From 2a5062389a292293552680be8f79f0fb2f053808 Mon Sep 17 00:00:00 2001 From: John Haley Date: Thu, 7 Apr 2016 12:52:57 -0700 Subject: [PATCH 01/61] Add `Repository#refreshIndex` `Repository#refreshIndex` will return an `Index` object back that has the latest data loaded off of disk. This removes the need for the `Repository#index` then `Index#read(1)` pattern that was being used which seemed to have some weird timing issues that could have wrong data loaded into the returned index. Calling this function also clears the `Index` that's cached in the `Repository` object. --- examples/add-and-commit.js | 3 +- examples/create-new-repo.js | 3 +- examples/details-for-tree-entry.js | 2 +- examples/general.js | 2 +- examples/index-add-and-remove.js | 2 +- examples/merge-cleanly.js | 6 +- examples/merge-with-conflicts.js | 12 ++-- examples/push.js | 3 +- examples/remove-and-commit.js | 3 +- generate/input/descriptor.json | 6 +- lib/repository.js | 34 ++++++++--- test/tests/checkout.js | 3 +- test/tests/commit.js | 12 ++-- test/tests/diff.js | 4 +- test/tests/index.js | 6 +- test/tests/merge.js | 75 ++++++++---------------- test/tests/patch.js | 2 +- test/tests/rebase.js | 9 ++- test/tests/reset.js | 10 ++-- test/tests/revwalk.js | 3 +- test/tests/stage.js | 91 ++++++++++++++++++------------ test/tests/submodule.js | 2 +- test/tests/thread_safety.js | 2 +- test/utils/repository_setup.js | 3 +- 24 files changed, 148 insertions(+), 150 deletions(-) diff --git a/examples/add-and-commit.js b/examples/add-and-commit.js index 6366f3ba3..d9af04ed7 100644 --- a/examples/add-and-commit.js +++ b/examples/add-and-commit.js @@ -35,11 +35,10 @@ nodegit.Repository.open(path.resolve(__dirname, "../.git")) ); }) .then(function() { - return repo.openIndex(); + return repo.refreshIndex(); }) .then(function(indexResult) { index = indexResult; - return index.read(1); }) .then(function() { // this file is in the root of the directory and doesn't need a full path diff --git a/examples/create-new-repo.js b/examples/create-new-repo.js index 640bdc33a..6cabe9a75 100644 --- a/examples/create-new-repo.js +++ b/examples/create-new-repo.js @@ -20,11 +20,10 @@ fse.ensureDir(path.resolve(__dirname, repoDir)) return fse.writeFile(path.join(repository.workdir(), fileName), fileContent); }) .then(function(){ - return repository.openIndex(); + return repository.refreshIndex(); }) .then(function(idx) { index = idx; - return index.read(1); }) .then(function() { return index.addByPath(fileName); diff --git a/examples/details-for-tree-entry.js b/examples/details-for-tree-entry.js index 405538389..6c4a0dc28 100644 --- a/examples/details-for-tree-entry.js +++ b/examples/details-for-tree-entry.js @@ -13,7 +13,7 @@ nodegit.Repository.open(path.resolve(__dirname, "../.git")) // Tree entry doesn't have any data associated with the actual entry // To get that we need to get the index entry that this points to - return repo.openIndex().then(function(index) { + return repo.refreshIndex().then(function(index) { var indexEntry = index.getByPath(treeEntry.path()); // With the index entry we can now view the details for the tree entry diff --git a/examples/general.js b/examples/general.js index 2103cc096..7062f134f 100644 --- a/examples/general.js +++ b/examples/general.js @@ -319,7 +319,7 @@ nodegit.Repository.open(path.resolve(__dirname, "../.git")) // The [index file API][gi] allows you to read, traverse, update and write // the Git index file (sometimes thought of as the staging area). - return repo.openIndex(); + return repo.refreshIndex(); }) .then(function(index) { diff --git a/examples/index-add-and-remove.js b/examples/index-add-and-remove.js index f5e8ee8b2..d34199bde 100644 --- a/examples/index-add-and-remove.js +++ b/examples/index-add-and-remove.js @@ -5,7 +5,7 @@ var fse = promisify(require("fs-extra")); nodegit.Repository.open(path.resolve(__dirname, "../.git")) .then(function(repo) { - return repo.openIndex() + return repo.refreshIndex() .then(function(index) { var fileContent = { newFile1: "this has some content", diff --git a/examples/merge-cleanly.js b/examples/merge-cleanly.js index 096714e8e..94af29df6 100644 --- a/examples/merge-cleanly.js +++ b/examples/merge-cleanly.js @@ -43,10 +43,9 @@ fse.remove(path.resolve(__dirname, repoDir)) // Load up the repository index and make our initial commit to HEAD .then(function() { - return repository.openIndex(); + return repository.refreshIndex(); }) .then(function(index) { - index.read(1); index.addByPath(ourFileName); index.write(); @@ -79,10 +78,9 @@ fse.remove(path.resolve(__dirname, repoDir)) ); }) .then(function() { - return repository.openIndex(); + return repository.refreshIndex(); }) .then(function(index) { - index.read(1); index.addByPath(theirFileName); index.write(); diff --git a/examples/merge-with-conflicts.js b/examples/merge-with-conflicts.js index b296112b5..3320e2f6c 100644 --- a/examples/merge-with-conflicts.js +++ b/examples/merge-with-conflicts.js @@ -49,10 +49,9 @@ fse.remove(path.resolve(__dirname, repoDir)) // Load up the repository index and make our initial commit to HEAD .then(function() { - return repository.openIndex(); + return repository.refreshIndex(); }) .then(function(index) { - index.read(1); index.addByPath(fileName); index.write(); @@ -94,9 +93,8 @@ fse.remove(path.resolve(__dirname, repoDir)) ); }) .then(function() { - return repository.openIndex() + return repository.refreshIndex() .then(function(index) { - index.read(1); index.addByPath(fileName); index.write(); @@ -122,8 +120,7 @@ fse.remove(path.resolve(__dirname, repoDir)) ); }) .then(function() { - return repository.openIndex().then(function(index) { - index.read(1); + return repository.refreshIndex().then(function(index) { index.addByPath(fileName); index.write(); @@ -173,9 +170,8 @@ fse.remove(path.resolve(__dirname, repoDir)) // we need to get a new index as the other one isnt backed to // the repository in the usual fashion, and just behaves weirdly .then(function() { - return repository.openIndex().then(function(index) { + return repository.refreshIndex().then(function(index) { - index.read(1); index.addByPath(fileName); index.write(); diff --git a/examples/push.js b/examples/push.js index e603efcb7..70a533b21 100644 --- a/examples/push.js +++ b/examples/push.js @@ -30,10 +30,9 @@ fse.remove(path.resolve(__dirname, repoDir)) // Load up the repository index and make our initial commit to HEAD .then(function() { - return repository.openIndex(); + return repository.refreshIndex(); }) .then(function(index) { - index.read(1); index.addByPath(fileName); index.write(); diff --git a/examples/remove-and-commit.js b/examples/remove-and-commit.js index fd6ddc6b8..c321d1715 100644 --- a/examples/remove-and-commit.js +++ b/examples/remove-and-commit.js @@ -17,11 +17,10 @@ var _oid; nodegit.Repository.open(path.resolve(__dirname, "../.git")) .then(function(repo) { _repository = repo; - return repo.openIndex(); + return repo.refreshIndex(); }) .then(function(index){ _index = index; - return _index.read(); }) .then(function() { //remove the file from the index... diff --git a/generate/input/descriptor.json b/generate/input/descriptor.json index 48eb6968d..bfb9f28ce 100644 --- a/generate/input/descriptor.json +++ b/generate/input/descriptor.json @@ -1833,7 +1833,11 @@ } }, "git_repository_set_index": { - "ignore": true + "args": { + "index": { + "isOptional": true + } + } }, "git_repository_set_odb": { "ignore": true diff --git a/lib/repository.js b/lib/repository.js index 8004d944d..bdf95204c 100644 --- a/lib/repository.js +++ b/lib/repository.js @@ -23,6 +23,27 @@ Object.defineProperty(Repository.prototype, "openIndex", { enumerable: false, value: Repository.prototype.index }); +/** + * Grabs a fresh copy of the index from the repository. Invalidates + * all previously grabbed indexes + * + * @async + * @return {Index} + */ +Repository.prototype.refreshIndex = function(callback) { + var repo = this; + + repo.setIndex(); // clear the index + + return repo.index() + .then(function(index) { + if (typeof callback === "function") { + callback(null, index); + } + + return index; + }, callback); +}; /** * Creates a branch with the passed in name pointing to the commit @@ -521,10 +542,9 @@ Repository.prototype.createCommitOnHead = function( var index; var repo = this; - return repo.openIndex() + return repo.refreshIndex() .then(function(index_) { index = index_; - index.read(1); if (!filesToAdd) { filesToAdd = []; } filesToAdd.forEach(function(filePath) { index.addByPath(filePath); @@ -907,7 +927,7 @@ function performRebase(repository, rebase, signature, beforeNextFn) { function getPromise() { return rebase.next() .then(function() { - return repository.openIndex() + return repository.refreshIndex() .then(function(index) { if (index.hasConflicts()) { throw index; @@ -1033,7 +1053,7 @@ Repository.prototype.continueRebase = function(signature, beforeNextFn) { signature = signature || repo.defaultSignature(); - return repo.openIndex() + return repo.refreshIndex() .then(function(index) { if (index.hasConflicts()) { throw index; @@ -1241,11 +1261,10 @@ Repository.prototype.stageFilemode = function(filePath, stageNew) { return fse.remove(indexLock) .then(function() { - return repo.openIndex(); + return repo.refreshIndex(); }) .then(function(indexResult) { index = indexResult; - return index.read(1); }) .then(function() { return diffPromise; @@ -1449,10 +1468,9 @@ Repository.prototype.stageLines = }); }; - return repo.openIndex() + return repo.refreshIndex() .then(function(indexResult) { index = indexResult; - return index.read(1); }) .then(function() { return diffPromise(); diff --git a/test/tests/checkout.js b/test/tests/checkout.js index dfd5d6823..cc510f304 100644 --- a/test/tests/checkout.js +++ b/test/tests/checkout.js @@ -126,9 +126,8 @@ describe("Checkout", function() { .then(function(branch) { fse.writeFileSync(packageJsonPath, "\n"); - return test.repository.openIndex() + return test.repository.refreshIndex() .then(function(index) { - index.read(1); index.addByPath(packageJsonName); index.write(); diff --git a/test/tests/commit.js b/test/tests/commit.js index e770a0c1e..41b1d16cf 100644 --- a/test/tests/commit.js +++ b/test/tests/commit.js @@ -55,11 +55,10 @@ describe("Commit", function() { return fse.writeFile(path.join(repo.workdir(), fileName), fileContent) .then(function() { - return repo.openIndex(); + return repo.refreshIndex(); }) .then(function(indexResult) { index = indexResult; - return index.read(1); }) .then(function() { return index.addByPath(fileName); @@ -162,11 +161,10 @@ describe("Commit", function() { return fse.writeFile(path.join(repo.workdir(), fileName), fileContent); }) .then(function() { - return repo.openIndex(); + return repo.refreshIndex(); }) .then(function(indexResult) { index = indexResult; - return index.read(1); }) .then(function() { return index.addByPath(fileName); @@ -242,11 +240,10 @@ describe("Commit", function() { return fse.writeFile(path.join(repo.workdir(), fileName), fileContent); }) .then(function() { - return repo.openIndex(); + return repo.refreshIndex(); }) .then(function(indexResult) { index = indexResult; - return index.read(1); }) .then(function() { return index.addByPath(fileName); @@ -290,11 +287,10 @@ describe("Commit", function() { ); }) .then(function() { - return repo.openIndex(); + return repo.refreshIndex(); }) .then(function(indexResult) { index = indexResult; - return index.read(1); }) .then(function() { return index.addByPath(newFileName); diff --git a/test/tests/diff.js b/test/tests/diff.js index 24b218ee4..7ce87275c 100644 --- a/test/tests/diff.js +++ b/test/tests/diff.js @@ -27,7 +27,7 @@ describe("Diff", function() { return Repository.open(reposPath).then(function(repository) { test.repository = repository; - return repository.openIndex(); + return repository.refreshIndex(); }) .then(function(index) { test.index = index; @@ -307,7 +307,7 @@ describe("Diff", function() { return Repository.open(reposPath).then(function(repository) { test.repository = repository; - return repository.openIndex(); + return repository.refreshIndex(); }) .then(function(index) { test.index = index; diff --git a/test/tests/index.js b/test/tests/index.js index a8baa3a4d..bac0d7e34 100644 --- a/test/tests/index.js +++ b/test/tests/index.js @@ -22,7 +22,7 @@ describe("Index", function() { return Repository.open(reposPath) .then(function(repo) { test.repository = repo; - return repo.openIndex(); + return repo.refreshIndex(); }) .then(function(index) { test.index = index; @@ -342,7 +342,7 @@ describe("Index", function() { return RepoUtils.addFileToIndex(repo, fileName); }) .then(function() { - return repo.openIndex(); + return repo.index(); }) .then(function(index) { assert.ok(!index.hasConflicts()); @@ -353,7 +353,7 @@ describe("Index", function() { ); }) .then(function() { - return repo.openIndex(); + return repo.index(); }) .then(function(index) { assert(index.hasConflicts()); diff --git a/test/tests/merge.js b/test/tests/merge.js index 316790fe0..4af1f91cf 100644 --- a/test/tests/merge.js +++ b/test/tests/merge.js @@ -44,9 +44,8 @@ describe("Merge", function() { ourFileContent) // Load up the repository index and make our initial commit to HEAD .then(function() { - return repository.openIndex() + return repository.refreshIndex() .then(function(index) { - index.read(1); index.addByPath(ourFileName); index.write(); @@ -80,9 +79,8 @@ describe("Merge", function() { theirFileContent); }) .then(function() { - return repository.openIndex() + return repository.refreshIndex() .then(function(index) { - index.read(1); index.addByPath(theirFileName); index.write(); @@ -149,9 +147,8 @@ describe("Merge", function() { ourFileContent) // Load up the repository index and make our initial commit to HEAD .then(function() { - return repository.openIndex() + return repository.refreshIndex() .then(function(index) { - index.read(1); index.addByPath(ourFileName); index.write(); @@ -185,9 +182,8 @@ describe("Merge", function() { theirFileContent); }) .then(function() { - return repository.openIndex() + return repository.refreshIndex() .then(function(index) { - index.read(1); index.addByPath(theirFileName); index.write(); @@ -261,9 +257,8 @@ describe("Merge", function() { ourFileContent) // Load up the repository index and make our initial commit to HEAD .then(function() { - return repository.openIndex() + return repository.refreshIndex() .then(function(index) { - index.read(1); index.addByPath(ourFileName); index.write(); @@ -297,9 +292,8 @@ describe("Merge", function() { theirFileContent); }) .then(function() { - return repository.openIndex() + return repository.refreshIndex() .then(function(index) { - index.read(1); index.addByPath(theirFileName); index.write(); @@ -380,9 +374,8 @@ describe("Merge", function() { initialFileContent) // Load up the repository index and make our initial commit to HEAD .then(function() { - return repository.openIndex() + return repository.refreshIndex() .then(function(index) { - index.read(1); index.addByPath(initialFileName); index.write(); @@ -418,9 +411,8 @@ describe("Merge", function() { ourFileContent); }) .then(function() { - return repository.openIndex() + return repository.refreshIndex() .then(function(index) { - index.read(1); index.addByPath(ourFileName); index.write(); @@ -447,9 +439,8 @@ describe("Merge", function() { theirFileContent); }) .then(function() { - return repository.openIndex() + return repository.refreshIndex() .then(function(index) { - index.read(1); index.addByPath(theirFileName); index.write(); @@ -519,9 +510,8 @@ describe("Merge", function() { ourFileContent) // Load up the repository index and make our initial commit to HEAD .then(function() { - return repository.openIndex() + return repository.refreshIndex() .then(function(index) { - index.read(1); index.addByPath(ourFileName); index.write(); @@ -555,9 +545,8 @@ describe("Merge", function() { theirFileContent); }) .then(function() { - return repository.openIndex() + return repository.refreshIndex() .then(function(index) { - index.read(1); index.addByPath(theirFileName); index.write(); @@ -635,9 +624,8 @@ describe("Merge", function() { initialFileContent) // Load up the repository index and make our initial commit to HEAD .then(function() { - return repository.openIndex() + return repository.refreshIndex() .then(function(index) { - index.read(1); index.addByPath(initialFileName); index.write(); @@ -673,9 +661,8 @@ describe("Merge", function() { ourFileContent); }) .then(function() { - return repository.openIndex() + return repository.refreshIndex() .then(function(index) { - index.read(1); index.addByPath(ourFileName); index.write(); @@ -702,9 +689,8 @@ describe("Merge", function() { theirFileContent); }) .then(function() { - return repository.openIndex() + return repository.refreshIndex() .then(function(index) { - index.read(1); index.addByPath(theirFileName); index.write(); @@ -776,9 +762,8 @@ describe("Merge", function() { initialFileContent) // Load up the repository index and make our initial commit to HEAD .then(function() { - return repository.openIndex() + return repository.refreshIndex() .then(function(index) { - index.read(1); index.addByPath(initialFileName); index.write(); @@ -814,9 +799,8 @@ describe("Merge", function() { ourFileContent); }) .then(function() { - return repository.openIndex() + return repository.refreshIndex() .then(function(index) { - index.read(1); index.addByPath(ourFileName); index.write(); @@ -843,9 +827,8 @@ describe("Merge", function() { theirFileContent); }) .then(function() { - return repository.openIndex() + return repository.refreshIndex() .then(function(index) { - index.read(1); index.addByPath(theirFileName); index.write(); @@ -903,9 +886,8 @@ describe("Merge", function() { return fse.writeFile(path.join(repository.workdir(), fileName), baseFileContent) .then(function() { - return repository.openIndex() + return repository.refreshIndex() .then(function(index) { - index.read(1); index.addByPath(fileName); index.write(); @@ -945,8 +927,7 @@ describe("Merge", function() { ourFileContent); }) .then(function() { - return repository.openIndex().then(function(index) { - index.read(1); + return repository.refreshIndex().then(function(index) { index.addByPath(fileName); index.write(); @@ -973,8 +954,7 @@ describe("Merge", function() { theirFileContent); }) .then(function() { - return repository.openIndex().then(function(index) { - index.read(1); + return repository.refreshIndex().then(function(index) { index.addByPath(fileName); index.write(); @@ -1011,8 +991,7 @@ describe("Merge", function() { finalFileContent); }) .then(function() { - return repository.openIndex().then(function(index) { - index.read(1); + return repository.refreshIndex().then(function(index) { index.addByPath(fileName); index.write(); @@ -1072,8 +1051,7 @@ describe("Merge", function() { return fse.writeFile(path.join(repository.workdir(), fileName), baseFileContent) .then(function() { - return repository.openIndex().then(function(index) { - index.read(1); + return repository.refreshIndex().then(function(index) { index.addByPath(fileName); index.write(); @@ -1107,8 +1085,7 @@ describe("Merge", function() { baseFileContent + theirFileContent); }) .then(function() { - return repository.openIndex().then(function(index) { - index.read(1); + return repository.refreshIndex().then(function(index) { index.addByPath(fileName); index.write(); @@ -1130,8 +1107,7 @@ describe("Merge", function() { baseFileContent + ourFileContent); }) .then(function() { - return repository.openIndex().then(function(index) { - index.read(1); + return repository.refreshIndex().then(function(index) { index.addByPath(fileName); index.write(); @@ -1199,9 +1175,8 @@ describe("Merge", function() { conflictSolvedFileContent); }) .then(function() { - return repository.openIndex() + return repository.refreshIndex() .then(function(index) { - index.read(1); index.addByPath(fileName); index.write(); diff --git a/test/tests/patch.js b/test/tests/patch.js index 5ed996c8b..e426d2b63 100644 --- a/test/tests/patch.js +++ b/test/tests/patch.js @@ -15,7 +15,7 @@ describe("Patch", function() { return Repository.open(reposPath).then(function(repository) { test.repository = repository; - return repository.openIndex(); + return repository.refreshIndex(); }) .then(function(index) { test.index = index; diff --git a/test/tests/rebase.js b/test/tests/rebase.js index 3a7a077fd..adf325080 100644 --- a/test/tests/rebase.js +++ b/test/tests/rebase.js @@ -13,9 +13,8 @@ describe("Rebase", function() { var theirBranchName = "theirs"; var removeFileFromIndex = function(repository, fileName) { - return repository.openIndex() + return repository.refreshIndex() .then(function(index) { - index.read(1); index.removeByPath(fileName); index.write(); @@ -454,7 +453,7 @@ describe("Rebase", function() { assert.equal(rebaseOperation.id().toString(), "28cfeb17f66132edb3c4dacb7ff38e8dd48a1844"); - return repository.openIndex() + return repository.refreshIndex() .then(function(index) { assert.ok(index.hasConflicts()); }); @@ -472,7 +471,7 @@ describe("Rebase", function() { return RepoUtils.addFileToIndex(repository, fileName); }) .then(function(oid) { - return repository.openIndex() + return repository.refreshIndex() .then(function(index) { assert.ok(!index.hasConflicts()); @@ -1039,7 +1038,7 @@ describe("Rebase", function() { return RepoUtils.addFileToIndex(repository, fileName); }) .then(function(oid) { - return repository.openIndex() + return repository.refreshIndex() .then(function(index) { assert.ok(!index.hasConflicts()); diff --git a/test/tests/reset.js b/test/tests/reset.js index 3638c5761..7cfea3dd3 100644 --- a/test/tests/reset.js +++ b/test/tests/reset.js @@ -54,7 +54,7 @@ describe("Reset", function() { return Reset.default(test.repo, test.previousCommit, filePath) .then(function() { - return test.repo.openIndex(); + return test.repo.refreshIndex(); }) .then(function(index) { return index.writeTree(); @@ -80,7 +80,7 @@ describe("Reset", function() { return Reset.default(test.repo, test.currentCommit, filePath); }) .then(function() { - return test.repo.openIndex(); + return test.repo.refreshIndex(); }) .then(function(index) { return index.writeTree(); @@ -109,7 +109,7 @@ describe("Reset", function() { return Reset.reset(test.repo, test.previousCommit, Reset.TYPE.SOFT) .then(function() { - return test.repo.openIndex(); + return test.repo.refreshIndex(); }) .then(function(index) { return index.writeTree(); @@ -143,7 +143,7 @@ describe("Reset", function() { return Reset.reset(test.repo, test.previousCommit, Reset.TYPE.MIXED) .then(function() { - return test.repo.openIndex(); + return test.repo.refreshIndex(); }) .then(function(index) { return index.writeTree(); @@ -183,7 +183,7 @@ describe("Reset", function() { return Reset.reset(test.repo, test.previousCommit, Reset.TYPE.HARD) .then(function() { - return test.repo.openIndex(); + return test.repo.refreshIndex(); }) .then(function(index) { return index.writeTree(); diff --git a/test/tests/revwalk.js b/test/tests/revwalk.js index 85d708303..6999fbd44 100644 --- a/test/tests/revwalk.js +++ b/test/tests/revwalk.js @@ -253,9 +253,8 @@ describe("Revwalk", function() { ); }) .then(function() { - return repo.openIndex() + return repo.refreshIndex() .then(function(index) { - index.read(1); index.addByPath(fileNameB); index.removeByPath(fileNameA); index.write(); diff --git a/test/tests/stage.js b/test/tests/stage.js index d4543284d..d88e65139 100644 --- a/test/tests/stage.js +++ b/test/tests/stage.js @@ -20,10 +20,6 @@ describe("Stage", function() { return RepoUtils.createRepository(repoPath) .then(function(repo) { test.repository = repo; - return repo.openIndex(); - }) - .then(function(index) { - test.index = index; }); }); @@ -31,7 +27,7 @@ describe("Stage", function() { return fse.remove(test.repository.workdir()); }); -function stagingTest(staging, newFileContent) { + function stagingTest(staging, newFileContent) { var fileContent = newFileContent || "One line of text\n" + "Two lines of text\n"+ @@ -54,7 +50,6 @@ function stagingTest(staging, newFileContent) { "Nineteen lines of text\n"+ "Twenty lines of text\n"; var fileName = "stagedLinesTest.txt"; - var index; var stagedFile; var workingDirFile; var getDiffFunction; @@ -63,10 +58,17 @@ function stagingTest(staging, newFileContent) { workingDirFile = stagedFile.replace("Three", "Changed three") .replace("Seventeen", "Changed seventeen"); getDiffFunction = function() { - return NodeGit.Diff.indexToWorkdir(test.repository, index, { - flags: - NodeGit.Diff.OPTION.SHOW_UNTRACKED_CONTENT | - NodeGit.Diff.OPTION.RECURSE_UNTRACKED_DIRS + return test.repository.refreshIndex() + .then(function(index) { + return NodeGit.Diff.indexToWorkdir( + test.repository, + index, + { + flags: + NodeGit.Diff.OPTION.SHOW_UNTRACKED_CONTENT | + NodeGit.Diff.OPTION.RECURSE_UNTRACKED_DIRS + } + ); }); }; } @@ -81,15 +83,24 @@ function stagingTest(staging, newFileContent) { return test.repository.getBranchCommit("master"); }) .then(function(masterCommit) { - return masterCommit.getTree(); + var treePromise = masterCommit.getTree(); + var indexPromise = test.repository.refreshIndex(); + + return Promise.all([treePromise, indexPromise]); }) - .then(function(masterTree) { + .then(function(treeAndIndex) { + var masterTree = treeAndIndex[0]; + var index = treeAndIndex[1]; return NodeGit.Diff.treeToIndex( - test.repository, masterTree, index, { - flags: - NodeGit.Diff.OPTION.SHOW_UNTRACKED_CONTENT | - NodeGit.Diff.OPTION.RECURSE_UNTRACKED_DIRS - }); + test.repository, + masterTree, + index, + { + flags: + NodeGit.Diff.OPTION.SHOW_UNTRACKED_CONTENT | + NodeGit.Diff.OPTION.RECURSE_UNTRACKED_DIRS + } + ); }); }; } @@ -100,10 +111,6 @@ function stagingTest(staging, newFileContent) { workingDirFile); }) .then(function() { - return test.repository.openIndex(); - }) - .then(function(repoIndex) { - index = repoIndex; return getDiffFunction(); }) .then(function(fileDiff) { @@ -137,7 +144,10 @@ function stagingTest(staging, newFileContent) { }) .then(function(stageResult) { assert.equal(stageResult, 0); - var pathOid = index.getByPath(fileName).id; + return test.repository.refreshIndex(); + }) + .then(function(reloadedIndex) { + var pathOid = reloadedIndex.getByPath(fileName).id; return test.repository.getBlob(pathOid); }) .then(function(resultFileContents) { @@ -197,7 +207,7 @@ function stagingTest(staging, newFileContent) { it("staging last hunk stages whole file if no filemode changes", function() { return stagingTest(true, lastHunkStagedFileContent) .then(function() { - return test.repository.openIndex(); + return test.repository.refreshIndex(); }) .then(function(index) { return NodeGit.Diff.indexToWorkdir(test.repository, index, { @@ -290,11 +300,10 @@ function stagingTest(staging, newFileContent) { }) //Now lets do a commit... .then(function() { - return test.repository.openIndex(); + return test.repository.refreshIndex(); }) .then(function(repoIndex) { index = repoIndex; - index.read(1); return index.writeTree(); }) .then(function (oid) { @@ -321,14 +330,17 @@ function stagingTest(staging, newFileContent) { } return createAndCommitFiles( - test.repository, fileName, fileContent, afterWriteFn + test.repository, + fileName, + fileContent, + afterWriteFn ) //Then, diff between head commit and workdir should have filemode change .then(function() { return compareFilemodes(true, null, 0111 /* expect +x */); }) .then(function() { - return test.repository.openIndex(); + return test.repository.refreshIndex(); }) .then(function(repoIndex) { //Now we stage the whole file... @@ -344,9 +356,12 @@ function stagingTest(staging, newFileContent) { return test.repository.stageFilemode(fileName, false /* unstage */); }); }) - //We expect the Index to have no filemode changes, since we unstaged. .then(function() { - return compareFilemodes(false, index, 0 /* expect +x */); + return test.repository.refreshIndex(); + }) + //We expect the Index to have no filemode changes, since we unstaged. + .then(function(freshIndex) { + return compareFilemodes(false, freshIndex, 0 /* expect +x */); }) //We also expect the workdir to now have the filemode change. .then(function() { @@ -379,7 +394,7 @@ function stagingTest(staging, newFileContent) { test.repository, fileName, fileContent, afterWriteFn ) .then(function() { - return test.repository.openIndex(); + return test.repository.refreshIndex(); }) .then(function(repoIndex) { index = repoIndex; @@ -392,7 +407,10 @@ function stagingTest(staging, newFileContent) { return test.repository.stageFilemode(fileName, false /* unstage */); }) .then(function() { - return compareFilemodes(false, index, 0 /* expect nochange */); + return test.repository.refreshIndex(); + }) + .then(function(freshIndex) { + return compareFilemodes(false, freshIndex, 0 /* expect nochange */); }); }); } @@ -411,9 +429,8 @@ function stagingTest(staging, newFileContent) { })) .then(function() { // Initial commit - return test.repository.openIndex() + return test.repository.refreshIndex() .then(function(index) { - index.read(1); fileName.forEach(function(file) { index.addByPath(file); }); @@ -455,7 +472,7 @@ function stagingTest(staging, newFileContent) { {cwd: test.repository.workdir()}); }) .then(function() { - return test.repository.openIndex(); + return test.repository.refreshIndex(); }) .then(function(repoIndex) { index = repoIndex; @@ -468,8 +485,10 @@ function stagingTest(staging, newFileContent) { return test.repository.stageFilemode(fileName, false /* unstage */); }) .then(function() { - return compareFilemodes(false, index, 0 /* expect nochange */); + return test.repository.refreshIndex(); + }) + .then(function(freshIndex) { + return compareFilemodes(false, freshIndex, 0 /* expect nochange */); }); }); - }); diff --git a/test/tests/submodule.js b/test/tests/submodule.js index 002b4ef12..4dd167c70 100644 --- a/test/tests/submodule.js +++ b/test/tests/submodule.js @@ -146,7 +146,7 @@ describe("Submodule", function() { .then(function(submodule) { assert.equal(submodule.name(), submodulePath); // check whether .gitmodules and the submodule are in the index - return repo.openIndex(); + return repo.refreshIndex(); }) .then(function(index) { var entries = index.entries(); diff --git a/test/tests/thread_safety.js b/test/tests/thread_safety.js index c02952630..257c2d51e 100644 --- a/test/tests/thread_safety.js +++ b/test/tests/thread_safety.js @@ -14,7 +14,7 @@ describe("ThreadSafety", function() { return Repository.open(reposPath) .then(function(repo) { test.repository = repo; - return repo.openIndex(); + return repo.refreshIndex(); }) .then(function(index) { test.index = index; diff --git a/test/utils/repository_setup.js b/test/utils/repository_setup.js index d48c04650..8a6319af6 100644 --- a/test/utils/repository_setup.js +++ b/test/utils/repository_setup.js @@ -7,9 +7,8 @@ var fse = promisify(require("fs-extra")); var RepositorySetup = { addFileToIndex: function addFileToIndex(repository, fileName) { - return repository.openIndex() + return repository.refreshIndex() .then(function(index) { - index.read(1); index.addByPath(fileName); index.write(); From 50a620d7a7b42049b242a1cfb1f8812ebe24f088 Mon Sep 17 00:00:00 2001 From: Stjepan Rajko Date: Tue, 8 Mar 2016 09:40:04 -0700 Subject: [PATCH 02/61] Readd throttling --- generate/input/callbacks.json | 12 +- .../templates/manual/include/async_baton.h | 32 +++++ .../manual/include/callback_wrapper.h | 55 ++++++++- .../templates/manual/include/lock_master.h | 2 + .../templates/partials/callback_helpers.cc | 28 ++--- .../templates/partials/field_accessors.cc | 76 +++++++----- generate/templates/templates/class_content.cc | 1 - generate/templates/templates/class_header.h | 6 +- .../templates/templates/struct_content.cc | 5 - generate/templates/templates/struct_header.h | 11 +- test/tests/clone.js | 110 ++++++++++++++++++ 11 files changed, 266 insertions(+), 72 deletions(-) diff --git a/generate/input/callbacks.json b/generate/input/callbacks.json index d18919768..eb6b128a3 100644 --- a/generate/input/callbacks.json +++ b/generate/input/callbacks.json @@ -96,7 +96,8 @@ "type": "int", "noResults": 1, "success": 0, - "error": -1 + "error": -1, + "throttle": 100 } }, "git_checkout_perfdata_cb": { @@ -207,7 +208,8 @@ "type": "int", "noResults": 1, "success": 0, - "error": -1 + "error": -1, + "throttle": 100 } }, "git_diff_hunk_cb": { @@ -560,7 +562,8 @@ "type": "int", "noResults":0, "success": 0, - "error": -1 + "error": -1, + "throttle": 100 } }, "git_stash_cb": { @@ -670,7 +673,8 @@ "type": "int", "noResults": 0, "success": 0, - "error": -1 + "error": -1, + "throttle": 100 } }, "git_transport_cb": { diff --git a/generate/templates/manual/include/async_baton.h b/generate/templates/manual/include/async_baton.h index a1ce5c380..fee87c4c1 100644 --- a/generate/templates/manual/include/async_baton.h +++ b/generate/templates/manual/include/async_baton.h @@ -4,6 +4,9 @@ #include #include +#include "lock_master.h" +#include "functions/sleep_for_ms.h" + // Base class for Batons used for callbacks (for example, // JS functions passed as callback parameters, // or field properties of configuration objects whose values are callbacks) @@ -13,4 +16,33 @@ struct AsyncBaton { bool done; }; +template +struct AsyncBatonWithResult : public AsyncBaton { + ResultT result; + ResultT defaultResult; // result returned if the callback doesn't return anything valid + + AsyncBatonWithResult(const ResultT &defaultResult) + : defaultResult(defaultResult) { + } + + ResultT ExecuteAsync(uv_async_cb asyncCallback) { + result = 0; + req.data = this; + done = false; + + uv_async_init(uv_default_loop(), &req, asyncCallback); + { + LockMaster::TemporaryUnlock temporaryUnlock; + + uv_async_send(&req); + + while(!done) { + sleep_for_ms(1); + } + } + + return result; + } +}; + #endif diff --git a/generate/templates/manual/include/callback_wrapper.h b/generate/templates/manual/include/callback_wrapper.h index 41552de3e..b23a7bb36 100644 --- a/generate/templates/manual/include/callback_wrapper.h +++ b/generate/templates/manual/include/callback_wrapper.h @@ -1,17 +1,60 @@ #ifndef CALLBACK_WRAPPER_H #define CALLBACK_WRAPPER_H -#include -#include - -#include "nan.h" +#include +#include using namespace v8; using namespace node; -struct CallbackWrapper { +class CallbackWrapper { Nan::Callback* jsCallback; - void * payload; + + // throttling data, used for callbacks that need to be throttled + int throttle; // in milliseconds - if > 0, calls to the JS callback will be throttled + uint64_t lastCallTime; + +public: + CallbackWrapper() { + jsCallback = NULL; + lastCallTime = 0; + throttle = 0; + } + + ~CallbackWrapper() { + SetCallback(NULL); + } + + bool HasCallback() { + return jsCallback != NULL; + } + + Nan::Callback* GetCallback() { + return jsCallback; + } + + void SetCallback(Nan::Callback* callback, int throttle = 0) { + if(jsCallback) { + delete jsCallback; + } + jsCallback = callback; + this->throttle = throttle; + } + + bool WillBeThrottled() { + if(!throttle) { + return false; + } + // throttle if needed + uint64_t now = uv_hrtime(); + if(lastCallTime > 0 && now < lastCallTime + throttle * 1000000) { + // throttled + return true; + } else { + lastCallTime = now; + return false; + } + } }; #endif diff --git a/generate/templates/manual/include/lock_master.h b/generate/templates/manual/include/lock_master.h index 94a622666..fde38825b 100644 --- a/generate/templates/manual/include/lock_master.h +++ b/generate/templates/manual/include/lock_master.h @@ -1,6 +1,8 @@ #ifndef LOCK_MASTER_H #define LOCK_MASTER_H +#include + class LockMasterImpl; class LockMaster { diff --git a/generate/templates/partials/callback_helpers.cc b/generate/templates/partials/callback_helpers.cc index b103d24e0..f0870f2d1 100644 --- a/generate/templates/partials/callback_helpers.cc +++ b/generate/templates/partials/callback_helpers.cc @@ -6,28 +6,14 @@ {{ arg.cType }} {{ arg.name}}{% if not arg.lastArg %},{% endif %} {% endeach %} ) { - {{ cppFunctionName }}_{{ cbFunction.name|titleCase }}Baton* baton = new {{ cppFunctionName }}_{{ cbFunction.name|titleCase }}Baton(); + {{ cppFunctionName }}_{{ cbFunction.name|titleCase }}Baton* baton = + new {{ cppFunctionName }}_{{ cbFunction.name|titleCase }}Baton({{ cbFunction.return.noResults }}); {% each cbFunction.args|argsInfo as arg %} baton->{{ arg.name }} = {{ arg.name }}; {% endeach %} - baton->result = 0; - baton->req.data = baton; - baton->done = false; - - uv_async_init(uv_default_loop(), &baton->req, (uv_async_cb) {{ cppFunctionName }}_{{ cbFunction.name }}_async); - { - LockMaster::TemporaryUnlock temporaryUnlock; - - uv_async_send(&baton->req); - - while(!baton->done) { - sleep_for_ms(1); - } - } - - return baton->result; + return baton->ExecuteAsync((uv_async_cb) {{ cppFunctionName }}_{{ cbFunction.name }}_async); } void {{ cppClassName }}::{{ cppFunctionName }}_{{ cbFunction.name }}_async(uv_async_t* req, int status) { @@ -93,12 +79,12 @@ void {{ cppClassName }}::{{ cppFunctionName }}_{{ cbFunction.name }}_async(uv_as baton->result = (int)result->ToNumber()->Value(); } else { - baton->result = {{ cbFunction.return.noResults }}; + baton->result = baton->defaultResult; } {% endif %} } else { - baton->result = {{ cbFunction.return.noResults }}; + baton->result = baton->defaultResult; } {% endeach %} @@ -127,12 +113,12 @@ void {{ cppClassName }}::{{ cppFunctionName }}_{{ cbFunction.name }}_promiseComp baton->result = (int)result->ToNumber()->Value(); } else { - baton->result = {{ cbFunction.return.noResults }}; + baton->result = baton->defaultResult; } {% endif %} } else { - baton->result = {{ cbFunction.return.noResults }}; + baton->result = baton->defaultResult; } {% endeach %} } diff --git a/generate/templates/partials/field_accessors.cc b/generate/templates/partials/field_accessors.cc index 9261c2fcd..63eeb840a 100644 --- a/generate/templates/partials/field_accessors.cc +++ b/generate/templates/partials/field_accessors.cc @@ -11,8 +11,8 @@ info.GetReturnValue().Set(Nan::New(wrapper->{{ field.name }})); {% elsif field.isCallbackFunction %} - if (wrapper->{{field.name}} != NULL) { - info.GetReturnValue().Set(wrapper->{{ field.name }}->GetFunction()); + if (wrapper->{{field.name}}.HasCallback()) { + info.GetReturnValue().Set(wrapper->{{ field.name }}.GetCallback()->GetFunction()); } else { info.GetReturnValue().SetUndefined(); } @@ -31,6 +31,7 @@ } NAN_SETTER({{ cppClassName }}::Set{{ field.cppFunctionName }}) { + Nan::HandleScope scope; {{ cppClassName }} *wrapper = Nan::ObjectWrap::Unwrap<{{ cppClassName }}>(info.This()); @@ -47,16 +48,35 @@ wrapper->raw->{{ field.name }} = {% if not field.cType | isPointer %}*{% endif %}{% if field.cppClassName == 'GitStrarray' %}StrArrayConverter::Convert({{ field.name }}->ToObject()){% else %}Nan::ObjectWrap::Unwrap<{{ field.cppClassName }}>({{ field.name }}->ToObject())->GetValue(){% endif %}; {% elsif field.isCallbackFunction %} - if (wrapper->{{ field.name }} != NULL) { - delete wrapper->{{ field.name }}; - } + Nan::Callback *callback = NULL; + int throttle = {%if field.return.throttle %}{{ field.return.throttle }}{%else%}0{%endif%}; if (value->IsFunction()) { + callback = new Nan::Callback(value.As()); + } else if (value->IsObject()) { + Local object = value.As(); + Local callbackKey; + Nan::MaybeLocal maybeObjectCallback = Nan::Get(object, Nan::New("callback").ToLocalChecked()); + if (!maybeObjectCallback.IsEmpty()) { + Local objectCallback = maybeObjectCallback.ToLocalChecked(); + if (objectCallback->IsFunction()) { + callback = new Nan::Callback(objectCallback.As()); + Nan::MaybeLocal maybeObjectThrottle = Nan::Get(object, Nan::New("throttle").ToLocalChecked()); + if(!maybeObjectThrottle.IsEmpty()) { + Local objectThrottle = maybeObjectThrottle.ToLocalChecked(); + if (objectThrottle->IsNumber()) { + throttle = (int)objectThrottle.As()->Value(); + } + } + } + } + } + if (callback) { if (!wrapper->raw->{{ field.name }}) { wrapper->raw->{{ field.name }} = ({{ field.cType }}){{ field.name }}_cppCallback; } - wrapper->{{ field.name }} = new Nan::Callback(value.As()); + wrapper->{{ field.name }}.SetCallback(callback, throttle); } {% elsif field.payloadFor %} @@ -82,46 +102,42 @@ } {% if field.isCallbackFunction %} + {{ cppClassName }}* {{ cppClassName }}::{{ field.name }}_getInstanceFromBaton({{ field.name|titleCase }}Baton* baton) { + return static_cast<{{ cppClassName }}*>(baton->{% each field.args|argsInfo as arg %} + {% if arg.payload == true %}{{arg.name}}{% elsif arg.lastArg %}{{arg.name}}{% endif %} + {% endeach %}); + } + {{ field.return.type }} {{ cppClassName }}::{{ field.name }}_cppCallback ( {% each field.args|argsInfo as arg %} {{ arg.cType }} {{ arg.name}}{% if not arg.lastArg %},{% endif %} {% endeach %} ) { - {{ field.name|titleCase }}Baton* baton = new {{ field.name|titleCase }}Baton(); + {{ field.name|titleCase }}Baton* baton = + new {{ field.name|titleCase }}Baton({{ field.return.noResults }}); {% each field.args|argsInfo as arg %} baton->{{ arg.name }} = {{ arg.name }}; {% endeach %} - baton->result = 0; - baton->req.data = baton; - baton->done = false; - - uv_async_init(uv_default_loop(), &baton->req, (uv_async_cb) {{ field.name }}_async); - { - LockMaster::TemporaryUnlock temporaryUnlock; - - uv_async_send(&baton->req); + {{ cppClassName }}* instance = {{ field.name }}_getInstanceFromBaton(baton); - while(!baton->done) { - sleep_for_ms(1); - } + if (instance->{{ field.name }}.WillBeThrottled()) { + return baton->defaultResult; } - return baton->result; + return baton->ExecuteAsync((uv_async_cb) {{ field.name }}_async); } void {{ cppClassName }}::{{ field.name }}_async(uv_async_t* req, int status) { Nan::HandleScope scope; {{ field.name|titleCase }}Baton* baton = static_cast<{{ field.name|titleCase }}Baton*>(req->data); - {{ cppClassName }}* instance = static_cast<{{ cppClassName }}*>(baton->{% each field.args|argsInfo as arg %} - {% if arg.payload == true %}{{arg.name}}{% elsif arg.lastArg %}{{arg.name}}{% endif %} - {% endeach %}); + {{ cppClassName }}* instance = {{ field.name }}_getInstanceFromBaton(baton); - if (instance->{{ field.name }}->IsEmpty()) { + if (instance->{{ field.name }}.GetCallback()->IsEmpty()) { {% if field.return.type == "int" %} - baton->result = {{ field.return.noResults }}; // no results acquired + baton->result = baton->defaultResult; // no results acquired {% endif %} baton->done = true; @@ -163,7 +179,7 @@ }; Nan::TryCatch tryCatch; - Local result = instance->{{ field.name }}->Call({{ field.args|jsArgsCount }}, argv); + Local result = instance->{{ field.name }}.GetCallback()->Call({{ field.args|jsArgsCount }}, argv); uv_close((uv_handle_t*) &baton->req, NULL); @@ -187,12 +203,12 @@ baton->result = (int)result->ToNumber()->Value(); } else { - baton->result = {{ field.return.noResults }}; + baton->result = baton->defaultResult; } {% endif %} } else { - baton->result = {{ field.return.noResults }}; + baton->result = baton->defaultResult; } {% endeach %} baton->done = true; @@ -220,12 +236,12 @@ baton->result = (int)result->ToNumber()->Value(); } else{ - baton->result = {{ field.return.noResults }}; + baton->result = baton->defaultResult; } {% endif %} } else { - baton->result = {{ field.return.noResults }}; + baton->result = baton->defaultResult; } {% endeach %} } diff --git a/generate/templates/templates/class_content.cc b/generate/templates/templates/class_content.cc index 720c0d1e2..4cba077f3 100644 --- a/generate/templates/templates/class_content.cc +++ b/generate/templates/templates/class_content.cc @@ -11,7 +11,6 @@ extern "C" { #include "../include/lock_master.h" #include "../include/functions/copy.h" #include "../include/{{ filename }}.h" -#include "../include/functions/sleep_for_ms.h" {% each dependencies as dependency %} #include "{{ dependency }}" diff --git a/generate/templates/templates/class_header.h b/generate/templates/templates/class_header.h index 63abef7b9..6fc12dcd6 100644 --- a/generate/templates/templates/class_header.h +++ b/generate/templates/templates/class_header.h @@ -68,12 +68,14 @@ class {{ cppClassName }} : public Nan::ObjectWrap { static void {{ function.cppFunctionName }}_{{ arg.name }}_async(uv_async_t* req, int status); static void {{ function.cppFunctionName }}_{{ arg.name }}_promiseCompleted(bool isFulfilled, AsyncBaton *_baton, v8::Local result); - struct {{ function.cppFunctionName }}_{{ arg.name|titleCase }}Baton : AsyncBaton { + struct {{ function.cppFunctionName }}_{{ arg.name|titleCase }}Baton : public AsyncBatonWithResult<{{ arg.return.type }}> { {% each arg.args|argsInfo as cbArg %} {{ cbArg.cType }} {{ cbArg.name }}; {% endeach %} - {{ arg.return.type }} result; + {{ function.cppFunctionName }}_{{ arg.name|titleCase }}Baton(const {{ arg.return.type }} &defaultResult) + : AsyncBatonWithResult<{{ arg.return.type }}>(defaultResult) { + } }; {% endif %} {% endeach %} diff --git a/generate/templates/templates/struct_content.cc b/generate/templates/templates/struct_content.cc index 80b496538..49749e2df 100644 --- a/generate/templates/templates/struct_content.cc +++ b/generate/templates/templates/struct_content.cc @@ -17,7 +17,6 @@ extern "C" { #include "../include/lock_master.h" #include "../include/functions/copy.h" #include "../include/{{ filename }}.h" -#include "../include/functions/sleep_for_ms.h" {% each dependencies as dependency %} #include "{{ dependency }}" @@ -53,10 +52,7 @@ using namespace std; {% if not field.ignore %} {% if not field.isEnum %} {% if field.isCallbackFunction %} - if (this->{{ field.name }} != NULL) { - delete this->{{ field.name }}; this->raw->{{ fields|payloadFor field.name }} = NULL; - } {% endif %} {% endif %} {% endif %} @@ -84,7 +80,6 @@ void {{ cppClassName }}::ConstructFields() { // the current instance this->raw->{{ field.name }} = NULL; this->raw->{{ fields|payloadFor field.name }} = (void *)this; - this->{{ field.name }} = NULL; {% elsif field.payloadFor %} Local {{ field.name }} = Nan::Undefined(); diff --git a/generate/templates/templates/struct_header.h b/generate/templates/templates/struct_header.h index ac5a0e236..8a6ba17af 100644 --- a/generate/templates/templates/struct_header.h +++ b/generate/templates/templates/struct_header.h @@ -6,6 +6,7 @@ #include #include "async_baton.h" +#include "callback_wrapper.h" extern "C" { #include @@ -48,13 +49,17 @@ class {{ cppClassName }} : public Nan::ObjectWrap { static void {{ field.name }}_async(uv_async_t* req, int status); static void {{ field.name }}_promiseCompleted(bool isFulfilled, AsyncBaton *_baton, v8::Local result); - struct {{ field.name|titleCase }}Baton : public AsyncBaton { + struct {{ field.name|titleCase }}Baton : public AsyncBatonWithResult<{{ field.return.type }}> { {% each field.args|argsInfo as arg %} {{ arg.cType }} {{ arg.name}}; {% endeach %} - {{ field.return.type }} result; + {{ field.name|titleCase }}Baton(const {{ field.return.type }} &defaultResult) + : AsyncBatonWithResult<{{ field.return.type }}>(defaultResult) { + } }; + static {{ cppClassName }} * {{ field.name }}_getInstanceFromBaton ( + {{ field.name|titleCase }}Baton *baton); {% endif %} {% endif %} {% endeach %} @@ -73,7 +78,7 @@ class {{ cppClassName }} : public Nan::ObjectWrap { {% if field.isLibgitType %} Nan::Persistent {{ field.name }}; {% elsif field.isCallbackFunction %} - Nan::Callback* {{ field.name }}; + CallbackWrapper {{ field.name }}; {% elsif field.payloadFor %} Nan::Persistent {{ field.name }}; {% endif %} diff --git a/test/tests/clone.js b/test/tests/clone.js index cbb0d1c5d..40c557dee 100644 --- a/test/tests/clone.js +++ b/test/tests/clone.js @@ -3,6 +3,7 @@ var assert = require("assert"); var promisify = require("promisify-node"); var fse = promisify(require("fs-extra")); var local = path.join.bind(path, __dirname); +var _ = require("lodash"); describe("Clone", function() { var NodeGit = require("../../"); @@ -56,6 +57,115 @@ describe("Clone", function() { }); }); + it("can clone twice with https using same config object", function() { + var test = this; + var url = "https://github.com/nodegit/test.git"; + var progressCount = 0; + var opts = { + fetchOpts: { + callbacks: { + transferProgress: function(progress) { + progressCount++; + } + } + } + }; + + return Clone(url, clonePath, opts) + .then(function(repo) { + assert.ok(repo instanceof Repository); + assert.notEqual(progressCount, 0); + return fse.remove(clonePath); + }) + .then(function() { + progressCount = 0; + return Clone(url, clonePath, opts); + }) + .then(function(repo) { + assert.ok(repo instanceof Repository); + assert.notEqual(progressCount, 0); + test.repository = repo; + }); + }); + + function updateProgressIntervals(progressIntervals, lastInvocation) { + var now = new Date(); + if (lastInvocation) { + progressIntervals.push(now - lastInvocation); + } + return now; + } + + it("can clone with https and default throttled progress", function() { + var test = this; + var url = "https://github.com/nodegit/test.git"; + var progressCount = 0; + var lastInvocation; + var progressIntervals = []; + var opts = { + fetchOpts: { + callbacks: { + transferProgress: function(progress) { + lastInvocation = updateProgressIntervals(progressIntervals, + lastInvocation); + progressCount++; + } + } + } + }; + + return Clone(url, clonePath, opts).then(function(repo) { + assert.ok(repo instanceof Repository); + assert.notEqual(progressCount, 0); + var averageProgressInterval = _.sum(progressIntervals) / + progressIntervals.length; + // even though we are specifying a throttle period of 100, + // the throttle is applied on the scheduling side, + // and actual execution is at the mercy of the main js thread + // so the actual throttle intervals could be less than the specified + // throttle period + if (!averageProgressInterval || averageProgressInterval < 75) { + assert.fail(averageProgressInterval, 75, + "unexpected average time between callbacks", "<"); + } + test.repository = repo; + }); + }); + + it("can clone with https and explicitly throttled progress", function() { + var test = this; + var url = "https://github.com/nodegit/test.git"; + var progressCount = 0; + var lastInvocation; + var progressIntervals = []; + var opts = { + fetchOpts: { + callbacks: { + transferProgress: { + throttle: 50, + callback: function(progress) { + lastInvocation = updateProgressIntervals(progressIntervals, + lastInvocation); + progressCount++; + } + } + } + } + }; + + return Clone(url, clonePath, opts).then(function(repo) { + assert.ok(repo instanceof Repository); + assert.notEqual(progressCount, 0); + var averageProgressInterval = _.sum(progressIntervals) / + progressIntervals.length; + if (!averageProgressInterval || averageProgressInterval < 35) { + assert.fail(averageProgressInterval, 35, + "unexpected average time between callbacks", "<"); + } + test.repository = repo; + }); + }); + it("can clone using nested function", function() { var test = this; var url = "https://github.com/nodegit/test.git"; From c280d3859c52a0e2dc74f807d7a984187d77c9e1 Mon Sep 17 00:00:00 2001 From: Stjepan Rajko Date: Tue, 8 Mar 2016 09:42:48 -0700 Subject: [PATCH 03/61] Remove HandleScope from Set This HandeScope was introduced with throttling changes, and may have contributed to the crash. --- generate/templates/partials/field_accessors.cc | 2 -- 1 file changed, 2 deletions(-) diff --git a/generate/templates/partials/field_accessors.cc b/generate/templates/partials/field_accessors.cc index 63eeb840a..0b3b881d6 100644 --- a/generate/templates/partials/field_accessors.cc +++ b/generate/templates/partials/field_accessors.cc @@ -31,8 +31,6 @@ } NAN_SETTER({{ cppClassName }}::Set{{ field.cppFunctionName }}) { - Nan::HandleScope scope; - {{ cppClassName }} *wrapper = Nan::ObjectWrap::Unwrap<{{ cppClassName }}>(info.This()); {% if field.isEnum %} From b0089b04b70bff39829b6a6b95ef63ce78a89bca Mon Sep 17 00:00:00 2001 From: Stjepan Rajko Date: Tue, 8 Mar 2016 14:57:13 -0700 Subject: [PATCH 04/61] Reintroduce HasCallback check when clearing payload This check was removed with throttling changes, and may have contributed to the crash. --- generate/templates/templates/struct_content.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/generate/templates/templates/struct_content.cc b/generate/templates/templates/struct_content.cc index 49749e2df..a5f172aec 100644 --- a/generate/templates/templates/struct_content.cc +++ b/generate/templates/templates/struct_content.cc @@ -52,7 +52,9 @@ using namespace std; {% if not field.ignore %} {% if not field.isEnum %} {% if field.isCallbackFunction %} + if (this->{{ field.name }}.HasCallback()) { this->raw->{{ fields|payloadFor field.name }} = NULL; + } {% endif %} {% endif %} {% endif %} From 0c1be2698dbfbaa7822ea9e6d0b9966a06132ab4 Mon Sep 17 00:00:00 2001 From: John Haley Date: Thu, 7 Apr 2016 12:53:49 -0700 Subject: [PATCH 05/61] Remove `Repository#openIndex` --- lib/repository.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lib/repository.js b/lib/repository.js index bdf95204c..ade1d9ce9 100644 --- a/lib/repository.js +++ b/lib/repository.js @@ -19,10 +19,6 @@ var Tag = NodeGit.Tag; var Tree = NodeGit.Tree; var TreeBuilder = NodeGit.Treebuilder; -Object.defineProperty(Repository.prototype, "openIndex", { - enumerable: false, - value: Repository.prototype.index -}); /** * Grabs a fresh copy of the index from the repository. Invalidates * all previously grabbed indexes From 2e0e6de0b61181c0478655a854dd7fd6e4a84bdc Mon Sep 17 00:00:00 2001 From: John Haley Date: Fri, 8 Apr 2016 14:36:22 -0700 Subject: [PATCH 06/61] Make `Remote.create` async --- generate/input/descriptor.json | 5 ++- test/tests/remote.js | 82 ++++++++++++++++++++-------------- 2 files changed, 53 insertions(+), 34 deletions(-) diff --git a/generate/input/descriptor.json b/generate/input/descriptor.json index b863f8122..2b8a32756 100644 --- a/generate/input/descriptor.json +++ b/generate/input/descriptor.json @@ -1630,7 +1630,10 @@ "selfFreeing": true, "functions": { "git_remote_create": { - "isAsync": false + "isAsync": true, + "return": { + "isErrorCode": true + } }, "git_remote_connect": { "isAsync": true, diff --git a/test/tests/remote.js b/test/tests/remote.js index 1490df229..165cc8214 100644 --- a/test/tests/remote.js +++ b/test/tests/remote.js @@ -63,13 +63,17 @@ describe("Remote", function() { it("can set a remote", function() { var repository = this.repository; - Remote.create(repository, "origin1", url); - Remote.setPushurl(repository, "origin1", "https://google.com/"); - - return Remote.lookup(repository, "origin1").then(function(remote) { - assert.equal(remote.pushurl(), "https://google.com/"); - }); + return Remote.create(repository, "origin1", url) + .then(function() { + return Remote.setPushurl(repository, "origin1", "https://google.com/"); + }) + .then(function() { + return Remote.lookup(repository, "origin1"); + }) + .then(function(remote) { + assert.equal(remote.pushurl(), "https://google.com/"); + }); }); it("can read the remote name", function() { @@ -78,22 +82,28 @@ describe("Remote", function() { it("can create and load a new remote", function() { var repository = this.repository; - Remote.create(repository, "origin2", url); - return Remote.lookup(repository, "origin2").then(function(remote) { - assert(remote.url(), url); - }); + return Remote.create(repository, "origin2", url) + .then(function() { + return Remote.lookup(repository, "origin2"); + }) + .then(function(remote) { + assert(remote.url(), url); + }); }); it("can delete a remote", function() { var repository = this.repository; - Remote.create(repository, "origin3", url); - return Remote.delete(repository, "origin3") + return Remote.create(repository, "origin3", url) .then(function() { - return Remote.lookup(repository, "origin3"); + return Remote.delete(repository, "origin3"); }) - .then(Promise.reject.bind(Promise), Promise.resolve.bind(Promise)); + .then(function() { + return Remote.lookup(repository, "origin3") + // We only want to catch the failed lookup + .then(Promise.reject.bind(Promise), Promise.resolve.bind(Promise)); + }); }); it("can download from a remote", function() { @@ -124,9 +134,7 @@ describe("Remote", function() { var repo = this.repository; var wasCalled = false; - Remote.create(repo, "test2", url2); - - return repo.getRemote("test2") + return Remote.create(repo, "test2", url2) .then(function(remote) { var fetchOpts = { callbacks: { @@ -183,7 +191,6 @@ describe("Remote", function() { it("can fetch from a private repository", function() { var repo = this.repository; - var remote = Remote.create(repo, "private", privateUrl); var fetchOptions = { callbacks: { credentials: function(url, userName) { @@ -200,7 +207,10 @@ describe("Remote", function() { } }; - return remote.fetch(null, fetchOptions, "Fetch from private") + return Remote.create(repo, "private", privateUrl) + .then(function(remote) { + return remote.fetch(null, fetchOptions, "Fetch from private"); + }) .catch(function() { assert.fail("Unable to fetch from private repository"); }); @@ -209,7 +219,6 @@ describe("Remote", function() { it("can reject fetching from private repository without valid credentials", function() { var repo = this.repository; - var remote = Remote.create(repo, "private", privateUrl); var firstPass = true; var fetchOptions = { callbacks: { @@ -225,7 +234,10 @@ describe("Remote", function() { } }; - return remote.fetch(null, fetchOptions, "Fetch from private") + return Remote.create(repo, "private", privateUrl) + .then(function(remote) { + return remote.fetch(null, fetchOptions, "Fetch from private"); + }) .then(function () { assert.fail("Should not be able to fetch from repository"); }) @@ -240,19 +252,23 @@ describe("Remote", function() { it("can fetch from all remotes", function() { var repository = this.repository; - Remote.create(repository, "test1", url); - Remote.create(repository, "test2", url2); - return repository.fetchAll({ - callbacks: { - credentials: function(url, userName) { - return NodeGit.Cred.sshKeyFromAgent(userName); - }, - certificateCheck: function() { - return 1; - } - } - }); + return Remote.create(repository, "test1", url) + .then(function() { + return Remote.create(repository, "test2", url2); + }) + .then(function() { + return repository.fetchAll({ + callbacks: { + credentials: function(url, userName) { + return NodeGit.Cred.sshKeyFromAgent(userName); + }, + certificateCheck: function() { + return 1; + } + } + }); + }); }); it("will reject if credentials promise rejects", function() { From 1cd6320d2a3b605262d2bc9cfd79184134d813a2 Mon Sep 17 00:00:00 2001 From: John Haley Date: Sat, 26 Mar 2016 16:43:54 -0700 Subject: [PATCH 07/61] Make index methods async Anytime the index reads/writes to the disk it should be non-blocking. Additionally this will give us thread safety protection since async methods are piped through the `LockManager` --- examples/merge-cleanly.js | 28 +++++++---- examples/merge-with-conflicts.js | 51 +++++++++++-------- examples/push.js | 11 +++-- examples/remove-and-commit.js | 4 +- generate/input/descriptor.json | 84 +++++++++++++++++++++++++++++++- lib/repository.js | 19 +++++--- 6 files changed, 154 insertions(+), 43 deletions(-) diff --git a/examples/merge-cleanly.js b/examples/merge-cleanly.js index 94af29df6..81a5a54c4 100644 --- a/examples/merge-cleanly.js +++ b/examples/merge-cleanly.js @@ -46,10 +46,13 @@ fse.remove(path.resolve(__dirname, repoDir)) return repository.refreshIndex(); }) .then(function(index) { - index.addByPath(ourFileName); - index.write(); - - return index.writeTree(); + return index.addByPath(ourFileName) + .then(function() { + return index.write(); + }) + .then(function() { + return index.writeTree(); + }); }) .then(function(oid) { return repository.createCommit("HEAD", ourSignature, @@ -81,10 +84,13 @@ fse.remove(path.resolve(__dirname, repoDir)) return repository.refreshIndex(); }) .then(function(index) { - index.addByPath(theirFileName); - index.write(); - - return index.writeTree(); + return index.addByPath(theirFileName) + .then(function() { + return index.write(); + }) + .then(funcion() { + return index.writeTree(); + }); }) .then(function(oid) { // You don"t have to change head to make a commit to a different branch. @@ -110,8 +116,10 @@ fse.remove(path.resolve(__dirname, repoDir)) // the repository instead of just writing it. .then(function(index) { if (!index.hasConflicts()) { - index.write(); - return index.writeTreeTo(repository); + return index.write() + .then(function() { + return index.writeTreeTo(repository); + }); } }) diff --git a/examples/merge-with-conflicts.js b/examples/merge-with-conflicts.js index 3320e2f6c..13e07c8d5 100644 --- a/examples/merge-with-conflicts.js +++ b/examples/merge-with-conflicts.js @@ -52,10 +52,13 @@ fse.remove(path.resolve(__dirname, repoDir)) return repository.refreshIndex(); }) .then(function(index) { - index.addByPath(fileName); - index.write(); - - return index.writeTree(); + return index.addByPath(fileName) + .then(function() { + return index.write(); + }) + .then(function() { + return index.writeTree(); + }); }) .then(function(oid) { return repository.createCommit("HEAD", baseSignature, @@ -95,10 +98,13 @@ fse.remove(path.resolve(__dirname, repoDir)) .then(function() { return repository.refreshIndex() .then(function(index) { - index.addByPath(fileName); - index.write(); - - return index.writeTree(); + return index.addByPath(fileName) + .then(function() { + return index.write(); + }) + .then(function() { + return index.writeTree(); + }); }); }) .then(function(oid) { @@ -120,11 +126,15 @@ fse.remove(path.resolve(__dirname, repoDir)) ); }) .then(function() { - return repository.refreshIndex().then(function(index) { - index.addByPath(fileName); - index.write(); - - return index.writeTree(); + return repository.refreshIndex() + .then(function(index) { + return index.addByPath(fileName) + .then(function() { + return index.write(); + }) + .then(function() { + return index.writeTree(); + }); }); }) .then(function(oid) { @@ -170,12 +180,15 @@ fse.remove(path.resolve(__dirname, repoDir)) // we need to get a new index as the other one isnt backed to // the repository in the usual fashion, and just behaves weirdly .then(function() { - return repository.refreshIndex().then(function(index) { - - index.addByPath(fileName); - index.write(); - - return index.writeTree(); + return repository.refreshIndex() + .then(function(index) { + return index.addByPath(fileName) + .then(function() { + return index.write(); + }) + .then(function() { + return index.writeTree(); + }); }); }) .then(function(oid) { diff --git a/examples/push.js b/examples/push.js index 70a533b21..ac340820f 100644 --- a/examples/push.js +++ b/examples/push.js @@ -33,10 +33,13 @@ fse.remove(path.resolve(__dirname, repoDir)) return repository.refreshIndex(); }) .then(function(index) { - index.addByPath(fileName); - index.write(); - - return index.writeTree(); + return index.addByPath(fileName) + .then(function() { + return index.write(); + }) + .then(function() { + return index.writeTree(); + }); }) .then(function(oid) { return repository.createCommit("HEAD", signature, signature, diff --git a/examples/remove-and-commit.js b/examples/remove-and-commit.js index c321d1715..10751f061 100644 --- a/examples/remove-and-commit.js +++ b/examples/remove-and-commit.js @@ -24,7 +24,9 @@ nodegit.Repository.open(path.resolve(__dirname, "../.git")) }) .then(function() { //remove the file from the index... - _index.removeByPath(fileName); + return _index.removeByPath(fileName); + }) + .then(function() { return _index.write(); }) .then(function() { diff --git a/generate/input/descriptor.json b/generate/input/descriptor.json index 2b8a32756..01e2bff38 100644 --- a/generate/input/descriptor.json +++ b/generate/input/descriptor.json @@ -959,6 +959,12 @@ }, "index": { "functions": { + "git_index_add": { + "isAsync": true, + "return": { + "isErrorCode": true + } + }, "git_index_add_all": { "args": { "pathspec": { @@ -979,8 +985,25 @@ "git_index_add_frombuffer": { "ignore": true }, - "git_index_conflict_get": { + "git_index_clear": { + "isAsync": true, + "return": { + "isErrorCode": true + } + }, + "git_index_conflict_add": { "isAsync": true, + "return": { + "isErrorCode": true + } + }, + "git_index_conflict_cleanup": { + "isAsync": true, + "return": { + "isErrorCode": true + } + }, + "git_index_conflict_get": { "args": { "ancestor_out": { "isReturn": true @@ -992,6 +1015,13 @@ "isReturn": true } }, + "isAsync": true, + "return": { + "isErrorCode": true + } + }, + "git_index_conflict_remove": { + "isAsync": true, "return": { "isErrorCode": true } @@ -1024,11 +1054,33 @@ "git_index_new": { "ignore": true }, + "git_index_open": { + "isAsync": true, + "return": { + "isErrorCode": true + } + }, "git_index_read": { "args": { "force": { "isOptional": true } + }, + "isAsync": true, + "return": { + "isErrorCode": true + } + }, + "git_index_read_tree": { + "isAsync": true, + "return": { + "isErrorCode": true + } + }, + "git_index_remove": { + "isAsync": true, + "return": { + "isErrorCode": true } }, "git_index_remove_all": { @@ -1048,6 +1100,18 @@ "isErrorCode": true } }, + "git_index_remove_bypath": { + "isAsync": true, + "return": { + "isErrorCode": true + } + }, + "git_index_remove_directory": { + "isAsync": true, + "return": { + "isErrorCode": true + } + }, "git_index_update_all": { "args": { "pathspec": { @@ -1070,7 +1134,23 @@ "force": { "isOptional": true } - } + }, + "isAsync": true, + "return": { + "isErrorCode": true + } + }, + "git_index_write_tree": { + "isAsync": true, + "return": { + "isErrorCode": true + } + }, + "git_index_write_tree_to": { + "isAsync": true, + "return": { + "isErrorCode": true + } } }, "dependencies": [ diff --git a/lib/repository.js b/lib/repository.js index ade1d9ce9..7fa3d1cb0 100644 --- a/lib/repository.js +++ b/lib/repository.js @@ -535,16 +535,21 @@ Repository.prototype.createCommitOnHead = function( message, callback) { - var index; var repo = this; return repo.refreshIndex() - .then(function(index_) { - index = index_; - if (!filesToAdd) { filesToAdd = []; } - filesToAdd.forEach(function(filePath) { - index.addByPath(filePath); - }); + .then(function(index) { + if (!filesToAdd) { + filesToAdd = []; + } + + return filesToAdd + .reduce(function(lastFilePromise, filePath) { + return lastFilePromise + .then(function() { + return index.addByPath(filePath); + }); + }, Promise.resolve()); index.write(); return index.writeTree(); }) From 4c8f601880a68d96ff59d18332e2d72524c05fe0 Mon Sep 17 00:00:00 2001 From: John Haley Date: Sat, 26 Mar 2016 18:29:29 -0700 Subject: [PATCH 08/61] First round of test fixes --- examples/merge-cleanly.js | 2 +- generate/input/descriptor.json | 6 + lib/repository.js | 40 ++-- test/tests/checkout.js | 11 +- test/tests/cherrypick.js | 2 - test/tests/index.js | 4 +- test/tests/merge.js | 404 ++++++++++++++++++++------------- test/tests/rebase.js | 11 +- test/tests/revwalk.js | 17 +- test/tests/stage.js | 29 ++- test/utils/repository_setup.js | 11 +- 11 files changed, 328 insertions(+), 209 deletions(-) diff --git a/examples/merge-cleanly.js b/examples/merge-cleanly.js index 81a5a54c4..c338cb90f 100644 --- a/examples/merge-cleanly.js +++ b/examples/merge-cleanly.js @@ -88,7 +88,7 @@ fse.remove(path.resolve(__dirname, repoDir)) .then(function() { return index.write(); }) - .then(funcion() { + .then(function() { return index.writeTree(); }); }) diff --git a/generate/input/descriptor.json b/generate/input/descriptor.json index 01e2bff38..623ad030c 100644 --- a/generate/input/descriptor.json +++ b/generate/input/descriptor.json @@ -982,6 +982,12 @@ "isErrorCode": true } }, + "git_index_add_bypath": { + "isAsync": true, + "return": { + "isErrorCode": true + } + }, "git_index_add_frombuffer": { "ignore": true }, diff --git a/lib/repository.js b/lib/repository.js index 7fa3d1cb0..234166722 100644 --- a/lib/repository.js +++ b/lib/repository.js @@ -549,9 +549,13 @@ Repository.prototype.createCommitOnHead = function( .then(function() { return index.addByPath(filePath); }); - }, Promise.resolve()); - index.write(); - return index.writeTree(); + }, Promise.resolve()) + .then(function() { + return index.write(); + }) + .then(function() { + return index.writeTree(); + }); }) .then(function(treeOid) { return repo.getHeadCommit() @@ -854,7 +858,6 @@ Repository.prototype.mergeBranches = } // No conflicts so just go ahead with the merge - index.write(); return index.writeTreeTo(repo); }) .then(function(oid) { @@ -1292,15 +1295,20 @@ Repository.prototype.stageFilemode = function(filePath, stageNew) { return Promise.reject("No differences found for this file."); } - pathPatches.forEach(function(pathPatch) { - var entry = index.getByPath(pathPatch.newFile().path(), 0); - - entry.mode = stageNew ? - pathPatch.newFile().mode() : pathPatch.oldFile().mode(); + return pathPatches + .reduce(function(lastIndexAddPromise, pathPatch) { + var entry = index.getByPath(pathPatch.newFile().path(), 0); - index.add(entry); - }); + entry.mode = stageNew ? + pathPatch.newFile().mode() : pathPatch.oldFile().mode(); + return lastIndexAddPromise + .then(function() { + return index.add(entry); + }); + }, Promise.resolve()); + }) + .then(function() { return index.write(); }); }; @@ -1461,8 +1469,10 @@ Repository.prototype.stageLines = !pathPatch[0].isTypeChange(); } if (emptyPatch) { - index.addByPath(filePath); - return index.write(); + return index.addByPath(filePath) + .then(function() { + return index.write(); + }); } else { return result; } @@ -1514,7 +1524,9 @@ Repository.prototype.stageLines = entry.path = filePath; entry.fileSize = newBlob.content().length; - index.add(entry); + return index.add(entry); + }) + .then(function() { return index.write(); }) .then(function(result) { diff --git a/test/tests/checkout.js b/test/tests/checkout.js index cc510f304..cdde973ed 100644 --- a/test/tests/checkout.js +++ b/test/tests/checkout.js @@ -128,10 +128,13 @@ describe("Checkout", function() { return test.repository.refreshIndex() .then(function(index) { - index.addByPath(packageJsonName); - index.write(); - - return index.writeTree(); + return index.addByPath(packageJsonName) + .then(function() { + return index.write(); + }) + .then(function() { + return index.writeTree(); + }); }); }) .then(function(oid) { diff --git a/test/tests/cherrypick.js b/test/tests/cherrypick.js index 325fd410b..e4f2ca7e4 100644 --- a/test/tests/cherrypick.js +++ b/test/tests/cherrypick.js @@ -75,8 +75,6 @@ describe("Cherrypick", function() { }) .then(function(index) { assert(index); - index.write(); - return index.writeTreeTo(repo); }) .then(function(oid) { diff --git a/test/tests/index.js b/test/tests/index.js index bac0d7e34..aba18fa60 100644 --- a/test/tests/index.js +++ b/test/tests/index.js @@ -80,7 +80,7 @@ describe("Index", function() { })); }) .then(function() { - index.clear(); + return index.clear(); }); }); @@ -131,7 +131,7 @@ describe("Index", function() { })); }) .then(function() { - index.clear(); + return index.clear(); }); }); diff --git a/test/tests/merge.js b/test/tests/merge.js index 4af1f91cf..3a63b0ced 100644 --- a/test/tests/merge.js +++ b/test/tests/merge.js @@ -44,11 +44,14 @@ describe("Merge", function() { ourFileContent) // Load up the repository index and make our initial commit to HEAD .then(function() { - return repository.refreshIndex() - .then(function(index) { - index.addByPath(ourFileName); - index.write(); - + return repository.refreshIndex(); + }) + .then(function(index) { + return index.addByPath(ourFileName) + .then(function() { + return index.write(); + }) + .then(function() { return index.writeTree(); }); }) @@ -79,11 +82,14 @@ describe("Merge", function() { theirFileContent); }) .then(function() { - return repository.refreshIndex() - .then(function(index) { - index.addByPath(theirFileName); - index.write(); - + return repository.refreshIndex(); + }) + .then(function(index) { + return index.addByPath(theirFileName) + .then(function() { + return index.write(); + }) + .then(function() { return index.writeTree(); }); }) @@ -107,7 +113,6 @@ describe("Merge", function() { }) .then(function(index) { assert(!index.hasConflicts()); - index.write(); return index.writeTreeTo(repository); }) .then(function(oid) { @@ -147,13 +152,16 @@ describe("Merge", function() { ourFileContent) // Load up the repository index and make our initial commit to HEAD .then(function() { - return repository.refreshIndex() - .then(function(index) { - index.addByPath(ourFileName); - index.write(); - - return index.writeTree(); - }); + return repository.refreshIndex(); + }) + .then(function(index) { + return index.addByPath(ourFileName) + .then(function() { + return index.write(); + }) + .then(function() { + return index.writeTree(); + }); }) .then(function(oid) { assert.equal(oid.toString(), @@ -182,13 +190,16 @@ describe("Merge", function() { theirFileContent); }) .then(function() { - return repository.refreshIndex() - .then(function(index) { - index.addByPath(theirFileName); - index.write(); - - return index.writeTree(); - }); + return repository.refreshIndex(); + }) + .then(function(index) { + return index.addByPath(theirFileName) + .then(function() { + return index.write(); + }) + .then(function() { + return index.writeTree(); + }); }) .then(function(oid) { assert.equal(oid.toString(), @@ -257,13 +268,16 @@ describe("Merge", function() { ourFileContent) // Load up the repository index and make our initial commit to HEAD .then(function() { - return repository.refreshIndex() - .then(function(index) { - index.addByPath(ourFileName); - index.write(); - - return index.writeTree(); - }); + return repository.refreshIndex(); + }) + .then(function(index) { + return index.addByPath(ourFileName) + .then(function() { + return index.write(); + }) + .then(function() { + return index.writeTree(); + }); }) .then(function(oid) { assert.equal(oid.toString(), @@ -292,13 +306,16 @@ describe("Merge", function() { theirFileContent); }) .then(function() { - return repository.refreshIndex() - .then(function(index) { - index.addByPath(theirFileName); - index.write(); - - return index.writeTree(); - }); + return repository.refreshIndex(); + }) + .then(function(index) { + return index.addByPath(theirFileName) + .then(function() { + return index.write(); + }) + .then(function() { + return index.writeTree(); + }); }) .then(function(oid) { assert.equal(oid.toString(), @@ -374,13 +391,16 @@ describe("Merge", function() { initialFileContent) // Load up the repository index and make our initial commit to HEAD .then(function() { - return repository.refreshIndex() - .then(function(index) { - index.addByPath(initialFileName); - index.write(); - - return index.writeTree(); - }); + return repository.refreshIndex(); + }) + .then(function(index) { + return index.addByPath(initialFileName) + .then(function() { + return index.write(); + }) + .then(function() { + return index.writeTree(); + }); }) .then(function(oid) { assert.equal(oid.toString(), @@ -411,13 +431,16 @@ describe("Merge", function() { ourFileContent); }) .then(function() { - return repository.refreshIndex() - .then(function(index) { - index.addByPath(ourFileName); - index.write(); - - return index.writeTree(); - }); + return repository.refreshIndex(); + }) + .then(function(index) { + return index.addByPath(ourFileName) + .then(function() { + return index.write(); + }) + .then(function() { + return index.writeTree(); + }); }) .then(function(oid) { assert.equal(oid.toString(), @@ -439,13 +462,16 @@ describe("Merge", function() { theirFileContent); }) .then(function() { - return repository.refreshIndex() - .then(function(index) { - index.addByPath(theirFileName); - index.write(); - - return index.writeTree(); - }); + return repository.refreshIndex(); + }) + .then(function(index) { + return index.addByPath(theirFileName) + .then(function() { + return index.write(); + }) + .then(function() { + return index.writeTree(); + }); }) .then(function(oid) { assert.equal(oid.toString(), @@ -510,13 +536,16 @@ describe("Merge", function() { ourFileContent) // Load up the repository index and make our initial commit to HEAD .then(function() { - return repository.refreshIndex() - .then(function(index) { - index.addByPath(ourFileName); - index.write(); - - return index.writeTree(); - }); + return repository.refreshIndex(); + }) + .then(function(index) { + return index.addByPath(ourFileName) + .then(function() { + return index.write(); + }) + .then(function() { + return index.writeTree(); + }); }) .then(function(oid) { assert.equal(oid.toString(), @@ -545,13 +574,16 @@ describe("Merge", function() { theirFileContent); }) .then(function() { - return repository.refreshIndex() - .then(function(index) { - index.addByPath(theirFileName); - index.write(); - - return index.writeTree(); - }); + return repository.refreshIndex(); + }) + .then(function(index) { + return index.addByPath(theirFileName) + .then(function() { + return index.write(); + }) + .then(function() { + return index.writeTree(); + }); }) .then(function(oid) { assert.equal(oid.toString(), @@ -624,13 +656,16 @@ describe("Merge", function() { initialFileContent) // Load up the repository index and make our initial commit to HEAD .then(function() { - return repository.refreshIndex() - .then(function(index) { - index.addByPath(initialFileName); - index.write(); - - return index.writeTree(); - }); + return repository.refreshIndex(); + }) + .then(function(index) { + return index.addByPath(initialFileName) + .then(function() { + return index.write(); + }) + .then(function() { + return index.writeTree(); + }); }) .then(function(oid) { assert.equal(oid.toString(), @@ -661,13 +696,16 @@ describe("Merge", function() { ourFileContent); }) .then(function() { - return repository.refreshIndex() - .then(function(index) { - index.addByPath(ourFileName); - index.write(); - - return index.writeTree(); - }); + return repository.refreshIndex(); + }) + .then(function(index) { + return index.addByPath(ourFileName) + .then(function() { + return index.write(); + }) + .then(function() { + return index.writeTree(); + }); }) .then(function(oid) { assert.equal(oid.toString(), @@ -689,13 +727,16 @@ describe("Merge", function() { theirFileContent); }) .then(function() { - return repository.refreshIndex() - .then(function(index) { - index.addByPath(theirFileName); - index.write(); - - return index.writeTree(); - }); + return repository.refreshIndex(); + }) + .then(function(index) { + return index.addByPath(theirFileName) + .then(function() { + return index.write(); + }) + .then(function() { + return index.writeTree(); + }); }) .then(function(oid) { assert.equal(oid.toString(), @@ -762,13 +803,16 @@ describe("Merge", function() { initialFileContent) // Load up the repository index and make our initial commit to HEAD .then(function() { - return repository.refreshIndex() - .then(function(index) { - index.addByPath(initialFileName); - index.write(); - - return index.writeTree(); - }); + return repository.refreshIndex(); + }) + .then(function(index) { + return index.addByPath(initialFileName) + .then(function() { + return index.write(); + }) + .then(function() { + return index.writeTree(); + }); }) .then(function(oid) { assert.equal(oid.toString(), @@ -799,13 +843,16 @@ describe("Merge", function() { ourFileContent); }) .then(function() { - return repository.refreshIndex() - .then(function(index) { - index.addByPath(ourFileName); - index.write(); - - return index.writeTree(); - }); + return repository.refreshIndex(); + }) + .then(function(index) { + return index.addByPath(ourFileName) + .then(function() { + return index.write(); + }) + .then(function() { + return index.writeTree(); + }); }) .then(function(oid) { assert.equal(oid.toString(), @@ -827,13 +874,16 @@ describe("Merge", function() { theirFileContent); }) .then(function() { - return repository.refreshIndex() - .then(function(index) { - index.addByPath(theirFileName); - index.write(); - - return index.writeTree(); - }); + return repository.refreshIndex(); + }) + .then(function(index) { + return index.addByPath(theirFileName) + .then(function() { + return index.write(); + }) + .then(function(){ + return index.writeTree(); + }); }) .then(function(oid) { assert.equal(oid.toString(), @@ -886,11 +936,14 @@ describe("Merge", function() { return fse.writeFile(path.join(repository.workdir(), fileName), baseFileContent) .then(function() { - return repository.refreshIndex() - .then(function(index) { - index.addByPath(fileName); - index.write(); - + return repository.refreshIndex(); + }) + .then(function(index) { + return index.addByPath(fileName) + .then(function() { + return index.write(); + }) + .then(function() { return index.writeTree(); }); }) @@ -927,12 +980,16 @@ describe("Merge", function() { ourFileContent); }) .then(function() { - return repository.refreshIndex().then(function(index) { - index.addByPath(fileName); - index.write(); - - return index.writeTree(); - }); + return repository.refreshIndex(); + }) + .then(function(index) { + return index.addByPath(fileName) + .then(function() { + return index.write(); + }) + .then(function() { + return index.writeTree(); + }); }) .then(function(oid) { assert.equal(oid.toString(), @@ -954,12 +1011,16 @@ describe("Merge", function() { theirFileContent); }) .then(function() { - return repository.refreshIndex().then(function(index) { - index.addByPath(fileName); - index.write(); - - return index.writeTree(); - }); + return repository.refreshIndex(); + }) + .then(function(index) { + return index.addByPath(fileName) + .then(function() { + return index.write(); + }) + .then(function() { + return index.writeTree(); + }); }) .then(function(oid) { assert.equal(oid.toString(), @@ -991,12 +1052,16 @@ describe("Merge", function() { finalFileContent); }) .then(function() { - return repository.refreshIndex().then(function(index) { - index.addByPath(fileName); - index.write(); - - return index.writeTree(); - }); + return repository.refreshIndex(); + }) + .then(function(index) { + return index.addByPath(fileName) + .then(function() { + return index.write(); + }) + .then(function() { + return index.writeTree(); + }); }) .then(function(oid) { assert.equal(oid.toString(), @@ -1051,12 +1116,16 @@ describe("Merge", function() { return fse.writeFile(path.join(repository.workdir(), fileName), baseFileContent) .then(function() { - return repository.refreshIndex().then(function(index) { - index.addByPath(fileName); - index.write(); - - return index.writeTree(); - }); + return repository.refreshIndex(); + }) + .then(function(index) { + return index.addByPath(fileName) + .then(function() { + return index.write(); + }) + .then(function() { + return index.writeTree(); + }); }) .then(function(oid) { assert.equal(oid.toString(), @@ -1085,12 +1154,16 @@ describe("Merge", function() { baseFileContent + theirFileContent); }) .then(function() { - return repository.refreshIndex().then(function(index) { - index.addByPath(fileName); - index.write(); - - return index.writeTree(); - }); + return repository.refreshIndex(); + }) + .then(function(index) { + return index.addByPath(fileName) + .then(function() { + return index.write(); + }) + .then(function() { + return index.writeTree(); + }); }) .then(function(oid) { assert.equal(oid.toString(), @@ -1107,12 +1180,16 @@ describe("Merge", function() { baseFileContent + ourFileContent); }) .then(function() { - return repository.refreshIndex().then(function(index) { - index.addByPath(fileName); - index.write(); - - return index.writeTree(); - }); + return repository.refreshIndex(); + }) + .then(function(index) { + return index.addByPath(fileName) + .then(function() { + return index.write(); + }) + .then(function() { + return index.writeTree(); + }); }) .then(function(oid) { assert.equal(oid.toString(), @@ -1175,11 +1252,14 @@ describe("Merge", function() { conflictSolvedFileContent); }) .then(function() { - return repository.refreshIndex() - .then(function(index) { - index.addByPath(fileName); - index.write(); - + return repository.refreshIndex(); + }) + .then(function(index) { + return index.addByPath(fileName) + .then(function() { + return index.write(); + }) + .then(function() { return index.writeTree(); }); }) diff --git a/test/tests/rebase.js b/test/tests/rebase.js index adf325080..f40d73621 100644 --- a/test/tests/rebase.js +++ b/test/tests/rebase.js @@ -15,10 +15,13 @@ describe("Rebase", function() { var removeFileFromIndex = function(repository, fileName) { return repository.refreshIndex() .then(function(index) { - index.removeByPath(fileName); - index.write(); - - return index.writeTree(); + return index.removeByPath(fileName) + .then(function() { + return index.write(); + }) + .then(function() { + return index.writeTree(); + }); }); }; diff --git a/test/tests/revwalk.js b/test/tests/revwalk.js index 6400bf899..96bb736c8 100644 --- a/test/tests/revwalk.js +++ b/test/tests/revwalk.js @@ -253,12 +253,17 @@ describe("Revwalk", function() { ); }) .then(function() { - return repo.refreshIndex() - .then(function(index) { - index.addByPath(fileNameB); - index.removeByPath(fileNameA); - index.write(); - + return repo.refreshIndex(); + }) + .then(function(index) { + return index.addByPath(fileNameB) + .then(function() { + return index.removeByPath(fileNameA); + }) + .then(function() { + return index.write(); + }) + .then(function() { return index.writeTree(); }); }) diff --git a/test/tests/stage.js b/test/tests/stage.js index d88e65139..1b59e898d 100644 --- a/test/tests/stage.js +++ b/test/tests/stage.js @@ -302,8 +302,8 @@ describe("Stage", function() { .then(function() { return test.repository.refreshIndex(); }) - .then(function(repoIndex) { - index = repoIndex; + .then(function(_index) { + index = _index; return index.writeTree(); }) .then(function (oid) { @@ -345,7 +345,9 @@ describe("Stage", function() { .then(function(repoIndex) { //Now we stage the whole file... index = repoIndex; - index.addByPath(fileName); + return index.addByPath(fileName); + }) + .then(function() { return index.write(); }) .then(function() { @@ -429,13 +431,20 @@ describe("Stage", function() { })) .then(function() { // Initial commit - return test.repository.refreshIndex() - .then(function(index) { - fileName.forEach(function(file) { - index.addByPath(file); - }); - index.write(); - + return test.repository.refreshIndex(); + }) + .then(function(index) { + return fileName + .reduce(function(lastPromise, file) { + return lastPromise + .then(function() { + return index.addByPath(file); + }); + }, Promise.resolve()) + .then(function() { + return index.write(); + }) + .then(function() { return index.writeTree(); }); }) diff --git a/test/utils/repository_setup.js b/test/utils/repository_setup.js index 8a6319af6..c5d6ab3e2 100644 --- a/test/utils/repository_setup.js +++ b/test/utils/repository_setup.js @@ -9,10 +9,13 @@ var RepositorySetup = { function addFileToIndex(repository, fileName) { return repository.refreshIndex() .then(function(index) { - index.addByPath(fileName); - index.write(); - - return index.writeTree(); + return index.addByPath(fileName) + .then(function() { + return index.write(); + }) + .then(function() { + return index.writeTree(); + }); }); }, From 367e0532765053c85bff4348397860011d8bf46f Mon Sep 17 00:00:00 2001 From: John Haley Date: Fri, 8 Apr 2016 11:22:27 -0700 Subject: [PATCH 09/61] Fix "commit on head on empty repo with createCommitOnHead" test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit So this test was never valid ¯\_(ツ)_/¯ You can't call `Index#addByPath` with an absolute path which was what was happening. Since the method was sync the result was considered the actual result of the call and not the error code so this error was never caught. Now that the function is async, that result is correctly interpretted and the test failed correctly. Changing this test to use the relative path fixes the test. --- test/tests/repository.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/tests/repository.js b/test/tests/repository.js index a0635041d..003bc92d8 100644 --- a/test/tests/repository.js +++ b/test/tests/repository.js @@ -259,7 +259,7 @@ describe("Repository", function() { return fse.writeFile(filePath, fileContent) .then(function() { return repo.createCommitOnHead( - [filePath], + [fileName], authSig, commitSig, commitMsg From e9585628db9e292ffc263cd54be02c43bd7a5418 Mon Sep 17 00:00:00 2001 From: John Haley Date: Fri, 8 Apr 2016 11:22:36 -0700 Subject: [PATCH 10/61] Fix some formatting --- test/tests/repository.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/test/tests/repository.js b/test/tests/repository.js index 003bc92d8..307c52ee3 100644 --- a/test/tests/repository.js +++ b/test/tests/repository.js @@ -266,13 +266,13 @@ describe("Repository", function() { ); }) .then(function(oidResult) { - return repo.getHeadCommit() - .then(function(commit) { - assert.equal( - commit.toString(), - oidResult.toString() - ); - }); + return repo.getHeadCommit() + .then(function(commit) { + assert.equal( + commit.toString(), + oidResult.toString() + ); + }); }); }); From 615ef49f95eaa4ea81434c1d504e55aa9b3fd662 Mon Sep 17 00:00:00 2001 From: John Haley Date: Fri, 8 Apr 2016 12:19:49 -0700 Subject: [PATCH 11/61] Fix staging tests Writing an index to disk is now async and no longer returns it's result code. Instead of checking for `0` we can just handle the error callback/rejected promise case. --- test/tests/stage.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/tests/stage.js b/test/tests/stage.js index 1b59e898d..c1b9588d7 100644 --- a/test/tests/stage.js +++ b/test/tests/stage.js @@ -142,8 +142,7 @@ describe("Stage", function() { }); return test.repository.stageLines(fileName, linesToStage, !staging); }) - .then(function(stageResult) { - assert.equal(stageResult, 0); + .then(function() { return test.repository.refreshIndex(); }) .then(function(reloadedIndex) { From a0fb5d42963295f5842091be035f84816dcbbf6d Mon Sep 17 00:00:00 2001 From: John Haley Date: Fri, 8 Apr 2016 16:06:07 -0700 Subject: [PATCH 12/61] Sorted things in `descriptor.json` alphabetically --- generate/input/descriptor.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/generate/input/descriptor.json b/generate/input/descriptor.json index 623ad030c..68bc7e683 100644 --- a/generate/input/descriptor.json +++ b/generate/input/descriptor.json @@ -1026,12 +1026,6 @@ "isErrorCode": true } }, - "git_index_conflict_remove": { - "isAsync": true, - "return": { - "isErrorCode": true - } - }, "git_index_conflict_iterator_free": { "ignore": true }, @@ -1041,6 +1035,12 @@ "git_index_conflict_next": { "ignore": true }, + "git_index_conflict_remove": { + "isAsync": true, + "return": { + "isErrorCode": true + } + }, "git_index_entrycount": { "jsFunctionName": "entryCount" }, From c861c81dcf369e4327564704950de59a81ab40da Mon Sep 17 00:00:00 2001 From: John Haley Date: Fri, 8 Apr 2016 17:25:10 -0700 Subject: [PATCH 13/61] Fix segfault in `Branch.name` The generated C++ code was freeing the out parameter because it was a string even though the string was of type `const`. Now we have a safeguard in place so we aren't freeing things that we shouldn't be in this case. --- generate/templates/filters/args_info.js | 1 + generate/templates/partials/async_function.cc | 2 +- test/tests/branch.js | 9 +++++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/generate/templates/filters/args_info.js b/generate/templates/filters/args_info.js index e2fe799d7..1382c67d6 100644 --- a/generate/templates/filters/args_info.js +++ b/generate/templates/filters/args_info.js @@ -22,6 +22,7 @@ module.exports = function(args) { arg.cArg = cArg; arg.isCppClassStringOrArray = ~["String", "Array"].indexOf(arg.cppClassName); + arg.isConst = ~arg.cType.indexOf("const "); // if we have a callback then we also need the corresponding payload for that callback if (arg.isCallbackFunction) { diff --git a/generate/templates/partials/async_function.cc b/generate/templates/partials/async_function.cc index c38066b99..7b564adb2 100644 --- a/generate/templates/partials/async_function.cc +++ b/generate/templates/partials/async_function.cc @@ -250,7 +250,7 @@ void {{ cppClassName }}::{{ cppFunctionName }}Worker::HandleOKCallback() { {%if arg.isCppClassStringOrArray %} {%if arg.freeFunctionName %} {{ arg.freeFunctionName }}(baton->{{ arg.name }}); - {%else%} + {%elsif not arg.isConst%} free((void *)baton->{{ arg.name }}); {%endif%} {%elsif arg | isOid %} diff --git a/test/tests/branch.js b/test/tests/branch.js index cdb57a804..8e69020a8 100644 --- a/test/tests/branch.js +++ b/test/tests/branch.js @@ -68,4 +68,13 @@ describe("Branch", function() { assert.equal(upstream.shorthand(), upstreamName); }); }); + + it("can get the name of a branch", function() { + var branch = this.branch; + + return NodeGit.Branch.name(branch) + .then(function(branchNameToTest) { + assert.equal(branchNameToTest, branchName); + }); + }); }); From e15808a40f1bea622b3a69c67546ecf8740625f4 Mon Sep 17 00:00:00 2001 From: Stjepan Rajko Date: Wed, 6 Apr 2016 14:28:24 -0700 Subject: [PATCH 14/61] Factor out base class for structs / classes with cType - Separated cpyFunction from dupFunction in descriptor (since semantics are different - only affects git_oid) - Added a {{ cppFunctionName }}Traits class to start leaning more on C++ templates where possible - Assigning `free` as `freeFunctionName` for structs (since that was the previous behavior) - Extracting a number of variables and methods from class_ and struct_ combyne templates into a base class (mostly dealing with construction / destruction and memory management). This is to extend the memory management coverage that was implemented for class_ types to struct_ types. I tried to maintain a similar .h / .cc separation that we had before. --- generate/input/descriptor.json | 2 +- generate/scripts/generateNativeCode.js | 5 +- generate/scripts/helpers.js | 2 + .../manual/include/nodegit_wrapper.h | 64 ++++++++++ .../templates/manual/src/nodegit_wrapper.cc | 113 ++++++++++++++++++ generate/templates/partials/traits.h | 28 +++++ generate/templates/templates/class_content.cc | 100 +--------------- generate/templates/templates/class_header.h | 59 +++++---- .../templates/templates/struct_content.cc | 53 ++------ generate/templates/templates/struct_header.h | 21 ++-- test/tests/repository.js | 8 ++ 11 files changed, 274 insertions(+), 181 deletions(-) create mode 100644 generate/templates/manual/include/nodegit_wrapper.h create mode 100644 generate/templates/manual/src/nodegit_wrapper.cc create mode 100644 generate/templates/partials/traits.h diff --git a/generate/input/descriptor.json b/generate/input/descriptor.json index 2b8a32756..452d34770 100644 --- a/generate/input/descriptor.json +++ b/generate/input/descriptor.json @@ -1307,7 +1307,7 @@ "ignore": true }, "oid": { - "dupFunction": "git_oid_cpy", + "cpyFunction": "git_oid_cpy", "freeFunctionName": "free", "shouldAlloc": true, "functions": { diff --git a/generate/scripts/generateNativeCode.js b/generate/scripts/generateNativeCode.js index 4c43e0b04..b07004077 100644 --- a/generate/scripts/generateNativeCode.js +++ b/generate/scripts/generateNativeCode.js @@ -35,7 +35,8 @@ module.exports = function generateNativeCode() { fields: utils.readFile("templates/partials/fields.cc"), guardArguments: utils.readFile("templates/partials/guard_arguments.cc"), syncFunction: utils.readFile("templates/partials/sync_function.cc"), - fieldAccessors: utils.readFile("templates/partials/field_accessors.cc") + fieldAccessors: utils.readFile("templates/partials/field_accessors.cc"), + traits: utils.readFile("templates/partials/traits.h") }; var templates = { @@ -87,7 +88,9 @@ module.exports = function generateNativeCode() { // Attach all partials to select templates. Object.keys(partials).forEach(function(partial) { + templates.class_header.registerPartial(partial, combyne(partials[partial])); templates.class_content.registerPartial(partial, combyne(partials[partial])); + templates.struct_header.registerPartial(partial, combyne(partials[partial])); templates.struct_content.registerPartial(partial, combyne(partials[partial])); }); diff --git a/generate/scripts/helpers.js b/generate/scripts/helpers.js index 6e1f33613..ace88803b 100644 --- a/generate/scripts/helpers.js +++ b/generate/scripts/helpers.js @@ -183,6 +183,8 @@ var Helpers = { if (typeDefOverrides.freeFunctionName) { typeDef.freeFunctionName = typeDefOverrides.freeFunctionName; + } else if (typeDef.type === 'struct') { + typeDef.freeFunctionName = 'free'; } typeDef.fields = typeDef.fields || []; diff --git a/generate/templates/manual/include/nodegit_wrapper.h b/generate/templates/manual/include/nodegit_wrapper.h new file mode 100644 index 000000000..ea5277a50 --- /dev/null +++ b/generate/templates/manual/include/nodegit_wrapper.h @@ -0,0 +1,64 @@ +#ifndef NODEGIT_WRAPPER_H +#define NODEGIT_WRAPPER_H + +#include + +// the Traits template parameter supplies: +// typename cppClass - the C++ type of the NodeGit wrapper (e.g. GitRepository) +// typename cType - the C type of the libgit2 object being wrapped (e.g. git_repository) +// +// static const bool isDuplicable +// static void duplicate(cType **dest, cType *src) - duplicates src using dupFunction or cpyFunction +// +// static const bool isFreeable +// static void free(cType *raw) - frees the object using freeFunctionName + +template +class NodeGitWrapper : public Nan::ObjectWrap { +public: + // replicate Traits typedefs for ease of use + typedef typename Traits::cType cType; + typedef typename Traits::cppClass cppClass; + + // whether raw should be freed on destruction + // TODO: this should be protected but we have a few use cases that change this to + // false from the outside. I suspect it gets turned to false to avoid + // double-free problems in cases like when we pass cred objects to libgit2 + // and it frees them. We should probably be NULLing raw in that case + // (and through a method) instead of changing selfFreeing, but that's + // a separate issue. + bool selfFreeing; +protected: + cType *raw; + + // owner of the object, in the memory management sense. only populated + // when using ownedByThis, and the type doesn't have a dupFunction + // CopyablePersistentTraits are used to get the reset-on-destruct behavior. + Nan::Persistent > owner; + + static Nan::Persistent constructor_template; + + // diagnostic count of self-freeing object instances + static int SelfFreeingInstanceCount; + // diagnostic count of constructed non-self-freeing object instances + static int NonSelfFreeingConstructedCount; + + static void InitializeTemplate(v8::Local &tpl); + + NodeGitWrapper(cType *raw, bool selfFreeing, v8::Local owner); + NodeGitWrapper(const char *error); // calls ThrowError + ~NodeGitWrapper(); + + static NAN_METHOD(JSNewFunction); + + static NAN_METHOD(GetSelfFreeingInstanceCount); + static NAN_METHOD(GetNonSelfFreeingConstructedCount); + +public: + static v8::Local New(const cType *raw, bool selfFreeing, v8::Local owner = v8::Local()); + + cType *GetValue(); + void ClearValue(); +}; + +#endif diff --git a/generate/templates/manual/src/nodegit_wrapper.cc b/generate/templates/manual/src/nodegit_wrapper.cc new file mode 100644 index 000000000..e22468a99 --- /dev/null +++ b/generate/templates/manual/src/nodegit_wrapper.cc @@ -0,0 +1,113 @@ +template +NodeGitWrapper::NodeGitWrapper(typename Traits::cType *raw, bool selfFreeing, v8::Local owner) { + if (!owner.IsEmpty()) { + // if we have an owner, there are two options - either we duplicate the raw object + // (so we own the duplicate, and can self-free it) + // or we keep a handle on the owner so it doesn't get garbage collected + // while this wrapper is accessible + if(Traits::isDuplicable) { + Traits::duplicate(&this->raw, raw); + selfFreeing = true; + } else { + this->owner.Reset(owner); + this->raw = raw; + } + } else { + this->raw = raw; + } + this->selfFreeing = selfFreeing; + + if (selfFreeing) { + SelfFreeingInstanceCount++; + } else { + NonSelfFreeingConstructedCount++; + } +} + +template +NodeGitWrapper::NodeGitWrapper(const char *error) { + selfFreeing = false; + raw = NULL; + Nan::ThrowError(error); +} + +template +NodeGitWrapper::~NodeGitWrapper() { + if(Traits::isFreeable && selfFreeing) { + Traits::free(raw); + SelfFreeingInstanceCount--; + raw = NULL; + } +} + +template +NAN_METHOD(NodeGitWrapper::JSNewFunction) { + cppClass * instance; + + if (info.Length() == 0 || !info[0]->IsExternal()) { + Nan::TryCatch tryCatch; + instance = new cppClass(); + // handle the case where the default constructor is not supported + if(tryCatch.HasCaught()) { + delete instance; + tryCatch.ReThrow(); + return; + } + } else { + instance = new cppClass(static_cast( + Local::Cast(info[0])->Value()), + Nan::To(info[1]).FromJust(), + info.Length() >= 3 && !info[2].IsEmpty() && info[2]->IsObject() ? info[2]->ToObject() : Local() + ); + } + + instance->Wrap(info.This()); + info.GetReturnValue().Set(info.This()); +} + +template +v8::Local NodeGitWrapper::New(const typename Traits::cType *raw, bool selfFreeing, v8::Local owner) { + Nan::EscapableHandleScope scope; + Local argv[3] = { Nan::New((void *)raw), Nan::New(selfFreeing), owner }; + return scope.Escape( + Nan::NewInstance( + Nan::New(constructor_template), + owner.IsEmpty() ? 2 : 3, // passing an empty handle as part of the arguments causes a crash + argv + ).ToLocalChecked()); +} + +template +typename Traits::cType *NodeGitWrapper::GetValue() { + return raw; +} + +template +void NodeGitWrapper::ClearValue() { + raw = NULL; +} + +template +Nan::Persistent NodeGitWrapper::constructor_template; + +template +int NodeGitWrapper::SelfFreeingInstanceCount; + +template +int NodeGitWrapper::NonSelfFreeingConstructedCount; + +template +NAN_METHOD(NodeGitWrapper::GetSelfFreeingInstanceCount) { + info.GetReturnValue().Set(SelfFreeingInstanceCount); +} + +template +NAN_METHOD(NodeGitWrapper::GetNonSelfFreeingConstructedCount) { + info.GetReturnValue().Set(NonSelfFreeingConstructedCount); +} + +template +void NodeGitWrapper::InitializeTemplate(v8::Local &tpl) { + Nan::SetMethod(tpl, "getSelfFreeingInstanceCount", GetSelfFreeingInstanceCount); + Nan::SetMethod(tpl, "getNonSelfFreeingConstructedCount", GetNonSelfFreeingConstructedCount); +} diff --git a/generate/templates/partials/traits.h b/generate/templates/partials/traits.h new file mode 100644 index 000000000..efcc4b49a --- /dev/null +++ b/generate/templates/partials/traits.h @@ -0,0 +1,28 @@ +class {{ cppClassName }}; + +struct {{ cppClassName }}Traits { + typedef {{ cppClassName }} cppClass; + typedef {{ cType }} cType; + + static const bool isDuplicable = {{ dupFunction|toBool |or cpyFunction|toBool}}; + static void duplicate({{ cType }} **dest, {{ cType }} *src) { + {% if dupFunction %} + {{ dupFunction }}(dest, src); + {% elsif cpyFunction %} + {{ cType }} *copy = ({{ cType }} *)malloc(sizeof({{ cType }})); + {{ cpyFunction }}(copy, src); + *dest = copy; + {% else %} + Nan::ThrowError("duplicate called on {{ cppClassName }} which cannot be duplicated"); + {% endif %} + } + + static const bool isFreeable = {{ freeFunctionName | toBool}}; + static void free({{ cType }} *raw) { + {% if freeFunctionName %} + ::{{ freeFunctionName }}(raw); // :: to avoid calling this free recursively + {% else %} + Nan::ThrowError("free called on {{ cppClassName }} which cannot be freed"); + {% endif %} + } +}; diff --git a/generate/templates/templates/class_content.cc b/generate/templates/templates/class_content.cc index 4cba077f3..b8084baa6 100644 --- a/generate/templates/templates/class_content.cc +++ b/generate/templates/templates/class_content.cc @@ -11,6 +11,7 @@ extern "C" { #include "../include/lock_master.h" #include "../include/functions/copy.h" #include "../include/{{ filename }}.h" +#include "nodegit_wrapper.cc" {% each dependencies as dependency %} #include "{{ dependency }}" @@ -23,47 +24,7 @@ using namespace v8; using namespace node; {% if cType %} - {{ cppClassName }}::{{ cppClassName }}({{ cType }} *raw, bool selfFreeing, Local owner) { - if (!owner.IsEmpty()) { - // if we have an owner, there are two options - either we duplicate the raw object - // (so we own the duplicate, and can self-free it) - // or we keep a handle on the owner so it doesn't get garbage collected - // while this wrapper is accessible - {% if dupFunction %} - {% if shouldAlloc %} - this->raw = ({{ cType }} *)malloc(sizeof({{ cType }})); - {{ dupFunction }}(this->raw, raw); - {% else %} - {{ dupFunction }}(&this->raw, raw); - {% endif %} - selfFreeing = true; - {% else %} - this->owner.Reset(owner); - this->raw = raw; - {% endif %} - } else { - this->raw = raw; - } - this->selfFreeing = selfFreeing; - - if (selfFreeing) { - SelfFreeingInstanceCount++; - } else { - NonSelfFreeingConstructedCount++; - } - - } - {{ cppClassName }}::~{{ cppClassName }}() { - {% if freeFunctionName %} - if (this->selfFreeing) { - {{ freeFunctionName }}(this->raw); - SelfFreeingInstanceCount--; - - this->raw = NULL; - } - {% endif %} - // this will cause an error if you have a non-self-freeing object that also needs // to save values. Since the object that will eventually free the object has no // way of knowing to free these values. @@ -104,61 +65,13 @@ using namespace node; {% endif %} {% endeach %} - Nan::SetMethod(tpl, "getSelfFreeingInstanceCount", GetSelfFreeingInstanceCount); - Nan::SetMethod(tpl, "getNonSelfFreeingConstructedCount", GetNonSelfFreeingConstructedCount); + InitializeTemplate(tpl); Local _constructor_template = Nan::GetFunction(tpl).ToLocalChecked(); constructor_template.Reset(_constructor_template); Nan::Set(target, Nan::New("{{ jsClassName }}").ToLocalChecked(), _constructor_template); } - NAN_METHOD({{ cppClassName }}::JSNewFunction) { - - if (info.Length() == 0 || !info[0]->IsExternal()) { - {% if createFunctionName %} - return Nan::ThrowError("A new {{ cppClassName }} cannot be instantiated. Use {{ jsCreateFunctionName }} instead."); - {% else %} - return Nan::ThrowError("A new {{ cppClassName }} cannot be instantiated."); - {% endif %} - } - - {{ cppClassName }}* object = new {{ cppClassName }}(static_cast<{{ cType }} *>( - Local::Cast(info[0])->Value()), - Nan::To(info[1]).FromJust(), - info.Length() >= 3 && !info[2].IsEmpty() && info[2]->IsObject() ? info[2]->ToObject() : Local() - ); - object->Wrap(info.This()); - - info.GetReturnValue().Set(info.This()); - } - - Local {{ cppClassName }}::New(const {{ cType }} *raw, bool selfFreeing, Local owner) { - Nan::EscapableHandleScope scope; - Local argv[3] = { Nan::New((void *)raw), Nan::New(selfFreeing), owner }; - return scope.Escape( - Nan::NewInstance( - Nan::New({{ cppClassName }}::constructor_template), - owner.IsEmpty() ? 2 : 3, // passing an empty handle as part of the arguments causes a crash - argv - ).ToLocalChecked()); - } - - NAN_METHOD({{ cppClassName }}::GetSelfFreeingInstanceCount) { - info.GetReturnValue().Set(SelfFreeingInstanceCount); - } - - NAN_METHOD({{ cppClassName }}::GetNonSelfFreeingConstructedCount) { - info.GetReturnValue().Set(NonSelfFreeingConstructedCount); - } - - {{ cType }} *{{ cppClassName }}::GetValue() { - return this->raw; - } - - void {{ cppClassName }}::ClearValue() { - this->raw = NULL; - } - {% else %} void {{ cppClassName }}::InitializeComponent(Local target) { @@ -191,9 +104,8 @@ using namespace node; {% partial fields . %} -{% if not cTypeIsUndefined %} - Nan::Persistent {{ cppClassName }}::constructor_template; +{%if cType %} +// force base class template instantiation, to make sure we get all the +// methods, statics, etc. +template class NodeGitWrapper<{{ cppClassName }}Traits>; {% endif %} - -int {{ cppClassName }}::SelfFreeingInstanceCount; -int {{ cppClassName }}::NonSelfFreeingConstructedCount; diff --git a/generate/templates/templates/class_header.h b/generate/templates/templates/class_header.h index 6fc12dcd6..aff51243a 100644 --- a/generate/templates/templates/class_header.h +++ b/generate/templates/templates/class_header.h @@ -6,6 +6,7 @@ #include #include "async_baton.h" +#include "nodegit_wrapper.h" #include "promise_completion.h" extern "C" { @@ -35,23 +36,23 @@ struct {{ cType }} { using namespace node; using namespace v8; -class {{ cppClassName }} : public Nan::ObjectWrap { - public: +{%if cType %} +{%partial traits .%} +{%endif%} - static Nan::Persistent constructor_template; +class {{ cppClassName }} : public +{%if cType %} + NodeGitWrapper<{{ cppClassName }}Traits> +{%else%} + Nan::ObjectWrap +{%endif%} +{ + {%if cType %} + // grant full access to base class + friend class NodeGitWrapper<{{ cppClassName }}Traits>; + {%endif %} + public: static void InitializeComponent (Local target); - // diagnostic count of self-freeing object instances - static int SelfFreeingInstanceCount; - // diagnostic count of constructed non-self-freeing object instances - static int NonSelfFreeingConstructedCount; - - {%if cType%} - {{ cType }} *GetValue(); - void ClearValue(); - - static Local New(const {{ cType }} *raw, bool selfFreeing, Local owner = Local()); - {%endif%} - bool selfFreeing; {% each functions as function %} {% if not function.ignore %} @@ -84,15 +85,19 @@ class {{ cppClassName }} : public Nan::ObjectWrap { private: - // owner of the object, in the memory management sense. only populated - // when using ownedByThis, and the type doesn't have a dupFunction - // CopyablePersistentTraits are used to get the reset-on-destruct behavior. - {%if not dupFunction %} - Nan::Persistent > owner; - {%endif%} - {%if cType%} - {{ cppClassName }}({{ cType }} *raw, bool selfFreeing, Local owner = Local()); + {{ cppClassName }}() + : NodeGitWrapper<{{ cppClassName }}Traits>( + {% if createFunctionName %} + "A new {{ cppClassName }} cannot be instantiated. Use {{ jsCreateFunctionName }} instead." + {% else %} + "A new {{ cppClassName }} cannot be instantiated." + {% endif %} + ) + {} + {{ cppClassName }}({{ cType }} *raw, bool selfFreeing, Local owner = Local()) + : NodeGitWrapper<{{ cppClassName }}Traits>(raw, selfFreeing, owner) + {} ~{{ cppClassName }}(); {%endif%} @@ -106,10 +111,6 @@ class {{ cppClassName }} : public Nan::ObjectWrap { {% endif %} {% endeach %} - static NAN_METHOD(JSNewFunction); - static NAN_METHOD(GetSelfFreeingInstanceCount); - static NAN_METHOD(GetNonSelfFreeingConstructedCount); - {%each fields as field%} {%if not field.ignore%} static NAN_METHOD({{ field.cppFunctionName }}); @@ -186,10 +187,6 @@ class {{ cppClassName }} : public Nan::ObjectWrap { {%endif%} {%endeach%} {%endeach%} - - {%if cType%} - {{ cType }} *raw; - {%endif%} }; #endif diff --git a/generate/templates/templates/struct_content.cc b/generate/templates/templates/struct_content.cc index a5f172aec..3bb619d92 100644 --- a/generate/templates/templates/struct_content.cc +++ b/generate/templates/templates/struct_content.cc @@ -17,6 +17,7 @@ extern "C" { #include "../include/lock_master.h" #include "../include/functions/copy.h" #include "../include/{{ filename }}.h" +#include "nodegit_wrapper.cc" {% each dependencies as dependency %} #include "{{ dependency }}" @@ -28,8 +29,11 @@ using namespace std; // generated from struct_content.cc -{{ cppClassName }}::{{ cppClassName }}() { +{{ cppClassName }}::{{ cppClassName }}() : NodeGitWrapper<{{ cppClassName }}Traits>(NULL, true, v8::Local()) +{ {% if ignoreInit == true %} + // TODO: this looks like a memory leak to me - we are allocating wrappedValue + // then copying it below, but never freeing it {{ cType }}* wrappedValue = new {{ cType }}; {% else %} {{ cType }} wrappedValue = {{ cType|upper }}_INIT; @@ -38,13 +42,12 @@ using namespace std; memcpy(this->raw, &wrappedValue, sizeof({{ cType }})); this->ConstructFields(); - this->selfFreeing = true; } -{{ cppClassName }}::{{ cppClassName }}({{ cType }}* raw, bool selfFreeing) { - this->raw = raw; +{{ cppClassName }}::{{ cppClassName }}({{ cType }}* raw, bool selfFreeing, v8::Local owner) + : NodeGitWrapper<{{ cppClassName }}Traits>(raw, selfFreeing, owner) +{ this->ConstructFields(); - this->selfFreeing = selfFreeing; } {{ cppClassName }}::~{{ cppClassName }}() { @@ -59,10 +62,6 @@ using namespace std; {% endif %} {% endif %} {% endeach %} - - if (this->selfFreeing) { - free(this->raw); - } } void {{ cppClassName }}::ConstructFields() { @@ -108,41 +107,15 @@ void {{ cppClassName }}::InitializeComponent(Local target) { {% endif %} {% endeach %} + InitializeTemplate(tpl); + Local _constructor_template = Nan::GetFunction(tpl).ToLocalChecked(); constructor_template.Reset(_constructor_template); Nan::Set(target, Nan::New("{{ jsClassName }}").ToLocalChecked(), _constructor_template); } -NAN_METHOD({{ cppClassName }}::JSNewFunction) { - {{ cppClassName }}* instance; - - if (info.Length() == 0 || !info[0]->IsExternal()) { - instance = new {{ cppClassName }}(); - } - else { - instance = new {{ cppClassName }}(static_cast<{{ cType }}*>(Local::Cast(info[0])->Value()), Nan::To(info[1]).FromJust()); - } - - instance->Wrap(info.This()); - - info.GetReturnValue().Set(info.This()); -} - -Local {{ cppClassName }}::New(const {{ cType }} * raw, bool selfFreeing) { - Nan::EscapableHandleScope scope; - - Local argv[2] = { Nan::New((void *)raw), Nan::New(selfFreeing) }; - return scope.Escape(Nan::NewInstance(Nan::New({{ cppClassName }}::constructor_template), 2, argv).ToLocalChecked()); -} - -{{ cType }} *{{ cppClassName }}::GetValue() { - return this->raw; -} - -void {{ cppClassName }}::ClearValue() { - this->raw = NULL; -} - {% partial fieldAccessors . %} -Nan::Persistent {{ cppClassName }}::constructor_template; +// force base class template instantiation, to make sure we get all the +// methods, statics, etc. +template class NodeGitWrapper<{{ cppClassName }}Traits>; diff --git a/generate/templates/templates/struct_header.h b/generate/templates/templates/struct_header.h index 8a6ba17af..122a55c0a 100644 --- a/generate/templates/templates/struct_header.h +++ b/generate/templates/templates/struct_header.h @@ -7,6 +7,7 @@ #include "async_baton.h" #include "callback_wrapper.h" +#include "nodegit_wrapper.h" extern "C" { #include @@ -22,19 +23,15 @@ extern "C" { using namespace node; using namespace v8; -class {{ cppClassName }} : public Nan::ObjectWrap { +{%partial traits .%} + +class {{ cppClassName }} : public NodeGitWrapper<{{ cppClassName }}Traits> { + // grant full access to base class + friend class NodeGitWrapper<{{ cppClassName }}Traits>; public: - {{ cppClassName }}({{ cType }}* raw, bool selfFreeing); - static Nan::Persistent constructor_template; + {{ cppClassName }}({{ cType }}* raw, bool selfFreeing, v8::Local owner = Local()); static void InitializeComponent (Local target); - {{ cType }} *GetValue(); - void ClearValue(); - - static Local New(const {{ cType }} *raw, bool selfFreeing); - - bool selfFreeing; - {% each fields as field %} {% if not field.ignore %} {% if field.isCallbackFunction %} @@ -70,8 +67,6 @@ class {{ cppClassName }} : public Nan::ObjectWrap { void ConstructFields(); - static NAN_METHOD(JSNewFunction); - {% each fields as field %} {% if not field.ignore %} {% if not field.isEnum %} @@ -89,8 +84,6 @@ class {{ cppClassName }} : public Nan::ObjectWrap { {% endif %} {% endeach %} - - {{ cType }} *raw; }; #endif diff --git a/test/tests/repository.js b/test/tests/repository.js index a0635041d..6645eb82f 100644 --- a/test/tests/repository.js +++ b/test/tests/repository.js @@ -31,6 +31,14 @@ describe("Repository", function() { }); }); + it("cannot instantiate a repository", function() { + assert.throws( + function() { new Repository(); }, + undefined, + "hello" + ); + }); + it("can open a valid repository", function() { assert.ok(this.repository instanceof Repository); }); From 591a6ff52be68092f85bc2651ddb536039dcf523 Mon Sep 17 00:00:00 2001 From: Chris LaRose Date: Thu, 14 Apr 2016 00:55:56 -0700 Subject: [PATCH 15/61] Fix docstring for TreeEntry#getBlob --- lib/tree_entry.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tree_entry.js b/lib/tree_entry.js index d4309098c..f13e27a99 100644 --- a/lib/tree_entry.js +++ b/lib/tree_entry.js @@ -60,7 +60,7 @@ TreeEntry.prototype.getTree = function(callback) { }; /** - * Retrieve the tree for this entry. Make sure to call `isTree` first! + * Retrieve the blob for this entry. Make sure to call `isBlob` first! * @async * @return {Blob} */ From 3813abbf5312b35aff8a7ded65e4afe8ca2fc4d1 Mon Sep 17 00:00:00 2001 From: Adrian Sieber Date: Mon, 18 Apr 2016 18:28:30 +0000 Subject: [PATCH 16/61] Fix a typo in function call --- lib/tree.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tree.js b/lib/tree.js index c85a925bc..3f6ebb7ad 100644 --- a/lib/tree.js +++ b/lib/tree.js @@ -65,7 +65,7 @@ Tree.prototype.entryByIndex = function(i) { * @return {TreeEntry} */ Tree.prototype.entryByName = function(name) { - var entry = this.entryByname(name); + var entry = this.entryByName(name); entry.parent = this; return entry; }; From d6f0827e426f78d04c238650ff92e7a0efd1a859 Mon Sep 17 00:00:00 2001 From: Tyler Wanek Date: Mon, 18 Apr 2016 09:51:35 -0700 Subject: [PATCH 17/61] Correct index.conflictAdd to have optional parameters when you run into a conflict, sometimes one of the entries just plain old doesn't exist. An example being you create a file in 2 branches and try to merge them. They have no ancestor_entry because they were both created in their respective branches. Therefore, ancestor_entry should be null. The same can apply to our_entry and their_entry --- generate/input/descriptor.json | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/generate/input/descriptor.json b/generate/input/descriptor.json index e007440c6..76679337d 100644 --- a/generate/input/descriptor.json +++ b/generate/input/descriptor.json @@ -998,7 +998,20 @@ } }, "git_index_conflict_add": { - "isAsync": true, + "args": { + "index": { + "isSelf": true + }, + "ancestor_entry": { + "isOptional": true + }, + "our_entry": { + "isOptional": true + }, + "their_entry": { + "isOptional": true + } + }, "return": { "isErrorCode": true } From a336802a4f614d0b2b312e3ca3745cd9f1b543ca Mon Sep 17 00:00:00 2001 From: Kyle Smith Date: Tue, 19 Apr 2016 12:50:43 -0700 Subject: [PATCH 18/61] Added git_diff_merge --- generate/input/descriptor.json | 10 +++++- test/tests/diff.js | 61 +++++++++++++++++++++++++++++++++- 2 files changed, 69 insertions(+), 2 deletions(-) diff --git a/generate/input/descriptor.json b/generate/input/descriptor.json index c8e45d87f..b4577b092 100644 --- a/generate/input/descriptor.json +++ b/generate/input/descriptor.json @@ -741,7 +741,15 @@ "ignore": true }, "git_diff_merge": { - "ignore": true + "isAsync": true, + "args": { + "onto": { + "isSelf": true + } + }, + "return": { + "isErrorCode": true + } }, "git_diff_num_deltas_of_type": { "ignore": true diff --git a/test/tests/diff.js b/test/tests/diff.js index 7ce87275c..4b2cdfe33 100644 --- a/test/tests/diff.js +++ b/test/tests/diff.js @@ -1,9 +1,31 @@ var assert = require("assert"); var path = require("path"); var promisify = require("promisify-node"); +var _ = require("lodash"); var fse = promisify(require("fs-extra")); var local = path.join.bind(path, __dirname); +function getLinesFromDiff(diff) { + return diff.patches() + .then(function(patches) { + return Promise.all(_.map(patches, function(patch) { + return patch.hunks(); + })); + }) + .then(function(listsOfHunks) { + var hunks = _.flatten(listsOfHunks); + return Promise.all(_.map(hunks, function(hunk) { + return hunk.lines(); + })); + }) + .then(function(listsOfLines) { + var lines = _.flatten(listsOfLines); + return _.map(lines, function(line) { + return line.content(); + }); + }); +} + describe("Diff", function() { var NodeGit = require("../../"); var Repository = NodeGit.Repository; @@ -144,7 +166,7 @@ describe("Diff", function() { }); }); - it("can resolve individual line chages from the patch hunks", function() { + it("can resolve individual line changes from the patch hunks", function() { return this.workdirDiff.patches() .then(function(patches) { var result = []; @@ -326,6 +348,43 @@ describe("Diff", function() { }); }); + + it("can merge two diffs", function() { + var linesOfFirstDiff; + var linesOfSecondDiff; + var firstDiff = this.diff[0]; + var secondDiff; + var oid = "c88d39e70585199425b111c6a2c7fa7b4bc617ad"; + return this.repository.getCommit(oid) + .then(function(testCommit) { + return testCommit.getDiff(); + }) + .then(function(_secondDiff) { + secondDiff = _secondDiff[0]; + return Promise.all([ + getLinesFromDiff(firstDiff), + getLinesFromDiff(secondDiff) + ]); + }) + .then(function(listOfLines) { + linesOfFirstDiff = listOfLines[0]; + linesOfSecondDiff = listOfLines[1]; + return firstDiff.merge(secondDiff); + }) + .then(function() { + return getLinesFromDiff(firstDiff); + }) + .then(function(linesOfMergedDiff) { + var allDiffLines = _.flatten([ + linesOfFirstDiff, + linesOfSecondDiff + ]); + _.forEach(allDiffLines, function(diffLine) { + assert.ok(_.includes(linesOfMergedDiff, diffLine)); + }); + }); + }); + // This wasn't working before. It was only passing because the promise chain // was broken it.skip("can find similar files in a diff", function() { From 0d950eae460540684d8594931954a3b88278d8a4 Mon Sep 17 00:00:00 2001 From: Chris Bargren Date: Mon, 28 Mar 2016 10:45:46 -0700 Subject: [PATCH 19/61] Removing libgit2 as a submodule libgit2 isn't an actual submodule so this just causes problems --- .gitmodules | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 .gitmodules diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index ca6a48f0b..000000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "vendor/libgit2"] - path = vendor/libgit2 - url = git://github.com/libgit2/libgit2.git From 94f7579442ec64e49b2199cace2ba07130d977d9 Mon Sep 17 00:00:00 2001 From: John Haley Date: Mon, 28 Mar 2016 11:51:45 -0700 Subject: [PATCH 20/61] Beautifly v0.23.4.json --- generate/input/v0.23.4.json | 35221 +++++++++++++++++++++++++++++++++- 1 file changed, 35220 insertions(+), 1 deletion(-) diff --git a/generate/input/v0.23.4.json b/generate/input/v0.23.4.json index fc90801b6..71acf27a0 100644 --- a/generate/input/v0.23.4.json +++ b/generate/input/v0.23.4.json @@ -1 +1,35220 @@ -{"files":[{"file":"annotated_commit.h","functions":["git_annotated_commit_from_ref","git_annotated_commit_from_fetchhead","git_annotated_commit_lookup","git_annotated_commit_from_revspec","git_annotated_commit_id","git_annotated_commit_free"],"meta":{},"lines":112},{"file":"attr.h","functions":["git_attr_value","git_attr_get","git_attr_get_many","git_attr_foreach","git_attr_cache_flush","git_attr_add_macro"],"meta":{},"lines":240},{"file":"blame.h","functions":["git_blame_init_options","git_blame_get_hunk_count","git_blame_get_hunk_byindex","git_blame_get_hunk_byline","git_blame_file","git_blame_buffer","git_blame_free"],"meta":{},"lines":207},{"file":"blob.h","functions":["git_blob_lookup","git_blob_lookup_prefix","git_blob_free","git_blob_id","git_blob_owner","git_blob_rawcontent","git_blob_rawsize","git_blob_filtered_content","git_blob_create_fromworkdir","git_blob_create_fromdisk","git_blob_create_fromchunks","git_blob_create_frombuffer","git_blob_is_binary"],"meta":{},"lines":217},{"file":"branch.h","functions":["git_branch_create","git_branch_create_from_annotated","git_branch_delete","git_branch_iterator_new","git_branch_next","git_branch_iterator_free","git_branch_move","git_branch_lookup","git_branch_name","git_branch_upstream","git_branch_set_upstream","git_branch_is_head"],"meta":{},"lines":246},{"file":"buffer.h","functions":["git_buf_free","git_buf_grow","git_buf_set","git_buf_is_binary","git_buf_contains_nul"],"meta":{},"lines":122},{"file":"checkout.h","functions":["git_checkout_notify_cb","git_checkout_progress_cb","git_checkout_perfdata_cb","git_checkout_init_options","git_checkout_head","git_checkout_index","git_checkout_tree"],"meta":{},"lines":354},{"file":"cherrypick.h","functions":["git_cherrypick_init_options","git_cherrypick_commit","git_cherrypick"],"meta":{},"lines":84},{"file":"clone.h","functions":["git_remote_create_cb","git_repository_create_cb","git_clone_init_options","git_clone"],"meta":{},"lines":203},{"file":"commit.h","functions":["git_commit_lookup","git_commit_lookup_prefix","git_commit_free","git_commit_id","git_commit_owner","git_commit_message_encoding","git_commit_message","git_commit_message_raw","git_commit_summary","git_commit_time","git_commit_time_offset","git_commit_committer","git_commit_author","git_commit_raw_header","git_commit_tree","git_commit_tree_id","git_commit_parentcount","git_commit_parent","git_commit_parent_id","git_commit_nth_gen_ancestor","git_commit_header_field","git_commit_create","git_commit_create_v","git_commit_amend"],"meta":{},"lines":364},{"file":"common.h","functions":["git_libgit2_version","git_libgit2_features","git_libgit2_opts"],"meta":{},"lines":245},{"file":"config.h","functions":["git_config_entry_free","git_config_find_global","git_config_find_xdg","git_config_find_system","git_config_open_default","git_config_new","git_config_add_file_ondisk","git_config_open_ondisk","git_config_open_level","git_config_open_global","git_config_snapshot","git_config_free","git_config_get_entry","git_config_get_int32","git_config_get_int64","git_config_get_bool","git_config_get_path","git_config_get_string","git_config_get_string_buf","git_config_get_multivar_foreach","git_config_multivar_iterator_new","git_config_next","git_config_iterator_free","git_config_set_int32","git_config_set_int64","git_config_set_bool","git_config_set_string","git_config_set_multivar","git_config_delete_entry","git_config_delete_multivar","git_config_foreach","git_config_iterator_new","git_config_iterator_glob_new","git_config_foreach_match","git_config_get_mapped","git_config_lookup_map_value","git_config_parse_bool","git_config_parse_int32","git_config_parse_int64","git_config_parse_path","git_config_backend_foreach_match"],"meta":{},"lines":691},{"file":"cred_helpers.h","functions":["git_cred_userpass"],"meta":{},"lines":48},{"file":"describe.h","functions":["git_describe_commit","git_describe_workdir","git_describe_format","git_describe_result_free"],"meta":{},"lines":158},{"file":"diff.h","functions":["git_diff_notify_cb","git_diff_init_options","git_diff_file_cb","git_diff_binary_cb","git_diff_hunk_cb","git_diff_line_cb","git_diff_find_init_options","git_diff_free","git_diff_tree_to_tree","git_diff_tree_to_index","git_diff_index_to_workdir","git_diff_tree_to_workdir","git_diff_tree_to_workdir_with_index","git_diff_merge","git_diff_find_similar","git_diff_num_deltas","git_diff_num_deltas_of_type","git_diff_get_delta","git_diff_is_sorted_icase","git_diff_foreach","git_diff_status_char","git_diff_print","git_diff_blobs","git_diff_blob_to_buffer","git_diff_buffers","git_diff_get_stats","git_diff_stats_files_changed","git_diff_stats_insertions","git_diff_stats_deletions","git_diff_stats_to_buf","git_diff_stats_free","git_diff_format_email","git_diff_commit_as_email","git_diff_format_email_init_options"],"meta":{},"lines":1301},{"file":"errors.h","functions":["giterr_last","giterr_clear","giterr_detach","giterr_set_str","giterr_set_oom"],"meta":{},"lines":160},{"file":"filter.h","functions":["git_filter_list_load","git_filter_list_contains","git_filter_list_apply_to_data","git_filter_list_apply_to_file","git_filter_list_apply_to_blob","git_filter_list_stream_data","git_filter_list_stream_file","git_filter_list_stream_blob","git_filter_list_free"],"meta":{},"lines":210},{"file":"global.h","functions":["git_libgit2_init","git_libgit2_shutdown"],"meta":{},"lines":39},{"file":"graph.h","functions":["git_graph_ahead_behind","git_graph_descendant_of"],"meta":{},"lines":51},{"file":"ignore.h","functions":["git_ignore_add_rule","git_ignore_clear_internal_rules","git_ignore_path_is_ignored"],"meta":{},"lines":74},{"file":"index.h","functions":["git_index_matched_path_cb","git_index_open","git_index_new","git_index_free","git_index_owner","git_index_caps","git_index_set_caps","git_index_read","git_index_write","git_index_path","git_index_checksum","git_index_read_tree","git_index_write_tree","git_index_write_tree_to","git_index_entrycount","git_index_clear","git_index_get_byindex","git_index_get_bypath","git_index_remove","git_index_remove_directory","git_index_add","git_index_entry_stage","git_index_entry_is_conflict","git_index_add_bypath","git_index_add_frombuffer","git_index_remove_bypath","git_index_add_all","git_index_remove_all","git_index_update_all","git_index_find","git_index_conflict_add","git_index_conflict_get","git_index_conflict_remove","git_index_conflict_cleanup","git_index_has_conflicts","git_index_conflict_iterator_new","git_index_conflict_next","git_index_conflict_iterator_free"],"meta":{},"lines":755},{"file":"indexer.h","functions":["git_indexer_new","git_indexer_append","git_indexer_commit","git_indexer_hash","git_indexer_free"],"meta":{},"lines":72},{"file":"merge.h","functions":["git_merge_file_init_input","git_merge_file_init_options","git_merge_init_options","git_merge_analysis","git_merge_base","git_merge_bases","git_merge_base_many","git_merge_bases_many","git_merge_base_octopus","git_merge_file","git_merge_file_from_index","git_merge_file_result_free","git_merge_trees","git_merge_commits","git_merge"],"meta":{},"lines":547},{"file":"message.h","functions":["git_message_prettify"],"meta":{},"lines":39},{"file":"net.h","functions":["git_headlist_cb"],"meta":{},"lines":55},{"file":"notes.h","functions":["git_note_foreach_cb","git_note_iterator_new","git_note_iterator_free","git_note_next","git_note_read","git_note_author","git_note_committer","git_note_message","git_note_id","git_note_create","git_note_remove","git_note_free","git_note_foreach"],"meta":{},"lines":213},{"file":"object.h","functions":["git_object_lookup","git_object_lookup_prefix","git_object_lookup_bypath","git_object_id","git_object_short_id","git_object_type","git_object_owner","git_object_free","git_object_type2string","git_object_string2type","git_object_typeisloose","git_object__size","git_object_peel","git_object_dup"],"meta":{},"lines":237},{"file":"odb.h","functions":["git_odb_foreach_cb","git_odb_new","git_odb_open","git_odb_add_disk_alternate","git_odb_free","git_odb_read","git_odb_read_prefix","git_odb_read_header","git_odb_exists","git_odb_exists_prefix","git_odb_refresh","git_odb_foreach","git_odb_write","git_odb_open_wstream","git_odb_stream_write","git_odb_stream_finalize_write","git_odb_stream_read","git_odb_stream_free","git_odb_open_rstream","git_odb_write_pack","git_odb_hash","git_odb_hashfile","git_odb_object_dup","git_odb_object_free","git_odb_object_id","git_odb_object_data","git_odb_object_size","git_odb_object_type","git_odb_add_backend","git_odb_add_alternate","git_odb_num_backends","git_odb_get_backend"],"meta":{},"lines":491},{"file":"odb_backend.h","functions":["git_odb_backend_pack","git_odb_backend_loose","git_odb_backend_one_pack"],"meta":{},"lines":130},{"file":"oid.h","functions":["git_oid_fromstr","git_oid_fromstrp","git_oid_fromstrn","git_oid_fromraw","git_oid_fmt","git_oid_nfmt","git_oid_pathfmt","git_oid_tostr_s","git_oid_tostr","git_oid_cpy","git_oid_cmp","git_oid_equal","git_oid_ncmp","git_oid_streq","git_oid_strcmp","git_oid_iszero","git_oid_shorten_new","git_oid_shorten_add","git_oid_shorten_free"],"meta":{},"lines":265},{"file":"oidarray.h","functions":["git_oidarray_free"],"meta":{},"lines":34},{"file":"pack.h","functions":["git_packbuilder_new","git_packbuilder_set_threads","git_packbuilder_insert","git_packbuilder_insert_tree","git_packbuilder_insert_commit","git_packbuilder_insert_walk","git_packbuilder_insert_recur","git_packbuilder_write","git_packbuilder_hash","git_packbuilder_foreach","git_packbuilder_object_count","git_packbuilder_written","git_packbuilder_progress","git_packbuilder_set_callbacks","git_packbuilder_free"],"meta":{},"lines":236},{"file":"patch.h","functions":["git_patch_from_diff","git_patch_from_blobs","git_patch_from_blob_and_buffer","git_patch_from_buffers","git_patch_free","git_patch_get_delta","git_patch_num_hunks","git_patch_line_stats","git_patch_get_hunk","git_patch_num_lines_in_hunk","git_patch_get_line_in_hunk","git_patch_size","git_patch_print","git_patch_to_buf"],"meta":{},"lines":268},{"file":"pathspec.h","functions":["git_pathspec_new","git_pathspec_free","git_pathspec_matches_path","git_pathspec_match_workdir","git_pathspec_match_index","git_pathspec_match_tree","git_pathspec_match_diff","git_pathspec_match_list_free","git_pathspec_match_list_entrycount","git_pathspec_match_list_entry","git_pathspec_match_list_diff_entry","git_pathspec_match_list_failed_entrycount","git_pathspec_match_list_failed_entry"],"meta":{},"lines":260},{"file":"rebase.h","functions":["git_rebase_init_options","git_rebase_init","git_rebase_open","git_rebase_operation_entrycount","git_rebase_operation_current","git_rebase_operation_byindex","git_rebase_next","git_rebase_commit","git_rebase_abort","git_rebase_finish","git_rebase_free"],"meta":{},"lines":286},{"file":"refdb.h","functions":["git_refdb_new","git_refdb_open","git_refdb_compress","git_refdb_free"],"meta":{},"lines":63},{"file":"reflog.h","functions":["git_reflog_read","git_reflog_write","git_reflog_append","git_reflog_rename","git_reflog_delete","git_reflog_entrycount","git_reflog_entry_byindex","git_reflog_drop","git_reflog_entry_id_old","git_reflog_entry_id_new","git_reflog_entry_committer","git_reflog_entry_message","git_reflog_free"],"meta":{},"lines":166},{"file":"refs.h","functions":["git_reference_lookup","git_reference_name_to_id","git_reference_dwim","git_reference_symbolic_create_matching","git_reference_symbolic_create","git_reference_create","git_reference_create_matching","git_reference_target","git_reference_target_peel","git_reference_symbolic_target","git_reference_type","git_reference_name","git_reference_resolve","git_reference_owner","git_reference_symbolic_set_target","git_reference_set_target","git_reference_rename","git_reference_delete","git_reference_remove","git_reference_list","git_reference_foreach","git_reference_foreach_name","git_reference_free","git_reference_cmp","git_reference_iterator_new","git_reference_iterator_glob_new","git_reference_next","git_reference_next_name","git_reference_iterator_free","git_reference_foreach_glob","git_reference_has_log","git_reference_ensure_log","git_reference_is_branch","git_reference_is_remote","git_reference_is_tag","git_reference_is_note","git_reference_normalize_name","git_reference_peel","git_reference_is_valid_name","git_reference_shorthand"],"meta":{},"lines":730},{"file":"refspec.h","functions":["git_refspec_src","git_refspec_dst","git_refspec_string","git_refspec_force","git_refspec_direction","git_refspec_src_matches","git_refspec_dst_matches","git_refspec_transform","git_refspec_rtransform"],"meta":{},"lines":100},{"file":"remote.h","functions":["git_remote_rename_problem_cb","git_remote_create","git_remote_create_with_fetchspec","git_remote_create_anonymous","git_remote_lookup","git_remote_dup","git_remote_owner","git_remote_name","git_remote_url","git_remote_pushurl","git_remote_set_url","git_remote_set_pushurl","git_remote_add_fetch","git_remote_get_fetch_refspecs","git_remote_add_push","git_remote_get_push_refspecs","git_remote_refspec_count","git_remote_get_refspec","git_remote_connect","git_remote_ls","git_remote_connected","git_remote_stop","git_remote_disconnect","git_remote_free","git_remote_list","git_push_transfer_progress","git_push_negotiation","git_remote_init_callbacks","git_fetch_init_options","git_push_init_options","git_remote_download","git_remote_upload","git_remote_update_tips","git_remote_fetch","git_remote_prune","git_remote_push","git_remote_stats","git_remote_autotag","git_remote_set_autotag","git_remote_prune_refs","git_remote_rename","git_remote_is_valid_name","git_remote_delete","git_remote_default_branch"],"meta":{},"lines":796},{"file":"repository.h","functions":["git_repository_open","git_repository_wrap_odb","git_repository_discover","git_repository_open_ext","git_repository_open_bare","git_repository_free","git_repository_init","git_repository_init_init_options","git_repository_init_ext","git_repository_head","git_repository_head_detached","git_repository_head_unborn","git_repository_is_empty","git_repository_path","git_repository_workdir","git_repository_set_workdir","git_repository_is_bare","git_repository_config","git_repository_config_snapshot","git_repository_odb","git_repository_refdb","git_repository_index","git_repository_message","git_repository_message_remove","git_repository_state_cleanup","git_repository_fetchhead_foreach","git_repository_mergehead_foreach","git_repository_hashfile","git_repository_set_head","git_repository_set_head_detached","git_repository_set_head_detached_from_annotated","git_repository_detach_head","git_repository_state","git_repository_set_namespace","git_repository_get_namespace","git_repository_is_shallow","git_repository_ident","git_repository_set_ident"],"meta":{},"lines":750},{"file":"reset.h","functions":["git_reset","git_reset_from_annotated","git_reset_default"],"meta":{},"lines":107},{"file":"revert.h","functions":["git_revert_init_options","git_revert_commit","git_revert"],"meta":{},"lines":84},{"file":"revparse.h","functions":["git_revparse_single","git_revparse_ext","git_revparse"],"meta":{},"lines":108},{"file":"revwalk.h","functions":["git_revwalk_new","git_revwalk_reset","git_revwalk_push","git_revwalk_push_glob","git_revwalk_push_head","git_revwalk_hide","git_revwalk_hide_glob","git_revwalk_hide_head","git_revwalk_push_ref","git_revwalk_hide_ref","git_revwalk_next","git_revwalk_sorting","git_revwalk_push_range","git_revwalk_simplify_first_parent","git_revwalk_free","git_revwalk_repository","git_revwalk_hide_cb","git_revwalk_add_hide_cb"],"meta":{},"lines":293},{"file":"signature.h","functions":["git_signature_new","git_signature_now","git_signature_default","git_signature_dup","git_signature_free"],"meta":{},"lines":86},{"file":"stash.h","functions":["git_stash_apply_progress_cb","git_stash_apply_init_options","git_stash_apply","git_stash_cb","git_stash_foreach","git_stash_drop","git_stash_pop"],"meta":{},"lines":253},{"file":"status.h","functions":["git_status_cb","git_status_init_options","git_status_foreach","git_status_foreach_ext","git_status_file","git_status_list_new","git_status_list_entrycount","git_status_byindex","git_status_list_free","git_status_should_ignore"],"meta":{},"lines":366},{"file":"strarray.h","functions":["git_strarray_free","git_strarray_copy"],"meta":{},"lines":53},{"file":"submodule.h","functions":["git_submodule_update_init_options","git_submodule_update","git_submodule_lookup","git_submodule_free","git_submodule_foreach","git_submodule_add_setup","git_submodule_add_finalize","git_submodule_add_to_index","git_submodule_owner","git_submodule_name","git_submodule_path","git_submodule_url","git_submodule_resolve_url","git_submodule_branch","git_submodule_set_branch","git_submodule_set_url","git_submodule_index_id","git_submodule_head_id","git_submodule_wd_id","git_submodule_ignore","git_submodule_set_ignore","git_submodule_update_strategy","git_submodule_set_update","git_submodule_fetch_recurse_submodules","git_submodule_set_fetch_recurse_submodules","git_submodule_init","git_submodule_repo_init","git_submodule_sync","git_submodule_open","git_submodule_reload","git_submodule_status","git_submodule_location"],"meta":{},"lines":622},{"file":"sys/commit.h","functions":["git_commit_create_from_ids","git_commit_create_from_callback"],"meta":{},"lines":76},{"file":"sys/config.h","functions":["git_config_init_backend","git_config_add_backend"],"meta":{},"lines":109},{"file":"sys/diff.h","functions":["git_diff_print_callback__to_buf","git_diff_print_callback__to_file_handle","git_diff_get_perfdata","git_status_list_get_perfdata"],"meta":{},"lines":90},{"file":"sys/filter.h","functions":["git_filter_lookup","git_filter_list_new","git_filter_list_push","git_filter_list_length","git_filter_source_repo","git_filter_source_path","git_filter_source_filemode","git_filter_source_id","git_filter_source_mode","git_filter_source_flags","git_filter_init_fn","git_filter_shutdown_fn","git_filter_check_fn","git_filter_apply_fn","git_filter_cleanup_fn","git_filter_register","git_filter_unregister"],"meta":{},"lines":305},{"file":"sys/hashsig.h","functions":["git_hashsig_create","git_hashsig_create_fromfile","git_hashsig_free","git_hashsig_compare"],"meta":{},"lines":102},{"file":"sys/mempack.h","functions":["git_mempack_new","git_mempack_reset"],"meta":{},"lines":81},{"file":"sys/odb_backend.h","functions":["git_odb_init_backend"],"meta":{},"lines":102},{"file":"sys/openssl.h","functions":["git_openssl_set_locking"],"meta":{},"lines":34},{"file":"sys/refdb_backend.h","functions":["git_refdb_init_backend","git_refdb_backend_fs","git_refdb_set_backend"],"meta":{},"lines":213},{"file":"sys/refs.h","functions":["git_reference__alloc","git_reference__alloc_symbolic"],"meta":{},"lines":45},{"file":"sys/repository.h","functions":["git_repository_new","git_repository__cleanup","git_repository_reinit_filesystem","git_repository_set_config","git_repository_set_odb","git_repository_set_refdb","git_repository_set_index","git_repository_set_bare"],"meta":{},"lines":136},{"file":"sys/stream.h","functions":[],"meta":{},"lines":40},{"file":"sys/transport.h","functions":["git_transport_init","git_transport_new","git_transport_ssh_with_paths","git_transport_unregister","git_transport_dummy","git_transport_local","git_transport_smart","git_smart_subtransport_http","git_smart_subtransport_git","git_smart_subtransport_ssh"],"meta":{},"lines":349},{"file":"tag.h","functions":["git_tag_lookup","git_tag_lookup_prefix","git_tag_free","git_tag_id","git_tag_owner","git_tag_target","git_tag_target_id","git_tag_target_type","git_tag_name","git_tag_tagger","git_tag_message","git_tag_create","git_tag_annotation_create","git_tag_create_frombuffer","git_tag_create_lightweight","git_tag_delete","git_tag_list","git_tag_list_match","git_tag_foreach","git_tag_peel"],"meta":{},"lines":348},{"file":"trace.h","functions":["git_trace_callback","git_trace_set"],"meta":{},"lines":63},{"file":"transport.h","functions":["git_transport_cb","git_cred_has_username","git_cred_userpass_plaintext_new","git_cred_ssh_key_new","git_cred_ssh_interactive_new","git_cred_ssh_key_from_agent","git_cred_ssh_custom_new","git_cred_default_new","git_cred_username_new","git_cred_ssh_key_memory_new","git_cred_acquire_cb"],"meta":{},"lines":334},{"file":"tree.h","functions":["git_tree_lookup","git_tree_lookup_prefix","git_tree_free","git_tree_id","git_tree_owner","git_tree_entrycount","git_tree_entry_byname","git_tree_entry_byindex","git_tree_entry_byid","git_tree_entry_bypath","git_tree_entry_dup","git_tree_entry_free","git_tree_entry_name","git_tree_entry_id","git_tree_entry_type","git_tree_entry_filemode","git_tree_entry_filemode_raw","git_tree_entry_cmp","git_tree_entry_to_object","git_treebuilder_new","git_treebuilder_clear","git_treebuilder_entrycount","git_treebuilder_free","git_treebuilder_get","git_treebuilder_insert","git_treebuilder_remove","git_treebuilder_filter_cb","git_treebuilder_filter","git_treebuilder_write","git_treewalk_cb","git_tree_walk"],"meta":{},"lines":410},{"file":"types.h","functions":["git_transfer_progress_cb","git_transport_message_cb","git_transport_certificate_check_cb"],"meta":{},"lines":425}],"functions":{"git_annotated_commit_from_ref":{"type":"function","file":"annotated_commit.h","line":33,"lineto":36,"args":[{"name":"out","type":"git_annotated_commit **","comment":"pointer to store the git_annotated_commit result in"},{"name":"repo","type":"git_repository *","comment":"repository that contains the given reference"},{"name":"ref","type":"const git_reference *","comment":"reference to use to lookup the git_annotated_commit"}],"argline":"git_annotated_commit **out, git_repository *repo, const git_reference *ref","sig":"git_annotated_commit **::git_repository *::const git_reference *","return":{"type":"int","comment":" 0 on success or error code"},"description":"

Creates a git_annotated_commit from the given reference.\n The resulting git_annotated_commit must be freed with\n git_annotated_commit_free.

\n","comments":"","group":"annotated"},"git_annotated_commit_from_fetchhead":{"type":"function","file":"annotated_commit.h","line":50,"lineto":55,"args":[{"name":"out","type":"git_annotated_commit **","comment":"pointer to store the git_annotated_commit result in"},{"name":"repo","type":"git_repository *","comment":"repository that contains the given commit"},{"name":"branch_name","type":"const char *","comment":"name of the (remote) branch"},{"name":"remote_url","type":"const char *","comment":"url of the remote"},{"name":"id","type":"const git_oid *","comment":"the commit object id of the remote branch"}],"argline":"git_annotated_commit **out, git_repository *repo, const char *branch_name, const char *remote_url, const git_oid *id","sig":"git_annotated_commit **::git_repository *::const char *::const char *::const git_oid *","return":{"type":"int","comment":" 0 on success or error code"},"description":"

Creates a git_annotated_commit from the given fetch head data.\n The resulting git_annotated_commit must be freed with\n git_annotated_commit_free.

\n","comments":"","group":"annotated"},"git_annotated_commit_lookup":{"type":"function","file":"annotated_commit.h","line":75,"lineto":78,"args":[{"name":"out","type":"git_annotated_commit **","comment":"pointer to store the git_annotated_commit result in"},{"name":"repo","type":"git_repository *","comment":"repository that contains the given commit"},{"name":"id","type":"const git_oid *","comment":"the commit object id to lookup"}],"argline":"git_annotated_commit **out, git_repository *repo, const git_oid *id","sig":"git_annotated_commit **::git_repository *::const git_oid *","return":{"type":"int","comment":" 0 on success or error code"},"description":"

Creates a git_annotated_commit from the given commit id.\n The resulting git_annotated_commit must be freed with\n git_annotated_commit_free.

\n","comments":"

An annotated commit contains information about how it was\n looked up, which may be useful for functions like merge or\n rebase to provide context to the operation. For example,\n conflict files will include the name of the source or target\n branches being merged. It is therefore preferable to use the\n most specific function (eg git_annotated_commit_from_ref)\n instead of this one when that data is known.

\n","group":"annotated"},"git_annotated_commit_from_revspec":{"type":"function","file":"annotated_commit.h","line":92,"lineto":95,"args":[{"name":"out","type":"git_annotated_commit **","comment":"pointer to store the git_annotated_commit result in"},{"name":"repo","type":"git_repository *","comment":"repository that contains the given commit"},{"name":"revspec","type":"const char *","comment":"the extended sha syntax string to use to lookup the commit"}],"argline":"git_annotated_commit **out, git_repository *repo, const char *revspec","sig":"git_annotated_commit **::git_repository *::const char *","return":{"type":"int","comment":" 0 on success or error code"},"description":"

Creates a git_annotated_comit from a revision string.

\n","comments":"

See man gitrevisions, or\n http://git-scm.com/docs/git-rev-parse.html#_specifying_revisions for\n information on the syntax accepted.

\n","group":"annotated"},"git_annotated_commit_id":{"type":"function","file":"annotated_commit.h","line":103,"lineto":104,"args":[{"name":"commit","type":"const git_annotated_commit *","comment":"the given annotated commit"}],"argline":"const git_annotated_commit *commit","sig":"const git_annotated_commit *","return":{"type":"const git_oid *","comment":" commit id"},"description":"

Gets the commit ID that the given git_annotated_commit refers to.

\n","comments":"","group":"annotated"},"git_annotated_commit_free":{"type":"function","file":"annotated_commit.h","line":111,"lineto":112,"args":[{"name":"commit","type":"git_annotated_commit *","comment":"annotated commit to free"}],"argline":"git_annotated_commit *commit","sig":"git_annotated_commit *","return":{"type":"void","comment":null},"description":"

Frees a git_annotated_commit.

\n","comments":"","group":"annotated"},"git_attr_value":{"type":"function","file":"attr.h","line":102,"lineto":102,"args":[{"name":"attr","type":"const char *","comment":"The attribute"}],"argline":"const char *attr","sig":"const char *","return":{"type":"git_attr_t","comment":" the value type for the attribute"},"description":"

Return the value type for a given attribute.

\n","comments":"

This can be either TRUE, FALSE, UNSPECIFIED (if the attribute\n was not set at all), or VALUE, if the attribute was set to an\n actual string.

\n\n

If the attribute has a VALUE string, it can be accessed normally\n as a NULL-terminated C string.

\n","group":"attr"},"git_attr_get":{"type":"function","file":"attr.h","line":145,"lineto":150,"args":[{"name":"value_out","type":"const char **","comment":"Output of the value of the attribute. Use the GIT_ATTR_...\n macros to test for TRUE, FALSE, UNSPECIFIED, etc. or just\n use the string value for attributes set to a value. You\n should NOT modify or free this value."},{"name":"repo","type":"git_repository *","comment":"The repository containing the path."},{"name":"flags","type":"uint32_t","comment":"A combination of GIT_ATTR_CHECK... flags."},{"name":"path","type":"const char *","comment":"The path to check for attributes. Relative paths are\n interpreted relative to the repo root. The file does\n not have to exist, but if it does not, then it will be\n treated as a plain file (not a directory)."},{"name":"name","type":"const char *","comment":"The name of the attribute to look up."}],"argline":"const char **value_out, git_repository *repo, uint32_t flags, const char *path, const char *name","sig":"const char **::git_repository *::uint32_t::const char *::const char *","return":{"type":"int","comment":null},"description":"

Look up the value of one git attribute for path.

\n","comments":"","group":"attr"},"git_attr_get_many":{"type":"function","file":"attr.h","line":181,"lineto":187,"args":[{"name":"values_out","type":"const char **","comment":"An array of num_attr entries that will have string\n pointers written into it for the values of the attributes.\n You should not modify or free the values that are written\n into this array (although of course, you should free the\n array itself if you allocated it)."},{"name":"repo","type":"git_repository *","comment":"The repository containing the path."},{"name":"flags","type":"uint32_t","comment":"A combination of GIT_ATTR_CHECK... flags."},{"name":"path","type":"const char *","comment":"The path inside the repo to check attributes. This\n does not have to exist, but if it does not, then\n it will be treated as a plain file (i.e. not a directory)."},{"name":"num_attr","type":"size_t","comment":"The number of attributes being looked up"},{"name":"names","type":"const char **","comment":"An array of num_attr strings containing attribute names."}],"argline":"const char **values_out, git_repository *repo, uint32_t flags, const char *path, size_t num_attr, const char **names","sig":"const char **::git_repository *::uint32_t::const char *::size_t::const char **","return":{"type":"int","comment":null},"description":"

Look up a list of git attributes for path.

\n","comments":"

Use this if you have a known list of attributes that you want to\n look up in a single call. This is somewhat more efficient than\n calling git_attr_get() multiple times.

\n\n

For example, you might write:

\n\n
 const char *attrs[] = { "crlf", "diff", "foo" };\n const char **values[3];\n git_attr_get_many(values, repo, 0, "my/fun/file.c", 3, attrs);\n
\n\n

Then you could loop through the 3 values to get the settings for\n the three attributes you asked about.

\n","group":"attr"},"git_attr_foreach":{"type":"function","file":"attr.h","line":209,"lineto":214,"args":[{"name":"repo","type":"git_repository *","comment":"The repository containing the path."},{"name":"flags","type":"uint32_t","comment":"A combination of GIT_ATTR_CHECK... flags."},{"name":"path","type":"const char *","comment":"Path inside the repo to check attributes. This does not have\n to exist, but if it does not, then it will be treated as a\n plain file (i.e. not a directory)."},{"name":"callback","type":"git_attr_foreach_cb","comment":"Function to invoke on each attribute name and value. The\n value may be NULL is the attribute is explicitly set to\n UNSPECIFIED using the '!' sign. Callback will be invoked\n only once per attribute name, even if there are multiple\n rules for a given file. The highest priority rule will be\n used. Return a non-zero value from this to stop looping.\n The value will be returned from `git_attr_foreach`."},{"name":"payload","type":"void *","comment":"Passed on as extra parameter to callback function."}],"argline":"git_repository *repo, uint32_t flags, const char *path, git_attr_foreach_cb callback, void *payload","sig":"git_repository *::uint32_t::const char *::git_attr_foreach_cb::void *","return":{"type":"int","comment":" 0 on success, non-zero callback return value, or error code"},"description":"

Loop over all the git attributes for a path.

\n","comments":"","group":"attr"},"git_attr_cache_flush":{"type":"function","file":"attr.h","line":224,"lineto":225,"args":[{"name":"repo","type":"git_repository *","comment":null}],"argline":"git_repository *repo","sig":"git_repository *","return":{"type":"void","comment":null},"description":"

Flush the gitattributes cache.

\n","comments":"

Call this if you have reason to believe that the attributes files on\n disk no longer match the cached contents of memory. This will cause\n the attributes files to be reloaded the next time that an attribute\n access function is called.

\n","group":"attr"},"git_attr_add_macro":{"type":"function","file":"attr.h","line":237,"lineto":240,"args":[{"name":"repo","type":"git_repository *","comment":null},{"name":"name","type":"const char *","comment":null},{"name":"values","type":"const char *","comment":null}],"argline":"git_repository *repo, const char *name, const char *values","sig":"git_repository *::const char *::const char *","return":{"type":"int","comment":null},"description":"

Add a macro definition.

\n","comments":"

Macros will automatically be loaded from the top level .gitattributes\n file of the repository (plus the build-in "binary" macro). This\n function allows you to add others. For example, to add the default\n macro, you would call:

\n\n
 git_attr_add_macro(repo, "binary", "-diff -crlf");\n
\n","group":"attr"},"git_blame_init_options":{"type":"function","file":"blame.h","line":92,"lineto":94,"args":[{"name":"opts","type":"git_blame_options *","comment":"The `git_blame_options` struct to initialize"},{"name":"version","type":"unsigned int","comment":"Version of struct; pass `GIT_BLAME_OPTIONS_VERSION`"}],"argline":"git_blame_options *opts, unsigned int version","sig":"git_blame_options *::unsigned int","return":{"type":"int","comment":" Zero on success; -1 on failure."},"description":"

Initializes a git_blame_options with default values. Equivalent to\n creating an instance with GIT_BLAME_OPTIONS_INIT.

\n","comments":"","group":"blame"},"git_blame_get_hunk_count":{"type":"function","file":"blame.h","line":137,"lineto":137,"args":[{"name":"blame","type":"git_blame *","comment":null}],"argline":"git_blame *blame","sig":"git_blame *","return":{"type":"uint32_t","comment":null},"description":"

Gets the number of hunks that exist in the blame structure.

\n","comments":"","group":"blame"},"git_blame_get_hunk_byindex":{"type":"function","file":"blame.h","line":146,"lineto":148,"args":[{"name":"blame","type":"git_blame *","comment":"the blame structure to query"},{"name":"index","type":"uint32_t","comment":"index of the hunk to retrieve"}],"argline":"git_blame *blame, uint32_t index","sig":"git_blame *::uint32_t","return":{"type":"const git_blame_hunk *","comment":" the hunk at the given index, or NULL on error"},"description":"

Gets the blame hunk at the given index.

\n","comments":"","group":"blame"},"git_blame_get_hunk_byline":{"type":"function","file":"blame.h","line":157,"lineto":159,"args":[{"name":"blame","type":"git_blame *","comment":"the blame structure to query"},{"name":"lineno","type":"uint32_t","comment":"the (1-based) line number to find a hunk for"}],"argline":"git_blame *blame, uint32_t lineno","sig":"git_blame *::uint32_t","return":{"type":"const git_blame_hunk *","comment":" the hunk that contains the given line, or NULL on error"},"description":"

Gets the hunk that relates to the given line number in the newest commit.

\n","comments":"","group":"blame","examples":{"blame.c":["ex/v0.23.2/blame.html#git_blame_get_hunk_byline-1"]}},"git_blame_file":{"type":"function","file":"blame.h","line":172,"lineto":176,"args":[{"name":"out","type":"git_blame **","comment":"pointer that will receive the blame object"},{"name":"repo","type":"git_repository *","comment":"repository whose history is to be walked"},{"name":"path","type":"const char *","comment":"path to file to consider"},{"name":"options","type":"git_blame_options *","comment":"options for the blame operation. If NULL, this is treated as\n though GIT_BLAME_OPTIONS_INIT were passed."}],"argline":"git_blame **out, git_repository *repo, const char *path, git_blame_options *options","sig":"git_blame **::git_repository *::const char *::git_blame_options *","return":{"type":"int","comment":" 0 on success, or an error code. (use giterr_last for information\n about the error.)"},"description":"

Get the blame for a single file.

\n","comments":"","group":"blame","examples":{"blame.c":["ex/v0.23.2/blame.html#git_blame_file-2"]}},"git_blame_buffer":{"type":"function","file":"blame.h","line":196,"lineto":200,"args":[{"name":"out","type":"git_blame **","comment":"pointer that will receive the resulting blame data"},{"name":"reference","type":"git_blame *","comment":"cached blame from the history of the file (usually the output\n from git_blame_file)"},{"name":"buffer","type":"const char *","comment":"the (possibly) modified contents of the file"},{"name":"buffer_len","type":"size_t","comment":"number of valid bytes in the buffer"}],"argline":"git_blame **out, git_blame *reference, const char *buffer, size_t buffer_len","sig":"git_blame **::git_blame *::const char *::size_t","return":{"type":"int","comment":" 0 on success, or an error code. (use giterr_last for information\n about the error)"},"description":"

Get blame data for a file that has been modified in memory. The reference\n parameter is a pre-calculated blame for the in-odb history of the file. This\n means that once a file blame is completed (which can be expensive), updating\n the buffer blame is very fast.

\n","comments":"

Lines that differ between the buffer and the committed version are marked as\n having a zero OID for their final_commit_id.

\n","group":"blame"},"git_blame_free":{"type":"function","file":"blame.h","line":207,"lineto":207,"args":[{"name":"blame","type":"git_blame *","comment":"the blame structure to free"}],"argline":"git_blame *blame","sig":"git_blame *","return":{"type":"void","comment":null},"description":"

Free memory allocated by git_blame_file or git_blame_buffer.

\n","comments":"","group":"blame","examples":{"blame.c":["ex/v0.23.2/blame.html#git_blame_free-3"]}},"git_blob_lookup":{"type":"function","file":"blob.h","line":33,"lineto":33,"args":[{"name":"blob","type":"git_blob **","comment":"pointer to the looked up blob"},{"name":"repo","type":"git_repository *","comment":"the repo to use when locating the blob."},{"name":"id","type":"const git_oid *","comment":"identity of the blob to locate."}],"argline":"git_blob **blob, git_repository *repo, const git_oid *id","sig":"git_blob **::git_repository *::const git_oid *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Lookup a blob object from a repository.

\n","comments":"","group":"blob","examples":{"blame.c":["ex/v0.23.2/blame.html#git_blob_lookup-4"],"general.c":["ex/v0.23.2/general.html#git_blob_lookup-1"]}},"git_blob_lookup_prefix":{"type":"function","file":"blob.h","line":47,"lineto":47,"args":[{"name":"blob","type":"git_blob **","comment":"pointer to the looked up blob"},{"name":"repo","type":"git_repository *","comment":"the repo to use when locating the blob."},{"name":"id","type":"const git_oid *","comment":"identity of the blob to locate."},{"name":"len","type":"size_t","comment":"the length of the short identifier"}],"argline":"git_blob **blob, git_repository *repo, const git_oid *id, size_t len","sig":"git_blob **::git_repository *::const git_oid *::size_t","return":{"type":"int","comment":" 0 or an error code"},"description":"

Lookup a blob object from a repository,\n given a prefix of its identifier (short id).

\n","comments":"","group":"blob"},"git_blob_free":{"type":"function","file":"blob.h","line":60,"lineto":60,"args":[{"name":"blob","type":"git_blob *","comment":"the blob to close"}],"argline":"git_blob *blob","sig":"git_blob *","return":{"type":"void","comment":null},"description":"

Close an open blob

\n","comments":"

This is a wrapper around git_object_free()

\n\n

IMPORTANT:\n It is necessary to call this method when you stop\n using a blob. Failure to do so will cause a memory leak.

\n","group":"blob","examples":{"blame.c":["ex/v0.23.2/blame.html#git_blob_free-5"]}},"git_blob_id":{"type":"function","file":"blob.h","line":68,"lineto":68,"args":[{"name":"blob","type":"const git_blob *","comment":"a previously loaded blob."}],"argline":"const git_blob *blob","sig":"const git_blob *","return":{"type":"const git_oid *","comment":" SHA1 hash for this blob."},"description":"

Get the id of a blob.

\n","comments":"","group":"blob"},"git_blob_owner":{"type":"function","file":"blob.h","line":76,"lineto":76,"args":[{"name":"blob","type":"const git_blob *","comment":"A previously loaded blob."}],"argline":"const git_blob *blob","sig":"const git_blob *","return":{"type":"git_repository *","comment":" Repository that contains this blob."},"description":"

Get the repository that contains the blob.

\n","comments":"","group":"blob"},"git_blob_rawcontent":{"type":"function","file":"blob.h","line":89,"lineto":89,"args":[{"name":"blob","type":"const git_blob *","comment":"pointer to the blob"}],"argline":"const git_blob *blob","sig":"const git_blob *","return":{"type":"const void *","comment":" the pointer"},"description":"

Get a read-only buffer with the raw content of a blob.

\n","comments":"

A pointer to the raw content of a blob is returned;\n this pointer is owned internally by the object and shall\n not be free'd. The pointer may be invalidated at a later\n time.

\n","group":"blob","examples":{"blame.c":["ex/v0.23.2/blame.html#git_blob_rawcontent-6"],"cat-file.c":["ex/v0.23.2/cat-file.html#git_blob_rawcontent-1"],"general.c":["ex/v0.23.2/general.html#git_blob_rawcontent-2"]}},"git_blob_rawsize":{"type":"function","file":"blob.h","line":97,"lineto":97,"args":[{"name":"blob","type":"const git_blob *","comment":"pointer to the blob"}],"argline":"const git_blob *blob","sig":"const git_blob *","return":{"type":"git_off_t","comment":" size on bytes"},"description":"

Get the size in bytes of the contents of a blob

\n","comments":"","group":"blob","examples":{"blame.c":["ex/v0.23.2/blame.html#git_blob_rawsize-7"],"cat-file.c":["ex/v0.23.2/cat-file.html#git_blob_rawsize-2"],"general.c":["ex/v0.23.2/general.html#git_blob_rawsize-3","ex/v0.23.2/general.html#git_blob_rawsize-4"]}},"git_blob_filtered_content":{"type":"function","file":"blob.h","line":122,"lineto":126,"args":[{"name":"out","type":"git_buf *","comment":"The git_buf to be filled in"},{"name":"blob","type":"git_blob *","comment":"Pointer to the blob"},{"name":"as_path","type":"const char *","comment":"Path used for file attribute lookups, etc."},{"name":"check_for_binary_data","type":"int","comment":"Should this test if blob content contains\n NUL bytes / looks like binary data before applying filters?"}],"argline":"git_buf *out, git_blob *blob, const char *as_path, int check_for_binary_data","sig":"git_buf *::git_blob *::const char *::int","return":{"type":"int","comment":" 0 on success or an error code"},"description":"

Get a buffer with the filtered content of a blob.

\n","comments":"

This applies filters as if the blob was being checked out to the\n working directory under the specified filename. This may apply\n CRLF filtering or other types of changes depending on the file\n attributes set for the blob and the content detected in it.

\n\n

The output is written into a git_buf which the caller must free\n when done (via git_buf_free).

\n\n

If no filters need to be applied, then the out buffer will just\n be populated with a pointer to the raw content of the blob. In\n that case, be careful to not free the blob until done with the\n buffer or copy it into memory you own.

\n","group":"blob"},"git_blob_create_fromworkdir":{"type":"function","file":"blob.h","line":139,"lineto":139,"args":[{"name":"id","type":"git_oid *","comment":"return the id of the written blob"},{"name":"repo","type":"git_repository *","comment":"repository where the blob will be written.\n\tthis repository cannot be bare"},{"name":"relative_path","type":"const char *","comment":"file from which the blob will be created,\n\trelative to the repository's working dir"}],"argline":"git_oid *id, git_repository *repo, const char *relative_path","sig":"git_oid *::git_repository *::const char *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Read a file from the working folder of a repository\n and write it to the Object Database as a loose blob

\n","comments":"","group":"blob"},"git_blob_create_fromdisk":{"type":"function","file":"blob.h","line":151,"lineto":151,"args":[{"name":"id","type":"git_oid *","comment":"return the id of the written blob"},{"name":"repo","type":"git_repository *","comment":"repository where the blob will be written.\n\tthis repository can be bare or not"},{"name":"path","type":"const char *","comment":"file from which the blob will be created"}],"argline":"git_oid *id, git_repository *repo, const char *path","sig":"git_oid *::git_repository *::const char *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Read a file from the filesystem and write its content\n to the Object Database as a loose blob

\n","comments":"","group":"blob"},"git_blob_create_fromchunks":{"type":"function","file":"blob.h","line":187,"lineto":192,"args":[{"name":"id","type":"git_oid *","comment":"Return the id of the written blob"},{"name":"repo","type":"git_repository *","comment":"Repository where the blob will be written.\n This repository can be bare or not."},{"name":"hintpath","type":"const char *","comment":"If not NULL, will be used to select data filters\n to apply onto the content of the blob to be created."},{"name":"callback","type":"git_blob_chunk_cb","comment":null},{"name":"payload","type":"void *","comment":null}],"argline":"git_oid *id, git_repository *repo, const char *hintpath, git_blob_chunk_cb callback, void *payload","sig":"git_oid *::git_repository *::const char *::git_blob_chunk_cb::void *","return":{"type":"int","comment":" 0 or error code (from either libgit2 or callback function)"},"description":"

Write a loose blob to the Object Database from a\n provider of chunks of data.

\n","comments":"

If the hintpath parameter is filled, it will be used to determine\n what git filters should be applied to the object before it is written\n to the object database.

\n\n

The implementation of the callback MUST respect the following rules:

\n\n
    \n

  • content must be filled by the callback. The maximum number of\nbytes that the buffer can accept per call is defined by the\nmax_length parameter. Allocation and freeing of the buffer will\nbe taken care of by libgit2.

    • \n

  • The callback must return the number of bytes that have been\nwritten to the content buffer.

    • \n

  • When there is no more data to stream, callback should return

    \n\n
      \n
    1. This will prevent it from being invoked anymore.
      2. \n
    • \n

  • If an error occurs, the callback should return a negative value.\nThis value will be returned to the caller.

    • \n
\n","group":"blob"},"git_blob_create_frombuffer":{"type":"function","file":"blob.h","line":203,"lineto":204,"args":[{"name":"id","type":"git_oid *","comment":"return the id of the written blob"},{"name":"repo","type":"git_repository *","comment":"repository where to blob will be written"},{"name":"buffer","type":"const void *","comment":"data to be written into the blob"},{"name":"len","type":"size_t","comment":"length of the data"}],"argline":"git_oid *id, git_repository *repo, const void *buffer, size_t len","sig":"git_oid *::git_repository *::const void *::size_t","return":{"type":"int","comment":" 0 or an error code"},"description":"

Write an in-memory buffer to the ODB as a blob

\n","comments":"","group":"blob"},"git_blob_is_binary":{"type":"function","file":"blob.h","line":217,"lineto":217,"args":[{"name":"blob","type":"const git_blob *","comment":"The blob which content should be analyzed"}],"argline":"const git_blob *blob","sig":"const git_blob *","return":{"type":"int","comment":" 1 if the content of the blob is detected\n as binary; 0 otherwise."},"description":"

Determine if the blob content is most certainly binary or not.

\n","comments":"

The heuristic used to guess if a file is binary is taken from core git:\n Searching for NUL bytes and looking for a reasonable ratio of printable\n to non-printable characters among the first 8000 bytes.

\n","group":"blob"},"git_branch_create":{"type":"function","file":"branch.h","line":50,"lineto":55,"args":[{"name":"out","type":"git_reference **","comment":"Pointer where to store the underlying reference."},{"name":"repo","type":"git_repository *","comment":null},{"name":"branch_name","type":"const char *","comment":"Name for the branch; this name is\n validated for consistency. It should also not conflict with\n an already existing branch name."},{"name":"target","type":"const git_commit *","comment":"Commit to which this branch should point. This object\n must belong to the given `repo`."},{"name":"force","type":"int","comment":"Overwrite existing branch."}],"argline":"git_reference **out, git_repository *repo, const char *branch_name, const git_commit *target, int force","sig":"git_reference **::git_repository *::const char *::const git_commit *::int","return":{"type":"int","comment":" 0, GIT_EINVALIDSPEC or an error code.\n A proper reference is written in the refs/heads namespace\n pointing to the provided target commit."},"description":"

Create a new branch pointing at a target commit

\n","comments":"

A new direct reference will be created pointing to\n this target commit. If force is true and a reference\n already exists with the given name, it'll be replaced.

\n\n

The returned reference must be freed by the user.

\n\n

The branch name will be checked for validity.\n See git_tag_create() for rules about valid names.

\n","group":"branch"},"git_branch_create_from_annotated":{"type":"function","file":"branch.h","line":68,"lineto":73,"args":[{"name":"ref_out","type":"git_reference **","comment":null},{"name":"repository","type":"git_repository *","comment":null},{"name":"branch_name","type":"const char *","comment":null},{"name":"commit","type":"const git_annotated_commit *","comment":null},{"name":"force","type":"int","comment":null}],"argline":"git_reference **ref_out, git_repository *repository, const char *branch_name, const git_annotated_commit *commit, int force","sig":"git_reference **::git_repository *::const char *::const git_annotated_commit *::int","return":{"type":"int","comment":null},"description":"

Create a new branch pointing at a target commit

\n","comments":"

This behaves like git_branch_create() but takes an annotated\n commit, which lets you specify which extended sha syntax string was\n specified by a user, allowing for more exact reflog messages.

\n\n

See the documentation for git_branch_create().

\n","group":"branch"},"git_branch_delete":{"type":"function","file":"branch.h","line":85,"lineto":85,"args":[{"name":"branch","type":"git_reference *","comment":"A valid reference representing a branch"}],"argline":"git_reference *branch","sig":"git_reference *","return":{"type":"int","comment":" 0 on success, or an error code."},"description":"

Delete an existing branch reference.

\n","comments":"

If the branch is successfully deleted, the passed reference\n object will be invalidated. The reference must be freed manually\n by the user.

\n","group":"branch"},"git_branch_iterator_new":{"type":"function","file":"branch.h","line":101,"lineto":104,"args":[{"name":"out","type":"git_branch_iterator **","comment":"the iterator"},{"name":"repo","type":"git_repository *","comment":"Repository where to find the branches."},{"name":"list_flags","type":"git_branch_t","comment":"Filtering flags for the branch\n listing. Valid values are GIT_BRANCH_LOCAL, GIT_BRANCH_REMOTE\n or GIT_BRANCH_ALL."}],"argline":"git_branch_iterator **out, git_repository *repo, git_branch_t list_flags","sig":"git_branch_iterator **::git_repository *::git_branch_t","return":{"type":"int","comment":" 0 on success or an error code"},"description":"

Create an iterator which loops over the requested branches.

\n","comments":"","group":"branch"},"git_branch_next":{"type":"function","file":"branch.h","line":114,"lineto":114,"args":[{"name":"out","type":"git_reference **","comment":"the reference"},{"name":"out_type","type":"git_branch_t *","comment":"the type of branch (local or remote-tracking)"},{"name":"iter","type":"git_branch_iterator *","comment":"the branch iterator"}],"argline":"git_reference **out, git_branch_t *out_type, git_branch_iterator *iter","sig":"git_reference **::git_branch_t *::git_branch_iterator *","return":{"type":"int","comment":" 0 on success, GIT_ITEROVER if there are no more branches or an error code."},"description":"

Retrieve the next branch from the iterator

\n","comments":"","group":"branch"},"git_branch_iterator_free":{"type":"function","file":"branch.h","line":121,"lineto":121,"args":[{"name":"iter","type":"git_branch_iterator *","comment":"the iterator to free"}],"argline":"git_branch_iterator *iter","sig":"git_branch_iterator *","return":{"type":"void","comment":null},"description":"

Free a branch iterator

\n","comments":"","group":"branch"},"git_branch_move":{"type":"function","file":"branch.h","line":138,"lineto":142,"args":[{"name":"out","type":"git_reference **","comment":null},{"name":"branch","type":"git_reference *","comment":"Current underlying reference of the branch."},{"name":"new_branch_name","type":"const char *","comment":"Target name of the branch once the move\n is performed; this name is validated for consistency."},{"name":"force","type":"int","comment":"Overwrite existing branch."}],"argline":"git_reference **out, git_reference *branch, const char *new_branch_name, int force","sig":"git_reference **::git_reference *::const char *::int","return":{"type":"int","comment":" 0 on success, GIT_EINVALIDSPEC or an error code."},"description":"

Move/rename an existing local branch reference.

\n","comments":"

The new branch name will be checked for validity.\n See git_tag_create() for rules about valid names.

\n","group":"branch"},"git_branch_lookup":{"type":"function","file":"branch.h","line":165,"lineto":169,"args":[{"name":"out","type":"git_reference **","comment":"pointer to the looked-up branch reference"},{"name":"repo","type":"git_repository *","comment":"the repository to look up the branch"},{"name":"branch_name","type":"const char *","comment":"Name of the branch to be looked-up;\n this name is validated for consistency."},{"name":"branch_type","type":"git_branch_t","comment":"Type of the considered branch. This should\n be valued with either GIT_BRANCH_LOCAL or GIT_BRANCH_REMOTE."}],"argline":"git_reference **out, git_repository *repo, const char *branch_name, git_branch_t branch_type","sig":"git_reference **::git_repository *::const char *::git_branch_t","return":{"type":"int","comment":" 0 on success; GIT_ENOTFOUND when no matching branch\n exists, GIT_EINVALIDSPEC, otherwise an error code."},"description":"

Lookup a branch by its name in a repository.

\n","comments":"

The generated reference must be freed by the user.

\n\n

The branch name will be checked for validity.\n See git_tag_create() for rules about valid names.

\n","group":"branch"},"git_branch_name":{"type":"function","file":"branch.h","line":186,"lineto":188,"args":[{"name":"out","type":"const char **","comment":"where the pointer of branch name is stored;\n this is valid as long as the ref is not freed."},{"name":"ref","type":"const git_reference *","comment":"the reference ideally pointing to a branch"}],"argline":"const char **out, const git_reference *ref","sig":"const char **::const git_reference *","return":{"type":"int","comment":" 0 on success; otherwise an error code (e.g., if the\n ref is no local or remote branch)."},"description":"

Return the name of the given local or remote branch.

\n","comments":"

The name of the branch matches the definition of the name\n for git_branch_lookup. That is, if the returned name is given\n to git_branch_lookup() then the reference is returned that\n was given to this function.

\n","group":"branch"},"git_branch_upstream":{"type":"function","file":"branch.h","line":202,"lineto":204,"args":[{"name":"out","type":"git_reference **","comment":"Pointer where to store the retrieved\n reference."},{"name":"branch","type":"const git_reference *","comment":"Current underlying reference of the branch."}],"argline":"git_reference **out, const git_reference *branch","sig":"git_reference **::const git_reference *","return":{"type":"int","comment":" 0 on success; GIT_ENOTFOUND when no remote tracking\n reference exists, otherwise an error code."},"description":"

Return the reference supporting the remote tracking branch,\n given a local branch reference.

\n","comments":"","group":"branch"},"git_branch_set_upstream":{"type":"function","file":"branch.h","line":216,"lineto":216,"args":[{"name":"branch","type":"git_reference *","comment":"the branch to configure"},{"name":"upstream_name","type":"const char *","comment":"remote-tracking or local branch to set as\n upstream. Pass NULL to unset."}],"argline":"git_reference *branch, const char *upstream_name","sig":"git_reference *::const char *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Set the upstream configuration for a given local branch

\n","comments":"","group":"branch"},"git_branch_is_head":{"type":"function","file":"branch.h","line":245,"lineto":246,"args":[{"name":"branch","type":"const git_reference *","comment":"Current underlying reference of the branch."}],"argline":"const git_reference *branch","sig":"const git_reference *","return":{"type":"int","comment":" 1 if HEAD points at the branch, 0 if it isn't,\n error code otherwise."},"description":"

Determine if the current local branch is pointed at by HEAD.

\n","comments":"","group":"branch"},"git_buf_free":{"type":"function","file":"buffer.h","line":72,"lineto":72,"args":[{"name":"buffer","type":"git_buf *","comment":"The buffer to deallocate"}],"argline":"git_buf *buffer","sig":"git_buf *","return":{"type":"void","comment":null},"description":"

Free the memory referred to by the git_buf.

\n","comments":"

Note that this does not free the git_buf itself, just the memory\n pointed to by buffer->ptr. This will not free the memory if it looks\n like it was not allocated internally, but it will clear the buffer back\n to the empty state.

\n","group":"buf","examples":{"diff.c":["ex/v0.23.2/diff.html#git_buf_free-1"],"remote.c":["ex/v0.23.2/remote.html#git_buf_free-1"],"tag.c":["ex/v0.23.2/tag.html#git_buf_free-1"]}},"git_buf_grow":{"type":"function","file":"buffer.h","line":95,"lineto":95,"args":[{"name":"buffer","type":"git_buf *","comment":"The buffer to be resized; may or may not be allocated yet"},{"name":"target_size","type":"size_t","comment":"The desired available size"}],"argline":"git_buf *buffer, size_t target_size","sig":"git_buf *::size_t","return":{"type":"int","comment":" 0 on success, -1 on allocation failure"},"description":"

Resize the buffer allocation to make more space.

\n","comments":"

This will attempt to grow the buffer to accommodate the target size.

\n\n

If the buffer refers to memory that was not allocated by libgit2 (i.e.\n the asize field is zero), then ptr will be replaced with a newly\n allocated block of data. Be careful so that memory allocated by the\n caller is not lost. As a special variant, if you pass target_size as\n 0 and the memory is not allocated by libgit2, this will allocate a new\n buffer of size size and copy the external data into it.

\n\n

Currently, this will never shrink a buffer, only expand it.

\n\n

If the allocation fails, this will return an error and the buffer will be\n marked as invalid for future operations, invaliding the contents.

\n","group":"buf"},"git_buf_set":{"type":"function","file":"buffer.h","line":105,"lineto":106,"args":[{"name":"buffer","type":"git_buf *","comment":"The buffer to set"},{"name":"data","type":"const void *","comment":"The data to copy into the buffer"},{"name":"datalen","type":"size_t","comment":"The length of the data to copy into the buffer"}],"argline":"git_buf *buffer, const void *data, size_t datalen","sig":"git_buf *::const void *::size_t","return":{"type":"int","comment":" 0 on success, -1 on allocation failure"},"description":"

Set buffer to a copy of some raw data.

\n","comments":"","group":"buf"},"git_buf_is_binary":{"type":"function","file":"buffer.h","line":114,"lineto":114,"args":[{"name":"buf","type":"const git_buf *","comment":"Buffer to check"}],"argline":"const git_buf *buf","sig":"const git_buf *","return":{"type":"int","comment":" 1 if buffer looks like non-text data"},"description":"

Check quickly if buffer looks like it contains binary data

\n","comments":"","group":"buf"},"git_buf_contains_nul":{"type":"function","file":"buffer.h","line":122,"lineto":122,"args":[{"name":"buf","type":"const git_buf *","comment":"Buffer to check"}],"argline":"const git_buf *buf","sig":"const git_buf *","return":{"type":"int","comment":" 1 if buffer contains a NUL byte"},"description":"

Check quickly if buffer contains a NUL byte

\n","comments":"","group":"buf"},"git_checkout_init_options":{"type":"function","file":"checkout.h","line":308,"lineto":310,"args":[{"name":"opts","type":"git_checkout_options *","comment":"the `git_checkout_options` struct to initialize."},{"name":"version","type":"unsigned int","comment":"Version of struct; pass `GIT_CHECKOUT_OPTIONS_VERSION`"}],"argline":"git_checkout_options *opts, unsigned int version","sig":"git_checkout_options *::unsigned int","return":{"type":"int","comment":" Zero on success; -1 on failure."},"description":"

Initializes a git_checkout_options with default values. Equivalent to\n creating an instance with GIT_CHECKOUT_OPTIONS_INIT.

\n","comments":"","group":"checkout"},"git_checkout_head":{"type":"function","file":"checkout.h","line":322,"lineto":324,"args":[{"name":"repo","type":"git_repository *","comment":"repository to check out (must be non-bare)"},{"name":"opts","type":"const git_checkout_options *","comment":"specifies checkout options (may be NULL)"}],"argline":"git_repository *repo, const git_checkout_options *opts","sig":"git_repository *::const git_checkout_options *","return":{"type":"int","comment":" 0 on success, GIT_EUNBORNBRANCH if HEAD points to a non\n existing branch, non-zero value returned by `notify_cb`, or\n other error code \n<\n 0 (use giterr_last for error details)"},"description":"

Updates files in the index and the working tree to match the content of\n the commit pointed at by HEAD.

\n","comments":"","group":"checkout"},"git_checkout_index":{"type":"function","file":"checkout.h","line":335,"lineto":338,"args":[{"name":"repo","type":"git_repository *","comment":"repository into which to check out (must be non-bare)"},{"name":"index","type":"git_index *","comment":"index to be checked out (or NULL to use repository index)"},{"name":"opts","type":"const git_checkout_options *","comment":"specifies checkout options (may be NULL)"}],"argline":"git_repository *repo, git_index *index, const git_checkout_options *opts","sig":"git_repository *::git_index *::const git_checkout_options *","return":{"type":"int","comment":" 0 on success, non-zero return value from `notify_cb`, or error\n code \n<\n 0 (use giterr_last for error details)"},"description":"

Updates files in the working tree to match the content of the index.

\n","comments":"","group":"checkout"},"git_checkout_tree":{"type":"function","file":"checkout.h","line":351,"lineto":354,"args":[{"name":"repo","type":"git_repository *","comment":"repository to check out (must be non-bare)"},{"name":"treeish","type":"const git_object *","comment":"a commit, tag or tree which content will be used to update\n the working directory (or NULL to use HEAD)"},{"name":"opts","type":"const git_checkout_options *","comment":"specifies checkout options (may be NULL)"}],"argline":"git_repository *repo, const git_object *treeish, const git_checkout_options *opts","sig":"git_repository *::const git_object *::const git_checkout_options *","return":{"type":"int","comment":" 0 on success, non-zero return value from `notify_cb`, or error\n code \n<\n 0 (use giterr_last for error details)"},"description":"

Updates files in the index and working tree to match the content of the\n tree pointed at by the treeish.

\n","comments":"","group":"checkout"},"git_cherrypick_init_options":{"type":"function","file":"cherrypick.h","line":47,"lineto":49,"args":[{"name":"opts","type":"git_cherrypick_options *","comment":"the `git_cherrypick_options` struct to initialize"},{"name":"version","type":"unsigned int","comment":"Version of struct; pass `GIT_CHERRYPICK_OPTIONS_VERSION`"}],"argline":"git_cherrypick_options *opts, unsigned int version","sig":"git_cherrypick_options *::unsigned int","return":{"type":"int","comment":" Zero on success; -1 on failure."},"description":"

Initializes a git_cherrypick_options with default values. Equivalent to\n creating an instance with GIT_CHERRYPICK_OPTIONS_INIT.

\n","comments":"","group":"cherrypick"},"git_cherrypick_commit":{"type":"function","file":"cherrypick.h","line":65,"lineto":71,"args":[{"name":"out","type":"git_index **","comment":"pointer to store the index result in"},{"name":"repo","type":"git_repository *","comment":"the repository that contains the given commits"},{"name":"cherrypick_commit","type":"git_commit *","comment":"the commit to cherry-pick"},{"name":"our_commit","type":"git_commit *","comment":"the commit to revert against (eg, HEAD)"},{"name":"mainline","type":"unsigned int","comment":"the parent of the revert commit, if it is a merge"},{"name":"merge_options","type":"const git_merge_options *","comment":"the merge options (or null for defaults)"}],"argline":"git_index **out, git_repository *repo, git_commit *cherrypick_commit, git_commit *our_commit, unsigned int mainline, const git_merge_options *merge_options","sig":"git_index **::git_repository *::git_commit *::git_commit *::unsigned int::const git_merge_options *","return":{"type":"int","comment":" zero on success, -1 on failure."},"description":"

Cherry-picks the given commit against the given "our" commit, producing an\n index that reflects the result of the cherry-pick.

\n","comments":"

The returned index must be freed explicitly with git_index_free.

\n","group":"cherrypick"},"git_cherrypick":{"type":"function","file":"cherrypick.h","line":81,"lineto":84,"args":[{"name":"repo","type":"git_repository *","comment":"the repository to cherry-pick"},{"name":"commit","type":"git_commit *","comment":"the commit to cherry-pick"},{"name":"cherrypick_options","type":"const git_cherrypick_options *","comment":"the cherry-pick options (or null for defaults)"}],"argline":"git_repository *repo, git_commit *commit, const git_cherrypick_options *cherrypick_options","sig":"git_repository *::git_commit *::const git_cherrypick_options *","return":{"type":"int","comment":" zero on success, -1 on failure."},"description":"

Cherry-pick the given commit, producing changes in the index and working directory.

\n","comments":"","group":"cherrypick"},"git_clone_init_options":{"type":"function","file":"clone.h","line":179,"lineto":181,"args":[{"name":"opts","type":"git_clone_options *","comment":"The `git_clone_options` struct to initialize"},{"name":"version","type":"unsigned int","comment":"Version of struct; pass `GIT_CLONE_OPTIONS_VERSION`"}],"argline":"git_clone_options *opts, unsigned int version","sig":"git_clone_options *::unsigned int","return":{"type":"int","comment":" Zero on success; -1 on failure."},"description":"

Initializes a git_clone_options with default values. Equivalent to\n creating an instance with GIT_CLONE_OPTIONS_INIT.

\n","comments":"","group":"clone"},"git_clone":{"type":"function","file":"clone.h","line":199,"lineto":203,"args":[{"name":"out","type":"git_repository **","comment":"pointer that will receive the resulting repository object"},{"name":"url","type":"const char *","comment":"the remote repository to clone"},{"name":"local_path","type":"const char *","comment":"local directory to clone to"},{"name":"options","type":"const git_clone_options *","comment":"configuration options for the clone. If NULL, the\n function works as though GIT_OPTIONS_INIT were passed."}],"argline":"git_repository **out, const char *url, const char *local_path, const git_clone_options *options","sig":"git_repository **::const char *::const char *::const git_clone_options *","return":{"type":"int","comment":" 0 on success, any non-zero return value from a callback\n function, or a negative value to indicate an error (use\n `giterr_last` for a detailed error message)"},"description":"

Clone a remote repository.

\n","comments":"

By default this creates its repository and initial remote to match\n git's defaults. You can use the options in the callback to\n customize how these are created.

\n","group":"clone","examples":{"network/clone.c":["ex/v0.23.2/network/clone.html#git_clone-1"]}},"git_commit_lookup":{"type":"function","file":"commit.h","line":36,"lineto":37,"args":[{"name":"commit","type":"git_commit **","comment":"pointer to the looked up commit"},{"name":"repo","type":"git_repository *","comment":"the repo to use when locating the commit."},{"name":"id","type":"const git_oid *","comment":"identity of the commit to locate. If the object is\n\t\tan annotated tag it will be peeled back to the commit."}],"argline":"git_commit **commit, git_repository *repo, const git_oid *id","sig":"git_commit **::git_repository *::const git_oid *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Lookup a commit object from a repository.

\n","comments":"

The returned object should be released with git_commit_free when no\n longer needed.

\n","group":"commit","examples":{"general.c":["ex/v0.23.2/general.html#git_commit_lookup-5","ex/v0.23.2/general.html#git_commit_lookup-6","ex/v0.23.2/general.html#git_commit_lookup-7"],"log.c":["ex/v0.23.2/log.html#git_commit_lookup-1"]}},"git_commit_lookup_prefix":{"type":"function","file":"commit.h","line":55,"lineto":56,"args":[{"name":"commit","type":"git_commit **","comment":"pointer to the looked up commit"},{"name":"repo","type":"git_repository *","comment":"the repo to use when locating the commit."},{"name":"id","type":"const git_oid *","comment":"identity of the commit to locate. If the object is\n\t\tan annotated tag it will be peeled back to the commit."},{"name":"len","type":"size_t","comment":"the length of the short identifier"}],"argline":"git_commit **commit, git_repository *repo, const git_oid *id, size_t len","sig":"git_commit **::git_repository *::const git_oid *::size_t","return":{"type":"int","comment":" 0 or an error code"},"description":"

Lookup a commit object from a repository, given a prefix of its\n identifier (short id).

\n","comments":"

The returned object should be released with git_commit_free when no\n longer needed.

\n","group":"commit"},"git_commit_free":{"type":"function","file":"commit.h","line":70,"lineto":70,"args":[{"name":"commit","type":"git_commit *","comment":"the commit to close"}],"argline":"git_commit *commit","sig":"git_commit *","return":{"type":"void","comment":null},"description":"

Close an open commit

\n","comments":"

This is a wrapper around git_object_free()

\n\n

IMPORTANT:\n It is necessary to call this method when you stop\n using a commit. Failure to do so will cause a memory leak.

\n","group":"commit","examples":{"general.c":["ex/v0.23.2/general.html#git_commit_free-8","ex/v0.23.2/general.html#git_commit_free-9","ex/v0.23.2/general.html#git_commit_free-10","ex/v0.23.2/general.html#git_commit_free-11"],"log.c":["ex/v0.23.2/log.html#git_commit_free-2","ex/v0.23.2/log.html#git_commit_free-3","ex/v0.23.2/log.html#git_commit_free-4","ex/v0.23.2/log.html#git_commit_free-5"]}},"git_commit_id":{"type":"function","file":"commit.h","line":78,"lineto":78,"args":[{"name":"commit","type":"const git_commit *","comment":"a previously loaded commit."}],"argline":"const git_commit *commit","sig":"const git_commit *","return":{"type":"const git_oid *","comment":" object identity for the commit."},"description":"

Get the id of a commit.

\n","comments":"","group":"commit","examples":{"general.c":["ex/v0.23.2/general.html#git_commit_id-12"],"log.c":["ex/v0.23.2/log.html#git_commit_id-6"]}},"git_commit_owner":{"type":"function","file":"commit.h","line":86,"lineto":86,"args":[{"name":"commit","type":"const git_commit *","comment":"A previously loaded commit."}],"argline":"const git_commit *commit","sig":"const git_commit *","return":{"type":"git_repository *","comment":" Repository that contains this commit."},"description":"

Get the repository that contains the commit.

\n","comments":"","group":"commit","examples":{"log.c":["ex/v0.23.2/log.html#git_commit_owner-7","ex/v0.23.2/log.html#git_commit_owner-8"]}},"git_commit_message_encoding":{"type":"function","file":"commit.h","line":98,"lineto":98,"args":[{"name":"commit","type":"const git_commit *","comment":"a previously loaded commit."}],"argline":"const git_commit *commit","sig":"const git_commit *","return":{"type":"const char *","comment":" NULL, or the encoding"},"description":"

Get the encoding for the message of a commit,\n as a string representing a standard encoding name.

\n","comments":"

The encoding may be NULL if the encoding header\n in the commit is missing; in that case UTF-8 is assumed.

\n","group":"commit"},"git_commit_message":{"type":"function","file":"commit.h","line":109,"lineto":109,"args":[{"name":"commit","type":"const git_commit *","comment":"a previously loaded commit."}],"argline":"const git_commit *commit","sig":"const git_commit *","return":{"type":"const char *","comment":" the message of a commit"},"description":"

Get the full message of a commit.

\n","comments":"

The returned message will be slightly prettified by removing any\n potential leading newlines.

\n","group":"commit","examples":{"cat-file.c":["ex/v0.23.2/cat-file.html#git_commit_message-3","ex/v0.23.2/cat-file.html#git_commit_message-4"],"general.c":["ex/v0.23.2/general.html#git_commit_message-13","ex/v0.23.2/general.html#git_commit_message-14","ex/v0.23.2/general.html#git_commit_message-15"],"log.c":["ex/v0.23.2/log.html#git_commit_message-9","ex/v0.23.2/log.html#git_commit_message-10"],"tag.c":["ex/v0.23.2/tag.html#git_commit_message-2"]}},"git_commit_message_raw":{"type":"function","file":"commit.h","line":117,"lineto":117,"args":[{"name":"commit","type":"const git_commit *","comment":"a previously loaded commit."}],"argline":"const git_commit *commit","sig":"const git_commit *","return":{"type":"const char *","comment":" the raw message of a commit"},"description":"

Get the full raw message of a commit.

\n","comments":"","group":"commit"},"git_commit_summary":{"type":"function","file":"commit.h","line":128,"lineto":128,"args":[{"name":"commit","type":"git_commit *","comment":"a previously loaded commit."}],"argline":"git_commit *commit","sig":"git_commit *","return":{"type":"const char *","comment":" the summary of a commit or NULL on error"},"description":"

Get the short "summary" of the git commit message.

\n","comments":"

The returned message is the summary of the commit, comprising the\n first paragraph of the message with whitespace trimmed and squashed.

\n","group":"commit"},"git_commit_time":{"type":"function","file":"commit.h","line":136,"lineto":136,"args":[{"name":"commit","type":"const git_commit *","comment":"a previously loaded commit."}],"argline":"const git_commit *commit","sig":"const git_commit *","return":{"type":"git_time_t","comment":" the time of a commit"},"description":"

Get the commit time (i.e. committer time) of a commit.

\n","comments":"","group":"commit","examples":{"general.c":["ex/v0.23.2/general.html#git_commit_time-16","ex/v0.23.2/general.html#git_commit_time-17"]}},"git_commit_time_offset":{"type":"function","file":"commit.h","line":144,"lineto":144,"args":[{"name":"commit","type":"const git_commit *","comment":"a previously loaded commit."}],"argline":"const git_commit *commit","sig":"const git_commit *","return":{"type":"int","comment":" positive or negative timezone offset, in minutes from UTC"},"description":"

Get the commit timezone offset (i.e. committer's preferred timezone) of a commit.

\n","comments":"","group":"commit"},"git_commit_committer":{"type":"function","file":"commit.h","line":152,"lineto":152,"args":[{"name":"commit","type":"const git_commit *","comment":"a previously loaded commit."}],"argline":"const git_commit *commit","sig":"const git_commit *","return":{"type":"const git_signature *","comment":" the committer of a commit"},"description":"

Get the committer of a commit.

\n","comments":"","group":"commit","examples":{"cat-file.c":["ex/v0.23.2/cat-file.html#git_commit_committer-5"],"general.c":["ex/v0.23.2/general.html#git_commit_committer-18"],"log.c":["ex/v0.23.2/log.html#git_commit_committer-11"]}},"git_commit_author":{"type":"function","file":"commit.h","line":160,"lineto":160,"args":[{"name":"commit","type":"const git_commit *","comment":"a previously loaded commit."}],"argline":"const git_commit *commit","sig":"const git_commit *","return":{"type":"const git_signature *","comment":" the author of a commit"},"description":"

Get the author of a commit.

\n","comments":"","group":"commit","examples":{"cat-file.c":["ex/v0.23.2/cat-file.html#git_commit_author-6"],"general.c":["ex/v0.23.2/general.html#git_commit_author-19","ex/v0.23.2/general.html#git_commit_author-20"],"log.c":["ex/v0.23.2/log.html#git_commit_author-12","ex/v0.23.2/log.html#git_commit_author-13"]}},"git_commit_raw_header":{"type":"function","file":"commit.h","line":168,"lineto":168,"args":[{"name":"commit","type":"const git_commit *","comment":"a previously loaded commit"}],"argline":"const git_commit *commit","sig":"const git_commit *","return":{"type":"const char *","comment":" the header text of the commit"},"description":"

Get the full raw text of the commit header.

\n","comments":"","group":"commit"},"git_commit_tree":{"type":"function","file":"commit.h","line":177,"lineto":177,"args":[{"name":"tree_out","type":"git_tree **","comment":"pointer where to store the tree object"},{"name":"commit","type":"const git_commit *","comment":"a previously loaded commit."}],"argline":"git_tree **tree_out, const git_commit *commit","sig":"git_tree **::const git_commit *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Get the tree pointed to by a commit.

\n","comments":"","group":"commit","examples":{"log.c":["ex/v0.23.2/log.html#git_commit_tree-14","ex/v0.23.2/log.html#git_commit_tree-15","ex/v0.23.2/log.html#git_commit_tree-16","ex/v0.23.2/log.html#git_commit_tree-17","ex/v0.23.2/log.html#git_commit_tree-18"]}},"git_commit_tree_id":{"type":"function","file":"commit.h","line":187,"lineto":187,"args":[{"name":"commit","type":"const git_commit *","comment":"a previously loaded commit."}],"argline":"const git_commit *commit","sig":"const git_commit *","return":{"type":"const git_oid *","comment":" the id of tree pointed to by commit."},"description":"

Get the id of the tree pointed to by a commit. This differs from\n git_commit_tree in that no attempts are made to fetch an object\n from the ODB.

\n","comments":"","group":"commit","examples":{"cat-file.c":["ex/v0.23.2/cat-file.html#git_commit_tree_id-7"]}},"git_commit_parentcount":{"type":"function","file":"commit.h","line":195,"lineto":195,"args":[{"name":"commit","type":"const git_commit *","comment":"a previously loaded commit."}],"argline":"const git_commit *commit","sig":"const git_commit *","return":{"type":"unsigned int","comment":" integer of count of parents"},"description":"

Get the number of parents of this commit

\n","comments":"","group":"commit","examples":{"cat-file.c":["ex/v0.23.2/cat-file.html#git_commit_parentcount-8"],"general.c":["ex/v0.23.2/general.html#git_commit_parentcount-21"],"log.c":["ex/v0.23.2/log.html#git_commit_parentcount-19","ex/v0.23.2/log.html#git_commit_parentcount-20"]}},"git_commit_parent":{"type":"function","file":"commit.h","line":205,"lineto":208,"args":[{"name":"out","type":"git_commit **","comment":"Pointer where to store the parent commit"},{"name":"commit","type":"const git_commit *","comment":"a previously loaded commit."},{"name":"n","type":"unsigned int","comment":"the position of the parent (from 0 to `parentcount`)"}],"argline":"git_commit **out, const git_commit *commit, unsigned int n","sig":"git_commit **::const git_commit *::unsigned int","return":{"type":"int","comment":" 0 or an error code"},"description":"

Get the specified parent of the commit.

\n","comments":"","group":"commit","examples":{"general.c":["ex/v0.23.2/general.html#git_commit_parent-22"],"log.c":["ex/v0.23.2/log.html#git_commit_parent-21","ex/v0.23.2/log.html#git_commit_parent-22"]}},"git_commit_parent_id":{"type":"function","file":"commit.h","line":219,"lineto":221,"args":[{"name":"commit","type":"const git_commit *","comment":"a previously loaded commit."},{"name":"n","type":"unsigned int","comment":"the position of the parent (from 0 to `parentcount`)"}],"argline":"const git_commit *commit, unsigned int n","sig":"const git_commit *::unsigned int","return":{"type":"const git_oid *","comment":" the id of the parent, NULL on error."},"description":"

Get the oid of a specified parent for a commit. This is different from\n git_commit_parent, which will attempt to load the parent commit from\n the ODB.

\n","comments":"","group":"commit","examples":{"cat-file.c":["ex/v0.23.2/cat-file.html#git_commit_parent_id-9"],"log.c":["ex/v0.23.2/log.html#git_commit_parent_id-23"]}},"git_commit_nth_gen_ancestor":{"type":"function","file":"commit.h","line":237,"lineto":240,"args":[{"name":"ancestor","type":"git_commit **","comment":"Pointer where to store the ancestor commit"},{"name":"commit","type":"const git_commit *","comment":"a previously loaded commit."},{"name":"n","type":"unsigned int","comment":"the requested generation"}],"argline":"git_commit **ancestor, const git_commit *commit, unsigned int n","sig":"git_commit **::const git_commit *::unsigned int","return":{"type":"int","comment":" 0 on success; GIT_ENOTFOUND if no matching ancestor exists\n or an error code"},"description":"

Get the commit object that is the \n<n

\n\n
\n

th generation ancestor\n of the named commit object, following only the first parents.\n The returned commit has to be freed by the caller.

\n
\n","comments":"

Passing 0 as the generation number returns another instance of the\n base commit itself.

\n","group":"commit"},"git_commit_header_field":{"type":"function","file":"commit.h","line":251,"lineto":251,"args":[{"name":"out","type":"git_buf *","comment":"the buffer to fill"},{"name":"commit","type":"const git_commit *","comment":"the commit to look in"},{"name":"field","type":"const char *","comment":"the header field to return"}],"argline":"git_buf *out, const git_commit *commit, const char *field","sig":"git_buf *::const git_commit *::const char *","return":{"type":"int","comment":" 0 on succeess, GIT_ENOTFOUND if the field does not exist,\n or an error code"},"description":"

Get an arbitrary header field

\n","comments":"","group":"commit"},"git_commit_create":{"type":"function","file":"commit.h","line":297,"lineto":307,"args":[{"name":"id","type":"git_oid *","comment":"Pointer in which to store the OID of the newly created commit"},{"name":"repo","type":"git_repository *","comment":"Repository where to store the commit"},{"name":"update_ref","type":"const char *","comment":"If not NULL, name of the reference that\n\twill be updated to point to this commit. If the reference\n\tis not direct, it will be resolved to a direct reference.\n\tUse \"HEAD\" to update the HEAD of the current branch and\n\tmake it point to this commit. If the reference doesn't\n\texist yet, it will be created. If it does exist, the first\n\tparent must be the tip of this branch."},{"name":"author","type":"const git_signature *","comment":"Signature with author and author time of commit"},{"name":"committer","type":"const git_signature *","comment":"Signature with committer and * commit time of commit"},{"name":"message_encoding","type":"const char *","comment":"The encoding for the message in the\n commit, represented with a standard encoding name.\n E.g. \"UTF-8\". If NULL, no encoding header is written and\n UTF-8 is assumed."},{"name":"message","type":"const char *","comment":"Full message for this commit"},{"name":"tree","type":"const git_tree *","comment":"An instance of a `git_tree` object that will\n be used as the tree for the commit. This tree object must\n also be owned by the given `repo`."},{"name":"parent_count","type":"size_t","comment":"Number of parents for this commit"},{"name":"parents","type":"const git_commit *[]","comment":"Array of `parent_count` pointers to `git_commit`\n objects that will be used as the parents for this commit. This\n array may be NULL if `parent_count` is 0 (root commit). All the\n given commits must be owned by the `repo`."}],"argline":"git_oid *id, git_repository *repo, const char *update_ref, const git_signature *author, const git_signature *committer, const char *message_encoding, const char *message, const git_tree *tree, size_t parent_count, const git_commit *[] parents","sig":"git_oid *::git_repository *::const char *::const git_signature *::const git_signature *::const char *::const char *::const git_tree *::size_t::const git_commit *[]","return":{"type":"int","comment":" 0 or an error code\n\tThe created commit will be written to the Object Database and\n\tthe given reference will be updated to point to it"},"description":"

Create new commit in the repository from a list of git_object pointers

\n","comments":"

The message will not be cleaned up automatically. You can do that\n with the git_message_prettify() function.

\n","group":"commit"},"git_commit_create_v":{"type":"function","file":"commit.h","line":323,"lineto":333,"args":[{"name":"id","type":"git_oid *","comment":null},{"name":"repo","type":"git_repository *","comment":null},{"name":"update_ref","type":"const char *","comment":null},{"name":"author","type":"const git_signature *","comment":null},{"name":"committer","type":"const git_signature *","comment":null},{"name":"message_encoding","type":"const char *","comment":null},{"name":"message","type":"const char *","comment":null},{"name":"tree","type":"const git_tree *","comment":null},{"name":"parent_count","type":"size_t","comment":null}],"argline":"git_oid *id, git_repository *repo, const char *update_ref, const git_signature *author, const git_signature *committer, const char *message_encoding, const char *message, const git_tree *tree, size_t parent_count","sig":"git_oid *::git_repository *::const char *::const git_signature *::const git_signature *::const char *::const char *::const git_tree *::size_t","return":{"type":"int","comment":null},"description":"

Create new commit in the repository using a variable argument list.

\n","comments":"

The message will not be cleaned up automatically. You can do that\n with the git_message_prettify() function.

\n\n

The parents for the commit are specified as a variable list of pointers\n to const git_commit *. Note that this is a convenience method which may\n not be safe to export for certain languages or compilers

\n\n

All other parameters remain the same as git_commit_create().

\n","group":"commit","examples":{"general.c":["ex/v0.23.2/general.html#git_commit_create_v-23"],"init.c":["ex/v0.23.2/init.html#git_commit_create_v-1"]}},"git_commit_amend":{"type":"function","file":"commit.h","line":356,"lineto":364,"args":[{"name":"id","type":"git_oid *","comment":null},{"name":"commit_to_amend","type":"const git_commit *","comment":null},{"name":"update_ref","type":"const char *","comment":null},{"name":"author","type":"const git_signature *","comment":null},{"name":"committer","type":"const git_signature *","comment":null},{"name":"message_encoding","type":"const char *","comment":null},{"name":"message","type":"const char *","comment":null},{"name":"tree","type":"const git_tree *","comment":null}],"argline":"git_oid *id, const git_commit *commit_to_amend, const char *update_ref, const git_signature *author, const git_signature *committer, const char *message_encoding, const char *message, const git_tree *tree","sig":"git_oid *::const git_commit *::const char *::const git_signature *::const git_signature *::const char *::const char *::const git_tree *","return":{"type":"int","comment":null},"description":"

Amend an existing commit by replacing only non-NULL values.

\n","comments":"

This creates a new commit that is exactly the same as the old commit,\n except that any non-NULL values will be updated. The new commit has\n the same parents as the old commit.

\n\n

The update_ref value works as in the regular git_commit_create(),\n updating the ref to point to the newly rewritten commit. If you want\n to amend a commit that is not currently the tip of the branch and then\n rewrite the following commits to reach a ref, pass this as NULL and\n update the rest of the commit chain and ref separately.

\n\n

Unlike git_commit_create(), the author, committer, message,\n message_encoding, and tree parameters can be NULL in which case this\n will use the values from the original commit_to_amend.

\n\n

All parameters have the same meanings as in git_commit_create().

\n","group":"commit"},"git_libgit2_version":{"type":"function","file":"common.h","line":94,"lineto":94,"args":[{"name":"major","type":"int *","comment":"Store the major version number"},{"name":"minor","type":"int *","comment":"Store the minor version number"},{"name":"rev","type":"int *","comment":"Store the revision (patch) number"}],"argline":"int *major, int *minor, int *rev","sig":"int *::int *::int *","return":{"type":"void","comment":null},"description":"

Return the version of the libgit2 library\n being currently used.

\n","comments":"","group":"libgit2"},"git_libgit2_features":{"type":"function","file":"common.h","line":124,"lineto":124,"args":[],"argline":"","sig":"","return":{"type":"int","comment":" A combination of GIT_FEATURE_* values."},"description":"

Query compile time options for libgit2.

\n","comments":"
    \n

  • GIT_FEATURE_THREADS\nLibgit2 was compiled with thread support. Note that thread support is\nstill to be seen as a 'work in progress' - basic object lookups are\nbelieved to be threadsafe, but other operations may not be.

    • \n

  • GIT_FEATURE_HTTPS\nLibgit2 supports the https:// protocol. This requires the openssl\nlibrary to be found when compiling libgit2.

    • \n

  • GIT_FEATURE_SSH\nLibgit2 supports the SSH protocol for network operations. This requires\nthe libssh2 library to be found when compiling libgit2

    • \n
\n","group":"libgit2"},"git_libgit2_opts":{"type":"function","file":"common.h","line":245,"lineto":245,"args":[{"name":"option","type":"int","comment":"Option key"}],"argline":"int option","sig":"int","return":{"type":"int","comment":" 0 on success, \n<\n0 on failure"},"description":"

Set or query a library global option

\n","comments":"

Available options:

\n\n
* opts(GIT_OPT_GET_MWINDOW_SIZE, size_t *):\n\n    > Get the maximum mmap window size\n\n* opts(GIT_OPT_SET_MWINDOW_SIZE, size_t):\n\n    > Set the maximum mmap window size\n\n* opts(GIT_OPT_GET_MWINDOW_MAPPED_LIMIT, size_t *):\n\n    > Get the maximum memory that will be mapped in total by the library\n\n* opts(GIT_OPT_SET_MWINDOW_MAPPED_LIMIT, size_t):\n\n    >Set the maximum amount of memory that can be mapped at any time\n    by the library\n\n* opts(GIT_OPT_GET_SEARCH_PATH, int level, git_buf *buf)\n\n    > Get the search path for a given level of config data.  "level" must\n    > be one of `GIT_CONFIG_LEVEL_SYSTEM`, `GIT_CONFIG_LEVEL_GLOBAL`, or\n    > `GIT_CONFIG_LEVEL_XDG`.  The search path is written to the `out`\n    > buffer.\n\n* opts(GIT_OPT_SET_SEARCH_PATH, int level, const char *path)\n\n    > Set the search path for a level of config data.  The search path\n    > applied to shared attributes and ignore files, too.\n    >\n    > - `path` lists directories delimited by GIT_PATH_LIST_SEPARATOR.\n    >   Pass NULL to reset to the default (generally based on environment\n    >   variables).  Use magic path `$PATH` to include the old value\n    >   of the path (if you want to prepend or append, for instance).\n    >\n    > - `level` must be GIT_CONFIG_LEVEL_SYSTEM, GIT_CONFIG_LEVEL_GLOBAL,\n    >   or GIT_CONFIG_LEVEL_XDG.\n\n* opts(GIT_OPT_SET_CACHE_OBJECT_LIMIT, git_otype type, size_t size)\n\n    > Set the maximum data size for the given type of object to be\n    > considered eligible for caching in memory.  Setting to value to\n    > zero means that that type of object will not be cached.\n    > Defaults to 0 for GIT_OBJ_BLOB (i.e. won't cache blobs) and 4k\n    > for GIT_OBJ_COMMIT, GIT_OBJ_TREE, and GIT_OBJ_TAG.\n\n* opts(GIT_OPT_SET_CACHE_MAX_SIZE, ssize_t max_storage_bytes)\n\n    > Set the maximum total data size that will be cached in memory\n    > across all repositories before libgit2 starts evicting objects\n    > from the cache.  This is a soft limit, in that the library might\n    > briefly exceed it, but will start aggressively evicting objects\n    > from cache when that happens.  The default cache size is 256MB.\n\n* opts(GIT_OPT_ENABLE_CACHING, int enabled)\n\n    > Enable or disable caching completely.\n    >\n    > Because caches are repository-specific, disabling the cache\n    > cannot immediately clear all cached objects, but each cache will\n    > be cleared on the next attempt to update anything in it.\n\n* opts(GIT_OPT_GET_CACHED_MEMORY, ssize_t *current, ssize_t *allowed)\n\n    > Get the current bytes in cache and the maximum that would be\n    > allowed in the cache.\n\n* opts(GIT_OPT_GET_TEMPLATE_PATH, git_buf *out)\n\n    > Get the default template path.\n    > The path is written to the `out` buffer.\n\n* opts(GIT_OPT_SET_TEMPLATE_PATH, const char *path)\n\n    > Set the default template path.\n    >\n    > - `path` directory of template.\n\n* opts(GIT_OPT_SET_SSL_CERT_LOCATIONS, const char *file, const char *path)\n\n    > Set the SSL certificate-authority locations.\n    >\n    > - `file` is the location of a file containing several\n    >   certificates concatenated together.\n    > - `path` is the location of a directory holding several\n    >   certificates, one per file.\n    >\n    > Either parameter may be `NULL`, but not both.\n
\n","group":"libgit2"},"git_config_entry_free":{"type":"function","file":"config.h","line":72,"lineto":72,"args":[{"name":"","type":"git_config_entry *","comment":null}],"argline":"git_config_entry *","sig":"git_config_entry *","return":{"type":"void","comment":null},"description":"

Free a config entry

\n","comments":"","group":"config"},"git_config_find_global":{"type":"function","file":"config.h","line":113,"lineto":113,"args":[{"name":"out","type":"git_buf *","comment":"Pointer to a user-allocated git_buf in which to store the path"}],"argline":"git_buf *out","sig":"git_buf *","return":{"type":"int","comment":" 0 if a global configuration file has been found. Its path will be stored in `out`."},"description":"

Locate the path to the global configuration file

\n","comments":"

The user or global configuration file is usually\n located in $HOME/.gitconfig.

\n\n

This method will try to guess the full path to that\n file, if the file exists. The returned path\n may be used on any git_config call to load the\n global configuration file.

\n\n

This method will not guess the path to the xdg compatible\n config file (.config/git/config).

\n","group":"config"},"git_config_find_xdg":{"type":"function","file":"config.h","line":130,"lineto":130,"args":[{"name":"out","type":"git_buf *","comment":"Pointer to a user-allocated git_buf in which to store the path"}],"argline":"git_buf *out","sig":"git_buf *","return":{"type":"int","comment":" 0 if a xdg compatible configuration file has been\n\tfound. Its path will be stored in `out`."},"description":"

Locate the path to the global xdg compatible configuration file

\n","comments":"

The xdg compatible configuration file is usually\n located in $HOME/.config/git/config.

\n\n

This method will try to guess the full path to that\n file, if the file exists. The returned path\n may be used on any git_config call to load the\n xdg compatible configuration file.

\n","group":"config"},"git_config_find_system":{"type":"function","file":"config.h","line":142,"lineto":142,"args":[{"name":"out","type":"git_buf *","comment":"Pointer to a user-allocated git_buf in which to store the path"}],"argline":"git_buf *out","sig":"git_buf *","return":{"type":"int","comment":" 0 if a system configuration file has been\n\tfound. Its path will be stored in `out`."},"description":"

Locate the path to the system configuration file

\n","comments":"

If /etc/gitconfig doesn't exist, it will look for\n %PROGRAMFILES%

\n\n

.

\n","group":"config"},"git_config_open_default":{"type":"function","file":"config.h","line":154,"lineto":154,"args":[{"name":"out","type":"git_config **","comment":"Pointer to store the config instance"}],"argline":"git_config **out","sig":"git_config **","return":{"type":"int","comment":" 0 or an error code"},"description":"

Open the global, XDG and system configuration files

\n","comments":"

Utility wrapper that finds the global, XDG and system configuration files\n and opens them into a single prioritized config object that can be\n used when accessing default config data outside a repository.

\n","group":"config"},"git_config_new":{"type":"function","file":"config.h","line":165,"lineto":165,"args":[{"name":"out","type":"git_config **","comment":"pointer to the new configuration"}],"argline":"git_config **out","sig":"git_config **","return":{"type":"int","comment":" 0 or an error code"},"description":"

Allocate a new configuration object

\n","comments":"

This object is empty, so you have to add a file to it before you\n can do anything with it.

\n","group":"config"},"git_config_add_file_ondisk":{"type":"function","file":"config.h","line":192,"lineto":196,"args":[{"name":"cfg","type":"git_config *","comment":"the configuration to add the file to"},{"name":"path","type":"const char *","comment":"path to the configuration file to add"},{"name":"level","type":"git_config_level_t","comment":"the priority level of the backend"},{"name":"force","type":"int","comment":"replace config file at the given priority level"}],"argline":"git_config *cfg, const char *path, git_config_level_t level, int force","sig":"git_config *::const char *::git_config_level_t::int","return":{"type":"int","comment":" 0 on success, GIT_EEXISTS when adding more than one file\n for a given priority level (and force_replace set to 0),\n GIT_ENOTFOUND when the file doesn't exist or error code"},"description":"

Add an on-disk config file instance to an existing config

\n","comments":"

The on-disk file pointed at by path will be opened and\n parsed; it's expected to be a native Git config file following\n the default Git config syntax (see man git-config).

\n\n

If the file does not exist, the file will still be added and it\n will be created the first time we write to it.

\n\n

Note that the configuration object will free the file\n automatically.

\n\n

Further queries on this config object will access each\n of the config file instances in order (instances with\n a higher priority level will be accessed first).

\n","group":"config"},"git_config_open_ondisk":{"type":"function","file":"config.h","line":210,"lineto":210,"args":[{"name":"out","type":"git_config **","comment":"The configuration instance to create"},{"name":"path","type":"const char *","comment":"Path to the on-disk file to open"}],"argline":"git_config **out, const char *path","sig":"git_config **::const char *","return":{"type":"int","comment":" 0 on success, or an error code"},"description":"

Create a new config instance containing a single on-disk file

\n","comments":"

This method is a simple utility wrapper for the following sequence\n of calls:\n - git_config_new\n - git_config_add_file_ondisk

\n","group":"config","examples":{"general.c":["ex/v0.23.2/general.html#git_config_open_ondisk-24"]}},"git_config_open_level":{"type":"function","file":"config.h","line":228,"lineto":231,"args":[{"name":"out","type":"git_config **","comment":"The configuration instance to create"},{"name":"parent","type":"const git_config *","comment":"Multi-level config to search for the given level"},{"name":"level","type":"git_config_level_t","comment":"Configuration level to search for"}],"argline":"git_config **out, const git_config *parent, git_config_level_t level","sig":"git_config **::const git_config *::git_config_level_t","return":{"type":"int","comment":" 0, GIT_ENOTFOUND if the passed level cannot be found in the\n multi-level parent config, or an error code"},"description":"

Build a single-level focused config object from a multi-level one.

\n","comments":"

The returned config object can be used to perform get/set/delete operations\n on a single specific level.

\n\n

Getting several times the same level from the same parent multi-level config\n will return different config instances, but containing the same config_file\n instance.

\n","group":"config"},"git_config_open_global":{"type":"function","file":"config.h","line":245,"lineto":245,"args":[{"name":"out","type":"git_config **","comment":"pointer in which to store the config object"},{"name":"config","type":"git_config *","comment":"the config object in which to look"}],"argline":"git_config **out, git_config *config","sig":"git_config **::git_config *","return":{"type":"int","comment":null},"description":"

Open the global/XDG configuration file according to git's rules

\n","comments":"

Git allows you to store your global configuration at\n $HOME/.config or $XDG_CONFIG_HOME/git/config. For backwards\n compatability, the XDG file shouldn't be used unless the use has\n created it explicitly. With this function you'll open the correct\n one to write to.

\n","group":"config"},"git_config_snapshot":{"type":"function","file":"config.h","line":261,"lineto":261,"args":[{"name":"out","type":"git_config **","comment":"pointer in which to store the snapshot config object"},{"name":"config","type":"git_config *","comment":"configuration to snapshot"}],"argline":"git_config **out, git_config *config","sig":"git_config **::git_config *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Create a snapshot of the configuration

\n","comments":"

Create a snapshot of the current state of a configuration, which\n allows you to look into a consistent view of the configuration for\n looking up complex values (e.g. a remote, submodule).

\n\n

The string returned when querying such a config object is valid\n until it is freed.

\n","group":"config"},"git_config_free":{"type":"function","file":"config.h","line":268,"lineto":268,"args":[{"name":"cfg","type":"git_config *","comment":"the configuration to free"}],"argline":"git_config *cfg","sig":"git_config *","return":{"type":"void","comment":null},"description":"

Free the configuration and its associated memory and files

\n","comments":"","group":"config"},"git_config_get_entry":{"type":"function","file":"config.h","line":280,"lineto":283,"args":[{"name":"out","type":"git_config_entry **","comment":"pointer to the variable git_config_entry"},{"name":"cfg","type":"const git_config *","comment":"where to look for the variable"},{"name":"name","type":"const char *","comment":"the variable's name"}],"argline":"git_config_entry **out, const git_config *cfg, const char *name","sig":"git_config_entry **::const git_config *::const char *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Get the git_config_entry of a config variable.

\n","comments":"

Free the git_config_entry after use with git_config_entry_free().

\n","group":"config"},"git_config_get_int32":{"type":"function","file":"config.h","line":297,"lineto":297,"args":[{"name":"out","type":"int32_t *","comment":"pointer to the variable where the value should be stored"},{"name":"cfg","type":"const git_config *","comment":"where to look for the variable"},{"name":"name","type":"const char *","comment":"the variable's name"}],"argline":"int32_t *out, const git_config *cfg, const char *name","sig":"int32_t *::const git_config *::const char *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Get the value of an integer config variable.

\n","comments":"

All config files will be looked into, in the order of their\n defined level. A higher level means a higher priority. The\n first occurrence of the variable will be returned here.

\n","group":"config","examples":{"general.c":["ex/v0.23.2/general.html#git_config_get_int32-25"]}},"git_config_get_int64":{"type":"function","file":"config.h","line":311,"lineto":311,"args":[{"name":"out","type":"int64_t *","comment":"pointer to the variable where the value should be stored"},{"name":"cfg","type":"const git_config *","comment":"where to look for the variable"},{"name":"name","type":"const char *","comment":"the variable's name"}],"argline":"int64_t *out, const git_config *cfg, const char *name","sig":"int64_t *::const git_config *::const char *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Get the value of a long integer config variable.

\n","comments":"

All config files will be looked into, in the order of their\n defined level. A higher level means a higher priority. The\n first occurrence of the variable will be returned here.

\n","group":"config"},"git_config_get_bool":{"type":"function","file":"config.h","line":328,"lineto":328,"args":[{"name":"out","type":"int *","comment":"pointer to the variable where the value should be stored"},{"name":"cfg","type":"const git_config *","comment":"where to look for the variable"},{"name":"name","type":"const char *","comment":"the variable's name"}],"argline":"int *out, const git_config *cfg, const char *name","sig":"int *::const git_config *::const char *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Get the value of a boolean config variable.

\n","comments":"

This function uses the usual C convention of 0 being false and\n anything else true.

\n\n

All config files will be looked into, in the order of their\n defined level. A higher level means a higher priority. The\n first occurrence of the variable will be returned here.

\n","group":"config"},"git_config_get_path":{"type":"function","file":"config.h","line":346,"lineto":346,"args":[{"name":"out","type":"git_buf *","comment":"the buffer in which to store the result"},{"name":"cfg","type":"const git_config *","comment":"where to look for the variable"},{"name":"name","type":"const char *","comment":"the variable's name"}],"argline":"git_buf *out, const git_config *cfg, const char *name","sig":"git_buf *::const git_config *::const char *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Get the value of a path config variable.

\n","comments":"

A leading '~' will be expanded to the global search path (which\n defaults to the user's home directory but can be overridden via\n git_libgit2_opts().

\n\n

All config files will be looked into, in the order of their\n defined level. A higher level means a higher priority. The\n first occurrence of the variable will be returned here.

\n","group":"config"},"git_config_get_string":{"type":"function","file":"config.h","line":364,"lineto":364,"args":[{"name":"out","type":"const char **","comment":"pointer to the string"},{"name":"cfg","type":"const git_config *","comment":"where to look for the variable"},{"name":"name","type":"const char *","comment":"the variable's name"}],"argline":"const char **out, const git_config *cfg, const char *name","sig":"const char **::const git_config *::const char *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Get the value of a string config variable.

\n","comments":"

This function can only be used on snapshot config objects. The\n string is owned by the config and should not be freed by the\n user. The pointer will be valid until the config is freed.

\n\n

All config files will be looked into, in the order of their\n defined level. A higher level means a higher priority. The\n first occurrence of the variable will be returned here.

\n","group":"config","examples":{"general.c":["ex/v0.23.2/general.html#git_config_get_string-26"]}},"git_config_get_string_buf":{"type":"function","file":"config.h","line":380,"lineto":380,"args":[{"name":"out","type":"git_buf *","comment":"buffer in which to store the string"},{"name":"cfg","type":"const git_config *","comment":"where to look for the variable"},{"name":"name","type":"const char *","comment":"the variable's name"}],"argline":"git_buf *out, const git_config *cfg, const char *name","sig":"git_buf *::const git_config *::const char *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Get the value of a string config variable.

\n","comments":"

The value of the config will be copied into the buffer.

\n\n

All config files will be looked into, in the order of their\n defined level. A higher level means a higher priority. The\n first occurrence of the variable will be returned here.

\n","group":"config"},"git_config_get_multivar_foreach":{"type":"function","file":"config.h","line":394,"lineto":394,"args":[{"name":"cfg","type":"const git_config *","comment":"where to look for the variable"},{"name":"name","type":"const char *","comment":"the variable's name"},{"name":"regexp","type":"const char *","comment":"regular expression to filter which variables we're\n interested in. Use NULL to indicate all"},{"name":"callback","type":"git_config_foreach_cb","comment":"the function to be called on each value of the variable"},{"name":"payload","type":"void *","comment":"opaque pointer to pass to the callback"}],"argline":"const git_config *cfg, const char *name, const char *regexp, git_config_foreach_cb callback, void *payload","sig":"const git_config *::const char *::const char *::git_config_foreach_cb::void *","return":{"type":"int","comment":null},"description":"

Get each value of a multivar in a foreach callback

\n","comments":"

The callback will be called on each variable found

\n","group":"config"},"git_config_multivar_iterator_new":{"type":"function","file":"config.h","line":405,"lineto":405,"args":[{"name":"out","type":"git_config_iterator **","comment":"pointer to store the iterator"},{"name":"cfg","type":"const git_config *","comment":"where to look for the variable"},{"name":"name","type":"const char *","comment":"the variable's name"},{"name":"regexp","type":"const char *","comment":"regular expression to filter which variables we're\n interested in. Use NULL to indicate all"}],"argline":"git_config_iterator **out, const git_config *cfg, const char *name, const char *regexp","sig":"git_config_iterator **::const git_config *::const char *::const char *","return":{"type":"int","comment":null},"description":"

Get each value of a multivar

\n","comments":"","group":"config"},"git_config_next":{"type":"function","file":"config.h","line":417,"lineto":417,"args":[{"name":"entry","type":"git_config_entry **","comment":"pointer to store the entry"},{"name":"iter","type":"git_config_iterator *","comment":"the iterator"}],"argline":"git_config_entry **entry, git_config_iterator *iter","sig":"git_config_entry **::git_config_iterator *","return":{"type":"int","comment":" 0 or an error code. GIT_ITEROVER if the iteration has completed"},"description":"

Return the current entry and advance the iterator

\n","comments":"

The pointers returned by this function are valid until the iterator\n is freed.

\n","group":"config"},"git_config_iterator_free":{"type":"function","file":"config.h","line":424,"lineto":424,"args":[{"name":"iter","type":"git_config_iterator *","comment":"the iterator to free"}],"argline":"git_config_iterator *iter","sig":"git_config_iterator *","return":{"type":"void","comment":null},"description":"

Free a config iterator

\n","comments":"","group":"config"},"git_config_set_int32":{"type":"function","file":"config.h","line":435,"lineto":435,"args":[{"name":"cfg","type":"git_config *","comment":"where to look for the variable"},{"name":"name","type":"const char *","comment":"the variable's name"},{"name":"value","type":"int32_t","comment":"Integer value for the variable"}],"argline":"git_config *cfg, const char *name, int32_t value","sig":"git_config *::const char *::int32_t","return":{"type":"int","comment":" 0 or an error code"},"description":"

Set the value of an integer config variable in the config file\n with the highest level (usually the local one).

\n","comments":"","group":"config"},"git_config_set_int64":{"type":"function","file":"config.h","line":446,"lineto":446,"args":[{"name":"cfg","type":"git_config *","comment":"where to look for the variable"},{"name":"name","type":"const char *","comment":"the variable's name"},{"name":"value","type":"int64_t","comment":"Long integer value for the variable"}],"argline":"git_config *cfg, const char *name, int64_t value","sig":"git_config *::const char *::int64_t","return":{"type":"int","comment":" 0 or an error code"},"description":"

Set the value of a long integer config variable in the config file\n with the highest level (usually the local one).

\n","comments":"","group":"config"},"git_config_set_bool":{"type":"function","file":"config.h","line":457,"lineto":457,"args":[{"name":"cfg","type":"git_config *","comment":"where to look for the variable"},{"name":"name","type":"const char *","comment":"the variable's name"},{"name":"value","type":"int","comment":"the value to store"}],"argline":"git_config *cfg, const char *name, int value","sig":"git_config *::const char *::int","return":{"type":"int","comment":" 0 or an error code"},"description":"

Set the value of a boolean config variable in the config file\n with the highest level (usually the local one).

\n","comments":"","group":"config"},"git_config_set_string":{"type":"function","file":"config.h","line":471,"lineto":471,"args":[{"name":"cfg","type":"git_config *","comment":"where to look for the variable"},{"name":"name","type":"const char *","comment":"the variable's name"},{"name":"value","type":"const char *","comment":"the string to store."}],"argline":"git_config *cfg, const char *name, const char *value","sig":"git_config *::const char *::const char *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Set the value of a string config variable in the config file\n with the highest level (usually the local one).

\n","comments":"

A copy of the string is made and the user is free to use it\n afterwards.

\n","group":"config"},"git_config_set_multivar":{"type":"function","file":"config.h","line":481,"lineto":481,"args":[{"name":"cfg","type":"git_config *","comment":"where to look for the variable"},{"name":"name","type":"const char *","comment":"the variable's name"},{"name":"regexp","type":"const char *","comment":"a regular expression to indicate which values to replace"},{"name":"value","type":"const char *","comment":"the new value."}],"argline":"git_config *cfg, const char *name, const char *regexp, const char *value","sig":"git_config *::const char *::const char *::const char *","return":{"type":"int","comment":null},"description":"

Set a multivar in the local config file.

\n","comments":"","group":"config"},"git_config_delete_entry":{"type":"function","file":"config.h","line":490,"lineto":490,"args":[{"name":"cfg","type":"git_config *","comment":"the configuration"},{"name":"name","type":"const char *","comment":"the variable to delete"}],"argline":"git_config *cfg, const char *name","sig":"git_config *::const char *","return":{"type":"int","comment":null},"description":"

Delete a config variable from the config file\n with the highest level (usually the local one).

\n","comments":"","group":"config"},"git_config_delete_multivar":{"type":"function","file":"config.h","line":501,"lineto":501,"args":[{"name":"cfg","type":"git_config *","comment":"where to look for the variables"},{"name":"name","type":"const char *","comment":"the variable's name"},{"name":"regexp","type":"const char *","comment":"a regular expression to indicate which values to delete"}],"argline":"git_config *cfg, const char *name, const char *regexp","sig":"git_config *::const char *::const char *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Deletes one or several entries from a multivar in the local config file.

\n","comments":"","group":"config"},"git_config_foreach":{"type":"function","file":"config.h","line":519,"lineto":522,"args":[{"name":"cfg","type":"const git_config *","comment":"where to get the variables from"},{"name":"callback","type":"git_config_foreach_cb","comment":"the function to call on each variable"},{"name":"payload","type":"void *","comment":"the data to pass to the callback"}],"argline":"const git_config *cfg, git_config_foreach_cb callback, void *payload","sig":"const git_config *::git_config_foreach_cb::void *","return":{"type":"int","comment":" 0 on success, non-zero callback return value, or error code"},"description":"

Perform an operation on each config variable.

\n","comments":"

The callback receives the normalized name and value of each variable\n in the config backend, and the data pointer passed to this function.\n If the callback returns a non-zero value, the function stops iterating\n and returns that value to the caller.

\n\n

The pointers passed to the callback are only valid as long as the\n iteration is ongoing.

\n","group":"config"},"git_config_iterator_new":{"type":"function","file":"config.h","line":533,"lineto":533,"args":[{"name":"out","type":"git_config_iterator **","comment":"pointer to store the iterator"},{"name":"cfg","type":"const git_config *","comment":"where to ge the variables from"}],"argline":"git_config_iterator **out, const git_config *cfg","sig":"git_config_iterator **::const git_config *","return":{"type":"int","comment":null},"description":"

Iterate over all the config variables

\n","comments":"

Use git_config_next to advance the iteration and\n git_config_iterator_free when done.

\n","group":"config"},"git_config_iterator_glob_new":{"type":"function","file":"config.h","line":545,"lineto":545,"args":[{"name":"out","type":"git_config_iterator **","comment":"pointer to store the iterator"},{"name":"cfg","type":"const git_config *","comment":"where to ge the variables from"},{"name":"regexp","type":"const char *","comment":"regular expression to match the names"}],"argline":"git_config_iterator **out, const git_config *cfg, const char *regexp","sig":"git_config_iterator **::const git_config *::const char *","return":{"type":"int","comment":null},"description":"

Iterate over all the config variables whose name matches a pattern

\n","comments":"

Use git_config_next to advance the iteration and\n git_config_iterator_free when done.

\n","group":"config"},"git_config_foreach_match":{"type":"function","file":"config.h","line":563,"lineto":567,"args":[{"name":"cfg","type":"const git_config *","comment":"where to get the variables from"},{"name":"regexp","type":"const char *","comment":"regular expression to match against config names"},{"name":"callback","type":"git_config_foreach_cb","comment":"the function to call on each variable"},{"name":"payload","type":"void *","comment":"the data to pass to the callback"}],"argline":"const git_config *cfg, const char *regexp, git_config_foreach_cb callback, void *payload","sig":"const git_config *::const char *::git_config_foreach_cb::void *","return":{"type":"int","comment":" 0 or the return value of the callback which didn't return 0"},"description":"

Perform an operation on each config variable matching a regular expression.

\n","comments":"

This behaviors like git_config_foreach with an additional filter of a\n regular expression that filters which config keys are passed to the\n callback.

\n\n

The pointers passed to the callback are only valid as long as the\n iteration is ongoing.

\n","group":"config"},"git_config_get_mapped":{"type":"function","file":"config.h","line":603,"lineto":608,"args":[{"name":"out","type":"int *","comment":"place to store the result of the mapping"},{"name":"cfg","type":"const git_config *","comment":"config file to get the variables from"},{"name":"name","type":"const char *","comment":"name of the config variable to lookup"},{"name":"maps","type":"const git_cvar_map *","comment":"array of `git_cvar_map` objects specifying the possible mappings"},{"name":"map_n","type":"size_t","comment":"number of mapping objects in `maps`"}],"argline":"int *out, const git_config *cfg, const char *name, const git_cvar_map *maps, size_t map_n","sig":"int *::const git_config *::const char *::const git_cvar_map *::size_t","return":{"type":"int","comment":" 0 on success, error code otherwise"},"description":"

Query the value of a config variable and return it mapped to\n an integer constant.

\n","comments":"

This is a helper method to easily map different possible values\n to a variable to integer constants that easily identify them.

\n\n

A mapping array looks as follows:

\n\n
git_cvar_map autocrlf_mapping[] = {\n    {GIT_CVAR_FALSE, NULL, GIT_AUTO_CRLF_FALSE},\n    {GIT_CVAR_TRUE, NULL, GIT_AUTO_CRLF_TRUE},\n    {GIT_CVAR_STRING, "input", GIT_AUTO_CRLF_INPUT},\n    {GIT_CVAR_STRING, "default", GIT_AUTO_CRLF_DEFAULT}};\n
\n\n

On any "false" value for the variable (e.g. "false", "FALSE", "no"), the\n mapping will store GIT_AUTO_CRLF_FALSE in the out parameter.

\n\n

The same thing applies for any "true" value such as "true", "yes" or "1", storing\n the GIT_AUTO_CRLF_TRUE variable.

\n\n

Otherwise, if the value matches the string "input" (with case insensitive comparison),\n the given constant will be stored in out, and likewise for "default".

\n\n

If not a single match can be made to store in out, an error code will be\n returned.

\n","group":"config"},"git_config_lookup_map_value":{"type":"function","file":"config.h","line":618,"lineto":622,"args":[{"name":"out","type":"int *","comment":"place to store the result of the parsing"},{"name":"maps","type":"const git_cvar_map *","comment":"array of `git_cvar_map` objects specifying the possible mappings"},{"name":"map_n","type":"size_t","comment":"number of mapping objects in `maps`"},{"name":"value","type":"const char *","comment":"value to parse"}],"argline":"int *out, const git_cvar_map *maps, size_t map_n, const char *value","sig":"int *::const git_cvar_map *::size_t::const char *","return":{"type":"int","comment":null},"description":"

Maps a string value to an integer constant

\n","comments":"","group":"config"},"git_config_parse_bool":{"type":"function","file":"config.h","line":634,"lineto":634,"args":[{"name":"out","type":"int *","comment":"place to store the result of the parsing"},{"name":"value","type":"const char *","comment":"value to parse"}],"argline":"int *out, const char *value","sig":"int *::const char *","return":{"type":"int","comment":null},"description":"

Parse a string value as a bool.

\n","comments":"

Valid values for true are: 'true', 'yes', 'on', 1 or any\n number different from 0\n Valid values for false are: 'false', 'no', 'off', 0

\n","group":"config"},"git_config_parse_int32":{"type":"function","file":"config.h","line":646,"lineto":646,"args":[{"name":"out","type":"int32_t *","comment":"place to store the result of the parsing"},{"name":"value","type":"const char *","comment":"value to parse"}],"argline":"int32_t *out, const char *value","sig":"int32_t *::const char *","return":{"type":"int","comment":null},"description":"

Parse a string value as an int32.

\n","comments":"

An optional value suffix of 'k', 'm', or 'g' will\n cause the value to be multiplied by 1024, 1048576,\n or 1073741824 prior to output.

\n","group":"config"},"git_config_parse_int64":{"type":"function","file":"config.h","line":658,"lineto":658,"args":[{"name":"out","type":"int64_t *","comment":"place to store the result of the parsing"},{"name":"value","type":"const char *","comment":"value to parse"}],"argline":"int64_t *out, const char *value","sig":"int64_t *::const char *","return":{"type":"int","comment":null},"description":"

Parse a string value as an int64.

\n","comments":"

An optional value suffix of 'k', 'm', or 'g' will\n cause the value to be multiplied by 1024, 1048576,\n or 1073741824 prior to output.

\n","group":"config"},"git_config_parse_path":{"type":"function","file":"config.h","line":673,"lineto":673,"args":[{"name":"out","type":"git_buf *","comment":"placae to store the result of parsing"},{"name":"value","type":"const char *","comment":"the path to evaluate"}],"argline":"git_buf *out, const char *value","sig":"git_buf *::const char *","return":{"type":"int","comment":null},"description":"

Parse a string value as a path.

\n","comments":"

A leading '~' will be expanded to the global search path (which\n defaults to the user's home directory but can be overridden via\n git_libgit2_opts().

\n\n

If the value does not begin with a tilde, the input will be\n returned.

\n","group":"config"},"git_config_backend_foreach_match":{"type":"function","file":"config.h","line":687,"lineto":691,"args":[{"name":"backend","type":"git_config_backend *","comment":"where to get the variables from"},{"name":"regexp","type":"const char *","comment":"regular expression to match against config names (can be NULL)"},{"name":"callback","type":"git_config_foreach_cb","comment":"the function to call on each variable"},{"name":"payload","type":"void *","comment":"the data to pass to the callback"}],"argline":"git_config_backend *backend, const char *regexp, git_config_foreach_cb callback, void *payload","sig":"git_config_backend *::const char *::git_config_foreach_cb::void *","return":{"type":"int","comment":null},"description":"

Perform an operation on each config variable in given config backend\n matching a regular expression.

\n","comments":"

This behaviors like git_config_foreach_match except instead of all config\n entries it just enumerates through the given backend entry.

\n","group":"config"},"git_cred_userpass":{"type":"function","file":"cred_helpers.h","line":43,"lineto":48,"args":[{"name":"cred","type":"git_cred **","comment":"The newly created credential object."},{"name":"url","type":"const char *","comment":"The resource for which we are demanding a credential."},{"name":"user_from_url","type":"const char *","comment":"The username that was embedded in a \"user\n@\nhost\"\n remote url, or NULL if not included."},{"name":"allowed_types","type":"unsigned int","comment":"A bitmask stating which cred types are OK to return."},{"name":"payload","type":"void *","comment":"The payload provided when specifying this callback. (This is\n interpreted as a `git_cred_userpass_payload*`.)"}],"argline":"git_cred **cred, const char *url, const char *user_from_url, unsigned int allowed_types, void *payload","sig":"git_cred **::const char *::const char *::unsigned int::void *","return":{"type":"int","comment":null},"description":"

Stock callback usable as a git_cred_acquire_cb. This calls\n git_cred_userpass_plaintext_new unless the protocol has not specified\n GIT_CREDTYPE_USERPASS_PLAINTEXT as an allowed type.

\n","comments":"","group":"cred"},"git_describe_commit":{"type":"function","file":"describe.h","line":120,"lineto":123,"args":[{"name":"result","type":"git_describe_result **","comment":"pointer to store the result. You must free this once\n you're done with it."},{"name":"committish","type":"git_object *","comment":"a committish to describe"},{"name":"opts","type":"git_describe_options *","comment":"the lookup options"}],"argline":"git_describe_result **result, git_object *committish, git_describe_options *opts","sig":"git_describe_result **::git_object *::git_describe_options *","return":{"type":"int","comment":null},"description":"

Describe a commit

\n","comments":"

Perform the describe operation on the given committish object.

\n","group":"describe","examples":{"describe.c":["ex/v0.23.2/describe.html#git_describe_commit-1"]}},"git_describe_workdir":{"type":"function","file":"describe.h","line":137,"lineto":140,"args":[{"name":"out","type":"git_describe_result **","comment":"pointer to store the result. You must free this once\n you're done with it."},{"name":"repo","type":"git_repository *","comment":"the repository in which to perform the describe"},{"name":"opts","type":"git_describe_options *","comment":"the lookup options"}],"argline":"git_describe_result **out, git_repository *repo, git_describe_options *opts","sig":"git_describe_result **::git_repository *::git_describe_options *","return":{"type":"int","comment":null},"description":"

Describe a commit

\n","comments":"

Perform the describe operation on the current commit and the\n worktree. After peforming describe on HEAD, a status is run and the\n description is considered to be dirty if there are.

\n","group":"describe","examples":{"describe.c":["ex/v0.23.2/describe.html#git_describe_workdir-2"]}},"git_describe_format":{"type":"function","file":"describe.h","line":150,"lineto":153,"args":[{"name":"out","type":"git_buf *","comment":"The buffer to store the result"},{"name":"result","type":"const git_describe_result *","comment":"the result from `git_describe_commit()` or\n `git_describe_workdir()`."},{"name":"opts","type":"const git_describe_format_options *","comment":"the formatting options"}],"argline":"git_buf *out, const git_describe_result *result, const git_describe_format_options *opts","sig":"git_buf *::const git_describe_result *::const git_describe_format_options *","return":{"type":"int","comment":null},"description":"

Print the describe result to a buffer

\n","comments":"","group":"describe","examples":{"describe.c":["ex/v0.23.2/describe.html#git_describe_format-3"]}},"git_describe_result_free":{"type":"function","file":"describe.h","line":158,"lineto":158,"args":[{"name":"result","type":"git_describe_result *","comment":null}],"argline":"git_describe_result *result","sig":"git_describe_result *","return":{"type":"void","comment":null},"description":"

Free the describe result.

\n","comments":"","group":"describe"},"git_diff_init_options":{"type":"function","file":"diff.h","line":412,"lineto":414,"args":[{"name":"opts","type":"git_diff_options *","comment":"The `git_diff_options` struct to initialize"},{"name":"version","type":"unsigned int","comment":"Version of struct; pass `GIT_DIFF_OPTIONS_VERSION`"}],"argline":"git_diff_options *opts, unsigned int version","sig":"git_diff_options *::unsigned int","return":{"type":"int","comment":" Zero on success; -1 on failure."},"description":"

Initializes a git_diff_options with default values. Equivalent to\n creating an instance with GIT_DIFF_OPTIONS_INIT.

\n","comments":"","group":"diff"},"git_diff_find_init_options":{"type":"function","file":"diff.h","line":697,"lineto":699,"args":[{"name":"opts","type":"git_diff_find_options *","comment":"The `git_diff_find_options` struct to initialize"},{"name":"version","type":"unsigned int","comment":"Version of struct; pass `GIT_DIFF_FIND_OPTIONS_VERSION`"}],"argline":"git_diff_find_options *opts, unsigned int version","sig":"git_diff_find_options *::unsigned int","return":{"type":"int","comment":" Zero on success; -1 on failure."},"description":"

Initializes a git_diff_find_options with default values. Equivalent to\n creating an instance with GIT_DIFF_FIND_OPTIONS_INIT.

\n","comments":"","group":"diff"},"git_diff_free":{"type":"function","file":"diff.h","line":713,"lineto":713,"args":[{"name":"diff","type":"git_diff *","comment":"The previously created diff; cannot be used after free."}],"argline":"git_diff *diff","sig":"git_diff *","return":{"type":"void","comment":null},"description":"

Deallocate a diff.

\n","comments":"","group":"diff","examples":{"diff.c":["ex/v0.23.2/diff.html#git_diff_free-2"],"log.c":["ex/v0.23.2/log.html#git_diff_free-24","ex/v0.23.2/log.html#git_diff_free-25"]}},"git_diff_tree_to_tree":{"type":"function","file":"diff.h","line":731,"lineto":736,"args":[{"name":"diff","type":"git_diff **","comment":"Output pointer to a git_diff pointer to be allocated."},{"name":"repo","type":"git_repository *","comment":"The repository containing the trees."},{"name":"old_tree","type":"git_tree *","comment":"A git_tree object to diff from, or NULL for empty tree."},{"name":"new_tree","type":"git_tree *","comment":"A git_tree object to diff to, or NULL for empty tree."},{"name":"opts","type":"const git_diff_options *","comment":"Structure with options to influence diff or NULL for defaults."}],"argline":"git_diff **diff, git_repository *repo, git_tree *old_tree, git_tree *new_tree, const git_diff_options *opts","sig":"git_diff **::git_repository *::git_tree *::git_tree *::const git_diff_options *","return":{"type":"int","comment":null},"description":"

Create a diff with the difference between two tree objects.

\n","comments":"

This is equivalent to git diff \n<old\n-tree> \n<new\n-tree>

\n\n

The first tree will be used for the "old_file" side of the delta and the\n second tree will be used for the "new_file" side of the delta. You can\n pass NULL to indicate an empty tree, although it is an error to pass\n NULL for both the old_tree and new_tree.

\n","group":"diff","examples":{"diff.c":["ex/v0.23.2/diff.html#git_diff_tree_to_tree-3"],"log.c":["ex/v0.23.2/log.html#git_diff_tree_to_tree-26","ex/v0.23.2/log.html#git_diff_tree_to_tree-27"]}},"git_diff_tree_to_index":{"type":"function","file":"diff.h","line":757,"lineto":762,"args":[{"name":"diff","type":"git_diff **","comment":"Output pointer to a git_diff pointer to be allocated."},{"name":"repo","type":"git_repository *","comment":"The repository containing the tree and index."},{"name":"old_tree","type":"git_tree *","comment":"A git_tree object to diff from, or NULL for empty tree."},{"name":"index","type":"git_index *","comment":"The index to diff with; repo index used if NULL."},{"name":"opts","type":"const git_diff_options *","comment":"Structure with options to influence diff or NULL for defaults."}],"argline":"git_diff **diff, git_repository *repo, git_tree *old_tree, git_index *index, const git_diff_options *opts","sig":"git_diff **::git_repository *::git_tree *::git_index *::const git_diff_options *","return":{"type":"int","comment":null},"description":"

Create a diff between a tree and repository index.

\n","comments":"

This is equivalent to `git diff --cached \n<treeish

\n\n
\n

or if you pass\n the HEAD tree, then likegit diff --cached`.

\n
\n\n

The tree you pass will be used for the "old_file" side of the delta, and\n the index will be used for the "new_file" side of the delta.

\n\n

If you pass NULL for the index, then the existing index of the repo\n will be used. In this case, the index will be refreshed from disk\n (if it has changed) before the diff is generated.

\n","group":"diff","examples":{"diff.c":["ex/v0.23.2/diff.html#git_diff_tree_to_index-4"]}},"git_diff_index_to_workdir":{"type":"function","file":"diff.h","line":784,"lineto":788,"args":[{"name":"diff","type":"git_diff **","comment":"Output pointer to a git_diff pointer to be allocated."},{"name":"repo","type":"git_repository *","comment":"The repository."},{"name":"index","type":"git_index *","comment":"The index to diff from; repo index used if NULL."},{"name":"opts","type":"const git_diff_options *","comment":"Structure with options to influence diff or NULL for defaults."}],"argline":"git_diff **diff, git_repository *repo, git_index *index, const git_diff_options *opts","sig":"git_diff **::git_repository *::git_index *::const git_diff_options *","return":{"type":"int","comment":null},"description":"

Create a diff between the repository index and the workdir directory.

\n","comments":"

This matches the git diff command. See the note below on\n git_diff_tree_to_workdir for a discussion of the difference between\n git diff and git diff HEAD and how to emulate a `git diff \n<treeish

\n\n
\n

`\n using libgit2.

\n
\n\n

The index will be used for the "old_file" side of the delta, and the\n working directory will be used for the "new_file" side of the delta.

\n\n

If you pass NULL for the index, then the existing index of the repo\n will be used. In this case, the index will be refreshed from disk\n (if it has changed) before the diff is generated.

\n","group":"diff","examples":{"diff.c":["ex/v0.23.2/diff.html#git_diff_index_to_workdir-5"]}},"git_diff_tree_to_workdir":{"type":"function","file":"diff.h","line":813,"lineto":817,"args":[{"name":"diff","type":"git_diff **","comment":"A pointer to a git_diff pointer that will be allocated."},{"name":"repo","type":"git_repository *","comment":"The repository containing the tree."},{"name":"old_tree","type":"git_tree *","comment":"A git_tree object to diff from, or NULL for empty tree."},{"name":"opts","type":"const git_diff_options *","comment":"Structure with options to influence diff or NULL for defaults."}],"argline":"git_diff **diff, git_repository *repo, git_tree *old_tree, const git_diff_options *opts","sig":"git_diff **::git_repository *::git_tree *::const git_diff_options *","return":{"type":"int","comment":null},"description":"

Create a diff between a tree and the working directory.

\n","comments":"

The tree you provide will be used for the "old_file" side of the delta,\n and the working directory will be used for the "new_file" side.

\n\n

This is not the same as `git diff \n<treeish

\n\n
\n

orgit diff-index

\n
\n\n

<treeish

\n\n
\n

. Those commands use information from the index, whereas this\n function strictly returns the differences between the tree and the files\n in the working directory, regardless of the state of the index. Use\ngit_diff_tree_to_workdir_with_index` to emulate those commands.

\n
\n\n

To see difference between this and git_diff_tree_to_workdir_with_index,\n consider the example of a staged file deletion where the file has then\n been put back into the working dir and further modified. The\n tree-to-workdir diff for that file is 'modified', but git diff would\n show status 'deleted' since there is a staged delete.

\n","group":"diff","examples":{"diff.c":["ex/v0.23.2/diff.html#git_diff_tree_to_workdir-6"]}},"git_diff_tree_to_workdir_with_index":{"type":"function","file":"diff.h","line":832,"lineto":836,"args":[{"name":"diff","type":"git_diff **","comment":"A pointer to a git_diff pointer that will be allocated."},{"name":"repo","type":"git_repository *","comment":"The repository containing the tree."},{"name":"old_tree","type":"git_tree *","comment":"A git_tree object to diff from, or NULL for empty tree."},{"name":"opts","type":"const git_diff_options *","comment":"Structure with options to influence diff or NULL for defaults."}],"argline":"git_diff **diff, git_repository *repo, git_tree *old_tree, const git_diff_options *opts","sig":"git_diff **::git_repository *::git_tree *::const git_diff_options *","return":{"type":"int","comment":null},"description":"

Create a diff between a tree and the working directory using index data\n to account for staged deletes, tracked files, etc.

\n","comments":"

This emulates `git diff \n<tree

\n\n
\n

` by diffing the tree to the index and\n the index to the working directory and blending the results into a\n single diff that includes staged deleted, etc.

\n
\n","group":"diff","examples":{"diff.c":["ex/v0.23.2/diff.html#git_diff_tree_to_workdir_with_index-7"]}},"git_diff_merge":{"type":"function","file":"diff.h","line":851,"lineto":853,"args":[{"name":"onto","type":"git_diff *","comment":"Diff to merge into."},{"name":"from","type":"const git_diff *","comment":"Diff to merge."}],"argline":"git_diff *onto, const git_diff *from","sig":"git_diff *::const git_diff *","return":{"type":"int","comment":null},"description":"

Merge one diff into another.

\n","comments":"

This merges items from the "from" list into the "onto" list. The\n resulting diff will have all items that appear in either list.\n If an item appears in both lists, then it will be "merged" to appear\n as if the old version was from the "onto" list and the new version\n is from the "from" list (with the exception that if the item has a\n pending DELETE in the middle, then it will show as deleted).

\n","group":"diff"},"git_diff_find_similar":{"type":"function","file":"diff.h","line":867,"lineto":869,"args":[{"name":"diff","type":"git_diff *","comment":"diff to run detection algorithms on"},{"name":"options","type":"const git_diff_find_options *","comment":"Control how detection should be run, NULL for defaults"}],"argline":"git_diff *diff, const git_diff_find_options *options","sig":"git_diff *::const git_diff_find_options *","return":{"type":"int","comment":" 0 on success, -1 on failure"},"description":"

Transform a diff marking file renames, copies, etc.

\n","comments":"

This modifies a diff in place, replacing old entries that look\n like renames or copies with new entries reflecting those changes.\n This also will, if requested, break modified files into add/remove\n pairs if the amount of change is above a threshold.

\n","group":"diff","examples":{"diff.c":["ex/v0.23.2/diff.html#git_diff_find_similar-8"]}},"git_diff_num_deltas":{"type":"function","file":"diff.h","line":887,"lineto":887,"args":[{"name":"diff","type":"const git_diff *","comment":"A git_diff generated by one of the above functions"}],"argline":"const git_diff *diff","sig":"const git_diff *","return":{"type":"size_t","comment":" Count of number of deltas in the list"},"description":"

Query how many diff records are there in a diff.

\n","comments":"","group":"diff","examples":{"log.c":["ex/v0.23.2/log.html#git_diff_num_deltas-28"]}},"git_diff_num_deltas_of_type":{"type":"function","file":"diff.h","line":900,"lineto":901,"args":[{"name":"diff","type":"const git_diff *","comment":"A git_diff generated by one of the above functions"},{"name":"type","type":"git_delta_t","comment":"A git_delta_t value to filter the count"}],"argline":"const git_diff *diff, git_delta_t type","sig":"const git_diff *::git_delta_t","return":{"type":"size_t","comment":" Count of number of deltas matching delta_t type"},"description":"

Query how many diff deltas are there in a diff filtered by type.

\n","comments":"

This works just like git_diff_entrycount() with an extra parameter\n that is a git_delta_t and returns just the count of how many deltas\n match that particular type.

\n","group":"diff"},"git_diff_get_delta":{"type":"function","file":"diff.h","line":920,"lineto":921,"args":[{"name":"diff","type":"const git_diff *","comment":"Diff list object"},{"name":"idx","type":"size_t","comment":"Index into diff list"}],"argline":"const git_diff *diff, size_t idx","sig":"const git_diff *::size_t","return":{"type":"const git_diff_delta *","comment":" Pointer to git_diff_delta (or NULL if `idx` out of range)"},"description":"

Return the diff delta for an entry in the diff list.

\n","comments":"

The git_diff_delta pointer points to internal data and you do not\n have to release it when you are done with it. It will go away when\n the * git_diff (or any associated git_patch) goes away.

\n\n

Note that the flags on the delta related to whether it has binary\n content or not may not be set if there are no attributes set for the\n file and there has been no reason to load the file data at this point.\n For now, if you need those flags to be up to date, your only option is\n to either use git_diff_foreach or create a git_patch.

\n","group":"diff"},"git_diff_is_sorted_icase":{"type":"function","file":"diff.h","line":929,"lineto":929,"args":[{"name":"diff","type":"const git_diff *","comment":"diff to check"}],"argline":"const git_diff *diff","sig":"const git_diff *","return":{"type":"int","comment":" 0 if case sensitive, 1 if case is ignored"},"description":"

Check if deltas are sorted case sensitively or insensitively.

\n","comments":"","group":"diff"},"git_diff_foreach":{"type":"function","file":"diff.h","line":957,"lineto":963,"args":[{"name":"diff","type":"git_diff *","comment":"A git_diff generated by one of the above functions."},{"name":"file_cb","type":"git_diff_file_cb","comment":"Callback function to make per file in the diff."},{"name":"binary_cb","type":"git_diff_binary_cb","comment":"Optional callback to make for binary files."},{"name":"hunk_cb","type":"git_diff_hunk_cb","comment":"Optional callback to make per hunk of text diff. This\n callback is called to describe a range of lines in the\n diff. It will not be issued for binary files."},{"name":"line_cb","type":"git_diff_line_cb","comment":"Optional callback to make per line of diff text. This\n same callback will be made for context lines, added, and\n removed lines, and even for a deleted trailing newline."},{"name":"payload","type":"void *","comment":"Reference pointer that will be passed to your callbacks."}],"argline":"git_diff *diff, git_diff_file_cb file_cb, git_diff_binary_cb binary_cb, git_diff_hunk_cb hunk_cb, git_diff_line_cb line_cb, void *payload","sig":"git_diff *::git_diff_file_cb::git_diff_binary_cb::git_diff_hunk_cb::git_diff_line_cb::void *","return":{"type":"int","comment":" 0 on success, non-zero callback return value, or error code"},"description":"

Loop over all deltas in a diff issuing callbacks.

\n","comments":"

This will iterate through all of the files described in a diff. You\n should provide a file callback to learn about each file.

\n\n

The "hunk" and "line" callbacks are optional, and the text diff of the\n files will only be calculated if they are not NULL. Of course, these\n callbacks will not be invoked for binary files on the diff or for\n files whose only changed is a file mode change.

\n\n

Returning a non-zero value from any of the callbacks will terminate\n the iteration and return the value to the user.

\n","group":"diff"},"git_diff_status_char":{"type":"function","file":"diff.h","line":976,"lineto":976,"args":[{"name":"status","type":"git_delta_t","comment":"The git_delta_t value to look up"}],"argline":"git_delta_t status","sig":"git_delta_t","return":{"type":"char","comment":" The single character label for that code"},"description":"

Look up the single character abbreviation for a delta status code.

\n","comments":"

When you run git diff --name-status it uses single letter codes in\n the output such as 'A' for added, 'D' for deleted, 'M' for modified,\n etc. This function converts a git_delta_t value into these letters for\n your own purposes. GIT_DELTA_UNTRACKED will return a space (i.e. ' ').

\n","group":"diff"},"git_diff_print":{"type":"function","file":"diff.h","line":1001,"lineto":1005,"args":[{"name":"diff","type":"git_diff *","comment":"A git_diff generated by one of the above functions."},{"name":"format","type":"git_diff_format_t","comment":"A git_diff_format_t value to pick the text format."},{"name":"print_cb","type":"git_diff_line_cb","comment":"Callback to make per line of diff text."},{"name":"payload","type":"void *","comment":"Reference pointer that will be passed to your callback."}],"argline":"git_diff *diff, git_diff_format_t format, git_diff_line_cb print_cb, void *payload","sig":"git_diff *::git_diff_format_t::git_diff_line_cb::void *","return":{"type":"int","comment":" 0 on success, non-zero callback return value, or error code"},"description":"

Iterate over a diff generating formatted text output.

\n","comments":"

Returning a non-zero value from the callbacks will terminate the\n iteration and return the non-zero value to the caller.

\n","group":"diff","examples":{"diff.c":["ex/v0.23.2/diff.html#git_diff_print-9"],"log.c":["ex/v0.23.2/log.html#git_diff_print-29"]}},"git_diff_blobs":{"type":"function","file":"diff.h","line":1042,"lineto":1052,"args":[{"name":"old_blob","type":"const git_blob *","comment":"Blob for old side of diff, or NULL for empty blob"},{"name":"old_as_path","type":"const char *","comment":"Treat old blob as if it had this filename; can be NULL"},{"name":"new_blob","type":"const git_blob *","comment":"Blob for new side of diff, or NULL for empty blob"},{"name":"new_as_path","type":"const char *","comment":"Treat new blob as if it had this filename; can be NULL"},{"name":"options","type":"const git_diff_options *","comment":"Options for diff, or NULL for default options"},{"name":"file_cb","type":"git_diff_file_cb","comment":"Callback for \"file\"; made once if there is a diff; can be NULL"},{"name":"binary_cb","type":"git_diff_binary_cb","comment":"Callback for binary files; can be NULL"},{"name":"hunk_cb","type":"git_diff_hunk_cb","comment":"Callback for each hunk in diff; can be NULL"},{"name":"line_cb","type":"git_diff_line_cb","comment":"Callback for each line in diff; can be NULL"},{"name":"payload","type":"void *","comment":"Payload passed to each callback function"}],"argline":"const git_blob *old_blob, const char *old_as_path, const git_blob *new_blob, const char *new_as_path, const git_diff_options *options, git_diff_file_cb file_cb, git_diff_binary_cb binary_cb, git_diff_hunk_cb hunk_cb, git_diff_line_cb line_cb, void *payload","sig":"const git_blob *::const char *::const git_blob *::const char *::const git_diff_options *::git_diff_file_cb::git_diff_binary_cb::git_diff_hunk_cb::git_diff_line_cb::void *","return":{"type":"int","comment":" 0 on success, non-zero callback return value, or error code"},"description":"

Directly run a diff on two blobs.

\n","comments":"

Compared to a file, a blob lacks some contextual information. As such,\n the git_diff_file given to the callback will have some fake data; i.e.\n mode will be 0 and path will be NULL.

\n\n

NULL is allowed for either old_blob or new_blob and will be treated\n as an empty blob, with the oid set to NULL in the git_diff_file data.\n Passing NULL for both blobs is a noop; no callbacks will be made at all.

\n\n

We do run a binary content check on the blob content and if either blob\n looks like binary data, the git_diff_delta binary attribute will be set\n to 1 and no call to the hunk_cb nor line_cb will be made (unless you pass\n GIT_DIFF_FORCE_TEXT of course).

\n","group":"diff"},"git_diff_blob_to_buffer":{"type":"function","file":"diff.h","line":1079,"lineto":1090,"args":[{"name":"old_blob","type":"const git_blob *","comment":"Blob for old side of diff, or NULL for empty blob"},{"name":"old_as_path","type":"const char *","comment":"Treat old blob as if it had this filename; can be NULL"},{"name":"buffer","type":"const char *","comment":"Raw data for new side of diff, or NULL for empty"},{"name":"buffer_len","type":"size_t","comment":"Length of raw data for new side of diff"},{"name":"buffer_as_path","type":"const char *","comment":"Treat buffer as if it had this filename; can be NULL"},{"name":"options","type":"const git_diff_options *","comment":"Options for diff, or NULL for default options"},{"name":"file_cb","type":"git_diff_file_cb","comment":"Callback for \"file\"; made once if there is a diff; can be NULL"},{"name":"binary_cb","type":"git_diff_binary_cb","comment":"Callback for binary files; can be NULL"},{"name":"hunk_cb","type":"git_diff_hunk_cb","comment":"Callback for each hunk in diff; can be NULL"},{"name":"line_cb","type":"git_diff_line_cb","comment":"Callback for each line in diff; can be NULL"},{"name":"payload","type":"void *","comment":"Payload passed to each callback function"}],"argline":"const git_blob *old_blob, const char *old_as_path, const char *buffer, size_t buffer_len, const char *buffer_as_path, const git_diff_options *options, git_diff_file_cb file_cb, git_diff_binary_cb binary_cb, git_diff_hunk_cb hunk_cb, git_diff_line_cb line_cb, void *payload","sig":"const git_blob *::const char *::const char *::size_t::const char *::const git_diff_options *::git_diff_file_cb::git_diff_binary_cb::git_diff_hunk_cb::git_diff_line_cb::void *","return":{"type":"int","comment":" 0 on success, non-zero callback return value, or error code"},"description":"

Directly run a diff between a blob and a buffer.

\n","comments":"

As with git_diff_blobs, comparing a blob and buffer lacks some context,\n so the git_diff_file parameters to the callbacks will be faked a la the\n rules for git_diff_blobs().

\n\n

Passing NULL for old_blob will be treated as an empty blob (i.e. the\n file_cb will be invoked with GIT_DELTA_ADDED and the diff will be the\n entire content of the buffer added). Passing NULL to the buffer will do\n the reverse, with GIT_DELTA_REMOVED and blob content removed.

\n","group":"diff"},"git_diff_buffers":{"type":"function","file":"diff.h","line":1113,"lineto":1125,"args":[{"name":"old_buffer","type":"const void *","comment":"Raw data for old side of diff, or NULL for empty"},{"name":"old_len","type":"size_t","comment":"Length of the raw data for old side of the diff"},{"name":"old_as_path","type":"const char *","comment":"Treat old buffer as if it had this filename; can be NULL"},{"name":"new_buffer","type":"const void *","comment":"Raw data for new side of diff, or NULL for empty"},{"name":"new_len","type":"size_t","comment":"Length of raw data for new side of diff"},{"name":"new_as_path","type":"const char *","comment":"Treat buffer as if it had this filename; can be NULL"},{"name":"options","type":"const git_diff_options *","comment":"Options for diff, or NULL for default options"},{"name":"file_cb","type":"git_diff_file_cb","comment":"Callback for \"file\"; made once if there is a diff; can be NULL"},{"name":"binary_cb","type":"git_diff_binary_cb","comment":"Callback for binary files; can be NULL"},{"name":"hunk_cb","type":"git_diff_hunk_cb","comment":"Callback for each hunk in diff; can be NULL"},{"name":"line_cb","type":"git_diff_line_cb","comment":"Callback for each line in diff; can be NULL"},{"name":"payload","type":"void *","comment":"Payload passed to each callback function"}],"argline":"const void *old_buffer, size_t old_len, const char *old_as_path, const void *new_buffer, size_t new_len, const char *new_as_path, const git_diff_options *options, git_diff_file_cb file_cb, git_diff_binary_cb binary_cb, git_diff_hunk_cb hunk_cb, git_diff_line_cb line_cb, void *payload","sig":"const void *::size_t::const char *::const void *::size_t::const char *::const git_diff_options *::git_diff_file_cb::git_diff_binary_cb::git_diff_hunk_cb::git_diff_line_cb::void *","return":{"type":"int","comment":" 0 on success, non-zero callback return value, or error code"},"description":"

Directly run a diff between two buffers.

\n","comments":"

Even more than with git_diff_blobs, comparing two buffer lacks\n context, so the git_diff_file parameters to the callbacks will be\n faked a la the rules for git_diff_blobs().

\n","group":"diff"},"git_diff_get_stats":{"type":"function","file":"diff.h","line":1161,"lineto":1163,"args":[{"name":"out","type":"git_diff_stats **","comment":"Structure containg the diff statistics."},{"name":"diff","type":"git_diff *","comment":"A git_diff generated by one of the above functions."}],"argline":"git_diff_stats **out, git_diff *diff","sig":"git_diff_stats **::git_diff *","return":{"type":"int","comment":" 0 on success; non-zero on error"},"description":"

Accumlate diff statistics for all patches.

\n","comments":"","group":"diff","examples":{"diff.c":["ex/v0.23.2/diff.html#git_diff_get_stats-10"]}},"git_diff_stats_files_changed":{"type":"function","file":"diff.h","line":1171,"lineto":1172,"args":[{"name":"stats","type":"const git_diff_stats *","comment":"A `git_diff_stats` generated by one of the above functions."}],"argline":"const git_diff_stats *stats","sig":"const git_diff_stats *","return":{"type":"size_t","comment":" total number of files changed in the diff"},"description":"

Get the total number of files changed in a diff

\n","comments":"","group":"diff"},"git_diff_stats_insertions":{"type":"function","file":"diff.h","line":1180,"lineto":1181,"args":[{"name":"stats","type":"const git_diff_stats *","comment":"A `git_diff_stats` generated by one of the above functions."}],"argline":"const git_diff_stats *stats","sig":"const git_diff_stats *","return":{"type":"size_t","comment":" total number of insertions in the diff"},"description":"

Get the total number of insertions in a diff

\n","comments":"","group":"diff"},"git_diff_stats_deletions":{"type":"function","file":"diff.h","line":1189,"lineto":1190,"args":[{"name":"stats","type":"const git_diff_stats *","comment":"A `git_diff_stats` generated by one of the above functions."}],"argline":"const git_diff_stats *stats","sig":"const git_diff_stats *","return":{"type":"size_t","comment":" total number of deletions in the diff"},"description":"

Get the total number of deletions in a diff

\n","comments":"","group":"diff"},"git_diff_stats_to_buf":{"type":"function","file":"diff.h","line":1201,"lineto":1205,"args":[{"name":"out","type":"git_buf *","comment":"buffer to store the formatted diff statistics in."},{"name":"stats","type":"const git_diff_stats *","comment":"A `git_diff_stats` generated by one of the above functions."},{"name":"format","type":"git_diff_stats_format_t","comment":"Formatting option."},{"name":"width","type":"size_t","comment":"Target width for output (only affects GIT_DIFF_STATS_FULL)"}],"argline":"git_buf *out, const git_diff_stats *stats, git_diff_stats_format_t format, size_t width","sig":"git_buf *::const git_diff_stats *::git_diff_stats_format_t::size_t","return":{"type":"int","comment":" 0 on success; non-zero on error"},"description":"

Print diff statistics to a git_buf.

\n","comments":"","group":"diff","examples":{"diff.c":["ex/v0.23.2/diff.html#git_diff_stats_to_buf-11"]}},"git_diff_stats_free":{"type":"function","file":"diff.h","line":1213,"lineto":1213,"args":[{"name":"stats","type":"git_diff_stats *","comment":"The previously created statistics object;\n cannot be used after free."}],"argline":"git_diff_stats *stats","sig":"git_diff_stats *","return":{"type":"void","comment":null},"description":"

Deallocate a git_diff_stats.

\n","comments":"","group":"diff","examples":{"diff.c":["ex/v0.23.2/diff.html#git_diff_stats_free-12"]}},"git_diff_format_email":{"type":"function","file":"diff.h","line":1262,"lineto":1265,"args":[{"name":"out","type":"git_buf *","comment":"buffer to store the e-mail patch in"},{"name":"diff","type":"git_diff *","comment":"containing the commit"},{"name":"opts","type":"const git_diff_format_email_options *","comment":"structure with options to influence content and formatting."}],"argline":"git_buf *out, git_diff *diff, const git_diff_format_email_options *opts","sig":"git_buf *::git_diff *::const git_diff_format_email_options *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Create an e-mail ready patch from a diff.

\n","comments":"","group":"diff"},"git_diff_commit_as_email":{"type":"function","file":"diff.h","line":1281,"lineto":1288,"args":[{"name":"out","type":"git_buf *","comment":"buffer to store the e-mail patch in"},{"name":"repo","type":"git_repository *","comment":"containing the commit"},{"name":"commit","type":"git_commit *","comment":"pointer to up commit"},{"name":"patch_no","type":"size_t","comment":"patch number of the commit"},{"name":"total_patches","type":"size_t","comment":"total number of patches in the patch set"},{"name":"flags","type":"git_diff_format_email_flags_t","comment":"determines the formatting of the e-mail"},{"name":"diff_opts","type":"const git_diff_options *","comment":"structure with options to influence diff or NULL for defaults."}],"argline":"git_buf *out, git_repository *repo, git_commit *commit, size_t patch_no, size_t total_patches, git_diff_format_email_flags_t flags, const git_diff_options *diff_opts","sig":"git_buf *::git_repository *::git_commit *::size_t::size_t::git_diff_format_email_flags_t::const git_diff_options *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Create an e-mail ready patch for a commit.

\n","comments":"

Does not support creating patches for merge commits (yet).

\n","group":"diff"},"git_diff_format_email_init_options":{"type":"function","file":"diff.h","line":1299,"lineto":1301,"args":[{"name":"opts","type":"git_diff_format_email_options *","comment":"The `git_diff_format_email_options` struct to initialize"},{"name":"version","type":"unsigned int","comment":"Version of struct; pass `GIT_DIFF_FORMAT_EMAIL_OPTIONS_VERSION`"}],"argline":"git_diff_format_email_options *opts, unsigned int version","sig":"git_diff_format_email_options *::unsigned int","return":{"type":"int","comment":" Zero on success; -1 on failure."},"description":"

Initializes a git_diff_format_email_options with default values.

\n","comments":"

Equivalent to creating an instance with GIT_DIFF_FORMAT_EMAIL_OPTIONS_INIT.

\n","group":"diff"},"giterr_last":{"type":"function","file":"errors.h","line":109,"lineto":109,"args":[],"argline":"","sig":"","return":{"type":"const git_error *","comment":" A git_error object."},"description":"

Return the last git_error object that was generated for the\n current thread or NULL if no error has occurred.

\n","comments":"","group":"giterr","examples":{"general.c":["ex/v0.23.2/general.html#giterr_last-27"],"network/clone.c":["ex/v0.23.2/network/clone.html#giterr_last-2"],"network/git2.c":["ex/v0.23.2/network/git2.html#giterr_last-1","ex/v0.23.2/network/git2.html#giterr_last-2"]}},"giterr_clear":{"type":"function","file":"errors.h","line":114,"lineto":114,"args":[],"argline":"","sig":"","return":{"type":"void","comment":null},"description":"

Clear the last library error that occurred for this thread.

\n","comments":"","group":"giterr"},"giterr_detach":{"type":"function","file":"errors.h","line":126,"lineto":126,"args":[{"name":"cpy","type":"git_error *","comment":null}],"argline":"git_error *cpy","sig":"git_error *","return":{"type":"int","comment":null},"description":"

Get the last error data and clear it.

\n","comments":"

This copies the last error into the given git_error struct\n and returns 0 if the copy was successful, leaving the error\n cleared as if giterr_clear had been called.

\n\n

If there was no existing error in the library, -1 will be returned\n and the contents of cpy will be left unmodified.

\n","group":"giterr"},"giterr_set_str":{"type":"function","file":"errors.h","line":149,"lineto":149,"args":[{"name":"error_class","type":"int","comment":"One of the `git_error_t` enum above describing the\n general subsystem that is responsible for the error."},{"name":"string","type":"const char *","comment":"The formatted error message to keep"}],"argline":"int error_class, const char *string","sig":"int::const char *","return":{"type":"void","comment":null},"description":"

Set the error message string for this thread.

\n","comments":"

This function is public so that custom ODB backends and the like can\n relay an error message through libgit2. Most regular users of libgit2\n will never need to call this function -- actually, calling it in most\n circumstances (for example, calling from within a callback function)\n will just end up having the value overwritten by libgit2 internals.

\n\n

This error message is stored in thread-local storage and only applies\n to the particular thread that this libgit2 call is made from.

\n\n

NOTE: Passing the error_class as GITERR_OS has a special behavior: we\n attempt to append the system default error message for the last OS error\n that occurred and then clear the last error. The specific implementation\n of looking up and clearing this last OS error will vary by platform.

\n","group":"giterr"},"giterr_set_oom":{"type":"function","file":"errors.h","line":160,"lineto":160,"args":[],"argline":"","sig":"","return":{"type":"void","comment":null},"description":"

Set the error message to a special value for memory allocation failure.

\n","comments":"

The normal giterr_set_str() function attempts to strdup() the string\n that is passed in. This is not a good idea when the error in question\n is a memory allocation failure. That circumstance has a special setter\n function that sets the error string to a known and statically allocated\n internal value.

\n","group":"giterr"},"git_filter_list_load":{"type":"function","file":"filter.h","line":90,"lineto":96,"args":[{"name":"filters","type":"git_filter_list **","comment":"Output newly created git_filter_list (or NULL)"},{"name":"repo","type":"git_repository *","comment":"Repository object that contains `path`"},{"name":"blob","type":"git_blob *","comment":"The blob to which the filter will be applied (if known)"},{"name":"path","type":"const char *","comment":"Relative path of the file to be filtered"},{"name":"mode","type":"git_filter_mode_t","comment":"Filtering direction (WT->ODB or ODB->WT)"},{"name":"flags","type":"uint32_t","comment":"Combination of `git_filter_flag_t` flags"}],"argline":"git_filter_list **filters, git_repository *repo, git_blob *blob, const char *path, git_filter_mode_t mode, uint32_t flags","sig":"git_filter_list **::git_repository *::git_blob *::const char *::git_filter_mode_t::uint32_t","return":{"type":"int","comment":" 0 on success (which could still return NULL if no filters are\n needed for the requested file), \n<\n0 on error"},"description":"

Load the filter list for a given path.

\n","comments":"

This will return 0 (success) but set the output git_filter_list to NULL\n if no filters are requested for the given file.

\n","group":"filter"},"git_filter_list_contains":{"type":"function","file":"filter.h","line":110,"lineto":112,"args":[{"name":"filters","type":"git_filter_list *","comment":"A loaded git_filter_list (or NULL)"},{"name":"name","type":"const char *","comment":"The name of the filter to query"}],"argline":"git_filter_list *filters, const char *name","sig":"git_filter_list *::const char *","return":{"type":"int","comment":" 1 if the filter is in the list, 0 otherwise"},"description":"

Query the filter list to see if a given filter (by name) will run.\n The built-in filters "crlf" and "ident" can be queried, otherwise this\n is the name of the filter specified by the filter attribute.

\n","comments":"

This will return 0 if the given filter is not in the list, or 1 if\n the filter will be applied.

\n","group":"filter"},"git_filter_list_apply_to_data":{"type":"function","file":"filter.h","line":134,"lineto":137,"args":[{"name":"out","type":"git_buf *","comment":"Buffer to store the result of the filtering"},{"name":"filters","type":"git_filter_list *","comment":"A loaded git_filter_list (or NULL)"},{"name":"in","type":"git_buf *","comment":"Buffer containing the data to filter"}],"argline":"git_buf *out, git_filter_list *filters, git_buf *in","sig":"git_buf *::git_filter_list *::git_buf *","return":{"type":"int","comment":" 0 on success, an error code otherwise"},"description":"

Apply filter list to a data buffer.

\n","comments":"

See git2/buffer.h for background on git_buf objects.

\n\n

If the in buffer holds data allocated by libgit2 (i.e. in->asize is\n not zero), then it will be overwritten when applying the filters. If\n not, then it will be left untouched.

\n\n

If there are no filters to apply (or filters is NULL), then the out\n buffer will reference the in buffer data (with asize set to zero)\n instead of allocating data. This keeps allocations to a minimum, but\n it means you have to be careful about freeing the in data since out\n may be pointing to it!

\n","group":"filter"},"git_filter_list_apply_to_file":{"type":"function","file":"filter.h","line":148,"lineto":152,"args":[{"name":"out","type":"git_buf *","comment":"buffer into which to store the filtered file"},{"name":"filters","type":"git_filter_list *","comment":"the list of filters to apply"},{"name":"repo","type":"git_repository *","comment":"the repository in which to perform the filtering"},{"name":"path","type":"const char *","comment":"the path of the file to filter, a relative path will be\n taken as relative to the workdir"}],"argline":"git_buf *out, git_filter_list *filters, git_repository *repo, const char *path","sig":"git_buf *::git_filter_list *::git_repository *::const char *","return":{"type":"int","comment":null},"description":"

Apply a filter list to the contents of a file on disk

\n","comments":"","group":"filter"},"git_filter_list_apply_to_blob":{"type":"function","file":"filter.h","line":161,"lineto":164,"args":[{"name":"out","type":"git_buf *","comment":"buffer into which to store the filtered file"},{"name":"filters","type":"git_filter_list *","comment":"the list of filters to apply"},{"name":"blob","type":"git_blob *","comment":"the blob to filter"}],"argline":"git_buf *out, git_filter_list *filters, git_blob *blob","sig":"git_buf *::git_filter_list *::git_blob *","return":{"type":"int","comment":null},"description":"

Apply a filter list to the contents of a blob

\n","comments":"","group":"filter"},"git_filter_list_stream_data":{"type":"function","file":"filter.h","line":173,"lineto":176,"args":[{"name":"filters","type":"git_filter_list *","comment":"the list of filters to apply"},{"name":"data","type":"git_buf *","comment":"the buffer to filter"},{"name":"target","type":"git_writestream *","comment":"the stream into which the data will be written"}],"argline":"git_filter_list *filters, git_buf *data, git_writestream *target","sig":"git_filter_list *::git_buf *::git_writestream *","return":{"type":"int","comment":null},"description":"

Apply a filter list to an arbitrary buffer as a stream

\n","comments":"","group":"filter"},"git_filter_list_stream_file":{"type":"function","file":"filter.h","line":187,"lineto":191,"args":[{"name":"filters","type":"git_filter_list *","comment":"the list of filters to apply"},{"name":"repo","type":"git_repository *","comment":"the repository in which to perform the filtering"},{"name":"path","type":"const char *","comment":"the path of the file to filter, a relative path will be\n taken as relative to the workdir"},{"name":"target","type":"git_writestream *","comment":"the stream into which the data will be written"}],"argline":"git_filter_list *filters, git_repository *repo, const char *path, git_writestream *target","sig":"git_filter_list *::git_repository *::const char *::git_writestream *","return":{"type":"int","comment":null},"description":"

Apply a filter list to a file as a stream

\n","comments":"","group":"filter"},"git_filter_list_stream_blob":{"type":"function","file":"filter.h","line":200,"lineto":203,"args":[{"name":"filters","type":"git_filter_list *","comment":"the list of filters to apply"},{"name":"blob","type":"git_blob *","comment":"the blob to filter"},{"name":"target","type":"git_writestream *","comment":"the stream into which the data will be written"}],"argline":"git_filter_list *filters, git_blob *blob, git_writestream *target","sig":"git_filter_list *::git_blob *::git_writestream *","return":{"type":"int","comment":null},"description":"

Apply a filter list to a blob as a stream

\n","comments":"","group":"filter"},"git_filter_list_free":{"type":"function","file":"filter.h","line":210,"lineto":210,"args":[{"name":"filters","type":"git_filter_list *","comment":"A git_filter_list created by `git_filter_list_load`"}],"argline":"git_filter_list *filters","sig":"git_filter_list *","return":{"type":"void","comment":null},"description":"

Free a git_filter_list

\n","comments":"","group":"filter"},"git_libgit2_init":{"type":"function","file":"global.h","line":26,"lineto":26,"args":[],"argline":"","sig":"","return":{"type":"int","comment":" the number of initializations of the library, or an error code."},"description":"

Init the global state

\n","comments":"

This function must the called before any other libgit2 function in\n order to set up global state and threading.

\n\n

This function may be called multiple times - it will return the number\n of times the initialization has been called (including this one) that have\n not subsequently been shutdown.

\n","group":"libgit2","examples":{"blame.c":["ex/v0.23.2/blame.html#git_libgit2_init-8"],"cat-file.c":["ex/v0.23.2/cat-file.html#git_libgit2_init-10"],"describe.c":["ex/v0.23.2/describe.html#git_libgit2_init-4"],"diff.c":["ex/v0.23.2/diff.html#git_libgit2_init-13"],"general.c":["ex/v0.23.2/general.html#git_libgit2_init-28"],"init.c":["ex/v0.23.2/init.html#git_libgit2_init-2"],"log.c":["ex/v0.23.2/log.html#git_libgit2_init-30"],"network/git2.c":["ex/v0.23.2/network/git2.html#git_libgit2_init-3"],"remote.c":["ex/v0.23.2/remote.html#git_libgit2_init-2"],"rev-parse.c":["ex/v0.23.2/rev-parse.html#git_libgit2_init-1"],"status.c":["ex/v0.23.2/status.html#git_libgit2_init-1"],"tag.c":["ex/v0.23.2/tag.html#git_libgit2_init-3"]}},"git_libgit2_shutdown":{"type":"function","file":"global.h","line":39,"lineto":39,"args":[],"argline":"","sig":"","return":{"type":"int","comment":" the number of remaining initializations of the library, or an\n error code."},"description":"

Shutdown the global state

\n","comments":"

Clean up the global state and threading context after calling it as\n many times as git_libgit2_init() was called - it will return the\n number of remainining initializations that have not been shutdown\n (after this one).

\n","group":"libgit2","examples":{"blame.c":["ex/v0.23.2/blame.html#git_libgit2_shutdown-9"],"cat-file.c":["ex/v0.23.2/cat-file.html#git_libgit2_shutdown-11"],"describe.c":["ex/v0.23.2/describe.html#git_libgit2_shutdown-5"],"diff.c":["ex/v0.23.2/diff.html#git_libgit2_shutdown-14"],"init.c":["ex/v0.23.2/init.html#git_libgit2_shutdown-3"],"log.c":["ex/v0.23.2/log.html#git_libgit2_shutdown-31"],"network/git2.c":["ex/v0.23.2/network/git2.html#git_libgit2_shutdown-4"],"remote.c":["ex/v0.23.2/remote.html#git_libgit2_shutdown-3"],"rev-parse.c":["ex/v0.23.2/rev-parse.html#git_libgit2_shutdown-2"],"status.c":["ex/v0.23.2/status.html#git_libgit2_shutdown-2"],"tag.c":["ex/v0.23.2/tag.html#git_libgit2_shutdown-4"]}},"git_graph_ahead_behind":{"type":"function","file":"graph.h","line":37,"lineto":37,"args":[{"name":"ahead","type":"size_t *","comment":"number of unique from commits in `upstream`"},{"name":"behind","type":"size_t *","comment":"number of unique from commits in `local`"},{"name":"repo","type":"git_repository *","comment":"the repository where the commits exist"},{"name":"local","type":"const git_oid *","comment":"the commit for local"},{"name":"upstream","type":"const git_oid *","comment":"the commit for upstream"}],"argline":"size_t *ahead, size_t *behind, git_repository *repo, const git_oid *local, const git_oid *upstream","sig":"size_t *::size_t *::git_repository *::const git_oid *::const git_oid *","return":{"type":"int","comment":null},"description":"

Count the number of unique commits between two commit objects

\n","comments":"

There is no need for branches containing the commits to have any\n upstream relationship, but it helps to think of one as a branch and\n the other as its upstream, the ahead and behind values will be\n what git would report for the branches.

\n","group":"graph"},"git_graph_descendant_of":{"type":"function","file":"graph.h","line":48,"lineto":51,"args":[{"name":"repo","type":"git_repository *","comment":null},{"name":"commit","type":"const git_oid *","comment":"a previously loaded commit."},{"name":"ancestor","type":"const git_oid *","comment":"a potential ancestor commit."}],"argline":"git_repository *repo, const git_oid *commit, const git_oid *ancestor","sig":"git_repository *::const git_oid *::const git_oid *","return":{"type":"int","comment":" 1 if the given commit is a descendant of the potential ancestor,\n 0 if not, error code otherwise."},"description":"

Determine if a commit is the descendant of another commit.

\n","comments":"","group":"graph"},"git_ignore_add_rule":{"type":"function","file":"ignore.h","line":37,"lineto":39,"args":[{"name":"repo","type":"git_repository *","comment":"The repository to add ignore rules to."},{"name":"rules","type":"const char *","comment":"Text of rules, a la the contents of a .gitignore file.\n It is okay to have multiple rules in the text; if so,\n each rule should be terminated with a newline."}],"argline":"git_repository *repo, const char *rules","sig":"git_repository *::const char *","return":{"type":"int","comment":" 0 on success"},"description":"

Add ignore rules for a repository.

\n","comments":"

Excludesfile rules (i.e. .gitignore rules) are generally read from\n .gitignore files in the repository tree or from a shared system file\n only if a "core.excludesfile" config value is set. The library also\n keeps a set of per-repository internal ignores that can be configured\n in-memory and will not persist. This function allows you to add to\n that internal rules list.

\n\n

Example usage:

\n\n
 error = git_ignore_add_rule(myrepo, "*.c\n
\n\n

/

\n\n

with space

\n\n

");

\n\n

This would add three rules to the ignores.

\n","group":"ignore"},"git_ignore_clear_internal_rules":{"type":"function","file":"ignore.h","line":52,"lineto":53,"args":[{"name":"repo","type":"git_repository *","comment":"The repository to remove ignore rules from."}],"argline":"git_repository *repo","sig":"git_repository *","return":{"type":"int","comment":" 0 on success"},"description":"

Clear ignore rules that were explicitly added.

\n","comments":"

Resets to the default internal ignore rules. This will not turn off\n rules in .gitignore files that actually exist in the filesystem.

\n\n

The default internal ignores ignore ".", ".." and ".git" entries.

\n","group":"ignore"},"git_ignore_path_is_ignored":{"type":"function","file":"ignore.h","line":71,"lineto":74,"args":[{"name":"ignored","type":"int *","comment":"boolean returning 0 if the file is not ignored, 1 if it is"},{"name":"repo","type":"git_repository *","comment":"a repository object"},{"name":"path","type":"const char *","comment":"the file to check ignores for, relative to the repo's workdir."}],"argline":"int *ignored, git_repository *repo, const char *path","sig":"int *::git_repository *::const char *","return":{"type":"int","comment":" 0 if ignore rules could be processed for the file (regardless\n of whether it exists or not), or an error \n<\n 0 if they could not."},"description":"

Test if the ignore rules apply to a given path.

\n","comments":"

This function checks the ignore rules to see if they would apply to the\n given file. This indicates if the file would be ignored regardless of\n whether the file is already in the index or committed to the repository.

\n\n

One way to think of this is if you were to do "git add ." on the\n directory containing the file, would it be added or not?

\n","group":"ignore"},"git_index_open":{"type":"function","file":"index.h","line":189,"lineto":189,"args":[{"name":"out","type":"git_index **","comment":"the pointer for the new index"},{"name":"index_path","type":"const char *","comment":"the path to the index file in disk"}],"argline":"git_index **out, const char *index_path","sig":"git_index **::const char *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Create a new bare Git index object as a memory representation\n of the Git index file in 'index_path', without a repository\n to back it.

\n","comments":"

Since there is no ODB or working directory behind this index,\n any Index methods which rely on these (e.g. index_add_bypath)\n will fail with the GIT_ERROR error code.

\n\n

If you need to access the index of an actual repository,\n use the git_repository_index wrapper.

\n\n

The index must be freed once it's no longer in use.

\n","group":"index"},"git_index_new":{"type":"function","file":"index.h","line":202,"lineto":202,"args":[{"name":"out","type":"git_index **","comment":"the pointer for the new index"}],"argline":"git_index **out","sig":"git_index **","return":{"type":"int","comment":" 0 or an error code"},"description":"

Create an in-memory index object.

\n","comments":"

This index object cannot be read/written to the filesystem,\n but may be used to perform in-memory index operations.

\n\n

The index must be freed once it's no longer in use.

\n","group":"index"},"git_index_free":{"type":"function","file":"index.h","line":209,"lineto":209,"args":[{"name":"index","type":"git_index *","comment":"an existing index object"}],"argline":"git_index *index","sig":"git_index *","return":{"type":"void","comment":null},"description":"

Free an existing index object.

\n","comments":"","group":"index","examples":{"general.c":["ex/v0.23.2/general.html#git_index_free-29"],"init.c":["ex/v0.23.2/init.html#git_index_free-4"]}},"git_index_owner":{"type":"function","file":"index.h","line":217,"lineto":217,"args":[{"name":"index","type":"const git_index *","comment":"The index"}],"argline":"const git_index *index","sig":"const git_index *","return":{"type":"git_repository *","comment":" A pointer to the repository"},"description":"

Get the repository this index relates to

\n","comments":"","group":"index"},"git_index_caps":{"type":"function","file":"index.h","line":225,"lineto":225,"args":[{"name":"index","type":"const git_index *","comment":"An existing index object"}],"argline":"const git_index *index","sig":"const git_index *","return":{"type":"int","comment":" A combination of GIT_INDEXCAP values"},"description":"

Read index capabilities flags.

\n","comments":"","group":"index"},"git_index_set_caps":{"type":"function","file":"index.h","line":238,"lineto":238,"args":[{"name":"index","type":"git_index *","comment":"An existing index object"},{"name":"caps","type":"int","comment":"A combination of GIT_INDEXCAP values"}],"argline":"git_index *index, int caps","sig":"git_index *::int","return":{"type":"int","comment":" 0 on success, -1 on failure"},"description":"

Set index capabilities flags.

\n","comments":"

If you pass GIT_INDEXCAP_FROM_OWNER for the caps, then the\n capabilities will be read from the config of the owner object,\n looking at core.ignorecase, core.filemode, core.symlinks.

\n","group":"index"},"git_index_read":{"type":"function","file":"index.h","line":257,"lineto":257,"args":[{"name":"index","type":"git_index *","comment":"an existing index object"},{"name":"force","type":"int","comment":"if true, always reload, vs. only read if file has changed"}],"argline":"git_index *index, int force","sig":"git_index *::int","return":{"type":"int","comment":" 0 or an error code"},"description":"

Update the contents of an existing index object in memory by reading\n from the hard disk.

\n","comments":"

If force is true, this performs a "hard" read that discards in-memory\n changes and always reloads the on-disk index data. If there is no\n on-disk version, the index will be cleared.

\n\n

If force is false, this does a "soft" read that reloads the index\n data from disk only if it has changed since the last time it was\n loaded. Purely in-memory index data will be untouched. Be aware: if\n there are changes on disk, unwritten in-memory changes are discarded.

\n","group":"index"},"git_index_write":{"type":"function","file":"index.h","line":266,"lineto":266,"args":[{"name":"index","type":"git_index *","comment":"an existing index object"}],"argline":"git_index *index","sig":"git_index *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Write an existing index object from memory back to disk\n using an atomic file lock.

\n","comments":"","group":"index"},"git_index_path":{"type":"function","file":"index.h","line":274,"lineto":274,"args":[{"name":"index","type":"const git_index *","comment":"an existing index object"}],"argline":"const git_index *index","sig":"const git_index *","return":{"type":"const char *","comment":" path to index file or NULL for in-memory index"},"description":"

Get the full path to the index file on disk.

\n","comments":"","group":"index"},"git_index_checksum":{"type":"function","file":"index.h","line":286,"lineto":286,"args":[{"name":"index","type":"git_index *","comment":"an existing index object"}],"argline":"git_index *index","sig":"git_index *","return":{"type":"const git_oid *","comment":" a pointer to the checksum of the index"},"description":"

Get the checksum of the index

\n","comments":"

This checksum is the SHA-1 hash over the index file (except the\n last 20 bytes which are the checksum itself). In cases where the\n index does not exist on-disk, it will be zeroed out.

\n","group":"index"},"git_index_read_tree":{"type":"function","file":"index.h","line":297,"lineto":297,"args":[{"name":"index","type":"git_index *","comment":"an existing index object"},{"name":"tree","type":"const git_tree *","comment":"tree to read"}],"argline":"git_index *index, const git_tree *tree","sig":"git_index *::const git_tree *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Read a tree into the index file with stats

\n","comments":"

The current index contents will be replaced by the specified tree.

\n","group":"index"},"git_index_write_tree":{"type":"function","file":"index.h","line":318,"lineto":318,"args":[{"name":"out","type":"git_oid *","comment":"Pointer where to store the OID of the written tree"},{"name":"index","type":"git_index *","comment":"Index to write"}],"argline":"git_oid *out, git_index *index","sig":"git_oid *::git_index *","return":{"type":"int","comment":" 0 on success, GIT_EUNMERGED when the index is not clean\n or an error code"},"description":"

Write the index as a tree

\n","comments":"

This method will scan the index and write a representation\n of its current state back to disk; it recursively creates\n tree objects for each of the subtrees stored in the index,\n but only returns the OID of the root tree. This is the OID\n that can be used e.g. to create a commit.

\n\n

The index instance cannot be bare, and needs to be associated\n to an existing repository.

\n\n

The index must not contain any file in conflict.

\n","group":"index","examples":{"init.c":["ex/v0.23.2/init.html#git_index_write_tree-5"]}},"git_index_write_tree_to":{"type":"function","file":"index.h","line":335,"lineto":335,"args":[{"name":"out","type":"git_oid *","comment":"Pointer where to store OID of the the written tree"},{"name":"index","type":"git_index *","comment":"Index to write"},{"name":"repo","type":"git_repository *","comment":"Repository where to write the tree"}],"argline":"git_oid *out, git_index *index, git_repository *repo","sig":"git_oid *::git_index *::git_repository *","return":{"type":"int","comment":" 0 on success, GIT_EUNMERGED when the index is not clean\n or an error code"},"description":"

Write the index as a tree to the given repository

\n","comments":"

This method will do the same as git_index_write_tree, but\n letting the user choose the repository where the tree will\n be written.

\n\n

The index must not contain any file in conflict.

\n","group":"index"},"git_index_entrycount":{"type":"function","file":"index.h","line":354,"lineto":354,"args":[{"name":"index","type":"const git_index *","comment":"an existing index object"}],"argline":"const git_index *index","sig":"const git_index *","return":{"type":"size_t","comment":" integer of count of current entries"},"description":"

Get the count of entries currently in the index

\n","comments":"","group":"index","examples":{"general.c":["ex/v0.23.2/general.html#git_index_entrycount-30"]}},"git_index_clear":{"type":"function","file":"index.h","line":365,"lineto":365,"args":[{"name":"index","type":"git_index *","comment":"an existing index object"}],"argline":"git_index *index","sig":"git_index *","return":{"type":"int","comment":" 0 on success, error code \n<\n 0 on failure"},"description":"

Clear the contents (all the entries) of an index object.

\n","comments":"

This clears the index object in memory; changes must be explicitly\n written to disk for them to take effect persistently.

\n","group":"index"},"git_index_get_byindex":{"type":"function","file":"index.h","line":378,"lineto":379,"args":[{"name":"index","type":"git_index *","comment":"an existing index object"},{"name":"n","type":"size_t","comment":"the position of the entry"}],"argline":"git_index *index, size_t n","sig":"git_index *::size_t","return":{"type":"const git_index_entry *","comment":" a pointer to the entry; NULL if out of bounds"},"description":"

Get a pointer to one of the entries in the index

\n","comments":"

The entry is not modifiable and should not be freed. Because the\n git_index_entry struct is a publicly defined struct, you should\n be able to make your own permanent copy of the data if necessary.

\n","group":"index","examples":{"general.c":["ex/v0.23.2/general.html#git_index_get_byindex-31"]}},"git_index_get_bypath":{"type":"function","file":"index.h","line":393,"lineto":394,"args":[{"name":"index","type":"git_index *","comment":"an existing index object"},{"name":"path","type":"const char *","comment":"path to search"},{"name":"stage","type":"int","comment":"stage to search"}],"argline":"git_index *index, const char *path, int stage","sig":"git_index *::const char *::int","return":{"type":"const git_index_entry *","comment":" a pointer to the entry; NULL if it was not found"},"description":"

Get a pointer to one of the entries in the index

\n","comments":"

The entry is not modifiable and should not be freed. Because the\n git_index_entry struct is a publicly defined struct, you should\n be able to make your own permanent copy of the data if necessary.

\n","group":"index"},"git_index_remove":{"type":"function","file":"index.h","line":404,"lineto":404,"args":[{"name":"index","type":"git_index *","comment":"an existing index object"},{"name":"path","type":"const char *","comment":"path to search"},{"name":"stage","type":"int","comment":"stage to search"}],"argline":"git_index *index, const char *path, int stage","sig":"git_index *::const char *::int","return":{"type":"int","comment":" 0 or an error code"},"description":"

Remove an entry from the index

\n","comments":"","group":"index"},"git_index_remove_directory":{"type":"function","file":"index.h","line":414,"lineto":415,"args":[{"name":"index","type":"git_index *","comment":"an existing index object"},{"name":"dir","type":"const char *","comment":"container directory path"},{"name":"stage","type":"int","comment":"stage to search"}],"argline":"git_index *index, const char *dir, int stage","sig":"git_index *::const char *::int","return":{"type":"int","comment":" 0 or an error code"},"description":"

Remove all entries from the index under a given directory

\n","comments":"","group":"index"},"git_index_add":{"type":"function","file":"index.h","line":431,"lineto":431,"args":[{"name":"index","type":"git_index *","comment":"an existing index object"},{"name":"source_entry","type":"const git_index_entry *","comment":"new entry object"}],"argline":"git_index *index, const git_index_entry *source_entry","sig":"git_index *::const git_index_entry *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Add or update an index entry from an in-memory struct

\n","comments":"

If a previous index entry exists that has the same path and stage\n as the given 'source_entry', it will be replaced. Otherwise, the\n 'source_entry' will be added.

\n\n

A full copy (including the 'path' string) of the given\n 'source_entry' will be inserted on the index.

\n","group":"index"},"git_index_entry_stage":{"type":"function","file":"index.h","line":443,"lineto":443,"args":[{"name":"entry","type":"const git_index_entry *","comment":"The entry"}],"argline":"const git_index_entry *entry","sig":"const git_index_entry *","return":{"type":"int","comment":" the stage number"},"description":"

Return the stage number from a git index entry

\n","comments":"

This entry is calculated from the entry's flag attribute like this:

\n\n
(entry->flags \n
\n\n

&\n GIT_IDXENTRY_STAGEMASK) >> GIT_IDXENTRY_STAGESHIFT

\n","group":"index"},"git_index_entry_is_conflict":{"type":"function","file":"index.h","line":452,"lineto":452,"args":[{"name":"entry","type":"const git_index_entry *","comment":"The entry"}],"argline":"const git_index_entry *entry","sig":"const git_index_entry *","return":{"type":"int","comment":" 1 if the entry is a conflict entry, 0 otherwise"},"description":"

Return whether the given index entry is a conflict (has a high stage\n entry). This is simply shorthand for git_index_entry_stage > 0.

\n","comments":"","group":"index"},"git_index_add_bypath":{"type":"function","file":"index.h","line":483,"lineto":483,"args":[{"name":"index","type":"git_index *","comment":"an existing index object"},{"name":"path","type":"const char *","comment":"filename to add"}],"argline":"git_index *index, const char *path","sig":"git_index *::const char *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Add or update an index entry from a file on disk

\n","comments":"

The file path must be relative to the repository's\n working folder and must be readable.

\n\n

This method will fail in bare index instances.

\n\n

This forces the file to be added to the index, not looking\n at gitignore rules. Those rules can be evaluated through\n the git_status APIs (in status.h) before calling this.

\n\n

If this file currently is the result of a merge conflict, this\n file will no longer be marked as conflicting. The data about\n the conflict will be moved to the "resolve undo" (REUC) section.

\n","group":"index"},"git_index_add_frombuffer":{"type":"function","file":"index.h","line":512,"lineto":515,"args":[{"name":"index","type":"git_index *","comment":"an existing index object"},{"name":"entry","type":"const git_index_entry *","comment":"filename to add"},{"name":"buffer","type":"const void *","comment":"data to be written into the blob"},{"name":"len","type":"size_t","comment":"length of the data"}],"argline":"git_index *index, const git_index_entry *entry, const void *buffer, size_t len","sig":"git_index *::const git_index_entry *::const void *::size_t","return":{"type":"int","comment":" 0 or an error code"},"description":"

Add or update an index entry from a buffer in memory

\n","comments":"

This method will create a blob in the repository that owns the\n index and then add the index entry to the index. The path of the\n entry represents the position of the blob relative to the\n repository's root folder.

\n\n

If a previous index entry exists that has the same path as the\n given 'entry', it will be replaced. Otherwise, the 'entry' will be\n added. The id and the file_size of the 'entry' are updated with the\n real value of the blob.

\n\n

This forces the file to be added to the index, not looking\n at gitignore rules. Those rules can be evaluated through\n the git_status APIs (in status.h) before calling this.

\n\n

If this file currently is the result of a merge conflict, this\n file will no longer be marked as conflicting. The data about\n the conflict will be moved to the "resolve undo" (REUC) section.

\n","group":"index"},"git_index_remove_bypath":{"type":"function","file":"index.h","line":531,"lineto":531,"args":[{"name":"index","type":"git_index *","comment":"an existing index object"},{"name":"path","type":"const char *","comment":"filename to remove"}],"argline":"git_index *index, const char *path","sig":"git_index *::const char *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Remove an index entry corresponding to a file on disk

\n","comments":"

The file path must be relative to the repository's\n working folder. It may exist.

\n\n

If this file currently is the result of a merge conflict, this\n file will no longer be marked as conflicting. The data about\n the conflict will be moved to the "resolve undo" (REUC) section.

\n","group":"index"},"git_index_add_all":{"type":"function","file":"index.h","line":578,"lineto":583,"args":[{"name":"index","type":"git_index *","comment":"an existing index object"},{"name":"pathspec","type":"const git_strarray *","comment":"array of path patterns"},{"name":"flags","type":"unsigned int","comment":"combination of git_index_add_option_t flags"},{"name":"callback","type":"git_index_matched_path_cb","comment":"notification callback for each added/updated path (also\n gets index of matching pathspec entry); can be NULL;\n return 0 to add, >0 to skip, \n<\n0 to abort scan."},{"name":"payload","type":"void *","comment":"payload passed through to callback function"}],"argline":"git_index *index, const git_strarray *pathspec, unsigned int flags, git_index_matched_path_cb callback, void *payload","sig":"git_index *::const git_strarray *::unsigned int::git_index_matched_path_cb::void *","return":{"type":"int","comment":" 0 on success, negative callback return value, or error code"},"description":"

Add or update index entries matching files in the working directory.

\n","comments":"

This method will fail in bare index instances.

\n\n

The pathspec is a list of file names or shell glob patterns that will\n matched against files in the repository's working directory. Each file\n that matches will be added to the index (either updating an existing\n entry or adding a new entry). You can disable glob expansion and force\n exact matching with the GIT_INDEX_ADD_DISABLE_PATHSPEC_MATCH flag.

\n\n

Files that are ignored will be skipped (unlike git_index_add_bypath).\n If a file is already tracked in the index, then it will be updated\n even if it is ignored. Pass the GIT_INDEX_ADD_FORCE flag to\n skip the checking of ignore rules.

\n\n

To emulate git add -A and generate an error if the pathspec contains\n the exact path of an ignored file (when not using FORCE), add the\n GIT_INDEX_ADD_CHECK_PATHSPEC flag. This checks that each entry\n in the pathspec that is an exact match to a filename on disk is\n either not ignored or already in the index. If this check fails, the\n function will return GIT_EINVALIDSPEC.

\n\n

To emulate git add -A with the "dry-run" option, just use a callback\n function that always returns a positive value. See below for details.

\n\n

If any files are currently the result of a merge conflict, those files\n will no longer be marked as conflicting. The data about the conflicts\n will be moved to the "resolve undo" (REUC) section.

\n\n

If you provide a callback function, it will be invoked on each matching\n item in the working directory immediately before it is added to /\n updated in the index. Returning zero will add the item to the index,\n greater than zero will skip the item, and less than zero will abort the\n scan and return that value to the caller.

\n","group":"index"},"git_index_remove_all":{"type":"function","file":"index.h","line":600,"lineto":604,"args":[{"name":"index","type":"git_index *","comment":"An existing index object"},{"name":"pathspec","type":"const git_strarray *","comment":"array of path patterns"},{"name":"callback","type":"git_index_matched_path_cb","comment":"notification callback for each removed path (also\n gets index of matching pathspec entry); can be NULL;\n return 0 to add, >0 to skip, \n<\n0 to abort scan."},{"name":"payload","type":"void *","comment":"payload passed through to callback function"}],"argline":"git_index *index, const git_strarray *pathspec, git_index_matched_path_cb callback, void *payload","sig":"git_index *::const git_strarray *::git_index_matched_path_cb::void *","return":{"type":"int","comment":" 0 on success, negative callback return value, or error code"},"description":"

Remove all matching index entries.

\n","comments":"

If you provide a callback function, it will be invoked on each matching\n item in the index immediately before it is removed. Return 0 to\n remove the item, > 0 to skip the item, and \n<\n 0 to abort the scan.

\n","group":"index"},"git_index_update_all":{"type":"function","file":"index.h","line":629,"lineto":633,"args":[{"name":"index","type":"git_index *","comment":"An existing index object"},{"name":"pathspec","type":"const git_strarray *","comment":"array of path patterns"},{"name":"callback","type":"git_index_matched_path_cb","comment":"notification callback for each updated path (also\n gets index of matching pathspec entry); can be NULL;\n return 0 to add, >0 to skip, \n<\n0 to abort scan."},{"name":"payload","type":"void *","comment":"payload passed through to callback function"}],"argline":"git_index *index, const git_strarray *pathspec, git_index_matched_path_cb callback, void *payload","sig":"git_index *::const git_strarray *::git_index_matched_path_cb::void *","return":{"type":"int","comment":" 0 on success, negative callback return value, or error code"},"description":"

Update all index entries to match the working directory

\n","comments":"

This method will fail in bare index instances.

\n\n

This scans the existing index entries and synchronizes them with the\n working directory, deleting them if the corresponding working directory\n file no longer exists otherwise updating the information (including\n adding the latest version of file to the ODB if needed).

\n\n

If you provide a callback function, it will be invoked on each matching\n item in the index immediately before it is updated (either refreshed\n or removed depending on working directory state). Return 0 to proceed\n with updating the item, > 0 to skip the item, and \n<\n 0 to abort the scan.

\n","group":"index"},"git_index_find":{"type":"function","file":"index.h","line":644,"lineto":644,"args":[{"name":"at_pos","type":"size_t *","comment":"the address to which the position of the index entry is written (optional)"},{"name":"index","type":"git_index *","comment":"an existing index object"},{"name":"path","type":"const char *","comment":"path to search"}],"argline":"size_t *at_pos, git_index *index, const char *path","sig":"size_t *::git_index *::const char *","return":{"type":"int","comment":" a zero-based position in the index if found; GIT_ENOTFOUND otherwise"},"description":"

Find the first position of any entries which point to given\n path in the Git index.

\n","comments":"","group":"index"},"git_index_conflict_add":{"type":"function","file":"index.h","line":669,"lineto":673,"args":[{"name":"index","type":"git_index *","comment":"an existing index object"},{"name":"ancestor_entry","type":"const git_index_entry *","comment":"the entry data for the ancestor of the conflict"},{"name":"our_entry","type":"const git_index_entry *","comment":"the entry data for our side of the merge conflict"},{"name":"their_entry","type":"const git_index_entry *","comment":"the entry data for their side of the merge conflict"}],"argline":"git_index *index, const git_index_entry *ancestor_entry, const git_index_entry *our_entry, const git_index_entry *their_entry","sig":"git_index *::const git_index_entry *::const git_index_entry *::const git_index_entry *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Add or update index entries to represent a conflict. Any staged\n entries that exist at the given paths will be removed.

\n","comments":"

The entries are the entries from the tree included in the merge. Any\n entry may be null to indicate that that file was not present in the\n trees during the merge. For example, ancestor_entry may be NULL to\n indicate that a file was added in both branches and must be resolved.

\n","group":"index"},"git_index_conflict_get":{"type":"function","file":"index.h","line":689,"lineto":694,"args":[{"name":"ancestor_out","type":"const git_index_entry **","comment":"Pointer to store the ancestor entry"},{"name":"our_out","type":"const git_index_entry **","comment":"Pointer to store the our entry"},{"name":"their_out","type":"const git_index_entry **","comment":"Pointer to store the their entry"},{"name":"index","type":"git_index *","comment":"an existing index object"},{"name":"path","type":"const char *","comment":"path to search"}],"argline":"const git_index_entry **ancestor_out, const git_index_entry **our_out, const git_index_entry **their_out, git_index *index, const char *path","sig":"const git_index_entry **::const git_index_entry **::const git_index_entry **::git_index *::const char *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Get the index entries that represent a conflict of a single file.

\n","comments":"

The entries are not modifiable and should not be freed. Because the\n git_index_entry struct is a publicly defined struct, you should\n be able to make your own permanent copy of the data if necessary.

\n","group":"index"},"git_index_conflict_remove":{"type":"function","file":"index.h","line":703,"lineto":703,"args":[{"name":"index","type":"git_index *","comment":"an existing index object"},{"name":"path","type":"const char *","comment":"path to remove conflicts for"}],"argline":"git_index *index, const char *path","sig":"git_index *::const char *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Removes the index entries that represent a conflict of a single file.

\n","comments":"","group":"index"},"git_index_conflict_cleanup":{"type":"function","file":"index.h","line":711,"lineto":711,"args":[{"name":"index","type":"git_index *","comment":"an existing index object"}],"argline":"git_index *index","sig":"git_index *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Remove all conflicts in the index (entries with a stage greater than 0).

\n","comments":"","group":"index"},"git_index_has_conflicts":{"type":"function","file":"index.h","line":718,"lineto":718,"args":[{"name":"index","type":"const git_index *","comment":null}],"argline":"const git_index *index","sig":"const git_index *","return":{"type":"int","comment":" 1 if at least one conflict is found, 0 otherwise."},"description":"

Determine if the index contains entries representing file conflicts.

\n","comments":"","group":"index"},"git_index_conflict_iterator_new":{"type":"function","file":"index.h","line":729,"lineto":731,"args":[{"name":"iterator_out","type":"git_index_conflict_iterator **","comment":"The newly created conflict iterator"},{"name":"index","type":"git_index *","comment":"The index to scan"}],"argline":"git_index_conflict_iterator **iterator_out, git_index *index","sig":"git_index_conflict_iterator **::git_index *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Create an iterator for the conflicts in the index.

\n","comments":"

The index must not be modified while iterating; the results are undefined.

\n","group":"index"},"git_index_conflict_next":{"type":"function","file":"index.h","line":743,"lineto":747,"args":[{"name":"ancestor_out","type":"const git_index_entry **","comment":"Pointer to store the ancestor side of the conflict"},{"name":"our_out","type":"const git_index_entry **","comment":"Pointer to store our side of the conflict"},{"name":"their_out","type":"const git_index_entry **","comment":"Pointer to store their side of the conflict"},{"name":"iterator","type":"git_index_conflict_iterator *","comment":null}],"argline":"const git_index_entry **ancestor_out, const git_index_entry **our_out, const git_index_entry **their_out, git_index_conflict_iterator *iterator","sig":"const git_index_entry **::const git_index_entry **::const git_index_entry **::git_index_conflict_iterator *","return":{"type":"int","comment":" 0 (no error), GIT_ITEROVER (iteration is done) or an error code\n (negative value)"},"description":"

Returns the current conflict (ancestor, ours and theirs entry) and\n advance the iterator internally to the next value.

\n","comments":"","group":"index"},"git_index_conflict_iterator_free":{"type":"function","file":"index.h","line":754,"lineto":755,"args":[{"name":"iterator","type":"git_index_conflict_iterator *","comment":"pointer to the iterator"}],"argline":"git_index_conflict_iterator *iterator","sig":"git_index_conflict_iterator *","return":{"type":"void","comment":null},"description":"

Frees a git_index_conflict_iterator.

\n","comments":"","group":"index"},"git_indexer_new":{"type":"function","file":"indexer.h","line":30,"lineto":36,"args":[{"name":"out","type":"git_indexer **","comment":"where to store the indexer instance"},{"name":"path","type":"const char *","comment":"to the directory where the packfile should be stored"},{"name":"mode","type":"unsigned int","comment":"permissions to use creating packfile or 0 for defaults"},{"name":"odb","type":"git_odb *","comment":"object database from which to read base objects when\n fixing thin packs. Pass NULL if no thin pack is expected (an error\n will be returned if there are bases missing)"},{"name":"progress_cb","type":"git_transfer_progress_cb","comment":"function to call with progress information"},{"name":"progress_cb_payload","type":"void *","comment":"payload for the progress callback"}],"argline":"git_indexer **out, const char *path, unsigned int mode, git_odb *odb, git_transfer_progress_cb progress_cb, void *progress_cb_payload","sig":"git_indexer **::const char *::unsigned int::git_odb *::git_transfer_progress_cb::void *","return":{"type":"int","comment":null},"description":"

Create a new indexer instance

\n","comments":"","group":"indexer","examples":{"network/index-pack.c":["ex/v0.23.2/network/index-pack.html#git_indexer_new-1"]}},"git_indexer_append":{"type":"function","file":"indexer.h","line":46,"lineto":46,"args":[{"name":"idx","type":"git_indexer *","comment":"the indexer"},{"name":"data","type":"const void *","comment":"the data to add"},{"name":"size","type":"size_t","comment":"the size of the data in bytes"},{"name":"stats","type":"git_transfer_progress *","comment":"stat storage"}],"argline":"git_indexer *idx, const void *data, size_t size, git_transfer_progress *stats","sig":"git_indexer *::const void *::size_t::git_transfer_progress *","return":{"type":"int","comment":null},"description":"

Add data to the indexer

\n","comments":"","group":"indexer","examples":{"network/index-pack.c":["ex/v0.23.2/network/index-pack.html#git_indexer_append-2"]}},"git_indexer_commit":{"type":"function","file":"indexer.h","line":55,"lineto":55,"args":[{"name":"idx","type":"git_indexer *","comment":"the indexer"},{"name":"stats","type":"git_transfer_progress *","comment":null}],"argline":"git_indexer *idx, git_transfer_progress *stats","sig":"git_indexer *::git_transfer_progress *","return":{"type":"int","comment":null},"description":"

Finalize the pack and index

\n","comments":"

Resolve any pending deltas and write out the index file

\n","group":"indexer","examples":{"network/index-pack.c":["ex/v0.23.2/network/index-pack.html#git_indexer_commit-3"]}},"git_indexer_hash":{"type":"function","file":"indexer.h","line":65,"lineto":65,"args":[{"name":"idx","type":"const git_indexer *","comment":"the indexer instance"}],"argline":"const git_indexer *idx","sig":"const git_indexer *","return":{"type":"const git_oid *","comment":null},"description":"

Get the packfile's hash

\n","comments":"

A packfile's name is derived from the sorted hashing of all object\n names. This is only correct after the index has been finalized.

\n","group":"indexer","examples":{"network/index-pack.c":["ex/v0.23.2/network/index-pack.html#git_indexer_hash-4"]}},"git_indexer_free":{"type":"function","file":"indexer.h","line":72,"lineto":72,"args":[{"name":"idx","type":"git_indexer *","comment":"the indexer to free"}],"argline":"git_indexer *idx","sig":"git_indexer *","return":{"type":"void","comment":null},"description":"

Free the indexer and its resources

\n","comments":"","group":"indexer","examples":{"network/index-pack.c":["ex/v0.23.2/network/index-pack.html#git_indexer_free-5"]}},"git_merge_file_init_input":{"type":"function","file":"merge.h","line":60,"lineto":62,"args":[{"name":"opts","type":"git_merge_file_input *","comment":"the `git_merge_file_input` instance to initialize."},{"name":"version","type":"unsigned int","comment":"the version of the struct; you should pass\n `GIT_MERGE_FILE_INPUT_VERSION` here."}],"argline":"git_merge_file_input *opts, unsigned int version","sig":"git_merge_file_input *::unsigned int","return":{"type":"int","comment":" Zero on success; -1 on failure."},"description":"

Initializes a git_merge_file_input with default values. Equivalent to\n creating an instance with GIT_MERGE_FILE_INPUT_INIT.

\n","comments":"","group":"merge"},"git_merge_file_init_options":{"type":"function","file":"merge.h","line":188,"lineto":190,"args":[{"name":"opts","type":"git_merge_file_options *","comment":"the `git_merge_file_options` instance to initialize."},{"name":"version","type":"unsigned int","comment":"the version of the struct; you should pass\n `GIT_MERGE_FILE_OPTIONS_VERSION` here."}],"argline":"git_merge_file_options *opts, unsigned int version","sig":"git_merge_file_options *::unsigned int","return":{"type":"int","comment":" Zero on success; -1 on failure."},"description":"

Initializes a git_merge_file_options with default values. Equivalent to\n creating an instance with GIT_MERGE_FILE_OPTIONS_INIT.

\n","comments":"","group":"merge"},"git_merge_init_options":{"type":"function","file":"merge.h","line":265,"lineto":267,"args":[{"name":"opts","type":"git_merge_options *","comment":"the `git_merge_options` instance to initialize."},{"name":"version","type":"unsigned int","comment":"the version of the struct; you should pass\n `GIT_MERGE_OPTIONS_VERSION` here."}],"argline":"git_merge_options *opts, unsigned int version","sig":"git_merge_options *::unsigned int","return":{"type":"int","comment":" Zero on success; -1 on failure."},"description":"

Initializes a git_merge_options with default values. Equivalent to\n creating an instance with GIT_MERGE_OPTIONS_INIT.

\n","comments":"","group":"merge"},"git_merge_analysis":{"type":"function","file":"merge.h","line":336,"lineto":341,"args":[{"name":"analysis_out","type":"git_merge_analysis_t *","comment":"analysis enumeration that the result is written into"},{"name":"preference_out","type":"git_merge_preference_t *","comment":null},{"name":"repo","type":"git_repository *","comment":"the repository to merge"},{"name":"their_heads","type":"const git_annotated_commit **","comment":"the heads to merge into"},{"name":"their_heads_len","type":"size_t","comment":"the number of heads to merge"}],"argline":"git_merge_analysis_t *analysis_out, git_merge_preference_t *preference_out, git_repository *repo, const git_annotated_commit **their_heads, size_t their_heads_len","sig":"git_merge_analysis_t *::git_merge_preference_t *::git_repository *::const git_annotated_commit **::size_t","return":{"type":"int","comment":" 0 on success or error code"},"description":"

Analyzes the given branch(es) and determines the opportunities for\n merging them into the HEAD of the repository.

\n","comments":"","group":"merge"},"git_merge_base":{"type":"function","file":"merge.h","line":352,"lineto":356,"args":[{"name":"out","type":"git_oid *","comment":"the OID of a merge base between 'one' and 'two'"},{"name":"repo","type":"git_repository *","comment":"the repository where the commits exist"},{"name":"one","type":"const git_oid *","comment":"one of the commits"},{"name":"two","type":"const git_oid *","comment":"the other commit"}],"argline":"git_oid *out, git_repository *repo, const git_oid *one, const git_oid *two","sig":"git_oid *::git_repository *::const git_oid *::const git_oid *","return":{"type":"int","comment":" 0 on success, GIT_ENOTFOUND if not found or error code"},"description":"

Find a merge base between two commits

\n","comments":"","group":"merge","examples":{"log.c":["ex/v0.23.2/log.html#git_merge_base-32"],"rev-parse.c":["ex/v0.23.2/rev-parse.html#git_merge_base-3"]}},"git_merge_bases":{"type":"function","file":"merge.h","line":367,"lineto":371,"args":[{"name":"out","type":"git_oidarray *","comment":"array in which to store the resulting ids"},{"name":"repo","type":"git_repository *","comment":"the repository where the commits exist"},{"name":"one","type":"const git_oid *","comment":"one of the commits"},{"name":"two","type":"const git_oid *","comment":"the other commit"}],"argline":"git_oidarray *out, git_repository *repo, const git_oid *one, const git_oid *two","sig":"git_oidarray *::git_repository *::const git_oid *::const git_oid *","return":{"type":"int","comment":" 0 on success, GIT_ENOTFOUND if not found or error code"},"description":"

Find merge bases between two commits

\n","comments":"","group":"merge"},"git_merge_base_many":{"type":"function","file":"merge.h","line":382,"lineto":386,"args":[{"name":"out","type":"git_oid *","comment":"the OID of a merge base considering all the commits"},{"name":"repo","type":"git_repository *","comment":"the repository where the commits exist"},{"name":"length","type":"size_t","comment":"The number of commits in the provided `input_array`"},{"name":"input_array","type":"const git_oid []","comment":"oids of the commits"}],"argline":"git_oid *out, git_repository *repo, size_t length, const git_oid [] input_array","sig":"git_oid *::git_repository *::size_t::const git_oid []","return":{"type":"int","comment":" Zero on success; GIT_ENOTFOUND or -1 on failure."},"description":"

Find a merge base given a list of commits

\n","comments":"","group":"merge"},"git_merge_bases_many":{"type":"function","file":"merge.h","line":397,"lineto":401,"args":[{"name":"out","type":"git_oidarray *","comment":"array in which to store the resulting ids"},{"name":"repo","type":"git_repository *","comment":"the repository where the commits exist"},{"name":"length","type":"size_t","comment":"The number of commits in the provided `input_array`"},{"name":"input_array","type":"const git_oid []","comment":"oids of the commits"}],"argline":"git_oidarray *out, git_repository *repo, size_t length, const git_oid [] input_array","sig":"git_oidarray *::git_repository *::size_t::const git_oid []","return":{"type":"int","comment":" Zero on success; GIT_ENOTFOUND or -1 on failure."},"description":"

Find all merge bases given a list of commits

\n","comments":"","group":"merge"},"git_merge_base_octopus":{"type":"function","file":"merge.h","line":412,"lineto":416,"args":[{"name":"out","type":"git_oid *","comment":"the OID of a merge base considering all the commits"},{"name":"repo","type":"git_repository *","comment":"the repository where the commits exist"},{"name":"length","type":"size_t","comment":"The number of commits in the provided `input_array`"},{"name":"input_array","type":"const git_oid []","comment":"oids of the commits"}],"argline":"git_oid *out, git_repository *repo, size_t length, const git_oid [] input_array","sig":"git_oid *::git_repository *::size_t::const git_oid []","return":{"type":"int","comment":" Zero on success; GIT_ENOTFOUND or -1 on failure."},"description":"

Find a merge base in preparation for an octopus merge

\n","comments":"","group":"merge"},"git_merge_file":{"type":"function","file":"merge.h","line":434,"lineto":439,"args":[{"name":"out","type":"git_merge_file_result *","comment":"The git_merge_file_result to be filled in"},{"name":"ancestor","type":"const git_merge_file_input *","comment":"The contents of the ancestor file"},{"name":"ours","type":"const git_merge_file_input *","comment":"The contents of the file in \"our\" side"},{"name":"theirs","type":"const git_merge_file_input *","comment":"The contents of the file in \"their\" side"},{"name":"opts","type":"const git_merge_file_options *","comment":"The merge file options or `NULL` for defaults"}],"argline":"git_merge_file_result *out, const git_merge_file_input *ancestor, const git_merge_file_input *ours, const git_merge_file_input *theirs, const git_merge_file_options *opts","sig":"git_merge_file_result *::const git_merge_file_input *::const git_merge_file_input *::const git_merge_file_input *::const git_merge_file_options *","return":{"type":"int","comment":" 0 on success or error code"},"description":"

Merge two files as they exist in the in-memory data structures, using\n the given common ancestor as the baseline, producing a\n git_merge_file_result that reflects the merge result. The\n git_merge_file_result must be freed with git_merge_file_result_free.

\n","comments":"

Note that this function does not reference a repository and any\n configuration must be passed as git_merge_file_options.

\n","group":"merge"},"git_merge_file_from_index":{"type":"function","file":"merge.h","line":455,"lineto":461,"args":[{"name":"out","type":"git_merge_file_result *","comment":"The git_merge_file_result to be filled in"},{"name":"repo","type":"git_repository *","comment":"The repository"},{"name":"ancestor","type":"const git_index_entry *","comment":"The index entry for the ancestor file (stage level 1)"},{"name":"ours","type":"const git_index_entry *","comment":"The index entry for our file (stage level 2)"},{"name":"theirs","type":"const git_index_entry *","comment":"The index entry for their file (stage level 3)"},{"name":"opts","type":"const git_merge_file_options *","comment":"The merge file options or NULL"}],"argline":"git_merge_file_result *out, git_repository *repo, const git_index_entry *ancestor, const git_index_entry *ours, const git_index_entry *theirs, const git_merge_file_options *opts","sig":"git_merge_file_result *::git_repository *::const git_index_entry *::const git_index_entry *::const git_index_entry *::const git_merge_file_options *","return":{"type":"int","comment":" 0 on success or error code"},"description":"

Merge two files as they exist in the index, using the given common\n ancestor as the baseline, producing a git_merge_file_result that\n reflects the merge result. The git_merge_file_result must be freed with\n git_merge_file_result_free.

\n","comments":"","group":"merge"},"git_merge_file_result_free":{"type":"function","file":"merge.h","line":468,"lineto":468,"args":[{"name":"result","type":"git_merge_file_result *","comment":"The result to free or `NULL`"}],"argline":"git_merge_file_result *result","sig":"git_merge_file_result *","return":{"type":"void","comment":null},"description":"

Frees a git_merge_file_result.

\n","comments":"","group":"merge"},"git_merge_trees":{"type":"function","file":"merge.h","line":486,"lineto":492,"args":[{"name":"out","type":"git_index **","comment":"pointer to store the index result in"},{"name":"repo","type":"git_repository *","comment":"repository that contains the given trees"},{"name":"ancestor_tree","type":"const git_tree *","comment":"the common ancestor between the trees (or null if none)"},{"name":"our_tree","type":"const git_tree *","comment":"the tree that reflects the destination tree"},{"name":"their_tree","type":"const git_tree *","comment":"the tree to merge in to `our_tree`"},{"name":"opts","type":"const git_merge_options *","comment":"the merge tree options (or null for defaults)"}],"argline":"git_index **out, git_repository *repo, const git_tree *ancestor_tree, const git_tree *our_tree, const git_tree *their_tree, const git_merge_options *opts","sig":"git_index **::git_repository *::const git_tree *::const git_tree *::const git_tree *::const git_merge_options *","return":{"type":"int","comment":" 0 on success or error code"},"description":"

Merge two trees, producing a git_index that reflects the result of\n the merge. The index may be written as-is to the working directory\n or checked out. If the index is to be converted to a tree, the caller\n should resolve any conflicts that arose as part of the merge.

\n","comments":"

The returned index must be freed explicitly with git_index_free.

\n","group":"merge"},"git_merge_commits":{"type":"function","file":"merge.h","line":513,"lineto":518,"args":[{"name":"out","type":"git_index **","comment":"pointer to store the index result in"},{"name":"repo","type":"git_repository *","comment":"repository that contains the given trees"},{"name":"our_commit","type":"const git_commit *","comment":"the commit that reflects the destination tree"},{"name":"their_commit","type":"const git_commit *","comment":"the commit to merge in to `our_commit`"},{"name":"opts","type":"const git_merge_options *","comment":"the merge tree options (or null for defaults)"}],"argline":"git_index **out, git_repository *repo, const git_commit *our_commit, const git_commit *their_commit, const git_merge_options *opts","sig":"git_index **::git_repository *::const git_commit *::const git_commit *::const git_merge_options *","return":{"type":"int","comment":" 0 on success or error code"},"description":"

Merge two commits, producing a git_index that reflects the result of\n the merge. The index may be written as-is to the working directory\n or checked out. If the index is to be converted to a tree, the caller\n should resolve any conflicts that arose as part of the merge.

\n","comments":"

The merge performed uses the first common ancestor, unlike the\n git-merge-recursive strategy, which may produce an artificial common\n ancestor tree when there are multiple ancestors.

\n\n

The returned index must be freed explicitly with git_index_free.

\n","group":"merge"},"git_merge":{"type":"function","file":"merge.h","line":542,"lineto":547,"args":[{"name":"repo","type":"git_repository *","comment":"the repository to merge"},{"name":"their_heads","type":"const git_annotated_commit **","comment":"the heads to merge into"},{"name":"their_heads_len","type":"size_t","comment":"the number of heads to merge"},{"name":"merge_opts","type":"const git_merge_options *","comment":"merge options"},{"name":"checkout_opts","type":"const git_checkout_options *","comment":"checkout options"}],"argline":"git_repository *repo, const git_annotated_commit **their_heads, size_t their_heads_len, const git_merge_options *merge_opts, const git_checkout_options *checkout_opts","sig":"git_repository *::const git_annotated_commit **::size_t::const git_merge_options *::const git_checkout_options *","return":{"type":"int","comment":" 0 on success or error code"},"description":"

Merges the given commit(s) into HEAD, writing the results into the working\n directory. Any changes are staged for commit and any conflicts are written\n to the index. Callers should inspect the repository's index after this\n completes, resolve any conflicts and prepare a commit.

\n","comments":"

The merge performed uses the first common ancestor, unlike the\n git-merge-recursive strategy, which may produce an artificial common\n ancestor tree when there are multiple ancestors.

\n\n

For compatibility with git, the repository is put into a merging\n state. Once the commit is done (or if the uses wishes to abort),\n you should clear this state by calling\n git_repository_state_cleanup().

\n","group":"merge"},"git_message_prettify":{"type":"function","file":"message.h","line":39,"lineto":39,"args":[{"name":"out","type":"git_buf *","comment":"The user-allocated git_buf which will be filled with the\n cleaned up message."},{"name":"message","type":"const char *","comment":"The message to be prettified."},{"name":"strip_comments","type":"int","comment":"Non-zero to remove comment lines, 0 to leave them in."},{"name":"comment_char","type":"char","comment":"Comment character. Lines starting with this character\n are considered to be comments and removed if `strip_comments` is non-zero."}],"argline":"git_buf *out, const char *message, int strip_comments, char comment_char","sig":"git_buf *::const char *::int::char","return":{"type":"int","comment":" 0 or an error code."},"description":"

Clean up message from excess whitespace and make sure that the last line\n ends with a '

\n\n

'.

\n","comments":"

Optionally, can remove lines starting with a "#".

\n","group":"message"},"git_note_iterator_new":{"type":"function","file":"notes.h","line":49,"lineto":52,"args":[{"name":"out","type":"git_note_iterator **","comment":"pointer to the iterator"},{"name":"repo","type":"git_repository *","comment":"repository where to look up the note"},{"name":"notes_ref","type":"const char *","comment":"canonical name of the reference to use (optional); defaults to\n \"refs/notes/commits\""}],"argline":"git_note_iterator **out, git_repository *repo, const char *notes_ref","sig":"git_note_iterator **::git_repository *::const char *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Creates a new iterator for notes

\n","comments":"

The iterator must be freed manually by the user.

\n","group":"note"},"git_note_iterator_free":{"type":"function","file":"notes.h","line":59,"lineto":59,"args":[{"name":"it","type":"git_note_iterator *","comment":"pointer to the iterator"}],"argline":"git_note_iterator *it","sig":"git_note_iterator *","return":{"type":"void","comment":null},"description":"

Frees an git_note_iterator

\n","comments":"","group":"note"},"git_note_next":{"type":"function","file":"notes.h","line":72,"lineto":75,"args":[{"name":"note_id","type":"git_oid *","comment":"id of blob containing the message"},{"name":"annotated_id","type":"git_oid *","comment":"id of the git object being annotated"},{"name":"it","type":"git_note_iterator *","comment":"pointer to the iterator"}],"argline":"git_oid *note_id, git_oid *annotated_id, git_note_iterator *it","sig":"git_oid *::git_oid *::git_note_iterator *","return":{"type":"int","comment":" 0 (no error), GIT_ITEROVER (iteration is done) or an error code\n (negative value)"},"description":"

Return the current item (note_id and annotated_id) and advance the iterator\n internally to the next value

\n","comments":"","group":"note"},"git_note_read":{"type":"function","file":"notes.h","line":91,"lineto":95,"args":[{"name":"out","type":"git_note **","comment":"pointer to the read note; NULL in case of error"},{"name":"repo","type":"git_repository *","comment":"repository where to look up the note"},{"name":"notes_ref","type":"const char *","comment":"canonical name of the reference to use (optional); defaults to\n \"refs/notes/commits\""},{"name":"oid","type":"const git_oid *","comment":"OID of the git object to read the note from"}],"argline":"git_note **out, git_repository *repo, const char *notes_ref, const git_oid *oid","sig":"git_note **::git_repository *::const char *::const git_oid *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Read the note for an object

\n","comments":"

The note must be freed manually by the user.

\n","group":"note"},"git_note_author":{"type":"function","file":"notes.h","line":103,"lineto":103,"args":[{"name":"note","type":"const git_note *","comment":"the note"}],"argline":"const git_note *note","sig":"const git_note *","return":{"type":"const git_signature *","comment":" the author"},"description":"

Get the note author

\n","comments":"","group":"note"},"git_note_committer":{"type":"function","file":"notes.h","line":111,"lineto":111,"args":[{"name":"note","type":"const git_note *","comment":"the note"}],"argline":"const git_note *note","sig":"const git_note *","return":{"type":"const git_signature *","comment":" the committer"},"description":"

Get the note committer

\n","comments":"","group":"note"},"git_note_message":{"type":"function","file":"notes.h","line":120,"lineto":120,"args":[{"name":"note","type":"const git_note *","comment":"the note"}],"argline":"const git_note *note","sig":"const git_note *","return":{"type":"const char *","comment":" the note message"},"description":"

Get the note message

\n","comments":"","group":"note"},"git_note_id":{"type":"function","file":"notes.h","line":129,"lineto":129,"args":[{"name":"note","type":"const git_note *","comment":"the note"}],"argline":"const git_note *note","sig":"const git_note *","return":{"type":"const git_oid *","comment":" the note object's id"},"description":"

Get the note object's id

\n","comments":"","group":"note"},"git_note_create":{"type":"function","file":"notes.h","line":146,"lineto":154,"args":[{"name":"out","type":"git_oid *","comment":"pointer to store the OID (optional); NULL in case of error"},{"name":"repo","type":"git_repository *","comment":"repository where to store the note"},{"name":"notes_ref","type":"const char *","comment":"canonical name of the reference to use (optional);\n\t\t\t\t\tdefaults to \"refs/notes/commits\""},{"name":"author","type":"const git_signature *","comment":"signature of the notes commit author"},{"name":"committer","type":"const git_signature *","comment":"signature of the notes commit committer"},{"name":"oid","type":"const git_oid *","comment":"OID of the git object to decorate"},{"name":"note","type":"const char *","comment":"Content of the note to add for object oid"},{"name":"force","type":"int","comment":"Overwrite existing note"}],"argline":"git_oid *out, git_repository *repo, const char *notes_ref, const git_signature *author, const git_signature *committer, const git_oid *oid, const char *note, int force","sig":"git_oid *::git_repository *::const char *::const git_signature *::const git_signature *::const git_oid *::const char *::int","return":{"type":"int","comment":" 0 or an error code"},"description":"

Add a note for an object

\n","comments":"","group":"note"},"git_note_remove":{"type":"function","file":"notes.h","line":169,"lineto":174,"args":[{"name":"repo","type":"git_repository *","comment":"repository where the note lives"},{"name":"notes_ref","type":"const char *","comment":"canonical name of the reference to use (optional);\n\t\t\t\t\tdefaults to \"refs/notes/commits\""},{"name":"author","type":"const git_signature *","comment":"signature of the notes commit author"},{"name":"committer","type":"const git_signature *","comment":"signature of the notes commit committer"},{"name":"oid","type":"const git_oid *","comment":"OID of the git object to remove the note from"}],"argline":"git_repository *repo, const char *notes_ref, const git_signature *author, const git_signature *committer, const git_oid *oid","sig":"git_repository *::const char *::const git_signature *::const git_signature *::const git_oid *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Remove the note for an object

\n","comments":"","group":"note"},"git_note_free":{"type":"function","file":"notes.h","line":181,"lineto":181,"args":[{"name":"note","type":"git_note *","comment":"git_note object"}],"argline":"git_note *note","sig":"git_note *","return":{"type":"void","comment":null},"description":"

Free a git_note object

\n","comments":"","group":"note"},"git_note_foreach":{"type":"function","file":"notes.h","line":209,"lineto":213,"args":[{"name":"repo","type":"git_repository *","comment":"Repository where to find the notes."},{"name":"notes_ref","type":"const char *","comment":"Reference to read from (optional); defaults to\n \"refs/notes/commits\"."},{"name":"note_cb","type":"git_note_foreach_cb","comment":"Callback to invoke per found annotation. Return non-zero\n to stop looping."},{"name":"payload","type":"void *","comment":"Extra parameter to callback function."}],"argline":"git_repository *repo, const char *notes_ref, git_note_foreach_cb note_cb, void *payload","sig":"git_repository *::const char *::git_note_foreach_cb::void *","return":{"type":"int","comment":" 0 on success, non-zero callback return value, or error code"},"description":"

Loop over all the notes within a specified namespace\n and issue a callback for each one.

\n","comments":"","group":"note"},"git_object_lookup":{"type":"function","file":"object.h","line":42,"lineto":46,"args":[{"name":"object","type":"git_object **","comment":"pointer to the looked-up object"},{"name":"repo","type":"git_repository *","comment":"the repository to look up the object"},{"name":"id","type":"const git_oid *","comment":"the unique identifier for the object"},{"name":"type","type":"git_otype","comment":"the type of the object"}],"argline":"git_object **object, git_repository *repo, const git_oid *id, git_otype type","sig":"git_object **::git_repository *::const git_oid *::git_otype","return":{"type":"int","comment":" 0 or an error code"},"description":"

Lookup a reference to one of the objects in a repository.

\n","comments":"

The generated reference is owned by the repository and\n should be closed with the git_object_free method\n instead of free'd manually.

\n\n

The 'type' parameter must match the type of the object\n in the odb; the method will fail otherwise.\n The special value 'GIT_OBJ_ANY' may be passed to let\n the method guess the object's type.

\n","group":"object","examples":{"log.c":["ex/v0.23.2/log.html#git_object_lookup-33"]}},"git_object_lookup_prefix":{"type":"function","file":"object.h","line":75,"lineto":80,"args":[{"name":"object_out","type":"git_object **","comment":"pointer where to store the looked-up object"},{"name":"repo","type":"git_repository *","comment":"the repository to look up the object"},{"name":"id","type":"const git_oid *","comment":"a short identifier for the object"},{"name":"len","type":"size_t","comment":"the length of the short identifier"},{"name":"type","type":"git_otype","comment":"the type of the object"}],"argline":"git_object **object_out, git_repository *repo, const git_oid *id, size_t len, git_otype type","sig":"git_object **::git_repository *::const git_oid *::size_t::git_otype","return":{"type":"int","comment":" 0 or an error code"},"description":"

Lookup a reference to one of the objects in a repository,\n given a prefix of its identifier (short id).

\n","comments":"

The object obtained will be so that its identifier\n matches the first 'len' hexadecimal characters\n (packets of 4 bits) of the given 'id'.\n 'len' must be at least GIT_OID_MINPREFIXLEN, and\n long enough to identify a unique object matching\n the prefix; otherwise the method will fail.

\n\n

The generated reference is owned by the repository and\n should be closed with the git_object_free method\n instead of free'd manually.

\n\n

The 'type' parameter must match the type of the object\n in the odb; the method will fail otherwise.\n The special value 'GIT_OBJ_ANY' may be passed to let\n the method guess the object's type.

\n","group":"object"},"git_object_lookup_bypath":{"type":"function","file":"object.h","line":93,"lineto":97,"args":[{"name":"out","type":"git_object **","comment":"buffer that receives a pointer to the object (which must be freed\n by the caller)"},{"name":"treeish","type":"const git_object *","comment":"root object that can be peeled to a tree"},{"name":"path","type":"const char *","comment":"relative path from the root object to the desired object"},{"name":"type","type":"git_otype","comment":"type of object desired"}],"argline":"git_object **out, const git_object *treeish, const char *path, git_otype type","sig":"git_object **::const git_object *::const char *::git_otype","return":{"type":"int","comment":" 0 on success, or an error code"},"description":"

Lookup an object that represents a tree entry.

\n","comments":"","group":"object"},"git_object_id":{"type":"function","file":"object.h","line":105,"lineto":105,"args":[{"name":"obj","type":"const git_object *","comment":"the repository object"}],"argline":"const git_object *obj","sig":"const git_object *","return":{"type":"const git_oid *","comment":" the SHA1 id"},"description":"

Get the id (SHA1) of a repository object

\n","comments":"","group":"object","examples":{"blame.c":["ex/v0.23.2/blame.html#git_object_id-10","ex/v0.23.2/blame.html#git_object_id-11","ex/v0.23.2/blame.html#git_object_id-12","ex/v0.23.2/blame.html#git_object_id-13"],"cat-file.c":["ex/v0.23.2/cat-file.html#git_object_id-12","ex/v0.23.2/cat-file.html#git_object_id-13"],"log.c":["ex/v0.23.2/log.html#git_object_id-34","ex/v0.23.2/log.html#git_object_id-35","ex/v0.23.2/log.html#git_object_id-36","ex/v0.23.2/log.html#git_object_id-37"],"rev-parse.c":["ex/v0.23.2/rev-parse.html#git_object_id-4","ex/v0.23.2/rev-parse.html#git_object_id-5","ex/v0.23.2/rev-parse.html#git_object_id-6","ex/v0.23.2/rev-parse.html#git_object_id-7","ex/v0.23.2/rev-parse.html#git_object_id-8"]}},"git_object_short_id":{"type":"function","file":"object.h","line":119,"lineto":119,"args":[{"name":"out","type":"git_buf *","comment":"Buffer to write string into"},{"name":"obj","type":"const git_object *","comment":"The object to get an ID for"}],"argline":"git_buf *out, const git_object *obj","sig":"git_buf *::const git_object *","return":{"type":"int","comment":" 0 on success, \n<\n0 for error"},"description":"

Get a short abbreviated OID string for the object

\n","comments":"

This starts at the "core.abbrev" length (default 7 characters) and\n iteratively extends to a longer string if that length is ambiguous.\n The result will be unambiguous (at least until new objects are added to\n the repository).

\n","group":"object","examples":{"tag.c":["ex/v0.23.2/tag.html#git_object_short_id-5"]}},"git_object_type":{"type":"function","file":"object.h","line":127,"lineto":127,"args":[{"name":"obj","type":"const git_object *","comment":"the repository object"}],"argline":"const git_object *obj","sig":"const git_object *","return":{"type":"git_otype","comment":" the object's type"},"description":"

Get the object type of an object

\n","comments":"","group":"object","examples":{"cat-file.c":["ex/v0.23.2/cat-file.html#git_object_type-14","ex/v0.23.2/cat-file.html#git_object_type-15","ex/v0.23.2/cat-file.html#git_object_type-16"],"tag.c":["ex/v0.23.2/tag.html#git_object_type-6"]}},"git_object_owner":{"type":"function","file":"object.h","line":141,"lineto":141,"args":[{"name":"obj","type":"const git_object *","comment":"the object"}],"argline":"const git_object *obj","sig":"const git_object *","return":{"type":"git_repository *","comment":" the repository who owns this object"},"description":"

Get the repository that owns this object

\n","comments":"

Freeing or calling git_repository_close on the\n returned pointer will invalidate the actual object.

\n\n

Any other operation may be run on the repository without\n affecting the object.

\n","group":"object"},"git_object_free":{"type":"function","file":"object.h","line":158,"lineto":158,"args":[{"name":"object","type":"git_object *","comment":"the object to close"}],"argline":"git_object *object","sig":"git_object *","return":{"type":"void","comment":null},"description":"

Close an open object

\n","comments":"

This method instructs the library to close an existing\n object; note that git_objects are owned and cached by the repository\n so the object may or may not be freed after this library call,\n depending on how aggressive is the caching mechanism used\n by the repository.

\n\n

IMPORTANT:\n It is necessary to call this method when you stop using\n an object. Failure to do so will cause a memory leak.

\n","group":"object","examples":{"blame.c":["ex/v0.23.2/blame.html#git_object_free-14","ex/v0.23.2/blame.html#git_object_free-15","ex/v0.23.2/blame.html#git_object_free-16","ex/v0.23.2/blame.html#git_object_free-17"],"cat-file.c":["ex/v0.23.2/cat-file.html#git_object_free-17"],"general.c":["ex/v0.23.2/general.html#git_object_free-32"],"log.c":["ex/v0.23.2/log.html#git_object_free-38"],"rev-parse.c":["ex/v0.23.2/rev-parse.html#git_object_free-9","ex/v0.23.2/rev-parse.html#git_object_free-10","ex/v0.23.2/rev-parse.html#git_object_free-11"],"tag.c":["ex/v0.23.2/tag.html#git_object_free-7","ex/v0.23.2/tag.html#git_object_free-8","ex/v0.23.2/tag.html#git_object_free-9","ex/v0.23.2/tag.html#git_object_free-10"]}},"git_object_type2string":{"type":"function","file":"object.h","line":169,"lineto":169,"args":[{"name":"type","type":"git_otype","comment":"object type to convert."}],"argline":"git_otype type","sig":"git_otype","return":{"type":"const char *","comment":" the corresponding string representation."},"description":"

Convert an object type to its string representation.

\n","comments":"

The result is a pointer to a string in static memory and\n should not be free()'ed.

\n","group":"object","examples":{"cat-file.c":["ex/v0.23.2/cat-file.html#git_object_type2string-18","ex/v0.23.2/cat-file.html#git_object_type2string-19","ex/v0.23.2/cat-file.html#git_object_type2string-20","ex/v0.23.2/cat-file.html#git_object_type2string-21"],"general.c":["ex/v0.23.2/general.html#git_object_type2string-33"]}},"git_object_string2type":{"type":"function","file":"object.h","line":177,"lineto":177,"args":[{"name":"str","type":"const char *","comment":"the string to convert."}],"argline":"const char *str","sig":"const char *","return":{"type":"git_otype","comment":" the corresponding git_otype."},"description":"

Convert a string object type representation to it's git_otype.

\n","comments":"","group":"object"},"git_object_typeisloose":{"type":"function","file":"object.h","line":186,"lineto":186,"args":[{"name":"type","type":"git_otype","comment":"object type to test."}],"argline":"git_otype type","sig":"git_otype","return":{"type":"int","comment":" true if the type represents a valid loose object type,\n false otherwise."},"description":"

Determine if the given git_otype is a valid loose object type.

\n","comments":"","group":"object"},"git_object__size":{"type":"function","file":"object.h","line":200,"lineto":200,"args":[{"name":"type","type":"git_otype","comment":"object type to get its size"}],"argline":"git_otype type","sig":"git_otype","return":{"type":"size_t","comment":" size in bytes of the object"},"description":"

Get the size in bytes for the structure which\n acts as an in-memory representation of any given\n object type.

\n","comments":"

For all the core types, this would the equivalent\n of calling sizeof(git_commit) if the core types\n were not opaque on the external API.

\n","group":"object"},"git_object_peel":{"type":"function","file":"object.h","line":225,"lineto":228,"args":[{"name":"peeled","type":"git_object **","comment":"Pointer to the peeled git_object"},{"name":"object","type":"const git_object *","comment":"The object to be processed"},{"name":"target_type","type":"git_otype","comment":"The type of the requested object (a GIT_OBJ_ value)"}],"argline":"git_object **peeled, const git_object *object, git_otype target_type","sig":"git_object **::const git_object *::git_otype","return":{"type":"int","comment":" 0 on success, GIT_EINVALIDSPEC, GIT_EPEEL, or an error code"},"description":"

Recursively peel an object until an object of the specified type is met.

\n","comments":"

If the query cannot be satisfied due to the object model,\n GIT_EINVALIDSPEC will be returned (e.g. trying to peel a blob to a\n tree).

\n\n

If you pass GIT_OBJ_ANY as the target type, then the object will\n be peeled until the type changes. A tag will be peeled until the\n referenced object is no longer a tag, and a commit will be peeled\n to a tree. Any other object type will return GIT_EINVALIDSPEC.

\n\n

If peeling a tag we discover an object which cannot be peeled to\n the target type due to the object model, GIT_EPEEL will be\n returned.

\n\n

You must free the returned object.

\n","group":"object"},"git_object_dup":{"type":"function","file":"object.h","line":237,"lineto":237,"args":[{"name":"dest","type":"git_object **","comment":"Pointer to store the copy of the object"},{"name":"source","type":"git_object *","comment":"Original object to copy"}],"argline":"git_object **dest, git_object *source","sig":"git_object **::git_object *","return":{"type":"int","comment":null},"description":"

Create an in-memory copy of a Git object. The copy must be\n explicitly free'd or it will leak.

\n","comments":"","group":"object"},"git_odb_new":{"type":"function","file":"odb.h","line":38,"lineto":38,"args":[{"name":"out","type":"git_odb **","comment":"location to store the database pointer, if opened.\n\t\t\tSet to NULL if the open failed."}],"argline":"git_odb **out","sig":"git_odb **","return":{"type":"int","comment":" 0 or an error code"},"description":"

Create a new object database with no backends.

\n","comments":"

Before the ODB can be used for read/writing, a custom database\n backend must be manually added using git_odb_add_backend()

\n","group":"odb"},"git_odb_open":{"type":"function","file":"odb.h","line":56,"lineto":56,"args":[{"name":"out","type":"git_odb **","comment":"location to store the database pointer, if opened.\n\t\t\tSet to NULL if the open failed."},{"name":"objects_dir","type":"const char *","comment":"path of the backends' \"objects\" directory."}],"argline":"git_odb **out, const char *objects_dir","sig":"git_odb **::const char *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Create a new object database and automatically add\n the two default backends:

\n","comments":"
- git_odb_backend_loose: read and write loose object files\n    from disk, assuming `objects_dir` as the Objects folder\n\n- git_odb_backend_pack: read objects from packfiles,\n    assuming `objects_dir` as the Objects folder which\n    contains a 'pack/' folder with the corresponding data\n
\n","group":"odb"},"git_odb_add_disk_alternate":{"type":"function","file":"odb.h","line":73,"lineto":73,"args":[{"name":"odb","type":"git_odb *","comment":"database to add the backend to"},{"name":"path","type":"const char *","comment":"path to the objects folder for the alternate"}],"argline":"git_odb *odb, const char *path","sig":"git_odb *::const char *","return":{"type":"int","comment":" 0 on success; error code otherwise"},"description":"

Add an on-disk alternate to an existing Object DB.

\n","comments":"

Note that the added path must point to an objects, not\n to a full repository, to use it as an alternate store.

\n\n

Alternate backends are always checked for objects after\n all the main backends have been exhausted.

\n\n

Writing is disabled on alternate backends.

\n","group":"odb"},"git_odb_free":{"type":"function","file":"odb.h","line":80,"lineto":80,"args":[{"name":"db","type":"git_odb *","comment":"database pointer to close. If NULL no action is taken."}],"argline":"git_odb *db","sig":"git_odb *","return":{"type":"void","comment":null},"description":"

Close an open object database.

\n","comments":"","group":"odb","examples":{"cat-file.c":["ex/v0.23.2/cat-file.html#git_odb_free-22"]}},"git_odb_read":{"type":"function","file":"odb.h","line":99,"lineto":99,"args":[{"name":"out","type":"git_odb_object **","comment":"pointer where to store the read object"},{"name":"db","type":"git_odb *","comment":"database to search for the object in."},{"name":"id","type":"const git_oid *","comment":"identity of the object to read."}],"argline":"git_odb_object **out, git_odb *db, const git_oid *id","sig":"git_odb_object **::git_odb *::const git_oid *","return":{"type":"int","comment":" - 0 if the object was read;\n - GIT_ENOTFOUND if the object is not in the database."},"description":"

Read an object from the database.

\n","comments":"

This method queries all available ODB backends\n trying to read the given OID.

\n\n

The returned object is reference counted and\n internally cached, so it should be closed\n by the user once it's no longer in use.

\n","group":"odb","examples":{"cat-file.c":["ex/v0.23.2/cat-file.html#git_odb_read-23"],"general.c":["ex/v0.23.2/general.html#git_odb_read-34"]}},"git_odb_read_prefix":{"type":"function","file":"odb.h","line":128,"lineto":128,"args":[{"name":"out","type":"git_odb_object **","comment":"pointer where to store the read object"},{"name":"db","type":"git_odb *","comment":"database to search for the object in."},{"name":"short_id","type":"const git_oid *","comment":"a prefix of the id of the object to read."},{"name":"len","type":"size_t","comment":"the length of the prefix"}],"argline":"git_odb_object **out, git_odb *db, const git_oid *short_id, size_t len","sig":"git_odb_object **::git_odb *::const git_oid *::size_t","return":{"type":"int","comment":" - 0 if the object was read;\n - GIT_ENOTFOUND if the object is not in the database.\n - GIT_EAMBIGUOUS if the prefix is ambiguous (several objects match the prefix)"},"description":"

Read an object from the database, given a prefix\n of its identifier.

\n","comments":"

This method queries all available ODB backends\n trying to match the 'len' first hexadecimal\n characters of the 'short_id'.\n The remaining (GIT_OID_HEXSZ-len)*4 bits of\n 'short_id' must be 0s.\n 'len' must be at least GIT_OID_MINPREFIXLEN,\n and the prefix must be long enough to identify\n a unique object in all the backends; the\n method will fail otherwise.

\n\n

The returned object is reference counted and\n internally cached, so it should be closed\n by the user once it's no longer in use.

\n","group":"odb"},"git_odb_read_header":{"type":"function","file":"odb.h","line":148,"lineto":148,"args":[{"name":"len_out","type":"size_t *","comment":"pointer where to store the length"},{"name":"type_out","type":"git_otype *","comment":"pointer where to store the type"},{"name":"db","type":"git_odb *","comment":"database to search for the object in."},{"name":"id","type":"const git_oid *","comment":"identity of the object to read."}],"argline":"size_t *len_out, git_otype *type_out, git_odb *db, const git_oid *id","sig":"size_t *::git_otype *::git_odb *::const git_oid *","return":{"type":"int","comment":" - 0 if the object was read;\n - GIT_ENOTFOUND if the object is not in the database."},"description":"

Read the header of an object from the database, without\n reading its full contents.

\n","comments":"

The header includes the length and the type of an object.

\n\n

Note that most backends do not support reading only the header\n of an object, so the whole object will be read and then the\n header will be returned.

\n","group":"odb"},"git_odb_exists":{"type":"function","file":"odb.h","line":159,"lineto":159,"args":[{"name":"db","type":"git_odb *","comment":"database to be searched for the given object."},{"name":"id","type":"const git_oid *","comment":"the object to search for."}],"argline":"git_odb *db, const git_oid *id","sig":"git_odb *::const git_oid *","return":{"type":"int","comment":" - 1, if the object was found\n - 0, otherwise"},"description":"

Determine if the given object can be found in the object database.

\n","comments":"","group":"odb"},"git_odb_exists_prefix":{"type":"function","file":"odb.h","line":171,"lineto":172,"args":[{"name":"out","type":"git_oid *","comment":"The full OID of the found object if just one is found."},{"name":"db","type":"git_odb *","comment":"The database to be searched for the given object."},{"name":"short_id","type":"const git_oid *","comment":"A prefix of the id of the object to read."},{"name":"len","type":"size_t","comment":"The length of the prefix."}],"argline":"git_oid *out, git_odb *db, const git_oid *short_id, size_t len","sig":"git_oid *::git_odb *::const git_oid *::size_t","return":{"type":"int","comment":" 0 if found, GIT_ENOTFOUND if not found, GIT_EAMBIGUOUS if multiple\n matches were found, other value \n<\n 0 if there was a read error."},"description":"

Determine if objects can be found in the object database from a short OID.

\n","comments":"","group":"odb"},"git_odb_refresh":{"type":"function","file":"odb.h","line":192,"lineto":192,"args":[{"name":"db","type":"struct git_odb *","comment":"database to refresh"}],"argline":"struct git_odb *db","sig":"struct git_odb *","return":{"type":"int","comment":" 0 on success, error code otherwise"},"description":"

Refresh the object database to load newly added files.

\n","comments":"

If the object databases have changed on disk while the library\n is running, this function will force a reload of the underlying\n indexes.

\n\n

Use this function when you're confident that an external\n application has tampered with the ODB.

\n\n

NOTE that it is not necessary to call this function at all. The\n library will automatically attempt to refresh the ODB\n when a lookup fails, to see if the looked up object exists\n on disk but hasn't been loaded yet.

\n","group":"odb"},"git_odb_foreach":{"type":"function","file":"odb.h","line":207,"lineto":207,"args":[{"name":"db","type":"git_odb *","comment":"database to use"},{"name":"cb","type":"git_odb_foreach_cb","comment":"the callback to call for each object"},{"name":"payload","type":"void *","comment":"data to pass to the callback"}],"argline":"git_odb *db, git_odb_foreach_cb cb, void *payload","sig":"git_odb *::git_odb_foreach_cb::void *","return":{"type":"int","comment":" 0 on success, non-zero callback return value, or error code"},"description":"

List all objects available in the database

\n","comments":"

The callback will be called for each object available in the\n database. Note that the objects are likely to be returned in the index\n order, which would make accessing the objects in that order inefficient.\n Return a non-zero value from the callback to stop looping.

\n","group":"odb"},"git_odb_write":{"type":"function","file":"odb.h","line":227,"lineto":227,"args":[{"name":"out","type":"git_oid *","comment":"pointer to store the OID result of the write"},{"name":"odb","type":"git_odb *","comment":"object database where to store the object"},{"name":"data","type":"const void *","comment":"buffer with the data to store"},{"name":"len","type":"size_t","comment":"size of the buffer"},{"name":"type","type":"git_otype","comment":"type of the data to store"}],"argline":"git_oid *out, git_odb *odb, const void *data, size_t len, git_otype type","sig":"git_oid *::git_odb *::const void *::size_t::git_otype","return":{"type":"int","comment":" 0 or an error code"},"description":"

Write an object directly into the ODB

\n","comments":"

This method writes a full object straight into the ODB.\n For most cases, it is preferred to write objects through a write\n stream, which is both faster and less memory intensive, specially\n for big objects.

\n\n

This method is provided for compatibility with custom backends\n which are not able to support streaming writes

\n","group":"odb","examples":{"general.c":["ex/v0.23.2/general.html#git_odb_write-35"]}},"git_odb_open_wstream":{"type":"function","file":"odb.h","line":250,"lineto":250,"args":[{"name":"out","type":"git_odb_stream **","comment":"pointer where to store the stream"},{"name":"db","type":"git_odb *","comment":"object database where the stream will write"},{"name":"size","type":"git_off_t","comment":"final size of the object that will be written"},{"name":"type","type":"git_otype","comment":"type of the object that will be written"}],"argline":"git_odb_stream **out, git_odb *db, git_off_t size, git_otype type","sig":"git_odb_stream **::git_odb *::git_off_t::git_otype","return":{"type":"int","comment":" 0 if the stream was created; error code otherwise"},"description":"

Open a stream to write an object into the ODB

\n","comments":"

The type and final length of the object must be specified\n when opening the stream.

\n\n

The returned stream will be of type GIT_STREAM_WRONLY, and it\n won't be effective until git_odb_stream_finalize_write is called\n and returns without an error

\n\n

The stream must always be freed when done with git_odb_stream_free or\n will leak memory.

\n","group":"odb"},"git_odb_stream_write":{"type":"function","file":"odb.h","line":263,"lineto":263,"args":[{"name":"stream","type":"git_odb_stream *","comment":"the stream"},{"name":"buffer","type":"const char *","comment":"the data to write"},{"name":"len","type":"size_t","comment":"the buffer's length"}],"argline":"git_odb_stream *stream, const char *buffer, size_t len","sig":"git_odb_stream *::const char *::size_t","return":{"type":"int","comment":" 0 if the write succeeded; error code otherwise"},"description":"

Write to an odb stream

\n","comments":"

This method will fail if the total number of received bytes exceeds the\n size declared with git_odb_open_wstream()

\n","group":"odb"},"git_odb_stream_finalize_write":{"type":"function","file":"odb.h","line":278,"lineto":278,"args":[{"name":"out","type":"git_oid *","comment":"pointer to store the resulting object's id"},{"name":"stream","type":"git_odb_stream *","comment":"the stream"}],"argline":"git_oid *out, git_odb_stream *stream","sig":"git_oid *::git_odb_stream *","return":{"type":"int","comment":" 0 on success; an error code otherwise"},"description":"

Finish writing to an odb stream

\n","comments":"

The object will take its final name and will be available to the\n odb.

\n\n

This method will fail if the total number of received bytes\n differs from the size declared with git_odb_open_wstream()

\n","group":"odb"},"git_odb_stream_read":{"type":"function","file":"odb.h","line":285,"lineto":285,"args":[{"name":"stream","type":"git_odb_stream *","comment":null},{"name":"buffer","type":"char *","comment":null},{"name":"len","type":"size_t","comment":null}],"argline":"git_odb_stream *stream, char *buffer, size_t len","sig":"git_odb_stream *::char *::size_t","return":{"type":"int","comment":null},"description":"

Read from an odb stream

\n","comments":"

Most backends don't implement streaming reads

\n","group":"odb"},"git_odb_stream_free":{"type":"function","file":"odb.h","line":292,"lineto":292,"args":[{"name":"stream","type":"git_odb_stream *","comment":"the stream to free"}],"argline":"git_odb_stream *stream","sig":"git_odb_stream *","return":{"type":"void","comment":null},"description":"

Free an odb stream

\n","comments":"","group":"odb"},"git_odb_open_rstream":{"type":"function","file":"odb.h","line":318,"lineto":318,"args":[{"name":"out","type":"git_odb_stream **","comment":"pointer where to store the stream"},{"name":"db","type":"git_odb *","comment":"object database where the stream will read from"},{"name":"oid","type":"const git_oid *","comment":"oid of the object the stream will read from"}],"argline":"git_odb_stream **out, git_odb *db, const git_oid *oid","sig":"git_odb_stream **::git_odb *::const git_oid *","return":{"type":"int","comment":" 0 if the stream was created; error code otherwise"},"description":"

Open a stream to read an object from the ODB

\n","comments":"

Note that most backends do not support streaming reads\n because they store their objects as compressed/delta'ed blobs.

\n\n

It's recommended to use git_odb_read instead, which is\n assured to work on all backends.

\n\n

The returned stream will be of type GIT_STREAM_RDONLY and\n will have the following methods:

\n\n
    - stream->read: read `n` bytes from the stream\n    - stream->free: free the stream\n
\n\n

The stream must always be free'd or will leak memory.

\n","group":"odb"},"git_odb_write_pack":{"type":"function","file":"odb.h","line":338,"lineto":342,"args":[{"name":"out","type":"git_odb_writepack **","comment":"pointer to the writepack functions"},{"name":"db","type":"git_odb *","comment":"object database where the stream will read from"},{"name":"progress_cb","type":"git_transfer_progress_cb","comment":"function to call with progress information.\n Be aware that this is called inline with network and indexing operations,\n so performance may be affected."},{"name":"progress_payload","type":"void *","comment":"payload for the progress callback"}],"argline":"git_odb_writepack **out, git_odb *db, git_transfer_progress_cb progress_cb, void *progress_payload","sig":"git_odb_writepack **::git_odb *::git_transfer_progress_cb::void *","return":{"type":"int","comment":null},"description":"

Open a stream for writing a pack file to the ODB.

\n","comments":"

If the ODB layer understands pack files, then the given\n packfile will likely be streamed directly to disk (and a\n corresponding index created). If the ODB layer does not\n understand pack files, the objects will be stored in whatever\n format the ODB layer uses.

\n","group":"odb"},"git_odb_hash":{"type":"function","file":"odb.h","line":356,"lineto":356,"args":[{"name":"out","type":"git_oid *","comment":"the resulting object-ID."},{"name":"data","type":"const void *","comment":"data to hash"},{"name":"len","type":"size_t","comment":"size of the data"},{"name":"type","type":"git_otype","comment":"of the data to hash"}],"argline":"git_oid *out, const void *data, size_t len, git_otype type","sig":"git_oid *::const void *::size_t::git_otype","return":{"type":"int","comment":" 0 or an error code"},"description":"

Determine the object-ID (sha1 hash) of a data buffer

\n","comments":"

The resulting SHA-1 OID will be the identifier for the data\n buffer as if the data buffer it were to written to the ODB.

\n","group":"odb"},"git_odb_hashfile":{"type":"function","file":"odb.h","line":371,"lineto":371,"args":[{"name":"out","type":"git_oid *","comment":"oid structure the result is written into."},{"name":"path","type":"const char *","comment":"file to read and determine object id for"},{"name":"type","type":"git_otype","comment":"the type of the object that will be hashed"}],"argline":"git_oid *out, const char *path, git_otype type","sig":"git_oid *::const char *::git_otype","return":{"type":"int","comment":" 0 or an error code"},"description":"

Read a file from disk and fill a git_oid with the object id\n that the file would have if it were written to the Object\n Database as an object of the given type (w/o applying filters).\n Similar functionality to git.git's git hash-object without\n the -w flag, however, with the --no-filters flag.\n If you need filters, see git_repository_hashfile.

\n","comments":"","group":"odb"},"git_odb_object_dup":{"type":"function","file":"odb.h","line":385,"lineto":385,"args":[{"name":"dest","type":"git_odb_object **","comment":"pointer where to store the copy"},{"name":"source","type":"git_odb_object *","comment":"object to copy"}],"argline":"git_odb_object **dest, git_odb_object *source","sig":"git_odb_object **::git_odb_object *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Create a copy of an odb_object

\n","comments":"

The returned copy must be manually freed with git_odb_object_free.\n Note that because of an implementation detail, the returned copy will be\n the same pointer as source: the object is internally refcounted, so the\n copy still needs to be freed twice.

\n","group":"odb"},"git_odb_object_free":{"type":"function","file":"odb.h","line":395,"lineto":395,"args":[{"name":"object","type":"git_odb_object *","comment":"object to close"}],"argline":"git_odb_object *object","sig":"git_odb_object *","return":{"type":"void","comment":null},"description":"

Close an ODB object

\n","comments":"

This method must always be called once a git_odb_object is no\n longer needed, otherwise memory will leak.

\n","group":"odb","examples":{"cat-file.c":["ex/v0.23.2/cat-file.html#git_odb_object_free-24"],"general.c":["ex/v0.23.2/general.html#git_odb_object_free-36"]}},"git_odb_object_id":{"type":"function","file":"odb.h","line":405,"lineto":405,"args":[{"name":"object","type":"git_odb_object *","comment":"the object"}],"argline":"git_odb_object *object","sig":"git_odb_object *","return":{"type":"const git_oid *","comment":" a pointer to the OID"},"description":"

Return the OID of an ODB object

\n","comments":"

This is the OID from which the object was read from

\n","group":"odb"},"git_odb_object_data":{"type":"function","file":"odb.h","line":418,"lineto":418,"args":[{"name":"object","type":"git_odb_object *","comment":"the object"}],"argline":"git_odb_object *object","sig":"git_odb_object *","return":{"type":"const void *","comment":" a pointer to the data"},"description":"

Return the data of an ODB object

\n","comments":"

This is the uncompressed, raw data as read from the ODB,\n without the leading header.

\n\n

This pointer is owned by the object and shall not be free'd.

\n","group":"odb","examples":{"general.c":["ex/v0.23.2/general.html#git_odb_object_data-37"]}},"git_odb_object_size":{"type":"function","file":"odb.h","line":429,"lineto":429,"args":[{"name":"object","type":"git_odb_object *","comment":"the object"}],"argline":"git_odb_object *object","sig":"git_odb_object *","return":{"type":"size_t","comment":" the size"},"description":"

Return the size of an ODB object

\n","comments":"

This is the real size of the data buffer, not the\n actual size of the object.

\n","group":"odb","examples":{"cat-file.c":["ex/v0.23.2/cat-file.html#git_odb_object_size-25"],"general.c":["ex/v0.23.2/general.html#git_odb_object_size-38"]}},"git_odb_object_type":{"type":"function","file":"odb.h","line":437,"lineto":437,"args":[{"name":"object","type":"git_odb_object *","comment":"the object"}],"argline":"git_odb_object *object","sig":"git_odb_object *","return":{"type":"git_otype","comment":" the type"},"description":"

Return the type of an ODB object

\n","comments":"","group":"odb","examples":{"general.c":["ex/v0.23.2/general.html#git_odb_object_type-39"]}},"git_odb_add_backend":{"type":"function","file":"odb.h","line":452,"lineto":452,"args":[{"name":"odb","type":"git_odb *","comment":"database to add the backend to"},{"name":"backend","type":"git_odb_backend *","comment":"pointer to a git_odb_backend instance"},{"name":"priority","type":"int","comment":"Value for ordering the backends queue"}],"argline":"git_odb *odb, git_odb_backend *backend, int priority","sig":"git_odb *::git_odb_backend *::int","return":{"type":"int","comment":" 0 on success; error code otherwise"},"description":"

Add a custom backend to an existing Object DB

\n","comments":"

The backends are checked in relative ordering, based on the\n value of the priority parameter.

\n\n

Read \n for more information.

\n","group":"odb"},"git_odb_add_alternate":{"type":"function","file":"odb.h","line":473,"lineto":473,"args":[{"name":"odb","type":"git_odb *","comment":"database to add the backend to"},{"name":"backend","type":"git_odb_backend *","comment":"pointer to a git_odb_backend instance"},{"name":"priority","type":"int","comment":"Value for ordering the backends queue"}],"argline":"git_odb *odb, git_odb_backend *backend, int priority","sig":"git_odb *::git_odb_backend *::int","return":{"type":"int","comment":" 0 on success; error code otherwise"},"description":"

Add a custom backend to an existing Object DB; this\n backend will work as an alternate.

\n","comments":"

Alternate backends are always checked for objects after\n all the main backends have been exhausted.

\n\n

The backends are checked in relative ordering, based on the\n value of the priority parameter.

\n\n

Writing is disabled on alternate backends.

\n\n

Read \n for more information.

\n","group":"odb"},"git_odb_num_backends":{"type":"function","file":"odb.h","line":481,"lineto":481,"args":[{"name":"odb","type":"git_odb *","comment":"object database"}],"argline":"git_odb *odb","sig":"git_odb *","return":{"type":"size_t","comment":" number of backends in the ODB"},"description":"

Get the number of ODB backend objects

\n","comments":"","group":"odb"},"git_odb_get_backend":{"type":"function","file":"odb.h","line":491,"lineto":491,"args":[{"name":"out","type":"git_odb_backend **","comment":"output pointer to ODB backend at pos"},{"name":"odb","type":"git_odb *","comment":"object database"},{"name":"pos","type":"size_t","comment":"index into object database backend list"}],"argline":"git_odb_backend **out, git_odb *odb, size_t pos","sig":"git_odb_backend **::git_odb *::size_t","return":{"type":"int","comment":" 0 on success; GIT_ENOTFOUND if pos is invalid; other errors \n<\n 0"},"description":"

Lookup an ODB backend object by index

\n","comments":"","group":"odb"},"git_odb_backend_pack":{"type":"function","file":"odb_backend.h","line":34,"lineto":34,"args":[{"name":"out","type":"git_odb_backend **","comment":"location to store the odb backend pointer"},{"name":"objects_dir","type":"const char *","comment":"the Git repository's objects directory"}],"argline":"git_odb_backend **out, const char *objects_dir","sig":"git_odb_backend **::const char *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Create a backend for the packfiles.

\n","comments":"","group":"odb"},"git_odb_backend_loose":{"type":"function","file":"odb_backend.h","line":48,"lineto":54,"args":[{"name":"out","type":"git_odb_backend **","comment":"location to store the odb backend pointer"},{"name":"objects_dir","type":"const char *","comment":"the Git repository's objects directory"},{"name":"compression_level","type":"int","comment":"zlib compression level to use"},{"name":"do_fsync","type":"int","comment":"whether to do an fsync() after writing (currently ignored)"},{"name":"dir_mode","type":"unsigned int","comment":"permissions to use creating a directory or 0 for defaults"},{"name":"file_mode","type":"unsigned int","comment":"permissions to use creating a file or 0 for defaults"}],"argline":"git_odb_backend **out, const char *objects_dir, int compression_level, int do_fsync, unsigned int dir_mode, unsigned int file_mode","sig":"git_odb_backend **::const char *::int::int::unsigned int::unsigned int","return":{"type":"int","comment":" 0 or an error code"},"description":"

Create a backend for loose objects

\n","comments":"","group":"odb"},"git_odb_backend_one_pack":{"type":"function","file":"odb_backend.h","line":67,"lineto":67,"args":[{"name":"out","type":"git_odb_backend **","comment":"location to store the odb backend pointer"},{"name":"index_file","type":"const char *","comment":"path to the packfile's .idx file"}],"argline":"git_odb_backend **out, const char *index_file","sig":"git_odb_backend **::const char *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Create a backend out of a single packfile

\n","comments":"

This can be useful for inspecting the contents of a single\n packfile.

\n","group":"odb"},"git_oid_fromstr":{"type":"function","file":"oid.h","line":47,"lineto":47,"args":[{"name":"out","type":"git_oid *","comment":"oid structure the result is written into."},{"name":"str","type":"const char *","comment":"input hex string; must be pointing at the start of\n\t\tthe hex sequence and have at least the number of bytes\n\t\tneeded for an oid encoded in hex (40 bytes)."}],"argline":"git_oid *out, const char *str","sig":"git_oid *::const char *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Parse a hex formatted object id into a git_oid.

\n","comments":"","group":"oid","examples":{"general.c":["ex/v0.23.2/general.html#git_oid_fromstr-40","ex/v0.23.2/general.html#git_oid_fromstr-41","ex/v0.23.2/general.html#git_oid_fromstr-42","ex/v0.23.2/general.html#git_oid_fromstr-43","ex/v0.23.2/general.html#git_oid_fromstr-44","ex/v0.23.2/general.html#git_oid_fromstr-45","ex/v0.23.2/general.html#git_oid_fromstr-46","ex/v0.23.2/general.html#git_oid_fromstr-47"]}},"git_oid_fromstrp":{"type":"function","file":"oid.h","line":57,"lineto":57,"args":[{"name":"out","type":"git_oid *","comment":"oid structure the result is written into."},{"name":"str","type":"const char *","comment":"input hex string; must be at least 4 characters\n long and null-terminated."}],"argline":"git_oid *out, const char *str","sig":"git_oid *::const char *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Parse a hex formatted null-terminated string into a git_oid.

\n","comments":"","group":"oid"},"git_oid_fromstrn":{"type":"function","file":"oid.h","line":70,"lineto":70,"args":[{"name":"out","type":"git_oid *","comment":"oid structure the result is written into."},{"name":"str","type":"const char *","comment":"input hex string of at least size `length`"},{"name":"length","type":"size_t","comment":"length of the input string"}],"argline":"git_oid *out, const char *str, size_t length","sig":"git_oid *::const char *::size_t","return":{"type":"int","comment":" 0 or an error code"},"description":"

Parse N characters of a hex formatted object id into a git_oid

\n","comments":"

If N is odd, N-1 characters will be parsed instead.\n The remaining space in the git_oid will be set to zero.

\n","group":"oid"},"git_oid_fromraw":{"type":"function","file":"oid.h","line":78,"lineto":78,"args":[{"name":"out","type":"git_oid *","comment":"oid structure the result is written into."},{"name":"raw","type":"const unsigned char *","comment":"the raw input bytes to be copied."}],"argline":"git_oid *out, const unsigned char *raw","sig":"git_oid *::const unsigned char *","return":{"type":"void","comment":null},"description":"

Copy an already raw oid into a git_oid structure.

\n","comments":"","group":"oid"},"git_oid_fmt":{"type":"function","file":"oid.h","line":90,"lineto":90,"args":[{"name":"out","type":"char *","comment":"output hex string; must be pointing at the start of\n\t\tthe hex sequence and have at least the number of bytes\n\t\tneeded for an oid encoded in hex (40 bytes). Only the\n\t\toid digits are written; a '\n\\\n0' terminator must be added\n\t\tby the caller if it is required."},{"name":"id","type":"const git_oid *","comment":"oid structure to format."}],"argline":"char *out, const git_oid *id","sig":"char *::const git_oid *","return":{"type":"void","comment":null},"description":"

Format a git_oid into a hex string.

\n","comments":"","group":"oid","examples":{"general.c":["ex/v0.23.2/general.html#git_oid_fmt-48","ex/v0.23.2/general.html#git_oid_fmt-49","ex/v0.23.2/general.html#git_oid_fmt-50","ex/v0.23.2/general.html#git_oid_fmt-51","ex/v0.23.2/general.html#git_oid_fmt-52"],"network/fetch.c":["ex/v0.23.2/network/fetch.html#git_oid_fmt-1","ex/v0.23.2/network/fetch.html#git_oid_fmt-2"],"network/index-pack.c":["ex/v0.23.2/network/index-pack.html#git_oid_fmt-6"],"network/ls-remote.c":["ex/v0.23.2/network/ls-remote.html#git_oid_fmt-1"]}},"git_oid_nfmt":{"type":"function","file":"oid.h","line":101,"lineto":101,"args":[{"name":"out","type":"char *","comment":"output hex string; you say how many bytes to write.\n\t\tIf the number of bytes is > GIT_OID_HEXSZ, extra bytes\n\t\twill be zeroed; if not, a '\n\\\n0' terminator is NOT added."},{"name":"n","type":"size_t","comment":"number of characters to write into out string"},{"name":"id","type":"const git_oid *","comment":"oid structure to format."}],"argline":"char *out, size_t n, const git_oid *id","sig":"char *::size_t::const git_oid *","return":{"type":"void","comment":null},"description":"

Format a git_oid into a partial hex string.

\n","comments":"","group":"oid"},"git_oid_pathfmt":{"type":"function","file":"oid.h","line":116,"lineto":116,"args":[{"name":"out","type":"char *","comment":"output hex string; must be pointing at the start of\n\t\tthe hex sequence and have at least the number of bytes\n\t\tneeded for an oid encoded in hex (41 bytes). Only the\n\t\toid digits are written; a '\n\\\n0' terminator must be added\n\t\tby the caller if it is required."},{"name":"id","type":"const git_oid *","comment":"oid structure to format."}],"argline":"char *out, const git_oid *id","sig":"char *::const git_oid *","return":{"type":"void","comment":null},"description":"

Format a git_oid into a loose-object path string.

\n","comments":"

The resulting string is "aa/...", where "aa" is the first two\n hex digits of the oid and "..." is the remaining 38 digits.

\n","group":"oid"},"git_oid_tostr_s":{"type":"function","file":"oid.h","line":129,"lineto":129,"args":[{"name":"oid","type":"const git_oid *","comment":"The oid structure to format"}],"argline":"const git_oid *oid","sig":"const git_oid *","return":{"type":"char *","comment":" the c-string"},"description":"

Format a git_oid into a statically allocated c-string.

\n","comments":"

The c-string is owned by the library and should not be freed\n by the user. If libgit2 is built with thread support, the string\n will be stored in TLS (i.e. one buffer per thread) to allow for\n concurrent calls of the function.

\n","group":"oid"},"git_oid_tostr":{"type":"function","file":"oid.h","line":148,"lineto":148,"args":[{"name":"out","type":"char *","comment":"the buffer into which the oid string is output."},{"name":"n","type":"size_t","comment":"the size of the out buffer."},{"name":"id","type":"const git_oid *","comment":"the oid structure to format."}],"argline":"char *out, size_t n, const git_oid *id","sig":"char *::size_t::const git_oid *","return":{"type":"char *","comment":" the out buffer pointer, assuming no input parameter\n\t\t\terrors, otherwise a pointer to an empty string."},"description":"

Format a git_oid into a buffer as a hex format c-string.

\n","comments":"

If the buffer is smaller than GIT_OID_HEXSZ+1, then the resulting\n oid c-string will be truncated to n-1 characters (but will still be\n NUL-byte terminated).

\n\n

If there are any input parameter errors (out == NULL, n == 0, oid ==\n NULL), then a pointer to an empty string is returned, so that the\n return value can always be printed.

\n","group":"oid","examples":{"blame.c":["ex/v0.23.2/blame.html#git_oid_tostr-18","ex/v0.23.2/blame.html#git_oid_tostr-19"],"cat-file.c":["ex/v0.23.2/cat-file.html#git_oid_tostr-26","ex/v0.23.2/cat-file.html#git_oid_tostr-27","ex/v0.23.2/cat-file.html#git_oid_tostr-28","ex/v0.23.2/cat-file.html#git_oid_tostr-29","ex/v0.23.2/cat-file.html#git_oid_tostr-30"],"log.c":["ex/v0.23.2/log.html#git_oid_tostr-39","ex/v0.23.2/log.html#git_oid_tostr-40"],"rev-parse.c":["ex/v0.23.2/rev-parse.html#git_oid_tostr-12","ex/v0.23.2/rev-parse.html#git_oid_tostr-13","ex/v0.23.2/rev-parse.html#git_oid_tostr-14","ex/v0.23.2/rev-parse.html#git_oid_tostr-15"]}},"git_oid_cpy":{"type":"function","file":"oid.h","line":156,"lineto":156,"args":[{"name":"out","type":"git_oid *","comment":"oid structure the result is written into."},{"name":"src","type":"const git_oid *","comment":"oid structure to copy from."}],"argline":"git_oid *out, const git_oid *src","sig":"git_oid *::const git_oid *","return":{"type":"void","comment":null},"description":"

Copy an oid from one structure to another.

\n","comments":"","group":"oid","examples":{"blame.c":["ex/v0.23.2/blame.html#git_oid_cpy-20","ex/v0.23.2/blame.html#git_oid_cpy-21","ex/v0.23.2/blame.html#git_oid_cpy-22"]}},"git_oid_cmp":{"type":"function","file":"oid.h","line":165,"lineto":165,"args":[{"name":"a","type":"const git_oid *","comment":"first oid structure."},{"name":"b","type":"const git_oid *","comment":"second oid structure."}],"argline":"const git_oid *a, const git_oid *b","sig":"const git_oid *::const git_oid *","return":{"type":"int","comment":" \n<\n0, 0, >0 if a \n<\n b, a == b, a > b."},"description":"

Compare two oid structures.

\n","comments":"","group":"oid"},"git_oid_equal":{"type":"function","file":"oid.h","line":174,"lineto":174,"args":[{"name":"a","type":"const git_oid *","comment":"first oid structure."},{"name":"b","type":"const git_oid *","comment":"second oid structure."}],"argline":"const git_oid *a, const git_oid *b","sig":"const git_oid *::const git_oid *","return":{"type":"int","comment":" true if equal, false otherwise"},"description":"

Compare two oid structures for equality

\n","comments":"","group":"oid"},"git_oid_ncmp":{"type":"function","file":"oid.h","line":185,"lineto":185,"args":[{"name":"a","type":"const git_oid *","comment":"first oid structure."},{"name":"b","type":"const git_oid *","comment":"second oid structure."},{"name":"len","type":"size_t","comment":"the number of hex chars to compare"}],"argline":"const git_oid *a, const git_oid *b, size_t len","sig":"const git_oid *::const git_oid *::size_t","return":{"type":"int","comment":" 0 in case of a match"},"description":"

Compare the first 'len' hexadecimal characters (packets of 4 bits)\n of two oid structures.

\n","comments":"","group":"oid"},"git_oid_streq":{"type":"function","file":"oid.h","line":194,"lineto":194,"args":[{"name":"id","type":"const git_oid *","comment":"oid structure."},{"name":"str","type":"const char *","comment":"input hex string of an object id."}],"argline":"const git_oid *id, const char *str","sig":"const git_oid *::const char *","return":{"type":"int","comment":" 0 in case of a match, -1 otherwise."},"description":"

Check if an oid equals an hex formatted object id.

\n","comments":"","group":"oid"},"git_oid_strcmp":{"type":"function","file":"oid.h","line":204,"lineto":204,"args":[{"name":"id","type":"const git_oid *","comment":"oid structure."},{"name":"str","type":"const char *","comment":"input hex string of an object id."}],"argline":"const git_oid *id, const char *str","sig":"const git_oid *::const char *","return":{"type":"int","comment":" -1 if str is not valid, \n<\n0 if id sorts before str,\n 0 if id matches str, >0 if id sorts after str."},"description":"

Compare an oid to an hex formatted object id.

\n","comments":"","group":"oid"},"git_oid_iszero":{"type":"function","file":"oid.h","line":211,"lineto":211,"args":[{"name":"id","type":"const git_oid *","comment":null}],"argline":"const git_oid *id","sig":"const git_oid *","return":{"type":"int","comment":" 1 if all zeros, 0 otherwise."},"description":"

Check is an oid is all zeros.

\n","comments":"","group":"oid","examples":{"blame.c":["ex/v0.23.2/blame.html#git_oid_iszero-23"],"network/fetch.c":["ex/v0.23.2/network/fetch.html#git_oid_iszero-3"]}},"git_oid_shorten_new":{"type":"function","file":"oid.h","line":232,"lineto":232,"args":[{"name":"min_length","type":"size_t","comment":"The minimal length for all identifiers,\n\t\twhich will be used even if shorter OIDs would still\n\t\tbe unique."}],"argline":"size_t min_length","sig":"size_t","return":{"type":"git_oid_shorten *","comment":" a `git_oid_shorten` instance, NULL if OOM"},"description":"

Create a new OID shortener.

\n","comments":"

The OID shortener is used to process a list of OIDs\n in text form and return the shortest length that would\n uniquely identify all of them.

\n\n

E.g. look at the result of git log --abbrev.

\n","group":"oid"},"git_oid_shorten_add":{"type":"function","file":"oid.h","line":258,"lineto":258,"args":[{"name":"os","type":"git_oid_shorten *","comment":"a `git_oid_shorten` instance"},{"name":"text_id","type":"const char *","comment":"an OID in text form"}],"argline":"git_oid_shorten *os, const char *text_id","sig":"git_oid_shorten *::const char *","return":{"type":"int","comment":" the minimal length to uniquely identify all OIDs\n\t\tadded so far to the set; or an error code (\n<\n0) if an\n\t\terror occurs."},"description":"

Add a new OID to set of shortened OIDs and calculate\n the minimal length to uniquely identify all the OIDs in\n the set.

\n","comments":"

The OID is expected to be a 40-char hexadecimal string.\n The OID is owned by the user and will not be modified\n or freed.

\n\n

For performance reasons, there is a hard-limit of how many\n OIDs can be added to a single set (around ~32000, assuming\n a mostly randomized distribution), which should be enough\n for any kind of program, and keeps the algorithm fast and\n memory-efficient.

\n\n

Attempting to add more than those OIDs will result in a\n GITERR_INVALID error

\n","group":"oid"},"git_oid_shorten_free":{"type":"function","file":"oid.h","line":265,"lineto":265,"args":[{"name":"os","type":"git_oid_shorten *","comment":"a `git_oid_shorten` instance"}],"argline":"git_oid_shorten *os","sig":"git_oid_shorten *","return":{"type":"void","comment":null},"description":"

Free an OID shortener instance

\n","comments":"","group":"oid"},"git_oidarray_free":{"type":"function","file":"oidarray.h","line":34,"lineto":34,"args":[{"name":"array","type":"git_oidarray *","comment":"git_oidarray from which to free oid data"}],"argline":"git_oidarray *array","sig":"git_oidarray *","return":{"type":"void","comment":null},"description":"

Free the OID array

\n","comments":"

This method must (and must only) be called on git_oidarray\n objects where the array is allocated by the library. Not doing so,\n will result in a memory leak.

\n\n

This does not free the git_oidarray itself, since the library will\n never allocate that object directly itself (it is more commonly embedded\n inside another struct or created on the stack).

\n","group":"oidarray"},"git_packbuilder_new":{"type":"function","file":"pack.h","line":64,"lineto":64,"args":[{"name":"out","type":"git_packbuilder **","comment":"The new packbuilder object"},{"name":"repo","type":"git_repository *","comment":"The repository"}],"argline":"git_packbuilder **out, git_repository *repo","sig":"git_packbuilder **::git_repository *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Initialize a new packbuilder

\n","comments":"","group":"packbuilder"},"git_packbuilder_set_threads":{"type":"function","file":"pack.h","line":77,"lineto":77,"args":[{"name":"pb","type":"git_packbuilder *","comment":"The packbuilder"},{"name":"n","type":"unsigned int","comment":"Number of threads to spawn"}],"argline":"git_packbuilder *pb, unsigned int n","sig":"git_packbuilder *::unsigned int","return":{"type":"unsigned int","comment":" number of actual threads to be used"},"description":"

Set number of threads to spawn

\n","comments":"

By default, libgit2 won't spawn any threads at all;\n when set to 0, libgit2 will autodetect the number of\n CPUs.

\n","group":"packbuilder"},"git_packbuilder_insert":{"type":"function","file":"pack.h","line":91,"lineto":91,"args":[{"name":"pb","type":"git_packbuilder *","comment":"The packbuilder"},{"name":"id","type":"const git_oid *","comment":"The oid of the commit"},{"name":"name","type":"const char *","comment":"The name; might be NULL"}],"argline":"git_packbuilder *pb, const git_oid *id, const char *name","sig":"git_packbuilder *::const git_oid *::const char *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Insert a single object

\n","comments":"

For an optimal pack it's mandatory to insert objects in recency order,\n commits followed by trees and blobs.

\n","group":"packbuilder"},"git_packbuilder_insert_tree":{"type":"function","file":"pack.h","line":103,"lineto":103,"args":[{"name":"pb","type":"git_packbuilder *","comment":"The packbuilder"},{"name":"id","type":"const git_oid *","comment":"The oid of the root tree"}],"argline":"git_packbuilder *pb, const git_oid *id","sig":"git_packbuilder *::const git_oid *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Insert a root tree object

\n","comments":"

This will add the tree as well as all referenced trees and blobs.

\n","group":"packbuilder"},"git_packbuilder_insert_commit":{"type":"function","file":"pack.h","line":115,"lineto":115,"args":[{"name":"pb","type":"git_packbuilder *","comment":"The packbuilder"},{"name":"id","type":"const git_oid *","comment":"The oid of the commit"}],"argline":"git_packbuilder *pb, const git_oid *id","sig":"git_packbuilder *::const git_oid *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Insert a commit object

\n","comments":"

This will add a commit as well as the completed referenced tree.

\n","group":"packbuilder"},"git_packbuilder_insert_walk":{"type":"function","file":"pack.h","line":128,"lineto":128,"args":[{"name":"pb","type":"git_packbuilder *","comment":"the packbuilder"},{"name":"walk","type":"git_revwalk *","comment":"the revwalk to use to fill the packbuilder"}],"argline":"git_packbuilder *pb, git_revwalk *walk","sig":"git_packbuilder *::git_revwalk *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Insert objects as given by the walk

\n","comments":"

Those commits and all objects they reference will be inserted into\n the packbuilder.

\n","group":"packbuilder"},"git_packbuilder_insert_recur":{"type":"function","file":"pack.h","line":140,"lineto":140,"args":[{"name":"pb","type":"git_packbuilder *","comment":"the packbuilder"},{"name":"id","type":"const git_oid *","comment":"the id of the root object to insert"},{"name":"name","type":"const char *","comment":"optional name for the object"}],"argline":"git_packbuilder *pb, const git_oid *id, const char *name","sig":"git_packbuilder *::const git_oid *::const char *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Recursively insert an object and its referenced objects

\n","comments":"

Insert the object as well as any object it references.

\n","group":"packbuilder"},"git_packbuilder_write":{"type":"function","file":"pack.h","line":164,"lineto":169,"args":[{"name":"pb","type":"git_packbuilder *","comment":"The packbuilder"},{"name":"path","type":"const char *","comment":"to the directory where the packfile and index should be stored"},{"name":"mode","type":"unsigned int","comment":"permissions to use creating a packfile or 0 for defaults"},{"name":"progress_cb","type":"git_transfer_progress_cb","comment":"function to call with progress information from the indexer (optional)"},{"name":"progress_cb_payload","type":"void *","comment":"payload for the progress callback (optional)"}],"argline":"git_packbuilder *pb, const char *path, unsigned int mode, git_transfer_progress_cb progress_cb, void *progress_cb_payload","sig":"git_packbuilder *::const char *::unsigned int::git_transfer_progress_cb::void *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Write the new pack and corresponding index file to path.

\n","comments":"","group":"packbuilder"},"git_packbuilder_hash":{"type":"function","file":"pack.h","line":179,"lineto":179,"args":[{"name":"pb","type":"git_packbuilder *","comment":"The packbuilder object"}],"argline":"git_packbuilder *pb","sig":"git_packbuilder *","return":{"type":"const git_oid *","comment":null},"description":"

Get the packfile's hash

\n","comments":"

A packfile's name is derived from the sorted hashing of all object\n names. This is only correct after the packfile has been written.

\n","group":"packbuilder"},"git_packbuilder_foreach":{"type":"function","file":"pack.h","line":191,"lineto":191,"args":[{"name":"pb","type":"git_packbuilder *","comment":"the packbuilder"},{"name":"cb","type":"git_packbuilder_foreach_cb","comment":"the callback to call with each packed object's buffer"},{"name":"payload","type":"void *","comment":"the callback's data"}],"argline":"git_packbuilder *pb, git_packbuilder_foreach_cb cb, void *payload","sig":"git_packbuilder *::git_packbuilder_foreach_cb::void *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Create the new pack and pass each object to the callback

\n","comments":"","group":"packbuilder"},"git_packbuilder_object_count":{"type":"function","file":"pack.h","line":199,"lineto":199,"args":[{"name":"pb","type":"git_packbuilder *","comment":"the packbuilder"}],"argline":"git_packbuilder *pb","sig":"git_packbuilder *","return":{"type":"uint32_t","comment":" the number of objects in the packfile"},"description":"

Get the total number of objects the packbuilder will write out

\n","comments":"","group":"packbuilder"},"git_packbuilder_written":{"type":"function","file":"pack.h","line":207,"lineto":207,"args":[{"name":"pb","type":"git_packbuilder *","comment":"the packbuilder"}],"argline":"git_packbuilder *pb","sig":"git_packbuilder *","return":{"type":"uint32_t","comment":" the number of objects which have already been written"},"description":"

Get the number of objects the packbuilder has already written out

\n","comments":"","group":"packbuilder"},"git_packbuilder_set_callbacks":{"type":"function","file":"pack.h","line":226,"lineto":229,"args":[{"name":"pb","type":"git_packbuilder *","comment":"The packbuilder object"},{"name":"progress_cb","type":"git_packbuilder_progress","comment":"Function to call with progress information during\n pack building. Be aware that this is called inline with pack building\n operations, so performance may be affected."},{"name":"progress_cb_payload","type":"void *","comment":"Payload for progress callback."}],"argline":"git_packbuilder *pb, git_packbuilder_progress progress_cb, void *progress_cb_payload","sig":"git_packbuilder *::git_packbuilder_progress::void *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Set the callbacks for a packbuilder

\n","comments":"","group":"packbuilder"},"git_packbuilder_free":{"type":"function","file":"pack.h","line":236,"lineto":236,"args":[{"name":"pb","type":"git_packbuilder *","comment":"The packbuilder"}],"argline":"git_packbuilder *pb","sig":"git_packbuilder *","return":{"type":"void","comment":null},"description":"

Free the packbuilder and all associated data

\n","comments":"","group":"packbuilder"},"git_patch_from_diff":{"type":"function","file":"patch.h","line":51,"lineto":52,"args":[{"name":"out","type":"git_patch **","comment":"Output parameter for the delta patch object"},{"name":"diff","type":"git_diff *","comment":"Diff list object"},{"name":"idx","type":"size_t","comment":"Index into diff list"}],"argline":"git_patch **out, git_diff *diff, size_t idx","sig":"git_patch **::git_diff *::size_t","return":{"type":"int","comment":" 0 on success, other value \n<\n 0 on error"},"description":"

Return a patch for an entry in the diff list.

\n","comments":"

The git_patch is a newly created object contains the text diffs\n for the delta. You have to call git_patch_free() when you are\n done with it. You can use the patch object to loop over all the hunks\n and lines in the diff of the one delta.

\n\n

For an unchanged file or a binary file, no git_patch will be\n created, the output will be set to NULL, and the binary flag will be\n set true in the git_diff_delta structure.

\n\n

It is okay to pass NULL for either of the output parameters; if you pass\n NULL for the git_patch, then the text diff will not be calculated.

\n","group":"patch"},"git_patch_from_blobs":{"type":"function","file":"patch.h","line":70,"lineto":76,"args":[{"name":"out","type":"git_patch **","comment":"The generated patch; NULL on error"},{"name":"old_blob","type":"const git_blob *","comment":"Blob for old side of diff, or NULL for empty blob"},{"name":"old_as_path","type":"const char *","comment":"Treat old blob as if it had this filename; can be NULL"},{"name":"new_blob","type":"const git_blob *","comment":"Blob for new side of diff, or NULL for empty blob"},{"name":"new_as_path","type":"const char *","comment":"Treat new blob as if it had this filename; can be NULL"},{"name":"opts","type":"const git_diff_options *","comment":"Options for diff, or NULL for default options"}],"argline":"git_patch **out, const git_blob *old_blob, const char *old_as_path, const git_blob *new_blob, const char *new_as_path, const git_diff_options *opts","sig":"git_patch **::const git_blob *::const char *::const git_blob *::const char *::const git_diff_options *","return":{"type":"int","comment":" 0 on success or error code \n<\n 0"},"description":"

Directly generate a patch from the difference between two blobs.

\n","comments":"

This is just like git_diff_blobs() except it generates a patch object\n for the difference instead of directly making callbacks. You can use the\n standard git_patch accessor functions to read the patch data, and\n you must call git_patch_free() on the patch when done.

\n","group":"patch"},"git_patch_from_blob_and_buffer":{"type":"function","file":"patch.h","line":95,"lineto":102,"args":[{"name":"out","type":"git_patch **","comment":"The generated patch; NULL on error"},{"name":"old_blob","type":"const git_blob *","comment":"Blob for old side of diff, or NULL for empty blob"},{"name":"old_as_path","type":"const char *","comment":"Treat old blob as if it had this filename; can be NULL"},{"name":"buffer","type":"const char *","comment":"Raw data for new side of diff, or NULL for empty"},{"name":"buffer_len","type":"size_t","comment":"Length of raw data for new side of diff"},{"name":"buffer_as_path","type":"const char *","comment":"Treat buffer as if it had this filename; can be NULL"},{"name":"opts","type":"const git_diff_options *","comment":"Options for diff, or NULL for default options"}],"argline":"git_patch **out, const git_blob *old_blob, const char *old_as_path, const char *buffer, size_t buffer_len, const char *buffer_as_path, const git_diff_options *opts","sig":"git_patch **::const git_blob *::const char *::const char *::size_t::const char *::const git_diff_options *","return":{"type":"int","comment":" 0 on success or error code \n<\n 0"},"description":"

Directly generate a patch from the difference between a blob and a buffer.

\n","comments":"

This is just like git_diff_blob_to_buffer() except it generates a patch\n object for the difference instead of directly making callbacks. You can\n use the standard git_patch accessor functions to read the patch\n data, and you must call git_patch_free() on the patch when done.

\n","group":"patch"},"git_patch_from_buffers":{"type":"function","file":"patch.h","line":122,"lineto":130,"args":[{"name":"out","type":"git_patch **","comment":"The generated patch; NULL on error"},{"name":"old_buffer","type":"const void *","comment":"Raw data for old side of diff, or NULL for empty"},{"name":"old_len","type":"size_t","comment":"Length of the raw data for old side of the diff"},{"name":"old_as_path","type":"const char *","comment":"Treat old buffer as if it had this filename; can be NULL"},{"name":"new_buffer","type":"const char *","comment":"Raw data for new side of diff, or NULL for empty"},{"name":"new_len","type":"size_t","comment":"Length of raw data for new side of diff"},{"name":"new_as_path","type":"const char *","comment":"Treat buffer as if it had this filename; can be NULL"},{"name":"opts","type":"const git_diff_options *","comment":"Options for diff, or NULL for default options"}],"argline":"git_patch **out, const void *old_buffer, size_t old_len, const char *old_as_path, const char *new_buffer, size_t new_len, const char *new_as_path, const git_diff_options *opts","sig":"git_patch **::const void *::size_t::const char *::const char *::size_t::const char *::const git_diff_options *","return":{"type":"int","comment":" 0 on success or error code \n<\n 0"},"description":"

Directly generate a patch from the difference between two buffers.

\n","comments":"

This is just like git_diff_buffers() except it generates a patch\n object for the difference instead of directly making callbacks. You can\n use the standard git_patch accessor functions to read the patch\n data, and you must call git_patch_free() on the patch when done.

\n","group":"patch"},"git_patch_free":{"type":"function","file":"patch.h","line":135,"lineto":135,"args":[{"name":"patch","type":"git_patch *","comment":null}],"argline":"git_patch *patch","sig":"git_patch *","return":{"type":"void","comment":null},"description":"

Free a git_patch object.

\n","comments":"","group":"patch"},"git_patch_get_delta":{"type":"function","file":"patch.h","line":141,"lineto":141,"args":[{"name":"patch","type":"const git_patch *","comment":null}],"argline":"const git_patch *patch","sig":"const git_patch *","return":{"type":"const git_diff_delta *","comment":null},"description":"

Get the delta associated with a patch. This delta points to internal\n data and you do not have to release it when you are done with it.

\n","comments":"","group":"patch"},"git_patch_num_hunks":{"type":"function","file":"patch.h","line":146,"lineto":146,"args":[{"name":"patch","type":"const git_patch *","comment":null}],"argline":"const git_patch *patch","sig":"const git_patch *","return":{"type":"size_t","comment":null},"description":"

Get the number of hunks in a patch

\n","comments":"","group":"patch"},"git_patch_line_stats":{"type":"function","file":"patch.h","line":164,"lineto":168,"args":[{"name":"total_context","type":"size_t *","comment":"Count of context lines in output, can be NULL."},{"name":"total_additions","type":"size_t *","comment":"Count of addition lines in output, can be NULL."},{"name":"total_deletions","type":"size_t *","comment":"Count of deletion lines in output, can be NULL."},{"name":"patch","type":"const git_patch *","comment":"The git_patch object"}],"argline":"size_t *total_context, size_t *total_additions, size_t *total_deletions, const git_patch *patch","sig":"size_t *::size_t *::size_t *::const git_patch *","return":{"type":"int","comment":" 0 on success, \n<\n0 on error"},"description":"

Get line counts of each type in a patch.

\n","comments":"

This helps imitate a diff --numstat type of output. For that purpose,\n you only need the total_additions and total_deletions values, but we\n include the total_context line count in case you want the total number\n of lines of diff output that will be generated.

\n\n

All outputs are optional. Pass NULL if you don't need a particular count.

\n","group":"patch"},"git_patch_get_hunk":{"type":"function","file":"patch.h","line":183,"lineto":187,"args":[{"name":"out","type":"const git_diff_hunk **","comment":"Output pointer to git_diff_hunk of hunk"},{"name":"lines_in_hunk","type":"size_t *","comment":"Output count of total lines in this hunk"},{"name":"patch","type":"git_patch *","comment":"Input pointer to patch object"},{"name":"hunk_idx","type":"size_t","comment":"Input index of hunk to get information about"}],"argline":"const git_diff_hunk **out, size_t *lines_in_hunk, git_patch *patch, size_t hunk_idx","sig":"const git_diff_hunk **::size_t *::git_patch *::size_t","return":{"type":"int","comment":" 0 on success, GIT_ENOTFOUND if hunk_idx out of range, \n<\n0 on error"},"description":"

Get the information about a hunk in a patch

\n","comments":"

Given a patch and a hunk index into the patch, this returns detailed\n information about that hunk. Any of the output pointers can be passed\n as NULL if you don't care about that particular piece of information.

\n","group":"patch"},"git_patch_num_lines_in_hunk":{"type":"function","file":"patch.h","line":196,"lineto":198,"args":[{"name":"patch","type":"const git_patch *","comment":"The git_patch object"},{"name":"hunk_idx","type":"size_t","comment":"Index of the hunk"}],"argline":"const git_patch *patch, size_t hunk_idx","sig":"const git_patch *::size_t","return":{"type":"int","comment":" Number of lines in hunk or -1 if invalid hunk index"},"description":"

Get the number of lines in a hunk.

\n","comments":"","group":"patch"},"git_patch_get_line_in_hunk":{"type":"function","file":"patch.h","line":214,"lineto":218,"args":[{"name":"out","type":"const git_diff_line **","comment":"The git_diff_line data for this line"},{"name":"patch","type":"git_patch *","comment":"The patch to look in"},{"name":"hunk_idx","type":"size_t","comment":"The index of the hunk"},{"name":"line_of_hunk","type":"size_t","comment":"The index of the line in the hunk"}],"argline":"const git_diff_line **out, git_patch *patch, size_t hunk_idx, size_t line_of_hunk","sig":"const git_diff_line **::git_patch *::size_t::size_t","return":{"type":"int","comment":" 0 on success, \n<\n0 on failure"},"description":"

Get data about a line in a hunk of a patch.

\n","comments":"

Given a patch, a hunk index, and a line index in the hunk, this\n will return a lot of details about that line. If you pass a hunk\n index larger than the number of hunks or a line index larger than\n the number of lines in the hunk, this will return -1.

\n","group":"patch"},"git_patch_size":{"type":"function","file":"patch.h","line":236,"lineto":240,"args":[{"name":"patch","type":"git_patch *","comment":"A git_patch representing changes to one file"},{"name":"include_context","type":"int","comment":"Include context lines in size if non-zero"},{"name":"include_hunk_headers","type":"int","comment":"Include hunk header lines if non-zero"},{"name":"include_file_headers","type":"int","comment":"Include file header lines if non-zero"}],"argline":"git_patch *patch, int include_context, int include_hunk_headers, int include_file_headers","sig":"git_patch *::int::int::int","return":{"type":"size_t","comment":" The number of bytes of data"},"description":"

Look up size of patch diff data in bytes

\n","comments":"

This returns the raw size of the patch data. This only includes the\n actual data from the lines of the diff, not the file or hunk headers.

\n\n

If you pass include_context as true (non-zero), this will be the size\n of all of the diff output; if you pass it as false (zero), this will\n only include the actual changed lines (as if context_lines was 0).

\n","group":"patch"},"git_patch_print":{"type":"function","file":"patch.h","line":254,"lineto":257,"args":[{"name":"patch","type":"git_patch *","comment":"A git_patch representing changes to one file"},{"name":"print_cb","type":"git_diff_line_cb","comment":"Callback function to output lines of the patch. Will be\n called for file headers, hunk headers, and diff lines."},{"name":"payload","type":"void *","comment":"Reference pointer that will be passed to your callbacks."}],"argline":"git_patch *patch, git_diff_line_cb print_cb, void *payload","sig":"git_patch *::git_diff_line_cb::void *","return":{"type":"int","comment":" 0 on success, non-zero callback return value, or error code"},"description":"

Serialize the patch to text via callback.

\n","comments":"

Returning a non-zero value from the callback will terminate the iteration\n and return that value to the caller.

\n","group":"patch"},"git_patch_to_buf":{"type":"function","file":"patch.h","line":266,"lineto":268,"args":[{"name":"out","type":"git_buf *","comment":"The git_buf to be filled in"},{"name":"patch","type":"git_patch *","comment":"A git_patch representing changes to one file"}],"argline":"git_buf *out, git_patch *patch","sig":"git_buf *::git_patch *","return":{"type":"int","comment":" 0 on success, \n<\n0 on failure."},"description":"

Get the content of a patch as a single diff text.

\n","comments":"","group":"patch"},"git_pathspec_new":{"type":"function","file":"pathspec.h","line":65,"lineto":66,"args":[{"name":"out","type":"git_pathspec **","comment":"Output of the compiled pathspec"},{"name":"pathspec","type":"const git_strarray *","comment":"A git_strarray of the paths to match"}],"argline":"git_pathspec **out, const git_strarray *pathspec","sig":"git_pathspec **::const git_strarray *","return":{"type":"int","comment":" 0 on success, \n<\n0 on failure"},"description":"

Compile a pathspec

\n","comments":"","group":"pathspec","examples":{"log.c":["ex/v0.23.2/log.html#git_pathspec_new-41"]}},"git_pathspec_free":{"type":"function","file":"pathspec.h","line":73,"lineto":73,"args":[{"name":"ps","type":"git_pathspec *","comment":"The compiled pathspec"}],"argline":"git_pathspec *ps","sig":"git_pathspec *","return":{"type":"void","comment":null},"description":"

Free a pathspec

\n","comments":"","group":"pathspec","examples":{"log.c":["ex/v0.23.2/log.html#git_pathspec_free-42"]}},"git_pathspec_matches_path":{"type":"function","file":"pathspec.h","line":88,"lineto":89,"args":[{"name":"ps","type":"const git_pathspec *","comment":"The compiled pathspec"},{"name":"flags","type":"uint32_t","comment":"Combination of git_pathspec_flag_t options to control match"},{"name":"path","type":"const char *","comment":"The pathname to attempt to match"}],"argline":"const git_pathspec *ps, uint32_t flags, const char *path","sig":"const git_pathspec *::uint32_t::const char *","return":{"type":"int","comment":" 1 is path matches spec, 0 if it does not"},"description":"

Try to match a path against a pathspec

\n","comments":"

Unlike most of the other pathspec matching functions, this will not\n fall back on the native case-sensitivity for your platform. You must\n explicitly pass flags to control case sensitivity or else this will\n fall back on being case sensitive.

\n","group":"pathspec"},"git_pathspec_match_workdir":{"type":"function","file":"pathspec.h","line":113,"lineto":117,"args":[{"name":"out","type":"git_pathspec_match_list **","comment":"Output list of matches; pass NULL to just get return value"},{"name":"repo","type":"git_repository *","comment":"The repository in which to match; bare repo is an error"},{"name":"flags","type":"uint32_t","comment":"Combination of git_pathspec_flag_t options to control match"},{"name":"ps","type":"git_pathspec *","comment":"Pathspec to be matched"}],"argline":"git_pathspec_match_list **out, git_repository *repo, uint32_t flags, git_pathspec *ps","sig":"git_pathspec_match_list **::git_repository *::uint32_t::git_pathspec *","return":{"type":"int","comment":" 0 on success, -1 on error, GIT_ENOTFOUND if no matches and\n the GIT_PATHSPEC_NO_MATCH_ERROR flag was given"},"description":"

Match a pathspec against the working directory of a repository.

\n","comments":"

This matches the pathspec against the current files in the working\n directory of the repository. It is an error to invoke this on a bare\n repo. This handles git ignores (i.e. ignored files will not be\n considered to match the pathspec unless the file is tracked in the\n index).

\n\n

If out is not NULL, this returns a git_patchspec_match_list. That\n contains the list of all matched filenames (unless you pass the\n GIT_PATHSPEC_FAILURES_ONLY flag) and may also contain the list of\n pathspecs with no match (if you used the GIT_PATHSPEC_FIND_FAILURES\n flag). You must call git_pathspec_match_list_free() on this object.

\n","group":"pathspec"},"git_pathspec_match_index":{"type":"function","file":"pathspec.h","line":142,"lineto":146,"args":[{"name":"out","type":"git_pathspec_match_list **","comment":"Output list of matches; pass NULL to just get return value"},{"name":"index","type":"git_index *","comment":"The index to match against"},{"name":"flags","type":"uint32_t","comment":"Combination of git_pathspec_flag_t options to control match"},{"name":"ps","type":"git_pathspec *","comment":"Pathspec to be matched"}],"argline":"git_pathspec_match_list **out, git_index *index, uint32_t flags, git_pathspec *ps","sig":"git_pathspec_match_list **::git_index *::uint32_t::git_pathspec *","return":{"type":"int","comment":" 0 on success, -1 on error, GIT_ENOTFOUND if no matches and\n the GIT_PATHSPEC_NO_MATCH_ERROR flag is used"},"description":"

Match a pathspec against entries in an index.

\n","comments":"

This matches the pathspec against the files in the repository index.

\n\n

NOTE: At the moment, the case sensitivity of this match is controlled\n by the current case-sensitivity of the index object itself and the\n USE_CASE and IGNORE_CASE flags will have no effect. This behavior will\n be corrected in a future release.

\n\n

If out is not NULL, this returns a git_patchspec_match_list. That\n contains the list of all matched filenames (unless you pass the\n GIT_PATHSPEC_FAILURES_ONLY flag) and may also contain the list of\n pathspecs with no match (if you used the GIT_PATHSPEC_FIND_FAILURES\n flag). You must call git_pathspec_match_list_free() on this object.

\n","group":"pathspec"},"git_pathspec_match_tree":{"type":"function","file":"pathspec.h","line":166,"lineto":170,"args":[{"name":"out","type":"git_pathspec_match_list **","comment":"Output list of matches; pass NULL to just get return value"},{"name":"tree","type":"git_tree *","comment":"The root-level tree to match against"},{"name":"flags","type":"uint32_t","comment":"Combination of git_pathspec_flag_t options to control match"},{"name":"ps","type":"git_pathspec *","comment":"Pathspec to be matched"}],"argline":"git_pathspec_match_list **out, git_tree *tree, uint32_t flags, git_pathspec *ps","sig":"git_pathspec_match_list **::git_tree *::uint32_t::git_pathspec *","return":{"type":"int","comment":" 0 on success, -1 on error, GIT_ENOTFOUND if no matches and\n the GIT_PATHSPEC_NO_MATCH_ERROR flag is used"},"description":"

Match a pathspec against files in a tree.

\n","comments":"

This matches the pathspec against the files in the given tree.

\n\n

If out is not NULL, this returns a git_patchspec_match_list. That\n contains the list of all matched filenames (unless you pass the\n GIT_PATHSPEC_FAILURES_ONLY flag) and may also contain the list of\n pathspecs with no match (if you used the GIT_PATHSPEC_FIND_FAILURES\n flag). You must call git_pathspec_match_list_free() on this object.

\n","group":"pathspec","examples":{"log.c":["ex/v0.23.2/log.html#git_pathspec_match_tree-43"]}},"git_pathspec_match_diff":{"type":"function","file":"pathspec.h","line":190,"lineto":194,"args":[{"name":"out","type":"git_pathspec_match_list **","comment":"Output list of matches; pass NULL to just get return value"},{"name":"diff","type":"git_diff *","comment":"A generated diff list"},{"name":"flags","type":"uint32_t","comment":"Combination of git_pathspec_flag_t options to control match"},{"name":"ps","type":"git_pathspec *","comment":"Pathspec to be matched"}],"argline":"git_pathspec_match_list **out, git_diff *diff, uint32_t flags, git_pathspec *ps","sig":"git_pathspec_match_list **::git_diff *::uint32_t::git_pathspec *","return":{"type":"int","comment":" 0 on success, -1 on error, GIT_ENOTFOUND if no matches and\n the GIT_PATHSPEC_NO_MATCH_ERROR flag is used"},"description":"

Match a pathspec against files in a diff list.

\n","comments":"

This matches the pathspec against the files in the given diff list.

\n\n

If out is not NULL, this returns a git_patchspec_match_list. That\n contains the list of all matched filenames (unless you pass the\n GIT_PATHSPEC_FAILURES_ONLY flag) and may also contain the list of\n pathspecs with no match (if you used the GIT_PATHSPEC_FIND_FAILURES\n flag). You must call git_pathspec_match_list_free() on this object.

\n","group":"pathspec"},"git_pathspec_match_list_free":{"type":"function","file":"pathspec.h","line":201,"lineto":201,"args":[{"name":"m","type":"git_pathspec_match_list *","comment":"The git_pathspec_match_list to be freed"}],"argline":"git_pathspec_match_list *m","sig":"git_pathspec_match_list *","return":{"type":"void","comment":null},"description":"

Free memory associates with a git_pathspec_match_list

\n","comments":"","group":"pathspec"},"git_pathspec_match_list_entrycount":{"type":"function","file":"pathspec.h","line":209,"lineto":210,"args":[{"name":"m","type":"const git_pathspec_match_list *","comment":"The git_pathspec_match_list object"}],"argline":"const git_pathspec_match_list *m","sig":"const git_pathspec_match_list *","return":{"type":"size_t","comment":" Number of items in match list"},"description":"

Get the number of items in a match list.

\n","comments":"","group":"pathspec"},"git_pathspec_match_list_entry":{"type":"function","file":"pathspec.h","line":222,"lineto":223,"args":[{"name":"m","type":"const git_pathspec_match_list *","comment":"The git_pathspec_match_list object"},{"name":"pos","type":"size_t","comment":"The index into the list"}],"argline":"const git_pathspec_match_list *m, size_t pos","sig":"const git_pathspec_match_list *::size_t","return":{"type":"const char *","comment":" The filename of the match"},"description":"

Get a matching filename by position.

\n","comments":"

This routine cannot be used if the match list was generated by\n git_pathspec_match_diff. If so, it will always return NULL.

\n","group":"pathspec"},"git_pathspec_match_list_diff_entry":{"type":"function","file":"pathspec.h","line":235,"lineto":236,"args":[{"name":"m","type":"const git_pathspec_match_list *","comment":"The git_pathspec_match_list object"},{"name":"pos","type":"size_t","comment":"The index into the list"}],"argline":"const git_pathspec_match_list *m, size_t pos","sig":"const git_pathspec_match_list *::size_t","return":{"type":"const git_diff_delta *","comment":" The filename of the match"},"description":"

Get a matching diff delta by position.

\n","comments":"

This routine can only be used if the match list was generated by\n git_pathspec_match_diff. Otherwise it will always return NULL.

\n","group":"pathspec"},"git_pathspec_match_list_failed_entrycount":{"type":"function","file":"pathspec.h","line":247,"lineto":248,"args":[{"name":"m","type":"const git_pathspec_match_list *","comment":"The git_pathspec_match_list object"}],"argline":"const git_pathspec_match_list *m","sig":"const git_pathspec_match_list *","return":{"type":"size_t","comment":" Number of items in original pathspec that had no matches"},"description":"

Get the number of pathspec items that did not match.

\n","comments":"

This will be zero unless you passed GIT_PATHSPEC_FIND_FAILURES when\n generating the git_pathspec_match_list.

\n","group":"pathspec"},"git_pathspec_match_list_failed_entry":{"type":"function","file":"pathspec.h","line":259,"lineto":260,"args":[{"name":"m","type":"const git_pathspec_match_list *","comment":"The git_pathspec_match_list object"},{"name":"pos","type":"size_t","comment":"The index into the failed items"}],"argline":"const git_pathspec_match_list *m, size_t pos","sig":"const git_pathspec_match_list *::size_t","return":{"type":"const char *","comment":" The pathspec pattern that didn't match anything"},"description":"

Get an original pathspec string that had no matches.

\n","comments":"

This will be return NULL for positions out of range.

\n","group":"pathspec"},"git_rebase_init_options":{"type":"function","file":"rebase.h","line":141,"lineto":143,"args":[{"name":"opts","type":"git_rebase_options *","comment":"the `git_rebase_options` instance to initialize."},{"name":"version","type":"unsigned int","comment":"the version of the struct; you should pass\n `GIT_REBASE_OPTIONS_VERSION` here."}],"argline":"git_rebase_options *opts, unsigned int version","sig":"git_rebase_options *::unsigned int","return":{"type":"int","comment":" Zero on success; -1 on failure."},"description":"

Initializes a git_rebase_options with default values. Equivalent to\n creating an instance with GIT_REBASE_OPTIONS_INIT.

\n","comments":"","group":"rebase"},"git_rebase_init":{"type":"function","file":"rebase.h","line":162,"lineto":168,"args":[{"name":"out","type":"git_rebase **","comment":"Pointer to store the rebase object"},{"name":"repo","type":"git_repository *","comment":"The repository to perform the rebase"},{"name":"branch","type":"const git_annotated_commit *","comment":"The terminal commit to rebase, or NULL to rebase the\n current branch"},{"name":"upstream","type":"const git_annotated_commit *","comment":"The commit to begin rebasing from, or NULL to rebase all\n reachable commits"},{"name":"onto","type":"const git_annotated_commit *","comment":"The branch to rebase onto, or NULL to rebase onto the given\n upstream"},{"name":"opts","type":"const git_rebase_options *","comment":"Options to specify how rebase is performed, or NULL"}],"argline":"git_rebase **out, git_repository *repo, const git_annotated_commit *branch, const git_annotated_commit *upstream, const git_annotated_commit *onto, const git_rebase_options *opts","sig":"git_rebase **::git_repository *::const git_annotated_commit *::const git_annotated_commit *::const git_annotated_commit *::const git_rebase_options *","return":{"type":"int","comment":" Zero on success; -1 on failure."},"description":"

Initializes a rebase operation to rebase the changes in branch\n relative to upstream onto another branch. To begin the rebase\n process, call git_rebase_next. When you have finished with this\n object, call git_rebase_free.

\n","comments":"","group":"rebase"},"git_rebase_open":{"type":"function","file":"rebase.h","line":179,"lineto":182,"args":[{"name":"out","type":"git_rebase **","comment":"Pointer to store the rebase object"},{"name":"repo","type":"git_repository *","comment":"The repository that has a rebase in-progress"},{"name":"opts","type":"const git_rebase_options *","comment":"Options to specify how rebase is performed"}],"argline":"git_rebase **out, git_repository *repo, const git_rebase_options *opts","sig":"git_rebase **::git_repository *::const git_rebase_options *","return":{"type":"int","comment":" Zero on success; -1 on failure."},"description":"

Opens an existing rebase that was previously started by either an\n invocation of git_rebase_init or by another client.

\n","comments":"","group":"rebase"},"git_rebase_operation_entrycount":{"type":"function","file":"rebase.h","line":190,"lineto":190,"args":[{"name":"rebase","type":"git_rebase *","comment":"The in-progress rebase"}],"argline":"git_rebase *rebase","sig":"git_rebase *","return":{"type":"size_t","comment":" The number of rebase operations in total"},"description":"

Gets the count of rebase operations that are to be applied.

\n","comments":"","group":"rebase"},"git_rebase_operation_current":{"type":"function","file":"rebase.h","line":201,"lineto":201,"args":[{"name":"rebase","type":"git_rebase *","comment":"The in-progress rebase"}],"argline":"git_rebase *rebase","sig":"git_rebase *","return":{"type":"size_t","comment":" The index of the rebase operation currently being applied."},"description":"

Gets the index of the rebase operation that is currently being applied.\n If the first operation has not yet been applied (because you have\n called init but not yet next) then this returns\n GIT_REBASE_NO_OPERATION.

\n","comments":"","group":"rebase"},"git_rebase_operation_byindex":{"type":"function","file":"rebase.h","line":210,"lineto":212,"args":[{"name":"rebase","type":"git_rebase *","comment":"The in-progress rebase"},{"name":"idx","type":"size_t","comment":"The index of the rebase operation to retrieve"}],"argline":"git_rebase *rebase, size_t idx","sig":"git_rebase *::size_t","return":{"type":"git_rebase_operation *","comment":" The rebase operation or NULL if `idx` was out of bounds"},"description":"

Gets the rebase operation specified by the given index.

\n","comments":"","group":"rebase"},"git_rebase_next":{"type":"function","file":"rebase.h","line":225,"lineto":227,"args":[{"name":"operation","type":"git_rebase_operation **","comment":"Pointer to store the rebase operation that is to be performed next"},{"name":"rebase","type":"git_rebase *","comment":"The rebase in progress"}],"argline":"git_rebase_operation **operation, git_rebase *rebase","sig":"git_rebase_operation **::git_rebase *","return":{"type":"int","comment":" Zero on success; -1 on failure."},"description":"

Performs the next rebase operation and returns the information about it.\n If the operation is one that applies a patch (which is any operation except\n GIT_REBASE_OPERATION_EXEC) then the patch will be applied and the index and\n working directory will be updated with the changes. If there are conflicts,\n you will need to address those before committing the changes.

\n","comments":"","group":"rebase"},"git_rebase_commit":{"type":"function","file":"rebase.h","line":251,"lineto":257,"args":[{"name":"id","type":"git_oid *","comment":"Pointer in which to store the OID of the newly created commit"},{"name":"rebase","type":"git_rebase *","comment":"The rebase that is in-progress"},{"name":"author","type":"const git_signature *","comment":"The author of the updated commit, or NULL to keep the\n author from the original commit"},{"name":"committer","type":"const git_signature *","comment":"The committer of the rebase"},{"name":"message_encoding","type":"const char *","comment":"The encoding for the message in the commit,\n represented with a standard encoding name. If message is NULL,\n this should also be NULL, and the encoding from the original\n commit will be maintained. If message is specified, this may be\n NULL to indicate that \"UTF-8\" is to be used."},{"name":"message","type":"const char *","comment":"The message for this commit, or NULL to use the message\n from the original commit."}],"argline":"git_oid *id, git_rebase *rebase, const git_signature *author, const git_signature *committer, const char *message_encoding, const char *message","sig":"git_oid *::git_rebase *::const git_signature *::const git_signature *::const char *::const char *","return":{"type":"int","comment":" Zero on success, GIT_EUNMERGED if there are unmerged changes in\n the index, GIT_EAPPLIED if the current commit has already\n been applied to the upstream and there is nothing to commit,\n -1 on failure."},"description":"

Commits the current patch. You must have resolved any conflicts that\n were introduced during the patch application from the git_rebase_next\n invocation.

\n","comments":"","group":"rebase"},"git_rebase_abort":{"type":"function","file":"rebase.h","line":267,"lineto":267,"args":[{"name":"rebase","type":"git_rebase *","comment":"The rebase that is in-progress"}],"argline":"git_rebase *rebase","sig":"git_rebase *","return":{"type":"int","comment":" Zero on success; GIT_ENOTFOUND if a rebase is not in progress,\n -1 on other errors."},"description":"

Aborts a rebase that is currently in progress, resetting the repository\n and working directory to their state before rebase began.

\n","comments":"","group":"rebase"},"git_rebase_finish":{"type":"function","file":"rebase.h","line":277,"lineto":279,"args":[{"name":"rebase","type":"git_rebase *","comment":"The rebase that is in-progress"},{"name":"signature","type":"const git_signature *","comment":"The identity that is finishing the rebase (optional)"}],"argline":"git_rebase *rebase, const git_signature *signature","sig":"git_rebase *::const git_signature *","return":{"type":"int","comment":" Zero on success; -1 on error"},"description":"

Finishes a rebase that is currently in progress once all patches have\n been applied.

\n","comments":"","group":"rebase"},"git_rebase_free":{"type":"function","file":"rebase.h","line":286,"lineto":286,"args":[{"name":"rebase","type":"git_rebase *","comment":"The rebase object"}],"argline":"git_rebase *rebase","sig":"git_rebase *","return":{"type":"void","comment":null},"description":"

Frees the git_rebase object.

\n","comments":"","group":"rebase"},"git_refdb_new":{"type":"function","file":"refdb.h","line":35,"lineto":35,"args":[{"name":"out","type":"git_refdb **","comment":"location to store the database pointer, if opened.\n\t\t\tSet to NULL if the open failed."},{"name":"repo","type":"git_repository *","comment":"the repository"}],"argline":"git_refdb **out, git_repository *repo","sig":"git_refdb **::git_repository *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Create a new reference database with no backends.

\n","comments":"

Before the Ref DB can be used for read/writing, a custom database\n backend must be manually set using git_refdb_set_backend()

\n","group":"refdb"},"git_refdb_open":{"type":"function","file":"refdb.h","line":49,"lineto":49,"args":[{"name":"out","type":"git_refdb **","comment":"location to store the database pointer, if opened.\n\t\t\tSet to NULL if the open failed."},{"name":"repo","type":"git_repository *","comment":"the repository"}],"argline":"git_refdb **out, git_repository *repo","sig":"git_refdb **::git_repository *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Create a new reference database and automatically add\n the default backends:

\n","comments":"
    \n
  • git_refdb_dir: read and write loose and packed refs\n from disk, assuming the repository dir as the folder
    • \n
\n","group":"refdb"},"git_refdb_compress":{"type":"function","file":"refdb.h","line":56,"lineto":56,"args":[{"name":"refdb","type":"git_refdb *","comment":null}],"argline":"git_refdb *refdb","sig":"git_refdb *","return":{"type":"int","comment":null},"description":"

Suggests that the given refdb compress or optimize its references.\n This mechanism is implementation specific. For on-disk reference\n databases, for example, this may pack all loose references.

\n","comments":"","group":"refdb"},"git_refdb_free":{"type":"function","file":"refdb.h","line":63,"lineto":63,"args":[{"name":"refdb","type":"git_refdb *","comment":"reference database pointer or NULL"}],"argline":"git_refdb *refdb","sig":"git_refdb *","return":{"type":"void","comment":null},"description":"

Close an open reference database.

\n","comments":"","group":"refdb"},"git_reflog_read":{"type":"function","file":"reflog.h","line":38,"lineto":38,"args":[{"name":"out","type":"git_reflog **","comment":"pointer to reflog"},{"name":"repo","type":"git_repository *","comment":"the repostiory"},{"name":"name","type":"const char *","comment":"reference to look up"}],"argline":"git_reflog **out, git_repository *repo, const char *name","sig":"git_reflog **::git_repository *::const char *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Read the reflog for the given reference

\n","comments":"

If there is no reflog file for the given\n reference yet, an empty reflog object will\n be returned.

\n\n

The reflog must be freed manually by using\n git_reflog_free().

\n","group":"reflog"},"git_reflog_write":{"type":"function","file":"reflog.h","line":47,"lineto":47,"args":[{"name":"reflog","type":"git_reflog *","comment":"an existing reflog object"}],"argline":"git_reflog *reflog","sig":"git_reflog *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Write an existing in-memory reflog object back to disk\n using an atomic file lock.

\n","comments":"","group":"reflog"},"git_reflog_append":{"type":"function","file":"reflog.h","line":60,"lineto":60,"args":[{"name":"reflog","type":"git_reflog *","comment":"an existing reflog object"},{"name":"id","type":"const git_oid *","comment":"the OID the reference is now pointing to"},{"name":"committer","type":"const git_signature *","comment":"the signature of the committer"},{"name":"msg","type":"const char *","comment":"the reflog message"}],"argline":"git_reflog *reflog, const git_oid *id, const git_signature *committer, const char *msg","sig":"git_reflog *::const git_oid *::const git_signature *::const char *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Add a new entry to the in-memory reflog.

\n","comments":"

msg is optional and can be NULL.

\n","group":"reflog"},"git_reflog_rename":{"type":"function","file":"reflog.h","line":75,"lineto":75,"args":[{"name":"repo","type":"git_repository *","comment":"the repository"},{"name":"old_name","type":"const char *","comment":"the old name of the reference"},{"name":"name","type":"const char *","comment":"the new name of the reference"}],"argline":"git_repository *repo, const char *old_name, const char *name","sig":"git_repository *::const char *::const char *","return":{"type":"int","comment":" 0 on success, GIT_EINVALIDSPEC or an error code"},"description":"

Rename a reflog

\n","comments":"

The reflog to be renamed is expected to already exist

\n\n

The new name will be checked for validity.\n See git_reference_create_symbolic() for rules about valid names.

\n","group":"reflog"},"git_reflog_delete":{"type":"function","file":"reflog.h","line":84,"lineto":84,"args":[{"name":"repo","type":"git_repository *","comment":"the repository"},{"name":"name","type":"const char *","comment":"the reflog to delete"}],"argline":"git_repository *repo, const char *name","sig":"git_repository *::const char *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Delete the reflog for the given reference

\n","comments":"","group":"reflog"},"git_reflog_entrycount":{"type":"function","file":"reflog.h","line":92,"lineto":92,"args":[{"name":"reflog","type":"git_reflog *","comment":"the previously loaded reflog"}],"argline":"git_reflog *reflog","sig":"git_reflog *","return":{"type":"size_t","comment":" the number of log entries"},"description":"

Get the number of log entries in a reflog

\n","comments":"","group":"reflog"},"git_reflog_entry_byindex":{"type":"function","file":"reflog.h","line":105,"lineto":105,"args":[{"name":"reflog","type":"const git_reflog *","comment":"a previously loaded reflog"},{"name":"idx","type":"size_t","comment":"the position of the entry to lookup. Should be greater than or\n equal to 0 (zero) and less than `git_reflog_entrycount()`."}],"argline":"const git_reflog *reflog, size_t idx","sig":"const git_reflog *::size_t","return":{"type":"const git_reflog_entry *","comment":" the entry; NULL if not found"},"description":"

Lookup an entry by its index

\n","comments":"

Requesting the reflog entry with an index of 0 (zero) will\n return the most recently created entry.

\n","group":"reflog"},"git_reflog_drop":{"type":"function","file":"reflog.h","line":124,"lineto":127,"args":[{"name":"reflog","type":"git_reflog *","comment":"a previously loaded reflog."},{"name":"idx","type":"size_t","comment":"the position of the entry to remove. Should be greater than or\n equal to 0 (zero) and less than `git_reflog_entrycount()`."},{"name":"rewrite_previous_entry","type":"int","comment":"1 to rewrite the history; 0 otherwise."}],"argline":"git_reflog *reflog, size_t idx, int rewrite_previous_entry","sig":"git_reflog *::size_t::int","return":{"type":"int","comment":" 0 on success, GIT_ENOTFOUND if the entry doesn't exist\n or an error code."},"description":"

Remove an entry from the reflog by its index

\n","comments":"

To ensure there's no gap in the log history, set rewrite_previous_entry\n param value to 1. When deleting entry n, member old_oid of entry n-1\n (if any) will be updated with the value of member new_oid of entry n+1.

\n","group":"reflog"},"git_reflog_entry_id_old":{"type":"function","file":"reflog.h","line":135,"lineto":135,"args":[{"name":"entry","type":"const git_reflog_entry *","comment":"a reflog entry"}],"argline":"const git_reflog_entry *entry","sig":"const git_reflog_entry *","return":{"type":"const git_oid *","comment":" the old oid"},"description":"

Get the old oid

\n","comments":"","group":"reflog"},"git_reflog_entry_id_new":{"type":"function","file":"reflog.h","line":143,"lineto":143,"args":[{"name":"entry","type":"const git_reflog_entry *","comment":"a reflog entry"}],"argline":"const git_reflog_entry *entry","sig":"const git_reflog_entry *","return":{"type":"const git_oid *","comment":" the new oid at this time"},"description":"

Get the new oid

\n","comments":"","group":"reflog"},"git_reflog_entry_committer":{"type":"function","file":"reflog.h","line":151,"lineto":151,"args":[{"name":"entry","type":"const git_reflog_entry *","comment":"a reflog entry"}],"argline":"const git_reflog_entry *entry","sig":"const git_reflog_entry *","return":{"type":"const git_signature *","comment":" the committer"},"description":"

Get the committer of this entry

\n","comments":"","group":"reflog"},"git_reflog_entry_message":{"type":"function","file":"reflog.h","line":159,"lineto":159,"args":[{"name":"entry","type":"const git_reflog_entry *","comment":"a reflog entry"}],"argline":"const git_reflog_entry *entry","sig":"const git_reflog_entry *","return":{"type":"const char *","comment":" the log msg"},"description":"

Get the log message

\n","comments":"","group":"reflog"},"git_reflog_free":{"type":"function","file":"reflog.h","line":166,"lineto":166,"args":[{"name":"reflog","type":"git_reflog *","comment":"reflog to free"}],"argline":"git_reflog *reflog","sig":"git_reflog *","return":{"type":"void","comment":null},"description":"

Free the reflog

\n","comments":"","group":"reflog"},"git_reference_lookup":{"type":"function","file":"refs.h","line":37,"lineto":37,"args":[{"name":"out","type":"git_reference **","comment":"pointer to the looked-up reference"},{"name":"repo","type":"git_repository *","comment":"the repository to look up the reference"},{"name":"name","type":"const char *","comment":"the long name for the reference (e.g. HEAD, refs/heads/master, refs/tags/v0.1.0, ...)"}],"argline":"git_reference **out, git_repository *repo, const char *name","sig":"git_reference **::git_repository *::const char *","return":{"type":"int","comment":" 0 on success, GIT_ENOTFOUND, GIT_EINVALIDSPEC or an error code."},"description":"

Lookup a reference by name in a repository.

\n","comments":"

The returned reference must be freed by the user.

\n\n

The name will be checked for validity.\n See git_reference_symbolic_create() for rules about valid names.

\n","group":"reference","examples":{"general.c":["ex/v0.23.2/general.html#git_reference_lookup-53"]}},"git_reference_name_to_id":{"type":"function","file":"refs.h","line":54,"lineto":55,"args":[{"name":"out","type":"git_oid *","comment":"Pointer to oid to be filled in"},{"name":"repo","type":"git_repository *","comment":"The repository in which to look up the reference"},{"name":"name","type":"const char *","comment":"The long name for the reference (e.g. HEAD, refs/heads/master, refs/tags/v0.1.0, ...)"}],"argline":"git_oid *out, git_repository *repo, const char *name","sig":"git_oid *::git_repository *::const char *","return":{"type":"int","comment":" 0 on success, GIT_ENOTFOUND, GIT_EINVALIDSPEC or an error code."},"description":"

Lookup a reference by name and resolve immediately to OID.

\n","comments":"

This function provides a quick way to resolve a reference name straight\n through to the object id that it refers to. This avoids having to\n allocate or free any git_reference objects for simple situations.

\n\n

The name will be checked for validity.\n See git_reference_symbolic_create() for rules about valid names.

\n","group":"reference"},"git_reference_dwim":{"type":"function","file":"refs.h","line":68,"lineto":68,"args":[{"name":"out","type":"git_reference **","comment":"pointer in which to store the reference"},{"name":"repo","type":"git_repository *","comment":"the repository in which to look"},{"name":"shorthand","type":"const char *","comment":"the short name for the reference"}],"argline":"git_reference **out, git_repository *repo, const char *shorthand","sig":"git_reference **::git_repository *::const char *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Lookup a reference by DWIMing its short name

\n","comments":"

Apply the git precendence rules to the given shorthand to determine\n which reference the user is referring to.

\n","group":"reference"},"git_reference_symbolic_create_matching":{"type":"function","file":"refs.h","line":109,"lineto":109,"args":[{"name":"out","type":"git_reference **","comment":"Pointer to the newly created reference"},{"name":"repo","type":"git_repository *","comment":"Repository where that reference will live"},{"name":"name","type":"const char *","comment":"The name of the reference"},{"name":"target","type":"const char *","comment":"The target of the reference"},{"name":"force","type":"int","comment":"Overwrite existing references"},{"name":"current_value","type":"const char *","comment":"The expected value of the reference when updating"},{"name":"log_message","type":"const char *","comment":"The one line long message to be appended to the reflog"}],"argline":"git_reference **out, git_repository *repo, const char *name, const char *target, int force, const char *current_value, const char *log_message","sig":"git_reference **::git_repository *::const char *::const char *::int::const char *::const char *","return":{"type":"int","comment":" 0 on success, GIT_EEXISTS, GIT_EINVALIDSPEC, GIT_EMODIFIED or an error code"},"description":"

Conditionally create a new symbolic reference.

\n","comments":"

A symbolic reference is a reference name that refers to another\n reference name. If the other name moves, the symbolic name will move,\n too. As a simple example, the "HEAD" reference might refer to\n "refs/heads/master" while on the "master" branch of a repository.

\n\n

The symbolic reference will be created in the repository and written to\n the disk. The generated reference object must be freed by the user.

\n\n

Valid reference names must follow one of two patterns:

\n\n
    \n
  1. Top-level names must contain only capital letters and underscores,\nand must begin and end with a letter. (e.g. "HEAD", "ORIG_HEAD").
    2. \n
  2. Names prefixed with "refs/" can be almost anything. You must avoid\nthe characters '~', '^', ':', '\n\\\n', '?', '[', and '*', and the\nsequences ".." and "\n@\n{" which have special meaning to revparse.
    3. \n
\n\n

This function will return an error if a reference already exists with the\n given name unless force is true, in which case it will be overwritten.

\n\n

The message for the reflog will be ignored if the reference does\n not belong in the standard set (HEAD, branches and remote-tracking\n branches) and it does not have a reflog.

\n\n

It will return GIT_EMODIFIED if the reference's value at the time\n of updating does not match the one passed through current_value\n (i.e. if the ref has changed since the user read it).

\n","group":"reference"},"git_reference_symbolic_create":{"type":"function","file":"refs.h","line":145,"lineto":145,"args":[{"name":"out","type":"git_reference **","comment":"Pointer to the newly created reference"},{"name":"repo","type":"git_repository *","comment":"Repository where that reference will live"},{"name":"name","type":"const char *","comment":"The name of the reference"},{"name":"target","type":"const char *","comment":"The target of the reference"},{"name":"force","type":"int","comment":"Overwrite existing references"},{"name":"log_message","type":"const char *","comment":"The one line long message to be appended to the reflog"}],"argline":"git_reference **out, git_repository *repo, const char *name, const char *target, int force, const char *log_message","sig":"git_reference **::git_repository *::const char *::const char *::int::const char *","return":{"type":"int","comment":" 0 on success, GIT_EEXISTS, GIT_EINVALIDSPEC or an error code"},"description":"

Create a new symbolic reference.

\n","comments":"

A symbolic reference is a reference name that refers to another\n reference name. If the other name moves, the symbolic name will move,\n too. As a simple example, the "HEAD" reference might refer to\n "refs/heads/master" while on the "master" branch of a repository.

\n\n

The symbolic reference will be created in the repository and written to\n the disk. The generated reference object must be freed by the user.

\n\n

Valid reference names must follow one of two patterns:

\n\n
    \n
  1. Top-level names must contain only capital letters and underscores,\nand must begin and end with a letter. (e.g. "HEAD", "ORIG_HEAD").
    2. \n
  2. Names prefixed with "refs/" can be almost anything. You must avoid\nthe characters '~', '^', ':', '\n\\\n', '?', '[', and '*', and the\nsequences ".." and "\n@\n{" which have special meaning to revparse.
    3. \n
\n\n

This function will return an error if a reference already exists with the\n given name unless force is true, in which case it will be overwritten.

\n\n

The message for the reflog will be ignored if the reference does\n not belong in the standard set (HEAD, branches and remote-tracking\n branches) and it does not have a reflog.

\n","group":"reference"},"git_reference_create":{"type":"function","file":"refs.h","line":182,"lineto":182,"args":[{"name":"out","type":"git_reference **","comment":"Pointer to the newly created reference"},{"name":"repo","type":"git_repository *","comment":"Repository where that reference will live"},{"name":"name","type":"const char *","comment":"The name of the reference"},{"name":"id","type":"const git_oid *","comment":"The object id pointed to by the reference."},{"name":"force","type":"int","comment":"Overwrite existing references"},{"name":"log_message","type":"const char *","comment":"The one line long message to be appended to the reflog"}],"argline":"git_reference **out, git_repository *repo, const char *name, const git_oid *id, int force, const char *log_message","sig":"git_reference **::git_repository *::const char *::const git_oid *::int::const char *","return":{"type":"int","comment":" 0 on success, GIT_EEXISTS, GIT_EINVALIDSPEC or an error code"},"description":"

Create a new direct reference.

\n","comments":"

A direct reference (also called an object id reference) refers directly\n to a specific object id (a.k.a. OID or SHA) in the repository. The id\n permanently refers to the object (although the reference itself can be\n moved). For example, in libgit2 the direct ref "refs/tags/v0.17.0"\n refers to OID 5b9fac39d8a76b9139667c26a63e6b3f204b3977.

\n\n

The direct reference will be created in the repository and written to\n the disk. The generated reference object must be freed by the user.

\n\n

Valid reference names must follow one of two patterns:

\n\n
    \n
  1. Top-level names must contain only capital letters and underscores,\nand must begin and end with a letter. (e.g. "HEAD", "ORIG_HEAD").
    2. \n
  2. Names prefixed with "refs/" can be almost anything. You must avoid\nthe characters '~', '^', ':', '\n\\\n', '?', '[', and '*', and the\nsequences ".." and "\n@\n{" which have special meaning to revparse.
    3. \n
\n\n

This function will return an error if a reference already exists with the\n given name unless force is true, in which case it will be overwritten.

\n\n

The message for the reflog will be ignored if the reference does\n not belong in the standard set (HEAD, branches and remote-tracking\n branches) and and it does not have a reflog.

\n","group":"reference"},"git_reference_create_matching":{"type":"function","file":"refs.h","line":225,"lineto":225,"args":[{"name":"out","type":"git_reference **","comment":"Pointer to the newly created reference"},{"name":"repo","type":"git_repository *","comment":"Repository where that reference will live"},{"name":"name","type":"const char *","comment":"The name of the reference"},{"name":"id","type":"const git_oid *","comment":"The object id pointed to by the reference."},{"name":"force","type":"int","comment":"Overwrite existing references"},{"name":"current_id","type":"const git_oid *","comment":"The expected value of the reference at the time of update"},{"name":"log_message","type":"const char *","comment":"The one line long message to be appended to the reflog"}],"argline":"git_reference **out, git_repository *repo, const char *name, const git_oid *id, int force, const git_oid *current_id, const char *log_message","sig":"git_reference **::git_repository *::const char *::const git_oid *::int::const git_oid *::const char *","return":{"type":"int","comment":" 0 on success, GIT_EMODIFIED if the value of the reference\n has changed, GIT_EEXISTS, GIT_EINVALIDSPEC or an error code"},"description":"

Conditionally create new direct reference

\n","comments":"

A direct reference (also called an object id reference) refers directly\n to a specific object id (a.k.a. OID or SHA) in the repository. The id\n permanently refers to the object (although the reference itself can be\n moved). For example, in libgit2 the direct ref "refs/tags/v0.17.0"\n refers to OID 5b9fac39d8a76b9139667c26a63e6b3f204b3977.

\n\n

The direct reference will be created in the repository and written to\n the disk. The generated reference object must be freed by the user.

\n\n

Valid reference names must follow one of two patterns:

\n\n
    \n
  1. Top-level names must contain only capital letters and underscores,\nand must begin and end with a letter. (e.g. "HEAD", "ORIG_HEAD").
    2. \n
  2. Names prefixed with "refs/" can be almost anything. You must avoid\nthe characters '~', '^', ':', '\n\\\n', '?', '[', and '*', and the\nsequences ".." and "\n@\n{" which have special meaning to revparse.
    3. \n
\n\n

This function will return an error if a reference already exists with the\n given name unless force is true, in which case it will be overwritten.

\n\n

The message for the reflog will be ignored if the reference does\n not belong in the standard set (HEAD, branches and remote-tracking\n branches) and and it does not have a reflog.

\n\n

It will return GIT_EMODIFIED if the reference's value at the time\n of updating does not match the one passed through current_id\n (i.e. if the ref has changed since the user read it).

\n","group":"reference"},"git_reference_target":{"type":"function","file":"refs.h","line":240,"lineto":240,"args":[{"name":"ref","type":"const git_reference *","comment":"The reference"}],"argline":"const git_reference *ref","sig":"const git_reference *","return":{"type":"const git_oid *","comment":" a pointer to the oid if available, NULL otherwise"},"description":"

Get the OID pointed to by a direct reference.

\n","comments":"

Only available if the reference is direct (i.e. an object id reference,\n not a symbolic one).

\n\n

To find the OID of a symbolic ref, call git_reference_resolve() and\n then this function (or maybe use git_reference_name_to_id() to\n directly resolve a reference name all the way through to an OID).

\n","group":"reference","examples":{"general.c":["ex/v0.23.2/general.html#git_reference_target-54"]}},"git_reference_target_peel":{"type":"function","file":"refs.h","line":251,"lineto":251,"args":[{"name":"ref","type":"const git_reference *","comment":"The reference"}],"argline":"const git_reference *ref","sig":"const git_reference *","return":{"type":"const git_oid *","comment":" a pointer to the oid if available, NULL otherwise"},"description":"

Return the peeled OID target of this reference.

\n","comments":"

This peeled OID only applies to direct references that point to\n a hard Tag object: it is the result of peeling such Tag.

\n","group":"reference"},"git_reference_symbolic_target":{"type":"function","file":"refs.h","line":261,"lineto":261,"args":[{"name":"ref","type":"const git_reference *","comment":"The reference"}],"argline":"const git_reference *ref","sig":"const git_reference *","return":{"type":"const char *","comment":" a pointer to the name if available, NULL otherwise"},"description":"

Get full name to the reference pointed to by a symbolic reference.

\n","comments":"

Only available if the reference is symbolic.

\n","group":"reference","examples":{"general.c":["ex/v0.23.2/general.html#git_reference_symbolic_target-55"]}},"git_reference_type":{"type":"function","file":"refs.h","line":271,"lineto":271,"args":[{"name":"ref","type":"const git_reference *","comment":"The reference"}],"argline":"const git_reference *ref","sig":"const git_reference *","return":{"type":"git_ref_t","comment":" the type"},"description":"

Get the type of a reference.

\n","comments":"

Either direct (GIT_REF_OID) or symbolic (GIT_REF_SYMBOLIC)

\n","group":"reference","examples":{"general.c":["ex/v0.23.2/general.html#git_reference_type-56"]}},"git_reference_name":{"type":"function","file":"refs.h","line":281,"lineto":281,"args":[{"name":"ref","type":"const git_reference *","comment":"The reference"}],"argline":"const git_reference *ref","sig":"const git_reference *","return":{"type":"const char *","comment":" the full name for the ref"},"description":"

Get the full name of a reference.

\n","comments":"

See git_reference_symbolic_create() for rules about valid names.

\n","group":"reference"},"git_reference_resolve":{"type":"function","file":"refs.h","line":299,"lineto":299,"args":[{"name":"out","type":"git_reference **","comment":"Pointer to the peeled reference"},{"name":"ref","type":"const git_reference *","comment":"The reference"}],"argline":"git_reference **out, const git_reference *ref","sig":"git_reference **::const git_reference *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Resolve a symbolic reference to a direct reference.

\n","comments":"

This method iteratively peels a symbolic reference until it resolves to\n a direct reference to an OID.

\n\n

The peeled reference is returned in the resolved_ref argument, and\n must be freed manually once it's no longer needed.

\n\n

If a direct reference is passed as an argument, a copy of that\n reference is returned. This copy must be manually freed too.

\n","group":"reference"},"git_reference_owner":{"type":"function","file":"refs.h","line":307,"lineto":307,"args":[{"name":"ref","type":"const git_reference *","comment":"The reference"}],"argline":"const git_reference *ref","sig":"const git_reference *","return":{"type":"git_repository *","comment":" a pointer to the repo"},"description":"

Get the repository where a reference resides.

\n","comments":"","group":"reference"},"git_reference_symbolic_set_target":{"type":"function","file":"refs.h","line":329,"lineto":333,"args":[{"name":"out","type":"git_reference **","comment":"Pointer to the newly created reference"},{"name":"ref","type":"git_reference *","comment":"The reference"},{"name":"target","type":"const char *","comment":"The new target for the reference"},{"name":"log_message","type":"const char *","comment":"The one line long message to be appended to the reflog"}],"argline":"git_reference **out, git_reference *ref, const char *target, const char *log_message","sig":"git_reference **::git_reference *::const char *::const char *","return":{"type":"int","comment":" 0 on success, GIT_EINVALIDSPEC or an error code"},"description":"

Create a new reference with the same name as the given reference but a\n different symbolic target. The reference must be a symbolic reference,\n otherwise this will fail.

\n","comments":"

The new reference will be written to disk, overwriting the given reference.

\n\n

The target name will be checked for validity.\n See git_reference_symbolic_create() for rules about valid names.

\n\n

The message for the reflog will be ignored if the reference does\n not belong in the standard set (HEAD, branches and remote-tracking\n branches) and and it does not have a reflog.

\n","group":"reference"},"git_reference_set_target":{"type":"function","file":"refs.h","line":349,"lineto":353,"args":[{"name":"out","type":"git_reference **","comment":"Pointer to the newly created reference"},{"name":"ref","type":"git_reference *","comment":"The reference"},{"name":"id","type":"const git_oid *","comment":"The new target OID for the reference"},{"name":"log_message","type":"const char *","comment":"The one line long message to be appended to the reflog"}],"argline":"git_reference **out, git_reference *ref, const git_oid *id, const char *log_message","sig":"git_reference **::git_reference *::const git_oid *::const char *","return":{"type":"int","comment":" 0 on success, GIT_EMODIFIED if the value of the reference\n has changed since it was read, or an error code"},"description":"

Conditionally create a new reference with the same name as the given reference but a\n different OID target. The reference must be a direct reference, otherwise\n this will fail.

\n","comments":"

The new reference will be written to disk, overwriting the given reference.

\n","group":"reference"},"git_reference_rename":{"type":"function","file":"refs.h","line":378,"lineto":383,"args":[{"name":"new_ref","type":"git_reference **","comment":null},{"name":"ref","type":"git_reference *","comment":"The reference to rename"},{"name":"new_name","type":"const char *","comment":"The new name for the reference"},{"name":"force","type":"int","comment":"Overwrite an existing reference"},{"name":"log_message","type":"const char *","comment":"The one line long message to be appended to the reflog"}],"argline":"git_reference **new_ref, git_reference *ref, const char *new_name, int force, const char *log_message","sig":"git_reference **::git_reference *::const char *::int::const char *","return":{"type":"int","comment":" 0 on success, GIT_EINVALIDSPEC, GIT_EEXISTS or an error code"},"description":"

Rename an existing reference.

\n","comments":"

This method works for both direct and symbolic references.

\n\n

The new name will be checked for validity.\n See git_reference_symbolic_create() for rules about valid names.

\n\n

If the force flag is not enabled, and there's already\n a reference with the given name, the renaming will fail.

\n\n

IMPORTANT:\n The user needs to write a proper reflog entry if the\n reflog is enabled for the repository. We only rename\n the reflog if it exists.

\n","group":"reference"},"git_reference_delete":{"type":"function","file":"refs.h","line":398,"lineto":398,"args":[{"name":"ref","type":"git_reference *","comment":"The reference to remove"}],"argline":"git_reference *ref","sig":"git_reference *","return":{"type":"int","comment":" 0, GIT_EMODIFIED or an error code"},"description":"

Delete an existing reference.

\n","comments":"

This method works for both direct and symbolic references. The reference\n will be immediately removed on disk but the memory will not be freed.\n Callers must call git_reference_free.

\n\n

This function will return an error if the reference has changed\n from the time it was looked up.

\n","group":"reference"},"git_reference_remove":{"type":"function","file":"refs.h","line":409,"lineto":409,"args":[{"name":"repo","type":"git_repository *","comment":null},{"name":"name","type":"const char *","comment":"The reference to remove"}],"argline":"git_repository *repo, const char *name","sig":"git_repository *::const char *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Delete an existing reference by name

\n","comments":"

This method removes the named reference from the repository without\n looking at its old value.

\n","group":"reference"},"git_reference_list":{"type":"function","file":"refs.h","line":423,"lineto":423,"args":[{"name":"array","type":"git_strarray *","comment":"Pointer to a git_strarray structure where\n\t\tthe reference names will be stored"},{"name":"repo","type":"git_repository *","comment":"Repository where to find the refs"}],"argline":"git_strarray *array, git_repository *repo","sig":"git_strarray *::git_repository *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Fill a list with all the references that can be found in a repository.

\n","comments":"

The string array will be filled with the names of all references; these\n values are owned by the user and should be free'd manually when no\n longer needed, using git_strarray_free().

\n","group":"reference","examples":{"general.c":["ex/v0.23.2/general.html#git_reference_list-57"]}},"git_reference_foreach":{"type":"function","file":"refs.h","line":441,"lineto":444,"args":[{"name":"repo","type":"git_repository *","comment":"Repository where to find the refs"},{"name":"callback","type":"git_reference_foreach_cb","comment":"Function which will be called for every listed ref"},{"name":"payload","type":"void *","comment":"Additional data to pass to the callback"}],"argline":"git_repository *repo, git_reference_foreach_cb callback, void *payload","sig":"git_repository *::git_reference_foreach_cb::void *","return":{"type":"int","comment":" 0 on success, non-zero callback return value, or error code"},"description":"

Perform a callback on each reference in the repository.

\n","comments":"

The callback function will be called for each reference in the\n repository, receiving the reference object and the payload value\n passed to this method. Returning a non-zero value from the callback\n will terminate the iteration.

\n","group":"reference"},"git_reference_foreach_name":{"type":"function","file":"refs.h","line":459,"lineto":462,"args":[{"name":"repo","type":"git_repository *","comment":"Repository where to find the refs"},{"name":"callback","type":"git_reference_foreach_name_cb","comment":"Function which will be called for every listed ref name"},{"name":"payload","type":"void *","comment":"Additional data to pass to the callback"}],"argline":"git_repository *repo, git_reference_foreach_name_cb callback, void *payload","sig":"git_repository *::git_reference_foreach_name_cb::void *","return":{"type":"int","comment":" 0 on success, non-zero callback return value, or error code"},"description":"

Perform a callback on the fully-qualified name of each reference.

\n","comments":"

The callback function will be called for each reference in the\n repository, receiving the name of the reference and the payload value\n passed to this method. Returning a non-zero value from the callback\n will terminate the iteration.

\n","group":"reference"},"git_reference_free":{"type":"function","file":"refs.h","line":469,"lineto":469,"args":[{"name":"ref","type":"git_reference *","comment":"git_reference"}],"argline":"git_reference *ref","sig":"git_reference *","return":{"type":"void","comment":null},"description":"

Free the given reference.

\n","comments":"","group":"reference","examples":{"status.c":["ex/v0.23.2/status.html#git_reference_free-3"]}},"git_reference_cmp":{"type":"function","file":"refs.h","line":478,"lineto":480,"args":[{"name":"ref1","type":"const git_reference *","comment":"The first git_reference"},{"name":"ref2","type":"const git_reference *","comment":"The second git_reference"}],"argline":"const git_reference *ref1, const git_reference *ref2","sig":"const git_reference *::const git_reference *","return":{"type":"int","comment":" 0 if the same, else a stable but meaningless ordering."},"description":"

Compare two references.

\n","comments":"","group":"reference"},"git_reference_iterator_new":{"type":"function","file":"refs.h","line":489,"lineto":491,"args":[{"name":"out","type":"git_reference_iterator **","comment":"pointer in which to store the iterator"},{"name":"repo","type":"git_repository *","comment":"the repository"}],"argline":"git_reference_iterator **out, git_repository *repo","sig":"git_reference_iterator **::git_repository *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Create an iterator for the repo's references

\n","comments":"","group":"reference"},"git_reference_iterator_glob_new":{"type":"function","file":"refs.h","line":502,"lineto":505,"args":[{"name":"out","type":"git_reference_iterator **","comment":"pointer in which to store the iterator"},{"name":"repo","type":"git_repository *","comment":"the repository"},{"name":"glob","type":"const char *","comment":"the glob to match against the reference names"}],"argline":"git_reference_iterator **out, git_repository *repo, const char *glob","sig":"git_reference_iterator **::git_repository *::const char *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Create an iterator for the repo's references that match the\n specified glob

\n","comments":"","group":"reference"},"git_reference_next":{"type":"function","file":"refs.h","line":514,"lineto":514,"args":[{"name":"out","type":"git_reference **","comment":"pointer in which to store the reference"},{"name":"iter","type":"git_reference_iterator *","comment":"the iterator"}],"argline":"git_reference **out, git_reference_iterator *iter","sig":"git_reference **::git_reference_iterator *","return":{"type":"int","comment":" 0, GIT_ITEROVER if there are no more; or an error code"},"description":"

Get the next reference

\n","comments":"","group":"reference"},"git_reference_next_name":{"type":"function","file":"refs.h","line":527,"lineto":527,"args":[{"name":"out","type":"const char **","comment":"pointer in which to store the string"},{"name":"iter","type":"git_reference_iterator *","comment":"the iterator"}],"argline":"const char **out, git_reference_iterator *iter","sig":"const char **::git_reference_iterator *","return":{"type":"int","comment":" 0, GIT_ITEROVER if there are no more; or an error code"},"description":"

Get the next reference's name

\n","comments":"

This function is provided for convenience in case only the names\n are interesting as it avoids the allocation of the git_reference\n object which git_reference_next() needs.

\n","group":"reference"},"git_reference_iterator_free":{"type":"function","file":"refs.h","line":534,"lineto":534,"args":[{"name":"iter","type":"git_reference_iterator *","comment":"the iterator to free"}],"argline":"git_reference_iterator *iter","sig":"git_reference_iterator *","return":{"type":"void","comment":null},"description":"

Free the iterator and its associated resources

\n","comments":"","group":"reference"},"git_reference_foreach_glob":{"type":"function","file":"refs.h","line":554,"lineto":558,"args":[{"name":"repo","type":"git_repository *","comment":"Repository where to find the refs"},{"name":"glob","type":"const char *","comment":"Pattern to match (fnmatch-style) against reference name."},{"name":"callback","type":"git_reference_foreach_name_cb","comment":"Function which will be called for every listed ref"},{"name":"payload","type":"void *","comment":"Additional data to pass to the callback"}],"argline":"git_repository *repo, const char *glob, git_reference_foreach_name_cb callback, void *payload","sig":"git_repository *::const char *::git_reference_foreach_name_cb::void *","return":{"type":"int","comment":" 0 on success, GIT_EUSER on non-zero callback, or error code"},"description":"

Perform a callback on each reference in the repository whose name\n matches the given pattern.

\n","comments":"

This function acts like git_reference_foreach() with an additional\n pattern match being applied to the reference name before issuing the\n callback function. See that function for more information.

\n\n

The pattern is matched using fnmatch or "glob" style where a '*' matches\n any sequence of letters, a '?' matches any letter, and square brackets\n can be used to define character ranges (such as "[0-9]" for digits).

\n","group":"reference"},"git_reference_has_log":{"type":"function","file":"refs.h","line":568,"lineto":568,"args":[{"name":"repo","type":"git_repository *","comment":"the repository"},{"name":"refname","type":"const char *","comment":"the reference's name"}],"argline":"git_repository *repo, const char *refname","sig":"git_repository *::const char *","return":{"type":"int","comment":" 0 when no reflog can be found, 1 when it exists;\n otherwise an error code."},"description":"

Check if a reflog exists for the specified reference.

\n","comments":"","group":"reference"},"git_reference_ensure_log":{"type":"function","file":"refs.h","line":580,"lineto":580,"args":[{"name":"repo","type":"git_repository *","comment":"the repository"},{"name":"refname","type":"const char *","comment":"the reference's name"}],"argline":"git_repository *repo, const char *refname","sig":"git_repository *::const char *","return":{"type":"int","comment":" 0 or an error code."},"description":"

Ensure there is a reflog for a particular reference.

\n","comments":"

Make sure that successive updates to the reference will append to\n its log.

\n","group":"reference"},"git_reference_is_branch":{"type":"function","file":"refs.h","line":590,"lineto":590,"args":[{"name":"ref","type":"const git_reference *","comment":"A git reference"}],"argline":"const git_reference *ref","sig":"const git_reference *","return":{"type":"int","comment":" 1 when the reference lives in the refs/heads\n namespace; 0 otherwise."},"description":"

Check if a reference is a local branch.

\n","comments":"","group":"reference"},"git_reference_is_remote":{"type":"function","file":"refs.h","line":600,"lineto":600,"args":[{"name":"ref","type":"const git_reference *","comment":"A git reference"}],"argline":"const git_reference *ref","sig":"const git_reference *","return":{"type":"int","comment":" 1 when the reference lives in the refs/remotes\n namespace; 0 otherwise."},"description":"

Check if a reference is a remote tracking branch

\n","comments":"","group":"reference"},"git_reference_is_tag":{"type":"function","file":"refs.h","line":610,"lineto":610,"args":[{"name":"ref","type":"const git_reference *","comment":"A git reference"}],"argline":"const git_reference *ref","sig":"const git_reference *","return":{"type":"int","comment":" 1 when the reference lives in the refs/tags\n namespace; 0 otherwise."},"description":"

Check if a reference is a tag

\n","comments":"","group":"reference"},"git_reference_is_note":{"type":"function","file":"refs.h","line":620,"lineto":620,"args":[{"name":"ref","type":"const git_reference *","comment":"A git reference"}],"argline":"const git_reference *ref","sig":"const git_reference *","return":{"type":"int","comment":" 1 when the reference lives in the refs/notes\n namespace; 0 otherwise."},"description":"

Check if a reference is a note

\n","comments":"","group":"reference"},"git_reference_normalize_name":{"type":"function","file":"refs.h","line":676,"lineto":680,"args":[{"name":"buffer_out","type":"char *","comment":"User allocated buffer to store normalized name"},{"name":"buffer_size","type":"size_t","comment":"Size of buffer_out"},{"name":"name","type":"const char *","comment":"Reference name to be checked."},{"name":"flags","type":"unsigned int","comment":"Flags to constrain name validation rules - see the\n GIT_REF_FORMAT constants above."}],"argline":"char *buffer_out, size_t buffer_size, const char *name, unsigned int flags","sig":"char *::size_t::const char *::unsigned int","return":{"type":"int","comment":" 0 on success, GIT_EBUFS if buffer is too small, GIT_EINVALIDSPEC\n or an error code."},"description":"

Normalize reference name and check validity.

\n","comments":"

This will normalize the reference name by removing any leading slash\n '/' characters and collapsing runs of adjacent slashes between name\n components into a single slash.

\n\n

Once normalized, if the reference name is valid, it will be returned in\n the user allocated buffer.

\n\n

See git_reference_symbolic_create() for rules about valid names.

\n","group":"reference"},"git_reference_peel":{"type":"function","file":"refs.h","line":697,"lineto":700,"args":[{"name":"out","type":"git_object **","comment":"Pointer to the peeled git_object"},{"name":"ref","type":"git_reference *","comment":"The reference to be processed"},{"name":"type","type":"git_otype","comment":"The type of the requested object (GIT_OBJ_COMMIT,\n GIT_OBJ_TAG, GIT_OBJ_TREE, GIT_OBJ_BLOB or GIT_OBJ_ANY)."}],"argline":"git_object **out, git_reference *ref, git_otype type","sig":"git_object **::git_reference *::git_otype","return":{"type":"int","comment":" 0 on success, GIT_EAMBIGUOUS, GIT_ENOTFOUND or an error code"},"description":"

Recursively peel reference until object of the specified type is found.

\n","comments":"

The retrieved peeled object is owned by the repository\n and should be closed with the git_object_free method.

\n\n

If you pass GIT_OBJ_ANY as the target type, then the object\n will be peeled until a non-tag object is met.

\n","group":"reference"},"git_reference_is_valid_name":{"type":"function","file":"refs.h","line":716,"lineto":716,"args":[{"name":"refname","type":"const char *","comment":"name to be checked."}],"argline":"const char *refname","sig":"const char *","return":{"type":"int","comment":" 1 if the reference name is acceptable; 0 if it isn't"},"description":"

Ensure the reference name is well-formed.

\n","comments":"

Valid reference names must follow one of two patterns:

\n\n
    \n
  1. Top-level names must contain only capital letters and underscores,\nand must begin and end with a letter. (e.g. "HEAD", "ORIG_HEAD").
    2. \n
  2. Names prefixed with "refs/" can be almost anything. You must avoid\nthe characters '~', '^', ':', '\n\\\n', '?', '[', and '*', and the\nsequences ".." and "\n@\n{" which have special meaning to revparse.
    3. \n
\n","group":"reference"},"git_reference_shorthand":{"type":"function","file":"refs.h","line":730,"lineto":730,"args":[{"name":"ref","type":"const git_reference *","comment":"a reference"}],"argline":"const git_reference *ref","sig":"const git_reference *","return":{"type":"const char *","comment":" the human-readable version of the name"},"description":"

Get the reference's short name

\n","comments":"

This will transform the reference name into a name "human-readable"\n version. If no shortname is appropriate, it will return the full\n name.

\n\n

The memory is owned by the reference and must not be freed.

\n","group":"reference","examples":{"status.c":["ex/v0.23.2/status.html#git_reference_shorthand-4"]}},"git_refspec_src":{"type":"function","file":"refspec.h","line":30,"lineto":30,"args":[{"name":"refspec","type":"const git_refspec *","comment":"the refspec"}],"argline":"const git_refspec *refspec","sig":"const git_refspec *","return":{"type":"const char *","comment":" the refspec's source specifier"},"description":"

Get the source specifier

\n","comments":"","group":"refspec"},"git_refspec_dst":{"type":"function","file":"refspec.h","line":38,"lineto":38,"args":[{"name":"refspec","type":"const git_refspec *","comment":"the refspec"}],"argline":"const git_refspec *refspec","sig":"const git_refspec *","return":{"type":"const char *","comment":" the refspec's destination specifier"},"description":"

Get the destination specifier

\n","comments":"","group":"refspec"},"git_refspec_string":{"type":"function","file":"refspec.h","line":46,"lineto":46,"args":[{"name":"refspec","type":"const git_refspec *","comment":"the refspec"}],"argline":"const git_refspec *refspec","sig":"const git_refspec *","return":{"type":"const char *","comment":null},"description":"

Get the refspec's string

\n","comments":"","group":"refspec"},"git_refspec_force":{"type":"function","file":"refspec.h","line":54,"lineto":54,"args":[{"name":"refspec","type":"const git_refspec *","comment":"the refspec"}],"argline":"const git_refspec *refspec","sig":"const git_refspec *","return":{"type":"int","comment":" 1 if force update has been set, 0 otherwise"},"description":"

Get the force update setting

\n","comments":"","group":"refspec"},"git_refspec_direction":{"type":"function","file":"refspec.h","line":62,"lineto":62,"args":[{"name":"spec","type":"const git_refspec *","comment":"refspec"}],"argline":"const git_refspec *spec","sig":"const git_refspec *","return":{"type":"git_direction","comment":" GIT_DIRECTION_FETCH or GIT_DIRECTION_PUSH"},"description":"

Get the refspec's direction.

\n","comments":"","group":"refspec"},"git_refspec_src_matches":{"type":"function","file":"refspec.h","line":71,"lineto":71,"args":[{"name":"refspec","type":"const git_refspec *","comment":"the refspec"},{"name":"refname","type":"const char *","comment":"the name of the reference to check"}],"argline":"const git_refspec *refspec, const char *refname","sig":"const git_refspec *::const char *","return":{"type":"int","comment":" 1 if the refspec matches, 0 otherwise"},"description":"

Check if a refspec's source descriptor matches a reference

\n","comments":"","group":"refspec"},"git_refspec_dst_matches":{"type":"function","file":"refspec.h","line":80,"lineto":80,"args":[{"name":"refspec","type":"const git_refspec *","comment":"the refspec"},{"name":"refname","type":"const char *","comment":"the name of the reference to check"}],"argline":"const git_refspec *refspec, const char *refname","sig":"const git_refspec *::const char *","return":{"type":"int","comment":" 1 if the refspec matches, 0 otherwise"},"description":"

Check if a refspec's destination descriptor matches a reference

\n","comments":"","group":"refspec"},"git_refspec_transform":{"type":"function","file":"refspec.h","line":90,"lineto":90,"args":[{"name":"out","type":"git_buf *","comment":"where to store the target name"},{"name":"spec","type":"const git_refspec *","comment":"the refspec"},{"name":"name","type":"const char *","comment":"the name of the reference to transform"}],"argline":"git_buf *out, const git_refspec *spec, const char *name","sig":"git_buf *::const git_refspec *::const char *","return":{"type":"int","comment":" 0, GIT_EBUFS or another error"},"description":"

Transform a reference to its target following the refspec's rules

\n","comments":"","group":"refspec"},"git_refspec_rtransform":{"type":"function","file":"refspec.h","line":100,"lineto":100,"args":[{"name":"out","type":"git_buf *","comment":"where to store the source reference name"},{"name":"spec","type":"const git_refspec *","comment":"the refspec"},{"name":"name","type":"const char *","comment":"the name of the reference to transform"}],"argline":"git_buf *out, const git_refspec *spec, const char *name","sig":"git_buf *::const git_refspec *::const char *","return":{"type":"int","comment":" 0, GIT_EBUFS or another error"},"description":"

Transform a target reference to its source reference following the refspec's rules

\n","comments":"","group":"refspec"},"git_remote_create":{"type":"function","file":"remote.h","line":39,"lineto":43,"args":[{"name":"out","type":"git_remote **","comment":"the resulting remote"},{"name":"repo","type":"git_repository *","comment":"the repository in which to create the remote"},{"name":"name","type":"const char *","comment":"the remote's name"},{"name":"url","type":"const char *","comment":"the remote's url"}],"argline":"git_remote **out, git_repository *repo, const char *name, const char *url","sig":"git_remote **::git_repository *::const char *::const char *","return":{"type":"int","comment":" 0, GIT_EINVALIDSPEC, GIT_EEXISTS or an error code"},"description":"

Add a remote with the default fetch refspec to the repository's configuration.

\n","comments":"","group":"remote","examples":{"remote.c":["ex/v0.23.2/remote.html#git_remote_create-4"]}},"git_remote_create_with_fetchspec":{"type":"function","file":"remote.h","line":56,"lineto":61,"args":[{"name":"out","type":"git_remote **","comment":"the resulting remote"},{"name":"repo","type":"git_repository *","comment":"the repository in which to create the remote"},{"name":"name","type":"const char *","comment":"the remote's name"},{"name":"url","type":"const char *","comment":"the remote's url"},{"name":"fetch","type":"const char *","comment":"the remote fetch value"}],"argline":"git_remote **out, git_repository *repo, const char *name, const char *url, const char *fetch","sig":"git_remote **::git_repository *::const char *::const char *::const char *","return":{"type":"int","comment":" 0, GIT_EINVALIDSPEC, GIT_EEXISTS or an error code"},"description":"

Add a remote with the provided fetch refspec (or default if NULL) to the repository's\n configuration.

\n","comments":"","group":"remote"},"git_remote_create_anonymous":{"type":"function","file":"remote.h","line":74,"lineto":77,"args":[{"name":"out","type":"git_remote **","comment":"pointer to the new remote objects"},{"name":"repo","type":"git_repository *","comment":"the associated repository"},{"name":"url","type":"const char *","comment":"the remote repository's URL"}],"argline":"git_remote **out, git_repository *repo, const char *url","sig":"git_remote **::git_repository *::const char *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Create an anonymous remote

\n","comments":"

Create a remote with the given url in-memory. You can use this when\n you have a URL instead of a remote's name.

\n","group":"remote","examples":{"network/fetch.c":["ex/v0.23.2/network/fetch.html#git_remote_create_anonymous-4"],"network/ls-remote.c":["ex/v0.23.2/network/ls-remote.html#git_remote_create_anonymous-2"]}},"git_remote_lookup":{"type":"function","file":"remote.h","line":90,"lineto":90,"args":[{"name":"out","type":"git_remote **","comment":"pointer to the new remote object"},{"name":"repo","type":"git_repository *","comment":"the associated repository"},{"name":"name","type":"const char *","comment":"the remote's name"}],"argline":"git_remote **out, git_repository *repo, const char *name","sig":"git_remote **::git_repository *::const char *","return":{"type":"int","comment":" 0, GIT_ENOTFOUND, GIT_EINVALIDSPEC or an error code"},"description":"

Get the information for a particular remote

\n","comments":"

The name will be checked for validity.\n See git_tag_create() for rules about valid names.

\n","group":"remote","examples":{"network/fetch.c":["ex/v0.23.2/network/fetch.html#git_remote_lookup-5"],"network/ls-remote.c":["ex/v0.23.2/network/ls-remote.html#git_remote_lookup-3"],"remote.c":["ex/v0.23.2/remote.html#git_remote_lookup-5"]}},"git_remote_dup":{"type":"function","file":"remote.h","line":102,"lineto":102,"args":[{"name":"dest","type":"git_remote **","comment":"pointer where to store the copy"},{"name":"source","type":"git_remote *","comment":"object to copy"}],"argline":"git_remote **dest, git_remote *source","sig":"git_remote **::git_remote *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Create a copy of an existing remote. All internal strings are also\n duplicated. Callbacks are not duplicated.

\n","comments":"

Call git_remote_free to free the data.

\n","group":"remote"},"git_remote_owner":{"type":"function","file":"remote.h","line":110,"lineto":110,"args":[{"name":"remote","type":"const git_remote *","comment":"the remote"}],"argline":"const git_remote *remote","sig":"const git_remote *","return":{"type":"git_repository *","comment":" a pointer to the repository"},"description":"

Get the remote's repository

\n","comments":"","group":"remote"},"git_remote_name":{"type":"function","file":"remote.h","line":118,"lineto":118,"args":[{"name":"remote","type":"const git_remote *","comment":"the remote"}],"argline":"const git_remote *remote","sig":"const git_remote *","return":{"type":"const char *","comment":" a pointer to the name or NULL for in-memory remotes"},"description":"

Get the remote's name

\n","comments":"","group":"remote"},"git_remote_url":{"type":"function","file":"remote.h","line":129,"lineto":129,"args":[{"name":"remote","type":"const git_remote *","comment":"the remote"}],"argline":"const git_remote *remote","sig":"const git_remote *","return":{"type":"const char *","comment":" a pointer to the url"},"description":"

Get the remote's url

\n","comments":"

If url.*.insteadOf has been configured for this URL, it will\n return the modified URL.

\n","group":"remote","examples":{"remote.c":["ex/v0.23.2/remote.html#git_remote_url-6"]}},"git_remote_pushurl":{"type":"function","file":"remote.h","line":140,"lineto":140,"args":[{"name":"remote","type":"const git_remote *","comment":"the remote"}],"argline":"const git_remote *remote","sig":"const git_remote *","return":{"type":"const char *","comment":" a pointer to the url or NULL if no special url for pushing is set"},"description":"

Get the remote's url for pushing

\n","comments":"

If url.*.pushInsteadOf has been configured for this URL, it\n will return the modified URL.

\n","group":"remote","examples":{"remote.c":["ex/v0.23.2/remote.html#git_remote_pushurl-7"]}},"git_remote_set_url":{"type":"function","file":"remote.h","line":153,"lineto":153,"args":[{"name":"repo","type":"git_repository *","comment":"the repository in which to perform the change"},{"name":"remote","type":"const char *","comment":"the remote's name"},{"name":"url","type":"const char *","comment":"the url to set"}],"argline":"git_repository *repo, const char *remote, const char *url","sig":"git_repository *::const char *::const char *","return":{"type":"int","comment":" 0 or an error value"},"description":"

Set the remote's url in the configuration

\n","comments":"

Remote objects already in memory will not be affected. This assumes\n the common case of a single-url remote and will otherwise return an error.

\n","group":"remote","examples":{"remote.c":["ex/v0.23.2/remote.html#git_remote_set_url-8"]}},"git_remote_set_pushurl":{"type":"function","file":"remote.h","line":166,"lineto":166,"args":[{"name":"repo","type":"git_repository *","comment":"the repository in which to perform the change"},{"name":"remote","type":"const char *","comment":"the remote's name"},{"name":"url","type":"const char *","comment":"the url to set"}],"argline":"git_repository *repo, const char *remote, const char *url","sig":"git_repository *::const char *::const char *","return":{"type":"int","comment":null},"description":"

Set the remote's url for pushing in the configuration.

\n","comments":"

Remote objects already in memory will not be affected. This assumes\n the common case of a single-url remote and will otherwise return an error.

\n","group":"remote","examples":{"remote.c":["ex/v0.23.2/remote.html#git_remote_set_pushurl-9"]}},"git_remote_add_fetch":{"type":"function","file":"remote.h","line":179,"lineto":179,"args":[{"name":"repo","type":"git_repository *","comment":"the repository in which to change the configuration"},{"name":"remote","type":"const char *","comment":"the name of the remote to change"},{"name":"refspec","type":"const char *","comment":"the new fetch refspec"}],"argline":"git_repository *repo, const char *remote, const char *refspec","sig":"git_repository *::const char *::const char *","return":{"type":"int","comment":" 0, GIT_EINVALIDSPEC if refspec is invalid or an error value"},"description":"

Add a fetch refspec to the remote's configuration

\n","comments":"

Add the given refspec to the fetch list in the configuration. No\n loaded remote instances will be affected.

\n","group":"remote"},"git_remote_get_fetch_refspecs":{"type":"function","file":"remote.h","line":190,"lineto":190,"args":[{"name":"array","type":"git_strarray *","comment":"pointer to the array in which to store the strings"},{"name":"remote","type":"const git_remote *","comment":"the remote to query"}],"argline":"git_strarray *array, const git_remote *remote","sig":"git_strarray *::const git_remote *","return":{"type":"int","comment":null},"description":"

Get the remote's list of fetch refspecs

\n","comments":"

The memory is owned by the user and should be freed with\n git_strarray_free.

\n","group":"remote"},"git_remote_add_push":{"type":"function","file":"remote.h","line":203,"lineto":203,"args":[{"name":"repo","type":"git_repository *","comment":"the repository in which to change the configuration"},{"name":"remote","type":"const char *","comment":"the name of the remote to change"},{"name":"refspec","type":"const char *","comment":"the new push refspec"}],"argline":"git_repository *repo, const char *remote, const char *refspec","sig":"git_repository *::const char *::const char *","return":{"type":"int","comment":" 0, GIT_EINVALIDSPEC if refspec is invalid or an error value"},"description":"

Add a push refspec to the remote's configuration

\n","comments":"

Add the given refspec to the push list in the configuration. No\n loaded remote instances will be affected.

\n","group":"remote"},"git_remote_get_push_refspecs":{"type":"function","file":"remote.h","line":214,"lineto":214,"args":[{"name":"array","type":"git_strarray *","comment":"pointer to the array in which to store the strings"},{"name":"remote","type":"const git_remote *","comment":"the remote to query"}],"argline":"git_strarray *array, const git_remote *remote","sig":"git_strarray *::const git_remote *","return":{"type":"int","comment":null},"description":"

Get the remote's list of push refspecs

\n","comments":"

The memory is owned by the user and should be freed with\n git_strarray_free.

\n","group":"remote"},"git_remote_refspec_count":{"type":"function","file":"remote.h","line":222,"lineto":222,"args":[{"name":"remote","type":"const git_remote *","comment":"the remote"}],"argline":"const git_remote *remote","sig":"const git_remote *","return":{"type":"size_t","comment":" the amount of refspecs configured in this remote"},"description":"

Get the number of refspecs for a remote

\n","comments":"","group":"remote"},"git_remote_get_refspec":{"type":"function","file":"remote.h","line":231,"lineto":231,"args":[{"name":"remote","type":"const git_remote *","comment":"the remote to query"},{"name":"n","type":"size_t","comment":"the refspec to get"}],"argline":"const git_remote *remote, size_t n","sig":"const git_remote *::size_t","return":{"type":"const git_refspec *","comment":" the nth refspec"},"description":"

Get a refspec from the remote

\n","comments":"","group":"remote"},"git_remote_connect":{"type":"function","file":"remote.h","line":246,"lineto":246,"args":[{"name":"remote","type":"git_remote *","comment":"the remote to connect to"},{"name":"direction","type":"git_direction","comment":"GIT_DIRECTION_FETCH if you want to fetch or\n GIT_DIRECTION_PUSH if you want to push"},{"name":"callbacks","type":"const git_remote_callbacks *","comment":"the callbacks to use for this connection"}],"argline":"git_remote *remote, git_direction direction, const git_remote_callbacks *callbacks","sig":"git_remote *::git_direction::const git_remote_callbacks *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Open a connection to a remote

\n","comments":"

The transport is selected based on the URL. The direction argument\n is due to a limitation of the git protocol (over TCP or SSH) which\n starts up a specific binary which can only do the one or the other.

\n","group":"remote","examples":{"network/fetch.c":["ex/v0.23.2/network/fetch.html#git_remote_connect-6"],"network/ls-remote.c":["ex/v0.23.2/network/ls-remote.html#git_remote_connect-4"]}},"git_remote_ls":{"type":"function","file":"remote.h","line":268,"lineto":268,"args":[{"name":"out","type":"const git_remote_head ***","comment":"pointer to the array"},{"name":"size","type":"size_t *","comment":"the number of remote heads"},{"name":"remote","type":"git_remote *","comment":"the remote"}],"argline":"const git_remote_head ***out, size_t *size, git_remote *remote","sig":"const git_remote_head ***::size_t *::git_remote *","return":{"type":"int","comment":" 0 on success, or an error code"},"description":"

Get the remote repository's reference advertisement list

\n","comments":"

Get the list of references with which the server responds to a new\n connection.

\n\n

The remote (or more exactly its transport) must have connected to\n the remote repository. This list is available as soon as the\n connection to the remote is initiated and it remains available\n after disconnecting.

\n\n

The memory belongs to the remote. The pointer will be valid as long\n as a new connection is not initiated, but it is recommended that\n you make a copy in order to make use of the data.

\n","group":"remote","examples":{"network/ls-remote.c":["ex/v0.23.2/network/ls-remote.html#git_remote_ls-5"]}},"git_remote_connected":{"type":"function","file":"remote.h","line":279,"lineto":279,"args":[{"name":"remote","type":"const git_remote *","comment":"the remote"}],"argline":"const git_remote *remote","sig":"const git_remote *","return":{"type":"int","comment":" 1 if it's connected, 0 otherwise."},"description":"

Check whether the remote is connected

\n","comments":"

Check whether the remote's underlying transport is connected to the\n remote host.

\n","group":"remote"},"git_remote_stop":{"type":"function","file":"remote.h","line":289,"lineto":289,"args":[{"name":"remote","type":"git_remote *","comment":"the remote"}],"argline":"git_remote *remote","sig":"git_remote *","return":{"type":"void","comment":null},"description":"

Cancel the operation

\n","comments":"

At certain points in its operation, the network code checks whether\n the operation has been cancelled and if so stops the operation.

\n","group":"remote"},"git_remote_disconnect":{"type":"function","file":"remote.h","line":298,"lineto":298,"args":[{"name":"remote","type":"git_remote *","comment":"the remote to disconnect from"}],"argline":"git_remote *remote","sig":"git_remote *","return":{"type":"void","comment":null},"description":"

Disconnect from the remote

\n","comments":"

Close the connection to the remote.

\n","group":"remote","examples":{"network/fetch.c":["ex/v0.23.2/network/fetch.html#git_remote_disconnect-7"]}},"git_remote_free":{"type":"function","file":"remote.h","line":308,"lineto":308,"args":[{"name":"remote","type":"git_remote *","comment":"the remote to free"}],"argline":"git_remote *remote","sig":"git_remote *","return":{"type":"void","comment":null},"description":"

Free the memory associated with a remote

\n","comments":"

This also disconnects from the remote, if the connection\n has not been closed yet (using git_remote_disconnect).

\n","group":"remote","examples":{"network/fetch.c":["ex/v0.23.2/network/fetch.html#git_remote_free-8","ex/v0.23.2/network/fetch.html#git_remote_free-9"],"network/ls-remote.c":["ex/v0.23.2/network/ls-remote.html#git_remote_free-6"],"remote.c":["ex/v0.23.2/remote.html#git_remote_free-10"]}},"git_remote_list":{"type":"function","file":"remote.h","line":319,"lineto":319,"args":[{"name":"out","type":"git_strarray *","comment":"a string array which receives the names of the remotes"},{"name":"repo","type":"git_repository *","comment":"the repository to query"}],"argline":"git_strarray *out, git_repository *repo","sig":"git_strarray *::git_repository *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Get a list of the configured remotes for a repo

\n","comments":"

The string array must be freed by the user.

\n","group":"remote","examples":{"remote.c":["ex/v0.23.2/remote.html#git_remote_list-11"]}},"git_remote_init_callbacks":{"type":"function","file":"remote.h","line":470,"lineto":472,"args":[{"name":"opts","type":"git_remote_callbacks *","comment":"the `git_remote_callbacks` struct to initialize"},{"name":"version","type":"unsigned int","comment":"Version of struct; pass `GIT_REMOTE_CALLBACKS_VERSION`"}],"argline":"git_remote_callbacks *opts, unsigned int version","sig":"git_remote_callbacks *::unsigned int","return":{"type":"int","comment":" Zero on success; -1 on failure."},"description":"

Initializes a git_remote_callbacks with default values. Equivalent to\n creating an instance with GIT_REMOTE_CALLBACKS_INIT.

\n","comments":"","group":"remote"},"git_fetch_init_options":{"type":"function","file":"remote.h","line":563,"lineto":565,"args":[{"name":"opts","type":"git_fetch_options *","comment":"the `git_push_options` instance to initialize."},{"name":"version","type":"unsigned int","comment":"the version of the struct; you should pass\n `GIT_FETCH_OPTIONS_VERSION` here."}],"argline":"git_fetch_options *opts, unsigned int version","sig":"git_fetch_options *::unsigned int","return":{"type":"int","comment":" Zero on success; -1 on failure."},"description":"

Initializes a git_fetch_options with default values. Equivalent to\n creating an instance with GIT_FETCH_OPTIONS_INIT.

\n","comments":"","group":"fetch"},"git_push_init_options":{"type":"function","file":"remote.h","line":602,"lineto":604,"args":[{"name":"opts","type":"git_push_options *","comment":"the `git_push_options` instance to initialize."},{"name":"version","type":"unsigned int","comment":"the version of the struct; you should pass\n `GIT_PUSH_OPTIONS_VERSION` here."}],"argline":"git_push_options *opts, unsigned int version","sig":"git_push_options *::unsigned int","return":{"type":"int","comment":" Zero on success; -1 on failure."},"description":"

Initializes a git_push_options with default values. Equivalent to\n creating an instance with GIT_PUSH_OPTIONS_INIT.

\n","comments":"","group":"push"},"git_remote_download":{"type":"function","file":"remote.h","line":622,"lineto":622,"args":[{"name":"remote","type":"git_remote *","comment":"the remote"},{"name":"refspecs","type":"const git_strarray *","comment":"the refspecs to use for this negotiation and\n download. Use NULL or an empty array to use the base refspecs"},{"name":"opts","type":"const git_fetch_options *","comment":"the options to use for this fetch"}],"argline":"git_remote *remote, const git_strarray *refspecs, const git_fetch_options *opts","sig":"git_remote *::const git_strarray *::const git_fetch_options *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Download and index the packfile

\n","comments":"

Connect to the remote if it hasn't been done yet, negotiate with\n the remote git which objects are missing, download and index the\n packfile.

\n\n

The .idx file will be created and both it and the packfile with be\n renamed to their final name.

\n","group":"remote","examples":{"network/fetch.c":["ex/v0.23.2/network/fetch.html#git_remote_download-10"]}},"git_remote_upload":{"type":"function","file":"remote.h","line":636,"lineto":636,"args":[{"name":"remote","type":"git_remote *","comment":"the remote"},{"name":"refspecs","type":"const git_strarray *","comment":"the refspecs to use for this negotiation and\n upload. Use NULL or an empty array to use the base refspecs"},{"name":"opts","type":"const git_push_options *","comment":"the options to use for this push"}],"argline":"git_remote *remote, const git_strarray *refspecs, const git_push_options *opts","sig":"git_remote *::const git_strarray *::const git_push_options *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Create a packfile and send it to the server

\n","comments":"

Connect to the remote if it hasn't been done yet, negotiate with\n the remote git which objects are missing, create a packfile with the missing objects and send it.

\n","group":"remote"},"git_remote_update_tips":{"type":"function","file":"remote.h","line":652,"lineto":657,"args":[{"name":"remote","type":"git_remote *","comment":"the remote to update"},{"name":"callbacks","type":"const git_remote_callbacks *","comment":"pointer to the callback structure to use"},{"name":"update_fetchhead","type":"int","comment":"whether to write to FETCH_HEAD. Pass 1 to behave like git."},{"name":"download_tags","type":"git_remote_autotag_option_t","comment":"what the behaviour for downloading tags is for this fetch. This is\n ignored for push. This must be the same value passed to `git_remote_download()`."},{"name":"reflog_message","type":"const char *","comment":"The message to insert into the reflogs. If\n NULL and fetching, the default is \"fetch \n\", where \n is\n the name of the remote (or its url, for in-memory remotes). This\n parameter is ignored when pushing."}],"argline":"git_remote *remote, const git_remote_callbacks *callbacks, int update_fetchhead, git_remote_autotag_option_t download_tags, const char *reflog_message","sig":"git_remote *::const git_remote_callbacks *::int::git_remote_autotag_option_t::const char *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Update the tips to the new state

\n","comments":"","group":"remote","examples":{"network/fetch.c":["ex/v0.23.2/network/fetch.html#git_remote_update_tips-11"]}},"git_remote_fetch":{"type":"function","file":"remote.h","line":673,"lineto":677,"args":[{"name":"remote","type":"git_remote *","comment":"the remote to fetch from"},{"name":"refspecs","type":"const git_strarray *","comment":"the refspecs to use for this fetch. Pass NULL or an\n empty array to use the base refspecs."},{"name":"opts","type":"const git_fetch_options *","comment":"options to use for this fetch"},{"name":"reflog_message","type":"const char *","comment":"The message to insert into the reflogs. If NULL, the\n\t\t\t\t\t\t\t\t default is \"fetch\""}],"argline":"git_remote *remote, const git_strarray *refspecs, const git_fetch_options *opts, const char *reflog_message","sig":"git_remote *::const git_strarray *::const git_fetch_options *::const char *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Download new data and update tips

\n","comments":"

Convenience function to connect to a remote, download the data,\n disconnect and update the remote-tracking branches.

\n","group":"remote"},"git_remote_prune":{"type":"function","file":"remote.h","line":686,"lineto":686,"args":[{"name":"remote","type":"git_remote *","comment":"the remote to prune"},{"name":"callbacks","type":"const git_remote_callbacks *","comment":"callbacks to use for this prune"}],"argline":"git_remote *remote, const git_remote_callbacks *callbacks","sig":"git_remote *::const git_remote_callbacks *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Prune tracking refs that are no longer present on remote

\n","comments":"","group":"remote"},"git_remote_push":{"type":"function","file":"remote.h","line":698,"lineto":700,"args":[{"name":"remote","type":"git_remote *","comment":"the remote to push to"},{"name":"refspecs","type":"const git_strarray *","comment":"the refspecs to use for pushing. If none are\n passed, the configured refspecs will be used"},{"name":"opts","type":"const git_push_options *","comment":"options to use for this push"}],"argline":"git_remote *remote, const git_strarray *refspecs, const git_push_options *opts","sig":"git_remote *::const git_strarray *::const git_push_options *","return":{"type":"int","comment":null},"description":"

Perform a push

\n","comments":"

Peform all the steps from a push.

\n","group":"remote"},"git_remote_stats":{"type":"function","file":"remote.h","line":705,"lineto":705,"args":[{"name":"remote","type":"git_remote *","comment":null}],"argline":"git_remote *remote","sig":"git_remote *","return":{"type":"const git_transfer_progress *","comment":null},"description":"

Get the statistics structure that is filled in by the fetch operation.

\n","comments":"","group":"remote","examples":{"network/fetch.c":["ex/v0.23.2/network/fetch.html#git_remote_stats-12"]}},"git_remote_autotag":{"type":"function","file":"remote.h","line":713,"lineto":713,"args":[{"name":"remote","type":"const git_remote *","comment":"the remote to query"}],"argline":"const git_remote *remote","sig":"const git_remote *","return":{"type":"git_remote_autotag_option_t","comment":" the auto-follow setting"},"description":"

Retrieve the tag auto-follow setting

\n","comments":"","group":"remote"},"git_remote_set_autotag":{"type":"function","file":"remote.h","line":725,"lineto":725,"args":[{"name":"repo","type":"git_repository *","comment":"the repository in which to make the change"},{"name":"remote","type":"const char *","comment":"the name of the remote"},{"name":"value","type":"git_remote_autotag_option_t","comment":"the new value to take."}],"argline":"git_repository *repo, const char *remote, git_remote_autotag_option_t value","sig":"git_repository *::const char *::git_remote_autotag_option_t","return":{"type":"int","comment":null},"description":"

Set the remote's tag following setting.

\n","comments":"

The change will be made in the configuration. No loaded remotes\n will be affected.

\n","group":"remote"},"git_remote_prune_refs":{"type":"function","file":"remote.h","line":732,"lineto":732,"args":[{"name":"remote","type":"const git_remote *","comment":"the remote to query"}],"argline":"const git_remote *remote","sig":"const git_remote *","return":{"type":"int","comment":" the ref-prune setting"},"description":"

Retrieve the ref-prune setting

\n","comments":"","group":"remote"},"git_remote_rename":{"type":"function","file":"remote.h","line":754,"lineto":758,"args":[{"name":"problems","type":"git_strarray *","comment":"non-default refspecs cannot be renamed and will be\n stored here for further processing by the caller. Always free this\n strarray on successful return."},{"name":"repo","type":"git_repository *","comment":"the repository in which to rename"},{"name":"name","type":"const char *","comment":"the current name of the remote"},{"name":"new_name","type":"const char *","comment":"the new name the remote should bear"}],"argline":"git_strarray *problems, git_repository *repo, const char *name, const char *new_name","sig":"git_strarray *::git_repository *::const char *::const char *","return":{"type":"int","comment":" 0, GIT_EINVALIDSPEC, GIT_EEXISTS or an error code"},"description":"

Give the remote a new name

\n","comments":"

All remote-tracking branches and configuration settings\n for the remote are updated.

\n\n

The new name will be checked for validity.\n See git_tag_create() for rules about valid names.

\n\n

No loaded instances of a the remote with the old name will change\n their name or their list of refspecs.

\n","group":"remote","examples":{"remote.c":["ex/v0.23.2/remote.html#git_remote_rename-12"]}},"git_remote_is_valid_name":{"type":"function","file":"remote.h","line":766,"lineto":766,"args":[{"name":"remote_name","type":"const char *","comment":"name to be checked."}],"argline":"const char *remote_name","sig":"const char *","return":{"type":"int","comment":" 1 if the reference name is acceptable; 0 if it isn't"},"description":"

Ensure the remote name is well-formed.

\n","comments":"","group":"remote"},"git_remote_delete":{"type":"function","file":"remote.h","line":778,"lineto":778,"args":[{"name":"repo","type":"git_repository *","comment":"the repository in which to act"},{"name":"name","type":"const char *","comment":"the name of the remove to delete"}],"argline":"git_repository *repo, const char *name","sig":"git_repository *::const char *","return":{"type":"int","comment":" 0 on success, or an error code."},"description":"

Delete an existing persisted remote.

\n","comments":"

All remote-tracking branches and configuration settings\n for the remote will be removed.

\n","group":"remote","examples":{"remote.c":["ex/v0.23.2/remote.html#git_remote_delete-13"]}},"git_remote_default_branch":{"type":"function","file":"remote.h","line":796,"lineto":796,"args":[{"name":"out","type":"git_buf *","comment":"the buffern in which to store the reference name"},{"name":"remote","type":"git_remote *","comment":"the remote"}],"argline":"git_buf *out, git_remote *remote","sig":"git_buf *::git_remote *","return":{"type":"int","comment":" 0, GIT_ENOTFOUND if the remote does not have any references\n or none of them point to HEAD's commit, or an error message."},"description":"

Retrieve the name of the remote's default branch

\n","comments":"

The default branch of a repository is the branch which HEAD points\n to. If the remote does not support reporting this information\n directly, it performs the guess as git does; that is, if there are\n multiple branches which point to the same commit, the first one is\n chosen. If the master branch is a candidate, it wins.

\n\n

This function must only be called after connecting.

\n","group":"remote"},"git_repository_open":{"type":"function","file":"repository.h","line":37,"lineto":37,"args":[{"name":"out","type":"git_repository **","comment":"pointer to the repo which will be opened"},{"name":"path","type":"const char *","comment":"the path to the repository"}],"argline":"git_repository **out, const char *path","sig":"git_repository **::const char *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Open a git repository.

\n","comments":"

The 'path' argument must point to either a git repository\n folder, or an existing work dir.

\n\n

The method will automatically detect if 'path' is a normal\n or bare repository or fail is 'path' is neither.

\n","group":"repository","examples":{"general.c":["ex/v0.23.2/general.html#git_repository_open-58"],"network/git2.c":["ex/v0.23.2/network/git2.html#git_repository_open-5"],"remote.c":["ex/v0.23.2/remote.html#git_repository_open-14"]}},"git_repository_wrap_odb":{"type":"function","file":"repository.h","line":50,"lineto":50,"args":[{"name":"out","type":"git_repository **","comment":"pointer to the repo"},{"name":"odb","type":"git_odb *","comment":"the object database to wrap"}],"argline":"git_repository **out, git_odb *odb","sig":"git_repository **::git_odb *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Create a "fake" repository to wrap an object database

\n","comments":"

Create a repository object to wrap an object database to be used\n with the API when all you have is an object database. This doesn't\n have any paths associated with it, so use with care.

\n","group":"repository"},"git_repository_discover":{"type":"function","file":"repository.h","line":78,"lineto":82,"args":[{"name":"out","type":"git_buf *","comment":"A pointer to a user-allocated git_buf which will contain\n the found path."},{"name":"start_path","type":"const char *","comment":"The base path where the lookup starts."},{"name":"across_fs","type":"int","comment":"If true, then the lookup will not stop when a\n filesystem device change is detected while exploring parent directories."},{"name":"ceiling_dirs","type":"const char *","comment":"A GIT_PATH_LIST_SEPARATOR separated list of\n absolute symbolic link free paths. The lookup will stop when any\n of this paths is reached. Note that the lookup always performs on\n start_path no matter start_path appears in ceiling_dirs ceiling_dirs\n might be NULL (which is equivalent to an empty string)"}],"argline":"git_buf *out, const char *start_path, int across_fs, const char *ceiling_dirs","sig":"git_buf *::const char *::int::const char *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Look for a git repository and copy its path in the given buffer.\n The lookup start from base_path and walk across parent directories\n if nothing has been found. The lookup ends when the first repository\n is found, or when reaching a directory referenced in ceiling_dirs\n or when the filesystem changes (in case across_fs is true).

\n","comments":"

The method will automatically detect if the repository is bare\n (if there is a repository).

\n","group":"repository","examples":{"remote.c":["ex/v0.23.2/remote.html#git_repository_discover-15"]}},"git_repository_open_ext":{"type":"function","file":"repository.h","line":122,"lineto":126,"args":[{"name":"out","type":"git_repository **","comment":"Pointer to the repo which will be opened. This can\n actually be NULL if you only want to use the error code to\n see if a repo at this path could be opened."},{"name":"path","type":"const char *","comment":"Path to open as git repository. If the flags\n permit \"searching\", then this can be a path to a subdirectory\n inside the working directory of the repository."},{"name":"flags","type":"unsigned int","comment":"A combination of the GIT_REPOSITORY_OPEN flags above."},{"name":"ceiling_dirs","type":"const char *","comment":"A GIT_PATH_LIST_SEPARATOR delimited list of path\n prefixes at which the search for a containing repository should\n terminate."}],"argline":"git_repository **out, const char *path, unsigned int flags, const char *ceiling_dirs","sig":"git_repository **::const char *::unsigned int::const char *","return":{"type":"int","comment":" 0 on success, GIT_ENOTFOUND if no repository could be found,\n or -1 if there was a repository but open failed for some reason\n (such as repo corruption or system errors)."},"description":"

Find and open a repository with extended controls.

\n","comments":"","group":"repository","examples":{"blame.c":["ex/v0.23.2/blame.html#git_repository_open_ext-24"],"cat-file.c":["ex/v0.23.2/cat-file.html#git_repository_open_ext-31"],"describe.c":["ex/v0.23.2/describe.html#git_repository_open_ext-6"],"diff.c":["ex/v0.23.2/diff.html#git_repository_open_ext-15"],"log.c":["ex/v0.23.2/log.html#git_repository_open_ext-44","ex/v0.23.2/log.html#git_repository_open_ext-45"],"rev-parse.c":["ex/v0.23.2/rev-parse.html#git_repository_open_ext-16"],"status.c":["ex/v0.23.2/status.html#git_repository_open_ext-5"],"tag.c":["ex/v0.23.2/tag.html#git_repository_open_ext-11"]}},"git_repository_open_bare":{"type":"function","file":"repository.h","line":139,"lineto":139,"args":[{"name":"out","type":"git_repository **","comment":"Pointer to the repo which will be opened."},{"name":"bare_path","type":"const char *","comment":"Direct path to the bare repository"}],"argline":"git_repository **out, const char *bare_path","sig":"git_repository **::const char *","return":{"type":"int","comment":" 0 on success, or an error code"},"description":"

Open a bare repository on the serverside.

\n","comments":"

This is a fast open for bare repositories that will come in handy\n if you're e.g. hosting git repositories and need to access them\n efficiently

\n","group":"repository"},"git_repository_free":{"type":"function","file":"repository.h","line":152,"lineto":152,"args":[{"name":"repo","type":"git_repository *","comment":"repository handle to close. If NULL nothing occurs."}],"argline":"git_repository *repo","sig":"git_repository *","return":{"type":"void","comment":null},"description":"

Free a previously allocated repository

\n","comments":"

Note that after a repository is free'd, all the objects it has spawned\n will still exist until they are manually closed by the user\n with git_object_free, but accessing any of the attributes of\n an object without a backing repository will result in undefined\n behavior

\n","group":"repository","examples":{"blame.c":["ex/v0.23.2/blame.html#git_repository_free-25"],"cat-file.c":["ex/v0.23.2/cat-file.html#git_repository_free-32"],"describe.c":["ex/v0.23.2/describe.html#git_repository_free-7"],"diff.c":["ex/v0.23.2/diff.html#git_repository_free-16"],"general.c":["ex/v0.23.2/general.html#git_repository_free-59"],"init.c":["ex/v0.23.2/init.html#git_repository_free-6"],"log.c":["ex/v0.23.2/log.html#git_repository_free-46"],"network/clone.c":["ex/v0.23.2/network/clone.html#git_repository_free-3"],"network/git2.c":["ex/v0.23.2/network/git2.html#git_repository_free-6"],"rev-parse.c":["ex/v0.23.2/rev-parse.html#git_repository_free-17"],"status.c":["ex/v0.23.2/status.html#git_repository_free-6"],"tag.c":["ex/v0.23.2/tag.html#git_repository_free-12"]}},"git_repository_init":{"type":"function","file":"repository.h","line":169,"lineto":172,"args":[{"name":"out","type":"git_repository **","comment":"pointer to the repo which will be created or reinitialized"},{"name":"path","type":"const char *","comment":"the path to the repository"},{"name":"is_bare","type":"unsigned int","comment":"if true, a Git repository without a working directory is\n\t\tcreated at the pointed path. If false, provided path will be\n\t\tconsidered as the working directory into which the .git directory\n\t\twill be created."}],"argline":"git_repository **out, const char *path, unsigned int is_bare","sig":"git_repository **::const char *::unsigned int","return":{"type":"int","comment":" 0 or an error code"},"description":"

Creates a new Git repository in the given folder.

\n","comments":"

TODO:\n - Reinit the repository

\n","group":"repository","examples":{"init.c":["ex/v0.23.2/init.html#git_repository_init-7"]}},"git_repository_init_init_options":{"type":"function","file":"repository.h","line":281,"lineto":283,"args":[{"name":"opts","type":"git_repository_init_options *","comment":"the `git_repository_init_options` struct to initialize"},{"name":"version","type":"unsigned int","comment":"Version of struct; pass `GIT_REPOSITORY_INIT_OPTIONS_VERSION`"}],"argline":"git_repository_init_options *opts, unsigned int version","sig":"git_repository_init_options *::unsigned int","return":{"type":"int","comment":" Zero on success; -1 on failure."},"description":"

Initializes a git_repository_init_options with default values. Equivalent\n to creating an instance with GIT_REPOSITORY_INIT_OPTIONS_INIT.

\n","comments":"","group":"repository"},"git_repository_init_ext":{"type":"function","file":"repository.h","line":298,"lineto":301,"args":[{"name":"out","type":"git_repository **","comment":"Pointer to the repo which will be created or reinitialized."},{"name":"repo_path","type":"const char *","comment":"The path to the repository."},{"name":"opts","type":"git_repository_init_options *","comment":"Pointer to git_repository_init_options struct."}],"argline":"git_repository **out, const char *repo_path, git_repository_init_options *opts","sig":"git_repository **::const char *::git_repository_init_options *","return":{"type":"int","comment":" 0 or an error code on failure."},"description":"

Create a new Git repository in the given folder with extended controls.

\n","comments":"

This will initialize a new git repository (creating the repo_path\n if requested by flags) and working directory as needed. It will\n auto-detect the case sensitivity of the file system and if the\n file system supports file mode bits correctly.

\n","group":"repository","examples":{"init.c":["ex/v0.23.2/init.html#git_repository_init_ext-8"]}},"git_repository_head":{"type":"function","file":"repository.h","line":316,"lineto":316,"args":[{"name":"out","type":"git_reference **","comment":"pointer to the reference which will be retrieved"},{"name":"repo","type":"git_repository *","comment":"a repository object"}],"argline":"git_reference **out, git_repository *repo","sig":"git_reference **::git_repository *","return":{"type":"int","comment":" 0 on success, GIT_EUNBORNBRANCH when HEAD points to a non existing\n branch, GIT_ENOTFOUND when HEAD is missing; an error code otherwise"},"description":"

Retrieve and resolve the reference pointed at by HEAD.

\n","comments":"

The returned git_reference will be owned by caller and\n git_reference_free() must be called when done with it to release the\n allocated memory and prevent a leak.

\n","group":"repository","examples":{"status.c":["ex/v0.23.2/status.html#git_repository_head-7"]}},"git_repository_head_detached":{"type":"function","file":"repository.h","line":328,"lineto":328,"args":[{"name":"repo","type":"git_repository *","comment":"Repo to test"}],"argline":"git_repository *repo","sig":"git_repository *","return":{"type":"int","comment":" 1 if HEAD is detached, 0 if it's not; error code if there\n was an error."},"description":"

Check if a repository's HEAD is detached

\n","comments":"

A repository's HEAD is detached when it points directly to a commit\n instead of a branch.

\n","group":"repository"},"git_repository_head_unborn":{"type":"function","file":"repository.h","line":340,"lineto":340,"args":[{"name":"repo","type":"git_repository *","comment":"Repo to test"}],"argline":"git_repository *repo","sig":"git_repository *","return":{"type":"int","comment":" 1 if the current branch is unborn, 0 if it's not; error\n code if there was an error"},"description":"

Check if the current branch is unborn

\n","comments":"

An unborn branch is one named from HEAD but which doesn't exist in\n the refs namespace, because it doesn't have any commit to point to.

\n","group":"repository"},"git_repository_is_empty":{"type":"function","file":"repository.h","line":352,"lineto":352,"args":[{"name":"repo","type":"git_repository *","comment":"Repo to test"}],"argline":"git_repository *repo","sig":"git_repository *","return":{"type":"int","comment":" 1 if the repository is empty, 0 if it isn't, error code\n if the repository is corrupted"},"description":"

Check if a repository is empty

\n","comments":"

An empty repository has just been initialized and contains no references\n apart from HEAD, which must be pointing to the unborn master branch.

\n","group":"repository"},"git_repository_path":{"type":"function","file":"repository.h","line":363,"lineto":363,"args":[{"name":"repo","type":"git_repository *","comment":"A repository object"}],"argline":"git_repository *repo","sig":"git_repository *","return":{"type":"const char *","comment":" the path to the repository"},"description":"

Get the path of this repository

\n","comments":"

This is the path of the .git folder for normal repositories,\n or of the repository itself for bare repositories.

\n","group":"repository","examples":{"init.c":["ex/v0.23.2/init.html#git_repository_path-9"],"status.c":["ex/v0.23.2/status.html#git_repository_path-8"]}},"git_repository_workdir":{"type":"function","file":"repository.h","line":374,"lineto":374,"args":[{"name":"repo","type":"git_repository *","comment":"A repository object"}],"argline":"git_repository *repo","sig":"git_repository *","return":{"type":"const char *","comment":" the path to the working dir, if it exists"},"description":"

Get the path of the working directory for this repository

\n","comments":"

If the repository is bare, this function will always return\n NULL.

\n","group":"repository","examples":{"init.c":["ex/v0.23.2/init.html#git_repository_workdir-10"]}},"git_repository_set_workdir":{"type":"function","file":"repository.h","line":393,"lineto":394,"args":[{"name":"repo","type":"git_repository *","comment":"A repository object"},{"name":"workdir","type":"const char *","comment":"The path to a working directory"},{"name":"update_gitlink","type":"int","comment":"Create/update gitlink in workdir and set config\n \"core.worktree\" (if workdir is not the parent of the .git directory)"}],"argline":"git_repository *repo, const char *workdir, int update_gitlink","sig":"git_repository *::const char *::int","return":{"type":"int","comment":" 0, or an error code"},"description":"

Set the path to the working directory for this repository

\n","comments":"

The working directory doesn't need to be the same one\n that contains the .git folder for this repository.

\n\n

If this repository is bare, setting its working directory\n will turn it into a normal repository, capable of performing\n all the common workdir operations (checkout, status, index\n manipulation, etc).

\n","group":"repository"},"git_repository_is_bare":{"type":"function","file":"repository.h","line":402,"lineto":402,"args":[{"name":"repo","type":"git_repository *","comment":"Repo to test"}],"argline":"git_repository *repo","sig":"git_repository *","return":{"type":"int","comment":" 1 if the repository is bare, 0 otherwise."},"description":"

Check if a repository is bare

\n","comments":"","group":"repository","examples":{"status.c":["ex/v0.23.2/status.html#git_repository_is_bare-9"]}},"git_repository_config":{"type":"function","file":"repository.h","line":418,"lineto":418,"args":[{"name":"out","type":"git_config **","comment":"Pointer to store the loaded configuration"},{"name":"repo","type":"git_repository *","comment":"A repository object"}],"argline":"git_config **out, git_repository *repo","sig":"git_config **::git_repository *","return":{"type":"int","comment":" 0, or an error code"},"description":"

Get the configuration file for this repository.

\n","comments":"

If a configuration file has not been set, the default\n config set for the repository will be returned, including\n global and system configurations (if they are available).

\n\n

The configuration file must be freed once it's no longer\n being used by the user.

\n","group":"repository"},"git_repository_config_snapshot":{"type":"function","file":"repository.h","line":434,"lineto":434,"args":[{"name":"out","type":"git_config **","comment":"Pointer to store the loaded configuration"},{"name":"repo","type":"git_repository *","comment":"the repository"}],"argline":"git_config **out, git_repository *repo","sig":"git_config **::git_repository *","return":{"type":"int","comment":" 0, or an error code"},"description":"

Get a snapshot of the repository's configuration

\n","comments":"

Convenience function to take a snapshot from the repository's\n configuration. The contents of this snapshot will not change,\n even if the underlying config files are modified.

\n\n

The configuration file must be freed once it's no longer\n being used by the user.

\n","group":"repository"},"git_repository_odb":{"type":"function","file":"repository.h","line":450,"lineto":450,"args":[{"name":"out","type":"git_odb **","comment":"Pointer to store the loaded ODB"},{"name":"repo","type":"git_repository *","comment":"A repository object"}],"argline":"git_odb **out, git_repository *repo","sig":"git_odb **::git_repository *","return":{"type":"int","comment":" 0, or an error code"},"description":"

Get the Object Database for this repository.

\n","comments":"

If a custom ODB has not been set, the default\n database for the repository will be returned (the one\n located in .git/objects).

\n\n

The ODB must be freed once it's no longer being used by\n the user.

\n","group":"repository","examples":{"cat-file.c":["ex/v0.23.2/cat-file.html#git_repository_odb-33"],"general.c":["ex/v0.23.2/general.html#git_repository_odb-60"]}},"git_repository_refdb":{"type":"function","file":"repository.h","line":466,"lineto":466,"args":[{"name":"out","type":"git_refdb **","comment":"Pointer to store the loaded refdb"},{"name":"repo","type":"git_repository *","comment":"A repository object"}],"argline":"git_refdb **out, git_repository *repo","sig":"git_refdb **::git_repository *","return":{"type":"int","comment":" 0, or an error code"},"description":"

Get the Reference Database Backend for this repository.

\n","comments":"

If a custom refsdb has not been set, the default database for\n the repository will be returned (the one that manipulates loose\n and packed references in the .git directory).

\n\n

The refdb must be freed once it's no longer being used by\n the user.

\n","group":"repository"},"git_repository_index":{"type":"function","file":"repository.h","line":482,"lineto":482,"args":[{"name":"out","type":"git_index **","comment":"Pointer to store the loaded index"},{"name":"repo","type":"git_repository *","comment":"A repository object"}],"argline":"git_index **out, git_repository *repo","sig":"git_index **::git_repository *","return":{"type":"int","comment":" 0, or an error code"},"description":"

Get the Index file for this repository.

\n","comments":"

If a custom index has not been set, the default\n index for the repository will be returned (the one\n located in .git/index).

\n\n

The index must be freed once it's no longer being used by\n the user.

\n","group":"repository","examples":{"general.c":["ex/v0.23.2/general.html#git_repository_index-61"],"init.c":["ex/v0.23.2/init.html#git_repository_index-11"]}},"git_repository_message":{"type":"function","file":"repository.h","line":500,"lineto":500,"args":[{"name":"out","type":"git_buf *","comment":"git_buf to write data into"},{"name":"repo","type":"git_repository *","comment":"Repository to read prepared message from"}],"argline":"git_buf *out, git_repository *repo","sig":"git_buf *::git_repository *","return":{"type":"int","comment":" 0, GIT_ENOTFOUND if no message exists or an error code"},"description":"

Retrieve git's prepared message

\n","comments":"

Operations such as git revert/cherry-pick/merge with the -n option\n stop just short of creating a commit with the changes and save\n their prepared message in .git/MERGE_MSG so the next git-commit\n execution can present it to the user for them to amend if they\n wish.

\n\n

Use this function to get the contents of this file. Don't forget to\n remove the file after you create the commit.

\n","group":"repository"},"git_repository_message_remove":{"type":"function","file":"repository.h","line":507,"lineto":507,"args":[{"name":"repo","type":"git_repository *","comment":null}],"argline":"git_repository *repo","sig":"git_repository *","return":{"type":"int","comment":null},"description":"

Remove git's prepared message.

\n","comments":"

Remove the message that git_repository_message retrieves.

\n","group":"repository"},"git_repository_state_cleanup":{"type":"function","file":"repository.h","line":516,"lineto":516,"args":[{"name":"repo","type":"git_repository *","comment":"A repository object"}],"argline":"git_repository *repo","sig":"git_repository *","return":{"type":"int","comment":" 0 on success, or error"},"description":"

Remove all the metadata associated with an ongoing command like merge,\n revert, cherry-pick, etc. For example: MERGE_HEAD, MERGE_MSG, etc.

\n","comments":"","group":"repository"},"git_repository_fetchhead_foreach":{"type":"function","file":"repository.h","line":535,"lineto":538,"args":[{"name":"repo","type":"git_repository *","comment":"A repository object"},{"name":"callback","type":"git_repository_fetchhead_foreach_cb","comment":"Callback function"},{"name":"payload","type":"void *","comment":"Pointer to callback data (optional)"}],"argline":"git_repository *repo, git_repository_fetchhead_foreach_cb callback, void *payload","sig":"git_repository *::git_repository_fetchhead_foreach_cb::void *","return":{"type":"int","comment":" 0 on success, non-zero callback return value, GIT_ENOTFOUND if\n there is no FETCH_HEAD file, or other error code."},"description":"

Invoke 'callback' for each entry in the given FETCH_HEAD file.

\n","comments":"

Return a non-zero value from the callback to stop the loop.

\n","group":"repository"},"git_repository_mergehead_foreach":{"type":"function","file":"repository.h","line":555,"lineto":558,"args":[{"name":"repo","type":"git_repository *","comment":"A repository object"},{"name":"callback","type":"git_repository_mergehead_foreach_cb","comment":"Callback function"},{"name":"payload","type":"void *","comment":"Pointer to callback data (optional)"}],"argline":"git_repository *repo, git_repository_mergehead_foreach_cb callback, void *payload","sig":"git_repository *::git_repository_mergehead_foreach_cb::void *","return":{"type":"int","comment":" 0 on success, non-zero callback return value, GIT_ENOTFOUND if\n there is no MERGE_HEAD file, or other error code."},"description":"

If a merge is in progress, invoke 'callback' for each commit ID in the\n MERGE_HEAD file.

\n","comments":"

Return a non-zero value from the callback to stop the loop.

\n","group":"repository"},"git_repository_hashfile":{"type":"function","file":"repository.h","line":583,"lineto":588,"args":[{"name":"out","type":"git_oid *","comment":"Output value of calculated SHA"},{"name":"repo","type":"git_repository *","comment":"Repository pointer"},{"name":"path","type":"const char *","comment":"Path to file on disk whose contents should be hashed. If the\n repository is not NULL, this can be a relative path."},{"name":"type","type":"git_otype","comment":"The object type to hash as (e.g. GIT_OBJ_BLOB)"},{"name":"as_path","type":"const char *","comment":"The path to use to look up filtering rules. If this is\n NULL, then the `path` parameter will be used instead. If\n this is passed as the empty string, then no filters will be\n applied when calculating the hash."}],"argline":"git_oid *out, git_repository *repo, const char *path, git_otype type, const char *as_path","sig":"git_oid *::git_repository *::const char *::git_otype::const char *","return":{"type":"int","comment":" 0 on success, or an error code"},"description":"

Calculate hash of file using repository filtering rules.

\n","comments":"

If you simply want to calculate the hash of a file on disk with no filters,\n you can just use the git_odb_hashfile() API. However, if you want to\n hash a file in the repository and you want to apply filtering rules (e.g.\n crlf filters) before generating the SHA, then use this function.

\n\n

Note: if the repository has core.safecrlf set to fail and the\n filtering triggers that failure, then this function will return an\n error and not calculate the hash of the file.

\n","group":"repository"},"git_repository_set_head":{"type":"function","file":"repository.h","line":608,"lineto":610,"args":[{"name":"repo","type":"git_repository *","comment":"Repository pointer"},{"name":"refname","type":"const char *","comment":"Canonical name of the reference the HEAD should point at"}],"argline":"git_repository *repo, const char *refname","sig":"git_repository *::const char *","return":{"type":"int","comment":" 0 on success, or an error code"},"description":"

Make the repository HEAD point to the specified reference.

\n","comments":"

If the provided reference points to a Tree or a Blob, the HEAD is\n unaltered and -1 is returned.

\n\n

If the provided reference points to a branch, the HEAD will point\n to that branch, staying attached, or become attached if it isn't yet.\n If the branch doesn't exist yet, no error will be return. The HEAD\n will then be attached to an unborn branch.

\n\n

Otherwise, the HEAD will be detached and will directly point to\n the Commit.

\n","group":"repository"},"git_repository_set_head_detached":{"type":"function","file":"repository.h","line":628,"lineto":630,"args":[{"name":"repo","type":"git_repository *","comment":"Repository pointer"},{"name":"commitish","type":"const git_oid *","comment":"Object id of the Commit the HEAD should point to"}],"argline":"git_repository *repo, const git_oid *commitish","sig":"git_repository *::const git_oid *","return":{"type":"int","comment":" 0 on success, or an error code"},"description":"

Make the repository HEAD directly point to the Commit.

\n","comments":"

If the provided committish cannot be found in the repository, the HEAD\n is unaltered and GIT_ENOTFOUND is returned.

\n\n

If the provided commitish cannot be peeled into a commit, the HEAD\n is unaltered and -1 is returned.

\n\n

Otherwise, the HEAD will eventually be detached and will directly point to\n the peeled Commit.

\n","group":"repository"},"git_repository_set_head_detached_from_annotated":{"type":"function","file":"repository.h","line":644,"lineto":646,"args":[{"name":"repo","type":"git_repository *","comment":null},{"name":"commitish","type":"const git_annotated_commit *","comment":null}],"argline":"git_repository *repo, const git_annotated_commit *commitish","sig":"git_repository *::const git_annotated_commit *","return":{"type":"int","comment":null},"description":"

Make the repository HEAD directly point to the Commit.

\n","comments":"

This behaves like git_repository_set_head_detached() but takes an\n annotated commit, which lets you specify which extended sha syntax\n string was specified by a user, allowing for more exact reflog\n messages.

\n\n

See the documentation for git_repository_set_head_detached().

\n","group":"repository"},"git_repository_detach_head":{"type":"function","file":"repository.h","line":665,"lineto":666,"args":[{"name":"repo","type":"git_repository *","comment":"Repository pointer"}],"argline":"git_repository *repo","sig":"git_repository *","return":{"type":"int","comment":" 0 on success, GIT_EUNBORNBRANCH when HEAD points to a non existing\n branch or an error code"},"description":"

Detach the HEAD.

\n","comments":"

If the HEAD is already detached and points to a Commit, 0 is returned.

\n\n

If the HEAD is already detached and points to a Tag, the HEAD is\n updated into making it point to the peeled Commit, and 0 is returned.

\n\n

If the HEAD is already detached and points to a non commitish, the HEAD is\n unaltered, and -1 is returned.

\n\n

Otherwise, the HEAD will be detached and point to the peeled Commit.

\n","group":"repository"},"git_repository_state":{"type":"function","file":"repository.h","line":694,"lineto":694,"args":[{"name":"repo","type":"git_repository *","comment":"Repository pointer"}],"argline":"git_repository *repo","sig":"git_repository *","return":{"type":"int","comment":" The state of the repository"},"description":"

Determines the status of a git repository - ie, whether an operation\n (merge, cherry-pick, etc) is in progress.

\n","comments":"","group":"repository"},"git_repository_set_namespace":{"type":"function","file":"repository.h","line":708,"lineto":708,"args":[{"name":"repo","type":"git_repository *","comment":"The repo"},{"name":"nmspace","type":"const char *","comment":"The namespace. This should not include the refs\n\tfolder, e.g. to namespace all references under `refs/namespaces/foo/`,\n\tuse `foo` as the namespace."}],"argline":"git_repository *repo, const char *nmspace","sig":"git_repository *::const char *","return":{"type":"int","comment":" 0 on success, -1 on error"},"description":"

Sets the active namespace for this Git Repository

\n","comments":"

This namespace affects all reference operations for the repo.\n See man gitnamespaces

\n","group":"repository"},"git_repository_get_namespace":{"type":"function","file":"repository.h","line":716,"lineto":716,"args":[{"name":"repo","type":"git_repository *","comment":"The repo"}],"argline":"git_repository *repo","sig":"git_repository *","return":{"type":"const char *","comment":" the active namespace, or NULL if there isn't one"},"description":"

Get the currently active namespace for this repository

\n","comments":"","group":"repository"},"git_repository_is_shallow":{"type":"function","file":"repository.h","line":725,"lineto":725,"args":[{"name":"repo","type":"git_repository *","comment":"The repository"}],"argline":"git_repository *repo","sig":"git_repository *","return":{"type":"int","comment":" 1 if shallow, zero if not"},"description":"

Determine if the repository was a shallow clone

\n","comments":"","group":"repository"},"git_repository_ident":{"type":"function","file":"repository.h","line":737,"lineto":737,"args":[{"name":"name","type":"const char **","comment":"where to store the pointer to the name"},{"name":"email","type":"const char **","comment":"where to store the pointer to the email"},{"name":"repo","type":"const git_repository *","comment":"the repository"}],"argline":"const char **name, const char **email, const git_repository *repo","sig":"const char **::const char **::const git_repository *","return":{"type":"int","comment":null},"description":"

Retrieve the configured identity to use for reflogs

\n","comments":"

The memory is owned by the repository and must not be freed by the\n user.

\n","group":"repository"},"git_repository_set_ident":{"type":"function","file":"repository.h","line":750,"lineto":750,"args":[{"name":"repo","type":"git_repository *","comment":"the repository to configure"},{"name":"name","type":"const char *","comment":"the name to use for the reflog entries"},{"name":"email","type":"const char *","comment":"the email to use for the reflog entries"}],"argline":"git_repository *repo, const char *name, const char *email","sig":"git_repository *::const char *::const char *","return":{"type":"int","comment":null},"description":"

Set the identity to be used for writing reflogs

\n","comments":"

If both are set, this name and email will be used to write to the\n reflog. Pass NULL to unset. When unset, the identity will be taken\n from the repository's configuration.

\n","group":"repository"},"git_reset":{"type":"function","file":"reset.h","line":62,"lineto":66,"args":[{"name":"repo","type":"git_repository *","comment":"Repository where to perform the reset operation."},{"name":"target","type":"git_object *","comment":"Committish to which the Head should be moved to. This object\n must belong to the given `repo` and can either be a git_commit or a\n git_tag. When a git_tag is being passed, it should be dereferencable\n to a git_commit which oid will be used as the target of the branch."},{"name":"reset_type","type":"git_reset_t","comment":"Kind of reset operation to perform."},{"name":"checkout_opts","type":"const git_checkout_options *","comment":"Checkout options to be used for a HARD reset.\n The checkout_strategy field will be overridden (based on reset_type).\n This parameter can be used to propagate notify and progress callbacks."}],"argline":"git_repository *repo, git_object *target, git_reset_t reset_type, const git_checkout_options *checkout_opts","sig":"git_repository *::git_object *::git_reset_t::const git_checkout_options *","return":{"type":"int","comment":" 0 on success or an error code"},"description":"

Sets the current head to the specified commit oid and optionally\n resets the index and working tree to match.

\n","comments":"

SOFT reset means the Head will be moved to the commit.

\n\n

MIXED reset will trigger a SOFT reset, plus the index will be replaced\n with the content of the commit tree.

\n\n

HARD reset will trigger a MIXED reset and the working directory will be\n replaced with the content of the index. (Untracked and ignored files\n will be left alone, however.)

\n\n

TODO: Implement remaining kinds of resets.

\n","group":"reset"},"git_reset_from_annotated":{"type":"function","file":"reset.h","line":80,"lineto":84,"args":[{"name":"repo","type":"git_repository *","comment":null},{"name":"commit","type":"git_annotated_commit *","comment":null},{"name":"reset_type","type":"git_reset_t","comment":null},{"name":"checkout_opts","type":"const git_checkout_options *","comment":null}],"argline":"git_repository *repo, git_annotated_commit *commit, git_reset_t reset_type, const git_checkout_options *checkout_opts","sig":"git_repository *::git_annotated_commit *::git_reset_t::const git_checkout_options *","return":{"type":"int","comment":null},"description":"

Sets the current head to the specified commit oid and optionally\n resets the index and working tree to match.

\n","comments":"

This behaves like git_reset() but takes an annotated commit,\n which lets you specify which extended sha syntax string was\n specified by a user, allowing for more exact reflog messages.

\n\n

See the documentation for git_reset().

\n","group":"reset"},"git_reset_default":{"type":"function","file":"reset.h","line":104,"lineto":107,"args":[{"name":"repo","type":"git_repository *","comment":"Repository where to perform the reset operation."},{"name":"target","type":"git_object *","comment":"The committish which content will be used to reset the content\n of the index."},{"name":"pathspecs","type":"git_strarray *","comment":"List of pathspecs to operate on."}],"argline":"git_repository *repo, git_object *target, git_strarray *pathspecs","sig":"git_repository *::git_object *::git_strarray *","return":{"type":"int","comment":" 0 on success or an error code \n<\n 0"},"description":"

Updates some entries in the index from the target commit tree.

\n","comments":"

The scope of the updated entries is determined by the paths\n being passed in the pathspec parameters.

\n\n

Passing a NULL target will result in removing\n entries in the index matching the provided pathspecs.

\n","group":"reset"},"git_revert_init_options":{"type":"function","file":"revert.h","line":47,"lineto":49,"args":[{"name":"opts","type":"git_revert_options *","comment":"the `git_revert_options` struct to initialize"},{"name":"version","type":"unsigned int","comment":"Version of struct; pass `GIT_REVERT_OPTIONS_VERSION`"}],"argline":"git_revert_options *opts, unsigned int version","sig":"git_revert_options *::unsigned int","return":{"type":"int","comment":" Zero on success; -1 on failure."},"description":"

Initializes a git_revert_options with default values. Equivalent to\n creating an instance with GIT_REVERT_OPTIONS_INIT.

\n","comments":"","group":"revert"},"git_revert_commit":{"type":"function","file":"revert.h","line":65,"lineto":71,"args":[{"name":"out","type":"git_index **","comment":"pointer to store the index result in"},{"name":"repo","type":"git_repository *","comment":"the repository that contains the given commits"},{"name":"revert_commit","type":"git_commit *","comment":"the commit to revert"},{"name":"our_commit","type":"git_commit *","comment":"the commit to revert against (eg, HEAD)"},{"name":"mainline","type":"unsigned int","comment":"the parent of the revert commit, if it is a merge"},{"name":"merge_options","type":"const git_merge_options *","comment":"the merge options (or null for defaults)"}],"argline":"git_index **out, git_repository *repo, git_commit *revert_commit, git_commit *our_commit, unsigned int mainline, const git_merge_options *merge_options","sig":"git_index **::git_repository *::git_commit *::git_commit *::unsigned int::const git_merge_options *","return":{"type":"int","comment":" zero on success, -1 on failure."},"description":"

Reverts the given commit against the given "our" commit, producing an\n index that reflects the result of the revert.

\n","comments":"

The returned index must be freed explicitly with git_index_free.

\n","group":"revert"},"git_revert":{"type":"function","file":"revert.h","line":81,"lineto":84,"args":[{"name":"repo","type":"git_repository *","comment":"the repository to revert"},{"name":"commit","type":"git_commit *","comment":"the commit to revert"},{"name":"given_opts","type":"const git_revert_options *","comment":"merge flags"}],"argline":"git_repository *repo, git_commit *commit, const git_revert_options *given_opts","sig":"git_repository *::git_commit *::const git_revert_options *","return":{"type":"int","comment":" zero on success, -1 on failure."},"description":"

Reverts the given commit, producing changes in the index and working directory.

\n","comments":"","group":"revert"},"git_revparse_single":{"type":"function","file":"revparse.h","line":37,"lineto":38,"args":[{"name":"out","type":"git_object **","comment":"pointer to output object"},{"name":"repo","type":"git_repository *","comment":"the repository to search in"},{"name":"spec","type":"const char *","comment":"the textual specification for an object"}],"argline":"git_object **out, git_repository *repo, const char *spec","sig":"git_object **::git_repository *::const char *","return":{"type":"int","comment":" 0 on success, GIT_ENOTFOUND, GIT_EAMBIGUOUS, GIT_EINVALIDSPEC or an error code"},"description":"

Find a single object, as specified by a revision string.

\n","comments":"

See man gitrevisions, or\n http://git-scm.com/docs/git-rev-parse.html#_specifying_revisions for\n information on the syntax accepted.

\n\n

The returned object should be released with git_object_free when no\n longer needed.

\n","group":"revparse","examples":{"blame.c":["ex/v0.23.2/blame.html#git_revparse_single-26"],"cat-file.c":["ex/v0.23.2/cat-file.html#git_revparse_single-34"],"describe.c":["ex/v0.23.2/describe.html#git_revparse_single-8"],"log.c":["ex/v0.23.2/log.html#git_revparse_single-47"],"tag.c":["ex/v0.23.2/tag.html#git_revparse_single-13","ex/v0.23.2/tag.html#git_revparse_single-14","ex/v0.23.2/tag.html#git_revparse_single-15","ex/v0.23.2/tag.html#git_revparse_single-16"]}},"git_revparse_ext":{"type":"function","file":"revparse.h","line":61,"lineto":65,"args":[{"name":"object_out","type":"git_object **","comment":"pointer to output object"},{"name":"reference_out","type":"git_reference **","comment":"pointer to output reference or NULL"},{"name":"repo","type":"git_repository *","comment":"the repository to search in"},{"name":"spec","type":"const char *","comment":"the textual specification for an object"}],"argline":"git_object **object_out, git_reference **reference_out, git_repository *repo, const char *spec","sig":"git_object **::git_reference **::git_repository *::const char *","return":{"type":"int","comment":" 0 on success, GIT_ENOTFOUND, GIT_EAMBIGUOUS, GIT_EINVALIDSPEC\n or an error code"},"description":"

Find a single object and intermediate reference by a revision string.

\n","comments":"

See man gitrevisions, or\n http://git-scm.com/docs/git-rev-parse.html#_specifying_revisions for\n information on the syntax accepted.

\n\n

In some cases (\n@\n{\n<\n-n>} or `\n<branchname

\n\n
\n

@\n{upstream}), the expression may\n point to an intermediate reference. When such expressions are being passed\n in,reference_out` will be valued as well.

\n
\n\n

The returned object should be released with git_object_free and the\n returned reference with git_reference_free when no longer needed.

\n","group":"revparse"},"git_revparse":{"type":"function","file":"revparse.h","line":105,"lineto":108,"args":[{"name":"revspec","type":"git_revspec *","comment":"Pointer to an user-allocated git_revspec struct where\n\t the result of the rev-parse will be stored"},{"name":"repo","type":"git_repository *","comment":"the repository to search in"},{"name":"spec","type":"const char *","comment":"the rev-parse spec to parse"}],"argline":"git_revspec *revspec, git_repository *repo, const char *spec","sig":"git_revspec *::git_repository *::const char *","return":{"type":"int","comment":" 0 on success, GIT_INVALIDSPEC, GIT_ENOTFOUND, GIT_EAMBIGUOUS or an error code"},"description":"

Parse a revision string for from, to, and intent.

\n","comments":"

See man gitrevisions or\n http://git-scm.com/docs/git-rev-parse.html#_specifying_revisions for\n information on the syntax accepted.

\n","group":"revparse","examples":{"blame.c":["ex/v0.23.2/blame.html#git_revparse-27"],"log.c":["ex/v0.23.2/log.html#git_revparse-48"],"rev-parse.c":["ex/v0.23.2/rev-parse.html#git_revparse-18","ex/v0.23.2/rev-parse.html#git_revparse-19"]}},"git_revwalk_new":{"type":"function","file":"revwalk.h","line":75,"lineto":75,"args":[{"name":"out","type":"git_revwalk **","comment":"pointer to the new revision walker"},{"name":"repo","type":"git_repository *","comment":"the repo to walk through"}],"argline":"git_revwalk **out, git_repository *repo","sig":"git_revwalk **::git_repository *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Allocate a new revision walker to iterate through a repo.

\n","comments":"

This revision walker uses a custom memory pool and an internal\n commit cache, so it is relatively expensive to allocate.

\n\n

For maximum performance, this revision walker should be\n reused for different walks.

\n\n

This revision walker is not thread safe: it may only be\n used to walk a repository on a single thread; however,\n it is possible to have several revision walkers in\n several different threads walking the same repository.

\n","group":"revwalk","examples":{"general.c":["ex/v0.23.2/general.html#git_revwalk_new-62"],"log.c":["ex/v0.23.2/log.html#git_revwalk_new-49","ex/v0.23.2/log.html#git_revwalk_new-50"]}},"git_revwalk_reset":{"type":"function","file":"revwalk.h","line":90,"lineto":90,"args":[{"name":"walker","type":"git_revwalk *","comment":"handle to reset."}],"argline":"git_revwalk *walker","sig":"git_revwalk *","return":{"type":"void","comment":null},"description":"

Reset the revision walker for reuse.

\n","comments":"

This will clear all the pushed and hidden commits, and\n leave the walker in a blank state (just like at\n creation) ready to receive new commit pushes and\n start a new walk.

\n\n

The revision walk is automatically reset when a walk\n is over.

\n","group":"revwalk"},"git_revwalk_push":{"type":"function","file":"revwalk.h","line":109,"lineto":109,"args":[{"name":"walk","type":"git_revwalk *","comment":"the walker being used for the traversal."},{"name":"id","type":"const git_oid *","comment":"the oid of the commit to start from."}],"argline":"git_revwalk *walk, const git_oid *id","sig":"git_revwalk *::const git_oid *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Add a new root for the traversal

\n","comments":"

The pushed commit will be marked as one of the roots from which to\n start the walk. This commit may not be walked if it or a child is\n hidden.

\n\n

At least one commit must be pushed onto the walker before a walk\n can be started.

\n\n

The given id must belong to a committish on the walked\n repository.

\n","group":"revwalk","examples":{"general.c":["ex/v0.23.2/general.html#git_revwalk_push-63"],"log.c":["ex/v0.23.2/log.html#git_revwalk_push-51"]}},"git_revwalk_push_glob":{"type":"function","file":"revwalk.h","line":127,"lineto":127,"args":[{"name":"walk","type":"git_revwalk *","comment":"the walker being used for the traversal"},{"name":"glob","type":"const char *","comment":"the glob pattern references should match"}],"argline":"git_revwalk *walk, const char *glob","sig":"git_revwalk *::const char *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Push matching references

\n","comments":"

The OIDs pointed to by the references that match the given glob\n pattern will be pushed to the revision walker.

\n\n

A leading 'refs/' is implied if not present as well as a trailing\n '/\n\\\n*' if the glob lacks '?', '\n\\\n*' or '['.

\n\n

Any references matching this glob which do not point to a\n committish will be ignored.

\n","group":"revwalk"},"git_revwalk_push_head":{"type":"function","file":"revwalk.h","line":135,"lineto":135,"args":[{"name":"walk","type":"git_revwalk *","comment":"the walker being used for the traversal"}],"argline":"git_revwalk *walk","sig":"git_revwalk *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Push the repository's HEAD

\n","comments":"","group":"revwalk","examples":{"log.c":["ex/v0.23.2/log.html#git_revwalk_push_head-52"]}},"git_revwalk_hide":{"type":"function","file":"revwalk.h","line":150,"lineto":150,"args":[{"name":"walk","type":"git_revwalk *","comment":"the walker being used for the traversal."},{"name":"commit_id","type":"const git_oid *","comment":"the oid of commit that will be ignored during the traversal"}],"argline":"git_revwalk *walk, const git_oid *commit_id","sig":"git_revwalk *::const git_oid *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Mark a commit (and its ancestors) uninteresting for the output.

\n","comments":"

The given id must belong to a committish on the walked\n repository.

\n\n

The resolved commit and all its parents will be hidden from the\n output on the revision walk.

\n","group":"revwalk","examples":{"log.c":["ex/v0.23.2/log.html#git_revwalk_hide-53"]}},"git_revwalk_hide_glob":{"type":"function","file":"revwalk.h","line":169,"lineto":169,"args":[{"name":"walk","type":"git_revwalk *","comment":"the walker being used for the traversal"},{"name":"glob","type":"const char *","comment":"the glob pattern references should match"}],"argline":"git_revwalk *walk, const char *glob","sig":"git_revwalk *::const char *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Hide matching references.

\n","comments":"

The OIDs pointed to by the references that match the given glob\n pattern and their ancestors will be hidden from the output on the\n revision walk.

\n\n

A leading 'refs/' is implied if not present as well as a trailing\n '/\n\\\n*' if the glob lacks '?', '\n\\\n*' or '['.

\n\n

Any references matching this glob which do not point to a\n committish will be ignored.

\n","group":"revwalk"},"git_revwalk_hide_head":{"type":"function","file":"revwalk.h","line":177,"lineto":177,"args":[{"name":"walk","type":"git_revwalk *","comment":"the walker being used for the traversal"}],"argline":"git_revwalk *walk","sig":"git_revwalk *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Hide the repository's HEAD

\n","comments":"","group":"revwalk"},"git_revwalk_push_ref":{"type":"function","file":"revwalk.h","line":188,"lineto":188,"args":[{"name":"walk","type":"git_revwalk *","comment":"the walker being used for the traversal"},{"name":"refname","type":"const char *","comment":"the reference to push"}],"argline":"git_revwalk *walk, const char *refname","sig":"git_revwalk *::const char *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Push the OID pointed to by a reference

\n","comments":"

The reference must point to a committish.

\n","group":"revwalk"},"git_revwalk_hide_ref":{"type":"function","file":"revwalk.h","line":199,"lineto":199,"args":[{"name":"walk","type":"git_revwalk *","comment":"the walker being used for the traversal"},{"name":"refname","type":"const char *","comment":"the reference to hide"}],"argline":"git_revwalk *walk, const char *refname","sig":"git_revwalk *::const char *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Hide the OID pointed to by a reference

\n","comments":"

The reference must point to a committish.

\n","group":"revwalk"},"git_revwalk_next":{"type":"function","file":"revwalk.h","line":219,"lineto":219,"args":[{"name":"out","type":"git_oid *","comment":"Pointer where to store the oid of the next commit"},{"name":"walk","type":"git_revwalk *","comment":"the walker to pop the commit from."}],"argline":"git_oid *out, git_revwalk *walk","sig":"git_oid *::git_revwalk *","return":{"type":"int","comment":" 0 if the next commit was found;\n\tGIT_ITEROVER if there are no commits left to iterate"},"description":"

Get the next commit from the revision walk.

\n","comments":"

The initial call to this method is not blocking when\n iterating through a repo with a time-sorting mode.

\n\n

Iterating with Topological or inverted modes makes the initial\n call blocking to preprocess the commit list, but this block should be\n mostly unnoticeable on most repositories (topological preprocessing\n times at 0.3s on the git.git repo).

\n\n

The revision walker is reset when the walk is over.

\n","group":"revwalk","examples":{"general.c":["ex/v0.23.2/general.html#git_revwalk_next-64"],"log.c":["ex/v0.23.2/log.html#git_revwalk_next-54"]}},"git_revwalk_sorting":{"type":"function","file":"revwalk.h","line":230,"lineto":230,"args":[{"name":"walk","type":"git_revwalk *","comment":"the walker being used for the traversal."},{"name":"sort_mode","type":"unsigned int","comment":"combination of GIT_SORT_XXX flags"}],"argline":"git_revwalk *walk, unsigned int sort_mode","sig":"git_revwalk *::unsigned int","return":{"type":"void","comment":null},"description":"

Change the sorting mode when iterating through the\n repository's contents.

\n","comments":"

Changing the sorting mode resets the walker.

\n","group":"revwalk","examples":{"general.c":["ex/v0.23.2/general.html#git_revwalk_sorting-65"],"log.c":["ex/v0.23.2/log.html#git_revwalk_sorting-55","ex/v0.23.2/log.html#git_revwalk_sorting-56"]}},"git_revwalk_push_range":{"type":"function","file":"revwalk.h","line":245,"lineto":245,"args":[{"name":"walk","type":"git_revwalk *","comment":"the walker being used for the traversal"},{"name":"range","type":"const char *","comment":"the range"}],"argline":"git_revwalk *walk, const char *range","sig":"git_revwalk *::const char *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Push and hide the respective endpoints of the given range.

\n","comments":"

The range should be of the form

\n\n

<commit

\n\n
\n

..\n<commit

\n\n

where each \n<commit\nis in the form accepted by 'git_revparse_single'.\n The left-hand commit will be hidden and the right-hand commit pushed.

\n
\n","group":"revwalk"},"git_revwalk_simplify_first_parent":{"type":"function","file":"revwalk.h","line":252,"lineto":252,"args":[{"name":"walk","type":"git_revwalk *","comment":null}],"argline":"git_revwalk *walk","sig":"git_revwalk *","return":{"type":"void","comment":null},"description":"

Simplify the history by first-parent

\n","comments":"

No parents other than the first for each commit will be enqueued.

\n","group":"revwalk"},"git_revwalk_free":{"type":"function","file":"revwalk.h","line":260,"lineto":260,"args":[{"name":"walk","type":"git_revwalk *","comment":"traversal handle to close. If NULL nothing occurs."}],"argline":"git_revwalk *walk","sig":"git_revwalk *","return":{"type":"void","comment":null},"description":"

Free a revision walker previously allocated.

\n","comments":"","group":"revwalk","examples":{"general.c":["ex/v0.23.2/general.html#git_revwalk_free-66"],"log.c":["ex/v0.23.2/log.html#git_revwalk_free-57"]}},"git_revwalk_repository":{"type":"function","file":"revwalk.h","line":269,"lineto":269,"args":[{"name":"walk","type":"git_revwalk *","comment":"the revision walker"}],"argline":"git_revwalk *walk","sig":"git_revwalk *","return":{"type":"git_repository *","comment":" the repository being walked"},"description":"

Return the repository on which this walker\n is operating.

\n","comments":"","group":"revwalk"},"git_revwalk_add_hide_cb":{"type":"function","file":"revwalk.h","line":290,"lineto":293,"args":[{"name":"walk","type":"git_revwalk *","comment":"the revision walker"},{"name":"hide_cb","type":"git_revwalk_hide_cb","comment":"callback function to hide a commit and its parents"},{"name":"payload","type":"void *","comment":"data payload to be passed to callback function"}],"argline":"git_revwalk *walk, git_revwalk_hide_cb hide_cb, void *payload","sig":"git_revwalk *::git_revwalk_hide_cb::void *","return":{"type":"int","comment":null},"description":"

Adds a callback function to hide a commit and its parents

\n","comments":"","group":"revwalk"},"git_signature_new":{"type":"function","file":"signature.h","line":37,"lineto":37,"args":[{"name":"out","type":"git_signature **","comment":"new signature, in case of error NULL"},{"name":"name","type":"const char *","comment":"name of the person"},{"name":"email","type":"const char *","comment":"email of the person"},{"name":"time","type":"git_time_t","comment":"time when the action happened"},{"name":"offset","type":"int","comment":"timezone offset in minutes for the time"}],"argline":"git_signature **out, const char *name, const char *email, git_time_t time, int offset","sig":"git_signature **::const char *::const char *::git_time_t::int","return":{"type":"int","comment":" 0 or an error code"},"description":"

Create a new action signature.

\n","comments":"

Call git_signature_free() to free the data.

\n\n

Note: angle brackets ('\n<\n' and '>') characters are not allowed\n to be used in either the name or the email parameter.

\n","group":"signature","examples":{"general.c":["ex/v0.23.2/general.html#git_signature_new-67","ex/v0.23.2/general.html#git_signature_new-68"]}},"git_signature_now":{"type":"function","file":"signature.h","line":49,"lineto":49,"args":[{"name":"out","type":"git_signature **","comment":"new signature, in case of error NULL"},{"name":"name","type":"const char *","comment":"name of the person"},{"name":"email","type":"const char *","comment":"email of the person"}],"argline":"git_signature **out, const char *name, const char *email","sig":"git_signature **::const char *::const char *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Create a new action signature with a timestamp of 'now'.

\n","comments":"

Call git_signature_free() to free the data.

\n","group":"signature"},"git_signature_default":{"type":"function","file":"signature.h","line":63,"lineto":63,"args":[{"name":"out","type":"git_signature **","comment":"new signature"},{"name":"repo","type":"git_repository *","comment":"repository pointer"}],"argline":"git_signature **out, git_repository *repo","sig":"git_signature **::git_repository *","return":{"type":"int","comment":" 0 on success, GIT_ENOTFOUND if config is missing, or error code"},"description":"

Create a new action signature with default user and now timestamp.

\n","comments":"

This looks up the user.name and user.email from the configuration and\n uses the current time as the timestamp, and creates a new signature\n based on that information. It will return GIT_ENOTFOUND if either the\n user.name or user.email are not set.

\n","group":"signature","examples":{"init.c":["ex/v0.23.2/init.html#git_signature_default-12"],"tag.c":["ex/v0.23.2/tag.html#git_signature_default-17"]}},"git_signature_dup":{"type":"function","file":"signature.h","line":75,"lineto":75,"args":[{"name":"dest","type":"git_signature **","comment":"pointer where to store the copy"},{"name":"sig","type":"const git_signature *","comment":"signature to duplicate"}],"argline":"git_signature **dest, const git_signature *sig","sig":"git_signature **::const git_signature *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Create a copy of an existing signature. All internal strings are also\n duplicated.

\n","comments":"

Call git_signature_free() to free the data.

\n","group":"signature"},"git_signature_free":{"type":"function","file":"signature.h","line":86,"lineto":86,"args":[{"name":"sig","type":"git_signature *","comment":"signature to free"}],"argline":"git_signature *sig","sig":"git_signature *","return":{"type":"void","comment":null},"description":"

Free an existing signature.

\n","comments":"

Because the signature is not an opaque structure, it is legal to free it\n manually, but be sure to free the "name" and "email" strings in addition\n to the structure itself.

\n","group":"signature","examples":{"init.c":["ex/v0.23.2/init.html#git_signature_free-13"],"tag.c":["ex/v0.23.2/tag.html#git_signature_free-18"]}},"git_stash_apply_init_options":{"type":"function","file":"stash.h","line":153,"lineto":154,"args":[{"name":"opts","type":"git_stash_apply_options *","comment":"the `git_stash_apply_options` instance to initialize."},{"name":"version","type":"unsigned int","comment":"the version of the struct; you should pass\n `GIT_STASH_APPLY_OPTIONS_INIT` here."}],"argline":"git_stash_apply_options *opts, unsigned int version","sig":"git_stash_apply_options *::unsigned int","return":{"type":"int","comment":" Zero on success; -1 on failure."},"description":"

Initializes a git_stash_apply_options with default values. Equivalent to\n creating an instance with GIT_STASH_APPLY_OPTIONS_INIT.

\n","comments":"","group":"stash"},"git_stash_apply":{"type":"function","file":"stash.h","line":182,"lineto":185,"args":[{"name":"repo","type":"git_repository *","comment":"The owning repository."},{"name":"index","type":"size_t","comment":"The position within the stash list. 0 points to the\n most recent stashed state."},{"name":"options","type":"const git_stash_apply_options *","comment":"Options to control how stashes are applied."}],"argline":"git_repository *repo, size_t index, const git_stash_apply_options *options","sig":"git_repository *::size_t::const git_stash_apply_options *","return":{"type":"int","comment":" 0 on success, GIT_ENOTFOUND if there's no stashed state for the\n given index, GIT_EMERGECONFLICT if changes exist in the working\n directory, or an error code"},"description":"

Apply a single stashed state from the stash list.

\n","comments":"

If local changes in the working directory conflict with changes in the\n stash then GIT_EMERGECONFLICT will be returned. In this case, the index\n will always remain unmodified and all files in the working directory will\n remain unmodified. However, if you are restoring untracked files or\n ignored files and there is a conflict when applying the modified files,\n then those files will remain in the working directory.

\n\n

If passing the GIT_STASH_APPLY_REINSTATE_INDEX flag and there would be\n conflicts when reinstating the index, the function will return\n GIT_EMERGECONFLICT and both the working directory and index will be left\n unmodified.

\n\n

Note that a minimum checkout strategy of GIT_CHECKOUT_SAFE is implied.

\n","group":"stash"},"git_stash_foreach":{"type":"function","file":"stash.h","line":218,"lineto":221,"args":[{"name":"repo","type":"git_repository *","comment":"Repository where to find the stash."},{"name":"callback","type":"git_stash_cb","comment":"Callback to invoke per found stashed state. The most\n recent stash state will be enumerated first."},{"name":"payload","type":"void *","comment":"Extra parameter to callback function."}],"argline":"git_repository *repo, git_stash_cb callback, void *payload","sig":"git_repository *::git_stash_cb::void *","return":{"type":"int","comment":" 0 on success, non-zero callback return value, or error code."},"description":"

Loop over all the stashed states and issue a callback for each one.

\n","comments":"

If the callback returns a non-zero value, this will stop looping.

\n","group":"stash"},"git_stash_drop":{"type":"function","file":"stash.h","line":234,"lineto":236,"args":[{"name":"repo","type":"git_repository *","comment":"The owning repository."},{"name":"index","type":"size_t","comment":"The position within the stash list. 0 points to the\n most recent stashed state."}],"argline":"git_repository *repo, size_t index","sig":"git_repository *::size_t","return":{"type":"int","comment":" 0 on success, GIT_ENOTFOUND if there's no stashed state for the given\n index, or error code."},"description":"

Remove a single stashed state from the stash list.

\n","comments":"","group":"stash"},"git_stash_pop":{"type":"function","file":"stash.h","line":250,"lineto":253,"args":[{"name":"repo","type":"git_repository *","comment":"The owning repository."},{"name":"index","type":"size_t","comment":"The position within the stash list. 0 points to the\n most recent stashed state."},{"name":"options","type":"const git_stash_apply_options *","comment":"Options to control how stashes are applied."}],"argline":"git_repository *repo, size_t index, const git_stash_apply_options *options","sig":"git_repository *::size_t::const git_stash_apply_options *","return":{"type":"int","comment":" 0 on success, GIT_ENOTFOUND if there's no stashed state for the given\n index, or error code. (see git_stash_apply() above for details)"},"description":"

Apply a single stashed state from the stash list and remove it from the list\n if successful.

\n","comments":"","group":"stash"},"git_status_init_options":{"type":"function","file":"status.h","line":195,"lineto":197,"args":[{"name":"opts","type":"git_status_options *","comment":"The `git_status_options` instance to initialize."},{"name":"version","type":"unsigned int","comment":"Version of struct; pass `GIT_STATUS_OPTIONS_VERSION`"}],"argline":"git_status_options *opts, unsigned int version","sig":"git_status_options *::unsigned int","return":{"type":"int","comment":" Zero on success; -1 on failure."},"description":"

Initializes a git_status_options with default values. Equivalent to\n creating an instance with GIT_STATUS_OPTIONS_INIT.

\n","comments":"","group":"status"},"git_status_foreach":{"type":"function","file":"status.h","line":235,"lineto":238,"args":[{"name":"repo","type":"git_repository *","comment":"A repository object"},{"name":"callback","type":"git_status_cb","comment":"The function to call on each file"},{"name":"payload","type":"void *","comment":"Pointer to pass through to callback function"}],"argline":"git_repository *repo, git_status_cb callback, void *payload","sig":"git_repository *::git_status_cb::void *","return":{"type":"int","comment":" 0 on success, non-zero callback return value, or error code"},"description":"

Gather file statuses and run a callback for each one.

\n","comments":"

The callback is passed the path of the file, the status (a combination of\n the git_status_t values above) and the payload data pointer passed\n into this function.

\n\n

If the callback returns a non-zero value, this function will stop looping\n and return that value to caller.

\n","group":"status","examples":{"status.c":["ex/v0.23.2/status.html#git_status_foreach-10"]}},"git_status_foreach_ext":{"type":"function","file":"status.h","line":259,"lineto":263,"args":[{"name":"repo","type":"git_repository *","comment":"Repository object"},{"name":"opts","type":"const git_status_options *","comment":"Status options structure"},{"name":"callback","type":"git_status_cb","comment":"The function to call on each file"},{"name":"payload","type":"void *","comment":"Pointer to pass through to callback function"}],"argline":"git_repository *repo, const git_status_options *opts, git_status_cb callback, void *payload","sig":"git_repository *::const git_status_options *::git_status_cb::void *","return":{"type":"int","comment":" 0 on success, non-zero callback return value, or error code"},"description":"

Gather file status information and run callbacks as requested.

\n","comments":"

This is an extended version of the git_status_foreach() API that\n allows for more granular control over which paths will be processed and\n in what order. See the git_status_options structure for details\n about the additional controls that this makes available.

\n\n

Note that if a pathspec is given in the git_status_options to filter\n the status, then the results from rename detection (if you enable it) may\n not be accurate. To do rename detection properly, this must be called\n with no pathspec so that all files can be considered.

\n","group":"status","examples":{"status.c":["ex/v0.23.2/status.html#git_status_foreach_ext-11"]}},"git_status_file":{"type":"function","file":"status.h","line":291,"lineto":294,"args":[{"name":"status_flags","type":"unsigned int *","comment":"Output combination of git_status_t values for file"},{"name":"repo","type":"git_repository *","comment":"A repository object"},{"name":"path","type":"const char *","comment":"The exact path to retrieve status for relative to the\n repository working directory"}],"argline":"unsigned int *status_flags, git_repository *repo, const char *path","sig":"unsigned int *::git_repository *::const char *","return":{"type":"int","comment":" 0 on success, GIT_ENOTFOUND if the file is not found in the HEAD,\n index, and work tree, GIT_EAMBIGUOUS if `path` matches multiple files\n or if it refers to a folder, and -1 on other errors."},"description":"

Get file status for a single file.

\n","comments":"

This tries to get status for the filename that you give. If no files\n match that name (in either the HEAD, index, or working directory), this\n returns GIT_ENOTFOUND.

\n\n

If the name matches multiple files (for example, if the path names a\n directory or if running on a case- insensitive filesystem and yet the\n HEAD has two entries that both match the path), then this returns\n GIT_EAMBIGUOUS because it cannot give correct results.

\n\n

This does not do any sort of rename detection. Renames require a set of\n targets and because of the path filtering, there is not enough\n information to check renames correctly. To check file status with rename\n detection, there is no choice but to do a full git_status_list_new and\n scan through looking for the path that you are interested in.

\n","group":"status"},"git_status_list_new":{"type":"function","file":"status.h","line":309,"lineto":312,"args":[{"name":"out","type":"git_status_list **","comment":"Pointer to store the status results in"},{"name":"repo","type":"git_repository *","comment":"Repository object"},{"name":"opts","type":"const git_status_options *","comment":"Status options structure"}],"argline":"git_status_list **out, git_repository *repo, const git_status_options *opts","sig":"git_status_list **::git_repository *::const git_status_options *","return":{"type":"int","comment":" 0 on success or error code"},"description":"

Gather file status information and populate the git_status_list.

\n","comments":"

Note that if a pathspec is given in the git_status_options to filter\n the status, then the results from rename detection (if you enable it) may\n not be accurate. To do rename detection properly, this must be called\n with no pathspec so that all files can be considered.

\n","group":"status","examples":{"status.c":["ex/v0.23.2/status.html#git_status_list_new-12","ex/v0.23.2/status.html#git_status_list_new-13"]}},"git_status_list_entrycount":{"type":"function","file":"status.h","line":323,"lineto":324,"args":[{"name":"statuslist","type":"git_status_list *","comment":"Existing status list object"}],"argline":"git_status_list *statuslist","sig":"git_status_list *","return":{"type":"size_t","comment":" the number of status entries"},"description":"

Gets the count of status entries in this list.

\n","comments":"

If there are no changes in status (at least according the options given\n when the status list was created), this can return 0.

\n","group":"status","examples":{"status.c":["ex/v0.23.2/status.html#git_status_list_entrycount-14","ex/v0.23.2/status.html#git_status_list_entrycount-15"]}},"git_status_byindex":{"type":"function","file":"status.h","line":335,"lineto":337,"args":[{"name":"statuslist","type":"git_status_list *","comment":"Existing status list object"},{"name":"idx","type":"size_t","comment":"Position of the entry"}],"argline":"git_status_list *statuslist, size_t idx","sig":"git_status_list *::size_t","return":{"type":"const git_status_entry *","comment":" Pointer to the entry; NULL if out of bounds"},"description":"

Get a pointer to one of the entries in the status list.

\n","comments":"

The entry is not modifiable and should not be freed.

\n","group":"status","examples":{"status.c":["ex/v0.23.2/status.html#git_status_byindex-16","ex/v0.23.2/status.html#git_status_byindex-17","ex/v0.23.2/status.html#git_status_byindex-18","ex/v0.23.2/status.html#git_status_byindex-19","ex/v0.23.2/status.html#git_status_byindex-20","ex/v0.23.2/status.html#git_status_byindex-21"]}},"git_status_list_free":{"type":"function","file":"status.h","line":344,"lineto":345,"args":[{"name":"statuslist","type":"git_status_list *","comment":"Existing status list object"}],"argline":"git_status_list *statuslist","sig":"git_status_list *","return":{"type":"void","comment":null},"description":"

Free an existing status list

\n","comments":"","group":"status","examples":{"status.c":["ex/v0.23.2/status.html#git_status_list_free-22"]}},"git_status_should_ignore":{"type":"function","file":"status.h","line":363,"lineto":366,"args":[{"name":"ignored","type":"int *","comment":"Boolean returning 0 if the file is not ignored, 1 if it is"},{"name":"repo","type":"git_repository *","comment":"A repository object"},{"name":"path","type":"const char *","comment":"The file to check ignores for, rooted at the repo's workdir."}],"argline":"int *ignored, git_repository *repo, const char *path","sig":"int *::git_repository *::const char *","return":{"type":"int","comment":" 0 if ignore rules could be processed for the file (regardless\n of whether it exists or not), or an error \n<\n 0 if they could not."},"description":"

Test if the ignore rules apply to a given file.

\n","comments":"

This function checks the ignore rules to see if they would apply to the\n given file. This indicates if the file would be ignored regardless of\n whether the file is already in the index or committed to the repository.

\n\n

One way to think of this is if you were to do "git add ." on the\n directory containing the file, would it be added or not?

\n","group":"status"},"git_strarray_free":{"type":"function","file":"strarray.h","line":41,"lineto":41,"args":[{"name":"array","type":"git_strarray *","comment":"git_strarray from which to free string data"}],"argline":"git_strarray *array","sig":"git_strarray *","return":{"type":"void","comment":null},"description":"

Close a string array object

\n","comments":"

This method should be called on git_strarray objects where the strings\n array is allocated and contains allocated strings, such as what you\n would get from git_strarray_copy(). Not doing so, will result in a\n memory leak.

\n\n

This does not free the git_strarray itself, since the library will\n never allocate that object directly itself (it is more commonly embedded\n inside another struct or created on the stack).

\n","group":"strarray","examples":{"general.c":["ex/v0.23.2/general.html#git_strarray_free-69"],"remote.c":["ex/v0.23.2/remote.html#git_strarray_free-16","ex/v0.23.2/remote.html#git_strarray_free-17"],"tag.c":["ex/v0.23.2/tag.html#git_strarray_free-19"]}},"git_strarray_copy":{"type":"function","file":"strarray.h","line":53,"lineto":53,"args":[{"name":"tgt","type":"git_strarray *","comment":"target"},{"name":"src","type":"const git_strarray *","comment":"source"}],"argline":"git_strarray *tgt, const git_strarray *src","sig":"git_strarray *::const git_strarray *","return":{"type":"int","comment":" 0 on success, \n<\n 0 on allocation failure"},"description":"

Copy a string array object from source to target.

\n","comments":"

Note: target is overwritten and hence should be empty, otherwise its\n contents are leaked. Call git_strarray_free() if necessary.

\n","group":"strarray"},"git_submodule_update_init_options":{"type":"function","file":"submodule.h","line":162,"lineto":163,"args":[{"name":"opts","type":"git_submodule_update_options *","comment":"The `git_submodule_update_options` instance to initialize."},{"name":"version","type":"unsigned int","comment":"Version of struct; pass `GIT_SUBMODULE_UPDATE_OPTIONS_VERSION`"}],"argline":"git_submodule_update_options *opts, unsigned int version","sig":"git_submodule_update_options *::unsigned int","return":{"type":"int","comment":" Zero on success; -1 on failure."},"description":"

Initializes a git_submodule_update_options with default values.\n Equivalent to creating an instance with GIT_SUBMODULE_UPDATE_OPTIONS_INIT.

\n","comments":"","group":"submodule"},"git_submodule_update":{"type":"function","file":"submodule.h","line":181,"lineto":181,"args":[{"name":"submodule","type":"git_submodule *","comment":"Submodule object"},{"name":"init","type":"int","comment":"If the submodule is not initialized, setting this flag to true\n will initialize the submodule before updating. Otherwise, this will\n return an error if attempting to update an uninitialzed repository.\n but setting this to true forces them to be updated."},{"name":"options","type":"git_submodule_update_options *","comment":"configuration options for the update. If NULL, the\n function works as though GIT_SUBMODULE_UPDATE_OPTIONS_INIT was passed."}],"argline":"git_submodule *submodule, int init, git_submodule_update_options *options","sig":"git_submodule *::int::git_submodule_update_options *","return":{"type":"int","comment":" 0 on success, any non-zero return value from a callback\n function, or a negative value to indicate an error (use\n `giterr_last` for a detailed error message)."},"description":"

Update a submodule. This will clone a missing submodule and\n checkout the subrepository to the commit specified in the index of\n containing repository.

\n","comments":"","group":"submodule"},"git_submodule_lookup":{"type":"function","file":"submodule.h","line":210,"lineto":213,"args":[{"name":"out","type":"git_submodule **","comment":"Output ptr to submodule; pass NULL to just get return code"},{"name":"repo","type":"git_repository *","comment":"The parent repository"},{"name":"name","type":"const char *","comment":"The name of or path to the submodule; trailing slashes okay"}],"argline":"git_submodule **out, git_repository *repo, const char *name","sig":"git_submodule **::git_repository *::const char *","return":{"type":"int","comment":" 0 on success, GIT_ENOTFOUND if submodule does not exist,\n GIT_EEXISTS if a repository is found in working directory only,\n -1 on other errors."},"description":"

Lookup submodule information by name or path.

\n","comments":"

Given either the submodule name or path (they are usually the same), this\n returns a structure describing the submodule.

\n\n

There are two expected error scenarios:

\n\n
    \n
  • The submodule is not mentioned in the HEAD, the index, and the config,\nbut does "exist" in the working directory (i.e. there is a subdirectory\nthat appears to be a Git repository). In this case, this function\nreturns GIT_EEXISTS to indicate a sub-repository exists but not in a\nstate where a git_submodule can be instantiated.
    • \n
  • The submodule is not mentioned in the HEAD, index, or config and the\nworking directory doesn't contain a value git repo at that path.\nThere may or may not be anything else at that path, but nothing that\nlooks like a submodule. In this case, this returns GIT_ENOTFOUND.
    • \n
\n\n

You must call git_submodule_free when done with the submodule.

\n","group":"submodule"},"git_submodule_free":{"type":"function","file":"submodule.h","line":220,"lineto":220,"args":[{"name":"submodule","type":"git_submodule *","comment":"Submodule object"}],"argline":"git_submodule *submodule","sig":"git_submodule *","return":{"type":"void","comment":null},"description":"

Release a submodule

\n","comments":"","group":"submodule"},"git_submodule_foreach":{"type":"function","file":"submodule.h","line":240,"lineto":243,"args":[{"name":"repo","type":"git_repository *","comment":"The repository"},{"name":"callback","type":"int (*)(git_submodule *, const char *, void *)","comment":"Function to be called with the name of each submodule.\n Return a non-zero value to terminate the iteration."},{"name":"payload","type":"void *","comment":"Extra data to pass to callback"}],"argline":"git_repository *repo, int (*)(git_submodule *, const char *, void *) callback, void *payload","sig":"git_repository *::int (*)(git_submodule *, const char *, void *)::void *","return":{"type":"int","comment":" 0 on success, -1 on error, or non-zero return value of callback"},"description":"

Iterate over all tracked submodules of a repository.

\n","comments":"

See the note on git_submodule above. This iterates over the tracked\n submodules as described therein.

\n\n

If you are concerned about items in the working directory that look like\n submodules but are not tracked, the diff API will generate a diff record\n for workdir items that look like submodules but are not tracked, showing\n them as added in the workdir. Also, the status API will treat the entire\n subdirectory of a contained git repo as a single GIT_STATUS_WT_NEW item.

\n","group":"submodule","examples":{"status.c":["ex/v0.23.2/status.html#git_submodule_foreach-23"]}},"git_submodule_add_setup":{"type":"function","file":"submodule.h","line":270,"lineto":275,"args":[{"name":"out","type":"git_submodule **","comment":"The newly created submodule ready to open for clone"},{"name":"repo","type":"git_repository *","comment":"The repository in which you want to create the submodule"},{"name":"url","type":"const char *","comment":"URL for the submodule's remote"},{"name":"path","type":"const char *","comment":"Path at which the submodule should be created"},{"name":"use_gitlink","type":"int","comment":"Should workdir contain a gitlink to the repo in\n .git/modules vs. repo directly in workdir."}],"argline":"git_submodule **out, git_repository *repo, const char *url, const char *path, int use_gitlink","sig":"git_submodule **::git_repository *::const char *::const char *::int","return":{"type":"int","comment":" 0 on success, GIT_EEXISTS if submodule already exists,\n -1 on other errors."},"description":"

Set up a new git submodule for checkout.

\n","comments":"

This does "git submodule add" up to the fetch and checkout of the\n submodule contents. It preps a new submodule, creates an entry in\n .gitmodules and creates an empty initialized repository either at the\n given path in the working directory or in .git/modules with a gitlink\n from the working directory to the new repo.

\n\n

To fully emulate "git submodule add" call this function, then open the\n submodule repo and perform the clone step as needed. Lastly, call\n git_submodule_add_finalize() to wrap up adding the new submodule and\n .gitmodules to the index to be ready to commit.

\n\n

You must call git_submodule_free on the submodule object when done.

\n","group":"submodule"},"git_submodule_add_finalize":{"type":"function","file":"submodule.h","line":287,"lineto":287,"args":[{"name":"submodule","type":"git_submodule *","comment":"The submodule to finish adding."}],"argline":"git_submodule *submodule","sig":"git_submodule *","return":{"type":"int","comment":null},"description":"

Resolve the setup of a new git submodule.

\n","comments":"

This should be called on a submodule once you have called add setup\n and done the clone of the submodule. This adds the .gitmodules file\n and the newly cloned submodule to the index to be ready to be committed\n (but doesn't actually do the commit).

\n","group":"submodule"},"git_submodule_add_to_index":{"type":"function","file":"submodule.h","line":299,"lineto":301,"args":[{"name":"submodule","type":"git_submodule *","comment":"The submodule to add to the index"},{"name":"write_index","type":"int","comment":"Boolean if this should immediately write the index\n file. If you pass this as false, you will have to get the\n git_index and explicitly call `git_index_write()` on it to\n save the change."}],"argline":"git_submodule *submodule, int write_index","sig":"git_submodule *::int","return":{"type":"int","comment":" 0 on success, \n<\n0 on failure"},"description":"

Add current submodule HEAD commit to index of superproject.

\n","comments":"","group":"submodule"},"git_submodule_owner":{"type":"function","file":"submodule.h","line":314,"lineto":314,"args":[{"name":"submodule","type":"git_submodule *","comment":"Pointer to submodule object"}],"argline":"git_submodule *submodule","sig":"git_submodule *","return":{"type":"git_repository *","comment":" Pointer to `git_repository`"},"description":"

Get the containing repository for a submodule.

\n","comments":"

This returns a pointer to the repository that contains the submodule.\n This is a just a reference to the repository that was passed to the\n original git_submodule_lookup() call, so if that repository has been\n freed, then this may be a dangling reference.

\n","group":"submodule"},"git_submodule_name":{"type":"function","file":"submodule.h","line":322,"lineto":322,"args":[{"name":"submodule","type":"git_submodule *","comment":"Pointer to submodule object"}],"argline":"git_submodule *submodule","sig":"git_submodule *","return":{"type":"const char *","comment":" Pointer to the submodule name"},"description":"

Get the name of submodule.

\n","comments":"","group":"submodule","examples":{"status.c":["ex/v0.23.2/status.html#git_submodule_name-24"]}},"git_submodule_path":{"type":"function","file":"submodule.h","line":333,"lineto":333,"args":[{"name":"submodule","type":"git_submodule *","comment":"Pointer to submodule object"}],"argline":"git_submodule *submodule","sig":"git_submodule *","return":{"type":"const char *","comment":" Pointer to the submodule path"},"description":"

Get the path to the submodule.

\n","comments":"

The path is almost always the same as the submodule name, but the\n two are actually not required to match.

\n","group":"submodule","examples":{"status.c":["ex/v0.23.2/status.html#git_submodule_path-25"]}},"git_submodule_url":{"type":"function","file":"submodule.h","line":341,"lineto":341,"args":[{"name":"submodule","type":"git_submodule *","comment":"Pointer to submodule object"}],"argline":"git_submodule *submodule","sig":"git_submodule *","return":{"type":"const char *","comment":" Pointer to the submodule url"},"description":"

Get the URL for the submodule.

\n","comments":"","group":"submodule"},"git_submodule_resolve_url":{"type":"function","file":"submodule.h","line":351,"lineto":351,"args":[{"name":"out","type":"git_buf *","comment":"buffer to store the absolute submodule url in"},{"name":"repo","type":"git_repository *","comment":"Pointer to repository object"},{"name":"url","type":"const char *","comment":"Relative url"}],"argline":"git_buf *out, git_repository *repo, const char *url","sig":"git_buf *::git_repository *::const char *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Resolve a submodule url relative to the given repository.

\n","comments":"","group":"submodule"},"git_submodule_branch":{"type":"function","file":"submodule.h","line":359,"lineto":359,"args":[{"name":"submodule","type":"git_submodule *","comment":"Pointer to submodule object"}],"argline":"git_submodule *submodule","sig":"git_submodule *","return":{"type":"const char *","comment":" Pointer to the submodule branch"},"description":"

Get the branch for the submodule.

\n","comments":"","group":"submodule"},"git_submodule_set_branch":{"type":"function","file":"submodule.h","line":372,"lineto":372,"args":[{"name":"repo","type":"git_repository *","comment":"the repository to affect"},{"name":"name","type":"const char *","comment":"the name of the submodule to configure"},{"name":"branch","type":"const char *","comment":"Branch that should be used for the submodule"}],"argline":"git_repository *repo, const char *name, const char *branch","sig":"git_repository *::const char *::const char *","return":{"type":"int","comment":" 0 on success, \n<\n0 on failure"},"description":"

Set the branch for the submodule in the configuration

\n","comments":"

After calling this, you may wish to call git_submodule_sync() to\n write the changes to the checked out submodule repository.

\n","group":"submodule"},"git_submodule_set_url":{"type":"function","file":"submodule.h","line":386,"lineto":386,"args":[{"name":"repo","type":"git_repository *","comment":"the repository to affect"},{"name":"name","type":"const char *","comment":"the name of the submodule to configure"},{"name":"url","type":"const char *","comment":"URL that should be used for the submodule"}],"argline":"git_repository *repo, const char *name, const char *url","sig":"git_repository *::const char *::const char *","return":{"type":"int","comment":" 0 on success, \n<\n0 on failure"},"description":"

Set the URL for the submodule in the configuration

\n","comments":"

After calling this, you may wish to call git_submodule_sync() to\n write the changes to the checked out submodule repository.

\n","group":"submodule"},"git_submodule_index_id":{"type":"function","file":"submodule.h","line":394,"lineto":394,"args":[{"name":"submodule","type":"git_submodule *","comment":"Pointer to submodule object"}],"argline":"git_submodule *submodule","sig":"git_submodule *","return":{"type":"const git_oid *","comment":" Pointer to git_oid or NULL if submodule is not in index."},"description":"

Get the OID for the submodule in the index.

\n","comments":"","group":"submodule"},"git_submodule_head_id":{"type":"function","file":"submodule.h","line":402,"lineto":402,"args":[{"name":"submodule","type":"git_submodule *","comment":"Pointer to submodule object"}],"argline":"git_submodule *submodule","sig":"git_submodule *","return":{"type":"const git_oid *","comment":" Pointer to git_oid or NULL if submodule is not in the HEAD."},"description":"

Get the OID for the submodule in the current HEAD tree.

\n","comments":"","group":"submodule"},"git_submodule_wd_id":{"type":"function","file":"submodule.h","line":415,"lineto":415,"args":[{"name":"submodule","type":"git_submodule *","comment":"Pointer to submodule object"}],"argline":"git_submodule *submodule","sig":"git_submodule *","return":{"type":"const git_oid *","comment":" Pointer to git_oid or NULL if submodule is not checked out."},"description":"

Get the OID for the submodule in the current working directory.

\n","comments":"

This returns the OID that corresponds to looking up 'HEAD' in the checked\n out submodule. If there are pending changes in the index or anything\n else, this won't notice that. You should call git_submodule_status()\n for a more complete picture about the state of the working directory.

\n","group":"submodule"},"git_submodule_ignore":{"type":"function","file":"submodule.h","line":440,"lineto":441,"args":[{"name":"submodule","type":"git_submodule *","comment":"The submodule to check"}],"argline":"git_submodule *submodule","sig":"git_submodule *","return":{"type":"git_submodule_ignore_t","comment":" The current git_submodule_ignore_t valyue what will be used for\n this submodule."},"description":"

Get the ignore rule that will be used for the submodule.

\n","comments":"

These values control the behavior of git_submodule_status() for this\n submodule. There are four ignore values:

\n\n
    \n
  • GIT_SUBMODULE_IGNORE_NONE will consider any change to the contents\nof the submodule from a clean checkout to be dirty, including the\naddition of untracked files. This is the default if unspecified.
    • \n
  • GIT_SUBMODULE_IGNORE_UNTRACKED examines the contents of the\nworking tree (i.e. call git_status_foreach() on the submodule) but\nUNTRACKED files will not count as making the submodule dirty.
    • \n
  • GIT_SUBMODULE_IGNORE_DIRTY means to only check if the HEAD of the\nsubmodule has moved for status. This is fast since it does not need to\nscan the working tree of the submodule at all.
    • \n
  • GIT_SUBMODULE_IGNORE_ALL means not to open the submodule repo.\nThe working directory will be consider clean so long as there is a\nchecked out version present.
    • \n
\n","group":"submodule"},"git_submodule_set_ignore":{"type":"function","file":"submodule.h","line":453,"lineto":456,"args":[{"name":"repo","type":"git_repository *","comment":"the repository to affect"},{"name":"name","type":"const char *","comment":"the name of the submdule"},{"name":"ignore","type":"git_submodule_ignore_t","comment":"The new value for the ignore rule"}],"argline":"git_repository *repo, const char *name, git_submodule_ignore_t ignore","sig":"git_repository *::const char *::git_submodule_ignore_t","return":{"type":"int","comment":" 0 or an error code"},"description":"

Set the ignore rule for the submodule in the configuration

\n","comments":"

This does not affect any currently-loaded instances.

\n","group":"submodule"},"git_submodule_update_strategy":{"type":"function","file":"submodule.h","line":468,"lineto":469,"args":[{"name":"submodule","type":"git_submodule *","comment":"The submodule to check"}],"argline":"git_submodule *submodule","sig":"git_submodule *","return":{"type":"git_submodule_update_t","comment":" The current git_submodule_update_t value that will be used\n for this submodule."},"description":"

Get the update rule that will be used for the submodule.

\n","comments":"

This value controls the behavior of the git submodule update command.\n There are four useful values documented with git_submodule_update_t.

\n","group":"submodule"},"git_submodule_set_update":{"type":"function","file":"submodule.h","line":481,"lineto":484,"args":[{"name":"repo","type":"git_repository *","comment":"the repository to affect"},{"name":"name","type":"const char *","comment":"the name of the submodule to configure"},{"name":"update","type":"git_submodule_update_t","comment":"The new value to use"}],"argline":"git_repository *repo, const char *name, git_submodule_update_t update","sig":"git_repository *::const char *::git_submodule_update_t","return":{"type":"int","comment":" 0 or an error code"},"description":"

Set the update rule for the submodule in the configuration

\n","comments":"

This setting won't affect any existing instances.

\n","group":"submodule"},"git_submodule_fetch_recurse_submodules":{"type":"function","file":"submodule.h","line":497,"lineto":498,"args":[{"name":"submodule","type":"git_submodule *","comment":null}],"argline":"git_submodule *submodule","sig":"git_submodule *","return":{"type":"git_submodule_recurse_t","comment":" 0 if fetchRecurseSubmodules is false, 1 if true"},"description":"

Read the fetchRecurseSubmodules rule for a submodule.

\n","comments":"

This accesses the submodule.\n<name

\n\n
\n

.fetchRecurseSubmodules value for\n the submodule that controls fetching behavior for the submodule.

\n
\n\n

Note that at this time, libgit2 does not honor this setting and the\n fetch functionality current ignores submodules.

\n","group":"submodule"},"git_submodule_set_fetch_recurse_submodules":{"type":"function","file":"submodule.h","line":510,"lineto":513,"args":[{"name":"repo","type":"git_repository *","comment":"the repository to affect"},{"name":"name","type":"const char *","comment":"the submodule to configure"},{"name":"fetch_recurse_submodules","type":"git_submodule_recurse_t","comment":"Boolean value"}],"argline":"git_repository *repo, const char *name, git_submodule_recurse_t fetch_recurse_submodules","sig":"git_repository *::const char *::git_submodule_recurse_t","return":{"type":"int","comment":" old value for fetchRecurseSubmodules"},"description":"

Set the fetchRecurseSubmodules rule for a submodule in the configuration

\n","comments":"

This setting won't affect any existing instances.

\n","group":"submodule"},"git_submodule_init":{"type":"function","file":"submodule.h","line":528,"lineto":528,"args":[{"name":"submodule","type":"git_submodule *","comment":"The submodule to write into the superproject config"},{"name":"overwrite","type":"int","comment":"By default, existing entries will not be overwritten,\n but setting this to true forces them to be updated."}],"argline":"git_submodule *submodule, int overwrite","sig":"git_submodule *::int","return":{"type":"int","comment":" 0 on success, \n<\n0 on failure."},"description":"

Copy submodule info into ".git/config" file.

\n","comments":"

Just like "git submodule init", this copies information about the\n submodule into ".git/config". You can use the accessor functions\n above to alter the in-memory git_submodule object and control what\n is written to the config, overriding what is in .gitmodules.

\n","group":"submodule"},"git_submodule_repo_init":{"type":"function","file":"submodule.h","line":543,"lineto":546,"args":[{"name":"out","type":"git_repository **","comment":"Output pointer to the created git repository."},{"name":"sm","type":"const git_submodule *","comment":"The submodule to create a new subrepository from."},{"name":"use_gitlink","type":"int","comment":"Should the workdir contain a gitlink to\n the repo in .git/modules vs. repo directly in workdir."}],"argline":"git_repository **out, const git_submodule *sm, int use_gitlink","sig":"git_repository **::const git_submodule *::int","return":{"type":"int","comment":" 0 on success, \n<\n0 on failure."},"description":"

Set up the subrepository for a submodule in preparation for clone.

\n","comments":"

This function can be called to init and set up a submodule\n repository from a submodule in preparation to clone it from\n its remote.

\n","group":"submodule"},"git_submodule_sync":{"type":"function","file":"submodule.h","line":556,"lineto":556,"args":[{"name":"submodule","type":"git_submodule *","comment":null}],"argline":"git_submodule *submodule","sig":"git_submodule *","return":{"type":"int","comment":null},"description":"

Copy submodule remote info into submodule repo.

\n","comments":"

This copies the information about the submodules URL into the checked out\n submodule config, acting like "git submodule sync". This is useful if\n you have altered the URL for the submodule (or it has been altered by a\n fetch of upstream changes) and you need to update your local repo.

\n","group":"submodule"},"git_submodule_open":{"type":"function","file":"submodule.h","line":570,"lineto":572,"args":[{"name":"repo","type":"git_repository **","comment":"Pointer to the submodule repo which was opened"},{"name":"submodule","type":"git_submodule *","comment":"Submodule to be opened"}],"argline":"git_repository **repo, git_submodule *submodule","sig":"git_repository **::git_submodule *","return":{"type":"int","comment":" 0 on success, \n<\n0 if submodule repo could not be opened."},"description":"

Open the repository for a submodule.

\n","comments":"

This is a newly opened repository object. The caller is responsible for\n calling git_repository_free() on it when done. Multiple calls to this\n function will return distinct git_repository objects. This will only\n work if the submodule is checked out into the working directory.

\n","group":"submodule"},"git_submodule_reload":{"type":"function","file":"submodule.h","line":584,"lineto":584,"args":[{"name":"submodule","type":"git_submodule *","comment":"The submodule to reload"},{"name":"force","type":"int","comment":"Force reload even if the data doesn't seem out of date"}],"argline":"git_submodule *submodule, int force","sig":"git_submodule *::int","return":{"type":"int","comment":" 0 on success, \n<\n0 on error"},"description":"

Reread submodule info from config, index, and HEAD.

\n","comments":"

Call this to reread cached submodule information for this submodule if\n you have reason to believe that it has changed.

\n","group":"submodule"},"git_submodule_status":{"type":"function","file":"submodule.h","line":600,"lineto":604,"args":[{"name":"status","type":"unsigned int *","comment":"Combination of `GIT_SUBMODULE_STATUS` flags"},{"name":"repo","type":"git_repository *","comment":"the repository in which to look"},{"name":"name","type":"const char *","comment":"name of the submodule"},{"name":"ignore","type":"git_submodule_ignore_t","comment":"the ignore rules to follow"}],"argline":"unsigned int *status, git_repository *repo, const char *name, git_submodule_ignore_t ignore","sig":"unsigned int *::git_repository *::const char *::git_submodule_ignore_t","return":{"type":"int","comment":" 0 on success, \n<\n0 on error"},"description":"

Get the status for a submodule.

\n","comments":"

This looks at a submodule and tries to determine the status. It\n will return a combination of the GIT_SUBMODULE_STATUS values above.\n How deeply it examines the working directory to do this will depend\n on the git_submodule_ignore_t value for the submodule.

\n","group":"submodule","examples":{"status.c":["ex/v0.23.2/status.html#git_submodule_status-26"]}},"git_submodule_location":{"type":"function","file":"submodule.h","line":620,"lineto":622,"args":[{"name":"location_status","type":"unsigned int *","comment":"Combination of first four `GIT_SUBMODULE_STATUS` flags"},{"name":"submodule","type":"git_submodule *","comment":"Submodule for which to get status"}],"argline":"unsigned int *location_status, git_submodule *submodule","sig":"unsigned int *::git_submodule *","return":{"type":"int","comment":" 0 on success, \n<\n0 on error"},"description":"

Get the locations of submodule information.

\n","comments":"

This is a bit like a very lightweight version of git_submodule_status.\n It just returns a made of the first four submodule status values (i.e.\n the ones like GIT_SUBMODULE_STATUS_IN_HEAD, etc) that tell you where the\n submodule data comes from (i.e. the HEAD commit, gitmodules file, etc.).\n This can be useful if you want to know if the submodule is present in the\n working directory at this point in time, etc.

\n","group":"submodule"},"git_commit_create_from_ids":{"type":"function","file":"sys/commit.h","line":34,"lineto":44,"args":[{"name":"id","type":"git_oid *","comment":null},{"name":"repo","type":"git_repository *","comment":null},{"name":"update_ref","type":"const char *","comment":null},{"name":"author","type":"const git_signature *","comment":null},{"name":"committer","type":"const git_signature *","comment":null},{"name":"message_encoding","type":"const char *","comment":null},{"name":"message","type":"const char *","comment":null},{"name":"tree","type":"const git_oid *","comment":null},{"name":"parent_count","type":"size_t","comment":null},{"name":"parents","type":"const git_oid *[]","comment":null}],"argline":"git_oid *id, git_repository *repo, const char *update_ref, const git_signature *author, const git_signature *committer, const char *message_encoding, const char *message, const git_oid *tree, size_t parent_count, const git_oid *[] parents","sig":"git_oid *::git_repository *::const char *::const git_signature *::const git_signature *::const char *::const char *::const git_oid *::size_t::const git_oid *[]","return":{"type":"int","comment":null},"description":"

Create new commit in the repository from a list of git_oid values.

\n","comments":"

See documentation for git_commit_create() for information about the\n parameters, as the meaning is identical excepting that tree and\n parents now take git_oid. This is a dangerous API in that nor\n the tree, neither the parents list of git_oids are checked for\n validity.

\n","group":"commit"},"git_commit_create_from_callback":{"type":"function","file":"sys/commit.h","line":66,"lineto":76,"args":[{"name":"id","type":"git_oid *","comment":null},{"name":"repo","type":"git_repository *","comment":null},{"name":"update_ref","type":"const char *","comment":null},{"name":"author","type":"const git_signature *","comment":null},{"name":"committer","type":"const git_signature *","comment":null},{"name":"message_encoding","type":"const char *","comment":null},{"name":"message","type":"const char *","comment":null},{"name":"tree","type":"const git_oid *","comment":null},{"name":"parent_cb","type":"git_commit_parent_callback","comment":null},{"name":"parent_payload","type":"void *","comment":null}],"argline":"git_oid *id, git_repository *repo, const char *update_ref, const git_signature *author, const git_signature *committer, const char *message_encoding, const char *message, const git_oid *tree, git_commit_parent_callback parent_cb, void *parent_payload","sig":"git_oid *::git_repository *::const char *::const git_signature *::const git_signature *::const char *::const char *::const git_oid *::git_commit_parent_callback::void *","return":{"type":"int","comment":null},"description":"

Create a new commit in the repository with an callback to supply parents.

\n","comments":"

See documentation for git_commit_create() for information about the\n parameters, as the meaning is identical excepting that tree takes a\n git_oid and doesn't check for validity, and parent_cb is invoked\n with parent_payload and should return git_oid values or NULL to\n indicate that all parents are accounted for.

\n","group":"commit"},"git_config_init_backend":{"type":"function","file":"sys/config.h","line":83,"lineto":85,"args":[{"name":"backend","type":"git_config_backend *","comment":"the `git_config_backend` struct to initialize."},{"name":"version","type":"unsigned int","comment":"Version of struct; pass `GIT_CONFIG_BACKEND_VERSION`"}],"argline":"git_config_backend *backend, unsigned int version","sig":"git_config_backend *::unsigned int","return":{"type":"int","comment":" Zero on success; -1 on failure."},"description":"

Initializes a git_config_backend with default values. Equivalent to\n creating an instance with GIT_CONFIG_BACKEND_INIT.

\n","comments":"","group":"config"},"git_config_add_backend":{"type":"function","file":"sys/config.h","line":105,"lineto":109,"args":[{"name":"cfg","type":"git_config *","comment":"the configuration to add the file to"},{"name":"file","type":"git_config_backend *","comment":"the configuration file (backend) to add"},{"name":"level","type":"git_config_level_t","comment":"the priority level of the backend"},{"name":"force","type":"int","comment":"if a config file already exists for the given\n priority level, replace it"}],"argline":"git_config *cfg, git_config_backend *file, git_config_level_t level, int force","sig":"git_config *::git_config_backend *::git_config_level_t::int","return":{"type":"int","comment":" 0 on success, GIT_EEXISTS when adding more than one file\n for a given priority level (and force_replace set to 0), or error code"},"description":"

Add a generic config file instance to an existing config

\n","comments":"

Note that the configuration object will free the file\n automatically.

\n\n

Further queries on this config object will access each\n of the config file instances in order (instances with\n a higher priority level will be accessed first).

\n","group":"config"},"git_diff_print_callback__to_buf":{"type":"function","file":"sys/diff.h","line":37,"lineto":41,"args":[{"name":"delta","type":"const git_diff_delta *","comment":null},{"name":"hunk","type":"const git_diff_hunk *","comment":null},{"name":"line","type":"const git_diff_line *","comment":null},{"name":"payload","type":"void *","comment":null}],"argline":"const git_diff_delta *delta, const git_diff_hunk *hunk, const git_diff_line *line, void *payload","sig":"const git_diff_delta *::const git_diff_hunk *::const git_diff_line *::void *","return":{"type":"int","comment":null},"description":"

Diff print callback that writes to a git_buf.

\n","comments":"

This function is provided not for you to call it directly, but instead\n so you can use it as a function pointer to the git_diff_print or\n git_patch_print APIs. When using those APIs, you specify a callback\n to actually handle the diff and/or patch data.

\n\n

Use this callback to easily write that data to a git_buf buffer. You\n must pass a git_buf * value as the payload to the git_diff_print\n and/or git_patch_print function. The data will be appended to the\n buffer (after any existing content).

\n","group":"diff"},"git_diff_print_callback__to_file_handle":{"type":"function","file":"sys/diff.h","line":57,"lineto":61,"args":[{"name":"delta","type":"const git_diff_delta *","comment":null},{"name":"hunk","type":"const git_diff_hunk *","comment":null},{"name":"line","type":"const git_diff_line *","comment":null},{"name":"payload","type":"void *","comment":null}],"argline":"const git_diff_delta *delta, const git_diff_hunk *hunk, const git_diff_line *line, void *payload","sig":"const git_diff_delta *::const git_diff_hunk *::const git_diff_line *::void *","return":{"type":"int","comment":null},"description":"

Diff print callback that writes to stdio FILE handle.

\n","comments":"

This function is provided not for you to call it directly, but instead\n so you can use it as a function pointer to the git_diff_print or\n git_patch_print APIs. When using those APIs, you specify a callback\n to actually handle the diff and/or patch data.

\n\n

Use this callback to easily write that data to a stdio FILE handle. You\n must pass a FILE * value (such as stdout or stderr or the return\n value from fopen()) as the payload to the git_diff_print\n and/or git_patch_print function. If you pass NULL, this will write\n data to stdout.

\n","group":"diff"},"git_diff_get_perfdata":{"type":"function","file":"sys/diff.h","line":83,"lineto":84,"args":[{"name":"out","type":"git_diff_perfdata *","comment":"Structure to be filled with diff performance data"},{"name":"diff","type":"const git_diff *","comment":"Diff to read performance data from"}],"argline":"git_diff_perfdata *out, const git_diff *diff","sig":"git_diff_perfdata *::const git_diff *","return":{"type":"int","comment":" 0 for success, \n<\n0 for error"},"description":"

Get performance data for a diff object.

\n","comments":"","group":"diff"},"git_status_list_get_perfdata":{"type":"function","file":"sys/diff.h","line":89,"lineto":90,"args":[{"name":"out","type":"git_diff_perfdata *","comment":null},{"name":"status","type":"const git_status_list *","comment":null}],"argline":"git_diff_perfdata *out, const git_status_list *status","sig":"git_diff_perfdata *::const git_status_list *","return":{"type":"int","comment":null},"description":"

Get performance data for diffs from a git_status_list

\n","comments":"","group":"status"},"git_filter_lookup":{"type":"function","file":"sys/filter.h","line":27,"lineto":27,"args":[{"name":"name","type":"const char *","comment":"The name of the filter"}],"argline":"const char *name","sig":"const char *","return":{"type":"git_filter *","comment":" Pointer to the filter object or NULL if not found"},"description":"

Look up a filter by name

\n","comments":"","group":"filter"},"git_filter_list_new":{"type":"function","file":"sys/filter.h","line":57,"lineto":61,"args":[{"name":"out","type":"git_filter_list **","comment":null},{"name":"repo","type":"git_repository *","comment":null},{"name":"mode","type":"git_filter_mode_t","comment":null},{"name":"options","type":"uint32_t","comment":null}],"argline":"git_filter_list **out, git_repository *repo, git_filter_mode_t mode, uint32_t options","sig":"git_filter_list **::git_repository *::git_filter_mode_t::uint32_t","return":{"type":"int","comment":null},"description":"

Create a new empty filter list

\n","comments":"

Normally you won't use this because git_filter_list_load will create\n the filter list for you, but you can use this in combination with the\n git_filter_lookup and git_filter_list_push functions to assemble\n your own chains of filters.

\n","group":"filter"},"git_filter_list_push":{"type":"function","file":"sys/filter.h","line":76,"lineto":77,"args":[{"name":"fl","type":"git_filter_list *","comment":null},{"name":"filter","type":"git_filter *","comment":null},{"name":"payload","type":"void *","comment":null}],"argline":"git_filter_list *fl, git_filter *filter, void *payload","sig":"git_filter_list *::git_filter *::void *","return":{"type":"int","comment":null},"description":"

Add a filter to a filter list with the given payload.

\n","comments":"

Normally you won't have to do this because the filter list is created\n by calling the "check" function on registered filters when the filter\n attributes are set, but this does allow more direct manipulation of\n filter lists when desired.

\n\n

Note that normally the "check" function can set up a payload for the\n filter. Using this function, you can either pass in a payload if you\n know the expected payload format, or you can pass NULL. Some filters\n may fail with a NULL payload. Good luck!

\n","group":"filter"},"git_filter_list_length":{"type":"function","file":"sys/filter.h","line":90,"lineto":90,"args":[{"name":"fl","type":"const git_filter_list *","comment":"A filter list"}],"argline":"const git_filter_list *fl","sig":"const git_filter_list *","return":{"type":"size_t","comment":" The number of filters in the list"},"description":"

Look up how many filters are in the list

\n","comments":"

We will attempt to apply all of these filters to any data passed in,\n but note that the filter apply action still has the option of skipping\n data that is passed in (for example, the CRLF filter will skip data\n that appears to be binary).

\n","group":"filter"},"git_filter_source_repo":{"type":"function","file":"sys/filter.h","line":100,"lineto":100,"args":[{"name":"src","type":"const git_filter_source *","comment":null}],"argline":"const git_filter_source *src","sig":"const git_filter_source *","return":{"type":"git_repository *","comment":null},"description":"

Get the repository that the source data is coming from.

\n","comments":"","group":"filter"},"git_filter_source_path":{"type":"function","file":"sys/filter.h","line":105,"lineto":105,"args":[{"name":"src","type":"const git_filter_source *","comment":null}],"argline":"const git_filter_source *src","sig":"const git_filter_source *","return":{"type":"const char *","comment":null},"description":"

Get the path that the source data is coming from.

\n","comments":"","group":"filter"},"git_filter_source_filemode":{"type":"function","file":"sys/filter.h","line":111,"lineto":111,"args":[{"name":"src","type":"const git_filter_source *","comment":null}],"argline":"const git_filter_source *src","sig":"const git_filter_source *","return":{"type":"uint16_t","comment":null},"description":"

Get the file mode of the source file\n If the mode is unknown, this will return 0

\n","comments":"","group":"filter"},"git_filter_source_id":{"type":"function","file":"sys/filter.h","line":118,"lineto":118,"args":[{"name":"src","type":"const git_filter_source *","comment":null}],"argline":"const git_filter_source *src","sig":"const git_filter_source *","return":{"type":"const git_oid *","comment":null},"description":"

Get the OID of the source\n If the OID is unknown (often the case with GIT_FILTER_CLEAN) then\n this will return NULL.

\n","comments":"","group":"filter"},"git_filter_source_mode":{"type":"function","file":"sys/filter.h","line":123,"lineto":123,"args":[{"name":"src","type":"const git_filter_source *","comment":null}],"argline":"const git_filter_source *src","sig":"const git_filter_source *","return":{"type":"git_filter_mode_t","comment":null},"description":"

Get the git_filter_mode_t to be used

\n","comments":"","group":"filter"},"git_filter_source_flags":{"type":"function","file":"sys/filter.h","line":128,"lineto":128,"args":[{"name":"src","type":"const git_filter_source *","comment":null}],"argline":"const git_filter_source *src","sig":"const git_filter_source *","return":{"type":"uint32_t","comment":null},"description":"

Get the combination git_filter_flag_t options to be applied

\n","comments":"","group":"filter"},"git_filter_register":{"type":"function","file":"sys/filter.h","line":289,"lineto":290,"args":[{"name":"name","type":"const char *","comment":"A name by which the filter can be referenced. Attempting\n \t\t\tto register with an in-use name will return GIT_EEXISTS."},{"name":"filter","type":"git_filter *","comment":"The filter definition. This pointer will be stored as is\n \t\t\tby libgit2 so it must be a durable allocation (either static\n \t\t\tor on the heap)."},{"name":"priority","type":"int","comment":"The priority for filter application"}],"argline":"const char *name, git_filter *filter, int priority","sig":"const char *::git_filter *::int","return":{"type":"int","comment":" 0 on successful registry, error code \n<\n0 on failure"},"description":"

Register a filter under a given name with a given priority.

\n","comments":"

As mentioned elsewhere, the initialize callback will not be invoked\n immediately. It is deferred until the filter is used in some way.

\n\n

A filter's attribute checks and check and apply callbacks will be\n issued in order of priority on smudge (to workdir), and in reverse\n order of priority on clean (to odb).

\n\n

Two filters are preregistered with libgit2:\n - GIT_FILTER_CRLF with priority 0\n - GIT_FILTER_IDENT with priority 100

\n\n

Currently the filter registry is not thread safe, so any registering or\n deregistering of filters must be done outside of any possible usage of\n the filters (i.e. during application setup or shutdown).

\n","group":"filter"},"git_filter_unregister":{"type":"function","file":"sys/filter.h","line":305,"lineto":305,"args":[{"name":"name","type":"const char *","comment":"The name under which the filter was registered"}],"argline":"const char *name","sig":"const char *","return":{"type":"int","comment":" 0 on success, error code \n<\n0 on failure"},"description":"

Remove the filter with the given name

\n","comments":"

Attempting to remove the builtin libgit2 filters is not permitted and\n will return an error.

\n\n

Currently the filter registry is not thread safe, so any registering or\n deregistering of filters must be done outside of any possible usage of\n the filters (i.e. during application setup or shutdown).

\n","group":"filter"},"git_hashsig_create":{"type":"function","file":"sys/hashsig.h","line":62,"lineto":66,"args":[{"name":"out","type":"git_hashsig **","comment":"The computed similarity signature."},{"name":"buf","type":"const char *","comment":"The input buffer."},{"name":"buflen","type":"size_t","comment":"The input buffer size."},{"name":"opts","type":"git_hashsig_option_t","comment":"The signature computation options (see above)."}],"argline":"git_hashsig **out, const char *buf, size_t buflen, git_hashsig_option_t opts","sig":"git_hashsig **::const char *::size_t::git_hashsig_option_t","return":{"type":"int","comment":" 0 on success, GIT_EBUFS if the buffer doesn't contain enough data to\n compute a valid signature (unless GIT_HASHSIG_ALLOW_SMALL_FILES is set), or\n error code."},"description":"

Compute a similarity signature for a text buffer

\n","comments":"

If you have passed the option GIT_HASHSIG_IGNORE_WHITESPACE, then the\n whitespace will be removed from the buffer while it is being processed,\n modifying the buffer in place. Sorry about that!

\n","group":"hashsig"},"git_hashsig_create_fromfile":{"type":"function","file":"sys/hashsig.h","line":81,"lineto":84,"args":[{"name":"out","type":"git_hashsig **","comment":"The computed similarity signature."},{"name":"path","type":"const char *","comment":"The path to the input file."},{"name":"opts","type":"git_hashsig_option_t","comment":"The signature computation options (see above)."}],"argline":"git_hashsig **out, const char *path, git_hashsig_option_t opts","sig":"git_hashsig **::const char *::git_hashsig_option_t","return":{"type":"int","comment":" 0 on success, GIT_EBUFS if the buffer doesn't contain enough data to\n compute a valid signature (unless GIT_HASHSIG_ALLOW_SMALL_FILES is set), or\n error code."},"description":"

Compute a similarity signature for a text file

\n","comments":"

This walks through the file, only loading a maximum of 4K of file data at\n a time. Otherwise, it acts just like git_hashsig_create.

\n","group":"hashsig"},"git_hashsig_free":{"type":"function","file":"sys/hashsig.h","line":91,"lineto":91,"args":[{"name":"sig","type":"git_hashsig *","comment":"The similarity signature to free."}],"argline":"git_hashsig *sig","sig":"git_hashsig *","return":{"type":"void","comment":null},"description":"

Release memory for a content similarity signature

\n","comments":"","group":"hashsig"},"git_hashsig_compare":{"type":"function","file":"sys/hashsig.h","line":100,"lineto":102,"args":[{"name":"a","type":"const git_hashsig *","comment":"The first similarity signature to compare."},{"name":"b","type":"const git_hashsig *","comment":"The second similarity signature to compare."}],"argline":"const git_hashsig *a, const git_hashsig *b","sig":"const git_hashsig *::const git_hashsig *","return":{"type":"int","comment":" [0 to 100] on success as the similarity score, or error code."},"description":"

Measure similarity score between two similarity signatures

\n","comments":"","group":"hashsig"},"git_mempack_new":{"type":"function","file":"sys/mempack.h","line":44,"lineto":44,"args":[{"name":"out","type":"git_odb_backend **","comment":"Poiter where to store the ODB backend"}],"argline":"git_odb_backend **out","sig":"git_odb_backend **","return":{"type":"int","comment":" 0 on success; error code otherwise"},"description":"
Instantiate a new mempack backend.\n
\n","comments":"
The backend must be added to an existing ODB with the highest\npriority.\n\n    git_mempack_new(\n
\n\n

&mempacker\n);\n git_repository_odb(\n&odb\n, repository);\n git_odb_add_backend(odb, mempacker, 999);

\n\n
Once the backend has been loaded, all writes to the ODB will\ninstead be queued in memory, and can be finalized with\n`git_mempack_dump`.\n\nSubsequent reads will also be served from the in-memory store\nto ensure consistency, until the memory store is dumped.\n
\n","group":"mempack"},"git_mempack_reset":{"type":"function","file":"sys/mempack.h","line":81,"lineto":81,"args":[{"name":"backend","type":"git_odb_backend *","comment":"The mempack backend"}],"argline":"git_odb_backend *backend","sig":"git_odb_backend *","return":{"type":"void","comment":null},"description":"
Reset the memory packer by clearing all the queued objects.\n
\n","comments":"
This assumes that `git_mempack_dump` has been called before to\nstore all the queued objects into a single packfile.\n\nAlternatively, call `reset` without a previous dump to "undo"\nall the recently written objects, giving transaction-like\nsemantics to the Git repository.\n
\n","group":"mempack"},"git_odb_init_backend":{"type":"function","file":"sys/odb_backend.h","line":100,"lineto":102,"args":[{"name":"backend","type":"git_odb_backend *","comment":"the `git_odb_backend` struct to initialize."},{"name":"version","type":"unsigned int","comment":"Version the struct; pass `GIT_ODB_BACKEND_VERSION`"}],"argline":"git_odb_backend *backend, unsigned int version","sig":"git_odb_backend *::unsigned int","return":{"type":"int","comment":" Zero on success; -1 on failure."},"description":"

Initializes a git_odb_backend with default values. Equivalent to\n creating an instance with GIT_ODB_BACKEND_INIT.

\n","comments":"","group":"odb"},"git_openssl_set_locking":{"type":"function","file":"sys/openssl.h","line":34,"lineto":34,"args":[],"argline":"","sig":"","return":{"type":"int","comment":" 0 on success, -1 if there are errors or if libgit2 was not\n built with OpenSSL and threading support."},"description":"

Initialize the OpenSSL locks

\n","comments":"

OpenSSL requires the application to determine how it performs\n locking.

\n\n

This is a last-resort convenience function which libgit2 provides for\n allocating and initializing the locks as well as setting the\n locking function to use the system's native locking functions.

\n\n

The locking function will be cleared and the memory will be freed\n when you call git_threads_sutdown().

\n\n

If your programming language has an OpenSSL package/bindings, it\n likely sets up locking. You should very strongly prefer that over\n this function.

\n","group":"openssl"},"git_refdb_init_backend":{"type":"function","file":"sys/refdb_backend.h","line":182,"lineto":184,"args":[{"name":"backend","type":"git_refdb_backend *","comment":"the `git_refdb_backend` struct to initialize"},{"name":"version","type":"unsigned int","comment":"Version of struct; pass `GIT_REFDB_BACKEND_VERSION`"}],"argline":"git_refdb_backend *backend, unsigned int version","sig":"git_refdb_backend *::unsigned int","return":{"type":"int","comment":" Zero on success; -1 on failure."},"description":"

Initializes a git_refdb_backend with default values. Equivalent to\n creating an instance with GIT_REFDB_BACKEND_INIT.

\n","comments":"","group":"refdb"},"git_refdb_backend_fs":{"type":"function","file":"sys/refdb_backend.h","line":197,"lineto":199,"args":[{"name":"backend_out","type":"git_refdb_backend **","comment":"Output pointer to the git_refdb_backend object"},{"name":"repo","type":"git_repository *","comment":"Git repository to access"}],"argline":"git_refdb_backend **backend_out, git_repository *repo","sig":"git_refdb_backend **::git_repository *","return":{"type":"int","comment":" 0 on success, \n<\n0 error code on failure"},"description":"

Constructors for default filesystem-based refdb backend

\n","comments":"

Under normal usage, this is called for you when the repository is\n opened / created, but you can use this to explicitly construct a\n filesystem refdb backend for a repository.

\n","group":"refdb"},"git_refdb_set_backend":{"type":"function","file":"sys/refdb_backend.h","line":211,"lineto":213,"args":[{"name":"refdb","type":"git_refdb *","comment":"database to add the backend to"},{"name":"backend","type":"git_refdb_backend *","comment":"pointer to a git_refdb_backend instance"}],"argline":"git_refdb *refdb, git_refdb_backend *backend","sig":"git_refdb *::git_refdb_backend *","return":{"type":"int","comment":" 0 on success; error code otherwise"},"description":"

Sets the custom backend to an existing reference DB

\n","comments":"

The git_refdb will take ownership of the git_refdb_backend so you\n should NOT free it after calling this function.

\n","group":"refdb"},"git_reference__alloc":{"type":"function","file":"sys/refs.h","line":31,"lineto":34,"args":[{"name":"name","type":"const char *","comment":"the reference name"},{"name":"oid","type":"const git_oid *","comment":"the object id for a direct reference"},{"name":"peel","type":"const git_oid *","comment":"the first non-tag object's OID, or NULL"}],"argline":"const char *name, const git_oid *oid, const git_oid *peel","sig":"const char *::const git_oid *::const git_oid *","return":{"type":"git_reference *","comment":" the created git_reference or NULL on error"},"description":"

Create a new direct reference from an OID.

\n","comments":"","group":"reference"},"git_reference__alloc_symbolic":{"type":"function","file":"sys/refs.h","line":43,"lineto":45,"args":[{"name":"name","type":"const char *","comment":"the reference name"},{"name":"target","type":"const char *","comment":"the target for a symbolic reference"}],"argline":"const char *name, const char *target","sig":"const char *::const char *","return":{"type":"git_reference *","comment":" the created git_reference or NULL on error"},"description":"

Create a new symbolic reference.

\n","comments":"","group":"reference"},"git_repository_new":{"type":"function","file":"sys/repository.h","line":31,"lineto":31,"args":[{"name":"out","type":"git_repository **","comment":"The blank repository"}],"argline":"git_repository **out","sig":"git_repository **","return":{"type":"int","comment":" 0 on success, or an error code"},"description":"

Create a new repository with neither backends nor config object

\n","comments":"

Note that this is only useful if you wish to associate the repository\n with a non-filesystem-backed object database and config store.

\n","group":"repository"},"git_repository__cleanup":{"type":"function","file":"sys/repository.h","line":44,"lineto":44,"args":[{"name":"repo","type":"git_repository *","comment":null}],"argline":"git_repository *repo","sig":"git_repository *","return":{"type":"void","comment":null},"description":"

Reset all the internal state in a repository.

\n","comments":"

This will free all the mapped memory and internal objects\n of the repository and leave it in a "blank" state.

\n\n

There's no need to call this function directly unless you're\n trying to aggressively cleanup the repo before its\n deallocation. git_repository_free already performs this operation\n before deallocation the repo.

\n","group":"repository"},"git_repository_reinit_filesystem":{"type":"function","file":"sys/repository.h","line":61,"lineto":63,"args":[{"name":"repo","type":"git_repository *","comment":"A repository object"},{"name":"recurse_submodules","type":"int","comment":"Should submodules be updated recursively"}],"argline":"git_repository *repo, int recurse_submodules","sig":"git_repository *::int","return":{"type":"int","comment":" 0 on success, \n<\n 0 on error"},"description":"

Update the filesystem config settings for an open repository

\n","comments":"

When a repository is initialized, config values are set based on the\n properties of the filesystem that the repository is on, such as\n "core.ignorecase", "core.filemode", "core.symlinks", etc. If the\n repository is moved to a new filesystem, these properties may no\n longer be correct and API calls may not behave as expected. This\n call reruns the phase of repository initialization that sets those\n properties to compensate for the current filesystem of the repo.

\n","group":"repository"},"git_repository_set_config":{"type":"function","file":"sys/repository.h","line":78,"lineto":78,"args":[{"name":"repo","type":"git_repository *","comment":"A repository object"},{"name":"config","type":"git_config *","comment":"A Config object"}],"argline":"git_repository *repo, git_config *config","sig":"git_repository *::git_config *","return":{"type":"void","comment":null},"description":"

Set the configuration file for this repository

\n","comments":"

This configuration file will be used for all configuration\n queries involving this repository.

\n\n

The repository will keep a reference to the config file;\n the user must still free the config after setting it\n to the repository, or it will leak.

\n","group":"repository"},"git_repository_set_odb":{"type":"function","file":"sys/repository.h","line":93,"lineto":93,"args":[{"name":"repo","type":"git_repository *","comment":"A repository object"},{"name":"odb","type":"git_odb *","comment":"An ODB object"}],"argline":"git_repository *repo, git_odb *odb","sig":"git_repository *::git_odb *","return":{"type":"void","comment":null},"description":"

Set the Object Database for this repository

\n","comments":"

The ODB will be used for all object-related operations\n involving this repository.

\n\n

The repository will keep a reference to the ODB; the user\n must still free the ODB object after setting it to the\n repository, or it will leak.

\n","group":"repository"},"git_repository_set_refdb":{"type":"function","file":"sys/repository.h","line":108,"lineto":108,"args":[{"name":"repo","type":"git_repository *","comment":"A repository object"},{"name":"refdb","type":"git_refdb *","comment":"An refdb object"}],"argline":"git_repository *repo, git_refdb *refdb","sig":"git_repository *::git_refdb *","return":{"type":"void","comment":null},"description":"

Set the Reference Database Backend for this repository

\n","comments":"

The refdb will be used for all reference related operations\n involving this repository.

\n\n

The repository will keep a reference to the refdb; the user\n must still free the refdb object after setting it to the\n repository, or it will leak.

\n","group":"repository"},"git_repository_set_index":{"type":"function","file":"sys/repository.h","line":123,"lineto":123,"args":[{"name":"repo","type":"git_repository *","comment":"A repository object"},{"name":"index","type":"git_index *","comment":"An index object"}],"argline":"git_repository *repo, git_index *index","sig":"git_repository *::git_index *","return":{"type":"void","comment":null},"description":"

Set the index file for this repository

\n","comments":"

This index will be used for all index-related operations\n involving this repository.

\n\n

The repository will keep a reference to the index file;\n the user must still free the index after setting it\n to the repository, or it will leak.

\n","group":"repository"},"git_repository_set_bare":{"type":"function","file":"sys/repository.h","line":136,"lineto":136,"args":[{"name":"repo","type":"git_repository *","comment":"Repo to make bare"}],"argline":"git_repository *repo","sig":"git_repository *","return":{"type":"int","comment":" 0 on success, \n<\n0 on failure"},"description":"

Set a repository to be bare.

\n","comments":"

Clear the working directory and set core.bare to true. You may also\n want to call git_repository_set_index(repo, NULL) since a bare repo\n typically does not have an index, but this function will not do that\n for you.

\n","group":"repository"},"git_transport_init":{"type":"function","file":"sys/transport.h","line":111,"lineto":113,"args":[{"name":"opts","type":"git_transport *","comment":"the `git_transport` struct to initialize"},{"name":"version","type":"unsigned int","comment":"Version of struct; pass `GIT_TRANSPORT_VERSION`"}],"argline":"git_transport *opts, unsigned int version","sig":"git_transport *::unsigned int","return":{"type":"int","comment":" Zero on success; -1 on failure."},"description":"

Initializes a git_transport with default values. Equivalent to\n creating an instance with GIT_TRANSPORT_INIT.

\n","comments":"","group":"transport"},"git_transport_new":{"type":"function","file":"sys/transport.h","line":125,"lineto":125,"args":[{"name":"out","type":"git_transport **","comment":"The newly created transport (out)"},{"name":"owner","type":"git_remote *","comment":"The git_remote which will own this transport"},{"name":"url","type":"const char *","comment":"The URL to connect to"}],"argline":"git_transport **out, git_remote *owner, const char *url","sig":"git_transport **::git_remote *::const char *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Function to use to create a transport from a URL. The transport database\n is scanned to find a transport that implements the scheme of the URI (i.e.\n git:// or http://) and a transport object is returned to the caller.

\n","comments":"","group":"transport"},"git_transport_ssh_with_paths":{"type":"function","file":"sys/transport.h","line":141,"lineto":141,"args":[{"name":"out","type":"git_transport **","comment":"the resulting transport"},{"name":"owner","type":"git_remote *","comment":"the owning remote"},{"name":"payload","type":"void *","comment":"a strarray with the paths"}],"argline":"git_transport **out, git_remote *owner, void *payload","sig":"git_transport **::git_remote *::void *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Create an ssh transport with custom git command paths

\n","comments":"

This is a factory function suitable for setting as the transport\n callback in a remote (or for a clone in the options).

\n\n

The payload argument must be a strarray pointer with the paths for\n the git-upload-pack and git-receive-pack at index 0 and 1.

\n","group":"transport"},"git_transport_unregister":{"type":"function","file":"sys/transport.h","line":169,"lineto":170,"args":[{"name":"prefix","type":"const char *","comment":"From the previous call to git_transport_register"}],"argline":"const char *prefix","sig":"const char *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Unregister a custom transport definition which was previously registered\n with git_transport_register.

\n","comments":"","group":"transport"},"git_transport_dummy":{"type":"function","file":"sys/transport.h","line":183,"lineto":186,"args":[{"name":"out","type":"git_transport **","comment":"The newly created transport (out)"},{"name":"owner","type":"git_remote *","comment":"The git_remote which will own this transport"},{"name":"payload","type":"void *","comment":"You must pass NULL for this parameter."}],"argline":"git_transport **out, git_remote *owner, void *payload","sig":"git_transport **::git_remote *::void *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Create an instance of the dummy transport.

\n","comments":"","group":"transport"},"git_transport_local":{"type":"function","file":"sys/transport.h","line":196,"lineto":199,"args":[{"name":"out","type":"git_transport **","comment":"The newly created transport (out)"},{"name":"owner","type":"git_remote *","comment":"The git_remote which will own this transport"},{"name":"payload","type":"void *","comment":"You must pass NULL for this parameter."}],"argline":"git_transport **out, git_remote *owner, void *payload","sig":"git_transport **::git_remote *::void *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Create an instance of the local transport.

\n","comments":"","group":"transport"},"git_transport_smart":{"type":"function","file":"sys/transport.h","line":209,"lineto":212,"args":[{"name":"out","type":"git_transport **","comment":"The newly created transport (out)"},{"name":"owner","type":"git_remote *","comment":"The git_remote which will own this transport"},{"name":"payload","type":"void *","comment":"A pointer to a git_smart_subtransport_definition"}],"argline":"git_transport **out, git_remote *owner, void *payload","sig":"git_transport **::git_remote *::void *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Create an instance of the smart transport.

\n","comments":"","group":"transport"},"git_smart_subtransport_http":{"type":"function","file":"sys/transport.h","line":322,"lineto":325,"args":[{"name":"out","type":"git_smart_subtransport **","comment":"The newly created subtransport"},{"name":"owner","type":"git_transport *","comment":"The smart transport to own this subtransport"},{"name":"param","type":"void *","comment":null}],"argline":"git_smart_subtransport **out, git_transport *owner, void *param","sig":"git_smart_subtransport **::git_transport *::void *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Create an instance of the http subtransport. This subtransport\n also supports https. On Win32, this subtransport may be implemented\n using the WinHTTP library.

\n","comments":"","group":"smart"},"git_smart_subtransport_git":{"type":"function","file":"sys/transport.h","line":334,"lineto":337,"args":[{"name":"out","type":"git_smart_subtransport **","comment":"The newly created subtransport"},{"name":"owner","type":"git_transport *","comment":"The smart transport to own this subtransport"},{"name":"param","type":"void *","comment":null}],"argline":"git_smart_subtransport **out, git_transport *owner, void *param","sig":"git_smart_subtransport **::git_transport *::void *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Create an instance of the git subtransport.

\n","comments":"","group":"smart"},"git_smart_subtransport_ssh":{"type":"function","file":"sys/transport.h","line":346,"lineto":349,"args":[{"name":"out","type":"git_smart_subtransport **","comment":"The newly created subtransport"},{"name":"owner","type":"git_transport *","comment":"The smart transport to own this subtransport"},{"name":"param","type":"void *","comment":null}],"argline":"git_smart_subtransport **out, git_transport *owner, void *param","sig":"git_smart_subtransport **::git_transport *::void *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Create an instance of the ssh subtransport.

\n","comments":"","group":"smart"},"git_tag_lookup":{"type":"function","file":"tag.h","line":33,"lineto":34,"args":[{"name":"out","type":"git_tag **","comment":"pointer to the looked up tag"},{"name":"repo","type":"git_repository *","comment":"the repo to use when locating the tag."},{"name":"id","type":"const git_oid *","comment":"identity of the tag to locate."}],"argline":"git_tag **out, git_repository *repo, const git_oid *id","sig":"git_tag **::git_repository *::const git_oid *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Lookup a tag object from the repository.

\n","comments":"","group":"tag","examples":{"general.c":["ex/v0.23.2/general.html#git_tag_lookup-70"]}},"git_tag_lookup_prefix":{"type":"function","file":"tag.h","line":48,"lineto":49,"args":[{"name":"out","type":"git_tag **","comment":"pointer to the looked up tag"},{"name":"repo","type":"git_repository *","comment":"the repo to use when locating the tag."},{"name":"id","type":"const git_oid *","comment":"identity of the tag to locate."},{"name":"len","type":"size_t","comment":"the length of the short identifier"}],"argline":"git_tag **out, git_repository *repo, const git_oid *id, size_t len","sig":"git_tag **::git_repository *::const git_oid *::size_t","return":{"type":"int","comment":" 0 or an error code"},"description":"

Lookup a tag object from the repository,\n given a prefix of its identifier (short id).

\n","comments":"","group":"tag"},"git_tag_free":{"type":"function","file":"tag.h","line":61,"lineto":61,"args":[{"name":"tag","type":"git_tag *","comment":"the tag to close"}],"argline":"git_tag *tag","sig":"git_tag *","return":{"type":"void","comment":null},"description":"

Close an open tag

\n","comments":"

You can no longer use the git_tag pointer after this call.

\n\n

IMPORTANT: You MUST call this method when you are through with a tag to\n release memory. Failure to do so will cause a memory leak.

\n","group":"tag"},"git_tag_id":{"type":"function","file":"tag.h","line":69,"lineto":69,"args":[{"name":"tag","type":"const git_tag *","comment":"a previously loaded tag."}],"argline":"const git_tag *tag","sig":"const git_tag *","return":{"type":"const git_oid *","comment":" object identity for the tag."},"description":"

Get the id of a tag.

\n","comments":"","group":"tag"},"git_tag_owner":{"type":"function","file":"tag.h","line":77,"lineto":77,"args":[{"name":"tag","type":"const git_tag *","comment":"A previously loaded tag."}],"argline":"const git_tag *tag","sig":"const git_tag *","return":{"type":"git_repository *","comment":" Repository that contains this tag."},"description":"

Get the repository that contains the tag.

\n","comments":"","group":"tag"},"git_tag_target":{"type":"function","file":"tag.h","line":89,"lineto":89,"args":[{"name":"target_out","type":"git_object **","comment":"pointer where to store the target"},{"name":"tag","type":"const git_tag *","comment":"a previously loaded tag."}],"argline":"git_object **target_out, const git_tag *tag","sig":"git_object **::const git_tag *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Get the tagged object of a tag

\n","comments":"

This method performs a repository lookup for the\n given object and returns it

\n","group":"tag","examples":{"general.c":["ex/v0.23.2/general.html#git_tag_target-71"]}},"git_tag_target_id":{"type":"function","file":"tag.h","line":97,"lineto":97,"args":[{"name":"tag","type":"const git_tag *","comment":"a previously loaded tag."}],"argline":"const git_tag *tag","sig":"const git_tag *","return":{"type":"const git_oid *","comment":" pointer to the OID"},"description":"

Get the OID of the tagged object of a tag

\n","comments":"","group":"tag","examples":{"cat-file.c":["ex/v0.23.2/cat-file.html#git_tag_target_id-35"]}},"git_tag_target_type":{"type":"function","file":"tag.h","line":105,"lineto":105,"args":[{"name":"tag","type":"const git_tag *","comment":"a previously loaded tag."}],"argline":"const git_tag *tag","sig":"const git_tag *","return":{"type":"git_otype","comment":" type of the tagged object"},"description":"

Get the type of a tag's tagged object

\n","comments":"","group":"tag","examples":{"cat-file.c":["ex/v0.23.2/cat-file.html#git_tag_target_type-36"],"general.c":["ex/v0.23.2/general.html#git_tag_target_type-72"]}},"git_tag_name":{"type":"function","file":"tag.h","line":113,"lineto":113,"args":[{"name":"tag","type":"const git_tag *","comment":"a previously loaded tag."}],"argline":"const git_tag *tag","sig":"const git_tag *","return":{"type":"const char *","comment":" name of the tag"},"description":"

Get the name of a tag

\n","comments":"","group":"tag","examples":{"cat-file.c":["ex/v0.23.2/cat-file.html#git_tag_name-37"],"general.c":["ex/v0.23.2/general.html#git_tag_name-73"],"tag.c":["ex/v0.23.2/tag.html#git_tag_name-20"]}},"git_tag_tagger":{"type":"function","file":"tag.h","line":121,"lineto":121,"args":[{"name":"tag","type":"const git_tag *","comment":"a previously loaded tag."}],"argline":"const git_tag *tag","sig":"const git_tag *","return":{"type":"const git_signature *","comment":" reference to the tag's author or NULL when unspecified"},"description":"

Get the tagger (author) of a tag

\n","comments":"","group":"tag","examples":{"cat-file.c":["ex/v0.23.2/cat-file.html#git_tag_tagger-38"]}},"git_tag_message":{"type":"function","file":"tag.h","line":129,"lineto":129,"args":[{"name":"tag","type":"const git_tag *","comment":"a previously loaded tag."}],"argline":"const git_tag *tag","sig":"const git_tag *","return":{"type":"const char *","comment":" message of the tag or NULL when unspecified"},"description":"

Get the message of a tag

\n","comments":"","group":"tag","examples":{"cat-file.c":["ex/v0.23.2/cat-file.html#git_tag_message-39","ex/v0.23.2/cat-file.html#git_tag_message-40"],"general.c":["ex/v0.23.2/general.html#git_tag_message-74"],"tag.c":["ex/v0.23.2/tag.html#git_tag_message-21"]}},"git_tag_create":{"type":"function","file":"tag.h","line":171,"lineto":178,"args":[{"name":"oid","type":"git_oid *","comment":"Pointer where to store the OID of the\n newly created tag. If the tag already exists, this parameter\n will be the oid of the existing tag, and the function will\n return a GIT_EEXISTS error code."},{"name":"repo","type":"git_repository *","comment":"Repository where to store the tag"},{"name":"tag_name","type":"const char *","comment":"Name for the tag; this name is validated\n for consistency. It should also not conflict with an\n already existing tag name"},{"name":"target","type":"const git_object *","comment":"Object to which this tag points. This object\n must belong to the given `repo`."},{"name":"tagger","type":"const git_signature *","comment":"Signature of the tagger for this tag, and\n of the tagging time"},{"name":"message","type":"const char *","comment":"Full message for this tag"},{"name":"force","type":"int","comment":"Overwrite existing references"}],"argline":"git_oid *oid, git_repository *repo, const char *tag_name, const git_object *target, const git_signature *tagger, const char *message, int force","sig":"git_oid *::git_repository *::const char *::const git_object *::const git_signature *::const char *::int","return":{"type":"int","comment":" 0 on success, GIT_EINVALIDSPEC or an error code\n\tA tag object is written to the ODB, and a proper reference\n\tis written in the /refs/tags folder, pointing to it"},"description":"

Create a new tag in the repository from an object

\n","comments":"

A new reference will also be created pointing to\n this tag object. If force is true and a reference\n already exists with the given name, it'll be replaced.

\n\n

The message will not be cleaned up. This can be achieved\n through git_message_prettify().

\n\n

The tag name will be checked for validity. You must avoid\n the characters '~', '^', ':', '\n\\\n', '?', '[', and '*', and the\n sequences ".." and "\n@\n{" which have special meaning to revparse.

\n","group":"tag","examples":{"tag.c":["ex/v0.23.2/tag.html#git_tag_create-22"]}},"git_tag_annotation_create":{"type":"function","file":"tag.h","line":203,"lineto":209,"args":[{"name":"oid","type":"git_oid *","comment":"Pointer where to store the OID of the\n newly created tag"},{"name":"repo","type":"git_repository *","comment":"Repository where to store the tag"},{"name":"tag_name","type":"const char *","comment":"Name for the tag"},{"name":"target","type":"const git_object *","comment":"Object to which this tag points. This object\n must belong to the given `repo`."},{"name":"tagger","type":"const git_signature *","comment":"Signature of the tagger for this tag, and\n of the tagging time"},{"name":"message","type":"const char *","comment":"Full message for this tag"}],"argline":"git_oid *oid, git_repository *repo, const char *tag_name, const git_object *target, const git_signature *tagger, const char *message","sig":"git_oid *::git_repository *::const char *::const git_object *::const git_signature *::const char *","return":{"type":"int","comment":" 0 on success or an error code"},"description":"

Create a new tag in the object database pointing to a git_object

\n","comments":"

The message will not be cleaned up. This can be achieved\n through git_message_prettify().

\n","group":"tag"},"git_tag_create_frombuffer":{"type":"function","file":"tag.h","line":220,"lineto":224,"args":[{"name":"oid","type":"git_oid *","comment":"Pointer where to store the OID of the newly created tag"},{"name":"repo","type":"git_repository *","comment":"Repository where to store the tag"},{"name":"buffer","type":"const char *","comment":"Raw tag data"},{"name":"force","type":"int","comment":"Overwrite existing tags"}],"argline":"git_oid *oid, git_repository *repo, const char *buffer, int force","sig":"git_oid *::git_repository *::const char *::int","return":{"type":"int","comment":" 0 on success; error code otherwise"},"description":"

Create a new tag in the repository from a buffer

\n","comments":"","group":"tag"},"git_tag_create_lightweight":{"type":"function","file":"tag.h","line":256,"lineto":261,"args":[{"name":"oid","type":"git_oid *","comment":"Pointer where to store the OID of the provided\n target object. If the tag already exists, this parameter\n will be filled with the oid of the existing pointed object\n and the function will return a GIT_EEXISTS error code."},{"name":"repo","type":"git_repository *","comment":"Repository where to store the lightweight tag"},{"name":"tag_name","type":"const char *","comment":"Name for the tag; this name is validated\n for consistency. It should also not conflict with an\n already existing tag name"},{"name":"target","type":"const git_object *","comment":"Object to which this tag points. This object\n must belong to the given `repo`."},{"name":"force","type":"int","comment":"Overwrite existing references"}],"argline":"git_oid *oid, git_repository *repo, const char *tag_name, const git_object *target, int force","sig":"git_oid *::git_repository *::const char *::const git_object *::int","return":{"type":"int","comment":" 0 on success, GIT_EINVALIDSPEC or an error code\n\tA proper reference is written in the /refs/tags folder,\n pointing to the provided target object"},"description":"

Create a new lightweight tag pointing at a target object

\n","comments":"

A new direct reference will be created pointing to\n this target object. If force is true and a reference\n already exists with the given name, it'll be replaced.

\n\n

The tag name will be checked for validity.\n See git_tag_create() for rules about valid names.

\n","group":"tag","examples":{"tag.c":["ex/v0.23.2/tag.html#git_tag_create_lightweight-23"]}},"git_tag_delete":{"type":"function","file":"tag.h","line":276,"lineto":278,"args":[{"name":"repo","type":"git_repository *","comment":"Repository where lives the tag"},{"name":"tag_name","type":"const char *","comment":"Name of the tag to be deleted;\n this name is validated for consistency."}],"argline":"git_repository *repo, const char *tag_name","sig":"git_repository *::const char *","return":{"type":"int","comment":" 0 on success, GIT_EINVALIDSPEC or an error code"},"description":"

Delete an existing tag reference.

\n","comments":"

The tag name will be checked for validity.\n See git_tag_create() for rules about valid names.

\n","group":"tag","examples":{"tag.c":["ex/v0.23.2/tag.html#git_tag_delete-24"]}},"git_tag_list":{"type":"function","file":"tag.h","line":293,"lineto":295,"args":[{"name":"tag_names","type":"git_strarray *","comment":"Pointer to a git_strarray structure where\n\t\tthe tag names will be stored"},{"name":"repo","type":"git_repository *","comment":"Repository where to find the tags"}],"argline":"git_strarray *tag_names, git_repository *repo","sig":"git_strarray *::git_repository *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Fill a list with all the tags in the Repository

\n","comments":"

The string array will be filled with the names of the\n matching tags; these values are owned by the user and\n should be free'd manually when no longer needed, using\n git_strarray_free.

\n","group":"tag"},"git_tag_list_match":{"type":"function","file":"tag.h","line":315,"lineto":318,"args":[{"name":"tag_names","type":"git_strarray *","comment":"Pointer to a git_strarray structure where\n\t\tthe tag names will be stored"},{"name":"pattern","type":"const char *","comment":"Standard fnmatch pattern"},{"name":"repo","type":"git_repository *","comment":"Repository where to find the tags"}],"argline":"git_strarray *tag_names, const char *pattern, git_repository *repo","sig":"git_strarray *::const char *::git_repository *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Fill a list with all the tags in the Repository\n which name match a defined pattern

\n","comments":"

If an empty pattern is provided, all the tags\n will be returned.

\n\n

The string array will be filled with the names of the\n matching tags; these values are owned by the user and\n should be free'd manually when no longer needed, using\n git_strarray_free.

\n","group":"tag","examples":{"tag.c":["ex/v0.23.2/tag.html#git_tag_list_match-25"]}},"git_tag_foreach":{"type":"function","file":"tag.h","line":330,"lineto":333,"args":[{"name":"repo","type":"git_repository *","comment":"Repository"},{"name":"callback","type":"git_tag_foreach_cb","comment":"Callback function"},{"name":"payload","type":"void *","comment":"Pointer to callback data (optional)"}],"argline":"git_repository *repo, git_tag_foreach_cb callback, void *payload","sig":"git_repository *::git_tag_foreach_cb::void *","return":{"type":"int","comment":null},"description":"

Call callback `cb' for each tag in the repository

\n","comments":"","group":"tag"},"git_tag_peel":{"type":"function","file":"tag.h","line":346,"lineto":348,"args":[{"name":"tag_target_out","type":"git_object **","comment":"Pointer to the peeled git_object"},{"name":"tag","type":"const git_tag *","comment":"The tag to be processed"}],"argline":"git_object **tag_target_out, const git_tag *tag","sig":"git_object **::const git_tag *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Recursively peel a tag until a non tag git_object is found

\n","comments":"

The retrieved tag_target object is owned by the repository\n and should be closed with the git_object_free method.

\n","group":"tag"},"git_trace_set":{"type":"function","file":"trace.h","line":63,"lineto":63,"args":[{"name":"level","type":"git_trace_level_t","comment":"Level to set tracing to"},{"name":"cb","type":"git_trace_callback","comment":"Function to call with trace data"}],"argline":"git_trace_level_t level, git_trace_callback cb","sig":"git_trace_level_t::git_trace_callback","return":{"type":"int","comment":" 0 or an error code"},"description":"

Sets the system tracing configuration to the specified level with the\n specified callback. When system events occur at a level equal to, or\n lower than, the given level they will be reported to the given callback.

\n","comments":"","group":"trace"},"git_cred_has_username":{"type":"function","file":"transport.h","line":197,"lineto":197,"args":[{"name":"cred","type":"git_cred *","comment":"object to check"}],"argline":"git_cred *cred","sig":"git_cred *","return":{"type":"int","comment":" 1 if the credential object has non-NULL username, 0 otherwise"},"description":"

Check whether a credential object contains username information.

\n","comments":"","group":"cred"},"git_cred_userpass_plaintext_new":{"type":"function","file":"transport.h","line":208,"lineto":211,"args":[{"name":"out","type":"git_cred **","comment":"The newly created credential object."},{"name":"username","type":"const char *","comment":"The username of the credential."},{"name":"password","type":"const char *","comment":"The password of the credential."}],"argline":"git_cred **out, const char *username, const char *password","sig":"git_cred **::const char *::const char *","return":{"type":"int","comment":" 0 for success or an error code for failure"},"description":"

Create a new plain-text username and password credential object.\n The supplied credential parameter will be internally duplicated.

\n","comments":"","group":"cred"},"git_cred_ssh_key_new":{"type":"function","file":"transport.h","line":224,"lineto":229,"args":[{"name":"out","type":"git_cred **","comment":"The newly created credential object."},{"name":"username","type":"const char *","comment":"username to use to authenticate"},{"name":"publickey","type":"const char *","comment":"The path to the public key of the credential."},{"name":"privatekey","type":"const char *","comment":"The path to the private key of the credential."},{"name":"passphrase","type":"const char *","comment":"The passphrase of the credential."}],"argline":"git_cred **out, const char *username, const char *publickey, const char *privatekey, const char *passphrase","sig":"git_cred **::const char *::const char *::const char *::const char *","return":{"type":"int","comment":" 0 for success or an error code for failure"},"description":"

Create a new passphrase-protected ssh key credential object.\n The supplied credential parameter will be internally duplicated.

\n","comments":"","group":"cred"},"git_cred_ssh_interactive_new":{"type":"function","file":"transport.h","line":240,"lineto":244,"args":[{"name":"out","type":"git_cred **","comment":null},{"name":"username","type":"const char *","comment":"Username to use to authenticate."},{"name":"prompt_callback","type":"git_cred_ssh_interactive_callback","comment":"The callback method used for prompts."},{"name":"payload","type":"void *","comment":"Additional data to pass to the callback."}],"argline":"git_cred **out, const char *username, git_cred_ssh_interactive_callback prompt_callback, void *payload","sig":"git_cred **::const char *::git_cred_ssh_interactive_callback::void *","return":{"type":"int","comment":" 0 for success or an error code for failure."},"description":"

Create a new ssh keyboard-interactive based credential object.\n The supplied credential parameter will be internally duplicated.

\n","comments":"","group":"cred"},"git_cred_ssh_key_from_agent":{"type":"function","file":"transport.h","line":254,"lineto":256,"args":[{"name":"out","type":"git_cred **","comment":"The newly created credential object."},{"name":"username","type":"const char *","comment":"username to use to authenticate"}],"argline":"git_cred **out, const char *username","sig":"git_cred **::const char *","return":{"type":"int","comment":" 0 for success or an error code for failure"},"description":"

Create a new ssh key credential object used for querying an ssh-agent.\n The supplied credential parameter will be internally duplicated.

\n","comments":"","group":"cred"},"git_cred_ssh_custom_new":{"type":"function","file":"transport.h","line":276,"lineto":282,"args":[{"name":"out","type":"git_cred **","comment":"The newly created credential object."},{"name":"username","type":"const char *","comment":"username to use to authenticate"},{"name":"publickey","type":"const char *","comment":"The bytes of the public key."},{"name":"publickey_len","type":"size_t","comment":"The length of the public key in bytes."},{"name":"sign_callback","type":"git_cred_sign_callback","comment":"The callback method to sign the data during the challenge."},{"name":"payload","type":"void *","comment":"Additional data to pass to the callback."}],"argline":"git_cred **out, const char *username, const char *publickey, size_t publickey_len, git_cred_sign_callback sign_callback, void *payload","sig":"git_cred **::const char *::const char *::size_t::git_cred_sign_callback::void *","return":{"type":"int","comment":" 0 for success or an error code for failure"},"description":"

Create an ssh key credential with a custom signing function.

\n","comments":"

This lets you use your own function to sign the challenge.

\n\n

This function and its credential type is provided for completeness\n and wraps libssh2_userauth_publickey(), which is undocumented.

\n\n

The supplied credential parameter will be internally duplicated.

\n","group":"cred"},"git_cred_default_new":{"type":"function","file":"transport.h","line":290,"lineto":290,"args":[{"name":"out","type":"git_cred **","comment":null}],"argline":"git_cred **out","sig":"git_cred **","return":{"type":"int","comment":" 0 for success or an error code for failure"},"description":"

Create a "default" credential usable for Negotiate mechanisms like NTLM\n or Kerberos authentication.

\n","comments":"","group":"cred"},"git_cred_username_new":{"type":"function","file":"transport.h","line":298,"lineto":298,"args":[{"name":"cred","type":"git_cred **","comment":null},{"name":"username","type":"const char *","comment":null}],"argline":"git_cred **cred, const char *username","sig":"git_cred **::const char *","return":{"type":"int","comment":null},"description":"

Create a credential to specify a username.

\n","comments":"

This is used with ssh authentication to query for the username if\n none is specified in the url.

\n","group":"cred"},"git_cred_ssh_key_memory_new":{"type":"function","file":"transport.h","line":310,"lineto":315,"args":[{"name":"out","type":"git_cred **","comment":"The newly created credential object."},{"name":"username","type":"const char *","comment":"username to use to authenticate."},{"name":"publickey","type":"const char *","comment":"The public key of the credential."},{"name":"privatekey","type":"const char *","comment":"The private key of the credential."},{"name":"passphrase","type":"const char *","comment":"The passphrase of the credential."}],"argline":"git_cred **out, const char *username, const char *publickey, const char *privatekey, const char *passphrase","sig":"git_cred **::const char *::const char *::const char *::const char *","return":{"type":"int","comment":" 0 for success or an error code for failure"},"description":"

Create a new ssh key credential object reading the keys from memory.

\n","comments":"","group":"cred"},"git_tree_lookup":{"type":"function","file":"tree.h","line":32,"lineto":33,"args":[{"name":"out","type":"git_tree **","comment":"Pointer to the looked up tree"},{"name":"repo","type":"git_repository *","comment":"The repo to use when locating the tree."},{"name":"id","type":"const git_oid *","comment":"Identity of the tree to locate."}],"argline":"git_tree **out, git_repository *repo, const git_oid *id","sig":"git_tree **::git_repository *::const git_oid *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Lookup a tree object from the repository.

\n","comments":"","group":"tree","examples":{"general.c":["ex/v0.23.2/general.html#git_tree_lookup-75","ex/v0.23.2/general.html#git_tree_lookup-76"],"init.c":["ex/v0.23.2/init.html#git_tree_lookup-14"]}},"git_tree_lookup_prefix":{"type":"function","file":"tree.h","line":47,"lineto":51,"args":[{"name":"out","type":"git_tree **","comment":"pointer to the looked up tree"},{"name":"repo","type":"git_repository *","comment":"the repo to use when locating the tree."},{"name":"id","type":"const git_oid *","comment":"identity of the tree to locate."},{"name":"len","type":"size_t","comment":"the length of the short identifier"}],"argline":"git_tree **out, git_repository *repo, const git_oid *id, size_t len","sig":"git_tree **::git_repository *::const git_oid *::size_t","return":{"type":"int","comment":" 0 or an error code"},"description":"

Lookup a tree object from the repository,\n given a prefix of its identifier (short id).

\n","comments":"","group":"tree"},"git_tree_free":{"type":"function","file":"tree.h","line":63,"lineto":63,"args":[{"name":"tree","type":"git_tree *","comment":"The tree to close"}],"argline":"git_tree *tree","sig":"git_tree *","return":{"type":"void","comment":null},"description":"

Close an open tree

\n","comments":"

You can no longer use the git_tree pointer after this call.

\n\n

IMPORTANT: You MUST call this method when you stop using a tree to\n release memory. Failure to do so will cause a memory leak.

\n","group":"tree","examples":{"diff.c":["ex/v0.23.2/diff.html#git_tree_free-17","ex/v0.23.2/diff.html#git_tree_free-18"],"init.c":["ex/v0.23.2/init.html#git_tree_free-15"],"log.c":["ex/v0.23.2/log.html#git_tree_free-58","ex/v0.23.2/log.html#git_tree_free-59","ex/v0.23.2/log.html#git_tree_free-60","ex/v0.23.2/log.html#git_tree_free-61","ex/v0.23.2/log.html#git_tree_free-62"]}},"git_tree_id":{"type":"function","file":"tree.h","line":71,"lineto":71,"args":[{"name":"tree","type":"const git_tree *","comment":"a previously loaded tree."}],"argline":"const git_tree *tree","sig":"const git_tree *","return":{"type":"const git_oid *","comment":" object identity for the tree."},"description":"

Get the id of a tree.

\n","comments":"","group":"tree"},"git_tree_owner":{"type":"function","file":"tree.h","line":79,"lineto":79,"args":[{"name":"tree","type":"const git_tree *","comment":"A previously loaded tree."}],"argline":"const git_tree *tree","sig":"const git_tree *","return":{"type":"git_repository *","comment":" Repository that contains this tree."},"description":"

Get the repository that contains the tree.

\n","comments":"","group":"tree"},"git_tree_entrycount":{"type":"function","file":"tree.h","line":87,"lineto":87,"args":[{"name":"tree","type":"const git_tree *","comment":"a previously loaded tree."}],"argline":"const git_tree *tree","sig":"const git_tree *","return":{"type":"size_t","comment":" the number of entries in the tree"},"description":"

Get the number of entries listed in a tree

\n","comments":"","group":"tree","examples":{"cat-file.c":["ex/v0.23.2/cat-file.html#git_tree_entrycount-41"],"general.c":["ex/v0.23.2/general.html#git_tree_entrycount-77"]}},"git_tree_entry_byname":{"type":"function","file":"tree.h","line":99,"lineto":100,"args":[{"name":"tree","type":"const git_tree *","comment":"a previously loaded tree."},{"name":"filename","type":"const char *","comment":"the filename of the desired entry"}],"argline":"const git_tree *tree, const char *filename","sig":"const git_tree *::const char *","return":{"type":"const git_tree_entry *","comment":" the tree entry; NULL if not found"},"description":"

Lookup a tree entry by its filename

\n","comments":"

This returns a git_tree_entry that is owned by the git_tree. You don't\n have to free it, but you must not use it after the git_tree is released.

\n","group":"tree","examples":{"general.c":["ex/v0.23.2/general.html#git_tree_entry_byname-78"]}},"git_tree_entry_byindex":{"type":"function","file":"tree.h","line":112,"lineto":113,"args":[{"name":"tree","type":"const git_tree *","comment":"a previously loaded tree."},{"name":"idx","type":"size_t","comment":"the position in the entry list"}],"argline":"const git_tree *tree, size_t idx","sig":"const git_tree *::size_t","return":{"type":"const git_tree_entry *","comment":" the tree entry; NULL if not found"},"description":"

Lookup a tree entry by its position in the tree

\n","comments":"

This returns a git_tree_entry that is owned by the git_tree. You don't\n have to free it, but you must not use it after the git_tree is released.

\n","group":"tree","examples":{"cat-file.c":["ex/v0.23.2/cat-file.html#git_tree_entry_byindex-42"],"general.c":["ex/v0.23.2/general.html#git_tree_entry_byindex-79"]}},"git_tree_entry_byid":{"type":"function","file":"tree.h","line":127,"lineto":128,"args":[{"name":"tree","type":"const git_tree *","comment":"a previously loaded tree."},{"name":"id","type":"const git_oid *","comment":"the sha being looked for"}],"argline":"const git_tree *tree, const git_oid *id","sig":"const git_tree *::const git_oid *","return":{"type":"const git_tree_entry *","comment":" the tree entry; NULL if not found"},"description":"

Lookup a tree entry by SHA value.

\n","comments":"

This returns a git_tree_entry that is owned by the git_tree. You don't\n have to free it, but you must not use it after the git_tree is released.

\n\n

Warning: this must examine every entry in the tree, so it is not fast.

\n","group":"tree"},"git_tree_entry_bypath":{"type":"function","file":"tree.h","line":142,"lineto":145,"args":[{"name":"out","type":"git_tree_entry **","comment":"Pointer where to store the tree entry"},{"name":"root","type":"const git_tree *","comment":"Previously loaded tree which is the root of the relative path"},{"name":"path","type":"const char *","comment":"Path to the contained entry"}],"argline":"git_tree_entry **out, const git_tree *root, const char *path","sig":"git_tree_entry **::const git_tree *::const char *","return":{"type":"int","comment":" 0 on success; GIT_ENOTFOUND if the path does not exist"},"description":"

Retrieve a tree entry contained in a tree or in any of its subtrees,\n given its relative path.

\n","comments":"

Unlike the other lookup functions, the returned tree entry is owned by\n the user and must be freed explicitly with git_tree_entry_free().

\n","group":"tree"},"git_tree_entry_dup":{"type":"function","file":"tree.h","line":157,"lineto":157,"args":[{"name":"dest","type":"git_tree_entry **","comment":"pointer where to store the copy"},{"name":"source","type":"const git_tree_entry *","comment":"tree entry to duplicate"}],"argline":"git_tree_entry **dest, const git_tree_entry *source","sig":"git_tree_entry **::const git_tree_entry *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Duplicate a tree entry

\n","comments":"

Create a copy of a tree entry. The returned copy is owned by the user,\n and must be freed explicitly with git_tree_entry_free().

\n","group":"tree"},"git_tree_entry_free":{"type":"function","file":"tree.h","line":168,"lineto":168,"args":[{"name":"entry","type":"git_tree_entry *","comment":"The entry to free"}],"argline":"git_tree_entry *entry","sig":"git_tree_entry *","return":{"type":"void","comment":null},"description":"

Free a user-owned tree entry

\n","comments":"

IMPORTANT: This function is only needed for tree entries owned by the\n user, such as the ones returned by git_tree_entry_dup() or\n git_tree_entry_bypath().

\n","group":"tree"},"git_tree_entry_name":{"type":"function","file":"tree.h","line":176,"lineto":176,"args":[{"name":"entry","type":"const git_tree_entry *","comment":"a tree entry"}],"argline":"const git_tree_entry *entry","sig":"const git_tree_entry *","return":{"type":"const char *","comment":" the name of the file"},"description":"

Get the filename of a tree entry

\n","comments":"","group":"tree","examples":{"cat-file.c":["ex/v0.23.2/cat-file.html#git_tree_entry_name-43"],"general.c":["ex/v0.23.2/general.html#git_tree_entry_name-80","ex/v0.23.2/general.html#git_tree_entry_name-81"]}},"git_tree_entry_id":{"type":"function","file":"tree.h","line":184,"lineto":184,"args":[{"name":"entry","type":"const git_tree_entry *","comment":"a tree entry"}],"argline":"const git_tree_entry *entry","sig":"const git_tree_entry *","return":{"type":"const git_oid *","comment":" the oid of the object"},"description":"

Get the id of the object pointed by the entry

\n","comments":"","group":"tree","examples":{"cat-file.c":["ex/v0.23.2/cat-file.html#git_tree_entry_id-44"]}},"git_tree_entry_type":{"type":"function","file":"tree.h","line":192,"lineto":192,"args":[{"name":"entry","type":"const git_tree_entry *","comment":"a tree entry"}],"argline":"const git_tree_entry *entry","sig":"const git_tree_entry *","return":{"type":"git_otype","comment":" the type of the pointed object"},"description":"

Get the type of the object pointed by the entry

\n","comments":"","group":"tree","examples":{"cat-file.c":["ex/v0.23.2/cat-file.html#git_tree_entry_type-45"]}},"git_tree_entry_filemode":{"type":"function","file":"tree.h","line":200,"lineto":200,"args":[{"name":"entry","type":"const git_tree_entry *","comment":"a tree entry"}],"argline":"const git_tree_entry *entry","sig":"const git_tree_entry *","return":{"type":"git_filemode_t","comment":" filemode as an integer"},"description":"

Get the UNIX file attributes of a tree entry

\n","comments":"","group":"tree","examples":{"cat-file.c":["ex/v0.23.2/cat-file.html#git_tree_entry_filemode-46"]}},"git_tree_entry_filemode_raw":{"type":"function","file":"tree.h","line":212,"lineto":212,"args":[{"name":"entry","type":"const git_tree_entry *","comment":"a tree entry"}],"argline":"const git_tree_entry *entry","sig":"const git_tree_entry *","return":{"type":"git_filemode_t","comment":" filemode as an integer"},"description":"

Get the raw UNIX file attributes of a tree entry

\n","comments":"

This function does not perform any normalization and is only useful\n if you need to be able to recreate the original tree object.

\n","group":"tree"},"git_tree_entry_cmp":{"type":"function","file":"tree.h","line":220,"lineto":220,"args":[{"name":"e1","type":"const git_tree_entry *","comment":"first tree entry"},{"name":"e2","type":"const git_tree_entry *","comment":"second tree entry"}],"argline":"const git_tree_entry *e1, const git_tree_entry *e2","sig":"const git_tree_entry *::const git_tree_entry *","return":{"type":"int","comment":" \n<\n0 if e1 is before e2, 0 if e1 == e2, >0 if e1 is after e2"},"description":"

Compare two tree entries

\n","comments":"","group":"tree"},"git_tree_entry_to_object":{"type":"function","file":"tree.h","line":232,"lineto":235,"args":[{"name":"object_out","type":"git_object **","comment":"pointer to the converted object"},{"name":"repo","type":"git_repository *","comment":"repository where to lookup the pointed object"},{"name":"entry","type":"const git_tree_entry *","comment":"a tree entry"}],"argline":"git_object **object_out, git_repository *repo, const git_tree_entry *entry","sig":"git_object **::git_repository *::const git_tree_entry *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Convert a tree entry to the git_object it points to.

\n","comments":"

You must call git_object_free() on the object when you are done with it.

\n","group":"tree","examples":{"general.c":["ex/v0.23.2/general.html#git_tree_entry_to_object-82"]}},"git_treebuilder_new":{"type":"function","file":"tree.h","line":254,"lineto":255,"args":[{"name":"out","type":"git_treebuilder **","comment":"Pointer where to store the tree builder"},{"name":"repo","type":"git_repository *","comment":"Repository in which to store the object"},{"name":"source","type":"const git_tree *","comment":"Source tree to initialize the builder (optional)"}],"argline":"git_treebuilder **out, git_repository *repo, const git_tree *source","sig":"git_treebuilder **::git_repository *::const git_tree *","return":{"type":"int","comment":" 0 on success; error code otherwise"},"description":"

Create a new tree builder.

\n","comments":"

The tree builder can be used to create or modify trees in memory and\n write them as tree objects to the database.

\n\n

If the source parameter is not NULL, the tree builder will be\n initialized with the entries of the given tree.

\n\n

If the source parameter is NULL, the tree builder will start with no\n entries and will have to be filled manually.

\n","group":"treebuilder"},"git_treebuilder_clear":{"type":"function","file":"tree.h","line":262,"lineto":262,"args":[{"name":"bld","type":"git_treebuilder *","comment":"Builder to clear"}],"argline":"git_treebuilder *bld","sig":"git_treebuilder *","return":{"type":"void","comment":null},"description":"

Clear all the entires in the builder

\n","comments":"","group":"treebuilder"},"git_treebuilder_entrycount":{"type":"function","file":"tree.h","line":270,"lineto":270,"args":[{"name":"bld","type":"git_treebuilder *","comment":"a previously loaded treebuilder."}],"argline":"git_treebuilder *bld","sig":"git_treebuilder *","return":{"type":"unsigned int","comment":" the number of entries in the treebuilder"},"description":"

Get the number of entries listed in a treebuilder

\n","comments":"","group":"treebuilder"},"git_treebuilder_free":{"type":"function","file":"tree.h","line":281,"lineto":281,"args":[{"name":"bld","type":"git_treebuilder *","comment":"Builder to free"}],"argline":"git_treebuilder *bld","sig":"git_treebuilder *","return":{"type":"void","comment":null},"description":"

Free a tree builder

\n","comments":"

This will clear all the entries and free to builder.\n Failing to free the builder after you're done using it\n will result in a memory leak

\n","group":"treebuilder"},"git_treebuilder_get":{"type":"function","file":"tree.h","line":293,"lineto":294,"args":[{"name":"bld","type":"git_treebuilder *","comment":"Tree builder"},{"name":"filename","type":"const char *","comment":"Name of the entry"}],"argline":"git_treebuilder *bld, const char *filename","sig":"git_treebuilder *::const char *","return":{"type":"const git_tree_entry *","comment":" pointer to the entry; NULL if not found"},"description":"

Get an entry from the builder from its filename

\n","comments":"

The returned entry is owned by the builder and should\n not be freed manually.

\n","group":"treebuilder"},"git_treebuilder_insert":{"type":"function","file":"tree.h","line":323,"lineto":328,"args":[{"name":"out","type":"const git_tree_entry **","comment":"Pointer to store the entry (optional)"},{"name":"bld","type":"git_treebuilder *","comment":"Tree builder"},{"name":"filename","type":"const char *","comment":"Filename of the entry"},{"name":"id","type":"const git_oid *","comment":"SHA1 oid of the entry"},{"name":"filemode","type":"git_filemode_t","comment":"Folder attributes of the entry. This parameter must\n\t\t\tbe valued with one of the following entries: 0040000, 0100644,\n\t\t\t0100755, 0120000 or 0160000."}],"argline":"const git_tree_entry **out, git_treebuilder *bld, const char *filename, const git_oid *id, git_filemode_t filemode","sig":"const git_tree_entry **::git_treebuilder *::const char *::const git_oid *::git_filemode_t","return":{"type":"int","comment":" 0 or an error code"},"description":"

Add or update an entry to the builder

\n","comments":"

Insert a new entry for filename in the builder with the\n given attributes.

\n\n

If an entry named filename already exists, its attributes\n will be updated with the given ones.

\n\n

The optional pointer out can be used to retrieve a pointer to the\n newly created/updated entry. Pass NULL if you do not need it. The\n pointer may not be valid past the next operation in this\n builder. Duplicate the entry if you want to keep it.

\n\n

No attempt is being made to ensure that the provided oid points\n to an existing git object in the object database, nor that the\n attributes make sense regarding the type of the pointed at object.

\n","group":"treebuilder"},"git_treebuilder_remove":{"type":"function","file":"tree.h","line":336,"lineto":337,"args":[{"name":"bld","type":"git_treebuilder *","comment":"Tree builder"},{"name":"filename","type":"const char *","comment":"Filename of the entry to remove"}],"argline":"git_treebuilder *bld, const char *filename","sig":"git_treebuilder *::const char *","return":{"type":"int","comment":null},"description":"

Remove an entry from the builder by its filename

\n","comments":"","group":"treebuilder"},"git_treebuilder_filter":{"type":"function","file":"tree.h","line":360,"lineto":363,"args":[{"name":"bld","type":"git_treebuilder *","comment":"Tree builder"},{"name":"filter","type":"git_treebuilder_filter_cb","comment":"Callback to filter entries"},{"name":"payload","type":"void *","comment":"Extra data to pass to filter callback"}],"argline":"git_treebuilder *bld, git_treebuilder_filter_cb filter, void *payload","sig":"git_treebuilder *::git_treebuilder_filter_cb::void *","return":{"type":"void","comment":null},"description":"

Selectively remove entries in the tree

\n","comments":"

The filter callback will be called for each entry in the tree with a\n pointer to the entry and the provided payload; if the callback returns\n non-zero, the entry will be filtered (removed from the builder).

\n","group":"treebuilder"},"git_treebuilder_write":{"type":"function","file":"tree.h","line":375,"lineto":376,"args":[{"name":"id","type":"git_oid *","comment":"Pointer to store the OID of the newly written tree"},{"name":"bld","type":"git_treebuilder *","comment":"Tree builder to write"}],"argline":"git_oid *id, git_treebuilder *bld","sig":"git_oid *::git_treebuilder *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Write the contents of the tree builder as a tree object

\n","comments":"

The tree builder will be written to the given repo, and its\n identifying SHA1 hash will be stored in the id pointer.

\n","group":"treebuilder"},"git_tree_walk":{"type":"function","file":"tree.h","line":406,"lineto":410,"args":[{"name":"tree","type":"const git_tree *","comment":"The tree to walk"},{"name":"mode","type":"git_treewalk_mode","comment":"Traversal mode (pre or post-order)"},{"name":"callback","type":"git_treewalk_cb","comment":"Function to call on each tree entry"},{"name":"payload","type":"void *","comment":"Opaque pointer to be passed on each callback"}],"argline":"const git_tree *tree, git_treewalk_mode mode, git_treewalk_cb callback, void *payload","sig":"const git_tree *::git_treewalk_mode::git_treewalk_cb::void *","return":{"type":"int","comment":" 0 or an error code"},"description":"

Traverse the entries in a tree and its subtrees in post or pre order.

\n","comments":"

The entries will be traversed in the specified order, children subtrees\n will be automatically loaded as required, and the callback will be\n called once per entry with the current (relative) root for the entry and\n the entry data itself.

\n\n

If the callback returns a positive value, the passed entry will be\n skipped on the traversal (in pre mode). A negative value stops the walk.

\n","group":"tree"}},"callbacks":{"git_checkout_notify_cb":{"type":"callback","file":"checkout.h","line":223,"lineto":229,"args":[{"name":"why","type":"git_checkout_notify_t","comment":null},{"name":"path","type":"const char *","comment":null},{"name":"baseline","type":"const git_diff_file *","comment":null},{"name":"target","type":"const git_diff_file *","comment":null},{"name":"workdir","type":"const git_diff_file *","comment":null},{"name":"payload","type":"void *","comment":null}],"argline":"git_checkout_notify_t why, const char *path, const git_diff_file *baseline, const git_diff_file *target, const git_diff_file *workdir, void *payload","sig":"git_checkout_notify_t::const char *::const git_diff_file *::const git_diff_file *::const git_diff_file *::void *","return":{"type":"int","comment":null},"description":"

Checkout notification callback function

\n","comments":""},"git_checkout_progress_cb":{"type":"callback","file":"checkout.h","line":232,"lineto":236,"args":[{"name":"path","type":"const char *","comment":null},{"name":"completed_steps","type":"size_t","comment":null},{"name":"total_steps","type":"size_t","comment":null},{"name":"payload","type":"void *","comment":null}],"argline":"const char *path, size_t completed_steps, size_t total_steps, void *payload","sig":"const char *::size_t::size_t::void *","return":{"type":"void","comment":null},"description":"

Checkout progress notification function

\n","comments":""},"git_checkout_perfdata_cb":{"type":"callback","file":"checkout.h","line":239,"lineto":241,"args":[{"name":"perfdata","type":"const git_checkout_perfdata *","comment":null},{"name":"payload","type":"void *","comment":null}],"argline":"const git_checkout_perfdata *perfdata, void *payload","sig":"const git_checkout_perfdata *::void *","return":{"type":"void","comment":null},"description":"

Checkout perfdata notification function

\n","comments":""},"git_remote_create_cb":{"type":"callback","file":"clone.h","line":69,"lineto":74,"args":[{"name":"out","type":"git_remote **","comment":"the resulting remote"},{"name":"repo","type":"git_repository *","comment":"the repository in which to create the remote"},{"name":"name","type":"const char *","comment":"the remote's name"},{"name":"url","type":"const char *","comment":"the remote's url"},{"name":"payload","type":"void *","comment":"an opaque payload"}],"argline":"git_remote **out, git_repository *repo, const char *name, const char *url, void *payload","sig":"git_remote **::git_repository *::const char *::const char *::void *","return":{"type":"int","comment":" 0, GIT_EINVALIDSPEC, GIT_EEXISTS or an error code"},"description":"

The signature of a function matching git_remote_create, with an additional\n void* as a callback payload.

\n","comments":"

Callers of git_clone may provide a function matching this signature to override\n the remote creation and customization process during a clone operation.

\n"},"git_repository_create_cb":{"type":"callback","file":"clone.h","line":90,"lineto":94,"args":[{"name":"out","type":"git_repository **","comment":"the resulting repository"},{"name":"path","type":"const char *","comment":"path in which to create the repository"},{"name":"bare","type":"int","comment":"whether the repository is bare. This is the value from the clone options"},{"name":"payload","type":"void *","comment":"payload specified by the options"}],"argline":"git_repository **out, const char *path, int bare, void *payload","sig":"git_repository **::const char *::int::void *","return":{"type":"int","comment":" 0, or a negative value to indicate error"},"description":"

The signature of a function matchin git_repository_init, with an\n aditional void * as callback payload.

\n","comments":"

Callers of git_clone my provide a function matching this signature\n to override the repository creation and customization process\n during a clone operation.

\n"},"git_diff_notify_cb":{"type":"callback","file":"diff.h","line":343,"lineto":347,"args":[{"name":"diff_so_far","type":"const git_diff *","comment":null},{"name":"delta_to_add","type":"const git_diff_delta *","comment":null},{"name":"matched_pathspec","type":"const char *","comment":null},{"name":"payload","type":"void *","comment":null}],"argline":"const git_diff *diff_so_far, const git_diff_delta *delta_to_add, const char *matched_pathspec, void *payload","sig":"const git_diff *::const git_diff_delta *::const char *::void *","return":{"type":"int","comment":null},"description":"

Diff notification callback function.

\n","comments":"

The callback will be called for each file, just before the git_delta_t\n gets inserted into the diff.

\n\n

When the callback:\n - returns \n<\n 0, the diff process will be aborted.\n - returns > 0, the delta will not be inserted into the diff, but the\n diff process continues.\n - returns 0, the delta is inserted into the diff, and the diff process\n continues.

\n"},"git_diff_file_cb":{"type":"callback","file":"diff.h","line":423,"lineto":426,"args":[{"name":"delta","type":"const git_diff_delta *","comment":"A pointer to the delta data for the file"},{"name":"progress","type":"float","comment":"Goes from 0 to 1 over the diff"},{"name":"payload","type":"void *","comment":"User-specified pointer from foreach function"}],"argline":"const git_diff_delta *delta, float progress, void *payload","sig":"const git_diff_delta *::float::void *","return":{"type":"int","comment":null},"description":"

When iterating over a diff, callback that will be made per file.

\n","comments":""},"git_diff_binary_cb":{"type":"callback","file":"diff.h","line":470,"lineto":473,"args":[{"name":"delta","type":"const git_diff_delta *","comment":null},{"name":"binary","type":"const git_diff_binary *","comment":null},{"name":"payload","type":"void *","comment":null}],"argline":"const git_diff_delta *delta, const git_diff_binary *binary, void *payload","sig":"const git_diff_delta *::const git_diff_binary *::void *","return":{"type":"int","comment":null},"description":"

When iterating over a diff, callback that will be made for\n binary content within the diff.

\n","comments":""},"git_diff_hunk_cb":{"type":"callback","file":"diff.h","line":490,"lineto":493,"args":[{"name":"delta","type":"const git_diff_delta *","comment":null},{"name":"hunk","type":"const git_diff_hunk *","comment":null},{"name":"payload","type":"void *","comment":null}],"argline":"const git_diff_delta *delta, const git_diff_hunk *hunk, void *payload","sig":"const git_diff_delta *::const git_diff_hunk *::void *","return":{"type":"int","comment":null},"description":"

When iterating over a diff, callback that will be made per hunk.

\n","comments":""},"git_diff_line_cb":{"type":"callback","file":"diff.h","line":543,"lineto":547,"args":[{"name":"delta","type":"const git_diff_delta *","comment":null},{"name":"hunk","type":"const git_diff_hunk *","comment":null},{"name":"line","type":"const git_diff_line *","comment":null},{"name":"payload","type":"void *","comment":null}],"argline":"const git_diff_delta *delta, const git_diff_hunk *hunk, const git_diff_line *line, void *payload","sig":"const git_diff_delta *::const git_diff_hunk *::const git_diff_line *::void *","return":{"type":"int","comment":null},"description":"

When iterating over a diff, callback that will be made per text diff\n line. In this context, the provided range will be NULL.

\n","comments":"

When printing a diff, callback that will be made to output each line\n of text. This uses some extra GIT_DIFF_LINE_... constants for output\n of lines of file and hunk headers.

\n"},"git_index_matched_path_cb":{"type":"callback","file":"index.h","line":146,"lineto":147,"args":[{"name":"path","type":"const char *","comment":null},{"name":"matched_pathspec","type":"const char *","comment":null},{"name":"payload","type":"void *","comment":null}],"argline":"const char *path, const char *matched_pathspec, void *payload","sig":"const char *::const char *::void *","return":{"type":"int","comment":null},"description":"

Callback for APIs that add/remove/update files matching pathspec

\n","comments":""},"git_headlist_cb":{"type":"callback","file":"net.h","line":55,"lineto":55,"args":[{"name":"rhead","type":"git_remote_head *","comment":null},{"name":"payload","type":"void *","comment":null}],"argline":"git_remote_head *rhead, void *payload","sig":"git_remote_head *::void *","return":{"type":"int","comment":null},"description":"

Callback for listing the remote heads

\n","comments":""},"git_note_foreach_cb":{"type":"callback","file":"notes.h","line":29,"lineto":30,"args":[{"name":"blob_id","type":"const git_oid *","comment":null},{"name":"annotated_object_id","type":"const git_oid *","comment":null},{"name":"payload","type":"void *","comment":null}],"argline":"const git_oid *blob_id, const git_oid *annotated_object_id, void *payload","sig":"const git_oid *::const git_oid *::void *","return":{"type":"int","comment":null},"description":"

Callback for git_note_foreach.

\n","comments":"

Receives:\n - blob_id: Oid of the blob containing the message\n - annotated_object_id: Oid of the git object being annotated\n - payload: Payload data passed to git_note_foreach

\n"},"git_odb_foreach_cb":{"type":"callback","file":"odb.h","line":26,"lineto":26,"args":[{"name":"id","type":"const git_oid *","comment":null},{"name":"payload","type":"void *","comment":null}],"argline":"const git_oid *id, void *payload","sig":"const git_oid *::void *","return":{"type":"int","comment":null},"description":"

Function type for callbacks from git_odb_foreach.

\n","comments":""},"git_packbuilder_progress":{"type":"callback","file":"pack.h","line":210,"lineto":214,"args":[{"name":"stage","type":"int","comment":null},{"name":"current","type":"unsigned int","comment":null},{"name":"total","type":"unsigned int","comment":null},{"name":"payload","type":"void *","comment":null}],"argline":"int stage, unsigned int current, unsigned int total, void *payload","sig":"int::unsigned int::unsigned int::void *","return":{"type":"int","comment":null},"description":"

Packbuilder progress notification function

\n","comments":""},"git_remote_rename_problem_cb":{"type":"callback","file":"remote.h","line":28,"lineto":28,"args":[{"name":"problematic_refspec","type":"const char *","comment":null},{"name":"payload","type":"void *","comment":null}],"argline":"const char *problematic_refspec, void *payload","sig":"const char *::void *","return":{"type":"int","comment":null},"description":"

git2/remote.h

\n","comments":"

@\n{

\n"},"git_push_transfer_progress":{"type":"callback","file":"remote.h","line":332,"lineto":336,"args":[{"name":"current","type":"unsigned int","comment":null},{"name":"total","type":"unsigned int","comment":null},{"name":"bytes","type":"size_t","comment":null},{"name":"payload","type":"void *","comment":null}],"argline":"unsigned int current, unsigned int total, size_t bytes, void *payload","sig":"unsigned int::unsigned int::size_t::void *","return":{"type":"int","comment":null},"description":"

Push network progress notification function

\n","comments":""},"git_push_negotiation":{"type":"callback","file":"remote.h","line":365,"lineto":365,"args":[{"name":"updates","type":"const git_push_update **","comment":"an array containing the updates which will be sent\n as commands to the destination."},{"name":"len","type":"size_t","comment":"number of elements in `updates`"},{"name":"payload","type":"void *","comment":"Payload provided by the caller"}],"argline":"const git_push_update **updates, size_t len, void *payload","sig":"const git_push_update **::size_t::void *","return":{"type":"int","comment":null},"description":"","comments":""},"git_revwalk_hide_cb":{"type":"callback","file":"revwalk.h","line":279,"lineto":281,"args":[{"name":"commit_id","type":"const git_oid *","comment":"oid of Commit"},{"name":"payload","type":"void *","comment":"User-specified pointer to data to be passed as data payload"}],"argline":"const git_oid *commit_id, void *payload","sig":"const git_oid *::void *","return":{"type":"int","comment":null},"description":"

This is a callback function that user can provide to hide a\n commit and its parents. If the callback function returns non-zero value,\n then this commit and its parents will be hidden.

\n","comments":""},"git_stash_apply_progress_cb":{"type":"callback","file":"stash.h","line":113,"lineto":115,"args":[{"name":"progress","type":"git_stash_apply_progress_t","comment":null},{"name":"payload","type":"void *","comment":null}],"argline":"git_stash_apply_progress_t progress, void *payload","sig":"git_stash_apply_progress_t::void *","return":{"type":"int","comment":null},"description":"

Stash application progress notification function.\n Return 0 to continue processing, or a negative value to\n abort the stash application.

\n","comments":""},"git_stash_cb":{"type":"callback","file":"stash.h","line":198,"lineto":202,"args":[{"name":"index","type":"size_t","comment":"The position within the stash list. 0 points to the\n most recent stashed state."},{"name":"message","type":"const char *","comment":"The stash message."},{"name":"stash_id","type":"const int *","comment":"The commit oid of the stashed state."},{"name":"payload","type":"void *","comment":"Extra parameter to callback function."}],"argline":"size_t index, const char *message, const int *stash_id, void *payload","sig":"size_t::const char *::const int *::void *","return":{"type":"int","comment":" 0 to continue iterating or non-zero to stop."},"description":"

This is a callback function you can provide to iterate over all the\n stashed states that will be invoked per entry.

\n","comments":""},"git_status_cb":{"type":"callback","file":"status.h","line":61,"lineto":62,"args":[{"name":"path","type":"const char *","comment":null},{"name":"status_flags","type":"unsigned int","comment":null},{"name":"payload","type":"void *","comment":null}],"argline":"const char *path, unsigned int status_flags, void *payload","sig":"const char *::unsigned int::void *","return":{"type":"int","comment":null},"description":"

Function pointer to receive status on individual files

\n","comments":"

path is the relative path to the file from the root of the repository.

\n\n

status_flags is a combination of git_status_t values that apply.

\n\n

payload is the value you passed to the foreach function as payload.

\n"},"git_filter_init_fn":{"type":"callback","file":"sys/filter.h","line":152,"lineto":152,"args":[{"name":"self","type":"git_filter *","comment":null}],"argline":"git_filter *self","sig":"git_filter *","return":{"type":"int","comment":null},"description":"

Initialize callback on filter

\n","comments":"

Specified as filter.initialize, this is an optional callback invoked\n before a filter is first used. It will be called once at most.

\n\n

If non-NULL, the filter's initialize callback will be invoked right\n before the first use of the filter, so you can defer expensive\n initialization operations (in case libgit2 is being used in a way that\n doesn't need the filter).

\n"},"git_filter_shutdown_fn":{"type":"callback","file":"sys/filter.h","line":164,"lineto":164,"args":[{"name":"self","type":"git_filter *","comment":null}],"argline":"git_filter *self","sig":"git_filter *","return":{"type":"void","comment":null},"description":"

Shutdown callback on filter

\n","comments":"

Specified as filter.shutdown, this is an optional callback invoked\n when the filter is unregistered or when libgit2 is shutting down. It\n will be called once at most and should release resources as needed.\n This may be called even if the initialize callback was not made.

\n\n

Typically this function will free the git_filter object itself.

\n"},"git_filter_check_fn":{"type":"callback","file":"sys/filter.h","line":186,"lineto":190,"args":[{"name":"self","type":"git_filter *","comment":null},{"name":"payload","type":"void **","comment":null},{"name":"src","type":"const git_filter_source *","comment":null},{"name":"attr_values","type":"const char **","comment":null}],"argline":"git_filter *self, void **payload, const git_filter_source *src, const char **attr_values","sig":"git_filter *::void **::const git_filter_source *::const char **","return":{"type":"int","comment":null},"description":"

Callback to decide if a given source needs this filter

\n","comments":"

Specified as filter.check, this is an optional callback that checks\n if filtering is needed for a given source.

\n\n

It should return 0 if the filter should be applied (i.e. success),\n GIT_PASSTHROUGH if the filter should not be applied, or an error code\n to fail out of the filter processing pipeline and return to the caller.

\n\n

The attr_values will be set to the values of any attributes given in\n the filter definition. See git_filter below for more detail.

\n\n

The payload will be a pointer to a reference payload for the filter.\n This will start as NULL, but check can assign to this pointer for\n later use by the apply callback. Note that the value should be heap\n allocated (not stack), so that it doesn't go away before the apply\n callback can use it. If a filter allocates and assigns a value to the\n payload, it will need a cleanup callback to free the payload.

\n"},"git_filter_apply_fn":{"type":"callback","file":"sys/filter.h","line":204,"lineto":209,"args":[{"name":"self","type":"git_filter *","comment":null},{"name":"payload","type":"void **","comment":null},{"name":"to","type":"git_buf *","comment":null},{"name":"from","type":"const git_buf *","comment":null},{"name":"src","type":"const git_filter_source *","comment":null}],"argline":"git_filter *self, void **payload, git_buf *to, const git_buf *from, const git_filter_source *src","sig":"git_filter *::void **::git_buf *::const git_buf *::const git_filter_source *","return":{"type":"int","comment":null},"description":"

Callback to actually perform the data filtering

\n","comments":"

Specified as filter.apply, this is the callback that actually filters\n data. If it successfully writes the output, it should return 0. Like\n check, it can return GIT_PASSTHROUGH to indicate that the filter\n doesn't want to run. Other error codes will stop filter processing and\n return to the caller.

\n\n

The payload value will refer to any payload that was set by the\n check callback. It may be read from or written to as needed.

\n"},"git_filter_cleanup_fn":{"type":"callback","file":"sys/filter.h","line":226,"lineto":228,"args":[{"name":"self","type":"git_filter *","comment":null},{"name":"payload","type":"void *","comment":null}],"argline":"git_filter *self, void *payload","sig":"git_filter *::void *","return":{"type":"void","comment":null},"description":"

Callback to clean up after filtering has been applied

\n","comments":"

Specified as filter.cleanup, this is an optional callback invoked\n after the filter has been applied. If the check or apply callbacks\n allocated a payload to keep per-source filter state, use this\n callback to free that payload and release resources as required.

\n"},"git_trace_callback":{"type":"callback","file":"trace.h","line":52,"lineto":52,"args":[{"name":"level","type":"git_trace_level_t","comment":null},{"name":"msg","type":"const char *","comment":null}],"argline":"git_trace_level_t level, const char *msg","sig":"git_trace_level_t::const char *","return":{"type":"void","comment":null},"description":"

An instance for a tracing function

\n","comments":""},"git_transport_cb":{"type":"callback","file":"transport.h","line":24,"lineto":24,"args":[{"name":"out","type":"git_transport **","comment":null},{"name":"owner","type":"git_remote *","comment":null},{"name":"param","type":"void *","comment":null}],"argline":"git_transport **out, git_remote *owner, void *param","sig":"git_transport **::git_remote *::void *","return":{"type":"int","comment":null},"description":"

Signature of a function which creates a transport

\n","comments":""},"git_cred_acquire_cb":{"type":"callback","file":"transport.h","line":329,"lineto":334,"args":[{"name":"cred","type":"git_cred **","comment":null},{"name":"url","type":"const char *","comment":null},{"name":"username_from_url","type":"const char *","comment":null},{"name":"allowed_types","type":"unsigned int","comment":null},{"name":"payload","type":"void *","comment":null}],"argline":"git_cred **cred, const char *url, const char *username_from_url, unsigned int allowed_types, void *payload","sig":"git_cred **::const char *::const char *::unsigned int::void *","return":{"type":"int","comment":null},"description":"

Signature of a function which acquires a credential object.

\n","comments":"
    \n
  • cred: The newly created credential object.
    • \n
  • url: The resource for which we are demanding a credential.
    • \n
  • username_from_url: The username that was embedded in a "user\n@\nhost"\n remote url, or NULL if not included.
    • \n
  • allowed_types: A bitmask stating which cred types are OK to return.
    • \n
  • payload: The payload provided when specifying this callback.
    • \n
  • returns 0 for success, \n<\n0 to indicate an error, > 0 to indicate\n no credential was acquired
    • \n
\n"},"git_treebuilder_filter_cb":{"type":"callback","file":"tree.h","line":346,"lineto":347,"args":[{"name":"entry","type":"const git_tree_entry *","comment":null},{"name":"payload","type":"void *","comment":null}],"argline":"const git_tree_entry *entry, void *payload","sig":"const git_tree_entry *::void *","return":{"type":"int","comment":null},"description":"

Callback for git_treebuilder_filter

\n","comments":"

The return value is treated as a boolean, with zero indicating that the\n entry should be left alone and any non-zero value meaning that the\n entry should be removed from the treebuilder list (i.e. filtered out).

\n"},"git_treewalk_cb":{"type":"callback","file":"tree.h","line":380,"lineto":381,"args":[{"name":"root","type":"const char *","comment":null},{"name":"entry","type":"const git_tree_entry *","comment":null},{"name":"payload","type":"void *","comment":null}],"argline":"const char *root, const git_tree_entry *entry, void *payload","sig":"const char *::const git_tree_entry *::void *","return":{"type":"int","comment":null},"description":"

Callback for the tree traversal method

\n","comments":""},"git_transfer_progress_cb":{"type":"callback","file":"types.h","line":270,"lineto":270,"args":[{"name":"stats","type":"const git_transfer_progress *","comment":"Structure containing information about the state of the transfer"},{"name":"payload","type":"void *","comment":"Payload provided by caller"}],"argline":"const git_transfer_progress *stats, void *payload","sig":"const git_transfer_progress *::void *","return":{"type":"int","comment":null},"description":"

Type for progress callbacks during indexing. Return a value less than zero\n to cancel the transfer.

\n","comments":""},"git_transport_message_cb":{"type":"callback","file":"types.h","line":280,"lineto":280,"args":[{"name":"str","type":"const char *","comment":"The message from the transport"},{"name":"len","type":"int","comment":"The length of the message"},{"name":"payload","type":"void *","comment":"Payload provided by the caller"}],"argline":"const char *str, int len, void *payload","sig":"const char *::int::void *","return":{"type":"int","comment":null},"description":"

Type for messages delivered by the transport. Return a negative value\n to cancel the network operation.

\n","comments":""},"git_transport_certificate_check_cb":{"type":"callback","file":"types.h","line":330,"lineto":330,"args":[{"name":"cert","type":"git_cert *","comment":"The host certificate"},{"name":"valid","type":"int","comment":"Whether the libgit2 checks (OpenSSL or WinHTTP) think\n this certificate is valid"},{"name":"host","type":"const char *","comment":"Hostname of the host libgit2 connected to"},{"name":"payload","type":"void *","comment":"Payload provided by the caller"}],"argline":"git_cert *cert, int valid, const char *host, void *payload","sig":"git_cert *::int::const char *::void *","return":{"type":"int","comment":null},"description":"

Callback for the user's custom certificate checks.

\n","comments":""}},"globals":{},"types":[["git_annotated_commit",{"decl":"git_annotated_commit","type":"struct","value":"git_annotated_commit","file":"types.h","line":178,"lineto":178,"tdef":"typedef","description":" Annotated commits, the input to merge and rebase. ","comments":"","used":{"returns":[],"needs":["git_annotated_commit_free","git_annotated_commit_from_fetchhead","git_annotated_commit_from_ref","git_annotated_commit_from_revspec","git_annotated_commit_id","git_annotated_commit_lookup","git_branch_create_from_annotated","git_merge","git_merge_analysis","git_rebase_init","git_repository_set_head_detached_from_annotated","git_reset_from_annotated"]}}],["git_attr_t",{"decl":["GIT_ATTR_UNSPECIFIED_T","GIT_ATTR_TRUE_T","GIT_ATTR_FALSE_T","GIT_ATTR_VALUE_T"],"type":"enum","file":"attr.h","line":82,"lineto":87,"block":"GIT_ATTR_UNSPECIFIED_T\nGIT_ATTR_TRUE_T\nGIT_ATTR_FALSE_T\nGIT_ATTR_VALUE_T","tdef":"typedef","description":" Possible states for an attribute","comments":"","fields":[{"type":"int","name":"GIT_ATTR_UNSPECIFIED_T","comments":"

The attribute has been left unspecified

\n","value":0},{"type":"int","name":"GIT_ATTR_TRUE_T","comments":"

The attribute has been set

\n","value":1},{"type":"int","name":"GIT_ATTR_FALSE_T","comments":"

The attribute has been unset

\n","value":2},{"type":"int","name":"GIT_ATTR_VALUE_T","comments":"

This attribute has a value

\n","value":3}],"used":{"returns":[],"needs":[]}}],["git_blame_flag_t",{"decl":["GIT_BLAME_NORMAL","GIT_BLAME_TRACK_COPIES_SAME_FILE","GIT_BLAME_TRACK_COPIES_SAME_COMMIT_MOVES","GIT_BLAME_TRACK_COPIES_SAME_COMMIT_COPIES","GIT_BLAME_TRACK_COPIES_ANY_COMMIT_COPIES","GIT_BLAME_FIRST_PARENT"],"type":"enum","file":"blame.h","line":26,"lineto":46,"block":"GIT_BLAME_NORMAL\nGIT_BLAME_TRACK_COPIES_SAME_FILE\nGIT_BLAME_TRACK_COPIES_SAME_COMMIT_MOVES\nGIT_BLAME_TRACK_COPIES_SAME_COMMIT_COPIES\nGIT_BLAME_TRACK_COPIES_ANY_COMMIT_COPIES\nGIT_BLAME_FIRST_PARENT","tdef":"typedef","description":" Flags for indicating option behavior for git_blame APIs.","comments":"","fields":[{"type":"int","name":"GIT_BLAME_NORMAL","comments":"

Normal blame, the default

\n","value":0},{"type":"int","name":"GIT_BLAME_TRACK_COPIES_SAME_FILE","comments":"

Track lines that have moved within a file (like git blame -M).\n NOT IMPLEMENTED.

\n","value":1},{"type":"int","name":"GIT_BLAME_TRACK_COPIES_SAME_COMMIT_MOVES","comments":"

Track lines that have moved across files in the same commit (like git blame -C).\n NOT IMPLEMENTED.

\n","value":2},{"type":"int","name":"GIT_BLAME_TRACK_COPIES_SAME_COMMIT_COPIES","comments":"

Track lines that have been copied from another file that exists in the\n same commit (like git blame -CC). Implies SAME_FILE.\n NOT IMPLEMENTED.

\n","value":4},{"type":"int","name":"GIT_BLAME_TRACK_COPIES_ANY_COMMIT_COPIES","comments":"

Track lines that have been copied from another file that exists in any\n commit (like git blame -CCC). Implies SAME_COMMIT_COPIES.\n NOT IMPLEMENTED.

\n","value":8},{"type":"int","name":"GIT_BLAME_FIRST_PARENT","comments":"

Restrict the search of commits to those reachable following only the\n first parents.

\n","value":16}],"used":{"returns":[],"needs":[]}}],["git_blame_hunk",{"decl":["uint16_t lines_in_hunk","git_oid final_commit_id","uint16_t final_start_line_number","git_signature * final_signature","git_oid orig_commit_id","const char * orig_path","uint16_t orig_start_line_number","git_signature * orig_signature","char boundary"],"type":"struct","value":"git_blame_hunk","file":"blame.h","line":115,"lineto":128,"block":"uint16_t lines_in_hunk\ngit_oid final_commit_id\nuint16_t final_start_line_number\ngit_signature * final_signature\ngit_oid orig_commit_id\nconst char * orig_path\nuint16_t orig_start_line_number\ngit_signature * orig_signature\nchar boundary","tdef":"typedef","description":" Structure that represents a blame hunk.","comments":"
    \n
  • lines_in_hunk is the number of lines in this hunk
    • \n
  • final_commit_id is the OID of the commit where this line was last\nchanged.
    • \n
  • final_start_line_number is the 1-based line number where this hunk\nbegins, in the final version of the file
    • \n
  • orig_commit_id is the OID of the commit where this hunk was found. This\nwill usually be the same as final_commit_id, except when\nGIT_BLAME_TRACK_COPIES_ANY_COMMIT_COPIES has been specified.
    • \n
  • orig_path is the path to the file where this hunk originated, as of the\ncommit specified by orig_commit_id.
    • \n
  • orig_start_line_number is the 1-based line number where this hunk begins\nin the file named by orig_path in the commit specified by\norig_commit_id.
    • \n
  • boundary is 1 iff the hunk has been tracked to a boundary commit (the\nroot, or the commit specified in git_blame_options.oldest_commit)
    • \n
\n","fields":[{"type":"uint16_t","name":"lines_in_hunk","comments":""},{"type":"git_oid","name":"final_commit_id","comments":""},{"type":"uint16_t","name":"final_start_line_number","comments":""},{"type":"git_signature *","name":"final_signature","comments":""},{"type":"git_oid","name":"orig_commit_id","comments":""},{"type":"const char *","name":"orig_path","comments":""},{"type":"uint16_t","name":"orig_start_line_number","comments":""},{"type":"git_signature *","name":"orig_signature","comments":""},{"type":"char","name":"boundary","comments":""}],"used":{"returns":["git_blame_get_hunk_byindex","git_blame_get_hunk_byline"],"needs":[]}}],["git_blame_options",{"decl":["unsigned int version","uint32_t flags","uint16_t min_match_characters","git_oid newest_commit","git_oid oldest_commit","uint32_t min_line","uint32_t max_line"],"type":"struct","value":"git_blame_options","file":"blame.h","line":70,"lineto":79,"block":"unsigned int version\nuint32_t flags\nuint16_t min_match_characters\ngit_oid newest_commit\ngit_oid oldest_commit\nuint32_t min_line\nuint32_t max_line","tdef":"typedef","description":" Blame options structure","comments":"

Use zeros to indicate default settings. It's easiest to use the\n GIT_BLAME_OPTIONS_INIT macro:\n git_blame_options opts = GIT_BLAME_OPTIONS_INIT;

\n\n
    \n
  • flags is a combination of the git_blame_flag_t values above.
    • \n
  • min_match_characters is the lower bound on the number of alphanumeric\ncharacters that must be detected as moving/copying within a file for it to\nassociate those lines with the parent commit. The default value is 20.\nThis value only takes effect if any of the GIT_BLAME_TRACK_COPIES_*\nflags are specified.
    • \n
  • newest_commit is the id of the newest commit to consider. The default\n is HEAD.
    • \n
  • oldest_commit is the id of the oldest commit to consider. The default\n is the first commit encountered with a NULL parent.\n\n
      \n
    • min_line is the first line in the file to blame. The default is 1 (line\n numbers start with 1).
      • \n
    • max_line is the last line in the file to blame. The default is the last\n line of the file.
      • \n
    • \n
\n","fields":[{"type":"unsigned int","name":"version","comments":""},{"type":"uint32_t","name":"flags","comments":""},{"type":"uint16_t","name":"min_match_characters","comments":""},{"type":"git_oid","name":"newest_commit","comments":""},{"type":"git_oid","name":"oldest_commit","comments":""},{"type":"uint32_t","name":"min_line","comments":""},{"type":"uint32_t","name":"max_line","comments":""}],"used":{"returns":[],"needs":["git_blame_file","git_blame_init_options"]}}],["git_blob",{"decl":"git_blob","type":"struct","value":"git_blob","file":"types.h","line":117,"lineto":117,"tdef":"typedef","description":" In-memory representation of a blob object. ","comments":"","used":{"returns":[],"needs":["git_blob_filtered_content","git_blob_free","git_blob_id","git_blob_is_binary","git_blob_lookup","git_blob_lookup_prefix","git_blob_owner","git_blob_rawcontent","git_blob_rawsize","git_diff_blob_to_buffer","git_diff_blobs","git_filter_list_apply_to_blob","git_filter_list_load","git_filter_list_stream_blob","git_patch_from_blob_and_buffer","git_patch_from_blobs"]}}],["git_branch_iterator",{"decl":"git_branch_iterator","type":"struct","value":"git_branch_iterator","file":"branch.h","line":88,"lineto":88,"tdef":"typedef","description":" Iterator type for branches ","comments":"","used":{"returns":[],"needs":["git_branch_iterator_free","git_branch_iterator_new","git_branch_next"]}}],["git_branch_t",{"decl":["GIT_BRANCH_LOCAL","GIT_BRANCH_REMOTE","GIT_BRANCH_ALL"],"type":"enum","file":"types.h","line":198,"lineto":202,"block":"GIT_BRANCH_LOCAL\nGIT_BRANCH_REMOTE\nGIT_BRANCH_ALL","tdef":"typedef","description":" Basic type of any Git branch. ","comments":"","fields":[{"type":"int","name":"GIT_BRANCH_LOCAL","comments":"","value":1},{"type":"int","name":"GIT_BRANCH_REMOTE","comments":"","value":2},{"type":"int","name":"GIT_BRANCH_ALL","comments":"","value":3}],"used":{"returns":[],"needs":["git_branch_iterator_new","git_branch_lookup","git_branch_next"]}}],["git_buf",{"decl":["char * ptr","size_t asize","size_t size"],"type":"struct","value":"git_buf","file":"buffer.h","line":52,"lineto":55,"block":"char * ptr\nsize_t asize\nsize_t size","tdef":"typedef","description":" A data buffer for exporting data from libgit2","comments":"

Sometimes libgit2 wants to return an allocated data buffer to the\n caller and have the caller take responsibility for freeing that memory.\n This can be awkward if the caller does not have easy access to the same\n allocation functions that libgit2 is using. In those cases, libgit2\n will fill in a git_buf and the caller can use git_buf_free() to\n release it when they are done.

\n\n

A git_buf may also be used for the caller to pass in a reference to\n a block of memory they hold. In this case, libgit2 will not resize or\n free the memory, but will read from it as needed.

\n\n

A git_buf is a public structure with three fields:

\n\n
    \n

  • ptr points to the start of the allocated memory. If it is NULL,\nthen the git_buf is considered empty and libgit2 will feel free\nto overwrite it with new data.

    • \n

  • size holds the size (in bytes) of the data that is actually used.

    • \n

  • asize holds the known total amount of allocated memory if the ptr\nwas allocated by libgit2. It may be larger than size. If ptr\nwas not allocated by libgit2 and should not be resized and/or freed,\nthen asize will be set to zero.

    • \n
\n\n

Some APIs may occasionally do something slightly unusual with a buffer,\n such as setting ptr to a value that was passed in by the user. In\n those cases, the behavior will be clearly documented by the API.

\n","fields":[{"type":"char *","name":"ptr","comments":""},{"type":"size_t","name":"asize","comments":""},{"type":"size_t","name":"size","comments":""}],"used":{"returns":[],"needs":["git_blob_filtered_content","git_buf_contains_nul","git_buf_free","git_buf_grow","git_buf_is_binary","git_buf_set","git_commit_header_field","git_config_find_global","git_config_find_system","git_config_find_xdg","git_config_get_path","git_config_get_string_buf","git_config_parse_path","git_describe_format","git_diff_commit_as_email","git_diff_format_email","git_diff_stats_to_buf","git_filter_list_apply_to_blob","git_filter_list_apply_to_data","git_filter_list_apply_to_file","git_filter_list_stream_data","git_message_prettify","git_object_short_id","git_patch_to_buf","git_refspec_rtransform","git_refspec_transform","git_remote_default_branch","git_repository_discover","git_repository_message","git_submodule_resolve_url"]}}],["git_cert",{"decl":["git_cert_t cert_type"],"type":"struct","value":"git_cert","file":"types.h","line":314,"lineto":319,"block":"git_cert_t cert_type","tdef":"typedef","description":" Parent type for `git_cert_hostkey` and `git_cert_x509`.","comments":"","fields":[{"type":"git_cert_t","name":"cert_type","comments":" Type of certificate. A `GIT_CERT_` value."}],"used":{"returns":[],"needs":[]}}],["git_cert_hostkey",{"decl":["git_cert_t cert_type","git_cert_ssh_t type","unsigned char [16] hash_md5","unsigned char [20] hash_sha1"],"type":"struct","value":"git_cert_hostkey","file":"transport.h","line":39,"lineto":62,"block":"git_cert_t cert_type\ngit_cert_ssh_t type\nunsigned char [16] hash_md5\nunsigned char [20] hash_sha1","tdef":"typedef","description":" Hostkey information taken from libssh2","comments":"","fields":[{"type":"git_cert_t","name":"cert_type","comments":" Type of certificate. Here to share the header with\n `git_cert`."},{"type":"git_cert_ssh_t","name":"type","comments":" A hostkey type from libssh2, either\n `GIT_CERT_SSH_MD5` or `GIT_CERT_SSH_SHA1`"},{"type":"unsigned char [16]","name":"hash_md5","comments":" Hostkey hash. If type has `GIT_CERT_SSH_MD5` set, this will\n have the MD5 hash of the hostkey."},{"type":"unsigned char [20]","name":"hash_sha1","comments":" Hostkey hash. If type has `GIT_CERT_SSH_SHA1` set, this will\n have the SHA-1 hash of the hostkey."}],"used":{"returns":[],"needs":[]}}],["git_cert_ssh_t",{"decl":["GIT_CERT_SSH_MD5","GIT_CERT_SSH_SHA1"],"type":"enum","file":"transport.h","line":29,"lineto":34,"block":"GIT_CERT_SSH_MD5\nGIT_CERT_SSH_SHA1","tdef":"typedef","description":" Type of SSH host fingerprint","comments":"","fields":[{"type":"int","name":"GIT_CERT_SSH_MD5","comments":"

MD5 is available

\n","value":1},{"type":"int","name":"GIT_CERT_SSH_SHA1","comments":"

SHA-1 is available

\n","value":2}],"used":{"returns":[],"needs":[]}}],["git_cert_t",{"decl":["GIT_CERT_NONE","GIT_CERT_X509","GIT_CERT_HOSTKEY_LIBSSH2","GIT_CERT_STRARRAY"],"type":"enum","file":"types.h","line":286,"lineto":309,"block":"GIT_CERT_NONE\nGIT_CERT_X509\nGIT_CERT_HOSTKEY_LIBSSH2\nGIT_CERT_STRARRAY\nGIT_CERT_NONE\nGIT_CERT_X509\nGIT_CERT_HOSTKEY_LIBSSH2\nGIT_CERT_STRARRAY","tdef":"typedef","description":" Type of host certificate structure that is passed to the check callback","comments":"","fields":[{"type":"int","name":"GIT_CERT_NONE","comments":"

No information about the certificate is available. This may\n happen when using curl.

\n","value":0},{"type":"int","name":"GIT_CERT_X509","comments":"

The data argument to the callback will be a pointer to\n the DER-encoded data.

\n","value":1},{"type":"int","name":"GIT_CERT_HOSTKEY_LIBSSH2","comments":"

The data argument to the callback will be a pointer to a\n git_cert_hostkey structure.

\n","value":2},{"type":"int","name":"GIT_CERT_STRARRAY","comments":"

The data argument to the callback will be a pointer to a\n git_strarray with name:content strings containing\n information about the certificate. This is used when using\n curl.

\n","value":3}],"used":{"returns":[],"needs":[]}}],["git_cert_x509",{"decl":["git_cert_t cert_type","void * data","size_t len"],"type":"struct","value":"git_cert_x509","file":"transport.h","line":67,"lineto":81,"block":"git_cert_t cert_type\nvoid * data\nsize_t len","tdef":"typedef","description":" X.509 certificate information","comments":"","fields":[{"type":"git_cert_t","name":"cert_type","comments":" Type of certificate. Here to share the header with\n `git_cert`."},{"type":"void *","name":"data","comments":" Pointer to the X.509 certificate data"},{"type":"size_t","name":"len","comments":" Length of the memory block pointed to by `data`."}],"used":{"returns":[],"needs":[]}}],["git_checkout_notify_t",{"decl":["GIT_CHECKOUT_NOTIFY_NONE","GIT_CHECKOUT_NOTIFY_CONFLICT","GIT_CHECKOUT_NOTIFY_DIRTY","GIT_CHECKOUT_NOTIFY_UPDATED","GIT_CHECKOUT_NOTIFY_UNTRACKED","GIT_CHECKOUT_NOTIFY_IGNORED","GIT_CHECKOUT_NOTIFY_ALL"],"type":"enum","file":"checkout.h","line":205,"lineto":214,"block":"GIT_CHECKOUT_NOTIFY_NONE\nGIT_CHECKOUT_NOTIFY_CONFLICT\nGIT_CHECKOUT_NOTIFY_DIRTY\nGIT_CHECKOUT_NOTIFY_UPDATED\nGIT_CHECKOUT_NOTIFY_UNTRACKED\nGIT_CHECKOUT_NOTIFY_IGNORED\nGIT_CHECKOUT_NOTIFY_ALL","tdef":"typedef","description":" Checkout notification flags","comments":"

Checkout will invoke an options notification callback (notify_cb) for\n certain cases - you pick which ones via notify_flags:

\n\n
    \n

  • GIT_CHECKOUT_NOTIFY_CONFLICT invokes checkout on conflicting paths.

    • \n

  • GIT_CHECKOUT_NOTIFY_DIRTY notifies about "dirty" files, i.e. those that\ndo not need an update but no longer match the baseline. Core git\ndisplays these files when checkout runs, but won't stop the checkout.

    • \n

  • GIT_CHECKOUT_NOTIFY_UPDATED sends notification for any file changed.

    • \n

  • GIT_CHECKOUT_NOTIFY_UNTRACKED notifies about untracked files.

    • \n

  • GIT_CHECKOUT_NOTIFY_IGNORED notifies about ignored files.

    • \n
\n\n

Returning a non-zero value from this callback will cancel the checkout.\n The non-zero return value will be propagated back and returned by the\n git_checkout_... call.

\n\n

Notification callbacks are made prior to modifying any files on disk,\n so canceling on any notification will still happen prior to any files\n being modified.

\n","fields":[{"type":"int","name":"GIT_CHECKOUT_NOTIFY_NONE","comments":"","value":0},{"type":"int","name":"GIT_CHECKOUT_NOTIFY_CONFLICT","comments":"","value":1},{"type":"int","name":"GIT_CHECKOUT_NOTIFY_DIRTY","comments":"","value":2},{"type":"int","name":"GIT_CHECKOUT_NOTIFY_UPDATED","comments":"","value":4},{"type":"int","name":"GIT_CHECKOUT_NOTIFY_UNTRACKED","comments":"","value":8},{"type":"int","name":"GIT_CHECKOUT_NOTIFY_IGNORED","comments":"","value":16},{"type":"int","name":"GIT_CHECKOUT_NOTIFY_ALL","comments":"","value":65535}],"used":{"returns":[],"needs":[]}}],["git_checkout_options",{"decl":["unsigned int version","unsigned int checkout_strategy","int disable_filters","unsigned int dir_mode","unsigned int file_mode","int file_open_flags","unsigned int notify_flags","git_checkout_notify_cb notify_cb","void * notify_payload","git_checkout_progress_cb progress_cb","void * progress_payload","git_strarray paths","git_tree * baseline","git_index * baseline_index","const char * target_directory","const char * ancestor_label","const char * our_label","const char * their_label","git_checkout_perfdata_cb perfdata_cb","void * perfdata_payload"],"type":"struct","value":"git_checkout_options","file":"checkout.h","line":251,"lineto":295,"block":"unsigned int version\nunsigned int checkout_strategy\nint disable_filters\nunsigned int dir_mode\nunsigned int file_mode\nint file_open_flags\nunsigned int notify_flags\ngit_checkout_notify_cb notify_cb\nvoid * notify_payload\ngit_checkout_progress_cb progress_cb\nvoid * progress_payload\ngit_strarray paths\ngit_tree * baseline\ngit_index * baseline_index\nconst char * target_directory\nconst char * ancestor_label\nconst char * our_label\nconst char * their_label\ngit_checkout_perfdata_cb perfdata_cb\nvoid * perfdata_payload","tdef":"typedef","description":" Checkout options structure","comments":"

Zero out for defaults. Initialize with GIT_CHECKOUT_OPTIONS_INIT macro to\n correctly set the version field. E.g.

\n\n
    git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT;\n
\n","fields":[{"type":"unsigned int","name":"version","comments":""},{"type":"unsigned int","name":"checkout_strategy","comments":" default will be a dry run "},{"type":"int","name":"disable_filters","comments":" don't apply filters like CRLF conversion "},{"type":"unsigned int","name":"dir_mode","comments":" default is 0755 "},{"type":"unsigned int","name":"file_mode","comments":" default is 0644 or 0755 as dictated by blob "},{"type":"int","name":"file_open_flags","comments":" default is O_CREAT | O_TRUNC | O_WRONLY "},{"type":"unsigned int","name":"notify_flags","comments":" see `git_checkout_notify_t` above "},{"type":"git_checkout_notify_cb","name":"notify_cb","comments":""},{"type":"void *","name":"notify_payload","comments":""},{"type":"git_checkout_progress_cb","name":"progress_cb","comments":" Optional callback to notify the consumer of checkout progress. "},{"type":"void *","name":"progress_payload","comments":""},{"type":"git_strarray","name":"paths","comments":" When not zeroed out, array of fnmatch patterns specifying which\n paths should be taken into account, otherwise all files. Use\n GIT_CHECKOUT_DISABLE_PATHSPEC_MATCH to treat as simple list."},{"type":"git_tree *","name":"baseline","comments":" The expected content of the working directory; defaults to HEAD.\n If the working directory does not match this baseline information,\n that will produce a checkout conflict."},{"type":"git_index *","name":"baseline_index","comments":" expected content of workdir, expressed as an index. "},{"type":"const char *","name":"target_directory","comments":" alternative checkout path to workdir "},{"type":"const char *","name":"ancestor_label","comments":" the name of the common ancestor side of conflicts "},{"type":"const char *","name":"our_label","comments":" the name of the \"our\" side of conflicts "},{"type":"const char *","name":"their_label","comments":" the name of the \"their\" side of conflicts "},{"type":"git_checkout_perfdata_cb","name":"perfdata_cb","comments":" Optional callback to notify the consumer of performance data. "},{"type":"void *","name":"perfdata_payload","comments":""}],"used":{"returns":[],"needs":["git_checkout_head","git_checkout_index","git_checkout_init_options","git_checkout_tree","git_merge","git_reset","git_reset_from_annotated"]}}],["git_checkout_strategy_t",{"decl":["GIT_CHECKOUT_NONE","GIT_CHECKOUT_SAFE","GIT_CHECKOUT_FORCE","GIT_CHECKOUT_RECREATE_MISSING","GIT_CHECKOUT_ALLOW_CONFLICTS","GIT_CHECKOUT_REMOVE_UNTRACKED","GIT_CHECKOUT_REMOVE_IGNORED","GIT_CHECKOUT_UPDATE_ONLY","GIT_CHECKOUT_DONT_UPDATE_INDEX","GIT_CHECKOUT_NO_REFRESH","GIT_CHECKOUT_SKIP_UNMERGED","GIT_CHECKOUT_USE_OURS","GIT_CHECKOUT_USE_THEIRS","GIT_CHECKOUT_DISABLE_PATHSPEC_MATCH","GIT_CHECKOUT_SKIP_LOCKED_DIRECTORIES","GIT_CHECKOUT_DONT_OVERWRITE_IGNORED","GIT_CHECKOUT_CONFLICT_STYLE_MERGE","GIT_CHECKOUT_CONFLICT_STYLE_DIFF3","GIT_CHECKOUT_DONT_REMOVE_EXISTING","GIT_CHECKOUT_DONT_WRITE_INDEX","GIT_CHECKOUT_UPDATE_SUBMODULES","GIT_CHECKOUT_UPDATE_SUBMODULES_IF_CHANGED"],"type":"enum","file":"checkout.h","line":106,"lineto":177,"block":"GIT_CHECKOUT_NONE\nGIT_CHECKOUT_SAFE\nGIT_CHECKOUT_FORCE\nGIT_CHECKOUT_RECREATE_MISSING\nGIT_CHECKOUT_ALLOW_CONFLICTS\nGIT_CHECKOUT_REMOVE_UNTRACKED\nGIT_CHECKOUT_REMOVE_IGNORED\nGIT_CHECKOUT_UPDATE_ONLY\nGIT_CHECKOUT_DONT_UPDATE_INDEX\nGIT_CHECKOUT_NO_REFRESH\nGIT_CHECKOUT_SKIP_UNMERGED\nGIT_CHECKOUT_USE_OURS\nGIT_CHECKOUT_USE_THEIRS\nGIT_CHECKOUT_DISABLE_PATHSPEC_MATCH\nGIT_CHECKOUT_SKIP_LOCKED_DIRECTORIES\nGIT_CHECKOUT_DONT_OVERWRITE_IGNORED\nGIT_CHECKOUT_CONFLICT_STYLE_MERGE\nGIT_CHECKOUT_CONFLICT_STYLE_DIFF3\nGIT_CHECKOUT_DONT_REMOVE_EXISTING\nGIT_CHECKOUT_DONT_WRITE_INDEX\nGIT_CHECKOUT_UPDATE_SUBMODULES\nGIT_CHECKOUT_UPDATE_SUBMODULES_IF_CHANGED","tdef":"typedef","description":" Checkout behavior flags","comments":"

In libgit2, checkout is used to update the working directory and index\n to match a target tree. Unlike git checkout, it does not move the HEAD\n commit for you - use git_repository_set_head or the like to do that.

\n\n

Checkout looks at (up to) four things: the "target" tree you want to\n check out, the "baseline" tree of what was checked out previously, the\n working directory for actual files, and the index for staged changes.

\n\n

You give checkout one of three strategies for update:

\n\n
    \n

  • GIT_CHECKOUT_NONE is a dry-run strategy that checks for conflicts,\netc., but doesn't make any actual changes.

    • \n

  • GIT_CHECKOUT_FORCE is at the opposite extreme, taking any action to\nmake the working directory match the target (including potentially\ndiscarding modified files).

    • \n

  • GIT_CHECKOUT_SAFE is between these two options, it will only make\nmodifications that will not lose changes.

    \n\n
                     |  target == baseline   |  target != baseline  |\n
    \n\n

    ---------------------|-----------------------|----------------------|\n workdir == baseline | no action | create, update, or |\n | | delete file |\n---------------------|-----------------------|----------------------|\n workdir exists and | no action | conflict (notify |\n is != baseline | notify dirty MODIFIED | and cancel checkout) |\n---------------------|-----------------------|----------------------|\n workdir missing, | notify dirty DELETED | create file |\n baseline present | | |\n---------------------|-----------------------|----------------------|

    • \n
\n\n

To emulate git checkout, use GIT_CHECKOUT_SAFE with a checkout\n notification callback (see below) that displays information about dirty\n files. The default behavior will cancel checkout on conflicts.

\n\n

To emulate git checkout-index, use GIT_CHECKOUT_SAFE with a\n notification callback that cancels the operation if a dirty-but-existing\n file is found in the working directory. This core git command isn't\n quite "force" but is sensitive about some types of changes.

\n\n

To emulate git checkout -f, use GIT_CHECKOUT_FORCE.

\n\n

There are some additional flags to modified the behavior of checkout:

\n\n
    \n

  • GIT_CHECKOUT_ALLOW_CONFLICTS makes SAFE mode apply safe file updates\neven if there are conflicts (instead of cancelling the checkout).

    • \n

  • GIT_CHECKOUT_REMOVE_UNTRACKED means remove untracked files (i.e. not\nin target, baseline, or index, and not ignored) from the working dir.

    • \n

  • GIT_CHECKOUT_REMOVE_IGNORED means remove ignored files (that are also\nuntracked) from the working directory as well.

    • \n

  • GIT_CHECKOUT_UPDATE_ONLY means to only update the content of files that\nalready exist. Files will not be created nor deleted. This just skips\napplying adds, deletes, and typechanges.

    • \n

  • GIT_CHECKOUT_DONT_UPDATE_INDEX prevents checkout from writing the\nupdated files' information to the index.

    • \n

  • Normally, checkout will reload the index and git attributes from disk\nbefore any operations. GIT_CHECKOUT_NO_REFRESH prevents this reload.

    • \n

  • Unmerged index entries are conflicts. GIT_CHECKOUT_SKIP_UNMERGED skips\nfiles with unmerged index entries instead. GIT_CHECKOUT_USE_OURS and\nGIT_CHECKOUT_USE_THEIRS to proceed with the checkout using either the\nstage 2 ("ours") or stage 3 ("theirs") version of files in the index.

    • \n

  • GIT_CHECKOUT_DONT_OVERWRITE_IGNORED prevents ignored files from being\noverwritten. Normally, files that are ignored in the working directory\nare not considered "precious" and may be overwritten if the checkout\ntarget contains that file.

    • \n

  • GIT_CHECKOUT_DONT_REMOVE_EXISTING prevents checkout from removing\nfiles or folders that fold to the same name on case insensitive\nfilesystems. This can cause files to retain their existing names\nand write through existing symbolic links.

    • \n
\n","fields":[{"type":"int","name":"GIT_CHECKOUT_NONE","comments":"

default is a dry run, no actual updates

\n","value":0},{"type":"int","name":"GIT_CHECKOUT_SAFE","comments":"

Allow safe updates that cannot overwrite uncommitted data

\n","value":1},{"type":"int","name":"GIT_CHECKOUT_FORCE","comments":"

Allow all updates to force working directory to look like index

\n","value":2},{"type":"int","name":"GIT_CHECKOUT_RECREATE_MISSING","comments":"

Allow checkout to recreate missing files

\n","value":4},{"type":"int","name":"GIT_CHECKOUT_ALLOW_CONFLICTS","comments":"

Allow checkout to make safe updates even if conflicts are found

\n","value":16},{"type":"int","name":"GIT_CHECKOUT_REMOVE_UNTRACKED","comments":"

Remove untracked files not in index (that are not ignored)

\n","value":32},{"type":"int","name":"GIT_CHECKOUT_REMOVE_IGNORED","comments":"

Remove ignored files not in index

\n","value":64},{"type":"int","name":"GIT_CHECKOUT_UPDATE_ONLY","comments":"

Only update existing files, don't create new ones

\n","value":128},{"type":"int","name":"GIT_CHECKOUT_DONT_UPDATE_INDEX","comments":"

Normally checkout updates index entries as it goes; this stops that.\n Implies GIT_CHECKOUT_DONT_WRITE_INDEX.

\n","value":256},{"type":"int","name":"GIT_CHECKOUT_NO_REFRESH","comments":"

Don't refresh index/config/etc before doing checkout

\n","value":512},{"type":"int","name":"GIT_CHECKOUT_SKIP_UNMERGED","comments":"

Allow checkout to skip unmerged files

\n","value":1024},{"type":"int","name":"GIT_CHECKOUT_USE_OURS","comments":"

For unmerged files, checkout stage 2 from index

\n","value":2048},{"type":"int","name":"GIT_CHECKOUT_USE_THEIRS","comments":"

For unmerged files, checkout stage 3 from index

\n","value":4096},{"type":"int","name":"GIT_CHECKOUT_DISABLE_PATHSPEC_MATCH","comments":"

Treat pathspec as simple list of exact match file paths

\n","value":8192},{"type":"int","name":"GIT_CHECKOUT_SKIP_LOCKED_DIRECTORIES","comments":"

Ignore directories in use, they will be left empty

\n","value":262144},{"type":"int","name":"GIT_CHECKOUT_DONT_OVERWRITE_IGNORED","comments":"

Don't overwrite ignored files that exist in the checkout target

\n","value":524288},{"type":"int","name":"GIT_CHECKOUT_CONFLICT_STYLE_MERGE","comments":"

Write normal merge files for conflicts

\n","value":1048576},{"type":"int","name":"GIT_CHECKOUT_CONFLICT_STYLE_DIFF3","comments":"

Include common ancestor data in diff3 format files for conflicts

\n","value":2097152},{"type":"int","name":"GIT_CHECKOUT_DONT_REMOVE_EXISTING","comments":"

Don't overwrite existing files or folders

\n","value":4194304},{"type":"int","name":"GIT_CHECKOUT_DONT_WRITE_INDEX","comments":"

Normally checkout writes the index upon completion; this prevents that.

\n","value":8388608},{"type":"int","name":"GIT_CHECKOUT_UPDATE_SUBMODULES","comments":"

Recursively checkout submodules with same options (NOT IMPLEMENTED)

\n","value":65536},{"type":"int","name":"GIT_CHECKOUT_UPDATE_SUBMODULES_IF_CHANGED","comments":"

Recursively checkout submodules if HEAD moved in super repo (NOT IMPLEMENTED)

\n","value":131072}],"used":{"returns":[],"needs":[]}}],["git_cherrypick_options",{"decl":["unsigned int version","unsigned int mainline","git_merge_options merge_opts","git_checkout_options checkout_opts"],"type":"struct","value":"git_cherrypick_options","file":"cherrypick.h","line":26,"lineto":34,"block":"unsigned int version\nunsigned int mainline\ngit_merge_options merge_opts\ngit_checkout_options checkout_opts","tdef":"typedef","description":" Cherry-pick options","comments":"","fields":[{"type":"unsigned int","name":"version","comments":""},{"type":"unsigned int","name":"mainline","comments":" For merge commits, the \"mainline\" is treated as the parent. "},{"type":"git_merge_options","name":"merge_opts","comments":" Options for the merging "},{"type":"git_checkout_options","name":"checkout_opts","comments":" Options for the checkout "}],"used":{"returns":[],"needs":["git_cherrypick","git_cherrypick_init_options"]}}],["git_clone_local_t",{"decl":["GIT_CLONE_LOCAL_AUTO","GIT_CLONE_LOCAL","GIT_CLONE_NO_LOCAL","GIT_CLONE_LOCAL_NO_LINKS"],"type":"enum","file":"clone.h","line":33,"lineto":53,"block":"GIT_CLONE_LOCAL_AUTO\nGIT_CLONE_LOCAL\nGIT_CLONE_NO_LOCAL\nGIT_CLONE_LOCAL_NO_LINKS","tdef":"typedef","description":" Options for bypassing the git-aware transport on clone. Bypassing\n it means that instead of a fetch, libgit2 will copy the object\n database directory instead of figuring out what it needs, which is\n faster. If possible, it will hardlink the files to save space.","comments":"","fields":[{"type":"int","name":"GIT_CLONE_LOCAL_AUTO","comments":"

Auto-detect (default), libgit2 will bypass the git-aware\n transport for local paths, but use a normal fetch for\n file:// urls.

\n","value":0},{"type":"int","name":"GIT_CLONE_LOCAL","comments":"

Bypass the git-aware transport even for a file:// url.

\n","value":1},{"type":"int","name":"GIT_CLONE_NO_LOCAL","comments":"

Do no bypass the git-aware transport

\n","value":2},{"type":"int","name":"GIT_CLONE_LOCAL_NO_LINKS","comments":"

Bypass the git-aware transport, but do not try to use\n hardlinks.

\n","value":3}],"used":{"returns":[],"needs":[]}}],["git_clone_options",{"decl":["unsigned int version","git_checkout_options checkout_opts","git_fetch_options fetch_opts","int bare","git_clone_local_t local","const char * checkout_branch","git_repository_create_cb repository_cb","void * repository_cb_payload","git_remote_create_cb remote_cb","void * remote_cb_payload"],"type":"struct","value":"git_clone_options","file":"clone.h","line":103,"lineto":164,"block":"unsigned int version\ngit_checkout_options checkout_opts\ngit_fetch_options fetch_opts\nint bare\ngit_clone_local_t local\nconst char * checkout_branch\ngit_repository_create_cb repository_cb\nvoid * repository_cb_payload\ngit_remote_create_cb remote_cb\nvoid * remote_cb_payload","tdef":"typedef","description":" Clone options structure","comments":"

Use the GIT_CLONE_OPTIONS_INIT to get the default settings, like this:

\n\n
    git_clone_options opts = GIT_CLONE_OPTIONS_INIT;\n
\n","fields":[{"type":"unsigned int","name":"version","comments":""},{"type":"git_checkout_options","name":"checkout_opts","comments":" These options are passed to the checkout step. To disable\n checkout, set the `checkout_strategy` to\n `GIT_CHECKOUT_NONE`."},{"type":"git_fetch_options","name":"fetch_opts","comments":" Options which control the fetch, including callbacks.\n\n The callbacks are used for reporting fetch progress, and for acquiring\n credentials in the event they are needed."},{"type":"int","name":"bare","comments":" Set to zero (false) to create a standard repo, or non-zero\n for a bare repo"},{"type":"git_clone_local_t","name":"local","comments":" Whether to use a fetch or copy the object database."},{"type":"const char *","name":"checkout_branch","comments":" The name of the branch to checkout. NULL means use the\n remote's default branch."},{"type":"git_repository_create_cb","name":"repository_cb","comments":" A callback used to create the new repository into which to\n clone. If NULL, the 'bare' field will be used to determine\n whether to create a bare repository."},{"type":"void *","name":"repository_cb_payload","comments":" An opaque payload to pass to the git_repository creation callback.\n This parameter is ignored unless repository_cb is non-NULL."},{"type":"git_remote_create_cb","name":"remote_cb","comments":" A callback used to create the git_remote, prior to its being\n used to perform the clone operation. See the documentation for\n git_remote_create_cb for details. This parameter may be NULL,\n indicating that git_clone should provide default behavior."},{"type":"void *","name":"remote_cb_payload","comments":" An opaque payload to pass to the git_remote creation callback.\n This parameter is ignored unless remote_cb is non-NULL."}],"used":{"returns":[],"needs":["git_clone","git_clone_init_options"]}}],["git_commit",{"decl":"git_commit","type":"struct","value":"git_commit","file":"types.h","line":120,"lineto":120,"tdef":"typedef","description":" Parsed representation of a commit object. ","comments":"","used":{"returns":[],"needs":["git_branch_create","git_cherrypick","git_cherrypick_commit","git_commit_amend","git_commit_author","git_commit_committer","git_commit_create","git_commit_free","git_commit_header_field","git_commit_id","git_commit_lookup","git_commit_lookup_prefix","git_commit_message","git_commit_message_encoding","git_commit_message_raw","git_commit_nth_gen_ancestor","git_commit_owner","git_commit_parent","git_commit_parent_id","git_commit_parentcount","git_commit_raw_header","git_commit_summary","git_commit_time","git_commit_time_offset","git_commit_tree","git_commit_tree_id","git_diff_commit_as_email","git_merge_commits","git_revert","git_revert_commit"]}}],["git_config",{"decl":"git_config","type":"struct","value":"git_config","file":"types.h","line":138,"lineto":138,"tdef":"typedef","description":" Memory representation of a set of config files ","comments":"","used":{"returns":[],"needs":["git_config_add_backend","git_config_add_file_ondisk","git_config_delete_entry","git_config_delete_multivar","git_config_foreach","git_config_foreach_match","git_config_free","git_config_get_bool","git_config_get_entry","git_config_get_int32","git_config_get_int64","git_config_get_mapped","git_config_get_multivar_foreach","git_config_get_path","git_config_get_string","git_config_get_string_buf","git_config_iterator_glob_new","git_config_iterator_new","git_config_multivar_iterator_new","git_config_new","git_config_open_default","git_config_open_global","git_config_open_level","git_config_open_ondisk","git_config_set_bool","git_config_set_int32","git_config_set_int64","git_config_set_multivar","git_config_set_string","git_config_snapshot","git_repository_config","git_repository_config_snapshot","git_repository_set_config"]}}],["git_config_backend",{"decl":"git_config_backend","type":"struct","value":"git_config_backend","file":"types.h","line":141,"lineto":141,"block":"unsigned int version\nint readonly\nstruct git_config * cfg\nint (*)(struct git_config_backend *, git_config_level_t) open\nint (*)(struct git_config_backend *, const char *, git_config_entry **) get\nint (*)(struct git_config_backend *, const char *, const char *) set\nint (*)(git_config_backend *, const char *, const char *, const char *) set_multivar\nint (*)(struct git_config_backend *, const char *) del\nint (*)(struct git_config_backend *, const char *, const char *) del_multivar\nint (*)(git_config_iterator **, struct git_config_backend *) iterator\nint (*)(struct git_config_backend **, struct git_config_backend *) snapshot\nvoid (*)(struct git_config_backend *) free","tdef":"typedef","description":" Interface to access a configuration file ","comments":"","fields":[{"type":"unsigned int","name":"version","comments":""},{"type":"int","name":"readonly","comments":" True if this backend is for a snapshot "},{"type":"struct git_config *","name":"cfg","comments":""},{"type":"int (*)(struct git_config_backend *, git_config_level_t)","name":"open","comments":""},{"type":"int (*)(struct git_config_backend *, const char *, git_config_entry **)","name":"get","comments":""},{"type":"int (*)(struct git_config_backend *, const char *, const char *)","name":"set","comments":""},{"type":"int (*)(git_config_backend *, const char *, const char *, const char *)","name":"set_multivar","comments":""},{"type":"int (*)(struct git_config_backend *, const char *)","name":"del","comments":""},{"type":"int (*)(struct git_config_backend *, const char *, const char *)","name":"del_multivar","comments":""},{"type":"int (*)(git_config_iterator **, struct git_config_backend *)","name":"iterator","comments":""},{"type":"int (*)(struct git_config_backend **, struct git_config_backend *)","name":"snapshot","comments":" Produce a read-only version of this backend "},{"type":"void (*)(struct git_config_backend *)","name":"free","comments":""}],"used":{"returns":[],"needs":["git_config_add_backend","git_config_backend_foreach_match","git_config_init_backend"]}}],["git_config_entry",{"decl":["const char * name","const char * value","git_config_level_t level","void (*)(struct git_config_entry *) free","void * payload"],"type":"struct","value":"git_config_entry","file":"config.h","line":61,"lineto":67,"block":"const char * name\nconst char * value\ngit_config_level_t level\nvoid (*)(struct git_config_entry *) free\nvoid * payload","tdef":"typedef","description":" An entry in a configuration file","comments":"","fields":[{"type":"const char *","name":"name","comments":" Name of the entry (normalised) "},{"type":"const char *","name":"value","comments":" String value of the entry "},{"type":"git_config_level_t","name":"level","comments":" Which config file this was found in "},{"type":"void (*)(struct git_config_entry *)","name":"free","comments":" Free function for this entry "},{"type":"void *","name":"payload","comments":" Opaque value for the free function. Do not read or write "}],"used":{"returns":[],"needs":["git_config_entry_free","git_config_get_entry","git_config_next"]}}],["git_config_iterator",{"decl":["git_config_backend * backend","unsigned int flags","int (*)(git_config_entry **, git_config_iterator *) next","void (*)(git_config_iterator *) free"],"type":"struct","value":"git_config_iterator","file":"sys/config.h","line":34,"lineto":48,"block":"git_config_backend * backend\nunsigned int flags\nint (*)(git_config_entry **, git_config_iterator *) next\nvoid (*)(git_config_iterator *) free","tdef":null,"description":" Every iterator must have this struct as its first element, so the\n API can talk to it. You'd define your iterator as","comments":"
 struct my_iterator {\n         git_config_iterator parent;\n         ...\n }\n
\n\n

and assign iter->parent.backend to your git_config_backend.

\n","fields":[{"type":"git_config_backend *","name":"backend","comments":""},{"type":"unsigned int","name":"flags","comments":""},{"type":"int (*)(git_config_entry **, git_config_iterator *)","name":"next","comments":" Return the current entry and advance the iterator. The\n memory belongs to the library."},{"type":"void (*)(git_config_iterator *)","name":"free","comments":" Free the iterator"}],"used":{"returns":[],"needs":["git_config_iterator_free","git_config_iterator_glob_new","git_config_iterator_new","git_config_multivar_iterator_new","git_config_next"]}}],["git_config_level_t",{"decl":["GIT_CONFIG_LEVEL_SYSTEM","GIT_CONFIG_LEVEL_XDG","GIT_CONFIG_LEVEL_GLOBAL","GIT_CONFIG_LEVEL_LOCAL","GIT_CONFIG_LEVEL_APP","GIT_CONFIG_HIGHEST_LEVEL"],"type":"enum","file":"config.h","line":31,"lineto":56,"block":"GIT_CONFIG_LEVEL_SYSTEM\nGIT_CONFIG_LEVEL_XDG\nGIT_CONFIG_LEVEL_GLOBAL\nGIT_CONFIG_LEVEL_LOCAL\nGIT_CONFIG_LEVEL_APP\nGIT_CONFIG_HIGHEST_LEVEL","tdef":"typedef","description":" Priority level of a config file.\n These priority levels correspond to the natural escalation logic\n (from higher to lower) when searching for config entries in git.git.","comments":"

git_config_open_default() and git_repository_config() honor those\n priority levels as well.

\n","fields":[{"type":"int","name":"GIT_CONFIG_LEVEL_SYSTEM","comments":"

System-wide configuration file; /etc/gitconfig on Linux systems

\n","value":1},{"type":"int","name":"GIT_CONFIG_LEVEL_XDG","comments":"

XDG compatible configuration file; typically ~/.config/git/config

\n","value":2},{"type":"int","name":"GIT_CONFIG_LEVEL_GLOBAL","comments":"

User-specific configuration file (also called Global configuration\n file); typically ~/.gitconfig

\n","value":3},{"type":"int","name":"GIT_CONFIG_LEVEL_LOCAL","comments":"

Repository specific configuration file; $WORK_DIR/.git/config on\n non-bare repos

\n","value":4},{"type":"int","name":"GIT_CONFIG_LEVEL_APP","comments":"

Application specific configuration file; freely defined by applications

\n","value":5},{"type":"int","name":"GIT_CONFIG_HIGHEST_LEVEL","comments":"

Represents the highest level available config file (i.e. the most\n specific config file available that actually is loaded)

\n","value":-1}],"used":{"returns":[],"needs":["git_config_add_backend","git_config_add_file_ondisk","git_config_open_level"]}}],["git_cred_default",{"decl":"git_cred_default","type":"struct","value":"git_cred_default","file":"transport.h","line":183,"lineto":183,"tdef":"typedef","description":" A key for NTLM/Kerberos \"default\" credentials ","comments":"","used":{"returns":[],"needs":[]}}],["git_cred_ssh_custom",{"decl":["git_cred parent","char * username","char * publickey","size_t publickey_len","git_cred_sign_callback sign_callback","void * payload"],"type":"struct","value":"git_cred_ssh_custom","file":"transport.h","line":173,"lineto":180,"block":"git_cred parent\nchar * username\nchar * publickey\nsize_t publickey_len\ngit_cred_sign_callback sign_callback\nvoid * payload","tdef":"typedef","description":" A key with a custom signature function","comments":"","fields":[{"type":"git_cred","name":"parent","comments":""},{"type":"char *","name":"username","comments":""},{"type":"char *","name":"publickey","comments":""},{"type":"size_t","name":"publickey_len","comments":""},{"type":"git_cred_sign_callback","name":"sign_callback","comments":""},{"type":"void *","name":"payload","comments":""}],"used":{"returns":[],"needs":[]}}],["git_cred_ssh_interactive",{"decl":["git_cred parent","char * username","git_cred_ssh_interactive_callback prompt_callback","void * payload"],"type":"struct","value":"git_cred_ssh_interactive","file":"transport.h","line":163,"lineto":168,"block":"git_cred parent\nchar * username\ngit_cred_ssh_interactive_callback prompt_callback\nvoid * payload","tdef":"typedef","description":" Keyboard-interactive based ssh authentication","comments":"","fields":[{"type":"git_cred","name":"parent","comments":""},{"type":"char *","name":"username","comments":""},{"type":"git_cred_ssh_interactive_callback","name":"prompt_callback","comments":""},{"type":"void *","name":"payload","comments":""}],"used":{"returns":[],"needs":[]}}],["git_cred_ssh_key",{"decl":["git_cred parent","char * username","char * publickey","char * privatekey","char * passphrase"],"type":"struct","value":"git_cred_ssh_key","file":"transport.h","line":152,"lineto":158,"block":"git_cred parent\nchar * username\nchar * publickey\nchar * privatekey\nchar * passphrase","tdef":"typedef","description":" A ssh key from disk","comments":"","fields":[{"type":"git_cred","name":"parent","comments":""},{"type":"char *","name":"username","comments":""},{"type":"char *","name":"publickey","comments":""},{"type":"char *","name":"privatekey","comments":""},{"type":"char *","name":"passphrase","comments":""}],"used":{"returns":[],"needs":[]}}],["git_cred_username",{"decl":["git_cred parent","char [1] username"],"type":"struct","value":"git_cred_username","file":"transport.h","line":186,"lineto":189,"block":"git_cred parent\nchar [1] username","tdef":"typedef","description":" Username-only credential information ","comments":"","fields":[{"type":"git_cred","name":"parent","comments":""},{"type":"char [1]","name":"username","comments":""}],"used":{"returns":[],"needs":[]}}],["git_cred_userpass_payload",{"decl":["const char * username","const char * password"],"type":"struct","value":"git_cred_userpass_payload","file":"cred_helpers.h","line":24,"lineto":27,"block":"const char * username\nconst char * password","tdef":"typedef","description":" Payload for git_cred_stock_userpass_plaintext.","comments":"","fields":[{"type":"const char *","name":"username","comments":""},{"type":"const char *","name":"password","comments":""}],"used":{"returns":[],"needs":[]}}],["git_cred_userpass_plaintext",{"decl":["git_cred parent","char * username","char * password"],"type":"struct","value":"git_cred_userpass_plaintext","file":"transport.h","line":129,"lineto":133,"block":"git_cred parent\nchar * username\nchar * password","tdef":"typedef","description":" A plaintext username and password ","comments":"","fields":[{"type":"git_cred","name":"parent","comments":""},{"type":"char *","name":"username","comments":""},{"type":"char *","name":"password","comments":""}],"used":{"returns":[],"needs":[]}}],["git_credtype_t",{"decl":["GIT_CREDTYPE_USERPASS_PLAINTEXT","GIT_CREDTYPE_SSH_KEY","GIT_CREDTYPE_SSH_CUSTOM","GIT_CREDTYPE_DEFAULT","GIT_CREDTYPE_SSH_INTERACTIVE","GIT_CREDTYPE_USERNAME","GIT_CREDTYPE_SSH_MEMORY"],"type":"enum","file":"transport.h","line":88,"lineto":118,"block":"GIT_CREDTYPE_USERPASS_PLAINTEXT\nGIT_CREDTYPE_SSH_KEY\nGIT_CREDTYPE_SSH_CUSTOM\nGIT_CREDTYPE_DEFAULT\nGIT_CREDTYPE_SSH_INTERACTIVE\nGIT_CREDTYPE_USERNAME\nGIT_CREDTYPE_SSH_MEMORY","tdef":"typedef","description":" Authentication type requested ","comments":"","fields":[{"type":"int","name":"GIT_CREDTYPE_USERPASS_PLAINTEXT","comments":"","value":1},{"type":"int","name":"GIT_CREDTYPE_SSH_KEY","comments":"","value":2},{"type":"int","name":"GIT_CREDTYPE_SSH_CUSTOM","comments":"","value":4},{"type":"int","name":"GIT_CREDTYPE_DEFAULT","comments":"","value":8},{"type":"int","name":"GIT_CREDTYPE_SSH_INTERACTIVE","comments":"","value":16},{"type":"int","name":"GIT_CREDTYPE_USERNAME","comments":"

Username-only information

\n\n

If the SSH transport does not know which username to use,\n it will ask via this credential type.

\n","value":32},{"type":"int","name":"GIT_CREDTYPE_SSH_MEMORY","comments":"

Credentials read from memory.

\n\n

Only available for libssh2+OpenSSL for now.

\n","value":64}],"used":{"returns":[],"needs":[]}}],["git_cvar_map",{"decl":["git_cvar_t cvar_type","const char * str_match","int map_value"],"type":"struct","value":"git_cvar_map","file":"config.h","line":90,"lineto":94,"block":"git_cvar_t cvar_type\nconst char * str_match\nint map_value","tdef":"typedef","description":" Mapping from config variables to values.","comments":"","fields":[{"type":"git_cvar_t","name":"cvar_type","comments":""},{"type":"const char *","name":"str_match","comments":""},{"type":"int","name":"map_value","comments":""}],"used":{"returns":[],"needs":["git_config_get_mapped","git_config_lookup_map_value"]}}],["git_cvar_t",{"decl":["GIT_CVAR_FALSE","GIT_CVAR_TRUE","GIT_CVAR_INT32","GIT_CVAR_STRING"],"type":"enum","file":"config.h","line":80,"lineto":85,"block":"GIT_CVAR_FALSE\nGIT_CVAR_TRUE\nGIT_CVAR_INT32\nGIT_CVAR_STRING","tdef":"typedef","description":" Config var type","comments":"","fields":[{"type":"int","name":"GIT_CVAR_FALSE","comments":"","value":0},{"type":"int","name":"GIT_CVAR_TRUE","comments":"","value":1},{"type":"int","name":"GIT_CVAR_INT32","comments":"","value":2},{"type":"int","name":"GIT_CVAR_STRING","comments":"","value":3}],"used":{"returns":[],"needs":[]}}],["git_delta_t",{"decl":["GIT_DELTA_UNMODIFIED","GIT_DELTA_ADDED","GIT_DELTA_DELETED","GIT_DELTA_MODIFIED","GIT_DELTA_RENAMED","GIT_DELTA_COPIED","GIT_DELTA_IGNORED","GIT_DELTA_UNTRACKED","GIT_DELTA_TYPECHANGE","GIT_DELTA_UNREADABLE","GIT_DELTA_CONFLICTED"],"type":"enum","file":"diff.h","line":242,"lineto":254,"block":"GIT_DELTA_UNMODIFIED\nGIT_DELTA_ADDED\nGIT_DELTA_DELETED\nGIT_DELTA_MODIFIED\nGIT_DELTA_RENAMED\nGIT_DELTA_COPIED\nGIT_DELTA_IGNORED\nGIT_DELTA_UNTRACKED\nGIT_DELTA_TYPECHANGE\nGIT_DELTA_UNREADABLE\nGIT_DELTA_CONFLICTED","tdef":"typedef","description":" What type of change is described by a git_diff_delta?","comments":"

GIT_DELTA_RENAMED and GIT_DELTA_COPIED will only show up if you run\n git_diff_find_similar() on the diff object.

\n\n

GIT_DELTA_TYPECHANGE only shows up given GIT_DIFF_INCLUDE_TYPECHANGE\n in the option flags (otherwise type changes will be split into ADDED /\n DELETED pairs).

\n","fields":[{"type":"int","name":"GIT_DELTA_UNMODIFIED","comments":"

no changes

\n","value":0},{"type":"int","name":"GIT_DELTA_ADDED","comments":"

entry does not exist in old version

\n","value":1},{"type":"int","name":"GIT_DELTA_DELETED","comments":"

entry does not exist in new version

\n","value":2},{"type":"int","name":"GIT_DELTA_MODIFIED","comments":"

entry content changed between old and new

\n","value":3},{"type":"int","name":"GIT_DELTA_RENAMED","comments":"

entry was renamed between old and new

\n","value":4},{"type":"int","name":"GIT_DELTA_COPIED","comments":"

entry was copied from another old entry

\n","value":5},{"type":"int","name":"GIT_DELTA_IGNORED","comments":"

entry is ignored item in workdir

\n","value":6},{"type":"int","name":"GIT_DELTA_UNTRACKED","comments":"

entry is untracked item in workdir

\n","value":7},{"type":"int","name":"GIT_DELTA_TYPECHANGE","comments":"

type of entry changed between old and new

\n","value":8},{"type":"int","name":"GIT_DELTA_UNREADABLE","comments":"

entry is unreadable

\n","value":9},{"type":"int","name":"GIT_DELTA_CONFLICTED","comments":"

entry in the index is conflicted

\n","value":10}],"used":{"returns":[],"needs":["git_diff_num_deltas_of_type","git_diff_status_char"]}}],["git_describe_format_options",{"decl":["unsigned int version","unsigned int abbreviated_size","int always_use_long_format","const char * dirty_suffix"],"type":"struct","value":"git_describe_format_options","file":"describe.h","line":78,"lineto":98,"block":"unsigned int version\nunsigned int abbreviated_size\nint always_use_long_format\nconst char * dirty_suffix","tdef":"typedef","description":" Options for formatting the describe string","comments":"","fields":[{"type":"unsigned int","name":"version","comments":""},{"type":"unsigned int","name":"abbreviated_size","comments":" Size of the abbreviated commit id to use. This value is the\n lower bound for the length of the abbreviated string. The\n default is 7."},{"type":"int","name":"always_use_long_format","comments":" Set to use the long format even when a shorter name could be used."},{"type":"const char *","name":"dirty_suffix","comments":" If the workdir is dirty and this is set, this string will\n be appended to the description string."}],"used":{"returns":[],"needs":["git_describe_format"]}}],["git_describe_options",{"decl":["unsigned int version","unsigned int max_candidates_tags","unsigned int describe_strategy","const char * pattern","int only_follow_first_parent","int show_commit_oid_as_fallback"],"type":"struct","value":"git_describe_options","file":"describe.h","line":44,"lineto":62,"block":"unsigned int version\nunsigned int max_candidates_tags\nunsigned int describe_strategy\nconst char * pattern\nint only_follow_first_parent\nint show_commit_oid_as_fallback","tdef":"typedef","description":" Describe options structure","comments":"

Initialize with GIT_DESCRIBE_OPTIONS_INIT macro to correctly set\n the version field. E.g.

\n\n
    git_describe_options opts = GIT_DESCRIBE_OPTIONS_INIT;\n
\n","fields":[{"type":"unsigned int","name":"version","comments":""},{"type":"unsigned int","name":"max_candidates_tags","comments":""},{"type":"unsigned int","name":"describe_strategy","comments":" default: 10 "},{"type":"const char *","name":"pattern","comments":" default: GIT_DESCRIBE_DEFAULT "},{"type":"int","name":"only_follow_first_parent","comments":" When calculating the distance from the matching tag or\n reference, only walk down the first-parent ancestry."},{"type":"int","name":"show_commit_oid_as_fallback","comments":" If no matching tag or reference is found, the describe\n operation would normally fail. If this option is set, it\n will instead fall back to showing the full id of the\n commit."}],"used":{"returns":[],"needs":["git_describe_commit","git_describe_workdir"]}}],["git_describe_strategy_t",{"decl":["GIT_DESCRIBE_DEFAULT","GIT_DESCRIBE_TAGS","GIT_DESCRIBE_ALL"],"type":"enum","file":"describe.h","line":30,"lineto":34,"block":"GIT_DESCRIBE_DEFAULT\nGIT_DESCRIBE_TAGS\nGIT_DESCRIBE_ALL","tdef":"typedef","description":" Reference lookup strategy","comments":"

These behave like the --tags and --all optios to git-describe,\n namely they say to look for any reference in either refs/tags/ or\n refs/ respectively.

\n","fields":[{"type":"int","name":"GIT_DESCRIBE_DEFAULT","comments":"","value":0},{"type":"int","name":"GIT_DESCRIBE_TAGS","comments":"","value":1},{"type":"int","name":"GIT_DESCRIBE_ALL","comments":"","value":2}],"used":{"returns":[],"needs":[]}}],["git_diff",{"decl":"git_diff","type":"struct","value":"git_diff","file":"diff.h","line":215,"lineto":215,"tdef":"typedef","description":" The diff object that contains all individual file deltas.","comments":"

This is an opaque structure which will be allocated by one of the diff\n generator functions below (such as git_diff_tree_to_tree). You are\n responsible for releasing the object memory when done, using the\n git_diff_free() function.

\n","used":{"returns":[],"needs":["git_diff_find_similar","git_diff_foreach","git_diff_format_email","git_diff_free","git_diff_get_delta","git_diff_get_perfdata","git_diff_get_stats","git_diff_index_to_workdir","git_diff_is_sorted_icase","git_diff_merge","git_diff_num_deltas","git_diff_num_deltas_of_type","git_diff_print","git_diff_tree_to_index","git_diff_tree_to_tree","git_diff_tree_to_workdir","git_diff_tree_to_workdir_with_index","git_patch_from_diff","git_pathspec_match_diff"]}}],["git_diff_binary",{"decl":["git_diff_binary_file old_file","git_diff_binary_file new_file"],"type":"struct","value":"git_diff_binary","file":"diff.h","line":461,"lineto":464,"block":"git_diff_binary_file old_file\ngit_diff_binary_file new_file","tdef":"typedef","description":" Structure describing the binary contents of a diff. ","comments":"","fields":[{"type":"git_diff_binary_file","name":"old_file","comments":" The contents of the old file. "},{"type":"git_diff_binary_file","name":"new_file","comments":" The contents of the new file. "}],"used":{"returns":[],"needs":[]}}],["git_diff_binary_file",{"decl":["git_diff_binary_t type","const char * data","size_t datalen","size_t inflatedlen"],"type":"struct","value":"git_diff_binary_file","file":"diff.h","line":446,"lineto":458,"block":"git_diff_binary_t type\nconst char * data\nsize_t datalen\nsize_t inflatedlen","tdef":"typedef","description":" The contents of one of the files in a binary diff. ","comments":"","fields":[{"type":"git_diff_binary_t","name":"type","comments":" The type of binary data for this file. "},{"type":"const char *","name":"data","comments":" The binary data, deflated. "},{"type":"size_t","name":"datalen","comments":" The length of the binary data. "},{"type":"size_t","name":"inflatedlen","comments":" The length of the binary data after inflation. "}],"used":{"returns":[],"needs":[]}}],["git_diff_binary_t",{"decl":["GIT_DIFF_BINARY_NONE","GIT_DIFF_BINARY_LITERAL","GIT_DIFF_BINARY_DELTA"],"type":"enum","file":"diff.h","line":434,"lineto":443,"block":"GIT_DIFF_BINARY_NONE\nGIT_DIFF_BINARY_LITERAL\nGIT_DIFF_BINARY_DELTA","tdef":"typedef","description":" When producing a binary diff, the binary data returned will be\n either the deflated full (\"literal\") contents of the file, or\n the deflated binary delta between the two sides (whichever is\n smaller).","comments":"","fields":[{"type":"int","name":"GIT_DIFF_BINARY_NONE","comments":"

There is no binary delta.

\n","value":0},{"type":"int","name":"GIT_DIFF_BINARY_LITERAL","comments":"

The binary data is the literal contents of the file.

\n","value":1},{"type":"int","name":"GIT_DIFF_BINARY_DELTA","comments":"

The binary data is the delta from one side to the other.

\n","value":2}],"used":{"returns":[],"needs":[]}}],["git_diff_delta",{"decl":["git_delta_t status","uint32_t flags","uint16_t similarity","uint16_t nfiles","git_diff_file old_file","git_diff_file new_file"],"type":"struct","value":"git_diff_delta","file":"diff.h","line":321,"lineto":328,"block":"git_delta_t status\nuint32_t flags\nuint16_t similarity\nuint16_t nfiles\ngit_diff_file old_file\ngit_diff_file new_file","tdef":"typedef","description":" Description of changes to one entry.","comments":"

When iterating over a diff, this will be passed to most callbacks and\n you can use the contents to understand exactly what has changed.

\n\n

The old_file represents the "from" side of the diff and the new_file\n represents to "to" side of the diff. What those means depend on the\n function that was used to generate the diff and will be documented below.\n You can also use the GIT_DIFF_REVERSE flag to flip it around.

\n\n

Although the two sides of the delta are named "old_file" and "new_file",\n they actually may correspond to entries that represent a file, a symbolic\n link, a submodule commit id, or even a tree (if you are tracking type\n changes or ignored/untracked directories).

\n\n

Under some circumstances, in the name of efficiency, not all fields will\n be filled in, but we generally try to fill in as much as possible. One\n example is that the "flags" field may not have either the BINARY or the\n NOT_BINARY flag set to avoid examining file contents if you do not pass\n in hunk and/or line callbacks to the diff foreach iteration function. It\n will just use the git attributes for those files.

\n\n

The similarity score is zero unless you call git_diff_find_similar()\n which does a similarity analysis of files in the diff. Use that\n function to do rename and copy detection, and to split heavily modified\n files in add/delete pairs. After that call, deltas with a status of\n GIT_DELTA_RENAMED or GIT_DELTA_COPIED will have a similarity score\n between 0 and 100 indicating how similar the old and new sides are.

\n\n

If you ask git_diff_find_similar to find heavily modified files to\n break, but to not actually break the records, then GIT_DELTA_MODIFIED\n records may have a non-zero similarity score if the self-similarity is\n below the split threshold. To display this value like core Git, invert\n the score (a la printf("M%03d", 100 - delta->similarity)).

\n","fields":[{"type":"git_delta_t","name":"status","comments":""},{"type":"uint32_t","name":"flags","comments":" git_diff_flag_t values "},{"type":"uint16_t","name":"similarity","comments":" for RENAMED and COPIED, value 0-100 "},{"type":"uint16_t","name":"nfiles","comments":" number of files in this delta "},{"type":"git_diff_file","name":"old_file","comments":""},{"type":"git_diff_file","name":"new_file","comments":""}],"used":{"returns":["git_diff_get_delta","git_patch_get_delta","git_pathspec_match_list_diff_entry"],"needs":["git_diff_print_callback__to_buf","git_diff_print_callback__to_file_handle"]}}],["git_diff_file",{"decl":["git_oid id","const char * path","git_off_t size","uint32_t flags","uint16_t mode"],"type":"struct","value":"git_diff_file","file":"diff.h","line":277,"lineto":283,"block":"git_oid id\nconst char * path\ngit_off_t size\nuint32_t flags\nuint16_t mode","tdef":"typedef","description":" Description of one side of a delta.","comments":"

Although this is called a "file", it could represent a file, a symbolic\n link, a submodule commit id, or even a tree (although that only if you\n are tracking type changes or ignored/untracked directories).

\n\n

The oid is the git_oid of the item. If the entry represents an\n absent side of a diff (e.g. the old_file of a GIT_DELTA_ADDED delta),\n then the oid will be zeroes.

\n\n

path is the NUL-terminated path to the entry relative to the working\n directory of the repository.

\n\n

size is the size of the entry in bytes.

\n\n

flags is a combination of the git_diff_flag_t types

\n\n

mode is, roughly, the stat() st_mode value for the item. This will\n be restricted to one of the git_filemode_t values.

\n","fields":[{"type":"git_oid","name":"id","comments":""},{"type":"const char *","name":"path","comments":""},{"type":"git_off_t","name":"size","comments":""},{"type":"uint32_t","name":"flags","comments":""},{"type":"uint16_t","name":"mode","comments":""}],"used":{"returns":[],"needs":[]}}],["git_diff_find_options",{"decl":["unsigned int version","uint32_t flags","uint16_t rename_threshold","uint16_t rename_from_rewrite_threshold","uint16_t copy_threshold","uint16_t break_rewrite_threshold","size_t rename_limit","git_diff_similarity_metric * metric"],"type":"struct","value":"git_diff_find_options","file":"diff.h","line":658,"lineto":684,"block":"unsigned int version\nuint32_t flags\nuint16_t rename_threshold\nuint16_t rename_from_rewrite_threshold\nuint16_t copy_threshold\nuint16_t break_rewrite_threshold\nsize_t rename_limit\ngit_diff_similarity_metric * metric","tdef":"typedef","description":" Control behavior of rename and copy detection","comments":"

These options mostly mimic parameters that can be passed to git-diff.

\n\n
    \n
  • rename_threshold is the same as the -M option with a value
    • \n
  • copy_threshold is the same as the -C option with a value
    • \n
  • rename_from_rewrite_threshold matches the top of the -B option
    • \n
  • break_rewrite_threshold matches the bottom of the -B option
    • \n
  • rename_limit is the maximum number of matches to consider for\na particular file. This is a little different from the -l option\nto regular Git because we will still process up to this many matches\nbefore abandoning the search.
    • \n
\n\n

The metric option allows you to plug in a custom similarity metric.\n Set it to NULL for the default internal metric which is based on sampling\n hashes of ranges of data in the file. The default metric is a pretty\n good similarity approximation that should work fairly well for both text\n and binary data, and is pretty fast with fixed memory overhead.

\n","fields":[{"type":"unsigned int","name":"version","comments":""},{"type":"uint32_t","name":"flags","comments":" Combination of git_diff_find_t values (default GIT_DIFF_FIND_BY_CONFIG).\n NOTE: if you don't explicitly set this, `diff.renames` could be set\n to false, resulting in `git_diff_find_similar` doing nothing."},{"type":"uint16_t","name":"rename_threshold","comments":" Similarity to consider a file renamed (default 50) "},{"type":"uint16_t","name":"rename_from_rewrite_threshold","comments":" Similarity of modified to be eligible rename source (default 50) "},{"type":"uint16_t","name":"copy_threshold","comments":" Similarity to consider a file a copy (default 50) "},{"type":"uint16_t","name":"break_rewrite_threshold","comments":" Similarity to split modify into delete/add pair (default 60) "},{"type":"size_t","name":"rename_limit","comments":" Maximum similarity sources to examine for a file (somewhat like\n git-diff's `-l` option or `diff.renameLimit` config) (default 200)"},{"type":"git_diff_similarity_metric *","name":"metric","comments":" Pluggable similarity metric; pass NULL to use internal metric "}],"used":{"returns":[],"needs":["git_diff_find_init_options","git_diff_find_similar"]}}],["git_diff_find_t",{"decl":["GIT_DIFF_FIND_BY_CONFIG","GIT_DIFF_FIND_RENAMES","GIT_DIFF_FIND_RENAMES_FROM_REWRITES","GIT_DIFF_FIND_COPIES","GIT_DIFF_FIND_COPIES_FROM_UNMODIFIED","GIT_DIFF_FIND_REWRITES","GIT_DIFF_BREAK_REWRITES","GIT_DIFF_FIND_AND_BREAK_REWRITES","GIT_DIFF_FIND_FOR_UNTRACKED","GIT_DIFF_FIND_ALL","GIT_DIFF_FIND_IGNORE_LEADING_WHITESPACE","GIT_DIFF_FIND_IGNORE_WHITESPACE","GIT_DIFF_FIND_DONT_IGNORE_WHITESPACE","GIT_DIFF_FIND_EXACT_MATCH_ONLY","GIT_DIFF_BREAK_REWRITES_FOR_RENAMES_ONLY","GIT_DIFF_FIND_REMOVE_UNMODIFIED"],"type":"enum","file":"diff.h","line":552,"lineto":621,"block":"GIT_DIFF_FIND_BY_CONFIG\nGIT_DIFF_FIND_RENAMES\nGIT_DIFF_FIND_RENAMES_FROM_REWRITES\nGIT_DIFF_FIND_COPIES\nGIT_DIFF_FIND_COPIES_FROM_UNMODIFIED\nGIT_DIFF_FIND_REWRITES\nGIT_DIFF_BREAK_REWRITES\nGIT_DIFF_FIND_AND_BREAK_REWRITES\nGIT_DIFF_FIND_FOR_UNTRACKED\nGIT_DIFF_FIND_ALL\nGIT_DIFF_FIND_IGNORE_LEADING_WHITESPACE\nGIT_DIFF_FIND_IGNORE_WHITESPACE\nGIT_DIFF_FIND_DONT_IGNORE_WHITESPACE\nGIT_DIFF_FIND_EXACT_MATCH_ONLY\nGIT_DIFF_BREAK_REWRITES_FOR_RENAMES_ONLY\nGIT_DIFF_FIND_REMOVE_UNMODIFIED","tdef":"typedef","description":" Flags to control the behavior of diff rename/copy detection.","comments":"","fields":[{"type":"int","name":"GIT_DIFF_FIND_BY_CONFIG","comments":"

Obey diff.renames. Overridden by any other GIT_DIFF_FIND_... flag.

\n","value":0},{"type":"int","name":"GIT_DIFF_FIND_RENAMES","comments":"

Look for renames? (--find-renames)

\n","value":1},{"type":"int","name":"GIT_DIFF_FIND_RENAMES_FROM_REWRITES","comments":"

Consider old side of MODIFIED for renames? (--break-rewrites=N)

\n","value":2},{"type":"int","name":"GIT_DIFF_FIND_COPIES","comments":"

Look for copies? (a la --find-copies).

\n","value":4},{"type":"int","name":"GIT_DIFF_FIND_COPIES_FROM_UNMODIFIED","comments":"

Consider UNMODIFIED as copy sources? (--find-copies-harder).

\n\n

For this to work correctly, use GIT_DIFF_INCLUDE_UNMODIFIED when\n the initial git_diff is being generated.

\n","value":8},{"type":"int","name":"GIT_DIFF_FIND_REWRITES","comments":"

Mark significant rewrites for split (--break-rewrites=/M)

\n","value":16},{"type":"int","name":"GIT_DIFF_BREAK_REWRITES","comments":"

Actually split large rewrites into delete/add pairs

\n","value":32},{"type":"int","name":"GIT_DIFF_FIND_AND_BREAK_REWRITES","comments":"

Mark rewrites for split and break into delete/add pairs

\n","value":48},{"type":"int","name":"GIT_DIFF_FIND_FOR_UNTRACKED","comments":"

Find renames/copies for UNTRACKED items in working directory.

\n\n

For this to work correctly, use GIT_DIFF_INCLUDE_UNTRACKED when the\n initial git_diff is being generated (and obviously the diff must\n be against the working directory for this to make sense).

\n","value":64},{"type":"int","name":"GIT_DIFF_FIND_ALL","comments":"

Turn on all finding features.

\n","value":255},{"type":"int","name":"GIT_DIFF_FIND_IGNORE_LEADING_WHITESPACE","comments":"

Measure similarity ignoring leading whitespace (default)

\n","value":0},{"type":"int","name":"GIT_DIFF_FIND_IGNORE_WHITESPACE","comments":"

Measure similarity ignoring all whitespace

\n","value":4096},{"type":"int","name":"GIT_DIFF_FIND_DONT_IGNORE_WHITESPACE","comments":"

Measure similarity including all data

\n","value":8192},{"type":"int","name":"GIT_DIFF_FIND_EXACT_MATCH_ONLY","comments":"

Measure similarity only by comparing SHAs (fast and cheap)

\n","value":16384},{"type":"int","name":"GIT_DIFF_BREAK_REWRITES_FOR_RENAMES_ONLY","comments":"

Do not break rewrites unless they contribute to a rename.

\n\n

Normally, GIT_DIFF_FIND_AND_BREAK_REWRITES will measure the self-\n similarity of modified files and split the ones that have changed a\n lot into a DELETE / ADD pair. Then the sides of that pair will be\n considered candidates for rename and copy detection.

\n\n

If you add this flag in and the split pair is not used for an\n actual rename or copy, then the modified record will be restored to\n a regular MODIFIED record instead of being split.

\n","value":32768},{"type":"int","name":"GIT_DIFF_FIND_REMOVE_UNMODIFIED","comments":"

Remove any UNMODIFIED deltas after find_similar is done.

\n\n

Using GIT_DIFF_FIND_COPIES_FROM_UNMODIFIED to emulate the\n --find-copies-harder behavior requires building a diff with the\n GIT_DIFF_INCLUDE_UNMODIFIED flag. If you do not want UNMODIFIED\n records in the final result, pass this flag to have them removed.

\n","value":65536}],"used":{"returns":[],"needs":[]}}],["git_diff_flag_t",{"decl":["GIT_DIFF_FLAG_BINARY","GIT_DIFF_FLAG_NOT_BINARY","GIT_DIFF_FLAG_VALID_ID","GIT_DIFF_FLAG_EXISTS"],"type":"enum","file":"diff.h","line":225,"lineto":230,"block":"GIT_DIFF_FLAG_BINARY\nGIT_DIFF_FLAG_NOT_BINARY\nGIT_DIFF_FLAG_VALID_ID\nGIT_DIFF_FLAG_EXISTS","tdef":"typedef","description":" Flags for the delta object and the file objects on each side.","comments":"

These flags are used for both the flags value of the git_diff_delta\n and the flags for the git_diff_file objects representing the old and\n new sides of the delta. Values outside of this public range should be\n considered reserved for internal or future use.

\n","fields":[{"type":"int","name":"GIT_DIFF_FLAG_BINARY","comments":"

file(s) treated as binary data

\n","value":1},{"type":"int","name":"GIT_DIFF_FLAG_NOT_BINARY","comments":"

file(s) treated as text data

\n","value":2},{"type":"int","name":"GIT_DIFF_FLAG_VALID_ID","comments":"

id value is known correct

\n","value":4},{"type":"int","name":"GIT_DIFF_FLAG_EXISTS","comments":"

file exists at this side of the delta

\n","value":8}],"used":{"returns":[],"needs":[]}}],["git_diff_format_email_flags_t",{"decl":["GIT_DIFF_FORMAT_EMAIL_NONE","GIT_DIFF_FORMAT_EMAIL_EXCLUDE_SUBJECT_PATCH_MARKER"],"type":"enum","file":"diff.h","line":1218,"lineto":1225,"block":"GIT_DIFF_FORMAT_EMAIL_NONE\nGIT_DIFF_FORMAT_EMAIL_EXCLUDE_SUBJECT_PATCH_MARKER","tdef":"typedef","description":" Formatting options for diff e-mail generation","comments":"","fields":[{"type":"int","name":"GIT_DIFF_FORMAT_EMAIL_NONE","comments":"

Normal patch, the default

\n","value":0},{"type":"int","name":"GIT_DIFF_FORMAT_EMAIL_EXCLUDE_SUBJECT_PATCH_MARKER","comments":"

Don't insert "[PATCH]" in the subject header

\n","value":1}],"used":{"returns":[],"needs":["git_diff_commit_as_email"]}}],["git_diff_format_email_options",{"decl":["unsigned int version","git_diff_format_email_flags_t flags","size_t patch_no","size_t total_patches","const git_oid * id","const char * summary","const git_signature * author"],"type":"struct","value":"git_diff_format_email_options","file":"diff.h","line":1230,"lineto":1249,"block":"unsigned int version\ngit_diff_format_email_flags_t flags\nsize_t patch_no\nsize_t total_patches\nconst git_oid * id\nconst char * summary\nconst git_signature * author","tdef":"typedef","description":" Options for controlling the formatting of the generated e-mail.","comments":"","fields":[{"type":"unsigned int","name":"version","comments":""},{"type":"git_diff_format_email_flags_t","name":"flags","comments":""},{"type":"size_t","name":"patch_no","comments":" This patch number "},{"type":"size_t","name":"total_patches","comments":" Total number of patches in this series "},{"type":"const git_oid *","name":"id","comments":" id to use for the commit "},{"type":"const char *","name":"summary","comments":" Summary of the change "},{"type":"const git_signature *","name":"author","comments":" Author of the change "}],"used":{"returns":[],"needs":["git_diff_format_email","git_diff_format_email_init_options"]}}],["git_diff_format_t",{"decl":["GIT_DIFF_FORMAT_PATCH","GIT_DIFF_FORMAT_PATCH_HEADER","GIT_DIFF_FORMAT_RAW","GIT_DIFF_FORMAT_NAME_ONLY","GIT_DIFF_FORMAT_NAME_STATUS"],"type":"enum","file":"diff.h","line":981,"lineto":987,"block":"GIT_DIFF_FORMAT_PATCH\nGIT_DIFF_FORMAT_PATCH_HEADER\nGIT_DIFF_FORMAT_RAW\nGIT_DIFF_FORMAT_NAME_ONLY\nGIT_DIFF_FORMAT_NAME_STATUS","tdef":"typedef","description":" Possible output formats for diff data","comments":"","fields":[{"type":"int","name":"GIT_DIFF_FORMAT_PATCH","comments":"

full git diff

\n","value":1},{"type":"int","name":"GIT_DIFF_FORMAT_PATCH_HEADER","comments":"

just the file headers of patch

\n","value":2},{"type":"int","name":"GIT_DIFF_FORMAT_RAW","comments":"

like git diff --raw

\n","value":3},{"type":"int","name":"GIT_DIFF_FORMAT_NAME_ONLY","comments":"

like git diff --name-only

\n","value":4},{"type":"int","name":"GIT_DIFF_FORMAT_NAME_STATUS","comments":"

like git diff --name-status

\n","value":5}],"used":{"returns":[],"needs":["git_diff_print"]}}],["git_diff_hunk",{"decl":["int old_start","int old_lines","int new_start","int new_lines","size_t header_len","char [128] header"],"type":"struct","value":"git_diff_hunk","file":"diff.h","line":478,"lineto":485,"block":"int old_start\nint old_lines\nint new_start\nint new_lines\nsize_t header_len\nchar [128] header","tdef":"typedef","description":" Structure describing a hunk of a diff.","comments":"","fields":[{"type":"int","name":"old_start","comments":" Starting line number in old_file "},{"type":"int","name":"old_lines","comments":" Number of lines in old_file "},{"type":"int","name":"new_start","comments":" Starting line number in new_file "},{"type":"int","name":"new_lines","comments":" Number of lines in new_file "},{"type":"size_t","name":"header_len","comments":" Number of bytes in header text "},{"type":"char [128]","name":"header","comments":" Header text, NUL-byte terminated "}],"used":{"returns":[],"needs":["git_diff_print_callback__to_buf","git_diff_print_callback__to_file_handle","git_patch_get_hunk"]}}],["git_diff_line",{"decl":["char origin","int old_lineno","int new_lineno","int num_lines","size_t content_len","git_off_t content_offset","const char * content"],"type":"struct","value":"git_diff_line","file":"diff.h","line":525,"lineto":533,"block":"char origin\nint old_lineno\nint new_lineno\nint num_lines\nsize_t content_len\ngit_off_t content_offset\nconst char * content","tdef":"typedef","description":" Structure describing a line (or data span) of a diff.","comments":"","fields":[{"type":"char","name":"origin","comments":" A git_diff_line_t value "},{"type":"int","name":"old_lineno","comments":" Line number in old file or -1 for added line "},{"type":"int","name":"new_lineno","comments":" Line number in new file or -1 for deleted line "},{"type":"int","name":"num_lines","comments":" Number of newline characters in content "},{"type":"size_t","name":"content_len","comments":" Number of bytes of data "},{"type":"git_off_t","name":"content_offset","comments":" Offset in the original file to the content "},{"type":"const char *","name":"content","comments":" Pointer to diff text, not NUL-byte terminated "}],"used":{"returns":[],"needs":["git_diff_print_callback__to_buf","git_diff_print_callback__to_file_handle","git_patch_get_line_in_hunk"]}}],["git_diff_line_t",{"decl":["GIT_DIFF_LINE_CONTEXT","GIT_DIFF_LINE_ADDITION","GIT_DIFF_LINE_DELETION","GIT_DIFF_LINE_CONTEXT_EOFNL","GIT_DIFF_LINE_ADD_EOFNL","GIT_DIFF_LINE_DEL_EOFNL","GIT_DIFF_LINE_FILE_HDR","GIT_DIFF_LINE_HUNK_HDR","GIT_DIFF_LINE_BINARY"],"type":"enum","file":"diff.h","line":504,"lineto":520,"block":"GIT_DIFF_LINE_CONTEXT\nGIT_DIFF_LINE_ADDITION\nGIT_DIFF_LINE_DELETION\nGIT_DIFF_LINE_CONTEXT_EOFNL\nGIT_DIFF_LINE_ADD_EOFNL\nGIT_DIFF_LINE_DEL_EOFNL\nGIT_DIFF_LINE_FILE_HDR\nGIT_DIFF_LINE_HUNK_HDR\nGIT_DIFF_LINE_BINARY","tdef":"typedef","description":" Line origin constants.","comments":"

These values describe where a line came from and will be passed to\n the git_diff_line_cb when iterating over a diff. There are some\n special origin constants at the end that are used for the text\n output callbacks to demarcate lines that are actually part of\n the file or hunk headers.

\n","fields":[{"type":"int","name":"GIT_DIFF_LINE_CONTEXT","comments":"","value":32},{"type":"int","name":"GIT_DIFF_LINE_ADDITION","comments":"","value":43},{"type":"int","name":"GIT_DIFF_LINE_DELETION","comments":"","value":45},{"type":"int","name":"GIT_DIFF_LINE_CONTEXT_EOFNL","comments":"

Both files have no LF at end

\n","value":61},{"type":"int","name":"GIT_DIFF_LINE_ADD_EOFNL","comments":"

Old has no LF at end, new does

\n","value":62},{"type":"int","name":"GIT_DIFF_LINE_DEL_EOFNL","comments":"

Old has LF at end, new does not

\n","value":60},{"type":"int","name":"GIT_DIFF_LINE_FILE_HDR","comments":"","value":70},{"type":"int","name":"GIT_DIFF_LINE_HUNK_HDR","comments":"","value":72},{"type":"int","name":"GIT_DIFF_LINE_BINARY","comments":"

For "Binary files x and y differ"

\n","value":66}],"used":{"returns":[],"needs":[]}}],["git_diff_option_t",{"decl":["GIT_DIFF_NORMAL","GIT_DIFF_REVERSE","GIT_DIFF_INCLUDE_IGNORED","GIT_DIFF_RECURSE_IGNORED_DIRS","GIT_DIFF_INCLUDE_UNTRACKED","GIT_DIFF_RECURSE_UNTRACKED_DIRS","GIT_DIFF_INCLUDE_UNMODIFIED","GIT_DIFF_INCLUDE_TYPECHANGE","GIT_DIFF_INCLUDE_TYPECHANGE_TREES","GIT_DIFF_IGNORE_FILEMODE","GIT_DIFF_IGNORE_SUBMODULES","GIT_DIFF_IGNORE_CASE","GIT_DIFF_INCLUDE_CASECHANGE","GIT_DIFF_DISABLE_PATHSPEC_MATCH","GIT_DIFF_SKIP_BINARY_CHECK","GIT_DIFF_ENABLE_FAST_UNTRACKED_DIRS","GIT_DIFF_UPDATE_INDEX","GIT_DIFF_INCLUDE_UNREADABLE","GIT_DIFF_INCLUDE_UNREADABLE_AS_UNTRACKED","GIT_DIFF_FORCE_TEXT","GIT_DIFF_FORCE_BINARY","GIT_DIFF_IGNORE_WHITESPACE","GIT_DIFF_IGNORE_WHITESPACE_CHANGE","GIT_DIFF_IGNORE_WHITESPACE_EOL","GIT_DIFF_SHOW_UNTRACKED_CONTENT","GIT_DIFF_SHOW_UNMODIFIED","GIT_DIFF_PATIENCE","GIT_DIFF_MINIMAL","GIT_DIFF_SHOW_BINARY"],"type":"enum","file":"diff.h","line":72,"lineto":205,"block":"GIT_DIFF_NORMAL\nGIT_DIFF_REVERSE\nGIT_DIFF_INCLUDE_IGNORED\nGIT_DIFF_RECURSE_IGNORED_DIRS\nGIT_DIFF_INCLUDE_UNTRACKED\nGIT_DIFF_RECURSE_UNTRACKED_DIRS\nGIT_DIFF_INCLUDE_UNMODIFIED\nGIT_DIFF_INCLUDE_TYPECHANGE\nGIT_DIFF_INCLUDE_TYPECHANGE_TREES\nGIT_DIFF_IGNORE_FILEMODE\nGIT_DIFF_IGNORE_SUBMODULES\nGIT_DIFF_IGNORE_CASE\nGIT_DIFF_INCLUDE_CASECHANGE\nGIT_DIFF_DISABLE_PATHSPEC_MATCH\nGIT_DIFF_SKIP_BINARY_CHECK\nGIT_DIFF_ENABLE_FAST_UNTRACKED_DIRS\nGIT_DIFF_UPDATE_INDEX\nGIT_DIFF_INCLUDE_UNREADABLE\nGIT_DIFF_INCLUDE_UNREADABLE_AS_UNTRACKED\nGIT_DIFF_FORCE_TEXT\nGIT_DIFF_FORCE_BINARY\nGIT_DIFF_IGNORE_WHITESPACE\nGIT_DIFF_IGNORE_WHITESPACE_CHANGE\nGIT_DIFF_IGNORE_WHITESPACE_EOL\nGIT_DIFF_SHOW_UNTRACKED_CONTENT\nGIT_DIFF_SHOW_UNMODIFIED\nGIT_DIFF_PATIENCE\nGIT_DIFF_MINIMAL\nGIT_DIFF_SHOW_BINARY","tdef":"typedef","description":" Flags for diff options. A combination of these flags can be passed\n in via the `flags` value in the `git_diff_options`.","comments":"","fields":[{"type":"int","name":"GIT_DIFF_NORMAL","comments":"

Normal diff, the default

\n","value":0},{"type":"int","name":"GIT_DIFF_REVERSE","comments":"

Reverse the sides of the diff

\n","value":1},{"type":"int","name":"GIT_DIFF_INCLUDE_IGNORED","comments":"

Include ignored files in the diff

\n","value":2},{"type":"int","name":"GIT_DIFF_RECURSE_IGNORED_DIRS","comments":"

Even with GIT_DIFF_INCLUDE_IGNORED, an entire ignored directory\n will be marked with only a single entry in the diff; this flag\n adds all files under the directory as IGNORED entries, too.

\n","value":4},{"type":"int","name":"GIT_DIFF_INCLUDE_UNTRACKED","comments":"

Include untracked files in the diff

\n","value":8},{"type":"int","name":"GIT_DIFF_RECURSE_UNTRACKED_DIRS","comments":"

Even with GIT_DIFF_INCLUDE_UNTRACKED, an entire untracked\n directory will be marked with only a single entry in the diff\n (a la what core Git does in git status); this flag adds all\n files under untracked directories as UNTRACKED entries, too.

\n","value":16},{"type":"int","name":"GIT_DIFF_INCLUDE_UNMODIFIED","comments":"

Include unmodified files in the diff

\n","value":32},{"type":"int","name":"GIT_DIFF_INCLUDE_TYPECHANGE","comments":"

Normally, a type change between files will be converted into a\n DELETED record for the old and an ADDED record for the new; this\n options enabled the generation of TYPECHANGE delta records.

\n","value":64},{"type":"int","name":"GIT_DIFF_INCLUDE_TYPECHANGE_TREES","comments":"

Even with GIT_DIFF_INCLUDE_TYPECHANGE, blob->tree changes still\n generally show as a DELETED blob. This flag tries to correctly\n label blob->tree transitions as TYPECHANGE records with new_file's\n mode set to tree. Note: the tree SHA will not be available.

\n","value":128},{"type":"int","name":"GIT_DIFF_IGNORE_FILEMODE","comments":"

Ignore file mode changes

\n","value":256},{"type":"int","name":"GIT_DIFF_IGNORE_SUBMODULES","comments":"

Treat all submodules as unmodified

\n","value":512},{"type":"int","name":"GIT_DIFF_IGNORE_CASE","comments":"

Use case insensitive filename comparisons

\n","value":1024},{"type":"int","name":"GIT_DIFF_INCLUDE_CASECHANGE","comments":"

May be combined with GIT_DIFF_IGNORE_CASE to specify that a file\n that has changed case will be returned as an add/delete pair.

\n","value":2048},{"type":"int","name":"GIT_DIFF_DISABLE_PATHSPEC_MATCH","comments":"

If the pathspec is set in the diff options, this flags means to\n apply it as an exact match instead of as an fnmatch pattern.

\n","value":4096},{"type":"int","name":"GIT_DIFF_SKIP_BINARY_CHECK","comments":"

Disable updating of the binary flag in delta records. This is\n useful when iterating over a diff if you don't need hunk and data\n callbacks and want to avoid having to load file completely.

\n","value":8192},{"type":"int","name":"GIT_DIFF_ENABLE_FAST_UNTRACKED_DIRS","comments":"

When diff finds an untracked directory, to match the behavior of\n core Git, it scans the contents for IGNORED and UNTRACKED files.\n If all contents are IGNORED, then the directory is IGNORED; if\n any contents are not IGNORED, then the directory is UNTRACKED.\n This is extra work that may not matter in many cases. This flag\n turns off that scan and immediately labels an untracked directory\n as UNTRACKED (changing the behavior to not match core Git).

\n","value":16384},{"type":"int","name":"GIT_DIFF_UPDATE_INDEX","comments":"

When diff finds a file in the working directory with stat\n information different from the index, but the OID ends up being the\n same, write the correct stat information into the index. Note:\n without this flag, diff will always leave the index untouched.

\n","value":32768},{"type":"int","name":"GIT_DIFF_INCLUDE_UNREADABLE","comments":"

Include unreadable files in the diff

\n","value":65536},{"type":"int","name":"GIT_DIFF_INCLUDE_UNREADABLE_AS_UNTRACKED","comments":"

Include unreadable files in the diff

\n","value":131072},{"type":"int","name":"GIT_DIFF_FORCE_TEXT","comments":"

Treat all files as text, disabling binary attributes \n&\n detection

\n","value":1048576},{"type":"int","name":"GIT_DIFF_FORCE_BINARY","comments":"

Treat all files as binary, disabling text diffs

\n","value":2097152},{"type":"int","name":"GIT_DIFF_IGNORE_WHITESPACE","comments":"

Ignore all whitespace

\n","value":4194304},{"type":"int","name":"GIT_DIFF_IGNORE_WHITESPACE_CHANGE","comments":"

Ignore changes in amount of whitespace

\n","value":8388608},{"type":"int","name":"GIT_DIFF_IGNORE_WHITESPACE_EOL","comments":"

Ignore whitespace at end of line

\n","value":16777216},{"type":"int","name":"GIT_DIFF_SHOW_UNTRACKED_CONTENT","comments":"

When generating patch text, include the content of untracked\n files. This automatically turns on GIT_DIFF_INCLUDE_UNTRACKED but\n it does not turn on GIT_DIFF_RECURSE_UNTRACKED_DIRS. Add that\n flag if you want the content of every single UNTRACKED file.

\n","value":33554432},{"type":"int","name":"GIT_DIFF_SHOW_UNMODIFIED","comments":"

When generating output, include the names of unmodified files if\n they are included in the git_diff. Normally these are skipped in\n the formats that list files (e.g. name-only, name-status, raw).\n Even with this, these will not be included in patch format.

\n","value":67108864},{"type":"int","name":"GIT_DIFF_PATIENCE","comments":"

Use the "patience diff" algorithm

\n","value":268435456},{"type":"int","name":"GIT_DIFF_MINIMAL","comments":"

Take extra time to find minimal diff

\n","value":536870912},{"type":"int","name":"GIT_DIFF_SHOW_BINARY","comments":"

Include the necessary deflate / delta information so that git-apply\n can apply given diff information to binary files.

\n","value":1073741824}],"used":{"returns":[],"needs":[]}}],["git_diff_options",{"decl":["unsigned int version","uint32_t flags","git_submodule_ignore_t ignore_submodules","git_strarray pathspec","git_diff_notify_cb notify_cb","void * notify_payload","uint32_t context_lines","uint32_t interhunk_lines","uint16_t id_abbrev","git_off_t max_size","const char * old_prefix","const char * new_prefix"],"type":"struct","value":"git_diff_options","file":"diff.h","line":374,"lineto":393,"block":"unsigned int version\nuint32_t flags\ngit_submodule_ignore_t ignore_submodules\ngit_strarray pathspec\ngit_diff_notify_cb notify_cb\nvoid * notify_payload\nuint32_t context_lines\nuint32_t interhunk_lines\nuint16_t id_abbrev\ngit_off_t max_size\nconst char * old_prefix\nconst char * new_prefix","tdef":"typedef","description":" Structure describing options about how the diff should be executed.","comments":"

Setting all values of the structure to zero will yield the default\n values. Similarly, passing NULL for the options structure will\n give the defaults. The default values are marked below.

\n\n
    \n
  • flags is a combination of the git_diff_option_t values above
    • \n
  • context_lines is the number of unchanged lines that define the\nboundary of a hunk (and to display before and after)
    • \n
  • interhunk_lines is the maximum number of unchanged lines between\nhunk boundaries before the hunks will be merged into a one.
    • \n
  • old_prefix is the virtual "directory" to prefix to old file names\nin hunk headers (default "a")
    • \n
  • new_prefix is the virtual "directory" to prefix to new file names\nin hunk headers (default "b")
    • \n
  • pathspec is an array of paths / fnmatch patterns to constrain diff
    • \n
  • max_size is a file size (in bytes) above which a blob will be marked\nas binary automatically; pass a negative value to disable.
    • \n
  • notify_cb is an optional callback function, notifying the consumer of\nwhich files are being examined as the diff is generated
    • \n
  • notify_payload is the payload data to pass to the notify_cb function
    • \n
  • ignore_submodules overrides the submodule ignore setting for all\nsubmodules in the diff.
    • \n
\n","fields":[{"type":"unsigned int","name":"version","comments":" version for the struct "},{"type":"uint32_t","name":"flags","comments":" defaults to GIT_DIFF_NORMAL "},{"type":"git_submodule_ignore_t","name":"ignore_submodules","comments":" submodule ignore rule "},{"type":"git_strarray","name":"pathspec","comments":" defaults to include all paths "},{"type":"git_diff_notify_cb","name":"notify_cb","comments":""},{"type":"void *","name":"notify_payload","comments":""},{"type":"uint32_t","name":"context_lines","comments":" defaults to 3 "},{"type":"uint32_t","name":"interhunk_lines","comments":" defaults to 0 "},{"type":"uint16_t","name":"id_abbrev","comments":" default 'core.abbrev' or 7 if unset "},{"type":"git_off_t","name":"max_size","comments":" defaults to 512MB "},{"type":"const char *","name":"old_prefix","comments":" defaults to \"a\" "},{"type":"const char *","name":"new_prefix","comments":" defaults to \"b\" "}],"used":{"returns":[],"needs":["git_diff_blob_to_buffer","git_diff_blobs","git_diff_buffers","git_diff_commit_as_email","git_diff_index_to_workdir","git_diff_init_options","git_diff_tree_to_index","git_diff_tree_to_tree","git_diff_tree_to_workdir","git_diff_tree_to_workdir_with_index","git_patch_from_blob_and_buffer","git_patch_from_blobs","git_patch_from_buffers"]}}],["git_diff_perfdata",{"decl":["unsigned int version","size_t stat_calls","size_t oid_calculations"],"type":"struct","value":"git_diff_perfdata","file":"sys/diff.h","line":67,"lineto":71,"block":"unsigned int version\nsize_t stat_calls\nsize_t oid_calculations","tdef":"typedef","description":" Performance data from diffing","comments":"","fields":[{"type":"unsigned int","name":"version","comments":""},{"type":"size_t","name":"stat_calls","comments":" Number of stat() calls performed "},{"type":"size_t","name":"oid_calculations","comments":" Number of ID calculations "}],"used":{"returns":[],"needs":["git_diff_get_perfdata","git_status_list_get_perfdata"]}}],["git_diff_similarity_metric",{"decl":["int (*)(void **, const git_diff_file *, const char *, void *) file_signature","int (*)(void **, const git_diff_file *, const char *, size_t, void *) buffer_signature","void (*)(void *, void *) free_signature","int (*)(int *, void *, void *, void *) similarity","void * payload"],"type":"struct","value":"git_diff_similarity_metric","file":"diff.h","line":626,"lineto":636,"block":"int (*)(void **, const git_diff_file *, const char *, void *) file_signature\nint (*)(void **, const git_diff_file *, const char *, size_t, void *) buffer_signature\nvoid (*)(void *, void *) free_signature\nint (*)(int *, void *, void *, void *) similarity\nvoid * payload","tdef":"typedef","description":" Pluggable similarity metric","comments":"","fields":[{"type":"int (*)(void **, const git_diff_file *, const char *, void *)","name":"file_signature","comments":""},{"type":"int (*)(void **, const git_diff_file *, const char *, size_t, void *)","name":"buffer_signature","comments":""},{"type":"void (*)(void *, void *)","name":"free_signature","comments":""},{"type":"int (*)(int *, void *, void *, void *)","name":"similarity","comments":""},{"type":"void *","name":"payload","comments":""}],"used":{"returns":[],"needs":[]}}],["git_diff_stats",{"decl":"git_diff_stats","type":"struct","value":"git_diff_stats","file":"diff.h","line":1132,"lineto":1132,"tdef":"typedef","description":" This is an opaque structure which is allocated by `git_diff_get_stats`.\n You are responsible for releasing the object memory when done, using the\n `git_diff_stats_free()` function.","comments":"","used":{"returns":[],"needs":["git_diff_get_stats","git_diff_stats_deletions","git_diff_stats_files_changed","git_diff_stats_free","git_diff_stats_insertions","git_diff_stats_to_buf"]}}],["git_diff_stats_format_t",{"decl":["GIT_DIFF_STATS_NONE","GIT_DIFF_STATS_FULL","GIT_DIFF_STATS_SHORT","GIT_DIFF_STATS_NUMBER","GIT_DIFF_STATS_INCLUDE_SUMMARY"],"type":"enum","file":"diff.h","line":1137,"lineto":1152,"block":"GIT_DIFF_STATS_NONE\nGIT_DIFF_STATS_FULL\nGIT_DIFF_STATS_SHORT\nGIT_DIFF_STATS_NUMBER\nGIT_DIFF_STATS_INCLUDE_SUMMARY","tdef":"typedef","description":" Formatting options for diff stats","comments":"","fields":[{"type":"int","name":"GIT_DIFF_STATS_NONE","comments":"

No stats

\n","value":0},{"type":"int","name":"GIT_DIFF_STATS_FULL","comments":"

Full statistics, equivalent of --stat

\n","value":1},{"type":"int","name":"GIT_DIFF_STATS_SHORT","comments":"

Short statistics, equivalent of --shortstat

\n","value":2},{"type":"int","name":"GIT_DIFF_STATS_NUMBER","comments":"

Number statistics, equivalent of --numstat

\n","value":4},{"type":"int","name":"GIT_DIFF_STATS_INCLUDE_SUMMARY","comments":"

Extended header information such as creations, renames and mode changes, equivalent of --summary

\n","value":8}],"used":{"returns":[],"needs":["git_diff_stats_to_buf"]}}],["git_direction",{"decl":["GIT_DIRECTION_FETCH","GIT_DIRECTION_PUSH"],"type":"enum","file":"net.h","line":31,"lineto":34,"block":"GIT_DIRECTION_FETCH\nGIT_DIRECTION_PUSH","tdef":"typedef","description":" Direction of the connection.","comments":"

We need this because we need to know whether we should call\n git-upload-pack or git-receive-pack on the remote end when get_refs\n gets called.

\n","fields":[{"type":"int","name":"GIT_DIRECTION_FETCH","comments":"","value":0},{"type":"int","name":"GIT_DIRECTION_PUSH","comments":"","value":1}],"used":{"returns":[],"needs":["git_remote_connect"]}}],["git_error",{"decl":["char * message","int klass"],"type":"struct","value":"git_error","file":"errors.h","line":63,"lineto":66,"block":"char * message\nint klass","tdef":"typedef","description":" Structure to store extra details of the last error that occurred.","comments":"

This is kept on a per-thread basis if GIT_THREADS was defined when the\n library was build, otherwise one is kept globally for the library

\n","fields":[{"type":"char *","name":"message","comments":""},{"type":"int","name":"klass","comments":""}],"used":{"returns":["giterr_last"],"needs":["giterr_detach"]}}],["git_error_code",{"decl":["GIT_OK","GIT_ERROR","GIT_ENOTFOUND","GIT_EEXISTS","GIT_EAMBIGUOUS","GIT_EBUFS","GIT_EUSER","GIT_EBAREREPO","GIT_EUNBORNBRANCH","GIT_EUNMERGED","GIT_ENONFASTFORWARD","GIT_EINVALIDSPEC","GIT_ECONFLICT","GIT_ELOCKED","GIT_EMODIFIED","GIT_EAUTH","GIT_ECERTIFICATE","GIT_EAPPLIED","GIT_EPEEL","GIT_EEOF","GIT_EINVALID","GIT_EUNCOMMITTED","GIT_EDIRECTORY","GIT_PASSTHROUGH","GIT_ITEROVER"],"type":"enum","file":"errors.h","line":21,"lineto":55,"block":"GIT_OK\nGIT_ERROR\nGIT_ENOTFOUND\nGIT_EEXISTS\nGIT_EAMBIGUOUS\nGIT_EBUFS\nGIT_EUSER\nGIT_EBAREREPO\nGIT_EUNBORNBRANCH\nGIT_EUNMERGED\nGIT_ENONFASTFORWARD\nGIT_EINVALIDSPEC\nGIT_ECONFLICT\nGIT_ELOCKED\nGIT_EMODIFIED\nGIT_EAUTH\nGIT_ECERTIFICATE\nGIT_EAPPLIED\nGIT_EPEEL\nGIT_EEOF\nGIT_EINVALID\nGIT_EUNCOMMITTED\nGIT_EDIRECTORY\nGIT_PASSTHROUGH\nGIT_ITEROVER","tdef":"typedef","description":" Generic return codes ","comments":"","fields":[{"type":"int","name":"GIT_OK","comments":"

No error

\n","value":0},{"type":"int","name":"GIT_ERROR","comments":"

Generic error

\n","value":-1},{"type":"int","name":"GIT_ENOTFOUND","comments":"

Requested object could not be found

\n","value":-3},{"type":"int","name":"GIT_EEXISTS","comments":"

Object exists preventing operation

\n","value":-4},{"type":"int","name":"GIT_EAMBIGUOUS","comments":"

More than one object matches

\n","value":-5},{"type":"int","name":"GIT_EBUFS","comments":"

Output buffer too short to hold data

\n","value":-6},{"type":"int","name":"GIT_EUSER","comments":"","value":-7},{"type":"int","name":"GIT_EBAREREPO","comments":"

Operation not allowed on bare repository

\n","value":-8},{"type":"int","name":"GIT_EUNBORNBRANCH","comments":"

HEAD refers to branch with no commits

\n","value":-9},{"type":"int","name":"GIT_EUNMERGED","comments":"

Merge in progress prevented operation

\n","value":-10},{"type":"int","name":"GIT_ENONFASTFORWARD","comments":"

Reference was not fast-forwardable

\n","value":-11},{"type":"int","name":"GIT_EINVALIDSPEC","comments":"

Name/ref spec was not in a valid format

\n","value":-12},{"type":"int","name":"GIT_ECONFLICT","comments":"

Checkout conflicts prevented operation

\n","value":-13},{"type":"int","name":"GIT_ELOCKED","comments":"

Lock file prevented operation

\n","value":-14},{"type":"int","name":"GIT_EMODIFIED","comments":"

Reference value does not match expected

\n","value":-15},{"type":"int","name":"GIT_EAUTH","comments":"

Authentication error

\n","value":-16},{"type":"int","name":"GIT_ECERTIFICATE","comments":"

Server certificate is invalid

\n","value":-17},{"type":"int","name":"GIT_EAPPLIED","comments":"

Patch/merge has already been applied

\n","value":-18},{"type":"int","name":"GIT_EPEEL","comments":"

The requested peel operation is not possible

\n","value":-19},{"type":"int","name":"GIT_EEOF","comments":"

Unexpected EOF

\n","value":-20},{"type":"int","name":"GIT_EINVALID","comments":"

Invalid operation or input

\n","value":-21},{"type":"int","name":"GIT_EUNCOMMITTED","comments":"

Uncommitted changes in index prevented operation

\n","value":-22},{"type":"int","name":"GIT_EDIRECTORY","comments":"

The operation is not valid for a directory

\n","value":-23},{"type":"int","name":"GIT_PASSTHROUGH","comments":"

Internal only

\n","value":-30},{"type":"int","name":"GIT_ITEROVER","comments":"

Signals end of iteration with iterator

\n","value":-31}],"used":{"returns":[],"needs":[]}}],["git_error_t",{"decl":["GITERR_NONE","GITERR_NOMEMORY","GITERR_OS","GITERR_INVALID","GITERR_REFERENCE","GITERR_ZLIB","GITERR_REPOSITORY","GITERR_CONFIG","GITERR_REGEX","GITERR_ODB","GITERR_INDEX","GITERR_OBJECT","GITERR_NET","GITERR_TAG","GITERR_TREE","GITERR_INDEXER","GITERR_SSL","GITERR_SUBMODULE","GITERR_THREAD","GITERR_STASH","GITERR_CHECKOUT","GITERR_FETCHHEAD","GITERR_MERGE","GITERR_SSH","GITERR_FILTER","GITERR_REVERT","GITERR_CALLBACK","GITERR_CHERRYPICK","GITERR_DESCRIBE","GITERR_REBASE","GITERR_FILESYSTEM"],"type":"enum","file":"errors.h","line":69,"lineto":101,"block":"GITERR_NONE\nGITERR_NOMEMORY\nGITERR_OS\nGITERR_INVALID\nGITERR_REFERENCE\nGITERR_ZLIB\nGITERR_REPOSITORY\nGITERR_CONFIG\nGITERR_REGEX\nGITERR_ODB\nGITERR_INDEX\nGITERR_OBJECT\nGITERR_NET\nGITERR_TAG\nGITERR_TREE\nGITERR_INDEXER\nGITERR_SSL\nGITERR_SUBMODULE\nGITERR_THREAD\nGITERR_STASH\nGITERR_CHECKOUT\nGITERR_FETCHHEAD\nGITERR_MERGE\nGITERR_SSH\nGITERR_FILTER\nGITERR_REVERT\nGITERR_CALLBACK\nGITERR_CHERRYPICK\nGITERR_DESCRIBE\nGITERR_REBASE\nGITERR_FILESYSTEM","tdef":"typedef","description":" Error classes ","comments":"","fields":[{"type":"int","name":"GITERR_NONE","comments":"","value":0},{"type":"int","name":"GITERR_NOMEMORY","comments":"","value":1},{"type":"int","name":"GITERR_OS","comments":"","value":2},{"type":"int","name":"GITERR_INVALID","comments":"","value":3},{"type":"int","name":"GITERR_REFERENCE","comments":"","value":4},{"type":"int","name":"GITERR_ZLIB","comments":"","value":5},{"type":"int","name":"GITERR_REPOSITORY","comments":"","value":6},{"type":"int","name":"GITERR_CONFIG","comments":"","value":7},{"type":"int","name":"GITERR_REGEX","comments":"","value":8},{"type":"int","name":"GITERR_ODB","comments":"","value":9},{"type":"int","name":"GITERR_INDEX","comments":"","value":10},{"type":"int","name":"GITERR_OBJECT","comments":"","value":11},{"type":"int","name":"GITERR_NET","comments":"","value":12},{"type":"int","name":"GITERR_TAG","comments":"","value":13},{"type":"int","name":"GITERR_TREE","comments":"","value":14},{"type":"int","name":"GITERR_INDEXER","comments":"","value":15},{"type":"int","name":"GITERR_SSL","comments":"","value":16},{"type":"int","name":"GITERR_SUBMODULE","comments":"","value":17},{"type":"int","name":"GITERR_THREAD","comments":"","value":18},{"type":"int","name":"GITERR_STASH","comments":"","value":19},{"type":"int","name":"GITERR_CHECKOUT","comments":"","value":20},{"type":"int","name":"GITERR_FETCHHEAD","comments":"","value":21},{"type":"int","name":"GITERR_MERGE","comments":"","value":22},{"type":"int","name":"GITERR_SSH","comments":"","value":23},{"type":"int","name":"GITERR_FILTER","comments":"","value":24},{"type":"int","name":"GITERR_REVERT","comments":"","value":25},{"type":"int","name":"GITERR_CALLBACK","comments":"","value":26},{"type":"int","name":"GITERR_CHERRYPICK","comments":"","value":27},{"type":"int","name":"GITERR_DESCRIBE","comments":"","value":28},{"type":"int","name":"GITERR_REBASE","comments":"","value":29},{"type":"int","name":"GITERR_FILESYSTEM","comments":"","value":30}],"used":{"returns":[],"needs":[]}}],["git_feature_t",{"decl":["GIT_FEATURE_THREADS","GIT_FEATURE_HTTPS","GIT_FEATURE_SSH"],"type":"enum","file":"common.h","line":100,"lineto":104,"block":"GIT_FEATURE_THREADS\nGIT_FEATURE_HTTPS\nGIT_FEATURE_SSH","tdef":"typedef","description":" Combinations of these values describe the features with which libgit2\n was compiled","comments":"","fields":[{"type":"int","name":"GIT_FEATURE_THREADS","comments":"","value":1},{"type":"int","name":"GIT_FEATURE_HTTPS","comments":"","value":2},{"type":"int","name":"GIT_FEATURE_SSH","comments":"","value":4}],"used":{"returns":[],"needs":[]}}],["git_fetch_options",{"decl":["int version","git_remote_callbacks callbacks","git_fetch_prune_t prune","int update_fetchhead","git_remote_autotag_option_t download_tags"],"type":"struct","value":"git_fetch_options","file":"remote.h","line":522,"lineto":549,"block":"int version\ngit_remote_callbacks callbacks\ngit_fetch_prune_t prune\nint update_fetchhead\ngit_remote_autotag_option_t download_tags","tdef":"typedef","description":" Fetch options structure.","comments":"

Zero out for defaults. Initialize with GIT_FETCH_OPTIONS_INIT macro to\n correctly set the version field. E.g.

\n\n
    git_fetch_options opts = GIT_FETCH_OPTIONS_INIT;\n
\n","fields":[{"type":"int","name":"version","comments":""},{"type":"git_remote_callbacks","name":"callbacks","comments":" Callbacks to use for this fetch operation"},{"type":"git_fetch_prune_t","name":"prune","comments":" Whether to perform a prune after the fetch"},{"type":"int","name":"update_fetchhead","comments":" Whether to write the results to FETCH_HEAD. Defaults to\n on. Leave this default in order to behave like git."},{"type":"git_remote_autotag_option_t","name":"download_tags","comments":" Determines how to behave regarding tags on the remote, such\n as auto-downloading tags for objects we're downloading or\n downloading all of them.\n\n The default is to auto-follow tags."}],"used":{"returns":[],"needs":["git_fetch_init_options","git_remote_download","git_remote_fetch"]}}],["git_filemode_t",{"decl":["GIT_FILEMODE_UNREADABLE","GIT_FILEMODE_TREE","GIT_FILEMODE_BLOB","GIT_FILEMODE_BLOB_EXECUTABLE","GIT_FILEMODE_LINK","GIT_FILEMODE_COMMIT"],"type":"enum","file":"types.h","line":205,"lineto":212,"block":"GIT_FILEMODE_UNREADABLE\nGIT_FILEMODE_TREE\nGIT_FILEMODE_BLOB\nGIT_FILEMODE_BLOB_EXECUTABLE\nGIT_FILEMODE_LINK\nGIT_FILEMODE_COMMIT","tdef":"typedef","description":" Valid modes for index and tree entries. ","comments":"","fields":[{"type":"int","name":"GIT_FILEMODE_UNREADABLE","comments":"","value":0},{"type":"int","name":"GIT_FILEMODE_TREE","comments":"","value":16384},{"type":"int","name":"GIT_FILEMODE_BLOB","comments":"","value":33188},{"type":"int","name":"GIT_FILEMODE_BLOB_EXECUTABLE","comments":"","value":33261},{"type":"int","name":"GIT_FILEMODE_LINK","comments":"","value":40960},{"type":"int","name":"GIT_FILEMODE_COMMIT","comments":"","value":57344}],"used":{"returns":[],"needs":["git_treebuilder_insert"]}}],["git_filter",{"decl":["unsigned int version","const char * attributes","git_filter_init_fn initialize","git_filter_shutdown_fn shutdown","git_filter_check_fn check","git_filter_apply_fn apply","git_filter_stream_fn stream","git_filter_cleanup_fn cleanup"],"type":"struct","value":"git_filter","file":"sys/filter.h","line":248,"lineto":259,"tdef":null,"description":" Filter structure used to register custom filters.","comments":"

To associate extra data with a filter, allocate extra data and put the\n git_filter struct at the start of your data buffer, then cast the\n self pointer to your larger structure when your callback is invoked.

\n\n

version should be set to GIT_FILTER_VERSION

\n\n

attributes is a whitespace-separated list of attribute names to check\n for this filter (e.g. "eol crlf text"). If the attribute name is bare,\n it will be simply loaded and passed to the check callback. If it has\n a value (i.e. "name=value"), the attribute must match that value for\n the filter to be applied.

\n\n

The initialize, shutdown, check, apply, and cleanup callbacks\n are all documented above with the respective function pointer typedefs.

\n","block":"unsigned int version\nconst char * attributes\ngit_filter_init_fn initialize\ngit_filter_shutdown_fn shutdown\ngit_filter_check_fn check\ngit_filter_apply_fn apply\ngit_filter_stream_fn stream\ngit_filter_cleanup_fn cleanup","fields":[{"type":"unsigned int","name":"version","comments":""},{"type":"const char *","name":"attributes","comments":""},{"type":"git_filter_init_fn","name":"initialize","comments":""},{"type":"git_filter_shutdown_fn","name":"shutdown","comments":""},{"type":"git_filter_check_fn","name":"check","comments":""},{"type":"git_filter_apply_fn","name":"apply","comments":""},{"type":"git_filter_stream_fn","name":"stream","comments":""},{"type":"git_filter_cleanup_fn","name":"cleanup","comments":""}],"used":{"returns":["git_filter_lookup"],"needs":["git_filter_list_push","git_filter_register"]}}],["git_filter_flag_t",{"decl":["GIT_FILTER_DEFAULT","GIT_FILTER_ALLOW_UNSAFE"],"type":"enum","file":"filter.h","line":41,"lineto":44,"block":"GIT_FILTER_DEFAULT\nGIT_FILTER_ALLOW_UNSAFE","tdef":"typedef","description":" Filter option flags.","comments":"","fields":[{"type":"int","name":"GIT_FILTER_DEFAULT","comments":"","value":0},{"type":"int","name":"GIT_FILTER_ALLOW_UNSAFE","comments":"","value":1}],"used":{"returns":[],"needs":[]}}],["git_filter_list",{"decl":"git_filter_list","type":"struct","value":"git_filter_list","file":"filter.h","line":73,"lineto":73,"tdef":"typedef","description":" List of filters to be applied","comments":"

This represents a list of filters to be applied to a file / blob. You\n can build the list with one call, apply it with another, and dispose it\n with a third. In typical usage, there are not many occasions where a\n git_filter_list is needed directly since the library will generally\n handle conversions for you, but it can be convenient to be able to\n build and apply the list sometimes.

\n","used":{"returns":[],"needs":["git_filter_list_apply_to_blob","git_filter_list_apply_to_data","git_filter_list_apply_to_file","git_filter_list_contains","git_filter_list_free","git_filter_list_length","git_filter_list_load","git_filter_list_new","git_filter_list_push","git_filter_list_stream_blob","git_filter_list_stream_data","git_filter_list_stream_file"]}}],["git_filter_mode_t",{"decl":["GIT_FILTER_TO_WORKTREE","GIT_FILTER_SMUDGE","GIT_FILTER_TO_ODB","GIT_FILTER_CLEAN"],"type":"enum","file":"filter.h","line":31,"lineto":36,"block":"GIT_FILTER_TO_WORKTREE\nGIT_FILTER_SMUDGE\nGIT_FILTER_TO_ODB\nGIT_FILTER_CLEAN","tdef":"typedef","description":" Filters are applied in one of two directions: smudging - which is\n exporting a file from the Git object database to the working directory,\n and cleaning - which is importing a file from the working directory to\n the Git object database. These values control which direction of\n change is being applied.","comments":"","fields":[{"type":"int","name":"GIT_FILTER_TO_WORKTREE","comments":"","value":0},{"type":"int","name":"GIT_FILTER_SMUDGE","comments":"","value":0},{"type":"int","name":"GIT_FILTER_TO_ODB","comments":"","value":1},{"type":"int","name":"GIT_FILTER_CLEAN","comments":"","value":1}],"used":{"returns":[],"needs":["git_filter_list_load","git_filter_list_new"]}}],["git_filter_source",{"decl":"git_filter_source","type":"struct","value":"git_filter_source","file":"sys/filter.h","line":95,"lineto":95,"tdef":"typedef","description":" A filter source represents a file/blob to be processed","comments":"","used":{"returns":[],"needs":["git_filter_source_filemode","git_filter_source_flags","git_filter_source_id","git_filter_source_mode","git_filter_source_path","git_filter_source_repo"]}}],["git_hashsig",{"decl":"git_hashsig","type":"struct","value":"git_hashsig","file":"sys/hashsig.h","line":17,"lineto":17,"tdef":"typedef","description":" Similarity signature of arbitrary text content based on line hashes","comments":"","used":{"returns":[],"needs":["git_hashsig_compare","git_hashsig_create","git_hashsig_create_fromfile","git_hashsig_free"]}}],["git_hashsig_option_t",{"decl":["GIT_HASHSIG_NORMAL","GIT_HASHSIG_IGNORE_WHITESPACE","GIT_HASHSIG_SMART_WHITESPACE","GIT_HASHSIG_ALLOW_SMALL_FILES"],"type":"enum","file":"sys/hashsig.h","line":25,"lineto":45,"block":"GIT_HASHSIG_NORMAL\nGIT_HASHSIG_IGNORE_WHITESPACE\nGIT_HASHSIG_SMART_WHITESPACE\nGIT_HASHSIG_ALLOW_SMALL_FILES","tdef":"typedef","description":" Options for hashsig computation","comments":"

The options GIT_HASHSIG_NORMAL, GIT_HASHSIG_IGNORE_WHITESPACE,\n GIT_HASHSIG_SMART_WHITESPACE are exclusive and should not be combined.

\n","fields":[{"type":"int","name":"GIT_HASHSIG_NORMAL","comments":"

Use all data

\n","value":0},{"type":"int","name":"GIT_HASHSIG_IGNORE_WHITESPACE","comments":"

Ignore whitespace

\n","value":1},{"type":"int","name":"GIT_HASHSIG_SMART_WHITESPACE","comments":"

Ignore

\n\n

and all space after

\n","value":2},{"type":"int","name":"GIT_HASHSIG_ALLOW_SMALL_FILES","comments":"

Allow hashing of small files

\n","value":4}],"used":{"returns":[],"needs":["git_hashsig_create","git_hashsig_create_fromfile"]}}],["git_idxentry_extended_flag_t",{"decl":["GIT_IDXENTRY_INTENT_TO_ADD","GIT_IDXENTRY_SKIP_WORKTREE","GIT_IDXENTRY_EXTENDED2","GIT_IDXENTRY_EXTENDED_FLAGS","GIT_IDXENTRY_UPDATE","GIT_IDXENTRY_REMOVE","GIT_IDXENTRY_UPTODATE","GIT_IDXENTRY_ADDED","GIT_IDXENTRY_HASHED","GIT_IDXENTRY_UNHASHED","GIT_IDXENTRY_WT_REMOVE","GIT_IDXENTRY_CONFLICTED","GIT_IDXENTRY_UNPACKED","GIT_IDXENTRY_NEW_SKIP_WORKTREE"],"type":"enum","file":"index.h","line":115,"lineto":135,"block":"GIT_IDXENTRY_INTENT_TO_ADD\nGIT_IDXENTRY_SKIP_WORKTREE\nGIT_IDXENTRY_EXTENDED2\nGIT_IDXENTRY_EXTENDED_FLAGS\nGIT_IDXENTRY_UPDATE\nGIT_IDXENTRY_REMOVE\nGIT_IDXENTRY_UPTODATE\nGIT_IDXENTRY_ADDED\nGIT_IDXENTRY_HASHED\nGIT_IDXENTRY_UNHASHED\nGIT_IDXENTRY_WT_REMOVE\nGIT_IDXENTRY_CONFLICTED\nGIT_IDXENTRY_UNPACKED\nGIT_IDXENTRY_NEW_SKIP_WORKTREE","tdef":"typedef","description":" Bitmasks for on-disk fields of `git_index_entry`'s `flags_extended`","comments":"

In memory, the flags_extended fields are divided into two parts: the\n fields that are read from and written to disk, and other fields that\n in-memory only and used by libgit2. Only the flags in\n GIT_IDXENTRY_EXTENDED_FLAGS will get saved on-disk.

\n\n

Thee first three bitmasks match the three fields in the\n git_index_entry flags_extended value that belong on disk. You\n can use them to interpret the data in the flags_extended.

\n\n

The rest of the bitmasks match the other fields in the git_index_entry\n flags_extended value that are only used in-memory by libgit2.\n You can use them to interpret the data in the flags_extended.

\n","fields":[{"type":"int","name":"GIT_IDXENTRY_INTENT_TO_ADD","comments":"","value":8192},{"type":"int","name":"GIT_IDXENTRY_SKIP_WORKTREE","comments":"","value":16384},{"type":"int","name":"GIT_IDXENTRY_EXTENDED2","comments":"

Reserved for future extension

\n","value":32768},{"type":"int","name":"GIT_IDXENTRY_EXTENDED_FLAGS","comments":"

Reserved for future extension

\n","value":24576},{"type":"int","name":"GIT_IDXENTRY_UPDATE","comments":"

Reserved for future extension

\n","value":1},{"type":"int","name":"GIT_IDXENTRY_REMOVE","comments":"

Reserved for future extension

\n","value":2},{"type":"int","name":"GIT_IDXENTRY_UPTODATE","comments":"

Reserved for future extension

\n","value":4},{"type":"int","name":"GIT_IDXENTRY_ADDED","comments":"

Reserved for future extension

\n","value":8},{"type":"int","name":"GIT_IDXENTRY_HASHED","comments":"

Reserved for future extension

\n","value":16},{"type":"int","name":"GIT_IDXENTRY_UNHASHED","comments":"

Reserved for future extension

\n","value":32},{"type":"int","name":"GIT_IDXENTRY_WT_REMOVE","comments":"

remove in work directory

\n","value":64},{"type":"int","name":"GIT_IDXENTRY_CONFLICTED","comments":"","value":128},{"type":"int","name":"GIT_IDXENTRY_UNPACKED","comments":"","value":256},{"type":"int","name":"GIT_IDXENTRY_NEW_SKIP_WORKTREE","comments":"","value":512}],"used":{"returns":[],"needs":[]}}],["git_index",{"decl":"git_index","type":"struct","value":"git_index","file":"types.h","line":132,"lineto":132,"tdef":"typedef","description":" Memory representation of an index file. ","comments":"","used":{"returns":[],"needs":["git_checkout_index","git_cherrypick_commit","git_diff_index_to_workdir","git_diff_tree_to_index","git_index_add","git_index_add_all","git_index_add_bypath","git_index_add_frombuffer","git_index_caps","git_index_checksum","git_index_clear","git_index_conflict_add","git_index_conflict_cleanup","git_index_conflict_get","git_index_conflict_iterator_new","git_index_conflict_remove","git_index_entrycount","git_index_find","git_index_free","git_index_get_byindex","git_index_get_bypath","git_index_has_conflicts","git_index_new","git_index_open","git_index_owner","git_index_path","git_index_read","git_index_read_tree","git_index_remove","git_index_remove_all","git_index_remove_bypath","git_index_remove_directory","git_index_set_caps","git_index_update_all","git_index_write","git_index_write_tree","git_index_write_tree_to","git_merge_commits","git_merge_trees","git_pathspec_match_index","git_repository_index","git_repository_set_index","git_revert_commit"]}}],["git_index_add_option_t",{"decl":["GIT_INDEX_ADD_DEFAULT","GIT_INDEX_ADD_FORCE","GIT_INDEX_ADD_DISABLE_PATHSPEC_MATCH","GIT_INDEX_ADD_CHECK_PATHSPEC"],"type":"enum","file":"index.h","line":150,"lineto":155,"block":"GIT_INDEX_ADD_DEFAULT\nGIT_INDEX_ADD_FORCE\nGIT_INDEX_ADD_DISABLE_PATHSPEC_MATCH\nGIT_INDEX_ADD_CHECK_PATHSPEC","tdef":"typedef","description":" Flags for APIs that add files matching pathspec ","comments":"","fields":[{"type":"int","name":"GIT_INDEX_ADD_DEFAULT","comments":"","value":0},{"type":"int","name":"GIT_INDEX_ADD_FORCE","comments":"","value":1},{"type":"int","name":"GIT_INDEX_ADD_DISABLE_PATHSPEC_MATCH","comments":"","value":2},{"type":"int","name":"GIT_INDEX_ADD_CHECK_PATHSPEC","comments":"","value":4}],"used":{"returns":[],"needs":[]}}],["git_index_conflict_iterator",{"decl":"git_index_conflict_iterator","type":"struct","value":"git_index_conflict_iterator","file":"types.h","line":135,"lineto":135,"tdef":"typedef","description":" An iterator for conflicts in the index. ","comments":"","used":{"returns":[],"needs":["git_index_conflict_iterator_free","git_index_conflict_iterator_new","git_index_conflict_next"]}}],["git_index_entry",{"decl":["git_index_time ctime","git_index_time mtime","uint32_t dev","uint32_t ino","uint32_t mode","uint32_t uid","uint32_t gid","uint32_t file_size","git_oid id","uint16_t flags","uint16_t flags_extended","const char * path"],"type":"struct","value":"git_index_entry","file":"index.h","line":53,"lineto":70,"block":"git_index_time ctime\ngit_index_time mtime\nuint32_t dev\nuint32_t ino\nuint32_t mode\nuint32_t uid\nuint32_t gid\nuint32_t file_size\ngit_oid id\nuint16_t flags\nuint16_t flags_extended\nconst char * path","tdef":"typedef","description":" In-memory representation of a file entry in the index.","comments":"

This is a public structure that represents a file entry in the index.\n The meaning of the fields corresponds to core Git's documentation (in\n "Documentation/technical/index-format.txt").

\n\n

The flags field consists of a number of bit fields which can be\n accessed via the first set of GIT_IDXENTRY_... bitmasks below. These\n flags are all read from and persisted to disk.

\n\n

The flags_extended field also has a number of bit fields which can be\n accessed via the later GIT_IDXENTRY_... bitmasks below. Some of\n these flags are read from and written to disk, but some are set aside\n for in-memory only reference.

\n\n

Note that the time and size fields are truncated to 32 bits. This\n is enough to detect changes, which is enough for the index to\n function as a cache, but it should not be taken as an authoritative\n source for that data.

\n","fields":[{"type":"git_index_time","name":"ctime","comments":""},{"type":"git_index_time","name":"mtime","comments":""},{"type":"uint32_t","name":"dev","comments":""},{"type":"uint32_t","name":"ino","comments":""},{"type":"uint32_t","name":"mode","comments":""},{"type":"uint32_t","name":"uid","comments":""},{"type":"uint32_t","name":"gid","comments":""},{"type":"uint32_t","name":"file_size","comments":""},{"type":"git_oid","name":"id","comments":""},{"type":"uint16_t","name":"flags","comments":""},{"type":"uint16_t","name":"flags_extended","comments":""},{"type":"const char *","name":"path","comments":""}],"used":{"returns":["git_index_get_byindex","git_index_get_bypath"],"needs":["git_index_add","git_index_add_frombuffer","git_index_conflict_add","git_index_conflict_get","git_index_conflict_next","git_index_entry_is_conflict","git_index_entry_stage","git_merge_file_from_index"]}}],["git_index_time",{"decl":["int32_t seconds","uint32_t nanoseconds"],"type":"struct","value":"git_index_time","file":"index.h","line":26,"lineto":30,"block":"int32_t seconds\nuint32_t nanoseconds","tdef":"typedef","description":" Time structure used in a git index entry ","comments":"","fields":[{"type":"int32_t","name":"seconds","comments":""},{"type":"uint32_t","name":"nanoseconds","comments":""}],"used":{"returns":[],"needs":[]}}],["git_indexcap_t",{"decl":["GIT_INDEXCAP_IGNORE_CASE","GIT_INDEXCAP_NO_FILEMODE","GIT_INDEXCAP_NO_SYMLINKS","GIT_INDEXCAP_FROM_OWNER"],"type":"enum","file":"index.h","line":138,"lineto":143,"block":"GIT_INDEXCAP_IGNORE_CASE\nGIT_INDEXCAP_NO_FILEMODE\nGIT_INDEXCAP_NO_SYMLINKS\nGIT_INDEXCAP_FROM_OWNER","tdef":"typedef","description":" Capabilities of system that affect index actions. ","comments":"","fields":[{"type":"int","name":"GIT_INDEXCAP_IGNORE_CASE","comments":"","value":1},{"type":"int","name":"GIT_INDEXCAP_NO_FILEMODE","comments":"","value":2},{"type":"int","name":"GIT_INDEXCAP_NO_SYMLINKS","comments":"","value":4},{"type":"int","name":"GIT_INDEXCAP_FROM_OWNER","comments":"","value":-1}],"used":{"returns":[],"needs":[]}}],["git_indxentry_flag_t",{"decl":["GIT_IDXENTRY_EXTENDED","GIT_IDXENTRY_VALID"],"type":"enum","file":"index.h","line":86,"lineto":89,"block":"GIT_IDXENTRY_EXTENDED\nGIT_IDXENTRY_VALID","tdef":"typedef","description":" Flags for index entries","comments":"","fields":[{"type":"int","name":"GIT_IDXENTRY_EXTENDED","comments":"","value":16384},{"type":"int","name":"GIT_IDXENTRY_VALID","comments":"","value":32768}],"used":{"returns":[],"needs":[]}}],["git_libgit2_opt_t",{"decl":["GIT_OPT_GET_MWINDOW_SIZE","GIT_OPT_SET_MWINDOW_SIZE","GIT_OPT_GET_MWINDOW_MAPPED_LIMIT","GIT_OPT_SET_MWINDOW_MAPPED_LIMIT","GIT_OPT_GET_SEARCH_PATH","GIT_OPT_SET_SEARCH_PATH","GIT_OPT_SET_CACHE_OBJECT_LIMIT","GIT_OPT_SET_CACHE_MAX_SIZE","GIT_OPT_ENABLE_CACHING","GIT_OPT_GET_CACHED_MEMORY","GIT_OPT_GET_TEMPLATE_PATH","GIT_OPT_SET_TEMPLATE_PATH","GIT_OPT_SET_SSL_CERT_LOCATIONS"],"type":"enum","file":"common.h","line":132,"lineto":146,"block":"GIT_OPT_GET_MWINDOW_SIZE\nGIT_OPT_SET_MWINDOW_SIZE\nGIT_OPT_GET_MWINDOW_MAPPED_LIMIT\nGIT_OPT_SET_MWINDOW_MAPPED_LIMIT\nGIT_OPT_GET_SEARCH_PATH\nGIT_OPT_SET_SEARCH_PATH\nGIT_OPT_SET_CACHE_OBJECT_LIMIT\nGIT_OPT_SET_CACHE_MAX_SIZE\nGIT_OPT_ENABLE_CACHING\nGIT_OPT_GET_CACHED_MEMORY\nGIT_OPT_GET_TEMPLATE_PATH\nGIT_OPT_SET_TEMPLATE_PATH\nGIT_OPT_SET_SSL_CERT_LOCATIONS","tdef":"typedef","description":" Global library options","comments":"

These are used to select which global option to set or get and are\n used in git_libgit2_opts().

\n","fields":[{"type":"int","name":"GIT_OPT_GET_MWINDOW_SIZE","comments":"","value":0},{"type":"int","name":"GIT_OPT_SET_MWINDOW_SIZE","comments":"","value":1},{"type":"int","name":"GIT_OPT_GET_MWINDOW_MAPPED_LIMIT","comments":"","value":2},{"type":"int","name":"GIT_OPT_SET_MWINDOW_MAPPED_LIMIT","comments":"","value":3},{"type":"int","name":"GIT_OPT_GET_SEARCH_PATH","comments":"","value":4},{"type":"int","name":"GIT_OPT_SET_SEARCH_PATH","comments":"","value":5},{"type":"int","name":"GIT_OPT_SET_CACHE_OBJECT_LIMIT","comments":"","value":6},{"type":"int","name":"GIT_OPT_SET_CACHE_MAX_SIZE","comments":"","value":7},{"type":"int","name":"GIT_OPT_ENABLE_CACHING","comments":"","value":8},{"type":"int","name":"GIT_OPT_GET_CACHED_MEMORY","comments":"","value":9},{"type":"int","name":"GIT_OPT_GET_TEMPLATE_PATH","comments":"","value":10},{"type":"int","name":"GIT_OPT_SET_TEMPLATE_PATH","comments":"","value":11},{"type":"int","name":"GIT_OPT_SET_SSL_CERT_LOCATIONS","comments":"","value":12}],"used":{"returns":[],"needs":[]}}],["git_merge_analysis_t",{"decl":["GIT_MERGE_ANALYSIS_NONE","GIT_MERGE_ANALYSIS_NORMAL","GIT_MERGE_ANALYSIS_UP_TO_DATE","GIT_MERGE_ANALYSIS_FASTFORWARD","GIT_MERGE_ANALYSIS_UNBORN"],"type":"enum","file":"merge.h","line":272,"lineto":301,"block":"GIT_MERGE_ANALYSIS_NONE\nGIT_MERGE_ANALYSIS_NORMAL\nGIT_MERGE_ANALYSIS_UP_TO_DATE\nGIT_MERGE_ANALYSIS_FASTFORWARD\nGIT_MERGE_ANALYSIS_UNBORN","tdef":"typedef","description":" The results of `git_merge_analysis` indicate the merge opportunities.","comments":"","fields":[{"type":"int","name":"GIT_MERGE_ANALYSIS_NONE","comments":"

No merge is possible. (Unused.)

\n","value":0},{"type":"int","name":"GIT_MERGE_ANALYSIS_NORMAL","comments":"

A "normal" merge; both HEAD and the given merge input have diverged\n from their common ancestor. The divergent commits must be merged.

\n","value":1},{"type":"int","name":"GIT_MERGE_ANALYSIS_UP_TO_DATE","comments":"

All given merge inputs are reachable from HEAD, meaning the\n repository is up-to-date and no merge needs to be performed.

\n","value":2},{"type":"int","name":"GIT_MERGE_ANALYSIS_FASTFORWARD","comments":"

The given merge input is a fast-forward from HEAD and no merge\n needs to be performed. Instead, the client can check out the\n given merge input.

\n","value":4},{"type":"int","name":"GIT_MERGE_ANALYSIS_UNBORN","comments":"

The HEAD of the current repository is "unborn" and does not point to\n a valid commit. No merge can be performed, but the caller may wish\n to simply set HEAD to the target commit(s).

\n","value":8}],"used":{"returns":[],"needs":["git_merge_analysis"]}}],["git_merge_file_favor_t",{"decl":["GIT_MERGE_FILE_FAVOR_NORMAL","GIT_MERGE_FILE_FAVOR_OURS","GIT_MERGE_FILE_FAVOR_THEIRS","GIT_MERGE_FILE_FAVOR_UNION"],"type":"enum","file":"merge.h","line":81,"lineto":111,"block":"GIT_MERGE_FILE_FAVOR_NORMAL\nGIT_MERGE_FILE_FAVOR_OURS\nGIT_MERGE_FILE_FAVOR_THEIRS\nGIT_MERGE_FILE_FAVOR_UNION","tdef":"typedef","description":" Merge file favor options for `git_merge_options` instruct the file-level\n merging functionality how to deal with conflicting regions of the files.","comments":"","fields":[{"type":"int","name":"GIT_MERGE_FILE_FAVOR_NORMAL","comments":"

When a region of a file is changed in both branches, a conflict\n will be recorded in the index so that git_checkout can produce\n a merge file with conflict markers in the working directory.\n This is the default.

\n","value":0},{"type":"int","name":"GIT_MERGE_FILE_FAVOR_OURS","comments":"

When a region of a file is changed in both branches, the file\n created in the index will contain the "ours" side of any conflicting\n region. The index will not record a conflict.

\n","value":1},{"type":"int","name":"GIT_MERGE_FILE_FAVOR_THEIRS","comments":"

When a region of a file is changed in both branches, the file\n created in the index will contain the "theirs" side of any conflicting\n region. The index will not record a conflict.

\n","value":2},{"type":"int","name":"GIT_MERGE_FILE_FAVOR_UNION","comments":"

When a region of a file is changed in both branches, the file\n created in the index will contain each unique line from each side,\n which has the result of combining both files. The index will not\n record a conflict.

\n","value":3}],"used":{"returns":[],"needs":[]}}],["git_merge_file_flags_t",{"decl":["GIT_MERGE_FILE_DEFAULT","GIT_MERGE_FILE_STYLE_MERGE","GIT_MERGE_FILE_STYLE_DIFF3","GIT_MERGE_FILE_SIMPLIFY_ALNUM","GIT_MERGE_FILE_IGNORE_WHITESPACE","GIT_MERGE_FILE_IGNORE_WHITESPACE_CHANGE","GIT_MERGE_FILE_IGNORE_WHITESPACE_EOL","GIT_MERGE_FILE_DIFF_PATIENCE","GIT_MERGE_FILE_DIFF_MINIMAL"],"type":"enum","file":"merge.h","line":116,"lineto":143,"block":"GIT_MERGE_FILE_DEFAULT\nGIT_MERGE_FILE_STYLE_MERGE\nGIT_MERGE_FILE_STYLE_DIFF3\nGIT_MERGE_FILE_SIMPLIFY_ALNUM\nGIT_MERGE_FILE_IGNORE_WHITESPACE\nGIT_MERGE_FILE_IGNORE_WHITESPACE_CHANGE\nGIT_MERGE_FILE_IGNORE_WHITESPACE_EOL\nGIT_MERGE_FILE_DIFF_PATIENCE\nGIT_MERGE_FILE_DIFF_MINIMAL","tdef":"typedef","description":" File merging flags","comments":"","fields":[{"type":"int","name":"GIT_MERGE_FILE_DEFAULT","comments":"

Defaults

\n","value":0},{"type":"int","name":"GIT_MERGE_FILE_STYLE_MERGE","comments":"

Create standard conflicted merge files

\n","value":1},{"type":"int","name":"GIT_MERGE_FILE_STYLE_DIFF3","comments":"

Create diff3-style files

\n","value":2},{"type":"int","name":"GIT_MERGE_FILE_SIMPLIFY_ALNUM","comments":"

Condense non-alphanumeric regions for simplified diff file

\n","value":4},{"type":"int","name":"GIT_MERGE_FILE_IGNORE_WHITESPACE","comments":"

Ignore all whitespace

\n","value":8},{"type":"int","name":"GIT_MERGE_FILE_IGNORE_WHITESPACE_CHANGE","comments":"

Ignore changes in amount of whitespace

\n","value":16},{"type":"int","name":"GIT_MERGE_FILE_IGNORE_WHITESPACE_EOL","comments":"

Ignore whitespace at end of line

\n","value":32},{"type":"int","name":"GIT_MERGE_FILE_DIFF_PATIENCE","comments":"

Use the "patience diff" algorithm

\n","value":64},{"type":"int","name":"GIT_MERGE_FILE_DIFF_MINIMAL","comments":"

Take extra time to find minimal diff

\n","value":128}],"used":{"returns":[],"needs":[]}}],["git_merge_file_input",{"decl":["unsigned int version","const char * ptr","size_t size","const char * path","unsigned int mode"],"type":"struct","value":"git_merge_file_input","file":"merge.h","line":32,"lineto":46,"block":"unsigned int version\nconst char * ptr\nsize_t size\nconst char * path\nunsigned int mode","tdef":"typedef","description":" The file inputs to `git_merge_file`. Callers should populate the\n `git_merge_file_input` structure with descriptions of the files in\n each side of the conflict for use in producing the merge file.","comments":"","fields":[{"type":"unsigned int","name":"version","comments":""},{"type":"const char *","name":"ptr","comments":" Pointer to the contents of the file. "},{"type":"size_t","name":"size","comments":" Size of the contents pointed to in `ptr`. "},{"type":"const char *","name":"path","comments":" File name of the conflicted file, or `NULL` to not merge the path. "},{"type":"unsigned int","name":"mode","comments":" File mode of the conflicted file, or `0` to not merge the mode. "}],"used":{"returns":[],"needs":["git_merge_file","git_merge_file_init_input"]}}],["git_merge_file_options",{"decl":["unsigned int version","const char * ancestor_label","const char * our_label","const char * their_label","git_merge_file_favor_t favor","unsigned int flags"],"type":"struct","value":"git_merge_file_options","file":"merge.h","line":148,"lineto":174,"block":"unsigned int version\nconst char * ancestor_label\nconst char * our_label\nconst char * their_label\ngit_merge_file_favor_t favor\nunsigned int flags","tdef":"typedef","description":" Options for merging a file","comments":"","fields":[{"type":"unsigned int","name":"version","comments":""},{"type":"const char *","name":"ancestor_label","comments":" Label for the ancestor file side of the conflict which will be prepended\n to labels in diff3-format merge files."},{"type":"const char *","name":"our_label","comments":" Label for our file side of the conflict which will be prepended\n to labels in merge files."},{"type":"const char *","name":"their_label","comments":" Label for their file side of the conflict which will be prepended\n to labels in merge files."},{"type":"git_merge_file_favor_t","name":"favor","comments":" The file to favor in region conflicts. "},{"type":"unsigned int","name":"flags","comments":" see `git_merge_file_flags_t` above "}],"used":{"returns":[],"needs":["git_merge_file","git_merge_file_from_index","git_merge_file_init_options"]}}],["git_merge_file_result",{"decl":["unsigned int automergeable","const char * path","unsigned int mode","const char * ptr","size_t len"],"type":"struct","value":"git_merge_file_result","file":"merge.h","line":195,"lineto":216,"block":"unsigned int automergeable\nconst char * path\nunsigned int mode\nconst char * ptr\nsize_t len","tdef":"typedef","description":" Information about file-level merging","comments":"","fields":[{"type":"unsigned int","name":"automergeable","comments":" True if the output was automerged, false if the output contains\n conflict markers."},{"type":"const char *","name":"path","comments":" The path that the resultant merge file should use, or NULL if a\n filename conflict would occur."},{"type":"unsigned int","name":"mode","comments":" The mode that the resultant merge file should use. "},{"type":"const char *","name":"ptr","comments":" The contents of the merge. "},{"type":"size_t","name":"len","comments":" The length of the merge contents. "}],"used":{"returns":[],"needs":["git_merge_file","git_merge_file_from_index","git_merge_file_result_free"]}}],["git_merge_options",{"decl":["unsigned int version","git_merge_tree_flag_t tree_flags","unsigned int rename_threshold","unsigned int target_limit","git_diff_similarity_metric * metric","git_merge_file_favor_t file_favor","unsigned int file_flags"],"type":"struct","value":"git_merge_options","file":"merge.h","line":221,"lineto":251,"block":"unsigned int version\ngit_merge_tree_flag_t tree_flags\nunsigned int rename_threshold\nunsigned int target_limit\ngit_diff_similarity_metric * metric\ngit_merge_file_favor_t file_favor\nunsigned int file_flags","tdef":"typedef","description":" Merging options","comments":"","fields":[{"type":"unsigned int","name":"version","comments":""},{"type":"git_merge_tree_flag_t","name":"tree_flags","comments":""},{"type":"unsigned int","name":"rename_threshold","comments":" Similarity to consider a file renamed (default 50). If\n `GIT_MERGE_TREE_FIND_RENAMES` is enabled, added files will be compared\n with deleted files to determine their similarity. Files that are\n more similar than the rename threshold (percentage-wise) will be\n treated as a rename."},{"type":"unsigned int","name":"target_limit","comments":" Maximum similarity sources to examine for renames (default 200).\n If the number of rename candidates (add / delete pairs) is greater\n than this value, inexact rename detection is aborted.\n\n This setting overrides the `merge.renameLimit` configuration value."},{"type":"git_diff_similarity_metric *","name":"metric","comments":" Pluggable similarity metric; pass NULL to use internal metric "},{"type":"git_merge_file_favor_t","name":"file_favor","comments":" Flags for handling conflicting content. "},{"type":"unsigned int","name":"file_flags","comments":" see `git_merge_file_flags_t` above "}],"used":{"returns":[],"needs":["git_cherrypick_commit","git_merge","git_merge_commits","git_merge_init_options","git_merge_trees","git_revert_commit"]}}],["git_merge_preference_t",{"decl":["GIT_MERGE_PREFERENCE_NONE","GIT_MERGE_PREFERENCE_NO_FASTFORWARD","GIT_MERGE_PREFERENCE_FASTFORWARD_ONLY"],"type":"enum","file":"merge.h","line":306,"lineto":324,"block":"GIT_MERGE_PREFERENCE_NONE\nGIT_MERGE_PREFERENCE_NO_FASTFORWARD\nGIT_MERGE_PREFERENCE_FASTFORWARD_ONLY","tdef":"typedef","description":" The user's stated preference for merges.","comments":"","fields":[{"type":"int","name":"GIT_MERGE_PREFERENCE_NONE","comments":"

No configuration was found that suggests a preferred behavior for\n merge.

\n","value":0},{"type":"int","name":"GIT_MERGE_PREFERENCE_NO_FASTFORWARD","comments":"

There is a merge.ff=false configuration setting, suggesting that\n the user does not want to allow a fast-forward merge.

\n","value":1},{"type":"int","name":"GIT_MERGE_PREFERENCE_FASTFORWARD_ONLY","comments":"

There is a merge.ff=only configuration setting, suggesting that\n the user only wants fast-forward merges.

\n","value":2}],"used":{"returns":[],"needs":["git_merge_analysis"]}}],["git_merge_result",{"decl":"git_merge_result","type":"struct","value":"git_merge_result","file":"types.h","line":181,"lineto":181,"tdef":"typedef","description":" Merge result ","comments":"","used":{"returns":[],"needs":[]}}],["git_merge_tree_flag_t",{"decl":["GIT_MERGE_TREE_FIND_RENAMES"],"type":"enum","file":"merge.h","line":68,"lineto":75,"block":"GIT_MERGE_TREE_FIND_RENAMES","tdef":"typedef","description":" Flags for `git_merge_tree` options. A combination of these flags can be\n passed in via the `tree_flags` value in the `git_merge_options`.","comments":"","fields":[{"type":"int","name":"GIT_MERGE_TREE_FIND_RENAMES","comments":"

Detect renames that occur between the common ancestor and the "ours"\n side or the common ancestor and the "theirs" side. This will enable\n the ability to merge between a modified and renamed file.

\n","value":1}],"used":{"returns":[],"needs":[]}}],["git_note",{"decl":"git_note","type":"struct","value":"git_note","file":"types.h","line":150,"lineto":150,"tdef":"typedef","description":" Representation of a git note ","comments":"","used":{"returns":[],"needs":["git_note_author","git_note_committer","git_note_free","git_note_id","git_note_message","git_note_read"]}}],["git_note_iterator",{"decl":"git_note_iterator","type":"struct","value":"git_note_iterator","file":"notes.h","line":35,"lineto":35,"tdef":"typedef","description":" note iterator","comments":"","used":{"returns":[],"needs":["git_note_iterator_free","git_note_iterator_new","git_note_next"]}}],["git_object",{"decl":"git_object","type":"struct","value":"git_object","file":"types.h","line":108,"lineto":108,"tdef":"typedef","description":" Representation of a generic object in a repository ","comments":"","used":{"returns":[],"needs":["git_checkout_tree","git_describe_commit","git_object_dup","git_object_free","git_object_id","git_object_lookup","git_object_lookup_bypath","git_object_lookup_prefix","git_object_owner","git_object_peel","git_object_short_id","git_object_type","git_reference_peel","git_reset","git_reset_default","git_revparse_ext","git_revparse_single","git_tag_annotation_create","git_tag_create","git_tag_create_lightweight","git_tag_peel","git_tag_target","git_tree_entry_to_object"]}}],["git_odb",{"decl":"git_odb","type":"struct","value":"git_odb","file":"types.h","line":81,"lineto":81,"tdef":"typedef","description":" An open object database handle. ","comments":"","used":{"returns":[],"needs":["git_indexer_new","git_odb_add_alternate","git_odb_add_backend","git_odb_add_disk_alternate","git_odb_exists","git_odb_exists_prefix","git_odb_foreach","git_odb_free","git_odb_get_backend","git_odb_new","git_odb_num_backends","git_odb_open","git_odb_open_rstream","git_odb_open_wstream","git_odb_read","git_odb_read_header","git_odb_read_prefix","git_odb_refresh","git_odb_write","git_odb_write_pack","git_repository_odb","git_repository_set_odb","git_repository_wrap_odb"]}}],["git_odb_backend",{"decl":"git_odb_backend","type":"struct","value":"git_odb_backend","file":"types.h","line":84,"lineto":84,"block":"unsigned int version\ngit_odb * odb\nint (*)(void **, size_t *, git_otype *, git_odb_backend *, const git_oid *) read\nint (*)(git_oid *, void **, size_t *, git_otype *, git_odb_backend *, const git_oid *, size_t) read_prefix\nint (*)(size_t *, git_otype *, git_odb_backend *, const git_oid *) read_header\nint (*)(git_odb_backend *, const git_oid *, const void *, size_t, git_otype) write\nint (*)(git_odb_stream **, git_odb_backend *, git_off_t, git_otype) writestream\nint (*)(git_odb_stream **, git_odb_backend *, const git_oid *) readstream\nint (*)(git_odb_backend *, const git_oid *) exists\nint (*)(git_oid *, git_odb_backend *, const git_oid *, size_t) exists_prefix\nint (*)(git_odb_backend *) refresh\nint (*)(git_odb_backend *, git_odb_foreach_cb, void *) foreach\nint (*)(git_odb_writepack **, git_odb_backend *, git_odb *, git_transfer_progress_cb, void *) writepack\nvoid (*)(git_odb_backend *) free","tdef":"typedef","description":" A custom backend in an ODB ","comments":"","fields":[{"type":"unsigned int","name":"version","comments":""},{"type":"git_odb *","name":"odb","comments":""},{"type":"int (*)(void **, size_t *, git_otype *, git_odb_backend *, const git_oid *)","name":"read","comments":""},{"type":"int (*)(git_oid *, void **, size_t *, git_otype *, git_odb_backend *, const git_oid *, size_t)","name":"read_prefix","comments":""},{"type":"int (*)(size_t *, git_otype *, git_odb_backend *, const git_oid *)","name":"read_header","comments":""},{"type":"int (*)(git_odb_backend *, const git_oid *, const void *, size_t, git_otype)","name":"write","comments":" Write an object into the backend. The id of the object has\n already been calculated and is passed in."},{"type":"int (*)(git_odb_stream **, git_odb_backend *, git_off_t, git_otype)","name":"writestream","comments":""},{"type":"int (*)(git_odb_stream **, git_odb_backend *, const git_oid *)","name":"readstream","comments":""},{"type":"int (*)(git_odb_backend *, const git_oid *)","name":"exists","comments":""},{"type":"int (*)(git_oid *, git_odb_backend *, const git_oid *, size_t)","name":"exists_prefix","comments":""},{"type":"int (*)(git_odb_backend *)","name":"refresh","comments":" If the backend implements a refreshing mechanism, it should be exposed\n through this endpoint. Each call to `git_odb_refresh()` will invoke it.\n\n However, the backend implementation should try to stay up-to-date as much\n as possible by itself as libgit2 will not automatically invoke\n `git_odb_refresh()`. For instance, a potential strategy for the backend\n implementation to achieve this could be to internally invoke this\n endpoint on failed lookups (ie. `exists()`, `read()`, `read_header()`)."},{"type":"int (*)(git_odb_backend *, git_odb_foreach_cb, void *)","name":"foreach","comments":""},{"type":"int (*)(git_odb_writepack **, git_odb_backend *, git_odb *, git_transfer_progress_cb, void *)","name":"writepack","comments":""},{"type":"void (*)(git_odb_backend *)","name":"free","comments":""}],"used":{"returns":[],"needs":["git_mempack_new","git_mempack_reset","git_odb_add_alternate","git_odb_add_backend","git_odb_backend_loose","git_odb_backend_one_pack","git_odb_backend_pack","git_odb_get_backend","git_odb_init_backend"]}}],["git_odb_object",{"decl":"git_odb_object","type":"struct","value":"git_odb_object","file":"types.h","line":87,"lineto":87,"tdef":"typedef","description":" An object read from the ODB ","comments":"","used":{"returns":[],"needs":["git_odb_object_data","git_odb_object_dup","git_odb_object_free","git_odb_object_id","git_odb_object_size","git_odb_object_type","git_odb_read","git_odb_read_prefix"]}}],["git_odb_stream",{"decl":"git_odb_stream","type":"struct","value":"git_odb_stream","file":"types.h","line":90,"lineto":90,"block":"git_odb_backend * backend\nunsigned int mode\nvoid * hash_ctx\ngit_off_t declared_size\ngit_off_t received_bytes\nint (*)(git_odb_stream *, char *, size_t) read\nint (*)(git_odb_stream *, const char *, size_t) write\nint (*)(git_odb_stream *, const int *) finalize_write\nvoid (*)(git_odb_stream *) free","tdef":"typedef","description":" A stream to read/write from the ODB ","comments":"","fields":[{"type":"git_odb_backend *","name":"backend","comments":""},{"type":"unsigned int","name":"mode","comments":""},{"type":"void *","name":"hash_ctx","comments":""},{"type":"git_off_t","name":"declared_size","comments":""},{"type":"git_off_t","name":"received_bytes","comments":""},{"type":"int (*)(git_odb_stream *, char *, size_t)","name":"read","comments":" Write at most `len` bytes into `buffer` and advance the stream."},{"type":"int (*)(git_odb_stream *, const char *, size_t)","name":"write","comments":" Write `len` bytes from `buffer` into the stream."},{"type":"int (*)(git_odb_stream *, const int *)","name":"finalize_write","comments":" Store the contents of the stream as an object with the id\n specified in `oid`.\n\n This method might not be invoked if:\n - an error occurs earlier with the `write` callback,\n - the object referred to by `oid` already exists in any backend, or\n - the final number of received bytes differs from the size declared\n with `git_odb_open_wstream()`"},{"type":"void (*)(git_odb_stream *)","name":"free","comments":" Free the stream's memory.\n\n This method might be called without a call to `finalize_write` if\n an error occurs or if the object is already present in the ODB."}],"used":{"returns":[],"needs":["git_odb_open_rstream","git_odb_open_wstream","git_odb_stream_finalize_write","git_odb_stream_free","git_odb_stream_read","git_odb_stream_write"]}}],["git_odb_stream_t",{"decl":["GIT_STREAM_RDONLY","GIT_STREAM_WRONLY","GIT_STREAM_RW"],"type":"enum","file":"odb_backend.h","line":70,"lineto":74,"block":"GIT_STREAM_RDONLY\nGIT_STREAM_WRONLY\nGIT_STREAM_RW","tdef":"typedef","description":" Streaming mode ","comments":"","fields":[{"type":"int","name":"GIT_STREAM_RDONLY","comments":"","value":2},{"type":"int","name":"GIT_STREAM_WRONLY","comments":"","value":4},{"type":"int","name":"GIT_STREAM_RW","comments":"","value":6}],"used":{"returns":[],"needs":[]}}],["git_odb_writepack",{"decl":"git_odb_writepack","type":"struct","value":"git_odb_writepack","file":"types.h","line":93,"lineto":93,"block":"git_odb_backend * backend\nint (*)(git_odb_writepack *, const void *, size_t, git_transfer_progress *) append\nint (*)(git_odb_writepack *, git_transfer_progress *) commit\nvoid (*)(git_odb_writepack *) free","tdef":"typedef","description":" A stream to write a packfile to the ODB ","comments":"","fields":[{"type":"git_odb_backend *","name":"backend","comments":""},{"type":"int (*)(git_odb_writepack *, const void *, size_t, git_transfer_progress *)","name":"append","comments":""},{"type":"int (*)(git_odb_writepack *, git_transfer_progress *)","name":"commit","comments":""},{"type":"void (*)(git_odb_writepack *)","name":"free","comments":""}],"used":{"returns":[],"needs":["git_odb_write_pack"]}}],["git_oid",{"decl":["unsigned char [20] id"],"type":"struct","value":"git_oid","file":"oid.h","line":33,"lineto":36,"block":"unsigned char [20] id","tdef":"typedef","description":" Unique identity of any object (commit, tree, blob, tag). ","comments":"","fields":[{"type":"unsigned char [20]","name":"id","comments":" raw binary formatted id "}],"used":{"returns":["git_annotated_commit_id","git_blob_id","git_commit_id","git_commit_parent_id","git_commit_tree_id","git_filter_source_id","git_index_checksum","git_indexer_hash","git_note_id","git_object_id","git_odb_object_id","git_packbuilder_hash","git_reference_target","git_reference_target_peel","git_reflog_entry_id_new","git_reflog_entry_id_old","git_submodule_head_id","git_submodule_index_id","git_submodule_wd_id","git_tag_id","git_tag_target_id","git_tree_entry_id","git_tree_id"],"needs":["git_annotated_commit_from_fetchhead","git_annotated_commit_lookup","git_blob_create_frombuffer","git_blob_create_fromchunks","git_blob_create_fromdisk","git_blob_create_fromworkdir","git_blob_lookup","git_blob_lookup_prefix","git_commit_amend","git_commit_create","git_commit_create_from_callback","git_commit_create_from_ids","git_commit_create_v","git_commit_lookup","git_commit_lookup_prefix","git_graph_ahead_behind","git_graph_descendant_of","git_index_write_tree","git_index_write_tree_to","git_merge_base","git_merge_base_many","git_merge_base_octopus","git_merge_bases","git_merge_bases_many","git_note_create","git_note_next","git_note_read","git_note_remove","git_object_lookup","git_object_lookup_prefix","git_odb_exists","git_odb_exists_prefix","git_odb_hash","git_odb_hashfile","git_odb_open_rstream","git_odb_read","git_odb_read_header","git_odb_read_prefix","git_odb_stream_finalize_write","git_odb_write","git_oid_cmp","git_oid_cpy","git_oid_equal","git_oid_fmt","git_oid_fromraw","git_oid_fromstr","git_oid_fromstrn","git_oid_fromstrp","git_oid_iszero","git_oid_ncmp","git_oid_nfmt","git_oid_pathfmt","git_oid_strcmp","git_oid_streq","git_oid_tostr","git_oid_tostr_s","git_packbuilder_insert","git_packbuilder_insert_commit","git_packbuilder_insert_recur","git_packbuilder_insert_tree","git_rebase_commit","git_reference__alloc","git_reference_create","git_reference_create_matching","git_reference_name_to_id","git_reference_set_target","git_reflog_append","git_repository_hashfile","git_repository_set_head_detached","git_revwalk_hide","git_revwalk_next","git_revwalk_push","git_tag_annotation_create","git_tag_create","git_tag_create_frombuffer","git_tag_create_lightweight","git_tag_lookup","git_tag_lookup_prefix","git_tree_entry_byid","git_tree_lookup","git_tree_lookup_prefix","git_treebuilder_insert","git_treebuilder_write"]}}],["git_oid_shorten",{"decl":"git_oid_shorten","type":"struct","value":"git_oid_shorten","file":"oid.h","line":216,"lineto":216,"tdef":"typedef","description":" OID Shortener object","comments":"","used":{"returns":["git_oid_shorten_new"],"needs":["git_oid_shorten_add","git_oid_shorten_free"]}}],["git_oidarray",{"decl":["git_oid * ids","size_t count"],"type":"struct","value":"git_oidarray","file":"oidarray.h","line":16,"lineto":19,"block":"git_oid * ids\nsize_t count","tdef":"typedef","description":" Array of object ids ","comments":"","fields":[{"type":"git_oid *","name":"ids","comments":""},{"type":"size_t","name":"count","comments":""}],"used":{"returns":[],"needs":["git_merge_bases","git_merge_bases_many","git_oidarray_free"]}}],["git_otype",{"decl":["GIT_OBJ_ANY","GIT_OBJ_BAD","GIT_OBJ__EXT1","GIT_OBJ_COMMIT","GIT_OBJ_TREE","GIT_OBJ_BLOB","GIT_OBJ_TAG","GIT_OBJ__EXT2","GIT_OBJ_OFS_DELTA","GIT_OBJ_REF_DELTA"],"type":"enum","file":"types.h","line":67,"lineto":78,"block":"GIT_OBJ_ANY\nGIT_OBJ_BAD\nGIT_OBJ__EXT1\nGIT_OBJ_COMMIT\nGIT_OBJ_TREE\nGIT_OBJ_BLOB\nGIT_OBJ_TAG\nGIT_OBJ__EXT2\nGIT_OBJ_OFS_DELTA\nGIT_OBJ_REF_DELTA","tdef":"typedef","description":" Basic type (loose or packed) of any Git object. ","comments":"","fields":[{"type":"int","name":"GIT_OBJ_ANY","comments":"

Object can be any of the following

\n","value":-2},{"type":"int","name":"GIT_OBJ_BAD","comments":"

Object is invalid.

\n","value":-1},{"type":"int","name":"GIT_OBJ__EXT1","comments":"

Reserved for future use.

\n","value":0},{"type":"int","name":"GIT_OBJ_COMMIT","comments":"

A commit object.

\n","value":1},{"type":"int","name":"GIT_OBJ_TREE","comments":"

A tree (directory listing) object.

\n","value":2},{"type":"int","name":"GIT_OBJ_BLOB","comments":"

A file revision object.

\n","value":3},{"type":"int","name":"GIT_OBJ_TAG","comments":"

An annotated tag object.

\n","value":4},{"type":"int","name":"GIT_OBJ__EXT2","comments":"

Reserved for future use.

\n","value":5},{"type":"int","name":"GIT_OBJ_OFS_DELTA","comments":"

A delta, base is given by an offset.

\n","value":6},{"type":"int","name":"GIT_OBJ_REF_DELTA","comments":"

A delta, base is given by object id.

\n","value":7}],"used":{"returns":[],"needs":["git_object__size","git_object_lookup","git_object_lookup_bypath","git_object_lookup_prefix","git_object_peel","git_object_type2string","git_object_typeisloose","git_odb_hash","git_odb_hashfile","git_odb_open_wstream","git_odb_read_header","git_odb_write","git_reference_peel","git_repository_hashfile"]}}],["git_packbuilder",{"decl":"git_packbuilder","type":"struct","value":"git_packbuilder","file":"types.h","line":153,"lineto":153,"tdef":"typedef","description":" Representation of a git packbuilder ","comments":"","used":{"returns":[],"needs":["git_packbuilder_foreach","git_packbuilder_free","git_packbuilder_hash","git_packbuilder_insert","git_packbuilder_insert_commit","git_packbuilder_insert_recur","git_packbuilder_insert_tree","git_packbuilder_insert_walk","git_packbuilder_new","git_packbuilder_object_count","git_packbuilder_set_callbacks","git_packbuilder_set_threads","git_packbuilder_write","git_packbuilder_written"]}}],["git_packbuilder_stage_t",{"decl":["GIT_PACKBUILDER_ADDING_OBJECTS","GIT_PACKBUILDER_DELTAFICATION"],"type":"enum","file":"pack.h","line":51,"lineto":54,"block":"GIT_PACKBUILDER_ADDING_OBJECTS\nGIT_PACKBUILDER_DELTAFICATION","tdef":"typedef","description":" Stages that are reported by the packbuilder progress callback.","comments":"","fields":[{"type":"int","name":"GIT_PACKBUILDER_ADDING_OBJECTS","comments":"","value":0},{"type":"int","name":"GIT_PACKBUILDER_DELTAFICATION","comments":"","value":1}],"used":{"returns":[],"needs":[]}}],["git_patch",{"decl":"git_patch","type":"struct","value":"git_patch","file":"patch.h","line":29,"lineto":29,"tdef":"typedef","description":" The diff patch is used to store all the text diffs for a delta.","comments":"

You can easily loop over the content of patches and get information about\n them.

\n","used":{"returns":[],"needs":["git_patch_free","git_patch_from_blob_and_buffer","git_patch_from_blobs","git_patch_from_buffers","git_patch_from_diff","git_patch_get_delta","git_patch_get_hunk","git_patch_get_line_in_hunk","git_patch_line_stats","git_patch_num_hunks","git_patch_num_lines_in_hunk","git_patch_print","git_patch_size","git_patch_to_buf"]}}],["git_pathspec",{"decl":"git_pathspec","type":"struct","value":"git_pathspec","file":"pathspec.h","line":20,"lineto":20,"tdef":"typedef","description":" Compiled pathspec","comments":"","used":{"returns":[],"needs":["git_pathspec_free","git_pathspec_match_diff","git_pathspec_match_index","git_pathspec_match_tree","git_pathspec_match_workdir","git_pathspec_matches_path","git_pathspec_new"]}}],["git_pathspec_flag_t",{"decl":["GIT_PATHSPEC_DEFAULT","GIT_PATHSPEC_IGNORE_CASE","GIT_PATHSPEC_USE_CASE","GIT_PATHSPEC_NO_GLOB","GIT_PATHSPEC_NO_MATCH_ERROR","GIT_PATHSPEC_FIND_FAILURES","GIT_PATHSPEC_FAILURES_ONLY"],"type":"enum","file":"pathspec.h","line":48,"lineto":56,"block":"GIT_PATHSPEC_DEFAULT\nGIT_PATHSPEC_IGNORE_CASE\nGIT_PATHSPEC_USE_CASE\nGIT_PATHSPEC_NO_GLOB\nGIT_PATHSPEC_NO_MATCH_ERROR\nGIT_PATHSPEC_FIND_FAILURES\nGIT_PATHSPEC_FAILURES_ONLY","tdef":"typedef","description":" Options controlling how pathspec match should be executed","comments":"
    \n
  • GIT_PATHSPEC_IGNORE_CASE forces match to ignore case; otherwise\nmatch will use native case sensitivity of platform filesystem
    • \n
  • GIT_PATHSPEC_USE_CASE forces case sensitive match; otherwise\nmatch will use native case sensitivity of platform filesystem
    • \n
  • GIT_PATHSPEC_NO_GLOB disables glob patterns and just uses simple\nstring comparison for matching
    • \n
  • GIT_PATHSPEC_NO_MATCH_ERROR means the match functions return error\ncode GIT_ENOTFOUND if no matches are found; otherwise no matches is\nstill success (return 0) but git_pathspec_match_list_entrycount\nwill indicate 0 matches.
    • \n
  • GIT_PATHSPEC_FIND_FAILURES means that the git_pathspec_match_list\nshould track which patterns matched which files so that at the end of\nthe match we can identify patterns that did not match any files.
    • \n
  • GIT_PATHSPEC_FAILURES_ONLY means that the git_pathspec_match_list\ndoes not need to keep the actual matching filenames. Use this to\njust test if there were any matches at all or in combination with\nGIT_PATHSPEC_FIND_FAILURES to validate a pathspec.
    • \n
\n","fields":[{"type":"int","name":"GIT_PATHSPEC_DEFAULT","comments":"","value":0},{"type":"int","name":"GIT_PATHSPEC_IGNORE_CASE","comments":"","value":1},{"type":"int","name":"GIT_PATHSPEC_USE_CASE","comments":"","value":2},{"type":"int","name":"GIT_PATHSPEC_NO_GLOB","comments":"","value":4},{"type":"int","name":"GIT_PATHSPEC_NO_MATCH_ERROR","comments":"","value":8},{"type":"int","name":"GIT_PATHSPEC_FIND_FAILURES","comments":"","value":16},{"type":"int","name":"GIT_PATHSPEC_FAILURES_ONLY","comments":"","value":32}],"used":{"returns":[],"needs":[]}}],["git_pathspec_match_list",{"decl":"git_pathspec_match_list","type":"struct","value":"git_pathspec_match_list","file":"pathspec.h","line":25,"lineto":25,"tdef":"typedef","description":" List of filenames matching a pathspec","comments":"","used":{"returns":[],"needs":["git_pathspec_match_diff","git_pathspec_match_index","git_pathspec_match_list_diff_entry","git_pathspec_match_list_entry","git_pathspec_match_list_entrycount","git_pathspec_match_list_failed_entry","git_pathspec_match_list_failed_entrycount","git_pathspec_match_list_free","git_pathspec_match_tree","git_pathspec_match_workdir"]}}],["git_push",{"decl":"git_push","type":"struct","value":"git_push","file":"types.h","line":236,"lineto":236,"tdef":"typedef","description":" Preparation for a push operation. Can be used to configure what to\n push and the level of parallelism of the packfile builder.","comments":"","used":{"returns":[],"needs":[]}}],["git_push_options",{"decl":["unsigned int version","unsigned int pb_parallelism","git_remote_callbacks callbacks"],"type":"struct","value":"git_push_options","file":"remote.h","line":571,"lineto":588,"block":"unsigned int version\nunsigned int pb_parallelism\ngit_remote_callbacks callbacks","tdef":"typedef","description":" Controls the behavior of a git_push object.","comments":"","fields":[{"type":"unsigned int","name":"version","comments":""},{"type":"unsigned int","name":"pb_parallelism","comments":" If the transport being used to push to the remote requires the creation\n of a pack file, this controls the number of worker threads used by\n the packbuilder when creating that pack file to be sent to the remote.\n\n If set to 0, the packbuilder will auto-detect the number of threads\n to create. The default value is 1."},{"type":"git_remote_callbacks","name":"callbacks","comments":" Callbacks to use for this push operation"}],"used":{"returns":[],"needs":["git_push_init_options","git_remote_push","git_remote_upload"]}}],["git_push_update",{"decl":["char * src_refname","char * dst_refname","git_oid src","git_oid dst"],"type":"struct","value":"git_push_update","file":"remote.h","line":340,"lineto":357,"block":"char * src_refname\nchar * dst_refname\ngit_oid src\ngit_oid dst","tdef":"typedef","description":" Represents an update which will be performed on the remote during push","comments":"","fields":[{"type":"char *","name":"src_refname","comments":" The source name of the reference"},{"type":"char *","name":"dst_refname","comments":" The name of the reference to update on the server"},{"type":"git_oid","name":"src","comments":" The current target of the reference"},{"type":"git_oid","name":"dst","comments":" The new target for the reference"}],"used":{"returns":[],"needs":[]}}],["git_rebase",{"decl":"git_rebase","type":"struct","value":"git_rebase","file":"types.h","line":187,"lineto":187,"tdef":"typedef","description":" Representation of a rebase ","comments":"","used":{"returns":[],"needs":["git_rebase_abort","git_rebase_commit","git_rebase_finish","git_rebase_free","git_rebase_init","git_rebase_next","git_rebase_open","git_rebase_operation_byindex","git_rebase_operation_current","git_rebase_operation_entrycount"]}}],["git_rebase_operation",{"decl":["git_rebase_operation_t type","const git_oid id","const char * exec"],"type":"struct","value":"git_rebase_operation","file":"rebase.h","line":115,"lineto":130,"block":"git_rebase_operation_t type\nconst git_oid id\nconst char * exec","tdef":"typedef","description":" A rebase operation","comments":"

Describes a single instruction/operation to be performed during the\n rebase.

\n","fields":[{"type":"git_rebase_operation_t","name":"type","comments":" The type of rebase operation. "},{"type":"const git_oid","name":"id","comments":" The commit ID being cherry-picked. This will be populated for\n all operations except those of type `GIT_REBASE_OPERATION_EXEC`."},{"type":"const char *","name":"exec","comments":" The executable the user has requested be run. This will only\n be populated for operations of type `GIT_REBASE_OPERATION_EXEC`."}],"used":{"returns":["git_rebase_operation_byindex"],"needs":["git_rebase_next"]}}],["git_rebase_operation_t",{"decl":["GIT_REBASE_OPERATION_PICK","GIT_REBASE_OPERATION_REWORD","GIT_REBASE_OPERATION_EDIT","GIT_REBASE_OPERATION_SQUASH","GIT_REBASE_OPERATION_FIXUP","GIT_REBASE_OPERATION_EXEC"],"type":"enum","file":"rebase.h","line":64,"lineto":100,"block":"GIT_REBASE_OPERATION_PICK\nGIT_REBASE_OPERATION_REWORD\nGIT_REBASE_OPERATION_EDIT\nGIT_REBASE_OPERATION_SQUASH\nGIT_REBASE_OPERATION_FIXUP\nGIT_REBASE_OPERATION_EXEC","tdef":"typedef","description":" Type of rebase operation in-progress after calling `git_rebase_next`.","comments":"","fields":[{"type":"int","name":"GIT_REBASE_OPERATION_PICK","comments":"

The given commit is to be cherry-picked. The client should commit\n the changes and continue if there are no conflicts.

\n","value":0},{"type":"int","name":"GIT_REBASE_OPERATION_REWORD","comments":"

The given commit is to be cherry-picked, but the client should prompt\n the user to provide an updated commit message.

\n","value":1},{"type":"int","name":"GIT_REBASE_OPERATION_EDIT","comments":"

The given commit is to be cherry-picked, but the client should stop\n to allow the user to edit the changes before committing them.

\n","value":2},{"type":"int","name":"GIT_REBASE_OPERATION_SQUASH","comments":"

The given commit is to be squashed into the previous commit. The\n commit message will be merged with the previous message.

\n","value":3},{"type":"int","name":"GIT_REBASE_OPERATION_FIXUP","comments":"

The given commit is to be squashed into the previous commit. The\n commit message from this commit will be discarded.

\n","value":4},{"type":"int","name":"GIT_REBASE_OPERATION_EXEC","comments":"

No commit will be cherry-picked. The client should run the given\n command and (if successful) continue.

\n","value":5}],"used":{"returns":[],"needs":[]}}],["git_ref_t",{"decl":["GIT_REF_INVALID","GIT_REF_OID","GIT_REF_SYMBOLIC","GIT_REF_LISTALL"],"type":"enum","file":"types.h","line":190,"lineto":195,"block":"GIT_REF_INVALID\nGIT_REF_OID\nGIT_REF_SYMBOLIC\nGIT_REF_LISTALL","tdef":"typedef","description":" Basic type of any Git reference. ","comments":"","fields":[{"type":"int","name":"GIT_REF_INVALID","comments":"

Invalid reference

\n","value":0},{"type":"int","name":"GIT_REF_OID","comments":"

A reference which points at an object id

\n","value":1},{"type":"int","name":"GIT_REF_SYMBOLIC","comments":"

A reference which points at another reference

\n","value":2},{"type":"int","name":"GIT_REF_LISTALL","comments":"","value":3}],"used":{"returns":[],"needs":[]}}],["git_refdb",{"decl":"git_refdb","type":"struct","value":"git_refdb","file":"types.h","line":96,"lineto":96,"tdef":"typedef","description":" An open refs database handle. ","comments":"","used":{"returns":[],"needs":["git_refdb_compress","git_refdb_free","git_refdb_new","git_refdb_open","git_refdb_set_backend","git_repository_refdb","git_repository_set_refdb"]}}],["git_refdb_backend",{"decl":"git_refdb_backend","type":"struct","value":"git_refdb_backend","file":"types.h","line":99,"lineto":99,"block":"unsigned int version\nint (*)(int *, git_refdb_backend *, const char *) exists\nint (*)(git_reference **, git_refdb_backend *, const char *) lookup\nint (*)(git_reference_iterator **, struct git_refdb_backend *, const char *) iterator\nint (*)(git_refdb_backend *, const git_reference *, int, const git_signature *, const char *, const git_oid *, const char *) write\nint (*)(git_reference **, git_refdb_backend *, const char *, const char *, int, const git_signature *, const char *) rename\nint (*)(git_refdb_backend *, const char *, const git_oid *, const char *) del\nint (*)(git_refdb_backend *) compress\nint (*)(git_refdb_backend *, const char *) has_log\nint (*)(git_refdb_backend *, const char *) ensure_log\nvoid (*)(git_refdb_backend *) free\nint (*)(git_reflog **, git_refdb_backend *, const char *) reflog_read\nint (*)(git_refdb_backend *, git_reflog *) reflog_write\nint (*)(git_refdb_backend *, const char *, const char *) reflog_rename\nint (*)(git_refdb_backend *, const char *) reflog_delete\nint (*)(void **, git_refdb_backend *, const char *) lock\nint (*)(git_refdb_backend *, void *, int, int, const git_reference *, const git_signature *, const char *) unlock","tdef":"typedef","description":" A custom backend for refs ","comments":"","fields":[{"type":"unsigned int","name":"version","comments":""},{"type":"int (*)(int *, git_refdb_backend *, const char *)","name":"exists","comments":" Queries the refdb backend to determine if the given ref_name\n exists. A refdb implementation must provide this function."},{"type":"int (*)(git_reference **, git_refdb_backend *, const char *)","name":"lookup","comments":" Queries the refdb backend for a given reference. A refdb\n implementation must provide this function."},{"type":"int (*)(git_reference_iterator **, struct git_refdb_backend *, const char *)","name":"iterator","comments":" Allocate an iterator object for the backend.\n\n A refdb implementation must provide this function."},{"type":"int (*)(git_refdb_backend *, const git_reference *, int, const git_signature *, const char *, const git_oid *, const char *)","name":"write","comments":""},{"type":"int (*)(git_reference **, git_refdb_backend *, const char *, const char *, int, const git_signature *, const char *)","name":"rename","comments":""},{"type":"int (*)(git_refdb_backend *, const char *, const git_oid *, const char *)","name":"del","comments":" Deletes the given reference from the refdb. A refdb implementation\n must provide this function."},{"type":"int (*)(git_refdb_backend *)","name":"compress","comments":" Suggests that the given refdb compress or optimize its references.\n This mechanism is implementation specific. (For on-disk reference\n databases, this may pack all loose references.) A refdb\n implementation may provide this function; if it is not provided,\n nothing will be done."},{"type":"int (*)(git_refdb_backend *, const char *)","name":"has_log","comments":" Query whether a particular reference has a log (may be empty)"},{"type":"int (*)(git_refdb_backend *, const char *)","name":"ensure_log","comments":" Make sure a particular reference will have a reflog which\n will be appended to on writes."},{"type":"void (*)(git_refdb_backend *)","name":"free","comments":" Frees any resources held by the refdb. A refdb implementation may\n provide this function; if it is not provided, nothing will be done."},{"type":"int (*)(git_reflog **, git_refdb_backend *, const char *)","name":"reflog_read","comments":" Read the reflog for the given reference name."},{"type":"int (*)(git_refdb_backend *, git_reflog *)","name":"reflog_write","comments":" Write a reflog to disk."},{"type":"int (*)(git_refdb_backend *, const char *, const char *)","name":"reflog_rename","comments":" Rename a reflog"},{"type":"int (*)(git_refdb_backend *, const char *)","name":"reflog_delete","comments":" Remove a reflog."},{"type":"int (*)(void **, git_refdb_backend *, const char *)","name":"lock","comments":" Lock a reference. The opaque parameter will be passed to the unlock function"},{"type":"int (*)(git_refdb_backend *, void *, int, int, const git_reference *, const git_signature *, const char *)","name":"unlock","comments":" Unlock a reference. Only one of target or symbolic_target\n will be set. success indicates whether to update the\n reference or discard the lock (if it's false)"}],"used":{"returns":[],"needs":["git_refdb_backend_fs","git_refdb_init_backend","git_refdb_set_backend"]}}],["git_reference",{"decl":"git_reference","type":"struct","value":"git_reference","file":"types.h","line":169,"lineto":169,"tdef":"typedef","description":" In-memory representation of a reference. ","comments":"","used":{"returns":["git_reference__alloc","git_reference__alloc_symbolic"],"needs":["git_annotated_commit_from_ref","git_branch_create","git_branch_create_from_annotated","git_branch_delete","git_branch_is_head","git_branch_lookup","git_branch_move","git_branch_name","git_branch_next","git_branch_set_upstream","git_branch_upstream","git_reference_cmp","git_reference_create","git_reference_create_matching","git_reference_delete","git_reference_dwim","git_reference_free","git_reference_is_branch","git_reference_is_note","git_reference_is_remote","git_reference_is_tag","git_reference_lookup","git_reference_name","git_reference_next","git_reference_owner","git_reference_peel","git_reference_rename","git_reference_resolve","git_reference_set_target","git_reference_shorthand","git_reference_symbolic_create","git_reference_symbolic_create_matching","git_reference_symbolic_set_target","git_reference_symbolic_target","git_reference_target","git_reference_target_peel","git_reference_type","git_repository_head","git_revparse_ext"]}}],["git_reference_iterator",{"decl":"git_reference_iterator","type":"struct","value":"git_reference_iterator","file":"types.h","line":172,"lineto":172,"block":"git_refdb * db\nint (*)(git_reference **, git_reference_iterator *) next\nint (*)(const char **, git_reference_iterator *) next_name\nvoid (*)(git_reference_iterator *) free","tdef":"typedef","description":" Iterator for references ","comments":"","fields":[{"type":"git_refdb *","name":"db","comments":""},{"type":"int (*)(git_reference **, git_reference_iterator *)","name":"next","comments":" Return the current reference and advance the iterator."},{"type":"int (*)(const char **, git_reference_iterator *)","name":"next_name","comments":" Return the name of the current reference and advance the iterator"},{"type":"void (*)(git_reference_iterator *)","name":"free","comments":" Free the iterator"}],"used":{"returns":[],"needs":["git_reference_iterator_free","git_reference_iterator_glob_new","git_reference_iterator_new","git_reference_next","git_reference_next_name"]}}],["git_reference_normalize_t",{"decl":["GIT_REF_FORMAT_NORMAL","GIT_REF_FORMAT_ALLOW_ONELEVEL","GIT_REF_FORMAT_REFSPEC_PATTERN","GIT_REF_FORMAT_REFSPEC_SHORTHAND"],"type":"enum","file":"refs.h","line":625,"lineto":654,"block":"GIT_REF_FORMAT_NORMAL\nGIT_REF_FORMAT_ALLOW_ONELEVEL\nGIT_REF_FORMAT_REFSPEC_PATTERN\nGIT_REF_FORMAT_REFSPEC_SHORTHAND","tdef":"typedef","description":" Normalization options for reference lookup","comments":"","fields":[{"type":"int","name":"GIT_REF_FORMAT_NORMAL","comments":"

No particular normalization.

\n","value":0},{"type":"int","name":"GIT_REF_FORMAT_ALLOW_ONELEVEL","comments":"

Control whether one-level refnames are accepted\n (i.e., refnames that do not contain multiple /-separated\n components). Those are expected to be written only using\n uppercase letters and underscore (FETCH_HEAD, ...)

\n","value":1},{"type":"int","name":"GIT_REF_FORMAT_REFSPEC_PATTERN","comments":"

Interpret the provided name as a reference pattern for a\n refspec (as used with remote repositories). If this option\n is enabled, the name is allowed to contain a single * (\n<star

\n\n
\n

)\n in place of a one full pathname component\n (e.g., foo/\n<star\n/bar but not foo/bar\n<star\n).

\n
\n","value":2},{"type":"int","name":"GIT_REF_FORMAT_REFSPEC_SHORTHAND","comments":"

Interpret the name as part of a refspec in shorthand form\n so the ONELEVEL naming rules aren't enforced and 'master'\n becomes a valid name.

\n","value":4}],"used":{"returns":[],"needs":[]}}],["git_reflog",{"decl":"git_reflog","type":"struct","value":"git_reflog","file":"types.h","line":147,"lineto":147,"tdef":"typedef","description":" Representation of a reference log ","comments":"","used":{"returns":[],"needs":["git_reflog_append","git_reflog_drop","git_reflog_entry_byindex","git_reflog_entrycount","git_reflog_free","git_reflog_read","git_reflog_write"]}}],["git_reflog_entry",{"decl":"git_reflog_entry","type":"struct","value":"git_reflog_entry","file":"types.h","line":144,"lineto":144,"tdef":"typedef","description":" Representation of a reference log entry ","comments":"","used":{"returns":["git_reflog_entry_byindex"],"needs":["git_reflog_entry_committer","git_reflog_entry_id_new","git_reflog_entry_id_old","git_reflog_entry_message"]}}],["git_remote",{"decl":"git_remote","type":"struct","value":"git_remote","file":"types.h","line":224,"lineto":224,"tdef":"typedef","description":" Git's idea of a remote repository. A remote can be anonymous (in\n which case it does not have backing configuration entires).","comments":"","used":{"returns":[],"needs":["git_remote_autotag","git_remote_connect","git_remote_connected","git_remote_create","git_remote_create_anonymous","git_remote_create_with_fetchspec","git_remote_default_branch","git_remote_disconnect","git_remote_download","git_remote_dup","git_remote_fetch","git_remote_free","git_remote_get_fetch_refspecs","git_remote_get_push_refspecs","git_remote_get_refspec","git_remote_lookup","git_remote_ls","git_remote_name","git_remote_owner","git_remote_prune","git_remote_prune_refs","git_remote_push","git_remote_pushurl","git_remote_refspec_count","git_remote_stats","git_remote_stop","git_remote_update_tips","git_remote_upload","git_remote_url","git_transport_dummy","git_transport_local","git_transport_new","git_transport_smart","git_transport_ssh_with_paths"]}}],["git_remote_autotag_option_t",{"decl":["GIT_REMOTE_DOWNLOAD_TAGS_UNSPECIFIED","GIT_REMOTE_DOWNLOAD_TAGS_AUTO","GIT_REMOTE_DOWNLOAD_TAGS_NONE","GIT_REMOTE_DOWNLOAD_TAGS_ALL"],"type":"enum","file":"remote.h","line":494,"lineto":512,"block":"GIT_REMOTE_DOWNLOAD_TAGS_UNSPECIFIED\nGIT_REMOTE_DOWNLOAD_TAGS_AUTO\nGIT_REMOTE_DOWNLOAD_TAGS_NONE\nGIT_REMOTE_DOWNLOAD_TAGS_ALL","tdef":"typedef","description":" Automatic tag following option","comments":"

Lets us select the --tags option to use.

\n","fields":[{"type":"int","name":"GIT_REMOTE_DOWNLOAD_TAGS_UNSPECIFIED","comments":"

Use the setting from the configuration.

\n","value":0},{"type":"int","name":"GIT_REMOTE_DOWNLOAD_TAGS_AUTO","comments":"

Ask the server for tags pointing to objects we're already\n downloading.

\n","value":1},{"type":"int","name":"GIT_REMOTE_DOWNLOAD_TAGS_NONE","comments":"

Don't ask for any tags beyond the refspecs.

\n","value":2},{"type":"int","name":"GIT_REMOTE_DOWNLOAD_TAGS_ALL","comments":"

Ask for the all the tags.

\n","value":3}],"used":{"returns":[],"needs":["git_remote_set_autotag","git_remote_update_tips"]}}],["git_remote_callbacks",{"decl":["unsigned int version","git_transport_message_cb sideband_progress","int (*)(git_remote_completion_type, void *) completion","git_cred_acquire_cb credentials","git_transport_certificate_check_cb certificate_check","git_transfer_progress_cb transfer_progress","int (*)(const char *, const git_oid *, const git_oid *, void *) update_tips","git_packbuilder_progress pack_progress","git_push_transfer_progress push_transfer_progress","int (*)(const char *, const char *, void *) push_update_reference","git_push_negotiation push_negotiation","git_transport_cb transport","void * payload"],"type":"struct","value":"git_remote_callbacks","file":"remote.h","line":373,"lineto":457,"block":"unsigned int version\ngit_transport_message_cb sideband_progress\nint (*)(git_remote_completion_type, void *) completion\ngit_cred_acquire_cb credentials\ngit_transport_certificate_check_cb certificate_check\ngit_transfer_progress_cb transfer_progress\nint (*)(const char *, const git_oid *, const git_oid *, void *) update_tips\ngit_packbuilder_progress pack_progress\ngit_push_transfer_progress push_transfer_progress\nint (*)(const char *, const char *, void *) push_update_reference\ngit_push_negotiation push_negotiation\ngit_transport_cb transport\nvoid * payload","tdef":null,"description":" The callback settings structure","comments":"

Set the callbacks to be called by the remote when informing the user\n about the progress of the network operations.

\n","fields":[{"type":"unsigned int","name":"version","comments":""},{"type":"git_transport_message_cb","name":"sideband_progress","comments":" Textual progress from the remote. Text send over the\n progress side-band will be passed to this function (this is\n the 'counting objects' output."},{"type":"int (*)(git_remote_completion_type, void *)","name":"completion","comments":" Completion is called when different parts of the download\n process are done (currently unused)."},{"type":"git_cred_acquire_cb","name":"credentials","comments":" This will be called if the remote host requires\n authentication in order to connect to it.\n\n Returning GIT_PASSTHROUGH will make libgit2 behave as\n though this field isn't set."},{"type":"git_transport_certificate_check_cb","name":"certificate_check","comments":" If cert verification fails, this will be called to let the\n user make the final decision of whether to allow the\n connection to proceed. Returns 1 to allow the connection, 0\n to disallow it or a negative value to indicate an error."},{"type":"git_transfer_progress_cb","name":"transfer_progress","comments":" During the download of new data, this will be regularly\n called with the current count of progress done by the\n indexer."},{"type":"int (*)(const char *, const git_oid *, const git_oid *, void *)","name":"update_tips","comments":" Each time a reference is updated locally, this function\n will be called with information about it."},{"type":"git_packbuilder_progress","name":"pack_progress","comments":" Function to call with progress information during pack\n building. Be aware that this is called inline with pack\n building operations, so performance may be affected."},{"type":"git_push_transfer_progress","name":"push_transfer_progress","comments":" Function to call with progress information during the\n upload portion of a push. Be aware that this is called\n inline with pack building operations, so performance may be\n affected."},{"type":"int (*)(const char *, const char *, void *)","name":"push_update_reference","comments":" Called for each updated reference on push. If `status` is\n not `NULL`, the update was rejected by the remote server\n and `status` contains the reason given."},{"type":"git_push_negotiation","name":"push_negotiation","comments":" Called once between the negotiation step and the upload. It\n provides information about what updates will be performed."},{"type":"git_transport_cb","name":"transport","comments":" Create the transport to use for this operation. Leave NULL\n to auto-detect."},{"type":"void *","name":"payload","comments":" This will be passed to each of the callbacks in this struct\n as the last parameter."}],"used":{"returns":[],"needs":["git_remote_connect","git_remote_init_callbacks","git_remote_prune","git_remote_update_tips"]}}],["git_remote_completion_type",{"decl":["GIT_REMOTE_COMPLETION_DOWNLOAD","GIT_REMOTE_COMPLETION_INDEXING","GIT_REMOTE_COMPLETION_ERROR"],"type":"enum","file":"remote.h","line":325,"lineto":329,"block":"GIT_REMOTE_COMPLETION_DOWNLOAD\nGIT_REMOTE_COMPLETION_INDEXING\nGIT_REMOTE_COMPLETION_ERROR\nGIT_REMOTE_COMPLETION_DOWNLOAD\nGIT_REMOTE_COMPLETION_INDEXING\nGIT_REMOTE_COMPLETION_ERROR","tdef":"typedef","description":" Argument to the completion callback which tells it which operation\n finished.","comments":"","fields":[{"type":"int","name":"GIT_REMOTE_COMPLETION_DOWNLOAD","comments":"","value":0},{"type":"int","name":"GIT_REMOTE_COMPLETION_INDEXING","comments":"","value":1},{"type":"int","name":"GIT_REMOTE_COMPLETION_ERROR","comments":"","value":2}],"used":{"returns":[],"needs":[]}}],["git_remote_head",{"decl":["int local","git_oid oid","git_oid loid","char * name","char * symref_target"],"type":"struct","value":"git_remote_head","file":"net.h","line":40,"lineto":50,"block":"int local\ngit_oid oid\ngit_oid loid\nchar * name\nchar * symref_target","tdef":null,"description":" Description of a reference advertised by a remote server, given out\n on `ls` calls.","comments":"","fields":[{"type":"int","name":"local","comments":""},{"type":"git_oid","name":"oid","comments":""},{"type":"git_oid","name":"loid","comments":""},{"type":"char *","name":"name","comments":""},{"type":"char *","name":"symref_target","comments":" If the server send a symref mapping for this ref, this will\n point to the target."}],"used":{"returns":[],"needs":["git_remote_ls"]}}],["git_repository",{"decl":"git_repository","type":"struct","value":"git_repository","file":"types.h","line":105,"lineto":105,"tdef":"typedef","description":" Representation of an existing git repository,\n including all its object contents","comments":"","used":{"returns":["git_blob_owner","git_commit_owner","git_filter_source_repo","git_index_owner","git_object_owner","git_reference_owner","git_remote_owner","git_revwalk_repository","git_submodule_owner","git_tag_owner","git_tree_owner"],"needs":["git_annotated_commit_from_fetchhead","git_annotated_commit_from_ref","git_annotated_commit_from_revspec","git_annotated_commit_lookup","git_attr_add_macro","git_attr_cache_flush","git_attr_foreach","git_attr_get","git_attr_get_many","git_blame_file","git_blob_create_frombuffer","git_blob_create_fromchunks","git_blob_create_fromdisk","git_blob_create_fromworkdir","git_blob_lookup","git_blob_lookup_prefix","git_branch_create","git_branch_create_from_annotated","git_branch_iterator_new","git_branch_lookup","git_checkout_head","git_checkout_index","git_checkout_tree","git_cherrypick","git_cherrypick_commit","git_clone","git_commit_create","git_commit_create_from_callback","git_commit_create_from_ids","git_commit_create_v","git_commit_lookup","git_commit_lookup_prefix","git_describe_workdir","git_diff_commit_as_email","git_diff_index_to_workdir","git_diff_tree_to_index","git_diff_tree_to_tree","git_diff_tree_to_workdir","git_diff_tree_to_workdir_with_index","git_filter_list_apply_to_file","git_filter_list_load","git_filter_list_new","git_filter_list_stream_file","git_graph_ahead_behind","git_graph_descendant_of","git_ignore_add_rule","git_ignore_clear_internal_rules","git_ignore_path_is_ignored","git_index_write_tree_to","git_merge","git_merge_analysis","git_merge_base","git_merge_base_many","git_merge_base_octopus","git_merge_bases","git_merge_bases_many","git_merge_commits","git_merge_file_from_index","git_merge_trees","git_note_create","git_note_foreach","git_note_iterator_new","git_note_read","git_note_remove","git_object_lookup","git_object_lookup_prefix","git_packbuilder_new","git_pathspec_match_workdir","git_rebase_init","git_rebase_open","git_refdb_backend_fs","git_refdb_new","git_refdb_open","git_reference_create","git_reference_create_matching","git_reference_dwim","git_reference_ensure_log","git_reference_foreach","git_reference_foreach_glob","git_reference_foreach_name","git_reference_has_log","git_reference_iterator_glob_new","git_reference_iterator_new","git_reference_list","git_reference_lookup","git_reference_name_to_id","git_reference_remove","git_reference_symbolic_create","git_reference_symbolic_create_matching","git_reflog_delete","git_reflog_read","git_reflog_rename","git_remote_add_fetch","git_remote_add_push","git_remote_create","git_remote_create_anonymous","git_remote_create_with_fetchspec","git_remote_delete","git_remote_list","git_remote_lookup","git_remote_rename","git_remote_set_autotag","git_remote_set_pushurl","git_remote_set_url","git_repository__cleanup","git_repository_config","git_repository_config_snapshot","git_repository_detach_head","git_repository_fetchhead_foreach","git_repository_free","git_repository_get_namespace","git_repository_hashfile","git_repository_head","git_repository_head_detached","git_repository_head_unborn","git_repository_ident","git_repository_index","git_repository_init","git_repository_init_ext","git_repository_is_bare","git_repository_is_empty","git_repository_is_shallow","git_repository_mergehead_foreach","git_repository_message","git_repository_message_remove","git_repository_new","git_repository_odb","git_repository_open","git_repository_open_bare","git_repository_open_ext","git_repository_path","git_repository_refdb","git_repository_reinit_filesystem","git_repository_set_bare","git_repository_set_config","git_repository_set_head","git_repository_set_head_detached","git_repository_set_head_detached_from_annotated","git_repository_set_ident","git_repository_set_index","git_repository_set_namespace","git_repository_set_odb","git_repository_set_refdb","git_repository_set_workdir","git_repository_state","git_repository_state_cleanup","git_repository_workdir","git_repository_wrap_odb","git_reset","git_reset_default","git_reset_from_annotated","git_revert","git_revert_commit","git_revparse","git_revparse_ext","git_revparse_single","git_revwalk_new","git_signature_default","git_stash_apply","git_stash_drop","git_stash_foreach","git_stash_pop","git_status_file","git_status_foreach","git_status_foreach_ext","git_status_list_new","git_status_should_ignore","git_submodule_add_setup","git_submodule_foreach","git_submodule_lookup","git_submodule_open","git_submodule_repo_init","git_submodule_resolve_url","git_submodule_set_branch","git_submodule_set_fetch_recurse_submodules","git_submodule_set_ignore","git_submodule_set_update","git_submodule_set_url","git_submodule_status","git_tag_annotation_create","git_tag_create","git_tag_create_frombuffer","git_tag_create_lightweight","git_tag_delete","git_tag_foreach","git_tag_list","git_tag_list_match","git_tag_lookup","git_tag_lookup_prefix","git_tree_entry_to_object","git_tree_lookup","git_tree_lookup_prefix","git_treebuilder_new"]}}],["git_repository_init_flag_t",{"decl":["GIT_REPOSITORY_INIT_BARE","GIT_REPOSITORY_INIT_NO_REINIT","GIT_REPOSITORY_INIT_NO_DOTGIT_DIR","GIT_REPOSITORY_INIT_MKDIR","GIT_REPOSITORY_INIT_MKPATH","GIT_REPOSITORY_INIT_EXTERNAL_TEMPLATE","GIT_REPOSITORY_INIT_RELATIVE_GITLINK"],"type":"enum","file":"repository.h","line":202,"lineto":210,"block":"GIT_REPOSITORY_INIT_BARE\nGIT_REPOSITORY_INIT_NO_REINIT\nGIT_REPOSITORY_INIT_NO_DOTGIT_DIR\nGIT_REPOSITORY_INIT_MKDIR\nGIT_REPOSITORY_INIT_MKPATH\nGIT_REPOSITORY_INIT_EXTERNAL_TEMPLATE\nGIT_REPOSITORY_INIT_RELATIVE_GITLINK","tdef":"typedef","description":" Option flags for `git_repository_init_ext`.","comments":"

These flags configure extra behaviors to git_repository_init_ext.\n In every case, the default behavior is the zero value (i.e. flag is\n not set). Just OR the flag values together for the flags parameter\n when initializing a new repo. Details of individual values are:

\n\n
    \n
  • BARE - Create a bare repository with no working directory.
    • \n
  • NO_REINIT - Return an GIT_EEXISTS error if the repo_path appears to\n already be an git repository.
    • \n
  • NO_DOTGIT_DIR - Normally a "/.git/" will be appended to the repo\n path for non-bare repos (if it is not already there), but\n passing this flag prevents that behavior.
    • \n
  • MKDIR - Make the repo_path (and workdir_path) as needed. Init is\n always willing to create the ".git" directory even without this\n flag. This flag tells init to create the trailing component of\n the repo and workdir paths as needed.
    • \n
  • MKPATH - Recursively make all components of the repo and workdir\n paths as necessary.
    • \n
  • EXTERNAL_TEMPLATE - libgit2 normally uses internal templates to\n initialize a new repo. This flags enables external templates,\n looking the "template_path" from the options if set, or the\n init.templatedir global config if not, or falling back on\n "/usr/share/git-core/templates" if it exists.
    • \n
  • GIT_REPOSITORY_INIT_RELATIVE_GITLINK - If an alternate workdir is\n specified, use relative paths for the gitdir and core.worktree.
    • \n
\n","fields":[{"type":"int","name":"GIT_REPOSITORY_INIT_BARE","comments":"","value":1},{"type":"int","name":"GIT_REPOSITORY_INIT_NO_REINIT","comments":"","value":2},{"type":"int","name":"GIT_REPOSITORY_INIT_NO_DOTGIT_DIR","comments":"","value":4},{"type":"int","name":"GIT_REPOSITORY_INIT_MKDIR","comments":"","value":8},{"type":"int","name":"GIT_REPOSITORY_INIT_MKPATH","comments":"","value":16},{"type":"int","name":"GIT_REPOSITORY_INIT_EXTERNAL_TEMPLATE","comments":"","value":32},{"type":"int","name":"GIT_REPOSITORY_INIT_RELATIVE_GITLINK","comments":"","value":64}],"used":{"returns":[],"needs":[]}}],["git_repository_init_mode_t",{"decl":["GIT_REPOSITORY_INIT_SHARED_UMASK","GIT_REPOSITORY_INIT_SHARED_GROUP","GIT_REPOSITORY_INIT_SHARED_ALL"],"type":"enum","file":"repository.h","line":225,"lineto":229,"block":"GIT_REPOSITORY_INIT_SHARED_UMASK\nGIT_REPOSITORY_INIT_SHARED_GROUP\nGIT_REPOSITORY_INIT_SHARED_ALL","tdef":"typedef","description":" Mode options for `git_repository_init_ext`.","comments":"

Set the mode field of the git_repository_init_options structure\n either to the custom mode that you would like, or to one of the\n following modes:

\n\n
    \n
  • SHARED_UMASK - Use permissions configured by umask - the default.
    • \n
  • SHARED_GROUP - Use "--shared=group" behavior, chmod'ing the new repo\n to be group writable and "g+sx" for sticky group assignment.
    • \n
  • SHARED_ALL - Use "--shared=all" behavior, adding world readability.
    • \n
  • Anything else - Set to custom value.
    • \n
\n","fields":[{"type":"int","name":"GIT_REPOSITORY_INIT_SHARED_UMASK","comments":"","value":0},{"type":"int","name":"GIT_REPOSITORY_INIT_SHARED_GROUP","comments":"","value":1533},{"type":"int","name":"GIT_REPOSITORY_INIT_SHARED_ALL","comments":"","value":1535}],"used":{"returns":[],"needs":[]}}],["git_repository_init_options",{"decl":["unsigned int version","uint32_t flags","uint32_t mode","const char * workdir_path","const char * description","const char * template_path","const char * initial_head","const char * origin_url"],"type":"struct","value":"git_repository_init_options","file":"repository.h","line":259,"lineto":268,"block":"unsigned int version\nuint32_t flags\nuint32_t mode\nconst char * workdir_path\nconst char * description\nconst char * template_path\nconst char * initial_head\nconst char * origin_url","tdef":"typedef","description":" Extended options structure for `git_repository_init_ext`.","comments":"

This contains extra options for git_repository_init_ext that enable\n additional initialization features. The fields are:

\n\n
    \n
  • flags - Combination of GIT_REPOSITORY_INIT flags above.
    • \n
  • mode - Set to one of the standard GIT_REPOSITORY_INIT_SHARED_...\n constants above, or to a custom value that you would like.
    • \n
  • workdir_path - The path to the working dir or NULL for default (i.e.\n repo_path parent on non-bare repos). IF THIS IS RELATIVE PATH,\n IT WILL BE EVALUATED RELATIVE TO THE REPO_PATH. If this is not\n the "natural" working directory, a .git gitlink file will be\n created here linking to the repo_path.
    • \n
  • description - If set, this will be used to initialize the "description"\n file in the repository, instead of using the template content.
    • \n
  • template_path - When GIT_REPOSITORY_INIT_EXTERNAL_TEMPLATE is set,\n this contains the path to use for the template directory. If\n this is NULL, the config or default directory options will be\n used instead.
    • \n
  • initial_head - The name of the head to point HEAD at. If NULL, then\n this will be treated as "master" and the HEAD ref will be set\n to "refs/heads/master". If this begins with "refs/" it will be\n used verbatim; otherwise "refs/heads/" will be prefixed.
    • \n
  • origin_url - If this is non-NULL, then after the rest of the\n repository initialization is completed, an "origin" remote\n will be added pointing to this URL.
    • \n
\n","fields":[{"type":"unsigned int","name":"version","comments":""},{"type":"uint32_t","name":"flags","comments":""},{"type":"uint32_t","name":"mode","comments":""},{"type":"const char *","name":"workdir_path","comments":""},{"type":"const char *","name":"description","comments":""},{"type":"const char *","name":"template_path","comments":""},{"type":"const char *","name":"initial_head","comments":""},{"type":"const char *","name":"origin_url","comments":""}],"used":{"returns":[],"needs":["git_repository_init_ext","git_repository_init_init_options"]}}],["git_repository_open_flag_t",{"decl":["GIT_REPOSITORY_OPEN_NO_SEARCH","GIT_REPOSITORY_OPEN_CROSS_FS","GIT_REPOSITORY_OPEN_BARE"],"type":"enum","file":"repository.h","line":99,"lineto":103,"block":"GIT_REPOSITORY_OPEN_NO_SEARCH\nGIT_REPOSITORY_OPEN_CROSS_FS\nGIT_REPOSITORY_OPEN_BARE","tdef":"typedef","description":" Option flags for `git_repository_open_ext`.","comments":"
    \n
  • GIT_REPOSITORY_OPEN_NO_SEARCH - Only open the repository if it can be\nimmediately found in the start_path. Do not walk up from the\nstart_path looking at parent directories.
    • \n
  • GIT_REPOSITORY_OPEN_CROSS_FS - Unless this flag is set, open will not\ncontinue searching across filesystem boundaries (i.e. when st_dev\nchanges from the stat system call). (E.g. Searching in a user's home\ndirectory "/home/user/source/" will not return "/.git/" as the found\nrepo if "/" is a different filesystem than "/home".)
    • \n
  • GIT_REPOSITORY_OPEN_BARE - Open repository as a bare repo regardless\nof core.bare config, and defer loading config file for faster setup.\nUnlike git_repository_open_bare, this can follow gitlinks.
    • \n
\n","fields":[{"type":"int","name":"GIT_REPOSITORY_OPEN_NO_SEARCH","comments":"","value":1},{"type":"int","name":"GIT_REPOSITORY_OPEN_CROSS_FS","comments":"","value":2},{"type":"int","name":"GIT_REPOSITORY_OPEN_BARE","comments":"","value":4}],"used":{"returns":[],"needs":[]}}],["git_repository_state_t",{"decl":["GIT_REPOSITORY_STATE_NONE","GIT_REPOSITORY_STATE_MERGE","GIT_REPOSITORY_STATE_REVERT","GIT_REPOSITORY_STATE_CHERRYPICK","GIT_REPOSITORY_STATE_BISECT","GIT_REPOSITORY_STATE_REBASE","GIT_REPOSITORY_STATE_REBASE_INTERACTIVE","GIT_REPOSITORY_STATE_REBASE_MERGE","GIT_REPOSITORY_STATE_APPLY_MAILBOX","GIT_REPOSITORY_STATE_APPLY_MAILBOX_OR_REBASE"],"type":"enum","file":"repository.h","line":674,"lineto":685,"block":"GIT_REPOSITORY_STATE_NONE\nGIT_REPOSITORY_STATE_MERGE\nGIT_REPOSITORY_STATE_REVERT\nGIT_REPOSITORY_STATE_CHERRYPICK\nGIT_REPOSITORY_STATE_BISECT\nGIT_REPOSITORY_STATE_REBASE\nGIT_REPOSITORY_STATE_REBASE_INTERACTIVE\nGIT_REPOSITORY_STATE_REBASE_MERGE\nGIT_REPOSITORY_STATE_APPLY_MAILBOX\nGIT_REPOSITORY_STATE_APPLY_MAILBOX_OR_REBASE","tdef":"typedef","description":" Repository state","comments":"

These values represent possible states for the repository to be in,\n based on the current operation which is ongoing.

\n","fields":[{"type":"int","name":"GIT_REPOSITORY_STATE_NONE","comments":"","value":0},{"type":"int","name":"GIT_REPOSITORY_STATE_MERGE","comments":"","value":1},{"type":"int","name":"GIT_REPOSITORY_STATE_REVERT","comments":"","value":2},{"type":"int","name":"GIT_REPOSITORY_STATE_CHERRYPICK","comments":"","value":3},{"type":"int","name":"GIT_REPOSITORY_STATE_BISECT","comments":"","value":4},{"type":"int","name":"GIT_REPOSITORY_STATE_REBASE","comments":"","value":5},{"type":"int","name":"GIT_REPOSITORY_STATE_REBASE_INTERACTIVE","comments":"","value":6},{"type":"int","name":"GIT_REPOSITORY_STATE_REBASE_MERGE","comments":"","value":7},{"type":"int","name":"GIT_REPOSITORY_STATE_APPLY_MAILBOX","comments":"","value":8},{"type":"int","name":"GIT_REPOSITORY_STATE_APPLY_MAILBOX_OR_REBASE","comments":"","value":9}],"used":{"returns":[],"needs":[]}}],["git_reset_t",{"decl":["GIT_RESET_SOFT","GIT_RESET_MIXED","GIT_RESET_HARD"],"type":"enum","file":"reset.h","line":26,"lineto":30,"block":"GIT_RESET_SOFT\nGIT_RESET_MIXED\nGIT_RESET_HARD","tdef":"typedef","description":" Kinds of reset operation","comments":"","fields":[{"type":"int","name":"GIT_RESET_SOFT","comments":"

Move the head to the given commit

\n","value":1},{"type":"int","name":"GIT_RESET_MIXED","comments":"

SOFT plus reset index to the commit

\n","value":2},{"type":"int","name":"GIT_RESET_HARD","comments":"

MIXED plus changes in working tree discarded

\n","value":3}],"used":{"returns":[],"needs":["git_reset","git_reset_from_annotated"]}}],["git_revert_options",{"decl":["unsigned int version","unsigned int mainline","git_merge_options merge_opts","git_checkout_options checkout_opts"],"type":"struct","value":"git_revert_options","file":"revert.h","line":26,"lineto":34,"block":"unsigned int version\nunsigned int mainline\ngit_merge_options merge_opts\ngit_checkout_options checkout_opts","tdef":"typedef","description":" Options for revert","comments":"","fields":[{"type":"unsigned int","name":"version","comments":""},{"type":"unsigned int","name":"mainline","comments":" For merge commits, the \"mainline\" is treated as the parent. "},{"type":"git_merge_options","name":"merge_opts","comments":" Options for the merging "},{"type":"git_checkout_options","name":"checkout_opts","comments":" Options for the checkout "}],"used":{"returns":[],"needs":["git_revert","git_revert_init_options"]}}],["git_revparse_mode_t",{"decl":["GIT_REVPARSE_SINGLE","GIT_REVPARSE_RANGE","GIT_REVPARSE_MERGE_BASE"],"type":"enum","file":"revparse.h","line":71,"lineto":78,"block":"GIT_REVPARSE_SINGLE\nGIT_REVPARSE_RANGE\nGIT_REVPARSE_MERGE_BASE","tdef":"typedef","description":" Revparse flags. These indicate the intended behavior of the spec passed to\n git_revparse.","comments":"","fields":[{"type":"int","name":"GIT_REVPARSE_SINGLE","comments":"

The spec targeted a single object.

\n","value":1},{"type":"int","name":"GIT_REVPARSE_RANGE","comments":"

The spec targeted a range of commits.

\n","value":2},{"type":"int","name":"GIT_REVPARSE_MERGE_BASE","comments":"

The spec used the '...' operator, which invokes special semantics.

\n","value":4}],"used":{"returns":[],"needs":[]}}],["git_revspec",{"decl":["git_object * from","git_object * to","unsigned int flags"],"type":"struct","value":"git_revspec","file":"revparse.h","line":83,"lineto":90,"block":"git_object * from\ngit_object * to\nunsigned int flags","tdef":"typedef","description":" Git Revision Spec: output of a `git_revparse` operation","comments":"","fields":[{"type":"git_object *","name":"from","comments":" The left element of the revspec; must be freed by the user "},{"type":"git_object *","name":"to","comments":" The right element of the revspec; must be freed by the user "},{"type":"unsigned int","name":"flags","comments":" The intent of the revspec (i.e. `git_revparse_mode_t` flags) "}],"used":{"returns":[],"needs":["git_revparse"]}}],["git_revwalk",{"decl":"git_revwalk","type":"struct","value":"git_revwalk","file":"types.h","line":111,"lineto":111,"tdef":"typedef","description":" Representation of an in-progress walk through the commits in a repo ","comments":"","used":{"returns":[],"needs":["git_packbuilder_insert_walk","git_revwalk_add_hide_cb","git_revwalk_free","git_revwalk_hide","git_revwalk_hide_glob","git_revwalk_hide_head","git_revwalk_hide_ref","git_revwalk_new","git_revwalk_next","git_revwalk_push","git_revwalk_push_glob","git_revwalk_push_head","git_revwalk_push_range","git_revwalk_push_ref","git_revwalk_repository","git_revwalk_reset","git_revwalk_simplify_first_parent","git_revwalk_sorting"]}}],["git_signature",{"decl":["char * name","char * email","git_time when"],"type":"struct","value":"git_signature","file":"types.h","line":162,"lineto":166,"block":"char * name\nchar * email\ngit_time when","tdef":"typedef","description":" An action signature (e.g. for committers, taggers, etc) ","comments":"","fields":[{"type":"char *","name":"name","comments":" full name of the author "},{"type":"char *","name":"email","comments":" email of the author "},{"type":"git_time","name":"when","comments":" time when the action happened "}],"used":{"returns":["git_commit_author","git_commit_committer","git_note_author","git_note_committer","git_reflog_entry_committer","git_tag_tagger"],"needs":["git_commit_amend","git_commit_create","git_commit_create_from_callback","git_commit_create_from_ids","git_commit_create_v","git_note_create","git_note_remove","git_rebase_commit","git_rebase_finish","git_reflog_append","git_signature_default","git_signature_dup","git_signature_free","git_signature_new","git_signature_now","git_tag_annotation_create","git_tag_create"]}}],["git_smart_subtransport_definition",{"decl":["git_smart_subtransport_cb callback","unsigned int rpc","void * param"],"type":"struct","value":"git_smart_subtransport_definition","file":"sys/transport.h","line":296,"lineto":309,"block":"git_smart_subtransport_cb callback\nunsigned int rpc\nvoid * param","tdef":"typedef","description":" Definition for a \"subtransport\"","comments":"

This is used to let the smart protocol code know about the protocol\n which you are implementing.

\n","fields":[{"type":"git_smart_subtransport_cb","name":"callback","comments":" The function to use to create the git_smart_subtransport "},{"type":"unsigned int","name":"rpc","comments":" True if the protocol is stateless; false otherwise. For example,\n http:// is stateless, but git:// is not."},{"type":"void *","name":"param","comments":" Param of the callback"}],"used":{"returns":[],"needs":[]}}],["git_sort_t",{"decl":["GIT_SORT_NONE","GIT_SORT_TOPOLOGICAL","GIT_SORT_TIME","GIT_SORT_REVERSE"],"type":"enum","file":"revwalk.h","line":26,"lineto":55,"block":"GIT_SORT_NONE\nGIT_SORT_TOPOLOGICAL\nGIT_SORT_TIME\nGIT_SORT_REVERSE","tdef":"typedef","description":" Flags to specify the sorting which a revwalk should perform.","comments":"","fields":[{"type":"int","name":"GIT_SORT_NONE","comments":"

Sort the repository contents in no particular ordering;\n this sorting is arbitrary, implementation-specific\n and subject to change at any time.\n This is the default sorting for new walkers.

\n","value":0},{"type":"int","name":"GIT_SORT_TOPOLOGICAL","comments":"

Sort the repository contents in topological order\n (parents before children); this sorting mode\n can be combined with time sorting.

\n","value":1},{"type":"int","name":"GIT_SORT_TIME","comments":"

Sort the repository contents by commit time;\n this sorting mode can be combined with\n topological sorting.

\n","value":2},{"type":"int","name":"GIT_SORT_REVERSE","comments":"

Iterate through the repository contents in reverse\n order; this sorting mode can be combined with\n any of the above.

\n","value":4}],"used":{"returns":[],"needs":[]}}],["git_stash_apply_flags",{"decl":["GIT_STASH_APPLY_DEFAULT","GIT_STASH_APPLY_REINSTATE_INDEX"],"type":"enum","file":"stash.h","line":74,"lineto":81,"block":"GIT_STASH_APPLY_DEFAULT\nGIT_STASH_APPLY_REINSTATE_INDEX","tdef":"typedef","description":" Stash application flags. ","comments":"","fields":[{"type":"int","name":"GIT_STASH_APPLY_DEFAULT","comments":"","value":0},{"type":"int","name":"GIT_STASH_APPLY_REINSTATE_INDEX","comments":"","value":1}],"used":{"returns":[],"needs":[]}}],["git_stash_flags",{"decl":["GIT_STASH_DEFAULT","GIT_STASH_KEEP_INDEX","GIT_STASH_INCLUDE_UNTRACKED","GIT_STASH_INCLUDE_IGNORED"],"type":"enum","file":"stash.h","line":24,"lineto":47,"block":"GIT_STASH_DEFAULT\nGIT_STASH_KEEP_INDEX\nGIT_STASH_INCLUDE_UNTRACKED\nGIT_STASH_INCLUDE_IGNORED","tdef":"typedef","description":" Stash flags","comments":"","fields":[{"type":"int","name":"GIT_STASH_DEFAULT","comments":"

No option, default

\n","value":0},{"type":"int","name":"GIT_STASH_KEEP_INDEX","comments":"

All changes already added to the index are left intact in\n the working directory

\n","value":1},{"type":"int","name":"GIT_STASH_INCLUDE_UNTRACKED","comments":"

All untracked files are also stashed and then cleaned up\n from the working directory

\n","value":2},{"type":"int","name":"GIT_STASH_INCLUDE_IGNORED","comments":"

All ignored files are also stashed and then cleaned up from\n the working directory

\n","value":4}],"used":{"returns":[],"needs":[]}}],["git_status_list",{"decl":"git_status_list","type":"struct","value":"git_status_list","file":"types.h","line":184,"lineto":184,"tdef":"typedef","description":" Representation of a status collection ","comments":"","used":{"returns":[],"needs":["git_status_byindex","git_status_list_entrycount","git_status_list_free","git_status_list_get_perfdata","git_status_list_new"]}}],["git_status_opt_t",{"decl":["GIT_STATUS_OPT_INCLUDE_UNTRACKED","GIT_STATUS_OPT_INCLUDE_IGNORED","GIT_STATUS_OPT_INCLUDE_UNMODIFIED","GIT_STATUS_OPT_EXCLUDE_SUBMODULES","GIT_STATUS_OPT_RECURSE_UNTRACKED_DIRS","GIT_STATUS_OPT_DISABLE_PATHSPEC_MATCH","GIT_STATUS_OPT_RECURSE_IGNORED_DIRS","GIT_STATUS_OPT_RENAMES_HEAD_TO_INDEX","GIT_STATUS_OPT_RENAMES_INDEX_TO_WORKDIR","GIT_STATUS_OPT_SORT_CASE_SENSITIVELY","GIT_STATUS_OPT_SORT_CASE_INSENSITIVELY","GIT_STATUS_OPT_RENAMES_FROM_REWRITES","GIT_STATUS_OPT_NO_REFRESH","GIT_STATUS_OPT_UPDATE_INDEX","GIT_STATUS_OPT_INCLUDE_UNREADABLE","GIT_STATUS_OPT_INCLUDE_UNREADABLE_AS_UNTRACKED"],"type":"enum","file":"status.h","line":137,"lineto":154,"block":"GIT_STATUS_OPT_INCLUDE_UNTRACKED\nGIT_STATUS_OPT_INCLUDE_IGNORED\nGIT_STATUS_OPT_INCLUDE_UNMODIFIED\nGIT_STATUS_OPT_EXCLUDE_SUBMODULES\nGIT_STATUS_OPT_RECURSE_UNTRACKED_DIRS\nGIT_STATUS_OPT_DISABLE_PATHSPEC_MATCH\nGIT_STATUS_OPT_RECURSE_IGNORED_DIRS\nGIT_STATUS_OPT_RENAMES_HEAD_TO_INDEX\nGIT_STATUS_OPT_RENAMES_INDEX_TO_WORKDIR\nGIT_STATUS_OPT_SORT_CASE_SENSITIVELY\nGIT_STATUS_OPT_SORT_CASE_INSENSITIVELY\nGIT_STATUS_OPT_RENAMES_FROM_REWRITES\nGIT_STATUS_OPT_NO_REFRESH\nGIT_STATUS_OPT_UPDATE_INDEX\nGIT_STATUS_OPT_INCLUDE_UNREADABLE\nGIT_STATUS_OPT_INCLUDE_UNREADABLE_AS_UNTRACKED","tdef":"typedef","description":" Flags to control status callbacks","comments":"
    \n
  • GIT_STATUS_OPT_INCLUDE_UNTRACKED says that callbacks should be made\non untracked files. These will only be made if the workdir files are\nincluded in the status "show" option.
    • \n
  • GIT_STATUS_OPT_INCLUDE_IGNORED says that ignored files get callbacks.\nAgain, these callbacks will only be made if the workdir files are\nincluded in the status "show" option.
    • \n
  • GIT_STATUS_OPT_INCLUDE_UNMODIFIED indicates that callback should be\nmade even on unmodified files.
    • \n
  • GIT_STATUS_OPT_EXCLUDE_SUBMODULES indicates that submodules should be\nskipped. This only applies if there are no pending typechanges to\nthe submodule (either from or to another type).
    • \n
  • GIT_STATUS_OPT_RECURSE_UNTRACKED_DIRS indicates that all files in\nuntracked directories should be included. Normally if an entire\ndirectory is new, then just the top-level directory is included (with\na trailing slash on the entry name). This flag says to include all\nof the individual files in the directory instead.
    • \n
  • GIT_STATUS_OPT_DISABLE_PATHSPEC_MATCH indicates that the given path\nshould be treated as a literal path, and not as a pathspec pattern.
    • \n
  • GIT_STATUS_OPT_RECURSE_IGNORED_DIRS indicates that the contents of\nignored directories should be included in the status. This is like\ndoing git ls-files -o -i --exclude-standard with core git.
    • \n
  • GIT_STATUS_OPT_RENAMES_HEAD_TO_INDEX indicates that rename detection\nshould be processed between the head and the index and enables\nthe GIT_STATUS_INDEX_RENAMED as a possible status flag.
    • \n
  • GIT_STATUS_OPT_RENAMES_INDEX_TO_WORKDIR indicates that rename\ndetection should be run between the index and the working directory\nand enabled GIT_STATUS_WT_RENAMED as a possible status flag.
    • \n
  • GIT_STATUS_OPT_SORT_CASE_SENSITIVELY overrides the native case\nsensitivity for the file system and forces the output to be in\ncase-sensitive order
    • \n
  • GIT_STATUS_OPT_SORT_CASE_INSENSITIVELY overrides the native case\nsensitivity for the file system and forces the output to be in\ncase-insensitive order
    • \n
  • GIT_STATUS_OPT_RENAMES_FROM_REWRITES indicates that rename detection\nshould include rewritten files
    • \n
  • GIT_STATUS_OPT_NO_REFRESH bypasses the default status behavior of\ndoing a "soft" index reload (i.e. reloading the index data if the\nfile on disk has been modified outside libgit2).
    • \n
  • GIT_STATUS_OPT_UPDATE_INDEX tells libgit2 to refresh the stat cache\nin the index for files that are unchanged but have out of date stat\ninformation in the index. It will result in less work being done on\nsubsequent calls to get status. This is mutually exclusive with the\nNO_REFRESH option.
    • \n
\n\n

Calling git_status_foreach() is like calling the extended version\n with: GIT_STATUS_OPT_INCLUDE_IGNORED, GIT_STATUS_OPT_INCLUDE_UNTRACKED,\n and GIT_STATUS_OPT_RECURSE_UNTRACKED_DIRS. Those options are bundled\n together as GIT_STATUS_OPT_DEFAULTS if you want them as a baseline.

\n","fields":[{"type":"int","name":"GIT_STATUS_OPT_INCLUDE_UNTRACKED","comments":"","value":1},{"type":"int","name":"GIT_STATUS_OPT_INCLUDE_IGNORED","comments":"","value":2},{"type":"int","name":"GIT_STATUS_OPT_INCLUDE_UNMODIFIED","comments":"","value":4},{"type":"int","name":"GIT_STATUS_OPT_EXCLUDE_SUBMODULES","comments":"","value":8},{"type":"int","name":"GIT_STATUS_OPT_RECURSE_UNTRACKED_DIRS","comments":"","value":16},{"type":"int","name":"GIT_STATUS_OPT_DISABLE_PATHSPEC_MATCH","comments":"","value":32},{"type":"int","name":"GIT_STATUS_OPT_RECURSE_IGNORED_DIRS","comments":"","value":64},{"type":"int","name":"GIT_STATUS_OPT_RENAMES_HEAD_TO_INDEX","comments":"","value":128},{"type":"int","name":"GIT_STATUS_OPT_RENAMES_INDEX_TO_WORKDIR","comments":"","value":256},{"type":"int","name":"GIT_STATUS_OPT_SORT_CASE_SENSITIVELY","comments":"","value":512},{"type":"int","name":"GIT_STATUS_OPT_SORT_CASE_INSENSITIVELY","comments":"","value":1024},{"type":"int","name":"GIT_STATUS_OPT_RENAMES_FROM_REWRITES","comments":"","value":2048},{"type":"int","name":"GIT_STATUS_OPT_NO_REFRESH","comments":"","value":4096},{"type":"int","name":"GIT_STATUS_OPT_UPDATE_INDEX","comments":"","value":8192},{"type":"int","name":"GIT_STATUS_OPT_INCLUDE_UNREADABLE","comments":"","value":16384},{"type":"int","name":"GIT_STATUS_OPT_INCLUDE_UNREADABLE_AS_UNTRACKED","comments":"","value":32768}],"used":{"returns":[],"needs":[]}}],["git_status_show_t",{"decl":["GIT_STATUS_SHOW_INDEX_AND_WORKDIR","GIT_STATUS_SHOW_INDEX_ONLY","GIT_STATUS_SHOW_WORKDIR_ONLY"],"type":"enum","file":"status.h","line":79,"lineto":83,"block":"GIT_STATUS_SHOW_INDEX_AND_WORKDIR\nGIT_STATUS_SHOW_INDEX_ONLY\nGIT_STATUS_SHOW_WORKDIR_ONLY","tdef":"typedef","description":" Select the files on which to report status.","comments":"

With git_status_foreach_ext, this will control which changes get\n callbacks. With git_status_list_new, these will control which\n changes are included in the list.

\n\n
    \n
  • GIT_STATUS_SHOW_INDEX_AND_WORKDIR is the default. This roughly\nmatches git status --porcelain regarding which files are\nincluded and in what order.
    • \n
  • GIT_STATUS_SHOW_INDEX_ONLY only gives status based on HEAD to index\ncomparison, not looking at working directory changes.
    • \n
  • GIT_STATUS_SHOW_WORKDIR_ONLY only gives status based on index to\nworking directory comparison, not comparing the index to the HEAD.
    • \n
\n","fields":[{"type":"int","name":"GIT_STATUS_SHOW_INDEX_AND_WORKDIR","comments":"","value":0},{"type":"int","name":"GIT_STATUS_SHOW_INDEX_ONLY","comments":"","value":1},{"type":"int","name":"GIT_STATUS_SHOW_WORKDIR_ONLY","comments":"","value":2}],"used":{"returns":[],"needs":[]}}],["git_status_t",{"decl":["GIT_STATUS_CURRENT","GIT_STATUS_INDEX_NEW","GIT_STATUS_INDEX_MODIFIED","GIT_STATUS_INDEX_DELETED","GIT_STATUS_INDEX_RENAMED","GIT_STATUS_INDEX_TYPECHANGE","GIT_STATUS_WT_NEW","GIT_STATUS_WT_MODIFIED","GIT_STATUS_WT_DELETED","GIT_STATUS_WT_TYPECHANGE","GIT_STATUS_WT_RENAMED","GIT_STATUS_WT_UNREADABLE","GIT_STATUS_IGNORED","GIT_STATUS_CONFLICTED"],"type":"enum","file":"status.h","line":32,"lineto":50,"block":"GIT_STATUS_CURRENT\nGIT_STATUS_INDEX_NEW\nGIT_STATUS_INDEX_MODIFIED\nGIT_STATUS_INDEX_DELETED\nGIT_STATUS_INDEX_RENAMED\nGIT_STATUS_INDEX_TYPECHANGE\nGIT_STATUS_WT_NEW\nGIT_STATUS_WT_MODIFIED\nGIT_STATUS_WT_DELETED\nGIT_STATUS_WT_TYPECHANGE\nGIT_STATUS_WT_RENAMED\nGIT_STATUS_WT_UNREADABLE\nGIT_STATUS_IGNORED\nGIT_STATUS_CONFLICTED","tdef":"typedef","description":" Status flags for a single file.","comments":"

A combination of these values will be returned to indicate the status of\n a file. Status compares the working directory, the index, and the\n current HEAD of the repository. The GIT_STATUS_INDEX set of flags\n represents the status of file in the index relative to the HEAD, and the\n GIT_STATUS_WT set of flags represent the status of the file in the\n working directory relative to the index.

\n","fields":[{"type":"int","name":"GIT_STATUS_CURRENT","comments":"","value":0},{"type":"int","name":"GIT_STATUS_INDEX_NEW","comments":"","value":1},{"type":"int","name":"GIT_STATUS_INDEX_MODIFIED","comments":"","value":2},{"type":"int","name":"GIT_STATUS_INDEX_DELETED","comments":"","value":4},{"type":"int","name":"GIT_STATUS_INDEX_RENAMED","comments":"","value":8},{"type":"int","name":"GIT_STATUS_INDEX_TYPECHANGE","comments":"","value":16},{"type":"int","name":"GIT_STATUS_WT_NEW","comments":"","value":128},{"type":"int","name":"GIT_STATUS_WT_MODIFIED","comments":"","value":256},{"type":"int","name":"GIT_STATUS_WT_DELETED","comments":"","value":512},{"type":"int","name":"GIT_STATUS_WT_TYPECHANGE","comments":"","value":1024},{"type":"int","name":"GIT_STATUS_WT_RENAMED","comments":"","value":2048},{"type":"int","name":"GIT_STATUS_WT_UNREADABLE","comments":"","value":4096},{"type":"int","name":"GIT_STATUS_IGNORED","comments":"","value":16384},{"type":"int","name":"GIT_STATUS_CONFLICTED","comments":"","value":32768}],"used":{"returns":[],"needs":[]}}],["git_strarray",{"decl":["char ** strings","size_t count"],"type":"struct","value":"git_strarray","file":"strarray.h","line":22,"lineto":25,"block":"char ** strings\nsize_t count","tdef":"typedef","description":" Array of strings ","comments":"","fields":[{"type":"char **","name":"strings","comments":""},{"type":"size_t","name":"count","comments":""}],"used":{"returns":[],"needs":["git_index_add_all","git_index_remove_all","git_index_update_all","git_pathspec_new","git_reference_list","git_remote_download","git_remote_fetch","git_remote_get_fetch_refspecs","git_remote_get_push_refspecs","git_remote_list","git_remote_push","git_remote_rename","git_remote_upload","git_reset_default","git_strarray_copy","git_strarray_free","git_tag_list","git_tag_list_match"]}}],["git_stream",{"decl":["int version","int encrypted","int proxy_support","int (*)(struct git_stream *) connect","int (*)(git_cert **, struct git_stream *) certificate","int (*)(struct git_stream *, const char *) set_proxy","ssize_t (*)(struct git_stream *, void *, size_t) read","ssize_t (*)(struct git_stream *, const char *, size_t, int) write","int (*)(struct git_stream *) close","void (*)(struct git_stream *) free"],"type":"struct","value":"git_stream","file":"sys/stream.h","line":28,"lineto":40,"block":"int version\nint encrypted\nint proxy_support\nint (*)(struct git_stream *) connect\nint (*)(git_cert **, struct git_stream *) certificate\nint (*)(struct git_stream *, const char *) set_proxy\nssize_t (*)(struct git_stream *, void *, size_t) read\nssize_t (*)(struct git_stream *, const char *, size_t, int) write\nint (*)(struct git_stream *) close\nvoid (*)(struct git_stream *) free","tdef":"typedef","description":" Every stream must have this struct as its first element, so the\n API can talk to it. You'd define your stream as","comments":"
 struct my_stream {\n         git_stream parent;\n         ...\n }\n
\n\n

and fill the functions

\n","fields":[{"type":"int","name":"version","comments":""},{"type":"int","name":"encrypted","comments":""},{"type":"int","name":"proxy_support","comments":""},{"type":"int (*)(struct git_stream *)","name":"connect","comments":""},{"type":"int (*)(git_cert **, struct git_stream *)","name":"certificate","comments":""},{"type":"int (*)(struct git_stream *, const char *)","name":"set_proxy","comments":""},{"type":"ssize_t (*)(struct git_stream *, void *, size_t)","name":"read","comments":""},{"type":"ssize_t (*)(struct git_stream *, const char *, size_t, int)","name":"write","comments":""},{"type":"int (*)(struct git_stream *)","name":"close","comments":""},{"type":"void (*)(struct git_stream *)","name":"free","comments":""}],"used":{"returns":[],"needs":[]}}],["git_submodule",{"decl":"git_submodule","type":"struct","value":"git_submodule","file":"types.h","line":335,"lineto":335,"tdef":"typedef","description":" Opaque structure representing a submodule.","comments":"","used":{"returns":[],"needs":["git_submodule_add_finalize","git_submodule_add_setup","git_submodule_add_to_index","git_submodule_branch","git_submodule_fetch_recurse_submodules","git_submodule_foreach","git_submodule_free","git_submodule_head_id","git_submodule_ignore","git_submodule_index_id","git_submodule_init","git_submodule_location","git_submodule_lookup","git_submodule_name","git_submodule_open","git_submodule_owner","git_submodule_path","git_submodule_reload","git_submodule_repo_init","git_submodule_sync","git_submodule_update","git_submodule_update_strategy","git_submodule_url","git_submodule_wd_id"]}}],["git_submodule_ignore_t",{"decl":["GIT_SUBMODULE_IGNORE_UNSPECIFIED","GIT_SUBMODULE_IGNORE_NONE","GIT_SUBMODULE_IGNORE_UNTRACKED","GIT_SUBMODULE_IGNORE_DIRTY","GIT_SUBMODULE_IGNORE_ALL"],"type":"enum","file":"types.h","line":399,"lineto":406,"block":"GIT_SUBMODULE_IGNORE_UNSPECIFIED\nGIT_SUBMODULE_IGNORE_NONE\nGIT_SUBMODULE_IGNORE_UNTRACKED\nGIT_SUBMODULE_IGNORE_DIRTY\nGIT_SUBMODULE_IGNORE_ALL","tdef":"typedef","description":" Submodule ignore values","comments":"

These values represent settings for the submodule.$name.ignore\n configuration value which says how deeply to look at the working\n directory when getting submodule status.

\n\n

You can override this value in memory on a per-submodule basis with\n git_submodule_set_ignore() and can write the changed value to disk\n with git_submodule_save(). If you have overwritten the value, you\n can revert to the on disk value by using GIT_SUBMODULE_IGNORE_RESET.

\n\n

The values are:

\n\n
    \n
  • GIT_SUBMODULE_IGNORE_UNSPECIFIED: use the submodule's configuration
    • \n
  • GIT_SUBMODULE_IGNORE_NONE: don't ignore any change - i.e. even an\nuntracked file, will mark the submodule as dirty. Ignored files are\nstill ignored, of course.
    • \n
  • GIT_SUBMODULE_IGNORE_UNTRACKED: ignore untracked files; only changes\nto tracked files, or the index or the HEAD commit will matter.
    • \n
  • GIT_SUBMODULE_IGNORE_DIRTY: ignore changes in the working directory,\nonly considering changes if the HEAD of submodule has moved from the\nvalue in the superproject.
    • \n
  • GIT_SUBMODULE_IGNORE_ALL: never check if the submodule is dirty
    • \n
  • GIT_SUBMODULE_IGNORE_DEFAULT: not used except as static initializer\nwhen we don't want any particular ignore rule to be specified.
    • \n
\n","fields":[{"type":"int","name":"GIT_SUBMODULE_IGNORE_UNSPECIFIED","comments":"

use the submodule's configuration

\n","value":-1},{"type":"int","name":"GIT_SUBMODULE_IGNORE_NONE","comments":"

any change or untracked == dirty

\n","value":1},{"type":"int","name":"GIT_SUBMODULE_IGNORE_UNTRACKED","comments":"

dirty if tracked files change

\n","value":2},{"type":"int","name":"GIT_SUBMODULE_IGNORE_DIRTY","comments":"

only dirty if HEAD moved

\n","value":3},{"type":"int","name":"GIT_SUBMODULE_IGNORE_ALL","comments":"

never dirty

\n","value":4}],"used":{"returns":[],"needs":["git_submodule_set_ignore","git_submodule_status"]}}],["git_submodule_recurse_t",{"decl":["GIT_SUBMODULE_RECURSE_NO","GIT_SUBMODULE_RECURSE_YES","GIT_SUBMODULE_RECURSE_ONDEMAND"],"type":"enum","file":"types.h","line":418,"lineto":422,"block":"GIT_SUBMODULE_RECURSE_NO\nGIT_SUBMODULE_RECURSE_YES\nGIT_SUBMODULE_RECURSE_ONDEMAND","tdef":"typedef","description":" Options for submodule recurse.","comments":"

Represent the value of submodule.$name.fetchRecurseSubmodules

\n\n
    \n
  • GIT_SUBMODULE_RECURSE_NO - do no recurse into submodules
    • \n
  • GIT_SUBMODULE_RECURSE_YES - recurse into submodules
    • \n
  • GIT_SUBMODULE_RECURSE_ONDEMAND - recurse into submodules only when\n commit not already in local clone
    • \n
\n","fields":[{"type":"int","name":"GIT_SUBMODULE_RECURSE_NO","comments":"","value":0},{"type":"int","name":"GIT_SUBMODULE_RECURSE_YES","comments":"","value":1},{"type":"int","name":"GIT_SUBMODULE_RECURSE_ONDEMAND","comments":"","value":2}],"used":{"returns":[],"needs":["git_submodule_set_fetch_recurse_submodules"]}}],["git_submodule_status_t",{"decl":["GIT_SUBMODULE_STATUS_IN_HEAD","GIT_SUBMODULE_STATUS_IN_INDEX","GIT_SUBMODULE_STATUS_IN_CONFIG","GIT_SUBMODULE_STATUS_IN_WD","GIT_SUBMODULE_STATUS_INDEX_ADDED","GIT_SUBMODULE_STATUS_INDEX_DELETED","GIT_SUBMODULE_STATUS_INDEX_MODIFIED","GIT_SUBMODULE_STATUS_WD_UNINITIALIZED","GIT_SUBMODULE_STATUS_WD_ADDED","GIT_SUBMODULE_STATUS_WD_DELETED","GIT_SUBMODULE_STATUS_WD_MODIFIED","GIT_SUBMODULE_STATUS_WD_INDEX_MODIFIED","GIT_SUBMODULE_STATUS_WD_WD_MODIFIED","GIT_SUBMODULE_STATUS_WD_UNTRACKED"],"type":"enum","file":"submodule.h","line":74,"lineto":89,"block":"GIT_SUBMODULE_STATUS_IN_HEAD\nGIT_SUBMODULE_STATUS_IN_INDEX\nGIT_SUBMODULE_STATUS_IN_CONFIG\nGIT_SUBMODULE_STATUS_IN_WD\nGIT_SUBMODULE_STATUS_INDEX_ADDED\nGIT_SUBMODULE_STATUS_INDEX_DELETED\nGIT_SUBMODULE_STATUS_INDEX_MODIFIED\nGIT_SUBMODULE_STATUS_WD_UNINITIALIZED\nGIT_SUBMODULE_STATUS_WD_ADDED\nGIT_SUBMODULE_STATUS_WD_DELETED\nGIT_SUBMODULE_STATUS_WD_MODIFIED\nGIT_SUBMODULE_STATUS_WD_INDEX_MODIFIED\nGIT_SUBMODULE_STATUS_WD_WD_MODIFIED\nGIT_SUBMODULE_STATUS_WD_UNTRACKED","tdef":"typedef","description":" Return codes for submodule status.","comments":"

A combination of these flags will be returned to describe the status of a\n submodule. Depending on the "ignore" property of the submodule, some of\n the flags may never be returned because they indicate changes that are\n supposed to be ignored.

\n\n

Submodule info is contained in 4 places: the HEAD tree, the index, config\n files (both .git/config and .gitmodules), and the working directory. Any\n or all of those places might be missing information about the submodule\n depending on what state the repo is in. We consider all four places to\n build the combination of status flags.

\n\n

There are four values that are not really status, but give basic info\n about what sources of submodule data are available. These will be\n returned even if ignore is set to "ALL".

\n\n
    \n
  • IN_HEAD - superproject head contains submodule
    • \n
  • IN_INDEX - superproject index contains submodule
    • \n
  • IN_CONFIG - superproject gitmodules has submodule
    • \n
  • IN_WD - superproject workdir has submodule
    • \n
\n\n

The following values will be returned so long as ignore is not "ALL".

\n\n
    \n
  • INDEX_ADDED - in index, not in head
    • \n
  • INDEX_DELETED - in head, not in index
    • \n
  • INDEX_MODIFIED - index and head don't match
    • \n
  • WD_UNINITIALIZED - workdir contains empty directory
    • \n
  • WD_ADDED - in workdir, not index
    • \n
  • WD_DELETED - in index, not workdir
    • \n
  • WD_MODIFIED - index and workdir head don't match
    • \n
\n\n

The following can only be returned if ignore is "NONE" or "UNTRACKED".

\n\n
    \n
  • WD_INDEX_MODIFIED - submodule workdir index is dirty
    • \n
  • WD_WD_MODIFIED - submodule workdir has modified files
    • \n
\n\n

Lastly, the following will only be returned for ignore "NONE".

\n\n
    \n
  • WD_UNTRACKED - wd contains untracked files
    • \n
\n","fields":[{"type":"int","name":"GIT_SUBMODULE_STATUS_IN_HEAD","comments":"","value":1},{"type":"int","name":"GIT_SUBMODULE_STATUS_IN_INDEX","comments":"","value":2},{"type":"int","name":"GIT_SUBMODULE_STATUS_IN_CONFIG","comments":"","value":4},{"type":"int","name":"GIT_SUBMODULE_STATUS_IN_WD","comments":"","value":8},{"type":"int","name":"GIT_SUBMODULE_STATUS_INDEX_ADDED","comments":"","value":16},{"type":"int","name":"GIT_SUBMODULE_STATUS_INDEX_DELETED","comments":"","value":32},{"type":"int","name":"GIT_SUBMODULE_STATUS_INDEX_MODIFIED","comments":"","value":64},{"type":"int","name":"GIT_SUBMODULE_STATUS_WD_UNINITIALIZED","comments":"","value":128},{"type":"int","name":"GIT_SUBMODULE_STATUS_WD_ADDED","comments":"","value":256},{"type":"int","name":"GIT_SUBMODULE_STATUS_WD_DELETED","comments":"","value":512},{"type":"int","name":"GIT_SUBMODULE_STATUS_WD_MODIFIED","comments":"","value":1024},{"type":"int","name":"GIT_SUBMODULE_STATUS_WD_INDEX_MODIFIED","comments":"","value":2048},{"type":"int","name":"GIT_SUBMODULE_STATUS_WD_WD_MODIFIED","comments":"","value":4096},{"type":"int","name":"GIT_SUBMODULE_STATUS_WD_UNTRACKED","comments":"","value":8192}],"used":{"returns":[],"needs":[]}}],["git_submodule_update_options",{"decl":["unsigned int version","git_checkout_options checkout_opts","git_fetch_options fetch_opts","unsigned int clone_checkout_strategy"],"type":"struct","value":"git_submodule_update_options","file":"submodule.h","line":118,"lineto":146,"block":"unsigned int version\ngit_checkout_options checkout_opts\ngit_fetch_options fetch_opts\nunsigned int clone_checkout_strategy","tdef":"typedef","description":" Submodule update options structure","comments":"

Use the GIT_SUBMODULE_UPDATE_OPTIONS_INIT to get the default settings,\n like this:

\n\n

git_submodule_update_options opts = GIT_SUBMODULE_UPDATE_OPTIONS_INIT;

\n","fields":[{"type":"unsigned int","name":"version","comments":""},{"type":"git_checkout_options","name":"checkout_opts","comments":" These options are passed to the checkout step. To disable\n checkout, set the `checkout_strategy` to\n `GIT_CHECKOUT_NONE`. Generally you will want the use\n GIT_CHECKOUT_SAFE to update files in the working\n directory. Use the `clone_checkout_strategy` field\n to set the checkout strategy that will be used in\n the case where update needs to clone the repository."},{"type":"git_fetch_options","name":"fetch_opts","comments":" Options which control the fetch, including callbacks.\n\n The callbacks to use for reporting fetch progress, and for acquiring\n credentials in the event they are needed."},{"type":"unsigned int","name":"clone_checkout_strategy","comments":" The checkout strategy to use when the sub repository needs to\n be cloned. Use GIT_CHECKOUT_SAFE to create all files\n in the working directory for the newly cloned repository."}],"used":{"returns":[],"needs":["git_submodule_update","git_submodule_update_init_options"]}}],["git_submodule_update_t",{"decl":["GIT_SUBMODULE_UPDATE_CHECKOUT","GIT_SUBMODULE_UPDATE_REBASE","GIT_SUBMODULE_UPDATE_MERGE","GIT_SUBMODULE_UPDATE_NONE","GIT_SUBMODULE_UPDATE_DEFAULT"],"type":"enum","file":"types.h","line":363,"lineto":370,"block":"GIT_SUBMODULE_UPDATE_CHECKOUT\nGIT_SUBMODULE_UPDATE_REBASE\nGIT_SUBMODULE_UPDATE_MERGE\nGIT_SUBMODULE_UPDATE_NONE\nGIT_SUBMODULE_UPDATE_DEFAULT","tdef":"typedef","description":" Submodule update values","comments":"

These values represent settings for the submodule.$name.update\n configuration value which says how to handle git submodule update for\n this submodule. The value is usually set in the ".gitmodules" file and\n copied to ".git/config" when the submodule is initialized.

\n\n

You can override this setting on a per-submodule basis with\n git_submodule_set_update() and write the changed value to disk using\n git_submodule_save(). If you have overwritten the value, you can\n revert it by passing GIT_SUBMODULE_UPDATE_RESET to the set function.

\n\n

The values are:

\n\n
    \n
  • GIT_SUBMODULE_UPDATE_CHECKOUT: the default; when a submodule is\nupdated, checkout the new detached HEAD to the submodule directory.
    • \n
  • GIT_SUBMODULE_UPDATE_REBASE: update by rebasing the current checked\nout branch onto the commit from the superproject.
    • \n
  • GIT_SUBMODULE_UPDATE_MERGE: update by merging the commit in the\nsuperproject into the current checkout out branch of the submodule.
    • \n
  • GIT_SUBMODULE_UPDATE_NONE: do not update this submodule even when\nthe commit in the superproject is updated.
    • \n
  • GIT_SUBMODULE_UPDATE_DEFAULT: not used except as static initializer\nwhen we don't want any particular update rule to be specified.
    • \n
\n","fields":[{"type":"int","name":"GIT_SUBMODULE_UPDATE_CHECKOUT","comments":"","value":1},{"type":"int","name":"GIT_SUBMODULE_UPDATE_REBASE","comments":"","value":2},{"type":"int","name":"GIT_SUBMODULE_UPDATE_MERGE","comments":"","value":3},{"type":"int","name":"GIT_SUBMODULE_UPDATE_NONE","comments":"","value":4},{"type":"int","name":"GIT_SUBMODULE_UPDATE_DEFAULT","comments":"","value":0}],"used":{"returns":[],"needs":["git_submodule_set_update"]}}],["git_tag",{"decl":"git_tag","type":"struct","value":"git_tag","file":"types.h","line":114,"lineto":114,"tdef":"typedef","description":" Parsed representation of a tag object. ","comments":"","used":{"returns":[],"needs":["git_tag_free","git_tag_id","git_tag_lookup","git_tag_lookup_prefix","git_tag_message","git_tag_name","git_tag_owner","git_tag_peel","git_tag_tagger","git_tag_target","git_tag_target_id","git_tag_target_type"]}}],["git_time",{"decl":["git_time_t time","int offset"],"type":"struct","value":"git_time","file":"types.h","line":156,"lineto":159,"block":"git_time_t time\nint offset","tdef":"typedef","description":" Time in a signature ","comments":"","fields":[{"type":"git_time_t","name":"time","comments":" time in seconds from epoch "},{"type":"int","name":"offset","comments":" timezone offset, in minutes "}],"used":{"returns":[],"needs":[]}}],["git_trace_level_t",{"decl":["GIT_TRACE_NONE","GIT_TRACE_FATAL","GIT_TRACE_ERROR","GIT_TRACE_WARN","GIT_TRACE_INFO","GIT_TRACE_DEBUG","GIT_TRACE_TRACE"],"type":"enum","file":"trace.h","line":26,"lineto":47,"block":"GIT_TRACE_NONE\nGIT_TRACE_FATAL\nGIT_TRACE_ERROR\nGIT_TRACE_WARN\nGIT_TRACE_INFO\nGIT_TRACE_DEBUG\nGIT_TRACE_TRACE","tdef":"typedef","description":" Available tracing levels. When tracing is set to a particular level,\n callers will be provided tracing at the given level and all lower levels.","comments":"","fields":[{"type":"int","name":"GIT_TRACE_NONE","comments":"

No tracing will be performed.

\n","value":0},{"type":"int","name":"GIT_TRACE_FATAL","comments":"

Severe errors that may impact the program's execution

\n","value":1},{"type":"int","name":"GIT_TRACE_ERROR","comments":"

Errors that do not impact the program's execution

\n","value":2},{"type":"int","name":"GIT_TRACE_WARN","comments":"

Warnings that suggest abnormal data

\n","value":3},{"type":"int","name":"GIT_TRACE_INFO","comments":"

Informational messages about program execution

\n","value":4},{"type":"int","name":"GIT_TRACE_DEBUG","comments":"

Detailed data that allows for debugging

\n","value":5},{"type":"int","name":"GIT_TRACE_TRACE","comments":"

Exceptionally detailed debugging data

\n","value":6}],"used":{"returns":[],"needs":["git_trace_set"]}}],["git_transaction",{"decl":"git_transaction","type":"struct","value":"git_transaction","file":"types.h","line":175,"lineto":175,"tdef":"typedef","description":" Transactional interface to references ","comments":"","used":{"returns":[],"needs":[]}}],["git_transfer_progress",{"decl":["unsigned int total_objects","unsigned int indexed_objects","unsigned int received_objects","unsigned int local_objects","unsigned int total_deltas","unsigned int indexed_deltas","size_t received_bytes"],"type":"struct","value":"git_transfer_progress","file":"types.h","line":253,"lineto":261,"block":"unsigned int total_objects\nunsigned int indexed_objects\nunsigned int received_objects\nunsigned int local_objects\nunsigned int total_deltas\nunsigned int indexed_deltas\nsize_t received_bytes","tdef":"typedef","description":" This is passed as the first argument to the callback to allow the\n user to see the progress.","comments":"
    \n
  • total_objects: number of objects in the packfile being downloaded
    • \n
  • indexed_objects: received objects that have been hashed
    • \n
  • received_objects: objects which have been downloaded
    • \n
  • local_objects: locally-available objects that have been injected\nin order to fix a thin pack.
    • \n
  • received-bytes: size of the packfile received up to now
    • \n
\n","fields":[{"type":"unsigned int","name":"total_objects","comments":""},{"type":"unsigned int","name":"indexed_objects","comments":""},{"type":"unsigned int","name":"received_objects","comments":""},{"type":"unsigned int","name":"local_objects","comments":""},{"type":"unsigned int","name":"total_deltas","comments":""},{"type":"unsigned int","name":"indexed_deltas","comments":""},{"type":"size_t","name":"received_bytes","comments":""}],"used":{"returns":["git_remote_stats"],"needs":["git_indexer_append","git_indexer_commit"]}}],["git_transport",{"decl":"git_transport","type":"struct","value":"git_transport","file":"types.h","line":230,"lineto":230,"tdef":"typedef","description":" Interface which represents a transport to communicate with a\n remote.","comments":"","used":{"returns":[],"needs":["git_smart_subtransport_git","git_smart_subtransport_http","git_smart_subtransport_ssh","git_transport_dummy","git_transport_init","git_transport_local","git_transport_new","git_transport_smart","git_transport_ssh_with_paths"]}}],["git_transport_flags_t",{"decl":["GIT_TRANSPORTFLAGS_NONE"],"type":"enum","file":"sys/transport.h","line":29,"lineto":31,"block":"GIT_TRANSPORTFLAGS_NONE","tdef":"typedef","description":" Flags to pass to transport","comments":"

Currently unused.

\n","fields":[{"type":"int","name":"GIT_TRANSPORTFLAGS_NONE","comments":"","value":0}],"used":{"returns":[],"needs":[]}}],["git_tree",{"decl":"git_tree","type":"struct","value":"git_tree","file":"types.h","line":126,"lineto":126,"tdef":"typedef","description":" Representation of a tree object. ","comments":"","used":{"returns":[],"needs":["git_commit_amend","git_commit_create","git_commit_create_v","git_commit_tree","git_diff_tree_to_index","git_diff_tree_to_tree","git_diff_tree_to_workdir","git_diff_tree_to_workdir_with_index","git_index_read_tree","git_merge_trees","git_pathspec_match_tree","git_tree_entry_byid","git_tree_entry_byindex","git_tree_entry_byname","git_tree_entry_bypath","git_tree_entrycount","git_tree_free","git_tree_id","git_tree_lookup","git_tree_lookup_prefix","git_tree_owner","git_tree_walk","git_treebuilder_new"]}}],["git_tree_entry",{"decl":"git_tree_entry","type":"struct","value":"git_tree_entry","file":"types.h","line":123,"lineto":123,"tdef":"typedef","description":" Representation of each one of the entries in a tree object. ","comments":"","used":{"returns":["git_tree_entry_byid","git_tree_entry_byindex","git_tree_entry_byname","git_treebuilder_get"],"needs":["git_tree_entry_bypath","git_tree_entry_cmp","git_tree_entry_dup","git_tree_entry_filemode","git_tree_entry_filemode_raw","git_tree_entry_free","git_tree_entry_id","git_tree_entry_name","git_tree_entry_to_object","git_tree_entry_type","git_treebuilder_insert"]}}],["git_treebuilder",{"decl":"git_treebuilder","type":"struct","value":"git_treebuilder","file":"types.h","line":129,"lineto":129,"tdef":"typedef","description":" Constructor for in-memory trees ","comments":"","used":{"returns":[],"needs":["git_treebuilder_clear","git_treebuilder_entrycount","git_treebuilder_filter","git_treebuilder_free","git_treebuilder_get","git_treebuilder_insert","git_treebuilder_new","git_treebuilder_remove","git_treebuilder_write"]}}],["git_treewalk_mode",{"decl":["GIT_TREEWALK_PRE","GIT_TREEWALK_POST"],"type":"enum","file":"tree.h","line":384,"lineto":387,"block":"GIT_TREEWALK_PRE\nGIT_TREEWALK_POST","tdef":"typedef","description":" Tree traversal modes ","comments":"","fields":[{"type":"int","name":"GIT_TREEWALK_PRE","comments":"","value":0},{"type":"int","name":"GIT_TREEWALK_POST","comments":"","value":1}],"used":{"returns":[],"needs":["git_tree_walk"]}}],["git_writestream",{"decl":"git_writestream","type":"struct","value":"git_writestream","file":"types.h","line":425,"lineto":425,"tdef":"typedef","description":" A type to write in a streaming fashion, for example, for filters. ","comments":"","used":{"returns":[],"needs":["git_filter_list_stream_blob","git_filter_list_stream_data","git_filter_list_stream_file"]}}]],"prefix":"include/git2","groups":[["annotated",["git_annotated_commit_free","git_annotated_commit_from_fetchhead","git_annotated_commit_from_ref","git_annotated_commit_from_revspec","git_annotated_commit_id","git_annotated_commit_lookup"]],["attr",["git_attr_add_macro","git_attr_cache_flush","git_attr_foreach","git_attr_get","git_attr_get_many","git_attr_value"]],["blame",["git_blame_buffer","git_blame_file","git_blame_free","git_blame_get_hunk_byindex","git_blame_get_hunk_byline","git_blame_get_hunk_count","git_blame_init_options"]],["blob",["git_blob_create_frombuffer","git_blob_create_fromchunks","git_blob_create_fromdisk","git_blob_create_fromworkdir","git_blob_filtered_content","git_blob_free","git_blob_id","git_blob_is_binary","git_blob_lookup","git_blob_lookup_prefix","git_blob_owner","git_blob_rawcontent","git_blob_rawsize"]],["branch",["git_branch_create","git_branch_create_from_annotated","git_branch_delete","git_branch_is_head","git_branch_iterator_free","git_branch_iterator_new","git_branch_lookup","git_branch_move","git_branch_name","git_branch_next","git_branch_set_upstream","git_branch_upstream"]],["buf",["git_buf_contains_nul","git_buf_free","git_buf_grow","git_buf_is_binary","git_buf_set"]],["checkout",["git_checkout_head","git_checkout_index","git_checkout_init_options","git_checkout_tree"]],["cherrypick",["git_cherrypick","git_cherrypick_commit","git_cherrypick_init_options"]],["clone",["git_clone","git_clone_init_options"]],["commit",["git_commit_amend","git_commit_author","git_commit_committer","git_commit_create","git_commit_create_from_callback","git_commit_create_from_ids","git_commit_create_v","git_commit_free","git_commit_header_field","git_commit_id","git_commit_lookup","git_commit_lookup_prefix","git_commit_message","git_commit_message_encoding","git_commit_message_raw","git_commit_nth_gen_ancestor","git_commit_owner","git_commit_parent","git_commit_parent_id","git_commit_parentcount","git_commit_raw_header","git_commit_summary","git_commit_time","git_commit_time_offset","git_commit_tree","git_commit_tree_id"]],["config",["git_config_add_backend","git_config_add_file_ondisk","git_config_backend_foreach_match","git_config_delete_entry","git_config_delete_multivar","git_config_entry_free","git_config_find_global","git_config_find_system","git_config_find_xdg","git_config_foreach","git_config_foreach_match","git_config_free","git_config_get_bool","git_config_get_entry","git_config_get_int32","git_config_get_int64","git_config_get_mapped","git_config_get_multivar_foreach","git_config_get_path","git_config_get_string","git_config_get_string_buf","git_config_init_backend","git_config_iterator_free","git_config_iterator_glob_new","git_config_iterator_new","git_config_lookup_map_value","git_config_multivar_iterator_new","git_config_new","git_config_next","git_config_open_default","git_config_open_global","git_config_open_level","git_config_open_ondisk","git_config_parse_bool","git_config_parse_int32","git_config_parse_int64","git_config_parse_path","git_config_set_bool","git_config_set_int32","git_config_set_int64","git_config_set_multivar","git_config_set_string","git_config_snapshot"]],["cred",["git_cred_default_new","git_cred_has_username","git_cred_ssh_custom_new","git_cred_ssh_interactive_new","git_cred_ssh_key_from_agent","git_cred_ssh_key_memory_new","git_cred_ssh_key_new","git_cred_username_new","git_cred_userpass","git_cred_userpass_plaintext_new"]],["describe",["git_describe_commit","git_describe_format","git_describe_result_free","git_describe_workdir"]],["diff",["git_diff_blob_to_buffer","git_diff_blobs","git_diff_buffers","git_diff_commit_as_email","git_diff_find_init_options","git_diff_find_similar","git_diff_foreach","git_diff_format_email","git_diff_format_email_init_options","git_diff_free","git_diff_get_delta","git_diff_get_perfdata","git_diff_get_stats","git_diff_index_to_workdir","git_diff_init_options","git_diff_is_sorted_icase","git_diff_merge","git_diff_num_deltas","git_diff_num_deltas_of_type","git_diff_print","git_diff_print_callback__to_buf","git_diff_print_callback__to_file_handle","git_diff_stats_deletions","git_diff_stats_files_changed","git_diff_stats_free","git_diff_stats_insertions","git_diff_stats_to_buf","git_diff_status_char","git_diff_tree_to_index","git_diff_tree_to_tree","git_diff_tree_to_workdir","git_diff_tree_to_workdir_with_index"]],["fetch",["git_fetch_init_options"]],["filter",["git_filter_list_apply_to_blob","git_filter_list_apply_to_data","git_filter_list_apply_to_file","git_filter_list_contains","git_filter_list_free","git_filter_list_length","git_filter_list_load","git_filter_list_new","git_filter_list_push","git_filter_list_stream_blob","git_filter_list_stream_data","git_filter_list_stream_file","git_filter_lookup","git_filter_register","git_filter_source_filemode","git_filter_source_flags","git_filter_source_id","git_filter_source_mode","git_filter_source_path","git_filter_source_repo","git_filter_unregister"]],["giterr",["giterr_clear","giterr_detach","giterr_last","giterr_set_oom","giterr_set_str"]],["graph",["git_graph_ahead_behind","git_graph_descendant_of"]],["hashsig",["git_hashsig_compare","git_hashsig_create","git_hashsig_create_fromfile","git_hashsig_free"]],["ignore",["git_ignore_add_rule","git_ignore_clear_internal_rules","git_ignore_path_is_ignored"]],["index",["git_index_add","git_index_add_all","git_index_add_bypath","git_index_add_frombuffer","git_index_caps","git_index_checksum","git_index_clear","git_index_conflict_add","git_index_conflict_cleanup","git_index_conflict_get","git_index_conflict_iterator_free","git_index_conflict_iterator_new","git_index_conflict_next","git_index_conflict_remove","git_index_entry_is_conflict","git_index_entry_stage","git_index_entrycount","git_index_find","git_index_free","git_index_get_byindex","git_index_get_bypath","git_index_has_conflicts","git_index_new","git_index_open","git_index_owner","git_index_path","git_index_read","git_index_read_tree","git_index_remove","git_index_remove_all","git_index_remove_bypath","git_index_remove_directory","git_index_set_caps","git_index_update_all","git_index_write","git_index_write_tree","git_index_write_tree_to"]],["indexer",["git_indexer_append","git_indexer_commit","git_indexer_free","git_indexer_hash","git_indexer_new"]],["libgit2",["git_libgit2_features","git_libgit2_init","git_libgit2_opts","git_libgit2_shutdown","git_libgit2_version"]],["mempack",["git_mempack_new","git_mempack_reset"]],["merge",["git_merge","git_merge_analysis","git_merge_base","git_merge_base_many","git_merge_base_octopus","git_merge_bases","git_merge_bases_many","git_merge_commits","git_merge_file","git_merge_file_from_index","git_merge_file_init_input","git_merge_file_init_options","git_merge_file_result_free","git_merge_init_options","git_merge_trees"]],["message",["git_message_prettify"]],["note",["git_note_author","git_note_committer","git_note_create","git_note_foreach","git_note_free","git_note_id","git_note_iterator_free","git_note_iterator_new","git_note_message","git_note_next","git_note_read","git_note_remove"]],["object",["git_object__size","git_object_dup","git_object_free","git_object_id","git_object_lookup","git_object_lookup_bypath","git_object_lookup_prefix","git_object_owner","git_object_peel","git_object_short_id","git_object_string2type","git_object_type","git_object_type2string","git_object_typeisloose"]],["odb",["git_odb_add_alternate","git_odb_add_backend","git_odb_add_disk_alternate","git_odb_backend_loose","git_odb_backend_one_pack","git_odb_backend_pack","git_odb_exists","git_odb_exists_prefix","git_odb_foreach","git_odb_free","git_odb_get_backend","git_odb_hash","git_odb_hashfile","git_odb_init_backend","git_odb_new","git_odb_num_backends","git_odb_object_data","git_odb_object_dup","git_odb_object_free","git_odb_object_id","git_odb_object_size","git_odb_object_type","git_odb_open","git_odb_open_rstream","git_odb_open_wstream","git_odb_read","git_odb_read_header","git_odb_read_prefix","git_odb_refresh","git_odb_stream_finalize_write","git_odb_stream_free","git_odb_stream_read","git_odb_stream_write","git_odb_write","git_odb_write_pack"]],["oid",["git_oid_cmp","git_oid_cpy","git_oid_equal","git_oid_fmt","git_oid_fromraw","git_oid_fromstr","git_oid_fromstrn","git_oid_fromstrp","git_oid_iszero","git_oid_ncmp","git_oid_nfmt","git_oid_pathfmt","git_oid_shorten_add","git_oid_shorten_free","git_oid_shorten_new","git_oid_strcmp","git_oid_streq","git_oid_tostr","git_oid_tostr_s"]],["oidarray",["git_oidarray_free"]],["openssl",["git_openssl_set_locking"]],["packbuilder",["git_packbuilder_foreach","git_packbuilder_free","git_packbuilder_hash","git_packbuilder_insert","git_packbuilder_insert_commit","git_packbuilder_insert_recur","git_packbuilder_insert_tree","git_packbuilder_insert_walk","git_packbuilder_new","git_packbuilder_object_count","git_packbuilder_set_callbacks","git_packbuilder_set_threads","git_packbuilder_write","git_packbuilder_written"]],["patch",["git_patch_free","git_patch_from_blob_and_buffer","git_patch_from_blobs","git_patch_from_buffers","git_patch_from_diff","git_patch_get_delta","git_patch_get_hunk","git_patch_get_line_in_hunk","git_patch_line_stats","git_patch_num_hunks","git_patch_num_lines_in_hunk","git_patch_print","git_patch_size","git_patch_to_buf"]],["pathspec",["git_pathspec_free","git_pathspec_match_diff","git_pathspec_match_index","git_pathspec_match_list_diff_entry","git_pathspec_match_list_entry","git_pathspec_match_list_entrycount","git_pathspec_match_list_failed_entry","git_pathspec_match_list_failed_entrycount","git_pathspec_match_list_free","git_pathspec_match_tree","git_pathspec_match_workdir","git_pathspec_matches_path","git_pathspec_new"]],["push",["git_push_init_options"]],["rebase",["git_rebase_abort","git_rebase_commit","git_rebase_finish","git_rebase_free","git_rebase_init","git_rebase_init_options","git_rebase_next","git_rebase_open","git_rebase_operation_byindex","git_rebase_operation_current","git_rebase_operation_entrycount"]],["refdb",["git_refdb_backend_fs","git_refdb_compress","git_refdb_free","git_refdb_init_backend","git_refdb_new","git_refdb_open","git_refdb_set_backend"]],["reference",["git_reference__alloc","git_reference__alloc_symbolic","git_reference_cmp","git_reference_create","git_reference_create_matching","git_reference_delete","git_reference_dwim","git_reference_ensure_log","git_reference_foreach","git_reference_foreach_glob","git_reference_foreach_name","git_reference_free","git_reference_has_log","git_reference_is_branch","git_reference_is_note","git_reference_is_remote","git_reference_is_tag","git_reference_is_valid_name","git_reference_iterator_free","git_reference_iterator_glob_new","git_reference_iterator_new","git_reference_list","git_reference_lookup","git_reference_name","git_reference_name_to_id","git_reference_next","git_reference_next_name","git_reference_normalize_name","git_reference_owner","git_reference_peel","git_reference_remove","git_reference_rename","git_reference_resolve","git_reference_set_target","git_reference_shorthand","git_reference_symbolic_create","git_reference_symbolic_create_matching","git_reference_symbolic_set_target","git_reference_symbolic_target","git_reference_target","git_reference_target_peel","git_reference_type"]],["reflog",["git_reflog_append","git_reflog_delete","git_reflog_drop","git_reflog_entry_byindex","git_reflog_entry_committer","git_reflog_entry_id_new","git_reflog_entry_id_old","git_reflog_entry_message","git_reflog_entrycount","git_reflog_free","git_reflog_read","git_reflog_rename","git_reflog_write"]],["refspec",["git_refspec_direction","git_refspec_dst","git_refspec_dst_matches","git_refspec_force","git_refspec_rtransform","git_refspec_src","git_refspec_src_matches","git_refspec_string","git_refspec_transform"]],["remote",["git_remote_add_fetch","git_remote_add_push","git_remote_autotag","git_remote_connect","git_remote_connected","git_remote_create","git_remote_create_anonymous","git_remote_create_with_fetchspec","git_remote_default_branch","git_remote_delete","git_remote_disconnect","git_remote_download","git_remote_dup","git_remote_fetch","git_remote_free","git_remote_get_fetch_refspecs","git_remote_get_push_refspecs","git_remote_get_refspec","git_remote_init_callbacks","git_remote_is_valid_name","git_remote_list","git_remote_lookup","git_remote_ls","git_remote_name","git_remote_owner","git_remote_prune","git_remote_prune_refs","git_remote_push","git_remote_pushurl","git_remote_refspec_count","git_remote_rename","git_remote_set_autotag","git_remote_set_pushurl","git_remote_set_url","git_remote_stats","git_remote_stop","git_remote_update_tips","git_remote_upload","git_remote_url"]],["repository",["git_repository__cleanup","git_repository_config","git_repository_config_snapshot","git_repository_detach_head","git_repository_discover","git_repository_fetchhead_foreach","git_repository_free","git_repository_get_namespace","git_repository_hashfile","git_repository_head","git_repository_head_detached","git_repository_head_unborn","git_repository_ident","git_repository_index","git_repository_init","git_repository_init_ext","git_repository_init_init_options","git_repository_is_bare","git_repository_is_empty","git_repository_is_shallow","git_repository_mergehead_foreach","git_repository_message","git_repository_message_remove","git_repository_new","git_repository_odb","git_repository_open","git_repository_open_bare","git_repository_open_ext","git_repository_path","git_repository_refdb","git_repository_reinit_filesystem","git_repository_set_bare","git_repository_set_config","git_repository_set_head","git_repository_set_head_detached","git_repository_set_head_detached_from_annotated","git_repository_set_ident","git_repository_set_index","git_repository_set_namespace","git_repository_set_odb","git_repository_set_refdb","git_repository_set_workdir","git_repository_state","git_repository_state_cleanup","git_repository_workdir","git_repository_wrap_odb"]],["reset",["git_reset","git_reset_default","git_reset_from_annotated"]],["revert",["git_revert","git_revert_commit","git_revert_init_options"]],["revparse",["git_revparse","git_revparse_ext","git_revparse_single"]],["revwalk",["git_revwalk_add_hide_cb","git_revwalk_free","git_revwalk_hide","git_revwalk_hide_glob","git_revwalk_hide_head","git_revwalk_hide_ref","git_revwalk_new","git_revwalk_next","git_revwalk_push","git_revwalk_push_glob","git_revwalk_push_head","git_revwalk_push_range","git_revwalk_push_ref","git_revwalk_repository","git_revwalk_reset","git_revwalk_simplify_first_parent","git_revwalk_sorting"]],["signature",["git_signature_default","git_signature_dup","git_signature_free","git_signature_new","git_signature_now"]],["smart",["git_smart_subtransport_git","git_smart_subtransport_http","git_smart_subtransport_ssh"]],["stash",["git_stash_apply","git_stash_apply_init_options","git_stash_drop","git_stash_foreach","git_stash_pop"]],["status",["git_status_byindex","git_status_file","git_status_foreach","git_status_foreach_ext","git_status_init_options","git_status_list_entrycount","git_status_list_free","git_status_list_get_perfdata","git_status_list_new","git_status_should_ignore"]],["strarray",["git_strarray_copy","git_strarray_free"]],["submodule",["git_submodule_add_finalize","git_submodule_add_setup","git_submodule_add_to_index","git_submodule_branch","git_submodule_fetch_recurse_submodules","git_submodule_foreach","git_submodule_free","git_submodule_head_id","git_submodule_ignore","git_submodule_index_id","git_submodule_init","git_submodule_location","git_submodule_lookup","git_submodule_name","git_submodule_open","git_submodule_owner","git_submodule_path","git_submodule_reload","git_submodule_repo_init","git_submodule_resolve_url","git_submodule_set_branch","git_submodule_set_fetch_recurse_submodules","git_submodule_set_ignore","git_submodule_set_update","git_submodule_set_url","git_submodule_status","git_submodule_sync","git_submodule_update","git_submodule_update_init_options","git_submodule_update_strategy","git_submodule_url","git_submodule_wd_id"]],["tag",["git_tag_annotation_create","git_tag_create","git_tag_create_frombuffer","git_tag_create_lightweight","git_tag_delete","git_tag_foreach","git_tag_free","git_tag_id","git_tag_list","git_tag_list_match","git_tag_lookup","git_tag_lookup_prefix","git_tag_message","git_tag_name","git_tag_owner","git_tag_peel","git_tag_tagger","git_tag_target","git_tag_target_id","git_tag_target_type"]],["trace",["git_trace_set"]],["transport",["git_transport_dummy","git_transport_init","git_transport_local","git_transport_new","git_transport_smart","git_transport_ssh_with_paths","git_transport_unregister"]],["tree",["git_tree_entry_byid","git_tree_entry_byindex","git_tree_entry_byname","git_tree_entry_bypath","git_tree_entry_cmp","git_tree_entry_dup","git_tree_entry_filemode","git_tree_entry_filemode_raw","git_tree_entry_free","git_tree_entry_id","git_tree_entry_name","git_tree_entry_to_object","git_tree_entry_type","git_tree_entrycount","git_tree_free","git_tree_id","git_tree_lookup","git_tree_lookup_prefix","git_tree_owner","git_tree_walk"]],["treebuilder",["git_treebuilder_clear","git_treebuilder_entrycount","git_treebuilder_filter","git_treebuilder_free","git_treebuilder_get","git_treebuilder_insert","git_treebuilder_new","git_treebuilder_remove","git_treebuilder_write"]]],"examples":[["add.c","ex/v0.23.2/add.html"],["blame.c","ex/v0.23.2/blame.html"],["cat-file.c","ex/v0.23.2/cat-file.html"],["common.c","ex/v0.23.2/common.html"],["describe.c","ex/v0.23.2/describe.html"],["diff.c","ex/v0.23.2/diff.html"],["for-each-ref.c","ex/v0.23.2/for-each-ref.html"],["general.c","ex/v0.23.2/general.html"],["init.c","ex/v0.23.2/init.html"],["log.c","ex/v0.23.2/log.html"],["network/clone.c","ex/v0.23.2/network/clone.html"],["network/common.c","ex/v0.23.2/network/common.html"],["network/fetch.c","ex/v0.23.2/network/fetch.html"],["network/git2.c","ex/v0.23.2/network/git2.html"],["network/index-pack.c","ex/v0.23.2/network/index-pack.html"],["network/ls-remote.c","ex/v0.23.2/network/ls-remote.html"],["remote.c","ex/v0.23.2/remote.html"],["rev-list.c","ex/v0.23.2/rev-list.html"],["rev-parse.c","ex/v0.23.2/rev-parse.html"],["showindex.c","ex/v0.23.2/showindex.html"],["status.c","ex/v0.23.2/status.html"],["tag.c","ex/v0.23.2/tag.html"]]} +{ + "files": [ + { + "file": "annotated_commit.h", + "functions": [ + "git_annotated_commit_from_ref", + "git_annotated_commit_from_fetchhead", + "git_annotated_commit_lookup", + "git_annotated_commit_from_revspec", + "git_annotated_commit_id", + "git_annotated_commit_free" + ], + "meta": {}, + "lines": 112 + }, + { + "file": "attr.h", + "functions": [ + "git_attr_value", + "git_attr_get", + "git_attr_get_many", + "git_attr_foreach", + "git_attr_cache_flush", + "git_attr_add_macro" + ], + "meta": {}, + "lines": 240 + }, + { + "file": "blame.h", + "functions": [ + "git_blame_init_options", + "git_blame_get_hunk_count", + "git_blame_get_hunk_byindex", + "git_blame_get_hunk_byline", + "git_blame_file", + "git_blame_buffer", + "git_blame_free" + ], + "meta": {}, + "lines": 207 + }, + { + "file": "blob.h", + "functions": [ + "git_blob_lookup", + "git_blob_lookup_prefix", + "git_blob_free", + "git_blob_id", + "git_blob_owner", + "git_blob_rawcontent", + "git_blob_rawsize", + "git_blob_filtered_content", + "git_blob_create_fromworkdir", + "git_blob_create_fromdisk", + "git_blob_create_fromchunks", + "git_blob_create_frombuffer", + "git_blob_is_binary" + ], + "meta": {}, + "lines": 217 + }, + { + "file": "branch.h", + "functions": [ + "git_branch_create", + "git_branch_create_from_annotated", + "git_branch_delete", + "git_branch_iterator_new", + "git_branch_next", + "git_branch_iterator_free", + "git_branch_move", + "git_branch_lookup", + "git_branch_name", + "git_branch_upstream", + "git_branch_set_upstream", + "git_branch_is_head" + ], + "meta": {}, + "lines": 246 + }, + { + "file": "buffer.h", + "functions": [ + "git_buf_free", + "git_buf_grow", + "git_buf_set", + "git_buf_is_binary", + "git_buf_contains_nul" + ], + "meta": {}, + "lines": 122 + }, + { + "file": "checkout.h", + "functions": [ + "git_checkout_notify_cb", + "git_checkout_progress_cb", + "git_checkout_perfdata_cb", + "git_checkout_init_options", + "git_checkout_head", + "git_checkout_index", + "git_checkout_tree" + ], + "meta": {}, + "lines": 354 + }, + { + "file": "cherrypick.h", + "functions": [ + "git_cherrypick_init_options", + "git_cherrypick_commit", + "git_cherrypick" + ], + "meta": {}, + "lines": 84 + }, + { + "file": "clone.h", + "functions": [ + "git_remote_create_cb", + "git_repository_create_cb", + "git_clone_init_options", + "git_clone" + ], + "meta": {}, + "lines": 203 + }, + { + "file": "commit.h", + "functions": [ + "git_commit_lookup", + "git_commit_lookup_prefix", + "git_commit_free", + "git_commit_id", + "git_commit_owner", + "git_commit_message_encoding", + "git_commit_message", + "git_commit_message_raw", + "git_commit_summary", + "git_commit_time", + "git_commit_time_offset", + "git_commit_committer", + "git_commit_author", + "git_commit_raw_header", + "git_commit_tree", + "git_commit_tree_id", + "git_commit_parentcount", + "git_commit_parent", + "git_commit_parent_id", + "git_commit_nth_gen_ancestor", + "git_commit_header_field", + "git_commit_create", + "git_commit_create_v", + "git_commit_amend" + ], + "meta": {}, + "lines": 364 + }, + { + "file": "common.h", + "functions": [ + "git_libgit2_version", + "git_libgit2_features", + "git_libgit2_opts" + ], + "meta": {}, + "lines": 245 + }, + { + "file": "config.h", + "functions": [ + "git_config_entry_free", + "git_config_find_global", + "git_config_find_xdg", + "git_config_find_system", + "git_config_open_default", + "git_config_new", + "git_config_add_file_ondisk", + "git_config_open_ondisk", + "git_config_open_level", + "git_config_open_global", + "git_config_snapshot", + "git_config_free", + "git_config_get_entry", + "git_config_get_int32", + "git_config_get_int64", + "git_config_get_bool", + "git_config_get_path", + "git_config_get_string", + "git_config_get_string_buf", + "git_config_get_multivar_foreach", + "git_config_multivar_iterator_new", + "git_config_next", + "git_config_iterator_free", + "git_config_set_int32", + "git_config_set_int64", + "git_config_set_bool", + "git_config_set_string", + "git_config_set_multivar", + "git_config_delete_entry", + "git_config_delete_multivar", + "git_config_foreach", + "git_config_iterator_new", + "git_config_iterator_glob_new", + "git_config_foreach_match", + "git_config_get_mapped", + "git_config_lookup_map_value", + "git_config_parse_bool", + "git_config_parse_int32", + "git_config_parse_int64", + "git_config_parse_path", + "git_config_backend_foreach_match" + ], + "meta": {}, + "lines": 691 + }, + { + "file": "cred_helpers.h", + "functions": [ + "git_cred_userpass" + ], + "meta": {}, + "lines": 48 + }, + { + "file": "describe.h", + "functions": [ + "git_describe_commit", + "git_describe_workdir", + "git_describe_format", + "git_describe_result_free" + ], + "meta": {}, + "lines": 158 + }, + { + "file": "diff.h", + "functions": [ + "git_diff_notify_cb", + "git_diff_init_options", + "git_diff_file_cb", + "git_diff_binary_cb", + "git_diff_hunk_cb", + "git_diff_line_cb", + "git_diff_find_init_options", + "git_diff_free", + "git_diff_tree_to_tree", + "git_diff_tree_to_index", + "git_diff_index_to_workdir", + "git_diff_tree_to_workdir", + "git_diff_tree_to_workdir_with_index", + "git_diff_merge", + "git_diff_find_similar", + "git_diff_num_deltas", + "git_diff_num_deltas_of_type", + "git_diff_get_delta", + "git_diff_is_sorted_icase", + "git_diff_foreach", + "git_diff_status_char", + "git_diff_print", + "git_diff_blobs", + "git_diff_blob_to_buffer", + "git_diff_buffers", + "git_diff_get_stats", + "git_diff_stats_files_changed", + "git_diff_stats_insertions", + "git_diff_stats_deletions", + "git_diff_stats_to_buf", + "git_diff_stats_free", + "git_diff_format_email", + "git_diff_commit_as_email", + "git_diff_format_email_init_options" + ], + "meta": {}, + "lines": 1301 + }, + { + "file": "errors.h", + "functions": [ + "giterr_last", + "giterr_clear", + "giterr_detach", + "giterr_set_str", + "giterr_set_oom" + ], + "meta": {}, + "lines": 160 + }, + { + "file": "filter.h", + "functions": [ + "git_filter_list_load", + "git_filter_list_contains", + "git_filter_list_apply_to_data", + "git_filter_list_apply_to_file", + "git_filter_list_apply_to_blob", + "git_filter_list_stream_data", + "git_filter_list_stream_file", + "git_filter_list_stream_blob", + "git_filter_list_free" + ], + "meta": {}, + "lines": 210 + }, + { + "file": "global.h", + "functions": [ + "git_libgit2_init", + "git_libgit2_shutdown" + ], + "meta": {}, + "lines": 39 + }, + { + "file": "graph.h", + "functions": [ + "git_graph_ahead_behind", + "git_graph_descendant_of" + ], + "meta": {}, + "lines": 51 + }, + { + "file": "ignore.h", + "functions": [ + "git_ignore_add_rule", + "git_ignore_clear_internal_rules", + "git_ignore_path_is_ignored" + ], + "meta": {}, + "lines": 74 + }, + { + "file": "index.h", + "functions": [ + "git_index_matched_path_cb", + "git_index_open", + "git_index_new", + "git_index_free", + "git_index_owner", + "git_index_caps", + "git_index_set_caps", + "git_index_read", + "git_index_write", + "git_index_path", + "git_index_checksum", + "git_index_read_tree", + "git_index_write_tree", + "git_index_write_tree_to", + "git_index_entrycount", + "git_index_clear", + "git_index_get_byindex", + "git_index_get_bypath", + "git_index_remove", + "git_index_remove_directory", + "git_index_add", + "git_index_entry_stage", + "git_index_entry_is_conflict", + "git_index_add_bypath", + "git_index_add_frombuffer", + "git_index_remove_bypath", + "git_index_add_all", + "git_index_remove_all", + "git_index_update_all", + "git_index_find", + "git_index_conflict_add", + "git_index_conflict_get", + "git_index_conflict_remove", + "git_index_conflict_cleanup", + "git_index_has_conflicts", + "git_index_conflict_iterator_new", + "git_index_conflict_next", + "git_index_conflict_iterator_free" + ], + "meta": {}, + "lines": 755 + }, + { + "file": "indexer.h", + "functions": [ + "git_indexer_new", + "git_indexer_append", + "git_indexer_commit", + "git_indexer_hash", + "git_indexer_free" + ], + "meta": {}, + "lines": 72 + }, + { + "file": "merge.h", + "functions": [ + "git_merge_file_init_input", + "git_merge_file_init_options", + "git_merge_init_options", + "git_merge_analysis", + "git_merge_base", + "git_merge_bases", + "git_merge_base_many", + "git_merge_bases_many", + "git_merge_base_octopus", + "git_merge_file", + "git_merge_file_from_index", + "git_merge_file_result_free", + "git_merge_trees", + "git_merge_commits", + "git_merge" + ], + "meta": {}, + "lines": 547 + }, + { + "file": "message.h", + "functions": [ + "git_message_prettify" + ], + "meta": {}, + "lines": 39 + }, + { + "file": "net.h", + "functions": [ + "git_headlist_cb" + ], + "meta": {}, + "lines": 55 + }, + { + "file": "notes.h", + "functions": [ + "git_note_foreach_cb", + "git_note_iterator_new", + "git_note_iterator_free", + "git_note_next", + "git_note_read", + "git_note_author", + "git_note_committer", + "git_note_message", + "git_note_id", + "git_note_create", + "git_note_remove", + "git_note_free", + "git_note_foreach" + ], + "meta": {}, + "lines": 213 + }, + { + "file": "object.h", + "functions": [ + "git_object_lookup", + "git_object_lookup_prefix", + "git_object_lookup_bypath", + "git_object_id", + "git_object_short_id", + "git_object_type", + "git_object_owner", + "git_object_free", + "git_object_type2string", + "git_object_string2type", + "git_object_typeisloose", + "git_object__size", + "git_object_peel", + "git_object_dup" + ], + "meta": {}, + "lines": 237 + }, + { + "file": "odb.h", + "functions": [ + "git_odb_foreach_cb", + "git_odb_new", + "git_odb_open", + "git_odb_add_disk_alternate", + "git_odb_free", + "git_odb_read", + "git_odb_read_prefix", + "git_odb_read_header", + "git_odb_exists", + "git_odb_exists_prefix", + "git_odb_refresh", + "git_odb_foreach", + "git_odb_write", + "git_odb_open_wstream", + "git_odb_stream_write", + "git_odb_stream_finalize_write", + "git_odb_stream_read", + "git_odb_stream_free", + "git_odb_open_rstream", + "git_odb_write_pack", + "git_odb_hash", + "git_odb_hashfile", + "git_odb_object_dup", + "git_odb_object_free", + "git_odb_object_id", + "git_odb_object_data", + "git_odb_object_size", + "git_odb_object_type", + "git_odb_add_backend", + "git_odb_add_alternate", + "git_odb_num_backends", + "git_odb_get_backend" + ], + "meta": {}, + "lines": 491 + }, + { + "file": "odb_backend.h", + "functions": [ + "git_odb_backend_pack", + "git_odb_backend_loose", + "git_odb_backend_one_pack" + ], + "meta": {}, + "lines": 130 + }, + { + "file": "oid.h", + "functions": [ + "git_oid_fromstr", + "git_oid_fromstrp", + "git_oid_fromstrn", + "git_oid_fromraw", + "git_oid_fmt", + "git_oid_nfmt", + "git_oid_pathfmt", + "git_oid_tostr_s", + "git_oid_tostr", + "git_oid_cpy", + "git_oid_cmp", + "git_oid_equal", + "git_oid_ncmp", + "git_oid_streq", + "git_oid_strcmp", + "git_oid_iszero", + "git_oid_shorten_new", + "git_oid_shorten_add", + "git_oid_shorten_free" + ], + "meta": {}, + "lines": 265 + }, + { + "file": "oidarray.h", + "functions": [ + "git_oidarray_free" + ], + "meta": {}, + "lines": 34 + }, + { + "file": "pack.h", + "functions": [ + "git_packbuilder_new", + "git_packbuilder_set_threads", + "git_packbuilder_insert", + "git_packbuilder_insert_tree", + "git_packbuilder_insert_commit", + "git_packbuilder_insert_walk", + "git_packbuilder_insert_recur", + "git_packbuilder_write", + "git_packbuilder_hash", + "git_packbuilder_foreach", + "git_packbuilder_object_count", + "git_packbuilder_written", + "git_packbuilder_progress", + "git_packbuilder_set_callbacks", + "git_packbuilder_free" + ], + "meta": {}, + "lines": 236 + }, + { + "file": "patch.h", + "functions": [ + "git_patch_from_diff", + "git_patch_from_blobs", + "git_patch_from_blob_and_buffer", + "git_patch_from_buffers", + "git_patch_free", + "git_patch_get_delta", + "git_patch_num_hunks", + "git_patch_line_stats", + "git_patch_get_hunk", + "git_patch_num_lines_in_hunk", + "git_patch_get_line_in_hunk", + "git_patch_size", + "git_patch_print", + "git_patch_to_buf" + ], + "meta": {}, + "lines": 268 + }, + { + "file": "pathspec.h", + "functions": [ + "git_pathspec_new", + "git_pathspec_free", + "git_pathspec_matches_path", + "git_pathspec_match_workdir", + "git_pathspec_match_index", + "git_pathspec_match_tree", + "git_pathspec_match_diff", + "git_pathspec_match_list_free", + "git_pathspec_match_list_entrycount", + "git_pathspec_match_list_entry", + "git_pathspec_match_list_diff_entry", + "git_pathspec_match_list_failed_entrycount", + "git_pathspec_match_list_failed_entry" + ], + "meta": {}, + "lines": 260 + }, + { + "file": "rebase.h", + "functions": [ + "git_rebase_init_options", + "git_rebase_init", + "git_rebase_open", + "git_rebase_operation_entrycount", + "git_rebase_operation_current", + "git_rebase_operation_byindex", + "git_rebase_next", + "git_rebase_commit", + "git_rebase_abort", + "git_rebase_finish", + "git_rebase_free" + ], + "meta": {}, + "lines": 286 + }, + { + "file": "refdb.h", + "functions": [ + "git_refdb_new", + "git_refdb_open", + "git_refdb_compress", + "git_refdb_free" + ], + "meta": {}, + "lines": 63 + }, + { + "file": "reflog.h", + "functions": [ + "git_reflog_read", + "git_reflog_write", + "git_reflog_append", + "git_reflog_rename", + "git_reflog_delete", + "git_reflog_entrycount", + "git_reflog_entry_byindex", + "git_reflog_drop", + "git_reflog_entry_id_old", + "git_reflog_entry_id_new", + "git_reflog_entry_committer", + "git_reflog_entry_message", + "git_reflog_free" + ], + "meta": {}, + "lines": 166 + }, + { + "file": "refs.h", + "functions": [ + "git_reference_lookup", + "git_reference_name_to_id", + "git_reference_dwim", + "git_reference_symbolic_create_matching", + "git_reference_symbolic_create", + "git_reference_create", + "git_reference_create_matching", + "git_reference_target", + "git_reference_target_peel", + "git_reference_symbolic_target", + "git_reference_type", + "git_reference_name", + "git_reference_resolve", + "git_reference_owner", + "git_reference_symbolic_set_target", + "git_reference_set_target", + "git_reference_rename", + "git_reference_delete", + "git_reference_remove", + "git_reference_list", + "git_reference_foreach", + "git_reference_foreach_name", + "git_reference_free", + "git_reference_cmp", + "git_reference_iterator_new", + "git_reference_iterator_glob_new", + "git_reference_next", + "git_reference_next_name", + "git_reference_iterator_free", + "git_reference_foreach_glob", + "git_reference_has_log", + "git_reference_ensure_log", + "git_reference_is_branch", + "git_reference_is_remote", + "git_reference_is_tag", + "git_reference_is_note", + "git_reference_normalize_name", + "git_reference_peel", + "git_reference_is_valid_name", + "git_reference_shorthand" + ], + "meta": {}, + "lines": 730 + }, + { + "file": "refspec.h", + "functions": [ + "git_refspec_src", + "git_refspec_dst", + "git_refspec_string", + "git_refspec_force", + "git_refspec_direction", + "git_refspec_src_matches", + "git_refspec_dst_matches", + "git_refspec_transform", + "git_refspec_rtransform" + ], + "meta": {}, + "lines": 100 + }, + { + "file": "remote.h", + "functions": [ + "git_remote_rename_problem_cb", + "git_remote_create", + "git_remote_create_with_fetchspec", + "git_remote_create_anonymous", + "git_remote_lookup", + "git_remote_dup", + "git_remote_owner", + "git_remote_name", + "git_remote_url", + "git_remote_pushurl", + "git_remote_set_url", + "git_remote_set_pushurl", + "git_remote_add_fetch", + "git_remote_get_fetch_refspecs", + "git_remote_add_push", + "git_remote_get_push_refspecs", + "git_remote_refspec_count", + "git_remote_get_refspec", + "git_remote_connect", + "git_remote_ls", + "git_remote_connected", + "git_remote_stop", + "git_remote_disconnect", + "git_remote_free", + "git_remote_list", + "git_push_transfer_progress", + "git_push_negotiation", + "git_remote_init_callbacks", + "git_fetch_init_options", + "git_push_init_options", + "git_remote_download", + "git_remote_upload", + "git_remote_update_tips", + "git_remote_fetch", + "git_remote_prune", + "git_remote_push", + "git_remote_stats", + "git_remote_autotag", + "git_remote_set_autotag", + "git_remote_prune_refs", + "git_remote_rename", + "git_remote_is_valid_name", + "git_remote_delete", + "git_remote_default_branch" + ], + "meta": {}, + "lines": 796 + }, + { + "file": "repository.h", + "functions": [ + "git_repository_open", + "git_repository_wrap_odb", + "git_repository_discover", + "git_repository_open_ext", + "git_repository_open_bare", + "git_repository_free", + "git_repository_init", + "git_repository_init_init_options", + "git_repository_init_ext", + "git_repository_head", + "git_repository_head_detached", + "git_repository_head_unborn", + "git_repository_is_empty", + "git_repository_path", + "git_repository_workdir", + "git_repository_set_workdir", + "git_repository_is_bare", + "git_repository_config", + "git_repository_config_snapshot", + "git_repository_odb", + "git_repository_refdb", + "git_repository_index", + "git_repository_message", + "git_repository_message_remove", + "git_repository_state_cleanup", + "git_repository_fetchhead_foreach", + "git_repository_mergehead_foreach", + "git_repository_hashfile", + "git_repository_set_head", + "git_repository_set_head_detached", + "git_repository_set_head_detached_from_annotated", + "git_repository_detach_head", + "git_repository_state", + "git_repository_set_namespace", + "git_repository_get_namespace", + "git_repository_is_shallow", + "git_repository_ident", + "git_repository_set_ident" + ], + "meta": {}, + "lines": 750 + }, + { + "file": "reset.h", + "functions": [ + "git_reset", + "git_reset_from_annotated", + "git_reset_default" + ], + "meta": {}, + "lines": 107 + }, + { + "file": "revert.h", + "functions": [ + "git_revert_init_options", + "git_revert_commit", + "git_revert" + ], + "meta": {}, + "lines": 84 + }, + { + "file": "revparse.h", + "functions": [ + "git_revparse_single", + "git_revparse_ext", + "git_revparse" + ], + "meta": {}, + "lines": 108 + }, + { + "file": "revwalk.h", + "functions": [ + "git_revwalk_new", + "git_revwalk_reset", + "git_revwalk_push", + "git_revwalk_push_glob", + "git_revwalk_push_head", + "git_revwalk_hide", + "git_revwalk_hide_glob", + "git_revwalk_hide_head", + "git_revwalk_push_ref", + "git_revwalk_hide_ref", + "git_revwalk_next", + "git_revwalk_sorting", + "git_revwalk_push_range", + "git_revwalk_simplify_first_parent", + "git_revwalk_free", + "git_revwalk_repository", + "git_revwalk_hide_cb", + "git_revwalk_add_hide_cb" + ], + "meta": {}, + "lines": 293 + }, + { + "file": "signature.h", + "functions": [ + "git_signature_new", + "git_signature_now", + "git_signature_default", + "git_signature_dup", + "git_signature_free" + ], + "meta": {}, + "lines": 86 + }, + { + "file": "stash.h", + "functions": [ + "git_stash_apply_progress_cb", + "git_stash_apply_init_options", + "git_stash_apply", + "git_stash_cb", + "git_stash_foreach", + "git_stash_drop", + "git_stash_pop" + ], + "meta": {}, + "lines": 253 + }, + { + "file": "status.h", + "functions": [ + "git_status_cb", + "git_status_init_options", + "git_status_foreach", + "git_status_foreach_ext", + "git_status_file", + "git_status_list_new", + "git_status_list_entrycount", + "git_status_byindex", + "git_status_list_free", + "git_status_should_ignore" + ], + "meta": {}, + "lines": 366 + }, + { + "file": "strarray.h", + "functions": [ + "git_strarray_free", + "git_strarray_copy" + ], + "meta": {}, + "lines": 53 + }, + { + "file": "submodule.h", + "functions": [ + "git_submodule_update_init_options", + "git_submodule_update", + "git_submodule_lookup", + "git_submodule_free", + "git_submodule_foreach", + "git_submodule_add_setup", + "git_submodule_add_finalize", + "git_submodule_add_to_index", + "git_submodule_owner", + "git_submodule_name", + "git_submodule_path", + "git_submodule_url", + "git_submodule_resolve_url", + "git_submodule_branch", + "git_submodule_set_branch", + "git_submodule_set_url", + "git_submodule_index_id", + "git_submodule_head_id", + "git_submodule_wd_id", + "git_submodule_ignore", + "git_submodule_set_ignore", + "git_submodule_update_strategy", + "git_submodule_set_update", + "git_submodule_fetch_recurse_submodules", + "git_submodule_set_fetch_recurse_submodules", + "git_submodule_init", + "git_submodule_repo_init", + "git_submodule_sync", + "git_submodule_open", + "git_submodule_reload", + "git_submodule_status", + "git_submodule_location" + ], + "meta": {}, + "lines": 622 + }, + { + "file": "sys/commit.h", + "functions": [ + "git_commit_create_from_ids", + "git_commit_create_from_callback" + ], + "meta": {}, + "lines": 76 + }, + { + "file": "sys/config.h", + "functions": [ + "git_config_init_backend", + "git_config_add_backend" + ], + "meta": {}, + "lines": 109 + }, + { + "file": "sys/diff.h", + "functions": [ + "git_diff_print_callback__to_buf", + "git_diff_print_callback__to_file_handle", + "git_diff_get_perfdata", + "git_status_list_get_perfdata" + ], + "meta": {}, + "lines": 90 + }, + { + "file": "sys/filter.h", + "functions": [ + "git_filter_lookup", + "git_filter_list_new", + "git_filter_list_push", + "git_filter_list_length", + "git_filter_source_repo", + "git_filter_source_path", + "git_filter_source_filemode", + "git_filter_source_id", + "git_filter_source_mode", + "git_filter_source_flags", + "git_filter_init_fn", + "git_filter_shutdown_fn", + "git_filter_check_fn", + "git_filter_apply_fn", + "git_filter_cleanup_fn", + "git_filter_register", + "git_filter_unregister" + ], + "meta": {}, + "lines": 305 + }, + { + "file": "sys/hashsig.h", + "functions": [ + "git_hashsig_create", + "git_hashsig_create_fromfile", + "git_hashsig_free", + "git_hashsig_compare" + ], + "meta": {}, + "lines": 102 + }, + { + "file": "sys/mempack.h", + "functions": [ + "git_mempack_new", + "git_mempack_reset" + ], + "meta": {}, + "lines": 81 + }, + { + "file": "sys/odb_backend.h", + "functions": [ + "git_odb_init_backend" + ], + "meta": {}, + "lines": 102 + }, + { + "file": "sys/openssl.h", + "functions": [ + "git_openssl_set_locking" + ], + "meta": {}, + "lines": 34 + }, + { + "file": "sys/refdb_backend.h", + "functions": [ + "git_refdb_init_backend", + "git_refdb_backend_fs", + "git_refdb_set_backend" + ], + "meta": {}, + "lines": 213 + }, + { + "file": "sys/refs.h", + "functions": [ + "git_reference__alloc", + "git_reference__alloc_symbolic" + ], + "meta": {}, + "lines": 45 + }, + { + "file": "sys/repository.h", + "functions": [ + "git_repository_new", + "git_repository__cleanup", + "git_repository_reinit_filesystem", + "git_repository_set_config", + "git_repository_set_odb", + "git_repository_set_refdb", + "git_repository_set_index", + "git_repository_set_bare" + ], + "meta": {}, + "lines": 136 + }, + { + "file": "sys/stream.h", + "functions": [], + "meta": {}, + "lines": 40 + }, + { + "file": "sys/transport.h", + "functions": [ + "git_transport_init", + "git_transport_new", + "git_transport_ssh_with_paths", + "git_transport_unregister", + "git_transport_dummy", + "git_transport_local", + "git_transport_smart", + "git_smart_subtransport_http", + "git_smart_subtransport_git", + "git_smart_subtransport_ssh" + ], + "meta": {}, + "lines": 349 + }, + { + "file": "tag.h", + "functions": [ + "git_tag_lookup", + "git_tag_lookup_prefix", + "git_tag_free", + "git_tag_id", + "git_tag_owner", + "git_tag_target", + "git_tag_target_id", + "git_tag_target_type", + "git_tag_name", + "git_tag_tagger", + "git_tag_message", + "git_tag_create", + "git_tag_annotation_create", + "git_tag_create_frombuffer", + "git_tag_create_lightweight", + "git_tag_delete", + "git_tag_list", + "git_tag_list_match", + "git_tag_foreach", + "git_tag_peel" + ], + "meta": {}, + "lines": 348 + }, + { + "file": "trace.h", + "functions": [ + "git_trace_callback", + "git_trace_set" + ], + "meta": {}, + "lines": 63 + }, + { + "file": "transport.h", + "functions": [ + "git_transport_cb", + "git_cred_has_username", + "git_cred_userpass_plaintext_new", + "git_cred_ssh_key_new", + "git_cred_ssh_interactive_new", + "git_cred_ssh_key_from_agent", + "git_cred_ssh_custom_new", + "git_cred_default_new", + "git_cred_username_new", + "git_cred_ssh_key_memory_new", + "git_cred_acquire_cb" + ], + "meta": {}, + "lines": 334 + }, + { + "file": "tree.h", + "functions": [ + "git_tree_lookup", + "git_tree_lookup_prefix", + "git_tree_free", + "git_tree_id", + "git_tree_owner", + "git_tree_entrycount", + "git_tree_entry_byname", + "git_tree_entry_byindex", + "git_tree_entry_byid", + "git_tree_entry_bypath", + "git_tree_entry_dup", + "git_tree_entry_free", + "git_tree_entry_name", + "git_tree_entry_id", + "git_tree_entry_type", + "git_tree_entry_filemode", + "git_tree_entry_filemode_raw", + "git_tree_entry_cmp", + "git_tree_entry_to_object", + "git_treebuilder_new", + "git_treebuilder_clear", + "git_treebuilder_entrycount", + "git_treebuilder_free", + "git_treebuilder_get", + "git_treebuilder_insert", + "git_treebuilder_remove", + "git_treebuilder_filter_cb", + "git_treebuilder_filter", + "git_treebuilder_write", + "git_treewalk_cb", + "git_tree_walk" + ], + "meta": {}, + "lines": 410 + }, + { + "file": "types.h", + "functions": [ + "git_transfer_progress_cb", + "git_transport_message_cb", + "git_transport_certificate_check_cb" + ], + "meta": {}, + "lines": 425 + } + ], + "functions": { + "git_annotated_commit_from_ref": { + "type": "function", + "file": "annotated_commit.h", + "line": 33, + "lineto": 36, + "args": [ + { + "name": "out", + "type": "git_annotated_commit **", + "comment": "pointer to store the git_annotated_commit result in" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "repository that contains the given reference" + }, + { + "name": "ref", + "type": "const git_reference *", + "comment": "reference to use to lookup the git_annotated_commit" + } + ], + "argline": "git_annotated_commit **out, git_repository *repo, const git_reference *ref", + "sig": "git_annotated_commit **::git_repository *::const git_reference *", + "return": { + "type": "int", + "comment": " 0 on success or error code" + }, + "description": "

Creates a git_annotated_commit from the given reference.\n The resulting git_annotated_commit must be freed with\n git_annotated_commit_free.

\n", + "comments": "", + "group": "annotated" + }, + "git_annotated_commit_from_fetchhead": { + "type": "function", + "file": "annotated_commit.h", + "line": 50, + "lineto": 55, + "args": [ + { + "name": "out", + "type": "git_annotated_commit **", + "comment": "pointer to store the git_annotated_commit result in" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "repository that contains the given commit" + }, + { + "name": "branch_name", + "type": "const char *", + "comment": "name of the (remote) branch" + }, + { + "name": "remote_url", + "type": "const char *", + "comment": "url of the remote" + }, + { + "name": "id", + "type": "const git_oid *", + "comment": "the commit object id of the remote branch" + } + ], + "argline": "git_annotated_commit **out, git_repository *repo, const char *branch_name, const char *remote_url, const git_oid *id", + "sig": "git_annotated_commit **::git_repository *::const char *::const char *::const git_oid *", + "return": { + "type": "int", + "comment": " 0 on success or error code" + }, + "description": "

Creates a git_annotated_commit from the given fetch head data.\n The resulting git_annotated_commit must be freed with\n git_annotated_commit_free.

\n", + "comments": "", + "group": "annotated" + }, + "git_annotated_commit_lookup": { + "type": "function", + "file": "annotated_commit.h", + "line": 75, + "lineto": 78, + "args": [ + { + "name": "out", + "type": "git_annotated_commit **", + "comment": "pointer to store the git_annotated_commit result in" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "repository that contains the given commit" + }, + { + "name": "id", + "type": "const git_oid *", + "comment": "the commit object id to lookup" + } + ], + "argline": "git_annotated_commit **out, git_repository *repo, const git_oid *id", + "sig": "git_annotated_commit **::git_repository *::const git_oid *", + "return": { + "type": "int", + "comment": " 0 on success or error code" + }, + "description": "

Creates a git_annotated_commit from the given commit id.\n The resulting git_annotated_commit must be freed with\n git_annotated_commit_free.

\n", + "comments": "

An annotated commit contains information about how it was\n looked up, which may be useful for functions like merge or\n rebase to provide context to the operation. For example,\n conflict files will include the name of the source or target\n branches being merged. It is therefore preferable to use the\n most specific function (eg git_annotated_commit_from_ref)\n instead of this one when that data is known.

\n", + "group": "annotated" + }, + "git_annotated_commit_from_revspec": { + "type": "function", + "file": "annotated_commit.h", + "line": 92, + "lineto": 95, + "args": [ + { + "name": "out", + "type": "git_annotated_commit **", + "comment": "pointer to store the git_annotated_commit result in" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "repository that contains the given commit" + }, + { + "name": "revspec", + "type": "const char *", + "comment": "the extended sha syntax string to use to lookup the commit" + } + ], + "argline": "git_annotated_commit **out, git_repository *repo, const char *revspec", + "sig": "git_annotated_commit **::git_repository *::const char *", + "return": { + "type": "int", + "comment": " 0 on success or error code" + }, + "description": "

Creates a git_annotated_comit from a revision string.

\n", + "comments": "

See man gitrevisions, or\n http://git-scm.com/docs/git-rev-parse.html#_specifying_revisions for\n information on the syntax accepted.

\n", + "group": "annotated" + }, + "git_annotated_commit_id": { + "type": "function", + "file": "annotated_commit.h", + "line": 103, + "lineto": 104, + "args": [ + { + "name": "commit", + "type": "const git_annotated_commit *", + "comment": "the given annotated commit" + } + ], + "argline": "const git_annotated_commit *commit", + "sig": "const git_annotated_commit *", + "return": { + "type": "const git_oid *", + "comment": " commit id" + }, + "description": "

Gets the commit ID that the given git_annotated_commit refers to.

\n", + "comments": "", + "group": "annotated" + }, + "git_annotated_commit_free": { + "type": "function", + "file": "annotated_commit.h", + "line": 111, + "lineto": 112, + "args": [ + { + "name": "commit", + "type": "git_annotated_commit *", + "comment": "annotated commit to free" + } + ], + "argline": "git_annotated_commit *commit", + "sig": "git_annotated_commit *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Frees a git_annotated_commit.

\n", + "comments": "", + "group": "annotated" + }, + "git_attr_value": { + "type": "function", + "file": "attr.h", + "line": 102, + "lineto": 102, + "args": [ + { + "name": "attr", + "type": "const char *", + "comment": "The attribute" + } + ], + "argline": "const char *attr", + "sig": "const char *", + "return": { + "type": "git_attr_t", + "comment": " the value type for the attribute" + }, + "description": "

Return the value type for a given attribute.

\n", + "comments": "

This can be either TRUE, FALSE, UNSPECIFIED (if the attribute\n was not set at all), or VALUE, if the attribute was set to an\n actual string.

\n\n

If the attribute has a VALUE string, it can be accessed normally\n as a NULL-terminated C string.

\n", + "group": "attr" + }, + "git_attr_get": { + "type": "function", + "file": "attr.h", + "line": 145, + "lineto": 150, + "args": [ + { + "name": "value_out", + "type": "const char **", + "comment": "Output of the value of the attribute. Use the GIT_ATTR_...\n macros to test for TRUE, FALSE, UNSPECIFIED, etc. or just\n use the string value for attributes set to a value. You\n should NOT modify or free this value." + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "The repository containing the path." + }, + { + "name": "flags", + "type": "uint32_t", + "comment": "A combination of GIT_ATTR_CHECK... flags." + }, + { + "name": "path", + "type": "const char *", + "comment": "The path to check for attributes. Relative paths are\n interpreted relative to the repo root. The file does\n not have to exist, but if it does not, then it will be\n treated as a plain file (not a directory)." + }, + { + "name": "name", + "type": "const char *", + "comment": "The name of the attribute to look up." + } + ], + "argline": "const char **value_out, git_repository *repo, uint32_t flags, const char *path, const char *name", + "sig": "const char **::git_repository *::uint32_t::const char *::const char *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Look up the value of one git attribute for path.

\n", + "comments": "", + "group": "attr" + }, + "git_attr_get_many": { + "type": "function", + "file": "attr.h", + "line": 181, + "lineto": 187, + "args": [ + { + "name": "values_out", + "type": "const char **", + "comment": "An array of num_attr entries that will have string\n pointers written into it for the values of the attributes.\n You should not modify or free the values that are written\n into this array (although of course, you should free the\n array itself if you allocated it)." + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "The repository containing the path." + }, + { + "name": "flags", + "type": "uint32_t", + "comment": "A combination of GIT_ATTR_CHECK... flags." + }, + { + "name": "path", + "type": "const char *", + "comment": "The path inside the repo to check attributes. This\n does not have to exist, but if it does not, then\n it will be treated as a plain file (i.e. not a directory)." + }, + { + "name": "num_attr", + "type": "size_t", + "comment": "The number of attributes being looked up" + }, + { + "name": "names", + "type": "const char **", + "comment": "An array of num_attr strings containing attribute names." + } + ], + "argline": "const char **values_out, git_repository *repo, uint32_t flags, const char *path, size_t num_attr, const char **names", + "sig": "const char **::git_repository *::uint32_t::const char *::size_t::const char **", + "return": { + "type": "int", + "comment": null + }, + "description": "

Look up a list of git attributes for path.

\n", + "comments": "

Use this if you have a known list of attributes that you want to\n look up in a single call. This is somewhat more efficient than\n calling git_attr_get() multiple times.

\n\n

For example, you might write:

\n\n
 const char *attrs[] = { "crlf", "diff", "foo" };\n const char **values[3];\n git_attr_get_many(values, repo, 0, "my/fun/file.c", 3, attrs);\n
\n\n

Then you could loop through the 3 values to get the settings for\n the three attributes you asked about.

\n", + "group": "attr" + }, + "git_attr_foreach": { + "type": "function", + "file": "attr.h", + "line": 209, + "lineto": 214, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "The repository containing the path." + }, + { + "name": "flags", + "type": "uint32_t", + "comment": "A combination of GIT_ATTR_CHECK... flags." + }, + { + "name": "path", + "type": "const char *", + "comment": "Path inside the repo to check attributes. This does not have\n to exist, but if it does not, then it will be treated as a\n plain file (i.e. not a directory)." + }, + { + "name": "callback", + "type": "git_attr_foreach_cb", + "comment": "Function to invoke on each attribute name and value. The\n value may be NULL is the attribute is explicitly set to\n UNSPECIFIED using the '!' sign. Callback will be invoked\n only once per attribute name, even if there are multiple\n rules for a given file. The highest priority rule will be\n used. Return a non-zero value from this to stop looping.\n The value will be returned from `git_attr_foreach`." + }, + { + "name": "payload", + "type": "void *", + "comment": "Passed on as extra parameter to callback function." + } + ], + "argline": "git_repository *repo, uint32_t flags, const char *path, git_attr_foreach_cb callback, void *payload", + "sig": "git_repository *::uint32_t::const char *::git_attr_foreach_cb::void *", + "return": { + "type": "int", + "comment": " 0 on success, non-zero callback return value, or error code" + }, + "description": "

Loop over all the git attributes for a path.

\n", + "comments": "", + "group": "attr" + }, + "git_attr_cache_flush": { + "type": "function", + "file": "attr.h", + "line": 224, + "lineto": 225, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": null + } + ], + "argline": "git_repository *repo", + "sig": "git_repository *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Flush the gitattributes cache.

\n", + "comments": "

Call this if you have reason to believe that the attributes files on\n disk no longer match the cached contents of memory. This will cause\n the attributes files to be reloaded the next time that an attribute\n access function is called.

\n", + "group": "attr" + }, + "git_attr_add_macro": { + "type": "function", + "file": "attr.h", + "line": 237, + "lineto": 240, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": null + }, + { + "name": "name", + "type": "const char *", + "comment": null + }, + { + "name": "values", + "type": "const char *", + "comment": null + } + ], + "argline": "git_repository *repo, const char *name, const char *values", + "sig": "git_repository *::const char *::const char *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Add a macro definition.

\n", + "comments": "

Macros will automatically be loaded from the top level .gitattributes\n file of the repository (plus the build-in "binary" macro). This\n function allows you to add others. For example, to add the default\n macro, you would call:

\n\n
 git_attr_add_macro(repo, "binary", "-diff -crlf");\n
\n", + "group": "attr" + }, + "git_blame_init_options": { + "type": "function", + "file": "blame.h", + "line": 92, + "lineto": 94, + "args": [ + { + "name": "opts", + "type": "git_blame_options *", + "comment": "The `git_blame_options` struct to initialize" + }, + { + "name": "version", + "type": "unsigned int", + "comment": "Version of struct; pass `GIT_BLAME_OPTIONS_VERSION`" + } + ], + "argline": "git_blame_options *opts, unsigned int version", + "sig": "git_blame_options *::unsigned int", + "return": { + "type": "int", + "comment": " Zero on success; -1 on failure." + }, + "description": "

Initializes a git_blame_options with default values. Equivalent to\n creating an instance with GIT_BLAME_OPTIONS_INIT.

\n", + "comments": "", + "group": "blame" + }, + "git_blame_get_hunk_count": { + "type": "function", + "file": "blame.h", + "line": 137, + "lineto": 137, + "args": [ + { + "name": "blame", + "type": "git_blame *", + "comment": null + } + ], + "argline": "git_blame *blame", + "sig": "git_blame *", + "return": { + "type": "uint32_t", + "comment": null + }, + "description": "

Gets the number of hunks that exist in the blame structure.

\n", + "comments": "", + "group": "blame" + }, + "git_blame_get_hunk_byindex": { + "type": "function", + "file": "blame.h", + "line": 146, + "lineto": 148, + "args": [ + { + "name": "blame", + "type": "git_blame *", + "comment": "the blame structure to query" + }, + { + "name": "index", + "type": "uint32_t", + "comment": "index of the hunk to retrieve" + } + ], + "argline": "git_blame *blame, uint32_t index", + "sig": "git_blame *::uint32_t", + "return": { + "type": "const git_blame_hunk *", + "comment": " the hunk at the given index, or NULL on error" + }, + "description": "

Gets the blame hunk at the given index.

\n", + "comments": "", + "group": "blame" + }, + "git_blame_get_hunk_byline": { + "type": "function", + "file": "blame.h", + "line": 157, + "lineto": 159, + "args": [ + { + "name": "blame", + "type": "git_blame *", + "comment": "the blame structure to query" + }, + { + "name": "lineno", + "type": "uint32_t", + "comment": "the (1-based) line number to find a hunk for" + } + ], + "argline": "git_blame *blame, uint32_t lineno", + "sig": "git_blame *::uint32_t", + "return": { + "type": "const git_blame_hunk *", + "comment": " the hunk that contains the given line, or NULL on error" + }, + "description": "

Gets the hunk that relates to the given line number in the newest commit.

\n", + "comments": "", + "group": "blame", + "examples": { + "blame.c": [ + "ex/v0.23.2/blame.html#git_blame_get_hunk_byline-1" + ] + } + }, + "git_blame_file": { + "type": "function", + "file": "blame.h", + "line": 172, + "lineto": 176, + "args": [ + { + "name": "out", + "type": "git_blame **", + "comment": "pointer that will receive the blame object" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "repository whose history is to be walked" + }, + { + "name": "path", + "type": "const char *", + "comment": "path to file to consider" + }, + { + "name": "options", + "type": "git_blame_options *", + "comment": "options for the blame operation. If NULL, this is treated as\n though GIT_BLAME_OPTIONS_INIT were passed." + } + ], + "argline": "git_blame **out, git_repository *repo, const char *path, git_blame_options *options", + "sig": "git_blame **::git_repository *::const char *::git_blame_options *", + "return": { + "type": "int", + "comment": " 0 on success, or an error code. (use giterr_last for information\n about the error.)" + }, + "description": "

Get the blame for a single file.

\n", + "comments": "", + "group": "blame", + "examples": { + "blame.c": [ + "ex/v0.23.2/blame.html#git_blame_file-2" + ] + } + }, + "git_blame_buffer": { + "type": "function", + "file": "blame.h", + "line": 196, + "lineto": 200, + "args": [ + { + "name": "out", + "type": "git_blame **", + "comment": "pointer that will receive the resulting blame data" + }, + { + "name": "reference", + "type": "git_blame *", + "comment": "cached blame from the history of the file (usually the output\n from git_blame_file)" + }, + { + "name": "buffer", + "type": "const char *", + "comment": "the (possibly) modified contents of the file" + }, + { + "name": "buffer_len", + "type": "size_t", + "comment": "number of valid bytes in the buffer" + } + ], + "argline": "git_blame **out, git_blame *reference, const char *buffer, size_t buffer_len", + "sig": "git_blame **::git_blame *::const char *::size_t", + "return": { + "type": "int", + "comment": " 0 on success, or an error code. (use giterr_last for information\n about the error)" + }, + "description": "

Get blame data for a file that has been modified in memory. The reference\n parameter is a pre-calculated blame for the in-odb history of the file. This\n means that once a file blame is completed (which can be expensive), updating\n the buffer blame is very fast.

\n", + "comments": "

Lines that differ between the buffer and the committed version are marked as\n having a zero OID for their final_commit_id.

\n", + "group": "blame" + }, + "git_blame_free": { + "type": "function", + "file": "blame.h", + "line": 207, + "lineto": 207, + "args": [ + { + "name": "blame", + "type": "git_blame *", + "comment": "the blame structure to free" + } + ], + "argline": "git_blame *blame", + "sig": "git_blame *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Free memory allocated by git_blame_file or git_blame_buffer.

\n", + "comments": "", + "group": "blame", + "examples": { + "blame.c": [ + "ex/v0.23.2/blame.html#git_blame_free-3" + ] + } + }, + "git_blob_lookup": { + "type": "function", + "file": "blob.h", + "line": 33, + "lineto": 33, + "args": [ + { + "name": "blob", + "type": "git_blob **", + "comment": "pointer to the looked up blob" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "the repo to use when locating the blob." + }, + { + "name": "id", + "type": "const git_oid *", + "comment": "identity of the blob to locate." + } + ], + "argline": "git_blob **blob, git_repository *repo, const git_oid *id", + "sig": "git_blob **::git_repository *::const git_oid *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Lookup a blob object from a repository.

\n", + "comments": "", + "group": "blob", + "examples": { + "blame.c": [ + "ex/v0.23.2/blame.html#git_blob_lookup-4" + ], + "general.c": [ + "ex/v0.23.2/general.html#git_blob_lookup-1" + ] + } + }, + "git_blob_lookup_prefix": { + "type": "function", + "file": "blob.h", + "line": 47, + "lineto": 47, + "args": [ + { + "name": "blob", + "type": "git_blob **", + "comment": "pointer to the looked up blob" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "the repo to use when locating the blob." + }, + { + "name": "id", + "type": "const git_oid *", + "comment": "identity of the blob to locate." + }, + { + "name": "len", + "type": "size_t", + "comment": "the length of the short identifier" + } + ], + "argline": "git_blob **blob, git_repository *repo, const git_oid *id, size_t len", + "sig": "git_blob **::git_repository *::const git_oid *::size_t", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Lookup a blob object from a repository,\n given a prefix of its identifier (short id).

\n", + "comments": "", + "group": "blob" + }, + "git_blob_free": { + "type": "function", + "file": "blob.h", + "line": 60, + "lineto": 60, + "args": [ + { + "name": "blob", + "type": "git_blob *", + "comment": "the blob to close" + } + ], + "argline": "git_blob *blob", + "sig": "git_blob *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Close an open blob

\n", + "comments": "

This is a wrapper around git_object_free()

\n\n

IMPORTANT:\n It is necessary to call this method when you stop\n using a blob. Failure to do so will cause a memory leak.

\n", + "group": "blob", + "examples": { + "blame.c": [ + "ex/v0.23.2/blame.html#git_blob_free-5" + ] + } + }, + "git_blob_id": { + "type": "function", + "file": "blob.h", + "line": 68, + "lineto": 68, + "args": [ + { + "name": "blob", + "type": "const git_blob *", + "comment": "a previously loaded blob." + } + ], + "argline": "const git_blob *blob", + "sig": "const git_blob *", + "return": { + "type": "const git_oid *", + "comment": " SHA1 hash for this blob." + }, + "description": "

Get the id of a blob.

\n", + "comments": "", + "group": "blob" + }, + "git_blob_owner": { + "type": "function", + "file": "blob.h", + "line": 76, + "lineto": 76, + "args": [ + { + "name": "blob", + "type": "const git_blob *", + "comment": "A previously loaded blob." + } + ], + "argline": "const git_blob *blob", + "sig": "const git_blob *", + "return": { + "type": "git_repository *", + "comment": " Repository that contains this blob." + }, + "description": "

Get the repository that contains the blob.

\n", + "comments": "", + "group": "blob" + }, + "git_blob_rawcontent": { + "type": "function", + "file": "blob.h", + "line": 89, + "lineto": 89, + "args": [ + { + "name": "blob", + "type": "const git_blob *", + "comment": "pointer to the blob" + } + ], + "argline": "const git_blob *blob", + "sig": "const git_blob *", + "return": { + "type": "const void *", + "comment": " the pointer" + }, + "description": "

Get a read-only buffer with the raw content of a blob.

\n", + "comments": "

A pointer to the raw content of a blob is returned;\n this pointer is owned internally by the object and shall\n not be free'd. The pointer may be invalidated at a later\n time.

\n", + "group": "blob", + "examples": { + "blame.c": [ + "ex/v0.23.2/blame.html#git_blob_rawcontent-6" + ], + "cat-file.c": [ + "ex/v0.23.2/cat-file.html#git_blob_rawcontent-1" + ], + "general.c": [ + "ex/v0.23.2/general.html#git_blob_rawcontent-2" + ] + } + }, + "git_blob_rawsize": { + "type": "function", + "file": "blob.h", + "line": 97, + "lineto": 97, + "args": [ + { + "name": "blob", + "type": "const git_blob *", + "comment": "pointer to the blob" + } + ], + "argline": "const git_blob *blob", + "sig": "const git_blob *", + "return": { + "type": "git_off_t", + "comment": " size on bytes" + }, + "description": "

Get the size in bytes of the contents of a blob

\n", + "comments": "", + "group": "blob", + "examples": { + "blame.c": [ + "ex/v0.23.2/blame.html#git_blob_rawsize-7" + ], + "cat-file.c": [ + "ex/v0.23.2/cat-file.html#git_blob_rawsize-2" + ], + "general.c": [ + "ex/v0.23.2/general.html#git_blob_rawsize-3", + "ex/v0.23.2/general.html#git_blob_rawsize-4" + ] + } + }, + "git_blob_filtered_content": { + "type": "function", + "file": "blob.h", + "line": 122, + "lineto": 126, + "args": [ + { + "name": "out", + "type": "git_buf *", + "comment": "The git_buf to be filled in" + }, + { + "name": "blob", + "type": "git_blob *", + "comment": "Pointer to the blob" + }, + { + "name": "as_path", + "type": "const char *", + "comment": "Path used for file attribute lookups, etc." + }, + { + "name": "check_for_binary_data", + "type": "int", + "comment": "Should this test if blob content contains\n NUL bytes / looks like binary data before applying filters?" + } + ], + "argline": "git_buf *out, git_blob *blob, const char *as_path, int check_for_binary_data", + "sig": "git_buf *::git_blob *::const char *::int", + "return": { + "type": "int", + "comment": " 0 on success or an error code" + }, + "description": "

Get a buffer with the filtered content of a blob.

\n", + "comments": "

This applies filters as if the blob was being checked out to the\n working directory under the specified filename. This may apply\n CRLF filtering or other types of changes depending on the file\n attributes set for the blob and the content detected in it.

\n\n

The output is written into a git_buf which the caller must free\n when done (via git_buf_free).

\n\n

If no filters need to be applied, then the out buffer will just\n be populated with a pointer to the raw content of the blob. In\n that case, be careful to not free the blob until done with the\n buffer or copy it into memory you own.

\n", + "group": "blob" + }, + "git_blob_create_fromworkdir": { + "type": "function", + "file": "blob.h", + "line": 139, + "lineto": 139, + "args": [ + { + "name": "id", + "type": "git_oid *", + "comment": "return the id of the written blob" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "repository where the blob will be written.\n\tthis repository cannot be bare" + }, + { + "name": "relative_path", + "type": "const char *", + "comment": "file from which the blob will be created,\n\trelative to the repository's working dir" + } + ], + "argline": "git_oid *id, git_repository *repo, const char *relative_path", + "sig": "git_oid *::git_repository *::const char *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Read a file from the working folder of a repository\n and write it to the Object Database as a loose blob

\n", + "comments": "", + "group": "blob" + }, + "git_blob_create_fromdisk": { + "type": "function", + "file": "blob.h", + "line": 151, + "lineto": 151, + "args": [ + { + "name": "id", + "type": "git_oid *", + "comment": "return the id of the written blob" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "repository where the blob will be written.\n\tthis repository can be bare or not" + }, + { + "name": "path", + "type": "const char *", + "comment": "file from which the blob will be created" + } + ], + "argline": "git_oid *id, git_repository *repo, const char *path", + "sig": "git_oid *::git_repository *::const char *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Read a file from the filesystem and write its content\n to the Object Database as a loose blob

\n", + "comments": "", + "group": "blob" + }, + "git_blob_create_fromchunks": { + "type": "function", + "file": "blob.h", + "line": 187, + "lineto": 192, + "args": [ + { + "name": "id", + "type": "git_oid *", + "comment": "Return the id of the written blob" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "Repository where the blob will be written.\n This repository can be bare or not." + }, + { + "name": "hintpath", + "type": "const char *", + "comment": "If not NULL, will be used to select data filters\n to apply onto the content of the blob to be created." + }, + { + "name": "callback", + "type": "git_blob_chunk_cb", + "comment": null + }, + { + "name": "payload", + "type": "void *", + "comment": null + } + ], + "argline": "git_oid *id, git_repository *repo, const char *hintpath, git_blob_chunk_cb callback, void *payload", + "sig": "git_oid *::git_repository *::const char *::git_blob_chunk_cb::void *", + "return": { + "type": "int", + "comment": " 0 or error code (from either libgit2 or callback function)" + }, + "description": "

Write a loose blob to the Object Database from a\n provider of chunks of data.

\n", + "comments": "

If the hintpath parameter is filled, it will be used to determine\n what git filters should be applied to the object before it is written\n to the object database.

\n\n

The implementation of the callback MUST respect the following rules:

\n\n
    \n

  • content must be filled by the callback. The maximum number of\nbytes that the buffer can accept per call is defined by the\nmax_length parameter. Allocation and freeing of the buffer will\nbe taken care of by libgit2.

    • \n

  • The callback must return the number of bytes that have been\nwritten to the content buffer.

    • \n

  • When there is no more data to stream, callback should return

    \n\n
      \n
    1. This will prevent it from being invoked anymore.
      2. \n
    • \n

  • If an error occurs, the callback should return a negative value.\nThis value will be returned to the caller.

    • \n
\n", + "group": "blob" + }, + "git_blob_create_frombuffer": { + "type": "function", + "file": "blob.h", + "line": 203, + "lineto": 204, + "args": [ + { + "name": "id", + "type": "git_oid *", + "comment": "return the id of the written blob" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "repository where to blob will be written" + }, + { + "name": "buffer", + "type": "const void *", + "comment": "data to be written into the blob" + }, + { + "name": "len", + "type": "size_t", + "comment": "length of the data" + } + ], + "argline": "git_oid *id, git_repository *repo, const void *buffer, size_t len", + "sig": "git_oid *::git_repository *::const void *::size_t", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Write an in-memory buffer to the ODB as a blob

\n", + "comments": "", + "group": "blob" + }, + "git_blob_is_binary": { + "type": "function", + "file": "blob.h", + "line": 217, + "lineto": 217, + "args": [ + { + "name": "blob", + "type": "const git_blob *", + "comment": "The blob which content should be analyzed" + } + ], + "argline": "const git_blob *blob", + "sig": "const git_blob *", + "return": { + "type": "int", + "comment": " 1 if the content of the blob is detected\n as binary; 0 otherwise." + }, + "description": "

Determine if the blob content is most certainly binary or not.

\n", + "comments": "

The heuristic used to guess if a file is binary is taken from core git:\n Searching for NUL bytes and looking for a reasonable ratio of printable\n to non-printable characters among the first 8000 bytes.

\n", + "group": "blob" + }, + "git_branch_create": { + "type": "function", + "file": "branch.h", + "line": 50, + "lineto": 55, + "args": [ + { + "name": "out", + "type": "git_reference **", + "comment": "Pointer where to store the underlying reference." + }, + { + "name": "repo", + "type": "git_repository *", + "comment": null + }, + { + "name": "branch_name", + "type": "const char *", + "comment": "Name for the branch; this name is\n validated for consistency. It should also not conflict with\n an already existing branch name." + }, + { + "name": "target", + "type": "const git_commit *", + "comment": "Commit to which this branch should point. This object\n must belong to the given `repo`." + }, + { + "name": "force", + "type": "int", + "comment": "Overwrite existing branch." + } + ], + "argline": "git_reference **out, git_repository *repo, const char *branch_name, const git_commit *target, int force", + "sig": "git_reference **::git_repository *::const char *::const git_commit *::int", + "return": { + "type": "int", + "comment": " 0, GIT_EINVALIDSPEC or an error code.\n A proper reference is written in the refs/heads namespace\n pointing to the provided target commit." + }, + "description": "

Create a new branch pointing at a target commit

\n", + "comments": "

A new direct reference will be created pointing to\n this target commit. If force is true and a reference\n already exists with the given name, it'll be replaced.

\n\n

The returned reference must be freed by the user.

\n\n

The branch name will be checked for validity.\n See git_tag_create() for rules about valid names.

\n", + "group": "branch" + }, + "git_branch_create_from_annotated": { + "type": "function", + "file": "branch.h", + "line": 68, + "lineto": 73, + "args": [ + { + "name": "ref_out", + "type": "git_reference **", + "comment": null + }, + { + "name": "repository", + "type": "git_repository *", + "comment": null + }, + { + "name": "branch_name", + "type": "const char *", + "comment": null + }, + { + "name": "commit", + "type": "const git_annotated_commit *", + "comment": null + }, + { + "name": "force", + "type": "int", + "comment": null + } + ], + "argline": "git_reference **ref_out, git_repository *repository, const char *branch_name, const git_annotated_commit *commit, int force", + "sig": "git_reference **::git_repository *::const char *::const git_annotated_commit *::int", + "return": { + "type": "int", + "comment": null + }, + "description": "

Create a new branch pointing at a target commit

\n", + "comments": "

This behaves like git_branch_create() but takes an annotated\n commit, which lets you specify which extended sha syntax string was\n specified by a user, allowing for more exact reflog messages.

\n\n

See the documentation for git_branch_create().

\n", + "group": "branch" + }, + "git_branch_delete": { + "type": "function", + "file": "branch.h", + "line": 85, + "lineto": 85, + "args": [ + { + "name": "branch", + "type": "git_reference *", + "comment": "A valid reference representing a branch" + } + ], + "argline": "git_reference *branch", + "sig": "git_reference *", + "return": { + "type": "int", + "comment": " 0 on success, or an error code." + }, + "description": "

Delete an existing branch reference.

\n", + "comments": "

If the branch is successfully deleted, the passed reference\n object will be invalidated. The reference must be freed manually\n by the user.

\n", + "group": "branch" + }, + "git_branch_iterator_new": { + "type": "function", + "file": "branch.h", + "line": 101, + "lineto": 104, + "args": [ + { + "name": "out", + "type": "git_branch_iterator **", + "comment": "the iterator" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "Repository where to find the branches." + }, + { + "name": "list_flags", + "type": "git_branch_t", + "comment": "Filtering flags for the branch\n listing. Valid values are GIT_BRANCH_LOCAL, GIT_BRANCH_REMOTE\n or GIT_BRANCH_ALL." + } + ], + "argline": "git_branch_iterator **out, git_repository *repo, git_branch_t list_flags", + "sig": "git_branch_iterator **::git_repository *::git_branch_t", + "return": { + "type": "int", + "comment": " 0 on success or an error code" + }, + "description": "

Create an iterator which loops over the requested branches.

\n", + "comments": "", + "group": "branch" + }, + "git_branch_next": { + "type": "function", + "file": "branch.h", + "line": 114, + "lineto": 114, + "args": [ + { + "name": "out", + "type": "git_reference **", + "comment": "the reference" + }, + { + "name": "out_type", + "type": "git_branch_t *", + "comment": "the type of branch (local or remote-tracking)" + }, + { + "name": "iter", + "type": "git_branch_iterator *", + "comment": "the branch iterator" + } + ], + "argline": "git_reference **out, git_branch_t *out_type, git_branch_iterator *iter", + "sig": "git_reference **::git_branch_t *::git_branch_iterator *", + "return": { + "type": "int", + "comment": " 0 on success, GIT_ITEROVER if there are no more branches or an error code." + }, + "description": "

Retrieve the next branch from the iterator

\n", + "comments": "", + "group": "branch" + }, + "git_branch_iterator_free": { + "type": "function", + "file": "branch.h", + "line": 121, + "lineto": 121, + "args": [ + { + "name": "iter", + "type": "git_branch_iterator *", + "comment": "the iterator to free" + } + ], + "argline": "git_branch_iterator *iter", + "sig": "git_branch_iterator *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Free a branch iterator

\n", + "comments": "", + "group": "branch" + }, + "git_branch_move": { + "type": "function", + "file": "branch.h", + "line": 138, + "lineto": 142, + "args": [ + { + "name": "out", + "type": "git_reference **", + "comment": null + }, + { + "name": "branch", + "type": "git_reference *", + "comment": "Current underlying reference of the branch." + }, + { + "name": "new_branch_name", + "type": "const char *", + "comment": "Target name of the branch once the move\n is performed; this name is validated for consistency." + }, + { + "name": "force", + "type": "int", + "comment": "Overwrite existing branch." + } + ], + "argline": "git_reference **out, git_reference *branch, const char *new_branch_name, int force", + "sig": "git_reference **::git_reference *::const char *::int", + "return": { + "type": "int", + "comment": " 0 on success, GIT_EINVALIDSPEC or an error code." + }, + "description": "

Move/rename an existing local branch reference.

\n", + "comments": "

The new branch name will be checked for validity.\n See git_tag_create() for rules about valid names.

\n", + "group": "branch" + }, + "git_branch_lookup": { + "type": "function", + "file": "branch.h", + "line": 165, + "lineto": 169, + "args": [ + { + "name": "out", + "type": "git_reference **", + "comment": "pointer to the looked-up branch reference" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "the repository to look up the branch" + }, + { + "name": "branch_name", + "type": "const char *", + "comment": "Name of the branch to be looked-up;\n this name is validated for consistency." + }, + { + "name": "branch_type", + "type": "git_branch_t", + "comment": "Type of the considered branch. This should\n be valued with either GIT_BRANCH_LOCAL or GIT_BRANCH_REMOTE." + } + ], + "argline": "git_reference **out, git_repository *repo, const char *branch_name, git_branch_t branch_type", + "sig": "git_reference **::git_repository *::const char *::git_branch_t", + "return": { + "type": "int", + "comment": " 0 on success; GIT_ENOTFOUND when no matching branch\n exists, GIT_EINVALIDSPEC, otherwise an error code." + }, + "description": "

Lookup a branch by its name in a repository.

\n", + "comments": "

The generated reference must be freed by the user.

\n\n

The branch name will be checked for validity.\n See git_tag_create() for rules about valid names.

\n", + "group": "branch" + }, + "git_branch_name": { + "type": "function", + "file": "branch.h", + "line": 186, + "lineto": 188, + "args": [ + { + "name": "out", + "type": "const char **", + "comment": "where the pointer of branch name is stored;\n this is valid as long as the ref is not freed." + }, + { + "name": "ref", + "type": "const git_reference *", + "comment": "the reference ideally pointing to a branch" + } + ], + "argline": "const char **out, const git_reference *ref", + "sig": "const char **::const git_reference *", + "return": { + "type": "int", + "comment": " 0 on success; otherwise an error code (e.g., if the\n ref is no local or remote branch)." + }, + "description": "

Return the name of the given local or remote branch.

\n", + "comments": "

The name of the branch matches the definition of the name\n for git_branch_lookup. That is, if the returned name is given\n to git_branch_lookup() then the reference is returned that\n was given to this function.

\n", + "group": "branch" + }, + "git_branch_upstream": { + "type": "function", + "file": "branch.h", + "line": 202, + "lineto": 204, + "args": [ + { + "name": "out", + "type": "git_reference **", + "comment": "Pointer where to store the retrieved\n reference." + }, + { + "name": "branch", + "type": "const git_reference *", + "comment": "Current underlying reference of the branch." + } + ], + "argline": "git_reference **out, const git_reference *branch", + "sig": "git_reference **::const git_reference *", + "return": { + "type": "int", + "comment": " 0 on success; GIT_ENOTFOUND when no remote tracking\n reference exists, otherwise an error code." + }, + "description": "

Return the reference supporting the remote tracking branch,\n given a local branch reference.

\n", + "comments": "", + "group": "branch" + }, + "git_branch_set_upstream": { + "type": "function", + "file": "branch.h", + "line": 216, + "lineto": 216, + "args": [ + { + "name": "branch", + "type": "git_reference *", + "comment": "the branch to configure" + }, + { + "name": "upstream_name", + "type": "const char *", + "comment": "remote-tracking or local branch to set as\n upstream. Pass NULL to unset." + } + ], + "argline": "git_reference *branch, const char *upstream_name", + "sig": "git_reference *::const char *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Set the upstream configuration for a given local branch

\n", + "comments": "", + "group": "branch" + }, + "git_branch_is_head": { + "type": "function", + "file": "branch.h", + "line": 245, + "lineto": 246, + "args": [ + { + "name": "branch", + "type": "const git_reference *", + "comment": "Current underlying reference of the branch." + } + ], + "argline": "const git_reference *branch", + "sig": "const git_reference *", + "return": { + "type": "int", + "comment": " 1 if HEAD points at the branch, 0 if it isn't,\n error code otherwise." + }, + "description": "

Determine if the current local branch is pointed at by HEAD.

\n", + "comments": "", + "group": "branch" + }, + "git_buf_free": { + "type": "function", + "file": "buffer.h", + "line": 72, + "lineto": 72, + "args": [ + { + "name": "buffer", + "type": "git_buf *", + "comment": "The buffer to deallocate" + } + ], + "argline": "git_buf *buffer", + "sig": "git_buf *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Free the memory referred to by the git_buf.

\n", + "comments": "

Note that this does not free the git_buf itself, just the memory\n pointed to by buffer->ptr. This will not free the memory if it looks\n like it was not allocated internally, but it will clear the buffer back\n to the empty state.

\n", + "group": "buf", + "examples": { + "diff.c": [ + "ex/v0.23.2/diff.html#git_buf_free-1" + ], + "remote.c": [ + "ex/v0.23.2/remote.html#git_buf_free-1" + ], + "tag.c": [ + "ex/v0.23.2/tag.html#git_buf_free-1" + ] + } + }, + "git_buf_grow": { + "type": "function", + "file": "buffer.h", + "line": 95, + "lineto": 95, + "args": [ + { + "name": "buffer", + "type": "git_buf *", + "comment": "The buffer to be resized; may or may not be allocated yet" + }, + { + "name": "target_size", + "type": "size_t", + "comment": "The desired available size" + } + ], + "argline": "git_buf *buffer, size_t target_size", + "sig": "git_buf *::size_t", + "return": { + "type": "int", + "comment": " 0 on success, -1 on allocation failure" + }, + "description": "

Resize the buffer allocation to make more space.

\n", + "comments": "

This will attempt to grow the buffer to accommodate the target size.

\n\n

If the buffer refers to memory that was not allocated by libgit2 (i.e.\n the asize field is zero), then ptr will be replaced with a newly\n allocated block of data. Be careful so that memory allocated by the\n caller is not lost. As a special variant, if you pass target_size as\n 0 and the memory is not allocated by libgit2, this will allocate a new\n buffer of size size and copy the external data into it.

\n\n

Currently, this will never shrink a buffer, only expand it.

\n\n

If the allocation fails, this will return an error and the buffer will be\n marked as invalid for future operations, invaliding the contents.

\n", + "group": "buf" + }, + "git_buf_set": { + "type": "function", + "file": "buffer.h", + "line": 105, + "lineto": 106, + "args": [ + { + "name": "buffer", + "type": "git_buf *", + "comment": "The buffer to set" + }, + { + "name": "data", + "type": "const void *", + "comment": "The data to copy into the buffer" + }, + { + "name": "datalen", + "type": "size_t", + "comment": "The length of the data to copy into the buffer" + } + ], + "argline": "git_buf *buffer, const void *data, size_t datalen", + "sig": "git_buf *::const void *::size_t", + "return": { + "type": "int", + "comment": " 0 on success, -1 on allocation failure" + }, + "description": "

Set buffer to a copy of some raw data.

\n", + "comments": "", + "group": "buf" + }, + "git_buf_is_binary": { + "type": "function", + "file": "buffer.h", + "line": 114, + "lineto": 114, + "args": [ + { + "name": "buf", + "type": "const git_buf *", + "comment": "Buffer to check" + } + ], + "argline": "const git_buf *buf", + "sig": "const git_buf *", + "return": { + "type": "int", + "comment": " 1 if buffer looks like non-text data" + }, + "description": "

Check quickly if buffer looks like it contains binary data

\n", + "comments": "", + "group": "buf" + }, + "git_buf_contains_nul": { + "type": "function", + "file": "buffer.h", + "line": 122, + "lineto": 122, + "args": [ + { + "name": "buf", + "type": "const git_buf *", + "comment": "Buffer to check" + } + ], + "argline": "const git_buf *buf", + "sig": "const git_buf *", + "return": { + "type": "int", + "comment": " 1 if buffer contains a NUL byte" + }, + "description": "

Check quickly if buffer contains a NUL byte

\n", + "comments": "", + "group": "buf" + }, + "git_checkout_init_options": { + "type": "function", + "file": "checkout.h", + "line": 308, + "lineto": 310, + "args": [ + { + "name": "opts", + "type": "git_checkout_options *", + "comment": "the `git_checkout_options` struct to initialize." + }, + { + "name": "version", + "type": "unsigned int", + "comment": "Version of struct; pass `GIT_CHECKOUT_OPTIONS_VERSION`" + } + ], + "argline": "git_checkout_options *opts, unsigned int version", + "sig": "git_checkout_options *::unsigned int", + "return": { + "type": "int", + "comment": " Zero on success; -1 on failure." + }, + "description": "

Initializes a git_checkout_options with default values. Equivalent to\n creating an instance with GIT_CHECKOUT_OPTIONS_INIT.

\n", + "comments": "", + "group": "checkout" + }, + "git_checkout_head": { + "type": "function", + "file": "checkout.h", + "line": 322, + "lineto": 324, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "repository to check out (must be non-bare)" + }, + { + "name": "opts", + "type": "const git_checkout_options *", + "comment": "specifies checkout options (may be NULL)" + } + ], + "argline": "git_repository *repo, const git_checkout_options *opts", + "sig": "git_repository *::const git_checkout_options *", + "return": { + "type": "int", + "comment": " 0 on success, GIT_EUNBORNBRANCH if HEAD points to a non\n existing branch, non-zero value returned by `notify_cb`, or\n other error code \n<\n 0 (use giterr_last for error details)" + }, + "description": "

Updates files in the index and the working tree to match the content of\n the commit pointed at by HEAD.

\n", + "comments": "", + "group": "checkout" + }, + "git_checkout_index": { + "type": "function", + "file": "checkout.h", + "line": 335, + "lineto": 338, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "repository into which to check out (must be non-bare)" + }, + { + "name": "index", + "type": "git_index *", + "comment": "index to be checked out (or NULL to use repository index)" + }, + { + "name": "opts", + "type": "const git_checkout_options *", + "comment": "specifies checkout options (may be NULL)" + } + ], + "argline": "git_repository *repo, git_index *index, const git_checkout_options *opts", + "sig": "git_repository *::git_index *::const git_checkout_options *", + "return": { + "type": "int", + "comment": " 0 on success, non-zero return value from `notify_cb`, or error\n code \n<\n 0 (use giterr_last for error details)" + }, + "description": "

Updates files in the working tree to match the content of the index.

\n", + "comments": "", + "group": "checkout" + }, + "git_checkout_tree": { + "type": "function", + "file": "checkout.h", + "line": 351, + "lineto": 354, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "repository to check out (must be non-bare)" + }, + { + "name": "treeish", + "type": "const git_object *", + "comment": "a commit, tag or tree which content will be used to update\n the working directory (or NULL to use HEAD)" + }, + { + "name": "opts", + "type": "const git_checkout_options *", + "comment": "specifies checkout options (may be NULL)" + } + ], + "argline": "git_repository *repo, const git_object *treeish, const git_checkout_options *opts", + "sig": "git_repository *::const git_object *::const git_checkout_options *", + "return": { + "type": "int", + "comment": " 0 on success, non-zero return value from `notify_cb`, or error\n code \n<\n 0 (use giterr_last for error details)" + }, + "description": "

Updates files in the index and working tree to match the content of the\n tree pointed at by the treeish.

\n", + "comments": "", + "group": "checkout" + }, + "git_cherrypick_init_options": { + "type": "function", + "file": "cherrypick.h", + "line": 47, + "lineto": 49, + "args": [ + { + "name": "opts", + "type": "git_cherrypick_options *", + "comment": "the `git_cherrypick_options` struct to initialize" + }, + { + "name": "version", + "type": "unsigned int", + "comment": "Version of struct; pass `GIT_CHERRYPICK_OPTIONS_VERSION`" + } + ], + "argline": "git_cherrypick_options *opts, unsigned int version", + "sig": "git_cherrypick_options *::unsigned int", + "return": { + "type": "int", + "comment": " Zero on success; -1 on failure." + }, + "description": "

Initializes a git_cherrypick_options with default values. Equivalent to\n creating an instance with GIT_CHERRYPICK_OPTIONS_INIT.

\n", + "comments": "", + "group": "cherrypick" + }, + "git_cherrypick_commit": { + "type": "function", + "file": "cherrypick.h", + "line": 65, + "lineto": 71, + "args": [ + { + "name": "out", + "type": "git_index **", + "comment": "pointer to store the index result in" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "the repository that contains the given commits" + }, + { + "name": "cherrypick_commit", + "type": "git_commit *", + "comment": "the commit to cherry-pick" + }, + { + "name": "our_commit", + "type": "git_commit *", + "comment": "the commit to revert against (eg, HEAD)" + }, + { + "name": "mainline", + "type": "unsigned int", + "comment": "the parent of the revert commit, if it is a merge" + }, + { + "name": "merge_options", + "type": "const git_merge_options *", + "comment": "the merge options (or null for defaults)" + } + ], + "argline": "git_index **out, git_repository *repo, git_commit *cherrypick_commit, git_commit *our_commit, unsigned int mainline, const git_merge_options *merge_options", + "sig": "git_index **::git_repository *::git_commit *::git_commit *::unsigned int::const git_merge_options *", + "return": { + "type": "int", + "comment": " zero on success, -1 on failure." + }, + "description": "

Cherry-picks the given commit against the given "our" commit, producing an\n index that reflects the result of the cherry-pick.

\n", + "comments": "

The returned index must be freed explicitly with git_index_free.

\n", + "group": "cherrypick" + }, + "git_cherrypick": { + "type": "function", + "file": "cherrypick.h", + "line": 81, + "lineto": 84, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "the repository to cherry-pick" + }, + { + "name": "commit", + "type": "git_commit *", + "comment": "the commit to cherry-pick" + }, + { + "name": "cherrypick_options", + "type": "const git_cherrypick_options *", + "comment": "the cherry-pick options (or null for defaults)" + } + ], + "argline": "git_repository *repo, git_commit *commit, const git_cherrypick_options *cherrypick_options", + "sig": "git_repository *::git_commit *::const git_cherrypick_options *", + "return": { + "type": "int", + "comment": " zero on success, -1 on failure." + }, + "description": "

Cherry-pick the given commit, producing changes in the index and working directory.

\n", + "comments": "", + "group": "cherrypick" + }, + "git_clone_init_options": { + "type": "function", + "file": "clone.h", + "line": 179, + "lineto": 181, + "args": [ + { + "name": "opts", + "type": "git_clone_options *", + "comment": "The `git_clone_options` struct to initialize" + }, + { + "name": "version", + "type": "unsigned int", + "comment": "Version of struct; pass `GIT_CLONE_OPTIONS_VERSION`" + } + ], + "argline": "git_clone_options *opts, unsigned int version", + "sig": "git_clone_options *::unsigned int", + "return": { + "type": "int", + "comment": " Zero on success; -1 on failure." + }, + "description": "

Initializes a git_clone_options with default values. Equivalent to\n creating an instance with GIT_CLONE_OPTIONS_INIT.

\n", + "comments": "", + "group": "clone" + }, + "git_clone": { + "type": "function", + "file": "clone.h", + "line": 199, + "lineto": 203, + "args": [ + { + "name": "out", + "type": "git_repository **", + "comment": "pointer that will receive the resulting repository object" + }, + { + "name": "url", + "type": "const char *", + "comment": "the remote repository to clone" + }, + { + "name": "local_path", + "type": "const char *", + "comment": "local directory to clone to" + }, + { + "name": "options", + "type": "const git_clone_options *", + "comment": "configuration options for the clone. If NULL, the\n function works as though GIT_OPTIONS_INIT were passed." + } + ], + "argline": "git_repository **out, const char *url, const char *local_path, const git_clone_options *options", + "sig": "git_repository **::const char *::const char *::const git_clone_options *", + "return": { + "type": "int", + "comment": " 0 on success, any non-zero return value from a callback\n function, or a negative value to indicate an error (use\n `giterr_last` for a detailed error message)" + }, + "description": "

Clone a remote repository.

\n", + "comments": "

By default this creates its repository and initial remote to match\n git's defaults. You can use the options in the callback to\n customize how these are created.

\n", + "group": "clone", + "examples": { + "network/clone.c": [ + "ex/v0.23.2/network/clone.html#git_clone-1" + ] + } + }, + "git_commit_lookup": { + "type": "function", + "file": "commit.h", + "line": 36, + "lineto": 37, + "args": [ + { + "name": "commit", + "type": "git_commit **", + "comment": "pointer to the looked up commit" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "the repo to use when locating the commit." + }, + { + "name": "id", + "type": "const git_oid *", + "comment": "identity of the commit to locate. If the object is\n\t\tan annotated tag it will be peeled back to the commit." + } + ], + "argline": "git_commit **commit, git_repository *repo, const git_oid *id", + "sig": "git_commit **::git_repository *::const git_oid *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Lookup a commit object from a repository.

\n", + "comments": "

The returned object should be released with git_commit_free when no\n longer needed.

\n", + "group": "commit", + "examples": { + "general.c": [ + "ex/v0.23.2/general.html#git_commit_lookup-5", + "ex/v0.23.2/general.html#git_commit_lookup-6", + "ex/v0.23.2/general.html#git_commit_lookup-7" + ], + "log.c": [ + "ex/v0.23.2/log.html#git_commit_lookup-1" + ] + } + }, + "git_commit_lookup_prefix": { + "type": "function", + "file": "commit.h", + "line": 55, + "lineto": 56, + "args": [ + { + "name": "commit", + "type": "git_commit **", + "comment": "pointer to the looked up commit" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "the repo to use when locating the commit." + }, + { + "name": "id", + "type": "const git_oid *", + "comment": "identity of the commit to locate. If the object is\n\t\tan annotated tag it will be peeled back to the commit." + }, + { + "name": "len", + "type": "size_t", + "comment": "the length of the short identifier" + } + ], + "argline": "git_commit **commit, git_repository *repo, const git_oid *id, size_t len", + "sig": "git_commit **::git_repository *::const git_oid *::size_t", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Lookup a commit object from a repository, given a prefix of its\n identifier (short id).

\n", + "comments": "

The returned object should be released with git_commit_free when no\n longer needed.

\n", + "group": "commit" + }, + "git_commit_free": { + "type": "function", + "file": "commit.h", + "line": 70, + "lineto": 70, + "args": [ + { + "name": "commit", + "type": "git_commit *", + "comment": "the commit to close" + } + ], + "argline": "git_commit *commit", + "sig": "git_commit *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Close an open commit

\n", + "comments": "

This is a wrapper around git_object_free()

\n\n

IMPORTANT:\n It is necessary to call this method when you stop\n using a commit. Failure to do so will cause a memory leak.

\n", + "group": "commit", + "examples": { + "general.c": [ + "ex/v0.23.2/general.html#git_commit_free-8", + "ex/v0.23.2/general.html#git_commit_free-9", + "ex/v0.23.2/general.html#git_commit_free-10", + "ex/v0.23.2/general.html#git_commit_free-11" + ], + "log.c": [ + "ex/v0.23.2/log.html#git_commit_free-2", + "ex/v0.23.2/log.html#git_commit_free-3", + "ex/v0.23.2/log.html#git_commit_free-4", + "ex/v0.23.2/log.html#git_commit_free-5" + ] + } + }, + "git_commit_id": { + "type": "function", + "file": "commit.h", + "line": 78, + "lineto": 78, + "args": [ + { + "name": "commit", + "type": "const git_commit *", + "comment": "a previously loaded commit." + } + ], + "argline": "const git_commit *commit", + "sig": "const git_commit *", + "return": { + "type": "const git_oid *", + "comment": " object identity for the commit." + }, + "description": "

Get the id of a commit.

\n", + "comments": "", + "group": "commit", + "examples": { + "general.c": [ + "ex/v0.23.2/general.html#git_commit_id-12" + ], + "log.c": [ + "ex/v0.23.2/log.html#git_commit_id-6" + ] + } + }, + "git_commit_owner": { + "type": "function", + "file": "commit.h", + "line": 86, + "lineto": 86, + "args": [ + { + "name": "commit", + "type": "const git_commit *", + "comment": "A previously loaded commit." + } + ], + "argline": "const git_commit *commit", + "sig": "const git_commit *", + "return": { + "type": "git_repository *", + "comment": " Repository that contains this commit." + }, + "description": "

Get the repository that contains the commit.

\n", + "comments": "", + "group": "commit", + "examples": { + "log.c": [ + "ex/v0.23.2/log.html#git_commit_owner-7", + "ex/v0.23.2/log.html#git_commit_owner-8" + ] + } + }, + "git_commit_message_encoding": { + "type": "function", + "file": "commit.h", + "line": 98, + "lineto": 98, + "args": [ + { + "name": "commit", + "type": "const git_commit *", + "comment": "a previously loaded commit." + } + ], + "argline": "const git_commit *commit", + "sig": "const git_commit *", + "return": { + "type": "const char *", + "comment": " NULL, or the encoding" + }, + "description": "

Get the encoding for the message of a commit,\n as a string representing a standard encoding name.

\n", + "comments": "

The encoding may be NULL if the encoding header\n in the commit is missing; in that case UTF-8 is assumed.

\n", + "group": "commit" + }, + "git_commit_message": { + "type": "function", + "file": "commit.h", + "line": 109, + "lineto": 109, + "args": [ + { + "name": "commit", + "type": "const git_commit *", + "comment": "a previously loaded commit." + } + ], + "argline": "const git_commit *commit", + "sig": "const git_commit *", + "return": { + "type": "const char *", + "comment": " the message of a commit" + }, + "description": "

Get the full message of a commit.

\n", + "comments": "

The returned message will be slightly prettified by removing any\n potential leading newlines.

\n", + "group": "commit", + "examples": { + "cat-file.c": [ + "ex/v0.23.2/cat-file.html#git_commit_message-3", + "ex/v0.23.2/cat-file.html#git_commit_message-4" + ], + "general.c": [ + "ex/v0.23.2/general.html#git_commit_message-13", + "ex/v0.23.2/general.html#git_commit_message-14", + "ex/v0.23.2/general.html#git_commit_message-15" + ], + "log.c": [ + "ex/v0.23.2/log.html#git_commit_message-9", + "ex/v0.23.2/log.html#git_commit_message-10" + ], + "tag.c": [ + "ex/v0.23.2/tag.html#git_commit_message-2" + ] + } + }, + "git_commit_message_raw": { + "type": "function", + "file": "commit.h", + "line": 117, + "lineto": 117, + "args": [ + { + "name": "commit", + "type": "const git_commit *", + "comment": "a previously loaded commit." + } + ], + "argline": "const git_commit *commit", + "sig": "const git_commit *", + "return": { + "type": "const char *", + "comment": " the raw message of a commit" + }, + "description": "

Get the full raw message of a commit.

\n", + "comments": "", + "group": "commit" + }, + "git_commit_summary": { + "type": "function", + "file": "commit.h", + "line": 128, + "lineto": 128, + "args": [ + { + "name": "commit", + "type": "git_commit *", + "comment": "a previously loaded commit." + } + ], + "argline": "git_commit *commit", + "sig": "git_commit *", + "return": { + "type": "const char *", + "comment": " the summary of a commit or NULL on error" + }, + "description": "

Get the short "summary" of the git commit message.

\n", + "comments": "

The returned message is the summary of the commit, comprising the\n first paragraph of the message with whitespace trimmed and squashed.

\n", + "group": "commit" + }, + "git_commit_time": { + "type": "function", + "file": "commit.h", + "line": 136, + "lineto": 136, + "args": [ + { + "name": "commit", + "type": "const git_commit *", + "comment": "a previously loaded commit." + } + ], + "argline": "const git_commit *commit", + "sig": "const git_commit *", + "return": { + "type": "git_time_t", + "comment": " the time of a commit" + }, + "description": "

Get the commit time (i.e. committer time) of a commit.

\n", + "comments": "", + "group": "commit", + "examples": { + "general.c": [ + "ex/v0.23.2/general.html#git_commit_time-16", + "ex/v0.23.2/general.html#git_commit_time-17" + ] + } + }, + "git_commit_time_offset": { + "type": "function", + "file": "commit.h", + "line": 144, + "lineto": 144, + "args": [ + { + "name": "commit", + "type": "const git_commit *", + "comment": "a previously loaded commit." + } + ], + "argline": "const git_commit *commit", + "sig": "const git_commit *", + "return": { + "type": "int", + "comment": " positive or negative timezone offset, in minutes from UTC" + }, + "description": "

Get the commit timezone offset (i.e. committer's preferred timezone) of a commit.

\n", + "comments": "", + "group": "commit" + }, + "git_commit_committer": { + "type": "function", + "file": "commit.h", + "line": 152, + "lineto": 152, + "args": [ + { + "name": "commit", + "type": "const git_commit *", + "comment": "a previously loaded commit." + } + ], + "argline": "const git_commit *commit", + "sig": "const git_commit *", + "return": { + "type": "const git_signature *", + "comment": " the committer of a commit" + }, + "description": "

Get the committer of a commit.

\n", + "comments": "", + "group": "commit", + "examples": { + "cat-file.c": [ + "ex/v0.23.2/cat-file.html#git_commit_committer-5" + ], + "general.c": [ + "ex/v0.23.2/general.html#git_commit_committer-18" + ], + "log.c": [ + "ex/v0.23.2/log.html#git_commit_committer-11" + ] + } + }, + "git_commit_author": { + "type": "function", + "file": "commit.h", + "line": 160, + "lineto": 160, + "args": [ + { + "name": "commit", + "type": "const git_commit *", + "comment": "a previously loaded commit." + } + ], + "argline": "const git_commit *commit", + "sig": "const git_commit *", + "return": { + "type": "const git_signature *", + "comment": " the author of a commit" + }, + "description": "

Get the author of a commit.

\n", + "comments": "", + "group": "commit", + "examples": { + "cat-file.c": [ + "ex/v0.23.2/cat-file.html#git_commit_author-6" + ], + "general.c": [ + "ex/v0.23.2/general.html#git_commit_author-19", + "ex/v0.23.2/general.html#git_commit_author-20" + ], + "log.c": [ + "ex/v0.23.2/log.html#git_commit_author-12", + "ex/v0.23.2/log.html#git_commit_author-13" + ] + } + }, + "git_commit_raw_header": { + "type": "function", + "file": "commit.h", + "line": 168, + "lineto": 168, + "args": [ + { + "name": "commit", + "type": "const git_commit *", + "comment": "a previously loaded commit" + } + ], + "argline": "const git_commit *commit", + "sig": "const git_commit *", + "return": { + "type": "const char *", + "comment": " the header text of the commit" + }, + "description": "

Get the full raw text of the commit header.

\n", + "comments": "", + "group": "commit" + }, + "git_commit_tree": { + "type": "function", + "file": "commit.h", + "line": 177, + "lineto": 177, + "args": [ + { + "name": "tree_out", + "type": "git_tree **", + "comment": "pointer where to store the tree object" + }, + { + "name": "commit", + "type": "const git_commit *", + "comment": "a previously loaded commit." + } + ], + "argline": "git_tree **tree_out, const git_commit *commit", + "sig": "git_tree **::const git_commit *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Get the tree pointed to by a commit.

\n", + "comments": "", + "group": "commit", + "examples": { + "log.c": [ + "ex/v0.23.2/log.html#git_commit_tree-14", + "ex/v0.23.2/log.html#git_commit_tree-15", + "ex/v0.23.2/log.html#git_commit_tree-16", + "ex/v0.23.2/log.html#git_commit_tree-17", + "ex/v0.23.2/log.html#git_commit_tree-18" + ] + } + }, + "git_commit_tree_id": { + "type": "function", + "file": "commit.h", + "line": 187, + "lineto": 187, + "args": [ + { + "name": "commit", + "type": "const git_commit *", + "comment": "a previously loaded commit." + } + ], + "argline": "const git_commit *commit", + "sig": "const git_commit *", + "return": { + "type": "const git_oid *", + "comment": " the id of tree pointed to by commit." + }, + "description": "

Get the id of the tree pointed to by a commit. This differs from\n git_commit_tree in that no attempts are made to fetch an object\n from the ODB.

\n", + "comments": "", + "group": "commit", + "examples": { + "cat-file.c": [ + "ex/v0.23.2/cat-file.html#git_commit_tree_id-7" + ] + } + }, + "git_commit_parentcount": { + "type": "function", + "file": "commit.h", + "line": 195, + "lineto": 195, + "args": [ + { + "name": "commit", + "type": "const git_commit *", + "comment": "a previously loaded commit." + } + ], + "argline": "const git_commit *commit", + "sig": "const git_commit *", + "return": { + "type": "unsigned int", + "comment": " integer of count of parents" + }, + "description": "

Get the number of parents of this commit

\n", + "comments": "", + "group": "commit", + "examples": { + "cat-file.c": [ + "ex/v0.23.2/cat-file.html#git_commit_parentcount-8" + ], + "general.c": [ + "ex/v0.23.2/general.html#git_commit_parentcount-21" + ], + "log.c": [ + "ex/v0.23.2/log.html#git_commit_parentcount-19", + "ex/v0.23.2/log.html#git_commit_parentcount-20" + ] + } + }, + "git_commit_parent": { + "type": "function", + "file": "commit.h", + "line": 205, + "lineto": 208, + "args": [ + { + "name": "out", + "type": "git_commit **", + "comment": "Pointer where to store the parent commit" + }, + { + "name": "commit", + "type": "const git_commit *", + "comment": "a previously loaded commit." + }, + { + "name": "n", + "type": "unsigned int", + "comment": "the position of the parent (from 0 to `parentcount`)" + } + ], + "argline": "git_commit **out, const git_commit *commit, unsigned int n", + "sig": "git_commit **::const git_commit *::unsigned int", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Get the specified parent of the commit.

\n", + "comments": "", + "group": "commit", + "examples": { + "general.c": [ + "ex/v0.23.2/general.html#git_commit_parent-22" + ], + "log.c": [ + "ex/v0.23.2/log.html#git_commit_parent-21", + "ex/v0.23.2/log.html#git_commit_parent-22" + ] + } + }, + "git_commit_parent_id": { + "type": "function", + "file": "commit.h", + "line": 219, + "lineto": 221, + "args": [ + { + "name": "commit", + "type": "const git_commit *", + "comment": "a previously loaded commit." + }, + { + "name": "n", + "type": "unsigned int", + "comment": "the position of the parent (from 0 to `parentcount`)" + } + ], + "argline": "const git_commit *commit, unsigned int n", + "sig": "const git_commit *::unsigned int", + "return": { + "type": "const git_oid *", + "comment": " the id of the parent, NULL on error." + }, + "description": "

Get the oid of a specified parent for a commit. This is different from\n git_commit_parent, which will attempt to load the parent commit from\n the ODB.

\n", + "comments": "", + "group": "commit", + "examples": { + "cat-file.c": [ + "ex/v0.23.2/cat-file.html#git_commit_parent_id-9" + ], + "log.c": [ + "ex/v0.23.2/log.html#git_commit_parent_id-23" + ] + } + }, + "git_commit_nth_gen_ancestor": { + "type": "function", + "file": "commit.h", + "line": 237, + "lineto": 240, + "args": [ + { + "name": "ancestor", + "type": "git_commit **", + "comment": "Pointer where to store the ancestor commit" + }, + { + "name": "commit", + "type": "const git_commit *", + "comment": "a previously loaded commit." + }, + { + "name": "n", + "type": "unsigned int", + "comment": "the requested generation" + } + ], + "argline": "git_commit **ancestor, const git_commit *commit, unsigned int n", + "sig": "git_commit **::const git_commit *::unsigned int", + "return": { + "type": "int", + "comment": " 0 on success; GIT_ENOTFOUND if no matching ancestor exists\n or an error code" + }, + "description": "

Get the commit object that is the \n<n

\n\n
\n

th generation ancestor\n of the named commit object, following only the first parents.\n The returned commit has to be freed by the caller.

\n
\n", + "comments": "

Passing 0 as the generation number returns another instance of the\n base commit itself.

\n", + "group": "commit" + }, + "git_commit_header_field": { + "type": "function", + "file": "commit.h", + "line": 251, + "lineto": 251, + "args": [ + { + "name": "out", + "type": "git_buf *", + "comment": "the buffer to fill" + }, + { + "name": "commit", + "type": "const git_commit *", + "comment": "the commit to look in" + }, + { + "name": "field", + "type": "const char *", + "comment": "the header field to return" + } + ], + "argline": "git_buf *out, const git_commit *commit, const char *field", + "sig": "git_buf *::const git_commit *::const char *", + "return": { + "type": "int", + "comment": " 0 on succeess, GIT_ENOTFOUND if the field does not exist,\n or an error code" + }, + "description": "

Get an arbitrary header field

\n", + "comments": "", + "group": "commit" + }, + "git_commit_create": { + "type": "function", + "file": "commit.h", + "line": 297, + "lineto": 307, + "args": [ + { + "name": "id", + "type": "git_oid *", + "comment": "Pointer in which to store the OID of the newly created commit" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "Repository where to store the commit" + }, + { + "name": "update_ref", + "type": "const char *", + "comment": "If not NULL, name of the reference that\n\twill be updated to point to this commit. If the reference\n\tis not direct, it will be resolved to a direct reference.\n\tUse \"HEAD\" to update the HEAD of the current branch and\n\tmake it point to this commit. If the reference doesn't\n\texist yet, it will be created. If it does exist, the first\n\tparent must be the tip of this branch." + }, + { + "name": "author", + "type": "const git_signature *", + "comment": "Signature with author and author time of commit" + }, + { + "name": "committer", + "type": "const git_signature *", + "comment": "Signature with committer and * commit time of commit" + }, + { + "name": "message_encoding", + "type": "const char *", + "comment": "The encoding for the message in the\n commit, represented with a standard encoding name.\n E.g. \"UTF-8\". If NULL, no encoding header is written and\n UTF-8 is assumed." + }, + { + "name": "message", + "type": "const char *", + "comment": "Full message for this commit" + }, + { + "name": "tree", + "type": "const git_tree *", + "comment": "An instance of a `git_tree` object that will\n be used as the tree for the commit. This tree object must\n also be owned by the given `repo`." + }, + { + "name": "parent_count", + "type": "size_t", + "comment": "Number of parents for this commit" + }, + { + "name": "parents", + "type": "const git_commit *[]", + "comment": "Array of `parent_count` pointers to `git_commit`\n objects that will be used as the parents for this commit. This\n array may be NULL if `parent_count` is 0 (root commit). All the\n given commits must be owned by the `repo`." + } + ], + "argline": "git_oid *id, git_repository *repo, const char *update_ref, const git_signature *author, const git_signature *committer, const char *message_encoding, const char *message, const git_tree *tree, size_t parent_count, const git_commit *[] parents", + "sig": "git_oid *::git_repository *::const char *::const git_signature *::const git_signature *::const char *::const char *::const git_tree *::size_t::const git_commit *[]", + "return": { + "type": "int", + "comment": " 0 or an error code\n\tThe created commit will be written to the Object Database and\n\tthe given reference will be updated to point to it" + }, + "description": "

Create new commit in the repository from a list of git_object pointers

\n", + "comments": "

The message will not be cleaned up automatically. You can do that\n with the git_message_prettify() function.

\n", + "group": "commit" + }, + "git_commit_create_v": { + "type": "function", + "file": "commit.h", + "line": 323, + "lineto": 333, + "args": [ + { + "name": "id", + "type": "git_oid *", + "comment": null + }, + { + "name": "repo", + "type": "git_repository *", + "comment": null + }, + { + "name": "update_ref", + "type": "const char *", + "comment": null + }, + { + "name": "author", + "type": "const git_signature *", + "comment": null + }, + { + "name": "committer", + "type": "const git_signature *", + "comment": null + }, + { + "name": "message_encoding", + "type": "const char *", + "comment": null + }, + { + "name": "message", + "type": "const char *", + "comment": null + }, + { + "name": "tree", + "type": "const git_tree *", + "comment": null + }, + { + "name": "parent_count", + "type": "size_t", + "comment": null + } + ], + "argline": "git_oid *id, git_repository *repo, const char *update_ref, const git_signature *author, const git_signature *committer, const char *message_encoding, const char *message, const git_tree *tree, size_t parent_count", + "sig": "git_oid *::git_repository *::const char *::const git_signature *::const git_signature *::const char *::const char *::const git_tree *::size_t", + "return": { + "type": "int", + "comment": null + }, + "description": "

Create new commit in the repository using a variable argument list.

\n", + "comments": "

The message will not be cleaned up automatically. You can do that\n with the git_message_prettify() function.

\n\n

The parents for the commit are specified as a variable list of pointers\n to const git_commit *. Note that this is a convenience method which may\n not be safe to export for certain languages or compilers

\n\n

All other parameters remain the same as git_commit_create().

\n", + "group": "commit", + "examples": { + "general.c": [ + "ex/v0.23.2/general.html#git_commit_create_v-23" + ], + "init.c": [ + "ex/v0.23.2/init.html#git_commit_create_v-1" + ] + } + }, + "git_commit_amend": { + "type": "function", + "file": "commit.h", + "line": 356, + "lineto": 364, + "args": [ + { + "name": "id", + "type": "git_oid *", + "comment": null + }, + { + "name": "commit_to_amend", + "type": "const git_commit *", + "comment": null + }, + { + "name": "update_ref", + "type": "const char *", + "comment": null + }, + { + "name": "author", + "type": "const git_signature *", + "comment": null + }, + { + "name": "committer", + "type": "const git_signature *", + "comment": null + }, + { + "name": "message_encoding", + "type": "const char *", + "comment": null + }, + { + "name": "message", + "type": "const char *", + "comment": null + }, + { + "name": "tree", + "type": "const git_tree *", + "comment": null + } + ], + "argline": "git_oid *id, const git_commit *commit_to_amend, const char *update_ref, const git_signature *author, const git_signature *committer, const char *message_encoding, const char *message, const git_tree *tree", + "sig": "git_oid *::const git_commit *::const char *::const git_signature *::const git_signature *::const char *::const char *::const git_tree *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Amend an existing commit by replacing only non-NULL values.

\n", + "comments": "

This creates a new commit that is exactly the same as the old commit,\n except that any non-NULL values will be updated. The new commit has\n the same parents as the old commit.

\n\n

The update_ref value works as in the regular git_commit_create(),\n updating the ref to point to the newly rewritten commit. If you want\n to amend a commit that is not currently the tip of the branch and then\n rewrite the following commits to reach a ref, pass this as NULL and\n update the rest of the commit chain and ref separately.

\n\n

Unlike git_commit_create(), the author, committer, message,\n message_encoding, and tree parameters can be NULL in which case this\n will use the values from the original commit_to_amend.

\n\n

All parameters have the same meanings as in git_commit_create().

\n", + "group": "commit" + }, + "git_libgit2_version": { + "type": "function", + "file": "common.h", + "line": 94, + "lineto": 94, + "args": [ + { + "name": "major", + "type": "int *", + "comment": "Store the major version number" + }, + { + "name": "minor", + "type": "int *", + "comment": "Store the minor version number" + }, + { + "name": "rev", + "type": "int *", + "comment": "Store the revision (patch) number" + } + ], + "argline": "int *major, int *minor, int *rev", + "sig": "int *::int *::int *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Return the version of the libgit2 library\n being currently used.

\n", + "comments": "", + "group": "libgit2" + }, + "git_libgit2_features": { + "type": "function", + "file": "common.h", + "line": 124, + "lineto": 124, + "args": [], + "argline": "", + "sig": "", + "return": { + "type": "int", + "comment": " A combination of GIT_FEATURE_* values." + }, + "description": "

Query compile time options for libgit2.

\n", + "comments": "
    \n

  • GIT_FEATURE_THREADS\nLibgit2 was compiled with thread support. Note that thread support is\nstill to be seen as a 'work in progress' - basic object lookups are\nbelieved to be threadsafe, but other operations may not be.

    • \n

  • GIT_FEATURE_HTTPS\nLibgit2 supports the https:// protocol. This requires the openssl\nlibrary to be found when compiling libgit2.

    • \n

  • GIT_FEATURE_SSH\nLibgit2 supports the SSH protocol for network operations. This requires\nthe libssh2 library to be found when compiling libgit2

    • \n
\n", + "group": "libgit2" + }, + "git_libgit2_opts": { + "type": "function", + "file": "common.h", + "line": 245, + "lineto": 245, + "args": [ + { + "name": "option", + "type": "int", + "comment": "Option key" + } + ], + "argline": "int option", + "sig": "int", + "return": { + "type": "int", + "comment": " 0 on success, \n<\n0 on failure" + }, + "description": "

Set or query a library global option

\n", + "comments": "

Available options:

\n\n
* opts(GIT_OPT_GET_MWINDOW_SIZE, size_t *):\n\n    > Get the maximum mmap window size\n\n* opts(GIT_OPT_SET_MWINDOW_SIZE, size_t):\n\n    > Set the maximum mmap window size\n\n* opts(GIT_OPT_GET_MWINDOW_MAPPED_LIMIT, size_t *):\n\n    > Get the maximum memory that will be mapped in total by the library\n\n* opts(GIT_OPT_SET_MWINDOW_MAPPED_LIMIT, size_t):\n\n    >Set the maximum amount of memory that can be mapped at any time\n    by the library\n\n* opts(GIT_OPT_GET_SEARCH_PATH, int level, git_buf *buf)\n\n    > Get the search path for a given level of config data.  "level" must\n    > be one of `GIT_CONFIG_LEVEL_SYSTEM`, `GIT_CONFIG_LEVEL_GLOBAL`, or\n    > `GIT_CONFIG_LEVEL_XDG`.  The search path is written to the `out`\n    > buffer.\n\n* opts(GIT_OPT_SET_SEARCH_PATH, int level, const char *path)\n\n    > Set the search path for a level of config data.  The search path\n    > applied to shared attributes and ignore files, too.\n    >\n    > - `path` lists directories delimited by GIT_PATH_LIST_SEPARATOR.\n    >   Pass NULL to reset to the default (generally based on environment\n    >   variables).  Use magic path `$PATH` to include the old value\n    >   of the path (if you want to prepend or append, for instance).\n    >\n    > - `level` must be GIT_CONFIG_LEVEL_SYSTEM, GIT_CONFIG_LEVEL_GLOBAL,\n    >   or GIT_CONFIG_LEVEL_XDG.\n\n* opts(GIT_OPT_SET_CACHE_OBJECT_LIMIT, git_otype type, size_t size)\n\n    > Set the maximum data size for the given type of object to be\n    > considered eligible for caching in memory.  Setting to value to\n    > zero means that that type of object will not be cached.\n    > Defaults to 0 for GIT_OBJ_BLOB (i.e. won't cache blobs) and 4k\n    > for GIT_OBJ_COMMIT, GIT_OBJ_TREE, and GIT_OBJ_TAG.\n\n* opts(GIT_OPT_SET_CACHE_MAX_SIZE, ssize_t max_storage_bytes)\n\n    > Set the maximum total data size that will be cached in memory\n    > across all repositories before libgit2 starts evicting objects\n    > from the cache.  This is a soft limit, in that the library might\n    > briefly exceed it, but will start aggressively evicting objects\n    > from cache when that happens.  The default cache size is 256MB.\n\n* opts(GIT_OPT_ENABLE_CACHING, int enabled)\n\n    > Enable or disable caching completely.\n    >\n    > Because caches are repository-specific, disabling the cache\n    > cannot immediately clear all cached objects, but each cache will\n    > be cleared on the next attempt to update anything in it.\n\n* opts(GIT_OPT_GET_CACHED_MEMORY, ssize_t *current, ssize_t *allowed)\n\n    > Get the current bytes in cache and the maximum that would be\n    > allowed in the cache.\n\n* opts(GIT_OPT_GET_TEMPLATE_PATH, git_buf *out)\n\n    > Get the default template path.\n    > The path is written to the `out` buffer.\n\n* opts(GIT_OPT_SET_TEMPLATE_PATH, const char *path)\n\n    > Set the default template path.\n    >\n    > - `path` directory of template.\n\n* opts(GIT_OPT_SET_SSL_CERT_LOCATIONS, const char *file, const char *path)\n\n    > Set the SSL certificate-authority locations.\n    >\n    > - `file` is the location of a file containing several\n    >   certificates concatenated together.\n    > - `path` is the location of a directory holding several\n    >   certificates, one per file.\n    >\n    > Either parameter may be `NULL`, but not both.\n
\n", + "group": "libgit2" + }, + "git_config_entry_free": { + "type": "function", + "file": "config.h", + "line": 72, + "lineto": 72, + "args": [ + { + "name": "", + "type": "git_config_entry *", + "comment": null + } + ], + "argline": "git_config_entry *", + "sig": "git_config_entry *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Free a config entry

\n", + "comments": "", + "group": "config" + }, + "git_config_find_global": { + "type": "function", + "file": "config.h", + "line": 113, + "lineto": 113, + "args": [ + { + "name": "out", + "type": "git_buf *", + "comment": "Pointer to a user-allocated git_buf in which to store the path" + } + ], + "argline": "git_buf *out", + "sig": "git_buf *", + "return": { + "type": "int", + "comment": " 0 if a global configuration file has been found. Its path will be stored in `out`." + }, + "description": "

Locate the path to the global configuration file

\n", + "comments": "

The user or global configuration file is usually\n located in $HOME/.gitconfig.

\n\n

This method will try to guess the full path to that\n file, if the file exists. The returned path\n may be used on any git_config call to load the\n global configuration file.

\n\n

This method will not guess the path to the xdg compatible\n config file (.config/git/config).

\n", + "group": "config" + }, + "git_config_find_xdg": { + "type": "function", + "file": "config.h", + "line": 130, + "lineto": 130, + "args": [ + { + "name": "out", + "type": "git_buf *", + "comment": "Pointer to a user-allocated git_buf in which to store the path" + } + ], + "argline": "git_buf *out", + "sig": "git_buf *", + "return": { + "type": "int", + "comment": " 0 if a xdg compatible configuration file has been\n\tfound. Its path will be stored in `out`." + }, + "description": "

Locate the path to the global xdg compatible configuration file

\n", + "comments": "

The xdg compatible configuration file is usually\n located in $HOME/.config/git/config.

\n\n

This method will try to guess the full path to that\n file, if the file exists. The returned path\n may be used on any git_config call to load the\n xdg compatible configuration file.

\n", + "group": "config" + }, + "git_config_find_system": { + "type": "function", + "file": "config.h", + "line": 142, + "lineto": 142, + "args": [ + { + "name": "out", + "type": "git_buf *", + "comment": "Pointer to a user-allocated git_buf in which to store the path" + } + ], + "argline": "git_buf *out", + "sig": "git_buf *", + "return": { + "type": "int", + "comment": " 0 if a system configuration file has been\n\tfound. Its path will be stored in `out`." + }, + "description": "

Locate the path to the system configuration file

\n", + "comments": "

If /etc/gitconfig doesn't exist, it will look for\n %PROGRAMFILES%

\n\n

.

\n", + "group": "config" + }, + "git_config_open_default": { + "type": "function", + "file": "config.h", + "line": 154, + "lineto": 154, + "args": [ + { + "name": "out", + "type": "git_config **", + "comment": "Pointer to store the config instance" + } + ], + "argline": "git_config **out", + "sig": "git_config **", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Open the global, XDG and system configuration files

\n", + "comments": "

Utility wrapper that finds the global, XDG and system configuration files\n and opens them into a single prioritized config object that can be\n used when accessing default config data outside a repository.

\n", + "group": "config" + }, + "git_config_new": { + "type": "function", + "file": "config.h", + "line": 165, + "lineto": 165, + "args": [ + { + "name": "out", + "type": "git_config **", + "comment": "pointer to the new configuration" + } + ], + "argline": "git_config **out", + "sig": "git_config **", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Allocate a new configuration object

\n", + "comments": "

This object is empty, so you have to add a file to it before you\n can do anything with it.

\n", + "group": "config" + }, + "git_config_add_file_ondisk": { + "type": "function", + "file": "config.h", + "line": 192, + "lineto": 196, + "args": [ + { + "name": "cfg", + "type": "git_config *", + "comment": "the configuration to add the file to" + }, + { + "name": "path", + "type": "const char *", + "comment": "path to the configuration file to add" + }, + { + "name": "level", + "type": "git_config_level_t", + "comment": "the priority level of the backend" + }, + { + "name": "force", + "type": "int", + "comment": "replace config file at the given priority level" + } + ], + "argline": "git_config *cfg, const char *path, git_config_level_t level, int force", + "sig": "git_config *::const char *::git_config_level_t::int", + "return": { + "type": "int", + "comment": " 0 on success, GIT_EEXISTS when adding more than one file\n for a given priority level (and force_replace set to 0),\n GIT_ENOTFOUND when the file doesn't exist or error code" + }, + "description": "

Add an on-disk config file instance to an existing config

\n", + "comments": "

The on-disk file pointed at by path will be opened and\n parsed; it's expected to be a native Git config file following\n the default Git config syntax (see man git-config).

\n\n

If the file does not exist, the file will still be added and it\n will be created the first time we write to it.

\n\n

Note that the configuration object will free the file\n automatically.

\n\n

Further queries on this config object will access each\n of the config file instances in order (instances with\n a higher priority level will be accessed first).

\n", + "group": "config" + }, + "git_config_open_ondisk": { + "type": "function", + "file": "config.h", + "line": 210, + "lineto": 210, + "args": [ + { + "name": "out", + "type": "git_config **", + "comment": "The configuration instance to create" + }, + { + "name": "path", + "type": "const char *", + "comment": "Path to the on-disk file to open" + } + ], + "argline": "git_config **out, const char *path", + "sig": "git_config **::const char *", + "return": { + "type": "int", + "comment": " 0 on success, or an error code" + }, + "description": "

Create a new config instance containing a single on-disk file

\n", + "comments": "

This method is a simple utility wrapper for the following sequence\n of calls:\n - git_config_new\n - git_config_add_file_ondisk

\n", + "group": "config", + "examples": { + "general.c": [ + "ex/v0.23.2/general.html#git_config_open_ondisk-24" + ] + } + }, + "git_config_open_level": { + "type": "function", + "file": "config.h", + "line": 228, + "lineto": 231, + "args": [ + { + "name": "out", + "type": "git_config **", + "comment": "The configuration instance to create" + }, + { + "name": "parent", + "type": "const git_config *", + "comment": "Multi-level config to search for the given level" + }, + { + "name": "level", + "type": "git_config_level_t", + "comment": "Configuration level to search for" + } + ], + "argline": "git_config **out, const git_config *parent, git_config_level_t level", + "sig": "git_config **::const git_config *::git_config_level_t", + "return": { + "type": "int", + "comment": " 0, GIT_ENOTFOUND if the passed level cannot be found in the\n multi-level parent config, or an error code" + }, + "description": "

Build a single-level focused config object from a multi-level one.

\n", + "comments": "

The returned config object can be used to perform get/set/delete operations\n on a single specific level.

\n\n

Getting several times the same level from the same parent multi-level config\n will return different config instances, but containing the same config_file\n instance.

\n", + "group": "config" + }, + "git_config_open_global": { + "type": "function", + "file": "config.h", + "line": 245, + "lineto": 245, + "args": [ + { + "name": "out", + "type": "git_config **", + "comment": "pointer in which to store the config object" + }, + { + "name": "config", + "type": "git_config *", + "comment": "the config object in which to look" + } + ], + "argline": "git_config **out, git_config *config", + "sig": "git_config **::git_config *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Open the global/XDG configuration file according to git's rules

\n", + "comments": "

Git allows you to store your global configuration at\n $HOME/.config or $XDG_CONFIG_HOME/git/config. For backwards\n compatability, the XDG file shouldn't be used unless the use has\n created it explicitly. With this function you'll open the correct\n one to write to.

\n", + "group": "config" + }, + "git_config_snapshot": { + "type": "function", + "file": "config.h", + "line": 261, + "lineto": 261, + "args": [ + { + "name": "out", + "type": "git_config **", + "comment": "pointer in which to store the snapshot config object" + }, + { + "name": "config", + "type": "git_config *", + "comment": "configuration to snapshot" + } + ], + "argline": "git_config **out, git_config *config", + "sig": "git_config **::git_config *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Create a snapshot of the configuration

\n", + "comments": "

Create a snapshot of the current state of a configuration, which\n allows you to look into a consistent view of the configuration for\n looking up complex values (e.g. a remote, submodule).

\n\n

The string returned when querying such a config object is valid\n until it is freed.

\n", + "group": "config" + }, + "git_config_free": { + "type": "function", + "file": "config.h", + "line": 268, + "lineto": 268, + "args": [ + { + "name": "cfg", + "type": "git_config *", + "comment": "the configuration to free" + } + ], + "argline": "git_config *cfg", + "sig": "git_config *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Free the configuration and its associated memory and files

\n", + "comments": "", + "group": "config" + }, + "git_config_get_entry": { + "type": "function", + "file": "config.h", + "line": 280, + "lineto": 283, + "args": [ + { + "name": "out", + "type": "git_config_entry **", + "comment": "pointer to the variable git_config_entry" + }, + { + "name": "cfg", + "type": "const git_config *", + "comment": "where to look for the variable" + }, + { + "name": "name", + "type": "const char *", + "comment": "the variable's name" + } + ], + "argline": "git_config_entry **out, const git_config *cfg, const char *name", + "sig": "git_config_entry **::const git_config *::const char *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Get the git_config_entry of a config variable.

\n", + "comments": "

Free the git_config_entry after use with git_config_entry_free().

\n", + "group": "config" + }, + "git_config_get_int32": { + "type": "function", + "file": "config.h", + "line": 297, + "lineto": 297, + "args": [ + { + "name": "out", + "type": "int32_t *", + "comment": "pointer to the variable where the value should be stored" + }, + { + "name": "cfg", + "type": "const git_config *", + "comment": "where to look for the variable" + }, + { + "name": "name", + "type": "const char *", + "comment": "the variable's name" + } + ], + "argline": "int32_t *out, const git_config *cfg, const char *name", + "sig": "int32_t *::const git_config *::const char *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Get the value of an integer config variable.

\n", + "comments": "

All config files will be looked into, in the order of their\n defined level. A higher level means a higher priority. The\n first occurrence of the variable will be returned here.

\n", + "group": "config", + "examples": { + "general.c": [ + "ex/v0.23.2/general.html#git_config_get_int32-25" + ] + } + }, + "git_config_get_int64": { + "type": "function", + "file": "config.h", + "line": 311, + "lineto": 311, + "args": [ + { + "name": "out", + "type": "int64_t *", + "comment": "pointer to the variable where the value should be stored" + }, + { + "name": "cfg", + "type": "const git_config *", + "comment": "where to look for the variable" + }, + { + "name": "name", + "type": "const char *", + "comment": "the variable's name" + } + ], + "argline": "int64_t *out, const git_config *cfg, const char *name", + "sig": "int64_t *::const git_config *::const char *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Get the value of a long integer config variable.

\n", + "comments": "

All config files will be looked into, in the order of their\n defined level. A higher level means a higher priority. The\n first occurrence of the variable will be returned here.

\n", + "group": "config" + }, + "git_config_get_bool": { + "type": "function", + "file": "config.h", + "line": 328, + "lineto": 328, + "args": [ + { + "name": "out", + "type": "int *", + "comment": "pointer to the variable where the value should be stored" + }, + { + "name": "cfg", + "type": "const git_config *", + "comment": "where to look for the variable" + }, + { + "name": "name", + "type": "const char *", + "comment": "the variable's name" + } + ], + "argline": "int *out, const git_config *cfg, const char *name", + "sig": "int *::const git_config *::const char *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Get the value of a boolean config variable.

\n", + "comments": "

This function uses the usual C convention of 0 being false and\n anything else true.

\n\n

All config files will be looked into, in the order of their\n defined level. A higher level means a higher priority. The\n first occurrence of the variable will be returned here.

\n", + "group": "config" + }, + "git_config_get_path": { + "type": "function", + "file": "config.h", + "line": 346, + "lineto": 346, + "args": [ + { + "name": "out", + "type": "git_buf *", + "comment": "the buffer in which to store the result" + }, + { + "name": "cfg", + "type": "const git_config *", + "comment": "where to look for the variable" + }, + { + "name": "name", + "type": "const char *", + "comment": "the variable's name" + } + ], + "argline": "git_buf *out, const git_config *cfg, const char *name", + "sig": "git_buf *::const git_config *::const char *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Get the value of a path config variable.

\n", + "comments": "

A leading '~' will be expanded to the global search path (which\n defaults to the user's home directory but can be overridden via\n git_libgit2_opts().

\n\n

All config files will be looked into, in the order of their\n defined level. A higher level means a higher priority. The\n first occurrence of the variable will be returned here.

\n", + "group": "config" + }, + "git_config_get_string": { + "type": "function", + "file": "config.h", + "line": 364, + "lineto": 364, + "args": [ + { + "name": "out", + "type": "const char **", + "comment": "pointer to the string" + }, + { + "name": "cfg", + "type": "const git_config *", + "comment": "where to look for the variable" + }, + { + "name": "name", + "type": "const char *", + "comment": "the variable's name" + } + ], + "argline": "const char **out, const git_config *cfg, const char *name", + "sig": "const char **::const git_config *::const char *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Get the value of a string config variable.

\n", + "comments": "

This function can only be used on snapshot config objects. The\n string is owned by the config and should not be freed by the\n user. The pointer will be valid until the config is freed.

\n\n

All config files will be looked into, in the order of their\n defined level. A higher level means a higher priority. The\n first occurrence of the variable will be returned here.

\n", + "group": "config", + "examples": { + "general.c": [ + "ex/v0.23.2/general.html#git_config_get_string-26" + ] + } + }, + "git_config_get_string_buf": { + "type": "function", + "file": "config.h", + "line": 380, + "lineto": 380, + "args": [ + { + "name": "out", + "type": "git_buf *", + "comment": "buffer in which to store the string" + }, + { + "name": "cfg", + "type": "const git_config *", + "comment": "where to look for the variable" + }, + { + "name": "name", + "type": "const char *", + "comment": "the variable's name" + } + ], + "argline": "git_buf *out, const git_config *cfg, const char *name", + "sig": "git_buf *::const git_config *::const char *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Get the value of a string config variable.

\n", + "comments": "

The value of the config will be copied into the buffer.

\n\n

All config files will be looked into, in the order of their\n defined level. A higher level means a higher priority. The\n first occurrence of the variable will be returned here.

\n", + "group": "config" + }, + "git_config_get_multivar_foreach": { + "type": "function", + "file": "config.h", + "line": 394, + "lineto": 394, + "args": [ + { + "name": "cfg", + "type": "const git_config *", + "comment": "where to look for the variable" + }, + { + "name": "name", + "type": "const char *", + "comment": "the variable's name" + }, + { + "name": "regexp", + "type": "const char *", + "comment": "regular expression to filter which variables we're\n interested in. Use NULL to indicate all" + }, + { + "name": "callback", + "type": "git_config_foreach_cb", + "comment": "the function to be called on each value of the variable" + }, + { + "name": "payload", + "type": "void *", + "comment": "opaque pointer to pass to the callback" + } + ], + "argline": "const git_config *cfg, const char *name, const char *regexp, git_config_foreach_cb callback, void *payload", + "sig": "const git_config *::const char *::const char *::git_config_foreach_cb::void *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Get each value of a multivar in a foreach callback

\n", + "comments": "

The callback will be called on each variable found

\n", + "group": "config" + }, + "git_config_multivar_iterator_new": { + "type": "function", + "file": "config.h", + "line": 405, + "lineto": 405, + "args": [ + { + "name": "out", + "type": "git_config_iterator **", + "comment": "pointer to store the iterator" + }, + { + "name": "cfg", + "type": "const git_config *", + "comment": "where to look for the variable" + }, + { + "name": "name", + "type": "const char *", + "comment": "the variable's name" + }, + { + "name": "regexp", + "type": "const char *", + "comment": "regular expression to filter which variables we're\n interested in. Use NULL to indicate all" + } + ], + "argline": "git_config_iterator **out, const git_config *cfg, const char *name, const char *regexp", + "sig": "git_config_iterator **::const git_config *::const char *::const char *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Get each value of a multivar

\n", + "comments": "", + "group": "config" + }, + "git_config_next": { + "type": "function", + "file": "config.h", + "line": 417, + "lineto": 417, + "args": [ + { + "name": "entry", + "type": "git_config_entry **", + "comment": "pointer to store the entry" + }, + { + "name": "iter", + "type": "git_config_iterator *", + "comment": "the iterator" + } + ], + "argline": "git_config_entry **entry, git_config_iterator *iter", + "sig": "git_config_entry **::git_config_iterator *", + "return": { + "type": "int", + "comment": " 0 or an error code. GIT_ITEROVER if the iteration has completed" + }, + "description": "

Return the current entry and advance the iterator

\n", + "comments": "

The pointers returned by this function are valid until the iterator\n is freed.

\n", + "group": "config" + }, + "git_config_iterator_free": { + "type": "function", + "file": "config.h", + "line": 424, + "lineto": 424, + "args": [ + { + "name": "iter", + "type": "git_config_iterator *", + "comment": "the iterator to free" + } + ], + "argline": "git_config_iterator *iter", + "sig": "git_config_iterator *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Free a config iterator

\n", + "comments": "", + "group": "config" + }, + "git_config_set_int32": { + "type": "function", + "file": "config.h", + "line": 435, + "lineto": 435, + "args": [ + { + "name": "cfg", + "type": "git_config *", + "comment": "where to look for the variable" + }, + { + "name": "name", + "type": "const char *", + "comment": "the variable's name" + }, + { + "name": "value", + "type": "int32_t", + "comment": "Integer value for the variable" + } + ], + "argline": "git_config *cfg, const char *name, int32_t value", + "sig": "git_config *::const char *::int32_t", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Set the value of an integer config variable in the config file\n with the highest level (usually the local one).

\n", + "comments": "", + "group": "config" + }, + "git_config_set_int64": { + "type": "function", + "file": "config.h", + "line": 446, + "lineto": 446, + "args": [ + { + "name": "cfg", + "type": "git_config *", + "comment": "where to look for the variable" + }, + { + "name": "name", + "type": "const char *", + "comment": "the variable's name" + }, + { + "name": "value", + "type": "int64_t", + "comment": "Long integer value for the variable" + } + ], + "argline": "git_config *cfg, const char *name, int64_t value", + "sig": "git_config *::const char *::int64_t", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Set the value of a long integer config variable in the config file\n with the highest level (usually the local one).

\n", + "comments": "", + "group": "config" + }, + "git_config_set_bool": { + "type": "function", + "file": "config.h", + "line": 457, + "lineto": 457, + "args": [ + { + "name": "cfg", + "type": "git_config *", + "comment": "where to look for the variable" + }, + { + "name": "name", + "type": "const char *", + "comment": "the variable's name" + }, + { + "name": "value", + "type": "int", + "comment": "the value to store" + } + ], + "argline": "git_config *cfg, const char *name, int value", + "sig": "git_config *::const char *::int", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Set the value of a boolean config variable in the config file\n with the highest level (usually the local one).

\n", + "comments": "", + "group": "config" + }, + "git_config_set_string": { + "type": "function", + "file": "config.h", + "line": 471, + "lineto": 471, + "args": [ + { + "name": "cfg", + "type": "git_config *", + "comment": "where to look for the variable" + }, + { + "name": "name", + "type": "const char *", + "comment": "the variable's name" + }, + { + "name": "value", + "type": "const char *", + "comment": "the string to store." + } + ], + "argline": "git_config *cfg, const char *name, const char *value", + "sig": "git_config *::const char *::const char *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Set the value of a string config variable in the config file\n with the highest level (usually the local one).

\n", + "comments": "

A copy of the string is made and the user is free to use it\n afterwards.

\n", + "group": "config" + }, + "git_config_set_multivar": { + "type": "function", + "file": "config.h", + "line": 481, + "lineto": 481, + "args": [ + { + "name": "cfg", + "type": "git_config *", + "comment": "where to look for the variable" + }, + { + "name": "name", + "type": "const char *", + "comment": "the variable's name" + }, + { + "name": "regexp", + "type": "const char *", + "comment": "a regular expression to indicate which values to replace" + }, + { + "name": "value", + "type": "const char *", + "comment": "the new value." + } + ], + "argline": "git_config *cfg, const char *name, const char *regexp, const char *value", + "sig": "git_config *::const char *::const char *::const char *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Set a multivar in the local config file.

\n", + "comments": "", + "group": "config" + }, + "git_config_delete_entry": { + "type": "function", + "file": "config.h", + "line": 490, + "lineto": 490, + "args": [ + { + "name": "cfg", + "type": "git_config *", + "comment": "the configuration" + }, + { + "name": "name", + "type": "const char *", + "comment": "the variable to delete" + } + ], + "argline": "git_config *cfg, const char *name", + "sig": "git_config *::const char *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Delete a config variable from the config file\n with the highest level (usually the local one).

\n", + "comments": "", + "group": "config" + }, + "git_config_delete_multivar": { + "type": "function", + "file": "config.h", + "line": 501, + "lineto": 501, + "args": [ + { + "name": "cfg", + "type": "git_config *", + "comment": "where to look for the variables" + }, + { + "name": "name", + "type": "const char *", + "comment": "the variable's name" + }, + { + "name": "regexp", + "type": "const char *", + "comment": "a regular expression to indicate which values to delete" + } + ], + "argline": "git_config *cfg, const char *name, const char *regexp", + "sig": "git_config *::const char *::const char *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Deletes one or several entries from a multivar in the local config file.

\n", + "comments": "", + "group": "config" + }, + "git_config_foreach": { + "type": "function", + "file": "config.h", + "line": 519, + "lineto": 522, + "args": [ + { + "name": "cfg", + "type": "const git_config *", + "comment": "where to get the variables from" + }, + { + "name": "callback", + "type": "git_config_foreach_cb", + "comment": "the function to call on each variable" + }, + { + "name": "payload", + "type": "void *", + "comment": "the data to pass to the callback" + } + ], + "argline": "const git_config *cfg, git_config_foreach_cb callback, void *payload", + "sig": "const git_config *::git_config_foreach_cb::void *", + "return": { + "type": "int", + "comment": " 0 on success, non-zero callback return value, or error code" + }, + "description": "

Perform an operation on each config variable.

\n", + "comments": "

The callback receives the normalized name and value of each variable\n in the config backend, and the data pointer passed to this function.\n If the callback returns a non-zero value, the function stops iterating\n and returns that value to the caller.

\n\n

The pointers passed to the callback are only valid as long as the\n iteration is ongoing.

\n", + "group": "config" + }, + "git_config_iterator_new": { + "type": "function", + "file": "config.h", + "line": 533, + "lineto": 533, + "args": [ + { + "name": "out", + "type": "git_config_iterator **", + "comment": "pointer to store the iterator" + }, + { + "name": "cfg", + "type": "const git_config *", + "comment": "where to ge the variables from" + } + ], + "argline": "git_config_iterator **out, const git_config *cfg", + "sig": "git_config_iterator **::const git_config *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Iterate over all the config variables

\n", + "comments": "

Use git_config_next to advance the iteration and\n git_config_iterator_free when done.

\n", + "group": "config" + }, + "git_config_iterator_glob_new": { + "type": "function", + "file": "config.h", + "line": 545, + "lineto": 545, + "args": [ + { + "name": "out", + "type": "git_config_iterator **", + "comment": "pointer to store the iterator" + }, + { + "name": "cfg", + "type": "const git_config *", + "comment": "where to ge the variables from" + }, + { + "name": "regexp", + "type": "const char *", + "comment": "regular expression to match the names" + } + ], + "argline": "git_config_iterator **out, const git_config *cfg, const char *regexp", + "sig": "git_config_iterator **::const git_config *::const char *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Iterate over all the config variables whose name matches a pattern

\n", + "comments": "

Use git_config_next to advance the iteration and\n git_config_iterator_free when done.

\n", + "group": "config" + }, + "git_config_foreach_match": { + "type": "function", + "file": "config.h", + "line": 563, + "lineto": 567, + "args": [ + { + "name": "cfg", + "type": "const git_config *", + "comment": "where to get the variables from" + }, + { + "name": "regexp", + "type": "const char *", + "comment": "regular expression to match against config names" + }, + { + "name": "callback", + "type": "git_config_foreach_cb", + "comment": "the function to call on each variable" + }, + { + "name": "payload", + "type": "void *", + "comment": "the data to pass to the callback" + } + ], + "argline": "const git_config *cfg, const char *regexp, git_config_foreach_cb callback, void *payload", + "sig": "const git_config *::const char *::git_config_foreach_cb::void *", + "return": { + "type": "int", + "comment": " 0 or the return value of the callback which didn't return 0" + }, + "description": "

Perform an operation on each config variable matching a regular expression.

\n", + "comments": "

This behaviors like git_config_foreach with an additional filter of a\n regular expression that filters which config keys are passed to the\n callback.

\n\n

The pointers passed to the callback are only valid as long as the\n iteration is ongoing.

\n", + "group": "config" + }, + "git_config_get_mapped": { + "type": "function", + "file": "config.h", + "line": 603, + "lineto": 608, + "args": [ + { + "name": "out", + "type": "int *", + "comment": "place to store the result of the mapping" + }, + { + "name": "cfg", + "type": "const git_config *", + "comment": "config file to get the variables from" + }, + { + "name": "name", + "type": "const char *", + "comment": "name of the config variable to lookup" + }, + { + "name": "maps", + "type": "const git_cvar_map *", + "comment": "array of `git_cvar_map` objects specifying the possible mappings" + }, + { + "name": "map_n", + "type": "size_t", + "comment": "number of mapping objects in `maps`" + } + ], + "argline": "int *out, const git_config *cfg, const char *name, const git_cvar_map *maps, size_t map_n", + "sig": "int *::const git_config *::const char *::const git_cvar_map *::size_t", + "return": { + "type": "int", + "comment": " 0 on success, error code otherwise" + }, + "description": "

Query the value of a config variable and return it mapped to\n an integer constant.

\n", + "comments": "

This is a helper method to easily map different possible values\n to a variable to integer constants that easily identify them.

\n\n

A mapping array looks as follows:

\n\n
git_cvar_map autocrlf_mapping[] = {\n    {GIT_CVAR_FALSE, NULL, GIT_AUTO_CRLF_FALSE},\n    {GIT_CVAR_TRUE, NULL, GIT_AUTO_CRLF_TRUE},\n    {GIT_CVAR_STRING, "input", GIT_AUTO_CRLF_INPUT},\n    {GIT_CVAR_STRING, "default", GIT_AUTO_CRLF_DEFAULT}};\n
\n\n

On any "false" value for the variable (e.g. "false", "FALSE", "no"), the\n mapping will store GIT_AUTO_CRLF_FALSE in the out parameter.

\n\n

The same thing applies for any "true" value such as "true", "yes" or "1", storing\n the GIT_AUTO_CRLF_TRUE variable.

\n\n

Otherwise, if the value matches the string "input" (with case insensitive comparison),\n the given constant will be stored in out, and likewise for "default".

\n\n

If not a single match can be made to store in out, an error code will be\n returned.

\n", + "group": "config" + }, + "git_config_lookup_map_value": { + "type": "function", + "file": "config.h", + "line": 618, + "lineto": 622, + "args": [ + { + "name": "out", + "type": "int *", + "comment": "place to store the result of the parsing" + }, + { + "name": "maps", + "type": "const git_cvar_map *", + "comment": "array of `git_cvar_map` objects specifying the possible mappings" + }, + { + "name": "map_n", + "type": "size_t", + "comment": "number of mapping objects in `maps`" + }, + { + "name": "value", + "type": "const char *", + "comment": "value to parse" + } + ], + "argline": "int *out, const git_cvar_map *maps, size_t map_n, const char *value", + "sig": "int *::const git_cvar_map *::size_t::const char *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Maps a string value to an integer constant

\n", + "comments": "", + "group": "config" + }, + "git_config_parse_bool": { + "type": "function", + "file": "config.h", + "line": 634, + "lineto": 634, + "args": [ + { + "name": "out", + "type": "int *", + "comment": "place to store the result of the parsing" + }, + { + "name": "value", + "type": "const char *", + "comment": "value to parse" + } + ], + "argline": "int *out, const char *value", + "sig": "int *::const char *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Parse a string value as a bool.

\n", + "comments": "

Valid values for true are: 'true', 'yes', 'on', 1 or any\n number different from 0\n Valid values for false are: 'false', 'no', 'off', 0

\n", + "group": "config" + }, + "git_config_parse_int32": { + "type": "function", + "file": "config.h", + "line": 646, + "lineto": 646, + "args": [ + { + "name": "out", + "type": "int32_t *", + "comment": "place to store the result of the parsing" + }, + { + "name": "value", + "type": "const char *", + "comment": "value to parse" + } + ], + "argline": "int32_t *out, const char *value", + "sig": "int32_t *::const char *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Parse a string value as an int32.

\n", + "comments": "

An optional value suffix of 'k', 'm', or 'g' will\n cause the value to be multiplied by 1024, 1048576,\n or 1073741824 prior to output.

\n", + "group": "config" + }, + "git_config_parse_int64": { + "type": "function", + "file": "config.h", + "line": 658, + "lineto": 658, + "args": [ + { + "name": "out", + "type": "int64_t *", + "comment": "place to store the result of the parsing" + }, + { + "name": "value", + "type": "const char *", + "comment": "value to parse" + } + ], + "argline": "int64_t *out, const char *value", + "sig": "int64_t *::const char *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Parse a string value as an int64.

\n", + "comments": "

An optional value suffix of 'k', 'm', or 'g' will\n cause the value to be multiplied by 1024, 1048576,\n or 1073741824 prior to output.

\n", + "group": "config" + }, + "git_config_parse_path": { + "type": "function", + "file": "config.h", + "line": 673, + "lineto": 673, + "args": [ + { + "name": "out", + "type": "git_buf *", + "comment": "placae to store the result of parsing" + }, + { + "name": "value", + "type": "const char *", + "comment": "the path to evaluate" + } + ], + "argline": "git_buf *out, const char *value", + "sig": "git_buf *::const char *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Parse a string value as a path.

\n", + "comments": "

A leading '~' will be expanded to the global search path (which\n defaults to the user's home directory but can be overridden via\n git_libgit2_opts().

\n\n

If the value does not begin with a tilde, the input will be\n returned.

\n", + "group": "config" + }, + "git_config_backend_foreach_match": { + "type": "function", + "file": "config.h", + "line": 687, + "lineto": 691, + "args": [ + { + "name": "backend", + "type": "git_config_backend *", + "comment": "where to get the variables from" + }, + { + "name": "regexp", + "type": "const char *", + "comment": "regular expression to match against config names (can be NULL)" + }, + { + "name": "callback", + "type": "git_config_foreach_cb", + "comment": "the function to call on each variable" + }, + { + "name": "payload", + "type": "void *", + "comment": "the data to pass to the callback" + } + ], + "argline": "git_config_backend *backend, const char *regexp, git_config_foreach_cb callback, void *payload", + "sig": "git_config_backend *::const char *::git_config_foreach_cb::void *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Perform an operation on each config variable in given config backend\n matching a regular expression.

\n", + "comments": "

This behaviors like git_config_foreach_match except instead of all config\n entries it just enumerates through the given backend entry.

\n", + "group": "config" + }, + "git_cred_userpass": { + "type": "function", + "file": "cred_helpers.h", + "line": 43, + "lineto": 48, + "args": [ + { + "name": "cred", + "type": "git_cred **", + "comment": "The newly created credential object." + }, + { + "name": "url", + "type": "const char *", + "comment": "The resource for which we are demanding a credential." + }, + { + "name": "user_from_url", + "type": "const char *", + "comment": "The username that was embedded in a \"user\n@\nhost\"\n remote url, or NULL if not included." + }, + { + "name": "allowed_types", + "type": "unsigned int", + "comment": "A bitmask stating which cred types are OK to return." + }, + { + "name": "payload", + "type": "void *", + "comment": "The payload provided when specifying this callback. (This is\n interpreted as a `git_cred_userpass_payload*`.)" + } + ], + "argline": "git_cred **cred, const char *url, const char *user_from_url, unsigned int allowed_types, void *payload", + "sig": "git_cred **::const char *::const char *::unsigned int::void *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Stock callback usable as a git_cred_acquire_cb. This calls\n git_cred_userpass_plaintext_new unless the protocol has not specified\n GIT_CREDTYPE_USERPASS_PLAINTEXT as an allowed type.

\n", + "comments": "", + "group": "cred" + }, + "git_describe_commit": { + "type": "function", + "file": "describe.h", + "line": 120, + "lineto": 123, + "args": [ + { + "name": "result", + "type": "git_describe_result **", + "comment": "pointer to store the result. You must free this once\n you're done with it." + }, + { + "name": "committish", + "type": "git_object *", + "comment": "a committish to describe" + }, + { + "name": "opts", + "type": "git_describe_options *", + "comment": "the lookup options" + } + ], + "argline": "git_describe_result **result, git_object *committish, git_describe_options *opts", + "sig": "git_describe_result **::git_object *::git_describe_options *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Describe a commit

\n", + "comments": "

Perform the describe operation on the given committish object.

\n", + "group": "describe", + "examples": { + "describe.c": [ + "ex/v0.23.2/describe.html#git_describe_commit-1" + ] + } + }, + "git_describe_workdir": { + "type": "function", + "file": "describe.h", + "line": 137, + "lineto": 140, + "args": [ + { + "name": "out", + "type": "git_describe_result **", + "comment": "pointer to store the result. You must free this once\n you're done with it." + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "the repository in which to perform the describe" + }, + { + "name": "opts", + "type": "git_describe_options *", + "comment": "the lookup options" + } + ], + "argline": "git_describe_result **out, git_repository *repo, git_describe_options *opts", + "sig": "git_describe_result **::git_repository *::git_describe_options *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Describe a commit

\n", + "comments": "

Perform the describe operation on the current commit and the\n worktree. After peforming describe on HEAD, a status is run and the\n description is considered to be dirty if there are.

\n", + "group": "describe", + "examples": { + "describe.c": [ + "ex/v0.23.2/describe.html#git_describe_workdir-2" + ] + } + }, + "git_describe_format": { + "type": "function", + "file": "describe.h", + "line": 150, + "lineto": 153, + "args": [ + { + "name": "out", + "type": "git_buf *", + "comment": "The buffer to store the result" + }, + { + "name": "result", + "type": "const git_describe_result *", + "comment": "the result from `git_describe_commit()` or\n `git_describe_workdir()`." + }, + { + "name": "opts", + "type": "const git_describe_format_options *", + "comment": "the formatting options" + } + ], + "argline": "git_buf *out, const git_describe_result *result, const git_describe_format_options *opts", + "sig": "git_buf *::const git_describe_result *::const git_describe_format_options *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Print the describe result to a buffer

\n", + "comments": "", + "group": "describe", + "examples": { + "describe.c": [ + "ex/v0.23.2/describe.html#git_describe_format-3" + ] + } + }, + "git_describe_result_free": { + "type": "function", + "file": "describe.h", + "line": 158, + "lineto": 158, + "args": [ + { + "name": "result", + "type": "git_describe_result *", + "comment": null + } + ], + "argline": "git_describe_result *result", + "sig": "git_describe_result *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Free the describe result.

\n", + "comments": "", + "group": "describe" + }, + "git_diff_init_options": { + "type": "function", + "file": "diff.h", + "line": 412, + "lineto": 414, + "args": [ + { + "name": "opts", + "type": "git_diff_options *", + "comment": "The `git_diff_options` struct to initialize" + }, + { + "name": "version", + "type": "unsigned int", + "comment": "Version of struct; pass `GIT_DIFF_OPTIONS_VERSION`" + } + ], + "argline": "git_diff_options *opts, unsigned int version", + "sig": "git_diff_options *::unsigned int", + "return": { + "type": "int", + "comment": " Zero on success; -1 on failure." + }, + "description": "

Initializes a git_diff_options with default values. Equivalent to\n creating an instance with GIT_DIFF_OPTIONS_INIT.

\n", + "comments": "", + "group": "diff" + }, + "git_diff_find_init_options": { + "type": "function", + "file": "diff.h", + "line": 697, + "lineto": 699, + "args": [ + { + "name": "opts", + "type": "git_diff_find_options *", + "comment": "The `git_diff_find_options` struct to initialize" + }, + { + "name": "version", + "type": "unsigned int", + "comment": "Version of struct; pass `GIT_DIFF_FIND_OPTIONS_VERSION`" + } + ], + "argline": "git_diff_find_options *opts, unsigned int version", + "sig": "git_diff_find_options *::unsigned int", + "return": { + "type": "int", + "comment": " Zero on success; -1 on failure." + }, + "description": "

Initializes a git_diff_find_options with default values. Equivalent to\n creating an instance with GIT_DIFF_FIND_OPTIONS_INIT.

\n", + "comments": "", + "group": "diff" + }, + "git_diff_free": { + "type": "function", + "file": "diff.h", + "line": 713, + "lineto": 713, + "args": [ + { + "name": "diff", + "type": "git_diff *", + "comment": "The previously created diff; cannot be used after free." + } + ], + "argline": "git_diff *diff", + "sig": "git_diff *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Deallocate a diff.

\n", + "comments": "", + "group": "diff", + "examples": { + "diff.c": [ + "ex/v0.23.2/diff.html#git_diff_free-2" + ], + "log.c": [ + "ex/v0.23.2/log.html#git_diff_free-24", + "ex/v0.23.2/log.html#git_diff_free-25" + ] + } + }, + "git_diff_tree_to_tree": { + "type": "function", + "file": "diff.h", + "line": 731, + "lineto": 736, + "args": [ + { + "name": "diff", + "type": "git_diff **", + "comment": "Output pointer to a git_diff pointer to be allocated." + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "The repository containing the trees." + }, + { + "name": "old_tree", + "type": "git_tree *", + "comment": "A git_tree object to diff from, or NULL for empty tree." + }, + { + "name": "new_tree", + "type": "git_tree *", + "comment": "A git_tree object to diff to, or NULL for empty tree." + }, + { + "name": "opts", + "type": "const git_diff_options *", + "comment": "Structure with options to influence diff or NULL for defaults." + } + ], + "argline": "git_diff **diff, git_repository *repo, git_tree *old_tree, git_tree *new_tree, const git_diff_options *opts", + "sig": "git_diff **::git_repository *::git_tree *::git_tree *::const git_diff_options *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Create a diff with the difference between two tree objects.

\n", + "comments": "

This is equivalent to git diff \n<old\n-tree> \n<new\n-tree>

\n\n

The first tree will be used for the "old_file" side of the delta and the\n second tree will be used for the "new_file" side of the delta. You can\n pass NULL to indicate an empty tree, although it is an error to pass\n NULL for both the old_tree and new_tree.

\n", + "group": "diff", + "examples": { + "diff.c": [ + "ex/v0.23.2/diff.html#git_diff_tree_to_tree-3" + ], + "log.c": [ + "ex/v0.23.2/log.html#git_diff_tree_to_tree-26", + "ex/v0.23.2/log.html#git_diff_tree_to_tree-27" + ] + } + }, + "git_diff_tree_to_index": { + "type": "function", + "file": "diff.h", + "line": 757, + "lineto": 762, + "args": [ + { + "name": "diff", + "type": "git_diff **", + "comment": "Output pointer to a git_diff pointer to be allocated." + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "The repository containing the tree and index." + }, + { + "name": "old_tree", + "type": "git_tree *", + "comment": "A git_tree object to diff from, or NULL for empty tree." + }, + { + "name": "index", + "type": "git_index *", + "comment": "The index to diff with; repo index used if NULL." + }, + { + "name": "opts", + "type": "const git_diff_options *", + "comment": "Structure with options to influence diff or NULL for defaults." + } + ], + "argline": "git_diff **diff, git_repository *repo, git_tree *old_tree, git_index *index, const git_diff_options *opts", + "sig": "git_diff **::git_repository *::git_tree *::git_index *::const git_diff_options *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Create a diff between a tree and repository index.

\n", + "comments": "

This is equivalent to `git diff --cached \n<treeish

\n\n
\n

or if you pass\n the HEAD tree, then likegit diff --cached`.

\n
\n\n

The tree you pass will be used for the "old_file" side of the delta, and\n the index will be used for the "new_file" side of the delta.

\n\n

If you pass NULL for the index, then the existing index of the repo\n will be used. In this case, the index will be refreshed from disk\n (if it has changed) before the diff is generated.

\n", + "group": "diff", + "examples": { + "diff.c": [ + "ex/v0.23.2/diff.html#git_diff_tree_to_index-4" + ] + } + }, + "git_diff_index_to_workdir": { + "type": "function", + "file": "diff.h", + "line": 784, + "lineto": 788, + "args": [ + { + "name": "diff", + "type": "git_diff **", + "comment": "Output pointer to a git_diff pointer to be allocated." + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "The repository." + }, + { + "name": "index", + "type": "git_index *", + "comment": "The index to diff from; repo index used if NULL." + }, + { + "name": "opts", + "type": "const git_diff_options *", + "comment": "Structure with options to influence diff or NULL for defaults." + } + ], + "argline": "git_diff **diff, git_repository *repo, git_index *index, const git_diff_options *opts", + "sig": "git_diff **::git_repository *::git_index *::const git_diff_options *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Create a diff between the repository index and the workdir directory.

\n", + "comments": "

This matches the git diff command. See the note below on\n git_diff_tree_to_workdir for a discussion of the difference between\n git diff and git diff HEAD and how to emulate a `git diff \n<treeish

\n\n
\n

`\n using libgit2.

\n
\n\n

The index will be used for the "old_file" side of the delta, and the\n working directory will be used for the "new_file" side of the delta.

\n\n

If you pass NULL for the index, then the existing index of the repo\n will be used. In this case, the index will be refreshed from disk\n (if it has changed) before the diff is generated.

\n", + "group": "diff", + "examples": { + "diff.c": [ + "ex/v0.23.2/diff.html#git_diff_index_to_workdir-5" + ] + } + }, + "git_diff_tree_to_workdir": { + "type": "function", + "file": "diff.h", + "line": 813, + "lineto": 817, + "args": [ + { + "name": "diff", + "type": "git_diff **", + "comment": "A pointer to a git_diff pointer that will be allocated." + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "The repository containing the tree." + }, + { + "name": "old_tree", + "type": "git_tree *", + "comment": "A git_tree object to diff from, or NULL for empty tree." + }, + { + "name": "opts", + "type": "const git_diff_options *", + "comment": "Structure with options to influence diff or NULL for defaults." + } + ], + "argline": "git_diff **diff, git_repository *repo, git_tree *old_tree, const git_diff_options *opts", + "sig": "git_diff **::git_repository *::git_tree *::const git_diff_options *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Create a diff between a tree and the working directory.

\n", + "comments": "

The tree you provide will be used for the "old_file" side of the delta,\n and the working directory will be used for the "new_file" side.

\n\n

This is not the same as `git diff \n<treeish

\n\n
\n

orgit diff-index

\n
\n\n

<treeish

\n\n
\n

. Those commands use information from the index, whereas this\n function strictly returns the differences between the tree and the files\n in the working directory, regardless of the state of the index. Use\ngit_diff_tree_to_workdir_with_index` to emulate those commands.

\n
\n\n

To see difference between this and git_diff_tree_to_workdir_with_index,\n consider the example of a staged file deletion where the file has then\n been put back into the working dir and further modified. The\n tree-to-workdir diff for that file is 'modified', but git diff would\n show status 'deleted' since there is a staged delete.

\n", + "group": "diff", + "examples": { + "diff.c": [ + "ex/v0.23.2/diff.html#git_diff_tree_to_workdir-6" + ] + } + }, + "git_diff_tree_to_workdir_with_index": { + "type": "function", + "file": "diff.h", + "line": 832, + "lineto": 836, + "args": [ + { + "name": "diff", + "type": "git_diff **", + "comment": "A pointer to a git_diff pointer that will be allocated." + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "The repository containing the tree." + }, + { + "name": "old_tree", + "type": "git_tree *", + "comment": "A git_tree object to diff from, or NULL for empty tree." + }, + { + "name": "opts", + "type": "const git_diff_options *", + "comment": "Structure with options to influence diff or NULL for defaults." + } + ], + "argline": "git_diff **diff, git_repository *repo, git_tree *old_tree, const git_diff_options *opts", + "sig": "git_diff **::git_repository *::git_tree *::const git_diff_options *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Create a diff between a tree and the working directory using index data\n to account for staged deletes, tracked files, etc.

\n", + "comments": "

This emulates `git diff \n<tree

\n\n
\n

` by diffing the tree to the index and\n the index to the working directory and blending the results into a\n single diff that includes staged deleted, etc.

\n
\n", + "group": "diff", + "examples": { + "diff.c": [ + "ex/v0.23.2/diff.html#git_diff_tree_to_workdir_with_index-7" + ] + } + }, + "git_diff_merge": { + "type": "function", + "file": "diff.h", + "line": 851, + "lineto": 853, + "args": [ + { + "name": "onto", + "type": "git_diff *", + "comment": "Diff to merge into." + }, + { + "name": "from", + "type": "const git_diff *", + "comment": "Diff to merge." + } + ], + "argline": "git_diff *onto, const git_diff *from", + "sig": "git_diff *::const git_diff *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Merge one diff into another.

\n", + "comments": "

This merges items from the "from" list into the "onto" list. The\n resulting diff will have all items that appear in either list.\n If an item appears in both lists, then it will be "merged" to appear\n as if the old version was from the "onto" list and the new version\n is from the "from" list (with the exception that if the item has a\n pending DELETE in the middle, then it will show as deleted).

\n", + "group": "diff" + }, + "git_diff_find_similar": { + "type": "function", + "file": "diff.h", + "line": 867, + "lineto": 869, + "args": [ + { + "name": "diff", + "type": "git_diff *", + "comment": "diff to run detection algorithms on" + }, + { + "name": "options", + "type": "const git_diff_find_options *", + "comment": "Control how detection should be run, NULL for defaults" + } + ], + "argline": "git_diff *diff, const git_diff_find_options *options", + "sig": "git_diff *::const git_diff_find_options *", + "return": { + "type": "int", + "comment": " 0 on success, -1 on failure" + }, + "description": "

Transform a diff marking file renames, copies, etc.

\n", + "comments": "

This modifies a diff in place, replacing old entries that look\n like renames or copies with new entries reflecting those changes.\n This also will, if requested, break modified files into add/remove\n pairs if the amount of change is above a threshold.

\n", + "group": "diff", + "examples": { + "diff.c": [ + "ex/v0.23.2/diff.html#git_diff_find_similar-8" + ] + } + }, + "git_diff_num_deltas": { + "type": "function", + "file": "diff.h", + "line": 887, + "lineto": 887, + "args": [ + { + "name": "diff", + "type": "const git_diff *", + "comment": "A git_diff generated by one of the above functions" + } + ], + "argline": "const git_diff *diff", + "sig": "const git_diff *", + "return": { + "type": "size_t", + "comment": " Count of number of deltas in the list" + }, + "description": "

Query how many diff records are there in a diff.

\n", + "comments": "", + "group": "diff", + "examples": { + "log.c": [ + "ex/v0.23.2/log.html#git_diff_num_deltas-28" + ] + } + }, + "git_diff_num_deltas_of_type": { + "type": "function", + "file": "diff.h", + "line": 900, + "lineto": 901, + "args": [ + { + "name": "diff", + "type": "const git_diff *", + "comment": "A git_diff generated by one of the above functions" + }, + { + "name": "type", + "type": "git_delta_t", + "comment": "A git_delta_t value to filter the count" + } + ], + "argline": "const git_diff *diff, git_delta_t type", + "sig": "const git_diff *::git_delta_t", + "return": { + "type": "size_t", + "comment": " Count of number of deltas matching delta_t type" + }, + "description": "

Query how many diff deltas are there in a diff filtered by type.

\n", + "comments": "

This works just like git_diff_entrycount() with an extra parameter\n that is a git_delta_t and returns just the count of how many deltas\n match that particular type.

\n", + "group": "diff" + }, + "git_diff_get_delta": { + "type": "function", + "file": "diff.h", + "line": 920, + "lineto": 921, + "args": [ + { + "name": "diff", + "type": "const git_diff *", + "comment": "Diff list object" + }, + { + "name": "idx", + "type": "size_t", + "comment": "Index into diff list" + } + ], + "argline": "const git_diff *diff, size_t idx", + "sig": "const git_diff *::size_t", + "return": { + "type": "const git_diff_delta *", + "comment": " Pointer to git_diff_delta (or NULL if `idx` out of range)" + }, + "description": "

Return the diff delta for an entry in the diff list.

\n", + "comments": "

The git_diff_delta pointer points to internal data and you do not\n have to release it when you are done with it. It will go away when\n the * git_diff (or any associated git_patch) goes away.

\n\n

Note that the flags on the delta related to whether it has binary\n content or not may not be set if there are no attributes set for the\n file and there has been no reason to load the file data at this point.\n For now, if you need those flags to be up to date, your only option is\n to either use git_diff_foreach or create a git_patch.

\n", + "group": "diff" + }, + "git_diff_is_sorted_icase": { + "type": "function", + "file": "diff.h", + "line": 929, + "lineto": 929, + "args": [ + { + "name": "diff", + "type": "const git_diff *", + "comment": "diff to check" + } + ], + "argline": "const git_diff *diff", + "sig": "const git_diff *", + "return": { + "type": "int", + "comment": " 0 if case sensitive, 1 if case is ignored" + }, + "description": "

Check if deltas are sorted case sensitively or insensitively.

\n", + "comments": "", + "group": "diff" + }, + "git_diff_foreach": { + "type": "function", + "file": "diff.h", + "line": 957, + "lineto": 963, + "args": [ + { + "name": "diff", + "type": "git_diff *", + "comment": "A git_diff generated by one of the above functions." + }, + { + "name": "file_cb", + "type": "git_diff_file_cb", + "comment": "Callback function to make per file in the diff." + }, + { + "name": "binary_cb", + "type": "git_diff_binary_cb", + "comment": "Optional callback to make for binary files." + }, + { + "name": "hunk_cb", + "type": "git_diff_hunk_cb", + "comment": "Optional callback to make per hunk of text diff. This\n callback is called to describe a range of lines in the\n diff. It will not be issued for binary files." + }, + { + "name": "line_cb", + "type": "git_diff_line_cb", + "comment": "Optional callback to make per line of diff text. This\n same callback will be made for context lines, added, and\n removed lines, and even for a deleted trailing newline." + }, + { + "name": "payload", + "type": "void *", + "comment": "Reference pointer that will be passed to your callbacks." + } + ], + "argline": "git_diff *diff, git_diff_file_cb file_cb, git_diff_binary_cb binary_cb, git_diff_hunk_cb hunk_cb, git_diff_line_cb line_cb, void *payload", + "sig": "git_diff *::git_diff_file_cb::git_diff_binary_cb::git_diff_hunk_cb::git_diff_line_cb::void *", + "return": { + "type": "int", + "comment": " 0 on success, non-zero callback return value, or error code" + }, + "description": "

Loop over all deltas in a diff issuing callbacks.

\n", + "comments": "

This will iterate through all of the files described in a diff. You\n should provide a file callback to learn about each file.

\n\n

The "hunk" and "line" callbacks are optional, and the text diff of the\n files will only be calculated if they are not NULL. Of course, these\n callbacks will not be invoked for binary files on the diff or for\n files whose only changed is a file mode change.

\n\n

Returning a non-zero value from any of the callbacks will terminate\n the iteration and return the value to the user.

\n", + "group": "diff" + }, + "git_diff_status_char": { + "type": "function", + "file": "diff.h", + "line": 976, + "lineto": 976, + "args": [ + { + "name": "status", + "type": "git_delta_t", + "comment": "The git_delta_t value to look up" + } + ], + "argline": "git_delta_t status", + "sig": "git_delta_t", + "return": { + "type": "char", + "comment": " The single character label for that code" + }, + "description": "

Look up the single character abbreviation for a delta status code.

\n", + "comments": "

When you run git diff --name-status it uses single letter codes in\n the output such as 'A' for added, 'D' for deleted, 'M' for modified,\n etc. This function converts a git_delta_t value into these letters for\n your own purposes. GIT_DELTA_UNTRACKED will return a space (i.e. ' ').

\n", + "group": "diff" + }, + "git_diff_print": { + "type": "function", + "file": "diff.h", + "line": 1001, + "lineto": 1005, + "args": [ + { + "name": "diff", + "type": "git_diff *", + "comment": "A git_diff generated by one of the above functions." + }, + { + "name": "format", + "type": "git_diff_format_t", + "comment": "A git_diff_format_t value to pick the text format." + }, + { + "name": "print_cb", + "type": "git_diff_line_cb", + "comment": "Callback to make per line of diff text." + }, + { + "name": "payload", + "type": "void *", + "comment": "Reference pointer that will be passed to your callback." + } + ], + "argline": "git_diff *diff, git_diff_format_t format, git_diff_line_cb print_cb, void *payload", + "sig": "git_diff *::git_diff_format_t::git_diff_line_cb::void *", + "return": { + "type": "int", + "comment": " 0 on success, non-zero callback return value, or error code" + }, + "description": "

Iterate over a diff generating formatted text output.

\n", + "comments": "

Returning a non-zero value from the callbacks will terminate the\n iteration and return the non-zero value to the caller.

\n", + "group": "diff", + "examples": { + "diff.c": [ + "ex/v0.23.2/diff.html#git_diff_print-9" + ], + "log.c": [ + "ex/v0.23.2/log.html#git_diff_print-29" + ] + } + }, + "git_diff_blobs": { + "type": "function", + "file": "diff.h", + "line": 1042, + "lineto": 1052, + "args": [ + { + "name": "old_blob", + "type": "const git_blob *", + "comment": "Blob for old side of diff, or NULL for empty blob" + }, + { + "name": "old_as_path", + "type": "const char *", + "comment": "Treat old blob as if it had this filename; can be NULL" + }, + { + "name": "new_blob", + "type": "const git_blob *", + "comment": "Blob for new side of diff, or NULL for empty blob" + }, + { + "name": "new_as_path", + "type": "const char *", + "comment": "Treat new blob as if it had this filename; can be NULL" + }, + { + "name": "options", + "type": "const git_diff_options *", + "comment": "Options for diff, or NULL for default options" + }, + { + "name": "file_cb", + "type": "git_diff_file_cb", + "comment": "Callback for \"file\"; made once if there is a diff; can be NULL" + }, + { + "name": "binary_cb", + "type": "git_diff_binary_cb", + "comment": "Callback for binary files; can be NULL" + }, + { + "name": "hunk_cb", + "type": "git_diff_hunk_cb", + "comment": "Callback for each hunk in diff; can be NULL" + }, + { + "name": "line_cb", + "type": "git_diff_line_cb", + "comment": "Callback for each line in diff; can be NULL" + }, + { + "name": "payload", + "type": "void *", + "comment": "Payload passed to each callback function" + } + ], + "argline": "const git_blob *old_blob, const char *old_as_path, const git_blob *new_blob, const char *new_as_path, const git_diff_options *options, git_diff_file_cb file_cb, git_diff_binary_cb binary_cb, git_diff_hunk_cb hunk_cb, git_diff_line_cb line_cb, void *payload", + "sig": "const git_blob *::const char *::const git_blob *::const char *::const git_diff_options *::git_diff_file_cb::git_diff_binary_cb::git_diff_hunk_cb::git_diff_line_cb::void *", + "return": { + "type": "int", + "comment": " 0 on success, non-zero callback return value, or error code" + }, + "description": "

Directly run a diff on two blobs.

\n", + "comments": "

Compared to a file, a blob lacks some contextual information. As such,\n the git_diff_file given to the callback will have some fake data; i.e.\n mode will be 0 and path will be NULL.

\n\n

NULL is allowed for either old_blob or new_blob and will be treated\n as an empty blob, with the oid set to NULL in the git_diff_file data.\n Passing NULL for both blobs is a noop; no callbacks will be made at all.

\n\n

We do run a binary content check on the blob content and if either blob\n looks like binary data, the git_diff_delta binary attribute will be set\n to 1 and no call to the hunk_cb nor line_cb will be made (unless you pass\n GIT_DIFF_FORCE_TEXT of course).

\n", + "group": "diff" + }, + "git_diff_blob_to_buffer": { + "type": "function", + "file": "diff.h", + "line": 1079, + "lineto": 1090, + "args": [ + { + "name": "old_blob", + "type": "const git_blob *", + "comment": "Blob for old side of diff, or NULL for empty blob" + }, + { + "name": "old_as_path", + "type": "const char *", + "comment": "Treat old blob as if it had this filename; can be NULL" + }, + { + "name": "buffer", + "type": "const char *", + "comment": "Raw data for new side of diff, or NULL for empty" + }, + { + "name": "buffer_len", + "type": "size_t", + "comment": "Length of raw data for new side of diff" + }, + { + "name": "buffer_as_path", + "type": "const char *", + "comment": "Treat buffer as if it had this filename; can be NULL" + }, + { + "name": "options", + "type": "const git_diff_options *", + "comment": "Options for diff, or NULL for default options" + }, + { + "name": "file_cb", + "type": "git_diff_file_cb", + "comment": "Callback for \"file\"; made once if there is a diff; can be NULL" + }, + { + "name": "binary_cb", + "type": "git_diff_binary_cb", + "comment": "Callback for binary files; can be NULL" + }, + { + "name": "hunk_cb", + "type": "git_diff_hunk_cb", + "comment": "Callback for each hunk in diff; can be NULL" + }, + { + "name": "line_cb", + "type": "git_diff_line_cb", + "comment": "Callback for each line in diff; can be NULL" + }, + { + "name": "payload", + "type": "void *", + "comment": "Payload passed to each callback function" + } + ], + "argline": "const git_blob *old_blob, const char *old_as_path, const char *buffer, size_t buffer_len, const char *buffer_as_path, const git_diff_options *options, git_diff_file_cb file_cb, git_diff_binary_cb binary_cb, git_diff_hunk_cb hunk_cb, git_diff_line_cb line_cb, void *payload", + "sig": "const git_blob *::const char *::const char *::size_t::const char *::const git_diff_options *::git_diff_file_cb::git_diff_binary_cb::git_diff_hunk_cb::git_diff_line_cb::void *", + "return": { + "type": "int", + "comment": " 0 on success, non-zero callback return value, or error code" + }, + "description": "

Directly run a diff between a blob and a buffer.

\n", + "comments": "

As with git_diff_blobs, comparing a blob and buffer lacks some context,\n so the git_diff_file parameters to the callbacks will be faked a la the\n rules for git_diff_blobs().

\n\n

Passing NULL for old_blob will be treated as an empty blob (i.e. the\n file_cb will be invoked with GIT_DELTA_ADDED and the diff will be the\n entire content of the buffer added). Passing NULL to the buffer will do\n the reverse, with GIT_DELTA_REMOVED and blob content removed.

\n", + "group": "diff" + }, + "git_diff_buffers": { + "type": "function", + "file": "diff.h", + "line": 1113, + "lineto": 1125, + "args": [ + { + "name": "old_buffer", + "type": "const void *", + "comment": "Raw data for old side of diff, or NULL for empty" + }, + { + "name": "old_len", + "type": "size_t", + "comment": "Length of the raw data for old side of the diff" + }, + { + "name": "old_as_path", + "type": "const char *", + "comment": "Treat old buffer as if it had this filename; can be NULL" + }, + { + "name": "new_buffer", + "type": "const void *", + "comment": "Raw data for new side of diff, or NULL for empty" + }, + { + "name": "new_len", + "type": "size_t", + "comment": "Length of raw data for new side of diff" + }, + { + "name": "new_as_path", + "type": "const char *", + "comment": "Treat buffer as if it had this filename; can be NULL" + }, + { + "name": "options", + "type": "const git_diff_options *", + "comment": "Options for diff, or NULL for default options" + }, + { + "name": "file_cb", + "type": "git_diff_file_cb", + "comment": "Callback for \"file\"; made once if there is a diff; can be NULL" + }, + { + "name": "binary_cb", + "type": "git_diff_binary_cb", + "comment": "Callback for binary files; can be NULL" + }, + { + "name": "hunk_cb", + "type": "git_diff_hunk_cb", + "comment": "Callback for each hunk in diff; can be NULL" + }, + { + "name": "line_cb", + "type": "git_diff_line_cb", + "comment": "Callback for each line in diff; can be NULL" + }, + { + "name": "payload", + "type": "void *", + "comment": "Payload passed to each callback function" + } + ], + "argline": "const void *old_buffer, size_t old_len, const char *old_as_path, const void *new_buffer, size_t new_len, const char *new_as_path, const git_diff_options *options, git_diff_file_cb file_cb, git_diff_binary_cb binary_cb, git_diff_hunk_cb hunk_cb, git_diff_line_cb line_cb, void *payload", + "sig": "const void *::size_t::const char *::const void *::size_t::const char *::const git_diff_options *::git_diff_file_cb::git_diff_binary_cb::git_diff_hunk_cb::git_diff_line_cb::void *", + "return": { + "type": "int", + "comment": " 0 on success, non-zero callback return value, or error code" + }, + "description": "

Directly run a diff between two buffers.

\n", + "comments": "

Even more than with git_diff_blobs, comparing two buffer lacks\n context, so the git_diff_file parameters to the callbacks will be\n faked a la the rules for git_diff_blobs().

\n", + "group": "diff" + }, + "git_diff_get_stats": { + "type": "function", + "file": "diff.h", + "line": 1161, + "lineto": 1163, + "args": [ + { + "name": "out", + "type": "git_diff_stats **", + "comment": "Structure containg the diff statistics." + }, + { + "name": "diff", + "type": "git_diff *", + "comment": "A git_diff generated by one of the above functions." + } + ], + "argline": "git_diff_stats **out, git_diff *diff", + "sig": "git_diff_stats **::git_diff *", + "return": { + "type": "int", + "comment": " 0 on success; non-zero on error" + }, + "description": "

Accumlate diff statistics for all patches.

\n", + "comments": "", + "group": "diff", + "examples": { + "diff.c": [ + "ex/v0.23.2/diff.html#git_diff_get_stats-10" + ] + } + }, + "git_diff_stats_files_changed": { + "type": "function", + "file": "diff.h", + "line": 1171, + "lineto": 1172, + "args": [ + { + "name": "stats", + "type": "const git_diff_stats *", + "comment": "A `git_diff_stats` generated by one of the above functions." + } + ], + "argline": "const git_diff_stats *stats", + "sig": "const git_diff_stats *", + "return": { + "type": "size_t", + "comment": " total number of files changed in the diff" + }, + "description": "

Get the total number of files changed in a diff

\n", + "comments": "", + "group": "diff" + }, + "git_diff_stats_insertions": { + "type": "function", + "file": "diff.h", + "line": 1180, + "lineto": 1181, + "args": [ + { + "name": "stats", + "type": "const git_diff_stats *", + "comment": "A `git_diff_stats` generated by one of the above functions." + } + ], + "argline": "const git_diff_stats *stats", + "sig": "const git_diff_stats *", + "return": { + "type": "size_t", + "comment": " total number of insertions in the diff" + }, + "description": "

Get the total number of insertions in a diff

\n", + "comments": "", + "group": "diff" + }, + "git_diff_stats_deletions": { + "type": "function", + "file": "diff.h", + "line": 1189, + "lineto": 1190, + "args": [ + { + "name": "stats", + "type": "const git_diff_stats *", + "comment": "A `git_diff_stats` generated by one of the above functions." + } + ], + "argline": "const git_diff_stats *stats", + "sig": "const git_diff_stats *", + "return": { + "type": "size_t", + "comment": " total number of deletions in the diff" + }, + "description": "

Get the total number of deletions in a diff

\n", + "comments": "", + "group": "diff" + }, + "git_diff_stats_to_buf": { + "type": "function", + "file": "diff.h", + "line": 1201, + "lineto": 1205, + "args": [ + { + "name": "out", + "type": "git_buf *", + "comment": "buffer to store the formatted diff statistics in." + }, + { + "name": "stats", + "type": "const git_diff_stats *", + "comment": "A `git_diff_stats` generated by one of the above functions." + }, + { + "name": "format", + "type": "git_diff_stats_format_t", + "comment": "Formatting option." + }, + { + "name": "width", + "type": "size_t", + "comment": "Target width for output (only affects GIT_DIFF_STATS_FULL)" + } + ], + "argline": "git_buf *out, const git_diff_stats *stats, git_diff_stats_format_t format, size_t width", + "sig": "git_buf *::const git_diff_stats *::git_diff_stats_format_t::size_t", + "return": { + "type": "int", + "comment": " 0 on success; non-zero on error" + }, + "description": "

Print diff statistics to a git_buf.

\n", + "comments": "", + "group": "diff", + "examples": { + "diff.c": [ + "ex/v0.23.2/diff.html#git_diff_stats_to_buf-11" + ] + } + }, + "git_diff_stats_free": { + "type": "function", + "file": "diff.h", + "line": 1213, + "lineto": 1213, + "args": [ + { + "name": "stats", + "type": "git_diff_stats *", + "comment": "The previously created statistics object;\n cannot be used after free." + } + ], + "argline": "git_diff_stats *stats", + "sig": "git_diff_stats *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Deallocate a git_diff_stats.

\n", + "comments": "", + "group": "diff", + "examples": { + "diff.c": [ + "ex/v0.23.2/diff.html#git_diff_stats_free-12" + ] + } + }, + "git_diff_format_email": { + "type": "function", + "file": "diff.h", + "line": 1262, + "lineto": 1265, + "args": [ + { + "name": "out", + "type": "git_buf *", + "comment": "buffer to store the e-mail patch in" + }, + { + "name": "diff", + "type": "git_diff *", + "comment": "containing the commit" + }, + { + "name": "opts", + "type": "const git_diff_format_email_options *", + "comment": "structure with options to influence content and formatting." + } + ], + "argline": "git_buf *out, git_diff *diff, const git_diff_format_email_options *opts", + "sig": "git_buf *::git_diff *::const git_diff_format_email_options *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Create an e-mail ready patch from a diff.

\n", + "comments": "", + "group": "diff" + }, + "git_diff_commit_as_email": { + "type": "function", + "file": "diff.h", + "line": 1281, + "lineto": 1288, + "args": [ + { + "name": "out", + "type": "git_buf *", + "comment": "buffer to store the e-mail patch in" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "containing the commit" + }, + { + "name": "commit", + "type": "git_commit *", + "comment": "pointer to up commit" + }, + { + "name": "patch_no", + "type": "size_t", + "comment": "patch number of the commit" + }, + { + "name": "total_patches", + "type": "size_t", + "comment": "total number of patches in the patch set" + }, + { + "name": "flags", + "type": "git_diff_format_email_flags_t", + "comment": "determines the formatting of the e-mail" + }, + { + "name": "diff_opts", + "type": "const git_diff_options *", + "comment": "structure with options to influence diff or NULL for defaults." + } + ], + "argline": "git_buf *out, git_repository *repo, git_commit *commit, size_t patch_no, size_t total_patches, git_diff_format_email_flags_t flags, const git_diff_options *diff_opts", + "sig": "git_buf *::git_repository *::git_commit *::size_t::size_t::git_diff_format_email_flags_t::const git_diff_options *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Create an e-mail ready patch for a commit.

\n", + "comments": "

Does not support creating patches for merge commits (yet).

\n", + "group": "diff" + }, + "git_diff_format_email_init_options": { + "type": "function", + "file": "diff.h", + "line": 1299, + "lineto": 1301, + "args": [ + { + "name": "opts", + "type": "git_diff_format_email_options *", + "comment": "The `git_diff_format_email_options` struct to initialize" + }, + { + "name": "version", + "type": "unsigned int", + "comment": "Version of struct; pass `GIT_DIFF_FORMAT_EMAIL_OPTIONS_VERSION`" + } + ], + "argline": "git_diff_format_email_options *opts, unsigned int version", + "sig": "git_diff_format_email_options *::unsigned int", + "return": { + "type": "int", + "comment": " Zero on success; -1 on failure." + }, + "description": "

Initializes a git_diff_format_email_options with default values.

\n", + "comments": "

Equivalent to creating an instance with GIT_DIFF_FORMAT_EMAIL_OPTIONS_INIT.

\n", + "group": "diff" + }, + "giterr_last": { + "type": "function", + "file": "errors.h", + "line": 109, + "lineto": 109, + "args": [], + "argline": "", + "sig": "", + "return": { + "type": "const git_error *", + "comment": " A git_error object." + }, + "description": "

Return the last git_error object that was generated for the\n current thread or NULL if no error has occurred.

\n", + "comments": "", + "group": "giterr", + "examples": { + "general.c": [ + "ex/v0.23.2/general.html#giterr_last-27" + ], + "network/clone.c": [ + "ex/v0.23.2/network/clone.html#giterr_last-2" + ], + "network/git2.c": [ + "ex/v0.23.2/network/git2.html#giterr_last-1", + "ex/v0.23.2/network/git2.html#giterr_last-2" + ] + } + }, + "giterr_clear": { + "type": "function", + "file": "errors.h", + "line": 114, + "lineto": 114, + "args": [], + "argline": "", + "sig": "", + "return": { + "type": "void", + "comment": null + }, + "description": "

Clear the last library error that occurred for this thread.

\n", + "comments": "", + "group": "giterr" + }, + "giterr_detach": { + "type": "function", + "file": "errors.h", + "line": 126, + "lineto": 126, + "args": [ + { + "name": "cpy", + "type": "git_error *", + "comment": null + } + ], + "argline": "git_error *cpy", + "sig": "git_error *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Get the last error data and clear it.

\n", + "comments": "

This copies the last error into the given git_error struct\n and returns 0 if the copy was successful, leaving the error\n cleared as if giterr_clear had been called.

\n\n

If there was no existing error in the library, -1 will be returned\n and the contents of cpy will be left unmodified.

\n", + "group": "giterr" + }, + "giterr_set_str": { + "type": "function", + "file": "errors.h", + "line": 149, + "lineto": 149, + "args": [ + { + "name": "error_class", + "type": "int", + "comment": "One of the `git_error_t` enum above describing the\n general subsystem that is responsible for the error." + }, + { + "name": "string", + "type": "const char *", + "comment": "The formatted error message to keep" + } + ], + "argline": "int error_class, const char *string", + "sig": "int::const char *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Set the error message string for this thread.

\n", + "comments": "

This function is public so that custom ODB backends and the like can\n relay an error message through libgit2. Most regular users of libgit2\n will never need to call this function -- actually, calling it in most\n circumstances (for example, calling from within a callback function)\n will just end up having the value overwritten by libgit2 internals.

\n\n

This error message is stored in thread-local storage and only applies\n to the particular thread that this libgit2 call is made from.

\n\n

NOTE: Passing the error_class as GITERR_OS has a special behavior: we\n attempt to append the system default error message for the last OS error\n that occurred and then clear the last error. The specific implementation\n of looking up and clearing this last OS error will vary by platform.

\n", + "group": "giterr" + }, + "giterr_set_oom": { + "type": "function", + "file": "errors.h", + "line": 160, + "lineto": 160, + "args": [], + "argline": "", + "sig": "", + "return": { + "type": "void", + "comment": null + }, + "description": "

Set the error message to a special value for memory allocation failure.

\n", + "comments": "

The normal giterr_set_str() function attempts to strdup() the string\n that is passed in. This is not a good idea when the error in question\n is a memory allocation failure. That circumstance has a special setter\n function that sets the error string to a known and statically allocated\n internal value.

\n", + "group": "giterr" + }, + "git_filter_list_load": { + "type": "function", + "file": "filter.h", + "line": 90, + "lineto": 96, + "args": [ + { + "name": "filters", + "type": "git_filter_list **", + "comment": "Output newly created git_filter_list (or NULL)" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "Repository object that contains `path`" + }, + { + "name": "blob", + "type": "git_blob *", + "comment": "The blob to which the filter will be applied (if known)" + }, + { + "name": "path", + "type": "const char *", + "comment": "Relative path of the file to be filtered" + }, + { + "name": "mode", + "type": "git_filter_mode_t", + "comment": "Filtering direction (WT->ODB or ODB->WT)" + }, + { + "name": "flags", + "type": "uint32_t", + "comment": "Combination of `git_filter_flag_t` flags" + } + ], + "argline": "git_filter_list **filters, git_repository *repo, git_blob *blob, const char *path, git_filter_mode_t mode, uint32_t flags", + "sig": "git_filter_list **::git_repository *::git_blob *::const char *::git_filter_mode_t::uint32_t", + "return": { + "type": "int", + "comment": " 0 on success (which could still return NULL if no filters are\n needed for the requested file), \n<\n0 on error" + }, + "description": "

Load the filter list for a given path.

\n", + "comments": "

This will return 0 (success) but set the output git_filter_list to NULL\n if no filters are requested for the given file.

\n", + "group": "filter" + }, + "git_filter_list_contains": { + "type": "function", + "file": "filter.h", + "line": 110, + "lineto": 112, + "args": [ + { + "name": "filters", + "type": "git_filter_list *", + "comment": "A loaded git_filter_list (or NULL)" + }, + { + "name": "name", + "type": "const char *", + "comment": "The name of the filter to query" + } + ], + "argline": "git_filter_list *filters, const char *name", + "sig": "git_filter_list *::const char *", + "return": { + "type": "int", + "comment": " 1 if the filter is in the list, 0 otherwise" + }, + "description": "

Query the filter list to see if a given filter (by name) will run.\n The built-in filters "crlf" and "ident" can be queried, otherwise this\n is the name of the filter specified by the filter attribute.

\n", + "comments": "

This will return 0 if the given filter is not in the list, or 1 if\n the filter will be applied.

\n", + "group": "filter" + }, + "git_filter_list_apply_to_data": { + "type": "function", + "file": "filter.h", + "line": 134, + "lineto": 137, + "args": [ + { + "name": "out", + "type": "git_buf *", + "comment": "Buffer to store the result of the filtering" + }, + { + "name": "filters", + "type": "git_filter_list *", + "comment": "A loaded git_filter_list (or NULL)" + }, + { + "name": "in", + "type": "git_buf *", + "comment": "Buffer containing the data to filter" + } + ], + "argline": "git_buf *out, git_filter_list *filters, git_buf *in", + "sig": "git_buf *::git_filter_list *::git_buf *", + "return": { + "type": "int", + "comment": " 0 on success, an error code otherwise" + }, + "description": "

Apply filter list to a data buffer.

\n", + "comments": "

See git2/buffer.h for background on git_buf objects.

\n\n

If the in buffer holds data allocated by libgit2 (i.e. in->asize is\n not zero), then it will be overwritten when applying the filters. If\n not, then it will be left untouched.

\n\n

If there are no filters to apply (or filters is NULL), then the out\n buffer will reference the in buffer data (with asize set to zero)\n instead of allocating data. This keeps allocations to a minimum, but\n it means you have to be careful about freeing the in data since out\n may be pointing to it!

\n", + "group": "filter" + }, + "git_filter_list_apply_to_file": { + "type": "function", + "file": "filter.h", + "line": 148, + "lineto": 152, + "args": [ + { + "name": "out", + "type": "git_buf *", + "comment": "buffer into which to store the filtered file" + }, + { + "name": "filters", + "type": "git_filter_list *", + "comment": "the list of filters to apply" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "the repository in which to perform the filtering" + }, + { + "name": "path", + "type": "const char *", + "comment": "the path of the file to filter, a relative path will be\n taken as relative to the workdir" + } + ], + "argline": "git_buf *out, git_filter_list *filters, git_repository *repo, const char *path", + "sig": "git_buf *::git_filter_list *::git_repository *::const char *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Apply a filter list to the contents of a file on disk

\n", + "comments": "", + "group": "filter" + }, + "git_filter_list_apply_to_blob": { + "type": "function", + "file": "filter.h", + "line": 161, + "lineto": 164, + "args": [ + { + "name": "out", + "type": "git_buf *", + "comment": "buffer into which to store the filtered file" + }, + { + "name": "filters", + "type": "git_filter_list *", + "comment": "the list of filters to apply" + }, + { + "name": "blob", + "type": "git_blob *", + "comment": "the blob to filter" + } + ], + "argline": "git_buf *out, git_filter_list *filters, git_blob *blob", + "sig": "git_buf *::git_filter_list *::git_blob *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Apply a filter list to the contents of a blob

\n", + "comments": "", + "group": "filter" + }, + "git_filter_list_stream_data": { + "type": "function", + "file": "filter.h", + "line": 173, + "lineto": 176, + "args": [ + { + "name": "filters", + "type": "git_filter_list *", + "comment": "the list of filters to apply" + }, + { + "name": "data", + "type": "git_buf *", + "comment": "the buffer to filter" + }, + { + "name": "target", + "type": "git_writestream *", + "comment": "the stream into which the data will be written" + } + ], + "argline": "git_filter_list *filters, git_buf *data, git_writestream *target", + "sig": "git_filter_list *::git_buf *::git_writestream *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Apply a filter list to an arbitrary buffer as a stream

\n", + "comments": "", + "group": "filter" + }, + "git_filter_list_stream_file": { + "type": "function", + "file": "filter.h", + "line": 187, + "lineto": 191, + "args": [ + { + "name": "filters", + "type": "git_filter_list *", + "comment": "the list of filters to apply" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "the repository in which to perform the filtering" + }, + { + "name": "path", + "type": "const char *", + "comment": "the path of the file to filter, a relative path will be\n taken as relative to the workdir" + }, + { + "name": "target", + "type": "git_writestream *", + "comment": "the stream into which the data will be written" + } + ], + "argline": "git_filter_list *filters, git_repository *repo, const char *path, git_writestream *target", + "sig": "git_filter_list *::git_repository *::const char *::git_writestream *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Apply a filter list to a file as a stream

\n", + "comments": "", + "group": "filter" + }, + "git_filter_list_stream_blob": { + "type": "function", + "file": "filter.h", + "line": 200, + "lineto": 203, + "args": [ + { + "name": "filters", + "type": "git_filter_list *", + "comment": "the list of filters to apply" + }, + { + "name": "blob", + "type": "git_blob *", + "comment": "the blob to filter" + }, + { + "name": "target", + "type": "git_writestream *", + "comment": "the stream into which the data will be written" + } + ], + "argline": "git_filter_list *filters, git_blob *blob, git_writestream *target", + "sig": "git_filter_list *::git_blob *::git_writestream *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Apply a filter list to a blob as a stream

\n", + "comments": "", + "group": "filter" + }, + "git_filter_list_free": { + "type": "function", + "file": "filter.h", + "line": 210, + "lineto": 210, + "args": [ + { + "name": "filters", + "type": "git_filter_list *", + "comment": "A git_filter_list created by `git_filter_list_load`" + } + ], + "argline": "git_filter_list *filters", + "sig": "git_filter_list *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Free a git_filter_list

\n", + "comments": "", + "group": "filter" + }, + "git_libgit2_init": { + "type": "function", + "file": "global.h", + "line": 26, + "lineto": 26, + "args": [], + "argline": "", + "sig": "", + "return": { + "type": "int", + "comment": " the number of initializations of the library, or an error code." + }, + "description": "

Init the global state

\n", + "comments": "

This function must the called before any other libgit2 function in\n order to set up global state and threading.

\n\n

This function may be called multiple times - it will return the number\n of times the initialization has been called (including this one) that have\n not subsequently been shutdown.

\n", + "group": "libgit2", + "examples": { + "blame.c": [ + "ex/v0.23.2/blame.html#git_libgit2_init-8" + ], + "cat-file.c": [ + "ex/v0.23.2/cat-file.html#git_libgit2_init-10" + ], + "describe.c": [ + "ex/v0.23.2/describe.html#git_libgit2_init-4" + ], + "diff.c": [ + "ex/v0.23.2/diff.html#git_libgit2_init-13" + ], + "general.c": [ + "ex/v0.23.2/general.html#git_libgit2_init-28" + ], + "init.c": [ + "ex/v0.23.2/init.html#git_libgit2_init-2" + ], + "log.c": [ + "ex/v0.23.2/log.html#git_libgit2_init-30" + ], + "network/git2.c": [ + "ex/v0.23.2/network/git2.html#git_libgit2_init-3" + ], + "remote.c": [ + "ex/v0.23.2/remote.html#git_libgit2_init-2" + ], + "rev-parse.c": [ + "ex/v0.23.2/rev-parse.html#git_libgit2_init-1" + ], + "status.c": [ + "ex/v0.23.2/status.html#git_libgit2_init-1" + ], + "tag.c": [ + "ex/v0.23.2/tag.html#git_libgit2_init-3" + ] + } + }, + "git_libgit2_shutdown": { + "type": "function", + "file": "global.h", + "line": 39, + "lineto": 39, + "args": [], + "argline": "", + "sig": "", + "return": { + "type": "int", + "comment": " the number of remaining initializations of the library, or an\n error code." + }, + "description": "

Shutdown the global state

\n", + "comments": "

Clean up the global state and threading context after calling it as\n many times as git_libgit2_init() was called - it will return the\n number of remainining initializations that have not been shutdown\n (after this one).

\n", + "group": "libgit2", + "examples": { + "blame.c": [ + "ex/v0.23.2/blame.html#git_libgit2_shutdown-9" + ], + "cat-file.c": [ + "ex/v0.23.2/cat-file.html#git_libgit2_shutdown-11" + ], + "describe.c": [ + "ex/v0.23.2/describe.html#git_libgit2_shutdown-5" + ], + "diff.c": [ + "ex/v0.23.2/diff.html#git_libgit2_shutdown-14" + ], + "init.c": [ + "ex/v0.23.2/init.html#git_libgit2_shutdown-3" + ], + "log.c": [ + "ex/v0.23.2/log.html#git_libgit2_shutdown-31" + ], + "network/git2.c": [ + "ex/v0.23.2/network/git2.html#git_libgit2_shutdown-4" + ], + "remote.c": [ + "ex/v0.23.2/remote.html#git_libgit2_shutdown-3" + ], + "rev-parse.c": [ + "ex/v0.23.2/rev-parse.html#git_libgit2_shutdown-2" + ], + "status.c": [ + "ex/v0.23.2/status.html#git_libgit2_shutdown-2" + ], + "tag.c": [ + "ex/v0.23.2/tag.html#git_libgit2_shutdown-4" + ] + } + }, + "git_graph_ahead_behind": { + "type": "function", + "file": "graph.h", + "line": 37, + "lineto": 37, + "args": [ + { + "name": "ahead", + "type": "size_t *", + "comment": "number of unique from commits in `upstream`" + }, + { + "name": "behind", + "type": "size_t *", + "comment": "number of unique from commits in `local`" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "the repository where the commits exist" + }, + { + "name": "local", + "type": "const git_oid *", + "comment": "the commit for local" + }, + { + "name": "upstream", + "type": "const git_oid *", + "comment": "the commit for upstream" + } + ], + "argline": "size_t *ahead, size_t *behind, git_repository *repo, const git_oid *local, const git_oid *upstream", + "sig": "size_t *::size_t *::git_repository *::const git_oid *::const git_oid *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Count the number of unique commits between two commit objects

\n", + "comments": "

There is no need for branches containing the commits to have any\n upstream relationship, but it helps to think of one as a branch and\n the other as its upstream, the ahead and behind values will be\n what git would report for the branches.

\n", + "group": "graph" + }, + "git_graph_descendant_of": { + "type": "function", + "file": "graph.h", + "line": 48, + "lineto": 51, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": null + }, + { + "name": "commit", + "type": "const git_oid *", + "comment": "a previously loaded commit." + }, + { + "name": "ancestor", + "type": "const git_oid *", + "comment": "a potential ancestor commit." + } + ], + "argline": "git_repository *repo, const git_oid *commit, const git_oid *ancestor", + "sig": "git_repository *::const git_oid *::const git_oid *", + "return": { + "type": "int", + "comment": " 1 if the given commit is a descendant of the potential ancestor,\n 0 if not, error code otherwise." + }, + "description": "

Determine if a commit is the descendant of another commit.

\n", + "comments": "", + "group": "graph" + }, + "git_ignore_add_rule": { + "type": "function", + "file": "ignore.h", + "line": 37, + "lineto": 39, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "The repository to add ignore rules to." + }, + { + "name": "rules", + "type": "const char *", + "comment": "Text of rules, a la the contents of a .gitignore file.\n It is okay to have multiple rules in the text; if so,\n each rule should be terminated with a newline." + } + ], + "argline": "git_repository *repo, const char *rules", + "sig": "git_repository *::const char *", + "return": { + "type": "int", + "comment": " 0 on success" + }, + "description": "

Add ignore rules for a repository.

\n", + "comments": "

Excludesfile rules (i.e. .gitignore rules) are generally read from\n .gitignore files in the repository tree or from a shared system file\n only if a "core.excludesfile" config value is set. The library also\n keeps a set of per-repository internal ignores that can be configured\n in-memory and will not persist. This function allows you to add to\n that internal rules list.

\n\n

Example usage:

\n\n
 error = git_ignore_add_rule(myrepo, "*.c\n
\n\n

/

\n\n

with space

\n\n

");

\n\n

This would add three rules to the ignores.

\n", + "group": "ignore" + }, + "git_ignore_clear_internal_rules": { + "type": "function", + "file": "ignore.h", + "line": 52, + "lineto": 53, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "The repository to remove ignore rules from." + } + ], + "argline": "git_repository *repo", + "sig": "git_repository *", + "return": { + "type": "int", + "comment": " 0 on success" + }, + "description": "

Clear ignore rules that were explicitly added.

\n", + "comments": "

Resets to the default internal ignore rules. This will not turn off\n rules in .gitignore files that actually exist in the filesystem.

\n\n

The default internal ignores ignore ".", ".." and ".git" entries.

\n", + "group": "ignore" + }, + "git_ignore_path_is_ignored": { + "type": "function", + "file": "ignore.h", + "line": 71, + "lineto": 74, + "args": [ + { + "name": "ignored", + "type": "int *", + "comment": "boolean returning 0 if the file is not ignored, 1 if it is" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "a repository object" + }, + { + "name": "path", + "type": "const char *", + "comment": "the file to check ignores for, relative to the repo's workdir." + } + ], + "argline": "int *ignored, git_repository *repo, const char *path", + "sig": "int *::git_repository *::const char *", + "return": { + "type": "int", + "comment": " 0 if ignore rules could be processed for the file (regardless\n of whether it exists or not), or an error \n<\n 0 if they could not." + }, + "description": "

Test if the ignore rules apply to a given path.

\n", + "comments": "

This function checks the ignore rules to see if they would apply to the\n given file. This indicates if the file would be ignored regardless of\n whether the file is already in the index or committed to the repository.

\n\n

One way to think of this is if you were to do "git add ." on the\n directory containing the file, would it be added or not?

\n", + "group": "ignore" + }, + "git_index_open": { + "type": "function", + "file": "index.h", + "line": 189, + "lineto": 189, + "args": [ + { + "name": "out", + "type": "git_index **", + "comment": "the pointer for the new index" + }, + { + "name": "index_path", + "type": "const char *", + "comment": "the path to the index file in disk" + } + ], + "argline": "git_index **out, const char *index_path", + "sig": "git_index **::const char *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Create a new bare Git index object as a memory representation\n of the Git index file in 'index_path', without a repository\n to back it.

\n", + "comments": "

Since there is no ODB or working directory behind this index,\n any Index methods which rely on these (e.g. index_add_bypath)\n will fail with the GIT_ERROR error code.

\n\n

If you need to access the index of an actual repository,\n use the git_repository_index wrapper.

\n\n

The index must be freed once it's no longer in use.

\n", + "group": "index" + }, + "git_index_new": { + "type": "function", + "file": "index.h", + "line": 202, + "lineto": 202, + "args": [ + { + "name": "out", + "type": "git_index **", + "comment": "the pointer for the new index" + } + ], + "argline": "git_index **out", + "sig": "git_index **", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Create an in-memory index object.

\n", + "comments": "

This index object cannot be read/written to the filesystem,\n but may be used to perform in-memory index operations.

\n\n

The index must be freed once it's no longer in use.

\n", + "group": "index" + }, + "git_index_free": { + "type": "function", + "file": "index.h", + "line": 209, + "lineto": 209, + "args": [ + { + "name": "index", + "type": "git_index *", + "comment": "an existing index object" + } + ], + "argline": "git_index *index", + "sig": "git_index *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Free an existing index object.

\n", + "comments": "", + "group": "index", + "examples": { + "general.c": [ + "ex/v0.23.2/general.html#git_index_free-29" + ], + "init.c": [ + "ex/v0.23.2/init.html#git_index_free-4" + ] + } + }, + "git_index_owner": { + "type": "function", + "file": "index.h", + "line": 217, + "lineto": 217, + "args": [ + { + "name": "index", + "type": "const git_index *", + "comment": "The index" + } + ], + "argline": "const git_index *index", + "sig": "const git_index *", + "return": { + "type": "git_repository *", + "comment": " A pointer to the repository" + }, + "description": "

Get the repository this index relates to

\n", + "comments": "", + "group": "index" + }, + "git_index_caps": { + "type": "function", + "file": "index.h", + "line": 225, + "lineto": 225, + "args": [ + { + "name": "index", + "type": "const git_index *", + "comment": "An existing index object" + } + ], + "argline": "const git_index *index", + "sig": "const git_index *", + "return": { + "type": "int", + "comment": " A combination of GIT_INDEXCAP values" + }, + "description": "

Read index capabilities flags.

\n", + "comments": "", + "group": "index" + }, + "git_index_set_caps": { + "type": "function", + "file": "index.h", + "line": 238, + "lineto": 238, + "args": [ + { + "name": "index", + "type": "git_index *", + "comment": "An existing index object" + }, + { + "name": "caps", + "type": "int", + "comment": "A combination of GIT_INDEXCAP values" + } + ], + "argline": "git_index *index, int caps", + "sig": "git_index *::int", + "return": { + "type": "int", + "comment": " 0 on success, -1 on failure" + }, + "description": "

Set index capabilities flags.

\n", + "comments": "

If you pass GIT_INDEXCAP_FROM_OWNER for the caps, then the\n capabilities will be read from the config of the owner object,\n looking at core.ignorecase, core.filemode, core.symlinks.

\n", + "group": "index" + }, + "git_index_read": { + "type": "function", + "file": "index.h", + "line": 257, + "lineto": 257, + "args": [ + { + "name": "index", + "type": "git_index *", + "comment": "an existing index object" + }, + { + "name": "force", + "type": "int", + "comment": "if true, always reload, vs. only read if file has changed" + } + ], + "argline": "git_index *index, int force", + "sig": "git_index *::int", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Update the contents of an existing index object in memory by reading\n from the hard disk.

\n", + "comments": "

If force is true, this performs a "hard" read that discards in-memory\n changes and always reloads the on-disk index data. If there is no\n on-disk version, the index will be cleared.

\n\n

If force is false, this does a "soft" read that reloads the index\n data from disk only if it has changed since the last time it was\n loaded. Purely in-memory index data will be untouched. Be aware: if\n there are changes on disk, unwritten in-memory changes are discarded.

\n", + "group": "index" + }, + "git_index_write": { + "type": "function", + "file": "index.h", + "line": 266, + "lineto": 266, + "args": [ + { + "name": "index", + "type": "git_index *", + "comment": "an existing index object" + } + ], + "argline": "git_index *index", + "sig": "git_index *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Write an existing index object from memory back to disk\n using an atomic file lock.

\n", + "comments": "", + "group": "index" + }, + "git_index_path": { + "type": "function", + "file": "index.h", + "line": 274, + "lineto": 274, + "args": [ + { + "name": "index", + "type": "const git_index *", + "comment": "an existing index object" + } + ], + "argline": "const git_index *index", + "sig": "const git_index *", + "return": { + "type": "const char *", + "comment": " path to index file or NULL for in-memory index" + }, + "description": "

Get the full path to the index file on disk.

\n", + "comments": "", + "group": "index" + }, + "git_index_checksum": { + "type": "function", + "file": "index.h", + "line": 286, + "lineto": 286, + "args": [ + { + "name": "index", + "type": "git_index *", + "comment": "an existing index object" + } + ], + "argline": "git_index *index", + "sig": "git_index *", + "return": { + "type": "const git_oid *", + "comment": " a pointer to the checksum of the index" + }, + "description": "

Get the checksum of the index

\n", + "comments": "

This checksum is the SHA-1 hash over the index file (except the\n last 20 bytes which are the checksum itself). In cases where the\n index does not exist on-disk, it will be zeroed out.

\n", + "group": "index" + }, + "git_index_read_tree": { + "type": "function", + "file": "index.h", + "line": 297, + "lineto": 297, + "args": [ + { + "name": "index", + "type": "git_index *", + "comment": "an existing index object" + }, + { + "name": "tree", + "type": "const git_tree *", + "comment": "tree to read" + } + ], + "argline": "git_index *index, const git_tree *tree", + "sig": "git_index *::const git_tree *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Read a tree into the index file with stats

\n", + "comments": "

The current index contents will be replaced by the specified tree.

\n", + "group": "index" + }, + "git_index_write_tree": { + "type": "function", + "file": "index.h", + "line": 318, + "lineto": 318, + "args": [ + { + "name": "out", + "type": "git_oid *", + "comment": "Pointer where to store the OID of the written tree" + }, + { + "name": "index", + "type": "git_index *", + "comment": "Index to write" + } + ], + "argline": "git_oid *out, git_index *index", + "sig": "git_oid *::git_index *", + "return": { + "type": "int", + "comment": " 0 on success, GIT_EUNMERGED when the index is not clean\n or an error code" + }, + "description": "

Write the index as a tree

\n", + "comments": "

This method will scan the index and write a representation\n of its current state back to disk; it recursively creates\n tree objects for each of the subtrees stored in the index,\n but only returns the OID of the root tree. This is the OID\n that can be used e.g. to create a commit.

\n\n

The index instance cannot be bare, and needs to be associated\n to an existing repository.

\n\n

The index must not contain any file in conflict.

\n", + "group": "index", + "examples": { + "init.c": [ + "ex/v0.23.2/init.html#git_index_write_tree-5" + ] + } + }, + "git_index_write_tree_to": { + "type": "function", + "file": "index.h", + "line": 335, + "lineto": 335, + "args": [ + { + "name": "out", + "type": "git_oid *", + "comment": "Pointer where to store OID of the the written tree" + }, + { + "name": "index", + "type": "git_index *", + "comment": "Index to write" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "Repository where to write the tree" + } + ], + "argline": "git_oid *out, git_index *index, git_repository *repo", + "sig": "git_oid *::git_index *::git_repository *", + "return": { + "type": "int", + "comment": " 0 on success, GIT_EUNMERGED when the index is not clean\n or an error code" + }, + "description": "

Write the index as a tree to the given repository

\n", + "comments": "

This method will do the same as git_index_write_tree, but\n letting the user choose the repository where the tree will\n be written.

\n\n

The index must not contain any file in conflict.

\n", + "group": "index" + }, + "git_index_entrycount": { + "type": "function", + "file": "index.h", + "line": 354, + "lineto": 354, + "args": [ + { + "name": "index", + "type": "const git_index *", + "comment": "an existing index object" + } + ], + "argline": "const git_index *index", + "sig": "const git_index *", + "return": { + "type": "size_t", + "comment": " integer of count of current entries" + }, + "description": "

Get the count of entries currently in the index

\n", + "comments": "", + "group": "index", + "examples": { + "general.c": [ + "ex/v0.23.2/general.html#git_index_entrycount-30" + ] + } + }, + "git_index_clear": { + "type": "function", + "file": "index.h", + "line": 365, + "lineto": 365, + "args": [ + { + "name": "index", + "type": "git_index *", + "comment": "an existing index object" + } + ], + "argline": "git_index *index", + "sig": "git_index *", + "return": { + "type": "int", + "comment": " 0 on success, error code \n<\n 0 on failure" + }, + "description": "

Clear the contents (all the entries) of an index object.

\n", + "comments": "

This clears the index object in memory; changes must be explicitly\n written to disk for them to take effect persistently.

\n", + "group": "index" + }, + "git_index_get_byindex": { + "type": "function", + "file": "index.h", + "line": 378, + "lineto": 379, + "args": [ + { + "name": "index", + "type": "git_index *", + "comment": "an existing index object" + }, + { + "name": "n", + "type": "size_t", + "comment": "the position of the entry" + } + ], + "argline": "git_index *index, size_t n", + "sig": "git_index *::size_t", + "return": { + "type": "const git_index_entry *", + "comment": " a pointer to the entry; NULL if out of bounds" + }, + "description": "

Get a pointer to one of the entries in the index

\n", + "comments": "

The entry is not modifiable and should not be freed. Because the\n git_index_entry struct is a publicly defined struct, you should\n be able to make your own permanent copy of the data if necessary.

\n", + "group": "index", + "examples": { + "general.c": [ + "ex/v0.23.2/general.html#git_index_get_byindex-31" + ] + } + }, + "git_index_get_bypath": { + "type": "function", + "file": "index.h", + "line": 393, + "lineto": 394, + "args": [ + { + "name": "index", + "type": "git_index *", + "comment": "an existing index object" + }, + { + "name": "path", + "type": "const char *", + "comment": "path to search" + }, + { + "name": "stage", + "type": "int", + "comment": "stage to search" + } + ], + "argline": "git_index *index, const char *path, int stage", + "sig": "git_index *::const char *::int", + "return": { + "type": "const git_index_entry *", + "comment": " a pointer to the entry; NULL if it was not found" + }, + "description": "

Get a pointer to one of the entries in the index

\n", + "comments": "

The entry is not modifiable and should not be freed. Because the\n git_index_entry struct is a publicly defined struct, you should\n be able to make your own permanent copy of the data if necessary.

\n", + "group": "index" + }, + "git_index_remove": { + "type": "function", + "file": "index.h", + "line": 404, + "lineto": 404, + "args": [ + { + "name": "index", + "type": "git_index *", + "comment": "an existing index object" + }, + { + "name": "path", + "type": "const char *", + "comment": "path to search" + }, + { + "name": "stage", + "type": "int", + "comment": "stage to search" + } + ], + "argline": "git_index *index, const char *path, int stage", + "sig": "git_index *::const char *::int", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Remove an entry from the index

\n", + "comments": "", + "group": "index" + }, + "git_index_remove_directory": { + "type": "function", + "file": "index.h", + "line": 414, + "lineto": 415, + "args": [ + { + "name": "index", + "type": "git_index *", + "comment": "an existing index object" + }, + { + "name": "dir", + "type": "const char *", + "comment": "container directory path" + }, + { + "name": "stage", + "type": "int", + "comment": "stage to search" + } + ], + "argline": "git_index *index, const char *dir, int stage", + "sig": "git_index *::const char *::int", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Remove all entries from the index under a given directory

\n", + "comments": "", + "group": "index" + }, + "git_index_add": { + "type": "function", + "file": "index.h", + "line": 431, + "lineto": 431, + "args": [ + { + "name": "index", + "type": "git_index *", + "comment": "an existing index object" + }, + { + "name": "source_entry", + "type": "const git_index_entry *", + "comment": "new entry object" + } + ], + "argline": "git_index *index, const git_index_entry *source_entry", + "sig": "git_index *::const git_index_entry *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Add or update an index entry from an in-memory struct

\n", + "comments": "

If a previous index entry exists that has the same path and stage\n as the given 'source_entry', it will be replaced. Otherwise, the\n 'source_entry' will be added.

\n\n

A full copy (including the 'path' string) of the given\n 'source_entry' will be inserted on the index.

\n", + "group": "index" + }, + "git_index_entry_stage": { + "type": "function", + "file": "index.h", + "line": 443, + "lineto": 443, + "args": [ + { + "name": "entry", + "type": "const git_index_entry *", + "comment": "The entry" + } + ], + "argline": "const git_index_entry *entry", + "sig": "const git_index_entry *", + "return": { + "type": "int", + "comment": " the stage number" + }, + "description": "

Return the stage number from a git index entry

\n", + "comments": "

This entry is calculated from the entry's flag attribute like this:

\n\n
(entry->flags \n
\n\n

&\n GIT_IDXENTRY_STAGEMASK) >> GIT_IDXENTRY_STAGESHIFT

\n", + "group": "index" + }, + "git_index_entry_is_conflict": { + "type": "function", + "file": "index.h", + "line": 452, + "lineto": 452, + "args": [ + { + "name": "entry", + "type": "const git_index_entry *", + "comment": "The entry" + } + ], + "argline": "const git_index_entry *entry", + "sig": "const git_index_entry *", + "return": { + "type": "int", + "comment": " 1 if the entry is a conflict entry, 0 otherwise" + }, + "description": "

Return whether the given index entry is a conflict (has a high stage\n entry). This is simply shorthand for git_index_entry_stage > 0.

\n", + "comments": "", + "group": "index" + }, + "git_index_add_bypath": { + "type": "function", + "file": "index.h", + "line": 483, + "lineto": 483, + "args": [ + { + "name": "index", + "type": "git_index *", + "comment": "an existing index object" + }, + { + "name": "path", + "type": "const char *", + "comment": "filename to add" + } + ], + "argline": "git_index *index, const char *path", + "sig": "git_index *::const char *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Add or update an index entry from a file on disk

\n", + "comments": "

The file path must be relative to the repository's\n working folder and must be readable.

\n\n

This method will fail in bare index instances.

\n\n

This forces the file to be added to the index, not looking\n at gitignore rules. Those rules can be evaluated through\n the git_status APIs (in status.h) before calling this.

\n\n

If this file currently is the result of a merge conflict, this\n file will no longer be marked as conflicting. The data about\n the conflict will be moved to the "resolve undo" (REUC) section.

\n", + "group": "index" + }, + "git_index_add_frombuffer": { + "type": "function", + "file": "index.h", + "line": 512, + "lineto": 515, + "args": [ + { + "name": "index", + "type": "git_index *", + "comment": "an existing index object" + }, + { + "name": "entry", + "type": "const git_index_entry *", + "comment": "filename to add" + }, + { + "name": "buffer", + "type": "const void *", + "comment": "data to be written into the blob" + }, + { + "name": "len", + "type": "size_t", + "comment": "length of the data" + } + ], + "argline": "git_index *index, const git_index_entry *entry, const void *buffer, size_t len", + "sig": "git_index *::const git_index_entry *::const void *::size_t", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Add or update an index entry from a buffer in memory

\n", + "comments": "

This method will create a blob in the repository that owns the\n index and then add the index entry to the index. The path of the\n entry represents the position of the blob relative to the\n repository's root folder.

\n\n

If a previous index entry exists that has the same path as the\n given 'entry', it will be replaced. Otherwise, the 'entry' will be\n added. The id and the file_size of the 'entry' are updated with the\n real value of the blob.

\n\n

This forces the file to be added to the index, not looking\n at gitignore rules. Those rules can be evaluated through\n the git_status APIs (in status.h) before calling this.

\n\n

If this file currently is the result of a merge conflict, this\n file will no longer be marked as conflicting. The data about\n the conflict will be moved to the "resolve undo" (REUC) section.

\n", + "group": "index" + }, + "git_index_remove_bypath": { + "type": "function", + "file": "index.h", + "line": 531, + "lineto": 531, + "args": [ + { + "name": "index", + "type": "git_index *", + "comment": "an existing index object" + }, + { + "name": "path", + "type": "const char *", + "comment": "filename to remove" + } + ], + "argline": "git_index *index, const char *path", + "sig": "git_index *::const char *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Remove an index entry corresponding to a file on disk

\n", + "comments": "

The file path must be relative to the repository's\n working folder. It may exist.

\n\n

If this file currently is the result of a merge conflict, this\n file will no longer be marked as conflicting. The data about\n the conflict will be moved to the "resolve undo" (REUC) section.

\n", + "group": "index" + }, + "git_index_add_all": { + "type": "function", + "file": "index.h", + "line": 578, + "lineto": 583, + "args": [ + { + "name": "index", + "type": "git_index *", + "comment": "an existing index object" + }, + { + "name": "pathspec", + "type": "const git_strarray *", + "comment": "array of path patterns" + }, + { + "name": "flags", + "type": "unsigned int", + "comment": "combination of git_index_add_option_t flags" + }, + { + "name": "callback", + "type": "git_index_matched_path_cb", + "comment": "notification callback for each added/updated path (also\n gets index of matching pathspec entry); can be NULL;\n return 0 to add, >0 to skip, \n<\n0 to abort scan." + }, + { + "name": "payload", + "type": "void *", + "comment": "payload passed through to callback function" + } + ], + "argline": "git_index *index, const git_strarray *pathspec, unsigned int flags, git_index_matched_path_cb callback, void *payload", + "sig": "git_index *::const git_strarray *::unsigned int::git_index_matched_path_cb::void *", + "return": { + "type": "int", + "comment": " 0 on success, negative callback return value, or error code" + }, + "description": "

Add or update index entries matching files in the working directory.

\n", + "comments": "

This method will fail in bare index instances.

\n\n

The pathspec is a list of file names or shell glob patterns that will\n matched against files in the repository's working directory. Each file\n that matches will be added to the index (either updating an existing\n entry or adding a new entry). You can disable glob expansion and force\n exact matching with the GIT_INDEX_ADD_DISABLE_PATHSPEC_MATCH flag.

\n\n

Files that are ignored will be skipped (unlike git_index_add_bypath).\n If a file is already tracked in the index, then it will be updated\n even if it is ignored. Pass the GIT_INDEX_ADD_FORCE flag to\n skip the checking of ignore rules.

\n\n

To emulate git add -A and generate an error if the pathspec contains\n the exact path of an ignored file (when not using FORCE), add the\n GIT_INDEX_ADD_CHECK_PATHSPEC flag. This checks that each entry\n in the pathspec that is an exact match to a filename on disk is\n either not ignored or already in the index. If this check fails, the\n function will return GIT_EINVALIDSPEC.

\n\n

To emulate git add -A with the "dry-run" option, just use a callback\n function that always returns a positive value. See below for details.

\n\n

If any files are currently the result of a merge conflict, those files\n will no longer be marked as conflicting. The data about the conflicts\n will be moved to the "resolve undo" (REUC) section.

\n\n

If you provide a callback function, it will be invoked on each matching\n item in the working directory immediately before it is added to /\n updated in the index. Returning zero will add the item to the index,\n greater than zero will skip the item, and less than zero will abort the\n scan and return that value to the caller.

\n", + "group": "index" + }, + "git_index_remove_all": { + "type": "function", + "file": "index.h", + "line": 600, + "lineto": 604, + "args": [ + { + "name": "index", + "type": "git_index *", + "comment": "An existing index object" + }, + { + "name": "pathspec", + "type": "const git_strarray *", + "comment": "array of path patterns" + }, + { + "name": "callback", + "type": "git_index_matched_path_cb", + "comment": "notification callback for each removed path (also\n gets index of matching pathspec entry); can be NULL;\n return 0 to add, >0 to skip, \n<\n0 to abort scan." + }, + { + "name": "payload", + "type": "void *", + "comment": "payload passed through to callback function" + } + ], + "argline": "git_index *index, const git_strarray *pathspec, git_index_matched_path_cb callback, void *payload", + "sig": "git_index *::const git_strarray *::git_index_matched_path_cb::void *", + "return": { + "type": "int", + "comment": " 0 on success, negative callback return value, or error code" + }, + "description": "

Remove all matching index entries.

\n", + "comments": "

If you provide a callback function, it will be invoked on each matching\n item in the index immediately before it is removed. Return 0 to\n remove the item, > 0 to skip the item, and \n<\n 0 to abort the scan.

\n", + "group": "index" + }, + "git_index_update_all": { + "type": "function", + "file": "index.h", + "line": 629, + "lineto": 633, + "args": [ + { + "name": "index", + "type": "git_index *", + "comment": "An existing index object" + }, + { + "name": "pathspec", + "type": "const git_strarray *", + "comment": "array of path patterns" + }, + { + "name": "callback", + "type": "git_index_matched_path_cb", + "comment": "notification callback for each updated path (also\n gets index of matching pathspec entry); can be NULL;\n return 0 to add, >0 to skip, \n<\n0 to abort scan." + }, + { + "name": "payload", + "type": "void *", + "comment": "payload passed through to callback function" + } + ], + "argline": "git_index *index, const git_strarray *pathspec, git_index_matched_path_cb callback, void *payload", + "sig": "git_index *::const git_strarray *::git_index_matched_path_cb::void *", + "return": { + "type": "int", + "comment": " 0 on success, negative callback return value, or error code" + }, + "description": "

Update all index entries to match the working directory

\n", + "comments": "

This method will fail in bare index instances.

\n\n

This scans the existing index entries and synchronizes them with the\n working directory, deleting them if the corresponding working directory\n file no longer exists otherwise updating the information (including\n adding the latest version of file to the ODB if needed).

\n\n

If you provide a callback function, it will be invoked on each matching\n item in the index immediately before it is updated (either refreshed\n or removed depending on working directory state). Return 0 to proceed\n with updating the item, > 0 to skip the item, and \n<\n 0 to abort the scan.

\n", + "group": "index" + }, + "git_index_find": { + "type": "function", + "file": "index.h", + "line": 644, + "lineto": 644, + "args": [ + { + "name": "at_pos", + "type": "size_t *", + "comment": "the address to which the position of the index entry is written (optional)" + }, + { + "name": "index", + "type": "git_index *", + "comment": "an existing index object" + }, + { + "name": "path", + "type": "const char *", + "comment": "path to search" + } + ], + "argline": "size_t *at_pos, git_index *index, const char *path", + "sig": "size_t *::git_index *::const char *", + "return": { + "type": "int", + "comment": " a zero-based position in the index if found; GIT_ENOTFOUND otherwise" + }, + "description": "

Find the first position of any entries which point to given\n path in the Git index.

\n", + "comments": "", + "group": "index" + }, + "git_index_conflict_add": { + "type": "function", + "file": "index.h", + "line": 669, + "lineto": 673, + "args": [ + { + "name": "index", + "type": "git_index *", + "comment": "an existing index object" + }, + { + "name": "ancestor_entry", + "type": "const git_index_entry *", + "comment": "the entry data for the ancestor of the conflict" + }, + { + "name": "our_entry", + "type": "const git_index_entry *", + "comment": "the entry data for our side of the merge conflict" + }, + { + "name": "their_entry", + "type": "const git_index_entry *", + "comment": "the entry data for their side of the merge conflict" + } + ], + "argline": "git_index *index, const git_index_entry *ancestor_entry, const git_index_entry *our_entry, const git_index_entry *their_entry", + "sig": "git_index *::const git_index_entry *::const git_index_entry *::const git_index_entry *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Add or update index entries to represent a conflict. Any staged\n entries that exist at the given paths will be removed.

\n", + "comments": "

The entries are the entries from the tree included in the merge. Any\n entry may be null to indicate that that file was not present in the\n trees during the merge. For example, ancestor_entry may be NULL to\n indicate that a file was added in both branches and must be resolved.

\n", + "group": "index" + }, + "git_index_conflict_get": { + "type": "function", + "file": "index.h", + "line": 689, + "lineto": 694, + "args": [ + { + "name": "ancestor_out", + "type": "const git_index_entry **", + "comment": "Pointer to store the ancestor entry" + }, + { + "name": "our_out", + "type": "const git_index_entry **", + "comment": "Pointer to store the our entry" + }, + { + "name": "their_out", + "type": "const git_index_entry **", + "comment": "Pointer to store the their entry" + }, + { + "name": "index", + "type": "git_index *", + "comment": "an existing index object" + }, + { + "name": "path", + "type": "const char *", + "comment": "path to search" + } + ], + "argline": "const git_index_entry **ancestor_out, const git_index_entry **our_out, const git_index_entry **their_out, git_index *index, const char *path", + "sig": "const git_index_entry **::const git_index_entry **::const git_index_entry **::git_index *::const char *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Get the index entries that represent a conflict of a single file.

\n", + "comments": "

The entries are not modifiable and should not be freed. Because the\n git_index_entry struct is a publicly defined struct, you should\n be able to make your own permanent copy of the data if necessary.

\n", + "group": "index" + }, + "git_index_conflict_remove": { + "type": "function", + "file": "index.h", + "line": 703, + "lineto": 703, + "args": [ + { + "name": "index", + "type": "git_index *", + "comment": "an existing index object" + }, + { + "name": "path", + "type": "const char *", + "comment": "path to remove conflicts for" + } + ], + "argline": "git_index *index, const char *path", + "sig": "git_index *::const char *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Removes the index entries that represent a conflict of a single file.

\n", + "comments": "", + "group": "index" + }, + "git_index_conflict_cleanup": { + "type": "function", + "file": "index.h", + "line": 711, + "lineto": 711, + "args": [ + { + "name": "index", + "type": "git_index *", + "comment": "an existing index object" + } + ], + "argline": "git_index *index", + "sig": "git_index *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Remove all conflicts in the index (entries with a stage greater than 0).

\n", + "comments": "", + "group": "index" + }, + "git_index_has_conflicts": { + "type": "function", + "file": "index.h", + "line": 718, + "lineto": 718, + "args": [ + { + "name": "index", + "type": "const git_index *", + "comment": null + } + ], + "argline": "const git_index *index", + "sig": "const git_index *", + "return": { + "type": "int", + "comment": " 1 if at least one conflict is found, 0 otherwise." + }, + "description": "

Determine if the index contains entries representing file conflicts.

\n", + "comments": "", + "group": "index" + }, + "git_index_conflict_iterator_new": { + "type": "function", + "file": "index.h", + "line": 729, + "lineto": 731, + "args": [ + { + "name": "iterator_out", + "type": "git_index_conflict_iterator **", + "comment": "The newly created conflict iterator" + }, + { + "name": "index", + "type": "git_index *", + "comment": "The index to scan" + } + ], + "argline": "git_index_conflict_iterator **iterator_out, git_index *index", + "sig": "git_index_conflict_iterator **::git_index *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Create an iterator for the conflicts in the index.

\n", + "comments": "

The index must not be modified while iterating; the results are undefined.

\n", + "group": "index" + }, + "git_index_conflict_next": { + "type": "function", + "file": "index.h", + "line": 743, + "lineto": 747, + "args": [ + { + "name": "ancestor_out", + "type": "const git_index_entry **", + "comment": "Pointer to store the ancestor side of the conflict" + }, + { + "name": "our_out", + "type": "const git_index_entry **", + "comment": "Pointer to store our side of the conflict" + }, + { + "name": "their_out", + "type": "const git_index_entry **", + "comment": "Pointer to store their side of the conflict" + }, + { + "name": "iterator", + "type": "git_index_conflict_iterator *", + "comment": null + } + ], + "argline": "const git_index_entry **ancestor_out, const git_index_entry **our_out, const git_index_entry **their_out, git_index_conflict_iterator *iterator", + "sig": "const git_index_entry **::const git_index_entry **::const git_index_entry **::git_index_conflict_iterator *", + "return": { + "type": "int", + "comment": " 0 (no error), GIT_ITEROVER (iteration is done) or an error code\n (negative value)" + }, + "description": "

Returns the current conflict (ancestor, ours and theirs entry) and\n advance the iterator internally to the next value.

\n", + "comments": "", + "group": "index" + }, + "git_index_conflict_iterator_free": { + "type": "function", + "file": "index.h", + "line": 754, + "lineto": 755, + "args": [ + { + "name": "iterator", + "type": "git_index_conflict_iterator *", + "comment": "pointer to the iterator" + } + ], + "argline": "git_index_conflict_iterator *iterator", + "sig": "git_index_conflict_iterator *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Frees a git_index_conflict_iterator.

\n", + "comments": "", + "group": "index" + }, + "git_indexer_new": { + "type": "function", + "file": "indexer.h", + "line": 30, + "lineto": 36, + "args": [ + { + "name": "out", + "type": "git_indexer **", + "comment": "where to store the indexer instance" + }, + { + "name": "path", + "type": "const char *", + "comment": "to the directory where the packfile should be stored" + }, + { + "name": "mode", + "type": "unsigned int", + "comment": "permissions to use creating packfile or 0 for defaults" + }, + { + "name": "odb", + "type": "git_odb *", + "comment": "object database from which to read base objects when\n fixing thin packs. Pass NULL if no thin pack is expected (an error\n will be returned if there are bases missing)" + }, + { + "name": "progress_cb", + "type": "git_transfer_progress_cb", + "comment": "function to call with progress information" + }, + { + "name": "progress_cb_payload", + "type": "void *", + "comment": "payload for the progress callback" + } + ], + "argline": "git_indexer **out, const char *path, unsigned int mode, git_odb *odb, git_transfer_progress_cb progress_cb, void *progress_cb_payload", + "sig": "git_indexer **::const char *::unsigned int::git_odb *::git_transfer_progress_cb::void *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Create a new indexer instance

\n", + "comments": "", + "group": "indexer", + "examples": { + "network/index-pack.c": [ + "ex/v0.23.2/network/index-pack.html#git_indexer_new-1" + ] + } + }, + "git_indexer_append": { + "type": "function", + "file": "indexer.h", + "line": 46, + "lineto": 46, + "args": [ + { + "name": "idx", + "type": "git_indexer *", + "comment": "the indexer" + }, + { + "name": "data", + "type": "const void *", + "comment": "the data to add" + }, + { + "name": "size", + "type": "size_t", + "comment": "the size of the data in bytes" + }, + { + "name": "stats", + "type": "git_transfer_progress *", + "comment": "stat storage" + } + ], + "argline": "git_indexer *idx, const void *data, size_t size, git_transfer_progress *stats", + "sig": "git_indexer *::const void *::size_t::git_transfer_progress *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Add data to the indexer

\n", + "comments": "", + "group": "indexer", + "examples": { + "network/index-pack.c": [ + "ex/v0.23.2/network/index-pack.html#git_indexer_append-2" + ] + } + }, + "git_indexer_commit": { + "type": "function", + "file": "indexer.h", + "line": 55, + "lineto": 55, + "args": [ + { + "name": "idx", + "type": "git_indexer *", + "comment": "the indexer" + }, + { + "name": "stats", + "type": "git_transfer_progress *", + "comment": null + } + ], + "argline": "git_indexer *idx, git_transfer_progress *stats", + "sig": "git_indexer *::git_transfer_progress *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Finalize the pack and index

\n", + "comments": "

Resolve any pending deltas and write out the index file

\n", + "group": "indexer", + "examples": { + "network/index-pack.c": [ + "ex/v0.23.2/network/index-pack.html#git_indexer_commit-3" + ] + } + }, + "git_indexer_hash": { + "type": "function", + "file": "indexer.h", + "line": 65, + "lineto": 65, + "args": [ + { + "name": "idx", + "type": "const git_indexer *", + "comment": "the indexer instance" + } + ], + "argline": "const git_indexer *idx", + "sig": "const git_indexer *", + "return": { + "type": "const git_oid *", + "comment": null + }, + "description": "

Get the packfile's hash

\n", + "comments": "

A packfile's name is derived from the sorted hashing of all object\n names. This is only correct after the index has been finalized.

\n", + "group": "indexer", + "examples": { + "network/index-pack.c": [ + "ex/v0.23.2/network/index-pack.html#git_indexer_hash-4" + ] + } + }, + "git_indexer_free": { + "type": "function", + "file": "indexer.h", + "line": 72, + "lineto": 72, + "args": [ + { + "name": "idx", + "type": "git_indexer *", + "comment": "the indexer to free" + } + ], + "argline": "git_indexer *idx", + "sig": "git_indexer *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Free the indexer and its resources

\n", + "comments": "", + "group": "indexer", + "examples": { + "network/index-pack.c": [ + "ex/v0.23.2/network/index-pack.html#git_indexer_free-5" + ] + } + }, + "git_merge_file_init_input": { + "type": "function", + "file": "merge.h", + "line": 60, + "lineto": 62, + "args": [ + { + "name": "opts", + "type": "git_merge_file_input *", + "comment": "the `git_merge_file_input` instance to initialize." + }, + { + "name": "version", + "type": "unsigned int", + "comment": "the version of the struct; you should pass\n `GIT_MERGE_FILE_INPUT_VERSION` here." + } + ], + "argline": "git_merge_file_input *opts, unsigned int version", + "sig": "git_merge_file_input *::unsigned int", + "return": { + "type": "int", + "comment": " Zero on success; -1 on failure." + }, + "description": "

Initializes a git_merge_file_input with default values. Equivalent to\n creating an instance with GIT_MERGE_FILE_INPUT_INIT.

\n", + "comments": "", + "group": "merge" + }, + "git_merge_file_init_options": { + "type": "function", + "file": "merge.h", + "line": 188, + "lineto": 190, + "args": [ + { + "name": "opts", + "type": "git_merge_file_options *", + "comment": "the `git_merge_file_options` instance to initialize." + }, + { + "name": "version", + "type": "unsigned int", + "comment": "the version of the struct; you should pass\n `GIT_MERGE_FILE_OPTIONS_VERSION` here." + } + ], + "argline": "git_merge_file_options *opts, unsigned int version", + "sig": "git_merge_file_options *::unsigned int", + "return": { + "type": "int", + "comment": " Zero on success; -1 on failure." + }, + "description": "

Initializes a git_merge_file_options with default values. Equivalent to\n creating an instance with GIT_MERGE_FILE_OPTIONS_INIT.

\n", + "comments": "", + "group": "merge" + }, + "git_merge_init_options": { + "type": "function", + "file": "merge.h", + "line": 265, + "lineto": 267, + "args": [ + { + "name": "opts", + "type": "git_merge_options *", + "comment": "the `git_merge_options` instance to initialize." + }, + { + "name": "version", + "type": "unsigned int", + "comment": "the version of the struct; you should pass\n `GIT_MERGE_OPTIONS_VERSION` here." + } + ], + "argline": "git_merge_options *opts, unsigned int version", + "sig": "git_merge_options *::unsigned int", + "return": { + "type": "int", + "comment": " Zero on success; -1 on failure." + }, + "description": "

Initializes a git_merge_options with default values. Equivalent to\n creating an instance with GIT_MERGE_OPTIONS_INIT.

\n", + "comments": "", + "group": "merge" + }, + "git_merge_analysis": { + "type": "function", + "file": "merge.h", + "line": 336, + "lineto": 341, + "args": [ + { + "name": "analysis_out", + "type": "git_merge_analysis_t *", + "comment": "analysis enumeration that the result is written into" + }, + { + "name": "preference_out", + "type": "git_merge_preference_t *", + "comment": null + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "the repository to merge" + }, + { + "name": "their_heads", + "type": "const git_annotated_commit **", + "comment": "the heads to merge into" + }, + { + "name": "their_heads_len", + "type": "size_t", + "comment": "the number of heads to merge" + } + ], + "argline": "git_merge_analysis_t *analysis_out, git_merge_preference_t *preference_out, git_repository *repo, const git_annotated_commit **their_heads, size_t their_heads_len", + "sig": "git_merge_analysis_t *::git_merge_preference_t *::git_repository *::const git_annotated_commit **::size_t", + "return": { + "type": "int", + "comment": " 0 on success or error code" + }, + "description": "

Analyzes the given branch(es) and determines the opportunities for\n merging them into the HEAD of the repository.

\n", + "comments": "", + "group": "merge" + }, + "git_merge_base": { + "type": "function", + "file": "merge.h", + "line": 352, + "lineto": 356, + "args": [ + { + "name": "out", + "type": "git_oid *", + "comment": "the OID of a merge base between 'one' and 'two'" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "the repository where the commits exist" + }, + { + "name": "one", + "type": "const git_oid *", + "comment": "one of the commits" + }, + { + "name": "two", + "type": "const git_oid *", + "comment": "the other commit" + } + ], + "argline": "git_oid *out, git_repository *repo, const git_oid *one, const git_oid *two", + "sig": "git_oid *::git_repository *::const git_oid *::const git_oid *", + "return": { + "type": "int", + "comment": " 0 on success, GIT_ENOTFOUND if not found or error code" + }, + "description": "

Find a merge base between two commits

\n", + "comments": "", + "group": "merge", + "examples": { + "log.c": [ + "ex/v0.23.2/log.html#git_merge_base-32" + ], + "rev-parse.c": [ + "ex/v0.23.2/rev-parse.html#git_merge_base-3" + ] + } + }, + "git_merge_bases": { + "type": "function", + "file": "merge.h", + "line": 367, + "lineto": 371, + "args": [ + { + "name": "out", + "type": "git_oidarray *", + "comment": "array in which to store the resulting ids" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "the repository where the commits exist" + }, + { + "name": "one", + "type": "const git_oid *", + "comment": "one of the commits" + }, + { + "name": "two", + "type": "const git_oid *", + "comment": "the other commit" + } + ], + "argline": "git_oidarray *out, git_repository *repo, const git_oid *one, const git_oid *two", + "sig": "git_oidarray *::git_repository *::const git_oid *::const git_oid *", + "return": { + "type": "int", + "comment": " 0 on success, GIT_ENOTFOUND if not found or error code" + }, + "description": "

Find merge bases between two commits

\n", + "comments": "", + "group": "merge" + }, + "git_merge_base_many": { + "type": "function", + "file": "merge.h", + "line": 382, + "lineto": 386, + "args": [ + { + "name": "out", + "type": "git_oid *", + "comment": "the OID of a merge base considering all the commits" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "the repository where the commits exist" + }, + { + "name": "length", + "type": "size_t", + "comment": "The number of commits in the provided `input_array`" + }, + { + "name": "input_array", + "type": "const git_oid []", + "comment": "oids of the commits" + } + ], + "argline": "git_oid *out, git_repository *repo, size_t length, const git_oid [] input_array", + "sig": "git_oid *::git_repository *::size_t::const git_oid []", + "return": { + "type": "int", + "comment": " Zero on success; GIT_ENOTFOUND or -1 on failure." + }, + "description": "

Find a merge base given a list of commits

\n", + "comments": "", + "group": "merge" + }, + "git_merge_bases_many": { + "type": "function", + "file": "merge.h", + "line": 397, + "lineto": 401, + "args": [ + { + "name": "out", + "type": "git_oidarray *", + "comment": "array in which to store the resulting ids" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "the repository where the commits exist" + }, + { + "name": "length", + "type": "size_t", + "comment": "The number of commits in the provided `input_array`" + }, + { + "name": "input_array", + "type": "const git_oid []", + "comment": "oids of the commits" + } + ], + "argline": "git_oidarray *out, git_repository *repo, size_t length, const git_oid [] input_array", + "sig": "git_oidarray *::git_repository *::size_t::const git_oid []", + "return": { + "type": "int", + "comment": " Zero on success; GIT_ENOTFOUND or -1 on failure." + }, + "description": "

Find all merge bases given a list of commits

\n", + "comments": "", + "group": "merge" + }, + "git_merge_base_octopus": { + "type": "function", + "file": "merge.h", + "line": 412, + "lineto": 416, + "args": [ + { + "name": "out", + "type": "git_oid *", + "comment": "the OID of a merge base considering all the commits" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "the repository where the commits exist" + }, + { + "name": "length", + "type": "size_t", + "comment": "The number of commits in the provided `input_array`" + }, + { + "name": "input_array", + "type": "const git_oid []", + "comment": "oids of the commits" + } + ], + "argline": "git_oid *out, git_repository *repo, size_t length, const git_oid [] input_array", + "sig": "git_oid *::git_repository *::size_t::const git_oid []", + "return": { + "type": "int", + "comment": " Zero on success; GIT_ENOTFOUND or -1 on failure." + }, + "description": "

Find a merge base in preparation for an octopus merge

\n", + "comments": "", + "group": "merge" + }, + "git_merge_file": { + "type": "function", + "file": "merge.h", + "line": 434, + "lineto": 439, + "args": [ + { + "name": "out", + "type": "git_merge_file_result *", + "comment": "The git_merge_file_result to be filled in" + }, + { + "name": "ancestor", + "type": "const git_merge_file_input *", + "comment": "The contents of the ancestor file" + }, + { + "name": "ours", + "type": "const git_merge_file_input *", + "comment": "The contents of the file in \"our\" side" + }, + { + "name": "theirs", + "type": "const git_merge_file_input *", + "comment": "The contents of the file in \"their\" side" + }, + { + "name": "opts", + "type": "const git_merge_file_options *", + "comment": "The merge file options or `NULL` for defaults" + } + ], + "argline": "git_merge_file_result *out, const git_merge_file_input *ancestor, const git_merge_file_input *ours, const git_merge_file_input *theirs, const git_merge_file_options *opts", + "sig": "git_merge_file_result *::const git_merge_file_input *::const git_merge_file_input *::const git_merge_file_input *::const git_merge_file_options *", + "return": { + "type": "int", + "comment": " 0 on success or error code" + }, + "description": "

Merge two files as they exist in the in-memory data structures, using\n the given common ancestor as the baseline, producing a\n git_merge_file_result that reflects the merge result. The\n git_merge_file_result must be freed with git_merge_file_result_free.

\n", + "comments": "

Note that this function does not reference a repository and any\n configuration must be passed as git_merge_file_options.

\n", + "group": "merge" + }, + "git_merge_file_from_index": { + "type": "function", + "file": "merge.h", + "line": 455, + "lineto": 461, + "args": [ + { + "name": "out", + "type": "git_merge_file_result *", + "comment": "The git_merge_file_result to be filled in" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "The repository" + }, + { + "name": "ancestor", + "type": "const git_index_entry *", + "comment": "The index entry for the ancestor file (stage level 1)" + }, + { + "name": "ours", + "type": "const git_index_entry *", + "comment": "The index entry for our file (stage level 2)" + }, + { + "name": "theirs", + "type": "const git_index_entry *", + "comment": "The index entry for their file (stage level 3)" + }, + { + "name": "opts", + "type": "const git_merge_file_options *", + "comment": "The merge file options or NULL" + } + ], + "argline": "git_merge_file_result *out, git_repository *repo, const git_index_entry *ancestor, const git_index_entry *ours, const git_index_entry *theirs, const git_merge_file_options *opts", + "sig": "git_merge_file_result *::git_repository *::const git_index_entry *::const git_index_entry *::const git_index_entry *::const git_merge_file_options *", + "return": { + "type": "int", + "comment": " 0 on success or error code" + }, + "description": "

Merge two files as they exist in the index, using the given common\n ancestor as the baseline, producing a git_merge_file_result that\n reflects the merge result. The git_merge_file_result must be freed with\n git_merge_file_result_free.

\n", + "comments": "", + "group": "merge" + }, + "git_merge_file_result_free": { + "type": "function", + "file": "merge.h", + "line": 468, + "lineto": 468, + "args": [ + { + "name": "result", + "type": "git_merge_file_result *", + "comment": "The result to free or `NULL`" + } + ], + "argline": "git_merge_file_result *result", + "sig": "git_merge_file_result *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Frees a git_merge_file_result.

\n", + "comments": "", + "group": "merge" + }, + "git_merge_trees": { + "type": "function", + "file": "merge.h", + "line": 486, + "lineto": 492, + "args": [ + { + "name": "out", + "type": "git_index **", + "comment": "pointer to store the index result in" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "repository that contains the given trees" + }, + { + "name": "ancestor_tree", + "type": "const git_tree *", + "comment": "the common ancestor between the trees (or null if none)" + }, + { + "name": "our_tree", + "type": "const git_tree *", + "comment": "the tree that reflects the destination tree" + }, + { + "name": "their_tree", + "type": "const git_tree *", + "comment": "the tree to merge in to `our_tree`" + }, + { + "name": "opts", + "type": "const git_merge_options *", + "comment": "the merge tree options (or null for defaults)" + } + ], + "argline": "git_index **out, git_repository *repo, const git_tree *ancestor_tree, const git_tree *our_tree, const git_tree *their_tree, const git_merge_options *opts", + "sig": "git_index **::git_repository *::const git_tree *::const git_tree *::const git_tree *::const git_merge_options *", + "return": { + "type": "int", + "comment": " 0 on success or error code" + }, + "description": "

Merge two trees, producing a git_index that reflects the result of\n the merge. The index may be written as-is to the working directory\n or checked out. If the index is to be converted to a tree, the caller\n should resolve any conflicts that arose as part of the merge.

\n", + "comments": "

The returned index must be freed explicitly with git_index_free.

\n", + "group": "merge" + }, + "git_merge_commits": { + "type": "function", + "file": "merge.h", + "line": 513, + "lineto": 518, + "args": [ + { + "name": "out", + "type": "git_index **", + "comment": "pointer to store the index result in" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "repository that contains the given trees" + }, + { + "name": "our_commit", + "type": "const git_commit *", + "comment": "the commit that reflects the destination tree" + }, + { + "name": "their_commit", + "type": "const git_commit *", + "comment": "the commit to merge in to `our_commit`" + }, + { + "name": "opts", + "type": "const git_merge_options *", + "comment": "the merge tree options (or null for defaults)" + } + ], + "argline": "git_index **out, git_repository *repo, const git_commit *our_commit, const git_commit *their_commit, const git_merge_options *opts", + "sig": "git_index **::git_repository *::const git_commit *::const git_commit *::const git_merge_options *", + "return": { + "type": "int", + "comment": " 0 on success or error code" + }, + "description": "

Merge two commits, producing a git_index that reflects the result of\n the merge. The index may be written as-is to the working directory\n or checked out. If the index is to be converted to a tree, the caller\n should resolve any conflicts that arose as part of the merge.

\n", + "comments": "

The merge performed uses the first common ancestor, unlike the\n git-merge-recursive strategy, which may produce an artificial common\n ancestor tree when there are multiple ancestors.

\n\n

The returned index must be freed explicitly with git_index_free.

\n", + "group": "merge" + }, + "git_merge": { + "type": "function", + "file": "merge.h", + "line": 542, + "lineto": 547, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "the repository to merge" + }, + { + "name": "their_heads", + "type": "const git_annotated_commit **", + "comment": "the heads to merge into" + }, + { + "name": "their_heads_len", + "type": "size_t", + "comment": "the number of heads to merge" + }, + { + "name": "merge_opts", + "type": "const git_merge_options *", + "comment": "merge options" + }, + { + "name": "checkout_opts", + "type": "const git_checkout_options *", + "comment": "checkout options" + } + ], + "argline": "git_repository *repo, const git_annotated_commit **their_heads, size_t their_heads_len, const git_merge_options *merge_opts, const git_checkout_options *checkout_opts", + "sig": "git_repository *::const git_annotated_commit **::size_t::const git_merge_options *::const git_checkout_options *", + "return": { + "type": "int", + "comment": " 0 on success or error code" + }, + "description": "

Merges the given commit(s) into HEAD, writing the results into the working\n directory. Any changes are staged for commit and any conflicts are written\n to the index. Callers should inspect the repository's index after this\n completes, resolve any conflicts and prepare a commit.

\n", + "comments": "

The merge performed uses the first common ancestor, unlike the\n git-merge-recursive strategy, which may produce an artificial common\n ancestor tree when there are multiple ancestors.

\n\n

For compatibility with git, the repository is put into a merging\n state. Once the commit is done (or if the uses wishes to abort),\n you should clear this state by calling\n git_repository_state_cleanup().

\n", + "group": "merge" + }, + "git_message_prettify": { + "type": "function", + "file": "message.h", + "line": 39, + "lineto": 39, + "args": [ + { + "name": "out", + "type": "git_buf *", + "comment": "The user-allocated git_buf which will be filled with the\n cleaned up message." + }, + { + "name": "message", + "type": "const char *", + "comment": "The message to be prettified." + }, + { + "name": "strip_comments", + "type": "int", + "comment": "Non-zero to remove comment lines, 0 to leave them in." + }, + { + "name": "comment_char", + "type": "char", + "comment": "Comment character. Lines starting with this character\n are considered to be comments and removed if `strip_comments` is non-zero." + } + ], + "argline": "git_buf *out, const char *message, int strip_comments, char comment_char", + "sig": "git_buf *::const char *::int::char", + "return": { + "type": "int", + "comment": " 0 or an error code." + }, + "description": "

Clean up message from excess whitespace and make sure that the last line\n ends with a '

\n\n

'.

\n", + "comments": "

Optionally, can remove lines starting with a "#".

\n", + "group": "message" + }, + "git_note_iterator_new": { + "type": "function", + "file": "notes.h", + "line": 49, + "lineto": 52, + "args": [ + { + "name": "out", + "type": "git_note_iterator **", + "comment": "pointer to the iterator" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "repository where to look up the note" + }, + { + "name": "notes_ref", + "type": "const char *", + "comment": "canonical name of the reference to use (optional); defaults to\n \"refs/notes/commits\"" + } + ], + "argline": "git_note_iterator **out, git_repository *repo, const char *notes_ref", + "sig": "git_note_iterator **::git_repository *::const char *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Creates a new iterator for notes

\n", + "comments": "

The iterator must be freed manually by the user.

\n", + "group": "note" + }, + "git_note_iterator_free": { + "type": "function", + "file": "notes.h", + "line": 59, + "lineto": 59, + "args": [ + { + "name": "it", + "type": "git_note_iterator *", + "comment": "pointer to the iterator" + } + ], + "argline": "git_note_iterator *it", + "sig": "git_note_iterator *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Frees an git_note_iterator

\n", + "comments": "", + "group": "note" + }, + "git_note_next": { + "type": "function", + "file": "notes.h", + "line": 72, + "lineto": 75, + "args": [ + { + "name": "note_id", + "type": "git_oid *", + "comment": "id of blob containing the message" + }, + { + "name": "annotated_id", + "type": "git_oid *", + "comment": "id of the git object being annotated" + }, + { + "name": "it", + "type": "git_note_iterator *", + "comment": "pointer to the iterator" + } + ], + "argline": "git_oid *note_id, git_oid *annotated_id, git_note_iterator *it", + "sig": "git_oid *::git_oid *::git_note_iterator *", + "return": { + "type": "int", + "comment": " 0 (no error), GIT_ITEROVER (iteration is done) or an error code\n (negative value)" + }, + "description": "

Return the current item (note_id and annotated_id) and advance the iterator\n internally to the next value

\n", + "comments": "", + "group": "note" + }, + "git_note_read": { + "type": "function", + "file": "notes.h", + "line": 91, + "lineto": 95, + "args": [ + { + "name": "out", + "type": "git_note **", + "comment": "pointer to the read note; NULL in case of error" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "repository where to look up the note" + }, + { + "name": "notes_ref", + "type": "const char *", + "comment": "canonical name of the reference to use (optional); defaults to\n \"refs/notes/commits\"" + }, + { + "name": "oid", + "type": "const git_oid *", + "comment": "OID of the git object to read the note from" + } + ], + "argline": "git_note **out, git_repository *repo, const char *notes_ref, const git_oid *oid", + "sig": "git_note **::git_repository *::const char *::const git_oid *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Read the note for an object

\n", + "comments": "

The note must be freed manually by the user.

\n", + "group": "note" + }, + "git_note_author": { + "type": "function", + "file": "notes.h", + "line": 103, + "lineto": 103, + "args": [ + { + "name": "note", + "type": "const git_note *", + "comment": "the note" + } + ], + "argline": "const git_note *note", + "sig": "const git_note *", + "return": { + "type": "const git_signature *", + "comment": " the author" + }, + "description": "

Get the note author

\n", + "comments": "", + "group": "note" + }, + "git_note_committer": { + "type": "function", + "file": "notes.h", + "line": 111, + "lineto": 111, + "args": [ + { + "name": "note", + "type": "const git_note *", + "comment": "the note" + } + ], + "argline": "const git_note *note", + "sig": "const git_note *", + "return": { + "type": "const git_signature *", + "comment": " the committer" + }, + "description": "

Get the note committer

\n", + "comments": "", + "group": "note" + }, + "git_note_message": { + "type": "function", + "file": "notes.h", + "line": 120, + "lineto": 120, + "args": [ + { + "name": "note", + "type": "const git_note *", + "comment": "the note" + } + ], + "argline": "const git_note *note", + "sig": "const git_note *", + "return": { + "type": "const char *", + "comment": " the note message" + }, + "description": "

Get the note message

\n", + "comments": "", + "group": "note" + }, + "git_note_id": { + "type": "function", + "file": "notes.h", + "line": 129, + "lineto": 129, + "args": [ + { + "name": "note", + "type": "const git_note *", + "comment": "the note" + } + ], + "argline": "const git_note *note", + "sig": "const git_note *", + "return": { + "type": "const git_oid *", + "comment": " the note object's id" + }, + "description": "

Get the note object's id

\n", + "comments": "", + "group": "note" + }, + "git_note_create": { + "type": "function", + "file": "notes.h", + "line": 146, + "lineto": 154, + "args": [ + { + "name": "out", + "type": "git_oid *", + "comment": "pointer to store the OID (optional); NULL in case of error" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "repository where to store the note" + }, + { + "name": "notes_ref", + "type": "const char *", + "comment": "canonical name of the reference to use (optional);\n\t\t\t\t\tdefaults to \"refs/notes/commits\"" + }, + { + "name": "author", + "type": "const git_signature *", + "comment": "signature of the notes commit author" + }, + { + "name": "committer", + "type": "const git_signature *", + "comment": "signature of the notes commit committer" + }, + { + "name": "oid", + "type": "const git_oid *", + "comment": "OID of the git object to decorate" + }, + { + "name": "note", + "type": "const char *", + "comment": "Content of the note to add for object oid" + }, + { + "name": "force", + "type": "int", + "comment": "Overwrite existing note" + } + ], + "argline": "git_oid *out, git_repository *repo, const char *notes_ref, const git_signature *author, const git_signature *committer, const git_oid *oid, const char *note, int force", + "sig": "git_oid *::git_repository *::const char *::const git_signature *::const git_signature *::const git_oid *::const char *::int", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Add a note for an object

\n", + "comments": "", + "group": "note" + }, + "git_note_remove": { + "type": "function", + "file": "notes.h", + "line": 169, + "lineto": 174, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "repository where the note lives" + }, + { + "name": "notes_ref", + "type": "const char *", + "comment": "canonical name of the reference to use (optional);\n\t\t\t\t\tdefaults to \"refs/notes/commits\"" + }, + { + "name": "author", + "type": "const git_signature *", + "comment": "signature of the notes commit author" + }, + { + "name": "committer", + "type": "const git_signature *", + "comment": "signature of the notes commit committer" + }, + { + "name": "oid", + "type": "const git_oid *", + "comment": "OID of the git object to remove the note from" + } + ], + "argline": "git_repository *repo, const char *notes_ref, const git_signature *author, const git_signature *committer, const git_oid *oid", + "sig": "git_repository *::const char *::const git_signature *::const git_signature *::const git_oid *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Remove the note for an object

\n", + "comments": "", + "group": "note" + }, + "git_note_free": { + "type": "function", + "file": "notes.h", + "line": 181, + "lineto": 181, + "args": [ + { + "name": "note", + "type": "git_note *", + "comment": "git_note object" + } + ], + "argline": "git_note *note", + "sig": "git_note *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Free a git_note object

\n", + "comments": "", + "group": "note" + }, + "git_note_foreach": { + "type": "function", + "file": "notes.h", + "line": 209, + "lineto": 213, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "Repository where to find the notes." + }, + { + "name": "notes_ref", + "type": "const char *", + "comment": "Reference to read from (optional); defaults to\n \"refs/notes/commits\"." + }, + { + "name": "note_cb", + "type": "git_note_foreach_cb", + "comment": "Callback to invoke per found annotation. Return non-zero\n to stop looping." + }, + { + "name": "payload", + "type": "void *", + "comment": "Extra parameter to callback function." + } + ], + "argline": "git_repository *repo, const char *notes_ref, git_note_foreach_cb note_cb, void *payload", + "sig": "git_repository *::const char *::git_note_foreach_cb::void *", + "return": { + "type": "int", + "comment": " 0 on success, non-zero callback return value, or error code" + }, + "description": "

Loop over all the notes within a specified namespace\n and issue a callback for each one.

\n", + "comments": "", + "group": "note" + }, + "git_object_lookup": { + "type": "function", + "file": "object.h", + "line": 42, + "lineto": 46, + "args": [ + { + "name": "object", + "type": "git_object **", + "comment": "pointer to the looked-up object" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "the repository to look up the object" + }, + { + "name": "id", + "type": "const git_oid *", + "comment": "the unique identifier for the object" + }, + { + "name": "type", + "type": "git_otype", + "comment": "the type of the object" + } + ], + "argline": "git_object **object, git_repository *repo, const git_oid *id, git_otype type", + "sig": "git_object **::git_repository *::const git_oid *::git_otype", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Lookup a reference to one of the objects in a repository.

\n", + "comments": "

The generated reference is owned by the repository and\n should be closed with the git_object_free method\n instead of free'd manually.

\n\n

The 'type' parameter must match the type of the object\n in the odb; the method will fail otherwise.\n The special value 'GIT_OBJ_ANY' may be passed to let\n the method guess the object's type.

\n", + "group": "object", + "examples": { + "log.c": [ + "ex/v0.23.2/log.html#git_object_lookup-33" + ] + } + }, + "git_object_lookup_prefix": { + "type": "function", + "file": "object.h", + "line": 75, + "lineto": 80, + "args": [ + { + "name": "object_out", + "type": "git_object **", + "comment": "pointer where to store the looked-up object" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "the repository to look up the object" + }, + { + "name": "id", + "type": "const git_oid *", + "comment": "a short identifier for the object" + }, + { + "name": "len", + "type": "size_t", + "comment": "the length of the short identifier" + }, + { + "name": "type", + "type": "git_otype", + "comment": "the type of the object" + } + ], + "argline": "git_object **object_out, git_repository *repo, const git_oid *id, size_t len, git_otype type", + "sig": "git_object **::git_repository *::const git_oid *::size_t::git_otype", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Lookup a reference to one of the objects in a repository,\n given a prefix of its identifier (short id).

\n", + "comments": "

The object obtained will be so that its identifier\n matches the first 'len' hexadecimal characters\n (packets of 4 bits) of the given 'id'.\n 'len' must be at least GIT_OID_MINPREFIXLEN, and\n long enough to identify a unique object matching\n the prefix; otherwise the method will fail.

\n\n

The generated reference is owned by the repository and\n should be closed with the git_object_free method\n instead of free'd manually.

\n\n

The 'type' parameter must match the type of the object\n in the odb; the method will fail otherwise.\n The special value 'GIT_OBJ_ANY' may be passed to let\n the method guess the object's type.

\n", + "group": "object" + }, + "git_object_lookup_bypath": { + "type": "function", + "file": "object.h", + "line": 93, + "lineto": 97, + "args": [ + { + "name": "out", + "type": "git_object **", + "comment": "buffer that receives a pointer to the object (which must be freed\n by the caller)" + }, + { + "name": "treeish", + "type": "const git_object *", + "comment": "root object that can be peeled to a tree" + }, + { + "name": "path", + "type": "const char *", + "comment": "relative path from the root object to the desired object" + }, + { + "name": "type", + "type": "git_otype", + "comment": "type of object desired" + } + ], + "argline": "git_object **out, const git_object *treeish, const char *path, git_otype type", + "sig": "git_object **::const git_object *::const char *::git_otype", + "return": { + "type": "int", + "comment": " 0 on success, or an error code" + }, + "description": "

Lookup an object that represents a tree entry.

\n", + "comments": "", + "group": "object" + }, + "git_object_id": { + "type": "function", + "file": "object.h", + "line": 105, + "lineto": 105, + "args": [ + { + "name": "obj", + "type": "const git_object *", + "comment": "the repository object" + } + ], + "argline": "const git_object *obj", + "sig": "const git_object *", + "return": { + "type": "const git_oid *", + "comment": " the SHA1 id" + }, + "description": "

Get the id (SHA1) of a repository object

\n", + "comments": "", + "group": "object", + "examples": { + "blame.c": [ + "ex/v0.23.2/blame.html#git_object_id-10", + "ex/v0.23.2/blame.html#git_object_id-11", + "ex/v0.23.2/blame.html#git_object_id-12", + "ex/v0.23.2/blame.html#git_object_id-13" + ], + "cat-file.c": [ + "ex/v0.23.2/cat-file.html#git_object_id-12", + "ex/v0.23.2/cat-file.html#git_object_id-13" + ], + "log.c": [ + "ex/v0.23.2/log.html#git_object_id-34", + "ex/v0.23.2/log.html#git_object_id-35", + "ex/v0.23.2/log.html#git_object_id-36", + "ex/v0.23.2/log.html#git_object_id-37" + ], + "rev-parse.c": [ + "ex/v0.23.2/rev-parse.html#git_object_id-4", + "ex/v0.23.2/rev-parse.html#git_object_id-5", + "ex/v0.23.2/rev-parse.html#git_object_id-6", + "ex/v0.23.2/rev-parse.html#git_object_id-7", + "ex/v0.23.2/rev-parse.html#git_object_id-8" + ] + } + }, + "git_object_short_id": { + "type": "function", + "file": "object.h", + "line": 119, + "lineto": 119, + "args": [ + { + "name": "out", + "type": "git_buf *", + "comment": "Buffer to write string into" + }, + { + "name": "obj", + "type": "const git_object *", + "comment": "The object to get an ID for" + } + ], + "argline": "git_buf *out, const git_object *obj", + "sig": "git_buf *::const git_object *", + "return": { + "type": "int", + "comment": " 0 on success, \n<\n0 for error" + }, + "description": "

Get a short abbreviated OID string for the object

\n", + "comments": "

This starts at the "core.abbrev" length (default 7 characters) and\n iteratively extends to a longer string if that length is ambiguous.\n The result will be unambiguous (at least until new objects are added to\n the repository).

\n", + "group": "object", + "examples": { + "tag.c": [ + "ex/v0.23.2/tag.html#git_object_short_id-5" + ] + } + }, + "git_object_type": { + "type": "function", + "file": "object.h", + "line": 127, + "lineto": 127, + "args": [ + { + "name": "obj", + "type": "const git_object *", + "comment": "the repository object" + } + ], + "argline": "const git_object *obj", + "sig": "const git_object *", + "return": { + "type": "git_otype", + "comment": " the object's type" + }, + "description": "

Get the object type of an object

\n", + "comments": "", + "group": "object", + "examples": { + "cat-file.c": [ + "ex/v0.23.2/cat-file.html#git_object_type-14", + "ex/v0.23.2/cat-file.html#git_object_type-15", + "ex/v0.23.2/cat-file.html#git_object_type-16" + ], + "tag.c": [ + "ex/v0.23.2/tag.html#git_object_type-6" + ] + } + }, + "git_object_owner": { + "type": "function", + "file": "object.h", + "line": 141, + "lineto": 141, + "args": [ + { + "name": "obj", + "type": "const git_object *", + "comment": "the object" + } + ], + "argline": "const git_object *obj", + "sig": "const git_object *", + "return": { + "type": "git_repository *", + "comment": " the repository who owns this object" + }, + "description": "

Get the repository that owns this object

\n", + "comments": "

Freeing or calling git_repository_close on the\n returned pointer will invalidate the actual object.

\n\n

Any other operation may be run on the repository without\n affecting the object.

\n", + "group": "object" + }, + "git_object_free": { + "type": "function", + "file": "object.h", + "line": 158, + "lineto": 158, + "args": [ + { + "name": "object", + "type": "git_object *", + "comment": "the object to close" + } + ], + "argline": "git_object *object", + "sig": "git_object *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Close an open object

\n", + "comments": "

This method instructs the library to close an existing\n object; note that git_objects are owned and cached by the repository\n so the object may or may not be freed after this library call,\n depending on how aggressive is the caching mechanism used\n by the repository.

\n\n

IMPORTANT:\n It is necessary to call this method when you stop using\n an object. Failure to do so will cause a memory leak.

\n", + "group": "object", + "examples": { + "blame.c": [ + "ex/v0.23.2/blame.html#git_object_free-14", + "ex/v0.23.2/blame.html#git_object_free-15", + "ex/v0.23.2/blame.html#git_object_free-16", + "ex/v0.23.2/blame.html#git_object_free-17" + ], + "cat-file.c": [ + "ex/v0.23.2/cat-file.html#git_object_free-17" + ], + "general.c": [ + "ex/v0.23.2/general.html#git_object_free-32" + ], + "log.c": [ + "ex/v0.23.2/log.html#git_object_free-38" + ], + "rev-parse.c": [ + "ex/v0.23.2/rev-parse.html#git_object_free-9", + "ex/v0.23.2/rev-parse.html#git_object_free-10", + "ex/v0.23.2/rev-parse.html#git_object_free-11" + ], + "tag.c": [ + "ex/v0.23.2/tag.html#git_object_free-7", + "ex/v0.23.2/tag.html#git_object_free-8", + "ex/v0.23.2/tag.html#git_object_free-9", + "ex/v0.23.2/tag.html#git_object_free-10" + ] + } + }, + "git_object_type2string": { + "type": "function", + "file": "object.h", + "line": 169, + "lineto": 169, + "args": [ + { + "name": "type", + "type": "git_otype", + "comment": "object type to convert." + } + ], + "argline": "git_otype type", + "sig": "git_otype", + "return": { + "type": "const char *", + "comment": " the corresponding string representation." + }, + "description": "

Convert an object type to its string representation.

\n", + "comments": "

The result is a pointer to a string in static memory and\n should not be free()'ed.

\n", + "group": "object", + "examples": { + "cat-file.c": [ + "ex/v0.23.2/cat-file.html#git_object_type2string-18", + "ex/v0.23.2/cat-file.html#git_object_type2string-19", + "ex/v0.23.2/cat-file.html#git_object_type2string-20", + "ex/v0.23.2/cat-file.html#git_object_type2string-21" + ], + "general.c": [ + "ex/v0.23.2/general.html#git_object_type2string-33" + ] + } + }, + "git_object_string2type": { + "type": "function", + "file": "object.h", + "line": 177, + "lineto": 177, + "args": [ + { + "name": "str", + "type": "const char *", + "comment": "the string to convert." + } + ], + "argline": "const char *str", + "sig": "const char *", + "return": { + "type": "git_otype", + "comment": " the corresponding git_otype." + }, + "description": "

Convert a string object type representation to it's git_otype.

\n", + "comments": "", + "group": "object" + }, + "git_object_typeisloose": { + "type": "function", + "file": "object.h", + "line": 186, + "lineto": 186, + "args": [ + { + "name": "type", + "type": "git_otype", + "comment": "object type to test." + } + ], + "argline": "git_otype type", + "sig": "git_otype", + "return": { + "type": "int", + "comment": " true if the type represents a valid loose object type,\n false otherwise." + }, + "description": "

Determine if the given git_otype is a valid loose object type.

\n", + "comments": "", + "group": "object" + }, + "git_object__size": { + "type": "function", + "file": "object.h", + "line": 200, + "lineto": 200, + "args": [ + { + "name": "type", + "type": "git_otype", + "comment": "object type to get its size" + } + ], + "argline": "git_otype type", + "sig": "git_otype", + "return": { + "type": "size_t", + "comment": " size in bytes of the object" + }, + "description": "

Get the size in bytes for the structure which\n acts as an in-memory representation of any given\n object type.

\n", + "comments": "

For all the core types, this would the equivalent\n of calling sizeof(git_commit) if the core types\n were not opaque on the external API.

\n", + "group": "object" + }, + "git_object_peel": { + "type": "function", + "file": "object.h", + "line": 225, + "lineto": 228, + "args": [ + { + "name": "peeled", + "type": "git_object **", + "comment": "Pointer to the peeled git_object" + }, + { + "name": "object", + "type": "const git_object *", + "comment": "The object to be processed" + }, + { + "name": "target_type", + "type": "git_otype", + "comment": "The type of the requested object (a GIT_OBJ_ value)" + } + ], + "argline": "git_object **peeled, const git_object *object, git_otype target_type", + "sig": "git_object **::const git_object *::git_otype", + "return": { + "type": "int", + "comment": " 0 on success, GIT_EINVALIDSPEC, GIT_EPEEL, or an error code" + }, + "description": "

Recursively peel an object until an object of the specified type is met.

\n", + "comments": "

If the query cannot be satisfied due to the object model,\n GIT_EINVALIDSPEC will be returned (e.g. trying to peel a blob to a\n tree).

\n\n

If you pass GIT_OBJ_ANY as the target type, then the object will\n be peeled until the type changes. A tag will be peeled until the\n referenced object is no longer a tag, and a commit will be peeled\n to a tree. Any other object type will return GIT_EINVALIDSPEC.

\n\n

If peeling a tag we discover an object which cannot be peeled to\n the target type due to the object model, GIT_EPEEL will be\n returned.

\n\n

You must free the returned object.

\n", + "group": "object" + }, + "git_object_dup": { + "type": "function", + "file": "object.h", + "line": 237, + "lineto": 237, + "args": [ + { + "name": "dest", + "type": "git_object **", + "comment": "Pointer to store the copy of the object" + }, + { + "name": "source", + "type": "git_object *", + "comment": "Original object to copy" + } + ], + "argline": "git_object **dest, git_object *source", + "sig": "git_object **::git_object *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Create an in-memory copy of a Git object. The copy must be\n explicitly free'd or it will leak.

\n", + "comments": "", + "group": "object" + }, + "git_odb_new": { + "type": "function", + "file": "odb.h", + "line": 38, + "lineto": 38, + "args": [ + { + "name": "out", + "type": "git_odb **", + "comment": "location to store the database pointer, if opened.\n\t\t\tSet to NULL if the open failed." + } + ], + "argline": "git_odb **out", + "sig": "git_odb **", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Create a new object database with no backends.

\n", + "comments": "

Before the ODB can be used for read/writing, a custom database\n backend must be manually added using git_odb_add_backend()

\n", + "group": "odb" + }, + "git_odb_open": { + "type": "function", + "file": "odb.h", + "line": 56, + "lineto": 56, + "args": [ + { + "name": "out", + "type": "git_odb **", + "comment": "location to store the database pointer, if opened.\n\t\t\tSet to NULL if the open failed." + }, + { + "name": "objects_dir", + "type": "const char *", + "comment": "path of the backends' \"objects\" directory." + } + ], + "argline": "git_odb **out, const char *objects_dir", + "sig": "git_odb **::const char *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Create a new object database and automatically add\n the two default backends:

\n", + "comments": "
- git_odb_backend_loose: read and write loose object files\n    from disk, assuming `objects_dir` as the Objects folder\n\n- git_odb_backend_pack: read objects from packfiles,\n    assuming `objects_dir` as the Objects folder which\n    contains a 'pack/' folder with the corresponding data\n
\n", + "group": "odb" + }, + "git_odb_add_disk_alternate": { + "type": "function", + "file": "odb.h", + "line": 73, + "lineto": 73, + "args": [ + { + "name": "odb", + "type": "git_odb *", + "comment": "database to add the backend to" + }, + { + "name": "path", + "type": "const char *", + "comment": "path to the objects folder for the alternate" + } + ], + "argline": "git_odb *odb, const char *path", + "sig": "git_odb *::const char *", + "return": { + "type": "int", + "comment": " 0 on success; error code otherwise" + }, + "description": "

Add an on-disk alternate to an existing Object DB.

\n", + "comments": "

Note that the added path must point to an objects, not\n to a full repository, to use it as an alternate store.

\n\n

Alternate backends are always checked for objects after\n all the main backends have been exhausted.

\n\n

Writing is disabled on alternate backends.

\n", + "group": "odb" + }, + "git_odb_free": { + "type": "function", + "file": "odb.h", + "line": 80, + "lineto": 80, + "args": [ + { + "name": "db", + "type": "git_odb *", + "comment": "database pointer to close. If NULL no action is taken." + } + ], + "argline": "git_odb *db", + "sig": "git_odb *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Close an open object database.

\n", + "comments": "", + "group": "odb", + "examples": { + "cat-file.c": [ + "ex/v0.23.2/cat-file.html#git_odb_free-22" + ] + } + }, + "git_odb_read": { + "type": "function", + "file": "odb.h", + "line": 99, + "lineto": 99, + "args": [ + { + "name": "out", + "type": "git_odb_object **", + "comment": "pointer where to store the read object" + }, + { + "name": "db", + "type": "git_odb *", + "comment": "database to search for the object in." + }, + { + "name": "id", + "type": "const git_oid *", + "comment": "identity of the object to read." + } + ], + "argline": "git_odb_object **out, git_odb *db, const git_oid *id", + "sig": "git_odb_object **::git_odb *::const git_oid *", + "return": { + "type": "int", + "comment": " - 0 if the object was read;\n - GIT_ENOTFOUND if the object is not in the database." + }, + "description": "

Read an object from the database.

\n", + "comments": "

This method queries all available ODB backends\n trying to read the given OID.

\n\n

The returned object is reference counted and\n internally cached, so it should be closed\n by the user once it's no longer in use.

\n", + "group": "odb", + "examples": { + "cat-file.c": [ + "ex/v0.23.2/cat-file.html#git_odb_read-23" + ], + "general.c": [ + "ex/v0.23.2/general.html#git_odb_read-34" + ] + } + }, + "git_odb_read_prefix": { + "type": "function", + "file": "odb.h", + "line": 128, + "lineto": 128, + "args": [ + { + "name": "out", + "type": "git_odb_object **", + "comment": "pointer where to store the read object" + }, + { + "name": "db", + "type": "git_odb *", + "comment": "database to search for the object in." + }, + { + "name": "short_id", + "type": "const git_oid *", + "comment": "a prefix of the id of the object to read." + }, + { + "name": "len", + "type": "size_t", + "comment": "the length of the prefix" + } + ], + "argline": "git_odb_object **out, git_odb *db, const git_oid *short_id, size_t len", + "sig": "git_odb_object **::git_odb *::const git_oid *::size_t", + "return": { + "type": "int", + "comment": " - 0 if the object was read;\n - GIT_ENOTFOUND if the object is not in the database.\n - GIT_EAMBIGUOUS if the prefix is ambiguous (several objects match the prefix)" + }, + "description": "

Read an object from the database, given a prefix\n of its identifier.

\n", + "comments": "

This method queries all available ODB backends\n trying to match the 'len' first hexadecimal\n characters of the 'short_id'.\n The remaining (GIT_OID_HEXSZ-len)*4 bits of\n 'short_id' must be 0s.\n 'len' must be at least GIT_OID_MINPREFIXLEN,\n and the prefix must be long enough to identify\n a unique object in all the backends; the\n method will fail otherwise.

\n\n

The returned object is reference counted and\n internally cached, so it should be closed\n by the user once it's no longer in use.

\n", + "group": "odb" + }, + "git_odb_read_header": { + "type": "function", + "file": "odb.h", + "line": 148, + "lineto": 148, + "args": [ + { + "name": "len_out", + "type": "size_t *", + "comment": "pointer where to store the length" + }, + { + "name": "type_out", + "type": "git_otype *", + "comment": "pointer where to store the type" + }, + { + "name": "db", + "type": "git_odb *", + "comment": "database to search for the object in." + }, + { + "name": "id", + "type": "const git_oid *", + "comment": "identity of the object to read." + } + ], + "argline": "size_t *len_out, git_otype *type_out, git_odb *db, const git_oid *id", + "sig": "size_t *::git_otype *::git_odb *::const git_oid *", + "return": { + "type": "int", + "comment": " - 0 if the object was read;\n - GIT_ENOTFOUND if the object is not in the database." + }, + "description": "

Read the header of an object from the database, without\n reading its full contents.

\n", + "comments": "

The header includes the length and the type of an object.

\n\n

Note that most backends do not support reading only the header\n of an object, so the whole object will be read and then the\n header will be returned.

\n", + "group": "odb" + }, + "git_odb_exists": { + "type": "function", + "file": "odb.h", + "line": 159, + "lineto": 159, + "args": [ + { + "name": "db", + "type": "git_odb *", + "comment": "database to be searched for the given object." + }, + { + "name": "id", + "type": "const git_oid *", + "comment": "the object to search for." + } + ], + "argline": "git_odb *db, const git_oid *id", + "sig": "git_odb *::const git_oid *", + "return": { + "type": "int", + "comment": " - 1, if the object was found\n - 0, otherwise" + }, + "description": "

Determine if the given object can be found in the object database.

\n", + "comments": "", + "group": "odb" + }, + "git_odb_exists_prefix": { + "type": "function", + "file": "odb.h", + "line": 171, + "lineto": 172, + "args": [ + { + "name": "out", + "type": "git_oid *", + "comment": "The full OID of the found object if just one is found." + }, + { + "name": "db", + "type": "git_odb *", + "comment": "The database to be searched for the given object." + }, + { + "name": "short_id", + "type": "const git_oid *", + "comment": "A prefix of the id of the object to read." + }, + { + "name": "len", + "type": "size_t", + "comment": "The length of the prefix." + } + ], + "argline": "git_oid *out, git_odb *db, const git_oid *short_id, size_t len", + "sig": "git_oid *::git_odb *::const git_oid *::size_t", + "return": { + "type": "int", + "comment": " 0 if found, GIT_ENOTFOUND if not found, GIT_EAMBIGUOUS if multiple\n matches were found, other value \n<\n 0 if there was a read error." + }, + "description": "

Determine if objects can be found in the object database from a short OID.

\n", + "comments": "", + "group": "odb" + }, + "git_odb_refresh": { + "type": "function", + "file": "odb.h", + "line": 192, + "lineto": 192, + "args": [ + { + "name": "db", + "type": "struct git_odb *", + "comment": "database to refresh" + } + ], + "argline": "struct git_odb *db", + "sig": "struct git_odb *", + "return": { + "type": "int", + "comment": " 0 on success, error code otherwise" + }, + "description": "

Refresh the object database to load newly added files.

\n", + "comments": "

If the object databases have changed on disk while the library\n is running, this function will force a reload of the underlying\n indexes.

\n\n

Use this function when you're confident that an external\n application has tampered with the ODB.

\n\n

NOTE that it is not necessary to call this function at all. The\n library will automatically attempt to refresh the ODB\n when a lookup fails, to see if the looked up object exists\n on disk but hasn't been loaded yet.

\n", + "group": "odb" + }, + "git_odb_foreach": { + "type": "function", + "file": "odb.h", + "line": 207, + "lineto": 207, + "args": [ + { + "name": "db", + "type": "git_odb *", + "comment": "database to use" + }, + { + "name": "cb", + "type": "git_odb_foreach_cb", + "comment": "the callback to call for each object" + }, + { + "name": "payload", + "type": "void *", + "comment": "data to pass to the callback" + } + ], + "argline": "git_odb *db, git_odb_foreach_cb cb, void *payload", + "sig": "git_odb *::git_odb_foreach_cb::void *", + "return": { + "type": "int", + "comment": " 0 on success, non-zero callback return value, or error code" + }, + "description": "

List all objects available in the database

\n", + "comments": "

The callback will be called for each object available in the\n database. Note that the objects are likely to be returned in the index\n order, which would make accessing the objects in that order inefficient.\n Return a non-zero value from the callback to stop looping.

\n", + "group": "odb" + }, + "git_odb_write": { + "type": "function", + "file": "odb.h", + "line": 227, + "lineto": 227, + "args": [ + { + "name": "out", + "type": "git_oid *", + "comment": "pointer to store the OID result of the write" + }, + { + "name": "odb", + "type": "git_odb *", + "comment": "object database where to store the object" + }, + { + "name": "data", + "type": "const void *", + "comment": "buffer with the data to store" + }, + { + "name": "len", + "type": "size_t", + "comment": "size of the buffer" + }, + { + "name": "type", + "type": "git_otype", + "comment": "type of the data to store" + } + ], + "argline": "git_oid *out, git_odb *odb, const void *data, size_t len, git_otype type", + "sig": "git_oid *::git_odb *::const void *::size_t::git_otype", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Write an object directly into the ODB

\n", + "comments": "

This method writes a full object straight into the ODB.\n For most cases, it is preferred to write objects through a write\n stream, which is both faster and less memory intensive, specially\n for big objects.

\n\n

This method is provided for compatibility with custom backends\n which are not able to support streaming writes

\n", + "group": "odb", + "examples": { + "general.c": [ + "ex/v0.23.2/general.html#git_odb_write-35" + ] + } + }, + "git_odb_open_wstream": { + "type": "function", + "file": "odb.h", + "line": 250, + "lineto": 250, + "args": [ + { + "name": "out", + "type": "git_odb_stream **", + "comment": "pointer where to store the stream" + }, + { + "name": "db", + "type": "git_odb *", + "comment": "object database where the stream will write" + }, + { + "name": "size", + "type": "git_off_t", + "comment": "final size of the object that will be written" + }, + { + "name": "type", + "type": "git_otype", + "comment": "type of the object that will be written" + } + ], + "argline": "git_odb_stream **out, git_odb *db, git_off_t size, git_otype type", + "sig": "git_odb_stream **::git_odb *::git_off_t::git_otype", + "return": { + "type": "int", + "comment": " 0 if the stream was created; error code otherwise" + }, + "description": "

Open a stream to write an object into the ODB

\n", + "comments": "

The type and final length of the object must be specified\n when opening the stream.

\n\n

The returned stream will be of type GIT_STREAM_WRONLY, and it\n won't be effective until git_odb_stream_finalize_write is called\n and returns without an error

\n\n

The stream must always be freed when done with git_odb_stream_free or\n will leak memory.

\n", + "group": "odb" + }, + "git_odb_stream_write": { + "type": "function", + "file": "odb.h", + "line": 263, + "lineto": 263, + "args": [ + { + "name": "stream", + "type": "git_odb_stream *", + "comment": "the stream" + }, + { + "name": "buffer", + "type": "const char *", + "comment": "the data to write" + }, + { + "name": "len", + "type": "size_t", + "comment": "the buffer's length" + } + ], + "argline": "git_odb_stream *stream, const char *buffer, size_t len", + "sig": "git_odb_stream *::const char *::size_t", + "return": { + "type": "int", + "comment": " 0 if the write succeeded; error code otherwise" + }, + "description": "

Write to an odb stream

\n", + "comments": "

This method will fail if the total number of received bytes exceeds the\n size declared with git_odb_open_wstream()

\n", + "group": "odb" + }, + "git_odb_stream_finalize_write": { + "type": "function", + "file": "odb.h", + "line": 278, + "lineto": 278, + "args": [ + { + "name": "out", + "type": "git_oid *", + "comment": "pointer to store the resulting object's id" + }, + { + "name": "stream", + "type": "git_odb_stream *", + "comment": "the stream" + } + ], + "argline": "git_oid *out, git_odb_stream *stream", + "sig": "git_oid *::git_odb_stream *", + "return": { + "type": "int", + "comment": " 0 on success; an error code otherwise" + }, + "description": "

Finish writing to an odb stream

\n", + "comments": "

The object will take its final name and will be available to the\n odb.

\n\n

This method will fail if the total number of received bytes\n differs from the size declared with git_odb_open_wstream()

\n", + "group": "odb" + }, + "git_odb_stream_read": { + "type": "function", + "file": "odb.h", + "line": 285, + "lineto": 285, + "args": [ + { + "name": "stream", + "type": "git_odb_stream *", + "comment": null + }, + { + "name": "buffer", + "type": "char *", + "comment": null + }, + { + "name": "len", + "type": "size_t", + "comment": null + } + ], + "argline": "git_odb_stream *stream, char *buffer, size_t len", + "sig": "git_odb_stream *::char *::size_t", + "return": { + "type": "int", + "comment": null + }, + "description": "

Read from an odb stream

\n", + "comments": "

Most backends don't implement streaming reads

\n", + "group": "odb" + }, + "git_odb_stream_free": { + "type": "function", + "file": "odb.h", + "line": 292, + "lineto": 292, + "args": [ + { + "name": "stream", + "type": "git_odb_stream *", + "comment": "the stream to free" + } + ], + "argline": "git_odb_stream *stream", + "sig": "git_odb_stream *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Free an odb stream

\n", + "comments": "", + "group": "odb" + }, + "git_odb_open_rstream": { + "type": "function", + "file": "odb.h", + "line": 318, + "lineto": 318, + "args": [ + { + "name": "out", + "type": "git_odb_stream **", + "comment": "pointer where to store the stream" + }, + { + "name": "db", + "type": "git_odb *", + "comment": "object database where the stream will read from" + }, + { + "name": "oid", + "type": "const git_oid *", + "comment": "oid of the object the stream will read from" + } + ], + "argline": "git_odb_stream **out, git_odb *db, const git_oid *oid", + "sig": "git_odb_stream **::git_odb *::const git_oid *", + "return": { + "type": "int", + "comment": " 0 if the stream was created; error code otherwise" + }, + "description": "

Open a stream to read an object from the ODB

\n", + "comments": "

Note that most backends do not support streaming reads\n because they store their objects as compressed/delta'ed blobs.

\n\n

It's recommended to use git_odb_read instead, which is\n assured to work on all backends.

\n\n

The returned stream will be of type GIT_STREAM_RDONLY and\n will have the following methods:

\n\n
    - stream->read: read `n` bytes from the stream\n    - stream->free: free the stream\n
\n\n

The stream must always be free'd or will leak memory.

\n", + "group": "odb" + }, + "git_odb_write_pack": { + "type": "function", + "file": "odb.h", + "line": 338, + "lineto": 342, + "args": [ + { + "name": "out", + "type": "git_odb_writepack **", + "comment": "pointer to the writepack functions" + }, + { + "name": "db", + "type": "git_odb *", + "comment": "object database where the stream will read from" + }, + { + "name": "progress_cb", + "type": "git_transfer_progress_cb", + "comment": "function to call with progress information.\n Be aware that this is called inline with network and indexing operations,\n so performance may be affected." + }, + { + "name": "progress_payload", + "type": "void *", + "comment": "payload for the progress callback" + } + ], + "argline": "git_odb_writepack **out, git_odb *db, git_transfer_progress_cb progress_cb, void *progress_payload", + "sig": "git_odb_writepack **::git_odb *::git_transfer_progress_cb::void *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Open a stream for writing a pack file to the ODB.

\n", + "comments": "

If the ODB layer understands pack files, then the given\n packfile will likely be streamed directly to disk (and a\n corresponding index created). If the ODB layer does not\n understand pack files, the objects will be stored in whatever\n format the ODB layer uses.

\n", + "group": "odb" + }, + "git_odb_hash": { + "type": "function", + "file": "odb.h", + "line": 356, + "lineto": 356, + "args": [ + { + "name": "out", + "type": "git_oid *", + "comment": "the resulting object-ID." + }, + { + "name": "data", + "type": "const void *", + "comment": "data to hash" + }, + { + "name": "len", + "type": "size_t", + "comment": "size of the data" + }, + { + "name": "type", + "type": "git_otype", + "comment": "of the data to hash" + } + ], + "argline": "git_oid *out, const void *data, size_t len, git_otype type", + "sig": "git_oid *::const void *::size_t::git_otype", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Determine the object-ID (sha1 hash) of a data buffer

\n", + "comments": "

The resulting SHA-1 OID will be the identifier for the data\n buffer as if the data buffer it were to written to the ODB.

\n", + "group": "odb" + }, + "git_odb_hashfile": { + "type": "function", + "file": "odb.h", + "line": 371, + "lineto": 371, + "args": [ + { + "name": "out", + "type": "git_oid *", + "comment": "oid structure the result is written into." + }, + { + "name": "path", + "type": "const char *", + "comment": "file to read and determine object id for" + }, + { + "name": "type", + "type": "git_otype", + "comment": "the type of the object that will be hashed" + } + ], + "argline": "git_oid *out, const char *path, git_otype type", + "sig": "git_oid *::const char *::git_otype", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Read a file from disk and fill a git_oid with the object id\n that the file would have if it were written to the Object\n Database as an object of the given type (w/o applying filters).\n Similar functionality to git.git's git hash-object without\n the -w flag, however, with the --no-filters flag.\n If you need filters, see git_repository_hashfile.

\n", + "comments": "", + "group": "odb" + }, + "git_odb_object_dup": { + "type": "function", + "file": "odb.h", + "line": 385, + "lineto": 385, + "args": [ + { + "name": "dest", + "type": "git_odb_object **", + "comment": "pointer where to store the copy" + }, + { + "name": "source", + "type": "git_odb_object *", + "comment": "object to copy" + } + ], + "argline": "git_odb_object **dest, git_odb_object *source", + "sig": "git_odb_object **::git_odb_object *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Create a copy of an odb_object

\n", + "comments": "

The returned copy must be manually freed with git_odb_object_free.\n Note that because of an implementation detail, the returned copy will be\n the same pointer as source: the object is internally refcounted, so the\n copy still needs to be freed twice.

\n", + "group": "odb" + }, + "git_odb_object_free": { + "type": "function", + "file": "odb.h", + "line": 395, + "lineto": 395, + "args": [ + { + "name": "object", + "type": "git_odb_object *", + "comment": "object to close" + } + ], + "argline": "git_odb_object *object", + "sig": "git_odb_object *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Close an ODB object

\n", + "comments": "

This method must always be called once a git_odb_object is no\n longer needed, otherwise memory will leak.

\n", + "group": "odb", + "examples": { + "cat-file.c": [ + "ex/v0.23.2/cat-file.html#git_odb_object_free-24" + ], + "general.c": [ + "ex/v0.23.2/general.html#git_odb_object_free-36" + ] + } + }, + "git_odb_object_id": { + "type": "function", + "file": "odb.h", + "line": 405, + "lineto": 405, + "args": [ + { + "name": "object", + "type": "git_odb_object *", + "comment": "the object" + } + ], + "argline": "git_odb_object *object", + "sig": "git_odb_object *", + "return": { + "type": "const git_oid *", + "comment": " a pointer to the OID" + }, + "description": "

Return the OID of an ODB object

\n", + "comments": "

This is the OID from which the object was read from

\n", + "group": "odb" + }, + "git_odb_object_data": { + "type": "function", + "file": "odb.h", + "line": 418, + "lineto": 418, + "args": [ + { + "name": "object", + "type": "git_odb_object *", + "comment": "the object" + } + ], + "argline": "git_odb_object *object", + "sig": "git_odb_object *", + "return": { + "type": "const void *", + "comment": " a pointer to the data" + }, + "description": "

Return the data of an ODB object

\n", + "comments": "

This is the uncompressed, raw data as read from the ODB,\n without the leading header.

\n\n

This pointer is owned by the object and shall not be free'd.

\n", + "group": "odb", + "examples": { + "general.c": [ + "ex/v0.23.2/general.html#git_odb_object_data-37" + ] + } + }, + "git_odb_object_size": { + "type": "function", + "file": "odb.h", + "line": 429, + "lineto": 429, + "args": [ + { + "name": "object", + "type": "git_odb_object *", + "comment": "the object" + } + ], + "argline": "git_odb_object *object", + "sig": "git_odb_object *", + "return": { + "type": "size_t", + "comment": " the size" + }, + "description": "

Return the size of an ODB object

\n", + "comments": "

This is the real size of the data buffer, not the\n actual size of the object.

\n", + "group": "odb", + "examples": { + "cat-file.c": [ + "ex/v0.23.2/cat-file.html#git_odb_object_size-25" + ], + "general.c": [ + "ex/v0.23.2/general.html#git_odb_object_size-38" + ] + } + }, + "git_odb_object_type": { + "type": "function", + "file": "odb.h", + "line": 437, + "lineto": 437, + "args": [ + { + "name": "object", + "type": "git_odb_object *", + "comment": "the object" + } + ], + "argline": "git_odb_object *object", + "sig": "git_odb_object *", + "return": { + "type": "git_otype", + "comment": " the type" + }, + "description": "

Return the type of an ODB object

\n", + "comments": "", + "group": "odb", + "examples": { + "general.c": [ + "ex/v0.23.2/general.html#git_odb_object_type-39" + ] + } + }, + "git_odb_add_backend": { + "type": "function", + "file": "odb.h", + "line": 452, + "lineto": 452, + "args": [ + { + "name": "odb", + "type": "git_odb *", + "comment": "database to add the backend to" + }, + { + "name": "backend", + "type": "git_odb_backend *", + "comment": "pointer to a git_odb_backend instance" + }, + { + "name": "priority", + "type": "int", + "comment": "Value for ordering the backends queue" + } + ], + "argline": "git_odb *odb, git_odb_backend *backend, int priority", + "sig": "git_odb *::git_odb_backend *::int", + "return": { + "type": "int", + "comment": " 0 on success; error code otherwise" + }, + "description": "

Add a custom backend to an existing Object DB

\n", + "comments": "

The backends are checked in relative ordering, based on the\n value of the priority parameter.

\n\n

Read \n for more information.

\n", + "group": "odb" + }, + "git_odb_add_alternate": { + "type": "function", + "file": "odb.h", + "line": 473, + "lineto": 473, + "args": [ + { + "name": "odb", + "type": "git_odb *", + "comment": "database to add the backend to" + }, + { + "name": "backend", + "type": "git_odb_backend *", + "comment": "pointer to a git_odb_backend instance" + }, + { + "name": "priority", + "type": "int", + "comment": "Value for ordering the backends queue" + } + ], + "argline": "git_odb *odb, git_odb_backend *backend, int priority", + "sig": "git_odb *::git_odb_backend *::int", + "return": { + "type": "int", + "comment": " 0 on success; error code otherwise" + }, + "description": "

Add a custom backend to an existing Object DB; this\n backend will work as an alternate.

\n", + "comments": "

Alternate backends are always checked for objects after\n all the main backends have been exhausted.

\n\n

The backends are checked in relative ordering, based on the\n value of the priority parameter.

\n\n

Writing is disabled on alternate backends.

\n\n

Read \n for more information.

\n", + "group": "odb" + }, + "git_odb_num_backends": { + "type": "function", + "file": "odb.h", + "line": 481, + "lineto": 481, + "args": [ + { + "name": "odb", + "type": "git_odb *", + "comment": "object database" + } + ], + "argline": "git_odb *odb", + "sig": "git_odb *", + "return": { + "type": "size_t", + "comment": " number of backends in the ODB" + }, + "description": "

Get the number of ODB backend objects

\n", + "comments": "", + "group": "odb" + }, + "git_odb_get_backend": { + "type": "function", + "file": "odb.h", + "line": 491, + "lineto": 491, + "args": [ + { + "name": "out", + "type": "git_odb_backend **", + "comment": "output pointer to ODB backend at pos" + }, + { + "name": "odb", + "type": "git_odb *", + "comment": "object database" + }, + { + "name": "pos", + "type": "size_t", + "comment": "index into object database backend list" + } + ], + "argline": "git_odb_backend **out, git_odb *odb, size_t pos", + "sig": "git_odb_backend **::git_odb *::size_t", + "return": { + "type": "int", + "comment": " 0 on success; GIT_ENOTFOUND if pos is invalid; other errors \n<\n 0" + }, + "description": "

Lookup an ODB backend object by index

\n", + "comments": "", + "group": "odb" + }, + "git_odb_backend_pack": { + "type": "function", + "file": "odb_backend.h", + "line": 34, + "lineto": 34, + "args": [ + { + "name": "out", + "type": "git_odb_backend **", + "comment": "location to store the odb backend pointer" + }, + { + "name": "objects_dir", + "type": "const char *", + "comment": "the Git repository's objects directory" + } + ], + "argline": "git_odb_backend **out, const char *objects_dir", + "sig": "git_odb_backend **::const char *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Create a backend for the packfiles.

\n", + "comments": "", + "group": "odb" + }, + "git_odb_backend_loose": { + "type": "function", + "file": "odb_backend.h", + "line": 48, + "lineto": 54, + "args": [ + { + "name": "out", + "type": "git_odb_backend **", + "comment": "location to store the odb backend pointer" + }, + { + "name": "objects_dir", + "type": "const char *", + "comment": "the Git repository's objects directory" + }, + { + "name": "compression_level", + "type": "int", + "comment": "zlib compression level to use" + }, + { + "name": "do_fsync", + "type": "int", + "comment": "whether to do an fsync() after writing (currently ignored)" + }, + { + "name": "dir_mode", + "type": "unsigned int", + "comment": "permissions to use creating a directory or 0 for defaults" + }, + { + "name": "file_mode", + "type": "unsigned int", + "comment": "permissions to use creating a file or 0 for defaults" + } + ], + "argline": "git_odb_backend **out, const char *objects_dir, int compression_level, int do_fsync, unsigned int dir_mode, unsigned int file_mode", + "sig": "git_odb_backend **::const char *::int::int::unsigned int::unsigned int", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Create a backend for loose objects

\n", + "comments": "", + "group": "odb" + }, + "git_odb_backend_one_pack": { + "type": "function", + "file": "odb_backend.h", + "line": 67, + "lineto": 67, + "args": [ + { + "name": "out", + "type": "git_odb_backend **", + "comment": "location to store the odb backend pointer" + }, + { + "name": "index_file", + "type": "const char *", + "comment": "path to the packfile's .idx file" + } + ], + "argline": "git_odb_backend **out, const char *index_file", + "sig": "git_odb_backend **::const char *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Create a backend out of a single packfile

\n", + "comments": "

This can be useful for inspecting the contents of a single\n packfile.

\n", + "group": "odb" + }, + "git_oid_fromstr": { + "type": "function", + "file": "oid.h", + "line": 47, + "lineto": 47, + "args": [ + { + "name": "out", + "type": "git_oid *", + "comment": "oid structure the result is written into." + }, + { + "name": "str", + "type": "const char *", + "comment": "input hex string; must be pointing at the start of\n\t\tthe hex sequence and have at least the number of bytes\n\t\tneeded for an oid encoded in hex (40 bytes)." + } + ], + "argline": "git_oid *out, const char *str", + "sig": "git_oid *::const char *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Parse a hex formatted object id into a git_oid.

\n", + "comments": "", + "group": "oid", + "examples": { + "general.c": [ + "ex/v0.23.2/general.html#git_oid_fromstr-40", + "ex/v0.23.2/general.html#git_oid_fromstr-41", + "ex/v0.23.2/general.html#git_oid_fromstr-42", + "ex/v0.23.2/general.html#git_oid_fromstr-43", + "ex/v0.23.2/general.html#git_oid_fromstr-44", + "ex/v0.23.2/general.html#git_oid_fromstr-45", + "ex/v0.23.2/general.html#git_oid_fromstr-46", + "ex/v0.23.2/general.html#git_oid_fromstr-47" + ] + } + }, + "git_oid_fromstrp": { + "type": "function", + "file": "oid.h", + "line": 57, + "lineto": 57, + "args": [ + { + "name": "out", + "type": "git_oid *", + "comment": "oid structure the result is written into." + }, + { + "name": "str", + "type": "const char *", + "comment": "input hex string; must be at least 4 characters\n long and null-terminated." + } + ], + "argline": "git_oid *out, const char *str", + "sig": "git_oid *::const char *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Parse a hex formatted null-terminated string into a git_oid.

\n", + "comments": "", + "group": "oid" + }, + "git_oid_fromstrn": { + "type": "function", + "file": "oid.h", + "line": 70, + "lineto": 70, + "args": [ + { + "name": "out", + "type": "git_oid *", + "comment": "oid structure the result is written into." + }, + { + "name": "str", + "type": "const char *", + "comment": "input hex string of at least size `length`" + }, + { + "name": "length", + "type": "size_t", + "comment": "length of the input string" + } + ], + "argline": "git_oid *out, const char *str, size_t length", + "sig": "git_oid *::const char *::size_t", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Parse N characters of a hex formatted object id into a git_oid

\n", + "comments": "

If N is odd, N-1 characters will be parsed instead.\n The remaining space in the git_oid will be set to zero.

\n", + "group": "oid" + }, + "git_oid_fromraw": { + "type": "function", + "file": "oid.h", + "line": 78, + "lineto": 78, + "args": [ + { + "name": "out", + "type": "git_oid *", + "comment": "oid structure the result is written into." + }, + { + "name": "raw", + "type": "const unsigned char *", + "comment": "the raw input bytes to be copied." + } + ], + "argline": "git_oid *out, const unsigned char *raw", + "sig": "git_oid *::const unsigned char *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Copy an already raw oid into a git_oid structure.

\n", + "comments": "", + "group": "oid" + }, + "git_oid_fmt": { + "type": "function", + "file": "oid.h", + "line": 90, + "lineto": 90, + "args": [ + { + "name": "out", + "type": "char *", + "comment": "output hex string; must be pointing at the start of\n\t\tthe hex sequence and have at least the number of bytes\n\t\tneeded for an oid encoded in hex (40 bytes). Only the\n\t\toid digits are written; a '\n\\\n0' terminator must be added\n\t\tby the caller if it is required." + }, + { + "name": "id", + "type": "const git_oid *", + "comment": "oid structure to format." + } + ], + "argline": "char *out, const git_oid *id", + "sig": "char *::const git_oid *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Format a git_oid into a hex string.

\n", + "comments": "", + "group": "oid", + "examples": { + "general.c": [ + "ex/v0.23.2/general.html#git_oid_fmt-48", + "ex/v0.23.2/general.html#git_oid_fmt-49", + "ex/v0.23.2/general.html#git_oid_fmt-50", + "ex/v0.23.2/general.html#git_oid_fmt-51", + "ex/v0.23.2/general.html#git_oid_fmt-52" + ], + "network/fetch.c": [ + "ex/v0.23.2/network/fetch.html#git_oid_fmt-1", + "ex/v0.23.2/network/fetch.html#git_oid_fmt-2" + ], + "network/index-pack.c": [ + "ex/v0.23.2/network/index-pack.html#git_oid_fmt-6" + ], + "network/ls-remote.c": [ + "ex/v0.23.2/network/ls-remote.html#git_oid_fmt-1" + ] + } + }, + "git_oid_nfmt": { + "type": "function", + "file": "oid.h", + "line": 101, + "lineto": 101, + "args": [ + { + "name": "out", + "type": "char *", + "comment": "output hex string; you say how many bytes to write.\n\t\tIf the number of bytes is > GIT_OID_HEXSZ, extra bytes\n\t\twill be zeroed; if not, a '\n\\\n0' terminator is NOT added." + }, + { + "name": "n", + "type": "size_t", + "comment": "number of characters to write into out string" + }, + { + "name": "id", + "type": "const git_oid *", + "comment": "oid structure to format." + } + ], + "argline": "char *out, size_t n, const git_oid *id", + "sig": "char *::size_t::const git_oid *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Format a git_oid into a partial hex string.

\n", + "comments": "", + "group": "oid" + }, + "git_oid_pathfmt": { + "type": "function", + "file": "oid.h", + "line": 116, + "lineto": 116, + "args": [ + { + "name": "out", + "type": "char *", + "comment": "output hex string; must be pointing at the start of\n\t\tthe hex sequence and have at least the number of bytes\n\t\tneeded for an oid encoded in hex (41 bytes). Only the\n\t\toid digits are written; a '\n\\\n0' terminator must be added\n\t\tby the caller if it is required." + }, + { + "name": "id", + "type": "const git_oid *", + "comment": "oid structure to format." + } + ], + "argline": "char *out, const git_oid *id", + "sig": "char *::const git_oid *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Format a git_oid into a loose-object path string.

\n", + "comments": "

The resulting string is "aa/...", where "aa" is the first two\n hex digits of the oid and "..." is the remaining 38 digits.

\n", + "group": "oid" + }, + "git_oid_tostr_s": { + "type": "function", + "file": "oid.h", + "line": 129, + "lineto": 129, + "args": [ + { + "name": "oid", + "type": "const git_oid *", + "comment": "The oid structure to format" + } + ], + "argline": "const git_oid *oid", + "sig": "const git_oid *", + "return": { + "type": "char *", + "comment": " the c-string" + }, + "description": "

Format a git_oid into a statically allocated c-string.

\n", + "comments": "

The c-string is owned by the library and should not be freed\n by the user. If libgit2 is built with thread support, the string\n will be stored in TLS (i.e. one buffer per thread) to allow for\n concurrent calls of the function.

\n", + "group": "oid" + }, + "git_oid_tostr": { + "type": "function", + "file": "oid.h", + "line": 148, + "lineto": 148, + "args": [ + { + "name": "out", + "type": "char *", + "comment": "the buffer into which the oid string is output." + }, + { + "name": "n", + "type": "size_t", + "comment": "the size of the out buffer." + }, + { + "name": "id", + "type": "const git_oid *", + "comment": "the oid structure to format." + } + ], + "argline": "char *out, size_t n, const git_oid *id", + "sig": "char *::size_t::const git_oid *", + "return": { + "type": "char *", + "comment": " the out buffer pointer, assuming no input parameter\n\t\t\terrors, otherwise a pointer to an empty string." + }, + "description": "

Format a git_oid into a buffer as a hex format c-string.

\n", + "comments": "

If the buffer is smaller than GIT_OID_HEXSZ+1, then the resulting\n oid c-string will be truncated to n-1 characters (but will still be\n NUL-byte terminated).

\n\n

If there are any input parameter errors (out == NULL, n == 0, oid ==\n NULL), then a pointer to an empty string is returned, so that the\n return value can always be printed.

\n", + "group": "oid", + "examples": { + "blame.c": [ + "ex/v0.23.2/blame.html#git_oid_tostr-18", + "ex/v0.23.2/blame.html#git_oid_tostr-19" + ], + "cat-file.c": [ + "ex/v0.23.2/cat-file.html#git_oid_tostr-26", + "ex/v0.23.2/cat-file.html#git_oid_tostr-27", + "ex/v0.23.2/cat-file.html#git_oid_tostr-28", + "ex/v0.23.2/cat-file.html#git_oid_tostr-29", + "ex/v0.23.2/cat-file.html#git_oid_tostr-30" + ], + "log.c": [ + "ex/v0.23.2/log.html#git_oid_tostr-39", + "ex/v0.23.2/log.html#git_oid_tostr-40" + ], + "rev-parse.c": [ + "ex/v0.23.2/rev-parse.html#git_oid_tostr-12", + "ex/v0.23.2/rev-parse.html#git_oid_tostr-13", + "ex/v0.23.2/rev-parse.html#git_oid_tostr-14", + "ex/v0.23.2/rev-parse.html#git_oid_tostr-15" + ] + } + }, + "git_oid_cpy": { + "type": "function", + "file": "oid.h", + "line": 156, + "lineto": 156, + "args": [ + { + "name": "out", + "type": "git_oid *", + "comment": "oid structure the result is written into." + }, + { + "name": "src", + "type": "const git_oid *", + "comment": "oid structure to copy from." + } + ], + "argline": "git_oid *out, const git_oid *src", + "sig": "git_oid *::const git_oid *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Copy an oid from one structure to another.

\n", + "comments": "", + "group": "oid", + "examples": { + "blame.c": [ + "ex/v0.23.2/blame.html#git_oid_cpy-20", + "ex/v0.23.2/blame.html#git_oid_cpy-21", + "ex/v0.23.2/blame.html#git_oid_cpy-22" + ] + } + }, + "git_oid_cmp": { + "type": "function", + "file": "oid.h", + "line": 165, + "lineto": 165, + "args": [ + { + "name": "a", + "type": "const git_oid *", + "comment": "first oid structure." + }, + { + "name": "b", + "type": "const git_oid *", + "comment": "second oid structure." + } + ], + "argline": "const git_oid *a, const git_oid *b", + "sig": "const git_oid *::const git_oid *", + "return": { + "type": "int", + "comment": " \n<\n0, 0, >0 if a \n<\n b, a == b, a > b." + }, + "description": "

Compare two oid structures.

\n", + "comments": "", + "group": "oid" + }, + "git_oid_equal": { + "type": "function", + "file": "oid.h", + "line": 174, + "lineto": 174, + "args": [ + { + "name": "a", + "type": "const git_oid *", + "comment": "first oid structure." + }, + { + "name": "b", + "type": "const git_oid *", + "comment": "second oid structure." + } + ], + "argline": "const git_oid *a, const git_oid *b", + "sig": "const git_oid *::const git_oid *", + "return": { + "type": "int", + "comment": " true if equal, false otherwise" + }, + "description": "

Compare two oid structures for equality

\n", + "comments": "", + "group": "oid" + }, + "git_oid_ncmp": { + "type": "function", + "file": "oid.h", + "line": 185, + "lineto": 185, + "args": [ + { + "name": "a", + "type": "const git_oid *", + "comment": "first oid structure." + }, + { + "name": "b", + "type": "const git_oid *", + "comment": "second oid structure." + }, + { + "name": "len", + "type": "size_t", + "comment": "the number of hex chars to compare" + } + ], + "argline": "const git_oid *a, const git_oid *b, size_t len", + "sig": "const git_oid *::const git_oid *::size_t", + "return": { + "type": "int", + "comment": " 0 in case of a match" + }, + "description": "

Compare the first 'len' hexadecimal characters (packets of 4 bits)\n of two oid structures.

\n", + "comments": "", + "group": "oid" + }, + "git_oid_streq": { + "type": "function", + "file": "oid.h", + "line": 194, + "lineto": 194, + "args": [ + { + "name": "id", + "type": "const git_oid *", + "comment": "oid structure." + }, + { + "name": "str", + "type": "const char *", + "comment": "input hex string of an object id." + } + ], + "argline": "const git_oid *id, const char *str", + "sig": "const git_oid *::const char *", + "return": { + "type": "int", + "comment": " 0 in case of a match, -1 otherwise." + }, + "description": "

Check if an oid equals an hex formatted object id.

\n", + "comments": "", + "group": "oid" + }, + "git_oid_strcmp": { + "type": "function", + "file": "oid.h", + "line": 204, + "lineto": 204, + "args": [ + { + "name": "id", + "type": "const git_oid *", + "comment": "oid structure." + }, + { + "name": "str", + "type": "const char *", + "comment": "input hex string of an object id." + } + ], + "argline": "const git_oid *id, const char *str", + "sig": "const git_oid *::const char *", + "return": { + "type": "int", + "comment": " -1 if str is not valid, \n<\n0 if id sorts before str,\n 0 if id matches str, >0 if id sorts after str." + }, + "description": "

Compare an oid to an hex formatted object id.

\n", + "comments": "", + "group": "oid" + }, + "git_oid_iszero": { + "type": "function", + "file": "oid.h", + "line": 211, + "lineto": 211, + "args": [ + { + "name": "id", + "type": "const git_oid *", + "comment": null + } + ], + "argline": "const git_oid *id", + "sig": "const git_oid *", + "return": { + "type": "int", + "comment": " 1 if all zeros, 0 otherwise." + }, + "description": "

Check is an oid is all zeros.

\n", + "comments": "", + "group": "oid", + "examples": { + "blame.c": [ + "ex/v0.23.2/blame.html#git_oid_iszero-23" + ], + "network/fetch.c": [ + "ex/v0.23.2/network/fetch.html#git_oid_iszero-3" + ] + } + }, + "git_oid_shorten_new": { + "type": "function", + "file": "oid.h", + "line": 232, + "lineto": 232, + "args": [ + { + "name": "min_length", + "type": "size_t", + "comment": "The minimal length for all identifiers,\n\t\twhich will be used even if shorter OIDs would still\n\t\tbe unique." + } + ], + "argline": "size_t min_length", + "sig": "size_t", + "return": { + "type": "git_oid_shorten *", + "comment": " a `git_oid_shorten` instance, NULL if OOM" + }, + "description": "

Create a new OID shortener.

\n", + "comments": "

The OID shortener is used to process a list of OIDs\n in text form and return the shortest length that would\n uniquely identify all of them.

\n\n

E.g. look at the result of git log --abbrev.

\n", + "group": "oid" + }, + "git_oid_shorten_add": { + "type": "function", + "file": "oid.h", + "line": 258, + "lineto": 258, + "args": [ + { + "name": "os", + "type": "git_oid_shorten *", + "comment": "a `git_oid_shorten` instance" + }, + { + "name": "text_id", + "type": "const char *", + "comment": "an OID in text form" + } + ], + "argline": "git_oid_shorten *os, const char *text_id", + "sig": "git_oid_shorten *::const char *", + "return": { + "type": "int", + "comment": " the minimal length to uniquely identify all OIDs\n\t\tadded so far to the set; or an error code (\n<\n0) if an\n\t\terror occurs." + }, + "description": "

Add a new OID to set of shortened OIDs and calculate\n the minimal length to uniquely identify all the OIDs in\n the set.

\n", + "comments": "

The OID is expected to be a 40-char hexadecimal string.\n The OID is owned by the user and will not be modified\n or freed.

\n\n

For performance reasons, there is a hard-limit of how many\n OIDs can be added to a single set (around ~32000, assuming\n a mostly randomized distribution), which should be enough\n for any kind of program, and keeps the algorithm fast and\n memory-efficient.

\n\n

Attempting to add more than those OIDs will result in a\n GITERR_INVALID error

\n", + "group": "oid" + }, + "git_oid_shorten_free": { + "type": "function", + "file": "oid.h", + "line": 265, + "lineto": 265, + "args": [ + { + "name": "os", + "type": "git_oid_shorten *", + "comment": "a `git_oid_shorten` instance" + } + ], + "argline": "git_oid_shorten *os", + "sig": "git_oid_shorten *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Free an OID shortener instance

\n", + "comments": "", + "group": "oid" + }, + "git_oidarray_free": { + "type": "function", + "file": "oidarray.h", + "line": 34, + "lineto": 34, + "args": [ + { + "name": "array", + "type": "git_oidarray *", + "comment": "git_oidarray from which to free oid data" + } + ], + "argline": "git_oidarray *array", + "sig": "git_oidarray *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Free the OID array

\n", + "comments": "

This method must (and must only) be called on git_oidarray\n objects where the array is allocated by the library. Not doing so,\n will result in a memory leak.

\n\n

This does not free the git_oidarray itself, since the library will\n never allocate that object directly itself (it is more commonly embedded\n inside another struct or created on the stack).

\n", + "group": "oidarray" + }, + "git_packbuilder_new": { + "type": "function", + "file": "pack.h", + "line": 64, + "lineto": 64, + "args": [ + { + "name": "out", + "type": "git_packbuilder **", + "comment": "The new packbuilder object" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "The repository" + } + ], + "argline": "git_packbuilder **out, git_repository *repo", + "sig": "git_packbuilder **::git_repository *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Initialize a new packbuilder

\n", + "comments": "", + "group": "packbuilder" + }, + "git_packbuilder_set_threads": { + "type": "function", + "file": "pack.h", + "line": 77, + "lineto": 77, + "args": [ + { + "name": "pb", + "type": "git_packbuilder *", + "comment": "The packbuilder" + }, + { + "name": "n", + "type": "unsigned int", + "comment": "Number of threads to spawn" + } + ], + "argline": "git_packbuilder *pb, unsigned int n", + "sig": "git_packbuilder *::unsigned int", + "return": { + "type": "unsigned int", + "comment": " number of actual threads to be used" + }, + "description": "

Set number of threads to spawn

\n", + "comments": "

By default, libgit2 won't spawn any threads at all;\n when set to 0, libgit2 will autodetect the number of\n CPUs.

\n", + "group": "packbuilder" + }, + "git_packbuilder_insert": { + "type": "function", + "file": "pack.h", + "line": 91, + "lineto": 91, + "args": [ + { + "name": "pb", + "type": "git_packbuilder *", + "comment": "The packbuilder" + }, + { + "name": "id", + "type": "const git_oid *", + "comment": "The oid of the commit" + }, + { + "name": "name", + "type": "const char *", + "comment": "The name; might be NULL" + } + ], + "argline": "git_packbuilder *pb, const git_oid *id, const char *name", + "sig": "git_packbuilder *::const git_oid *::const char *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Insert a single object

\n", + "comments": "

For an optimal pack it's mandatory to insert objects in recency order,\n commits followed by trees and blobs.

\n", + "group": "packbuilder" + }, + "git_packbuilder_insert_tree": { + "type": "function", + "file": "pack.h", + "line": 103, + "lineto": 103, + "args": [ + { + "name": "pb", + "type": "git_packbuilder *", + "comment": "The packbuilder" + }, + { + "name": "id", + "type": "const git_oid *", + "comment": "The oid of the root tree" + } + ], + "argline": "git_packbuilder *pb, const git_oid *id", + "sig": "git_packbuilder *::const git_oid *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Insert a root tree object

\n", + "comments": "

This will add the tree as well as all referenced trees and blobs.

\n", + "group": "packbuilder" + }, + "git_packbuilder_insert_commit": { + "type": "function", + "file": "pack.h", + "line": 115, + "lineto": 115, + "args": [ + { + "name": "pb", + "type": "git_packbuilder *", + "comment": "The packbuilder" + }, + { + "name": "id", + "type": "const git_oid *", + "comment": "The oid of the commit" + } + ], + "argline": "git_packbuilder *pb, const git_oid *id", + "sig": "git_packbuilder *::const git_oid *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Insert a commit object

\n", + "comments": "

This will add a commit as well as the completed referenced tree.

\n", + "group": "packbuilder" + }, + "git_packbuilder_insert_walk": { + "type": "function", + "file": "pack.h", + "line": 128, + "lineto": 128, + "args": [ + { + "name": "pb", + "type": "git_packbuilder *", + "comment": "the packbuilder" + }, + { + "name": "walk", + "type": "git_revwalk *", + "comment": "the revwalk to use to fill the packbuilder" + } + ], + "argline": "git_packbuilder *pb, git_revwalk *walk", + "sig": "git_packbuilder *::git_revwalk *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Insert objects as given by the walk

\n", + "comments": "

Those commits and all objects they reference will be inserted into\n the packbuilder.

\n", + "group": "packbuilder" + }, + "git_packbuilder_insert_recur": { + "type": "function", + "file": "pack.h", + "line": 140, + "lineto": 140, + "args": [ + { + "name": "pb", + "type": "git_packbuilder *", + "comment": "the packbuilder" + }, + { + "name": "id", + "type": "const git_oid *", + "comment": "the id of the root object to insert" + }, + { + "name": "name", + "type": "const char *", + "comment": "optional name for the object" + } + ], + "argline": "git_packbuilder *pb, const git_oid *id, const char *name", + "sig": "git_packbuilder *::const git_oid *::const char *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Recursively insert an object and its referenced objects

\n", + "comments": "

Insert the object as well as any object it references.

\n", + "group": "packbuilder" + }, + "git_packbuilder_write": { + "type": "function", + "file": "pack.h", + "line": 164, + "lineto": 169, + "args": [ + { + "name": "pb", + "type": "git_packbuilder *", + "comment": "The packbuilder" + }, + { + "name": "path", + "type": "const char *", + "comment": "to the directory where the packfile and index should be stored" + }, + { + "name": "mode", + "type": "unsigned int", + "comment": "permissions to use creating a packfile or 0 for defaults" + }, + { + "name": "progress_cb", + "type": "git_transfer_progress_cb", + "comment": "function to call with progress information from the indexer (optional)" + }, + { + "name": "progress_cb_payload", + "type": "void *", + "comment": "payload for the progress callback (optional)" + } + ], + "argline": "git_packbuilder *pb, const char *path, unsigned int mode, git_transfer_progress_cb progress_cb, void *progress_cb_payload", + "sig": "git_packbuilder *::const char *::unsigned int::git_transfer_progress_cb::void *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Write the new pack and corresponding index file to path.

\n", + "comments": "", + "group": "packbuilder" + }, + "git_packbuilder_hash": { + "type": "function", + "file": "pack.h", + "line": 179, + "lineto": 179, + "args": [ + { + "name": "pb", + "type": "git_packbuilder *", + "comment": "The packbuilder object" + } + ], + "argline": "git_packbuilder *pb", + "sig": "git_packbuilder *", + "return": { + "type": "const git_oid *", + "comment": null + }, + "description": "

Get the packfile's hash

\n", + "comments": "

A packfile's name is derived from the sorted hashing of all object\n names. This is only correct after the packfile has been written.

\n", + "group": "packbuilder" + }, + "git_packbuilder_foreach": { + "type": "function", + "file": "pack.h", + "line": 191, + "lineto": 191, + "args": [ + { + "name": "pb", + "type": "git_packbuilder *", + "comment": "the packbuilder" + }, + { + "name": "cb", + "type": "git_packbuilder_foreach_cb", + "comment": "the callback to call with each packed object's buffer" + }, + { + "name": "payload", + "type": "void *", + "comment": "the callback's data" + } + ], + "argline": "git_packbuilder *pb, git_packbuilder_foreach_cb cb, void *payload", + "sig": "git_packbuilder *::git_packbuilder_foreach_cb::void *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Create the new pack and pass each object to the callback

\n", + "comments": "", + "group": "packbuilder" + }, + "git_packbuilder_object_count": { + "type": "function", + "file": "pack.h", + "line": 199, + "lineto": 199, + "args": [ + { + "name": "pb", + "type": "git_packbuilder *", + "comment": "the packbuilder" + } + ], + "argline": "git_packbuilder *pb", + "sig": "git_packbuilder *", + "return": { + "type": "uint32_t", + "comment": " the number of objects in the packfile" + }, + "description": "

Get the total number of objects the packbuilder will write out

\n", + "comments": "", + "group": "packbuilder" + }, + "git_packbuilder_written": { + "type": "function", + "file": "pack.h", + "line": 207, + "lineto": 207, + "args": [ + { + "name": "pb", + "type": "git_packbuilder *", + "comment": "the packbuilder" + } + ], + "argline": "git_packbuilder *pb", + "sig": "git_packbuilder *", + "return": { + "type": "uint32_t", + "comment": " the number of objects which have already been written" + }, + "description": "

Get the number of objects the packbuilder has already written out

\n", + "comments": "", + "group": "packbuilder" + }, + "git_packbuilder_set_callbacks": { + "type": "function", + "file": "pack.h", + "line": 226, + "lineto": 229, + "args": [ + { + "name": "pb", + "type": "git_packbuilder *", + "comment": "The packbuilder object" + }, + { + "name": "progress_cb", + "type": "git_packbuilder_progress", + "comment": "Function to call with progress information during\n pack building. Be aware that this is called inline with pack building\n operations, so performance may be affected." + }, + { + "name": "progress_cb_payload", + "type": "void *", + "comment": "Payload for progress callback." + } + ], + "argline": "git_packbuilder *pb, git_packbuilder_progress progress_cb, void *progress_cb_payload", + "sig": "git_packbuilder *::git_packbuilder_progress::void *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Set the callbacks for a packbuilder

\n", + "comments": "", + "group": "packbuilder" + }, + "git_packbuilder_free": { + "type": "function", + "file": "pack.h", + "line": 236, + "lineto": 236, + "args": [ + { + "name": "pb", + "type": "git_packbuilder *", + "comment": "The packbuilder" + } + ], + "argline": "git_packbuilder *pb", + "sig": "git_packbuilder *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Free the packbuilder and all associated data

\n", + "comments": "", + "group": "packbuilder" + }, + "git_patch_from_diff": { + "type": "function", + "file": "patch.h", + "line": 51, + "lineto": 52, + "args": [ + { + "name": "out", + "type": "git_patch **", + "comment": "Output parameter for the delta patch object" + }, + { + "name": "diff", + "type": "git_diff *", + "comment": "Diff list object" + }, + { + "name": "idx", + "type": "size_t", + "comment": "Index into diff list" + } + ], + "argline": "git_patch **out, git_diff *diff, size_t idx", + "sig": "git_patch **::git_diff *::size_t", + "return": { + "type": "int", + "comment": " 0 on success, other value \n<\n 0 on error" + }, + "description": "

Return a patch for an entry in the diff list.

\n", + "comments": "

The git_patch is a newly created object contains the text diffs\n for the delta. You have to call git_patch_free() when you are\n done with it. You can use the patch object to loop over all the hunks\n and lines in the diff of the one delta.

\n\n

For an unchanged file or a binary file, no git_patch will be\n created, the output will be set to NULL, and the binary flag will be\n set true in the git_diff_delta structure.

\n\n

It is okay to pass NULL for either of the output parameters; if you pass\n NULL for the git_patch, then the text diff will not be calculated.

\n", + "group": "patch" + }, + "git_patch_from_blobs": { + "type": "function", + "file": "patch.h", + "line": 70, + "lineto": 76, + "args": [ + { + "name": "out", + "type": "git_patch **", + "comment": "The generated patch; NULL on error" + }, + { + "name": "old_blob", + "type": "const git_blob *", + "comment": "Blob for old side of diff, or NULL for empty blob" + }, + { + "name": "old_as_path", + "type": "const char *", + "comment": "Treat old blob as if it had this filename; can be NULL" + }, + { + "name": "new_blob", + "type": "const git_blob *", + "comment": "Blob for new side of diff, or NULL for empty blob" + }, + { + "name": "new_as_path", + "type": "const char *", + "comment": "Treat new blob as if it had this filename; can be NULL" + }, + { + "name": "opts", + "type": "const git_diff_options *", + "comment": "Options for diff, or NULL for default options" + } + ], + "argline": "git_patch **out, const git_blob *old_blob, const char *old_as_path, const git_blob *new_blob, const char *new_as_path, const git_diff_options *opts", + "sig": "git_patch **::const git_blob *::const char *::const git_blob *::const char *::const git_diff_options *", + "return": { + "type": "int", + "comment": " 0 on success or error code \n<\n 0" + }, + "description": "

Directly generate a patch from the difference between two blobs.

\n", + "comments": "

This is just like git_diff_blobs() except it generates a patch object\n for the difference instead of directly making callbacks. You can use the\n standard git_patch accessor functions to read the patch data, and\n you must call git_patch_free() on the patch when done.

\n", + "group": "patch" + }, + "git_patch_from_blob_and_buffer": { + "type": "function", + "file": "patch.h", + "line": 95, + "lineto": 102, + "args": [ + { + "name": "out", + "type": "git_patch **", + "comment": "The generated patch; NULL on error" + }, + { + "name": "old_blob", + "type": "const git_blob *", + "comment": "Blob for old side of diff, or NULL for empty blob" + }, + { + "name": "old_as_path", + "type": "const char *", + "comment": "Treat old blob as if it had this filename; can be NULL" + }, + { + "name": "buffer", + "type": "const char *", + "comment": "Raw data for new side of diff, or NULL for empty" + }, + { + "name": "buffer_len", + "type": "size_t", + "comment": "Length of raw data for new side of diff" + }, + { + "name": "buffer_as_path", + "type": "const char *", + "comment": "Treat buffer as if it had this filename; can be NULL" + }, + { + "name": "opts", + "type": "const git_diff_options *", + "comment": "Options for diff, or NULL for default options" + } + ], + "argline": "git_patch **out, const git_blob *old_blob, const char *old_as_path, const char *buffer, size_t buffer_len, const char *buffer_as_path, const git_diff_options *opts", + "sig": "git_patch **::const git_blob *::const char *::const char *::size_t::const char *::const git_diff_options *", + "return": { + "type": "int", + "comment": " 0 on success or error code \n<\n 0" + }, + "description": "

Directly generate a patch from the difference between a blob and a buffer.

\n", + "comments": "

This is just like git_diff_blob_to_buffer() except it generates a patch\n object for the difference instead of directly making callbacks. You can\n use the standard git_patch accessor functions to read the patch\n data, and you must call git_patch_free() on the patch when done.

\n", + "group": "patch" + }, + "git_patch_from_buffers": { + "type": "function", + "file": "patch.h", + "line": 122, + "lineto": 130, + "args": [ + { + "name": "out", + "type": "git_patch **", + "comment": "The generated patch; NULL on error" + }, + { + "name": "old_buffer", + "type": "const void *", + "comment": "Raw data for old side of diff, or NULL for empty" + }, + { + "name": "old_len", + "type": "size_t", + "comment": "Length of the raw data for old side of the diff" + }, + { + "name": "old_as_path", + "type": "const char *", + "comment": "Treat old buffer as if it had this filename; can be NULL" + }, + { + "name": "new_buffer", + "type": "const char *", + "comment": "Raw data for new side of diff, or NULL for empty" + }, + { + "name": "new_len", + "type": "size_t", + "comment": "Length of raw data for new side of diff" + }, + { + "name": "new_as_path", + "type": "const char *", + "comment": "Treat buffer as if it had this filename; can be NULL" + }, + { + "name": "opts", + "type": "const git_diff_options *", + "comment": "Options for diff, or NULL for default options" + } + ], + "argline": "git_patch **out, const void *old_buffer, size_t old_len, const char *old_as_path, const char *new_buffer, size_t new_len, const char *new_as_path, const git_diff_options *opts", + "sig": "git_patch **::const void *::size_t::const char *::const char *::size_t::const char *::const git_diff_options *", + "return": { + "type": "int", + "comment": " 0 on success or error code \n<\n 0" + }, + "description": "

Directly generate a patch from the difference between two buffers.

\n", + "comments": "

This is just like git_diff_buffers() except it generates a patch\n object for the difference instead of directly making callbacks. You can\n use the standard git_patch accessor functions to read the patch\n data, and you must call git_patch_free() on the patch when done.

\n", + "group": "patch" + }, + "git_patch_free": { + "type": "function", + "file": "patch.h", + "line": 135, + "lineto": 135, + "args": [ + { + "name": "patch", + "type": "git_patch *", + "comment": null + } + ], + "argline": "git_patch *patch", + "sig": "git_patch *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Free a git_patch object.

\n", + "comments": "", + "group": "patch" + }, + "git_patch_get_delta": { + "type": "function", + "file": "patch.h", + "line": 141, + "lineto": 141, + "args": [ + { + "name": "patch", + "type": "const git_patch *", + "comment": null + } + ], + "argline": "const git_patch *patch", + "sig": "const git_patch *", + "return": { + "type": "const git_diff_delta *", + "comment": null + }, + "description": "

Get the delta associated with a patch. This delta points to internal\n data and you do not have to release it when you are done with it.

\n", + "comments": "", + "group": "patch" + }, + "git_patch_num_hunks": { + "type": "function", + "file": "patch.h", + "line": 146, + "lineto": 146, + "args": [ + { + "name": "patch", + "type": "const git_patch *", + "comment": null + } + ], + "argline": "const git_patch *patch", + "sig": "const git_patch *", + "return": { + "type": "size_t", + "comment": null + }, + "description": "

Get the number of hunks in a patch

\n", + "comments": "", + "group": "patch" + }, + "git_patch_line_stats": { + "type": "function", + "file": "patch.h", + "line": 164, + "lineto": 168, + "args": [ + { + "name": "total_context", + "type": "size_t *", + "comment": "Count of context lines in output, can be NULL." + }, + { + "name": "total_additions", + "type": "size_t *", + "comment": "Count of addition lines in output, can be NULL." + }, + { + "name": "total_deletions", + "type": "size_t *", + "comment": "Count of deletion lines in output, can be NULL." + }, + { + "name": "patch", + "type": "const git_patch *", + "comment": "The git_patch object" + } + ], + "argline": "size_t *total_context, size_t *total_additions, size_t *total_deletions, const git_patch *patch", + "sig": "size_t *::size_t *::size_t *::const git_patch *", + "return": { + "type": "int", + "comment": " 0 on success, \n<\n0 on error" + }, + "description": "

Get line counts of each type in a patch.

\n", + "comments": "

This helps imitate a diff --numstat type of output. For that purpose,\n you only need the total_additions and total_deletions values, but we\n include the total_context line count in case you want the total number\n of lines of diff output that will be generated.

\n\n

All outputs are optional. Pass NULL if you don't need a particular count.

\n", + "group": "patch" + }, + "git_patch_get_hunk": { + "type": "function", + "file": "patch.h", + "line": 183, + "lineto": 187, + "args": [ + { + "name": "out", + "type": "const git_diff_hunk **", + "comment": "Output pointer to git_diff_hunk of hunk" + }, + { + "name": "lines_in_hunk", + "type": "size_t *", + "comment": "Output count of total lines in this hunk" + }, + { + "name": "patch", + "type": "git_patch *", + "comment": "Input pointer to patch object" + }, + { + "name": "hunk_idx", + "type": "size_t", + "comment": "Input index of hunk to get information about" + } + ], + "argline": "const git_diff_hunk **out, size_t *lines_in_hunk, git_patch *patch, size_t hunk_idx", + "sig": "const git_diff_hunk **::size_t *::git_patch *::size_t", + "return": { + "type": "int", + "comment": " 0 on success, GIT_ENOTFOUND if hunk_idx out of range, \n<\n0 on error" + }, + "description": "

Get the information about a hunk in a patch

\n", + "comments": "

Given a patch and a hunk index into the patch, this returns detailed\n information about that hunk. Any of the output pointers can be passed\n as NULL if you don't care about that particular piece of information.

\n", + "group": "patch" + }, + "git_patch_num_lines_in_hunk": { + "type": "function", + "file": "patch.h", + "line": 196, + "lineto": 198, + "args": [ + { + "name": "patch", + "type": "const git_patch *", + "comment": "The git_patch object" + }, + { + "name": "hunk_idx", + "type": "size_t", + "comment": "Index of the hunk" + } + ], + "argline": "const git_patch *patch, size_t hunk_idx", + "sig": "const git_patch *::size_t", + "return": { + "type": "int", + "comment": " Number of lines in hunk or -1 if invalid hunk index" + }, + "description": "

Get the number of lines in a hunk.

\n", + "comments": "", + "group": "patch" + }, + "git_patch_get_line_in_hunk": { + "type": "function", + "file": "patch.h", + "line": 214, + "lineto": 218, + "args": [ + { + "name": "out", + "type": "const git_diff_line **", + "comment": "The git_diff_line data for this line" + }, + { + "name": "patch", + "type": "git_patch *", + "comment": "The patch to look in" + }, + { + "name": "hunk_idx", + "type": "size_t", + "comment": "The index of the hunk" + }, + { + "name": "line_of_hunk", + "type": "size_t", + "comment": "The index of the line in the hunk" + } + ], + "argline": "const git_diff_line **out, git_patch *patch, size_t hunk_idx, size_t line_of_hunk", + "sig": "const git_diff_line **::git_patch *::size_t::size_t", + "return": { + "type": "int", + "comment": " 0 on success, \n<\n0 on failure" + }, + "description": "

Get data about a line in a hunk of a patch.

\n", + "comments": "

Given a patch, a hunk index, and a line index in the hunk, this\n will return a lot of details about that line. If you pass a hunk\n index larger than the number of hunks or a line index larger than\n the number of lines in the hunk, this will return -1.

\n", + "group": "patch" + }, + "git_patch_size": { + "type": "function", + "file": "patch.h", + "line": 236, + "lineto": 240, + "args": [ + { + "name": "patch", + "type": "git_patch *", + "comment": "A git_patch representing changes to one file" + }, + { + "name": "include_context", + "type": "int", + "comment": "Include context lines in size if non-zero" + }, + { + "name": "include_hunk_headers", + "type": "int", + "comment": "Include hunk header lines if non-zero" + }, + { + "name": "include_file_headers", + "type": "int", + "comment": "Include file header lines if non-zero" + } + ], + "argline": "git_patch *patch, int include_context, int include_hunk_headers, int include_file_headers", + "sig": "git_patch *::int::int::int", + "return": { + "type": "size_t", + "comment": " The number of bytes of data" + }, + "description": "

Look up size of patch diff data in bytes

\n", + "comments": "

This returns the raw size of the patch data. This only includes the\n actual data from the lines of the diff, not the file or hunk headers.

\n\n

If you pass include_context as true (non-zero), this will be the size\n of all of the diff output; if you pass it as false (zero), this will\n only include the actual changed lines (as if context_lines was 0).

\n", + "group": "patch" + }, + "git_patch_print": { + "type": "function", + "file": "patch.h", + "line": 254, + "lineto": 257, + "args": [ + { + "name": "patch", + "type": "git_patch *", + "comment": "A git_patch representing changes to one file" + }, + { + "name": "print_cb", + "type": "git_diff_line_cb", + "comment": "Callback function to output lines of the patch. Will be\n called for file headers, hunk headers, and diff lines." + }, + { + "name": "payload", + "type": "void *", + "comment": "Reference pointer that will be passed to your callbacks." + } + ], + "argline": "git_patch *patch, git_diff_line_cb print_cb, void *payload", + "sig": "git_patch *::git_diff_line_cb::void *", + "return": { + "type": "int", + "comment": " 0 on success, non-zero callback return value, or error code" + }, + "description": "

Serialize the patch to text via callback.

\n", + "comments": "

Returning a non-zero value from the callback will terminate the iteration\n and return that value to the caller.

\n", + "group": "patch" + }, + "git_patch_to_buf": { + "type": "function", + "file": "patch.h", + "line": 266, + "lineto": 268, + "args": [ + { + "name": "out", + "type": "git_buf *", + "comment": "The git_buf to be filled in" + }, + { + "name": "patch", + "type": "git_patch *", + "comment": "A git_patch representing changes to one file" + } + ], + "argline": "git_buf *out, git_patch *patch", + "sig": "git_buf *::git_patch *", + "return": { + "type": "int", + "comment": " 0 on success, \n<\n0 on failure." + }, + "description": "

Get the content of a patch as a single diff text.

\n", + "comments": "", + "group": "patch" + }, + "git_pathspec_new": { + "type": "function", + "file": "pathspec.h", + "line": 65, + "lineto": 66, + "args": [ + { + "name": "out", + "type": "git_pathspec **", + "comment": "Output of the compiled pathspec" + }, + { + "name": "pathspec", + "type": "const git_strarray *", + "comment": "A git_strarray of the paths to match" + } + ], + "argline": "git_pathspec **out, const git_strarray *pathspec", + "sig": "git_pathspec **::const git_strarray *", + "return": { + "type": "int", + "comment": " 0 on success, \n<\n0 on failure" + }, + "description": "

Compile a pathspec

\n", + "comments": "", + "group": "pathspec", + "examples": { + "log.c": [ + "ex/v0.23.2/log.html#git_pathspec_new-41" + ] + } + }, + "git_pathspec_free": { + "type": "function", + "file": "pathspec.h", + "line": 73, + "lineto": 73, + "args": [ + { + "name": "ps", + "type": "git_pathspec *", + "comment": "The compiled pathspec" + } + ], + "argline": "git_pathspec *ps", + "sig": "git_pathspec *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Free a pathspec

\n", + "comments": "", + "group": "pathspec", + "examples": { + "log.c": [ + "ex/v0.23.2/log.html#git_pathspec_free-42" + ] + } + }, + "git_pathspec_matches_path": { + "type": "function", + "file": "pathspec.h", + "line": 88, + "lineto": 89, + "args": [ + { + "name": "ps", + "type": "const git_pathspec *", + "comment": "The compiled pathspec" + }, + { + "name": "flags", + "type": "uint32_t", + "comment": "Combination of git_pathspec_flag_t options to control match" + }, + { + "name": "path", + "type": "const char *", + "comment": "The pathname to attempt to match" + } + ], + "argline": "const git_pathspec *ps, uint32_t flags, const char *path", + "sig": "const git_pathspec *::uint32_t::const char *", + "return": { + "type": "int", + "comment": " 1 is path matches spec, 0 if it does not" + }, + "description": "

Try to match a path against a pathspec

\n", + "comments": "

Unlike most of the other pathspec matching functions, this will not\n fall back on the native case-sensitivity for your platform. You must\n explicitly pass flags to control case sensitivity or else this will\n fall back on being case sensitive.

\n", + "group": "pathspec" + }, + "git_pathspec_match_workdir": { + "type": "function", + "file": "pathspec.h", + "line": 113, + "lineto": 117, + "args": [ + { + "name": "out", + "type": "git_pathspec_match_list **", + "comment": "Output list of matches; pass NULL to just get return value" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "The repository in which to match; bare repo is an error" + }, + { + "name": "flags", + "type": "uint32_t", + "comment": "Combination of git_pathspec_flag_t options to control match" + }, + { + "name": "ps", + "type": "git_pathspec *", + "comment": "Pathspec to be matched" + } + ], + "argline": "git_pathspec_match_list **out, git_repository *repo, uint32_t flags, git_pathspec *ps", + "sig": "git_pathspec_match_list **::git_repository *::uint32_t::git_pathspec *", + "return": { + "type": "int", + "comment": " 0 on success, -1 on error, GIT_ENOTFOUND if no matches and\n the GIT_PATHSPEC_NO_MATCH_ERROR flag was given" + }, + "description": "

Match a pathspec against the working directory of a repository.

\n", + "comments": "

This matches the pathspec against the current files in the working\n directory of the repository. It is an error to invoke this on a bare\n repo. This handles git ignores (i.e. ignored files will not be\n considered to match the pathspec unless the file is tracked in the\n index).

\n\n

If out is not NULL, this returns a git_patchspec_match_list. That\n contains the list of all matched filenames (unless you pass the\n GIT_PATHSPEC_FAILURES_ONLY flag) and may also contain the list of\n pathspecs with no match (if you used the GIT_PATHSPEC_FIND_FAILURES\n flag). You must call git_pathspec_match_list_free() on this object.

\n", + "group": "pathspec" + }, + "git_pathspec_match_index": { + "type": "function", + "file": "pathspec.h", + "line": 142, + "lineto": 146, + "args": [ + { + "name": "out", + "type": "git_pathspec_match_list **", + "comment": "Output list of matches; pass NULL to just get return value" + }, + { + "name": "index", + "type": "git_index *", + "comment": "The index to match against" + }, + { + "name": "flags", + "type": "uint32_t", + "comment": "Combination of git_pathspec_flag_t options to control match" + }, + { + "name": "ps", + "type": "git_pathspec *", + "comment": "Pathspec to be matched" + } + ], + "argline": "git_pathspec_match_list **out, git_index *index, uint32_t flags, git_pathspec *ps", + "sig": "git_pathspec_match_list **::git_index *::uint32_t::git_pathspec *", + "return": { + "type": "int", + "comment": " 0 on success, -1 on error, GIT_ENOTFOUND if no matches and\n the GIT_PATHSPEC_NO_MATCH_ERROR flag is used" + }, + "description": "

Match a pathspec against entries in an index.

\n", + "comments": "

This matches the pathspec against the files in the repository index.

\n\n

NOTE: At the moment, the case sensitivity of this match is controlled\n by the current case-sensitivity of the index object itself and the\n USE_CASE and IGNORE_CASE flags will have no effect. This behavior will\n be corrected in a future release.

\n\n

If out is not NULL, this returns a git_patchspec_match_list. That\n contains the list of all matched filenames (unless you pass the\n GIT_PATHSPEC_FAILURES_ONLY flag) and may also contain the list of\n pathspecs with no match (if you used the GIT_PATHSPEC_FIND_FAILURES\n flag). You must call git_pathspec_match_list_free() on this object.

\n", + "group": "pathspec" + }, + "git_pathspec_match_tree": { + "type": "function", + "file": "pathspec.h", + "line": 166, + "lineto": 170, + "args": [ + { + "name": "out", + "type": "git_pathspec_match_list **", + "comment": "Output list of matches; pass NULL to just get return value" + }, + { + "name": "tree", + "type": "git_tree *", + "comment": "The root-level tree to match against" + }, + { + "name": "flags", + "type": "uint32_t", + "comment": "Combination of git_pathspec_flag_t options to control match" + }, + { + "name": "ps", + "type": "git_pathspec *", + "comment": "Pathspec to be matched" + } + ], + "argline": "git_pathspec_match_list **out, git_tree *tree, uint32_t flags, git_pathspec *ps", + "sig": "git_pathspec_match_list **::git_tree *::uint32_t::git_pathspec *", + "return": { + "type": "int", + "comment": " 0 on success, -1 on error, GIT_ENOTFOUND if no matches and\n the GIT_PATHSPEC_NO_MATCH_ERROR flag is used" + }, + "description": "

Match a pathspec against files in a tree.

\n", + "comments": "

This matches the pathspec against the files in the given tree.

\n\n

If out is not NULL, this returns a git_patchspec_match_list. That\n contains the list of all matched filenames (unless you pass the\n GIT_PATHSPEC_FAILURES_ONLY flag) and may also contain the list of\n pathspecs with no match (if you used the GIT_PATHSPEC_FIND_FAILURES\n flag). You must call git_pathspec_match_list_free() on this object.

\n", + "group": "pathspec", + "examples": { + "log.c": [ + "ex/v0.23.2/log.html#git_pathspec_match_tree-43" + ] + } + }, + "git_pathspec_match_diff": { + "type": "function", + "file": "pathspec.h", + "line": 190, + "lineto": 194, + "args": [ + { + "name": "out", + "type": "git_pathspec_match_list **", + "comment": "Output list of matches; pass NULL to just get return value" + }, + { + "name": "diff", + "type": "git_diff *", + "comment": "A generated diff list" + }, + { + "name": "flags", + "type": "uint32_t", + "comment": "Combination of git_pathspec_flag_t options to control match" + }, + { + "name": "ps", + "type": "git_pathspec *", + "comment": "Pathspec to be matched" + } + ], + "argline": "git_pathspec_match_list **out, git_diff *diff, uint32_t flags, git_pathspec *ps", + "sig": "git_pathspec_match_list **::git_diff *::uint32_t::git_pathspec *", + "return": { + "type": "int", + "comment": " 0 on success, -1 on error, GIT_ENOTFOUND if no matches and\n the GIT_PATHSPEC_NO_MATCH_ERROR flag is used" + }, + "description": "

Match a pathspec against files in a diff list.

\n", + "comments": "

This matches the pathspec against the files in the given diff list.

\n\n

If out is not NULL, this returns a git_patchspec_match_list. That\n contains the list of all matched filenames (unless you pass the\n GIT_PATHSPEC_FAILURES_ONLY flag) and may also contain the list of\n pathspecs with no match (if you used the GIT_PATHSPEC_FIND_FAILURES\n flag). You must call git_pathspec_match_list_free() on this object.

\n", + "group": "pathspec" + }, + "git_pathspec_match_list_free": { + "type": "function", + "file": "pathspec.h", + "line": 201, + "lineto": 201, + "args": [ + { + "name": "m", + "type": "git_pathspec_match_list *", + "comment": "The git_pathspec_match_list to be freed" + } + ], + "argline": "git_pathspec_match_list *m", + "sig": "git_pathspec_match_list *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Free memory associates with a git_pathspec_match_list

\n", + "comments": "", + "group": "pathspec" + }, + "git_pathspec_match_list_entrycount": { + "type": "function", + "file": "pathspec.h", + "line": 209, + "lineto": 210, + "args": [ + { + "name": "m", + "type": "const git_pathspec_match_list *", + "comment": "The git_pathspec_match_list object" + } + ], + "argline": "const git_pathspec_match_list *m", + "sig": "const git_pathspec_match_list *", + "return": { + "type": "size_t", + "comment": " Number of items in match list" + }, + "description": "

Get the number of items in a match list.

\n", + "comments": "", + "group": "pathspec" + }, + "git_pathspec_match_list_entry": { + "type": "function", + "file": "pathspec.h", + "line": 222, + "lineto": 223, + "args": [ + { + "name": "m", + "type": "const git_pathspec_match_list *", + "comment": "The git_pathspec_match_list object" + }, + { + "name": "pos", + "type": "size_t", + "comment": "The index into the list" + } + ], + "argline": "const git_pathspec_match_list *m, size_t pos", + "sig": "const git_pathspec_match_list *::size_t", + "return": { + "type": "const char *", + "comment": " The filename of the match" + }, + "description": "

Get a matching filename by position.

\n", + "comments": "

This routine cannot be used if the match list was generated by\n git_pathspec_match_diff. If so, it will always return NULL.

\n", + "group": "pathspec" + }, + "git_pathspec_match_list_diff_entry": { + "type": "function", + "file": "pathspec.h", + "line": 235, + "lineto": 236, + "args": [ + { + "name": "m", + "type": "const git_pathspec_match_list *", + "comment": "The git_pathspec_match_list object" + }, + { + "name": "pos", + "type": "size_t", + "comment": "The index into the list" + } + ], + "argline": "const git_pathspec_match_list *m, size_t pos", + "sig": "const git_pathspec_match_list *::size_t", + "return": { + "type": "const git_diff_delta *", + "comment": " The filename of the match" + }, + "description": "

Get a matching diff delta by position.

\n", + "comments": "

This routine can only be used if the match list was generated by\n git_pathspec_match_diff. Otherwise it will always return NULL.

\n", + "group": "pathspec" + }, + "git_pathspec_match_list_failed_entrycount": { + "type": "function", + "file": "pathspec.h", + "line": 247, + "lineto": 248, + "args": [ + { + "name": "m", + "type": "const git_pathspec_match_list *", + "comment": "The git_pathspec_match_list object" + } + ], + "argline": "const git_pathspec_match_list *m", + "sig": "const git_pathspec_match_list *", + "return": { + "type": "size_t", + "comment": " Number of items in original pathspec that had no matches" + }, + "description": "

Get the number of pathspec items that did not match.

\n", + "comments": "

This will be zero unless you passed GIT_PATHSPEC_FIND_FAILURES when\n generating the git_pathspec_match_list.

\n", + "group": "pathspec" + }, + "git_pathspec_match_list_failed_entry": { + "type": "function", + "file": "pathspec.h", + "line": 259, + "lineto": 260, + "args": [ + { + "name": "m", + "type": "const git_pathspec_match_list *", + "comment": "The git_pathspec_match_list object" + }, + { + "name": "pos", + "type": "size_t", + "comment": "The index into the failed items" + } + ], + "argline": "const git_pathspec_match_list *m, size_t pos", + "sig": "const git_pathspec_match_list *::size_t", + "return": { + "type": "const char *", + "comment": " The pathspec pattern that didn't match anything" + }, + "description": "

Get an original pathspec string that had no matches.

\n", + "comments": "

This will be return NULL for positions out of range.

\n", + "group": "pathspec" + }, + "git_rebase_init_options": { + "type": "function", + "file": "rebase.h", + "line": 141, + "lineto": 143, + "args": [ + { + "name": "opts", + "type": "git_rebase_options *", + "comment": "the `git_rebase_options` instance to initialize." + }, + { + "name": "version", + "type": "unsigned int", + "comment": "the version of the struct; you should pass\n `GIT_REBASE_OPTIONS_VERSION` here." + } + ], + "argline": "git_rebase_options *opts, unsigned int version", + "sig": "git_rebase_options *::unsigned int", + "return": { + "type": "int", + "comment": " Zero on success; -1 on failure." + }, + "description": "

Initializes a git_rebase_options with default values. Equivalent to\n creating an instance with GIT_REBASE_OPTIONS_INIT.

\n", + "comments": "", + "group": "rebase" + }, + "git_rebase_init": { + "type": "function", + "file": "rebase.h", + "line": 162, + "lineto": 168, + "args": [ + { + "name": "out", + "type": "git_rebase **", + "comment": "Pointer to store the rebase object" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "The repository to perform the rebase" + }, + { + "name": "branch", + "type": "const git_annotated_commit *", + "comment": "The terminal commit to rebase, or NULL to rebase the\n current branch" + }, + { + "name": "upstream", + "type": "const git_annotated_commit *", + "comment": "The commit to begin rebasing from, or NULL to rebase all\n reachable commits" + }, + { + "name": "onto", + "type": "const git_annotated_commit *", + "comment": "The branch to rebase onto, or NULL to rebase onto the given\n upstream" + }, + { + "name": "opts", + "type": "const git_rebase_options *", + "comment": "Options to specify how rebase is performed, or NULL" + } + ], + "argline": "git_rebase **out, git_repository *repo, const git_annotated_commit *branch, const git_annotated_commit *upstream, const git_annotated_commit *onto, const git_rebase_options *opts", + "sig": "git_rebase **::git_repository *::const git_annotated_commit *::const git_annotated_commit *::const git_annotated_commit *::const git_rebase_options *", + "return": { + "type": "int", + "comment": " Zero on success; -1 on failure." + }, + "description": "

Initializes a rebase operation to rebase the changes in branch\n relative to upstream onto another branch. To begin the rebase\n process, call git_rebase_next. When you have finished with this\n object, call git_rebase_free.

\n", + "comments": "", + "group": "rebase" + }, + "git_rebase_open": { + "type": "function", + "file": "rebase.h", + "line": 179, + "lineto": 182, + "args": [ + { + "name": "out", + "type": "git_rebase **", + "comment": "Pointer to store the rebase object" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "The repository that has a rebase in-progress" + }, + { + "name": "opts", + "type": "const git_rebase_options *", + "comment": "Options to specify how rebase is performed" + } + ], + "argline": "git_rebase **out, git_repository *repo, const git_rebase_options *opts", + "sig": "git_rebase **::git_repository *::const git_rebase_options *", + "return": { + "type": "int", + "comment": " Zero on success; -1 on failure." + }, + "description": "

Opens an existing rebase that was previously started by either an\n invocation of git_rebase_init or by another client.

\n", + "comments": "", + "group": "rebase" + }, + "git_rebase_operation_entrycount": { + "type": "function", + "file": "rebase.h", + "line": 190, + "lineto": 190, + "args": [ + { + "name": "rebase", + "type": "git_rebase *", + "comment": "The in-progress rebase" + } + ], + "argline": "git_rebase *rebase", + "sig": "git_rebase *", + "return": { + "type": "size_t", + "comment": " The number of rebase operations in total" + }, + "description": "

Gets the count of rebase operations that are to be applied.

\n", + "comments": "", + "group": "rebase" + }, + "git_rebase_operation_current": { + "type": "function", + "file": "rebase.h", + "line": 201, + "lineto": 201, + "args": [ + { + "name": "rebase", + "type": "git_rebase *", + "comment": "The in-progress rebase" + } + ], + "argline": "git_rebase *rebase", + "sig": "git_rebase *", + "return": { + "type": "size_t", + "comment": " The index of the rebase operation currently being applied." + }, + "description": "

Gets the index of the rebase operation that is currently being applied.\n If the first operation has not yet been applied (because you have\n called init but not yet next) then this returns\n GIT_REBASE_NO_OPERATION.

\n", + "comments": "", + "group": "rebase" + }, + "git_rebase_operation_byindex": { + "type": "function", + "file": "rebase.h", + "line": 210, + "lineto": 212, + "args": [ + { + "name": "rebase", + "type": "git_rebase *", + "comment": "The in-progress rebase" + }, + { + "name": "idx", + "type": "size_t", + "comment": "The index of the rebase operation to retrieve" + } + ], + "argline": "git_rebase *rebase, size_t idx", + "sig": "git_rebase *::size_t", + "return": { + "type": "git_rebase_operation *", + "comment": " The rebase operation or NULL if `idx` was out of bounds" + }, + "description": "

Gets the rebase operation specified by the given index.

\n", + "comments": "", + "group": "rebase" + }, + "git_rebase_next": { + "type": "function", + "file": "rebase.h", + "line": 225, + "lineto": 227, + "args": [ + { + "name": "operation", + "type": "git_rebase_operation **", + "comment": "Pointer to store the rebase operation that is to be performed next" + }, + { + "name": "rebase", + "type": "git_rebase *", + "comment": "The rebase in progress" + } + ], + "argline": "git_rebase_operation **operation, git_rebase *rebase", + "sig": "git_rebase_operation **::git_rebase *", + "return": { + "type": "int", + "comment": " Zero on success; -1 on failure." + }, + "description": "

Performs the next rebase operation and returns the information about it.\n If the operation is one that applies a patch (which is any operation except\n GIT_REBASE_OPERATION_EXEC) then the patch will be applied and the index and\n working directory will be updated with the changes. If there are conflicts,\n you will need to address those before committing the changes.

\n", + "comments": "", + "group": "rebase" + }, + "git_rebase_commit": { + "type": "function", + "file": "rebase.h", + "line": 251, + "lineto": 257, + "args": [ + { + "name": "id", + "type": "git_oid *", + "comment": "Pointer in which to store the OID of the newly created commit" + }, + { + "name": "rebase", + "type": "git_rebase *", + "comment": "The rebase that is in-progress" + }, + { + "name": "author", + "type": "const git_signature *", + "comment": "The author of the updated commit, or NULL to keep the\n author from the original commit" + }, + { + "name": "committer", + "type": "const git_signature *", + "comment": "The committer of the rebase" + }, + { + "name": "message_encoding", + "type": "const char *", + "comment": "The encoding for the message in the commit,\n represented with a standard encoding name. If message is NULL,\n this should also be NULL, and the encoding from the original\n commit will be maintained. If message is specified, this may be\n NULL to indicate that \"UTF-8\" is to be used." + }, + { + "name": "message", + "type": "const char *", + "comment": "The message for this commit, or NULL to use the message\n from the original commit." + } + ], + "argline": "git_oid *id, git_rebase *rebase, const git_signature *author, const git_signature *committer, const char *message_encoding, const char *message", + "sig": "git_oid *::git_rebase *::const git_signature *::const git_signature *::const char *::const char *", + "return": { + "type": "int", + "comment": " Zero on success, GIT_EUNMERGED if there are unmerged changes in\n the index, GIT_EAPPLIED if the current commit has already\n been applied to the upstream and there is nothing to commit,\n -1 on failure." + }, + "description": "

Commits the current patch. You must have resolved any conflicts that\n were introduced during the patch application from the git_rebase_next\n invocation.

\n", + "comments": "", + "group": "rebase" + }, + "git_rebase_abort": { + "type": "function", + "file": "rebase.h", + "line": 267, + "lineto": 267, + "args": [ + { + "name": "rebase", + "type": "git_rebase *", + "comment": "The rebase that is in-progress" + } + ], + "argline": "git_rebase *rebase", + "sig": "git_rebase *", + "return": { + "type": "int", + "comment": " Zero on success; GIT_ENOTFOUND if a rebase is not in progress,\n -1 on other errors." + }, + "description": "

Aborts a rebase that is currently in progress, resetting the repository\n and working directory to their state before rebase began.

\n", + "comments": "", + "group": "rebase" + }, + "git_rebase_finish": { + "type": "function", + "file": "rebase.h", + "line": 277, + "lineto": 279, + "args": [ + { + "name": "rebase", + "type": "git_rebase *", + "comment": "The rebase that is in-progress" + }, + { + "name": "signature", + "type": "const git_signature *", + "comment": "The identity that is finishing the rebase (optional)" + } + ], + "argline": "git_rebase *rebase, const git_signature *signature", + "sig": "git_rebase *::const git_signature *", + "return": { + "type": "int", + "comment": " Zero on success; -1 on error" + }, + "description": "

Finishes a rebase that is currently in progress once all patches have\n been applied.

\n", + "comments": "", + "group": "rebase" + }, + "git_rebase_free": { + "type": "function", + "file": "rebase.h", + "line": 286, + "lineto": 286, + "args": [ + { + "name": "rebase", + "type": "git_rebase *", + "comment": "The rebase object" + } + ], + "argline": "git_rebase *rebase", + "sig": "git_rebase *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Frees the git_rebase object.

\n", + "comments": "", + "group": "rebase" + }, + "git_refdb_new": { + "type": "function", + "file": "refdb.h", + "line": 35, + "lineto": 35, + "args": [ + { + "name": "out", + "type": "git_refdb **", + "comment": "location to store the database pointer, if opened.\n\t\t\tSet to NULL if the open failed." + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "the repository" + } + ], + "argline": "git_refdb **out, git_repository *repo", + "sig": "git_refdb **::git_repository *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Create a new reference database with no backends.

\n", + "comments": "

Before the Ref DB can be used for read/writing, a custom database\n backend must be manually set using git_refdb_set_backend()

\n", + "group": "refdb" + }, + "git_refdb_open": { + "type": "function", + "file": "refdb.h", + "line": 49, + "lineto": 49, + "args": [ + { + "name": "out", + "type": "git_refdb **", + "comment": "location to store the database pointer, if opened.\n\t\t\tSet to NULL if the open failed." + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "the repository" + } + ], + "argline": "git_refdb **out, git_repository *repo", + "sig": "git_refdb **::git_repository *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Create a new reference database and automatically add\n the default backends:

\n", + "comments": "
    \n
  • git_refdb_dir: read and write loose and packed refs\n from disk, assuming the repository dir as the folder
    • \n
\n", + "group": "refdb" + }, + "git_refdb_compress": { + "type": "function", + "file": "refdb.h", + "line": 56, + "lineto": 56, + "args": [ + { + "name": "refdb", + "type": "git_refdb *", + "comment": null + } + ], + "argline": "git_refdb *refdb", + "sig": "git_refdb *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Suggests that the given refdb compress or optimize its references.\n This mechanism is implementation specific. For on-disk reference\n databases, for example, this may pack all loose references.

\n", + "comments": "", + "group": "refdb" + }, + "git_refdb_free": { + "type": "function", + "file": "refdb.h", + "line": 63, + "lineto": 63, + "args": [ + { + "name": "refdb", + "type": "git_refdb *", + "comment": "reference database pointer or NULL" + } + ], + "argline": "git_refdb *refdb", + "sig": "git_refdb *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Close an open reference database.

\n", + "comments": "", + "group": "refdb" + }, + "git_reflog_read": { + "type": "function", + "file": "reflog.h", + "line": 38, + "lineto": 38, + "args": [ + { + "name": "out", + "type": "git_reflog **", + "comment": "pointer to reflog" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "the repostiory" + }, + { + "name": "name", + "type": "const char *", + "comment": "reference to look up" + } + ], + "argline": "git_reflog **out, git_repository *repo, const char *name", + "sig": "git_reflog **::git_repository *::const char *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Read the reflog for the given reference

\n", + "comments": "

If there is no reflog file for the given\n reference yet, an empty reflog object will\n be returned.

\n\n

The reflog must be freed manually by using\n git_reflog_free().

\n", + "group": "reflog" + }, + "git_reflog_write": { + "type": "function", + "file": "reflog.h", + "line": 47, + "lineto": 47, + "args": [ + { + "name": "reflog", + "type": "git_reflog *", + "comment": "an existing reflog object" + } + ], + "argline": "git_reflog *reflog", + "sig": "git_reflog *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Write an existing in-memory reflog object back to disk\n using an atomic file lock.

\n", + "comments": "", + "group": "reflog" + }, + "git_reflog_append": { + "type": "function", + "file": "reflog.h", + "line": 60, + "lineto": 60, + "args": [ + { + "name": "reflog", + "type": "git_reflog *", + "comment": "an existing reflog object" + }, + { + "name": "id", + "type": "const git_oid *", + "comment": "the OID the reference is now pointing to" + }, + { + "name": "committer", + "type": "const git_signature *", + "comment": "the signature of the committer" + }, + { + "name": "msg", + "type": "const char *", + "comment": "the reflog message" + } + ], + "argline": "git_reflog *reflog, const git_oid *id, const git_signature *committer, const char *msg", + "sig": "git_reflog *::const git_oid *::const git_signature *::const char *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Add a new entry to the in-memory reflog.

\n", + "comments": "

msg is optional and can be NULL.

\n", + "group": "reflog" + }, + "git_reflog_rename": { + "type": "function", + "file": "reflog.h", + "line": 75, + "lineto": 75, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "the repository" + }, + { + "name": "old_name", + "type": "const char *", + "comment": "the old name of the reference" + }, + { + "name": "name", + "type": "const char *", + "comment": "the new name of the reference" + } + ], + "argline": "git_repository *repo, const char *old_name, const char *name", + "sig": "git_repository *::const char *::const char *", + "return": { + "type": "int", + "comment": " 0 on success, GIT_EINVALIDSPEC or an error code" + }, + "description": "

Rename a reflog

\n", + "comments": "

The reflog to be renamed is expected to already exist

\n\n

The new name will be checked for validity.\n See git_reference_create_symbolic() for rules about valid names.

\n", + "group": "reflog" + }, + "git_reflog_delete": { + "type": "function", + "file": "reflog.h", + "line": 84, + "lineto": 84, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "the repository" + }, + { + "name": "name", + "type": "const char *", + "comment": "the reflog to delete" + } + ], + "argline": "git_repository *repo, const char *name", + "sig": "git_repository *::const char *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Delete the reflog for the given reference

\n", + "comments": "", + "group": "reflog" + }, + "git_reflog_entrycount": { + "type": "function", + "file": "reflog.h", + "line": 92, + "lineto": 92, + "args": [ + { + "name": "reflog", + "type": "git_reflog *", + "comment": "the previously loaded reflog" + } + ], + "argline": "git_reflog *reflog", + "sig": "git_reflog *", + "return": { + "type": "size_t", + "comment": " the number of log entries" + }, + "description": "

Get the number of log entries in a reflog

\n", + "comments": "", + "group": "reflog" + }, + "git_reflog_entry_byindex": { + "type": "function", + "file": "reflog.h", + "line": 105, + "lineto": 105, + "args": [ + { + "name": "reflog", + "type": "const git_reflog *", + "comment": "a previously loaded reflog" + }, + { + "name": "idx", + "type": "size_t", + "comment": "the position of the entry to lookup. Should be greater than or\n equal to 0 (zero) and less than `git_reflog_entrycount()`." + } + ], + "argline": "const git_reflog *reflog, size_t idx", + "sig": "const git_reflog *::size_t", + "return": { + "type": "const git_reflog_entry *", + "comment": " the entry; NULL if not found" + }, + "description": "

Lookup an entry by its index

\n", + "comments": "

Requesting the reflog entry with an index of 0 (zero) will\n return the most recently created entry.

\n", + "group": "reflog" + }, + "git_reflog_drop": { + "type": "function", + "file": "reflog.h", + "line": 124, + "lineto": 127, + "args": [ + { + "name": "reflog", + "type": "git_reflog *", + "comment": "a previously loaded reflog." + }, + { + "name": "idx", + "type": "size_t", + "comment": "the position of the entry to remove. Should be greater than or\n equal to 0 (zero) and less than `git_reflog_entrycount()`." + }, + { + "name": "rewrite_previous_entry", + "type": "int", + "comment": "1 to rewrite the history; 0 otherwise." + } + ], + "argline": "git_reflog *reflog, size_t idx, int rewrite_previous_entry", + "sig": "git_reflog *::size_t::int", + "return": { + "type": "int", + "comment": " 0 on success, GIT_ENOTFOUND if the entry doesn't exist\n or an error code." + }, + "description": "

Remove an entry from the reflog by its index

\n", + "comments": "

To ensure there's no gap in the log history, set rewrite_previous_entry\n param value to 1. When deleting entry n, member old_oid of entry n-1\n (if any) will be updated with the value of member new_oid of entry n+1.

\n", + "group": "reflog" + }, + "git_reflog_entry_id_old": { + "type": "function", + "file": "reflog.h", + "line": 135, + "lineto": 135, + "args": [ + { + "name": "entry", + "type": "const git_reflog_entry *", + "comment": "a reflog entry" + } + ], + "argline": "const git_reflog_entry *entry", + "sig": "const git_reflog_entry *", + "return": { + "type": "const git_oid *", + "comment": " the old oid" + }, + "description": "

Get the old oid

\n", + "comments": "", + "group": "reflog" + }, + "git_reflog_entry_id_new": { + "type": "function", + "file": "reflog.h", + "line": 143, + "lineto": 143, + "args": [ + { + "name": "entry", + "type": "const git_reflog_entry *", + "comment": "a reflog entry" + } + ], + "argline": "const git_reflog_entry *entry", + "sig": "const git_reflog_entry *", + "return": { + "type": "const git_oid *", + "comment": " the new oid at this time" + }, + "description": "

Get the new oid

\n", + "comments": "", + "group": "reflog" + }, + "git_reflog_entry_committer": { + "type": "function", + "file": "reflog.h", + "line": 151, + "lineto": 151, + "args": [ + { + "name": "entry", + "type": "const git_reflog_entry *", + "comment": "a reflog entry" + } + ], + "argline": "const git_reflog_entry *entry", + "sig": "const git_reflog_entry *", + "return": { + "type": "const git_signature *", + "comment": " the committer" + }, + "description": "

Get the committer of this entry

\n", + "comments": "", + "group": "reflog" + }, + "git_reflog_entry_message": { + "type": "function", + "file": "reflog.h", + "line": 159, + "lineto": 159, + "args": [ + { + "name": "entry", + "type": "const git_reflog_entry *", + "comment": "a reflog entry" + } + ], + "argline": "const git_reflog_entry *entry", + "sig": "const git_reflog_entry *", + "return": { + "type": "const char *", + "comment": " the log msg" + }, + "description": "

Get the log message

\n", + "comments": "", + "group": "reflog" + }, + "git_reflog_free": { + "type": "function", + "file": "reflog.h", + "line": 166, + "lineto": 166, + "args": [ + { + "name": "reflog", + "type": "git_reflog *", + "comment": "reflog to free" + } + ], + "argline": "git_reflog *reflog", + "sig": "git_reflog *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Free the reflog

\n", + "comments": "", + "group": "reflog" + }, + "git_reference_lookup": { + "type": "function", + "file": "refs.h", + "line": 37, + "lineto": 37, + "args": [ + { + "name": "out", + "type": "git_reference **", + "comment": "pointer to the looked-up reference" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "the repository to look up the reference" + }, + { + "name": "name", + "type": "const char *", + "comment": "the long name for the reference (e.g. HEAD, refs/heads/master, refs/tags/v0.1.0, ...)" + } + ], + "argline": "git_reference **out, git_repository *repo, const char *name", + "sig": "git_reference **::git_repository *::const char *", + "return": { + "type": "int", + "comment": " 0 on success, GIT_ENOTFOUND, GIT_EINVALIDSPEC or an error code." + }, + "description": "

Lookup a reference by name in a repository.

\n", + "comments": "

The returned reference must be freed by the user.

\n\n

The name will be checked for validity.\n See git_reference_symbolic_create() for rules about valid names.

\n", + "group": "reference", + "examples": { + "general.c": [ + "ex/v0.23.2/general.html#git_reference_lookup-53" + ] + } + }, + "git_reference_name_to_id": { + "type": "function", + "file": "refs.h", + "line": 54, + "lineto": 55, + "args": [ + { + "name": "out", + "type": "git_oid *", + "comment": "Pointer to oid to be filled in" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "The repository in which to look up the reference" + }, + { + "name": "name", + "type": "const char *", + "comment": "The long name for the reference (e.g. HEAD, refs/heads/master, refs/tags/v0.1.0, ...)" + } + ], + "argline": "git_oid *out, git_repository *repo, const char *name", + "sig": "git_oid *::git_repository *::const char *", + "return": { + "type": "int", + "comment": " 0 on success, GIT_ENOTFOUND, GIT_EINVALIDSPEC or an error code." + }, + "description": "

Lookup a reference by name and resolve immediately to OID.

\n", + "comments": "

This function provides a quick way to resolve a reference name straight\n through to the object id that it refers to. This avoids having to\n allocate or free any git_reference objects for simple situations.

\n\n

The name will be checked for validity.\n See git_reference_symbolic_create() for rules about valid names.

\n", + "group": "reference" + }, + "git_reference_dwim": { + "type": "function", + "file": "refs.h", + "line": 68, + "lineto": 68, + "args": [ + { + "name": "out", + "type": "git_reference **", + "comment": "pointer in which to store the reference" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "the repository in which to look" + }, + { + "name": "shorthand", + "type": "const char *", + "comment": "the short name for the reference" + } + ], + "argline": "git_reference **out, git_repository *repo, const char *shorthand", + "sig": "git_reference **::git_repository *::const char *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Lookup a reference by DWIMing its short name

\n", + "comments": "

Apply the git precendence rules to the given shorthand to determine\n which reference the user is referring to.

\n", + "group": "reference" + }, + "git_reference_symbolic_create_matching": { + "type": "function", + "file": "refs.h", + "line": 109, + "lineto": 109, + "args": [ + { + "name": "out", + "type": "git_reference **", + "comment": "Pointer to the newly created reference" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "Repository where that reference will live" + }, + { + "name": "name", + "type": "const char *", + "comment": "The name of the reference" + }, + { + "name": "target", + "type": "const char *", + "comment": "The target of the reference" + }, + { + "name": "force", + "type": "int", + "comment": "Overwrite existing references" + }, + { + "name": "current_value", + "type": "const char *", + "comment": "The expected value of the reference when updating" + }, + { + "name": "log_message", + "type": "const char *", + "comment": "The one line long message to be appended to the reflog" + } + ], + "argline": "git_reference **out, git_repository *repo, const char *name, const char *target, int force, const char *current_value, const char *log_message", + "sig": "git_reference **::git_repository *::const char *::const char *::int::const char *::const char *", + "return": { + "type": "int", + "comment": " 0 on success, GIT_EEXISTS, GIT_EINVALIDSPEC, GIT_EMODIFIED or an error code" + }, + "description": "

Conditionally create a new symbolic reference.

\n", + "comments": "

A symbolic reference is a reference name that refers to another\n reference name. If the other name moves, the symbolic name will move,\n too. As a simple example, the "HEAD" reference might refer to\n "refs/heads/master" while on the "master" branch of a repository.

\n\n

The symbolic reference will be created in the repository and written to\n the disk. The generated reference object must be freed by the user.

\n\n

Valid reference names must follow one of two patterns:

\n\n
    \n
  1. Top-level names must contain only capital letters and underscores,\nand must begin and end with a letter. (e.g. "HEAD", "ORIG_HEAD").
    2. \n
  2. Names prefixed with "refs/" can be almost anything. You must avoid\nthe characters '~', '^', ':', '\n\\\n', '?', '[', and '*', and the\nsequences ".." and "\n@\n{" which have special meaning to revparse.
    3. \n
\n\n

This function will return an error if a reference already exists with the\n given name unless force is true, in which case it will be overwritten.

\n\n

The message for the reflog will be ignored if the reference does\n not belong in the standard set (HEAD, branches and remote-tracking\n branches) and it does not have a reflog.

\n\n

It will return GIT_EMODIFIED if the reference's value at the time\n of updating does not match the one passed through current_value\n (i.e. if the ref has changed since the user read it).

\n", + "group": "reference" + }, + "git_reference_symbolic_create": { + "type": "function", + "file": "refs.h", + "line": 145, + "lineto": 145, + "args": [ + { + "name": "out", + "type": "git_reference **", + "comment": "Pointer to the newly created reference" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "Repository where that reference will live" + }, + { + "name": "name", + "type": "const char *", + "comment": "The name of the reference" + }, + { + "name": "target", + "type": "const char *", + "comment": "The target of the reference" + }, + { + "name": "force", + "type": "int", + "comment": "Overwrite existing references" + }, + { + "name": "log_message", + "type": "const char *", + "comment": "The one line long message to be appended to the reflog" + } + ], + "argline": "git_reference **out, git_repository *repo, const char *name, const char *target, int force, const char *log_message", + "sig": "git_reference **::git_repository *::const char *::const char *::int::const char *", + "return": { + "type": "int", + "comment": " 0 on success, GIT_EEXISTS, GIT_EINVALIDSPEC or an error code" + }, + "description": "

Create a new symbolic reference.

\n", + "comments": "

A symbolic reference is a reference name that refers to another\n reference name. If the other name moves, the symbolic name will move,\n too. As a simple example, the "HEAD" reference might refer to\n "refs/heads/master" while on the "master" branch of a repository.

\n\n

The symbolic reference will be created in the repository and written to\n the disk. The generated reference object must be freed by the user.

\n\n

Valid reference names must follow one of two patterns:

\n\n
    \n
  1. Top-level names must contain only capital letters and underscores,\nand must begin and end with a letter. (e.g. "HEAD", "ORIG_HEAD").
    2. \n
  2. Names prefixed with "refs/" can be almost anything. You must avoid\nthe characters '~', '^', ':', '\n\\\n', '?', '[', and '*', and the\nsequences ".." and "\n@\n{" which have special meaning to revparse.
    3. \n
\n\n

This function will return an error if a reference already exists with the\n given name unless force is true, in which case it will be overwritten.

\n\n

The message for the reflog will be ignored if the reference does\n not belong in the standard set (HEAD, branches and remote-tracking\n branches) and it does not have a reflog.

\n", + "group": "reference" + }, + "git_reference_create": { + "type": "function", + "file": "refs.h", + "line": 182, + "lineto": 182, + "args": [ + { + "name": "out", + "type": "git_reference **", + "comment": "Pointer to the newly created reference" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "Repository where that reference will live" + }, + { + "name": "name", + "type": "const char *", + "comment": "The name of the reference" + }, + { + "name": "id", + "type": "const git_oid *", + "comment": "The object id pointed to by the reference." + }, + { + "name": "force", + "type": "int", + "comment": "Overwrite existing references" + }, + { + "name": "log_message", + "type": "const char *", + "comment": "The one line long message to be appended to the reflog" + } + ], + "argline": "git_reference **out, git_repository *repo, const char *name, const git_oid *id, int force, const char *log_message", + "sig": "git_reference **::git_repository *::const char *::const git_oid *::int::const char *", + "return": { + "type": "int", + "comment": " 0 on success, GIT_EEXISTS, GIT_EINVALIDSPEC or an error code" + }, + "description": "

Create a new direct reference.

\n", + "comments": "

A direct reference (also called an object id reference) refers directly\n to a specific object id (a.k.a. OID or SHA) in the repository. The id\n permanently refers to the object (although the reference itself can be\n moved). For example, in libgit2 the direct ref "refs/tags/v0.17.0"\n refers to OID 5b9fac39d8a76b9139667c26a63e6b3f204b3977.

\n\n

The direct reference will be created in the repository and written to\n the disk. The generated reference object must be freed by the user.

\n\n

Valid reference names must follow one of two patterns:

\n\n
    \n
  1. Top-level names must contain only capital letters and underscores,\nand must begin and end with a letter. (e.g. "HEAD", "ORIG_HEAD").
    2. \n
  2. Names prefixed with "refs/" can be almost anything. You must avoid\nthe characters '~', '^', ':', '\n\\\n', '?', '[', and '*', and the\nsequences ".." and "\n@\n{" which have special meaning to revparse.
    3. \n
\n\n

This function will return an error if a reference already exists with the\n given name unless force is true, in which case it will be overwritten.

\n\n

The message for the reflog will be ignored if the reference does\n not belong in the standard set (HEAD, branches and remote-tracking\n branches) and and it does not have a reflog.

\n", + "group": "reference" + }, + "git_reference_create_matching": { + "type": "function", + "file": "refs.h", + "line": 225, + "lineto": 225, + "args": [ + { + "name": "out", + "type": "git_reference **", + "comment": "Pointer to the newly created reference" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "Repository where that reference will live" + }, + { + "name": "name", + "type": "const char *", + "comment": "The name of the reference" + }, + { + "name": "id", + "type": "const git_oid *", + "comment": "The object id pointed to by the reference." + }, + { + "name": "force", + "type": "int", + "comment": "Overwrite existing references" + }, + { + "name": "current_id", + "type": "const git_oid *", + "comment": "The expected value of the reference at the time of update" + }, + { + "name": "log_message", + "type": "const char *", + "comment": "The one line long message to be appended to the reflog" + } + ], + "argline": "git_reference **out, git_repository *repo, const char *name, const git_oid *id, int force, const git_oid *current_id, const char *log_message", + "sig": "git_reference **::git_repository *::const char *::const git_oid *::int::const git_oid *::const char *", + "return": { + "type": "int", + "comment": " 0 on success, GIT_EMODIFIED if the value of the reference\n has changed, GIT_EEXISTS, GIT_EINVALIDSPEC or an error code" + }, + "description": "

Conditionally create new direct reference

\n", + "comments": "

A direct reference (also called an object id reference) refers directly\n to a specific object id (a.k.a. OID or SHA) in the repository. The id\n permanently refers to the object (although the reference itself can be\n moved). For example, in libgit2 the direct ref "refs/tags/v0.17.0"\n refers to OID 5b9fac39d8a76b9139667c26a63e6b3f204b3977.

\n\n

The direct reference will be created in the repository and written to\n the disk. The generated reference object must be freed by the user.

\n\n

Valid reference names must follow one of two patterns:

\n\n
    \n
  1. Top-level names must contain only capital letters and underscores,\nand must begin and end with a letter. (e.g. "HEAD", "ORIG_HEAD").
    2. \n
  2. Names prefixed with "refs/" can be almost anything. You must avoid\nthe characters '~', '^', ':', '\n\\\n', '?', '[', and '*', and the\nsequences ".." and "\n@\n{" which have special meaning to revparse.
    3. \n
\n\n

This function will return an error if a reference already exists with the\n given name unless force is true, in which case it will be overwritten.

\n\n

The message for the reflog will be ignored if the reference does\n not belong in the standard set (HEAD, branches and remote-tracking\n branches) and and it does not have a reflog.

\n\n

It will return GIT_EMODIFIED if the reference's value at the time\n of updating does not match the one passed through current_id\n (i.e. if the ref has changed since the user read it).

\n", + "group": "reference" + }, + "git_reference_target": { + "type": "function", + "file": "refs.h", + "line": 240, + "lineto": 240, + "args": [ + { + "name": "ref", + "type": "const git_reference *", + "comment": "The reference" + } + ], + "argline": "const git_reference *ref", + "sig": "const git_reference *", + "return": { + "type": "const git_oid *", + "comment": " a pointer to the oid if available, NULL otherwise" + }, + "description": "

Get the OID pointed to by a direct reference.

\n", + "comments": "

Only available if the reference is direct (i.e. an object id reference,\n not a symbolic one).

\n\n

To find the OID of a symbolic ref, call git_reference_resolve() and\n then this function (or maybe use git_reference_name_to_id() to\n directly resolve a reference name all the way through to an OID).

\n", + "group": "reference", + "examples": { + "general.c": [ + "ex/v0.23.2/general.html#git_reference_target-54" + ] + } + }, + "git_reference_target_peel": { + "type": "function", + "file": "refs.h", + "line": 251, + "lineto": 251, + "args": [ + { + "name": "ref", + "type": "const git_reference *", + "comment": "The reference" + } + ], + "argline": "const git_reference *ref", + "sig": "const git_reference *", + "return": { + "type": "const git_oid *", + "comment": " a pointer to the oid if available, NULL otherwise" + }, + "description": "

Return the peeled OID target of this reference.

\n", + "comments": "

This peeled OID only applies to direct references that point to\n a hard Tag object: it is the result of peeling such Tag.

\n", + "group": "reference" + }, + "git_reference_symbolic_target": { + "type": "function", + "file": "refs.h", + "line": 261, + "lineto": 261, + "args": [ + { + "name": "ref", + "type": "const git_reference *", + "comment": "The reference" + } + ], + "argline": "const git_reference *ref", + "sig": "const git_reference *", + "return": { + "type": "const char *", + "comment": " a pointer to the name if available, NULL otherwise" + }, + "description": "

Get full name to the reference pointed to by a symbolic reference.

\n", + "comments": "

Only available if the reference is symbolic.

\n", + "group": "reference", + "examples": { + "general.c": [ + "ex/v0.23.2/general.html#git_reference_symbolic_target-55" + ] + } + }, + "git_reference_type": { + "type": "function", + "file": "refs.h", + "line": 271, + "lineto": 271, + "args": [ + { + "name": "ref", + "type": "const git_reference *", + "comment": "The reference" + } + ], + "argline": "const git_reference *ref", + "sig": "const git_reference *", + "return": { + "type": "git_ref_t", + "comment": " the type" + }, + "description": "

Get the type of a reference.

\n", + "comments": "

Either direct (GIT_REF_OID) or symbolic (GIT_REF_SYMBOLIC)

\n", + "group": "reference", + "examples": { + "general.c": [ + "ex/v0.23.2/general.html#git_reference_type-56" + ] + } + }, + "git_reference_name": { + "type": "function", + "file": "refs.h", + "line": 281, + "lineto": 281, + "args": [ + { + "name": "ref", + "type": "const git_reference *", + "comment": "The reference" + } + ], + "argline": "const git_reference *ref", + "sig": "const git_reference *", + "return": { + "type": "const char *", + "comment": " the full name for the ref" + }, + "description": "

Get the full name of a reference.

\n", + "comments": "

See git_reference_symbolic_create() for rules about valid names.

\n", + "group": "reference" + }, + "git_reference_resolve": { + "type": "function", + "file": "refs.h", + "line": 299, + "lineto": 299, + "args": [ + { + "name": "out", + "type": "git_reference **", + "comment": "Pointer to the peeled reference" + }, + { + "name": "ref", + "type": "const git_reference *", + "comment": "The reference" + } + ], + "argline": "git_reference **out, const git_reference *ref", + "sig": "git_reference **::const git_reference *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Resolve a symbolic reference to a direct reference.

\n", + "comments": "

This method iteratively peels a symbolic reference until it resolves to\n a direct reference to an OID.

\n\n

The peeled reference is returned in the resolved_ref argument, and\n must be freed manually once it's no longer needed.

\n\n

If a direct reference is passed as an argument, a copy of that\n reference is returned. This copy must be manually freed too.

\n", + "group": "reference" + }, + "git_reference_owner": { + "type": "function", + "file": "refs.h", + "line": 307, + "lineto": 307, + "args": [ + { + "name": "ref", + "type": "const git_reference *", + "comment": "The reference" + } + ], + "argline": "const git_reference *ref", + "sig": "const git_reference *", + "return": { + "type": "git_repository *", + "comment": " a pointer to the repo" + }, + "description": "

Get the repository where a reference resides.

\n", + "comments": "", + "group": "reference" + }, + "git_reference_symbolic_set_target": { + "type": "function", + "file": "refs.h", + "line": 329, + "lineto": 333, + "args": [ + { + "name": "out", + "type": "git_reference **", + "comment": "Pointer to the newly created reference" + }, + { + "name": "ref", + "type": "git_reference *", + "comment": "The reference" + }, + { + "name": "target", + "type": "const char *", + "comment": "The new target for the reference" + }, + { + "name": "log_message", + "type": "const char *", + "comment": "The one line long message to be appended to the reflog" + } + ], + "argline": "git_reference **out, git_reference *ref, const char *target, const char *log_message", + "sig": "git_reference **::git_reference *::const char *::const char *", + "return": { + "type": "int", + "comment": " 0 on success, GIT_EINVALIDSPEC or an error code" + }, + "description": "

Create a new reference with the same name as the given reference but a\n different symbolic target. The reference must be a symbolic reference,\n otherwise this will fail.

\n", + "comments": "

The new reference will be written to disk, overwriting the given reference.

\n\n

The target name will be checked for validity.\n See git_reference_symbolic_create() for rules about valid names.

\n\n

The message for the reflog will be ignored if the reference does\n not belong in the standard set (HEAD, branches and remote-tracking\n branches) and and it does not have a reflog.

\n", + "group": "reference" + }, + "git_reference_set_target": { + "type": "function", + "file": "refs.h", + "line": 349, + "lineto": 353, + "args": [ + { + "name": "out", + "type": "git_reference **", + "comment": "Pointer to the newly created reference" + }, + { + "name": "ref", + "type": "git_reference *", + "comment": "The reference" + }, + { + "name": "id", + "type": "const git_oid *", + "comment": "The new target OID for the reference" + }, + { + "name": "log_message", + "type": "const char *", + "comment": "The one line long message to be appended to the reflog" + } + ], + "argline": "git_reference **out, git_reference *ref, const git_oid *id, const char *log_message", + "sig": "git_reference **::git_reference *::const git_oid *::const char *", + "return": { + "type": "int", + "comment": " 0 on success, GIT_EMODIFIED if the value of the reference\n has changed since it was read, or an error code" + }, + "description": "

Conditionally create a new reference with the same name as the given reference but a\n different OID target. The reference must be a direct reference, otherwise\n this will fail.

\n", + "comments": "

The new reference will be written to disk, overwriting the given reference.

\n", + "group": "reference" + }, + "git_reference_rename": { + "type": "function", + "file": "refs.h", + "line": 378, + "lineto": 383, + "args": [ + { + "name": "new_ref", + "type": "git_reference **", + "comment": null + }, + { + "name": "ref", + "type": "git_reference *", + "comment": "The reference to rename" + }, + { + "name": "new_name", + "type": "const char *", + "comment": "The new name for the reference" + }, + { + "name": "force", + "type": "int", + "comment": "Overwrite an existing reference" + }, + { + "name": "log_message", + "type": "const char *", + "comment": "The one line long message to be appended to the reflog" + } + ], + "argline": "git_reference **new_ref, git_reference *ref, const char *new_name, int force, const char *log_message", + "sig": "git_reference **::git_reference *::const char *::int::const char *", + "return": { + "type": "int", + "comment": " 0 on success, GIT_EINVALIDSPEC, GIT_EEXISTS or an error code" + }, + "description": "

Rename an existing reference.

\n", + "comments": "

This method works for both direct and symbolic references.

\n\n

The new name will be checked for validity.\n See git_reference_symbolic_create() for rules about valid names.

\n\n

If the force flag is not enabled, and there's already\n a reference with the given name, the renaming will fail.

\n\n

IMPORTANT:\n The user needs to write a proper reflog entry if the\n reflog is enabled for the repository. We only rename\n the reflog if it exists.

\n", + "group": "reference" + }, + "git_reference_delete": { + "type": "function", + "file": "refs.h", + "line": 398, + "lineto": 398, + "args": [ + { + "name": "ref", + "type": "git_reference *", + "comment": "The reference to remove" + } + ], + "argline": "git_reference *ref", + "sig": "git_reference *", + "return": { + "type": "int", + "comment": " 0, GIT_EMODIFIED or an error code" + }, + "description": "

Delete an existing reference.

\n", + "comments": "

This method works for both direct and symbolic references. The reference\n will be immediately removed on disk but the memory will not be freed.\n Callers must call git_reference_free.

\n\n

This function will return an error if the reference has changed\n from the time it was looked up.

\n", + "group": "reference" + }, + "git_reference_remove": { + "type": "function", + "file": "refs.h", + "line": 409, + "lineto": 409, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": null + }, + { + "name": "name", + "type": "const char *", + "comment": "The reference to remove" + } + ], + "argline": "git_repository *repo, const char *name", + "sig": "git_repository *::const char *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Delete an existing reference by name

\n", + "comments": "

This method removes the named reference from the repository without\n looking at its old value.

\n", + "group": "reference" + }, + "git_reference_list": { + "type": "function", + "file": "refs.h", + "line": 423, + "lineto": 423, + "args": [ + { + "name": "array", + "type": "git_strarray *", + "comment": "Pointer to a git_strarray structure where\n\t\tthe reference names will be stored" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "Repository where to find the refs" + } + ], + "argline": "git_strarray *array, git_repository *repo", + "sig": "git_strarray *::git_repository *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Fill a list with all the references that can be found in a repository.

\n", + "comments": "

The string array will be filled with the names of all references; these\n values are owned by the user and should be free'd manually when no\n longer needed, using git_strarray_free().

\n", + "group": "reference", + "examples": { + "general.c": [ + "ex/v0.23.2/general.html#git_reference_list-57" + ] + } + }, + "git_reference_foreach": { + "type": "function", + "file": "refs.h", + "line": 441, + "lineto": 444, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "Repository where to find the refs" + }, + { + "name": "callback", + "type": "git_reference_foreach_cb", + "comment": "Function which will be called for every listed ref" + }, + { + "name": "payload", + "type": "void *", + "comment": "Additional data to pass to the callback" + } + ], + "argline": "git_repository *repo, git_reference_foreach_cb callback, void *payload", + "sig": "git_repository *::git_reference_foreach_cb::void *", + "return": { + "type": "int", + "comment": " 0 on success, non-zero callback return value, or error code" + }, + "description": "

Perform a callback on each reference in the repository.

\n", + "comments": "

The callback function will be called for each reference in the\n repository, receiving the reference object and the payload value\n passed to this method. Returning a non-zero value from the callback\n will terminate the iteration.

\n", + "group": "reference" + }, + "git_reference_foreach_name": { + "type": "function", + "file": "refs.h", + "line": 459, + "lineto": 462, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "Repository where to find the refs" + }, + { + "name": "callback", + "type": "git_reference_foreach_name_cb", + "comment": "Function which will be called for every listed ref name" + }, + { + "name": "payload", + "type": "void *", + "comment": "Additional data to pass to the callback" + } + ], + "argline": "git_repository *repo, git_reference_foreach_name_cb callback, void *payload", + "sig": "git_repository *::git_reference_foreach_name_cb::void *", + "return": { + "type": "int", + "comment": " 0 on success, non-zero callback return value, or error code" + }, + "description": "

Perform a callback on the fully-qualified name of each reference.

\n", + "comments": "

The callback function will be called for each reference in the\n repository, receiving the name of the reference and the payload value\n passed to this method. Returning a non-zero value from the callback\n will terminate the iteration.

\n", + "group": "reference" + }, + "git_reference_free": { + "type": "function", + "file": "refs.h", + "line": 469, + "lineto": 469, + "args": [ + { + "name": "ref", + "type": "git_reference *", + "comment": "git_reference" + } + ], + "argline": "git_reference *ref", + "sig": "git_reference *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Free the given reference.

\n", + "comments": "", + "group": "reference", + "examples": { + "status.c": [ + "ex/v0.23.2/status.html#git_reference_free-3" + ] + } + }, + "git_reference_cmp": { + "type": "function", + "file": "refs.h", + "line": 478, + "lineto": 480, + "args": [ + { + "name": "ref1", + "type": "const git_reference *", + "comment": "The first git_reference" + }, + { + "name": "ref2", + "type": "const git_reference *", + "comment": "The second git_reference" + } + ], + "argline": "const git_reference *ref1, const git_reference *ref2", + "sig": "const git_reference *::const git_reference *", + "return": { + "type": "int", + "comment": " 0 if the same, else a stable but meaningless ordering." + }, + "description": "

Compare two references.

\n", + "comments": "", + "group": "reference" + }, + "git_reference_iterator_new": { + "type": "function", + "file": "refs.h", + "line": 489, + "lineto": 491, + "args": [ + { + "name": "out", + "type": "git_reference_iterator **", + "comment": "pointer in which to store the iterator" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "the repository" + } + ], + "argline": "git_reference_iterator **out, git_repository *repo", + "sig": "git_reference_iterator **::git_repository *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Create an iterator for the repo's references

\n", + "comments": "", + "group": "reference" + }, + "git_reference_iterator_glob_new": { + "type": "function", + "file": "refs.h", + "line": 502, + "lineto": 505, + "args": [ + { + "name": "out", + "type": "git_reference_iterator **", + "comment": "pointer in which to store the iterator" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "the repository" + }, + { + "name": "glob", + "type": "const char *", + "comment": "the glob to match against the reference names" + } + ], + "argline": "git_reference_iterator **out, git_repository *repo, const char *glob", + "sig": "git_reference_iterator **::git_repository *::const char *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Create an iterator for the repo's references that match the\n specified glob

\n", + "comments": "", + "group": "reference" + }, + "git_reference_next": { + "type": "function", + "file": "refs.h", + "line": 514, + "lineto": 514, + "args": [ + { + "name": "out", + "type": "git_reference **", + "comment": "pointer in which to store the reference" + }, + { + "name": "iter", + "type": "git_reference_iterator *", + "comment": "the iterator" + } + ], + "argline": "git_reference **out, git_reference_iterator *iter", + "sig": "git_reference **::git_reference_iterator *", + "return": { + "type": "int", + "comment": " 0, GIT_ITEROVER if there are no more; or an error code" + }, + "description": "

Get the next reference

\n", + "comments": "", + "group": "reference" + }, + "git_reference_next_name": { + "type": "function", + "file": "refs.h", + "line": 527, + "lineto": 527, + "args": [ + { + "name": "out", + "type": "const char **", + "comment": "pointer in which to store the string" + }, + { + "name": "iter", + "type": "git_reference_iterator *", + "comment": "the iterator" + } + ], + "argline": "const char **out, git_reference_iterator *iter", + "sig": "const char **::git_reference_iterator *", + "return": { + "type": "int", + "comment": " 0, GIT_ITEROVER if there are no more; or an error code" + }, + "description": "

Get the next reference's name

\n", + "comments": "

This function is provided for convenience in case only the names\n are interesting as it avoids the allocation of the git_reference\n object which git_reference_next() needs.

\n", + "group": "reference" + }, + "git_reference_iterator_free": { + "type": "function", + "file": "refs.h", + "line": 534, + "lineto": 534, + "args": [ + { + "name": "iter", + "type": "git_reference_iterator *", + "comment": "the iterator to free" + } + ], + "argline": "git_reference_iterator *iter", + "sig": "git_reference_iterator *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Free the iterator and its associated resources

\n", + "comments": "", + "group": "reference" + }, + "git_reference_foreach_glob": { + "type": "function", + "file": "refs.h", + "line": 554, + "lineto": 558, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "Repository where to find the refs" + }, + { + "name": "glob", + "type": "const char *", + "comment": "Pattern to match (fnmatch-style) against reference name." + }, + { + "name": "callback", + "type": "git_reference_foreach_name_cb", + "comment": "Function which will be called for every listed ref" + }, + { + "name": "payload", + "type": "void *", + "comment": "Additional data to pass to the callback" + } + ], + "argline": "git_repository *repo, const char *glob, git_reference_foreach_name_cb callback, void *payload", + "sig": "git_repository *::const char *::git_reference_foreach_name_cb::void *", + "return": { + "type": "int", + "comment": " 0 on success, GIT_EUSER on non-zero callback, or error code" + }, + "description": "

Perform a callback on each reference in the repository whose name\n matches the given pattern.

\n", + "comments": "

This function acts like git_reference_foreach() with an additional\n pattern match being applied to the reference name before issuing the\n callback function. See that function for more information.

\n\n

The pattern is matched using fnmatch or "glob" style where a '*' matches\n any sequence of letters, a '?' matches any letter, and square brackets\n can be used to define character ranges (such as "[0-9]" for digits).

\n", + "group": "reference" + }, + "git_reference_has_log": { + "type": "function", + "file": "refs.h", + "line": 568, + "lineto": 568, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "the repository" + }, + { + "name": "refname", + "type": "const char *", + "comment": "the reference's name" + } + ], + "argline": "git_repository *repo, const char *refname", + "sig": "git_repository *::const char *", + "return": { + "type": "int", + "comment": " 0 when no reflog can be found, 1 when it exists;\n otherwise an error code." + }, + "description": "

Check if a reflog exists for the specified reference.

\n", + "comments": "", + "group": "reference" + }, + "git_reference_ensure_log": { + "type": "function", + "file": "refs.h", + "line": 580, + "lineto": 580, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "the repository" + }, + { + "name": "refname", + "type": "const char *", + "comment": "the reference's name" + } + ], + "argline": "git_repository *repo, const char *refname", + "sig": "git_repository *::const char *", + "return": { + "type": "int", + "comment": " 0 or an error code." + }, + "description": "

Ensure there is a reflog for a particular reference.

\n", + "comments": "

Make sure that successive updates to the reference will append to\n its log.

\n", + "group": "reference" + }, + "git_reference_is_branch": { + "type": "function", + "file": "refs.h", + "line": 590, + "lineto": 590, + "args": [ + { + "name": "ref", + "type": "const git_reference *", + "comment": "A git reference" + } + ], + "argline": "const git_reference *ref", + "sig": "const git_reference *", + "return": { + "type": "int", + "comment": " 1 when the reference lives in the refs/heads\n namespace; 0 otherwise." + }, + "description": "

Check if a reference is a local branch.

\n", + "comments": "", + "group": "reference" + }, + "git_reference_is_remote": { + "type": "function", + "file": "refs.h", + "line": 600, + "lineto": 600, + "args": [ + { + "name": "ref", + "type": "const git_reference *", + "comment": "A git reference" + } + ], + "argline": "const git_reference *ref", + "sig": "const git_reference *", + "return": { + "type": "int", + "comment": " 1 when the reference lives in the refs/remotes\n namespace; 0 otherwise." + }, + "description": "

Check if a reference is a remote tracking branch

\n", + "comments": "", + "group": "reference" + }, + "git_reference_is_tag": { + "type": "function", + "file": "refs.h", + "line": 610, + "lineto": 610, + "args": [ + { + "name": "ref", + "type": "const git_reference *", + "comment": "A git reference" + } + ], + "argline": "const git_reference *ref", + "sig": "const git_reference *", + "return": { + "type": "int", + "comment": " 1 when the reference lives in the refs/tags\n namespace; 0 otherwise." + }, + "description": "

Check if a reference is a tag

\n", + "comments": "", + "group": "reference" + }, + "git_reference_is_note": { + "type": "function", + "file": "refs.h", + "line": 620, + "lineto": 620, + "args": [ + { + "name": "ref", + "type": "const git_reference *", + "comment": "A git reference" + } + ], + "argline": "const git_reference *ref", + "sig": "const git_reference *", + "return": { + "type": "int", + "comment": " 1 when the reference lives in the refs/notes\n namespace; 0 otherwise." + }, + "description": "

Check if a reference is a note

\n", + "comments": "", + "group": "reference" + }, + "git_reference_normalize_name": { + "type": "function", + "file": "refs.h", + "line": 676, + "lineto": 680, + "args": [ + { + "name": "buffer_out", + "type": "char *", + "comment": "User allocated buffer to store normalized name" + }, + { + "name": "buffer_size", + "type": "size_t", + "comment": "Size of buffer_out" + }, + { + "name": "name", + "type": "const char *", + "comment": "Reference name to be checked." + }, + { + "name": "flags", + "type": "unsigned int", + "comment": "Flags to constrain name validation rules - see the\n GIT_REF_FORMAT constants above." + } + ], + "argline": "char *buffer_out, size_t buffer_size, const char *name, unsigned int flags", + "sig": "char *::size_t::const char *::unsigned int", + "return": { + "type": "int", + "comment": " 0 on success, GIT_EBUFS if buffer is too small, GIT_EINVALIDSPEC\n or an error code." + }, + "description": "

Normalize reference name and check validity.

\n", + "comments": "

This will normalize the reference name by removing any leading slash\n '/' characters and collapsing runs of adjacent slashes between name\n components into a single slash.

\n\n

Once normalized, if the reference name is valid, it will be returned in\n the user allocated buffer.

\n\n

See git_reference_symbolic_create() for rules about valid names.

\n", + "group": "reference" + }, + "git_reference_peel": { + "type": "function", + "file": "refs.h", + "line": 697, + "lineto": 700, + "args": [ + { + "name": "out", + "type": "git_object **", + "comment": "Pointer to the peeled git_object" + }, + { + "name": "ref", + "type": "git_reference *", + "comment": "The reference to be processed" + }, + { + "name": "type", + "type": "git_otype", + "comment": "The type of the requested object (GIT_OBJ_COMMIT,\n GIT_OBJ_TAG, GIT_OBJ_TREE, GIT_OBJ_BLOB or GIT_OBJ_ANY)." + } + ], + "argline": "git_object **out, git_reference *ref, git_otype type", + "sig": "git_object **::git_reference *::git_otype", + "return": { + "type": "int", + "comment": " 0 on success, GIT_EAMBIGUOUS, GIT_ENOTFOUND or an error code" + }, + "description": "

Recursively peel reference until object of the specified type is found.

\n", + "comments": "

The retrieved peeled object is owned by the repository\n and should be closed with the git_object_free method.

\n\n

If you pass GIT_OBJ_ANY as the target type, then the object\n will be peeled until a non-tag object is met.

\n", + "group": "reference" + }, + "git_reference_is_valid_name": { + "type": "function", + "file": "refs.h", + "line": 716, + "lineto": 716, + "args": [ + { + "name": "refname", + "type": "const char *", + "comment": "name to be checked." + } + ], + "argline": "const char *refname", + "sig": "const char *", + "return": { + "type": "int", + "comment": " 1 if the reference name is acceptable; 0 if it isn't" + }, + "description": "

Ensure the reference name is well-formed.

\n", + "comments": "

Valid reference names must follow one of two patterns:

\n\n
    \n
  1. Top-level names must contain only capital letters and underscores,\nand must begin and end with a letter. (e.g. "HEAD", "ORIG_HEAD").
    2. \n
  2. Names prefixed with "refs/" can be almost anything. You must avoid\nthe characters '~', '^', ':', '\n\\\n', '?', '[', and '*', and the\nsequences ".." and "\n@\n{" which have special meaning to revparse.
    3. \n
\n", + "group": "reference" + }, + "git_reference_shorthand": { + "type": "function", + "file": "refs.h", + "line": 730, + "lineto": 730, + "args": [ + { + "name": "ref", + "type": "const git_reference *", + "comment": "a reference" + } + ], + "argline": "const git_reference *ref", + "sig": "const git_reference *", + "return": { + "type": "const char *", + "comment": " the human-readable version of the name" + }, + "description": "

Get the reference's short name

\n", + "comments": "

This will transform the reference name into a name "human-readable"\n version. If no shortname is appropriate, it will return the full\n name.

\n\n

The memory is owned by the reference and must not be freed.

\n", + "group": "reference", + "examples": { + "status.c": [ + "ex/v0.23.2/status.html#git_reference_shorthand-4" + ] + } + }, + "git_refspec_src": { + "type": "function", + "file": "refspec.h", + "line": 30, + "lineto": 30, + "args": [ + { + "name": "refspec", + "type": "const git_refspec *", + "comment": "the refspec" + } + ], + "argline": "const git_refspec *refspec", + "sig": "const git_refspec *", + "return": { + "type": "const char *", + "comment": " the refspec's source specifier" + }, + "description": "

Get the source specifier

\n", + "comments": "", + "group": "refspec" + }, + "git_refspec_dst": { + "type": "function", + "file": "refspec.h", + "line": 38, + "lineto": 38, + "args": [ + { + "name": "refspec", + "type": "const git_refspec *", + "comment": "the refspec" + } + ], + "argline": "const git_refspec *refspec", + "sig": "const git_refspec *", + "return": { + "type": "const char *", + "comment": " the refspec's destination specifier" + }, + "description": "

Get the destination specifier

\n", + "comments": "", + "group": "refspec" + }, + "git_refspec_string": { + "type": "function", + "file": "refspec.h", + "line": 46, + "lineto": 46, + "args": [ + { + "name": "refspec", + "type": "const git_refspec *", + "comment": "the refspec" + } + ], + "argline": "const git_refspec *refspec", + "sig": "const git_refspec *", + "return": { + "type": "const char *", + "comment": null + }, + "description": "

Get the refspec's string

\n", + "comments": "", + "group": "refspec" + }, + "git_refspec_force": { + "type": "function", + "file": "refspec.h", + "line": 54, + "lineto": 54, + "args": [ + { + "name": "refspec", + "type": "const git_refspec *", + "comment": "the refspec" + } + ], + "argline": "const git_refspec *refspec", + "sig": "const git_refspec *", + "return": { + "type": "int", + "comment": " 1 if force update has been set, 0 otherwise" + }, + "description": "

Get the force update setting

\n", + "comments": "", + "group": "refspec" + }, + "git_refspec_direction": { + "type": "function", + "file": "refspec.h", + "line": 62, + "lineto": 62, + "args": [ + { + "name": "spec", + "type": "const git_refspec *", + "comment": "refspec" + } + ], + "argline": "const git_refspec *spec", + "sig": "const git_refspec *", + "return": { + "type": "git_direction", + "comment": " GIT_DIRECTION_FETCH or GIT_DIRECTION_PUSH" + }, + "description": "

Get the refspec's direction.

\n", + "comments": "", + "group": "refspec" + }, + "git_refspec_src_matches": { + "type": "function", + "file": "refspec.h", + "line": 71, + "lineto": 71, + "args": [ + { + "name": "refspec", + "type": "const git_refspec *", + "comment": "the refspec" + }, + { + "name": "refname", + "type": "const char *", + "comment": "the name of the reference to check" + } + ], + "argline": "const git_refspec *refspec, const char *refname", + "sig": "const git_refspec *::const char *", + "return": { + "type": "int", + "comment": " 1 if the refspec matches, 0 otherwise" + }, + "description": "

Check if a refspec's source descriptor matches a reference

\n", + "comments": "", + "group": "refspec" + }, + "git_refspec_dst_matches": { + "type": "function", + "file": "refspec.h", + "line": 80, + "lineto": 80, + "args": [ + { + "name": "refspec", + "type": "const git_refspec *", + "comment": "the refspec" + }, + { + "name": "refname", + "type": "const char *", + "comment": "the name of the reference to check" + } + ], + "argline": "const git_refspec *refspec, const char *refname", + "sig": "const git_refspec *::const char *", + "return": { + "type": "int", + "comment": " 1 if the refspec matches, 0 otherwise" + }, + "description": "

Check if a refspec's destination descriptor matches a reference

\n", + "comments": "", + "group": "refspec" + }, + "git_refspec_transform": { + "type": "function", + "file": "refspec.h", + "line": 90, + "lineto": 90, + "args": [ + { + "name": "out", + "type": "git_buf *", + "comment": "where to store the target name" + }, + { + "name": "spec", + "type": "const git_refspec *", + "comment": "the refspec" + }, + { + "name": "name", + "type": "const char *", + "comment": "the name of the reference to transform" + } + ], + "argline": "git_buf *out, const git_refspec *spec, const char *name", + "sig": "git_buf *::const git_refspec *::const char *", + "return": { + "type": "int", + "comment": " 0, GIT_EBUFS or another error" + }, + "description": "

Transform a reference to its target following the refspec's rules

\n", + "comments": "", + "group": "refspec" + }, + "git_refspec_rtransform": { + "type": "function", + "file": "refspec.h", + "line": 100, + "lineto": 100, + "args": [ + { + "name": "out", + "type": "git_buf *", + "comment": "where to store the source reference name" + }, + { + "name": "spec", + "type": "const git_refspec *", + "comment": "the refspec" + }, + { + "name": "name", + "type": "const char *", + "comment": "the name of the reference to transform" + } + ], + "argline": "git_buf *out, const git_refspec *spec, const char *name", + "sig": "git_buf *::const git_refspec *::const char *", + "return": { + "type": "int", + "comment": " 0, GIT_EBUFS or another error" + }, + "description": "

Transform a target reference to its source reference following the refspec's rules

\n", + "comments": "", + "group": "refspec" + }, + "git_remote_create": { + "type": "function", + "file": "remote.h", + "line": 39, + "lineto": 43, + "args": [ + { + "name": "out", + "type": "git_remote **", + "comment": "the resulting remote" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "the repository in which to create the remote" + }, + { + "name": "name", + "type": "const char *", + "comment": "the remote's name" + }, + { + "name": "url", + "type": "const char *", + "comment": "the remote's url" + } + ], + "argline": "git_remote **out, git_repository *repo, const char *name, const char *url", + "sig": "git_remote **::git_repository *::const char *::const char *", + "return": { + "type": "int", + "comment": " 0, GIT_EINVALIDSPEC, GIT_EEXISTS or an error code" + }, + "description": "

Add a remote with the default fetch refspec to the repository's configuration.

\n", + "comments": "", + "group": "remote", + "examples": { + "remote.c": [ + "ex/v0.23.2/remote.html#git_remote_create-4" + ] + } + }, + "git_remote_create_with_fetchspec": { + "type": "function", + "file": "remote.h", + "line": 56, + "lineto": 61, + "args": [ + { + "name": "out", + "type": "git_remote **", + "comment": "the resulting remote" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "the repository in which to create the remote" + }, + { + "name": "name", + "type": "const char *", + "comment": "the remote's name" + }, + { + "name": "url", + "type": "const char *", + "comment": "the remote's url" + }, + { + "name": "fetch", + "type": "const char *", + "comment": "the remote fetch value" + } + ], + "argline": "git_remote **out, git_repository *repo, const char *name, const char *url, const char *fetch", + "sig": "git_remote **::git_repository *::const char *::const char *::const char *", + "return": { + "type": "int", + "comment": " 0, GIT_EINVALIDSPEC, GIT_EEXISTS or an error code" + }, + "description": "

Add a remote with the provided fetch refspec (or default if NULL) to the repository's\n configuration.

\n", + "comments": "", + "group": "remote" + }, + "git_remote_create_anonymous": { + "type": "function", + "file": "remote.h", + "line": 74, + "lineto": 77, + "args": [ + { + "name": "out", + "type": "git_remote **", + "comment": "pointer to the new remote objects" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "the associated repository" + }, + { + "name": "url", + "type": "const char *", + "comment": "the remote repository's URL" + } + ], + "argline": "git_remote **out, git_repository *repo, const char *url", + "sig": "git_remote **::git_repository *::const char *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Create an anonymous remote

\n", + "comments": "

Create a remote with the given url in-memory. You can use this when\n you have a URL instead of a remote's name.

\n", + "group": "remote", + "examples": { + "network/fetch.c": [ + "ex/v0.23.2/network/fetch.html#git_remote_create_anonymous-4" + ], + "network/ls-remote.c": [ + "ex/v0.23.2/network/ls-remote.html#git_remote_create_anonymous-2" + ] + } + }, + "git_remote_lookup": { + "type": "function", + "file": "remote.h", + "line": 90, + "lineto": 90, + "args": [ + { + "name": "out", + "type": "git_remote **", + "comment": "pointer to the new remote object" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "the associated repository" + }, + { + "name": "name", + "type": "const char *", + "comment": "the remote's name" + } + ], + "argline": "git_remote **out, git_repository *repo, const char *name", + "sig": "git_remote **::git_repository *::const char *", + "return": { + "type": "int", + "comment": " 0, GIT_ENOTFOUND, GIT_EINVALIDSPEC or an error code" + }, + "description": "

Get the information for a particular remote

\n", + "comments": "

The name will be checked for validity.\n See git_tag_create() for rules about valid names.

\n", + "group": "remote", + "examples": { + "network/fetch.c": [ + "ex/v0.23.2/network/fetch.html#git_remote_lookup-5" + ], + "network/ls-remote.c": [ + "ex/v0.23.2/network/ls-remote.html#git_remote_lookup-3" + ], + "remote.c": [ + "ex/v0.23.2/remote.html#git_remote_lookup-5" + ] + } + }, + "git_remote_dup": { + "type": "function", + "file": "remote.h", + "line": 102, + "lineto": 102, + "args": [ + { + "name": "dest", + "type": "git_remote **", + "comment": "pointer where to store the copy" + }, + { + "name": "source", + "type": "git_remote *", + "comment": "object to copy" + } + ], + "argline": "git_remote **dest, git_remote *source", + "sig": "git_remote **::git_remote *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Create a copy of an existing remote. All internal strings are also\n duplicated. Callbacks are not duplicated.

\n", + "comments": "

Call git_remote_free to free the data.

\n", + "group": "remote" + }, + "git_remote_owner": { + "type": "function", + "file": "remote.h", + "line": 110, + "lineto": 110, + "args": [ + { + "name": "remote", + "type": "const git_remote *", + "comment": "the remote" + } + ], + "argline": "const git_remote *remote", + "sig": "const git_remote *", + "return": { + "type": "git_repository *", + "comment": " a pointer to the repository" + }, + "description": "

Get the remote's repository

\n", + "comments": "", + "group": "remote" + }, + "git_remote_name": { + "type": "function", + "file": "remote.h", + "line": 118, + "lineto": 118, + "args": [ + { + "name": "remote", + "type": "const git_remote *", + "comment": "the remote" + } + ], + "argline": "const git_remote *remote", + "sig": "const git_remote *", + "return": { + "type": "const char *", + "comment": " a pointer to the name or NULL for in-memory remotes" + }, + "description": "

Get the remote's name

\n", + "comments": "", + "group": "remote" + }, + "git_remote_url": { + "type": "function", + "file": "remote.h", + "line": 129, + "lineto": 129, + "args": [ + { + "name": "remote", + "type": "const git_remote *", + "comment": "the remote" + } + ], + "argline": "const git_remote *remote", + "sig": "const git_remote *", + "return": { + "type": "const char *", + "comment": " a pointer to the url" + }, + "description": "

Get the remote's url

\n", + "comments": "

If url.*.insteadOf has been configured for this URL, it will\n return the modified URL.

\n", + "group": "remote", + "examples": { + "remote.c": [ + "ex/v0.23.2/remote.html#git_remote_url-6" + ] + } + }, + "git_remote_pushurl": { + "type": "function", + "file": "remote.h", + "line": 140, + "lineto": 140, + "args": [ + { + "name": "remote", + "type": "const git_remote *", + "comment": "the remote" + } + ], + "argline": "const git_remote *remote", + "sig": "const git_remote *", + "return": { + "type": "const char *", + "comment": " a pointer to the url or NULL if no special url for pushing is set" + }, + "description": "

Get the remote's url for pushing

\n", + "comments": "

If url.*.pushInsteadOf has been configured for this URL, it\n will return the modified URL.

\n", + "group": "remote", + "examples": { + "remote.c": [ + "ex/v0.23.2/remote.html#git_remote_pushurl-7" + ] + } + }, + "git_remote_set_url": { + "type": "function", + "file": "remote.h", + "line": 153, + "lineto": 153, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "the repository in which to perform the change" + }, + { + "name": "remote", + "type": "const char *", + "comment": "the remote's name" + }, + { + "name": "url", + "type": "const char *", + "comment": "the url to set" + } + ], + "argline": "git_repository *repo, const char *remote, const char *url", + "sig": "git_repository *::const char *::const char *", + "return": { + "type": "int", + "comment": " 0 or an error value" + }, + "description": "

Set the remote's url in the configuration

\n", + "comments": "

Remote objects already in memory will not be affected. This assumes\n the common case of a single-url remote and will otherwise return an error.

\n", + "group": "remote", + "examples": { + "remote.c": [ + "ex/v0.23.2/remote.html#git_remote_set_url-8" + ] + } + }, + "git_remote_set_pushurl": { + "type": "function", + "file": "remote.h", + "line": 166, + "lineto": 166, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "the repository in which to perform the change" + }, + { + "name": "remote", + "type": "const char *", + "comment": "the remote's name" + }, + { + "name": "url", + "type": "const char *", + "comment": "the url to set" + } + ], + "argline": "git_repository *repo, const char *remote, const char *url", + "sig": "git_repository *::const char *::const char *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Set the remote's url for pushing in the configuration.

\n", + "comments": "

Remote objects already in memory will not be affected. This assumes\n the common case of a single-url remote and will otherwise return an error.

\n", + "group": "remote", + "examples": { + "remote.c": [ + "ex/v0.23.2/remote.html#git_remote_set_pushurl-9" + ] + } + }, + "git_remote_add_fetch": { + "type": "function", + "file": "remote.h", + "line": 179, + "lineto": 179, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "the repository in which to change the configuration" + }, + { + "name": "remote", + "type": "const char *", + "comment": "the name of the remote to change" + }, + { + "name": "refspec", + "type": "const char *", + "comment": "the new fetch refspec" + } + ], + "argline": "git_repository *repo, const char *remote, const char *refspec", + "sig": "git_repository *::const char *::const char *", + "return": { + "type": "int", + "comment": " 0, GIT_EINVALIDSPEC if refspec is invalid or an error value" + }, + "description": "

Add a fetch refspec to the remote's configuration

\n", + "comments": "

Add the given refspec to the fetch list in the configuration. No\n loaded remote instances will be affected.

\n", + "group": "remote" + }, + "git_remote_get_fetch_refspecs": { + "type": "function", + "file": "remote.h", + "line": 190, + "lineto": 190, + "args": [ + { + "name": "array", + "type": "git_strarray *", + "comment": "pointer to the array in which to store the strings" + }, + { + "name": "remote", + "type": "const git_remote *", + "comment": "the remote to query" + } + ], + "argline": "git_strarray *array, const git_remote *remote", + "sig": "git_strarray *::const git_remote *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Get the remote's list of fetch refspecs

\n", + "comments": "

The memory is owned by the user and should be freed with\n git_strarray_free.

\n", + "group": "remote" + }, + "git_remote_add_push": { + "type": "function", + "file": "remote.h", + "line": 203, + "lineto": 203, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "the repository in which to change the configuration" + }, + { + "name": "remote", + "type": "const char *", + "comment": "the name of the remote to change" + }, + { + "name": "refspec", + "type": "const char *", + "comment": "the new push refspec" + } + ], + "argline": "git_repository *repo, const char *remote, const char *refspec", + "sig": "git_repository *::const char *::const char *", + "return": { + "type": "int", + "comment": " 0, GIT_EINVALIDSPEC if refspec is invalid or an error value" + }, + "description": "

Add a push refspec to the remote's configuration

\n", + "comments": "

Add the given refspec to the push list in the configuration. No\n loaded remote instances will be affected.

\n", + "group": "remote" + }, + "git_remote_get_push_refspecs": { + "type": "function", + "file": "remote.h", + "line": 214, + "lineto": 214, + "args": [ + { + "name": "array", + "type": "git_strarray *", + "comment": "pointer to the array in which to store the strings" + }, + { + "name": "remote", + "type": "const git_remote *", + "comment": "the remote to query" + } + ], + "argline": "git_strarray *array, const git_remote *remote", + "sig": "git_strarray *::const git_remote *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Get the remote's list of push refspecs

\n", + "comments": "

The memory is owned by the user and should be freed with\n git_strarray_free.

\n", + "group": "remote" + }, + "git_remote_refspec_count": { + "type": "function", + "file": "remote.h", + "line": 222, + "lineto": 222, + "args": [ + { + "name": "remote", + "type": "const git_remote *", + "comment": "the remote" + } + ], + "argline": "const git_remote *remote", + "sig": "const git_remote *", + "return": { + "type": "size_t", + "comment": " the amount of refspecs configured in this remote" + }, + "description": "

Get the number of refspecs for a remote

\n", + "comments": "", + "group": "remote" + }, + "git_remote_get_refspec": { + "type": "function", + "file": "remote.h", + "line": 231, + "lineto": 231, + "args": [ + { + "name": "remote", + "type": "const git_remote *", + "comment": "the remote to query" + }, + { + "name": "n", + "type": "size_t", + "comment": "the refspec to get" + } + ], + "argline": "const git_remote *remote, size_t n", + "sig": "const git_remote *::size_t", + "return": { + "type": "const git_refspec *", + "comment": " the nth refspec" + }, + "description": "

Get a refspec from the remote

\n", + "comments": "", + "group": "remote" + }, + "git_remote_connect": { + "type": "function", + "file": "remote.h", + "line": 246, + "lineto": 246, + "args": [ + { + "name": "remote", + "type": "git_remote *", + "comment": "the remote to connect to" + }, + { + "name": "direction", + "type": "git_direction", + "comment": "GIT_DIRECTION_FETCH if you want to fetch or\n GIT_DIRECTION_PUSH if you want to push" + }, + { + "name": "callbacks", + "type": "const git_remote_callbacks *", + "comment": "the callbacks to use for this connection" + } + ], + "argline": "git_remote *remote, git_direction direction, const git_remote_callbacks *callbacks", + "sig": "git_remote *::git_direction::const git_remote_callbacks *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Open a connection to a remote

\n", + "comments": "

The transport is selected based on the URL. The direction argument\n is due to a limitation of the git protocol (over TCP or SSH) which\n starts up a specific binary which can only do the one or the other.

\n", + "group": "remote", + "examples": { + "network/fetch.c": [ + "ex/v0.23.2/network/fetch.html#git_remote_connect-6" + ], + "network/ls-remote.c": [ + "ex/v0.23.2/network/ls-remote.html#git_remote_connect-4" + ] + } + }, + "git_remote_ls": { + "type": "function", + "file": "remote.h", + "line": 268, + "lineto": 268, + "args": [ + { + "name": "out", + "type": "const git_remote_head ***", + "comment": "pointer to the array" + }, + { + "name": "size", + "type": "size_t *", + "comment": "the number of remote heads" + }, + { + "name": "remote", + "type": "git_remote *", + "comment": "the remote" + } + ], + "argline": "const git_remote_head ***out, size_t *size, git_remote *remote", + "sig": "const git_remote_head ***::size_t *::git_remote *", + "return": { + "type": "int", + "comment": " 0 on success, or an error code" + }, + "description": "

Get the remote repository's reference advertisement list

\n", + "comments": "

Get the list of references with which the server responds to a new\n connection.

\n\n

The remote (or more exactly its transport) must have connected to\n the remote repository. This list is available as soon as the\n connection to the remote is initiated and it remains available\n after disconnecting.

\n\n

The memory belongs to the remote. The pointer will be valid as long\n as a new connection is not initiated, but it is recommended that\n you make a copy in order to make use of the data.

\n", + "group": "remote", + "examples": { + "network/ls-remote.c": [ + "ex/v0.23.2/network/ls-remote.html#git_remote_ls-5" + ] + } + }, + "git_remote_connected": { + "type": "function", + "file": "remote.h", + "line": 279, + "lineto": 279, + "args": [ + { + "name": "remote", + "type": "const git_remote *", + "comment": "the remote" + } + ], + "argline": "const git_remote *remote", + "sig": "const git_remote *", + "return": { + "type": "int", + "comment": " 1 if it's connected, 0 otherwise." + }, + "description": "

Check whether the remote is connected

\n", + "comments": "

Check whether the remote's underlying transport is connected to the\n remote host.

\n", + "group": "remote" + }, + "git_remote_stop": { + "type": "function", + "file": "remote.h", + "line": 289, + "lineto": 289, + "args": [ + { + "name": "remote", + "type": "git_remote *", + "comment": "the remote" + } + ], + "argline": "git_remote *remote", + "sig": "git_remote *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Cancel the operation

\n", + "comments": "

At certain points in its operation, the network code checks whether\n the operation has been cancelled and if so stops the operation.

\n", + "group": "remote" + }, + "git_remote_disconnect": { + "type": "function", + "file": "remote.h", + "line": 298, + "lineto": 298, + "args": [ + { + "name": "remote", + "type": "git_remote *", + "comment": "the remote to disconnect from" + } + ], + "argline": "git_remote *remote", + "sig": "git_remote *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Disconnect from the remote

\n", + "comments": "

Close the connection to the remote.

\n", + "group": "remote", + "examples": { + "network/fetch.c": [ + "ex/v0.23.2/network/fetch.html#git_remote_disconnect-7" + ] + } + }, + "git_remote_free": { + "type": "function", + "file": "remote.h", + "line": 308, + "lineto": 308, + "args": [ + { + "name": "remote", + "type": "git_remote *", + "comment": "the remote to free" + } + ], + "argline": "git_remote *remote", + "sig": "git_remote *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Free the memory associated with a remote

\n", + "comments": "

This also disconnects from the remote, if the connection\n has not been closed yet (using git_remote_disconnect).

\n", + "group": "remote", + "examples": { + "network/fetch.c": [ + "ex/v0.23.2/network/fetch.html#git_remote_free-8", + "ex/v0.23.2/network/fetch.html#git_remote_free-9" + ], + "network/ls-remote.c": [ + "ex/v0.23.2/network/ls-remote.html#git_remote_free-6" + ], + "remote.c": [ + "ex/v0.23.2/remote.html#git_remote_free-10" + ] + } + }, + "git_remote_list": { + "type": "function", + "file": "remote.h", + "line": 319, + "lineto": 319, + "args": [ + { + "name": "out", + "type": "git_strarray *", + "comment": "a string array which receives the names of the remotes" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "the repository to query" + } + ], + "argline": "git_strarray *out, git_repository *repo", + "sig": "git_strarray *::git_repository *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Get a list of the configured remotes for a repo

\n", + "comments": "

The string array must be freed by the user.

\n", + "group": "remote", + "examples": { + "remote.c": [ + "ex/v0.23.2/remote.html#git_remote_list-11" + ] + } + }, + "git_remote_init_callbacks": { + "type": "function", + "file": "remote.h", + "line": 470, + "lineto": 472, + "args": [ + { + "name": "opts", + "type": "git_remote_callbacks *", + "comment": "the `git_remote_callbacks` struct to initialize" + }, + { + "name": "version", + "type": "unsigned int", + "comment": "Version of struct; pass `GIT_REMOTE_CALLBACKS_VERSION`" + } + ], + "argline": "git_remote_callbacks *opts, unsigned int version", + "sig": "git_remote_callbacks *::unsigned int", + "return": { + "type": "int", + "comment": " Zero on success; -1 on failure." + }, + "description": "

Initializes a git_remote_callbacks with default values. Equivalent to\n creating an instance with GIT_REMOTE_CALLBACKS_INIT.

\n", + "comments": "", + "group": "remote" + }, + "git_fetch_init_options": { + "type": "function", + "file": "remote.h", + "line": 563, + "lineto": 565, + "args": [ + { + "name": "opts", + "type": "git_fetch_options *", + "comment": "the `git_push_options` instance to initialize." + }, + { + "name": "version", + "type": "unsigned int", + "comment": "the version of the struct; you should pass\n `GIT_FETCH_OPTIONS_VERSION` here." + } + ], + "argline": "git_fetch_options *opts, unsigned int version", + "sig": "git_fetch_options *::unsigned int", + "return": { + "type": "int", + "comment": " Zero on success; -1 on failure." + }, + "description": "

Initializes a git_fetch_options with default values. Equivalent to\n creating an instance with GIT_FETCH_OPTIONS_INIT.

\n", + "comments": "", + "group": "fetch" + }, + "git_push_init_options": { + "type": "function", + "file": "remote.h", + "line": 602, + "lineto": 604, + "args": [ + { + "name": "opts", + "type": "git_push_options *", + "comment": "the `git_push_options` instance to initialize." + }, + { + "name": "version", + "type": "unsigned int", + "comment": "the version of the struct; you should pass\n `GIT_PUSH_OPTIONS_VERSION` here." + } + ], + "argline": "git_push_options *opts, unsigned int version", + "sig": "git_push_options *::unsigned int", + "return": { + "type": "int", + "comment": " Zero on success; -1 on failure." + }, + "description": "

Initializes a git_push_options with default values. Equivalent to\n creating an instance with GIT_PUSH_OPTIONS_INIT.

\n", + "comments": "", + "group": "push" + }, + "git_remote_download": { + "type": "function", + "file": "remote.h", + "line": 622, + "lineto": 622, + "args": [ + { + "name": "remote", + "type": "git_remote *", + "comment": "the remote" + }, + { + "name": "refspecs", + "type": "const git_strarray *", + "comment": "the refspecs to use for this negotiation and\n download. Use NULL or an empty array to use the base refspecs" + }, + { + "name": "opts", + "type": "const git_fetch_options *", + "comment": "the options to use for this fetch" + } + ], + "argline": "git_remote *remote, const git_strarray *refspecs, const git_fetch_options *opts", + "sig": "git_remote *::const git_strarray *::const git_fetch_options *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Download and index the packfile

\n", + "comments": "

Connect to the remote if it hasn't been done yet, negotiate with\n the remote git which objects are missing, download and index the\n packfile.

\n\n

The .idx file will be created and both it and the packfile with be\n renamed to their final name.

\n", + "group": "remote", + "examples": { + "network/fetch.c": [ + "ex/v0.23.2/network/fetch.html#git_remote_download-10" + ] + } + }, + "git_remote_upload": { + "type": "function", + "file": "remote.h", + "line": 636, + "lineto": 636, + "args": [ + { + "name": "remote", + "type": "git_remote *", + "comment": "the remote" + }, + { + "name": "refspecs", + "type": "const git_strarray *", + "comment": "the refspecs to use for this negotiation and\n upload. Use NULL or an empty array to use the base refspecs" + }, + { + "name": "opts", + "type": "const git_push_options *", + "comment": "the options to use for this push" + } + ], + "argline": "git_remote *remote, const git_strarray *refspecs, const git_push_options *opts", + "sig": "git_remote *::const git_strarray *::const git_push_options *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Create a packfile and send it to the server

\n", + "comments": "

Connect to the remote if it hasn't been done yet, negotiate with\n the remote git which objects are missing, create a packfile with the missing objects and send it.

\n", + "group": "remote" + }, + "git_remote_update_tips": { + "type": "function", + "file": "remote.h", + "line": 652, + "lineto": 657, + "args": [ + { + "name": "remote", + "type": "git_remote *", + "comment": "the remote to update" + }, + { + "name": "callbacks", + "type": "const git_remote_callbacks *", + "comment": "pointer to the callback structure to use" + }, + { + "name": "update_fetchhead", + "type": "int", + "comment": "whether to write to FETCH_HEAD. Pass 1 to behave like git." + }, + { + "name": "download_tags", + "type": "git_remote_autotag_option_t", + "comment": "what the behaviour for downloading tags is for this fetch. This is\n ignored for push. This must be the same value passed to `git_remote_download()`." + }, + { + "name": "reflog_message", + "type": "const char *", + "comment": "The message to insert into the reflogs. If\n NULL and fetching, the default is \"fetch \n\", where \n is\n the name of the remote (or its url, for in-memory remotes). This\n parameter is ignored when pushing." + } + ], + "argline": "git_remote *remote, const git_remote_callbacks *callbacks, int update_fetchhead, git_remote_autotag_option_t download_tags, const char *reflog_message", + "sig": "git_remote *::const git_remote_callbacks *::int::git_remote_autotag_option_t::const char *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Update the tips to the new state

\n", + "comments": "", + "group": "remote", + "examples": { + "network/fetch.c": [ + "ex/v0.23.2/network/fetch.html#git_remote_update_tips-11" + ] + } + }, + "git_remote_fetch": { + "type": "function", + "file": "remote.h", + "line": 673, + "lineto": 677, + "args": [ + { + "name": "remote", + "type": "git_remote *", + "comment": "the remote to fetch from" + }, + { + "name": "refspecs", + "type": "const git_strarray *", + "comment": "the refspecs to use for this fetch. Pass NULL or an\n empty array to use the base refspecs." + }, + { + "name": "opts", + "type": "const git_fetch_options *", + "comment": "options to use for this fetch" + }, + { + "name": "reflog_message", + "type": "const char *", + "comment": "The message to insert into the reflogs. If NULL, the\n\t\t\t\t\t\t\t\t default is \"fetch\"" + } + ], + "argline": "git_remote *remote, const git_strarray *refspecs, const git_fetch_options *opts, const char *reflog_message", + "sig": "git_remote *::const git_strarray *::const git_fetch_options *::const char *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Download new data and update tips

\n", + "comments": "

Convenience function to connect to a remote, download the data,\n disconnect and update the remote-tracking branches.

\n", + "group": "remote" + }, + "git_remote_prune": { + "type": "function", + "file": "remote.h", + "line": 686, + "lineto": 686, + "args": [ + { + "name": "remote", + "type": "git_remote *", + "comment": "the remote to prune" + }, + { + "name": "callbacks", + "type": "const git_remote_callbacks *", + "comment": "callbacks to use for this prune" + } + ], + "argline": "git_remote *remote, const git_remote_callbacks *callbacks", + "sig": "git_remote *::const git_remote_callbacks *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Prune tracking refs that are no longer present on remote

\n", + "comments": "", + "group": "remote" + }, + "git_remote_push": { + "type": "function", + "file": "remote.h", + "line": 698, + "lineto": 700, + "args": [ + { + "name": "remote", + "type": "git_remote *", + "comment": "the remote to push to" + }, + { + "name": "refspecs", + "type": "const git_strarray *", + "comment": "the refspecs to use for pushing. If none are\n passed, the configured refspecs will be used" + }, + { + "name": "opts", + "type": "const git_push_options *", + "comment": "options to use for this push" + } + ], + "argline": "git_remote *remote, const git_strarray *refspecs, const git_push_options *opts", + "sig": "git_remote *::const git_strarray *::const git_push_options *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Perform a push

\n", + "comments": "

Peform all the steps from a push.

\n", + "group": "remote" + }, + "git_remote_stats": { + "type": "function", + "file": "remote.h", + "line": 705, + "lineto": 705, + "args": [ + { + "name": "remote", + "type": "git_remote *", + "comment": null + } + ], + "argline": "git_remote *remote", + "sig": "git_remote *", + "return": { + "type": "const git_transfer_progress *", + "comment": null + }, + "description": "

Get the statistics structure that is filled in by the fetch operation.

\n", + "comments": "", + "group": "remote", + "examples": { + "network/fetch.c": [ + "ex/v0.23.2/network/fetch.html#git_remote_stats-12" + ] + } + }, + "git_remote_autotag": { + "type": "function", + "file": "remote.h", + "line": 713, + "lineto": 713, + "args": [ + { + "name": "remote", + "type": "const git_remote *", + "comment": "the remote to query" + } + ], + "argline": "const git_remote *remote", + "sig": "const git_remote *", + "return": { + "type": "git_remote_autotag_option_t", + "comment": " the auto-follow setting" + }, + "description": "

Retrieve the tag auto-follow setting

\n", + "comments": "", + "group": "remote" + }, + "git_remote_set_autotag": { + "type": "function", + "file": "remote.h", + "line": 725, + "lineto": 725, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "the repository in which to make the change" + }, + { + "name": "remote", + "type": "const char *", + "comment": "the name of the remote" + }, + { + "name": "value", + "type": "git_remote_autotag_option_t", + "comment": "the new value to take." + } + ], + "argline": "git_repository *repo, const char *remote, git_remote_autotag_option_t value", + "sig": "git_repository *::const char *::git_remote_autotag_option_t", + "return": { + "type": "int", + "comment": null + }, + "description": "

Set the remote's tag following setting.

\n", + "comments": "

The change will be made in the configuration. No loaded remotes\n will be affected.

\n", + "group": "remote" + }, + "git_remote_prune_refs": { + "type": "function", + "file": "remote.h", + "line": 732, + "lineto": 732, + "args": [ + { + "name": "remote", + "type": "const git_remote *", + "comment": "the remote to query" + } + ], + "argline": "const git_remote *remote", + "sig": "const git_remote *", + "return": { + "type": "int", + "comment": " the ref-prune setting" + }, + "description": "

Retrieve the ref-prune setting

\n", + "comments": "", + "group": "remote" + }, + "git_remote_rename": { + "type": "function", + "file": "remote.h", + "line": 754, + "lineto": 758, + "args": [ + { + "name": "problems", + "type": "git_strarray *", + "comment": "non-default refspecs cannot be renamed and will be\n stored here for further processing by the caller. Always free this\n strarray on successful return." + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "the repository in which to rename" + }, + { + "name": "name", + "type": "const char *", + "comment": "the current name of the remote" + }, + { + "name": "new_name", + "type": "const char *", + "comment": "the new name the remote should bear" + } + ], + "argline": "git_strarray *problems, git_repository *repo, const char *name, const char *new_name", + "sig": "git_strarray *::git_repository *::const char *::const char *", + "return": { + "type": "int", + "comment": " 0, GIT_EINVALIDSPEC, GIT_EEXISTS or an error code" + }, + "description": "

Give the remote a new name

\n", + "comments": "

All remote-tracking branches and configuration settings\n for the remote are updated.

\n\n

The new name will be checked for validity.\n See git_tag_create() for rules about valid names.

\n\n

No loaded instances of a the remote with the old name will change\n their name or their list of refspecs.

\n", + "group": "remote", + "examples": { + "remote.c": [ + "ex/v0.23.2/remote.html#git_remote_rename-12" + ] + } + }, + "git_remote_is_valid_name": { + "type": "function", + "file": "remote.h", + "line": 766, + "lineto": 766, + "args": [ + { + "name": "remote_name", + "type": "const char *", + "comment": "name to be checked." + } + ], + "argline": "const char *remote_name", + "sig": "const char *", + "return": { + "type": "int", + "comment": " 1 if the reference name is acceptable; 0 if it isn't" + }, + "description": "

Ensure the remote name is well-formed.

\n", + "comments": "", + "group": "remote" + }, + "git_remote_delete": { + "type": "function", + "file": "remote.h", + "line": 778, + "lineto": 778, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "the repository in which to act" + }, + { + "name": "name", + "type": "const char *", + "comment": "the name of the remove to delete" + } + ], + "argline": "git_repository *repo, const char *name", + "sig": "git_repository *::const char *", + "return": { + "type": "int", + "comment": " 0 on success, or an error code." + }, + "description": "

Delete an existing persisted remote.

\n", + "comments": "

All remote-tracking branches and configuration settings\n for the remote will be removed.

\n", + "group": "remote", + "examples": { + "remote.c": [ + "ex/v0.23.2/remote.html#git_remote_delete-13" + ] + } + }, + "git_remote_default_branch": { + "type": "function", + "file": "remote.h", + "line": 796, + "lineto": 796, + "args": [ + { + "name": "out", + "type": "git_buf *", + "comment": "the buffern in which to store the reference name" + }, + { + "name": "remote", + "type": "git_remote *", + "comment": "the remote" + } + ], + "argline": "git_buf *out, git_remote *remote", + "sig": "git_buf *::git_remote *", + "return": { + "type": "int", + "comment": " 0, GIT_ENOTFOUND if the remote does not have any references\n or none of them point to HEAD's commit, or an error message." + }, + "description": "

Retrieve the name of the remote's default branch

\n", + "comments": "

The default branch of a repository is the branch which HEAD points\n to. If the remote does not support reporting this information\n directly, it performs the guess as git does; that is, if there are\n multiple branches which point to the same commit, the first one is\n chosen. If the master branch is a candidate, it wins.

\n\n

This function must only be called after connecting.

\n", + "group": "remote" + }, + "git_repository_open": { + "type": "function", + "file": "repository.h", + "line": 37, + "lineto": 37, + "args": [ + { + "name": "out", + "type": "git_repository **", + "comment": "pointer to the repo which will be opened" + }, + { + "name": "path", + "type": "const char *", + "comment": "the path to the repository" + } + ], + "argline": "git_repository **out, const char *path", + "sig": "git_repository **::const char *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Open a git repository.

\n", + "comments": "

The 'path' argument must point to either a git repository\n folder, or an existing work dir.

\n\n

The method will automatically detect if 'path' is a normal\n or bare repository or fail is 'path' is neither.

\n", + "group": "repository", + "examples": { + "general.c": [ + "ex/v0.23.2/general.html#git_repository_open-58" + ], + "network/git2.c": [ + "ex/v0.23.2/network/git2.html#git_repository_open-5" + ], + "remote.c": [ + "ex/v0.23.2/remote.html#git_repository_open-14" + ] + } + }, + "git_repository_wrap_odb": { + "type": "function", + "file": "repository.h", + "line": 50, + "lineto": 50, + "args": [ + { + "name": "out", + "type": "git_repository **", + "comment": "pointer to the repo" + }, + { + "name": "odb", + "type": "git_odb *", + "comment": "the object database to wrap" + } + ], + "argline": "git_repository **out, git_odb *odb", + "sig": "git_repository **::git_odb *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Create a "fake" repository to wrap an object database

\n", + "comments": "

Create a repository object to wrap an object database to be used\n with the API when all you have is an object database. This doesn't\n have any paths associated with it, so use with care.

\n", + "group": "repository" + }, + "git_repository_discover": { + "type": "function", + "file": "repository.h", + "line": 78, + "lineto": 82, + "args": [ + { + "name": "out", + "type": "git_buf *", + "comment": "A pointer to a user-allocated git_buf which will contain\n the found path." + }, + { + "name": "start_path", + "type": "const char *", + "comment": "The base path where the lookup starts." + }, + { + "name": "across_fs", + "type": "int", + "comment": "If true, then the lookup will not stop when a\n filesystem device change is detected while exploring parent directories." + }, + { + "name": "ceiling_dirs", + "type": "const char *", + "comment": "A GIT_PATH_LIST_SEPARATOR separated list of\n absolute symbolic link free paths. The lookup will stop when any\n of this paths is reached. Note that the lookup always performs on\n start_path no matter start_path appears in ceiling_dirs ceiling_dirs\n might be NULL (which is equivalent to an empty string)" + } + ], + "argline": "git_buf *out, const char *start_path, int across_fs, const char *ceiling_dirs", + "sig": "git_buf *::const char *::int::const char *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Look for a git repository and copy its path in the given buffer.\n The lookup start from base_path and walk across parent directories\n if nothing has been found. The lookup ends when the first repository\n is found, or when reaching a directory referenced in ceiling_dirs\n or when the filesystem changes (in case across_fs is true).

\n", + "comments": "

The method will automatically detect if the repository is bare\n (if there is a repository).

\n", + "group": "repository", + "examples": { + "remote.c": [ + "ex/v0.23.2/remote.html#git_repository_discover-15" + ] + } + }, + "git_repository_open_ext": { + "type": "function", + "file": "repository.h", + "line": 122, + "lineto": 126, + "args": [ + { + "name": "out", + "type": "git_repository **", + "comment": "Pointer to the repo which will be opened. This can\n actually be NULL if you only want to use the error code to\n see if a repo at this path could be opened." + }, + { + "name": "path", + "type": "const char *", + "comment": "Path to open as git repository. If the flags\n permit \"searching\", then this can be a path to a subdirectory\n inside the working directory of the repository." + }, + { + "name": "flags", + "type": "unsigned int", + "comment": "A combination of the GIT_REPOSITORY_OPEN flags above." + }, + { + "name": "ceiling_dirs", + "type": "const char *", + "comment": "A GIT_PATH_LIST_SEPARATOR delimited list of path\n prefixes at which the search for a containing repository should\n terminate." + } + ], + "argline": "git_repository **out, const char *path, unsigned int flags, const char *ceiling_dirs", + "sig": "git_repository **::const char *::unsigned int::const char *", + "return": { + "type": "int", + "comment": " 0 on success, GIT_ENOTFOUND if no repository could be found,\n or -1 if there was a repository but open failed for some reason\n (such as repo corruption or system errors)." + }, + "description": "

Find and open a repository with extended controls.

\n", + "comments": "", + "group": "repository", + "examples": { + "blame.c": [ + "ex/v0.23.2/blame.html#git_repository_open_ext-24" + ], + "cat-file.c": [ + "ex/v0.23.2/cat-file.html#git_repository_open_ext-31" + ], + "describe.c": [ + "ex/v0.23.2/describe.html#git_repository_open_ext-6" + ], + "diff.c": [ + "ex/v0.23.2/diff.html#git_repository_open_ext-15" + ], + "log.c": [ + "ex/v0.23.2/log.html#git_repository_open_ext-44", + "ex/v0.23.2/log.html#git_repository_open_ext-45" + ], + "rev-parse.c": [ + "ex/v0.23.2/rev-parse.html#git_repository_open_ext-16" + ], + "status.c": [ + "ex/v0.23.2/status.html#git_repository_open_ext-5" + ], + "tag.c": [ + "ex/v0.23.2/tag.html#git_repository_open_ext-11" + ] + } + }, + "git_repository_open_bare": { + "type": "function", + "file": "repository.h", + "line": 139, + "lineto": 139, + "args": [ + { + "name": "out", + "type": "git_repository **", + "comment": "Pointer to the repo which will be opened." + }, + { + "name": "bare_path", + "type": "const char *", + "comment": "Direct path to the bare repository" + } + ], + "argline": "git_repository **out, const char *bare_path", + "sig": "git_repository **::const char *", + "return": { + "type": "int", + "comment": " 0 on success, or an error code" + }, + "description": "

Open a bare repository on the serverside.

\n", + "comments": "

This is a fast open for bare repositories that will come in handy\n if you're e.g. hosting git repositories and need to access them\n efficiently

\n", + "group": "repository" + }, + "git_repository_free": { + "type": "function", + "file": "repository.h", + "line": 152, + "lineto": 152, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "repository handle to close. If NULL nothing occurs." + } + ], + "argline": "git_repository *repo", + "sig": "git_repository *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Free a previously allocated repository

\n", + "comments": "

Note that after a repository is free'd, all the objects it has spawned\n will still exist until they are manually closed by the user\n with git_object_free, but accessing any of the attributes of\n an object without a backing repository will result in undefined\n behavior

\n", + "group": "repository", + "examples": { + "blame.c": [ + "ex/v0.23.2/blame.html#git_repository_free-25" + ], + "cat-file.c": [ + "ex/v0.23.2/cat-file.html#git_repository_free-32" + ], + "describe.c": [ + "ex/v0.23.2/describe.html#git_repository_free-7" + ], + "diff.c": [ + "ex/v0.23.2/diff.html#git_repository_free-16" + ], + "general.c": [ + "ex/v0.23.2/general.html#git_repository_free-59" + ], + "init.c": [ + "ex/v0.23.2/init.html#git_repository_free-6" + ], + "log.c": [ + "ex/v0.23.2/log.html#git_repository_free-46" + ], + "network/clone.c": [ + "ex/v0.23.2/network/clone.html#git_repository_free-3" + ], + "network/git2.c": [ + "ex/v0.23.2/network/git2.html#git_repository_free-6" + ], + "rev-parse.c": [ + "ex/v0.23.2/rev-parse.html#git_repository_free-17" + ], + "status.c": [ + "ex/v0.23.2/status.html#git_repository_free-6" + ], + "tag.c": [ + "ex/v0.23.2/tag.html#git_repository_free-12" + ] + } + }, + "git_repository_init": { + "type": "function", + "file": "repository.h", + "line": 169, + "lineto": 172, + "args": [ + { + "name": "out", + "type": "git_repository **", + "comment": "pointer to the repo which will be created or reinitialized" + }, + { + "name": "path", + "type": "const char *", + "comment": "the path to the repository" + }, + { + "name": "is_bare", + "type": "unsigned int", + "comment": "if true, a Git repository without a working directory is\n\t\tcreated at the pointed path. If false, provided path will be\n\t\tconsidered as the working directory into which the .git directory\n\t\twill be created." + } + ], + "argline": "git_repository **out, const char *path, unsigned int is_bare", + "sig": "git_repository **::const char *::unsigned int", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Creates a new Git repository in the given folder.

\n", + "comments": "

TODO:\n - Reinit the repository

\n", + "group": "repository", + "examples": { + "init.c": [ + "ex/v0.23.2/init.html#git_repository_init-7" + ] + } + }, + "git_repository_init_init_options": { + "type": "function", + "file": "repository.h", + "line": 281, + "lineto": 283, + "args": [ + { + "name": "opts", + "type": "git_repository_init_options *", + "comment": "the `git_repository_init_options` struct to initialize" + }, + { + "name": "version", + "type": "unsigned int", + "comment": "Version of struct; pass `GIT_REPOSITORY_INIT_OPTIONS_VERSION`" + } + ], + "argline": "git_repository_init_options *opts, unsigned int version", + "sig": "git_repository_init_options *::unsigned int", + "return": { + "type": "int", + "comment": " Zero on success; -1 on failure." + }, + "description": "

Initializes a git_repository_init_options with default values. Equivalent\n to creating an instance with GIT_REPOSITORY_INIT_OPTIONS_INIT.

\n", + "comments": "", + "group": "repository" + }, + "git_repository_init_ext": { + "type": "function", + "file": "repository.h", + "line": 298, + "lineto": 301, + "args": [ + { + "name": "out", + "type": "git_repository **", + "comment": "Pointer to the repo which will be created or reinitialized." + }, + { + "name": "repo_path", + "type": "const char *", + "comment": "The path to the repository." + }, + { + "name": "opts", + "type": "git_repository_init_options *", + "comment": "Pointer to git_repository_init_options struct." + } + ], + "argline": "git_repository **out, const char *repo_path, git_repository_init_options *opts", + "sig": "git_repository **::const char *::git_repository_init_options *", + "return": { + "type": "int", + "comment": " 0 or an error code on failure." + }, + "description": "

Create a new Git repository in the given folder with extended controls.

\n", + "comments": "

This will initialize a new git repository (creating the repo_path\n if requested by flags) and working directory as needed. It will\n auto-detect the case sensitivity of the file system and if the\n file system supports file mode bits correctly.

\n", + "group": "repository", + "examples": { + "init.c": [ + "ex/v0.23.2/init.html#git_repository_init_ext-8" + ] + } + }, + "git_repository_head": { + "type": "function", + "file": "repository.h", + "line": 316, + "lineto": 316, + "args": [ + { + "name": "out", + "type": "git_reference **", + "comment": "pointer to the reference which will be retrieved" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "a repository object" + } + ], + "argline": "git_reference **out, git_repository *repo", + "sig": "git_reference **::git_repository *", + "return": { + "type": "int", + "comment": " 0 on success, GIT_EUNBORNBRANCH when HEAD points to a non existing\n branch, GIT_ENOTFOUND when HEAD is missing; an error code otherwise" + }, + "description": "

Retrieve and resolve the reference pointed at by HEAD.

\n", + "comments": "

The returned git_reference will be owned by caller and\n git_reference_free() must be called when done with it to release the\n allocated memory and prevent a leak.

\n", + "group": "repository", + "examples": { + "status.c": [ + "ex/v0.23.2/status.html#git_repository_head-7" + ] + } + }, + "git_repository_head_detached": { + "type": "function", + "file": "repository.h", + "line": 328, + "lineto": 328, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "Repo to test" + } + ], + "argline": "git_repository *repo", + "sig": "git_repository *", + "return": { + "type": "int", + "comment": " 1 if HEAD is detached, 0 if it's not; error code if there\n was an error." + }, + "description": "

Check if a repository's HEAD is detached

\n", + "comments": "

A repository's HEAD is detached when it points directly to a commit\n instead of a branch.

\n", + "group": "repository" + }, + "git_repository_head_unborn": { + "type": "function", + "file": "repository.h", + "line": 340, + "lineto": 340, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "Repo to test" + } + ], + "argline": "git_repository *repo", + "sig": "git_repository *", + "return": { + "type": "int", + "comment": " 1 if the current branch is unborn, 0 if it's not; error\n code if there was an error" + }, + "description": "

Check if the current branch is unborn

\n", + "comments": "

An unborn branch is one named from HEAD but which doesn't exist in\n the refs namespace, because it doesn't have any commit to point to.

\n", + "group": "repository" + }, + "git_repository_is_empty": { + "type": "function", + "file": "repository.h", + "line": 352, + "lineto": 352, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "Repo to test" + } + ], + "argline": "git_repository *repo", + "sig": "git_repository *", + "return": { + "type": "int", + "comment": " 1 if the repository is empty, 0 if it isn't, error code\n if the repository is corrupted" + }, + "description": "

Check if a repository is empty

\n", + "comments": "

An empty repository has just been initialized and contains no references\n apart from HEAD, which must be pointing to the unborn master branch.

\n", + "group": "repository" + }, + "git_repository_path": { + "type": "function", + "file": "repository.h", + "line": 363, + "lineto": 363, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "A repository object" + } + ], + "argline": "git_repository *repo", + "sig": "git_repository *", + "return": { + "type": "const char *", + "comment": " the path to the repository" + }, + "description": "

Get the path of this repository

\n", + "comments": "

This is the path of the .git folder for normal repositories,\n or of the repository itself for bare repositories.

\n", + "group": "repository", + "examples": { + "init.c": [ + "ex/v0.23.2/init.html#git_repository_path-9" + ], + "status.c": [ + "ex/v0.23.2/status.html#git_repository_path-8" + ] + } + }, + "git_repository_workdir": { + "type": "function", + "file": "repository.h", + "line": 374, + "lineto": 374, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "A repository object" + } + ], + "argline": "git_repository *repo", + "sig": "git_repository *", + "return": { + "type": "const char *", + "comment": " the path to the working dir, if it exists" + }, + "description": "

Get the path of the working directory for this repository

\n", + "comments": "

If the repository is bare, this function will always return\n NULL.

\n", + "group": "repository", + "examples": { + "init.c": [ + "ex/v0.23.2/init.html#git_repository_workdir-10" + ] + } + }, + "git_repository_set_workdir": { + "type": "function", + "file": "repository.h", + "line": 393, + "lineto": 394, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "A repository object" + }, + { + "name": "workdir", + "type": "const char *", + "comment": "The path to a working directory" + }, + { + "name": "update_gitlink", + "type": "int", + "comment": "Create/update gitlink in workdir and set config\n \"core.worktree\" (if workdir is not the parent of the .git directory)" + } + ], + "argline": "git_repository *repo, const char *workdir, int update_gitlink", + "sig": "git_repository *::const char *::int", + "return": { + "type": "int", + "comment": " 0, or an error code" + }, + "description": "

Set the path to the working directory for this repository

\n", + "comments": "

The working directory doesn't need to be the same one\n that contains the .git folder for this repository.

\n\n

If this repository is bare, setting its working directory\n will turn it into a normal repository, capable of performing\n all the common workdir operations (checkout, status, index\n manipulation, etc).

\n", + "group": "repository" + }, + "git_repository_is_bare": { + "type": "function", + "file": "repository.h", + "line": 402, + "lineto": 402, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "Repo to test" + } + ], + "argline": "git_repository *repo", + "sig": "git_repository *", + "return": { + "type": "int", + "comment": " 1 if the repository is bare, 0 otherwise." + }, + "description": "

Check if a repository is bare

\n", + "comments": "", + "group": "repository", + "examples": { + "status.c": [ + "ex/v0.23.2/status.html#git_repository_is_bare-9" + ] + } + }, + "git_repository_config": { + "type": "function", + "file": "repository.h", + "line": 418, + "lineto": 418, + "args": [ + { + "name": "out", + "type": "git_config **", + "comment": "Pointer to store the loaded configuration" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "A repository object" + } + ], + "argline": "git_config **out, git_repository *repo", + "sig": "git_config **::git_repository *", + "return": { + "type": "int", + "comment": " 0, or an error code" + }, + "description": "

Get the configuration file for this repository.

\n", + "comments": "

If a configuration file has not been set, the default\n config set for the repository will be returned, including\n global and system configurations (if they are available).

\n\n

The configuration file must be freed once it's no longer\n being used by the user.

\n", + "group": "repository" + }, + "git_repository_config_snapshot": { + "type": "function", + "file": "repository.h", + "line": 434, + "lineto": 434, + "args": [ + { + "name": "out", + "type": "git_config **", + "comment": "Pointer to store the loaded configuration" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "the repository" + } + ], + "argline": "git_config **out, git_repository *repo", + "sig": "git_config **::git_repository *", + "return": { + "type": "int", + "comment": " 0, or an error code" + }, + "description": "

Get a snapshot of the repository's configuration

\n", + "comments": "

Convenience function to take a snapshot from the repository's\n configuration. The contents of this snapshot will not change,\n even if the underlying config files are modified.

\n\n

The configuration file must be freed once it's no longer\n being used by the user.

\n", + "group": "repository" + }, + "git_repository_odb": { + "type": "function", + "file": "repository.h", + "line": 450, + "lineto": 450, + "args": [ + { + "name": "out", + "type": "git_odb **", + "comment": "Pointer to store the loaded ODB" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "A repository object" + } + ], + "argline": "git_odb **out, git_repository *repo", + "sig": "git_odb **::git_repository *", + "return": { + "type": "int", + "comment": " 0, or an error code" + }, + "description": "

Get the Object Database for this repository.

\n", + "comments": "

If a custom ODB has not been set, the default\n database for the repository will be returned (the one\n located in .git/objects).

\n\n

The ODB must be freed once it's no longer being used by\n the user.

\n", + "group": "repository", + "examples": { + "cat-file.c": [ + "ex/v0.23.2/cat-file.html#git_repository_odb-33" + ], + "general.c": [ + "ex/v0.23.2/general.html#git_repository_odb-60" + ] + } + }, + "git_repository_refdb": { + "type": "function", + "file": "repository.h", + "line": 466, + "lineto": 466, + "args": [ + { + "name": "out", + "type": "git_refdb **", + "comment": "Pointer to store the loaded refdb" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "A repository object" + } + ], + "argline": "git_refdb **out, git_repository *repo", + "sig": "git_refdb **::git_repository *", + "return": { + "type": "int", + "comment": " 0, or an error code" + }, + "description": "

Get the Reference Database Backend for this repository.

\n", + "comments": "

If a custom refsdb has not been set, the default database for\n the repository will be returned (the one that manipulates loose\n and packed references in the .git directory).

\n\n

The refdb must be freed once it's no longer being used by\n the user.

\n", + "group": "repository" + }, + "git_repository_index": { + "type": "function", + "file": "repository.h", + "line": 482, + "lineto": 482, + "args": [ + { + "name": "out", + "type": "git_index **", + "comment": "Pointer to store the loaded index" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "A repository object" + } + ], + "argline": "git_index **out, git_repository *repo", + "sig": "git_index **::git_repository *", + "return": { + "type": "int", + "comment": " 0, or an error code" + }, + "description": "

Get the Index file for this repository.

\n", + "comments": "

If a custom index has not been set, the default\n index for the repository will be returned (the one\n located in .git/index).

\n\n

The index must be freed once it's no longer being used by\n the user.

\n", + "group": "repository", + "examples": { + "general.c": [ + "ex/v0.23.2/general.html#git_repository_index-61" + ], + "init.c": [ + "ex/v0.23.2/init.html#git_repository_index-11" + ] + } + }, + "git_repository_message": { + "type": "function", + "file": "repository.h", + "line": 500, + "lineto": 500, + "args": [ + { + "name": "out", + "type": "git_buf *", + "comment": "git_buf to write data into" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "Repository to read prepared message from" + } + ], + "argline": "git_buf *out, git_repository *repo", + "sig": "git_buf *::git_repository *", + "return": { + "type": "int", + "comment": " 0, GIT_ENOTFOUND if no message exists or an error code" + }, + "description": "

Retrieve git's prepared message

\n", + "comments": "

Operations such as git revert/cherry-pick/merge with the -n option\n stop just short of creating a commit with the changes and save\n their prepared message in .git/MERGE_MSG so the next git-commit\n execution can present it to the user for them to amend if they\n wish.

\n\n

Use this function to get the contents of this file. Don't forget to\n remove the file after you create the commit.

\n", + "group": "repository" + }, + "git_repository_message_remove": { + "type": "function", + "file": "repository.h", + "line": 507, + "lineto": 507, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": null + } + ], + "argline": "git_repository *repo", + "sig": "git_repository *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Remove git's prepared message.

\n", + "comments": "

Remove the message that git_repository_message retrieves.

\n", + "group": "repository" + }, + "git_repository_state_cleanup": { + "type": "function", + "file": "repository.h", + "line": 516, + "lineto": 516, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "A repository object" + } + ], + "argline": "git_repository *repo", + "sig": "git_repository *", + "return": { + "type": "int", + "comment": " 0 on success, or error" + }, + "description": "

Remove all the metadata associated with an ongoing command like merge,\n revert, cherry-pick, etc. For example: MERGE_HEAD, MERGE_MSG, etc.

\n", + "comments": "", + "group": "repository" + }, + "git_repository_fetchhead_foreach": { + "type": "function", + "file": "repository.h", + "line": 535, + "lineto": 538, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "A repository object" + }, + { + "name": "callback", + "type": "git_repository_fetchhead_foreach_cb", + "comment": "Callback function" + }, + { + "name": "payload", + "type": "void *", + "comment": "Pointer to callback data (optional)" + } + ], + "argline": "git_repository *repo, git_repository_fetchhead_foreach_cb callback, void *payload", + "sig": "git_repository *::git_repository_fetchhead_foreach_cb::void *", + "return": { + "type": "int", + "comment": " 0 on success, non-zero callback return value, GIT_ENOTFOUND if\n there is no FETCH_HEAD file, or other error code." + }, + "description": "

Invoke 'callback' for each entry in the given FETCH_HEAD file.

\n", + "comments": "

Return a non-zero value from the callback to stop the loop.

\n", + "group": "repository" + }, + "git_repository_mergehead_foreach": { + "type": "function", + "file": "repository.h", + "line": 555, + "lineto": 558, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "A repository object" + }, + { + "name": "callback", + "type": "git_repository_mergehead_foreach_cb", + "comment": "Callback function" + }, + { + "name": "payload", + "type": "void *", + "comment": "Pointer to callback data (optional)" + } + ], + "argline": "git_repository *repo, git_repository_mergehead_foreach_cb callback, void *payload", + "sig": "git_repository *::git_repository_mergehead_foreach_cb::void *", + "return": { + "type": "int", + "comment": " 0 on success, non-zero callback return value, GIT_ENOTFOUND if\n there is no MERGE_HEAD file, or other error code." + }, + "description": "

If a merge is in progress, invoke 'callback' for each commit ID in the\n MERGE_HEAD file.

\n", + "comments": "

Return a non-zero value from the callback to stop the loop.

\n", + "group": "repository" + }, + "git_repository_hashfile": { + "type": "function", + "file": "repository.h", + "line": 583, + "lineto": 588, + "args": [ + { + "name": "out", + "type": "git_oid *", + "comment": "Output value of calculated SHA" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "Repository pointer" + }, + { + "name": "path", + "type": "const char *", + "comment": "Path to file on disk whose contents should be hashed. If the\n repository is not NULL, this can be a relative path." + }, + { + "name": "type", + "type": "git_otype", + "comment": "The object type to hash as (e.g. GIT_OBJ_BLOB)" + }, + { + "name": "as_path", + "type": "const char *", + "comment": "The path to use to look up filtering rules. If this is\n NULL, then the `path` parameter will be used instead. If\n this is passed as the empty string, then no filters will be\n applied when calculating the hash." + } + ], + "argline": "git_oid *out, git_repository *repo, const char *path, git_otype type, const char *as_path", + "sig": "git_oid *::git_repository *::const char *::git_otype::const char *", + "return": { + "type": "int", + "comment": " 0 on success, or an error code" + }, + "description": "

Calculate hash of file using repository filtering rules.

\n", + "comments": "

If you simply want to calculate the hash of a file on disk with no filters,\n you can just use the git_odb_hashfile() API. However, if you want to\n hash a file in the repository and you want to apply filtering rules (e.g.\n crlf filters) before generating the SHA, then use this function.

\n\n

Note: if the repository has core.safecrlf set to fail and the\n filtering triggers that failure, then this function will return an\n error and not calculate the hash of the file.

\n", + "group": "repository" + }, + "git_repository_set_head": { + "type": "function", + "file": "repository.h", + "line": 608, + "lineto": 610, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "Repository pointer" + }, + { + "name": "refname", + "type": "const char *", + "comment": "Canonical name of the reference the HEAD should point at" + } + ], + "argline": "git_repository *repo, const char *refname", + "sig": "git_repository *::const char *", + "return": { + "type": "int", + "comment": " 0 on success, or an error code" + }, + "description": "

Make the repository HEAD point to the specified reference.

\n", + "comments": "

If the provided reference points to a Tree or a Blob, the HEAD is\n unaltered and -1 is returned.

\n\n

If the provided reference points to a branch, the HEAD will point\n to that branch, staying attached, or become attached if it isn't yet.\n If the branch doesn't exist yet, no error will be return. The HEAD\n will then be attached to an unborn branch.

\n\n

Otherwise, the HEAD will be detached and will directly point to\n the Commit.

\n", + "group": "repository" + }, + "git_repository_set_head_detached": { + "type": "function", + "file": "repository.h", + "line": 628, + "lineto": 630, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "Repository pointer" + }, + { + "name": "commitish", + "type": "const git_oid *", + "comment": "Object id of the Commit the HEAD should point to" + } + ], + "argline": "git_repository *repo, const git_oid *commitish", + "sig": "git_repository *::const git_oid *", + "return": { + "type": "int", + "comment": " 0 on success, or an error code" + }, + "description": "

Make the repository HEAD directly point to the Commit.

\n", + "comments": "

If the provided committish cannot be found in the repository, the HEAD\n is unaltered and GIT_ENOTFOUND is returned.

\n\n

If the provided commitish cannot be peeled into a commit, the HEAD\n is unaltered and -1 is returned.

\n\n

Otherwise, the HEAD will eventually be detached and will directly point to\n the peeled Commit.

\n", + "group": "repository" + }, + "git_repository_set_head_detached_from_annotated": { + "type": "function", + "file": "repository.h", + "line": 644, + "lineto": 646, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": null + }, + { + "name": "commitish", + "type": "const git_annotated_commit *", + "comment": null + } + ], + "argline": "git_repository *repo, const git_annotated_commit *commitish", + "sig": "git_repository *::const git_annotated_commit *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Make the repository HEAD directly point to the Commit.

\n", + "comments": "

This behaves like git_repository_set_head_detached() but takes an\n annotated commit, which lets you specify which extended sha syntax\n string was specified by a user, allowing for more exact reflog\n messages.

\n\n

See the documentation for git_repository_set_head_detached().

\n", + "group": "repository" + }, + "git_repository_detach_head": { + "type": "function", + "file": "repository.h", + "line": 665, + "lineto": 666, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "Repository pointer" + } + ], + "argline": "git_repository *repo", + "sig": "git_repository *", + "return": { + "type": "int", + "comment": " 0 on success, GIT_EUNBORNBRANCH when HEAD points to a non existing\n branch or an error code" + }, + "description": "

Detach the HEAD.

\n", + "comments": "

If the HEAD is already detached and points to a Commit, 0 is returned.

\n\n

If the HEAD is already detached and points to a Tag, the HEAD is\n updated into making it point to the peeled Commit, and 0 is returned.

\n\n

If the HEAD is already detached and points to a non commitish, the HEAD is\n unaltered, and -1 is returned.

\n\n

Otherwise, the HEAD will be detached and point to the peeled Commit.

\n", + "group": "repository" + }, + "git_repository_state": { + "type": "function", + "file": "repository.h", + "line": 694, + "lineto": 694, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "Repository pointer" + } + ], + "argline": "git_repository *repo", + "sig": "git_repository *", + "return": { + "type": "int", + "comment": " The state of the repository" + }, + "description": "

Determines the status of a git repository - ie, whether an operation\n (merge, cherry-pick, etc) is in progress.

\n", + "comments": "", + "group": "repository" + }, + "git_repository_set_namespace": { + "type": "function", + "file": "repository.h", + "line": 708, + "lineto": 708, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "The repo" + }, + { + "name": "nmspace", + "type": "const char *", + "comment": "The namespace. This should not include the refs\n\tfolder, e.g. to namespace all references under `refs/namespaces/foo/`,\n\tuse `foo` as the namespace." + } + ], + "argline": "git_repository *repo, const char *nmspace", + "sig": "git_repository *::const char *", + "return": { + "type": "int", + "comment": " 0 on success, -1 on error" + }, + "description": "

Sets the active namespace for this Git Repository

\n", + "comments": "

This namespace affects all reference operations for the repo.\n See man gitnamespaces

\n", + "group": "repository" + }, + "git_repository_get_namespace": { + "type": "function", + "file": "repository.h", + "line": 716, + "lineto": 716, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "The repo" + } + ], + "argline": "git_repository *repo", + "sig": "git_repository *", + "return": { + "type": "const char *", + "comment": " the active namespace, or NULL if there isn't one" + }, + "description": "

Get the currently active namespace for this repository

\n", + "comments": "", + "group": "repository" + }, + "git_repository_is_shallow": { + "type": "function", + "file": "repository.h", + "line": 725, + "lineto": 725, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "The repository" + } + ], + "argline": "git_repository *repo", + "sig": "git_repository *", + "return": { + "type": "int", + "comment": " 1 if shallow, zero if not" + }, + "description": "

Determine if the repository was a shallow clone

\n", + "comments": "", + "group": "repository" + }, + "git_repository_ident": { + "type": "function", + "file": "repository.h", + "line": 737, + "lineto": 737, + "args": [ + { + "name": "name", + "type": "const char **", + "comment": "where to store the pointer to the name" + }, + { + "name": "email", + "type": "const char **", + "comment": "where to store the pointer to the email" + }, + { + "name": "repo", + "type": "const git_repository *", + "comment": "the repository" + } + ], + "argline": "const char **name, const char **email, const git_repository *repo", + "sig": "const char **::const char **::const git_repository *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Retrieve the configured identity to use for reflogs

\n", + "comments": "

The memory is owned by the repository and must not be freed by the\n user.

\n", + "group": "repository" + }, + "git_repository_set_ident": { + "type": "function", + "file": "repository.h", + "line": 750, + "lineto": 750, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "the repository to configure" + }, + { + "name": "name", + "type": "const char *", + "comment": "the name to use for the reflog entries" + }, + { + "name": "email", + "type": "const char *", + "comment": "the email to use for the reflog entries" + } + ], + "argline": "git_repository *repo, const char *name, const char *email", + "sig": "git_repository *::const char *::const char *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Set the identity to be used for writing reflogs

\n", + "comments": "

If both are set, this name and email will be used to write to the\n reflog. Pass NULL to unset. When unset, the identity will be taken\n from the repository's configuration.

\n", + "group": "repository" + }, + "git_reset": { + "type": "function", + "file": "reset.h", + "line": 62, + "lineto": 66, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "Repository where to perform the reset operation." + }, + { + "name": "target", + "type": "git_object *", + "comment": "Committish to which the Head should be moved to. This object\n must belong to the given `repo` and can either be a git_commit or a\n git_tag. When a git_tag is being passed, it should be dereferencable\n to a git_commit which oid will be used as the target of the branch." + }, + { + "name": "reset_type", + "type": "git_reset_t", + "comment": "Kind of reset operation to perform." + }, + { + "name": "checkout_opts", + "type": "const git_checkout_options *", + "comment": "Checkout options to be used for a HARD reset.\n The checkout_strategy field will be overridden (based on reset_type).\n This parameter can be used to propagate notify and progress callbacks." + } + ], + "argline": "git_repository *repo, git_object *target, git_reset_t reset_type, const git_checkout_options *checkout_opts", + "sig": "git_repository *::git_object *::git_reset_t::const git_checkout_options *", + "return": { + "type": "int", + "comment": " 0 on success or an error code" + }, + "description": "

Sets the current head to the specified commit oid and optionally\n resets the index and working tree to match.

\n", + "comments": "

SOFT reset means the Head will be moved to the commit.

\n\n

MIXED reset will trigger a SOFT reset, plus the index will be replaced\n with the content of the commit tree.

\n\n

HARD reset will trigger a MIXED reset and the working directory will be\n replaced with the content of the index. (Untracked and ignored files\n will be left alone, however.)

\n\n

TODO: Implement remaining kinds of resets.

\n", + "group": "reset" + }, + "git_reset_from_annotated": { + "type": "function", + "file": "reset.h", + "line": 80, + "lineto": 84, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": null + }, + { + "name": "commit", + "type": "git_annotated_commit *", + "comment": null + }, + { + "name": "reset_type", + "type": "git_reset_t", + "comment": null + }, + { + "name": "checkout_opts", + "type": "const git_checkout_options *", + "comment": null + } + ], + "argline": "git_repository *repo, git_annotated_commit *commit, git_reset_t reset_type, const git_checkout_options *checkout_opts", + "sig": "git_repository *::git_annotated_commit *::git_reset_t::const git_checkout_options *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Sets the current head to the specified commit oid and optionally\n resets the index and working tree to match.

\n", + "comments": "

This behaves like git_reset() but takes an annotated commit,\n which lets you specify which extended sha syntax string was\n specified by a user, allowing for more exact reflog messages.

\n\n

See the documentation for git_reset().

\n", + "group": "reset" + }, + "git_reset_default": { + "type": "function", + "file": "reset.h", + "line": 104, + "lineto": 107, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "Repository where to perform the reset operation." + }, + { + "name": "target", + "type": "git_object *", + "comment": "The committish which content will be used to reset the content\n of the index." + }, + { + "name": "pathspecs", + "type": "git_strarray *", + "comment": "List of pathspecs to operate on." + } + ], + "argline": "git_repository *repo, git_object *target, git_strarray *pathspecs", + "sig": "git_repository *::git_object *::git_strarray *", + "return": { + "type": "int", + "comment": " 0 on success or an error code \n<\n 0" + }, + "description": "

Updates some entries in the index from the target commit tree.

\n", + "comments": "

The scope of the updated entries is determined by the paths\n being passed in the pathspec parameters.

\n\n

Passing a NULL target will result in removing\n entries in the index matching the provided pathspecs.

\n", + "group": "reset" + }, + "git_revert_init_options": { + "type": "function", + "file": "revert.h", + "line": 47, + "lineto": 49, + "args": [ + { + "name": "opts", + "type": "git_revert_options *", + "comment": "the `git_revert_options` struct to initialize" + }, + { + "name": "version", + "type": "unsigned int", + "comment": "Version of struct; pass `GIT_REVERT_OPTIONS_VERSION`" + } + ], + "argline": "git_revert_options *opts, unsigned int version", + "sig": "git_revert_options *::unsigned int", + "return": { + "type": "int", + "comment": " Zero on success; -1 on failure." + }, + "description": "

Initializes a git_revert_options with default values. Equivalent to\n creating an instance with GIT_REVERT_OPTIONS_INIT.

\n", + "comments": "", + "group": "revert" + }, + "git_revert_commit": { + "type": "function", + "file": "revert.h", + "line": 65, + "lineto": 71, + "args": [ + { + "name": "out", + "type": "git_index **", + "comment": "pointer to store the index result in" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "the repository that contains the given commits" + }, + { + "name": "revert_commit", + "type": "git_commit *", + "comment": "the commit to revert" + }, + { + "name": "our_commit", + "type": "git_commit *", + "comment": "the commit to revert against (eg, HEAD)" + }, + { + "name": "mainline", + "type": "unsigned int", + "comment": "the parent of the revert commit, if it is a merge" + }, + { + "name": "merge_options", + "type": "const git_merge_options *", + "comment": "the merge options (or null for defaults)" + } + ], + "argline": "git_index **out, git_repository *repo, git_commit *revert_commit, git_commit *our_commit, unsigned int mainline, const git_merge_options *merge_options", + "sig": "git_index **::git_repository *::git_commit *::git_commit *::unsigned int::const git_merge_options *", + "return": { + "type": "int", + "comment": " zero on success, -1 on failure." + }, + "description": "

Reverts the given commit against the given "our" commit, producing an\n index that reflects the result of the revert.

\n", + "comments": "

The returned index must be freed explicitly with git_index_free.

\n", + "group": "revert" + }, + "git_revert": { + "type": "function", + "file": "revert.h", + "line": 81, + "lineto": 84, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "the repository to revert" + }, + { + "name": "commit", + "type": "git_commit *", + "comment": "the commit to revert" + }, + { + "name": "given_opts", + "type": "const git_revert_options *", + "comment": "merge flags" + } + ], + "argline": "git_repository *repo, git_commit *commit, const git_revert_options *given_opts", + "sig": "git_repository *::git_commit *::const git_revert_options *", + "return": { + "type": "int", + "comment": " zero on success, -1 on failure." + }, + "description": "

Reverts the given commit, producing changes in the index and working directory.

\n", + "comments": "", + "group": "revert" + }, + "git_revparse_single": { + "type": "function", + "file": "revparse.h", + "line": 37, + "lineto": 38, + "args": [ + { + "name": "out", + "type": "git_object **", + "comment": "pointer to output object" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "the repository to search in" + }, + { + "name": "spec", + "type": "const char *", + "comment": "the textual specification for an object" + } + ], + "argline": "git_object **out, git_repository *repo, const char *spec", + "sig": "git_object **::git_repository *::const char *", + "return": { + "type": "int", + "comment": " 0 on success, GIT_ENOTFOUND, GIT_EAMBIGUOUS, GIT_EINVALIDSPEC or an error code" + }, + "description": "

Find a single object, as specified by a revision string.

\n", + "comments": "

See man gitrevisions, or\n http://git-scm.com/docs/git-rev-parse.html#_specifying_revisions for\n information on the syntax accepted.

\n\n

The returned object should be released with git_object_free when no\n longer needed.

\n", + "group": "revparse", + "examples": { + "blame.c": [ + "ex/v0.23.2/blame.html#git_revparse_single-26" + ], + "cat-file.c": [ + "ex/v0.23.2/cat-file.html#git_revparse_single-34" + ], + "describe.c": [ + "ex/v0.23.2/describe.html#git_revparse_single-8" + ], + "log.c": [ + "ex/v0.23.2/log.html#git_revparse_single-47" + ], + "tag.c": [ + "ex/v0.23.2/tag.html#git_revparse_single-13", + "ex/v0.23.2/tag.html#git_revparse_single-14", + "ex/v0.23.2/tag.html#git_revparse_single-15", + "ex/v0.23.2/tag.html#git_revparse_single-16" + ] + } + }, + "git_revparse_ext": { + "type": "function", + "file": "revparse.h", + "line": 61, + "lineto": 65, + "args": [ + { + "name": "object_out", + "type": "git_object **", + "comment": "pointer to output object" + }, + { + "name": "reference_out", + "type": "git_reference **", + "comment": "pointer to output reference or NULL" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "the repository to search in" + }, + { + "name": "spec", + "type": "const char *", + "comment": "the textual specification for an object" + } + ], + "argline": "git_object **object_out, git_reference **reference_out, git_repository *repo, const char *spec", + "sig": "git_object **::git_reference **::git_repository *::const char *", + "return": { + "type": "int", + "comment": " 0 on success, GIT_ENOTFOUND, GIT_EAMBIGUOUS, GIT_EINVALIDSPEC\n or an error code" + }, + "description": "

Find a single object and intermediate reference by a revision string.

\n", + "comments": "

See man gitrevisions, or\n http://git-scm.com/docs/git-rev-parse.html#_specifying_revisions for\n information on the syntax accepted.

\n\n

In some cases (\n@\n{\n<\n-n>} or `\n<branchname

\n\n
\n

@\n{upstream}), the expression may\n point to an intermediate reference. When such expressions are being passed\n in,reference_out` will be valued as well.

\n
\n\n

The returned object should be released with git_object_free and the\n returned reference with git_reference_free when no longer needed.

\n", + "group": "revparse" + }, + "git_revparse": { + "type": "function", + "file": "revparse.h", + "line": 105, + "lineto": 108, + "args": [ + { + "name": "revspec", + "type": "git_revspec *", + "comment": "Pointer to an user-allocated git_revspec struct where\n\t the result of the rev-parse will be stored" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "the repository to search in" + }, + { + "name": "spec", + "type": "const char *", + "comment": "the rev-parse spec to parse" + } + ], + "argline": "git_revspec *revspec, git_repository *repo, const char *spec", + "sig": "git_revspec *::git_repository *::const char *", + "return": { + "type": "int", + "comment": " 0 on success, GIT_INVALIDSPEC, GIT_ENOTFOUND, GIT_EAMBIGUOUS or an error code" + }, + "description": "

Parse a revision string for from, to, and intent.

\n", + "comments": "

See man gitrevisions or\n http://git-scm.com/docs/git-rev-parse.html#_specifying_revisions for\n information on the syntax accepted.

\n", + "group": "revparse", + "examples": { + "blame.c": [ + "ex/v0.23.2/blame.html#git_revparse-27" + ], + "log.c": [ + "ex/v0.23.2/log.html#git_revparse-48" + ], + "rev-parse.c": [ + "ex/v0.23.2/rev-parse.html#git_revparse-18", + "ex/v0.23.2/rev-parse.html#git_revparse-19" + ] + } + }, + "git_revwalk_new": { + "type": "function", + "file": "revwalk.h", + "line": 75, + "lineto": 75, + "args": [ + { + "name": "out", + "type": "git_revwalk **", + "comment": "pointer to the new revision walker" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "the repo to walk through" + } + ], + "argline": "git_revwalk **out, git_repository *repo", + "sig": "git_revwalk **::git_repository *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Allocate a new revision walker to iterate through a repo.

\n", + "comments": "

This revision walker uses a custom memory pool and an internal\n commit cache, so it is relatively expensive to allocate.

\n\n

For maximum performance, this revision walker should be\n reused for different walks.

\n\n

This revision walker is not thread safe: it may only be\n used to walk a repository on a single thread; however,\n it is possible to have several revision walkers in\n several different threads walking the same repository.

\n", + "group": "revwalk", + "examples": { + "general.c": [ + "ex/v0.23.2/general.html#git_revwalk_new-62" + ], + "log.c": [ + "ex/v0.23.2/log.html#git_revwalk_new-49", + "ex/v0.23.2/log.html#git_revwalk_new-50" + ] + } + }, + "git_revwalk_reset": { + "type": "function", + "file": "revwalk.h", + "line": 90, + "lineto": 90, + "args": [ + { + "name": "walker", + "type": "git_revwalk *", + "comment": "handle to reset." + } + ], + "argline": "git_revwalk *walker", + "sig": "git_revwalk *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Reset the revision walker for reuse.

\n", + "comments": "

This will clear all the pushed and hidden commits, and\n leave the walker in a blank state (just like at\n creation) ready to receive new commit pushes and\n start a new walk.

\n\n

The revision walk is automatically reset when a walk\n is over.

\n", + "group": "revwalk" + }, + "git_revwalk_push": { + "type": "function", + "file": "revwalk.h", + "line": 109, + "lineto": 109, + "args": [ + { + "name": "walk", + "type": "git_revwalk *", + "comment": "the walker being used for the traversal." + }, + { + "name": "id", + "type": "const git_oid *", + "comment": "the oid of the commit to start from." + } + ], + "argline": "git_revwalk *walk, const git_oid *id", + "sig": "git_revwalk *::const git_oid *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Add a new root for the traversal

\n", + "comments": "

The pushed commit will be marked as one of the roots from which to\n start the walk. This commit may not be walked if it or a child is\n hidden.

\n\n

At least one commit must be pushed onto the walker before a walk\n can be started.

\n\n

The given id must belong to a committish on the walked\n repository.

\n", + "group": "revwalk", + "examples": { + "general.c": [ + "ex/v0.23.2/general.html#git_revwalk_push-63" + ], + "log.c": [ + "ex/v0.23.2/log.html#git_revwalk_push-51" + ] + } + }, + "git_revwalk_push_glob": { + "type": "function", + "file": "revwalk.h", + "line": 127, + "lineto": 127, + "args": [ + { + "name": "walk", + "type": "git_revwalk *", + "comment": "the walker being used for the traversal" + }, + { + "name": "glob", + "type": "const char *", + "comment": "the glob pattern references should match" + } + ], + "argline": "git_revwalk *walk, const char *glob", + "sig": "git_revwalk *::const char *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Push matching references

\n", + "comments": "

The OIDs pointed to by the references that match the given glob\n pattern will be pushed to the revision walker.

\n\n

A leading 'refs/' is implied if not present as well as a trailing\n '/\n\\\n*' if the glob lacks '?', '\n\\\n*' or '['.

\n\n

Any references matching this glob which do not point to a\n committish will be ignored.

\n", + "group": "revwalk" + }, + "git_revwalk_push_head": { + "type": "function", + "file": "revwalk.h", + "line": 135, + "lineto": 135, + "args": [ + { + "name": "walk", + "type": "git_revwalk *", + "comment": "the walker being used for the traversal" + } + ], + "argline": "git_revwalk *walk", + "sig": "git_revwalk *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Push the repository's HEAD

\n", + "comments": "", + "group": "revwalk", + "examples": { + "log.c": [ + "ex/v0.23.2/log.html#git_revwalk_push_head-52" + ] + } + }, + "git_revwalk_hide": { + "type": "function", + "file": "revwalk.h", + "line": 150, + "lineto": 150, + "args": [ + { + "name": "walk", + "type": "git_revwalk *", + "comment": "the walker being used for the traversal." + }, + { + "name": "commit_id", + "type": "const git_oid *", + "comment": "the oid of commit that will be ignored during the traversal" + } + ], + "argline": "git_revwalk *walk, const git_oid *commit_id", + "sig": "git_revwalk *::const git_oid *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Mark a commit (and its ancestors) uninteresting for the output.

\n", + "comments": "

The given id must belong to a committish on the walked\n repository.

\n\n

The resolved commit and all its parents will be hidden from the\n output on the revision walk.

\n", + "group": "revwalk", + "examples": { + "log.c": [ + "ex/v0.23.2/log.html#git_revwalk_hide-53" + ] + } + }, + "git_revwalk_hide_glob": { + "type": "function", + "file": "revwalk.h", + "line": 169, + "lineto": 169, + "args": [ + { + "name": "walk", + "type": "git_revwalk *", + "comment": "the walker being used for the traversal" + }, + { + "name": "glob", + "type": "const char *", + "comment": "the glob pattern references should match" + } + ], + "argline": "git_revwalk *walk, const char *glob", + "sig": "git_revwalk *::const char *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Hide matching references.

\n", + "comments": "

The OIDs pointed to by the references that match the given glob\n pattern and their ancestors will be hidden from the output on the\n revision walk.

\n\n

A leading 'refs/' is implied if not present as well as a trailing\n '/\n\\\n*' if the glob lacks '?', '\n\\\n*' or '['.

\n\n

Any references matching this glob which do not point to a\n committish will be ignored.

\n", + "group": "revwalk" + }, + "git_revwalk_hide_head": { + "type": "function", + "file": "revwalk.h", + "line": 177, + "lineto": 177, + "args": [ + { + "name": "walk", + "type": "git_revwalk *", + "comment": "the walker being used for the traversal" + } + ], + "argline": "git_revwalk *walk", + "sig": "git_revwalk *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Hide the repository's HEAD

\n", + "comments": "", + "group": "revwalk" + }, + "git_revwalk_push_ref": { + "type": "function", + "file": "revwalk.h", + "line": 188, + "lineto": 188, + "args": [ + { + "name": "walk", + "type": "git_revwalk *", + "comment": "the walker being used for the traversal" + }, + { + "name": "refname", + "type": "const char *", + "comment": "the reference to push" + } + ], + "argline": "git_revwalk *walk, const char *refname", + "sig": "git_revwalk *::const char *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Push the OID pointed to by a reference

\n", + "comments": "

The reference must point to a committish.

\n", + "group": "revwalk" + }, + "git_revwalk_hide_ref": { + "type": "function", + "file": "revwalk.h", + "line": 199, + "lineto": 199, + "args": [ + { + "name": "walk", + "type": "git_revwalk *", + "comment": "the walker being used for the traversal" + }, + { + "name": "refname", + "type": "const char *", + "comment": "the reference to hide" + } + ], + "argline": "git_revwalk *walk, const char *refname", + "sig": "git_revwalk *::const char *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Hide the OID pointed to by a reference

\n", + "comments": "

The reference must point to a committish.

\n", + "group": "revwalk" + }, + "git_revwalk_next": { + "type": "function", + "file": "revwalk.h", + "line": 219, + "lineto": 219, + "args": [ + { + "name": "out", + "type": "git_oid *", + "comment": "Pointer where to store the oid of the next commit" + }, + { + "name": "walk", + "type": "git_revwalk *", + "comment": "the walker to pop the commit from." + } + ], + "argline": "git_oid *out, git_revwalk *walk", + "sig": "git_oid *::git_revwalk *", + "return": { + "type": "int", + "comment": " 0 if the next commit was found;\n\tGIT_ITEROVER if there are no commits left to iterate" + }, + "description": "

Get the next commit from the revision walk.

\n", + "comments": "

The initial call to this method is not blocking when\n iterating through a repo with a time-sorting mode.

\n\n

Iterating with Topological or inverted modes makes the initial\n call blocking to preprocess the commit list, but this block should be\n mostly unnoticeable on most repositories (topological preprocessing\n times at 0.3s on the git.git repo).

\n\n

The revision walker is reset when the walk is over.

\n", + "group": "revwalk", + "examples": { + "general.c": [ + "ex/v0.23.2/general.html#git_revwalk_next-64" + ], + "log.c": [ + "ex/v0.23.2/log.html#git_revwalk_next-54" + ] + } + }, + "git_revwalk_sorting": { + "type": "function", + "file": "revwalk.h", + "line": 230, + "lineto": 230, + "args": [ + { + "name": "walk", + "type": "git_revwalk *", + "comment": "the walker being used for the traversal." + }, + { + "name": "sort_mode", + "type": "unsigned int", + "comment": "combination of GIT_SORT_XXX flags" + } + ], + "argline": "git_revwalk *walk, unsigned int sort_mode", + "sig": "git_revwalk *::unsigned int", + "return": { + "type": "void", + "comment": null + }, + "description": "

Change the sorting mode when iterating through the\n repository's contents.

\n", + "comments": "

Changing the sorting mode resets the walker.

\n", + "group": "revwalk", + "examples": { + "general.c": [ + "ex/v0.23.2/general.html#git_revwalk_sorting-65" + ], + "log.c": [ + "ex/v0.23.2/log.html#git_revwalk_sorting-55", + "ex/v0.23.2/log.html#git_revwalk_sorting-56" + ] + } + }, + "git_revwalk_push_range": { + "type": "function", + "file": "revwalk.h", + "line": 245, + "lineto": 245, + "args": [ + { + "name": "walk", + "type": "git_revwalk *", + "comment": "the walker being used for the traversal" + }, + { + "name": "range", + "type": "const char *", + "comment": "the range" + } + ], + "argline": "git_revwalk *walk, const char *range", + "sig": "git_revwalk *::const char *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Push and hide the respective endpoints of the given range.

\n", + "comments": "

The range should be of the form

\n\n

<commit

\n\n
\n

..\n<commit

\n\n

where each \n<commit\nis in the form accepted by 'git_revparse_single'.\n The left-hand commit will be hidden and the right-hand commit pushed.

\n
\n", + "group": "revwalk" + }, + "git_revwalk_simplify_first_parent": { + "type": "function", + "file": "revwalk.h", + "line": 252, + "lineto": 252, + "args": [ + { + "name": "walk", + "type": "git_revwalk *", + "comment": null + } + ], + "argline": "git_revwalk *walk", + "sig": "git_revwalk *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Simplify the history by first-parent

\n", + "comments": "

No parents other than the first for each commit will be enqueued.

\n", + "group": "revwalk" + }, + "git_revwalk_free": { + "type": "function", + "file": "revwalk.h", + "line": 260, + "lineto": 260, + "args": [ + { + "name": "walk", + "type": "git_revwalk *", + "comment": "traversal handle to close. If NULL nothing occurs." + } + ], + "argline": "git_revwalk *walk", + "sig": "git_revwalk *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Free a revision walker previously allocated.

\n", + "comments": "", + "group": "revwalk", + "examples": { + "general.c": [ + "ex/v0.23.2/general.html#git_revwalk_free-66" + ], + "log.c": [ + "ex/v0.23.2/log.html#git_revwalk_free-57" + ] + } + }, + "git_revwalk_repository": { + "type": "function", + "file": "revwalk.h", + "line": 269, + "lineto": 269, + "args": [ + { + "name": "walk", + "type": "git_revwalk *", + "comment": "the revision walker" + } + ], + "argline": "git_revwalk *walk", + "sig": "git_revwalk *", + "return": { + "type": "git_repository *", + "comment": " the repository being walked" + }, + "description": "

Return the repository on which this walker\n is operating.

\n", + "comments": "", + "group": "revwalk" + }, + "git_revwalk_add_hide_cb": { + "type": "function", + "file": "revwalk.h", + "line": 290, + "lineto": 293, + "args": [ + { + "name": "walk", + "type": "git_revwalk *", + "comment": "the revision walker" + }, + { + "name": "hide_cb", + "type": "git_revwalk_hide_cb", + "comment": "callback function to hide a commit and its parents" + }, + { + "name": "payload", + "type": "void *", + "comment": "data payload to be passed to callback function" + } + ], + "argline": "git_revwalk *walk, git_revwalk_hide_cb hide_cb, void *payload", + "sig": "git_revwalk *::git_revwalk_hide_cb::void *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Adds a callback function to hide a commit and its parents

\n", + "comments": "", + "group": "revwalk" + }, + "git_signature_new": { + "type": "function", + "file": "signature.h", + "line": 37, + "lineto": 37, + "args": [ + { + "name": "out", + "type": "git_signature **", + "comment": "new signature, in case of error NULL" + }, + { + "name": "name", + "type": "const char *", + "comment": "name of the person" + }, + { + "name": "email", + "type": "const char *", + "comment": "email of the person" + }, + { + "name": "time", + "type": "git_time_t", + "comment": "time when the action happened" + }, + { + "name": "offset", + "type": "int", + "comment": "timezone offset in minutes for the time" + } + ], + "argline": "git_signature **out, const char *name, const char *email, git_time_t time, int offset", + "sig": "git_signature **::const char *::const char *::git_time_t::int", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Create a new action signature.

\n", + "comments": "

Call git_signature_free() to free the data.

\n\n

Note: angle brackets ('\n<\n' and '>') characters are not allowed\n to be used in either the name or the email parameter.

\n", + "group": "signature", + "examples": { + "general.c": [ + "ex/v0.23.2/general.html#git_signature_new-67", + "ex/v0.23.2/general.html#git_signature_new-68" + ] + } + }, + "git_signature_now": { + "type": "function", + "file": "signature.h", + "line": 49, + "lineto": 49, + "args": [ + { + "name": "out", + "type": "git_signature **", + "comment": "new signature, in case of error NULL" + }, + { + "name": "name", + "type": "const char *", + "comment": "name of the person" + }, + { + "name": "email", + "type": "const char *", + "comment": "email of the person" + } + ], + "argline": "git_signature **out, const char *name, const char *email", + "sig": "git_signature **::const char *::const char *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Create a new action signature with a timestamp of 'now'.

\n", + "comments": "

Call git_signature_free() to free the data.

\n", + "group": "signature" + }, + "git_signature_default": { + "type": "function", + "file": "signature.h", + "line": 63, + "lineto": 63, + "args": [ + { + "name": "out", + "type": "git_signature **", + "comment": "new signature" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "repository pointer" + } + ], + "argline": "git_signature **out, git_repository *repo", + "sig": "git_signature **::git_repository *", + "return": { + "type": "int", + "comment": " 0 on success, GIT_ENOTFOUND if config is missing, or error code" + }, + "description": "

Create a new action signature with default user and now timestamp.

\n", + "comments": "

This looks up the user.name and user.email from the configuration and\n uses the current time as the timestamp, and creates a new signature\n based on that information. It will return GIT_ENOTFOUND if either the\n user.name or user.email are not set.

\n", + "group": "signature", + "examples": { + "init.c": [ + "ex/v0.23.2/init.html#git_signature_default-12" + ], + "tag.c": [ + "ex/v0.23.2/tag.html#git_signature_default-17" + ] + } + }, + "git_signature_dup": { + "type": "function", + "file": "signature.h", + "line": 75, + "lineto": 75, + "args": [ + { + "name": "dest", + "type": "git_signature **", + "comment": "pointer where to store the copy" + }, + { + "name": "sig", + "type": "const git_signature *", + "comment": "signature to duplicate" + } + ], + "argline": "git_signature **dest, const git_signature *sig", + "sig": "git_signature **::const git_signature *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Create a copy of an existing signature. All internal strings are also\n duplicated.

\n", + "comments": "

Call git_signature_free() to free the data.

\n", + "group": "signature" + }, + "git_signature_free": { + "type": "function", + "file": "signature.h", + "line": 86, + "lineto": 86, + "args": [ + { + "name": "sig", + "type": "git_signature *", + "comment": "signature to free" + } + ], + "argline": "git_signature *sig", + "sig": "git_signature *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Free an existing signature.

\n", + "comments": "

Because the signature is not an opaque structure, it is legal to free it\n manually, but be sure to free the "name" and "email" strings in addition\n to the structure itself.

\n", + "group": "signature", + "examples": { + "init.c": [ + "ex/v0.23.2/init.html#git_signature_free-13" + ], + "tag.c": [ + "ex/v0.23.2/tag.html#git_signature_free-18" + ] + } + }, + "git_stash_apply_init_options": { + "type": "function", + "file": "stash.h", + "line": 153, + "lineto": 154, + "args": [ + { + "name": "opts", + "type": "git_stash_apply_options *", + "comment": "the `git_stash_apply_options` instance to initialize." + }, + { + "name": "version", + "type": "unsigned int", + "comment": "the version of the struct; you should pass\n `GIT_STASH_APPLY_OPTIONS_INIT` here." + } + ], + "argline": "git_stash_apply_options *opts, unsigned int version", + "sig": "git_stash_apply_options *::unsigned int", + "return": { + "type": "int", + "comment": " Zero on success; -1 on failure." + }, + "description": "

Initializes a git_stash_apply_options with default values. Equivalent to\n creating an instance with GIT_STASH_APPLY_OPTIONS_INIT.

\n", + "comments": "", + "group": "stash" + }, + "git_stash_apply": { + "type": "function", + "file": "stash.h", + "line": 182, + "lineto": 185, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "The owning repository." + }, + { + "name": "index", + "type": "size_t", + "comment": "The position within the stash list. 0 points to the\n most recent stashed state." + }, + { + "name": "options", + "type": "const git_stash_apply_options *", + "comment": "Options to control how stashes are applied." + } + ], + "argline": "git_repository *repo, size_t index, const git_stash_apply_options *options", + "sig": "git_repository *::size_t::const git_stash_apply_options *", + "return": { + "type": "int", + "comment": " 0 on success, GIT_ENOTFOUND if there's no stashed state for the\n given index, GIT_EMERGECONFLICT if changes exist in the working\n directory, or an error code" + }, + "description": "

Apply a single stashed state from the stash list.

\n", + "comments": "

If local changes in the working directory conflict with changes in the\n stash then GIT_EMERGECONFLICT will be returned. In this case, the index\n will always remain unmodified and all files in the working directory will\n remain unmodified. However, if you are restoring untracked files or\n ignored files and there is a conflict when applying the modified files,\n then those files will remain in the working directory.

\n\n

If passing the GIT_STASH_APPLY_REINSTATE_INDEX flag and there would be\n conflicts when reinstating the index, the function will return\n GIT_EMERGECONFLICT and both the working directory and index will be left\n unmodified.

\n\n

Note that a minimum checkout strategy of GIT_CHECKOUT_SAFE is implied.

\n", + "group": "stash" + }, + "git_stash_foreach": { + "type": "function", + "file": "stash.h", + "line": 218, + "lineto": 221, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "Repository where to find the stash." + }, + { + "name": "callback", + "type": "git_stash_cb", + "comment": "Callback to invoke per found stashed state. The most\n recent stash state will be enumerated first." + }, + { + "name": "payload", + "type": "void *", + "comment": "Extra parameter to callback function." + } + ], + "argline": "git_repository *repo, git_stash_cb callback, void *payload", + "sig": "git_repository *::git_stash_cb::void *", + "return": { + "type": "int", + "comment": " 0 on success, non-zero callback return value, or error code." + }, + "description": "

Loop over all the stashed states and issue a callback for each one.

\n", + "comments": "

If the callback returns a non-zero value, this will stop looping.

\n", + "group": "stash" + }, + "git_stash_drop": { + "type": "function", + "file": "stash.h", + "line": 234, + "lineto": 236, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "The owning repository." + }, + { + "name": "index", + "type": "size_t", + "comment": "The position within the stash list. 0 points to the\n most recent stashed state." + } + ], + "argline": "git_repository *repo, size_t index", + "sig": "git_repository *::size_t", + "return": { + "type": "int", + "comment": " 0 on success, GIT_ENOTFOUND if there's no stashed state for the given\n index, or error code." + }, + "description": "

Remove a single stashed state from the stash list.

\n", + "comments": "", + "group": "stash" + }, + "git_stash_pop": { + "type": "function", + "file": "stash.h", + "line": 250, + "lineto": 253, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "The owning repository." + }, + { + "name": "index", + "type": "size_t", + "comment": "The position within the stash list. 0 points to the\n most recent stashed state." + }, + { + "name": "options", + "type": "const git_stash_apply_options *", + "comment": "Options to control how stashes are applied." + } + ], + "argline": "git_repository *repo, size_t index, const git_stash_apply_options *options", + "sig": "git_repository *::size_t::const git_stash_apply_options *", + "return": { + "type": "int", + "comment": " 0 on success, GIT_ENOTFOUND if there's no stashed state for the given\n index, or error code. (see git_stash_apply() above for details)" + }, + "description": "

Apply a single stashed state from the stash list and remove it from the list\n if successful.

\n", + "comments": "", + "group": "stash" + }, + "git_status_init_options": { + "type": "function", + "file": "status.h", + "line": 195, + "lineto": 197, + "args": [ + { + "name": "opts", + "type": "git_status_options *", + "comment": "The `git_status_options` instance to initialize." + }, + { + "name": "version", + "type": "unsigned int", + "comment": "Version of struct; pass `GIT_STATUS_OPTIONS_VERSION`" + } + ], + "argline": "git_status_options *opts, unsigned int version", + "sig": "git_status_options *::unsigned int", + "return": { + "type": "int", + "comment": " Zero on success; -1 on failure." + }, + "description": "

Initializes a git_status_options with default values. Equivalent to\n creating an instance with GIT_STATUS_OPTIONS_INIT.

\n", + "comments": "", + "group": "status" + }, + "git_status_foreach": { + "type": "function", + "file": "status.h", + "line": 235, + "lineto": 238, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "A repository object" + }, + { + "name": "callback", + "type": "git_status_cb", + "comment": "The function to call on each file" + }, + { + "name": "payload", + "type": "void *", + "comment": "Pointer to pass through to callback function" + } + ], + "argline": "git_repository *repo, git_status_cb callback, void *payload", + "sig": "git_repository *::git_status_cb::void *", + "return": { + "type": "int", + "comment": " 0 on success, non-zero callback return value, or error code" + }, + "description": "

Gather file statuses and run a callback for each one.

\n", + "comments": "

The callback is passed the path of the file, the status (a combination of\n the git_status_t values above) and the payload data pointer passed\n into this function.

\n\n

If the callback returns a non-zero value, this function will stop looping\n and return that value to caller.

\n", + "group": "status", + "examples": { + "status.c": [ + "ex/v0.23.2/status.html#git_status_foreach-10" + ] + } + }, + "git_status_foreach_ext": { + "type": "function", + "file": "status.h", + "line": 259, + "lineto": 263, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "Repository object" + }, + { + "name": "opts", + "type": "const git_status_options *", + "comment": "Status options structure" + }, + { + "name": "callback", + "type": "git_status_cb", + "comment": "The function to call on each file" + }, + { + "name": "payload", + "type": "void *", + "comment": "Pointer to pass through to callback function" + } + ], + "argline": "git_repository *repo, const git_status_options *opts, git_status_cb callback, void *payload", + "sig": "git_repository *::const git_status_options *::git_status_cb::void *", + "return": { + "type": "int", + "comment": " 0 on success, non-zero callback return value, or error code" + }, + "description": "

Gather file status information and run callbacks as requested.

\n", + "comments": "

This is an extended version of the git_status_foreach() API that\n allows for more granular control over which paths will be processed and\n in what order. See the git_status_options structure for details\n about the additional controls that this makes available.

\n\n

Note that if a pathspec is given in the git_status_options to filter\n the status, then the results from rename detection (if you enable it) may\n not be accurate. To do rename detection properly, this must be called\n with no pathspec so that all files can be considered.

\n", + "group": "status", + "examples": { + "status.c": [ + "ex/v0.23.2/status.html#git_status_foreach_ext-11" + ] + } + }, + "git_status_file": { + "type": "function", + "file": "status.h", + "line": 291, + "lineto": 294, + "args": [ + { + "name": "status_flags", + "type": "unsigned int *", + "comment": "Output combination of git_status_t values for file" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "A repository object" + }, + { + "name": "path", + "type": "const char *", + "comment": "The exact path to retrieve status for relative to the\n repository working directory" + } + ], + "argline": "unsigned int *status_flags, git_repository *repo, const char *path", + "sig": "unsigned int *::git_repository *::const char *", + "return": { + "type": "int", + "comment": " 0 on success, GIT_ENOTFOUND if the file is not found in the HEAD,\n index, and work tree, GIT_EAMBIGUOUS if `path` matches multiple files\n or if it refers to a folder, and -1 on other errors." + }, + "description": "

Get file status for a single file.

\n", + "comments": "

This tries to get status for the filename that you give. If no files\n match that name (in either the HEAD, index, or working directory), this\n returns GIT_ENOTFOUND.

\n\n

If the name matches multiple files (for example, if the path names a\n directory or if running on a case- insensitive filesystem and yet the\n HEAD has two entries that both match the path), then this returns\n GIT_EAMBIGUOUS because it cannot give correct results.

\n\n

This does not do any sort of rename detection. Renames require a set of\n targets and because of the path filtering, there is not enough\n information to check renames correctly. To check file status with rename\n detection, there is no choice but to do a full git_status_list_new and\n scan through looking for the path that you are interested in.

\n", + "group": "status" + }, + "git_status_list_new": { + "type": "function", + "file": "status.h", + "line": 309, + "lineto": 312, + "args": [ + { + "name": "out", + "type": "git_status_list **", + "comment": "Pointer to store the status results in" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "Repository object" + }, + { + "name": "opts", + "type": "const git_status_options *", + "comment": "Status options structure" + } + ], + "argline": "git_status_list **out, git_repository *repo, const git_status_options *opts", + "sig": "git_status_list **::git_repository *::const git_status_options *", + "return": { + "type": "int", + "comment": " 0 on success or error code" + }, + "description": "

Gather file status information and populate the git_status_list.

\n", + "comments": "

Note that if a pathspec is given in the git_status_options to filter\n the status, then the results from rename detection (if you enable it) may\n not be accurate. To do rename detection properly, this must be called\n with no pathspec so that all files can be considered.

\n", + "group": "status", + "examples": { + "status.c": [ + "ex/v0.23.2/status.html#git_status_list_new-12", + "ex/v0.23.2/status.html#git_status_list_new-13" + ] + } + }, + "git_status_list_entrycount": { + "type": "function", + "file": "status.h", + "line": 323, + "lineto": 324, + "args": [ + { + "name": "statuslist", + "type": "git_status_list *", + "comment": "Existing status list object" + } + ], + "argline": "git_status_list *statuslist", + "sig": "git_status_list *", + "return": { + "type": "size_t", + "comment": " the number of status entries" + }, + "description": "

Gets the count of status entries in this list.

\n", + "comments": "

If there are no changes in status (at least according the options given\n when the status list was created), this can return 0.

\n", + "group": "status", + "examples": { + "status.c": [ + "ex/v0.23.2/status.html#git_status_list_entrycount-14", + "ex/v0.23.2/status.html#git_status_list_entrycount-15" + ] + } + }, + "git_status_byindex": { + "type": "function", + "file": "status.h", + "line": 335, + "lineto": 337, + "args": [ + { + "name": "statuslist", + "type": "git_status_list *", + "comment": "Existing status list object" + }, + { + "name": "idx", + "type": "size_t", + "comment": "Position of the entry" + } + ], + "argline": "git_status_list *statuslist, size_t idx", + "sig": "git_status_list *::size_t", + "return": { + "type": "const git_status_entry *", + "comment": " Pointer to the entry; NULL if out of bounds" + }, + "description": "

Get a pointer to one of the entries in the status list.

\n", + "comments": "

The entry is not modifiable and should not be freed.

\n", + "group": "status", + "examples": { + "status.c": [ + "ex/v0.23.2/status.html#git_status_byindex-16", + "ex/v0.23.2/status.html#git_status_byindex-17", + "ex/v0.23.2/status.html#git_status_byindex-18", + "ex/v0.23.2/status.html#git_status_byindex-19", + "ex/v0.23.2/status.html#git_status_byindex-20", + "ex/v0.23.2/status.html#git_status_byindex-21" + ] + } + }, + "git_status_list_free": { + "type": "function", + "file": "status.h", + "line": 344, + "lineto": 345, + "args": [ + { + "name": "statuslist", + "type": "git_status_list *", + "comment": "Existing status list object" + } + ], + "argline": "git_status_list *statuslist", + "sig": "git_status_list *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Free an existing status list

\n", + "comments": "", + "group": "status", + "examples": { + "status.c": [ + "ex/v0.23.2/status.html#git_status_list_free-22" + ] + } + }, + "git_status_should_ignore": { + "type": "function", + "file": "status.h", + "line": 363, + "lineto": 366, + "args": [ + { + "name": "ignored", + "type": "int *", + "comment": "Boolean returning 0 if the file is not ignored, 1 if it is" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "A repository object" + }, + { + "name": "path", + "type": "const char *", + "comment": "The file to check ignores for, rooted at the repo's workdir." + } + ], + "argline": "int *ignored, git_repository *repo, const char *path", + "sig": "int *::git_repository *::const char *", + "return": { + "type": "int", + "comment": " 0 if ignore rules could be processed for the file (regardless\n of whether it exists or not), or an error \n<\n 0 if they could not." + }, + "description": "

Test if the ignore rules apply to a given file.

\n", + "comments": "

This function checks the ignore rules to see if they would apply to the\n given file. This indicates if the file would be ignored regardless of\n whether the file is already in the index or committed to the repository.

\n\n

One way to think of this is if you were to do "git add ." on the\n directory containing the file, would it be added or not?

\n", + "group": "status" + }, + "git_strarray_free": { + "type": "function", + "file": "strarray.h", + "line": 41, + "lineto": 41, + "args": [ + { + "name": "array", + "type": "git_strarray *", + "comment": "git_strarray from which to free string data" + } + ], + "argline": "git_strarray *array", + "sig": "git_strarray *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Close a string array object

\n", + "comments": "

This method should be called on git_strarray objects where the strings\n array is allocated and contains allocated strings, such as what you\n would get from git_strarray_copy(). Not doing so, will result in a\n memory leak.

\n\n

This does not free the git_strarray itself, since the library will\n never allocate that object directly itself (it is more commonly embedded\n inside another struct or created on the stack).

\n", + "group": "strarray", + "examples": { + "general.c": [ + "ex/v0.23.2/general.html#git_strarray_free-69" + ], + "remote.c": [ + "ex/v0.23.2/remote.html#git_strarray_free-16", + "ex/v0.23.2/remote.html#git_strarray_free-17" + ], + "tag.c": [ + "ex/v0.23.2/tag.html#git_strarray_free-19" + ] + } + }, + "git_strarray_copy": { + "type": "function", + "file": "strarray.h", + "line": 53, + "lineto": 53, + "args": [ + { + "name": "tgt", + "type": "git_strarray *", + "comment": "target" + }, + { + "name": "src", + "type": "const git_strarray *", + "comment": "source" + } + ], + "argline": "git_strarray *tgt, const git_strarray *src", + "sig": "git_strarray *::const git_strarray *", + "return": { + "type": "int", + "comment": " 0 on success, \n<\n 0 on allocation failure" + }, + "description": "

Copy a string array object from source to target.

\n", + "comments": "

Note: target is overwritten and hence should be empty, otherwise its\n contents are leaked. Call git_strarray_free() if necessary.

\n", + "group": "strarray" + }, + "git_submodule_update_init_options": { + "type": "function", + "file": "submodule.h", + "line": 162, + "lineto": 163, + "args": [ + { + "name": "opts", + "type": "git_submodule_update_options *", + "comment": "The `git_submodule_update_options` instance to initialize." + }, + { + "name": "version", + "type": "unsigned int", + "comment": "Version of struct; pass `GIT_SUBMODULE_UPDATE_OPTIONS_VERSION`" + } + ], + "argline": "git_submodule_update_options *opts, unsigned int version", + "sig": "git_submodule_update_options *::unsigned int", + "return": { + "type": "int", + "comment": " Zero on success; -1 on failure." + }, + "description": "

Initializes a git_submodule_update_options with default values.\n Equivalent to creating an instance with GIT_SUBMODULE_UPDATE_OPTIONS_INIT.

\n", + "comments": "", + "group": "submodule" + }, + "git_submodule_update": { + "type": "function", + "file": "submodule.h", + "line": 181, + "lineto": 181, + "args": [ + { + "name": "submodule", + "type": "git_submodule *", + "comment": "Submodule object" + }, + { + "name": "init", + "type": "int", + "comment": "If the submodule is not initialized, setting this flag to true\n will initialize the submodule before updating. Otherwise, this will\n return an error if attempting to update an uninitialzed repository.\n but setting this to true forces them to be updated." + }, + { + "name": "options", + "type": "git_submodule_update_options *", + "comment": "configuration options for the update. If NULL, the\n function works as though GIT_SUBMODULE_UPDATE_OPTIONS_INIT was passed." + } + ], + "argline": "git_submodule *submodule, int init, git_submodule_update_options *options", + "sig": "git_submodule *::int::git_submodule_update_options *", + "return": { + "type": "int", + "comment": " 0 on success, any non-zero return value from a callback\n function, or a negative value to indicate an error (use\n `giterr_last` for a detailed error message)." + }, + "description": "

Update a submodule. This will clone a missing submodule and\n checkout the subrepository to the commit specified in the index of\n containing repository.

\n", + "comments": "", + "group": "submodule" + }, + "git_submodule_lookup": { + "type": "function", + "file": "submodule.h", + "line": 210, + "lineto": 213, + "args": [ + { + "name": "out", + "type": "git_submodule **", + "comment": "Output ptr to submodule; pass NULL to just get return code" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "The parent repository" + }, + { + "name": "name", + "type": "const char *", + "comment": "The name of or path to the submodule; trailing slashes okay" + } + ], + "argline": "git_submodule **out, git_repository *repo, const char *name", + "sig": "git_submodule **::git_repository *::const char *", + "return": { + "type": "int", + "comment": " 0 on success, GIT_ENOTFOUND if submodule does not exist,\n GIT_EEXISTS if a repository is found in working directory only,\n -1 on other errors." + }, + "description": "

Lookup submodule information by name or path.

\n", + "comments": "

Given either the submodule name or path (they are usually the same), this\n returns a structure describing the submodule.

\n\n

There are two expected error scenarios:

\n\n
    \n
  • The submodule is not mentioned in the HEAD, the index, and the config,\nbut does "exist" in the working directory (i.e. there is a subdirectory\nthat appears to be a Git repository). In this case, this function\nreturns GIT_EEXISTS to indicate a sub-repository exists but not in a\nstate where a git_submodule can be instantiated.
    • \n
  • The submodule is not mentioned in the HEAD, index, or config and the\nworking directory doesn't contain a value git repo at that path.\nThere may or may not be anything else at that path, but nothing that\nlooks like a submodule. In this case, this returns GIT_ENOTFOUND.
    • \n
\n\n

You must call git_submodule_free when done with the submodule.

\n", + "group": "submodule" + }, + "git_submodule_free": { + "type": "function", + "file": "submodule.h", + "line": 220, + "lineto": 220, + "args": [ + { + "name": "submodule", + "type": "git_submodule *", + "comment": "Submodule object" + } + ], + "argline": "git_submodule *submodule", + "sig": "git_submodule *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Release a submodule

\n", + "comments": "", + "group": "submodule" + }, + "git_submodule_foreach": { + "type": "function", + "file": "submodule.h", + "line": 240, + "lineto": 243, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "The repository" + }, + { + "name": "callback", + "type": "int (*)(git_submodule *, const char *, void *)", + "comment": "Function to be called with the name of each submodule.\n Return a non-zero value to terminate the iteration." + }, + { + "name": "payload", + "type": "void *", + "comment": "Extra data to pass to callback" + } + ], + "argline": "git_repository *repo, int (*)(git_submodule *, const char *, void *) callback, void *payload", + "sig": "git_repository *::int (*)(git_submodule *, const char *, void *)::void *", + "return": { + "type": "int", + "comment": " 0 on success, -1 on error, or non-zero return value of callback" + }, + "description": "

Iterate over all tracked submodules of a repository.

\n", + "comments": "

See the note on git_submodule above. This iterates over the tracked\n submodules as described therein.

\n\n

If you are concerned about items in the working directory that look like\n submodules but are not tracked, the diff API will generate a diff record\n for workdir items that look like submodules but are not tracked, showing\n them as added in the workdir. Also, the status API will treat the entire\n subdirectory of a contained git repo as a single GIT_STATUS_WT_NEW item.

\n", + "group": "submodule", + "examples": { + "status.c": [ + "ex/v0.23.2/status.html#git_submodule_foreach-23" + ] + } + }, + "git_submodule_add_setup": { + "type": "function", + "file": "submodule.h", + "line": 270, + "lineto": 275, + "args": [ + { + "name": "out", + "type": "git_submodule **", + "comment": "The newly created submodule ready to open for clone" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "The repository in which you want to create the submodule" + }, + { + "name": "url", + "type": "const char *", + "comment": "URL for the submodule's remote" + }, + { + "name": "path", + "type": "const char *", + "comment": "Path at which the submodule should be created" + }, + { + "name": "use_gitlink", + "type": "int", + "comment": "Should workdir contain a gitlink to the repo in\n .git/modules vs. repo directly in workdir." + } + ], + "argline": "git_submodule **out, git_repository *repo, const char *url, const char *path, int use_gitlink", + "sig": "git_submodule **::git_repository *::const char *::const char *::int", + "return": { + "type": "int", + "comment": " 0 on success, GIT_EEXISTS if submodule already exists,\n -1 on other errors." + }, + "description": "

Set up a new git submodule for checkout.

\n", + "comments": "

This does "git submodule add" up to the fetch and checkout of the\n submodule contents. It preps a new submodule, creates an entry in\n .gitmodules and creates an empty initialized repository either at the\n given path in the working directory or in .git/modules with a gitlink\n from the working directory to the new repo.

\n\n

To fully emulate "git submodule add" call this function, then open the\n submodule repo and perform the clone step as needed. Lastly, call\n git_submodule_add_finalize() to wrap up adding the new submodule and\n .gitmodules to the index to be ready to commit.

\n\n

You must call git_submodule_free on the submodule object when done.

\n", + "group": "submodule" + }, + "git_submodule_add_finalize": { + "type": "function", + "file": "submodule.h", + "line": 287, + "lineto": 287, + "args": [ + { + "name": "submodule", + "type": "git_submodule *", + "comment": "The submodule to finish adding." + } + ], + "argline": "git_submodule *submodule", + "sig": "git_submodule *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Resolve the setup of a new git submodule.

\n", + "comments": "

This should be called on a submodule once you have called add setup\n and done the clone of the submodule. This adds the .gitmodules file\n and the newly cloned submodule to the index to be ready to be committed\n (but doesn't actually do the commit).

\n", + "group": "submodule" + }, + "git_submodule_add_to_index": { + "type": "function", + "file": "submodule.h", + "line": 299, + "lineto": 301, + "args": [ + { + "name": "submodule", + "type": "git_submodule *", + "comment": "The submodule to add to the index" + }, + { + "name": "write_index", + "type": "int", + "comment": "Boolean if this should immediately write the index\n file. If you pass this as false, you will have to get the\n git_index and explicitly call `git_index_write()` on it to\n save the change." + } + ], + "argline": "git_submodule *submodule, int write_index", + "sig": "git_submodule *::int", + "return": { + "type": "int", + "comment": " 0 on success, \n<\n0 on failure" + }, + "description": "

Add current submodule HEAD commit to index of superproject.

\n", + "comments": "", + "group": "submodule" + }, + "git_submodule_owner": { + "type": "function", + "file": "submodule.h", + "line": 314, + "lineto": 314, + "args": [ + { + "name": "submodule", + "type": "git_submodule *", + "comment": "Pointer to submodule object" + } + ], + "argline": "git_submodule *submodule", + "sig": "git_submodule *", + "return": { + "type": "git_repository *", + "comment": " Pointer to `git_repository`" + }, + "description": "

Get the containing repository for a submodule.

\n", + "comments": "

This returns a pointer to the repository that contains the submodule.\n This is a just a reference to the repository that was passed to the\n original git_submodule_lookup() call, so if that repository has been\n freed, then this may be a dangling reference.

\n", + "group": "submodule" + }, + "git_submodule_name": { + "type": "function", + "file": "submodule.h", + "line": 322, + "lineto": 322, + "args": [ + { + "name": "submodule", + "type": "git_submodule *", + "comment": "Pointer to submodule object" + } + ], + "argline": "git_submodule *submodule", + "sig": "git_submodule *", + "return": { + "type": "const char *", + "comment": " Pointer to the submodule name" + }, + "description": "

Get the name of submodule.

\n", + "comments": "", + "group": "submodule", + "examples": { + "status.c": [ + "ex/v0.23.2/status.html#git_submodule_name-24" + ] + } + }, + "git_submodule_path": { + "type": "function", + "file": "submodule.h", + "line": 333, + "lineto": 333, + "args": [ + { + "name": "submodule", + "type": "git_submodule *", + "comment": "Pointer to submodule object" + } + ], + "argline": "git_submodule *submodule", + "sig": "git_submodule *", + "return": { + "type": "const char *", + "comment": " Pointer to the submodule path" + }, + "description": "

Get the path to the submodule.

\n", + "comments": "

The path is almost always the same as the submodule name, but the\n two are actually not required to match.

\n", + "group": "submodule", + "examples": { + "status.c": [ + "ex/v0.23.2/status.html#git_submodule_path-25" + ] + } + }, + "git_submodule_url": { + "type": "function", + "file": "submodule.h", + "line": 341, + "lineto": 341, + "args": [ + { + "name": "submodule", + "type": "git_submodule *", + "comment": "Pointer to submodule object" + } + ], + "argline": "git_submodule *submodule", + "sig": "git_submodule *", + "return": { + "type": "const char *", + "comment": " Pointer to the submodule url" + }, + "description": "

Get the URL for the submodule.

\n", + "comments": "", + "group": "submodule" + }, + "git_submodule_resolve_url": { + "type": "function", + "file": "submodule.h", + "line": 351, + "lineto": 351, + "args": [ + { + "name": "out", + "type": "git_buf *", + "comment": "buffer to store the absolute submodule url in" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "Pointer to repository object" + }, + { + "name": "url", + "type": "const char *", + "comment": "Relative url" + } + ], + "argline": "git_buf *out, git_repository *repo, const char *url", + "sig": "git_buf *::git_repository *::const char *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Resolve a submodule url relative to the given repository.

\n", + "comments": "", + "group": "submodule" + }, + "git_submodule_branch": { + "type": "function", + "file": "submodule.h", + "line": 359, + "lineto": 359, + "args": [ + { + "name": "submodule", + "type": "git_submodule *", + "comment": "Pointer to submodule object" + } + ], + "argline": "git_submodule *submodule", + "sig": "git_submodule *", + "return": { + "type": "const char *", + "comment": " Pointer to the submodule branch" + }, + "description": "

Get the branch for the submodule.

\n", + "comments": "", + "group": "submodule" + }, + "git_submodule_set_branch": { + "type": "function", + "file": "submodule.h", + "line": 372, + "lineto": 372, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "the repository to affect" + }, + { + "name": "name", + "type": "const char *", + "comment": "the name of the submodule to configure" + }, + { + "name": "branch", + "type": "const char *", + "comment": "Branch that should be used for the submodule" + } + ], + "argline": "git_repository *repo, const char *name, const char *branch", + "sig": "git_repository *::const char *::const char *", + "return": { + "type": "int", + "comment": " 0 on success, \n<\n0 on failure" + }, + "description": "

Set the branch for the submodule in the configuration

\n", + "comments": "

After calling this, you may wish to call git_submodule_sync() to\n write the changes to the checked out submodule repository.

\n", + "group": "submodule" + }, + "git_submodule_set_url": { + "type": "function", + "file": "submodule.h", + "line": 386, + "lineto": 386, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "the repository to affect" + }, + { + "name": "name", + "type": "const char *", + "comment": "the name of the submodule to configure" + }, + { + "name": "url", + "type": "const char *", + "comment": "URL that should be used for the submodule" + } + ], + "argline": "git_repository *repo, const char *name, const char *url", + "sig": "git_repository *::const char *::const char *", + "return": { + "type": "int", + "comment": " 0 on success, \n<\n0 on failure" + }, + "description": "

Set the URL for the submodule in the configuration

\n", + "comments": "

After calling this, you may wish to call git_submodule_sync() to\n write the changes to the checked out submodule repository.

\n", + "group": "submodule" + }, + "git_submodule_index_id": { + "type": "function", + "file": "submodule.h", + "line": 394, + "lineto": 394, + "args": [ + { + "name": "submodule", + "type": "git_submodule *", + "comment": "Pointer to submodule object" + } + ], + "argline": "git_submodule *submodule", + "sig": "git_submodule *", + "return": { + "type": "const git_oid *", + "comment": " Pointer to git_oid or NULL if submodule is not in index." + }, + "description": "

Get the OID for the submodule in the index.

\n", + "comments": "", + "group": "submodule" + }, + "git_submodule_head_id": { + "type": "function", + "file": "submodule.h", + "line": 402, + "lineto": 402, + "args": [ + { + "name": "submodule", + "type": "git_submodule *", + "comment": "Pointer to submodule object" + } + ], + "argline": "git_submodule *submodule", + "sig": "git_submodule *", + "return": { + "type": "const git_oid *", + "comment": " Pointer to git_oid or NULL if submodule is not in the HEAD." + }, + "description": "

Get the OID for the submodule in the current HEAD tree.

\n", + "comments": "", + "group": "submodule" + }, + "git_submodule_wd_id": { + "type": "function", + "file": "submodule.h", + "line": 415, + "lineto": 415, + "args": [ + { + "name": "submodule", + "type": "git_submodule *", + "comment": "Pointer to submodule object" + } + ], + "argline": "git_submodule *submodule", + "sig": "git_submodule *", + "return": { + "type": "const git_oid *", + "comment": " Pointer to git_oid or NULL if submodule is not checked out." + }, + "description": "

Get the OID for the submodule in the current working directory.

\n", + "comments": "

This returns the OID that corresponds to looking up 'HEAD' in the checked\n out submodule. If there are pending changes in the index or anything\n else, this won't notice that. You should call git_submodule_status()\n for a more complete picture about the state of the working directory.

\n", + "group": "submodule" + }, + "git_submodule_ignore": { + "type": "function", + "file": "submodule.h", + "line": 440, + "lineto": 441, + "args": [ + { + "name": "submodule", + "type": "git_submodule *", + "comment": "The submodule to check" + } + ], + "argline": "git_submodule *submodule", + "sig": "git_submodule *", + "return": { + "type": "git_submodule_ignore_t", + "comment": " The current git_submodule_ignore_t valyue what will be used for\n this submodule." + }, + "description": "

Get the ignore rule that will be used for the submodule.

\n", + "comments": "

These values control the behavior of git_submodule_status() for this\n submodule. There are four ignore values:

\n\n
    \n
  • GIT_SUBMODULE_IGNORE_NONE will consider any change to the contents\nof the submodule from a clean checkout to be dirty, including the\naddition of untracked files. This is the default if unspecified.
    • \n
  • GIT_SUBMODULE_IGNORE_UNTRACKED examines the contents of the\nworking tree (i.e. call git_status_foreach() on the submodule) but\nUNTRACKED files will not count as making the submodule dirty.
    • \n
  • GIT_SUBMODULE_IGNORE_DIRTY means to only check if the HEAD of the\nsubmodule has moved for status. This is fast since it does not need to\nscan the working tree of the submodule at all.
    • \n
  • GIT_SUBMODULE_IGNORE_ALL means not to open the submodule repo.\nThe working directory will be consider clean so long as there is a\nchecked out version present.
    • \n
\n", + "group": "submodule" + }, + "git_submodule_set_ignore": { + "type": "function", + "file": "submodule.h", + "line": 453, + "lineto": 456, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "the repository to affect" + }, + { + "name": "name", + "type": "const char *", + "comment": "the name of the submdule" + }, + { + "name": "ignore", + "type": "git_submodule_ignore_t", + "comment": "The new value for the ignore rule" + } + ], + "argline": "git_repository *repo, const char *name, git_submodule_ignore_t ignore", + "sig": "git_repository *::const char *::git_submodule_ignore_t", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Set the ignore rule for the submodule in the configuration

\n", + "comments": "

This does not affect any currently-loaded instances.

\n", + "group": "submodule" + }, + "git_submodule_update_strategy": { + "type": "function", + "file": "submodule.h", + "line": 468, + "lineto": 469, + "args": [ + { + "name": "submodule", + "type": "git_submodule *", + "comment": "The submodule to check" + } + ], + "argline": "git_submodule *submodule", + "sig": "git_submodule *", + "return": { + "type": "git_submodule_update_t", + "comment": " The current git_submodule_update_t value that will be used\n for this submodule." + }, + "description": "

Get the update rule that will be used for the submodule.

\n", + "comments": "

This value controls the behavior of the git submodule update command.\n There are four useful values documented with git_submodule_update_t.

\n", + "group": "submodule" + }, + "git_submodule_set_update": { + "type": "function", + "file": "submodule.h", + "line": 481, + "lineto": 484, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "the repository to affect" + }, + { + "name": "name", + "type": "const char *", + "comment": "the name of the submodule to configure" + }, + { + "name": "update", + "type": "git_submodule_update_t", + "comment": "The new value to use" + } + ], + "argline": "git_repository *repo, const char *name, git_submodule_update_t update", + "sig": "git_repository *::const char *::git_submodule_update_t", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Set the update rule for the submodule in the configuration

\n", + "comments": "

This setting won't affect any existing instances.

\n", + "group": "submodule" + }, + "git_submodule_fetch_recurse_submodules": { + "type": "function", + "file": "submodule.h", + "line": 497, + "lineto": 498, + "args": [ + { + "name": "submodule", + "type": "git_submodule *", + "comment": null + } + ], + "argline": "git_submodule *submodule", + "sig": "git_submodule *", + "return": { + "type": "git_submodule_recurse_t", + "comment": " 0 if fetchRecurseSubmodules is false, 1 if true" + }, + "description": "

Read the fetchRecurseSubmodules rule for a submodule.

\n", + "comments": "

This accesses the submodule.\n<name

\n\n
\n

.fetchRecurseSubmodules value for\n the submodule that controls fetching behavior for the submodule.

\n
\n\n

Note that at this time, libgit2 does not honor this setting and the\n fetch functionality current ignores submodules.

\n", + "group": "submodule" + }, + "git_submodule_set_fetch_recurse_submodules": { + "type": "function", + "file": "submodule.h", + "line": 510, + "lineto": 513, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "the repository to affect" + }, + { + "name": "name", + "type": "const char *", + "comment": "the submodule to configure" + }, + { + "name": "fetch_recurse_submodules", + "type": "git_submodule_recurse_t", + "comment": "Boolean value" + } + ], + "argline": "git_repository *repo, const char *name, git_submodule_recurse_t fetch_recurse_submodules", + "sig": "git_repository *::const char *::git_submodule_recurse_t", + "return": { + "type": "int", + "comment": " old value for fetchRecurseSubmodules" + }, + "description": "

Set the fetchRecurseSubmodules rule for a submodule in the configuration

\n", + "comments": "

This setting won't affect any existing instances.

\n", + "group": "submodule" + }, + "git_submodule_init": { + "type": "function", + "file": "submodule.h", + "line": 528, + "lineto": 528, + "args": [ + { + "name": "submodule", + "type": "git_submodule *", + "comment": "The submodule to write into the superproject config" + }, + { + "name": "overwrite", + "type": "int", + "comment": "By default, existing entries will not be overwritten,\n but setting this to true forces them to be updated." + } + ], + "argline": "git_submodule *submodule, int overwrite", + "sig": "git_submodule *::int", + "return": { + "type": "int", + "comment": " 0 on success, \n<\n0 on failure." + }, + "description": "

Copy submodule info into ".git/config" file.

\n", + "comments": "

Just like "git submodule init", this copies information about the\n submodule into ".git/config". You can use the accessor functions\n above to alter the in-memory git_submodule object and control what\n is written to the config, overriding what is in .gitmodules.

\n", + "group": "submodule" + }, + "git_submodule_repo_init": { + "type": "function", + "file": "submodule.h", + "line": 543, + "lineto": 546, + "args": [ + { + "name": "out", + "type": "git_repository **", + "comment": "Output pointer to the created git repository." + }, + { + "name": "sm", + "type": "const git_submodule *", + "comment": "The submodule to create a new subrepository from." + }, + { + "name": "use_gitlink", + "type": "int", + "comment": "Should the workdir contain a gitlink to\n the repo in .git/modules vs. repo directly in workdir." + } + ], + "argline": "git_repository **out, const git_submodule *sm, int use_gitlink", + "sig": "git_repository **::const git_submodule *::int", + "return": { + "type": "int", + "comment": " 0 on success, \n<\n0 on failure." + }, + "description": "

Set up the subrepository for a submodule in preparation for clone.

\n", + "comments": "

This function can be called to init and set up a submodule\n repository from a submodule in preparation to clone it from\n its remote.

\n", + "group": "submodule" + }, + "git_submodule_sync": { + "type": "function", + "file": "submodule.h", + "line": 556, + "lineto": 556, + "args": [ + { + "name": "submodule", + "type": "git_submodule *", + "comment": null + } + ], + "argline": "git_submodule *submodule", + "sig": "git_submodule *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Copy submodule remote info into submodule repo.

\n", + "comments": "

This copies the information about the submodules URL into the checked out\n submodule config, acting like "git submodule sync". This is useful if\n you have altered the URL for the submodule (or it has been altered by a\n fetch of upstream changes) and you need to update your local repo.

\n", + "group": "submodule" + }, + "git_submodule_open": { + "type": "function", + "file": "submodule.h", + "line": 570, + "lineto": 572, + "args": [ + { + "name": "repo", + "type": "git_repository **", + "comment": "Pointer to the submodule repo which was opened" + }, + { + "name": "submodule", + "type": "git_submodule *", + "comment": "Submodule to be opened" + } + ], + "argline": "git_repository **repo, git_submodule *submodule", + "sig": "git_repository **::git_submodule *", + "return": { + "type": "int", + "comment": " 0 on success, \n<\n0 if submodule repo could not be opened." + }, + "description": "

Open the repository for a submodule.

\n", + "comments": "

This is a newly opened repository object. The caller is responsible for\n calling git_repository_free() on it when done. Multiple calls to this\n function will return distinct git_repository objects. This will only\n work if the submodule is checked out into the working directory.

\n", + "group": "submodule" + }, + "git_submodule_reload": { + "type": "function", + "file": "submodule.h", + "line": 584, + "lineto": 584, + "args": [ + { + "name": "submodule", + "type": "git_submodule *", + "comment": "The submodule to reload" + }, + { + "name": "force", + "type": "int", + "comment": "Force reload even if the data doesn't seem out of date" + } + ], + "argline": "git_submodule *submodule, int force", + "sig": "git_submodule *::int", + "return": { + "type": "int", + "comment": " 0 on success, \n<\n0 on error" + }, + "description": "

Reread submodule info from config, index, and HEAD.

\n", + "comments": "

Call this to reread cached submodule information for this submodule if\n you have reason to believe that it has changed.

\n", + "group": "submodule" + }, + "git_submodule_status": { + "type": "function", + "file": "submodule.h", + "line": 600, + "lineto": 604, + "args": [ + { + "name": "status", + "type": "unsigned int *", + "comment": "Combination of `GIT_SUBMODULE_STATUS` flags" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "the repository in which to look" + }, + { + "name": "name", + "type": "const char *", + "comment": "name of the submodule" + }, + { + "name": "ignore", + "type": "git_submodule_ignore_t", + "comment": "the ignore rules to follow" + } + ], + "argline": "unsigned int *status, git_repository *repo, const char *name, git_submodule_ignore_t ignore", + "sig": "unsigned int *::git_repository *::const char *::git_submodule_ignore_t", + "return": { + "type": "int", + "comment": " 0 on success, \n<\n0 on error" + }, + "description": "

Get the status for a submodule.

\n", + "comments": "

This looks at a submodule and tries to determine the status. It\n will return a combination of the GIT_SUBMODULE_STATUS values above.\n How deeply it examines the working directory to do this will depend\n on the git_submodule_ignore_t value for the submodule.

\n", + "group": "submodule", + "examples": { + "status.c": [ + "ex/v0.23.2/status.html#git_submodule_status-26" + ] + } + }, + "git_submodule_location": { + "type": "function", + "file": "submodule.h", + "line": 620, + "lineto": 622, + "args": [ + { + "name": "location_status", + "type": "unsigned int *", + "comment": "Combination of first four `GIT_SUBMODULE_STATUS` flags" + }, + { + "name": "submodule", + "type": "git_submodule *", + "comment": "Submodule for which to get status" + } + ], + "argline": "unsigned int *location_status, git_submodule *submodule", + "sig": "unsigned int *::git_submodule *", + "return": { + "type": "int", + "comment": " 0 on success, \n<\n0 on error" + }, + "description": "

Get the locations of submodule information.

\n", + "comments": "

This is a bit like a very lightweight version of git_submodule_status.\n It just returns a made of the first four submodule status values (i.e.\n the ones like GIT_SUBMODULE_STATUS_IN_HEAD, etc) that tell you where the\n submodule data comes from (i.e. the HEAD commit, gitmodules file, etc.).\n This can be useful if you want to know if the submodule is present in the\n working directory at this point in time, etc.

\n", + "group": "submodule" + }, + "git_commit_create_from_ids": { + "type": "function", + "file": "sys/commit.h", + "line": 34, + "lineto": 44, + "args": [ + { + "name": "id", + "type": "git_oid *", + "comment": null + }, + { + "name": "repo", + "type": "git_repository *", + "comment": null + }, + { + "name": "update_ref", + "type": "const char *", + "comment": null + }, + { + "name": "author", + "type": "const git_signature *", + "comment": null + }, + { + "name": "committer", + "type": "const git_signature *", + "comment": null + }, + { + "name": "message_encoding", + "type": "const char *", + "comment": null + }, + { + "name": "message", + "type": "const char *", + "comment": null + }, + { + "name": "tree", + "type": "const git_oid *", + "comment": null + }, + { + "name": "parent_count", + "type": "size_t", + "comment": null + }, + { + "name": "parents", + "type": "const git_oid *[]", + "comment": null + } + ], + "argline": "git_oid *id, git_repository *repo, const char *update_ref, const git_signature *author, const git_signature *committer, const char *message_encoding, const char *message, const git_oid *tree, size_t parent_count, const git_oid *[] parents", + "sig": "git_oid *::git_repository *::const char *::const git_signature *::const git_signature *::const char *::const char *::const git_oid *::size_t::const git_oid *[]", + "return": { + "type": "int", + "comment": null + }, + "description": "

Create new commit in the repository from a list of git_oid values.

\n", + "comments": "

See documentation for git_commit_create() for information about the\n parameters, as the meaning is identical excepting that tree and\n parents now take git_oid. This is a dangerous API in that nor\n the tree, neither the parents list of git_oids are checked for\n validity.

\n", + "group": "commit" + }, + "git_commit_create_from_callback": { + "type": "function", + "file": "sys/commit.h", + "line": 66, + "lineto": 76, + "args": [ + { + "name": "id", + "type": "git_oid *", + "comment": null + }, + { + "name": "repo", + "type": "git_repository *", + "comment": null + }, + { + "name": "update_ref", + "type": "const char *", + "comment": null + }, + { + "name": "author", + "type": "const git_signature *", + "comment": null + }, + { + "name": "committer", + "type": "const git_signature *", + "comment": null + }, + { + "name": "message_encoding", + "type": "const char *", + "comment": null + }, + { + "name": "message", + "type": "const char *", + "comment": null + }, + { + "name": "tree", + "type": "const git_oid *", + "comment": null + }, + { + "name": "parent_cb", + "type": "git_commit_parent_callback", + "comment": null + }, + { + "name": "parent_payload", + "type": "void *", + "comment": null + } + ], + "argline": "git_oid *id, git_repository *repo, const char *update_ref, const git_signature *author, const git_signature *committer, const char *message_encoding, const char *message, const git_oid *tree, git_commit_parent_callback parent_cb, void *parent_payload", + "sig": "git_oid *::git_repository *::const char *::const git_signature *::const git_signature *::const char *::const char *::const git_oid *::git_commit_parent_callback::void *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Create a new commit in the repository with an callback to supply parents.

\n", + "comments": "

See documentation for git_commit_create() for information about the\n parameters, as the meaning is identical excepting that tree takes a\n git_oid and doesn't check for validity, and parent_cb is invoked\n with parent_payload and should return git_oid values or NULL to\n indicate that all parents are accounted for.

\n", + "group": "commit" + }, + "git_config_init_backend": { + "type": "function", + "file": "sys/config.h", + "line": 83, + "lineto": 85, + "args": [ + { + "name": "backend", + "type": "git_config_backend *", + "comment": "the `git_config_backend` struct to initialize." + }, + { + "name": "version", + "type": "unsigned int", + "comment": "Version of struct; pass `GIT_CONFIG_BACKEND_VERSION`" + } + ], + "argline": "git_config_backend *backend, unsigned int version", + "sig": "git_config_backend *::unsigned int", + "return": { + "type": "int", + "comment": " Zero on success; -1 on failure." + }, + "description": "

Initializes a git_config_backend with default values. Equivalent to\n creating an instance with GIT_CONFIG_BACKEND_INIT.

\n", + "comments": "", + "group": "config" + }, + "git_config_add_backend": { + "type": "function", + "file": "sys/config.h", + "line": 105, + "lineto": 109, + "args": [ + { + "name": "cfg", + "type": "git_config *", + "comment": "the configuration to add the file to" + }, + { + "name": "file", + "type": "git_config_backend *", + "comment": "the configuration file (backend) to add" + }, + { + "name": "level", + "type": "git_config_level_t", + "comment": "the priority level of the backend" + }, + { + "name": "force", + "type": "int", + "comment": "if a config file already exists for the given\n priority level, replace it" + } + ], + "argline": "git_config *cfg, git_config_backend *file, git_config_level_t level, int force", + "sig": "git_config *::git_config_backend *::git_config_level_t::int", + "return": { + "type": "int", + "comment": " 0 on success, GIT_EEXISTS when adding more than one file\n for a given priority level (and force_replace set to 0), or error code" + }, + "description": "

Add a generic config file instance to an existing config

\n", + "comments": "

Note that the configuration object will free the file\n automatically.

\n\n

Further queries on this config object will access each\n of the config file instances in order (instances with\n a higher priority level will be accessed first).

\n", + "group": "config" + }, + "git_diff_print_callback__to_buf": { + "type": "function", + "file": "sys/diff.h", + "line": 37, + "lineto": 41, + "args": [ + { + "name": "delta", + "type": "const git_diff_delta *", + "comment": null + }, + { + "name": "hunk", + "type": "const git_diff_hunk *", + "comment": null + }, + { + "name": "line", + "type": "const git_diff_line *", + "comment": null + }, + { + "name": "payload", + "type": "void *", + "comment": null + } + ], + "argline": "const git_diff_delta *delta, const git_diff_hunk *hunk, const git_diff_line *line, void *payload", + "sig": "const git_diff_delta *::const git_diff_hunk *::const git_diff_line *::void *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Diff print callback that writes to a git_buf.

\n", + "comments": "

This function is provided not for you to call it directly, but instead\n so you can use it as a function pointer to the git_diff_print or\n git_patch_print APIs. When using those APIs, you specify a callback\n to actually handle the diff and/or patch data.

\n\n

Use this callback to easily write that data to a git_buf buffer. You\n must pass a git_buf * value as the payload to the git_diff_print\n and/or git_patch_print function. The data will be appended to the\n buffer (after any existing content).

\n", + "group": "diff" + }, + "git_diff_print_callback__to_file_handle": { + "type": "function", + "file": "sys/diff.h", + "line": 57, + "lineto": 61, + "args": [ + { + "name": "delta", + "type": "const git_diff_delta *", + "comment": null + }, + { + "name": "hunk", + "type": "const git_diff_hunk *", + "comment": null + }, + { + "name": "line", + "type": "const git_diff_line *", + "comment": null + }, + { + "name": "payload", + "type": "void *", + "comment": null + } + ], + "argline": "const git_diff_delta *delta, const git_diff_hunk *hunk, const git_diff_line *line, void *payload", + "sig": "const git_diff_delta *::const git_diff_hunk *::const git_diff_line *::void *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Diff print callback that writes to stdio FILE handle.

\n", + "comments": "

This function is provided not for you to call it directly, but instead\n so you can use it as a function pointer to the git_diff_print or\n git_patch_print APIs. When using those APIs, you specify a callback\n to actually handle the diff and/or patch data.

\n\n

Use this callback to easily write that data to a stdio FILE handle. You\n must pass a FILE * value (such as stdout or stderr or the return\n value from fopen()) as the payload to the git_diff_print\n and/or git_patch_print function. If you pass NULL, this will write\n data to stdout.

\n", + "group": "diff" + }, + "git_diff_get_perfdata": { + "type": "function", + "file": "sys/diff.h", + "line": 83, + "lineto": 84, + "args": [ + { + "name": "out", + "type": "git_diff_perfdata *", + "comment": "Structure to be filled with diff performance data" + }, + { + "name": "diff", + "type": "const git_diff *", + "comment": "Diff to read performance data from" + } + ], + "argline": "git_diff_perfdata *out, const git_diff *diff", + "sig": "git_diff_perfdata *::const git_diff *", + "return": { + "type": "int", + "comment": " 0 for success, \n<\n0 for error" + }, + "description": "

Get performance data for a diff object.

\n", + "comments": "", + "group": "diff" + }, + "git_status_list_get_perfdata": { + "type": "function", + "file": "sys/diff.h", + "line": 89, + "lineto": 90, + "args": [ + { + "name": "out", + "type": "git_diff_perfdata *", + "comment": null + }, + { + "name": "status", + "type": "const git_status_list *", + "comment": null + } + ], + "argline": "git_diff_perfdata *out, const git_status_list *status", + "sig": "git_diff_perfdata *::const git_status_list *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Get performance data for diffs from a git_status_list

\n", + "comments": "", + "group": "status" + }, + "git_filter_lookup": { + "type": "function", + "file": "sys/filter.h", + "line": 27, + "lineto": 27, + "args": [ + { + "name": "name", + "type": "const char *", + "comment": "The name of the filter" + } + ], + "argline": "const char *name", + "sig": "const char *", + "return": { + "type": "git_filter *", + "comment": " Pointer to the filter object or NULL if not found" + }, + "description": "

Look up a filter by name

\n", + "comments": "", + "group": "filter" + }, + "git_filter_list_new": { + "type": "function", + "file": "sys/filter.h", + "line": 57, + "lineto": 61, + "args": [ + { + "name": "out", + "type": "git_filter_list **", + "comment": null + }, + { + "name": "repo", + "type": "git_repository *", + "comment": null + }, + { + "name": "mode", + "type": "git_filter_mode_t", + "comment": null + }, + { + "name": "options", + "type": "uint32_t", + "comment": null + } + ], + "argline": "git_filter_list **out, git_repository *repo, git_filter_mode_t mode, uint32_t options", + "sig": "git_filter_list **::git_repository *::git_filter_mode_t::uint32_t", + "return": { + "type": "int", + "comment": null + }, + "description": "

Create a new empty filter list

\n", + "comments": "

Normally you won't use this because git_filter_list_load will create\n the filter list for you, but you can use this in combination with the\n git_filter_lookup and git_filter_list_push functions to assemble\n your own chains of filters.

\n", + "group": "filter" + }, + "git_filter_list_push": { + "type": "function", + "file": "sys/filter.h", + "line": 76, + "lineto": 77, + "args": [ + { + "name": "fl", + "type": "git_filter_list *", + "comment": null + }, + { + "name": "filter", + "type": "git_filter *", + "comment": null + }, + { + "name": "payload", + "type": "void *", + "comment": null + } + ], + "argline": "git_filter_list *fl, git_filter *filter, void *payload", + "sig": "git_filter_list *::git_filter *::void *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Add a filter to a filter list with the given payload.

\n", + "comments": "

Normally you won't have to do this because the filter list is created\n by calling the "check" function on registered filters when the filter\n attributes are set, but this does allow more direct manipulation of\n filter lists when desired.

\n\n

Note that normally the "check" function can set up a payload for the\n filter. Using this function, you can either pass in a payload if you\n know the expected payload format, or you can pass NULL. Some filters\n may fail with a NULL payload. Good luck!

\n", + "group": "filter" + }, + "git_filter_list_length": { + "type": "function", + "file": "sys/filter.h", + "line": 90, + "lineto": 90, + "args": [ + { + "name": "fl", + "type": "const git_filter_list *", + "comment": "A filter list" + } + ], + "argline": "const git_filter_list *fl", + "sig": "const git_filter_list *", + "return": { + "type": "size_t", + "comment": " The number of filters in the list" + }, + "description": "

Look up how many filters are in the list

\n", + "comments": "

We will attempt to apply all of these filters to any data passed in,\n but note that the filter apply action still has the option of skipping\n data that is passed in (for example, the CRLF filter will skip data\n that appears to be binary).

\n", + "group": "filter" + }, + "git_filter_source_repo": { + "type": "function", + "file": "sys/filter.h", + "line": 100, + "lineto": 100, + "args": [ + { + "name": "src", + "type": "const git_filter_source *", + "comment": null + } + ], + "argline": "const git_filter_source *src", + "sig": "const git_filter_source *", + "return": { + "type": "git_repository *", + "comment": null + }, + "description": "

Get the repository that the source data is coming from.

\n", + "comments": "", + "group": "filter" + }, + "git_filter_source_path": { + "type": "function", + "file": "sys/filter.h", + "line": 105, + "lineto": 105, + "args": [ + { + "name": "src", + "type": "const git_filter_source *", + "comment": null + } + ], + "argline": "const git_filter_source *src", + "sig": "const git_filter_source *", + "return": { + "type": "const char *", + "comment": null + }, + "description": "

Get the path that the source data is coming from.

\n", + "comments": "", + "group": "filter" + }, + "git_filter_source_filemode": { + "type": "function", + "file": "sys/filter.h", + "line": 111, + "lineto": 111, + "args": [ + { + "name": "src", + "type": "const git_filter_source *", + "comment": null + } + ], + "argline": "const git_filter_source *src", + "sig": "const git_filter_source *", + "return": { + "type": "uint16_t", + "comment": null + }, + "description": "

Get the file mode of the source file\n If the mode is unknown, this will return 0

\n", + "comments": "", + "group": "filter" + }, + "git_filter_source_id": { + "type": "function", + "file": "sys/filter.h", + "line": 118, + "lineto": 118, + "args": [ + { + "name": "src", + "type": "const git_filter_source *", + "comment": null + } + ], + "argline": "const git_filter_source *src", + "sig": "const git_filter_source *", + "return": { + "type": "const git_oid *", + "comment": null + }, + "description": "

Get the OID of the source\n If the OID is unknown (often the case with GIT_FILTER_CLEAN) then\n this will return NULL.

\n", + "comments": "", + "group": "filter" + }, + "git_filter_source_mode": { + "type": "function", + "file": "sys/filter.h", + "line": 123, + "lineto": 123, + "args": [ + { + "name": "src", + "type": "const git_filter_source *", + "comment": null + } + ], + "argline": "const git_filter_source *src", + "sig": "const git_filter_source *", + "return": { + "type": "git_filter_mode_t", + "comment": null + }, + "description": "

Get the git_filter_mode_t to be used

\n", + "comments": "", + "group": "filter" + }, + "git_filter_source_flags": { + "type": "function", + "file": "sys/filter.h", + "line": 128, + "lineto": 128, + "args": [ + { + "name": "src", + "type": "const git_filter_source *", + "comment": null + } + ], + "argline": "const git_filter_source *src", + "sig": "const git_filter_source *", + "return": { + "type": "uint32_t", + "comment": null + }, + "description": "

Get the combination git_filter_flag_t options to be applied

\n", + "comments": "", + "group": "filter" + }, + "git_filter_register": { + "type": "function", + "file": "sys/filter.h", + "line": 289, + "lineto": 290, + "args": [ + { + "name": "name", + "type": "const char *", + "comment": "A name by which the filter can be referenced. Attempting\n \t\t\tto register with an in-use name will return GIT_EEXISTS." + }, + { + "name": "filter", + "type": "git_filter *", + "comment": "The filter definition. This pointer will be stored as is\n \t\t\tby libgit2 so it must be a durable allocation (either static\n \t\t\tor on the heap)." + }, + { + "name": "priority", + "type": "int", + "comment": "The priority for filter application" + } + ], + "argline": "const char *name, git_filter *filter, int priority", + "sig": "const char *::git_filter *::int", + "return": { + "type": "int", + "comment": " 0 on successful registry, error code \n<\n0 on failure" + }, + "description": "

Register a filter under a given name with a given priority.

\n", + "comments": "

As mentioned elsewhere, the initialize callback will not be invoked\n immediately. It is deferred until the filter is used in some way.

\n\n

A filter's attribute checks and check and apply callbacks will be\n issued in order of priority on smudge (to workdir), and in reverse\n order of priority on clean (to odb).

\n\n

Two filters are preregistered with libgit2:\n - GIT_FILTER_CRLF with priority 0\n - GIT_FILTER_IDENT with priority 100

\n\n

Currently the filter registry is not thread safe, so any registering or\n deregistering of filters must be done outside of any possible usage of\n the filters (i.e. during application setup or shutdown).

\n", + "group": "filter" + }, + "git_filter_unregister": { + "type": "function", + "file": "sys/filter.h", + "line": 305, + "lineto": 305, + "args": [ + { + "name": "name", + "type": "const char *", + "comment": "The name under which the filter was registered" + } + ], + "argline": "const char *name", + "sig": "const char *", + "return": { + "type": "int", + "comment": " 0 on success, error code \n<\n0 on failure" + }, + "description": "

Remove the filter with the given name

\n", + "comments": "

Attempting to remove the builtin libgit2 filters is not permitted and\n will return an error.

\n\n

Currently the filter registry is not thread safe, so any registering or\n deregistering of filters must be done outside of any possible usage of\n the filters (i.e. during application setup or shutdown).

\n", + "group": "filter" + }, + "git_hashsig_create": { + "type": "function", + "file": "sys/hashsig.h", + "line": 62, + "lineto": 66, + "args": [ + { + "name": "out", + "type": "git_hashsig **", + "comment": "The computed similarity signature." + }, + { + "name": "buf", + "type": "const char *", + "comment": "The input buffer." + }, + { + "name": "buflen", + "type": "size_t", + "comment": "The input buffer size." + }, + { + "name": "opts", + "type": "git_hashsig_option_t", + "comment": "The signature computation options (see above)." + } + ], + "argline": "git_hashsig **out, const char *buf, size_t buflen, git_hashsig_option_t opts", + "sig": "git_hashsig **::const char *::size_t::git_hashsig_option_t", + "return": { + "type": "int", + "comment": " 0 on success, GIT_EBUFS if the buffer doesn't contain enough data to\n compute a valid signature (unless GIT_HASHSIG_ALLOW_SMALL_FILES is set), or\n error code." + }, + "description": "

Compute a similarity signature for a text buffer

\n", + "comments": "

If you have passed the option GIT_HASHSIG_IGNORE_WHITESPACE, then the\n whitespace will be removed from the buffer while it is being processed,\n modifying the buffer in place. Sorry about that!

\n", + "group": "hashsig" + }, + "git_hashsig_create_fromfile": { + "type": "function", + "file": "sys/hashsig.h", + "line": 81, + "lineto": 84, + "args": [ + { + "name": "out", + "type": "git_hashsig **", + "comment": "The computed similarity signature." + }, + { + "name": "path", + "type": "const char *", + "comment": "The path to the input file." + }, + { + "name": "opts", + "type": "git_hashsig_option_t", + "comment": "The signature computation options (see above)." + } + ], + "argline": "git_hashsig **out, const char *path, git_hashsig_option_t opts", + "sig": "git_hashsig **::const char *::git_hashsig_option_t", + "return": { + "type": "int", + "comment": " 0 on success, GIT_EBUFS if the buffer doesn't contain enough data to\n compute a valid signature (unless GIT_HASHSIG_ALLOW_SMALL_FILES is set), or\n error code." + }, + "description": "

Compute a similarity signature for a text file

\n", + "comments": "

This walks through the file, only loading a maximum of 4K of file data at\n a time. Otherwise, it acts just like git_hashsig_create.

\n", + "group": "hashsig" + }, + "git_hashsig_free": { + "type": "function", + "file": "sys/hashsig.h", + "line": 91, + "lineto": 91, + "args": [ + { + "name": "sig", + "type": "git_hashsig *", + "comment": "The similarity signature to free." + } + ], + "argline": "git_hashsig *sig", + "sig": "git_hashsig *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Release memory for a content similarity signature

\n", + "comments": "", + "group": "hashsig" + }, + "git_hashsig_compare": { + "type": "function", + "file": "sys/hashsig.h", + "line": 100, + "lineto": 102, + "args": [ + { + "name": "a", + "type": "const git_hashsig *", + "comment": "The first similarity signature to compare." + }, + { + "name": "b", + "type": "const git_hashsig *", + "comment": "The second similarity signature to compare." + } + ], + "argline": "const git_hashsig *a, const git_hashsig *b", + "sig": "const git_hashsig *::const git_hashsig *", + "return": { + "type": "int", + "comment": " [0 to 100] on success as the similarity score, or error code." + }, + "description": "

Measure similarity score between two similarity signatures

\n", + "comments": "", + "group": "hashsig" + }, + "git_mempack_new": { + "type": "function", + "file": "sys/mempack.h", + "line": 44, + "lineto": 44, + "args": [ + { + "name": "out", + "type": "git_odb_backend **", + "comment": "Poiter where to store the ODB backend" + } + ], + "argline": "git_odb_backend **out", + "sig": "git_odb_backend **", + "return": { + "type": "int", + "comment": " 0 on success; error code otherwise" + }, + "description": "
Instantiate a new mempack backend.\n
\n", + "comments": "
The backend must be added to an existing ODB with the highest\npriority.\n\n    git_mempack_new(\n
\n\n

&mempacker\n);\n git_repository_odb(\n&odb\n, repository);\n git_odb_add_backend(odb, mempacker, 999);

\n\n
Once the backend has been loaded, all writes to the ODB will\ninstead be queued in memory, and can be finalized with\n`git_mempack_dump`.\n\nSubsequent reads will also be served from the in-memory store\nto ensure consistency, until the memory store is dumped.\n
\n", + "group": "mempack" + }, + "git_mempack_reset": { + "type": "function", + "file": "sys/mempack.h", + "line": 81, + "lineto": 81, + "args": [ + { + "name": "backend", + "type": "git_odb_backend *", + "comment": "The mempack backend" + } + ], + "argline": "git_odb_backend *backend", + "sig": "git_odb_backend *", + "return": { + "type": "void", + "comment": null + }, + "description": "
Reset the memory packer by clearing all the queued objects.\n
\n", + "comments": "
This assumes that `git_mempack_dump` has been called before to\nstore all the queued objects into a single packfile.\n\nAlternatively, call `reset` without a previous dump to "undo"\nall the recently written objects, giving transaction-like\nsemantics to the Git repository.\n
\n", + "group": "mempack" + }, + "git_odb_init_backend": { + "type": "function", + "file": "sys/odb_backend.h", + "line": 100, + "lineto": 102, + "args": [ + { + "name": "backend", + "type": "git_odb_backend *", + "comment": "the `git_odb_backend` struct to initialize." + }, + { + "name": "version", + "type": "unsigned int", + "comment": "Version the struct; pass `GIT_ODB_BACKEND_VERSION`" + } + ], + "argline": "git_odb_backend *backend, unsigned int version", + "sig": "git_odb_backend *::unsigned int", + "return": { + "type": "int", + "comment": " Zero on success; -1 on failure." + }, + "description": "

Initializes a git_odb_backend with default values. Equivalent to\n creating an instance with GIT_ODB_BACKEND_INIT.

\n", + "comments": "", + "group": "odb" + }, + "git_openssl_set_locking": { + "type": "function", + "file": "sys/openssl.h", + "line": 34, + "lineto": 34, + "args": [], + "argline": "", + "sig": "", + "return": { + "type": "int", + "comment": " 0 on success, -1 if there are errors or if libgit2 was not\n built with OpenSSL and threading support." + }, + "description": "

Initialize the OpenSSL locks

\n", + "comments": "

OpenSSL requires the application to determine how it performs\n locking.

\n\n

This is a last-resort convenience function which libgit2 provides for\n allocating and initializing the locks as well as setting the\n locking function to use the system's native locking functions.

\n\n

The locking function will be cleared and the memory will be freed\n when you call git_threads_sutdown().

\n\n

If your programming language has an OpenSSL package/bindings, it\n likely sets up locking. You should very strongly prefer that over\n this function.

\n", + "group": "openssl" + }, + "git_refdb_init_backend": { + "type": "function", + "file": "sys/refdb_backend.h", + "line": 182, + "lineto": 184, + "args": [ + { + "name": "backend", + "type": "git_refdb_backend *", + "comment": "the `git_refdb_backend` struct to initialize" + }, + { + "name": "version", + "type": "unsigned int", + "comment": "Version of struct; pass `GIT_REFDB_BACKEND_VERSION`" + } + ], + "argline": "git_refdb_backend *backend, unsigned int version", + "sig": "git_refdb_backend *::unsigned int", + "return": { + "type": "int", + "comment": " Zero on success; -1 on failure." + }, + "description": "

Initializes a git_refdb_backend with default values. Equivalent to\n creating an instance with GIT_REFDB_BACKEND_INIT.

\n", + "comments": "", + "group": "refdb" + }, + "git_refdb_backend_fs": { + "type": "function", + "file": "sys/refdb_backend.h", + "line": 197, + "lineto": 199, + "args": [ + { + "name": "backend_out", + "type": "git_refdb_backend **", + "comment": "Output pointer to the git_refdb_backend object" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "Git repository to access" + } + ], + "argline": "git_refdb_backend **backend_out, git_repository *repo", + "sig": "git_refdb_backend **::git_repository *", + "return": { + "type": "int", + "comment": " 0 on success, \n<\n0 error code on failure" + }, + "description": "

Constructors for default filesystem-based refdb backend

\n", + "comments": "

Under normal usage, this is called for you when the repository is\n opened / created, but you can use this to explicitly construct a\n filesystem refdb backend for a repository.

\n", + "group": "refdb" + }, + "git_refdb_set_backend": { + "type": "function", + "file": "sys/refdb_backend.h", + "line": 211, + "lineto": 213, + "args": [ + { + "name": "refdb", + "type": "git_refdb *", + "comment": "database to add the backend to" + }, + { + "name": "backend", + "type": "git_refdb_backend *", + "comment": "pointer to a git_refdb_backend instance" + } + ], + "argline": "git_refdb *refdb, git_refdb_backend *backend", + "sig": "git_refdb *::git_refdb_backend *", + "return": { + "type": "int", + "comment": " 0 on success; error code otherwise" + }, + "description": "

Sets the custom backend to an existing reference DB

\n", + "comments": "

The git_refdb will take ownership of the git_refdb_backend so you\n should NOT free it after calling this function.

\n", + "group": "refdb" + }, + "git_reference__alloc": { + "type": "function", + "file": "sys/refs.h", + "line": 31, + "lineto": 34, + "args": [ + { + "name": "name", + "type": "const char *", + "comment": "the reference name" + }, + { + "name": "oid", + "type": "const git_oid *", + "comment": "the object id for a direct reference" + }, + { + "name": "peel", + "type": "const git_oid *", + "comment": "the first non-tag object's OID, or NULL" + } + ], + "argline": "const char *name, const git_oid *oid, const git_oid *peel", + "sig": "const char *::const git_oid *::const git_oid *", + "return": { + "type": "git_reference *", + "comment": " the created git_reference or NULL on error" + }, + "description": "

Create a new direct reference from an OID.

\n", + "comments": "", + "group": "reference" + }, + "git_reference__alloc_symbolic": { + "type": "function", + "file": "sys/refs.h", + "line": 43, + "lineto": 45, + "args": [ + { + "name": "name", + "type": "const char *", + "comment": "the reference name" + }, + { + "name": "target", + "type": "const char *", + "comment": "the target for a symbolic reference" + } + ], + "argline": "const char *name, const char *target", + "sig": "const char *::const char *", + "return": { + "type": "git_reference *", + "comment": " the created git_reference or NULL on error" + }, + "description": "

Create a new symbolic reference.

\n", + "comments": "", + "group": "reference" + }, + "git_repository_new": { + "type": "function", + "file": "sys/repository.h", + "line": 31, + "lineto": 31, + "args": [ + { + "name": "out", + "type": "git_repository **", + "comment": "The blank repository" + } + ], + "argline": "git_repository **out", + "sig": "git_repository **", + "return": { + "type": "int", + "comment": " 0 on success, or an error code" + }, + "description": "

Create a new repository with neither backends nor config object

\n", + "comments": "

Note that this is only useful if you wish to associate the repository\n with a non-filesystem-backed object database and config store.

\n", + "group": "repository" + }, + "git_repository__cleanup": { + "type": "function", + "file": "sys/repository.h", + "line": 44, + "lineto": 44, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": null + } + ], + "argline": "git_repository *repo", + "sig": "git_repository *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Reset all the internal state in a repository.

\n", + "comments": "

This will free all the mapped memory and internal objects\n of the repository and leave it in a "blank" state.

\n\n

There's no need to call this function directly unless you're\n trying to aggressively cleanup the repo before its\n deallocation. git_repository_free already performs this operation\n before deallocation the repo.

\n", + "group": "repository" + }, + "git_repository_reinit_filesystem": { + "type": "function", + "file": "sys/repository.h", + "line": 61, + "lineto": 63, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "A repository object" + }, + { + "name": "recurse_submodules", + "type": "int", + "comment": "Should submodules be updated recursively" + } + ], + "argline": "git_repository *repo, int recurse_submodules", + "sig": "git_repository *::int", + "return": { + "type": "int", + "comment": " 0 on success, \n<\n 0 on error" + }, + "description": "

Update the filesystem config settings for an open repository

\n", + "comments": "

When a repository is initialized, config values are set based on the\n properties of the filesystem that the repository is on, such as\n "core.ignorecase", "core.filemode", "core.symlinks", etc. If the\n repository is moved to a new filesystem, these properties may no\n longer be correct and API calls may not behave as expected. This\n call reruns the phase of repository initialization that sets those\n properties to compensate for the current filesystem of the repo.

\n", + "group": "repository" + }, + "git_repository_set_config": { + "type": "function", + "file": "sys/repository.h", + "line": 78, + "lineto": 78, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "A repository object" + }, + { + "name": "config", + "type": "git_config *", + "comment": "A Config object" + } + ], + "argline": "git_repository *repo, git_config *config", + "sig": "git_repository *::git_config *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Set the configuration file for this repository

\n", + "comments": "

This configuration file will be used for all configuration\n queries involving this repository.

\n\n

The repository will keep a reference to the config file;\n the user must still free the config after setting it\n to the repository, or it will leak.

\n", + "group": "repository" + }, + "git_repository_set_odb": { + "type": "function", + "file": "sys/repository.h", + "line": 93, + "lineto": 93, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "A repository object" + }, + { + "name": "odb", + "type": "git_odb *", + "comment": "An ODB object" + } + ], + "argline": "git_repository *repo, git_odb *odb", + "sig": "git_repository *::git_odb *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Set the Object Database for this repository

\n", + "comments": "

The ODB will be used for all object-related operations\n involving this repository.

\n\n

The repository will keep a reference to the ODB; the user\n must still free the ODB object after setting it to the\n repository, or it will leak.

\n", + "group": "repository" + }, + "git_repository_set_refdb": { + "type": "function", + "file": "sys/repository.h", + "line": 108, + "lineto": 108, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "A repository object" + }, + { + "name": "refdb", + "type": "git_refdb *", + "comment": "An refdb object" + } + ], + "argline": "git_repository *repo, git_refdb *refdb", + "sig": "git_repository *::git_refdb *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Set the Reference Database Backend for this repository

\n", + "comments": "

The refdb will be used for all reference related operations\n involving this repository.

\n\n

The repository will keep a reference to the refdb; the user\n must still free the refdb object after setting it to the\n repository, or it will leak.

\n", + "group": "repository" + }, + "git_repository_set_index": { + "type": "function", + "file": "sys/repository.h", + "line": 123, + "lineto": 123, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "A repository object" + }, + { + "name": "index", + "type": "git_index *", + "comment": "An index object" + } + ], + "argline": "git_repository *repo, git_index *index", + "sig": "git_repository *::git_index *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Set the index file for this repository

\n", + "comments": "

This index will be used for all index-related operations\n involving this repository.

\n\n

The repository will keep a reference to the index file;\n the user must still free the index after setting it\n to the repository, or it will leak.

\n", + "group": "repository" + }, + "git_repository_set_bare": { + "type": "function", + "file": "sys/repository.h", + "line": 136, + "lineto": 136, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "Repo to make bare" + } + ], + "argline": "git_repository *repo", + "sig": "git_repository *", + "return": { + "type": "int", + "comment": " 0 on success, \n<\n0 on failure" + }, + "description": "

Set a repository to be bare.

\n", + "comments": "

Clear the working directory and set core.bare to true. You may also\n want to call git_repository_set_index(repo, NULL) since a bare repo\n typically does not have an index, but this function will not do that\n for you.

\n", + "group": "repository" + }, + "git_transport_init": { + "type": "function", + "file": "sys/transport.h", + "line": 111, + "lineto": 113, + "args": [ + { + "name": "opts", + "type": "git_transport *", + "comment": "the `git_transport` struct to initialize" + }, + { + "name": "version", + "type": "unsigned int", + "comment": "Version of struct; pass `GIT_TRANSPORT_VERSION`" + } + ], + "argline": "git_transport *opts, unsigned int version", + "sig": "git_transport *::unsigned int", + "return": { + "type": "int", + "comment": " Zero on success; -1 on failure." + }, + "description": "

Initializes a git_transport with default values. Equivalent to\n creating an instance with GIT_TRANSPORT_INIT.

\n", + "comments": "", + "group": "transport" + }, + "git_transport_new": { + "type": "function", + "file": "sys/transport.h", + "line": 125, + "lineto": 125, + "args": [ + { + "name": "out", + "type": "git_transport **", + "comment": "The newly created transport (out)" + }, + { + "name": "owner", + "type": "git_remote *", + "comment": "The git_remote which will own this transport" + }, + { + "name": "url", + "type": "const char *", + "comment": "The URL to connect to" + } + ], + "argline": "git_transport **out, git_remote *owner, const char *url", + "sig": "git_transport **::git_remote *::const char *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Function to use to create a transport from a URL. The transport database\n is scanned to find a transport that implements the scheme of the URI (i.e.\n git:// or http://) and a transport object is returned to the caller.

\n", + "comments": "", + "group": "transport" + }, + "git_transport_ssh_with_paths": { + "type": "function", + "file": "sys/transport.h", + "line": 141, + "lineto": 141, + "args": [ + { + "name": "out", + "type": "git_transport **", + "comment": "the resulting transport" + }, + { + "name": "owner", + "type": "git_remote *", + "comment": "the owning remote" + }, + { + "name": "payload", + "type": "void *", + "comment": "a strarray with the paths" + } + ], + "argline": "git_transport **out, git_remote *owner, void *payload", + "sig": "git_transport **::git_remote *::void *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Create an ssh transport with custom git command paths

\n", + "comments": "

This is a factory function suitable for setting as the transport\n callback in a remote (or for a clone in the options).

\n\n

The payload argument must be a strarray pointer with the paths for\n the git-upload-pack and git-receive-pack at index 0 and 1.

\n", + "group": "transport" + }, + "git_transport_unregister": { + "type": "function", + "file": "sys/transport.h", + "line": 169, + "lineto": 170, + "args": [ + { + "name": "prefix", + "type": "const char *", + "comment": "From the previous call to git_transport_register" + } + ], + "argline": "const char *prefix", + "sig": "const char *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Unregister a custom transport definition which was previously registered\n with git_transport_register.

\n", + "comments": "", + "group": "transport" + }, + "git_transport_dummy": { + "type": "function", + "file": "sys/transport.h", + "line": 183, + "lineto": 186, + "args": [ + { + "name": "out", + "type": "git_transport **", + "comment": "The newly created transport (out)" + }, + { + "name": "owner", + "type": "git_remote *", + "comment": "The git_remote which will own this transport" + }, + { + "name": "payload", + "type": "void *", + "comment": "You must pass NULL for this parameter." + } + ], + "argline": "git_transport **out, git_remote *owner, void *payload", + "sig": "git_transport **::git_remote *::void *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Create an instance of the dummy transport.

\n", + "comments": "", + "group": "transport" + }, + "git_transport_local": { + "type": "function", + "file": "sys/transport.h", + "line": 196, + "lineto": 199, + "args": [ + { + "name": "out", + "type": "git_transport **", + "comment": "The newly created transport (out)" + }, + { + "name": "owner", + "type": "git_remote *", + "comment": "The git_remote which will own this transport" + }, + { + "name": "payload", + "type": "void *", + "comment": "You must pass NULL for this parameter." + } + ], + "argline": "git_transport **out, git_remote *owner, void *payload", + "sig": "git_transport **::git_remote *::void *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Create an instance of the local transport.

\n", + "comments": "", + "group": "transport" + }, + "git_transport_smart": { + "type": "function", + "file": "sys/transport.h", + "line": 209, + "lineto": 212, + "args": [ + { + "name": "out", + "type": "git_transport **", + "comment": "The newly created transport (out)" + }, + { + "name": "owner", + "type": "git_remote *", + "comment": "The git_remote which will own this transport" + }, + { + "name": "payload", + "type": "void *", + "comment": "A pointer to a git_smart_subtransport_definition" + } + ], + "argline": "git_transport **out, git_remote *owner, void *payload", + "sig": "git_transport **::git_remote *::void *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Create an instance of the smart transport.

\n", + "comments": "", + "group": "transport" + }, + "git_smart_subtransport_http": { + "type": "function", + "file": "sys/transport.h", + "line": 322, + "lineto": 325, + "args": [ + { + "name": "out", + "type": "git_smart_subtransport **", + "comment": "The newly created subtransport" + }, + { + "name": "owner", + "type": "git_transport *", + "comment": "The smart transport to own this subtransport" + }, + { + "name": "param", + "type": "void *", + "comment": null + } + ], + "argline": "git_smart_subtransport **out, git_transport *owner, void *param", + "sig": "git_smart_subtransport **::git_transport *::void *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Create an instance of the http subtransport. This subtransport\n also supports https. On Win32, this subtransport may be implemented\n using the WinHTTP library.

\n", + "comments": "", + "group": "smart" + }, + "git_smart_subtransport_git": { + "type": "function", + "file": "sys/transport.h", + "line": 334, + "lineto": 337, + "args": [ + { + "name": "out", + "type": "git_smart_subtransport **", + "comment": "The newly created subtransport" + }, + { + "name": "owner", + "type": "git_transport *", + "comment": "The smart transport to own this subtransport" + }, + { + "name": "param", + "type": "void *", + "comment": null + } + ], + "argline": "git_smart_subtransport **out, git_transport *owner, void *param", + "sig": "git_smart_subtransport **::git_transport *::void *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Create an instance of the git subtransport.

\n", + "comments": "", + "group": "smart" + }, + "git_smart_subtransport_ssh": { + "type": "function", + "file": "sys/transport.h", + "line": 346, + "lineto": 349, + "args": [ + { + "name": "out", + "type": "git_smart_subtransport **", + "comment": "The newly created subtransport" + }, + { + "name": "owner", + "type": "git_transport *", + "comment": "The smart transport to own this subtransport" + }, + { + "name": "param", + "type": "void *", + "comment": null + } + ], + "argline": "git_smart_subtransport **out, git_transport *owner, void *param", + "sig": "git_smart_subtransport **::git_transport *::void *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Create an instance of the ssh subtransport.

\n", + "comments": "", + "group": "smart" + }, + "git_tag_lookup": { + "type": "function", + "file": "tag.h", + "line": 33, + "lineto": 34, + "args": [ + { + "name": "out", + "type": "git_tag **", + "comment": "pointer to the looked up tag" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "the repo to use when locating the tag." + }, + { + "name": "id", + "type": "const git_oid *", + "comment": "identity of the tag to locate." + } + ], + "argline": "git_tag **out, git_repository *repo, const git_oid *id", + "sig": "git_tag **::git_repository *::const git_oid *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Lookup a tag object from the repository.

\n", + "comments": "", + "group": "tag", + "examples": { + "general.c": [ + "ex/v0.23.2/general.html#git_tag_lookup-70" + ] + } + }, + "git_tag_lookup_prefix": { + "type": "function", + "file": "tag.h", + "line": 48, + "lineto": 49, + "args": [ + { + "name": "out", + "type": "git_tag **", + "comment": "pointer to the looked up tag" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "the repo to use when locating the tag." + }, + { + "name": "id", + "type": "const git_oid *", + "comment": "identity of the tag to locate." + }, + { + "name": "len", + "type": "size_t", + "comment": "the length of the short identifier" + } + ], + "argline": "git_tag **out, git_repository *repo, const git_oid *id, size_t len", + "sig": "git_tag **::git_repository *::const git_oid *::size_t", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Lookup a tag object from the repository,\n given a prefix of its identifier (short id).

\n", + "comments": "", + "group": "tag" + }, + "git_tag_free": { + "type": "function", + "file": "tag.h", + "line": 61, + "lineto": 61, + "args": [ + { + "name": "tag", + "type": "git_tag *", + "comment": "the tag to close" + } + ], + "argline": "git_tag *tag", + "sig": "git_tag *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Close an open tag

\n", + "comments": "

You can no longer use the git_tag pointer after this call.

\n\n

IMPORTANT: You MUST call this method when you are through with a tag to\n release memory. Failure to do so will cause a memory leak.

\n", + "group": "tag" + }, + "git_tag_id": { + "type": "function", + "file": "tag.h", + "line": 69, + "lineto": 69, + "args": [ + { + "name": "tag", + "type": "const git_tag *", + "comment": "a previously loaded tag." + } + ], + "argline": "const git_tag *tag", + "sig": "const git_tag *", + "return": { + "type": "const git_oid *", + "comment": " object identity for the tag." + }, + "description": "

Get the id of a tag.

\n", + "comments": "", + "group": "tag" + }, + "git_tag_owner": { + "type": "function", + "file": "tag.h", + "line": 77, + "lineto": 77, + "args": [ + { + "name": "tag", + "type": "const git_tag *", + "comment": "A previously loaded tag." + } + ], + "argline": "const git_tag *tag", + "sig": "const git_tag *", + "return": { + "type": "git_repository *", + "comment": " Repository that contains this tag." + }, + "description": "

Get the repository that contains the tag.

\n", + "comments": "", + "group": "tag" + }, + "git_tag_target": { + "type": "function", + "file": "tag.h", + "line": 89, + "lineto": 89, + "args": [ + { + "name": "target_out", + "type": "git_object **", + "comment": "pointer where to store the target" + }, + { + "name": "tag", + "type": "const git_tag *", + "comment": "a previously loaded tag." + } + ], + "argline": "git_object **target_out, const git_tag *tag", + "sig": "git_object **::const git_tag *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Get the tagged object of a tag

\n", + "comments": "

This method performs a repository lookup for the\n given object and returns it

\n", + "group": "tag", + "examples": { + "general.c": [ + "ex/v0.23.2/general.html#git_tag_target-71" + ] + } + }, + "git_tag_target_id": { + "type": "function", + "file": "tag.h", + "line": 97, + "lineto": 97, + "args": [ + { + "name": "tag", + "type": "const git_tag *", + "comment": "a previously loaded tag." + } + ], + "argline": "const git_tag *tag", + "sig": "const git_tag *", + "return": { + "type": "const git_oid *", + "comment": " pointer to the OID" + }, + "description": "

Get the OID of the tagged object of a tag

\n", + "comments": "", + "group": "tag", + "examples": { + "cat-file.c": [ + "ex/v0.23.2/cat-file.html#git_tag_target_id-35" + ] + } + }, + "git_tag_target_type": { + "type": "function", + "file": "tag.h", + "line": 105, + "lineto": 105, + "args": [ + { + "name": "tag", + "type": "const git_tag *", + "comment": "a previously loaded tag." + } + ], + "argline": "const git_tag *tag", + "sig": "const git_tag *", + "return": { + "type": "git_otype", + "comment": " type of the tagged object" + }, + "description": "

Get the type of a tag's tagged object

\n", + "comments": "", + "group": "tag", + "examples": { + "cat-file.c": [ + "ex/v0.23.2/cat-file.html#git_tag_target_type-36" + ], + "general.c": [ + "ex/v0.23.2/general.html#git_tag_target_type-72" + ] + } + }, + "git_tag_name": { + "type": "function", + "file": "tag.h", + "line": 113, + "lineto": 113, + "args": [ + { + "name": "tag", + "type": "const git_tag *", + "comment": "a previously loaded tag." + } + ], + "argline": "const git_tag *tag", + "sig": "const git_tag *", + "return": { + "type": "const char *", + "comment": " name of the tag" + }, + "description": "

Get the name of a tag

\n", + "comments": "", + "group": "tag", + "examples": { + "cat-file.c": [ + "ex/v0.23.2/cat-file.html#git_tag_name-37" + ], + "general.c": [ + "ex/v0.23.2/general.html#git_tag_name-73" + ], + "tag.c": [ + "ex/v0.23.2/tag.html#git_tag_name-20" + ] + } + }, + "git_tag_tagger": { + "type": "function", + "file": "tag.h", + "line": 121, + "lineto": 121, + "args": [ + { + "name": "tag", + "type": "const git_tag *", + "comment": "a previously loaded tag." + } + ], + "argline": "const git_tag *tag", + "sig": "const git_tag *", + "return": { + "type": "const git_signature *", + "comment": " reference to the tag's author or NULL when unspecified" + }, + "description": "

Get the tagger (author) of a tag

\n", + "comments": "", + "group": "tag", + "examples": { + "cat-file.c": [ + "ex/v0.23.2/cat-file.html#git_tag_tagger-38" + ] + } + }, + "git_tag_message": { + "type": "function", + "file": "tag.h", + "line": 129, + "lineto": 129, + "args": [ + { + "name": "tag", + "type": "const git_tag *", + "comment": "a previously loaded tag." + } + ], + "argline": "const git_tag *tag", + "sig": "const git_tag *", + "return": { + "type": "const char *", + "comment": " message of the tag or NULL when unspecified" + }, + "description": "

Get the message of a tag

\n", + "comments": "", + "group": "tag", + "examples": { + "cat-file.c": [ + "ex/v0.23.2/cat-file.html#git_tag_message-39", + "ex/v0.23.2/cat-file.html#git_tag_message-40" + ], + "general.c": [ + "ex/v0.23.2/general.html#git_tag_message-74" + ], + "tag.c": [ + "ex/v0.23.2/tag.html#git_tag_message-21" + ] + } + }, + "git_tag_create": { + "type": "function", + "file": "tag.h", + "line": 171, + "lineto": 178, + "args": [ + { + "name": "oid", + "type": "git_oid *", + "comment": "Pointer where to store the OID of the\n newly created tag. If the tag already exists, this parameter\n will be the oid of the existing tag, and the function will\n return a GIT_EEXISTS error code." + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "Repository where to store the tag" + }, + { + "name": "tag_name", + "type": "const char *", + "comment": "Name for the tag; this name is validated\n for consistency. It should also not conflict with an\n already existing tag name" + }, + { + "name": "target", + "type": "const git_object *", + "comment": "Object to which this tag points. This object\n must belong to the given `repo`." + }, + { + "name": "tagger", + "type": "const git_signature *", + "comment": "Signature of the tagger for this tag, and\n of the tagging time" + }, + { + "name": "message", + "type": "const char *", + "comment": "Full message for this tag" + }, + { + "name": "force", + "type": "int", + "comment": "Overwrite existing references" + } + ], + "argline": "git_oid *oid, git_repository *repo, const char *tag_name, const git_object *target, const git_signature *tagger, const char *message, int force", + "sig": "git_oid *::git_repository *::const char *::const git_object *::const git_signature *::const char *::int", + "return": { + "type": "int", + "comment": " 0 on success, GIT_EINVALIDSPEC or an error code\n\tA tag object is written to the ODB, and a proper reference\n\tis written in the /refs/tags folder, pointing to it" + }, + "description": "

Create a new tag in the repository from an object

\n", + "comments": "

A new reference will also be created pointing to\n this tag object. If force is true and a reference\n already exists with the given name, it'll be replaced.

\n\n

The message will not be cleaned up. This can be achieved\n through git_message_prettify().

\n\n

The tag name will be checked for validity. You must avoid\n the characters '~', '^', ':', '\n\\\n', '?', '[', and '*', and the\n sequences ".." and "\n@\n{" which have special meaning to revparse.

\n", + "group": "tag", + "examples": { + "tag.c": [ + "ex/v0.23.2/tag.html#git_tag_create-22" + ] + } + }, + "git_tag_annotation_create": { + "type": "function", + "file": "tag.h", + "line": 203, + "lineto": 209, + "args": [ + { + "name": "oid", + "type": "git_oid *", + "comment": "Pointer where to store the OID of the\n newly created tag" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "Repository where to store the tag" + }, + { + "name": "tag_name", + "type": "const char *", + "comment": "Name for the tag" + }, + { + "name": "target", + "type": "const git_object *", + "comment": "Object to which this tag points. This object\n must belong to the given `repo`." + }, + { + "name": "tagger", + "type": "const git_signature *", + "comment": "Signature of the tagger for this tag, and\n of the tagging time" + }, + { + "name": "message", + "type": "const char *", + "comment": "Full message for this tag" + } + ], + "argline": "git_oid *oid, git_repository *repo, const char *tag_name, const git_object *target, const git_signature *tagger, const char *message", + "sig": "git_oid *::git_repository *::const char *::const git_object *::const git_signature *::const char *", + "return": { + "type": "int", + "comment": " 0 on success or an error code" + }, + "description": "

Create a new tag in the object database pointing to a git_object

\n", + "comments": "

The message will not be cleaned up. This can be achieved\n through git_message_prettify().

\n", + "group": "tag" + }, + "git_tag_create_frombuffer": { + "type": "function", + "file": "tag.h", + "line": 220, + "lineto": 224, + "args": [ + { + "name": "oid", + "type": "git_oid *", + "comment": "Pointer where to store the OID of the newly created tag" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "Repository where to store the tag" + }, + { + "name": "buffer", + "type": "const char *", + "comment": "Raw tag data" + }, + { + "name": "force", + "type": "int", + "comment": "Overwrite existing tags" + } + ], + "argline": "git_oid *oid, git_repository *repo, const char *buffer, int force", + "sig": "git_oid *::git_repository *::const char *::int", + "return": { + "type": "int", + "comment": " 0 on success; error code otherwise" + }, + "description": "

Create a new tag in the repository from a buffer

\n", + "comments": "", + "group": "tag" + }, + "git_tag_create_lightweight": { + "type": "function", + "file": "tag.h", + "line": 256, + "lineto": 261, + "args": [ + { + "name": "oid", + "type": "git_oid *", + "comment": "Pointer where to store the OID of the provided\n target object. If the tag already exists, this parameter\n will be filled with the oid of the existing pointed object\n and the function will return a GIT_EEXISTS error code." + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "Repository where to store the lightweight tag" + }, + { + "name": "tag_name", + "type": "const char *", + "comment": "Name for the tag; this name is validated\n for consistency. It should also not conflict with an\n already existing tag name" + }, + { + "name": "target", + "type": "const git_object *", + "comment": "Object to which this tag points. This object\n must belong to the given `repo`." + }, + { + "name": "force", + "type": "int", + "comment": "Overwrite existing references" + } + ], + "argline": "git_oid *oid, git_repository *repo, const char *tag_name, const git_object *target, int force", + "sig": "git_oid *::git_repository *::const char *::const git_object *::int", + "return": { + "type": "int", + "comment": " 0 on success, GIT_EINVALIDSPEC or an error code\n\tA proper reference is written in the /refs/tags folder,\n pointing to the provided target object" + }, + "description": "

Create a new lightweight tag pointing at a target object

\n", + "comments": "

A new direct reference will be created pointing to\n this target object. If force is true and a reference\n already exists with the given name, it'll be replaced.

\n\n

The tag name will be checked for validity.\n See git_tag_create() for rules about valid names.

\n", + "group": "tag", + "examples": { + "tag.c": [ + "ex/v0.23.2/tag.html#git_tag_create_lightweight-23" + ] + } + }, + "git_tag_delete": { + "type": "function", + "file": "tag.h", + "line": 276, + "lineto": 278, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "Repository where lives the tag" + }, + { + "name": "tag_name", + "type": "const char *", + "comment": "Name of the tag to be deleted;\n this name is validated for consistency." + } + ], + "argline": "git_repository *repo, const char *tag_name", + "sig": "git_repository *::const char *", + "return": { + "type": "int", + "comment": " 0 on success, GIT_EINVALIDSPEC or an error code" + }, + "description": "

Delete an existing tag reference.

\n", + "comments": "

The tag name will be checked for validity.\n See git_tag_create() for rules about valid names.

\n", + "group": "tag", + "examples": { + "tag.c": [ + "ex/v0.23.2/tag.html#git_tag_delete-24" + ] + } + }, + "git_tag_list": { + "type": "function", + "file": "tag.h", + "line": 293, + "lineto": 295, + "args": [ + { + "name": "tag_names", + "type": "git_strarray *", + "comment": "Pointer to a git_strarray structure where\n\t\tthe tag names will be stored" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "Repository where to find the tags" + } + ], + "argline": "git_strarray *tag_names, git_repository *repo", + "sig": "git_strarray *::git_repository *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Fill a list with all the tags in the Repository

\n", + "comments": "

The string array will be filled with the names of the\n matching tags; these values are owned by the user and\n should be free'd manually when no longer needed, using\n git_strarray_free.

\n", + "group": "tag" + }, + "git_tag_list_match": { + "type": "function", + "file": "tag.h", + "line": 315, + "lineto": 318, + "args": [ + { + "name": "tag_names", + "type": "git_strarray *", + "comment": "Pointer to a git_strarray structure where\n\t\tthe tag names will be stored" + }, + { + "name": "pattern", + "type": "const char *", + "comment": "Standard fnmatch pattern" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "Repository where to find the tags" + } + ], + "argline": "git_strarray *tag_names, const char *pattern, git_repository *repo", + "sig": "git_strarray *::const char *::git_repository *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Fill a list with all the tags in the Repository\n which name match a defined pattern

\n", + "comments": "

If an empty pattern is provided, all the tags\n will be returned.

\n\n

The string array will be filled with the names of the\n matching tags; these values are owned by the user and\n should be free'd manually when no longer needed, using\n git_strarray_free.

\n", + "group": "tag", + "examples": { + "tag.c": [ + "ex/v0.23.2/tag.html#git_tag_list_match-25" + ] + } + }, + "git_tag_foreach": { + "type": "function", + "file": "tag.h", + "line": 330, + "lineto": 333, + "args": [ + { + "name": "repo", + "type": "git_repository *", + "comment": "Repository" + }, + { + "name": "callback", + "type": "git_tag_foreach_cb", + "comment": "Callback function" + }, + { + "name": "payload", + "type": "void *", + "comment": "Pointer to callback data (optional)" + } + ], + "argline": "git_repository *repo, git_tag_foreach_cb callback, void *payload", + "sig": "git_repository *::git_tag_foreach_cb::void *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Call callback `cb' for each tag in the repository

\n", + "comments": "", + "group": "tag" + }, + "git_tag_peel": { + "type": "function", + "file": "tag.h", + "line": 346, + "lineto": 348, + "args": [ + { + "name": "tag_target_out", + "type": "git_object **", + "comment": "Pointer to the peeled git_object" + }, + { + "name": "tag", + "type": "const git_tag *", + "comment": "The tag to be processed" + } + ], + "argline": "git_object **tag_target_out, const git_tag *tag", + "sig": "git_object **::const git_tag *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Recursively peel a tag until a non tag git_object is found

\n", + "comments": "

The retrieved tag_target object is owned by the repository\n and should be closed with the git_object_free method.

\n", + "group": "tag" + }, + "git_trace_set": { + "type": "function", + "file": "trace.h", + "line": 63, + "lineto": 63, + "args": [ + { + "name": "level", + "type": "git_trace_level_t", + "comment": "Level to set tracing to" + }, + { + "name": "cb", + "type": "git_trace_callback", + "comment": "Function to call with trace data" + } + ], + "argline": "git_trace_level_t level, git_trace_callback cb", + "sig": "git_trace_level_t::git_trace_callback", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Sets the system tracing configuration to the specified level with the\n specified callback. When system events occur at a level equal to, or\n lower than, the given level they will be reported to the given callback.

\n", + "comments": "", + "group": "trace" + }, + "git_cred_has_username": { + "type": "function", + "file": "transport.h", + "line": 197, + "lineto": 197, + "args": [ + { + "name": "cred", + "type": "git_cred *", + "comment": "object to check" + } + ], + "argline": "git_cred *cred", + "sig": "git_cred *", + "return": { + "type": "int", + "comment": " 1 if the credential object has non-NULL username, 0 otherwise" + }, + "description": "

Check whether a credential object contains username information.

\n", + "comments": "", + "group": "cred" + }, + "git_cred_userpass_plaintext_new": { + "type": "function", + "file": "transport.h", + "line": 208, + "lineto": 211, + "args": [ + { + "name": "out", + "type": "git_cred **", + "comment": "The newly created credential object." + }, + { + "name": "username", + "type": "const char *", + "comment": "The username of the credential." + }, + { + "name": "password", + "type": "const char *", + "comment": "The password of the credential." + } + ], + "argline": "git_cred **out, const char *username, const char *password", + "sig": "git_cred **::const char *::const char *", + "return": { + "type": "int", + "comment": " 0 for success or an error code for failure" + }, + "description": "

Create a new plain-text username and password credential object.\n The supplied credential parameter will be internally duplicated.

\n", + "comments": "", + "group": "cred" + }, + "git_cred_ssh_key_new": { + "type": "function", + "file": "transport.h", + "line": 224, + "lineto": 229, + "args": [ + { + "name": "out", + "type": "git_cred **", + "comment": "The newly created credential object." + }, + { + "name": "username", + "type": "const char *", + "comment": "username to use to authenticate" + }, + { + "name": "publickey", + "type": "const char *", + "comment": "The path to the public key of the credential." + }, + { + "name": "privatekey", + "type": "const char *", + "comment": "The path to the private key of the credential." + }, + { + "name": "passphrase", + "type": "const char *", + "comment": "The passphrase of the credential." + } + ], + "argline": "git_cred **out, const char *username, const char *publickey, const char *privatekey, const char *passphrase", + "sig": "git_cred **::const char *::const char *::const char *::const char *", + "return": { + "type": "int", + "comment": " 0 for success or an error code for failure" + }, + "description": "

Create a new passphrase-protected ssh key credential object.\n The supplied credential parameter will be internally duplicated.

\n", + "comments": "", + "group": "cred" + }, + "git_cred_ssh_interactive_new": { + "type": "function", + "file": "transport.h", + "line": 240, + "lineto": 244, + "args": [ + { + "name": "out", + "type": "git_cred **", + "comment": null + }, + { + "name": "username", + "type": "const char *", + "comment": "Username to use to authenticate." + }, + { + "name": "prompt_callback", + "type": "git_cred_ssh_interactive_callback", + "comment": "The callback method used for prompts." + }, + { + "name": "payload", + "type": "void *", + "comment": "Additional data to pass to the callback." + } + ], + "argline": "git_cred **out, const char *username, git_cred_ssh_interactive_callback prompt_callback, void *payload", + "sig": "git_cred **::const char *::git_cred_ssh_interactive_callback::void *", + "return": { + "type": "int", + "comment": " 0 for success or an error code for failure." + }, + "description": "

Create a new ssh keyboard-interactive based credential object.\n The supplied credential parameter will be internally duplicated.

\n", + "comments": "", + "group": "cred" + }, + "git_cred_ssh_key_from_agent": { + "type": "function", + "file": "transport.h", + "line": 254, + "lineto": 256, + "args": [ + { + "name": "out", + "type": "git_cred **", + "comment": "The newly created credential object." + }, + { + "name": "username", + "type": "const char *", + "comment": "username to use to authenticate" + } + ], + "argline": "git_cred **out, const char *username", + "sig": "git_cred **::const char *", + "return": { + "type": "int", + "comment": " 0 for success or an error code for failure" + }, + "description": "

Create a new ssh key credential object used for querying an ssh-agent.\n The supplied credential parameter will be internally duplicated.

\n", + "comments": "", + "group": "cred" + }, + "git_cred_ssh_custom_new": { + "type": "function", + "file": "transport.h", + "line": 276, + "lineto": 282, + "args": [ + { + "name": "out", + "type": "git_cred **", + "comment": "The newly created credential object." + }, + { + "name": "username", + "type": "const char *", + "comment": "username to use to authenticate" + }, + { + "name": "publickey", + "type": "const char *", + "comment": "The bytes of the public key." + }, + { + "name": "publickey_len", + "type": "size_t", + "comment": "The length of the public key in bytes." + }, + { + "name": "sign_callback", + "type": "git_cred_sign_callback", + "comment": "The callback method to sign the data during the challenge." + }, + { + "name": "payload", + "type": "void *", + "comment": "Additional data to pass to the callback." + } + ], + "argline": "git_cred **out, const char *username, const char *publickey, size_t publickey_len, git_cred_sign_callback sign_callback, void *payload", + "sig": "git_cred **::const char *::const char *::size_t::git_cred_sign_callback::void *", + "return": { + "type": "int", + "comment": " 0 for success or an error code for failure" + }, + "description": "

Create an ssh key credential with a custom signing function.

\n", + "comments": "

This lets you use your own function to sign the challenge.

\n\n

This function and its credential type is provided for completeness\n and wraps libssh2_userauth_publickey(), which is undocumented.

\n\n

The supplied credential parameter will be internally duplicated.

\n", + "group": "cred" + }, + "git_cred_default_new": { + "type": "function", + "file": "transport.h", + "line": 290, + "lineto": 290, + "args": [ + { + "name": "out", + "type": "git_cred **", + "comment": null + } + ], + "argline": "git_cred **out", + "sig": "git_cred **", + "return": { + "type": "int", + "comment": " 0 for success or an error code for failure" + }, + "description": "

Create a "default" credential usable for Negotiate mechanisms like NTLM\n or Kerberos authentication.

\n", + "comments": "", + "group": "cred" + }, + "git_cred_username_new": { + "type": "function", + "file": "transport.h", + "line": 298, + "lineto": 298, + "args": [ + { + "name": "cred", + "type": "git_cred **", + "comment": null + }, + { + "name": "username", + "type": "const char *", + "comment": null + } + ], + "argline": "git_cred **cred, const char *username", + "sig": "git_cred **::const char *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Create a credential to specify a username.

\n", + "comments": "

This is used with ssh authentication to query for the username if\n none is specified in the url.

\n", + "group": "cred" + }, + "git_cred_ssh_key_memory_new": { + "type": "function", + "file": "transport.h", + "line": 310, + "lineto": 315, + "args": [ + { + "name": "out", + "type": "git_cred **", + "comment": "The newly created credential object." + }, + { + "name": "username", + "type": "const char *", + "comment": "username to use to authenticate." + }, + { + "name": "publickey", + "type": "const char *", + "comment": "The public key of the credential." + }, + { + "name": "privatekey", + "type": "const char *", + "comment": "The private key of the credential." + }, + { + "name": "passphrase", + "type": "const char *", + "comment": "The passphrase of the credential." + } + ], + "argline": "git_cred **out, const char *username, const char *publickey, const char *privatekey, const char *passphrase", + "sig": "git_cred **::const char *::const char *::const char *::const char *", + "return": { + "type": "int", + "comment": " 0 for success or an error code for failure" + }, + "description": "

Create a new ssh key credential object reading the keys from memory.

\n", + "comments": "", + "group": "cred" + }, + "git_tree_lookup": { + "type": "function", + "file": "tree.h", + "line": 32, + "lineto": 33, + "args": [ + { + "name": "out", + "type": "git_tree **", + "comment": "Pointer to the looked up tree" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "The repo to use when locating the tree." + }, + { + "name": "id", + "type": "const git_oid *", + "comment": "Identity of the tree to locate." + } + ], + "argline": "git_tree **out, git_repository *repo, const git_oid *id", + "sig": "git_tree **::git_repository *::const git_oid *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Lookup a tree object from the repository.

\n", + "comments": "", + "group": "tree", + "examples": { + "general.c": [ + "ex/v0.23.2/general.html#git_tree_lookup-75", + "ex/v0.23.2/general.html#git_tree_lookup-76" + ], + "init.c": [ + "ex/v0.23.2/init.html#git_tree_lookup-14" + ] + } + }, + "git_tree_lookup_prefix": { + "type": "function", + "file": "tree.h", + "line": 47, + "lineto": 51, + "args": [ + { + "name": "out", + "type": "git_tree **", + "comment": "pointer to the looked up tree" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "the repo to use when locating the tree." + }, + { + "name": "id", + "type": "const git_oid *", + "comment": "identity of the tree to locate." + }, + { + "name": "len", + "type": "size_t", + "comment": "the length of the short identifier" + } + ], + "argline": "git_tree **out, git_repository *repo, const git_oid *id, size_t len", + "sig": "git_tree **::git_repository *::const git_oid *::size_t", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Lookup a tree object from the repository,\n given a prefix of its identifier (short id).

\n", + "comments": "", + "group": "tree" + }, + "git_tree_free": { + "type": "function", + "file": "tree.h", + "line": 63, + "lineto": 63, + "args": [ + { + "name": "tree", + "type": "git_tree *", + "comment": "The tree to close" + } + ], + "argline": "git_tree *tree", + "sig": "git_tree *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Close an open tree

\n", + "comments": "

You can no longer use the git_tree pointer after this call.

\n\n

IMPORTANT: You MUST call this method when you stop using a tree to\n release memory. Failure to do so will cause a memory leak.

\n", + "group": "tree", + "examples": { + "diff.c": [ + "ex/v0.23.2/diff.html#git_tree_free-17", + "ex/v0.23.2/diff.html#git_tree_free-18" + ], + "init.c": [ + "ex/v0.23.2/init.html#git_tree_free-15" + ], + "log.c": [ + "ex/v0.23.2/log.html#git_tree_free-58", + "ex/v0.23.2/log.html#git_tree_free-59", + "ex/v0.23.2/log.html#git_tree_free-60", + "ex/v0.23.2/log.html#git_tree_free-61", + "ex/v0.23.2/log.html#git_tree_free-62" + ] + } + }, + "git_tree_id": { + "type": "function", + "file": "tree.h", + "line": 71, + "lineto": 71, + "args": [ + { + "name": "tree", + "type": "const git_tree *", + "comment": "a previously loaded tree." + } + ], + "argline": "const git_tree *tree", + "sig": "const git_tree *", + "return": { + "type": "const git_oid *", + "comment": " object identity for the tree." + }, + "description": "

Get the id of a tree.

\n", + "comments": "", + "group": "tree" + }, + "git_tree_owner": { + "type": "function", + "file": "tree.h", + "line": 79, + "lineto": 79, + "args": [ + { + "name": "tree", + "type": "const git_tree *", + "comment": "A previously loaded tree." + } + ], + "argline": "const git_tree *tree", + "sig": "const git_tree *", + "return": { + "type": "git_repository *", + "comment": " Repository that contains this tree." + }, + "description": "

Get the repository that contains the tree.

\n", + "comments": "", + "group": "tree" + }, + "git_tree_entrycount": { + "type": "function", + "file": "tree.h", + "line": 87, + "lineto": 87, + "args": [ + { + "name": "tree", + "type": "const git_tree *", + "comment": "a previously loaded tree." + } + ], + "argline": "const git_tree *tree", + "sig": "const git_tree *", + "return": { + "type": "size_t", + "comment": " the number of entries in the tree" + }, + "description": "

Get the number of entries listed in a tree

\n", + "comments": "", + "group": "tree", + "examples": { + "cat-file.c": [ + "ex/v0.23.2/cat-file.html#git_tree_entrycount-41" + ], + "general.c": [ + "ex/v0.23.2/general.html#git_tree_entrycount-77" + ] + } + }, + "git_tree_entry_byname": { + "type": "function", + "file": "tree.h", + "line": 99, + "lineto": 100, + "args": [ + { + "name": "tree", + "type": "const git_tree *", + "comment": "a previously loaded tree." + }, + { + "name": "filename", + "type": "const char *", + "comment": "the filename of the desired entry" + } + ], + "argline": "const git_tree *tree, const char *filename", + "sig": "const git_tree *::const char *", + "return": { + "type": "const git_tree_entry *", + "comment": " the tree entry; NULL if not found" + }, + "description": "

Lookup a tree entry by its filename

\n", + "comments": "

This returns a git_tree_entry that is owned by the git_tree. You don't\n have to free it, but you must not use it after the git_tree is released.

\n", + "group": "tree", + "examples": { + "general.c": [ + "ex/v0.23.2/general.html#git_tree_entry_byname-78" + ] + } + }, + "git_tree_entry_byindex": { + "type": "function", + "file": "tree.h", + "line": 112, + "lineto": 113, + "args": [ + { + "name": "tree", + "type": "const git_tree *", + "comment": "a previously loaded tree." + }, + { + "name": "idx", + "type": "size_t", + "comment": "the position in the entry list" + } + ], + "argline": "const git_tree *tree, size_t idx", + "sig": "const git_tree *::size_t", + "return": { + "type": "const git_tree_entry *", + "comment": " the tree entry; NULL if not found" + }, + "description": "

Lookup a tree entry by its position in the tree

\n", + "comments": "

This returns a git_tree_entry that is owned by the git_tree. You don't\n have to free it, but you must not use it after the git_tree is released.

\n", + "group": "tree", + "examples": { + "cat-file.c": [ + "ex/v0.23.2/cat-file.html#git_tree_entry_byindex-42" + ], + "general.c": [ + "ex/v0.23.2/general.html#git_tree_entry_byindex-79" + ] + } + }, + "git_tree_entry_byid": { + "type": "function", + "file": "tree.h", + "line": 127, + "lineto": 128, + "args": [ + { + "name": "tree", + "type": "const git_tree *", + "comment": "a previously loaded tree." + }, + { + "name": "id", + "type": "const git_oid *", + "comment": "the sha being looked for" + } + ], + "argline": "const git_tree *tree, const git_oid *id", + "sig": "const git_tree *::const git_oid *", + "return": { + "type": "const git_tree_entry *", + "comment": " the tree entry; NULL if not found" + }, + "description": "

Lookup a tree entry by SHA value.

\n", + "comments": "

This returns a git_tree_entry that is owned by the git_tree. You don't\n have to free it, but you must not use it after the git_tree is released.

\n\n

Warning: this must examine every entry in the tree, so it is not fast.

\n", + "group": "tree" + }, + "git_tree_entry_bypath": { + "type": "function", + "file": "tree.h", + "line": 142, + "lineto": 145, + "args": [ + { + "name": "out", + "type": "git_tree_entry **", + "comment": "Pointer where to store the tree entry" + }, + { + "name": "root", + "type": "const git_tree *", + "comment": "Previously loaded tree which is the root of the relative path" + }, + { + "name": "path", + "type": "const char *", + "comment": "Path to the contained entry" + } + ], + "argline": "git_tree_entry **out, const git_tree *root, const char *path", + "sig": "git_tree_entry **::const git_tree *::const char *", + "return": { + "type": "int", + "comment": " 0 on success; GIT_ENOTFOUND if the path does not exist" + }, + "description": "

Retrieve a tree entry contained in a tree or in any of its subtrees,\n given its relative path.

\n", + "comments": "

Unlike the other lookup functions, the returned tree entry is owned by\n the user and must be freed explicitly with git_tree_entry_free().

\n", + "group": "tree" + }, + "git_tree_entry_dup": { + "type": "function", + "file": "tree.h", + "line": 157, + "lineto": 157, + "args": [ + { + "name": "dest", + "type": "git_tree_entry **", + "comment": "pointer where to store the copy" + }, + { + "name": "source", + "type": "const git_tree_entry *", + "comment": "tree entry to duplicate" + } + ], + "argline": "git_tree_entry **dest, const git_tree_entry *source", + "sig": "git_tree_entry **::const git_tree_entry *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Duplicate a tree entry

\n", + "comments": "

Create a copy of a tree entry. The returned copy is owned by the user,\n and must be freed explicitly with git_tree_entry_free().

\n", + "group": "tree" + }, + "git_tree_entry_free": { + "type": "function", + "file": "tree.h", + "line": 168, + "lineto": 168, + "args": [ + { + "name": "entry", + "type": "git_tree_entry *", + "comment": "The entry to free" + } + ], + "argline": "git_tree_entry *entry", + "sig": "git_tree_entry *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Free a user-owned tree entry

\n", + "comments": "

IMPORTANT: This function is only needed for tree entries owned by the\n user, such as the ones returned by git_tree_entry_dup() or\n git_tree_entry_bypath().

\n", + "group": "tree" + }, + "git_tree_entry_name": { + "type": "function", + "file": "tree.h", + "line": 176, + "lineto": 176, + "args": [ + { + "name": "entry", + "type": "const git_tree_entry *", + "comment": "a tree entry" + } + ], + "argline": "const git_tree_entry *entry", + "sig": "const git_tree_entry *", + "return": { + "type": "const char *", + "comment": " the name of the file" + }, + "description": "

Get the filename of a tree entry

\n", + "comments": "", + "group": "tree", + "examples": { + "cat-file.c": [ + "ex/v0.23.2/cat-file.html#git_tree_entry_name-43" + ], + "general.c": [ + "ex/v0.23.2/general.html#git_tree_entry_name-80", + "ex/v0.23.2/general.html#git_tree_entry_name-81" + ] + } + }, + "git_tree_entry_id": { + "type": "function", + "file": "tree.h", + "line": 184, + "lineto": 184, + "args": [ + { + "name": "entry", + "type": "const git_tree_entry *", + "comment": "a tree entry" + } + ], + "argline": "const git_tree_entry *entry", + "sig": "const git_tree_entry *", + "return": { + "type": "const git_oid *", + "comment": " the oid of the object" + }, + "description": "

Get the id of the object pointed by the entry

\n", + "comments": "", + "group": "tree", + "examples": { + "cat-file.c": [ + "ex/v0.23.2/cat-file.html#git_tree_entry_id-44" + ] + } + }, + "git_tree_entry_type": { + "type": "function", + "file": "tree.h", + "line": 192, + "lineto": 192, + "args": [ + { + "name": "entry", + "type": "const git_tree_entry *", + "comment": "a tree entry" + } + ], + "argline": "const git_tree_entry *entry", + "sig": "const git_tree_entry *", + "return": { + "type": "git_otype", + "comment": " the type of the pointed object" + }, + "description": "

Get the type of the object pointed by the entry

\n", + "comments": "", + "group": "tree", + "examples": { + "cat-file.c": [ + "ex/v0.23.2/cat-file.html#git_tree_entry_type-45" + ] + } + }, + "git_tree_entry_filemode": { + "type": "function", + "file": "tree.h", + "line": 200, + "lineto": 200, + "args": [ + { + "name": "entry", + "type": "const git_tree_entry *", + "comment": "a tree entry" + } + ], + "argline": "const git_tree_entry *entry", + "sig": "const git_tree_entry *", + "return": { + "type": "git_filemode_t", + "comment": " filemode as an integer" + }, + "description": "

Get the UNIX file attributes of a tree entry

\n", + "comments": "", + "group": "tree", + "examples": { + "cat-file.c": [ + "ex/v0.23.2/cat-file.html#git_tree_entry_filemode-46" + ] + } + }, + "git_tree_entry_filemode_raw": { + "type": "function", + "file": "tree.h", + "line": 212, + "lineto": 212, + "args": [ + { + "name": "entry", + "type": "const git_tree_entry *", + "comment": "a tree entry" + } + ], + "argline": "const git_tree_entry *entry", + "sig": "const git_tree_entry *", + "return": { + "type": "git_filemode_t", + "comment": " filemode as an integer" + }, + "description": "

Get the raw UNIX file attributes of a tree entry

\n", + "comments": "

This function does not perform any normalization and is only useful\n if you need to be able to recreate the original tree object.

\n", + "group": "tree" + }, + "git_tree_entry_cmp": { + "type": "function", + "file": "tree.h", + "line": 220, + "lineto": 220, + "args": [ + { + "name": "e1", + "type": "const git_tree_entry *", + "comment": "first tree entry" + }, + { + "name": "e2", + "type": "const git_tree_entry *", + "comment": "second tree entry" + } + ], + "argline": "const git_tree_entry *e1, const git_tree_entry *e2", + "sig": "const git_tree_entry *::const git_tree_entry *", + "return": { + "type": "int", + "comment": " \n<\n0 if e1 is before e2, 0 if e1 == e2, >0 if e1 is after e2" + }, + "description": "

Compare two tree entries

\n", + "comments": "", + "group": "tree" + }, + "git_tree_entry_to_object": { + "type": "function", + "file": "tree.h", + "line": 232, + "lineto": 235, + "args": [ + { + "name": "object_out", + "type": "git_object **", + "comment": "pointer to the converted object" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "repository where to lookup the pointed object" + }, + { + "name": "entry", + "type": "const git_tree_entry *", + "comment": "a tree entry" + } + ], + "argline": "git_object **object_out, git_repository *repo, const git_tree_entry *entry", + "sig": "git_object **::git_repository *::const git_tree_entry *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Convert a tree entry to the git_object it points to.

\n", + "comments": "

You must call git_object_free() on the object when you are done with it.

\n", + "group": "tree", + "examples": { + "general.c": [ + "ex/v0.23.2/general.html#git_tree_entry_to_object-82" + ] + } + }, + "git_treebuilder_new": { + "type": "function", + "file": "tree.h", + "line": 254, + "lineto": 255, + "args": [ + { + "name": "out", + "type": "git_treebuilder **", + "comment": "Pointer where to store the tree builder" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "Repository in which to store the object" + }, + { + "name": "source", + "type": "const git_tree *", + "comment": "Source tree to initialize the builder (optional)" + } + ], + "argline": "git_treebuilder **out, git_repository *repo, const git_tree *source", + "sig": "git_treebuilder **::git_repository *::const git_tree *", + "return": { + "type": "int", + "comment": " 0 on success; error code otherwise" + }, + "description": "

Create a new tree builder.

\n", + "comments": "

The tree builder can be used to create or modify trees in memory and\n write them as tree objects to the database.

\n\n

If the source parameter is not NULL, the tree builder will be\n initialized with the entries of the given tree.

\n\n

If the source parameter is NULL, the tree builder will start with no\n entries and will have to be filled manually.

\n", + "group": "treebuilder" + }, + "git_treebuilder_clear": { + "type": "function", + "file": "tree.h", + "line": 262, + "lineto": 262, + "args": [ + { + "name": "bld", + "type": "git_treebuilder *", + "comment": "Builder to clear" + } + ], + "argline": "git_treebuilder *bld", + "sig": "git_treebuilder *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Clear all the entires in the builder

\n", + "comments": "", + "group": "treebuilder" + }, + "git_treebuilder_entrycount": { + "type": "function", + "file": "tree.h", + "line": 270, + "lineto": 270, + "args": [ + { + "name": "bld", + "type": "git_treebuilder *", + "comment": "a previously loaded treebuilder." + } + ], + "argline": "git_treebuilder *bld", + "sig": "git_treebuilder *", + "return": { + "type": "unsigned int", + "comment": " the number of entries in the treebuilder" + }, + "description": "

Get the number of entries listed in a treebuilder

\n", + "comments": "", + "group": "treebuilder" + }, + "git_treebuilder_free": { + "type": "function", + "file": "tree.h", + "line": 281, + "lineto": 281, + "args": [ + { + "name": "bld", + "type": "git_treebuilder *", + "comment": "Builder to free" + } + ], + "argline": "git_treebuilder *bld", + "sig": "git_treebuilder *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Free a tree builder

\n", + "comments": "

This will clear all the entries and free to builder.\n Failing to free the builder after you're done using it\n will result in a memory leak

\n", + "group": "treebuilder" + }, + "git_treebuilder_get": { + "type": "function", + "file": "tree.h", + "line": 293, + "lineto": 294, + "args": [ + { + "name": "bld", + "type": "git_treebuilder *", + "comment": "Tree builder" + }, + { + "name": "filename", + "type": "const char *", + "comment": "Name of the entry" + } + ], + "argline": "git_treebuilder *bld, const char *filename", + "sig": "git_treebuilder *::const char *", + "return": { + "type": "const git_tree_entry *", + "comment": " pointer to the entry; NULL if not found" + }, + "description": "

Get an entry from the builder from its filename

\n", + "comments": "

The returned entry is owned by the builder and should\n not be freed manually.

\n", + "group": "treebuilder" + }, + "git_treebuilder_insert": { + "type": "function", + "file": "tree.h", + "line": 323, + "lineto": 328, + "args": [ + { + "name": "out", + "type": "const git_tree_entry **", + "comment": "Pointer to store the entry (optional)" + }, + { + "name": "bld", + "type": "git_treebuilder *", + "comment": "Tree builder" + }, + { + "name": "filename", + "type": "const char *", + "comment": "Filename of the entry" + }, + { + "name": "id", + "type": "const git_oid *", + "comment": "SHA1 oid of the entry" + }, + { + "name": "filemode", + "type": "git_filemode_t", + "comment": "Folder attributes of the entry. This parameter must\n\t\t\tbe valued with one of the following entries: 0040000, 0100644,\n\t\t\t0100755, 0120000 or 0160000." + } + ], + "argline": "const git_tree_entry **out, git_treebuilder *bld, const char *filename, const git_oid *id, git_filemode_t filemode", + "sig": "const git_tree_entry **::git_treebuilder *::const char *::const git_oid *::git_filemode_t", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Add or update an entry to the builder

\n", + "comments": "

Insert a new entry for filename in the builder with the\n given attributes.

\n\n

If an entry named filename already exists, its attributes\n will be updated with the given ones.

\n\n

The optional pointer out can be used to retrieve a pointer to the\n newly created/updated entry. Pass NULL if you do not need it. The\n pointer may not be valid past the next operation in this\n builder. Duplicate the entry if you want to keep it.

\n\n

No attempt is being made to ensure that the provided oid points\n to an existing git object in the object database, nor that the\n attributes make sense regarding the type of the pointed at object.

\n", + "group": "treebuilder" + }, + "git_treebuilder_remove": { + "type": "function", + "file": "tree.h", + "line": 336, + "lineto": 337, + "args": [ + { + "name": "bld", + "type": "git_treebuilder *", + "comment": "Tree builder" + }, + { + "name": "filename", + "type": "const char *", + "comment": "Filename of the entry to remove" + } + ], + "argline": "git_treebuilder *bld, const char *filename", + "sig": "git_treebuilder *::const char *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Remove an entry from the builder by its filename

\n", + "comments": "", + "group": "treebuilder" + }, + "git_treebuilder_filter": { + "type": "function", + "file": "tree.h", + "line": 360, + "lineto": 363, + "args": [ + { + "name": "bld", + "type": "git_treebuilder *", + "comment": "Tree builder" + }, + { + "name": "filter", + "type": "git_treebuilder_filter_cb", + "comment": "Callback to filter entries" + }, + { + "name": "payload", + "type": "void *", + "comment": "Extra data to pass to filter callback" + } + ], + "argline": "git_treebuilder *bld, git_treebuilder_filter_cb filter, void *payload", + "sig": "git_treebuilder *::git_treebuilder_filter_cb::void *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Selectively remove entries in the tree

\n", + "comments": "

The filter callback will be called for each entry in the tree with a\n pointer to the entry and the provided payload; if the callback returns\n non-zero, the entry will be filtered (removed from the builder).

\n", + "group": "treebuilder" + }, + "git_treebuilder_write": { + "type": "function", + "file": "tree.h", + "line": 375, + "lineto": 376, + "args": [ + { + "name": "id", + "type": "git_oid *", + "comment": "Pointer to store the OID of the newly written tree" + }, + { + "name": "bld", + "type": "git_treebuilder *", + "comment": "Tree builder to write" + } + ], + "argline": "git_oid *id, git_treebuilder *bld", + "sig": "git_oid *::git_treebuilder *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Write the contents of the tree builder as a tree object

\n", + "comments": "

The tree builder will be written to the given repo, and its\n identifying SHA1 hash will be stored in the id pointer.

\n", + "group": "treebuilder" + }, + "git_tree_walk": { + "type": "function", + "file": "tree.h", + "line": 406, + "lineto": 410, + "args": [ + { + "name": "tree", + "type": "const git_tree *", + "comment": "The tree to walk" + }, + { + "name": "mode", + "type": "git_treewalk_mode", + "comment": "Traversal mode (pre or post-order)" + }, + { + "name": "callback", + "type": "git_treewalk_cb", + "comment": "Function to call on each tree entry" + }, + { + "name": "payload", + "type": "void *", + "comment": "Opaque pointer to be passed on each callback" + } + ], + "argline": "const git_tree *tree, git_treewalk_mode mode, git_treewalk_cb callback, void *payload", + "sig": "const git_tree *::git_treewalk_mode::git_treewalk_cb::void *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Traverse the entries in a tree and its subtrees in post or pre order.

\n", + "comments": "

The entries will be traversed in the specified order, children subtrees\n will be automatically loaded as required, and the callback will be\n called once per entry with the current (relative) root for the entry and\n the entry data itself.

\n\n

If the callback returns a positive value, the passed entry will be\n skipped on the traversal (in pre mode). A negative value stops the walk.

\n", + "group": "tree" + } + }, + "callbacks": { + "git_checkout_notify_cb": { + "type": "callback", + "file": "checkout.h", + "line": 223, + "lineto": 229, + "args": [ + { + "name": "why", + "type": "git_checkout_notify_t", + "comment": null + }, + { + "name": "path", + "type": "const char *", + "comment": null + }, + { + "name": "baseline", + "type": "const git_diff_file *", + "comment": null + }, + { + "name": "target", + "type": "const git_diff_file *", + "comment": null + }, + { + "name": "workdir", + "type": "const git_diff_file *", + "comment": null + }, + { + "name": "payload", + "type": "void *", + "comment": null + } + ], + "argline": "git_checkout_notify_t why, const char *path, const git_diff_file *baseline, const git_diff_file *target, const git_diff_file *workdir, void *payload", + "sig": "git_checkout_notify_t::const char *::const git_diff_file *::const git_diff_file *::const git_diff_file *::void *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Checkout notification callback function

\n", + "comments": "" + }, + "git_checkout_progress_cb": { + "type": "callback", + "file": "checkout.h", + "line": 232, + "lineto": 236, + "args": [ + { + "name": "path", + "type": "const char *", + "comment": null + }, + { + "name": "completed_steps", + "type": "size_t", + "comment": null + }, + { + "name": "total_steps", + "type": "size_t", + "comment": null + }, + { + "name": "payload", + "type": "void *", + "comment": null + } + ], + "argline": "const char *path, size_t completed_steps, size_t total_steps, void *payload", + "sig": "const char *::size_t::size_t::void *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Checkout progress notification function

\n", + "comments": "" + }, + "git_checkout_perfdata_cb": { + "type": "callback", + "file": "checkout.h", + "line": 239, + "lineto": 241, + "args": [ + { + "name": "perfdata", + "type": "const git_checkout_perfdata *", + "comment": null + }, + { + "name": "payload", + "type": "void *", + "comment": null + } + ], + "argline": "const git_checkout_perfdata *perfdata, void *payload", + "sig": "const git_checkout_perfdata *::void *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Checkout perfdata notification function

\n", + "comments": "" + }, + "git_remote_create_cb": { + "type": "callback", + "file": "clone.h", + "line": 69, + "lineto": 74, + "args": [ + { + "name": "out", + "type": "git_remote **", + "comment": "the resulting remote" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "the repository in which to create the remote" + }, + { + "name": "name", + "type": "const char *", + "comment": "the remote's name" + }, + { + "name": "url", + "type": "const char *", + "comment": "the remote's url" + }, + { + "name": "payload", + "type": "void *", + "comment": "an opaque payload" + } + ], + "argline": "git_remote **out, git_repository *repo, const char *name, const char *url, void *payload", + "sig": "git_remote **::git_repository *::const char *::const char *::void *", + "return": { + "type": "int", + "comment": " 0, GIT_EINVALIDSPEC, GIT_EEXISTS or an error code" + }, + "description": "

The signature of a function matching git_remote_create, with an additional\n void* as a callback payload.

\n", + "comments": "

Callers of git_clone may provide a function matching this signature to override\n the remote creation and customization process during a clone operation.

\n" + }, + "git_repository_create_cb": { + "type": "callback", + "file": "clone.h", + "line": 90, + "lineto": 94, + "args": [ + { + "name": "out", + "type": "git_repository **", + "comment": "the resulting repository" + }, + { + "name": "path", + "type": "const char *", + "comment": "path in which to create the repository" + }, + { + "name": "bare", + "type": "int", + "comment": "whether the repository is bare. This is the value from the clone options" + }, + { + "name": "payload", + "type": "void *", + "comment": "payload specified by the options" + } + ], + "argline": "git_repository **out, const char *path, int bare, void *payload", + "sig": "git_repository **::const char *::int::void *", + "return": { + "type": "int", + "comment": " 0, or a negative value to indicate error" + }, + "description": "

The signature of a function matchin git_repository_init, with an\n aditional void * as callback payload.

\n", + "comments": "

Callers of git_clone my provide a function matching this signature\n to override the repository creation and customization process\n during a clone operation.

\n" + }, + "git_diff_notify_cb": { + "type": "callback", + "file": "diff.h", + "line": 343, + "lineto": 347, + "args": [ + { + "name": "diff_so_far", + "type": "const git_diff *", + "comment": null + }, + { + "name": "delta_to_add", + "type": "const git_diff_delta *", + "comment": null + }, + { + "name": "matched_pathspec", + "type": "const char *", + "comment": null + }, + { + "name": "payload", + "type": "void *", + "comment": null + } + ], + "argline": "const git_diff *diff_so_far, const git_diff_delta *delta_to_add, const char *matched_pathspec, void *payload", + "sig": "const git_diff *::const git_diff_delta *::const char *::void *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Diff notification callback function.

\n", + "comments": "

The callback will be called for each file, just before the git_delta_t\n gets inserted into the diff.

\n\n

When the callback:\n - returns \n<\n 0, the diff process will be aborted.\n - returns > 0, the delta will not be inserted into the diff, but the\n diff process continues.\n - returns 0, the delta is inserted into the diff, and the diff process\n continues.

\n" + }, + "git_diff_file_cb": { + "type": "callback", + "file": "diff.h", + "line": 423, + "lineto": 426, + "args": [ + { + "name": "delta", + "type": "const git_diff_delta *", + "comment": "A pointer to the delta data for the file" + }, + { + "name": "progress", + "type": "float", + "comment": "Goes from 0 to 1 over the diff" + }, + { + "name": "payload", + "type": "void *", + "comment": "User-specified pointer from foreach function" + } + ], + "argline": "const git_diff_delta *delta, float progress, void *payload", + "sig": "const git_diff_delta *::float::void *", + "return": { + "type": "int", + "comment": null + }, + "description": "

When iterating over a diff, callback that will be made per file.

\n", + "comments": "" + }, + "git_diff_binary_cb": { + "type": "callback", + "file": "diff.h", + "line": 470, + "lineto": 473, + "args": [ + { + "name": "delta", + "type": "const git_diff_delta *", + "comment": null + }, + { + "name": "binary", + "type": "const git_diff_binary *", + "comment": null + }, + { + "name": "payload", + "type": "void *", + "comment": null + } + ], + "argline": "const git_diff_delta *delta, const git_diff_binary *binary, void *payload", + "sig": "const git_diff_delta *::const git_diff_binary *::void *", + "return": { + "type": "int", + "comment": null + }, + "description": "

When iterating over a diff, callback that will be made for\n binary content within the diff.

\n", + "comments": "" + }, + "git_diff_hunk_cb": { + "type": "callback", + "file": "diff.h", + "line": 490, + "lineto": 493, + "args": [ + { + "name": "delta", + "type": "const git_diff_delta *", + "comment": null + }, + { + "name": "hunk", + "type": "const git_diff_hunk *", + "comment": null + }, + { + "name": "payload", + "type": "void *", + "comment": null + } + ], + "argline": "const git_diff_delta *delta, const git_diff_hunk *hunk, void *payload", + "sig": "const git_diff_delta *::const git_diff_hunk *::void *", + "return": { + "type": "int", + "comment": null + }, + "description": "

When iterating over a diff, callback that will be made per hunk.

\n", + "comments": "" + }, + "git_diff_line_cb": { + "type": "callback", + "file": "diff.h", + "line": 543, + "lineto": 547, + "args": [ + { + "name": "delta", + "type": "const git_diff_delta *", + "comment": null + }, + { + "name": "hunk", + "type": "const git_diff_hunk *", + "comment": null + }, + { + "name": "line", + "type": "const git_diff_line *", + "comment": null + }, + { + "name": "payload", + "type": "void *", + "comment": null + } + ], + "argline": "const git_diff_delta *delta, const git_diff_hunk *hunk, const git_diff_line *line, void *payload", + "sig": "const git_diff_delta *::const git_diff_hunk *::const git_diff_line *::void *", + "return": { + "type": "int", + "comment": null + }, + "description": "

When iterating over a diff, callback that will be made per text diff\n line. In this context, the provided range will be NULL.

\n", + "comments": "

When printing a diff, callback that will be made to output each line\n of text. This uses some extra GIT_DIFF_LINE_... constants for output\n of lines of file and hunk headers.

\n" + }, + "git_index_matched_path_cb": { + "type": "callback", + "file": "index.h", + "line": 146, + "lineto": 147, + "args": [ + { + "name": "path", + "type": "const char *", + "comment": null + }, + { + "name": "matched_pathspec", + "type": "const char *", + "comment": null + }, + { + "name": "payload", + "type": "void *", + "comment": null + } + ], + "argline": "const char *path, const char *matched_pathspec, void *payload", + "sig": "const char *::const char *::void *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Callback for APIs that add/remove/update files matching pathspec

\n", + "comments": "" + }, + "git_headlist_cb": { + "type": "callback", + "file": "net.h", + "line": 55, + "lineto": 55, + "args": [ + { + "name": "rhead", + "type": "git_remote_head *", + "comment": null + }, + { + "name": "payload", + "type": "void *", + "comment": null + } + ], + "argline": "git_remote_head *rhead, void *payload", + "sig": "git_remote_head *::void *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Callback for listing the remote heads

\n", + "comments": "" + }, + "git_note_foreach_cb": { + "type": "callback", + "file": "notes.h", + "line": 29, + "lineto": 30, + "args": [ + { + "name": "blob_id", + "type": "const git_oid *", + "comment": null + }, + { + "name": "annotated_object_id", + "type": "const git_oid *", + "comment": null + }, + { + "name": "payload", + "type": "void *", + "comment": null + } + ], + "argline": "const git_oid *blob_id, const git_oid *annotated_object_id, void *payload", + "sig": "const git_oid *::const git_oid *::void *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Callback for git_note_foreach.

\n", + "comments": "

Receives:\n - blob_id: Oid of the blob containing the message\n - annotated_object_id: Oid of the git object being annotated\n - payload: Payload data passed to git_note_foreach

\n" + }, + "git_odb_foreach_cb": { + "type": "callback", + "file": "odb.h", + "line": 26, + "lineto": 26, + "args": [ + { + "name": "id", + "type": "const git_oid *", + "comment": null + }, + { + "name": "payload", + "type": "void *", + "comment": null + } + ], + "argline": "const git_oid *id, void *payload", + "sig": "const git_oid *::void *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Function type for callbacks from git_odb_foreach.

\n", + "comments": "" + }, + "git_packbuilder_progress": { + "type": "callback", + "file": "pack.h", + "line": 210, + "lineto": 214, + "args": [ + { + "name": "stage", + "type": "int", + "comment": null + }, + { + "name": "current", + "type": "unsigned int", + "comment": null + }, + { + "name": "total", + "type": "unsigned int", + "comment": null + }, + { + "name": "payload", + "type": "void *", + "comment": null + } + ], + "argline": "int stage, unsigned int current, unsigned int total, void *payload", + "sig": "int::unsigned int::unsigned int::void *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Packbuilder progress notification function

\n", + "comments": "" + }, + "git_remote_rename_problem_cb": { + "type": "callback", + "file": "remote.h", + "line": 28, + "lineto": 28, + "args": [ + { + "name": "problematic_refspec", + "type": "const char *", + "comment": null + }, + { + "name": "payload", + "type": "void *", + "comment": null + } + ], + "argline": "const char *problematic_refspec, void *payload", + "sig": "const char *::void *", + "return": { + "type": "int", + "comment": null + }, + "description": "

git2/remote.h

\n", + "comments": "

@\n{

\n" + }, + "git_push_transfer_progress": { + "type": "callback", + "file": "remote.h", + "line": 332, + "lineto": 336, + "args": [ + { + "name": "current", + "type": "unsigned int", + "comment": null + }, + { + "name": "total", + "type": "unsigned int", + "comment": null + }, + { + "name": "bytes", + "type": "size_t", + "comment": null + }, + { + "name": "payload", + "type": "void *", + "comment": null + } + ], + "argline": "unsigned int current, unsigned int total, size_t bytes, void *payload", + "sig": "unsigned int::unsigned int::size_t::void *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Push network progress notification function

\n", + "comments": "" + }, + "git_push_negotiation": { + "type": "callback", + "file": "remote.h", + "line": 365, + "lineto": 365, + "args": [ + { + "name": "updates", + "type": "const git_push_update **", + "comment": "an array containing the updates which will be sent\n as commands to the destination." + }, + { + "name": "len", + "type": "size_t", + "comment": "number of elements in `updates`" + }, + { + "name": "payload", + "type": "void *", + "comment": "Payload provided by the caller" + } + ], + "argline": "const git_push_update **updates, size_t len, void *payload", + "sig": "const git_push_update **::size_t::void *", + "return": { + "type": "int", + "comment": null + }, + "description": "", + "comments": "" + }, + "git_revwalk_hide_cb": { + "type": "callback", + "file": "revwalk.h", + "line": 279, + "lineto": 281, + "args": [ + { + "name": "commit_id", + "type": "const git_oid *", + "comment": "oid of Commit" + }, + { + "name": "payload", + "type": "void *", + "comment": "User-specified pointer to data to be passed as data payload" + } + ], + "argline": "const git_oid *commit_id, void *payload", + "sig": "const git_oid *::void *", + "return": { + "type": "int", + "comment": null + }, + "description": "

This is a callback function that user can provide to hide a\n commit and its parents. If the callback function returns non-zero value,\n then this commit and its parents will be hidden.

\n", + "comments": "" + }, + "git_stash_apply_progress_cb": { + "type": "callback", + "file": "stash.h", + "line": 113, + "lineto": 115, + "args": [ + { + "name": "progress", + "type": "git_stash_apply_progress_t", + "comment": null + }, + { + "name": "payload", + "type": "void *", + "comment": null + } + ], + "argline": "git_stash_apply_progress_t progress, void *payload", + "sig": "git_stash_apply_progress_t::void *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Stash application progress notification function.\n Return 0 to continue processing, or a negative value to\n abort the stash application.

\n", + "comments": "" + }, + "git_stash_cb": { + "type": "callback", + "file": "stash.h", + "line": 198, + "lineto": 202, + "args": [ + { + "name": "index", + "type": "size_t", + "comment": "The position within the stash list. 0 points to the\n most recent stashed state." + }, + { + "name": "message", + "type": "const char *", + "comment": "The stash message." + }, + { + "name": "stash_id", + "type": "const int *", + "comment": "The commit oid of the stashed state." + }, + { + "name": "payload", + "type": "void *", + "comment": "Extra parameter to callback function." + } + ], + "argline": "size_t index, const char *message, const int *stash_id, void *payload", + "sig": "size_t::const char *::const int *::void *", + "return": { + "type": "int", + "comment": " 0 to continue iterating or non-zero to stop." + }, + "description": "

This is a callback function you can provide to iterate over all the\n stashed states that will be invoked per entry.

\n", + "comments": "" + }, + "git_status_cb": { + "type": "callback", + "file": "status.h", + "line": 61, + "lineto": 62, + "args": [ + { + "name": "path", + "type": "const char *", + "comment": null + }, + { + "name": "status_flags", + "type": "unsigned int", + "comment": null + }, + { + "name": "payload", + "type": "void *", + "comment": null + } + ], + "argline": "const char *path, unsigned int status_flags, void *payload", + "sig": "const char *::unsigned int::void *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Function pointer to receive status on individual files

\n", + "comments": "

path is the relative path to the file from the root of the repository.

\n\n

status_flags is a combination of git_status_t values that apply.

\n\n

payload is the value you passed to the foreach function as payload.

\n" + }, + "git_filter_init_fn": { + "type": "callback", + "file": "sys/filter.h", + "line": 152, + "lineto": 152, + "args": [ + { + "name": "self", + "type": "git_filter *", + "comment": null + } + ], + "argline": "git_filter *self", + "sig": "git_filter *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Initialize callback on filter

\n", + "comments": "

Specified as filter.initialize, this is an optional callback invoked\n before a filter is first used. It will be called once at most.

\n\n

If non-NULL, the filter's initialize callback will be invoked right\n before the first use of the filter, so you can defer expensive\n initialization operations (in case libgit2 is being used in a way that\n doesn't need the filter).

\n" + }, + "git_filter_shutdown_fn": { + "type": "callback", + "file": "sys/filter.h", + "line": 164, + "lineto": 164, + "args": [ + { + "name": "self", + "type": "git_filter *", + "comment": null + } + ], + "argline": "git_filter *self", + "sig": "git_filter *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Shutdown callback on filter

\n", + "comments": "

Specified as filter.shutdown, this is an optional callback invoked\n when the filter is unregistered or when libgit2 is shutting down. It\n will be called once at most and should release resources as needed.\n This may be called even if the initialize callback was not made.

\n\n

Typically this function will free the git_filter object itself.

\n" + }, + "git_filter_check_fn": { + "type": "callback", + "file": "sys/filter.h", + "line": 186, + "lineto": 190, + "args": [ + { + "name": "self", + "type": "git_filter *", + "comment": null + }, + { + "name": "payload", + "type": "void **", + "comment": null + }, + { + "name": "src", + "type": "const git_filter_source *", + "comment": null + }, + { + "name": "attr_values", + "type": "const char **", + "comment": null + } + ], + "argline": "git_filter *self, void **payload, const git_filter_source *src, const char **attr_values", + "sig": "git_filter *::void **::const git_filter_source *::const char **", + "return": { + "type": "int", + "comment": null + }, + "description": "

Callback to decide if a given source needs this filter

\n", + "comments": "

Specified as filter.check, this is an optional callback that checks\n if filtering is needed for a given source.

\n\n

It should return 0 if the filter should be applied (i.e. success),\n GIT_PASSTHROUGH if the filter should not be applied, or an error code\n to fail out of the filter processing pipeline and return to the caller.

\n\n

The attr_values will be set to the values of any attributes given in\n the filter definition. See git_filter below for more detail.

\n\n

The payload will be a pointer to a reference payload for the filter.\n This will start as NULL, but check can assign to this pointer for\n later use by the apply callback. Note that the value should be heap\n allocated (not stack), so that it doesn't go away before the apply\n callback can use it. If a filter allocates and assigns a value to the\n payload, it will need a cleanup callback to free the payload.

\n" + }, + "git_filter_apply_fn": { + "type": "callback", + "file": "sys/filter.h", + "line": 204, + "lineto": 209, + "args": [ + { + "name": "self", + "type": "git_filter *", + "comment": null + }, + { + "name": "payload", + "type": "void **", + "comment": null + }, + { + "name": "to", + "type": "git_buf *", + "comment": null + }, + { + "name": "from", + "type": "const git_buf *", + "comment": null + }, + { + "name": "src", + "type": "const git_filter_source *", + "comment": null + } + ], + "argline": "git_filter *self, void **payload, git_buf *to, const git_buf *from, const git_filter_source *src", + "sig": "git_filter *::void **::git_buf *::const git_buf *::const git_filter_source *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Callback to actually perform the data filtering

\n", + "comments": "

Specified as filter.apply, this is the callback that actually filters\n data. If it successfully writes the output, it should return 0. Like\n check, it can return GIT_PASSTHROUGH to indicate that the filter\n doesn't want to run. Other error codes will stop filter processing and\n return to the caller.

\n\n

The payload value will refer to any payload that was set by the\n check callback. It may be read from or written to as needed.

\n" + }, + "git_filter_cleanup_fn": { + "type": "callback", + "file": "sys/filter.h", + "line": 226, + "lineto": 228, + "args": [ + { + "name": "self", + "type": "git_filter *", + "comment": null + }, + { + "name": "payload", + "type": "void *", + "comment": null + } + ], + "argline": "git_filter *self, void *payload", + "sig": "git_filter *::void *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Callback to clean up after filtering has been applied

\n", + "comments": "

Specified as filter.cleanup, this is an optional callback invoked\n after the filter has been applied. If the check or apply callbacks\n allocated a payload to keep per-source filter state, use this\n callback to free that payload and release resources as required.

\n" + }, + "git_trace_callback": { + "type": "callback", + "file": "trace.h", + "line": 52, + "lineto": 52, + "args": [ + { + "name": "level", + "type": "git_trace_level_t", + "comment": null + }, + { + "name": "msg", + "type": "const char *", + "comment": null + } + ], + "argline": "git_trace_level_t level, const char *msg", + "sig": "git_trace_level_t::const char *", + "return": { + "type": "void", + "comment": null + }, + "description": "

An instance for a tracing function

\n", + "comments": "" + }, + "git_transport_cb": { + "type": "callback", + "file": "transport.h", + "line": 24, + "lineto": 24, + "args": [ + { + "name": "out", + "type": "git_transport **", + "comment": null + }, + { + "name": "owner", + "type": "git_remote *", + "comment": null + }, + { + "name": "param", + "type": "void *", + "comment": null + } + ], + "argline": "git_transport **out, git_remote *owner, void *param", + "sig": "git_transport **::git_remote *::void *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Signature of a function which creates a transport

\n", + "comments": "" + }, + "git_cred_acquire_cb": { + "type": "callback", + "file": "transport.h", + "line": 329, + "lineto": 334, + "args": [ + { + "name": "cred", + "type": "git_cred **", + "comment": null + }, + { + "name": "url", + "type": "const char *", + "comment": null + }, + { + "name": "username_from_url", + "type": "const char *", + "comment": null + }, + { + "name": "allowed_types", + "type": "unsigned int", + "comment": null + }, + { + "name": "payload", + "type": "void *", + "comment": null + } + ], + "argline": "git_cred **cred, const char *url, const char *username_from_url, unsigned int allowed_types, void *payload", + "sig": "git_cred **::const char *::const char *::unsigned int::void *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Signature of a function which acquires a credential object.

\n", + "comments": "
    \n
  • cred: The newly created credential object.
    • \n
  • url: The resource for which we are demanding a credential.
    • \n
  • username_from_url: The username that was embedded in a "user\n@\nhost"\n remote url, or NULL if not included.
    • \n
  • allowed_types: A bitmask stating which cred types are OK to return.
    • \n
  • payload: The payload provided when specifying this callback.
    • \n
  • returns 0 for success, \n<\n0 to indicate an error, > 0 to indicate\n no credential was acquired
    • \n
\n" + }, + "git_treebuilder_filter_cb": { + "type": "callback", + "file": "tree.h", + "line": 346, + "lineto": 347, + "args": [ + { + "name": "entry", + "type": "const git_tree_entry *", + "comment": null + }, + { + "name": "payload", + "type": "void *", + "comment": null + } + ], + "argline": "const git_tree_entry *entry, void *payload", + "sig": "const git_tree_entry *::void *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Callback for git_treebuilder_filter

\n", + "comments": "

The return value is treated as a boolean, with zero indicating that the\n entry should be left alone and any non-zero value meaning that the\n entry should be removed from the treebuilder list (i.e. filtered out).

\n" + }, + "git_treewalk_cb": { + "type": "callback", + "file": "tree.h", + "line": 380, + "lineto": 381, + "args": [ + { + "name": "root", + "type": "const char *", + "comment": null + }, + { + "name": "entry", + "type": "const git_tree_entry *", + "comment": null + }, + { + "name": "payload", + "type": "void *", + "comment": null + } + ], + "argline": "const char *root, const git_tree_entry *entry, void *payload", + "sig": "const char *::const git_tree_entry *::void *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Callback for the tree traversal method

\n", + "comments": "" + }, + "git_transfer_progress_cb": { + "type": "callback", + "file": "types.h", + "line": 270, + "lineto": 270, + "args": [ + { + "name": "stats", + "type": "const git_transfer_progress *", + "comment": "Structure containing information about the state of the transfer" + }, + { + "name": "payload", + "type": "void *", + "comment": "Payload provided by caller" + } + ], + "argline": "const git_transfer_progress *stats, void *payload", + "sig": "const git_transfer_progress *::void *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Type for progress callbacks during indexing. Return a value less than zero\n to cancel the transfer.

\n", + "comments": "" + }, + "git_transport_message_cb": { + "type": "callback", + "file": "types.h", + "line": 280, + "lineto": 280, + "args": [ + { + "name": "str", + "type": "const char *", + "comment": "The message from the transport" + }, + { + "name": "len", + "type": "int", + "comment": "The length of the message" + }, + { + "name": "payload", + "type": "void *", + "comment": "Payload provided by the caller" + } + ], + "argline": "const char *str, int len, void *payload", + "sig": "const char *::int::void *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Type for messages delivered by the transport. Return a negative value\n to cancel the network operation.

\n", + "comments": "" + }, + "git_transport_certificate_check_cb": { + "type": "callback", + "file": "types.h", + "line": 330, + "lineto": 330, + "args": [ + { + "name": "cert", + "type": "git_cert *", + "comment": "The host certificate" + }, + { + "name": "valid", + "type": "int", + "comment": "Whether the libgit2 checks (OpenSSL or WinHTTP) think\n this certificate is valid" + }, + { + "name": "host", + "type": "const char *", + "comment": "Hostname of the host libgit2 connected to" + }, + { + "name": "payload", + "type": "void *", + "comment": "Payload provided by the caller" + } + ], + "argline": "git_cert *cert, int valid, const char *host, void *payload", + "sig": "git_cert *::int::const char *::void *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Callback for the user's custom certificate checks.

\n", + "comments": "" + } + }, + "globals": {}, + "types": [ + [ + "git_annotated_commit", + { + "decl": "git_annotated_commit", + "type": "struct", + "value": "git_annotated_commit", + "file": "types.h", + "line": 178, + "lineto": 178, + "tdef": "typedef", + "description": " Annotated commits, the input to merge and rebase. ", + "comments": "", + "used": { + "returns": [], + "needs": [ + "git_annotated_commit_free", + "git_annotated_commit_from_fetchhead", + "git_annotated_commit_from_ref", + "git_annotated_commit_from_revspec", + "git_annotated_commit_id", + "git_annotated_commit_lookup", + "git_branch_create_from_annotated", + "git_merge", + "git_merge_analysis", + "git_rebase_init", + "git_repository_set_head_detached_from_annotated", + "git_reset_from_annotated" + ] + } + } + ], + [ + "git_attr_t", + { + "decl": [ + "GIT_ATTR_UNSPECIFIED_T", + "GIT_ATTR_TRUE_T", + "GIT_ATTR_FALSE_T", + "GIT_ATTR_VALUE_T" + ], + "type": "enum", + "file": "attr.h", + "line": 82, + "lineto": 87, + "block": "GIT_ATTR_UNSPECIFIED_T\nGIT_ATTR_TRUE_T\nGIT_ATTR_FALSE_T\nGIT_ATTR_VALUE_T", + "tdef": "typedef", + "description": " Possible states for an attribute", + "comments": "", + "fields": [ + { + "type": "int", + "name": "GIT_ATTR_UNSPECIFIED_T", + "comments": "

The attribute has been left unspecified

\n", + "value": 0 + }, + { + "type": "int", + "name": "GIT_ATTR_TRUE_T", + "comments": "

The attribute has been set

\n", + "value": 1 + }, + { + "type": "int", + "name": "GIT_ATTR_FALSE_T", + "comments": "

The attribute has been unset

\n", + "value": 2 + }, + { + "type": "int", + "name": "GIT_ATTR_VALUE_T", + "comments": "

This attribute has a value

\n", + "value": 3 + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_blame_flag_t", + { + "decl": [ + "GIT_BLAME_NORMAL", + "GIT_BLAME_TRACK_COPIES_SAME_FILE", + "GIT_BLAME_TRACK_COPIES_SAME_COMMIT_MOVES", + "GIT_BLAME_TRACK_COPIES_SAME_COMMIT_COPIES", + "GIT_BLAME_TRACK_COPIES_ANY_COMMIT_COPIES", + "GIT_BLAME_FIRST_PARENT" + ], + "type": "enum", + "file": "blame.h", + "line": 26, + "lineto": 46, + "block": "GIT_BLAME_NORMAL\nGIT_BLAME_TRACK_COPIES_SAME_FILE\nGIT_BLAME_TRACK_COPIES_SAME_COMMIT_MOVES\nGIT_BLAME_TRACK_COPIES_SAME_COMMIT_COPIES\nGIT_BLAME_TRACK_COPIES_ANY_COMMIT_COPIES\nGIT_BLAME_FIRST_PARENT", + "tdef": "typedef", + "description": " Flags for indicating option behavior for git_blame APIs.", + "comments": "", + "fields": [ + { + "type": "int", + "name": "GIT_BLAME_NORMAL", + "comments": "

Normal blame, the default

\n", + "value": 0 + }, + { + "type": "int", + "name": "GIT_BLAME_TRACK_COPIES_SAME_FILE", + "comments": "

Track lines that have moved within a file (like git blame -M).\n NOT IMPLEMENTED.

\n", + "value": 1 + }, + { + "type": "int", + "name": "GIT_BLAME_TRACK_COPIES_SAME_COMMIT_MOVES", + "comments": "

Track lines that have moved across files in the same commit (like git blame -C).\n NOT IMPLEMENTED.

\n", + "value": 2 + }, + { + "type": "int", + "name": "GIT_BLAME_TRACK_COPIES_SAME_COMMIT_COPIES", + "comments": "

Track lines that have been copied from another file that exists in the\n same commit (like git blame -CC). Implies SAME_FILE.\n NOT IMPLEMENTED.

\n", + "value": 4 + }, + { + "type": "int", + "name": "GIT_BLAME_TRACK_COPIES_ANY_COMMIT_COPIES", + "comments": "

Track lines that have been copied from another file that exists in any\n commit (like git blame -CCC). Implies SAME_COMMIT_COPIES.\n NOT IMPLEMENTED.

\n", + "value": 8 + }, + { + "type": "int", + "name": "GIT_BLAME_FIRST_PARENT", + "comments": "

Restrict the search of commits to those reachable following only the\n first parents.

\n", + "value": 16 + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_blame_hunk", + { + "decl": [ + "uint16_t lines_in_hunk", + "git_oid final_commit_id", + "uint16_t final_start_line_number", + "git_signature * final_signature", + "git_oid orig_commit_id", + "const char * orig_path", + "uint16_t orig_start_line_number", + "git_signature * orig_signature", + "char boundary" + ], + "type": "struct", + "value": "git_blame_hunk", + "file": "blame.h", + "line": 115, + "lineto": 128, + "block": "uint16_t lines_in_hunk\ngit_oid final_commit_id\nuint16_t final_start_line_number\ngit_signature * final_signature\ngit_oid orig_commit_id\nconst char * orig_path\nuint16_t orig_start_line_number\ngit_signature * orig_signature\nchar boundary", + "tdef": "typedef", + "description": " Structure that represents a blame hunk.", + "comments": "
    \n
  • lines_in_hunk is the number of lines in this hunk
    • \n
  • final_commit_id is the OID of the commit where this line was last\nchanged.
    • \n
  • final_start_line_number is the 1-based line number where this hunk\nbegins, in the final version of the file
    • \n
  • orig_commit_id is the OID of the commit where this hunk was found. This\nwill usually be the same as final_commit_id, except when\nGIT_BLAME_TRACK_COPIES_ANY_COMMIT_COPIES has been specified.
    • \n
  • orig_path is the path to the file where this hunk originated, as of the\ncommit specified by orig_commit_id.
    • \n
  • orig_start_line_number is the 1-based line number where this hunk begins\nin the file named by orig_path in the commit specified by\norig_commit_id.
    • \n
  • boundary is 1 iff the hunk has been tracked to a boundary commit (the\nroot, or the commit specified in git_blame_options.oldest_commit)
    • \n
\n", + "fields": [ + { + "type": "uint16_t", + "name": "lines_in_hunk", + "comments": "" + }, + { + "type": "git_oid", + "name": "final_commit_id", + "comments": "" + }, + { + "type": "uint16_t", + "name": "final_start_line_number", + "comments": "" + }, + { + "type": "git_signature *", + "name": "final_signature", + "comments": "" + }, + { + "type": "git_oid", + "name": "orig_commit_id", + "comments": "" + }, + { + "type": "const char *", + "name": "orig_path", + "comments": "" + }, + { + "type": "uint16_t", + "name": "orig_start_line_number", + "comments": "" + }, + { + "type": "git_signature *", + "name": "orig_signature", + "comments": "" + }, + { + "type": "char", + "name": "boundary", + "comments": "" + } + ], + "used": { + "returns": [ + "git_blame_get_hunk_byindex", + "git_blame_get_hunk_byline" + ], + "needs": [] + } + } + ], + [ + "git_blame_options", + { + "decl": [ + "unsigned int version", + "uint32_t flags", + "uint16_t min_match_characters", + "git_oid newest_commit", + "git_oid oldest_commit", + "uint32_t min_line", + "uint32_t max_line" + ], + "type": "struct", + "value": "git_blame_options", + "file": "blame.h", + "line": 70, + "lineto": 79, + "block": "unsigned int version\nuint32_t flags\nuint16_t min_match_characters\ngit_oid newest_commit\ngit_oid oldest_commit\nuint32_t min_line\nuint32_t max_line", + "tdef": "typedef", + "description": " Blame options structure", + "comments": "

Use zeros to indicate default settings. It's easiest to use the\n GIT_BLAME_OPTIONS_INIT macro:\n git_blame_options opts = GIT_BLAME_OPTIONS_INIT;

\n\n
    \n
  • flags is a combination of the git_blame_flag_t values above.
    • \n
  • min_match_characters is the lower bound on the number of alphanumeric\ncharacters that must be detected as moving/copying within a file for it to\nassociate those lines with the parent commit. The default value is 20.\nThis value only takes effect if any of the GIT_BLAME_TRACK_COPIES_*\nflags are specified.
    • \n
  • newest_commit is the id of the newest commit to consider. The default\n is HEAD.
    • \n
  • oldest_commit is the id of the oldest commit to consider. The default\n is the first commit encountered with a NULL parent.\n\n
      \n
    • min_line is the first line in the file to blame. The default is 1 (line\n numbers start with 1).
      • \n
    • max_line is the last line in the file to blame. The default is the last\n line of the file.
      • \n
    • \n
\n", + "fields": [ + { + "type": "unsigned int", + "name": "version", + "comments": "" + }, + { + "type": "uint32_t", + "name": "flags", + "comments": "" + }, + { + "type": "uint16_t", + "name": "min_match_characters", + "comments": "" + }, + { + "type": "git_oid", + "name": "newest_commit", + "comments": "" + }, + { + "type": "git_oid", + "name": "oldest_commit", + "comments": "" + }, + { + "type": "uint32_t", + "name": "min_line", + "comments": "" + }, + { + "type": "uint32_t", + "name": "max_line", + "comments": "" + } + ], + "used": { + "returns": [], + "needs": [ + "git_blame_file", + "git_blame_init_options" + ] + } + } + ], + [ + "git_blob", + { + "decl": "git_blob", + "type": "struct", + "value": "git_blob", + "file": "types.h", + "line": 117, + "lineto": 117, + "tdef": "typedef", + "description": " In-memory representation of a blob object. ", + "comments": "", + "used": { + "returns": [], + "needs": [ + "git_blob_filtered_content", + "git_blob_free", + "git_blob_id", + "git_blob_is_binary", + "git_blob_lookup", + "git_blob_lookup_prefix", + "git_blob_owner", + "git_blob_rawcontent", + "git_blob_rawsize", + "git_diff_blob_to_buffer", + "git_diff_blobs", + "git_filter_list_apply_to_blob", + "git_filter_list_load", + "git_filter_list_stream_blob", + "git_patch_from_blob_and_buffer", + "git_patch_from_blobs" + ] + } + } + ], + [ + "git_branch_iterator", + { + "decl": "git_branch_iterator", + "type": "struct", + "value": "git_branch_iterator", + "file": "branch.h", + "line": 88, + "lineto": 88, + "tdef": "typedef", + "description": " Iterator type for branches ", + "comments": "", + "used": { + "returns": [], + "needs": [ + "git_branch_iterator_free", + "git_branch_iterator_new", + "git_branch_next" + ] + } + } + ], + [ + "git_branch_t", + { + "decl": [ + "GIT_BRANCH_LOCAL", + "GIT_BRANCH_REMOTE", + "GIT_BRANCH_ALL" + ], + "type": "enum", + "file": "types.h", + "line": 198, + "lineto": 202, + "block": "GIT_BRANCH_LOCAL\nGIT_BRANCH_REMOTE\nGIT_BRANCH_ALL", + "tdef": "typedef", + "description": " Basic type of any Git branch. ", + "comments": "", + "fields": [ + { + "type": "int", + "name": "GIT_BRANCH_LOCAL", + "comments": "", + "value": 1 + }, + { + "type": "int", + "name": "GIT_BRANCH_REMOTE", + "comments": "", + "value": 2 + }, + { + "type": "int", + "name": "GIT_BRANCH_ALL", + "comments": "", + "value": 3 + } + ], + "used": { + "returns": [], + "needs": [ + "git_branch_iterator_new", + "git_branch_lookup", + "git_branch_next" + ] + } + } + ], + [ + "git_buf", + { + "decl": [ + "char * ptr", + "size_t asize", + "size_t size" + ], + "type": "struct", + "value": "git_buf", + "file": "buffer.h", + "line": 52, + "lineto": 55, + "block": "char * ptr\nsize_t asize\nsize_t size", + "tdef": "typedef", + "description": " A data buffer for exporting data from libgit2", + "comments": "

Sometimes libgit2 wants to return an allocated data buffer to the\n caller and have the caller take responsibility for freeing that memory.\n This can be awkward if the caller does not have easy access to the same\n allocation functions that libgit2 is using. In those cases, libgit2\n will fill in a git_buf and the caller can use git_buf_free() to\n release it when they are done.

\n\n

A git_buf may also be used for the caller to pass in a reference to\n a block of memory they hold. In this case, libgit2 will not resize or\n free the memory, but will read from it as needed.

\n\n

A git_buf is a public structure with three fields:

\n\n
    \n

  • ptr points to the start of the allocated memory. If it is NULL,\nthen the git_buf is considered empty and libgit2 will feel free\nto overwrite it with new data.

    • \n

  • size holds the size (in bytes) of the data that is actually used.

    • \n

  • asize holds the known total amount of allocated memory if the ptr\nwas allocated by libgit2. It may be larger than size. If ptr\nwas not allocated by libgit2 and should not be resized and/or freed,\nthen asize will be set to zero.

    • \n
\n\n

Some APIs may occasionally do something slightly unusual with a buffer,\n such as setting ptr to a value that was passed in by the user. In\n those cases, the behavior will be clearly documented by the API.

\n", + "fields": [ + { + "type": "char *", + "name": "ptr", + "comments": "" + }, + { + "type": "size_t", + "name": "asize", + "comments": "" + }, + { + "type": "size_t", + "name": "size", + "comments": "" + } + ], + "used": { + "returns": [], + "needs": [ + "git_blob_filtered_content", + "git_buf_contains_nul", + "git_buf_free", + "git_buf_grow", + "git_buf_is_binary", + "git_buf_set", + "git_commit_header_field", + "git_config_find_global", + "git_config_find_system", + "git_config_find_xdg", + "git_config_get_path", + "git_config_get_string_buf", + "git_config_parse_path", + "git_describe_format", + "git_diff_commit_as_email", + "git_diff_format_email", + "git_diff_stats_to_buf", + "git_filter_list_apply_to_blob", + "git_filter_list_apply_to_data", + "git_filter_list_apply_to_file", + "git_filter_list_stream_data", + "git_message_prettify", + "git_object_short_id", + "git_patch_to_buf", + "git_refspec_rtransform", + "git_refspec_transform", + "git_remote_default_branch", + "git_repository_discover", + "git_repository_message", + "git_submodule_resolve_url" + ] + } + } + ], + [ + "git_cert", + { + "decl": [ + "git_cert_t cert_type" + ], + "type": "struct", + "value": "git_cert", + "file": "types.h", + "line": 314, + "lineto": 319, + "block": "git_cert_t cert_type", + "tdef": "typedef", + "description": " Parent type for `git_cert_hostkey` and `git_cert_x509`.", + "comments": "", + "fields": [ + { + "type": "git_cert_t", + "name": "cert_type", + "comments": " Type of certificate. A `GIT_CERT_` value." + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_cert_hostkey", + { + "decl": [ + "git_cert_t cert_type", + "git_cert_ssh_t type", + "unsigned char [16] hash_md5", + "unsigned char [20] hash_sha1" + ], + "type": "struct", + "value": "git_cert_hostkey", + "file": "transport.h", + "line": 39, + "lineto": 62, + "block": "git_cert_t cert_type\ngit_cert_ssh_t type\nunsigned char [16] hash_md5\nunsigned char [20] hash_sha1", + "tdef": "typedef", + "description": " Hostkey information taken from libssh2", + "comments": "", + "fields": [ + { + "type": "git_cert_t", + "name": "cert_type", + "comments": " Type of certificate. Here to share the header with\n `git_cert`." + }, + { + "type": "git_cert_ssh_t", + "name": "type", + "comments": " A hostkey type from libssh2, either\n `GIT_CERT_SSH_MD5` or `GIT_CERT_SSH_SHA1`" + }, + { + "type": "unsigned char [16]", + "name": "hash_md5", + "comments": " Hostkey hash. If type has `GIT_CERT_SSH_MD5` set, this will\n have the MD5 hash of the hostkey." + }, + { + "type": "unsigned char [20]", + "name": "hash_sha1", + "comments": " Hostkey hash. If type has `GIT_CERT_SSH_SHA1` set, this will\n have the SHA-1 hash of the hostkey." + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_cert_ssh_t", + { + "decl": [ + "GIT_CERT_SSH_MD5", + "GIT_CERT_SSH_SHA1" + ], + "type": "enum", + "file": "transport.h", + "line": 29, + "lineto": 34, + "block": "GIT_CERT_SSH_MD5\nGIT_CERT_SSH_SHA1", + "tdef": "typedef", + "description": " Type of SSH host fingerprint", + "comments": "", + "fields": [ + { + "type": "int", + "name": "GIT_CERT_SSH_MD5", + "comments": "

MD5 is available

\n", + "value": 1 + }, + { + "type": "int", + "name": "GIT_CERT_SSH_SHA1", + "comments": "

SHA-1 is available

\n", + "value": 2 + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_cert_t", + { + "decl": [ + "GIT_CERT_NONE", + "GIT_CERT_X509", + "GIT_CERT_HOSTKEY_LIBSSH2", + "GIT_CERT_STRARRAY" + ], + "type": "enum", + "file": "types.h", + "line": 286, + "lineto": 309, + "block": "GIT_CERT_NONE\nGIT_CERT_X509\nGIT_CERT_HOSTKEY_LIBSSH2\nGIT_CERT_STRARRAY\nGIT_CERT_NONE\nGIT_CERT_X509\nGIT_CERT_HOSTKEY_LIBSSH2\nGIT_CERT_STRARRAY", + "tdef": "typedef", + "description": " Type of host certificate structure that is passed to the check callback", + "comments": "", + "fields": [ + { + "type": "int", + "name": "GIT_CERT_NONE", + "comments": "

No information about the certificate is available. This may\n happen when using curl.

\n", + "value": 0 + }, + { + "type": "int", + "name": "GIT_CERT_X509", + "comments": "

The data argument to the callback will be a pointer to\n the DER-encoded data.

\n", + "value": 1 + }, + { + "type": "int", + "name": "GIT_CERT_HOSTKEY_LIBSSH2", + "comments": "

The data argument to the callback will be a pointer to a\n git_cert_hostkey structure.

\n", + "value": 2 + }, + { + "type": "int", + "name": "GIT_CERT_STRARRAY", + "comments": "

The data argument to the callback will be a pointer to a\n git_strarray with name:content strings containing\n information about the certificate. This is used when using\n curl.

\n", + "value": 3 + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_cert_x509", + { + "decl": [ + "git_cert_t cert_type", + "void * data", + "size_t len" + ], + "type": "struct", + "value": "git_cert_x509", + "file": "transport.h", + "line": 67, + "lineto": 81, + "block": "git_cert_t cert_type\nvoid * data\nsize_t len", + "tdef": "typedef", + "description": " X.509 certificate information", + "comments": "", + "fields": [ + { + "type": "git_cert_t", + "name": "cert_type", + "comments": " Type of certificate. Here to share the header with\n `git_cert`." + }, + { + "type": "void *", + "name": "data", + "comments": " Pointer to the X.509 certificate data" + }, + { + "type": "size_t", + "name": "len", + "comments": " Length of the memory block pointed to by `data`." + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_checkout_notify_t", + { + "decl": [ + "GIT_CHECKOUT_NOTIFY_NONE", + "GIT_CHECKOUT_NOTIFY_CONFLICT", + "GIT_CHECKOUT_NOTIFY_DIRTY", + "GIT_CHECKOUT_NOTIFY_UPDATED", + "GIT_CHECKOUT_NOTIFY_UNTRACKED", + "GIT_CHECKOUT_NOTIFY_IGNORED", + "GIT_CHECKOUT_NOTIFY_ALL" + ], + "type": "enum", + "file": "checkout.h", + "line": 205, + "lineto": 214, + "block": "GIT_CHECKOUT_NOTIFY_NONE\nGIT_CHECKOUT_NOTIFY_CONFLICT\nGIT_CHECKOUT_NOTIFY_DIRTY\nGIT_CHECKOUT_NOTIFY_UPDATED\nGIT_CHECKOUT_NOTIFY_UNTRACKED\nGIT_CHECKOUT_NOTIFY_IGNORED\nGIT_CHECKOUT_NOTIFY_ALL", + "tdef": "typedef", + "description": " Checkout notification flags", + "comments": "

Checkout will invoke an options notification callback (notify_cb) for\n certain cases - you pick which ones via notify_flags:

\n\n
    \n

  • GIT_CHECKOUT_NOTIFY_CONFLICT invokes checkout on conflicting paths.

    • \n

  • GIT_CHECKOUT_NOTIFY_DIRTY notifies about "dirty" files, i.e. those that\ndo not need an update but no longer match the baseline. Core git\ndisplays these files when checkout runs, but won't stop the checkout.

    • \n

  • GIT_CHECKOUT_NOTIFY_UPDATED sends notification for any file changed.

    • \n

  • GIT_CHECKOUT_NOTIFY_UNTRACKED notifies about untracked files.

    • \n

  • GIT_CHECKOUT_NOTIFY_IGNORED notifies about ignored files.

    • \n
\n\n

Returning a non-zero value from this callback will cancel the checkout.\n The non-zero return value will be propagated back and returned by the\n git_checkout_... call.

\n\n

Notification callbacks are made prior to modifying any files on disk,\n so canceling on any notification will still happen prior to any files\n being modified.

\n", + "fields": [ + { + "type": "int", + "name": "GIT_CHECKOUT_NOTIFY_NONE", + "comments": "", + "value": 0 + }, + { + "type": "int", + "name": "GIT_CHECKOUT_NOTIFY_CONFLICT", + "comments": "", + "value": 1 + }, + { + "type": "int", + "name": "GIT_CHECKOUT_NOTIFY_DIRTY", + "comments": "", + "value": 2 + }, + { + "type": "int", + "name": "GIT_CHECKOUT_NOTIFY_UPDATED", + "comments": "", + "value": 4 + }, + { + "type": "int", + "name": "GIT_CHECKOUT_NOTIFY_UNTRACKED", + "comments": "", + "value": 8 + }, + { + "type": "int", + "name": "GIT_CHECKOUT_NOTIFY_IGNORED", + "comments": "", + "value": 16 + }, + { + "type": "int", + "name": "GIT_CHECKOUT_NOTIFY_ALL", + "comments": "", + "value": 65535 + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_checkout_options", + { + "decl": [ + "unsigned int version", + "unsigned int checkout_strategy", + "int disable_filters", + "unsigned int dir_mode", + "unsigned int file_mode", + "int file_open_flags", + "unsigned int notify_flags", + "git_checkout_notify_cb notify_cb", + "void * notify_payload", + "git_checkout_progress_cb progress_cb", + "void * progress_payload", + "git_strarray paths", + "git_tree * baseline", + "git_index * baseline_index", + "const char * target_directory", + "const char * ancestor_label", + "const char * our_label", + "const char * their_label", + "git_checkout_perfdata_cb perfdata_cb", + "void * perfdata_payload" + ], + "type": "struct", + "value": "git_checkout_options", + "file": "checkout.h", + "line": 251, + "lineto": 295, + "block": "unsigned int version\nunsigned int checkout_strategy\nint disable_filters\nunsigned int dir_mode\nunsigned int file_mode\nint file_open_flags\nunsigned int notify_flags\ngit_checkout_notify_cb notify_cb\nvoid * notify_payload\ngit_checkout_progress_cb progress_cb\nvoid * progress_payload\ngit_strarray paths\ngit_tree * baseline\ngit_index * baseline_index\nconst char * target_directory\nconst char * ancestor_label\nconst char * our_label\nconst char * their_label\ngit_checkout_perfdata_cb perfdata_cb\nvoid * perfdata_payload", + "tdef": "typedef", + "description": " Checkout options structure", + "comments": "

Zero out for defaults. Initialize with GIT_CHECKOUT_OPTIONS_INIT macro to\n correctly set the version field. E.g.

\n\n
    git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT;\n
\n", + "fields": [ + { + "type": "unsigned int", + "name": "version", + "comments": "" + }, + { + "type": "unsigned int", + "name": "checkout_strategy", + "comments": " default will be a dry run " + }, + { + "type": "int", + "name": "disable_filters", + "comments": " don't apply filters like CRLF conversion " + }, + { + "type": "unsigned int", + "name": "dir_mode", + "comments": " default is 0755 " + }, + { + "type": "unsigned int", + "name": "file_mode", + "comments": " default is 0644 or 0755 as dictated by blob " + }, + { + "type": "int", + "name": "file_open_flags", + "comments": " default is O_CREAT | O_TRUNC | O_WRONLY " + }, + { + "type": "unsigned int", + "name": "notify_flags", + "comments": " see `git_checkout_notify_t` above " + }, + { + "type": "git_checkout_notify_cb", + "name": "notify_cb", + "comments": "" + }, + { + "type": "void *", + "name": "notify_payload", + "comments": "" + }, + { + "type": "git_checkout_progress_cb", + "name": "progress_cb", + "comments": " Optional callback to notify the consumer of checkout progress. " + }, + { + "type": "void *", + "name": "progress_payload", + "comments": "" + }, + { + "type": "git_strarray", + "name": "paths", + "comments": " When not zeroed out, array of fnmatch patterns specifying which\n paths should be taken into account, otherwise all files. Use\n GIT_CHECKOUT_DISABLE_PATHSPEC_MATCH to treat as simple list." + }, + { + "type": "git_tree *", + "name": "baseline", + "comments": " The expected content of the working directory; defaults to HEAD.\n If the working directory does not match this baseline information,\n that will produce a checkout conflict." + }, + { + "type": "git_index *", + "name": "baseline_index", + "comments": " expected content of workdir, expressed as an index. " + }, + { + "type": "const char *", + "name": "target_directory", + "comments": " alternative checkout path to workdir " + }, + { + "type": "const char *", + "name": "ancestor_label", + "comments": " the name of the common ancestor side of conflicts " + }, + { + "type": "const char *", + "name": "our_label", + "comments": " the name of the \"our\" side of conflicts " + }, + { + "type": "const char *", + "name": "their_label", + "comments": " the name of the \"their\" side of conflicts " + }, + { + "type": "git_checkout_perfdata_cb", + "name": "perfdata_cb", + "comments": " Optional callback to notify the consumer of performance data. " + }, + { + "type": "void *", + "name": "perfdata_payload", + "comments": "" + } + ], + "used": { + "returns": [], + "needs": [ + "git_checkout_head", + "git_checkout_index", + "git_checkout_init_options", + "git_checkout_tree", + "git_merge", + "git_reset", + "git_reset_from_annotated" + ] + } + } + ], + [ + "git_checkout_strategy_t", + { + "decl": [ + "GIT_CHECKOUT_NONE", + "GIT_CHECKOUT_SAFE", + "GIT_CHECKOUT_FORCE", + "GIT_CHECKOUT_RECREATE_MISSING", + "GIT_CHECKOUT_ALLOW_CONFLICTS", + "GIT_CHECKOUT_REMOVE_UNTRACKED", + "GIT_CHECKOUT_REMOVE_IGNORED", + "GIT_CHECKOUT_UPDATE_ONLY", + "GIT_CHECKOUT_DONT_UPDATE_INDEX", + "GIT_CHECKOUT_NO_REFRESH", + "GIT_CHECKOUT_SKIP_UNMERGED", + "GIT_CHECKOUT_USE_OURS", + "GIT_CHECKOUT_USE_THEIRS", + "GIT_CHECKOUT_DISABLE_PATHSPEC_MATCH", + "GIT_CHECKOUT_SKIP_LOCKED_DIRECTORIES", + "GIT_CHECKOUT_DONT_OVERWRITE_IGNORED", + "GIT_CHECKOUT_CONFLICT_STYLE_MERGE", + "GIT_CHECKOUT_CONFLICT_STYLE_DIFF3", + "GIT_CHECKOUT_DONT_REMOVE_EXISTING", + "GIT_CHECKOUT_DONT_WRITE_INDEX", + "GIT_CHECKOUT_UPDATE_SUBMODULES", + "GIT_CHECKOUT_UPDATE_SUBMODULES_IF_CHANGED" + ], + "type": "enum", + "file": "checkout.h", + "line": 106, + "lineto": 177, + "block": "GIT_CHECKOUT_NONE\nGIT_CHECKOUT_SAFE\nGIT_CHECKOUT_FORCE\nGIT_CHECKOUT_RECREATE_MISSING\nGIT_CHECKOUT_ALLOW_CONFLICTS\nGIT_CHECKOUT_REMOVE_UNTRACKED\nGIT_CHECKOUT_REMOVE_IGNORED\nGIT_CHECKOUT_UPDATE_ONLY\nGIT_CHECKOUT_DONT_UPDATE_INDEX\nGIT_CHECKOUT_NO_REFRESH\nGIT_CHECKOUT_SKIP_UNMERGED\nGIT_CHECKOUT_USE_OURS\nGIT_CHECKOUT_USE_THEIRS\nGIT_CHECKOUT_DISABLE_PATHSPEC_MATCH\nGIT_CHECKOUT_SKIP_LOCKED_DIRECTORIES\nGIT_CHECKOUT_DONT_OVERWRITE_IGNORED\nGIT_CHECKOUT_CONFLICT_STYLE_MERGE\nGIT_CHECKOUT_CONFLICT_STYLE_DIFF3\nGIT_CHECKOUT_DONT_REMOVE_EXISTING\nGIT_CHECKOUT_DONT_WRITE_INDEX\nGIT_CHECKOUT_UPDATE_SUBMODULES\nGIT_CHECKOUT_UPDATE_SUBMODULES_IF_CHANGED", + "tdef": "typedef", + "description": " Checkout behavior flags", + "comments": "

In libgit2, checkout is used to update the working directory and index\n to match a target tree. Unlike git checkout, it does not move the HEAD\n commit for you - use git_repository_set_head or the like to do that.

\n\n

Checkout looks at (up to) four things: the "target" tree you want to\n check out, the "baseline" tree of what was checked out previously, the\n working directory for actual files, and the index for staged changes.

\n\n

You give checkout one of three strategies for update:

\n\n
    \n

  • GIT_CHECKOUT_NONE is a dry-run strategy that checks for conflicts,\netc., but doesn't make any actual changes.

    • \n

  • GIT_CHECKOUT_FORCE is at the opposite extreme, taking any action to\nmake the working directory match the target (including potentially\ndiscarding modified files).

    • \n

  • GIT_CHECKOUT_SAFE is between these two options, it will only make\nmodifications that will not lose changes.

    \n\n
                     |  target == baseline   |  target != baseline  |\n
    \n\n

    ---------------------|-----------------------|----------------------|\n workdir == baseline | no action | create, update, or |\n | | delete file |\n---------------------|-----------------------|----------------------|\n workdir exists and | no action | conflict (notify |\n is != baseline | notify dirty MODIFIED | and cancel checkout) |\n---------------------|-----------------------|----------------------|\n workdir missing, | notify dirty DELETED | create file |\n baseline present | | |\n---------------------|-----------------------|----------------------|

    • \n
\n\n

To emulate git checkout, use GIT_CHECKOUT_SAFE with a checkout\n notification callback (see below) that displays information about dirty\n files. The default behavior will cancel checkout on conflicts.

\n\n

To emulate git checkout-index, use GIT_CHECKOUT_SAFE with a\n notification callback that cancels the operation if a dirty-but-existing\n file is found in the working directory. This core git command isn't\n quite "force" but is sensitive about some types of changes.

\n\n

To emulate git checkout -f, use GIT_CHECKOUT_FORCE.

\n\n

There are some additional flags to modified the behavior of checkout:

\n\n
    \n

  • GIT_CHECKOUT_ALLOW_CONFLICTS makes SAFE mode apply safe file updates\neven if there are conflicts (instead of cancelling the checkout).

    • \n

  • GIT_CHECKOUT_REMOVE_UNTRACKED means remove untracked files (i.e. not\nin target, baseline, or index, and not ignored) from the working dir.

    • \n

  • GIT_CHECKOUT_REMOVE_IGNORED means remove ignored files (that are also\nuntracked) from the working directory as well.

    • \n

  • GIT_CHECKOUT_UPDATE_ONLY means to only update the content of files that\nalready exist. Files will not be created nor deleted. This just skips\napplying adds, deletes, and typechanges.

    • \n

  • GIT_CHECKOUT_DONT_UPDATE_INDEX prevents checkout from writing the\nupdated files' information to the index.

    • \n

  • Normally, checkout will reload the index and git attributes from disk\nbefore any operations. GIT_CHECKOUT_NO_REFRESH prevents this reload.

    • \n

  • Unmerged index entries are conflicts. GIT_CHECKOUT_SKIP_UNMERGED skips\nfiles with unmerged index entries instead. GIT_CHECKOUT_USE_OURS and\nGIT_CHECKOUT_USE_THEIRS to proceed with the checkout using either the\nstage 2 ("ours") or stage 3 ("theirs") version of files in the index.

    • \n

  • GIT_CHECKOUT_DONT_OVERWRITE_IGNORED prevents ignored files from being\noverwritten. Normally, files that are ignored in the working directory\nare not considered "precious" and may be overwritten if the checkout\ntarget contains that file.

    • \n

  • GIT_CHECKOUT_DONT_REMOVE_EXISTING prevents checkout from removing\nfiles or folders that fold to the same name on case insensitive\nfilesystems. This can cause files to retain their existing names\nand write through existing symbolic links.

    • \n
\n", + "fields": [ + { + "type": "int", + "name": "GIT_CHECKOUT_NONE", + "comments": "

default is a dry run, no actual updates

\n", + "value": 0 + }, + { + "type": "int", + "name": "GIT_CHECKOUT_SAFE", + "comments": "

Allow safe updates that cannot overwrite uncommitted data

\n", + "value": 1 + }, + { + "type": "int", + "name": "GIT_CHECKOUT_FORCE", + "comments": "

Allow all updates to force working directory to look like index

\n", + "value": 2 + }, + { + "type": "int", + "name": "GIT_CHECKOUT_RECREATE_MISSING", + "comments": "

Allow checkout to recreate missing files

\n", + "value": 4 + }, + { + "type": "int", + "name": "GIT_CHECKOUT_ALLOW_CONFLICTS", + "comments": "

Allow checkout to make safe updates even if conflicts are found

\n", + "value": 16 + }, + { + "type": "int", + "name": "GIT_CHECKOUT_REMOVE_UNTRACKED", + "comments": "

Remove untracked files not in index (that are not ignored)

\n", + "value": 32 + }, + { + "type": "int", + "name": "GIT_CHECKOUT_REMOVE_IGNORED", + "comments": "

Remove ignored files not in index

\n", + "value": 64 + }, + { + "type": "int", + "name": "GIT_CHECKOUT_UPDATE_ONLY", + "comments": "

Only update existing files, don't create new ones

\n", + "value": 128 + }, + { + "type": "int", + "name": "GIT_CHECKOUT_DONT_UPDATE_INDEX", + "comments": "

Normally checkout updates index entries as it goes; this stops that.\n Implies GIT_CHECKOUT_DONT_WRITE_INDEX.

\n", + "value": 256 + }, + { + "type": "int", + "name": "GIT_CHECKOUT_NO_REFRESH", + "comments": "

Don't refresh index/config/etc before doing checkout

\n", + "value": 512 + }, + { + "type": "int", + "name": "GIT_CHECKOUT_SKIP_UNMERGED", + "comments": "

Allow checkout to skip unmerged files

\n", + "value": 1024 + }, + { + "type": "int", + "name": "GIT_CHECKOUT_USE_OURS", + "comments": "

For unmerged files, checkout stage 2 from index

\n", + "value": 2048 + }, + { + "type": "int", + "name": "GIT_CHECKOUT_USE_THEIRS", + "comments": "

For unmerged files, checkout stage 3 from index

\n", + "value": 4096 + }, + { + "type": "int", + "name": "GIT_CHECKOUT_DISABLE_PATHSPEC_MATCH", + "comments": "

Treat pathspec as simple list of exact match file paths

\n", + "value": 8192 + }, + { + "type": "int", + "name": "GIT_CHECKOUT_SKIP_LOCKED_DIRECTORIES", + "comments": "

Ignore directories in use, they will be left empty

\n", + "value": 262144 + }, + { + "type": "int", + "name": "GIT_CHECKOUT_DONT_OVERWRITE_IGNORED", + "comments": "

Don't overwrite ignored files that exist in the checkout target

\n", + "value": 524288 + }, + { + "type": "int", + "name": "GIT_CHECKOUT_CONFLICT_STYLE_MERGE", + "comments": "

Write normal merge files for conflicts

\n", + "value": 1048576 + }, + { + "type": "int", + "name": "GIT_CHECKOUT_CONFLICT_STYLE_DIFF3", + "comments": "

Include common ancestor data in diff3 format files for conflicts

\n", + "value": 2097152 + }, + { + "type": "int", + "name": "GIT_CHECKOUT_DONT_REMOVE_EXISTING", + "comments": "

Don't overwrite existing files or folders

\n", + "value": 4194304 + }, + { + "type": "int", + "name": "GIT_CHECKOUT_DONT_WRITE_INDEX", + "comments": "

Normally checkout writes the index upon completion; this prevents that.

\n", + "value": 8388608 + }, + { + "type": "int", + "name": "GIT_CHECKOUT_UPDATE_SUBMODULES", + "comments": "

Recursively checkout submodules with same options (NOT IMPLEMENTED)

\n", + "value": 65536 + }, + { + "type": "int", + "name": "GIT_CHECKOUT_UPDATE_SUBMODULES_IF_CHANGED", + "comments": "

Recursively checkout submodules if HEAD moved in super repo (NOT IMPLEMENTED)

\n", + "value": 131072 + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_cherrypick_options", + { + "decl": [ + "unsigned int version", + "unsigned int mainline", + "git_merge_options merge_opts", + "git_checkout_options checkout_opts" + ], + "type": "struct", + "value": "git_cherrypick_options", + "file": "cherrypick.h", + "line": 26, + "lineto": 34, + "block": "unsigned int version\nunsigned int mainline\ngit_merge_options merge_opts\ngit_checkout_options checkout_opts", + "tdef": "typedef", + "description": " Cherry-pick options", + "comments": "", + "fields": [ + { + "type": "unsigned int", + "name": "version", + "comments": "" + }, + { + "type": "unsigned int", + "name": "mainline", + "comments": " For merge commits, the \"mainline\" is treated as the parent. " + }, + { + "type": "git_merge_options", + "name": "merge_opts", + "comments": " Options for the merging " + }, + { + "type": "git_checkout_options", + "name": "checkout_opts", + "comments": " Options for the checkout " + } + ], + "used": { + "returns": [], + "needs": [ + "git_cherrypick", + "git_cherrypick_init_options" + ] + } + } + ], + [ + "git_clone_local_t", + { + "decl": [ + "GIT_CLONE_LOCAL_AUTO", + "GIT_CLONE_LOCAL", + "GIT_CLONE_NO_LOCAL", + "GIT_CLONE_LOCAL_NO_LINKS" + ], + "type": "enum", + "file": "clone.h", + "line": 33, + "lineto": 53, + "block": "GIT_CLONE_LOCAL_AUTO\nGIT_CLONE_LOCAL\nGIT_CLONE_NO_LOCAL\nGIT_CLONE_LOCAL_NO_LINKS", + "tdef": "typedef", + "description": " Options for bypassing the git-aware transport on clone. Bypassing\n it means that instead of a fetch, libgit2 will copy the object\n database directory instead of figuring out what it needs, which is\n faster. If possible, it will hardlink the files to save space.", + "comments": "", + "fields": [ + { + "type": "int", + "name": "GIT_CLONE_LOCAL_AUTO", + "comments": "

Auto-detect (default), libgit2 will bypass the git-aware\n transport for local paths, but use a normal fetch for\n file:// urls.

\n", + "value": 0 + }, + { + "type": "int", + "name": "GIT_CLONE_LOCAL", + "comments": "

Bypass the git-aware transport even for a file:// url.

\n", + "value": 1 + }, + { + "type": "int", + "name": "GIT_CLONE_NO_LOCAL", + "comments": "

Do no bypass the git-aware transport

\n", + "value": 2 + }, + { + "type": "int", + "name": "GIT_CLONE_LOCAL_NO_LINKS", + "comments": "

Bypass the git-aware transport, but do not try to use\n hardlinks.

\n", + "value": 3 + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_clone_options", + { + "decl": [ + "unsigned int version", + "git_checkout_options checkout_opts", + "git_fetch_options fetch_opts", + "int bare", + "git_clone_local_t local", + "const char * checkout_branch", + "git_repository_create_cb repository_cb", + "void * repository_cb_payload", + "git_remote_create_cb remote_cb", + "void * remote_cb_payload" + ], + "type": "struct", + "value": "git_clone_options", + "file": "clone.h", + "line": 103, + "lineto": 164, + "block": "unsigned int version\ngit_checkout_options checkout_opts\ngit_fetch_options fetch_opts\nint bare\ngit_clone_local_t local\nconst char * checkout_branch\ngit_repository_create_cb repository_cb\nvoid * repository_cb_payload\ngit_remote_create_cb remote_cb\nvoid * remote_cb_payload", + "tdef": "typedef", + "description": " Clone options structure", + "comments": "

Use the GIT_CLONE_OPTIONS_INIT to get the default settings, like this:

\n\n
    git_clone_options opts = GIT_CLONE_OPTIONS_INIT;\n
\n", + "fields": [ + { + "type": "unsigned int", + "name": "version", + "comments": "" + }, + { + "type": "git_checkout_options", + "name": "checkout_opts", + "comments": " These options are passed to the checkout step. To disable\n checkout, set the `checkout_strategy` to\n `GIT_CHECKOUT_NONE`." + }, + { + "type": "git_fetch_options", + "name": "fetch_opts", + "comments": " Options which control the fetch, including callbacks.\n\n The callbacks are used for reporting fetch progress, and for acquiring\n credentials in the event they are needed." + }, + { + "type": "int", + "name": "bare", + "comments": " Set to zero (false) to create a standard repo, or non-zero\n for a bare repo" + }, + { + "type": "git_clone_local_t", + "name": "local", + "comments": " Whether to use a fetch or copy the object database." + }, + { + "type": "const char *", + "name": "checkout_branch", + "comments": " The name of the branch to checkout. NULL means use the\n remote's default branch." + }, + { + "type": "git_repository_create_cb", + "name": "repository_cb", + "comments": " A callback used to create the new repository into which to\n clone. If NULL, the 'bare' field will be used to determine\n whether to create a bare repository." + }, + { + "type": "void *", + "name": "repository_cb_payload", + "comments": " An opaque payload to pass to the git_repository creation callback.\n This parameter is ignored unless repository_cb is non-NULL." + }, + { + "type": "git_remote_create_cb", + "name": "remote_cb", + "comments": " A callback used to create the git_remote, prior to its being\n used to perform the clone operation. See the documentation for\n git_remote_create_cb for details. This parameter may be NULL,\n indicating that git_clone should provide default behavior." + }, + { + "type": "void *", + "name": "remote_cb_payload", + "comments": " An opaque payload to pass to the git_remote creation callback.\n This parameter is ignored unless remote_cb is non-NULL." + } + ], + "used": { + "returns": [], + "needs": [ + "git_clone", + "git_clone_init_options" + ] + } + } + ], + [ + "git_commit", + { + "decl": "git_commit", + "type": "struct", + "value": "git_commit", + "file": "types.h", + "line": 120, + "lineto": 120, + "tdef": "typedef", + "description": " Parsed representation of a commit object. ", + "comments": "", + "used": { + "returns": [], + "needs": [ + "git_branch_create", + "git_cherrypick", + "git_cherrypick_commit", + "git_commit_amend", + "git_commit_author", + "git_commit_committer", + "git_commit_create", + "git_commit_free", + "git_commit_header_field", + "git_commit_id", + "git_commit_lookup", + "git_commit_lookup_prefix", + "git_commit_message", + "git_commit_message_encoding", + "git_commit_message_raw", + "git_commit_nth_gen_ancestor", + "git_commit_owner", + "git_commit_parent", + "git_commit_parent_id", + "git_commit_parentcount", + "git_commit_raw_header", + "git_commit_summary", + "git_commit_time", + "git_commit_time_offset", + "git_commit_tree", + "git_commit_tree_id", + "git_diff_commit_as_email", + "git_merge_commits", + "git_revert", + "git_revert_commit" + ] + } + } + ], + [ + "git_config", + { + "decl": "git_config", + "type": "struct", + "value": "git_config", + "file": "types.h", + "line": 138, + "lineto": 138, + "tdef": "typedef", + "description": " Memory representation of a set of config files ", + "comments": "", + "used": { + "returns": [], + "needs": [ + "git_config_add_backend", + "git_config_add_file_ondisk", + "git_config_delete_entry", + "git_config_delete_multivar", + "git_config_foreach", + "git_config_foreach_match", + "git_config_free", + "git_config_get_bool", + "git_config_get_entry", + "git_config_get_int32", + "git_config_get_int64", + "git_config_get_mapped", + "git_config_get_multivar_foreach", + "git_config_get_path", + "git_config_get_string", + "git_config_get_string_buf", + "git_config_iterator_glob_new", + "git_config_iterator_new", + "git_config_multivar_iterator_new", + "git_config_new", + "git_config_open_default", + "git_config_open_global", + "git_config_open_level", + "git_config_open_ondisk", + "git_config_set_bool", + "git_config_set_int32", + "git_config_set_int64", + "git_config_set_multivar", + "git_config_set_string", + "git_config_snapshot", + "git_repository_config", + "git_repository_config_snapshot", + "git_repository_set_config" + ] + } + } + ], + [ + "git_config_backend", + { + "decl": "git_config_backend", + "type": "struct", + "value": "git_config_backend", + "file": "types.h", + "line": 141, + "lineto": 141, + "block": "unsigned int version\nint readonly\nstruct git_config * cfg\nint (*)(struct git_config_backend *, git_config_level_t) open\nint (*)(struct git_config_backend *, const char *, git_config_entry **) get\nint (*)(struct git_config_backend *, const char *, const char *) set\nint (*)(git_config_backend *, const char *, const char *, const char *) set_multivar\nint (*)(struct git_config_backend *, const char *) del\nint (*)(struct git_config_backend *, const char *, const char *) del_multivar\nint (*)(git_config_iterator **, struct git_config_backend *) iterator\nint (*)(struct git_config_backend **, struct git_config_backend *) snapshot\nvoid (*)(struct git_config_backend *) free", + "tdef": "typedef", + "description": " Interface to access a configuration file ", + "comments": "", + "fields": [ + { + "type": "unsigned int", + "name": "version", + "comments": "" + }, + { + "type": "int", + "name": "readonly", + "comments": " True if this backend is for a snapshot " + }, + { + "type": "struct git_config *", + "name": "cfg", + "comments": "" + }, + { + "type": "int (*)(struct git_config_backend *, git_config_level_t)", + "name": "open", + "comments": "" + }, + { + "type": "int (*)(struct git_config_backend *, const char *, git_config_entry **)", + "name": "get", + "comments": "" + }, + { + "type": "int (*)(struct git_config_backend *, const char *, const char *)", + "name": "set", + "comments": "" + }, + { + "type": "int (*)(git_config_backend *, const char *, const char *, const char *)", + "name": "set_multivar", + "comments": "" + }, + { + "type": "int (*)(struct git_config_backend *, const char *)", + "name": "del", + "comments": "" + }, + { + "type": "int (*)(struct git_config_backend *, const char *, const char *)", + "name": "del_multivar", + "comments": "" + }, + { + "type": "int (*)(git_config_iterator **, struct git_config_backend *)", + "name": "iterator", + "comments": "" + }, + { + "type": "int (*)(struct git_config_backend **, struct git_config_backend *)", + "name": "snapshot", + "comments": " Produce a read-only version of this backend " + }, + { + "type": "void (*)(struct git_config_backend *)", + "name": "free", + "comments": "" + } + ], + "used": { + "returns": [], + "needs": [ + "git_config_add_backend", + "git_config_backend_foreach_match", + "git_config_init_backend" + ] + } + } + ], + [ + "git_config_entry", + { + "decl": [ + "const char * name", + "const char * value", + "git_config_level_t level", + "void (*)(struct git_config_entry *) free", + "void * payload" + ], + "type": "struct", + "value": "git_config_entry", + "file": "config.h", + "line": 61, + "lineto": 67, + "block": "const char * name\nconst char * value\ngit_config_level_t level\nvoid (*)(struct git_config_entry *) free\nvoid * payload", + "tdef": "typedef", + "description": " An entry in a configuration file", + "comments": "", + "fields": [ + { + "type": "const char *", + "name": "name", + "comments": " Name of the entry (normalised) " + }, + { + "type": "const char *", + "name": "value", + "comments": " String value of the entry " + }, + { + "type": "git_config_level_t", + "name": "level", + "comments": " Which config file this was found in " + }, + { + "type": "void (*)(struct git_config_entry *)", + "name": "free", + "comments": " Free function for this entry " + }, + { + "type": "void *", + "name": "payload", + "comments": " Opaque value for the free function. Do not read or write " + } + ], + "used": { + "returns": [], + "needs": [ + "git_config_entry_free", + "git_config_get_entry", + "git_config_next" + ] + } + } + ], + [ + "git_config_iterator", + { + "decl": [ + "git_config_backend * backend", + "unsigned int flags", + "int (*)(git_config_entry **, git_config_iterator *) next", + "void (*)(git_config_iterator *) free" + ], + "type": "struct", + "value": "git_config_iterator", + "file": "sys/config.h", + "line": 34, + "lineto": 48, + "block": "git_config_backend * backend\nunsigned int flags\nint (*)(git_config_entry **, git_config_iterator *) next\nvoid (*)(git_config_iterator *) free", + "tdef": null, + "description": " Every iterator must have this struct as its first element, so the\n API can talk to it. You'd define your iterator as", + "comments": "
 struct my_iterator {\n         git_config_iterator parent;\n         ...\n }\n
\n\n

and assign iter->parent.backend to your git_config_backend.

\n", + "fields": [ + { + "type": "git_config_backend *", + "name": "backend", + "comments": "" + }, + { + "type": "unsigned int", + "name": "flags", + "comments": "" + }, + { + "type": "int (*)(git_config_entry **, git_config_iterator *)", + "name": "next", + "comments": " Return the current entry and advance the iterator. The\n memory belongs to the library." + }, + { + "type": "void (*)(git_config_iterator *)", + "name": "free", + "comments": " Free the iterator" + } + ], + "used": { + "returns": [], + "needs": [ + "git_config_iterator_free", + "git_config_iterator_glob_new", + "git_config_iterator_new", + "git_config_multivar_iterator_new", + "git_config_next" + ] + } + } + ], + [ + "git_config_level_t", + { + "decl": [ + "GIT_CONFIG_LEVEL_SYSTEM", + "GIT_CONFIG_LEVEL_XDG", + "GIT_CONFIG_LEVEL_GLOBAL", + "GIT_CONFIG_LEVEL_LOCAL", + "GIT_CONFIG_LEVEL_APP", + "GIT_CONFIG_HIGHEST_LEVEL" + ], + "type": "enum", + "file": "config.h", + "line": 31, + "lineto": 56, + "block": "GIT_CONFIG_LEVEL_SYSTEM\nGIT_CONFIG_LEVEL_XDG\nGIT_CONFIG_LEVEL_GLOBAL\nGIT_CONFIG_LEVEL_LOCAL\nGIT_CONFIG_LEVEL_APP\nGIT_CONFIG_HIGHEST_LEVEL", + "tdef": "typedef", + "description": " Priority level of a config file.\n These priority levels correspond to the natural escalation logic\n (from higher to lower) when searching for config entries in git.git.", + "comments": "

git_config_open_default() and git_repository_config() honor those\n priority levels as well.

\n", + "fields": [ + { + "type": "int", + "name": "GIT_CONFIG_LEVEL_SYSTEM", + "comments": "

System-wide configuration file; /etc/gitconfig on Linux systems

\n", + "value": 1 + }, + { + "type": "int", + "name": "GIT_CONFIG_LEVEL_XDG", + "comments": "

XDG compatible configuration file; typically ~/.config/git/config

\n", + "value": 2 + }, + { + "type": "int", + "name": "GIT_CONFIG_LEVEL_GLOBAL", + "comments": "

User-specific configuration file (also called Global configuration\n file); typically ~/.gitconfig

\n", + "value": 3 + }, + { + "type": "int", + "name": "GIT_CONFIG_LEVEL_LOCAL", + "comments": "

Repository specific configuration file; $WORK_DIR/.git/config on\n non-bare repos

\n", + "value": 4 + }, + { + "type": "int", + "name": "GIT_CONFIG_LEVEL_APP", + "comments": "

Application specific configuration file; freely defined by applications

\n", + "value": 5 + }, + { + "type": "int", + "name": "GIT_CONFIG_HIGHEST_LEVEL", + "comments": "

Represents the highest level available config file (i.e. the most\n specific config file available that actually is loaded)

\n", + "value": -1 + } + ], + "used": { + "returns": [], + "needs": [ + "git_config_add_backend", + "git_config_add_file_ondisk", + "git_config_open_level" + ] + } + } + ], + [ + "git_cred_default", + { + "decl": "git_cred_default", + "type": "struct", + "value": "git_cred_default", + "file": "transport.h", + "line": 183, + "lineto": 183, + "tdef": "typedef", + "description": " A key for NTLM/Kerberos \"default\" credentials ", + "comments": "", + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_cred_ssh_custom", + { + "decl": [ + "git_cred parent", + "char * username", + "char * publickey", + "size_t publickey_len", + "git_cred_sign_callback sign_callback", + "void * payload" + ], + "type": "struct", + "value": "git_cred_ssh_custom", + "file": "transport.h", + "line": 173, + "lineto": 180, + "block": "git_cred parent\nchar * username\nchar * publickey\nsize_t publickey_len\ngit_cred_sign_callback sign_callback\nvoid * payload", + "tdef": "typedef", + "description": " A key with a custom signature function", + "comments": "", + "fields": [ + { + "type": "git_cred", + "name": "parent", + "comments": "" + }, + { + "type": "char *", + "name": "username", + "comments": "" + }, + { + "type": "char *", + "name": "publickey", + "comments": "" + }, + { + "type": "size_t", + "name": "publickey_len", + "comments": "" + }, + { + "type": "git_cred_sign_callback", + "name": "sign_callback", + "comments": "" + }, + { + "type": "void *", + "name": "payload", + "comments": "" + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_cred_ssh_interactive", + { + "decl": [ + "git_cred parent", + "char * username", + "git_cred_ssh_interactive_callback prompt_callback", + "void * payload" + ], + "type": "struct", + "value": "git_cred_ssh_interactive", + "file": "transport.h", + "line": 163, + "lineto": 168, + "block": "git_cred parent\nchar * username\ngit_cred_ssh_interactive_callback prompt_callback\nvoid * payload", + "tdef": "typedef", + "description": " Keyboard-interactive based ssh authentication", + "comments": "", + "fields": [ + { + "type": "git_cred", + "name": "parent", + "comments": "" + }, + { + "type": "char *", + "name": "username", + "comments": "" + }, + { + "type": "git_cred_ssh_interactive_callback", + "name": "prompt_callback", + "comments": "" + }, + { + "type": "void *", + "name": "payload", + "comments": "" + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_cred_ssh_key", + { + "decl": [ + "git_cred parent", + "char * username", + "char * publickey", + "char * privatekey", + "char * passphrase" + ], + "type": "struct", + "value": "git_cred_ssh_key", + "file": "transport.h", + "line": 152, + "lineto": 158, + "block": "git_cred parent\nchar * username\nchar * publickey\nchar * privatekey\nchar * passphrase", + "tdef": "typedef", + "description": " A ssh key from disk", + "comments": "", + "fields": [ + { + "type": "git_cred", + "name": "parent", + "comments": "" + }, + { + "type": "char *", + "name": "username", + "comments": "" + }, + { + "type": "char *", + "name": "publickey", + "comments": "" + }, + { + "type": "char *", + "name": "privatekey", + "comments": "" + }, + { + "type": "char *", + "name": "passphrase", + "comments": "" + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_cred_username", + { + "decl": [ + "git_cred parent", + "char [1] username" + ], + "type": "struct", + "value": "git_cred_username", + "file": "transport.h", + "line": 186, + "lineto": 189, + "block": "git_cred parent\nchar [1] username", + "tdef": "typedef", + "description": " Username-only credential information ", + "comments": "", + "fields": [ + { + "type": "git_cred", + "name": "parent", + "comments": "" + }, + { + "type": "char [1]", + "name": "username", + "comments": "" + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_cred_userpass_payload", + { + "decl": [ + "const char * username", + "const char * password" + ], + "type": "struct", + "value": "git_cred_userpass_payload", + "file": "cred_helpers.h", + "line": 24, + "lineto": 27, + "block": "const char * username\nconst char * password", + "tdef": "typedef", + "description": " Payload for git_cred_stock_userpass_plaintext.", + "comments": "", + "fields": [ + { + "type": "const char *", + "name": "username", + "comments": "" + }, + { + "type": "const char *", + "name": "password", + "comments": "" + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_cred_userpass_plaintext", + { + "decl": [ + "git_cred parent", + "char * username", + "char * password" + ], + "type": "struct", + "value": "git_cred_userpass_plaintext", + "file": "transport.h", + "line": 129, + "lineto": 133, + "block": "git_cred parent\nchar * username\nchar * password", + "tdef": "typedef", + "description": " A plaintext username and password ", + "comments": "", + "fields": [ + { + "type": "git_cred", + "name": "parent", + "comments": "" + }, + { + "type": "char *", + "name": "username", + "comments": "" + }, + { + "type": "char *", + "name": "password", + "comments": "" + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_credtype_t", + { + "decl": [ + "GIT_CREDTYPE_USERPASS_PLAINTEXT", + "GIT_CREDTYPE_SSH_KEY", + "GIT_CREDTYPE_SSH_CUSTOM", + "GIT_CREDTYPE_DEFAULT", + "GIT_CREDTYPE_SSH_INTERACTIVE", + "GIT_CREDTYPE_USERNAME", + "GIT_CREDTYPE_SSH_MEMORY" + ], + "type": "enum", + "file": "transport.h", + "line": 88, + "lineto": 118, + "block": "GIT_CREDTYPE_USERPASS_PLAINTEXT\nGIT_CREDTYPE_SSH_KEY\nGIT_CREDTYPE_SSH_CUSTOM\nGIT_CREDTYPE_DEFAULT\nGIT_CREDTYPE_SSH_INTERACTIVE\nGIT_CREDTYPE_USERNAME\nGIT_CREDTYPE_SSH_MEMORY", + "tdef": "typedef", + "description": " Authentication type requested ", + "comments": "", + "fields": [ + { + "type": "int", + "name": "GIT_CREDTYPE_USERPASS_PLAINTEXT", + "comments": "", + "value": 1 + }, + { + "type": "int", + "name": "GIT_CREDTYPE_SSH_KEY", + "comments": "", + "value": 2 + }, + { + "type": "int", + "name": "GIT_CREDTYPE_SSH_CUSTOM", + "comments": "", + "value": 4 + }, + { + "type": "int", + "name": "GIT_CREDTYPE_DEFAULT", + "comments": "", + "value": 8 + }, + { + "type": "int", + "name": "GIT_CREDTYPE_SSH_INTERACTIVE", + "comments": "", + "value": 16 + }, + { + "type": "int", + "name": "GIT_CREDTYPE_USERNAME", + "comments": "

Username-only information

\n\n

If the SSH transport does not know which username to use,\n it will ask via this credential type.

\n", + "value": 32 + }, + { + "type": "int", + "name": "GIT_CREDTYPE_SSH_MEMORY", + "comments": "

Credentials read from memory.

\n\n

Only available for libssh2+OpenSSL for now.

\n", + "value": 64 + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_cvar_map", + { + "decl": [ + "git_cvar_t cvar_type", + "const char * str_match", + "int map_value" + ], + "type": "struct", + "value": "git_cvar_map", + "file": "config.h", + "line": 90, + "lineto": 94, + "block": "git_cvar_t cvar_type\nconst char * str_match\nint map_value", + "tdef": "typedef", + "description": " Mapping from config variables to values.", + "comments": "", + "fields": [ + { + "type": "git_cvar_t", + "name": "cvar_type", + "comments": "" + }, + { + "type": "const char *", + "name": "str_match", + "comments": "" + }, + { + "type": "int", + "name": "map_value", + "comments": "" + } + ], + "used": { + "returns": [], + "needs": [ + "git_config_get_mapped", + "git_config_lookup_map_value" + ] + } + } + ], + [ + "git_cvar_t", + { + "decl": [ + "GIT_CVAR_FALSE", + "GIT_CVAR_TRUE", + "GIT_CVAR_INT32", + "GIT_CVAR_STRING" + ], + "type": "enum", + "file": "config.h", + "line": 80, + "lineto": 85, + "block": "GIT_CVAR_FALSE\nGIT_CVAR_TRUE\nGIT_CVAR_INT32\nGIT_CVAR_STRING", + "tdef": "typedef", + "description": " Config var type", + "comments": "", + "fields": [ + { + "type": "int", + "name": "GIT_CVAR_FALSE", + "comments": "", + "value": 0 + }, + { + "type": "int", + "name": "GIT_CVAR_TRUE", + "comments": "", + "value": 1 + }, + { + "type": "int", + "name": "GIT_CVAR_INT32", + "comments": "", + "value": 2 + }, + { + "type": "int", + "name": "GIT_CVAR_STRING", + "comments": "", + "value": 3 + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_delta_t", + { + "decl": [ + "GIT_DELTA_UNMODIFIED", + "GIT_DELTA_ADDED", + "GIT_DELTA_DELETED", + "GIT_DELTA_MODIFIED", + "GIT_DELTA_RENAMED", + "GIT_DELTA_COPIED", + "GIT_DELTA_IGNORED", + "GIT_DELTA_UNTRACKED", + "GIT_DELTA_TYPECHANGE", + "GIT_DELTA_UNREADABLE", + "GIT_DELTA_CONFLICTED" + ], + "type": "enum", + "file": "diff.h", + "line": 242, + "lineto": 254, + "block": "GIT_DELTA_UNMODIFIED\nGIT_DELTA_ADDED\nGIT_DELTA_DELETED\nGIT_DELTA_MODIFIED\nGIT_DELTA_RENAMED\nGIT_DELTA_COPIED\nGIT_DELTA_IGNORED\nGIT_DELTA_UNTRACKED\nGIT_DELTA_TYPECHANGE\nGIT_DELTA_UNREADABLE\nGIT_DELTA_CONFLICTED", + "tdef": "typedef", + "description": " What type of change is described by a git_diff_delta?", + "comments": "

GIT_DELTA_RENAMED and GIT_DELTA_COPIED will only show up if you run\n git_diff_find_similar() on the diff object.

\n\n

GIT_DELTA_TYPECHANGE only shows up given GIT_DIFF_INCLUDE_TYPECHANGE\n in the option flags (otherwise type changes will be split into ADDED /\n DELETED pairs).

\n", + "fields": [ + { + "type": "int", + "name": "GIT_DELTA_UNMODIFIED", + "comments": "

no changes

\n", + "value": 0 + }, + { + "type": "int", + "name": "GIT_DELTA_ADDED", + "comments": "

entry does not exist in old version

\n", + "value": 1 + }, + { + "type": "int", + "name": "GIT_DELTA_DELETED", + "comments": "

entry does not exist in new version

\n", + "value": 2 + }, + { + "type": "int", + "name": "GIT_DELTA_MODIFIED", + "comments": "

entry content changed between old and new

\n", + "value": 3 + }, + { + "type": "int", + "name": "GIT_DELTA_RENAMED", + "comments": "

entry was renamed between old and new

\n", + "value": 4 + }, + { + "type": "int", + "name": "GIT_DELTA_COPIED", + "comments": "

entry was copied from another old entry

\n", + "value": 5 + }, + { + "type": "int", + "name": "GIT_DELTA_IGNORED", + "comments": "

entry is ignored item in workdir

\n", + "value": 6 + }, + { + "type": "int", + "name": "GIT_DELTA_UNTRACKED", + "comments": "

entry is untracked item in workdir

\n", + "value": 7 + }, + { + "type": "int", + "name": "GIT_DELTA_TYPECHANGE", + "comments": "

type of entry changed between old and new

\n", + "value": 8 + }, + { + "type": "int", + "name": "GIT_DELTA_UNREADABLE", + "comments": "

entry is unreadable

\n", + "value": 9 + }, + { + "type": "int", + "name": "GIT_DELTA_CONFLICTED", + "comments": "

entry in the index is conflicted

\n", + "value": 10 + } + ], + "used": { + "returns": [], + "needs": [ + "git_diff_num_deltas_of_type", + "git_diff_status_char" + ] + } + } + ], + [ + "git_describe_format_options", + { + "decl": [ + "unsigned int version", + "unsigned int abbreviated_size", + "int always_use_long_format", + "const char * dirty_suffix" + ], + "type": "struct", + "value": "git_describe_format_options", + "file": "describe.h", + "line": 78, + "lineto": 98, + "block": "unsigned int version\nunsigned int abbreviated_size\nint always_use_long_format\nconst char * dirty_suffix", + "tdef": "typedef", + "description": " Options for formatting the describe string", + "comments": "", + "fields": [ + { + "type": "unsigned int", + "name": "version", + "comments": "" + }, + { + "type": "unsigned int", + "name": "abbreviated_size", + "comments": " Size of the abbreviated commit id to use. This value is the\n lower bound for the length of the abbreviated string. The\n default is 7." + }, + { + "type": "int", + "name": "always_use_long_format", + "comments": " Set to use the long format even when a shorter name could be used." + }, + { + "type": "const char *", + "name": "dirty_suffix", + "comments": " If the workdir is dirty and this is set, this string will\n be appended to the description string." + } + ], + "used": { + "returns": [], + "needs": [ + "git_describe_format" + ] + } + } + ], + [ + "git_describe_options", + { + "decl": [ + "unsigned int version", + "unsigned int max_candidates_tags", + "unsigned int describe_strategy", + "const char * pattern", + "int only_follow_first_parent", + "int show_commit_oid_as_fallback" + ], + "type": "struct", + "value": "git_describe_options", + "file": "describe.h", + "line": 44, + "lineto": 62, + "block": "unsigned int version\nunsigned int max_candidates_tags\nunsigned int describe_strategy\nconst char * pattern\nint only_follow_first_parent\nint show_commit_oid_as_fallback", + "tdef": "typedef", + "description": " Describe options structure", + "comments": "

Initialize with GIT_DESCRIBE_OPTIONS_INIT macro to correctly set\n the version field. E.g.

\n\n
    git_describe_options opts = GIT_DESCRIBE_OPTIONS_INIT;\n
\n", + "fields": [ + { + "type": "unsigned int", + "name": "version", + "comments": "" + }, + { + "type": "unsigned int", + "name": "max_candidates_tags", + "comments": "" + }, + { + "type": "unsigned int", + "name": "describe_strategy", + "comments": " default: 10 " + }, + { + "type": "const char *", + "name": "pattern", + "comments": " default: GIT_DESCRIBE_DEFAULT " + }, + { + "type": "int", + "name": "only_follow_first_parent", + "comments": " When calculating the distance from the matching tag or\n reference, only walk down the first-parent ancestry." + }, + { + "type": "int", + "name": "show_commit_oid_as_fallback", + "comments": " If no matching tag or reference is found, the describe\n operation would normally fail. If this option is set, it\n will instead fall back to showing the full id of the\n commit." + } + ], + "used": { + "returns": [], + "needs": [ + "git_describe_commit", + "git_describe_workdir" + ] + } + } + ], + [ + "git_describe_strategy_t", + { + "decl": [ + "GIT_DESCRIBE_DEFAULT", + "GIT_DESCRIBE_TAGS", + "GIT_DESCRIBE_ALL" + ], + "type": "enum", + "file": "describe.h", + "line": 30, + "lineto": 34, + "block": "GIT_DESCRIBE_DEFAULT\nGIT_DESCRIBE_TAGS\nGIT_DESCRIBE_ALL", + "tdef": "typedef", + "description": " Reference lookup strategy", + "comments": "

These behave like the --tags and --all optios to git-describe,\n namely they say to look for any reference in either refs/tags/ or\n refs/ respectively.

\n", + "fields": [ + { + "type": "int", + "name": "GIT_DESCRIBE_DEFAULT", + "comments": "", + "value": 0 + }, + { + "type": "int", + "name": "GIT_DESCRIBE_TAGS", + "comments": "", + "value": 1 + }, + { + "type": "int", + "name": "GIT_DESCRIBE_ALL", + "comments": "", + "value": 2 + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_diff", + { + "decl": "git_diff", + "type": "struct", + "value": "git_diff", + "file": "diff.h", + "line": 215, + "lineto": 215, + "tdef": "typedef", + "description": " The diff object that contains all individual file deltas.", + "comments": "

This is an opaque structure which will be allocated by one of the diff\n generator functions below (such as git_diff_tree_to_tree). You are\n responsible for releasing the object memory when done, using the\n git_diff_free() function.

\n", + "used": { + "returns": [], + "needs": [ + "git_diff_find_similar", + "git_diff_foreach", + "git_diff_format_email", + "git_diff_free", + "git_diff_get_delta", + "git_diff_get_perfdata", + "git_diff_get_stats", + "git_diff_index_to_workdir", + "git_diff_is_sorted_icase", + "git_diff_merge", + "git_diff_num_deltas", + "git_diff_num_deltas_of_type", + "git_diff_print", + "git_diff_tree_to_index", + "git_diff_tree_to_tree", + "git_diff_tree_to_workdir", + "git_diff_tree_to_workdir_with_index", + "git_patch_from_diff", + "git_pathspec_match_diff" + ] + } + } + ], + [ + "git_diff_binary", + { + "decl": [ + "git_diff_binary_file old_file", + "git_diff_binary_file new_file" + ], + "type": "struct", + "value": "git_diff_binary", + "file": "diff.h", + "line": 461, + "lineto": 464, + "block": "git_diff_binary_file old_file\ngit_diff_binary_file new_file", + "tdef": "typedef", + "description": " Structure describing the binary contents of a diff. ", + "comments": "", + "fields": [ + { + "type": "git_diff_binary_file", + "name": "old_file", + "comments": " The contents of the old file. " + }, + { + "type": "git_diff_binary_file", + "name": "new_file", + "comments": " The contents of the new file. " + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_diff_binary_file", + { + "decl": [ + "git_diff_binary_t type", + "const char * data", + "size_t datalen", + "size_t inflatedlen" + ], + "type": "struct", + "value": "git_diff_binary_file", + "file": "diff.h", + "line": 446, + "lineto": 458, + "block": "git_diff_binary_t type\nconst char * data\nsize_t datalen\nsize_t inflatedlen", + "tdef": "typedef", + "description": " The contents of one of the files in a binary diff. ", + "comments": "", + "fields": [ + { + "type": "git_diff_binary_t", + "name": "type", + "comments": " The type of binary data for this file. " + }, + { + "type": "const char *", + "name": "data", + "comments": " The binary data, deflated. " + }, + { + "type": "size_t", + "name": "datalen", + "comments": " The length of the binary data. " + }, + { + "type": "size_t", + "name": "inflatedlen", + "comments": " The length of the binary data after inflation. " + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_diff_binary_t", + { + "decl": [ + "GIT_DIFF_BINARY_NONE", + "GIT_DIFF_BINARY_LITERAL", + "GIT_DIFF_BINARY_DELTA" + ], + "type": "enum", + "file": "diff.h", + "line": 434, + "lineto": 443, + "block": "GIT_DIFF_BINARY_NONE\nGIT_DIFF_BINARY_LITERAL\nGIT_DIFF_BINARY_DELTA", + "tdef": "typedef", + "description": " When producing a binary diff, the binary data returned will be\n either the deflated full (\"literal\") contents of the file, or\n the deflated binary delta between the two sides (whichever is\n smaller).", + "comments": "", + "fields": [ + { + "type": "int", + "name": "GIT_DIFF_BINARY_NONE", + "comments": "

There is no binary delta.

\n", + "value": 0 + }, + { + "type": "int", + "name": "GIT_DIFF_BINARY_LITERAL", + "comments": "

The binary data is the literal contents of the file.

\n", + "value": 1 + }, + { + "type": "int", + "name": "GIT_DIFF_BINARY_DELTA", + "comments": "

The binary data is the delta from one side to the other.

\n", + "value": 2 + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_diff_delta", + { + "decl": [ + "git_delta_t status", + "uint32_t flags", + "uint16_t similarity", + "uint16_t nfiles", + "git_diff_file old_file", + "git_diff_file new_file" + ], + "type": "struct", + "value": "git_diff_delta", + "file": "diff.h", + "line": 321, + "lineto": 328, + "block": "git_delta_t status\nuint32_t flags\nuint16_t similarity\nuint16_t nfiles\ngit_diff_file old_file\ngit_diff_file new_file", + "tdef": "typedef", + "description": " Description of changes to one entry.", + "comments": "

When iterating over a diff, this will be passed to most callbacks and\n you can use the contents to understand exactly what has changed.

\n\n

The old_file represents the "from" side of the diff and the new_file\n represents to "to" side of the diff. What those means depend on the\n function that was used to generate the diff and will be documented below.\n You can also use the GIT_DIFF_REVERSE flag to flip it around.

\n\n

Although the two sides of the delta are named "old_file" and "new_file",\n they actually may correspond to entries that represent a file, a symbolic\n link, a submodule commit id, or even a tree (if you are tracking type\n changes or ignored/untracked directories).

\n\n

Under some circumstances, in the name of efficiency, not all fields will\n be filled in, but we generally try to fill in as much as possible. One\n example is that the "flags" field may not have either the BINARY or the\n NOT_BINARY flag set to avoid examining file contents if you do not pass\n in hunk and/or line callbacks to the diff foreach iteration function. It\n will just use the git attributes for those files.

\n\n

The similarity score is zero unless you call git_diff_find_similar()\n which does a similarity analysis of files in the diff. Use that\n function to do rename and copy detection, and to split heavily modified\n files in add/delete pairs. After that call, deltas with a status of\n GIT_DELTA_RENAMED or GIT_DELTA_COPIED will have a similarity score\n between 0 and 100 indicating how similar the old and new sides are.

\n\n

If you ask git_diff_find_similar to find heavily modified files to\n break, but to not actually break the records, then GIT_DELTA_MODIFIED\n records may have a non-zero similarity score if the self-similarity is\n below the split threshold. To display this value like core Git, invert\n the score (a la printf("M%03d", 100 - delta->similarity)).

\n", + "fields": [ + { + "type": "git_delta_t", + "name": "status", + "comments": "" + }, + { + "type": "uint32_t", + "name": "flags", + "comments": " git_diff_flag_t values " + }, + { + "type": "uint16_t", + "name": "similarity", + "comments": " for RENAMED and COPIED, value 0-100 " + }, + { + "type": "uint16_t", + "name": "nfiles", + "comments": " number of files in this delta " + }, + { + "type": "git_diff_file", + "name": "old_file", + "comments": "" + }, + { + "type": "git_diff_file", + "name": "new_file", + "comments": "" + } + ], + "used": { + "returns": [ + "git_diff_get_delta", + "git_patch_get_delta", + "git_pathspec_match_list_diff_entry" + ], + "needs": [ + "git_diff_print_callback__to_buf", + "git_diff_print_callback__to_file_handle" + ] + } + } + ], + [ + "git_diff_file", + { + "decl": [ + "git_oid id", + "const char * path", + "git_off_t size", + "uint32_t flags", + "uint16_t mode" + ], + "type": "struct", + "value": "git_diff_file", + "file": "diff.h", + "line": 277, + "lineto": 283, + "block": "git_oid id\nconst char * path\ngit_off_t size\nuint32_t flags\nuint16_t mode", + "tdef": "typedef", + "description": " Description of one side of a delta.", + "comments": "

Although this is called a "file", it could represent a file, a symbolic\n link, a submodule commit id, or even a tree (although that only if you\n are tracking type changes or ignored/untracked directories).

\n\n

The oid is the git_oid of the item. If the entry represents an\n absent side of a diff (e.g. the old_file of a GIT_DELTA_ADDED delta),\n then the oid will be zeroes.

\n\n

path is the NUL-terminated path to the entry relative to the working\n directory of the repository.

\n\n

size is the size of the entry in bytes.

\n\n

flags is a combination of the git_diff_flag_t types

\n\n

mode is, roughly, the stat() st_mode value for the item. This will\n be restricted to one of the git_filemode_t values.

\n", + "fields": [ + { + "type": "git_oid", + "name": "id", + "comments": "" + }, + { + "type": "const char *", + "name": "path", + "comments": "" + }, + { + "type": "git_off_t", + "name": "size", + "comments": "" + }, + { + "type": "uint32_t", + "name": "flags", + "comments": "" + }, + { + "type": "uint16_t", + "name": "mode", + "comments": "" + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_diff_find_options", + { + "decl": [ + "unsigned int version", + "uint32_t flags", + "uint16_t rename_threshold", + "uint16_t rename_from_rewrite_threshold", + "uint16_t copy_threshold", + "uint16_t break_rewrite_threshold", + "size_t rename_limit", + "git_diff_similarity_metric * metric" + ], + "type": "struct", + "value": "git_diff_find_options", + "file": "diff.h", + "line": 658, + "lineto": 684, + "block": "unsigned int version\nuint32_t flags\nuint16_t rename_threshold\nuint16_t rename_from_rewrite_threshold\nuint16_t copy_threshold\nuint16_t break_rewrite_threshold\nsize_t rename_limit\ngit_diff_similarity_metric * metric", + "tdef": "typedef", + "description": " Control behavior of rename and copy detection", + "comments": "

These options mostly mimic parameters that can be passed to git-diff.

\n\n
    \n
  • rename_threshold is the same as the -M option with a value
    • \n
  • copy_threshold is the same as the -C option with a value
    • \n
  • rename_from_rewrite_threshold matches the top of the -B option
    • \n
  • break_rewrite_threshold matches the bottom of the -B option
    • \n
  • rename_limit is the maximum number of matches to consider for\na particular file. This is a little different from the -l option\nto regular Git because we will still process up to this many matches\nbefore abandoning the search.
    • \n
\n\n

The metric option allows you to plug in a custom similarity metric.\n Set it to NULL for the default internal metric which is based on sampling\n hashes of ranges of data in the file. The default metric is a pretty\n good similarity approximation that should work fairly well for both text\n and binary data, and is pretty fast with fixed memory overhead.

\n", + "fields": [ + { + "type": "unsigned int", + "name": "version", + "comments": "" + }, + { + "type": "uint32_t", + "name": "flags", + "comments": " Combination of git_diff_find_t values (default GIT_DIFF_FIND_BY_CONFIG).\n NOTE: if you don't explicitly set this, `diff.renames` could be set\n to false, resulting in `git_diff_find_similar` doing nothing." + }, + { + "type": "uint16_t", + "name": "rename_threshold", + "comments": " Similarity to consider a file renamed (default 50) " + }, + { + "type": "uint16_t", + "name": "rename_from_rewrite_threshold", + "comments": " Similarity of modified to be eligible rename source (default 50) " + }, + { + "type": "uint16_t", + "name": "copy_threshold", + "comments": " Similarity to consider a file a copy (default 50) " + }, + { + "type": "uint16_t", + "name": "break_rewrite_threshold", + "comments": " Similarity to split modify into delete/add pair (default 60) " + }, + { + "type": "size_t", + "name": "rename_limit", + "comments": " Maximum similarity sources to examine for a file (somewhat like\n git-diff's `-l` option or `diff.renameLimit` config) (default 200)" + }, + { + "type": "git_diff_similarity_metric *", + "name": "metric", + "comments": " Pluggable similarity metric; pass NULL to use internal metric " + } + ], + "used": { + "returns": [], + "needs": [ + "git_diff_find_init_options", + "git_diff_find_similar" + ] + } + } + ], + [ + "git_diff_find_t", + { + "decl": [ + "GIT_DIFF_FIND_BY_CONFIG", + "GIT_DIFF_FIND_RENAMES", + "GIT_DIFF_FIND_RENAMES_FROM_REWRITES", + "GIT_DIFF_FIND_COPIES", + "GIT_DIFF_FIND_COPIES_FROM_UNMODIFIED", + "GIT_DIFF_FIND_REWRITES", + "GIT_DIFF_BREAK_REWRITES", + "GIT_DIFF_FIND_AND_BREAK_REWRITES", + "GIT_DIFF_FIND_FOR_UNTRACKED", + "GIT_DIFF_FIND_ALL", + "GIT_DIFF_FIND_IGNORE_LEADING_WHITESPACE", + "GIT_DIFF_FIND_IGNORE_WHITESPACE", + "GIT_DIFF_FIND_DONT_IGNORE_WHITESPACE", + "GIT_DIFF_FIND_EXACT_MATCH_ONLY", + "GIT_DIFF_BREAK_REWRITES_FOR_RENAMES_ONLY", + "GIT_DIFF_FIND_REMOVE_UNMODIFIED" + ], + "type": "enum", + "file": "diff.h", + "line": 552, + "lineto": 621, + "block": "GIT_DIFF_FIND_BY_CONFIG\nGIT_DIFF_FIND_RENAMES\nGIT_DIFF_FIND_RENAMES_FROM_REWRITES\nGIT_DIFF_FIND_COPIES\nGIT_DIFF_FIND_COPIES_FROM_UNMODIFIED\nGIT_DIFF_FIND_REWRITES\nGIT_DIFF_BREAK_REWRITES\nGIT_DIFF_FIND_AND_BREAK_REWRITES\nGIT_DIFF_FIND_FOR_UNTRACKED\nGIT_DIFF_FIND_ALL\nGIT_DIFF_FIND_IGNORE_LEADING_WHITESPACE\nGIT_DIFF_FIND_IGNORE_WHITESPACE\nGIT_DIFF_FIND_DONT_IGNORE_WHITESPACE\nGIT_DIFF_FIND_EXACT_MATCH_ONLY\nGIT_DIFF_BREAK_REWRITES_FOR_RENAMES_ONLY\nGIT_DIFF_FIND_REMOVE_UNMODIFIED", + "tdef": "typedef", + "description": " Flags to control the behavior of diff rename/copy detection.", + "comments": "", + "fields": [ + { + "type": "int", + "name": "GIT_DIFF_FIND_BY_CONFIG", + "comments": "

Obey diff.renames. Overridden by any other GIT_DIFF_FIND_... flag.

\n", + "value": 0 + }, + { + "type": "int", + "name": "GIT_DIFF_FIND_RENAMES", + "comments": "

Look for renames? (--find-renames)

\n", + "value": 1 + }, + { + "type": "int", + "name": "GIT_DIFF_FIND_RENAMES_FROM_REWRITES", + "comments": "

Consider old side of MODIFIED for renames? (--break-rewrites=N)

\n", + "value": 2 + }, + { + "type": "int", + "name": "GIT_DIFF_FIND_COPIES", + "comments": "

Look for copies? (a la --find-copies).

\n", + "value": 4 + }, + { + "type": "int", + "name": "GIT_DIFF_FIND_COPIES_FROM_UNMODIFIED", + "comments": "

Consider UNMODIFIED as copy sources? (--find-copies-harder).

\n\n

For this to work correctly, use GIT_DIFF_INCLUDE_UNMODIFIED when\n the initial git_diff is being generated.

\n", + "value": 8 + }, + { + "type": "int", + "name": "GIT_DIFF_FIND_REWRITES", + "comments": "

Mark significant rewrites for split (--break-rewrites=/M)

\n", + "value": 16 + }, + { + "type": "int", + "name": "GIT_DIFF_BREAK_REWRITES", + "comments": "

Actually split large rewrites into delete/add pairs

\n", + "value": 32 + }, + { + "type": "int", + "name": "GIT_DIFF_FIND_AND_BREAK_REWRITES", + "comments": "

Mark rewrites for split and break into delete/add pairs

\n", + "value": 48 + }, + { + "type": "int", + "name": "GIT_DIFF_FIND_FOR_UNTRACKED", + "comments": "

Find renames/copies for UNTRACKED items in working directory.

\n\n

For this to work correctly, use GIT_DIFF_INCLUDE_UNTRACKED when the\n initial git_diff is being generated (and obviously the diff must\n be against the working directory for this to make sense).

\n", + "value": 64 + }, + { + "type": "int", + "name": "GIT_DIFF_FIND_ALL", + "comments": "

Turn on all finding features.

\n", + "value": 255 + }, + { + "type": "int", + "name": "GIT_DIFF_FIND_IGNORE_LEADING_WHITESPACE", + "comments": "

Measure similarity ignoring leading whitespace (default)

\n", + "value": 0 + }, + { + "type": "int", + "name": "GIT_DIFF_FIND_IGNORE_WHITESPACE", + "comments": "

Measure similarity ignoring all whitespace

\n", + "value": 4096 + }, + { + "type": "int", + "name": "GIT_DIFF_FIND_DONT_IGNORE_WHITESPACE", + "comments": "

Measure similarity including all data

\n", + "value": 8192 + }, + { + "type": "int", + "name": "GIT_DIFF_FIND_EXACT_MATCH_ONLY", + "comments": "

Measure similarity only by comparing SHAs (fast and cheap)

\n", + "value": 16384 + }, + { + "type": "int", + "name": "GIT_DIFF_BREAK_REWRITES_FOR_RENAMES_ONLY", + "comments": "

Do not break rewrites unless they contribute to a rename.

\n\n

Normally, GIT_DIFF_FIND_AND_BREAK_REWRITES will measure the self-\n similarity of modified files and split the ones that have changed a\n lot into a DELETE / ADD pair. Then the sides of that pair will be\n considered candidates for rename and copy detection.

\n\n

If you add this flag in and the split pair is not used for an\n actual rename or copy, then the modified record will be restored to\n a regular MODIFIED record instead of being split.

\n", + "value": 32768 + }, + { + "type": "int", + "name": "GIT_DIFF_FIND_REMOVE_UNMODIFIED", + "comments": "

Remove any UNMODIFIED deltas after find_similar is done.

\n\n

Using GIT_DIFF_FIND_COPIES_FROM_UNMODIFIED to emulate the\n --find-copies-harder behavior requires building a diff with the\n GIT_DIFF_INCLUDE_UNMODIFIED flag. If you do not want UNMODIFIED\n records in the final result, pass this flag to have them removed.

\n", + "value": 65536 + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_diff_flag_t", + { + "decl": [ + "GIT_DIFF_FLAG_BINARY", + "GIT_DIFF_FLAG_NOT_BINARY", + "GIT_DIFF_FLAG_VALID_ID", + "GIT_DIFF_FLAG_EXISTS" + ], + "type": "enum", + "file": "diff.h", + "line": 225, + "lineto": 230, + "block": "GIT_DIFF_FLAG_BINARY\nGIT_DIFF_FLAG_NOT_BINARY\nGIT_DIFF_FLAG_VALID_ID\nGIT_DIFF_FLAG_EXISTS", + "tdef": "typedef", + "description": " Flags for the delta object and the file objects on each side.", + "comments": "

These flags are used for both the flags value of the git_diff_delta\n and the flags for the git_diff_file objects representing the old and\n new sides of the delta. Values outside of this public range should be\n considered reserved for internal or future use.

\n", + "fields": [ + { + "type": "int", + "name": "GIT_DIFF_FLAG_BINARY", + "comments": "

file(s) treated as binary data

\n", + "value": 1 + }, + { + "type": "int", + "name": "GIT_DIFF_FLAG_NOT_BINARY", + "comments": "

file(s) treated as text data

\n", + "value": 2 + }, + { + "type": "int", + "name": "GIT_DIFF_FLAG_VALID_ID", + "comments": "

id value is known correct

\n", + "value": 4 + }, + { + "type": "int", + "name": "GIT_DIFF_FLAG_EXISTS", + "comments": "

file exists at this side of the delta

\n", + "value": 8 + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_diff_format_email_flags_t", + { + "decl": [ + "GIT_DIFF_FORMAT_EMAIL_NONE", + "GIT_DIFF_FORMAT_EMAIL_EXCLUDE_SUBJECT_PATCH_MARKER" + ], + "type": "enum", + "file": "diff.h", + "line": 1218, + "lineto": 1225, + "block": "GIT_DIFF_FORMAT_EMAIL_NONE\nGIT_DIFF_FORMAT_EMAIL_EXCLUDE_SUBJECT_PATCH_MARKER", + "tdef": "typedef", + "description": " Formatting options for diff e-mail generation", + "comments": "", + "fields": [ + { + "type": "int", + "name": "GIT_DIFF_FORMAT_EMAIL_NONE", + "comments": "

Normal patch, the default

\n", + "value": 0 + }, + { + "type": "int", + "name": "GIT_DIFF_FORMAT_EMAIL_EXCLUDE_SUBJECT_PATCH_MARKER", + "comments": "

Don't insert "[PATCH]" in the subject header

\n", + "value": 1 + } + ], + "used": { + "returns": [], + "needs": [ + "git_diff_commit_as_email" + ] + } + } + ], + [ + "git_diff_format_email_options", + { + "decl": [ + "unsigned int version", + "git_diff_format_email_flags_t flags", + "size_t patch_no", + "size_t total_patches", + "const git_oid * id", + "const char * summary", + "const git_signature * author" + ], + "type": "struct", + "value": "git_diff_format_email_options", + "file": "diff.h", + "line": 1230, + "lineto": 1249, + "block": "unsigned int version\ngit_diff_format_email_flags_t flags\nsize_t patch_no\nsize_t total_patches\nconst git_oid * id\nconst char * summary\nconst git_signature * author", + "tdef": "typedef", + "description": " Options for controlling the formatting of the generated e-mail.", + "comments": "", + "fields": [ + { + "type": "unsigned int", + "name": "version", + "comments": "" + }, + { + "type": "git_diff_format_email_flags_t", + "name": "flags", + "comments": "" + }, + { + "type": "size_t", + "name": "patch_no", + "comments": " This patch number " + }, + { + "type": "size_t", + "name": "total_patches", + "comments": " Total number of patches in this series " + }, + { + "type": "const git_oid *", + "name": "id", + "comments": " id to use for the commit " + }, + { + "type": "const char *", + "name": "summary", + "comments": " Summary of the change " + }, + { + "type": "const git_signature *", + "name": "author", + "comments": " Author of the change " + } + ], + "used": { + "returns": [], + "needs": [ + "git_diff_format_email", + "git_diff_format_email_init_options" + ] + } + } + ], + [ + "git_diff_format_t", + { + "decl": [ + "GIT_DIFF_FORMAT_PATCH", + "GIT_DIFF_FORMAT_PATCH_HEADER", + "GIT_DIFF_FORMAT_RAW", + "GIT_DIFF_FORMAT_NAME_ONLY", + "GIT_DIFF_FORMAT_NAME_STATUS" + ], + "type": "enum", + "file": "diff.h", + "line": 981, + "lineto": 987, + "block": "GIT_DIFF_FORMAT_PATCH\nGIT_DIFF_FORMAT_PATCH_HEADER\nGIT_DIFF_FORMAT_RAW\nGIT_DIFF_FORMAT_NAME_ONLY\nGIT_DIFF_FORMAT_NAME_STATUS", + "tdef": "typedef", + "description": " Possible output formats for diff data", + "comments": "", + "fields": [ + { + "type": "int", + "name": "GIT_DIFF_FORMAT_PATCH", + "comments": "

full git diff

\n", + "value": 1 + }, + { + "type": "int", + "name": "GIT_DIFF_FORMAT_PATCH_HEADER", + "comments": "

just the file headers of patch

\n", + "value": 2 + }, + { + "type": "int", + "name": "GIT_DIFF_FORMAT_RAW", + "comments": "

like git diff --raw

\n", + "value": 3 + }, + { + "type": "int", + "name": "GIT_DIFF_FORMAT_NAME_ONLY", + "comments": "

like git diff --name-only

\n", + "value": 4 + }, + { + "type": "int", + "name": "GIT_DIFF_FORMAT_NAME_STATUS", + "comments": "

like git diff --name-status

\n", + "value": 5 + } + ], + "used": { + "returns": [], + "needs": [ + "git_diff_print" + ] + } + } + ], + [ + "git_diff_hunk", + { + "decl": [ + "int old_start", + "int old_lines", + "int new_start", + "int new_lines", + "size_t header_len", + "char [128] header" + ], + "type": "struct", + "value": "git_diff_hunk", + "file": "diff.h", + "line": 478, + "lineto": 485, + "block": "int old_start\nint old_lines\nint new_start\nint new_lines\nsize_t header_len\nchar [128] header", + "tdef": "typedef", + "description": " Structure describing a hunk of a diff.", + "comments": "", + "fields": [ + { + "type": "int", + "name": "old_start", + "comments": " Starting line number in old_file " + }, + { + "type": "int", + "name": "old_lines", + "comments": " Number of lines in old_file " + }, + { + "type": "int", + "name": "new_start", + "comments": " Starting line number in new_file " + }, + { + "type": "int", + "name": "new_lines", + "comments": " Number of lines in new_file " + }, + { + "type": "size_t", + "name": "header_len", + "comments": " Number of bytes in header text " + }, + { + "type": "char [128]", + "name": "header", + "comments": " Header text, NUL-byte terminated " + } + ], + "used": { + "returns": [], + "needs": [ + "git_diff_print_callback__to_buf", + "git_diff_print_callback__to_file_handle", + "git_patch_get_hunk" + ] + } + } + ], + [ + "git_diff_line", + { + "decl": [ + "char origin", + "int old_lineno", + "int new_lineno", + "int num_lines", + "size_t content_len", + "git_off_t content_offset", + "const char * content" + ], + "type": "struct", + "value": "git_diff_line", + "file": "diff.h", + "line": 525, + "lineto": 533, + "block": "char origin\nint old_lineno\nint new_lineno\nint num_lines\nsize_t content_len\ngit_off_t content_offset\nconst char * content", + "tdef": "typedef", + "description": " Structure describing a line (or data span) of a diff.", + "comments": "", + "fields": [ + { + "type": "char", + "name": "origin", + "comments": " A git_diff_line_t value " + }, + { + "type": "int", + "name": "old_lineno", + "comments": " Line number in old file or -1 for added line " + }, + { + "type": "int", + "name": "new_lineno", + "comments": " Line number in new file or -1 for deleted line " + }, + { + "type": "int", + "name": "num_lines", + "comments": " Number of newline characters in content " + }, + { + "type": "size_t", + "name": "content_len", + "comments": " Number of bytes of data " + }, + { + "type": "git_off_t", + "name": "content_offset", + "comments": " Offset in the original file to the content " + }, + { + "type": "const char *", + "name": "content", + "comments": " Pointer to diff text, not NUL-byte terminated " + } + ], + "used": { + "returns": [], + "needs": [ + "git_diff_print_callback__to_buf", + "git_diff_print_callback__to_file_handle", + "git_patch_get_line_in_hunk" + ] + } + } + ], + [ + "git_diff_line_t", + { + "decl": [ + "GIT_DIFF_LINE_CONTEXT", + "GIT_DIFF_LINE_ADDITION", + "GIT_DIFF_LINE_DELETION", + "GIT_DIFF_LINE_CONTEXT_EOFNL", + "GIT_DIFF_LINE_ADD_EOFNL", + "GIT_DIFF_LINE_DEL_EOFNL", + "GIT_DIFF_LINE_FILE_HDR", + "GIT_DIFF_LINE_HUNK_HDR", + "GIT_DIFF_LINE_BINARY" + ], + "type": "enum", + "file": "diff.h", + "line": 504, + "lineto": 520, + "block": "GIT_DIFF_LINE_CONTEXT\nGIT_DIFF_LINE_ADDITION\nGIT_DIFF_LINE_DELETION\nGIT_DIFF_LINE_CONTEXT_EOFNL\nGIT_DIFF_LINE_ADD_EOFNL\nGIT_DIFF_LINE_DEL_EOFNL\nGIT_DIFF_LINE_FILE_HDR\nGIT_DIFF_LINE_HUNK_HDR\nGIT_DIFF_LINE_BINARY", + "tdef": "typedef", + "description": " Line origin constants.", + "comments": "

These values describe where a line came from and will be passed to\n the git_diff_line_cb when iterating over a diff. There are some\n special origin constants at the end that are used for the text\n output callbacks to demarcate lines that are actually part of\n the file or hunk headers.

\n", + "fields": [ + { + "type": "int", + "name": "GIT_DIFF_LINE_CONTEXT", + "comments": "", + "value": 32 + }, + { + "type": "int", + "name": "GIT_DIFF_LINE_ADDITION", + "comments": "", + "value": 43 + }, + { + "type": "int", + "name": "GIT_DIFF_LINE_DELETION", + "comments": "", + "value": 45 + }, + { + "type": "int", + "name": "GIT_DIFF_LINE_CONTEXT_EOFNL", + "comments": "

Both files have no LF at end

\n", + "value": 61 + }, + { + "type": "int", + "name": "GIT_DIFF_LINE_ADD_EOFNL", + "comments": "

Old has no LF at end, new does

\n", + "value": 62 + }, + { + "type": "int", + "name": "GIT_DIFF_LINE_DEL_EOFNL", + "comments": "

Old has LF at end, new does not

\n", + "value": 60 + }, + { + "type": "int", + "name": "GIT_DIFF_LINE_FILE_HDR", + "comments": "", + "value": 70 + }, + { + "type": "int", + "name": "GIT_DIFF_LINE_HUNK_HDR", + "comments": "", + "value": 72 + }, + { + "type": "int", + "name": "GIT_DIFF_LINE_BINARY", + "comments": "

For "Binary files x and y differ"

\n", + "value": 66 + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_diff_option_t", + { + "decl": [ + "GIT_DIFF_NORMAL", + "GIT_DIFF_REVERSE", + "GIT_DIFF_INCLUDE_IGNORED", + "GIT_DIFF_RECURSE_IGNORED_DIRS", + "GIT_DIFF_INCLUDE_UNTRACKED", + "GIT_DIFF_RECURSE_UNTRACKED_DIRS", + "GIT_DIFF_INCLUDE_UNMODIFIED", + "GIT_DIFF_INCLUDE_TYPECHANGE", + "GIT_DIFF_INCLUDE_TYPECHANGE_TREES", + "GIT_DIFF_IGNORE_FILEMODE", + "GIT_DIFF_IGNORE_SUBMODULES", + "GIT_DIFF_IGNORE_CASE", + "GIT_DIFF_INCLUDE_CASECHANGE", + "GIT_DIFF_DISABLE_PATHSPEC_MATCH", + "GIT_DIFF_SKIP_BINARY_CHECK", + "GIT_DIFF_ENABLE_FAST_UNTRACKED_DIRS", + "GIT_DIFF_UPDATE_INDEX", + "GIT_DIFF_INCLUDE_UNREADABLE", + "GIT_DIFF_INCLUDE_UNREADABLE_AS_UNTRACKED", + "GIT_DIFF_FORCE_TEXT", + "GIT_DIFF_FORCE_BINARY", + "GIT_DIFF_IGNORE_WHITESPACE", + "GIT_DIFF_IGNORE_WHITESPACE_CHANGE", + "GIT_DIFF_IGNORE_WHITESPACE_EOL", + "GIT_DIFF_SHOW_UNTRACKED_CONTENT", + "GIT_DIFF_SHOW_UNMODIFIED", + "GIT_DIFF_PATIENCE", + "GIT_DIFF_MINIMAL", + "GIT_DIFF_SHOW_BINARY" + ], + "type": "enum", + "file": "diff.h", + "line": 72, + "lineto": 205, + "block": "GIT_DIFF_NORMAL\nGIT_DIFF_REVERSE\nGIT_DIFF_INCLUDE_IGNORED\nGIT_DIFF_RECURSE_IGNORED_DIRS\nGIT_DIFF_INCLUDE_UNTRACKED\nGIT_DIFF_RECURSE_UNTRACKED_DIRS\nGIT_DIFF_INCLUDE_UNMODIFIED\nGIT_DIFF_INCLUDE_TYPECHANGE\nGIT_DIFF_INCLUDE_TYPECHANGE_TREES\nGIT_DIFF_IGNORE_FILEMODE\nGIT_DIFF_IGNORE_SUBMODULES\nGIT_DIFF_IGNORE_CASE\nGIT_DIFF_INCLUDE_CASECHANGE\nGIT_DIFF_DISABLE_PATHSPEC_MATCH\nGIT_DIFF_SKIP_BINARY_CHECK\nGIT_DIFF_ENABLE_FAST_UNTRACKED_DIRS\nGIT_DIFF_UPDATE_INDEX\nGIT_DIFF_INCLUDE_UNREADABLE\nGIT_DIFF_INCLUDE_UNREADABLE_AS_UNTRACKED\nGIT_DIFF_FORCE_TEXT\nGIT_DIFF_FORCE_BINARY\nGIT_DIFF_IGNORE_WHITESPACE\nGIT_DIFF_IGNORE_WHITESPACE_CHANGE\nGIT_DIFF_IGNORE_WHITESPACE_EOL\nGIT_DIFF_SHOW_UNTRACKED_CONTENT\nGIT_DIFF_SHOW_UNMODIFIED\nGIT_DIFF_PATIENCE\nGIT_DIFF_MINIMAL\nGIT_DIFF_SHOW_BINARY", + "tdef": "typedef", + "description": " Flags for diff options. A combination of these flags can be passed\n in via the `flags` value in the `git_diff_options`.", + "comments": "", + "fields": [ + { + "type": "int", + "name": "GIT_DIFF_NORMAL", + "comments": "

Normal diff, the default

\n", + "value": 0 + }, + { + "type": "int", + "name": "GIT_DIFF_REVERSE", + "comments": "

Reverse the sides of the diff

\n", + "value": 1 + }, + { + "type": "int", + "name": "GIT_DIFF_INCLUDE_IGNORED", + "comments": "

Include ignored files in the diff

\n", + "value": 2 + }, + { + "type": "int", + "name": "GIT_DIFF_RECURSE_IGNORED_DIRS", + "comments": "

Even with GIT_DIFF_INCLUDE_IGNORED, an entire ignored directory\n will be marked with only a single entry in the diff; this flag\n adds all files under the directory as IGNORED entries, too.

\n", + "value": 4 + }, + { + "type": "int", + "name": "GIT_DIFF_INCLUDE_UNTRACKED", + "comments": "

Include untracked files in the diff

\n", + "value": 8 + }, + { + "type": "int", + "name": "GIT_DIFF_RECURSE_UNTRACKED_DIRS", + "comments": "

Even with GIT_DIFF_INCLUDE_UNTRACKED, an entire untracked\n directory will be marked with only a single entry in the diff\n (a la what core Git does in git status); this flag adds all\n files under untracked directories as UNTRACKED entries, too.

\n", + "value": 16 + }, + { + "type": "int", + "name": "GIT_DIFF_INCLUDE_UNMODIFIED", + "comments": "

Include unmodified files in the diff

\n", + "value": 32 + }, + { + "type": "int", + "name": "GIT_DIFF_INCLUDE_TYPECHANGE", + "comments": "

Normally, a type change between files will be converted into a\n DELETED record for the old and an ADDED record for the new; this\n options enabled the generation of TYPECHANGE delta records.

\n", + "value": 64 + }, + { + "type": "int", + "name": "GIT_DIFF_INCLUDE_TYPECHANGE_TREES", + "comments": "

Even with GIT_DIFF_INCLUDE_TYPECHANGE, blob->tree changes still\n generally show as a DELETED blob. This flag tries to correctly\n label blob->tree transitions as TYPECHANGE records with new_file's\n mode set to tree. Note: the tree SHA will not be available.

\n", + "value": 128 + }, + { + "type": "int", + "name": "GIT_DIFF_IGNORE_FILEMODE", + "comments": "

Ignore file mode changes

\n", + "value": 256 + }, + { + "type": "int", + "name": "GIT_DIFF_IGNORE_SUBMODULES", + "comments": "

Treat all submodules as unmodified

\n", + "value": 512 + }, + { + "type": "int", + "name": "GIT_DIFF_IGNORE_CASE", + "comments": "

Use case insensitive filename comparisons

\n", + "value": 1024 + }, + { + "type": "int", + "name": "GIT_DIFF_INCLUDE_CASECHANGE", + "comments": "

May be combined with GIT_DIFF_IGNORE_CASE to specify that a file\n that has changed case will be returned as an add/delete pair.

\n", + "value": 2048 + }, + { + "type": "int", + "name": "GIT_DIFF_DISABLE_PATHSPEC_MATCH", + "comments": "

If the pathspec is set in the diff options, this flags means to\n apply it as an exact match instead of as an fnmatch pattern.

\n", + "value": 4096 + }, + { + "type": "int", + "name": "GIT_DIFF_SKIP_BINARY_CHECK", + "comments": "

Disable updating of the binary flag in delta records. This is\n useful when iterating over a diff if you don't need hunk and data\n callbacks and want to avoid having to load file completely.

\n", + "value": 8192 + }, + { + "type": "int", + "name": "GIT_DIFF_ENABLE_FAST_UNTRACKED_DIRS", + "comments": "

When diff finds an untracked directory, to match the behavior of\n core Git, it scans the contents for IGNORED and UNTRACKED files.\n If all contents are IGNORED, then the directory is IGNORED; if\n any contents are not IGNORED, then the directory is UNTRACKED.\n This is extra work that may not matter in many cases. This flag\n turns off that scan and immediately labels an untracked directory\n as UNTRACKED (changing the behavior to not match core Git).

\n", + "value": 16384 + }, + { + "type": "int", + "name": "GIT_DIFF_UPDATE_INDEX", + "comments": "

When diff finds a file in the working directory with stat\n information different from the index, but the OID ends up being the\n same, write the correct stat information into the index. Note:\n without this flag, diff will always leave the index untouched.

\n", + "value": 32768 + }, + { + "type": "int", + "name": "GIT_DIFF_INCLUDE_UNREADABLE", + "comments": "

Include unreadable files in the diff

\n", + "value": 65536 + }, + { + "type": "int", + "name": "GIT_DIFF_INCLUDE_UNREADABLE_AS_UNTRACKED", + "comments": "

Include unreadable files in the diff

\n", + "value": 131072 + }, + { + "type": "int", + "name": "GIT_DIFF_FORCE_TEXT", + "comments": "

Treat all files as text, disabling binary attributes \n&\n detection

\n", + "value": 1048576 + }, + { + "type": "int", + "name": "GIT_DIFF_FORCE_BINARY", + "comments": "

Treat all files as binary, disabling text diffs

\n", + "value": 2097152 + }, + { + "type": "int", + "name": "GIT_DIFF_IGNORE_WHITESPACE", + "comments": "

Ignore all whitespace

\n", + "value": 4194304 + }, + { + "type": "int", + "name": "GIT_DIFF_IGNORE_WHITESPACE_CHANGE", + "comments": "

Ignore changes in amount of whitespace

\n", + "value": 8388608 + }, + { + "type": "int", + "name": "GIT_DIFF_IGNORE_WHITESPACE_EOL", + "comments": "

Ignore whitespace at end of line

\n", + "value": 16777216 + }, + { + "type": "int", + "name": "GIT_DIFF_SHOW_UNTRACKED_CONTENT", + "comments": "

When generating patch text, include the content of untracked\n files. This automatically turns on GIT_DIFF_INCLUDE_UNTRACKED but\n it does not turn on GIT_DIFF_RECURSE_UNTRACKED_DIRS. Add that\n flag if you want the content of every single UNTRACKED file.

\n", + "value": 33554432 + }, + { + "type": "int", + "name": "GIT_DIFF_SHOW_UNMODIFIED", + "comments": "

When generating output, include the names of unmodified files if\n they are included in the git_diff. Normally these are skipped in\n the formats that list files (e.g. name-only, name-status, raw).\n Even with this, these will not be included in patch format.

\n", + "value": 67108864 + }, + { + "type": "int", + "name": "GIT_DIFF_PATIENCE", + "comments": "

Use the "patience diff" algorithm

\n", + "value": 268435456 + }, + { + "type": "int", + "name": "GIT_DIFF_MINIMAL", + "comments": "

Take extra time to find minimal diff

\n", + "value": 536870912 + }, + { + "type": "int", + "name": "GIT_DIFF_SHOW_BINARY", + "comments": "

Include the necessary deflate / delta information so that git-apply\n can apply given diff information to binary files.

\n", + "value": 1073741824 + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_diff_options", + { + "decl": [ + "unsigned int version", + "uint32_t flags", + "git_submodule_ignore_t ignore_submodules", + "git_strarray pathspec", + "git_diff_notify_cb notify_cb", + "void * notify_payload", + "uint32_t context_lines", + "uint32_t interhunk_lines", + "uint16_t id_abbrev", + "git_off_t max_size", + "const char * old_prefix", + "const char * new_prefix" + ], + "type": "struct", + "value": "git_diff_options", + "file": "diff.h", + "line": 374, + "lineto": 393, + "block": "unsigned int version\nuint32_t flags\ngit_submodule_ignore_t ignore_submodules\ngit_strarray pathspec\ngit_diff_notify_cb notify_cb\nvoid * notify_payload\nuint32_t context_lines\nuint32_t interhunk_lines\nuint16_t id_abbrev\ngit_off_t max_size\nconst char * old_prefix\nconst char * new_prefix", + "tdef": "typedef", + "description": " Structure describing options about how the diff should be executed.", + "comments": "

Setting all values of the structure to zero will yield the default\n values. Similarly, passing NULL for the options structure will\n give the defaults. The default values are marked below.

\n\n
    \n
  • flags is a combination of the git_diff_option_t values above
    • \n
  • context_lines is the number of unchanged lines that define the\nboundary of a hunk (and to display before and after)
    • \n
  • interhunk_lines is the maximum number of unchanged lines between\nhunk boundaries before the hunks will be merged into a one.
    • \n
  • old_prefix is the virtual "directory" to prefix to old file names\nin hunk headers (default "a")
    • \n
  • new_prefix is the virtual "directory" to prefix to new file names\nin hunk headers (default "b")
    • \n
  • pathspec is an array of paths / fnmatch patterns to constrain diff
    • \n
  • max_size is a file size (in bytes) above which a blob will be marked\nas binary automatically; pass a negative value to disable.
    • \n
  • notify_cb is an optional callback function, notifying the consumer of\nwhich files are being examined as the diff is generated
    • \n
  • notify_payload is the payload data to pass to the notify_cb function
    • \n
  • ignore_submodules overrides the submodule ignore setting for all\nsubmodules in the diff.
    • \n
\n", + "fields": [ + { + "type": "unsigned int", + "name": "version", + "comments": " version for the struct " + }, + { + "type": "uint32_t", + "name": "flags", + "comments": " defaults to GIT_DIFF_NORMAL " + }, + { + "type": "git_submodule_ignore_t", + "name": "ignore_submodules", + "comments": " submodule ignore rule " + }, + { + "type": "git_strarray", + "name": "pathspec", + "comments": " defaults to include all paths " + }, + { + "type": "git_diff_notify_cb", + "name": "notify_cb", + "comments": "" + }, + { + "type": "void *", + "name": "notify_payload", + "comments": "" + }, + { + "type": "uint32_t", + "name": "context_lines", + "comments": " defaults to 3 " + }, + { + "type": "uint32_t", + "name": "interhunk_lines", + "comments": " defaults to 0 " + }, + { + "type": "uint16_t", + "name": "id_abbrev", + "comments": " default 'core.abbrev' or 7 if unset " + }, + { + "type": "git_off_t", + "name": "max_size", + "comments": " defaults to 512MB " + }, + { + "type": "const char *", + "name": "old_prefix", + "comments": " defaults to \"a\" " + }, + { + "type": "const char *", + "name": "new_prefix", + "comments": " defaults to \"b\" " + } + ], + "used": { + "returns": [], + "needs": [ + "git_diff_blob_to_buffer", + "git_diff_blobs", + "git_diff_buffers", + "git_diff_commit_as_email", + "git_diff_index_to_workdir", + "git_diff_init_options", + "git_diff_tree_to_index", + "git_diff_tree_to_tree", + "git_diff_tree_to_workdir", + "git_diff_tree_to_workdir_with_index", + "git_patch_from_blob_and_buffer", + "git_patch_from_blobs", + "git_patch_from_buffers" + ] + } + } + ], + [ + "git_diff_perfdata", + { + "decl": [ + "unsigned int version", + "size_t stat_calls", + "size_t oid_calculations" + ], + "type": "struct", + "value": "git_diff_perfdata", + "file": "sys/diff.h", + "line": 67, + "lineto": 71, + "block": "unsigned int version\nsize_t stat_calls\nsize_t oid_calculations", + "tdef": "typedef", + "description": " Performance data from diffing", + "comments": "", + "fields": [ + { + "type": "unsigned int", + "name": "version", + "comments": "" + }, + { + "type": "size_t", + "name": "stat_calls", + "comments": " Number of stat() calls performed " + }, + { + "type": "size_t", + "name": "oid_calculations", + "comments": " Number of ID calculations " + } + ], + "used": { + "returns": [], + "needs": [ + "git_diff_get_perfdata", + "git_status_list_get_perfdata" + ] + } + } + ], + [ + "git_diff_similarity_metric", + { + "decl": [ + "int (*)(void **, const git_diff_file *, const char *, void *) file_signature", + "int (*)(void **, const git_diff_file *, const char *, size_t, void *) buffer_signature", + "void (*)(void *, void *) free_signature", + "int (*)(int *, void *, void *, void *) similarity", + "void * payload" + ], + "type": "struct", + "value": "git_diff_similarity_metric", + "file": "diff.h", + "line": 626, + "lineto": 636, + "block": "int (*)(void **, const git_diff_file *, const char *, void *) file_signature\nint (*)(void **, const git_diff_file *, const char *, size_t, void *) buffer_signature\nvoid (*)(void *, void *) free_signature\nint (*)(int *, void *, void *, void *) similarity\nvoid * payload", + "tdef": "typedef", + "description": " Pluggable similarity metric", + "comments": "", + "fields": [ + { + "type": "int (*)(void **, const git_diff_file *, const char *, void *)", + "name": "file_signature", + "comments": "" + }, + { + "type": "int (*)(void **, const git_diff_file *, const char *, size_t, void *)", + "name": "buffer_signature", + "comments": "" + }, + { + "type": "void (*)(void *, void *)", + "name": "free_signature", + "comments": "" + }, + { + "type": "int (*)(int *, void *, void *, void *)", + "name": "similarity", + "comments": "" + }, + { + "type": "void *", + "name": "payload", + "comments": "" + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_diff_stats", + { + "decl": "git_diff_stats", + "type": "struct", + "value": "git_diff_stats", + "file": "diff.h", + "line": 1132, + "lineto": 1132, + "tdef": "typedef", + "description": " This is an opaque structure which is allocated by `git_diff_get_stats`.\n You are responsible for releasing the object memory when done, using the\n `git_diff_stats_free()` function.", + "comments": "", + "used": { + "returns": [], + "needs": [ + "git_diff_get_stats", + "git_diff_stats_deletions", + "git_diff_stats_files_changed", + "git_diff_stats_free", + "git_diff_stats_insertions", + "git_diff_stats_to_buf" + ] + } + } + ], + [ + "git_diff_stats_format_t", + { + "decl": [ + "GIT_DIFF_STATS_NONE", + "GIT_DIFF_STATS_FULL", + "GIT_DIFF_STATS_SHORT", + "GIT_DIFF_STATS_NUMBER", + "GIT_DIFF_STATS_INCLUDE_SUMMARY" + ], + "type": "enum", + "file": "diff.h", + "line": 1137, + "lineto": 1152, + "block": "GIT_DIFF_STATS_NONE\nGIT_DIFF_STATS_FULL\nGIT_DIFF_STATS_SHORT\nGIT_DIFF_STATS_NUMBER\nGIT_DIFF_STATS_INCLUDE_SUMMARY", + "tdef": "typedef", + "description": " Formatting options for diff stats", + "comments": "", + "fields": [ + { + "type": "int", + "name": "GIT_DIFF_STATS_NONE", + "comments": "

No stats

\n", + "value": 0 + }, + { + "type": "int", + "name": "GIT_DIFF_STATS_FULL", + "comments": "

Full statistics, equivalent of --stat

\n", + "value": 1 + }, + { + "type": "int", + "name": "GIT_DIFF_STATS_SHORT", + "comments": "

Short statistics, equivalent of --shortstat

\n", + "value": 2 + }, + { + "type": "int", + "name": "GIT_DIFF_STATS_NUMBER", + "comments": "

Number statistics, equivalent of --numstat

\n", + "value": 4 + }, + { + "type": "int", + "name": "GIT_DIFF_STATS_INCLUDE_SUMMARY", + "comments": "

Extended header information such as creations, renames and mode changes, equivalent of --summary

\n", + "value": 8 + } + ], + "used": { + "returns": [], + "needs": [ + "git_diff_stats_to_buf" + ] + } + } + ], + [ + "git_direction", + { + "decl": [ + "GIT_DIRECTION_FETCH", + "GIT_DIRECTION_PUSH" + ], + "type": "enum", + "file": "net.h", + "line": 31, + "lineto": 34, + "block": "GIT_DIRECTION_FETCH\nGIT_DIRECTION_PUSH", + "tdef": "typedef", + "description": " Direction of the connection.", + "comments": "

We need this because we need to know whether we should call\n git-upload-pack or git-receive-pack on the remote end when get_refs\n gets called.

\n", + "fields": [ + { + "type": "int", + "name": "GIT_DIRECTION_FETCH", + "comments": "", + "value": 0 + }, + { + "type": "int", + "name": "GIT_DIRECTION_PUSH", + "comments": "", + "value": 1 + } + ], + "used": { + "returns": [], + "needs": [ + "git_remote_connect" + ] + } + } + ], + [ + "git_error", + { + "decl": [ + "char * message", + "int klass" + ], + "type": "struct", + "value": "git_error", + "file": "errors.h", + "line": 63, + "lineto": 66, + "block": "char * message\nint klass", + "tdef": "typedef", + "description": " Structure to store extra details of the last error that occurred.", + "comments": "

This is kept on a per-thread basis if GIT_THREADS was defined when the\n library was build, otherwise one is kept globally for the library

\n", + "fields": [ + { + "type": "char *", + "name": "message", + "comments": "" + }, + { + "type": "int", + "name": "klass", + "comments": "" + } + ], + "used": { + "returns": [ + "giterr_last" + ], + "needs": [ + "giterr_detach" + ] + } + } + ], + [ + "git_error_code", + { + "decl": [ + "GIT_OK", + "GIT_ERROR", + "GIT_ENOTFOUND", + "GIT_EEXISTS", + "GIT_EAMBIGUOUS", + "GIT_EBUFS", + "GIT_EUSER", + "GIT_EBAREREPO", + "GIT_EUNBORNBRANCH", + "GIT_EUNMERGED", + "GIT_ENONFASTFORWARD", + "GIT_EINVALIDSPEC", + "GIT_ECONFLICT", + "GIT_ELOCKED", + "GIT_EMODIFIED", + "GIT_EAUTH", + "GIT_ECERTIFICATE", + "GIT_EAPPLIED", + "GIT_EPEEL", + "GIT_EEOF", + "GIT_EINVALID", + "GIT_EUNCOMMITTED", + "GIT_EDIRECTORY", + "GIT_PASSTHROUGH", + "GIT_ITEROVER" + ], + "type": "enum", + "file": "errors.h", + "line": 21, + "lineto": 55, + "block": "GIT_OK\nGIT_ERROR\nGIT_ENOTFOUND\nGIT_EEXISTS\nGIT_EAMBIGUOUS\nGIT_EBUFS\nGIT_EUSER\nGIT_EBAREREPO\nGIT_EUNBORNBRANCH\nGIT_EUNMERGED\nGIT_ENONFASTFORWARD\nGIT_EINVALIDSPEC\nGIT_ECONFLICT\nGIT_ELOCKED\nGIT_EMODIFIED\nGIT_EAUTH\nGIT_ECERTIFICATE\nGIT_EAPPLIED\nGIT_EPEEL\nGIT_EEOF\nGIT_EINVALID\nGIT_EUNCOMMITTED\nGIT_EDIRECTORY\nGIT_PASSTHROUGH\nGIT_ITEROVER", + "tdef": "typedef", + "description": " Generic return codes ", + "comments": "", + "fields": [ + { + "type": "int", + "name": "GIT_OK", + "comments": "

No error

\n", + "value": 0 + }, + { + "type": "int", + "name": "GIT_ERROR", + "comments": "

Generic error

\n", + "value": -1 + }, + { + "type": "int", + "name": "GIT_ENOTFOUND", + "comments": "

Requested object could not be found

\n", + "value": -3 + }, + { + "type": "int", + "name": "GIT_EEXISTS", + "comments": "

Object exists preventing operation

\n", + "value": -4 + }, + { + "type": "int", + "name": "GIT_EAMBIGUOUS", + "comments": "

More than one object matches

\n", + "value": -5 + }, + { + "type": "int", + "name": "GIT_EBUFS", + "comments": "

Output buffer too short to hold data

\n", + "value": -6 + }, + { + "type": "int", + "name": "GIT_EUSER", + "comments": "", + "value": -7 + }, + { + "type": "int", + "name": "GIT_EBAREREPO", + "comments": "

Operation not allowed on bare repository

\n", + "value": -8 + }, + { + "type": "int", + "name": "GIT_EUNBORNBRANCH", + "comments": "

HEAD refers to branch with no commits

\n", + "value": -9 + }, + { + "type": "int", + "name": "GIT_EUNMERGED", + "comments": "

Merge in progress prevented operation

\n", + "value": -10 + }, + { + "type": "int", + "name": "GIT_ENONFASTFORWARD", + "comments": "

Reference was not fast-forwardable

\n", + "value": -11 + }, + { + "type": "int", + "name": "GIT_EINVALIDSPEC", + "comments": "

Name/ref spec was not in a valid format

\n", + "value": -12 + }, + { + "type": "int", + "name": "GIT_ECONFLICT", + "comments": "

Checkout conflicts prevented operation

\n", + "value": -13 + }, + { + "type": "int", + "name": "GIT_ELOCKED", + "comments": "

Lock file prevented operation

\n", + "value": -14 + }, + { + "type": "int", + "name": "GIT_EMODIFIED", + "comments": "

Reference value does not match expected

\n", + "value": -15 + }, + { + "type": "int", + "name": "GIT_EAUTH", + "comments": "

Authentication error

\n", + "value": -16 + }, + { + "type": "int", + "name": "GIT_ECERTIFICATE", + "comments": "

Server certificate is invalid

\n", + "value": -17 + }, + { + "type": "int", + "name": "GIT_EAPPLIED", + "comments": "

Patch/merge has already been applied

\n", + "value": -18 + }, + { + "type": "int", + "name": "GIT_EPEEL", + "comments": "

The requested peel operation is not possible

\n", + "value": -19 + }, + { + "type": "int", + "name": "GIT_EEOF", + "comments": "

Unexpected EOF

\n", + "value": -20 + }, + { + "type": "int", + "name": "GIT_EINVALID", + "comments": "

Invalid operation or input

\n", + "value": -21 + }, + { + "type": "int", + "name": "GIT_EUNCOMMITTED", + "comments": "

Uncommitted changes in index prevented operation

\n", + "value": -22 + }, + { + "type": "int", + "name": "GIT_EDIRECTORY", + "comments": "

The operation is not valid for a directory

\n", + "value": -23 + }, + { + "type": "int", + "name": "GIT_PASSTHROUGH", + "comments": "

Internal only

\n", + "value": -30 + }, + { + "type": "int", + "name": "GIT_ITEROVER", + "comments": "

Signals end of iteration with iterator

\n", + "value": -31 + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_error_t", + { + "decl": [ + "GITERR_NONE", + "GITERR_NOMEMORY", + "GITERR_OS", + "GITERR_INVALID", + "GITERR_REFERENCE", + "GITERR_ZLIB", + "GITERR_REPOSITORY", + "GITERR_CONFIG", + "GITERR_REGEX", + "GITERR_ODB", + "GITERR_INDEX", + "GITERR_OBJECT", + "GITERR_NET", + "GITERR_TAG", + "GITERR_TREE", + "GITERR_INDEXER", + "GITERR_SSL", + "GITERR_SUBMODULE", + "GITERR_THREAD", + "GITERR_STASH", + "GITERR_CHECKOUT", + "GITERR_FETCHHEAD", + "GITERR_MERGE", + "GITERR_SSH", + "GITERR_FILTER", + "GITERR_REVERT", + "GITERR_CALLBACK", + "GITERR_CHERRYPICK", + "GITERR_DESCRIBE", + "GITERR_REBASE", + "GITERR_FILESYSTEM" + ], + "type": "enum", + "file": "errors.h", + "line": 69, + "lineto": 101, + "block": "GITERR_NONE\nGITERR_NOMEMORY\nGITERR_OS\nGITERR_INVALID\nGITERR_REFERENCE\nGITERR_ZLIB\nGITERR_REPOSITORY\nGITERR_CONFIG\nGITERR_REGEX\nGITERR_ODB\nGITERR_INDEX\nGITERR_OBJECT\nGITERR_NET\nGITERR_TAG\nGITERR_TREE\nGITERR_INDEXER\nGITERR_SSL\nGITERR_SUBMODULE\nGITERR_THREAD\nGITERR_STASH\nGITERR_CHECKOUT\nGITERR_FETCHHEAD\nGITERR_MERGE\nGITERR_SSH\nGITERR_FILTER\nGITERR_REVERT\nGITERR_CALLBACK\nGITERR_CHERRYPICK\nGITERR_DESCRIBE\nGITERR_REBASE\nGITERR_FILESYSTEM", + "tdef": "typedef", + "description": " Error classes ", + "comments": "", + "fields": [ + { + "type": "int", + "name": "GITERR_NONE", + "comments": "", + "value": 0 + }, + { + "type": "int", + "name": "GITERR_NOMEMORY", + "comments": "", + "value": 1 + }, + { + "type": "int", + "name": "GITERR_OS", + "comments": "", + "value": 2 + }, + { + "type": "int", + "name": "GITERR_INVALID", + "comments": "", + "value": 3 + }, + { + "type": "int", + "name": "GITERR_REFERENCE", + "comments": "", + "value": 4 + }, + { + "type": "int", + "name": "GITERR_ZLIB", + "comments": "", + "value": 5 + }, + { + "type": "int", + "name": "GITERR_REPOSITORY", + "comments": "", + "value": 6 + }, + { + "type": "int", + "name": "GITERR_CONFIG", + "comments": "", + "value": 7 + }, + { + "type": "int", + "name": "GITERR_REGEX", + "comments": "", + "value": 8 + }, + { + "type": "int", + "name": "GITERR_ODB", + "comments": "", + "value": 9 + }, + { + "type": "int", + "name": "GITERR_INDEX", + "comments": "", + "value": 10 + }, + { + "type": "int", + "name": "GITERR_OBJECT", + "comments": "", + "value": 11 + }, + { + "type": "int", + "name": "GITERR_NET", + "comments": "", + "value": 12 + }, + { + "type": "int", + "name": "GITERR_TAG", + "comments": "", + "value": 13 + }, + { + "type": "int", + "name": "GITERR_TREE", + "comments": "", + "value": 14 + }, + { + "type": "int", + "name": "GITERR_INDEXER", + "comments": "", + "value": 15 + }, + { + "type": "int", + "name": "GITERR_SSL", + "comments": "", + "value": 16 + }, + { + "type": "int", + "name": "GITERR_SUBMODULE", + "comments": "", + "value": 17 + }, + { + "type": "int", + "name": "GITERR_THREAD", + "comments": "", + "value": 18 + }, + { + "type": "int", + "name": "GITERR_STASH", + "comments": "", + "value": 19 + }, + { + "type": "int", + "name": "GITERR_CHECKOUT", + "comments": "", + "value": 20 + }, + { + "type": "int", + "name": "GITERR_FETCHHEAD", + "comments": "", + "value": 21 + }, + { + "type": "int", + "name": "GITERR_MERGE", + "comments": "", + "value": 22 + }, + { + "type": "int", + "name": "GITERR_SSH", + "comments": "", + "value": 23 + }, + { + "type": "int", + "name": "GITERR_FILTER", + "comments": "", + "value": 24 + }, + { + "type": "int", + "name": "GITERR_REVERT", + "comments": "", + "value": 25 + }, + { + "type": "int", + "name": "GITERR_CALLBACK", + "comments": "", + "value": 26 + }, + { + "type": "int", + "name": "GITERR_CHERRYPICK", + "comments": "", + "value": 27 + }, + { + "type": "int", + "name": "GITERR_DESCRIBE", + "comments": "", + "value": 28 + }, + { + "type": "int", + "name": "GITERR_REBASE", + "comments": "", + "value": 29 + }, + { + "type": "int", + "name": "GITERR_FILESYSTEM", + "comments": "", + "value": 30 + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_feature_t", + { + "decl": [ + "GIT_FEATURE_THREADS", + "GIT_FEATURE_HTTPS", + "GIT_FEATURE_SSH" + ], + "type": "enum", + "file": "common.h", + "line": 100, + "lineto": 104, + "block": "GIT_FEATURE_THREADS\nGIT_FEATURE_HTTPS\nGIT_FEATURE_SSH", + "tdef": "typedef", + "description": " Combinations of these values describe the features with which libgit2\n was compiled", + "comments": "", + "fields": [ + { + "type": "int", + "name": "GIT_FEATURE_THREADS", + "comments": "", + "value": 1 + }, + { + "type": "int", + "name": "GIT_FEATURE_HTTPS", + "comments": "", + "value": 2 + }, + { + "type": "int", + "name": "GIT_FEATURE_SSH", + "comments": "", + "value": 4 + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_fetch_options", + { + "decl": [ + "int version", + "git_remote_callbacks callbacks", + "git_fetch_prune_t prune", + "int update_fetchhead", + "git_remote_autotag_option_t download_tags" + ], + "type": "struct", + "value": "git_fetch_options", + "file": "remote.h", + "line": 522, + "lineto": 549, + "block": "int version\ngit_remote_callbacks callbacks\ngit_fetch_prune_t prune\nint update_fetchhead\ngit_remote_autotag_option_t download_tags", + "tdef": "typedef", + "description": " Fetch options structure.", + "comments": "

Zero out for defaults. Initialize with GIT_FETCH_OPTIONS_INIT macro to\n correctly set the version field. E.g.

\n\n
    git_fetch_options opts = GIT_FETCH_OPTIONS_INIT;\n
\n", + "fields": [ + { + "type": "int", + "name": "version", + "comments": "" + }, + { + "type": "git_remote_callbacks", + "name": "callbacks", + "comments": " Callbacks to use for this fetch operation" + }, + { + "type": "git_fetch_prune_t", + "name": "prune", + "comments": " Whether to perform a prune after the fetch" + }, + { + "type": "int", + "name": "update_fetchhead", + "comments": " Whether to write the results to FETCH_HEAD. Defaults to\n on. Leave this default in order to behave like git." + }, + { + "type": "git_remote_autotag_option_t", + "name": "download_tags", + "comments": " Determines how to behave regarding tags on the remote, such\n as auto-downloading tags for objects we're downloading or\n downloading all of them.\n\n The default is to auto-follow tags." + } + ], + "used": { + "returns": [], + "needs": [ + "git_fetch_init_options", + "git_remote_download", + "git_remote_fetch" + ] + } + } + ], + [ + "git_filemode_t", + { + "decl": [ + "GIT_FILEMODE_UNREADABLE", + "GIT_FILEMODE_TREE", + "GIT_FILEMODE_BLOB", + "GIT_FILEMODE_BLOB_EXECUTABLE", + "GIT_FILEMODE_LINK", + "GIT_FILEMODE_COMMIT" + ], + "type": "enum", + "file": "types.h", + "line": 205, + "lineto": 212, + "block": "GIT_FILEMODE_UNREADABLE\nGIT_FILEMODE_TREE\nGIT_FILEMODE_BLOB\nGIT_FILEMODE_BLOB_EXECUTABLE\nGIT_FILEMODE_LINK\nGIT_FILEMODE_COMMIT", + "tdef": "typedef", + "description": " Valid modes for index and tree entries. ", + "comments": "", + "fields": [ + { + "type": "int", + "name": "GIT_FILEMODE_UNREADABLE", + "comments": "", + "value": 0 + }, + { + "type": "int", + "name": "GIT_FILEMODE_TREE", + "comments": "", + "value": 16384 + }, + { + "type": "int", + "name": "GIT_FILEMODE_BLOB", + "comments": "", + "value": 33188 + }, + { + "type": "int", + "name": "GIT_FILEMODE_BLOB_EXECUTABLE", + "comments": "", + "value": 33261 + }, + { + "type": "int", + "name": "GIT_FILEMODE_LINK", + "comments": "", + "value": 40960 + }, + { + "type": "int", + "name": "GIT_FILEMODE_COMMIT", + "comments": "", + "value": 57344 + } + ], + "used": { + "returns": [], + "needs": [ + "git_treebuilder_insert" + ] + } + } + ], + [ + "git_filter", + { + "decl": [ + "unsigned int version", + "const char * attributes", + "git_filter_init_fn initialize", + "git_filter_shutdown_fn shutdown", + "git_filter_check_fn check", + "git_filter_apply_fn apply", + "git_filter_stream_fn stream", + "git_filter_cleanup_fn cleanup" + ], + "type": "struct", + "value": "git_filter", + "file": "sys/filter.h", + "line": 248, + "lineto": 259, + "tdef": null, + "description": " Filter structure used to register custom filters.", + "comments": "

To associate extra data with a filter, allocate extra data and put the\n git_filter struct at the start of your data buffer, then cast the\n self pointer to your larger structure when your callback is invoked.

\n\n

version should be set to GIT_FILTER_VERSION

\n\n

attributes is a whitespace-separated list of attribute names to check\n for this filter (e.g. "eol crlf text"). If the attribute name is bare,\n it will be simply loaded and passed to the check callback. If it has\n a value (i.e. "name=value"), the attribute must match that value for\n the filter to be applied.

\n\n

The initialize, shutdown, check, apply, and cleanup callbacks\n are all documented above with the respective function pointer typedefs.

\n", + "block": "unsigned int version\nconst char * attributes\ngit_filter_init_fn initialize\ngit_filter_shutdown_fn shutdown\ngit_filter_check_fn check\ngit_filter_apply_fn apply\ngit_filter_stream_fn stream\ngit_filter_cleanup_fn cleanup", + "fields": [ + { + "type": "unsigned int", + "name": "version", + "comments": "" + }, + { + "type": "const char *", + "name": "attributes", + "comments": "" + }, + { + "type": "git_filter_init_fn", + "name": "initialize", + "comments": "" + }, + { + "type": "git_filter_shutdown_fn", + "name": "shutdown", + "comments": "" + }, + { + "type": "git_filter_check_fn", + "name": "check", + "comments": "" + }, + { + "type": "git_filter_apply_fn", + "name": "apply", + "comments": "" + }, + { + "type": "git_filter_stream_fn", + "name": "stream", + "comments": "" + }, + { + "type": "git_filter_cleanup_fn", + "name": "cleanup", + "comments": "" + } + ], + "used": { + "returns": [ + "git_filter_lookup" + ], + "needs": [ + "git_filter_list_push", + "git_filter_register" + ] + } + } + ], + [ + "git_filter_flag_t", + { + "decl": [ + "GIT_FILTER_DEFAULT", + "GIT_FILTER_ALLOW_UNSAFE" + ], + "type": "enum", + "file": "filter.h", + "line": 41, + "lineto": 44, + "block": "GIT_FILTER_DEFAULT\nGIT_FILTER_ALLOW_UNSAFE", + "tdef": "typedef", + "description": " Filter option flags.", + "comments": "", + "fields": [ + { + "type": "int", + "name": "GIT_FILTER_DEFAULT", + "comments": "", + "value": 0 + }, + { + "type": "int", + "name": "GIT_FILTER_ALLOW_UNSAFE", + "comments": "", + "value": 1 + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_filter_list", + { + "decl": "git_filter_list", + "type": "struct", + "value": "git_filter_list", + "file": "filter.h", + "line": 73, + "lineto": 73, + "tdef": "typedef", + "description": " List of filters to be applied", + "comments": "

This represents a list of filters to be applied to a file / blob. You\n can build the list with one call, apply it with another, and dispose it\n with a third. In typical usage, there are not many occasions where a\n git_filter_list is needed directly since the library will generally\n handle conversions for you, but it can be convenient to be able to\n build and apply the list sometimes.

\n", + "used": { + "returns": [], + "needs": [ + "git_filter_list_apply_to_blob", + "git_filter_list_apply_to_data", + "git_filter_list_apply_to_file", + "git_filter_list_contains", + "git_filter_list_free", + "git_filter_list_length", + "git_filter_list_load", + "git_filter_list_new", + "git_filter_list_push", + "git_filter_list_stream_blob", + "git_filter_list_stream_data", + "git_filter_list_stream_file" + ] + } + } + ], + [ + "git_filter_mode_t", + { + "decl": [ + "GIT_FILTER_TO_WORKTREE", + "GIT_FILTER_SMUDGE", + "GIT_FILTER_TO_ODB", + "GIT_FILTER_CLEAN" + ], + "type": "enum", + "file": "filter.h", + "line": 31, + "lineto": 36, + "block": "GIT_FILTER_TO_WORKTREE\nGIT_FILTER_SMUDGE\nGIT_FILTER_TO_ODB\nGIT_FILTER_CLEAN", + "tdef": "typedef", + "description": " Filters are applied in one of two directions: smudging - which is\n exporting a file from the Git object database to the working directory,\n and cleaning - which is importing a file from the working directory to\n the Git object database. These values control which direction of\n change is being applied.", + "comments": "", + "fields": [ + { + "type": "int", + "name": "GIT_FILTER_TO_WORKTREE", + "comments": "", + "value": 0 + }, + { + "type": "int", + "name": "GIT_FILTER_SMUDGE", + "comments": "", + "value": 0 + }, + { + "type": "int", + "name": "GIT_FILTER_TO_ODB", + "comments": "", + "value": 1 + }, + { + "type": "int", + "name": "GIT_FILTER_CLEAN", + "comments": "", + "value": 1 + } + ], + "used": { + "returns": [], + "needs": [ + "git_filter_list_load", + "git_filter_list_new" + ] + } + } + ], + [ + "git_filter_source", + { + "decl": "git_filter_source", + "type": "struct", + "value": "git_filter_source", + "file": "sys/filter.h", + "line": 95, + "lineto": 95, + "tdef": "typedef", + "description": " A filter source represents a file/blob to be processed", + "comments": "", + "used": { + "returns": [], + "needs": [ + "git_filter_source_filemode", + "git_filter_source_flags", + "git_filter_source_id", + "git_filter_source_mode", + "git_filter_source_path", + "git_filter_source_repo" + ] + } + } + ], + [ + "git_hashsig", + { + "decl": "git_hashsig", + "type": "struct", + "value": "git_hashsig", + "file": "sys/hashsig.h", + "line": 17, + "lineto": 17, + "tdef": "typedef", + "description": " Similarity signature of arbitrary text content based on line hashes", + "comments": "", + "used": { + "returns": [], + "needs": [ + "git_hashsig_compare", + "git_hashsig_create", + "git_hashsig_create_fromfile", + "git_hashsig_free" + ] + } + } + ], + [ + "git_hashsig_option_t", + { + "decl": [ + "GIT_HASHSIG_NORMAL", + "GIT_HASHSIG_IGNORE_WHITESPACE", + "GIT_HASHSIG_SMART_WHITESPACE", + "GIT_HASHSIG_ALLOW_SMALL_FILES" + ], + "type": "enum", + "file": "sys/hashsig.h", + "line": 25, + "lineto": 45, + "block": "GIT_HASHSIG_NORMAL\nGIT_HASHSIG_IGNORE_WHITESPACE\nGIT_HASHSIG_SMART_WHITESPACE\nGIT_HASHSIG_ALLOW_SMALL_FILES", + "tdef": "typedef", + "description": " Options for hashsig computation", + "comments": "

The options GIT_HASHSIG_NORMAL, GIT_HASHSIG_IGNORE_WHITESPACE,\n GIT_HASHSIG_SMART_WHITESPACE are exclusive and should not be combined.

\n", + "fields": [ + { + "type": "int", + "name": "GIT_HASHSIG_NORMAL", + "comments": "

Use all data

\n", + "value": 0 + }, + { + "type": "int", + "name": "GIT_HASHSIG_IGNORE_WHITESPACE", + "comments": "

Ignore whitespace

\n", + "value": 1 + }, + { + "type": "int", + "name": "GIT_HASHSIG_SMART_WHITESPACE", + "comments": "

Ignore

\n\n

and all space after

\n", + "value": 2 + }, + { + "type": "int", + "name": "GIT_HASHSIG_ALLOW_SMALL_FILES", + "comments": "

Allow hashing of small files

\n", + "value": 4 + } + ], + "used": { + "returns": [], + "needs": [ + "git_hashsig_create", + "git_hashsig_create_fromfile" + ] + } + } + ], + [ + "git_idxentry_extended_flag_t", + { + "decl": [ + "GIT_IDXENTRY_INTENT_TO_ADD", + "GIT_IDXENTRY_SKIP_WORKTREE", + "GIT_IDXENTRY_EXTENDED2", + "GIT_IDXENTRY_EXTENDED_FLAGS", + "GIT_IDXENTRY_UPDATE", + "GIT_IDXENTRY_REMOVE", + "GIT_IDXENTRY_UPTODATE", + "GIT_IDXENTRY_ADDED", + "GIT_IDXENTRY_HASHED", + "GIT_IDXENTRY_UNHASHED", + "GIT_IDXENTRY_WT_REMOVE", + "GIT_IDXENTRY_CONFLICTED", + "GIT_IDXENTRY_UNPACKED", + "GIT_IDXENTRY_NEW_SKIP_WORKTREE" + ], + "type": "enum", + "file": "index.h", + "line": 115, + "lineto": 135, + "block": "GIT_IDXENTRY_INTENT_TO_ADD\nGIT_IDXENTRY_SKIP_WORKTREE\nGIT_IDXENTRY_EXTENDED2\nGIT_IDXENTRY_EXTENDED_FLAGS\nGIT_IDXENTRY_UPDATE\nGIT_IDXENTRY_REMOVE\nGIT_IDXENTRY_UPTODATE\nGIT_IDXENTRY_ADDED\nGIT_IDXENTRY_HASHED\nGIT_IDXENTRY_UNHASHED\nGIT_IDXENTRY_WT_REMOVE\nGIT_IDXENTRY_CONFLICTED\nGIT_IDXENTRY_UNPACKED\nGIT_IDXENTRY_NEW_SKIP_WORKTREE", + "tdef": "typedef", + "description": " Bitmasks for on-disk fields of `git_index_entry`'s `flags_extended`", + "comments": "

In memory, the flags_extended fields are divided into two parts: the\n fields that are read from and written to disk, and other fields that\n in-memory only and used by libgit2. Only the flags in\n GIT_IDXENTRY_EXTENDED_FLAGS will get saved on-disk.

\n\n

Thee first three bitmasks match the three fields in the\n git_index_entry flags_extended value that belong on disk. You\n can use them to interpret the data in the flags_extended.

\n\n

The rest of the bitmasks match the other fields in the git_index_entry\n flags_extended value that are only used in-memory by libgit2.\n You can use them to interpret the data in the flags_extended.

\n", + "fields": [ + { + "type": "int", + "name": "GIT_IDXENTRY_INTENT_TO_ADD", + "comments": "", + "value": 8192 + }, + { + "type": "int", + "name": "GIT_IDXENTRY_SKIP_WORKTREE", + "comments": "", + "value": 16384 + }, + { + "type": "int", + "name": "GIT_IDXENTRY_EXTENDED2", + "comments": "

Reserved for future extension

\n", + "value": 32768 + }, + { + "type": "int", + "name": "GIT_IDXENTRY_EXTENDED_FLAGS", + "comments": "

Reserved for future extension

\n", + "value": 24576 + }, + { + "type": "int", + "name": "GIT_IDXENTRY_UPDATE", + "comments": "

Reserved for future extension

\n", + "value": 1 + }, + { + "type": "int", + "name": "GIT_IDXENTRY_REMOVE", + "comments": "

Reserved for future extension

\n", + "value": 2 + }, + { + "type": "int", + "name": "GIT_IDXENTRY_UPTODATE", + "comments": "

Reserved for future extension

\n", + "value": 4 + }, + { + "type": "int", + "name": "GIT_IDXENTRY_ADDED", + "comments": "

Reserved for future extension

\n", + "value": 8 + }, + { + "type": "int", + "name": "GIT_IDXENTRY_HASHED", + "comments": "

Reserved for future extension

\n", + "value": 16 + }, + { + "type": "int", + "name": "GIT_IDXENTRY_UNHASHED", + "comments": "

Reserved for future extension

\n", + "value": 32 + }, + { + "type": "int", + "name": "GIT_IDXENTRY_WT_REMOVE", + "comments": "

remove in work directory

\n", + "value": 64 + }, + { + "type": "int", + "name": "GIT_IDXENTRY_CONFLICTED", + "comments": "", + "value": 128 + }, + { + "type": "int", + "name": "GIT_IDXENTRY_UNPACKED", + "comments": "", + "value": 256 + }, + { + "type": "int", + "name": "GIT_IDXENTRY_NEW_SKIP_WORKTREE", + "comments": "", + "value": 512 + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_index", + { + "decl": "git_index", + "type": "struct", + "value": "git_index", + "file": "types.h", + "line": 132, + "lineto": 132, + "tdef": "typedef", + "description": " Memory representation of an index file. ", + "comments": "", + "used": { + "returns": [], + "needs": [ + "git_checkout_index", + "git_cherrypick_commit", + "git_diff_index_to_workdir", + "git_diff_tree_to_index", + "git_index_add", + "git_index_add_all", + "git_index_add_bypath", + "git_index_add_frombuffer", + "git_index_caps", + "git_index_checksum", + "git_index_clear", + "git_index_conflict_add", + "git_index_conflict_cleanup", + "git_index_conflict_get", + "git_index_conflict_iterator_new", + "git_index_conflict_remove", + "git_index_entrycount", + "git_index_find", + "git_index_free", + "git_index_get_byindex", + "git_index_get_bypath", + "git_index_has_conflicts", + "git_index_new", + "git_index_open", + "git_index_owner", + "git_index_path", + "git_index_read", + "git_index_read_tree", + "git_index_remove", + "git_index_remove_all", + "git_index_remove_bypath", + "git_index_remove_directory", + "git_index_set_caps", + "git_index_update_all", + "git_index_write", + "git_index_write_tree", + "git_index_write_tree_to", + "git_merge_commits", + "git_merge_trees", + "git_pathspec_match_index", + "git_repository_index", + "git_repository_set_index", + "git_revert_commit" + ] + } + } + ], + [ + "git_index_add_option_t", + { + "decl": [ + "GIT_INDEX_ADD_DEFAULT", + "GIT_INDEX_ADD_FORCE", + "GIT_INDEX_ADD_DISABLE_PATHSPEC_MATCH", + "GIT_INDEX_ADD_CHECK_PATHSPEC" + ], + "type": "enum", + "file": "index.h", + "line": 150, + "lineto": 155, + "block": "GIT_INDEX_ADD_DEFAULT\nGIT_INDEX_ADD_FORCE\nGIT_INDEX_ADD_DISABLE_PATHSPEC_MATCH\nGIT_INDEX_ADD_CHECK_PATHSPEC", + "tdef": "typedef", + "description": " Flags for APIs that add files matching pathspec ", + "comments": "", + "fields": [ + { + "type": "int", + "name": "GIT_INDEX_ADD_DEFAULT", + "comments": "", + "value": 0 + }, + { + "type": "int", + "name": "GIT_INDEX_ADD_FORCE", + "comments": "", + "value": 1 + }, + { + "type": "int", + "name": "GIT_INDEX_ADD_DISABLE_PATHSPEC_MATCH", + "comments": "", + "value": 2 + }, + { + "type": "int", + "name": "GIT_INDEX_ADD_CHECK_PATHSPEC", + "comments": "", + "value": 4 + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_index_conflict_iterator", + { + "decl": "git_index_conflict_iterator", + "type": "struct", + "value": "git_index_conflict_iterator", + "file": "types.h", + "line": 135, + "lineto": 135, + "tdef": "typedef", + "description": " An iterator for conflicts in the index. ", + "comments": "", + "used": { + "returns": [], + "needs": [ + "git_index_conflict_iterator_free", + "git_index_conflict_iterator_new", + "git_index_conflict_next" + ] + } + } + ], + [ + "git_index_entry", + { + "decl": [ + "git_index_time ctime", + "git_index_time mtime", + "uint32_t dev", + "uint32_t ino", + "uint32_t mode", + "uint32_t uid", + "uint32_t gid", + "uint32_t file_size", + "git_oid id", + "uint16_t flags", + "uint16_t flags_extended", + "const char * path" + ], + "type": "struct", + "value": "git_index_entry", + "file": "index.h", + "line": 53, + "lineto": 70, + "block": "git_index_time ctime\ngit_index_time mtime\nuint32_t dev\nuint32_t ino\nuint32_t mode\nuint32_t uid\nuint32_t gid\nuint32_t file_size\ngit_oid id\nuint16_t flags\nuint16_t flags_extended\nconst char * path", + "tdef": "typedef", + "description": " In-memory representation of a file entry in the index.", + "comments": "

This is a public structure that represents a file entry in the index.\n The meaning of the fields corresponds to core Git's documentation (in\n "Documentation/technical/index-format.txt").

\n\n

The flags field consists of a number of bit fields which can be\n accessed via the first set of GIT_IDXENTRY_... bitmasks below. These\n flags are all read from and persisted to disk.

\n\n

The flags_extended field also has a number of bit fields which can be\n accessed via the later GIT_IDXENTRY_... bitmasks below. Some of\n these flags are read from and written to disk, but some are set aside\n for in-memory only reference.

\n\n

Note that the time and size fields are truncated to 32 bits. This\n is enough to detect changes, which is enough for the index to\n function as a cache, but it should not be taken as an authoritative\n source for that data.

\n", + "fields": [ + { + "type": "git_index_time", + "name": "ctime", + "comments": "" + }, + { + "type": "git_index_time", + "name": "mtime", + "comments": "" + }, + { + "type": "uint32_t", + "name": "dev", + "comments": "" + }, + { + "type": "uint32_t", + "name": "ino", + "comments": "" + }, + { + "type": "uint32_t", + "name": "mode", + "comments": "" + }, + { + "type": "uint32_t", + "name": "uid", + "comments": "" + }, + { + "type": "uint32_t", + "name": "gid", + "comments": "" + }, + { + "type": "uint32_t", + "name": "file_size", + "comments": "" + }, + { + "type": "git_oid", + "name": "id", + "comments": "" + }, + { + "type": "uint16_t", + "name": "flags", + "comments": "" + }, + { + "type": "uint16_t", + "name": "flags_extended", + "comments": "" + }, + { + "type": "const char *", + "name": "path", + "comments": "" + } + ], + "used": { + "returns": [ + "git_index_get_byindex", + "git_index_get_bypath" + ], + "needs": [ + "git_index_add", + "git_index_add_frombuffer", + "git_index_conflict_add", + "git_index_conflict_get", + "git_index_conflict_next", + "git_index_entry_is_conflict", + "git_index_entry_stage", + "git_merge_file_from_index" + ] + } + } + ], + [ + "git_index_time", + { + "decl": [ + "int32_t seconds", + "uint32_t nanoseconds" + ], + "type": "struct", + "value": "git_index_time", + "file": "index.h", + "line": 26, + "lineto": 30, + "block": "int32_t seconds\nuint32_t nanoseconds", + "tdef": "typedef", + "description": " Time structure used in a git index entry ", + "comments": "", + "fields": [ + { + "type": "int32_t", + "name": "seconds", + "comments": "" + }, + { + "type": "uint32_t", + "name": "nanoseconds", + "comments": "" + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_indexcap_t", + { + "decl": [ + "GIT_INDEXCAP_IGNORE_CASE", + "GIT_INDEXCAP_NO_FILEMODE", + "GIT_INDEXCAP_NO_SYMLINKS", + "GIT_INDEXCAP_FROM_OWNER" + ], + "type": "enum", + "file": "index.h", + "line": 138, + "lineto": 143, + "block": "GIT_INDEXCAP_IGNORE_CASE\nGIT_INDEXCAP_NO_FILEMODE\nGIT_INDEXCAP_NO_SYMLINKS\nGIT_INDEXCAP_FROM_OWNER", + "tdef": "typedef", + "description": " Capabilities of system that affect index actions. ", + "comments": "", + "fields": [ + { + "type": "int", + "name": "GIT_INDEXCAP_IGNORE_CASE", + "comments": "", + "value": 1 + }, + { + "type": "int", + "name": "GIT_INDEXCAP_NO_FILEMODE", + "comments": "", + "value": 2 + }, + { + "type": "int", + "name": "GIT_INDEXCAP_NO_SYMLINKS", + "comments": "", + "value": 4 + }, + { + "type": "int", + "name": "GIT_INDEXCAP_FROM_OWNER", + "comments": "", + "value": -1 + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_indxentry_flag_t", + { + "decl": [ + "GIT_IDXENTRY_EXTENDED", + "GIT_IDXENTRY_VALID" + ], + "type": "enum", + "file": "index.h", + "line": 86, + "lineto": 89, + "block": "GIT_IDXENTRY_EXTENDED\nGIT_IDXENTRY_VALID", + "tdef": "typedef", + "description": " Flags for index entries", + "comments": "", + "fields": [ + { + "type": "int", + "name": "GIT_IDXENTRY_EXTENDED", + "comments": "", + "value": 16384 + }, + { + "type": "int", + "name": "GIT_IDXENTRY_VALID", + "comments": "", + "value": 32768 + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_libgit2_opt_t", + { + "decl": [ + "GIT_OPT_GET_MWINDOW_SIZE", + "GIT_OPT_SET_MWINDOW_SIZE", + "GIT_OPT_GET_MWINDOW_MAPPED_LIMIT", + "GIT_OPT_SET_MWINDOW_MAPPED_LIMIT", + "GIT_OPT_GET_SEARCH_PATH", + "GIT_OPT_SET_SEARCH_PATH", + "GIT_OPT_SET_CACHE_OBJECT_LIMIT", + "GIT_OPT_SET_CACHE_MAX_SIZE", + "GIT_OPT_ENABLE_CACHING", + "GIT_OPT_GET_CACHED_MEMORY", + "GIT_OPT_GET_TEMPLATE_PATH", + "GIT_OPT_SET_TEMPLATE_PATH", + "GIT_OPT_SET_SSL_CERT_LOCATIONS" + ], + "type": "enum", + "file": "common.h", + "line": 132, + "lineto": 146, + "block": "GIT_OPT_GET_MWINDOW_SIZE\nGIT_OPT_SET_MWINDOW_SIZE\nGIT_OPT_GET_MWINDOW_MAPPED_LIMIT\nGIT_OPT_SET_MWINDOW_MAPPED_LIMIT\nGIT_OPT_GET_SEARCH_PATH\nGIT_OPT_SET_SEARCH_PATH\nGIT_OPT_SET_CACHE_OBJECT_LIMIT\nGIT_OPT_SET_CACHE_MAX_SIZE\nGIT_OPT_ENABLE_CACHING\nGIT_OPT_GET_CACHED_MEMORY\nGIT_OPT_GET_TEMPLATE_PATH\nGIT_OPT_SET_TEMPLATE_PATH\nGIT_OPT_SET_SSL_CERT_LOCATIONS", + "tdef": "typedef", + "description": " Global library options", + "comments": "

These are used to select which global option to set or get and are\n used in git_libgit2_opts().

\n", + "fields": [ + { + "type": "int", + "name": "GIT_OPT_GET_MWINDOW_SIZE", + "comments": "", + "value": 0 + }, + { + "type": "int", + "name": "GIT_OPT_SET_MWINDOW_SIZE", + "comments": "", + "value": 1 + }, + { + "type": "int", + "name": "GIT_OPT_GET_MWINDOW_MAPPED_LIMIT", + "comments": "", + "value": 2 + }, + { + "type": "int", + "name": "GIT_OPT_SET_MWINDOW_MAPPED_LIMIT", + "comments": "", + "value": 3 + }, + { + "type": "int", + "name": "GIT_OPT_GET_SEARCH_PATH", + "comments": "", + "value": 4 + }, + { + "type": "int", + "name": "GIT_OPT_SET_SEARCH_PATH", + "comments": "", + "value": 5 + }, + { + "type": "int", + "name": "GIT_OPT_SET_CACHE_OBJECT_LIMIT", + "comments": "", + "value": 6 + }, + { + "type": "int", + "name": "GIT_OPT_SET_CACHE_MAX_SIZE", + "comments": "", + "value": 7 + }, + { + "type": "int", + "name": "GIT_OPT_ENABLE_CACHING", + "comments": "", + "value": 8 + }, + { + "type": "int", + "name": "GIT_OPT_GET_CACHED_MEMORY", + "comments": "", + "value": 9 + }, + { + "type": "int", + "name": "GIT_OPT_GET_TEMPLATE_PATH", + "comments": "", + "value": 10 + }, + { + "type": "int", + "name": "GIT_OPT_SET_TEMPLATE_PATH", + "comments": "", + "value": 11 + }, + { + "type": "int", + "name": "GIT_OPT_SET_SSL_CERT_LOCATIONS", + "comments": "", + "value": 12 + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_merge_analysis_t", + { + "decl": [ + "GIT_MERGE_ANALYSIS_NONE", + "GIT_MERGE_ANALYSIS_NORMAL", + "GIT_MERGE_ANALYSIS_UP_TO_DATE", + "GIT_MERGE_ANALYSIS_FASTFORWARD", + "GIT_MERGE_ANALYSIS_UNBORN" + ], + "type": "enum", + "file": "merge.h", + "line": 272, + "lineto": 301, + "block": "GIT_MERGE_ANALYSIS_NONE\nGIT_MERGE_ANALYSIS_NORMAL\nGIT_MERGE_ANALYSIS_UP_TO_DATE\nGIT_MERGE_ANALYSIS_FASTFORWARD\nGIT_MERGE_ANALYSIS_UNBORN", + "tdef": "typedef", + "description": " The results of `git_merge_analysis` indicate the merge opportunities.", + "comments": "", + "fields": [ + { + "type": "int", + "name": "GIT_MERGE_ANALYSIS_NONE", + "comments": "

No merge is possible. (Unused.)

\n", + "value": 0 + }, + { + "type": "int", + "name": "GIT_MERGE_ANALYSIS_NORMAL", + "comments": "

A "normal" merge; both HEAD and the given merge input have diverged\n from their common ancestor. The divergent commits must be merged.

\n", + "value": 1 + }, + { + "type": "int", + "name": "GIT_MERGE_ANALYSIS_UP_TO_DATE", + "comments": "

All given merge inputs are reachable from HEAD, meaning the\n repository is up-to-date and no merge needs to be performed.

\n", + "value": 2 + }, + { + "type": "int", + "name": "GIT_MERGE_ANALYSIS_FASTFORWARD", + "comments": "

The given merge input is a fast-forward from HEAD and no merge\n needs to be performed. Instead, the client can check out the\n given merge input.

\n", + "value": 4 + }, + { + "type": "int", + "name": "GIT_MERGE_ANALYSIS_UNBORN", + "comments": "

The HEAD of the current repository is "unborn" and does not point to\n a valid commit. No merge can be performed, but the caller may wish\n to simply set HEAD to the target commit(s).

\n", + "value": 8 + } + ], + "used": { + "returns": [], + "needs": [ + "git_merge_analysis" + ] + } + } + ], + [ + "git_merge_file_favor_t", + { + "decl": [ + "GIT_MERGE_FILE_FAVOR_NORMAL", + "GIT_MERGE_FILE_FAVOR_OURS", + "GIT_MERGE_FILE_FAVOR_THEIRS", + "GIT_MERGE_FILE_FAVOR_UNION" + ], + "type": "enum", + "file": "merge.h", + "line": 81, + "lineto": 111, + "block": "GIT_MERGE_FILE_FAVOR_NORMAL\nGIT_MERGE_FILE_FAVOR_OURS\nGIT_MERGE_FILE_FAVOR_THEIRS\nGIT_MERGE_FILE_FAVOR_UNION", + "tdef": "typedef", + "description": " Merge file favor options for `git_merge_options` instruct the file-level\n merging functionality how to deal with conflicting regions of the files.", + "comments": "", + "fields": [ + { + "type": "int", + "name": "GIT_MERGE_FILE_FAVOR_NORMAL", + "comments": "

When a region of a file is changed in both branches, a conflict\n will be recorded in the index so that git_checkout can produce\n a merge file with conflict markers in the working directory.\n This is the default.

\n", + "value": 0 + }, + { + "type": "int", + "name": "GIT_MERGE_FILE_FAVOR_OURS", + "comments": "

When a region of a file is changed in both branches, the file\n created in the index will contain the "ours" side of any conflicting\n region. The index will not record a conflict.

\n", + "value": 1 + }, + { + "type": "int", + "name": "GIT_MERGE_FILE_FAVOR_THEIRS", + "comments": "

When a region of a file is changed in both branches, the file\n created in the index will contain the "theirs" side of any conflicting\n region. The index will not record a conflict.

\n", + "value": 2 + }, + { + "type": "int", + "name": "GIT_MERGE_FILE_FAVOR_UNION", + "comments": "

When a region of a file is changed in both branches, the file\n created in the index will contain each unique line from each side,\n which has the result of combining both files. The index will not\n record a conflict.

\n", + "value": 3 + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_merge_file_flags_t", + { + "decl": [ + "GIT_MERGE_FILE_DEFAULT", + "GIT_MERGE_FILE_STYLE_MERGE", + "GIT_MERGE_FILE_STYLE_DIFF3", + "GIT_MERGE_FILE_SIMPLIFY_ALNUM", + "GIT_MERGE_FILE_IGNORE_WHITESPACE", + "GIT_MERGE_FILE_IGNORE_WHITESPACE_CHANGE", + "GIT_MERGE_FILE_IGNORE_WHITESPACE_EOL", + "GIT_MERGE_FILE_DIFF_PATIENCE", + "GIT_MERGE_FILE_DIFF_MINIMAL" + ], + "type": "enum", + "file": "merge.h", + "line": 116, + "lineto": 143, + "block": "GIT_MERGE_FILE_DEFAULT\nGIT_MERGE_FILE_STYLE_MERGE\nGIT_MERGE_FILE_STYLE_DIFF3\nGIT_MERGE_FILE_SIMPLIFY_ALNUM\nGIT_MERGE_FILE_IGNORE_WHITESPACE\nGIT_MERGE_FILE_IGNORE_WHITESPACE_CHANGE\nGIT_MERGE_FILE_IGNORE_WHITESPACE_EOL\nGIT_MERGE_FILE_DIFF_PATIENCE\nGIT_MERGE_FILE_DIFF_MINIMAL", + "tdef": "typedef", + "description": " File merging flags", + "comments": "", + "fields": [ + { + "type": "int", + "name": "GIT_MERGE_FILE_DEFAULT", + "comments": "

Defaults

\n", + "value": 0 + }, + { + "type": "int", + "name": "GIT_MERGE_FILE_STYLE_MERGE", + "comments": "

Create standard conflicted merge files

\n", + "value": 1 + }, + { + "type": "int", + "name": "GIT_MERGE_FILE_STYLE_DIFF3", + "comments": "

Create diff3-style files

\n", + "value": 2 + }, + { + "type": "int", + "name": "GIT_MERGE_FILE_SIMPLIFY_ALNUM", + "comments": "

Condense non-alphanumeric regions for simplified diff file

\n", + "value": 4 + }, + { + "type": "int", + "name": "GIT_MERGE_FILE_IGNORE_WHITESPACE", + "comments": "

Ignore all whitespace

\n", + "value": 8 + }, + { + "type": "int", + "name": "GIT_MERGE_FILE_IGNORE_WHITESPACE_CHANGE", + "comments": "

Ignore changes in amount of whitespace

\n", + "value": 16 + }, + { + "type": "int", + "name": "GIT_MERGE_FILE_IGNORE_WHITESPACE_EOL", + "comments": "

Ignore whitespace at end of line

\n", + "value": 32 + }, + { + "type": "int", + "name": "GIT_MERGE_FILE_DIFF_PATIENCE", + "comments": "

Use the "patience diff" algorithm

\n", + "value": 64 + }, + { + "type": "int", + "name": "GIT_MERGE_FILE_DIFF_MINIMAL", + "comments": "

Take extra time to find minimal diff

\n", + "value": 128 + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_merge_file_input", + { + "decl": [ + "unsigned int version", + "const char * ptr", + "size_t size", + "const char * path", + "unsigned int mode" + ], + "type": "struct", + "value": "git_merge_file_input", + "file": "merge.h", + "line": 32, + "lineto": 46, + "block": "unsigned int version\nconst char * ptr\nsize_t size\nconst char * path\nunsigned int mode", + "tdef": "typedef", + "description": " The file inputs to `git_merge_file`. Callers should populate the\n `git_merge_file_input` structure with descriptions of the files in\n each side of the conflict for use in producing the merge file.", + "comments": "", + "fields": [ + { + "type": "unsigned int", + "name": "version", + "comments": "" + }, + { + "type": "const char *", + "name": "ptr", + "comments": " Pointer to the contents of the file. " + }, + { + "type": "size_t", + "name": "size", + "comments": " Size of the contents pointed to in `ptr`. " + }, + { + "type": "const char *", + "name": "path", + "comments": " File name of the conflicted file, or `NULL` to not merge the path. " + }, + { + "type": "unsigned int", + "name": "mode", + "comments": " File mode of the conflicted file, or `0` to not merge the mode. " + } + ], + "used": { + "returns": [], + "needs": [ + "git_merge_file", + "git_merge_file_init_input" + ] + } + } + ], + [ + "git_merge_file_options", + { + "decl": [ + "unsigned int version", + "const char * ancestor_label", + "const char * our_label", + "const char * their_label", + "git_merge_file_favor_t favor", + "unsigned int flags" + ], + "type": "struct", + "value": "git_merge_file_options", + "file": "merge.h", + "line": 148, + "lineto": 174, + "block": "unsigned int version\nconst char * ancestor_label\nconst char * our_label\nconst char * their_label\ngit_merge_file_favor_t favor\nunsigned int flags", + "tdef": "typedef", + "description": " Options for merging a file", + "comments": "", + "fields": [ + { + "type": "unsigned int", + "name": "version", + "comments": "" + }, + { + "type": "const char *", + "name": "ancestor_label", + "comments": " Label for the ancestor file side of the conflict which will be prepended\n to labels in diff3-format merge files." + }, + { + "type": "const char *", + "name": "our_label", + "comments": " Label for our file side of the conflict which will be prepended\n to labels in merge files." + }, + { + "type": "const char *", + "name": "their_label", + "comments": " Label for their file side of the conflict which will be prepended\n to labels in merge files." + }, + { + "type": "git_merge_file_favor_t", + "name": "favor", + "comments": " The file to favor in region conflicts. " + }, + { + "type": "unsigned int", + "name": "flags", + "comments": " see `git_merge_file_flags_t` above " + } + ], + "used": { + "returns": [], + "needs": [ + "git_merge_file", + "git_merge_file_from_index", + "git_merge_file_init_options" + ] + } + } + ], + [ + "git_merge_file_result", + { + "decl": [ + "unsigned int automergeable", + "const char * path", + "unsigned int mode", + "const char * ptr", + "size_t len" + ], + "type": "struct", + "value": "git_merge_file_result", + "file": "merge.h", + "line": 195, + "lineto": 216, + "block": "unsigned int automergeable\nconst char * path\nunsigned int mode\nconst char * ptr\nsize_t len", + "tdef": "typedef", + "description": " Information about file-level merging", + "comments": "", + "fields": [ + { + "type": "unsigned int", + "name": "automergeable", + "comments": " True if the output was automerged, false if the output contains\n conflict markers." + }, + { + "type": "const char *", + "name": "path", + "comments": " The path that the resultant merge file should use, or NULL if a\n filename conflict would occur." + }, + { + "type": "unsigned int", + "name": "mode", + "comments": " The mode that the resultant merge file should use. " + }, + { + "type": "const char *", + "name": "ptr", + "comments": " The contents of the merge. " + }, + { + "type": "size_t", + "name": "len", + "comments": " The length of the merge contents. " + } + ], + "used": { + "returns": [], + "needs": [ + "git_merge_file", + "git_merge_file_from_index", + "git_merge_file_result_free" + ] + } + } + ], + [ + "git_merge_options", + { + "decl": [ + "unsigned int version", + "git_merge_tree_flag_t tree_flags", + "unsigned int rename_threshold", + "unsigned int target_limit", + "git_diff_similarity_metric * metric", + "git_merge_file_favor_t file_favor", + "unsigned int file_flags" + ], + "type": "struct", + "value": "git_merge_options", + "file": "merge.h", + "line": 221, + "lineto": 251, + "block": "unsigned int version\ngit_merge_tree_flag_t tree_flags\nunsigned int rename_threshold\nunsigned int target_limit\ngit_diff_similarity_metric * metric\ngit_merge_file_favor_t file_favor\nunsigned int file_flags", + "tdef": "typedef", + "description": " Merging options", + "comments": "", + "fields": [ + { + "type": "unsigned int", + "name": "version", + "comments": "" + }, + { + "type": "git_merge_tree_flag_t", + "name": "tree_flags", + "comments": "" + }, + { + "type": "unsigned int", + "name": "rename_threshold", + "comments": " Similarity to consider a file renamed (default 50). If\n `GIT_MERGE_TREE_FIND_RENAMES` is enabled, added files will be compared\n with deleted files to determine their similarity. Files that are\n more similar than the rename threshold (percentage-wise) will be\n treated as a rename." + }, + { + "type": "unsigned int", + "name": "target_limit", + "comments": " Maximum similarity sources to examine for renames (default 200).\n If the number of rename candidates (add / delete pairs) is greater\n than this value, inexact rename detection is aborted.\n\n This setting overrides the `merge.renameLimit` configuration value." + }, + { + "type": "git_diff_similarity_metric *", + "name": "metric", + "comments": " Pluggable similarity metric; pass NULL to use internal metric " + }, + { + "type": "git_merge_file_favor_t", + "name": "file_favor", + "comments": " Flags for handling conflicting content. " + }, + { + "type": "unsigned int", + "name": "file_flags", + "comments": " see `git_merge_file_flags_t` above " + } + ], + "used": { + "returns": [], + "needs": [ + "git_cherrypick_commit", + "git_merge", + "git_merge_commits", + "git_merge_init_options", + "git_merge_trees", + "git_revert_commit" + ] + } + } + ], + [ + "git_merge_preference_t", + { + "decl": [ + "GIT_MERGE_PREFERENCE_NONE", + "GIT_MERGE_PREFERENCE_NO_FASTFORWARD", + "GIT_MERGE_PREFERENCE_FASTFORWARD_ONLY" + ], + "type": "enum", + "file": "merge.h", + "line": 306, + "lineto": 324, + "block": "GIT_MERGE_PREFERENCE_NONE\nGIT_MERGE_PREFERENCE_NO_FASTFORWARD\nGIT_MERGE_PREFERENCE_FASTFORWARD_ONLY", + "tdef": "typedef", + "description": " The user's stated preference for merges.", + "comments": "", + "fields": [ + { + "type": "int", + "name": "GIT_MERGE_PREFERENCE_NONE", + "comments": "

No configuration was found that suggests a preferred behavior for\n merge.

\n", + "value": 0 + }, + { + "type": "int", + "name": "GIT_MERGE_PREFERENCE_NO_FASTFORWARD", + "comments": "

There is a merge.ff=false configuration setting, suggesting that\n the user does not want to allow a fast-forward merge.

\n", + "value": 1 + }, + { + "type": "int", + "name": "GIT_MERGE_PREFERENCE_FASTFORWARD_ONLY", + "comments": "

There is a merge.ff=only configuration setting, suggesting that\n the user only wants fast-forward merges.

\n", + "value": 2 + } + ], + "used": { + "returns": [], + "needs": [ + "git_merge_analysis" + ] + } + } + ], + [ + "git_merge_result", + { + "decl": "git_merge_result", + "type": "struct", + "value": "git_merge_result", + "file": "types.h", + "line": 181, + "lineto": 181, + "tdef": "typedef", + "description": " Merge result ", + "comments": "", + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_merge_tree_flag_t", + { + "decl": [ + "GIT_MERGE_TREE_FIND_RENAMES" + ], + "type": "enum", + "file": "merge.h", + "line": 68, + "lineto": 75, + "block": "GIT_MERGE_TREE_FIND_RENAMES", + "tdef": "typedef", + "description": " Flags for `git_merge_tree` options. A combination of these flags can be\n passed in via the `tree_flags` value in the `git_merge_options`.", + "comments": "", + "fields": [ + { + "type": "int", + "name": "GIT_MERGE_TREE_FIND_RENAMES", + "comments": "

Detect renames that occur between the common ancestor and the "ours"\n side or the common ancestor and the "theirs" side. This will enable\n the ability to merge between a modified and renamed file.

\n", + "value": 1 + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_note", + { + "decl": "git_note", + "type": "struct", + "value": "git_note", + "file": "types.h", + "line": 150, + "lineto": 150, + "tdef": "typedef", + "description": " Representation of a git note ", + "comments": "", + "used": { + "returns": [], + "needs": [ + "git_note_author", + "git_note_committer", + "git_note_free", + "git_note_id", + "git_note_message", + "git_note_read" + ] + } + } + ], + [ + "git_note_iterator", + { + "decl": "git_note_iterator", + "type": "struct", + "value": "git_note_iterator", + "file": "notes.h", + "line": 35, + "lineto": 35, + "tdef": "typedef", + "description": " note iterator", + "comments": "", + "used": { + "returns": [], + "needs": [ + "git_note_iterator_free", + "git_note_iterator_new", + "git_note_next" + ] + } + } + ], + [ + "git_object", + { + "decl": "git_object", + "type": "struct", + "value": "git_object", + "file": "types.h", + "line": 108, + "lineto": 108, + "tdef": "typedef", + "description": " Representation of a generic object in a repository ", + "comments": "", + "used": { + "returns": [], + "needs": [ + "git_checkout_tree", + "git_describe_commit", + "git_object_dup", + "git_object_free", + "git_object_id", + "git_object_lookup", + "git_object_lookup_bypath", + "git_object_lookup_prefix", + "git_object_owner", + "git_object_peel", + "git_object_short_id", + "git_object_type", + "git_reference_peel", + "git_reset", + "git_reset_default", + "git_revparse_ext", + "git_revparse_single", + "git_tag_annotation_create", + "git_tag_create", + "git_tag_create_lightweight", + "git_tag_peel", + "git_tag_target", + "git_tree_entry_to_object" + ] + } + } + ], + [ + "git_odb", + { + "decl": "git_odb", + "type": "struct", + "value": "git_odb", + "file": "types.h", + "line": 81, + "lineto": 81, + "tdef": "typedef", + "description": " An open object database handle. ", + "comments": "", + "used": { + "returns": [], + "needs": [ + "git_indexer_new", + "git_odb_add_alternate", + "git_odb_add_backend", + "git_odb_add_disk_alternate", + "git_odb_exists", + "git_odb_exists_prefix", + "git_odb_foreach", + "git_odb_free", + "git_odb_get_backend", + "git_odb_new", + "git_odb_num_backends", + "git_odb_open", + "git_odb_open_rstream", + "git_odb_open_wstream", + "git_odb_read", + "git_odb_read_header", + "git_odb_read_prefix", + "git_odb_refresh", + "git_odb_write", + "git_odb_write_pack", + "git_repository_odb", + "git_repository_set_odb", + "git_repository_wrap_odb" + ] + } + } + ], + [ + "git_odb_backend", + { + "decl": "git_odb_backend", + "type": "struct", + "value": "git_odb_backend", + "file": "types.h", + "line": 84, + "lineto": 84, + "block": "unsigned int version\ngit_odb * odb\nint (*)(void **, size_t *, git_otype *, git_odb_backend *, const git_oid *) read\nint (*)(git_oid *, void **, size_t *, git_otype *, git_odb_backend *, const git_oid *, size_t) read_prefix\nint (*)(size_t *, git_otype *, git_odb_backend *, const git_oid *) read_header\nint (*)(git_odb_backend *, const git_oid *, const void *, size_t, git_otype) write\nint (*)(git_odb_stream **, git_odb_backend *, git_off_t, git_otype) writestream\nint (*)(git_odb_stream **, git_odb_backend *, const git_oid *) readstream\nint (*)(git_odb_backend *, const git_oid *) exists\nint (*)(git_oid *, git_odb_backend *, const git_oid *, size_t) exists_prefix\nint (*)(git_odb_backend *) refresh\nint (*)(git_odb_backend *, git_odb_foreach_cb, void *) foreach\nint (*)(git_odb_writepack **, git_odb_backend *, git_odb *, git_transfer_progress_cb, void *) writepack\nvoid (*)(git_odb_backend *) free", + "tdef": "typedef", + "description": " A custom backend in an ODB ", + "comments": "", + "fields": [ + { + "type": "unsigned int", + "name": "version", + "comments": "" + }, + { + "type": "git_odb *", + "name": "odb", + "comments": "" + }, + { + "type": "int (*)(void **, size_t *, git_otype *, git_odb_backend *, const git_oid *)", + "name": "read", + "comments": "" + }, + { + "type": "int (*)(git_oid *, void **, size_t *, git_otype *, git_odb_backend *, const git_oid *, size_t)", + "name": "read_prefix", + "comments": "" + }, + { + "type": "int (*)(size_t *, git_otype *, git_odb_backend *, const git_oid *)", + "name": "read_header", + "comments": "" + }, + { + "type": "int (*)(git_odb_backend *, const git_oid *, const void *, size_t, git_otype)", + "name": "write", + "comments": " Write an object into the backend. The id of the object has\n already been calculated and is passed in." + }, + { + "type": "int (*)(git_odb_stream **, git_odb_backend *, git_off_t, git_otype)", + "name": "writestream", + "comments": "" + }, + { + "type": "int (*)(git_odb_stream **, git_odb_backend *, const git_oid *)", + "name": "readstream", + "comments": "" + }, + { + "type": "int (*)(git_odb_backend *, const git_oid *)", + "name": "exists", + "comments": "" + }, + { + "type": "int (*)(git_oid *, git_odb_backend *, const git_oid *, size_t)", + "name": "exists_prefix", + "comments": "" + }, + { + "type": "int (*)(git_odb_backend *)", + "name": "refresh", + "comments": " If the backend implements a refreshing mechanism, it should be exposed\n through this endpoint. Each call to `git_odb_refresh()` will invoke it.\n\n However, the backend implementation should try to stay up-to-date as much\n as possible by itself as libgit2 will not automatically invoke\n `git_odb_refresh()`. For instance, a potential strategy for the backend\n implementation to achieve this could be to internally invoke this\n endpoint on failed lookups (ie. `exists()`, `read()`, `read_header()`)." + }, + { + "type": "int (*)(git_odb_backend *, git_odb_foreach_cb, void *)", + "name": "foreach", + "comments": "" + }, + { + "type": "int (*)(git_odb_writepack **, git_odb_backend *, git_odb *, git_transfer_progress_cb, void *)", + "name": "writepack", + "comments": "" + }, + { + "type": "void (*)(git_odb_backend *)", + "name": "free", + "comments": "" + } + ], + "used": { + "returns": [], + "needs": [ + "git_mempack_new", + "git_mempack_reset", + "git_odb_add_alternate", + "git_odb_add_backend", + "git_odb_backend_loose", + "git_odb_backend_one_pack", + "git_odb_backend_pack", + "git_odb_get_backend", + "git_odb_init_backend" + ] + } + } + ], + [ + "git_odb_object", + { + "decl": "git_odb_object", + "type": "struct", + "value": "git_odb_object", + "file": "types.h", + "line": 87, + "lineto": 87, + "tdef": "typedef", + "description": " An object read from the ODB ", + "comments": "", + "used": { + "returns": [], + "needs": [ + "git_odb_object_data", + "git_odb_object_dup", + "git_odb_object_free", + "git_odb_object_id", + "git_odb_object_size", + "git_odb_object_type", + "git_odb_read", + "git_odb_read_prefix" + ] + } + } + ], + [ + "git_odb_stream", + { + "decl": "git_odb_stream", + "type": "struct", + "value": "git_odb_stream", + "file": "types.h", + "line": 90, + "lineto": 90, + "block": "git_odb_backend * backend\nunsigned int mode\nvoid * hash_ctx\ngit_off_t declared_size\ngit_off_t received_bytes\nint (*)(git_odb_stream *, char *, size_t) read\nint (*)(git_odb_stream *, const char *, size_t) write\nint (*)(git_odb_stream *, const int *) finalize_write\nvoid (*)(git_odb_stream *) free", + "tdef": "typedef", + "description": " A stream to read/write from the ODB ", + "comments": "", + "fields": [ + { + "type": "git_odb_backend *", + "name": "backend", + "comments": "" + }, + { + "type": "unsigned int", + "name": "mode", + "comments": "" + }, + { + "type": "void *", + "name": "hash_ctx", + "comments": "" + }, + { + "type": "git_off_t", + "name": "declared_size", + "comments": "" + }, + { + "type": "git_off_t", + "name": "received_bytes", + "comments": "" + }, + { + "type": "int (*)(git_odb_stream *, char *, size_t)", + "name": "read", + "comments": " Write at most `len` bytes into `buffer` and advance the stream." + }, + { + "type": "int (*)(git_odb_stream *, const char *, size_t)", + "name": "write", + "comments": " Write `len` bytes from `buffer` into the stream." + }, + { + "type": "int (*)(git_odb_stream *, const int *)", + "name": "finalize_write", + "comments": " Store the contents of the stream as an object with the id\n specified in `oid`.\n\n This method might not be invoked if:\n - an error occurs earlier with the `write` callback,\n - the object referred to by `oid` already exists in any backend, or\n - the final number of received bytes differs from the size declared\n with `git_odb_open_wstream()`" + }, + { + "type": "void (*)(git_odb_stream *)", + "name": "free", + "comments": " Free the stream's memory.\n\n This method might be called without a call to `finalize_write` if\n an error occurs or if the object is already present in the ODB." + } + ], + "used": { + "returns": [], + "needs": [ + "git_odb_open_rstream", + "git_odb_open_wstream", + "git_odb_stream_finalize_write", + "git_odb_stream_free", + "git_odb_stream_read", + "git_odb_stream_write" + ] + } + } + ], + [ + "git_odb_stream_t", + { + "decl": [ + "GIT_STREAM_RDONLY", + "GIT_STREAM_WRONLY", + "GIT_STREAM_RW" + ], + "type": "enum", + "file": "odb_backend.h", + "line": 70, + "lineto": 74, + "block": "GIT_STREAM_RDONLY\nGIT_STREAM_WRONLY\nGIT_STREAM_RW", + "tdef": "typedef", + "description": " Streaming mode ", + "comments": "", + "fields": [ + { + "type": "int", + "name": "GIT_STREAM_RDONLY", + "comments": "", + "value": 2 + }, + { + "type": "int", + "name": "GIT_STREAM_WRONLY", + "comments": "", + "value": 4 + }, + { + "type": "int", + "name": "GIT_STREAM_RW", + "comments": "", + "value": 6 + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_odb_writepack", + { + "decl": "git_odb_writepack", + "type": "struct", + "value": "git_odb_writepack", + "file": "types.h", + "line": 93, + "lineto": 93, + "block": "git_odb_backend * backend\nint (*)(git_odb_writepack *, const void *, size_t, git_transfer_progress *) append\nint (*)(git_odb_writepack *, git_transfer_progress *) commit\nvoid (*)(git_odb_writepack *) free", + "tdef": "typedef", + "description": " A stream to write a packfile to the ODB ", + "comments": "", + "fields": [ + { + "type": "git_odb_backend *", + "name": "backend", + "comments": "" + }, + { + "type": "int (*)(git_odb_writepack *, const void *, size_t, git_transfer_progress *)", + "name": "append", + "comments": "" + }, + { + "type": "int (*)(git_odb_writepack *, git_transfer_progress *)", + "name": "commit", + "comments": "" + }, + { + "type": "void (*)(git_odb_writepack *)", + "name": "free", + "comments": "" + } + ], + "used": { + "returns": [], + "needs": [ + "git_odb_write_pack" + ] + } + } + ], + [ + "git_oid", + { + "decl": [ + "unsigned char [20] id" + ], + "type": "struct", + "value": "git_oid", + "file": "oid.h", + "line": 33, + "lineto": 36, + "block": "unsigned char [20] id", + "tdef": "typedef", + "description": " Unique identity of any object (commit, tree, blob, tag). ", + "comments": "", + "fields": [ + { + "type": "unsigned char [20]", + "name": "id", + "comments": " raw binary formatted id " + } + ], + "used": { + "returns": [ + "git_annotated_commit_id", + "git_blob_id", + "git_commit_id", + "git_commit_parent_id", + "git_commit_tree_id", + "git_filter_source_id", + "git_index_checksum", + "git_indexer_hash", + "git_note_id", + "git_object_id", + "git_odb_object_id", + "git_packbuilder_hash", + "git_reference_target", + "git_reference_target_peel", + "git_reflog_entry_id_new", + "git_reflog_entry_id_old", + "git_submodule_head_id", + "git_submodule_index_id", + "git_submodule_wd_id", + "git_tag_id", + "git_tag_target_id", + "git_tree_entry_id", + "git_tree_id" + ], + "needs": [ + "git_annotated_commit_from_fetchhead", + "git_annotated_commit_lookup", + "git_blob_create_frombuffer", + "git_blob_create_fromchunks", + "git_blob_create_fromdisk", + "git_blob_create_fromworkdir", + "git_blob_lookup", + "git_blob_lookup_prefix", + "git_commit_amend", + "git_commit_create", + "git_commit_create_from_callback", + "git_commit_create_from_ids", + "git_commit_create_v", + "git_commit_lookup", + "git_commit_lookup_prefix", + "git_graph_ahead_behind", + "git_graph_descendant_of", + "git_index_write_tree", + "git_index_write_tree_to", + "git_merge_base", + "git_merge_base_many", + "git_merge_base_octopus", + "git_merge_bases", + "git_merge_bases_many", + "git_note_create", + "git_note_next", + "git_note_read", + "git_note_remove", + "git_object_lookup", + "git_object_lookup_prefix", + "git_odb_exists", + "git_odb_exists_prefix", + "git_odb_hash", + "git_odb_hashfile", + "git_odb_open_rstream", + "git_odb_read", + "git_odb_read_header", + "git_odb_read_prefix", + "git_odb_stream_finalize_write", + "git_odb_write", + "git_oid_cmp", + "git_oid_cpy", + "git_oid_equal", + "git_oid_fmt", + "git_oid_fromraw", + "git_oid_fromstr", + "git_oid_fromstrn", + "git_oid_fromstrp", + "git_oid_iszero", + "git_oid_ncmp", + "git_oid_nfmt", + "git_oid_pathfmt", + "git_oid_strcmp", + "git_oid_streq", + "git_oid_tostr", + "git_oid_tostr_s", + "git_packbuilder_insert", + "git_packbuilder_insert_commit", + "git_packbuilder_insert_recur", + "git_packbuilder_insert_tree", + "git_rebase_commit", + "git_reference__alloc", + "git_reference_create", + "git_reference_create_matching", + "git_reference_name_to_id", + "git_reference_set_target", + "git_reflog_append", + "git_repository_hashfile", + "git_repository_set_head_detached", + "git_revwalk_hide", + "git_revwalk_next", + "git_revwalk_push", + "git_tag_annotation_create", + "git_tag_create", + "git_tag_create_frombuffer", + "git_tag_create_lightweight", + "git_tag_lookup", + "git_tag_lookup_prefix", + "git_tree_entry_byid", + "git_tree_lookup", + "git_tree_lookup_prefix", + "git_treebuilder_insert", + "git_treebuilder_write" + ] + } + } + ], + [ + "git_oid_shorten", + { + "decl": "git_oid_shorten", + "type": "struct", + "value": "git_oid_shorten", + "file": "oid.h", + "line": 216, + "lineto": 216, + "tdef": "typedef", + "description": " OID Shortener object", + "comments": "", + "used": { + "returns": [ + "git_oid_shorten_new" + ], + "needs": [ + "git_oid_shorten_add", + "git_oid_shorten_free" + ] + } + } + ], + [ + "git_oidarray", + { + "decl": [ + "git_oid * ids", + "size_t count" + ], + "type": "struct", + "value": "git_oidarray", + "file": "oidarray.h", + "line": 16, + "lineto": 19, + "block": "git_oid * ids\nsize_t count", + "tdef": "typedef", + "description": " Array of object ids ", + "comments": "", + "fields": [ + { + "type": "git_oid *", + "name": "ids", + "comments": "" + }, + { + "type": "size_t", + "name": "count", + "comments": "" + } + ], + "used": { + "returns": [], + "needs": [ + "git_merge_bases", + "git_merge_bases_many", + "git_oidarray_free" + ] + } + } + ], + [ + "git_otype", + { + "decl": [ + "GIT_OBJ_ANY", + "GIT_OBJ_BAD", + "GIT_OBJ__EXT1", + "GIT_OBJ_COMMIT", + "GIT_OBJ_TREE", + "GIT_OBJ_BLOB", + "GIT_OBJ_TAG", + "GIT_OBJ__EXT2", + "GIT_OBJ_OFS_DELTA", + "GIT_OBJ_REF_DELTA" + ], + "type": "enum", + "file": "types.h", + "line": 67, + "lineto": 78, + "block": "GIT_OBJ_ANY\nGIT_OBJ_BAD\nGIT_OBJ__EXT1\nGIT_OBJ_COMMIT\nGIT_OBJ_TREE\nGIT_OBJ_BLOB\nGIT_OBJ_TAG\nGIT_OBJ__EXT2\nGIT_OBJ_OFS_DELTA\nGIT_OBJ_REF_DELTA", + "tdef": "typedef", + "description": " Basic type (loose or packed) of any Git object. ", + "comments": "", + "fields": [ + { + "type": "int", + "name": "GIT_OBJ_ANY", + "comments": "

Object can be any of the following

\n", + "value": -2 + }, + { + "type": "int", + "name": "GIT_OBJ_BAD", + "comments": "

Object is invalid.

\n", + "value": -1 + }, + { + "type": "int", + "name": "GIT_OBJ__EXT1", + "comments": "

Reserved for future use.

\n", + "value": 0 + }, + { + "type": "int", + "name": "GIT_OBJ_COMMIT", + "comments": "

A commit object.

\n", + "value": 1 + }, + { + "type": "int", + "name": "GIT_OBJ_TREE", + "comments": "

A tree (directory listing) object.

\n", + "value": 2 + }, + { + "type": "int", + "name": "GIT_OBJ_BLOB", + "comments": "

A file revision object.

\n", + "value": 3 + }, + { + "type": "int", + "name": "GIT_OBJ_TAG", + "comments": "

An annotated tag object.

\n", + "value": 4 + }, + { + "type": "int", + "name": "GIT_OBJ__EXT2", + "comments": "

Reserved for future use.

\n", + "value": 5 + }, + { + "type": "int", + "name": "GIT_OBJ_OFS_DELTA", + "comments": "

A delta, base is given by an offset.

\n", + "value": 6 + }, + { + "type": "int", + "name": "GIT_OBJ_REF_DELTA", + "comments": "

A delta, base is given by object id.

\n", + "value": 7 + } + ], + "used": { + "returns": [], + "needs": [ + "git_object__size", + "git_object_lookup", + "git_object_lookup_bypath", + "git_object_lookup_prefix", + "git_object_peel", + "git_object_type2string", + "git_object_typeisloose", + "git_odb_hash", + "git_odb_hashfile", + "git_odb_open_wstream", + "git_odb_read_header", + "git_odb_write", + "git_reference_peel", + "git_repository_hashfile" + ] + } + } + ], + [ + "git_packbuilder", + { + "decl": "git_packbuilder", + "type": "struct", + "value": "git_packbuilder", + "file": "types.h", + "line": 153, + "lineto": 153, + "tdef": "typedef", + "description": " Representation of a git packbuilder ", + "comments": "", + "used": { + "returns": [], + "needs": [ + "git_packbuilder_foreach", + "git_packbuilder_free", + "git_packbuilder_hash", + "git_packbuilder_insert", + "git_packbuilder_insert_commit", + "git_packbuilder_insert_recur", + "git_packbuilder_insert_tree", + "git_packbuilder_insert_walk", + "git_packbuilder_new", + "git_packbuilder_object_count", + "git_packbuilder_set_callbacks", + "git_packbuilder_set_threads", + "git_packbuilder_write", + "git_packbuilder_written" + ] + } + } + ], + [ + "git_packbuilder_stage_t", + { + "decl": [ + "GIT_PACKBUILDER_ADDING_OBJECTS", + "GIT_PACKBUILDER_DELTAFICATION" + ], + "type": "enum", + "file": "pack.h", + "line": 51, + "lineto": 54, + "block": "GIT_PACKBUILDER_ADDING_OBJECTS\nGIT_PACKBUILDER_DELTAFICATION", + "tdef": "typedef", + "description": " Stages that are reported by the packbuilder progress callback.", + "comments": "", + "fields": [ + { + "type": "int", + "name": "GIT_PACKBUILDER_ADDING_OBJECTS", + "comments": "", + "value": 0 + }, + { + "type": "int", + "name": "GIT_PACKBUILDER_DELTAFICATION", + "comments": "", + "value": 1 + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_patch", + { + "decl": "git_patch", + "type": "struct", + "value": "git_patch", + "file": "patch.h", + "line": 29, + "lineto": 29, + "tdef": "typedef", + "description": " The diff patch is used to store all the text diffs for a delta.", + "comments": "

You can easily loop over the content of patches and get information about\n them.

\n", + "used": { + "returns": [], + "needs": [ + "git_patch_free", + "git_patch_from_blob_and_buffer", + "git_patch_from_blobs", + "git_patch_from_buffers", + "git_patch_from_diff", + "git_patch_get_delta", + "git_patch_get_hunk", + "git_patch_get_line_in_hunk", + "git_patch_line_stats", + "git_patch_num_hunks", + "git_patch_num_lines_in_hunk", + "git_patch_print", + "git_patch_size", + "git_patch_to_buf" + ] + } + } + ], + [ + "git_pathspec", + { + "decl": "git_pathspec", + "type": "struct", + "value": "git_pathspec", + "file": "pathspec.h", + "line": 20, + "lineto": 20, + "tdef": "typedef", + "description": " Compiled pathspec", + "comments": "", + "used": { + "returns": [], + "needs": [ + "git_pathspec_free", + "git_pathspec_match_diff", + "git_pathspec_match_index", + "git_pathspec_match_tree", + "git_pathspec_match_workdir", + "git_pathspec_matches_path", + "git_pathspec_new" + ] + } + } + ], + [ + "git_pathspec_flag_t", + { + "decl": [ + "GIT_PATHSPEC_DEFAULT", + "GIT_PATHSPEC_IGNORE_CASE", + "GIT_PATHSPEC_USE_CASE", + "GIT_PATHSPEC_NO_GLOB", + "GIT_PATHSPEC_NO_MATCH_ERROR", + "GIT_PATHSPEC_FIND_FAILURES", + "GIT_PATHSPEC_FAILURES_ONLY" + ], + "type": "enum", + "file": "pathspec.h", + "line": 48, + "lineto": 56, + "block": "GIT_PATHSPEC_DEFAULT\nGIT_PATHSPEC_IGNORE_CASE\nGIT_PATHSPEC_USE_CASE\nGIT_PATHSPEC_NO_GLOB\nGIT_PATHSPEC_NO_MATCH_ERROR\nGIT_PATHSPEC_FIND_FAILURES\nGIT_PATHSPEC_FAILURES_ONLY", + "tdef": "typedef", + "description": " Options controlling how pathspec match should be executed", + "comments": "
    \n
  • GIT_PATHSPEC_IGNORE_CASE forces match to ignore case; otherwise\nmatch will use native case sensitivity of platform filesystem
    • \n
  • GIT_PATHSPEC_USE_CASE forces case sensitive match; otherwise\nmatch will use native case sensitivity of platform filesystem
    • \n
  • GIT_PATHSPEC_NO_GLOB disables glob patterns and just uses simple\nstring comparison for matching
    • \n
  • GIT_PATHSPEC_NO_MATCH_ERROR means the match functions return error\ncode GIT_ENOTFOUND if no matches are found; otherwise no matches is\nstill success (return 0) but git_pathspec_match_list_entrycount\nwill indicate 0 matches.
    • \n
  • GIT_PATHSPEC_FIND_FAILURES means that the git_pathspec_match_list\nshould track which patterns matched which files so that at the end of\nthe match we can identify patterns that did not match any files.
    • \n
  • GIT_PATHSPEC_FAILURES_ONLY means that the git_pathspec_match_list\ndoes not need to keep the actual matching filenames. Use this to\njust test if there were any matches at all or in combination with\nGIT_PATHSPEC_FIND_FAILURES to validate a pathspec.
    • \n
\n", + "fields": [ + { + "type": "int", + "name": "GIT_PATHSPEC_DEFAULT", + "comments": "", + "value": 0 + }, + { + "type": "int", + "name": "GIT_PATHSPEC_IGNORE_CASE", + "comments": "", + "value": 1 + }, + { + "type": "int", + "name": "GIT_PATHSPEC_USE_CASE", + "comments": "", + "value": 2 + }, + { + "type": "int", + "name": "GIT_PATHSPEC_NO_GLOB", + "comments": "", + "value": 4 + }, + { + "type": "int", + "name": "GIT_PATHSPEC_NO_MATCH_ERROR", + "comments": "", + "value": 8 + }, + { + "type": "int", + "name": "GIT_PATHSPEC_FIND_FAILURES", + "comments": "", + "value": 16 + }, + { + "type": "int", + "name": "GIT_PATHSPEC_FAILURES_ONLY", + "comments": "", + "value": 32 + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_pathspec_match_list", + { + "decl": "git_pathspec_match_list", + "type": "struct", + "value": "git_pathspec_match_list", + "file": "pathspec.h", + "line": 25, + "lineto": 25, + "tdef": "typedef", + "description": " List of filenames matching a pathspec", + "comments": "", + "used": { + "returns": [], + "needs": [ + "git_pathspec_match_diff", + "git_pathspec_match_index", + "git_pathspec_match_list_diff_entry", + "git_pathspec_match_list_entry", + "git_pathspec_match_list_entrycount", + "git_pathspec_match_list_failed_entry", + "git_pathspec_match_list_failed_entrycount", + "git_pathspec_match_list_free", + "git_pathspec_match_tree", + "git_pathspec_match_workdir" + ] + } + } + ], + [ + "git_push", + { + "decl": "git_push", + "type": "struct", + "value": "git_push", + "file": "types.h", + "line": 236, + "lineto": 236, + "tdef": "typedef", + "description": " Preparation for a push operation. Can be used to configure what to\n push and the level of parallelism of the packfile builder.", + "comments": "", + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_push_options", + { + "decl": [ + "unsigned int version", + "unsigned int pb_parallelism", + "git_remote_callbacks callbacks" + ], + "type": "struct", + "value": "git_push_options", + "file": "remote.h", + "line": 571, + "lineto": 588, + "block": "unsigned int version\nunsigned int pb_parallelism\ngit_remote_callbacks callbacks", + "tdef": "typedef", + "description": " Controls the behavior of a git_push object.", + "comments": "", + "fields": [ + { + "type": "unsigned int", + "name": "version", + "comments": "" + }, + { + "type": "unsigned int", + "name": "pb_parallelism", + "comments": " If the transport being used to push to the remote requires the creation\n of a pack file, this controls the number of worker threads used by\n the packbuilder when creating that pack file to be sent to the remote.\n\n If set to 0, the packbuilder will auto-detect the number of threads\n to create. The default value is 1." + }, + { + "type": "git_remote_callbacks", + "name": "callbacks", + "comments": " Callbacks to use for this push operation" + } + ], + "used": { + "returns": [], + "needs": [ + "git_push_init_options", + "git_remote_push", + "git_remote_upload" + ] + } + } + ], + [ + "git_push_update", + { + "decl": [ + "char * src_refname", + "char * dst_refname", + "git_oid src", + "git_oid dst" + ], + "type": "struct", + "value": "git_push_update", + "file": "remote.h", + "line": 340, + "lineto": 357, + "block": "char * src_refname\nchar * dst_refname\ngit_oid src\ngit_oid dst", + "tdef": "typedef", + "description": " Represents an update which will be performed on the remote during push", + "comments": "", + "fields": [ + { + "type": "char *", + "name": "src_refname", + "comments": " The source name of the reference" + }, + { + "type": "char *", + "name": "dst_refname", + "comments": " The name of the reference to update on the server" + }, + { + "type": "git_oid", + "name": "src", + "comments": " The current target of the reference" + }, + { + "type": "git_oid", + "name": "dst", + "comments": " The new target for the reference" + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_rebase", + { + "decl": "git_rebase", + "type": "struct", + "value": "git_rebase", + "file": "types.h", + "line": 187, + "lineto": 187, + "tdef": "typedef", + "description": " Representation of a rebase ", + "comments": "", + "used": { + "returns": [], + "needs": [ + "git_rebase_abort", + "git_rebase_commit", + "git_rebase_finish", + "git_rebase_free", + "git_rebase_init", + "git_rebase_next", + "git_rebase_open", + "git_rebase_operation_byindex", + "git_rebase_operation_current", + "git_rebase_operation_entrycount" + ] + } + } + ], + [ + "git_rebase_operation", + { + "decl": [ + "git_rebase_operation_t type", + "const git_oid id", + "const char * exec" + ], + "type": "struct", + "value": "git_rebase_operation", + "file": "rebase.h", + "line": 115, + "lineto": 130, + "block": "git_rebase_operation_t type\nconst git_oid id\nconst char * exec", + "tdef": "typedef", + "description": " A rebase operation", + "comments": "

Describes a single instruction/operation to be performed during the\n rebase.

\n", + "fields": [ + { + "type": "git_rebase_operation_t", + "name": "type", + "comments": " The type of rebase operation. " + }, + { + "type": "const git_oid", + "name": "id", + "comments": " The commit ID being cherry-picked. This will be populated for\n all operations except those of type `GIT_REBASE_OPERATION_EXEC`." + }, + { + "type": "const char *", + "name": "exec", + "comments": " The executable the user has requested be run. This will only\n be populated for operations of type `GIT_REBASE_OPERATION_EXEC`." + } + ], + "used": { + "returns": [ + "git_rebase_operation_byindex" + ], + "needs": [ + "git_rebase_next" + ] + } + } + ], + [ + "git_rebase_operation_t", + { + "decl": [ + "GIT_REBASE_OPERATION_PICK", + "GIT_REBASE_OPERATION_REWORD", + "GIT_REBASE_OPERATION_EDIT", + "GIT_REBASE_OPERATION_SQUASH", + "GIT_REBASE_OPERATION_FIXUP", + "GIT_REBASE_OPERATION_EXEC" + ], + "type": "enum", + "file": "rebase.h", + "line": 64, + "lineto": 100, + "block": "GIT_REBASE_OPERATION_PICK\nGIT_REBASE_OPERATION_REWORD\nGIT_REBASE_OPERATION_EDIT\nGIT_REBASE_OPERATION_SQUASH\nGIT_REBASE_OPERATION_FIXUP\nGIT_REBASE_OPERATION_EXEC", + "tdef": "typedef", + "description": " Type of rebase operation in-progress after calling `git_rebase_next`.", + "comments": "", + "fields": [ + { + "type": "int", + "name": "GIT_REBASE_OPERATION_PICK", + "comments": "

The given commit is to be cherry-picked. The client should commit\n the changes and continue if there are no conflicts.

\n", + "value": 0 + }, + { + "type": "int", + "name": "GIT_REBASE_OPERATION_REWORD", + "comments": "

The given commit is to be cherry-picked, but the client should prompt\n the user to provide an updated commit message.

\n", + "value": 1 + }, + { + "type": "int", + "name": "GIT_REBASE_OPERATION_EDIT", + "comments": "

The given commit is to be cherry-picked, but the client should stop\n to allow the user to edit the changes before committing them.

\n", + "value": 2 + }, + { + "type": "int", + "name": "GIT_REBASE_OPERATION_SQUASH", + "comments": "

The given commit is to be squashed into the previous commit. The\n commit message will be merged with the previous message.

\n", + "value": 3 + }, + { + "type": "int", + "name": "GIT_REBASE_OPERATION_FIXUP", + "comments": "

The given commit is to be squashed into the previous commit. The\n commit message from this commit will be discarded.

\n", + "value": 4 + }, + { + "type": "int", + "name": "GIT_REBASE_OPERATION_EXEC", + "comments": "

No commit will be cherry-picked. The client should run the given\n command and (if successful) continue.

\n", + "value": 5 + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_ref_t", + { + "decl": [ + "GIT_REF_INVALID", + "GIT_REF_OID", + "GIT_REF_SYMBOLIC", + "GIT_REF_LISTALL" + ], + "type": "enum", + "file": "types.h", + "line": 190, + "lineto": 195, + "block": "GIT_REF_INVALID\nGIT_REF_OID\nGIT_REF_SYMBOLIC\nGIT_REF_LISTALL", + "tdef": "typedef", + "description": " Basic type of any Git reference. ", + "comments": "", + "fields": [ + { + "type": "int", + "name": "GIT_REF_INVALID", + "comments": "

Invalid reference

\n", + "value": 0 + }, + { + "type": "int", + "name": "GIT_REF_OID", + "comments": "

A reference which points at an object id

\n", + "value": 1 + }, + { + "type": "int", + "name": "GIT_REF_SYMBOLIC", + "comments": "

A reference which points at another reference

\n", + "value": 2 + }, + { + "type": "int", + "name": "GIT_REF_LISTALL", + "comments": "", + "value": 3 + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_refdb", + { + "decl": "git_refdb", + "type": "struct", + "value": "git_refdb", + "file": "types.h", + "line": 96, + "lineto": 96, + "tdef": "typedef", + "description": " An open refs database handle. ", + "comments": "", + "used": { + "returns": [], + "needs": [ + "git_refdb_compress", + "git_refdb_free", + "git_refdb_new", + "git_refdb_open", + "git_refdb_set_backend", + "git_repository_refdb", + "git_repository_set_refdb" + ] + } + } + ], + [ + "git_refdb_backend", + { + "decl": "git_refdb_backend", + "type": "struct", + "value": "git_refdb_backend", + "file": "types.h", + "line": 99, + "lineto": 99, + "block": "unsigned int version\nint (*)(int *, git_refdb_backend *, const char *) exists\nint (*)(git_reference **, git_refdb_backend *, const char *) lookup\nint (*)(git_reference_iterator **, struct git_refdb_backend *, const char *) iterator\nint (*)(git_refdb_backend *, const git_reference *, int, const git_signature *, const char *, const git_oid *, const char *) write\nint (*)(git_reference **, git_refdb_backend *, const char *, const char *, int, const git_signature *, const char *) rename\nint (*)(git_refdb_backend *, const char *, const git_oid *, const char *) del\nint (*)(git_refdb_backend *) compress\nint (*)(git_refdb_backend *, const char *) has_log\nint (*)(git_refdb_backend *, const char *) ensure_log\nvoid (*)(git_refdb_backend *) free\nint (*)(git_reflog **, git_refdb_backend *, const char *) reflog_read\nint (*)(git_refdb_backend *, git_reflog *) reflog_write\nint (*)(git_refdb_backend *, const char *, const char *) reflog_rename\nint (*)(git_refdb_backend *, const char *) reflog_delete\nint (*)(void **, git_refdb_backend *, const char *) lock\nint (*)(git_refdb_backend *, void *, int, int, const git_reference *, const git_signature *, const char *) unlock", + "tdef": "typedef", + "description": " A custom backend for refs ", + "comments": "", + "fields": [ + { + "type": "unsigned int", + "name": "version", + "comments": "" + }, + { + "type": "int (*)(int *, git_refdb_backend *, const char *)", + "name": "exists", + "comments": " Queries the refdb backend to determine if the given ref_name\n exists. A refdb implementation must provide this function." + }, + { + "type": "int (*)(git_reference **, git_refdb_backend *, const char *)", + "name": "lookup", + "comments": " Queries the refdb backend for a given reference. A refdb\n implementation must provide this function." + }, + { + "type": "int (*)(git_reference_iterator **, struct git_refdb_backend *, const char *)", + "name": "iterator", + "comments": " Allocate an iterator object for the backend.\n\n A refdb implementation must provide this function." + }, + { + "type": "int (*)(git_refdb_backend *, const git_reference *, int, const git_signature *, const char *, const git_oid *, const char *)", + "name": "write", + "comments": "" + }, + { + "type": "int (*)(git_reference **, git_refdb_backend *, const char *, const char *, int, const git_signature *, const char *)", + "name": "rename", + "comments": "" + }, + { + "type": "int (*)(git_refdb_backend *, const char *, const git_oid *, const char *)", + "name": "del", + "comments": " Deletes the given reference from the refdb. A refdb implementation\n must provide this function." + }, + { + "type": "int (*)(git_refdb_backend *)", + "name": "compress", + "comments": " Suggests that the given refdb compress or optimize its references.\n This mechanism is implementation specific. (For on-disk reference\n databases, this may pack all loose references.) A refdb\n implementation may provide this function; if it is not provided,\n nothing will be done." + }, + { + "type": "int (*)(git_refdb_backend *, const char *)", + "name": "has_log", + "comments": " Query whether a particular reference has a log (may be empty)" + }, + { + "type": "int (*)(git_refdb_backend *, const char *)", + "name": "ensure_log", + "comments": " Make sure a particular reference will have a reflog which\n will be appended to on writes." + }, + { + "type": "void (*)(git_refdb_backend *)", + "name": "free", + "comments": " Frees any resources held by the refdb. A refdb implementation may\n provide this function; if it is not provided, nothing will be done." + }, + { + "type": "int (*)(git_reflog **, git_refdb_backend *, const char *)", + "name": "reflog_read", + "comments": " Read the reflog for the given reference name." + }, + { + "type": "int (*)(git_refdb_backend *, git_reflog *)", + "name": "reflog_write", + "comments": " Write a reflog to disk." + }, + { + "type": "int (*)(git_refdb_backend *, const char *, const char *)", + "name": "reflog_rename", + "comments": " Rename a reflog" + }, + { + "type": "int (*)(git_refdb_backend *, const char *)", + "name": "reflog_delete", + "comments": " Remove a reflog." + }, + { + "type": "int (*)(void **, git_refdb_backend *, const char *)", + "name": "lock", + "comments": " Lock a reference. The opaque parameter will be passed to the unlock function" + }, + { + "type": "int (*)(git_refdb_backend *, void *, int, int, const git_reference *, const git_signature *, const char *)", + "name": "unlock", + "comments": " Unlock a reference. Only one of target or symbolic_target\n will be set. success indicates whether to update the\n reference or discard the lock (if it's false)" + } + ], + "used": { + "returns": [], + "needs": [ + "git_refdb_backend_fs", + "git_refdb_init_backend", + "git_refdb_set_backend" + ] + } + } + ], + [ + "git_reference", + { + "decl": "git_reference", + "type": "struct", + "value": "git_reference", + "file": "types.h", + "line": 169, + "lineto": 169, + "tdef": "typedef", + "description": " In-memory representation of a reference. ", + "comments": "", + "used": { + "returns": [ + "git_reference__alloc", + "git_reference__alloc_symbolic" + ], + "needs": [ + "git_annotated_commit_from_ref", + "git_branch_create", + "git_branch_create_from_annotated", + "git_branch_delete", + "git_branch_is_head", + "git_branch_lookup", + "git_branch_move", + "git_branch_name", + "git_branch_next", + "git_branch_set_upstream", + "git_branch_upstream", + "git_reference_cmp", + "git_reference_create", + "git_reference_create_matching", + "git_reference_delete", + "git_reference_dwim", + "git_reference_free", + "git_reference_is_branch", + "git_reference_is_note", + "git_reference_is_remote", + "git_reference_is_tag", + "git_reference_lookup", + "git_reference_name", + "git_reference_next", + "git_reference_owner", + "git_reference_peel", + "git_reference_rename", + "git_reference_resolve", + "git_reference_set_target", + "git_reference_shorthand", + "git_reference_symbolic_create", + "git_reference_symbolic_create_matching", + "git_reference_symbolic_set_target", + "git_reference_symbolic_target", + "git_reference_target", + "git_reference_target_peel", + "git_reference_type", + "git_repository_head", + "git_revparse_ext" + ] + } + } + ], + [ + "git_reference_iterator", + { + "decl": "git_reference_iterator", + "type": "struct", + "value": "git_reference_iterator", + "file": "types.h", + "line": 172, + "lineto": 172, + "block": "git_refdb * db\nint (*)(git_reference **, git_reference_iterator *) next\nint (*)(const char **, git_reference_iterator *) next_name\nvoid (*)(git_reference_iterator *) free", + "tdef": "typedef", + "description": " Iterator for references ", + "comments": "", + "fields": [ + { + "type": "git_refdb *", + "name": "db", + "comments": "" + }, + { + "type": "int (*)(git_reference **, git_reference_iterator *)", + "name": "next", + "comments": " Return the current reference and advance the iterator." + }, + { + "type": "int (*)(const char **, git_reference_iterator *)", + "name": "next_name", + "comments": " Return the name of the current reference and advance the iterator" + }, + { + "type": "void (*)(git_reference_iterator *)", + "name": "free", + "comments": " Free the iterator" + } + ], + "used": { + "returns": [], + "needs": [ + "git_reference_iterator_free", + "git_reference_iterator_glob_new", + "git_reference_iterator_new", + "git_reference_next", + "git_reference_next_name" + ] + } + } + ], + [ + "git_reference_normalize_t", + { + "decl": [ + "GIT_REF_FORMAT_NORMAL", + "GIT_REF_FORMAT_ALLOW_ONELEVEL", + "GIT_REF_FORMAT_REFSPEC_PATTERN", + "GIT_REF_FORMAT_REFSPEC_SHORTHAND" + ], + "type": "enum", + "file": "refs.h", + "line": 625, + "lineto": 654, + "block": "GIT_REF_FORMAT_NORMAL\nGIT_REF_FORMAT_ALLOW_ONELEVEL\nGIT_REF_FORMAT_REFSPEC_PATTERN\nGIT_REF_FORMAT_REFSPEC_SHORTHAND", + "tdef": "typedef", + "description": " Normalization options for reference lookup", + "comments": "", + "fields": [ + { + "type": "int", + "name": "GIT_REF_FORMAT_NORMAL", + "comments": "

No particular normalization.

\n", + "value": 0 + }, + { + "type": "int", + "name": "GIT_REF_FORMAT_ALLOW_ONELEVEL", + "comments": "

Control whether one-level refnames are accepted\n (i.e., refnames that do not contain multiple /-separated\n components). Those are expected to be written only using\n uppercase letters and underscore (FETCH_HEAD, ...)

\n", + "value": 1 + }, + { + "type": "int", + "name": "GIT_REF_FORMAT_REFSPEC_PATTERN", + "comments": "

Interpret the provided name as a reference pattern for a\n refspec (as used with remote repositories). If this option\n is enabled, the name is allowed to contain a single * (\n<star

\n\n
\n

)\n in place of a one full pathname component\n (e.g., foo/\n<star\n/bar but not foo/bar\n<star\n).

\n
\n", + "value": 2 + }, + { + "type": "int", + "name": "GIT_REF_FORMAT_REFSPEC_SHORTHAND", + "comments": "

Interpret the name as part of a refspec in shorthand form\n so the ONELEVEL naming rules aren't enforced and 'master'\n becomes a valid name.

\n", + "value": 4 + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_reflog", + { + "decl": "git_reflog", + "type": "struct", + "value": "git_reflog", + "file": "types.h", + "line": 147, + "lineto": 147, + "tdef": "typedef", + "description": " Representation of a reference log ", + "comments": "", + "used": { + "returns": [], + "needs": [ + "git_reflog_append", + "git_reflog_drop", + "git_reflog_entry_byindex", + "git_reflog_entrycount", + "git_reflog_free", + "git_reflog_read", + "git_reflog_write" + ] + } + } + ], + [ + "git_reflog_entry", + { + "decl": "git_reflog_entry", + "type": "struct", + "value": "git_reflog_entry", + "file": "types.h", + "line": 144, + "lineto": 144, + "tdef": "typedef", + "description": " Representation of a reference log entry ", + "comments": "", + "used": { + "returns": [ + "git_reflog_entry_byindex" + ], + "needs": [ + "git_reflog_entry_committer", + "git_reflog_entry_id_new", + "git_reflog_entry_id_old", + "git_reflog_entry_message" + ] + } + } + ], + [ + "git_remote", + { + "decl": "git_remote", + "type": "struct", + "value": "git_remote", + "file": "types.h", + "line": 224, + "lineto": 224, + "tdef": "typedef", + "description": " Git's idea of a remote repository. A remote can be anonymous (in\n which case it does not have backing configuration entires).", + "comments": "", + "used": { + "returns": [], + "needs": [ + "git_remote_autotag", + "git_remote_connect", + "git_remote_connected", + "git_remote_create", + "git_remote_create_anonymous", + "git_remote_create_with_fetchspec", + "git_remote_default_branch", + "git_remote_disconnect", + "git_remote_download", + "git_remote_dup", + "git_remote_fetch", + "git_remote_free", + "git_remote_get_fetch_refspecs", + "git_remote_get_push_refspecs", + "git_remote_get_refspec", + "git_remote_lookup", + "git_remote_ls", + "git_remote_name", + "git_remote_owner", + "git_remote_prune", + "git_remote_prune_refs", + "git_remote_push", + "git_remote_pushurl", + "git_remote_refspec_count", + "git_remote_stats", + "git_remote_stop", + "git_remote_update_tips", + "git_remote_upload", + "git_remote_url", + "git_transport_dummy", + "git_transport_local", + "git_transport_new", + "git_transport_smart", + "git_transport_ssh_with_paths" + ] + } + } + ], + [ + "git_remote_autotag_option_t", + { + "decl": [ + "GIT_REMOTE_DOWNLOAD_TAGS_UNSPECIFIED", + "GIT_REMOTE_DOWNLOAD_TAGS_AUTO", + "GIT_REMOTE_DOWNLOAD_TAGS_NONE", + "GIT_REMOTE_DOWNLOAD_TAGS_ALL" + ], + "type": "enum", + "file": "remote.h", + "line": 494, + "lineto": 512, + "block": "GIT_REMOTE_DOWNLOAD_TAGS_UNSPECIFIED\nGIT_REMOTE_DOWNLOAD_TAGS_AUTO\nGIT_REMOTE_DOWNLOAD_TAGS_NONE\nGIT_REMOTE_DOWNLOAD_TAGS_ALL", + "tdef": "typedef", + "description": " Automatic tag following option", + "comments": "

Lets us select the --tags option to use.

\n", + "fields": [ + { + "type": "int", + "name": "GIT_REMOTE_DOWNLOAD_TAGS_UNSPECIFIED", + "comments": "

Use the setting from the configuration.

\n", + "value": 0 + }, + { + "type": "int", + "name": "GIT_REMOTE_DOWNLOAD_TAGS_AUTO", + "comments": "

Ask the server for tags pointing to objects we're already\n downloading.

\n", + "value": 1 + }, + { + "type": "int", + "name": "GIT_REMOTE_DOWNLOAD_TAGS_NONE", + "comments": "

Don't ask for any tags beyond the refspecs.

\n", + "value": 2 + }, + { + "type": "int", + "name": "GIT_REMOTE_DOWNLOAD_TAGS_ALL", + "comments": "

Ask for the all the tags.

\n", + "value": 3 + } + ], + "used": { + "returns": [], + "needs": [ + "git_remote_set_autotag", + "git_remote_update_tips" + ] + } + } + ], + [ + "git_remote_callbacks", + { + "decl": [ + "unsigned int version", + "git_transport_message_cb sideband_progress", + "int (*)(git_remote_completion_type, void *) completion", + "git_cred_acquire_cb credentials", + "git_transport_certificate_check_cb certificate_check", + "git_transfer_progress_cb transfer_progress", + "int (*)(const char *, const git_oid *, const git_oid *, void *) update_tips", + "git_packbuilder_progress pack_progress", + "git_push_transfer_progress push_transfer_progress", + "int (*)(const char *, const char *, void *) push_update_reference", + "git_push_negotiation push_negotiation", + "git_transport_cb transport", + "void * payload" + ], + "type": "struct", + "value": "git_remote_callbacks", + "file": "remote.h", + "line": 373, + "lineto": 457, + "block": "unsigned int version\ngit_transport_message_cb sideband_progress\nint (*)(git_remote_completion_type, void *) completion\ngit_cred_acquire_cb credentials\ngit_transport_certificate_check_cb certificate_check\ngit_transfer_progress_cb transfer_progress\nint (*)(const char *, const git_oid *, const git_oid *, void *) update_tips\ngit_packbuilder_progress pack_progress\ngit_push_transfer_progress push_transfer_progress\nint (*)(const char *, const char *, void *) push_update_reference\ngit_push_negotiation push_negotiation\ngit_transport_cb transport\nvoid * payload", + "tdef": null, + "description": " The callback settings structure", + "comments": "

Set the callbacks to be called by the remote when informing the user\n about the progress of the network operations.

\n", + "fields": [ + { + "type": "unsigned int", + "name": "version", + "comments": "" + }, + { + "type": "git_transport_message_cb", + "name": "sideband_progress", + "comments": " Textual progress from the remote. Text send over the\n progress side-band will be passed to this function (this is\n the 'counting objects' output." + }, + { + "type": "int (*)(git_remote_completion_type, void *)", + "name": "completion", + "comments": " Completion is called when different parts of the download\n process are done (currently unused)." + }, + { + "type": "git_cred_acquire_cb", + "name": "credentials", + "comments": " This will be called if the remote host requires\n authentication in order to connect to it.\n\n Returning GIT_PASSTHROUGH will make libgit2 behave as\n though this field isn't set." + }, + { + "type": "git_transport_certificate_check_cb", + "name": "certificate_check", + "comments": " If cert verification fails, this will be called to let the\n user make the final decision of whether to allow the\n connection to proceed. Returns 1 to allow the connection, 0\n to disallow it or a negative value to indicate an error." + }, + { + "type": "git_transfer_progress_cb", + "name": "transfer_progress", + "comments": " During the download of new data, this will be regularly\n called with the current count of progress done by the\n indexer." + }, + { + "type": "int (*)(const char *, const git_oid *, const git_oid *, void *)", + "name": "update_tips", + "comments": " Each time a reference is updated locally, this function\n will be called with information about it." + }, + { + "type": "git_packbuilder_progress", + "name": "pack_progress", + "comments": " Function to call with progress information during pack\n building. Be aware that this is called inline with pack\n building operations, so performance may be affected." + }, + { + "type": "git_push_transfer_progress", + "name": "push_transfer_progress", + "comments": " Function to call with progress information during the\n upload portion of a push. Be aware that this is called\n inline with pack building operations, so performance may be\n affected." + }, + { + "type": "int (*)(const char *, const char *, void *)", + "name": "push_update_reference", + "comments": " Called for each updated reference on push. If `status` is\n not `NULL`, the update was rejected by the remote server\n and `status` contains the reason given." + }, + { + "type": "git_push_negotiation", + "name": "push_negotiation", + "comments": " Called once between the negotiation step and the upload. It\n provides information about what updates will be performed." + }, + { + "type": "git_transport_cb", + "name": "transport", + "comments": " Create the transport to use for this operation. Leave NULL\n to auto-detect." + }, + { + "type": "void *", + "name": "payload", + "comments": " This will be passed to each of the callbacks in this struct\n as the last parameter." + } + ], + "used": { + "returns": [], + "needs": [ + "git_remote_connect", + "git_remote_init_callbacks", + "git_remote_prune", + "git_remote_update_tips" + ] + } + } + ], + [ + "git_remote_completion_type", + { + "decl": [ + "GIT_REMOTE_COMPLETION_DOWNLOAD", + "GIT_REMOTE_COMPLETION_INDEXING", + "GIT_REMOTE_COMPLETION_ERROR" + ], + "type": "enum", + "file": "remote.h", + "line": 325, + "lineto": 329, + "block": "GIT_REMOTE_COMPLETION_DOWNLOAD\nGIT_REMOTE_COMPLETION_INDEXING\nGIT_REMOTE_COMPLETION_ERROR\nGIT_REMOTE_COMPLETION_DOWNLOAD\nGIT_REMOTE_COMPLETION_INDEXING\nGIT_REMOTE_COMPLETION_ERROR", + "tdef": "typedef", + "description": " Argument to the completion callback which tells it which operation\n finished.", + "comments": "", + "fields": [ + { + "type": "int", + "name": "GIT_REMOTE_COMPLETION_DOWNLOAD", + "comments": "", + "value": 0 + }, + { + "type": "int", + "name": "GIT_REMOTE_COMPLETION_INDEXING", + "comments": "", + "value": 1 + }, + { + "type": "int", + "name": "GIT_REMOTE_COMPLETION_ERROR", + "comments": "", + "value": 2 + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_remote_head", + { + "decl": [ + "int local", + "git_oid oid", + "git_oid loid", + "char * name", + "char * symref_target" + ], + "type": "struct", + "value": "git_remote_head", + "file": "net.h", + "line": 40, + "lineto": 50, + "block": "int local\ngit_oid oid\ngit_oid loid\nchar * name\nchar * symref_target", + "tdef": null, + "description": " Description of a reference advertised by a remote server, given out\n on `ls` calls.", + "comments": "", + "fields": [ + { + "type": "int", + "name": "local", + "comments": "" + }, + { + "type": "git_oid", + "name": "oid", + "comments": "" + }, + { + "type": "git_oid", + "name": "loid", + "comments": "" + }, + { + "type": "char *", + "name": "name", + "comments": "" + }, + { + "type": "char *", + "name": "symref_target", + "comments": " If the server send a symref mapping for this ref, this will\n point to the target." + } + ], + "used": { + "returns": [], + "needs": [ + "git_remote_ls" + ] + } + } + ], + [ + "git_repository", + { + "decl": "git_repository", + "type": "struct", + "value": "git_repository", + "file": "types.h", + "line": 105, + "lineto": 105, + "tdef": "typedef", + "description": " Representation of an existing git repository,\n including all its object contents", + "comments": "", + "used": { + "returns": [ + "git_blob_owner", + "git_commit_owner", + "git_filter_source_repo", + "git_index_owner", + "git_object_owner", + "git_reference_owner", + "git_remote_owner", + "git_revwalk_repository", + "git_submodule_owner", + "git_tag_owner", + "git_tree_owner" + ], + "needs": [ + "git_annotated_commit_from_fetchhead", + "git_annotated_commit_from_ref", + "git_annotated_commit_from_revspec", + "git_annotated_commit_lookup", + "git_attr_add_macro", + "git_attr_cache_flush", + "git_attr_foreach", + "git_attr_get", + "git_attr_get_many", + "git_blame_file", + "git_blob_create_frombuffer", + "git_blob_create_fromchunks", + "git_blob_create_fromdisk", + "git_blob_create_fromworkdir", + "git_blob_lookup", + "git_blob_lookup_prefix", + "git_branch_create", + "git_branch_create_from_annotated", + "git_branch_iterator_new", + "git_branch_lookup", + "git_checkout_head", + "git_checkout_index", + "git_checkout_tree", + "git_cherrypick", + "git_cherrypick_commit", + "git_clone", + "git_commit_create", + "git_commit_create_from_callback", + "git_commit_create_from_ids", + "git_commit_create_v", + "git_commit_lookup", + "git_commit_lookup_prefix", + "git_describe_workdir", + "git_diff_commit_as_email", + "git_diff_index_to_workdir", + "git_diff_tree_to_index", + "git_diff_tree_to_tree", + "git_diff_tree_to_workdir", + "git_diff_tree_to_workdir_with_index", + "git_filter_list_apply_to_file", + "git_filter_list_load", + "git_filter_list_new", + "git_filter_list_stream_file", + "git_graph_ahead_behind", + "git_graph_descendant_of", + "git_ignore_add_rule", + "git_ignore_clear_internal_rules", + "git_ignore_path_is_ignored", + "git_index_write_tree_to", + "git_merge", + "git_merge_analysis", + "git_merge_base", + "git_merge_base_many", + "git_merge_base_octopus", + "git_merge_bases", + "git_merge_bases_many", + "git_merge_commits", + "git_merge_file_from_index", + "git_merge_trees", + "git_note_create", + "git_note_foreach", + "git_note_iterator_new", + "git_note_read", + "git_note_remove", + "git_object_lookup", + "git_object_lookup_prefix", + "git_packbuilder_new", + "git_pathspec_match_workdir", + "git_rebase_init", + "git_rebase_open", + "git_refdb_backend_fs", + "git_refdb_new", + "git_refdb_open", + "git_reference_create", + "git_reference_create_matching", + "git_reference_dwim", + "git_reference_ensure_log", + "git_reference_foreach", + "git_reference_foreach_glob", + "git_reference_foreach_name", + "git_reference_has_log", + "git_reference_iterator_glob_new", + "git_reference_iterator_new", + "git_reference_list", + "git_reference_lookup", + "git_reference_name_to_id", + "git_reference_remove", + "git_reference_symbolic_create", + "git_reference_symbolic_create_matching", + "git_reflog_delete", + "git_reflog_read", + "git_reflog_rename", + "git_remote_add_fetch", + "git_remote_add_push", + "git_remote_create", + "git_remote_create_anonymous", + "git_remote_create_with_fetchspec", + "git_remote_delete", + "git_remote_list", + "git_remote_lookup", + "git_remote_rename", + "git_remote_set_autotag", + "git_remote_set_pushurl", + "git_remote_set_url", + "git_repository__cleanup", + "git_repository_config", + "git_repository_config_snapshot", + "git_repository_detach_head", + "git_repository_fetchhead_foreach", + "git_repository_free", + "git_repository_get_namespace", + "git_repository_hashfile", + "git_repository_head", + "git_repository_head_detached", + "git_repository_head_unborn", + "git_repository_ident", + "git_repository_index", + "git_repository_init", + "git_repository_init_ext", + "git_repository_is_bare", + "git_repository_is_empty", + "git_repository_is_shallow", + "git_repository_mergehead_foreach", + "git_repository_message", + "git_repository_message_remove", + "git_repository_new", + "git_repository_odb", + "git_repository_open", + "git_repository_open_bare", + "git_repository_open_ext", + "git_repository_path", + "git_repository_refdb", + "git_repository_reinit_filesystem", + "git_repository_set_bare", + "git_repository_set_config", + "git_repository_set_head", + "git_repository_set_head_detached", + "git_repository_set_head_detached_from_annotated", + "git_repository_set_ident", + "git_repository_set_index", + "git_repository_set_namespace", + "git_repository_set_odb", + "git_repository_set_refdb", + "git_repository_set_workdir", + "git_repository_state", + "git_repository_state_cleanup", + "git_repository_workdir", + "git_repository_wrap_odb", + "git_reset", + "git_reset_default", + "git_reset_from_annotated", + "git_revert", + "git_revert_commit", + "git_revparse", + "git_revparse_ext", + "git_revparse_single", + "git_revwalk_new", + "git_signature_default", + "git_stash_apply", + "git_stash_drop", + "git_stash_foreach", + "git_stash_pop", + "git_status_file", + "git_status_foreach", + "git_status_foreach_ext", + "git_status_list_new", + "git_status_should_ignore", + "git_submodule_add_setup", + "git_submodule_foreach", + "git_submodule_lookup", + "git_submodule_open", + "git_submodule_repo_init", + "git_submodule_resolve_url", + "git_submodule_set_branch", + "git_submodule_set_fetch_recurse_submodules", + "git_submodule_set_ignore", + "git_submodule_set_update", + "git_submodule_set_url", + "git_submodule_status", + "git_tag_annotation_create", + "git_tag_create", + "git_tag_create_frombuffer", + "git_tag_create_lightweight", + "git_tag_delete", + "git_tag_foreach", + "git_tag_list", + "git_tag_list_match", + "git_tag_lookup", + "git_tag_lookup_prefix", + "git_tree_entry_to_object", + "git_tree_lookup", + "git_tree_lookup_prefix", + "git_treebuilder_new" + ] + } + } + ], + [ + "git_repository_init_flag_t", + { + "decl": [ + "GIT_REPOSITORY_INIT_BARE", + "GIT_REPOSITORY_INIT_NO_REINIT", + "GIT_REPOSITORY_INIT_NO_DOTGIT_DIR", + "GIT_REPOSITORY_INIT_MKDIR", + "GIT_REPOSITORY_INIT_MKPATH", + "GIT_REPOSITORY_INIT_EXTERNAL_TEMPLATE", + "GIT_REPOSITORY_INIT_RELATIVE_GITLINK" + ], + "type": "enum", + "file": "repository.h", + "line": 202, + "lineto": 210, + "block": "GIT_REPOSITORY_INIT_BARE\nGIT_REPOSITORY_INIT_NO_REINIT\nGIT_REPOSITORY_INIT_NO_DOTGIT_DIR\nGIT_REPOSITORY_INIT_MKDIR\nGIT_REPOSITORY_INIT_MKPATH\nGIT_REPOSITORY_INIT_EXTERNAL_TEMPLATE\nGIT_REPOSITORY_INIT_RELATIVE_GITLINK", + "tdef": "typedef", + "description": " Option flags for `git_repository_init_ext`.", + "comments": "

These flags configure extra behaviors to git_repository_init_ext.\n In every case, the default behavior is the zero value (i.e. flag is\n not set). Just OR the flag values together for the flags parameter\n when initializing a new repo. Details of individual values are:

\n\n
    \n
  • BARE - Create a bare repository with no working directory.
    • \n
  • NO_REINIT - Return an GIT_EEXISTS error if the repo_path appears to\n already be an git repository.
    • \n
  • NO_DOTGIT_DIR - Normally a "/.git/" will be appended to the repo\n path for non-bare repos (if it is not already there), but\n passing this flag prevents that behavior.
    • \n
  • MKDIR - Make the repo_path (and workdir_path) as needed. Init is\n always willing to create the ".git" directory even without this\n flag. This flag tells init to create the trailing component of\n the repo and workdir paths as needed.
    • \n
  • MKPATH - Recursively make all components of the repo and workdir\n paths as necessary.
    • \n
  • EXTERNAL_TEMPLATE - libgit2 normally uses internal templates to\n initialize a new repo. This flags enables external templates,\n looking the "template_path" from the options if set, or the\n init.templatedir global config if not, or falling back on\n "/usr/share/git-core/templates" if it exists.
    • \n
  • GIT_REPOSITORY_INIT_RELATIVE_GITLINK - If an alternate workdir is\n specified, use relative paths for the gitdir and core.worktree.
    • \n
\n", + "fields": [ + { + "type": "int", + "name": "GIT_REPOSITORY_INIT_BARE", + "comments": "", + "value": 1 + }, + { + "type": "int", + "name": "GIT_REPOSITORY_INIT_NO_REINIT", + "comments": "", + "value": 2 + }, + { + "type": "int", + "name": "GIT_REPOSITORY_INIT_NO_DOTGIT_DIR", + "comments": "", + "value": 4 + }, + { + "type": "int", + "name": "GIT_REPOSITORY_INIT_MKDIR", + "comments": "", + "value": 8 + }, + { + "type": "int", + "name": "GIT_REPOSITORY_INIT_MKPATH", + "comments": "", + "value": 16 + }, + { + "type": "int", + "name": "GIT_REPOSITORY_INIT_EXTERNAL_TEMPLATE", + "comments": "", + "value": 32 + }, + { + "type": "int", + "name": "GIT_REPOSITORY_INIT_RELATIVE_GITLINK", + "comments": "", + "value": 64 + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_repository_init_mode_t", + { + "decl": [ + "GIT_REPOSITORY_INIT_SHARED_UMASK", + "GIT_REPOSITORY_INIT_SHARED_GROUP", + "GIT_REPOSITORY_INIT_SHARED_ALL" + ], + "type": "enum", + "file": "repository.h", + "line": 225, + "lineto": 229, + "block": "GIT_REPOSITORY_INIT_SHARED_UMASK\nGIT_REPOSITORY_INIT_SHARED_GROUP\nGIT_REPOSITORY_INIT_SHARED_ALL", + "tdef": "typedef", + "description": " Mode options for `git_repository_init_ext`.", + "comments": "

Set the mode field of the git_repository_init_options structure\n either to the custom mode that you would like, or to one of the\n following modes:

\n\n
    \n
  • SHARED_UMASK - Use permissions configured by umask - the default.
    • \n
  • SHARED_GROUP - Use "--shared=group" behavior, chmod'ing the new repo\n to be group writable and "g+sx" for sticky group assignment.
    • \n
  • SHARED_ALL - Use "--shared=all" behavior, adding world readability.
    • \n
  • Anything else - Set to custom value.
    • \n
\n", + "fields": [ + { + "type": "int", + "name": "GIT_REPOSITORY_INIT_SHARED_UMASK", + "comments": "", + "value": 0 + }, + { + "type": "int", + "name": "GIT_REPOSITORY_INIT_SHARED_GROUP", + "comments": "", + "value": 1533 + }, + { + "type": "int", + "name": "GIT_REPOSITORY_INIT_SHARED_ALL", + "comments": "", + "value": 1535 + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_repository_init_options", + { + "decl": [ + "unsigned int version", + "uint32_t flags", + "uint32_t mode", + "const char * workdir_path", + "const char * description", + "const char * template_path", + "const char * initial_head", + "const char * origin_url" + ], + "type": "struct", + "value": "git_repository_init_options", + "file": "repository.h", + "line": 259, + "lineto": 268, + "block": "unsigned int version\nuint32_t flags\nuint32_t mode\nconst char * workdir_path\nconst char * description\nconst char * template_path\nconst char * initial_head\nconst char * origin_url", + "tdef": "typedef", + "description": " Extended options structure for `git_repository_init_ext`.", + "comments": "

This contains extra options for git_repository_init_ext that enable\n additional initialization features. The fields are:

\n\n
    \n
  • flags - Combination of GIT_REPOSITORY_INIT flags above.
    • \n
  • mode - Set to one of the standard GIT_REPOSITORY_INIT_SHARED_...\n constants above, or to a custom value that you would like.
    • \n
  • workdir_path - The path to the working dir or NULL for default (i.e.\n repo_path parent on non-bare repos). IF THIS IS RELATIVE PATH,\n IT WILL BE EVALUATED RELATIVE TO THE REPO_PATH. If this is not\n the "natural" working directory, a .git gitlink file will be\n created here linking to the repo_path.
    • \n
  • description - If set, this will be used to initialize the "description"\n file in the repository, instead of using the template content.
    • \n
  • template_path - When GIT_REPOSITORY_INIT_EXTERNAL_TEMPLATE is set,\n this contains the path to use for the template directory. If\n this is NULL, the config or default directory options will be\n used instead.
    • \n
  • initial_head - The name of the head to point HEAD at. If NULL, then\n this will be treated as "master" and the HEAD ref will be set\n to "refs/heads/master". If this begins with "refs/" it will be\n used verbatim; otherwise "refs/heads/" will be prefixed.
    • \n
  • origin_url - If this is non-NULL, then after the rest of the\n repository initialization is completed, an "origin" remote\n will be added pointing to this URL.
    • \n
\n", + "fields": [ + { + "type": "unsigned int", + "name": "version", + "comments": "" + }, + { + "type": "uint32_t", + "name": "flags", + "comments": "" + }, + { + "type": "uint32_t", + "name": "mode", + "comments": "" + }, + { + "type": "const char *", + "name": "workdir_path", + "comments": "" + }, + { + "type": "const char *", + "name": "description", + "comments": "" + }, + { + "type": "const char *", + "name": "template_path", + "comments": "" + }, + { + "type": "const char *", + "name": "initial_head", + "comments": "" + }, + { + "type": "const char *", + "name": "origin_url", + "comments": "" + } + ], + "used": { + "returns": [], + "needs": [ + "git_repository_init_ext", + "git_repository_init_init_options" + ] + } + } + ], + [ + "git_repository_open_flag_t", + { + "decl": [ + "GIT_REPOSITORY_OPEN_NO_SEARCH", + "GIT_REPOSITORY_OPEN_CROSS_FS", + "GIT_REPOSITORY_OPEN_BARE" + ], + "type": "enum", + "file": "repository.h", + "line": 99, + "lineto": 103, + "block": "GIT_REPOSITORY_OPEN_NO_SEARCH\nGIT_REPOSITORY_OPEN_CROSS_FS\nGIT_REPOSITORY_OPEN_BARE", + "tdef": "typedef", + "description": " Option flags for `git_repository_open_ext`.", + "comments": "
    \n
  • GIT_REPOSITORY_OPEN_NO_SEARCH - Only open the repository if it can be\nimmediately found in the start_path. Do not walk up from the\nstart_path looking at parent directories.
    • \n
  • GIT_REPOSITORY_OPEN_CROSS_FS - Unless this flag is set, open will not\ncontinue searching across filesystem boundaries (i.e. when st_dev\nchanges from the stat system call). (E.g. Searching in a user's home\ndirectory "/home/user/source/" will not return "/.git/" as the found\nrepo if "/" is a different filesystem than "/home".)
    • \n
  • GIT_REPOSITORY_OPEN_BARE - Open repository as a bare repo regardless\nof core.bare config, and defer loading config file for faster setup.\nUnlike git_repository_open_bare, this can follow gitlinks.
    • \n
\n", + "fields": [ + { + "type": "int", + "name": "GIT_REPOSITORY_OPEN_NO_SEARCH", + "comments": "", + "value": 1 + }, + { + "type": "int", + "name": "GIT_REPOSITORY_OPEN_CROSS_FS", + "comments": "", + "value": 2 + }, + { + "type": "int", + "name": "GIT_REPOSITORY_OPEN_BARE", + "comments": "", + "value": 4 + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_repository_state_t", + { + "decl": [ + "GIT_REPOSITORY_STATE_NONE", + "GIT_REPOSITORY_STATE_MERGE", + "GIT_REPOSITORY_STATE_REVERT", + "GIT_REPOSITORY_STATE_CHERRYPICK", + "GIT_REPOSITORY_STATE_BISECT", + "GIT_REPOSITORY_STATE_REBASE", + "GIT_REPOSITORY_STATE_REBASE_INTERACTIVE", + "GIT_REPOSITORY_STATE_REBASE_MERGE", + "GIT_REPOSITORY_STATE_APPLY_MAILBOX", + "GIT_REPOSITORY_STATE_APPLY_MAILBOX_OR_REBASE" + ], + "type": "enum", + "file": "repository.h", + "line": 674, + "lineto": 685, + "block": "GIT_REPOSITORY_STATE_NONE\nGIT_REPOSITORY_STATE_MERGE\nGIT_REPOSITORY_STATE_REVERT\nGIT_REPOSITORY_STATE_CHERRYPICK\nGIT_REPOSITORY_STATE_BISECT\nGIT_REPOSITORY_STATE_REBASE\nGIT_REPOSITORY_STATE_REBASE_INTERACTIVE\nGIT_REPOSITORY_STATE_REBASE_MERGE\nGIT_REPOSITORY_STATE_APPLY_MAILBOX\nGIT_REPOSITORY_STATE_APPLY_MAILBOX_OR_REBASE", + "tdef": "typedef", + "description": " Repository state", + "comments": "

These values represent possible states for the repository to be in,\n based on the current operation which is ongoing.

\n", + "fields": [ + { + "type": "int", + "name": "GIT_REPOSITORY_STATE_NONE", + "comments": "", + "value": 0 + }, + { + "type": "int", + "name": "GIT_REPOSITORY_STATE_MERGE", + "comments": "", + "value": 1 + }, + { + "type": "int", + "name": "GIT_REPOSITORY_STATE_REVERT", + "comments": "", + "value": 2 + }, + { + "type": "int", + "name": "GIT_REPOSITORY_STATE_CHERRYPICK", + "comments": "", + "value": 3 + }, + { + "type": "int", + "name": "GIT_REPOSITORY_STATE_BISECT", + "comments": "", + "value": 4 + }, + { + "type": "int", + "name": "GIT_REPOSITORY_STATE_REBASE", + "comments": "", + "value": 5 + }, + { + "type": "int", + "name": "GIT_REPOSITORY_STATE_REBASE_INTERACTIVE", + "comments": "", + "value": 6 + }, + { + "type": "int", + "name": "GIT_REPOSITORY_STATE_REBASE_MERGE", + "comments": "", + "value": 7 + }, + { + "type": "int", + "name": "GIT_REPOSITORY_STATE_APPLY_MAILBOX", + "comments": "", + "value": 8 + }, + { + "type": "int", + "name": "GIT_REPOSITORY_STATE_APPLY_MAILBOX_OR_REBASE", + "comments": "", + "value": 9 + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_reset_t", + { + "decl": [ + "GIT_RESET_SOFT", + "GIT_RESET_MIXED", + "GIT_RESET_HARD" + ], + "type": "enum", + "file": "reset.h", + "line": 26, + "lineto": 30, + "block": "GIT_RESET_SOFT\nGIT_RESET_MIXED\nGIT_RESET_HARD", + "tdef": "typedef", + "description": " Kinds of reset operation", + "comments": "", + "fields": [ + { + "type": "int", + "name": "GIT_RESET_SOFT", + "comments": "

Move the head to the given commit

\n", + "value": 1 + }, + { + "type": "int", + "name": "GIT_RESET_MIXED", + "comments": "

SOFT plus reset index to the commit

\n", + "value": 2 + }, + { + "type": "int", + "name": "GIT_RESET_HARD", + "comments": "

MIXED plus changes in working tree discarded

\n", + "value": 3 + } + ], + "used": { + "returns": [], + "needs": [ + "git_reset", + "git_reset_from_annotated" + ] + } + } + ], + [ + "git_revert_options", + { + "decl": [ + "unsigned int version", + "unsigned int mainline", + "git_merge_options merge_opts", + "git_checkout_options checkout_opts" + ], + "type": "struct", + "value": "git_revert_options", + "file": "revert.h", + "line": 26, + "lineto": 34, + "block": "unsigned int version\nunsigned int mainline\ngit_merge_options merge_opts\ngit_checkout_options checkout_opts", + "tdef": "typedef", + "description": " Options for revert", + "comments": "", + "fields": [ + { + "type": "unsigned int", + "name": "version", + "comments": "" + }, + { + "type": "unsigned int", + "name": "mainline", + "comments": " For merge commits, the \"mainline\" is treated as the parent. " + }, + { + "type": "git_merge_options", + "name": "merge_opts", + "comments": " Options for the merging " + }, + { + "type": "git_checkout_options", + "name": "checkout_opts", + "comments": " Options for the checkout " + } + ], + "used": { + "returns": [], + "needs": [ + "git_revert", + "git_revert_init_options" + ] + } + } + ], + [ + "git_revparse_mode_t", + { + "decl": [ + "GIT_REVPARSE_SINGLE", + "GIT_REVPARSE_RANGE", + "GIT_REVPARSE_MERGE_BASE" + ], + "type": "enum", + "file": "revparse.h", + "line": 71, + "lineto": 78, + "block": "GIT_REVPARSE_SINGLE\nGIT_REVPARSE_RANGE\nGIT_REVPARSE_MERGE_BASE", + "tdef": "typedef", + "description": " Revparse flags. These indicate the intended behavior of the spec passed to\n git_revparse.", + "comments": "", + "fields": [ + { + "type": "int", + "name": "GIT_REVPARSE_SINGLE", + "comments": "

The spec targeted a single object.

\n", + "value": 1 + }, + { + "type": "int", + "name": "GIT_REVPARSE_RANGE", + "comments": "

The spec targeted a range of commits.

\n", + "value": 2 + }, + { + "type": "int", + "name": "GIT_REVPARSE_MERGE_BASE", + "comments": "

The spec used the '...' operator, which invokes special semantics.

\n", + "value": 4 + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_revspec", + { + "decl": [ + "git_object * from", + "git_object * to", + "unsigned int flags" + ], + "type": "struct", + "value": "git_revspec", + "file": "revparse.h", + "line": 83, + "lineto": 90, + "block": "git_object * from\ngit_object * to\nunsigned int flags", + "tdef": "typedef", + "description": " Git Revision Spec: output of a `git_revparse` operation", + "comments": "", + "fields": [ + { + "type": "git_object *", + "name": "from", + "comments": " The left element of the revspec; must be freed by the user " + }, + { + "type": "git_object *", + "name": "to", + "comments": " The right element of the revspec; must be freed by the user " + }, + { + "type": "unsigned int", + "name": "flags", + "comments": " The intent of the revspec (i.e. `git_revparse_mode_t` flags) " + } + ], + "used": { + "returns": [], + "needs": [ + "git_revparse" + ] + } + } + ], + [ + "git_revwalk", + { + "decl": "git_revwalk", + "type": "struct", + "value": "git_revwalk", + "file": "types.h", + "line": 111, + "lineto": 111, + "tdef": "typedef", + "description": " Representation of an in-progress walk through the commits in a repo ", + "comments": "", + "used": { + "returns": [], + "needs": [ + "git_packbuilder_insert_walk", + "git_revwalk_add_hide_cb", + "git_revwalk_free", + "git_revwalk_hide", + "git_revwalk_hide_glob", + "git_revwalk_hide_head", + "git_revwalk_hide_ref", + "git_revwalk_new", + "git_revwalk_next", + "git_revwalk_push", + "git_revwalk_push_glob", + "git_revwalk_push_head", + "git_revwalk_push_range", + "git_revwalk_push_ref", + "git_revwalk_repository", + "git_revwalk_reset", + "git_revwalk_simplify_first_parent", + "git_revwalk_sorting" + ] + } + } + ], + [ + "git_signature", + { + "decl": [ + "char * name", + "char * email", + "git_time when" + ], + "type": "struct", + "value": "git_signature", + "file": "types.h", + "line": 162, + "lineto": 166, + "block": "char * name\nchar * email\ngit_time when", + "tdef": "typedef", + "description": " An action signature (e.g. for committers, taggers, etc) ", + "comments": "", + "fields": [ + { + "type": "char *", + "name": "name", + "comments": " full name of the author " + }, + { + "type": "char *", + "name": "email", + "comments": " email of the author " + }, + { + "type": "git_time", + "name": "when", + "comments": " time when the action happened " + } + ], + "used": { + "returns": [ + "git_commit_author", + "git_commit_committer", + "git_note_author", + "git_note_committer", + "git_reflog_entry_committer", + "git_tag_tagger" + ], + "needs": [ + "git_commit_amend", + "git_commit_create", + "git_commit_create_from_callback", + "git_commit_create_from_ids", + "git_commit_create_v", + "git_note_create", + "git_note_remove", + "git_rebase_commit", + "git_rebase_finish", + "git_reflog_append", + "git_signature_default", + "git_signature_dup", + "git_signature_free", + "git_signature_new", + "git_signature_now", + "git_tag_annotation_create", + "git_tag_create" + ] + } + } + ], + [ + "git_smart_subtransport_definition", + { + "decl": [ + "git_smart_subtransport_cb callback", + "unsigned int rpc", + "void * param" + ], + "type": "struct", + "value": "git_smart_subtransport_definition", + "file": "sys/transport.h", + "line": 296, + "lineto": 309, + "block": "git_smart_subtransport_cb callback\nunsigned int rpc\nvoid * param", + "tdef": "typedef", + "description": " Definition for a \"subtransport\"", + "comments": "

This is used to let the smart protocol code know about the protocol\n which you are implementing.

\n", + "fields": [ + { + "type": "git_smart_subtransport_cb", + "name": "callback", + "comments": " The function to use to create the git_smart_subtransport " + }, + { + "type": "unsigned int", + "name": "rpc", + "comments": " True if the protocol is stateless; false otherwise. For example,\n http:// is stateless, but git:// is not." + }, + { + "type": "void *", + "name": "param", + "comments": " Param of the callback" + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_sort_t", + { + "decl": [ + "GIT_SORT_NONE", + "GIT_SORT_TOPOLOGICAL", + "GIT_SORT_TIME", + "GIT_SORT_REVERSE" + ], + "type": "enum", + "file": "revwalk.h", + "line": 26, + "lineto": 55, + "block": "GIT_SORT_NONE\nGIT_SORT_TOPOLOGICAL\nGIT_SORT_TIME\nGIT_SORT_REVERSE", + "tdef": "typedef", + "description": " Flags to specify the sorting which a revwalk should perform.", + "comments": "", + "fields": [ + { + "type": "int", + "name": "GIT_SORT_NONE", + "comments": "

Sort the repository contents in no particular ordering;\n this sorting is arbitrary, implementation-specific\n and subject to change at any time.\n This is the default sorting for new walkers.

\n", + "value": 0 + }, + { + "type": "int", + "name": "GIT_SORT_TOPOLOGICAL", + "comments": "

Sort the repository contents in topological order\n (parents before children); this sorting mode\n can be combined with time sorting.

\n", + "value": 1 + }, + { + "type": "int", + "name": "GIT_SORT_TIME", + "comments": "

Sort the repository contents by commit time;\n this sorting mode can be combined with\n topological sorting.

\n", + "value": 2 + }, + { + "type": "int", + "name": "GIT_SORT_REVERSE", + "comments": "

Iterate through the repository contents in reverse\n order; this sorting mode can be combined with\n any of the above.

\n", + "value": 4 + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_stash_apply_flags", + { + "decl": [ + "GIT_STASH_APPLY_DEFAULT", + "GIT_STASH_APPLY_REINSTATE_INDEX" + ], + "type": "enum", + "file": "stash.h", + "line": 74, + "lineto": 81, + "block": "GIT_STASH_APPLY_DEFAULT\nGIT_STASH_APPLY_REINSTATE_INDEX", + "tdef": "typedef", + "description": " Stash application flags. ", + "comments": "", + "fields": [ + { + "type": "int", + "name": "GIT_STASH_APPLY_DEFAULT", + "comments": "", + "value": 0 + }, + { + "type": "int", + "name": "GIT_STASH_APPLY_REINSTATE_INDEX", + "comments": "", + "value": 1 + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_stash_flags", + { + "decl": [ + "GIT_STASH_DEFAULT", + "GIT_STASH_KEEP_INDEX", + "GIT_STASH_INCLUDE_UNTRACKED", + "GIT_STASH_INCLUDE_IGNORED" + ], + "type": "enum", + "file": "stash.h", + "line": 24, + "lineto": 47, + "block": "GIT_STASH_DEFAULT\nGIT_STASH_KEEP_INDEX\nGIT_STASH_INCLUDE_UNTRACKED\nGIT_STASH_INCLUDE_IGNORED", + "tdef": "typedef", + "description": " Stash flags", + "comments": "", + "fields": [ + { + "type": "int", + "name": "GIT_STASH_DEFAULT", + "comments": "

No option, default

\n", + "value": 0 + }, + { + "type": "int", + "name": "GIT_STASH_KEEP_INDEX", + "comments": "

All changes already added to the index are left intact in\n the working directory

\n", + "value": 1 + }, + { + "type": "int", + "name": "GIT_STASH_INCLUDE_UNTRACKED", + "comments": "

All untracked files are also stashed and then cleaned up\n from the working directory

\n", + "value": 2 + }, + { + "type": "int", + "name": "GIT_STASH_INCLUDE_IGNORED", + "comments": "

All ignored files are also stashed and then cleaned up from\n the working directory

\n", + "value": 4 + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_status_list", + { + "decl": "git_status_list", + "type": "struct", + "value": "git_status_list", + "file": "types.h", + "line": 184, + "lineto": 184, + "tdef": "typedef", + "description": " Representation of a status collection ", + "comments": "", + "used": { + "returns": [], + "needs": [ + "git_status_byindex", + "git_status_list_entrycount", + "git_status_list_free", + "git_status_list_get_perfdata", + "git_status_list_new" + ] + } + } + ], + [ + "git_status_opt_t", + { + "decl": [ + "GIT_STATUS_OPT_INCLUDE_UNTRACKED", + "GIT_STATUS_OPT_INCLUDE_IGNORED", + "GIT_STATUS_OPT_INCLUDE_UNMODIFIED", + "GIT_STATUS_OPT_EXCLUDE_SUBMODULES", + "GIT_STATUS_OPT_RECURSE_UNTRACKED_DIRS", + "GIT_STATUS_OPT_DISABLE_PATHSPEC_MATCH", + "GIT_STATUS_OPT_RECURSE_IGNORED_DIRS", + "GIT_STATUS_OPT_RENAMES_HEAD_TO_INDEX", + "GIT_STATUS_OPT_RENAMES_INDEX_TO_WORKDIR", + "GIT_STATUS_OPT_SORT_CASE_SENSITIVELY", + "GIT_STATUS_OPT_SORT_CASE_INSENSITIVELY", + "GIT_STATUS_OPT_RENAMES_FROM_REWRITES", + "GIT_STATUS_OPT_NO_REFRESH", + "GIT_STATUS_OPT_UPDATE_INDEX", + "GIT_STATUS_OPT_INCLUDE_UNREADABLE", + "GIT_STATUS_OPT_INCLUDE_UNREADABLE_AS_UNTRACKED" + ], + "type": "enum", + "file": "status.h", + "line": 137, + "lineto": 154, + "block": "GIT_STATUS_OPT_INCLUDE_UNTRACKED\nGIT_STATUS_OPT_INCLUDE_IGNORED\nGIT_STATUS_OPT_INCLUDE_UNMODIFIED\nGIT_STATUS_OPT_EXCLUDE_SUBMODULES\nGIT_STATUS_OPT_RECURSE_UNTRACKED_DIRS\nGIT_STATUS_OPT_DISABLE_PATHSPEC_MATCH\nGIT_STATUS_OPT_RECURSE_IGNORED_DIRS\nGIT_STATUS_OPT_RENAMES_HEAD_TO_INDEX\nGIT_STATUS_OPT_RENAMES_INDEX_TO_WORKDIR\nGIT_STATUS_OPT_SORT_CASE_SENSITIVELY\nGIT_STATUS_OPT_SORT_CASE_INSENSITIVELY\nGIT_STATUS_OPT_RENAMES_FROM_REWRITES\nGIT_STATUS_OPT_NO_REFRESH\nGIT_STATUS_OPT_UPDATE_INDEX\nGIT_STATUS_OPT_INCLUDE_UNREADABLE\nGIT_STATUS_OPT_INCLUDE_UNREADABLE_AS_UNTRACKED", + "tdef": "typedef", + "description": " Flags to control status callbacks", + "comments": "
    \n
  • GIT_STATUS_OPT_INCLUDE_UNTRACKED says that callbacks should be made\non untracked files. These will only be made if the workdir files are\nincluded in the status "show" option.
    • \n
  • GIT_STATUS_OPT_INCLUDE_IGNORED says that ignored files get callbacks.\nAgain, these callbacks will only be made if the workdir files are\nincluded in the status "show" option.
    • \n
  • GIT_STATUS_OPT_INCLUDE_UNMODIFIED indicates that callback should be\nmade even on unmodified files.
    • \n
  • GIT_STATUS_OPT_EXCLUDE_SUBMODULES indicates that submodules should be\nskipped. This only applies if there are no pending typechanges to\nthe submodule (either from or to another type).
    • \n
  • GIT_STATUS_OPT_RECURSE_UNTRACKED_DIRS indicates that all files in\nuntracked directories should be included. Normally if an entire\ndirectory is new, then just the top-level directory is included (with\na trailing slash on the entry name). This flag says to include all\nof the individual files in the directory instead.
    • \n
  • GIT_STATUS_OPT_DISABLE_PATHSPEC_MATCH indicates that the given path\nshould be treated as a literal path, and not as a pathspec pattern.
    • \n
  • GIT_STATUS_OPT_RECURSE_IGNORED_DIRS indicates that the contents of\nignored directories should be included in the status. This is like\ndoing git ls-files -o -i --exclude-standard with core git.
    • \n
  • GIT_STATUS_OPT_RENAMES_HEAD_TO_INDEX indicates that rename detection\nshould be processed between the head and the index and enables\nthe GIT_STATUS_INDEX_RENAMED as a possible status flag.
    • \n
  • GIT_STATUS_OPT_RENAMES_INDEX_TO_WORKDIR indicates that rename\ndetection should be run between the index and the working directory\nand enabled GIT_STATUS_WT_RENAMED as a possible status flag.
    • \n
  • GIT_STATUS_OPT_SORT_CASE_SENSITIVELY overrides the native case\nsensitivity for the file system and forces the output to be in\ncase-sensitive order
    • \n
  • GIT_STATUS_OPT_SORT_CASE_INSENSITIVELY overrides the native case\nsensitivity for the file system and forces the output to be in\ncase-insensitive order
    • \n
  • GIT_STATUS_OPT_RENAMES_FROM_REWRITES indicates that rename detection\nshould include rewritten files
    • \n
  • GIT_STATUS_OPT_NO_REFRESH bypasses the default status behavior of\ndoing a "soft" index reload (i.e. reloading the index data if the\nfile on disk has been modified outside libgit2).
    • \n
  • GIT_STATUS_OPT_UPDATE_INDEX tells libgit2 to refresh the stat cache\nin the index for files that are unchanged but have out of date stat\ninformation in the index. It will result in less work being done on\nsubsequent calls to get status. This is mutually exclusive with the\nNO_REFRESH option.
    • \n
\n\n

Calling git_status_foreach() is like calling the extended version\n with: GIT_STATUS_OPT_INCLUDE_IGNORED, GIT_STATUS_OPT_INCLUDE_UNTRACKED,\n and GIT_STATUS_OPT_RECURSE_UNTRACKED_DIRS. Those options are bundled\n together as GIT_STATUS_OPT_DEFAULTS if you want them as a baseline.

\n", + "fields": [ + { + "type": "int", + "name": "GIT_STATUS_OPT_INCLUDE_UNTRACKED", + "comments": "", + "value": 1 + }, + { + "type": "int", + "name": "GIT_STATUS_OPT_INCLUDE_IGNORED", + "comments": "", + "value": 2 + }, + { + "type": "int", + "name": "GIT_STATUS_OPT_INCLUDE_UNMODIFIED", + "comments": "", + "value": 4 + }, + { + "type": "int", + "name": "GIT_STATUS_OPT_EXCLUDE_SUBMODULES", + "comments": "", + "value": 8 + }, + { + "type": "int", + "name": "GIT_STATUS_OPT_RECURSE_UNTRACKED_DIRS", + "comments": "", + "value": 16 + }, + { + "type": "int", + "name": "GIT_STATUS_OPT_DISABLE_PATHSPEC_MATCH", + "comments": "", + "value": 32 + }, + { + "type": "int", + "name": "GIT_STATUS_OPT_RECURSE_IGNORED_DIRS", + "comments": "", + "value": 64 + }, + { + "type": "int", + "name": "GIT_STATUS_OPT_RENAMES_HEAD_TO_INDEX", + "comments": "", + "value": 128 + }, + { + "type": "int", + "name": "GIT_STATUS_OPT_RENAMES_INDEX_TO_WORKDIR", + "comments": "", + "value": 256 + }, + { + "type": "int", + "name": "GIT_STATUS_OPT_SORT_CASE_SENSITIVELY", + "comments": "", + "value": 512 + }, + { + "type": "int", + "name": "GIT_STATUS_OPT_SORT_CASE_INSENSITIVELY", + "comments": "", + "value": 1024 + }, + { + "type": "int", + "name": "GIT_STATUS_OPT_RENAMES_FROM_REWRITES", + "comments": "", + "value": 2048 + }, + { + "type": "int", + "name": "GIT_STATUS_OPT_NO_REFRESH", + "comments": "", + "value": 4096 + }, + { + "type": "int", + "name": "GIT_STATUS_OPT_UPDATE_INDEX", + "comments": "", + "value": 8192 + }, + { + "type": "int", + "name": "GIT_STATUS_OPT_INCLUDE_UNREADABLE", + "comments": "", + "value": 16384 + }, + { + "type": "int", + "name": "GIT_STATUS_OPT_INCLUDE_UNREADABLE_AS_UNTRACKED", + "comments": "", + "value": 32768 + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_status_show_t", + { + "decl": [ + "GIT_STATUS_SHOW_INDEX_AND_WORKDIR", + "GIT_STATUS_SHOW_INDEX_ONLY", + "GIT_STATUS_SHOW_WORKDIR_ONLY" + ], + "type": "enum", + "file": "status.h", + "line": 79, + "lineto": 83, + "block": "GIT_STATUS_SHOW_INDEX_AND_WORKDIR\nGIT_STATUS_SHOW_INDEX_ONLY\nGIT_STATUS_SHOW_WORKDIR_ONLY", + "tdef": "typedef", + "description": " Select the files on which to report status.", + "comments": "

With git_status_foreach_ext, this will control which changes get\n callbacks. With git_status_list_new, these will control which\n changes are included in the list.

\n\n
    \n
  • GIT_STATUS_SHOW_INDEX_AND_WORKDIR is the default. This roughly\nmatches git status --porcelain regarding which files are\nincluded and in what order.
    • \n
  • GIT_STATUS_SHOW_INDEX_ONLY only gives status based on HEAD to index\ncomparison, not looking at working directory changes.
    • \n
  • GIT_STATUS_SHOW_WORKDIR_ONLY only gives status based on index to\nworking directory comparison, not comparing the index to the HEAD.
    • \n
\n", + "fields": [ + { + "type": "int", + "name": "GIT_STATUS_SHOW_INDEX_AND_WORKDIR", + "comments": "", + "value": 0 + }, + { + "type": "int", + "name": "GIT_STATUS_SHOW_INDEX_ONLY", + "comments": "", + "value": 1 + }, + { + "type": "int", + "name": "GIT_STATUS_SHOW_WORKDIR_ONLY", + "comments": "", + "value": 2 + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_status_t", + { + "decl": [ + "GIT_STATUS_CURRENT", + "GIT_STATUS_INDEX_NEW", + "GIT_STATUS_INDEX_MODIFIED", + "GIT_STATUS_INDEX_DELETED", + "GIT_STATUS_INDEX_RENAMED", + "GIT_STATUS_INDEX_TYPECHANGE", + "GIT_STATUS_WT_NEW", + "GIT_STATUS_WT_MODIFIED", + "GIT_STATUS_WT_DELETED", + "GIT_STATUS_WT_TYPECHANGE", + "GIT_STATUS_WT_RENAMED", + "GIT_STATUS_WT_UNREADABLE", + "GIT_STATUS_IGNORED", + "GIT_STATUS_CONFLICTED" + ], + "type": "enum", + "file": "status.h", + "line": 32, + "lineto": 50, + "block": "GIT_STATUS_CURRENT\nGIT_STATUS_INDEX_NEW\nGIT_STATUS_INDEX_MODIFIED\nGIT_STATUS_INDEX_DELETED\nGIT_STATUS_INDEX_RENAMED\nGIT_STATUS_INDEX_TYPECHANGE\nGIT_STATUS_WT_NEW\nGIT_STATUS_WT_MODIFIED\nGIT_STATUS_WT_DELETED\nGIT_STATUS_WT_TYPECHANGE\nGIT_STATUS_WT_RENAMED\nGIT_STATUS_WT_UNREADABLE\nGIT_STATUS_IGNORED\nGIT_STATUS_CONFLICTED", + "tdef": "typedef", + "description": " Status flags for a single file.", + "comments": "

A combination of these values will be returned to indicate the status of\n a file. Status compares the working directory, the index, and the\n current HEAD of the repository. The GIT_STATUS_INDEX set of flags\n represents the status of file in the index relative to the HEAD, and the\n GIT_STATUS_WT set of flags represent the status of the file in the\n working directory relative to the index.

\n", + "fields": [ + { + "type": "int", + "name": "GIT_STATUS_CURRENT", + "comments": "", + "value": 0 + }, + { + "type": "int", + "name": "GIT_STATUS_INDEX_NEW", + "comments": "", + "value": 1 + }, + { + "type": "int", + "name": "GIT_STATUS_INDEX_MODIFIED", + "comments": "", + "value": 2 + }, + { + "type": "int", + "name": "GIT_STATUS_INDEX_DELETED", + "comments": "", + "value": 4 + }, + { + "type": "int", + "name": "GIT_STATUS_INDEX_RENAMED", + "comments": "", + "value": 8 + }, + { + "type": "int", + "name": "GIT_STATUS_INDEX_TYPECHANGE", + "comments": "", + "value": 16 + }, + { + "type": "int", + "name": "GIT_STATUS_WT_NEW", + "comments": "", + "value": 128 + }, + { + "type": "int", + "name": "GIT_STATUS_WT_MODIFIED", + "comments": "", + "value": 256 + }, + { + "type": "int", + "name": "GIT_STATUS_WT_DELETED", + "comments": "", + "value": 512 + }, + { + "type": "int", + "name": "GIT_STATUS_WT_TYPECHANGE", + "comments": "", + "value": 1024 + }, + { + "type": "int", + "name": "GIT_STATUS_WT_RENAMED", + "comments": "", + "value": 2048 + }, + { + "type": "int", + "name": "GIT_STATUS_WT_UNREADABLE", + "comments": "", + "value": 4096 + }, + { + "type": "int", + "name": "GIT_STATUS_IGNORED", + "comments": "", + "value": 16384 + }, + { + "type": "int", + "name": "GIT_STATUS_CONFLICTED", + "comments": "", + "value": 32768 + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_strarray", + { + "decl": [ + "char ** strings", + "size_t count" + ], + "type": "struct", + "value": "git_strarray", + "file": "strarray.h", + "line": 22, + "lineto": 25, + "block": "char ** strings\nsize_t count", + "tdef": "typedef", + "description": " Array of strings ", + "comments": "", + "fields": [ + { + "type": "char **", + "name": "strings", + "comments": "" + }, + { + "type": "size_t", + "name": "count", + "comments": "" + } + ], + "used": { + "returns": [], + "needs": [ + "git_index_add_all", + "git_index_remove_all", + "git_index_update_all", + "git_pathspec_new", + "git_reference_list", + "git_remote_download", + "git_remote_fetch", + "git_remote_get_fetch_refspecs", + "git_remote_get_push_refspecs", + "git_remote_list", + "git_remote_push", + "git_remote_rename", + "git_remote_upload", + "git_reset_default", + "git_strarray_copy", + "git_strarray_free", + "git_tag_list", + "git_tag_list_match" + ] + } + } + ], + [ + "git_stream", + { + "decl": [ + "int version", + "int encrypted", + "int proxy_support", + "int (*)(struct git_stream *) connect", + "int (*)(git_cert **, struct git_stream *) certificate", + "int (*)(struct git_stream *, const char *) set_proxy", + "ssize_t (*)(struct git_stream *, void *, size_t) read", + "ssize_t (*)(struct git_stream *, const char *, size_t, int) write", + "int (*)(struct git_stream *) close", + "void (*)(struct git_stream *) free" + ], + "type": "struct", + "value": "git_stream", + "file": "sys/stream.h", + "line": 28, + "lineto": 40, + "block": "int version\nint encrypted\nint proxy_support\nint (*)(struct git_stream *) connect\nint (*)(git_cert **, struct git_stream *) certificate\nint (*)(struct git_stream *, const char *) set_proxy\nssize_t (*)(struct git_stream *, void *, size_t) read\nssize_t (*)(struct git_stream *, const char *, size_t, int) write\nint (*)(struct git_stream *) close\nvoid (*)(struct git_stream *) free", + "tdef": "typedef", + "description": " Every stream must have this struct as its first element, so the\n API can talk to it. You'd define your stream as", + "comments": "
 struct my_stream {\n         git_stream parent;\n         ...\n }\n
\n\n

and fill the functions

\n", + "fields": [ + { + "type": "int", + "name": "version", + "comments": "" + }, + { + "type": "int", + "name": "encrypted", + "comments": "" + }, + { + "type": "int", + "name": "proxy_support", + "comments": "" + }, + { + "type": "int (*)(struct git_stream *)", + "name": "connect", + "comments": "" + }, + { + "type": "int (*)(git_cert **, struct git_stream *)", + "name": "certificate", + "comments": "" + }, + { + "type": "int (*)(struct git_stream *, const char *)", + "name": "set_proxy", + "comments": "" + }, + { + "type": "ssize_t (*)(struct git_stream *, void *, size_t)", + "name": "read", + "comments": "" + }, + { + "type": "ssize_t (*)(struct git_stream *, const char *, size_t, int)", + "name": "write", + "comments": "" + }, + { + "type": "int (*)(struct git_stream *)", + "name": "close", + "comments": "" + }, + { + "type": "void (*)(struct git_stream *)", + "name": "free", + "comments": "" + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_submodule", + { + "decl": "git_submodule", + "type": "struct", + "value": "git_submodule", + "file": "types.h", + "line": 335, + "lineto": 335, + "tdef": "typedef", + "description": " Opaque structure representing a submodule.", + "comments": "", + "used": { + "returns": [], + "needs": [ + "git_submodule_add_finalize", + "git_submodule_add_setup", + "git_submodule_add_to_index", + "git_submodule_branch", + "git_submodule_fetch_recurse_submodules", + "git_submodule_foreach", + "git_submodule_free", + "git_submodule_head_id", + "git_submodule_ignore", + "git_submodule_index_id", + "git_submodule_init", + "git_submodule_location", + "git_submodule_lookup", + "git_submodule_name", + "git_submodule_open", + "git_submodule_owner", + "git_submodule_path", + "git_submodule_reload", + "git_submodule_repo_init", + "git_submodule_sync", + "git_submodule_update", + "git_submodule_update_strategy", + "git_submodule_url", + "git_submodule_wd_id" + ] + } + } + ], + [ + "git_submodule_ignore_t", + { + "decl": [ + "GIT_SUBMODULE_IGNORE_UNSPECIFIED", + "GIT_SUBMODULE_IGNORE_NONE", + "GIT_SUBMODULE_IGNORE_UNTRACKED", + "GIT_SUBMODULE_IGNORE_DIRTY", + "GIT_SUBMODULE_IGNORE_ALL" + ], + "type": "enum", + "file": "types.h", + "line": 399, + "lineto": 406, + "block": "GIT_SUBMODULE_IGNORE_UNSPECIFIED\nGIT_SUBMODULE_IGNORE_NONE\nGIT_SUBMODULE_IGNORE_UNTRACKED\nGIT_SUBMODULE_IGNORE_DIRTY\nGIT_SUBMODULE_IGNORE_ALL", + "tdef": "typedef", + "description": " Submodule ignore values", + "comments": "

These values represent settings for the submodule.$name.ignore\n configuration value which says how deeply to look at the working\n directory when getting submodule status.

\n\n

You can override this value in memory on a per-submodule basis with\n git_submodule_set_ignore() and can write the changed value to disk\n with git_submodule_save(). If you have overwritten the value, you\n can revert to the on disk value by using GIT_SUBMODULE_IGNORE_RESET.

\n\n

The values are:

\n\n
    \n
  • GIT_SUBMODULE_IGNORE_UNSPECIFIED: use the submodule's configuration
    • \n
  • GIT_SUBMODULE_IGNORE_NONE: don't ignore any change - i.e. even an\nuntracked file, will mark the submodule as dirty. Ignored files are\nstill ignored, of course.
    • \n
  • GIT_SUBMODULE_IGNORE_UNTRACKED: ignore untracked files; only changes\nto tracked files, or the index or the HEAD commit will matter.
    • \n
  • GIT_SUBMODULE_IGNORE_DIRTY: ignore changes in the working directory,\nonly considering changes if the HEAD of submodule has moved from the\nvalue in the superproject.
    • \n
  • GIT_SUBMODULE_IGNORE_ALL: never check if the submodule is dirty
    • \n
  • GIT_SUBMODULE_IGNORE_DEFAULT: not used except as static initializer\nwhen we don't want any particular ignore rule to be specified.
    • \n
\n", + "fields": [ + { + "type": "int", + "name": "GIT_SUBMODULE_IGNORE_UNSPECIFIED", + "comments": "

use the submodule's configuration

\n", + "value": -1 + }, + { + "type": "int", + "name": "GIT_SUBMODULE_IGNORE_NONE", + "comments": "

any change or untracked == dirty

\n", + "value": 1 + }, + { + "type": "int", + "name": "GIT_SUBMODULE_IGNORE_UNTRACKED", + "comments": "

dirty if tracked files change

\n", + "value": 2 + }, + { + "type": "int", + "name": "GIT_SUBMODULE_IGNORE_DIRTY", + "comments": "

only dirty if HEAD moved

\n", + "value": 3 + }, + { + "type": "int", + "name": "GIT_SUBMODULE_IGNORE_ALL", + "comments": "

never dirty

\n", + "value": 4 + } + ], + "used": { + "returns": [], + "needs": [ + "git_submodule_set_ignore", + "git_submodule_status" + ] + } + } + ], + [ + "git_submodule_recurse_t", + { + "decl": [ + "GIT_SUBMODULE_RECURSE_NO", + "GIT_SUBMODULE_RECURSE_YES", + "GIT_SUBMODULE_RECURSE_ONDEMAND" + ], + "type": "enum", + "file": "types.h", + "line": 418, + "lineto": 422, + "block": "GIT_SUBMODULE_RECURSE_NO\nGIT_SUBMODULE_RECURSE_YES\nGIT_SUBMODULE_RECURSE_ONDEMAND", + "tdef": "typedef", + "description": " Options for submodule recurse.", + "comments": "

Represent the value of submodule.$name.fetchRecurseSubmodules

\n\n
    \n
  • GIT_SUBMODULE_RECURSE_NO - do no recurse into submodules
    • \n
  • GIT_SUBMODULE_RECURSE_YES - recurse into submodules
    • \n
  • GIT_SUBMODULE_RECURSE_ONDEMAND - recurse into submodules only when\n commit not already in local clone
    • \n
\n", + "fields": [ + { + "type": "int", + "name": "GIT_SUBMODULE_RECURSE_NO", + "comments": "", + "value": 0 + }, + { + "type": "int", + "name": "GIT_SUBMODULE_RECURSE_YES", + "comments": "", + "value": 1 + }, + { + "type": "int", + "name": "GIT_SUBMODULE_RECURSE_ONDEMAND", + "comments": "", + "value": 2 + } + ], + "used": { + "returns": [], + "needs": [ + "git_submodule_set_fetch_recurse_submodules" + ] + } + } + ], + [ + "git_submodule_status_t", + { + "decl": [ + "GIT_SUBMODULE_STATUS_IN_HEAD", + "GIT_SUBMODULE_STATUS_IN_INDEX", + "GIT_SUBMODULE_STATUS_IN_CONFIG", + "GIT_SUBMODULE_STATUS_IN_WD", + "GIT_SUBMODULE_STATUS_INDEX_ADDED", + "GIT_SUBMODULE_STATUS_INDEX_DELETED", + "GIT_SUBMODULE_STATUS_INDEX_MODIFIED", + "GIT_SUBMODULE_STATUS_WD_UNINITIALIZED", + "GIT_SUBMODULE_STATUS_WD_ADDED", + "GIT_SUBMODULE_STATUS_WD_DELETED", + "GIT_SUBMODULE_STATUS_WD_MODIFIED", + "GIT_SUBMODULE_STATUS_WD_INDEX_MODIFIED", + "GIT_SUBMODULE_STATUS_WD_WD_MODIFIED", + "GIT_SUBMODULE_STATUS_WD_UNTRACKED" + ], + "type": "enum", + "file": "submodule.h", + "line": 74, + "lineto": 89, + "block": "GIT_SUBMODULE_STATUS_IN_HEAD\nGIT_SUBMODULE_STATUS_IN_INDEX\nGIT_SUBMODULE_STATUS_IN_CONFIG\nGIT_SUBMODULE_STATUS_IN_WD\nGIT_SUBMODULE_STATUS_INDEX_ADDED\nGIT_SUBMODULE_STATUS_INDEX_DELETED\nGIT_SUBMODULE_STATUS_INDEX_MODIFIED\nGIT_SUBMODULE_STATUS_WD_UNINITIALIZED\nGIT_SUBMODULE_STATUS_WD_ADDED\nGIT_SUBMODULE_STATUS_WD_DELETED\nGIT_SUBMODULE_STATUS_WD_MODIFIED\nGIT_SUBMODULE_STATUS_WD_INDEX_MODIFIED\nGIT_SUBMODULE_STATUS_WD_WD_MODIFIED\nGIT_SUBMODULE_STATUS_WD_UNTRACKED", + "tdef": "typedef", + "description": " Return codes for submodule status.", + "comments": "

A combination of these flags will be returned to describe the status of a\n submodule. Depending on the "ignore" property of the submodule, some of\n the flags may never be returned because they indicate changes that are\n supposed to be ignored.

\n\n

Submodule info is contained in 4 places: the HEAD tree, the index, config\n files (both .git/config and .gitmodules), and the working directory. Any\n or all of those places might be missing information about the submodule\n depending on what state the repo is in. We consider all four places to\n build the combination of status flags.

\n\n

There are four values that are not really status, but give basic info\n about what sources of submodule data are available. These will be\n returned even if ignore is set to "ALL".

\n\n
    \n
  • IN_HEAD - superproject head contains submodule
    • \n
  • IN_INDEX - superproject index contains submodule
    • \n
  • IN_CONFIG - superproject gitmodules has submodule
    • \n
  • IN_WD - superproject workdir has submodule
    • \n
\n\n

The following values will be returned so long as ignore is not "ALL".

\n\n
    \n
  • INDEX_ADDED - in index, not in head
    • \n
  • INDEX_DELETED - in head, not in index
    • \n
  • INDEX_MODIFIED - index and head don't match
    • \n
  • WD_UNINITIALIZED - workdir contains empty directory
    • \n
  • WD_ADDED - in workdir, not index
    • \n
  • WD_DELETED - in index, not workdir
    • \n
  • WD_MODIFIED - index and workdir head don't match
    • \n
\n\n

The following can only be returned if ignore is "NONE" or "UNTRACKED".

\n\n
    \n
  • WD_INDEX_MODIFIED - submodule workdir index is dirty
    • \n
  • WD_WD_MODIFIED - submodule workdir has modified files
    • \n
\n\n

Lastly, the following will only be returned for ignore "NONE".

\n\n
    \n
  • WD_UNTRACKED - wd contains untracked files
    • \n
\n", + "fields": [ + { + "type": "int", + "name": "GIT_SUBMODULE_STATUS_IN_HEAD", + "comments": "", + "value": 1 + }, + { + "type": "int", + "name": "GIT_SUBMODULE_STATUS_IN_INDEX", + "comments": "", + "value": 2 + }, + { + "type": "int", + "name": "GIT_SUBMODULE_STATUS_IN_CONFIG", + "comments": "", + "value": 4 + }, + { + "type": "int", + "name": "GIT_SUBMODULE_STATUS_IN_WD", + "comments": "", + "value": 8 + }, + { + "type": "int", + "name": "GIT_SUBMODULE_STATUS_INDEX_ADDED", + "comments": "", + "value": 16 + }, + { + "type": "int", + "name": "GIT_SUBMODULE_STATUS_INDEX_DELETED", + "comments": "", + "value": 32 + }, + { + "type": "int", + "name": "GIT_SUBMODULE_STATUS_INDEX_MODIFIED", + "comments": "", + "value": 64 + }, + { + "type": "int", + "name": "GIT_SUBMODULE_STATUS_WD_UNINITIALIZED", + "comments": "", + "value": 128 + }, + { + "type": "int", + "name": "GIT_SUBMODULE_STATUS_WD_ADDED", + "comments": "", + "value": 256 + }, + { + "type": "int", + "name": "GIT_SUBMODULE_STATUS_WD_DELETED", + "comments": "", + "value": 512 + }, + { + "type": "int", + "name": "GIT_SUBMODULE_STATUS_WD_MODIFIED", + "comments": "", + "value": 1024 + }, + { + "type": "int", + "name": "GIT_SUBMODULE_STATUS_WD_INDEX_MODIFIED", + "comments": "", + "value": 2048 + }, + { + "type": "int", + "name": "GIT_SUBMODULE_STATUS_WD_WD_MODIFIED", + "comments": "", + "value": 4096 + }, + { + "type": "int", + "name": "GIT_SUBMODULE_STATUS_WD_UNTRACKED", + "comments": "", + "value": 8192 + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_submodule_update_options", + { + "decl": [ + "unsigned int version", + "git_checkout_options checkout_opts", + "git_fetch_options fetch_opts", + "unsigned int clone_checkout_strategy" + ], + "type": "struct", + "value": "git_submodule_update_options", + "file": "submodule.h", + "line": 118, + "lineto": 146, + "block": "unsigned int version\ngit_checkout_options checkout_opts\ngit_fetch_options fetch_opts\nunsigned int clone_checkout_strategy", + "tdef": "typedef", + "description": " Submodule update options structure", + "comments": "

Use the GIT_SUBMODULE_UPDATE_OPTIONS_INIT to get the default settings,\n like this:

\n\n

git_submodule_update_options opts = GIT_SUBMODULE_UPDATE_OPTIONS_INIT;

\n", + "fields": [ + { + "type": "unsigned int", + "name": "version", + "comments": "" + }, + { + "type": "git_checkout_options", + "name": "checkout_opts", + "comments": " These options are passed to the checkout step. To disable\n checkout, set the `checkout_strategy` to\n `GIT_CHECKOUT_NONE`. Generally you will want the use\n GIT_CHECKOUT_SAFE to update files in the working\n directory. Use the `clone_checkout_strategy` field\n to set the checkout strategy that will be used in\n the case where update needs to clone the repository." + }, + { + "type": "git_fetch_options", + "name": "fetch_opts", + "comments": " Options which control the fetch, including callbacks.\n\n The callbacks to use for reporting fetch progress, and for acquiring\n credentials in the event they are needed." + }, + { + "type": "unsigned int", + "name": "clone_checkout_strategy", + "comments": " The checkout strategy to use when the sub repository needs to\n be cloned. Use GIT_CHECKOUT_SAFE to create all files\n in the working directory for the newly cloned repository." + } + ], + "used": { + "returns": [], + "needs": [ + "git_submodule_update", + "git_submodule_update_init_options" + ] + } + } + ], + [ + "git_submodule_update_t", + { + "decl": [ + "GIT_SUBMODULE_UPDATE_CHECKOUT", + "GIT_SUBMODULE_UPDATE_REBASE", + "GIT_SUBMODULE_UPDATE_MERGE", + "GIT_SUBMODULE_UPDATE_NONE", + "GIT_SUBMODULE_UPDATE_DEFAULT" + ], + "type": "enum", + "file": "types.h", + "line": 363, + "lineto": 370, + "block": "GIT_SUBMODULE_UPDATE_CHECKOUT\nGIT_SUBMODULE_UPDATE_REBASE\nGIT_SUBMODULE_UPDATE_MERGE\nGIT_SUBMODULE_UPDATE_NONE\nGIT_SUBMODULE_UPDATE_DEFAULT", + "tdef": "typedef", + "description": " Submodule update values", + "comments": "

These values represent settings for the submodule.$name.update\n configuration value which says how to handle git submodule update for\n this submodule. The value is usually set in the ".gitmodules" file and\n copied to ".git/config" when the submodule is initialized.

\n\n

You can override this setting on a per-submodule basis with\n git_submodule_set_update() and write the changed value to disk using\n git_submodule_save(). If you have overwritten the value, you can\n revert it by passing GIT_SUBMODULE_UPDATE_RESET to the set function.

\n\n

The values are:

\n\n
    \n
  • GIT_SUBMODULE_UPDATE_CHECKOUT: the default; when a submodule is\nupdated, checkout the new detached HEAD to the submodule directory.
    • \n
  • GIT_SUBMODULE_UPDATE_REBASE: update by rebasing the current checked\nout branch onto the commit from the superproject.
    • \n
  • GIT_SUBMODULE_UPDATE_MERGE: update by merging the commit in the\nsuperproject into the current checkout out branch of the submodule.
    • \n
  • GIT_SUBMODULE_UPDATE_NONE: do not update this submodule even when\nthe commit in the superproject is updated.
    • \n
  • GIT_SUBMODULE_UPDATE_DEFAULT: not used except as static initializer\nwhen we don't want any particular update rule to be specified.
    • \n
\n", + "fields": [ + { + "type": "int", + "name": "GIT_SUBMODULE_UPDATE_CHECKOUT", + "comments": "", + "value": 1 + }, + { + "type": "int", + "name": "GIT_SUBMODULE_UPDATE_REBASE", + "comments": "", + "value": 2 + }, + { + "type": "int", + "name": "GIT_SUBMODULE_UPDATE_MERGE", + "comments": "", + "value": 3 + }, + { + "type": "int", + "name": "GIT_SUBMODULE_UPDATE_NONE", + "comments": "", + "value": 4 + }, + { + "type": "int", + "name": "GIT_SUBMODULE_UPDATE_DEFAULT", + "comments": "", + "value": 0 + } + ], + "used": { + "returns": [], + "needs": [ + "git_submodule_set_update" + ] + } + } + ], + [ + "git_tag", + { + "decl": "git_tag", + "type": "struct", + "value": "git_tag", + "file": "types.h", + "line": 114, + "lineto": 114, + "tdef": "typedef", + "description": " Parsed representation of a tag object. ", + "comments": "", + "used": { + "returns": [], + "needs": [ + "git_tag_free", + "git_tag_id", + "git_tag_lookup", + "git_tag_lookup_prefix", + "git_tag_message", + "git_tag_name", + "git_tag_owner", + "git_tag_peel", + "git_tag_tagger", + "git_tag_target", + "git_tag_target_id", + "git_tag_target_type" + ] + } + } + ], + [ + "git_time", + { + "decl": [ + "git_time_t time", + "int offset" + ], + "type": "struct", + "value": "git_time", + "file": "types.h", + "line": 156, + "lineto": 159, + "block": "git_time_t time\nint offset", + "tdef": "typedef", + "description": " Time in a signature ", + "comments": "", + "fields": [ + { + "type": "git_time_t", + "name": "time", + "comments": " time in seconds from epoch " + }, + { + "type": "int", + "name": "offset", + "comments": " timezone offset, in minutes " + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_trace_level_t", + { + "decl": [ + "GIT_TRACE_NONE", + "GIT_TRACE_FATAL", + "GIT_TRACE_ERROR", + "GIT_TRACE_WARN", + "GIT_TRACE_INFO", + "GIT_TRACE_DEBUG", + "GIT_TRACE_TRACE" + ], + "type": "enum", + "file": "trace.h", + "line": 26, + "lineto": 47, + "block": "GIT_TRACE_NONE\nGIT_TRACE_FATAL\nGIT_TRACE_ERROR\nGIT_TRACE_WARN\nGIT_TRACE_INFO\nGIT_TRACE_DEBUG\nGIT_TRACE_TRACE", + "tdef": "typedef", + "description": " Available tracing levels. When tracing is set to a particular level,\n callers will be provided tracing at the given level and all lower levels.", + "comments": "", + "fields": [ + { + "type": "int", + "name": "GIT_TRACE_NONE", + "comments": "

No tracing will be performed.

\n", + "value": 0 + }, + { + "type": "int", + "name": "GIT_TRACE_FATAL", + "comments": "

Severe errors that may impact the program's execution

\n", + "value": 1 + }, + { + "type": "int", + "name": "GIT_TRACE_ERROR", + "comments": "

Errors that do not impact the program's execution

\n", + "value": 2 + }, + { + "type": "int", + "name": "GIT_TRACE_WARN", + "comments": "

Warnings that suggest abnormal data

\n", + "value": 3 + }, + { + "type": "int", + "name": "GIT_TRACE_INFO", + "comments": "

Informational messages about program execution

\n", + "value": 4 + }, + { + "type": "int", + "name": "GIT_TRACE_DEBUG", + "comments": "

Detailed data that allows for debugging

\n", + "value": 5 + }, + { + "type": "int", + "name": "GIT_TRACE_TRACE", + "comments": "

Exceptionally detailed debugging data

\n", + "value": 6 + } + ], + "used": { + "returns": [], + "needs": [ + "git_trace_set" + ] + } + } + ], + [ + "git_transaction", + { + "decl": "git_transaction", + "type": "struct", + "value": "git_transaction", + "file": "types.h", + "line": 175, + "lineto": 175, + "tdef": "typedef", + "description": " Transactional interface to references ", + "comments": "", + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_transfer_progress", + { + "decl": [ + "unsigned int total_objects", + "unsigned int indexed_objects", + "unsigned int received_objects", + "unsigned int local_objects", + "unsigned int total_deltas", + "unsigned int indexed_deltas", + "size_t received_bytes" + ], + "type": "struct", + "value": "git_transfer_progress", + "file": "types.h", + "line": 253, + "lineto": 261, + "block": "unsigned int total_objects\nunsigned int indexed_objects\nunsigned int received_objects\nunsigned int local_objects\nunsigned int total_deltas\nunsigned int indexed_deltas\nsize_t received_bytes", + "tdef": "typedef", + "description": " This is passed as the first argument to the callback to allow the\n user to see the progress.", + "comments": "
    \n
  • total_objects: number of objects in the packfile being downloaded
    • \n
  • indexed_objects: received objects that have been hashed
    • \n
  • received_objects: objects which have been downloaded
    • \n
  • local_objects: locally-available objects that have been injected\nin order to fix a thin pack.
    • \n
  • received-bytes: size of the packfile received up to now
    • \n
\n", + "fields": [ + { + "type": "unsigned int", + "name": "total_objects", + "comments": "" + }, + { + "type": "unsigned int", + "name": "indexed_objects", + "comments": "" + }, + { + "type": "unsigned int", + "name": "received_objects", + "comments": "" + }, + { + "type": "unsigned int", + "name": "local_objects", + "comments": "" + }, + { + "type": "unsigned int", + "name": "total_deltas", + "comments": "" + }, + { + "type": "unsigned int", + "name": "indexed_deltas", + "comments": "" + }, + { + "type": "size_t", + "name": "received_bytes", + "comments": "" + } + ], + "used": { + "returns": [ + "git_remote_stats" + ], + "needs": [ + "git_indexer_append", + "git_indexer_commit" + ] + } + } + ], + [ + "git_transport", + { + "decl": "git_transport", + "type": "struct", + "value": "git_transport", + "file": "types.h", + "line": 230, + "lineto": 230, + "tdef": "typedef", + "description": " Interface which represents a transport to communicate with a\n remote.", + "comments": "", + "used": { + "returns": [], + "needs": [ + "git_smart_subtransport_git", + "git_smart_subtransport_http", + "git_smart_subtransport_ssh", + "git_transport_dummy", + "git_transport_init", + "git_transport_local", + "git_transport_new", + "git_transport_smart", + "git_transport_ssh_with_paths" + ] + } + } + ], + [ + "git_transport_flags_t", + { + "decl": [ + "GIT_TRANSPORTFLAGS_NONE" + ], + "type": "enum", + "file": "sys/transport.h", + "line": 29, + "lineto": 31, + "block": "GIT_TRANSPORTFLAGS_NONE", + "tdef": "typedef", + "description": " Flags to pass to transport", + "comments": "

Currently unused.

\n", + "fields": [ + { + "type": "int", + "name": "GIT_TRANSPORTFLAGS_NONE", + "comments": "", + "value": 0 + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], + [ + "git_tree", + { + "decl": "git_tree", + "type": "struct", + "value": "git_tree", + "file": "types.h", + "line": 126, + "lineto": 126, + "tdef": "typedef", + "description": " Representation of a tree object. ", + "comments": "", + "used": { + "returns": [], + "needs": [ + "git_commit_amend", + "git_commit_create", + "git_commit_create_v", + "git_commit_tree", + "git_diff_tree_to_index", + "git_diff_tree_to_tree", + "git_diff_tree_to_workdir", + "git_diff_tree_to_workdir_with_index", + "git_index_read_tree", + "git_merge_trees", + "git_pathspec_match_tree", + "git_tree_entry_byid", + "git_tree_entry_byindex", + "git_tree_entry_byname", + "git_tree_entry_bypath", + "git_tree_entrycount", + "git_tree_free", + "git_tree_id", + "git_tree_lookup", + "git_tree_lookup_prefix", + "git_tree_owner", + "git_tree_walk", + "git_treebuilder_new" + ] + } + } + ], + [ + "git_tree_entry", + { + "decl": "git_tree_entry", + "type": "struct", + "value": "git_tree_entry", + "file": "types.h", + "line": 123, + "lineto": 123, + "tdef": "typedef", + "description": " Representation of each one of the entries in a tree object. ", + "comments": "", + "used": { + "returns": [ + "git_tree_entry_byid", + "git_tree_entry_byindex", + "git_tree_entry_byname", + "git_treebuilder_get" + ], + "needs": [ + "git_tree_entry_bypath", + "git_tree_entry_cmp", + "git_tree_entry_dup", + "git_tree_entry_filemode", + "git_tree_entry_filemode_raw", + "git_tree_entry_free", + "git_tree_entry_id", + "git_tree_entry_name", + "git_tree_entry_to_object", + "git_tree_entry_type", + "git_treebuilder_insert" + ] + } + } + ], + [ + "git_treebuilder", + { + "decl": "git_treebuilder", + "type": "struct", + "value": "git_treebuilder", + "file": "types.h", + "line": 129, + "lineto": 129, + "tdef": "typedef", + "description": " Constructor for in-memory trees ", + "comments": "", + "used": { + "returns": [], + "needs": [ + "git_treebuilder_clear", + "git_treebuilder_entrycount", + "git_treebuilder_filter", + "git_treebuilder_free", + "git_treebuilder_get", + "git_treebuilder_insert", + "git_treebuilder_new", + "git_treebuilder_remove", + "git_treebuilder_write" + ] + } + } + ], + [ + "git_treewalk_mode", + { + "decl": [ + "GIT_TREEWALK_PRE", + "GIT_TREEWALK_POST" + ], + "type": "enum", + "file": "tree.h", + "line": 384, + "lineto": 387, + "block": "GIT_TREEWALK_PRE\nGIT_TREEWALK_POST", + "tdef": "typedef", + "description": " Tree traversal modes ", + "comments": "", + "fields": [ + { + "type": "int", + "name": "GIT_TREEWALK_PRE", + "comments": "", + "value": 0 + }, + { + "type": "int", + "name": "GIT_TREEWALK_POST", + "comments": "", + "value": 1 + } + ], + "used": { + "returns": [], + "needs": [ + "git_tree_walk" + ] + } + } + ], + [ + "git_writestream", + { + "decl": "git_writestream", + "type": "struct", + "value": "git_writestream", + "file": "types.h", + "line": 425, + "lineto": 425, + "tdef": "typedef", + "description": " A type to write in a streaming fashion, for example, for filters. ", + "comments": "", + "used": { + "returns": [], + "needs": [ + "git_filter_list_stream_blob", + "git_filter_list_stream_data", + "git_filter_list_stream_file" + ] + } + } + ] + ], + "prefix": "include/git2", + "groups": [ + [ + "annotated", + [ + "git_annotated_commit_free", + "git_annotated_commit_from_fetchhead", + "git_annotated_commit_from_ref", + "git_annotated_commit_from_revspec", + "git_annotated_commit_id", + "git_annotated_commit_lookup" + ] + ], + [ + "attr", + [ + "git_attr_add_macro", + "git_attr_cache_flush", + "git_attr_foreach", + "git_attr_get", + "git_attr_get_many", + "git_attr_value" + ] + ], + [ + "blame", + [ + "git_blame_buffer", + "git_blame_file", + "git_blame_free", + "git_blame_get_hunk_byindex", + "git_blame_get_hunk_byline", + "git_blame_get_hunk_count", + "git_blame_init_options" + ] + ], + [ + "blob", + [ + "git_blob_create_frombuffer", + "git_blob_create_fromchunks", + "git_blob_create_fromdisk", + "git_blob_create_fromworkdir", + "git_blob_filtered_content", + "git_blob_free", + "git_blob_id", + "git_blob_is_binary", + "git_blob_lookup", + "git_blob_lookup_prefix", + "git_blob_owner", + "git_blob_rawcontent", + "git_blob_rawsize" + ] + ], + [ + "branch", + [ + "git_branch_create", + "git_branch_create_from_annotated", + "git_branch_delete", + "git_branch_is_head", + "git_branch_iterator_free", + "git_branch_iterator_new", + "git_branch_lookup", + "git_branch_move", + "git_branch_name", + "git_branch_next", + "git_branch_set_upstream", + "git_branch_upstream" + ] + ], + [ + "buf", + [ + "git_buf_contains_nul", + "git_buf_free", + "git_buf_grow", + "git_buf_is_binary", + "git_buf_set" + ] + ], + [ + "checkout", + [ + "git_checkout_head", + "git_checkout_index", + "git_checkout_init_options", + "git_checkout_tree" + ] + ], + [ + "cherrypick", + [ + "git_cherrypick", + "git_cherrypick_commit", + "git_cherrypick_init_options" + ] + ], + [ + "clone", + [ + "git_clone", + "git_clone_init_options" + ] + ], + [ + "commit", + [ + "git_commit_amend", + "git_commit_author", + "git_commit_committer", + "git_commit_create", + "git_commit_create_from_callback", + "git_commit_create_from_ids", + "git_commit_create_v", + "git_commit_free", + "git_commit_header_field", + "git_commit_id", + "git_commit_lookup", + "git_commit_lookup_prefix", + "git_commit_message", + "git_commit_message_encoding", + "git_commit_message_raw", + "git_commit_nth_gen_ancestor", + "git_commit_owner", + "git_commit_parent", + "git_commit_parent_id", + "git_commit_parentcount", + "git_commit_raw_header", + "git_commit_summary", + "git_commit_time", + "git_commit_time_offset", + "git_commit_tree", + "git_commit_tree_id" + ] + ], + [ + "config", + [ + "git_config_add_backend", + "git_config_add_file_ondisk", + "git_config_backend_foreach_match", + "git_config_delete_entry", + "git_config_delete_multivar", + "git_config_entry_free", + "git_config_find_global", + "git_config_find_system", + "git_config_find_xdg", + "git_config_foreach", + "git_config_foreach_match", + "git_config_free", + "git_config_get_bool", + "git_config_get_entry", + "git_config_get_int32", + "git_config_get_int64", + "git_config_get_mapped", + "git_config_get_multivar_foreach", + "git_config_get_path", + "git_config_get_string", + "git_config_get_string_buf", + "git_config_init_backend", + "git_config_iterator_free", + "git_config_iterator_glob_new", + "git_config_iterator_new", + "git_config_lookup_map_value", + "git_config_multivar_iterator_new", + "git_config_new", + "git_config_next", + "git_config_open_default", + "git_config_open_global", + "git_config_open_level", + "git_config_open_ondisk", + "git_config_parse_bool", + "git_config_parse_int32", + "git_config_parse_int64", + "git_config_parse_path", + "git_config_set_bool", + "git_config_set_int32", + "git_config_set_int64", + "git_config_set_multivar", + "git_config_set_string", + "git_config_snapshot" + ] + ], + [ + "cred", + [ + "git_cred_default_new", + "git_cred_has_username", + "git_cred_ssh_custom_new", + "git_cred_ssh_interactive_new", + "git_cred_ssh_key_from_agent", + "git_cred_ssh_key_memory_new", + "git_cred_ssh_key_new", + "git_cred_username_new", + "git_cred_userpass", + "git_cred_userpass_plaintext_new" + ] + ], + [ + "describe", + [ + "git_describe_commit", + "git_describe_format", + "git_describe_result_free", + "git_describe_workdir" + ] + ], + [ + "diff", + [ + "git_diff_blob_to_buffer", + "git_diff_blobs", + "git_diff_buffers", + "git_diff_commit_as_email", + "git_diff_find_init_options", + "git_diff_find_similar", + "git_diff_foreach", + "git_diff_format_email", + "git_diff_format_email_init_options", + "git_diff_free", + "git_diff_get_delta", + "git_diff_get_perfdata", + "git_diff_get_stats", + "git_diff_index_to_workdir", + "git_diff_init_options", + "git_diff_is_sorted_icase", + "git_diff_merge", + "git_diff_num_deltas", + "git_diff_num_deltas_of_type", + "git_diff_print", + "git_diff_print_callback__to_buf", + "git_diff_print_callback__to_file_handle", + "git_diff_stats_deletions", + "git_diff_stats_files_changed", + "git_diff_stats_free", + "git_diff_stats_insertions", + "git_diff_stats_to_buf", + "git_diff_status_char", + "git_diff_tree_to_index", + "git_diff_tree_to_tree", + "git_diff_tree_to_workdir", + "git_diff_tree_to_workdir_with_index" + ] + ], + [ + "fetch", + [ + "git_fetch_init_options" + ] + ], + [ + "filter", + [ + "git_filter_list_apply_to_blob", + "git_filter_list_apply_to_data", + "git_filter_list_apply_to_file", + "git_filter_list_contains", + "git_filter_list_free", + "git_filter_list_length", + "git_filter_list_load", + "git_filter_list_new", + "git_filter_list_push", + "git_filter_list_stream_blob", + "git_filter_list_stream_data", + "git_filter_list_stream_file", + "git_filter_lookup", + "git_filter_register", + "git_filter_source_filemode", + "git_filter_source_flags", + "git_filter_source_id", + "git_filter_source_mode", + "git_filter_source_path", + "git_filter_source_repo", + "git_filter_unregister" + ] + ], + [ + "giterr", + [ + "giterr_clear", + "giterr_detach", + "giterr_last", + "giterr_set_oom", + "giterr_set_str" + ] + ], + [ + "graph", + [ + "git_graph_ahead_behind", + "git_graph_descendant_of" + ] + ], + [ + "hashsig", + [ + "git_hashsig_compare", + "git_hashsig_create", + "git_hashsig_create_fromfile", + "git_hashsig_free" + ] + ], + [ + "ignore", + [ + "git_ignore_add_rule", + "git_ignore_clear_internal_rules", + "git_ignore_path_is_ignored" + ] + ], + [ + "index", + [ + "git_index_add", + "git_index_add_all", + "git_index_add_bypath", + "git_index_add_frombuffer", + "git_index_caps", + "git_index_checksum", + "git_index_clear", + "git_index_conflict_add", + "git_index_conflict_cleanup", + "git_index_conflict_get", + "git_index_conflict_iterator_free", + "git_index_conflict_iterator_new", + "git_index_conflict_next", + "git_index_conflict_remove", + "git_index_entry_is_conflict", + "git_index_entry_stage", + "git_index_entrycount", + "git_index_find", + "git_index_free", + "git_index_get_byindex", + "git_index_get_bypath", + "git_index_has_conflicts", + "git_index_new", + "git_index_open", + "git_index_owner", + "git_index_path", + "git_index_read", + "git_index_read_tree", + "git_index_remove", + "git_index_remove_all", + "git_index_remove_bypath", + "git_index_remove_directory", + "git_index_set_caps", + "git_index_update_all", + "git_index_write", + "git_index_write_tree", + "git_index_write_tree_to" + ] + ], + [ + "indexer", + [ + "git_indexer_append", + "git_indexer_commit", + "git_indexer_free", + "git_indexer_hash", + "git_indexer_new" + ] + ], + [ + "libgit2", + [ + "git_libgit2_features", + "git_libgit2_init", + "git_libgit2_opts", + "git_libgit2_shutdown", + "git_libgit2_version" + ] + ], + [ + "mempack", + [ + "git_mempack_new", + "git_mempack_reset" + ] + ], + [ + "merge", + [ + "git_merge", + "git_merge_analysis", + "git_merge_base", + "git_merge_base_many", + "git_merge_base_octopus", + "git_merge_bases", + "git_merge_bases_many", + "git_merge_commits", + "git_merge_file", + "git_merge_file_from_index", + "git_merge_file_init_input", + "git_merge_file_init_options", + "git_merge_file_result_free", + "git_merge_init_options", + "git_merge_trees" + ] + ], + [ + "message", + [ + "git_message_prettify" + ] + ], + [ + "note", + [ + "git_note_author", + "git_note_committer", + "git_note_create", + "git_note_foreach", + "git_note_free", + "git_note_id", + "git_note_iterator_free", + "git_note_iterator_new", + "git_note_message", + "git_note_next", + "git_note_read", + "git_note_remove" + ] + ], + [ + "object", + [ + "git_object__size", + "git_object_dup", + "git_object_free", + "git_object_id", + "git_object_lookup", + "git_object_lookup_bypath", + "git_object_lookup_prefix", + "git_object_owner", + "git_object_peel", + "git_object_short_id", + "git_object_string2type", + "git_object_type", + "git_object_type2string", + "git_object_typeisloose" + ] + ], + [ + "odb", + [ + "git_odb_add_alternate", + "git_odb_add_backend", + "git_odb_add_disk_alternate", + "git_odb_backend_loose", + "git_odb_backend_one_pack", + "git_odb_backend_pack", + "git_odb_exists", + "git_odb_exists_prefix", + "git_odb_foreach", + "git_odb_free", + "git_odb_get_backend", + "git_odb_hash", + "git_odb_hashfile", + "git_odb_init_backend", + "git_odb_new", + "git_odb_num_backends", + "git_odb_object_data", + "git_odb_object_dup", + "git_odb_object_free", + "git_odb_object_id", + "git_odb_object_size", + "git_odb_object_type", + "git_odb_open", + "git_odb_open_rstream", + "git_odb_open_wstream", + "git_odb_read", + "git_odb_read_header", + "git_odb_read_prefix", + "git_odb_refresh", + "git_odb_stream_finalize_write", + "git_odb_stream_free", + "git_odb_stream_read", + "git_odb_stream_write", + "git_odb_write", + "git_odb_write_pack" + ] + ], + [ + "oid", + [ + "git_oid_cmp", + "git_oid_cpy", + "git_oid_equal", + "git_oid_fmt", + "git_oid_fromraw", + "git_oid_fromstr", + "git_oid_fromstrn", + "git_oid_fromstrp", + "git_oid_iszero", + "git_oid_ncmp", + "git_oid_nfmt", + "git_oid_pathfmt", + "git_oid_shorten_add", + "git_oid_shorten_free", + "git_oid_shorten_new", + "git_oid_strcmp", + "git_oid_streq", + "git_oid_tostr", + "git_oid_tostr_s" + ] + ], + [ + "oidarray", + [ + "git_oidarray_free" + ] + ], + [ + "openssl", + [ + "git_openssl_set_locking" + ] + ], + [ + "packbuilder", + [ + "git_packbuilder_foreach", + "git_packbuilder_free", + "git_packbuilder_hash", + "git_packbuilder_insert", + "git_packbuilder_insert_commit", + "git_packbuilder_insert_recur", + "git_packbuilder_insert_tree", + "git_packbuilder_insert_walk", + "git_packbuilder_new", + "git_packbuilder_object_count", + "git_packbuilder_set_callbacks", + "git_packbuilder_set_threads", + "git_packbuilder_write", + "git_packbuilder_written" + ] + ], + [ + "patch", + [ + "git_patch_free", + "git_patch_from_blob_and_buffer", + "git_patch_from_blobs", + "git_patch_from_buffers", + "git_patch_from_diff", + "git_patch_get_delta", + "git_patch_get_hunk", + "git_patch_get_line_in_hunk", + "git_patch_line_stats", + "git_patch_num_hunks", + "git_patch_num_lines_in_hunk", + "git_patch_print", + "git_patch_size", + "git_patch_to_buf" + ] + ], + [ + "pathspec", + [ + "git_pathspec_free", + "git_pathspec_match_diff", + "git_pathspec_match_index", + "git_pathspec_match_list_diff_entry", + "git_pathspec_match_list_entry", + "git_pathspec_match_list_entrycount", + "git_pathspec_match_list_failed_entry", + "git_pathspec_match_list_failed_entrycount", + "git_pathspec_match_list_free", + "git_pathspec_match_tree", + "git_pathspec_match_workdir", + "git_pathspec_matches_path", + "git_pathspec_new" + ] + ], + [ + "push", + [ + "git_push_init_options" + ] + ], + [ + "rebase", + [ + "git_rebase_abort", + "git_rebase_commit", + "git_rebase_finish", + "git_rebase_free", + "git_rebase_init", + "git_rebase_init_options", + "git_rebase_next", + "git_rebase_open", + "git_rebase_operation_byindex", + "git_rebase_operation_current", + "git_rebase_operation_entrycount" + ] + ], + [ + "refdb", + [ + "git_refdb_backend_fs", + "git_refdb_compress", + "git_refdb_free", + "git_refdb_init_backend", + "git_refdb_new", + "git_refdb_open", + "git_refdb_set_backend" + ] + ], + [ + "reference", + [ + "git_reference__alloc", + "git_reference__alloc_symbolic", + "git_reference_cmp", + "git_reference_create", + "git_reference_create_matching", + "git_reference_delete", + "git_reference_dwim", + "git_reference_ensure_log", + "git_reference_foreach", + "git_reference_foreach_glob", + "git_reference_foreach_name", + "git_reference_free", + "git_reference_has_log", + "git_reference_is_branch", + "git_reference_is_note", + "git_reference_is_remote", + "git_reference_is_tag", + "git_reference_is_valid_name", + "git_reference_iterator_free", + "git_reference_iterator_glob_new", + "git_reference_iterator_new", + "git_reference_list", + "git_reference_lookup", + "git_reference_name", + "git_reference_name_to_id", + "git_reference_next", + "git_reference_next_name", + "git_reference_normalize_name", + "git_reference_owner", + "git_reference_peel", + "git_reference_remove", + "git_reference_rename", + "git_reference_resolve", + "git_reference_set_target", + "git_reference_shorthand", + "git_reference_symbolic_create", + "git_reference_symbolic_create_matching", + "git_reference_symbolic_set_target", + "git_reference_symbolic_target", + "git_reference_target", + "git_reference_target_peel", + "git_reference_type" + ] + ], + [ + "reflog", + [ + "git_reflog_append", + "git_reflog_delete", + "git_reflog_drop", + "git_reflog_entry_byindex", + "git_reflog_entry_committer", + "git_reflog_entry_id_new", + "git_reflog_entry_id_old", + "git_reflog_entry_message", + "git_reflog_entrycount", + "git_reflog_free", + "git_reflog_read", + "git_reflog_rename", + "git_reflog_write" + ] + ], + [ + "refspec", + [ + "git_refspec_direction", + "git_refspec_dst", + "git_refspec_dst_matches", + "git_refspec_force", + "git_refspec_rtransform", + "git_refspec_src", + "git_refspec_src_matches", + "git_refspec_string", + "git_refspec_transform" + ] + ], + [ + "remote", + [ + "git_remote_add_fetch", + "git_remote_add_push", + "git_remote_autotag", + "git_remote_connect", + "git_remote_connected", + "git_remote_create", + "git_remote_create_anonymous", + "git_remote_create_with_fetchspec", + "git_remote_default_branch", + "git_remote_delete", + "git_remote_disconnect", + "git_remote_download", + "git_remote_dup", + "git_remote_fetch", + "git_remote_free", + "git_remote_get_fetch_refspecs", + "git_remote_get_push_refspecs", + "git_remote_get_refspec", + "git_remote_init_callbacks", + "git_remote_is_valid_name", + "git_remote_list", + "git_remote_lookup", + "git_remote_ls", + "git_remote_name", + "git_remote_owner", + "git_remote_prune", + "git_remote_prune_refs", + "git_remote_push", + "git_remote_pushurl", + "git_remote_refspec_count", + "git_remote_rename", + "git_remote_set_autotag", + "git_remote_set_pushurl", + "git_remote_set_url", + "git_remote_stats", + "git_remote_stop", + "git_remote_update_tips", + "git_remote_upload", + "git_remote_url" + ] + ], + [ + "repository", + [ + "git_repository__cleanup", + "git_repository_config", + "git_repository_config_snapshot", + "git_repository_detach_head", + "git_repository_discover", + "git_repository_fetchhead_foreach", + "git_repository_free", + "git_repository_get_namespace", + "git_repository_hashfile", + "git_repository_head", + "git_repository_head_detached", + "git_repository_head_unborn", + "git_repository_ident", + "git_repository_index", + "git_repository_init", + "git_repository_init_ext", + "git_repository_init_init_options", + "git_repository_is_bare", + "git_repository_is_empty", + "git_repository_is_shallow", + "git_repository_mergehead_foreach", + "git_repository_message", + "git_repository_message_remove", + "git_repository_new", + "git_repository_odb", + "git_repository_open", + "git_repository_open_bare", + "git_repository_open_ext", + "git_repository_path", + "git_repository_refdb", + "git_repository_reinit_filesystem", + "git_repository_set_bare", + "git_repository_set_config", + "git_repository_set_head", + "git_repository_set_head_detached", + "git_repository_set_head_detached_from_annotated", + "git_repository_set_ident", + "git_repository_set_index", + "git_repository_set_namespace", + "git_repository_set_odb", + "git_repository_set_refdb", + "git_repository_set_workdir", + "git_repository_state", + "git_repository_state_cleanup", + "git_repository_workdir", + "git_repository_wrap_odb" + ] + ], + [ + "reset", + [ + "git_reset", + "git_reset_default", + "git_reset_from_annotated" + ] + ], + [ + "revert", + [ + "git_revert", + "git_revert_commit", + "git_revert_init_options" + ] + ], + [ + "revparse", + [ + "git_revparse", + "git_revparse_ext", + "git_revparse_single" + ] + ], + [ + "revwalk", + [ + "git_revwalk_add_hide_cb", + "git_revwalk_free", + "git_revwalk_hide", + "git_revwalk_hide_glob", + "git_revwalk_hide_head", + "git_revwalk_hide_ref", + "git_revwalk_new", + "git_revwalk_next", + "git_revwalk_push", + "git_revwalk_push_glob", + "git_revwalk_push_head", + "git_revwalk_push_range", + "git_revwalk_push_ref", + "git_revwalk_repository", + "git_revwalk_reset", + "git_revwalk_simplify_first_parent", + "git_revwalk_sorting" + ] + ], + [ + "signature", + [ + "git_signature_default", + "git_signature_dup", + "git_signature_free", + "git_signature_new", + "git_signature_now" + ] + ], + [ + "smart", + [ + "git_smart_subtransport_git", + "git_smart_subtransport_http", + "git_smart_subtransport_ssh" + ] + ], + [ + "stash", + [ + "git_stash_apply", + "git_stash_apply_init_options", + "git_stash_drop", + "git_stash_foreach", + "git_stash_pop" + ] + ], + [ + "status", + [ + "git_status_byindex", + "git_status_file", + "git_status_foreach", + "git_status_foreach_ext", + "git_status_init_options", + "git_status_list_entrycount", + "git_status_list_free", + "git_status_list_get_perfdata", + "git_status_list_new", + "git_status_should_ignore" + ] + ], + [ + "strarray", + [ + "git_strarray_copy", + "git_strarray_free" + ] + ], + [ + "submodule", + [ + "git_submodule_add_finalize", + "git_submodule_add_setup", + "git_submodule_add_to_index", + "git_submodule_branch", + "git_submodule_fetch_recurse_submodules", + "git_submodule_foreach", + "git_submodule_free", + "git_submodule_head_id", + "git_submodule_ignore", + "git_submodule_index_id", + "git_submodule_init", + "git_submodule_location", + "git_submodule_lookup", + "git_submodule_name", + "git_submodule_open", + "git_submodule_owner", + "git_submodule_path", + "git_submodule_reload", + "git_submodule_repo_init", + "git_submodule_resolve_url", + "git_submodule_set_branch", + "git_submodule_set_fetch_recurse_submodules", + "git_submodule_set_ignore", + "git_submodule_set_update", + "git_submodule_set_url", + "git_submodule_status", + "git_submodule_sync", + "git_submodule_update", + "git_submodule_update_init_options", + "git_submodule_update_strategy", + "git_submodule_url", + "git_submodule_wd_id" + ] + ], + [ + "tag", + [ + "git_tag_annotation_create", + "git_tag_create", + "git_tag_create_frombuffer", + "git_tag_create_lightweight", + "git_tag_delete", + "git_tag_foreach", + "git_tag_free", + "git_tag_id", + "git_tag_list", + "git_tag_list_match", + "git_tag_lookup", + "git_tag_lookup_prefix", + "git_tag_message", + "git_tag_name", + "git_tag_owner", + "git_tag_peel", + "git_tag_tagger", + "git_tag_target", + "git_tag_target_id", + "git_tag_target_type" + ] + ], + [ + "trace", + [ + "git_trace_set" + ] + ], + [ + "transport", + [ + "git_transport_dummy", + "git_transport_init", + "git_transport_local", + "git_transport_new", + "git_transport_smart", + "git_transport_ssh_with_paths", + "git_transport_unregister" + ] + ], + [ + "tree", + [ + "git_tree_entry_byid", + "git_tree_entry_byindex", + "git_tree_entry_byname", + "git_tree_entry_bypath", + "git_tree_entry_cmp", + "git_tree_entry_dup", + "git_tree_entry_filemode", + "git_tree_entry_filemode_raw", + "git_tree_entry_free", + "git_tree_entry_id", + "git_tree_entry_name", + "git_tree_entry_to_object", + "git_tree_entry_type", + "git_tree_entrycount", + "git_tree_free", + "git_tree_id", + "git_tree_lookup", + "git_tree_lookup_prefix", + "git_tree_owner", + "git_tree_walk" + ] + ], + [ + "treebuilder", + [ + "git_treebuilder_clear", + "git_treebuilder_entrycount", + "git_treebuilder_filter", + "git_treebuilder_free", + "git_treebuilder_get", + "git_treebuilder_insert", + "git_treebuilder_new", + "git_treebuilder_remove", + "git_treebuilder_write" + ] + ] + ], + "examples": [ + [ + "add.c", + "ex/v0.23.2/add.html" + ], + [ + "blame.c", + "ex/v0.23.2/blame.html" + ], + [ + "cat-file.c", + "ex/v0.23.2/cat-file.html" + ], + [ + "common.c", + "ex/v0.23.2/common.html" + ], + [ + "describe.c", + "ex/v0.23.2/describe.html" + ], + [ + "diff.c", + "ex/v0.23.2/diff.html" + ], + [ + "for-each-ref.c", + "ex/v0.23.2/for-each-ref.html" + ], + [ + "general.c", + "ex/v0.23.2/general.html" + ], + [ + "init.c", + "ex/v0.23.2/init.html" + ], + [ + "log.c", + "ex/v0.23.2/log.html" + ], + [ + "network/clone.c", + "ex/v0.23.2/network/clone.html" + ], + [ + "network/common.c", + "ex/v0.23.2/network/common.html" + ], + [ + "network/fetch.c", + "ex/v0.23.2/network/fetch.html" + ], + [ + "network/git2.c", + "ex/v0.23.2/network/git2.html" + ], + [ + "network/index-pack.c", + "ex/v0.23.2/network/index-pack.html" + ], + [ + "network/ls-remote.c", + "ex/v0.23.2/network/ls-remote.html" + ], + [ + "remote.c", + "ex/v0.23.2/remote.html" + ], + [ + "rev-list.c", + "ex/v0.23.2/rev-list.html" + ], + [ + "rev-parse.c", + "ex/v0.23.2/rev-parse.html" + ], + [ + "showindex.c", + "ex/v0.23.2/showindex.html" + ], + [ + "status.c", + "ex/v0.23.2/status.html" + ], + [ + "tag.c", + "ex/v0.23.2/tag.html" + ] + ] +} From 138f39826b0c1784156889e25df5628ec66a7a34 Mon Sep 17 00:00:00 2001 From: John Haley Date: Mon, 25 Apr 2016 11:36:36 -0700 Subject: [PATCH 21/61] Rename libgit2 docs json to just `libgit2-docs.json` --- generate/input/{v0.23.4.json => libgit2-docs.json} | 0 generate/scripts/generateJson.js | 3 +-- generate/scripts/helpers.js | 3 +-- package.json | 3 +-- 4 files changed, 3 insertions(+), 6 deletions(-) rename generate/input/{v0.23.4.json => libgit2-docs.json} (100%) diff --git a/generate/input/v0.23.4.json b/generate/input/libgit2-docs.json similarity index 100% rename from generate/input/v0.23.4.json rename to generate/input/libgit2-docs.json diff --git a/generate/scripts/generateJson.js b/generate/scripts/generateJson.js index af43ef508..369218b2e 100644 --- a/generate/scripts/generateJson.js +++ b/generate/scripts/generateJson.js @@ -2,8 +2,7 @@ const path = require("path"); const utils = require("./utils"); var _; -var version = require("../../package.json").vendorDependencies.libgit2.version; -var libgit2 = require("../input/v" + version + ".json"); +var libgit2 = require("../input/libgit2-docs.json"); var descriptor = require("../input/descriptor.json"); var supplement = require("../input/libgit2-supplement.json"); diff --git a/generate/scripts/helpers.js b/generate/scripts/helpers.js index ace88803b..bd8d61fc5 100644 --- a/generate/scripts/helpers.js +++ b/generate/scripts/helpers.js @@ -6,10 +6,9 @@ var path = require("path"); var fs = require("fs"); // TODO: When libgit2's docs include callbacks we should be able to remove this -var version = require("../../package.json").vendorDependencies.libgit2.version; var callbackDefs = require("../input/callbacks.json"); var descriptor = require("../input/descriptor.json"); -var libgit2 = require("../input/v" + version + ".json"); +var libgit2 = require("../input/libgit2-docs.json"); var cTypes = libgit2.groups.map(function(group) { return group[0];}); diff --git a/package.json b/package.json index 526ab5873..dd165323f 100644 --- a/package.json +++ b/package.json @@ -57,8 +57,7 @@ }, "vendorDependencies": { "libgit2": { - "sha": "e8feafe32007ebd16a61820c70abd221655d053c", - "version": "0.23.4" + "sha": "e8feafe32007ebd16a61820c70abd221655d053c" }, "libssh2": "1.6.0", "http_parser": "2.5.0" From eab9618c315748189b5c65ee7a42dfd3d5ed6fa6 Mon Sep 17 00:00:00 2001 From: John Haley Date: Tue, 26 Apr 2016 10:21:13 -0700 Subject: [PATCH 22/61] Update to libgit2 v0.24.1 --- generate/input/libgit2-docs.json | 4234 ++++++++++------- vendor/libgit2/.mailmap | 3 +- vendor/libgit2/.travis.yml | 4 +- vendor/libgit2/CHANGELOG.md | 116 +- vendor/libgit2/CMakeLists.txt | 88 +- vendor/libgit2/CODE_OF_CONDUCT.md | 75 + vendor/libgit2/CONVENTIONS.md | 32 + vendor/libgit2/PROJECTS.md | 6 +- vendor/libgit2/README.md | 22 +- vendor/libgit2/THREADING.md | 16 +- vendor/libgit2/appveyor.yml | 6 +- vendor/libgit2/deps/http-parser/http_parser.c | 7 +- vendor/libgit2/examples/network/fetch.c | 102 +- vendor/libgit2/examples/network/ls-remote.c | 2 +- vendor/libgit2/git.git-authors | 1 + vendor/libgit2/include/git2/blame.h | 12 +- vendor/libgit2/include/git2/blob.h | 4 +- vendor/libgit2/include/git2/commit.h | 31 + vendor/libgit2/include/git2/common.h | 51 +- vendor/libgit2/include/git2/config.h | 42 +- vendor/libgit2/include/git2/diff.h | 63 +- vendor/libgit2/include/git2/errors.h | 18 +- vendor/libgit2/include/git2/index.h | 39 +- vendor/libgit2/include/git2/merge.h | 60 +- vendor/libgit2/include/git2/rebase.h | 36 +- vendor/libgit2/include/git2/remote.h | 13 +- vendor/libgit2/include/git2/repository.h | 2 + vendor/libgit2/include/git2/stash.h | 4 +- vendor/libgit2/include/git2/submodule.h | 13 +- vendor/libgit2/include/git2/sys/config.h | 14 + vendor/libgit2/include/git2/sys/filter.h | 56 +- vendor/libgit2/include/git2/sys/index.h | 2 +- vendor/libgit2/include/git2/sys/odb_backend.h | 4 + .../libgit2/include/git2/sys/refdb_backend.h | 9 +- vendor/libgit2/include/git2/sys/stream.h | 13 + vendor/libgit2/include/git2/sys/transport.h | 27 + vendor/libgit2/include/git2/transport.h | 46 +- vendor/libgit2/include/git2/version.h | 8 +- vendor/libgit2/libgit2.pc.in | 2 +- vendor/libgit2/script/cibuild.sh | 6 +- vendor/libgit2/script/coverity.sh | 21 +- vendor/libgit2/script/install-deps-osx.sh | 3 +- vendor/libgit2/script/user_nodefs.h | 34 + vendor/libgit2/src/annotated_commit.c | 89 +- vendor/libgit2/src/annotated_commit.h | 27 +- vendor/libgit2/src/array.h | 40 + vendor/libgit2/src/attr_file.c | 11 +- vendor/libgit2/src/attrcache.c | 5 +- vendor/libgit2/src/blame.c | 35 +- vendor/libgit2/src/blame.h | 6 +- vendor/libgit2/src/blame_git.c | 41 +- vendor/libgit2/src/branch.c | 13 +- vendor/libgit2/src/checkout.c | 51 +- vendor/libgit2/src/clone.c | 4 +- vendor/libgit2/src/commit.c | 234 +- vendor/libgit2/src/commit.h | 1 + vendor/libgit2/src/commit_list.c | 2 +- vendor/libgit2/src/common.h | 29 +- vendor/libgit2/src/config.c | 46 + vendor/libgit2/src/config.h | 16 + vendor/libgit2/src/config_cache.c | 3 +- vendor/libgit2/src/config_file.c | 183 +- vendor/libgit2/src/config_file.h | 10 + vendor/libgit2/src/crlf.c | 2 +- vendor/libgit2/src/curl_stream.c | 20 +- vendor/libgit2/src/describe.c | 3 +- vendor/libgit2/src/diff.c | 169 +- vendor/libgit2/src/diff.h | 1 - vendor/libgit2/src/diff_file.c | 25 + vendor/libgit2/src/diff_print.c | 6 +- vendor/libgit2/src/diff_tform.c | 39 +- vendor/libgit2/src/errors.c | 115 +- vendor/libgit2/src/filebuf.c | 13 +- vendor/libgit2/src/fileops.c | 325 +- vendor/libgit2/src/fileops.h | 22 +- vendor/libgit2/src/filter.c | 286 +- vendor/libgit2/src/filter.h | 2 + vendor/libgit2/src/global.c | 247 +- vendor/libgit2/src/global.h | 4 + vendor/libgit2/src/idxmap.h | 93 + vendor/libgit2/src/ignore.c | 30 +- vendor/libgit2/src/index.c | 767 ++- vendor/libgit2/src/index.h | 44 +- vendor/libgit2/src/indexer.c | 18 +- vendor/libgit2/src/iterator.c | 521 +- vendor/libgit2/src/iterator.h | 49 +- vendor/libgit2/src/merge.c | 546 ++- vendor/libgit2/src/merge.h | 4 +- vendor/libgit2/src/mwindow.c | 14 +- vendor/libgit2/src/netops.c | 4 + vendor/libgit2/src/notes.c | 2 +- vendor/libgit2/src/object.c | 35 +- vendor/libgit2/src/object.h | 23 + vendor/libgit2/src/odb.c | 20 +- vendor/libgit2/src/odb.h | 3 +- vendor/libgit2/src/odb_loose.c | 24 +- vendor/libgit2/src/odb_mempack.c | 5 +- vendor/libgit2/src/odb_pack.c | 8 +- vendor/libgit2/src/oid.h | 9 + vendor/libgit2/src/oidmap.h | 2 + vendor/libgit2/src/openssl_stream.c | 156 +- vendor/libgit2/src/openssl_stream.h | 2 + vendor/libgit2/src/pack-objects.c | 29 +- vendor/libgit2/src/pack.c | 37 +- vendor/libgit2/src/pack.h | 7 - vendor/libgit2/src/path.c | 51 +- vendor/libgit2/src/path.h | 31 +- vendor/libgit2/src/pathspec.c | 37 +- vendor/libgit2/src/pool.c | 329 +- vendor/libgit2/src/pool.h | 80 +- vendor/libgit2/src/posix.c | 14 +- vendor/libgit2/src/posix.h | 1 + vendor/libgit2/src/push.c | 15 +- vendor/libgit2/src/push.h | 1 + vendor/libgit2/src/rebase.c | 400 +- vendor/libgit2/src/refdb.c | 8 +- vendor/libgit2/src/refdb_fs.c | 49 +- vendor/libgit2/src/refs.c | 11 +- vendor/libgit2/src/refs.h | 5 + vendor/libgit2/src/refspec.c | 8 +- vendor/libgit2/src/remote.c | 63 +- vendor/libgit2/src/repository.c | 48 +- vendor/libgit2/src/reset.c | 12 +- vendor/libgit2/src/revwalk.c | 9 +- vendor/libgit2/src/settings.c | 67 +- vendor/libgit2/src/signature.c | 5 +- vendor/libgit2/src/sortedcache.c | 5 +- vendor/libgit2/src/stash.c | 31 +- vendor/libgit2/src/stransport_stream.c | 2 +- vendor/libgit2/src/stream.h | 3 + vendor/libgit2/src/submodule.c | 431 +- vendor/libgit2/src/sysdir.c | 49 +- vendor/libgit2/src/sysdir.h | 14 +- vendor/libgit2/src/tag.c | 2 +- vendor/libgit2/src/thread-utils.h | 2 +- vendor/libgit2/src/tls_stream.c | 13 + vendor/libgit2/src/transaction.c | 44 +- vendor/libgit2/src/transaction.h | 14 + vendor/libgit2/src/transport.c | 2 + vendor/libgit2/src/transports/cred.c | 8 + vendor/libgit2/src/transports/http.c | 19 +- vendor/libgit2/src/transports/smart.c | 95 + vendor/libgit2/src/transports/smart.h | 1 + vendor/libgit2/src/transports/smart_pkt.c | 35 +- .../libgit2/src/transports/smart_protocol.c | 80 +- vendor/libgit2/src/transports/ssh.c | 80 +- vendor/libgit2/src/transports/ssh.h | 12 + vendor/libgit2/src/transports/winhttp.c | 75 +- vendor/libgit2/src/tree.c | 232 +- vendor/libgit2/src/tree.h | 10 +- vendor/libgit2/src/unix/map.c | 7 +- vendor/libgit2/src/unix/posix.h | 16 +- vendor/libgit2/src/util.c | 48 + vendor/libgit2/src/util.h | 18 +- vendor/libgit2/src/vector.c | 7 + vendor/libgit2/src/vector.h | 1 + vendor/libgit2/src/win32/findfile.c | 10 + vendor/libgit2/src/win32/findfile.h | 1 + vendor/libgit2/src/win32/map.c | 29 +- vendor/libgit2/src/win32/mingw-compat.h | 6 - vendor/libgit2/src/win32/msvc-compat.h | 3 - vendor/libgit2/src/win32/posix.h | 10 +- vendor/libgit2/src/win32/posix_w32.c | 22 +- vendor/libgit2/src/win32/utf-conv.c | 21 +- .../libgit2/src/win32/w32_crtdbg_stacktrace.c | 343 ++ .../libgit2/src/win32/w32_crtdbg_stacktrace.h | 93 + vendor/libgit2/src/win32/w32_stack.c | 192 + vendor/libgit2/src/win32/w32_stack.h | 138 + vendor/libgit2/src/win32/w32_util.c | 34 +- vendor/libgit2/src/win32/w32_util.h | 87 +- vendor/libgit2/src/win32/win32-compat.h | 52 + vendor/libgit2/src/xdiff/xmerge.c | 9 +- vendor/libgit2/src/xdiff/xprepare.c | 3 +- vendor/libgit2/tests/attr/ignore.c | 13 + vendor/libgit2/tests/blame/blame_helpers.c | 4 +- vendor/libgit2/tests/blame/blame_helpers.h | 6 +- vendor/libgit2/tests/blame/simple.c | 12 + .../libgit2/tests/checkout/checkout_helpers.c | 12 +- vendor/libgit2/tests/checkout/crlf.c | 9 +- vendor/libgit2/tests/checkout/index.c | 4 +- vendor/libgit2/tests/cherrypick/workdir.c | 4 +- vendor/libgit2/tests/clar_libgit2.c | 62 +- vendor/libgit2/tests/clar_libgit2.h | 1 + vendor/libgit2/tests/clar_libgit2_trace.c | 19 + vendor/libgit2/tests/clone/nonetwork.c | 9 +- vendor/libgit2/tests/commit/commit.c | 47 +- vendor/libgit2/tests/commit/parse.c | 95 + vendor/libgit2/tests/commit/write.c | 113 +- vendor/libgit2/tests/config/global.c | 48 +- vendor/libgit2/tests/config/multivar.c | 2 +- vendor/libgit2/tests/config/stress.c | 23 + vendor/libgit2/tests/config/write.c | 98 +- vendor/libgit2/tests/core/array.c | 57 + vendor/libgit2/tests/core/buffer.c | 2 +- vendor/libgit2/tests/core/copy.c | 8 +- vendor/libgit2/tests/core/dirent.c | 29 + vendor/libgit2/tests/core/env.c | 20 +- vendor/libgit2/tests/core/errors.c | 52 +- vendor/libgit2/tests/core/features.c | 6 + vendor/libgit2/tests/core/filebuf.c | 35 + vendor/libgit2/tests/core/ftruncate.c | 2 +- vendor/libgit2/tests/core/futils.c | 68 + vendor/libgit2/tests/core/mkdir.c | 128 +- vendor/libgit2/tests/core/opts.c | 6 + vendor/libgit2/tests/core/pool.c | 88 +- vendor/libgit2/tests/core/posix.c | 2 +- vendor/libgit2/tests/core/stat.c | 2 +- vendor/libgit2/tests/core/stream.c | 51 + vendor/libgit2/tests/core/useragent.c | 11 + vendor/libgit2/tests/diff/format_email.c | 41 + vendor/libgit2/tests/diff/index.c | 40 +- vendor/libgit2/tests/diff/iterator.c | 62 +- vendor/libgit2/tests/diff/notify.c | 30 +- vendor/libgit2/tests/diff/tree.c | 2 +- vendor/libgit2/tests/diff/workdir.c | 326 +- vendor/libgit2/tests/filter/custom.c | 107 +- vendor/libgit2/tests/filter/custom_helpers.c | 108 + vendor/libgit2/tests/filter/custom_helpers.h | 18 + vendor/libgit2/tests/filter/stream.c | 2 +- vendor/libgit2/tests/filter/wildcard.c | 184 + vendor/libgit2/tests/index/add.c | 84 + vendor/libgit2/tests/index/addall.c | 35 + vendor/libgit2/tests/index/bypath.c | 314 ++ vendor/libgit2/tests/index/cache.c | 6 +- vendor/libgit2/tests/index/conflicts.c | 125 +- vendor/libgit2/tests/index/filemodes.c | 8 + vendor/libgit2/tests/index/nsec.c | 9 + vendor/libgit2/tests/index/racy.c | 243 +- vendor/libgit2/tests/index/rename.c | 36 + vendor/libgit2/tests/index/tests.c | 56 +- vendor/libgit2/tests/main.c | 19 - vendor/libgit2/tests/merge/conflict_data.h | 103 + vendor/libgit2/tests/merge/files.c | 1 + vendor/libgit2/tests/merge/merge_helpers.c | 12 +- vendor/libgit2/tests/merge/merge_helpers.h | 43 - vendor/libgit2/tests/merge/trees/automerge.c | 3 +- vendor/libgit2/tests/merge/trees/commits.c | 19 +- vendor/libgit2/tests/merge/trees/recursive.c | 410 ++ vendor/libgit2/tests/merge/trees/treediff.c | 14 +- vendor/libgit2/tests/merge/workdir/dirty.c | 13 +- .../libgit2/tests/merge/workdir/recursive.c | 84 + vendor/libgit2/tests/merge/workdir/renames.c | 6 +- vendor/libgit2/tests/merge/workdir/simple.c | 1 + vendor/libgit2/tests/network/fetchlocal.c | 39 +- .../tests/network/remote/defaultbranch.c | 6 +- vendor/libgit2/tests/network/remote/local.c | 8 +- vendor/libgit2/tests/network/remote/remotes.c | 6 +- vendor/libgit2/tests/object/tree/attributes.c | 2 + vendor/libgit2/tests/object/tree/write.c | 98 +- vendor/libgit2/tests/odb/alternates.c | 2 +- vendor/libgit2/tests/odb/sorting.c | 1 + vendor/libgit2/tests/online/badssl.c | 46 + vendor/libgit2/tests/online/clone.c | 130 +- vendor/libgit2/tests/online/fetch.c | 12 +- vendor/libgit2/tests/online/push.c | 28 +- vendor/libgit2/tests/online/push_util.c | 11 +- vendor/libgit2/tests/online/push_util.h | 4 +- vendor/libgit2/tests/path/core.c | 12 +- vendor/libgit2/tests/rebase/inmemory.c | 116 + vendor/libgit2/tests/rebase/iterator.c | 50 +- vendor/libgit2/tests/rebase/merge.c | 30 + vendor/libgit2/tests/refs/branches/delete.c | 2 + vendor/libgit2/tests/refs/create.c | 44 +- vendor/libgit2/tests/refs/lookup.c | 8 + vendor/libgit2/tests/refs/pack.c | 2 +- vendor/libgit2/tests/refs/reflog/reflog.c | 71 + vendor/libgit2/tests/repo/discover.c | 16 +- vendor/libgit2/tests/repo/init.c | 180 +- vendor/libgit2/tests/repo/iterator.c | 838 +++- vendor/libgit2/tests/repo/open.c | 4 +- vendor/libgit2/tests/repo/reservedname.c | 24 + vendor/libgit2/tests/repo/state.c | 18 + vendor/libgit2/tests/reset/hard.c | 58 +- .../37/681a80ca21064efd5c3bf2ef41eb3d05a1428b | Bin 0 -> 106 bytes .../4e/ecfea484f8005d101e547f6bfb07c99e2b114e | Bin 0 -> 163 bytes .../5a/572e2e94825f54b95417eacaa089d560c5a5e9 | Bin 0 -> 324 bytes .../66/53ff42313eb5c82806f145391b18a9699800c7 | Bin 0 -> 160 bytes .../ad/9cb4eac23df2fe5e1264287a5872ea2a1ff8b2 | Bin 0 -> 106 bytes .../de/9fe35f9906e1994e083cc59c87232bf418795b | Bin 0 -> 331 bytes .../resources/blametest.git/refs/heads/master | 2 +- .../resources/diff_format_email/.gitted/index | Bin 256 -> 289 bytes .../62/7e7e12d87e07a83fad5b6bfa25e86ead4a5270 | 1 + .../73/09653445ecf038d3e3dd9ed55edb6cb541a4ba | Bin 0 -> 28 bytes .../d5/ff67764c82f729b13c26a09576570d884d9687 | Bin 0 -> 121 bytes .../.gitted/refs/heads/master | 2 +- .../resources/diff_format_email/file3.txt | 1 + .../resources/merge-recursive/.gitted/HEAD | 1 + .../resources/merge-recursive/.gitted/config | 7 + .../resources/merge-recursive/.gitted/index | Bin 0 -> 619 bytes .../merge-recursive/.gitted/info/refs | 1 + .../00/6b298c5702b04c00370d0414959765b82fd722 | Bin 0 -> 207 bytes .../00/7f1ee2af8e5d99906867c4237510e1790a89b8 | 3 + .../01/6eef4a6fefd36bdcaa93ad773449ddc5c73cbb | Bin 0 -> 208 bytes .../05/c6a04ac101ab1a9836a95d5ec8d16b6f6304fd | Bin 0 -> 208 bytes .../06/db153c36829fc656e05cdf5a3bf7183f3c10aa | 2 + .../07/10c3c796e0704361472ecb904413fca0107a25 | Bin 0 -> 208 bytes .../07/2d89dcf3a7671ac34a8e875bb72fb39bcf14d7 | Bin 0 -> 208 bytes .../0b/b7ed583d7e9ad507e8b902594f5c9126ea456b | Bin 0 -> 161 bytes .../0e/8126647ec607f0a14122cec4b15315d790c8ff | Bin 0 -> 208 bytes .../0f/a6ead2731b9d138afe38c336c9727ea05027a7 | 1 + .../12/4d4fe29d3433fdaa2f0f455d226f2c79d89cf3 | Bin 0 -> 208 bytes .../15/311229e70fa62653f73dde1d4deef1a8e47a11 | Bin 0 -> 710 bytes .../15/faa0c9991f2d65686e844651faa2ff9827887b | Bin 0 -> 665 bytes .../16/895aa5e13f8907d4adab81285557d938fad342 | Bin 0 -> 634 bytes .../1c/1bdb80c04233d1a9b9755913ee233987be6175 | Bin 0 -> 208 bytes .../1e/8dff96faaaa24f84943d2d9601dde61cb0398a | Bin 0 -> 268 bytes .../21/950d5e4e4d1a871b4dfcf72ecb6b9c162c434e | Bin 0 -> 670 bytes .../34/8f16ffaeb73f319a75cec5b16a0a47d2d5e27c | Bin 0 -> 208 bytes .../37/185b25a204309bf74817da1a607518f13ca3ed | Bin 0 -> 715 bytes .../37/a5054a9f9b4628e3924c5cb8f2147c6e2a3efc | Bin 0 -> 630 bytes .../38/55170cef875708da06ab9ad7fc6a73b531cda1 | Bin 0 -> 664 bytes .../3a/3f5a6ec1c968d1d2d5d20dee0d161a4351f279 | 1 + .../3b/919b6e8a575b4779c8243ebea3e3beb436e88f | Bin 0 -> 208 bytes .../3f/d41804a7906db846af5e868444782e546af46a | Bin 0 -> 206 bytes .../41/71bb8d40e9fc830d79b757dc06ec6c14548b78 | Bin 0 -> 207 bytes .../42/1b392106e079df6d412babd5636697938269ec | 2 + .../42/44d13e2bbc38510320443bbb003f3967d12436 | Bin 0 -> 207 bytes .../42/cdad903aef3e7b614675e6584a8be417941911 | Bin 0 -> 208 bytes .../43/2faca0c62dc556ad71a22f23e541a46a8b0f6f | 2 + .../43/5424798e5e1b21dd4588d1c291ba4eb179a838 | Bin 0 -> 208 bytes .../43/6ea75c99f527e4b42fddb46abedf7726eb719d | 2 + .../48/3065df53c0f4a02cdc6b2910b05d388fc17ffb | Bin 0 -> 165 bytes .../4b/7c5650008b2e747fe1809eeb5a1dde0e80850a | Bin 0 -> 615 bytes .../4c/49317a0912ca559d2048bc329994eb7d10474f | Bin 0 -> 183 bytes .../4d/fc1be85a9d6c9898152444d32b238b4aecf8cc | Bin 0 -> 168 bytes .../4e/21d2d63357bde5027d1625f5ec6b430cdeb143 | Bin 0 -> 662 bytes .../4e/70a6b06fc62481f80fbb74327849e7170eebff | Bin 0 -> 207 bytes .../4f/4e85a0ab8515e34302721fbcec06fa9d9c1a9a | Bin 0 -> 631 bytes .../50/e4facaafb746cfed89287206274193c1417288 | 2 + .../53/9bd011c4822c560c1d17cab095006b7a10f707 | Bin 0 -> 163 bytes .../56/07a8c4601a737daadd1f470bde3142aff57026 | 1 + .../5a/ba269b3be41fc8db38068d3948c8af543fe609 | Bin 0 -> 208 bytes .../5b/8e1e56cb99e8b99ac22eec8aebf6422ecd08c0 | Bin 0 -> 208 bytes .../5e/8747f5200fac0f945a07daf6163ca9cb1a8da9 | Bin 0 -> 672 bytes .../5f/18576d464946eb2338daeb8b4030019961f505 | Bin 0 -> 208 bytes .../63/e8773becdea9c3699c95a5740be5baa8be8d69 | Bin 0 -> 207 bytes .../65/bea8448ca5b3104628ffbca553c54bde54b0fc | 3 + .../66/6ffdfcf1eaa5641fa31064bf2607327e843c09 | Bin 0 -> 664 bytes .../68/a2e1ee61a23a4728fe6b35580fbbbf729df370 | Bin 0 -> 665 bytes .../68/af1fc7407fd9addf1701a87eb1c95c7494c598 | Bin 0 -> 443 bytes .../68/f6182f4c85d39e1309d97c7e456156dc9c0096 | Bin 0 -> 755 bytes .../6c/778edd0e4cf394f5a3df8b96db516024cc1bb8 | Bin 0 -> 636 bytes .../6e/f31d35a3f5abc1e24f4f9afa5cb2016f03fa2d | 1 + .../71/3e438567b28543235faf265c4c5b02b437c7fd | Bin 0 -> 207 bytes .../72/3181f1bfd30e47a6d1d36a4d874e31e7a0a1a4 | 2 + .../73/b20c8e09fa2726d69ff66969186014165da3c3 | Bin 0 -> 208 bytes .../74/4df1bdf0f7bca20deb23e5a5eb8255fc237901 | Bin 0 -> 207 bytes .../75/c653822173a8e5795153ec3773dfe44bb9bb63 | 1 + .../78/3d6539dde96b8873c5b5da3e79cc14cd64830b | 4 + .../7a/9277e0c5ec75339f011c176d0c20e513c4de1c | 1 + .../7c/7bf85e978f1d18c0566f702d2cb7766b9c8d4f | 1 + .../7c/7e08f9559d9e1551b91e1cf68f1d0066109add | Bin 0 -> 443 bytes .../7e/3056f6765b3044ab09701077dbe1eb5b0e9ad0 | Bin 0 -> 208 bytes .../81/5b5a1c80ca749d705c7aa0cb294a00cbedd340 | 5 + .../88/8588a782ad433fbf0cc526e07cfe6f4a6b60b3 | Bin 0 -> 208 bytes .../88/eb3f98849f4b8d0555395f514800900a01dc8f | Bin 0 -> 209 bytes .../89/8d12687fb35be271c27c795a6b32c8b51da79e | Bin 0 -> 663 bytes .../8a/bda8de114a93f2d3c5a975ee2960f31e24be58 | 2 + .../8f/35f30bfe09513f96cf8aa4df0834ae34e93bae | 1 + .../94/d2c01087f48213bd157222d54edfefd77c9bba | Bin 0 -> 621 bytes .../95/78b04e2087976e382622322ba476aa40398dc7 | Bin 0 -> 620 bytes .../96/23368f0fc562d6d840372ae17dc4cc32d51a80 | 2 + .../97/3b70322e758da87e1ce21d2195d86c5e4e9647 | 1 + .../98/1c79eb38518d3821e73bb159dc413bb42d6614 | Bin 0 -> 208 bytes .../9a/e63b4a8ce0f181b2d1d098971733a103226917 | Bin 0 -> 240 bytes .../9b/258ad4c39f40c24f66bf1faf48eb6202d59c85 | Bin 0 -> 240 bytes .../9c/3f1c70db28c00ce74b22ba3edafe16d9cf03d4 | Bin 0 -> 208 bytes .../9e/12bce04446d097ae1782967a5888c2e2a0d35b | Bin 0 -> 268 bytes .../a0/2d4fd126e0cc8fb46ee48cf38bad36d44f2dbc | Bin 0 -> 649 bytes .../a0/65d3022e99a1943177c10a53cce38bc2127042 | Bin 0 -> 162 bytes .../a2/8c21c90aa36580641b345011869d1a899a6783 | 2 + .../a2/fa36ffc4a565a223e225d15b18774f87d0c4f0 | 3 + .../a3/4e5a16feabbd0335a633aadb8217c9f3dba58d | Bin 0 -> 164 bytes .../a7/b066537e6be7109abfe4ff97b675d4e077da20 | Bin 0 -> 621 bytes .../a8/2a121ea36b115548d6dad2cd86ec27f06f7b30 | Bin 0 -> 208 bytes .../aa/9e263294fd2f6f6fd9ceab23ca8ce3ea2ce707 | Bin 0 -> 175 bytes .../ad/1ea02c2cc4f55c1dff87b80a086206a73885eb | 2 + .../ad/2ace9e15f66b3d1138922e6ffdc3ea3f967fa6 | Bin 0 -> 170 bytes .../ad/98bfa4679fb00b89207a0a11b8bbf91a3e4de9 | Bin 0 -> 208 bytes .../b2/a81ead9e722af0099fccfb478cea88eea749a2 | Bin 0 -> 664 bytes .../b4/cefb3c75770e57bb8bb44e4a50d9578009e847 | Bin 0 -> 639 bytes .../b9/1ef5ffa8612616c8e76051901caafd723f0e2c | Bin 0 -> 712 bytes .../bd/97980c22d122509cdd915fd9788d56c8d3ae20 | Bin 0 -> 163 bytes .../c0/bd078a61d2cc22c52ca5ce04abdcdc5cc1829e | Bin 0 -> 207 bytes .../c4/83ca4bb087174af5cb51d7caa9c09fe4a28ccb | 1 + .../c4/e6cca3ec6ae0148ed231f97257df8c311e015f | 1 + .../ca/224bba0a8a24f1768804fe5f565b1014af7ef2 | Bin 0 -> 170 bytes .../ca/49d1a8b6116ffeba22667bba265fa5261df7ab | 2 + .../ca/7d316d6d9af99d2481e980d68b77e572d80fe7 | Bin 0 -> 207 bytes .../ca/fa936d25f0b397432a27201f6b3284c47df8be | Bin 0 -> 712 bytes .../cb/49ad76147f5f9439cbd6133708b76142660660 | Bin 0 -> 641 bytes .../d0/dd5d9083bda65ec99aa8b9b64a5a278771b70a | Bin 0 -> 620 bytes .../d2/682aaf9594080ce877b5eeee110850fd6e3480 | 1 + .../d6/04c75019c282144bdbbf3fd3462ba74b240efc | Bin 0 -> 620 bytes .../d7/1c24b3b113fd1d1909998c5bfe33b86a65ee03 | Bin 0 -> 240 bytes .../d8/dd349b78f19a4ebe3357bacb8138f00bf5ed41 | Bin 0 -> 277 bytes .../d8/e05a90b3c2240d71a20c2502c937d9b7d22777 | 2 + .../da/b7b53383a1fec46632e60a1d847ce4f9ae14f2 | Bin 0 -> 208 bytes .../db/203155a789fb749aa3c14e93eea2c744a9c6c7 | 1 + .../de/a7215f259b2cced87d1bda6c72f8b4ce37a2ff | Bin 0 -> 357 bytes .../e1/512550f09d980214e46e6d3f5a2b20c3d75755 | Bin 0 -> 208 bytes .../e1/dcfc3038be54195a59817c89782b261e46cb05 | 1 + .../e2/93bfdddb81a853bbb16b8b58e68626f30841a4 | Bin 0 -> 207 bytes .../e2/c84bb33992a455b1a7a5019f0e38d883d3f475 | Bin 0 -> 208 bytes .../e2/d185fa827d58134cea20b9e1df893833c6560e | Bin 0 -> 208 bytes .../e5/0fbbd701458757bdfe9815f58ed717c588d1b5 | 3 + .../ef/1783444b61a8671beea4ce1f4d0202677dfbfb | 3 + .../f1/3e1bc6ba935fce2efffa5be4c4832404034ef1 | Bin 0 -> 206 bytes .../f1/72517a8cf39e009ffff541ee52429b89e418f3 | Bin 0 -> 268 bytes .../f1/b44c04989a3a1c14b036cfadfa328d53a7bc5e | Bin 0 -> 672 bytes .../f3/5f159ff5d44dfd9f52d63dd5b659f0521ff569 | Bin 0 -> 669 bytes .../f5/1658077d85f2264fa179b4d0848268cb3475c3 | 2 + .../f7/929c5a67a4bdc98247fb4b5098675723932a64 | Bin 0 -> 207 bytes .../fa/567f568ed72157c0c617438d077695b99d9aac | Bin 0 -> 662 bytes .../fd/8b5fe88cda995e70a22ed98701e65b843e05ec | Bin 0 -> 165 bytes .../fe/f01f3104c8047d05e8572e521c454f8fd4b8db | Bin 0 -> 207 bytes .../ff/b36e513f5fdf8a6ba850a20142676a2ac4807d | Bin 0 -> 355 bytes .../.gitted/refs/heads/branchA-1 | 1 + .../.gitted/refs/heads/branchA-2 | 1 + .../.gitted/refs/heads/branchB-1 | 1 + .../.gitted/refs/heads/branchB-2 | 1 + .../.gitted/refs/heads/branchC-1 | 1 + .../.gitted/refs/heads/branchC-2 | 1 + .../.gitted/refs/heads/branchD-1 | 1 + .../.gitted/refs/heads/branchD-2 | 1 + .../.gitted/refs/heads/branchE-1 | 1 + .../.gitted/refs/heads/branchE-2 | 1 + .../.gitted/refs/heads/branchE-3 | 1 + .../.gitted/refs/heads/branchF-1 | 1 + .../.gitted/refs/heads/branchF-2 | 1 + .../.gitted/refs/heads/branchG-1 | 1 + .../.gitted/refs/heads/branchG-2 | 1 + .../.gitted/refs/heads/branchH-1 | 1 + .../.gitted/refs/heads/branchH-2 | 1 + .../.gitted/refs/heads/branchI-1 | 1 + .../.gitted/refs/heads/branchI-2 | 1 + .../resources/merge-recursive/asparagus.txt | 10 + .../tests/resources/merge-recursive/beef.txt | 22 + .../resources/merge-recursive/bouilli.txt | 18 + .../tests/resources/merge-recursive/gravy.txt | 8 + .../resources/merge-recursive/oyster.txt | 13 + .../tests/resources/merge-recursive/veal.txt | 20 + .../2b/d0a343aeef7a2cf0d158478966a6e587ff3863 | Bin 0 -> 56 bytes .../d4/27e0b2e138501a3d15cc376077a3631e15bd46 | Bin 0 -> 38 bytes .../ee/3fa1b8c00aff7fe02065fdb50864bb0d932ccf | Bin 0 -> 64 bytes vendor/libgit2/tests/resources/sub.git/HEAD | 1 + vendor/libgit2/tests/resources/sub.git/config | 8 + vendor/libgit2/tests/resources/sub.git/index | Bin 0 -> 405 bytes .../libgit2/tests/resources/sub.git/logs/HEAD | 1 + .../resources/sub.git/logs/refs/heads/master | 1 + .../10/ddd6d257e01349d514541981aeecea6b2e741d | Bin 0 -> 22 bytes .../17/6a458f94e0ea5272ce67c36bf30b6be9caf623 | Bin 0 -> 28 bytes .../94/c7d78d85c933d1d95b56bc2de01833ba8559fb | Bin 0 -> 132 bytes .../b7/a59b3f4ea13b985f8a1e0d3757d5cd3331add8 | Bin 0 -> 139 bytes .../d0/ee23c41b28746d7e822511d7838bce784ae773 | Bin 0 -> 54 bytes .../tests/resources/sub.git/refs/heads/master | 1 + .../resources/submodule_with_path/.gitmodules | 3 + .../submodule_with_path/.gitted/HEAD | 1 + .../submodule_with_path/.gitted/config | 8 + .../submodule_with_path/.gitted/index | Bin 0 -> 253 bytes .../18/372280a56a54340fa600aa91315065c6c4c693 | Bin 0 -> 85 bytes .../36/683131578275f6a8fd1c539e0d5da0d8adff26 | Bin 0 -> 63 bytes .../89/ca686bb21bfb75dda99a02313831a0c418f921 | Bin 0 -> 161 bytes .../b1/620ef2628d10416a84d19c783e33dc4556c9c3 | Bin 0 -> 86 bytes .../ba/34c47dc9d3d0b1bb335b45c9d26ba1f0fc90c7 | Bin 0 -> 68 bytes .../c8/4bf57ba2254dba216ab5c6eb1a19fe8bd0e0d6 | Bin 0 -> 127 bytes .../d5/45fc6b40ec9e67332b6a1d2dedcbdb1bffeb6b | Bin 0 -> 51 bytes .../.gitted/refs/heads/master | 1 + .../resources/super/.gitted/COMMIT_EDITMSG | 1 + .../tests/resources/super/.gitted/HEAD | 1 + .../tests/resources/super/.gitted/config | 10 + .../tests/resources/super/.gitted/index | Bin 0 -> 217 bytes .../51/589c218bf77a8da9e9d8dbc097d76a742726c4 | Bin 0 -> 90 bytes .../79/d0d58ca6aa1688a073d280169908454cad5b91 | Bin 0 -> 132 bytes .../d7/57768b570a83e80d02edcc1032db14573e5034 | Bin 0 -> 87 bytes .../resources/super/.gitted/refs/heads/master | 1 + .../libgit2/tests/resources/super/gitmodules | 3 + .../ee/3fa1b8c00aff7fe02065fdb50864bb0d932ccf | Bin 0 -> 64 bytes .../resources/win32-forbidden/.gitted/HEAD | 1 + .../resources/win32-forbidden/.gitted/config | 7 + .../resources/win32-forbidden/.gitted/index | Bin 0 -> 577 bytes .../win32-forbidden/.gitted/info/exclude | 6 + .../10/68072702a28a82c78902cf5bf82c3864cf4356 | Bin 0 -> 143 bytes .../17/6a458f94e0ea5272ce67c36bf30b6be9caf623 | Bin 0 -> 28 bytes .../2d/7445a749d25269f32724aa621cb70b196bcc40 | Bin 0 -> 105 bytes .../34/96991d72d500af36edef68bbfcccd1661d88db | 3 + .../8f/45aad6f23b9509f8786c617e19c127ae76609a | 2 + .../da/623abd956bb2fd8052c708c7ed43f05d192d37 | Bin 0 -> 59 bytes .../ea/c7621a652e5261ef1c1d3e7ae31b0d84fcbaba | 3 + .../win32-forbidden/.gitted/refs/heads/master | 1 + vendor/libgit2/tests/revert/workdir.c | 4 +- vendor/libgit2/tests/revwalk/basic.c | 3 +- vendor/libgit2/tests/status/ignore.c | 29 +- vendor/libgit2/tests/status/worktree.c | 15 +- vendor/libgit2/tests/status/worktree_init.c | 4 +- vendor/libgit2/tests/submodule/lookup.c | 55 + vendor/libgit2/tests/submodule/status.c | 16 +- .../tests/submodule/submodule_helpers.c | 31 + .../tests/submodule/submodule_helpers.h | 2 + vendor/libgit2/tests/submodule/update.c | 48 + vendor/libgit2/tests/threads/iterator.c | 5 +- .../libgit2/tests/trace/windows/stacktrace.c | 151 + vendor/libgit2/tests/transport/register.c | 25 +- vendor/libgit2/tests/win32/forbidden.c | 183 + vendor/libgit2/tests/win32/longpath.c | 4 +- 505 files changed, 14813 insertions(+), 5170 deletions(-) create mode 100644 vendor/libgit2/CODE_OF_CONDUCT.md create mode 100644 vendor/libgit2/script/user_nodefs.h create mode 100644 vendor/libgit2/src/idxmap.h create mode 100644 vendor/libgit2/src/transaction.h create mode 100644 vendor/libgit2/src/transports/ssh.h create mode 100644 vendor/libgit2/src/win32/w32_crtdbg_stacktrace.c create mode 100644 vendor/libgit2/src/win32/w32_crtdbg_stacktrace.h create mode 100644 vendor/libgit2/src/win32/w32_stack.c create mode 100644 vendor/libgit2/src/win32/w32_stack.h create mode 100644 vendor/libgit2/src/win32/win32-compat.h create mode 100644 vendor/libgit2/tests/core/array.c create mode 100644 vendor/libgit2/tests/core/futils.c create mode 100644 vendor/libgit2/tests/core/stream.c create mode 100644 vendor/libgit2/tests/core/useragent.c create mode 100644 vendor/libgit2/tests/filter/custom_helpers.c create mode 100644 vendor/libgit2/tests/filter/custom_helpers.h create mode 100644 vendor/libgit2/tests/filter/wildcard.c create mode 100644 vendor/libgit2/tests/index/add.c create mode 100644 vendor/libgit2/tests/merge/conflict_data.h create mode 100644 vendor/libgit2/tests/merge/trees/recursive.c create mode 100644 vendor/libgit2/tests/merge/workdir/recursive.c create mode 100644 vendor/libgit2/tests/online/badssl.c create mode 100644 vendor/libgit2/tests/rebase/inmemory.c create mode 100644 vendor/libgit2/tests/resources/blametest.git/objects/37/681a80ca21064efd5c3bf2ef41eb3d05a1428b create mode 100644 vendor/libgit2/tests/resources/blametest.git/objects/4e/ecfea484f8005d101e547f6bfb07c99e2b114e create mode 100644 vendor/libgit2/tests/resources/blametest.git/objects/5a/572e2e94825f54b95417eacaa089d560c5a5e9 create mode 100644 vendor/libgit2/tests/resources/blametest.git/objects/66/53ff42313eb5c82806f145391b18a9699800c7 create mode 100644 vendor/libgit2/tests/resources/blametest.git/objects/ad/9cb4eac23df2fe5e1264287a5872ea2a1ff8b2 create mode 100644 vendor/libgit2/tests/resources/blametest.git/objects/de/9fe35f9906e1994e083cc59c87232bf418795b create mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/62/7e7e12d87e07a83fad5b6bfa25e86ead4a5270 create mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/73/09653445ecf038d3e3dd9ed55edb6cb541a4ba create mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/d5/ff67764c82f729b13c26a09576570d884d9687 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/HEAD create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/config create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/index create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/info/refs create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/00/6b298c5702b04c00370d0414959765b82fd722 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/00/7f1ee2af8e5d99906867c4237510e1790a89b8 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/01/6eef4a6fefd36bdcaa93ad773449ddc5c73cbb create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/05/c6a04ac101ab1a9836a95d5ec8d16b6f6304fd create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/06/db153c36829fc656e05cdf5a3bf7183f3c10aa create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/07/10c3c796e0704361472ecb904413fca0107a25 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/07/2d89dcf3a7671ac34a8e875bb72fb39bcf14d7 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/0b/b7ed583d7e9ad507e8b902594f5c9126ea456b create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/0e/8126647ec607f0a14122cec4b15315d790c8ff create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/0f/a6ead2731b9d138afe38c336c9727ea05027a7 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/12/4d4fe29d3433fdaa2f0f455d226f2c79d89cf3 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/15/311229e70fa62653f73dde1d4deef1a8e47a11 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/15/faa0c9991f2d65686e844651faa2ff9827887b create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/16/895aa5e13f8907d4adab81285557d938fad342 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/1c/1bdb80c04233d1a9b9755913ee233987be6175 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/1e/8dff96faaaa24f84943d2d9601dde61cb0398a create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/21/950d5e4e4d1a871b4dfcf72ecb6b9c162c434e create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/34/8f16ffaeb73f319a75cec5b16a0a47d2d5e27c create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/37/185b25a204309bf74817da1a607518f13ca3ed create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/37/a5054a9f9b4628e3924c5cb8f2147c6e2a3efc create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/38/55170cef875708da06ab9ad7fc6a73b531cda1 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/3a/3f5a6ec1c968d1d2d5d20dee0d161a4351f279 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/3b/919b6e8a575b4779c8243ebea3e3beb436e88f create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/3f/d41804a7906db846af5e868444782e546af46a create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/41/71bb8d40e9fc830d79b757dc06ec6c14548b78 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/42/1b392106e079df6d412babd5636697938269ec create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/42/44d13e2bbc38510320443bbb003f3967d12436 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/42/cdad903aef3e7b614675e6584a8be417941911 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/43/2faca0c62dc556ad71a22f23e541a46a8b0f6f create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/43/5424798e5e1b21dd4588d1c291ba4eb179a838 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/43/6ea75c99f527e4b42fddb46abedf7726eb719d create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/48/3065df53c0f4a02cdc6b2910b05d388fc17ffb create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/4b/7c5650008b2e747fe1809eeb5a1dde0e80850a create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/4c/49317a0912ca559d2048bc329994eb7d10474f create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/4d/fc1be85a9d6c9898152444d32b238b4aecf8cc create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/4e/21d2d63357bde5027d1625f5ec6b430cdeb143 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/4e/70a6b06fc62481f80fbb74327849e7170eebff create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/4f/4e85a0ab8515e34302721fbcec06fa9d9c1a9a create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/50/e4facaafb746cfed89287206274193c1417288 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/53/9bd011c4822c560c1d17cab095006b7a10f707 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/56/07a8c4601a737daadd1f470bde3142aff57026 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/5a/ba269b3be41fc8db38068d3948c8af543fe609 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/5b/8e1e56cb99e8b99ac22eec8aebf6422ecd08c0 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/5e/8747f5200fac0f945a07daf6163ca9cb1a8da9 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/5f/18576d464946eb2338daeb8b4030019961f505 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/63/e8773becdea9c3699c95a5740be5baa8be8d69 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/65/bea8448ca5b3104628ffbca553c54bde54b0fc create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/66/6ffdfcf1eaa5641fa31064bf2607327e843c09 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/68/a2e1ee61a23a4728fe6b35580fbbbf729df370 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/68/af1fc7407fd9addf1701a87eb1c95c7494c598 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/68/f6182f4c85d39e1309d97c7e456156dc9c0096 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/6c/778edd0e4cf394f5a3df8b96db516024cc1bb8 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/6e/f31d35a3f5abc1e24f4f9afa5cb2016f03fa2d create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/71/3e438567b28543235faf265c4c5b02b437c7fd create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/72/3181f1bfd30e47a6d1d36a4d874e31e7a0a1a4 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/73/b20c8e09fa2726d69ff66969186014165da3c3 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/74/4df1bdf0f7bca20deb23e5a5eb8255fc237901 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/75/c653822173a8e5795153ec3773dfe44bb9bb63 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/78/3d6539dde96b8873c5b5da3e79cc14cd64830b create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/7a/9277e0c5ec75339f011c176d0c20e513c4de1c create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/7c/7bf85e978f1d18c0566f702d2cb7766b9c8d4f create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/7c/7e08f9559d9e1551b91e1cf68f1d0066109add create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/7e/3056f6765b3044ab09701077dbe1eb5b0e9ad0 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/81/5b5a1c80ca749d705c7aa0cb294a00cbedd340 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/88/8588a782ad433fbf0cc526e07cfe6f4a6b60b3 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/88/eb3f98849f4b8d0555395f514800900a01dc8f create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/89/8d12687fb35be271c27c795a6b32c8b51da79e create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/8a/bda8de114a93f2d3c5a975ee2960f31e24be58 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/8f/35f30bfe09513f96cf8aa4df0834ae34e93bae create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/94/d2c01087f48213bd157222d54edfefd77c9bba create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/95/78b04e2087976e382622322ba476aa40398dc7 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/96/23368f0fc562d6d840372ae17dc4cc32d51a80 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/97/3b70322e758da87e1ce21d2195d86c5e4e9647 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/98/1c79eb38518d3821e73bb159dc413bb42d6614 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/9a/e63b4a8ce0f181b2d1d098971733a103226917 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/9b/258ad4c39f40c24f66bf1faf48eb6202d59c85 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/9c/3f1c70db28c00ce74b22ba3edafe16d9cf03d4 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/9e/12bce04446d097ae1782967a5888c2e2a0d35b create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/a0/2d4fd126e0cc8fb46ee48cf38bad36d44f2dbc create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/a0/65d3022e99a1943177c10a53cce38bc2127042 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/a2/8c21c90aa36580641b345011869d1a899a6783 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/a2/fa36ffc4a565a223e225d15b18774f87d0c4f0 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/a3/4e5a16feabbd0335a633aadb8217c9f3dba58d create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/a7/b066537e6be7109abfe4ff97b675d4e077da20 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/a8/2a121ea36b115548d6dad2cd86ec27f06f7b30 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/aa/9e263294fd2f6f6fd9ceab23ca8ce3ea2ce707 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/ad/1ea02c2cc4f55c1dff87b80a086206a73885eb create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/ad/2ace9e15f66b3d1138922e6ffdc3ea3f967fa6 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/ad/98bfa4679fb00b89207a0a11b8bbf91a3e4de9 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/b2/a81ead9e722af0099fccfb478cea88eea749a2 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/b4/cefb3c75770e57bb8bb44e4a50d9578009e847 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/b9/1ef5ffa8612616c8e76051901caafd723f0e2c create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/bd/97980c22d122509cdd915fd9788d56c8d3ae20 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/c0/bd078a61d2cc22c52ca5ce04abdcdc5cc1829e create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/c4/83ca4bb087174af5cb51d7caa9c09fe4a28ccb create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/c4/e6cca3ec6ae0148ed231f97257df8c311e015f create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/ca/224bba0a8a24f1768804fe5f565b1014af7ef2 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/ca/49d1a8b6116ffeba22667bba265fa5261df7ab create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/ca/7d316d6d9af99d2481e980d68b77e572d80fe7 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/ca/fa936d25f0b397432a27201f6b3284c47df8be create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/cb/49ad76147f5f9439cbd6133708b76142660660 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/d0/dd5d9083bda65ec99aa8b9b64a5a278771b70a create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/d2/682aaf9594080ce877b5eeee110850fd6e3480 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/d6/04c75019c282144bdbbf3fd3462ba74b240efc create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/d7/1c24b3b113fd1d1909998c5bfe33b86a65ee03 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/d8/dd349b78f19a4ebe3357bacb8138f00bf5ed41 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/d8/e05a90b3c2240d71a20c2502c937d9b7d22777 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/da/b7b53383a1fec46632e60a1d847ce4f9ae14f2 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/db/203155a789fb749aa3c14e93eea2c744a9c6c7 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/de/a7215f259b2cced87d1bda6c72f8b4ce37a2ff create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/e1/512550f09d980214e46e6d3f5a2b20c3d75755 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/e1/dcfc3038be54195a59817c89782b261e46cb05 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/e2/93bfdddb81a853bbb16b8b58e68626f30841a4 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/e2/c84bb33992a455b1a7a5019f0e38d883d3f475 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/e2/d185fa827d58134cea20b9e1df893833c6560e create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/e5/0fbbd701458757bdfe9815f58ed717c588d1b5 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/ef/1783444b61a8671beea4ce1f4d0202677dfbfb create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/f1/3e1bc6ba935fce2efffa5be4c4832404034ef1 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/f1/72517a8cf39e009ffff541ee52429b89e418f3 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/f1/b44c04989a3a1c14b036cfadfa328d53a7bc5e create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/f3/5f159ff5d44dfd9f52d63dd5b659f0521ff569 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/f5/1658077d85f2264fa179b4d0848268cb3475c3 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/f7/929c5a67a4bdc98247fb4b5098675723932a64 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/fa/567f568ed72157c0c617438d077695b99d9aac create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/fd/8b5fe88cda995e70a22ed98701e65b843e05ec create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/fe/f01f3104c8047d05e8572e521c454f8fd4b8db create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/ff/b36e513f5fdf8a6ba850a20142676a2ac4807d create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchA-1 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchA-2 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchB-1 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchB-2 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchC-1 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchC-2 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchD-1 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchD-2 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchE-1 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchE-2 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchE-3 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchF-1 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchF-2 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchG-1 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchG-2 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchH-1 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchH-2 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchI-1 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchI-2 create mode 100644 vendor/libgit2/tests/resources/merge-recursive/asparagus.txt create mode 100644 vendor/libgit2/tests/resources/merge-recursive/beef.txt create mode 100644 vendor/libgit2/tests/resources/merge-recursive/bouilli.txt create mode 100644 vendor/libgit2/tests/resources/merge-recursive/gravy.txt create mode 100644 vendor/libgit2/tests/resources/merge-recursive/oyster.txt create mode 100644 vendor/libgit2/tests/resources/merge-recursive/veal.txt create mode 100644 vendor/libgit2/tests/resources/status/.gitted/objects/2b/d0a343aeef7a2cf0d158478966a6e587ff3863 create mode 100644 vendor/libgit2/tests/resources/status/.gitted/objects/d4/27e0b2e138501a3d15cc376077a3631e15bd46 create mode 100644 vendor/libgit2/tests/resources/status/.gitted/objects/ee/3fa1b8c00aff7fe02065fdb50864bb0d932ccf create mode 100644 vendor/libgit2/tests/resources/sub.git/HEAD create mode 100644 vendor/libgit2/tests/resources/sub.git/config create mode 100644 vendor/libgit2/tests/resources/sub.git/index create mode 100644 vendor/libgit2/tests/resources/sub.git/logs/HEAD create mode 100644 vendor/libgit2/tests/resources/sub.git/logs/refs/heads/master create mode 100644 vendor/libgit2/tests/resources/sub.git/objects/10/ddd6d257e01349d514541981aeecea6b2e741d create mode 100644 vendor/libgit2/tests/resources/sub.git/objects/17/6a458f94e0ea5272ce67c36bf30b6be9caf623 create mode 100644 vendor/libgit2/tests/resources/sub.git/objects/94/c7d78d85c933d1d95b56bc2de01833ba8559fb create mode 100644 vendor/libgit2/tests/resources/sub.git/objects/b7/a59b3f4ea13b985f8a1e0d3757d5cd3331add8 create mode 100644 vendor/libgit2/tests/resources/sub.git/objects/d0/ee23c41b28746d7e822511d7838bce784ae773 create mode 100644 vendor/libgit2/tests/resources/sub.git/refs/heads/master create mode 100644 vendor/libgit2/tests/resources/submodule_with_path/.gitmodules create mode 100644 vendor/libgit2/tests/resources/submodule_with_path/.gitted/HEAD create mode 100644 vendor/libgit2/tests/resources/submodule_with_path/.gitted/config create mode 100644 vendor/libgit2/tests/resources/submodule_with_path/.gitted/index create mode 100644 vendor/libgit2/tests/resources/submodule_with_path/.gitted/objects/18/372280a56a54340fa600aa91315065c6c4c693 create mode 100644 vendor/libgit2/tests/resources/submodule_with_path/.gitted/objects/36/683131578275f6a8fd1c539e0d5da0d8adff26 create mode 100644 vendor/libgit2/tests/resources/submodule_with_path/.gitted/objects/89/ca686bb21bfb75dda99a02313831a0c418f921 create mode 100644 vendor/libgit2/tests/resources/submodule_with_path/.gitted/objects/b1/620ef2628d10416a84d19c783e33dc4556c9c3 create mode 100644 vendor/libgit2/tests/resources/submodule_with_path/.gitted/objects/ba/34c47dc9d3d0b1bb335b45c9d26ba1f0fc90c7 create mode 100644 vendor/libgit2/tests/resources/submodule_with_path/.gitted/objects/c8/4bf57ba2254dba216ab5c6eb1a19fe8bd0e0d6 create mode 100644 vendor/libgit2/tests/resources/submodule_with_path/.gitted/objects/d5/45fc6b40ec9e67332b6a1d2dedcbdb1bffeb6b create mode 100644 vendor/libgit2/tests/resources/submodule_with_path/.gitted/refs/heads/master create mode 100644 vendor/libgit2/tests/resources/super/.gitted/COMMIT_EDITMSG create mode 100644 vendor/libgit2/tests/resources/super/.gitted/HEAD create mode 100644 vendor/libgit2/tests/resources/super/.gitted/config create mode 100644 vendor/libgit2/tests/resources/super/.gitted/index create mode 100644 vendor/libgit2/tests/resources/super/.gitted/objects/51/589c218bf77a8da9e9d8dbc097d76a742726c4 create mode 100644 vendor/libgit2/tests/resources/super/.gitted/objects/79/d0d58ca6aa1688a073d280169908454cad5b91 create mode 100644 vendor/libgit2/tests/resources/super/.gitted/objects/d7/57768b570a83e80d02edcc1032db14573e5034 create mode 100644 vendor/libgit2/tests/resources/super/.gitted/refs/heads/master create mode 100644 vendor/libgit2/tests/resources/super/gitmodules create mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/objects/ee/3fa1b8c00aff7fe02065fdb50864bb0d932ccf create mode 100644 vendor/libgit2/tests/resources/win32-forbidden/.gitted/HEAD create mode 100644 vendor/libgit2/tests/resources/win32-forbidden/.gitted/config create mode 100644 vendor/libgit2/tests/resources/win32-forbidden/.gitted/index create mode 100644 vendor/libgit2/tests/resources/win32-forbidden/.gitted/info/exclude create mode 100644 vendor/libgit2/tests/resources/win32-forbidden/.gitted/objects/10/68072702a28a82c78902cf5bf82c3864cf4356 create mode 100644 vendor/libgit2/tests/resources/win32-forbidden/.gitted/objects/17/6a458f94e0ea5272ce67c36bf30b6be9caf623 create mode 100644 vendor/libgit2/tests/resources/win32-forbidden/.gitted/objects/2d/7445a749d25269f32724aa621cb70b196bcc40 create mode 100644 vendor/libgit2/tests/resources/win32-forbidden/.gitted/objects/34/96991d72d500af36edef68bbfcccd1661d88db create mode 100644 vendor/libgit2/tests/resources/win32-forbidden/.gitted/objects/8f/45aad6f23b9509f8786c617e19c127ae76609a create mode 100644 vendor/libgit2/tests/resources/win32-forbidden/.gitted/objects/da/623abd956bb2fd8052c708c7ed43f05d192d37 create mode 100644 vendor/libgit2/tests/resources/win32-forbidden/.gitted/objects/ea/c7621a652e5261ef1c1d3e7ae31b0d84fcbaba create mode 100644 vendor/libgit2/tests/resources/win32-forbidden/.gitted/refs/heads/master create mode 100644 vendor/libgit2/tests/trace/windows/stacktrace.c create mode 100644 vendor/libgit2/tests/win32/forbidden.c diff --git a/generate/input/libgit2-docs.json b/generate/input/libgit2-docs.json index 71acf27a0..dec45be15 100644 --- a/generate/input/libgit2-docs.json +++ b/generate/input/libgit2-docs.json @@ -138,6 +138,7 @@ "git_commit_message", "git_commit_message_raw", "git_commit_summary", + "git_commit_body", "git_commit_time", "git_commit_time_offset", "git_commit_committer", @@ -150,12 +151,13 @@ "git_commit_parent_id", "git_commit_nth_gen_ancestor", "git_commit_header_field", + "git_commit_extract_signature", "git_commit_create", "git_commit_create_v", "git_commit_amend" ], "meta": {}, - "lines": 364 + "lines": 395 }, { "file": "common.h", @@ -165,7 +167,7 @@ "git_libgit2_opts" ], "meta": {}, - "lines": 245 + "lines": 282 }, { "file": "config.h", @@ -174,6 +176,7 @@ "git_config_find_global", "git_config_find_xdg", "git_config_find_system", + "git_config_find_programdata", "git_config_open_default", "git_config_new", "git_config_add_file_ondisk", @@ -210,10 +213,11 @@ "git_config_parse_int32", "git_config_parse_int64", "git_config_parse_path", - "git_config_backend_foreach_match" + "git_config_backend_foreach_match", + "git_config_lock" ], "meta": {}, - "lines": 691 + "lines": 724 }, { "file": "cred_helpers.h", @@ -238,6 +242,7 @@ "file": "diff.h", "functions": [ "git_diff_notify_cb", + "git_diff_progress_cb", "git_diff_init_options", "git_diff_file_cb", "git_diff_binary_cb", @@ -250,6 +255,7 @@ "git_diff_index_to_workdir", "git_diff_tree_to_workdir", "git_diff_tree_to_workdir_with_index", + "git_diff_index_to_index", "git_diff_merge", "git_diff_find_similar", "git_diff_num_deltas", @@ -273,19 +279,18 @@ "git_diff_format_email_init_options" ], "meta": {}, - "lines": 1301 + "lines": 1346 }, { "file": "errors.h", "functions": [ "giterr_last", "giterr_clear", - "giterr_detach", "giterr_set_str", "giterr_set_oom" ], "meta": {}, - "lines": 160 + "lines": 144 }, { "file": "filter.h", @@ -364,6 +369,7 @@ "git_index_remove_all", "git_index_update_all", "git_index_find", + "git_index_find_prefix", "git_index_conflict_add", "git_index_conflict_get", "git_index_conflict_remove", @@ -374,7 +380,7 @@ "git_index_conflict_iterator_free" ], "meta": {}, - "lines": 755 + "lines": 780 }, { "file": "indexer.h", @@ -408,7 +414,7 @@ "git_merge" ], "meta": {}, - "lines": 547 + "lines": 569 }, { "file": "message.h", @@ -623,13 +629,14 @@ "git_rebase_operation_current", "git_rebase_operation_byindex", "git_rebase_next", + "git_rebase_inmemory_index", "git_rebase_commit", "git_rebase_abort", "git_rebase_finish", "git_rebase_free" ], "meta": {}, - "lines": 286 + "lines": 316 }, { "file": "refdb.h", @@ -774,7 +781,7 @@ "git_remote_default_branch" ], "meta": {}, - "lines": 796 + "lines": 807 }, { "file": "repository.h", @@ -819,7 +826,7 @@ "git_repository_set_ident" ], "meta": {}, - "lines": 750 + "lines": 752 }, { "file": "reset.h", @@ -931,6 +938,7 @@ { "file": "submodule.h", "functions": [ + "git_submodule_cb", "git_submodule_update_init_options", "git_submodule_update", "git_submodule_lookup", @@ -965,12 +973,11 @@ "git_submodule_location" ], "meta": {}, - "lines": 622 + "lines": 633 }, { "file": "sys/commit.h", "functions": [ - "git_commit_create_from_ids", "git_commit_create_from_callback" ], "meta": {}, @@ -983,7 +990,7 @@ "git_config_add_backend" ], "meta": {}, - "lines": 109 + "lines": 123 }, { "file": "sys/diff.h", @@ -1002,7 +1009,6 @@ "git_filter_lookup", "git_filter_list_new", "git_filter_list_push", - "git_filter_list_length", "git_filter_source_repo", "git_filter_source_path", "git_filter_source_filemode", @@ -1018,12 +1024,11 @@ "git_filter_unregister" ], "meta": {}, - "lines": 305 + "lines": 317 }, { "file": "sys/hashsig.h", "functions": [ - "git_hashsig_create", "git_hashsig_create_fromfile", "git_hashsig_free", "git_hashsig_compare" @@ -1046,7 +1051,7 @@ "git_odb_init_backend" ], "meta": {}, - "lines": 102 + "lines": 106 }, { "file": "sys/openssl.h", @@ -1064,7 +1069,7 @@ "git_refdb_set_backend" ], "meta": {}, - "lines": 213 + "lines": 214 }, { "file": "sys/refs.h", @@ -1092,9 +1097,11 @@ }, { "file": "sys/stream.h", - "functions": [], + "functions": [ + "git_stream_register_tls" + ], "meta": {}, - "lines": 40 + "lines": 53 }, { "file": "sys/transport.h", @@ -1106,12 +1113,13 @@ "git_transport_dummy", "git_transport_local", "git_transport_smart", + "git_transport_smart_certificate_check", "git_smart_subtransport_http", "git_smart_subtransport_git", "git_smart_subtransport_ssh" ], "meta": {}, - "lines": 349 + "lines": 377 }, { "file": "tag.h", @@ -1162,10 +1170,11 @@ "git_cred_default_new", "git_cred_username_new", "git_cred_ssh_key_memory_new", + "git_cred_free", "git_cred_acquire_cb" ], "meta": {}, - "lines": 334 + "lines": 338 }, { "file": "tree.h", @@ -1320,7 +1329,7 @@ "comment": " 0 on success or error code" }, "description": "

Creates a git_annotated_commit from the given commit id.\n The resulting git_annotated_commit must be freed with\n git_annotated_commit_free.

\n", - "comments": "

An annotated commit contains information about how it was\n looked up, which may be useful for functions like merge or\n rebase to provide context to the operation. For example,\n conflict files will include the name of the source or target\n branches being merged. It is therefore preferable to use the\n most specific function (eg git_annotated_commit_from_ref)\n instead of this one when that data is known.

\n", + "comments": "

An annotated commit contains information about how it was looked up, which may be useful for functions like merge or rebase to provide context to the operation. For example, conflict files will include the name of the source or target branches being merged. It is therefore preferable to use the most specific function (eg git_annotated_commit_from_ref) instead of this one when that data is known.

\n", "group": "annotated" }, "git_annotated_commit_from_revspec": { @@ -1352,7 +1361,7 @@ "comment": " 0 on success or error code" }, "description": "

Creates a git_annotated_comit from a revision string.

\n", - "comments": "

See man gitrevisions, or\n http://git-scm.com/docs/git-rev-parse.html#_specifying_revisions for\n information on the syntax accepted.

\n", + "comments": "

See man gitrevisions, or http://git-scm.com/docs/git-rev-parse.html#_specifying_revisions for information on the syntax accepted.

\n", "group": "annotated" }, "git_annotated_commit_id": { @@ -1418,7 +1427,7 @@ "comment": " the value type for the attribute" }, "description": "

Return the value type for a given attribute.

\n", - "comments": "

This can be either TRUE, FALSE, UNSPECIFIED (if the attribute\n was not set at all), or VALUE, if the attribute was set to an\n actual string.

\n\n

If the attribute has a VALUE string, it can be accessed normally\n as a NULL-terminated C string.

\n", + "comments": "

This can be either TRUE, FALSE, UNSPECIFIED (if the attribute was not set at all), or VALUE, if the attribute was set to an actual string.

\n\n

If the attribute has a VALUE string, it can be accessed normally as a NULL-terminated C string.

\n", "group": "attr" }, "git_attr_get": { @@ -1507,7 +1516,7 @@ "comment": null }, "description": "

Look up a list of git attributes for path.

\n", - "comments": "

Use this if you have a known list of attributes that you want to\n look up in a single call. This is somewhat more efficient than\n calling git_attr_get() multiple times.

\n\n

For example, you might write:

\n\n
 const char *attrs[] = { "crlf", "diff", "foo" };\n const char **values[3];\n git_attr_get_many(values, repo, 0, "my/fun/file.c", 3, attrs);\n
\n\n

Then you could loop through the 3 values to get the settings for\n the three attributes you asked about.

\n", + "comments": "

Use this if you have a known list of attributes that you want to look up in a single call. This is somewhat more efficient than calling git_attr_get() multiple times.

\n\n

For example, you might write:

\n\n
 const char *attrs[] = { "crlf", "diff", "foo" };     const char **values[3];     git_attr_get_many(values, repo, 0, "my/fun/file.c", 3, attrs);\n
\n\n

Then you could loop through the 3 values to get the settings for the three attributes you asked about.

\n", "group": "attr" }, "git_attr_foreach": { @@ -1571,7 +1580,7 @@ "comment": null }, "description": "

Flush the gitattributes cache.

\n", - "comments": "

Call this if you have reason to believe that the attributes files on\n disk no longer match the cached contents of memory. This will cause\n the attributes files to be reloaded the next time that an attribute\n access function is called.

\n", + "comments": "

Call this if you have reason to believe that the attributes files on disk no longer match the cached contents of memory. This will cause the attributes files to be reloaded the next time that an attribute access function is called.

\n", "group": "attr" }, "git_attr_add_macro": { @@ -1603,7 +1612,7 @@ "comment": null }, "description": "

Add a macro definition.

\n", - "comments": "

Macros will automatically be loaded from the top level .gitattributes\n file of the repository (plus the build-in "binary" macro). This\n function allows you to add others. For example, to add the default\n macro, you would call:

\n\n
 git_attr_add_macro(repo, "binary", "-diff -crlf");\n
\n", + "comments": "

Macros will automatically be loaded from the top level .gitattributes file of the repository (plus the build-in "binary" macro). This function allows you to add others. For example, to add the default macro, you would call:

\n\n
 git_attr_add_macro(repo, "binary", "-diff -crlf");\n
\n", "group": "attr" }, "git_blame_init_options": { @@ -1695,12 +1704,12 @@ }, { "name": "lineno", - "type": "uint32_t", + "type": "size_t", "comment": "the (1-based) line number to find a hunk for" } ], - "argline": "git_blame *blame, uint32_t lineno", - "sig": "git_blame *::uint32_t", + "argline": "git_blame *blame, size_t lineno", + "sig": "git_blame *::size_t", "return": { "type": "const git_blame_hunk *", "comment": " the hunk that contains the given line, or NULL on error" @@ -1710,7 +1719,7 @@ "group": "blame", "examples": { "blame.c": [ - "ex/v0.23.2/blame.html#git_blame_get_hunk_byline-1" + "ex/v0.24.1/blame.html#git_blame_get_hunk_byline-1" ] } }, @@ -1752,7 +1761,7 @@ "group": "blame", "examples": { "blame.c": [ - "ex/v0.23.2/blame.html#git_blame_file-2" + "ex/v0.24.1/blame.html#git_blame_file-2" ] } }, @@ -1790,7 +1799,7 @@ "comment": " 0 on success, or an error code. (use giterr_last for information\n about the error)" }, "description": "

Get blame data for a file that has been modified in memory. The reference\n parameter is a pre-calculated blame for the in-odb history of the file. This\n means that once a file blame is completed (which can be expensive), updating\n the buffer blame is very fast.

\n", - "comments": "

Lines that differ between the buffer and the committed version are marked as\n having a zero OID for their final_commit_id.

\n", + "comments": "

Lines that differ between the buffer and the committed version are marked as having a zero OID for their final_commit_id.

\n", "group": "blame" }, "git_blame_free": { @@ -1816,7 +1825,7 @@ "group": "blame", "examples": { "blame.c": [ - "ex/v0.23.2/blame.html#git_blame_free-3" + "ex/v0.24.1/blame.html#git_blame_free-3" ] } }, @@ -1853,10 +1862,10 @@ "group": "blob", "examples": { "blame.c": [ - "ex/v0.23.2/blame.html#git_blob_lookup-4" + "ex/v0.24.1/blame.html#git_blob_lookup-4" ], "general.c": [ - "ex/v0.23.2/general.html#git_blob_lookup-1" + "ex/v0.24.1/general.html#git_blob_lookup-1" ] } }, @@ -1916,11 +1925,11 @@ "comment": null }, "description": "

Close an open blob

\n", - "comments": "

This is a wrapper around git_object_free()

\n\n

IMPORTANT:\n It is necessary to call this method when you stop\n using a blob. Failure to do so will cause a memory leak.

\n", + "comments": "

This is a wrapper around git_object_free()

\n\n

IMPORTANT: It is necessary to call this method when you stop using a blob. Failure to do so will cause a memory leak.

\n", "group": "blob", "examples": { "blame.c": [ - "ex/v0.23.2/blame.html#git_blob_free-5" + "ex/v0.24.1/blame.html#git_blob_free-5" ] } }, @@ -1987,17 +1996,17 @@ "comment": " the pointer" }, "description": "

Get a read-only buffer with the raw content of a blob.

\n", - "comments": "

A pointer to the raw content of a blob is returned;\n this pointer is owned internally by the object and shall\n not be free'd. The pointer may be invalidated at a later\n time.

\n", + "comments": "

A pointer to the raw content of a blob is returned; this pointer is owned internally by the object and shall not be free'd. The pointer may be invalidated at a later time.

\n", "group": "blob", "examples": { "blame.c": [ - "ex/v0.23.2/blame.html#git_blob_rawcontent-6" + "ex/v0.24.1/blame.html#git_blob_rawcontent-6" ], "cat-file.c": [ - "ex/v0.23.2/cat-file.html#git_blob_rawcontent-1" + "ex/v0.24.1/cat-file.html#git_blob_rawcontent-1" ], "general.c": [ - "ex/v0.23.2/general.html#git_blob_rawcontent-2" + "ex/v0.24.1/general.html#git_blob_rawcontent-2" ] } }, @@ -2024,14 +2033,14 @@ "group": "blob", "examples": { "blame.c": [ - "ex/v0.23.2/blame.html#git_blob_rawsize-7" + "ex/v0.24.1/blame.html#git_blob_rawsize-7" ], "cat-file.c": [ - "ex/v0.23.2/cat-file.html#git_blob_rawsize-2" + "ex/v0.24.1/cat-file.html#git_blob_rawsize-2" ], "general.c": [ - "ex/v0.23.2/general.html#git_blob_rawsize-3", - "ex/v0.23.2/general.html#git_blob_rawsize-4" + "ex/v0.24.1/general.html#git_blob_rawsize-3", + "ex/v0.24.1/general.html#git_blob_rawsize-4" ] } }, @@ -2069,7 +2078,7 @@ "comment": " 0 on success or an error code" }, "description": "

Get a buffer with the filtered content of a blob.

\n", - "comments": "

This applies filters as if the blob was being checked out to the\n working directory under the specified filename. This may apply\n CRLF filtering or other types of changes depending on the file\n attributes set for the blob and the content detected in it.

\n\n

The output is written into a git_buf which the caller must free\n when done (via git_buf_free).

\n\n

If no filters need to be applied, then the out buffer will just\n be populated with a pointer to the raw content of the blob. In\n that case, be careful to not free the blob until done with the\n buffer or copy it into memory you own.

\n", + "comments": "

This applies filters as if the blob was being checked out to the working directory under the specified filename. This may apply CRLF filtering or other types of changes depending on the file attributes set for the blob and the content detected in it.

\n\n

The output is written into a git_buf which the caller must free when done (via git_buf_free).

\n\n

If no filters need to be applied, then the out buffer will just be populated with a pointer to the raw content of the blob. In that case, be careful to not free the blob until done with the buffer or copy it into memory you own.

\n", "group": "blob" }, "git_blob_create_fromworkdir": { @@ -2175,7 +2184,7 @@ "comment": " 0 or error code (from either libgit2 or callback function)" }, "description": "

Write a loose blob to the Object Database from a\n provider of chunks of data.

\n", - "comments": "

If the hintpath parameter is filled, it will be used to determine\n what git filters should be applied to the object before it is written\n to the object database.

\n\n

The implementation of the callback MUST respect the following rules:

\n\n
    \n

  • content must be filled by the callback. The maximum number of\nbytes that the buffer can accept per call is defined by the\nmax_length parameter. Allocation and freeing of the buffer will\nbe taken care of by libgit2.

    • \n

  • The callback must return the number of bytes that have been\nwritten to the content buffer.

    • \n

  • When there is no more data to stream, callback should return

    \n\n
      \n
    1. This will prevent it from being invoked anymore.
      2. \n
    • \n

  • If an error occurs, the callback should return a negative value.\nThis value will be returned to the caller.

    • \n
\n", + "comments": "

If the hintpath parameter is filled, it will be used to determine what git filters should be applied to the object before it is written to the object database.

\n\n

The implementation of the callback MUST respect the following rules:

\n\n
    \n

  • content must be filled by the callback. The maximum number of bytes that the buffer can accept per call is defined by the max_length parameter. Allocation and freeing of the buffer will be taken care of by libgit2.

    • \n

  • The callback must return the number of bytes that have been written to the content buffer.

    • \n

  • When there is no more data to stream, callback should return 0. This will prevent it from being invoked anymore.

    • \n

  • If an error occurs, the callback should return a negative value. This value will be returned to the caller.

    • \n
\n", "group": "blob" }, "git_blob_create_frombuffer": { @@ -2234,7 +2243,7 @@ "comment": " 1 if the content of the blob is detected\n as binary; 0 otherwise." }, "description": "

Determine if the blob content is most certainly binary or not.

\n", - "comments": "

The heuristic used to guess if a file is binary is taken from core git:\n Searching for NUL bytes and looking for a reasonable ratio of printable\n to non-printable characters among the first 8000 bytes.

\n", + "comments": "

The heuristic used to guess if a file is binary is taken from core git: Searching for NUL bytes and looking for a reasonable ratio of printable to non-printable characters among the first 8000 bytes.

\n", "group": "blob" }, "git_branch_create": { @@ -2276,7 +2285,7 @@ "comment": " 0, GIT_EINVALIDSPEC or an error code.\n A proper reference is written in the refs/heads namespace\n pointing to the provided target commit." }, "description": "

Create a new branch pointing at a target commit

\n", - "comments": "

A new direct reference will be created pointing to\n this target commit. If force is true and a reference\n already exists with the given name, it'll be replaced.

\n\n

The returned reference must be freed by the user.

\n\n

The branch name will be checked for validity.\n See git_tag_create() for rules about valid names.

\n", + "comments": "

A new direct reference will be created pointing to this target commit. If force is true and a reference already exists with the given name, it'll be replaced.

\n\n

The returned reference must be freed by the user.

\n\n

The branch name will be checked for validity. See git_tag_create() for rules about valid names.

\n", "group": "branch" }, "git_branch_create_from_annotated": { @@ -2318,7 +2327,7 @@ "comment": null }, "description": "

Create a new branch pointing at a target commit

\n", - "comments": "

This behaves like git_branch_create() but takes an annotated\n commit, which lets you specify which extended sha syntax string was\n specified by a user, allowing for more exact reflog messages.

\n\n

See the documentation for git_branch_create().

\n", + "comments": "

This behaves like git_branch_create() but takes an annotated commit, which lets you specify which extended sha syntax string was specified by a user, allowing for more exact reflog messages.

\n\n

See the documentation for git_branch_create().

\n", "group": "branch" }, "git_branch_delete": { @@ -2340,7 +2349,7 @@ "comment": " 0 on success, or an error code." }, "description": "

Delete an existing branch reference.

\n", - "comments": "

If the branch is successfully deleted, the passed reference\n object will be invalidated. The reference must be freed manually\n by the user.

\n", + "comments": "

If the branch is successfully deleted, the passed reference object will be invalidated. The reference must be freed manually by the user.

\n", "group": "branch" }, "git_branch_iterator_new": { @@ -2463,7 +2472,7 @@ "comment": " 0 on success, GIT_EINVALIDSPEC or an error code." }, "description": "

Move/rename an existing local branch reference.

\n", - "comments": "

The new branch name will be checked for validity.\n See git_tag_create() for rules about valid names.

\n", + "comments": "

The new branch name will be checked for validity. See git_tag_create() for rules about valid names.

\n", "group": "branch" }, "git_branch_lookup": { @@ -2500,7 +2509,7 @@ "comment": " 0 on success; GIT_ENOTFOUND when no matching branch\n exists, GIT_EINVALIDSPEC, otherwise an error code." }, "description": "

Lookup a branch by its name in a repository.

\n", - "comments": "

The generated reference must be freed by the user.

\n\n

The branch name will be checked for validity.\n See git_tag_create() for rules about valid names.

\n", + "comments": "

The generated reference must be freed by the user.

\n\n

The branch name will be checked for validity. See git_tag_create() for rules about valid names.

\n", "group": "branch" }, "git_branch_name": { @@ -2527,7 +2536,7 @@ "comment": " 0 on success; otherwise an error code (e.g., if the\n ref is no local or remote branch)." }, "description": "

Return the name of the given local or remote branch.

\n", - "comments": "

The name of the branch matches the definition of the name\n for git_branch_lookup. That is, if the returned name is given\n to git_branch_lookup() then the reference is returned that\n was given to this function.

\n", + "comments": "

The name of the branch matches the definition of the name for git_branch_lookup. That is, if the returned name is given to git_branch_lookup() then the reference is returned that was given to this function.

\n", "group": "branch" }, "git_branch_upstream": { @@ -2625,17 +2634,17 @@ "comment": null }, "description": "

Free the memory referred to by the git_buf.

\n", - "comments": "

Note that this does not free the git_buf itself, just the memory\n pointed to by buffer->ptr. This will not free the memory if it looks\n like it was not allocated internally, but it will clear the buffer back\n to the empty state.

\n", + "comments": "

Note that this does not free the git_buf itself, just the memory pointed to by buffer->ptr. This will not free the memory if it looks like it was not allocated internally, but it will clear the buffer back to the empty state.

\n", "group": "buf", "examples": { "diff.c": [ - "ex/v0.23.2/diff.html#git_buf_free-1" + "ex/v0.24.1/diff.html#git_buf_free-1" ], "remote.c": [ - "ex/v0.23.2/remote.html#git_buf_free-1" + "ex/v0.24.1/remote.html#git_buf_free-1" ], "tag.c": [ - "ex/v0.23.2/tag.html#git_buf_free-1" + "ex/v0.24.1/tag.html#git_buf_free-1" ] } }, @@ -2663,7 +2672,7 @@ "comment": " 0 on success, -1 on allocation failure" }, "description": "

Resize the buffer allocation to make more space.

\n", - "comments": "

This will attempt to grow the buffer to accommodate the target size.

\n\n

If the buffer refers to memory that was not allocated by libgit2 (i.e.\n the asize field is zero), then ptr will be replaced with a newly\n allocated block of data. Be careful so that memory allocated by the\n caller is not lost. As a special variant, if you pass target_size as\n 0 and the memory is not allocated by libgit2, this will allocate a new\n buffer of size size and copy the external data into it.

\n\n

Currently, this will never shrink a buffer, only expand it.

\n\n

If the allocation fails, this will return an error and the buffer will be\n marked as invalid for future operations, invaliding the contents.

\n", + "comments": "

This will attempt to grow the buffer to accommodate the target size.

\n\n

If the buffer refers to memory that was not allocated by libgit2 (i.e. the asize field is zero), then ptr will be replaced with a newly allocated block of data. Be careful so that memory allocated by the caller is not lost. As a special variant, if you pass target_size as 0 and the memory is not allocated by libgit2, this will allocate a new buffer of size size and copy the external data into it.

\n\n

Currently, this will never shrink a buffer, only expand it.

\n\n

If the allocation fails, this will return an error and the buffer will be marked as invalid for future operations, invaliding the contents.

\n", "group": "buf" }, "git_buf_set": { @@ -3027,11 +3036,11 @@ "comment": " 0 on success, any non-zero return value from a callback\n function, or a negative value to indicate an error (use\n `giterr_last` for a detailed error message)" }, "description": "

Clone a remote repository.

\n", - "comments": "

By default this creates its repository and initial remote to match\n git's defaults. You can use the options in the callback to\n customize how these are created.

\n", + "comments": "

By default this creates its repository and initial remote to match git's defaults. You can use the options in the callback to customize how these are created.

\n", "group": "clone", "examples": { "network/clone.c": [ - "ex/v0.23.2/network/clone.html#git_clone-1" + "ex/v0.24.1/network/clone.html#git_clone-1" ] } }, @@ -3064,16 +3073,16 @@ "comment": " 0 or an error code" }, "description": "

Lookup a commit object from a repository.

\n", - "comments": "

The returned object should be released with git_commit_free when no\n longer needed.

\n", + "comments": "

The returned object should be released with git_commit_free when no longer needed.

\n", "group": "commit", "examples": { "general.c": [ - "ex/v0.23.2/general.html#git_commit_lookup-5", - "ex/v0.23.2/general.html#git_commit_lookup-6", - "ex/v0.23.2/general.html#git_commit_lookup-7" + "ex/v0.24.1/general.html#git_commit_lookup-5", + "ex/v0.24.1/general.html#git_commit_lookup-6", + "ex/v0.24.1/general.html#git_commit_lookup-7" ], "log.c": [ - "ex/v0.23.2/log.html#git_commit_lookup-1" + "ex/v0.24.1/log.html#git_commit_lookup-1" ] } }, @@ -3111,7 +3120,7 @@ "comment": " 0 or an error code" }, "description": "

Lookup a commit object from a repository, given a prefix of its\n identifier (short id).

\n", - "comments": "

The returned object should be released with git_commit_free when no\n longer needed.

\n", + "comments": "

The returned object should be released with git_commit_free when no longer needed.

\n", "group": "commit" }, "git_commit_free": { @@ -3133,20 +3142,20 @@ "comment": null }, "description": "

Close an open commit

\n", - "comments": "

This is a wrapper around git_object_free()

\n\n

IMPORTANT:\n It is necessary to call this method when you stop\n using a commit. Failure to do so will cause a memory leak.

\n", + "comments": "

This is a wrapper around git_object_free()

\n\n

IMPORTANT: It is necessary to call this method when you stop using a commit. Failure to do so will cause a memory leak.

\n", "group": "commit", "examples": { "general.c": [ - "ex/v0.23.2/general.html#git_commit_free-8", - "ex/v0.23.2/general.html#git_commit_free-9", - "ex/v0.23.2/general.html#git_commit_free-10", - "ex/v0.23.2/general.html#git_commit_free-11" + "ex/v0.24.1/general.html#git_commit_free-8", + "ex/v0.24.1/general.html#git_commit_free-9", + "ex/v0.24.1/general.html#git_commit_free-10", + "ex/v0.24.1/general.html#git_commit_free-11" ], "log.c": [ - "ex/v0.23.2/log.html#git_commit_free-2", - "ex/v0.23.2/log.html#git_commit_free-3", - "ex/v0.23.2/log.html#git_commit_free-4", - "ex/v0.23.2/log.html#git_commit_free-5" + "ex/v0.24.1/log.html#git_commit_free-2", + "ex/v0.24.1/log.html#git_commit_free-3", + "ex/v0.24.1/log.html#git_commit_free-4", + "ex/v0.24.1/log.html#git_commit_free-5" ] } }, @@ -3173,10 +3182,10 @@ "group": "commit", "examples": { "general.c": [ - "ex/v0.23.2/general.html#git_commit_id-12" + "ex/v0.24.1/general.html#git_commit_id-12" ], "log.c": [ - "ex/v0.23.2/log.html#git_commit_id-6" + "ex/v0.24.1/log.html#git_commit_id-6" ] } }, @@ -3203,8 +3212,8 @@ "group": "commit", "examples": { "log.c": [ - "ex/v0.23.2/log.html#git_commit_owner-7", - "ex/v0.23.2/log.html#git_commit_owner-8" + "ex/v0.24.1/log.html#git_commit_owner-7", + "ex/v0.24.1/log.html#git_commit_owner-8" ] } }, @@ -3227,7 +3236,7 @@ "comment": " NULL, or the encoding" }, "description": "

Get the encoding for the message of a commit,\n as a string representing a standard encoding name.

\n", - "comments": "

The encoding may be NULL if the encoding header\n in the commit is missing; in that case UTF-8 is assumed.

\n", + "comments": "

The encoding may be NULL if the encoding header in the commit is missing; in that case UTF-8 is assumed.

\n", "group": "commit" }, "git_commit_message": { @@ -3249,24 +3258,24 @@ "comment": " the message of a commit" }, "description": "

Get the full message of a commit.

\n", - "comments": "

The returned message will be slightly prettified by removing any\n potential leading newlines.

\n", + "comments": "

The returned message will be slightly prettified by removing any potential leading newlines.

\n", "group": "commit", "examples": { "cat-file.c": [ - "ex/v0.23.2/cat-file.html#git_commit_message-3", - "ex/v0.23.2/cat-file.html#git_commit_message-4" + "ex/v0.24.1/cat-file.html#git_commit_message-3", + "ex/v0.24.1/cat-file.html#git_commit_message-4" ], "general.c": [ - "ex/v0.23.2/general.html#git_commit_message-13", - "ex/v0.23.2/general.html#git_commit_message-14", - "ex/v0.23.2/general.html#git_commit_message-15" + "ex/v0.24.1/general.html#git_commit_message-13", + "ex/v0.24.1/general.html#git_commit_message-14", + "ex/v0.24.1/general.html#git_commit_message-15" ], "log.c": [ - "ex/v0.23.2/log.html#git_commit_message-9", - "ex/v0.23.2/log.html#git_commit_message-10" + "ex/v0.24.1/log.html#git_commit_message-9", + "ex/v0.24.1/log.html#git_commit_message-10" ], "tag.c": [ - "ex/v0.23.2/tag.html#git_commit_message-2" + "ex/v0.24.1/tag.html#git_commit_message-2" ] } }, @@ -3311,14 +3320,36 @@ "comment": " the summary of a commit or NULL on error" }, "description": "

Get the short "summary" of the git commit message.

\n", - "comments": "

The returned message is the summary of the commit, comprising the\n first paragraph of the message with whitespace trimmed and squashed.

\n", + "comments": "

The returned message is the summary of the commit, comprising the first paragraph of the message with whitespace trimmed and squashed.

\n", + "group": "commit" + }, + "git_commit_body": { + "type": "function", + "file": "commit.h", + "line": 141, + "lineto": 141, + "args": [ + { + "name": "commit", + "type": "git_commit *", + "comment": "a previously loaded commit." + } + ], + "argline": "git_commit *commit", + "sig": "git_commit *", + "return": { + "type": "const char *", + "comment": " the body of a commit or NULL when no the message only\n consists of a summary" + }, + "description": "

Get the long "body" of the git commit message.

\n", + "comments": "

The returned message is the body of the commit, comprising everything but the first paragraph of the message. Leading and trailing whitespaces are trimmed.

\n", "group": "commit" }, "git_commit_time": { "type": "function", "file": "commit.h", - "line": 136, - "lineto": 136, + "line": 149, + "lineto": 149, "args": [ { "name": "commit", @@ -3337,16 +3368,16 @@ "group": "commit", "examples": { "general.c": [ - "ex/v0.23.2/general.html#git_commit_time-16", - "ex/v0.23.2/general.html#git_commit_time-17" + "ex/v0.24.1/general.html#git_commit_time-16", + "ex/v0.24.1/general.html#git_commit_time-17" ] } }, "git_commit_time_offset": { "type": "function", "file": "commit.h", - "line": 144, - "lineto": 144, + "line": 157, + "lineto": 157, "args": [ { "name": "commit", @@ -3367,8 +3398,8 @@ "git_commit_committer": { "type": "function", "file": "commit.h", - "line": 152, - "lineto": 152, + "line": 165, + "lineto": 165, "args": [ { "name": "commit", @@ -3387,21 +3418,21 @@ "group": "commit", "examples": { "cat-file.c": [ - "ex/v0.23.2/cat-file.html#git_commit_committer-5" + "ex/v0.24.1/cat-file.html#git_commit_committer-5" ], "general.c": [ - "ex/v0.23.2/general.html#git_commit_committer-18" + "ex/v0.24.1/general.html#git_commit_committer-18" ], "log.c": [ - "ex/v0.23.2/log.html#git_commit_committer-11" + "ex/v0.24.1/log.html#git_commit_committer-11" ] } }, "git_commit_author": { "type": "function", "file": "commit.h", - "line": 160, - "lineto": 160, + "line": 173, + "lineto": 173, "args": [ { "name": "commit", @@ -3420,23 +3451,23 @@ "group": "commit", "examples": { "cat-file.c": [ - "ex/v0.23.2/cat-file.html#git_commit_author-6" + "ex/v0.24.1/cat-file.html#git_commit_author-6" ], "general.c": [ - "ex/v0.23.2/general.html#git_commit_author-19", - "ex/v0.23.2/general.html#git_commit_author-20" + "ex/v0.24.1/general.html#git_commit_author-19", + "ex/v0.24.1/general.html#git_commit_author-20" ], "log.c": [ - "ex/v0.23.2/log.html#git_commit_author-12", - "ex/v0.23.2/log.html#git_commit_author-13" + "ex/v0.24.1/log.html#git_commit_author-12", + "ex/v0.24.1/log.html#git_commit_author-13" ] } }, "git_commit_raw_header": { "type": "function", "file": "commit.h", - "line": 168, - "lineto": 168, + "line": 181, + "lineto": 181, "args": [ { "name": "commit", @@ -3457,8 +3488,8 @@ "git_commit_tree": { "type": "function", "file": "commit.h", - "line": 177, - "lineto": 177, + "line": 190, + "lineto": 190, "args": [ { "name": "tree_out", @@ -3482,19 +3513,19 @@ "group": "commit", "examples": { "log.c": [ - "ex/v0.23.2/log.html#git_commit_tree-14", - "ex/v0.23.2/log.html#git_commit_tree-15", - "ex/v0.23.2/log.html#git_commit_tree-16", - "ex/v0.23.2/log.html#git_commit_tree-17", - "ex/v0.23.2/log.html#git_commit_tree-18" + "ex/v0.24.1/log.html#git_commit_tree-14", + "ex/v0.24.1/log.html#git_commit_tree-15", + "ex/v0.24.1/log.html#git_commit_tree-16", + "ex/v0.24.1/log.html#git_commit_tree-17", + "ex/v0.24.1/log.html#git_commit_tree-18" ] } }, "git_commit_tree_id": { "type": "function", "file": "commit.h", - "line": 187, - "lineto": 187, + "line": 200, + "lineto": 200, "args": [ { "name": "commit", @@ -3513,15 +3544,15 @@ "group": "commit", "examples": { "cat-file.c": [ - "ex/v0.23.2/cat-file.html#git_commit_tree_id-7" + "ex/v0.24.1/cat-file.html#git_commit_tree_id-7" ] } }, "git_commit_parentcount": { "type": "function", "file": "commit.h", - "line": 195, - "lineto": 195, + "line": 208, + "lineto": 208, "args": [ { "name": "commit", @@ -3540,22 +3571,22 @@ "group": "commit", "examples": { "cat-file.c": [ - "ex/v0.23.2/cat-file.html#git_commit_parentcount-8" + "ex/v0.24.1/cat-file.html#git_commit_parentcount-8" ], "general.c": [ - "ex/v0.23.2/general.html#git_commit_parentcount-21" + "ex/v0.24.1/general.html#git_commit_parentcount-21" ], "log.c": [ - "ex/v0.23.2/log.html#git_commit_parentcount-19", - "ex/v0.23.2/log.html#git_commit_parentcount-20" + "ex/v0.24.1/log.html#git_commit_parentcount-19", + "ex/v0.24.1/log.html#git_commit_parentcount-20" ] } }, "git_commit_parent": { "type": "function", "file": "commit.h", - "line": 205, - "lineto": 208, + "line": 218, + "lineto": 221, "args": [ { "name": "out", @@ -3584,19 +3615,19 @@ "group": "commit", "examples": { "general.c": [ - "ex/v0.23.2/general.html#git_commit_parent-22" + "ex/v0.24.1/general.html#git_commit_parent-22" ], "log.c": [ - "ex/v0.23.2/log.html#git_commit_parent-21", - "ex/v0.23.2/log.html#git_commit_parent-22" + "ex/v0.24.1/log.html#git_commit_parent-21", + "ex/v0.24.1/log.html#git_commit_parent-22" ] } }, "git_commit_parent_id": { "type": "function", "file": "commit.h", - "line": 219, - "lineto": 221, + "line": 232, + "lineto": 234, "args": [ { "name": "commit", @@ -3620,18 +3651,18 @@ "group": "commit", "examples": { "cat-file.c": [ - "ex/v0.23.2/cat-file.html#git_commit_parent_id-9" + "ex/v0.24.1/cat-file.html#git_commit_parent_id-9" ], "log.c": [ - "ex/v0.23.2/log.html#git_commit_parent_id-23" + "ex/v0.24.1/log.html#git_commit_parent_id-23" ] } }, "git_commit_nth_gen_ancestor": { "type": "function", "file": "commit.h", - "line": 237, - "lineto": 240, + "line": 250, + "lineto": 253, "args": [ { "name": "ancestor", @@ -3656,14 +3687,14 @@ "comment": " 0 on success; GIT_ENOTFOUND if no matching ancestor exists\n or an error code" }, "description": "

Get the commit object that is the \n<n

\n\n
\n

th generation ancestor\n of the named commit object, following only the first parents.\n The returned commit has to be freed by the caller.

\n
\n", - "comments": "

Passing 0 as the generation number returns another instance of the\n base commit itself.

\n", + "comments": "

Passing 0 as the generation number returns another instance of the base commit itself.

\n", "group": "commit" }, "git_commit_header_field": { "type": "function", "file": "commit.h", - "line": 251, - "lineto": 251, + "line": 264, + "lineto": 264, "args": [ { "name": "out", @@ -3691,11 +3722,53 @@ "comments": "", "group": "commit" }, + "git_commit_extract_signature": { + "type": "function", + "file": "commit.h", + "line": 282, + "lineto": 282, + "args": [ + { + "name": "signature", + "type": "git_buf *", + "comment": "the signature block" + }, + { + "name": "signed_data", + "type": "git_buf *", + "comment": "signed data; this is the commit contents minus the signature block" + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "the repository in which the commit exists" + }, + { + "name": "commit_id", + "type": "git_oid *", + "comment": "the commit from which to extract the data" + }, + { + "name": "field", + "type": "const char *", + "comment": "the name of the header field containing the signature\n block; pass `NULL` to extract the default 'gpgsig'" + } + ], + "argline": "git_buf *signature, git_buf *signed_data, git_repository *repo, git_oid *commit_id, const char *field", + "sig": "git_buf *::git_buf *::git_repository *::git_oid *::const char *", + "return": { + "type": "int", + "comment": " 0 on success, GIT_ENOTFOUND if the id is not for a commit\n or the commit does not have a signature." + }, + "description": "

Extract the signature from a commit

\n", + "comments": "

If the id is not for a commit, the error class will be GITERR_INVALID. If the commit does not have a signature, the error class will be GITERR_OBJECT.

\n", + "group": "commit" + }, "git_commit_create": { "type": "function", "file": "commit.h", - "line": 297, - "lineto": 307, + "line": 328, + "lineto": 338, "args": [ { "name": "id", @@ -3755,14 +3828,14 @@ "comment": " 0 or an error code\n\tThe created commit will be written to the Object Database and\n\tthe given reference will be updated to point to it" }, "description": "

Create new commit in the repository from a list of git_object pointers

\n", - "comments": "

The message will not be cleaned up automatically. You can do that\n with the git_message_prettify() function.

\n", + "comments": "

The message will not be cleaned up automatically. You can do that with the git_message_prettify() function.

\n", "group": "commit" }, "git_commit_create_v": { "type": "function", "file": "commit.h", - "line": 323, - "lineto": 333, + "line": 354, + "lineto": 364, "args": [ { "name": "id", @@ -3817,22 +3890,22 @@ "comment": null }, "description": "

Create new commit in the repository using a variable argument list.

\n", - "comments": "

The message will not be cleaned up automatically. You can do that\n with the git_message_prettify() function.

\n\n

The parents for the commit are specified as a variable list of pointers\n to const git_commit *. Note that this is a convenience method which may\n not be safe to export for certain languages or compilers

\n\n

All other parameters remain the same as git_commit_create().

\n", + "comments": "

The message will not be cleaned up automatically. You can do that with the git_message_prettify() function.

\n\n

The parents for the commit are specified as a variable list of pointers to const git_commit *. Note that this is a convenience method which may not be safe to export for certain languages or compilers

\n\n

All other parameters remain the same as git_commit_create().

\n", "group": "commit", "examples": { "general.c": [ - "ex/v0.23.2/general.html#git_commit_create_v-23" + "ex/v0.24.1/general.html#git_commit_create_v-23" ], "init.c": [ - "ex/v0.23.2/init.html#git_commit_create_v-1" + "ex/v0.24.1/init.html#git_commit_create_v-1" ] } }, "git_commit_amend": { "type": "function", "file": "commit.h", - "line": 356, - "lineto": 364, + "line": 387, + "lineto": 395, "args": [ { "name": "id", @@ -3882,14 +3955,14 @@ "comment": null }, "description": "

Amend an existing commit by replacing only non-NULL values.

\n", - "comments": "

This creates a new commit that is exactly the same as the old commit,\n except that any non-NULL values will be updated. The new commit has\n the same parents as the old commit.

\n\n

The update_ref value works as in the regular git_commit_create(),\n updating the ref to point to the newly rewritten commit. If you want\n to amend a commit that is not currently the tip of the branch and then\n rewrite the following commits to reach a ref, pass this as NULL and\n update the rest of the commit chain and ref separately.

\n\n

Unlike git_commit_create(), the author, committer, message,\n message_encoding, and tree parameters can be NULL in which case this\n will use the values from the original commit_to_amend.

\n\n

All parameters have the same meanings as in git_commit_create().

\n", + "comments": "

This creates a new commit that is exactly the same as the old commit, except that any non-NULL values will be updated. The new commit has the same parents as the old commit.

\n\n

The update_ref value works as in the regular git_commit_create(), updating the ref to point to the newly rewritten commit. If you want to amend a commit that is not currently the tip of the branch and then rewrite the following commits to reach a ref, pass this as NULL and update the rest of the commit chain and ref separately.

\n\n

Unlike git_commit_create(), the author, committer, message, message_encoding, and tree parameters can be NULL in which case this will use the values from the original commit_to_amend.

\n\n

All parameters have the same meanings as in git_commit_create().

\n", "group": "commit" }, "git_libgit2_version": { "type": "function", "file": "common.h", - "line": 94, - "lineto": 94, + "line": 105, + "lineto": 105, "args": [ { "name": "major", @@ -3920,8 +3993,8 @@ "git_libgit2_features": { "type": "function", "file": "common.h", - "line": 124, - "lineto": 124, + "line": 136, + "lineto": 136, "args": [], "argline": "", "sig": "", @@ -3930,14 +4003,14 @@ "comment": " A combination of GIT_FEATURE_* values." }, "description": "

Query compile time options for libgit2.

\n", - "comments": "
    \n

  • GIT_FEATURE_THREADS\nLibgit2 was compiled with thread support. Note that thread support is\nstill to be seen as a 'work in progress' - basic object lookups are\nbelieved to be threadsafe, but other operations may not be.

    • \n

  • GIT_FEATURE_HTTPS\nLibgit2 supports the https:// protocol. This requires the openssl\nlibrary to be found when compiling libgit2.

    • \n

  • GIT_FEATURE_SSH\nLibgit2 supports the SSH protocol for network operations. This requires\nthe libssh2 library to be found when compiling libgit2

    • \n
\n", + "comments": "
    \n

  • GIT_FEATURE_THREADS Libgit2 was compiled with thread support. Note that thread support is still to be seen as a 'work in progress' - basic object lookups are believed to be threadsafe, but other operations may not be.

    • \n

  • GIT_FEATURE_HTTPS Libgit2 supports the https:// protocol. This requires the openssl library to be found when compiling libgit2.

    • \n

  • GIT_FEATURE_SSH Libgit2 supports the SSH protocol for network operations. This requires the libssh2 library to be found when compiling libgit2

    • \n
\n", "group": "libgit2" }, "git_libgit2_opts": { "type": "function", "file": "common.h", - "line": 245, - "lineto": 245, + "line": 282, + "lineto": 282, "args": [ { "name": "option", @@ -3952,14 +4025,14 @@ "comment": " 0 on success, \n<\n0 on failure" }, "description": "

Set or query a library global option

\n", - "comments": "

Available options:

\n\n
* opts(GIT_OPT_GET_MWINDOW_SIZE, size_t *):\n\n    > Get the maximum mmap window size\n\n* opts(GIT_OPT_SET_MWINDOW_SIZE, size_t):\n\n    > Set the maximum mmap window size\n\n* opts(GIT_OPT_GET_MWINDOW_MAPPED_LIMIT, size_t *):\n\n    > Get the maximum memory that will be mapped in total by the library\n\n* opts(GIT_OPT_SET_MWINDOW_MAPPED_LIMIT, size_t):\n\n    >Set the maximum amount of memory that can be mapped at any time\n    by the library\n\n* opts(GIT_OPT_GET_SEARCH_PATH, int level, git_buf *buf)\n\n    > Get the search path for a given level of config data.  "level" must\n    > be one of `GIT_CONFIG_LEVEL_SYSTEM`, `GIT_CONFIG_LEVEL_GLOBAL`, or\n    > `GIT_CONFIG_LEVEL_XDG`.  The search path is written to the `out`\n    > buffer.\n\n* opts(GIT_OPT_SET_SEARCH_PATH, int level, const char *path)\n\n    > Set the search path for a level of config data.  The search path\n    > applied to shared attributes and ignore files, too.\n    >\n    > - `path` lists directories delimited by GIT_PATH_LIST_SEPARATOR.\n    >   Pass NULL to reset to the default (generally based on environment\n    >   variables).  Use magic path `$PATH` to include the old value\n    >   of the path (if you want to prepend or append, for instance).\n    >\n    > - `level` must be GIT_CONFIG_LEVEL_SYSTEM, GIT_CONFIG_LEVEL_GLOBAL,\n    >   or GIT_CONFIG_LEVEL_XDG.\n\n* opts(GIT_OPT_SET_CACHE_OBJECT_LIMIT, git_otype type, size_t size)\n\n    > Set the maximum data size for the given type of object to be\n    > considered eligible for caching in memory.  Setting to value to\n    > zero means that that type of object will not be cached.\n    > Defaults to 0 for GIT_OBJ_BLOB (i.e. won't cache blobs) and 4k\n    > for GIT_OBJ_COMMIT, GIT_OBJ_TREE, and GIT_OBJ_TAG.\n\n* opts(GIT_OPT_SET_CACHE_MAX_SIZE, ssize_t max_storage_bytes)\n\n    > Set the maximum total data size that will be cached in memory\n    > across all repositories before libgit2 starts evicting objects\n    > from the cache.  This is a soft limit, in that the library might\n    > briefly exceed it, but will start aggressively evicting objects\n    > from cache when that happens.  The default cache size is 256MB.\n\n* opts(GIT_OPT_ENABLE_CACHING, int enabled)\n\n    > Enable or disable caching completely.\n    >\n    > Because caches are repository-specific, disabling the cache\n    > cannot immediately clear all cached objects, but each cache will\n    > be cleared on the next attempt to update anything in it.\n\n* opts(GIT_OPT_GET_CACHED_MEMORY, ssize_t *current, ssize_t *allowed)\n\n    > Get the current bytes in cache and the maximum that would be\n    > allowed in the cache.\n\n* opts(GIT_OPT_GET_TEMPLATE_PATH, git_buf *out)\n\n    > Get the default template path.\n    > The path is written to the `out` buffer.\n\n* opts(GIT_OPT_SET_TEMPLATE_PATH, const char *path)\n\n    > Set the default template path.\n    >\n    > - `path` directory of template.\n\n* opts(GIT_OPT_SET_SSL_CERT_LOCATIONS, const char *file, const char *path)\n\n    > Set the SSL certificate-authority locations.\n    >\n    > - `file` is the location of a file containing several\n    >   certificates concatenated together.\n    > - `path` is the location of a directory holding several\n    >   certificates, one per file.\n    >\n    > Either parameter may be `NULL`, but not both.\n
\n", + "comments": "

Available options:

\n\n
* opts(GIT_OPT_GET_MWINDOW_SIZE, size_t *):\n\n    > Get the maximum mmap window size\n\n* opts(GIT_OPT_SET_MWINDOW_SIZE, size_t):\n\n    > Set the maximum mmap window size\n\n* opts(GIT_OPT_GET_MWINDOW_MAPPED_LIMIT, size_t *):\n\n    > Get the maximum memory that will be mapped in total by the library\n\n* opts(GIT_OPT_SET_MWINDOW_MAPPED_LIMIT, size_t):\n\n    >Set the maximum amount of memory that can be mapped at any time        by the library\n\n* opts(GIT_OPT_GET_SEARCH_PATH, int level, git_buf *buf)\n\n    > Get the search path for a given level of config data.  "level" must       > be one of `GIT_CONFIG_LEVEL_SYSTEM`, `GIT_CONFIG_LEVEL_GLOBAL`,       > `GIT_CONFIG_LEVEL_XDG`, or `GIT_CONFIG_LEVEL_PROGRAMDATA`.        > The search path is written to the `out` buffer.\n\n* opts(GIT_OPT_SET_SEARCH_PATH, int level, const char *path)\n\n    > Set the search path for a level of config data.  The search path      > applied to shared attributes and ignore files, too.       >       > - `path` lists directories delimited by GIT_PATH_LIST_SEPARATOR.      >   Pass NULL to reset to the default (generally based on environment       >   variables).  Use magic path `$PATH` to include the old value        >   of the path (if you want to prepend or append, for instance).       >       > - `level` must be `GIT_CONFIG_LEVEL_SYSTEM`,      >   `GIT_CONFIG_LEVEL_GLOBAL`, `GIT_CONFIG_LEVEL_XDG`, or       >   `GIT_CONFIG_LEVEL_PROGRAMDATA`.\n\n* opts(GIT_OPT_SET_CACHE_OBJECT_LIMIT, git_otype type, size_t size)\n\n    > Set the maximum data size for the given type of object to be      > considered eligible for caching in memory.  Setting to value to       > zero means that that type of object will not be cached.       > Defaults to 0 for GIT_OBJ_BLOB (i.e. won't cache blobs) and 4k        > for GIT_OBJ_COMMIT, GIT_OBJ_TREE, and GIT_OBJ_TAG.\n\n* opts(GIT_OPT_SET_CACHE_MAX_SIZE, ssize_t max_storage_bytes)\n\n    > Set the maximum total data size that will be cached in memory     > across all repositories before libgit2 starts evicting objects        > from the cache.  This is a soft limit, in that the library might      > briefly exceed it, but will start aggressively evicting objects       > from cache when that happens.  The default cache size is 256MB.\n\n* opts(GIT_OPT_ENABLE_CACHING, int enabled)\n\n    > Enable or disable caching completely.     >       > Because caches are repository-specific, disabling the cache       > cannot immediately clear all cached objects, but each cache will      > be cleared on the next attempt to update anything in it.\n\n* opts(GIT_OPT_GET_CACHED_MEMORY, ssize_t *current, ssize_t *allowed)\n\n    > Get the current bytes in cache and the maximum that would be      > allowed in the cache.\n\n* opts(GIT_OPT_GET_TEMPLATE_PATH, git_buf *out)\n\n    > Get the default template path.        > The path is written to the `out` buffer.\n\n* opts(GIT_OPT_SET_TEMPLATE_PATH, const char *path)\n\n    > Set the default template path.        >       > - `path` directory of template.\n\n* opts(GIT_OPT_SET_SSL_CERT_LOCATIONS, const char *file, const char *path)\n\n    > Set the SSL certificate-authority locations.      >       > - `file` is the location of a file containing several     >   certificates concatenated together.     > - `path` is the location of a directory holding several       >   certificates, one per file.     >       > Either parameter may be `NULL`, but not both.\n\n* opts(GIT_OPT_SET_USER_AGENT, const char *user_agent)\n\n    > Set the value of the User-Agent header.  This value will be       > appended to "git/1.0", for compatibility with other git clients.      >       > - `user_agent` is the value that will be delivered as the     >   User-Agent header on HTTP requests.\n\n* opts(GIT_OPT_ENABLE_STRICT_OBJECT_CREATION, int enabled)\n\n    > Enable strict input validation when creating new objects      > to ensure that all inputs to the new objects are valid.  For      > example, when this is enabled, the parent(s) and tree inputs      > will be validated when creating a new commit.  This defaults      > to disabled.  * opts(GIT_OPT_SET_SSL_CIPHERS, const char *ciphers)\n\n    > Set the SSL ciphers use for HTTPS connections.        >       > - `ciphers` is the list of ciphers that are eanbled.\n
\n", "group": "libgit2" }, "git_config_entry_free": { "type": "function", "file": "config.h", - "line": 72, - "lineto": 72, + "line": 75, + "lineto": 75, "args": [ { "name": "", @@ -3980,8 +4053,8 @@ "git_config_find_global": { "type": "function", "file": "config.h", - "line": 113, - "lineto": 113, + "line": 116, + "lineto": 116, "args": [ { "name": "out", @@ -3996,14 +4069,14 @@ "comment": " 0 if a global configuration file has been found. Its path will be stored in `out`." }, "description": "

Locate the path to the global configuration file

\n", - "comments": "

The user or global configuration file is usually\n located in $HOME/.gitconfig.

\n\n

This method will try to guess the full path to that\n file, if the file exists. The returned path\n may be used on any git_config call to load the\n global configuration file.

\n\n

This method will not guess the path to the xdg compatible\n config file (.config/git/config).

\n", + "comments": "

The user or global configuration file is usually located in $HOME/.gitconfig.

\n\n

This method will try to guess the full path to that file, if the file exists. The returned path may be used on any git_config call to load the global configuration file.

\n\n

This method will not guess the path to the xdg compatible config file (.config/git/config).

\n", "group": "config" }, "git_config_find_xdg": { "type": "function", "file": "config.h", - "line": 130, - "lineto": 130, + "line": 133, + "lineto": 133, "args": [ { "name": "out", @@ -4018,14 +4091,14 @@ "comment": " 0 if a xdg compatible configuration file has been\n\tfound. Its path will be stored in `out`." }, "description": "

Locate the path to the global xdg compatible configuration file

\n", - "comments": "

The xdg compatible configuration file is usually\n located in $HOME/.config/git/config.

\n\n

This method will try to guess the full path to that\n file, if the file exists. The returned path\n may be used on any git_config call to load the\n xdg compatible configuration file.

\n", + "comments": "

The xdg compatible configuration file is usually located in $HOME/.config/git/config.

\n\n

This method will try to guess the full path to that file, if the file exists. The returned path may be used on any git_config call to load the xdg compatible configuration file.

\n", "group": "config" }, "git_config_find_system": { "type": "function", "file": "config.h", - "line": 142, - "lineto": 142, + "line": 145, + "lineto": 145, "args": [ { "name": "out", @@ -4040,14 +4113,36 @@ "comment": " 0 if a system configuration file has been\n\tfound. Its path will be stored in `out`." }, "description": "

Locate the path to the system configuration file

\n", - "comments": "

If /etc/gitconfig doesn't exist, it will look for\n %PROGRAMFILES%

\n\n

.

\n", + "comments": "

If /etc/gitconfig doesn't exist, it will look for %PROGRAMFILES%.

\n", + "group": "config" + }, + "git_config_find_programdata": { + "type": "function", + "file": "config.h", + "line": 156, + "lineto": 156, + "args": [ + { + "name": "out", + "type": "git_buf *", + "comment": "Pointer to a user-allocated git_buf in which to store the path" + } + ], + "argline": "git_buf *out", + "sig": "git_buf *", + "return": { + "type": "int", + "comment": " 0 if a ProgramData configuration file has been\n\tfound. Its path will be stored in `out`." + }, + "description": "

Locate the path to the configuration file in ProgramData

\n", + "comments": "

Look for the file in %PROGRAMDATA% used by portable git.

\n", "group": "config" }, "git_config_open_default": { "type": "function", "file": "config.h", - "line": 154, - "lineto": 154, + "line": 168, + "lineto": 168, "args": [ { "name": "out", @@ -4062,14 +4157,14 @@ "comment": " 0 or an error code" }, "description": "

Open the global, XDG and system configuration files

\n", - "comments": "

Utility wrapper that finds the global, XDG and system configuration files\n and opens them into a single prioritized config object that can be\n used when accessing default config data outside a repository.

\n", + "comments": "

Utility wrapper that finds the global, XDG and system configuration files and opens them into a single prioritized config object that can be used when accessing default config data outside a repository.

\n", "group": "config" }, "git_config_new": { "type": "function", "file": "config.h", - "line": 165, - "lineto": 165, + "line": 179, + "lineto": 179, "args": [ { "name": "out", @@ -4084,14 +4179,14 @@ "comment": " 0 or an error code" }, "description": "

Allocate a new configuration object

\n", - "comments": "

This object is empty, so you have to add a file to it before you\n can do anything with it.

\n", + "comments": "

This object is empty, so you have to add a file to it before you can do anything with it.

\n", "group": "config" }, "git_config_add_file_ondisk": { "type": "function", "file": "config.h", - "line": 192, - "lineto": 196, + "line": 206, + "lineto": 210, "args": [ { "name": "cfg", @@ -4121,14 +4216,14 @@ "comment": " 0 on success, GIT_EEXISTS when adding more than one file\n for a given priority level (and force_replace set to 0),\n GIT_ENOTFOUND when the file doesn't exist or error code" }, "description": "

Add an on-disk config file instance to an existing config

\n", - "comments": "

The on-disk file pointed at by path will be opened and\n parsed; it's expected to be a native Git config file following\n the default Git config syntax (see man git-config).

\n\n

If the file does not exist, the file will still be added and it\n will be created the first time we write to it.

\n\n

Note that the configuration object will free the file\n automatically.

\n\n

Further queries on this config object will access each\n of the config file instances in order (instances with\n a higher priority level will be accessed first).

\n", + "comments": "

The on-disk file pointed at by path will be opened and parsed; it's expected to be a native Git config file following the default Git config syntax (see man git-config).

\n\n

If the file does not exist, the file will still be added and it will be created the first time we write to it.

\n\n

Note that the configuration object will free the file automatically.

\n\n

Further queries on this config object will access each of the config file instances in order (instances with a higher priority level will be accessed first).

\n", "group": "config" }, "git_config_open_ondisk": { "type": "function", "file": "config.h", - "line": 210, - "lineto": 210, + "line": 224, + "lineto": 224, "args": [ { "name": "out", @@ -4148,19 +4243,19 @@ "comment": " 0 on success, or an error code" }, "description": "

Create a new config instance containing a single on-disk file

\n", - "comments": "

This method is a simple utility wrapper for the following sequence\n of calls:\n - git_config_new\n - git_config_add_file_ondisk

\n", + "comments": "

This method is a simple utility wrapper for the following sequence of calls: - git_config_new - git_config_add_file_ondisk

\n", "group": "config", "examples": { "general.c": [ - "ex/v0.23.2/general.html#git_config_open_ondisk-24" + "ex/v0.24.1/general.html#git_config_open_ondisk-24" ] } }, "git_config_open_level": { "type": "function", "file": "config.h", - "line": 228, - "lineto": 231, + "line": 242, + "lineto": 245, "args": [ { "name": "out", @@ -4185,14 +4280,14 @@ "comment": " 0, GIT_ENOTFOUND if the passed level cannot be found in the\n multi-level parent config, or an error code" }, "description": "

Build a single-level focused config object from a multi-level one.

\n", - "comments": "

The returned config object can be used to perform get/set/delete operations\n on a single specific level.

\n\n

Getting several times the same level from the same parent multi-level config\n will return different config instances, but containing the same config_file\n instance.

\n", + "comments": "

The returned config object can be used to perform get/set/delete operations on a single specific level.

\n\n

Getting several times the same level from the same parent multi-level config will return different config instances, but containing the same config_file instance.

\n", "group": "config" }, "git_config_open_global": { "type": "function", "file": "config.h", - "line": 245, - "lineto": 245, + "line": 259, + "lineto": 259, "args": [ { "name": "out", @@ -4212,14 +4307,14 @@ "comment": null }, "description": "

Open the global/XDG configuration file according to git's rules

\n", - "comments": "

Git allows you to store your global configuration at\n $HOME/.config or $XDG_CONFIG_HOME/git/config. For backwards\n compatability, the XDG file shouldn't be used unless the use has\n created it explicitly. With this function you'll open the correct\n one to write to.

\n", + "comments": "

Git allows you to store your global configuration at $HOME/.config or $XDG_CONFIG_HOME/git/config. For backwards compatability, the XDG file shouldn't be used unless the use has created it explicitly. With this function you'll open the correct one to write to.

\n", "group": "config" }, "git_config_snapshot": { "type": "function", "file": "config.h", - "line": 261, - "lineto": 261, + "line": 275, + "lineto": 275, "args": [ { "name": "out", @@ -4239,14 +4334,14 @@ "comment": " 0 or an error code" }, "description": "

Create a snapshot of the configuration

\n", - "comments": "

Create a snapshot of the current state of a configuration, which\n allows you to look into a consistent view of the configuration for\n looking up complex values (e.g. a remote, submodule).

\n\n

The string returned when querying such a config object is valid\n until it is freed.

\n", + "comments": "

Create a snapshot of the current state of a configuration, which allows you to look into a consistent view of the configuration for looking up complex values (e.g. a remote, submodule).

\n\n

The string returned when querying such a config object is valid until it is freed.

\n", "group": "config" }, "git_config_free": { "type": "function", "file": "config.h", - "line": 268, - "lineto": 268, + "line": 282, + "lineto": 282, "args": [ { "name": "cfg", @@ -4267,8 +4362,8 @@ "git_config_get_entry": { "type": "function", "file": "config.h", - "line": 280, - "lineto": 283, + "line": 294, + "lineto": 297, "args": [ { "name": "out", @@ -4299,8 +4394,8 @@ "git_config_get_int32": { "type": "function", "file": "config.h", - "line": 297, - "lineto": 297, + "line": 311, + "lineto": 311, "args": [ { "name": "out", @@ -4325,19 +4420,19 @@ "comment": " 0 or an error code" }, "description": "

Get the value of an integer config variable.

\n", - "comments": "

All config files will be looked into, in the order of their\n defined level. A higher level means a higher priority. The\n first occurrence of the variable will be returned here.

\n", + "comments": "

All config files will be looked into, in the order of their defined level. A higher level means a higher priority. The first occurrence of the variable will be returned here.

\n", "group": "config", "examples": { "general.c": [ - "ex/v0.23.2/general.html#git_config_get_int32-25" + "ex/v0.24.1/general.html#git_config_get_int32-25" ] } }, "git_config_get_int64": { "type": "function", "file": "config.h", - "line": 311, - "lineto": 311, + "line": 325, + "lineto": 325, "args": [ { "name": "out", @@ -4362,14 +4457,14 @@ "comment": " 0 or an error code" }, "description": "

Get the value of a long integer config variable.

\n", - "comments": "

All config files will be looked into, in the order of their\n defined level. A higher level means a higher priority. The\n first occurrence of the variable will be returned here.

\n", + "comments": "

All config files will be looked into, in the order of their defined level. A higher level means a higher priority. The first occurrence of the variable will be returned here.

\n", "group": "config" }, "git_config_get_bool": { "type": "function", "file": "config.h", - "line": 328, - "lineto": 328, + "line": 342, + "lineto": 342, "args": [ { "name": "out", @@ -4394,14 +4489,14 @@ "comment": " 0 or an error code" }, "description": "

Get the value of a boolean config variable.

\n", - "comments": "

This function uses the usual C convention of 0 being false and\n anything else true.

\n\n

All config files will be looked into, in the order of their\n defined level. A higher level means a higher priority. The\n first occurrence of the variable will be returned here.

\n", + "comments": "

This function uses the usual C convention of 0 being false and anything else true.

\n\n

All config files will be looked into, in the order of their defined level. A higher level means a higher priority. The first occurrence of the variable will be returned here.

\n", "group": "config" }, "git_config_get_path": { "type": "function", "file": "config.h", - "line": 346, - "lineto": 346, + "line": 360, + "lineto": 360, "args": [ { "name": "out", @@ -4426,14 +4521,14 @@ "comment": " 0 or an error code" }, "description": "

Get the value of a path config variable.

\n", - "comments": "

A leading '~' will be expanded to the global search path (which\n defaults to the user's home directory but can be overridden via\n git_libgit2_opts().

\n\n

All config files will be looked into, in the order of their\n defined level. A higher level means a higher priority. The\n first occurrence of the variable will be returned here.

\n", + "comments": "

A leading '~' will be expanded to the global search path (which defaults to the user's home directory but can be overridden via git_libgit2_opts().

\n\n

All config files will be looked into, in the order of their defined level. A higher level means a higher priority. The first occurrence of the variable will be returned here.

\n", "group": "config" }, "git_config_get_string": { "type": "function", "file": "config.h", - "line": 364, - "lineto": 364, + "line": 378, + "lineto": 378, "args": [ { "name": "out", @@ -4458,19 +4553,19 @@ "comment": " 0 or an error code" }, "description": "

Get the value of a string config variable.

\n", - "comments": "

This function can only be used on snapshot config objects. The\n string is owned by the config and should not be freed by the\n user. The pointer will be valid until the config is freed.

\n\n

All config files will be looked into, in the order of their\n defined level. A higher level means a higher priority. The\n first occurrence of the variable will be returned here.

\n", + "comments": "

This function can only be used on snapshot config objects. The string is owned by the config and should not be freed by the user. The pointer will be valid until the config is freed.

\n\n

All config files will be looked into, in the order of their defined level. A higher level means a higher priority. The first occurrence of the variable will be returned here.

\n", "group": "config", "examples": { "general.c": [ - "ex/v0.23.2/general.html#git_config_get_string-26" + "ex/v0.24.1/general.html#git_config_get_string-26" ] } }, "git_config_get_string_buf": { "type": "function", "file": "config.h", - "line": 380, - "lineto": 380, + "line": 394, + "lineto": 394, "args": [ { "name": "out", @@ -4495,14 +4590,14 @@ "comment": " 0 or an error code" }, "description": "

Get the value of a string config variable.

\n", - "comments": "

The value of the config will be copied into the buffer.

\n\n

All config files will be looked into, in the order of their\n defined level. A higher level means a higher priority. The\n first occurrence of the variable will be returned here.

\n", + "comments": "

The value of the config will be copied into the buffer.

\n\n

All config files will be looked into, in the order of their defined level. A higher level means a higher priority. The first occurrence of the variable will be returned here.

\n", "group": "config" }, "git_config_get_multivar_foreach": { "type": "function", "file": "config.h", - "line": 394, - "lineto": 394, + "line": 408, + "lineto": 408, "args": [ { "name": "cfg", @@ -4543,8 +4638,8 @@ "git_config_multivar_iterator_new": { "type": "function", "file": "config.h", - "line": 405, - "lineto": 405, + "line": 419, + "lineto": 419, "args": [ { "name": "out", @@ -4580,8 +4675,8 @@ "git_config_next": { "type": "function", "file": "config.h", - "line": 417, - "lineto": 417, + "line": 431, + "lineto": 431, "args": [ { "name": "entry", @@ -4601,14 +4696,14 @@ "comment": " 0 or an error code. GIT_ITEROVER if the iteration has completed" }, "description": "

Return the current entry and advance the iterator

\n", - "comments": "

The pointers returned by this function are valid until the iterator\n is freed.

\n", + "comments": "

The pointers returned by this function are valid until the iterator is freed.

\n", "group": "config" }, "git_config_iterator_free": { "type": "function", "file": "config.h", - "line": 424, - "lineto": 424, + "line": 438, + "lineto": 438, "args": [ { "name": "iter", @@ -4629,8 +4724,8 @@ "git_config_set_int32": { "type": "function", "file": "config.h", - "line": 435, - "lineto": 435, + "line": 449, + "lineto": 449, "args": [ { "name": "cfg", @@ -4661,8 +4756,8 @@ "git_config_set_int64": { "type": "function", "file": "config.h", - "line": 446, - "lineto": 446, + "line": 460, + "lineto": 460, "args": [ { "name": "cfg", @@ -4693,8 +4788,8 @@ "git_config_set_bool": { "type": "function", "file": "config.h", - "line": 457, - "lineto": 457, + "line": 471, + "lineto": 471, "args": [ { "name": "cfg", @@ -4725,8 +4820,8 @@ "git_config_set_string": { "type": "function", "file": "config.h", - "line": 471, - "lineto": 471, + "line": 485, + "lineto": 485, "args": [ { "name": "cfg", @@ -4751,14 +4846,14 @@ "comment": " 0 or an error code" }, "description": "

Set the value of a string config variable in the config file\n with the highest level (usually the local one).

\n", - "comments": "

A copy of the string is made and the user is free to use it\n afterwards.

\n", + "comments": "

A copy of the string is made and the user is free to use it afterwards.

\n", "group": "config" }, "git_config_set_multivar": { "type": "function", "file": "config.h", - "line": 481, - "lineto": 481, + "line": 495, + "lineto": 495, "args": [ { "name": "cfg", @@ -4794,8 +4889,8 @@ "git_config_delete_entry": { "type": "function", "file": "config.h", - "line": 490, - "lineto": 490, + "line": 504, + "lineto": 504, "args": [ { "name": "cfg", @@ -4821,8 +4916,8 @@ "git_config_delete_multivar": { "type": "function", "file": "config.h", - "line": 501, - "lineto": 501, + "line": 515, + "lineto": 515, "args": [ { "name": "cfg", @@ -4853,8 +4948,8 @@ "git_config_foreach": { "type": "function", "file": "config.h", - "line": 519, - "lineto": 522, + "line": 533, + "lineto": 536, "args": [ { "name": "cfg", @@ -4879,14 +4974,14 @@ "comment": " 0 on success, non-zero callback return value, or error code" }, "description": "

Perform an operation on each config variable.

\n", - "comments": "

The callback receives the normalized name and value of each variable\n in the config backend, and the data pointer passed to this function.\n If the callback returns a non-zero value, the function stops iterating\n and returns that value to the caller.

\n\n

The pointers passed to the callback are only valid as long as the\n iteration is ongoing.

\n", + "comments": "

The callback receives the normalized name and value of each variable in the config backend, and the data pointer passed to this function. If the callback returns a non-zero value, the function stops iterating and returns that value to the caller.

\n\n

The pointers passed to the callback are only valid as long as the iteration is ongoing.

\n", "group": "config" }, "git_config_iterator_new": { "type": "function", "file": "config.h", - "line": 533, - "lineto": 533, + "line": 547, + "lineto": 547, "args": [ { "name": "out", @@ -4906,14 +5001,14 @@ "comment": null }, "description": "

Iterate over all the config variables

\n", - "comments": "

Use git_config_next to advance the iteration and\n git_config_iterator_free when done.

\n", + "comments": "

Use git_config_next to advance the iteration and git_config_iterator_free when done.

\n", "group": "config" }, "git_config_iterator_glob_new": { "type": "function", "file": "config.h", - "line": 545, - "lineto": 545, + "line": 559, + "lineto": 559, "args": [ { "name": "out", @@ -4938,14 +5033,14 @@ "comment": null }, "description": "

Iterate over all the config variables whose name matches a pattern

\n", - "comments": "

Use git_config_next to advance the iteration and\n git_config_iterator_free when done.

\n", + "comments": "

Use git_config_next to advance the iteration and git_config_iterator_free when done.

\n", "group": "config" }, "git_config_foreach_match": { "type": "function", "file": "config.h", - "line": 563, - "lineto": 567, + "line": 577, + "lineto": 581, "args": [ { "name": "cfg", @@ -4975,14 +5070,14 @@ "comment": " 0 or the return value of the callback which didn't return 0" }, "description": "

Perform an operation on each config variable matching a regular expression.

\n", - "comments": "

This behaviors like git_config_foreach with an additional filter of a\n regular expression that filters which config keys are passed to the\n callback.

\n\n

The pointers passed to the callback are only valid as long as the\n iteration is ongoing.

\n", + "comments": "

This behaviors like git_config_foreach with an additional filter of a regular expression that filters which config keys are passed to the callback.

\n\n

The pointers passed to the callback are only valid as long as the iteration is ongoing.

\n", "group": "config" }, "git_config_get_mapped": { "type": "function", "file": "config.h", - "line": 603, - "lineto": 608, + "line": 617, + "lineto": 622, "args": [ { "name": "out", @@ -5017,14 +5112,14 @@ "comment": " 0 on success, error code otherwise" }, "description": "

Query the value of a config variable and return it mapped to\n an integer constant.

\n", - "comments": "

This is a helper method to easily map different possible values\n to a variable to integer constants that easily identify them.

\n\n

A mapping array looks as follows:

\n\n
git_cvar_map autocrlf_mapping[] = {\n    {GIT_CVAR_FALSE, NULL, GIT_AUTO_CRLF_FALSE},\n    {GIT_CVAR_TRUE, NULL, GIT_AUTO_CRLF_TRUE},\n    {GIT_CVAR_STRING, "input", GIT_AUTO_CRLF_INPUT},\n    {GIT_CVAR_STRING, "default", GIT_AUTO_CRLF_DEFAULT}};\n
\n\n

On any "false" value for the variable (e.g. "false", "FALSE", "no"), the\n mapping will store GIT_AUTO_CRLF_FALSE in the out parameter.

\n\n

The same thing applies for any "true" value such as "true", "yes" or "1", storing\n the GIT_AUTO_CRLF_TRUE variable.

\n\n

Otherwise, if the value matches the string "input" (with case insensitive comparison),\n the given constant will be stored in out, and likewise for "default".

\n\n

If not a single match can be made to store in out, an error code will be\n returned.

\n", + "comments": "

This is a helper method to easily map different possible values to a variable to integer constants that easily identify them.

\n\n

A mapping array looks as follows:

\n\n
git_cvar_map autocrlf_mapping[] = {     {GIT_CVAR_FALSE, NULL, GIT_AUTO_CRLF_FALSE},        {GIT_CVAR_TRUE, NULL, GIT_AUTO_CRLF_TRUE},      {GIT_CVAR_STRING, "input", GIT_AUTO_CRLF_INPUT},        {GIT_CVAR_STRING, "default", GIT_AUTO_CRLF_DEFAULT}};\n
\n\n

On any "false" value for the variable (e.g. "false", "FALSE", "no"), the mapping will store GIT_AUTO_CRLF_FALSE in the out parameter.

\n\n

The same thing applies for any "true" value such as "true", "yes" or "1", storing the GIT_AUTO_CRLF_TRUE variable.

\n\n

Otherwise, if the value matches the string "input" (with case insensitive comparison), the given constant will be stored in out, and likewise for "default".

\n\n

If not a single match can be made to store in out, an error code will be returned.

\n", "group": "config" }, "git_config_lookup_map_value": { "type": "function", "file": "config.h", - "line": 618, - "lineto": 622, + "line": 632, + "lineto": 636, "args": [ { "name": "out", @@ -5060,8 +5155,8 @@ "git_config_parse_bool": { "type": "function", "file": "config.h", - "line": 634, - "lineto": 634, + "line": 648, + "lineto": 648, "args": [ { "name": "out", @@ -5081,14 +5176,14 @@ "comment": null }, "description": "

Parse a string value as a bool.

\n", - "comments": "

Valid values for true are: 'true', 'yes', 'on', 1 or any\n number different from 0\n Valid values for false are: 'false', 'no', 'off', 0

\n", + "comments": "

Valid values for true are: 'true', 'yes', 'on', 1 or any number different from 0 Valid values for false are: 'false', 'no', 'off', 0

\n", "group": "config" }, "git_config_parse_int32": { "type": "function", "file": "config.h", - "line": 646, - "lineto": 646, + "line": 660, + "lineto": 660, "args": [ { "name": "out", @@ -5108,14 +5203,14 @@ "comment": null }, "description": "

Parse a string value as an int32.

\n", - "comments": "

An optional value suffix of 'k', 'm', or 'g' will\n cause the value to be multiplied by 1024, 1048576,\n or 1073741824 prior to output.

\n", + "comments": "

An optional value suffix of 'k', 'm', or 'g' will cause the value to be multiplied by 1024, 1048576, or 1073741824 prior to output.

\n", "group": "config" }, "git_config_parse_int64": { "type": "function", "file": "config.h", - "line": 658, - "lineto": 658, + "line": 672, + "lineto": 672, "args": [ { "name": "out", @@ -5135,14 +5230,14 @@ "comment": null }, "description": "

Parse a string value as an int64.

\n", - "comments": "

An optional value suffix of 'k', 'm', or 'g' will\n cause the value to be multiplied by 1024, 1048576,\n or 1073741824 prior to output.

\n", + "comments": "

An optional value suffix of 'k', 'm', or 'g' will cause the value to be multiplied by 1024, 1048576, or 1073741824 prior to output.

\n", "group": "config" }, "git_config_parse_path": { "type": "function", "file": "config.h", - "line": 673, - "lineto": 673, + "line": 687, + "lineto": 687, "args": [ { "name": "out", @@ -5162,14 +5257,14 @@ "comment": null }, "description": "

Parse a string value as a path.

\n", - "comments": "

A leading '~' will be expanded to the global search path (which\n defaults to the user's home directory but can be overridden via\n git_libgit2_opts().

\n\n

If the value does not begin with a tilde, the input will be\n returned.

\n", + "comments": "

A leading '~' will be expanded to the global search path (which defaults to the user's home directory but can be overridden via git_libgit2_opts().

\n\n

If the value does not begin with a tilde, the input will be returned.

\n", "group": "config" }, "git_config_backend_foreach_match": { "type": "function", "file": "config.h", - "line": 687, - "lineto": 691, + "line": 701, + "lineto": 705, "args": [ { "name": "backend", @@ -5199,7 +5294,34 @@ "comment": null }, "description": "

Perform an operation on each config variable in given config backend\n matching a regular expression.

\n", - "comments": "

This behaviors like git_config_foreach_match except instead of all config\n entries it just enumerates through the given backend entry.

\n", + "comments": "

This behaviors like git_config_foreach_match except instead of all config entries it just enumerates through the given backend entry.

\n", + "group": "config" + }, + "git_config_lock": { + "type": "function", + "file": "config.h", + "line": 724, + "lineto": 724, + "args": [ + { + "name": "tx", + "type": "git_transaction **", + "comment": "the resulting transaction, use this to commit or undo the\n changes" + }, + { + "name": "cfg", + "type": "git_config *", + "comment": "the configuration in which to lock" + } + ], + "argline": "git_transaction **tx, git_config *cfg", + "sig": "git_transaction **::git_config *", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Lock the backend with the highest priority

\n", + "comments": "

Locking disallows anybody else from writing to that backend. Any updates made after locking will not be visible to a reader until the file is unlocked.

\n\n

You can apply the changes by calling git_transaction_commit() before freeing the transaction. Either of these actions will unlock the config.

\n", "group": "config" }, "git_cred_userpass": { @@ -5277,7 +5399,7 @@ "group": "describe", "examples": { "describe.c": [ - "ex/v0.23.2/describe.html#git_describe_commit-1" + "ex/v0.24.1/describe.html#git_describe_commit-1" ] } }, @@ -5310,11 +5432,11 @@ "comment": null }, "description": "

Describe a commit

\n", - "comments": "

Perform the describe operation on the current commit and the\n worktree. After peforming describe on HEAD, a status is run and the\n description is considered to be dirty if there are.

\n", + "comments": "

Perform the describe operation on the current commit and the worktree. After peforming describe on HEAD, a status is run and the description is considered to be dirty if there are.

\n", "group": "describe", "examples": { "describe.c": [ - "ex/v0.23.2/describe.html#git_describe_workdir-2" + "ex/v0.24.1/describe.html#git_describe_workdir-2" ] } }, @@ -5351,7 +5473,7 @@ "group": "describe", "examples": { "describe.c": [ - "ex/v0.23.2/describe.html#git_describe_format-3" + "ex/v0.24.1/describe.html#git_describe_format-3" ] } }, @@ -5380,8 +5502,8 @@ "git_diff_init_options": { "type": "function", "file": "diff.h", - "line": 412, - "lineto": 414, + "line": 435, + "lineto": 437, "args": [ { "name": "opts", @@ -5407,8 +5529,8 @@ "git_diff_find_init_options": { "type": "function", "file": "diff.h", - "line": 697, - "lineto": 699, + "line": 720, + "lineto": 722, "args": [ { "name": "opts", @@ -5434,8 +5556,8 @@ "git_diff_free": { "type": "function", "file": "diff.h", - "line": 713, - "lineto": 713, + "line": 736, + "lineto": 736, "args": [ { "name": "diff", @@ -5454,19 +5576,19 @@ "group": "diff", "examples": { "diff.c": [ - "ex/v0.23.2/diff.html#git_diff_free-2" + "ex/v0.24.1/diff.html#git_diff_free-2" ], "log.c": [ - "ex/v0.23.2/log.html#git_diff_free-24", - "ex/v0.23.2/log.html#git_diff_free-25" + "ex/v0.24.1/log.html#git_diff_free-24", + "ex/v0.24.1/log.html#git_diff_free-25" ] } }, "git_diff_tree_to_tree": { "type": "function", "file": "diff.h", - "line": 731, - "lineto": 736, + "line": 754, + "lineto": 759, "args": [ { "name": "diff", @@ -5501,23 +5623,23 @@ "comment": null }, "description": "

Create a diff with the difference between two tree objects.

\n", - "comments": "

This is equivalent to git diff \n<old\n-tree> \n<new\n-tree>

\n\n

The first tree will be used for the "old_file" side of the delta and the\n second tree will be used for the "new_file" side of the delta. You can\n pass NULL to indicate an empty tree, although it is an error to pass\n NULL for both the old_tree and new_tree.

\n", + "comments": "

This is equivalent to git diff <old-tree> <new-tree>

\n\n

The first tree will be used for the "old_file" side of the delta and the second tree will be used for the "new_file" side of the delta. You can pass NULL to indicate an empty tree, although it is an error to pass NULL for both the old_tree and new_tree.

\n", "group": "diff", "examples": { "diff.c": [ - "ex/v0.23.2/diff.html#git_diff_tree_to_tree-3" + "ex/v0.24.1/diff.html#git_diff_tree_to_tree-3" ], "log.c": [ - "ex/v0.23.2/log.html#git_diff_tree_to_tree-26", - "ex/v0.23.2/log.html#git_diff_tree_to_tree-27" + "ex/v0.24.1/log.html#git_diff_tree_to_tree-26", + "ex/v0.24.1/log.html#git_diff_tree_to_tree-27" ] } }, "git_diff_tree_to_index": { "type": "function", "file": "diff.h", - "line": 757, - "lineto": 762, + "line": 780, + "lineto": 785, "args": [ { "name": "diff", @@ -5552,19 +5674,19 @@ "comment": null }, "description": "

Create a diff between a tree and repository index.

\n", - "comments": "

This is equivalent to `git diff --cached \n<treeish

\n\n
\n

or if you pass\n the HEAD tree, then likegit diff --cached`.

\n
\n\n

The tree you pass will be used for the "old_file" side of the delta, and\n the index will be used for the "new_file" side of the delta.

\n\n

If you pass NULL for the index, then the existing index of the repo\n will be used. In this case, the index will be refreshed from disk\n (if it has changed) before the diff is generated.

\n", + "comments": "

This is equivalent to git diff --cached <treeish> or if you pass the HEAD tree, then like git diff --cached.

\n\n

The tree you pass will be used for the "old_file" side of the delta, and the index will be used for the "new_file" side of the delta.

\n\n

If you pass NULL for the index, then the existing index of the repo will be used. In this case, the index will be refreshed from disk (if it has changed) before the diff is generated.

\n", "group": "diff", "examples": { "diff.c": [ - "ex/v0.23.2/diff.html#git_diff_tree_to_index-4" + "ex/v0.24.1/diff.html#git_diff_tree_to_index-4" ] } }, "git_diff_index_to_workdir": { "type": "function", "file": "diff.h", - "line": 784, - "lineto": 788, + "line": 807, + "lineto": 811, "args": [ { "name": "diff", @@ -5594,19 +5716,19 @@ "comment": null }, "description": "

Create a diff between the repository index and the workdir directory.

\n", - "comments": "

This matches the git diff command. See the note below on\n git_diff_tree_to_workdir for a discussion of the difference between\n git diff and git diff HEAD and how to emulate a `git diff \n<treeish

\n\n
\n

`\n using libgit2.

\n
\n\n

The index will be used for the "old_file" side of the delta, and the\n working directory will be used for the "new_file" side of the delta.

\n\n

If you pass NULL for the index, then the existing index of the repo\n will be used. In this case, the index will be refreshed from disk\n (if it has changed) before the diff is generated.

\n", + "comments": "

This matches the git diff command. See the note below on git_diff_tree_to_workdir for a discussion of the difference between git diff and git diff HEAD and how to emulate a git diff <treeish> using libgit2.

\n\n

The index will be used for the "old_file" side of the delta, and the working directory will be used for the "new_file" side of the delta.

\n\n

If you pass NULL for the index, then the existing index of the repo will be used. In this case, the index will be refreshed from disk (if it has changed) before the diff is generated.

\n", "group": "diff", "examples": { "diff.c": [ - "ex/v0.23.2/diff.html#git_diff_index_to_workdir-5" + "ex/v0.24.1/diff.html#git_diff_index_to_workdir-5" ] } }, "git_diff_tree_to_workdir": { "type": "function", "file": "diff.h", - "line": 813, - "lineto": 817, + "line": 836, + "lineto": 840, "args": [ { "name": "diff", @@ -5636,19 +5758,19 @@ "comment": null }, "description": "

Create a diff between a tree and the working directory.

\n", - "comments": "

The tree you provide will be used for the "old_file" side of the delta,\n and the working directory will be used for the "new_file" side.

\n\n

This is not the same as `git diff \n<treeish

\n\n
\n

orgit diff-index

\n
\n\n

<treeish

\n\n
\n

. Those commands use information from the index, whereas this\n function strictly returns the differences between the tree and the files\n in the working directory, regardless of the state of the index. Use\ngit_diff_tree_to_workdir_with_index` to emulate those commands.

\n
\n\n

To see difference between this and git_diff_tree_to_workdir_with_index,\n consider the example of a staged file deletion where the file has then\n been put back into the working dir and further modified. The\n tree-to-workdir diff for that file is 'modified', but git diff would\n show status 'deleted' since there is a staged delete.

\n", + "comments": "

The tree you provide will be used for the "old_file" side of the delta, and the working directory will be used for the "new_file" side.

\n\n

This is not the same as git diff <treeish> or git diff-index <treeish>. Those commands use information from the index, whereas this function strictly returns the differences between the tree and the files in the working directory, regardless of the state of the index. Use git_diff_tree_to_workdir_with_index to emulate those commands.

\n\n

To see difference between this and git_diff_tree_to_workdir_with_index, consider the example of a staged file deletion where the file has then been put back into the working dir and further modified. The tree-to-workdir diff for that file is 'modified', but git diff would show status 'deleted' since there is a staged delete.

\n", "group": "diff", "examples": { "diff.c": [ - "ex/v0.23.2/diff.html#git_diff_tree_to_workdir-6" + "ex/v0.24.1/diff.html#git_diff_tree_to_workdir-6" ] } }, "git_diff_tree_to_workdir_with_index": { "type": "function", "file": "diff.h", - "line": 832, - "lineto": 836, + "line": 855, + "lineto": 859, "args": [ { "name": "diff", @@ -5678,19 +5800,61 @@ "comment": null }, "description": "

Create a diff between a tree and the working directory using index data\n to account for staged deletes, tracked files, etc.

\n", - "comments": "

This emulates `git diff \n<tree

\n\n
\n

` by diffing the tree to the index and\n the index to the working directory and blending the results into a\n single diff that includes staged deleted, etc.

\n
\n", + "comments": "

This emulates git diff <tree> by diffing the tree to the index and the index to the working directory and blending the results into a single diff that includes staged deleted, etc.

\n", "group": "diff", "examples": { "diff.c": [ - "ex/v0.23.2/diff.html#git_diff_tree_to_workdir_with_index-7" + "ex/v0.24.1/diff.html#git_diff_tree_to_workdir_with_index-7" ] } }, + "git_diff_index_to_index": { + "type": "function", + "file": "diff.h", + "line": 873, + "lineto": 878, + "args": [ + { + "name": "diff", + "type": "git_diff **", + "comment": "Output pointer to a git_diff pointer to be allocated." + }, + { + "name": "repo", + "type": "git_repository *", + "comment": "The repository containing the indexes." + }, + { + "name": "old_index", + "type": "git_index *", + "comment": "A git_index object to diff from." + }, + { + "name": "new_index", + "type": "git_index *", + "comment": "A git_index object to diff to." + }, + { + "name": "opts", + "type": "const git_diff_options *", + "comment": "Structure with options to influence diff or NULL for defaults." + } + ], + "argline": "git_diff **diff, git_repository *repo, git_index *old_index, git_index *new_index, const git_diff_options *opts", + "sig": "git_diff **::git_repository *::git_index *::git_index *::const git_diff_options *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Create a diff with the difference between two index objects.

\n", + "comments": "

The first index will be used for the "old_file" side of the delta and the second index will be used for the "new_file" side of the delta.

\n", + "group": "diff" + }, "git_diff_merge": { "type": "function", "file": "diff.h", - "line": 851, - "lineto": 853, + "line": 893, + "lineto": 895, "args": [ { "name": "onto", @@ -5710,14 +5874,14 @@ "comment": null }, "description": "

Merge one diff into another.

\n", - "comments": "

This merges items from the "from" list into the "onto" list. The\n resulting diff will have all items that appear in either list.\n If an item appears in both lists, then it will be "merged" to appear\n as if the old version was from the "onto" list and the new version\n is from the "from" list (with the exception that if the item has a\n pending DELETE in the middle, then it will show as deleted).

\n", + "comments": "

This merges items from the "from" list into the "onto" list. The resulting diff will have all items that appear in either list. If an item appears in both lists, then it will be "merged" to appear as if the old version was from the "onto" list and the new version is from the "from" list (with the exception that if the item has a pending DELETE in the middle, then it will show as deleted).

\n", "group": "diff" }, "git_diff_find_similar": { "type": "function", "file": "diff.h", - "line": 867, - "lineto": 869, + "line": 909, + "lineto": 911, "args": [ { "name": "diff", @@ -5737,19 +5901,19 @@ "comment": " 0 on success, -1 on failure" }, "description": "

Transform a diff marking file renames, copies, etc.

\n", - "comments": "

This modifies a diff in place, replacing old entries that look\n like renames or copies with new entries reflecting those changes.\n This also will, if requested, break modified files into add/remove\n pairs if the amount of change is above a threshold.

\n", + "comments": "

This modifies a diff in place, replacing old entries that look like renames or copies with new entries reflecting those changes. This also will, if requested, break modified files into add/remove pairs if the amount of change is above a threshold.

\n", "group": "diff", "examples": { "diff.c": [ - "ex/v0.23.2/diff.html#git_diff_find_similar-8" + "ex/v0.24.1/diff.html#git_diff_find_similar-8" ] } }, "git_diff_num_deltas": { "type": "function", "file": "diff.h", - "line": 887, - "lineto": 887, + "line": 929, + "lineto": 929, "args": [ { "name": "diff", @@ -5768,15 +5932,15 @@ "group": "diff", "examples": { "log.c": [ - "ex/v0.23.2/log.html#git_diff_num_deltas-28" + "ex/v0.24.1/log.html#git_diff_num_deltas-28" ] } }, "git_diff_num_deltas_of_type": { "type": "function", "file": "diff.h", - "line": 900, - "lineto": 901, + "line": 942, + "lineto": 943, "args": [ { "name": "diff", @@ -5796,14 +5960,14 @@ "comment": " Count of number of deltas matching delta_t type" }, "description": "

Query how many diff deltas are there in a diff filtered by type.

\n", - "comments": "

This works just like git_diff_entrycount() with an extra parameter\n that is a git_delta_t and returns just the count of how many deltas\n match that particular type.

\n", + "comments": "

This works just like git_diff_entrycount() with an extra parameter that is a git_delta_t and returns just the count of how many deltas match that particular type.

\n", "group": "diff" }, "git_diff_get_delta": { "type": "function", "file": "diff.h", - "line": 920, - "lineto": 921, + "line": 962, + "lineto": 963, "args": [ { "name": "diff", @@ -5823,14 +5987,14 @@ "comment": " Pointer to git_diff_delta (or NULL if `idx` out of range)" }, "description": "

Return the diff delta for an entry in the diff list.

\n", - "comments": "

The git_diff_delta pointer points to internal data and you do not\n have to release it when you are done with it. It will go away when\n the * git_diff (or any associated git_patch) goes away.

\n\n

Note that the flags on the delta related to whether it has binary\n content or not may not be set if there are no attributes set for the\n file and there has been no reason to load the file data at this point.\n For now, if you need those flags to be up to date, your only option is\n to either use git_diff_foreach or create a git_patch.

\n", + "comments": "

The git_diff_delta pointer points to internal data and you do not have to release it when you are done with it. It will go away when the * git_diff (or any associated git_patch) goes away.

\n\n

Note that the flags on the delta related to whether it has binary content or not may not be set if there are no attributes set for the file and there has been no reason to load the file data at this point. For now, if you need those flags to be up to date, your only option is to either use git_diff_foreach or create a git_patch.

\n", "group": "diff" }, "git_diff_is_sorted_icase": { "type": "function", "file": "diff.h", - "line": 929, - "lineto": 929, + "line": 971, + "lineto": 971, "args": [ { "name": "diff", @@ -5851,8 +6015,8 @@ "git_diff_foreach": { "type": "function", "file": "diff.h", - "line": 957, - "lineto": 963, + "line": 999, + "lineto": 1005, "args": [ { "name": "diff", @@ -5892,14 +6056,14 @@ "comment": " 0 on success, non-zero callback return value, or error code" }, "description": "

Loop over all deltas in a diff issuing callbacks.

\n", - "comments": "

This will iterate through all of the files described in a diff. You\n should provide a file callback to learn about each file.

\n\n

The "hunk" and "line" callbacks are optional, and the text diff of the\n files will only be calculated if they are not NULL. Of course, these\n callbacks will not be invoked for binary files on the diff or for\n files whose only changed is a file mode change.

\n\n

Returning a non-zero value from any of the callbacks will terminate\n the iteration and return the value to the user.

\n", + "comments": "

This will iterate through all of the files described in a diff. You should provide a file callback to learn about each file.

\n\n

The "hunk" and "line" callbacks are optional, and the text diff of the files will only be calculated if they are not NULL. Of course, these callbacks will not be invoked for binary files on the diff or for files whose only changed is a file mode change.

\n\n

Returning a non-zero value from any of the callbacks will terminate the iteration and return the value to the user.

\n", "group": "diff" }, "git_diff_status_char": { "type": "function", "file": "diff.h", - "line": 976, - "lineto": 976, + "line": 1018, + "lineto": 1018, "args": [ { "name": "status", @@ -5914,14 +6078,14 @@ "comment": " The single character label for that code" }, "description": "

Look up the single character abbreviation for a delta status code.

\n", - "comments": "

When you run git diff --name-status it uses single letter codes in\n the output such as 'A' for added, 'D' for deleted, 'M' for modified,\n etc. This function converts a git_delta_t value into these letters for\n your own purposes. GIT_DELTA_UNTRACKED will return a space (i.e. ' ').

\n", + "comments": "

When you run git diff --name-status it uses single letter codes in the output such as 'A' for added, 'D' for deleted, 'M' for modified, etc. This function converts a git_delta_t value into these letters for your own purposes. GIT_DELTA_UNTRACKED will return a space (i.e. ' ').

\n", "group": "diff" }, "git_diff_print": { "type": "function", "file": "diff.h", - "line": 1001, - "lineto": 1005, + "line": 1043, + "lineto": 1047, "args": [ { "name": "diff", @@ -5951,22 +6115,22 @@ "comment": " 0 on success, non-zero callback return value, or error code" }, "description": "

Iterate over a diff generating formatted text output.

\n", - "comments": "

Returning a non-zero value from the callbacks will terminate the\n iteration and return the non-zero value to the caller.

\n", + "comments": "

Returning a non-zero value from the callbacks will terminate the iteration and return the non-zero value to the caller.

\n", "group": "diff", "examples": { "diff.c": [ - "ex/v0.23.2/diff.html#git_diff_print-9" + "ex/v0.24.1/diff.html#git_diff_print-9" ], "log.c": [ - "ex/v0.23.2/log.html#git_diff_print-29" + "ex/v0.24.1/log.html#git_diff_print-29" ] } }, "git_diff_blobs": { "type": "function", "file": "diff.h", - "line": 1042, - "lineto": 1052, + "line": 1084, + "lineto": 1094, "args": [ { "name": "old_blob", @@ -6026,14 +6190,14 @@ "comment": " 0 on success, non-zero callback return value, or error code" }, "description": "

Directly run a diff on two blobs.

\n", - "comments": "

Compared to a file, a blob lacks some contextual information. As such,\n the git_diff_file given to the callback will have some fake data; i.e.\n mode will be 0 and path will be NULL.

\n\n

NULL is allowed for either old_blob or new_blob and will be treated\n as an empty blob, with the oid set to NULL in the git_diff_file data.\n Passing NULL for both blobs is a noop; no callbacks will be made at all.

\n\n

We do run a binary content check on the blob content and if either blob\n looks like binary data, the git_diff_delta binary attribute will be set\n to 1 and no call to the hunk_cb nor line_cb will be made (unless you pass\n GIT_DIFF_FORCE_TEXT of course).

\n", + "comments": "

Compared to a file, a blob lacks some contextual information. As such, the git_diff_file given to the callback will have some fake data; i.e. mode will be 0 and path will be NULL.

\n\n

NULL is allowed for either old_blob or new_blob and will be treated as an empty blob, with the oid set to NULL in the git_diff_file data. Passing NULL for both blobs is a noop; no callbacks will be made at all.

\n\n

We do run a binary content check on the blob content and if either blob looks like binary data, the git_diff_delta binary attribute will be set to 1 and no call to the hunk_cb nor line_cb will be made (unless you pass GIT_DIFF_FORCE_TEXT of course).

\n", "group": "diff" }, "git_diff_blob_to_buffer": { "type": "function", "file": "diff.h", - "line": 1079, - "lineto": 1090, + "line": 1121, + "lineto": 1132, "args": [ { "name": "old_blob", @@ -6098,14 +6262,14 @@ "comment": " 0 on success, non-zero callback return value, or error code" }, "description": "

Directly run a diff between a blob and a buffer.

\n", - "comments": "

As with git_diff_blobs, comparing a blob and buffer lacks some context,\n so the git_diff_file parameters to the callbacks will be faked a la the\n rules for git_diff_blobs().

\n\n

Passing NULL for old_blob will be treated as an empty blob (i.e. the\n file_cb will be invoked with GIT_DELTA_ADDED and the diff will be the\n entire content of the buffer added). Passing NULL to the buffer will do\n the reverse, with GIT_DELTA_REMOVED and blob content removed.

\n", + "comments": "

As with git_diff_blobs, comparing a blob and buffer lacks some context, so the git_diff_file parameters to the callbacks will be faked a la the rules for git_diff_blobs().

\n\n

Passing NULL for old_blob will be treated as an empty blob (i.e. the file_cb will be invoked with GIT_DELTA_ADDED and the diff will be the entire content of the buffer added). Passing NULL to the buffer will do the reverse, with GIT_DELTA_REMOVED and blob content removed.

\n", "group": "diff" }, "git_diff_buffers": { "type": "function", "file": "diff.h", - "line": 1113, - "lineto": 1125, + "line": 1155, + "lineto": 1167, "args": [ { "name": "old_buffer", @@ -6175,14 +6339,14 @@ "comment": " 0 on success, non-zero callback return value, or error code" }, "description": "

Directly run a diff between two buffers.

\n", - "comments": "

Even more than with git_diff_blobs, comparing two buffer lacks\n context, so the git_diff_file parameters to the callbacks will be\n faked a la the rules for git_diff_blobs().

\n", + "comments": "

Even more than with git_diff_blobs, comparing two buffer lacks context, so the git_diff_file parameters to the callbacks will be faked a la the rules for git_diff_blobs().

\n", "group": "diff" }, "git_diff_get_stats": { "type": "function", "file": "diff.h", - "line": 1161, - "lineto": 1163, + "line": 1203, + "lineto": 1205, "args": [ { "name": "out", @@ -6201,20 +6365,20 @@ "type": "int", "comment": " 0 on success; non-zero on error" }, - "description": "

Accumlate diff statistics for all patches.

\n", + "description": "

Accumulate diff statistics for all patches.

\n", "comments": "", "group": "diff", "examples": { "diff.c": [ - "ex/v0.23.2/diff.html#git_diff_get_stats-10" + "ex/v0.24.1/diff.html#git_diff_get_stats-10" ] } }, "git_diff_stats_files_changed": { "type": "function", "file": "diff.h", - "line": 1171, - "lineto": 1172, + "line": 1213, + "lineto": 1214, "args": [ { "name": "stats", @@ -6235,8 +6399,8 @@ "git_diff_stats_insertions": { "type": "function", "file": "diff.h", - "line": 1180, - "lineto": 1181, + "line": 1222, + "lineto": 1223, "args": [ { "name": "stats", @@ -6257,8 +6421,8 @@ "git_diff_stats_deletions": { "type": "function", "file": "diff.h", - "line": 1189, - "lineto": 1190, + "line": 1231, + "lineto": 1232, "args": [ { "name": "stats", @@ -6279,8 +6443,8 @@ "git_diff_stats_to_buf": { "type": "function", "file": "diff.h", - "line": 1201, - "lineto": 1205, + "line": 1243, + "lineto": 1247, "args": [ { "name": "out", @@ -6314,15 +6478,15 @@ "group": "diff", "examples": { "diff.c": [ - "ex/v0.23.2/diff.html#git_diff_stats_to_buf-11" + "ex/v0.24.1/diff.html#git_diff_stats_to_buf-11" ] } }, "git_diff_stats_free": { "type": "function", "file": "diff.h", - "line": 1213, - "lineto": 1213, + "line": 1255, + "lineto": 1255, "args": [ { "name": "stats", @@ -6341,15 +6505,15 @@ "group": "diff", "examples": { "diff.c": [ - "ex/v0.23.2/diff.html#git_diff_stats_free-12" + "ex/v0.24.1/diff.html#git_diff_stats_free-12" ] } }, "git_diff_format_email": { "type": "function", "file": "diff.h", - "line": 1262, - "lineto": 1265, + "line": 1307, + "lineto": 1310, "args": [ { "name": "out", @@ -6380,8 +6544,8 @@ "git_diff_commit_as_email": { "type": "function", "file": "diff.h", - "line": 1281, - "lineto": 1288, + "line": 1326, + "lineto": 1333, "args": [ { "name": "out", @@ -6432,8 +6596,8 @@ "git_diff_format_email_init_options": { "type": "function", "file": "diff.h", - "line": 1299, - "lineto": 1301, + "line": 1344, + "lineto": 1346, "args": [ { "name": "opts", @@ -6459,8 +6623,8 @@ "giterr_last": { "type": "function", "file": "errors.h", - "line": 109, - "lineto": 109, + "line": 110, + "lineto": 110, "args": [], "argline": "", "sig": "", @@ -6473,22 +6637,22 @@ "group": "giterr", "examples": { "general.c": [ - "ex/v0.23.2/general.html#giterr_last-27" + "ex/v0.24.1/general.html#giterr_last-27" ], "network/clone.c": [ - "ex/v0.23.2/network/clone.html#giterr_last-2" + "ex/v0.24.1/network/clone.html#giterr_last-2" ], "network/git2.c": [ - "ex/v0.23.2/network/git2.html#giterr_last-1", - "ex/v0.23.2/network/git2.html#giterr_last-2" + "ex/v0.24.1/network/git2.html#giterr_last-1", + "ex/v0.24.1/network/git2.html#giterr_last-2" ] } }, "giterr_clear": { "type": "function", "file": "errors.h", - "line": 114, - "lineto": 114, + "line": 115, + "lineto": 115, "args": [], "argline": "", "sig": "", @@ -6500,33 +6664,11 @@ "comments": "", "group": "giterr" }, - "giterr_detach": { - "type": "function", - "file": "errors.h", - "line": 126, - "lineto": 126, - "args": [ - { - "name": "cpy", - "type": "git_error *", - "comment": null - } - ], - "argline": "git_error *cpy", - "sig": "git_error *", - "return": { - "type": "int", - "comment": null - }, - "description": "

Get the last error data and clear it.

\n", - "comments": "

This copies the last error into the given git_error struct\n and returns 0 if the copy was successful, leaving the error\n cleared as if giterr_clear had been called.

\n\n

If there was no existing error in the library, -1 will be returned\n and the contents of cpy will be left unmodified.

\n", - "group": "giterr" - }, "giterr_set_str": { "type": "function", "file": "errors.h", - "line": 149, - "lineto": 149, + "line": 133, + "lineto": 133, "args": [ { "name": "error_class", @@ -6546,14 +6688,14 @@ "comment": null }, "description": "

Set the error message string for this thread.

\n", - "comments": "

This function is public so that custom ODB backends and the like can\n relay an error message through libgit2. Most regular users of libgit2\n will never need to call this function -- actually, calling it in most\n circumstances (for example, calling from within a callback function)\n will just end up having the value overwritten by libgit2 internals.

\n\n

This error message is stored in thread-local storage and only applies\n to the particular thread that this libgit2 call is made from.

\n\n

NOTE: Passing the error_class as GITERR_OS has a special behavior: we\n attempt to append the system default error message for the last OS error\n that occurred and then clear the last error. The specific implementation\n of looking up and clearing this last OS error will vary by platform.

\n", + "comments": "

This function is public so that custom ODB backends and the like can relay an error message through libgit2. Most regular users of libgit2 will never need to call this function -- actually, calling it in most circumstances (for example, calling from within a callback function) will just end up having the value overwritten by libgit2 internals.

\n\n

This error message is stored in thread-local storage and only applies to the particular thread that this libgit2 call is made from.

\n", "group": "giterr" }, "giterr_set_oom": { "type": "function", "file": "errors.h", - "line": 160, - "lineto": 160, + "line": 144, + "lineto": 144, "args": [], "argline": "", "sig": "", @@ -6562,7 +6704,7 @@ "comment": null }, "description": "

Set the error message to a special value for memory allocation failure.

\n", - "comments": "

The normal giterr_set_str() function attempts to strdup() the string\n that is passed in. This is not a good idea when the error in question\n is a memory allocation failure. That circumstance has a special setter\n function that sets the error string to a known and statically allocated\n internal value.

\n", + "comments": "

The normal giterr_set_str() function attempts to strdup() the string that is passed in. This is not a good idea when the error in question is a memory allocation failure. That circumstance has a special setter function that sets the error string to a known and statically allocated internal value.

\n", "group": "giterr" }, "git_filter_list_load": { @@ -6609,7 +6751,7 @@ "comment": " 0 on success (which could still return NULL if no filters are\n needed for the requested file), \n<\n0 on error" }, "description": "

Load the filter list for a given path.

\n", - "comments": "

This will return 0 (success) but set the output git_filter_list to NULL\n if no filters are requested for the given file.

\n", + "comments": "

This will return 0 (success) but set the output git_filter_list to NULL if no filters are requested for the given file.

\n", "group": "filter" }, "git_filter_list_contains": { @@ -6636,7 +6778,7 @@ "comment": " 1 if the filter is in the list, 0 otherwise" }, "description": "

Query the filter list to see if a given filter (by name) will run.\n The built-in filters "crlf" and "ident" can be queried, otherwise this\n is the name of the filter specified by the filter attribute.

\n", - "comments": "

This will return 0 if the given filter is not in the list, or 1 if\n the filter will be applied.

\n", + "comments": "

This will return 0 if the given filter is not in the list, or 1 if the filter will be applied.

\n", "group": "filter" }, "git_filter_list_apply_to_data": { @@ -6668,7 +6810,7 @@ "comment": " 0 on success, an error code otherwise" }, "description": "

Apply filter list to a data buffer.

\n", - "comments": "

See git2/buffer.h for background on git_buf objects.

\n\n

If the in buffer holds data allocated by libgit2 (i.e. in->asize is\n not zero), then it will be overwritten when applying the filters. If\n not, then it will be left untouched.

\n\n

If there are no filters to apply (or filters is NULL), then the out\n buffer will reference the in buffer data (with asize set to zero)\n instead of allocating data. This keeps allocations to a minimum, but\n it means you have to be careful about freeing the in data since out\n may be pointing to it!

\n", + "comments": "

See git2/buffer.h for background on git_buf objects.

\n\n

If the in buffer holds data allocated by libgit2 (i.e. in->asize is not zero), then it will be overwritten when applying the filters. If not, then it will be left untouched.

\n\n

If there are no filters to apply (or filters is NULL), then the out buffer will reference the in buffer data (with asize set to zero) instead of allocating data. This keeps allocations to a minimum, but it means you have to be careful about freeing the in data since out may be pointing to it!

\n", "group": "filter" }, "git_filter_list_apply_to_file": { @@ -6876,44 +7018,44 @@ "comment": " the number of initializations of the library, or an error code." }, "description": "

Init the global state

\n", - "comments": "

This function must the called before any other libgit2 function in\n order to set up global state and threading.

\n\n

This function may be called multiple times - it will return the number\n of times the initialization has been called (including this one) that have\n not subsequently been shutdown.

\n", + "comments": "

This function must the called before any other libgit2 function in order to set up global state and threading.

\n\n

This function may be called multiple times - it will return the number of times the initialization has been called (including this one) that have not subsequently been shutdown.

\n", "group": "libgit2", "examples": { "blame.c": [ - "ex/v0.23.2/blame.html#git_libgit2_init-8" + "ex/v0.24.1/blame.html#git_libgit2_init-8" ], "cat-file.c": [ - "ex/v0.23.2/cat-file.html#git_libgit2_init-10" + "ex/v0.24.1/cat-file.html#git_libgit2_init-10" ], "describe.c": [ - "ex/v0.23.2/describe.html#git_libgit2_init-4" + "ex/v0.24.1/describe.html#git_libgit2_init-4" ], "diff.c": [ - "ex/v0.23.2/diff.html#git_libgit2_init-13" + "ex/v0.24.1/diff.html#git_libgit2_init-13" ], "general.c": [ - "ex/v0.23.2/general.html#git_libgit2_init-28" + "ex/v0.24.1/general.html#git_libgit2_init-28" ], "init.c": [ - "ex/v0.23.2/init.html#git_libgit2_init-2" + "ex/v0.24.1/init.html#git_libgit2_init-2" ], "log.c": [ - "ex/v0.23.2/log.html#git_libgit2_init-30" + "ex/v0.24.1/log.html#git_libgit2_init-30" ], "network/git2.c": [ - "ex/v0.23.2/network/git2.html#git_libgit2_init-3" + "ex/v0.24.1/network/git2.html#git_libgit2_init-3" ], "remote.c": [ - "ex/v0.23.2/remote.html#git_libgit2_init-2" + "ex/v0.24.1/remote.html#git_libgit2_init-2" ], "rev-parse.c": [ - "ex/v0.23.2/rev-parse.html#git_libgit2_init-1" + "ex/v0.24.1/rev-parse.html#git_libgit2_init-1" ], "status.c": [ - "ex/v0.23.2/status.html#git_libgit2_init-1" + "ex/v0.24.1/status.html#git_libgit2_init-1" ], "tag.c": [ - "ex/v0.23.2/tag.html#git_libgit2_init-3" + "ex/v0.24.1/tag.html#git_libgit2_init-3" ] } }, @@ -6930,41 +7072,41 @@ "comment": " the number of remaining initializations of the library, or an\n error code." }, "description": "

Shutdown the global state

\n", - "comments": "

Clean up the global state and threading context after calling it as\n many times as git_libgit2_init() was called - it will return the\n number of remainining initializations that have not been shutdown\n (after this one).

\n", + "comments": "

Clean up the global state and threading context after calling it as many times as git_libgit2_init() was called - it will return the number of remainining initializations that have not been shutdown (after this one).

\n", "group": "libgit2", "examples": { "blame.c": [ - "ex/v0.23.2/blame.html#git_libgit2_shutdown-9" + "ex/v0.24.1/blame.html#git_libgit2_shutdown-9" ], "cat-file.c": [ - "ex/v0.23.2/cat-file.html#git_libgit2_shutdown-11" + "ex/v0.24.1/cat-file.html#git_libgit2_shutdown-11" ], "describe.c": [ - "ex/v0.23.2/describe.html#git_libgit2_shutdown-5" + "ex/v0.24.1/describe.html#git_libgit2_shutdown-5" ], "diff.c": [ - "ex/v0.23.2/diff.html#git_libgit2_shutdown-14" + "ex/v0.24.1/diff.html#git_libgit2_shutdown-14" ], "init.c": [ - "ex/v0.23.2/init.html#git_libgit2_shutdown-3" + "ex/v0.24.1/init.html#git_libgit2_shutdown-3" ], "log.c": [ - "ex/v0.23.2/log.html#git_libgit2_shutdown-31" + "ex/v0.24.1/log.html#git_libgit2_shutdown-31" ], "network/git2.c": [ - "ex/v0.23.2/network/git2.html#git_libgit2_shutdown-4" + "ex/v0.24.1/network/git2.html#git_libgit2_shutdown-4" ], "remote.c": [ - "ex/v0.23.2/remote.html#git_libgit2_shutdown-3" + "ex/v0.24.1/remote.html#git_libgit2_shutdown-3" ], "rev-parse.c": [ - "ex/v0.23.2/rev-parse.html#git_libgit2_shutdown-2" + "ex/v0.24.1/rev-parse.html#git_libgit2_shutdown-2" ], "status.c": [ - "ex/v0.23.2/status.html#git_libgit2_shutdown-2" + "ex/v0.24.1/status.html#git_libgit2_shutdown-2" ], "tag.c": [ - "ex/v0.23.2/tag.html#git_libgit2_shutdown-4" + "ex/v0.24.1/tag.html#git_libgit2_shutdown-4" ] } }, @@ -7007,7 +7149,7 @@ "comment": null }, "description": "

Count the number of unique commits between two commit objects

\n", - "comments": "

There is no need for branches containing the commits to have any\n upstream relationship, but it helps to think of one as a branch and\n the other as its upstream, the ahead and behind values will be\n what git would report for the branches.

\n", + "comments": "

There is no need for branches containing the commits to have any upstream relationship, but it helps to think of one as a branch and the other as its upstream, the ahead and behind values will be what git would report for the branches.

\n", "group": "graph" }, "git_graph_descendant_of": { @@ -7066,7 +7208,7 @@ "comment": " 0 on success" }, "description": "

Add ignore rules for a repository.

\n", - "comments": "

Excludesfile rules (i.e. .gitignore rules) are generally read from\n .gitignore files in the repository tree or from a shared system file\n only if a "core.excludesfile" config value is set. The library also\n keeps a set of per-repository internal ignores that can be configured\n in-memory and will not persist. This function allows you to add to\n that internal rules list.

\n\n

Example usage:

\n\n
 error = git_ignore_add_rule(myrepo, "*.c\n
\n\n

/

\n\n

with space

\n\n

");

\n\n

This would add three rules to the ignores.

\n", + "comments": "

Excludesfile rules (i.e. .gitignore rules) are generally read from .gitignore files in the repository tree or from a shared system file only if a "core.excludesfile" config value is set. The library also keeps a set of per-repository internal ignores that can be configured in-memory and will not persist. This function allows you to add to that internal rules list.

\n\n

Example usage:

\n\n
 error = git_ignore_add_rule(myrepo, "*.c/ with space");\n
\n\n

This would add three rules to the ignores.

\n", "group": "ignore" }, "git_ignore_clear_internal_rules": { @@ -7088,7 +7230,7 @@ "comment": " 0 on success" }, "description": "

Clear ignore rules that were explicitly added.

\n", - "comments": "

Resets to the default internal ignore rules. This will not turn off\n rules in .gitignore files that actually exist in the filesystem.

\n\n

The default internal ignores ignore ".", ".." and ".git" entries.

\n", + "comments": "

Resets to the default internal ignore rules. This will not turn off rules in .gitignore files that actually exist in the filesystem.

\n\n

The default internal ignores ignore ".", ".." and ".git" entries.

\n", "group": "ignore" }, "git_ignore_path_is_ignored": { @@ -7120,14 +7262,14 @@ "comment": " 0 if ignore rules could be processed for the file (regardless\n of whether it exists or not), or an error \n<\n 0 if they could not." }, "description": "

Test if the ignore rules apply to a given path.

\n", - "comments": "

This function checks the ignore rules to see if they would apply to the\n given file. This indicates if the file would be ignored regardless of\n whether the file is already in the index or committed to the repository.

\n\n

One way to think of this is if you were to do "git add ." on the\n directory containing the file, would it be added or not?

\n", + "comments": "

This function checks the ignore rules to see if they would apply to the given file. This indicates if the file would be ignored regardless of whether the file is already in the index or committed to the repository.

\n\n

One way to think of this is if you were to do "git add ." on the directory containing the file, would it be added or not?

\n", "group": "ignore" }, "git_index_open": { "type": "function", "file": "index.h", - "line": 189, - "lineto": 189, + "line": 203, + "lineto": 203, "args": [ { "name": "out", @@ -7147,14 +7289,14 @@ "comment": " 0 or an error code" }, "description": "

Create a new bare Git index object as a memory representation\n of the Git index file in 'index_path', without a repository\n to back it.

\n", - "comments": "

Since there is no ODB or working directory behind this index,\n any Index methods which rely on these (e.g. index_add_bypath)\n will fail with the GIT_ERROR error code.

\n\n

If you need to access the index of an actual repository,\n use the git_repository_index wrapper.

\n\n

The index must be freed once it's no longer in use.

\n", + "comments": "

Since there is no ODB or working directory behind this index, any Index methods which rely on these (e.g. index_add_bypath) will fail with the GIT_ERROR error code.

\n\n

If you need to access the index of an actual repository, use the git_repository_index wrapper.

\n\n

The index must be freed once it's no longer in use.

\n", "group": "index" }, "git_index_new": { "type": "function", "file": "index.h", - "line": 202, - "lineto": 202, + "line": 216, + "lineto": 216, "args": [ { "name": "out", @@ -7169,14 +7311,14 @@ "comment": " 0 or an error code" }, "description": "

Create an in-memory index object.

\n", - "comments": "

This index object cannot be read/written to the filesystem,\n but may be used to perform in-memory index operations.

\n\n

The index must be freed once it's no longer in use.

\n", + "comments": "

This index object cannot be read/written to the filesystem, but may be used to perform in-memory index operations.

\n\n

The index must be freed once it's no longer in use.

\n", "group": "index" }, "git_index_free": { "type": "function", "file": "index.h", - "line": 209, - "lineto": 209, + "line": 223, + "lineto": 223, "args": [ { "name": "index", @@ -7195,18 +7337,18 @@ "group": "index", "examples": { "general.c": [ - "ex/v0.23.2/general.html#git_index_free-29" + "ex/v0.24.1/general.html#git_index_free-29" ], "init.c": [ - "ex/v0.23.2/init.html#git_index_free-4" + "ex/v0.24.1/init.html#git_index_free-4" ] } }, "git_index_owner": { "type": "function", "file": "index.h", - "line": 217, - "lineto": 217, + "line": 231, + "lineto": 231, "args": [ { "name": "index", @@ -7227,8 +7369,8 @@ "git_index_caps": { "type": "function", "file": "index.h", - "line": 225, - "lineto": 225, + "line": 239, + "lineto": 239, "args": [ { "name": "index", @@ -7249,8 +7391,8 @@ "git_index_set_caps": { "type": "function", "file": "index.h", - "line": 238, - "lineto": 238, + "line": 252, + "lineto": 252, "args": [ { "name": "index", @@ -7270,14 +7412,14 @@ "comment": " 0 on success, -1 on failure" }, "description": "

Set index capabilities flags.

\n", - "comments": "

If you pass GIT_INDEXCAP_FROM_OWNER for the caps, then the\n capabilities will be read from the config of the owner object,\n looking at core.ignorecase, core.filemode, core.symlinks.

\n", + "comments": "

If you pass GIT_INDEXCAP_FROM_OWNER for the caps, then the capabilities will be read from the config of the owner object, looking at core.ignorecase, core.filemode, core.symlinks.

\n", "group": "index" }, "git_index_read": { "type": "function", "file": "index.h", - "line": 257, - "lineto": 257, + "line": 271, + "lineto": 271, "args": [ { "name": "index", @@ -7297,14 +7439,14 @@ "comment": " 0 or an error code" }, "description": "

Update the contents of an existing index object in memory by reading\n from the hard disk.

\n", - "comments": "

If force is true, this performs a "hard" read that discards in-memory\n changes and always reloads the on-disk index data. If there is no\n on-disk version, the index will be cleared.

\n\n

If force is false, this does a "soft" read that reloads the index\n data from disk only if it has changed since the last time it was\n loaded. Purely in-memory index data will be untouched. Be aware: if\n there are changes on disk, unwritten in-memory changes are discarded.

\n", + "comments": "

If force is true, this performs a "hard" read that discards in-memory changes and always reloads the on-disk index data. If there is no on-disk version, the index will be cleared.

\n\n

If force is false, this does a "soft" read that reloads the index data from disk only if it has changed since the last time it was loaded. Purely in-memory index data will be untouched. Be aware: if there are changes on disk, unwritten in-memory changes are discarded.

\n", "group": "index" }, "git_index_write": { "type": "function", "file": "index.h", - "line": 266, - "lineto": 266, + "line": 280, + "lineto": 280, "args": [ { "name": "index", @@ -7325,8 +7467,8 @@ "git_index_path": { "type": "function", "file": "index.h", - "line": 274, - "lineto": 274, + "line": 288, + "lineto": 288, "args": [ { "name": "index", @@ -7347,8 +7489,8 @@ "git_index_checksum": { "type": "function", "file": "index.h", - "line": 286, - "lineto": 286, + "line": 300, + "lineto": 300, "args": [ { "name": "index", @@ -7363,14 +7505,14 @@ "comment": " a pointer to the checksum of the index" }, "description": "

Get the checksum of the index

\n", - "comments": "

This checksum is the SHA-1 hash over the index file (except the\n last 20 bytes which are the checksum itself). In cases where the\n index does not exist on-disk, it will be zeroed out.

\n", + "comments": "

This checksum is the SHA-1 hash over the index file (except the last 20 bytes which are the checksum itself). In cases where the index does not exist on-disk, it will be zeroed out.

\n", "group": "index" }, "git_index_read_tree": { "type": "function", "file": "index.h", - "line": 297, - "lineto": 297, + "line": 311, + "lineto": 311, "args": [ { "name": "index", @@ -7396,8 +7538,8 @@ "git_index_write_tree": { "type": "function", "file": "index.h", - "line": 318, - "lineto": 318, + "line": 332, + "lineto": 332, "args": [ { "name": "out", @@ -7417,19 +7559,19 @@ "comment": " 0 on success, GIT_EUNMERGED when the index is not clean\n or an error code" }, "description": "

Write the index as a tree

\n", - "comments": "

This method will scan the index and write a representation\n of its current state back to disk; it recursively creates\n tree objects for each of the subtrees stored in the index,\n but only returns the OID of the root tree. This is the OID\n that can be used e.g. to create a commit.

\n\n

The index instance cannot be bare, and needs to be associated\n to an existing repository.

\n\n

The index must not contain any file in conflict.

\n", + "comments": "

This method will scan the index and write a representation of its current state back to disk; it recursively creates tree objects for each of the subtrees stored in the index, but only returns the OID of the root tree. This is the OID that can be used e.g. to create a commit.

\n\n

The index instance cannot be bare, and needs to be associated to an existing repository.

\n\n

The index must not contain any file in conflict.

\n", "group": "index", "examples": { "init.c": [ - "ex/v0.23.2/init.html#git_index_write_tree-5" + "ex/v0.24.1/init.html#git_index_write_tree-5" ] } }, "git_index_write_tree_to": { "type": "function", "file": "index.h", - "line": 335, - "lineto": 335, + "line": 349, + "lineto": 349, "args": [ { "name": "out", @@ -7454,14 +7596,14 @@ "comment": " 0 on success, GIT_EUNMERGED when the index is not clean\n or an error code" }, "description": "

Write the index as a tree to the given repository

\n", - "comments": "

This method will do the same as git_index_write_tree, but\n letting the user choose the repository where the tree will\n be written.

\n\n

The index must not contain any file in conflict.

\n", + "comments": "

This method will do the same as git_index_write_tree, but letting the user choose the repository where the tree will be written.

\n\n

The index must not contain any file in conflict.

\n", "group": "index" }, "git_index_entrycount": { "type": "function", "file": "index.h", - "line": 354, - "lineto": 354, + "line": 368, + "lineto": 368, "args": [ { "name": "index", @@ -7480,15 +7622,15 @@ "group": "index", "examples": { "general.c": [ - "ex/v0.23.2/general.html#git_index_entrycount-30" + "ex/v0.24.1/general.html#git_index_entrycount-30" ] } }, "git_index_clear": { "type": "function", "file": "index.h", - "line": 365, - "lineto": 365, + "line": 379, + "lineto": 379, "args": [ { "name": "index", @@ -7503,14 +7645,14 @@ "comment": " 0 on success, error code \n<\n 0 on failure" }, "description": "

Clear the contents (all the entries) of an index object.

\n", - "comments": "

This clears the index object in memory; changes must be explicitly\n written to disk for them to take effect persistently.

\n", + "comments": "

This clears the index object in memory; changes must be explicitly written to disk for them to take effect persistently.

\n", "group": "index" }, "git_index_get_byindex": { "type": "function", "file": "index.h", - "line": 378, - "lineto": 379, + "line": 392, + "lineto": 393, "args": [ { "name": "index", @@ -7530,19 +7672,19 @@ "comment": " a pointer to the entry; NULL if out of bounds" }, "description": "

Get a pointer to one of the entries in the index

\n", - "comments": "

The entry is not modifiable and should not be freed. Because the\n git_index_entry struct is a publicly defined struct, you should\n be able to make your own permanent copy of the data if necessary.

\n", + "comments": "

The entry is not modifiable and should not be freed. Because the git_index_entry struct is a publicly defined struct, you should be able to make your own permanent copy of the data if necessary.

\n", "group": "index", "examples": { "general.c": [ - "ex/v0.23.2/general.html#git_index_get_byindex-31" + "ex/v0.24.1/general.html#git_index_get_byindex-31" ] } }, "git_index_get_bypath": { "type": "function", "file": "index.h", - "line": 393, - "lineto": 394, + "line": 407, + "lineto": 408, "args": [ { "name": "index", @@ -7567,14 +7709,14 @@ "comment": " a pointer to the entry; NULL if it was not found" }, "description": "

Get a pointer to one of the entries in the index

\n", - "comments": "

The entry is not modifiable and should not be freed. Because the\n git_index_entry struct is a publicly defined struct, you should\n be able to make your own permanent copy of the data if necessary.

\n", + "comments": "

The entry is not modifiable and should not be freed. Because the git_index_entry struct is a publicly defined struct, you should be able to make your own permanent copy of the data if necessary.

\n", "group": "index" }, "git_index_remove": { "type": "function", "file": "index.h", - "line": 404, - "lineto": 404, + "line": 418, + "lineto": 418, "args": [ { "name": "index", @@ -7605,8 +7747,8 @@ "git_index_remove_directory": { "type": "function", "file": "index.h", - "line": 414, - "lineto": 415, + "line": 428, + "lineto": 429, "args": [ { "name": "index", @@ -7637,8 +7779,8 @@ "git_index_add": { "type": "function", "file": "index.h", - "line": 431, - "lineto": 431, + "line": 445, + "lineto": 445, "args": [ { "name": "index", @@ -7658,14 +7800,14 @@ "comment": " 0 or an error code" }, "description": "

Add or update an index entry from an in-memory struct

\n", - "comments": "

If a previous index entry exists that has the same path and stage\n as the given 'source_entry', it will be replaced. Otherwise, the\n 'source_entry' will be added.

\n\n

A full copy (including the 'path' string) of the given\n 'source_entry' will be inserted on the index.

\n", + "comments": "

If a previous index entry exists that has the same path and stage as the given 'source_entry', it will be replaced. Otherwise, the 'source_entry' will be added.

\n\n

A full copy (including the 'path' string) of the given 'source_entry' will be inserted on the index.

\n", "group": "index" }, "git_index_entry_stage": { "type": "function", "file": "index.h", - "line": 443, - "lineto": 443, + "line": 457, + "lineto": 457, "args": [ { "name": "entry", @@ -7680,14 +7822,14 @@ "comment": " the stage number" }, "description": "

Return the stage number from a git index entry

\n", - "comments": "

This entry is calculated from the entry's flag attribute like this:

\n\n
(entry->flags \n
\n\n

&\n GIT_IDXENTRY_STAGEMASK) >> GIT_IDXENTRY_STAGESHIFT

\n", + "comments": "

This entry is calculated from the entry's flag attribute like this:

\n\n
(entry->flags & GIT_IDXENTRY_STAGEMASK) >> GIT_IDXENTRY_STAGESHIFT\n
\n", "group": "index" }, "git_index_entry_is_conflict": { "type": "function", "file": "index.h", - "line": 452, - "lineto": 452, + "line": 466, + "lineto": 466, "args": [ { "name": "entry", @@ -7708,8 +7850,8 @@ "git_index_add_bypath": { "type": "function", "file": "index.h", - "line": 483, - "lineto": 483, + "line": 497, + "lineto": 497, "args": [ { "name": "index", @@ -7729,14 +7871,14 @@ "comment": " 0 or an error code" }, "description": "

Add or update an index entry from a file on disk

\n", - "comments": "

The file path must be relative to the repository's\n working folder and must be readable.

\n\n

This method will fail in bare index instances.

\n\n

This forces the file to be added to the index, not looking\n at gitignore rules. Those rules can be evaluated through\n the git_status APIs (in status.h) before calling this.

\n\n

If this file currently is the result of a merge conflict, this\n file will no longer be marked as conflicting. The data about\n the conflict will be moved to the "resolve undo" (REUC) section.

\n", + "comments": "

The file path must be relative to the repository's working folder and must be readable.

\n\n

This method will fail in bare index instances.

\n\n

This forces the file to be added to the index, not looking at gitignore rules. Those rules can be evaluated through the git_status APIs (in status.h) before calling this.

\n\n

If this file currently is the result of a merge conflict, this file will no longer be marked as conflicting. The data about the conflict will be moved to the "resolve undo" (REUC) section.

\n", "group": "index" }, "git_index_add_frombuffer": { "type": "function", "file": "index.h", - "line": 512, - "lineto": 515, + "line": 526, + "lineto": 529, "args": [ { "name": "index", @@ -7766,14 +7908,14 @@ "comment": " 0 or an error code" }, "description": "

Add or update an index entry from a buffer in memory

\n", - "comments": "

This method will create a blob in the repository that owns the\n index and then add the index entry to the index. The path of the\n entry represents the position of the blob relative to the\n repository's root folder.

\n\n

If a previous index entry exists that has the same path as the\n given 'entry', it will be replaced. Otherwise, the 'entry' will be\n added. The id and the file_size of the 'entry' are updated with the\n real value of the blob.

\n\n

This forces the file to be added to the index, not looking\n at gitignore rules. Those rules can be evaluated through\n the git_status APIs (in status.h) before calling this.

\n\n

If this file currently is the result of a merge conflict, this\n file will no longer be marked as conflicting. The data about\n the conflict will be moved to the "resolve undo" (REUC) section.

\n", + "comments": "

This method will create a blob in the repository that owns the index and then add the index entry to the index. The path of the entry represents the position of the blob relative to the repository's root folder.

\n\n

If a previous index entry exists that has the same path as the given 'entry', it will be replaced. Otherwise, the 'entry' will be added. The id and the file_size of the 'entry' are updated with the real value of the blob.

\n\n

This forces the file to be added to the index, not looking at gitignore rules. Those rules can be evaluated through the git_status APIs (in status.h) before calling this.

\n\n

If this file currently is the result of a merge conflict, this file will no longer be marked as conflicting. The data about the conflict will be moved to the "resolve undo" (REUC) section.

\n", "group": "index" }, "git_index_remove_bypath": { "type": "function", "file": "index.h", - "line": 531, - "lineto": 531, + "line": 545, + "lineto": 545, "args": [ { "name": "index", @@ -7793,14 +7935,14 @@ "comment": " 0 or an error code" }, "description": "

Remove an index entry corresponding to a file on disk

\n", - "comments": "

The file path must be relative to the repository's\n working folder. It may exist.

\n\n

If this file currently is the result of a merge conflict, this\n file will no longer be marked as conflicting. The data about\n the conflict will be moved to the "resolve undo" (REUC) section.

\n", + "comments": "

The file path must be relative to the repository's working folder. It may exist.

\n\n

If this file currently is the result of a merge conflict, this file will no longer be marked as conflicting. The data about the conflict will be moved to the "resolve undo" (REUC) section.

\n", "group": "index" }, "git_index_add_all": { "type": "function", "file": "index.h", - "line": 578, - "lineto": 583, + "line": 592, + "lineto": 597, "args": [ { "name": "index", @@ -7835,14 +7977,14 @@ "comment": " 0 on success, negative callback return value, or error code" }, "description": "

Add or update index entries matching files in the working directory.

\n", - "comments": "

This method will fail in bare index instances.

\n\n

The pathspec is a list of file names or shell glob patterns that will\n matched against files in the repository's working directory. Each file\n that matches will be added to the index (either updating an existing\n entry or adding a new entry). You can disable glob expansion and force\n exact matching with the GIT_INDEX_ADD_DISABLE_PATHSPEC_MATCH flag.

\n\n

Files that are ignored will be skipped (unlike git_index_add_bypath).\n If a file is already tracked in the index, then it will be updated\n even if it is ignored. Pass the GIT_INDEX_ADD_FORCE flag to\n skip the checking of ignore rules.

\n\n

To emulate git add -A and generate an error if the pathspec contains\n the exact path of an ignored file (when not using FORCE), add the\n GIT_INDEX_ADD_CHECK_PATHSPEC flag. This checks that each entry\n in the pathspec that is an exact match to a filename on disk is\n either not ignored or already in the index. If this check fails, the\n function will return GIT_EINVALIDSPEC.

\n\n

To emulate git add -A with the "dry-run" option, just use a callback\n function that always returns a positive value. See below for details.

\n\n

If any files are currently the result of a merge conflict, those files\n will no longer be marked as conflicting. The data about the conflicts\n will be moved to the "resolve undo" (REUC) section.

\n\n

If you provide a callback function, it will be invoked on each matching\n item in the working directory immediately before it is added to /\n updated in the index. Returning zero will add the item to the index,\n greater than zero will skip the item, and less than zero will abort the\n scan and return that value to the caller.

\n", + "comments": "

This method will fail in bare index instances.

\n\n

The pathspec is a list of file names or shell glob patterns that will matched against files in the repository's working directory. Each file that matches will be added to the index (either updating an existing entry or adding a new entry). You can disable glob expansion and force exact matching with the GIT_INDEX_ADD_DISABLE_PATHSPEC_MATCH flag.

\n\n

Files that are ignored will be skipped (unlike git_index_add_bypath). If a file is already tracked in the index, then it will be updated even if it is ignored. Pass the GIT_INDEX_ADD_FORCE flag to skip the checking of ignore rules.

\n\n

To emulate git add -A and generate an error if the pathspec contains the exact path of an ignored file (when not using FORCE), add the GIT_INDEX_ADD_CHECK_PATHSPEC flag. This checks that each entry in the pathspec that is an exact match to a filename on disk is either not ignored or already in the index. If this check fails, the function will return GIT_EINVALIDSPEC.

\n\n

To emulate git add -A with the "dry-run" option, just use a callback function that always returns a positive value. See below for details.

\n\n

If any files are currently the result of a merge conflict, those files will no longer be marked as conflicting. The data about the conflicts will be moved to the "resolve undo" (REUC) section.

\n\n

If you provide a callback function, it will be invoked on each matching item in the working directory immediately before it is added to / updated in the index. Returning zero will add the item to the index, greater than zero will skip the item, and less than zero will abort the scan and return that value to the caller.

\n", "group": "index" }, "git_index_remove_all": { "type": "function", "file": "index.h", - "line": 600, - "lineto": 604, + "line": 614, + "lineto": 618, "args": [ { "name": "index", @@ -7872,14 +8014,14 @@ "comment": " 0 on success, negative callback return value, or error code" }, "description": "

Remove all matching index entries.

\n", - "comments": "

If you provide a callback function, it will be invoked on each matching\n item in the index immediately before it is removed. Return 0 to\n remove the item, > 0 to skip the item, and \n<\n 0 to abort the scan.

\n", + "comments": "

If you provide a callback function, it will be invoked on each matching item in the index immediately before it is removed. Return 0 to remove the item, > 0 to skip the item, and < 0 to abort the scan.

\n", "group": "index" }, "git_index_update_all": { "type": "function", "file": "index.h", - "line": 629, - "lineto": 633, + "line": 643, + "lineto": 647, "args": [ { "name": "index", @@ -7909,14 +8051,14 @@ "comment": " 0 on success, negative callback return value, or error code" }, "description": "

Update all index entries to match the working directory

\n", - "comments": "

This method will fail in bare index instances.

\n\n

This scans the existing index entries and synchronizes them with the\n working directory, deleting them if the corresponding working directory\n file no longer exists otherwise updating the information (including\n adding the latest version of file to the ODB if needed).

\n\n

If you provide a callback function, it will be invoked on each matching\n item in the index immediately before it is updated (either refreshed\n or removed depending on working directory state). Return 0 to proceed\n with updating the item, > 0 to skip the item, and \n<\n 0 to abort the scan.

\n", + "comments": "

This method will fail in bare index instances.

\n\n

This scans the existing index entries and synchronizes them with the working directory, deleting them if the corresponding working directory file no longer exists otherwise updating the information (including adding the latest version of file to the ODB if needed).

\n\n

If you provide a callback function, it will be invoked on each matching item in the index immediately before it is updated (either refreshed or removed depending on working directory state). Return 0 to proceed with updating the item, > 0 to skip the item, and < 0 to abort the scan.

\n", "group": "index" }, "git_index_find": { "type": "function", "file": "index.h", - "line": 644, - "lineto": 644, + "line": 658, + "lineto": 658, "args": [ { "name": "at_pos", @@ -7944,11 +8086,43 @@ "comments": "", "group": "index" }, - "git_index_conflict_add": { + "git_index_find_prefix": { "type": "function", "file": "index.h", "line": 669, - "lineto": 673, + "lineto": 669, + "args": [ + { + "name": "at_pos", + "type": "size_t *", + "comment": "the address to which the position of the index entry is written (optional)" + }, + { + "name": "index", + "type": "git_index *", + "comment": "an existing index object" + }, + { + "name": "prefix", + "type": "const char *", + "comment": "the prefix to search for" + } + ], + "argline": "size_t *at_pos, git_index *index, const char *prefix", + "sig": "size_t *::git_index *::const char *", + "return": { + "type": "int", + "comment": " 0 with valid value in at_pos; an error code otherwise" + }, + "description": "

Find the first position of any entries matching a prefix. To find the first position\n of a path inside a given folder, suffix the prefix with a '/'.

\n", + "comments": "", + "group": "index" + }, + "git_index_conflict_add": { + "type": "function", + "file": "index.h", + "line": 694, + "lineto": 698, "args": [ { "name": "index", @@ -7978,14 +8152,14 @@ "comment": " 0 or an error code" }, "description": "

Add or update index entries to represent a conflict. Any staged\n entries that exist at the given paths will be removed.

\n", - "comments": "

The entries are the entries from the tree included in the merge. Any\n entry may be null to indicate that that file was not present in the\n trees during the merge. For example, ancestor_entry may be NULL to\n indicate that a file was added in both branches and must be resolved.

\n", + "comments": "

The entries are the entries from the tree included in the merge. Any entry may be null to indicate that that file was not present in the trees during the merge. For example, ancestor_entry may be NULL to indicate that a file was added in both branches and must be resolved.

\n", "group": "index" }, "git_index_conflict_get": { "type": "function", "file": "index.h", - "line": 689, - "lineto": 694, + "line": 714, + "lineto": 719, "args": [ { "name": "ancestor_out", @@ -8020,14 +8194,14 @@ "comment": " 0 or an error code" }, "description": "

Get the index entries that represent a conflict of a single file.

\n", - "comments": "

The entries are not modifiable and should not be freed. Because the\n git_index_entry struct is a publicly defined struct, you should\n be able to make your own permanent copy of the data if necessary.

\n", + "comments": "

The entries are not modifiable and should not be freed. Because the git_index_entry struct is a publicly defined struct, you should be able to make your own permanent copy of the data if necessary.

\n", "group": "index" }, "git_index_conflict_remove": { "type": "function", "file": "index.h", - "line": 703, - "lineto": 703, + "line": 728, + "lineto": 728, "args": [ { "name": "index", @@ -8053,8 +8227,8 @@ "git_index_conflict_cleanup": { "type": "function", "file": "index.h", - "line": 711, - "lineto": 711, + "line": 736, + "lineto": 736, "args": [ { "name": "index", @@ -8075,8 +8249,8 @@ "git_index_has_conflicts": { "type": "function", "file": "index.h", - "line": 718, - "lineto": 718, + "line": 743, + "lineto": 743, "args": [ { "name": "index", @@ -8097,8 +8271,8 @@ "git_index_conflict_iterator_new": { "type": "function", "file": "index.h", - "line": 729, - "lineto": 731, + "line": 754, + "lineto": 756, "args": [ { "name": "iterator_out", @@ -8124,8 +8298,8 @@ "git_index_conflict_next": { "type": "function", "file": "index.h", - "line": 743, - "lineto": 747, + "line": 768, + "lineto": 772, "args": [ { "name": "ancestor_out", @@ -8161,8 +8335,8 @@ "git_index_conflict_iterator_free": { "type": "function", "file": "index.h", - "line": 754, - "lineto": 755, + "line": 779, + "lineto": 780, "args": [ { "name": "iterator", @@ -8228,7 +8402,7 @@ "group": "indexer", "examples": { "network/index-pack.c": [ - "ex/v0.23.2/network/index-pack.html#git_indexer_new-1" + "ex/v0.24.1/network/index-pack.html#git_indexer_new-1" ] } }, @@ -8270,7 +8444,7 @@ "group": "indexer", "examples": { "network/index-pack.c": [ - "ex/v0.23.2/network/index-pack.html#git_indexer_append-2" + "ex/v0.24.1/network/index-pack.html#git_indexer_append-2" ] } }, @@ -8302,7 +8476,7 @@ "group": "indexer", "examples": { "network/index-pack.c": [ - "ex/v0.23.2/network/index-pack.html#git_indexer_commit-3" + "ex/v0.24.1/network/index-pack.html#git_indexer_commit-3" ] } }, @@ -8325,11 +8499,11 @@ "comment": null }, "description": "

Get the packfile's hash

\n", - "comments": "

A packfile's name is derived from the sorted hashing of all object\n names. This is only correct after the index has been finalized.

\n", + "comments": "

A packfile's name is derived from the sorted hashing of all object names. This is only correct after the index has been finalized.

\n", "group": "indexer", "examples": { "network/index-pack.c": [ - "ex/v0.23.2/network/index-pack.html#git_indexer_hash-4" + "ex/v0.24.1/network/index-pack.html#git_indexer_hash-4" ] } }, @@ -8356,7 +8530,7 @@ "group": "indexer", "examples": { "network/index-pack.c": [ - "ex/v0.23.2/network/index-pack.html#git_indexer_free-5" + "ex/v0.24.1/network/index-pack.html#git_indexer_free-5" ] } }, @@ -8390,8 +8564,8 @@ "git_merge_file_init_options": { "type": "function", "file": "merge.h", - "line": 188, - "lineto": 190, + "line": 208, + "lineto": 210, "args": [ { "name": "opts", @@ -8417,8 +8591,8 @@ "git_merge_init_options": { "type": "function", "file": "merge.h", - "line": 265, - "lineto": 267, + "line": 295, + "lineto": 297, "args": [ { "name": "opts", @@ -8444,8 +8618,8 @@ "git_merge_analysis": { "type": "function", "file": "merge.h", - "line": 336, - "lineto": 341, + "line": 366, + "lineto": 371, "args": [ { "name": "analysis_out", @@ -8486,8 +8660,8 @@ "git_merge_base": { "type": "function", "file": "merge.h", - "line": 352, - "lineto": 356, + "line": 382, + "lineto": 386, "args": [ { "name": "out", @@ -8521,18 +8695,18 @@ "group": "merge", "examples": { "log.c": [ - "ex/v0.23.2/log.html#git_merge_base-32" + "ex/v0.24.1/log.html#git_merge_base-32" ], "rev-parse.c": [ - "ex/v0.23.2/rev-parse.html#git_merge_base-3" + "ex/v0.24.1/rev-parse.html#git_merge_base-3" ] } }, "git_merge_bases": { "type": "function", "file": "merge.h", - "line": 367, - "lineto": 371, + "line": 397, + "lineto": 401, "args": [ { "name": "out", @@ -8568,8 +8742,8 @@ "git_merge_base_many": { "type": "function", "file": "merge.h", - "line": 382, - "lineto": 386, + "line": 412, + "lineto": 416, "args": [ { "name": "out", @@ -8605,8 +8779,8 @@ "git_merge_bases_many": { "type": "function", "file": "merge.h", - "line": 397, - "lineto": 401, + "line": 427, + "lineto": 431, "args": [ { "name": "out", @@ -8642,8 +8816,8 @@ "git_merge_base_octopus": { "type": "function", "file": "merge.h", - "line": 412, - "lineto": 416, + "line": 442, + "lineto": 446, "args": [ { "name": "out", @@ -8679,8 +8853,8 @@ "git_merge_file": { "type": "function", "file": "merge.h", - "line": 434, - "lineto": 439, + "line": 464, + "lineto": 469, "args": [ { "name": "out", @@ -8715,14 +8889,14 @@ "comment": " 0 on success or error code" }, "description": "

Merge two files as they exist in the in-memory data structures, using\n the given common ancestor as the baseline, producing a\n git_merge_file_result that reflects the merge result. The\n git_merge_file_result must be freed with git_merge_file_result_free.

\n", - "comments": "

Note that this function does not reference a repository and any\n configuration must be passed as git_merge_file_options.

\n", + "comments": "

Note that this function does not reference a repository and any configuration must be passed as git_merge_file_options.

\n", "group": "merge" }, "git_merge_file_from_index": { "type": "function", "file": "merge.h", - "line": 455, - "lineto": 461, + "line": 485, + "lineto": 491, "args": [ { "name": "out", @@ -8768,8 +8942,8 @@ "git_merge_file_result_free": { "type": "function", "file": "merge.h", - "line": 468, - "lineto": 468, + "line": 498, + "lineto": 498, "args": [ { "name": "result", @@ -8790,8 +8964,8 @@ "git_merge_trees": { "type": "function", "file": "merge.h", - "line": 486, - "lineto": 492, + "line": 516, + "lineto": 522, "args": [ { "name": "out", @@ -8837,8 +9011,8 @@ "git_merge_commits": { "type": "function", "file": "merge.h", - "line": 513, - "lineto": 518, + "line": 539, + "lineto": 544, "args": [ { "name": "out", @@ -8873,14 +9047,14 @@ "comment": " 0 on success or error code" }, "description": "

Merge two commits, producing a git_index that reflects the result of\n the merge. The index may be written as-is to the working directory\n or checked out. If the index is to be converted to a tree, the caller\n should resolve any conflicts that arose as part of the merge.

\n", - "comments": "

The merge performed uses the first common ancestor, unlike the\n git-merge-recursive strategy, which may produce an artificial common\n ancestor tree when there are multiple ancestors.

\n\n

The returned index must be freed explicitly with git_index_free.

\n", + "comments": "

The returned index must be freed explicitly with git_index_free.

\n", "group": "merge" }, "git_merge": { "type": "function", "file": "merge.h", - "line": 542, - "lineto": 547, + "line": 564, + "lineto": 569, "args": [ { "name": "repo", @@ -8915,7 +9089,7 @@ "comment": " 0 on success or error code" }, "description": "

Merges the given commit(s) into HEAD, writing the results into the working\n directory. Any changes are staged for commit and any conflicts are written\n to the index. Callers should inspect the repository's index after this\n completes, resolve any conflicts and prepare a commit.

\n", - "comments": "

The merge performed uses the first common ancestor, unlike the\n git-merge-recursive strategy, which may produce an artificial common\n ancestor tree when there are multiple ancestors.

\n\n

For compatibility with git, the repository is put into a merging\n state. Once the commit is done (or if the uses wishes to abort),\n you should clear this state by calling\n git_repository_state_cleanup().

\n", + "comments": "

For compatibility with git, the repository is put into a merging state. Once the commit is done (or if the uses wishes to abort), you should clear this state by calling git_repository_state_cleanup().

\n", "group": "merge" }, "git_message_prettify": { @@ -9358,11 +9532,11 @@ "comment": " 0 or an error code" }, "description": "

Lookup a reference to one of the objects in a repository.

\n", - "comments": "

The generated reference is owned by the repository and\n should be closed with the git_object_free method\n instead of free'd manually.

\n\n

The 'type' parameter must match the type of the object\n in the odb; the method will fail otherwise.\n The special value 'GIT_OBJ_ANY' may be passed to let\n the method guess the object's type.

\n", + "comments": "

The generated reference is owned by the repository and should be closed with the git_object_free method instead of free'd manually.

\n\n

The 'type' parameter must match the type of the object in the odb; the method will fail otherwise. The special value 'GIT_OBJ_ANY' may be passed to let the method guess the object's type.

\n", "group": "object", "examples": { "log.c": [ - "ex/v0.23.2/log.html#git_object_lookup-33" + "ex/v0.24.1/log.html#git_object_lookup-33" ] } }, @@ -9405,7 +9579,7 @@ "comment": " 0 or an error code" }, "description": "

Lookup a reference to one of the objects in a repository,\n given a prefix of its identifier (short id).

\n", - "comments": "

The object obtained will be so that its identifier\n matches the first 'len' hexadecimal characters\n (packets of 4 bits) of the given 'id'.\n 'len' must be at least GIT_OID_MINPREFIXLEN, and\n long enough to identify a unique object matching\n the prefix; otherwise the method will fail.

\n\n

The generated reference is owned by the repository and\n should be closed with the git_object_free method\n instead of free'd manually.

\n\n

The 'type' parameter must match the type of the object\n in the odb; the method will fail otherwise.\n The special value 'GIT_OBJ_ANY' may be passed to let\n the method guess the object's type.

\n", + "comments": "

The object obtained will be so that its identifier matches the first 'len' hexadecimal characters (packets of 4 bits) of the given 'id'. 'len' must be at least GIT_OID_MINPREFIXLEN, and long enough to identify a unique object matching the prefix; otherwise the method will fail.

\n\n

The generated reference is owned by the repository and should be closed with the git_object_free method instead of free'd manually.

\n\n

The 'type' parameter must match the type of the object in the odb; the method will fail otherwise. The special value 'GIT_OBJ_ANY' may be passed to let the method guess the object's type.

\n", "group": "object" }, "git_object_lookup_bypath": { @@ -9468,27 +9642,27 @@ "group": "object", "examples": { "blame.c": [ - "ex/v0.23.2/blame.html#git_object_id-10", - "ex/v0.23.2/blame.html#git_object_id-11", - "ex/v0.23.2/blame.html#git_object_id-12", - "ex/v0.23.2/blame.html#git_object_id-13" + "ex/v0.24.1/blame.html#git_object_id-10", + "ex/v0.24.1/blame.html#git_object_id-11", + "ex/v0.24.1/blame.html#git_object_id-12", + "ex/v0.24.1/blame.html#git_object_id-13" ], "cat-file.c": [ - "ex/v0.23.2/cat-file.html#git_object_id-12", - "ex/v0.23.2/cat-file.html#git_object_id-13" + "ex/v0.24.1/cat-file.html#git_object_id-12", + "ex/v0.24.1/cat-file.html#git_object_id-13" ], "log.c": [ - "ex/v0.23.2/log.html#git_object_id-34", - "ex/v0.23.2/log.html#git_object_id-35", - "ex/v0.23.2/log.html#git_object_id-36", - "ex/v0.23.2/log.html#git_object_id-37" + "ex/v0.24.1/log.html#git_object_id-34", + "ex/v0.24.1/log.html#git_object_id-35", + "ex/v0.24.1/log.html#git_object_id-36", + "ex/v0.24.1/log.html#git_object_id-37" ], "rev-parse.c": [ - "ex/v0.23.2/rev-parse.html#git_object_id-4", - "ex/v0.23.2/rev-parse.html#git_object_id-5", - "ex/v0.23.2/rev-parse.html#git_object_id-6", - "ex/v0.23.2/rev-parse.html#git_object_id-7", - "ex/v0.23.2/rev-parse.html#git_object_id-8" + "ex/v0.24.1/rev-parse.html#git_object_id-4", + "ex/v0.24.1/rev-parse.html#git_object_id-5", + "ex/v0.24.1/rev-parse.html#git_object_id-6", + "ex/v0.24.1/rev-parse.html#git_object_id-7", + "ex/v0.24.1/rev-parse.html#git_object_id-8" ] } }, @@ -9516,11 +9690,11 @@ "comment": " 0 on success, \n<\n0 for error" }, "description": "

Get a short abbreviated OID string for the object

\n", - "comments": "

This starts at the "core.abbrev" length (default 7 characters) and\n iteratively extends to a longer string if that length is ambiguous.\n The result will be unambiguous (at least until new objects are added to\n the repository).

\n", + "comments": "

This starts at the "core.abbrev" length (default 7 characters) and iteratively extends to a longer string if that length is ambiguous. The result will be unambiguous (at least until new objects are added to the repository).

\n", "group": "object", "examples": { "tag.c": [ - "ex/v0.23.2/tag.html#git_object_short_id-5" + "ex/v0.24.1/tag.html#git_object_short_id-5" ] } }, @@ -9547,12 +9721,12 @@ "group": "object", "examples": { "cat-file.c": [ - "ex/v0.23.2/cat-file.html#git_object_type-14", - "ex/v0.23.2/cat-file.html#git_object_type-15", - "ex/v0.23.2/cat-file.html#git_object_type-16" + "ex/v0.24.1/cat-file.html#git_object_type-14", + "ex/v0.24.1/cat-file.html#git_object_type-15", + "ex/v0.24.1/cat-file.html#git_object_type-16" ], "tag.c": [ - "ex/v0.23.2/tag.html#git_object_type-6" + "ex/v0.24.1/tag.html#git_object_type-6" ] } }, @@ -9575,7 +9749,7 @@ "comment": " the repository who owns this object" }, "description": "

Get the repository that owns this object

\n", - "comments": "

Freeing or calling git_repository_close on the\n returned pointer will invalidate the actual object.

\n\n

Any other operation may be run on the repository without\n affecting the object.

\n", + "comments": "

Freeing or calling git_repository_close on the returned pointer will invalidate the actual object.

\n\n

Any other operation may be run on the repository without affecting the object.

\n", "group": "object" }, "git_object_free": { @@ -9597,34 +9771,34 @@ "comment": null }, "description": "

Close an open object

\n", - "comments": "

This method instructs the library to close an existing\n object; note that git_objects are owned and cached by the repository\n so the object may or may not be freed after this library call,\n depending on how aggressive is the caching mechanism used\n by the repository.

\n\n

IMPORTANT:\n It is necessary to call this method when you stop using\n an object. Failure to do so will cause a memory leak.

\n", + "comments": "

This method instructs the library to close an existing object; note that git_objects are owned and cached by the repository so the object may or may not be freed after this library call, depending on how aggressive is the caching mechanism used by the repository.

\n\n

IMPORTANT: It is necessary to call this method when you stop using an object. Failure to do so will cause a memory leak.

\n", "group": "object", "examples": { "blame.c": [ - "ex/v0.23.2/blame.html#git_object_free-14", - "ex/v0.23.2/blame.html#git_object_free-15", - "ex/v0.23.2/blame.html#git_object_free-16", - "ex/v0.23.2/blame.html#git_object_free-17" + "ex/v0.24.1/blame.html#git_object_free-14", + "ex/v0.24.1/blame.html#git_object_free-15", + "ex/v0.24.1/blame.html#git_object_free-16", + "ex/v0.24.1/blame.html#git_object_free-17" ], "cat-file.c": [ - "ex/v0.23.2/cat-file.html#git_object_free-17" + "ex/v0.24.1/cat-file.html#git_object_free-17" ], "general.c": [ - "ex/v0.23.2/general.html#git_object_free-32" + "ex/v0.24.1/general.html#git_object_free-32" ], "log.c": [ - "ex/v0.23.2/log.html#git_object_free-38" + "ex/v0.24.1/log.html#git_object_free-38" ], "rev-parse.c": [ - "ex/v0.23.2/rev-parse.html#git_object_free-9", - "ex/v0.23.2/rev-parse.html#git_object_free-10", - "ex/v0.23.2/rev-parse.html#git_object_free-11" + "ex/v0.24.1/rev-parse.html#git_object_free-9", + "ex/v0.24.1/rev-parse.html#git_object_free-10", + "ex/v0.24.1/rev-parse.html#git_object_free-11" ], "tag.c": [ - "ex/v0.23.2/tag.html#git_object_free-7", - "ex/v0.23.2/tag.html#git_object_free-8", - "ex/v0.23.2/tag.html#git_object_free-9", - "ex/v0.23.2/tag.html#git_object_free-10" + "ex/v0.24.1/tag.html#git_object_free-7", + "ex/v0.24.1/tag.html#git_object_free-8", + "ex/v0.24.1/tag.html#git_object_free-9", + "ex/v0.24.1/tag.html#git_object_free-10" ] } }, @@ -9647,17 +9821,17 @@ "comment": " the corresponding string representation." }, "description": "

Convert an object type to its string representation.

\n", - "comments": "

The result is a pointer to a string in static memory and\n should not be free()'ed.

\n", + "comments": "

The result is a pointer to a string in static memory and should not be free()'ed.

\n", "group": "object", "examples": { "cat-file.c": [ - "ex/v0.23.2/cat-file.html#git_object_type2string-18", - "ex/v0.23.2/cat-file.html#git_object_type2string-19", - "ex/v0.23.2/cat-file.html#git_object_type2string-20", - "ex/v0.23.2/cat-file.html#git_object_type2string-21" + "ex/v0.24.1/cat-file.html#git_object_type2string-18", + "ex/v0.24.1/cat-file.html#git_object_type2string-19", + "ex/v0.24.1/cat-file.html#git_object_type2string-20", + "ex/v0.24.1/cat-file.html#git_object_type2string-21" ], "general.c": [ - "ex/v0.23.2/general.html#git_object_type2string-33" + "ex/v0.24.1/general.html#git_object_type2string-33" ] } }, @@ -9724,7 +9898,7 @@ "comment": " size in bytes of the object" }, "description": "

Get the size in bytes for the structure which\n acts as an in-memory representation of any given\n object type.

\n", - "comments": "

For all the core types, this would the equivalent\n of calling sizeof(git_commit) if the core types\n were not opaque on the external API.

\n", + "comments": "

For all the core types, this would the equivalent of calling sizeof(git_commit) if the core types were not opaque on the external API.

\n", "group": "object" }, "git_object_peel": { @@ -9756,7 +9930,7 @@ "comment": " 0 on success, GIT_EINVALIDSPEC, GIT_EPEEL, or an error code" }, "description": "

Recursively peel an object until an object of the specified type is met.

\n", - "comments": "

If the query cannot be satisfied due to the object model,\n GIT_EINVALIDSPEC will be returned (e.g. trying to peel a blob to a\n tree).

\n\n

If you pass GIT_OBJ_ANY as the target type, then the object will\n be peeled until the type changes. A tag will be peeled until the\n referenced object is no longer a tag, and a commit will be peeled\n to a tree. Any other object type will return GIT_EINVALIDSPEC.

\n\n

If peeling a tag we discover an object which cannot be peeled to\n the target type due to the object model, GIT_EPEEL will be\n returned.

\n\n

You must free the returned object.

\n", + "comments": "

If the query cannot be satisfied due to the object model, GIT_EINVALIDSPEC will be returned (e.g. trying to peel a blob to a tree).

\n\n

If you pass GIT_OBJ_ANY as the target type, then the object will be peeled until the type changes. A tag will be peeled until the referenced object is no longer a tag, and a commit will be peeled to a tree. Any other object type will return GIT_EINVALIDSPEC.

\n\n

If peeling a tag we discover an object which cannot be peeled to the target type due to the object model, GIT_EPEEL will be returned.

\n\n

You must free the returned object.

\n", "group": "object" }, "git_object_dup": { @@ -9805,7 +9979,7 @@ "comment": " 0 or an error code" }, "description": "

Create a new object database with no backends.

\n", - "comments": "

Before the ODB can be used for read/writing, a custom database\n backend must be manually added using git_odb_add_backend()

\n", + "comments": "

Before the ODB can be used for read/writing, a custom database backend must be manually added using git_odb_add_backend()

\n", "group": "odb" }, "git_odb_open": { @@ -9832,7 +10006,7 @@ "comment": " 0 or an error code" }, "description": "

Create a new object database and automatically add\n the two default backends:

\n", - "comments": "
- git_odb_backend_loose: read and write loose object files\n    from disk, assuming `objects_dir` as the Objects folder\n\n- git_odb_backend_pack: read objects from packfiles,\n    assuming `objects_dir` as the Objects folder which\n    contains a 'pack/' folder with the corresponding data\n
\n", + "comments": "
- git_odb_backend_loose: read and write loose object files      from disk, assuming `objects_dir` as the Objects folder\n\n- git_odb_backend_pack: read objects from packfiles,        assuming `objects_dir` as the Objects folder which      contains a 'pack/' folder with the corresponding data\n
\n", "group": "odb" }, "git_odb_add_disk_alternate": { @@ -9859,7 +10033,7 @@ "comment": " 0 on success; error code otherwise" }, "description": "

Add an on-disk alternate to an existing Object DB.

\n", - "comments": "

Note that the added path must point to an objects, not\n to a full repository, to use it as an alternate store.

\n\n

Alternate backends are always checked for objects after\n all the main backends have been exhausted.

\n\n

Writing is disabled on alternate backends.

\n", + "comments": "

Note that the added path must point to an objects, not to a full repository, to use it as an alternate store.

\n\n

Alternate backends are always checked for objects after all the main backends have been exhausted.

\n\n

Writing is disabled on alternate backends.

\n", "group": "odb" }, "git_odb_free": { @@ -9885,7 +10059,7 @@ "group": "odb", "examples": { "cat-file.c": [ - "ex/v0.23.2/cat-file.html#git_odb_free-22" + "ex/v0.24.1/cat-file.html#git_odb_free-22" ] } }, @@ -9918,14 +10092,14 @@ "comment": " - 0 if the object was read;\n - GIT_ENOTFOUND if the object is not in the database." }, "description": "

Read an object from the database.

\n", - "comments": "

This method queries all available ODB backends\n trying to read the given OID.

\n\n

The returned object is reference counted and\n internally cached, so it should be closed\n by the user once it's no longer in use.

\n", + "comments": "

This method queries all available ODB backends trying to read the given OID.

\n\n

The returned object is reference counted and internally cached, so it should be closed by the user once it's no longer in use.

\n", "group": "odb", "examples": { "cat-file.c": [ - "ex/v0.23.2/cat-file.html#git_odb_read-23" + "ex/v0.24.1/cat-file.html#git_odb_read-23" ], "general.c": [ - "ex/v0.23.2/general.html#git_odb_read-34" + "ex/v0.24.1/general.html#git_odb_read-34" ] } }, @@ -9963,7 +10137,7 @@ "comment": " - 0 if the object was read;\n - GIT_ENOTFOUND if the object is not in the database.\n - GIT_EAMBIGUOUS if the prefix is ambiguous (several objects match the prefix)" }, "description": "

Read an object from the database, given a prefix\n of its identifier.

\n", - "comments": "

This method queries all available ODB backends\n trying to match the 'len' first hexadecimal\n characters of the 'short_id'.\n The remaining (GIT_OID_HEXSZ-len)*4 bits of\n 'short_id' must be 0s.\n 'len' must be at least GIT_OID_MINPREFIXLEN,\n and the prefix must be long enough to identify\n a unique object in all the backends; the\n method will fail otherwise.

\n\n

The returned object is reference counted and\n internally cached, so it should be closed\n by the user once it's no longer in use.

\n", + "comments": "

This method queries all available ODB backends trying to match the 'len' first hexadecimal characters of the 'short_id'. The remaining (GIT_OID_HEXSZ-len)*4 bits of 'short_id' must be 0s. 'len' must be at least GIT_OID_MINPREFIXLEN, and the prefix must be long enough to identify a unique object in all the backends; the method will fail otherwise.

\n\n

The returned object is reference counted and internally cached, so it should be closed by the user once it's no longer in use.

\n", "group": "odb" }, "git_odb_read_header": { @@ -10000,7 +10174,7 @@ "comment": " - 0 if the object was read;\n - GIT_ENOTFOUND if the object is not in the database." }, "description": "

Read the header of an object from the database, without\n reading its full contents.

\n", - "comments": "

The header includes the length and the type of an object.

\n\n

Note that most backends do not support reading only the header\n of an object, so the whole object will be read and then the\n header will be returned.

\n", + "comments": "

The header includes the length and the type of an object.

\n\n

Note that most backends do not support reading only the header of an object, so the whole object will be read and then the header will be returned.

\n", "group": "odb" }, "git_odb_exists": { @@ -10086,7 +10260,7 @@ "comment": " 0 on success, error code otherwise" }, "description": "

Refresh the object database to load newly added files.

\n", - "comments": "

If the object databases have changed on disk while the library\n is running, this function will force a reload of the underlying\n indexes.

\n\n

Use this function when you're confident that an external\n application has tampered with the ODB.

\n\n

NOTE that it is not necessary to call this function at all. The\n library will automatically attempt to refresh the ODB\n when a lookup fails, to see if the looked up object exists\n on disk but hasn't been loaded yet.

\n", + "comments": "

If the object databases have changed on disk while the library is running, this function will force a reload of the underlying indexes.

\n\n

Use this function when you're confident that an external application has tampered with the ODB.

\n\n

NOTE that it is not necessary to call this function at all. The library will automatically attempt to refresh the ODB when a lookup fails, to see if the looked up object exists on disk but hasn't been loaded yet.

\n", "group": "odb" }, "git_odb_foreach": { @@ -10118,7 +10292,7 @@ "comment": " 0 on success, non-zero callback return value, or error code" }, "description": "

List all objects available in the database

\n", - "comments": "

The callback will be called for each object available in the\n database. Note that the objects are likely to be returned in the index\n order, which would make accessing the objects in that order inefficient.\n Return a non-zero value from the callback to stop looping.

\n", + "comments": "

The callback will be called for each object available in the database. Note that the objects are likely to be returned in the index order, which would make accessing the objects in that order inefficient. Return a non-zero value from the callback to stop looping.

\n", "group": "odb" }, "git_odb_write": { @@ -10160,11 +10334,11 @@ "comment": " 0 or an error code" }, "description": "

Write an object directly into the ODB

\n", - "comments": "

This method writes a full object straight into the ODB.\n For most cases, it is preferred to write objects through a write\n stream, which is both faster and less memory intensive, specially\n for big objects.

\n\n

This method is provided for compatibility with custom backends\n which are not able to support streaming writes

\n", + "comments": "

This method writes a full object straight into the ODB. For most cases, it is preferred to write objects through a write stream, which is both faster and less memory intensive, specially for big objects.

\n\n

This method is provided for compatibility with custom backends which are not able to support streaming writes

\n", "group": "odb", "examples": { "general.c": [ - "ex/v0.23.2/general.html#git_odb_write-35" + "ex/v0.24.1/general.html#git_odb_write-35" ] } }, @@ -10202,7 +10376,7 @@ "comment": " 0 if the stream was created; error code otherwise" }, "description": "

Open a stream to write an object into the ODB

\n", - "comments": "

The type and final length of the object must be specified\n when opening the stream.

\n\n

The returned stream will be of type GIT_STREAM_WRONLY, and it\n won't be effective until git_odb_stream_finalize_write is called\n and returns without an error

\n\n

The stream must always be freed when done with git_odb_stream_free or\n will leak memory.

\n", + "comments": "

The type and final length of the object must be specified when opening the stream.

\n\n

The returned stream will be of type GIT_STREAM_WRONLY, and it won't be effective until git_odb_stream_finalize_write is called and returns without an error

\n\n

The stream must always be freed when done with git_odb_stream_free or will leak memory.

\n", "group": "odb" }, "git_odb_stream_write": { @@ -10234,7 +10408,7 @@ "comment": " 0 if the write succeeded; error code otherwise" }, "description": "

Write to an odb stream

\n", - "comments": "

This method will fail if the total number of received bytes exceeds the\n size declared with git_odb_open_wstream()

\n", + "comments": "

This method will fail if the total number of received bytes exceeds the size declared with git_odb_open_wstream()

\n", "group": "odb" }, "git_odb_stream_finalize_write": { @@ -10261,7 +10435,7 @@ "comment": " 0 on success; an error code otherwise" }, "description": "

Finish writing to an odb stream

\n", - "comments": "

The object will take its final name and will be available to the\n odb.

\n\n

This method will fail if the total number of received bytes\n differs from the size declared with git_odb_open_wstream()

\n", + "comments": "

The object will take its final name and will be available to the odb.

\n\n

This method will fail if the total number of received bytes differs from the size declared with git_odb_open_wstream()

\n", "group": "odb" }, "git_odb_stream_read": { @@ -10347,7 +10521,7 @@ "comment": " 0 if the stream was created; error code otherwise" }, "description": "

Open a stream to read an object from the ODB

\n", - "comments": "

Note that most backends do not support streaming reads\n because they store their objects as compressed/delta'ed blobs.

\n\n

It's recommended to use git_odb_read instead, which is\n assured to work on all backends.

\n\n

The returned stream will be of type GIT_STREAM_RDONLY and\n will have the following methods:

\n\n
    - stream->read: read `n` bytes from the stream\n    - stream->free: free the stream\n
\n\n

The stream must always be free'd or will leak memory.

\n", + "comments": "

Note that most backends do not support streaming reads because they store their objects as compressed/delta'ed blobs.

\n\n

It's recommended to use git_odb_read instead, which is assured to work on all backends.

\n\n

The returned stream will be of type GIT_STREAM_RDONLY and will have the following methods:

\n\n
    - stream->read: read `n` bytes from the stream      - stream->free: free the stream\n
\n\n

The stream must always be free'd or will leak memory.

\n", "group": "odb" }, "git_odb_write_pack": { @@ -10384,7 +10558,7 @@ "comment": null }, "description": "

Open a stream for writing a pack file to the ODB.

\n", - "comments": "

If the ODB layer understands pack files, then the given\n packfile will likely be streamed directly to disk (and a\n corresponding index created). If the ODB layer does not\n understand pack files, the objects will be stored in whatever\n format the ODB layer uses.

\n", + "comments": "

If the ODB layer understands pack files, then the given packfile will likely be streamed directly to disk (and a corresponding index created). If the ODB layer does not understand pack files, the objects will be stored in whatever format the ODB layer uses.

\n", "group": "odb" }, "git_odb_hash": { @@ -10421,7 +10595,7 @@ "comment": " 0 or an error code" }, "description": "

Determine the object-ID (sha1 hash) of a data buffer

\n", - "comments": "

The resulting SHA-1 OID will be the identifier for the data\n buffer as if the data buffer it were to written to the ODB.

\n", + "comments": "

The resulting SHA-1 OID will be the identifier for the data buffer as if the data buffer it were to written to the ODB.

\n", "group": "odb" }, "git_odb_hashfile": { @@ -10480,7 +10654,7 @@ "comment": " 0 or an error code" }, "description": "

Create a copy of an odb_object

\n", - "comments": "

The returned copy must be manually freed with git_odb_object_free.\n Note that because of an implementation detail, the returned copy will be\n the same pointer as source: the object is internally refcounted, so the\n copy still needs to be freed twice.

\n", + "comments": "

The returned copy must be manually freed with git_odb_object_free. Note that because of an implementation detail, the returned copy will be the same pointer as source: the object is internally refcounted, so the copy still needs to be freed twice.

\n", "group": "odb" }, "git_odb_object_free": { @@ -10502,14 +10676,14 @@ "comment": null }, "description": "

Close an ODB object

\n", - "comments": "

This method must always be called once a git_odb_object is no\n longer needed, otherwise memory will leak.

\n", + "comments": "

This method must always be called once a git_odb_object is no longer needed, otherwise memory will leak.

\n", "group": "odb", "examples": { "cat-file.c": [ - "ex/v0.23.2/cat-file.html#git_odb_object_free-24" + "ex/v0.24.1/cat-file.html#git_odb_object_free-24" ], "general.c": [ - "ex/v0.23.2/general.html#git_odb_object_free-36" + "ex/v0.24.1/general.html#git_odb_object_free-36" ] } }, @@ -10554,11 +10728,11 @@ "comment": " a pointer to the data" }, "description": "

Return the data of an ODB object

\n", - "comments": "

This is the uncompressed, raw data as read from the ODB,\n without the leading header.

\n\n

This pointer is owned by the object and shall not be free'd.

\n", + "comments": "

This is the uncompressed, raw data as read from the ODB, without the leading header.

\n\n

This pointer is owned by the object and shall not be free'd.

\n", "group": "odb", "examples": { "general.c": [ - "ex/v0.23.2/general.html#git_odb_object_data-37" + "ex/v0.24.1/general.html#git_odb_object_data-37" ] } }, @@ -10581,14 +10755,14 @@ "comment": " the size" }, "description": "

Return the size of an ODB object

\n", - "comments": "

This is the real size of the data buffer, not the\n actual size of the object.

\n", + "comments": "

This is the real size of the data buffer, not the actual size of the object.

\n", "group": "odb", "examples": { "cat-file.c": [ - "ex/v0.23.2/cat-file.html#git_odb_object_size-25" + "ex/v0.24.1/cat-file.html#git_odb_object_size-25" ], "general.c": [ - "ex/v0.23.2/general.html#git_odb_object_size-38" + "ex/v0.24.1/general.html#git_odb_object_size-38" ] } }, @@ -10615,7 +10789,7 @@ "group": "odb", "examples": { "general.c": [ - "ex/v0.23.2/general.html#git_odb_object_type-39" + "ex/v0.24.1/general.html#git_odb_object_type-39" ] } }, @@ -10648,7 +10822,7 @@ "comment": " 0 on success; error code otherwise" }, "description": "

Add a custom backend to an existing Object DB

\n", - "comments": "

The backends are checked in relative ordering, based on the\n value of the priority parameter.

\n\n

Read \n for more information.

\n", + "comments": "

The backends are checked in relative ordering, based on the value of the priority parameter.

\n\n

Read for more information.

\n", "group": "odb" }, "git_odb_add_alternate": { @@ -10680,7 +10854,7 @@ "comment": " 0 on success; error code otherwise" }, "description": "

Add a custom backend to an existing Object DB; this\n backend will work as an alternate.

\n", - "comments": "

Alternate backends are always checked for objects after\n all the main backends have been exhausted.

\n\n

The backends are checked in relative ordering, based on the\n value of the priority parameter.

\n\n

Writing is disabled on alternate backends.

\n\n

Read \n for more information.

\n", + "comments": "

Alternate backends are always checked for objects after all the main backends have been exhausted.

\n\n

The backends are checked in relative ordering, based on the value of the priority parameter.

\n\n

Writing is disabled on alternate backends.

\n\n

Read for more information.

\n", "group": "odb" }, "git_odb_num_backends": { @@ -10835,7 +11009,7 @@ "comment": " 0 or an error code" }, "description": "

Create a backend out of a single packfile

\n", - "comments": "

This can be useful for inspecting the contents of a single\n packfile.

\n", + "comments": "

This can be useful for inspecting the contents of a single packfile.

\n", "group": "odb" }, "git_oid_fromstr": { @@ -10866,14 +11040,14 @@ "group": "oid", "examples": { "general.c": [ - "ex/v0.23.2/general.html#git_oid_fromstr-40", - "ex/v0.23.2/general.html#git_oid_fromstr-41", - "ex/v0.23.2/general.html#git_oid_fromstr-42", - "ex/v0.23.2/general.html#git_oid_fromstr-43", - "ex/v0.23.2/general.html#git_oid_fromstr-44", - "ex/v0.23.2/general.html#git_oid_fromstr-45", - "ex/v0.23.2/general.html#git_oid_fromstr-46", - "ex/v0.23.2/general.html#git_oid_fromstr-47" + "ex/v0.24.1/general.html#git_oid_fromstr-40", + "ex/v0.24.1/general.html#git_oid_fromstr-41", + "ex/v0.24.1/general.html#git_oid_fromstr-42", + "ex/v0.24.1/general.html#git_oid_fromstr-43", + "ex/v0.24.1/general.html#git_oid_fromstr-44", + "ex/v0.24.1/general.html#git_oid_fromstr-45", + "ex/v0.24.1/general.html#git_oid_fromstr-46", + "ex/v0.24.1/general.html#git_oid_fromstr-47" ] } }, @@ -10933,7 +11107,7 @@ "comment": " 0 or an error code" }, "description": "

Parse N characters of a hex formatted object id into a git_oid

\n", - "comments": "

If N is odd, N-1 characters will be parsed instead.\n The remaining space in the git_oid will be set to zero.

\n", + "comments": "

If N is odd, N-1 characters will be parsed instead. The remaining space in the git_oid will be set to zero.

\n", "group": "oid" }, "git_oid_fromraw": { @@ -10991,21 +11165,21 @@ "group": "oid", "examples": { "general.c": [ - "ex/v0.23.2/general.html#git_oid_fmt-48", - "ex/v0.23.2/general.html#git_oid_fmt-49", - "ex/v0.23.2/general.html#git_oid_fmt-50", - "ex/v0.23.2/general.html#git_oid_fmt-51", - "ex/v0.23.2/general.html#git_oid_fmt-52" + "ex/v0.24.1/general.html#git_oid_fmt-48", + "ex/v0.24.1/general.html#git_oid_fmt-49", + "ex/v0.24.1/general.html#git_oid_fmt-50", + "ex/v0.24.1/general.html#git_oid_fmt-51", + "ex/v0.24.1/general.html#git_oid_fmt-52" ], "network/fetch.c": [ - "ex/v0.23.2/network/fetch.html#git_oid_fmt-1", - "ex/v0.23.2/network/fetch.html#git_oid_fmt-2" + "ex/v0.24.1/network/fetch.html#git_oid_fmt-1", + "ex/v0.24.1/network/fetch.html#git_oid_fmt-2" ], "network/index-pack.c": [ - "ex/v0.23.2/network/index-pack.html#git_oid_fmt-6" + "ex/v0.24.1/network/index-pack.html#git_oid_fmt-6" ], "network/ls-remote.c": [ - "ex/v0.23.2/network/ls-remote.html#git_oid_fmt-1" + "ex/v0.24.1/network/ls-remote.html#git_oid_fmt-1" ] } }, @@ -11065,7 +11239,7 @@ "comment": null }, "description": "

Format a git_oid into a loose-object path string.

\n", - "comments": "

The resulting string is "aa/...", where "aa" is the first two\n hex digits of the oid and "..." is the remaining 38 digits.

\n", + "comments": "

The resulting string is "aa/...", where "aa" is the first two hex digits of the oid and "..." is the remaining 38 digits.

\n", "group": "oid" }, "git_oid_tostr_s": { @@ -11087,7 +11261,7 @@ "comment": " the c-string" }, "description": "

Format a git_oid into a statically allocated c-string.

\n", - "comments": "

The c-string is owned by the library and should not be freed\n by the user. If libgit2 is built with thread support, the string\n will be stored in TLS (i.e. one buffer per thread) to allow for\n concurrent calls of the function.

\n", + "comments": "

The c-string is owned by the library and should not be freed by the user. If libgit2 is built with thread support, the string will be stored in TLS (i.e. one buffer per thread) to allow for concurrent calls of the function.

\n", "group": "oid" }, "git_oid_tostr": { @@ -11119,29 +11293,29 @@ "comment": " the out buffer pointer, assuming no input parameter\n\t\t\terrors, otherwise a pointer to an empty string." }, "description": "

Format a git_oid into a buffer as a hex format c-string.

\n", - "comments": "

If the buffer is smaller than GIT_OID_HEXSZ+1, then the resulting\n oid c-string will be truncated to n-1 characters (but will still be\n NUL-byte terminated).

\n\n

If there are any input parameter errors (out == NULL, n == 0, oid ==\n NULL), then a pointer to an empty string is returned, so that the\n return value can always be printed.

\n", + "comments": "

If the buffer is smaller than GIT_OID_HEXSZ+1, then the resulting oid c-string will be truncated to n-1 characters (but will still be NUL-byte terminated).

\n\n

If there are any input parameter errors (out == NULL, n == 0, oid == NULL), then a pointer to an empty string is returned, so that the return value can always be printed.

\n", "group": "oid", "examples": { "blame.c": [ - "ex/v0.23.2/blame.html#git_oid_tostr-18", - "ex/v0.23.2/blame.html#git_oid_tostr-19" + "ex/v0.24.1/blame.html#git_oid_tostr-18", + "ex/v0.24.1/blame.html#git_oid_tostr-19" ], "cat-file.c": [ - "ex/v0.23.2/cat-file.html#git_oid_tostr-26", - "ex/v0.23.2/cat-file.html#git_oid_tostr-27", - "ex/v0.23.2/cat-file.html#git_oid_tostr-28", - "ex/v0.23.2/cat-file.html#git_oid_tostr-29", - "ex/v0.23.2/cat-file.html#git_oid_tostr-30" + "ex/v0.24.1/cat-file.html#git_oid_tostr-26", + "ex/v0.24.1/cat-file.html#git_oid_tostr-27", + "ex/v0.24.1/cat-file.html#git_oid_tostr-28", + "ex/v0.24.1/cat-file.html#git_oid_tostr-29", + "ex/v0.24.1/cat-file.html#git_oid_tostr-30" ], "log.c": [ - "ex/v0.23.2/log.html#git_oid_tostr-39", - "ex/v0.23.2/log.html#git_oid_tostr-40" + "ex/v0.24.1/log.html#git_oid_tostr-39", + "ex/v0.24.1/log.html#git_oid_tostr-40" ], "rev-parse.c": [ - "ex/v0.23.2/rev-parse.html#git_oid_tostr-12", - "ex/v0.23.2/rev-parse.html#git_oid_tostr-13", - "ex/v0.23.2/rev-parse.html#git_oid_tostr-14", - "ex/v0.23.2/rev-parse.html#git_oid_tostr-15" + "ex/v0.24.1/rev-parse.html#git_oid_tostr-12", + "ex/v0.24.1/rev-parse.html#git_oid_tostr-13", + "ex/v0.24.1/rev-parse.html#git_oid_tostr-14", + "ex/v0.24.1/rev-parse.html#git_oid_tostr-15" ] } }, @@ -11173,9 +11347,9 @@ "group": "oid", "examples": { "blame.c": [ - "ex/v0.23.2/blame.html#git_oid_cpy-20", - "ex/v0.23.2/blame.html#git_oid_cpy-21", - "ex/v0.23.2/blame.html#git_oid_cpy-22" + "ex/v0.24.1/blame.html#git_oid_cpy-20", + "ex/v0.24.1/blame.html#git_oid_cpy-21", + "ex/v0.24.1/blame.html#git_oid_cpy-22" ] } }, @@ -11342,10 +11516,10 @@ "group": "oid", "examples": { "blame.c": [ - "ex/v0.23.2/blame.html#git_oid_iszero-23" + "ex/v0.24.1/blame.html#git_oid_iszero-23" ], "network/fetch.c": [ - "ex/v0.23.2/network/fetch.html#git_oid_iszero-3" + "ex/v0.24.1/network/fetch.html#git_oid_iszero-3" ] } }, @@ -11368,7 +11542,7 @@ "comment": " a `git_oid_shorten` instance, NULL if OOM" }, "description": "

Create a new OID shortener.

\n", - "comments": "

The OID shortener is used to process a list of OIDs\n in text form and return the shortest length that would\n uniquely identify all of them.

\n\n

E.g. look at the result of git log --abbrev.

\n", + "comments": "

The OID shortener is used to process a list of OIDs in text form and return the shortest length that would uniquely identify all of them.

\n\n

E.g. look at the result of git log --abbrev.

\n", "group": "oid" }, "git_oid_shorten_add": { @@ -11395,7 +11569,7 @@ "comment": " the minimal length to uniquely identify all OIDs\n\t\tadded so far to the set; or an error code (\n<\n0) if an\n\t\terror occurs." }, "description": "

Add a new OID to set of shortened OIDs and calculate\n the minimal length to uniquely identify all the OIDs in\n the set.

\n", - "comments": "

The OID is expected to be a 40-char hexadecimal string.\n The OID is owned by the user and will not be modified\n or freed.

\n\n

For performance reasons, there is a hard-limit of how many\n OIDs can be added to a single set (around ~32000, assuming\n a mostly randomized distribution), which should be enough\n for any kind of program, and keeps the algorithm fast and\n memory-efficient.

\n\n

Attempting to add more than those OIDs will result in a\n GITERR_INVALID error

\n", + "comments": "

The OID is expected to be a 40-char hexadecimal string. The OID is owned by the user and will not be modified or freed.

\n\n

For performance reasons, there is a hard-limit of how many OIDs can be added to a single set (around ~32000, assuming a mostly randomized distribution), which should be enough for any kind of program, and keeps the algorithm fast and memory-efficient.

\n\n

Attempting to add more than those OIDs will result in a GITERR_INVALID error

\n", "group": "oid" }, "git_oid_shorten_free": { @@ -11439,7 +11613,7 @@ "comment": null }, "description": "

Free the OID array

\n", - "comments": "

This method must (and must only) be called on git_oidarray\n objects where the array is allocated by the library. Not doing so,\n will result in a memory leak.

\n\n

This does not free the git_oidarray itself, since the library will\n never allocate that object directly itself (it is more commonly embedded\n inside another struct or created on the stack).

\n", + "comments": "

This method must (and must only) be called on git_oidarray objects where the array is allocated by the library. Not doing so, will result in a memory leak.

\n\n

This does not free the git_oidarray itself, since the library will never allocate that object directly itself (it is more commonly embedded inside another struct or created on the stack).

\n", "group": "oidarray" }, "git_packbuilder_new": { @@ -11493,7 +11667,7 @@ "comment": " number of actual threads to be used" }, "description": "

Set number of threads to spawn

\n", - "comments": "

By default, libgit2 won't spawn any threads at all;\n when set to 0, libgit2 will autodetect the number of\n CPUs.

\n", + "comments": "

By default, libgit2 won't spawn any threads at all; when set to 0, libgit2 will autodetect the number of CPUs.

\n", "group": "packbuilder" }, "git_packbuilder_insert": { @@ -11525,7 +11699,7 @@ "comment": " 0 or an error code" }, "description": "

Insert a single object

\n", - "comments": "

For an optimal pack it's mandatory to insert objects in recency order,\n commits followed by trees and blobs.

\n", + "comments": "

For an optimal pack it's mandatory to insert objects in recency order, commits followed by trees and blobs.

\n", "group": "packbuilder" }, "git_packbuilder_insert_tree": { @@ -11606,7 +11780,7 @@ "comment": " 0 or an error code" }, "description": "

Insert objects as given by the walk

\n", - "comments": "

Those commits and all objects they reference will be inserted into\n the packbuilder.

\n", + "comments": "

Those commits and all objects they reference will be inserted into the packbuilder.

\n", "group": "packbuilder" }, "git_packbuilder_insert_recur": { @@ -11702,7 +11876,7 @@ "comment": null }, "description": "

Get the packfile's hash

\n", - "comments": "

A packfile's name is derived from the sorted hashing of all object\n names. This is only correct after the packfile has been written.

\n", + "comments": "

A packfile's name is derived from the sorted hashing of all object names. This is only correct after the packfile has been written.

\n", "group": "packbuilder" }, "git_packbuilder_foreach": { @@ -11864,7 +12038,7 @@ "comment": " 0 on success, other value \n<\n 0 on error" }, "description": "

Return a patch for an entry in the diff list.

\n", - "comments": "

The git_patch is a newly created object contains the text diffs\n for the delta. You have to call git_patch_free() when you are\n done with it. You can use the patch object to loop over all the hunks\n and lines in the diff of the one delta.

\n\n

For an unchanged file or a binary file, no git_patch will be\n created, the output will be set to NULL, and the binary flag will be\n set true in the git_diff_delta structure.

\n\n

It is okay to pass NULL for either of the output parameters; if you pass\n NULL for the git_patch, then the text diff will not be calculated.

\n", + "comments": "

The git_patch is a newly created object contains the text diffs for the delta. You have to call git_patch_free() when you are done with it. You can use the patch object to loop over all the hunks and lines in the diff of the one delta.

\n\n

For an unchanged file or a binary file, no git_patch will be created, the output will be set to NULL, and the binary flag will be set true in the git_diff_delta structure.

\n\n

It is okay to pass NULL for either of the output parameters; if you pass NULL for the git_patch, then the text diff will not be calculated.

\n", "group": "patch" }, "git_patch_from_blobs": { @@ -11911,7 +12085,7 @@ "comment": " 0 on success or error code \n<\n 0" }, "description": "

Directly generate a patch from the difference between two blobs.

\n", - "comments": "

This is just like git_diff_blobs() except it generates a patch object\n for the difference instead of directly making callbacks. You can use the\n standard git_patch accessor functions to read the patch data, and\n you must call git_patch_free() on the patch when done.

\n", + "comments": "

This is just like git_diff_blobs() except it generates a patch object for the difference instead of directly making callbacks. You can use the standard git_patch accessor functions to read the patch data, and you must call git_patch_free() on the patch when done.

\n", "group": "patch" }, "git_patch_from_blob_and_buffer": { @@ -11963,7 +12137,7 @@ "comment": " 0 on success or error code \n<\n 0" }, "description": "

Directly generate a patch from the difference between a blob and a buffer.

\n", - "comments": "

This is just like git_diff_blob_to_buffer() except it generates a patch\n object for the difference instead of directly making callbacks. You can\n use the standard git_patch accessor functions to read the patch\n data, and you must call git_patch_free() on the patch when done.

\n", + "comments": "

This is just like git_diff_blob_to_buffer() except it generates a patch object for the difference instead of directly making callbacks. You can use the standard git_patch accessor functions to read the patch data, and you must call git_patch_free() on the patch when done.

\n", "group": "patch" }, "git_patch_from_buffers": { @@ -12020,7 +12194,7 @@ "comment": " 0 on success or error code \n<\n 0" }, "description": "

Directly generate a patch from the difference between two buffers.

\n", - "comments": "

This is just like git_diff_buffers() except it generates a patch\n object for the difference instead of directly making callbacks. You can\n use the standard git_patch accessor functions to read the patch\n data, and you must call git_patch_free() on the patch when done.

\n", + "comments": "

This is just like git_diff_buffers() except it generates a patch object for the difference instead of directly making callbacks. You can use the standard git_patch accessor functions to read the patch data, and you must call git_patch_free() on the patch when done.

\n", "group": "patch" }, "git_patch_free": { @@ -12123,7 +12297,7 @@ "comment": " 0 on success, \n<\n0 on error" }, "description": "

Get line counts of each type in a patch.

\n", - "comments": "

This helps imitate a diff --numstat type of output. For that purpose,\n you only need the total_additions and total_deletions values, but we\n include the total_context line count in case you want the total number\n of lines of diff output that will be generated.

\n\n

All outputs are optional. Pass NULL if you don't need a particular count.

\n", + "comments": "

This helps imitate a diff --numstat type of output. For that purpose, you only need the total_additions and total_deletions values, but we include the total_context line count in case you want the total number of lines of diff output that will be generated.

\n\n

All outputs are optional. Pass NULL if you don't need a particular count.

\n", "group": "patch" }, "git_patch_get_hunk": { @@ -12160,7 +12334,7 @@ "comment": " 0 on success, GIT_ENOTFOUND if hunk_idx out of range, \n<\n0 on error" }, "description": "

Get the information about a hunk in a patch

\n", - "comments": "

Given a patch and a hunk index into the patch, this returns detailed\n information about that hunk. Any of the output pointers can be passed\n as NULL if you don't care about that particular piece of information.

\n", + "comments": "

Given a patch and a hunk index into the patch, this returns detailed information about that hunk. Any of the output pointers can be passed as NULL if you don't care about that particular piece of information.

\n", "group": "patch" }, "git_patch_num_lines_in_hunk": { @@ -12224,7 +12398,7 @@ "comment": " 0 on success, \n<\n0 on failure" }, "description": "

Get data about a line in a hunk of a patch.

\n", - "comments": "

Given a patch, a hunk index, and a line index in the hunk, this\n will return a lot of details about that line. If you pass a hunk\n index larger than the number of hunks or a line index larger than\n the number of lines in the hunk, this will return -1.

\n", + "comments": "

Given a patch, a hunk index, and a line index in the hunk, this will return a lot of details about that line. If you pass a hunk index larger than the number of hunks or a line index larger than the number of lines in the hunk, this will return -1.

\n", "group": "patch" }, "git_patch_size": { @@ -12261,7 +12435,7 @@ "comment": " The number of bytes of data" }, "description": "

Look up size of patch diff data in bytes

\n", - "comments": "

This returns the raw size of the patch data. This only includes the\n actual data from the lines of the diff, not the file or hunk headers.

\n\n

If you pass include_context as true (non-zero), this will be the size\n of all of the diff output; if you pass it as false (zero), this will\n only include the actual changed lines (as if context_lines was 0).

\n", + "comments": "

This returns the raw size of the patch data. This only includes the actual data from the lines of the diff, not the file or hunk headers.

\n\n

If you pass include_context as true (non-zero), this will be the size of all of the diff output; if you pass it as false (zero), this will only include the actual changed lines (as if context_lines was 0).

\n", "group": "patch" }, "git_patch_print": { @@ -12293,7 +12467,7 @@ "comment": " 0 on success, non-zero callback return value, or error code" }, "description": "

Serialize the patch to text via callback.

\n", - "comments": "

Returning a non-zero value from the callback will terminate the iteration\n and return that value to the caller.

\n", + "comments": "

Returning a non-zero value from the callback will terminate the iteration and return that value to the caller.

\n", "group": "patch" }, "git_patch_to_buf": { @@ -12351,7 +12525,7 @@ "group": "pathspec", "examples": { "log.c": [ - "ex/v0.23.2/log.html#git_pathspec_new-41" + "ex/v0.24.1/log.html#git_pathspec_new-41" ] } }, @@ -12378,7 +12552,7 @@ "group": "pathspec", "examples": { "log.c": [ - "ex/v0.23.2/log.html#git_pathspec_free-42" + "ex/v0.24.1/log.html#git_pathspec_free-42" ] } }, @@ -12411,7 +12585,7 @@ "comment": " 1 is path matches spec, 0 if it does not" }, "description": "

Try to match a path against a pathspec

\n", - "comments": "

Unlike most of the other pathspec matching functions, this will not\n fall back on the native case-sensitivity for your platform. You must\n explicitly pass flags to control case sensitivity or else this will\n fall back on being case sensitive.

\n", + "comments": "

Unlike most of the other pathspec matching functions, this will not fall back on the native case-sensitivity for your platform. You must explicitly pass flags to control case sensitivity or else this will fall back on being case sensitive.

\n", "group": "pathspec" }, "git_pathspec_match_workdir": { @@ -12448,7 +12622,7 @@ "comment": " 0 on success, -1 on error, GIT_ENOTFOUND if no matches and\n the GIT_PATHSPEC_NO_MATCH_ERROR flag was given" }, "description": "

Match a pathspec against the working directory of a repository.

\n", - "comments": "

This matches the pathspec against the current files in the working\n directory of the repository. It is an error to invoke this on a bare\n repo. This handles git ignores (i.e. ignored files will not be\n considered to match the pathspec unless the file is tracked in the\n index).

\n\n

If out is not NULL, this returns a git_patchspec_match_list. That\n contains the list of all matched filenames (unless you pass the\n GIT_PATHSPEC_FAILURES_ONLY flag) and may also contain the list of\n pathspecs with no match (if you used the GIT_PATHSPEC_FIND_FAILURES\n flag). You must call git_pathspec_match_list_free() on this object.

\n", + "comments": "

This matches the pathspec against the current files in the working directory of the repository. It is an error to invoke this on a bare repo. This handles git ignores (i.e. ignored files will not be considered to match the pathspec unless the file is tracked in the index).

\n\n

If out is not NULL, this returns a git_patchspec_match_list. That contains the list of all matched filenames (unless you pass the GIT_PATHSPEC_FAILURES_ONLY flag) and may also contain the list of pathspecs with no match (if you used the GIT_PATHSPEC_FIND_FAILURES flag). You must call git_pathspec_match_list_free() on this object.

\n", "group": "pathspec" }, "git_pathspec_match_index": { @@ -12485,7 +12659,7 @@ "comment": " 0 on success, -1 on error, GIT_ENOTFOUND if no matches and\n the GIT_PATHSPEC_NO_MATCH_ERROR flag is used" }, "description": "

Match a pathspec against entries in an index.

\n", - "comments": "

This matches the pathspec against the files in the repository index.

\n\n

NOTE: At the moment, the case sensitivity of this match is controlled\n by the current case-sensitivity of the index object itself and the\n USE_CASE and IGNORE_CASE flags will have no effect. This behavior will\n be corrected in a future release.

\n\n

If out is not NULL, this returns a git_patchspec_match_list. That\n contains the list of all matched filenames (unless you pass the\n GIT_PATHSPEC_FAILURES_ONLY flag) and may also contain the list of\n pathspecs with no match (if you used the GIT_PATHSPEC_FIND_FAILURES\n flag). You must call git_pathspec_match_list_free() on this object.

\n", + "comments": "

This matches the pathspec against the files in the repository index.

\n\n

NOTE: At the moment, the case sensitivity of this match is controlled by the current case-sensitivity of the index object itself and the USE_CASE and IGNORE_CASE flags will have no effect. This behavior will be corrected in a future release.

\n\n

If out is not NULL, this returns a git_patchspec_match_list. That contains the list of all matched filenames (unless you pass the GIT_PATHSPEC_FAILURES_ONLY flag) and may also contain the list of pathspecs with no match (if you used the GIT_PATHSPEC_FIND_FAILURES flag). You must call git_pathspec_match_list_free() on this object.

\n", "group": "pathspec" }, "git_pathspec_match_tree": { @@ -12522,11 +12696,11 @@ "comment": " 0 on success, -1 on error, GIT_ENOTFOUND if no matches and\n the GIT_PATHSPEC_NO_MATCH_ERROR flag is used" }, "description": "

Match a pathspec against files in a tree.

\n", - "comments": "

This matches the pathspec against the files in the given tree.

\n\n

If out is not NULL, this returns a git_patchspec_match_list. That\n contains the list of all matched filenames (unless you pass the\n GIT_PATHSPEC_FAILURES_ONLY flag) and may also contain the list of\n pathspecs with no match (if you used the GIT_PATHSPEC_FIND_FAILURES\n flag). You must call git_pathspec_match_list_free() on this object.

\n", + "comments": "

This matches the pathspec against the files in the given tree.

\n\n

If out is not NULL, this returns a git_patchspec_match_list. That contains the list of all matched filenames (unless you pass the GIT_PATHSPEC_FAILURES_ONLY flag) and may also contain the list of pathspecs with no match (if you used the GIT_PATHSPEC_FIND_FAILURES flag). You must call git_pathspec_match_list_free() on this object.

\n", "group": "pathspec", "examples": { "log.c": [ - "ex/v0.23.2/log.html#git_pathspec_match_tree-43" + "ex/v0.24.1/log.html#git_pathspec_match_tree-43" ] } }, @@ -12564,7 +12738,7 @@ "comment": " 0 on success, -1 on error, GIT_ENOTFOUND if no matches and\n the GIT_PATHSPEC_NO_MATCH_ERROR flag is used" }, "description": "

Match a pathspec against files in a diff list.

\n", - "comments": "

This matches the pathspec against the files in the given diff list.

\n\n

If out is not NULL, this returns a git_patchspec_match_list. That\n contains the list of all matched filenames (unless you pass the\n GIT_PATHSPEC_FAILURES_ONLY flag) and may also contain the list of\n pathspecs with no match (if you used the GIT_PATHSPEC_FIND_FAILURES\n flag). You must call git_pathspec_match_list_free() on this object.

\n", + "comments": "

This matches the pathspec against the files in the given diff list.

\n\n

If out is not NULL, this returns a git_patchspec_match_list. That contains the list of all matched filenames (unless you pass the GIT_PATHSPEC_FAILURES_ONLY flag) and may also contain the list of pathspecs with no match (if you used the GIT_PATHSPEC_FIND_FAILURES flag). You must call git_pathspec_match_list_free() on this object.

\n", "group": "pathspec" }, "git_pathspec_match_list_free": { @@ -12635,7 +12809,7 @@ "comment": " The filename of the match" }, "description": "

Get a matching filename by position.

\n", - "comments": "

This routine cannot be used if the match list was generated by\n git_pathspec_match_diff. If so, it will always return NULL.

\n", + "comments": "

This routine cannot be used if the match list was generated by git_pathspec_match_diff. If so, it will always return NULL.

\n", "group": "pathspec" }, "git_pathspec_match_list_diff_entry": { @@ -12662,7 +12836,7 @@ "comment": " The filename of the match" }, "description": "

Get a matching diff delta by position.

\n", - "comments": "

This routine can only be used if the match list was generated by\n git_pathspec_match_diff. Otherwise it will always return NULL.

\n", + "comments": "

This routine can only be used if the match list was generated by git_pathspec_match_diff. Otherwise it will always return NULL.

\n", "group": "pathspec" }, "git_pathspec_match_list_failed_entrycount": { @@ -12684,7 +12858,7 @@ "comment": " Number of items in original pathspec that had no matches" }, "description": "

Get the number of pathspec items that did not match.

\n", - "comments": "

This will be zero unless you passed GIT_PATHSPEC_FIND_FAILURES when\n generating the git_pathspec_match_list.

\n", + "comments": "

This will be zero unless you passed GIT_PATHSPEC_FIND_FAILURES when generating the git_pathspec_match_list.

\n", "group": "pathspec" }, "git_pathspec_match_list_failed_entry": { @@ -12717,8 +12891,8 @@ "git_rebase_init_options": { "type": "function", "file": "rebase.h", - "line": 141, - "lineto": 143, + "line": 156, + "lineto": 158, "args": [ { "name": "opts", @@ -12744,8 +12918,8 @@ "git_rebase_init": { "type": "function", "file": "rebase.h", - "line": 162, - "lineto": 168, + "line": 177, + "lineto": 183, "args": [ { "name": "out", @@ -12791,8 +12965,8 @@ "git_rebase_open": { "type": "function", "file": "rebase.h", - "line": 179, - "lineto": 182, + "line": 194, + "lineto": 197, "args": [ { "name": "out", @@ -12823,8 +12997,8 @@ "git_rebase_operation_entrycount": { "type": "function", "file": "rebase.h", - "line": 190, - "lineto": 190, + "line": 205, + "lineto": 205, "args": [ { "name": "rebase", @@ -12845,8 +13019,8 @@ "git_rebase_operation_current": { "type": "function", "file": "rebase.h", - "line": 201, - "lineto": 201, + "line": 216, + "lineto": 216, "args": [ { "name": "rebase", @@ -12867,8 +13041,8 @@ "git_rebase_operation_byindex": { "type": "function", "file": "rebase.h", - "line": 210, - "lineto": 212, + "line": 225, + "lineto": 227, "args": [ { "name": "rebase", @@ -12894,8 +13068,8 @@ "git_rebase_next": { "type": "function", "file": "rebase.h", - "line": 225, - "lineto": 227, + "line": 240, + "lineto": 242, "args": [ { "name": "operation", @@ -12918,11 +13092,38 @@ "comments": "", "group": "rebase" }, - "git_rebase_commit": { + "git_rebase_inmemory_index": { "type": "function", "file": "rebase.h", - "line": 251, + "line": 255, "lineto": 257, + "args": [ + { + "name": "index", + "type": "git_index **", + "comment": null + }, + { + "name": "rebase", + "type": "git_rebase *", + "comment": null + } + ], + "argline": "git_index **index, git_rebase *rebase", + "sig": "git_index **::git_rebase *", + "return": { + "type": "int", + "comment": null + }, + "description": "

Gets the index produced by the last operation, which is the result\n of git_rebase_next and which will be committed by the next\n invocation of git_rebase_commit. This is useful for resolving\n conflicts in an in-memory rebase before committing them. You must\n call git_index_free when you are finished with this.

\n", + "comments": "

This is only applicable for in-memory rebases; for rebases within a working directory, the changes were applied to the repository's index.

\n", + "group": "rebase" + }, + "git_rebase_commit": { + "type": "function", + "file": "rebase.h", + "line": 281, + "lineto": 287, "args": [ { "name": "id", @@ -12968,8 +13169,8 @@ "git_rebase_abort": { "type": "function", "file": "rebase.h", - "line": 267, - "lineto": 267, + "line": 297, + "lineto": 297, "args": [ { "name": "rebase", @@ -12990,8 +13191,8 @@ "git_rebase_finish": { "type": "function", "file": "rebase.h", - "line": 277, - "lineto": 279, + "line": 307, + "lineto": 309, "args": [ { "name": "rebase", @@ -13017,8 +13218,8 @@ "git_rebase_free": { "type": "function", "file": "rebase.h", - "line": 286, - "lineto": 286, + "line": 316, + "lineto": 316, "args": [ { "name": "rebase", @@ -13060,7 +13261,7 @@ "comment": " 0 or an error code" }, "description": "

Create a new reference database with no backends.

\n", - "comments": "

Before the Ref DB can be used for read/writing, a custom database\n backend must be manually set using git_refdb_set_backend()

\n", + "comments": "

Before the Ref DB can be used for read/writing, a custom database backend must be manually set using git_refdb_set_backend()

\n", "group": "refdb" }, "git_refdb_open": { @@ -13087,7 +13288,7 @@ "comment": " 0 or an error code" }, "description": "

Create a new reference database and automatically add\n the default backends:

\n", - "comments": "
    \n
  • git_refdb_dir: read and write loose and packed refs\n from disk, assuming the repository dir as the folder
    • \n
\n", + "comments": "
    \n
  • git_refdb_dir: read and write loose and packed refs from disk, assuming the repository dir as the folder
    • \n
\n", "group": "refdb" }, "git_refdb_compress": { @@ -13163,7 +13364,7 @@ "comment": " 0 or an error code" }, "description": "

Read the reflog for the given reference

\n", - "comments": "

If there is no reflog file for the given\n reference yet, an empty reflog object will\n be returned.

\n\n

The reflog must be freed manually by using\n git_reflog_free().

\n", + "comments": "

If there is no reflog file for the given reference yet, an empty reflog object will be returned.

\n\n

The reflog must be freed manually by using git_reflog_free().

\n", "group": "reflog" }, "git_reflog_write": { @@ -13254,7 +13455,7 @@ "comment": " 0 on success, GIT_EINVALIDSPEC or an error code" }, "description": "

Rename a reflog

\n", - "comments": "

The reflog to be renamed is expected to already exist

\n\n

The new name will be checked for validity.\n See git_reference_create_symbolic() for rules about valid names.

\n", + "comments": "

The reflog to be renamed is expected to already exist

\n\n

The new name will be checked for validity. See git_reference_create_symbolic() for rules about valid names.

\n", "group": "reflog" }, "git_reflog_delete": { @@ -13330,7 +13531,7 @@ "comment": " the entry; NULL if not found" }, "description": "

Lookup an entry by its index

\n", - "comments": "

Requesting the reflog entry with an index of 0 (zero) will\n return the most recently created entry.

\n", + "comments": "

Requesting the reflog entry with an index of 0 (zero) will return the most recently created entry.

\n", "group": "reflog" }, "git_reflog_drop": { @@ -13362,7 +13563,7 @@ "comment": " 0 on success, GIT_ENOTFOUND if the entry doesn't exist\n or an error code." }, "description": "

Remove an entry from the reflog by its index

\n", - "comments": "

To ensure there's no gap in the log history, set rewrite_previous_entry\n param value to 1. When deleting entry n, member old_oid of entry n-1\n (if any) will be updated with the value of member new_oid of entry n+1.

\n", + "comments": "

To ensure there's no gap in the log history, set rewrite_previous_entry param value to 1. When deleting entry n, member old_oid of entry n-1 (if any) will be updated with the value of member new_oid of entry n+1.

\n", "group": "reflog" }, "git_reflog_entry_id_old": { @@ -13504,11 +13705,11 @@ "comment": " 0 on success, GIT_ENOTFOUND, GIT_EINVALIDSPEC or an error code." }, "description": "

Lookup a reference by name in a repository.

\n", - "comments": "

The returned reference must be freed by the user.

\n\n

The name will be checked for validity.\n See git_reference_symbolic_create() for rules about valid names.

\n", + "comments": "

The returned reference must be freed by the user.

\n\n

The name will be checked for validity. See git_reference_symbolic_create() for rules about valid names.

\n", "group": "reference", "examples": { "general.c": [ - "ex/v0.23.2/general.html#git_reference_lookup-53" + "ex/v0.24.1/general.html#git_reference_lookup-53" ] } }, @@ -13541,7 +13742,7 @@ "comment": " 0 on success, GIT_ENOTFOUND, GIT_EINVALIDSPEC or an error code." }, "description": "

Lookup a reference by name and resolve immediately to OID.

\n", - "comments": "

This function provides a quick way to resolve a reference name straight\n through to the object id that it refers to. This avoids having to\n allocate or free any git_reference objects for simple situations.

\n\n

The name will be checked for validity.\n See git_reference_symbolic_create() for rules about valid names.

\n", + "comments": "

This function provides a quick way to resolve a reference name straight through to the object id that it refers to. This avoids having to allocate or free any git_reference objects for simple situations.

\n\n

The name will be checked for validity. See git_reference_symbolic_create() for rules about valid names.

\n", "group": "reference" }, "git_reference_dwim": { @@ -13573,7 +13774,7 @@ "comment": " 0 or an error code" }, "description": "

Lookup a reference by DWIMing its short name

\n", - "comments": "

Apply the git precendence rules to the given shorthand to determine\n which reference the user is referring to.

\n", + "comments": "

Apply the git precendence rules to the given shorthand to determine which reference the user is referring to.

\n", "group": "reference" }, "git_reference_symbolic_create_matching": { @@ -13625,7 +13826,7 @@ "comment": " 0 on success, GIT_EEXISTS, GIT_EINVALIDSPEC, GIT_EMODIFIED or an error code" }, "description": "

Conditionally create a new symbolic reference.

\n", - "comments": "

A symbolic reference is a reference name that refers to another\n reference name. If the other name moves, the symbolic name will move,\n too. As a simple example, the "HEAD" reference might refer to\n "refs/heads/master" while on the "master" branch of a repository.

\n\n

The symbolic reference will be created in the repository and written to\n the disk. The generated reference object must be freed by the user.

\n\n

Valid reference names must follow one of two patterns:

\n\n
    \n
  1. Top-level names must contain only capital letters and underscores,\nand must begin and end with a letter. (e.g. "HEAD", "ORIG_HEAD").
    2. \n
  2. Names prefixed with "refs/" can be almost anything. You must avoid\nthe characters '~', '^', ':', '\n\\\n', '?', '[', and '*', and the\nsequences ".." and "\n@\n{" which have special meaning to revparse.
    3. \n
\n\n

This function will return an error if a reference already exists with the\n given name unless force is true, in which case it will be overwritten.

\n\n

The message for the reflog will be ignored if the reference does\n not belong in the standard set (HEAD, branches and remote-tracking\n branches) and it does not have a reflog.

\n\n

It will return GIT_EMODIFIED if the reference's value at the time\n of updating does not match the one passed through current_value\n (i.e. if the ref has changed since the user read it).

\n", + "comments": "

A symbolic reference is a reference name that refers to another reference name. If the other name moves, the symbolic name will move, too. As a simple example, the "HEAD" reference might refer to "refs/heads/master" while on the "master" branch of a repository.

\n\n

The symbolic reference will be created in the repository and written to the disk. The generated reference object must be freed by the user.

\n\n

Valid reference names must follow one of two patterns:

\n\n
    \n
  1. Top-level names must contain only capital letters and underscores, and must begin and end with a letter. (e.g. "HEAD", "ORIG_HEAD"). 2. Names prefixed with "refs/" can be almost anything. You must avoid the characters '~', '^', ':', '\\', '?', '[', and '*', and the sequences ".." and "@{" which have special meaning to revparse.
    2. \n
\n\n

This function will return an error if a reference already exists with the given name unless force is true, in which case it will be overwritten.

\n\n

The message for the reflog will be ignored if the reference does not belong in the standard set (HEAD, branches and remote-tracking branches) and it does not have a reflog.

\n\n

It will return GIT_EMODIFIED if the reference's value at the time of updating does not match the one passed through current_value (i.e. if the ref has changed since the user read it).

\n", "group": "reference" }, "git_reference_symbolic_create": { @@ -13672,7 +13873,7 @@ "comment": " 0 on success, GIT_EEXISTS, GIT_EINVALIDSPEC or an error code" }, "description": "

Create a new symbolic reference.

\n", - "comments": "

A symbolic reference is a reference name that refers to another\n reference name. If the other name moves, the symbolic name will move,\n too. As a simple example, the "HEAD" reference might refer to\n "refs/heads/master" while on the "master" branch of a repository.

\n\n

The symbolic reference will be created in the repository and written to\n the disk. The generated reference object must be freed by the user.

\n\n

Valid reference names must follow one of two patterns:

\n\n
    \n
  1. Top-level names must contain only capital letters and underscores,\nand must begin and end with a letter. (e.g. "HEAD", "ORIG_HEAD").
    2. \n
  2. Names prefixed with "refs/" can be almost anything. You must avoid\nthe characters '~', '^', ':', '\n\\\n', '?', '[', and '*', and the\nsequences ".." and "\n@\n{" which have special meaning to revparse.
    3. \n
\n\n

This function will return an error if a reference already exists with the\n given name unless force is true, in which case it will be overwritten.

\n\n

The message for the reflog will be ignored if the reference does\n not belong in the standard set (HEAD, branches and remote-tracking\n branches) and it does not have a reflog.

\n", + "comments": "

A symbolic reference is a reference name that refers to another reference name. If the other name moves, the symbolic name will move, too. As a simple example, the "HEAD" reference might refer to "refs/heads/master" while on the "master" branch of a repository.

\n\n

The symbolic reference will be created in the repository and written to the disk. The generated reference object must be freed by the user.

\n\n

Valid reference names must follow one of two patterns:

\n\n
    \n
  1. Top-level names must contain only capital letters and underscores, and must begin and end with a letter. (e.g. "HEAD", "ORIG_HEAD"). 2. Names prefixed with "refs/" can be almost anything. You must avoid the characters '~', '^', ':', '\\', '?', '[', and '*', and the sequences ".." and "@{" which have special meaning to revparse.
    2. \n
\n\n

This function will return an error if a reference already exists with the given name unless force is true, in which case it will be overwritten.

\n\n

The message for the reflog will be ignored if the reference does not belong in the standard set (HEAD, branches and remote-tracking branches) and it does not have a reflog.

\n", "group": "reference" }, "git_reference_create": { @@ -13719,7 +13920,7 @@ "comment": " 0 on success, GIT_EEXISTS, GIT_EINVALIDSPEC or an error code" }, "description": "

Create a new direct reference.

\n", - "comments": "

A direct reference (also called an object id reference) refers directly\n to a specific object id (a.k.a. OID or SHA) in the repository. The id\n permanently refers to the object (although the reference itself can be\n moved). For example, in libgit2 the direct ref "refs/tags/v0.17.0"\n refers to OID 5b9fac39d8a76b9139667c26a63e6b3f204b3977.

\n\n

The direct reference will be created in the repository and written to\n the disk. The generated reference object must be freed by the user.

\n\n

Valid reference names must follow one of two patterns:

\n\n
    \n
  1. Top-level names must contain only capital letters and underscores,\nand must begin and end with a letter. (e.g. "HEAD", "ORIG_HEAD").
    2. \n
  2. Names prefixed with "refs/" can be almost anything. You must avoid\nthe characters '~', '^', ':', '\n\\\n', '?', '[', and '*', and the\nsequences ".." and "\n@\n{" which have special meaning to revparse.
    3. \n
\n\n

This function will return an error if a reference already exists with the\n given name unless force is true, in which case it will be overwritten.

\n\n

The message for the reflog will be ignored if the reference does\n not belong in the standard set (HEAD, branches and remote-tracking\n branches) and and it does not have a reflog.

\n", + "comments": "

A direct reference (also called an object id reference) refers directly to a specific object id (a.k.a. OID or SHA) in the repository. The id permanently refers to the object (although the reference itself can be moved). For example, in libgit2 the direct ref "refs/tags/v0.17.0" refers to OID 5b9fac39d8a76b9139667c26a63e6b3f204b3977.

\n\n

The direct reference will be created in the repository and written to the disk. The generated reference object must be freed by the user.

\n\n

Valid reference names must follow one of two patterns:

\n\n
    \n
  1. Top-level names must contain only capital letters and underscores, and must begin and end with a letter. (e.g. "HEAD", "ORIG_HEAD"). 2. Names prefixed with "refs/" can be almost anything. You must avoid the characters '~', '^', ':', '\\', '?', '[', and '*', and the sequences ".." and "@{" which have special meaning to revparse.
    2. \n
\n\n

This function will return an error if a reference already exists with the given name unless force is true, in which case it will be overwritten.

\n\n

The message for the reflog will be ignored if the reference does not belong in the standard set (HEAD, branches and remote-tracking branches) and and it does not have a reflog.

\n", "group": "reference" }, "git_reference_create_matching": { @@ -13771,7 +13972,7 @@ "comment": " 0 on success, GIT_EMODIFIED if the value of the reference\n has changed, GIT_EEXISTS, GIT_EINVALIDSPEC or an error code" }, "description": "

Conditionally create new direct reference

\n", - "comments": "

A direct reference (also called an object id reference) refers directly\n to a specific object id (a.k.a. OID or SHA) in the repository. The id\n permanently refers to the object (although the reference itself can be\n moved). For example, in libgit2 the direct ref "refs/tags/v0.17.0"\n refers to OID 5b9fac39d8a76b9139667c26a63e6b3f204b3977.

\n\n

The direct reference will be created in the repository and written to\n the disk. The generated reference object must be freed by the user.

\n\n

Valid reference names must follow one of two patterns:

\n\n
    \n
  1. Top-level names must contain only capital letters and underscores,\nand must begin and end with a letter. (e.g. "HEAD", "ORIG_HEAD").
    2. \n
  2. Names prefixed with "refs/" can be almost anything. You must avoid\nthe characters '~', '^', ':', '\n\\\n', '?', '[', and '*', and the\nsequences ".." and "\n@\n{" which have special meaning to revparse.
    3. \n
\n\n

This function will return an error if a reference already exists with the\n given name unless force is true, in which case it will be overwritten.

\n\n

The message for the reflog will be ignored if the reference does\n not belong in the standard set (HEAD, branches and remote-tracking\n branches) and and it does not have a reflog.

\n\n

It will return GIT_EMODIFIED if the reference's value at the time\n of updating does not match the one passed through current_id\n (i.e. if the ref has changed since the user read it).

\n", + "comments": "

A direct reference (also called an object id reference) refers directly to a specific object id (a.k.a. OID or SHA) in the repository. The id permanently refers to the object (although the reference itself can be moved). For example, in libgit2 the direct ref "refs/tags/v0.17.0" refers to OID 5b9fac39d8a76b9139667c26a63e6b3f204b3977.

\n\n

The direct reference will be created in the repository and written to the disk. The generated reference object must be freed by the user.

\n\n

Valid reference names must follow one of two patterns:

\n\n
    \n
  1. Top-level names must contain only capital letters and underscores, and must begin and end with a letter. (e.g. "HEAD", "ORIG_HEAD"). 2. Names prefixed with "refs/" can be almost anything. You must avoid the characters '~', '^', ':', '\\', '?', '[', and '*', and the sequences ".." and "@{" which have special meaning to revparse.
    2. \n
\n\n

This function will return an error if a reference already exists with the given name unless force is true, in which case it will be overwritten.

\n\n

The message for the reflog will be ignored if the reference does not belong in the standard set (HEAD, branches and remote-tracking branches) and and it does not have a reflog.

\n\n

It will return GIT_EMODIFIED if the reference's value at the time of updating does not match the one passed through current_id (i.e. if the ref has changed since the user read it).

\n", "group": "reference" }, "git_reference_target": { @@ -13793,11 +13994,11 @@ "comment": " a pointer to the oid if available, NULL otherwise" }, "description": "

Get the OID pointed to by a direct reference.

\n", - "comments": "

Only available if the reference is direct (i.e. an object id reference,\n not a symbolic one).

\n\n

To find the OID of a symbolic ref, call git_reference_resolve() and\n then this function (or maybe use git_reference_name_to_id() to\n directly resolve a reference name all the way through to an OID).

\n", + "comments": "

Only available if the reference is direct (i.e. an object id reference, not a symbolic one).

\n\n

To find the OID of a symbolic ref, call git_reference_resolve() and then this function (or maybe use git_reference_name_to_id() to directly resolve a reference name all the way through to an OID).

\n", "group": "reference", "examples": { "general.c": [ - "ex/v0.23.2/general.html#git_reference_target-54" + "ex/v0.24.1/general.html#git_reference_target-54" ] } }, @@ -13820,7 +14021,7 @@ "comment": " a pointer to the oid if available, NULL otherwise" }, "description": "

Return the peeled OID target of this reference.

\n", - "comments": "

This peeled OID only applies to direct references that point to\n a hard Tag object: it is the result of peeling such Tag.

\n", + "comments": "

This peeled OID only applies to direct references that point to a hard Tag object: it is the result of peeling such Tag.

\n", "group": "reference" }, "git_reference_symbolic_target": { @@ -13846,7 +14047,7 @@ "group": "reference", "examples": { "general.c": [ - "ex/v0.23.2/general.html#git_reference_symbolic_target-55" + "ex/v0.24.1/general.html#git_reference_symbolic_target-55" ] } }, @@ -13873,7 +14074,7 @@ "group": "reference", "examples": { "general.c": [ - "ex/v0.23.2/general.html#git_reference_type-56" + "ex/v0.24.1/general.html#git_reference_type-56" ] } }, @@ -13923,7 +14124,7 @@ "comment": " 0 or an error code" }, "description": "

Resolve a symbolic reference to a direct reference.

\n", - "comments": "

This method iteratively peels a symbolic reference until it resolves to\n a direct reference to an OID.

\n\n

The peeled reference is returned in the resolved_ref argument, and\n must be freed manually once it's no longer needed.

\n\n

If a direct reference is passed as an argument, a copy of that\n reference is returned. This copy must be manually freed too.

\n", + "comments": "

This method iteratively peels a symbolic reference until it resolves to a direct reference to an OID.

\n\n

The peeled reference is returned in the resolved_ref argument, and must be freed manually once it's no longer needed.

\n\n

If a direct reference is passed as an argument, a copy of that reference is returned. This copy must be manually freed too.

\n", "group": "reference" }, "git_reference_owner": { @@ -13982,7 +14183,7 @@ "comment": " 0 on success, GIT_EINVALIDSPEC or an error code" }, "description": "

Create a new reference with the same name as the given reference but a\n different symbolic target. The reference must be a symbolic reference,\n otherwise this will fail.

\n", - "comments": "

The new reference will be written to disk, overwriting the given reference.

\n\n

The target name will be checked for validity.\n See git_reference_symbolic_create() for rules about valid names.

\n\n

The message for the reflog will be ignored if the reference does\n not belong in the standard set (HEAD, branches and remote-tracking\n branches) and and it does not have a reflog.

\n", + "comments": "

The new reference will be written to disk, overwriting the given reference.

\n\n

The target name will be checked for validity. See git_reference_symbolic_create() for rules about valid names.

\n\n

The message for the reflog will be ignored if the reference does not belong in the standard set (HEAD, branches and remote-tracking branches) and and it does not have a reflog.

\n", "group": "reference" }, "git_reference_set_target": { @@ -14061,7 +14262,7 @@ "comment": " 0 on success, GIT_EINVALIDSPEC, GIT_EEXISTS or an error code" }, "description": "

Rename an existing reference.

\n", - "comments": "

This method works for both direct and symbolic references.

\n\n

The new name will be checked for validity.\n See git_reference_symbolic_create() for rules about valid names.

\n\n

If the force flag is not enabled, and there's already\n a reference with the given name, the renaming will fail.

\n\n

IMPORTANT:\n The user needs to write a proper reflog entry if the\n reflog is enabled for the repository. We only rename\n the reflog if it exists.

\n", + "comments": "

This method works for both direct and symbolic references.

\n\n

The new name will be checked for validity. See git_reference_symbolic_create() for rules about valid names.

\n\n

If the force flag is not enabled, and there's already a reference with the given name, the renaming will fail.

\n\n

IMPORTANT: The user needs to write a proper reflog entry if the reflog is enabled for the repository. We only rename the reflog if it exists.

\n", "group": "reference" }, "git_reference_delete": { @@ -14083,7 +14284,7 @@ "comment": " 0, GIT_EMODIFIED or an error code" }, "description": "

Delete an existing reference.

\n", - "comments": "

This method works for both direct and symbolic references. The reference\n will be immediately removed on disk but the memory will not be freed.\n Callers must call git_reference_free.

\n\n

This function will return an error if the reference has changed\n from the time it was looked up.

\n", + "comments": "

This method works for both direct and symbolic references. The reference will be immediately removed on disk but the memory will not be freed. Callers must call git_reference_free.

\n\n

This function will return an error if the reference has changed from the time it was looked up.

\n", "group": "reference" }, "git_reference_remove": { @@ -14110,7 +14311,7 @@ "comment": " 0 or an error code" }, "description": "

Delete an existing reference by name

\n", - "comments": "

This method removes the named reference from the repository without\n looking at its old value.

\n", + "comments": "

This method removes the named reference from the repository without looking at its old value.

\n", "group": "reference" }, "git_reference_list": { @@ -14137,11 +14338,11 @@ "comment": " 0 or an error code" }, "description": "

Fill a list with all the references that can be found in a repository.

\n", - "comments": "

The string array will be filled with the names of all references; these\n values are owned by the user and should be free'd manually when no\n longer needed, using git_strarray_free().

\n", + "comments": "

The string array will be filled with the names of all references; these values are owned by the user and should be free'd manually when no longer needed, using git_strarray_free().

\n", "group": "reference", "examples": { "general.c": [ - "ex/v0.23.2/general.html#git_reference_list-57" + "ex/v0.24.1/general.html#git_reference_list-57" ] } }, @@ -14174,7 +14375,7 @@ "comment": " 0 on success, non-zero callback return value, or error code" }, "description": "

Perform a callback on each reference in the repository.

\n", - "comments": "

The callback function will be called for each reference in the\n repository, receiving the reference object and the payload value\n passed to this method. Returning a non-zero value from the callback\n will terminate the iteration.

\n", + "comments": "

The callback function will be called for each reference in the repository, receiving the reference object and the payload value passed to this method. Returning a non-zero value from the callback will terminate the iteration.

\n", "group": "reference" }, "git_reference_foreach_name": { @@ -14206,7 +14407,7 @@ "comment": " 0 on success, non-zero callback return value, or error code" }, "description": "

Perform a callback on the fully-qualified name of each reference.

\n", - "comments": "

The callback function will be called for each reference in the\n repository, receiving the name of the reference and the payload value\n passed to this method. Returning a non-zero value from the callback\n will terminate the iteration.

\n", + "comments": "

The callback function will be called for each reference in the repository, receiving the name of the reference and the payload value passed to this method. Returning a non-zero value from the callback will terminate the iteration.

\n", "group": "reference" }, "git_reference_free": { @@ -14232,7 +14433,7 @@ "group": "reference", "examples": { "status.c": [ - "ex/v0.23.2/status.html#git_reference_free-3" + "ex/v0.24.1/status.html#git_reference_free-3" ] } }, @@ -14373,7 +14574,7 @@ "comment": " 0, GIT_ITEROVER if there are no more; or an error code" }, "description": "

Get the next reference's name

\n", - "comments": "

This function is provided for convenience in case only the names\n are interesting as it avoids the allocation of the git_reference\n object which git_reference_next() needs.

\n", + "comments": "

This function is provided for convenience in case only the names are interesting as it avoids the allocation of the git_reference object which git_reference_next() needs.

\n", "group": "reference" }, "git_reference_iterator_free": { @@ -14432,7 +14633,7 @@ "comment": " 0 on success, GIT_EUSER on non-zero callback, or error code" }, "description": "

Perform a callback on each reference in the repository whose name\n matches the given pattern.

\n", - "comments": "

This function acts like git_reference_foreach() with an additional\n pattern match being applied to the reference name before issuing the\n callback function. See that function for more information.

\n\n

The pattern is matched using fnmatch or "glob" style where a '*' matches\n any sequence of letters, a '?' matches any letter, and square brackets\n can be used to define character ranges (such as "[0-9]" for digits).

\n", + "comments": "

This function acts like git_reference_foreach() with an additional pattern match being applied to the reference name before issuing the callback function. See that function for more information.

\n\n

The pattern is matched using fnmatch or "glob" style where a '*' matches any sequence of letters, a '?' matches any letter, and square brackets can be used to define character ranges (such as "[0-9]" for digits).

\n", "group": "reference" }, "git_reference_has_log": { @@ -14486,7 +14687,7 @@ "comment": " 0 or an error code." }, "description": "

Ensure there is a reflog for a particular reference.

\n", - "comments": "

Make sure that successive updates to the reference will append to\n its log.

\n", + "comments": "

Make sure that successive updates to the reference will append to its log.

\n", "group": "reference" }, "git_reference_is_branch": { @@ -14611,7 +14812,7 @@ "comment": " 0 on success, GIT_EBUFS if buffer is too small, GIT_EINVALIDSPEC\n or an error code." }, "description": "

Normalize reference name and check validity.

\n", - "comments": "

This will normalize the reference name by removing any leading slash\n '/' characters and collapsing runs of adjacent slashes between name\n components into a single slash.

\n\n

Once normalized, if the reference name is valid, it will be returned in\n the user allocated buffer.

\n\n

See git_reference_symbolic_create() for rules about valid names.

\n", + "comments": "

This will normalize the reference name by removing any leading slash '/' characters and collapsing runs of adjacent slashes between name components into a single slash.

\n\n

Once normalized, if the reference name is valid, it will be returned in the user allocated buffer.

\n\n

See git_reference_symbolic_create() for rules about valid names.

\n", "group": "reference" }, "git_reference_peel": { @@ -14643,7 +14844,7 @@ "comment": " 0 on success, GIT_EAMBIGUOUS, GIT_ENOTFOUND or an error code" }, "description": "

Recursively peel reference until object of the specified type is found.

\n", - "comments": "

The retrieved peeled object is owned by the repository\n and should be closed with the git_object_free method.

\n\n

If you pass GIT_OBJ_ANY as the target type, then the object\n will be peeled until a non-tag object is met.

\n", + "comments": "

The retrieved peeled object is owned by the repository and should be closed with the git_object_free method.

\n\n

If you pass GIT_OBJ_ANY as the target type, then the object will be peeled until a non-tag object is met.

\n", "group": "reference" }, "git_reference_is_valid_name": { @@ -14665,7 +14866,7 @@ "comment": " 1 if the reference name is acceptable; 0 if it isn't" }, "description": "

Ensure the reference name is well-formed.

\n", - "comments": "

Valid reference names must follow one of two patterns:

\n\n
    \n
  1. Top-level names must contain only capital letters and underscores,\nand must begin and end with a letter. (e.g. "HEAD", "ORIG_HEAD").
    2. \n
  2. Names prefixed with "refs/" can be almost anything. You must avoid\nthe characters '~', '^', ':', '\n\\\n', '?', '[', and '*', and the\nsequences ".." and "\n@\n{" which have special meaning to revparse.
    3. \n
\n", + "comments": "

Valid reference names must follow one of two patterns:

\n\n
    \n
  1. Top-level names must contain only capital letters and underscores, and must begin and end with a letter. (e.g. "HEAD", "ORIG_HEAD"). 2. Names prefixed with "refs/" can be almost anything. You must avoid the characters '~', '^', ':', '\\', '?', '[', and '*', and the sequences ".." and "@{" which have special meaning to revparse.
    2. \n
\n", "group": "reference" }, "git_reference_shorthand": { @@ -14687,11 +14888,11 @@ "comment": " the human-readable version of the name" }, "description": "

Get the reference's short name

\n", - "comments": "

This will transform the reference name into a name "human-readable"\n version. If no shortname is appropriate, it will return the full\n name.

\n\n

The memory is owned by the reference and must not be freed.

\n", + "comments": "

This will transform the reference name into a name "human-readable" version. If no shortname is appropriate, it will return the full name.

\n\n

The memory is owned by the reference and must not be freed.

\n", "group": "reference", "examples": { "status.c": [ - "ex/v0.23.2/status.html#git_reference_shorthand-4" + "ex/v0.24.1/status.html#git_reference_shorthand-4" ] } }, @@ -14961,7 +15162,7 @@ "group": "remote", "examples": { "remote.c": [ - "ex/v0.23.2/remote.html#git_remote_create-4" + "ex/v0.24.1/remote.html#git_remote_create-4" ] } }, @@ -15036,14 +15237,14 @@ "comment": " 0 or an error code" }, "description": "

Create an anonymous remote

\n", - "comments": "

Create a remote with the given url in-memory. You can use this when\n you have a URL instead of a remote's name.

\n", + "comments": "

Create a remote with the given url in-memory. You can use this when you have a URL instead of a remote's name.

\n", "group": "remote", "examples": { "network/fetch.c": [ - "ex/v0.23.2/network/fetch.html#git_remote_create_anonymous-4" + "ex/v0.24.1/network/fetch.html#git_remote_create_anonymous-4" ], "network/ls-remote.c": [ - "ex/v0.23.2/network/ls-remote.html#git_remote_create_anonymous-2" + "ex/v0.24.1/network/ls-remote.html#git_remote_create_anonymous-2" ] } }, @@ -15076,17 +15277,17 @@ "comment": " 0, GIT_ENOTFOUND, GIT_EINVALIDSPEC or an error code" }, "description": "

Get the information for a particular remote

\n", - "comments": "

The name will be checked for validity.\n See git_tag_create() for rules about valid names.

\n", + "comments": "

The name will be checked for validity. See git_tag_create() for rules about valid names.

\n", "group": "remote", "examples": { "network/fetch.c": [ - "ex/v0.23.2/network/fetch.html#git_remote_lookup-5" + "ex/v0.24.1/network/fetch.html#git_remote_lookup-5" ], "network/ls-remote.c": [ - "ex/v0.23.2/network/ls-remote.html#git_remote_lookup-3" + "ex/v0.24.1/network/ls-remote.html#git_remote_lookup-3" ], "remote.c": [ - "ex/v0.23.2/remote.html#git_remote_lookup-5" + "ex/v0.24.1/remote.html#git_remote_lookup-5" ] } }, @@ -15180,11 +15381,11 @@ "comment": " a pointer to the url" }, "description": "

Get the remote's url

\n", - "comments": "

If url.*.insteadOf has been configured for this URL, it will\n return the modified URL.

\n", + "comments": "

If url.*.insteadOf has been configured for this URL, it will return the modified URL.

\n", "group": "remote", "examples": { "remote.c": [ - "ex/v0.23.2/remote.html#git_remote_url-6" + "ex/v0.24.1/remote.html#git_remote_url-6" ] } }, @@ -15207,11 +15408,11 @@ "comment": " a pointer to the url or NULL if no special url for pushing is set" }, "description": "

Get the remote's url for pushing

\n", - "comments": "

If url.*.pushInsteadOf has been configured for this URL, it\n will return the modified URL.

\n", + "comments": "

If url.*.pushInsteadOf has been configured for this URL, it will return the modified URL.

\n", "group": "remote", "examples": { "remote.c": [ - "ex/v0.23.2/remote.html#git_remote_pushurl-7" + "ex/v0.24.1/remote.html#git_remote_pushurl-7" ] } }, @@ -15244,11 +15445,11 @@ "comment": " 0 or an error value" }, "description": "

Set the remote's url in the configuration

\n", - "comments": "

Remote objects already in memory will not be affected. This assumes\n the common case of a single-url remote and will otherwise return an error.

\n", + "comments": "

Remote objects already in memory will not be affected. This assumes the common case of a single-url remote and will otherwise return an error.

\n", "group": "remote", "examples": { "remote.c": [ - "ex/v0.23.2/remote.html#git_remote_set_url-8" + "ex/v0.24.1/remote.html#git_remote_set_url-8" ] } }, @@ -15281,11 +15482,11 @@ "comment": null }, "description": "

Set the remote's url for pushing in the configuration.

\n", - "comments": "

Remote objects already in memory will not be affected. This assumes\n the common case of a single-url remote and will otherwise return an error.

\n", + "comments": "

Remote objects already in memory will not be affected. This assumes the common case of a single-url remote and will otherwise return an error.

\n", "group": "remote", "examples": { "remote.c": [ - "ex/v0.23.2/remote.html#git_remote_set_pushurl-9" + "ex/v0.24.1/remote.html#git_remote_set_pushurl-9" ] } }, @@ -15318,7 +15519,7 @@ "comment": " 0, GIT_EINVALIDSPEC if refspec is invalid or an error value" }, "description": "

Add a fetch refspec to the remote's configuration

\n", - "comments": "

Add the given refspec to the fetch list in the configuration. No\n loaded remote instances will be affected.

\n", + "comments": "

Add the given refspec to the fetch list in the configuration. No loaded remote instances will be affected.

\n", "group": "remote" }, "git_remote_get_fetch_refspecs": { @@ -15345,7 +15546,7 @@ "comment": null }, "description": "

Get the remote's list of fetch refspecs

\n", - "comments": "

The memory is owned by the user and should be freed with\n git_strarray_free.

\n", + "comments": "

The memory is owned by the user and should be freed with git_strarray_free.

\n", "group": "remote" }, "git_remote_add_push": { @@ -15377,7 +15578,7 @@ "comment": " 0, GIT_EINVALIDSPEC if refspec is invalid or an error value" }, "description": "

Add a push refspec to the remote's configuration

\n", - "comments": "

Add the given refspec to the push list in the configuration. No\n loaded remote instances will be affected.

\n", + "comments": "

Add the given refspec to the push list in the configuration. No loaded remote instances will be affected.

\n", "group": "remote" }, "git_remote_get_push_refspecs": { @@ -15404,7 +15605,7 @@ "comment": null }, "description": "

Get the remote's list of push refspecs

\n", - "comments": "

The memory is owned by the user and should be freed with\n git_strarray_free.

\n", + "comments": "

The memory is owned by the user and should be freed with git_strarray_free.

\n", "group": "remote" }, "git_remote_refspec_count": { @@ -15459,8 +15660,8 @@ "git_remote_connect": { "type": "function", "file": "remote.h", - "line": 246, - "lineto": 246, + "line": 247, + "lineto": 247, "args": [ { "name": "remote", @@ -15476,31 +15677,33 @@ "name": "callbacks", "type": "const git_remote_callbacks *", "comment": "the callbacks to use for this connection" + }, + { + "name": "custom_headers", + "type": "const git_strarray *", + "comment": "extra HTTP headers to use in this connection" } ], - "argline": "git_remote *remote, git_direction direction, const git_remote_callbacks *callbacks", - "sig": "git_remote *::git_direction::const git_remote_callbacks *", + "argline": "git_remote *remote, git_direction direction, const git_remote_callbacks *callbacks, const git_strarray *custom_headers", + "sig": "git_remote *::git_direction::const git_remote_callbacks *::const git_strarray *", "return": { "type": "int", "comment": " 0 or an error code" }, "description": "

Open a connection to a remote

\n", - "comments": "

The transport is selected based on the URL. The direction argument\n is due to a limitation of the git protocol (over TCP or SSH) which\n starts up a specific binary which can only do the one or the other.

\n", + "comments": "

The transport is selected based on the URL. The direction argument is due to a limitation of the git protocol (over TCP or SSH) which starts up a specific binary which can only do the one or the other.

\n", "group": "remote", "examples": { - "network/fetch.c": [ - "ex/v0.23.2/network/fetch.html#git_remote_connect-6" - ], "network/ls-remote.c": [ - "ex/v0.23.2/network/ls-remote.html#git_remote_connect-4" + "ex/v0.24.1/network/ls-remote.html#git_remote_connect-4" ] } }, "git_remote_ls": { "type": "function", "file": "remote.h", - "line": 268, - "lineto": 268, + "line": 269, + "lineto": 269, "args": [ { "name": "out", @@ -15525,19 +15728,19 @@ "comment": " 0 on success, or an error code" }, "description": "

Get the remote repository's reference advertisement list

\n", - "comments": "

Get the list of references with which the server responds to a new\n connection.

\n\n

The remote (or more exactly its transport) must have connected to\n the remote repository. This list is available as soon as the\n connection to the remote is initiated and it remains available\n after disconnecting.

\n\n

The memory belongs to the remote. The pointer will be valid as long\n as a new connection is not initiated, but it is recommended that\n you make a copy in order to make use of the data.

\n", + "comments": "

Get the list of references with which the server responds to a new connection.

\n\n

The remote (or more exactly its transport) must have connected to the remote repository. This list is available as soon as the connection to the remote is initiated and it remains available after disconnecting.

\n\n

The memory belongs to the remote. The pointer will be valid as long as a new connection is not initiated, but it is recommended that you make a copy in order to make use of the data.

\n", "group": "remote", "examples": { "network/ls-remote.c": [ - "ex/v0.23.2/network/ls-remote.html#git_remote_ls-5" + "ex/v0.24.1/network/ls-remote.html#git_remote_ls-5" ] } }, "git_remote_connected": { "type": "function", "file": "remote.h", - "line": 279, - "lineto": 279, + "line": 280, + "lineto": 280, "args": [ { "name": "remote", @@ -15552,14 +15755,14 @@ "comment": " 1 if it's connected, 0 otherwise." }, "description": "

Check whether the remote is connected

\n", - "comments": "

Check whether the remote's underlying transport is connected to the\n remote host.

\n", + "comments": "

Check whether the remote's underlying transport is connected to the remote host.

\n", "group": "remote" }, "git_remote_stop": { "type": "function", "file": "remote.h", - "line": 289, - "lineto": 289, + "line": 290, + "lineto": 290, "args": [ { "name": "remote", @@ -15574,14 +15777,14 @@ "comment": null }, "description": "

Cancel the operation

\n", - "comments": "

At certain points in its operation, the network code checks whether\n the operation has been cancelled and if so stops the operation.

\n", + "comments": "

At certain points in its operation, the network code checks whether the operation has been cancelled and if so stops the operation.

\n", "group": "remote" }, "git_remote_disconnect": { "type": "function", "file": "remote.h", - "line": 298, - "lineto": 298, + "line": 299, + "lineto": 299, "args": [ { "name": "remote", @@ -15597,18 +15800,13 @@ }, "description": "

Disconnect from the remote

\n", "comments": "

Close the connection to the remote.

\n", - "group": "remote", - "examples": { - "network/fetch.c": [ - "ex/v0.23.2/network/fetch.html#git_remote_disconnect-7" - ] - } + "group": "remote" }, "git_remote_free": { "type": "function", "file": "remote.h", - "line": 308, - "lineto": 308, + "line": 309, + "lineto": 309, "args": [ { "name": "remote", @@ -15623,26 +15821,26 @@ "comment": null }, "description": "

Free the memory associated with a remote

\n", - "comments": "

This also disconnects from the remote, if the connection\n has not been closed yet (using git_remote_disconnect).

\n", + "comments": "

This also disconnects from the remote, if the connection has not been closed yet (using git_remote_disconnect).

\n", "group": "remote", "examples": { "network/fetch.c": [ - "ex/v0.23.2/network/fetch.html#git_remote_free-8", - "ex/v0.23.2/network/fetch.html#git_remote_free-9" + "ex/v0.24.1/network/fetch.html#git_remote_free-6", + "ex/v0.24.1/network/fetch.html#git_remote_free-7" ], "network/ls-remote.c": [ - "ex/v0.23.2/network/ls-remote.html#git_remote_free-6" + "ex/v0.24.1/network/ls-remote.html#git_remote_free-6" ], "remote.c": [ - "ex/v0.23.2/remote.html#git_remote_free-10" + "ex/v0.24.1/remote.html#git_remote_free-10" ] } }, "git_remote_list": { "type": "function", "file": "remote.h", - "line": 319, - "lineto": 319, + "line": 320, + "lineto": 320, "args": [ { "name": "out", @@ -15666,15 +15864,15 @@ "group": "remote", "examples": { "remote.c": [ - "ex/v0.23.2/remote.html#git_remote_list-11" + "ex/v0.24.1/remote.html#git_remote_list-11" ] } }, "git_remote_init_callbacks": { "type": "function", "file": "remote.h", - "line": 470, - "lineto": 472, + "line": 471, + "lineto": 473, "args": [ { "name": "opts", @@ -15700,8 +15898,8 @@ "git_fetch_init_options": { "type": "function", "file": "remote.h", - "line": 563, - "lineto": 565, + "line": 569, + "lineto": 571, "args": [ { "name": "opts", @@ -15727,8 +15925,8 @@ "git_push_init_options": { "type": "function", "file": "remote.h", - "line": 602, - "lineto": 604, + "line": 613, + "lineto": 615, "args": [ { "name": "opts", @@ -15754,8 +15952,8 @@ "git_remote_download": { "type": "function", "file": "remote.h", - "line": 622, - "lineto": 622, + "line": 633, + "lineto": 633, "args": [ { "name": "remote", @@ -15780,19 +15978,14 @@ "comment": " 0 or an error code" }, "description": "

Download and index the packfile

\n", - "comments": "

Connect to the remote if it hasn't been done yet, negotiate with\n the remote git which objects are missing, download and index the\n packfile.

\n\n

The .idx file will be created and both it and the packfile with be\n renamed to their final name.

\n", - "group": "remote", - "examples": { - "network/fetch.c": [ - "ex/v0.23.2/network/fetch.html#git_remote_download-10" - ] - } + "comments": "

Connect to the remote if it hasn't been done yet, negotiate with the remote git which objects are missing, download and index the packfile.

\n\n

The .idx file will be created and both it and the packfile with be renamed to their final name.

\n", + "group": "remote" }, "git_remote_upload": { "type": "function", "file": "remote.h", - "line": 636, - "lineto": 636, + "line": 647, + "lineto": 647, "args": [ { "name": "remote", @@ -15817,14 +16010,14 @@ "comment": " 0 or an error code" }, "description": "

Create a packfile and send it to the server

\n", - "comments": "

Connect to the remote if it hasn't been done yet, negotiate with\n the remote git which objects are missing, create a packfile with the missing objects and send it.

\n", + "comments": "

Connect to the remote if it hasn't been done yet, negotiate with the remote git which objects are missing, create a packfile with the missing objects and send it.

\n", "group": "remote" }, "git_remote_update_tips": { "type": "function", "file": "remote.h", - "line": 652, - "lineto": 657, + "line": 663, + "lineto": 668, "args": [ { "name": "remote", @@ -15860,18 +16053,13 @@ }, "description": "

Update the tips to the new state

\n", "comments": "", - "group": "remote", - "examples": { - "network/fetch.c": [ - "ex/v0.23.2/network/fetch.html#git_remote_update_tips-11" - ] - } + "group": "remote" }, "git_remote_fetch": { "type": "function", "file": "remote.h", - "line": 673, - "lineto": 677, + "line": 684, + "lineto": 688, "args": [ { "name": "remote", @@ -15901,14 +16089,19 @@ "comment": " 0 or an error code" }, "description": "

Download new data and update tips

\n", - "comments": "

Convenience function to connect to a remote, download the data,\n disconnect and update the remote-tracking branches.

\n", - "group": "remote" + "comments": "

Convenience function to connect to a remote, download the data, disconnect and update the remote-tracking branches.

\n", + "group": "remote", + "examples": { + "network/fetch.c": [ + "ex/v0.24.1/network/fetch.html#git_remote_fetch-8" + ] + } }, "git_remote_prune": { "type": "function", "file": "remote.h", - "line": 686, - "lineto": 686, + "line": 697, + "lineto": 697, "args": [ { "name": "remote", @@ -15934,8 +16127,8 @@ "git_remote_push": { "type": "function", "file": "remote.h", - "line": 698, - "lineto": 700, + "line": 709, + "lineto": 711, "args": [ { "name": "remote", @@ -15966,8 +16159,8 @@ "git_remote_stats": { "type": "function", "file": "remote.h", - "line": 705, - "lineto": 705, + "line": 716, + "lineto": 716, "args": [ { "name": "remote", @@ -15986,15 +16179,15 @@ "group": "remote", "examples": { "network/fetch.c": [ - "ex/v0.23.2/network/fetch.html#git_remote_stats-12" + "ex/v0.24.1/network/fetch.html#git_remote_stats-9" ] } }, "git_remote_autotag": { "type": "function", "file": "remote.h", - "line": 713, - "lineto": 713, + "line": 724, + "lineto": 724, "args": [ { "name": "remote", @@ -16015,8 +16208,8 @@ "git_remote_set_autotag": { "type": "function", "file": "remote.h", - "line": 725, - "lineto": 725, + "line": 736, + "lineto": 736, "args": [ { "name": "repo", @@ -16041,14 +16234,14 @@ "comment": null }, "description": "

Set the remote's tag following setting.

\n", - "comments": "

The change will be made in the configuration. No loaded remotes\n will be affected.

\n", + "comments": "

The change will be made in the configuration. No loaded remotes will be affected.

\n", "group": "remote" }, "git_remote_prune_refs": { "type": "function", "file": "remote.h", - "line": 732, - "lineto": 732, + "line": 743, + "lineto": 743, "args": [ { "name": "remote", @@ -16069,8 +16262,8 @@ "git_remote_rename": { "type": "function", "file": "remote.h", - "line": 754, - "lineto": 758, + "line": 765, + "lineto": 769, "args": [ { "name": "problems", @@ -16100,19 +16293,19 @@ "comment": " 0, GIT_EINVALIDSPEC, GIT_EEXISTS or an error code" }, "description": "

Give the remote a new name

\n", - "comments": "

All remote-tracking branches and configuration settings\n for the remote are updated.

\n\n

The new name will be checked for validity.\n See git_tag_create() for rules about valid names.

\n\n

No loaded instances of a the remote with the old name will change\n their name or their list of refspecs.

\n", + "comments": "

All remote-tracking branches and configuration settings for the remote are updated.

\n\n

The new name will be checked for validity. See git_tag_create() for rules about valid names.

\n\n

No loaded instances of a the remote with the old name will change their name or their list of refspecs.

\n", "group": "remote", "examples": { "remote.c": [ - "ex/v0.23.2/remote.html#git_remote_rename-12" + "ex/v0.24.1/remote.html#git_remote_rename-12" ] } }, "git_remote_is_valid_name": { "type": "function", "file": "remote.h", - "line": 766, - "lineto": 766, + "line": 777, + "lineto": 777, "args": [ { "name": "remote_name", @@ -16133,8 +16326,8 @@ "git_remote_delete": { "type": "function", "file": "remote.h", - "line": 778, - "lineto": 778, + "line": 789, + "lineto": 789, "args": [ { "name": "repo", @@ -16154,19 +16347,19 @@ "comment": " 0 on success, or an error code." }, "description": "

Delete an existing persisted remote.

\n", - "comments": "

All remote-tracking branches and configuration settings\n for the remote will be removed.

\n", + "comments": "

All remote-tracking branches and configuration settings for the remote will be removed.

\n", "group": "remote", "examples": { "remote.c": [ - "ex/v0.23.2/remote.html#git_remote_delete-13" + "ex/v0.24.1/remote.html#git_remote_delete-13" ] } }, "git_remote_default_branch": { "type": "function", "file": "remote.h", - "line": 796, - "lineto": 796, + "line": 807, + "lineto": 807, "args": [ { "name": "out", @@ -16186,7 +16379,7 @@ "comment": " 0, GIT_ENOTFOUND if the remote does not have any references\n or none of them point to HEAD's commit, or an error message." }, "description": "

Retrieve the name of the remote's default branch

\n", - "comments": "

The default branch of a repository is the branch which HEAD points\n to. If the remote does not support reporting this information\n directly, it performs the guess as git does; that is, if there are\n multiple branches which point to the same commit, the first one is\n chosen. If the master branch is a candidate, it wins.

\n\n

This function must only be called after connecting.

\n", + "comments": "

The default branch of a repository is the branch which HEAD points to. If the remote does not support reporting this information directly, it performs the guess as git does; that is, if there are multiple branches which point to the same commit, the first one is chosen. If the master branch is a candidate, it wins.

\n\n

This function must only be called after connecting.

\n", "group": "remote" }, "git_repository_open": { @@ -16213,17 +16406,17 @@ "comment": " 0 or an error code" }, "description": "

Open a git repository.

\n", - "comments": "

The 'path' argument must point to either a git repository\n folder, or an existing work dir.

\n\n

The method will automatically detect if 'path' is a normal\n or bare repository or fail is 'path' is neither.

\n", + "comments": "

The 'path' argument must point to either a git repository folder, or an existing work dir.

\n\n

The method will automatically detect if 'path' is a normal or bare repository or fail is 'path' is neither.

\n", "group": "repository", "examples": { "general.c": [ - "ex/v0.23.2/general.html#git_repository_open-58" + "ex/v0.24.1/general.html#git_repository_open-58" ], "network/git2.c": [ - "ex/v0.23.2/network/git2.html#git_repository_open-5" + "ex/v0.24.1/network/git2.html#git_repository_open-5" ], "remote.c": [ - "ex/v0.23.2/remote.html#git_repository_open-14" + "ex/v0.24.1/remote.html#git_repository_open-14" ] } }, @@ -16251,7 +16444,7 @@ "comment": " 0 or an error code" }, "description": "

Create a "fake" repository to wrap an object database

\n", - "comments": "

Create a repository object to wrap an object database to be used\n with the API when all you have is an object database. This doesn't\n have any paths associated with it, so use with care.

\n", + "comments": "

Create a repository object to wrap an object database to be used with the API when all you have is an object database. This doesn't have any paths associated with it, so use with care.

\n", "group": "repository" }, "git_repository_discover": { @@ -16288,11 +16481,11 @@ "comment": " 0 or an error code" }, "description": "

Look for a git repository and copy its path in the given buffer.\n The lookup start from base_path and walk across parent directories\n if nothing has been found. The lookup ends when the first repository\n is found, or when reaching a directory referenced in ceiling_dirs\n or when the filesystem changes (in case across_fs is true).

\n", - "comments": "

The method will automatically detect if the repository is bare\n (if there is a repository).

\n", + "comments": "

The method will automatically detect if the repository is bare (if there is a repository).

\n", "group": "repository", "examples": { "remote.c": [ - "ex/v0.23.2/remote.html#git_repository_discover-15" + "ex/v0.24.1/remote.html#git_repository_discover-15" ] } }, @@ -16334,29 +16527,29 @@ "group": "repository", "examples": { "blame.c": [ - "ex/v0.23.2/blame.html#git_repository_open_ext-24" + "ex/v0.24.1/blame.html#git_repository_open_ext-24" ], "cat-file.c": [ - "ex/v0.23.2/cat-file.html#git_repository_open_ext-31" + "ex/v0.24.1/cat-file.html#git_repository_open_ext-31" ], "describe.c": [ - "ex/v0.23.2/describe.html#git_repository_open_ext-6" + "ex/v0.24.1/describe.html#git_repository_open_ext-6" ], "diff.c": [ - "ex/v0.23.2/diff.html#git_repository_open_ext-15" + "ex/v0.24.1/diff.html#git_repository_open_ext-15" ], "log.c": [ - "ex/v0.23.2/log.html#git_repository_open_ext-44", - "ex/v0.23.2/log.html#git_repository_open_ext-45" + "ex/v0.24.1/log.html#git_repository_open_ext-44", + "ex/v0.24.1/log.html#git_repository_open_ext-45" ], "rev-parse.c": [ - "ex/v0.23.2/rev-parse.html#git_repository_open_ext-16" + "ex/v0.24.1/rev-parse.html#git_repository_open_ext-16" ], "status.c": [ - "ex/v0.23.2/status.html#git_repository_open_ext-5" + "ex/v0.24.1/status.html#git_repository_open_ext-5" ], "tag.c": [ - "ex/v0.23.2/tag.html#git_repository_open_ext-11" + "ex/v0.24.1/tag.html#git_repository_open_ext-11" ] } }, @@ -16384,7 +16577,7 @@ "comment": " 0 on success, or an error code" }, "description": "

Open a bare repository on the serverside.

\n", - "comments": "

This is a fast open for bare repositories that will come in handy\n if you're e.g. hosting git repositories and need to access them\n efficiently

\n", + "comments": "

This is a fast open for bare repositories that will come in handy if you're e.g. hosting git repositories and need to access them efficiently

\n", "group": "repository" }, "git_repository_free": { @@ -16406,44 +16599,44 @@ "comment": null }, "description": "

Free a previously allocated repository

\n", - "comments": "

Note that after a repository is free'd, all the objects it has spawned\n will still exist until they are manually closed by the user\n with git_object_free, but accessing any of the attributes of\n an object without a backing repository will result in undefined\n behavior

\n", + "comments": "

Note that after a repository is free'd, all the objects it has spawned will still exist until they are manually closed by the user with git_object_free, but accessing any of the attributes of an object without a backing repository will result in undefined behavior

\n", "group": "repository", "examples": { "blame.c": [ - "ex/v0.23.2/blame.html#git_repository_free-25" + "ex/v0.24.1/blame.html#git_repository_free-25" ], "cat-file.c": [ - "ex/v0.23.2/cat-file.html#git_repository_free-32" + "ex/v0.24.1/cat-file.html#git_repository_free-32" ], "describe.c": [ - "ex/v0.23.2/describe.html#git_repository_free-7" + "ex/v0.24.1/describe.html#git_repository_free-7" ], "diff.c": [ - "ex/v0.23.2/diff.html#git_repository_free-16" + "ex/v0.24.1/diff.html#git_repository_free-16" ], "general.c": [ - "ex/v0.23.2/general.html#git_repository_free-59" + "ex/v0.24.1/general.html#git_repository_free-59" ], "init.c": [ - "ex/v0.23.2/init.html#git_repository_free-6" + "ex/v0.24.1/init.html#git_repository_free-6" ], "log.c": [ - "ex/v0.23.2/log.html#git_repository_free-46" + "ex/v0.24.1/log.html#git_repository_free-46" ], "network/clone.c": [ - "ex/v0.23.2/network/clone.html#git_repository_free-3" + "ex/v0.24.1/network/clone.html#git_repository_free-3" ], "network/git2.c": [ - "ex/v0.23.2/network/git2.html#git_repository_free-6" + "ex/v0.24.1/network/git2.html#git_repository_free-6" ], "rev-parse.c": [ - "ex/v0.23.2/rev-parse.html#git_repository_free-17" + "ex/v0.24.1/rev-parse.html#git_repository_free-17" ], "status.c": [ - "ex/v0.23.2/status.html#git_repository_free-6" + "ex/v0.24.1/status.html#git_repository_free-6" ], "tag.c": [ - "ex/v0.23.2/tag.html#git_repository_free-12" + "ex/v0.24.1/tag.html#git_repository_free-12" ] } }, @@ -16476,11 +16669,11 @@ "comment": " 0 or an error code" }, "description": "

Creates a new Git repository in the given folder.

\n", - "comments": "

TODO:\n - Reinit the repository

\n", + "comments": "

TODO: - Reinit the repository

\n", "group": "repository", "examples": { "init.c": [ - "ex/v0.23.2/init.html#git_repository_init-7" + "ex/v0.24.1/init.html#git_repository_init-7" ] } }, @@ -16540,11 +16733,11 @@ "comment": " 0 or an error code on failure." }, "description": "

Create a new Git repository in the given folder with extended controls.

\n", - "comments": "

This will initialize a new git repository (creating the repo_path\n if requested by flags) and working directory as needed. It will\n auto-detect the case sensitivity of the file system and if the\n file system supports file mode bits correctly.

\n", + "comments": "

This will initialize a new git repository (creating the repo_path if requested by flags) and working directory as needed. It will auto-detect the case sensitivity of the file system and if the file system supports file mode bits correctly.

\n", "group": "repository", "examples": { "init.c": [ - "ex/v0.23.2/init.html#git_repository_init_ext-8" + "ex/v0.24.1/init.html#git_repository_init_ext-8" ] } }, @@ -16572,11 +16765,11 @@ "comment": " 0 on success, GIT_EUNBORNBRANCH when HEAD points to a non existing\n branch, GIT_ENOTFOUND when HEAD is missing; an error code otherwise" }, "description": "

Retrieve and resolve the reference pointed at by HEAD.

\n", - "comments": "

The returned git_reference will be owned by caller and\n git_reference_free() must be called when done with it to release the\n allocated memory and prevent a leak.

\n", + "comments": "

The returned git_reference will be owned by caller and git_reference_free() must be called when done with it to release the allocated memory and prevent a leak.

\n", "group": "repository", "examples": { "status.c": [ - "ex/v0.23.2/status.html#git_repository_head-7" + "ex/v0.24.1/status.html#git_repository_head-7" ] } }, @@ -16599,7 +16792,7 @@ "comment": " 1 if HEAD is detached, 0 if it's not; error code if there\n was an error." }, "description": "

Check if a repository's HEAD is detached

\n", - "comments": "

A repository's HEAD is detached when it points directly to a commit\n instead of a branch.

\n", + "comments": "

A repository's HEAD is detached when it points directly to a commit instead of a branch.

\n", "group": "repository" }, "git_repository_head_unborn": { @@ -16621,7 +16814,7 @@ "comment": " 1 if the current branch is unborn, 0 if it's not; error\n code if there was an error" }, "description": "

Check if the current branch is unborn

\n", - "comments": "

An unborn branch is one named from HEAD but which doesn't exist in\n the refs namespace, because it doesn't have any commit to point to.

\n", + "comments": "

An unborn branch is one named from HEAD but which doesn't exist in the refs namespace, because it doesn't have any commit to point to.

\n", "group": "repository" }, "git_repository_is_empty": { @@ -16643,7 +16836,7 @@ "comment": " 1 if the repository is empty, 0 if it isn't, error code\n if the repository is corrupted" }, "description": "

Check if a repository is empty

\n", - "comments": "

An empty repository has just been initialized and contains no references\n apart from HEAD, which must be pointing to the unborn master branch.

\n", + "comments": "

An empty repository has just been initialized and contains no references apart from HEAD, which must be pointing to the unborn master branch.

\n", "group": "repository" }, "git_repository_path": { @@ -16665,14 +16858,14 @@ "comment": " the path to the repository" }, "description": "

Get the path of this repository

\n", - "comments": "

This is the path of the .git folder for normal repositories,\n or of the repository itself for bare repositories.

\n", + "comments": "

This is the path of the .git folder for normal repositories, or of the repository itself for bare repositories.

\n", "group": "repository", "examples": { "init.c": [ - "ex/v0.23.2/init.html#git_repository_path-9" + "ex/v0.24.1/init.html#git_repository_path-9" ], "status.c": [ - "ex/v0.23.2/status.html#git_repository_path-8" + "ex/v0.24.1/status.html#git_repository_path-8" ] } }, @@ -16695,11 +16888,11 @@ "comment": " the path to the working dir, if it exists" }, "description": "

Get the path of the working directory for this repository

\n", - "comments": "

If the repository is bare, this function will always return\n NULL.

\n", + "comments": "

If the repository is bare, this function will always return NULL.

\n", "group": "repository", "examples": { "init.c": [ - "ex/v0.23.2/init.html#git_repository_workdir-10" + "ex/v0.24.1/init.html#git_repository_workdir-10" ] } }, @@ -16732,7 +16925,7 @@ "comment": " 0, or an error code" }, "description": "

Set the path to the working directory for this repository

\n", - "comments": "

The working directory doesn't need to be the same one\n that contains the .git folder for this repository.

\n\n

If this repository is bare, setting its working directory\n will turn it into a normal repository, capable of performing\n all the common workdir operations (checkout, status, index\n manipulation, etc).

\n", + "comments": "

The working directory doesn't need to be the same one that contains the .git folder for this repository.

\n\n

If this repository is bare, setting its working directory will turn it into a normal repository, capable of performing all the common workdir operations (checkout, status, index manipulation, etc).

\n", "group": "repository" }, "git_repository_is_bare": { @@ -16758,7 +16951,7 @@ "group": "repository", "examples": { "status.c": [ - "ex/v0.23.2/status.html#git_repository_is_bare-9" + "ex/v0.24.1/status.html#git_repository_is_bare-9" ] } }, @@ -16786,7 +16979,7 @@ "comment": " 0, or an error code" }, "description": "

Get the configuration file for this repository.

\n", - "comments": "

If a configuration file has not been set, the default\n config set for the repository will be returned, including\n global and system configurations (if they are available).

\n\n

The configuration file must be freed once it's no longer\n being used by the user.

\n", + "comments": "

If a configuration file has not been set, the default config set for the repository will be returned, including global and system configurations (if they are available).

\n\n

The configuration file must be freed once it's no longer being used by the user.

\n", "group": "repository" }, "git_repository_config_snapshot": { @@ -16813,7 +17006,7 @@ "comment": " 0, or an error code" }, "description": "

Get a snapshot of the repository's configuration

\n", - "comments": "

Convenience function to take a snapshot from the repository's\n configuration. The contents of this snapshot will not change,\n even if the underlying config files are modified.

\n\n

The configuration file must be freed once it's no longer\n being used by the user.

\n", + "comments": "

Convenience function to take a snapshot from the repository's configuration. The contents of this snapshot will not change, even if the underlying config files are modified.

\n\n

The configuration file must be freed once it's no longer being used by the user.

\n", "group": "repository" }, "git_repository_odb": { @@ -16840,14 +17033,14 @@ "comment": " 0, or an error code" }, "description": "

Get the Object Database for this repository.

\n", - "comments": "

If a custom ODB has not been set, the default\n database for the repository will be returned (the one\n located in .git/objects).

\n\n

The ODB must be freed once it's no longer being used by\n the user.

\n", + "comments": "

If a custom ODB has not been set, the default database for the repository will be returned (the one located in .git/objects).

\n\n

The ODB must be freed once it's no longer being used by the user.

\n", "group": "repository", "examples": { "cat-file.c": [ - "ex/v0.23.2/cat-file.html#git_repository_odb-33" + "ex/v0.24.1/cat-file.html#git_repository_odb-33" ], "general.c": [ - "ex/v0.23.2/general.html#git_repository_odb-60" + "ex/v0.24.1/general.html#git_repository_odb-60" ] } }, @@ -16875,7 +17068,7 @@ "comment": " 0, or an error code" }, "description": "

Get the Reference Database Backend for this repository.

\n", - "comments": "

If a custom refsdb has not been set, the default database for\n the repository will be returned (the one that manipulates loose\n and packed references in the .git directory).

\n\n

The refdb must be freed once it's no longer being used by\n the user.

\n", + "comments": "

If a custom refsdb has not been set, the default database for the repository will be returned (the one that manipulates loose and packed references in the .git directory).

\n\n

The refdb must be freed once it's no longer being used by the user.

\n", "group": "repository" }, "git_repository_index": { @@ -16902,14 +17095,14 @@ "comment": " 0, or an error code" }, "description": "

Get the Index file for this repository.

\n", - "comments": "

If a custom index has not been set, the default\n index for the repository will be returned (the one\n located in .git/index).

\n\n

The index must be freed once it's no longer being used by\n the user.

\n", + "comments": "

If a custom index has not been set, the default index for the repository will be returned (the one located in .git/index).

\n\n

The index must be freed once it's no longer being used by the user.

\n", "group": "repository", "examples": { "general.c": [ - "ex/v0.23.2/general.html#git_repository_index-61" + "ex/v0.24.1/general.html#git_repository_index-61" ], "init.c": [ - "ex/v0.23.2/init.html#git_repository_index-11" + "ex/v0.24.1/init.html#git_repository_index-11" ] } }, @@ -16937,7 +17130,7 @@ "comment": " 0, GIT_ENOTFOUND if no message exists or an error code" }, "description": "

Retrieve git's prepared message

\n", - "comments": "

Operations such as git revert/cherry-pick/merge with the -n option\n stop just short of creating a commit with the changes and save\n their prepared message in .git/MERGE_MSG so the next git-commit\n execution can present it to the user for them to amend if they\n wish.

\n\n

Use this function to get the contents of this file. Don't forget to\n remove the file after you create the commit.

\n", + "comments": "

Operations such as git revert/cherry-pick/merge with the -n option stop just short of creating a commit with the changes and save their prepared message in .git/MERGE_MSG so the next git-commit execution can present it to the user for them to amend if they wish.

\n\n

Use this function to get the contents of this file. Don't forget to remove the file after you create the commit.

\n", "group": "repository" }, "git_repository_message_remove": { @@ -17087,7 +17280,7 @@ "comment": " 0 on success, or an error code" }, "description": "

Calculate hash of file using repository filtering rules.

\n", - "comments": "

If you simply want to calculate the hash of a file on disk with no filters,\n you can just use the git_odb_hashfile() API. However, if you want to\n hash a file in the repository and you want to apply filtering rules (e.g.\n crlf filters) before generating the SHA, then use this function.

\n\n

Note: if the repository has core.safecrlf set to fail and the\n filtering triggers that failure, then this function will return an\n error and not calculate the hash of the file.

\n", + "comments": "

If you simply want to calculate the hash of a file on disk with no filters, you can just use the git_odb_hashfile() API. However, if you want to hash a file in the repository and you want to apply filtering rules (e.g. crlf filters) before generating the SHA, then use this function.

\n\n

Note: if the repository has core.safecrlf set to fail and the filtering triggers that failure, then this function will return an error and not calculate the hash of the file.

\n", "group": "repository" }, "git_repository_set_head": { @@ -17114,7 +17307,7 @@ "comment": " 0 on success, or an error code" }, "description": "

Make the repository HEAD point to the specified reference.

\n", - "comments": "

If the provided reference points to a Tree or a Blob, the HEAD is\n unaltered and -1 is returned.

\n\n

If the provided reference points to a branch, the HEAD will point\n to that branch, staying attached, or become attached if it isn't yet.\n If the branch doesn't exist yet, no error will be return. The HEAD\n will then be attached to an unborn branch.

\n\n

Otherwise, the HEAD will be detached and will directly point to\n the Commit.

\n", + "comments": "

If the provided reference points to a Tree or a Blob, the HEAD is unaltered and -1 is returned.

\n\n

If the provided reference points to a branch, the HEAD will point to that branch, staying attached, or become attached if it isn't yet. If the branch doesn't exist yet, no error will be return. The HEAD will then be attached to an unborn branch.

\n\n

Otherwise, the HEAD will be detached and will directly point to the Commit.

\n", "group": "repository" }, "git_repository_set_head_detached": { @@ -17141,7 +17334,7 @@ "comment": " 0 on success, or an error code" }, "description": "

Make the repository HEAD directly point to the Commit.

\n", - "comments": "

If the provided committish cannot be found in the repository, the HEAD\n is unaltered and GIT_ENOTFOUND is returned.

\n\n

If the provided commitish cannot be peeled into a commit, the HEAD\n is unaltered and -1 is returned.

\n\n

Otherwise, the HEAD will eventually be detached and will directly point to\n the peeled Commit.

\n", + "comments": "

If the provided committish cannot be found in the repository, the HEAD is unaltered and GIT_ENOTFOUND is returned.

\n\n

If the provided commitish cannot be peeled into a commit, the HEAD is unaltered and -1 is returned.

\n\n

Otherwise, the HEAD will eventually be detached and will directly point to the peeled Commit.

\n", "group": "repository" }, "git_repository_set_head_detached_from_annotated": { @@ -17168,7 +17361,7 @@ "comment": null }, "description": "

Make the repository HEAD directly point to the Commit.

\n", - "comments": "

This behaves like git_repository_set_head_detached() but takes an\n annotated commit, which lets you specify which extended sha syntax\n string was specified by a user, allowing for more exact reflog\n messages.

\n\n

See the documentation for git_repository_set_head_detached().

\n", + "comments": "

This behaves like git_repository_set_head_detached() but takes an annotated commit, which lets you specify which extended sha syntax string was specified by a user, allowing for more exact reflog messages.

\n\n

See the documentation for git_repository_set_head_detached().

\n", "group": "repository" }, "git_repository_detach_head": { @@ -17190,14 +17383,14 @@ "comment": " 0 on success, GIT_EUNBORNBRANCH when HEAD points to a non existing\n branch or an error code" }, "description": "

Detach the HEAD.

\n", - "comments": "

If the HEAD is already detached and points to a Commit, 0 is returned.

\n\n

If the HEAD is already detached and points to a Tag, the HEAD is\n updated into making it point to the peeled Commit, and 0 is returned.

\n\n

If the HEAD is already detached and points to a non commitish, the HEAD is\n unaltered, and -1 is returned.

\n\n

Otherwise, the HEAD will be detached and point to the peeled Commit.

\n", + "comments": "

If the HEAD is already detached and points to a Commit, 0 is returned.

\n\n

If the HEAD is already detached and points to a Tag, the HEAD is updated into making it point to the peeled Commit, and 0 is returned.

\n\n

If the HEAD is already detached and points to a non commitish, the HEAD is unaltered, and -1 is returned.

\n\n

Otherwise, the HEAD will be detached and point to the peeled Commit.

\n", "group": "repository" }, "git_repository_state": { "type": "function", "file": "repository.h", - "line": 694, - "lineto": 694, + "line": 696, + "lineto": 696, "args": [ { "name": "repo", @@ -17218,8 +17411,8 @@ "git_repository_set_namespace": { "type": "function", "file": "repository.h", - "line": 708, - "lineto": 708, + "line": 710, + "lineto": 710, "args": [ { "name": "repo", @@ -17239,14 +17432,14 @@ "comment": " 0 on success, -1 on error" }, "description": "

Sets the active namespace for this Git Repository

\n", - "comments": "

This namespace affects all reference operations for the repo.\n See man gitnamespaces

\n", + "comments": "

This namespace affects all reference operations for the repo. See man gitnamespaces

\n", "group": "repository" }, "git_repository_get_namespace": { "type": "function", "file": "repository.h", - "line": 716, - "lineto": 716, + "line": 718, + "lineto": 718, "args": [ { "name": "repo", @@ -17267,8 +17460,8 @@ "git_repository_is_shallow": { "type": "function", "file": "repository.h", - "line": 725, - "lineto": 725, + "line": 727, + "lineto": 727, "args": [ { "name": "repo", @@ -17289,8 +17482,8 @@ "git_repository_ident": { "type": "function", "file": "repository.h", - "line": 737, - "lineto": 737, + "line": 739, + "lineto": 739, "args": [ { "name": "name", @@ -17315,14 +17508,14 @@ "comment": null }, "description": "

Retrieve the configured identity to use for reflogs

\n", - "comments": "

The memory is owned by the repository and must not be freed by the\n user.

\n", + "comments": "

The memory is owned by the repository and must not be freed by the user.

\n", "group": "repository" }, "git_repository_set_ident": { "type": "function", "file": "repository.h", - "line": 750, - "lineto": 750, + "line": 752, + "lineto": 752, "args": [ { "name": "repo", @@ -17347,7 +17540,7 @@ "comment": null }, "description": "

Set the identity to be used for writing reflogs

\n", - "comments": "

If both are set, this name and email will be used to write to the\n reflog. Pass NULL to unset. When unset, the identity will be taken\n from the repository's configuration.

\n", + "comments": "

If both are set, this name and email will be used to write to the reflog. Pass NULL to unset. When unset, the identity will be taken from the repository's configuration.

\n", "group": "repository" }, "git_reset": { @@ -17384,7 +17577,7 @@ "comment": " 0 on success or an error code" }, "description": "

Sets the current head to the specified commit oid and optionally\n resets the index and working tree to match.

\n", - "comments": "

SOFT reset means the Head will be moved to the commit.

\n\n

MIXED reset will trigger a SOFT reset, plus the index will be replaced\n with the content of the commit tree.

\n\n

HARD reset will trigger a MIXED reset and the working directory will be\n replaced with the content of the index. (Untracked and ignored files\n will be left alone, however.)

\n\n

TODO: Implement remaining kinds of resets.

\n", + "comments": "

SOFT reset means the Head will be moved to the commit.

\n\n

MIXED reset will trigger a SOFT reset, plus the index will be replaced with the content of the commit tree.

\n\n

HARD reset will trigger a MIXED reset and the working directory will be replaced with the content of the index. (Untracked and ignored files will be left alone, however.)

\n\n

TODO: Implement remaining kinds of resets.

\n", "group": "reset" }, "git_reset_from_annotated": { @@ -17421,7 +17614,7 @@ "comment": null }, "description": "

Sets the current head to the specified commit oid and optionally\n resets the index and working tree to match.

\n", - "comments": "

This behaves like git_reset() but takes an annotated commit,\n which lets you specify which extended sha syntax string was\n specified by a user, allowing for more exact reflog messages.

\n\n

See the documentation for git_reset().

\n", + "comments": "

This behaves like git_reset() but takes an annotated commit, which lets you specify which extended sha syntax string was specified by a user, allowing for more exact reflog messages.

\n\n

See the documentation for git_reset().

\n", "group": "reset" }, "git_reset_default": { @@ -17453,7 +17646,7 @@ "comment": " 0 on success or an error code \n<\n 0" }, "description": "

Updates some entries in the index from the target commit tree.

\n", - "comments": "

The scope of the updated entries is determined by the paths\n being passed in the pathspec parameters.

\n\n

Passing a NULL target will result in removing\n entries in the index matching the provided pathspecs.

\n", + "comments": "

The scope of the updated entries is determined by the paths being passed in the pathspec parameters.

\n\n

Passing a NULL target will result in removing entries in the index matching the provided pathspecs.

\n", "group": "reset" }, "git_revert_init_options": { @@ -17591,26 +17784,26 @@ "comment": " 0 on success, GIT_ENOTFOUND, GIT_EAMBIGUOUS, GIT_EINVALIDSPEC or an error code" }, "description": "

Find a single object, as specified by a revision string.

\n", - "comments": "

See man gitrevisions, or\n http://git-scm.com/docs/git-rev-parse.html#_specifying_revisions for\n information on the syntax accepted.

\n\n

The returned object should be released with git_object_free when no\n longer needed.

\n", + "comments": "

See man gitrevisions, or http://git-scm.com/docs/git-rev-parse.html#_specifying_revisions for information on the syntax accepted.

\n\n

The returned object should be released with git_object_free when no longer needed.

\n", "group": "revparse", "examples": { "blame.c": [ - "ex/v0.23.2/blame.html#git_revparse_single-26" + "ex/v0.24.1/blame.html#git_revparse_single-26" ], "cat-file.c": [ - "ex/v0.23.2/cat-file.html#git_revparse_single-34" + "ex/v0.24.1/cat-file.html#git_revparse_single-34" ], "describe.c": [ - "ex/v0.23.2/describe.html#git_revparse_single-8" + "ex/v0.24.1/describe.html#git_revparse_single-8" ], "log.c": [ - "ex/v0.23.2/log.html#git_revparse_single-47" + "ex/v0.24.1/log.html#git_revparse_single-47" ], "tag.c": [ - "ex/v0.23.2/tag.html#git_revparse_single-13", - "ex/v0.23.2/tag.html#git_revparse_single-14", - "ex/v0.23.2/tag.html#git_revparse_single-15", - "ex/v0.23.2/tag.html#git_revparse_single-16" + "ex/v0.24.1/tag.html#git_revparse_single-13", + "ex/v0.24.1/tag.html#git_revparse_single-14", + "ex/v0.24.1/tag.html#git_revparse_single-15", + "ex/v0.24.1/tag.html#git_revparse_single-16" ] } }, @@ -17648,7 +17841,7 @@ "comment": " 0 on success, GIT_ENOTFOUND, GIT_EAMBIGUOUS, GIT_EINVALIDSPEC\n or an error code" }, "description": "

Find a single object and intermediate reference by a revision string.

\n", - "comments": "

See man gitrevisions, or\n http://git-scm.com/docs/git-rev-parse.html#_specifying_revisions for\n information on the syntax accepted.

\n\n

In some cases (\n@\n{\n<\n-n>} or `\n<branchname

\n\n
\n

@\n{upstream}), the expression may\n point to an intermediate reference. When such expressions are being passed\n in,reference_out` will be valued as well.

\n
\n\n

The returned object should be released with git_object_free and the\n returned reference with git_reference_free when no longer needed.

\n", + "comments": "

See man gitrevisions, or http://git-scm.com/docs/git-rev-parse.html#_specifying_revisions for information on the syntax accepted.

\n\n

In some cases (@{<-n>} or <branchname>@{upstream}), the expression may point to an intermediate reference. When such expressions are being passed in, reference_out will be valued as well.

\n\n

The returned object should be released with git_object_free and the returned reference with git_reference_free when no longer needed.

\n", "group": "revparse" }, "git_revparse": { @@ -17680,18 +17873,18 @@ "comment": " 0 on success, GIT_INVALIDSPEC, GIT_ENOTFOUND, GIT_EAMBIGUOUS or an error code" }, "description": "

Parse a revision string for from, to, and intent.

\n", - "comments": "

See man gitrevisions or\n http://git-scm.com/docs/git-rev-parse.html#_specifying_revisions for\n information on the syntax accepted.

\n", + "comments": "

See man gitrevisions or http://git-scm.com/docs/git-rev-parse.html#_specifying_revisions for information on the syntax accepted.

\n", "group": "revparse", "examples": { "blame.c": [ - "ex/v0.23.2/blame.html#git_revparse-27" + "ex/v0.24.1/blame.html#git_revparse-27" ], "log.c": [ - "ex/v0.23.2/log.html#git_revparse-48" + "ex/v0.24.1/log.html#git_revparse-48" ], "rev-parse.c": [ - "ex/v0.23.2/rev-parse.html#git_revparse-18", - "ex/v0.23.2/rev-parse.html#git_revparse-19" + "ex/v0.24.1/rev-parse.html#git_revparse-18", + "ex/v0.24.1/rev-parse.html#git_revparse-19" ] } }, @@ -17719,15 +17912,15 @@ "comment": " 0 or an error code" }, "description": "

Allocate a new revision walker to iterate through a repo.

\n", - "comments": "

This revision walker uses a custom memory pool and an internal\n commit cache, so it is relatively expensive to allocate.

\n\n

For maximum performance, this revision walker should be\n reused for different walks.

\n\n

This revision walker is not thread safe: it may only be\n used to walk a repository on a single thread; however,\n it is possible to have several revision walkers in\n several different threads walking the same repository.

\n", + "comments": "

This revision walker uses a custom memory pool and an internal commit cache, so it is relatively expensive to allocate.

\n\n

For maximum performance, this revision walker should be reused for different walks.

\n\n

This revision walker is not thread safe: it may only be used to walk a repository on a single thread; however, it is possible to have several revision walkers in several different threads walking the same repository.

\n", "group": "revwalk", "examples": { "general.c": [ - "ex/v0.23.2/general.html#git_revwalk_new-62" + "ex/v0.24.1/general.html#git_revwalk_new-62" ], "log.c": [ - "ex/v0.23.2/log.html#git_revwalk_new-49", - "ex/v0.23.2/log.html#git_revwalk_new-50" + "ex/v0.24.1/log.html#git_revwalk_new-49", + "ex/v0.24.1/log.html#git_revwalk_new-50" ] } }, @@ -17750,7 +17943,7 @@ "comment": null }, "description": "

Reset the revision walker for reuse.

\n", - "comments": "

This will clear all the pushed and hidden commits, and\n leave the walker in a blank state (just like at\n creation) ready to receive new commit pushes and\n start a new walk.

\n\n

The revision walk is automatically reset when a walk\n is over.

\n", + "comments": "

This will clear all the pushed and hidden commits, and leave the walker in a blank state (just like at creation) ready to receive new commit pushes and start a new walk.

\n\n

The revision walk is automatically reset when a walk is over.

\n", "group": "revwalk" }, "git_revwalk_push": { @@ -17777,14 +17970,14 @@ "comment": " 0 or an error code" }, "description": "

Add a new root for the traversal

\n", - "comments": "

The pushed commit will be marked as one of the roots from which to\n start the walk. This commit may not be walked if it or a child is\n hidden.

\n\n

At least one commit must be pushed onto the walker before a walk\n can be started.

\n\n

The given id must belong to a committish on the walked\n repository.

\n", + "comments": "

The pushed commit will be marked as one of the roots from which to start the walk. This commit may not be walked if it or a child is hidden.

\n\n

At least one commit must be pushed onto the walker before a walk can be started.

\n\n

The given id must belong to a committish on the walked repository.

\n", "group": "revwalk", "examples": { "general.c": [ - "ex/v0.23.2/general.html#git_revwalk_push-63" + "ex/v0.24.1/general.html#git_revwalk_push-63" ], "log.c": [ - "ex/v0.23.2/log.html#git_revwalk_push-51" + "ex/v0.24.1/log.html#git_revwalk_push-51" ] } }, @@ -17812,7 +18005,7 @@ "comment": " 0 or an error code" }, "description": "

Push matching references

\n", - "comments": "

The OIDs pointed to by the references that match the given glob\n pattern will be pushed to the revision walker.

\n\n

A leading 'refs/' is implied if not present as well as a trailing\n '/\n\\\n*' if the glob lacks '?', '\n\\\n*' or '['.

\n\n

Any references matching this glob which do not point to a\n committish will be ignored.

\n", + "comments": "

The OIDs pointed to by the references that match the given glob pattern will be pushed to the revision walker.

\n\n

A leading 'refs/' is implied if not present as well as a trailing '/*' if the glob lacks '?', '*' or '['.

\n\n

Any references matching this glob which do not point to a committish will be ignored.

\n", "group": "revwalk" }, "git_revwalk_push_head": { @@ -17838,7 +18031,7 @@ "group": "revwalk", "examples": { "log.c": [ - "ex/v0.23.2/log.html#git_revwalk_push_head-52" + "ex/v0.24.1/log.html#git_revwalk_push_head-52" ] } }, @@ -17866,11 +18059,11 @@ "comment": " 0 or an error code" }, "description": "

Mark a commit (and its ancestors) uninteresting for the output.

\n", - "comments": "

The given id must belong to a committish on the walked\n repository.

\n\n

The resolved commit and all its parents will be hidden from the\n output on the revision walk.

\n", + "comments": "

The given id must belong to a committish on the walked repository.

\n\n

The resolved commit and all its parents will be hidden from the output on the revision walk.

\n", "group": "revwalk", "examples": { "log.c": [ - "ex/v0.23.2/log.html#git_revwalk_hide-53" + "ex/v0.24.1/log.html#git_revwalk_hide-53" ] } }, @@ -17898,7 +18091,7 @@ "comment": " 0 or an error code" }, "description": "

Hide matching references.

\n", - "comments": "

The OIDs pointed to by the references that match the given glob\n pattern and their ancestors will be hidden from the output on the\n revision walk.

\n\n

A leading 'refs/' is implied if not present as well as a trailing\n '/\n\\\n*' if the glob lacks '?', '\n\\\n*' or '['.

\n\n

Any references matching this glob which do not point to a\n committish will be ignored.

\n", + "comments": "

The OIDs pointed to by the references that match the given glob pattern and their ancestors will be hidden from the output on the revision walk.

\n\n

A leading 'refs/' is implied if not present as well as a trailing '/*' if the glob lacks '?', '*' or '['.

\n\n

Any references matching this glob which do not point to a committish will be ignored.

\n", "group": "revwalk" }, "git_revwalk_hide_head": { @@ -18001,14 +18194,14 @@ "comment": " 0 if the next commit was found;\n\tGIT_ITEROVER if there are no commits left to iterate" }, "description": "

Get the next commit from the revision walk.

\n", - "comments": "

The initial call to this method is not blocking when\n iterating through a repo with a time-sorting mode.

\n\n

Iterating with Topological or inverted modes makes the initial\n call blocking to preprocess the commit list, but this block should be\n mostly unnoticeable on most repositories (topological preprocessing\n times at 0.3s on the git.git repo).

\n\n

The revision walker is reset when the walk is over.

\n", + "comments": "

The initial call to this method is not blocking when iterating through a repo with a time-sorting mode.

\n\n

Iterating with Topological or inverted modes makes the initial call blocking to preprocess the commit list, but this block should be mostly unnoticeable on most repositories (topological preprocessing times at 0.3s on the git.git repo).

\n\n

The revision walker is reset when the walk is over.

\n", "group": "revwalk", "examples": { "general.c": [ - "ex/v0.23.2/general.html#git_revwalk_next-64" + "ex/v0.24.1/general.html#git_revwalk_next-64" ], "log.c": [ - "ex/v0.23.2/log.html#git_revwalk_next-54" + "ex/v0.24.1/log.html#git_revwalk_next-54" ] } }, @@ -18040,11 +18233,11 @@ "group": "revwalk", "examples": { "general.c": [ - "ex/v0.23.2/general.html#git_revwalk_sorting-65" + "ex/v0.24.1/general.html#git_revwalk_sorting-65" ], "log.c": [ - "ex/v0.23.2/log.html#git_revwalk_sorting-55", - "ex/v0.23.2/log.html#git_revwalk_sorting-56" + "ex/v0.24.1/log.html#git_revwalk_sorting-55", + "ex/v0.24.1/log.html#git_revwalk_sorting-56" ] } }, @@ -18072,7 +18265,7 @@ "comment": " 0 or an error code" }, "description": "

Push and hide the respective endpoints of the given range.

\n", - "comments": "

The range should be of the form

\n\n

<commit

\n\n
\n

..\n<commit

\n\n

where each \n<commit\nis in the form accepted by 'git_revparse_single'.\n The left-hand commit will be hidden and the right-hand commit pushed.

\n
\n", + "comments": "

The range should be of the form .. where each is in the form accepted by 'git_revparse_single'. The left-hand commit will be hidden and the right-hand commit pushed.

\n", "group": "revwalk" }, "git_revwalk_simplify_first_parent": { @@ -18120,10 +18313,10 @@ "group": "revwalk", "examples": { "general.c": [ - "ex/v0.23.2/general.html#git_revwalk_free-66" + "ex/v0.24.1/general.html#git_revwalk_free-66" ], "log.c": [ - "ex/v0.23.2/log.html#git_revwalk_free-57" + "ex/v0.24.1/log.html#git_revwalk_free-57" ] } }, @@ -18220,12 +18413,12 @@ "comment": " 0 or an error code" }, "description": "

Create a new action signature.

\n", - "comments": "

Call git_signature_free() to free the data.

\n\n

Note: angle brackets ('\n<\n' and '>') characters are not allowed\n to be used in either the name or the email parameter.

\n", + "comments": "

Call git_signature_free() to free the data.

\n\n

Note: angle brackets ('<' and '>') characters are not allowed to be used in either the name or the email parameter.

\n", "group": "signature", "examples": { "general.c": [ - "ex/v0.23.2/general.html#git_signature_new-67", - "ex/v0.23.2/general.html#git_signature_new-68" + "ex/v0.24.1/general.html#git_signature_new-67", + "ex/v0.24.1/general.html#git_signature_new-68" ] } }, @@ -18285,14 +18478,14 @@ "comment": " 0 on success, GIT_ENOTFOUND if config is missing, or error code" }, "description": "

Create a new action signature with default user and now timestamp.

\n", - "comments": "

This looks up the user.name and user.email from the configuration and\n uses the current time as the timestamp, and creates a new signature\n based on that information. It will return GIT_ENOTFOUND if either the\n user.name or user.email are not set.

\n", + "comments": "

This looks up the user.name and user.email from the configuration and uses the current time as the timestamp, and creates a new signature based on that information. It will return GIT_ENOTFOUND if either the user.name or user.email are not set.

\n", "group": "signature", "examples": { "init.c": [ - "ex/v0.23.2/init.html#git_signature_default-12" + "ex/v0.24.1/init.html#git_signature_default-12" ], "tag.c": [ - "ex/v0.23.2/tag.html#git_signature_default-17" + "ex/v0.24.1/tag.html#git_signature_default-17" ] } }, @@ -18342,14 +18535,14 @@ "comment": null }, "description": "

Free an existing signature.

\n", - "comments": "

Because the signature is not an opaque structure, it is legal to free it\n manually, but be sure to free the "name" and "email" strings in addition\n to the structure itself.

\n", + "comments": "

Because the signature is not an opaque structure, it is legal to free it manually, but be sure to free the "name" and "email" strings in addition to the structure itself.

\n", "group": "signature", "examples": { "init.c": [ - "ex/v0.23.2/init.html#git_signature_free-13" + "ex/v0.24.1/init.html#git_signature_free-13" ], "tag.c": [ - "ex/v0.23.2/tag.html#git_signature_free-18" + "ex/v0.24.1/tag.html#git_signature_free-18" ] } }, @@ -18409,7 +18602,7 @@ "comment": " 0 on success, GIT_ENOTFOUND if there's no stashed state for the\n given index, GIT_EMERGECONFLICT if changes exist in the working\n directory, or an error code" }, "description": "

Apply a single stashed state from the stash list.

\n", - "comments": "

If local changes in the working directory conflict with changes in the\n stash then GIT_EMERGECONFLICT will be returned. In this case, the index\n will always remain unmodified and all files in the working directory will\n remain unmodified. However, if you are restoring untracked files or\n ignored files and there is a conflict when applying the modified files,\n then those files will remain in the working directory.

\n\n

If passing the GIT_STASH_APPLY_REINSTATE_INDEX flag and there would be\n conflicts when reinstating the index, the function will return\n GIT_EMERGECONFLICT and both the working directory and index will be left\n unmodified.

\n\n

Note that a minimum checkout strategy of GIT_CHECKOUT_SAFE is implied.

\n", + "comments": "

If local changes in the working directory conflict with changes in the stash then GIT_EMERGECONFLICT will be returned. In this case, the index will always remain unmodified and all files in the working directory will remain unmodified. However, if you are restoring untracked files or ignored files and there is a conflict when applying the modified files, then those files will remain in the working directory.

\n\n

If passing the GIT_STASH_APPLY_REINSTATE_INDEX flag and there would be conflicts when reinstating the index, the function will return GIT_EMERGECONFLICT and both the working directory and index will be left unmodified.

\n\n

Note that a minimum checkout strategy of GIT_CHECKOUT_SAFE is implied.

\n", "group": "stash" }, "git_stash_foreach": { @@ -18559,11 +18752,11 @@ "comment": " 0 on success, non-zero callback return value, or error code" }, "description": "

Gather file statuses and run a callback for each one.

\n", - "comments": "

The callback is passed the path of the file, the status (a combination of\n the git_status_t values above) and the payload data pointer passed\n into this function.

\n\n

If the callback returns a non-zero value, this function will stop looping\n and return that value to caller.

\n", + "comments": "

The callback is passed the path of the file, the status (a combination of the git_status_t values above) and the payload data pointer passed into this function.

\n\n

If the callback returns a non-zero value, this function will stop looping and return that value to caller.

\n", "group": "status", "examples": { "status.c": [ - "ex/v0.23.2/status.html#git_status_foreach-10" + "ex/v0.24.1/status.html#git_status_foreach-10" ] } }, @@ -18601,11 +18794,11 @@ "comment": " 0 on success, non-zero callback return value, or error code" }, "description": "

Gather file status information and run callbacks as requested.

\n", - "comments": "

This is an extended version of the git_status_foreach() API that\n allows for more granular control over which paths will be processed and\n in what order. See the git_status_options structure for details\n about the additional controls that this makes available.

\n\n

Note that if a pathspec is given in the git_status_options to filter\n the status, then the results from rename detection (if you enable it) may\n not be accurate. To do rename detection properly, this must be called\n with no pathspec so that all files can be considered.

\n", + "comments": "

This is an extended version of the git_status_foreach() API that allows for more granular control over which paths will be processed and in what order. See the git_status_options structure for details about the additional controls that this makes available.

\n\n

Note that if a pathspec is given in the git_status_options to filter the status, then the results from rename detection (if you enable it) may not be accurate. To do rename detection properly, this must be called with no pathspec so that all files can be considered.

\n", "group": "status", "examples": { "status.c": [ - "ex/v0.23.2/status.html#git_status_foreach_ext-11" + "ex/v0.24.1/status.html#git_status_foreach_ext-11" ] } }, @@ -18638,7 +18831,7 @@ "comment": " 0 on success, GIT_ENOTFOUND if the file is not found in the HEAD,\n index, and work tree, GIT_EAMBIGUOUS if `path` matches multiple files\n or if it refers to a folder, and -1 on other errors." }, "description": "

Get file status for a single file.

\n", - "comments": "

This tries to get status for the filename that you give. If no files\n match that name (in either the HEAD, index, or working directory), this\n returns GIT_ENOTFOUND.

\n\n

If the name matches multiple files (for example, if the path names a\n directory or if running on a case- insensitive filesystem and yet the\n HEAD has two entries that both match the path), then this returns\n GIT_EAMBIGUOUS because it cannot give correct results.

\n\n

This does not do any sort of rename detection. Renames require a set of\n targets and because of the path filtering, there is not enough\n information to check renames correctly. To check file status with rename\n detection, there is no choice but to do a full git_status_list_new and\n scan through looking for the path that you are interested in.

\n", + "comments": "

This tries to get status for the filename that you give. If no files match that name (in either the HEAD, index, or working directory), this returns GIT_ENOTFOUND.

\n\n

If the name matches multiple files (for example, if the path names a directory or if running on a case- insensitive filesystem and yet the HEAD has two entries that both match the path), then this returns GIT_EAMBIGUOUS because it cannot give correct results.

\n\n

This does not do any sort of rename detection. Renames require a set of targets and because of the path filtering, there is not enough information to check renames correctly. To check file status with rename detection, there is no choice but to do a full git_status_list_new and scan through looking for the path that you are interested in.

\n", "group": "status" }, "git_status_list_new": { @@ -18670,12 +18863,12 @@ "comment": " 0 on success or error code" }, "description": "

Gather file status information and populate the git_status_list.

\n", - "comments": "

Note that if a pathspec is given in the git_status_options to filter\n the status, then the results from rename detection (if you enable it) may\n not be accurate. To do rename detection properly, this must be called\n with no pathspec so that all files can be considered.

\n", + "comments": "

Note that if a pathspec is given in the git_status_options to filter the status, then the results from rename detection (if you enable it) may not be accurate. To do rename detection properly, this must be called with no pathspec so that all files can be considered.

\n", "group": "status", "examples": { "status.c": [ - "ex/v0.23.2/status.html#git_status_list_new-12", - "ex/v0.23.2/status.html#git_status_list_new-13" + "ex/v0.24.1/status.html#git_status_list_new-12", + "ex/v0.24.1/status.html#git_status_list_new-13" ] } }, @@ -18698,12 +18891,12 @@ "comment": " the number of status entries" }, "description": "

Gets the count of status entries in this list.

\n", - "comments": "

If there are no changes in status (at least according the options given\n when the status list was created), this can return 0.

\n", + "comments": "

If there are no changes in status (at least according the options given when the status list was created), this can return 0.

\n", "group": "status", "examples": { "status.c": [ - "ex/v0.23.2/status.html#git_status_list_entrycount-14", - "ex/v0.23.2/status.html#git_status_list_entrycount-15" + "ex/v0.24.1/status.html#git_status_list_entrycount-14", + "ex/v0.24.1/status.html#git_status_list_entrycount-15" ] } }, @@ -18735,12 +18928,12 @@ "group": "status", "examples": { "status.c": [ - "ex/v0.23.2/status.html#git_status_byindex-16", - "ex/v0.23.2/status.html#git_status_byindex-17", - "ex/v0.23.2/status.html#git_status_byindex-18", - "ex/v0.23.2/status.html#git_status_byindex-19", - "ex/v0.23.2/status.html#git_status_byindex-20", - "ex/v0.23.2/status.html#git_status_byindex-21" + "ex/v0.24.1/status.html#git_status_byindex-16", + "ex/v0.24.1/status.html#git_status_byindex-17", + "ex/v0.24.1/status.html#git_status_byindex-18", + "ex/v0.24.1/status.html#git_status_byindex-19", + "ex/v0.24.1/status.html#git_status_byindex-20", + "ex/v0.24.1/status.html#git_status_byindex-21" ] } }, @@ -18767,7 +18960,7 @@ "group": "status", "examples": { "status.c": [ - "ex/v0.23.2/status.html#git_status_list_free-22" + "ex/v0.24.1/status.html#git_status_list_free-22" ] } }, @@ -18800,7 +18993,7 @@ "comment": " 0 if ignore rules could be processed for the file (regardless\n of whether it exists or not), or an error \n<\n 0 if they could not." }, "description": "

Test if the ignore rules apply to a given file.

\n", - "comments": "

This function checks the ignore rules to see if they would apply to the\n given file. This indicates if the file would be ignored regardless of\n whether the file is already in the index or committed to the repository.

\n\n

One way to think of this is if you were to do "git add ." on the\n directory containing the file, would it be added or not?

\n", + "comments": "

This function checks the ignore rules to see if they would apply to the given file. This indicates if the file would be ignored regardless of whether the file is already in the index or committed to the repository.

\n\n

One way to think of this is if you were to do "git add ." on the directory containing the file, would it be added or not?

\n", "group": "status" }, "git_strarray_free": { @@ -18822,18 +19015,18 @@ "comment": null }, "description": "

Close a string array object

\n", - "comments": "

This method should be called on git_strarray objects where the strings\n array is allocated and contains allocated strings, such as what you\n would get from git_strarray_copy(). Not doing so, will result in a\n memory leak.

\n\n

This does not free the git_strarray itself, since the library will\n never allocate that object directly itself (it is more commonly embedded\n inside another struct or created on the stack).

\n", + "comments": "

This method should be called on git_strarray objects where the strings array is allocated and contains allocated strings, such as what you would get from git_strarray_copy(). Not doing so, will result in a memory leak.

\n\n

This does not free the git_strarray itself, since the library will never allocate that object directly itself (it is more commonly embedded inside another struct or created on the stack).

\n", "group": "strarray", "examples": { "general.c": [ - "ex/v0.23.2/general.html#git_strarray_free-69" + "ex/v0.24.1/general.html#git_strarray_free-69" ], "remote.c": [ - "ex/v0.23.2/remote.html#git_strarray_free-16", - "ex/v0.23.2/remote.html#git_strarray_free-17" + "ex/v0.24.1/remote.html#git_strarray_free-16", + "ex/v0.24.1/remote.html#git_strarray_free-17" ], "tag.c": [ - "ex/v0.23.2/tag.html#git_strarray_free-19" + "ex/v0.24.1/tag.html#git_strarray_free-19" ] } }, @@ -18861,14 +19054,14 @@ "comment": " 0 on success, \n<\n 0 on allocation failure" }, "description": "

Copy a string array object from source to target.

\n", - "comments": "

Note: target is overwritten and hence should be empty, otherwise its\n contents are leaked. Call git_strarray_free() if necessary.

\n", + "comments": "

Note: target is overwritten and hence should be empty, otherwise its contents are leaked. Call git_strarray_free() if necessary.

\n", "group": "strarray" }, "git_submodule_update_init_options": { "type": "function", "file": "submodule.h", - "line": 162, - "lineto": 163, + "line": 173, + "lineto": 174, "args": [ { "name": "opts", @@ -18894,8 +19087,8 @@ "git_submodule_update": { "type": "function", "file": "submodule.h", - "line": 181, - "lineto": 181, + "line": 192, + "lineto": 192, "args": [ { "name": "submodule", @@ -18926,8 +19119,8 @@ "git_submodule_lookup": { "type": "function", "file": "submodule.h", - "line": 210, - "lineto": 213, + "line": 221, + "lineto": 224, "args": [ { "name": "out", @@ -18952,14 +19145,14 @@ "comment": " 0 on success, GIT_ENOTFOUND if submodule does not exist,\n GIT_EEXISTS if a repository is found in working directory only,\n -1 on other errors." }, "description": "

Lookup submodule information by name or path.

\n", - "comments": "

Given either the submodule name or path (they are usually the same), this\n returns a structure describing the submodule.

\n\n

There are two expected error scenarios:

\n\n
    \n
  • The submodule is not mentioned in the HEAD, the index, and the config,\nbut does "exist" in the working directory (i.e. there is a subdirectory\nthat appears to be a Git repository). In this case, this function\nreturns GIT_EEXISTS to indicate a sub-repository exists but not in a\nstate where a git_submodule can be instantiated.
    • \n
  • The submodule is not mentioned in the HEAD, index, or config and the\nworking directory doesn't contain a value git repo at that path.\nThere may or may not be anything else at that path, but nothing that\nlooks like a submodule. In this case, this returns GIT_ENOTFOUND.
    • \n
\n\n

You must call git_submodule_free when done with the submodule.

\n", + "comments": "

Given either the submodule name or path (they are usually the same), this returns a structure describing the submodule.

\n\n

There are two expected error scenarios:

\n\n
    \n
  • The submodule is not mentioned in the HEAD, the index, and the config, but does "exist" in the working directory (i.e. there is a subdirectory that appears to be a Git repository). In this case, this function returns GIT_EEXISTS to indicate a sub-repository exists but not in a state where a git_submodule can be instantiated. - The submodule is not mentioned in the HEAD, index, or config and the working directory doesn't contain a value git repo at that path. There may or may not be anything else at that path, but nothing that looks like a submodule. In this case, this returns GIT_ENOTFOUND.
    • \n
\n\n

You must call git_submodule_free when done with the submodule.

\n", "group": "submodule" }, "git_submodule_free": { "type": "function", "file": "submodule.h", - "line": 220, - "lineto": 220, + "line": 231, + "lineto": 231, "args": [ { "name": "submodule", @@ -18980,8 +19173,8 @@ "git_submodule_foreach": { "type": "function", "file": "submodule.h", - "line": 240, - "lineto": 243, + "line": 251, + "lineto": 254, "args": [ { "name": "repo", @@ -18990,7 +19183,7 @@ }, { "name": "callback", - "type": "int (*)(git_submodule *, const char *, void *)", + "type": "git_submodule_cb", "comment": "Function to be called with the name of each submodule.\n Return a non-zero value to terminate the iteration." }, { @@ -18999,26 +19192,26 @@ "comment": "Extra data to pass to callback" } ], - "argline": "git_repository *repo, int (*)(git_submodule *, const char *, void *) callback, void *payload", - "sig": "git_repository *::int (*)(git_submodule *, const char *, void *)::void *", + "argline": "git_repository *repo, git_submodule_cb callback, void *payload", + "sig": "git_repository *::git_submodule_cb::void *", "return": { "type": "int", "comment": " 0 on success, -1 on error, or non-zero return value of callback" }, "description": "

Iterate over all tracked submodules of a repository.

\n", - "comments": "

See the note on git_submodule above. This iterates over the tracked\n submodules as described therein.

\n\n

If you are concerned about items in the working directory that look like\n submodules but are not tracked, the diff API will generate a diff record\n for workdir items that look like submodules but are not tracked, showing\n them as added in the workdir. Also, the status API will treat the entire\n subdirectory of a contained git repo as a single GIT_STATUS_WT_NEW item.

\n", + "comments": "

See the note on git_submodule above. This iterates over the tracked submodules as described therein.

\n\n

If you are concerned about items in the working directory that look like submodules but are not tracked, the diff API will generate a diff record for workdir items that look like submodules but are not tracked, showing them as added in the workdir. Also, the status API will treat the entire subdirectory of a contained git repo as a single GIT_STATUS_WT_NEW item.

\n", "group": "submodule", "examples": { "status.c": [ - "ex/v0.23.2/status.html#git_submodule_foreach-23" + "ex/v0.24.1/status.html#git_submodule_foreach-23" ] } }, "git_submodule_add_setup": { "type": "function", "file": "submodule.h", - "line": 270, - "lineto": 275, + "line": 281, + "lineto": 286, "args": [ { "name": "out", @@ -19053,14 +19246,14 @@ "comment": " 0 on success, GIT_EEXISTS if submodule already exists,\n -1 on other errors." }, "description": "

Set up a new git submodule for checkout.

\n", - "comments": "

This does "git submodule add" up to the fetch and checkout of the\n submodule contents. It preps a new submodule, creates an entry in\n .gitmodules and creates an empty initialized repository either at the\n given path in the working directory or in .git/modules with a gitlink\n from the working directory to the new repo.

\n\n

To fully emulate "git submodule add" call this function, then open the\n submodule repo and perform the clone step as needed. Lastly, call\n git_submodule_add_finalize() to wrap up adding the new submodule and\n .gitmodules to the index to be ready to commit.

\n\n

You must call git_submodule_free on the submodule object when done.

\n", + "comments": "

This does "git submodule add" up to the fetch and checkout of the submodule contents. It preps a new submodule, creates an entry in .gitmodules and creates an empty initialized repository either at the given path in the working directory or in .git/modules with a gitlink from the working directory to the new repo.

\n\n

To fully emulate "git submodule add" call this function, then open the submodule repo and perform the clone step as needed. Lastly, call git_submodule_add_finalize() to wrap up adding the new submodule and .gitmodules to the index to be ready to commit.

\n\n

You must call git_submodule_free on the submodule object when done.

\n", "group": "submodule" }, "git_submodule_add_finalize": { "type": "function", "file": "submodule.h", - "line": 287, - "lineto": 287, + "line": 298, + "lineto": 298, "args": [ { "name": "submodule", @@ -19075,14 +19268,14 @@ "comment": null }, "description": "

Resolve the setup of a new git submodule.

\n", - "comments": "

This should be called on a submodule once you have called add setup\n and done the clone of the submodule. This adds the .gitmodules file\n and the newly cloned submodule to the index to be ready to be committed\n (but doesn't actually do the commit).

\n", + "comments": "

This should be called on a submodule once you have called add setup and done the clone of the submodule. This adds the .gitmodules file and the newly cloned submodule to the index to be ready to be committed (but doesn't actually do the commit).

\n", "group": "submodule" }, "git_submodule_add_to_index": { "type": "function", "file": "submodule.h", - "line": 299, - "lineto": 301, + "line": 310, + "lineto": 312, "args": [ { "name": "submodule", @@ -19108,8 +19301,8 @@ "git_submodule_owner": { "type": "function", "file": "submodule.h", - "line": 314, - "lineto": 314, + "line": 325, + "lineto": 325, "args": [ { "name": "submodule", @@ -19124,14 +19317,14 @@ "comment": " Pointer to `git_repository`" }, "description": "

Get the containing repository for a submodule.

\n", - "comments": "

This returns a pointer to the repository that contains the submodule.\n This is a just a reference to the repository that was passed to the\n original git_submodule_lookup() call, so if that repository has been\n freed, then this may be a dangling reference.

\n", + "comments": "

This returns a pointer to the repository that contains the submodule. This is a just a reference to the repository that was passed to the original git_submodule_lookup() call, so if that repository has been freed, then this may be a dangling reference.

\n", "group": "submodule" }, "git_submodule_name": { "type": "function", "file": "submodule.h", - "line": 322, - "lineto": 322, + "line": 333, + "lineto": 333, "args": [ { "name": "submodule", @@ -19150,15 +19343,15 @@ "group": "submodule", "examples": { "status.c": [ - "ex/v0.23.2/status.html#git_submodule_name-24" + "ex/v0.24.1/status.html#git_submodule_name-24" ] } }, "git_submodule_path": { "type": "function", "file": "submodule.h", - "line": 333, - "lineto": 333, + "line": 344, + "lineto": 344, "args": [ { "name": "submodule", @@ -19173,19 +19366,19 @@ "comment": " Pointer to the submodule path" }, "description": "

Get the path to the submodule.

\n", - "comments": "

The path is almost always the same as the submodule name, but the\n two are actually not required to match.

\n", + "comments": "

The path is almost always the same as the submodule name, but the two are actually not required to match.

\n", "group": "submodule", "examples": { "status.c": [ - "ex/v0.23.2/status.html#git_submodule_path-25" + "ex/v0.24.1/status.html#git_submodule_path-25" ] } }, "git_submodule_url": { "type": "function", "file": "submodule.h", - "line": 341, - "lineto": 341, + "line": 352, + "lineto": 352, "args": [ { "name": "submodule", @@ -19206,8 +19399,8 @@ "git_submodule_resolve_url": { "type": "function", "file": "submodule.h", - "line": 351, - "lineto": 351, + "line": 362, + "lineto": 362, "args": [ { "name": "out", @@ -19238,8 +19431,8 @@ "git_submodule_branch": { "type": "function", "file": "submodule.h", - "line": 359, - "lineto": 359, + "line": 370, + "lineto": 370, "args": [ { "name": "submodule", @@ -19260,8 +19453,8 @@ "git_submodule_set_branch": { "type": "function", "file": "submodule.h", - "line": 372, - "lineto": 372, + "line": 383, + "lineto": 383, "args": [ { "name": "repo", @@ -19286,14 +19479,14 @@ "comment": " 0 on success, \n<\n0 on failure" }, "description": "

Set the branch for the submodule in the configuration

\n", - "comments": "

After calling this, you may wish to call git_submodule_sync() to\n write the changes to the checked out submodule repository.

\n", + "comments": "

After calling this, you may wish to call git_submodule_sync() to write the changes to the checked out submodule repository.

\n", "group": "submodule" }, "git_submodule_set_url": { "type": "function", "file": "submodule.h", - "line": 386, - "lineto": 386, + "line": 397, + "lineto": 397, "args": [ { "name": "repo", @@ -19318,14 +19511,14 @@ "comment": " 0 on success, \n<\n0 on failure" }, "description": "

Set the URL for the submodule in the configuration

\n", - "comments": "

After calling this, you may wish to call git_submodule_sync() to\n write the changes to the checked out submodule repository.

\n", + "comments": "

After calling this, you may wish to call git_submodule_sync() to write the changes to the checked out submodule repository.

\n", "group": "submodule" }, "git_submodule_index_id": { "type": "function", "file": "submodule.h", - "line": 394, - "lineto": 394, + "line": 405, + "lineto": 405, "args": [ { "name": "submodule", @@ -19346,8 +19539,8 @@ "git_submodule_head_id": { "type": "function", "file": "submodule.h", - "line": 402, - "lineto": 402, + "line": 413, + "lineto": 413, "args": [ { "name": "submodule", @@ -19368,8 +19561,8 @@ "git_submodule_wd_id": { "type": "function", "file": "submodule.h", - "line": 415, - "lineto": 415, + "line": 426, + "lineto": 426, "args": [ { "name": "submodule", @@ -19384,14 +19577,14 @@ "comment": " Pointer to git_oid or NULL if submodule is not checked out." }, "description": "

Get the OID for the submodule in the current working directory.

\n", - "comments": "

This returns the OID that corresponds to looking up 'HEAD' in the checked\n out submodule. If there are pending changes in the index or anything\n else, this won't notice that. You should call git_submodule_status()\n for a more complete picture about the state of the working directory.

\n", + "comments": "

This returns the OID that corresponds to looking up 'HEAD' in the checked out submodule. If there are pending changes in the index or anything else, this won't notice that. You should call git_submodule_status() for a more complete picture about the state of the working directory.

\n", "group": "submodule" }, "git_submodule_ignore": { "type": "function", "file": "submodule.h", - "line": 440, - "lineto": 441, + "line": 451, + "lineto": 452, "args": [ { "name": "submodule", @@ -19406,14 +19599,14 @@ "comment": " The current git_submodule_ignore_t valyue what will be used for\n this submodule." }, "description": "

Get the ignore rule that will be used for the submodule.

\n", - "comments": "

These values control the behavior of git_submodule_status() for this\n submodule. There are four ignore values:

\n\n
    \n
  • GIT_SUBMODULE_IGNORE_NONE will consider any change to the contents\nof the submodule from a clean checkout to be dirty, including the\naddition of untracked files. This is the default if unspecified.
    • \n
  • GIT_SUBMODULE_IGNORE_UNTRACKED examines the contents of the\nworking tree (i.e. call git_status_foreach() on the submodule) but\nUNTRACKED files will not count as making the submodule dirty.
    • \n
  • GIT_SUBMODULE_IGNORE_DIRTY means to only check if the HEAD of the\nsubmodule has moved for status. This is fast since it does not need to\nscan the working tree of the submodule at all.
    • \n
  • GIT_SUBMODULE_IGNORE_ALL means not to open the submodule repo.\nThe working directory will be consider clean so long as there is a\nchecked out version present.
    • \n
\n", + "comments": "

These values control the behavior of git_submodule_status() for this submodule. There are four ignore values:

\n\n
    \n
  • GIT_SUBMODULE_IGNORE_NONE will consider any change to the contents of the submodule from a clean checkout to be dirty, including the addition of untracked files. This is the default if unspecified. - GIT_SUBMODULE_IGNORE_UNTRACKED examines the contents of the working tree (i.e. call git_status_foreach() on the submodule) but UNTRACKED files will not count as making the submodule dirty. - GIT_SUBMODULE_IGNORE_DIRTY means to only check if the HEAD of the submodule has moved for status. This is fast since it does not need to scan the working tree of the submodule at all. - GIT_SUBMODULE_IGNORE_ALL means not to open the submodule repo. The working directory will be consider clean so long as there is a checked out version present.
    • \n
\n", "group": "submodule" }, "git_submodule_set_ignore": { "type": "function", "file": "submodule.h", - "line": 453, - "lineto": 456, + "line": 464, + "lineto": 467, "args": [ { "name": "repo", @@ -19444,8 +19637,8 @@ "git_submodule_update_strategy": { "type": "function", "file": "submodule.h", - "line": 468, - "lineto": 469, + "line": 479, + "lineto": 480, "args": [ { "name": "submodule", @@ -19460,14 +19653,14 @@ "comment": " The current git_submodule_update_t value that will be used\n for this submodule." }, "description": "

Get the update rule that will be used for the submodule.

\n", - "comments": "

This value controls the behavior of the git submodule update command.\n There are four useful values documented with git_submodule_update_t.

\n", + "comments": "

This value controls the behavior of the git submodule update command. There are four useful values documented with git_submodule_update_t.

\n", "group": "submodule" }, "git_submodule_set_update": { "type": "function", "file": "submodule.h", - "line": 481, - "lineto": 484, + "line": 492, + "lineto": 495, "args": [ { "name": "repo", @@ -19498,8 +19691,8 @@ "git_submodule_fetch_recurse_submodules": { "type": "function", "file": "submodule.h", - "line": 497, - "lineto": 498, + "line": 508, + "lineto": 509, "args": [ { "name": "submodule", @@ -19514,14 +19707,14 @@ "comment": " 0 if fetchRecurseSubmodules is false, 1 if true" }, "description": "

Read the fetchRecurseSubmodules rule for a submodule.

\n", - "comments": "

This accesses the submodule.\n<name

\n\n
\n

.fetchRecurseSubmodules value for\n the submodule that controls fetching behavior for the submodule.

\n
\n\n

Note that at this time, libgit2 does not honor this setting and the\n fetch functionality current ignores submodules.

\n", + "comments": "

This accesses the submodule..fetchRecurseSubmodules value for the submodule that controls fetching behavior for the submodule.

\n\n

Note that at this time, libgit2 does not honor this setting and the fetch functionality current ignores submodules.

\n", "group": "submodule" }, "git_submodule_set_fetch_recurse_submodules": { "type": "function", "file": "submodule.h", - "line": 510, - "lineto": 513, + "line": 521, + "lineto": 524, "args": [ { "name": "repo", @@ -19552,8 +19745,8 @@ "git_submodule_init": { "type": "function", "file": "submodule.h", - "line": 528, - "lineto": 528, + "line": 539, + "lineto": 539, "args": [ { "name": "submodule", @@ -19573,14 +19766,14 @@ "comment": " 0 on success, \n<\n0 on failure." }, "description": "

Copy submodule info into ".git/config" file.

\n", - "comments": "

Just like "git submodule init", this copies information about the\n submodule into ".git/config". You can use the accessor functions\n above to alter the in-memory git_submodule object and control what\n is written to the config, overriding what is in .gitmodules.

\n", + "comments": "

Just like "git submodule init", this copies information about the submodule into ".git/config". You can use the accessor functions above to alter the in-memory git_submodule object and control what is written to the config, overriding what is in .gitmodules.

\n", "group": "submodule" }, "git_submodule_repo_init": { "type": "function", "file": "submodule.h", - "line": 543, - "lineto": 546, + "line": 554, + "lineto": 557, "args": [ { "name": "out", @@ -19605,14 +19798,14 @@ "comment": " 0 on success, \n<\n0 on failure." }, "description": "

Set up the subrepository for a submodule in preparation for clone.

\n", - "comments": "

This function can be called to init and set up a submodule\n repository from a submodule in preparation to clone it from\n its remote.

\n", + "comments": "

This function can be called to init and set up a submodule repository from a submodule in preparation to clone it from its remote.

\n", "group": "submodule" }, "git_submodule_sync": { "type": "function", "file": "submodule.h", - "line": 556, - "lineto": 556, + "line": 567, + "lineto": 567, "args": [ { "name": "submodule", @@ -19627,14 +19820,14 @@ "comment": null }, "description": "

Copy submodule remote info into submodule repo.

\n", - "comments": "

This copies the information about the submodules URL into the checked out\n submodule config, acting like "git submodule sync". This is useful if\n you have altered the URL for the submodule (or it has been altered by a\n fetch of upstream changes) and you need to update your local repo.

\n", + "comments": "

This copies the information about the submodules URL into the checked out submodule config, acting like "git submodule sync". This is useful if you have altered the URL for the submodule (or it has been altered by a fetch of upstream changes) and you need to update your local repo.

\n", "group": "submodule" }, "git_submodule_open": { "type": "function", "file": "submodule.h", - "line": 570, - "lineto": 572, + "line": 581, + "lineto": 583, "args": [ { "name": "repo", @@ -19654,14 +19847,14 @@ "comment": " 0 on success, \n<\n0 if submodule repo could not be opened." }, "description": "

Open the repository for a submodule.

\n", - "comments": "

This is a newly opened repository object. The caller is responsible for\n calling git_repository_free() on it when done. Multiple calls to this\n function will return distinct git_repository objects. This will only\n work if the submodule is checked out into the working directory.

\n", + "comments": "

This is a newly opened repository object. The caller is responsible for calling git_repository_free() on it when done. Multiple calls to this function will return distinct git_repository objects. This will only work if the submodule is checked out into the working directory.

\n", "group": "submodule" }, "git_submodule_reload": { "type": "function", "file": "submodule.h", - "line": 584, - "lineto": 584, + "line": 595, + "lineto": 595, "args": [ { "name": "submodule", @@ -19681,14 +19874,14 @@ "comment": " 0 on success, \n<\n0 on error" }, "description": "

Reread submodule info from config, index, and HEAD.

\n", - "comments": "

Call this to reread cached submodule information for this submodule if\n you have reason to believe that it has changed.

\n", + "comments": "

Call this to reread cached submodule information for this submodule if you have reason to believe that it has changed.

\n", "group": "submodule" }, "git_submodule_status": { "type": "function", "file": "submodule.h", - "line": 600, - "lineto": 604, + "line": 611, + "lineto": 615, "args": [ { "name": "status", @@ -19718,19 +19911,19 @@ "comment": " 0 on success, \n<\n0 on error" }, "description": "

Get the status for a submodule.

\n", - "comments": "

This looks at a submodule and tries to determine the status. It\n will return a combination of the GIT_SUBMODULE_STATUS values above.\n How deeply it examines the working directory to do this will depend\n on the git_submodule_ignore_t value for the submodule.

\n", + "comments": "

This looks at a submodule and tries to determine the status. It will return a combination of the GIT_SUBMODULE_STATUS values above. How deeply it examines the working directory to do this will depend on the git_submodule_ignore_t value for the submodule.

\n", "group": "submodule", "examples": { "status.c": [ - "ex/v0.23.2/status.html#git_submodule_status-26" + "ex/v0.24.1/status.html#git_submodule_status-26" ] } }, "git_submodule_location": { "type": "function", "file": "submodule.h", - "line": 620, - "lineto": 622, + "line": 631, + "lineto": 633, "args": [ { "name": "location_status", @@ -19750,76 +19943,9 @@ "comment": " 0 on success, \n<\n0 on error" }, "description": "

Get the locations of submodule information.

\n", - "comments": "

This is a bit like a very lightweight version of git_submodule_status.\n It just returns a made of the first four submodule status values (i.e.\n the ones like GIT_SUBMODULE_STATUS_IN_HEAD, etc) that tell you where the\n submodule data comes from (i.e. the HEAD commit, gitmodules file, etc.).\n This can be useful if you want to know if the submodule is present in the\n working directory at this point in time, etc.

\n", + "comments": "

This is a bit like a very lightweight version of git_submodule_status. It just returns a made of the first four submodule status values (i.e. the ones like GIT_SUBMODULE_STATUS_IN_HEAD, etc) that tell you where the submodule data comes from (i.e. the HEAD commit, gitmodules file, etc.). This can be useful if you want to know if the submodule is present in the working directory at this point in time, etc.

\n", "group": "submodule" }, - "git_commit_create_from_ids": { - "type": "function", - "file": "sys/commit.h", - "line": 34, - "lineto": 44, - "args": [ - { - "name": "id", - "type": "git_oid *", - "comment": null - }, - { - "name": "repo", - "type": "git_repository *", - "comment": null - }, - { - "name": "update_ref", - "type": "const char *", - "comment": null - }, - { - "name": "author", - "type": "const git_signature *", - "comment": null - }, - { - "name": "committer", - "type": "const git_signature *", - "comment": null - }, - { - "name": "message_encoding", - "type": "const char *", - "comment": null - }, - { - "name": "message", - "type": "const char *", - "comment": null - }, - { - "name": "tree", - "type": "const git_oid *", - "comment": null - }, - { - "name": "parent_count", - "type": "size_t", - "comment": null - }, - { - "name": "parents", - "type": "const git_oid *[]", - "comment": null - } - ], - "argline": "git_oid *id, git_repository *repo, const char *update_ref, const git_signature *author, const git_signature *committer, const char *message_encoding, const char *message, const git_oid *tree, size_t parent_count, const git_oid *[] parents", - "sig": "git_oid *::git_repository *::const char *::const git_signature *::const git_signature *::const char *::const char *::const git_oid *::size_t::const git_oid *[]", - "return": { - "type": "int", - "comment": null - }, - "description": "

Create new commit in the repository from a list of git_oid values.

\n", - "comments": "

See documentation for git_commit_create() for information about the\n parameters, as the meaning is identical excepting that tree and\n parents now take git_oid. This is a dangerous API in that nor\n the tree, neither the parents list of git_oids are checked for\n validity.

\n", - "group": "commit" - }, "git_commit_create_from_callback": { "type": "function", "file": "sys/commit.h", @@ -19884,14 +20010,14 @@ "comment": null }, "description": "

Create a new commit in the repository with an callback to supply parents.

\n", - "comments": "

See documentation for git_commit_create() for information about the\n parameters, as the meaning is identical excepting that tree takes a\n git_oid and doesn't check for validity, and parent_cb is invoked\n with parent_payload and should return git_oid values or NULL to\n indicate that all parents are accounted for.

\n", + "comments": "

See documentation for git_commit_create() for information about the parameters, as the meaning is identical excepting that tree takes a git_oid and doesn't check for validity, and parent_cb is invoked with parent_payload and should return git_oid values or NULL to indicate that all parents are accounted for.

\n", "group": "commit" }, "git_config_init_backend": { "type": "function", "file": "sys/config.h", - "line": 83, - "lineto": 85, + "line": 97, + "lineto": 99, "args": [ { "name": "backend", @@ -19917,8 +20043,8 @@ "git_config_add_backend": { "type": "function", "file": "sys/config.h", - "line": 105, - "lineto": 109, + "line": 119, + "lineto": 123, "args": [ { "name": "cfg", @@ -19948,7 +20074,7 @@ "comment": " 0 on success, GIT_EEXISTS when adding more than one file\n for a given priority level (and force_replace set to 0), or error code" }, "description": "

Add a generic config file instance to an existing config

\n", - "comments": "

Note that the configuration object will free the file\n automatically.

\n\n

Further queries on this config object will access each\n of the config file instances in order (instances with\n a higher priority level will be accessed first).

\n", + "comments": "

Note that the configuration object will free the file automatically.

\n\n

Further queries on this config object will access each of the config file instances in order (instances with a higher priority level will be accessed first).

\n", "group": "config" }, "git_diff_print_callback__to_buf": { @@ -19985,7 +20111,7 @@ "comment": null }, "description": "

Diff print callback that writes to a git_buf.

\n", - "comments": "

This function is provided not for you to call it directly, but instead\n so you can use it as a function pointer to the git_diff_print or\n git_patch_print APIs. When using those APIs, you specify a callback\n to actually handle the diff and/or patch data.

\n\n

Use this callback to easily write that data to a git_buf buffer. You\n must pass a git_buf * value as the payload to the git_diff_print\n and/or git_patch_print function. The data will be appended to the\n buffer (after any existing content).

\n", + "comments": "

This function is provided not for you to call it directly, but instead so you can use it as a function pointer to the git_diff_print or git_patch_print APIs. When using those APIs, you specify a callback to actually handle the diff and/or patch data.

\n\n

Use this callback to easily write that data to a git_buf buffer. You must pass a git_buf * value as the payload to the git_diff_print and/or git_patch_print function. The data will be appended to the buffer (after any existing content).

\n", "group": "diff" }, "git_diff_print_callback__to_file_handle": { @@ -20022,7 +20148,7 @@ "comment": null }, "description": "

Diff print callback that writes to stdio FILE handle.

\n", - "comments": "

This function is provided not for you to call it directly, but instead\n so you can use it as a function pointer to the git_diff_print or\n git_patch_print APIs. When using those APIs, you specify a callback\n to actually handle the diff and/or patch data.

\n\n

Use this callback to easily write that data to a stdio FILE handle. You\n must pass a FILE * value (such as stdout or stderr or the return\n value from fopen()) as the payload to the git_diff_print\n and/or git_patch_print function. If you pass NULL, this will write\n data to stdout.

\n", + "comments": "

This function is provided not for you to call it directly, but instead so you can use it as a function pointer to the git_diff_print or git_patch_print APIs. When using those APIs, you specify a callback to actually handle the diff and/or patch data.

\n\n

Use this callback to easily write that data to a stdio FILE handle. You must pass a FILE * value (such as stdout or stderr or the return value from fopen()) as the payload to the git_diff_print and/or git_patch_print function. If you pass NULL, this will write data to stdout.

\n", "group": "diff" }, "git_diff_get_perfdata": { @@ -20135,7 +20261,7 @@ "comment": null }, "description": "

Create a new empty filter list

\n", - "comments": "

Normally you won't use this because git_filter_list_load will create\n the filter list for you, but you can use this in combination with the\n git_filter_lookup and git_filter_list_push functions to assemble\n your own chains of filters.

\n", + "comments": "

Normally you won't use this because git_filter_list_load will create the filter list for you, but you can use this in combination with the git_filter_lookup and git_filter_list_push functions to assemble your own chains of filters.

\n", "group": "filter" }, "git_filter_list_push": { @@ -20167,29 +20293,7 @@ "comment": null }, "description": "

Add a filter to a filter list with the given payload.

\n", - "comments": "

Normally you won't have to do this because the filter list is created\n by calling the "check" function on registered filters when the filter\n attributes are set, but this does allow more direct manipulation of\n filter lists when desired.

\n\n

Note that normally the "check" function can set up a payload for the\n filter. Using this function, you can either pass in a payload if you\n know the expected payload format, or you can pass NULL. Some filters\n may fail with a NULL payload. Good luck!

\n", - "group": "filter" - }, - "git_filter_list_length": { - "type": "function", - "file": "sys/filter.h", - "line": 90, - "lineto": 90, - "args": [ - { - "name": "fl", - "type": "const git_filter_list *", - "comment": "A filter list" - } - ], - "argline": "const git_filter_list *fl", - "sig": "const git_filter_list *", - "return": { - "type": "size_t", - "comment": " The number of filters in the list" - }, - "description": "

Look up how many filters are in the list

\n", - "comments": "

We will attempt to apply all of these filters to any data passed in,\n but note that the filter apply action still has the option of skipping\n data that is passed in (for example, the CRLF filter will skip data\n that appears to be binary).

\n", + "comments": "

Normally you won't have to do this because the filter list is created by calling the "check" function on registered filters when the filter attributes are set, but this does allow more direct manipulation of filter lists when desired.

\n\n

Note that normally the "check" function can set up a payload for the filter. Using this function, you can either pass in a payload if you know the expected payload format, or you can pass NULL. Some filters may fail with a NULL payload. Good luck!

\n", "group": "filter" }, "git_filter_source_repo": { @@ -20327,8 +20431,8 @@ "git_filter_register": { "type": "function", "file": "sys/filter.h", - "line": 289, - "lineto": 290, + "line": 301, + "lineto": 302, "args": [ { "name": "name", @@ -20353,14 +20457,14 @@ "comment": " 0 on successful registry, error code \n<\n0 on failure" }, "description": "

Register a filter under a given name with a given priority.

\n", - "comments": "

As mentioned elsewhere, the initialize callback will not be invoked\n immediately. It is deferred until the filter is used in some way.

\n\n

A filter's attribute checks and check and apply callbacks will be\n issued in order of priority on smudge (to workdir), and in reverse\n order of priority on clean (to odb).

\n\n

Two filters are preregistered with libgit2:\n - GIT_FILTER_CRLF with priority 0\n - GIT_FILTER_IDENT with priority 100

\n\n

Currently the filter registry is not thread safe, so any registering or\n deregistering of filters must be done outside of any possible usage of\n the filters (i.e. during application setup or shutdown).

\n", + "comments": "

As mentioned elsewhere, the initialize callback will not be invoked immediately. It is deferred until the filter is used in some way.

\n\n

A filter's attribute checks and check and apply callbacks will be issued in order of priority on smudge (to workdir), and in reverse order of priority on clean (to odb).

\n\n

Two filters are preregistered with libgit2: - GIT_FILTER_CRLF with priority 0 - GIT_FILTER_IDENT with priority 100

\n\n

Currently the filter registry is not thread safe, so any registering or deregistering of filters must be done outside of any possible usage of the filters (i.e. during application setup or shutdown).

\n", "group": "filter" }, "git_filter_unregister": { "type": "function", "file": "sys/filter.h", - "line": 305, - "lineto": 305, + "line": 317, + "lineto": 317, "args": [ { "name": "name", @@ -20375,46 +20479,9 @@ "comment": " 0 on success, error code \n<\n0 on failure" }, "description": "

Remove the filter with the given name

\n", - "comments": "

Attempting to remove the builtin libgit2 filters is not permitted and\n will return an error.

\n\n

Currently the filter registry is not thread safe, so any registering or\n deregistering of filters must be done outside of any possible usage of\n the filters (i.e. during application setup or shutdown).

\n", + "comments": "

Attempting to remove the builtin libgit2 filters is not permitted and will return an error.

\n\n

Currently the filter registry is not thread safe, so any registering or deregistering of filters must be done outside of any possible usage of the filters (i.e. during application setup or shutdown).

\n", "group": "filter" }, - "git_hashsig_create": { - "type": "function", - "file": "sys/hashsig.h", - "line": 62, - "lineto": 66, - "args": [ - { - "name": "out", - "type": "git_hashsig **", - "comment": "The computed similarity signature." - }, - { - "name": "buf", - "type": "const char *", - "comment": "The input buffer." - }, - { - "name": "buflen", - "type": "size_t", - "comment": "The input buffer size." - }, - { - "name": "opts", - "type": "git_hashsig_option_t", - "comment": "The signature computation options (see above)." - } - ], - "argline": "git_hashsig **out, const char *buf, size_t buflen, git_hashsig_option_t opts", - "sig": "git_hashsig **::const char *::size_t::git_hashsig_option_t", - "return": { - "type": "int", - "comment": " 0 on success, GIT_EBUFS if the buffer doesn't contain enough data to\n compute a valid signature (unless GIT_HASHSIG_ALLOW_SMALL_FILES is set), or\n error code." - }, - "description": "

Compute a similarity signature for a text buffer

\n", - "comments": "

If you have passed the option GIT_HASHSIG_IGNORE_WHITESPACE, then the\n whitespace will be removed from the buffer while it is being processed,\n modifying the buffer in place. Sorry about that!

\n", - "group": "hashsig" - }, "git_hashsig_create_fromfile": { "type": "function", "file": "sys/hashsig.h", @@ -20444,7 +20511,7 @@ "comment": " 0 on success, GIT_EBUFS if the buffer doesn't contain enough data to\n compute a valid signature (unless GIT_HASHSIG_ALLOW_SMALL_FILES is set), or\n error code." }, "description": "

Compute a similarity signature for a text file

\n", - "comments": "

This walks through the file, only loading a maximum of 4K of file data at\n a time. Otherwise, it acts just like git_hashsig_create.

\n", + "comments": "

This walks through the file, only loading a maximum of 4K of file data at a time. Otherwise, it acts just like git_hashsig_create.

\n", "group": "hashsig" }, "git_hashsig_free": { @@ -20515,7 +20582,7 @@ "comment": " 0 on success; error code otherwise" }, "description": "
Instantiate a new mempack backend.\n
\n", - "comments": "
The backend must be added to an existing ODB with the highest\npriority.\n\n    git_mempack_new(\n
\n\n

&mempacker\n);\n git_repository_odb(\n&odb\n, repository);\n git_odb_add_backend(odb, mempacker, 999);

\n\n
Once the backend has been loaded, all writes to the ODB will\ninstead be queued in memory, and can be finalized with\n`git_mempack_dump`.\n\nSubsequent reads will also be served from the in-memory store\nto ensure consistency, until the memory store is dumped.\n
\n", + "comments": "
The backend must be added to an existing ODB with the highest   priority.\n\n    git_mempack_new(&mempacker);        git_repository_odb(&odb, repository);       git_odb_add_backend(odb, mempacker, 999);\n\nOnce the backend has been loaded, all writes to the ODB will    instead be queued in memory, and can be finalized with  `git_mempack_dump`.\n\nSubsequent reads will also be served from the in-memory store   to ensure consistency, until the memory store is dumped.\n
\n", "group": "mempack" }, "git_mempack_reset": { @@ -20537,14 +20604,14 @@ "comment": null }, "description": "
Reset the memory packer by clearing all the queued objects.\n
\n", - "comments": "
This assumes that `git_mempack_dump` has been called before to\nstore all the queued objects into a single packfile.\n\nAlternatively, call `reset` without a previous dump to "undo"\nall the recently written objects, giving transaction-like\nsemantics to the Git repository.\n
\n", + "comments": "
This assumes that `git_mempack_dump` has been called before to  store all the queued objects into a single packfile.\n\nAlternatively, call `reset` without a previous dump to "undo"   all the recently written objects, giving transaction-like   semantics to the Git repository.\n
\n", "group": "mempack" }, "git_odb_init_backend": { "type": "function", "file": "sys/odb_backend.h", - "line": 100, - "lineto": 102, + "line": 104, + "lineto": 106, "args": [ { "name": "backend", @@ -20580,14 +20647,14 @@ "comment": " 0 on success, -1 if there are errors or if libgit2 was not\n built with OpenSSL and threading support." }, "description": "

Initialize the OpenSSL locks

\n", - "comments": "

OpenSSL requires the application to determine how it performs\n locking.

\n\n

This is a last-resort convenience function which libgit2 provides for\n allocating and initializing the locks as well as setting the\n locking function to use the system's native locking functions.

\n\n

The locking function will be cleared and the memory will be freed\n when you call git_threads_sutdown().

\n\n

If your programming language has an OpenSSL package/bindings, it\n likely sets up locking. You should very strongly prefer that over\n this function.

\n", + "comments": "

OpenSSL requires the application to determine how it performs locking.

\n\n

This is a last-resort convenience function which libgit2 provides for allocating and initializing the locks as well as setting the locking function to use the system's native locking functions.

\n\n

The locking function will be cleared and the memory will be freed when you call git_threads_sutdown().

\n\n

If your programming language has an OpenSSL package/bindings, it likely sets up locking. You should very strongly prefer that over this function.

\n", "group": "openssl" }, "git_refdb_init_backend": { "type": "function", "file": "sys/refdb_backend.h", - "line": 182, - "lineto": 184, + "line": 183, + "lineto": 185, "args": [ { "name": "backend", @@ -20613,8 +20680,8 @@ "git_refdb_backend_fs": { "type": "function", "file": "sys/refdb_backend.h", - "line": 197, - "lineto": 199, + "line": 198, + "lineto": 200, "args": [ { "name": "backend_out", @@ -20634,14 +20701,14 @@ "comment": " 0 on success, \n<\n0 error code on failure" }, "description": "

Constructors for default filesystem-based refdb backend

\n", - "comments": "

Under normal usage, this is called for you when the repository is\n opened / created, but you can use this to explicitly construct a\n filesystem refdb backend for a repository.

\n", + "comments": "

Under normal usage, this is called for you when the repository is opened / created, but you can use this to explicitly construct a filesystem refdb backend for a repository.

\n", "group": "refdb" }, "git_refdb_set_backend": { "type": "function", "file": "sys/refdb_backend.h", - "line": 211, - "lineto": 213, + "line": 212, + "lineto": 214, "args": [ { "name": "refdb", @@ -20661,7 +20728,7 @@ "comment": " 0 on success; error code otherwise" }, "description": "

Sets the custom backend to an existing reference DB

\n", - "comments": "

The git_refdb will take ownership of the git_refdb_backend so you\n should NOT free it after calling this function.

\n", + "comments": "

The git_refdb will take ownership of the git_refdb_backend so you should NOT free it after calling this function.

\n", "group": "refdb" }, "git_reference__alloc": { @@ -20742,7 +20809,7 @@ "comment": " 0 on success, or an error code" }, "description": "

Create a new repository with neither backends nor config object

\n", - "comments": "

Note that this is only useful if you wish to associate the repository\n with a non-filesystem-backed object database and config store.

\n", + "comments": "

Note that this is only useful if you wish to associate the repository with a non-filesystem-backed object database and config store.

\n", "group": "repository" }, "git_repository__cleanup": { @@ -20764,7 +20831,7 @@ "comment": null }, "description": "

Reset all the internal state in a repository.

\n", - "comments": "

This will free all the mapped memory and internal objects\n of the repository and leave it in a "blank" state.

\n\n

There's no need to call this function directly unless you're\n trying to aggressively cleanup the repo before its\n deallocation. git_repository_free already performs this operation\n before deallocation the repo.

\n", + "comments": "

This will free all the mapped memory and internal objects of the repository and leave it in a "blank" state.

\n\n

There's no need to call this function directly unless you're trying to aggressively cleanup the repo before its deallocation. git_repository_free already performs this operation before deallocation the repo.

\n", "group": "repository" }, "git_repository_reinit_filesystem": { @@ -20791,7 +20858,7 @@ "comment": " 0 on success, \n<\n 0 on error" }, "description": "

Update the filesystem config settings for an open repository

\n", - "comments": "

When a repository is initialized, config values are set based on the\n properties of the filesystem that the repository is on, such as\n "core.ignorecase", "core.filemode", "core.symlinks", etc. If the\n repository is moved to a new filesystem, these properties may no\n longer be correct and API calls may not behave as expected. This\n call reruns the phase of repository initialization that sets those\n properties to compensate for the current filesystem of the repo.

\n", + "comments": "

When a repository is initialized, config values are set based on the properties of the filesystem that the repository is on, such as "core.ignorecase", "core.filemode", "core.symlinks", etc. If the repository is moved to a new filesystem, these properties may no longer be correct and API calls may not behave as expected. This call reruns the phase of repository initialization that sets those properties to compensate for the current filesystem of the repo.

\n", "group": "repository" }, "git_repository_set_config": { @@ -20818,7 +20885,7 @@ "comment": null }, "description": "

Set the configuration file for this repository

\n", - "comments": "

This configuration file will be used for all configuration\n queries involving this repository.

\n\n

The repository will keep a reference to the config file;\n the user must still free the config after setting it\n to the repository, or it will leak.

\n", + "comments": "

This configuration file will be used for all configuration queries involving this repository.

\n\n

The repository will keep a reference to the config file; the user must still free the config after setting it to the repository, or it will leak.

\n", "group": "repository" }, "git_repository_set_odb": { @@ -20845,7 +20912,7 @@ "comment": null }, "description": "

Set the Object Database for this repository

\n", - "comments": "

The ODB will be used for all object-related operations\n involving this repository.

\n\n

The repository will keep a reference to the ODB; the user\n must still free the ODB object after setting it to the\n repository, or it will leak.

\n", + "comments": "

The ODB will be used for all object-related operations involving this repository.

\n\n

The repository will keep a reference to the ODB; the user must still free the ODB object after setting it to the repository, or it will leak.

\n", "group": "repository" }, "git_repository_set_refdb": { @@ -20872,7 +20939,7 @@ "comment": null }, "description": "

Set the Reference Database Backend for this repository

\n", - "comments": "

The refdb will be used for all reference related operations\n involving this repository.

\n\n

The repository will keep a reference to the refdb; the user\n must still free the refdb object after setting it to the\n repository, or it will leak.

\n", + "comments": "

The refdb will be used for all reference related operations involving this repository.

\n\n

The repository will keep a reference to the refdb; the user must still free the refdb object after setting it to the repository, or it will leak.

\n", "group": "repository" }, "git_repository_set_index": { @@ -20899,7 +20966,7 @@ "comment": null }, "description": "

Set the index file for this repository

\n", - "comments": "

This index will be used for all index-related operations\n involving this repository.

\n\n

The repository will keep a reference to the index file;\n the user must still free the index after setting it\n to the repository, or it will leak.

\n", + "comments": "

This index will be used for all index-related operations involving this repository.

\n\n

The repository will keep a reference to the index file; the user must still free the index after setting it to the repository, or it will leak.

\n", "group": "repository" }, "git_repository_set_bare": { @@ -20921,14 +20988,36 @@ "comment": " 0 on success, \n<\n0 on failure" }, "description": "

Set a repository to be bare.

\n", - "comments": "

Clear the working directory and set core.bare to true. You may also\n want to call git_repository_set_index(repo, NULL) since a bare repo\n typically does not have an index, but this function will not do that\n for you.

\n", + "comments": "

Clear the working directory and set core.bare to true. You may also want to call git_repository_set_index(repo, NULL) since a bare repo typically does not have an index, but this function will not do that for you.

\n", "group": "repository" }, + "git_stream_register_tls": { + "type": "function", + "file": "sys/stream.h", + "line": 53, + "lineto": 53, + "args": [ + { + "name": "ctor", + "type": "git_stream_cb", + "comment": "the constructor to use" + } + ], + "argline": "git_stream_cb ctor", + "sig": "git_stream_cb", + "return": { + "type": "int", + "comment": " 0 or an error code" + }, + "description": "

Register a TLS stream constructor for the library to use

\n", + "comments": "

If a constructor is already set, it will be overwritten. Pass NULL in order to deregister the current constructor.

\n", + "group": "stream" + }, "git_transport_init": { "type": "function", "file": "sys/transport.h", - "line": 111, - "lineto": 113, + "line": 117, + "lineto": 119, "args": [ { "name": "opts", @@ -20954,8 +21043,8 @@ "git_transport_new": { "type": "function", "file": "sys/transport.h", - "line": 125, - "lineto": 125, + "line": 131, + "lineto": 131, "args": [ { "name": "out", @@ -20986,8 +21075,8 @@ "git_transport_ssh_with_paths": { "type": "function", "file": "sys/transport.h", - "line": 141, - "lineto": 141, + "line": 147, + "lineto": 147, "args": [ { "name": "out", @@ -21012,14 +21101,14 @@ "comment": " 0 or an error code" }, "description": "

Create an ssh transport with custom git command paths

\n", - "comments": "

This is a factory function suitable for setting as the transport\n callback in a remote (or for a clone in the options).

\n\n

The payload argument must be a strarray pointer with the paths for\n the git-upload-pack and git-receive-pack at index 0 and 1.

\n", + "comments": "

This is a factory function suitable for setting as the transport callback in a remote (or for a clone in the options).

\n\n

The payload argument must be a strarray pointer with the paths for the git-upload-pack and git-receive-pack at index 0 and 1.

\n", "group": "transport" }, "git_transport_unregister": { "type": "function", "file": "sys/transport.h", - "line": 169, - "lineto": 170, + "line": 175, + "lineto": 176, "args": [ { "name": "prefix", @@ -21040,8 +21129,8 @@ "git_transport_dummy": { "type": "function", "file": "sys/transport.h", - "line": 183, - "lineto": 186, + "line": 189, + "lineto": 192, "args": [ { "name": "out", @@ -21072,8 +21161,8 @@ "git_transport_local": { "type": "function", "file": "sys/transport.h", - "line": 196, - "lineto": 199, + "line": 202, + "lineto": 205, "args": [ { "name": "out", @@ -21104,8 +21193,8 @@ "git_transport_smart": { "type": "function", "file": "sys/transport.h", - "line": 209, - "lineto": 212, + "line": 215, + "lineto": 218, "args": [ { "name": "out", @@ -21133,11 +21222,48 @@ "comments": "", "group": "transport" }, + "git_transport_smart_certificate_check": { + "type": "function", + "file": "sys/transport.h", + "line": 229, + "lineto": 229, + "args": [ + { + "name": "transport", + "type": "git_transport *", + "comment": "a smart transport" + }, + { + "name": "cert", + "type": "git_cert *", + "comment": "the certificate to pass to the caller" + }, + { + "name": "valid", + "type": "int", + "comment": "whether we believe the certificate is valid" + }, + { + "name": "hostname", + "type": "const char *", + "comment": "the hostname we connected to" + } + ], + "argline": "git_transport *transport, git_cert *cert, int valid, const char *hostname", + "sig": "git_transport *::git_cert *::int::const char *", + "return": { + "type": "int", + "comment": " the return value of the callback" + }, + "description": "

Call the certificate check for this transport.

\n", + "comments": "", + "group": "transport" + }, "git_smart_subtransport_http": { "type": "function", "file": "sys/transport.h", - "line": 322, - "lineto": 325, + "line": 350, + "lineto": 353, "args": [ { "name": "out", @@ -21168,8 +21294,8 @@ "git_smart_subtransport_git": { "type": "function", "file": "sys/transport.h", - "line": 334, - "lineto": 337, + "line": 362, + "lineto": 365, "args": [ { "name": "out", @@ -21200,8 +21326,8 @@ "git_smart_subtransport_ssh": { "type": "function", "file": "sys/transport.h", - "line": 346, - "lineto": 349, + "line": 374, + "lineto": 377, "args": [ { "name": "out", @@ -21262,7 +21388,7 @@ "group": "tag", "examples": { "general.c": [ - "ex/v0.23.2/general.html#git_tag_lookup-70" + "ex/v0.24.1/general.html#git_tag_lookup-70" ] } }, @@ -21322,7 +21448,7 @@ "comment": null }, "description": "

Close an open tag

\n", - "comments": "

You can no longer use the git_tag pointer after this call.

\n\n

IMPORTANT: You MUST call this method when you are through with a tag to\n release memory. Failure to do so will cause a memory leak.

\n", + "comments": "

You can no longer use the git_tag pointer after this call.

\n\n

IMPORTANT: You MUST call this method when you are through with a tag to release memory. Failure to do so will cause a memory leak.

\n", "group": "tag" }, "git_tag_id": { @@ -21393,11 +21519,11 @@ "comment": " 0 or an error code" }, "description": "

Get the tagged object of a tag

\n", - "comments": "

This method performs a repository lookup for the\n given object and returns it

\n", + "comments": "

This method performs a repository lookup for the given object and returns it

\n", "group": "tag", "examples": { "general.c": [ - "ex/v0.23.2/general.html#git_tag_target-71" + "ex/v0.24.1/general.html#git_tag_target-71" ] } }, @@ -21424,7 +21550,7 @@ "group": "tag", "examples": { "cat-file.c": [ - "ex/v0.23.2/cat-file.html#git_tag_target_id-35" + "ex/v0.24.1/cat-file.html#git_tag_target_id-35" ] } }, @@ -21451,10 +21577,10 @@ "group": "tag", "examples": { "cat-file.c": [ - "ex/v0.23.2/cat-file.html#git_tag_target_type-36" + "ex/v0.24.1/cat-file.html#git_tag_target_type-36" ], "general.c": [ - "ex/v0.23.2/general.html#git_tag_target_type-72" + "ex/v0.24.1/general.html#git_tag_target_type-72" ] } }, @@ -21481,13 +21607,13 @@ "group": "tag", "examples": { "cat-file.c": [ - "ex/v0.23.2/cat-file.html#git_tag_name-37" + "ex/v0.24.1/cat-file.html#git_tag_name-37" ], "general.c": [ - "ex/v0.23.2/general.html#git_tag_name-73" + "ex/v0.24.1/general.html#git_tag_name-73" ], "tag.c": [ - "ex/v0.23.2/tag.html#git_tag_name-20" + "ex/v0.24.1/tag.html#git_tag_name-20" ] } }, @@ -21514,7 +21640,7 @@ "group": "tag", "examples": { "cat-file.c": [ - "ex/v0.23.2/cat-file.html#git_tag_tagger-38" + "ex/v0.24.1/cat-file.html#git_tag_tagger-38" ] } }, @@ -21541,14 +21667,14 @@ "group": "tag", "examples": { "cat-file.c": [ - "ex/v0.23.2/cat-file.html#git_tag_message-39", - "ex/v0.23.2/cat-file.html#git_tag_message-40" + "ex/v0.24.1/cat-file.html#git_tag_message-39", + "ex/v0.24.1/cat-file.html#git_tag_message-40" ], "general.c": [ - "ex/v0.23.2/general.html#git_tag_message-74" + "ex/v0.24.1/general.html#git_tag_message-74" ], "tag.c": [ - "ex/v0.23.2/tag.html#git_tag_message-21" + "ex/v0.24.1/tag.html#git_tag_message-21" ] } }, @@ -21601,11 +21727,11 @@ "comment": " 0 on success, GIT_EINVALIDSPEC or an error code\n\tA tag object is written to the ODB, and a proper reference\n\tis written in the /refs/tags folder, pointing to it" }, "description": "

Create a new tag in the repository from an object

\n", - "comments": "

A new reference will also be created pointing to\n this tag object. If force is true and a reference\n already exists with the given name, it'll be replaced.

\n\n

The message will not be cleaned up. This can be achieved\n through git_message_prettify().

\n\n

The tag name will be checked for validity. You must avoid\n the characters '~', '^', ':', '\n\\\n', '?', '[', and '*', and the\n sequences ".." and "\n@\n{" which have special meaning to revparse.

\n", + "comments": "

A new reference will also be created pointing to this tag object. If force is true and a reference already exists with the given name, it'll be replaced.

\n\n

The message will not be cleaned up. This can be achieved through git_message_prettify().

\n\n

The tag name will be checked for validity. You must avoid the characters '~', '^', ':', '\\', '?', '[', and '*', and the sequences ".." and "@{" which have special meaning to revparse.

\n", "group": "tag", "examples": { "tag.c": [ - "ex/v0.23.2/tag.html#git_tag_create-22" + "ex/v0.24.1/tag.html#git_tag_create-22" ] } }, @@ -21653,7 +21779,7 @@ "comment": " 0 on success or an error code" }, "description": "

Create a new tag in the object database pointing to a git_object

\n", - "comments": "

The message will not be cleaned up. This can be achieved\n through git_message_prettify().

\n", + "comments": "

The message will not be cleaned up. This can be achieved through git_message_prettify().

\n", "group": "tag" }, "git_tag_create_frombuffer": { @@ -21732,11 +21858,11 @@ "comment": " 0 on success, GIT_EINVALIDSPEC or an error code\n\tA proper reference is written in the /refs/tags folder,\n pointing to the provided target object" }, "description": "

Create a new lightweight tag pointing at a target object

\n", - "comments": "

A new direct reference will be created pointing to\n this target object. If force is true and a reference\n already exists with the given name, it'll be replaced.

\n\n

The tag name will be checked for validity.\n See git_tag_create() for rules about valid names.

\n", + "comments": "

A new direct reference will be created pointing to this target object. If force is true and a reference already exists with the given name, it'll be replaced.

\n\n

The tag name will be checked for validity. See git_tag_create() for rules about valid names.

\n", "group": "tag", "examples": { "tag.c": [ - "ex/v0.23.2/tag.html#git_tag_create_lightweight-23" + "ex/v0.24.1/tag.html#git_tag_create_lightweight-23" ] } }, @@ -21764,11 +21890,11 @@ "comment": " 0 on success, GIT_EINVALIDSPEC or an error code" }, "description": "

Delete an existing tag reference.

\n", - "comments": "

The tag name will be checked for validity.\n See git_tag_create() for rules about valid names.

\n", + "comments": "

The tag name will be checked for validity. See git_tag_create() for rules about valid names.

\n", "group": "tag", "examples": { "tag.c": [ - "ex/v0.23.2/tag.html#git_tag_delete-24" + "ex/v0.24.1/tag.html#git_tag_delete-24" ] } }, @@ -21796,7 +21922,7 @@ "comment": " 0 or an error code" }, "description": "

Fill a list with all the tags in the Repository

\n", - "comments": "

The string array will be filled with the names of the\n matching tags; these values are owned by the user and\n should be free'd manually when no longer needed, using\n git_strarray_free.

\n", + "comments": "

The string array will be filled with the names of the matching tags; these values are owned by the user and should be free'd manually when no longer needed, using git_strarray_free.

\n", "group": "tag" }, "git_tag_list_match": { @@ -21828,11 +21954,11 @@ "comment": " 0 or an error code" }, "description": "

Fill a list with all the tags in the Repository\n which name match a defined pattern

\n", - "comments": "

If an empty pattern is provided, all the tags\n will be returned.

\n\n

The string array will be filled with the names of the\n matching tags; these values are owned by the user and\n should be free'd manually when no longer needed, using\n git_strarray_free.

\n", + "comments": "

If an empty pattern is provided, all the tags will be returned.

\n\n

The string array will be filled with the names of the matching tags; these values are owned by the user and should be free'd manually when no longer needed, using git_strarray_free.

\n", "group": "tag", "examples": { "tag.c": [ - "ex/v0.23.2/tag.html#git_tag_list_match-25" + "ex/v0.24.1/tag.html#git_tag_list_match-25" ] } }, @@ -21892,7 +22018,7 @@ "comment": " 0 or an error code" }, "description": "

Recursively peel a tag until a non tag git_object is found

\n", - "comments": "

The retrieved tag_target object is owned by the repository\n and should be closed with the git_object_free method.

\n", + "comments": "

The retrieved tag_target object is owned by the repository and should be closed with the git_object_free method.

\n", "group": "tag" }, "git_trace_set": { @@ -21925,8 +22051,8 @@ "git_cred_has_username": { "type": "function", "file": "transport.h", - "line": 197, - "lineto": 197, + "line": 190, + "lineto": 190, "args": [ { "name": "cred", @@ -21947,8 +22073,8 @@ "git_cred_userpass_plaintext_new": { "type": "function", "file": "transport.h", - "line": 208, - "lineto": 211, + "line": 201, + "lineto": 204, "args": [ { "name": "out", @@ -21979,8 +22105,8 @@ "git_cred_ssh_key_new": { "type": "function", "file": "transport.h", - "line": 224, - "lineto": 229, + "line": 217, + "lineto": 222, "args": [ { "name": "out", @@ -22021,8 +22147,8 @@ "git_cred_ssh_interactive_new": { "type": "function", "file": "transport.h", - "line": 240, - "lineto": 244, + "line": 233, + "lineto": 237, "args": [ { "name": "out", @@ -22058,8 +22184,8 @@ "git_cred_ssh_key_from_agent": { "type": "function", "file": "transport.h", - "line": 254, - "lineto": 256, + "line": 247, + "lineto": 249, "args": [ { "name": "out", @@ -22085,8 +22211,8 @@ "git_cred_ssh_custom_new": { "type": "function", "file": "transport.h", - "line": 276, - "lineto": 282, + "line": 269, + "lineto": 275, "args": [ { "name": "out", @@ -22126,14 +22252,14 @@ "comment": " 0 for success or an error code for failure" }, "description": "

Create an ssh key credential with a custom signing function.

\n", - "comments": "

This lets you use your own function to sign the challenge.

\n\n

This function and its credential type is provided for completeness\n and wraps libssh2_userauth_publickey(), which is undocumented.

\n\n

The supplied credential parameter will be internally duplicated.

\n", + "comments": "

This lets you use your own function to sign the challenge.

\n\n

This function and its credential type is provided for completeness and wraps libssh2_userauth_publickey(), which is undocumented.

\n\n

The supplied credential parameter will be internally duplicated.

\n", "group": "cred" }, "git_cred_default_new": { "type": "function", "file": "transport.h", - "line": 290, - "lineto": 290, + "line": 283, + "lineto": 283, "args": [ { "name": "out", @@ -22154,8 +22280,8 @@ "git_cred_username_new": { "type": "function", "file": "transport.h", - "line": 298, - "lineto": 298, + "line": 291, + "lineto": 291, "args": [ { "name": "cred", @@ -22175,14 +22301,14 @@ "comment": null }, "description": "

Create a credential to specify a username.

\n", - "comments": "

This is used with ssh authentication to query for the username if\n none is specified in the url.

\n", + "comments": "

This is used with ssh authentication to query for the username if none is specified in the url.

\n", "group": "cred" }, "git_cred_ssh_key_memory_new": { "type": "function", "file": "transport.h", - "line": 310, - "lineto": 315, + "line": 303, + "lineto": 308, "args": [ { "name": "out", @@ -22220,6 +22346,28 @@ "comments": "", "group": "cred" }, + "git_cred_free": { + "type": "function", + "file": "transport.h", + "line": 319, + "lineto": 319, + "args": [ + { + "name": "cred", + "type": "git_cred *", + "comment": "the object to free" + } + ], + "argline": "git_cred *cred", + "sig": "git_cred *", + "return": { + "type": "void", + "comment": null + }, + "description": "

Free a credential.

\n", + "comments": "

This is only necessary if you own the object; that is, if you are a transport.

\n", + "group": "cred" + }, "git_tree_lookup": { "type": "function", "file": "tree.h", @@ -22253,11 +22401,11 @@ "group": "tree", "examples": { "general.c": [ - "ex/v0.23.2/general.html#git_tree_lookup-75", - "ex/v0.23.2/general.html#git_tree_lookup-76" + "ex/v0.24.1/general.html#git_tree_lookup-75", + "ex/v0.24.1/general.html#git_tree_lookup-76" ], "init.c": [ - "ex/v0.23.2/init.html#git_tree_lookup-14" + "ex/v0.24.1/init.html#git_tree_lookup-14" ] } }, @@ -22317,22 +22465,22 @@ "comment": null }, "description": "

Close an open tree

\n", - "comments": "

You can no longer use the git_tree pointer after this call.

\n\n

IMPORTANT: You MUST call this method when you stop using a tree to\n release memory. Failure to do so will cause a memory leak.

\n", + "comments": "

You can no longer use the git_tree pointer after this call.

\n\n

IMPORTANT: You MUST call this method when you stop using a tree to release memory. Failure to do so will cause a memory leak.

\n", "group": "tree", "examples": { "diff.c": [ - "ex/v0.23.2/diff.html#git_tree_free-17", - "ex/v0.23.2/diff.html#git_tree_free-18" + "ex/v0.24.1/diff.html#git_tree_free-17", + "ex/v0.24.1/diff.html#git_tree_free-18" ], "init.c": [ - "ex/v0.23.2/init.html#git_tree_free-15" + "ex/v0.24.1/init.html#git_tree_free-15" ], "log.c": [ - "ex/v0.23.2/log.html#git_tree_free-58", - "ex/v0.23.2/log.html#git_tree_free-59", - "ex/v0.23.2/log.html#git_tree_free-60", - "ex/v0.23.2/log.html#git_tree_free-61", - "ex/v0.23.2/log.html#git_tree_free-62" + "ex/v0.24.1/log.html#git_tree_free-58", + "ex/v0.24.1/log.html#git_tree_free-59", + "ex/v0.24.1/log.html#git_tree_free-60", + "ex/v0.24.1/log.html#git_tree_free-61", + "ex/v0.24.1/log.html#git_tree_free-62" ] } }, @@ -22403,10 +22551,10 @@ "group": "tree", "examples": { "cat-file.c": [ - "ex/v0.23.2/cat-file.html#git_tree_entrycount-41" + "ex/v0.24.1/cat-file.html#git_tree_entrycount-41" ], "general.c": [ - "ex/v0.23.2/general.html#git_tree_entrycount-77" + "ex/v0.24.1/general.html#git_tree_entrycount-77" ] } }, @@ -22434,11 +22582,11 @@ "comment": " the tree entry; NULL if not found" }, "description": "

Lookup a tree entry by its filename

\n", - "comments": "

This returns a git_tree_entry that is owned by the git_tree. You don't\n have to free it, but you must not use it after the git_tree is released.

\n", + "comments": "

This returns a git_tree_entry that is owned by the git_tree. You don't have to free it, but you must not use it after the git_tree is released.

\n", "group": "tree", "examples": { "general.c": [ - "ex/v0.23.2/general.html#git_tree_entry_byname-78" + "ex/v0.24.1/general.html#git_tree_entry_byname-78" ] } }, @@ -22466,14 +22614,14 @@ "comment": " the tree entry; NULL if not found" }, "description": "

Lookup a tree entry by its position in the tree

\n", - "comments": "

This returns a git_tree_entry that is owned by the git_tree. You don't\n have to free it, but you must not use it after the git_tree is released.

\n", + "comments": "

This returns a git_tree_entry that is owned by the git_tree. You don't have to free it, but you must not use it after the git_tree is released.

\n", "group": "tree", "examples": { "cat-file.c": [ - "ex/v0.23.2/cat-file.html#git_tree_entry_byindex-42" + "ex/v0.24.1/cat-file.html#git_tree_entry_byindex-42" ], "general.c": [ - "ex/v0.23.2/general.html#git_tree_entry_byindex-79" + "ex/v0.24.1/general.html#git_tree_entry_byindex-79" ] } }, @@ -22501,7 +22649,7 @@ "comment": " the tree entry; NULL if not found" }, "description": "

Lookup a tree entry by SHA value.

\n", - "comments": "

This returns a git_tree_entry that is owned by the git_tree. You don't\n have to free it, but you must not use it after the git_tree is released.

\n\n

Warning: this must examine every entry in the tree, so it is not fast.

\n", + "comments": "

This returns a git_tree_entry that is owned by the git_tree. You don't have to free it, but you must not use it after the git_tree is released.

\n\n

Warning: this must examine every entry in the tree, so it is not fast.

\n", "group": "tree" }, "git_tree_entry_bypath": { @@ -22533,7 +22681,7 @@ "comment": " 0 on success; GIT_ENOTFOUND if the path does not exist" }, "description": "

Retrieve a tree entry contained in a tree or in any of its subtrees,\n given its relative path.

\n", - "comments": "

Unlike the other lookup functions, the returned tree entry is owned by\n the user and must be freed explicitly with git_tree_entry_free().

\n", + "comments": "

Unlike the other lookup functions, the returned tree entry is owned by the user and must be freed explicitly with git_tree_entry_free().

\n", "group": "tree" }, "git_tree_entry_dup": { @@ -22560,7 +22708,7 @@ "comment": " 0 or an error code" }, "description": "

Duplicate a tree entry

\n", - "comments": "

Create a copy of a tree entry. The returned copy is owned by the user,\n and must be freed explicitly with git_tree_entry_free().

\n", + "comments": "

Create a copy of a tree entry. The returned copy is owned by the user, and must be freed explicitly with git_tree_entry_free().

\n", "group": "tree" }, "git_tree_entry_free": { @@ -22582,7 +22730,7 @@ "comment": null }, "description": "

Free a user-owned tree entry

\n", - "comments": "

IMPORTANT: This function is only needed for tree entries owned by the\n user, such as the ones returned by git_tree_entry_dup() or\n git_tree_entry_bypath().

\n", + "comments": "

IMPORTANT: This function is only needed for tree entries owned by the user, such as the ones returned by git_tree_entry_dup() or git_tree_entry_bypath().

\n", "group": "tree" }, "git_tree_entry_name": { @@ -22608,11 +22756,11 @@ "group": "tree", "examples": { "cat-file.c": [ - "ex/v0.23.2/cat-file.html#git_tree_entry_name-43" + "ex/v0.24.1/cat-file.html#git_tree_entry_name-43" ], "general.c": [ - "ex/v0.23.2/general.html#git_tree_entry_name-80", - "ex/v0.23.2/general.html#git_tree_entry_name-81" + "ex/v0.24.1/general.html#git_tree_entry_name-80", + "ex/v0.24.1/general.html#git_tree_entry_name-81" ] } }, @@ -22639,7 +22787,7 @@ "group": "tree", "examples": { "cat-file.c": [ - "ex/v0.23.2/cat-file.html#git_tree_entry_id-44" + "ex/v0.24.1/cat-file.html#git_tree_entry_id-44" ] } }, @@ -22666,7 +22814,7 @@ "group": "tree", "examples": { "cat-file.c": [ - "ex/v0.23.2/cat-file.html#git_tree_entry_type-45" + "ex/v0.24.1/cat-file.html#git_tree_entry_type-45" ] } }, @@ -22693,7 +22841,7 @@ "group": "tree", "examples": { "cat-file.c": [ - "ex/v0.23.2/cat-file.html#git_tree_entry_filemode-46" + "ex/v0.24.1/cat-file.html#git_tree_entry_filemode-46" ] } }, @@ -22716,7 +22864,7 @@ "comment": " filemode as an integer" }, "description": "

Get the raw UNIX file attributes of a tree entry

\n", - "comments": "

This function does not perform any normalization and is only useful\n if you need to be able to recreate the original tree object.

\n", + "comments": "

This function does not perform any normalization and is only useful if you need to be able to recreate the original tree object.

\n", "group": "tree" }, "git_tree_entry_cmp": { @@ -22779,7 +22927,7 @@ "group": "tree", "examples": { "general.c": [ - "ex/v0.23.2/general.html#git_tree_entry_to_object-82" + "ex/v0.24.1/general.html#git_tree_entry_to_object-82" ] } }, @@ -22812,7 +22960,7 @@ "comment": " 0 on success; error code otherwise" }, "description": "

Create a new tree builder.

\n", - "comments": "

The tree builder can be used to create or modify trees in memory and\n write them as tree objects to the database.

\n\n

If the source parameter is not NULL, the tree builder will be\n initialized with the entries of the given tree.

\n\n

If the source parameter is NULL, the tree builder will start with no\n entries and will have to be filled manually.

\n", + "comments": "

The tree builder can be used to create or modify trees in memory and write them as tree objects to the database.

\n\n

If the source parameter is not NULL, the tree builder will be initialized with the entries of the given tree.

\n\n

If the source parameter is NULL, the tree builder will start with no entries and will have to be filled manually.

\n", "group": "treebuilder" }, "git_treebuilder_clear": { @@ -22878,7 +23026,7 @@ "comment": null }, "description": "

Free a tree builder

\n", - "comments": "

This will clear all the entries and free to builder.\n Failing to free the builder after you're done using it\n will result in a memory leak

\n", + "comments": "

This will clear all the entries and free to builder. Failing to free the builder after you're done using it will result in a memory leak

\n", "group": "treebuilder" }, "git_treebuilder_get": { @@ -22905,7 +23053,7 @@ "comment": " pointer to the entry; NULL if not found" }, "description": "

Get an entry from the builder from its filename

\n", - "comments": "

The returned entry is owned by the builder and should\n not be freed manually.

\n", + "comments": "

The returned entry is owned by the builder and should not be freed manually.

\n", "group": "treebuilder" }, "git_treebuilder_insert": { @@ -22947,7 +23095,7 @@ "comment": " 0 or an error code" }, "description": "

Add or update an entry to the builder

\n", - "comments": "

Insert a new entry for filename in the builder with the\n given attributes.

\n\n

If an entry named filename already exists, its attributes\n will be updated with the given ones.

\n\n

The optional pointer out can be used to retrieve a pointer to the\n newly created/updated entry. Pass NULL if you do not need it. The\n pointer may not be valid past the next operation in this\n builder. Duplicate the entry if you want to keep it.

\n\n

No attempt is being made to ensure that the provided oid points\n to an existing git object in the object database, nor that the\n attributes make sense regarding the type of the pointed at object.

\n", + "comments": "

Insert a new entry for filename in the builder with the given attributes.

\n\n

If an entry named filename already exists, its attributes will be updated with the given ones.

\n\n

The optional pointer out can be used to retrieve a pointer to the newly created/updated entry. Pass NULL if you do not need it. The pointer may not be valid past the next operation in this builder. Duplicate the entry if you want to keep it.

\n\n

No attempt is being made to ensure that the provided oid points to an existing git object in the object database, nor that the attributes make sense regarding the type of the pointed at object.

\n", "group": "treebuilder" }, "git_treebuilder_remove": { @@ -23006,7 +23154,7 @@ "comment": null }, "description": "

Selectively remove entries in the tree

\n", - "comments": "

The filter callback will be called for each entry in the tree with a\n pointer to the entry and the provided payload; if the callback returns\n non-zero, the entry will be filtered (removed from the builder).

\n", + "comments": "

The filter callback will be called for each entry in the tree with a pointer to the entry and the provided payload; if the callback returns non-zero, the entry will be filtered (removed from the builder).

\n", "group": "treebuilder" }, "git_treebuilder_write": { @@ -23033,7 +23181,7 @@ "comment": " 0 or an error code" }, "description": "

Write the contents of the tree builder as a tree object

\n", - "comments": "

The tree builder will be written to the given repo, and its\n identifying SHA1 hash will be stored in the id pointer.

\n", + "comments": "

The tree builder will be written to the given repo, and its identifying SHA1 hash will be stored in the id pointer.

\n", "group": "treebuilder" }, "git_tree_walk": { @@ -23070,7 +23218,7 @@ "comment": " 0 or an error code" }, "description": "

Traverse the entries in a tree and its subtrees in post or pre order.

\n", - "comments": "

The entries will be traversed in the specified order, children subtrees\n will be automatically loaded as required, and the callback will be\n called once per entry with the current (relative) root for the entry and\n the entry data itself.

\n\n

If the callback returns a positive value, the passed entry will be\n skipped on the traversal (in pre mode). A negative value stops the walk.

\n", + "comments": "

The entries will be traversed in the specified order, children subtrees will be automatically loaded as required, and the callback will be called once per entry with the current (relative) root for the entry and the entry data itself.

\n\n

If the callback returns a positive value, the passed entry will be skipped on the traversal (in pre mode). A negative value stops the walk.

\n", "group": "tree" } }, @@ -23222,7 +23370,7 @@ "comment": " 0, GIT_EINVALIDSPEC, GIT_EEXISTS or an error code" }, "description": "

The signature of a function matching git_remote_create, with an additional\n void* as a callback payload.

\n", - "comments": "

Callers of git_clone may provide a function matching this signature to override\n the remote creation and customization process during a clone operation.

\n" + "comments": "

Callers of git_clone may provide a function matching this signature to override the remote creation and customization process during a clone operation.

\n" }, "git_repository_create_cb": { "type": "callback", @@ -23258,13 +23406,13 @@ "comment": " 0, or a negative value to indicate error" }, "description": "

The signature of a function matchin git_repository_init, with an\n aditional void * as callback payload.

\n", - "comments": "

Callers of git_clone my provide a function matching this signature\n to override the repository creation and customization process\n during a clone operation.

\n" + "comments": "

Callers of git_clone my provide a function matching this signature to override the repository creation and customization process during a clone operation.

\n" }, "git_diff_notify_cb": { "type": "callback", "file": "diff.h", - "line": 343, - "lineto": 347, + "line": 347, + "lineto": 351, "args": [ { "name": "diff_so_far", @@ -23294,13 +23442,49 @@ "comment": null }, "description": "

Diff notification callback function.

\n", - "comments": "

The callback will be called for each file, just before the git_delta_t\n gets inserted into the diff.

\n\n

When the callback:\n - returns \n<\n 0, the diff process will be aborted.\n - returns > 0, the delta will not be inserted into the diff, but the\n diff process continues.\n - returns 0, the delta is inserted into the diff, and the diff process\n continues.

\n" + "comments": "

The callback will be called for each file, just before the git_delta_t gets inserted into the diff.

\n\n

When the callback: - returns < 0, the diff process will be aborted. - returns > 0, the delta will not be inserted into the diff, but the diff process continues. - returns 0, the delta is inserted into the diff, and the diff process continues.

\n" + }, + "git_diff_progress_cb": { + "type": "callback", + "file": "diff.h", + "line": 363, + "lineto": 367, + "args": [ + { + "name": "diff_so_far", + "type": "const git_diff *", + "comment": "The diff being generated." + }, + { + "name": "old_path", + "type": "const char *", + "comment": "The path to the old file or NULL." + }, + { + "name": "new_path", + "type": "const char *", + "comment": "The path to the new file or NULL." + }, + { + "name": "payload", + "type": "void *", + "comment": null + } + ], + "argline": "const git_diff *diff_so_far, const char *old_path, const char *new_path, void *payload", + "sig": "const git_diff *::const char *::const char *::void *", + "return": { + "type": "int", + "comment": " Non-zero to abort the diff." + }, + "description": "

Diff progress callback.

\n", + "comments": "

Called before each file comparison.

\n" }, "git_diff_file_cb": { "type": "callback", "file": "diff.h", - "line": 423, - "lineto": 426, + "line": 446, + "lineto": 449, "args": [ { "name": "delta", @@ -23330,8 +23514,8 @@ "git_diff_binary_cb": { "type": "callback", "file": "diff.h", - "line": 470, - "lineto": 473, + "line": 493, + "lineto": 496, "args": [ { "name": "delta", @@ -23361,8 +23545,8 @@ "git_diff_hunk_cb": { "type": "callback", "file": "diff.h", - "line": 490, - "lineto": 493, + "line": 513, + "lineto": 516, "args": [ { "name": "delta", @@ -23392,8 +23576,8 @@ "git_diff_line_cb": { "type": "callback", "file": "diff.h", - "line": 543, - "lineto": 547, + "line": 566, + "lineto": 570, "args": [ { "name": "delta", @@ -23423,7 +23607,7 @@ "comment": null }, "description": "

When iterating over a diff, callback that will be made per text diff\n line. In this context, the provided range will be NULL.

\n", - "comments": "

When printing a diff, callback that will be made to output each line\n of text. This uses some extra GIT_DIFF_LINE_... constants for output\n of lines of file and hunk headers.

\n" + "comments": "

When printing a diff, callback that will be made to output each line of text. This uses some extra GIT_DIFF_LINE_... constants for output of lines of file and hunk headers.

\n" }, "git_index_matched_path_cb": { "type": "callback", @@ -23511,7 +23695,7 @@ "comment": null }, "description": "

Callback for git_note_foreach.

\n", - "comments": "

Receives:\n - blob_id: Oid of the blob containing the message\n - annotated_object_id: Oid of the git object being annotated\n - payload: Payload data passed to git_note_foreach

\n" + "comments": "

Receives: - blob_id: Oid of the blob containing the message - annotated_object_id: Oid of the git object being annotated - payload: Payload data passed to git_note_foreach

\n" }, "git_odb_foreach_cb": { "type": "callback", @@ -23599,13 +23783,13 @@ "comment": null }, "description": "

git2/remote.h

\n", - "comments": "

@\n{

\n" + "comments": "

@{

\n" }, "git_push_transfer_progress": { "type": "callback", "file": "remote.h", - "line": 332, - "lineto": 336, + "line": 333, + "lineto": 337, "args": [ { "name": "current", @@ -23640,8 +23824,8 @@ "git_push_negotiation": { "type": "callback", "file": "remote.h", - "line": 365, - "lineto": 365, + "line": 366, + "lineto": 366, "args": [ { "name": "updates", @@ -23787,11 +23971,42 @@ "description": "

Function pointer to receive status on individual files

\n", "comments": "

path is the relative path to the file from the root of the repository.

\n\n

status_flags is a combination of git_status_t values that apply.

\n\n

payload is the value you passed to the foreach function as payload.

\n" }, + "git_submodule_cb": { + "type": "callback", + "file": "submodule.h", + "line": 118, + "lineto": 119, + "args": [ + { + "name": "sm", + "type": "git_submodule *", + "comment": "git_submodule currently being visited" + }, + { + "name": "name", + "type": "const char *", + "comment": "name of the submodule" + }, + { + "name": "payload", + "type": "void *", + "comment": "value you passed to the foreach function as payload" + } + ], + "argline": "git_submodule *sm, const char *name, void *payload", + "sig": "git_submodule *::const char *::void *", + "return": { + "type": "int", + "comment": " 0 on success or error code" + }, + "description": "

Function pointer to receive each submodule

\n", + "comments": "" + }, "git_filter_init_fn": { "type": "callback", "file": "sys/filter.h", - "line": 152, - "lineto": 152, + "line": 141, + "lineto": 141, "args": [ { "name": "self", @@ -23806,13 +24021,13 @@ "comment": null }, "description": "

Initialize callback on filter

\n", - "comments": "

Specified as filter.initialize, this is an optional callback invoked\n before a filter is first used. It will be called once at most.

\n\n

If non-NULL, the filter's initialize callback will be invoked right\n before the first use of the filter, so you can defer expensive\n initialization operations (in case libgit2 is being used in a way that\n doesn't need the filter).

\n" + "comments": "

Specified as filter.initialize, this is an optional callback invoked before a filter is first used. It will be called once at most.

\n\n

If non-NULL, the filter's initialize callback will be invoked right before the first use of the filter, so you can defer expensive initialization operations (in case libgit2 is being used in a way that doesn't need the filter).

\n" }, "git_filter_shutdown_fn": { "type": "callback", "file": "sys/filter.h", - "line": 164, - "lineto": 164, + "line": 153, + "lineto": 153, "args": [ { "name": "self", @@ -23827,13 +24042,13 @@ "comment": null }, "description": "

Shutdown callback on filter

\n", - "comments": "

Specified as filter.shutdown, this is an optional callback invoked\n when the filter is unregistered or when libgit2 is shutting down. It\n will be called once at most and should release resources as needed.\n This may be called even if the initialize callback was not made.

\n\n

Typically this function will free the git_filter object itself.

\n" + "comments": "

Specified as filter.shutdown, this is an optional callback invoked when the filter is unregistered or when libgit2 is shutting down. It will be called once at most and should release resources as needed. This may be called even if the initialize callback was not made.

\n\n

Typically this function will free the git_filter object itself.

\n" }, "git_filter_check_fn": { "type": "callback", "file": "sys/filter.h", - "line": 186, - "lineto": 190, + "line": 175, + "lineto": 179, "args": [ { "name": "self", @@ -23863,13 +24078,13 @@ "comment": null }, "description": "

Callback to decide if a given source needs this filter

\n", - "comments": "

Specified as filter.check, this is an optional callback that checks\n if filtering is needed for a given source.

\n\n

It should return 0 if the filter should be applied (i.e. success),\n GIT_PASSTHROUGH if the filter should not be applied, or an error code\n to fail out of the filter processing pipeline and return to the caller.

\n\n

The attr_values will be set to the values of any attributes given in\n the filter definition. See git_filter below for more detail.

\n\n

The payload will be a pointer to a reference payload for the filter.\n This will start as NULL, but check can assign to this pointer for\n later use by the apply callback. Note that the value should be heap\n allocated (not stack), so that it doesn't go away before the apply\n callback can use it. If a filter allocates and assigns a value to the\n payload, it will need a cleanup callback to free the payload.

\n" + "comments": "

Specified as filter.check, this is an optional callback that checks if filtering is needed for a given source.

\n\n

It should return 0 if the filter should be applied (i.e. success), GIT_PASSTHROUGH if the filter should not be applied, or an error code to fail out of the filter processing pipeline and return to the caller.

\n\n

The attr_values will be set to the values of any attributes given in the filter definition. See git_filter below for more detail.

\n\n

The payload will be a pointer to a reference payload for the filter. This will start as NULL, but check can assign to this pointer for later use by the apply callback. Note that the value should be heap allocated (not stack), so that it doesn't go away before the apply callback can use it. If a filter allocates and assigns a value to the payload, it will need a cleanup callback to free the payload.

\n" }, "git_filter_apply_fn": { "type": "callback", "file": "sys/filter.h", - "line": 204, - "lineto": 209, + "line": 193, + "lineto": 198, "args": [ { "name": "self", @@ -23904,13 +24119,13 @@ "comment": null }, "description": "

Callback to actually perform the data filtering

\n", - "comments": "

Specified as filter.apply, this is the callback that actually filters\n data. If it successfully writes the output, it should return 0. Like\n check, it can return GIT_PASSTHROUGH to indicate that the filter\n doesn't want to run. Other error codes will stop filter processing and\n return to the caller.

\n\n

The payload value will refer to any payload that was set by the\n check callback. It may be read from or written to as needed.

\n" + "comments": "

Specified as filter.apply, this is the callback that actually filters data. If it successfully writes the output, it should return 0. Like check, it can return GIT_PASSTHROUGH to indicate that the filter doesn't want to run. Other error codes will stop filter processing and return to the caller.

\n\n

The payload value will refer to any payload that was set by the check callback. It may be read from or written to as needed.

\n" }, "git_filter_cleanup_fn": { "type": "callback", "file": "sys/filter.h", - "line": 226, - "lineto": 228, + "line": 215, + "lineto": 217, "args": [ { "name": "self", @@ -23930,7 +24145,7 @@ "comment": null }, "description": "

Callback to clean up after filtering has been applied

\n", - "comments": "

Specified as filter.cleanup, this is an optional callback invoked\n after the filter has been applied. If the check or apply callbacks\n allocated a payload to keep per-source filter state, use this\n callback to free that payload and release resources as required.

\n" + "comments": "

Specified as filter.cleanup, this is an optional callback invoked after the filter has been applied. If the check or apply callbacks allocated a payload to keep per-source filter state, use this callback to free that payload and release resources as required.

\n" }, "git_trace_callback": { "type": "callback", @@ -23992,8 +24207,8 @@ "git_cred_acquire_cb": { "type": "callback", "file": "transport.h", - "line": 329, - "lineto": 334, + "line": 333, + "lineto": 338, "args": [ { "name": "cred", @@ -24028,7 +24243,7 @@ "comment": null }, "description": "

Signature of a function which acquires a credential object.

\n", - "comments": "
    \n
  • cred: The newly created credential object.
    • \n
  • url: The resource for which we are demanding a credential.
    • \n
  • username_from_url: The username that was embedded in a "user\n@\nhost"\n remote url, or NULL if not included.
    • \n
  • allowed_types: A bitmask stating which cred types are OK to return.
    • \n
  • payload: The payload provided when specifying this callback.
    • \n
  • returns 0 for success, \n<\n0 to indicate an error, > 0 to indicate\n no credential was acquired
    • \n
\n" + "comments": "
    \n
  • cred: The newly created credential object. - url: The resource for which we are demanding a credential. - username_from_url: The username that was embedded in a "user@host" remote url, or NULL if not included. - allowed_types: A bitmask stating which cred types are OK to return. - payload: The payload provided when specifying this callback. - returns 0 for success, < 0 to indicate an error, > 0 to indicate no credential was acquired
    • \n
\n" }, "git_treebuilder_filter_cb": { "type": "callback", @@ -24054,7 +24269,7 @@ "comment": null }, "description": "

Callback for git_treebuilder_filter

\n", - "comments": "

The return value is treated as a boolean, with zero indicating that the\n entry should be left alone and any non-zero value meaning that the\n entry should be removed from the treebuilder list (i.e. filtered out).

\n" + "comments": "

The return value is treated as a boolean, with zero indicating that the entry should be left alone and any non-zero value meaning that the entry should be removed from the treebuilder list (i.e. filtered out).

\n" }, "git_treewalk_cb": { "type": "callback", @@ -24258,7 +24473,9 @@ } ], "used": { - "returns": [], + "returns": [ + "git_attr_value" + ], "needs": [] } } @@ -24330,13 +24547,13 @@ "git_blame_hunk", { "decl": [ - "uint16_t lines_in_hunk", + "size_t lines_in_hunk", "git_oid final_commit_id", - "uint16_t final_start_line_number", + "size_t final_start_line_number", "git_signature * final_signature", "git_oid orig_commit_id", "const char * orig_path", - "uint16_t orig_start_line_number", + "size_t orig_start_line_number", "git_signature * orig_signature", "char boundary" ], @@ -24345,13 +24562,13 @@ "file": "blame.h", "line": 115, "lineto": 128, - "block": "uint16_t lines_in_hunk\ngit_oid final_commit_id\nuint16_t final_start_line_number\ngit_signature * final_signature\ngit_oid orig_commit_id\nconst char * orig_path\nuint16_t orig_start_line_number\ngit_signature * orig_signature\nchar boundary", + "block": "size_t lines_in_hunk\ngit_oid final_commit_id\nsize_t final_start_line_number\ngit_signature * final_signature\ngit_oid orig_commit_id\nconst char * orig_path\nsize_t orig_start_line_number\ngit_signature * orig_signature\nchar boundary", "tdef": "typedef", "description": " Structure that represents a blame hunk.", - "comments": "
    \n
  • lines_in_hunk is the number of lines in this hunk
    • \n
  • final_commit_id is the OID of the commit where this line was last\nchanged.
    • \n
  • final_start_line_number is the 1-based line number where this hunk\nbegins, in the final version of the file
    • \n
  • orig_commit_id is the OID of the commit where this hunk was found. This\nwill usually be the same as final_commit_id, except when\nGIT_BLAME_TRACK_COPIES_ANY_COMMIT_COPIES has been specified.
    • \n
  • orig_path is the path to the file where this hunk originated, as of the\ncommit specified by orig_commit_id.
    • \n
  • orig_start_line_number is the 1-based line number where this hunk begins\nin the file named by orig_path in the commit specified by\norig_commit_id.
    • \n
  • boundary is 1 iff the hunk has been tracked to a boundary commit (the\nroot, or the commit specified in git_blame_options.oldest_commit)
    • \n
\n", + "comments": "
    \n
  • lines_in_hunk is the number of lines in this hunk - final_commit_id is the OID of the commit where this line was last changed. - final_start_line_number is the 1-based line number where this hunk begins, in the final version of the file - orig_commit_id is the OID of the commit where this hunk was found. This will usually be the same as final_commit_id, except when GIT_BLAME_TRACK_COPIES_ANY_COMMIT_COPIES has been specified. - orig_path is the path to the file where this hunk originated, as of the commit specified by orig_commit_id. - orig_start_line_number is the 1-based line number where this hunk begins in the file named by orig_path in the commit specified by orig_commit_id. - boundary is 1 iff the hunk has been tracked to a boundary commit (the root, or the commit specified in git_blame_options.oldest_commit)
    • \n
\n", "fields": [ { - "type": "uint16_t", + "type": "size_t", "name": "lines_in_hunk", "comments": "" }, @@ -24361,7 +24578,7 @@ "comments": "" }, { - "type": "uint16_t", + "type": "size_t", "name": "final_start_line_number", "comments": "" }, @@ -24381,7 +24598,7 @@ "comments": "" }, { - "type": "uint16_t", + "type": "size_t", "name": "orig_start_line_number", "comments": "" }, @@ -24414,18 +24631,18 @@ "uint16_t min_match_characters", "git_oid newest_commit", "git_oid oldest_commit", - "uint32_t min_line", - "uint32_t max_line" + "size_t min_line", + "size_t max_line" ], "type": "struct", "value": "git_blame_options", "file": "blame.h", "line": 70, "lineto": 79, - "block": "unsigned int version\nuint32_t flags\nuint16_t min_match_characters\ngit_oid newest_commit\ngit_oid oldest_commit\nuint32_t min_line\nuint32_t max_line", + "block": "unsigned int version\nuint32_t flags\nuint16_t min_match_characters\ngit_oid newest_commit\ngit_oid oldest_commit\nsize_t min_line\nsize_t max_line", "tdef": "typedef", "description": " Blame options structure", - "comments": "

Use zeros to indicate default settings. It's easiest to use the\n GIT_BLAME_OPTIONS_INIT macro:\n git_blame_options opts = GIT_BLAME_OPTIONS_INIT;

\n\n
    \n
  • flags is a combination of the git_blame_flag_t values above.
    • \n
  • min_match_characters is the lower bound on the number of alphanumeric\ncharacters that must be detected as moving/copying within a file for it to\nassociate those lines with the parent commit. The default value is 20.\nThis value only takes effect if any of the GIT_BLAME_TRACK_COPIES_*\nflags are specified.
    • \n
  • newest_commit is the id of the newest commit to consider. The default\n is HEAD.
    • \n
  • oldest_commit is the id of the oldest commit to consider. The default\n is the first commit encountered with a NULL parent.\n\n
      \n
    • min_line is the first line in the file to blame. The default is 1 (line\n numbers start with 1).
      • \n
    • max_line is the last line in the file to blame. The default is the last\n line of the file.
      • \n
    • \n
\n", + "comments": "

Use zeros to indicate default settings. It's easiest to use the GIT_BLAME_OPTIONS_INIT macro: git_blame_options opts = GIT_BLAME_OPTIONS_INIT;

\n\n
    \n
  • flags is a combination of the git_blame_flag_t values above. - min_match_characters is the lower bound on the number of alphanumeric characters that must be detected as moving/copying within a file for it to associate those lines with the parent commit. The default value is 20. This value only takes effect if any of the GIT_BLAME_TRACK_COPIES_* flags are specified. - newest_commit is the id of the newest commit to consider. The default is HEAD. - oldest_commit is the id of the oldest commit to consider. The default is the first commit encountered with a NULL parent. - min_line is the first line in the file to blame. The default is 1 (line numbers start with 1). - max_line is the last line in the file to blame. The default is the last line of the file.
    • \n
\n", "fields": [ { "type": "unsigned int", @@ -24453,12 +24670,12 @@ "comments": "" }, { - "type": "uint32_t", + "type": "size_t", "name": "min_line", "comments": "" }, { - "type": "uint32_t", + "type": "size_t", "name": "max_line", "comments": "" } @@ -24487,6 +24704,7 @@ "used": { "returns": [], "needs": [ + "git_blob_create_fromchunks", "git_blob_filtered_content", "git_blob_free", "git_blob_id", @@ -24591,7 +24809,7 @@ "block": "char * ptr\nsize_t asize\nsize_t size", "tdef": "typedef", "description": " A data buffer for exporting data from libgit2", - "comments": "

Sometimes libgit2 wants to return an allocated data buffer to the\n caller and have the caller take responsibility for freeing that memory.\n This can be awkward if the caller does not have easy access to the same\n allocation functions that libgit2 is using. In those cases, libgit2\n will fill in a git_buf and the caller can use git_buf_free() to\n release it when they are done.

\n\n

A git_buf may also be used for the caller to pass in a reference to\n a block of memory they hold. In this case, libgit2 will not resize or\n free the memory, but will read from it as needed.

\n\n

A git_buf is a public structure with three fields:

\n\n
    \n

  • ptr points to the start of the allocated memory. If it is NULL,\nthen the git_buf is considered empty and libgit2 will feel free\nto overwrite it with new data.

    • \n

  • size holds the size (in bytes) of the data that is actually used.

    • \n

  • asize holds the known total amount of allocated memory if the ptr\nwas allocated by libgit2. It may be larger than size. If ptr\nwas not allocated by libgit2 and should not be resized and/or freed,\nthen asize will be set to zero.

    • \n
\n\n

Some APIs may occasionally do something slightly unusual with a buffer,\n such as setting ptr to a value that was passed in by the user. In\n those cases, the behavior will be clearly documented by the API.

\n", + "comments": "

Sometimes libgit2 wants to return an allocated data buffer to the caller and have the caller take responsibility for freeing that memory. This can be awkward if the caller does not have easy access to the same allocation functions that libgit2 is using. In those cases, libgit2 will fill in a git_buf and the caller can use git_buf_free() to release it when they are done.

\n\n

A git_buf may also be used for the caller to pass in a reference to a block of memory they hold. In this case, libgit2 will not resize or free the memory, but will read from it as needed.

\n\n

A git_buf is a public structure with three fields:

\n\n
    \n

  • ptr points to the start of the allocated memory. If it is NULL, then the git_buf is considered empty and libgit2 will feel free to overwrite it with new data.

    • \n

  • size holds the size (in bytes) of the data that is actually used.

    • \n

  • asize holds the known total amount of allocated memory if the ptr was allocated by libgit2. It may be larger than size. If ptr was not allocated by libgit2 and should not be resized and/or freed, then asize will be set to zero.

    • \n
\n\n

Some APIs may occasionally do something slightly unusual with a buffer, such as setting ptr to a value that was passed in by the user. In those cases, the behavior will be clearly documented by the API.

\n", "fields": [ { "type": "char *", @@ -24618,8 +24836,10 @@ "git_buf_grow", "git_buf_is_binary", "git_buf_set", + "git_commit_extract_signature", "git_commit_header_field", "git_config_find_global", + "git_config_find_programdata", "git_config_find_system", "git_config_find_xdg", "git_config_get_path", @@ -24629,6 +24849,7 @@ "git_diff_commit_as_email", "git_diff_format_email", "git_diff_stats_to_buf", + "git_filter_apply_fn", "git_filter_list_apply_to_blob", "git_filter_list_apply_to_data", "git_filter_list_apply_to_file", @@ -24670,7 +24891,10 @@ ], "used": { "returns": [], - "needs": [] + "needs": [ + "git_transport_certificate_check_cb", + "git_transport_smart_certificate_check" + ] } } ], @@ -24678,7 +24902,7 @@ "git_cert_hostkey", { "decl": [ - "git_cert_t cert_type", + "git_cert parent", "git_cert_ssh_t type", "unsigned char [16] hash_md5", "unsigned char [20] hash_sha1" @@ -24687,16 +24911,16 @@ "value": "git_cert_hostkey", "file": "transport.h", "line": 39, - "lineto": 62, - "block": "git_cert_t cert_type\ngit_cert_ssh_t type\nunsigned char [16] hash_md5\nunsigned char [20] hash_sha1", + "lineto": 59, + "block": "git_cert parent\ngit_cert_ssh_t type\nunsigned char [16] hash_md5\nunsigned char [20] hash_sha1", "tdef": "typedef", "description": " Hostkey information taken from libssh2", "comments": "", "fields": [ { - "type": "git_cert_t", - "name": "cert_type", - "comments": " Type of certificate. Here to share the header with\n `git_cert`." + "type": "git_cert", + "name": "parent", + "comments": "" }, { "type": "git_cert_ssh_t", @@ -24808,24 +25032,24 @@ "git_cert_x509", { "decl": [ - "git_cert_t cert_type", + "git_cert parent", "void * data", "size_t len" ], "type": "struct", "value": "git_cert_x509", "file": "transport.h", - "line": 67, - "lineto": 81, - "block": "git_cert_t cert_type\nvoid * data\nsize_t len", + "line": 64, + "lineto": 74, + "block": "git_cert parent\nvoid * data\nsize_t len", "tdef": "typedef", "description": " X.509 certificate information", "comments": "", "fields": [ { - "type": "git_cert_t", - "name": "cert_type", - "comments": " Type of certificate. Here to share the header with\n `git_cert`." + "type": "git_cert", + "name": "parent", + "comments": "" }, { "type": "void *", @@ -24863,7 +25087,7 @@ "block": "GIT_CHECKOUT_NOTIFY_NONE\nGIT_CHECKOUT_NOTIFY_CONFLICT\nGIT_CHECKOUT_NOTIFY_DIRTY\nGIT_CHECKOUT_NOTIFY_UPDATED\nGIT_CHECKOUT_NOTIFY_UNTRACKED\nGIT_CHECKOUT_NOTIFY_IGNORED\nGIT_CHECKOUT_NOTIFY_ALL", "tdef": "typedef", "description": " Checkout notification flags", - "comments": "

Checkout will invoke an options notification callback (notify_cb) for\n certain cases - you pick which ones via notify_flags:

\n\n
    \n

  • GIT_CHECKOUT_NOTIFY_CONFLICT invokes checkout on conflicting paths.

    • \n

  • GIT_CHECKOUT_NOTIFY_DIRTY notifies about "dirty" files, i.e. those that\ndo not need an update but no longer match the baseline. Core git\ndisplays these files when checkout runs, but won't stop the checkout.

    • \n

  • GIT_CHECKOUT_NOTIFY_UPDATED sends notification for any file changed.

    • \n

  • GIT_CHECKOUT_NOTIFY_UNTRACKED notifies about untracked files.

    • \n

  • GIT_CHECKOUT_NOTIFY_IGNORED notifies about ignored files.

    • \n
\n\n

Returning a non-zero value from this callback will cancel the checkout.\n The non-zero return value will be propagated back and returned by the\n git_checkout_... call.

\n\n

Notification callbacks are made prior to modifying any files on disk,\n so canceling on any notification will still happen prior to any files\n being modified.

\n", + "comments": "

Checkout will invoke an options notification callback (notify_cb) for certain cases - you pick which ones via notify_flags:

\n\n
    \n

  • GIT_CHECKOUT_NOTIFY_CONFLICT invokes checkout on conflicting paths.

    • \n

  • GIT_CHECKOUT_NOTIFY_DIRTY notifies about "dirty" files, i.e. those that do not need an update but no longer match the baseline. Core git displays these files when checkout runs, but won't stop the checkout.

    • \n

  • GIT_CHECKOUT_NOTIFY_UPDATED sends notification for any file changed.

    • \n

  • GIT_CHECKOUT_NOTIFY_UNTRACKED notifies about untracked files.

    • \n

  • GIT_CHECKOUT_NOTIFY_IGNORED notifies about ignored files.

    • \n
\n\n

Returning a non-zero value from this callback will cancel the checkout. The non-zero return value will be propagated back and returned by the git_checkout_... call.

\n\n

Notification callbacks are made prior to modifying any files on disk, so canceling on any notification will still happen prior to any files being modified.

\n", "fields": [ { "type": "int", @@ -24910,7 +25134,9 @@ ], "used": { "returns": [], - "needs": [] + "needs": [ + "git_checkout_notify_cb" + ] } } ], @@ -24947,7 +25173,7 @@ "block": "unsigned int version\nunsigned int checkout_strategy\nint disable_filters\nunsigned int dir_mode\nunsigned int file_mode\nint file_open_flags\nunsigned int notify_flags\ngit_checkout_notify_cb notify_cb\nvoid * notify_payload\ngit_checkout_progress_cb progress_cb\nvoid * progress_payload\ngit_strarray paths\ngit_tree * baseline\ngit_index * baseline_index\nconst char * target_directory\nconst char * ancestor_label\nconst char * our_label\nconst char * their_label\ngit_checkout_perfdata_cb perfdata_cb\nvoid * perfdata_payload", "tdef": "typedef", "description": " Checkout options structure", - "comments": "

Zero out for defaults. Initialize with GIT_CHECKOUT_OPTIONS_INIT macro to\n correctly set the version field. E.g.

\n\n
    git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT;\n
\n", + "comments": "

Zero out for defaults. Initialize with GIT_CHECKOUT_OPTIONS_INIT macro to correctly set the version field. E.g.

\n\n
    git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT;\n
\n", "fields": [ { "type": "unsigned int", @@ -25098,7 +25324,7 @@ "block": "GIT_CHECKOUT_NONE\nGIT_CHECKOUT_SAFE\nGIT_CHECKOUT_FORCE\nGIT_CHECKOUT_RECREATE_MISSING\nGIT_CHECKOUT_ALLOW_CONFLICTS\nGIT_CHECKOUT_REMOVE_UNTRACKED\nGIT_CHECKOUT_REMOVE_IGNORED\nGIT_CHECKOUT_UPDATE_ONLY\nGIT_CHECKOUT_DONT_UPDATE_INDEX\nGIT_CHECKOUT_NO_REFRESH\nGIT_CHECKOUT_SKIP_UNMERGED\nGIT_CHECKOUT_USE_OURS\nGIT_CHECKOUT_USE_THEIRS\nGIT_CHECKOUT_DISABLE_PATHSPEC_MATCH\nGIT_CHECKOUT_SKIP_LOCKED_DIRECTORIES\nGIT_CHECKOUT_DONT_OVERWRITE_IGNORED\nGIT_CHECKOUT_CONFLICT_STYLE_MERGE\nGIT_CHECKOUT_CONFLICT_STYLE_DIFF3\nGIT_CHECKOUT_DONT_REMOVE_EXISTING\nGIT_CHECKOUT_DONT_WRITE_INDEX\nGIT_CHECKOUT_UPDATE_SUBMODULES\nGIT_CHECKOUT_UPDATE_SUBMODULES_IF_CHANGED", "tdef": "typedef", "description": " Checkout behavior flags", - "comments": "

In libgit2, checkout is used to update the working directory and index\n to match a target tree. Unlike git checkout, it does not move the HEAD\n commit for you - use git_repository_set_head or the like to do that.

\n\n

Checkout looks at (up to) four things: the "target" tree you want to\n check out, the "baseline" tree of what was checked out previously, the\n working directory for actual files, and the index for staged changes.

\n\n

You give checkout one of three strategies for update:

\n\n
    \n

  • GIT_CHECKOUT_NONE is a dry-run strategy that checks for conflicts,\netc., but doesn't make any actual changes.

    • \n

  • GIT_CHECKOUT_FORCE is at the opposite extreme, taking any action to\nmake the working directory match the target (including potentially\ndiscarding modified files).

    • \n

  • GIT_CHECKOUT_SAFE is between these two options, it will only make\nmodifications that will not lose changes.

    \n\n
                     |  target == baseline   |  target != baseline  |\n
    \n\n

    ---------------------|-----------------------|----------------------|\n workdir == baseline | no action | create, update, or |\n | | delete file |\n---------------------|-----------------------|----------------------|\n workdir exists and | no action | conflict (notify |\n is != baseline | notify dirty MODIFIED | and cancel checkout) |\n---------------------|-----------------------|----------------------|\n workdir missing, | notify dirty DELETED | create file |\n baseline present | | |\n---------------------|-----------------------|----------------------|

    • \n
\n\n

To emulate git checkout, use GIT_CHECKOUT_SAFE with a checkout\n notification callback (see below) that displays information about dirty\n files. The default behavior will cancel checkout on conflicts.

\n\n

To emulate git checkout-index, use GIT_CHECKOUT_SAFE with a\n notification callback that cancels the operation if a dirty-but-existing\n file is found in the working directory. This core git command isn't\n quite "force" but is sensitive about some types of changes.

\n\n

To emulate git checkout -f, use GIT_CHECKOUT_FORCE.

\n\n

There are some additional flags to modified the behavior of checkout:

\n\n
    \n

  • GIT_CHECKOUT_ALLOW_CONFLICTS makes SAFE mode apply safe file updates\neven if there are conflicts (instead of cancelling the checkout).

    • \n

  • GIT_CHECKOUT_REMOVE_UNTRACKED means remove untracked files (i.e. not\nin target, baseline, or index, and not ignored) from the working dir.

    • \n

  • GIT_CHECKOUT_REMOVE_IGNORED means remove ignored files (that are also\nuntracked) from the working directory as well.

    • \n

  • GIT_CHECKOUT_UPDATE_ONLY means to only update the content of files that\nalready exist. Files will not be created nor deleted. This just skips\napplying adds, deletes, and typechanges.

    • \n

  • GIT_CHECKOUT_DONT_UPDATE_INDEX prevents checkout from writing the\nupdated files' information to the index.

    • \n

  • Normally, checkout will reload the index and git attributes from disk\nbefore any operations. GIT_CHECKOUT_NO_REFRESH prevents this reload.

    • \n

  • Unmerged index entries are conflicts. GIT_CHECKOUT_SKIP_UNMERGED skips\nfiles with unmerged index entries instead. GIT_CHECKOUT_USE_OURS and\nGIT_CHECKOUT_USE_THEIRS to proceed with the checkout using either the\nstage 2 ("ours") or stage 3 ("theirs") version of files in the index.

    • \n

  • GIT_CHECKOUT_DONT_OVERWRITE_IGNORED prevents ignored files from being\noverwritten. Normally, files that are ignored in the working directory\nare not considered "precious" and may be overwritten if the checkout\ntarget contains that file.

    • \n

  • GIT_CHECKOUT_DONT_REMOVE_EXISTING prevents checkout from removing\nfiles or folders that fold to the same name on case insensitive\nfilesystems. This can cause files to retain their existing names\nand write through existing symbolic links.

    • \n
\n", + "comments": "

In libgit2, checkout is used to update the working directory and index to match a target tree. Unlike git checkout, it does not move the HEAD commit for you - use git_repository_set_head or the like to do that.

\n\n

Checkout looks at (up to) four things: the "target" tree you want to check out, the "baseline" tree of what was checked out previously, the working directory for actual files, and the index for staged changes.

\n\n

You give checkout one of three strategies for update:

\n\n
    \n

  • GIT_CHECKOUT_NONE is a dry-run strategy that checks for conflicts, etc., but doesn't make any actual changes.

    • \n

  • GIT_CHECKOUT_FORCE is at the opposite extreme, taking any action to make the working directory match the target (including potentially discarding modified files).

    • \n

  • GIT_CHECKOUT_SAFE is between these two options, it will only make modifications that will not lose changes.

    \n\n
                     |  target == baseline   |  target != baseline  |    ---------------------|-----------------------|----------------------|     workdir == baseline |       no action       |  create, update, or  |                         |                       |     delete file      |    ---------------------|-----------------------|----------------------|     workdir exists and  |       no action       |   conflict (notify   |       is != baseline    | notify dirty MODIFIED | and cancel checkout) |    ---------------------|-----------------------|----------------------|      workdir missing,   | notify dirty DELETED  |     create file      |      baseline present   |                       |                      |    ---------------------|-----------------------|----------------------|\n
    • \n
\n\n

To emulate git checkout, use GIT_CHECKOUT_SAFE with a checkout notification callback (see below) that displays information about dirty files. The default behavior will cancel checkout on conflicts.

\n\n

To emulate git checkout-index, use GIT_CHECKOUT_SAFE with a notification callback that cancels the operation if a dirty-but-existing file is found in the working directory. This core git command isn't quite "force" but is sensitive about some types of changes.

\n\n

To emulate git checkout -f, use GIT_CHECKOUT_FORCE.

\n\n

There are some additional flags to modified the behavior of checkout:

\n\n
    \n

  • GIT_CHECKOUT_ALLOW_CONFLICTS makes SAFE mode apply safe file updates even if there are conflicts (instead of cancelling the checkout).

    • \n

  • GIT_CHECKOUT_REMOVE_UNTRACKED means remove untracked files (i.e. not in target, baseline, or index, and not ignored) from the working dir.

    • \n

  • GIT_CHECKOUT_REMOVE_IGNORED means remove ignored files (that are also untracked) from the working directory as well.

    • \n

  • GIT_CHECKOUT_UPDATE_ONLY means to only update the content of files that already exist. Files will not be created nor deleted. This just skips applying adds, deletes, and typechanges.

    • \n

  • GIT_CHECKOUT_DONT_UPDATE_INDEX prevents checkout from writing the updated files' information to the index.

    • \n

  • Normally, checkout will reload the index and git attributes from disk before any operations. GIT_CHECKOUT_NO_REFRESH prevents this reload.

    • \n

  • Unmerged index entries are conflicts. GIT_CHECKOUT_SKIP_UNMERGED skips files with unmerged index entries instead. GIT_CHECKOUT_USE_OURS and GIT_CHECKOUT_USE_THEIRS to proceed with the checkout using either the stage 2 ("ours") or stage 3 ("theirs") version of files in the index.

    • \n

  • GIT_CHECKOUT_DONT_OVERWRITE_IGNORED prevents ignored files from being overwritten. Normally, files that are ignored in the working directory are not considered "precious" and may be overwritten if the checkout target contains that file.

    • \n

  • GIT_CHECKOUT_DONT_REMOVE_EXISTING prevents checkout from removing files or folders that fold to the same name on case insensitive filesystems. This can cause files to retain their existing names and write through existing symbolic links.

    • \n
\n", "fields": [ { "type": "int", @@ -25442,8 +25668,10 @@ "git_cherrypick_commit", "git_commit_amend", "git_commit_author", + "git_commit_body", "git_commit_committer", "git_commit_create", + "git_commit_create_from_callback", "git_commit_free", "git_commit_header_field", "git_commit_id", @@ -25488,8 +25716,10 @@ "needs": [ "git_config_add_backend", "git_config_add_file_ondisk", + "git_config_backend_foreach_match", "git_config_delete_entry", "git_config_delete_multivar", + "git_config_entry_free", "git_config_foreach", "git_config_foreach_match", "git_config_free", @@ -25502,10 +25732,14 @@ "git_config_get_path", "git_config_get_string", "git_config_get_string_buf", + "git_config_init_backend", + "git_config_iterator_free", "git_config_iterator_glob_new", "git_config_iterator_new", + "git_config_lock", "git_config_multivar_iterator_new", "git_config_new", + "git_config_next", "git_config_open_default", "git_config_open_global", "git_config_open_level", @@ -25532,7 +25766,7 @@ "file": "types.h", "line": 141, "lineto": 141, - "block": "unsigned int version\nint readonly\nstruct git_config * cfg\nint (*)(struct git_config_backend *, git_config_level_t) open\nint (*)(struct git_config_backend *, const char *, git_config_entry **) get\nint (*)(struct git_config_backend *, const char *, const char *) set\nint (*)(git_config_backend *, const char *, const char *, const char *) set_multivar\nint (*)(struct git_config_backend *, const char *) del\nint (*)(struct git_config_backend *, const char *, const char *) del_multivar\nint (*)(git_config_iterator **, struct git_config_backend *) iterator\nint (*)(struct git_config_backend **, struct git_config_backend *) snapshot\nvoid (*)(struct git_config_backend *) free", + "block": "unsigned int version\nint readonly\nstruct git_config * cfg\nint (*)(struct git_config_backend *, git_config_level_t) open\nint (*)(struct git_config_backend *, const char *, git_config_entry **) get\nint (*)(struct git_config_backend *, const char *, const char *) set\nint (*)(git_config_backend *, const char *, const char *, const char *) set_multivar\nint (*)(struct git_config_backend *, const char *) del\nint (*)(struct git_config_backend *, const char *, const char *) del_multivar\nint (*)(git_config_iterator **, struct git_config_backend *) iterator\nint (*)(struct git_config_backend **, struct git_config_backend *) snapshot\nint (*)(struct git_config_backend *) lock\nint (*)(struct git_config_backend *, int) unlock\nvoid (*)(struct git_config_backend *) free", "tdef": "typedef", "description": " Interface to access a configuration file ", "comments": "", @@ -25592,6 +25826,16 @@ "name": "snapshot", "comments": " Produce a read-only version of this backend " }, + { + "type": "int (*)(struct git_config_backend *)", + "name": "lock", + "comments": " Lock this backend.\n\n Prevent any writes to the data store backing this\n backend. Any updates must not be visible to any other\n readers." + }, + { + "type": "int (*)(struct git_config_backend *, int)", + "name": "unlock", + "comments": " Unlock the data store backing this backend. If success is\n true, the changes should be committed, otherwise rolled\n back." + }, { "type": "void (*)(struct git_config_backend *)", "name": "free", @@ -25621,8 +25865,8 @@ "type": "struct", "value": "git_config_entry", "file": "config.h", - "line": 61, - "lineto": 67, + "line": 64, + "lineto": 70, "block": "const char * name\nconst char * value\ngit_config_level_t level\nvoid (*)(struct git_config_entry *) free\nvoid * payload", "tdef": "typedef", "description": " An entry in a configuration file", @@ -25681,7 +25925,7 @@ "block": "git_config_backend * backend\nunsigned int flags\nint (*)(git_config_entry **, git_config_iterator *) next\nvoid (*)(git_config_iterator *) free", "tdef": null, "description": " Every iterator must have this struct as its first element, so the\n API can talk to it. You'd define your iterator as", - "comments": "
 struct my_iterator {\n         git_config_iterator parent;\n         ...\n }\n
\n\n

and assign iter->parent.backend to your git_config_backend.

\n", + "comments": "
 struct my_iterator {             git_config_iterator parent;             ...     }\n
\n\n

and assign iter->parent.backend to your git_config_backend.

\n", "fields": [ { "type": "git_config_backend *", @@ -25720,6 +25964,7 @@ "git_config_level_t", { "decl": [ + "GIT_CONFIG_LEVEL_PROGRAMDATA", "GIT_CONFIG_LEVEL_SYSTEM", "GIT_CONFIG_LEVEL_XDG", "GIT_CONFIG_LEVEL_GLOBAL", @@ -25730,41 +25975,47 @@ "type": "enum", "file": "config.h", "line": 31, - "lineto": 56, - "block": "GIT_CONFIG_LEVEL_SYSTEM\nGIT_CONFIG_LEVEL_XDG\nGIT_CONFIG_LEVEL_GLOBAL\nGIT_CONFIG_LEVEL_LOCAL\nGIT_CONFIG_LEVEL_APP\nGIT_CONFIG_HIGHEST_LEVEL", + "lineto": 59, + "block": "GIT_CONFIG_LEVEL_PROGRAMDATA\nGIT_CONFIG_LEVEL_SYSTEM\nGIT_CONFIG_LEVEL_XDG\nGIT_CONFIG_LEVEL_GLOBAL\nGIT_CONFIG_LEVEL_LOCAL\nGIT_CONFIG_LEVEL_APP\nGIT_CONFIG_HIGHEST_LEVEL", "tdef": "typedef", "description": " Priority level of a config file.\n These priority levels correspond to the natural escalation logic\n (from higher to lower) when searching for config entries in git.git.", - "comments": "

git_config_open_default() and git_repository_config() honor those\n priority levels as well.

\n", + "comments": "

git_config_open_default() and git_repository_config() honor those priority levels as well.

\n", "fields": [ + { + "type": "int", + "name": "GIT_CONFIG_LEVEL_PROGRAMDATA", + "comments": "

System-wide on Windows, for compatibility with portable git

\n", + "value": 1 + }, { "type": "int", "name": "GIT_CONFIG_LEVEL_SYSTEM", "comments": "

System-wide configuration file; /etc/gitconfig on Linux systems

\n", - "value": 1 + "value": 2 }, { "type": "int", "name": "GIT_CONFIG_LEVEL_XDG", "comments": "

XDG compatible configuration file; typically ~/.config/git/config

\n", - "value": 2 + "value": 3 }, { "type": "int", "name": "GIT_CONFIG_LEVEL_GLOBAL", "comments": "

User-specific configuration file (also called Global configuration\n file); typically ~/.gitconfig

\n", - "value": 3 + "value": 4 }, { "type": "int", "name": "GIT_CONFIG_LEVEL_LOCAL", "comments": "

Repository specific configuration file; $WORK_DIR/.git/config on\n non-bare repos

\n", - "value": 4 + "value": 5 }, { "type": "int", "name": "GIT_CONFIG_LEVEL_APP", "comments": "

Application specific configuration file; freely defined by applications

\n", - "value": 5 + "value": 6 }, { "type": "int", @@ -25790,8 +26041,8 @@ "type": "struct", "value": "git_cred_default", "file": "transport.h", - "line": 183, - "lineto": 183, + "line": 176, + "lineto": 176, "tdef": "typedef", "description": " A key for NTLM/Kerberos \"default\" credentials ", "comments": "", @@ -25815,8 +26066,8 @@ "type": "struct", "value": "git_cred_ssh_custom", "file": "transport.h", - "line": 173, - "lineto": 180, + "line": 166, + "lineto": 173, "block": "git_cred parent\nchar * username\nchar * publickey\nsize_t publickey_len\ngit_cred_sign_callback sign_callback\nvoid * payload", "tdef": "typedef", "description": " A key with a custom signature function", @@ -25871,8 +26122,8 @@ "type": "struct", "value": "git_cred_ssh_interactive", "file": "transport.h", - "line": 163, - "lineto": 168, + "line": 156, + "lineto": 161, "block": "git_cred parent\nchar * username\ngit_cred_ssh_interactive_callback prompt_callback\nvoid * payload", "tdef": "typedef", "description": " Keyboard-interactive based ssh authentication", @@ -25901,7 +26152,9 @@ ], "used": { "returns": [], - "needs": [] + "needs": [ + "git_cred_ssh_interactive_new" + ] } } ], @@ -25918,8 +26171,8 @@ "type": "struct", "value": "git_cred_ssh_key", "file": "transport.h", - "line": 152, - "lineto": 158, + "line": 145, + "lineto": 151, "block": "git_cred parent\nchar * username\nchar * publickey\nchar * privatekey\nchar * passphrase", "tdef": "typedef", "description": " A ssh key from disk", @@ -25967,8 +26220,8 @@ "type": "struct", "value": "git_cred_username", "file": "transport.h", - "line": 186, - "lineto": 189, + "line": 179, + "lineto": 182, "block": "git_cred parent\nchar [1] username", "tdef": "typedef", "description": " Username-only credential information ", @@ -26036,8 +26289,8 @@ "type": "struct", "value": "git_cred_userpass_plaintext", "file": "transport.h", - "line": 129, - "lineto": 133, + "line": 122, + "lineto": 126, "block": "git_cred parent\nchar * username\nchar * password", "tdef": "typedef", "description": " A plaintext username and password ", @@ -26079,8 +26332,8 @@ ], "type": "enum", "file": "transport.h", - "line": 88, - "lineto": 118, + "line": 81, + "lineto": 111, "block": "GIT_CREDTYPE_USERPASS_PLAINTEXT\nGIT_CREDTYPE_SSH_KEY\nGIT_CREDTYPE_SSH_CUSTOM\nGIT_CREDTYPE_DEFAULT\nGIT_CREDTYPE_SSH_INTERACTIVE\nGIT_CREDTYPE_USERNAME\nGIT_CREDTYPE_SSH_MEMORY", "tdef": "typedef", "description": " Authentication type requested ", @@ -26146,8 +26399,8 @@ "type": "struct", "value": "git_cvar_map", "file": "config.h", - "line": 90, - "lineto": 94, + "line": 93, + "lineto": 97, "block": "git_cvar_t cvar_type\nconst char * str_match\nint map_value", "tdef": "typedef", "description": " Mapping from config variables to values.", @@ -26189,8 +26442,8 @@ ], "type": "enum", "file": "config.h", - "line": 80, - "lineto": 85, + "line": 83, + "lineto": 88, "block": "GIT_CVAR_FALSE\nGIT_CVAR_TRUE\nGIT_CVAR_INT32\nGIT_CVAR_STRING", "tdef": "typedef", "description": " Config var type", @@ -26245,12 +26498,12 @@ ], "type": "enum", "file": "diff.h", - "line": 242, - "lineto": 254, + "line": 246, + "lineto": 258, "block": "GIT_DELTA_UNMODIFIED\nGIT_DELTA_ADDED\nGIT_DELTA_DELETED\nGIT_DELTA_MODIFIED\nGIT_DELTA_RENAMED\nGIT_DELTA_COPIED\nGIT_DELTA_IGNORED\nGIT_DELTA_UNTRACKED\nGIT_DELTA_TYPECHANGE\nGIT_DELTA_UNREADABLE\nGIT_DELTA_CONFLICTED", "tdef": "typedef", "description": " What type of change is described by a git_diff_delta?", - "comments": "

GIT_DELTA_RENAMED and GIT_DELTA_COPIED will only show up if you run\n git_diff_find_similar() on the diff object.

\n\n

GIT_DELTA_TYPECHANGE only shows up given GIT_DIFF_INCLUDE_TYPECHANGE\n in the option flags (otherwise type changes will be split into ADDED /\n DELETED pairs).

\n", + "comments": "

GIT_DELTA_RENAMED and GIT_DELTA_COPIED will only show up if you run git_diff_find_similar() on the diff object.

\n\n

GIT_DELTA_TYPECHANGE only shows up given GIT_DIFF_INCLUDE_TYPECHANGE in the option flags (otherwise type changes will be split into ADDED / DELETED pairs).

\n", "fields": [ { "type": "int", @@ -26395,7 +26648,7 @@ "block": "unsigned int version\nunsigned int max_candidates_tags\nunsigned int describe_strategy\nconst char * pattern\nint only_follow_first_parent\nint show_commit_oid_as_fallback", "tdef": "typedef", "description": " Describe options structure", - "comments": "

Initialize with GIT_DESCRIBE_OPTIONS_INIT macro to correctly set\n the version field. E.g.

\n\n
    git_describe_options opts = GIT_DESCRIBE_OPTIONS_INIT;\n
\n", + "comments": "

Initialize with GIT_DESCRIBE_OPTIONS_INIT macro to correctly set the version field. E.g.

\n\n
    git_describe_options opts = GIT_DESCRIBE_OPTIONS_INIT;\n
\n", "fields": [ { "type": "unsigned int", @@ -26452,7 +26705,7 @@ "block": "GIT_DESCRIBE_DEFAULT\nGIT_DESCRIBE_TAGS\nGIT_DESCRIBE_ALL", "tdef": "typedef", "description": " Reference lookup strategy", - "comments": "

These behave like the --tags and --all optios to git-describe,\n namely they say to look for any reference in either refs/tags/ or\n refs/ respectively.

\n", + "comments": "

These behave like the --tags and --all optios to git-describe, namely they say to look for any reference in either refs/tags/ or refs/ respectively.

\n", "fields": [ { "type": "int", @@ -26486,33 +26739,66 @@ "type": "struct", "value": "git_diff", "file": "diff.h", - "line": 215, - "lineto": 215, + "line": 219, + "lineto": 219, "tdef": "typedef", "description": " The diff object that contains all individual file deltas.", - "comments": "

This is an opaque structure which will be allocated by one of the diff\n generator functions below (such as git_diff_tree_to_tree). You are\n responsible for releasing the object memory when done, using the\n git_diff_free() function.

\n", + "comments": "

This is an opaque structure which will be allocated by one of the diff generator functions below (such as git_diff_tree_to_tree). You are responsible for releasing the object memory when done, using the git_diff_free() function.

\n", "used": { - "returns": [], + "returns": [ + "git_diff_get_delta", + "git_patch_get_delta", + "git_pathspec_match_list_diff_entry" + ], "needs": [ + "git_checkout_notify_cb", + "git_diff_binary_cb", + "git_diff_blob_to_buffer", + "git_diff_blobs", + "git_diff_buffers", + "git_diff_commit_as_email", + "git_diff_file_cb", + "git_diff_find_init_options", "git_diff_find_similar", "git_diff_foreach", "git_diff_format_email", + "git_diff_format_email_init_options", "git_diff_free", "git_diff_get_delta", "git_diff_get_perfdata", "git_diff_get_stats", + "git_diff_hunk_cb", + "git_diff_index_to_index", "git_diff_index_to_workdir", + "git_diff_init_options", "git_diff_is_sorted_icase", + "git_diff_line_cb", "git_diff_merge", + "git_diff_notify_cb", "git_diff_num_deltas", "git_diff_num_deltas_of_type", "git_diff_print", + "git_diff_print_callback__to_buf", + "git_diff_print_callback__to_file_handle", + "git_diff_progress_cb", + "git_diff_stats_deletions", + "git_diff_stats_files_changed", + "git_diff_stats_free", + "git_diff_stats_insertions", + "git_diff_stats_to_buf", "git_diff_tree_to_index", "git_diff_tree_to_tree", "git_diff_tree_to_workdir", "git_diff_tree_to_workdir_with_index", + "git_patch_from_blob_and_buffer", + "git_patch_from_blobs", + "git_patch_from_buffers", "git_patch_from_diff", - "git_pathspec_match_diff" + "git_patch_get_hunk", + "git_patch_get_line_in_hunk", + "git_patch_print", + "git_pathspec_match_diff", + "git_status_list_get_perfdata" ] } } @@ -26527,8 +26813,8 @@ "type": "struct", "value": "git_diff_binary", "file": "diff.h", - "line": 461, - "lineto": 464, + "line": 484, + "lineto": 487, "block": "git_diff_binary_file old_file\ngit_diff_binary_file new_file", "tdef": "typedef", "description": " Structure describing the binary contents of a diff. ", @@ -26547,7 +26833,13 @@ ], "used": { "returns": [], - "needs": [] + "needs": [ + "git_diff_binary_cb", + "git_diff_blob_to_buffer", + "git_diff_blobs", + "git_diff_buffers", + "git_diff_foreach" + ] } } ], @@ -26563,8 +26855,8 @@ "type": "struct", "value": "git_diff_binary_file", "file": "diff.h", - "line": 446, - "lineto": 458, + "line": 469, + "lineto": 481, "block": "git_diff_binary_t type\nconst char * data\nsize_t datalen\nsize_t inflatedlen", "tdef": "typedef", "description": " The contents of one of the files in a binary diff. ", @@ -26607,8 +26899,8 @@ ], "type": "enum", "file": "diff.h", - "line": 434, - "lineto": 443, + "line": 457, + "lineto": 466, "block": "GIT_DIFF_BINARY_NONE\nGIT_DIFF_BINARY_LITERAL\nGIT_DIFF_BINARY_DELTA", "tdef": "typedef", "description": " When producing a binary diff, the binary data returned will be\n either the deflated full (\"literal\") contents of the file, or\n the deflated binary delta between the two sides (whichever is\n smaller).", @@ -26653,12 +26945,12 @@ "type": "struct", "value": "git_diff_delta", "file": "diff.h", - "line": 321, - "lineto": 328, + "line": 325, + "lineto": 332, "block": "git_delta_t status\nuint32_t flags\nuint16_t similarity\nuint16_t nfiles\ngit_diff_file old_file\ngit_diff_file new_file", "tdef": "typedef", "description": " Description of changes to one entry.", - "comments": "

When iterating over a diff, this will be passed to most callbacks and\n you can use the contents to understand exactly what has changed.

\n\n

The old_file represents the "from" side of the diff and the new_file\n represents to "to" side of the diff. What those means depend on the\n function that was used to generate the diff and will be documented below.\n You can also use the GIT_DIFF_REVERSE flag to flip it around.

\n\n

Although the two sides of the delta are named "old_file" and "new_file",\n they actually may correspond to entries that represent a file, a symbolic\n link, a submodule commit id, or even a tree (if you are tracking type\n changes or ignored/untracked directories).

\n\n

Under some circumstances, in the name of efficiency, not all fields will\n be filled in, but we generally try to fill in as much as possible. One\n example is that the "flags" field may not have either the BINARY or the\n NOT_BINARY flag set to avoid examining file contents if you do not pass\n in hunk and/or line callbacks to the diff foreach iteration function. It\n will just use the git attributes for those files.

\n\n

The similarity score is zero unless you call git_diff_find_similar()\n which does a similarity analysis of files in the diff. Use that\n function to do rename and copy detection, and to split heavily modified\n files in add/delete pairs. After that call, deltas with a status of\n GIT_DELTA_RENAMED or GIT_DELTA_COPIED will have a similarity score\n between 0 and 100 indicating how similar the old and new sides are.

\n\n

If you ask git_diff_find_similar to find heavily modified files to\n break, but to not actually break the records, then GIT_DELTA_MODIFIED\n records may have a non-zero similarity score if the self-similarity is\n below the split threshold. To display this value like core Git, invert\n the score (a la printf("M%03d", 100 - delta->similarity)).

\n", + "comments": "

When iterating over a diff, this will be passed to most callbacks and you can use the contents to understand exactly what has changed.

\n\n

The old_file represents the "from" side of the diff and the new_file represents to "to" side of the diff. What those means depend on the function that was used to generate the diff and will be documented below. You can also use the GIT_DIFF_REVERSE flag to flip it around.

\n\n

Although the two sides of the delta are named "old_file" and "new_file", they actually may correspond to entries that represent a file, a symbolic link, a submodule commit id, or even a tree (if you are tracking type changes or ignored/untracked directories).

\n\n

Under some circumstances, in the name of efficiency, not all fields will be filled in, but we generally try to fill in as much as possible. One example is that the "flags" field may not have either the BINARY or the NOT_BINARY flag set to avoid examining file contents if you do not pass in hunk and/or line callbacks to the diff foreach iteration function. It will just use the git attributes for those files.

\n\n

The similarity score is zero unless you call git_diff_find_similar() which does a similarity analysis of files in the diff. Use that function to do rename and copy detection, and to split heavily modified files in add/delete pairs. After that call, deltas with a status of GIT_DELTA_RENAMED or GIT_DELTA_COPIED will have a similarity score between 0 and 100 indicating how similar the old and new sides are.

\n\n

If you ask git_diff_find_similar to find heavily modified files to break, but to not actually break the records, then GIT_DELTA_MODIFIED records may have a non-zero similarity score if the self-similarity is below the split threshold. To display this value like core Git, invert the score (a la printf("M%03d", 100 - delta->similarity)).

\n", "fields": [ { "type": "git_delta_t", @@ -26698,6 +26990,11 @@ "git_pathspec_match_list_diff_entry" ], "needs": [ + "git_diff_binary_cb", + "git_diff_file_cb", + "git_diff_hunk_cb", + "git_diff_line_cb", + "git_diff_notify_cb", "git_diff_print_callback__to_buf", "git_diff_print_callback__to_file_handle" ] @@ -26717,12 +27014,12 @@ "type": "struct", "value": "git_diff_file", "file": "diff.h", - "line": 277, - "lineto": 283, + "line": 281, + "lineto": 287, "block": "git_oid id\nconst char * path\ngit_off_t size\nuint32_t flags\nuint16_t mode", "tdef": "typedef", "description": " Description of one side of a delta.", - "comments": "

Although this is called a "file", it could represent a file, a symbolic\n link, a submodule commit id, or even a tree (although that only if you\n are tracking type changes or ignored/untracked directories).

\n\n

The oid is the git_oid of the item. If the entry represents an\n absent side of a diff (e.g. the old_file of a GIT_DELTA_ADDED delta),\n then the oid will be zeroes.

\n\n

path is the NUL-terminated path to the entry relative to the working\n directory of the repository.

\n\n

size is the size of the entry in bytes.

\n\n

flags is a combination of the git_diff_flag_t types

\n\n

mode is, roughly, the stat() st_mode value for the item. This will\n be restricted to one of the git_filemode_t values.

\n", + "comments": "

Although this is called a "file", it could represent a file, a symbolic link, a submodule commit id, or even a tree (although that only if you are tracking type changes or ignored/untracked directories).

\n\n

The oid is the git_oid of the item. If the entry represents an absent side of a diff (e.g. the old_file of a GIT_DELTA_ADDED delta), then the oid will be zeroes.

\n\n

path is the NUL-terminated path to the entry relative to the working directory of the repository.

\n\n

size is the size of the entry in bytes.

\n\n

flags is a combination of the git_diff_flag_t types

\n\n

mode is, roughly, the stat() st_mode value for the item. This will be restricted to one of the git_filemode_t values.

\n", "fields": [ { "type": "git_oid", @@ -26752,7 +27049,13 @@ ], "used": { "returns": [], - "needs": [] + "needs": [ + "git_checkout_notify_cb", + "git_diff_blob_to_buffer", + "git_diff_blobs", + "git_diff_buffers", + "git_diff_foreach" + ] } } ], @@ -26772,12 +27075,12 @@ "type": "struct", "value": "git_diff_find_options", "file": "diff.h", - "line": 658, - "lineto": 684, + "line": 681, + "lineto": 707, "block": "unsigned int version\nuint32_t flags\nuint16_t rename_threshold\nuint16_t rename_from_rewrite_threshold\nuint16_t copy_threshold\nuint16_t break_rewrite_threshold\nsize_t rename_limit\ngit_diff_similarity_metric * metric", "tdef": "typedef", "description": " Control behavior of rename and copy detection", - "comments": "

These options mostly mimic parameters that can be passed to git-diff.

\n\n
    \n
  • rename_threshold is the same as the -M option with a value
    • \n
  • copy_threshold is the same as the -C option with a value
    • \n
  • rename_from_rewrite_threshold matches the top of the -B option
    • \n
  • break_rewrite_threshold matches the bottom of the -B option
    • \n
  • rename_limit is the maximum number of matches to consider for\na particular file. This is a little different from the -l option\nto regular Git because we will still process up to this many matches\nbefore abandoning the search.
    • \n
\n\n

The metric option allows you to plug in a custom similarity metric.\n Set it to NULL for the default internal metric which is based on sampling\n hashes of ranges of data in the file. The default metric is a pretty\n good similarity approximation that should work fairly well for both text\n and binary data, and is pretty fast with fixed memory overhead.

\n", + "comments": "

These options mostly mimic parameters that can be passed to git-diff.

\n\n
    \n
  • rename_threshold is the same as the -M option with a value - copy_threshold is the same as the -C option with a value - rename_from_rewrite_threshold matches the top of the -B option - break_rewrite_threshold matches the bottom of the -B option - rename_limit is the maximum number of matches to consider for a particular file. This is a little different from the -l option to regular Git because we will still process up to this many matches before abandoning the search.
    • \n
\n\n

The metric option allows you to plug in a custom similarity metric. Set it to NULL for the default internal metric which is based on sampling hashes of ranges of data in the file. The default metric is a pretty good similarity approximation that should work fairly well for both text and binary data, and is pretty fast with fixed memory overhead.

\n", "fields": [ { "type": "unsigned int", @@ -26852,8 +27155,8 @@ ], "type": "enum", "file": "diff.h", - "line": 552, - "lineto": 621, + "line": 575, + "lineto": 644, "block": "GIT_DIFF_FIND_BY_CONFIG\nGIT_DIFF_FIND_RENAMES\nGIT_DIFF_FIND_RENAMES_FROM_REWRITES\nGIT_DIFF_FIND_COPIES\nGIT_DIFF_FIND_COPIES_FROM_UNMODIFIED\nGIT_DIFF_FIND_REWRITES\nGIT_DIFF_BREAK_REWRITES\nGIT_DIFF_FIND_AND_BREAK_REWRITES\nGIT_DIFF_FIND_FOR_UNTRACKED\nGIT_DIFF_FIND_ALL\nGIT_DIFF_FIND_IGNORE_LEADING_WHITESPACE\nGIT_DIFF_FIND_IGNORE_WHITESPACE\nGIT_DIFF_FIND_DONT_IGNORE_WHITESPACE\nGIT_DIFF_FIND_EXACT_MATCH_ONLY\nGIT_DIFF_BREAK_REWRITES_FOR_RENAMES_ONLY\nGIT_DIFF_FIND_REMOVE_UNMODIFIED", "tdef": "typedef", "description": " Flags to control the behavior of diff rename/copy detection.", @@ -26973,12 +27276,12 @@ ], "type": "enum", "file": "diff.h", - "line": 225, - "lineto": 230, + "line": 229, + "lineto": 234, "block": "GIT_DIFF_FLAG_BINARY\nGIT_DIFF_FLAG_NOT_BINARY\nGIT_DIFF_FLAG_VALID_ID\nGIT_DIFF_FLAG_EXISTS", "tdef": "typedef", "description": " Flags for the delta object and the file objects on each side.", - "comments": "

These flags are used for both the flags value of the git_diff_delta\n and the flags for the git_diff_file objects representing the old and\n new sides of the delta. Values outside of this public range should be\n considered reserved for internal or future use.

\n", + "comments": "

These flags are used for both the flags value of the git_diff_delta and the flags for the git_diff_file objects representing the old and new sides of the delta. Values outside of this public range should be considered reserved for internal or future use.

\n", "fields": [ { "type": "int", @@ -27020,8 +27323,8 @@ ], "type": "enum", "file": "diff.h", - "line": 1218, - "lineto": 1225, + "line": 1260, + "lineto": 1267, "block": "GIT_DIFF_FORMAT_EMAIL_NONE\nGIT_DIFF_FORMAT_EMAIL_EXCLUDE_SUBJECT_PATCH_MARKER", "tdef": "typedef", "description": " Formatting options for diff e-mail generation", @@ -27058,14 +27361,15 @@ "size_t total_patches", "const git_oid * id", "const char * summary", + "const char * body", "const git_signature * author" ], "type": "struct", "value": "git_diff_format_email_options", "file": "diff.h", - "line": 1230, - "lineto": 1249, - "block": "unsigned int version\ngit_diff_format_email_flags_t flags\nsize_t patch_no\nsize_t total_patches\nconst git_oid * id\nconst char * summary\nconst git_signature * author", + "line": 1272, + "lineto": 1294, + "block": "unsigned int version\ngit_diff_format_email_flags_t flags\nsize_t patch_no\nsize_t total_patches\nconst git_oid * id\nconst char * summary\nconst char * body\nconst git_signature * author", "tdef": "typedef", "description": " Options for controlling the formatting of the generated e-mail.", "comments": "", @@ -27100,6 +27404,11 @@ "name": "summary", "comments": " Summary of the change " }, + { + "type": "const char *", + "name": "body", + "comments": " Commit message's body " + }, { "type": "const git_signature *", "name": "author", @@ -27127,8 +27436,8 @@ ], "type": "enum", "file": "diff.h", - "line": 981, - "lineto": 987, + "line": 1023, + "lineto": 1029, "block": "GIT_DIFF_FORMAT_PATCH\nGIT_DIFF_FORMAT_PATCH_HEADER\nGIT_DIFF_FORMAT_RAW\nGIT_DIFF_FORMAT_NAME_ONLY\nGIT_DIFF_FORMAT_NAME_STATUS", "tdef": "typedef", "description": " Possible output formats for diff data", @@ -27187,8 +27496,8 @@ "type": "struct", "value": "git_diff_hunk", "file": "diff.h", - "line": 478, - "lineto": 485, + "line": 501, + "lineto": 508, "block": "int old_start\nint old_lines\nint new_start\nint new_lines\nsize_t header_len\nchar [128] header", "tdef": "typedef", "description": " Structure describing a hunk of a diff.", @@ -27228,6 +27537,12 @@ "used": { "returns": [], "needs": [ + "git_diff_blob_to_buffer", + "git_diff_blobs", + "git_diff_buffers", + "git_diff_foreach", + "git_diff_hunk_cb", + "git_diff_line_cb", "git_diff_print_callback__to_buf", "git_diff_print_callback__to_file_handle", "git_patch_get_hunk" @@ -27250,8 +27565,8 @@ "type": "struct", "value": "git_diff_line", "file": "diff.h", - "line": 525, - "lineto": 533, + "line": 548, + "lineto": 556, "block": "char origin\nint old_lineno\nint new_lineno\nint num_lines\nsize_t content_len\ngit_off_t content_offset\nconst char * content", "tdef": "typedef", "description": " Structure describing a line (or data span) of a diff.", @@ -27296,9 +27611,16 @@ "used": { "returns": [], "needs": [ + "git_diff_blob_to_buffer", + "git_diff_blobs", + "git_diff_buffers", + "git_diff_foreach", + "git_diff_line_cb", + "git_diff_print", "git_diff_print_callback__to_buf", "git_diff_print_callback__to_file_handle", - "git_patch_get_line_in_hunk" + "git_patch_get_line_in_hunk", + "git_patch_print" ] } } @@ -27319,12 +27641,12 @@ ], "type": "enum", "file": "diff.h", - "line": 504, - "lineto": 520, + "line": 527, + "lineto": 543, "block": "GIT_DIFF_LINE_CONTEXT\nGIT_DIFF_LINE_ADDITION\nGIT_DIFF_LINE_DELETION\nGIT_DIFF_LINE_CONTEXT_EOFNL\nGIT_DIFF_LINE_ADD_EOFNL\nGIT_DIFF_LINE_DEL_EOFNL\nGIT_DIFF_LINE_FILE_HDR\nGIT_DIFF_LINE_HUNK_HDR\nGIT_DIFF_LINE_BINARY", "tdef": "typedef", "description": " Line origin constants.", - "comments": "

These values describe where a line came from and will be passed to\n the git_diff_line_cb when iterating over a diff. There are some\n special origin constants at the end that are used for the text\n output callbacks to demarcate lines that are actually part of\n the file or hunk headers.

\n", + "comments": "

These values describe where a line came from and will be passed to the git_diff_line_cb when iterating over a diff. There are some special origin constants at the end that are used for the text output callbacks to demarcate lines that are actually part of the file or hunk headers.

\n", "fields": [ { "type": "int", @@ -27424,7 +27746,7 @@ "type": "enum", "file": "diff.h", "line": 72, - "lineto": 205, + "lineto": 209, "block": "GIT_DIFF_NORMAL\nGIT_DIFF_REVERSE\nGIT_DIFF_INCLUDE_IGNORED\nGIT_DIFF_RECURSE_IGNORED_DIRS\nGIT_DIFF_INCLUDE_UNTRACKED\nGIT_DIFF_RECURSE_UNTRACKED_DIRS\nGIT_DIFF_INCLUDE_UNMODIFIED\nGIT_DIFF_INCLUDE_TYPECHANGE\nGIT_DIFF_INCLUDE_TYPECHANGE_TREES\nGIT_DIFF_IGNORE_FILEMODE\nGIT_DIFF_IGNORE_SUBMODULES\nGIT_DIFF_IGNORE_CASE\nGIT_DIFF_INCLUDE_CASECHANGE\nGIT_DIFF_DISABLE_PATHSPEC_MATCH\nGIT_DIFF_SKIP_BINARY_CHECK\nGIT_DIFF_ENABLE_FAST_UNTRACKED_DIRS\nGIT_DIFF_UPDATE_INDEX\nGIT_DIFF_INCLUDE_UNREADABLE\nGIT_DIFF_INCLUDE_UNREADABLE_AS_UNTRACKED\nGIT_DIFF_FORCE_TEXT\nGIT_DIFF_FORCE_BINARY\nGIT_DIFF_IGNORE_WHITESPACE\nGIT_DIFF_IGNORE_WHITESPACE_CHANGE\nGIT_DIFF_IGNORE_WHITESPACE_EOL\nGIT_DIFF_SHOW_UNTRACKED_CONTENT\nGIT_DIFF_SHOW_UNMODIFIED\nGIT_DIFF_PATIENCE\nGIT_DIFF_MINIMAL\nGIT_DIFF_SHOW_BINARY", "tdef": "typedef", "description": " Flags for diff options. A combination of these flags can be passed\n in via the `flags` value in the `git_diff_options`.", @@ -27511,7 +27833,7 @@ { "type": "int", "name": "GIT_DIFF_DISABLE_PATHSPEC_MATCH", - "comments": "

If the pathspec is set in the diff options, this flags means to\n apply it as an exact match instead of as an fnmatch pattern.

\n", + "comments": "

If the pathspec is set in the diff options, this flags indicates\n that the paths will be treated as literal paths instead of\n fnmatch patterns. Each path in the list must either be a full\n path to a file or a directory. (A trailing slash indicates that\n the path will only match a directory). If a directory is\n specified, all children will be included.

\n", "value": 4096 }, { @@ -27620,7 +27942,8 @@ "git_submodule_ignore_t ignore_submodules", "git_strarray pathspec", "git_diff_notify_cb notify_cb", - "void * notify_payload", + "git_diff_progress_cb progress_cb", + "void * payload", "uint32_t context_lines", "uint32_t interhunk_lines", "uint16_t id_abbrev", @@ -27631,12 +27954,12 @@ "type": "struct", "value": "git_diff_options", "file": "diff.h", - "line": 374, - "lineto": 393, - "block": "unsigned int version\nuint32_t flags\ngit_submodule_ignore_t ignore_submodules\ngit_strarray pathspec\ngit_diff_notify_cb notify_cb\nvoid * notify_payload\nuint32_t context_lines\nuint32_t interhunk_lines\nuint16_t id_abbrev\ngit_off_t max_size\nconst char * old_prefix\nconst char * new_prefix", + "line": 396, + "lineto": 416, + "block": "unsigned int version\nuint32_t flags\ngit_submodule_ignore_t ignore_submodules\ngit_strarray pathspec\ngit_diff_notify_cb notify_cb\ngit_diff_progress_cb progress_cb\nvoid * payload\nuint32_t context_lines\nuint32_t interhunk_lines\nuint16_t id_abbrev\ngit_off_t max_size\nconst char * old_prefix\nconst char * new_prefix", "tdef": "typedef", "description": " Structure describing options about how the diff should be executed.", - "comments": "

Setting all values of the structure to zero will yield the default\n values. Similarly, passing NULL for the options structure will\n give the defaults. The default values are marked below.

\n\n
    \n
  • flags is a combination of the git_diff_option_t values above
    • \n
  • context_lines is the number of unchanged lines that define the\nboundary of a hunk (and to display before and after)
    • \n
  • interhunk_lines is the maximum number of unchanged lines between\nhunk boundaries before the hunks will be merged into a one.
    • \n
  • old_prefix is the virtual "directory" to prefix to old file names\nin hunk headers (default "a")
    • \n
  • new_prefix is the virtual "directory" to prefix to new file names\nin hunk headers (default "b")
    • \n
  • pathspec is an array of paths / fnmatch patterns to constrain diff
    • \n
  • max_size is a file size (in bytes) above which a blob will be marked\nas binary automatically; pass a negative value to disable.
    • \n
  • notify_cb is an optional callback function, notifying the consumer of\nwhich files are being examined as the diff is generated
    • \n
  • notify_payload is the payload data to pass to the notify_cb function
    • \n
  • ignore_submodules overrides the submodule ignore setting for all\nsubmodules in the diff.
    • \n
\n", + "comments": "

Setting all values of the structure to zero will yield the default values. Similarly, passing NULL for the options structure will give the defaults. The default values are marked below.

\n\n
    \n
  • flags is a combination of the git_diff_option_t values above - context_lines is the number of unchanged lines that define the boundary of a hunk (and to display before and after) - interhunk_lines is the maximum number of unchanged lines between hunk boundaries before the hunks will be merged into a one. - old_prefix is the virtual "directory" to prefix to old file names in hunk headers (default "a") - new_prefix is the virtual "directory" to prefix to new file names in hunk headers (default "b") - pathspec is an array of paths / fnmatch patterns to constrain diff - max_size is a file size (in bytes) above which a blob will be marked as binary automatically; pass a negative value to disable. - notify_cb is an optional callback function, notifying the consumer of changes to the diff as new deltas are added. - progress_cb is an optional callback function, notifying the consumer of which files are being examined as the diff is generated. - payload is the payload to pass to the callback functions. - ignore_submodules overrides the submodule ignore setting for all submodules in the diff.
    • \n
\n", "fields": [ { "type": "unsigned int", @@ -27663,9 +27986,14 @@ "name": "notify_cb", "comments": "" }, + { + "type": "git_diff_progress_cb", + "name": "progress_cb", + "comments": "" + }, { "type": "void *", - "name": "notify_payload", + "name": "payload", "comments": "" }, { @@ -27706,6 +28034,7 @@ "git_diff_blobs", "git_diff_buffers", "git_diff_commit_as_email", + "git_diff_index_to_index", "git_diff_index_to_workdir", "git_diff_init_options", "git_diff_tree_to_index", @@ -27719,49 +28048,6 @@ } } ], - [ - "git_diff_perfdata", - { - "decl": [ - "unsigned int version", - "size_t stat_calls", - "size_t oid_calculations" - ], - "type": "struct", - "value": "git_diff_perfdata", - "file": "sys/diff.h", - "line": 67, - "lineto": 71, - "block": "unsigned int version\nsize_t stat_calls\nsize_t oid_calculations", - "tdef": "typedef", - "description": " Performance data from diffing", - "comments": "", - "fields": [ - { - "type": "unsigned int", - "name": "version", - "comments": "" - }, - { - "type": "size_t", - "name": "stat_calls", - "comments": " Number of stat() calls performed " - }, - { - "type": "size_t", - "name": "oid_calculations", - "comments": " Number of ID calculations " - } - ], - "used": { - "returns": [], - "needs": [ - "git_diff_get_perfdata", - "git_status_list_get_perfdata" - ] - } - } - ], [ "git_diff_similarity_metric", { @@ -27775,8 +28061,8 @@ "type": "struct", "value": "git_diff_similarity_metric", "file": "diff.h", - "line": 626, - "lineto": 636, + "line": 649, + "lineto": 659, "block": "int (*)(void **, const git_diff_file *, const char *, void *) file_signature\nint (*)(void **, const git_diff_file *, const char *, size_t, void *) buffer_signature\nvoid (*)(void *, void *) free_signature\nint (*)(int *, void *, void *, void *) similarity\nvoid * payload", "tdef": "typedef", "description": " Pluggable similarity metric", @@ -27821,8 +28107,8 @@ "type": "struct", "value": "git_diff_stats", "file": "diff.h", - "line": 1132, - "lineto": 1132, + "line": 1174, + "lineto": 1174, "tdef": "typedef", "description": " This is an opaque structure which is allocated by `git_diff_get_stats`.\n You are responsible for releasing the object memory when done, using the\n `git_diff_stats_free()` function.", "comments": "", @@ -27851,8 +28137,8 @@ ], "type": "enum", "file": "diff.h", - "line": 1137, - "lineto": 1152, + "line": 1179, + "lineto": 1194, "block": "GIT_DIFF_STATS_NONE\nGIT_DIFF_STATS_FULL\nGIT_DIFF_STATS_SHORT\nGIT_DIFF_STATS_NUMBER\nGIT_DIFF_STATS_INCLUDE_SUMMARY", "tdef": "typedef", "description": " Formatting options for diff stats", @@ -27911,7 +28197,7 @@ "block": "GIT_DIRECTION_FETCH\nGIT_DIRECTION_PUSH", "tdef": "typedef", "description": " Direction of the connection.", - "comments": "

We need this because we need to know whether we should call\n git-upload-pack or git-receive-pack on the remote end when get_refs\n gets called.

\n", + "comments": "

We need this because we need to know whether we should call git-upload-pack or git-receive-pack on the remote end when get_refs gets called.

\n", "fields": [ { "type": "int", @@ -27927,7 +28213,9 @@ } ], "used": { - "returns": [], + "returns": [ + "git_refspec_direction" + ], "needs": [ "git_remote_connect" ] @@ -27944,12 +28232,12 @@ "type": "struct", "value": "git_error", "file": "errors.h", - "line": 63, - "lineto": 66, + "line": 64, + "lineto": 67, "block": "char * message\nint klass", "tdef": "typedef", "description": " Structure to store extra details of the last error that occurred.", - "comments": "

This is kept on a per-thread basis if GIT_THREADS was defined when the\n library was build, otherwise one is kept globally for the library

\n", + "comments": "

This is kept on a per-thread basis if GIT_THREADS was defined when the library was build, otherwise one is kept globally for the library

\n", "fields": [ { "type": "char *", @@ -27966,9 +28254,7 @@ "returns": [ "giterr_last" ], - "needs": [ - "giterr_detach" - ] + "needs": [] } } ], @@ -27999,14 +28285,15 @@ "GIT_EINVALID", "GIT_EUNCOMMITTED", "GIT_EDIRECTORY", + "GIT_EMERGECONFLICT", "GIT_PASSTHROUGH", "GIT_ITEROVER" ], "type": "enum", "file": "errors.h", "line": 21, - "lineto": 55, - "block": "GIT_OK\nGIT_ERROR\nGIT_ENOTFOUND\nGIT_EEXISTS\nGIT_EAMBIGUOUS\nGIT_EBUFS\nGIT_EUSER\nGIT_EBAREREPO\nGIT_EUNBORNBRANCH\nGIT_EUNMERGED\nGIT_ENONFASTFORWARD\nGIT_EINVALIDSPEC\nGIT_ECONFLICT\nGIT_ELOCKED\nGIT_EMODIFIED\nGIT_EAUTH\nGIT_ECERTIFICATE\nGIT_EAPPLIED\nGIT_EPEEL\nGIT_EEOF\nGIT_EINVALID\nGIT_EUNCOMMITTED\nGIT_EDIRECTORY\nGIT_PASSTHROUGH\nGIT_ITEROVER", + "lineto": 56, + "block": "GIT_OK\nGIT_ERROR\nGIT_ENOTFOUND\nGIT_EEXISTS\nGIT_EAMBIGUOUS\nGIT_EBUFS\nGIT_EUSER\nGIT_EBAREREPO\nGIT_EUNBORNBRANCH\nGIT_EUNMERGED\nGIT_ENONFASTFORWARD\nGIT_EINVALIDSPEC\nGIT_ECONFLICT\nGIT_ELOCKED\nGIT_EMODIFIED\nGIT_EAUTH\nGIT_ECERTIFICATE\nGIT_EAPPLIED\nGIT_EPEEL\nGIT_EEOF\nGIT_EINVALID\nGIT_EUNCOMMITTED\nGIT_EDIRECTORY\nGIT_EMERGECONFLICT\nGIT_PASSTHROUGH\nGIT_ITEROVER", "tdef": "typedef", "description": " Generic return codes ", "comments": "", @@ -28149,6 +28436,12 @@ "comments": "

The operation is not valid for a directory

\n", "value": -23 }, + { + "type": "int", + "name": "GIT_EMERGECONFLICT", + "comments": "

A merge conflict exists and cannot continue

\n", + "value": -24 + }, { "type": "int", "name": "GIT_PASSTHROUGH", @@ -28206,8 +28499,8 @@ ], "type": "enum", "file": "errors.h", - "line": 69, - "lineto": 101, + "line": 70, + "lineto": 102, "block": "GITERR_NONE\nGITERR_NOMEMORY\nGITERR_OS\nGITERR_INVALID\nGITERR_REFERENCE\nGITERR_ZLIB\nGITERR_REPOSITORY\nGITERR_CONFIG\nGITERR_REGEX\nGITERR_ODB\nGITERR_INDEX\nGITERR_OBJECT\nGITERR_NET\nGITERR_TAG\nGITERR_TREE\nGITERR_INDEXER\nGITERR_SSL\nGITERR_SUBMODULE\nGITERR_THREAD\nGITERR_STASH\nGITERR_CHECKOUT\nGITERR_FETCHHEAD\nGITERR_MERGE\nGITERR_SSH\nGITERR_FILTER\nGITERR_REVERT\nGITERR_CALLBACK\nGITERR_CHERRYPICK\nGITERR_DESCRIBE\nGITERR_REBASE\nGITERR_FILESYSTEM", "tdef": "typedef", "description": " Error classes ", @@ -28412,13 +28705,14 @@ "decl": [ "GIT_FEATURE_THREADS", "GIT_FEATURE_HTTPS", - "GIT_FEATURE_SSH" + "GIT_FEATURE_SSH", + "GIT_FEATURE_NSEC" ], "type": "enum", "file": "common.h", - "line": 100, - "lineto": 104, - "block": "GIT_FEATURE_THREADS\nGIT_FEATURE_HTTPS\nGIT_FEATURE_SSH", + "line": 111, + "lineto": 116, + "block": "GIT_FEATURE_THREADS\nGIT_FEATURE_HTTPS\nGIT_FEATURE_SSH\nGIT_FEATURE_NSEC", "tdef": "typedef", "description": " Combinations of these values describe the features with which libgit2\n was compiled", "comments": "", @@ -28440,6 +28734,12 @@ "name": "GIT_FEATURE_SSH", "comments": "", "value": 4 + }, + { + "type": "int", + "name": "GIT_FEATURE_NSEC", + "comments": "", + "value": 8 } ], "used": { @@ -28456,17 +28756,18 @@ "git_remote_callbacks callbacks", "git_fetch_prune_t prune", "int update_fetchhead", - "git_remote_autotag_option_t download_tags" + "git_remote_autotag_option_t download_tags", + "git_strarray custom_headers" ], "type": "struct", "value": "git_fetch_options", "file": "remote.h", - "line": 522, - "lineto": 549, - "block": "int version\ngit_remote_callbacks callbacks\ngit_fetch_prune_t prune\nint update_fetchhead\ngit_remote_autotag_option_t download_tags", + "line": 523, + "lineto": 555, + "block": "int version\ngit_remote_callbacks callbacks\ngit_fetch_prune_t prune\nint update_fetchhead\ngit_remote_autotag_option_t download_tags\ngit_strarray custom_headers", "tdef": "typedef", "description": " Fetch options structure.", - "comments": "

Zero out for defaults. Initialize with GIT_FETCH_OPTIONS_INIT macro to\n correctly set the version field. E.g.

\n\n
    git_fetch_options opts = GIT_FETCH_OPTIONS_INIT;\n
\n", + "comments": "

Zero out for defaults. Initialize with GIT_FETCH_OPTIONS_INIT macro to correctly set the version field. E.g.

\n\n
    git_fetch_options opts = GIT_FETCH_OPTIONS_INIT;\n
\n", "fields": [ { "type": "int", @@ -28492,6 +28793,11 @@ "type": "git_remote_autotag_option_t", "name": "download_tags", "comments": " Determines how to behave regarding tags on the remote, such\n as auto-downloading tags for objects we're downloading or\n downloading all of them.\n\n The default is to auto-follow tags." + }, + { + "type": "git_strarray", + "name": "custom_headers", + "comments": " Extra headers for this fetch operation" } ], "used": { @@ -28562,7 +28868,10 @@ } ], "used": { - "returns": [], + "returns": [ + "git_tree_entry_filemode", + "git_tree_entry_filemode_raw" + ], "needs": [ "git_treebuilder_insert" ] @@ -28585,61 +28894,83 @@ "type": "struct", "value": "git_filter", "file": "sys/filter.h", - "line": 248, - "lineto": 259, + "line": 226, + "lineto": 271, "tdef": null, "description": " Filter structure used to register custom filters.", - "comments": "

To associate extra data with a filter, allocate extra data and put the\n git_filter struct at the start of your data buffer, then cast the\n self pointer to your larger structure when your callback is invoked.

\n\n

version should be set to GIT_FILTER_VERSION

\n\n

attributes is a whitespace-separated list of attribute names to check\n for this filter (e.g. "eol crlf text"). If the attribute name is bare,\n it will be simply loaded and passed to the check callback. If it has\n a value (i.e. "name=value"), the attribute must match that value for\n the filter to be applied.

\n\n

The initialize, shutdown, check, apply, and cleanup callbacks\n are all documented above with the respective function pointer typedefs.

\n", + "comments": "

To associate extra data with a filter, allocate extra data and put the git_filter struct at the start of your data buffer, then cast the self pointer to your larger structure when your callback is invoked.

\n", "block": "unsigned int version\nconst char * attributes\ngit_filter_init_fn initialize\ngit_filter_shutdown_fn shutdown\ngit_filter_check_fn check\ngit_filter_apply_fn apply\ngit_filter_stream_fn stream\ngit_filter_cleanup_fn cleanup", "fields": [ { "type": "unsigned int", "name": "version", - "comments": "" + "comments": " The `version` field should be set to `GIT_FILTER_VERSION`. " }, { "type": "const char *", "name": "attributes", - "comments": "" + "comments": " A whitespace-separated list of attribute names to check for this\n filter (e.g. \"eol crlf text\"). If the attribute name is bare, it\n will be simply loaded and passed to the `check` callback. If it\n has a value (i.e. \"name=value\"), the attribute must match that\n value for the filter to be applied. The value may be a wildcard\n (eg, \"name=*\"), in which case the filter will be invoked for any\n value for the given attribute name. See the attribute parameter\n of the `check` callback for the attribute value that was specified." }, { "type": "git_filter_init_fn", "name": "initialize", - "comments": "" + "comments": " Called when the filter is first used for any file. " }, { "type": "git_filter_shutdown_fn", "name": "shutdown", - "comments": "" + "comments": " Called when the filter is removed or unregistered from the system. " }, { "type": "git_filter_check_fn", "name": "check", - "comments": "" + "comments": " Called to determine whether the filter should be invoked for a\n given file. If this function returns `GIT_PASSTHROUGH` then the\n `apply` function will not be invoked and the contents will be passed\n through unmodified." }, { "type": "git_filter_apply_fn", "name": "apply", - "comments": "" + "comments": " Called to actually apply the filter to file contents. If this\n function returns `GIT_PASSTHROUGH` then the contents will be passed\n through unmodified." }, { "type": "git_filter_stream_fn", "name": "stream", - "comments": "" + "comments": " Called to apply the filter in a streaming manner. If this is not\n specified then the system will call `apply` with the whole buffer." }, { "type": "git_filter_cleanup_fn", "name": "cleanup", - "comments": "" + "comments": " Called when the system is done filtering for a file. " } ], "used": { "returns": [ - "git_filter_lookup" + "git_filter_lookup", + "git_filter_source_mode" ], "needs": [ + "git_filter_apply_fn", + "git_filter_check_fn", + "git_filter_cleanup_fn", + "git_filter_init_fn", + "git_filter_list_apply_to_blob", + "git_filter_list_apply_to_data", + "git_filter_list_apply_to_file", + "git_filter_list_contains", + "git_filter_list_free", + "git_filter_list_load", + "git_filter_list_new", "git_filter_list_push", - "git_filter_register" + "git_filter_list_stream_blob", + "git_filter_list_stream_data", + "git_filter_list_stream_file", + "git_filter_register", + "git_filter_shutdown_fn", + "git_filter_source_filemode", + "git_filter_source_flags", + "git_filter_source_id", + "git_filter_source_mode", + "git_filter_source_path", + "git_filter_source_repo" ] } } @@ -28690,7 +29021,7 @@ "lineto": 73, "tdef": "typedef", "description": " List of filters to be applied", - "comments": "

This represents a list of filters to be applied to a file / blob. You\n can build the list with one call, apply it with another, and dispose it\n with a third. In typical usage, there are not many occasions where a\n git_filter_list is needed directly since the library will generally\n handle conversions for you, but it can be convenient to be able to\n build and apply the list sometimes.

\n", + "comments": "

This represents a list of filters to be applied to a file / blob. You can build the list with one call, apply it with another, and dispose it with a third. In typical usage, there are not many occasions where a git_filter_list is needed directly since the library will generally handle conversions for you, but it can be convenient to be able to build and apply the list sometimes.

\n", "used": { "returns": [], "needs": [ @@ -28699,7 +29030,6 @@ "git_filter_list_apply_to_file", "git_filter_list_contains", "git_filter_list_free", - "git_filter_list_length", "git_filter_list_load", "git_filter_list_new", "git_filter_list_push", @@ -28754,7 +29084,9 @@ } ], "used": { - "returns": [], + "returns": [ + "git_filter_source_mode" + ], "needs": [ "git_filter_list_load", "git_filter_list_new" @@ -28777,6 +29109,8 @@ "used": { "returns": [], "needs": [ + "git_filter_apply_fn", + "git_filter_check_fn", "git_filter_source_filemode", "git_filter_source_flags", "git_filter_source_id", @@ -28803,7 +29137,6 @@ "returns": [], "needs": [ "git_hashsig_compare", - "git_hashsig_create", "git_hashsig_create_fromfile", "git_hashsig_free" ] @@ -28826,7 +29159,7 @@ "block": "GIT_HASHSIG_NORMAL\nGIT_HASHSIG_IGNORE_WHITESPACE\nGIT_HASHSIG_SMART_WHITESPACE\nGIT_HASHSIG_ALLOW_SMALL_FILES", "tdef": "typedef", "description": " Options for hashsig computation", - "comments": "

The options GIT_HASHSIG_NORMAL, GIT_HASHSIG_IGNORE_WHITESPACE,\n GIT_HASHSIG_SMART_WHITESPACE are exclusive and should not be combined.

\n", + "comments": "

The options GIT_HASHSIG_NORMAL, GIT_HASHSIG_IGNORE_WHITESPACE, GIT_HASHSIG_SMART_WHITESPACE are exclusive and should not be combined.

\n", "fields": [ { "type": "int", @@ -28856,7 +29189,6 @@ "used": { "returns": [], "needs": [ - "git_hashsig_create", "git_hashsig_create_fromfile" ] } @@ -28888,7 +29220,7 @@ "block": "GIT_IDXENTRY_INTENT_TO_ADD\nGIT_IDXENTRY_SKIP_WORKTREE\nGIT_IDXENTRY_EXTENDED2\nGIT_IDXENTRY_EXTENDED_FLAGS\nGIT_IDXENTRY_UPDATE\nGIT_IDXENTRY_REMOVE\nGIT_IDXENTRY_UPTODATE\nGIT_IDXENTRY_ADDED\nGIT_IDXENTRY_HASHED\nGIT_IDXENTRY_UNHASHED\nGIT_IDXENTRY_WT_REMOVE\nGIT_IDXENTRY_CONFLICTED\nGIT_IDXENTRY_UNPACKED\nGIT_IDXENTRY_NEW_SKIP_WORKTREE", "tdef": "typedef", "description": " Bitmasks for on-disk fields of `git_index_entry`'s `flags_extended`", - "comments": "

In memory, the flags_extended fields are divided into two parts: the\n fields that are read from and written to disk, and other fields that\n in-memory only and used by libgit2. Only the flags in\n GIT_IDXENTRY_EXTENDED_FLAGS will get saved on-disk.

\n\n

Thee first three bitmasks match the three fields in the\n git_index_entry flags_extended value that belong on disk. You\n can use them to interpret the data in the flags_extended.

\n\n

The rest of the bitmasks match the other fields in the git_index_entry\n flags_extended value that are only used in-memory by libgit2.\n You can use them to interpret the data in the flags_extended.

\n", + "comments": "

In memory, the flags_extended fields are divided into two parts: the fields that are read from and written to disk, and other fields that in-memory only and used by libgit2. Only the flags in GIT_IDXENTRY_EXTENDED_FLAGS will get saved on-disk.

\n\n

Thee first three bitmasks match the three fields in the git_index_entry flags_extended value that belong on disk. You can use them to interpret the data in the flags_extended.

\n\n

The rest of the bitmasks match the other fields in the git_index_entry flags_extended value that are only used in-memory by libgit2. You can use them to interpret the data in the flags_extended.

\n", "fields": [ { "type": "int", @@ -28994,10 +29326,14 @@ "description": " Memory representation of an index file. ", "comments": "", "used": { - "returns": [], + "returns": [ + "git_index_get_byindex", + "git_index_get_bypath" + ], "needs": [ "git_checkout_index", "git_cherrypick_commit", + "git_diff_index_to_index", "git_diff_index_to_workdir", "git_diff_tree_to_index", "git_index_add", @@ -29010,10 +29346,15 @@ "git_index_conflict_add", "git_index_conflict_cleanup", "git_index_conflict_get", + "git_index_conflict_iterator_free", "git_index_conflict_iterator_new", + "git_index_conflict_next", "git_index_conflict_remove", + "git_index_entry_is_conflict", + "git_index_entry_stage", "git_index_entrycount", "git_index_find", + "git_index_find_prefix", "git_index_free", "git_index_get_byindex", "git_index_get_bypath", @@ -29033,9 +29374,16 @@ "git_index_write", "git_index_write_tree", "git_index_write_tree_to", + "git_indexer_append", + "git_indexer_commit", + "git_indexer_free", + "git_indexer_hash", + "git_indexer_new", "git_merge_commits", + "git_merge_file_from_index", "git_merge_trees", "git_pathspec_match_index", + "git_rebase_inmemory_index", "git_repository_index", "git_repository_set_index", "git_revert_commit" @@ -29139,7 +29487,7 @@ "block": "git_index_time ctime\ngit_index_time mtime\nuint32_t dev\nuint32_t ino\nuint32_t mode\nuint32_t uid\nuint32_t gid\nuint32_t file_size\ngit_oid id\nuint16_t flags\nuint16_t flags_extended\nconst char * path", "tdef": "typedef", "description": " In-memory representation of a file entry in the index.", - "comments": "

This is a public structure that represents a file entry in the index.\n The meaning of the fields corresponds to core Git's documentation (in\n "Documentation/technical/index-format.txt").

\n\n

The flags field consists of a number of bit fields which can be\n accessed via the first set of GIT_IDXENTRY_... bitmasks below. These\n flags are all read from and persisted to disk.

\n\n

The flags_extended field also has a number of bit fields which can be\n accessed via the later GIT_IDXENTRY_... bitmasks below. Some of\n these flags are read from and written to disk, but some are set aside\n for in-memory only reference.

\n\n

Note that the time and size fields are truncated to 32 bits. This\n is enough to detect changes, which is enough for the index to\n function as a cache, but it should not be taken as an authoritative\n source for that data.

\n", + "comments": "

This is a public structure that represents a file entry in the index. The meaning of the fields corresponds to core Git's documentation (in "Documentation/technical/index-format.txt").

\n\n

The flags field consists of a number of bit fields which can be accessed via the first set of GIT_IDXENTRY_... bitmasks below. These flags are all read from and persisted to disk.

\n\n

The flags_extended field also has a number of bit fields which can be accessed via the later GIT_IDXENTRY_... bitmasks below. Some of these flags are read from and written to disk, but some are set aside for in-memory only reference.

\n\n

Note that the time and size fields are truncated to 32 bits. This is enough to detect changes, which is enough for the index to function as a cache, but it should not be taken as an authoritative source for that data.

\n", "fields": [ { "type": "git_index_time", @@ -29354,16 +29702,19 @@ "GIT_OPT_GET_CACHED_MEMORY", "GIT_OPT_GET_TEMPLATE_PATH", "GIT_OPT_SET_TEMPLATE_PATH", - "GIT_OPT_SET_SSL_CERT_LOCATIONS" + "GIT_OPT_SET_SSL_CERT_LOCATIONS", + "GIT_OPT_SET_USER_AGENT", + "GIT_OPT_ENABLE_STRICT_OBJECT_CREATION", + "GIT_OPT_SET_SSL_CIPHERS" ], "type": "enum", "file": "common.h", - "line": 132, - "lineto": 146, - "block": "GIT_OPT_GET_MWINDOW_SIZE\nGIT_OPT_SET_MWINDOW_SIZE\nGIT_OPT_GET_MWINDOW_MAPPED_LIMIT\nGIT_OPT_SET_MWINDOW_MAPPED_LIMIT\nGIT_OPT_GET_SEARCH_PATH\nGIT_OPT_SET_SEARCH_PATH\nGIT_OPT_SET_CACHE_OBJECT_LIMIT\nGIT_OPT_SET_CACHE_MAX_SIZE\nGIT_OPT_ENABLE_CACHING\nGIT_OPT_GET_CACHED_MEMORY\nGIT_OPT_GET_TEMPLATE_PATH\nGIT_OPT_SET_TEMPLATE_PATH\nGIT_OPT_SET_SSL_CERT_LOCATIONS", + "line": 144, + "lineto": 161, + "block": "GIT_OPT_GET_MWINDOW_SIZE\nGIT_OPT_SET_MWINDOW_SIZE\nGIT_OPT_GET_MWINDOW_MAPPED_LIMIT\nGIT_OPT_SET_MWINDOW_MAPPED_LIMIT\nGIT_OPT_GET_SEARCH_PATH\nGIT_OPT_SET_SEARCH_PATH\nGIT_OPT_SET_CACHE_OBJECT_LIMIT\nGIT_OPT_SET_CACHE_MAX_SIZE\nGIT_OPT_ENABLE_CACHING\nGIT_OPT_GET_CACHED_MEMORY\nGIT_OPT_GET_TEMPLATE_PATH\nGIT_OPT_SET_TEMPLATE_PATH\nGIT_OPT_SET_SSL_CERT_LOCATIONS\nGIT_OPT_SET_USER_AGENT\nGIT_OPT_ENABLE_STRICT_OBJECT_CREATION\nGIT_OPT_SET_SSL_CIPHERS", "tdef": "typedef", "description": " Global library options", - "comments": "

These are used to select which global option to set or get and are\n used in git_libgit2_opts().

\n", + "comments": "

These are used to select which global option to set or get and are used in git_libgit2_opts().

\n", "fields": [ { "type": "int", @@ -29442,6 +29793,24 @@ "name": "GIT_OPT_SET_SSL_CERT_LOCATIONS", "comments": "", "value": 12 + }, + { + "type": "int", + "name": "GIT_OPT_SET_USER_AGENT", + "comments": "", + "value": 13 + }, + { + "type": "int", + "name": "GIT_OPT_ENABLE_STRICT_OBJECT_CREATION", + "comments": "", + "value": 14 + }, + { + "type": "int", + "name": "GIT_OPT_SET_SSL_CIPHERS", + "comments": "", + "value": 15 } ], "used": { @@ -29462,8 +29831,8 @@ ], "type": "enum", "file": "merge.h", - "line": 272, - "lineto": 301, + "line": 302, + "lineto": 331, "block": "GIT_MERGE_ANALYSIS_NONE\nGIT_MERGE_ANALYSIS_NORMAL\nGIT_MERGE_ANALYSIS_UP_TO_DATE\nGIT_MERGE_ANALYSIS_FASTFORWARD\nGIT_MERGE_ANALYSIS_UNBORN", "tdef": "typedef", "description": " The results of `git_merge_analysis` indicate the merge opportunities.", @@ -29519,8 +29888,8 @@ ], "type": "enum", "file": "merge.h", - "line": 81, - "lineto": 111, + "line": 101, + "lineto": 131, "block": "GIT_MERGE_FILE_FAVOR_NORMAL\nGIT_MERGE_FILE_FAVOR_OURS\nGIT_MERGE_FILE_FAVOR_THEIRS\nGIT_MERGE_FILE_FAVOR_UNION", "tdef": "typedef", "description": " Merge file favor options for `git_merge_options` instruct the file-level\n merging functionality how to deal with conflicting regions of the files.", @@ -29558,7 +29927,7 @@ } ], [ - "git_merge_file_flags_t", + "git_merge_file_flag_t", { "decl": [ "GIT_MERGE_FILE_DEFAULT", @@ -29573,8 +29942,8 @@ ], "type": "enum", "file": "merge.h", - "line": 116, - "lineto": 143, + "line": 136, + "lineto": 163, "block": "GIT_MERGE_FILE_DEFAULT\nGIT_MERGE_FILE_STYLE_MERGE\nGIT_MERGE_FILE_STYLE_DIFF3\nGIT_MERGE_FILE_SIMPLIFY_ALNUM\nGIT_MERGE_FILE_IGNORE_WHITESPACE\nGIT_MERGE_FILE_IGNORE_WHITESPACE_CHANGE\nGIT_MERGE_FILE_IGNORE_WHITESPACE_EOL\nGIT_MERGE_FILE_DIFF_PATIENCE\nGIT_MERGE_FILE_DIFF_MINIMAL", "tdef": "typedef", "description": " File merging flags", @@ -29705,14 +30074,14 @@ "const char * our_label", "const char * their_label", "git_merge_file_favor_t favor", - "unsigned int flags" + "git_merge_file_flag_t flags" ], "type": "struct", "value": "git_merge_file_options", "file": "merge.h", - "line": 148, - "lineto": 174, - "block": "unsigned int version\nconst char * ancestor_label\nconst char * our_label\nconst char * their_label\ngit_merge_file_favor_t favor\nunsigned int flags", + "line": 168, + "lineto": 194, + "block": "unsigned int version\nconst char * ancestor_label\nconst char * our_label\nconst char * their_label\ngit_merge_file_favor_t favor\ngit_merge_file_flag_t flags", "tdef": "typedef", "description": " Options for merging a file", "comments": "", @@ -29743,9 +30112,9 @@ "comments": " The file to favor in region conflicts. " }, { - "type": "unsigned int", + "type": "git_merge_file_flag_t", "name": "flags", - "comments": " see `git_merge_file_flags_t` above " + "comments": " see `git_merge_file_flag_t` above " } ], "used": { @@ -29771,8 +30140,8 @@ "type": "struct", "value": "git_merge_file_result", "file": "merge.h", - "line": 195, - "lineto": 216, + "line": 215, + "lineto": 236, "block": "unsigned int automergeable\nconst char * path\nunsigned int mode\nconst char * ptr\nsize_t len", "tdef": "typedef", "description": " Information about file-level merging", @@ -29814,24 +30183,74 @@ } } ], + [ + "git_merge_flag_t", + { + "decl": [ + "GIT_MERGE_FIND_RENAMES", + "GIT_MERGE_FAIL_ON_CONFLICT", + "GIT_MERGE_SKIP_REUC", + "GIT_MERGE_NO_RECURSIVE" + ], + "type": "enum", + "file": "merge.h", + "line": 68, + "lineto": 95, + "block": "GIT_MERGE_FIND_RENAMES\nGIT_MERGE_FAIL_ON_CONFLICT\nGIT_MERGE_SKIP_REUC\nGIT_MERGE_NO_RECURSIVE", + "tdef": "typedef", + "description": " Flags for `git_merge` options. A combination of these flags can be\n passed in via the `flags` value in the `git_merge_options`.", + "comments": "", + "fields": [ + { + "type": "int", + "name": "GIT_MERGE_FIND_RENAMES", + "comments": "

Detect renames that occur between the common ancestor and the "ours"\n side or the common ancestor and the "theirs" side. This will enable\n the ability to merge between a modified and renamed file.

\n", + "value": 1 + }, + { + "type": "int", + "name": "GIT_MERGE_FAIL_ON_CONFLICT", + "comments": "

If a conflict occurs, exit immediately instead of attempting to\n continue resolving conflicts. The merge operation will fail with\n GIT_EMERGECONFLICT and no index will be returned.

\n", + "value": 2 + }, + { + "type": "int", + "name": "GIT_MERGE_SKIP_REUC", + "comments": "

Do not write the REUC extension on the generated index

\n", + "value": 4 + }, + { + "type": "int", + "name": "GIT_MERGE_NO_RECURSIVE", + "comments": "

If the commits being merged have multiple merge bases, do not build\n a recursive merge base (by merging the multiple merge bases),\n instead simply use the first base. This flag provides a similar\n merge base to git-merge-resolve.

\n", + "value": 8 + } + ], + "used": { + "returns": [], + "needs": [] + } + } + ], [ "git_merge_options", { "decl": [ "unsigned int version", - "git_merge_tree_flag_t tree_flags", + "git_merge_flag_t flags", "unsigned int rename_threshold", "unsigned int target_limit", "git_diff_similarity_metric * metric", + "unsigned int recursion_limit", "git_merge_file_favor_t file_favor", - "unsigned int file_flags" + "git_merge_file_flag_t file_flags" ], "type": "struct", "value": "git_merge_options", "file": "merge.h", - "line": 221, - "lineto": 251, - "block": "unsigned int version\ngit_merge_tree_flag_t tree_flags\nunsigned int rename_threshold\nunsigned int target_limit\ngit_diff_similarity_metric * metric\ngit_merge_file_favor_t file_favor\nunsigned int file_flags", + "line": 241, + "lineto": 281, + "block": "unsigned int version\ngit_merge_flag_t flags\nunsigned int rename_threshold\nunsigned int target_limit\ngit_diff_similarity_metric * metric\nunsigned int recursion_limit\ngit_merge_file_favor_t file_favor\ngit_merge_file_flag_t file_flags", "tdef": "typedef", "description": " Merging options", "comments": "", @@ -29842,14 +30261,14 @@ "comments": "" }, { - "type": "git_merge_tree_flag_t", - "name": "tree_flags", - "comments": "" + "type": "git_merge_flag_t", + "name": "flags", + "comments": " See `git_merge_flag_t` above " }, { "type": "unsigned int", "name": "rename_threshold", - "comments": " Similarity to consider a file renamed (default 50). If\n `GIT_MERGE_TREE_FIND_RENAMES` is enabled, added files will be compared\n with deleted files to determine their similarity. Files that are\n more similar than the rename threshold (percentage-wise) will be\n treated as a rename." + "comments": " Similarity to consider a file renamed (default 50). If\n `GIT_MERGE_FIND_RENAMES` is enabled, added files will be compared\n with deleted files to determine their similarity. Files that are\n more similar than the rename threshold (percentage-wise) will be\n treated as a rename." }, { "type": "unsigned int", @@ -29861,15 +30280,20 @@ "name": "metric", "comments": " Pluggable similarity metric; pass NULL to use internal metric " }, + { + "type": "unsigned int", + "name": "recursion_limit", + "comments": " Maximum number of times to merge common ancestors to build a\n virtual merge base when faced with criss-cross merges. When this\n limit is reached, the next ancestor will simply be used instead of\n attempting to merge it. The default is unlimited." + }, { "type": "git_merge_file_favor_t", "name": "file_favor", "comments": " Flags for handling conflicting content. " }, { - "type": "unsigned int", + "type": "git_merge_file_flag_t", "name": "file_flags", - "comments": " see `git_merge_file_flags_t` above " + "comments": " see `git_merge_file_flag_t` above " } ], "used": { @@ -29895,8 +30319,8 @@ ], "type": "enum", "file": "merge.h", - "line": 306, - "lineto": 324, + "line": 336, + "lineto": 354, "block": "GIT_MERGE_PREFERENCE_NONE\nGIT_MERGE_PREFERENCE_NO_FASTFORWARD\nGIT_MERGE_PREFERENCE_FASTFORWARD_ONLY", "tdef": "typedef", "description": " The user's stated preference for merges.", @@ -29947,34 +30371,6 @@ } } ], - [ - "git_merge_tree_flag_t", - { - "decl": [ - "GIT_MERGE_TREE_FIND_RENAMES" - ], - "type": "enum", - "file": "merge.h", - "line": 68, - "lineto": 75, - "block": "GIT_MERGE_TREE_FIND_RENAMES", - "tdef": "typedef", - "description": " Flags for `git_merge_tree` options. A combination of these flags can be\n passed in via the `tree_flags` value in the `git_merge_options`.", - "comments": "", - "fields": [ - { - "type": "int", - "name": "GIT_MERGE_TREE_FIND_RENAMES", - "comments": "

Detect renames that occur between the common ancestor and the "ours"\n side or the common ancestor and the "theirs" side. This will enable\n the ability to merge between a modified and renamed file.

\n", - "value": 1 - } - ], - "used": { - "returns": [], - "needs": [] - } - } - ], [ "git_note", { @@ -29992,9 +30388,13 @@ "needs": [ "git_note_author", "git_note_committer", + "git_note_foreach", "git_note_free", "git_note_id", + "git_note_iterator_free", + "git_note_iterator_new", "git_note_message", + "git_note_next", "git_note_read" ] } @@ -30080,16 +30480,28 @@ "returns": [], "needs": [ "git_indexer_new", + "git_mempack_new", + "git_mempack_reset", "git_odb_add_alternate", "git_odb_add_backend", "git_odb_add_disk_alternate", + "git_odb_backend_loose", + "git_odb_backend_one_pack", + "git_odb_backend_pack", "git_odb_exists", "git_odb_exists_prefix", "git_odb_foreach", "git_odb_free", "git_odb_get_backend", + "git_odb_init_backend", "git_odb_new", "git_odb_num_backends", + "git_odb_object_data", + "git_odb_object_dup", + "git_odb_object_free", + "git_odb_object_id", + "git_odb_object_size", + "git_odb_object_type", "git_odb_open", "git_odb_open_rstream", "git_odb_open_wstream", @@ -30097,6 +30509,10 @@ "git_odb_read_header", "git_odb_read_prefix", "git_odb_refresh", + "git_odb_stream_finalize_write", + "git_odb_stream_free", + "git_odb_stream_read", + "git_odb_stream_write", "git_odb_write", "git_odb_write_pack", "git_repository_odb", @@ -30115,7 +30531,7 @@ "file": "types.h", "line": 84, "lineto": 84, - "block": "unsigned int version\ngit_odb * odb\nint (*)(void **, size_t *, git_otype *, git_odb_backend *, const git_oid *) read\nint (*)(git_oid *, void **, size_t *, git_otype *, git_odb_backend *, const git_oid *, size_t) read_prefix\nint (*)(size_t *, git_otype *, git_odb_backend *, const git_oid *) read_header\nint (*)(git_odb_backend *, const git_oid *, const void *, size_t, git_otype) write\nint (*)(git_odb_stream **, git_odb_backend *, git_off_t, git_otype) writestream\nint (*)(git_odb_stream **, git_odb_backend *, const git_oid *) readstream\nint (*)(git_odb_backend *, const git_oid *) exists\nint (*)(git_oid *, git_odb_backend *, const git_oid *, size_t) exists_prefix\nint (*)(git_odb_backend *) refresh\nint (*)(git_odb_backend *, git_odb_foreach_cb, void *) foreach\nint (*)(git_odb_writepack **, git_odb_backend *, git_odb *, git_transfer_progress_cb, void *) writepack\nvoid (*)(git_odb_backend *) free", + "block": "unsigned int version\ngit_odb * odb\nint (*)(void **, int *, git_otype *, git_odb_backend *, const git_oid *) read\nint (*)(git_oid *, void **, int *, git_otype *, git_odb_backend *, const git_oid *, int) read_prefix\nint (*)(int *, git_otype *, git_odb_backend *, const git_oid *) read_header\nint (*)(git_odb_backend *, const git_oid *, const void *, int, git_otype) write\nint (*)(git_odb_stream **, git_odb_backend *, git_off_t, git_otype) writestream\nint (*)(git_odb_stream **, git_odb_backend *, const git_oid *) readstream\nint (*)(git_odb_backend *, const git_oid *) exists\nint (*)(git_oid *, git_odb_backend *, const git_oid *, int) exists_prefix\nint (*)(git_odb_backend *) refresh\nint (*)(git_odb_backend *, git_odb_foreach_cb, void *) foreach\nint (*)(git_odb_writepack **, git_odb_backend *, git_odb *, git_transfer_progress_cb, void *) writepack\nvoid (*)(git_odb_backend *) free", "tdef": "typedef", "description": " A custom backend in an ODB ", "comments": "", @@ -30131,22 +30547,22 @@ "comments": "" }, { - "type": "int (*)(void **, size_t *, git_otype *, git_odb_backend *, const git_oid *)", + "type": "int (*)(void **, int *, git_otype *, git_odb_backend *, const git_oid *)", "name": "read", "comments": "" }, { - "type": "int (*)(git_oid *, void **, size_t *, git_otype *, git_odb_backend *, const git_oid *, size_t)", + "type": "int (*)(git_oid *, void **, int *, git_otype *, git_odb_backend *, const git_oid *, int)", "name": "read_prefix", "comments": "" }, { - "type": "int (*)(size_t *, git_otype *, git_odb_backend *, const git_oid *)", + "type": "int (*)(int *, git_otype *, git_odb_backend *, const git_oid *)", "name": "read_header", "comments": "" }, { - "type": "int (*)(git_odb_backend *, const git_oid *, const void *, size_t, git_otype)", + "type": "int (*)(git_odb_backend *, const git_oid *, const void *, int, git_otype)", "name": "write", "comments": " Write an object into the backend. The id of the object has\n already been calculated and is passed in." }, @@ -30166,7 +30582,7 @@ "comments": "" }, { - "type": "int (*)(git_oid *, git_odb_backend *, const git_oid *, size_t)", + "type": "int (*)(git_oid *, git_odb_backend *, const git_oid *, int)", "name": "exists_prefix", "comments": "" }, @@ -30188,7 +30604,7 @@ { "type": "void (*)(git_odb_backend *)", "name": "free", - "comments": "" + "comments": " Frees any resources held by the odb (including the `git_odb_backend`\n itself). An odb backend implementation must provide this function." } ], "used": { @@ -30427,6 +30843,7 @@ "git_note_id", "git_object_id", "git_odb_object_id", + "git_oid_shorten_new", "git_packbuilder_hash", "git_reference_target", "git_reference_target_peel", @@ -30452,8 +30869,8 @@ "git_commit_amend", "git_commit_create", "git_commit_create_from_callback", - "git_commit_create_from_ids", "git_commit_create_v", + "git_commit_extract_signature", "git_commit_lookup", "git_commit_lookup_prefix", "git_graph_ahead_behind", @@ -30466,6 +30883,7 @@ "git_merge_bases", "git_merge_bases_many", "git_note_create", + "git_note_foreach_cb", "git_note_next", "git_note_read", "git_note_remove", @@ -30473,6 +30891,7 @@ "git_object_lookup_prefix", "git_odb_exists", "git_odb_exists_prefix", + "git_odb_foreach_cb", "git_odb_hash", "git_odb_hashfile", "git_odb_open_rstream", @@ -30493,10 +30912,13 @@ "git_oid_ncmp", "git_oid_nfmt", "git_oid_pathfmt", + "git_oid_shorten_add", + "git_oid_shorten_free", "git_oid_strcmp", "git_oid_streq", "git_oid_tostr", "git_oid_tostr_s", + "git_oidarray_free", "git_packbuilder_insert", "git_packbuilder_insert_commit", "git_packbuilder_insert_recur", @@ -30511,6 +30933,7 @@ "git_repository_hashfile", "git_repository_set_head_detached", "git_revwalk_hide", + "git_revwalk_hide_cb", "git_revwalk_next", "git_revwalk_push", "git_tag_annotation_create", @@ -30675,7 +31098,13 @@ } ], "used": { - "returns": [], + "returns": [ + "git_object_string2type", + "git_object_type", + "git_odb_object_type", + "git_tag_target_type", + "git_tree_entry_type" + ], "needs": [ "git_object__size", "git_object_lookup", @@ -30774,7 +31203,7 @@ "lineto": 29, "tdef": "typedef", "description": " The diff patch is used to store all the text diffs for a delta.", - "comments": "

You can easily loop over the content of patches and get information about\n them.

\n", + "comments": "

You can easily loop over the content of patches and get information about them.

\n", "used": { "returns": [], "needs": [ @@ -30814,6 +31243,12 @@ "git_pathspec_free", "git_pathspec_match_diff", "git_pathspec_match_index", + "git_pathspec_match_list_diff_entry", + "git_pathspec_match_list_entry", + "git_pathspec_match_list_entrycount", + "git_pathspec_match_list_failed_entry", + "git_pathspec_match_list_failed_entrycount", + "git_pathspec_match_list_free", "git_pathspec_match_tree", "git_pathspec_match_workdir", "git_pathspec_matches_path", @@ -30841,7 +31276,7 @@ "block": "GIT_PATHSPEC_DEFAULT\nGIT_PATHSPEC_IGNORE_CASE\nGIT_PATHSPEC_USE_CASE\nGIT_PATHSPEC_NO_GLOB\nGIT_PATHSPEC_NO_MATCH_ERROR\nGIT_PATHSPEC_FIND_FAILURES\nGIT_PATHSPEC_FAILURES_ONLY", "tdef": "typedef", "description": " Options controlling how pathspec match should be executed", - "comments": "
    \n
  • GIT_PATHSPEC_IGNORE_CASE forces match to ignore case; otherwise\nmatch will use native case sensitivity of platform filesystem
    • \n
  • GIT_PATHSPEC_USE_CASE forces case sensitive match; otherwise\nmatch will use native case sensitivity of platform filesystem
    • \n
  • GIT_PATHSPEC_NO_GLOB disables glob patterns and just uses simple\nstring comparison for matching
    • \n
  • GIT_PATHSPEC_NO_MATCH_ERROR means the match functions return error\ncode GIT_ENOTFOUND if no matches are found; otherwise no matches is\nstill success (return 0) but git_pathspec_match_list_entrycount\nwill indicate 0 matches.
    • \n
  • GIT_PATHSPEC_FIND_FAILURES means that the git_pathspec_match_list\nshould track which patterns matched which files so that at the end of\nthe match we can identify patterns that did not match any files.
    • \n
  • GIT_PATHSPEC_FAILURES_ONLY means that the git_pathspec_match_list\ndoes not need to keep the actual matching filenames. Use this to\njust test if there were any matches at all or in combination with\nGIT_PATHSPEC_FIND_FAILURES to validate a pathspec.
    • \n
\n", + "comments": "
    \n
  • GIT_PATHSPEC_IGNORE_CASE forces match to ignore case; otherwise match will use native case sensitivity of platform filesystem - GIT_PATHSPEC_USE_CASE forces case sensitive match; otherwise match will use native case sensitivity of platform filesystem - GIT_PATHSPEC_NO_GLOB disables glob patterns and just uses simple string comparison for matching - GIT_PATHSPEC_NO_MATCH_ERROR means the match functions return error code GIT_ENOTFOUND if no matches are found; otherwise no matches is still success (return 0) but git_pathspec_match_list_entrycount will indicate 0 matches. - GIT_PATHSPEC_FIND_FAILURES means that the git_pathspec_match_list should track which patterns matched which files so that at the end of the match we can identify patterns that did not match any files. - GIT_PATHSPEC_FAILURES_ONLY means that the git_pathspec_match_list does not need to keep the actual matching filenames. Use this to just test if there were any matches at all or in combination with GIT_PATHSPEC_FIND_FAILURES to validate a pathspec.
    • \n
\n", "fields": [ { "type": "int", @@ -30935,7 +31370,12 @@ "comments": "", "used": { "returns": [], - "needs": [] + "needs": [ + "git_push_init_options", + "git_push_negotiation", + "git_remote_push", + "git_remote_upload" + ] } } ], @@ -30945,14 +31385,15 @@ "decl": [ "unsigned int version", "unsigned int pb_parallelism", - "git_remote_callbacks callbacks" + "git_remote_callbacks callbacks", + "git_strarray custom_headers" ], "type": "struct", "value": "git_push_options", "file": "remote.h", - "line": 571, - "lineto": 588, - "block": "unsigned int version\nunsigned int pb_parallelism\ngit_remote_callbacks callbacks", + "line": 577, + "lineto": 599, + "block": "unsigned int version\nunsigned int pb_parallelism\ngit_remote_callbacks callbacks\ngit_strarray custom_headers", "tdef": "typedef", "description": " Controls the behavior of a git_push object.", "comments": "", @@ -30971,6 +31412,11 @@ "type": "git_remote_callbacks", "name": "callbacks", "comments": " Callbacks to use for this push operation" + }, + { + "type": "git_strarray", + "name": "custom_headers", + "comments": " Extra headers for this push operation" } ], "used": { @@ -30995,8 +31441,8 @@ "type": "struct", "value": "git_push_update", "file": "remote.h", - "line": 340, - "lineto": 357, + "line": 341, + "lineto": 358, "block": "char * src_refname\nchar * dst_refname\ngit_oid src\ngit_oid dst", "tdef": "typedef", "description": " Represents an update which will be performed on the remote during push", @@ -31025,7 +31471,9 @@ ], "used": { "returns": [], - "needs": [] + "needs": [ + "git_push_negotiation" + ] } } ], @@ -31042,13 +31490,17 @@ "description": " Representation of a rebase ", "comments": "", "used": { - "returns": [], + "returns": [ + "git_rebase_operation_byindex" + ], "needs": [ "git_rebase_abort", "git_rebase_commit", "git_rebase_finish", "git_rebase_free", "git_rebase_init", + "git_rebase_init_options", + "git_rebase_inmemory_index", "git_rebase_next", "git_rebase_open", "git_rebase_operation_byindex", @@ -31069,12 +31521,12 @@ "type": "struct", "value": "git_rebase_operation", "file": "rebase.h", - "line": 115, - "lineto": 130, + "line": 130, + "lineto": 145, "block": "git_rebase_operation_t type\nconst git_oid id\nconst char * exec", "tdef": "typedef", "description": " A rebase operation", - "comments": "

Describes a single instruction/operation to be performed during the\n rebase.

\n", + "comments": "

Describes a single instruction/operation to be performed during the rebase.

\n", "fields": [ { "type": "git_rebase_operation_t", @@ -31115,8 +31567,8 @@ ], "type": "enum", "file": "rebase.h", - "line": 64, - "lineto": 100, + "line": 78, + "lineto": 114, "block": "GIT_REBASE_OPERATION_PICK\nGIT_REBASE_OPERATION_REWORD\nGIT_REBASE_OPERATION_EDIT\nGIT_REBASE_OPERATION_SQUASH\nGIT_REBASE_OPERATION_FIXUP\nGIT_REBASE_OPERATION_EXEC", "tdef": "typedef", "description": " Type of rebase operation in-progress after calling `git_rebase_next`.", @@ -31209,7 +31661,9 @@ } ], "used": { - "returns": [], + "returns": [ + "git_reference_type" + ], "needs": [] } } @@ -31229,8 +31683,10 @@ "used": { "returns": [], "needs": [ + "git_refdb_backend_fs", "git_refdb_compress", "git_refdb_free", + "git_refdb_init_backend", "git_refdb_new", "git_refdb_open", "git_refdb_set_backend", @@ -31287,7 +31743,7 @@ { "type": "int (*)(git_refdb_backend *, const char *, const git_oid *, const char *)", "name": "del", - "comments": " Deletes the given reference from the refdb. A refdb implementation\n must provide this function." + "comments": " Deletes the given reference (and if necessary its reflog)\n from the refdb. A refdb implementation must provide this\n function." }, { "type": "int (*)(git_refdb_backend *)", @@ -31307,7 +31763,7 @@ { "type": "void (*)(git_refdb_backend *)", "name": "free", - "comments": " Frees any resources held by the refdb. A refdb implementation may\n provide this function; if it is not provided, nothing will be done." + "comments": " Frees any resources held by the refdb (including the `git_refdb_backend`\n itself). A refdb backend implementation must provide this function." }, { "type": "int (*)(git_reflog **, git_refdb_backend *, const char *)", @@ -31384,14 +31840,21 @@ "git_reference_create_matching", "git_reference_delete", "git_reference_dwim", + "git_reference_foreach", + "git_reference_foreach_glob", + "git_reference_foreach_name", "git_reference_free", "git_reference_is_branch", "git_reference_is_note", "git_reference_is_remote", "git_reference_is_tag", + "git_reference_iterator_free", + "git_reference_iterator_glob_new", + "git_reference_iterator_new", "git_reference_lookup", "git_reference_name", "git_reference_next", + "git_reference_next_name", "git_reference_owner", "git_reference_peel", "git_reference_rename", @@ -31520,11 +31983,17 @@ "description": " Representation of a reference log ", "comments": "", "used": { - "returns": [], + "returns": [ + "git_reflog_entry_byindex" + ], "needs": [ "git_reflog_append", "git_reflog_drop", "git_reflog_entry_byindex", + "git_reflog_entry_committer", + "git_reflog_entry_id_new", + "git_reflog_entry_id_old", + "git_reflog_entry_message", "git_reflog_entrycount", "git_reflog_free", "git_reflog_read", @@ -31571,13 +32040,17 @@ "description": " Git's idea of a remote repository. A remote can be anonymous (in\n which case it does not have backing configuration entires).", "comments": "", "used": { - "returns": [], + "returns": [ + "git_remote_autotag" + ], "needs": [ + "git_headlist_cb", "git_remote_autotag", "git_remote_connect", "git_remote_connected", "git_remote_create", "git_remote_create_anonymous", + "git_remote_create_cb", "git_remote_create_with_fetchspec", "git_remote_default_branch", "git_remote_disconnect", @@ -31588,6 +32061,7 @@ "git_remote_get_fetch_refspecs", "git_remote_get_push_refspecs", "git_remote_get_refspec", + "git_remote_init_callbacks", "git_remote_lookup", "git_remote_ls", "git_remote_name", @@ -31597,11 +32071,13 @@ "git_remote_push", "git_remote_pushurl", "git_remote_refspec_count", + "git_remote_set_autotag", "git_remote_stats", "git_remote_stop", "git_remote_update_tips", "git_remote_upload", "git_remote_url", + "git_transport_cb", "git_transport_dummy", "git_transport_local", "git_transport_new", @@ -31622,8 +32098,8 @@ ], "type": "enum", "file": "remote.h", - "line": 494, - "lineto": 512, + "line": 495, + "lineto": 513, "block": "GIT_REMOTE_DOWNLOAD_TAGS_UNSPECIFIED\nGIT_REMOTE_DOWNLOAD_TAGS_AUTO\nGIT_REMOTE_DOWNLOAD_TAGS_NONE\nGIT_REMOTE_DOWNLOAD_TAGS_ALL", "tdef": "typedef", "description": " Automatic tag following option", @@ -31655,7 +32131,9 @@ } ], "used": { - "returns": [], + "returns": [ + "git_remote_autotag" + ], "needs": [ "git_remote_set_autotag", "git_remote_update_tips" @@ -31684,12 +32162,12 @@ "type": "struct", "value": "git_remote_callbacks", "file": "remote.h", - "line": 373, - "lineto": 457, + "line": 374, + "lineto": 458, "block": "unsigned int version\ngit_transport_message_cb sideband_progress\nint (*)(git_remote_completion_type, void *) completion\ngit_cred_acquire_cb credentials\ngit_transport_certificate_check_cb certificate_check\ngit_transfer_progress_cb transfer_progress\nint (*)(const char *, const git_oid *, const git_oid *, void *) update_tips\ngit_packbuilder_progress pack_progress\ngit_push_transfer_progress push_transfer_progress\nint (*)(const char *, const char *, void *) push_update_reference\ngit_push_negotiation push_negotiation\ngit_transport_cb transport\nvoid * payload", "tdef": null, "description": " The callback settings structure", - "comments": "

Set the callbacks to be called by the remote when informing the user\n about the progress of the network operations.

\n", + "comments": "

Set the callbacks to be called by the remote when informing the user about the progress of the network operations.

\n", "fields": [ { "type": "unsigned int", @@ -31778,8 +32256,8 @@ ], "type": "enum", "file": "remote.h", - "line": 325, - "lineto": 329, + "line": 326, + "lineto": 330, "block": "GIT_REMOTE_COMPLETION_DOWNLOAD\nGIT_REMOTE_COMPLETION_INDEXING\nGIT_REMOTE_COMPLETION_ERROR\nGIT_REMOTE_COMPLETION_DOWNLOAD\nGIT_REMOTE_COMPLETION_INDEXING\nGIT_REMOTE_COMPLETION_ERROR", "tdef": "typedef", "description": " Argument to the completion callback which tells it which operation\n finished.", @@ -31859,6 +32337,7 @@ "used": { "returns": [], "needs": [ + "git_headlist_cb", "git_remote_ls" ] } @@ -31919,12 +32398,13 @@ "git_clone", "git_commit_create", "git_commit_create_from_callback", - "git_commit_create_from_ids", "git_commit_create_v", + "git_commit_extract_signature", "git_commit_lookup", "git_commit_lookup_prefix", "git_describe_workdir", "git_diff_commit_as_email", + "git_diff_index_to_index", "git_diff_index_to_workdir", "git_diff_tree_to_index", "git_diff_tree_to_tree", @@ -31987,6 +32467,7 @@ "git_remote_add_push", "git_remote_create", "git_remote_create_anonymous", + "git_remote_create_cb", "git_remote_create_with_fetchspec", "git_remote_delete", "git_remote_list", @@ -31998,6 +32479,7 @@ "git_repository__cleanup", "git_repository_config", "git_repository_config_snapshot", + "git_repository_create_cb", "git_repository_detach_head", "git_repository_fetchhead_foreach", "git_repository_free", @@ -32010,6 +32492,7 @@ "git_repository_index", "git_repository_init", "git_repository_init_ext", + "git_repository_init_init_options", "git_repository_is_bare", "git_repository_is_empty", "git_repository_is_shallow", @@ -32107,7 +32590,7 @@ "block": "GIT_REPOSITORY_INIT_BARE\nGIT_REPOSITORY_INIT_NO_REINIT\nGIT_REPOSITORY_INIT_NO_DOTGIT_DIR\nGIT_REPOSITORY_INIT_MKDIR\nGIT_REPOSITORY_INIT_MKPATH\nGIT_REPOSITORY_INIT_EXTERNAL_TEMPLATE\nGIT_REPOSITORY_INIT_RELATIVE_GITLINK", "tdef": "typedef", "description": " Option flags for `git_repository_init_ext`.", - "comments": "

These flags configure extra behaviors to git_repository_init_ext.\n In every case, the default behavior is the zero value (i.e. flag is\n not set). Just OR the flag values together for the flags parameter\n when initializing a new repo. Details of individual values are:

\n\n
    \n
  • BARE - Create a bare repository with no working directory.
    • \n
  • NO_REINIT - Return an GIT_EEXISTS error if the repo_path appears to\n already be an git repository.
    • \n
  • NO_DOTGIT_DIR - Normally a "/.git/" will be appended to the repo\n path for non-bare repos (if it is not already there), but\n passing this flag prevents that behavior.
    • \n
  • MKDIR - Make the repo_path (and workdir_path) as needed. Init is\n always willing to create the ".git" directory even without this\n flag. This flag tells init to create the trailing component of\n the repo and workdir paths as needed.
    • \n
  • MKPATH - Recursively make all components of the repo and workdir\n paths as necessary.
    • \n
  • EXTERNAL_TEMPLATE - libgit2 normally uses internal templates to\n initialize a new repo. This flags enables external templates,\n looking the "template_path" from the options if set, or the\n init.templatedir global config if not, or falling back on\n "/usr/share/git-core/templates" if it exists.
    • \n
  • GIT_REPOSITORY_INIT_RELATIVE_GITLINK - If an alternate workdir is\n specified, use relative paths for the gitdir and core.worktree.
    • \n
\n", + "comments": "

These flags configure extra behaviors to git_repository_init_ext. In every case, the default behavior is the zero value (i.e. flag is not set). Just OR the flag values together for the flags parameter when initializing a new repo. Details of individual values are:

\n\n
    \n
  • BARE - Create a bare repository with no working directory. * NO_REINIT - Return an GIT_EEXISTS error if the repo_path appears to already be an git repository. * NO_DOTGIT_DIR - Normally a "/.git/" will be appended to the repo path for non-bare repos (if it is not already there), but passing this flag prevents that behavior. * MKDIR - Make the repo_path (and workdir_path) as needed. Init is always willing to create the ".git" directory even without this flag. This flag tells init to create the trailing component of the repo and workdir paths as needed. * MKPATH - Recursively make all components of the repo and workdir paths as necessary. * EXTERNAL_TEMPLATE - libgit2 normally uses internal templates to initialize a new repo. This flags enables external templates, looking the "template_path" from the options if set, or the init.templatedir global config if not, or falling back on "/usr/share/git-core/templates" if it exists. * GIT_REPOSITORY_INIT_RELATIVE_GITLINK - If an alternate workdir is specified, use relative paths for the gitdir and core.worktree.
    • \n
\n", "fields": [ { "type": "int", @@ -32173,7 +32656,7 @@ "block": "GIT_REPOSITORY_INIT_SHARED_UMASK\nGIT_REPOSITORY_INIT_SHARED_GROUP\nGIT_REPOSITORY_INIT_SHARED_ALL", "tdef": "typedef", "description": " Mode options for `git_repository_init_ext`.", - "comments": "

Set the mode field of the git_repository_init_options structure\n either to the custom mode that you would like, or to one of the\n following modes:

\n\n
    \n
  • SHARED_UMASK - Use permissions configured by umask - the default.
    • \n
  • SHARED_GROUP - Use "--shared=group" behavior, chmod'ing the new repo\n to be group writable and "g+sx" for sticky group assignment.
    • \n
  • SHARED_ALL - Use "--shared=all" behavior, adding world readability.
    • \n
  • Anything else - Set to custom value.
    • \n
\n", + "comments": "

Set the mode field of the git_repository_init_options structure either to the custom mode that you would like, or to one of the following modes:

\n\n
    \n
  • SHARED_UMASK - Use permissions configured by umask - the default. * SHARED_GROUP - Use "--shared=group" behavior, chmod'ing the new repo to be group writable and "g+sx" for sticky group assignment. * SHARED_ALL - Use "--shared=all" behavior, adding world readability. * Anything else - Set to custom value.
    • \n
\n", "fields": [ { "type": "int", @@ -32221,7 +32704,7 @@ "block": "unsigned int version\nuint32_t flags\nuint32_t mode\nconst char * workdir_path\nconst char * description\nconst char * template_path\nconst char * initial_head\nconst char * origin_url", "tdef": "typedef", "description": " Extended options structure for `git_repository_init_ext`.", - "comments": "

This contains extra options for git_repository_init_ext that enable\n additional initialization features. The fields are:

\n\n
    \n
  • flags - Combination of GIT_REPOSITORY_INIT flags above.
    • \n
  • mode - Set to one of the standard GIT_REPOSITORY_INIT_SHARED_...\n constants above, or to a custom value that you would like.
    • \n
  • workdir_path - The path to the working dir or NULL for default (i.e.\n repo_path parent on non-bare repos). IF THIS IS RELATIVE PATH,\n IT WILL BE EVALUATED RELATIVE TO THE REPO_PATH. If this is not\n the "natural" working directory, a .git gitlink file will be\n created here linking to the repo_path.
    • \n
  • description - If set, this will be used to initialize the "description"\n file in the repository, instead of using the template content.
    • \n
  • template_path - When GIT_REPOSITORY_INIT_EXTERNAL_TEMPLATE is set,\n this contains the path to use for the template directory. If\n this is NULL, the config or default directory options will be\n used instead.
    • \n
  • initial_head - The name of the head to point HEAD at. If NULL, then\n this will be treated as "master" and the HEAD ref will be set\n to "refs/heads/master". If this begins with "refs/" it will be\n used verbatim; otherwise "refs/heads/" will be prefixed.
    • \n
  • origin_url - If this is non-NULL, then after the rest of the\n repository initialization is completed, an "origin" remote\n will be added pointing to this URL.
    • \n
\n", + "comments": "

This contains extra options for git_repository_init_ext that enable additional initialization features. The fields are:

\n\n
    \n
  • flags - Combination of GIT_REPOSITORY_INIT flags above. * mode - Set to one of the standard GIT_REPOSITORY_INIT_SHARED_... constants above, or to a custom value that you would like. * workdir_path - The path to the working dir or NULL for default (i.e. repo_path parent on non-bare repos). IF THIS IS RELATIVE PATH, IT WILL BE EVALUATED RELATIVE TO THE REPO_PATH. If this is not the "natural" working directory, a .git gitlink file will be created here linking to the repo_path. * description - If set, this will be used to initialize the "description" file in the repository, instead of using the template content. * template_path - When GIT_REPOSITORY_INIT_EXTERNAL_TEMPLATE is set, this contains the path to use for the template directory. If this is NULL, the config or default directory options will be used instead. * initial_head - The name of the head to point HEAD at. If NULL, then this will be treated as "master" and the HEAD ref will be set to "refs/heads/master". If this begins with "refs/" it will be used verbatim; otherwise "refs/heads/" will be prefixed. * origin_url - If this is non-NULL, then after the rest of the repository initialization is completed, an "origin" remote will be added pointing to this URL.
    • \n
\n", "fields": [ { "type": "unsigned int", @@ -32288,7 +32771,7 @@ "block": "GIT_REPOSITORY_OPEN_NO_SEARCH\nGIT_REPOSITORY_OPEN_CROSS_FS\nGIT_REPOSITORY_OPEN_BARE", "tdef": "typedef", "description": " Option flags for `git_repository_open_ext`.", - "comments": "
    \n
  • GIT_REPOSITORY_OPEN_NO_SEARCH - Only open the repository if it can be\nimmediately found in the start_path. Do not walk up from the\nstart_path looking at parent directories.
    • \n
  • GIT_REPOSITORY_OPEN_CROSS_FS - Unless this flag is set, open will not\ncontinue searching across filesystem boundaries (i.e. when st_dev\nchanges from the stat system call). (E.g. Searching in a user's home\ndirectory "/home/user/source/" will not return "/.git/" as the found\nrepo if "/" is a different filesystem than "/home".)
    • \n
  • GIT_REPOSITORY_OPEN_BARE - Open repository as a bare repo regardless\nof core.bare config, and defer loading config file for faster setup.\nUnlike git_repository_open_bare, this can follow gitlinks.
    • \n
\n", + "comments": "
    \n
  • GIT_REPOSITORY_OPEN_NO_SEARCH - Only open the repository if it can be immediately found in the start_path. Do not walk up from the start_path looking at parent directories. * GIT_REPOSITORY_OPEN_CROSS_FS - Unless this flag is set, open will not continue searching across filesystem boundaries (i.e. when st_dev changes from the stat system call). (E.g. Searching in a user's home directory "/home/user/source/" will not return "/.git/" as the found repo if "/" is a different filesystem than "/home".) * GIT_REPOSITORY_OPEN_BARE - Open repository as a bare repo regardless of core.bare config, and defer loading config file for faster setup. Unlike git_repository_open_bare, this can follow gitlinks.
    • \n
\n", "fields": [ { "type": "int", @@ -32322,7 +32805,9 @@ "GIT_REPOSITORY_STATE_NONE", "GIT_REPOSITORY_STATE_MERGE", "GIT_REPOSITORY_STATE_REVERT", + "GIT_REPOSITORY_STATE_REVERT_SEQUENCE", "GIT_REPOSITORY_STATE_CHERRYPICK", + "GIT_REPOSITORY_STATE_CHERRYPICK_SEQUENCE", "GIT_REPOSITORY_STATE_BISECT", "GIT_REPOSITORY_STATE_REBASE", "GIT_REPOSITORY_STATE_REBASE_INTERACTIVE", @@ -32333,11 +32818,11 @@ "type": "enum", "file": "repository.h", "line": 674, - "lineto": 685, - "block": "GIT_REPOSITORY_STATE_NONE\nGIT_REPOSITORY_STATE_MERGE\nGIT_REPOSITORY_STATE_REVERT\nGIT_REPOSITORY_STATE_CHERRYPICK\nGIT_REPOSITORY_STATE_BISECT\nGIT_REPOSITORY_STATE_REBASE\nGIT_REPOSITORY_STATE_REBASE_INTERACTIVE\nGIT_REPOSITORY_STATE_REBASE_MERGE\nGIT_REPOSITORY_STATE_APPLY_MAILBOX\nGIT_REPOSITORY_STATE_APPLY_MAILBOX_OR_REBASE", + "lineto": 687, + "block": "GIT_REPOSITORY_STATE_NONE\nGIT_REPOSITORY_STATE_MERGE\nGIT_REPOSITORY_STATE_REVERT\nGIT_REPOSITORY_STATE_REVERT_SEQUENCE\nGIT_REPOSITORY_STATE_CHERRYPICK\nGIT_REPOSITORY_STATE_CHERRYPICK_SEQUENCE\nGIT_REPOSITORY_STATE_BISECT\nGIT_REPOSITORY_STATE_REBASE\nGIT_REPOSITORY_STATE_REBASE_INTERACTIVE\nGIT_REPOSITORY_STATE_REBASE_MERGE\nGIT_REPOSITORY_STATE_APPLY_MAILBOX\nGIT_REPOSITORY_STATE_APPLY_MAILBOX_OR_REBASE", "tdef": "typedef", "description": " Repository state", - "comments": "

These values represent possible states for the repository to be in,\n based on the current operation which is ongoing.

\n", + "comments": "

These values represent possible states for the repository to be in, based on the current operation which is ongoing.

\n", "fields": [ { "type": "int", @@ -32359,45 +32844,57 @@ }, { "type": "int", - "name": "GIT_REPOSITORY_STATE_CHERRYPICK", + "name": "GIT_REPOSITORY_STATE_REVERT_SEQUENCE", "comments": "", "value": 3 }, { "type": "int", - "name": "GIT_REPOSITORY_STATE_BISECT", + "name": "GIT_REPOSITORY_STATE_CHERRYPICK", "comments": "", "value": 4 }, { "type": "int", - "name": "GIT_REPOSITORY_STATE_REBASE", + "name": "GIT_REPOSITORY_STATE_CHERRYPICK_SEQUENCE", "comments": "", "value": 5 }, { "type": "int", - "name": "GIT_REPOSITORY_STATE_REBASE_INTERACTIVE", + "name": "GIT_REPOSITORY_STATE_BISECT", "comments": "", "value": 6 }, { "type": "int", - "name": "GIT_REPOSITORY_STATE_REBASE_MERGE", + "name": "GIT_REPOSITORY_STATE_REBASE", "comments": "", "value": 7 }, { "type": "int", - "name": "GIT_REPOSITORY_STATE_APPLY_MAILBOX", + "name": "GIT_REPOSITORY_STATE_REBASE_INTERACTIVE", "comments": "", "value": 8 }, { "type": "int", - "name": "GIT_REPOSITORY_STATE_APPLY_MAILBOX_OR_REBASE", + "name": "GIT_REPOSITORY_STATE_REBASE_MERGE", "comments": "", "value": 9 + }, + { + "type": "int", + "name": "GIT_REPOSITORY_STATE_APPLY_MAILBOX", + "comments": "", + "value": 10 + }, + { + "type": "int", + "name": "GIT_REPOSITORY_STATE_APPLY_MAILBOX_OR_REBASE", + "comments": "", + "value": 11 } ], "used": { @@ -32668,7 +33165,6 @@ "git_commit_amend", "git_commit_create", "git_commit_create_from_callback", - "git_commit_create_from_ids", "git_commit_create_v", "git_note_create", "git_note_remove", @@ -32697,12 +33193,12 @@ "type": "struct", "value": "git_smart_subtransport_definition", "file": "sys/transport.h", - "line": 296, - "lineto": 309, + "line": 324, + "lineto": 337, "block": "git_smart_subtransport_cb callback\nunsigned int rpc\nvoid * param", "tdef": "typedef", "description": " Definition for a \"subtransport\"", - "comments": "

This is used to let the smart protocol code know about the protocol\n which you are implementing.

\n", + "comments": "

This is used to let the smart protocol code know about the protocol which you are implementing.

\n", "fields": [ { "type": "git_smart_subtransport_cb", @@ -32911,7 +33407,7 @@ "block": "GIT_STATUS_OPT_INCLUDE_UNTRACKED\nGIT_STATUS_OPT_INCLUDE_IGNORED\nGIT_STATUS_OPT_INCLUDE_UNMODIFIED\nGIT_STATUS_OPT_EXCLUDE_SUBMODULES\nGIT_STATUS_OPT_RECURSE_UNTRACKED_DIRS\nGIT_STATUS_OPT_DISABLE_PATHSPEC_MATCH\nGIT_STATUS_OPT_RECURSE_IGNORED_DIRS\nGIT_STATUS_OPT_RENAMES_HEAD_TO_INDEX\nGIT_STATUS_OPT_RENAMES_INDEX_TO_WORKDIR\nGIT_STATUS_OPT_SORT_CASE_SENSITIVELY\nGIT_STATUS_OPT_SORT_CASE_INSENSITIVELY\nGIT_STATUS_OPT_RENAMES_FROM_REWRITES\nGIT_STATUS_OPT_NO_REFRESH\nGIT_STATUS_OPT_UPDATE_INDEX\nGIT_STATUS_OPT_INCLUDE_UNREADABLE\nGIT_STATUS_OPT_INCLUDE_UNREADABLE_AS_UNTRACKED", "tdef": "typedef", "description": " Flags to control status callbacks", - "comments": "
    \n
  • GIT_STATUS_OPT_INCLUDE_UNTRACKED says that callbacks should be made\non untracked files. These will only be made if the workdir files are\nincluded in the status "show" option.
    • \n
  • GIT_STATUS_OPT_INCLUDE_IGNORED says that ignored files get callbacks.\nAgain, these callbacks will only be made if the workdir files are\nincluded in the status "show" option.
    • \n
  • GIT_STATUS_OPT_INCLUDE_UNMODIFIED indicates that callback should be\nmade even on unmodified files.
    • \n
  • GIT_STATUS_OPT_EXCLUDE_SUBMODULES indicates that submodules should be\nskipped. This only applies if there are no pending typechanges to\nthe submodule (either from or to another type).
    • \n
  • GIT_STATUS_OPT_RECURSE_UNTRACKED_DIRS indicates that all files in\nuntracked directories should be included. Normally if an entire\ndirectory is new, then just the top-level directory is included (with\na trailing slash on the entry name). This flag says to include all\nof the individual files in the directory instead.
    • \n
  • GIT_STATUS_OPT_DISABLE_PATHSPEC_MATCH indicates that the given path\nshould be treated as a literal path, and not as a pathspec pattern.
    • \n
  • GIT_STATUS_OPT_RECURSE_IGNORED_DIRS indicates that the contents of\nignored directories should be included in the status. This is like\ndoing git ls-files -o -i --exclude-standard with core git.
    • \n
  • GIT_STATUS_OPT_RENAMES_HEAD_TO_INDEX indicates that rename detection\nshould be processed between the head and the index and enables\nthe GIT_STATUS_INDEX_RENAMED as a possible status flag.
    • \n
  • GIT_STATUS_OPT_RENAMES_INDEX_TO_WORKDIR indicates that rename\ndetection should be run between the index and the working directory\nand enabled GIT_STATUS_WT_RENAMED as a possible status flag.
    • \n
  • GIT_STATUS_OPT_SORT_CASE_SENSITIVELY overrides the native case\nsensitivity for the file system and forces the output to be in\ncase-sensitive order
    • \n
  • GIT_STATUS_OPT_SORT_CASE_INSENSITIVELY overrides the native case\nsensitivity for the file system and forces the output to be in\ncase-insensitive order
    • \n
  • GIT_STATUS_OPT_RENAMES_FROM_REWRITES indicates that rename detection\nshould include rewritten files
    • \n
  • GIT_STATUS_OPT_NO_REFRESH bypasses the default status behavior of\ndoing a "soft" index reload (i.e. reloading the index data if the\nfile on disk has been modified outside libgit2).
    • \n
  • GIT_STATUS_OPT_UPDATE_INDEX tells libgit2 to refresh the stat cache\nin the index for files that are unchanged but have out of date stat\ninformation in the index. It will result in less work being done on\nsubsequent calls to get status. This is mutually exclusive with the\nNO_REFRESH option.
    • \n
\n\n

Calling git_status_foreach() is like calling the extended version\n with: GIT_STATUS_OPT_INCLUDE_IGNORED, GIT_STATUS_OPT_INCLUDE_UNTRACKED,\n and GIT_STATUS_OPT_RECURSE_UNTRACKED_DIRS. Those options are bundled\n together as GIT_STATUS_OPT_DEFAULTS if you want them as a baseline.

\n", + "comments": "
    \n
  • GIT_STATUS_OPT_INCLUDE_UNTRACKED says that callbacks should be made on untracked files. These will only be made if the workdir files are included in the status "show" option. - GIT_STATUS_OPT_INCLUDE_IGNORED says that ignored files get callbacks. Again, these callbacks will only be made if the workdir files are included in the status "show" option. - GIT_STATUS_OPT_INCLUDE_UNMODIFIED indicates that callback should be made even on unmodified files. - GIT_STATUS_OPT_EXCLUDE_SUBMODULES indicates that submodules should be skipped. This only applies if there are no pending typechanges to the submodule (either from or to another type). - GIT_STATUS_OPT_RECURSE_UNTRACKED_DIRS indicates that all files in untracked directories should be included. Normally if an entire directory is new, then just the top-level directory is included (with a trailing slash on the entry name). This flag says to include all of the individual files in the directory instead. - GIT_STATUS_OPT_DISABLE_PATHSPEC_MATCH indicates that the given path should be treated as a literal path, and not as a pathspec pattern. - GIT_STATUS_OPT_RECURSE_IGNORED_DIRS indicates that the contents of ignored directories should be included in the status. This is like doing git ls-files -o -i --exclude-standard with core git. - GIT_STATUS_OPT_RENAMES_HEAD_TO_INDEX indicates that rename detection should be processed between the head and the index and enables the GIT_STATUS_INDEX_RENAMED as a possible status flag. - GIT_STATUS_OPT_RENAMES_INDEX_TO_WORKDIR indicates that rename detection should be run between the index and the working directory and enabled GIT_STATUS_WT_RENAMED as a possible status flag. - GIT_STATUS_OPT_SORT_CASE_SENSITIVELY overrides the native case sensitivity for the file system and forces the output to be in case-sensitive order - GIT_STATUS_OPT_SORT_CASE_INSENSITIVELY overrides the native case sensitivity for the file system and forces the output to be in case-insensitive order - GIT_STATUS_OPT_RENAMES_FROM_REWRITES indicates that rename detection should include rewritten files - GIT_STATUS_OPT_NO_REFRESH bypasses the default status behavior of doing a "soft" index reload (i.e. reloading the index data if the file on disk has been modified outside libgit2). - GIT_STATUS_OPT_UPDATE_INDEX tells libgit2 to refresh the stat cache in the index for files that are unchanged but have out of date stat information in the index. It will result in less work being done on subsequent calls to get status. This is mutually exclusive with the NO_REFRESH option.
    • \n
\n\n

Calling git_status_foreach() is like calling the extended version with: GIT_STATUS_OPT_INCLUDE_IGNORED, GIT_STATUS_OPT_INCLUDE_UNTRACKED, and GIT_STATUS_OPT_RECURSE_UNTRACKED_DIRS. Those options are bundled together as GIT_STATUS_OPT_DEFAULTS if you want them as a baseline.

\n", "fields": [ { "type": "int", @@ -33031,7 +33527,7 @@ "block": "GIT_STATUS_SHOW_INDEX_AND_WORKDIR\nGIT_STATUS_SHOW_INDEX_ONLY\nGIT_STATUS_SHOW_WORKDIR_ONLY", "tdef": "typedef", "description": " Select the files on which to report status.", - "comments": "

With git_status_foreach_ext, this will control which changes get\n callbacks. With git_status_list_new, these will control which\n changes are included in the list.

\n\n
    \n
  • GIT_STATUS_SHOW_INDEX_AND_WORKDIR is the default. This roughly\nmatches git status --porcelain regarding which files are\nincluded and in what order.
    • \n
  • GIT_STATUS_SHOW_INDEX_ONLY only gives status based on HEAD to index\ncomparison, not looking at working directory changes.
    • \n
  • GIT_STATUS_SHOW_WORKDIR_ONLY only gives status based on index to\nworking directory comparison, not comparing the index to the HEAD.
    • \n
\n", + "comments": "

With git_status_foreach_ext, this will control which changes get callbacks. With git_status_list_new, these will control which changes are included in the list.

\n\n
    \n
  • GIT_STATUS_SHOW_INDEX_AND_WORKDIR is the default. This roughly matches git status --porcelain regarding which files are included and in what order. - GIT_STATUS_SHOW_INDEX_ONLY only gives status based on HEAD to index comparison, not looking at working directory changes. - GIT_STATUS_SHOW_WORKDIR_ONLY only gives status based on index to working directory comparison, not comparing the index to the HEAD.
    • \n
\n", "fields": [ { "type": "int", @@ -33084,7 +33580,7 @@ "block": "GIT_STATUS_CURRENT\nGIT_STATUS_INDEX_NEW\nGIT_STATUS_INDEX_MODIFIED\nGIT_STATUS_INDEX_DELETED\nGIT_STATUS_INDEX_RENAMED\nGIT_STATUS_INDEX_TYPECHANGE\nGIT_STATUS_WT_NEW\nGIT_STATUS_WT_MODIFIED\nGIT_STATUS_WT_DELETED\nGIT_STATUS_WT_TYPECHANGE\nGIT_STATUS_WT_RENAMED\nGIT_STATUS_WT_UNREADABLE\nGIT_STATUS_IGNORED\nGIT_STATUS_CONFLICTED", "tdef": "typedef", "description": " Status flags for a single file.", - "comments": "

A combination of these values will be returned to indicate the status of\n a file. Status compares the working directory, the index, and the\n current HEAD of the repository. The GIT_STATUS_INDEX set of flags\n represents the status of file in the index relative to the HEAD, and the\n GIT_STATUS_WT set of flags represent the status of the file in the\n working directory relative to the index.

\n", + "comments": "

A combination of these values will be returned to indicate the status of a file. Status compares the working directory, the index, and the current HEAD of the repository. The GIT_STATUS_INDEX set of flags represents the status of file in the index relative to the HEAD, and the GIT_STATUS_WT set of flags represent the status of the file in the working directory relative to the index.

\n", "fields": [ { "type": "int", @@ -33213,6 +33709,7 @@ "git_index_update_all", "git_pathspec_new", "git_reference_list", + "git_remote_connect", "git_remote_download", "git_remote_fetch", "git_remote_get_fetch_refspecs", @@ -33240,8 +33737,8 @@ "int (*)(struct git_stream *) connect", "int (*)(git_cert **, struct git_stream *) certificate", "int (*)(struct git_stream *, const char *) set_proxy", - "ssize_t (*)(struct git_stream *, void *, size_t) read", - "ssize_t (*)(struct git_stream *, const char *, size_t, int) write", + "ssize_t (*)(struct git_stream *, void *, int) read", + "ssize_t (*)(struct git_stream *, const char *, int, int) write", "int (*)(struct git_stream *) close", "void (*)(struct git_stream *) free" ], @@ -33250,10 +33747,10 @@ "file": "sys/stream.h", "line": 28, "lineto": 40, - "block": "int version\nint encrypted\nint proxy_support\nint (*)(struct git_stream *) connect\nint (*)(git_cert **, struct git_stream *) certificate\nint (*)(struct git_stream *, const char *) set_proxy\nssize_t (*)(struct git_stream *, void *, size_t) read\nssize_t (*)(struct git_stream *, const char *, size_t, int) write\nint (*)(struct git_stream *) close\nvoid (*)(struct git_stream *) free", + "block": "int version\nint encrypted\nint proxy_support\nint (*)(struct git_stream *) connect\nint (*)(git_cert **, struct git_stream *) certificate\nint (*)(struct git_stream *, const char *) set_proxy\nssize_t (*)(struct git_stream *, void *, int) read\nssize_t (*)(struct git_stream *, const char *, int, int) write\nint (*)(struct git_stream *) close\nvoid (*)(struct git_stream *) free", "tdef": "typedef", "description": " Every stream must have this struct as its first element, so the\n API can talk to it. You'd define your stream as", - "comments": "
 struct my_stream {\n         git_stream parent;\n         ...\n }\n
\n\n

and fill the functions

\n", + "comments": "
 struct my_stream {             git_stream parent;             ...     }\n
\n\n

and fill the functions

\n", "fields": [ { "type": "int", @@ -33286,12 +33783,12 @@ "comments": "" }, { - "type": "ssize_t (*)(struct git_stream *, void *, size_t)", + "type": "ssize_t (*)(struct git_stream *, void *, int)", "name": "read", "comments": "" }, { - "type": "ssize_t (*)(struct git_stream *, const char *, size_t, int)", + "type": "ssize_t (*)(struct git_stream *, const char *, int, int)", "name": "write", "comments": "" }, @@ -33308,7 +33805,9 @@ ], "used": { "returns": [], - "needs": [] + "needs": [ + "git_stream_register_tls" + ] } } ], @@ -33325,12 +33824,17 @@ "description": " Opaque structure representing a submodule.", "comments": "", "used": { - "returns": [], + "returns": [ + "git_submodule_fetch_recurse_submodules", + "git_submodule_ignore", + "git_submodule_update_strategy" + ], "needs": [ "git_submodule_add_finalize", "git_submodule_add_setup", "git_submodule_add_to_index", "git_submodule_branch", + "git_submodule_cb", "git_submodule_fetch_recurse_submodules", "git_submodule_foreach", "git_submodule_free", @@ -33346,8 +33850,13 @@ "git_submodule_path", "git_submodule_reload", "git_submodule_repo_init", + "git_submodule_set_fetch_recurse_submodules", + "git_submodule_set_ignore", + "git_submodule_set_update", + "git_submodule_status", "git_submodule_sync", "git_submodule_update", + "git_submodule_update_init_options", "git_submodule_update_strategy", "git_submodule_url", "git_submodule_wd_id" @@ -33372,7 +33881,7 @@ "block": "GIT_SUBMODULE_IGNORE_UNSPECIFIED\nGIT_SUBMODULE_IGNORE_NONE\nGIT_SUBMODULE_IGNORE_UNTRACKED\nGIT_SUBMODULE_IGNORE_DIRTY\nGIT_SUBMODULE_IGNORE_ALL", "tdef": "typedef", "description": " Submodule ignore values", - "comments": "

These values represent settings for the submodule.$name.ignore\n configuration value which says how deeply to look at the working\n directory when getting submodule status.

\n\n

You can override this value in memory on a per-submodule basis with\n git_submodule_set_ignore() and can write the changed value to disk\n with git_submodule_save(). If you have overwritten the value, you\n can revert to the on disk value by using GIT_SUBMODULE_IGNORE_RESET.

\n\n

The values are:

\n\n
    \n
  • GIT_SUBMODULE_IGNORE_UNSPECIFIED: use the submodule's configuration
    • \n
  • GIT_SUBMODULE_IGNORE_NONE: don't ignore any change - i.e. even an\nuntracked file, will mark the submodule as dirty. Ignored files are\nstill ignored, of course.
    • \n
  • GIT_SUBMODULE_IGNORE_UNTRACKED: ignore untracked files; only changes\nto tracked files, or the index or the HEAD commit will matter.
    • \n
  • GIT_SUBMODULE_IGNORE_DIRTY: ignore changes in the working directory,\nonly considering changes if the HEAD of submodule has moved from the\nvalue in the superproject.
    • \n
  • GIT_SUBMODULE_IGNORE_ALL: never check if the submodule is dirty
    • \n
  • GIT_SUBMODULE_IGNORE_DEFAULT: not used except as static initializer\nwhen we don't want any particular ignore rule to be specified.
    • \n
\n", + "comments": "

These values represent settings for the submodule.$name.ignore configuration value which says how deeply to look at the working directory when getting submodule status.

\n\n

You can override this value in memory on a per-submodule basis with git_submodule_set_ignore() and can write the changed value to disk with git_submodule_save(). If you have overwritten the value, you can revert to the on disk value by using GIT_SUBMODULE_IGNORE_RESET.

\n\n

The values are:

\n\n
    \n
  • GIT_SUBMODULE_IGNORE_UNSPECIFIED: use the submodule's configuration - GIT_SUBMODULE_IGNORE_NONE: don't ignore any change - i.e. even an untracked file, will mark the submodule as dirty. Ignored files are still ignored, of course. - GIT_SUBMODULE_IGNORE_UNTRACKED: ignore untracked files; only changes to tracked files, or the index or the HEAD commit will matter. - GIT_SUBMODULE_IGNORE_DIRTY: ignore changes in the working directory, only considering changes if the HEAD of submodule has moved from the value in the superproject. - GIT_SUBMODULE_IGNORE_ALL: never check if the submodule is dirty - GIT_SUBMODULE_IGNORE_DEFAULT: not used except as static initializer when we don't want any particular ignore rule to be specified.
    • \n
\n", "fields": [ { "type": "int", @@ -33406,7 +33915,9 @@ } ], "used": { - "returns": [], + "returns": [ + "git_submodule_ignore" + ], "needs": [ "git_submodule_set_ignore", "git_submodule_status" @@ -33429,7 +33940,7 @@ "block": "GIT_SUBMODULE_RECURSE_NO\nGIT_SUBMODULE_RECURSE_YES\nGIT_SUBMODULE_RECURSE_ONDEMAND", "tdef": "typedef", "description": " Options for submodule recurse.", - "comments": "

Represent the value of submodule.$name.fetchRecurseSubmodules

\n\n
    \n
  • GIT_SUBMODULE_RECURSE_NO - do no recurse into submodules
    • \n
  • GIT_SUBMODULE_RECURSE_YES - recurse into submodules
    • \n
  • GIT_SUBMODULE_RECURSE_ONDEMAND - recurse into submodules only when\n commit not already in local clone
    • \n
\n", + "comments": "

Represent the value of submodule.$name.fetchRecurseSubmodules

\n\n
    \n
  • GIT_SUBMODULE_RECURSE_NO - do no recurse into submodules * GIT_SUBMODULE_RECURSE_YES - recurse into submodules * GIT_SUBMODULE_RECURSE_ONDEMAND - recurse into submodules only when commit not already in local clone
    • \n
\n", "fields": [ { "type": "int", @@ -33451,7 +33962,9 @@ } ], "used": { - "returns": [], + "returns": [ + "git_submodule_fetch_recurse_submodules" + ], "needs": [ "git_submodule_set_fetch_recurse_submodules" ] @@ -33484,7 +33997,7 @@ "block": "GIT_SUBMODULE_STATUS_IN_HEAD\nGIT_SUBMODULE_STATUS_IN_INDEX\nGIT_SUBMODULE_STATUS_IN_CONFIG\nGIT_SUBMODULE_STATUS_IN_WD\nGIT_SUBMODULE_STATUS_INDEX_ADDED\nGIT_SUBMODULE_STATUS_INDEX_DELETED\nGIT_SUBMODULE_STATUS_INDEX_MODIFIED\nGIT_SUBMODULE_STATUS_WD_UNINITIALIZED\nGIT_SUBMODULE_STATUS_WD_ADDED\nGIT_SUBMODULE_STATUS_WD_DELETED\nGIT_SUBMODULE_STATUS_WD_MODIFIED\nGIT_SUBMODULE_STATUS_WD_INDEX_MODIFIED\nGIT_SUBMODULE_STATUS_WD_WD_MODIFIED\nGIT_SUBMODULE_STATUS_WD_UNTRACKED", "tdef": "typedef", "description": " Return codes for submodule status.", - "comments": "

A combination of these flags will be returned to describe the status of a\n submodule. Depending on the "ignore" property of the submodule, some of\n the flags may never be returned because they indicate changes that are\n supposed to be ignored.

\n\n

Submodule info is contained in 4 places: the HEAD tree, the index, config\n files (both .git/config and .gitmodules), and the working directory. Any\n or all of those places might be missing information about the submodule\n depending on what state the repo is in. We consider all four places to\n build the combination of status flags.

\n\n

There are four values that are not really status, but give basic info\n about what sources of submodule data are available. These will be\n returned even if ignore is set to "ALL".

\n\n
    \n
  • IN_HEAD - superproject head contains submodule
    • \n
  • IN_INDEX - superproject index contains submodule
    • \n
  • IN_CONFIG - superproject gitmodules has submodule
    • \n
  • IN_WD - superproject workdir has submodule
    • \n
\n\n

The following values will be returned so long as ignore is not "ALL".

\n\n
    \n
  • INDEX_ADDED - in index, not in head
    • \n
  • INDEX_DELETED - in head, not in index
    • \n
  • INDEX_MODIFIED - index and head don't match
    • \n
  • WD_UNINITIALIZED - workdir contains empty directory
    • \n
  • WD_ADDED - in workdir, not index
    • \n
  • WD_DELETED - in index, not workdir
    • \n
  • WD_MODIFIED - index and workdir head don't match
    • \n
\n\n

The following can only be returned if ignore is "NONE" or "UNTRACKED".

\n\n
    \n
  • WD_INDEX_MODIFIED - submodule workdir index is dirty
    • \n
  • WD_WD_MODIFIED - submodule workdir has modified files
    • \n
\n\n

Lastly, the following will only be returned for ignore "NONE".

\n\n
    \n
  • WD_UNTRACKED - wd contains untracked files
    • \n
\n", + "comments": "

A combination of these flags will be returned to describe the status of a submodule. Depending on the "ignore" property of the submodule, some of the flags may never be returned because they indicate changes that are supposed to be ignored.

\n\n

Submodule info is contained in 4 places: the HEAD tree, the index, config files (both .git/config and .gitmodules), and the working directory. Any or all of those places might be missing information about the submodule depending on what state the repo is in. We consider all four places to build the combination of status flags.

\n\n

There are four values that are not really status, but give basic info about what sources of submodule data are available. These will be returned even if ignore is set to "ALL".

\n\n
    \n
  • IN_HEAD - superproject head contains submodule * IN_INDEX - superproject index contains submodule * IN_CONFIG - superproject gitmodules has submodule * IN_WD - superproject workdir has submodule
    • \n
\n\n

The following values will be returned so long as ignore is not "ALL".

\n\n
    \n
  • INDEX_ADDED - in index, not in head * INDEX_DELETED - in head, not in index * INDEX_MODIFIED - index and head don't match * WD_UNINITIALIZED - workdir contains empty directory * WD_ADDED - in workdir, not index * WD_DELETED - in index, not workdir * WD_MODIFIED - index and workdir head don't match
    • \n
\n\n

The following can only be returned if ignore is "NONE" or "UNTRACKED".

\n\n
    \n
  • WD_INDEX_MODIFIED - submodule workdir index is dirty * WD_WD_MODIFIED - submodule workdir has modified files
    • \n
\n\n

Lastly, the following will only be returned for ignore "NONE".

\n\n
    \n
  • WD_UNTRACKED - wd contains untracked files
    • \n
\n", "fields": [ { "type": "int", @@ -33589,12 +34102,12 @@ "type": "struct", "value": "git_submodule_update_options", "file": "submodule.h", - "line": 118, - "lineto": 146, + "line": 129, + "lineto": 157, "block": "unsigned int version\ngit_checkout_options checkout_opts\ngit_fetch_options fetch_opts\nunsigned int clone_checkout_strategy", "tdef": "typedef", "description": " Submodule update options structure", - "comments": "

Use the GIT_SUBMODULE_UPDATE_OPTIONS_INIT to get the default settings,\n like this:

\n\n

git_submodule_update_options opts = GIT_SUBMODULE_UPDATE_OPTIONS_INIT;

\n", + "comments": "

Use the GIT_SUBMODULE_UPDATE_OPTIONS_INIT to get the default settings, like this:

\n\n

git_submodule_update_options opts = GIT_SUBMODULE_UPDATE_OPTIONS_INIT;

\n", "fields": [ { "type": "unsigned int", @@ -33643,7 +34156,7 @@ "block": "GIT_SUBMODULE_UPDATE_CHECKOUT\nGIT_SUBMODULE_UPDATE_REBASE\nGIT_SUBMODULE_UPDATE_MERGE\nGIT_SUBMODULE_UPDATE_NONE\nGIT_SUBMODULE_UPDATE_DEFAULT", "tdef": "typedef", "description": " Submodule update values", - "comments": "

These values represent settings for the submodule.$name.update\n configuration value which says how to handle git submodule update for\n this submodule. The value is usually set in the ".gitmodules" file and\n copied to ".git/config" when the submodule is initialized.

\n\n

You can override this setting on a per-submodule basis with\n git_submodule_set_update() and write the changed value to disk using\n git_submodule_save(). If you have overwritten the value, you can\n revert it by passing GIT_SUBMODULE_UPDATE_RESET to the set function.

\n\n

The values are:

\n\n
    \n
  • GIT_SUBMODULE_UPDATE_CHECKOUT: the default; when a submodule is\nupdated, checkout the new detached HEAD to the submodule directory.
    • \n
  • GIT_SUBMODULE_UPDATE_REBASE: update by rebasing the current checked\nout branch onto the commit from the superproject.
    • \n
  • GIT_SUBMODULE_UPDATE_MERGE: update by merging the commit in the\nsuperproject into the current checkout out branch of the submodule.
    • \n
  • GIT_SUBMODULE_UPDATE_NONE: do not update this submodule even when\nthe commit in the superproject is updated.
    • \n
  • GIT_SUBMODULE_UPDATE_DEFAULT: not used except as static initializer\nwhen we don't want any particular update rule to be specified.
    • \n
\n", + "comments": "

These values represent settings for the submodule.$name.update configuration value which says how to handle git submodule update for this submodule. The value is usually set in the ".gitmodules" file and copied to ".git/config" when the submodule is initialized.

\n\n

You can override this setting on a per-submodule basis with git_submodule_set_update() and write the changed value to disk using git_submodule_save(). If you have overwritten the value, you can revert it by passing GIT_SUBMODULE_UPDATE_RESET to the set function.

\n\n

The values are:

\n\n
    \n
  • GIT_SUBMODULE_UPDATE_CHECKOUT: the default; when a submodule is updated, checkout the new detached HEAD to the submodule directory. - GIT_SUBMODULE_UPDATE_REBASE: update by rebasing the current checked out branch onto the commit from the superproject. - GIT_SUBMODULE_UPDATE_MERGE: update by merging the commit in the superproject into the current checkout out branch of the submodule. - GIT_SUBMODULE_UPDATE_NONE: do not update this submodule even when the commit in the superproject is updated. - GIT_SUBMODULE_UPDATE_DEFAULT: not used except as static initializer when we don't want any particular update rule to be specified.
    • \n
\n", "fields": [ { "type": "int", @@ -33677,7 +34190,9 @@ } ], "used": { - "returns": [], + "returns": [ + "git_submodule_update_strategy" + ], "needs": [ "git_submodule_set_update" ] @@ -33699,6 +34214,7 @@ "used": { "returns": [], "needs": [ + "git_tag_foreach", "git_tag_free", "git_tag_id", "git_tag_lookup", @@ -33744,8 +34260,12 @@ } ], "used": { - "returns": [], - "needs": [] + "returns": [ + "git_commit_time" + ], + "needs": [ + "git_signature_new" + ] } } ], @@ -33816,6 +34336,7 @@ "used": { "returns": [], "needs": [ + "git_trace_callback", "git_trace_set" ] } @@ -33835,7 +34356,9 @@ "comments": "", "used": { "returns": [], - "needs": [] + "needs": [ + "git_config_lock" + ] } } ], @@ -33859,7 +34382,7 @@ "block": "unsigned int total_objects\nunsigned int indexed_objects\nunsigned int received_objects\nunsigned int local_objects\nunsigned int total_deltas\nunsigned int indexed_deltas\nsize_t received_bytes", "tdef": "typedef", "description": " This is passed as the first argument to the callback to allow the\n user to see the progress.", - "comments": "
    \n
  • total_objects: number of objects in the packfile being downloaded
    • \n
  • indexed_objects: received objects that have been hashed
    • \n
  • received_objects: objects which have been downloaded
    • \n
  • local_objects: locally-available objects that have been injected\nin order to fix a thin pack.
    • \n
  • received-bytes: size of the packfile received up to now
    • \n
\n", + "comments": "
    \n
  • total_objects: number of objects in the packfile being downloaded - indexed_objects: received objects that have been hashed - received_objects: objects which have been downloaded - local_objects: locally-available objects that have been injected in order to fix a thin pack. - received-bytes: size of the packfile received up to now
    • \n
\n", "fields": [ { "type": "unsigned int", @@ -33903,7 +34426,11 @@ ], "needs": [ "git_indexer_append", - "git_indexer_commit" + "git_indexer_commit", + "git_indexer_new", + "git_odb_write_pack", + "git_packbuilder_write", + "git_transfer_progress_cb" ] } } @@ -33926,11 +34453,13 @@ "git_smart_subtransport_git", "git_smart_subtransport_http", "git_smart_subtransport_ssh", + "git_transport_cb", "git_transport_dummy", "git_transport_init", "git_transport_local", "git_transport_new", "git_transport_smart", + "git_transport_smart_certificate_check", "git_transport_ssh_with_paths" ] } @@ -33944,8 +34473,8 @@ ], "type": "enum", "file": "sys/transport.h", - "line": 29, - "lineto": 31, + "line": 30, + "lineto": 32, "block": "GIT_TRANSPORTFLAGS_NONE", "tdef": "typedef", "description": " Flags to pass to transport", @@ -33977,7 +34506,12 @@ "description": " Representation of a tree object. ", "comments": "", "used": { - "returns": [], + "returns": [ + "git_tree_entry_byid", + "git_tree_entry_byindex", + "git_tree_entry_byname", + "git_treebuilder_get" + ], "needs": [ "git_commit_amend", "git_commit_create", @@ -33994,6 +34528,15 @@ "git_tree_entry_byindex", "git_tree_entry_byname", "git_tree_entry_bypath", + "git_tree_entry_cmp", + "git_tree_entry_dup", + "git_tree_entry_filemode", + "git_tree_entry_filemode_raw", + "git_tree_entry_free", + "git_tree_entry_id", + "git_tree_entry_name", + "git_tree_entry_to_object", + "git_tree_entry_type", "git_tree_entrycount", "git_tree_free", "git_tree_id", @@ -34001,7 +34544,17 @@ "git_tree_lookup_prefix", "git_tree_owner", "git_tree_walk", - "git_treebuilder_new" + "git_treebuilder_clear", + "git_treebuilder_entrycount", + "git_treebuilder_filter", + "git_treebuilder_filter_cb", + "git_treebuilder_free", + "git_treebuilder_get", + "git_treebuilder_insert", + "git_treebuilder_new", + "git_treebuilder_remove", + "git_treebuilder_write", + "git_treewalk_cb" ] } } @@ -34036,7 +34589,9 @@ "git_tree_entry_name", "git_tree_entry_to_object", "git_tree_entry_type", - "git_treebuilder_insert" + "git_treebuilder_filter_cb", + "git_treebuilder_insert", + "git_treewalk_cb" ] } } @@ -34239,11 +34794,12 @@ [ "git_commit_amend", "git_commit_author", + "git_commit_body", "git_commit_committer", "git_commit_create", "git_commit_create_from_callback", - "git_commit_create_from_ids", "git_commit_create_v", + "git_commit_extract_signature", "git_commit_free", "git_commit_header_field", "git_commit_id", @@ -34275,6 +34831,7 @@ "git_config_delete_multivar", "git_config_entry_free", "git_config_find_global", + "git_config_find_programdata", "git_config_find_system", "git_config_find_xdg", "git_config_foreach", @@ -34293,6 +34850,7 @@ "git_config_iterator_free", "git_config_iterator_glob_new", "git_config_iterator_new", + "git_config_lock", "git_config_lookup_map_value", "git_config_multivar_iterator_new", "git_config_new", @@ -34317,6 +34875,7 @@ "cred", [ "git_cred_default_new", + "git_cred_free", "git_cred_has_username", "git_cred_ssh_custom_new", "git_cred_ssh_interactive_new", @@ -34353,6 +34912,7 @@ "git_diff_get_delta", "git_diff_get_perfdata", "git_diff_get_stats", + "git_diff_index_to_index", "git_diff_index_to_workdir", "git_diff_init_options", "git_diff_is_sorted_icase", @@ -34388,7 +34948,6 @@ "git_filter_list_apply_to_file", "git_filter_list_contains", "git_filter_list_free", - "git_filter_list_length", "git_filter_list_load", "git_filter_list_new", "git_filter_list_push", @@ -34410,7 +34969,6 @@ "giterr", [ "giterr_clear", - "giterr_detach", "giterr_last", "giterr_set_oom", "giterr_set_str" @@ -34427,7 +34985,6 @@ "hashsig", [ "git_hashsig_compare", - "git_hashsig_create", "git_hashsig_create_fromfile", "git_hashsig_free" ] @@ -34461,6 +35018,7 @@ "git_index_entry_stage", "git_index_entrycount", "git_index_find", + "git_index_find_prefix", "git_index_free", "git_index_get_byindex", "git_index_get_bypath", @@ -34718,6 +35276,7 @@ "git_rebase_free", "git_rebase_init", "git_rebase_init_options", + "git_rebase_inmemory_index", "git_rebase_next", "git_rebase_open", "git_rebase_operation_byindex", @@ -35007,6 +35566,12 @@ "git_strarray_free" ] ], + [ + "stream", + [ + "git_stream_register_tls" + ] + ], [ "submodule", [ @@ -35083,6 +35648,7 @@ "git_transport_local", "git_transport_new", "git_transport_smart", + "git_transport_smart_certificate_check", "git_transport_ssh_with_paths", "git_transport_unregister" ] @@ -35130,91 +35696,91 @@ "examples": [ [ "add.c", - "ex/v0.23.2/add.html" + "ex/v0.24.1/add.html" ], [ "blame.c", - "ex/v0.23.2/blame.html" + "ex/v0.24.1/blame.html" ], [ "cat-file.c", - "ex/v0.23.2/cat-file.html" + "ex/v0.24.1/cat-file.html" ], [ "common.c", - "ex/v0.23.2/common.html" + "ex/v0.24.1/common.html" ], [ "describe.c", - "ex/v0.23.2/describe.html" + "ex/v0.24.1/describe.html" ], [ "diff.c", - "ex/v0.23.2/diff.html" + "ex/v0.24.1/diff.html" ], [ "for-each-ref.c", - "ex/v0.23.2/for-each-ref.html" + "ex/v0.24.1/for-each-ref.html" ], [ "general.c", - "ex/v0.23.2/general.html" + "ex/v0.24.1/general.html" ], [ "init.c", - "ex/v0.23.2/init.html" + "ex/v0.24.1/init.html" ], [ "log.c", - "ex/v0.23.2/log.html" + "ex/v0.24.1/log.html" ], [ "network/clone.c", - "ex/v0.23.2/network/clone.html" + "ex/v0.24.1/network/clone.html" ], [ "network/common.c", - "ex/v0.23.2/network/common.html" + "ex/v0.24.1/network/common.html" ], [ "network/fetch.c", - "ex/v0.23.2/network/fetch.html" + "ex/v0.24.1/network/fetch.html" ], [ "network/git2.c", - "ex/v0.23.2/network/git2.html" + "ex/v0.24.1/network/git2.html" ], [ "network/index-pack.c", - "ex/v0.23.2/network/index-pack.html" + "ex/v0.24.1/network/index-pack.html" ], [ "network/ls-remote.c", - "ex/v0.23.2/network/ls-remote.html" + "ex/v0.24.1/network/ls-remote.html" ], [ "remote.c", - "ex/v0.23.2/remote.html" + "ex/v0.24.1/remote.html" ], [ "rev-list.c", - "ex/v0.23.2/rev-list.html" + "ex/v0.24.1/rev-list.html" ], [ "rev-parse.c", - "ex/v0.23.2/rev-parse.html" + "ex/v0.24.1/rev-parse.html" ], [ "showindex.c", - "ex/v0.23.2/showindex.html" + "ex/v0.24.1/showindex.html" ], [ "status.c", - "ex/v0.23.2/status.html" + "ex/v0.24.1/status.html" ], [ "tag.c", - "ex/v0.23.2/tag.html" + "ex/v0.24.1/tag.html" ] ] } diff --git a/vendor/libgit2/.mailmap b/vendor/libgit2/.mailmap index c656f64c7..8479cf6c4 100644 --- a/vendor/libgit2/.mailmap +++ b/vendor/libgit2/.mailmap @@ -16,6 +16,7 @@ Xavier L. Sascha Cunz Authmillenon Authmillenon -Edward Thomson +Edward Thomson +Edward Thomson J. David Ibáñez Russell Belfer diff --git a/vendor/libgit2/.travis.yml b/vendor/libgit2/.travis.yml index 9022fdec2..2f3ffe355 100644 --- a/vendor/libgit2/.travis.yml +++ b/vendor/libgit2/.travis.yml @@ -46,13 +46,13 @@ matrix: - compiler: gcc env: - VALGRIND=1 - OPTIONS="-DBUILD_CLAR=ON -DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=Debug" + OPTIONS="-DBUILD_CLAR=ON -DBUILD_EXAMPLES=OFF -DDEBUG_POOL=ON -DCMAKE_BUILD_TYPE=Debug" os: linux allow_failures: - env: COVERITY=1 - env: - VALGRIND=1 - OPTIONS="-DBUILD_CLAR=ON -DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=Debug" + OPTIONS="-DBUILD_CLAR=ON -DBUILD_EXAMPLES=OFF -DDEBUG_POOL=ON -DCMAKE_BUILD_TYPE=Debug" install: - if [ "$TRAVIS_OS_NAME" = "osx" ]; then ./script/install-deps-${TRAVIS_OS_NAME}.sh; fi diff --git a/vendor/libgit2/CHANGELOG.md b/vendor/libgit2/CHANGELOG.md index b824a66da..43476b99a 100644 --- a/vendor/libgit2/CHANGELOG.md +++ b/vendor/libgit2/CHANGELOG.md @@ -1,4 +1,4 @@ -v0.23 + 1 +v0.24 + 1 ------- ### Changes or improvements @@ -7,6 +7,116 @@ v0.23 + 1 ### API removals +### Breaking API changes + +v0.24 +------- + +### Changes or improvements + +* Custom filters can now be registered with wildcard attributes, for + example `filter=*`. Consumers should examine the attributes parameter + of the `check` function for details. + +* Symlinks are now followed when locking a file, which can be + necessary when multiple worktrees share a base repository. + +* You can now set your own user-agent to be sent for HTTP requests by + using the `GIT_OPT_SET_USER_AGENT` with `git_libgit2_opts()`. + +* You can set custom HTTP header fields to be sent along with requests + by passing them in the fetch and push options. + +* Tree objects are now assumed to be sorted. If a tree is not + correctly formed, it will give bad results. This is the git approach + and cuts a significant amount of time when reading the trees. + +* Filter registration is now protected against concurrent + registration. + +* Filenames which are not valid on Windows in an index no longer cause + to fail to parse it on that OS. + +* Rebases can now be performed purely in-memory, without touching the + repository's workdir. + +* When adding objects to the index, or when creating new tree or commit + objects, the inputs are validated to ensure that the dependent objects + exist and are of the correct type. This object validation can be + disabled with the GIT_OPT_ENABLE_STRICT_OBJECT_CREATION option. + +* The WinHTTP transport's handling of bad credentials now behaves like + the others, asking for credentials again. + +### API additions + +* `git_config_lock()` has been added, which allow for + transactional/atomic complex updates to the configuration, removing + the opportunity for concurrent operations and not committing any + changes until the unlock. + +* `git_diff_options` added a new callback `progress_cb` to report on the + progress of the diff as files are being compared. The documentation of + the existing callback `notify_cb` was updated to reflect that it only + gets called when new deltas are added to the diff. + +* `git_fetch_options` and `git_push_options` have gained a `custom_headers` + field to set the extra HTTP header fields to send. + +* `git_stream_register_tls()` lets you register a callback to be used + as the constructor for a TLS stream instead of the libgit2 built-in + one. + +* `git_commit_header_field()` allows you to look up a specific header + field in a commit. + +* `git_commit_extract_signature()` extracts the signature from a + commit and gives you both the signature and the signed data so you + can verify it. + +### API removals + +* No APIs were removed in this version. + +### Breaking API changes + +* The `git_merge_tree_flag_t` is now `git_merge_flag_t`. Subsequently, + its members are no longer prefixed with `GIT_MERGE_TREE_FLAG` but are + now prefixed with `GIT_MERGE_FLAG`, and the `tree_flags` field of the + `git_merge_options` structure is now named `flags`. + +* The `git_merge_file_flags_t` enum is now `git_merge_file_flag_t` for + consistency with other enum type names. + +* `git_cert` descendent types now have a proper `parent` member + +* It is the responsibility of the refdb backend to decide what to do + with the reflog on ref deletion. The file-based backend must delete + it, a database-backed one may wish to archive it. + +* `git_config_backend` has gained two entries. `lock` and `unlock` + with which to implement the transactional/atomic semantics for the + configuration backend. + +* `git_index_add` and `git_index_conflict_add()` will now use the case + as provided by the caller on case insensitive systems. Previous + versions would keep the case as it existed in the index. This does + not affect the higher-level `git_index_add_bypath` or + `git_index_add_frombuffer` functions. + +* The `notify_payload` field of `git_diff_options` was renamed to `payload` + to reflect that it's also the payload for the new progress callback. + +* The `git_config_level_t` enum has gained a higher-priority value + `GIT_CONFIG_LEVEL_PROGRAMDATA` which represent a rough Windows equivalent + to the system level configuration. + +* `git_rebase_init()` not also takes a merge options. + +* The index no longer performs locking itself. This is not something + users of the library should have been relying on as it's not part of + the concurrency guarantees. + v0.23 ------ @@ -239,8 +349,8 @@ v0.23 * `git_rebase_options` now contains a `git_checkout_options` struct that will be used for functions that modify the working directory, - namely `git_checkout_init`, `git_checkout_next` and - `git_checkout_abort`. As a result, `git_rebase_open` now also takes + namely `git_rebase_init`, `git_rebase_next` and + `git_rebase_abort`. As a result, `git_rebase_open` now also takes a `git_rebase_options` and only the `git_rebase_init` and `git_rebase_open` functions take a `git_rebase_options`, where they will persist the options to subsequent `git_rebase` calls. diff --git a/vendor/libgit2/CMakeLists.txt b/vendor/libgit2/CMakeLists.txt index 714e188e9..c79b2637c 100644 --- a/vendor/libgit2/CMakeLists.txt +++ b/vendor/libgit2/CMakeLists.txt @@ -20,6 +20,7 @@ SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Mo INCLUDE(CheckLibraryExists) INCLUDE(CheckFunctionExists) +INCLUDE(CheckStructHasMember) INCLUDE(AddCFlagIfSupported) INCLUDE(FindPkgConfig) @@ -40,6 +41,11 @@ OPTION( USE_SSH "Link with libssh to enable SSH support" ON ) OPTION( USE_GSSAPI "Link with libgssapi for SPNEGO auth" OFF ) OPTION( VALGRIND "Configure build for valgrind" OFF ) OPTION( CURL "User curl for HTTP if available" ON) +OPTION( DEBUG_POOL "Enable debug pool allocator" OFF ) + +IF(DEBUG_POOL) + ADD_DEFINITIONS(-DGIT_DEBUG_POOL) +ENDIF() IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") SET( USE_ICONV ON ) @@ -60,6 +66,10 @@ IF(MSVC) # are linking statically OPTION( STATIC_CRT "Link the static CRT libraries" ON ) + # If you want to embed a copy of libssh2 into libgit2, pass a + # path to libssh2 + OPTION( EMBED_SSH_PATH "Path to libssh2 to embed (Windows)" OFF ) + ADD_DEFINITIONS(-D_SCL_SECURE_NO_WARNINGS) ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE) ADD_DEFINITIONS(-D_CRT_NONSTDC_NO_DEPRECATE) @@ -81,6 +91,27 @@ IF (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") OPTION( USE_OPENSSL "Link with and use openssl library" ON ) ENDIF() +CHECK_STRUCT_HAS_MEMBER ("struct stat" st_mtim "sys/types.h;sys/stat.h" + HAVE_STRUCT_STAT_ST_MTIM LANGUAGE C) +CHECK_STRUCT_HAS_MEMBER ("struct stat" st_mtimespec "sys/types.h;sys/stat.h" + HAVE_STRUCT_STAT_ST_MTIMESPEC LANGUAGE C) +CHECK_STRUCT_HAS_MEMBER("struct stat" st_mtime_nsec sys/stat.h + HAVE_STRUCT_STAT_MTIME_NSEC LANGUAGE C) + +IF (HAVE_STRUCT_STAT_ST_MTIM) + CHECK_STRUCT_HAS_MEMBER("struct stat" st_mtim.tv_nsec sys/stat.h + HAVE_STRUCT_STAT_NSEC LANGUAGE C) +ELSEIF (HAVE_STRUCT_STAT_ST_MTIMESPEC) + CHECK_STRUCT_HAS_MEMBER("struct stat" st_mtimespec.tv_nsec sys/stat.h + HAVE_STRUCT_STAT_NSEC LANGUAGE C) +ELSE () + SET( HAVE_STRUCT_STAT_NSEC ON ) +ENDIF() + +IF (HAVE_STRUCT_STAT_NSEC OR WIN32) + OPTION( USE_NSEC "Care about sub-second file mtimes and ctimes" OFF ) +ENDIF() + # This variable will contain the libraries we need to put into # libgit2.pc's Requires.private. That is, what we're linking to or # what someone who's statically linking us needs to link to. @@ -133,13 +164,13 @@ FUNCTION(TARGET_OS_LIBRARIES target) ENDIF() ENDFUNCTION() -# For the MSVC IDE, this function splits up the source files like windows -# explorer does. This is esp. useful with the libgit2_clar project, were -# usually 2 or more files share the same name. Sadly, this file grouping -# is a per-directory option in cmake and not per-target, resulting in -# empty virtual folders "tests" for the git2.dll -FUNCTION(MSVC_SPLIT_SOURCES target) - IF(MSVC_IDE) +# This function splits the sources files up into their appropriate +# subdirectories. This is especially useful for IDEs like Xcode and +# Visual Studio, so that you can navigate into the libgit2_clar project, +# and see the folders within the tests folder (instead of just seeing all +# source and tests in a single folder.) +FUNCTION(IDE_SPLIT_SOURCES target) + IF(MSVC_IDE OR CMAKE_GENERATOR STREQUAL Xcode) GET_TARGET_PROPERTY(sources ${target} SOURCES) FOREACH(source ${sources}) IF(source MATCHES ".*/") @@ -190,6 +221,13 @@ IF (COREFOUNDATION_FOUND) ENDIF() +IF (WIN32 AND EMBED_SSH_PATH) + FILE(GLOB SRC_SSH "${EMBED_SSH_PATH}/src/*.c") + INCLUDE_DIRECTORIES("${EMBED_SSH_PATH}/include") + FILE(WRITE "${EMBED_SSH_PATH}/src/libssh2_config.h" "#define HAVE_WINCNG\n#define LIBSSH2_WINCNG\n#include \"../win32/libssh2_config.h\"") + ADD_DEFINITIONS(-DGIT_SSH) +ENDIF() + IF (WIN32 AND WINHTTP) ADD_DEFINITIONS(-DGIT_WINHTTP) INCLUDE_DIRECTORIES(deps/http-parser) @@ -206,7 +244,7 @@ IF (WIN32 AND WINHTTP) SET(LIBWINHTTP_PATH "${CMAKE_CURRENT_BINARY_DIR}/deps/winhttp") FILE(MAKE_DIRECTORY ${LIBWINHTTP_PATH}) - IF ("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") + IF (CMAKE_SIZEOF_VOID_P EQUAL 8) set(WINHTTP_DEF "${CMAKE_CURRENT_SOURCE_DIR}/deps/winhttp/winhttp64.def") ELSE() set(WINHTTP_DEF "${CMAKE_CURRENT_SOURCE_DIR}/deps/winhttp/winhttp.def") @@ -228,7 +266,8 @@ IF (WIN32 AND WINHTTP) LINK_DIRECTORIES(${LIBWINHTTP_PATH}) ENDIF () - LINK_LIBRARIES(winhttp rpcrt4 crypt32) + LINK_LIBRARIES(winhttp rpcrt4 crypt32 ole32) + LIST(APPEND LIBGIT2_PC_LIBS "-lwinhttp" "-lrpcrt4" "-lcrypt32" "-lole32") ELSE () IF (CURL) PKG_CHECK_MODULES(CURL libcurl) @@ -364,6 +403,7 @@ IF (MSVC) IF (MSVC_CRTDBG) SET(CRT_FLAG_DEBUG "${CRT_FLAG_DEBUG} /DGIT_MSVC_CRTDBG") + SET(CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES}" "Dbghelp.lib") ENDIF() # /Zi - Create debugging information @@ -372,7 +412,7 @@ IF (MSVC) # /MTd - Statically link the multithreaded debug version of the CRT # /MDd - Dynamically link the multithreaded debug version of the CRT # /RTC1 - Run time checks - SET(CMAKE_C_FLAGS_DEBUG "/Zi /Od /D_DEBUG /RTC1 ${CRT_FLAG_DEBUG}") + SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /Zi /Od /D_DEBUG /RTC1 ${CRT_FLAG_DEBUG}") # /DNDEBUG - Disables asserts # /MT - Statically link the multithreaded release version of the CRT @@ -424,7 +464,7 @@ ELSE () ENDIF() IF (WIN32 AND NOT CYGWIN) - SET(CMAKE_C_FLAGS_DEBUG "-D_DEBUG") + SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG") ENDIF () IF (MINGW) # MinGW always does PIC and complains if we tell it to @@ -504,6 +544,18 @@ IF (THREADSAFE) ADD_DEFINITIONS(-DGIT_THREADS) ENDIF() +IF (USE_NSEC) + ADD_DEFINITIONS(-DGIT_USE_NSEC) +ENDIF() + +IF (HAVE_STRUCT_STAT_ST_MTIM) + ADD_DEFINITIONS(-DGIT_USE_STAT_MTIM) +ELSEIF (HAVE_STRUCT_STAT_ST_MTIMESPEC) + ADD_DEFINITIONS(-DGIT_USE_STAT_MTIMESPEC) +ELSEIF (HAVE_STRUCT_STAT_ST_MTIME_NSEC) + ADD_DEFINITIONS(-DGIT_USE_STAT_MTIME_NSEC) +ENDIF() + ADD_DEFINITIONS(-D_FILE_OFFSET_BITS=64) # Collect sourcefiles @@ -533,7 +585,7 @@ ELSE() ENDIF() # Compile and link libgit2 -ADD_LIBRARY(git2 ${SRC_H} ${SRC_GIT2} ${SRC_OS} ${SRC_ZLIB} ${SRC_HTTP} ${SRC_REGEX} ${SRC_SHA1} ${WIN_RC}) +ADD_LIBRARY(git2 ${SRC_H} ${SRC_GIT2} ${SRC_OS} ${SRC_ZLIB} ${SRC_HTTP} ${SRC_REGEX} ${SRC_SSH} ${SRC_SHA1} ${WIN_RC}) TARGET_LINK_LIBRARIES(git2 ${SECURITY_DIRS}) TARGET_LINK_LIBRARIES(git2 ${COREFOUNDATION_DIRS}) TARGET_LINK_LIBRARIES(git2 ${SSL_LIBRARIES}) @@ -548,7 +600,7 @@ IF(MSVC AND GIT_ARCH_64 AND NOT BUILD_SHARED_LIBS) SET_TARGET_PROPERTIES(git2 PROPERTIES STATIC_LIBRARY_FLAGS "/MACHINE:x64") ENDIF() -MSVC_SPLIT_SOURCES(git2) +IDE_SPLIT_SOURCES(git2) IF (SONAME) SET_TARGET_PROPERTIES(git2 PROPERTIES VERSION ${LIBGIT2_VERSION_STRING}) @@ -556,6 +608,8 @@ IF (SONAME) IF (LIBGIT2_FILENAME) ADD_DEFINITIONS(-DLIBGIT2_FILENAME=\"${LIBGIT2_FILENAME}\") SET_TARGET_PROPERTIES(git2 PROPERTIES OUTPUT_NAME ${LIBGIT2_FILENAME}) + ELSEIF (DEFINED LIBGIT2_PREFIX) + SET_TARGET_PROPERTIES(git2 PROPERTIES PREFIX "${LIBGIT2_PREFIX}") ENDIF() ENDIF() STRING(REPLACE ";" " " LIBGIT2_PC_LIBS "${LIBGIT2_PC_LIBS}") @@ -608,7 +662,7 @@ IF (BUILD_CLAR) ${CLAR_PATH}/clar.c PROPERTIES OBJECT_DEPENDS ${CLAR_PATH}/clar.suite) - ADD_EXECUTABLE(libgit2_clar ${SRC_H} ${SRC_GIT2} ${SRC_OS} ${SRC_CLAR} ${SRC_TEST} ${SRC_ZLIB} ${SRC_HTTP} ${SRC_REGEX} ${SRC_SHA1}) + ADD_EXECUTABLE(libgit2_clar ${SRC_H} ${SRC_GIT2} ${SRC_OS} ${SRC_CLAR} ${SRC_TEST} ${SRC_ZLIB} ${SRC_HTTP} ${SRC_REGEX} ${SRC_SSH} ${SRC_SHA1}) TARGET_LINK_LIBRARIES(libgit2_clar ${COREFOUNDATION_DIRS}) TARGET_LINK_LIBRARIES(libgit2_clar ${SECURITY_DIRS}) @@ -617,7 +671,7 @@ IF (BUILD_CLAR) TARGET_LINK_LIBRARIES(libgit2_clar ${GSSAPI_LIBRARIES}) TARGET_LINK_LIBRARIES(libgit2_clar ${ICONV_LIBRARIES}) TARGET_OS_LIBRARIES(libgit2_clar) - MSVC_SPLIT_SOURCES(libgit2_clar) + IDE_SPLIT_SOURCES(libgit2_clar) IF (MSVC_IDE) # Precompiled headers @@ -630,6 +684,10 @@ IF (BUILD_CLAR) ELSE () ADD_TEST(libgit2_clar libgit2_clar -v) ENDIF () + + # Add a test target which runs the cred callback tests, to be + # called after setting the url and user + ADD_TEST(libgit2_clar-cred_callback libgit2_clar -v -sonline::clone::cred_callback) ENDIF () IF (TAGS) diff --git a/vendor/libgit2/CODE_OF_CONDUCT.md b/vendor/libgit2/CODE_OF_CONDUCT.md new file mode 100644 index 000000000..0a0e4ebab --- /dev/null +++ b/vendor/libgit2/CODE_OF_CONDUCT.md @@ -0,0 +1,75 @@ +# Contributor Covenant Code of Conduct + +## Our Pledge + +In the interest of fostering an open and welcoming environment, we as +contributors and maintainers pledge to making participation in our project and +our community a harassment-free experience for everyone, regardless of age, body +size, disability, ethnicity, gender identity and expression, level of experience, +nationality, personal appearance, race, religion, or sexual identity and +orientation. + +## Our Standards + +Examples of behavior that contributes to creating a positive environment +include: + +* Using welcoming and inclusive language +* Being respectful of differing viewpoints and experiences +* Gracefully accepting constructive criticism +* Focusing on what is best for the community +* Showing empathy towards other community members + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery and unwelcome sexual attention or +advances +* Trolling, insulting/derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or electronic + address, without explicit permission +* Other conduct which could reasonably be considered inappropriate in a + professional setting + +## Our Responsibilities + +Project maintainers are responsible for clarifying the standards of acceptable +behavior and are expected to take appropriate and fair corrective action in +response to any instances of unacceptable behavior. + +Project maintainers have the right and responsibility to remove, edit, or +reject comments, commits, code, wiki edits, issues, and other contributions +that are not aligned to this Code of Conduct, or to ban temporarily or +permanently any contributor for other behaviors that they deem inappropriate, +threatening, offensive, or harmful. + +## Scope + +This Code of Conduct applies both within project spaces and in public spaces +when an individual is representing the project or its community. Examples of +representing a project or community include using an official project e-mail +address, posting via an official social media account, or acting as an appointed +representative at an online or offline event. Representation of a project may be +further defined and clarified by project maintainers. + +## Enforcement + +Instances of abusive, harassing, or otherwise unacceptable behavior may be +reported by contacting the project team at [libgit2@gmail.com][email]. All +complaints will be reviewed and investigated and will result in a response that +is deemed necessary and appropriate to the circumstances. The project team is +obligated to maintain confidentiality with regard to the reporter of an incident. +Further details of specific enforcement policies may be posted separately. + +Project maintainers who do not follow or enforce the Code of Conduct in good +faith may face temporary or permanent repercussions as determined by other +members of the project's leadership. + +## Attribution + +This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, +available at [http://contributor-covenant.org/version/1/4][version] + +[email]: mailto:libgit2@gmail.com +[homepage]: http://contributor-covenant.org +[version]: http://contributor-covenant.org/version/1/4/ diff --git a/vendor/libgit2/CONVENTIONS.md b/vendor/libgit2/CONVENTIONS.md index 5b8238a78..0be4b33cc 100644 --- a/vendor/libgit2/CONVENTIONS.md +++ b/vendor/libgit2/CONVENTIONS.md @@ -3,6 +3,38 @@ We like to keep the source consistent and readable. Herein are some guidelines that should help with that. +## External API + +We have a few rules to avoid surprising ways of calling functions and +some rules for consumers of the library to avoid stepping on each +other's toes. + + - Property accessors return the value directly (e.g. an `int` or + `const char *`) but if a function can fail, we return a `int` value + and the output parameters go first in the parameter list, followed + by the object that a function is operating on, and then any other + arguments the function may need. + + - If a function returns an object as a return value, that function is + a getter and the object's lifetime is tied to the parent + object. Objects which are returned as the first argument as a + pointer-to-pointer are owned by the caller and it is repsponsible + for freeing it. Strings are returned via `git_buf` in order to + allow for re-use and safe freeing. + + - Most of what libgit2 does relates to I/O so you as a general rule + you should assume that any function can fail due to errors as even + getting data from the filesystem can result in all sorts of errors + and complex failure cases. + + - Paths inside the Git system are separated by a slash (0x2F). If a + function accepts a path on disk, then backslashes (0x5C) are also + accepted on Windows. + + - Do not mix allocators. If something has been allocated by libgit2, + you do not know which is the right free function in the general + case. Use the free functions provided for each object type. + ## Compatibility `libgit2` runs on many different platforms with many different compilers. diff --git a/vendor/libgit2/PROJECTS.md b/vendor/libgit2/PROJECTS.md index 4f200b7f9..87ce78f02 100644 --- a/vendor/libgit2/PROJECTS.md +++ b/vendor/libgit2/PROJECTS.md @@ -48,7 +48,7 @@ These are good small projects to get started with libgit2. a new example that mirrors the behavior. Examples don't have to be perfect emulations, but should demonstrate how to use the libgit2 APIs to get results that are similar to Git commands. This lets you (and us) - easily exercise a particular facet of the API and measure compatability + easily exercise a particular facet of the API and measure compatibility and feature parity with core git. * Submit a PR to clarify documentation! While we do try to document all of the APIs, your fresh eyes on the documentation will find areas that are @@ -75,8 +75,6 @@ might make good smaller projects by themselves. * Extract the Git tests that exercise that command * Convert the tests to call our emulation * These tests could go in examples/tests/... -* Fix symlink support for files in the .git directory (i.e. don't overwrite - the symlinks when writing the file contents back out) * Add hooks API to enumerate and manage hooks (not run them at this point) * Enumeration of available hooks * Lookup API to see which hooks have a script and get the script @@ -85,8 +83,6 @@ might make good smaller projects by themselves. executes the action in question * Isolate logic of ignore evaluation into a standalone API * Upgrade internal libxdiff code to latest from core Git -* Improve index internals with hashtable lookup for files instead of - using binary search every time * Tree builder improvements: * Extend to allow building a tree hierarchy * Apply-patch API diff --git a/vendor/libgit2/README.md b/vendor/libgit2/README.md index 3191aeee2..8ea787b3e 100644 --- a/vendor/libgit2/README.md +++ b/vendor/libgit2/README.md @@ -18,7 +18,7 @@ Additionally, the example code has been released to the public domain (see the * Website: [libgit2.github.com](http://libgit2.github.com) * StackOverflow Tag: [libgit2](http://stackoverflow.com/questions/tagged/libgit2) * Issues: [GitHub Issues](https://github.com/libgit2/libgit2/issues) (Right here!) -* API documentation: +* API documentation: * IRC: [#libgit2](irc://irc.freenode.net/libgit2) on irc.freenode.net. * Mailing list: The libgit2 mailing list was traditionally hosted in Librelist but has been deprecated. We encourage you to @@ -80,6 +80,12 @@ Threading See [THREADING](THREADING.md) for information +Conventions +=========== + +See [CONVENTIONS](CONVENTIONS.md) for an overview of the external +and internal API/coding conventions we use. + Building libgit2 - Using CMake ============================== @@ -88,7 +94,7 @@ Under Unix-like systems, like Linux, \*BSD and Mac OS X, libgit2 expects `pthrea they should be installed by default on all systems. Under Windows, libgit2 uses the native Windows API for threading. -The `libgit2` library is built using [CMake]() (version 2.8 or newer) on all platforms. +The `libgit2` library is built using [CMake]() (version 2.8 or newer) on all platforms. On most systems you can build the library using the following commands @@ -103,7 +109,7 @@ To install the library you can specify the install prefix by setting: $ cmake .. -DCMAKE_INSTALL_PREFIX=/install/prefix $ cmake --build . --target install -For more advanced use or questions about CMake please read . +For more advanced use or questions about CMake please read . The following CMake variables are declared: @@ -141,7 +147,7 @@ You need to run the CMake commands from the Visual Studio command prompt, not the regular or Windows SDK one. Select the right generator for your version with the `-G "Visual Studio X" option. -See [the website](https://libgit2.github.com/docs/guides/build-and-link) +See [the website](http://libgit2.github.com/docs/guides/build-and-link/) for more detailed instructions. Android @@ -184,9 +190,9 @@ Here are the bindings to libgit2 that are currently available: * Go * git2go * GObject - * libgit2-glib + * libgit2-glib * Haskell - * hgit2 + * hgit2 * Java * Jagged * Julia @@ -197,7 +203,7 @@ Here are the bindings to libgit2 that are currently available: * libgit2sharp * Node.js * node-gitteh - * nodegit + * nodegit * Objective-C * objective-git * OCaml @@ -230,7 +236,7 @@ How Can I Contribute? ================================== Check the [contribution guidelines](CONTRIBUTING.md) to understand our -workflow, the libgit2 [coding conventions](CONVENTIONS.md), and out list of +workflow, the libgit2 [coding conventions](CONVENTIONS.md), and our list of [good starting projects](PROJECTS.md). License diff --git a/vendor/libgit2/THREADING.md b/vendor/libgit2/THREADING.md index 3717d6c88..0b9e50286 100644 --- a/vendor/libgit2/THREADING.md +++ b/vendor/libgit2/THREADING.md @@ -72,13 +72,19 @@ which locking function it should use. This means that libgit2 cannot know what to set as the user of libgit2 may use OpenSSL independently and the locking settings must survive libgit2 shutting down. +Even if libgit2 doesn't use OpenSSL directly, OpenSSL can still be used +by libssh2 depending on the configuration. If OpenSSL is used both by +libgit2 and libssh2, you only need to set up threading for OpenSSL once. + libgit2 does provide a last-resort convenience function `git_openssl_set_locking()` (available in `sys/openssl.h`) to use the platform-native mutex mechanisms to perform the locking, which you may rely on if you do not want to use OpenSSL outside of libgit2, or you know that libgit2 will outlive the rest of the operations. It is not safe to use OpenSSL multi-threaded after libgit2's shutdown function -has been called. +has been called. Note `git_openssl_set_locking()` only works if +libgit2 uses OpenSSL directly - if OpenSSL is only used as a dependency +of libssh2 as described above, `git_openssl_set_locking()` is a no-op. If your programming language offers a package/bindings for OpenSSL, you should very strongly prefer to use that in order to set up @@ -87,14 +93,14 @@ when using this function. See the [OpenSSL documentation](https://www.openssl.org/docs/crypto/threads.html) -on threading for more details. +on threading for more details, and http://trac.libssh2.org/wiki/MultiThreading +for a specific example of providing the threading callbacks. Be also aware that libgit2 does not always link against OpenSSL if there are alternatives provided by the system. -libssh2 may be linked against OpenSSL or libgcrypt. If it uses -OpenSSL, you only need to set up threading for OpenSSL once and the -above paragraphs are enough. If it uses libgcrypt, then you need to +libssh2 may be linked against OpenSSL or libgcrypt. If it uses OpenSSL, +see the above paragraphs. If it uses libgcrypt, then you need to set up its locking before using it multi-threaded. libgit2 has no direct connection to libgcrypt and thus has not convenience functions for it (but libgcrypt has macros). Read libgcrypt's diff --git a/vendor/libgit2/appveyor.yml b/vendor/libgit2/appveyor.yml index 166fa56b1..3ed3c49a1 100644 --- a/vendor/libgit2/appveyor.yml +++ b/vendor/libgit2/appveyor.yml @@ -36,4 +36,8 @@ build_script: - cmd: | if "%GENERATOR%"=="MSYS Makefiles" (C:\MinGW\msys\1.0\bin\sh --login /c/projects/libgit2/script/appveyor-mingw.sh) test_script: -- ps: ctest -V . +- ps: | + ctest -V -R libgit2_clar + $env:GITTEST_REMOTE_URL="https://github.com/libgit2/non-existent" + $env:GITTEST_REMOTE_USER="libgit2test" + ctest -V -R libgit2_clar-cred_callback diff --git a/vendor/libgit2/deps/http-parser/http_parser.c b/vendor/libgit2/deps/http-parser/http_parser.c index 203530254..27bdd2081 100644 --- a/vendor/libgit2/deps/http-parser/http_parser.c +++ b/vendor/libgit2/deps/http-parser/http_parser.c @@ -99,7 +99,7 @@ do { \ FOR##_mark = NULL; \ } \ } while (0) - + /* Run the data callback FOR and consume the current byte */ #define CALLBACK_DATA(FOR) \ CALLBACK_DATA_(FOR, p - FOR##_mark, p - data + 1) @@ -444,6 +444,9 @@ parse_url_char(enum state s, const char ch) return s_req_path; } + /* The schema must start with an alpha character. After that, it may + * consist of digits, '+', '-' or '.', followed by a ':'. + */ if (IS_ALPHA(ch)) { return s_req_schema; } @@ -451,7 +454,7 @@ parse_url_char(enum state s, const char ch) break; case s_req_schema: - if (IS_ALPHA(ch)) { + if (IS_ALPHANUM(ch) || ch == '+' || ch == '-' || ch == '.') { return s; } diff --git a/vendor/libgit2/examples/network/fetch.c b/vendor/libgit2/examples/network/fetch.c index 6be12406b..177359b88 100644 --- a/vendor/libgit2/examples/network/fetch.c +++ b/vendor/libgit2/examples/network/fetch.c @@ -23,32 +23,6 @@ static int progress_cb(const char *str, int len, void *data) return 0; } -static void *download(void *ptr) -{ - struct dl_data *data = (struct dl_data *)ptr; - - // Connect to the remote end specifying that we want to fetch - // information from it. - if (git_remote_connect(data->remote, GIT_DIRECTION_FETCH, &data->fetch_opts->callbacks) < 0) { - data->ret = -1; - goto exit; - } - - // Download the packfile and index it. This function updates the - // amount of received data and the indexer stats which lets you - // inform the user about progress. - if (git_remote_download(data->remote, NULL, data->fetch_opts) < 0) { - data->ret = -1; - goto exit; - } - - data->ret = 0; - -exit: - data->finished = 1; - return &data->ret; -} - /** * This function gets called for each remote-tracking branch that gets * updated. The message we output depends on whether it's a new one or @@ -73,6 +47,25 @@ static int update_cb(const char *refname, const git_oid *a, const git_oid *b, vo return 0; } +/** + * This gets called during the download and indexing. Here we show + * processed and total objects in the pack and the amount of received + * data. Most frontends will probably want to show a percentage and + * the download rate. + */ +static int transfer_progress_cb(const git_transfer_progress *stats, void *payload) +{ + if (stats->received_objects == stats->total_objects) { + printf("Resolving deltas %d/%d\r", + stats->indexed_deltas, stats->total_deltas); + } else if (stats->total_objects > 0) { + printf("Received %d/%d objects (%d) in %" PRIuZ " bytes\r", + stats->received_objects, stats->total_objects, + stats->indexed_objects, stats->received_bytes); + } + return 0; +} + /** Entry point for this command */ int fetch(git_repository *repo, int argc, char **argv) { @@ -80,9 +73,6 @@ int fetch(git_repository *repo, int argc, char **argv) const git_transfer_progress *stats; struct dl_data data; git_fetch_options fetch_opts = GIT_FETCH_OPTIONS_INIT; -#ifndef _WIN32 - pthread_t worker; -#endif if (argc < 2) { fprintf(stderr, "usage: %s fetch \n", argv[-1]); @@ -99,49 +89,23 @@ int fetch(git_repository *repo, int argc, char **argv) // Set up the callbacks (only update_tips for now) fetch_opts.callbacks.update_tips = &update_cb; fetch_opts.callbacks.sideband_progress = &progress_cb; + fetch_opts.callbacks.transfer_progress = transfer_progress_cb; fetch_opts.callbacks.credentials = cred_acquire_cb; - // Set up the information for the background worker thread - data.remote = remote; - data.fetch_opts = &fetch_opts; - data.ret = 0; - data.finished = 0; - - stats = git_remote_stats(remote); - -#ifdef _WIN32 - download(&data); -#else - pthread_create(&worker, NULL, download, &data); - - // Loop while the worker thread is still running. Here we show processed - // and total objects in the pack and the amount of received - // data. Most frontends will probably want to show a percentage and - // the download rate. - do { - usleep(10000); - - if (stats->received_objects == stats->total_objects) { - printf("Resolving deltas %d/%d\r", - stats->indexed_deltas, stats->total_deltas); - } else if (stats->total_objects > 0) { - printf("Received %d/%d objects (%d) in %" PRIuZ " bytes\r", - stats->received_objects, stats->total_objects, - stats->indexed_objects, stats->received_bytes); - } - } while (!data.finished); - - if (data.ret < 0) - goto on_error; - - pthread_join(worker, NULL); -#endif + /** + * Perform the fetch with the configured refspecs from the + * config. Update the reflog for the updated references with + * "fetch". + */ + if (git_remote_fetch(remote, NULL, &fetch_opts, "fetch") < 0) + return -1; /** * If there are local objects (we got a thin pack), then tell * the user how many objects we saved from having to cross the * network. */ + stats = git_remote_stats(remote); if (stats->local_objects > 0) { printf("\rReceived %d/%d objects in %" PRIuZ " bytes (used %d local objects)\n", stats->indexed_objects, stats->total_objects, stats->received_bytes, stats->local_objects); @@ -150,16 +114,6 @@ int fetch(git_repository *repo, int argc, char **argv) stats->indexed_objects, stats->total_objects, stats->received_bytes); } - // Disconnect the underlying connection to prevent from idling. - git_remote_disconnect(remote); - - // Update the references in the remote's namespace to point to the - // right commits. This may be needed even if there was no packfile - // to download, which can happen e.g. when the branches have been - // changed but all the needed objects are available locally. - if (git_remote_update_tips(remote, &fetch_opts.callbacks, 1, fetch_opts.download_tags, NULL) < 0) - return -1; - git_remote_free(remote); return 0; diff --git a/vendor/libgit2/examples/network/ls-remote.c b/vendor/libgit2/examples/network/ls-remote.c index 21026562f..c9da79f5f 100644 --- a/vendor/libgit2/examples/network/ls-remote.c +++ b/vendor/libgit2/examples/network/ls-remote.c @@ -26,7 +26,7 @@ static int use_remote(git_repository *repo, char *name) */ callbacks.credentials = cred_acquire_cb; - error = git_remote_connect(remote, GIT_DIRECTION_FETCH, &callbacks); + error = git_remote_connect(remote, GIT_DIRECTION_FETCH, &callbacks, NULL); if (error < 0) goto cleanup; diff --git a/vendor/libgit2/git.git-authors b/vendor/libgit2/git.git-authors index 9131a1fa1..6a85224b4 100644 --- a/vendor/libgit2/git.git-authors +++ b/vendor/libgit2/git.git-authors @@ -39,6 +39,7 @@ ok Adam Simpkins (http transport) ok Adrian Johnson ok Alexey Shumkin ok Andreas Ericsson +ok Antoine Pelisse ok Boyd Lynn Gerber ok Brandon Casey ok Brian Downing diff --git a/vendor/libgit2/include/git2/blame.h b/vendor/libgit2/include/git2/blame.h index 173e9994b..84bb7f94c 100644 --- a/vendor/libgit2/include/git2/blame.h +++ b/vendor/libgit2/include/git2/blame.h @@ -74,8 +74,8 @@ typedef struct git_blame_options { uint16_t min_match_characters; git_oid newest_commit; git_oid oldest_commit; - uint32_t min_line; - uint32_t max_line; + size_t min_line; + size_t max_line; } git_blame_options; #define GIT_BLAME_OPTIONS_VERSION 1 @@ -113,15 +113,15 @@ GIT_EXTERN(int) git_blame_init_options( * root, or the commit specified in git_blame_options.oldest_commit) */ typedef struct git_blame_hunk { - uint16_t lines_in_hunk; + size_t lines_in_hunk; git_oid final_commit_id; - uint16_t final_start_line_number; + size_t final_start_line_number; git_signature *final_signature; git_oid orig_commit_id; const char *orig_path; - uint16_t orig_start_line_number; + size_t orig_start_line_number; git_signature *orig_signature; char boundary; @@ -156,7 +156,7 @@ GIT_EXTERN(const git_blame_hunk*) git_blame_get_hunk_byindex( */ GIT_EXTERN(const git_blame_hunk*) git_blame_get_hunk_byline( git_blame *blame, - uint32_t lineno); + size_t lineno); /** * Get the blame for a single file. diff --git a/vendor/libgit2/include/git2/blob.h b/vendor/libgit2/include/git2/blob.h index 4a6d8e50a..9a57c37f5 100644 --- a/vendor/libgit2/include/git2/blob.h +++ b/vendor/libgit2/include/git2/blob.h @@ -171,8 +171,8 @@ typedef int (*git_blob_chunk_cb)(char *content, size_t max_length, void *payload * - The `callback` must return the number of bytes that have been * written to the `content` buffer. * - * - When there is no more data to stream, `callback` should return - * 0. This will prevent it from being invoked anymore. + * - When there is no more data to stream, `callback` should return 0. + * This will prevent it from being invoked anymore. * * - If an error occurs, the callback should return a negative value. * This value will be returned to the caller. diff --git a/vendor/libgit2/include/git2/commit.h b/vendor/libgit2/include/git2/commit.h index 04711c1fa..3488c7440 100644 --- a/vendor/libgit2/include/git2/commit.h +++ b/vendor/libgit2/include/git2/commit.h @@ -127,6 +127,19 @@ GIT_EXTERN(const char *) git_commit_message_raw(const git_commit *commit); */ GIT_EXTERN(const char *) git_commit_summary(git_commit *commit); +/** + * Get the long "body" of the git commit message. + * + * The returned message is the body of the commit, comprising + * everything but the first paragraph of the message. Leading and + * trailing whitespaces are trimmed. + * + * @param commit a previously loaded commit. + * @return the body of a commit or NULL when no the message only + * consists of a summary + */ +GIT_EXTERN(const char *) git_commit_body(git_commit *commit); + /** * Get the commit time (i.e. committer time) of a commit. * @@ -250,6 +263,24 @@ GIT_EXTERN(int) git_commit_nth_gen_ancestor( */ GIT_EXTERN(int) git_commit_header_field(git_buf *out, const git_commit *commit, const char *field); +/** + * Extract the signature from a commit + * + * If the id is not for a commit, the error class will be + * `GITERR_INVALID`. If the commit does not have a signature, the + * error class will be `GITERR_OBJECT`. + * + * @param signature the signature block + * @param signed_data signed data; this is the commit contents minus the signature block + * @param repo the repository in which the commit exists + * @param commit_id the commit from which to extract the data + * @param field the name of the header field containing the signature + * block; pass `NULL` to extract the default 'gpgsig' + * @return 0 on success, GIT_ENOTFOUND if the id is not for a commit + * or the commit does not have a signature. + */ +GIT_EXTERN(int) git_commit_extract_signature(git_buf *signature, git_buf *signed_data, git_repository *repo, git_oid *commit_id, const char *field); + /** * Create new commit in the repository from a list of `git_object` pointers * diff --git a/vendor/libgit2/include/git2/common.h b/vendor/libgit2/include/git2/common.h index 577906115..d7428d811 100644 --- a/vendor/libgit2/include/git2/common.h +++ b/vendor/libgit2/include/git2/common.h @@ -24,10 +24,19 @@ GIT_BEGIN_DECL # include "inttypes.h" GIT_END_DECL -#else +/** This check is needed for importing this file in an iOS/OS X framework throws an error in Xcode otherwise.*/ +#elif !defined(__CLANG_INTTYPES_H) # include #endif +#ifdef DOCURIUM +/* + * This is so clang's doc parser acknowledges comments on functions + * with size_t parameters. + */ +typedef size_t size_t; +#endif + /** Declare a public function exported for application use. */ #if __GNUC__ >= 4 # define GIT_EXTERN(type) extern \ @@ -101,8 +110,9 @@ GIT_EXTERN(void) git_libgit2_version(int *major, int *minor, int *rev); */ typedef enum { GIT_FEATURE_THREADS = (1 << 0), - GIT_FEATURE_HTTPS = (1 << 1), - GIT_FEATURE_SSH = (1 << 2), + GIT_FEATURE_HTTPS = (1 << 1), + GIT_FEATURE_SSH = (1 << 2), + GIT_FEATURE_NSEC = (1 << 3), } git_feature_t; /** @@ -145,6 +155,9 @@ typedef enum { GIT_OPT_GET_TEMPLATE_PATH, GIT_OPT_SET_TEMPLATE_PATH, GIT_OPT_SET_SSL_CERT_LOCATIONS, + GIT_OPT_SET_USER_AGENT, + GIT_OPT_ENABLE_STRICT_OBJECT_CREATION, + GIT_OPT_SET_SSL_CIPHERS, } git_libgit2_opt_t; /** @@ -172,9 +185,9 @@ typedef enum { * * opts(GIT_OPT_GET_SEARCH_PATH, int level, git_buf *buf) * * > Get the search path for a given level of config data. "level" must - * > be one of `GIT_CONFIG_LEVEL_SYSTEM`, `GIT_CONFIG_LEVEL_GLOBAL`, or - * > `GIT_CONFIG_LEVEL_XDG`. The search path is written to the `out` - * > buffer. + * > be one of `GIT_CONFIG_LEVEL_SYSTEM`, `GIT_CONFIG_LEVEL_GLOBAL`, + * > `GIT_CONFIG_LEVEL_XDG`, or `GIT_CONFIG_LEVEL_PROGRAMDATA`. + * > The search path is written to the `out` buffer. * * * opts(GIT_OPT_SET_SEARCH_PATH, int level, const char *path) * @@ -186,8 +199,9 @@ typedef enum { * > variables). Use magic path `$PATH` to include the old value * > of the path (if you want to prepend or append, for instance). * > - * > - `level` must be GIT_CONFIG_LEVEL_SYSTEM, GIT_CONFIG_LEVEL_GLOBAL, - * > or GIT_CONFIG_LEVEL_XDG. + * > - `level` must be `GIT_CONFIG_LEVEL_SYSTEM`, + * > `GIT_CONFIG_LEVEL_GLOBAL`, `GIT_CONFIG_LEVEL_XDG`, or + * > `GIT_CONFIG_LEVEL_PROGRAMDATA`. * * * opts(GIT_OPT_SET_CACHE_OBJECT_LIMIT, git_otype type, size_t size) * @@ -240,6 +254,27 @@ typedef enum { * > * > Either parameter may be `NULL`, but not both. * + * * opts(GIT_OPT_SET_USER_AGENT, const char *user_agent) + * + * > Set the value of the User-Agent header. This value will be + * > appended to "git/1.0", for compatibility with other git clients. + * > + * > - `user_agent` is the value that will be delivered as the + * > User-Agent header on HTTP requests. + * + * * opts(GIT_OPT_ENABLE_STRICT_OBJECT_CREATION, int enabled) + * + * > Enable strict input validation when creating new objects + * > to ensure that all inputs to the new objects are valid. For + * > example, when this is enabled, the parent(s) and tree inputs + * > will be validated when creating a new commit. This defaults + * > to disabled. + * * opts(GIT_OPT_SET_SSL_CIPHERS, const char *ciphers) + * + * > Set the SSL ciphers use for HTTPS connections. + * > + * > - `ciphers` is the list of ciphers that are eanbled. + * * @param option Option key * @param ... value to set the option * @return 0 on success, <0 on failure diff --git a/vendor/libgit2/include/git2/config.h b/vendor/libgit2/include/git2/config.h index 537663ec9..d0f1ba1b3 100644 --- a/vendor/libgit2/include/git2/config.h +++ b/vendor/libgit2/include/git2/config.h @@ -29,25 +29,28 @@ GIT_BEGIN_DECL * priority levels as well. */ typedef enum { + /** System-wide on Windows, for compatibility with portable git */ + GIT_CONFIG_LEVEL_PROGRAMDATA = 1, + /** System-wide configuration file; /etc/gitconfig on Linux systems */ - GIT_CONFIG_LEVEL_SYSTEM = 1, + GIT_CONFIG_LEVEL_SYSTEM = 2, /** XDG compatible configuration file; typically ~/.config/git/config */ - GIT_CONFIG_LEVEL_XDG = 2, + GIT_CONFIG_LEVEL_XDG = 3, /** User-specific configuration file (also called Global configuration * file); typically ~/.gitconfig */ - GIT_CONFIG_LEVEL_GLOBAL = 3, + GIT_CONFIG_LEVEL_GLOBAL = 4, /** Repository specific configuration file; $WORK_DIR/.git/config on * non-bare repos */ - GIT_CONFIG_LEVEL_LOCAL = 4, + GIT_CONFIG_LEVEL_LOCAL = 5, /** Application specific configuration file; freely defined by applications */ - GIT_CONFIG_LEVEL_APP = 5, + GIT_CONFIG_LEVEL_APP = 6, /** Represents the highest level available config file (i.e. the most * specific config file available that actually is loaded) @@ -141,6 +144,17 @@ GIT_EXTERN(int) git_config_find_xdg(git_buf *out); */ GIT_EXTERN(int) git_config_find_system(git_buf *out); +/** + * Locate the path to the configuration file in ProgramData + * + * Look for the file in %PROGRAMDATA%\Git\config used by portable git. + * + * @param out Pointer to a user-allocated git_buf in which to store the path + * @return 0 if a ProgramData configuration file has been + * found. Its path will be stored in `out`. + */ +GIT_EXTERN(int) git_config_find_programdata(git_buf *out); + /** * Open the global, XDG and system configuration files * @@ -691,6 +705,24 @@ GIT_EXTERN(int) git_config_backend_foreach_match( void *payload); +/** + * Lock the backend with the highest priority + * + * Locking disallows anybody else from writing to that backend. Any + * updates made after locking will not be visible to a reader until + * the file is unlocked. + * + * You can apply the changes by calling `git_transaction_commit()` + * before freeing the transaction. Either of these actions will unlock + * the config. + * + * @param tx the resulting transaction, use this to commit or undo the + * changes + * @param cfg the configuration in which to lock + * @return 0 or an error code + */ +GIT_EXTERN(int) git_config_lock(git_transaction **tx, git_config *cfg); + /** @} */ GIT_END_DECL #endif diff --git a/vendor/libgit2/include/git2/diff.h b/vendor/libgit2/include/git2/diff.h index b3ab5397e..c35701a46 100644 --- a/vendor/libgit2/include/git2/diff.h +++ b/vendor/libgit2/include/git2/diff.h @@ -129,8 +129,12 @@ typedef enum { */ GIT_DIFF_INCLUDE_CASECHANGE = (1u << 11), - /** If the pathspec is set in the diff options, this flags means to - * apply it as an exact match instead of as an fnmatch pattern. + /** If the pathspec is set in the diff options, this flags indicates + * that the paths will be treated as literal paths instead of + * fnmatch patterns. Each path in the list must either be a full + * path to a file or a directory. (A trailing slash indicates that + * the path will _only_ match a directory). If a directory is + * specified, all children will be included. */ GIT_DIFF_DISABLE_PATHSPEC_MATCH = (1u << 12), @@ -346,6 +350,22 @@ typedef int (*git_diff_notify_cb)( const char *matched_pathspec, void *payload); +/** + * Diff progress callback. + * + * Called before each file comparison. + * + * @param diff_so_far The diff being generated. + * @param old_path The path to the old file or NULL. + * @param new_path The path to the new file or NULL. + * @return Non-zero to abort the diff. + */ +typedef int (*git_diff_progress_cb)( + const git_diff *diff_so_far, + const char *old_path, + const char *new_path, + void *payload); + /** * Structure describing options about how the diff should be executed. * @@ -366,8 +386,10 @@ typedef int (*git_diff_notify_cb)( * - `max_size` is a file size (in bytes) above which a blob will be marked * as binary automatically; pass a negative value to disable. * - `notify_cb` is an optional callback function, notifying the consumer of - * which files are being examined as the diff is generated - * - `notify_payload` is the payload data to pass to the `notify_cb` function + * changes to the diff as new deltas are added. + * - `progress_cb` is an optional callback function, notifying the consumer of + * which files are being examined as the diff is generated. + * - `payload` is the payload to pass to the callback functions. * - `ignore_submodules` overrides the submodule ignore setting for all * submodules in the diff. */ @@ -379,8 +401,9 @@ typedef struct { git_submodule_ignore_t ignore_submodules; /**< submodule ignore rule */ git_strarray pathspec; /**< defaults to include all paths */ - git_diff_notify_cb notify_cb; - void *notify_payload; + git_diff_notify_cb notify_cb; + git_diff_progress_cb progress_cb; + void *payload; /* options controlling how to diff text is generated */ @@ -399,7 +422,7 @@ typedef struct { * `git_diff_options_init` programmatic initialization. */ #define GIT_DIFF_OPTIONS_INIT \ - {GIT_DIFF_OPTIONS_VERSION, 0, GIT_SUBMODULE_IGNORE_UNSPECIFIED, {NULL,0}, NULL, NULL, 3} + {GIT_DIFF_OPTIONS_VERSION, 0, GIT_SUBMODULE_IGNORE_UNSPECIFIED, {NULL,0}, NULL, NULL, NULL, 3} /** * Initializes a `git_diff_options` with default values. Equivalent to @@ -835,6 +858,25 @@ GIT_EXTERN(int) git_diff_tree_to_workdir_with_index( git_tree *old_tree, const git_diff_options *opts); /**< can be NULL for defaults */ +/** + * Create a diff with the difference between two index objects. + * + * The first index will be used for the "old_file" side of the delta and the + * second index will be used for the "new_file" side of the delta. + * + * @param diff Output pointer to a git_diff pointer to be allocated. + * @param repo The repository containing the indexes. + * @param old_index A git_index object to diff from. + * @param new_index A git_index object to diff to. + * @param opts Structure with options to influence diff or NULL for defaults. + */ +GIT_EXTERN(int) git_diff_index_to_index( + git_diff **diff, + git_repository *repo, + git_index *old_index, + git_index *new_index, + const git_diff_options *opts); /**< can be NULL for defaults */ + /** * Merge one diff into another. * @@ -1152,7 +1194,7 @@ typedef enum { } git_diff_stats_format_t; /** - * Accumlate diff statistics for all patches. + * Accumulate diff statistics for all patches. * * @param out Structure containg the diff statistics. * @param diff A git_diff generated by one of the above functions. @@ -1244,12 +1286,15 @@ typedef struct { /** Summary of the change */ const char *summary; + /** Commit message's body */ + const char *body; + /** Author of the change */ const git_signature *author; } git_diff_format_email_options; #define GIT_DIFF_FORMAT_EMAIL_OPTIONS_VERSION 1 -#define GIT_DIFF_FORMAT_EMAIL_OPTIONS_INIT {GIT_DIFF_FORMAT_EMAIL_OPTIONS_VERSION, 0, 1, 1, NULL, NULL, NULL} +#define GIT_DIFF_FORMAT_EMAIL_OPTIONS_INIT {GIT_DIFF_FORMAT_EMAIL_OPTIONS_VERSION, 0, 1, 1, NULL, NULL, NULL, NULL} /** * Create an e-mail ready patch from a diff. diff --git a/vendor/libgit2/include/git2/errors.h b/vendor/libgit2/include/git2/errors.h index e189e55f1..3ecea34bf 100644 --- a/vendor/libgit2/include/git2/errors.h +++ b/vendor/libgit2/include/git2/errors.h @@ -49,6 +49,7 @@ typedef enum { GIT_EINVALID = -21, /**< Invalid operation or input */ GIT_EUNCOMMITTED = -22, /**< Uncommitted changes in index prevented operation */ GIT_EDIRECTORY = -23, /**< The operation is not valid for a directory */ + GIT_EMERGECONFLICT = -24, /**< A merge conflict exists and cannot continue */ GIT_PASSTHROUGH = -30, /**< Internal only */ GIT_ITEROVER = -31, /**< Signals end of iteration with iterator */ @@ -113,18 +114,6 @@ GIT_EXTERN(const git_error *) giterr_last(void); */ GIT_EXTERN(void) giterr_clear(void); -/** - * Get the last error data and clear it. - * - * This copies the last error into the given `git_error` struct - * and returns 0 if the copy was successful, leaving the error - * cleared as if `giterr_clear` had been called. - * - * If there was no existing error in the library, -1 will be returned - * and the contents of `cpy` will be left unmodified. - */ -GIT_EXTERN(int) giterr_detach(git_error *cpy); - /** * Set the error message string for this thread. * @@ -137,11 +126,6 @@ GIT_EXTERN(int) giterr_detach(git_error *cpy); * This error message is stored in thread-local storage and only applies * to the particular thread that this libgit2 call is made from. * - * NOTE: Passing the `error_class` as GITERR_OS has a special behavior: we - * attempt to append the system default error message for the last OS error - * that occurred and then clear the last error. The specific implementation - * of looking up and clearing this last OS error will vary by platform. - * * @param error_class One of the `git_error_t` enum above describing the * general subsystem that is responsible for the error. * @param string The formatted error message to keep diff --git a/vendor/libgit2/include/git2/index.h b/vendor/libgit2/include/git2/index.h index 7caf3ed78..466765be3 100644 --- a/vendor/libgit2/include/git2/index.h +++ b/vendor/libgit2/include/git2/index.h @@ -154,13 +154,27 @@ typedef enum { GIT_INDEX_ADD_CHECK_PATHSPEC = (1u << 2), } git_index_add_option_t; -/** - * Match any index stage. - * - * Some index APIs take a stage to match; pass this value to match - * any entry matching the path regardless of stage. - */ -#define GIT_INDEX_STAGE_ANY -1 +typedef enum { + /** + * Match any index stage. + * + * Some index APIs take a stage to match; pass this value to match + * any entry matching the path regardless of stage. + */ + GIT_INDEX_STAGE_ANY = -1, + + /** A normal staged file in the index. */ + GIT_INDEX_STAGE_NORMAL = 0, + + /** The ancestor side of a conflict. */ + GIT_INDEX_STAGE_ANCESTOR = 1, + + /** The "ours" side of a conflict. */ + GIT_INDEX_STAGE_OURS = 2, + + /** The "theirs" side of a conflict. */ + GIT_INDEX_STAGE_THEIRS = 3, +} git_index_stage_t; /** @name Index File Functions * @@ -643,6 +657,17 @@ GIT_EXTERN(int) git_index_update_all( */ GIT_EXTERN(int) git_index_find(size_t *at_pos, git_index *index, const char *path); +/** + * Find the first position of any entries matching a prefix. To find the first position + * of a path inside a given folder, suffix the prefix with a '/'. + * + * @param at_pos the address to which the position of the index entry is written (optional) + * @param index an existing index object + * @param prefix the prefix to search for + * @return 0 with valid value in at_pos; an error code otherwise + */ +GIT_EXTERN(int) git_index_find_prefix(size_t *at_pos, git_index *index, const char *prefix); + /**@}*/ /** @name Conflict Index Entry Functions diff --git a/vendor/libgit2/include/git2/merge.h b/vendor/libgit2/include/git2/merge.h index 5fef452b9..560797a0c 100644 --- a/vendor/libgit2/include/git2/merge.h +++ b/vendor/libgit2/include/git2/merge.h @@ -62,8 +62,8 @@ GIT_EXTERN(int) git_merge_file_init_input( unsigned int version); /** - * Flags for `git_merge_tree` options. A combination of these flags can be - * passed in via the `tree_flags` value in the `git_merge_options`. + * Flags for `git_merge` options. A combination of these flags can be + * passed in via the `flags` value in the `git_merge_options`. */ typedef enum { /** @@ -71,8 +71,28 @@ typedef enum { * side or the common ancestor and the "theirs" side. This will enable * the ability to merge between a modified and renamed file. */ - GIT_MERGE_TREE_FIND_RENAMES = (1 << 0), -} git_merge_tree_flag_t; + GIT_MERGE_FIND_RENAMES = (1 << 0), + + /** + * If a conflict occurs, exit immediately instead of attempting to + * continue resolving conflicts. The merge operation will fail with + * GIT_EMERGECONFLICT and no index will be returned. + */ + GIT_MERGE_FAIL_ON_CONFLICT = (1 << 1), + + /** + * Do not write the REUC extension on the generated index + */ + GIT_MERGE_SKIP_REUC = (1 << 2), + + /** + * If the commits being merged have multiple merge bases, do not build + * a recursive merge base (by merging the multiple merge bases), + * instead simply use the first base. This flag provides a similar + * merge base to `git-merge-resolve`. + */ + GIT_MERGE_NO_RECURSIVE = (1 << 3), +} git_merge_flag_t; /** * Merge file favor options for `git_merge_options` instruct the file-level @@ -140,7 +160,7 @@ typedef enum { /** Take extra time to find minimal diff */ GIT_MERGE_FILE_DIFF_MINIMAL = (1 << 7), -} git_merge_file_flags_t; +} git_merge_file_flag_t; /** * Options for merging a file @@ -169,8 +189,8 @@ typedef struct { /** The file to favor in region conflicts. */ git_merge_file_favor_t favor; - /** see `git_merge_file_flags_t` above */ - unsigned int flags; + /** see `git_merge_file_flag_t` above */ + git_merge_file_flag_t flags; } git_merge_file_options; #define GIT_MERGE_FILE_OPTIONS_VERSION 1 @@ -220,11 +240,13 @@ typedef struct { */ typedef struct { unsigned int version; - git_merge_tree_flag_t tree_flags; + + /** See `git_merge_flag_t` above */ + git_merge_flag_t flags; /** * Similarity to consider a file renamed (default 50). If - * `GIT_MERGE_TREE_FIND_RENAMES` is enabled, added files will be compared + * `GIT_MERGE_FIND_RENAMES` is enabled, added files will be compared * with deleted files to determine their similarity. Files that are * more similar than the rename threshold (percentage-wise) will be * treated as a rename. @@ -243,11 +265,19 @@ typedef struct { /** Pluggable similarity metric; pass NULL to use internal metric */ git_diff_similarity_metric *metric; + /** + * Maximum number of times to merge common ancestors to build a + * virtual merge base when faced with criss-cross merges. When this + * limit is reached, the next ancestor will simply be used instead of + * attempting to merge it. The default is unlimited. + */ + unsigned int recursion_limit; + /** Flags for handling conflicting content. */ git_merge_file_favor_t file_favor; - /** see `git_merge_file_flags_t` above */ - unsigned int file_flags; + /** see `git_merge_file_flag_t` above */ + git_merge_file_flag_t file_flags; } git_merge_options; #define GIT_MERGE_OPTIONS_VERSION 1 @@ -497,10 +527,6 @@ GIT_EXTERN(int) git_merge_trees( * or checked out. If the index is to be converted to a tree, the caller * should resolve any conflicts that arose as part of the merge. * - * The merge performed uses the first common ancestor, unlike the - * `git-merge-recursive` strategy, which may produce an artificial common - * ancestor tree when there are multiple ancestors. - * * The returned index must be freed explicitly with `git_index_free`. * * @param out pointer to store the index result in @@ -523,10 +549,6 @@ GIT_EXTERN(int) git_merge_commits( * to the index. Callers should inspect the repository's index after this * completes, resolve any conflicts and prepare a commit. * - * The merge performed uses the first common ancestor, unlike the - * `git-merge-recursive` strategy, which may produce an artificial common - * ancestor tree when there are multiple ancestors. - * * For compatibility with git, the repository is put into a merging * state. Once the commit is done (or if the uses wishes to abort), * you should clear this state by calling diff --git a/vendor/libgit2/include/git2/rebase.h b/vendor/libgit2/include/git2/rebase.h index d9aa175c7..9b9065ee4 100644 --- a/vendor/libgit2/include/git2/rebase.h +++ b/vendor/libgit2/include/git2/rebase.h @@ -38,19 +38,33 @@ typedef struct { */ int quiet; + /** + * Used by `git_rebase_init`, this will begin an in-memory rebase, + * which will allow callers to step through the rebase operations and + * commit the rebased changes, but will not rewind HEAD or update the + * repository to be in a rebasing state. This will not interfere with + * the working directory (if there is one). + */ + int inmemory; + /** * Used by `git_rebase_finish`, this is the name of the notes reference * used to rewrite notes for rebased commits when finishing the rebase; - * if NULL, the contents of the coniguration option `notes.rewriteRef` + * if NULL, the contents of the configuration option `notes.rewriteRef` * is examined, unless the configuration option `notes.rewrite.rebase` * is set to false. If `notes.rewriteRef` is also NULL, notes will * not be rewritten. */ const char *rewrite_notes_ref; + /** + * Options to control how trees are merged during `git_rebase_next`. + */ + git_merge_options merge_options; + /** * Options to control how files are written during `git_rebase_init`, - * `git_checkout_next` and `git_checkout_abort`. Note that a minimum + * `git_rebase_next` and `git_rebase_abort`. Note that a minimum * strategy of `GIT_CHECKOUT_SAFE` is defaulted in `init` and `next`, * and a minimum strategy of `GIT_CHECKOUT_FORCE` is defaulted in * `abort` to match git semantics. @@ -101,7 +115,8 @@ typedef enum { #define GIT_REBASE_OPTIONS_VERSION 1 #define GIT_REBASE_OPTIONS_INIT \ - {GIT_REBASE_OPTIONS_VERSION, 0, NULL, GIT_CHECKOUT_OPTIONS_INIT} + { GIT_REBASE_OPTIONS_VERSION, 0, 0, NULL, GIT_MERGE_OPTIONS_INIT, \ + GIT_CHECKOUT_OPTIONS_INIT} /** Indicates that a rebase operation is not (yet) in progress. */ #define GIT_REBASE_NO_OPERATION SIZE_MAX @@ -226,6 +241,21 @@ GIT_EXTERN(int) git_rebase_next( git_rebase_operation **operation, git_rebase *rebase); +/** + * Gets the index produced by the last operation, which is the result + * of `git_rebase_next` and which will be committed by the next + * invocation of `git_rebase_commit`. This is useful for resolving + * conflicts in an in-memory rebase before committing them. You must + * call `git_index_free` when you are finished with this. + * + * This is only applicable for in-memory rebases; for rebases within + * a working directory, the changes were applied to the repository's + * index. + */ +GIT_EXTERN(int) git_rebase_inmemory_index( + git_index **index, + git_rebase *rebase); + /** * Commits the current patch. You must have resolved any conflicts that * were introduced during the patch application from the `git_rebase_next` diff --git a/vendor/libgit2/include/git2/remote.h b/vendor/libgit2/include/git2/remote.h index 444fe5276..c42d96710 100644 --- a/vendor/libgit2/include/git2/remote.h +++ b/vendor/libgit2/include/git2/remote.h @@ -241,9 +241,10 @@ GIT_EXTERN(const git_refspec *)git_remote_get_refspec(const git_remote *remote, * @param direction GIT_DIRECTION_FETCH if you want to fetch or * GIT_DIRECTION_PUSH if you want to push * @param callbacks the callbacks to use for this connection + * @param custom_headers extra HTTP headers to use in this connection * @return 0 or an error code */ -GIT_EXTERN(int) git_remote_connect(git_remote *remote, git_direction direction, const git_remote_callbacks *callbacks); +GIT_EXTERN(int) git_remote_connect(git_remote *remote, git_direction direction, const git_remote_callbacks *callbacks, const git_strarray *custom_headers); /** * Get the remote repository's reference advertisement list @@ -546,6 +547,11 @@ typedef struct { * The default is to auto-follow tags. */ git_remote_autotag_option_t download_tags; + + /** + * Extra headers for this fetch operation + */ + git_strarray custom_headers; } git_fetch_options; #define GIT_FETCH_OPTIONS_VERSION 1 @@ -585,6 +591,11 @@ typedef struct { * Callbacks to use for this push operation */ git_remote_callbacks callbacks; + + /** + * Extra headers for this push operation + */ + git_strarray custom_headers; } git_push_options; #define GIT_PUSH_OPTIONS_VERSION 1 diff --git a/vendor/libgit2/include/git2/repository.h b/vendor/libgit2/include/git2/repository.h index cf268ef85..85b7e6861 100644 --- a/vendor/libgit2/include/git2/repository.h +++ b/vendor/libgit2/include/git2/repository.h @@ -675,7 +675,9 @@ typedef enum { GIT_REPOSITORY_STATE_NONE, GIT_REPOSITORY_STATE_MERGE, GIT_REPOSITORY_STATE_REVERT, + GIT_REPOSITORY_STATE_REVERT_SEQUENCE, GIT_REPOSITORY_STATE_CHERRYPICK, + GIT_REPOSITORY_STATE_CHERRYPICK_SEQUENCE, GIT_REPOSITORY_STATE_BISECT, GIT_REPOSITORY_STATE_REBASE, GIT_REPOSITORY_STATE_REBASE_INTERACTIVE, diff --git a/vendor/libgit2/include/git2/stash.h b/vendor/libgit2/include/git2/stash.h index 526db0ba2..733d75a7f 100644 --- a/vendor/libgit2/include/git2/stash.h +++ b/vendor/libgit2/include/git2/stash.h @@ -68,7 +68,7 @@ GIT_EXTERN(int) git_stash_save( git_repository *repo, const git_signature *stasher, const char *message, - unsigned int flags); + uint32_t flags); /** Stash application flags. */ typedef enum { @@ -150,7 +150,7 @@ typedef struct git_stash_apply_options { * `GIT_STASH_APPLY_OPTIONS_INIT` here. * @return Zero on success; -1 on failure. */ -int git_stash_apply_init_options( +GIT_EXTERN(int) git_stash_apply_init_options( git_stash_apply_options *opts, unsigned int version); /** diff --git a/vendor/libgit2/include/git2/submodule.h b/vendor/libgit2/include/git2/submodule.h index 689fe4b64..bc94eacaa 100644 --- a/vendor/libgit2/include/git2/submodule.h +++ b/vendor/libgit2/include/git2/submodule.h @@ -107,6 +107,17 @@ typedef enum { GIT_SUBMODULE_STATUS_WD_WD_MODIFIED | \ GIT_SUBMODULE_STATUS_WD_UNTRACKED)) != 0) +/** + * Function pointer to receive each submodule + * + * @param sm git_submodule currently being visited + * @param name name of the submodule + * @param payload value you passed to the foreach function as payload + * @return 0 on success or error code + */ +typedef int (*git_submodule_cb)( + git_submodule *sm, const char *name, void *payload); + /** * Submodule update options structure * @@ -239,7 +250,7 @@ GIT_EXTERN(void) git_submodule_free(git_submodule *submodule); */ GIT_EXTERN(int) git_submodule_foreach( git_repository *repo, - int (*callback)(git_submodule *sm, const char *name, void *payload), + git_submodule_cb callback, void *payload); /** diff --git a/vendor/libgit2/include/git2/sys/config.h b/vendor/libgit2/include/git2/sys/config.h index 044e34417..4dad6da42 100644 --- a/vendor/libgit2/include/git2/sys/config.h +++ b/vendor/libgit2/include/git2/sys/config.h @@ -67,6 +67,20 @@ struct git_config_backend { int (*iterator)(git_config_iterator **, struct git_config_backend *); /** Produce a read-only version of this backend */ int (*snapshot)(struct git_config_backend **, struct git_config_backend *); + /** + * Lock this backend. + * + * Prevent any writes to the data store backing this + * backend. Any updates must not be visible to any other + * readers. + */ + int (*lock)(struct git_config_backend *); + /** + * Unlock the data store backing this backend. If success is + * true, the changes should be committed, otherwise rolled + * back. + */ + int (*unlock)(struct git_config_backend *, int success); void (*free)(struct git_config_backend *); }; #define GIT_CONFIG_BACKEND_VERSION 1 diff --git a/vendor/libgit2/include/git2/sys/filter.h b/vendor/libgit2/include/git2/sys/filter.h index 5fd8d5566..d0e5d4d6f 100644 --- a/vendor/libgit2/include/git2/sys/filter.h +++ b/vendor/libgit2/include/git2/sys/filter.h @@ -127,17 +127,6 @@ GIT_EXTERN(git_filter_mode_t) git_filter_source_mode(const git_filter_source *sr */ GIT_EXTERN(uint32_t) git_filter_source_flags(const git_filter_source *src); -/* - * struct git_filter - * - * The filter lifecycle: - * - initialize - first use of filter - * - shutdown - filter removed/unregistered from system - * - check - considering filter for file - * - apply - apply filter to file contents - * - cleanup - done with file - */ - /** * Initialize callback on filter * @@ -233,28 +222,51 @@ typedef void (*git_filter_cleanup_fn)( * To associate extra data with a filter, allocate extra data and put the * `git_filter` struct at the start of your data buffer, then cast the * `self` pointer to your larger structure when your callback is invoked. - * - * `version` should be set to GIT_FILTER_VERSION - * - * `attributes` is a whitespace-separated list of attribute names to check - * for this filter (e.g. "eol crlf text"). If the attribute name is bare, - * it will be simply loaded and passed to the `check` callback. If it has - * a value (i.e. "name=value"), the attribute must match that value for - * the filter to be applied. - * - * The `initialize`, `shutdown`, `check`, `apply`, and `cleanup` callbacks - * are all documented above with the respective function pointer typedefs. */ struct git_filter { + /** The `version` field should be set to `GIT_FILTER_VERSION`. */ unsigned int version; + /** + * A whitespace-separated list of attribute names to check for this + * filter (e.g. "eol crlf text"). If the attribute name is bare, it + * will be simply loaded and passed to the `check` callback. If it + * has a value (i.e. "name=value"), the attribute must match that + * value for the filter to be applied. The value may be a wildcard + * (eg, "name=*"), in which case the filter will be invoked for any + * value for the given attribute name. See the attribute parameter + * of the `check` callback for the attribute value that was specified. + */ const char *attributes; + /** Called when the filter is first used for any file. */ git_filter_init_fn initialize; + + /** Called when the filter is removed or unregistered from the system. */ git_filter_shutdown_fn shutdown; + + /** + * Called to determine whether the filter should be invoked for a + * given file. If this function returns `GIT_PASSTHROUGH` then the + * `apply` function will not be invoked and the contents will be passed + * through unmodified. + */ git_filter_check_fn check; + + /** + * Called to actually apply the filter to file contents. If this + * function returns `GIT_PASSTHROUGH` then the contents will be passed + * through unmodified. + */ git_filter_apply_fn apply; + + /** + * Called to apply the filter in a streaming manner. If this is not + * specified then the system will call `apply` with the whole buffer. + */ git_filter_stream_fn stream; + + /** Called when the system is done filtering for a file. */ git_filter_cleanup_fn cleanup; }; diff --git a/vendor/libgit2/include/git2/sys/index.h b/vendor/libgit2/include/git2/sys/index.h index 29a99f798..2e2b87e68 100644 --- a/vendor/libgit2/include/git2/sys/index.h +++ b/vendor/libgit2/include/git2/sys/index.h @@ -25,7 +25,7 @@ typedef struct git_index_name_entry { /** Representation of a resolve undo entry in the index. */ typedef struct git_index_reuc_entry { - unsigned int mode[3]; + uint32_t mode[3]; git_oid oid[3]; char *path; } git_index_reuc_entry; diff --git a/vendor/libgit2/include/git2/sys/odb_backend.h b/vendor/libgit2/include/git2/sys/odb_backend.h index fe102ff3c..e423a9236 100644 --- a/vendor/libgit2/include/git2/sys/odb_backend.h +++ b/vendor/libgit2/include/git2/sys/odb_backend.h @@ -83,6 +83,10 @@ struct git_odb_backend { git_odb_writepack **, git_odb_backend *, git_odb *odb, git_transfer_progress_cb progress_cb, void *progress_payload); + /** + * Frees any resources held by the odb (including the `git_odb_backend` + * itself). An odb backend implementation must provide this function. + */ void (* free)(git_odb_backend *); }; diff --git a/vendor/libgit2/include/git2/sys/refdb_backend.h b/vendor/libgit2/include/git2/sys/refdb_backend.h index 8b004a7e0..5129ad84a 100644 --- a/vendor/libgit2/include/git2/sys/refdb_backend.h +++ b/vendor/libgit2/include/git2/sys/refdb_backend.h @@ -103,8 +103,9 @@ struct git_refdb_backend { const git_signature *who, const char *message); /** - * Deletes the given reference from the refdb. A refdb implementation - * must provide this function. + * Deletes the given reference (and if necessary its reflog) + * from the refdb. A refdb implementation must provide this + * function. */ int (*del)(git_refdb_backend *backend, const char *ref_name, const git_oid *old_id, const char *old_target); @@ -129,8 +130,8 @@ struct git_refdb_backend { int (*ensure_log)(git_refdb_backend *backend, const char *refname); /** - * Frees any resources held by the refdb. A refdb implementation may - * provide this function; if it is not provided, nothing will be done. + * Frees any resources held by the refdb (including the `git_refdb_backend` + * itself). A refdb backend implementation must provide this function. */ void (*free)(git_refdb_backend *backend); diff --git a/vendor/libgit2/include/git2/sys/stream.h b/vendor/libgit2/include/git2/sys/stream.h index 55a714bbb..2b4ff7fd8 100644 --- a/vendor/libgit2/include/git2/sys/stream.h +++ b/vendor/libgit2/include/git2/sys/stream.h @@ -39,6 +39,19 @@ typedef struct git_stream { void (*free)(struct git_stream *); } git_stream; +typedef int (*git_stream_cb)(git_stream **out, const char *host, const char *port); + +/** + * Register a TLS stream constructor for the library to use + * + * If a constructor is already set, it will be overwritten. Pass + * `NULL` in order to deregister the current constructor. + * + * @param ctor the constructor to use + * @return 0 or an error code + */ +GIT_EXTERN(int) git_stream_register_tls(git_stream_cb ctor); + GIT_END_DECL #endif diff --git a/vendor/libgit2/include/git2/sys/transport.h b/vendor/libgit2/include/git2/sys/transport.h index e6ee3c654..ce0234a18 100644 --- a/vendor/libgit2/include/git2/sys/transport.h +++ b/vendor/libgit2/include/git2/sys/transport.h @@ -41,6 +41,11 @@ struct git_transport { git_transport_certificate_check_cb certificate_check_cb, void *payload); + /* Set custom headers for HTTP requests */ + int (*set_custom_headers)( + git_transport *transport, + const git_strarray *custom_headers); + /* Connect the transport to the remote repository, using the given * direction. */ int (*connect)( @@ -212,6 +217,28 @@ GIT_EXTERN(int) git_transport_smart( git_remote *owner, /* (git_smart_subtransport_definition *) */ void *payload); +/** + * Call the certificate check for this transport. + * + * @param transport a smart transport + * @param cert the certificate to pass to the caller + * @param valid whether we believe the certificate is valid + * @param hostname the hostname we connected to + * @return the return value of the callback + */ +GIT_EXTERN(int) git_transport_smart_certificate_check(git_transport *transport, git_cert *cert, int valid, const char *hostname); + +/** + * Call the credentials callback for this transport + * + * @param out the pointer where the creds are to be stored + * @param transport a smart transport + * @param user the user we saw on the url (if any) + * @param methods available methods for authentication + * @return the return value of the callback + */ +GIT_EXTERN(int) git_transport_smart_credentials(git_cred **out, git_transport *transport, const char *user, int methods); + /* *** End of base transport interface *** *** Begin interface for subtransports for the smart transport *** diff --git a/vendor/libgit2/include/git2/transport.h b/vendor/libgit2/include/git2/transport.h index 2eeebd565..0ec241699 100644 --- a/vendor/libgit2/include/git2/transport.h +++ b/vendor/libgit2/include/git2/transport.h @@ -37,39 +37,32 @@ typedef enum { * Hostkey information taken from libssh2 */ typedef struct { + git_cert parent; + /** - * Type of certificate. Here to share the header with - * `git_cert`. + * A hostkey type from libssh2, either + * `GIT_CERT_SSH_MD5` or `GIT_CERT_SSH_SHA1` */ - git_cert_t cert_type; - /** - * A hostkey type from libssh2, either - * `GIT_CERT_SSH_MD5` or `GIT_CERT_SSH_SHA1` - */ git_cert_ssh_t type; - /** - * Hostkey hash. If type has `GIT_CERT_SSH_MD5` set, this will - * have the MD5 hash of the hostkey. - */ + /** + * Hostkey hash. If type has `GIT_CERT_SSH_MD5` set, this will + * have the MD5 hash of the hostkey. + */ unsigned char hash_md5[16]; - /** - * Hostkey hash. If type has `GIT_CERT_SSH_SHA1` set, this will - * have the SHA-1 hash of the hostkey. - */ - unsigned char hash_sha1[20]; + /** + * Hostkey hash. If type has `GIT_CERT_SSH_SHA1` set, this will + * have the SHA-1 hash of the hostkey. + */ + unsigned char hash_sha1[20]; } git_cert_hostkey; /** * X.509 certificate information */ typedef struct { - /** - * Type of certificate. Here to share the header with - * `git_cert`. - */ - git_cert_t cert_type; + git_cert parent; /** * Pointer to the X.509 certificate data */ @@ -314,6 +307,17 @@ GIT_EXTERN(int) git_cred_ssh_key_memory_new( const char *privatekey, const char *passphrase); + +/** + * Free a credential. + * + * This is only necessary if you own the object; that is, if you are a + * transport. + * + * @param cred the object to free + */ +GIT_EXTERN(void) git_cred_free(git_cred *cred); + /** * Signature of a function which acquires a credential object. * diff --git a/vendor/libgit2/include/git2/version.h b/vendor/libgit2/include/git2/version.h index 116a13524..66a6623cd 100644 --- a/vendor/libgit2/include/git2/version.h +++ b/vendor/libgit2/include/git2/version.h @@ -7,12 +7,12 @@ #ifndef INCLUDE_git_version_h__ #define INCLUDE_git_version_h__ -#define LIBGIT2_VERSION "0.23.4" +#define LIBGIT2_VERSION "0.24.0" #define LIBGIT2_VER_MAJOR 0 -#define LIBGIT2_VER_MINOR 23 -#define LIBGIT2_VER_REVISION 4 +#define LIBGIT2_VER_MINOR 24 +#define LIBGIT2_VER_REVISION 0 #define LIBGIT2_VER_PATCH 0 -#define LIBGIT2_SOVERSION 23 +#define LIBGIT2_SOVERSION 24 #endif diff --git a/vendor/libgit2/libgit2.pc.in b/vendor/libgit2/libgit2.pc.in index 880266a30..329a560a7 100644 --- a/vendor/libgit2/libgit2.pc.in +++ b/vendor/libgit2/libgit2.pc.in @@ -6,7 +6,7 @@ Name: libgit2 Description: The git library, take 2 Version: @LIBGIT2_VERSION_STRING@ -Libs: -L${libdir} -lgit2 +Libs: -L"${libdir}" -lgit2 Libs.private: @LIBGIT2_PC_LIBS@ Requires.private: @LIBGIT2_PC_REQUIRES@ diff --git a/vendor/libgit2/script/cibuild.sh b/vendor/libgit2/script/cibuild.sh index de5df9ea8..00cde0ada 100755 --- a/vendor/libgit2/script/cibuild.sh +++ b/vendor/libgit2/script/cibuild.sh @@ -25,7 +25,7 @@ git daemon --listen=localhost --export-all --enable=receive-pack --base-path="$H export GITTEST_REMOTE_URL="git://localhost/test.git" # Run the test suite -ctest -V . || exit $? +ctest -V -R libgit2_clar || exit $? # Now that we've tested the raw git protocol, let's set up ssh to we # can do the push tests over it @@ -56,3 +56,7 @@ if [ -e ./libgit2_clar ]; then ./libgit2_clar -sonline::clone::cred_callback || exit $? fi fi + +export GITTEST_REMOTE_URL="https://github.com/libgit2/non-existent" +export GITTEST_REMOTE_USER="libgit2test" +ctest -V -R libgit2_clar-cred_callback diff --git a/vendor/libgit2/script/coverity.sh b/vendor/libgit2/script/coverity.sh index dcfeffc1d..7fe9eb4c7 100755 --- a/vendor/libgit2/script/coverity.sh +++ b/vendor/libgit2/script/coverity.sh @@ -33,6 +33,8 @@ if [ ! -d "$TOOL_BASE" ]; then ln -s "$TOOL_DIR" "$TOOL_BASE"/cov-analysis fi +cp script/user_nodefs.h "$TOOL_BASE"/cov-analysis/config/user_nodefs.h + COV_BUILD="$TOOL_BASE/cov-analysis/bin/cov-build" # Configure and build @@ -47,11 +49,24 @@ COVERITY_UNSUPPORTED=1 \ # Upload results tar czf libgit2.tgz cov-int SHA=$(git rev-parse --short HEAD) -curl \ - --form project=libgit2 \ + +HTML="$(curl \ + --silent \ + --write-out "\n%{http_code}" \ --form token="$COVERITY_TOKEN" \ --form email=bs@github.com \ --form file=@libgit2.tgz \ --form version="$SHA" \ --form description="Travis build" \ - http://scan5.coverity.com/cgi-bin/upload.py + https://scan.coverity.com/builds?project=libgit2)" +# Body is everything up to the last line +BODY="$(echo "$HTML" | head -n-1)" +# Status code is the last line +STATUS_CODE="$(echo "$HTML" | tail -n1)" + +echo "${BODY}" + +if [ "${STATUS_CODE}" != "201" ]; then + echo "Received error code ${STATUS_CODE} from Coverity" + exit 1 +fi diff --git a/vendor/libgit2/script/install-deps-osx.sh b/vendor/libgit2/script/install-deps-osx.sh index c2e0162d8..5510379d4 100755 --- a/vendor/libgit2/script/install-deps-osx.sh +++ b/vendor/libgit2/script/install-deps-osx.sh @@ -2,4 +2,5 @@ set -x -brew install libssh2 cmake +brew update +brew install libssh2 diff --git a/vendor/libgit2/script/user_nodefs.h b/vendor/libgit2/script/user_nodefs.h new file mode 100644 index 000000000..3c06a706d --- /dev/null +++ b/vendor/libgit2/script/user_nodefs.h @@ -0,0 +1,34 @@ +/* + * Copyright (C) the libgit2 contributors. All rights reserved. + * + * This file is part of libgit2, distributed under the GNU GPL v2 with + * a Linking Exception. For full terms see the included COPYING file. + */ + +#nodef GITERR_CHECK_ALLOC(ptr) if (ptr == NULL) { __coverity_panic__(); } +#nodef GITERR_CHECK_ALLOC_BUF(buf) if (buf == NULL || git_buf_oom(buf)) { __coverity_panic__(); } + +#nodef GITERR_CHECK_ALLOC_ADD(out, one, two) \ + if (GIT_ADD_SIZET_OVERFLOW(out, one, two)) { __coverity_panic__(); } + +#nodef GITERR_CHECK_ALLOC_ADD3(out, one, two, three) \ + if (GIT_ADD_SIZET_OVERFLOW(out, one, two) || \ + GIT_ADD_SIZET_OVERFLOW(out, *(out), three)) { __coverity_panic__(); } + +#nodef GITERR_CHECK_ALLOC_ADD4(out, one, two, three, four) \ + if (GIT_ADD_SIZET_OVERFLOW(out, one, two) || \ + GIT_ADD_SIZET_OVERFLOW(out, *(out), three) || \ + GIT_ADD_SIZET_OVERFLOW(out, *(out), four)) { __coverity_panic__(); } + +#nodef GITERR_CHECK_ALLOC_MULTIPLY(out, nelem, elsize) \ + if (GIT_MULTIPLY_SIZET_OVERFLOW(out, nelem, elsize)) { __coverity_panic__(); } + +#nodef GITERR_CHECK_VERSION(S,V,N) if (giterr__check_version(S,V,N) < 0) { __coverity_panic__(); } + +#nodef LOOKS_LIKE_DRIVE_PREFIX(S) (strlen(S) >= 2 && git__isalpha((S)[0]) && (S)[1] == ':') + +#nodef git_vector_foreach(v, iter, elem) \ + for ((iter) = 0; (v)->contents != NULL && (iter) < (v)->length && ((elem) = (v)->contents[(iter)], 1); (iter)++ ) + +#nodef git_vector_rforeach(v, iter, elem) \ + for ((iter) = (v)->length - 1; (v)->contents != NULL && (iter) < SIZE_MAX && ((elem) = (v)->contents[(iter)], 1); (iter)-- ) diff --git a/vendor/libgit2/src/annotated_commit.c b/vendor/libgit2/src/annotated_commit.c index 3f2d2ed17..e53b95dee 100644 --- a/vendor/libgit2/src/annotated_commit.c +++ b/vendor/libgit2/src/annotated_commit.c @@ -7,12 +7,16 @@ #include "common.h" #include "annotated_commit.h" +#include "refs.h" +#include "cache.h" #include "git2/commit.h" #include "git2/refs.h" #include "git2/repository.h" #include "git2/annotated_commit.h" #include "git2/revparse.h" +#include "git2/tree.h" +#include "git2/index.h" static int annotated_commit_init( git_annotated_commit **out, @@ -22,14 +26,17 @@ static int annotated_commit_init( const char *remote_url) { git_annotated_commit *annotated_commit; + git_commit *commit = NULL; int error = 0; assert(out && id); *out = NULL; - annotated_commit = git__calloc(1, sizeof(git_annotated_commit)); - GITERR_CHECK_ALLOC(annotated_commit); + if ((error = git_commit_lookup(&commit, repo, id)) < 0 || + (error = git_annotated_commit_from_commit(&annotated_commit, + commit)) < 0) + goto done; if (ref_name) { annotated_commit->ref_name = git__strdup(ref_name); @@ -41,15 +48,10 @@ static int annotated_commit_init( GITERR_CHECK_ALLOC(annotated_commit->remote_url); } - git_oid_fmt(annotated_commit->id_str, id); - annotated_commit->id_str[GIT_OID_HEXSZ] = '\0'; - - if ((error = git_commit_lookup(&annotated_commit->commit, repo, id)) < 0) { - git_annotated_commit_free(annotated_commit); - return error; - } - *out = annotated_commit; + +done: + git_commit_free(commit); return error; } @@ -75,6 +77,51 @@ int git_annotated_commit_from_ref( return error; } +int git_annotated_commit_from_head( + git_annotated_commit **out, + git_repository *repo) +{ + git_reference *head; + int error; + + assert(out && repo); + + *out = NULL; + + if ((error = git_reference_lookup(&head, repo, GIT_HEAD_FILE)) < 0) + return -1; + + error = git_annotated_commit_from_ref(out, repo, head); + + git_reference_free(head); + return error; +} + +int git_annotated_commit_from_commit( + git_annotated_commit **out, + git_commit *commit) +{ + git_annotated_commit *annotated_commit; + + assert(out && commit); + + *out = NULL; + + annotated_commit = git__calloc(1, sizeof(git_annotated_commit)); + GITERR_CHECK_ALLOC(annotated_commit); + + annotated_commit->type = GIT_ANNOTATED_COMMIT_REAL; + + git_cached_obj_incref(commit); + annotated_commit->commit = commit; + + git_oid_fmt(annotated_commit->id_str, git_commit_id(commit)); + annotated_commit->id_str[GIT_OID_HEXSZ] = '\0'; + + *out = annotated_commit; + return 0; +} + int git_annotated_commit_lookup( git_annotated_commit **out, git_repository *repo, @@ -136,14 +183,20 @@ void git_annotated_commit_free(git_annotated_commit *annotated_commit) if (annotated_commit == NULL) return; - if (annotated_commit->commit != NULL) - git_commit_free(annotated_commit->commit); - - if (annotated_commit->ref_name != NULL) - git__free(annotated_commit->ref_name); - - if (annotated_commit->remote_url != NULL) - git__free(annotated_commit->remote_url); + switch (annotated_commit->type) { + case GIT_ANNOTATED_COMMIT_REAL: + git_commit_free(annotated_commit->commit); + git_tree_free(annotated_commit->tree); + git__free(annotated_commit->ref_name); + git__free(annotated_commit->remote_url); + break; + case GIT_ANNOTATED_COMMIT_VIRTUAL: + git_index_free(annotated_commit->index); + git_array_clear(annotated_commit->parents); + break; + default: + abort(); + } git__free(annotated_commit); } diff --git a/vendor/libgit2/src/annotated_commit.h b/vendor/libgit2/src/annotated_commit.h index e873184ae..cbb88fd22 100644 --- a/vendor/libgit2/src/annotated_commit.h +++ b/vendor/libgit2/src/annotated_commit.h @@ -7,11 +7,31 @@ #ifndef INCLUDE_annotated_commit_h__ #define INCLUDE_annotated_commit_h__ +#include "oidarray.h" + #include "git2/oid.h" -/** Internal structure for merge inputs */ +typedef enum { + GIT_ANNOTATED_COMMIT_REAL = 1, + GIT_ANNOTATED_COMMIT_VIRTUAL = 2, +} git_annotated_commit_t; + +/** + * Internal structure for merge inputs. An annotated commit is generally + * "real" and backed by an actual commit in the repository, but merge will + * internally create "virtual" commits that are in-memory intermediate + * commits backed by an index. + */ struct git_annotated_commit { + git_annotated_commit_t type; + + /* real commit */ git_commit *commit; + git_tree *tree; + + /* virtual commit structure */ + git_index *index; + git_array_oid_t parents; char *ref_name; char *remote_url; @@ -19,4 +39,9 @@ struct git_annotated_commit { char id_str[GIT_OID_HEXSZ+1]; }; +extern int git_annotated_commit_from_head(git_annotated_commit **out, + git_repository *repo); +extern int git_annotated_commit_from_commit(git_annotated_commit **out, + git_commit *commit); + #endif diff --git a/vendor/libgit2/src/array.h b/vendor/libgit2/src/array.h index 7cd9b7153..490e6be20 100644 --- a/vendor/libgit2/src/array.h +++ b/vendor/libgit2/src/array.h @@ -82,4 +82,44 @@ GIT_INLINE(void *) git_array_grow(void *_a, size_t item_size) #define git_array_valid_index(a, i) ((i) < (a).size) +#define git_array_foreach(a, i, element) \ + for ((i) = 0; (i) < (a).size && ((element) = &(a).ptr[(i)]); (i)++) + + +GIT_INLINE(int) git_array__search( + size_t *out, + void *array_ptr, + size_t item_size, + size_t array_len, + int (*compare)(const void *, const void *), + const void *key) +{ + size_t lim; + unsigned char *part, *array = array_ptr, *base = array_ptr; + int cmp; + + for (lim = array_len; lim != 0; lim >>= 1) { + part = base + (lim >> 1) * item_size; + cmp = (*compare)(key, part); + + if (cmp == 0) { + base = part; + break; + } + if (cmp > 0) { /* key > p; take right partition */ + base = part + 1 * item_size; + lim--; + } /* else take left partition */ + } + + if (out) + *out = (base - array) / item_size; + + return (cmp == 0) ? 0 : GIT_ENOTFOUND; +} + +#define git_array_search(out, a, cmp, key) \ + git_array__search(out, (a).ptr, sizeof(*(a).ptr), (a).size, \ + (cmp), (key)) + #endif diff --git a/vendor/libgit2/src/attr_file.c b/vendor/libgit2/src/attr_file.c index 89706865a..11d149358 100644 --- a/vendor/libgit2/src/attr_file.c +++ b/vendor/libgit2/src/attr_file.c @@ -35,11 +35,7 @@ int git_attr_file__new( return -1; } - if (git_pool_init(&attrs->pool, 1, 0) < 0) { - attr_file_free(attrs); - return -1; - } - + git_pool_init(&attrs->pool, 1); GIT_REFCOUNT_INC(attrs); attrs->entry = entry; attrs->source = source; @@ -127,7 +123,7 @@ int git_attr_file__load( break; } case GIT_ATTR_FILE__FROM_FILE: { - int fd; + int fd = -1; /* For open or read errors, pretend that we got ENOTFOUND. */ /* TODO: issue warning when warning API is available */ @@ -137,7 +133,8 @@ int git_attr_file__load( (fd = git_futils_open_ro(entry->fullpath)) < 0 || (error = git_futils_readbuffer_fd(&content, fd, (size_t)st.st_size)) < 0) nonexistent = true; - else + + if (fd >= 0) p_close(fd); break; diff --git a/vendor/libgit2/src/attrcache.c b/vendor/libgit2/src/attrcache.c index 5bc260460..a57110684 100644 --- a/vendor/libgit2/src/attrcache.c +++ b/vendor/libgit2/src/attrcache.c @@ -388,10 +388,11 @@ int git_attr_cache__do_init(git_repository *repo) * hashtable for attribute macros, and string pool */ if ((ret = git_strmap_alloc(&cache->files)) < 0 || - (ret = git_strmap_alloc(&cache->macros)) < 0 || - (ret = git_pool_init(&cache->pool, 1, 0)) < 0) + (ret = git_strmap_alloc(&cache->macros)) < 0) goto cancel; + git_pool_init(&cache->pool, 1); + cache = git__compare_and_swap(&repo->attrcache, NULL, cache); if (cache) goto cancel; /* raced with another thread, free this but no error */ diff --git a/vendor/libgit2/src/blame.c b/vendor/libgit2/src/blame.c index 08a90dcfd..2c8584ba5 100644 --- a/vendor/libgit2/src/blame.c +++ b/vendor/libgit2/src/blame.c @@ -23,8 +23,8 @@ static int hunk_byfinalline_search_cmp(const void *key, const void *entry) git_blame_hunk *hunk = (git_blame_hunk*)entry; size_t lineno = *(size_t*)key; - size_t lines_in_hunk = (size_t)hunk->lines_in_hunk; - size_t final_start_line_number = (size_t)hunk->final_start_line_number; + size_t lines_in_hunk = hunk->lines_in_hunk; + size_t final_start_line_number = hunk->final_start_line_number; if (lineno < final_start_line_number) return -1; @@ -44,7 +44,7 @@ static int hunk_cmp(const void *_a, const void *_b) static bool hunk_ends_at_or_before_line(git_blame_hunk *hunk, size_t line) { - return line >= (size_t)(hunk->final_start_line_number + hunk->lines_in_hunk - 1); + return line >= (hunk->final_start_line_number + hunk->lines_in_hunk - 1); } static bool hunk_starts_at_or_after_line(git_blame_hunk *hunk, size_t line) @@ -53,9 +53,9 @@ static bool hunk_starts_at_or_after_line(git_blame_hunk *hunk, size_t line) } static git_blame_hunk* new_hunk( - uint16_t start, - uint16_t lines, - uint16_t orig_start, + size_t start, + size_t lines, + size_t orig_start, const char *path) { git_blame_hunk *hunk = git__calloc(1, sizeof(git_blame_hunk)); @@ -166,9 +166,9 @@ const git_blame_hunk *git_blame_get_hunk_byindex(git_blame *blame, uint32_t inde return (git_blame_hunk*)git_vector_get(&blame->hunks, index); } -const git_blame_hunk *git_blame_get_hunk_byline(git_blame *blame, uint32_t lineno) +const git_blame_hunk *git_blame_get_hunk_byline(git_blame *blame, size_t lineno) { - size_t i, new_lineno = (size_t)lineno; + size_t i, new_lineno = lineno; assert(blame); if (!git_vector_bsearch2(&i, &blame->hunks, hunk_byfinalline_search_cmp, &new_lineno)) { @@ -178,7 +178,7 @@ const git_blame_hunk *git_blame_get_hunk_byline(git_blame *blame, uint32_t linen return NULL; } -static void normalize_options( +static int normalize_options( git_blame_options *out, const git_blame_options *in, git_repository *repo) @@ -190,7 +190,9 @@ static void normalize_options( /* No newest_commit => HEAD */ if (git_oid_iszero(&out->newest_commit)) { - git_reference_name_to_id(&out->newest_commit, repo, "HEAD"); + if (git_reference_name_to_id(&out->newest_commit, repo, "HEAD") < 0) { + return -1; + } } /* min_line 0 really means 1 */ @@ -204,6 +206,8 @@ static void normalize_options( out->flags |= GIT_BLAME_TRACK_COPIES_SAME_COMMIT_MOVES; if (out->flags & GIT_BLAME_TRACK_COPIES_SAME_COMMIT_MOVES) out->flags |= GIT_BLAME_TRACK_COPIES_SAME_FILE; + + return 0; } static git_blame_hunk *split_hunk_in_vector( @@ -223,8 +227,8 @@ static git_blame_hunk *split_hunk_in_vector( } new_line_count = hunk->lines_in_hunk - rel_line; - nh = new_hunk((uint16_t)(hunk->final_start_line_number+rel_line), (uint16_t)new_line_count, - (uint16_t)(hunk->orig_start_line_number+rel_line), hunk->orig_path); + nh = new_hunk(hunk->final_start_line_number + rel_line, new_line_count, + hunk->orig_start_line_number + rel_line, hunk->orig_path); if (!nh) return NULL; @@ -233,7 +237,7 @@ static git_blame_hunk *split_hunk_in_vector( git_oid_cpy(&nh->orig_commit_id, &hunk->orig_commit_id); /* Adjust hunk that was split */ - hunk->lines_in_hunk -= (uint16_t)new_line_count; + hunk->lines_in_hunk -= new_line_count; git_vector_insert_sorted(vec, nh, NULL); { git_blame_hunk *ret = return_new ? nh : hunk; @@ -362,7 +366,8 @@ int git_blame_file( git_blame *blame = NULL; assert(out && repo && path); - normalize_options(&normOptions, options, repo); + if ((error = normalize_options(&normOptions, options, repo)) < 0) + goto on_error; blame = git_blame__alloc(repo, normOptions, path); GITERR_CHECK_ALLOC(blame); @@ -442,7 +447,7 @@ static int buffer_line_cb( } else { /* Create a new buffer-blame hunk with this line */ shift_hunks_by(&blame->hunks, blame->current_diff_line, 1); - blame->current_hunk = new_hunk((uint16_t)blame->current_diff_line, 1, 0, blame->path); + blame->current_hunk = new_hunk(blame->current_diff_line, 1, 0, blame->path); GITERR_CHECK_ALLOC(blame->current_hunk); git_vector_insert_sorted(&blame->hunks, blame->current_hunk, NULL); diff --git a/vendor/libgit2/src/blame.h b/vendor/libgit2/src/blame.h index 7e23de808..d8db8d5c1 100644 --- a/vendor/libgit2/src/blame.h +++ b/vendor/libgit2/src/blame.h @@ -31,10 +31,10 @@ typedef struct git_blame__entry { /* the first line of this group in the final image; * internally all line numbers are 0 based. */ - int lno; + size_t lno; /* how many lines this group has */ - int num_lines; + size_t num_lines; /* the commit that introduced this group into the final image */ git_blame__origin *suspect; @@ -51,7 +51,7 @@ typedef struct git_blame__entry { /* the line number of the first line of this group in the * suspect's file; internally all line numbers are 0 based. */ - int s_lno; + size_t s_lno; /* how significant this entry is -- cached to avoid * scanning the lines over and over. diff --git a/vendor/libgit2/src/blame_git.c b/vendor/libgit2/src/blame_git.c index 67bae2384..700207edb 100644 --- a/vendor/libgit2/src/blame_git.c +++ b/vendor/libgit2/src/blame_git.c @@ -93,18 +93,25 @@ static bool same_suspect(git_blame__origin *a, git_blame__origin *b) } /* find the line number of the last line the target is suspected for */ -static int find_last_in_target(git_blame *blame, git_blame__origin *target) +static bool find_last_in_target(size_t *out, git_blame *blame, git_blame__origin *target) { git_blame__entry *e; - int last_in_target = -1; + size_t last_in_target = 0; + bool found = false; + + *out = 0; for (e=blame->ent; e; e=e->next) { if (e->guilty || !same_suspect(e->suspect, target)) continue; - if (last_in_target < e->s_lno + e->num_lines) + if (last_in_target < e->s_lno + e->num_lines) { + found = true; last_in_target = e->s_lno + e->num_lines; + } } - return last_in_target; + + *out = last_in_target; + return found; } /* @@ -122,9 +129,9 @@ static int find_last_in_target(git_blame *blame, git_blame__origin *target) * to be blamed for the parent, and after that portion. */ static void split_overlap(git_blame__entry *split, git_blame__entry *e, - int tlno, int plno, int same, git_blame__origin *parent) + size_t tlno, size_t plno, size_t same, git_blame__origin *parent) { - int chunk_end_lno; + size_t chunk_end_lno; if (e->s_lno < tlno) { /* there is a pre-chunk part not blamed on the parent */ @@ -265,9 +272,9 @@ static void decref_split(git_blame__entry *split) static void blame_overlap( git_blame *blame, git_blame__entry *e, - int tlno, - int plno, - int same, + size_t tlno, + size_t plno, + size_t same, git_blame__origin *parent) { git_blame__entry split[3] = {{0}}; @@ -285,9 +292,9 @@ static void blame_overlap( */ static void blame_chunk( git_blame *blame, - int tlno, - int plno, - int same, + size_t tlno, + size_t plno, + size_t same, git_blame__origin *target, git_blame__origin *parent) { @@ -314,7 +321,7 @@ static int my_emit( blame_chunk(d->blame, d->tlno, d->plno, start_b, d->target, d->parent); d->plno = start_a + count_a; d->tlno = start_b + count_b; - + return 0; } @@ -376,12 +383,11 @@ static int pass_blame_to_parent( git_blame__origin *target, git_blame__origin *parent) { - int last_in_target; + size_t last_in_target; mmfile_t file_p, file_o; blame_chunk_cb_data d = { blame, target, parent, 0, 0 }; - last_in_target = find_last_in_target(blame, target); - if (last_in_target < 0) + if (!find_last_in_target(&last_in_target, blame, target)) return 1; /* nothing remains for this target */ fill_origin_blob(parent, &file_p); @@ -519,7 +525,8 @@ static int pass_blame(git_blame *blame, git_blame__origin *origin, uint32_t opt) if (sg_origin[i]) continue; - git_commit_parent(&p, origin->commit, i); + if ((error = git_commit_parent(&p, origin->commit, i)) < 0) + goto finish; porigin = find_origin(blame, p, origin); if (!porigin) diff --git a/vendor/libgit2/src/branch.c b/vendor/libgit2/src/branch.c index 791d55106..0dcc14c29 100644 --- a/vendor/libgit2/src/branch.c +++ b/vendor/libgit2/src/branch.c @@ -155,18 +155,7 @@ int git_branch_delete(git_reference *branch) git_reference_owner(branch), git_buf_cstr(&config_section), NULL) < 0) goto on_error; - if (git_reference_delete(branch) < 0) - goto on_error; - - if ((error = git_reflog_delete(git_reference_owner(branch), git_reference_name(branch))) < 0) { - if (error == GIT_ENOTFOUND) { - giterr_clear(); - error = 0; - } - goto on_error; - } - - error = 0; + error = git_reference_delete(branch); on_error: git_buf_free(&config_section); diff --git a/vendor/libgit2/src/checkout.c b/vendor/libgit2/src/checkout.c index 12e308257..deeee62e0 100644 --- a/vendor/libgit2/src/checkout.c +++ b/vendor/libgit2/src/checkout.c @@ -200,8 +200,7 @@ static bool checkout_is_workdir_modified( * out.) */ if ((ie = git_index_get_bypath(data->index, wditem->path, 0)) != NULL) { - if (wditem->mtime.seconds == ie->mtime.seconds && - wditem->mtime.nanoseconds == ie->mtime.nanoseconds && + if (git_index_time_eq(&wditem->mtime, &ie->mtime) && wditem->file_size == ie->file_size) return !is_workdir_base_or_new(&ie->id, baseitem, newitem); } @@ -1227,7 +1226,7 @@ static int checkout_verify_paths( int action, git_diff_delta *delta) { - unsigned int flags = GIT_PATH_REJECT_DEFAULTS | GIT_PATH_REJECT_DOT_GIT; + unsigned int flags = GIT_PATH_REJECT_WORKDIR_DEFAULTS; if (action & CHECKOUT_ACTION__REMOVE) { if (!git_path_isvalid(repo, delta->old_file.path, flags)) { @@ -1255,11 +1254,13 @@ static int checkout_get_actions( int error = 0, act; const git_index_entry *wditem; git_vector pathspec = GIT_VECTOR_INIT, *deltas; - git_pool pathpool = GIT_POOL_INIT_STRINGPOOL; + git_pool pathpool; git_diff_delta *delta; size_t i, *counts = NULL; uint32_t *actions = NULL; + git_pool_init(&pathpool, 1); + if (data->opts.paths.count > 0 && git_pathspec__vinit(&pathspec, &data->opts.paths, &pathpool) < 0) return -1; @@ -1367,7 +1368,7 @@ static int checkout_mkdir( mkdir_opts.dir_map = data->mkdir_map; mkdir_opts.pool = &data->pool; - error = git_futils_mkdir_ext( + error = git_futils_mkdir_relative( path, base, mode, flags, &mkdir_opts); data->perfdata.mkdir_calls += mkdir_opts.perfdata.mkdir_calls; @@ -1486,8 +1487,10 @@ static int blob_content_to_file( if (!data->opts.disable_filters && (error = git_filter_list__load_ext( &fl, data->repo, blob, hint_path, - GIT_FILTER_TO_WORKTREE, &filter_opts))) + GIT_FILTER_TO_WORKTREE, &filter_opts))) { + p_close(fd); return error; + } /* setup the writer */ memset(&writer, 0, sizeof(struct checkout_stream)); @@ -2439,10 +2442,11 @@ static int checkout_data_init( git_config_entry_free(conflict_style); } + git_pool_init(&data->pool, 1); + if ((error = git_vector_init(&data->removes, 0, git__strcmp_cb)) < 0 || (error = git_vector_init(&data->remove_conflicts, 0, NULL)) < 0 || (error = git_vector_init(&data->update_conflicts, 0, NULL)) < 0 || - (error = git_pool_init(&data->pool, 1, 0)) < 0 || (error = git_buf_puts(&data->path, data->opts.target_directory)) < 0 || (error = git_path_to_dir(&data->path)) < 0 || (error = git_strmap_alloc(&data->mkdir_map)) < 0) @@ -2469,11 +2473,12 @@ int git_checkout_iterator( { int error = 0; git_iterator *baseline = NULL, *workdir = NULL; + git_iterator_options baseline_opts = GIT_ITERATOR_OPTIONS_INIT, + workdir_opts = GIT_ITERATOR_OPTIONS_INIT; checkout_data data = {0}; git_diff_options diff_opts = GIT_DIFF_OPTIONS_INIT; uint32_t *actions = NULL; size_t *counts = NULL; - git_iterator_flag_t iterflags = 0; /* initialize structures and options */ error = checkout_data_init(&data, target, opts); @@ -2497,25 +2502,31 @@ int git_checkout_iterator( /* set up iterators */ - iterflags = git_iterator_ignore_case(target) ? + workdir_opts.flags = git_iterator_ignore_case(target) ? GIT_ITERATOR_IGNORE_CASE : GIT_ITERATOR_DONT_IGNORE_CASE; + workdir_opts.flags |= GIT_ITERATOR_DONT_AUTOEXPAND; + workdir_opts.start = data.pfx; + workdir_opts.end = data.pfx; if ((error = git_iterator_reset(target, data.pfx, data.pfx)) < 0 || (error = git_iterator_for_workdir_ext( &workdir, data.repo, data.opts.target_directory, index, NULL, - iterflags | GIT_ITERATOR_DONT_AUTOEXPAND, - data.pfx, data.pfx)) < 0) + &workdir_opts)) < 0) goto cleanup; + baseline_opts.flags = git_iterator_ignore_case(target) ? + GIT_ITERATOR_IGNORE_CASE : GIT_ITERATOR_DONT_IGNORE_CASE; + baseline_opts.start = data.pfx; + baseline_opts.end = data.pfx; + if (data.opts.baseline_index) { if ((error = git_iterator_for_index( - &baseline, data.opts.baseline_index, - iterflags, data.pfx, data.pfx)) < 0) + &baseline, git_index_owner(data.opts.baseline_index), + data.opts.baseline_index, &baseline_opts)) < 0) goto cleanup; } else { if ((error = git_iterator_for_tree( - &baseline, data.opts.baseline, - iterflags, data.pfx, data.pfx)) < 0) + &baseline, data.opts.baseline, &baseline_opts)) < 0) goto cleanup; } @@ -2623,7 +2634,7 @@ int git_checkout_index( return error; GIT_REFCOUNT_INC(index); - if (!(error = git_iterator_for_index(&index_i, index, 0, NULL, NULL))) + if (!(error = git_iterator_for_index(&index_i, repo, index, NULL))) error = git_checkout_iterator(index_i, index, opts); if (owned) @@ -2644,6 +2655,7 @@ int git_checkout_tree( git_index *index; git_tree *tree = NULL; git_iterator *tree_i = NULL; + git_iterator_options iter_opts = GIT_ITERATOR_OPTIONS_INIT; if (!treeish && !repo) { giterr_set(GITERR_CHECKOUT, @@ -2679,7 +2691,12 @@ int git_checkout_tree( if ((error = git_repository_index(&index, repo)) < 0) return error; - if (!(error = git_iterator_for_tree(&tree_i, tree, 0, NULL, NULL))) + if ((opts->checkout_strategy & GIT_CHECKOUT_DISABLE_PATHSPEC_MATCH)) { + iter_opts.pathlist.count = opts->paths.count; + iter_opts.pathlist.strings = opts->paths.strings; + } + + if (!(error = git_iterator_for_tree(&tree_i, tree, &iter_opts))) error = git_checkout_iterator(tree_i, index, opts); git_iterator_free(tree_i); diff --git a/vendor/libgit2/src/clone.c b/vendor/libgit2/src/clone.c index 070daf94d..6b4b7ae53 100644 --- a/vendor/libgit2/src/clone.c +++ b/vendor/libgit2/src/clone.c @@ -440,14 +440,14 @@ int git_clone( if (error != 0) { git_error_state last_error = {0}; - giterr_capture(&last_error, error); + giterr_state_capture(&last_error, error); git_repository_free(repo); repo = NULL; (void)git_futils_rmdir_r(local_path, NULL, rmdir_flags); - giterr_restore(&last_error); + giterr_state_restore(&last_error); } *out = repo; diff --git a/vendor/libgit2/src/commit.c b/vendor/libgit2/src/commit.c index 616f947db..5ed9c474d 100644 --- a/vendor/libgit2/src/commit.c +++ b/vendor/libgit2/src/commit.c @@ -17,6 +17,7 @@ #include "signature.h" #include "message.h" #include "refs.h" +#include "object.h" void git_commit__free(void *_commit) { @@ -31,11 +32,12 @@ void git_commit__free(void *_commit) git__free(commit->raw_message); git__free(commit->message_encoding); git__free(commit->summary); + git__free(commit->body); git__free(commit); } -int git_commit_create_from_callback( +static int git_commit__create_internal( git_oid *id, git_repository *repo, const char *update_ref, @@ -45,7 +47,8 @@ int git_commit_create_from_callback( const char *message, const git_oid *tree, git_commit_parent_callback parent_cb, - void *parent_payload) + void *parent_payload, + bool validate) { git_reference *ref = NULL; int error = 0, matched_parent = 0; @@ -57,6 +60,9 @@ int git_commit_create_from_callback( assert(id && repo && tree && parent_cb); + if (validate && !git_object__is_valid(repo, tree, GIT_OBJ_TREE)) + return -1; + if (update_ref) { error = git_reference_lookup_resolved(&ref, repo, update_ref, 10); if (error < 0 && error != GIT_ENOTFOUND) @@ -70,6 +76,11 @@ int git_commit_create_from_callback( git_oid__writebuf(&commit, "tree ", tree); while ((parent = parent_cb(i, parent_payload)) != NULL) { + if (validate && !git_object__is_valid(repo, parent, GIT_OBJ_COMMIT)) { + error = -1; + goto on_error; + } + git_oid__writebuf(&commit, "parent ", parent); if (i == 0 && current_id && git_oid_equal(current_id, parent)) matched_parent = 1; @@ -113,10 +124,26 @@ int git_commit_create_from_callback( on_error: git_buf_free(&commit); - giterr_set(GITERR_OBJECT, "Failed to create commit."); return -1; } +int git_commit_create_from_callback( + git_oid *id, + git_repository *repo, + const char *update_ref, + const git_signature *author, + const git_signature *committer, + const char *message_encoding, + const char *message, + const git_oid *tree, + git_commit_parent_callback parent_cb, + void *parent_payload) +{ + return git_commit__create_internal( + id, repo, update_ref, author, committer, message_encoding, message, + tree, parent_cb, parent_payload, true); +} + typedef struct { size_t total; va_list args; @@ -152,10 +179,10 @@ int git_commit_create_v( data.total = parent_count; va_start(data.args, parent_count); - error = git_commit_create_from_callback( + error = git_commit__create_internal( id, repo, update_ref, author, committer, message_encoding, message, git_tree_id(tree), - commit_parent_from_varargs, &data); + commit_parent_from_varargs, &data, false); va_end(data.args); return error; @@ -186,10 +213,10 @@ int git_commit_create_from_ids( { commit_parent_oids data = { parent_count, parents }; - return git_commit_create_from_callback( + return git_commit__create_internal( id, repo, update_ref, author, committer, message_encoding, message, tree, - commit_parent_from_ids, &data); + commit_parent_from_ids, &data, true); } typedef struct { @@ -226,10 +253,10 @@ int git_commit_create( assert(tree && git_tree_owner(tree) == repo); - return git_commit_create_from_callback( + return git_commit__create_internal( id, repo, update_ref, author, committer, message_encoding, message, git_tree_id(tree), - commit_parent_from_array, &data); + commit_parent_from_array, &data, false); } static const git_oid *commit_parent_for_amend(size_t curr, void *payload) @@ -289,9 +316,9 @@ int git_commit_amend( } } - error = git_commit_create_from_callback( + error = git_commit__create_internal( id, repo, NULL, author, committer, message_encoding, message, - &tree_id, commit_parent_for_amend, (void *)commit_to_amend); + &tree_id, commit_parent_for_amend, (void *)commit_to_amend, false); if (!error && update_ref) { error = git_reference__update_for_commit( @@ -431,22 +458,37 @@ const char *git_commit_summary(git_commit *commit) { git_buf summary = GIT_BUF_INIT; const char *msg, *space; + bool space_contains_newline = false; assert(commit); if (!commit->summary) { for (msg = git_commit_message(commit), space = NULL; *msg; ++msg) { - if (msg[0] == '\n' && (!msg[1] || msg[1] == '\n')) + char next_character = msg[0]; + /* stop processing at the end of the first paragraph */ + if (next_character == '\n' && (!msg[1] || msg[1] == '\n')) break; - else if (msg[0] == '\n') - git_buf_putc(&summary, ' '); - else if (git__isspace(msg[0])) - space = space ? space : msg; - else if (space) { - git_buf_put(&summary, space, (msg - space) + 1); - space = NULL; - } else - git_buf_putc(&summary, *msg); + /* record the beginning of contiguous whitespace runs */ + else if (git__isspace(next_character)) { + if(space == NULL) { + space = msg; + space_contains_newline = false; + } + space_contains_newline |= next_character == '\n'; + } + /* the next character is non-space */ + else { + /* process any recorded whitespace */ + if (space) { + if(space_contains_newline) + git_buf_putc(&summary, ' '); /* if the space contains a newline, collapse to ' ' */ + else + git_buf_put(&summary, space, (msg - space)); /* otherwise copy it */ + space = NULL; + } + /* copy the next character */ + git_buf_putc(&summary, next_character); + } } commit->summary = git_buf_detach(&summary); @@ -457,6 +499,33 @@ const char *git_commit_summary(git_commit *commit) return commit->summary; } +const char *git_commit_body(git_commit *commit) +{ + const char *msg, *end; + + assert(commit); + + if (!commit->body) { + /* search for end of summary */ + for (msg = git_commit_message(commit); *msg; ++msg) + if (msg[0] == '\n' && (!msg[1] || msg[1] == '\n')) + break; + + /* trim leading and trailing whitespace */ + for (; *msg; ++msg) + if (!git__isspace(*msg)) + break; + for (end = msg + strlen(msg) - 1; msg <= end; --end) + if (!git__isspace(*end)) + break; + + if (*msg) + commit->body = git__strndup(msg, end - msg + 1); + } + + return commit->body; +} + int git_commit_tree(git_tree **tree_out, const git_commit *commit) { assert(commit); @@ -521,17 +590,103 @@ int git_commit_nth_gen_ancestor( int git_commit_header_field(git_buf *out, const git_commit *commit, const char *field) { - const char *buf = commit->raw_header; - const char *h, *eol; + const char *eol, *buf = commit->raw_header; git_buf_sanitize(out); - while ((h = strchr(buf, '\n')) && h[1] != '\0' && h[1] != '\n') { + + while ((eol = strchr(buf, '\n'))) { + /* We can skip continuations here */ + if (buf[0] == ' ') { + buf = eol + 1; + continue; + } + + /* Skip until we find the field we're after */ + if (git__prefixcmp(buf, field)) { + buf = eol + 1; + continue; + } + + buf += strlen(field); + /* Check that we're not matching a prefix but the field itself */ + if (buf[0] != ' ') { + buf = eol + 1; + continue; + } + + buf++; /* skip the SP */ + + git_buf_put(out, buf, eol - buf); + if (git_buf_oom(out)) + goto oom; + + /* If the next line starts with SP, it's multi-line, we must continue */ + while (eol[1] == ' ') { + git_buf_putc(out, '\n'); + buf = eol + 2; + eol = strchr(buf, '\n'); + if (!eol) + goto malformed; + + git_buf_put(out, buf, eol - buf); + } + + if (git_buf_oom(out)) + goto oom; + + return 0; + } + + giterr_set(GITERR_OBJECT, "no such field '%s'", field); + return GIT_ENOTFOUND; + +malformed: + giterr_set(GITERR_OBJECT, "malformed header"); + return -1; +oom: + giterr_set_oom(); + return -1; +} + +int git_commit_extract_signature(git_buf *signature, git_buf *signed_data, git_repository *repo, git_oid *commit_id, const char *field) +{ + git_odb_object *obj; + git_odb *odb; + const char *buf; + const char *h, *eol; + int error; + + git_buf_sanitize(signature); + git_buf_sanitize(signed_data); + + if (!field) + field = "gpgsig"; + + if ((error = git_repository_odb__weakptr(&odb, repo)) < 0) + return error; + + if ((error = git_odb_read(&obj, odb, commit_id)) < 0) + return error; + + if (obj->cached.type != GIT_OBJ_COMMIT) { + giterr_set(GITERR_INVALID, "the requested type does not match the type in ODB"); + error = GIT_ENOTFOUND; + goto cleanup; + } + + buf = git_odb_object_data(obj); + + while ((h = strchr(buf, '\n')) && h[1] != '\0') { h++; - if (git__prefixcmp(h, field)) { + if (git__prefixcmp(buf, field)) { + if (git_buf_put(signed_data, buf, h - buf) < 0) + return -1; + buf = h; continue; } + h = buf; h += strlen(field); eol = strchr(h, '\n'); if (h[0] != ' ') { @@ -543,33 +698,44 @@ int git_commit_header_field(git_buf *out, const git_commit *commit, const char * h++; /* skip the SP */ - git_buf_put(out, h, eol - h); - if (git_buf_oom(out)) + git_buf_put(signature, h, eol - h); + if (git_buf_oom(signature)) goto oom; /* If the next line starts with SP, it's multi-line, we must continue */ while (eol[1] == ' ') { - git_buf_putc(out, '\n'); + git_buf_putc(signature, '\n'); h = eol + 2; eol = strchr(h, '\n'); if (!eol) goto malformed; - git_buf_put(out, h, eol - h); + git_buf_put(signature, h, eol - h); } - if (git_buf_oom(out)) + if (git_buf_oom(signature)) goto oom; - return 0; + git_odb_object_free(obj); + return git_buf_puts(signed_data, eol+1); } - return GIT_ENOTFOUND; + giterr_set(GITERR_OBJECT, "this commit is not signed"); + error = GIT_ENOTFOUND; + goto cleanup; malformed: giterr_set(GITERR_OBJECT, "malformed header"); - return -1; + error = -1; + goto cleanup; oom: giterr_set_oom(); - return -1; + error = -1; + goto cleanup; + +cleanup: + git_odb_object_free(obj); + git_buf_clear(signature); + git_buf_clear(signed_data); + return error; } diff --git a/vendor/libgit2/src/commit.h b/vendor/libgit2/src/commit.h index efb080b50..d01ac2b2f 100644 --- a/vendor/libgit2/src/commit.h +++ b/vendor/libgit2/src/commit.h @@ -28,6 +28,7 @@ struct git_commit { char *raw_header; char *summary; + char *body; }; void git_commit__free(void *commit); diff --git a/vendor/libgit2/src/commit_list.c b/vendor/libgit2/src/commit_list.c index 53612d514..28948c88b 100644 --- a/vendor/libgit2/src/commit_list.c +++ b/vendor/libgit2/src/commit_list.c @@ -47,7 +47,7 @@ git_commit_list *git_commit_list_insert_by_date(git_commit_list_node *item, git_ git_commit_list_node *git_commit_list_alloc_node(git_revwalk *walk) { - return (git_commit_list_node *)git_pool_malloc(&walk->commit_pool, COMMIT_ALLOC); + return (git_commit_list_node *)git_pool_mallocz(&walk->commit_pool, 1); } static int commit_error(git_commit_list_node *commit, const char *msg) diff --git a/vendor/libgit2/src/common.h b/vendor/libgit2/src/common.h index 9056deaae..9abd605cb 100644 --- a/vendor/libgit2/src/common.h +++ b/vendor/libgit2/src/common.h @@ -41,11 +41,16 @@ # include # include "win32/msvc-compat.h" # include "win32/mingw-compat.h" +# include "win32/win32-compat.h" # include "win32/error.h" # include "win32/version.h" # ifdef GIT_THREADS # include "win32/pthread.h" # endif +# if defined(GIT_MSVC_CRTDBG) +# include "win32/w32_stack.h" +# include "win32/w32_crtdbg_stacktrace.h" +# endif #else @@ -57,6 +62,12 @@ # endif #define GIT_STDLIB_CALL +#ifdef GIT_USE_STAT_ATIMESPEC +# define st_atim st_atimespec +# define st_ctim st_ctimespec +# define st_mtim st_mtimespec +#endif + # include #endif @@ -78,6 +89,11 @@ */ #define GITERR_CHECK_ALLOC(ptr) if (ptr == NULL) { return -1; } +/** + * Check a buffer allocation result, returning -1 if it failed. + */ +#define GITERR_CHECK_ALLOC_BUF(buf) if ((void *)(buf) == NULL || git_buf_oom(buf)) { return -1; } + /** * Check a return value and propagate result if non-zero. */ @@ -137,20 +153,25 @@ void giterr_system_set(int code); * Structure to preserve libgit2 error state */ typedef struct { - int error_code; + int error_code; + unsigned int oom : 1; git_error error_msg; } git_error_state; /** * Capture current error state to restore later, returning error code. - * If `error_code` is zero, this does nothing and returns zero. + * If `error_code` is zero, this does not clear the current error state. + * You must either restore this error state, or free it. */ -int giterr_capture(git_error_state *state, int error_code); +extern int giterr_state_capture(git_error_state *state, int error_code); /** * Restore error state to a previous value, returning saved error code. */ -int giterr_restore(git_error_state *state); +extern int giterr_state_restore(git_error_state *state); + +/** Free an error state. */ +extern void giterr_state_free(git_error_state *state); /** * Check a versioned structure for validity diff --git a/vendor/libgit2/src/config.c b/vendor/libgit2/src/config.c index 77cf573e6..f4d4cb2b9 100644 --- a/vendor/libgit2/src/config.c +++ b/vendor/libgit2/src/config.c @@ -13,6 +13,7 @@ #include "vector.h" #include "buf_text.h" #include "config_file.h" +#include "transaction.h" #if GIT_WIN32 # include #endif @@ -1085,6 +1086,12 @@ int git_config_find_system(git_buf *path) return git_sysdir_find_system_file(path, GIT_CONFIG_FILENAME_SYSTEM); } +int git_config_find_programdata(git_buf *path) +{ + git_buf_sanitize(path); + return git_sysdir_find_programdata_file(path, GIT_CONFIG_FILENAME_PROGRAMDATA); +} + int git_config__global_location(git_buf *buf) { const git_buf *paths; @@ -1132,6 +1139,10 @@ int git_config_open_default(git_config **out) error = git_config_add_file_ondisk(cfg, buf.ptr, GIT_CONFIG_LEVEL_SYSTEM, 0); + if (!error && !git_config_find_programdata(&buf)) + error = git_config_add_file_ondisk(cfg, buf.ptr, + GIT_CONFIG_LEVEL_PROGRAMDATA, 0); + git_buf_free(&buf); if (error) { @@ -1144,6 +1155,41 @@ int git_config_open_default(git_config **out) return error; } +int git_config_lock(git_transaction **out, git_config *cfg) +{ + int error; + git_config_backend *file; + file_internal *internal; + + internal = git_vector_get(&cfg->files, 0); + if (!internal || !internal->file) { + giterr_set(GITERR_CONFIG, "cannot lock; the config has no backends/files"); + return -1; + } + file = internal->file; + + if ((error = file->lock(file)) < 0) + return error; + + return git_transaction_config_new(out, cfg); +} + +int git_config_unlock(git_config *cfg, int commit) +{ + git_config_backend *file; + file_internal *internal; + + internal = git_vector_get(&cfg->files, 0); + if (!internal || !internal->file) { + giterr_set(GITERR_CONFIG, "cannot lock; the config has no backends/files"); + return -1; + } + + file = internal->file; + + return file->unlock(file, commit); +} + /*********** * Parsers ***********/ diff --git a/vendor/libgit2/src/config.h b/vendor/libgit2/src/config.h index f257cc90f..00c12b50d 100644 --- a/vendor/libgit2/src/config.h +++ b/vendor/libgit2/src/config.h @@ -12,6 +12,7 @@ #include "vector.h" #include "repository.h" +#define GIT_CONFIG_FILENAME_PROGRAMDATA "config" #define GIT_CONFIG_FILENAME_SYSTEM "gitconfig" #define GIT_CONFIG_FILENAME_GLOBAL ".gitconfig" #define GIT_CONFIG_FILENAME_XDG "config" @@ -88,4 +89,19 @@ extern int git_config__cvar( */ int git_config_lookup_map_enum(git_cvar_t *type_out, const char **str_out, const git_cvar_map *maps, size_t map_n, int enum_val); + +/** + * Unlock the backend with the highest priority + * + * Unlocking will allow other writers to updat the configuration + * file. Optionally, any changes performed since the lock will be + * applied to the configuration. + * + * @param cfg the configuration + * @param commit boolean which indicates whether to commit any changes + * done since locking + * @return 0 or an error code + */ +GIT_EXTERN(int) git_config_unlock(git_config *cfg, int commit); + #endif diff --git a/vendor/libgit2/src/config_cache.c b/vendor/libgit2/src/config_cache.c index c859ec148..dbea871b9 100644 --- a/vendor/libgit2/src/config_cache.c +++ b/vendor/libgit2/src/config_cache.c @@ -86,7 +86,8 @@ int git_config__cvar(int *out, git_config *config, git_cvar_cached cvar) struct map_data *data = &_cvar_maps[(int)cvar]; git_config_entry *entry; - git_config__lookup_entry(&entry, config, data->cvar_name, false); + if ((error = git_config__lookup_entry(&entry, config, data->cvar_name, false)) < 0) + return error; if (!entry) *out = data->default_value; diff --git a/vendor/libgit2/src/config_file.c b/vendor/libgit2/src/config_file.c index 52a5376bd..ca4345cc7 100644 --- a/vendor/libgit2/src/config_file.c +++ b/vendor/libgit2/src/config_file.c @@ -77,8 +77,7 @@ typedef struct git_config_file_iter { (iter) = (tmp)) struct reader { - time_t file_mtime; - size_t file_size; + git_oid checksum; char *file_path; git_buf buffer; char *read_ptr; @@ -105,6 +104,10 @@ typedef struct { git_array_t(struct reader) readers; + bool locked; + git_filebuf locked_buf; + git_buf locked_content; + char *file_path; } diskfile_backend; @@ -281,7 +284,7 @@ static int config_open(git_config_backend *cfg, git_config_level_t level) git_buf_init(&reader->buffer, 0); res = git_futils_readbuffer_updated( - &reader->buffer, b->file_path, &reader->file_mtime, &reader->file_size, NULL); + &reader->buffer, b->file_path, &reader->checksum, NULL); /* It's fine if the file doesn't exist */ if (res == GIT_ENOTFOUND) @@ -341,7 +344,7 @@ static int config_refresh(git_config_backend *cfg) reader = git_array_get(b->readers, i); error = git_futils_readbuffer_updated( &reader->buffer, reader->file_path, - &reader->file_mtime, &reader->file_size, &updated); + &reader->checksum, &updated); if (error < 0 && error != GIT_ENOTFOUND) return error; @@ -550,30 +553,15 @@ static int config_set_multivar( git_config_backend *cfg, const char *name, const char *regexp, const char *value) { diskfile_backend *b = (diskfile_backend *)cfg; - refcounted_strmap *map; - git_strmap *values; char *key; regex_t preg; int result; - khiter_t pos; assert(regexp); if ((result = git_config__normalize_name(name, &key)) < 0) return result; - map = refcounted_strmap_take(&b->header); - values = b->header.values->values; - - pos = git_strmap_lookup_index(values, key); - if (!git_strmap_valid_index(values, pos)) { - /* If we don't have it, behave like a normal set */ - result = config_set(cfg, name, value); - refcounted_strmap_free(map); - git__free(key); - return result; - } - result = regcomp(&preg, regexp, REG_EXTENDED); if (result != 0) { giterr_set_regex(&preg, result); @@ -588,7 +576,6 @@ static int config_set_multivar( result = config_refresh(cfg); out: - refcounted_strmap_free(map); git__free(key); regfree(&preg); @@ -685,6 +672,42 @@ static int config_snapshot(git_config_backend **out, git_config_backend *in) return git_config_file__snapshot(out, b); } +static int config_lock(git_config_backend *_cfg) +{ + diskfile_backend *cfg = (diskfile_backend *) _cfg; + int error; + + if ((error = git_filebuf_open(&cfg->locked_buf, cfg->file_path, 0, GIT_CONFIG_FILE_MODE)) < 0) + return error; + + error = git_futils_readbuffer(&cfg->locked_content, cfg->file_path); + if (error < 0 && error != GIT_ENOTFOUND) { + git_filebuf_cleanup(&cfg->locked_buf); + return error; + } + + cfg->locked = true; + return 0; + +} + +static int config_unlock(git_config_backend *_cfg, int success) +{ + diskfile_backend *cfg = (diskfile_backend *) _cfg; + int error = 0; + + if (success) { + git_filebuf_write(&cfg->locked_buf, cfg->locked_content.ptr, cfg->locked_content.size); + error = git_filebuf_commit(&cfg->locked_buf); + } + + git_filebuf_cleanup(&cfg->locked_buf); + git_buf_free(&cfg->locked_content); + cfg->locked = false; + + return error; +} + int git_config_file__ondisk(git_config_backend **out, const char *path) { diskfile_backend *backend; @@ -706,6 +729,8 @@ int git_config_file__ondisk(git_config_backend **out, const char *path) backend->header.parent.del_multivar = config_delete_multivar; backend->header.parent.iterator = config_iterator_new; backend->header.parent.snapshot = config_snapshot; + backend->header.parent.lock = config_lock; + backend->header.parent.unlock = config_unlock; backend->header.parent.free = backend_free; *out = (git_config_backend *)backend; @@ -750,6 +775,21 @@ static int config_delete_readonly(git_config_backend *cfg, const char *name) return config_error_readonly(); } +static int config_lock_readonly(git_config_backend *_cfg) +{ + GIT_UNUSED(_cfg); + + return config_error_readonly(); +} + +static int config_unlock_readonly(git_config_backend *_cfg, int success) +{ + GIT_UNUSED(_cfg); + GIT_UNUSED(success); + + return config_error_readonly(); +} + static void backend_readonly_free(git_config_backend *_backend) { diskfile_backend *backend = (diskfile_backend *)_backend; @@ -803,6 +843,8 @@ int git_config_file__snapshot(git_config_backend **out, diskfile_backend *in) backend->header.parent.del = config_delete_readonly; backend->header.parent.del_multivar = config_delete_multivar_readonly; backend->header.parent.iterator = config_iterator_new; + backend->header.parent.lock = config_lock_readonly; + backend->header.parent.unlock = config_unlock_readonly; backend->header.parent.free = backend_readonly_free; *out = (git_config_backend *)backend; @@ -974,6 +1016,11 @@ static int parse_section_header_ext(struct reader *reader, const char *line, con */ first_quote = strchr(line, '"'); + if (first_quote == NULL) { + set_parse_error(reader, 0, "Missing quotation marks in section header"); + return -1; + } + last_quote = strrchr(line, '"'); quoted_len = last_quote - first_quote; @@ -1425,7 +1472,7 @@ static int config_parse( int (*on_section)(struct reader **reader, const char *current_section, const char *line, size_t line_len, void *data), int (*on_variable)(struct reader **reader, const char *current_section, char *var_name, char *var_value, const char *line, size_t line_len, void *data), int (*on_comment)(struct reader **reader, const char *line, size_t line_len, void *data), - int (*on_eof)(struct reader **reader, void *data), + int (*on_eof)(struct reader **reader, const char *current_section, void *data), void *data) { char *current_section = NULL, *var_name, *var_value, *line_start; @@ -1476,7 +1523,7 @@ static int config_parse( } if (on_eof) - result = on_eof(&reader, data); + result = on_eof(&reader, current_section, data); git__free(current_section); return result; @@ -1559,7 +1606,7 @@ static int read_on_variable( git_buf_init(&r->buffer, 0); result = git_futils_readbuffer_updated( - &r->buffer, r->file_path, &r->file_mtime, &r->file_size, NULL); + &r->buffer, r->file_path, &r->checksum, NULL); if (result == 0) { result = config_read(parse_data->values, parse_data->cfg_file, r, parse_data->level, parse_data->depth+1); @@ -1602,7 +1649,7 @@ static int config_read(git_strmap *values, diskfile_backend *cfg_file, struct re return config_parse(reader, NULL, read_on_variable, NULL, NULL, &parse_data); } -static int write_section(git_filebuf *file, const char *key) +static int write_section(git_buf *fbuf, const char *key) { int result; const char *dot; @@ -1626,7 +1673,7 @@ static int write_section(git_filebuf *file, const char *key) if (git_buf_oom(&buf)) return -1; - result = git_filebuf_write(file, git_buf_cstr(&buf), buf.size); + result = git_buf_put(fbuf, git_buf_cstr(&buf), buf.size); git_buf_free(&buf); return result; @@ -1651,7 +1698,8 @@ static const char *quotes_for_value(const char *value) } struct write_data { - git_filebuf *file; + git_buf *buf; + git_buf buffered_comment; unsigned int in_section : 1, preg_replaced : 1; const char *section; @@ -1660,23 +1708,28 @@ struct write_data { const char *value; }; -static int write_line(struct write_data *write_data, const char *line, size_t line_len) +static int write_line_to(git_buf *buf, const char *line, size_t line_len) { - int result = git_filebuf_write(write_data->file, line, line_len); + int result = git_buf_put(buf, line, line_len); if (!result && line_len && line[line_len-1] != '\n') - result = git_filebuf_printf(write_data->file, "\n"); + result = git_buf_printf(buf, "\n"); return result; } +static int write_line(struct write_data *write_data, const char *line, size_t line_len) +{ + return write_line_to(write_data->buf, line, line_len); +} + static int write_value(struct write_data *write_data) { const char *q; int result; q = quotes_for_value(write_data->value); - result = git_filebuf_printf(write_data->file, + result = git_buf_printf(write_data->buf, "\t%s = %s%s%s\n", write_data->name, q, write_data->value, q); /* If we are updating a single name/value, we're done. Setting `value` @@ -1711,6 +1764,14 @@ static int write_on_section( write_data->in_section = strcmp(current_section, write_data->section) == 0; + /* + * If there were comments just before this section, dump them as well. + */ + if (!result) { + result = git_buf_put(write_data->buf, write_data->buffered_comment.ptr, write_data->buffered_comment.size); + git_buf_clear(&write_data->buffered_comment); + } + if (!result) result = write_line(write_data, line, line_len); @@ -1728,10 +1789,19 @@ static int write_on_variable( { struct write_data *write_data = (struct write_data *)data; bool has_matched = false; + int error; GIT_UNUSED(reader); GIT_UNUSED(current_section); + /* + * If there were comments just before this variable, let's dump them as well. + */ + if ((error = git_buf_put(write_data->buf, write_data->buffered_comment.ptr, write_data->buffered_comment.size)) < 0) + return error; + + git_buf_clear(&write_data->buffered_comment); + /* See if we are to update this name/value pair; first examine name */ if (write_data->in_section && strcasecmp(write_data->name, var_name) == 0) @@ -1766,23 +1836,34 @@ static int write_on_comment(struct reader **reader, const char *line, size_t lin GIT_UNUSED(reader); write_data = (struct write_data *)data; - return write_line(write_data, line, line_len); + return write_line_to(&write_data->buffered_comment, line, line_len); } -static int write_on_eof(struct reader **reader, void *data) +static int write_on_eof( + struct reader **reader, const char *current_section, void *data) { struct write_data *write_data = (struct write_data *)data; int result = 0; GIT_UNUSED(reader); + /* + * If we've buffered comments when reaching EOF, make sure to dump them. + */ + if ((result = git_buf_put(write_data->buf, write_data->buffered_comment.ptr, write_data->buffered_comment.size)) < 0) + return result; + /* If we are at the EOF and have not written our value (again, for a * simple name/value set, not a multivar) then we have never seen the * section in question and should create a new section and write the * value. */ if ((!write_data->preg || !write_data->preg_replaced) && write_data->value) { - if ((result = write_section(write_data->file, write_data->section)) == 0) + /* write the section header unless we're already in it */ + if (!current_section || strcmp(current_section, write_data->section)) + result = write_section(write_data->buf, write_data->section); + + if (!result) result = write_value(write_data); } @@ -1797,18 +1878,23 @@ static int config_write(diskfile_backend *cfg, const char *key, const regex_t *p int result; char *section, *name, *ldot; git_filebuf file = GIT_FILEBUF_INIT; + git_buf buf = GIT_BUF_INIT; struct reader *reader = git_array_get(cfg->readers, 0); struct write_data write_data; - /* Lock the file */ - if ((result = git_filebuf_open( - &file, cfg->file_path, 0, GIT_CONFIG_FILE_MODE)) < 0) { + if (cfg->locked) { + result = git_buf_puts(&reader->buffer, git_buf_cstr(&cfg->locked_content)); + } else { + /* Lock the file */ + if ((result = git_filebuf_open( + &file, cfg->file_path, GIT_FILEBUF_HASH_CONTENTS, GIT_CONFIG_FILE_MODE)) < 0) { git_buf_free(&reader->buffer); return result; - } + } - /* We need to read in our own config file */ - result = git_futils_readbuffer(&reader->buffer, cfg->file_path); + /* We need to read in our own config file */ + result = git_futils_readbuffer(&reader->buffer, cfg->file_path); + } /* Initialise the reading position */ if (result == GIT_ENOTFOUND) { @@ -1827,7 +1913,8 @@ static int config_write(diskfile_backend *cfg, const char *key, const regex_t *p name = ldot + 1; section = git__strndup(key, ldot - key); - write_data.file = &file; + write_data.buf = &buf; + git_buf_init(&write_data.buffered_comment, 0); write_data.section = section; write_data.in_section = 0; write_data.preg_replaced = 0; @@ -1837,19 +1924,25 @@ static int config_write(diskfile_backend *cfg, const char *key, const regex_t *p result = config_parse(reader, write_on_section, write_on_variable, write_on_comment, write_on_eof, &write_data); git__free(section); + git_buf_free(&write_data.buffered_comment); if (result < 0) { git_filebuf_cleanup(&file); goto done; } - /* refresh stats - if this errors, then commit will error too */ - (void)git_filebuf_stats(&reader->file_mtime, &reader->file_size, &file); - - result = git_filebuf_commit(&file); - git_buf_free(&reader->buffer); + if (cfg->locked) { + size_t len = buf.asize; + /* Update our copy with the modified contents */ + git_buf_free(&cfg->locked_content); + git_buf_attach(&cfg->locked_content, git_buf_detach(&buf), len); + } else { + git_filebuf_write(&file, git_buf_cstr(&buf), git_buf_len(&buf)); + result = git_filebuf_commit(&file); + } done: + git_buf_free(&buf); git_buf_free(&reader->buffer); return result; } diff --git a/vendor/libgit2/src/config_file.h b/vendor/libgit2/src/config_file.h index 0d8bf740f..1c52892c3 100644 --- a/vendor/libgit2/src/config_file.h +++ b/vendor/libgit2/src/config_file.h @@ -55,6 +55,16 @@ GIT_INLINE(int) git_config_file_foreach_match( return git_config_backend_foreach_match(cfg, regexp, fn, data); } +GIT_INLINE(int) git_config_file_lock(git_config_backend *cfg) +{ + return cfg->lock(cfg); +} + +GIT_INLINE(int) git_config_file_unlock(git_config_backend *cfg, int success) +{ + return cfg->unlock(cfg, success); +} + extern int git_config_file_normalize_section(char *start, char *end); #endif diff --git a/vendor/libgit2/src/crlf.c b/vendor/libgit2/src/crlf.c index f391137c1..5d7510ac7 100644 --- a/vendor/libgit2/src/crlf.c +++ b/vendor/libgit2/src/crlf.c @@ -346,7 +346,7 @@ static int crlf_apply( /* initialize payload in case `check` was bypassed */ if (!*payload) { int error = crlf_check(self, payload, src, NULL); - if (error < 0 && error != GIT_PASSTHROUGH) + if (error < 0) return error; } diff --git a/vendor/libgit2/src/curl_stream.c b/vendor/libgit2/src/curl_stream.c index ca06c20d6..9963d94cc 100644 --- a/vendor/libgit2/src/curl_stream.c +++ b/vendor/libgit2/src/curl_stream.c @@ -67,9 +67,9 @@ static int curls_certificate(git_cert **out, git_stream *stream) /* No information is available, can happen with SecureTransport */ if (certinfo->num_of_certs == 0) { - s->cert_info.cert_type = GIT_CERT_NONE; - s->cert_info.data = NULL; - s->cert_info.len = 0; + s->cert_info.parent.cert_type = GIT_CERT_NONE; + s->cert_info.data = NULL; + s->cert_info.len = 0; return 0; } @@ -79,17 +79,18 @@ static int curls_certificate(git_cert **out, git_stream *stream) for (slist = certinfo->certinfo[0]; slist; slist = slist->next) { char *str = git__strdup(slist->data); GITERR_CHECK_ALLOC(str); + git_vector_insert(&strings, str); } /* Copy the contents of the vector into a strarray so we can expose them */ s->cert_info_strings.strings = (char **) strings.contents; s->cert_info_strings.count = strings.length; - s->cert_info.cert_type = GIT_CERT_STRARRAY; - s->cert_info.data = &s->cert_info_strings; - s->cert_info.len = strings.length; + s->cert_info.parent.cert_type = GIT_CERT_STRARRAY; + s->cert_info.data = &s->cert_info_strings; + s->cert_info.len = strings.length; - *out = (git_cert *) &s->cert_info; + *out = &s->cert_info.parent; return 0; } @@ -207,11 +208,14 @@ int git_curl_stream_new(git_stream **out, const char *host, const char *port) handle = curl_easy_init(); if (handle == NULL) { giterr_set(GITERR_NET, "failed to create curl handle"); + git__free(st); return -1; } - if ((error = git__strtol32(&iport, port, NULL, 10)) < 0) + if ((error = git__strtol32(&iport, port, NULL, 10)) < 0) { + git__free(st); return error; + } curl_easy_setopt(handle, CURLOPT_URL, host); curl_easy_setopt(handle, CURLOPT_ERRORBUFFER, st->curl_error); diff --git a/vendor/libgit2/src/describe.c b/vendor/libgit2/src/describe.c index 48f04e858..13ddad5be 100644 --- a/vendor/libgit2/src/describe.c +++ b/vendor/libgit2/src/describe.c @@ -582,7 +582,8 @@ static int describe( best = (struct possible_tag *)git_vector_get(&all_matches, 0); if (gave_up_on) { - git_pqueue_insert(&list, gave_up_on); + if ((error = git_pqueue_insert(&list, gave_up_on)) < 0) + goto cleanup; seen_commits--; } if ((error = finish_depth_computation( diff --git a/vendor/libgit2/src/diff.c b/vendor/libgit2/src/diff.c index 9cde03e17..9ac5b9250 100644 --- a/vendor/libgit2/src/diff.c +++ b/vendor/libgit2/src/diff.c @@ -56,7 +56,7 @@ static int diff_insert_delta( if (diff->opts.notify_cb) { error = diff->opts.notify_cb( - diff, delta, matched_pathspec, diff->opts.notify_payload); + diff, delta, matched_pathspec, diff->opts.payload); if (error) { git__free(delta); @@ -74,6 +74,32 @@ static int diff_insert_delta( return error; } +static bool diff_pathspec_match( + const char **matched_pathspec, + git_diff *diff, + const git_index_entry *entry) +{ + bool disable_pathspec_match = + DIFF_FLAG_IS_SET(diff, GIT_DIFF_DISABLE_PATHSPEC_MATCH); + + /* If we're disabling fnmatch, then the iterator has already applied + * the filters to the files for us and we don't have to do anything. + * However, this only applies to *files* - the iterator will include + * directories that we need to recurse into when not autoexpanding, + * so we still need to apply the pathspec match to directories. + */ + if ((S_ISLNK(entry->mode) || S_ISREG(entry->mode)) && + disable_pathspec_match) { + *matched_pathspec = entry->path; + return true; + } + + return git_pathspec__match( + &diff->pathspec, entry->path, disable_pathspec_match, + DIFF_FLAG_IS_SET(diff, GIT_DIFF_IGNORE_CASE), + matched_pathspec, NULL); +} + static int diff_delta__from_one( git_diff *diff, git_delta_t status, @@ -105,16 +131,12 @@ static int diff_delta__from_one( if (status == GIT_DELTA_UNTRACKED && DIFF_FLAG_ISNT_SET(diff, GIT_DIFF_INCLUDE_UNTRACKED)) return 0; - + if (status == GIT_DELTA_UNREADABLE && DIFF_FLAG_ISNT_SET(diff, GIT_DIFF_INCLUDE_UNREADABLE)) return 0; - if (!git_pathspec__match( - &diff->pathspec, entry->path, - DIFF_FLAG_IS_SET(diff, GIT_DIFF_DISABLE_PATHSPEC_MATCH), - DIFF_FLAG_IS_SET(diff, GIT_DIFF_IGNORE_CASE), - &matched_pathspec, NULL)) + if (!diff_pathspec_match(&matched_pathspec, diff, entry)) return 0; delta = diff_delta__alloc(diff, status, entry->path); @@ -408,8 +430,9 @@ static git_diff *diff_list_alloc( diff->new_src = new_iter->type; memcpy(&diff->opts, &dflt, sizeof(diff->opts)); - if (git_vector_init(&diff->deltas, 0, git_diff_delta__cmp) < 0 || - git_pool_init(&diff->pool, 1, 0) < 0) { + git_pool_init(&diff->pool, 1); + + if (git_vector_init(&diff->deltas, 0, git_diff_delta__cmp) < 0) { git_diff_free(diff); return NULL; } @@ -471,11 +494,6 @@ static int diff_list_apply_options( /* Don't set GIT_DIFFCAPS_USE_DEV - compile time option in core git */ - /* Don't trust nanoseconds; we do not load nanos from disk */ -#ifdef GIT_USE_NSEC - diff->diffcaps = diff->diffcaps | GIT_DIFFCAPS_TRUST_NANOSECS; -#endif - /* If not given explicit `opts`, check `diff.xyz` configs */ if (!opts) { int context = git_config__get_int_force(cfg, "diff.context", 3); @@ -676,13 +694,6 @@ int git_diff__oid_for_entry( return error; } -static bool diff_time_eq( - const git_index_time *a, const git_index_time *b, bool use_nanos) -{ - return a->seconds == b->seconds && - (!use_nanos || a->nanoseconds == b->nanoseconds); -} - typedef struct { git_repository *repo; git_iterator *old_iter; @@ -757,11 +768,7 @@ static int maybe_modified( const char *matched_pathspec; int error = 0; - if (!git_pathspec__match( - &diff->pathspec, oitem->path, - DIFF_FLAG_IS_SET(diff, GIT_DIFF_DISABLE_PATHSPEC_MATCH), - DIFF_FLAG_IS_SET(diff, GIT_DIFF_IGNORE_CASE), - &matched_pathspec, NULL)) + if (!diff_pathspec_match(&matched_pathspec, diff, oitem)) return 0; memset(&noid, 0, sizeof(noid)); @@ -819,7 +826,6 @@ static int maybe_modified( */ } else if (git_oid_iszero(&nitem->id) && new_is_workdir) { bool use_ctime = ((diff->diffcaps & GIT_DIFFCAPS_TRUST_CTIME) != 0); - bool use_nanos = ((diff->diffcaps & GIT_DIFFCAPS_TRUST_NANOSECS) != 0); git_index *index; git_iterator_index(&index, info->new_iter); @@ -838,13 +844,12 @@ static int maybe_modified( modified_uncertain = (oitem->file_size <= 0 && nitem->file_size > 0); } - else if (!diff_time_eq(&oitem->mtime, &nitem->mtime, use_nanos) || - (use_ctime && - !diff_time_eq(&oitem->ctime, &nitem->ctime, use_nanos)) || + else if (!git_index_time_eq(&oitem->mtime, &nitem->mtime) || + (use_ctime && !git_index_time_eq(&oitem->ctime, &nitem->ctime)) || oitem->ino != nitem->ino || oitem->uid != nitem->uid || oitem->gid != nitem->gid || - (index && nitem->mtime.seconds >= index->stamp.mtime)) + git_index_entry_newer_than_index(nitem, index)) { status = GIT_DELTA_MODIFIED; modified_uncertain = true; @@ -1055,6 +1060,12 @@ static int handle_unmatched_new_item( &info->nitem, &untracked_state, info->new_iter)) < 0) return error; + /* if we found nothing that matched our pathlist filter, exclude */ + if (untracked_state == GIT_ITERATOR_STATUS_FILTERED) { + git_vector_pop(&diff->deltas); + git__free(last); + } + /* if we found nothing or just ignored items, update the record */ if (untracked_state == GIT_ITERATOR_STATUS_IGNORED || untracked_state == GIT_ITERATOR_STATUS_EMPTY) { @@ -1235,7 +1246,18 @@ int git_diff__from_iterators( /* run iterators building diffs */ while (!error && (info.oitem || info.nitem)) { - int cmp = info.oitem ? + int cmp; + + /* report progress */ + if (opts && opts->progress_cb) { + if ((error = opts->progress_cb(diff, + info.oitem ? info.oitem->path : NULL, + info.nitem ? info.nitem->path : NULL, + opts->payload))) + break; + } + + cmp = info.oitem ? (info.nitem ? diff->entrycomp(info.oitem, info.nitem) : -1) : 1; /* create DELETED records for old items not matched in new */ @@ -1266,11 +1288,26 @@ int git_diff__from_iterators( return error; } -#define DIFF_FROM_ITERATORS(MAKE_FIRST, MAKE_SECOND) do { \ +#define DIFF_FROM_ITERATORS(MAKE_FIRST, FLAGS_FIRST, MAKE_SECOND, FLAGS_SECOND) do { \ git_iterator *a = NULL, *b = NULL; \ - char *pfx = opts ? git_pathspec_prefix(&opts->pathspec) : NULL; \ + char *pfx = (opts && !(opts->flags & GIT_DIFF_DISABLE_PATHSPEC_MATCH)) ? \ + git_pathspec_prefix(&opts->pathspec) : NULL; \ + git_iterator_options a_opts = GIT_ITERATOR_OPTIONS_INIT, \ + b_opts = GIT_ITERATOR_OPTIONS_INIT; \ + a_opts.flags = FLAGS_FIRST; \ + a_opts.start = pfx; \ + a_opts.end = pfx; \ + b_opts.flags = FLAGS_SECOND; \ + b_opts.start = pfx; \ + b_opts.end = pfx; \ GITERR_CHECK_VERSION(opts, GIT_DIFF_OPTIONS_VERSION, "git_diff_options"); \ - if (!(error = MAKE_FIRST) && !(error = MAKE_SECOND)) \ + if (opts && (opts->flags & GIT_DIFF_DISABLE_PATHSPEC_MATCH)) { \ + a_opts.pathlist.strings = opts->pathspec.strings; \ + a_opts.pathlist.count = opts->pathspec.count; \ + b_opts.pathlist.strings = opts->pathspec.strings; \ + b_opts.pathlist.count = opts->pathspec.count; \ + } \ + if (!error && !(error = MAKE_FIRST) && !(error = MAKE_SECOND)) \ error = git_diff__from_iterators(diff, repo, a, b, opts); \ git__free(pfx); git_iterator_free(a); git_iterator_free(b); \ } while (0) @@ -1282,8 +1319,8 @@ int git_diff_tree_to_tree( git_tree *new_tree, const git_diff_options *opts) { - int error = 0; git_iterator_flag_t iflag = GIT_ITERATOR_DONT_IGNORE_CASE; + int error = 0; assert(diff && repo); @@ -1295,8 +1332,8 @@ int git_diff_tree_to_tree( iflag = GIT_ITERATOR_IGNORE_CASE; DIFF_FROM_ITERATORS( - git_iterator_for_tree(&a, old_tree, iflag, pfx, pfx), - git_iterator_for_tree(&b, new_tree, iflag, pfx, pfx) + git_iterator_for_tree(&a, old_tree, &a_opts), iflag, + git_iterator_for_tree(&b, new_tree, &b_opts), iflag ); return error; @@ -1320,10 +1357,10 @@ int git_diff_tree_to_index( git_index *index, const git_diff_options *opts) { - int error = 0; - bool index_ignore_case = false; git_iterator_flag_t iflag = GIT_ITERATOR_DONT_IGNORE_CASE | GIT_ITERATOR_INCLUDE_CONFLICTS; + bool index_ignore_case = false; + int error = 0; assert(diff && repo); @@ -1333,8 +1370,8 @@ int git_diff_tree_to_index( index_ignore_case = index->ignore_case; DIFF_FROM_ITERATORS( - git_iterator_for_tree(&a, old_tree, iflag, pfx, pfx), - git_iterator_for_index(&b, index, iflag, pfx, pfx) + git_iterator_for_tree(&a, old_tree, &a_opts), iflag, + git_iterator_for_index(&b, repo, index, &b_opts), iflag ); /* if index is in case-insensitive order, re-sort deltas to match */ @@ -1358,10 +1395,11 @@ int git_diff_index_to_workdir( return error; DIFF_FROM_ITERATORS( - git_iterator_for_index( - &a, index, GIT_ITERATOR_INCLUDE_CONFLICTS, pfx, pfx), - git_iterator_for_workdir( - &b, repo, index, NULL, GIT_ITERATOR_DONT_AUTOEXPAND, pfx, pfx) + git_iterator_for_index(&a, repo, index, &a_opts), + GIT_ITERATOR_INCLUDE_CONFLICTS, + + git_iterator_for_workdir(&b, repo, index, NULL, &b_opts), + GIT_ITERATOR_DONT_AUTOEXPAND ); if (!error && DIFF_FLAG_IS_SET(*diff, GIT_DIFF_UPDATE_INDEX) && (*diff)->index_updated) @@ -1385,9 +1423,8 @@ int git_diff_tree_to_workdir( return error; DIFF_FROM_ITERATORS( - git_iterator_for_tree(&a, old_tree, 0, pfx, pfx), - git_iterator_for_workdir( - &b, repo, index, old_tree, GIT_ITERATOR_DONT_AUTOEXPAND, pfx, pfx) + git_iterator_for_tree(&a, old_tree, &a_opts), 0, + git_iterator_for_workdir(&b, repo, index, old_tree, &b_opts), GIT_ITERATOR_DONT_AUTOEXPAND ); return error; @@ -1423,6 +1460,29 @@ int git_diff_tree_to_workdir_with_index( return error; } +int git_diff_index_to_index( + git_diff **diff, + git_repository *repo, + git_index *old_index, + git_index *new_index, + const git_diff_options *opts) +{ + int error = 0; + + assert(diff && old_index && new_index); + + DIFF_FROM_ITERATORS( + git_iterator_for_index(&a, repo, old_index, &a_opts), GIT_ITERATOR_DONT_IGNORE_CASE, + git_iterator_for_index(&b, repo, new_index, &b_opts), GIT_ITERATOR_DONT_IGNORE_CASE + ); + + /* if index is in case-insensitive order, re-sort deltas to match */ + if (!error && (old_index->ignore_case || new_index->ignore_case)) + diff_set_ignore_case(*diff, true); + + return error; +} + size_t git_diff_num_deltas(const git_diff *diff) { assert(diff); @@ -1599,6 +1659,7 @@ int git_diff_format_email__append_header_tobuf( const git_oid *id, const git_signature *author, const char *summary, + const char *body, size_t patch_no, size_t total_patches, bool exclude_patchno_marker) @@ -1638,6 +1699,13 @@ int git_diff_format_email__append_header_tobuf( error = git_buf_printf(out, "%s\n\n", summary); + if (body) { + git_buf_puts(out, body); + + if (out->ptr[out->size - 1] != '\n') + git_buf_putc(out, '\n'); + } + return error; } @@ -1715,7 +1783,7 @@ int git_diff_format_email( error = git_diff_format_email__append_header_tobuf(out, opts->id, opts->author, summary == NULL ? opts->summary : summary, - opts->patch_no, opts->total_patches, ignore_marker); + opts->body, opts->patch_no, opts->total_patches, ignore_marker); if (error < 0) goto on_error; @@ -1758,6 +1826,7 @@ int git_diff_commit_as_email( opts.total_patches = total_patches; opts.id = git_commit_id(commit); opts.summary = git_commit_summary(commit); + opts.body = git_commit_body(commit); opts.author = git_commit_author(commit); if ((error = git_diff__commit(&diff, repo, commit, diff_opts)) < 0) diff --git a/vendor/libgit2/src/diff.h b/vendor/libgit2/src/diff.h index 2dfc2c615..47743f88b 100644 --- a/vendor/libgit2/src/diff.h +++ b/vendor/libgit2/src/diff.h @@ -28,7 +28,6 @@ enum { GIT_DIFFCAPS_TRUST_MODE_BITS = (1 << 2), /* use st_mode? */ GIT_DIFFCAPS_TRUST_CTIME = (1 << 3), /* use st_ctime? */ GIT_DIFFCAPS_USE_DEV = (1 << 4), /* use st_dev? */ - GIT_DIFFCAPS_TRUST_NANOSECS = (1 << 5), /* use stat time nanoseconds */ }; #define DIFF_FLAGS_KNOWN_BINARY (GIT_DIFF_FLAG_BINARY|GIT_DIFF_FLAG_NOT_BINARY) diff --git a/vendor/libgit2/src/diff_file.c b/vendor/libgit2/src/diff_file.c index c60362865..ecc34cf55 100644 --- a/vendor/libgit2/src/diff_file.c +++ b/vendor/libgit2/src/diff_file.c @@ -259,10 +259,35 @@ static int diff_file_content_load_blob( return error; } +static int diff_file_content_load_workdir_symlink_fake( + git_diff_file_content *fc, git_buf *path) +{ + git_buf target = GIT_BUF_INIT; + int error; + + if ((error = git_futils_readbuffer(&target, path->ptr)) < 0) + return error; + + fc->map.len = git_buf_len(&target); + fc->map.data = git_buf_detach(&target); + fc->flags |= GIT_DIFF_FLAG__FREE_DATA; + + git_buf_free(&target); + return error; +} + static int diff_file_content_load_workdir_symlink( git_diff_file_content *fc, git_buf *path) { ssize_t alloc_len, read_len; + int symlink_supported, error; + + if ((error = git_repository__cvar( + &symlink_supported, fc->repo, GIT_CVAR_SYMLINKS)) < 0) + return -1; + + if (!symlink_supported) + return diff_file_content_load_workdir_symlink_fake(fc, path); /* link path on disk could be UTF-16, so prepare a buffer that is * big enough to handle some UTF-8 data expansion diff --git a/vendor/libgit2/src/diff_print.c b/vendor/libgit2/src/diff_print.c index bc2d6fab0..dae9e341d 100644 --- a/vendor/libgit2/src/diff_print.c +++ b/vendor/libgit2/src/diff_print.c @@ -92,7 +92,11 @@ static int diff_print_info_init_frompatch( git_diff_line_cb cb, void *payload) { - git_repository *repo = patch && patch->diff ? patch->diff->repo : NULL; + git_repository *repo; + + assert(patch); + + repo = patch->diff ? patch->diff->repo : NULL; memset(pi, 0, sizeof(diff_print_info)); diff --git a/vendor/libgit2/src/diff_tform.c b/vendor/libgit2/src/diff_tform.c index 92647e330..6a6a62811 100644 --- a/vendor/libgit2/src/diff_tform.c +++ b/vendor/libgit2/src/diff_tform.c @@ -134,11 +134,11 @@ int git_diff__merge( return -1; } - if (git_vector_init( - &onto_new, onto->deltas.length, git_diff_delta__cmp) < 0 || - git_pool_init(&onto_pool, 1, 0) < 0) + if (git_vector_init(&onto_new, onto->deltas.length, git_diff_delta__cmp) < 0) return -1; + git_pool_init(&onto_pool, 1); + for (i = 0, j = 0; i < onto->deltas.length || j < from->deltas.length; ) { git_diff_delta *o = GIT_VECTOR_GET(&onto->deltas, i); const git_diff_delta *f = GIT_VECTOR_GET(&from->deltas, j); @@ -261,18 +261,23 @@ static int normalize_find_opts( if (!given || (given->flags & GIT_DIFF_FIND_ALL) == GIT_DIFF_FIND_BY_CONFIG) { - char *rule = - git_config__get_string_force(cfg, "diff.renames", "true"); - int boolval; - - if (!git__parse_bool(&boolval, rule) && !boolval) - /* don't set FIND_RENAMES if bool value is false */; - else if (!strcasecmp(rule, "copies") || !strcasecmp(rule, "copy")) - opts->flags |= GIT_DIFF_FIND_RENAMES | GIT_DIFF_FIND_COPIES; - else - opts->flags |= GIT_DIFF_FIND_RENAMES; + if (cfg) { + char *rule = + git_config__get_string_force(cfg, "diff.renames", "true"); + int boolval; + + if (!git__parse_bool(&boolval, rule) && !boolval) + /* don't set FIND_RENAMES if bool value is false */; + else if (!strcasecmp(rule, "copies") || !strcasecmp(rule, "copy")) + opts->flags |= GIT_DIFF_FIND_RENAMES | GIT_DIFF_FIND_COPIES; + else + opts->flags |= GIT_DIFF_FIND_RENAMES; - git__free(rule); + git__free(rule); + } else { + /* set default flag */ + opts->flags |= GIT_DIFF_FIND_RENAMES; + } } /* some flags imply others */ @@ -313,8 +318,10 @@ static int normalize_find_opts( #undef USE_DEFAULT if (!opts->rename_limit) { - opts->rename_limit = git_config__get_int_force( - cfg, "diff.renamelimit", DEFAULT_RENAME_LIMIT); + if (cfg) { + opts->rename_limit = git_config__get_int_force( + cfg, "diff.renamelimit", DEFAULT_RENAME_LIMIT); + } if (opts->rename_limit <= 0) opts->rename_limit = DEFAULT_RENAME_LIMIT; diff --git a/vendor/libgit2/src/errors.c b/vendor/libgit2/src/errors.c index 7a2600586..91acc3541 100644 --- a/vendor/libgit2/src/errors.c +++ b/vendor/libgit2/src/errors.c @@ -18,19 +18,30 @@ static git_error g_git_oom_error = { GITERR_NOMEMORY }; -static void set_error(int error_class, char *string) +static void set_error_from_buffer(int error_class) { git_error *error = &GIT_GLOBAL->error_t; + git_buf *buf = &GIT_GLOBAL->error_buf; - if (error->message != string) - git__free(error->message); - - error->message = string; + error->message = buf->ptr; error->klass = error_class; GIT_GLOBAL->last_error = error; } +static void set_error(int error_class, char *string) +{ + git_buf *buf = &GIT_GLOBAL->error_buf; + + git_buf_clear(buf); + if (string) { + git_buf_puts(buf, string); + git__free(string); + } + + set_error_from_buffer(error_class); +} + void giterr_set_oom(void) { GIT_GLOBAL->last_error = &g_git_oom_error; @@ -38,27 +49,28 @@ void giterr_set_oom(void) void giterr_set(int error_class, const char *string, ...) { - git_buf buf = GIT_BUF_INIT; va_list arglist; #ifdef GIT_WIN32 DWORD win32_error_code = (error_class == GITERR_OS) ? GetLastError() : 0; #endif int error_code = (error_class == GITERR_OS) ? errno : 0; + git_buf *buf = &GIT_GLOBAL->error_buf; + git_buf_clear(buf); if (string) { va_start(arglist, string); - git_buf_vprintf(&buf, string, arglist); + git_buf_vprintf(buf, string, arglist); va_end(arglist); if (error_class == GITERR_OS) - git_buf_PUTS(&buf, ": "); + git_buf_PUTS(buf, ": "); } if (error_class == GITERR_OS) { #ifdef GIT_WIN32 char * win32_error = git_win32_get_error_message(win32_error_code); if (win32_error) { - git_buf_puts(&buf, win32_error); + git_buf_puts(buf, win32_error); git__free(win32_error); SetLastError(0); @@ -66,26 +78,29 @@ void giterr_set(int error_class, const char *string, ...) else #endif if (error_code) - git_buf_puts(&buf, strerror(error_code)); + git_buf_puts(buf, strerror(error_code)); if (error_code) errno = 0; } - if (!git_buf_oom(&buf)) - set_error(error_class, git_buf_detach(&buf)); + if (!git_buf_oom(buf)) + set_error_from_buffer(error_class); } void giterr_set_str(int error_class, const char *string) { - char *message; + git_buf *buf = &GIT_GLOBAL->error_buf; assert(string); - message = git__strdup(string); + if (!string) + return; - if (message) - set_error(error_class, message); + git_buf_clear(buf); + git_buf_puts(buf, string); + if (!git_buf_oom(buf)) + set_error_from_buffer(error_class); } int giterr_set_regex(const regex_t *regex, int error_code) @@ -116,45 +131,65 @@ void giterr_clear(void) #endif } -int giterr_detach(git_error *cpy) +const git_error *giterr_last(void) +{ + return GIT_GLOBAL->last_error; +} + +int giterr_state_capture(git_error_state *state, int error_code) { git_error *error = GIT_GLOBAL->last_error; + git_buf *error_buf = &GIT_GLOBAL->error_buf; - assert(cpy); + memset(state, 0, sizeof(git_error_state)); - if (!error) - return -1; + if (!error_code) + return 0; - cpy->message = error->message; - cpy->klass = error->klass; + state->error_code = error_code; + state->oom = (error == &g_git_oom_error); - error->message = NULL; - giterr_clear(); + if (error) { + state->error_msg.klass = error->klass; - return 0; -} + if (state->oom) + state->error_msg.message = g_git_oom_error.message; + else + state->error_msg.message = git_buf_detach(error_buf); + } -const git_error *giterr_last(void) -{ - return GIT_GLOBAL->last_error; + giterr_clear(); + return error_code; } -int giterr_capture(git_error_state *state, int error_code) +int giterr_state_restore(git_error_state *state) { - state->error_code = error_code; - if (error_code) - giterr_detach(&state->error_msg); - return error_code; + int ret = 0; + + giterr_clear(); + + if (state && state->error_msg.message) { + if (state->oom) + giterr_set_oom(); + else + set_error(state->error_msg.klass, state->error_msg.message); + + ret = state->error_code; + memset(state, 0, sizeof(git_error_state)); + } + + return ret; } -int giterr_restore(git_error_state *state) +void giterr_state_free(git_error_state *state) { - if (state && state->error_code && state->error_msg.message) - set_error(state->error_msg.klass, state->error_msg.message); - else - giterr_clear(); + if (!state) + return; + + if (!state->oom) + git__free(state->error_msg.message); - return state ? state->error_code : 0; + memset(state, 0, sizeof(git_error_state)); } int giterr_system_last(void) diff --git a/vendor/libgit2/src/filebuf.c b/vendor/libgit2/src/filebuf.c index 2bbc210ba..101d5082a 100644 --- a/vendor/libgit2/src/filebuf.c +++ b/vendor/libgit2/src/filebuf.c @@ -70,6 +70,7 @@ static int lock_file(git_filebuf *file, int flags, mode_t mode) git_file source; char buffer[FILEIO_BUFSIZE]; ssize_t read_bytes; + int error; source = p_open(file->path_original, O_RDONLY); if (source < 0) { @@ -80,7 +81,8 @@ static int lock_file(git_filebuf *file, int flags, mode_t mode) } while ((read_bytes = p_read(source, buffer, sizeof(buffer))) > 0) { - p_write(file->fd, buffer, read_bytes); + if ((error = p_write(file->fd, buffer, read_bytes)) < 0) + break; if (file->compute_digest) git_hash_update(&file->digest, buffer, read_bytes); } @@ -90,6 +92,9 @@ static int lock_file(git_filebuf *file, int flags, mode_t mode) if (read_bytes < 0) { giterr_set(GITERR_OS, "Failed to read file '%s'", file->path_original); return -1; + } else if (error < 0) { + giterr_set(GITERR_OS, "Failed to write file '%s'", file->path_lock); + return -1; } } @@ -357,6 +362,12 @@ int git_filebuf_open(git_filebuf *file, const char *path, int flags, mode_t mode memcpy(file->path_lock, file->path_original, path_len); memcpy(file->path_lock + path_len, GIT_FILELOCK_EXTENSION, GIT_FILELOCK_EXTLENGTH); + if (git_path_isdir(file->path_original)) { + giterr_set(GITERR_FILESYSTEM, "path '%s' is a directory", file->path_original); + error = GIT_EDIRECTORY; + goto cleanup; + } + /* open the file for locking */ if ((error = lock_file(file, flags, mode)) < 0) goto cleanup; diff --git a/vendor/libgit2/src/fileops.c b/vendor/libgit2/src/fileops.c index b7b55159f..22868b489 100644 --- a/vendor/libgit2/src/fileops.c +++ b/vendor/libgit2/src/fileops.c @@ -18,7 +18,7 @@ GIT__USE_STRMAP int git_futils_mkpath2file(const char *file_path, const mode_t mode) { return git_futils_mkdir( - file_path, NULL, mode, + file_path, mode, GIT_MKDIR_PATH | GIT_MKDIR_SKIP_LAST | GIT_MKDIR_VERIFY_DIR); } @@ -153,13 +153,15 @@ int git_futils_readbuffer_fd(git_buf *buf, git_file fd, size_t len) } int git_futils_readbuffer_updated( - git_buf *buf, const char *path, time_t *mtime, size_t *size, int *updated) + git_buf *out, const char *path, git_oid *checksum, int *updated) { + int error; git_file fd; struct stat st; - bool changed = false; + git_buf buf = GIT_BUF_INIT; + git_oid checksum_new; - assert(buf && path && *path); + assert(out && path && *path); if (updated != NULL) *updated = 0; @@ -178,45 +180,50 @@ int git_futils_readbuffer_updated( return -1; } - /* - * If we were given a time and/or a size, we only want to read the file - * if it has been modified. - */ - if (size && *size != (size_t)st.st_size) - changed = true; - if (mtime && *mtime != (time_t)st.st_mtime) - changed = true; - if (!size && !mtime) - changed = true; - - if (!changed) { - return 0; - } - - if (mtime != NULL) - *mtime = st.st_mtime; - if (size != NULL) - *size = (size_t)st.st_size; - if ((fd = git_futils_open_ro(path)) < 0) return fd; - if (git_futils_readbuffer_fd(buf, fd, (size_t)st.st_size) < 0) { + if (git_futils_readbuffer_fd(&buf, fd, (size_t)st.st_size) < 0) { p_close(fd); return -1; } p_close(fd); + if ((error = git_hash_buf(&checksum_new, buf.ptr, buf.size)) < 0) { + git_buf_free(&buf); + return error; + } + + /* + * If we were given a checksum, we only want to use it if it's different + */ + if (checksum && !git_oid__cmp(checksum, &checksum_new)) { + git_buf_free(&buf); + if (updated) + *updated = 0; + + return 0; + } + + /* + * If we're here, the file did change, or the user didn't have an old version + */ + if (checksum) + git_oid_cpy(checksum, &checksum_new); + if (updated != NULL) *updated = 1; + git_buf_swap(out, &buf); + git_buf_free(&buf); + return 0; } int git_futils_readbuffer(git_buf *buf, const char *path) { - return git_futils_readbuffer_updated(buf, path, NULL, NULL, NULL); + return git_futils_readbuffer_updated(buf, path, NULL, NULL); } int git_futils_writebuffer( @@ -289,97 +296,230 @@ void git_futils_mmap_free(git_map *out) p_munmap(out); } -GIT_INLINE(int) validate_existing( - const char *make_path, +GIT_INLINE(int) mkdir_validate_dir( + const char *path, struct stat *st, mode_t mode, uint32_t flags, - struct git_futils_mkdir_perfdata *perfdata) + struct git_futils_mkdir_options *opts) { + /* with exclusive create, existing dir is an error */ + if ((flags & GIT_MKDIR_EXCL) != 0) { + giterr_set(GITERR_FILESYSTEM, + "Failed to make directory '%s': directory exists", path); + return GIT_EEXISTS; + } + if ((S_ISREG(st->st_mode) && (flags & GIT_MKDIR_REMOVE_FILES)) || (S_ISLNK(st->st_mode) && (flags & GIT_MKDIR_REMOVE_SYMLINKS))) { - if (p_unlink(make_path) < 0) { + if (p_unlink(path) < 0) { giterr_set(GITERR_OS, "Failed to remove %s '%s'", - S_ISLNK(st->st_mode) ? "symlink" : "file", make_path); + S_ISLNK(st->st_mode) ? "symlink" : "file", path); return GIT_EEXISTS; } - perfdata->mkdir_calls++; + opts->perfdata.mkdir_calls++; - if (p_mkdir(make_path, mode) < 0) { - giterr_set(GITERR_OS, "Failed to make directory '%s'", make_path); + if (p_mkdir(path, mode) < 0) { + giterr_set(GITERR_OS, "Failed to make directory '%s'", path); return GIT_EEXISTS; } } else if (S_ISLNK(st->st_mode)) { /* Re-stat the target, make sure it's a directory */ - perfdata->stat_calls++; + opts->perfdata.stat_calls++; - if (p_stat(make_path, st) < 0) { - giterr_set(GITERR_OS, "Failed to make directory '%s'", make_path); + if (p_stat(path, st) < 0) { + giterr_set(GITERR_OS, "Failed to make directory '%s'", path); return GIT_EEXISTS; } } else if (!S_ISDIR(st->st_mode)) { giterr_set(GITERR_FILESYSTEM, - "Failed to make directory '%s': directory exists", make_path); + "Failed to make directory '%s': directory exists", path); return GIT_EEXISTS; } return 0; } -int git_futils_mkdir_ext( +GIT_INLINE(int) mkdir_validate_mode( const char *path, - const char *base, + struct stat *st, + bool terminal_path, mode_t mode, uint32_t flags, struct git_futils_mkdir_options *opts) { - int error = -1; - git_buf make_path = GIT_BUF_INIT; - ssize_t root = 0, min_root_len, root_len; - char lastch = '/', *tail; - struct stat st; + if (((terminal_path && (flags & GIT_MKDIR_CHMOD) != 0) || + (flags & GIT_MKDIR_CHMOD_PATH) != 0) && st->st_mode != mode) { - /* build path and find "root" where we should start calling mkdir */ - if (git_path_join_unrooted(&make_path, path, base, &root) < 0) - return -1; + opts->perfdata.chmod_calls++; - if (make_path.size == 0) { - giterr_set(GITERR_OS, "Attempt to create empty path"); - goto done; + if (p_chmod(path, mode) < 0) { + giterr_set(GITERR_OS, "failed to set permissions on '%s'", path); + return -1; + } + } + + return 0; +} + +GIT_INLINE(int) mkdir_canonicalize( + git_buf *path, + uint32_t flags) +{ + ssize_t root_len; + + if (path->size == 0) { + giterr_set(GITERR_OS, "attempt to create empty path"); + return -1; } /* Trim trailing slashes (except the root) */ - if ((root_len = git_path_root(make_path.ptr)) < 0) + if ((root_len = git_path_root(path->ptr)) < 0) root_len = 0; else root_len++; - while (make_path.size > (size_t)root_len && - make_path.ptr[make_path.size - 1] == '/') - make_path.ptr[--make_path.size] = '\0'; + while (path->size > (size_t)root_len && path->ptr[path->size - 1] == '/') + path->ptr[--path->size] = '\0'; /* if we are not supposed to made the last element, truncate it */ if ((flags & GIT_MKDIR_SKIP_LAST2) != 0) { - git_path_dirname_r(&make_path, make_path.ptr); + git_path_dirname_r(path, path->ptr); flags |= GIT_MKDIR_SKIP_LAST; } if ((flags & GIT_MKDIR_SKIP_LAST) != 0) { - git_path_dirname_r(&make_path, make_path.ptr); + git_path_dirname_r(path, path->ptr); } /* We were either given the root path (or trimmed it to - * the root), we don't have anything to do. + * the root), we don't have anything to do. + */ + if (path->size <= (size_t)root_len) + git_buf_clear(path); + + return 0; +} + +int git_futils_mkdir( + const char *path, + mode_t mode, + uint32_t flags) +{ + git_buf make_path = GIT_BUF_INIT, parent_path = GIT_BUF_INIT; + const char *relative; + struct git_futils_mkdir_options opts = { 0 }; + struct stat st; + size_t depth = 0; + int len = 0, root_len, error; + + if ((error = git_buf_puts(&make_path, path)) < 0 || + (error = mkdir_canonicalize(&make_path, flags)) < 0 || + (error = git_buf_puts(&parent_path, make_path.ptr)) < 0 || + make_path.size == 0) + goto done; + + root_len = git_path_root(make_path.ptr); + + /* find the first parent directory that exists. this will be used + * as the base to dirname_relative. */ - if (make_path.size <= (size_t)root_len) { - error = 0; + for (relative = make_path.ptr; parent_path.size; ) { + error = p_lstat(parent_path.ptr, &st); + + if (error == 0) { + break; + } else if (errno != ENOENT) { + giterr_set(GITERR_OS, "failed to stat '%s'", parent_path.ptr); + goto done; + } + + depth++; + + /* examine the parent of the current path */ + if ((len = git_path_dirname_r(&parent_path, parent_path.ptr)) < 0) { + error = len; + goto done; + } + + assert(len); + + /* we've walked all the given path's parents and it's either relative + * or rooted. either way, give up and make the entire path. + */ + if ((len == 1 && parent_path.ptr[0] == '.') || len == root_len+1) { + relative = make_path.ptr; + break; + } + + relative = make_path.ptr + len + 1; + + /* not recursive? just make this directory relative to its parent. */ + if ((flags & GIT_MKDIR_PATH) == 0) + break; + } + + /* we found an item at the location we're trying to create, + * validate it. + */ + if (depth == 0) { + error = mkdir_validate_dir(make_path.ptr, &st, mode, flags, &opts); + + if (!error) + error = mkdir_validate_mode( + make_path.ptr, &st, true, mode, flags, &opts); + goto done; } + /* we already took `SKIP_LAST` and `SKIP_LAST2` into account when + * canonicalizing `make_path`. + */ + flags &= ~(GIT_MKDIR_SKIP_LAST2 | GIT_MKDIR_SKIP_LAST); + + error = git_futils_mkdir_relative(relative, + parent_path.size ? parent_path.ptr : NULL, mode, flags, &opts); + +done: + git_buf_free(&make_path); + git_buf_free(&parent_path); + return error; +} + +int git_futils_mkdir_r(const char *path, const mode_t mode) +{ + return git_futils_mkdir(path, mode, GIT_MKDIR_PATH); +} + +int git_futils_mkdir_relative( + const char *relative_path, + const char *base, + mode_t mode, + uint32_t flags, + struct git_futils_mkdir_options *opts) +{ + git_buf make_path = GIT_BUF_INIT; + ssize_t root = 0, min_root_len; + char lastch = '/', *tail; + struct stat st; + struct git_futils_mkdir_options empty_opts = {0}; + int error; + + if (!opts) + opts = &empty_opts; + + /* build path and find "root" where we should start calling mkdir */ + if (git_path_join_unrooted(&make_path, relative_path, base, &root) < 0) + return -1; + + if ((error = mkdir_canonicalize(&make_path, flags)) < 0 || + make_path.size == 0) + goto done; + /* if we are not supposed to make the whole path, reset root */ if ((flags & GIT_MKDIR_PATH) == 0) root = git_buf_rfind(&make_path, '/'); @@ -437,32 +577,15 @@ int git_futils_mkdir_ext( goto done; } } else { - /* with exclusive create, existing dir is an error */ - if ((flags & GIT_MKDIR_EXCL) != 0) { - giterr_set(GITERR_FILESYSTEM, "Failed to make directory '%s': directory exists", make_path.ptr); - error = GIT_EEXISTS; + if ((error = mkdir_validate_dir( + make_path.ptr, &st, mode, flags, opts)) < 0) goto done; - } - - if ((error = validate_existing( - make_path.ptr, &st, mode, flags, &opts->perfdata)) < 0) - goto done; } /* chmod if requested and necessary */ - if (((flags & GIT_MKDIR_CHMOD_PATH) != 0 || - (lastch == '\0' && (flags & GIT_MKDIR_CHMOD) != 0)) && - st.st_mode != mode) { - - opts->perfdata.chmod_calls++; - - if ((error = p_chmod(make_path.ptr, mode)) < 0 && - lastch == '\0') { - giterr_set(GITERR_OS, "Failed to set permissions on '%s'", - make_path.ptr); - goto done; - } - } + if ((error = mkdir_validate_mode( + make_path.ptr, &st, (lastch == '\0'), mode, flags, opts)) < 0) + goto done; if (opts->dir_map && opts->pool) { char *cache_path; @@ -501,21 +624,6 @@ int git_futils_mkdir_ext( return error; } -int git_futils_mkdir( - const char *path, - const char *base, - mode_t mode, - uint32_t flags) -{ - struct git_futils_mkdir_options options = {0}; - return git_futils_mkdir_ext(path, base, mode, flags, &options); -} - -int git_futils_mkdir_r(const char *path, const char *base, const mode_t mode) -{ - return git_futils_mkdir(path, base, mode, GIT_MKDIR_PATH); -} - typedef struct { const char *base; size_t baselen; @@ -777,7 +885,7 @@ static int _cp_r_mkdir(cp_r_info *info, git_buf *from) /* create root directory the first time we need to create a directory */ if ((info->flags & GIT_CPDIR__MKDIR_DONE_FOR_TO_ROOT) == 0) { error = git_futils_mkdir( - info->to_root, NULL, info->dirmode, + info->to_root, info->dirmode, (info->flags & GIT_CPDIR_CHMOD_DIRS) ? GIT_MKDIR_CHMOD : 0); info->flags |= GIT_CPDIR__MKDIR_DONE_FOR_TO_ROOT; @@ -785,9 +893,9 @@ static int _cp_r_mkdir(cp_r_info *info, git_buf *from) /* create directory with root as base to prevent excess chmods */ if (!error) - error = git_futils_mkdir( + error = git_futils_mkdir_relative( from->ptr + info->from_prefix, info->to_root, - info->dirmode, info->mkdir_flags); + info->dirmode, info->mkdir_flags, NULL); return error; } @@ -934,12 +1042,18 @@ int git_futils_filestamp_check( if (p_stat(path, &st) < 0) return GIT_ENOTFOUND; - if (stamp->mtime == (git_time_t)st.st_mtime && + if (stamp->mtime.tv_sec == st.st_mtime && +#if defined(GIT_USE_NSEC) + stamp->mtime.tv_nsec == st.st_mtime_nsec && +#endif stamp->size == (git_off_t)st.st_size && stamp->ino == (unsigned int)st.st_ino) return 0; - stamp->mtime = (git_time_t)st.st_mtime; + stamp->mtime.tv_sec = st.st_mtime; +#if defined(GIT_USE_NSEC) + stamp->mtime.tv_nsec = st.st_mtime_nsec; +#endif stamp->size = (git_off_t)st.st_size; stamp->ino = (unsigned int)st.st_ino; @@ -962,7 +1076,12 @@ void git_futils_filestamp_set_from_stat( git_futils_filestamp *stamp, struct stat *st) { if (st) { - stamp->mtime = (git_time_t)st->st_mtime; + stamp->mtime.tv_sec = st->st_mtime; +#if defined(GIT_USE_NSEC) + stamp->mtime.tv_nsec = st->st_mtime_nsec; +#else + stamp->mtime.tv_nsec = 0; +#endif stamp->size = (git_off_t)st->st_size; stamp->ino = (unsigned int)st->st_ino; } else { diff --git a/vendor/libgit2/src/fileops.h b/vendor/libgit2/src/fileops.h index 0f6466c59..6c6c49dcf 100644 --- a/vendor/libgit2/src/fileops.h +++ b/vendor/libgit2/src/fileops.h @@ -13,6 +13,7 @@ #include "path.h" #include "pool.h" #include "strmap.h" +#include "oid.h" /** * Filebuffer methods @@ -21,7 +22,7 @@ */ extern int git_futils_readbuffer(git_buf *obj, const char *path); extern int git_futils_readbuffer_updated( - git_buf *obj, const char *path, time_t *mtime, size_t *size, int *updated); + git_buf *obj, const char *path, git_oid *checksum, int *updated); extern int git_futils_readbuffer_fd(git_buf *obj, git_file fd, size_t len); extern int git_futils_writebuffer( @@ -55,12 +56,9 @@ extern int git_futils_creat_locked(const char *path, const mode_t mode); extern int git_futils_creat_locked_withpath(const char *path, const mode_t dirmode, const mode_t mode); /** - * Create a path recursively - * - * If a base parameter is being passed, it's expected to be valued with a - * path pointing to an already existing directory. + * Create a path recursively. */ -extern int git_futils_mkdir_r(const char *path, const char *base, const mode_t mode); +extern int git_futils_mkdir_r(const char *path, const mode_t mode); /** * Flags to pass to `git_futils_mkdir`. @@ -111,20 +109,20 @@ struct git_futils_mkdir_options * and optionally chmods the directory immediately after (or each part of the * path if requested). * - * @param path The path to create. + * @param path The path to create, relative to base. * @param base Root for relative path. These directories will never be made. * @param mode The mode to use for created directories. * @param flags Combination of the mkdir flags above. - * @param opts Extended options, use `git_futils_mkdir` if you are not interested. + * @param opts Extended options, or null. * @return 0 on success, else error code */ -extern int git_futils_mkdir_ext(const char *path, const char *base, mode_t mode, uint32_t flags, struct git_futils_mkdir_options *opts); +extern int git_futils_mkdir_relative(const char *path, const char *base, mode_t mode, uint32_t flags, struct git_futils_mkdir_options *opts); /** - * Create a directory or entire path. Similar to `git_futils_mkdir_withperf` + * Create a directory or entire path. Similar to `git_futils_mkdir_relative` * without performance data. */ -extern int git_futils_mkdir(const char *path, const char *base, mode_t mode, uint32_t flags); +extern int git_futils_mkdir(const char *path, mode_t mode, uint32_t flags); /** * Create all the folders required to contain @@ -312,7 +310,7 @@ extern int git_futils_fake_symlink(const char *new, const char *old); * versions could be implemented in the future. */ typedef struct { - git_time_t mtime; + struct timespec mtime; git_off_t size; unsigned int ino; } git_futils_filestamp; diff --git a/vendor/libgit2/src/filter.c b/vendor/libgit2/src/filter.c index 4006351f8..a0628d779 100644 --- a/vendor/libgit2/src/filter.c +++ b/vendor/libgit2/src/filter.c @@ -56,80 +56,15 @@ static int filter_def_priority_cmp(const void *a, const void *b) return (pa < pb) ? -1 : (pa > pb) ? 1 : 0; } -struct filter_registry { +struct git_filter_registry { + git_rwlock lock; git_vector filters; }; -static struct filter_registry *git__filter_registry = NULL; +static struct git_filter_registry filter_registry; -static void filter_registry_shutdown(void) -{ - struct filter_registry *reg = NULL; - size_t pos; - git_filter_def *fdef; - - if ((reg = git__swap(git__filter_registry, NULL)) == NULL) - return; - - git_vector_foreach(®->filters, pos, fdef) { - if (fdef->filter && fdef->filter->shutdown) { - fdef->filter->shutdown(fdef->filter); - fdef->initialized = false; - } - - git__free(fdef->filter_name); - git__free(fdef->attrdata); - git__free(fdef); - } - - git_vector_free(®->filters); - git__free(reg); -} - -static int filter_registry_initialize(void) -{ - int error = 0; - struct filter_registry *reg; - - if (git__filter_registry) - return 0; - - reg = git__calloc(1, sizeof(struct filter_registry)); - GITERR_CHECK_ALLOC(reg); - - if ((error = git_vector_init( - ®->filters, 2, filter_def_priority_cmp)) < 0) - goto cleanup; +static void git_filter_global_shutdown(void); - reg = git__compare_and_swap(&git__filter_registry, NULL, reg); - if (reg != NULL) - goto cleanup; - - git__on_shutdown(filter_registry_shutdown); - - /* try to register both default filters */ - { - git_filter *crlf = git_crlf_filter_new(); - git_filter *ident = git_ident_filter_new(); - - if (crlf && git_filter_register( - GIT_FILTER_CRLF, crlf, GIT_FILTER_CRLF_PRIORITY) < 0) - crlf = NULL; - if (ident && git_filter_register( - GIT_FILTER_IDENT, ident, GIT_FILTER_IDENT_PRIORITY) < 0) - ident = NULL; - - if (!crlf || !ident) - return -1; - } - - return 0; - -cleanup: - git_vector_free(®->filters); - git__free(reg); - return error; -} static int filter_def_scan_attrs( git_buf *attrs, size_t *nattr, size_t *nmatch, const char *attr_str) @@ -210,40 +145,14 @@ static int filter_def_filter_key_check(const void *key, const void *fdef) return (key == filter) ? 0 : -1; } -static int filter_registry_find(size_t *pos, const char *name) -{ - return git_vector_search2( - pos, &git__filter_registry->filters, filter_def_name_key_check, name); -} - -static git_filter_def *filter_registry_lookup(size_t *pos, const char *name) -{ - git_filter_def *fdef = NULL; - - if (!filter_registry_find(pos, name)) - fdef = git_vector_get(&git__filter_registry->filters, *pos); - - return fdef; -} - -int git_filter_register( +/* Note: callers must lock the registry before calling this function */ +static int filter_registry_insert( const char *name, git_filter *filter, int priority) { git_filter_def *fdef; size_t nattr = 0, nmatch = 0, alloc_len; git_buf attrs = GIT_BUF_INIT; - assert(name && filter); - - if (filter_registry_initialize() < 0) - return -1; - - if (!filter_registry_find(NULL, name)) { - giterr_set( - GITERR_FILTER, "Attempt to reregister existing filter '%s'", name); - return GIT_EEXISTS; - } - if (filter_def_scan_attrs(&attrs, &nattr, &nmatch, filter->attributes) < 0) return -1; @@ -265,21 +174,123 @@ int git_filter_register( filter_def_set_attrs(fdef); - if (git_vector_insert(&git__filter_registry->filters, fdef) < 0) { + if (git_vector_insert(&filter_registry.filters, fdef) < 0) { git__free(fdef->filter_name); git__free(fdef->attrdata); git__free(fdef); return -1; } - git_vector_sort(&git__filter_registry->filters); + git_vector_sort(&filter_registry.filters); return 0; } +int git_filter_global_init(void) +{ + git_filter *crlf = NULL, *ident = NULL; + int error = 0; + + if (git_rwlock_init(&filter_registry.lock) < 0) + return -1; + + if ((error = git_vector_init(&filter_registry.filters, 2, + filter_def_priority_cmp)) < 0) + goto done; + + if ((crlf = git_crlf_filter_new()) == NULL || + filter_registry_insert( + GIT_FILTER_CRLF, crlf, GIT_FILTER_CRLF_PRIORITY) < 0 || + (ident = git_ident_filter_new()) == NULL || + filter_registry_insert( + GIT_FILTER_IDENT, ident, GIT_FILTER_IDENT_PRIORITY) < 0) + error = -1; + + git__on_shutdown(git_filter_global_shutdown); + +done: + if (error) { + git_filter_free(crlf); + git_filter_free(ident); + } + + return error; +} + +static void git_filter_global_shutdown(void) +{ + size_t pos; + git_filter_def *fdef; + + if (git_rwlock_wrlock(&filter_registry.lock) < 0) + return; + + git_vector_foreach(&filter_registry.filters, pos, fdef) { + if (fdef->filter && fdef->filter->shutdown) { + fdef->filter->shutdown(fdef->filter); + fdef->initialized = false; + } + + git__free(fdef->filter_name); + git__free(fdef->attrdata); + git__free(fdef); + } + + git_vector_free(&filter_registry.filters); + + git_rwlock_wrunlock(&filter_registry.lock); + git_rwlock_free(&filter_registry.lock); +} + +/* Note: callers must lock the registry before calling this function */ +static int filter_registry_find(size_t *pos, const char *name) +{ + return git_vector_search2( + pos, &filter_registry.filters, filter_def_name_key_check, name); +} + +/* Note: callers must lock the registry before calling this function */ +static git_filter_def *filter_registry_lookup(size_t *pos, const char *name) +{ + git_filter_def *fdef = NULL; + + if (!filter_registry_find(pos, name)) + fdef = git_vector_get(&filter_registry.filters, *pos); + + return fdef; +} + + +int git_filter_register( + const char *name, git_filter *filter, int priority) +{ + int error; + + assert(name && filter); + + if (git_rwlock_wrlock(&filter_registry.lock) < 0) { + giterr_set(GITERR_OS, "failed to lock filter registry"); + return -1; + } + + if (!filter_registry_find(NULL, name)) { + giterr_set( + GITERR_FILTER, "attempt to reregister existing filter '%s'", name); + error = GIT_EEXISTS; + goto done; + } + + error = filter_registry_insert(name, filter, priority); + +done: + git_rwlock_wrunlock(&filter_registry.lock); + return error; +} + int git_filter_unregister(const char *name) { size_t pos; git_filter_def *fdef; + int error = 0; assert(name); @@ -289,12 +300,18 @@ int git_filter_unregister(const char *name) return -1; } + if (git_rwlock_wrlock(&filter_registry.lock) < 0) { + giterr_set(GITERR_OS, "failed to lock filter registry"); + return -1; + } + if ((fdef = filter_registry_lookup(&pos, name)) == NULL) { giterr_set(GITERR_FILTER, "Cannot find filter '%s' to unregister", name); - return GIT_ENOTFOUND; + error = GIT_ENOTFOUND; + goto done; } - (void)git_vector_remove(&git__filter_registry->filters, pos); + git_vector_remove(&filter_registry.filters, pos); if (fdef->initialized && fdef->filter && fdef->filter->shutdown) { fdef->filter->shutdown(fdef->filter); @@ -305,21 +322,18 @@ int git_filter_unregister(const char *name) git__free(fdef->attrdata); git__free(fdef); - return 0; +done: + git_rwlock_wrunlock(&filter_registry.lock); + return error; } static int filter_initialize(git_filter_def *fdef) { int error = 0; - if (!fdef->initialized && - fdef->filter && - fdef->filter->initialize && - (error = fdef->filter->initialize(fdef->filter)) < 0) - { - /* auto-unregister if initialize fails */ - git_filter_unregister(fdef->filter_name); - return error; + if (!fdef->initialized && fdef->filter && fdef->filter->initialize) { + if ((error = fdef->filter->initialize(fdef->filter)) < 0) + return error; } fdef->initialized = true; @@ -330,17 +344,22 @@ git_filter *git_filter_lookup(const char *name) { size_t pos; git_filter_def *fdef; + git_filter *filter = NULL; - if (filter_registry_initialize() < 0) + if (git_rwlock_rdlock(&filter_registry.lock) < 0) { + giterr_set(GITERR_OS, "failed to lock filter registry"); return NULL; + } - if ((fdef = filter_registry_lookup(&pos, name)) == NULL) - return NULL; + if ((fdef = filter_registry_lookup(&pos, name)) == NULL || + (!fdef->initialized && filter_initialize(fdef) < 0)) + goto done; - if (!fdef->initialized && filter_initialize(fdef) < 0) - return NULL; + filter = fdef->filter; - return fdef->filter; +done: + git_rwlock_rdunlock(&filter_registry.lock); + return filter; } void git_filter_free(git_filter *filter) @@ -433,8 +452,11 @@ static int filter_list_check_attributes( want_type = git_attr_value(want); found_type = git_attr_value(strs[i]); - if (want_type != found_type || - (want_type == GIT_ATTR_VALUE_T && strcmp(want, strs[i]))) + if (want_type != found_type) + error = GIT_ENOTFOUND; + else if (want_type == GIT_ATTR_VALUE_T && + strcmp(want, strs[i]) && + strcmp(want, "*")) error = GIT_ENOTFOUND; } @@ -475,8 +497,10 @@ int git_filter_list__load_ext( size_t idx; git_filter_def *fdef; - if (filter_registry_initialize() < 0) + if (git_rwlock_rdlock(&filter_registry.lock) < 0) { + giterr_set(GITERR_OS, "failed to lock filter registry"); return -1; + } src.repo = repo; src.path = path; @@ -486,7 +510,7 @@ int git_filter_list__load_ext( if (blob) git_oid_cpy(&src.oid, git_blob_id(blob)); - git_vector_foreach(&git__filter_registry->filters, idx, fdef) { + git_vector_foreach(&filter_registry.filters, idx, fdef) { const char **values = NULL; void *payload = NULL; @@ -520,7 +544,7 @@ int git_filter_list__load_ext( else { if (!fl) { if ((error = filter_list_new(&fl, &src)) < 0) - return error; + break; fl->temp_buf = filter_opts->temp_buf; } @@ -534,6 +558,8 @@ int git_filter_list__load_ext( } } + git_rwlock_rdunlock(&filter_registry.lock); + if (error && fl != NULL) { git_array_clear(fl->filters); git__free(fl); @@ -601,20 +627,28 @@ int git_filter_list_push( { int error = 0; size_t pos; - git_filter_def *fdef; + git_filter_def *fdef = NULL; git_filter_entry *fe; assert(fl && filter); + if (git_rwlock_rdlock(&filter_registry.lock) < 0) { + giterr_set(GITERR_OS, "failed to lock filter registry"); + return -1; + } + if (git_vector_search2( - &pos, &git__filter_registry->filters, - filter_def_filter_key_check, filter) < 0) { + &pos, &filter_registry.filters, + filter_def_filter_key_check, filter) == 0) + fdef = git_vector_get(&filter_registry.filters, pos); + + git_rwlock_rdunlock(&filter_registry.lock); + + if (fdef == NULL) { giterr_set(GITERR_FILTER, "Cannot use an unregistered filter"); return -1; } - fdef = git_vector_get(&git__filter_registry->filters, pos); - if (!fdef->initialized && (error = filter_initialize(fdef)) < 0) return error; diff --git a/vendor/libgit2/src/filter.h b/vendor/libgit2/src/filter.h index 5062afba5..9bd835f94 100644 --- a/vendor/libgit2/src/filter.h +++ b/vendor/libgit2/src/filter.h @@ -32,6 +32,8 @@ typedef struct { #define GIT_FILTER_OPTIONS_INIT {0} +extern int git_filter_global_init(void); + extern void git_filter_free(git_filter *filter); extern int git_filter_list__load_ext( diff --git a/vendor/libgit2/src/global.c b/vendor/libgit2/src/global.c index 3f20bfd31..adf353d35 100644 --- a/vendor/libgit2/src/global.c +++ b/vendor/libgit2/src/global.c @@ -8,26 +8,26 @@ #include "global.h" #include "hash.h" #include "sysdir.h" -#include "git2/global.h" -#include "git2/sys/openssl.h" +#include "filter.h" +#include "openssl_stream.h" #include "thread-utils.h" +#include "git2/global.h" +#include "transports/ssh.h" +#if defined(GIT_MSVC_CRTDBG) +#include "win32/w32_stack.h" +#include "win32/w32_crtdbg_stacktrace.h" +#endif git_mutex git__mwindow_mutex; #define MAX_SHUTDOWN_CB 8 -#ifdef GIT_OPENSSL -# include -SSL_CTX *git__ssl_ctx; -# ifdef GIT_THREADS -static git_mutex *openssl_locks; -# endif -#endif - static git_global_shutdown_fn git__shutdown_callbacks[MAX_SHUTDOWN_CB]; static git_atomic git__n_shutdown_callbacks; static git_atomic git__n_inits; +char *git__user_agent; +char *git__ssl_ciphers; void git__on_shutdown(git_global_shutdown_fn callback) { @@ -45,118 +45,50 @@ static void git__global_state_cleanup(git_global_st *st) st->error_t.message = NULL; } -static void git__shutdown(void) -{ - int pos; - - /* Shutdown subsystems that have registered */ - for (pos = git_atomic_get(&git__n_shutdown_callbacks); pos > 0; pos = git_atomic_dec(&git__n_shutdown_callbacks)) { - git_global_shutdown_fn cb = git__swap(git__shutdown_callbacks[pos - 1], NULL); - if (cb != NULL) - cb(); - } -} - -#if defined(GIT_THREADS) && defined(GIT_OPENSSL) -void openssl_locking_function(int mode, int n, const char *file, int line) +static int init_common(void) { - int lock; - - GIT_UNUSED(file); - GIT_UNUSED(line); - - lock = mode & CRYPTO_LOCK; + int ret; - if (lock) { - git_mutex_lock(&openssl_locks[n]); - } else { - git_mutex_unlock(&openssl_locks[n]); - } -} + /* Initialize the CRT debug allocator first, before our first malloc */ +#if defined(GIT_MSVC_CRTDBG) + git_win32__crtdbg_stacktrace_init(); + git_win32__stack_init(); +#endif -static void shutdown_ssl_locking(void) -{ - int num_locks, i; + /* Initialize any other subsystems that have global state */ + if ((ret = git_hash_global_init()) == 0 && + (ret = git_sysdir_global_init()) == 0 && + (ret = git_filter_global_init()) == 0 && + (ret = git_transport_ssh_global_init()) == 0) + ret = git_openssl_stream_global_init(); - num_locks = CRYPTO_num_locks(); - CRYPTO_set_locking_callback(NULL); + GIT_MEMORY_BARRIER; - for (i = 0; i < num_locks; ++i) - git_mutex_free(openssl_locks); - git__free(openssl_locks); + return ret; } -#endif -static void init_ssl(void) +static void shutdown_common(void) { -#ifdef GIT_OPENSSL - long ssl_opts = SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3; + int pos; - /* Older OpenSSL and MacOS OpenSSL doesn't have this */ -#ifdef SSL_OP_NO_COMPRESSION - ssl_opts |= SSL_OP_NO_COMPRESSION; -#endif + /* Shutdown subsystems that have registered */ + for (pos = git_atomic_get(&git__n_shutdown_callbacks); + pos > 0; + pos = git_atomic_dec(&git__n_shutdown_callbacks)) { - SSL_load_error_strings(); - OpenSSL_add_ssl_algorithms(); - /* - * Load SSLv{2,3} and TLSv1 so that we can talk with servers - * which use the SSL hellos, which are often used for - * compatibility. We then disable SSL so we only allow OpenSSL - * to speak TLSv1 to perform the encryption itself. - */ - git__ssl_ctx = SSL_CTX_new(SSLv23_method()); - SSL_CTX_set_options(git__ssl_ctx, ssl_opts); - SSL_CTX_set_mode(git__ssl_ctx, SSL_MODE_AUTO_RETRY); - SSL_CTX_set_verify(git__ssl_ctx, SSL_VERIFY_NONE, NULL); - if (!SSL_CTX_set_default_verify_paths(git__ssl_ctx)) { - SSL_CTX_free(git__ssl_ctx); - git__ssl_ctx = NULL; - } -#endif -} + git_global_shutdown_fn cb = git__swap( + git__shutdown_callbacks[pos - 1], NULL); -/** - * This function aims to clean-up the SSL context which - * we allocated. - */ -static void uninit_ssl(void) -{ -#ifdef GIT_OPENSSL - if (git__ssl_ctx) { - SSL_CTX_free(git__ssl_ctx); - git__ssl_ctx = NULL; + if (cb != NULL) + cb(); } -#endif -} -int git_openssl_set_locking(void) -{ -#ifdef GIT_OPENSSL -# ifdef GIT_THREADS - int num_locks, i; - - num_locks = CRYPTO_num_locks(); - openssl_locks = git__calloc(num_locks, sizeof(git_mutex)); - GITERR_CHECK_ALLOC(openssl_locks); - - for (i = 0; i < num_locks; i++) { - if (git_mutex_init(&openssl_locks[i]) != 0) { - giterr_set(GITERR_SSL, "failed to initialize openssl locks"); - return -1; - } - } + git__free(git__user_agent); + git__free(git__ssl_ciphers); - CRYPTO_set_locking_callback(openssl_locking_function); - git__on_shutdown(shutdown_ssl_locking); - return 0; -# else - giterr_set(GITERR_THREAD, "libgit2 as not built with threads"); - return -1; -# endif -#else - giterr_set(GITERR_SSL, "libgit2 was not built with OpenSSL support"); - return -1; +#if defined(GIT_MSVC_CRTDBG) + git_win32__crtdbg_stacktrace_cleanup(); + git_win32__stack_cleanup(); #endif } @@ -204,14 +136,13 @@ static int synchronized_threads_init(void) int error; _tls_index = TlsAlloc(); + + win32_pthread_initialize(); + if (git_mutex_init(&git__mwindow_mutex)) return -1; - /* Initialize any other subsystems that have global state */ - if ((error = git_hash_global_init()) >= 0) - error = git_sysdir_global_init(); - - win32_pthread_initialize(); + error = init_common(); return error; } @@ -235,17 +166,6 @@ int git_libgit2_init(void) return ret; } -static void synchronized_threads_shutdown(void) -{ - /* Shut down any subsystems that have global state */ - git__shutdown(); - - git__free_tls_data(); - - TlsFree(_tls_index); - git_mutex_free(&git__mwindow_mutex); -} - int git_libgit2_shutdown(void) { int ret; @@ -254,8 +174,14 @@ int git_libgit2_shutdown(void) while (InterlockedCompareExchange(&_mutex, 1, 0)) { Sleep(0); } /* Only do work on a 1 -> 0 transition of the refcount */ - if ((ret = git_atomic_dec(&git__n_inits)) == 0) - synchronized_threads_shutdown(); + if ((ret = git_atomic_dec(&git__n_inits)) == 0) { + shutdown_common(); + + git__free_tls_data(); + + TlsFree(_tls_index); + git_mutex_free(&git__mwindow_mutex); + } /* Exit the lock */ InterlockedExchange(&_mutex, 0); @@ -265,18 +191,19 @@ int git_libgit2_shutdown(void) git_global_st *git__global_state(void) { - void *ptr; + git_global_st *ptr; assert(git_atomic_get(&git__n_inits) > 0); if ((ptr = TlsGetValue(_tls_index)) != NULL) return ptr; - ptr = git__malloc(sizeof(git_global_st)); + ptr = git__calloc(1, sizeof(git_global_st)); if (!ptr) return NULL; - memset(ptr, 0x0, sizeof(git_global_st)); + git_buf_init(&ptr->error_buf, 0); + TlsSetValue(_tls_index, ptr); return ptr; } @@ -297,6 +224,20 @@ void git__free_tls_data(void) TlsSetValue(_tls_index, NULL); } +BOOL WINAPI DllMain(HINSTANCE hInstDll, DWORD fdwReason, LPVOID lpvReserved) +{ + /* This is how Windows lets us know our thread is being shut down */ + if (fdwReason == DLL_THREAD_DETACH) { + git__free_tls_data(); + } + + /* + * Windows pays attention to this during library loading. We don't do anything + * so we trivially succeed. + */ + return TRUE; +} + #elif defined(GIT_THREADS) && defined(_POSIX_THREADS) static pthread_key_t _tls_key; @@ -313,25 +254,18 @@ static void init_once(void) { if ((init_error = git_mutex_init(&git__mwindow_mutex)) != 0) return; - pthread_key_create(&_tls_key, &cb__free_status); - - - /* Initialize any other subsystems that have global state */ - if ((init_error = git_hash_global_init()) >= 0) - init_error = git_sysdir_global_init(); - /* OpenSSL needs to be initialized from the main thread */ - init_ssl(); + pthread_key_create(&_tls_key, &cb__free_status); - GIT_MEMORY_BARRIER; + init_error = init_common(); } int git_libgit2_init(void) { int ret; - pthread_once(&_once_init, init_once); ret = git_atomic_inc(&git__n_inits); + pthread_once(&_once_init, init_once); return init_error ? init_error : ret; } @@ -346,8 +280,7 @@ int git_libgit2_shutdown(void) return ret; /* Shut down any subsystems that have global state */ - git__shutdown(); - uninit_ssl(); + shutdown_common(); ptr = pthread_getspecific(_tls_key); pthread_setspecific(_tls_key, NULL); @@ -364,18 +297,18 @@ int git_libgit2_shutdown(void) git_global_st *git__global_state(void) { - void *ptr; + git_global_st *ptr; assert(git_atomic_get(&git__n_inits) > 0); if ((ptr = pthread_getspecific(_tls_key)) != NULL) return ptr; - ptr = git__malloc(sizeof(git_global_st)); + ptr = git__calloc(1, sizeof(git_global_st)); if (!ptr) return NULL; - memset(ptr, 0x0, sizeof(git_global_st)); + git_buf_init(&ptr->error_buf, 0); pthread_setspecific(_tls_key, ptr); return ptr; } @@ -386,14 +319,16 @@ static git_global_st __state; int git_libgit2_init(void) { - static int ssl_inited = 0; + int ret; - if (!ssl_inited) { - init_ssl(); - ssl_inited = 1; - } + /* Only init SSL the first time */ + if ((ret = git_atomic_inc(&git__n_inits)) != 1) + return ret; - return git_atomic_inc(&git__n_inits); + if ((ret = init_common()) < 0) + return ret; + + return 1; } int git_libgit2_shutdown(void) @@ -401,14 +336,12 @@ int git_libgit2_shutdown(void) int ret; /* Shut down any subsystems that have global state */ - if ((ret = git_atomic_dec(&git__n_inits)) != 0) - return ret; - - git__shutdown(); - git__global_state_cleanup(&__state); - uninit_ssl(); + if ((ret = git_atomic_dec(&git__n_inits)) == 0) { + shutdown_common(); + git__global_state_cleanup(&__state); + } - return 0; + return ret; } git_global_st *git__global_state(void) diff --git a/vendor/libgit2/src/global.h b/vendor/libgit2/src/global.h index fdad6ba89..219951525 100644 --- a/vendor/libgit2/src/global.h +++ b/vendor/libgit2/src/global.h @@ -14,6 +14,7 @@ typedef struct { git_error *last_error; git_error error_t; + git_buf error_buf; char oid_fmt[GIT_OID_HEXSZ+1]; } git_global_st; @@ -34,4 +35,7 @@ extern void git__on_shutdown(git_global_shutdown_fn callback); extern void git__free_tls_data(void); +extern const char *git_libgit2__user_agent(void); +extern const char *git_libgit2__ssl_ciphers(void); + #endif diff --git a/vendor/libgit2/src/idxmap.h b/vendor/libgit2/src/idxmap.h new file mode 100644 index 000000000..4122a89fe --- /dev/null +++ b/vendor/libgit2/src/idxmap.h @@ -0,0 +1,93 @@ +/* + * Copyright (C) the libgit2 contributors. All rights reserved. + * + * This file is part of libgit2, distributed under the GNU GPL v2 with + * a Linking Exception. For full terms see the included COPYING file. + */ +#ifndef INCLUDE_idxmap_h__ +#define INCLUDE_idxmap_h__ + +#include +#include "common.h" +#include "git2/index.h" + +#define kmalloc git__malloc +#define kcalloc git__calloc +#define krealloc git__realloc +#define kreallocarray git__reallocarray +#define kfree git__free +#include "khash.h" + +__KHASH_TYPE(idx, const git_index_entry *, git_index_entry *) +__KHASH_TYPE(idxicase, const git_index_entry *, git_index_entry *) + +typedef khash_t(idx) git_idxmap; +typedef khash_t(idxicase) git_idxmap_icase; + +typedef khiter_t git_idxmap_iter; + +/* This is __ac_X31_hash_string but with tolower and it takes the entry's stage into account */ +static kh_inline khint_t idxentry_hash(const git_index_entry *e) +{ + const char *s = e->path; + khint_t h = (khint_t)git__tolower(*s); + if (h) for (++s ; *s; ++s) h = (h << 5) - h + (khint_t)git__tolower(*s); + return h + GIT_IDXENTRY_STAGE(e); +} + +#define idxentry_equal(a, b) (GIT_IDXENTRY_STAGE(a) == GIT_IDXENTRY_STAGE(b) && strcmp(a->path, b->path) == 0) +#define idxentry_icase_equal(a, b) (GIT_IDXENTRY_STAGE(a) == GIT_IDXENTRY_STAGE(b) && strcasecmp(a->path, b->path) == 0) + +#define GIT__USE_IDXMAP \ + __KHASH_IMPL(idx, static kh_inline, const git_index_entry *, git_index_entry *, 1, idxentry_hash, idxentry_equal) + +#define GIT__USE_IDXMAP_ICASE \ + __KHASH_IMPL(idxicase, static kh_inline, const git_index_entry *, git_index_entry *, 1, idxentry_hash, idxentry_icase_equal) + +#define git_idxmap_alloc(hp) \ + ((*(hp) = kh_init(idx)) == NULL) ? giterr_set_oom(), -1 : 0 + +#define git_idxmap_icase_alloc(hp) \ + ((*(hp) = kh_init(idxicase)) == NULL) ? giterr_set_oom(), -1 : 0 + +#define git_idxmap_insert(h, key, val, rval) do { \ + khiter_t __pos = kh_put(idx, h, key, &rval); \ + if (rval >= 0) { \ + if (rval == 0) kh_key(h, __pos) = key; \ + kh_val(h, __pos) = val; \ + } } while (0) + +#define git_idxmap_icase_insert(h, key, val, rval) do { \ + khiter_t __pos = kh_put(idxicase, h, key, &rval); \ + if (rval >= 0) { \ + if (rval == 0) kh_key(h, __pos) = key; \ + kh_val(h, __pos) = val; \ + } } while (0) + +#define git_idxmap_lookup_index(h, k) kh_get(idx, h, k) +#define git_idxmap_icase_lookup_index(h, k) kh_get(idxicase, h, k) +#define git_idxmap_value_at(h, idx) kh_val(h, idx) +#define git_idxmap_valid_index(h, idx) (idx != kh_end(h)) +#define git_idxmap_has_data(h, idx) kh_exist(h, idx) + +#define git_idxmap_resize(h,s) kh_resize(idx, h, s) +#define git_idxmap_free(h) kh_destroy(idx, h), h = NULL +#define git_idxmap_clear(h) kh_clear(idx, h) + +#define git_idxmap_delete_at(h, id) kh_del(idx, h, id) +#define git_idxmap_icase_delete_at(h, id) kh_del(idxicase, h, id) + +#define git_idxmap_delete(h, key) do { \ + khiter_t __pos = git_idxmap_lookup_index(h, key); \ + if (git_idxmap_valid_index(h, __pos)) \ + git_idxmap_delete_at(h, __pos); } while (0) + +#define git_idxmap_icase_delete(h, key) do { \ + khiter_t __pos = git_idxmap_icase_lookup_index(h, key); \ + if (git_idxmap_valid_index(h, __pos)) \ + git_idxmap_icase_delete_at(h, __pos); } while (0) + +#define git_idxmap_begin kh_begin +#define git_idxmap_end kh_end + +#endif diff --git a/vendor/libgit2/src/ignore.c b/vendor/libgit2/src/ignore.c index 0031e4696..ac2af4f58 100644 --- a/vendor/libgit2/src/ignore.c +++ b/vendor/libgit2/src/ignore.c @@ -89,18 +89,20 @@ static int does_negate_rule(int *out, git_vector *rules, git_attr_fnmatch *match } /* - * If we're dealing with a directory (which we know via the - * strchr() check) we want to use 'dirname/' as the - * pattern so p_fnmatch() honours FNM_PATHNAME + * When dealing with a directory, we add '/' so + * p_fnmatch() honours FNM_PATHNAME. Checking for LEADINGDIR + * alone isn't enough as that's also set for nagations, so we + * need to check that NEGATIVE is off. */ git_buf_clear(&buf); if (rule->containing_dir) { git_buf_puts(&buf, rule->containing_dir); } - if (!strchr(rule->pattern, '*')) - error = git_buf_printf(&buf, "%s/*", rule->pattern); - else - error = git_buf_puts(&buf, rule->pattern); + + error = git_buf_puts(&buf, rule->pattern); + + if ((rule->flags & (GIT_ATTR_FNMATCH_LEADINGDIR | GIT_ATTR_FNMATCH_NEGATIVE)) == GIT_ATTR_FNMATCH_LEADINGDIR) + error = git_buf_PUTS(&buf, "/*"); if (error < 0) goto out; @@ -261,10 +263,18 @@ int git_ignore__for_path( goto cleanup; /* given a unrooted path in a non-bare repo, resolve it */ - if (workdir && git_path_root(path) < 0) - error = git_path_find_dir(&ignores->dir, path, workdir); - else + if (workdir && git_path_root(path) < 0) { + git_buf local = GIT_BUF_INIT; + + if ((error = git_path_dirname_r(&local, path)) < 0 || + (error = git_path_resolve_relative(&local, 0)) < 0 || + (error = git_path_to_dir(&local)) < 0 || + (error = git_buf_joinpath(&ignores->dir, workdir, local.ptr)) < 0) + {;} /* Nothing, we just want to stop on the first error */ + git_buf_free(&local); + } else { error = git_buf_joinpath(&ignores->dir, path, ""); + } if (error < 0) goto cleanup; diff --git a/vendor/libgit2/src/index.c b/vendor/libgit2/src/index.c index cb5902ea9..63e47965a 100644 --- a/vendor/libgit2/src/index.c +++ b/vendor/libgit2/src/index.c @@ -17,6 +17,8 @@ #include "pathspec.h" #include "ignore.h" #include "blob.h" +#include "idxmap.h" +#include "diff.h" #include "git2/odb.h" #include "git2/oid.h" @@ -24,6 +26,32 @@ #include "git2/config.h" #include "git2/sys/index.h" +GIT__USE_IDXMAP +GIT__USE_IDXMAP_ICASE + +#define INSERT_IN_MAP_EX(idx, map, e, err) do { \ + if ((idx)->ignore_case) \ + git_idxmap_icase_insert((khash_t(idxicase) *) (map), (e), (e), (err)); \ + else \ + git_idxmap_insert((map), (e), (e), (err)); \ + } while (0) + +#define INSERT_IN_MAP(idx, e, err) INSERT_IN_MAP_EX(idx, (idx)->entries_map, e, err) + +#define LOOKUP_IN_MAP(p, idx, k) do { \ + if ((idx)->ignore_case) \ + (p) = git_idxmap_icase_lookup_index((khash_t(idxicase) *) index->entries_map, (k)); \ + else \ + (p) = git_idxmap_lookup_index(index->entries_map, (k)); \ + } while (0) + +#define DELETE_IN_MAP(idx, e) do { \ + if ((idx)->ignore_case) \ + git_idxmap_icase_delete((khash_t(idxicase) *) (idx)->entries_map, (e)); \ + else \ + git_idxmap_delete((idx)->entries_map, (e)); \ + } while (0) + static int index_apply_to_wd_diff(git_index *index, int action, const git_strarray *paths, unsigned int flags, git_index_matched_path_cb cb, void *payload); @@ -328,28 +356,6 @@ static unsigned int index_merge_mode( return git_index__create_mode(mode); } -static int index_sort_if_needed(git_index *index, bool need_lock) -{ - /* not truly threadsafe because between when this checks and/or - * sorts the array another thread could come in and unsort it - */ - - if (git_vector_is_sorted(&index->entries)) - return 0; - - if (need_lock && git_mutex_lock(&index->lock) < 0) { - giterr_set(GITERR_OS, "Unable to lock index"); - return -1; - } - - git_vector_sort(&index->entries); - - if (need_lock) - git_mutex_unlock(&index->lock); - - return 0; -} - GIT_INLINE(int) index_find_in_entries( size_t *out, git_vector *entries, git_vector_cmp entry_srch, const char *path, size_t path_len, int stage) @@ -363,10 +369,9 @@ GIT_INLINE(int) index_find_in_entries( GIT_INLINE(int) index_find( size_t *out, git_index *index, - const char *path, size_t path_len, int stage, bool need_lock) + const char *path, size_t path_len, int stage) { - if (index_sort_if_needed(index, need_lock) < 0) - return -1; + git_vector_sort(&index->entries); return index_find_in_entries( out, &index->entries, index->entries_search, path, path_len, stage); @@ -390,7 +395,7 @@ void git_index__set_ignore_case(git_index *index, bool ignore_case) git_vector_set_cmp(&index->entries, ignore_case ? git_index_entry_icmp : git_index_entry_cmp); - index_sort_if_needed(index, true); + git_vector_sort(&index->entries); git_vector_set_cmp(&index->reuc, ignore_case ? reuc_icmp : reuc_cmp); git_vector_sort(&index->reuc); @@ -406,13 +411,7 @@ int git_index_open(git_index **index_out, const char *index_path) index = git__calloc(1, sizeof(git_index)); GITERR_CHECK_ALLOC(index); - if (git_mutex_init(&index->lock)) { - giterr_set(GITERR_OS, "Failed to initialize lock"); - git__free(index); - return -1; - } - - git_pool_init(&index->tree_pool, 1, 0); + git_pool_init(&index->tree_pool, 1); if (index_path != NULL) { index->index_file_path = git__strdup(index_path); @@ -425,6 +424,7 @@ int git_index_open(git_index **index_out, const char *index_path) } if (git_vector_init(&index->entries, 32, git_index_entry_cmp) < 0 || + git_idxmap_alloc(&index->entries_map) < 0 || git_vector_init(&index->names, 8, conflict_name_cmp) < 0 || git_vector_init(&index->reuc, 8, reuc_cmp) < 0 || git_vector_init(&index->deleted, 8, git_index_entry_cmp) < 0) @@ -462,13 +462,13 @@ static void index_free(git_index *index) assert(!git_atomic_get(&index->readers)); git_index_clear(index); + git_idxmap_free(index->entries_map); git_vector_free(&index->entries); git_vector_free(&index->names); git_vector_free(&index->reuc); git_vector_free(&index->deleted); git__free(index->index_file_path); - git_mutex_free(&index->lock); git__memzero(index, sizeof(*index)); git__free(index); @@ -508,6 +508,7 @@ static int index_remove_entry(git_index *index, size_t pos) if (entry != NULL) git_tree_cache_invalidate_path(index->tree, entry->path); + DELETE_IN_MAP(index, entry); error = git_vector_remove(&index->entries, pos); if (!error) { @@ -530,11 +531,7 @@ int git_index_clear(git_index *index) index->tree = NULL; git_pool_clear(&index->tree_pool); - if (git_mutex_lock(&index->lock) < 0) { - giterr_set(GITERR_OS, "Failed to lock index"); - return -1; - } - + git_idxmap_clear(index->entries_map); while (!error && index->entries.length > 0) error = index_remove_entry(index, index->entries.length - 1); index_free_deleted(index); @@ -544,8 +541,6 @@ int git_index_clear(git_index *index) git_futils_filestamp_set(&index->stamp, NULL); - git_mutex_unlock(&index->lock); - return error; } @@ -608,14 +603,14 @@ const git_oid *git_index_checksum(git_index *index) */ static int compare_checksum(git_index *index) { - int fd, error; + int fd; ssize_t bytes_read; git_oid checksum = {{ 0 }}; if ((fd = p_open(index->index_file_path, O_RDONLY)) < 0) return fd; - if ((error = p_lseek(fd, -20, SEEK_END)) < 0) { + if (p_lseek(fd, -20, SEEK_END) < 0) { p_close(fd); giterr_set(GITERR_OS, "failed to seek to end of file"); return -1; @@ -688,18 +683,13 @@ int git_index__changed_relative_to( return !!git_oid_cmp(&index->checksum, checksum); } -static bool is_racy_timestamp(git_time_t stamp, git_index_entry *entry) +static bool is_racy_entry(git_index *index, const git_index_entry *entry) { /* Git special-cases submodules in the check */ if (S_ISGITLINK(entry->mode)) return false; - /* If we never read the index, we can't have this race either */ - if (stamp == 0) - return false; - - /* If the timestamp is the same or newer than the index, it's racy */ - return ((int32_t) stamp) <= entry->mtime.seconds; + return git_index_entry_newer_than_index(entry, index); } /* @@ -711,9 +701,10 @@ static int truncate_racily_clean(git_index *index) size_t i; int error; git_index_entry *entry; - git_time_t ts = index->stamp.mtime; git_diff_options diff_opts = GIT_DIFF_OPTIONS_INIT; - git_diff *diff; + git_diff *diff = NULL; + git_vector paths = GIT_VECTOR_INIT; + git_diff_delta *delta; /* Nothing to do if there's no repo to talk about */ if (!INDEX_OWNER(index)) @@ -725,21 +716,33 @@ static int truncate_racily_clean(git_index *index) diff_opts.flags |= GIT_DIFF_INCLUDE_TYPECHANGE | GIT_DIFF_IGNORE_SUBMODULES | GIT_DIFF_DISABLE_PATHSPEC_MATCH; git_vector_foreach(&index->entries, i, entry) { - if (!is_racy_timestamp(ts, entry)) - continue; + if ((entry->flags_extended & GIT_IDXENTRY_UPTODATE) == 0 && + is_racy_entry(index, entry)) + git_vector_insert(&paths, (char *)entry->path); + } - diff_opts.pathspec.count = 1; - diff_opts.pathspec.strings = (char **) &entry->path; + if (paths.length == 0) + goto done; - if ((error = git_diff_index_to_workdir(&diff, INDEX_OWNER(index), index, &diff_opts)) < 0) - return error; + diff_opts.pathspec.count = paths.length; + diff_opts.pathspec.strings = (char **)paths.contents; - if (git_diff_num_deltas(diff) > 0) - entry->file_size = 0; + if ((error = git_diff_index_to_workdir(&diff, INDEX_OWNER(index), index, &diff_opts)) < 0) + return error; + + git_vector_foreach(&diff->deltas, i, delta) { + entry = (git_index_entry *)git_index_get_bypath(index, delta->old_file.path, 0); - git_diff_free(diff); + /* Ensure that we have a stage 0 for this file (ie, it's not a + * conflict), otherwise smudging it is quite pointless. + */ + if (entry) + entry->file_size = 0; } +done: + git_diff_free(diff); + git_vector_free(&paths); return 0; } @@ -796,53 +799,85 @@ const git_index_entry *git_index_get_byindex( git_index *index, size_t n) { assert(index); - if (index_sort_if_needed(index, true) < 0) - return NULL; + git_vector_sort(&index->entries); return git_vector_get(&index->entries, n); } const git_index_entry *git_index_get_bypath( git_index *index, const char *path, int stage) { - size_t pos; + khiter_t pos; + git_index_entry key = {{ 0 }}; assert(index); - if (index_find(&pos, index, path, 0, stage, true) < 0) { - giterr_set(GITERR_INDEX, "Index does not contain %s", path); - return NULL; - } + key.path = path; + GIT_IDXENTRY_STAGE_SET(&key, stage); + + LOOKUP_IN_MAP(pos, index, &key); - return git_index_get_byindex(index, pos); + if (git_idxmap_valid_index(index->entries_map, pos)) + return git_idxmap_value_at(index->entries_map, pos); + + giterr_set(GITERR_INDEX, "Index does not contain %s", path); + return NULL; } void git_index_entry__init_from_stat( git_index_entry *entry, struct stat *st, bool trust_mode) { - entry->ctime.seconds = (git_time_t)st->st_ctime; - entry->mtime.seconds = (git_time_t)st->st_mtime; - /* entry->mtime.nanoseconds = st->st_mtimensec; */ - /* entry->ctime.nanoseconds = st->st_ctimensec; */ + entry->ctime.seconds = (int32_t)st->st_ctime; + entry->mtime.seconds = (int32_t)st->st_mtime; +#if defined(GIT_USE_NSEC) + entry->mtime.nanoseconds = st->st_mtime_nsec; + entry->ctime.nanoseconds = st->st_ctime_nsec; +#endif entry->dev = st->st_rdev; entry->ino = st->st_ino; entry->mode = (!trust_mode && S_ISREG(st->st_mode)) ? git_index__create_mode(0666) : git_index__create_mode(st->st_mode); entry->uid = st->st_uid; entry->gid = st->st_gid; - entry->file_size = st->st_size; + entry->file_size = (uint32_t)st->st_size; +} + +static void index_entry_adjust_namemask( + git_index_entry *entry, + size_t path_length) +{ + entry->flags &= ~GIT_IDXENTRY_NAMEMASK; + + if (path_length < GIT_IDXENTRY_NAMEMASK) + entry->flags |= path_length & GIT_IDXENTRY_NAMEMASK; + else + entry->flags |= GIT_IDXENTRY_NAMEMASK; } +/* When `from_workdir` is true, we will validate the paths to avoid placing + * paths that are invalid for the working directory on the current filesystem + * (eg, on Windows, we will disallow `GIT~1`, `AUX`, `COM1`, etc). This + * function will *always* prevent `.git` and directory traversal `../` from + * being added to the index. + */ static int index_entry_create( git_index_entry **out, git_repository *repo, - const char *path) + const char *path, + bool from_workdir) { size_t pathlen = strlen(path), alloclen; struct entry_internal *entry; + unsigned int path_valid_flags = GIT_PATH_REJECT_INDEX_DEFAULTS; + + /* always reject placing `.git` in the index and directory traversal. + * when requested, disallow platform-specific filenames and upgrade to + * the platform-specific `.git` tests (eg, `git~1`, etc). + */ + if (from_workdir) + path_valid_flags |= GIT_PATH_REJECT_WORKDIR_DEFAULTS; - if (!git_path_isvalid(repo, path, - GIT_PATH_REJECT_DEFAULTS | GIT_PATH_REJECT_DOT_GIT)) { - giterr_set(GITERR_INDEX, "Invalid path: '%s'", path); + if (!git_path_isvalid(repo, path, path_valid_flags)) { + giterr_set(GITERR_INDEX, "invalid path: '%s'", path); return -1; } @@ -874,7 +909,7 @@ static int index_entry_init( "Could not initialize index entry. " "Index is not backed up by an existing repository."); - if (index_entry_create(&entry, INDEX_OWNER(index), rel_path) < 0) + if (index_entry_create(&entry, INDEX_OWNER(index), rel_path, true) < 0) return -1; /* write the blob to disk and get the oid and stat info */ @@ -928,42 +963,64 @@ static int index_entry_reuc_init(git_index_reuc_entry **reuc_out, *reuc_out = reuc = reuc_entry_alloc(path); GITERR_CHECK_ALLOC(reuc); - if ((reuc->mode[0] = ancestor_mode) > 0) + if ((reuc->mode[0] = ancestor_mode) > 0) { + assert(ancestor_oid); git_oid_cpy(&reuc->oid[0], ancestor_oid); + } - if ((reuc->mode[1] = our_mode) > 0) + if ((reuc->mode[1] = our_mode) > 0) { + assert(our_oid); git_oid_cpy(&reuc->oid[1], our_oid); + } - if ((reuc->mode[2] = their_mode) > 0) + if ((reuc->mode[2] = their_mode) > 0) { + assert(their_oid); git_oid_cpy(&reuc->oid[2], their_oid); + } return 0; } -static void index_entry_cpy(git_index_entry *tgt, const git_index_entry *src) +static void index_entry_cpy( + git_index_entry *tgt, + const git_index_entry *src) { const char *tgt_path = tgt->path; memcpy(tgt, src, sizeof(*tgt)); - tgt->path = tgt_path; /* reset to existing path data */ + tgt->path = tgt_path; } static int index_entry_dup( git_index_entry **out, - git_repository *repo, + git_index *index, const git_index_entry *src) { - git_index_entry *entry; + if (index_entry_create(out, INDEX_OWNER(index), src->path, false) < 0) + return -1; - if (!src) { - *out = NULL; - return 0; - } + index_entry_cpy(*out, src); + return 0; +} + +static void index_entry_cpy_nocache( + git_index_entry *tgt, + const git_index_entry *src) +{ + git_oid_cpy(&tgt->id, &src->id); + tgt->mode = src->mode; + tgt->flags = src->flags; + tgt->flags_extended = (src->flags_extended & GIT_IDXENTRY_EXTENDED_FLAGS); +} - if (index_entry_create(&entry, repo, src->path) < 0) +static int index_entry_dup_nocache( + git_index_entry **out, + git_index *index, + const git_index_entry *src) +{ + if (index_entry_create(out, INDEX_OWNER(index), src->path, false) < 0) return -1; - index_entry_cpy(entry, src); - *out = entry; + index_entry_cpy_nocache(*out, src); return 0; } @@ -1019,7 +1076,7 @@ static int has_dir_name(git_index *index, } len = slash - name; - if (!index_find(&pos, index, name, len, stage, false)) { + if (!index_find(&pos, index, name, len, stage)) { retval = -1; if (!ok_to_replace) break; @@ -1065,6 +1122,76 @@ static int check_file_directory_collision(git_index *index, return 0; } +static int canonicalize_directory_path( + git_index *index, + git_index_entry *entry, + git_index_entry *existing) +{ + const git_index_entry *match, *best = NULL; + char *search, *sep; + size_t pos, search_len, best_len; + + if (!index->ignore_case) + return 0; + + /* item already exists in the index, simply re-use the existing case */ + if (existing) { + memcpy((char *)entry->path, existing->path, strlen(existing->path)); + return 0; + } + + /* nothing to do */ + if (strchr(entry->path, '/') == NULL) + return 0; + + if ((search = git__strdup(entry->path)) == NULL) + return -1; + + /* starting at the parent directory and descending to the root, find the + * common parent directory. + */ + while (!best && (sep = strrchr(search, '/'))) { + sep[1] = '\0'; + + search_len = strlen(search); + + git_vector_bsearch2( + &pos, &index->entries, index->entries_search_path, search); + + while ((match = git_vector_get(&index->entries, pos))) { + if (GIT_IDXENTRY_STAGE(match) != 0) { + /* conflicts do not contribute to canonical paths */ + } else if (strncmp(search, match->path, search_len) == 0) { + /* prefer an exact match to the input filename */ + best = match; + best_len = search_len; + break; + } else if (strncasecmp(search, match->path, search_len) == 0) { + /* continue walking, there may be a path with an exact + * (case sensitive) match later in the index, but use this + * as the best match until that happens. + */ + if (!best) { + best = match; + best_len = search_len; + } + } else { + break; + } + + pos++; + } + + sep[0] = '\0'; + } + + if (best) + memcpy((char *)entry->path, best->path, best_len); + + git__free(search); + return 0; +} + static int index_no_dups(void **old, void *new) { const git_index_entry *entry = new; @@ -1074,18 +1201,76 @@ static int index_no_dups(void **old, void *new) return GIT_EEXISTS; } +static void index_existing_and_best( + git_index_entry **existing, + size_t *existing_position, + git_index_entry **best, + git_index *index, + const git_index_entry *entry) +{ + git_index_entry *e; + size_t pos; + int error; + + error = index_find(&pos, + index, entry->path, 0, GIT_IDXENTRY_STAGE(entry)); + + if (error == 0) { + *existing = index->entries.contents[pos]; + *existing_position = pos; + *best = index->entries.contents[pos]; + return; + } + + *existing = NULL; + *existing_position = 0; + *best = NULL; + + if (GIT_IDXENTRY_STAGE(entry) == 0) { + for (; pos < index->entries.length; pos++) { + int (*strcomp)(const char *a, const char *b) = + index->ignore_case ? git__strcasecmp : git__strcmp; + + e = index->entries.contents[pos]; + + if (strcomp(entry->path, e->path) != 0) + break; + + if (GIT_IDXENTRY_STAGE(e) == GIT_INDEX_STAGE_ANCESTOR) { + *best = e; + continue; + } else { + *best = e; + break; + } + } + } +} + /* index_insert takes ownership of the new entry - if it can't insert * it, then it will return an error **and also free the entry**. When * it replaces an existing entry, it will update the entry_ptr with the * actual entry in the index (and free the passed in one). + * + * trust_path is whether we use the given path, or whether (on case + * insensitive systems only) we try to canonicalize the given path to + * be within an existing directory. + * * trust_mode is whether we trust the mode in entry_ptr. + * + * trust_id is whether we trust the id or it should be validated. */ static int index_insert( - git_index *index, git_index_entry **entry_ptr, int replace, bool trust_mode) + git_index *index, + git_index_entry **entry_ptr, + int replace, + bool trust_path, + bool trust_mode, + bool trust_id) { int error = 0; size_t path_length, position; - git_index_entry *existing = NULL, *entry; + git_index_entry *existing, *best, *entry; assert(index && entry_ptr); @@ -1093,34 +1278,40 @@ static int index_insert( /* make sure that the path length flag is correct */ path_length = ((struct entry_internal *)entry)->pathlen; + index_entry_adjust_namemask(entry, path_length); - entry->flags &= ~GIT_IDXENTRY_NAMEMASK; + /* this entry is now up-to-date and should not be checked for raciness */ + entry->flags_extended |= GIT_IDXENTRY_UPTODATE; - if (path_length < GIT_IDXENTRY_NAMEMASK) - entry->flags |= path_length & GIT_IDXENTRY_NAMEMASK; - else - entry->flags |= GIT_IDXENTRY_NAMEMASK; + git_vector_sort(&index->entries); - if (git_mutex_lock(&index->lock) < 0) { - giterr_set(GITERR_OS, "Unable to acquire index lock"); - return -1; - } + /* look if an entry with this path already exists, either staged, or (if + * this entry is a regular staged item) as the "ours" side of a conflict. + */ + index_existing_and_best(&existing, &position, &best, index, entry); - git_vector_sort(&index->entries); + /* update the file mode */ + entry->mode = trust_mode ? + git_index__create_mode(entry->mode) : + index_merge_mode(index, best, entry->mode); - /* look if an entry with this path already exists */ - if (!index_find( - &position, index, entry->path, 0, GIT_IDXENTRY_STAGE(entry), false)) { - existing = index->entries.contents[position]; - /* update filemode to existing values if stat is not trusted */ - if (trust_mode) - entry->mode = git_index__create_mode(entry->mode); - else - entry->mode = index_merge_mode(index, existing, entry->mode); + /* canonicalize the directory name */ + if (!trust_path) + error = canonicalize_directory_path(index, entry, best); + + /* ensure that the given id exists (unless it's a submodule) */ + if (!error && !trust_id && INDEX_OWNER(index) && + (entry->mode & GIT_FILEMODE_COMMIT) != GIT_FILEMODE_COMMIT) { + + if (!git_object__is_valid(INDEX_OWNER(index), &entry->id, + git_object__type_from_filemode(entry->mode))) + error = -1; } /* look for tree / blob name collisions, removing conflicts if requested */ - error = check_file_directory_collision(index, entry, position, replace); + if (!error) + error = check_file_directory_collision(index, entry, position, replace); + if (error < 0) /* skip changes */; @@ -1128,8 +1319,13 @@ static int index_insert( * and return it in place of the passed in one. */ else if (existing) { - if (replace) + if (replace) { index_entry_cpy(existing, entry); + + if (trust_path) + memcpy((char *)existing->path, entry->path, strlen(entry->path)); + } + index_entry_free(entry); *entry_ptr = entry = existing; } @@ -1139,6 +1335,10 @@ static int index_insert( * check for dups, this is actually cheaper in the long run.) */ error = git_vector_insert_sorted(&index->entries, entry, index_no_dups); + + if (error == 0) { + INSERT_IN_MAP(index, entry, error); + } } if (error < 0) { @@ -1146,8 +1346,6 @@ static int index_insert( *entry_ptr = NULL; } - git_mutex_unlock(&index->lock); - return error; } @@ -1205,7 +1403,7 @@ int git_index_add_frombuffer( return -1; } - if (index_entry_dup(&entry, INDEX_OWNER(index), source_entry) < 0) + if (index_entry_dup(&entry, index, source_entry) < 0) return -1; error = git_blob_create_frombuffer(&id, INDEX_OWNER(index), buffer, len); @@ -1217,7 +1415,7 @@ int git_index_add_frombuffer( git_oid_cpy(&entry->id, &id); entry->file_size = len; - if ((error = index_insert(index, &entry, 1, true)) < 0) + if ((error = index_insert(index, &entry, 1, true, true, true)) < 0) return error; /* Adding implies conflict was resolved, move conflict entries to REUC */ @@ -1238,7 +1436,7 @@ static int add_repo_as_submodule(git_index_entry **out, git_index *index, const struct stat st; int error; - if (index_entry_create(&entry, INDEX_OWNER(index), path) < 0) + if (index_entry_create(&entry, INDEX_OWNER(index), path, true) < 0) return -1; if ((error = git_buf_joinpath(&abspath, git_repository_workdir(repo), path)) < 0) @@ -1276,7 +1474,7 @@ int git_index_add_bypath(git_index *index, const char *path) assert(index && path); if ((ret = index_entry_init(&entry, index, path)) == 0) - ret = index_insert(index, &entry, 1, false); + ret = index_insert(index, &entry, 1, false, false, true); /* If we were given a directory, let's see if it's a submodule */ if (ret < 0 && ret != GIT_EDIRECTORY) @@ -1286,13 +1484,13 @@ int git_index_add_bypath(git_index *index, const char *path) git_submodule *sm; git_error_state err; - giterr_capture(&err, ret); + giterr_state_capture(&err, ret); ret = git_submodule_lookup(&sm, INDEX_OWNER(index), path); if (ret == GIT_ENOTFOUND) - return giterr_restore(&err); + return giterr_state_restore(&err); - git__free(err.error_msg.message); + giterr_state_free(&err); /* * EEXISTS means that there is a repository at that path, but it's not known @@ -1302,7 +1500,7 @@ int git_index_add_bypath(git_index *index, const char *path) if ((ret = add_repo_as_submodule(&entry, index, path)) < 0) return ret; - if ((ret = index_insert(index, &entry, 1, false)) < 0) + if ((ret = index_insert(index, &entry, 1, false, false, true)) < 0) return ret; } else if (ret < 0) { return ret; @@ -1339,6 +1537,44 @@ int git_index_remove_bypath(git_index *index, const char *path) return 0; } +int git_index__fill(git_index *index, const git_vector *source_entries) +{ + const git_index_entry *source_entry = NULL; + size_t i; + int ret = 0; + + assert(index); + + if (!source_entries->length) + return 0; + + git_vector_size_hint(&index->entries, source_entries->length); + git_idxmap_resize(index->entries_map, (khint_t)(source_entries->length * 1.3)); + + git_vector_foreach(source_entries, i, source_entry) { + git_index_entry *entry = NULL; + + if ((ret = index_entry_dup(&entry, index, source_entry)) < 0) + break; + + index_entry_adjust_namemask(entry, ((struct entry_internal *)entry)->pathlen); + entry->flags_extended |= GIT_IDXENTRY_UPTODATE; + entry->mode = git_index__create_mode(entry->mode); + + if ((ret = git_vector_insert(&index->entries, entry)) < 0) + break; + + INSERT_IN_MAP(index, entry, ret); + if (ret < 0) + break; + } + + if (!ret) + git_vector_sort(&index->entries); + + return ret; +} + int git_index_add(git_index *index, const git_index_entry *source_entry) { @@ -1352,8 +1588,8 @@ int git_index_add(git_index *index, const git_index_entry *source_entry) return -1; } - if ((ret = index_entry_dup(&entry, INDEX_OWNER(index), source_entry)) < 0 || - (ret = index_insert(index, &entry, 1, true)) < 0) + if ((ret = index_entry_dup(&entry, index, source_entry)) < 0 || + (ret = index_insert(index, &entry, 1, true, true, false)) < 0) return ret; git_tree_cache_invalidate_path(index->tree, entry->path); @@ -1364,13 +1600,14 @@ int git_index_remove(git_index *index, const char *path, int stage) { int error; size_t position; + git_index_entry remove_key = {{ 0 }}; - if (git_mutex_lock(&index->lock) < 0) { - giterr_set(GITERR_OS, "Failed to lock index"); - return -1; - } + remove_key.path = path; + GIT_IDXENTRY_STAGE_SET(&remove_key, stage); - if (index_find(&position, index, path, 0, stage, false) < 0) { + DELETE_IN_MAP(index, &remove_key); + + if (index_find(&position, index, path, 0, stage) < 0) { giterr_set( GITERR_INDEX, "Index does not contain %s at stage %d", path, stage); error = GIT_ENOTFOUND; @@ -1378,7 +1615,6 @@ int git_index_remove(git_index *index, const char *path, int stage) error = index_remove_entry(index, position); } - git_mutex_unlock(&index->lock); return error; } @@ -1389,14 +1625,9 @@ int git_index_remove_directory(git_index *index, const char *dir, int stage) size_t pos; git_index_entry *entry; - if (git_mutex_lock(&index->lock) < 0) { - giterr_set(GITERR_OS, "Failed to lock index"); - return -1; - } - if (!(error = git_buf_sets(&pfx, dir)) && !(error = git_path_to_dir(&pfx))) - index_find(&pos, index, pfx.ptr, pfx.size, GIT_INDEX_STAGE_ANY, false); + index_find(&pos, index, pfx.ptr, pfx.size, GIT_INDEX_STAGE_ANY); while (!error) { entry = git_vector_get(&index->entries, pos); @@ -1413,17 +1644,33 @@ int git_index_remove_directory(git_index *index, const char *dir, int stage) /* removed entry at 'pos' so we don't need to increment */ } - git_mutex_unlock(&index->lock); git_buf_free(&pfx); return error; } +int git_index_find_prefix(size_t *at_pos, git_index *index, const char *prefix) +{ + int error = 0; + size_t pos; + const git_index_entry *entry; + + index_find(&pos, index, prefix, strlen(prefix), GIT_INDEX_STAGE_ANY); + entry = git_vector_get(&index->entries, pos); + if (!entry || git__prefixcmp(entry->path, prefix) != 0) + error = GIT_ENOTFOUND; + + if (!error && at_pos) + *at_pos = pos; + + return error; +} + int git_index__find_pos( size_t *out, git_index *index, const char *path, size_t path_len, int stage) { assert(index && path); - return index_find(out, index, path, path_len, stage, true); + return index_find(out, index, path, path_len, stage); } int git_index_find(size_t *at_pos, git_index *index, const char *path) @@ -1432,14 +1679,8 @@ int git_index_find(size_t *at_pos, git_index *index, const char *path) assert(index && path); - if (git_mutex_lock(&index->lock) < 0) { - giterr_set(GITERR_OS, "Failed to lock index"); - return -1; - } - if (git_vector_bsearch2( &pos, &index->entries, index->entries_search_path, path) < 0) { - git_mutex_unlock(&index->lock); giterr_set(GITERR_INDEX, "Index does not contain %s", path); return GIT_ENOTFOUND; } @@ -1457,7 +1698,6 @@ int git_index_find(size_t *at_pos, git_index *index, const char *path) if (at_pos) *at_pos = pos; - git_mutex_unlock(&index->lock); return 0; } @@ -1472,16 +1712,19 @@ int git_index_conflict_add(git_index *index, assert (index); - if ((ret = index_entry_dup(&entries[0], INDEX_OWNER(index), ancestor_entry)) < 0 || - (ret = index_entry_dup(&entries[1], INDEX_OWNER(index), our_entry)) < 0 || - (ret = index_entry_dup(&entries[2], INDEX_OWNER(index), their_entry)) < 0) + if ((ancestor_entry && + (ret = index_entry_dup(&entries[0], index, ancestor_entry)) < 0) || + (our_entry && + (ret = index_entry_dup(&entries[1], index, our_entry)) < 0) || + (their_entry && + (ret = index_entry_dup(&entries[2], index, their_entry)) < 0)) goto on_error; /* Validate entries */ for (i = 0; i < 3; i++) { if (entries[i] && !valid_filemode(entries[i]->mode)) { giterr_set(GITERR_INDEX, "invalid filemode for stage %d entry", - i); + i + 1); return -1; } } @@ -1508,7 +1751,7 @@ int git_index_conflict_add(git_index *index, /* Make sure stage is correct */ GIT_IDXENTRY_STAGE_SET(entries[i], i + 1); - if ((ret = index_insert(index, &entries[i], 0, true)) < 0) + if ((ret = index_insert(index, &entries[i], 1, true, true, false)) < 0) goto on_error; entries[i] = NULL; /* don't free if later entry fails */ @@ -1610,11 +1853,6 @@ static int index_conflict_remove(git_index *index, const char *path) if (path != NULL && git_index_find(&pos, index, path) < 0) return GIT_ENOTFOUND; - if (git_mutex_lock(&index->lock) < 0) { - giterr_set(GITERR_OS, "Unable to lock index"); - return -1; - } - while ((conflict_entry = git_vector_get(&index->entries, pos)) != NULL) { if (path != NULL && @@ -1630,8 +1868,6 @@ static int index_conflict_remove(git_index *index, const char *path) break; } - git_mutex_unlock(&index->lock); - return error; } @@ -1919,11 +2155,11 @@ static int read_reuc(git_index *index, const char *buffer, size_t size) /* read 3 ASCII octal numbers for stage entries */ for (i = 0; i < 3; i++) { - int tmp; + int64_t tmp; - if (git__strtol32(&tmp, buffer, &endptr, 8) < 0 || + if (git__strtol64(&tmp, buffer, &endptr, 8) < 0 || !endptr || endptr == buffer || *endptr || - (unsigned)tmp > UINT_MAX) { + tmp < 0) { index_entry_reuc_free(lost); return index_error_invalid("reading reuc entry stage"); } @@ -1977,9 +2213,10 @@ static int read_conflict_names(git_index *index, const char *buffer, size_t size #define read_conflict_name(ptr) \ len = p_strnlen(buffer, size) + 1; \ - if (size < len) \ - return index_error_invalid("reading conflict name entries"); \ - \ + if (size < len) { \ + index_error_invalid("reading conflict name entries"); \ + goto out_err; \ + } \ if (len == 1) \ ptr = NULL; \ else { \ @@ -2000,7 +2237,16 @@ static int read_conflict_names(git_index *index, const char *buffer, size_t size read_conflict_name(conflict_name->theirs); if (git_vector_insert(&index->names, conflict_name) < 0) - return -1; + goto out_err; + + continue; + +out_err: + git__free(conflict_name->ancestor); + git__free(conflict_name->ours); + git__free(conflict_name->theirs); + git__free(conflict_name); + return -1; } #undef read_conflict_name @@ -2079,7 +2325,7 @@ static size_t read_entry( entry.path = (char *)path_ptr; - if (index_entry_dup(out, INDEX_OWNER(index), &entry) < 0) + if (index_entry_dup(out, index, &entry) < 0) return 0; return entry_size; @@ -2170,13 +2416,13 @@ static int parse_index(git_index *index, const char *buffer, size_t buffer_size) seek_forward(INDEX_HEADER_SIZE); - if (git_mutex_lock(&index->lock) < 0) { - giterr_set(GITERR_OS, "Unable to acquire index lock"); - return -1; - } - assert(!index->entries.length); + if (index->ignore_case) + kh_resize(idxicase, (khash_t(idxicase) *) index->entries_map, header.entry_count); + else + kh_resize(idx, index->entries_map, header.entry_count); + /* Parse all the entries */ for (i = 0; i < header.entry_count && buffer_size > INDEX_FOOTER_SIZE; ++i) { git_index_entry *entry; @@ -2193,6 +2439,14 @@ static int parse_index(git_index *index, const char *buffer, size_t buffer_size) goto done; } + INSERT_IN_MAP(index, entry, error); + + if (error < 0) { + index_entry_free(entry); + goto done; + } + error = 0; + seek_forward(entry_size); } @@ -2239,10 +2493,9 @@ static int parse_index(git_index *index, const char *buffer, size_t buffer_size) * in-memory index is supposed to be case-insensitive */ git_vector_set_sorted(&index->entries, !index->ignore_case); - error = index_sort_if_needed(index, false); + git_vector_sort(&index->entries); done: - git_mutex_unlock(&index->lock); return error; } @@ -2313,7 +2566,8 @@ static int write_disk_entry(git_filebuf *file, git_index_entry *entry) if (entry->flags & GIT_IDXENTRY_EXTENDED) { struct entry_long *ondisk_ext; ondisk_ext = (struct entry_long *)ondisk; - ondisk_ext->flags_extended = htons(entry->flags_extended); + ondisk_ext->flags_extended = htons(entry->flags_extended & + GIT_IDXENTRY_EXTENDED_FLAGS); path = ondisk_ext->path; } else @@ -2331,11 +2585,6 @@ static int write_entries(git_index *index, git_filebuf *file) git_vector case_sorted, *entries; git_index_entry *entry; - if (git_mutex_lock(&index->lock) < 0) { - giterr_set(GITERR_OS, "Failed to lock index"); - return -1; - } - /* If index->entries is sorted case-insensitively, then we need * to re-sort it case-sensitively before writing */ if (index->ignore_case) { @@ -2350,8 +2599,6 @@ static int write_entries(git_index *index, git_filebuf *file) if ((error = write_disk_entry(file, entry)) < 0) break; - git_mutex_unlock(&index->lock); - if (index->ignore_case) git_vector_free(&case_sorted); @@ -2496,6 +2743,15 @@ static int write_tree_extension(git_index *index, git_filebuf *file) return error; } +static void clear_uptodate(git_index *index) +{ + git_index_entry *entry; + size_t i; + + git_vector_foreach(&index->entries, i, entry) + entry->flags_extended &= ~GIT_IDXENTRY_UPTODATE; +} + static int write_index(git_oid *checksum, git_index *index, git_filebuf *file) { git_oid hash_final; @@ -2535,7 +2791,13 @@ static int write_index(git_oid *checksum, git_index *index, git_filebuf *file) git_oid_cpy(checksum, &hash_final); /* write it at the end of the file */ - return git_filebuf_write(file, hash_final.id, GIT_OID_RAWSZ); + if (git_filebuf_write(file, hash_final.id, GIT_OID_RAWSZ) < 0) + return -1; + + /* file entries are no longer up to date */ + clear_uptodate(index); + + return 0; } int git_index_entry_stage(const git_index_entry *entry) @@ -2570,11 +2832,11 @@ static int read_tree_cb( if (git_buf_joinpath(&path, root, tentry->filename) < 0) return -1; - if (index_entry_create(&entry, INDEX_OWNER(data->index), path.ptr) < 0) + if (index_entry_create(&entry, INDEX_OWNER(data->index), path.ptr, false) < 0) return -1; entry->mode = tentry->attr; - entry->id = tentry->oid; + git_oid_cpy(&entry->id, git_tree_entry_id(tentry)); /* look for corresponding old entry and copy data to new entry */ if (data->old_entries != NULL && @@ -2588,11 +2850,7 @@ static int read_tree_cb( entry->flags_extended = 0; } - if (path.size < GIT_IDXENTRY_NAMEMASK) - entry->flags = path.size & GIT_IDXENTRY_NAMEMASK; - else - entry->flags = GIT_IDXENTRY_NAMEMASK; - + index_entry_adjust_namemask(entry, path.size); git_buf_free(&path); if (git_vector_insert(data->new_entries, entry) < 0) { @@ -2607,7 +2865,13 @@ int git_index_read_tree(git_index *index, const git_tree *tree) { int error = 0; git_vector entries = GIT_VECTOR_INIT; + git_idxmap *entries_map; read_tree_data data; + size_t i; + git_index_entry *e; + + if (git_idxmap_alloc(&entries_map) < 0) + return -1; git_vector_set_cmp(&entries, index->entries._cmp); /* match sort */ @@ -2619,26 +2883,39 @@ int git_index_read_tree(git_index *index, const git_tree *tree) index->tree = NULL; git_pool_clear(&index->tree_pool); - if (index_sort_if_needed(index, true) < 0) - return -1; + git_vector_sort(&index->entries); - error = git_tree_walk(tree, GIT_TREEWALK_POST, read_tree_cb, &data); + if ((error = git_tree_walk(tree, GIT_TREEWALK_POST, read_tree_cb, &data)) < 0) + goto cleanup; - if (!error) { - git_vector_sort(&entries); + if (index->ignore_case) + kh_resize(idxicase, (khash_t(idxicase) *) entries_map, entries.length); + else + kh_resize(idx, entries_map, entries.length); - if ((error = git_index_clear(index)) < 0) - /* well, this isn't good */; - else if (git_mutex_lock(&index->lock) < 0) { - giterr_set(GITERR_OS, "Unable to acquire index lock"); - error = -1; - } else { - git_vector_swap(&entries, &index->entries); - git_mutex_unlock(&index->lock); + git_vector_foreach(&entries, i, e) { + INSERT_IN_MAP_EX(index, entries_map, e, error); + + if (error < 0) { + giterr_set(GITERR_INDEX, "failed to insert entry into map"); + return error; } } + error = 0; + + git_vector_sort(&entries); + + if ((error = git_index_clear(index)) < 0) { + /* well, this isn't good */; + } else { + git_vector_swap(&entries, &index->entries); + entries_map = git__swap(index->entries_map, entries_map); + } + +cleanup: git_vector_free(&entries); + git_idxmap_free(entries_map); if (error < 0) return error; @@ -2653,30 +2930,42 @@ int git_index_read_index( { git_vector new_entries = GIT_VECTOR_INIT, remove_entries = GIT_VECTOR_INIT; + git_idxmap *new_entries_map = NULL; git_iterator *index_iterator = NULL; git_iterator *new_iterator = NULL; + git_iterator_options opts = GIT_ITERATOR_OPTIONS_INIT; const git_index_entry *old_entry, *new_entry; git_index_entry *entry; size_t i; int error; if ((error = git_vector_init(&new_entries, new_index->entries.length, index->entries._cmp)) < 0 || - (error = git_vector_init(&remove_entries, index->entries.length, NULL)) < 0) + (error = git_vector_init(&remove_entries, index->entries.length, NULL)) < 0 || + (error = git_idxmap_alloc(&new_entries_map)) < 0) goto done; - if ((error = git_iterator_for_index(&index_iterator, - index, GIT_ITERATOR_DONT_IGNORE_CASE, NULL, NULL)) < 0 || - (error = git_iterator_for_index(&new_iterator, - (git_index *)new_index, GIT_ITERATOR_DONT_IGNORE_CASE, NULL, NULL)) < 0) + if (index->ignore_case) + kh_resize(idxicase, (khash_t(idxicase) *) new_entries_map, new_index->entries.length); + else + kh_resize(idx, new_entries_map, new_index->entries.length); + + opts.flags = GIT_ITERATOR_DONT_IGNORE_CASE; + + if ((error = git_iterator_for_index(&index_iterator, git_index_owner(index), index, &opts)) < 0 || + (error = git_iterator_for_index(&new_iterator, git_index_owner(new_index), (git_index *)new_index, &opts)) < 0) goto done; - if (((error = git_iterator_current(&old_entry, index_iterator)) < 0 && + if (((error = git_iterator_current(&old_entry, index_iterator)) < 0 && error != GIT_ITEROVER) || - ((error = git_iterator_current(&new_entry, new_iterator)) < 0 && + ((error = git_iterator_current(&new_entry, new_iterator)) < 0 && error != GIT_ITEROVER)) goto done; while (true) { + git_index_entry + *dup_entry = NULL, + *add_entry = NULL, + *remove_entry = NULL; int diff; if (old_entry && new_entry) @@ -2689,27 +2978,39 @@ int git_index_read_index( break; if (diff < 0) { - git_vector_insert(&remove_entries, (git_index_entry *)old_entry); + remove_entry = (git_index_entry *)old_entry; } else if (diff > 0) { - if ((error = index_entry_dup(&entry, git_index_owner(index), new_entry)) < 0) - goto done; - - git_vector_insert(&new_entries, entry); + dup_entry = (git_index_entry *)new_entry; } else { /* Path and stage are equal, if the OID is equal, keep it to * keep the stat cache data. */ if (git_oid_equal(&old_entry->id, &new_entry->id)) { - git_vector_insert(&new_entries, (git_index_entry *)old_entry); + add_entry = (git_index_entry *)old_entry; } else { - if ((error = index_entry_dup(&entry, git_index_owner(index), new_entry)) < 0) - goto done; - - git_vector_insert(&new_entries, entry); - git_vector_insert(&remove_entries, (git_index_entry *)old_entry); + dup_entry = (git_index_entry *)new_entry; + remove_entry = (git_index_entry *)old_entry; } } + if (dup_entry) { + if ((error = index_entry_dup_nocache(&add_entry, index, dup_entry)) < 0) + goto done; + } + + if (add_entry) { + if ((error = git_vector_insert(&new_entries, add_entry)) == 0) + INSERT_IN_MAP_EX(index, new_entries_map, add_entry, error); + } + + if (remove_entry && error >= 0) + error = git_vector_insert(&remove_entries, remove_entry); + + if (error < 0) { + giterr_set(GITERR_INDEX, "failed to insert entry"); + return error; + } + if (diff <= 0) { if ((error = git_iterator_advance(&old_entry, index_iterator)) < 0 && error != GIT_ITEROVER) @@ -2727,6 +3028,7 @@ int git_index_read_index( git_index_reuc_clear(index); git_vector_swap(&new_entries, &index->entries); + new_entries_map = git__swap(index->entries_map, new_entries_map); git_vector_foreach(&remove_entries, i, entry) { if (index->tree) @@ -2738,6 +3040,7 @@ int git_index_read_index( error = 0; done: + git_idxmap_free(new_entries_map); git_vector_free(&new_entries); git_vector_free(&remove_entries); git_iterator_free(index_iterator); @@ -3007,18 +3310,11 @@ int git_index_snapshot_new(git_vector *snap, git_index *index) GIT_REFCOUNT_INC(index); - if (git_mutex_lock(&index->lock) < 0) { - giterr_set(GITERR_OS, "Failed to lock index"); - return -1; - } - git_atomic_inc(&index->readers); git_vector_sort(&index->entries); error = git_vector_dup(snap, &index->entries, index->entries._cmp); - git_mutex_unlock(&index->lock); - if (error < 0) git_index_free(index); @@ -3031,11 +3327,6 @@ void git_index_snapshot_release(git_vector *snap, git_index *index) git_atomic_dec(&index->readers); - if (!git_mutex_lock(&index->lock)) { - index_free_deleted(index); /* try to free pending deleted items */ - git_mutex_unlock(&index->lock); - } - git_index_free(index); } @@ -3100,9 +3391,7 @@ int git_indexwriter_commit(git_indexwriter *writer) if (!writer->should_write) return 0; - if (index_sort_if_needed(writer->index, true) < 0) - return -1; - + git_vector_sort(&writer->index->entries); git_vector_sort(&writer->index->reuc); if ((error = write_index(&checksum, writer->index, &writer->file)) < 0) { diff --git a/vendor/libgit2/src/index.h b/vendor/libgit2/src/index.h index 9c60b015c..8b9b49498 100644 --- a/vendor/libgit2/src/index.h +++ b/vendor/libgit2/src/index.h @@ -10,6 +10,7 @@ #include "fileops.h" #include "filebuf.h" #include "vector.h" +#include "idxmap.h" #include "tree-cache.h" #include "git2/odb.h" #include "git2/index.h" @@ -25,8 +26,8 @@ struct git_index { git_oid checksum; /* checksum at the end of the file */ git_vector entries; + git_idxmap *entries_map; - git_mutex lock; /* lock held while entries is being changed */ git_vector deleted; /* deleted entries if readers > 0 */ git_atomic readers; /* number of active iterators */ @@ -63,6 +64,45 @@ extern int git_index_entry_icmp(const void *a, const void *b); extern int git_index_entry_srch(const void *a, const void *b); extern int git_index_entry_isrch(const void *a, const void *b); +/* Index time handling functions */ +GIT_INLINE(bool) git_index_time_eq(const git_index_time *one, const git_index_time *two) +{ + if (one->seconds != two->seconds) + return false; + +#ifdef GIT_USE_NSEC + if (one->nanoseconds != two->nanoseconds) + return false; +#endif + + return true; +} + +/* + * Test if the given index time is newer than the given existing index entry. + * If the timestamps are exactly equivalent, then the given index time is + * considered "racily newer" than the existing index entry. + */ +GIT_INLINE(bool) git_index_entry_newer_than_index( + const git_index_entry *entry, git_index *index) +{ + /* If we never read the index, we can't have this race either */ + if (!index || index->stamp.mtime.tv_sec == 0) + return false; + + /* If the timestamp is the same or newer than the index, it's racy */ +#if defined(GIT_USE_NSEC) + if ((int32_t)index->stamp.mtime.tv_sec < entry->mtime.seconds) + return true; + else if ((int32_t)index->stamp.mtime.tv_sec > entry->mtime.seconds) + return false; + else + return (uint32_t)index->stamp.mtime.tv_nsec <= entry->mtime.nanoseconds; +#else + return ((int32_t)index->stamp.mtime.tv_sec) <= entry->mtime.seconds; +#endif +} + /* Search index for `path`, returning GIT_ENOTFOUND if it does not exist * (but not setting an error message). * @@ -72,6 +112,8 @@ extern int git_index_entry_isrch(const void *a, const void *b); extern int git_index__find_pos( size_t *at_pos, git_index *index, const char *path, size_t path_len, int stage); +extern int git_index__fill(git_index *index, const git_vector *source_entries); + extern void git_index__set_ignore_case(git_index *index, bool ignore_case); extern unsigned int git_index__create_mode(unsigned int mode); diff --git a/vendor/libgit2/src/indexer.c b/vendor/libgit2/src/indexer.c index 9aa092556..a3a866989 100644 --- a/vendor/libgit2/src/indexer.c +++ b/vendor/libgit2/src/indexer.c @@ -449,7 +449,7 @@ static void hash_partially(git_indexer *idx, const uint8_t *data, size_t size) static int write_at(git_indexer *idx, const void *data, git_off_t offset, size_t size) { git_file fd = idx->pack->mwf.fd; - size_t page_size; + size_t mmap_alignment; size_t page_offset; git_off_t page_start; unsigned char *map_data; @@ -458,11 +458,11 @@ static int write_at(git_indexer *idx, const void *data, git_off_t offset, size_t assert(data && size); - if ((error = git__page_size(&page_size)) < 0) + if ((error = git__mmap_alignment(&mmap_alignment)) < 0) return error; - /* the offset needs to be at the beginning of the a page boundary */ - page_offset = offset % page_size; + /* the offset needs to be at the mmap boundary for the platform */ + page_offset = offset % mmap_alignment; page_start = offset - page_offset; if ((error = p_mmap(&map, page_offset + size, GIT_PROT_WRITE, GIT_MAP_SHARED, fd, page_start)) < 0) @@ -777,7 +777,6 @@ static int fix_thin_pack(git_indexer *idx, git_transfer_progress *stats) curpos = delta->delta_off; error = git_packfile_unpack_header(&size, &type, &idx->pack->mwf, &w, &curpos); - git_mwindow_close(&w); if (error < 0) return error; @@ -914,12 +913,17 @@ int git_indexer_commit(git_indexer *idx, git_transfer_progress *stats) git_filebuf index_file = {0}; void *packfile_trailer; + if (!idx->parsed_header) { + giterr_set(GITERR_INDEXER, "incomplete pack header"); + return -1; + } + if (git_hash_ctx_init(&ctx) < 0) return -1; /* Test for this before resolve_deltas(), as it plays with idx->off */ - if (idx->off < idx->pack->mwf.size - 20) { - giterr_set(GITERR_INDEXER, "Unexpected data at the end of the pack"); + if (idx->off + 20 < idx->pack->mwf.size) { + giterr_set(GITERR_INDEXER, "unexpected data at the end of the pack"); return -1; } diff --git a/vendor/libgit2/src/iterator.c b/vendor/libgit2/src/iterator.c index cf51a340d..cb1ea6a87 100644 --- a/vendor/libgit2/src/iterator.c +++ b/vendor/libgit2/src/iterator.c @@ -31,14 +31,22 @@ (P)->base.cb = &(P)->cb; \ ITERATOR_SET_CB(P,NAME_LC); \ (P)->base.repo = (REPO); \ - (P)->base.start = start ? git__strdup(start) : NULL; \ - (P)->base.end = end ? git__strdup(end) : NULL; \ - if ((start && !(P)->base.start) || (end && !(P)->base.end)) { \ + (P)->base.start = options && options->start ? \ + git__strdup(options->start) : NULL; \ + (P)->base.end = options && options->end ? \ + git__strdup(options->end) : NULL; \ + if ((options && options->start && !(P)->base.start) || \ + (options && options->end && !(P)->base.end)) { \ git__free(P); return -1; } \ + (P)->base.strcomp = git__strcmp; \ + (P)->base.strncomp = git__strncmp; \ (P)->base.prefixcomp = git__prefixcmp; \ - (P)->base.flags = flags & ~ITERATOR_CASE_FLAGS; \ + (P)->base.flags = options ? options->flags & ~ITERATOR_CASE_FLAGS : 0; \ if ((P)->base.flags & GIT_ITERATOR_DONT_AUTOEXPAND) \ (P)->base.flags |= GIT_ITERATOR_INCLUDE_TREES; \ + if (options && options->pathlist.count && \ + iterator_pathlist__init(&P->base, &options->pathlist) < 0) { \ + git__free(P); return -1; } \ } while (0) #define iterator__flag(I,F) ((((git_iterator *)(I))->flags & GIT_ITERATOR_ ## F) != 0) @@ -56,6 +64,139 @@ (iterator__end(I) && ((git_iterator *)(I))->prefixcomp((PATH),iterator__end(I)) > 0) +typedef enum { + ITERATOR_PATHLIST_NONE = 0, + ITERATOR_PATHLIST_MATCH = 1, + ITERATOR_PATHLIST_MATCH_DIRECTORY = 2, + ITERATOR_PATHLIST_MATCH_CHILD = 3, +} iterator_pathlist__match_t; + +static int iterator_pathlist__init(git_iterator *iter, git_strarray *pathspec) +{ + size_t i; + + if (git_vector_init(&iter->pathlist, pathspec->count, + (git_vector_cmp)iter->strcomp) < 0) + return -1; + + for (i = 0; i < pathspec->count; i++) { + if (!pathspec->strings[i]) + continue; + + if (git_vector_insert(&iter->pathlist, pathspec->strings[i]) < 0) + return -1; + } + + git_vector_sort(&iter->pathlist); + + return 0; +} + +static iterator_pathlist__match_t iterator_pathlist__match( + git_iterator *iter, const char *path, size_t path_len) +{ + const char *p; + size_t idx; + int error; + + error = git_vector_bsearch2(&idx, &iter->pathlist, + (git_vector_cmp)iter->strcomp, path); + + if (error == 0) + return ITERATOR_PATHLIST_MATCH; + + /* at this point, the path we're examining may be a directory (though we + * don't know that yet, since we're avoiding a stat unless it's necessary) + * so see if the pathlist contains a file beneath this directory. + */ + while ((p = git_vector_get(&iter->pathlist, idx)) != NULL) { + if (iter->prefixcomp(p, path) != 0) + break; + + /* an exact match would have been matched by the bsearch above */ + assert(p[path_len]); + + /* is this a literal directory entry (eg `foo/`) or a file beneath */ + if (p[path_len] == '/') { + return (p[path_len+1] == '\0') ? + ITERATOR_PATHLIST_MATCH_DIRECTORY : + ITERATOR_PATHLIST_MATCH_CHILD; + } + + if (p[path_len] > '/') + break; + + idx++; + } + + return ITERATOR_PATHLIST_NONE; +} + +static void iterator_pathlist_walk__reset(git_iterator *iter) +{ + iter->pathlist_walk_idx = 0; +} + +/* walker for the index iterator that allows it to walk the sorted pathlist + * entries alongside the sorted index entries. the `iter->pathlist_walk_idx` + * stores the starting position for subsequent calls, the position is advanced + * along with the index iterator, with a special case for handling directories + * in the pathlist that are specified without trailing '/'. (eg, `foo`). + * we do not advance over these entries until we're certain that the index + * iterator will not ask us for a file beneath that directory (eg, `foo/bar`). + */ +static bool iterator_pathlist_walk__contains(git_iterator *iter, const char *path) +{ + size_t i; + char *p; + size_t p_len; + int cmp; + + for (i = iter->pathlist_walk_idx; i < iter->pathlist.length; i++) { + p = iter->pathlist.contents[i]; + p_len = strlen(p); + + /* see if the pathlist entry is a prefix of this path */ + cmp = iter->strncomp(p, path, p_len); + + /* this pathlist entry sorts before the given path, try the next */ + if (!p_len || cmp < 0) + iter->pathlist_walk_idx++; + + /* this pathlist sorts after the given path, no match. */ + else if (cmp > 0) + return false; + + /* match! an exact match (`foo` vs `foo`), the path is a child of an + * explicit directory in the pathlist (`foo/` vs `foo/bar`) or the path + * is a child of an entry in the pathlist (`foo` vs `foo/bar`) + */ + else if (path[p_len] == '\0' || p[p_len - 1] == '/' || path[p_len] == '/') + return true; + + /* only advance the start index for future callers if we know that we + * will not see a child of this path. eg, a pathlist entry `foo` is + * a prefix for `foo.txt` and `foo/bar`. don't advance the start + * pathlist index when we see `foo.txt` or we would miss a subsequent + * inspection of `foo/bar`. only advance when there are no more + * potential children. + */ + else if (path[p_len] > '/') + iter->pathlist_walk_idx++; + } + + return false; +} + +static void iterator_pathlist__update_ignore_case(git_iterator *iter) +{ + git_vector_set_cmp(&iter->pathlist, (git_vector_cmp)iter->strcomp); + git_vector_sort(&iter->pathlist); + + iter->pathlist_walk_idx = 0; +} + + static int iterator__reset_range( git_iterator *iter, const char *start, const char *end) { @@ -82,7 +223,8 @@ static int iterator__update_ignore_case( git_iterator *iter, git_iterator_flag_t flags) { - int error = 0, ignore_case = -1; + bool ignore_case; + int error; if ((flags & GIT_ITERATOR_IGNORE_CASE) != 0) ignore_case = true; @@ -91,19 +233,29 @@ static int iterator__update_ignore_case( else { git_index *index; - if (!(error = git_repository_index__weakptr(&index, iter->repo))) - ignore_case = (index->ignore_case != false); + if ((error = git_repository_index__weakptr(&index, iter->repo)) < 0) + return error; + + ignore_case = (index->ignore_case == 1); } - if (ignore_case > 0) + if (ignore_case) { iter->flags = (iter->flags | GIT_ITERATOR_IGNORE_CASE); - else if (ignore_case == 0) + + iter->strcomp = git__strcasecmp; + iter->strncomp = git__strncasecmp; + iter->prefixcomp = git__prefixcmp_icase; + } else { iter->flags = (iter->flags & ~GIT_ITERATOR_IGNORE_CASE); - iter->prefixcomp = iterator__ignore_case(iter) ? - git__prefixcmp_icase : git__prefixcmp; + iter->strcomp = git__strcmp; + iter->strncomp = git__strncmp; + iter->prefixcomp = git__prefixcmp; + } - return error; + iterator_pathlist__update_ignore_case(iter); + + return 0; } GIT_INLINE(void) iterator__clear_entry(const git_index_entry **entry) @@ -149,9 +301,7 @@ typedef struct { int git_iterator_for_nothing( git_iterator **iter, - git_iterator_flag_t flags, - const char *start, - const char *end) + git_iterator_options *options) { empty_iterator *i = git__calloc(1, sizeof(empty_iterator)); GITERR_CHECK_ALLOC(i); @@ -162,7 +312,7 @@ int git_iterator_for_nothing( ITERATOR_BASE_INIT(i, empty, EMPTY, NULL); - if ((flags & GIT_ITERATOR_IGNORE_CASE) != 0) + if (options && (options->flags & GIT_ITERATOR_IGNORE_CASE) != 0) i->base.flags |= GIT_ITERATOR_IGNORE_CASE; *iter = (git_iterator *)i; @@ -201,7 +351,6 @@ typedef struct { int path_ambiguities; bool path_has_filename; bool entry_is_current; - int (*strncomp)(const char *a, const char *b, size_t sz); } tree_iterator; static char *tree_iterator__current_filename( @@ -271,7 +420,7 @@ static int tree_iterator__search_cmp(const void *key, const void *val, void *p) return git_path_cmp( tf->start, tf->startlen, false, te->filename, te->filename_len, te->attr == GIT_FILEMODE_TREE, - ((tree_iterator *)p)->strncomp); + ((git_iterator *)p)->strncomp); } static bool tree_iterator__move_to_next( @@ -303,13 +452,13 @@ static int tree_iterator__set_next(tree_iterator *ti, tree_iterator_frame *tf) for (; tf->next < tf->n_entries; tf->next++, last = te) { te = tf->entries[tf->next]->te; - if (last && tree_iterator__te_cmp(last, te, ti->strncomp)) + if (last && tree_iterator__te_cmp(last, te, ti->base.strncomp)) break; /* try to load trees for items in [current,next) range */ if (!error && git_tree_entry__is_tree(te)) error = git_tree_lookup( - &tf->entries[tf->next]->tree, ti->base.repo, &te->oid); + &tf->entries[tf->next]->tree, ti->base.repo, te->oid); } if (tf->next > tf->current + 1) @@ -409,6 +558,8 @@ static bool tree_iterator__pop_frame(tree_iterator *ti, bool final) { tree_iterator_frame *tf = ti->head; + assert(tf); + if (!tf->up) return false; @@ -418,7 +569,7 @@ static bool tree_iterator__pop_frame(tree_iterator *ti, bool final) tree_iterator__move_to_next(ti, tf); if (!final) { /* if final, don't bother to clean up */ - git_pool_free_array(&ti->pool, tf->n_entries, (void **)tf->entries); + // TODO: maybe free the pool so far? git_buf_rtruncate_at_char(&ti->path, '/'); } @@ -432,6 +583,8 @@ static void tree_iterator__pop_all(tree_iterator *ti, bool to_end, bool final) while (tree_iterator__pop_frame(ti, final)) /* pop to root */; if (!final) { + assert(ti->head); + ti->head->current = to_end ? ti->head->n_entries : 0; ti->path_ambiguities = 0; git_buf_clear(&ti->path); @@ -450,7 +603,7 @@ static int tree_iterator__update_entry(tree_iterator *ti) te = tf->entries[tf->current]->te; ti->entry.mode = te->attr; - git_oid_cpy(&ti->entry.id, &te->oid); + git_oid_cpy(&ti->entry.id, te->oid); ti->entry.path = tree_iterator__current_filename(ti, te); GITERR_CHECK_ALLOC(ti->entry.path); @@ -468,7 +621,7 @@ static int tree_iterator__update_entry(tree_iterator *ti) return 0; } -static int tree_iterator__current( +static int tree_iterator__current_internal( const git_index_entry **entry, git_iterator *self) { int error; @@ -491,41 +644,32 @@ static int tree_iterator__current( return 0; } -static int tree_iterator__advance_into( - const git_index_entry **entry, git_iterator *self) +static int tree_iterator__advance_into_internal(git_iterator *self) { int error = 0; tree_iterator *ti = (tree_iterator *)self; - iterator__clear_entry(entry); - if (tree_iterator__at_tree(ti)) error = tree_iterator__push_frame(ti); - if (!error && entry) - error = tree_iterator__current(entry, self); - return error; } -static int tree_iterator__advance( - const git_index_entry **entry, git_iterator *self) +static int tree_iterator__advance_internal(git_iterator *self) { int error; tree_iterator *ti = (tree_iterator *)self; tree_iterator_frame *tf = ti->head; - iterator__clear_entry(entry); - if (tf->current >= tf->n_entries) return GIT_ITEROVER; if (!iterator__has_been_accessed(ti)) - return tree_iterator__current(entry, self); + return 0; if (iterator__do_autoexpand(ti) && iterator__include_trees(ti) && tree_iterator__at_tree(ti)) - return tree_iterator__advance_into(entry, self); + return tree_iterator__advance_into_internal(self); if (ti->path_has_filename) { git_buf_rtruncate_at_char(&ti->path, '/'); @@ -534,7 +678,7 @@ static int tree_iterator__advance( /* scan forward and up, advancing in frame or popping frame when done */ while (!tree_iterator__move_to_next(ti, tf) && - tree_iterator__pop_frame(ti, false)) + tree_iterator__pop_frame(ti, false)) tf = ti->head; /* find next and load trees */ @@ -543,7 +687,63 @@ static int tree_iterator__advance( /* deal with include_trees / auto_expand as needed */ if (!iterator__include_trees(ti) && tree_iterator__at_tree(ti)) - return tree_iterator__advance_into(entry, self); + return tree_iterator__advance_into_internal(self); + + return 0; +} + +static int tree_iterator__current( + const git_index_entry **out, git_iterator *self) +{ + const git_index_entry *entry = NULL; + iterator_pathlist__match_t m; + int error; + + do { + if ((error = tree_iterator__current_internal(&entry, self)) < 0) + return error; + + if (self->pathlist.length) { + m = iterator_pathlist__match( + self, entry->path, strlen(entry->path)); + + if (m != ITERATOR_PATHLIST_MATCH) { + if ((error = tree_iterator__advance_internal(self)) < 0) + return error; + + entry = NULL; + } + } + } while (!entry); + + if (out) + *out = entry; + + return error; +} + +static int tree_iterator__advance( + const git_index_entry **entry, git_iterator *self) +{ + int error = tree_iterator__advance_internal(self); + + iterator__clear_entry(entry); + + if (error < 0) + return error; + + return tree_iterator__current(entry, self); +} + +static int tree_iterator__advance_into( + const git_index_entry **entry, git_iterator *self) +{ + int error = tree_iterator__advance_into_internal(self); + + iterator__clear_entry(entry); + + if (error < 0) + return error; return tree_iterator__current(entry, self); } @@ -577,10 +777,12 @@ static void tree_iterator__free(git_iterator *self) { tree_iterator *ti = (tree_iterator *)self; - tree_iterator__pop_all(ti, true, false); + if (ti->head) { + tree_iterator__pop_all(ti, true, false); + git_tree_free(ti->head->entries[0]->tree); + git__free(ti->head); + } - git_tree_free(ti->head->entries[0]->tree); - git__free(ti->head); git_pool_clear(&ti->pool); git_buf_free(&ti->path); } @@ -607,15 +809,13 @@ static int tree_iterator__create_root_frame(tree_iterator *ti, git_tree *tree) int git_iterator_for_tree( git_iterator **iter, git_tree *tree, - git_iterator_flag_t flags, - const char *start, - const char *end) + git_iterator_options *options) { int error; tree_iterator *ti; if (tree == NULL) - return git_iterator_for_nothing(iter, flags, start, end); + return git_iterator_for_nothing(iter, options); if ((error = git_object_dup((git_object **)&tree, (git_object *)tree)) < 0) return error; @@ -625,12 +825,12 @@ int git_iterator_for_tree( ITERATOR_BASE_INIT(ti, tree, TREE, git_tree_owner(tree)); - if ((error = iterator__update_ignore_case((git_iterator *)ti, flags)) < 0) + if ((error = iterator__update_ignore_case((git_iterator *)ti, options ? options->flags : 0)) < 0) goto fail; - ti->strncomp = iterator__ignore_case(ti) ? git__strncasecmp : git__strncmp; - if ((error = git_pool_init(&ti->pool, sizeof(tree_iterator_entry),0)) < 0 || - (error = tree_iterator__create_root_frame(ti, tree)) < 0 || + git_pool_init(&ti->pool, sizeof(tree_iterator_entry)); + + if ((error = tree_iterator__create_root_frame(ti, tree)) < 0 || (error = tree_iterator__push_frame(ti)) < 0) /* expand root now */ goto fail; @@ -650,6 +850,8 @@ typedef struct { git_vector entries; git_vector_cmp entry_srch; size_t current; + /* when limiting with a pathlist, this is the current index into it */ + size_t pathlist_idx; /* when not in autoexpand mode, use these to represent "tree" state */ git_buf partial; size_t partial_pos; @@ -669,15 +871,35 @@ static const git_index_entry *index_iterator__index_entry(index_iterator *ii) return ie; } -static const git_index_entry *index_iterator__advance_over_conflicts(index_iterator *ii) +static const git_index_entry *index_iterator__advance_over_unwanted( + index_iterator *ii) { const git_index_entry *ie = index_iterator__index_entry(ii); + bool match; - if (!iterator__include_conflicts(ii)) { - while (ie && git_index_entry_is_conflict(ie)) { + while (ie) { + if (!iterator__include_conflicts(ii) && + git_index_entry_is_conflict(ie)) { ii->current++; ie = index_iterator__index_entry(ii); + continue; + } + + /* if we have a pathlist, this entry's path must be in it to be + * returned. walk the pathlist in unison with the index to + * compare paths. + */ + if (ii->base.pathlist.length) { + match = iterator_pathlist_walk__contains(&ii->base, ie->path); + + if (!match) { + ii->current++; + ie = index_iterator__index_entry(ii); + continue; + } } + + break; } return ie; @@ -706,7 +928,7 @@ static void index_iterator__next_prefix_tree(index_iterator *ii) static int index_iterator__first_prefix_tree(index_iterator *ii) { - const git_index_entry *ie = index_iterator__advance_over_conflicts(ii); + const git_index_entry *ie = index_iterator__advance_over_unwanted(ii); const char *scan, *prior, *slash; if (!ie || !iterator__include_trees(ii)) @@ -825,11 +1047,16 @@ static int index_iterator__reset( ii->current = 0; + iterator_pathlist_walk__reset(self); + + /* if we're given a start prefix, find it; if we're given a pathlist, find + * the first of those. start at the later of the two. + */ if (ii->base.start) git_index_snapshot_find( &ii->current, &ii->entries, ii->entry_srch, ii->base.start, 0, 0); - if ((ie = index_iterator__advance_over_conflicts(ii)) == NULL) + if ((ie = index_iterator__advance_over_unwanted(ii)) == NULL) return 0; if (git_buf_sets(&ii->partial, ie->path) < 0) @@ -859,10 +1086,9 @@ static void index_iterator__free(git_iterator *self) int git_iterator_for_index( git_iterator **iter, + git_repository *repo, git_index *index, - git_iterator_flag_t flags, - const char *start, - const char *end) + git_iterator_options *options) { int error = 0; index_iterator *ii = git__calloc(1, sizeof(index_iterator)); @@ -874,9 +1100,9 @@ int git_iterator_for_index( } ii->index = index; - ITERATOR_BASE_INIT(ii, index, INDEX, git_index_owner(index)); + ITERATOR_BASE_INIT(ii, index, INDEX, repo); - if ((error = iterator__update_ignore_case((git_iterator *)ii, flags)) < 0) { + if ((error = iterator__update_ignore_case((git_iterator *)ii, options ? options->flags : 0)) < 0) { git_iterator_free((git_iterator *)ii); return error; } @@ -916,6 +1142,7 @@ struct fs_iterator { size_t root_len; uint32_t dirload_flags; int depth; + iterator_pathlist__match_t pathlist_match; int (*enter_dir_cb)(fs_iterator *self); int (*leave_dir_cb)(fs_iterator *self); @@ -926,6 +1153,7 @@ struct fs_iterator { typedef struct { struct stat st; + iterator_pathlist__match_t pathlist_match; size_t path_len; char path[GIT_FLEX_ARRAY]; } fs_iterator_path_with_stat; @@ -1007,28 +1235,20 @@ static void fs_iterator__seek_frame_start( ff->index = 0; } -static int dirload_with_stat( - const char *dirpath, - size_t prefix_len, - unsigned int flags, - const char *start_stat, - const char *end_stat, - git_vector *contents) +static int dirload_with_stat(git_vector *contents, fs_iterator *fi) { git_path_diriter diriter = GIT_PATH_DIRITER_INIT; const char *path; - int (*strncomp)(const char *a, const char *b, size_t sz); - size_t start_len = start_stat ? strlen(start_stat) : 0; - size_t end_len = end_stat ? strlen(end_stat) : 0; + size_t start_len = fi->base.start ? strlen(fi->base.start) : 0; + size_t end_len = fi->base.end ? strlen(fi->base.end) : 0; fs_iterator_path_with_stat *ps; size_t path_len, cmp_len, ps_size; + iterator_pathlist__match_t pathlist_match = ITERATOR_PATHLIST_MATCH; int error; - strncomp = (flags & GIT_PATH_DIR_IGNORE_CASE) != 0 ? - git__strncasecmp : git__strncmp; - /* Any error here is equivalent to the dir not existing, skip over it */ - if ((error = git_path_diriter_init(&diriter, dirpath, flags)) < 0) { + if ((error = git_path_diriter_init( + &diriter, fi->path.ptr, fi->dirload_flags)) < 0) { error = GIT_ENOTFOUND; goto done; } @@ -1037,18 +1257,31 @@ static int dirload_with_stat( if ((error = git_path_diriter_fullpath(&path, &path_len, &diriter)) < 0) goto done; - assert(path_len > prefix_len); + assert(path_len > fi->root_len); /* remove the prefix if requested */ - path += prefix_len; - path_len -= prefix_len; + path += fi->root_len; + path_len -= fi->root_len; /* skip if before start_stat or after end_stat */ cmp_len = min(start_len, path_len); - if (cmp_len && strncomp(path, start_stat, cmp_len) < 0) + if (cmp_len && fi->base.strncomp(path, fi->base.start, cmp_len) < 0) continue; + /* skip if after end_stat */ cmp_len = min(end_len, path_len); - if (cmp_len && strncomp(path, end_stat, cmp_len) > 0) + if (cmp_len && fi->base.strncomp(path, fi->base.end, cmp_len) > 0) + continue; + + /* if we have a pathlist that we're limiting to, examine this path. + * if the frame has already deemed us inside the path (eg, we're in + * `foo/bar` and the pathlist previously was detected to say `foo/`) + * then simply continue. otherwise, examine the pathlist looking for + * this path or children of this path. + */ + if (fi->base.pathlist.length && + fi->pathlist_match != ITERATOR_PATHLIST_MATCH && + fi->pathlist_match != ITERATOR_PATHLIST_MATCH_DIRECTORY && + !(pathlist_match = iterator_pathlist__match(&fi->base, path, path_len))) continue; /* Make sure to append two bytes, one for the path's null @@ -1062,6 +1295,8 @@ static int dirload_with_stat( memcpy(ps->path, path, path_len); + /* TODO: don't stat if assume unchanged for this path */ + if ((error = git_path_diriter_stat(&ps->st, &diriter)) < 0) { if (error == GIT_ENOTFOUND) { /* file was removed between readdir and lstat */ @@ -1069,6 +1304,12 @@ static int dirload_with_stat( continue; } + if (pathlist_match == ITERATOR_PATHLIST_MATCH_DIRECTORY) { + /* were looking for a directory, but this is a file */ + git__free(ps); + continue; + } + /* Treat the file as unreadable if we get any other error */ memset(&ps->st, 0, sizeof(ps->st)); ps->st.st_mode = GIT_FILEMODE_UNREADABLE; @@ -1085,6 +1326,11 @@ static int dirload_with_stat( continue; } + /* record whether this path was explicitly found in the path list + * or whether we're only examining it because something beneath it + * is in the path list. + */ + ps->pathlist_match = pathlist_match; git_vector_insert(contents, ps); } @@ -1114,13 +1360,11 @@ static int fs_iterator__expand_dir(fs_iterator *fi) ff = fs_iterator__alloc_frame(fi); GITERR_CHECK_ALLOC(ff); - error = dirload_with_stat( - fi->path.ptr, fi->root_len, fi->dirload_flags, - fi->base.start, fi->base.end, &ff->entries); + error = dirload_with_stat(&ff->entries, fi); if (error < 0) { git_error_state last_error = { 0 }; - giterr_capture(&last_error, error); + giterr_state_capture(&last_error, error); /* these callbacks may clear the error message */ fs_iterator__free_frame(ff); @@ -1128,7 +1372,7 @@ static int fs_iterator__expand_dir(fs_iterator *fi) /* next time return value we skipped to */ fi->base.flags &= ~GIT_ITERATOR_FIRST_ACCESS; - return giterr_restore(&last_error); + return giterr_state_restore(&last_error); } if (ff->entries.length == 0) { @@ -1196,19 +1440,14 @@ static int fs_iterator__advance_into( return error; } -static int fs_iterator__advance_over( - const git_index_entry **entry, git_iterator *self) +static void fs_iterator__advance_over_internal(git_iterator *self) { - int error = 0; fs_iterator *fi = (fs_iterator *)self; fs_iterator_frame *ff; fs_iterator_path_with_stat *next; - if (entry != NULL) - *entry = NULL; - while (fi->entry.path != NULL) { - ff = fi->stack; + ff = fi->stack; next = git_vector_get(&ff->entries, ++ff->index); if (next != NULL) @@ -1216,8 +1455,19 @@ static int fs_iterator__advance_over( fs_iterator__pop_frame(fi, ff, false); } +} - error = fs_iterator__update_entry(fi); +static int fs_iterator__advance_over( + const git_index_entry **entry, git_iterator *self) +{ + int error; + + if (entry != NULL) + *entry = NULL; + + fs_iterator__advance_over_internal(self); + + error = fs_iterator__update_entry((fs_iterator *)self); if (!error && entry != NULL) error = fs_iterator__current(entry, self); @@ -1294,40 +1544,50 @@ static int fs_iterator__update_entry(fs_iterator *fi) { fs_iterator_path_with_stat *ps; - memset(&fi->entry, 0, sizeof(fi->entry)); + while (true) { + memset(&fi->entry, 0, sizeof(fi->entry)); - if (!fi->stack) - return GIT_ITEROVER; + if (!fi->stack) + return GIT_ITEROVER; - ps = git_vector_get(&fi->stack->entries, fi->stack->index); - if (!ps) - return GIT_ITEROVER; + ps = git_vector_get(&fi->stack->entries, fi->stack->index); + if (!ps) + return GIT_ITEROVER; - git_buf_truncate(&fi->path, fi->root_len); - if (git_buf_put(&fi->path, ps->path, ps->path_len) < 0) - return -1; + git_buf_truncate(&fi->path, fi->root_len); + if (git_buf_put(&fi->path, ps->path, ps->path_len) < 0) + return -1; - if (iterator__past_end(fi, fi->path.ptr + fi->root_len)) - return GIT_ITEROVER; + if (iterator__past_end(fi, fi->path.ptr + fi->root_len)) + return GIT_ITEROVER; - fi->entry.path = ps->path; - git_index_entry__init_from_stat(&fi->entry, &ps->st, true); + fi->entry.path = ps->path; + fi->pathlist_match = ps->pathlist_match; + git_index_entry__init_from_stat(&fi->entry, &ps->st, true); - /* need different mode here to keep directories during iteration */ - fi->entry.mode = git_futils_canonical_mode(ps->st.st_mode); + /* need different mode here to keep directories during iteration */ + fi->entry.mode = git_futils_canonical_mode(ps->st.st_mode); - /* allow wrapper to check/update the entry (can force skip) */ - if (fi->update_entry_cb && - fi->update_entry_cb(fi) == GIT_ENOTFOUND) - return fs_iterator__advance_over(NULL, (git_iterator *)fi); + /* allow wrapper to check/update the entry (can force skip) */ + if (fi->update_entry_cb && + fi->update_entry_cb(fi) == GIT_ENOTFOUND) { + fs_iterator__advance_over_internal(&fi->base); + continue; + } - /* if this is a tree and trees aren't included, then skip */ - if (fi->entry.mode == GIT_FILEMODE_TREE && !iterator__include_trees(fi)) { - int error = fs_iterator__advance_into(NULL, (git_iterator *)fi); - if (error != GIT_ENOTFOUND) - return error; - giterr_clear(); - return fs_iterator__advance_over(NULL, (git_iterator *)fi); + /* if this is a tree and trees aren't included, then skip */ + if (fi->entry.mode == GIT_FILEMODE_TREE && !iterator__include_trees(fi)) { + int error = fs_iterator__advance_into(NULL, &fi->base); + + if (error != GIT_ENOTFOUND) + return error; + + giterr_clear(); + fs_iterator__advance_over_internal(&fi->base); + continue; + } + + break; } return 0; @@ -1343,6 +1603,7 @@ static int fs_iterator__initialize( return -1; } fi->root_len = fi->path.size; + fi->pathlist_match = ITERATOR_PATHLIST_MATCH_CHILD; fi->dirload_flags = (iterator__ignore_case(fi) ? GIT_PATH_DIR_IGNORE_CASE : 0) | @@ -1366,16 +1627,14 @@ static int fs_iterator__initialize( int git_iterator_for_filesystem( git_iterator **out, const char *root, - git_iterator_flag_t flags, - const char *start, - const char *end) + git_iterator_options *options) { fs_iterator *fi = git__calloc(1, sizeof(fs_iterator)); GITERR_CHECK_ALLOC(fi); ITERATOR_BASE_INIT(fi, fs, FS, NULL); - if ((flags & GIT_ITERATOR_IGNORE_CASE) != 0) + if (options && (options->flags & GIT_ITERATOR_IGNORE_CASE) != 0) fi->base.flags |= GIT_ITERATOR_IGNORE_CASE; return fs_iterator__initialize(out, fi, root); @@ -1559,9 +1818,7 @@ int git_iterator_for_workdir_ext( const char *repo_workdir, git_index *index, git_tree *tree, - git_iterator_flag_t flags, - const char *start, - const char *end) + git_iterator_options *options) { int error, precompose = 0; workdir_iterator *wi; @@ -1583,7 +1840,7 @@ int git_iterator_for_workdir_ext( wi->fi.leave_dir_cb = workdir_iterator__leave_dir; wi->fi.update_entry_cb = workdir_iterator__update_entry; - if ((error = iterator__update_ignore_case((git_iterator *)wi, flags)) < 0 || + if ((error = iterator__update_ignore_case((git_iterator *)wi, options ? options->flags : 0)) < 0 || (error = git_ignore__for_path(repo, ".gitignore", &wi->ignores)) < 0) { git_iterator_free((git_iterator *)wi); @@ -1618,6 +1875,7 @@ void git_iterator_free(git_iterator *iter) iter->cb->free(iter); + git_vector_free(&iter->pathlist); git__free(iter->start); git__free(iter->end); @@ -1687,7 +1945,7 @@ int git_iterator_current_parent_tree( if (!(tf = tf->down) || tf->current >= tf->n_entries || !(te = tf->entries[tf->current]->te) || - ti->strncomp(scan, te->filename, te->filename_len) != 0) + ti->base.strncomp(scan, te->filename, te->filename_len) != 0) return 0; scan += te->filename_len; @@ -1820,9 +2078,18 @@ int git_iterator_advance_over_with_status( if (!error) continue; + else if (error == GIT_ENOTFOUND) { + /* we entered this directory only hoping to find child matches to + * our pathlist (eg, this is `foo` and we had a pathlist entry for + * `foo/bar`). it should not be ignored, it should be excluded. + */ + if (wi->fi.pathlist_match == ITERATOR_PATHLIST_MATCH_CHILD) + *status = GIT_ITERATOR_STATUS_FILTERED; + else + wi->is_ignored = GIT_IGNORE_TRUE; /* mark empty dirs ignored */ + error = 0; - wi->is_ignored = GIT_IGNORE_TRUE; /* mark empty dirs ignored */ } else break; /* real error, stop here */ } else { diff --git a/vendor/libgit2/src/iterator.h b/vendor/libgit2/src/iterator.h index 893e5db50..ac17d2970 100644 --- a/vendor/libgit2/src/iterator.h +++ b/vendor/libgit2/src/iterator.h @@ -38,6 +38,21 @@ typedef enum { GIT_ITERATOR_INCLUDE_CONFLICTS = (1u << 5), } git_iterator_flag_t; +typedef struct { + const char *start; + const char *end; + + /* paths to include in the iterator (literal). if set, any paths not + * listed here will be excluded from iteration. + */ + git_strarray pathlist; + + /* flags, from above */ + unsigned int flags; +} git_iterator_options; + +#define GIT_ITERATOR_OPTIONS_INIT {0} + typedef struct { int (*current)(const git_index_entry **, git_iterator *); int (*advance)(const git_index_entry **, git_iterator *); @@ -54,6 +69,10 @@ struct git_iterator { git_repository *repo; char *start; char *end; + git_vector pathlist; + size_t pathlist_walk_idx; + int (*strcomp)(const char *a, const char *b); + int (*strncomp)(const char *a, const char *b, size_t n); int (*prefixcomp)(const char *str, const char *prefix); size_t stat_calls; unsigned int flags; @@ -61,9 +80,7 @@ struct git_iterator { extern int git_iterator_for_nothing( git_iterator **out, - git_iterator_flag_t flags, - const char *start, - const char *end); + git_iterator_options *options); /* tree iterators will match the ignore_case value from the index of the * repository, unless you override with a non-zero flag value @@ -71,19 +88,16 @@ extern int git_iterator_for_nothing( extern int git_iterator_for_tree( git_iterator **out, git_tree *tree, - git_iterator_flag_t flags, - const char *start, - const char *end); + git_iterator_options *options); /* index iterators will take the ignore_case value from the index; the * ignore_case flags are not used */ extern int git_iterator_for_index( git_iterator **out, + git_repository *repo, git_index *index, - git_iterator_flag_t flags, - const char *start, - const char *end); + git_iterator_options *options); extern int git_iterator_for_workdir_ext( git_iterator **out, @@ -91,9 +105,7 @@ extern int git_iterator_for_workdir_ext( const char *repo_workdir, git_index *index, git_tree *tree, - git_iterator_flag_t flags, - const char *start, - const char *end); + git_iterator_options *options); /* workdir iterators will match the ignore_case value from the index of the * repository, unless you override with a non-zero flag value @@ -103,11 +115,9 @@ GIT_INLINE(int) git_iterator_for_workdir( git_repository *repo, git_index *index, git_tree *tree, - git_iterator_flag_t flags, - const char *start, - const char *end) + git_iterator_options *options) { - return git_iterator_for_workdir_ext(out, repo, NULL, index, tree, flags, start, end); + return git_iterator_for_workdir_ext(out, repo, NULL, index, tree, options); } /* for filesystem iterators, you have to explicitly pass in the ignore_case @@ -116,9 +126,7 @@ GIT_INLINE(int) git_iterator_for_workdir( extern int git_iterator_for_filesystem( git_iterator **out, const char *root, - git_iterator_flag_t flags, - const char *start, - const char *end); + git_iterator_options *options); extern void git_iterator_free(git_iterator *iter); @@ -271,7 +279,8 @@ extern git_index *git_iterator_get_index(git_iterator *iter); typedef enum { GIT_ITERATOR_STATUS_NORMAL = 0, GIT_ITERATOR_STATUS_IGNORED = 1, - GIT_ITERATOR_STATUS_EMPTY = 2 + GIT_ITERATOR_STATUS_EMPTY = 2, + GIT_ITERATOR_STATUS_FILTERED = 3 } git_iterator_status_t; /* Advance over a directory and check if it contains no files or just diff --git a/vendor/libgit2/src/merge.c b/vendor/libgit2/src/merge.c index 9799f935b..d2f92ccce 100644 --- a/vendor/libgit2/src/merge.c +++ b/vendor/libgit2/src/merge.c @@ -27,6 +27,8 @@ #include "config.h" #include "oidarray.h" #include "annotated_commit.h" +#include "commit.h" +#include "oidarray.h" #include "git2/types.h" #include "git2/repository.h" @@ -47,6 +49,19 @@ #define GIT_MERGE_INDEX_ENTRY_EXISTS(X) ((X).mode != 0) #define GIT_MERGE_INDEX_ENTRY_ISFILE(X) S_ISREG((X).mode) + +/** Internal merge flags. */ +enum { + /** The merge is for a virtual base in a recursive merge. */ + GIT_MERGE__VIRTUAL_BASE = (1 << 31), +}; + +enum { + /** Accept the conflict file, staging it as the merge result. */ + GIT_MERGE_FILE_FAVOR__CONFLICTED = 4, +}; + + typedef enum { TREE_IDX_ANCESTOR = 0, TREE_IDX_OURS = 1, @@ -799,11 +814,9 @@ static int merge_conflict_resolve_automerge( int *resolved, git_merge_diff_list *diff_list, const git_merge_diff *conflict, - unsigned int merge_file_favor, - unsigned int file_flags) + const git_merge_file_options *file_opts) { const git_index_entry *ancestor = NULL, *ours = NULL, *theirs = NULL; - git_merge_file_options opts = GIT_MERGE_FILE_OPTIONS_INIT; git_merge_file_result result = {0}; git_index_entry *index_entry; git_odb *odb = NULL; @@ -850,16 +863,13 @@ static int merge_conflict_resolve_automerge( theirs = GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->their_entry) ? &conflict->their_entry : NULL; - opts.favor = merge_file_favor; - opts.flags = file_flags; - if ((error = git_repository_odb(&odb, diff_list->repo)) < 0 || - (error = git_merge_file_from_index(&result, diff_list->repo, ancestor, ours, theirs, &opts)) < 0 || - !result.automergeable || + (error = git_merge_file_from_index(&result, diff_list->repo, ancestor, ours, theirs, file_opts)) < 0 || + (!result.automergeable && !(file_opts->flags & GIT_MERGE_FILE_FAVOR__CONFLICTED)) || (error = git_odb_write(&automerge_oid, odb, result.ptr, result.len, GIT_OBJ_BLOB)) < 0) goto done; - if ((index_entry = git_pool_malloc(&diff_list->pool, sizeof(git_index_entry))) == NULL) + if ((index_entry = git_pool_mallocz(&diff_list->pool, sizeof(git_index_entry))) == NULL) GITERR_CHECK_ALLOC(index_entry); index_entry->path = git_pool_strdup(&diff_list->pool, result.path); @@ -885,8 +895,7 @@ static int merge_conflict_resolve( int *out, git_merge_diff_list *diff_list, const git_merge_diff *conflict, - unsigned int merge_file_favor, - unsigned int file_flags) + const git_merge_file_options *file_opts) { int resolved = 0; int error = 0; @@ -902,8 +911,7 @@ static int merge_conflict_resolve( if (!resolved && (error = merge_conflict_resolve_one_renamed(&resolved, diff_list, conflict)) < 0) goto done; - if (!resolved && (error = merge_conflict_resolve_automerge(&resolved, diff_list, conflict, - merge_file_favor, file_flags)) < 0) + if (!resolved && (error = merge_conflict_resolve_automerge(&resolved, diff_list, conflict, file_opts)) < 0) goto done; *out = resolved; @@ -1296,7 +1304,7 @@ int git_merge_diff_list__find_renames( assert(diff_list && opts); - if ((opts->tree_flags & GIT_MERGE_TREE_FIND_RENAMES) == 0) + if ((opts->flags & GIT_MERGE_FIND_RENAMES) == 0) return 0; similarity_ours = git__calloc(diff_list->conflicts.length, @@ -1455,7 +1463,6 @@ GIT_INLINE(int) index_entry_dup_pool( { if (src != NULL) { memcpy(out, src, sizeof(git_index_entry)); - if ((out->path = git_pool_strdup(pool, src->path)) == NULL) return -1; } @@ -1491,7 +1498,7 @@ static git_merge_diff *merge_diff_from_index_entries( git_merge_diff *conflict; git_pool *pool = &diff_list->pool; - if ((conflict = git_pool_malloc(pool, sizeof(git_merge_diff))) == NULL) + if ((conflict = git_pool_mallocz(pool, sizeof(git_merge_diff))) == NULL) return NULL; if (index_entry_dup_pool(&conflict->ancestor_entry, pool, entries[TREE_IDX_ANCESTOR]) < 0 || @@ -1590,10 +1597,11 @@ git_merge_diff_list *git_merge_diff_list__alloc(git_repository *repo) diff_list->repo = repo; + git_pool_init(&diff_list->pool, 1); + if (git_vector_init(&diff_list->staged, 0, NULL) < 0 || git_vector_init(&diff_list->conflicts, 0, NULL) < 0 || - git_vector_init(&diff_list->resolved, 0, NULL) < 0 || - git_pool_init(&diff_list->pool, 1, 0) < 0) { + git_vector_init(&diff_list->resolved, 0, NULL) < 0) { git_merge_diff_list__free(diff_list); return NULL; } @@ -1632,8 +1640,8 @@ static int merge_normalize_opts( git_merge_options init = GIT_MERGE_OPTIONS_INIT; memcpy(opts, &init, sizeof(init)); - opts->tree_flags = GIT_MERGE_TREE_FIND_RENAMES; - opts->rename_threshold = GIT_MERGE_TREE_RENAME_THRESHOLD; + opts->flags = GIT_MERGE_FIND_RENAMES; + opts->rename_threshold = GIT_MERGE_DEFAULT_RENAME_THRESHOLD; } if (!opts->target_limit) { @@ -1643,7 +1651,7 @@ static int merge_normalize_opts( limit = git_config__get_int_force(cfg, "diff.renamelimit", 0); opts->target_limit = (limit <= 0) ? - GIT_MERGE_TREE_TARGET_LIMIT : (unsigned int)limit; + GIT_MERGE_DEFAULT_TARGET_LIMIT : (unsigned int)limit; } /* assign the internal metric with whitespace flag as payload */ @@ -1689,11 +1697,48 @@ static int merge_index_insert_reuc( mode[0], oid[0], mode[1], oid[1], mode[2], oid[2]); } -int index_from_diff_list(git_index **out, git_merge_diff_list *diff_list) +static int index_update_reuc(git_index *index, git_merge_diff_list *diff_list) +{ + int error; + size_t i; + git_merge_diff *conflict; + + /* Add each entry in the resolved conflict to the REUC independently, since + * the paths may differ due to renames. */ + git_vector_foreach(&diff_list->resolved, i, conflict) { + const git_index_entry *ancestor = + GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->ancestor_entry) ? + &conflict->ancestor_entry : NULL; + + const git_index_entry *ours = + GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->our_entry) ? + &conflict->our_entry : NULL; + + const git_index_entry *theirs = + GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->their_entry) ? + &conflict->their_entry : NULL; + + if (ancestor != NULL && + (error = merge_index_insert_reuc(index, TREE_IDX_ANCESTOR, ancestor)) < 0) + return error; + + if (ours != NULL && + (error = merge_index_insert_reuc(index, TREE_IDX_OURS, ours)) < 0) + return error; + + if (theirs != NULL && + (error = merge_index_insert_reuc(index, TREE_IDX_THEIRS, theirs)) < 0) + return error; + } + + return 0; +} + +static int index_from_diff_list(git_index **out, + git_merge_diff_list *diff_list, bool skip_reuc) { git_index *index; size_t i; - git_index_entry *entry; git_merge_diff *conflict; int error = 0; @@ -1702,10 +1747,8 @@ int index_from_diff_list(git_index **out, git_merge_diff_list *diff_list) if ((error = git_index_new(&index)) < 0) return error; - git_vector_foreach(&diff_list->staged, i, entry) { - if ((error = git_index_add(index, entry)) < 0) - goto on_error; - } + if ((error = git_index__fill(index, &diff_list->staged)) < 0) + goto on_error; git_vector_foreach(&diff_list->conflicts, i, conflict) { const git_index_entry *ancestor = @@ -1748,31 +1791,8 @@ int index_from_diff_list(git_index **out, git_merge_diff_list *diff_list) } } - /* Add each entry in the resolved conflict to the REUC independently, since - * the paths may differ due to renames. */ - git_vector_foreach(&diff_list->resolved, i, conflict) { - const git_index_entry *ancestor = - GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->ancestor_entry) ? - &conflict->ancestor_entry : NULL; - - const git_index_entry *ours = - GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->our_entry) ? - &conflict->our_entry : NULL; - - const git_index_entry *theirs = - GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->their_entry) ? - &conflict->their_entry : NULL; - - if (ancestor != NULL && - (error = merge_index_insert_reuc(index, TREE_IDX_ANCESTOR, ancestor)) < 0) - goto on_error; - - if (ours != NULL && - (error = merge_index_insert_reuc(index, TREE_IDX_OURS, ours)) < 0) - goto on_error; - - if (theirs != NULL && - (error = merge_index_insert_reuc(index, TREE_IDX_THEIRS, theirs)) < 0) + if (!skip_reuc) { + if ((error = index_update_reuc(index, diff_list)) < 0) goto on_error; } @@ -1781,16 +1801,19 @@ int index_from_diff_list(git_index **out, git_merge_diff_list *diff_list) on_error: git_index_free(index); - return error; } static git_iterator *iterator_given_or_empty(git_iterator **empty, git_iterator *given) { + git_iterator_options opts = GIT_ITERATOR_OPTIONS_INIT; + if (given) return given; - if (git_iterator_for_nothing(empty, GIT_ITERATOR_DONT_IGNORE_CASE, NULL, NULL) < 0) + opts.flags = GIT_ITERATOR_DONT_IGNORE_CASE; + + if (git_iterator_for_nothing(empty, &opts) < 0) return NULL; return *empty; @@ -1809,6 +1832,7 @@ int git_merge__iterators( *empty_theirs = NULL; git_merge_diff_list *diff_list; git_merge_options opts; + git_merge_file_options file_opts = GIT_MERGE_FILE_OPTIONS_INIT; git_merge_diff *conflict; git_vector changes; size_t i; @@ -1824,6 +1848,17 @@ int git_merge__iterators( if ((error = merge_normalize_opts(repo, &opts, given_opts)) < 0) return error; + file_opts.favor = opts.file_favor; + file_opts.flags = opts.file_flags; + + /* use the git-inspired labels when virtual base building */ + if (opts.flags & GIT_MERGE__VIRTUAL_BASE) { + file_opts.ancestor_label = "merged common ancestors"; + file_opts.our_label = "Temporary merge branch 1"; + file_opts.their_label = "Temporary merge branch 2"; + file_opts.flags |= GIT_MERGE_FILE_FAVOR__CONFLICTED; + } + diff_list = git_merge_diff_list__alloc(repo); GITERR_CHECK_ALLOC(diff_list); @@ -1842,19 +1877,28 @@ int git_merge__iterators( git_vector_foreach(&changes, i, conflict) { int resolved = 0; - if ((error = merge_conflict_resolve(&resolved, diff_list, conflict, opts.file_favor, opts.file_flags)) < 0) + if ((error = merge_conflict_resolve( + &resolved, diff_list, conflict, &file_opts)) < 0) goto done; - if (!resolved) + if (!resolved) { + if ((opts.flags & GIT_MERGE_FAIL_ON_CONFLICT)) { + giterr_set(GITERR_MERGE, "merge conflicts exist"); + error = GIT_EMERGECONFLICT; + goto done; + } + git_vector_insert(&diff_list->conflicts, conflict); + } } + error = index_from_diff_list(out, diff_list, + (opts.flags & GIT_MERGE_SKIP_REUC)); + +done: if (!given_opts || !given_opts->metric) git__free(opts.metric); - error = index_from_diff_list(out, diff_list); - -done: git_merge_diff_list__free(diff_list); git_iterator_free(empty_ancestor); git_iterator_free(empty_ours); @@ -1872,14 +1916,17 @@ int git_merge_trees( const git_merge_options *merge_opts) { git_iterator *ancestor_iter = NULL, *our_iter = NULL, *their_iter = NULL; + git_iterator_options iter_opts = GIT_ITERATOR_OPTIONS_INIT; int error; - if ((error = git_iterator_for_tree(&ancestor_iter, (git_tree *)ancestor_tree, - GIT_ITERATOR_DONT_IGNORE_CASE, NULL, NULL)) < 0 || - (error = git_iterator_for_tree(&our_iter, (git_tree *)our_tree, - GIT_ITERATOR_DONT_IGNORE_CASE, NULL, NULL)) < 0 || - (error = git_iterator_for_tree(&their_iter, (git_tree *)their_tree, - GIT_ITERATOR_DONT_IGNORE_CASE, NULL, NULL)) < 0) + iter_opts.flags = GIT_ITERATOR_DONT_IGNORE_CASE; + + if ((error = git_iterator_for_tree( + &ancestor_iter, (git_tree *)ancestor_tree, &iter_opts)) < 0 || + (error = git_iterator_for_tree( + &our_iter, (git_tree *)our_tree, &iter_opts)) < 0 || + (error = git_iterator_for_tree( + &their_iter, (git_tree *)their_tree, &iter_opts)) < 0) goto done; error = git_merge__iterators( @@ -1893,6 +1940,206 @@ int git_merge_trees( return error; } +static int merge_annotated_commits( + git_index **index_out, + git_annotated_commit **base_out, + git_repository *repo, + git_annotated_commit *our_commit, + git_annotated_commit *their_commit, + size_t recursion_level, + const git_merge_options *opts); + +GIT_INLINE(int) insert_head_ids( + git_array_oid_t *ids, + const git_annotated_commit *annotated_commit) +{ + git_oid *id; + size_t i; + + if (annotated_commit->type == GIT_ANNOTATED_COMMIT_REAL) { + id = git_array_alloc(*ids); + GITERR_CHECK_ALLOC(id); + + git_oid_cpy(id, git_commit_id(annotated_commit->commit)); + } else { + for (i = 0; i < annotated_commit->parents.size; i++) { + id = git_array_alloc(*ids); + GITERR_CHECK_ALLOC(id); + + git_oid_cpy(id, &annotated_commit->parents.ptr[i]); + } + } + + return 0; +} + +static int create_virtual_base( + git_annotated_commit **out, + git_repository *repo, + git_annotated_commit *one, + git_annotated_commit *two, + const git_merge_options *opts, + size_t recursion_level) +{ + git_annotated_commit *result = NULL; + git_index *index = NULL; + git_merge_options virtual_opts = GIT_MERGE_OPTIONS_INIT; + + /* Conflicts in the merge base creation do not propagate to conflicts + * in the result; the conflicted base will act as the common ancestor. + */ + if (opts) + memcpy(&virtual_opts, opts, sizeof(git_merge_options)); + + virtual_opts.flags &= ~GIT_MERGE_FAIL_ON_CONFLICT; + virtual_opts.flags |= GIT_MERGE__VIRTUAL_BASE; + + if ((merge_annotated_commits(&index, NULL, repo, one, two, + recursion_level + 1, &virtual_opts)) < 0) + return -1; + + result = git__calloc(1, sizeof(git_annotated_commit)); + GITERR_CHECK_ALLOC(result); + result->type = GIT_ANNOTATED_COMMIT_VIRTUAL; + result->index = index; + + insert_head_ids(&result->parents, one); + insert_head_ids(&result->parents, two); + + *out = result; + return 0; +} + +static int compute_base( + git_annotated_commit **out, + git_repository *repo, + const git_annotated_commit *one, + const git_annotated_commit *two, + const git_merge_options *given_opts, + size_t recursion_level) +{ + git_array_oid_t head_ids = GIT_ARRAY_INIT; + git_oidarray bases = {0}; + git_annotated_commit *base = NULL, *other = NULL, *new_base = NULL; + git_merge_options opts = GIT_MERGE_OPTIONS_INIT; + size_t i; + int error; + + *out = NULL; + + if (given_opts) + memcpy(&opts, given_opts, sizeof(git_merge_options)); + + if ((error = insert_head_ids(&head_ids, one)) < 0 || + (error = insert_head_ids(&head_ids, two)) < 0) + goto done; + + if ((error = git_merge_bases_many(&bases, repo, + head_ids.size, head_ids.ptr)) < 0 || + (error = git_annotated_commit_lookup(&base, repo, &bases.ids[0])) < 0 || + (opts.flags & GIT_MERGE_NO_RECURSIVE)) + goto done; + + for (i = 1; i < bases.count; i++) { + recursion_level++; + + if (opts.recursion_limit && recursion_level > opts.recursion_limit) + break; + + if ((error = git_annotated_commit_lookup(&other, repo, + &bases.ids[i])) < 0 || + (error = create_virtual_base(&new_base, repo, base, other, &opts, + recursion_level)) < 0) + goto done; + + git_annotated_commit_free(base); + git_annotated_commit_free(other); + + base = new_base; + new_base = NULL; + other = NULL; + } + +done: + if (error == 0) + *out = base; + else + git_annotated_commit_free(base); + + git_annotated_commit_free(other); + git_annotated_commit_free(new_base); + git_oidarray_free(&bases); + git_array_clear(head_ids); + return error; +} + +static int iterator_for_annotated_commit( + git_iterator **out, + git_annotated_commit *commit) +{ + git_iterator_options opts = GIT_ITERATOR_OPTIONS_INIT; + int error; + + opts.flags = GIT_ITERATOR_DONT_IGNORE_CASE; + + if (commit == NULL) { + error = git_iterator_for_nothing(out, &opts); + } else if (commit->type == GIT_ANNOTATED_COMMIT_VIRTUAL) { + error = git_iterator_for_index(out, git_index_owner(commit->index), commit->index, &opts); + } else { + if (!commit->tree && + (error = git_commit_tree(&commit->tree, commit->commit)) < 0) + goto done; + + error = git_iterator_for_tree(out, commit->tree, &opts); + } + +done: + return error; +} + +static int merge_annotated_commits( + git_index **index_out, + git_annotated_commit **base_out, + git_repository *repo, + git_annotated_commit *ours, + git_annotated_commit *theirs, + size_t recursion_level, + const git_merge_options *opts) +{ + git_annotated_commit *base = NULL; + git_iterator *base_iter = NULL, *our_iter = NULL, *their_iter = NULL; + int error; + + if ((error = compute_base(&base, repo, ours, theirs, opts, + recursion_level)) < 0) { + + if (error != GIT_ENOTFOUND) + goto done; + + giterr_clear(); + } + + if ((error = iterator_for_annotated_commit(&base_iter, base)) < 0 || + (error = iterator_for_annotated_commit(&our_iter, ours)) < 0 || + (error = iterator_for_annotated_commit(&their_iter, theirs)) < 0 || + (error = git_merge__iterators(index_out, repo, base_iter, our_iter, + their_iter, opts)) < 0) + goto done; + + if (base_out) { + *base_out = base; + base = NULL; + } + +done: + git_annotated_commit_free(base); + git_iterator_free(base_iter); + git_iterator_free(our_iter); + git_iterator_free(their_iter); + return error; +} + int git_merge_commits( git_index **out, @@ -1901,30 +2148,19 @@ int git_merge_commits( const git_commit *their_commit, const git_merge_options *opts) { - git_oid ancestor_oid; - git_commit *ancestor_commit = NULL; - git_tree *our_tree = NULL, *their_tree = NULL, *ancestor_tree = NULL; + git_annotated_commit *ours = NULL, *theirs = NULL, *base = NULL; int error = 0; - if ((error = git_merge_base(&ancestor_oid, repo, git_commit_id(our_commit), git_commit_id(their_commit))) < 0 && - error == GIT_ENOTFOUND) - giterr_clear(); - else if (error < 0 || - (error = git_commit_lookup(&ancestor_commit, repo, &ancestor_oid)) < 0 || - (error = git_commit_tree(&ancestor_tree, ancestor_commit)) < 0) + if ((error = git_annotated_commit_from_commit(&ours, (git_commit *)our_commit)) < 0 || + (error = git_annotated_commit_from_commit(&theirs, (git_commit *)their_commit)) < 0) goto done; - if ((error = git_commit_tree(&our_tree, our_commit)) < 0 || - (error = git_commit_tree(&their_tree, their_commit)) < 0 || - (error = git_merge_trees(out, repo, ancestor_tree, our_tree, their_tree, opts)) < 0) - goto done; + error = merge_annotated_commits(out, &base, repo, ours, theirs, 0, opts); done: - git_commit_free(ancestor_commit); - git_tree_free(our_tree); - git_tree_free(their_tree); - git_tree_free(ancestor_tree); - + git_annotated_commit_free(ours); + git_annotated_commit_free(theirs); + git_annotated_commit_free(base); return error; } @@ -2191,7 +2427,7 @@ static int write_merge_msg( assert(repo && heads); entries = git__calloc(heads_len, sizeof(struct merge_msg_entry)); - GITERR_CHECK_ALLOC(entries); + GITERR_CHECK_ALLOC(entries); if (git_vector_init(&matching, heads_len, NULL) < 0) { git__free(entries); @@ -2245,7 +2481,7 @@ static int write_merge_msg( if (matching.length) sep =','; - + if ((error = merge_msg_entries(&matching, entries, heads_len, msg_entry_is_tag)) < 0 || (error = merge_msg_write_tags(&file, &matching, sep)) < 0) goto cleanup; @@ -2358,49 +2594,50 @@ const char *merge_their_label(const char *branchname) } static int merge_normalize_checkout_opts( + git_checkout_options *out, git_repository *repo, - git_checkout_options *checkout_opts, const git_checkout_options *given_checkout_opts, - const git_annotated_commit *ancestor_head, + unsigned int checkout_strategy, + git_annotated_commit *ancestor, const git_annotated_commit *our_head, - size_t their_heads_len, - const git_annotated_commit **their_heads) + const git_annotated_commit **their_heads, + size_t their_heads_len) { + git_checkout_options default_checkout_opts = GIT_CHECKOUT_OPTIONS_INIT; int error = 0; GIT_UNUSED(repo); if (given_checkout_opts != NULL) - memcpy(checkout_opts, given_checkout_opts, sizeof(git_checkout_options)); - else { - git_checkout_options default_checkout_opts = GIT_CHECKOUT_OPTIONS_INIT; - default_checkout_opts.checkout_strategy = GIT_CHECKOUT_SAFE; + memcpy(out, given_checkout_opts, sizeof(git_checkout_options)); + else + memcpy(out, &default_checkout_opts, sizeof(git_checkout_options)); - memcpy(checkout_opts, &default_checkout_opts, sizeof(git_checkout_options)); - } + out->checkout_strategy = checkout_strategy; - /* TODO: for multiple ancestors in merge-recursive, this is "merged common ancestors" */ - if (!checkout_opts->ancestor_label) { - if (ancestor_head && ancestor_head->commit) - checkout_opts->ancestor_label = git_commit_summary(ancestor_head->commit); + if (!out->ancestor_label) { + if (ancestor && ancestor->type == GIT_ANNOTATED_COMMIT_REAL) + out->ancestor_label = git_commit_summary(ancestor->commit); + else if (ancestor) + out->ancestor_label = "merged common ancestors"; else - checkout_opts->ancestor_label = "ancestor"; + out->ancestor_label = "empty base"; } - if (!checkout_opts->our_label) { + if (!out->our_label) { if (our_head && our_head->ref_name) - checkout_opts->our_label = our_head->ref_name; + out->our_label = our_head->ref_name; else - checkout_opts->our_label = "ours"; + out->our_label = "ours"; } - if (!checkout_opts->their_label) { + if (!out->their_label) { if (their_heads_len == 1 && their_heads[0]->ref_name) - checkout_opts->their_label = merge_their_label(their_heads[0]->ref_name); + out->their_label = merge_their_label(their_heads[0]->ref_name); else if (their_heads_len == 1) - checkout_opts->their_label = their_heads[0]->id_str; + out->their_label = their_heads[0]->id_str; else - checkout_opts->their_label = "theirs"; + out->their_label = "theirs"; } return error; @@ -2411,6 +2648,7 @@ static int merge_check_index(size_t *conflicts, git_repository *repo, git_index git_tree *head_tree = NULL; git_index *index_repo = NULL; git_iterator *iter_repo = NULL, *iter_new = NULL; + git_iterator_options iter_opts = GIT_ITERATOR_OPTIONS_INIT; git_diff *staged_diff_list = NULL, *index_diff_list = NULL; git_diff_delta *delta; git_diff_options opts = GIT_DIFF_OPTIONS_INIT; @@ -2440,11 +2678,12 @@ static int merge_check_index(size_t *conflicts, git_repository *repo, git_index goto done; } - opts.pathspec.count = staged_paths.length; - opts.pathspec.strings = (char **)staged_paths.contents; + iter_opts.flags = GIT_ITERATOR_DONT_IGNORE_CASE; + iter_opts.pathlist.strings = (char **)staged_paths.contents; + iter_opts.pathlist.count = staged_paths.length; - if ((error = git_iterator_for_index(&iter_repo, index_repo, GIT_ITERATOR_DONT_IGNORE_CASE, NULL, NULL)) < 0 || - (error = git_iterator_for_index(&iter_new, index_new, GIT_ITERATOR_DONT_IGNORE_CASE, NULL, NULL)) < 0 || + if ((error = git_iterator_for_index(&iter_repo, repo, index_repo, &iter_opts)) < 0 || + (error = git_iterator_for_index(&iter_new, repo, index_new, &iter_opts)) < 0 || (error = git_diff__from_iterators(&index_diff_list, repo, iter_repo, iter_new, &opts)) < 0) goto done; @@ -2488,6 +2727,7 @@ static int merge_check_workdir(size_t *conflicts, git_repository *repo, git_inde * will be applied by the merge (including conflicts). Ensure that there * are no changes in the workdir to these paths. */ + opts.flags |= GIT_DIFF_DISABLE_PATHSPEC_MATCH; opts.pathspec.count = merged_paths->length; opts.pathspec.strings = (char **)merged_paths->contents; @@ -2506,6 +2746,7 @@ int git_merge__check_result(git_repository *repo, git_index *index_new) { git_tree *head_tree = NULL; git_iterator *iter_head = NULL, *iter_new = NULL; + git_iterator_options iter_opts = GIT_ITERATOR_OPTIONS_INIT; git_diff *merged_list = NULL; git_diff_options opts = GIT_DIFF_OPTIONS_INIT; git_diff_delta *delta; @@ -2514,9 +2755,11 @@ int git_merge__check_result(git_repository *repo, git_index *index_new) const git_index_entry *e; int error = 0; + iter_opts.flags = GIT_ITERATOR_DONT_IGNORE_CASE; + if ((error = git_repository_head_tree(&head_tree, repo)) < 0 || - (error = git_iterator_for_tree(&iter_head, head_tree, GIT_ITERATOR_DONT_IGNORE_CASE, NULL, NULL)) < 0 || - (error = git_iterator_for_index(&iter_new, index_new, GIT_ITERATOR_DONT_IGNORE_CASE, NULL, NULL)) < 0 || + (error = git_iterator_for_tree(&iter_head, head_tree, &iter_opts)) < 0 || + (error = git_iterator_for_index(&iter_new, repo, index_new, &iter_opts)) < 0 || (error = git_diff__from_iterators(&merged_list, repo, iter_head, iter_new, &opts)) < 0) goto done; @@ -2747,11 +2990,10 @@ int git_merge( { git_reference *our_ref = NULL; git_checkout_options checkout_opts; - git_annotated_commit *ancestor_head = NULL, *our_head = NULL; - git_tree *ancestor_tree = NULL, *our_tree = NULL, **their_trees = NULL; + git_annotated_commit *our_head = NULL, *base = NULL; git_index *index = NULL; git_indexwriter indexwriter = GIT_INDEXWRITER_INIT; - size_t i; + unsigned int checkout_strategy; int error = 0; assert(repo && their_heads); @@ -2761,61 +3003,49 @@ int git_merge( return -1; } - their_trees = git__calloc(their_heads_len, sizeof(git_tree *)); - GITERR_CHECK_ALLOC(their_trees); - - if ((error = merge_heads(&ancestor_head, &our_head, repo, their_heads, their_heads_len)) < 0 || - (error = merge_normalize_checkout_opts(repo, &checkout_opts, given_checkout_opts, - ancestor_head, our_head, their_heads_len, their_heads)) < 0 || - (error = git_indexwriter_init_for_operation(&indexwriter, repo, &checkout_opts.checkout_strategy)) < 0) - goto on_error; - - /* Write the merge files to the repository. */ - if ((error = git_merge__setup(repo, our_head, their_heads, their_heads_len)) < 0) - goto on_error; + if ((error = git_repository__ensure_not_bare(repo, "merge")) < 0) + goto done; - if (ancestor_head != NULL && - (error = git_commit_tree(&ancestor_tree, ancestor_head->commit)) < 0) - goto on_error; + checkout_strategy = given_checkout_opts ? + given_checkout_opts->checkout_strategy : + GIT_CHECKOUT_SAFE; - if ((error = git_commit_tree(&our_tree, our_head->commit)) < 0) - goto on_error; + if ((error = git_indexwriter_init_for_operation(&indexwriter, repo, + &checkout_strategy)) < 0) + goto done; - for (i = 0; i < their_heads_len; i++) { - if ((error = git_commit_tree(&their_trees[i], their_heads[i]->commit)) < 0) - goto on_error; - } + /* Write the merge setup files to the repository. */ + if ((error = git_annotated_commit_from_head(&our_head, repo)) < 0 || + (error = git_merge__setup(repo, our_head, their_heads, + their_heads_len)) < 0) + goto done; - /* TODO: recursive, octopus, etc... */ + /* TODO: octopus */ - if ((error = git_merge_trees(&index, repo, ancestor_tree, our_tree, their_trees[0], merge_opts)) < 0 || + if ((error = merge_annotated_commits(&index, &base, repo, our_head, + (git_annotated_commit *)their_heads[0], 0, merge_opts)) < 0 || (error = git_merge__check_result(repo, index)) < 0 || - (error = git_merge__append_conflicts_to_merge_msg(repo, index)) < 0 || - (error = git_checkout_index(repo, index, &checkout_opts)) < 0 || - (error = git_indexwriter_commit(&indexwriter)) < 0) - goto on_error; + (error = git_merge__append_conflicts_to_merge_msg(repo, index)) < 0) + goto done; - goto done; + /* check out the merge results */ -on_error: - merge_state_cleanup(repo); + if ((error = merge_normalize_checkout_opts(&checkout_opts, repo, + given_checkout_opts, checkout_strategy, + base, our_head, their_heads, their_heads_len)) < 0 || + (error = git_checkout_index(repo, index, &checkout_opts)) < 0) + goto done; + + error = git_indexwriter_commit(&indexwriter); done: - git_indexwriter_cleanup(&indexwriter); + if (error < 0) + merge_state_cleanup(repo); + git_indexwriter_cleanup(&indexwriter); git_index_free(index); - - git_tree_free(ancestor_tree); - git_tree_free(our_tree); - - for (i = 0; i < their_heads_len; i++) - git_tree_free(their_trees[i]); - - git__free(their_trees); - git_annotated_commit_free(our_head); - git_annotated_commit_free(ancestor_head); - + git_annotated_commit_free(base); git_reference_free(our_ref); return error; diff --git a/vendor/libgit2/src/merge.h b/vendor/libgit2/src/merge.h index 3caf617c6..bd839be49 100644 --- a/vendor/libgit2/src/merge.h +++ b/vendor/libgit2/src/merge.h @@ -19,8 +19,8 @@ #define GIT_MERGE_MODE_FILE "MERGE_MODE" #define GIT_MERGE_FILE_MODE 0666 -#define GIT_MERGE_TREE_RENAME_THRESHOLD 50 -#define GIT_MERGE_TREE_TARGET_LIMIT 1000 +#define GIT_MERGE_DEFAULT_RENAME_THRESHOLD 50 +#define GIT_MERGE_DEFAULT_TARGET_LIMIT 1000 /** Types of changes when files are merged from branch to branch. */ typedef enum { diff --git a/vendor/libgit2/src/mwindow.c b/vendor/libgit2/src/mwindow.c index 55c8d894b..d3e9be78b 100644 --- a/vendor/libgit2/src/mwindow.c +++ b/vendor/libgit2/src/mwindow.c @@ -296,8 +296,18 @@ static git_mwindow *new_window( */ if (git_futils_mmap_ro(&w->window_map, fd, w->offset, (size_t)len) < 0) { - git__free(w); - return NULL; + /* + * The first error might be down to memory fragmentation even if + * we're below our soft limits, so free up what we can and try again. + */ + + while (git_mwindow_close_lru(mwf) == 0) + /* nop */; + + if (git_futils_mmap_ro(&w->window_map, fd, w->offset, (size_t)len) < 0) { + git__free(w); + return NULL; + } } ctl->mmap_calls++; diff --git a/vendor/libgit2/src/netops.c b/vendor/libgit2/src/netops.c index 5e8075597..c4241989f 100644 --- a/vendor/libgit2/src/netops.c +++ b/vendor/libgit2/src/netops.c @@ -261,6 +261,10 @@ int gitno_extract_url_parts( *path = git__substrdup(_path, u.field_data[UF_PATH].len); GITERR_CHECK_ALLOC(*path); } else { + git__free(*port); + *port = NULL; + git__free(*host); + *host = NULL; giterr_set(GITERR_NET, "invalid url, missing path"); return GIT_EINVALIDSPEC; } diff --git a/vendor/libgit2/src/notes.c b/vendor/libgit2/src/notes.c index ef4b41b31..fe8d2164f 100644 --- a/vendor/libgit2/src/notes.c +++ b/vendor/libgit2/src/notes.c @@ -663,7 +663,7 @@ int git_note_iterator_new( if (error < 0) goto cleanup; - if ((error = git_iterator_for_tree(it, tree, 0, NULL, NULL)) < 0) + if ((error = git_iterator_for_tree(it, tree, NULL)) < 0) git_iterator_free(*it); cleanup: diff --git a/vendor/libgit2/src/object.c b/vendor/libgit2/src/object.c index 1073559fd..1d45f9f1b 100644 --- a/vendor/libgit2/src/object.c +++ b/vendor/libgit2/src/object.c @@ -12,9 +12,10 @@ #include "commit.h" #include "tree.h" #include "blob.h" +#include "oid.h" #include "tag.h" -static const int OBJECT_BASE_SIZE = 4096; +bool git_object__strict_input_validation = true; typedef struct { const char *str; /* type name string */ @@ -166,13 +167,9 @@ int git_object_lookup_prefix( error = git_odb_read(&odb_obj, odb, id); } } else { - git_oid short_oid; + git_oid short_oid = {{ 0 }}; - /* We copy the first len*4 bits from id and fill the remaining with 0s */ - memcpy(short_oid.id, id->id, (len + 1) / 2); - if (len % 2) - short_oid.id[len / 2] &= 0xF0; - memset(short_oid.id + (len + 1) / 2, 0, (GIT_OID_HEXSZ - len) / 2); + git_oid__cpy_prefix(&short_oid, id, len); /* If len < GIT_OID_HEXSZ (a strict short oid was given), we have * 2 options : @@ -467,3 +464,27 @@ int git_object_short_id(git_buf *out, const git_object *obj) return error; } +bool git_object__is_valid( + git_repository *repo, const git_oid *id, git_otype expected_type) +{ + git_odb *odb; + git_otype actual_type; + size_t len; + int error; + + if (!git_object__strict_input_validation) + return true; + + if ((error = git_repository_odb__weakptr(&odb, repo)) < 0 || + (error = git_odb_read_header(&len, &actual_type, odb, id)) < 0) + return false; + + if (expected_type != GIT_OBJ_ANY && expected_type != actual_type) { + giterr_set(GITERR_INVALID, + "the requested type does not match the type in the ODB"); + return false; + } + + return true; +} + diff --git a/vendor/libgit2/src/object.h b/vendor/libgit2/src/object.h index d187c55b7..dd227d16d 100644 --- a/vendor/libgit2/src/object.h +++ b/vendor/libgit2/src/object.h @@ -7,6 +7,10 @@ #ifndef INCLUDE_object_h__ #define INCLUDE_object_h__ +#include "repository.h" + +extern bool git_object__strict_input_validation; + /** Base git object for inheritance */ struct git_object { git_cached_obj cached; @@ -28,4 +32,23 @@ int git_oid__parse(git_oid *oid, const char **buffer_out, const char *buffer_end void git_oid__writebuf(git_buf *buf, const char *header, const git_oid *oid); +bool git_object__is_valid( + git_repository *repo, const git_oid *id, git_otype expected_type); + +GIT_INLINE(git_otype) git_object__type_from_filemode(git_filemode_t mode) +{ + switch (mode) { + case GIT_FILEMODE_TREE: + return GIT_OBJ_TREE; + case GIT_FILEMODE_COMMIT: + return GIT_OBJ_COMMIT; + case GIT_FILEMODE_BLOB: + case GIT_FILEMODE_BLOB_EXECUTABLE: + case GIT_FILEMODE_LINK: + return GIT_OBJ_BLOB; + default: + return GIT_OBJ_BAD; + } +} + #endif diff --git a/vendor/libgit2/src/odb.c b/vendor/libgit2/src/odb.c index 805d2c333..cb0f70623 100644 --- a/vendor/libgit2/src/odb.c +++ b/vendor/libgit2/src/odb.c @@ -604,8 +604,7 @@ static void odb_free(git_odb *db) backend_internal *internal = git_vector_get(&db->backends, i); git_odb_backend *backend = internal->backend; - if (backend->free) backend->free(backend); - else git__free(backend); + backend->free(backend); git__free(internal); } @@ -726,7 +725,8 @@ int git_odb_exists_prefix( git_oid_cpy(out, short_id); return 0; } else { - return git_odb__error_notfound("no match for id prefix", short_id); + return git_odb__error_notfound( + "no match for id prefix", short_id, len); } } @@ -741,7 +741,7 @@ int git_odb_exists_prefix( error = odb_exists_prefix_1(out, db, &key, len, true); if (error == GIT_ENOTFOUND) - return git_odb__error_notfound("no match for id prefix", &key); + return git_odb__error_notfound("no match for id prefix", &key, len); return error; } @@ -882,7 +882,7 @@ int git_odb_read(git_odb_object **out, git_odb *db, const git_oid *id) error = odb_read_1(out, db, id, true); if (error == GIT_ENOTFOUND) - return git_odb__error_notfound("no match for id", id); + return git_odb__error_notfound("no match for id", id, GIT_OID_HEXSZ); return error; } @@ -968,7 +968,7 @@ int git_odb_read_prefix( error = read_prefix_1(out, db, &key, len, true); if (error == GIT_ENOTFOUND) - return git_odb__error_notfound("no match for prefix", &key); + return git_odb__error_notfound("no match for prefix", &key, len); return error; } @@ -1224,12 +1224,14 @@ int git_odb_refresh(struct git_odb *db) return 0; } -int git_odb__error_notfound(const char *message, const git_oid *oid) +int git_odb__error_notfound( + const char *message, const git_oid *oid, size_t oid_len) { if (oid != NULL) { char oid_str[GIT_OID_HEXSZ + 1]; - git_oid_tostr(oid_str, sizeof(oid_str), oid); - giterr_set(GITERR_ODB, "Object not found - %s (%s)", message, oid_str); + git_oid_tostr(oid_str, oid_len, oid); + giterr_set(GITERR_ODB, "Object not found - %s (%.*s)", + message, oid_len, oid_str); } else giterr_set(GITERR_ODB, "Object not found - %s", message); diff --git a/vendor/libgit2/src/odb.h b/vendor/libgit2/src/odb.h index 281bd3a4d..31a9fd1b9 100644 --- a/vendor/libgit2/src/odb.h +++ b/vendor/libgit2/src/odb.h @@ -82,7 +82,8 @@ int git_odb__hashlink(git_oid *out, const char *path); /* * Generate a GIT_ENOTFOUND error for the ODB. */ -int git_odb__error_notfound(const char *message, const git_oid *oid); +int git_odb__error_notfound( + const char *message, const git_oid *oid, size_t oid_len); /* * Generate a GIT_EAMBIGUOUS error for the ODB. diff --git a/vendor/libgit2/src/odb_loose.c b/vendor/libgit2/src/odb_loose.c index 99b8f7c91..9d9bffd21 100644 --- a/vendor/libgit2/src/odb_loose.c +++ b/vendor/libgit2/src/odb_loose.c @@ -84,9 +84,9 @@ static int object_file_name( static int object_mkdir(const git_buf *name, const loose_backend *be) { - return git_futils_mkdir( + return git_futils_mkdir_relative( name->ptr + be->objects_dirlen, be->objects_dir, be->object_dir_mode, - GIT_MKDIR_PATH | GIT_MKDIR_SKIP_LAST | GIT_MKDIR_VERIFY_DIR); + GIT_MKDIR_PATH | GIT_MKDIR_SKIP_LAST | GIT_MKDIR_VERIFY_DIR, NULL); } static size_t get_binary_object_header(obj_hdr *hdr, git_buf *obj) @@ -547,7 +547,8 @@ static int locate_object_short_oid( /* Check that directory exists */ if (git_path_isdir(object_location->ptr) == false) - return git_odb__error_notfound("no matching loose object for prefix", short_oid); + return git_odb__error_notfound("no matching loose object for prefix", + short_oid, len); state.dir_len = git_buf_len(object_location); state.short_oid_len = len; @@ -560,7 +561,8 @@ static int locate_object_short_oid( return error; if (!state.found) - return git_odb__error_notfound("no matching loose object for prefix", short_oid); + return git_odb__error_notfound("no matching loose object for prefix", + short_oid, len); if (state.found > 1) return git_odb__error_ambiguous("multiple matches in loose objects"); @@ -613,9 +615,10 @@ static int loose_backend__read_header(size_t *len_p, git_otype *type_p, git_odb_ raw.len = 0; raw.type = GIT_OBJ_BAD; - if (locate_object(&object_path, (loose_backend *)backend, oid) < 0) - error = git_odb__error_notfound("no matching loose object", oid); - else if ((error = read_header_loose(&raw, &object_path)) == 0) { + if (locate_object(&object_path, (loose_backend *)backend, oid) < 0) { + error = git_odb__error_notfound("no matching loose object", + oid, GIT_OID_HEXSZ); + } else if ((error = read_header_loose(&raw, &object_path)) == 0) { *len_p = raw.len; *type_p = raw.type; } @@ -633,9 +636,10 @@ static int loose_backend__read(void **buffer_p, size_t *len_p, git_otype *type_p assert(backend && oid); - if (locate_object(&object_path, (loose_backend *)backend, oid) < 0) - error = git_odb__error_notfound("no matching loose object", oid); - else if ((error = read_loose(&raw, &object_path)) == 0) { + if (locate_object(&object_path, (loose_backend *)backend, oid) < 0) { + error = git_odb__error_notfound("no matching loose object", + oid, GIT_OID_HEXSZ); + } else if ((error = read_loose(&raw, &object_path)) == 0) { *buffer_p = raw.data; *len_p = raw.len; *type_p = raw.type; diff --git a/vendor/libgit2/src/odb_mempack.c b/vendor/libgit2/src/odb_mempack.c index 73accabb5..594a2784c 100644 --- a/vendor/libgit2/src/odb_mempack.c +++ b/vendor/libgit2/src/odb_mempack.c @@ -155,17 +155,14 @@ void git_mempack_reset(git_odb_backend *_backend) git_array_clear(db->commits); - git_oidmap_free(db->objects); - db->objects = git_oidmap_alloc(); + git_oidmap_clear(db->objects); } static void impl__free(git_odb_backend *_backend) { struct memory_packer_db *db = (struct memory_packer_db *)_backend; - git_mempack_reset((git_odb_backend *) db); git_oidmap_free(db->objects); - git__free(db); } diff --git a/vendor/libgit2/src/odb_pack.c b/vendor/libgit2/src/odb_pack.c index 77d2c75b9..5a57864ad 100644 --- a/vendor/libgit2/src/odb_pack.c +++ b/vendor/libgit2/src/odb_pack.c @@ -264,7 +264,8 @@ static int pack_entry_find(struct git_pack_entry *e, struct pack_backend *backen if (!pack_entry_find_inner(e, backend, oid, last_found)) return 0; - return git_odb__error_notfound("failed to find pack entry", oid); + return git_odb__error_notfound( + "failed to find pack entry", oid, GIT_OID_HEXSZ); } static int pack_entry_find_prefix( @@ -309,7 +310,8 @@ static int pack_entry_find_prefix( } if (!found) - return git_odb__error_notfound("no matching pack entry for prefix", short_oid); + return git_odb__error_notfound("no matching pack entry for prefix", + short_oid, len); else return 0; } @@ -333,7 +335,7 @@ static int pack_backend__refresh(git_odb_backend *backend_) return 0; if (p_stat(backend->pack_folder, &st) < 0 || !S_ISDIR(st.st_mode)) - return git_odb__error_notfound("failed to refresh packfiles", NULL); + return git_odb__error_notfound("failed to refresh packfiles", NULL, 0); git_buf_sets(&path, backend->pack_folder); diff --git a/vendor/libgit2/src/oid.h b/vendor/libgit2/src/oid.h index aa1f0bfdc..922a2a347 100644 --- a/vendor/libgit2/src/oid.h +++ b/vendor/libgit2/src/oid.h @@ -44,4 +44,13 @@ GIT_INLINE(int) git_oid__cmp(const git_oid *a, const git_oid *b) return git_oid__hashcmp(a->id, b->id); } +GIT_INLINE(void) git_oid__cpy_prefix( + git_oid *out, const git_oid *id, size_t len) +{ + memcpy(&out->id, id->id, (len + 1) / 2); + + if (len & 1) + out->id[len / 2] &= 0xF0; +} + #endif diff --git a/vendor/libgit2/src/oidmap.h b/vendor/libgit2/src/oidmap.h index d2c451e7f..2cf208f53 100644 --- a/vendor/libgit2/src/oidmap.h +++ b/vendor/libgit2/src/oidmap.h @@ -49,4 +49,6 @@ GIT_INLINE(khint_t) git_oidmap_hash(const git_oid *oid) #define git_oidmap_size(h) kh_size(h) +#define git_oidmap_clear(h) kh_clear(oid, h) + #endif diff --git a/vendor/libgit2/src/openssl_stream.c b/vendor/libgit2/src/openssl_stream.c index 16ee78341..a65f5586e 100644 --- a/vendor/libgit2/src/openssl_stream.c +++ b/vendor/libgit2/src/openssl_stream.c @@ -15,6 +15,7 @@ #include "socket_stream.h" #include "netops.h" #include "git2/transport.h" +#include "git2/sys/openssl.h" #ifdef GIT_CURL # include "curl_stream.h" @@ -31,6 +32,128 @@ #include #include +SSL_CTX *git__ssl_ctx; + +#define GIT_SSL_DEFAULT_CIPHERS "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-DSS-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA:DHE-DSS-AES128-SHA256:DHE-DSS-AES256-SHA256:DHE-DSS-AES128-SHA:DHE-DSS-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA" + +#ifdef GIT_THREADS + +static git_mutex *openssl_locks; + +static void openssl_locking_function( + int mode, int n, const char *file, int line) +{ + int lock; + + GIT_UNUSED(file); + GIT_UNUSED(line); + + lock = mode & CRYPTO_LOCK; + + if (lock) { + git_mutex_lock(&openssl_locks[n]); + } else { + git_mutex_unlock(&openssl_locks[n]); + } +} + +static void shutdown_ssl_locking(void) +{ + int num_locks, i; + + num_locks = CRYPTO_num_locks(); + CRYPTO_set_locking_callback(NULL); + + for (i = 0; i < num_locks; ++i) + git_mutex_free(openssl_locks); + git__free(openssl_locks); +} + +#endif /* GIT_THREADS */ + +/** + * This function aims to clean-up the SSL context which + * we allocated. + */ +static void shutdown_ssl(void) +{ + if (git__ssl_ctx) { + SSL_CTX_free(git__ssl_ctx); + git__ssl_ctx = NULL; + } +} + +int git_openssl_stream_global_init(void) +{ +#ifdef GIT_OPENSSL + long ssl_opts = SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3; + const char *ciphers = git_libgit2__ssl_ciphers(); + + /* Older OpenSSL and MacOS OpenSSL doesn't have this */ +#ifdef SSL_OP_NO_COMPRESSION + ssl_opts |= SSL_OP_NO_COMPRESSION; +#endif + + SSL_load_error_strings(); + OpenSSL_add_ssl_algorithms(); + /* + * Load SSLv{2,3} and TLSv1 so that we can talk with servers + * which use the SSL hellos, which are often used for + * compatibility. We then disable SSL so we only allow OpenSSL + * to speak TLSv1 to perform the encryption itself. + */ + git__ssl_ctx = SSL_CTX_new(SSLv23_method()); + SSL_CTX_set_options(git__ssl_ctx, ssl_opts); + SSL_CTX_set_mode(git__ssl_ctx, SSL_MODE_AUTO_RETRY); + SSL_CTX_set_verify(git__ssl_ctx, SSL_VERIFY_NONE, NULL); + if (!SSL_CTX_set_default_verify_paths(git__ssl_ctx)) { + SSL_CTX_free(git__ssl_ctx); + git__ssl_ctx = NULL; + return -1; + } + + if (!ciphers) { + ciphers = GIT_SSL_DEFAULT_CIPHERS; + } + + if(!SSL_CTX_set_cipher_list(git__ssl_ctx, ciphers)) { + SSL_CTX_free(git__ssl_ctx); + git__ssl_ctx = NULL; + return -1; + } +#endif + + git__on_shutdown(shutdown_ssl); + + return 0; +} + +int git_openssl_set_locking(void) +{ +#ifdef GIT_THREADS + int num_locks, i; + + num_locks = CRYPTO_num_locks(); + openssl_locks = git__calloc(num_locks, sizeof(git_mutex)); + GITERR_CHECK_ALLOC(openssl_locks); + + for (i = 0; i < num_locks; i++) { + if (git_mutex_init(&openssl_locks[i]) != 0) { + giterr_set(GITERR_SSL, "failed to initialize openssl locks"); + return -1; + } + } + + CRYPTO_set_locking_callback(openssl_locking_function); + git__on_shutdown(shutdown_ssl_locking); + return 0; +#else + giterr_set(GITERR_THREAD, "libgit2 as not built with threads"); + return -1; +#endif +} + + static int bio_create(BIO *b) { b->init = 1; @@ -158,7 +281,6 @@ static int ssl_teardown(SSL *ssl) else ret = 0; - SSL_free(ssl); return ret; } @@ -274,6 +396,8 @@ static int verify_server_cert(SSL *ssl, const char *host) GITERR_CHECK_ALLOC(peer_cn); memcpy(peer_cn, ASN1_STRING_data(str), size); peer_cn[size] = '\0'; + } else { + goto cert_fail_name; } } else { int size = ASN1_STRING_to_UTF8(&peer_cn, str); @@ -363,11 +487,12 @@ int openssl_certificate(git_cert **out, git_stream *stream) return -1; } - st->cert_info.cert_type = GIT_CERT_X509; + st->cert_info.parent.cert_type = GIT_CERT_X509; st->cert_info.data = encoded_cert; st->cert_info.len = len; - *out = (git_cert *)&st->cert_info; + *out = &st->cert_info.parent; + return 0; } @@ -420,6 +545,7 @@ void openssl_free(git_stream *stream) { openssl_stream *st = (openssl_stream *) stream; + SSL_free(st->ssl); git__free(st->host); git__free(st->cert_info.data); git_stream_free(st->io); @@ -434,6 +560,7 @@ int git_openssl_stream_new(git_stream **out, const char *host, const char *port) st = git__calloc(1, sizeof(openssl_stream)); GITERR_CHECK_ALLOC(st); + st->io = NULL; #ifdef GIT_CURL error = git_curl_stream_new(&st->io, host, port); #else @@ -441,12 +568,13 @@ int git_openssl_stream_new(git_stream **out, const char *host, const char *port) #endif if (error < 0) - return error; + goto out_err; st->ssl = SSL_new(git__ssl_ctx); if (st->ssl == NULL) { giterr_set(GITERR_SSL, "failed to create ssl object"); - return -1; + error = -1; + goto out_err; } st->host = git__strdup(host); @@ -465,11 +593,29 @@ int git_openssl_stream_new(git_stream **out, const char *host, const char *port) *out = (git_stream *) st; return 0; + +out_err: + git_stream_free(st->io); + git__free(st); + + return error; } #else #include "stream.h" +#include "git2/sys/openssl.h" + +int git_openssl_stream_global_init(void) +{ + return 0; +} + +int git_openssl_set_locking(void) +{ + giterr_set(GITERR_SSL, "libgit2 was not built with OpenSSL support"); + return -1; +} int git_openssl_stream_new(git_stream **out, const char *host, const char *port) { diff --git a/vendor/libgit2/src/openssl_stream.h b/vendor/libgit2/src/openssl_stream.h index 9ca06489e..82b5110c4 100644 --- a/vendor/libgit2/src/openssl_stream.h +++ b/vendor/libgit2/src/openssl_stream.h @@ -9,6 +9,8 @@ #include "git2/sys/stream.h" +extern int git_openssl_stream_global_init(void); + extern int git_openssl_stream_new(git_stream **out, const char *host, const char *port); #endif diff --git a/vendor/libgit2/src/pack-objects.c b/vendor/libgit2/src/pack-objects.c index c4c061a3a..11e13f7d4 100644 --- a/vendor/libgit2/src/pack-objects.c +++ b/vendor/libgit2/src/pack-objects.c @@ -91,7 +91,7 @@ static unsigned name_hash(const char *name) static int packbuilder_config(git_packbuilder *pb) { git_config *config; - int ret; + int ret = 0; int64_t val; if ((ret = git_repository_config_snapshot(&config, pb->repo)) < 0) @@ -100,8 +100,10 @@ static int packbuilder_config(git_packbuilder *pb) #define config_get(KEY,DST,DFLT) do { \ ret = git_config_get_int64(&val, config, KEY); \ if (!ret) (DST) = val; \ - else if (ret == GIT_ENOTFOUND) (DST) = (DFLT); \ - else if (ret < 0) return -1; } while (0) + else if (ret == GIT_ENOTFOUND) { \ + (DST) = (DFLT); \ + ret = 0; \ + } else if (ret < 0) goto out; } while (0) config_get("pack.deltaCacheSize", pb->max_delta_cache_size, GIT_PACK_DELTA_CACHE_SIZE); @@ -113,9 +115,10 @@ static int packbuilder_config(git_packbuilder *pb) #undef config_get +out: git_config_free(config); - return 0; + return ret; } int git_packbuilder_new(git_packbuilder **out, git_repository *repo) @@ -135,8 +138,7 @@ int git_packbuilder_new(git_packbuilder **out, git_repository *repo) if (!pb->walk_objects) goto on_error; - if (git_pool_init(&pb->object_pool, sizeof(git_walk_object), 0) < 0) - goto on_error; + git_pool_init(&pb->object_pool, sizeof(git_walk_object)); pb->repo = repo; pb->nr_threads = 1; /* do not spawn any thread by default */ @@ -606,6 +608,7 @@ static git_pobject **compute_write_order(git_packbuilder *pb) } if (wo_end != pb->nr_objects) { + git__free(wo); giterr_set(GITERR_INVALID, "invalid write order"); return NULL; } @@ -626,10 +629,8 @@ static int write_pack(git_packbuilder *pb, int error = 0; write_order = compute_write_order(pb); - if (write_order == NULL) { - error = -1; - goto done; - } + if (write_order == NULL) + return -1; /* Write pack header */ ph.hdr_signature = htonl(PACK_SIGNATURE); @@ -847,9 +848,13 @@ static int try_delta(git_packbuilder *pb, struct unpacked *trg, git_packbuilder__cache_unlock(pb); - if (overflow || - !(trg_object->delta_data = git__realloc(delta_buf, delta_size))) + if (overflow) { + git__free(delta_buf); return -1; + } + + trg_object->delta_data = git__realloc(delta_buf, delta_size); + GITERR_CHECK_ALLOC(trg_object->delta_data); } else { /* create delta when writing the pack */ git_packbuilder__cache_unlock(pb); diff --git a/vendor/libgit2/src/pack.c b/vendor/libgit2/src/pack.c index 45dd4d5be..e7003e66d 100644 --- a/vendor/libgit2/src/pack.c +++ b/vendor/libgit2/src/pack.c @@ -21,7 +21,7 @@ GIT__USE_OIDMAP static int packfile_open(struct git_pack_file *p); static git_off_t nth_packed_object_offset(const struct git_pack_file *p, uint32_t n); -int packfile_unpack_compressed( +static int packfile_unpack_compressed( git_rawobj *obj, struct git_pack_file *p, git_mwindow **w_curs, @@ -365,9 +365,14 @@ static unsigned char *pack_window_open( * pointless to ask for an offset into the middle of that * hash, and the pack_window_contains function above wouldn't match * don't allow an offset too close to the end of the file. + * + * Don't allow a negative offset, as that means we've wrapped + * around. */ if (offset > (p->mwf.size - 20)) return NULL; + if (offset < 0) + return NULL; return git_mwindow_open(&p->mwf, w_cursor, offset, 20, left); } @@ -489,7 +494,6 @@ int git_packfile_resolve_header( int error; error = git_packfile_unpack_header(&size, &type, &p->mwf, &w_curs, &curpos); - git_mwindow_close(&w_curs); if (error < 0) return error; @@ -512,7 +516,6 @@ int git_packfile_resolve_header( while (type == GIT_OBJ_OFS_DELTA || type == GIT_OBJ_REF_DELTA) { curpos = base_offset; error = git_packfile_unpack_header(&size, &type, &p->mwf, &w_curs, &curpos); - git_mwindow_close(&w_curs); if (error < 0) return error; if (type != GIT_OBJ_OFS_DELTA && type != GIT_OBJ_REF_DELTA) @@ -580,7 +583,6 @@ static int pack_dependency_chain(git_dependency_chain *chain_out, elem->base_key = obj_offset; error = git_packfile_unpack_header(&size, &type, &p->mwf, &w_curs, &curpos); - git_mwindow_close(&w_curs); if (error < 0) goto on_error; @@ -790,7 +792,6 @@ int git_packfile_stream_open(git_packfile_stream *obj, struct git_pack_file *p, obj->zstream.next_out = Z_NULL; st = inflateInit(&obj->zstream); if (st != Z_OK) { - git__free(obj); giterr_set(GITERR_ZLIB, "failed to init packfile stream"); return -1; } @@ -843,7 +844,7 @@ void git_packfile_stream_free(git_packfile_stream *obj) inflateEnd(&obj->zstream); } -int packfile_unpack_compressed( +static int packfile_unpack_compressed( git_rawobj *obj, struct git_pack_file *p, git_mwindow **w_curs, @@ -1014,7 +1015,7 @@ static int packfile_open(struct git_pack_file *p) unsigned char *idx_sha1; if (p->index_version == -1 && pack_index_open(p) < 0) - return git_odb__error_notfound("failed to open packfile", NULL); + return git_odb__error_notfound("failed to open packfile", NULL, 0); /* if mwf opened by another thread, return now */ if (git_mutex_lock(&p->lock) < 0) @@ -1095,7 +1096,7 @@ int git_packfile__name(char **out, const char *path) path_len = strlen(path); if (path_len < strlen(".idx")) - return git_odb__error_notfound("invalid packfile path", NULL); + return git_odb__error_notfound("invalid packfile path", NULL, 0); if (git_buf_printf(&buf, "%.*s.pack", (int)(path_len - strlen(".idx")), path) < 0) return -1; @@ -1113,7 +1114,7 @@ int git_packfile_alloc(struct git_pack_file **pack_out, const char *path) *pack_out = NULL; if (path_len < strlen(".idx")) - return git_odb__error_notfound("invalid packfile path", NULL); + return git_odb__error_notfound("invalid packfile path", NULL, 0); GITERR_CHECK_ALLOC_ADD(&alloc_len, sizeof(*p), path_len); GITERR_CHECK_ALLOC_ADD(&alloc_len, alloc_len, 2); @@ -1139,7 +1140,7 @@ int git_packfile_alloc(struct git_pack_file **pack_out, const char *path) if (p_stat(p->pack_name, &st) < 0 || !S_ISREG(st.st_mode)) { git__free(p); - return git_odb__error_notfound("packfile not found", NULL); + return git_odb__error_notfound("packfile not found", NULL, 0); } /* ok, it looks sane as far as we can check without @@ -1176,6 +1177,7 @@ int git_packfile_alloc(struct git_pack_file **pack_out, const char *path) static git_off_t nth_packed_object_offset(const struct git_pack_file *p, uint32_t n) { const unsigned char *index = p->index_map.data; + const unsigned char *end = index + p->index_map.len; index += 4 * 256; if (p->index_version == 1) { return ntohl(*((uint32_t *)(index + 24 * n))); @@ -1186,6 +1188,11 @@ static git_off_t nth_packed_object_offset(const struct git_pack_file *p, uint32_ if (!(off & 0x80000000)) return off; index += p->num_objects * 4 + (off & 0x7fffffff) * 8; + + /* Make sure we're not being sent out of bounds */ + if (index >= end - 8) + return -1; + return (((uint64_t)ntohl(*((uint32_t *)(index + 0)))) << 32) | ntohl(*((uint32_t *)(index + 4))); } @@ -1265,6 +1272,7 @@ static int pack_entry_find_offset( const unsigned char *index = p->index_map.data; unsigned hi, lo, stride; int pos, found = 0; + git_off_t offset; const unsigned char *current = 0; *offset_out = 0; @@ -1333,11 +1341,16 @@ static int pack_entry_find_offset( } if (!found) - return git_odb__error_notfound("failed to find offset for pack entry", short_oid); + return git_odb__error_notfound("failed to find offset for pack entry", short_oid, len); if (found > 1) return git_odb__error_ambiguous("found multiple offsets for pack entry"); - *offset_out = nth_packed_object_offset(p, pos); + if ((offset = nth_packed_object_offset(p, pos)) < 0) { + giterr_set(GITERR_ODB, "packfile index is corrupt"); + return -1; + } + + *offset_out = offset; git_oid_fromraw(found_oid, current); #ifdef INDEX_DEBUG_LOOKUP diff --git a/vendor/libgit2/src/pack.h b/vendor/libgit2/src/pack.h index b3d5b2993..d15247b74 100644 --- a/vendor/libgit2/src/pack.h +++ b/vendor/libgit2/src/pack.h @@ -138,13 +138,6 @@ int git_packfile_resolve_header( git_off_t offset); int git_packfile_unpack(git_rawobj *obj, struct git_pack_file *p, git_off_t *obj_offset); -int packfile_unpack_compressed( - git_rawobj *obj, - struct git_pack_file *p, - git_mwindow **w_curs, - git_off_t *curpos, - size_t size, - git_otype type); int git_packfile_stream_open(git_packfile_stream *obj, struct git_pack_file *p, git_off_t curpos); ssize_t git_packfile_stream_read(git_packfile_stream *obj, void *buffer, size_t len); diff --git a/vendor/libgit2/src/path.c b/vendor/libgit2/src/path.c index d1454846b..1fd14fcb9 100644 --- a/vendor/libgit2/src/path.c +++ b/vendor/libgit2/src/path.c @@ -526,6 +526,17 @@ bool git_path_isfile(const char *path) return S_ISREG(st.st_mode) != 0; } +bool git_path_islink(const char *path) +{ + struct stat st; + + assert(path); + if (p_lstat(path, &st) < 0) + return false; + + return S_ISLNK(st.st_mode) != 0; +} + #ifdef GIT_WIN32 bool git_path_is_empty_dir(const char *path) @@ -694,8 +705,7 @@ int git_path_resolve_relative(git_buf *path, size_t ceiling) char *base, *to, *from, *next; size_t len; - if (!path || git_buf_oom(path)) - return -1; + GITERR_CHECK_ALLOC_BUF(path); if (ceiling > path->size) ceiling = path->size; @@ -1166,7 +1176,11 @@ static int diriter_update_paths(git_path_diriter *diriter) diriter->path[path_len-1] = L'\0'; git_buf_truncate(&diriter->path_utf8, diriter->parent_utf8_len); - git_buf_putc(&diriter->path_utf8, '/'); + + if (diriter->parent_utf8_len > 0 && + diriter->path_utf8.ptr[diriter->parent_utf8_len-1] != '/') + git_buf_putc(&diriter->path_utf8, '/'); + git_buf_put_w(&diriter->path_utf8, diriter->current.cFileName, filename_len); if (git_buf_oom(&diriter->path_utf8)) @@ -1315,7 +1329,11 @@ int git_path_diriter_next(git_path_diriter *diriter) #endif git_buf_truncate(&diriter->path, diriter->parent_len); - git_buf_putc(&diriter->path, '/'); + + if (diriter->parent_len > 0 && + diriter->path.ptr[diriter->parent_len-1] != '/') + git_buf_putc(&diriter->path, '/'); + git_buf_put(&diriter->path, filename, filename_len); if (git_buf_oom(&diriter->path)) @@ -1380,7 +1398,7 @@ int git_path_dirload( git_vector *contents, const char *path, size_t prefix_len, - unsigned int flags) + uint32_t flags) { git_path_diriter iter = GIT_PATH_DIRITER_INIT; const char *name; @@ -1611,9 +1629,12 @@ static bool verify_component( !verify_dotgit_ntfs(repo, component, len)) return false; + /* don't bother rerunning the `.git` test if we ran the HFS or NTFS + * specific tests, they would have already rejected `.git`. + */ if ((flags & GIT_PATH_REJECT_DOT_GIT_HFS) == 0 && (flags & GIT_PATH_REJECT_DOT_GIT_NTFS) == 0 && - (flags & GIT_PATH_REJECT_DOT_GIT) && + (flags & GIT_PATH_REJECT_DOT_GIT_LITERAL) && len == 4 && component[0] == '.' && (component[1] == 'g' || component[1] == 'G') && @@ -1630,6 +1651,8 @@ GIT_INLINE(unsigned int) dotgit_flags( { int protectHFS = 0, protectNTFS = 0; + flags |= GIT_PATH_REJECT_DOT_GIT_LITERAL; + #ifdef __APPLE__ protectHFS = 1; #endif @@ -1676,3 +1699,19 @@ bool git_path_isvalid( return verify_component(repo, start, (c - start), flags); } + +int git_path_normalize_slashes(git_buf *out, const char *path) +{ + int error; + char *p; + + if ((error = git_buf_puts(out, path)) < 0) + return error; + + for (p = out->ptr; *p; p++) { + if (*p == '\\') + *p = '/'; + } + + return 0; +} diff --git a/vendor/libgit2/src/path.h b/vendor/libgit2/src/path.h index e6be06faa..875c8cb7e 100644 --- a/vendor/libgit2/src/path.h +++ b/vendor/libgit2/src/path.h @@ -72,7 +72,7 @@ extern const char *git_path_topdir(const char *path); * This will return a number >= 0 which is the offset to the start of the * path, if the path is rooted (i.e. "/rooted/path" returns 0 and * "c:/windows/rooted/path" returns 2). If the path is not rooted, this - * returns < 0. + * returns -1. */ extern int git_path_root(const char *path); @@ -168,6 +168,12 @@ extern bool git_path_isdir(const char *path); */ extern bool git_path_isfile(const char *path); +/** + * Check if the given path points to a symbolic link. + * @return true or false + */ +extern bool git_path_islink(const char *path); + /** * Check if the given path is a directory, and is empty. */ @@ -558,15 +564,16 @@ extern int git_path_from_url_or_path(git_buf *local_path_out, const char *url_or #define GIT_PATH_REJECT_TRAILING_COLON (1 << 6) #define GIT_PATH_REJECT_DOS_PATHS (1 << 7) #define GIT_PATH_REJECT_NT_CHARS (1 << 8) -#define GIT_PATH_REJECT_DOT_GIT_HFS (1 << 9) -#define GIT_PATH_REJECT_DOT_GIT_NTFS (1 << 10) +#define GIT_PATH_REJECT_DOT_GIT_LITERAL (1 << 9) +#define GIT_PATH_REJECT_DOT_GIT_HFS (1 << 10) +#define GIT_PATH_REJECT_DOT_GIT_NTFS (1 << 11) /* Default path safety for writing files to disk: since we use the * Win32 "File Namespace" APIs ("\\?\") we need to protect from * paths that the normal Win32 APIs would not write. */ #ifdef GIT_WIN32 -# define GIT_PATH_REJECT_DEFAULTS \ +# define GIT_PATH_REJECT_FILESYSTEM_DEFAULTS \ GIT_PATH_REJECT_TRAVERSAL | \ GIT_PATH_REJECT_BACKSLASH | \ GIT_PATH_REJECT_TRAILING_DOT | \ @@ -575,9 +582,18 @@ extern int git_path_from_url_or_path(git_buf *local_path_out, const char *url_or GIT_PATH_REJECT_DOS_PATHS | \ GIT_PATH_REJECT_NT_CHARS #else -# define GIT_PATH_REJECT_DEFAULTS GIT_PATH_REJECT_TRAVERSAL +# define GIT_PATH_REJECT_FILESYSTEM_DEFAULTS \ + GIT_PATH_REJECT_TRAVERSAL #endif + /* Paths that should never be written into the working directory. */ +#define GIT_PATH_REJECT_WORKDIR_DEFAULTS \ + GIT_PATH_REJECT_FILESYSTEM_DEFAULTS | GIT_PATH_REJECT_DOT_GIT + +/* Paths that should never be written to the index. */ +#define GIT_PATH_REJECT_INDEX_DEFAULTS \ + GIT_PATH_REJECT_TRAVERSAL | GIT_PATH_REJECT_DOT_GIT + /* * Determine whether a path is a valid git path or not - this must not contain * a '.' or '..' component, or a component that is ".git" (in any case). @@ -591,4 +607,9 @@ extern bool git_path_isvalid( const char *path, unsigned int flags); +/** + * Convert any backslashes into slashes + */ +int git_path_normalize_slashes(git_buf *out, const char *path); + #endif diff --git a/vendor/libgit2/src/pathspec.c b/vendor/libgit2/src/pathspec.c index fab6f9a76..8a93cdd50 100644 --- a/vendor/libgit2/src/pathspec.c +++ b/vendor/libgit2/src/pathspec.c @@ -237,9 +237,9 @@ int git_pathspec__init(git_pathspec *ps, const git_strarray *paths) memset(ps, 0, sizeof(*ps)); ps->prefix = git_pathspec_prefix(paths); + git_pool_init(&ps->pool, 1); - if ((error = git_pool_init(&ps->pool, 1, 0)) < 0 || - (error = git_pathspec__vinit(&ps->pathspec, paths, &ps->pool)) < 0) + if ((error = git_pathspec__vinit(&ps->pathspec, paths, &ps->pool)) < 0) git_pathspec__clear(ps); return error; @@ -312,15 +312,11 @@ static git_pathspec_match_list *pathspec_match_alloc( git_pathspec *ps, int datatype) { git_pathspec_match_list *m = git__calloc(1, sizeof(git_pathspec_match_list)); - - if (m != NULL && git_pool_init(&m->pool, 1, 0) < 0) { - pathspec_match_free(m); - m = NULL; - } - if (!m) return NULL; + git_pool_init(&m->pool, 1); + /* need to keep reference to pathspec and increment refcount because * failures array stores pointers to the pattern strings of the * pathspec that had no matches @@ -524,16 +520,16 @@ int git_pathspec_match_workdir( uint32_t flags, git_pathspec *ps) { - int error = 0; git_iterator *iter; + git_iterator_options iter_opts = GIT_ITERATOR_OPTIONS_INIT; + int error = 0; assert(repo); - if (!(error = git_iterator_for_workdir( - &iter, repo, NULL, NULL, pathspec_match_iter_flags(flags), NULL, NULL))) { + iter_opts.flags = pathspec_match_iter_flags(flags); + if (!(error = git_iterator_for_workdir(&iter, repo, NULL, NULL, &iter_opts))) { error = pathspec_match_from_iterator(out, iter, flags, ps); - git_iterator_free(iter); } @@ -546,16 +542,16 @@ int git_pathspec_match_index( uint32_t flags, git_pathspec *ps) { - int error = 0; git_iterator *iter; + git_iterator_options iter_opts = GIT_ITERATOR_OPTIONS_INIT; + int error = 0; assert(index); - if (!(error = git_iterator_for_index( - &iter, index, pathspec_match_iter_flags(flags), NULL, NULL))) { + iter_opts.flags = pathspec_match_iter_flags(flags); + if (!(error = git_iterator_for_index(&iter, git_index_owner(index), index, &iter_opts))) { error = pathspec_match_from_iterator(out, iter, flags, ps); - git_iterator_free(iter); } @@ -568,16 +564,16 @@ int git_pathspec_match_tree( uint32_t flags, git_pathspec *ps) { - int error = 0; git_iterator *iter; + git_iterator_options iter_opts = GIT_ITERATOR_OPTIONS_INIT; + int error = 0; assert(tree); - if (!(error = git_iterator_for_tree( - &iter, tree, pathspec_match_iter_flags(flags), NULL, NULL))) { + iter_opts.flags = pathspec_match_iter_flags(flags); + if (!(error = git_iterator_for_tree(&iter, tree, &iter_opts))) { error = pathspec_match_from_iterator(out, iter, flags, ps); - git_iterator_free(iter); } @@ -722,4 +718,3 @@ const char * git_pathspec_match_list_failed_entry( return entry ? *entry : NULL; } - diff --git a/vendor/libgit2/src/pool.c b/vendor/libgit2/src/pool.c index c93d78182..b4fc50fca 100644 --- a/vendor/libgit2/src/pool.c +++ b/vendor/libgit2/src/pool.c @@ -11,182 +11,179 @@ struct git_pool_page { GIT_ALIGN(char data[GIT_FLEX_ARRAY], 8); }; -struct pool_freelist { - struct pool_freelist *next; -}; - -#define GIT_POOL_MIN_USABLE 4 -#define GIT_POOL_MIN_PAGESZ 2 * sizeof(void*) - static void *pool_alloc_page(git_pool *pool, uint32_t size); -static void pool_insert_page(git_pool *pool, git_pool_page *page); -int git_pool_init( - git_pool *pool, uint32_t item_size, uint32_t items_per_page) +uint32_t git_pool__system_page_size(void) { - assert(pool); + static uint32_t size = 0; - if (!item_size) - item_size = 1; - /* round up item_size for decent object alignment */ - if (item_size > 4) - item_size = (item_size + 7) & ~7; - else if (item_size == 3) - item_size = 4; + if (!size) { + size_t page_size; + if (git__page_size(&page_size) < 0) + page_size = 4096; + /* allow space for malloc overhead */ + size = page_size - (2 * sizeof(void *)) - sizeof(git_pool_page); + } - if (!items_per_page) - items_per_page = git_pool__suggest_items_per_page(item_size); - if (item_size * items_per_page < GIT_POOL_MIN_PAGESZ) - items_per_page = (GIT_POOL_MIN_PAGESZ + item_size - 1) / item_size; + return size; +} + +#ifndef GIT_DEBUG_POOL +void git_pool_init(git_pool *pool, uint32_t item_size) +{ + assert(pool); + assert(item_size >= 1); memset(pool, 0, sizeof(git_pool)); pool->item_size = item_size; - pool->page_size = item_size * items_per_page; - - return 0; + pool->page_size = git_pool__system_page_size(); } void git_pool_clear(git_pool *pool) { git_pool_page *scan, *next; - for (scan = pool->open; scan != NULL; scan = next) { + for (scan = pool->pages; scan != NULL; scan = next) { next = scan->next; git__free(scan); } - pool->open = NULL; - for (scan = pool->full; scan != NULL; scan = next) { - next = scan->next; - git__free(scan); - } - pool->full = NULL; + pool->pages = NULL; +} - pool->free_list = NULL; +static void *pool_alloc_page(git_pool *pool, uint32_t size) +{ + git_pool_page *page; + const uint32_t new_page_size = (size <= pool->page_size) ? pool->page_size : size; + size_t alloc_size; - pool->items = 0; + if (GIT_ADD_SIZET_OVERFLOW(&alloc_size, new_page_size, sizeof(git_pool_page)) || + !(page = git__malloc(alloc_size))) + return NULL; - pool->has_string_alloc = 0; - pool->has_multi_item_alloc = 0; - pool->has_large_page_alloc = 0; + page->size = new_page_size; + page->avail = new_page_size - size; + page->next = pool->pages; + + pool->pages = page; + + return page->data; } -void git_pool_swap(git_pool *a, git_pool *b) +static void *pool_alloc(git_pool *pool, uint32_t size) { - git_pool temp; + git_pool_page *page = pool->pages; + void *ptr = NULL; - if (a == b) - return; + if (!page || page->avail < size) + return pool_alloc_page(pool, size); - memcpy(&temp, a, sizeof(temp)); - memcpy(a, b, sizeof(temp)); - memcpy(b, &temp, sizeof(temp)); + ptr = &page->data[page->size - page->avail]; + page->avail -= size; + + return ptr; } -static void pool_insert_page(git_pool *pool, git_pool_page *page) +uint32_t git_pool__open_pages(git_pool *pool) { + uint32_t ct = 0; git_pool_page *scan; - - /* If there are no open pages or this page has the most open space, - * insert it at the beginning of the list. This is the common case. - */ - if (pool->open == NULL || pool->open->avail < page->avail) { - page->next = pool->open; - pool->open = page; - return; - } - - /* Otherwise insert into sorted position. */ - for (scan = pool->open; - scan->next && scan->next->avail > page->avail; - scan = scan->next); - page->next = scan->next; - scan->next = page; + for (scan = pool->pages; scan != NULL; scan = scan->next) ct++; + return ct; } -static void *pool_alloc_page(git_pool *pool, uint32_t size) +bool git_pool__ptr_in_pool(git_pool *pool, void *ptr) { - git_pool_page *page; - uint32_t new_page_size; - size_t alloc_size; - - if (size <= pool->page_size) - new_page_size = pool->page_size; - else { - new_page_size = size; - pool->has_large_page_alloc = 1; - } - - if (GIT_ADD_SIZET_OVERFLOW(&alloc_size, new_page_size, sizeof(git_pool_page)) || - !(page = git__calloc(1, alloc_size))) - return NULL; + git_pool_page *scan; + for (scan = pool->pages; scan != NULL; scan = scan->next) + if ((void *)scan->data <= ptr && + (void *)(((char *)scan->data) + scan->size) > ptr) + return true; + return false; +} - page->size = new_page_size; - page->avail = new_page_size - size; +#else - if (page->avail > 0) - pool_insert_page(pool, page); +static int git_pool__ptr_cmp(const void * a, const void * b) +{ + if(a > b) { + return 1; + } + if(a < b) { + return -1; + } else { - page->next = pool->full; - pool->full = page; + return 0; } +} - pool->items++; +void git_pool_init(git_pool *pool, uint32_t item_size) +{ + assert(pool); + assert(item_size >= 1); - return page->data; + memset(pool, 0, sizeof(git_pool)); + pool->item_size = item_size; + pool->page_size = git_pool__system_page_size(); + git_vector_init(&pool->allocations, 100, git_pool__ptr_cmp); } -GIT_INLINE(void) pool_remove_page( - git_pool *pool, git_pool_page *page, git_pool_page *prev) +void git_pool_clear(git_pool *pool) { - if (prev == NULL) - pool->open = page->next; - else - prev->next = page->next; + git_vector_free_deep(&pool->allocations); } -void *git_pool_malloc(git_pool *pool, uint32_t items) -{ - git_pool_page *scan = pool->open, *prev; - uint32_t size = ((items * pool->item_size) + 7) & ~7; +static void *pool_alloc(git_pool *pool, uint32_t size) { void *ptr = NULL; - - pool->has_string_alloc = 0; - if (items > 1) - pool->has_multi_item_alloc = 1; - else if (pool->free_list != NULL) { - ptr = pool->free_list; - pool->free_list = ((struct pool_freelist *)pool->free_list)->next; - return ptr; + if((ptr = git__malloc(size)) == NULL) { + return NULL; } + git_vector_insert_sorted(&pool->allocations, ptr, NULL); + return ptr; +} - /* just add a block if there is no open one to accommodate this */ - if (size >= pool->page_size || !scan || scan->avail < size) - return pool_alloc_page(pool, size); +bool git_pool__ptr_in_pool(git_pool *pool, void *ptr) +{ + size_t pos; + return git_vector_bsearch(&pos, &pool->allocations, ptr) != GIT_ENOTFOUND; +} +#endif - pool->items++; +void git_pool_swap(git_pool *a, git_pool *b) +{ + git_pool temp; - /* find smallest block in free list with space */ - for (scan = pool->open, prev = NULL; - scan->next && scan->next->avail >= size; - prev = scan, scan = scan->next); + if (a == b) + return; - /* allocate space from the block */ - ptr = &scan->data[scan->size - scan->avail]; - scan->avail -= size; + memcpy(&temp, a, sizeof(temp)); + memcpy(a, b, sizeof(temp)); + memcpy(b, &temp, sizeof(temp)); +} - /* move to full list if there is almost no space left */ - if (scan->avail < pool->item_size || scan->avail < GIT_POOL_MIN_USABLE) { - pool_remove_page(pool, scan, prev); - scan->next = pool->full; - pool->full = scan; - } - /* reorder list if block is now smaller than the one after it */ - else if (scan->next != NULL && scan->next->avail > scan->avail) { - pool_remove_page(pool, scan, prev); - pool_insert_page(pool, scan); +static uint32_t alloc_size(git_pool *pool, uint32_t count) +{ + const uint32_t align = sizeof(void *) - 1; + + if (pool->item_size > 1) { + const uint32_t item_size = (pool->item_size + align) & ~align; + return item_size * count; } + return (count + align) & ~align; +} + +void *git_pool_malloc(git_pool *pool, uint32_t items) +{ + return pool_alloc(pool, alloc_size(pool, items)); +} + +void *git_pool_mallocz(git_pool *pool, uint32_t items) +{ + const uint32_t size = alloc_size(pool, items); + void *ptr = pool_alloc(pool, size); + if (ptr) + memset(ptr, 0x0, size); return ptr; } @@ -204,15 +201,12 @@ char *git_pool_strndup(git_pool *pool, const char *str, size_t n) ptr[n] = '\0'; } - pool->has_string_alloc = 1; - return ptr; } char *git_pool_strdup(git_pool *pool, const char *str) { assert(pool && str && pool->item_size == sizeof(char)); - return git_pool_strndup(pool, str, strlen(str)); } @@ -238,88 +232,5 @@ char *git_pool_strcat(git_pool *pool, const char *a, const char *b) memcpy(((char *)ptr) + len_a, b, len_b); *(((char *)ptr) + len_a + len_b) = '\0'; } - pool->has_string_alloc = 1; - return ptr; } - -void git_pool_free(git_pool *pool, void *ptr) -{ - struct pool_freelist *item = ptr; - - assert(pool && pool->item_size >= sizeof(void*)); - - if (item) { - item->next = pool->free_list; - pool->free_list = item; - } -} - -void git_pool_free_array(git_pool *pool, size_t count, void **ptrs) -{ - struct pool_freelist **items = (struct pool_freelist **)ptrs; - size_t i; - - assert(pool && ptrs && pool->item_size >= sizeof(void*)); - - if (!count) - return; - - for (i = count - 1; i > 0; --i) - items[i]->next = items[i - 1]; - - items[i]->next = pool->free_list; - pool->free_list = items[count - 1]; -} - -uint32_t git_pool__open_pages(git_pool *pool) -{ - uint32_t ct = 0; - git_pool_page *scan; - for (scan = pool->open; scan != NULL; scan = scan->next) ct++; - return ct; -} - -uint32_t git_pool__full_pages(git_pool *pool) -{ - uint32_t ct = 0; - git_pool_page *scan; - for (scan = pool->full; scan != NULL; scan = scan->next) ct++; - return ct; -} - -bool git_pool__ptr_in_pool(git_pool *pool, void *ptr) -{ - git_pool_page *scan; - for (scan = pool->open; scan != NULL; scan = scan->next) - if ((void *)scan->data <= ptr && - (void *)(((char *)scan->data) + scan->size) > ptr) - return true; - for (scan = pool->full; scan != NULL; scan = scan->next) - if ((void *)scan->data <= ptr && - (void *)(((char *)scan->data) + scan->size) > ptr) - return true; - return false; -} - -uint32_t git_pool__system_page_size(void) -{ - static uint32_t size = 0; - - if (!size) { - size_t page_size; - if (git__page_size(&page_size) < 0) - page_size = 4096; - size = page_size - 2 * sizeof(void *); /* allow space for malloc overhead */ - } - - return size; -} - -uint32_t git_pool__suggest_items_per_page(uint32_t item_size) -{ - uint32_t page_bytes = - git_pool__system_page_size() - sizeof(git_pool_page); - return page_bytes / item_size; -} - diff --git a/vendor/libgit2/src/pool.h b/vendor/libgit2/src/pool.h index b0007f315..e0fafa997 100644 --- a/vendor/libgit2/src/pool.h +++ b/vendor/libgit2/src/pool.h @@ -8,9 +8,11 @@ #define INCLUDE_pool_h__ #include "common.h" +#include "vector.h" typedef struct git_pool_page git_pool_page; +#ifndef GIT_DEBUG_POOL /** * Chunked allocator. * @@ -28,37 +30,52 @@ typedef struct git_pool_page git_pool_page; * For examples of how to set up a `git_pool` see `git_pool_init`. */ typedef struct { - git_pool_page *open; /* pages with space left */ - git_pool_page *full; /* pages with no space left */ - void *free_list; /* optional: list of freed blocks */ + git_pool_page *pages; /* allocated pages */ uint32_t item_size; /* size of single alloc unit in bytes */ uint32_t page_size; /* size of page in bytes */ - uint32_t items; - unsigned has_string_alloc : 1; /* was the strdup function used */ - unsigned has_multi_item_alloc : 1; /* was items ever > 1 in malloc */ - unsigned has_large_page_alloc : 1; /* are any pages > page_size */ } git_pool; -#define GIT_POOL_INIT_STRINGPOOL { 0, 0, 0, 1, 4000, 0, 0, 0, 0 } +#else + +/** + * Debug chunked allocator. + * + * Acts just like `git_pool` but instead of actually pooling allocations it + * passes them through to `git__malloc`. This makes it possible to easily debug + * systems that use `git_pool` using valgrind. + * + * In order to track allocations during the lifetime of the pool we use a + * `git_vector`. When the pool is deallocated everything in the vector is + * freed. + * + * `API is exactly the same as the standard `git_pool` with one exception. + * Since we aren't allocating pages to hand out in chunks we can't easily + * implement `git_pool__open_pages`. + */ +typedef struct { + git_vector allocations; + uint32_t item_size; + uint32_t page_size; +} git_pool; +#endif /** * Initialize a pool. * * To allocation strings, use like this: * - * git_pool_init(&string_pool, 1, 0); + * git_pool_init(&string_pool, 1); * my_string = git_pool_strdup(&string_pool, your_string); * * To allocate items of fixed size, use like this: * - * git_pool_init(&pool, sizeof(item), 0); + * git_pool_init(&pool, sizeof(item)); * my_item = git_pool_malloc(&pool, 1); * * Of course, you can use this in other ways, but those are the * two most common patterns. */ -extern int git_pool_init( - git_pool *pool, uint32_t item_size, uint32_t items_per_page); +extern void git_pool_init(git_pool *pool, uint32_t item_size); /** * Free all items in pool @@ -74,17 +91,7 @@ extern void git_pool_swap(git_pool *a, git_pool *b); * Allocate space for one or more items from a pool. */ extern void *git_pool_malloc(git_pool *pool, uint32_t items); - -/** - * Allocate space and zero it out. - */ -GIT_INLINE(void *) git_pool_mallocz(git_pool *pool, uint32_t items) -{ - void *ptr = git_pool_malloc(pool, items); - if (ptr) - memset(ptr, 0, (size_t)items * (size_t)pool->item_size); - return ptr; -} +extern void *git_pool_mallocz(git_pool *pool, uint32_t items); /** * Allocate space and duplicate string data into it. @@ -114,35 +121,12 @@ extern char *git_pool_strdup_safe(git_pool *pool, const char *str); */ extern char *git_pool_strcat(git_pool *pool, const char *a, const char *b); -/** - * Push a block back onto the free list for the pool. - * - * This is allowed only if the item_size is >= sizeof(void*). - * - * In some cases, it is helpful to "release" an allocated block - * for reuse. Pools don't support a general purpose free, but - * they will keep a simple free blocks linked list provided the - * native block size is large enough to hold a void pointer - */ -extern void git_pool_free(git_pool *pool, void *ptr); - -/** - * Push an array of pool allocated blocks efficiently onto the free list. - * - * This has the same constraints as `git_pool_free()` above. - */ -extern void git_pool_free_array(git_pool *pool, size_t count, void **ptrs); - /* * Misc utilities */ - +#ifndef GIT_DEBUG_POOL extern uint32_t git_pool__open_pages(git_pool *pool); - -extern uint32_t git_pool__full_pages(git_pool *pool); - +#endif extern bool git_pool__ptr_in_pool(git_pool *pool, void *ptr); -extern uint32_t git_pool__suggest_items_per_page(uint32_t item_size); - #endif diff --git a/vendor/libgit2/src/posix.c b/vendor/libgit2/src/posix.c index 8d86aa8bf..b3f1a1cd3 100644 --- a/vendor/libgit2/src/posix.c +++ b/vendor/libgit2/src/posix.c @@ -62,8 +62,11 @@ int p_getaddrinfo( ai = ainfo; for (p = 1; ainfo->ai_hostent->h_addr_list[p] != NULL; p++) { - ai->ai_next = malloc(sizeof(struct addrinfo)); - memcpy(&ai->ai_next, ainfo, sizeof(struct addrinfo)); + if (!(ai->ai_next = malloc(sizeof(struct addrinfo)))) { + p_freeaddrinfo(ainfo); + return -1; + } + memcpy(ai->ai_next, ainfo, sizeof(struct addrinfo)); memcpy(&ai->ai_next->ai_addr_in.sin_addr, ainfo->ai_hostent->h_addr_list[p], ainfo->ai_hostent->h_length); @@ -221,6 +224,13 @@ int git__page_size(size_t *page_size) return 0; } +int git__mmap_alignment(size_t *alignment) +{ + /* dummy; here we don't need any alignment anyway */ + *alignment = 4096; + return 0; +} + int p_mmap(git_map *out, size_t len, int prot, int flags, int fd, git_off_t offset) { diff --git a/vendor/libgit2/src/posix.h b/vendor/libgit2/src/posix.h index 8785a4c99..f204751cf 100644 --- a/vendor/libgit2/src/posix.h +++ b/vendor/libgit2/src/posix.h @@ -109,6 +109,7 @@ extern int p_getcwd(char *buffer_out, size_t size); extern int p_rename(const char *from, const char *to); extern int git__page_size(size_t *page_size); +extern int git__mmap_alignment(size_t *page_size); /** * Platform-dependent methods diff --git a/vendor/libgit2/src/push.c b/vendor/libgit2/src/push.c index a0d8a0550..0747259c8 100644 --- a/vendor/libgit2/src/push.c +++ b/vendor/libgit2/src/push.c @@ -73,6 +73,7 @@ int git_push_set_options(git_push *push, const git_push_options *opts) GITERR_CHECK_VERSION(opts, GIT_PUSH_OPTIONS_VERSION, "git_push_options"); push->pb_parallelism = opts->pb_parallelism; + push->custom_headers = &opts->custom_headers; return 0; } @@ -373,9 +374,9 @@ static int enqueue_object( case GIT_OBJ_COMMIT: return 0; case GIT_OBJ_TREE: - return git_packbuilder_insert_tree(pb, &entry->oid); + return git_packbuilder_insert_tree(pb, entry->oid); default: - return git_packbuilder_insert(pb, &entry->oid, entry->filename); + return git_packbuilder_insert(pb, entry->oid, entry->filename); } } @@ -395,7 +396,7 @@ static int queue_differences( const git_tree_entry *d_entry = git_tree_entry_byindex(delta, j); int cmp = 0; - if (!git_oid__cmp(&b_entry->oid, &d_entry->oid)) + if (!git_oid__cmp(b_entry->oid, d_entry->oid)) goto loop; cmp = strcmp(b_entry->filename, d_entry->filename); @@ -406,15 +407,15 @@ static int queue_differences( git_tree_entry__is_tree(b_entry) && git_tree_entry__is_tree(d_entry)) { /* Add the right-hand entry */ - if ((error = git_packbuilder_insert(pb, &d_entry->oid, + if ((error = git_packbuilder_insert(pb, d_entry->oid, d_entry->filename)) < 0) goto on_error; /* Acquire the subtrees and recurse */ if ((error = git_tree_lookup(&b_child, - git_tree_owner(base), &b_entry->oid)) < 0 || + git_tree_owner(base), b_entry->oid)) < 0 || (error = git_tree_lookup(&d_child, - git_tree_owner(delta), &d_entry->oid)) < 0 || + git_tree_owner(delta), d_entry->oid)) < 0 || (error = queue_differences(b_child, d_child, pb)) < 0) goto on_error; @@ -638,7 +639,7 @@ int git_push_finish(git_push *push, const git_remote_callbacks *callbacks) int error; if (!git_remote_connected(push->remote) && - (error = git_remote_connect(push->remote, GIT_DIRECTION_PUSH, callbacks)) < 0) + (error = git_remote_connect(push->remote, GIT_DIRECTION_PUSH, callbacks, push->custom_headers)) < 0) return error; if ((error = filter_refs(push->remote)) < 0 || diff --git a/vendor/libgit2/src/push.h b/vendor/libgit2/src/push.h index a847ee0d0..e32ad2f4d 100644 --- a/vendor/libgit2/src/push.h +++ b/vendor/libgit2/src/push.h @@ -38,6 +38,7 @@ struct git_push { /* options */ unsigned pb_parallelism; + const git_strarray *custom_headers; }; /** diff --git a/vendor/libgit2/src/rebase.c b/vendor/libgit2/src/rebase.c index 17536c030..bcad9b7cd 100644 --- a/vendor/libgit2/src/rebase.c +++ b/vendor/libgit2/src/rebase.c @@ -63,17 +63,23 @@ struct git_rebase { char *state_path; int head_detached : 1, + inmemory : 1, quiet : 1, started : 1; - char *orig_head_name; + git_array_t(git_rebase_operation) operations; + size_t current; + + /* Used by in-memory rebase */ + git_index *index; + git_commit *last_commit; + + /* Used by regular (not in-memory) merge-style rebase */ git_oid orig_head_id; + char *orig_head_name; git_oid onto_id; char *onto_name; - - git_array_t(git_rebase_operation) operations; - size_t current; }; #define GIT_REBASE_STATE_INIT {0} @@ -251,12 +257,12 @@ static int rebase_open_merge(git_rebase *rebase) return error; } -static git_rebase *rebase_alloc(const git_rebase_options *rebase_opts) +static int rebase_alloc(git_rebase **out, const git_rebase_options *rebase_opts) { git_rebase *rebase = git__calloc(1, sizeof(git_rebase)); + GITERR_CHECK_ALLOC(rebase); - if (!rebase) - return NULL; + *out = NULL; if (rebase_opts) memcpy(&rebase->options, rebase_opts, sizeof(git_rebase_options)); @@ -264,14 +270,16 @@ static git_rebase *rebase_alloc(const git_rebase_options *rebase_opts) git_rebase_init_options(&rebase->options, GIT_REBASE_OPTIONS_VERSION); if (rebase_opts && rebase_opts->rewrite_notes_ref) { - if ((rebase->options.rewrite_notes_ref = git__strdup(rebase_opts->rewrite_notes_ref)) == NULL) - return NULL; + rebase->options.rewrite_notes_ref = git__strdup(rebase_opts->rewrite_notes_ref); + GITERR_CHECK_ALLOC(rebase->options.rewrite_notes_ref); } if ((rebase->options.checkout_options.checkout_strategy & (GIT_CHECKOUT_SAFE | GIT_CHECKOUT_FORCE)) == 0) rebase->options.checkout_options.checkout_strategy = GIT_CHECKOUT_SAFE; - return rebase; + *out = rebase; + + return 0; } static int rebase_check_versions(const git_rebase_options *given_opts) @@ -299,8 +307,8 @@ int git_rebase_open( if ((error = rebase_check_versions(given_opts)) < 0) return error; - rebase = rebase_alloc(given_opts); - GITERR_CHECK_ALLOC(rebase); + if (rebase_alloc(&rebase, given_opts) < 0) + return -1; rebase->repo = repo; @@ -393,6 +401,9 @@ int git_rebase_open( static int rebase_cleanup(git_rebase *rebase) { + if (!rebase || rebase->inmemory) + return 0; + return git_path_isdir(rebase->state_path) ? git_futils_rmdir_r(rebase->state_path, NULL, GIT_RMDIR_REMOVE_FILES) : 0; @@ -600,62 +611,66 @@ static int rebase_init_merge( const git_annotated_commit *branch, const git_annotated_commit *upstream, const git_annotated_commit *onto) -{ - if (rebase_init_operations(rebase, repo, branch, upstream, onto) < 0) - return -1; - - rebase->onto_name = git__strdup(rebase_onto_name(onto)); - GITERR_CHECK_ALLOC(rebase->onto_name); - - return 0; -} - -static int rebase_init( - git_rebase *rebase, - git_repository *repo, - const git_annotated_commit *branch, - const git_annotated_commit *upstream, - const git_annotated_commit *onto) { git_reference *head_ref = NULL; - git_annotated_commit *head_branch = NULL; + git_commit *onto_commit = NULL; + git_buf reflog = GIT_BUF_INIT; git_buf state_path = GIT_BUF_INIT; int error; + GIT_UNUSED(upstream); + if ((error = git_buf_joinpath(&state_path, repo->path_repository, REBASE_MERGE_DIR)) < 0) goto done; - if (!branch) { - if ((error = git_repository_head(&head_ref, repo)) < 0 || - (error = git_annotated_commit_from_ref(&head_branch, repo, head_ref)) < 0) - goto done; - - branch = head_branch; - } - - rebase->repo = repo; - rebase->type = GIT_REBASE_TYPE_MERGE; rebase->state_path = git_buf_detach(&state_path); + GITERR_CHECK_ALLOC(rebase->state_path); + rebase->orig_head_name = git__strdup(branch->ref_name ? branch->ref_name : ORIG_DETACHED_HEAD); + GITERR_CHECK_ALLOC(rebase->orig_head_name); + + rebase->onto_name = git__strdup(rebase_onto_name(onto)); + GITERR_CHECK_ALLOC(rebase->onto_name); + rebase->quiet = rebase->options.quiet; git_oid_cpy(&rebase->orig_head_id, git_annotated_commit_id(branch)); git_oid_cpy(&rebase->onto_id, git_annotated_commit_id(onto)); - if (!rebase->orig_head_name || !rebase->state_path) - return -1; - - error = rebase_init_merge(rebase, repo, branch, upstream, onto); - - git_buf_free(&state_path); + if ((error = rebase_setupfiles(rebase)) < 0 || + (error = git_buf_printf(&reflog, + "rebase: checkout %s", rebase_onto_name(onto))) < 0 || + (error = git_commit_lookup( + &onto_commit, repo, git_annotated_commit_id(onto))) < 0 || + (error = git_checkout_tree(repo, + (git_object *)onto_commit, &rebase->options.checkout_options)) < 0 || + (error = git_reference_create(&head_ref, repo, GIT_HEAD_FILE, + git_annotated_commit_id(onto), 1, reflog.ptr)) < 0) + goto done; done: git_reference_free(head_ref); - git_annotated_commit_free(head_branch); + git_commit_free(onto_commit); + git_buf_free(&reflog); + git_buf_free(&state_path); return error; } +static int rebase_init_inmemory( + git_rebase *rebase, + git_repository *repo, + const git_annotated_commit *branch, + const git_annotated_commit *upstream, + const git_annotated_commit *onto) +{ + GIT_UNUSED(branch); + GIT_UNUSED(upstream); + + return git_commit_lookup( + &rebase->last_commit, repo, git_annotated_commit_id(onto)); +} + int git_rebase_init( git_rebase **out, git_repository *repo, @@ -665,9 +680,9 @@ int git_rebase_init( const git_rebase_options *given_opts) { git_rebase *rebase = NULL; - git_buf reflog = GIT_BUF_INIT; - git_commit *onto_commit = NULL; + git_annotated_commit *head_branch = NULL; git_reference *head_ref = NULL; + bool inmemory = (given_opts && given_opts->inmemory); int error; assert(repo && (upstream || onto)); @@ -677,39 +692,51 @@ int git_rebase_init( if (!onto) onto = upstream; - if ((error = rebase_check_versions(given_opts)) < 0 || - (error = git_repository__ensure_not_bare(repo, "rebase")) < 0 || - (error = rebase_ensure_not_in_progress(repo)) < 0 || - (error = rebase_ensure_not_dirty(repo, true, true, GIT_ERROR)) < 0 || - (error = git_commit_lookup( - &onto_commit, repo, git_annotated_commit_id(onto))) < 0) - return error; + if ((error = rebase_check_versions(given_opts)) < 0) + goto done; - rebase = rebase_alloc(given_opts); + if (!inmemory) { + if ((error = git_repository__ensure_not_bare(repo, "rebase")) < 0 || + (error = rebase_ensure_not_in_progress(repo)) < 0 || + (error = rebase_ensure_not_dirty(repo, true, true, GIT_ERROR)) < 0) + goto done; + } - if ((error = rebase_init( - rebase, repo, branch, upstream, onto)) < 0 || - (error = rebase_setupfiles(rebase)) < 0 || - (error = git_buf_printf(&reflog, - "rebase: checkout %s", rebase_onto_name(onto))) < 0 || - (error = git_checkout_tree( - repo, (git_object *)onto_commit, &rebase->options.checkout_options)) < 0 || - (error = git_reference_create(&head_ref, repo, GIT_HEAD_FILE, - git_annotated_commit_id(onto), 1, reflog.ptr)) < 0) + if (!branch) { + if ((error = git_repository_head(&head_ref, repo)) < 0 || + (error = git_annotated_commit_from_ref(&head_branch, repo, head_ref)) < 0) + goto done; + + branch = head_branch; + } + + if (rebase_alloc(&rebase, given_opts) < 0) + return -1; + + rebase->repo = repo; + rebase->inmemory = inmemory; + rebase->type = GIT_REBASE_TYPE_MERGE; + + if ((error = rebase_init_operations(rebase, repo, branch, upstream, onto)) < 0) goto done; - *out = rebase; + if (inmemory) + error = rebase_init_inmemory(rebase, repo, branch, upstream, onto); + else + rebase_init_merge(rebase, repo, branch ,upstream, onto); + + if (error == 0) + *out = rebase; done: git_reference_free(head_ref); + git_annotated_commit_free(head_branch); + if (error < 0) { rebase_cleanup(rebase); git_rebase_free(rebase); } - git_commit_free(onto_commit); - git_buf_free(&reflog); - return error; } @@ -764,9 +791,6 @@ static int rebase_next_merge( *out = NULL; - if ((error = rebase_movenext(rebase)) < 0) - goto done; - operation = git_array_get(rebase->operations, rebase->current); if ((error = git_commit_lookup(¤t_commit, rebase->repo, &operation->id)) < 0 || @@ -791,7 +815,7 @@ static int rebase_next_merge( if ((error = git_indexwriter_init_for_operation(&indexwriter, rebase->repo, &checkout_opts.checkout_strategy)) < 0 || (error = rebase_setupfile(rebase, MSGNUM_FILE, -1, "%" PRIuZ "\n", rebase->current+1)) < 0 || (error = rebase_setupfile(rebase, CURRENT_FILE, -1, "%.*s\n", GIT_OID_HEXSZ, current_idstr)) < 0 || - (error = git_merge_trees(&index, rebase->repo, parent_tree, head_tree, current_tree, NULL)) < 0 || + (error = git_merge_trees(&index, rebase->repo, parent_tree, head_tree, current_tree, &rebase->options.merge_options)) < 0 || (error = git_merge__check_result(rebase->repo, index)) < 0 || (error = git_checkout_index(rebase->repo, index, &checkout_opts)) < 0 || (error = git_indexwriter_commit(&indexwriter)) < 0) @@ -812,6 +836,49 @@ static int rebase_next_merge( return error; } +static int rebase_next_inmemory( + git_rebase_operation **out, + git_rebase *rebase) +{ + git_commit *current_commit = NULL, *parent_commit = NULL; + git_tree *current_tree = NULL, *head_tree = NULL, *parent_tree = NULL; + git_rebase_operation *operation; + git_index *index = NULL; + int error; + + *out = NULL; + + operation = git_array_get(rebase->operations, rebase->current); + + if ((error = git_commit_lookup(¤t_commit, rebase->repo, &operation->id)) < 0 || + (error = git_commit_tree(¤t_tree, current_commit)) < 0 || + (error = git_commit_parent(&parent_commit, current_commit, 0)) < 0 || + (error = git_commit_tree(&parent_tree, parent_commit)) < 0 || + (error = git_commit_tree(&head_tree, rebase->last_commit)) < 0 || + (error = git_merge_trees(&index, rebase->repo, parent_tree, head_tree, current_tree, &rebase->options.merge_options)) < 0) + goto done; + + if (!rebase->index) { + rebase->index = index; + index = NULL; + } else { + if ((error = git_index_read_index(rebase->index, index)) < 0) + goto done; + } + + *out = operation; + +done: + git_commit_free(current_commit); + git_commit_free(parent_commit); + git_tree_free(current_tree); + git_tree_free(head_tree); + git_tree_free(parent_tree); + git_index_free(index); + + return error; +} + int git_rebase_next( git_rebase_operation **out, git_rebase *rebase) @@ -820,66 +887,67 @@ int git_rebase_next( assert(out && rebase); - switch (rebase->type) { - case GIT_REBASE_TYPE_MERGE: + if ((error = rebase_movenext(rebase)) < 0) + return error; + + if (rebase->inmemory) + error = rebase_next_inmemory(out, rebase); + else if (rebase->type == GIT_REBASE_TYPE_MERGE) error = rebase_next_merge(out, rebase); - break; - default: + else abort(); - } return error; } -static int rebase_commit_merge( - git_oid *commit_id, +int git_rebase_inmemory_index( + git_index **out, + git_rebase *rebase) +{ + assert(out && rebase && rebase->index); + + GIT_REFCOUNT_INC(rebase->index); + *out = rebase->index; + + return 0; +} + +static int rebase_commit__create( + git_commit **out, git_rebase *rebase, + git_index *index, + git_commit *parent_commit, const git_signature *author, const git_signature *committer, const char *message_encoding, const char *message) { - git_index *index = NULL; - git_reference *head = NULL; - git_commit *current_commit = NULL, *head_commit = NULL, *commit = NULL; git_rebase_operation *operation; - git_tree *head_tree = NULL, *tree = NULL; - git_diff *diff = NULL; - git_oid tree_id; - git_buf reflog_msg = GIT_BUF_INIT; - char old_idstr[GIT_OID_HEXSZ], new_idstr[GIT_OID_HEXSZ]; + git_commit *current_commit = NULL, *commit = NULL; + git_tree *parent_tree = NULL, *tree = NULL; + git_oid tree_id, commit_id; int error; operation = git_array_get(rebase->operations, rebase->current); - assert(operation); - - if ((error = git_repository_index(&index, rebase->repo)) < 0) - goto done; if (git_index_has_conflicts(index)) { - giterr_set(GITERR_REBASE, "Conflicts have not been resolved"); + giterr_set(GITERR_REBASE, "conflicts have not been resolved"); error = GIT_EUNMERGED; goto done; } - if ((error = rebase_ensure_not_dirty(rebase->repo, false, true, GIT_EUNMERGED)) < 0 || - (error = git_commit_lookup(¤t_commit, rebase->repo, &operation->id)) < 0 || - (error = git_repository_head(&head, rebase->repo)) < 0 || - (error = git_reference_peel((git_object **)&head_commit, head, GIT_OBJ_COMMIT)) < 0 || - (error = git_commit_tree(&head_tree, head_commit)) < 0 || - (error = git_diff_tree_to_index(&diff, rebase->repo, head_tree, index, NULL)) < 0) + if ((error = git_commit_lookup(¤t_commit, rebase->repo, &operation->id)) < 0 || + (error = git_commit_tree(&parent_tree, parent_commit)) < 0 || + (error = git_index_write_tree_to(&tree_id, index, rebase->repo)) < 0 || + (error = git_tree_lookup(&tree, rebase->repo, &tree_id)) < 0) goto done; - if (git_diff_num_deltas(diff) == 0) { - giterr_set(GITERR_REBASE, "This patch has already been applied"); + if (git_oid_equal(&tree_id, git_tree_id(parent_tree))) { + giterr_set(GITERR_REBASE, "this patch has already been applied"); error = GIT_EAPPLIED; goto done; } - if ((error = git_index_write_tree(&tree_id, index)) < 0 || - (error = git_tree_lookup(&tree, rebase->repo, &tree_id)) < 0) - goto done; - if (!author) author = git_commit_author(current_commit); @@ -888,30 +956,100 @@ static int rebase_commit_merge( message = git_commit_message(current_commit); } - if ((error = git_commit_create(commit_id, rebase->repo, NULL, author, - committer, message_encoding, message, tree, 1, - (const git_commit **)&head_commit)) < 0 || - (error = git_commit_lookup(&commit, rebase->repo, commit_id)) < 0 || + if ((error = git_commit_create(&commit_id, rebase->repo, NULL, author, + committer, message_encoding, message, tree, 1, + (const git_commit **)&parent_commit)) < 0 || + (error = git_commit_lookup(&commit, rebase->repo, &commit_id)) < 0) + goto done; + + *out = commit; + +done: + if (error < 0) + git_commit_free(commit); + + git_commit_free(current_commit); + git_tree_free(parent_tree); + git_tree_free(tree); + + return error; +} + +static int rebase_commit_merge( + git_oid *commit_id, + git_rebase *rebase, + const git_signature *author, + const git_signature *committer, + const char *message_encoding, + const char *message) +{ + git_rebase_operation *operation; + git_reference *head = NULL; + git_commit *head_commit = NULL, *commit = NULL; + git_index *index = NULL; + char old_idstr[GIT_OID_HEXSZ], new_idstr[GIT_OID_HEXSZ]; + int error; + + operation = git_array_get(rebase->operations, rebase->current); + assert(operation); + + if ((error = rebase_ensure_not_dirty(rebase->repo, false, true, GIT_EUNMERGED)) < 0 || + (error = git_repository_head(&head, rebase->repo)) < 0 || + (error = git_reference_peel((git_object **)&head_commit, head, GIT_OBJ_COMMIT)) < 0 || + (error = git_repository_index(&index, rebase->repo)) < 0 || + (error = rebase_commit__create(&commit, rebase, index, head_commit, + author, committer, message_encoding, message)) < 0 || (error = git_reference__update_for_commit( - rebase->repo, NULL, "HEAD", commit_id, "rebase")) < 0) + rebase->repo, NULL, "HEAD", git_commit_id(commit), "rebase")) < 0) goto done; - git_oid_fmt(old_idstr, git_commit_id(current_commit)); - git_oid_fmt(new_idstr, commit_id); + git_oid_fmt(old_idstr, &operation->id); + git_oid_fmt(new_idstr, git_commit_id(commit)); + + if ((error = rebase_setupfile(rebase, REWRITTEN_FILE, O_CREAT|O_WRONLY|O_APPEND, + "%.*s %.*s\n", GIT_OID_HEXSZ, old_idstr, GIT_OID_HEXSZ, new_idstr)) < 0) + goto done; - error = rebase_setupfile(rebase, REWRITTEN_FILE, O_CREAT|O_WRONLY|O_APPEND, - "%.*s %.*s\n", GIT_OID_HEXSZ, old_idstr, GIT_OID_HEXSZ, new_idstr); + git_oid_cpy(commit_id, git_commit_id(commit)); done: - git_buf_free(&reflog_msg); - git_commit_free(commit); - git_diff_free(diff); - git_tree_free(tree); - git_tree_free(head_tree); - git_commit_free(head_commit); - git_commit_free(current_commit); - git_reference_free(head); git_index_free(index); + git_reference_free(head); + git_commit_free(head_commit); + git_commit_free(commit); + return error; +} + +static int rebase_commit_inmemory( + git_oid *commit_id, + git_rebase *rebase, + const git_signature *author, + const git_signature *committer, + const char *message_encoding, + const char *message) +{ + git_rebase_operation *operation; + git_commit *commit = NULL; + int error = 0; + + operation = git_array_get(rebase->operations, rebase->current); + + assert(operation); + assert(rebase->index); + assert(rebase->last_commit); + + if ((error = rebase_commit__create(&commit, rebase, rebase->index, + rebase->last_commit, author, committer, message_encoding, message)) < 0) + goto done; + + git_commit_free(rebase->last_commit); + rebase->last_commit = commit; + + git_oid_cpy(commit_id, git_commit_id(commit)); + +done: + if (error < 0) + git_commit_free(commit); return error; } @@ -928,14 +1066,14 @@ int git_rebase_commit( assert(rebase && committer); - switch (rebase->type) { - case GIT_REBASE_TYPE_MERGE: + if (rebase->inmemory) + error = rebase_commit_inmemory( + id, rebase, author, committer, message_encoding, message); + else if (rebase->type == GIT_REBASE_TYPE_MERGE) error = rebase_commit_merge( id, rebase, author, committer, message_encoding, message); - break; - default: + else abort(); - } return error; } @@ -948,6 +1086,9 @@ int git_rebase_abort(git_rebase *rebase) assert(rebase); + if (rebase->inmemory) + return 0; + error = rebase->head_detached ? git_reference_create(&orig_head_ref, rebase->repo, GIT_HEAD_FILE, &rebase->orig_head_id, 1, "rebase: aborting") : @@ -1125,6 +1266,9 @@ int git_rebase_finish( assert(rebase); + if (rebase->inmemory) + return 0; + git_oid_fmt(onto, &rebase->onto_id); if ((error = git_buf_printf(&branch_msg, "rebase finished: %s onto %.*s", @@ -1182,6 +1326,8 @@ void git_rebase_free(git_rebase *rebase) if (rebase == NULL) return; + git_index_free(rebase->index); + git_commit_free(rebase->last_commit); git__free(rebase->onto_name); git__free(rebase->orig_head_name); git__free(rebase->state_path); diff --git a/vendor/libgit2/src/refdb.c b/vendor/libgit2/src/refdb.c index 16fb519a6..debba1276 100644 --- a/vendor/libgit2/src/refdb.c +++ b/vendor/libgit2/src/refdb.c @@ -61,12 +61,8 @@ int git_refdb_open(git_refdb **out, git_repository *repo) static void refdb_free_backend(git_refdb *db) { - if (db->backend) { - if (db->backend->free) - db->backend->free(db->backend); - else - git__free(db->backend); - } + if (db->backend) + db->backend->free(db->backend); } int git_refdb_set_backend(git_refdb *db, git_refdb_backend *backend) diff --git a/vendor/libgit2/src/refdb_fs.c b/vendor/libgit2/src/refdb_fs.c index 792e4bb0a..f978038e6 100644 --- a/vendor/libgit2/src/refdb_fs.c +++ b/vendor/libgit2/src/refdb_fs.c @@ -63,6 +63,8 @@ typedef struct refdb_fs_backend { uint32_t direach_flags; } refdb_fs_backend; +static int refdb_reflog_fs__delete(git_refdb_backend *_backend, const char *name); + static int packref_cmp(const void *a_, const void *b_) { const struct packref *a = a_, *b = b_; @@ -478,14 +480,16 @@ static int iter_load_loose_paths(refdb_fs_backend *backend, refdb_fs_iter *iter) int error = 0; git_buf path = GIT_BUF_INIT; git_iterator *fsit = NULL; + git_iterator_options fsit_opts = GIT_ITERATOR_OPTIONS_INIT; const git_index_entry *entry = NULL; if (!backend->path) /* do nothing if no path for loose refs */ return 0; + fsit_opts.flags = backend->iterator_flags; + if ((error = git_buf_printf(&path, "%s/refs", backend->path)) < 0 || - (error = git_iterator_for_filesystem( - &fsit, path.ptr, backend->iterator_flags, NULL, NULL)) < 0) { + (error = git_iterator_for_filesystem(&fsit, path.ptr, &fsit_opts)) < 0) { git_buf_free(&path); return error; } @@ -622,8 +626,9 @@ static int refdb_fs_backend__iterator( iter = git__calloc(1, sizeof(refdb_fs_iter)); GITERR_CHECK_ALLOC(iter); - if (git_pool_init(&iter->pool, 1, 0) < 0 || - git_vector_init(&iter->loose, 8, NULL) < 0) + git_pool_init(&iter->pool, 1); + + if (git_vector_init(&iter->loose, 8, NULL) < 0) goto fail; if (glob != NULL && @@ -712,7 +717,7 @@ static int loose_lock(git_filebuf *file, refdb_fs_backend *backend, const char * assert(file && backend && name); - if (!git_path_isvalid(backend->repo, name, GIT_PATH_REJECT_DEFAULTS)) { + if (!git_path_isvalid(backend->repo, name, GIT_PATH_REJECT_FILESYSTEM_DEFAULTS)) { giterr_set(GITERR_INVALID, "Invalid reference name '%s'.", name); return GIT_EINVALIDSPEC; } @@ -728,8 +733,11 @@ static int loose_lock(git_filebuf *file, refdb_fs_backend *backend, const char * error = git_filebuf_open(file, ref_path.ptr, GIT_FILEBUF_FORCE, GIT_REFS_FILE_MODE); + if (error == GIT_EDIRECTORY) + giterr_set(GITERR_REFERENCE, "cannot lock ref '%s', there are refs beneath that folder", name); + git_buf_free(&ref_path); - return error; + return error; } static int loose_commit(git_filebuf *file, const git_reference *ref) @@ -954,6 +962,7 @@ static int packed_write(refdb_fs_backend *backend) for (i = 0; i < git_sortedcache_entrycount(refcache); ++i) { struct packref *ref = git_sortedcache_entry(refcache, i); + assert(ref); if (packed_find_peel(backend, ref) < 0) goto fail; @@ -1217,6 +1226,11 @@ static int refdb_fs_backend__delete( if ((error = loose_lock(&file, backend, ref_name)) < 0) return error; + if ((error = refdb_reflog_fs__delete(_backend, ref_name)) < 0) { + git_filebuf_cleanup(&file); + return error; + } + return refdb_fs_backend__delete_tail(_backend, &file, ref_name, old_id, old_target); } @@ -1404,7 +1418,8 @@ static int setup_namespace(git_buf *path, git_repository *repo) git__free(parts); /* Make sure that the folder with the namespace exists */ - if (git_futils_mkdir_r(git_buf_cstr(path), repo->path_repository, 0777) < 0) + if (git_futils_mkdir_relative(git_buf_cstr(path), repo->path_repository, + 0777, GIT_MKDIR_PATH, NULL) < 0) return -1; /* Return root of the namespaced path, i.e. without the trailing '/refs' */ @@ -1498,8 +1513,7 @@ static int reflog_parse(git_reflog *log, const char *buf, size_t buf_size) #undef seek_forward fail: - if (entry) - git_reflog_entry__free(entry); + git_reflog_entry__free(entry); return -1; } @@ -1658,7 +1672,7 @@ static int lock_reflog(git_filebuf *file, refdb_fs_backend *backend, const char repo = backend->repo; - if (!git_path_isvalid(backend->repo, refname, GIT_PATH_REJECT_DEFAULTS)) { + if (!git_path_isvalid(backend->repo, refname, GIT_PATH_REJECT_FILESYSTEM_DEFAULTS)) { giterr_set(GITERR_INVALID, "Invalid reference name '%s'.", refname); return GIT_EINVALIDSPEC; } @@ -1774,10 +1788,17 @@ static int reflog_append(refdb_fs_backend *backend, const git_reference *ref, co /* If the new branch matches part of the namespace of a previously deleted branch, * there maybe an obsolete/unused directory (or directory hierarchy) in the way. */ - if (git_path_isdir(git_buf_cstr(&path)) && - (git_futils_rmdir_r(git_buf_cstr(&path), NULL, GIT_RMDIR_SKIP_NONEMPTY) < 0)) { - error = -1; - goto cleanup; + if (git_path_isdir(git_buf_cstr(&path))) { + if ((git_futils_rmdir_r(git_buf_cstr(&path), NULL, GIT_RMDIR_SKIP_NONEMPTY) < 0)) + error = -1; + else if (git_path_isdir(git_buf_cstr(&path))) { + giterr_set(GITERR_REFERENCE, "cannot create reflog at '%s', there are reflogs beneath that folder", + ref->name); + error = GIT_EDIRECTORY; + } + + if (error != 0) + goto cleanup; } error = git_futils_writebuffer(&buf, git_buf_cstr(&path), O_WRONLY|O_CREAT|O_APPEND, GIT_REFLOG_FILE_MODE); diff --git a/vendor/libgit2/src/refs.c b/vendor/libgit2/src/refs.c index 7b538659d..26c80021f 100644 --- a/vendor/libgit2/src/refs.c +++ b/vendor/libgit2/src/refs.c @@ -289,6 +289,9 @@ int git_reference_dwim(git_reference **out, git_repository *repo, const char *re "Could not use '%s' as valid reference name", git_buf_cstr(&name)); } + if (error == GIT_ENOTFOUND) + giterr_set(GITERR_REFERENCE, "no reference found for shorthand '%s'", refname); + git_buf_free(&name); git_buf_free(&refnamebuf); return error; @@ -377,15 +380,9 @@ static int reference__create( return error; if (oid != NULL) { - git_odb *odb; - assert(symbolic == NULL); - /* Sanity check the reference being created - target must exist. */ - if ((error = git_repository_odb__weakptr(&odb, repo)) < 0) - return error; - - if (!git_odb_exists(odb, oid)) { + if (!git_object__is_valid(repo, oid, GIT_OBJ_ANY)) { giterr_set(GITERR_REFERENCE, "Target OID for the reference doesn't exist on the repository"); return -1; diff --git a/vendor/libgit2/src/refs.h b/vendor/libgit2/src/refs.h index f78ea06b0..fda9532de 100644 --- a/vendor/libgit2/src/refs.h +++ b/vendor/libgit2/src/refs.h @@ -44,6 +44,11 @@ #define GIT_REBASE_APPLY_APPLYING_FILE GIT_REBASE_APPLY_DIR "applying" #define GIT_REFS_HEADS_MASTER_FILE GIT_REFS_HEADS_DIR "master" +#define GIT_SEQUENCER_DIR "sequencer/" +#define GIT_SEQUENCER_HEAD_FILE GIT_SEQUENCER_DIR "head" +#define GIT_SEQUENCER_OPTIONS_FILE GIT_SEQUENCER_DIR "options" +#define GIT_SEQUENCER_TODO_FILE GIT_SEQUENCER_DIR "todo" + #define GIT_STASH_FILE "stash" #define GIT_REFS_STASH_FILE GIT_REFS_DIR GIT_STASH_FILE diff --git a/vendor/libgit2/src/refspec.c b/vendor/libgit2/src/refspec.c index f92a6d2b6..debde8692 100644 --- a/vendor/libgit2/src/refspec.c +++ b/vendor/libgit2/src/refspec.c @@ -323,8 +323,8 @@ int git_refspec__dwim_one(git_vector *out, git_refspec *spec, git_vector *refs) if (git__prefixcmp(spec->src, GIT_REFS_DIR)) { for (j = 0; formatters[j]; j++) { git_buf_clear(&buf); - if (git_buf_printf(&buf, formatters[j], spec->src) < 0) - return -1; + git_buf_printf(&buf, formatters[j], spec->src); + GITERR_CHECK_ALLOC_BUF(&buf); key.name = (char *) git_buf_cstr(&buf); if (!git_vector_search(&pos, refs, &key)) { @@ -348,8 +348,8 @@ int git_refspec__dwim_one(git_vector *out, git_refspec *spec, git_vector *refs) git_buf_puts(&buf, GIT_REFS_HEADS_DIR); } - if (git_buf_puts(&buf, spec->dst) < 0) - return -1; + git_buf_puts(&buf, spec->dst); + GITERR_CHECK_ALLOC_BUF(&buf); cur->dst = git_buf_detach(&buf); } diff --git a/vendor/libgit2/src/remote.c b/vendor/libgit2/src/remote.c index 9f82aaea3..8b7203ee2 100644 --- a/vendor/libgit2/src/remote.c +++ b/vendor/libgit2/src/remote.c @@ -153,7 +153,7 @@ static int get_check_cert(int *out, git_repository *repo) * most specific to least specific. */ /* GIT_SSL_NO_VERIFY environment variable */ - if ((val = getenv("GIT_SSL_NO_VERIFY")) != NULL) + if ((val = p_getenv("GIT_SSL_NO_VERIFY")) != NULL) return git_config_parse_bool(out, val); /* http.sslVerify config setting */ @@ -208,8 +208,8 @@ static int create_internal(git_remote **out, git_repository *repo, const char *n remote->repo = repo; - if (git_vector_init(&remote->refs, 32, NULL) < 0 || - canonicalize_url(&canonical_url, url) < 0) + if ((error = git_vector_init(&remote->refs, 32, NULL)) < 0 || + (error = canonicalize_url(&canonical_url, url)) < 0) goto on_error; remote->url = apply_insteadof(repo->_config, canonical_url.ptr, GIT_DIRECTION_FETCH); @@ -687,7 +687,15 @@ int set_transport_callbacks(git_transport *t, const git_remote_callbacks *cbs) cbs->certificate_check, cbs->payload); } -int git_remote_connect(git_remote *remote, git_direction direction, const git_remote_callbacks *callbacks) +static int set_transport_custom_headers(git_transport *t, const git_strarray *custom_headers) +{ + if (!t->set_custom_headers) + return 0; + + return t->set_custom_headers(t, custom_headers); +} + +int git_remote_connect(git_remote *remote, git_direction direction, const git_remote_callbacks *callbacks, const git_strarray *custom_headers) { git_transport *t; const char *url; @@ -726,6 +734,9 @@ int git_remote_connect(git_remote *remote, git_direction direction, const git_re if (!t && (error = git_transport_new(&t, remote, url)) < 0) return error; + if ((error = set_transport_custom_headers(t, custom_headers)) != 0) + goto on_error; + if ((error = set_transport_callbacks(t, callbacks)) < 0 || (error = t->connect(t, url, credentials, payload, direction, flags)) != 0) goto on_error; @@ -759,7 +770,7 @@ int git_remote__get_http_proxy(git_remote *remote, bool use_ssl, char **proxy_ur { git_config *cfg; git_config_entry *ce = NULL; - const char *val = NULL; + git_buf val = GIT_BUF_INIT; int error; assert(remote); @@ -789,7 +800,7 @@ int git_remote__get_http_proxy(git_remote *remote, bool use_ssl, char **proxy_ur return error; if (ce && ce->value) { - val = ce->value; + *proxy_url = git__strdup(ce->value); goto found; } } @@ -797,19 +808,28 @@ int git_remote__get_http_proxy(git_remote *remote, bool use_ssl, char **proxy_ur /* http.proxy config setting */ if ((error = git_config__lookup_entry(&ce, cfg, "http.proxy", false)) < 0) return error; + if (ce && ce->value) { - val = ce->value; + *proxy_url = git__strdup(ce->value); goto found; } /* HTTP_PROXY / HTTPS_PROXY environment variables */ - val = use_ssl ? getenv("HTTPS_PROXY") : getenv("HTTP_PROXY"); + error = git__getenv(&val, use_ssl ? "HTTPS_PROXY" : "HTTP_PROXY"); -found: - if (val && val[0]) { - *proxy_url = git__strdup(val); - GITERR_CHECK_ALLOC(*proxy_url); + if (error < 0) { + if (error == GIT_ENOTFOUND) { + giterr_clear(); + error = 0; + } + + return error; } + + *proxy_url = git_buf_detach(&val); + +found: + GITERR_CHECK_ALLOC(*proxy_url); git_config_entry_free(ce); return 0; @@ -875,16 +895,18 @@ int git_remote_download(git_remote *remote, const git_strarray *refspecs, const size_t i; git_vector *to_active, specs = GIT_VECTOR_INIT, refs = GIT_VECTOR_INIT; const git_remote_callbacks *cbs = NULL; + const git_strarray *custom_headers = NULL; assert(remote); if (opts) { GITERR_CHECK_VERSION(&opts->callbacks, GIT_REMOTE_CALLBACKS_VERSION, "git_remote_callbacks"); cbs = &opts->callbacks; + custom_headers = &opts->custom_headers; } if (!git_remote_connected(remote) && - (error = git_remote_connect(remote, GIT_DIRECTION_FETCH, cbs)) < 0) + (error = git_remote_connect(remote, GIT_DIRECTION_FETCH, cbs, custom_headers)) < 0) goto on_error; if (ls_to_vector(&refs, remote) < 0) @@ -948,16 +970,18 @@ int git_remote_fetch( bool prune = false; git_buf reflog_msg_buf = GIT_BUF_INIT; const git_remote_callbacks *cbs = NULL; + const git_strarray *custom_headers = NULL; if (opts) { GITERR_CHECK_VERSION(&opts->callbacks, GIT_REMOTE_CALLBACKS_VERSION, "git_remote_callbacks"); cbs = &opts->callbacks; + custom_headers = &opts->custom_headers; update_fetchhead = opts->update_fetchhead; tagopt = opts->download_tags; } /* Connect and download everything */ - if ((error = git_remote_connect(remote, GIT_DIRECTION_FETCH, cbs)) != 0) + if ((error = git_remote_connect(remote, GIT_DIRECTION_FETCH, cbs, custom_headers)) != 0) return error; error = git_remote_download(remote, refspecs, opts); @@ -2368,14 +2392,17 @@ int git_remote_upload(git_remote *remote, const git_strarray *refspecs, const gi git_push *push; git_refspec *spec; const git_remote_callbacks *cbs = NULL; + const git_strarray *custom_headers = NULL; assert(remote); - if (opts) + if (opts) { cbs = &opts->callbacks; + custom_headers = &opts->custom_headers; + } if (!git_remote_connected(remote) && - (error = git_remote_connect(remote, GIT_DIRECTION_PUSH, cbs)) < 0) + (error = git_remote_connect(remote, GIT_DIRECTION_PUSH, cbs, custom_headers)) < 0) goto cleanup; free_refspecs(&remote->active_refspecs); @@ -2424,15 +2451,17 @@ int git_remote_push(git_remote *remote, const git_strarray *refspecs, const git_ { int error; const git_remote_callbacks *cbs = NULL; + const git_strarray *custom_headers = NULL; if (opts) { GITERR_CHECK_VERSION(&opts->callbacks, GIT_REMOTE_CALLBACKS_VERSION, "git_remote_callbacks"); cbs = &opts->callbacks; + custom_headers = &opts->custom_headers; } assert(remote && refspecs); - if ((error = git_remote_connect(remote, GIT_DIRECTION_PUSH, cbs)) < 0) + if ((error = git_remote_connect(remote, GIT_DIRECTION_PUSH, cbs, custom_headers)) < 0) return error; if ((error = git_remote_upload(remote, refspecs, opts)) < 0) diff --git a/vendor/libgit2/src/repository.c b/vendor/libgit2/src/repository.c index 3476ccadc..8a6fef0f6 100644 --- a/vendor/libgit2/src/repository.c +++ b/vendor/libgit2/src/repository.c @@ -585,7 +585,8 @@ static int load_config( git_repository *repo, const char *global_config_path, const char *xdg_config_path, - const char *system_config_path) + const char *system_config_path, + const char *programdata_path) { int error; git_buf config_path = GIT_BUF_INIT; @@ -626,6 +627,12 @@ static int load_config( error != GIT_ENOTFOUND) goto on_error; + if (programdata_path != NULL && + (error = git_config_add_file_ondisk( + cfg, programdata_path, GIT_CONFIG_LEVEL_PROGRAMDATA, 0)) < 0 && + error != GIT_ENOTFOUND) + goto on_error; + giterr_clear(); /* clear any lingering ENOTFOUND errors */ *out = cfg; @@ -651,11 +658,13 @@ int git_repository_config__weakptr(git_config **out, git_repository *repo) git_buf global_buf = GIT_BUF_INIT; git_buf xdg_buf = GIT_BUF_INIT; git_buf system_buf = GIT_BUF_INIT; + git_buf programdata_buf = GIT_BUF_INIT; git_config *config; git_config_find_global(&global_buf); git_config_find_xdg(&xdg_buf); git_config_find_system(&system_buf); + git_config_find_programdata(&programdata_buf); /* If there is no global file, open a backend for it anyway */ if (git_buf_len(&global_buf) == 0) @@ -665,7 +674,8 @@ int git_repository_config__weakptr(git_config **out, git_repository *repo) &config, repo, path_unless_empty(&global_buf), path_unless_empty(&xdg_buf), - path_unless_empty(&system_buf)); + path_unless_empty(&system_buf), + path_unless_empty(&programdata_buf)); if (!error) { GIT_REFCOUNT_OWN(config, repo); @@ -679,6 +689,7 @@ int git_repository_config__weakptr(git_config **out, git_repository *repo) git_buf_free(&global_buf); git_buf_free(&xdg_buf); git_buf_free(&system_buf); + git_buf_free(&programdata_buf); } *out = repo->_config; @@ -1295,7 +1306,7 @@ static int repo_write_template( #ifdef GIT_WIN32 if (!error && hidden) { - if (git_win32__sethidden(path.ptr) < 0) + if (git_win32__set_hidden(path.ptr, true) < 0) error = -1; } #else @@ -1389,7 +1400,7 @@ static int repo_init_structure( /* Hide the ".git" directory */ #ifdef GIT_WIN32 if ((opts->flags & GIT_REPOSITORY_INIT__HAS_DOTGIT) != 0) { - if (git_win32__sethidden(repo_dir) < 0) { + if (git_win32__set_hidden(repo_dir, true) < 0) { giterr_set(GITERR_OS, "Failed to mark Git repository folder as hidden"); return -1; @@ -1427,7 +1438,9 @@ static int repo_init_structure( } if (tdir) { - uint32_t cpflags = GIT_CPDIR_COPY_SYMLINKS | GIT_CPDIR_SIMPLE_TO_MODE; + uint32_t cpflags = GIT_CPDIR_COPY_SYMLINKS | + GIT_CPDIR_SIMPLE_TO_MODE | + GIT_CPDIR_COPY_DOTFILES; if (opts->mode != GIT_REPOSITORY_INIT_SHARED_UMASK) cpflags |= GIT_CPDIR_CHMOD_DIRS; error = git_futils_cp_r(tdir, repo_dir, cpflags, dmode); @@ -1457,8 +1470,8 @@ static int repo_init_structure( if (chmod) mkdir_flags |= GIT_MKDIR_CHMOD; - error = git_futils_mkdir( - tpl->path, repo_dir, dmode, mkdir_flags); + error = git_futils_mkdir_relative( + tpl->path, repo_dir, dmode, mkdir_flags, NULL); } else if (!external_tpl) { const char *content = tpl->content; @@ -1480,7 +1493,7 @@ static int mkdir_parent(git_buf *buf, uint32_t mode, bool skip2) * don't try to set gid or grant world write access */ return git_futils_mkdir( - buf->ptr, NULL, mode & ~(S_ISGID | 0002), + buf->ptr, mode & ~(S_ISGID | 0002), GIT_MKDIR_PATH | GIT_MKDIR_VERIFY_DIR | (skip2 ? GIT_MKDIR_SKIP_LAST2 : GIT_MKDIR_SKIP_LAST)); } @@ -1584,14 +1597,14 @@ static int repo_init_directories( /* create path #4 */ if (wd_path->size > 0 && (error = git_futils_mkdir( - wd_path->ptr, NULL, dirmode & ~S_ISGID, + wd_path->ptr, dirmode & ~S_ISGID, GIT_MKDIR_VERIFY_DIR)) < 0) return error; /* create path #2 (if not the same as #4) */ if (!natural_wd && (error = git_futils_mkdir( - repo_path->ptr, NULL, dirmode & ~S_ISGID, + repo_path->ptr, dirmode & ~S_ISGID, GIT_MKDIR_VERIFY_DIR | GIT_MKDIR_SKIP_LAST)) < 0) return error; } @@ -1601,7 +1614,7 @@ static int repo_init_directories( has_dotgit) { /* create path #1 */ - error = git_futils_mkdir(repo_path->ptr, NULL, dirmode, + error = git_futils_mkdir(repo_path->ptr, dirmode, GIT_MKDIR_VERIFY_DIR | ((dirmode & S_ISGID) ? GIT_MKDIR_CHMOD : 0)); } @@ -2211,11 +2224,17 @@ int git_repository_state(git_repository *repo) state = GIT_REPOSITORY_STATE_APPLY_MAILBOX_OR_REBASE; else if (git_path_contains_file(&repo_path, GIT_MERGE_HEAD_FILE)) state = GIT_REPOSITORY_STATE_MERGE; - else if(git_path_contains_file(&repo_path, GIT_REVERT_HEAD_FILE)) + else if (git_path_contains_file(&repo_path, GIT_REVERT_HEAD_FILE)) { state = GIT_REPOSITORY_STATE_REVERT; - else if(git_path_contains_file(&repo_path, GIT_CHERRYPICK_HEAD_FILE)) + if (git_path_contains_file(&repo_path, GIT_SEQUENCER_TODO_FILE)) { + state = GIT_REPOSITORY_STATE_REVERT_SEQUENCE; + } + } else if (git_path_contains_file(&repo_path, GIT_CHERRYPICK_HEAD_FILE)) { state = GIT_REPOSITORY_STATE_CHERRYPICK; - else if(git_path_contains_file(&repo_path, GIT_BISECT_LOG_FILE)) + if (git_path_contains_file(&repo_path, GIT_SEQUENCER_TODO_FILE)) { + state = GIT_REPOSITORY_STATE_CHERRYPICK_SEQUENCE; + } + } else if (git_path_contains_file(&repo_path, GIT_BISECT_LOG_FILE)) state = GIT_REPOSITORY_STATE_BISECT; git_buf_free(&repo_path); @@ -2260,6 +2279,7 @@ static const char *state_files[] = { GIT_BISECT_LOG_FILE, GIT_REBASE_MERGE_DIR, GIT_REBASE_APPLY_DIR, + GIT_SEQUENCER_DIR, }; int git_repository_state_cleanup(git_repository *repo) diff --git a/vendor/libgit2/src/reset.c b/vendor/libgit2/src/reset.c index 0ffa51b66..f8a1a1dc8 100644 --- a/vendor/libgit2/src/reset.c +++ b/vendor/libgit2/src/reset.c @@ -145,19 +145,19 @@ static int reset( if ((error = git_buf_printf(&log_message, "reset: moving to %s", to)) < 0) return error; - /* move HEAD to the new target */ - if ((error = git_reference__update_terminal(repo, GIT_HEAD_FILE, - git_object_id(commit), NULL, git_buf_cstr(&log_message))) < 0) - goto cleanup; - if (reset_type == GIT_RESET_HARD) { - /* overwrite working directory with HEAD */ + /* overwrite working directory with the new tree */ opts.checkout_strategy = GIT_CHECKOUT_FORCE; if ((error = git_checkout_tree(repo, (git_object *)tree, &opts)) < 0) goto cleanup; } + /* move HEAD to the new target */ + if ((error = git_reference__update_terminal(repo, GIT_HEAD_FILE, + git_object_id(commit), NULL, git_buf_cstr(&log_message))) < 0) + goto cleanup; + if (reset_type > GIT_RESET_SOFT) { /* reset index to the target content */ diff --git a/vendor/libgit2/src/revwalk.c b/vendor/libgit2/src/revwalk.c index dcdd97915..4815a1089 100644 --- a/vendor/libgit2/src/revwalk.c +++ b/vendor/libgit2/src/revwalk.c @@ -223,8 +223,7 @@ static int push_glob(git_revwalk *walk, const char *glob, int hide) git_buf_joinpath(&buf, GIT_REFS_DIR, glob); else git_buf_puts(&buf, glob); - if (git_buf_oom(&buf)) - return -1; + GITERR_CHECK_ALLOC_BUF(&buf); /* If no '?', '*' or '[' exist, we append '/ *' to the glob */ wildcard = strcspn(glob, "?*["); @@ -535,12 +534,10 @@ int git_revwalk_new(git_revwalk **revwalk_out, git_repository *repo) walk->commits = git_oidmap_alloc(); GITERR_CHECK_ALLOC(walk->commits); - if (git_pqueue_init( - &walk->iterator_time, 0, 8, git_commit_list_time_cmp) < 0 || - git_pool_init(&walk->commit_pool, 1, - git_pool__suggest_items_per_page(COMMIT_ALLOC) * COMMIT_ALLOC) < 0) + if (git_pqueue_init(&walk->iterator_time, 0, 8, git_commit_list_time_cmp) < 0) return -1; + git_pool_init(&walk->commit_pool, COMMIT_ALLOC); walk->get_next = &revwalk_next_unsorted; walk->enqueue = &revwalk_enqueue_unsorted; diff --git a/vendor/libgit2/src/settings.c b/vendor/libgit2/src/settings.c index 2097ca314..0da19ea03 100644 --- a/vendor/libgit2/src/settings.c +++ b/vendor/libgit2/src/settings.c @@ -14,6 +14,7 @@ #include "sysdir.h" #include "cache.h" #include "global.h" +#include "object.h" void git_libgit2_version(int *major, int *minor, int *rev) { @@ -33,6 +34,9 @@ int git_libgit2_features() #endif #if defined(GIT_SSH) | GIT_FEATURE_SSH +#endif +#if defined(GIT_USE_NSEC) + | GIT_FEATURE_NSEC #endif ; } @@ -46,9 +50,18 @@ static int config_level_to_sysdir(int config_level) int val = -1; switch (config_level) { - case GIT_CONFIG_LEVEL_SYSTEM: val = GIT_SYSDIR_SYSTEM; break; - case GIT_CONFIG_LEVEL_XDG: val = GIT_SYSDIR_XDG; break; - case GIT_CONFIG_LEVEL_GLOBAL: val = GIT_SYSDIR_GLOBAL; break; + case GIT_CONFIG_LEVEL_SYSTEM: + val = GIT_SYSDIR_SYSTEM; + break; + case GIT_CONFIG_LEVEL_XDG: + val = GIT_SYSDIR_XDG; + break; + case GIT_CONFIG_LEVEL_GLOBAL: + val = GIT_SYSDIR_GLOBAL; + break; + case GIT_CONFIG_LEVEL_PROGRAMDATA: + val = GIT_SYSDIR_PROGRAMDATA; + break; default: giterr_set( GITERR_INVALID, "Invalid config path selector %d", config_level); @@ -57,6 +70,19 @@ static int config_level_to_sysdir(int config_level) return val; } +extern char *git__user_agent; +extern char *git__ssl_ciphers; + +const char *git_libgit2__user_agent() +{ + return git__user_agent; +} + +const char *git_libgit2__ssl_ciphers() +{ + return git__ssl_ciphers; +} + int git_libgit2_opts(int key, ...) { int error = 0; @@ -149,10 +175,43 @@ int git_libgit2_opts(int key, ...) } } #else - giterr_set(GITERR_NET, "Cannot set certificate locations: OpenSSL is not enabled"); + giterr_set(GITERR_NET, "cannot set certificate locations: OpenSSL is not enabled"); + error = -1; +#endif + break; + case GIT_OPT_SET_USER_AGENT: + git__free(git__user_agent); + git__user_agent = git__strdup(va_arg(ap, const char *)); + if (!git__user_agent) { + giterr_set_oom(); + error = -1; + } + + break; + + case GIT_OPT_ENABLE_STRICT_OBJECT_CREATION: + git_object__strict_input_validation = (va_arg(ap, int) != 0); + break; + + case GIT_OPT_SET_SSL_CIPHERS: +#ifdef GIT_OPENSSL + { + git__free(git__ssl_ciphers); + git__ssl_ciphers = git__strdup(va_arg(ap, const char *)); + if (!git__ssl_ciphers) { + giterr_set_oom(); + error = -1; + } + } +#else + giterr_set(GITERR_NET, "cannot set custom ciphers: OpenSSL is not enabled"); error = -1; #endif break; + + default: + giterr_set(GITERR_INVALID, "invalid option key"); + error = -1; } va_end(ap); diff --git a/vendor/libgit2/src/signature.c b/vendor/libgit2/src/signature.c index 109476efe..d07c93323 100644 --- a/vendor/libgit2/src/signature.c +++ b/vendor/libgit2/src/signature.c @@ -79,10 +79,9 @@ int git_signature_new(git_signature **sig_out, const char *name, const char *ema GITERR_CHECK_ALLOC(p); p->name = extract_trimmed(name, strlen(name)); + GITERR_CHECK_ALLOC(p->name); p->email = extract_trimmed(email, strlen(email)); - - if (p->name == NULL || p->email == NULL) - return -1; /* oom */ + GITERR_CHECK_ALLOC(p->email); if (p->name[0] == '\0' || p->email[0] == '\0') { git_signature_free(p); diff --git a/vendor/libgit2/src/sortedcache.c b/vendor/libgit2/src/sortedcache.c index 115175724..5c2a167a7 100644 --- a/vendor/libgit2/src/sortedcache.c +++ b/vendor/libgit2/src/sortedcache.c @@ -20,8 +20,9 @@ int git_sortedcache_new( sc = git__calloc(1, alloclen); GITERR_CHECK_ALLOC(sc); - if (git_pool_init(&sc->pool, 1, 0) < 0 || - git_vector_init(&sc->items, 4, item_cmp) < 0 || + git_pool_init(&sc->pool, 1); + + if (git_vector_init(&sc->items, 4, item_cmp) < 0 || git_strmap_alloc(&sc->map) < 0) goto fail; diff --git a/vendor/libgit2/src/stash.c b/vendor/libgit2/src/stash.c index fcb1112ac..43a464e64 100644 --- a/vendor/libgit2/src/stash.c +++ b/vendor/libgit2/src/stash.c @@ -679,12 +679,14 @@ static int merge_indexes( git_index *theirs_index) { git_iterator *ancestor = NULL, *ours = NULL, *theirs = NULL; - const git_iterator_flag_t flags = GIT_ITERATOR_DONT_IGNORE_CASE; + git_iterator_options iter_opts = GIT_ITERATOR_OPTIONS_INIT; int error; - if ((error = git_iterator_for_tree(&ancestor, ancestor_tree, flags, NULL, NULL)) < 0 || - (error = git_iterator_for_index(&ours, ours_index, flags, NULL, NULL)) < 0 || - (error = git_iterator_for_index(&theirs, theirs_index, flags, NULL, NULL)) < 0) + iter_opts.flags = GIT_ITERATOR_DONT_IGNORE_CASE; + + if ((error = git_iterator_for_tree(&ancestor, ancestor_tree, &iter_opts)) < 0 || + (error = git_iterator_for_index(&ours, repo, ours_index, &iter_opts)) < 0 || + (error = git_iterator_for_index(&theirs, repo, theirs_index, &iter_opts)) < 0) goto done; error = git_merge__iterators(out, repo, ancestor, ours, theirs, NULL); @@ -704,12 +706,14 @@ static int merge_index_and_tree( git_tree *theirs_tree) { git_iterator *ancestor = NULL, *ours = NULL, *theirs = NULL; - const git_iterator_flag_t flags = GIT_ITERATOR_DONT_IGNORE_CASE; + git_iterator_options iter_opts = GIT_ITERATOR_OPTIONS_INIT; int error; - if ((error = git_iterator_for_tree(&ancestor, ancestor_tree, flags, NULL, NULL)) < 0 || - (error = git_iterator_for_index(&ours, ours_index, flags, NULL, NULL)) < 0 || - (error = git_iterator_for_tree(&theirs, theirs_tree, flags, NULL, NULL)) < 0) + iter_opts.flags = GIT_ITERATOR_DONT_IGNORE_CASE; + + if ((error = git_iterator_for_tree(&ancestor, ancestor_tree, &iter_opts)) < 0 || + (error = git_iterator_for_index(&ours, repo, ours_index, &iter_opts)) < 0 || + (error = git_iterator_for_tree(&theirs, theirs_tree, &iter_opts)) < 0) goto done; error = git_merge__iterators(out, repo, ancestor, ours, theirs, NULL); @@ -724,7 +728,7 @@ static int merge_index_and_tree( static void normalize_apply_options( git_stash_apply_options *opts, const git_stash_apply_options *given_apply_opts) -{ +{ if (given_apply_opts != NULL) { memcpy(opts, given_apply_opts, sizeof(git_stash_apply_options)); } else { @@ -797,14 +801,15 @@ static int stage_new_files( git_tree *tree) { git_iterator *iterators[2] = { NULL, NULL }; + git_iterator_options iterator_options = GIT_ITERATOR_OPTIONS_INIT; git_index *index = NULL; int error; if ((error = git_index_new(&index)) < 0 || - (error = git_iterator_for_tree(&iterators[0], parent_tree, - GIT_ITERATOR_DONT_IGNORE_CASE, NULL, NULL)) < 0 || - (error = git_iterator_for_tree(&iterators[1], tree, - GIT_ITERATOR_DONT_IGNORE_CASE, NULL, NULL)) < 0) + (error = git_iterator_for_tree( + &iterators[0], parent_tree, &iterator_options)) < 0 || + (error = git_iterator_for_tree( + &iterators[1], tree, &iterator_options)) < 0) goto done; error = git_iterator_walk(iterators, 2, stage_new_file, index); diff --git a/vendor/libgit2/src/stransport_stream.c b/vendor/libgit2/src/stransport_stream.c index 10e19166c..33b6c5c38 100644 --- a/vendor/libgit2/src/stransport_stream.c +++ b/vendor/libgit2/src/stransport_stream.c @@ -108,7 +108,7 @@ int stransport_certificate(git_cert **out, git_stream *stream) return -1; } - st->cert_info.cert_type = GIT_CERT_X509; + st->cert_info.parent.cert_type = GIT_CERT_X509; st->cert_info.data = (void *) CFDataGetBytePtr(st->der_data); st->cert_info.len = CFDataGetLength(st->der_data); diff --git a/vendor/libgit2/src/stream.h b/vendor/libgit2/src/stream.h index 43fcc3045..4692c7115 100644 --- a/vendor/libgit2/src/stream.h +++ b/vendor/libgit2/src/stream.h @@ -62,6 +62,9 @@ GIT_INLINE(int) git_stream_close(git_stream *st) GIT_INLINE(void) git_stream_free(git_stream *st) { + if (!st) + return; + st->free(st); } diff --git a/vendor/libgit2/src/submodule.c b/vendor/libgit2/src/submodule.c index 3d028747f..c903cf939 100644 --- a/vendor/libgit2/src/submodule.c +++ b/vendor/libgit2/src/submodule.c @@ -80,7 +80,8 @@ static kh_inline int str_equal_no_trailing_slash(const char *a, const char *b) if (blen > 0 && b[blen - 1] == '/') blen--; - return (alen == blen && strncmp(a, b, alen) == 0); + return (alen == 0 && blen == 0) || + (alen == blen && strncmp(a, b, alen) == 0); } __KHASH_IMPL( @@ -89,9 +90,11 @@ __KHASH_IMPL( static int submodule_alloc(git_submodule **out, git_repository *repo, const char *name); static git_config_backend *open_gitmodules(git_repository *repo, int gitmod); +static git_config *gitmodules_snapshot(git_repository *repo); static int get_url_base(git_buf *url, git_repository *repo); static int lookup_head_remote_key(git_buf *remote_key, git_repository *repo); -static int submodule_load_from_config(const git_config_entry *, void *); +static int submodule_load_each(const git_config_entry *entry, void *payload); +static int submodule_read_config(git_submodule *sm, git_config *cfg); static int submodule_load_from_wd_lite(git_submodule *); static void submodule_get_index_status(unsigned int *, git_submodule *); static void submodule_get_wd_status(unsigned int *, git_submodule *, git_repository *, git_submodule_ignore_t); @@ -144,6 +147,43 @@ static int find_by_path(const git_config_entry *entry, void *payload) return 0; } +/** + * Find out the name of a submodule from its path + */ +static int name_from_path(git_buf *out, git_config *cfg, const char *path) +{ + const char *key = "submodule\\..*\\.path"; + git_config_iterator *iter; + git_config_entry *entry; + int error; + + if ((error = git_config_iterator_glob_new(&iter, cfg, key)) < 0) + return error; + + while ((error = git_config_next(&entry, iter)) == 0) { + const char *fdot, *ldot; + /* TODO: this should maybe be strcasecmp on a case-insensitive fs */ + if (strcmp(path, entry->value) != 0) + continue; + + fdot = strchr(entry->name, '.'); + ldot = strrchr(entry->name, '.'); + + git_buf_clear(out); + git_buf_put(out, fdot + 1, ldot - fdot - 1); + goto cleanup; + } + + if (error == GIT_ITEROVER) { + giterr_set(GITERR_SUBMODULE, "could not find a submodule name for '%s'", path); + error = GIT_ENOTFOUND; + } + +cleanup: + git_config_iterator_free(iter); + return error; +} + int git_submodule_lookup( git_submodule **out, /* NULL if user only wants to test existence */ git_repository *repo, @@ -190,6 +230,7 @@ int git_submodule_lookup( if (error < 0) { git_submodule_free(sm); + git_buf_free(&path); return error; } @@ -280,19 +321,25 @@ static int submodule_get_or_create(git_submodule **out, git_repository *repo, gi return 0; } -static int submodules_from_index(git_strmap *map, git_index *idx) +static int submodules_from_index(git_strmap *map, git_index *idx, git_config *cfg) { int error; git_iterator *i; const git_index_entry *entry; + git_buf name = GIT_BUF_INIT; - if ((error = git_iterator_for_index(&i, idx, 0, NULL, NULL)) < 0) + if ((error = git_iterator_for_index(&i, git_index_owner(idx), idx, NULL)) < 0) return error; while (!(error = git_iterator_advance(&entry, i))) { khiter_t pos = git_strmap_lookup_index(map, entry->path); git_submodule *sm; + git_buf_clear(&name); + if (!name_from_path(&name, cfg, entry->path)) { + git_strmap_lookup_index(map, name.ptr); + } + if (git_strmap_valid_index(map, pos)) { sm = git_strmap_value_at(map, pos); @@ -301,7 +348,7 @@ static int submodules_from_index(git_strmap *map, git_index *idx) else sm->flags |= GIT_SUBMODULE_STATUS__INDEX_NOT_SUBMODULE; } else if (S_ISGITLINK(entry->mode)) { - if (!submodule_get_or_create(&sm, git_index_owner(idx), map, entry->path)) { + if (!submodule_get_or_create(&sm, git_index_owner(idx), map, name.ptr ? name.ptr : entry->path)) { submodule_update_from_index_entry(sm, entry); git_submodule_free(sm); } @@ -311,24 +358,31 @@ static int submodules_from_index(git_strmap *map, git_index *idx) if (error == GIT_ITEROVER) error = 0; + git_buf_free(&name); git_iterator_free(i); return error; } -static int submodules_from_head(git_strmap *map, git_tree *head) +static int submodules_from_head(git_strmap *map, git_tree *head, git_config *cfg) { int error; git_iterator *i; const git_index_entry *entry; + git_buf name = GIT_BUF_INIT; - if ((error = git_iterator_for_tree(&i, head, 0, NULL, NULL)) < 0) + if ((error = git_iterator_for_tree(&i, head, NULL)) < 0) return error; while (!(error = git_iterator_advance(&entry, i))) { khiter_t pos = git_strmap_lookup_index(map, entry->path); git_submodule *sm; + git_buf_clear(&name); + if (!name_from_path(&name, cfg, entry->path)) { + git_strmap_lookup_index(map, name.ptr); + } + if (git_strmap_valid_index(map, pos)) { sm = git_strmap_value_at(map, pos); @@ -337,7 +391,7 @@ static int submodules_from_head(git_strmap *map, git_tree *head) else sm->flags |= GIT_SUBMODULE_STATUS__HEAD_NOT_SUBMODULE; } else if (S_ISGITLINK(entry->mode)) { - if (!submodule_get_or_create(&sm, git_tree_owner(head), map, entry->path)) { + if (!submodule_get_or_create(&sm, git_tree_owner(head), map, name.ptr ? name.ptr : entry->path)) { submodule_update_from_head_data( sm, entry->mode, &entry->id); git_submodule_free(sm); @@ -348,6 +402,7 @@ static int submodules_from_head(git_strmap *map, git_tree *head) if (error == GIT_ITEROVER) error = 0; + git_buf_free(&name); git_iterator_free(i); return error; @@ -355,8 +410,7 @@ static int submodules_from_head(git_strmap *map, git_tree *head) /* If have_sm is true, sm is populated, otherwise map an repo are. */ typedef struct { - int have_sm; - git_submodule *sm; + git_config *mods; git_strmap *map; git_repository *repo; } lfc_data; @@ -369,7 +423,7 @@ static int all_submodules(git_repository *repo, git_strmap *map) const char *wd = NULL; git_buf path = GIT_BUF_INIT; git_submodule *sm; - git_config_backend *mods = NULL; + git_config *mods = NULL; uint32_t mask; assert(repo && map); @@ -400,24 +454,28 @@ static int all_submodules(git_repository *repo, git_strmap *map) GIT_SUBMODULE_STATUS__WD_FLAGS | GIT_SUBMODULE_STATUS__WD_OID_VALID; + /* add submodule information from .gitmodules */ + if (wd) { + lfc_data data = { 0 }; + data.map = map; + data.repo = repo; + + if ((mods = gitmodules_snapshot(repo)) == NULL) + goto cleanup; + + data.mods = mods; + if ((error = git_config_foreach( + mods, submodule_load_each, &data)) < 0) + goto cleanup; + } /* add back submodule information from index */ if (idx) { - if ((error = submodules_from_index(map, idx)) < 0) + if ((error = submodules_from_index(map, idx, mods)) < 0) goto cleanup; } /* add submodule information from HEAD */ if (head) { - if ((error = submodules_from_head(map, head)) < 0) - goto cleanup; - } - /* add submodule information from .gitmodules */ - if (wd) { - lfc_data data = { 0 }; - data.map = map; - data.repo = repo; - if ((mods = open_gitmodules(repo, false)) != NULL && - (error = git_config_file_foreach( - mods, submodule_load_from_config, &data)) < 0) + if ((error = submodules_from_head(map, head, mods)) < 0) goto cleanup; } /* shallow scan submodules in work tree as needed */ @@ -428,7 +486,7 @@ static int all_submodules(git_repository *repo, git_strmap *map) } cleanup: - git_config_file_free(mods); + git_config_free(mods); /* TODO: if we got an error, mark submodule config as invalid? */ git_index_free(idx); git_tree_free(head); @@ -438,7 +496,7 @@ static int all_submodules(git_repository *repo, git_strmap *map) int git_submodule_foreach( git_repository *repo, - int (*callback)(git_submodule *sm, const char *name, void *payload), + git_submodule_cb callback, void *payload) { git_vector snapshot = GIT_VECTOR_INIT; @@ -721,9 +779,9 @@ int git_submodule_add_to_index(git_submodule *sm, int write_index) if ((error = git_commit_lookup(&head, sm_repo, &sm->wd_oid)) < 0) goto cleanup; - entry.ctime.seconds = git_commit_time(head); + entry.ctime.seconds = (int32_t)git_commit_time(head); entry.ctime.nanoseconds = 0; - entry.mtime.seconds = git_commit_time(head); + entry.mtime.seconds = (int32_t)git_commit_time(head); entry.mtime.nanoseconds = 0; git_commit_free(head); @@ -787,19 +845,15 @@ int git_submodule_resolve_url(git_buf *out, git_repository *repo, const char *ur git_buf_sanitize(out); + /* We do this in all platforms in case someone on Windows created the .gitmodules */ if (strchr(url, '\\')) { - char *p; - if ((error = git_buf_puts(&normalized, url)) < 0) + if ((error = git_path_normalize_slashes(&normalized, url)) < 0) return error; - for (p = normalized.ptr; *p; p++) { - if (*p == '\\') - *p = '/'; - } - url = normalized.ptr; } + if (git_path_is_relative(url)) { if (!(error = get_url_base(out, repo))) error = git_path_apply_relative(out, url); @@ -984,7 +1038,7 @@ static int submodule_repo_create( /** * Repodir: path to the sub-repo. sub-repo goes in: - * /modules// with a gitlink in the + * /modules// with a gitlink in the * sub-repo workdir directory to that repository. */ error = git_buf_join3( @@ -1101,7 +1155,7 @@ int git_submodule_update(git_submodule *sm, int init, git_submodule_update_optio clone_options.repository_cb_payload = sm; /* - * Do not perform checkout as part of clone, instead we + * Do not perform checkout as part of clone, instead we * will checkout the specific commit manually. */ clone_options.checkout_opts.checkout_strategy = GIT_CHECKOUT_NONE; @@ -1363,67 +1417,46 @@ static int submodule_update_head(git_submodule *submodule) git_tree_entry_bypath(&te, head, submodule->path) < 0) giterr_clear(); else - submodule_update_from_head_data(submodule, te->attr, &te->oid); + submodule_update_from_head_data(submodule, te->attr, git_tree_entry_id(te)); git_tree_entry_free(te); git_tree_free(head); return 0; } - int git_submodule_reload(git_submodule *sm, int force) { int error = 0; - git_config_backend *mods; - lfc_data data = { 0 }; + git_config *mods; GIT_UNUSED(force); assert(sm); - /* refresh index data */ - if ((error = submodule_update_index(sm)) < 0) - return error; - - /* refresh HEAD tree data */ - if ((error = submodule_update_head(sm)) < 0) - return error; - - /* done if bare */ - if (git_repository_is_bare(sm->repo)) - return error; - - /* refresh config data */ - mods = open_gitmodules(sm->repo, GITMODULES_EXISTING); - if (mods != NULL) { - git_buf path = GIT_BUF_INIT; - - git_buf_sets(&path, "submodule\\."); - git_buf_text_puts_escape_regex(&path, sm->name); - git_buf_puts(&path, "\\..*"); + if (!git_repository_is_bare(sm->repo)) { + /* refresh config data */ + mods = gitmodules_snapshot(sm->repo); + if (mods != NULL) { + error = submodule_read_config(sm, mods); + git_config_free(mods); - if (git_buf_oom(&path)) { - error = -1; - } else { - data.have_sm = 1; - data.sm = sm; - error = git_config_file_foreach_match( - mods, path.ptr, submodule_load_from_config, &data); + if (error < 0) + return error; } - git_buf_free(&path); - git_config_file_free(mods); + /* refresh wd data */ + sm->flags &= + ~(GIT_SUBMODULE_STATUS_IN_WD | + GIT_SUBMODULE_STATUS__WD_OID_VALID | + GIT_SUBMODULE_STATUS__WD_FLAGS); - if (error < 0) - return error; + error = submodule_load_from_wd_lite(sm); } - /* refresh wd data */ - sm->flags &= - ~(GIT_SUBMODULE_STATUS_IN_WD | GIT_SUBMODULE_STATUS__WD_OID_VALID | - GIT_SUBMODULE_STATUS__WD_FLAGS); + if (error == 0 && (error = submodule_update_index(sm)) == 0) + error = submodule_update_head(sm); - return submodule_load_from_wd_lite(sm); + return error; } static void submodule_copy_oid_maybe( @@ -1631,134 +1664,149 @@ int git_submodule_parse_recurse(git_submodule_recurse_t *out, const char *value) return 0; } -static int submodule_load_from_config( - const git_config_entry *entry, void *payload) +static int get_value(const char **out, git_config *cfg, git_buf *buf, const char *name, const char *field) { - const char *namestart, *property; - const char *key = entry->name, *value = entry->value, *path; - char *alternate = NULL, *replaced = NULL; - git_buf name = GIT_BUF_INIT; - lfc_data *data = payload; - git_submodule *sm; - int error = 0; - - if (git__prefixcmp(key, "submodule.") != 0) - return 0; - - namestart = key + strlen("submodule."); - property = strrchr(namestart, '.'); - - if (!property || (property == namestart)) - return 0; - - property++; - path = !strcasecmp(property, "path") ? value : NULL; + int error; - if ((error = git_buf_set(&name, namestart, property - namestart -1)) < 0) - goto done; + git_buf_clear(buf); - if (data->have_sm) { - sm = data->sm; - } else { - khiter_t pos; - git_strmap *map = data->map; - pos = git_strmap_lookup_index(map, path ? path : name.ptr); - if (git_strmap_valid_index(map, pos)) { - sm = git_strmap_value_at(map, pos); - } else { - if ((error = submodule_alloc(&sm, data->repo, name.ptr)) < 0) - goto done; + if ((error = git_buf_printf(buf, "submodule.%s.%s", name, field)) < 0 || + (error = git_config_get_string(out, cfg, buf->ptr)) < 0) + return error; - git_strmap_insert(map, sm->name, sm, error); - assert(error != 0); - if (error < 0) - goto done; - error = 0; - } - } + return error; +} - sm->flags |= GIT_SUBMODULE_STATUS_IN_CONFIG; +static int submodule_read_config(git_submodule *sm, git_config *cfg) +{ + git_buf key = GIT_BUF_INIT; + const char *value; + int error, in_config = 0; - /* Only from config might we get differing names & paths. If so, then - * update the submodule and insert under the alternative key. + /* + * TODO: Look up path in index and if it is present but not a GITLINK + * then this should be deleted (at least to match git's behavior) */ - /* TODO: if case insensitive filesystem, then the following strcmps + if ((error = get_value(&value, cfg, &key, sm->name, "path")) == 0) { + in_config = 1; + /* + * TODO: if case insensitive filesystem, then the following strcmp * should be strcasecmp */ - - if (strcmp(sm->name, name.ptr) != 0) { /* name changed */ - if (sm->path && !strcmp(sm->path, name.ptr)) { /* already set as path */ - replaced = sm->name; - sm->name = sm->path; - } else { - if (sm->name != sm->path) - replaced = sm->name; - alternate = sm->name = git_buf_detach(&name); - } - } - else if (path && strcmp(path, sm->path) != 0) { /* path changed */ - if (!strcmp(sm->name, value)) { /* already set as name */ - replaced = sm->path; - sm->path = sm->name; - } else { + if (strcmp(sm->name, value) != 0) { if (sm->path != sm->name) - replaced = sm->path; - if ((alternate = git__strdup(value)) == NULL) { - error = -1; - goto done; - } - sm->path = alternate; + git__free(sm->path); + sm->path = git__strdup(value); + GITERR_CHECK_ALLOC(sm->path); } + } else if (error != GIT_ENOTFOUND) { + goto cleanup; } - /* Deregister under name being replaced */ - if (replaced) { - git__free(replaced); + if ((error = get_value(&value, cfg, &key, sm->name, "url")) == 0) { + in_config = 1; + sm->url = git__strdup(value); + GITERR_CHECK_ALLOC(sm->url); + } else if (error != GIT_ENOTFOUND) { + goto cleanup; } - /* TODO: Look up path in index and if it is present but not a GITLINK - * then this should be deleted (at least to match git's behavior) - */ - - if (path) - goto done; - - /* copy other properties into submodule entry */ - if (strcasecmp(property, "url") == 0) { - git__free(sm->url); - sm->url = NULL; - - if (value != NULL && (sm->url = git__strdup(value)) == NULL) { - error = -1; - goto done; - } + if ((error = get_value(&value, cfg, &key, sm->name, "branch")) == 0) { + in_config = 1; + sm->branch = git__strdup(value); + GITERR_CHECK_ALLOC(sm->branch); + } else if (error != GIT_ENOTFOUND) { + goto cleanup; } - else if (strcasecmp(property, "branch") == 0) { - git__free(sm->branch); - sm->branch = NULL; - if (value != NULL && (sm->branch = git__strdup(value)) == NULL) { - error = -1; - goto done; - } - } - else if (strcasecmp(property, "update") == 0) { + if ((error = get_value(&value, cfg, &key, sm->name, "update")) == 0) { + in_config = 1; if ((error = git_submodule_parse_update(&sm->update, value)) < 0) - goto done; + goto cleanup; sm->update_default = sm->update; + } else if (error != GIT_ENOTFOUND) { + goto cleanup; } - else if (strcasecmp(property, "fetchRecurseSubmodules") == 0) { + + if ((error = get_value(&value, cfg, &key, sm->name, "fetchRecurseSubmodules")) == 0) { + in_config = 1; if ((error = git_submodule_parse_recurse(&sm->fetch_recurse, value)) < 0) - goto done; + goto cleanup; sm->fetch_recurse_default = sm->fetch_recurse; + } else if (error != GIT_ENOTFOUND) { + goto cleanup; } - else if (strcasecmp(property, "ignore") == 0) { + + if ((error = get_value(&value, cfg, &key, sm->name, "ignore")) == 0) { + in_config = 1; if ((error = git_submodule_parse_ignore(&sm->ignore, value)) < 0) - goto done; + goto cleanup; sm->ignore_default = sm->ignore; + } else if (error != GIT_ENOTFOUND) { + goto cleanup; + } + + if (in_config) + sm->flags |= GIT_SUBMODULE_STATUS_IN_CONFIG; + + error = 0; + +cleanup: + git_buf_free(&key); + return error; +} + +static int submodule_load_each(const git_config_entry *entry, void *payload) +{ + lfc_data *data = payload; + const char *namestart, *property; + git_strmap_iter pos; + git_strmap *map = data->map; + git_buf name = GIT_BUF_INIT; + git_submodule *sm; + int error; + + if (git__prefixcmp(entry->name, "submodule.") != 0) + return 0; + + namestart = entry->name + strlen("submodule."); + property = strrchr(namestart, '.'); + + if (!property || (property == namestart)) + return 0; + + property++; + + if ((error = git_buf_set(&name, namestart, property - namestart -1)) < 0) + return error; + + /* + * Now that we have the submodule's name, we can use that to + * figure out whether it's in the map. If it's not, we create + * a new submodule, load the config and insert it. If it's + * already inserted, we've already loaded it, so we skip. + */ + pos = git_strmap_lookup_index(map, name.ptr); + if (git_strmap_valid_index(map, pos)) { + error = 0; + goto done; + } + + if ((error = submodule_alloc(&sm, data->repo, name.ptr)) < 0) + goto done; + + if ((error = submodule_read_config(sm, data->mods)) < 0) { + git_submodule_free(sm); + goto done; } - /* ignore other unknown submodule properties */ + + git_strmap_insert(map, sm->name, sm, error); + assert(error != 0); + if (error < 0) + goto done; + + error = 0; done: git_buf_free(&name); @@ -1782,6 +1830,35 @@ static int submodule_load_from_wd_lite(git_submodule *sm) return 0; } +/** + * Returns a snapshot of $WORK_TREE/.gitmodules. + * + * We ignore any errors and just pretend the file isn't there. + */ +static git_config *gitmodules_snapshot(git_repository *repo) +{ + const char *workdir = git_repository_workdir(repo); + git_config *mods = NULL, *snap = NULL; + git_buf path = GIT_BUF_INIT; + + if (workdir != NULL) { + if (git_buf_joinpath(&path, workdir, GIT_MODULES_FILE) != 0) + return NULL; + + if (git_config_open_ondisk(&mods, path.ptr) < 0) + mods = NULL; + } + + git_buf_free(&path); + + if (mods) { + git_config_snapshot(&snap, mods); + git_config_free(mods); + } + + return snap; +} + static git_config_backend *open_gitmodules( git_repository *repo, int okay_to_create) diff --git a/vendor/libgit2/src/sysdir.c b/vendor/libgit2/src/sysdir.c index cd94a8b57..bf53d830f 100644 --- a/vendor/libgit2/src/sysdir.c +++ b/vendor/libgit2/src/sysdir.c @@ -15,6 +15,16 @@ #include "win32/findfile.h" #endif +static int git_sysdir_guess_programdata_dirs(git_buf *out) +{ +#ifdef GIT_WIN32 + return git_win32__find_programdata_dirs(out); +#else + git_buf_clear(out); + return 0; +#endif +} + static int git_sysdir_guess_system_dirs(git_buf *out) { #ifdef GIT_WIN32 @@ -29,7 +39,14 @@ static int git_sysdir_guess_global_dirs(git_buf *out) #ifdef GIT_WIN32 return git_win32__find_global_dirs(out); #else - return git_buf_sets(out, getenv("HOME")); + int error = git__getenv(out, "HOME"); + + if (error == GIT_ENOTFOUND) { + giterr_clear(); + error = 0; + } + + return error; #endif } @@ -38,15 +55,22 @@ static int git_sysdir_guess_xdg_dirs(git_buf *out) #ifdef GIT_WIN32 return git_win32__find_xdg_dirs(out); #else - const char *env = NULL; + git_buf env = GIT_BUF_INIT; + int error; - if ((env = getenv("XDG_CONFIG_HOME")) != NULL) - return git_buf_joinpath(out, env, "git"); - else if ((env = getenv("HOME")) != NULL) - return git_buf_joinpath(out, env, ".config/git"); + if ((error = git__getenv(&env, "XDG_CONFIG_HOME")) == 0) + error = git_buf_joinpath(out, env.ptr, "git"); - git_buf_clear(out); - return 0; + if (error == GIT_ENOTFOUND && (error = git__getenv(&env, "HOME")) == 0) + error = git_buf_joinpath(out, env.ptr, ".config/git"); + + if (error == GIT_ENOTFOUND) { + giterr_clear(); + error = 0; + } + + git_buf_free(&env); + return error; #endif } @@ -62,12 +86,13 @@ static int git_sysdir_guess_template_dirs(git_buf *out) typedef int (*git_sysdir_guess_cb)(git_buf *out); static git_buf git_sysdir__dirs[GIT_SYSDIR__MAX] = - { GIT_BUF_INIT, GIT_BUF_INIT, GIT_BUF_INIT, GIT_BUF_INIT }; + { GIT_BUF_INIT, GIT_BUF_INIT, GIT_BUF_INIT, GIT_BUF_INIT, GIT_BUF_INIT }; static git_sysdir_guess_cb git_sysdir__dir_guess[GIT_SYSDIR__MAX] = { git_sysdir_guess_system_dirs, git_sysdir_guess_global_dirs, git_sysdir_guess_xdg_dirs, + git_sysdir_guess_programdata_dirs, git_sysdir_guess_template_dirs, }; @@ -244,6 +269,12 @@ int git_sysdir_find_xdg_file(git_buf *path, const char *filename) path, filename, GIT_SYSDIR_XDG, "global/xdg"); } +int git_sysdir_find_programdata_file(git_buf *path, const char *filename) +{ + return git_sysdir_find_in_dirlist( + path, filename, GIT_SYSDIR_PROGRAMDATA, "ProgramData"); +} + int git_sysdir_find_template_dir(git_buf *path) { return git_sysdir_find_in_dirlist( diff --git a/vendor/libgit2/src/sysdir.h b/vendor/libgit2/src/sysdir.h index f1bbf0bae..12874fc85 100644 --- a/vendor/libgit2/src/sysdir.h +++ b/vendor/libgit2/src/sysdir.h @@ -38,6 +38,15 @@ extern int git_sysdir_find_xdg_file(git_buf *path, const char *filename); */ extern int git_sysdir_find_system_file(git_buf *path, const char *filename); +/** + * Find a "ProgramData" file (i.e. one in %PROGRAMDATA%) + * + * @param path buffer to write the full path into + * @param filename name of file to find in the ProgramData directory + * @return 0 if found, GIT_ENOTFOUND if not found, or -1 on other OS error + */ +extern int git_sysdir_find_programdata_file(git_buf *path, const char *filename); + /** * Find template directory. * @@ -50,8 +59,9 @@ typedef enum { GIT_SYSDIR_SYSTEM = 0, GIT_SYSDIR_GLOBAL = 1, GIT_SYSDIR_XDG = 2, - GIT_SYSDIR_TEMPLATE = 3, - GIT_SYSDIR__MAX = 4, + GIT_SYSDIR_PROGRAMDATA = 3, + GIT_SYSDIR_TEMPLATE = 4, + GIT_SYSDIR__MAX = 5, } git_sysdir_t; /** diff --git a/vendor/libgit2/src/tag.c b/vendor/libgit2/src/tag.c index 6e69d760d..c4bce1f22 100644 --- a/vendor/libgit2/src/tag.c +++ b/vendor/libgit2/src/tag.c @@ -358,7 +358,7 @@ int git_tag_create_frombuffer(git_oid *oid, git_repository *repo, const char *bu git_odb_object_free(target_obj); /** Ensure the tag name doesn't conflict with an already existing - * reference unless overwriting has explictly been requested **/ + * reference unless overwriting has explicitly been requested **/ if (error == 0 && !allow_ref_overwrite) { giterr_set(GITERR_TAG, "Tag already exists"); return GIT_EEXISTS; diff --git a/vendor/libgit2/src/thread-utils.h b/vendor/libgit2/src/thread-utils.h index dd1136caf..14c8a41ff 100644 --- a/vendor/libgit2/src/thread-utils.h +++ b/vendor/libgit2/src/thread-utils.h @@ -275,7 +275,7 @@ GIT_INLINE(int) git_atomic_get(git_atomic *a) extern int git_online_cpus(void); -#if defined(GIT_THREADS) && defined(GIT_WIN32) +#if defined(GIT_THREADS) && defined(_MSC_VER) # define GIT_MEMORY_BARRIER MemoryBarrier() #elif defined(GIT_THREADS) # define GIT_MEMORY_BARRIER __sync_synchronize() diff --git a/vendor/libgit2/src/tls_stream.c b/vendor/libgit2/src/tls_stream.c index 39a8ce343..83e2d064a 100644 --- a/vendor/libgit2/src/tls_stream.c +++ b/vendor/libgit2/src/tls_stream.c @@ -11,8 +11,21 @@ #include "openssl_stream.h" #include "stransport_stream.h" +static git_stream_cb tls_ctor; + +int git_stream_register_tls(git_stream_cb ctor) +{ + tls_ctor = ctor; + + return 0; +} + int git_tls_stream_new(git_stream **out, const char *host, const char *port) { + + if (tls_ctor) + return tls_ctor(out, host, port); + #ifdef GIT_SECURE_TRANSPORT return git_stransport_stream_new(out, host, port); #elif defined(GIT_OPENSSL) diff --git a/vendor/libgit2/src/transaction.c b/vendor/libgit2/src/transaction.c index e8331891c..2c8a1e8bd 100644 --- a/vendor/libgit2/src/transaction.c +++ b/vendor/libgit2/src/transaction.c @@ -12,6 +12,7 @@ #include "pool.h" #include "reflog.h" #include "signature.h" +#include "config.h" #include "git2/transaction.h" #include "git2/signature.h" @@ -20,6 +21,12 @@ GIT__USE_STRMAP +typedef enum { + TRANSACTION_NONE, + TRANSACTION_REFS, + TRANSACTION_CONFIG, +} transaction_t; + typedef struct { const char *name; void *payload; @@ -39,13 +46,29 @@ typedef struct { } transaction_node; struct git_transaction { + transaction_t type; git_repository *repo; git_refdb *db; + git_config *cfg; git_strmap *locks; git_pool pool; }; +int git_transaction_config_new(git_transaction **out, git_config *cfg) +{ + git_transaction *tx; + assert(out && cfg); + + tx = git__calloc(1, sizeof(git_transaction)); + GITERR_CHECK_ALLOC(tx); + + tx->type = TRANSACTION_CONFIG; + tx->cfg = cfg; + *out = tx; + return 0; +} + int git_transaction_new(git_transaction **out, git_repository *repo) { int error; @@ -54,8 +77,7 @@ int git_transaction_new(git_transaction **out, git_repository *repo) assert(out && repo); - if ((error = git_pool_init(&pool, 1, 0)) < 0) - return error; + git_pool_init(&pool, 1); tx = git_pool_mallocz(&pool, sizeof(git_transaction)); if (!tx) { @@ -71,6 +93,7 @@ int git_transaction_new(git_transaction **out, git_repository *repo) if ((error = git_repository_refdb(&tx->db, repo)) < 0) goto on_error; + tx->type = TRANSACTION_REFS; memcpy(&tx->pool, &pool, sizeof(git_pool)); tx->repo = repo; *out = tx; @@ -305,6 +328,13 @@ int git_transaction_commit(git_transaction *tx) assert(tx); + if (tx->type == TRANSACTION_CONFIG) { + error = git_config_unlock(tx->cfg, true); + tx->cfg = NULL; + + return error; + } + for (pos = kh_begin(tx->locks); pos < kh_end(tx->locks); pos++) { if (!git_strmap_has_data(tx->locks, pos)) continue; @@ -332,6 +362,16 @@ void git_transaction_free(git_transaction *tx) assert(tx); + if (tx->type == TRANSACTION_CONFIG) { + if (tx->cfg) { + git_config_unlock(tx->cfg, false); + git_config_free(tx->cfg); + } + + git__free(tx); + return; + } + /* start by unlocking the ones we've left hanging, if any */ for (pos = kh_begin(tx->locks); pos < kh_end(tx->locks); pos++) { if (!git_strmap_has_data(tx->locks, pos)) diff --git a/vendor/libgit2/src/transaction.h b/vendor/libgit2/src/transaction.h new file mode 100644 index 000000000..780c06830 --- /dev/null +++ b/vendor/libgit2/src/transaction.h @@ -0,0 +1,14 @@ +/* + * Copyright (C) the libgit2 contributors. All rights reserved. + * + * This file is part of libgit2, distributed under the GNU GPL v2 with + * a Linking Exception. For full terms see the included COPYING file. + */ +#ifndef INCLUDE_transaction_h__ +#define INCLUDE_transaction_h__ + +#include "common.h" + +int git_transaction_config_new(git_transaction **out, git_config *cfg); + +#endif diff --git a/vendor/libgit2/src/transport.c b/vendor/libgit2/src/transport.c index 5c65c7c06..327052fa3 100644 --- a/vendor/libgit2/src/transport.c +++ b/vendor/libgit2/src/transport.c @@ -35,6 +35,8 @@ static transport_definition transports[] = { { "file://", git_transport_local, NULL }, #ifdef GIT_SSH { "ssh://", git_transport_smart, &ssh_subtransport_definition }, + { "ssh+git://", git_transport_smart, &ssh_subtransport_definition }, + { "git+ssh://", git_transport_smart, &ssh_subtransport_definition }, #endif { NULL, 0, 0 } }; diff --git a/vendor/libgit2/src/transports/cred.c b/vendor/libgit2/src/transports/cred.c index 044b2a262..49ede48bf 100644 --- a/vendor/libgit2/src/transports/cred.c +++ b/vendor/libgit2/src/transports/cred.c @@ -378,3 +378,11 @@ int git_cred_username_new(git_cred **cred, const char *username) *cred = (git_cred *) c; return 0; } + +void git_cred_free(git_cred *cred) +{ + if (!cred) + return; + + cred->free(cred); +} diff --git a/vendor/libgit2/src/transports/http.c b/vendor/libgit2/src/transports/http.c index 87f3ee816..88b124bf7 100644 --- a/vendor/libgit2/src/transports/http.c +++ b/vendor/libgit2/src/transports/http.c @@ -10,6 +10,7 @@ #include "http_parser.h" #include "buffer.h" #include "netops.h" +#include "global.h" #include "remote.h" #include "smart.h" #include "auth.h" @@ -186,6 +187,16 @@ static int apply_credentials(git_buf *buf, http_subtransport *t) return context->next_token(buf, context, cred); } +static const char *user_agent(void) +{ + const char *custom = git_libgit2__user_agent(); + + if (custom) + return custom; + + return "libgit2 " LIBGIT2_VERSION; +} + static int gen_request( git_buf *buf, http_stream *s, @@ -193,10 +204,11 @@ static int gen_request( { http_subtransport *t = OWNING_SUBTRANSPORT(s); const char *path = t->connection_data.path ? t->connection_data.path : "/"; + size_t i; git_buf_printf(buf, "%s %s%s HTTP/1.1\r\n", s->verb, path, s->service_url); - git_buf_puts(buf, "User-Agent: git/1.0 (libgit2 " LIBGIT2_VERSION ")\r\n"); + git_buf_printf(buf, "User-Agent: git/1.0 (%s)\r\n", user_agent()); git_buf_printf(buf, "Host: %s\r\n", t->connection_data.host); if (s->chunked || content_length > 0) { @@ -210,6 +222,11 @@ static int gen_request( } else git_buf_puts(buf, "Accept: */*\r\n"); + for (i = 0; i < t->owner->custom_headers.count; i++) { + if (t->owner->custom_headers.strings[i]) + git_buf_printf(buf, "%s\r\n", t->owner->custom_headers.strings[i]); + } + /* Apply credentials to the request */ if (apply_credentials(buf, t) < 0) return -1; diff --git a/vendor/libgit2/src/transports/smart.c b/vendor/libgit2/src/transports/smart.c index 85a49e543..b0611c35e 100644 --- a/vendor/libgit2/src/transports/smart.c +++ b/vendor/libgit2/src/transports/smart.c @@ -66,6 +66,84 @@ static int git_smart__set_callbacks( return 0; } +static int http_header_name_length(const char *http_header) +{ + const char *colon = strchr(http_header, ':'); + if (!colon) + return 0; + return colon - http_header; +} + +static bool is_malformed_http_header(const char *http_header) +{ + const char *c; + int name_len; + + // Disallow \r and \n + c = strchr(http_header, '\r'); + if (c) + return true; + c = strchr(http_header, '\n'); + if (c) + return true; + + // Require a header name followed by : + name_len = http_header_name_length(http_header); + if (name_len < 1) + return true; + + return false; +} + +static char *forbidden_custom_headers[] = { + "User-Agent", + "Host", + "Accept", + "Content-Type", + "Transfer-Encoding", + "Content-Length", +}; + +static bool is_forbidden_custom_header(const char *custom_header) +{ + unsigned long i; + int name_len = http_header_name_length(custom_header); + + // Disallow headers that we set + for (i = 0; i < ARRAY_SIZE(forbidden_custom_headers); i++) + if (strncmp(forbidden_custom_headers[i], custom_header, name_len) == 0) + return true; + + return false; +} + +static int git_smart__set_custom_headers( + git_transport *transport, + const git_strarray *custom_headers) +{ + transport_smart *t = (transport_smart *)transport; + size_t i; + + if (t->custom_headers.count) + git_strarray_free(&t->custom_headers); + + if (!custom_headers) + return 0; + + for (i = 0; i < custom_headers->count; i++) { + if (is_malformed_http_header(custom_headers->strings[i])) { + giterr_set(GITERR_INVALID, "custom HTTP header '%s' is malformed", custom_headers->strings[i]); + return -1; + } + if (is_forbidden_custom_header(custom_headers->strings[i])) { + giterr_set(GITERR_INVALID, "custom HTTP header '%s' is already set by libgit2", custom_headers->strings[i]); + return -1; + } + } + + return git_strarray_copy(&t->custom_headers, custom_headers); +} + int git_smart__update_heads(transport_smart *t, git_vector *symrefs) { size_t i; @@ -362,6 +440,8 @@ static void git_smart__free(git_transport *transport) git_vector_free(refs); + git_strarray_free(&t->custom_headers); + git__free(t); } @@ -372,6 +452,20 @@ static int ref_name_cmp(const void *a, const void *b) return strcmp(ref_a->head.name, ref_b->head.name); } +int git_transport_smart_certificate_check(git_transport *transport, git_cert *cert, int valid, const char *hostname) +{ + transport_smart *t = (transport_smart *)transport; + + return t->certificate_check_cb(cert, valid, hostname, t->message_cb_payload); +} + +int git_transport_smart_credentials(git_cred **out, git_transport *transport, const char *user, int methods) +{ + transport_smart *t = (transport_smart *)transport; + + return t->cred_acquire_cb(out, t->url, user, methods, t->cred_acquire_payload); +} + int git_transport_smart(git_transport **out, git_remote *owner, void *param) { transport_smart *t; @@ -385,6 +479,7 @@ int git_transport_smart(git_transport **out, git_remote *owner, void *param) t->parent.version = GIT_TRANSPORT_VERSION; t->parent.set_callbacks = git_smart__set_callbacks; + t->parent.set_custom_headers = git_smart__set_custom_headers; t->parent.connect = git_smart__connect; t->parent.close = git_smart__close; t->parent.free = git_smart__free; diff --git a/vendor/libgit2/src/transports/smart.h b/vendor/libgit2/src/transports/smart.h index 4c728c7cc..800466adf 100644 --- a/vendor/libgit2/src/transports/smart.h +++ b/vendor/libgit2/src/transports/smart.h @@ -139,6 +139,7 @@ typedef struct { git_transport_message_cb error_cb; git_transport_certificate_check_cb certificate_check_cb; void *message_cb_payload; + git_strarray custom_headers; git_smart_subtransport *wrapped; git_smart_subtransport_stream *current_stream; transport_smart_caps caps; diff --git a/vendor/libgit2/src/transports/smart_pkt.c b/vendor/libgit2/src/transports/smart_pkt.c index 9ccbd8085..2ea57bb64 100644 --- a/vendor/libgit2/src/transports/smart_pkt.c +++ b/vendor/libgit2/src/transports/smart_pkt.c @@ -271,6 +271,7 @@ static int ok_pkt(git_pkt **out, const char *line, size_t len) line += 3; /* skip "ok " */ if (!(ptr = strchr(line, '\n'))) { giterr_set(GITERR_NET, "Invalid packet line"); + git__free(pkt); return -1; } len = ptr - line; @@ -295,13 +296,12 @@ static int ng_pkt(git_pkt **out, const char *line, size_t len) pkt = git__malloc(sizeof(*pkt)); GITERR_CHECK_ALLOC(pkt); + pkt->ref = NULL; pkt->type = GIT_PKT_NG; line += 3; /* skip "ng " */ - if (!(ptr = strchr(line, ' '))) { - giterr_set(GITERR_NET, "Invalid packet line"); - return -1; - } + if (!(ptr = strchr(line, ' '))) + goto out_err; len = ptr - line; GITERR_CHECK_ALLOC_ADD(&alloclen, len, 1); @@ -312,10 +312,8 @@ static int ng_pkt(git_pkt **out, const char *line, size_t len) pkt->ref[len] = '\0'; line = ptr + 1; - if (!(ptr = strchr(line, '\n'))) { - giterr_set(GITERR_NET, "Invalid packet line"); - return -1; - } + if (!(ptr = strchr(line, '\n'))) + goto out_err; len = ptr - line; GITERR_CHECK_ALLOC_ADD(&alloclen, len, 1); @@ -327,6 +325,12 @@ static int ng_pkt(git_pkt **out, const char *line, size_t len) *out = (git_pkt *)pkt; return 0; + +out_err: + giterr_set(GITERR_NET, "Invalid packet line"); + git__free(pkt->ref); + git__free(pkt); + return -1; } static int unpack_pkt(git_pkt **out, const char *line, size_t len) @@ -351,7 +355,7 @@ static int unpack_pkt(git_pkt **out, const char *line, size_t len) static int32_t parse_len(const char *line) { char num[PKT_LEN_SIZE + 1]; - int i, error; + int i, k, error; int32_t len; const char *num_end; @@ -360,7 +364,14 @@ static int32_t parse_len(const char *line) for (i = 0; i < PKT_LEN_SIZE; ++i) { if (!isxdigit(num[i])) { - giterr_set(GITERR_NET, "Found invalid hex digit in length"); + /* Make sure there are no special characters before passing to error message */ + for (k = 0; k < PKT_LEN_SIZE; ++k) { + if(!isprint(num[k])) { + num[k] = '.'; + } + } + + giterr_set(GITERR_NET, "invalid hex digit in length: '%s'", num); return -1; } } @@ -533,7 +544,9 @@ static int buffer_want_with_caps(const git_remote_head *head, transport_smart_ca "%04xwant %s %s\n", (unsigned int)len, oid, git_buf_cstr(&str)); git_buf_free(&str); - return git_buf_oom(buf); + GITERR_CHECK_ALLOC_BUF(buf); + + return 0; } /* diff --git a/vendor/libgit2/src/transports/smart_protocol.c b/vendor/libgit2/src/transports/smart_protocol.c index 1d46d4bc9..02e1ecf74 100644 --- a/vendor/libgit2/src/transports/smart_protocol.c +++ b/vendor/libgit2/src/transports/smart_protocol.c @@ -108,6 +108,7 @@ static int append_symref(const char **out, git_vector *symrefs, const char *ptr) if (giterr_last()->klass != GITERR_NOMEMORY) goto on_invalid; + git__free(mapping); return error; } @@ -120,6 +121,7 @@ static int append_symref(const char **out, git_vector *symrefs, const char *ptr) on_invalid: giterr_set(GITERR_NET, "remote sent invalid symref"); git_refspec__free(mapping); + git__free(mapping); return -1; } @@ -719,18 +721,39 @@ static int add_push_report_pkt(git_push *push, git_pkt *pkt) return 0; } -static int add_push_report_sideband_pkt(git_push *push, git_pkt_data *data_pkt) +static int add_push_report_sideband_pkt(git_push *push, git_pkt_data *data_pkt, git_buf *data_pkt_buf) { git_pkt *pkt; - const char *line = data_pkt->data, *line_end; - size_t line_len = data_pkt->len; + const char *line, *line_end; + size_t line_len; int error; + int reading_from_buf = data_pkt_buf->size > 0; + + if (reading_from_buf) { + /* We had an existing partial packet, so add the new + * packet to the buffer and parse the whole thing */ + git_buf_put(data_pkt_buf, data_pkt->data, data_pkt->len); + line = data_pkt_buf->ptr; + line_len = data_pkt_buf->size; + } + else { + line = data_pkt->data; + line_len = data_pkt->len; + } while (line_len > 0) { error = git_pkt_parse_line(&pkt, line, &line_end, line_len); - if (error < 0) - return error; + if (error == GIT_EBUFS) { + /* Buffer the data when the inner packet is split + * across multiple sideband packets */ + if (!reading_from_buf) + git_buf_put(data_pkt_buf, line, line_len); + error = 0; + goto done; + } + else if (error < 0) + goto done; /* Advance in the buffer */ line_len -= (line_end - line); @@ -741,10 +764,15 @@ static int add_push_report_sideband_pkt(git_push *push, git_pkt_data *data_pkt) git_pkt_free(pkt); if (error < 0 && error != GIT_ITEROVER) - return error; + goto done; } - return 0; + error = 0; + +done: + if (reading_from_buf) + git_buf_consume(data_pkt_buf, line_end); + return error; } static int parse_report(transport_smart *transport, git_push *push) @@ -753,6 +781,7 @@ static int parse_report(transport_smart *transport, git_push *push) const char *line_end = NULL; gitno_buffer *buf = &transport->buffer; int error, recvd; + git_buf data_pkt_buf = GIT_BUF_INIT; for (;;) { if (buf->offset > 0) @@ -761,16 +790,21 @@ static int parse_report(transport_smart *transport, git_push *push) else error = GIT_EBUFS; - if (error < 0 && error != GIT_EBUFS) - return -1; + if (error < 0 && error != GIT_EBUFS) { + error = -1; + goto done; + } if (error == GIT_EBUFS) { - if ((recvd = gitno_recv(buf)) < 0) - return recvd; + if ((recvd = gitno_recv(buf)) < 0) { + error = recvd; + goto done; + } if (recvd == 0) { giterr_set(GITERR_NET, "early EOF"); - return GIT_EEOF; + error = GIT_EEOF; + goto done; } continue; } @@ -782,7 +816,7 @@ static int parse_report(transport_smart *transport, git_push *push) switch (pkt->type) { case GIT_PKT_DATA: /* This is a sideband packet which contains other packets */ - error = add_push_report_sideband_pkt(push, (git_pkt_data *)pkt); + error = add_push_report_sideband_pkt(push, (git_pkt_data *)pkt, &data_pkt_buf); break; case GIT_PKT_ERR: giterr_set(GITERR_NET, "report-status: Error reported: %s", @@ -803,12 +837,24 @@ static int parse_report(transport_smart *transport, git_push *push) git_pkt_free(pkt); /* add_push_report_pkt returns GIT_ITEROVER when it receives a flush */ - if (error == GIT_ITEROVER) - return 0; + if (error == GIT_ITEROVER) { + error = 0; + if (data_pkt_buf.size > 0) { + /* If there was data remaining in the pack data buffer, + * then the server sent a partial pkt-line */ + giterr_set(GITERR_NET, "Incomplete pack data pkt-line"); + error = GIT_ERROR; + } + goto done; + } - if (error < 0) - return error; + if (error < 0) { + goto done; + } } +done: + git_buf_free(&data_pkt_buf); + return error; } static int add_ref_from_push_spec(git_vector *refs, push_spec *push_spec) diff --git a/vendor/libgit2/src/transports/ssh.c b/vendor/libgit2/src/transports/ssh.c index 250e588e7..cfd573665 100644 --- a/vendor/libgit2/src/transports/ssh.c +++ b/vendor/libgit2/src/transports/ssh.c @@ -15,12 +15,14 @@ #include "smart.h" #include "cred.h" #include "socket_stream.h" +#include "ssh.h" #ifdef GIT_SSH #define OWNING_SUBTRANSPORT(s) ((ssh_subtransport *)(s)->parent.subtransport) -static const char prefix_ssh[] = "ssh://"; +static const char *ssh_prefixes[] = { "ssh://", "ssh+git://", "git+ssh://" }; + static const char cmd_uploadpack[] = "git-upload-pack"; static const char cmd_receivepack[] = "git-receive-pack"; @@ -62,17 +64,24 @@ static int gen_proto(git_buf *request, const char *cmd, const char *url) { char *repo; int len; + size_t i; - if (!git__prefixcmp(url, prefix_ssh)) { - url = url + strlen(prefix_ssh); - repo = strchr(url, '/'); - if (repo && repo[1] == '~') - ++repo; - } else { - repo = strchr(url, ':'); - if (repo) repo++; + for (i = 0; i < ARRAY_SIZE(ssh_prefixes); ++i) { + const char *p = ssh_prefixes[i]; + + if (!git__prefixcmp(url, p)) { + url = url + strlen(p); + repo = strchr(url, '/'); + if (repo && repo[1] == '~') + ++repo; + + goto done; + } } + repo = strchr(url, ':'); + if (repo) repo++; +done: if (!repo) { giterr_set(GITERR_NET, "Malformed git protocol URL"); return -1; @@ -136,9 +145,14 @@ static int ssh_stream_read( * not-found error, so read from stderr and signal EOF on * stderr. */ - if (rc == 0 && (rc = libssh2_channel_read_stderr(s->channel, buffer, buf_size)) > 0) { - giterr_set(GITERR_SSH, "%*s", rc, buffer); - return GIT_EEOF; + if (rc == 0) { + if ((rc = libssh2_channel_read_stderr(s->channel, buffer, buf_size)) > 0) { + giterr_set(GITERR_SSH, "%*s", rc, buffer); + return GIT_EEOF; + } else if (rc < LIBSSH2_ERROR_NONE) { + ssh_error(s->session, "SSH could not read stderr"); + return -1; + } } @@ -494,6 +508,7 @@ static int _git_ssh_setup_conn( char *host=NULL, *port=NULL, *path=NULL, *user=NULL, *pass=NULL; const char *default_port="22"; int auth_methods, error = 0; + size_t i; ssh_stream *s; git_cred *cred = NULL; LIBSSH2_SESSION* session=NULL; @@ -509,16 +524,22 @@ static int _git_ssh_setup_conn( s->session = NULL; s->channel = NULL; - if (!git__prefixcmp(url, prefix_ssh)) { - if ((error = gitno_extract_url_parts(&host, &port, &path, &user, &pass, url, default_port)) < 0) - goto done; - } else { - if ((error = git_ssh_extract_url_parts(&host, &user, url)) < 0) - goto done; - port = git__strdup(default_port); - GITERR_CHECK_ALLOC(port); + for (i = 0; i < ARRAY_SIZE(ssh_prefixes); ++i) { + const char *p = ssh_prefixes[i]; + + if (!git__prefixcmp(url, p)) { + if ((error = gitno_extract_url_parts(&host, &port, &path, &user, &pass, url, default_port)) < 0) + goto done; + + goto post_extract; + } } + if ((error = git_ssh_extract_url_parts(&host, &user, url)) < 0) + goto done; + port = git__strdup(default_port); + GITERR_CHECK_ALLOC(port); +post_extract: if ((error = git_socket_stream_new(&s->io, host, port)) < 0 || (error = git_stream_connect(s->io)) < 0) goto done; @@ -527,10 +548,10 @@ static int _git_ssh_setup_conn( goto done; if (t->owner->certificate_check_cb != NULL) { - git_cert_hostkey cert = { 0 }, *cert_ptr; + git_cert_hostkey cert = {{ 0 }}, *cert_ptr; const char *key; - cert.cert_type = GIT_CERT_HOSTKEY_LIBSSH2; + cert.parent.cert_type = GIT_CERT_HOSTKEY_LIBSSH2; key = libssh2_hostkey_hash(session, LIBSSH2_HOSTKEY_HASH_SHA1); if (key != NULL) { @@ -871,3 +892,18 @@ int git_transport_ssh_with_paths(git_transport **out, git_remote *owner, void *p return -1; #endif } + +int git_transport_ssh_global_init(void) +{ +#ifdef GIT_SSH + + libssh2_init(0); + return 0; + +#else + + /* Nothing to initialize */ + return 0; + +#endif +} diff --git a/vendor/libgit2/src/transports/ssh.h b/vendor/libgit2/src/transports/ssh.h new file mode 100644 index 000000000..2db2cc5df --- /dev/null +++ b/vendor/libgit2/src/transports/ssh.h @@ -0,0 +1,12 @@ +/* + * Copyright (C) the libgit2 contributors. All rights reserved. + * + * This file is part of libgit2, distributed under the GNU GPL v2 with + * a Linking Exception. For full terms see the included COPYING file. + */ +#ifndef INCLUDE_ssh_h__ +#define INCLUDE_ssh_h__ + +int git_transport_ssh_global_init(void); + +#endif diff --git a/vendor/libgit2/src/transports/winhttp.c b/vendor/libgit2/src/transports/winhttp.c index da047d690..32b838084 100644 --- a/vendor/libgit2/src/transports/winhttp.c +++ b/vendor/libgit2/src/transports/winhttp.c @@ -15,6 +15,7 @@ #include "smart.h" #include "remote.h" #include "repository.h" +#include "global.h" #include #include @@ -52,10 +53,15 @@ static const int no_check_cert_flags = SECURITY_FLAG_IGNORE_CERT_CN_INVALID | SECURITY_FLAG_IGNORE_UNKNOWN_CA; #if defined(__MINGW32__) -const CLSID CLSID_InternetSecurityManager = { 0x7B8A2D94, 0x0AC9, 0x11D1, +static const CLSID CLSID_InternetSecurityManager_mingw = + { 0x7B8A2D94, 0x0AC9, 0x11D1, { 0x89, 0x6C, 0x00, 0xC0, 0x4F, 0xB6, 0xBF, 0xC4 } }; -const IID IID_IInternetSecurityManager = { 0x79EAC9EE, 0xBAF9, 0x11CE, +static const IID IID_IInternetSecurityManager_mingw = + { 0x79EAC9EE, 0xBAF9, 0x11CE, { 0x8C, 0x82, 0x00, 0xAA, 0x00, 0x4B, 0xA9, 0x0B } }; + +# define CLSID_InternetSecurityManager CLSID_InternetSecurityManager_mingw +# define IID_IInternetSecurityManager IID_IInternetSecurityManager_mingw #endif #define OWNING_SUBTRANSPORT(s) ((winhttp_subtransport *)(s)->parent.subtransport) @@ -228,7 +234,7 @@ static int certificate_check(winhttp_stream *s, int valid) } giterr_clear(); - cert.cert_type = GIT_CERT_X509; + cert.parent.cert_type = GIT_CERT_X509; cert.data = cert_ctx->pbCertEncoded; cert.len = cert_ctx->cbCertEncoded; error = t->owner->certificate_check_cb((git_cert *) &cert, valid, t->connection_data.host, t->owner->cred_acquire_payload); @@ -277,6 +283,7 @@ static int winhttp_stream_connect(winhttp_stream *s) unsigned long disable_redirects = WINHTTP_DISABLE_REDIRECTS; int default_timeout = TIMEOUT_INFINITE; int default_connect_timeout = DEFAULT_CONNECT_TIMEOUT; + size_t i; /* Prepare URL */ git_buf_printf(&buf, "%s%s", t->connection_data.path, s->service_url); @@ -409,6 +416,23 @@ static int winhttp_stream_connect(winhttp_stream *s) } } + for (i = 0; i < t->owner->custom_headers.count; i++) { + if (t->owner->custom_headers.strings[i]) { + git_buf_clear(&buf); + git_buf_puts(&buf, t->owner->custom_headers.strings[i]); + if (git__utf8_to_16(ct, MAX_CONTENT_TYPE_LEN, git_buf_cstr(&buf)) < 0) { + giterr_set(GITERR_OS, "Failed to convert custom header to wide characters"); + goto on_error; + } + + if (!WinHttpAddRequestHeaders(s->request, ct, (ULONG)-1L, + WINHTTP_ADDREQ_FLAG_ADD | WINHTTP_ADDREQ_FLAG_REPLACE)) { + giterr_set(GITERR_OS, "Failed to add a header to the request"); + goto on_error; + } + } + } + /* If requested, disable certificate validation */ if (t->connection_data.use_ssl) { int flags; @@ -549,12 +573,28 @@ static int winhttp_close_connection(winhttp_subtransport *t) return ret; } +static int user_agent(git_buf *ua) +{ + const char *custom = git_libgit2__user_agent(); + + git_buf_clear(ua); + git_buf_PUTS(ua, "git/1.0 ("); + + if (custom) + git_buf_puts(ua, custom); + else + git_buf_PUTS(ua, "libgit2 " LIBGIT2_VERSION); + + return git_buf_putc(ua, ')'); +} + static int winhttp_connect( winhttp_subtransport *t) { - wchar_t *ua = L"git/1.0 (libgit2 " WIDEN(LIBGIT2_VERSION) L")"; wchar_t *wide_host; int32_t port; + wchar_t *wide_ua; + git_buf ua = GIT_BUF_INIT; int error = -1; int default_timeout = TIMEOUT_INFINITE; int default_connect_timeout = DEFAULT_CONNECT_TIMEOUT; @@ -572,9 +612,23 @@ static int winhttp_connect( return -1; } + if ((error = user_agent(&ua)) < 0) { + git__free(wide_host); + return error; + } + + if (git__utf8_to_16_alloc(&wide_ua, git_buf_cstr(&ua)) < 0) { + giterr_set(GITERR_OS, "Unable to convert host to wide characters"); + git__free(wide_host); + git_buf_free(&ua); + return -1; + } + + git_buf_free(&ua); + /* Establish session */ t->session = WinHttpOpen( - ua, + wide_ua, WINHTTP_ACCESS_TYPE_DEFAULT_PROXY, WINHTTP_NO_PROXY_NAME, WINHTTP_NO_PROXY_BYPASS, @@ -610,6 +664,7 @@ static int winhttp_connect( winhttp_close_connection(t); git__free(wide_host); + git__free(wide_ua); return error; } @@ -871,16 +926,20 @@ static int winhttp_stream_read( if (parse_unauthorized_response(s->request, &allowed_types, &t->auth_mechanism) < 0) return -1; - if (allowed_types && - (!t->cred || 0 == (t->cred->credtype & allowed_types))) { + if (allowed_types) { int cred_error = 1; + git_cred_free(t->cred); + t->cred = NULL; /* Start with the user-supplied credential callback, if present */ if (t->owner->cred_acquire_cb) { cred_error = t->owner->cred_acquire_cb(&t->cred, t->owner->url, t->connection_data.user, allowed_types, t->owner->cred_acquire_payload); - if (cred_error < 0) + /* Treat GIT_PASSTHROUGH as though git_cred_acquire_cb isn't set */ + if (cred_error == GIT_PASSTHROUGH) + cred_error = 1; + else if (cred_error < 0) return cred_error; } diff --git a/vendor/libgit2/src/tree.c b/vendor/libgit2/src/tree.c index bdd17661b..6ce460c6d 100644 --- a/vendor/libgit2/src/tree.c +++ b/vendor/libgit2/src/tree.c @@ -17,6 +17,9 @@ #define DEFAULT_TREE_SIZE 16 #define MAX_FILEMODE_BYTES 6 +#define TREE_ENTRY_CHECK_NAMELEN(n) \ + if (n > UINT16_MAX) { giterr_set(GITERR_INVALID, "tree entry path too long"); } + GIT__USE_STRMAP static bool valid_filemode(const int filemode) @@ -81,27 +84,47 @@ int git_tree_entry_icmp(const git_tree_entry *e1, const git_tree_entry *e2) git__strncasecmp); } -static git_tree_entry *alloc_entry(const char *filename) +/** + * Allocate a new self-contained entry, with enough space after it to + * store the filename and the id. + */ +static git_tree_entry *alloc_entry(const char *filename, size_t filename_len, const git_oid *id) { git_tree_entry *entry = NULL; - size_t filename_len = strlen(filename), tree_len; + size_t tree_len; + + TREE_ENTRY_CHECK_NAMELEN(filename_len); if (GIT_ADD_SIZET_OVERFLOW(&tree_len, sizeof(git_tree_entry), filename_len) || - GIT_ADD_SIZET_OVERFLOW(&tree_len, tree_len, 1) || - !(entry = git__malloc(tree_len))) + GIT_ADD_SIZET_OVERFLOW(&tree_len, tree_len, 1) || + GIT_ADD_SIZET_OVERFLOW(&tree_len, tree_len, GIT_OID_RAWSZ)) return NULL; - memset(entry, 0x0, sizeof(git_tree_entry)); - memcpy(entry->filename, filename, filename_len); - entry->filename[filename_len] = 0; - entry->filename_len = filename_len; + entry = git__calloc(1, tree_len); + if (!entry) + return NULL; + + { + char *filename_ptr; + void *id_ptr; + + filename_ptr = ((char *) entry) + sizeof(git_tree_entry); + memcpy(filename_ptr, filename, filename_len); + entry->filename = filename_ptr; + + id_ptr = filename_ptr + filename_len + 1; + git_oid_cpy(id_ptr, id); + entry->oid = id_ptr; + } + + entry->filename_len = (uint16_t)filename_len; return entry; } struct tree_key_search { const char *filename; - size_t filename_len; + uint16_t filename_len; }; static int homing_search_cmp(const void *key, const void *array_member) @@ -109,8 +132,8 @@ static int homing_search_cmp(const void *key, const void *array_member) const struct tree_key_search *ksearch = key; const git_tree_entry *entry = array_member; - const size_t len1 = ksearch->filename_len; - const size_t len2 = entry->filename_len; + const uint16_t len1 = ksearch->filename_len; + const uint16_t len2 = entry->filename_len; return memcmp( ksearch->filename, @@ -140,24 +163,31 @@ static int homing_search_cmp(const void *key, const void *array_member) * around the area for our target file. */ static int tree_key_search( - size_t *at_pos, git_vector *entries, const char *filename, size_t filename_len) + size_t *at_pos, + const git_tree *tree, + const char *filename, + size_t filename_len) { struct tree_key_search ksearch; const git_tree_entry *entry; size_t homing, i; + TREE_ENTRY_CHECK_NAMELEN(filename_len); + ksearch.filename = filename; - ksearch.filename_len = filename_len; + ksearch.filename_len = (uint16_t)filename_len; /* Initial homing search; find an entry on the tree with * the same prefix as the filename we're looking for */ - if (git_vector_bsearch2(&homing, entries, &homing_search_cmp, &ksearch) < 0) + + if (git_array_search(&homing, + tree->entries, &homing_search_cmp, &ksearch) < 0) return GIT_ENOTFOUND; /* just a signal error; not passed back to user */ /* We found a common prefix. Look forward as long as * there are entries that share the common prefix */ - for (i = homing; i < entries->length; ++i) { - entry = entries->contents[i]; + for (i = homing; i < tree->entries.size; ++i) { + entry = git_array_get(tree->entries, i); if (homing_search_cmp(&ksearch, entry) < 0) break; @@ -177,7 +207,7 @@ static int tree_key_search( i = homing - 1; do { - entry = entries->contents[i]; + entry = git_array_get(tree->entries, i); if (homing_search_cmp(&ksearch, entry) > 0) break; @@ -206,33 +236,26 @@ void git_tree_entry_free(git_tree_entry *entry) int git_tree_entry_dup(git_tree_entry **dest, const git_tree_entry *source) { - size_t total_size; - git_tree_entry *copy; + git_tree_entry *cpy; assert(source); - GITERR_CHECK_ALLOC_ADD(&total_size, sizeof(git_tree_entry), source->filename_len); - GITERR_CHECK_ALLOC_ADD(&total_size, total_size, 1); - - copy = git__malloc(total_size); - GITERR_CHECK_ALLOC(copy); + cpy = alloc_entry(source->filename, source->filename_len, source->oid); + if (cpy == NULL) + return -1; - memcpy(copy, source, total_size); + cpy->attr = source->attr; - *dest = copy; + *dest = cpy; return 0; } void git_tree__free(void *_tree) { git_tree *tree = _tree; - size_t i; - git_tree_entry *e; - git_vector_foreach(&tree->entries, i, e) - git_tree_entry_free(e); - - git_vector_free(&tree->entries); + git_odb_object_free(tree->odb_obj); + git_array_clear(tree->entries); git__free(tree); } @@ -255,7 +278,7 @@ const char *git_tree_entry_name(const git_tree_entry *entry) const git_oid *git_tree_entry_id(const git_tree_entry *entry) { assert(entry); - return &entry->oid; + return entry->oid; } git_otype git_tree_entry_type(const git_tree_entry *entry) @@ -276,7 +299,7 @@ int git_tree_entry_to_object( const git_tree_entry *entry) { assert(entry && object_out); - return git_object_lookup(object_out, repo, &entry->oid, GIT_OBJ_ANY); + return git_object_lookup(object_out, repo, entry->oid, GIT_OBJ_ANY); } static const git_tree_entry *entry_fromname( @@ -284,19 +307,17 @@ static const git_tree_entry *entry_fromname( { size_t idx; - /* be safe when we cast away constness - i.e. don't trigger a sort */ - assert(git_vector_is_sorted(&tree->entries)); - - if (tree_key_search(&idx, (git_vector *)&tree->entries, name, name_len) < 0) + if (tree_key_search(&idx, tree, name, name_len) < 0) return NULL; - return git_vector_get(&tree->entries, idx); + return git_array_get(tree->entries, idx); } const git_tree_entry *git_tree_entry_byname( const git_tree *tree, const char *filename) { assert(tree && filename); + return entry_fromname(tree, filename, strlen(filename)); } @@ -304,7 +325,7 @@ const git_tree_entry *git_tree_entry_byindex( const git_tree *tree, size_t idx) { assert(tree); - return git_vector_get(&tree->entries, idx); + return git_array_get(tree->entries, idx); } const git_tree_entry *git_tree_entry_byid( @@ -315,8 +336,8 @@ const git_tree_entry *git_tree_entry_byid( assert(tree); - git_vector_foreach(&tree->entries, i, e) { - if (memcmp(&e->oid.id, &id->id, sizeof(id->id)) == 0) + git_array_foreach(tree->entries, i, e) { + if (memcmp(&e->oid->id, &id->id, sizeof(id->id)) == 0) return e; } @@ -325,31 +346,32 @@ const git_tree_entry *git_tree_entry_byid( int git_tree__prefix_position(const git_tree *tree, const char *path) { - const git_vector *entries = &tree->entries; struct tree_key_search ksearch; - size_t at_pos; + size_t at_pos, path_len; if (!path) return 0; - ksearch.filename = path; - ksearch.filename_len = strlen(path); + path_len = strlen(path); + TREE_ENTRY_CHECK_NAMELEN(path_len); - /* be safe when we cast away constness - i.e. don't trigger a sort */ - assert(git_vector_is_sorted(&tree->entries)); + ksearch.filename = path; + ksearch.filename_len = (uint16_t)path_len; /* Find tree entry with appropriate prefix */ - git_vector_bsearch2( - &at_pos, (git_vector *)entries, &homing_search_cmp, &ksearch); + git_array_search( + &at_pos, tree->entries, &homing_search_cmp, &ksearch); - for (; at_pos < entries->length; ++at_pos) { - const git_tree_entry *entry = entries->contents[at_pos]; + for (; at_pos < tree->entries.size; ++at_pos) { + const git_tree_entry *entry = git_array_get(tree->entries, at_pos); if (homing_search_cmp(&ksearch, entry) < 0) break; } for (; at_pos > 0; --at_pos) { - const git_tree_entry *entry = entries->contents[at_pos - 1]; + const git_tree_entry *entry = + git_array_get(tree->entries, at_pos - 1); + if (homing_search_cmp(&ksearch, entry) > 0) break; } @@ -360,7 +382,7 @@ int git_tree__prefix_position(const git_tree *tree, const char *path) size_t git_tree_entrycount(const git_tree *tree) { assert(tree); - return tree->entries.length; + return tree->entries.size; } unsigned int git_treebuilder_entrycount(git_treebuilder *bld) @@ -379,52 +401,68 @@ static int tree_error(const char *str, const char *path) return -1; } +static int parse_mode(unsigned int *modep, const char *buffer, const char **buffer_out) +{ + unsigned char c; + unsigned int mode = 0; + + if (*buffer == ' ') + return -1; + + while ((c = *buffer++) != ' ') { + if (c < '0' || c > '7') + return -1; + mode = (mode << 3) + (c - '0'); + } + *modep = mode; + *buffer_out = buffer; + + return 0; +} + int git_tree__parse(void *_tree, git_odb_object *odb_obj) { git_tree *tree = _tree; - const char *buffer = git_odb_object_data(odb_obj); - const char *buffer_end = buffer + git_odb_object_size(odb_obj); + const char *buffer; + const char *buffer_end; - if (git_vector_init(&tree->entries, DEFAULT_TREE_SIZE, entry_sort_cmp) < 0) + if (git_odb_object_dup(&tree->odb_obj, odb_obj) < 0) return -1; + buffer = git_odb_object_data(tree->odb_obj); + buffer_end = buffer + git_odb_object_size(tree->odb_obj); + + git_array_init_to_size(tree->entries, DEFAULT_TREE_SIZE); + GITERR_CHECK_ARRAY(tree->entries); + while (buffer < buffer_end) { git_tree_entry *entry; - int attr; + size_t filename_len; + const char *nul; + unsigned int attr; - if (git__strtol32(&attr, buffer, &buffer, 8) < 0 || !buffer) + if (parse_mode(&attr, buffer, &buffer) < 0 || !buffer) return tree_error("Failed to parse tree. Can't parse filemode", NULL); - if (*buffer++ != ' ') - return tree_error("Failed to parse tree. Object is corrupted", NULL); - - if (memchr(buffer, 0, buffer_end - buffer) == NULL) + if ((nul = memchr(buffer, 0, buffer_end - buffer)) == NULL) return tree_error("Failed to parse tree. Object is corrupted", NULL); - /** Allocate the entry and store it in the entries vector */ + filename_len = nul - buffer; + /* Allocate the entry */ { - entry = alloc_entry(buffer); + entry = git_array_alloc(tree->entries); GITERR_CHECK_ALLOC(entry); - if (git_vector_insert(&tree->entries, entry) < 0) { - git__free(entry); - return -1; - } - entry->attr = attr; + entry->filename_len = filename_len; + entry->filename = buffer; + entry->oid = (git_oid *) ((char *) buffer + filename_len + 1); } - while (buffer < buffer_end && *buffer != 0) - buffer++; - - buffer++; - - git_oid_fromraw(&entry->oid, (const unsigned char *)buffer); + buffer += filename_len + 1; buffer += GIT_OID_RAWSZ; } - git_vector_sort(&tree->entries); - return 0; } @@ -457,10 +495,9 @@ static int append_entry( if (!valid_entry_name(bld->repo, filename)) return tree_error("Failed to insert entry. Invalid name for a tree entry", filename); - entry = alloc_entry(filename); + entry = alloc_entry(filename, strlen(filename), id); GITERR_CHECK_ALLOC(entry); - git_oid_cpy(&entry->oid, id); entry->attr = (uint16_t)filemode; git_strmap_insert(bld->map, entry->filename, entry, error); @@ -649,10 +686,10 @@ int git_treebuilder_new( if (source != NULL) { git_tree_entry *entry_src; - git_vector_foreach(&source->entries, i, entry_src) { + git_array_foreach(source->entries, i, entry_src) { if (append_entry( bld, entry_src->filename, - &entry_src->oid, + entry_src->oid, entry_src->attr) < 0) goto on_error; } @@ -666,6 +703,18 @@ int git_treebuilder_new( return -1; } +static git_otype otype_from_mode(git_filemode_t filemode) +{ + switch (filemode) { + case GIT_FILEMODE_TREE: + return GIT_OBJ_TREE; + case GIT_FILEMODE_COMMIT: + return GIT_OBJ_COMMIT; + default: + return GIT_OBJ_BLOB; + } +} + int git_treebuilder_insert( const git_tree_entry **entry_out, git_treebuilder *bld, @@ -685,11 +734,16 @@ int git_treebuilder_insert( if (!valid_entry_name(bld->repo, filename)) return tree_error("Failed to insert entry. Invalid name for a tree entry", filename); + if (filemode != GIT_FILEMODE_COMMIT && + !git_object__is_valid(bld->repo, id, otype_from_mode(filemode))) + return tree_error("Failed to insert entry; invalid object specified", filename); + pos = git_strmap_lookup_index(bld->map, filename); if (git_strmap_valid_index(bld->map, pos)) { entry = git_strmap_value_at(bld->map, pos); + git_oid_cpy((git_oid *) entry->oid, id); } else { - entry = alloc_entry(filename); + entry = alloc_entry(filename, strlen(filename), id); GITERR_CHECK_ALLOC(entry); git_strmap_insert(bld->map, entry->filename, entry, error); @@ -701,7 +755,6 @@ int git_treebuilder_insert( } } - git_oid_cpy(&entry->oid, id); entry->attr = filemode; if (entry_out) @@ -772,19 +825,20 @@ int git_treebuilder_write(git_oid *oid, git_treebuilder *bld) git_buf_printf(&tree, "%o ", entry->attr); git_buf_put(&tree, entry->filename, entry->filename_len + 1); - git_buf_put(&tree, (char *)entry->oid.id, GIT_OID_RAWSZ); + git_buf_put(&tree, (char *)entry->oid->id, GIT_OID_RAWSZ); if (git_buf_oom(&tree)) error = -1; } - git_vector_free(&entries); if (!error && !(error = git_repository_odb__weakptr(&odb, bld->repo))) error = git_odb_write(oid, odb, tree.ptr, tree.size, GIT_OBJ_TREE); git_buf_free(&tree); + git_vector_free(&entries); + return error; } @@ -884,7 +938,7 @@ int git_tree_entry_bypath( return git_tree_entry_dup(entry_out, entry); } - if (git_tree_lookup(&subtree, root->object.repo, &entry->oid) < 0) + if (git_tree_lookup(&subtree, root->object.repo, entry->oid) < 0) return -1; error = git_tree_entry_bypath( @@ -908,7 +962,7 @@ static int tree_walk( size_t i; const git_tree_entry *entry; - git_vector_foreach(&tree->entries, i, entry) { + git_array_foreach(tree->entries, i, entry) { if (preorder) { error = callback(path->ptr, entry, payload); if (error < 0) { /* negative value stops iteration */ @@ -925,7 +979,7 @@ static int tree_walk( git_tree *subtree; size_t path_len = git_buf_len(path); - error = git_tree_lookup(&subtree, tree->object.repo, &entry->oid); + error = git_tree_lookup(&subtree, tree->object.repo, entry->oid); if (error < 0) break; diff --git a/vendor/libgit2/src/tree.h b/vendor/libgit2/src/tree.h index d01b6fd41..5e7a66e04 100644 --- a/vendor/libgit2/src/tree.h +++ b/vendor/libgit2/src/tree.h @@ -12,17 +12,19 @@ #include "odb.h" #include "vector.h" #include "strmap.h" +#include "pool.h" struct git_tree_entry { uint16_t attr; - git_oid oid; - size_t filename_len; - char filename[1]; + uint16_t filename_len; + const git_oid *oid; + const char *filename; }; struct git_tree { git_object object; - git_vector entries; + git_odb_object *odb_obj; + git_array_t(git_tree_entry) entries; }; struct git_treebuilder { diff --git a/vendor/libgit2/src/unix/map.c b/vendor/libgit2/src/unix/map.c index 87ee6594b..c55ad1aa7 100644 --- a/vendor/libgit2/src/unix/map.c +++ b/vendor/libgit2/src/unix/map.c @@ -17,13 +17,18 @@ int git__page_size(size_t *page_size) { long sc_page_size = sysconf(_SC_PAGE_SIZE); if (sc_page_size < 0) { - giterr_set_str(GITERR_OS, "Can't determine system page size"); + giterr_set(GITERR_OS, "can't determine system page size"); return -1; } *page_size = (size_t) sc_page_size; return 0; } +int git__mmap_alignment(size_t *alignment) +{ + return git__page_size(alignment); +} + int p_mmap(git_map *out, size_t len, int prot, int flags, int fd, git_off_t offset) { int mprot = PROT_READ; diff --git a/vendor/libgit2/src/unix/posix.h b/vendor/libgit2/src/unix/posix.h index 6633689bc..482d2c803 100644 --- a/vendor/libgit2/src/unix/posix.h +++ b/vendor/libgit2/src/unix/posix.h @@ -21,6 +21,18 @@ typedef int GIT_SOCKET; #define p_lstat(p,b) lstat(p,b) #define p_stat(p,b) stat(p, b) +#if defined(GIT_USE_STAT_MTIMESPEC) +# define st_atime_nsec st_atimespec.tv_nsec +# define st_mtime_nsec st_mtimespec.tv_nsec +# define st_ctime_nsec st_ctimespec.tv_nsec +#elif defined(GIT_USE_STAT_MTIM) +# define st_atime_nsec st_atim.tv_nsec +# define st_mtime_nsec st_mtim.tv_nsec +# define st_ctime_nsec st_ctim.tv_nsec +#elif !defined(GIT_USE_STAT_MTIME_NSEC) && defined(GIT_USE_NEC) +# error GIT_USE_NSEC defined but unknown struct stat nanosecond type +#endif + #define p_utimes(f, t) utimes(f, t) #define p_readlink(a, b, c) readlink(a, b, c) @@ -52,8 +64,10 @@ extern char *p_realpath(const char *, char *); #define p_localtime_r(c, r) localtime_r(c, r) #define p_gmtime_r(c, r) gmtime_r(c, r) +#define p_timeval timeval + #ifdef HAVE_FUTIMENS -GIT_INLINE(int) p_futimes(int f, const struct timeval t[2]) +GIT_INLINE(int) p_futimes(int f, const struct p_timeval t[2]) { struct timespec s[2]; s[0].tv_sec = t[0].tv_sec; diff --git a/vendor/libgit2/src/util.c b/vendor/libgit2/src/util.c index 49d491dd3..9e67f4347 100644 --- a/vendor/libgit2/src/util.c +++ b/vendor/libgit2/src/util.c @@ -10,6 +10,10 @@ #include #include "posix.h" +#ifdef GIT_WIN32 +# include "win32/w32_buffer.h" +#endif + #ifdef _MSC_VER # include #endif @@ -760,3 +764,47 @@ int git__utf8_iterate(const uint8_t *str, int str_len, int32_t *dst) *dst = uc; return length; } + +#ifdef GIT_WIN32 +int git__getenv(git_buf *out, const char *name) +{ + wchar_t *wide_name = NULL, *wide_value = NULL; + DWORD value_len; + int error = -1; + + git_buf_clear(out); + + if (git__utf8_to_16_alloc(&wide_name, name) < 0) + return -1; + + if ((value_len = GetEnvironmentVariableW(wide_name, NULL, 0)) > 0) { + wide_value = git__malloc(value_len * sizeof(wchar_t)); + GITERR_CHECK_ALLOC(wide_value); + + value_len = GetEnvironmentVariableW(wide_name, wide_value, value_len); + } + + if (value_len) + error = git_buf_put_w(out, wide_value, value_len); + else if (GetLastError() == ERROR_ENVVAR_NOT_FOUND) + error = GIT_ENOTFOUND; + else + giterr_set(GITERR_OS, "could not read environment variable '%s'", name); + + git__free(wide_name); + git__free(wide_value); + return error; +} +#else +int git__getenv(git_buf *out, const char *name) +{ + const char *val = getenv(name); + + git_buf_clear(out); + + if (!val) + return GIT_ENOTFOUND; + + return git_buf_puts(out, val); +} +#endif diff --git a/vendor/libgit2/src/util.h b/vendor/libgit2/src/util.h index b2abbe6a6..d0c3cd04a 100644 --- a/vendor/libgit2/src/util.h +++ b/vendor/libgit2/src/util.h @@ -7,6 +7,9 @@ #ifndef INCLUDE_util_h__ #define INCLUDE_util_h__ +#include "git2/buffer.h" +#include "buffer.h" + #if defined(GIT_MSVC_CRTDBG) /* Enable MSVC CRTDBG memory leak reporting. * @@ -35,6 +38,7 @@ */ #include #include +#include "win32/w32_crtdbg_stacktrace.h" #endif #include "common.h" @@ -62,23 +66,24 @@ #define CONST_STRLEN(x) ((sizeof(x)/sizeof(x[0])) - 1) #if defined(GIT_MSVC_CRTDBG) + GIT_INLINE(void *) git__crtdbg__malloc(size_t len, const char *file, int line) { - void *ptr = _malloc_dbg(len, _NORMAL_BLOCK, file, line); + void *ptr = _malloc_dbg(len, _NORMAL_BLOCK, git_win32__crtdbg_stacktrace(1,file), line); if (!ptr) giterr_set_oom(); return ptr; } GIT_INLINE(void *) git__crtdbg__calloc(size_t nelem, size_t elsize, const char *file, int line) { - void *ptr = _calloc_dbg(nelem, elsize, _NORMAL_BLOCK, file, line); + void *ptr = _calloc_dbg(nelem, elsize, _NORMAL_BLOCK, git_win32__crtdbg_stacktrace(1,file), line); if (!ptr) giterr_set_oom(); return ptr; } GIT_INLINE(char *) git__crtdbg__strdup(const char *str, const char *file, int line) { - char *ptr = _strdup_dbg(str, _NORMAL_BLOCK, file, line); + char *ptr = _strdup_dbg(str, _NORMAL_BLOCK, git_win32__crtdbg_stacktrace(1,file), line); if (!ptr) giterr_set_oom(); return ptr; } @@ -118,7 +123,7 @@ GIT_INLINE(char *) git__crtdbg__substrdup(const char *start, size_t n, const cha GIT_INLINE(void *) git__crtdbg__realloc(void *ptr, size_t size, const char *file, int line) { - void *new_ptr = _realloc_dbg(ptr, size, _NORMAL_BLOCK, file, line); + void *new_ptr = _realloc_dbg(ptr, size, _NORMAL_BLOCK, git_win32__crtdbg_stacktrace(1,file), line); if (!new_ptr) giterr_set_oom(); return new_ptr; } @@ -126,8 +131,9 @@ GIT_INLINE(void *) git__crtdbg__realloc(void *ptr, size_t size, const char *file GIT_INLINE(void *) git__crtdbg__reallocarray(void *ptr, size_t nelem, size_t elsize, const char *file, int line) { size_t newsize; + return GIT_MULTIPLY_SIZET_OVERFLOW(&newsize, nelem, elsize) ? - NULL : _realloc_dbg(ptr, newsize, _NORMAL_BLOCK, file, line); + NULL : _realloc_dbg(ptr, newsize, _NORMAL_BLOCK, git_win32__crtdbg_stacktrace(1,file), line); } GIT_INLINE(void *) git__crtdbg__mallocarray(size_t nelem, size_t elsize, const char *file, int line) @@ -596,4 +602,6 @@ GIT_INLINE(double) git__timer(void) #endif +extern int git__getenv(git_buf *out, const char *name); + #endif /* INCLUDE_util_h__ */ diff --git a/vendor/libgit2/src/vector.c b/vendor/libgit2/src/vector.c index 93d09bb5b..a81d463ef 100644 --- a/vendor/libgit2/src/vector.c +++ b/vendor/libgit2/src/vector.c @@ -40,6 +40,13 @@ GIT_INLINE(int) resize_vector(git_vector *v, size_t new_size) return 0; } +int git_vector_size_hint(git_vector *v, size_t size_hint) +{ + if (v->_alloc_size >= size_hint) + return 0; + return resize_vector(v, size_hint); +} + int git_vector_dup(git_vector *v, const git_vector *src, git_vector_cmp cmp) { size_t bytes; diff --git a/vendor/libgit2/src/vector.h b/vendor/libgit2/src/vector.h index aac46c4b3..b7500ded3 100644 --- a/vendor/libgit2/src/vector.h +++ b/vendor/libgit2/src/vector.h @@ -32,6 +32,7 @@ void git_vector_free_deep(git_vector *v); /* free each entry and self */ void git_vector_clear(git_vector *v); int git_vector_dup(git_vector *v, const git_vector *src, git_vector_cmp cmp); void git_vector_swap(git_vector *a, git_vector *b); +int git_vector_size_hint(git_vector *v, size_t size_hint); void **git_vector_detach(size_t *size, size_t *asize, git_vector *v); diff --git a/vendor/libgit2/src/win32/findfile.c b/vendor/libgit2/src/win32/findfile.c index de27dd060..58c22279e 100644 --- a/vendor/libgit2/src/win32/findfile.c +++ b/vendor/libgit2/src/win32/findfile.c @@ -215,3 +215,13 @@ int git_win32__find_xdg_dirs(git_buf *out) return win32_find_existing_dirs(out, global_tmpls); } + +int git_win32__find_programdata_dirs(git_buf *out) +{ + static const wchar_t *programdata_tmpls[2] = { + L"%PROGRAMDATA%\\Git", + NULL, + }; + + return win32_find_existing_dirs(out, programdata_tmpls); +} diff --git a/vendor/libgit2/src/win32/findfile.h b/vendor/libgit2/src/win32/findfile.h index a50319b9a..3d5fff439 100644 --- a/vendor/libgit2/src/win32/findfile.h +++ b/vendor/libgit2/src/win32/findfile.h @@ -11,6 +11,7 @@ extern int git_win32__find_system_dirs(git_buf *out, const wchar_t *subpath); extern int git_win32__find_global_dirs(git_buf *out); extern int git_win32__find_xdg_dirs(git_buf *out); +extern int git_win32__find_programdata_dirs(git_buf *out); #endif diff --git a/vendor/libgit2/src/win32/map.c b/vendor/libgit2/src/win32/map.c index a99c30f7e..03a3646a6 100644 --- a/vendor/libgit2/src/win32/map.c +++ b/vendor/libgit2/src/win32/map.c @@ -17,22 +17,41 @@ static DWORD get_page_size(void) if (!page_size) { GetSystemInfo(&sys); - page_size = sys.dwAllocationGranularity; + page_size = sys.dwPageSize; } return page_size; } +static DWORD get_allocation_granularity(void) +{ + static DWORD granularity; + SYSTEM_INFO sys; + + if (!granularity) { + GetSystemInfo(&sys); + granularity = sys.dwAllocationGranularity; + } + + return granularity; +} + int git__page_size(size_t *page_size) { *page_size = get_page_size(); return 0; } +int git__mmap_alignment(size_t *page_size) +{ + *page_size = get_allocation_granularity(); + return 0; +} + int p_mmap(git_map *out, size_t len, int prot, int flags, int fd, git_off_t offset) { HANDLE fh = (HANDLE)_get_osfhandle(fd); - DWORD page_size = get_page_size(); + DWORD alignment = get_allocation_granularity(); DWORD fmap_prot = 0; DWORD view_prot = 0; DWORD off_low = 0; @@ -62,12 +81,12 @@ int p_mmap(git_map *out, size_t len, int prot, int flags, int fd, git_off_t offs if (prot & GIT_PROT_READ) view_prot |= FILE_MAP_READ; - page_start = (offset / page_size) * page_size; + page_start = (offset / alignment) * alignment; page_offset = offset - page_start; - if (page_offset != 0) { /* offset must be multiple of page size */ + if (page_offset != 0) { /* offset must be multiple of the allocation granularity */ errno = EINVAL; - giterr_set(GITERR_OS, "Failed to mmap. Offset must be multiple of page size"); + giterr_set(GITERR_OS, "Failed to mmap. Offset must be multiple of allocation granularity"); return -1; } diff --git a/vendor/libgit2/src/win32/mingw-compat.h b/vendor/libgit2/src/win32/mingw-compat.h index a4a5a31c7..698ebed1a 100644 --- a/vendor/libgit2/src/win32/mingw-compat.h +++ b/vendor/libgit2/src/win32/mingw-compat.h @@ -11,12 +11,6 @@ #undef stat -#if _WIN32_WINNT >= 0x0601 -#define stat __stat64 -#else -#define stat _stati64 -#endif - #if _WIN32_WINNT < 0x0600 && !defined(__MINGW64_VERSION_MAJOR) #undef MemoryBarrier void __mingworg_MemoryBarrier(void); diff --git a/vendor/libgit2/src/win32/msvc-compat.h b/vendor/libgit2/src/win32/msvc-compat.h index 8004bc1f8..12b50d981 100644 --- a/vendor/libgit2/src/win32/msvc-compat.h +++ b/vendor/libgit2/src/win32/msvc-compat.h @@ -9,9 +9,6 @@ #if defined(_MSC_VER) -/* 64-bit stat information, regardless of USE_32BIT_TIME_T define */ -#define stat __stat64 - typedef unsigned short mode_t; typedef SSIZE_T ssize_t; diff --git a/vendor/libgit2/src/win32/posix.h b/vendor/libgit2/src/win32/posix.h index ac98fd864..5fab267c2 100644 --- a/vendor/libgit2/src/win32/posix.h +++ b/vendor/libgit2/src/win32/posix.h @@ -9,6 +9,7 @@ #include "common.h" #include "../posix.h" +#include "win32-compat.h" #include "path_w32.h" #include "utf-conv.h" #include "dir.h" @@ -16,12 +17,13 @@ typedef SOCKET GIT_SOCKET; #define p_lseek(f,n,w) _lseeki64(f, n, w) -#define p_fstat(f,b) _fstat64(f, b) + +extern int p_fstat(int fd, struct stat *buf); extern int p_lstat(const char *file_name, struct stat *buf); -extern int p_stat(const char* path, struct stat* buf); +extern int p_stat(const char* path, struct stat *buf); -extern int p_utimes(const char *filename, const struct timeval times[2]); -extern int p_futimes(int fd, const struct timeval times[2]); +extern int p_utimes(const char *filename, const struct p_timeval times[2]); +extern int p_futimes(int fd, const struct p_timeval times[2]); extern int p_readlink(const char *path, char *buf, size_t bufsiz); extern int p_symlink(const char *old, const char *new); diff --git a/vendor/libgit2/src/win32/posix_w32.c b/vendor/libgit2/src/win32/posix_w32.c index e7aa6fc7c..fea634b00 100644 --- a/vendor/libgit2/src/win32/posix_w32.c +++ b/vendor/libgit2/src/win32/posix_w32.c @@ -11,6 +11,8 @@ #include "utf-conv.h" #include "repository.h" #include "reparse.h" +#include "global.h" +#include "buffer.h" #include #include #include @@ -208,7 +210,7 @@ int p_lstat_posixly(const char *filename, struct stat *buf) return do_lstat(filename, buf, true); } -int p_utimes(const char *filename, const struct timeval times[2]) +int p_utimes(const char *filename, const struct p_timeval times[2]) { int fd, error; @@ -221,7 +223,7 @@ int p_utimes(const char *filename, const struct timeval times[2]) return error; } -int p_futimes(int fd, const struct timeval times[2]) +int p_futimes(int fd, const struct p_timeval times[2]) { HANDLE handle; FILETIME atime = {0}, mtime = {0}; @@ -396,6 +398,22 @@ static int follow_and_lstat_link(git_win32_path path, struct stat* buf) return lstat_w(target_w, buf, false); } +int p_fstat(int fd, struct stat *buf) +{ + BY_HANDLE_FILE_INFORMATION fhInfo; + + HANDLE fh = (HANDLE)_get_osfhandle(fd); + + if (fh == INVALID_HANDLE_VALUE || + !GetFileInformationByHandle(fh, &fhInfo)) { + errno = EBADF; + return -1; + } + + git_win32__file_information_to_stat(buf, &fhInfo); + return 0; +} + int p_stat(const char* path, struct stat* buf) { git_win32_path path_w; diff --git a/vendor/libgit2/src/win32/utf-conv.c b/vendor/libgit2/src/win32/utf-conv.c index f1b674ea0..96fd4606e 100644 --- a/vendor/libgit2/src/win32/utf-conv.c +++ b/vendor/libgit2/src/win32/utf-conv.c @@ -8,20 +8,6 @@ #include "common.h" #include "utf-conv.h" -GIT_INLINE(DWORD) get_wc_flags(void) -{ - static char inited = 0; - static DWORD flags; - - /* Invalid code point check supported on Vista+ only */ - if (!inited) { - flags = git_has_win32_version(6, 0, 0) ? WC_ERR_INVALID_CHARS : 0; - inited = 1; - } - - return flags; -} - GIT_INLINE(void) git__set_errno(void) { if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) @@ -66,7 +52,7 @@ int git__utf16_to_8(char *dest, size_t dest_size, const wchar_t *src) /* Length of -1 indicates NULL termination of the input string. Subtract 1 from the result to * turn 0 into -1 (an error code) and to not count the NULL terminator as part of the string's * length. WideCharToMultiByte never returns int's minvalue, so underflow is not possible */ - if ((len = WideCharToMultiByte(CP_UTF8, get_wc_flags(), src, -1, dest, (int)dest_size, NULL, NULL) - 1) < 0) + if ((len = WideCharToMultiByte(CP_UTF8, WC_ERR_INVALID_CHARS, src, -1, dest, (int)dest_size, NULL, NULL) - 1) < 0) git__set_errno(); return len; @@ -127,12 +113,11 @@ int git__utf8_to_16_alloc(wchar_t **dest, const char *src) int git__utf16_to_8_alloc(char **dest, const wchar_t *src) { int utf8_size; - DWORD dwFlags = get_wc_flags(); *dest = NULL; /* Length of -1 indicates NULL termination of the input string */ - utf8_size = WideCharToMultiByte(CP_UTF8, dwFlags, src, -1, NULL, 0, NULL, NULL); + utf8_size = WideCharToMultiByte(CP_UTF8, WC_ERR_INVALID_CHARS, src, -1, NULL, 0, NULL, NULL); if (!utf8_size) { git__set_errno(); @@ -146,7 +131,7 @@ int git__utf16_to_8_alloc(char **dest, const wchar_t *src) return -1; } - utf8_size = WideCharToMultiByte(CP_UTF8, dwFlags, src, -1, *dest, utf8_size, NULL, NULL); + utf8_size = WideCharToMultiByte(CP_UTF8, WC_ERR_INVALID_CHARS, src, -1, *dest, utf8_size, NULL, NULL); if (!utf8_size) { git__set_errno(); diff --git a/vendor/libgit2/src/win32/w32_crtdbg_stacktrace.c b/vendor/libgit2/src/win32/w32_crtdbg_stacktrace.c new file mode 100644 index 000000000..a778f4164 --- /dev/null +++ b/vendor/libgit2/src/win32/w32_crtdbg_stacktrace.c @@ -0,0 +1,343 @@ +/* + * Copyright (C) the libgit2 contributors. All rights reserved. + * + * This file is part of libgit2, distributed under the GNU GPL v2 with + * a Linking Exception. For full terms see the included COPYING file. + */ + +#if defined(GIT_MSVC_CRTDBG) +#include "w32_stack.h" +#include "w32_crtdbg_stacktrace.h" + +#define CRTDBG_STACKTRACE__UID_LEN (15) + +/** + * The stacktrace of an allocation can be distilled + * to a unique id based upon the stackframe pointers + * and ignoring any size arguments. We will use these + * UIDs as the (char const*) __FILE__ argument we + * give to the CRT malloc routines. + */ +typedef struct { + char uid[CRTDBG_STACKTRACE__UID_LEN + 1]; +} git_win32__crtdbg_stacktrace__uid; + +/** + * All mallocs with the same stacktrace will be de-duped + * and aggregated into this row. + */ +typedef struct { + git_win32__crtdbg_stacktrace__uid uid; /* must be first */ + git_win32__stack__raw_data raw_data; + unsigned int count_allocs; /* times this alloc signature seen since init */ + unsigned int count_allocs_at_last_checkpoint; /* times since last mark */ + unsigned int transient_count_leaks; /* sum of leaks */ +} git_win32__crtdbg_stacktrace__row; + +static CRITICAL_SECTION g_crtdbg_stacktrace_cs; + +/** + * CRTDBG memory leak tracking takes a "char const * const file_name" + * and stores the pointer in the heap data (instead of allocing a copy + * for itself). Normally, this is not a problem, since we usually pass + * in __FILE__. But I'm going to lie to it and pass in the address of + * the UID in place of the file_name. Also, I do not want to alloc the + * stacktrace data (because we are called from inside our alloc routines). + * Therefore, I'm creating a very large static pool array to store row + * data. This also eliminates the temptation to realloc it (and move the + * UID pointers). + * + * And to efficiently look for duplicates we need an index on the rows + * so we can bsearch it. Again, without mallocing. + * + * If we observe more than MY_ROW_LIMIT unique malloc signatures, we + * fall through and use the traditional __FILE__ processing and don't + * try to de-dup them. If your testing hits this limit, just increase + * it and try again. + */ + +#define MY_ROW_LIMIT (1024 * 1024) +static git_win32__crtdbg_stacktrace__row g_cs_rows[MY_ROW_LIMIT]; +static git_win32__crtdbg_stacktrace__row *g_cs_index[MY_ROW_LIMIT]; + +static unsigned int g_cs_end = MY_ROW_LIMIT; +static unsigned int g_cs_ins = 0; /* insertion point == unique allocs seen */ +static unsigned int g_count_total_allocs = 0; /* number of allocs seen */ +static unsigned int g_transient_count_total_leaks = 0; /* number of total leaks */ +static unsigned int g_transient_count_dedup_leaks = 0; /* number of unique leaks */ +static bool g_limit_reached = false; /* had allocs after we filled row table */ + +static unsigned int g_checkpoint_id = 0; /* to better label leak checkpoints */ +static bool g_transient_leaks_since_mark = false; /* payload for hook */ + +/** + * Compare function for bsearch on g_cs_index table. + */ +static int row_cmp(const void *v1, const void *v2) +{ + git_win32__stack__raw_data *d1 = (git_win32__stack__raw_data*)v1; + git_win32__crtdbg_stacktrace__row *r2 = (git_win32__crtdbg_stacktrace__row *)v2; + + return (git_win32__stack_compare(d1, &r2->raw_data)); +} + +/** + * Unique insert the new data into the row and index tables. + * We have to sort by the stackframe data itself, not the uid. + */ +static git_win32__crtdbg_stacktrace__row * insert_unique( + const git_win32__stack__raw_data *pdata) +{ + size_t pos; + if (git__bsearch(g_cs_index, g_cs_ins, pdata, row_cmp, &pos) < 0) { + /* Append new unique item to row table. */ + memcpy(&g_cs_rows[g_cs_ins].raw_data, pdata, sizeof(*pdata)); + sprintf(g_cs_rows[g_cs_ins].uid.uid, "##%08lx", g_cs_ins); + + /* Insert pointer to it into the proper place in the index table. */ + if (pos < g_cs_ins) + memmove(&g_cs_index[pos+1], &g_cs_index[pos], (g_cs_ins - pos)*sizeof(g_cs_index[0])); + g_cs_index[pos] = &g_cs_rows[g_cs_ins]; + + g_cs_ins++; + } + + g_cs_index[pos]->count_allocs++; + + return g_cs_index[pos]; +} + +/** + * Hook function to receive leak data from the CRT. (This includes + * both ":()" data, but also each of the + * various headers and fields. + * + * Scan this for the special "##" UID forms that we substituted + * for the "". Map back to the row data and + * increment its leak count. + * + * See https://msdn.microsoft.com/en-us/library/74kabxyx.aspx + * + * We suppress the actual crtdbg output. + */ +static int __cdecl report_hook(int nRptType, char *szMsg, int *retVal) +{ + static int hook_result = TRUE; /* FALSE to get stock dump; TRUE to suppress. */ + unsigned int pos; + + *retVal = 0; /* do not invoke debugger */ + + if ((szMsg[0] != '#') || (szMsg[1] != '#')) + return hook_result; + + if (sscanf(&szMsg[2], "%08lx", &pos) < 1) + return hook_result; + if (pos >= g_cs_ins) + return hook_result; + + if (g_transient_leaks_since_mark) { + if (g_cs_rows[pos].count_allocs == g_cs_rows[pos].count_allocs_at_last_checkpoint) + return hook_result; + } + + g_cs_rows[pos].transient_count_leaks++; + + if (g_cs_rows[pos].transient_count_leaks == 1) + g_transient_count_dedup_leaks++; + + g_transient_count_total_leaks++; + + return hook_result; +} + +/** + * Write leak data to all of the various places we need. + * We force the caller to sprintf() the message first + * because we want to avoid fprintf() because it allocs. + */ +static void my_output(const char *buf) +{ + fwrite(buf, strlen(buf), 1, stderr); + OutputDebugString(buf); +} + +/** + * For each row with leaks, dump a stacktrace for it. + */ +static void dump_summary(const char *label) +{ + unsigned int k; + char buf[10 * 1024]; + + if (g_transient_count_total_leaks == 0) + return; + + fflush(stdout); + fflush(stderr); + my_output("\n"); + + if (g_limit_reached) { + sprintf(buf, + "LEAK SUMMARY: de-dup row table[%d] filled. Increase MY_ROW_LIMIT.\n", + MY_ROW_LIMIT); + my_output(buf); + } + + if (!label) + label = ""; + + if (g_transient_leaks_since_mark) { + sprintf(buf, "LEAK CHECKPOINT %d: leaks %d unique %d: %s\n", + g_checkpoint_id, g_transient_count_total_leaks, g_transient_count_dedup_leaks, label); + my_output(buf); + } else { + sprintf(buf, "LEAK SUMMARY: TOTAL leaks %d de-duped %d: %s\n", + g_transient_count_total_leaks, g_transient_count_dedup_leaks, label); + my_output(buf); + } + my_output("\n"); + + for (k = 0; k < g_cs_ins; k++) { + if (g_cs_rows[k].transient_count_leaks > 0) { + sprintf(buf, "LEAK: %s leaked %d of %d times:\n", + g_cs_rows[k].uid.uid, + g_cs_rows[k].transient_count_leaks, + g_cs_rows[k].count_allocs); + my_output(buf); + + if (git_win32__stack_format( + buf, sizeof(buf), &g_cs_rows[k].raw_data, + NULL, NULL) >= 0) { + my_output(buf); + } + + my_output("\n"); + } + } + + fflush(stderr); +} + +void git_win32__crtdbg_stacktrace_init(void) +{ + InitializeCriticalSection(&g_crtdbg_stacktrace_cs); + + EnterCriticalSection(&g_crtdbg_stacktrace_cs); + + _CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF); + + _CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_DEBUG | _CRTDBG_MODE_FILE); + _CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_DEBUG | _CRTDBG_MODE_FILE); + _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_DEBUG | _CRTDBG_MODE_FILE); + + _CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR); + _CrtSetReportFile(_CRT_ERROR, _CRTDBG_FILE_STDERR); + _CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR); + + LeaveCriticalSection(&g_crtdbg_stacktrace_cs); +} + +int git_win32__crtdbg_stacktrace__dump( + git_win32__crtdbg_stacktrace_options opt, + const char *label) +{ + _CRT_REPORT_HOOK old; + unsigned int k; + int r = 0; + +#define IS_BIT_SET(o,b) (((o) & (b)) != 0) + + bool b_set_mark = IS_BIT_SET(opt, GIT_WIN32__CRTDBG_STACKTRACE__SET_MARK); + bool b_leaks_since_mark = IS_BIT_SET(opt, GIT_WIN32__CRTDBG_STACKTRACE__LEAKS_SINCE_MARK); + bool b_leaks_total = IS_BIT_SET(opt, GIT_WIN32__CRTDBG_STACKTRACE__LEAKS_TOTAL); + bool b_quiet = IS_BIT_SET(opt, GIT_WIN32__CRTDBG_STACKTRACE__QUIET); + + if (b_leaks_since_mark && b_leaks_total) { + giterr_set(GITERR_INVALID, "Cannot combine LEAKS_SINCE_MARK and LEAKS_TOTAL."); + return GIT_ERROR; + } + if (!b_set_mark && !b_leaks_since_mark && !b_leaks_total) { + giterr_set(GITERR_INVALID, "Nothing to do."); + return GIT_ERROR; + } + + EnterCriticalSection(&g_crtdbg_stacktrace_cs); + + if (b_leaks_since_mark || b_leaks_total) { + /* All variables with "transient" in the name are per-dump counters + * and reset before each dump. This lets us handle checkpoints. + */ + g_transient_count_total_leaks = 0; + g_transient_count_dedup_leaks = 0; + for (k = 0; k < g_cs_ins; k++) { + g_cs_rows[k].transient_count_leaks = 0; + } + } + + g_transient_leaks_since_mark = b_leaks_since_mark; + + old = _CrtSetReportHook(report_hook); + _CrtDumpMemoryLeaks(); + _CrtSetReportHook(old); + + if (b_leaks_since_mark || b_leaks_total) { + r = g_transient_count_dedup_leaks; + + if (!b_quiet) + dump_summary(label); + } + + if (b_set_mark) { + for (k = 0; k < g_cs_ins; k++) { + g_cs_rows[k].count_allocs_at_last_checkpoint = g_cs_rows[k].count_allocs; + } + + g_checkpoint_id++; + } + + LeaveCriticalSection(&g_crtdbg_stacktrace_cs); + + return r; +} + +void git_win32__crtdbg_stacktrace_cleanup(void) +{ + /* At shutdown/cleanup, dump cummulative leak info + * with everything since startup. This might generate + * extra noise if the caller has been doing checkpoint + * dumps, but it might also eliminate some false + * positives for resources previously reported during + * checkpoints. + */ + git_win32__crtdbg_stacktrace__dump( + GIT_WIN32__CRTDBG_STACKTRACE__LEAKS_TOTAL, + "CLEANUP"); + + DeleteCriticalSection(&g_crtdbg_stacktrace_cs); +} + +const char *git_win32__crtdbg_stacktrace(int skip, const char *file) +{ + git_win32__stack__raw_data new_data; + git_win32__crtdbg_stacktrace__row *row; + const char * result = file; + + if (git_win32__stack_capture(&new_data, skip+1) < 0) + return result; + + EnterCriticalSection(&g_crtdbg_stacktrace_cs); + + if (g_cs_ins < g_cs_end) { + row = insert_unique(&new_data); + result = row->uid.uid; + } else { + g_limit_reached = true; + } + + g_count_total_allocs++; + + LeaveCriticalSection(&g_crtdbg_stacktrace_cs); + + return result; +} +#endif diff --git a/vendor/libgit2/src/win32/w32_crtdbg_stacktrace.h b/vendor/libgit2/src/win32/w32_crtdbg_stacktrace.h new file mode 100644 index 000000000..40ca60d53 --- /dev/null +++ b/vendor/libgit2/src/win32/w32_crtdbg_stacktrace.h @@ -0,0 +1,93 @@ +/* + * Copyright (C) the libgit2 contributors. All rights reserved. + * + * This file is part of libgit2, distributed under the GNU GPL v2 with + * a Linking Exception. For full terms see the included COPYING file. + */ +#ifndef INCLUDE_w32_crtdbg_stacktrace_h__ +#define INCLUDE_w32_crtdbg_stacktrace_h__ + +#if defined(GIT_MSVC_CRTDBG) + +/** + * Initialize our memory leak tracking and de-dup data structures. + * This should ONLY be called by git_libgit2_init(). + */ +void git_win32__crtdbg_stacktrace_init(void); + +/** + * Shutdown our memory leak tracking and dump summary data. + * This should ONLY be called by git_libgit2_shutdown(). + * + * We explicitly call _CrtDumpMemoryLeaks() during here so + * that we can compute summary data for the leaks. We print + * the stacktrace of each unique leak. + * + * This cleanup does not happen if the app calls exit() + * without calling the libgit2 shutdown code. + * + * This info we print here is independent of any automatic + * reporting during exit() caused by _CRTDBG_LEAK_CHECK_DF. + * Set it in your app if you also want traditional reporting. + */ +void git_win32__crtdbg_stacktrace_cleanup(void); + +/** + * Checkpoint options. + */ +typedef enum git_win32__crtdbg_stacktrace_options { + /** + * Set checkpoint marker. + */ + GIT_WIN32__CRTDBG_STACKTRACE__SET_MARK = (1 << 0), + + /** + * Dump leaks since last checkpoint marker. + * May not be combined with __LEAKS_TOTAL. + * + * Note that this may generate false positives for global TLS + * error state and other global caches that aren't cleaned up + * until the thread/process terminates. So when using this + * around a region of interest, also check the final (at exit) + * dump before digging into leaks reported here. + */ + GIT_WIN32__CRTDBG_STACKTRACE__LEAKS_SINCE_MARK = (1 << 1), + + /** + * Dump leaks since init. May not be combined + * with __LEAKS_SINCE_MARK. + */ + GIT_WIN32__CRTDBG_STACKTRACE__LEAKS_TOTAL = (1 << 2), + + /** + * Suppress printing during dumps. + * Just return leak count. + */ + GIT_WIN32__CRTDBG_STACKTRACE__QUIET = (1 << 3), + +} git_win32__crtdbg_stacktrace_options; + +/** + * Checkpoint memory state and/or dump unique stack traces of + * current memory leaks. + * + * @return number of unique leaks (relative to requested starting + * point) or error. + */ +GIT_EXTERN(int) git_win32__crtdbg_stacktrace__dump( + git_win32__crtdbg_stacktrace_options opt, + const char *label); + +/** + * Construct stacktrace and append it to the global buffer. + * Return pointer to start of this string. On any error or + * lack of buffer space, just return the given file buffer + * so it will behave as usual. + * + * This should ONLY be called by our internal memory allocations + * routines. + */ +const char *git_win32__crtdbg_stacktrace(int skip, const char *file); + +#endif +#endif diff --git a/vendor/libgit2/src/win32/w32_stack.c b/vendor/libgit2/src/win32/w32_stack.c new file mode 100644 index 000000000..15af3dcb7 --- /dev/null +++ b/vendor/libgit2/src/win32/w32_stack.c @@ -0,0 +1,192 @@ +/* + * Copyright (C) the libgit2 contributors. All rights reserved. + * + * This file is part of libgit2, distributed under the GNU GPL v2 with + * a Linking Exception. For full terms see the included COPYING file. + */ + +#if defined(GIT_MSVC_CRTDBG) +#include "Windows.h" +#include "Dbghelp.h" +#include "win32/posix.h" +#include "w32_stack.h" +#include "hash.h" + +/** + * This is supposedly defined in WinBase.h (from Windows.h) but there were linker issues. + */ +USHORT WINAPI RtlCaptureStackBackTrace(ULONG, ULONG, PVOID*, PULONG); + +static bool g_win32_stack_initialized = false; +static HANDLE g_win32_stack_process = INVALID_HANDLE_VALUE; +static git_win32__stack__aux_cb_alloc g_aux_cb_alloc = NULL; +static git_win32__stack__aux_cb_lookup g_aux_cb_lookup = NULL; + +int git_win32__stack__set_aux_cb( + git_win32__stack__aux_cb_alloc cb_alloc, + git_win32__stack__aux_cb_lookup cb_lookup) +{ + g_aux_cb_alloc = cb_alloc; + g_aux_cb_lookup = cb_lookup; + + return 0; +} + +void git_win32__stack_init(void) +{ + if (!g_win32_stack_initialized) { + g_win32_stack_process = GetCurrentProcess(); + SymSetOptions(SYMOPT_LOAD_LINES); + SymInitialize(g_win32_stack_process, NULL, TRUE); + g_win32_stack_initialized = true; + } +} + +void git_win32__stack_cleanup(void) +{ + if (g_win32_stack_initialized) { + SymCleanup(g_win32_stack_process); + g_win32_stack_process = INVALID_HANDLE_VALUE; + g_win32_stack_initialized = false; + } +} + +int git_win32__stack_capture(git_win32__stack__raw_data *pdata, int skip) +{ + if (!g_win32_stack_initialized) { + giterr_set(GITERR_INVALID, "git_win32_stack not initialized."); + return GIT_ERROR; + } + + memset(pdata, 0, sizeof(*pdata)); + pdata->nr_frames = RtlCaptureStackBackTrace( + skip+1, GIT_WIN32__STACK__MAX_FRAMES, pdata->frames, NULL); + + /* If an "aux" data provider was registered, ask it to capture + * whatever data it needs and give us an "aux_id" to it so that + * we can refer to it later when reporting. + */ + if (g_aux_cb_alloc) + (g_aux_cb_alloc)(&pdata->aux_id); + + return 0; +} + +int git_win32__stack_compare( + git_win32__stack__raw_data *d1, + git_win32__stack__raw_data *d2) +{ + return memcmp(d1, d2, sizeof(*d1)); +} + +int git_win32__stack_format( + char *pbuf, int buf_len, + const git_win32__stack__raw_data *pdata, + const char *prefix, const char *suffix) +{ +#define MY_MAX_FILENAME 255 + + /* SYMBOL_INFO has char FileName[1] at the end. The docs say to + * to malloc it with extra space for your desired max filename. + */ + struct { + SYMBOL_INFO symbol; + char extra[MY_MAX_FILENAME + 1]; + } s; + + IMAGEHLP_LINE64 line; + int buf_used = 0; + unsigned int k; + char detail[MY_MAX_FILENAME * 2]; /* filename plus space for function name and formatting */ + int detail_len; + + if (!g_win32_stack_initialized) { + giterr_set(GITERR_INVALID, "git_win32_stack not initialized."); + return GIT_ERROR; + } + + if (!prefix) + prefix = "\t"; + if (!suffix) + suffix = "\n"; + + memset(pbuf, 0, buf_len); + + memset(&s, 0, sizeof(s)); + s.symbol.MaxNameLen = MY_MAX_FILENAME; + s.symbol.SizeOfStruct = sizeof(SYMBOL_INFO); + + memset(&line, 0, sizeof(line)); + line.SizeOfStruct = sizeof(IMAGEHLP_LINE64); + + for (k=0; k < pdata->nr_frames; k++) { + DWORD64 frame_k = (DWORD64)pdata->frames[k]; + DWORD dwUnused; + + if (SymFromAddr(g_win32_stack_process, frame_k, 0, &s.symbol) && + SymGetLineFromAddr64(g_win32_stack_process, frame_k, &dwUnused, &line)) { + const char *pslash; + const char *pfile; + + pslash = strrchr(line.FileName, '\\'); + pfile = ((pslash) ? (pslash+1) : line.FileName); + p_snprintf(detail, sizeof(detail), "%s%s:%d> %s%s", + prefix, pfile, line.LineNumber, s.symbol.Name, suffix); + } else { + /* This happens when we cross into another module. + * For example, in CLAR tests, this is typically + * the CRT startup code. Just print an unknown + * frame and continue. + */ + p_snprintf(detail, sizeof(detail), "%s??%s", prefix, suffix); + } + detail_len = strlen(detail); + + if (buf_len < (buf_used + detail_len + 1)) { + /* we don't have room for this frame in the buffer, so just stop. */ + break; + } + + memcpy(&pbuf[buf_used], detail, detail_len); + buf_used += detail_len; + } + + /* "aux_id" 0 is reserved to mean no aux data. This is needed to handle + * allocs that occur before the aux callbacks were registered. + */ + if (pdata->aux_id > 0) { + p_snprintf(detail, sizeof(detail), "%saux_id: %d%s", + prefix, pdata->aux_id, suffix); + detail_len = strlen(detail); + if ((buf_used + detail_len + 1) < buf_len) { + memcpy(&pbuf[buf_used], detail, detail_len); + buf_used += detail_len; + } + + /* If an "aux" data provider is still registered, ask it to append its detailed + * data to the end of ours using the "aux_id" it gave us when this de-duped + * item was created. + */ + if (g_aux_cb_lookup) + (g_aux_cb_lookup)(pdata->aux_id, &pbuf[buf_used], (buf_len - buf_used - 1)); + } + + return GIT_OK; +} + +int git_win32__stack( + char * pbuf, int buf_len, + int skip, + const char *prefix, const char *suffix) +{ + git_win32__stack__raw_data data; + int error; + + if ((error = git_win32__stack_capture(&data, skip)) < 0) + return error; + if ((error = git_win32__stack_format(pbuf, buf_len, &data, prefix, suffix)) < 0) + return error; + return 0; +} + +#endif diff --git a/vendor/libgit2/src/win32/w32_stack.h b/vendor/libgit2/src/win32/w32_stack.h new file mode 100644 index 000000000..21170bd2f --- /dev/null +++ b/vendor/libgit2/src/win32/w32_stack.h @@ -0,0 +1,138 @@ +/* + * Copyright (C) the libgit2 contributors. All rights reserved. + * + * This file is part of libgit2, distributed under the GNU GPL v2 with + * a Linking Exception. For full terms see the included COPYING file. + */ + +#ifndef INCLUDE_w32_stack_h__ +#define INCLUDE_w32_stack_h__ + +#if defined(GIT_MSVC_CRTDBG) + +/** + * This type defines a callback to be used to augment a C stacktrace + * with "aux" data. This can be used, for example, to allow LibGit2Sharp + * (or other interpreted consumer libraries) to give us C# stacktrace + * data for the PInvoke. + * + * This callback will be called during crtdbg-instrumented allocs. + * + * @param aux_id [out] A returned "aux_id" representing a unique + * (de-duped at the C# layer) stacktrace. "aux_id" 0 is reserved + * to mean no aux stacktrace data. + */ +typedef void (*git_win32__stack__aux_cb_alloc)(unsigned int *aux_id); + +/** + * This type defines a callback to be used to augment the output of + * a stacktrace. This will be used to request the C# layer format + * the C# stacktrace associated with "aux_id" into the provided + * buffer. + * + * This callback will be called during leak reporting. + * + * @param aux_id The "aux_id" key associated with a stacktrace. + * @param aux_msg A buffer where a formatted message should be written. + * @param aux_msg_len The size of the buffer. + */ +typedef void (*git_win32__stack__aux_cb_lookup)(unsigned int aux_id, char *aux_msg, unsigned int aux_msg_len); + +/** + * Register an "aux" data provider to augment our C stacktrace data. + * + * This can be used, for example, to allow LibGit2Sharp (or other + * interpreted consumer libraries) to give us the C# stacktrace of + * the PInvoke. + * + * If you choose to use this feature, it should be registered during + * initialization and not changed for the duration of the process. + */ +GIT_EXTERN(int) git_win32__stack__set_aux_cb( + git_win32__stack__aux_cb_alloc cb_alloc, + git_win32__stack__aux_cb_lookup cb_lookup); + +/** + * Maximum number of stackframes to record for a + * single stacktrace. + */ +#define GIT_WIN32__STACK__MAX_FRAMES 30 + +/** + * Wrapper containing the raw unprocessed stackframe + * data for a single stacktrace and any "aux_id". + * + * I put the aux_id first so leaks will be sorted by it. + * So, for example, if a specific callstack in C# leaks + * a repo handle, all of the pointers within the associated + * repo pointer will be grouped together. + */ +typedef struct { + unsigned int aux_id; + unsigned int nr_frames; + void *frames[GIT_WIN32__STACK__MAX_FRAMES]; +} git_win32__stack__raw_data; + + +/** + * Load symbol table data. This should be done in the primary + * thread at startup (under a lock if there are other threads + * active). + */ +void git_win32__stack_init(void); + +/** + * Cleanup symbol table data. This should be done in the + * primary thead at shutdown (under a lock if there are other + * threads active). + */ +void git_win32__stack_cleanup(void); + + +/** + * Capture raw stack trace data for the current process/thread. + * + * @param skip Number of initial frames to skip. Pass 0 to + * begin with the caller of this routine. Pass 1 to begin + * with its caller. And so on. + */ +int git_win32__stack_capture(git_win32__stack__raw_data *pdata, int skip); + +/** + * Compare 2 raw stacktraces with the usual -1,0,+1 result. + * This includes any "aux_id" values in the comparison, so that + * our de-dup is also "aux" context relative. + */ +int git_win32__stack_compare( + git_win32__stack__raw_data *d1, + git_win32__stack__raw_data *d2); + +/** + * Format raw stacktrace data into buffer WITHOUT using any mallocs. + * + * @param prefix String written before each frame; defaults to "\t". + * @param suffix String written after each frame; defaults to "\n". + */ +int git_win32__stack_format( + char *pbuf, int buf_len, + const git_win32__stack__raw_data *pdata, + const char *prefix, const char *suffix); + +/** + * Convenience routine to capture and format stacktrace into + * a buffer WITHOUT using any mallocs. This is primarily a + * wrapper for testing. + * + * @param skip Number of initial frames to skip. Pass 0 to + * begin with the caller of this routine. Pass 1 to begin + * with its caller. And so on. + * @param prefix String written before each frame; defaults to "\t". + * @param suffix String written after each frame; defaults to "\n". + */ +int git_win32__stack( + char * pbuf, int buf_len, + int skip, + const char *prefix, const char *suffix); + +#endif /* GIT_MSVC_CRTDBG */ +#endif /* INCLUDE_w32_stack_h__ */ diff --git a/vendor/libgit2/src/win32/w32_util.c b/vendor/libgit2/src/win32/w32_util.c index 2e52525d5..60311bb50 100644 --- a/vendor/libgit2/src/win32/w32_util.c +++ b/vendor/libgit2/src/win32/w32_util.c @@ -48,10 +48,10 @@ bool git_win32__findfirstfile_filter(git_win32_path dest, const char *src) * @param path The path which should receive the +H bit. * @return 0 on success; -1 on failure */ -int git_win32__sethidden(const char *path) +int git_win32__set_hidden(const char *path, bool hidden) { git_win32_path buf; - DWORD attrs; + DWORD attrs, newattrs; if (git_win32_path_from_utf8(buf, path) < 0) return -1; @@ -62,11 +62,35 @@ int git_win32__sethidden(const char *path) if (attrs == INVALID_FILE_ATTRIBUTES) return -1; - /* If the item isn't already +H, add the bit */ - if ((attrs & FILE_ATTRIBUTE_HIDDEN) == 0 && - !SetFileAttributesW(buf, attrs | FILE_ATTRIBUTE_HIDDEN)) + if (hidden) + newattrs = attrs | FILE_ATTRIBUTE_HIDDEN; + else + newattrs = attrs & ~FILE_ATTRIBUTE_HIDDEN; + + if (attrs != newattrs && !SetFileAttributesW(buf, newattrs)) { + giterr_set(GITERR_OS, "Failed to %s hidden bit for '%s'", + hidden ? "set" : "unset", path); + return -1; + } + + return 0; +} + +int git_win32__hidden(bool *out, const char *path) +{ + git_win32_path buf; + DWORD attrs; + + if (git_win32_path_from_utf8(buf, path) < 0) + return -1; + + attrs = GetFileAttributesW(buf); + + /* Ensure the path exists */ + if (attrs == INVALID_FILE_ATTRIBUTES) return -1; + *out = (attrs & FILE_ATTRIBUTE_HIDDEN) ? true : false; return 0; } diff --git a/vendor/libgit2/src/win32/w32_util.h b/vendor/libgit2/src/win32/w32_util.h index 377d651a8..2e475e5e9 100644 --- a/vendor/libgit2/src/win32/w32_util.h +++ b/vendor/libgit2/src/win32/w32_util.h @@ -40,12 +40,22 @@ GIT_INLINE(bool) git_win32__isalpha(wchar_t c) bool git_win32__findfirstfile_filter(git_win32_path dest, const char *src); /** - * Ensures the given path (file or folder) has the +H (hidden) attribute set. + * Ensures the given path (file or folder) has the +H (hidden) attribute set + * or unset. * - * @param path The path which should receive the +H bit. + * @param path The path that should receive the +H bit. + * @param hidden true to set +H, false to unset it * @return 0 on success; -1 on failure */ -int git_win32__sethidden(const char *path); +extern int git_win32__set_hidden(const char *path, bool hidden); + +/** + * Determines if the given file or folder has the hidden attribute set. + * @param hidden pointer to store hidden value + * @param path The path that should be queried for hiddenness. + * @return 0 on success or an error code. + */ +extern int git_win32__hidden(bool *hidden, const char *path); /** * Removes any trailing backslashes from a path, except in the case of a drive @@ -66,21 +76,27 @@ size_t git_win32__path_trim_end(wchar_t *str, size_t len); size_t git_win32__canonicalize_path(wchar_t *str, size_t len); /** - * Converts a FILETIME structure to a time_t. + * Converts a FILETIME structure to a struct timespec. * * @param FILETIME A pointer to a FILETIME - * @return A time_t containing the same time + * @param ts A pointer to the timespec structure to fill in */ -GIT_INLINE(time_t) git_win32__filetime_to_time_t(const FILETIME *ft) +GIT_INLINE(void) git_win32__filetime_to_timespec( + const FILETIME *ft, + struct timespec *ts) { long long winTime = ((long long)ft->dwHighDateTime << 32) + ft->dwLowDateTime; winTime -= 116444736000000000LL; /* Windows to Unix Epoch conversion */ - winTime /= 10000000; /* Nano to seconds resolution */ - return (time_t)winTime; + ts->tv_sec = (time_t)(winTime / 10000000); +#ifdef GIT_USE_NSEC + ts->tv_nsec = (winTime % 10000000) * 100; +#else + ts->tv_nsec = 0; +#endif } GIT_INLINE(void) git_win32__timeval_to_filetime( - FILETIME *ft, const struct timeval tv) + FILETIME *ft, const struct p_timeval tv) { long long ticks = (tv.tv_sec * 10000000LL) + (tv.tv_usec * 10LL) + 116444736000000000LL; @@ -89,19 +105,25 @@ GIT_INLINE(void) git_win32__timeval_to_filetime( ft->dwLowDateTime = (ticks & 0xffffffffLL); } -GIT_INLINE(int) git_win32__file_attribute_to_stat( +GIT_INLINE(void) git_win32__stat_init( struct stat *st, - const WIN32_FILE_ATTRIBUTE_DATA *attrdata, - const wchar_t *path) + DWORD dwFileAttributes, + DWORD nFileSizeHigh, + DWORD nFileSizeLow, + FILETIME ftCreationTime, + FILETIME ftLastAccessTime, + FILETIME ftLastWriteTime) { mode_t mode = S_IREAD; - if (attrdata->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + memset(st, 0, sizeof(struct stat)); + + if (dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) mode |= S_IFDIR; else mode |= S_IFREG; - if ((attrdata->dwFileAttributes & FILE_ATTRIBUTE_READONLY) == 0) + if ((dwFileAttributes & FILE_ATTRIBUTE_READONLY) == 0) mode |= S_IWRITE; st->st_ino = 0; @@ -109,12 +131,39 @@ GIT_INLINE(int) git_win32__file_attribute_to_stat( st->st_uid = 0; st->st_nlink = 1; st->st_mode = mode; - st->st_size = ((git_off_t)attrdata->nFileSizeHigh << 32) + attrdata->nFileSizeLow; + st->st_size = ((git_off_t)nFileSizeHigh << 32) + nFileSizeLow; st->st_dev = _getdrive() - 1; st->st_rdev = st->st_dev; - st->st_atime = git_win32__filetime_to_time_t(&(attrdata->ftLastAccessTime)); - st->st_mtime = git_win32__filetime_to_time_t(&(attrdata->ftLastWriteTime)); - st->st_ctime = git_win32__filetime_to_time_t(&(attrdata->ftCreationTime)); + git_win32__filetime_to_timespec(&ftLastAccessTime, &(st->st_atim)); + git_win32__filetime_to_timespec(&ftLastWriteTime, &(st->st_mtim)); + git_win32__filetime_to_timespec(&ftCreationTime, &(st->st_ctim)); +} + +GIT_INLINE(void) git_win32__file_information_to_stat( + struct stat *st, + const BY_HANDLE_FILE_INFORMATION *fileinfo) +{ + git_win32__stat_init(st, + fileinfo->dwFileAttributes, + fileinfo->nFileSizeHigh, + fileinfo->nFileSizeLow, + fileinfo->ftCreationTime, + fileinfo->ftLastAccessTime, + fileinfo->ftLastWriteTime); +} + +GIT_INLINE(int) git_win32__file_attribute_to_stat( + struct stat *st, + const WIN32_FILE_ATTRIBUTE_DATA *attrdata, + const wchar_t *path) +{ + git_win32__stat_init(st, + attrdata->dwFileAttributes, + attrdata->nFileSizeHigh, + attrdata->nFileSizeLow, + attrdata->ftCreationTime, + attrdata->ftLastAccessTime, + attrdata->ftLastWriteTime); if (attrdata->dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT && path) { git_win32_path target; @@ -123,7 +172,7 @@ GIT_INLINE(int) git_win32__file_attribute_to_stat( st->st_mode = (st->st_mode & ~S_IFMT) | S_IFLNK; /* st_size gets the UTF-8 length of the target name, in bytes, - * not counting the NULL terminator */ + * not counting the NULL terminator */ if ((st->st_size = git__utf16_to_8(NULL, 0, target)) < 0) { giterr_set(GITERR_OS, "Could not convert reparse point name for '%s'", path); return -1; diff --git a/vendor/libgit2/src/win32/win32-compat.h b/vendor/libgit2/src/win32/win32-compat.h new file mode 100644 index 000000000..f888fd69e --- /dev/null +++ b/vendor/libgit2/src/win32/win32-compat.h @@ -0,0 +1,52 @@ +/* + * Copyright (C) the libgit2 contributors. All rights reserved. + * + * This file is part of libgit2, distributed under the GNU GPL v2 with + * a Linking Exception. For full terms see the included COPYING file. + */ +#ifndef INCLUDE_win32_compat__ +#define INCLUDE_win32_compat__ + +#include +#include +#include +#include +#include + +typedef long suseconds_t; + +struct p_timeval { + time_t tv_sec; + suseconds_t tv_usec; +}; + +struct p_timespec { + time_t tv_sec; + long tv_nsec; +}; + +#define timespec p_timespec + +struct p_stat { + _dev_t st_dev; + _ino_t st_ino; + mode_t st_mode; + short st_nlink; + short st_uid; + short st_gid; + _dev_t st_rdev; + __int64 st_size; + struct timespec st_atim; + struct timespec st_mtim; + struct timespec st_ctim; +#define st_atime st_atim.tv_sec +#define st_mtime st_mtim.tv_sec +#define st_ctime st_ctim.tv_sec +#define st_atime_nsec st_atim.tv_nsec +#define st_mtime_nsec st_mtim.tv_nsec +#define st_ctime_nsec st_ctim.tv_nsec +}; + +#define stat p_stat + +#endif /* INCLUDE_win32_compat__ */ diff --git a/vendor/libgit2/src/xdiff/xmerge.c b/vendor/libgit2/src/xdiff/xmerge.c index 7b7e0e2d3..6448b5542 100644 --- a/vendor/libgit2/src/xdiff/xmerge.c +++ b/vendor/libgit2/src/xdiff/xmerge.c @@ -633,8 +633,11 @@ int xdl_merge(mmfile_t *orig, mmfile_t *mf1, mmfile_t *mf2, result->ptr = NULL; result->size = 0; - if (xdl_do_diff(orig, mf1, xpp, &xe1) < 0 || - xdl_do_diff(orig, mf2, xpp, &xe2) < 0) { + if (xdl_do_diff(orig, mf1, xpp, &xe1) < 0) { + return -1; + } + if (xdl_do_diff(orig, mf2, xpp, &xe2) < 0) { + xdl_free_env(&xe1); return -1; } if (xdl_change_compact(&xe1.xdf1, &xe1.xdf2, xpp->flags) < 0 || @@ -646,6 +649,8 @@ int xdl_merge(mmfile_t *orig, mmfile_t *mf1, mmfile_t *mf2, if (xdl_change_compact(&xe2.xdf1, &xe2.xdf2, xpp->flags) < 0 || xdl_change_compact(&xe2.xdf2, &xe2.xdf1, xpp->flags) < 0 || xdl_build_script(&xe2, &xscr2) < 0) { + xdl_free_script(xscr1); + xdl_free_env(&xe1); xdl_free_env(&xe2); return -1; } diff --git a/vendor/libgit2/src/xdiff/xprepare.c b/vendor/libgit2/src/xdiff/xprepare.c index 63a22c630..13b55aba7 100644 --- a/vendor/libgit2/src/xdiff/xprepare.c +++ b/vendor/libgit2/src/xdiff/xprepare.c @@ -301,10 +301,11 @@ int xdl_prepare_env(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, xdl_free_ctx(&xe->xdf2); xdl_free_ctx(&xe->xdf1); + xdl_free_classifier(&cf); return -1; } - if (!(xpp->flags & XDF_HISTOGRAM_DIFF)) + if (XDF_DIFF_ALG(xpp->flags) != XDF_HISTOGRAM_DIFF) xdl_free_classifier(&cf); return 0; diff --git a/vendor/libgit2/tests/attr/ignore.c b/vendor/libgit2/tests/attr/ignore.c index 27fed2539..91bf984a1 100644 --- a/vendor/libgit2/tests/attr/ignore.c +++ b/vendor/libgit2/tests/attr/ignore.c @@ -252,3 +252,16 @@ void test_attr_ignore__dont_ignore_files_for_folder(void) if (cl_repo_get_bool(g_repo, "core.ignorecase")) assert_is_ignored(false, "dir/TeSt"); } + +void test_attr_ignore__symlink_to_outside(void) +{ +#ifdef GIT_WIN32 + cl_skip(); +#endif + + cl_git_rewritefile("attr/.gitignore", "symlink\n"); + cl_git_mkfile("target", "target"); + cl_git_pass(p_symlink("../target", "attr/symlink")); + assert_is_ignored(true, "symlink"); + assert_is_ignored(true, "lala/../symlink"); +} diff --git a/vendor/libgit2/tests/blame/blame_helpers.c b/vendor/libgit2/tests/blame/blame_helpers.c index b305ba1e3..61e87350c 100644 --- a/vendor/libgit2/tests/blame/blame_helpers.c +++ b/vendor/libgit2/tests/blame/blame_helpers.c @@ -4,7 +4,7 @@ void hunk_message(size_t idx, const git_blame_hunk *hunk, const char *fmt, ...) { va_list arglist; - printf("Hunk %"PRIuZ" (line %d +%d): ", idx, + printf("Hunk %"PRIuZ" (line %"PRIuZ" +%"PRIuZ"): ", idx, hunk->final_start_line_number, hunk->lines_in_hunk-1); va_start(arglist, fmt); @@ -15,7 +15,7 @@ void hunk_message(size_t idx, const git_blame_hunk *hunk, const char *fmt, ...) } void check_blame_hunk_index(git_repository *repo, git_blame *blame, int idx, - int start_line, int len, char boundary, const char *commit_id, const char *orig_path) + size_t start_line, size_t len, char boundary, const char *commit_id, const char *orig_path) { char expected[GIT_OID_HEXSZ+1] = {0}, actual[GIT_OID_HEXSZ+1] = {0}; const git_blame_hunk *hunk = git_blame_get_hunk_byindex(blame, idx); diff --git a/vendor/libgit2/tests/blame/blame_helpers.h b/vendor/libgit2/tests/blame/blame_helpers.h index 94321a5b5..fd5a35d2c 100644 --- a/vendor/libgit2/tests/blame/blame_helpers.h +++ b/vendor/libgit2/tests/blame/blame_helpers.h @@ -7,10 +7,8 @@ void check_blame_hunk_index( git_repository *repo, git_blame *blame, int idx, - int start_line, - int len, + size_t start_line, + size_t len, char boundary, const char *commit_id, const char *orig_path); - - diff --git a/vendor/libgit2/tests/blame/simple.c b/vendor/libgit2/tests/blame/simple.c index 83e5e056b..30b78168f 100644 --- a/vendor/libgit2/tests/blame/simple.c +++ b/vendor/libgit2/tests/blame/simple.c @@ -281,6 +281,18 @@ void test_blame_simple__can_restrict_lines_both(void) check_blame_hunk_index(g_repo, g_blame, 2, 6, 2, 0, "63d671eb", "b.txt"); } +void test_blame_simple__can_blame_huge_file(void) +{ + git_blame_options opts = GIT_BLAME_OPTIONS_INIT; + + cl_git_pass(git_repository_open(&g_repo, cl_fixture("blametest.git"))); + + cl_git_pass(git_blame_file(&g_blame, g_repo, "huge.txt", &opts)); + cl_assert_equal_i(2, git_blame_get_hunk_count(g_blame)); + check_blame_hunk_index(g_repo, g_blame, 0, 1, 65536, 0, "4eecfea", "huge.txt"); + check_blame_hunk_index(g_repo, g_blame, 1, 65537, 1, 0, "6653ff4", "huge.txt"); +} + /* * $ git blame -n branch_file.txt be3563a..HEAD * orig line no final line no diff --git a/vendor/libgit2/tests/checkout/checkout_helpers.c b/vendor/libgit2/tests/checkout/checkout_helpers.c index 92a454d12..d7d24f33f 100644 --- a/vendor/libgit2/tests/checkout/checkout_helpers.c +++ b/vendor/libgit2/tests/checkout/checkout_helpers.c @@ -132,8 +132,8 @@ int checkout_count_callback( void tick_index(git_index *index) { - git_time_t ts; - struct timeval times[2]; + struct timespec ts; + struct p_timeval times[2]; cl_assert(index->on_disk); cl_assert(git_index_path(index)); @@ -141,10 +141,10 @@ void tick_index(git_index *index) cl_git_pass(git_index_read(index, true)); ts = index->stamp.mtime; - times[0].tv_sec = ts; - times[0].tv_usec = 0; - times[1].tv_sec = ts + 5; - times[1].tv_usec = 0; + times[0].tv_sec = ts.tv_sec; + times[0].tv_usec = ts.tv_nsec / 1000; + times[1].tv_sec = ts.tv_sec + 5; + times[1].tv_usec = ts.tv_nsec / 1000; cl_git_pass(p_utimes(git_index_path(index), times)); cl_git_pass(git_index_read(index, true)); diff --git a/vendor/libgit2/tests/checkout/crlf.c b/vendor/libgit2/tests/checkout/crlf.c index 8e77d0845..d467eaadd 100644 --- a/vendor/libgit2/tests/checkout/crlf.c +++ b/vendor/libgit2/tests/checkout/crlf.c @@ -278,6 +278,7 @@ void test_checkout_crlf__autocrlf_true_index_size_is_filtered_size(void) void test_checkout_crlf__with_ident(void) { git_index *index; + const git_index_entry *entry; git_blob *blob; git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; opts.checkout_strategy = GIT_CHECKOUT_FORCE; @@ -310,14 +311,14 @@ void test_checkout_crlf__with_ident(void) /* check that blobs have $Id$ */ - cl_git_pass(git_blob_lookup(&blob, g_repo, - & git_index_get_bypath(index, "lf.ident", 0)->id)); + cl_assert((entry = git_index_get_bypath(index, "lf.ident", 0))); + cl_git_pass(git_blob_lookup(&blob, g_repo, &entry->id)); cl_assert_equal_s( ALL_LF_TEXT_RAW "\n$Id$\n", git_blob_rawcontent(blob)); git_blob_free(blob); - cl_git_pass(git_blob_lookup(&blob, g_repo, - & git_index_get_bypath(index, "more2.identcrlf", 0)->id)); + cl_assert((entry = git_index_get_bypath(index, "more2.identcrlf", 0))); + cl_git_pass(git_blob_lookup(&blob, g_repo, &entry->id)); cl_assert_equal_s( "\n$Id$\n" MORE_CRLF_TEXT_AS_LF, git_blob_rawcontent(blob)); git_blob_free(blob); diff --git a/vendor/libgit2/tests/checkout/index.c b/vendor/libgit2/tests/checkout/index.c index 0d220e141..8af3e5684 100644 --- a/vendor/libgit2/tests/checkout/index.c +++ b/vendor/libgit2/tests/checkout/index.c @@ -63,7 +63,7 @@ void test_checkout_index__can_remove_untracked_files(void) { git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - git_futils_mkdir("./testrepo/dir/subdir/subsubdir", NULL, 0755, GIT_MKDIR_PATH); + git_futils_mkdir("./testrepo/dir/subdir/subsubdir", 0755, GIT_MKDIR_PATH); cl_git_mkfile("./testrepo/dir/one", "one\n"); cl_git_mkfile("./testrepo/dir/subdir/two", "two\n"); @@ -298,7 +298,7 @@ void test_checkout_index__options_dir_modes(void) /* File-mode test, since we're on the 'dir' branch */ cl_git_pass(p_stat("./testrepo/a/b.txt", &st)); - cl_assert_equal_i_fmt(st.st_mode, GIT_FILEMODE_BLOB_EXECUTABLE, "%07o"); + cl_assert_equal_i_fmt(st.st_mode, GIT_FILEMODE_BLOB_EXECUTABLE & ~um, "%07o"); git_commit_free(commit); } diff --git a/vendor/libgit2/tests/cherrypick/workdir.c b/vendor/libgit2/tests/cherrypick/workdir.c index 787f1f4d4..2b45f5a33 100644 --- a/vendor/libgit2/tests/cherrypick/workdir.c +++ b/vendor/libgit2/tests/cherrypick/workdir.c @@ -300,7 +300,7 @@ void test_cherrypick_workdir__rename(void) { 0100644, "28d9eb4208074ad1cc84e71ccc908b34573f05d2", 0, "file3.txt.renamed" }, }; - opts.merge_opts.tree_flags |= GIT_MERGE_TREE_FIND_RENAMES; + opts.merge_opts.flags |= GIT_MERGE_FIND_RENAMES; opts.merge_opts.rename_threshold = 50; git_oid_fromstr(&head_oid, "cfc4f0999a8367568e049af4f72e452d40828a15"); @@ -335,7 +335,7 @@ void test_cherrypick_workdir__both_renamed(void) { 0100644, "28d9eb4208074ad1cc84e71ccc908b34573f05d2", 2, "file3.txt.renamed_on_branch" }, }; - opts.merge_opts.tree_flags |= GIT_MERGE_TREE_FIND_RENAMES; + opts.merge_opts.flags |= GIT_MERGE_FIND_RENAMES; opts.merge_opts.rename_threshold = 50; git_oid_fromstr(&head_oid, "44cd2ed2052c9c68f9a439d208e9614dc2a55c70"); diff --git a/vendor/libgit2/tests/clar_libgit2.c b/vendor/libgit2/tests/clar_libgit2.c index b14af44a9..314d3441e 100644 --- a/vendor/libgit2/tests/clar_libgit2.c +++ b/vendor/libgit2/tests/clar_libgit2.c @@ -58,31 +58,38 @@ void cl_git_rmfile(const char *filename) cl_must_pass(p_unlink(filename)); } -#ifdef GIT_WIN32 - -#include "win32/utf-conv.h" - char *cl_getenv(const char *name) { - wchar_t *wide_name, *wide_value; - char *utf8_value = NULL; - DWORD value_len; + git_buf out = GIT_BUF_INIT; + int error = git__getenv(&out, name); - cl_assert(git__utf8_to_16_alloc(&wide_name, name) >= 0); + cl_assert(error >= 0 || error == GIT_ENOTFOUND); + + if (error == GIT_ENOTFOUND) + return NULL; - value_len = GetEnvironmentVariableW(wide_name, NULL, 0); + if (out.size == 0) { + char *dup = git__strdup(""); + cl_assert(dup); - if (value_len) { - cl_assert(wide_value = git__malloc(value_len * sizeof(wchar_t))); - cl_assert(GetEnvironmentVariableW(wide_name, wide_value, value_len)); - cl_assert(git__utf16_to_8_alloc(&utf8_value, wide_value) >= 0); - git__free(wide_value); + return dup; } - git__free(wide_name); - return utf8_value; + return git_buf_detach(&out); +} + +bool cl_is_env_set(const char *name) +{ + char *env = cl_getenv(name); + bool result = (env != NULL); + git__free(env); + return result; } +#ifdef GIT_WIN32 + +#include "win32/utf-conv.h" + int cl_setenv(const char *name, const char *value) { wchar_t *wide_name, *wide_value = NULL; @@ -138,10 +145,6 @@ int cl_rename(const char *source, const char *dest) #else #include -char *cl_getenv(const char *name) -{ - return getenv(name); -} int cl_setenv(const char *name, const char *value) { @@ -296,6 +299,8 @@ const char* cl_git_path_url(const char *path) in_buf++; } + cl_assert(url_buf.size < 4096); + strncpy(url, git_buf_cstr(&url_buf), 4096); git_buf_free(&url_buf); git_buf_free(&path_buf); @@ -536,14 +541,23 @@ void cl_fake_home(void) void cl_sandbox_set_search_path_defaults(void) { - const char *sandbox_path = clar_sandbox_path(); + git_buf path = GIT_BUF_INIT; + + git_buf_joinpath(&path, clar_sandbox_path(), "__config"); + + if (!git_path_exists(path.ptr)) + cl_must_pass(p_mkdir(path.ptr, 0777)); git_libgit2_opts( - GIT_OPT_SET_SEARCH_PATH, GIT_CONFIG_LEVEL_GLOBAL, sandbox_path); + GIT_OPT_SET_SEARCH_PATH, GIT_CONFIG_LEVEL_GLOBAL, path.ptr); git_libgit2_opts( - GIT_OPT_SET_SEARCH_PATH, GIT_CONFIG_LEVEL_XDG, sandbox_path); + GIT_OPT_SET_SEARCH_PATH, GIT_CONFIG_LEVEL_XDG, path.ptr); git_libgit2_opts( - GIT_OPT_SET_SEARCH_PATH, GIT_CONFIG_LEVEL_SYSTEM, sandbox_path); + GIT_OPT_SET_SEARCH_PATH, GIT_CONFIG_LEVEL_SYSTEM, path.ptr); + git_libgit2_opts( + GIT_OPT_SET_SEARCH_PATH, GIT_CONFIG_LEVEL_PROGRAMDATA, path.ptr); + + git_buf_free(&path); } #ifdef GIT_WIN32 diff --git a/vendor/libgit2/tests/clar_libgit2.h b/vendor/libgit2/tests/clar_libgit2.h index 9ab0da4f6..d7e635302 100644 --- a/vendor/libgit2/tests/clar_libgit2.h +++ b/vendor/libgit2/tests/clar_libgit2.h @@ -119,6 +119,7 @@ bool cl_is_chmod_supported(void); /* Environment wrappers */ char *cl_getenv(const char *name); +bool cl_is_env_set(const char *name); int cl_setenv(const char *name, const char *value); /* Reliable rename */ diff --git a/vendor/libgit2/tests/clar_libgit2_trace.c b/vendor/libgit2/tests/clar_libgit2_trace.c index ae582d1cb..aaeeb7810 100644 --- a/vendor/libgit2/tests/clar_libgit2_trace.c +++ b/vendor/libgit2/tests/clar_libgit2_trace.c @@ -142,9 +142,28 @@ void _cl_trace_cb__event_handler( switch (ev) { case CL_TRACE__SUITE_BEGIN: git_trace(GIT_TRACE_TRACE, "\n\n%s\n%s: Begin Suite", HR, suite_name); +#if 0 && defined(GIT_MSVC_CRTDBG) + git_win32__crtdbg_stacktrace__dump( + GIT_WIN32__CRTDBG_STACKTRACE__SET_MARK, + suite_name); +#endif break; case CL_TRACE__SUITE_END: +#if 0 && defined(GIT_MSVC_CRTDBG) + /* As an example of checkpointing, dump leaks within this suite. + * This may generate false positives for things like the global + * TLS error state and maybe the odb cache since they aren't + * freed until the global shutdown and outside the scope of this + * set of tests. + * + * This may under-report if the test itself uses a checkpoint. + * See tests/trace/windows/stacktrace.c + */ + git_win32__crtdbg_stacktrace__dump( + GIT_WIN32__CRTDBG_STACKTRACE__LEAKS_SINCE_MARK, + suite_name); +#endif git_trace(GIT_TRACE_TRACE, "\n\n%s: End Suite\n%s", suite_name, HR); break; diff --git a/vendor/libgit2/tests/clone/nonetwork.c b/vendor/libgit2/tests/clone/nonetwork.c index 44a503818..7ebf19f46 100644 --- a/vendor/libgit2/tests/clone/nonetwork.c +++ b/vendor/libgit2/tests/clone/nonetwork.c @@ -297,16 +297,19 @@ static void assert_correct_reflog(const char *name) { git_reflog *log; const git_reflog_entry *entry; - char expected_log_message[128] = {0}; + git_buf expected_message = GIT_BUF_INIT; - sprintf(expected_log_message, "clone: from %s", cl_git_fixture_url("testrepo.git")); + git_buf_printf(&expected_message, + "clone: from %s", cl_git_fixture_url("testrepo.git")); cl_git_pass(git_reflog_read(&log, g_repo, name)); cl_assert_equal_i(1, git_reflog_entrycount(log)); entry = git_reflog_entry_byindex(log, 0); - cl_assert_equal_s(expected_log_message, git_reflog_entry_message(entry)); + cl_assert_equal_s(expected_message.ptr, git_reflog_entry_message(entry)); git_reflog_free(log); + + git_buf_free(&expected_message); } void test_clone_nonetwork__clone_updates_reflog_properly(void) diff --git a/vendor/libgit2/tests/commit/commit.c b/vendor/libgit2/tests/commit/commit.c index f5461cfd3..c052cd568 100644 --- a/vendor/libgit2/tests/commit/commit.c +++ b/vendor/libgit2/tests/commit/commit.c @@ -63,6 +63,18 @@ void assert_commit_summary(const char *expected, const char *given) git_commit__free(dummy); } +void assert_commit_body(const char *expected, const char *given) +{ + git_commit *dummy; + + cl_assert(dummy = git__calloc(1, sizeof(struct git_commit))); + + dummy->raw_message = git__strdup(given); + cl_assert_equal_s(expected, git_commit_body(dummy)); + + git_commit__free(dummy); +} + void test_commit_commit__summary(void) { assert_commit_summary("One-liner with no trailing newline", "One-liner with no trailing newline"); @@ -70,14 +82,45 @@ void test_commit_commit__summary(void) assert_commit_summary("Trimmed leading&trailing newlines", "\n\nTrimmed leading&trailing newlines\n\n"); assert_commit_summary("First paragraph only", "\nFirst paragraph only\n\n(There are more!)"); assert_commit_summary("First paragraph with unwrapped trailing\tlines", "\nFirst paragraph\nwith unwrapped\ntrailing\tlines\n\n(Yes, unwrapped!)"); - assert_commit_summary("\tLeading \ttabs", "\tLeading\n\ttabs\n\nis preserved"); - assert_commit_summary(" Leading Spaces", " Leading\n Spaces\n\nare preserved"); + assert_commit_summary("\tLeading tabs", "\tLeading\n\ttabs\n\nare preserved"); /* tabs around newlines are collapsed down to a single space */ + assert_commit_summary(" Leading Spaces", " Leading\n Spaces\n\nare preserved"); /* spaces around newlines are collapsed down to a single space */ assert_commit_summary("Trailing tabs\tare removed", "Trailing tabs\tare removed\t\t"); assert_commit_summary("Trailing spaces are removed", "Trailing spaces are removed "); assert_commit_summary("Trailing tabs", "Trailing tabs\t\n\nare removed"); assert_commit_summary("Trailing spaces", "Trailing spaces \n\nare removed"); + assert_commit_summary("Newlines are replaced by spaces", "Newlines\nare\nreplaced by spaces\n"); + assert_commit_summary(" Spaces after newlines are collapsed", "\n Spaces after newlines\n are\n collapsed\n "); /* newlines at the very beginning are ignored and not collapsed */ + assert_commit_summary(" Spaces before newlines are collapsed", " \nSpaces before newlines \nare \ncollapsed \n"); + assert_commit_summary(" Spaces around newlines are collapsed", " \n Spaces around newlines \n are \n collapsed \n "); + assert_commit_summary(" Trailing newlines are" , " \n Trailing newlines \n are \n\n collapsed \n "); + assert_commit_summary(" Trailing spaces are stripped", " \n Trailing spaces \n are stripped \n\n \n \t "); assert_commit_summary("", ""); assert_commit_summary("", " "); assert_commit_summary("", "\n"); assert_commit_summary("", "\n \n"); } + +void test_commit_commit__body(void) +{ + assert_commit_body(NULL, "One-liner with no trailing newline"); + assert_commit_body(NULL, "One-liner with trailing newline\n"); + assert_commit_body(NULL, "\n\nTrimmed leading&trailing newlines\n\n"); + assert_commit_body("(There are more!)", "\nFirst paragraph only\n\n(There are more!)"); + assert_commit_body("(Yes, unwrapped!)", "\nFirst paragraph\nwith unwrapped\ntrailing\tlines\n\n(Yes, unwrapped!)"); + assert_commit_body("are preserved", "\tLeading\n\ttabs\n\nare preserved"); /* tabs around newlines are collapsed down to a single space */ + assert_commit_body("are preserved", " Leading\n Spaces\n\nare preserved"); /* spaces around newlines are collapsed down to a single space */ + assert_commit_body(NULL, "Trailing tabs\tare removed\t\t"); + assert_commit_body(NULL, "Trailing spaces are removed "); + assert_commit_body("are removed", "Trailing tabs\t\n\nare removed"); + assert_commit_body("are removed", "Trailing spaces \n\nare removed"); + assert_commit_body(NULL,"Newlines\nare\nreplaced by spaces\n"); + assert_commit_body(NULL , "\n Spaces after newlines\n are\n collapsed\n "); /* newlines at the very beginning are ignored and not collapsed */ + assert_commit_body(NULL , " \nSpaces before newlines \nare \ncollapsed \n"); + assert_commit_body(NULL , " \n Spaces around newlines \n are \n collapsed \n "); + assert_commit_body("collapsed" , " \n Trailing newlines \n are \n\n collapsed \n "); + assert_commit_body(NULL, " \n Trailing spaces \n are stripped \n\n \n \t "); + assert_commit_body(NULL , ""); + assert_commit_body(NULL , " "); + assert_commit_body(NULL , "\n"); + assert_commit_body(NULL , "\n \n"); +} diff --git a/vendor/libgit2/tests/commit/parse.c b/vendor/libgit2/tests/commit/parse.c index 388da078a..297fccc6b 100644 --- a/vendor/libgit2/tests/commit/parse.c +++ b/vendor/libgit2/tests/commit/parse.c @@ -443,16 +443,111 @@ cpxtDQQMGYFpXK/71stq\n\ cl_git_pass(parse_commit(&commit, passing_commit_cases[4])); + cl_git_pass(git_commit_header_field(&buf, commit, "tree")); + cl_assert_equal_s("6b79e22d69bf46e289df0345a14ca059dfc9bdf6", buf.ptr); + git_buf_clear(&buf); + cl_git_pass(git_commit_header_field(&buf, commit, "parent")); cl_assert_equal_s("34734e478d6cf50c27c9d69026d93974d052c454", buf.ptr); git_buf_clear(&buf); cl_git_pass(git_commit_header_field(&buf, commit, "gpgsig")); cl_assert_equal_s(gpgsig, buf.ptr); + git_buf_clear(&buf); cl_git_fail_with(GIT_ENOTFOUND, git_commit_header_field(&buf, commit, "awesomeness")); cl_git_fail_with(GIT_ENOTFOUND, git_commit_header_field(&buf, commit, "par")); + git_commit__free(commit); + cl_git_pass(parse_commit(&commit, passing_commit_cases[0])); + + cl_git_pass(git_commit_header_field(&buf, commit, "committer")); + cl_assert_equal_s("Vicent Marti 1273848544 +0200", buf.ptr); + git_buf_free(&buf); git_commit__free(commit); } + +void test_commit_parse__extract_signature(void) +{ + git_odb *odb; + git_oid commit_id; + git_buf signature = GIT_BUF_INIT, signed_data = GIT_BUF_INIT; + const char *gpgsig = "-----BEGIN PGP SIGNATURE-----\n\ +Version: GnuPG v1.4.12 (Darwin)\n\ +\n\ +iQIcBAABAgAGBQJQ+FMIAAoJEH+LfPdZDSs1e3EQAJMjhqjWF+WkGLHju7pTw2al\n\ +o6IoMAhv0Z/LHlWhzBd9e7JeCnanRt12bAU7yvYp9+Z+z+dbwqLwDoFp8LVuigl8\n\ +JGLcnwiUW3rSvhjdCp9irdb4+bhKUnKUzSdsR2CK4/hC0N2i/HOvMYX+BRsvqweq\n\ +AsAkA6dAWh+gAfedrBUkCTGhlNYoetjdakWqlGL1TiKAefEZrtA1TpPkGn92vbLq\n\ +SphFRUY9hVn1ZBWrT3hEpvAIcZag3rTOiRVT1X1flj8B2vGCEr3RrcwOIZikpdaW\n\ +who/X3xh/DGbI2RbuxmmJpxxP/8dsVchRJJzBwG+yhwU/iN3MlV2c5D69tls/Dok\n\ +6VbyU4lm/ae0y3yR83D9dUlkycOnmmlBAHKIZ9qUts9X7mWJf0+yy2QxJVpjaTGG\n\ +cmnQKKPeNIhGJk2ENnnnzjEve7L7YJQF6itbx5VCOcsGh3Ocb3YR7DMdWjt7f8pu\n\ +c6j+q1rP7EpE2afUN/geSlp5i3x8aXZPDj67jImbVCE/Q1X9voCtyzGJH7MXR0N9\n\ +ZpRF8yzveRfMH8bwAJjSOGAFF5XkcR/RNY95o+J+QcgBLdX48h+ZdNmUf6jqlu3J\n\ +7KmTXXQcOVpN6dD3CmRFsbjq+x6RHwa8u1iGn+oIkX908r97ckfB/kHKH7ZdXIJc\n\ +cpxtDQQMGYFpXK/71stq\n\ +=ozeK\n\ +-----END PGP SIGNATURE-----"; + + const char *data = "tree 6b79e22d69bf46e289df0345a14ca059dfc9bdf6\n\ +parent 34734e478d6cf50c27c9d69026d93974d052c454\n\ +author Ben Burkert 1358451456 -0800\n\ +committer Ben Burkert 1358451456 -0800\n\ +\n\ +a simple commit which works\n"; + + const char *oneline_signature = "tree 51832e6397b30309c8bcad9c55fa6ae67778f378\n\ +parent a1b6decaaac768b5e01e1b5dbf5b2cc081bed1eb\n\ +author Some User 1454537944 -0700\n\ +committer Some User 1454537944 -0700\n\ +gpgsig bad\n\ +\n\ +corrupt signature\n"; + + const char *oneline_data = "tree 51832e6397b30309c8bcad9c55fa6ae67778f378\n\ +parent a1b6decaaac768b5e01e1b5dbf5b2cc081bed1eb\n\ +author Some User 1454537944 -0700\n\ +committer Some User 1454537944 -0700\n\ +\n\ +corrupt signature\n"; + + + cl_git_pass(git_repository_odb__weakptr(&odb, g_repo)); + cl_git_pass(git_odb_write(&commit_id, odb, passing_commit_cases[4], strlen(passing_commit_cases[4]), GIT_OBJ_COMMIT)); + + cl_git_pass(git_commit_extract_signature(&signature, &signed_data, g_repo, &commit_id, NULL)); + cl_assert_equal_s(gpgsig, signature.ptr); + cl_assert_equal_s(data, signed_data.ptr); + + git_buf_clear(&signature); + git_buf_clear(&signed_data); + + cl_git_pass(git_commit_extract_signature(&signature, &signed_data, g_repo, &commit_id, "gpgsig")); + cl_assert_equal_s(gpgsig, signature.ptr); + cl_assert_equal_s(data, signed_data.ptr); + + /* Try to parse a tree */ + cl_git_pass(git_oid_fromstr(&commit_id, "45dd856fdd4d89b884c340ba0e047752d9b085d6")); + cl_git_fail_with(GIT_ENOTFOUND, git_commit_extract_signature(&signature, &signed_data, g_repo, &commit_id, NULL)); + cl_assert_equal_i(GITERR_INVALID, giterr_last()->klass); + + /* Try to parse an unsigned commit */ + cl_git_pass(git_odb_write(&commit_id, odb, passing_commit_cases[1], strlen(passing_commit_cases[1]), GIT_OBJ_COMMIT)); + cl_git_fail_with(GIT_ENOTFOUND, git_commit_extract_signature(&signature, &signed_data, g_repo, &commit_id, NULL)); + cl_assert_equal_i(GITERR_OBJECT, giterr_last()->klass); + + /* Parse the commit with a single-line signature */ + git_buf_clear(&signature); + git_buf_clear(&signed_data); + cl_git_pass(git_odb_write(&commit_id, odb, oneline_signature, strlen(oneline_signature), GIT_OBJ_COMMIT)); + cl_git_pass(git_commit_extract_signature(&signature, &signed_data, g_repo, &commit_id, NULL)); + cl_assert_equal_s("bad", signature.ptr); + cl_assert_equal_s(oneline_data, signed_data.ptr); + + + git_buf_free(&signature); + git_buf_free(&signed_data); + +} diff --git a/vendor/libgit2/tests/commit/write.c b/vendor/libgit2/tests/commit/write.c index ee9eb8237..96b7cc321 100644 --- a/vendor/libgit2/tests/commit/write.c +++ b/vendor/libgit2/tests/commit/write.c @@ -1,14 +1,16 @@ #include "clar_libgit2.h" +#include "git2/sys/commit.h" static const char *committer_name = "Vicent Marti"; static const char *committer_email = "vicent@github.com"; static const char *commit_message = "This commit has been created in memory\n\ This is a commit created in memory and it will be written back to disk\n"; -static const char *tree_oid = "1810dff58d8a660512d4832e740f692884338ccd"; +static const char *tree_id_str = "1810dff58d8a660512d4832e740f692884338ccd"; +static const char *parent_id_str = "8496071c1b46c854b31185ea97743be6a8774479"; static const char *root_commit_message = "This is a root commit\n\ This is a root commit and should be the only one in this branch\n"; static const char *root_reflog_message = "commit (initial): This is a root commit \ - This is a root commit and should be the only one in this branch"; +This is a root commit and should be the only one in this branch"; static char *head_old; static git_reference *head, *branch; static git_commit *commit; @@ -35,6 +37,8 @@ void test_commit_write__cleanup(void) head_old = NULL; cl_git_sandbox_cleanup(); + + cl_git_pass(git_libgit2_opts(GIT_OPT_ENABLE_STRICT_OBJECT_CREATION, 1)); } @@ -46,12 +50,11 @@ void test_commit_write__from_memory(void) const git_signature *author1, *committer1; git_commit *parent; git_tree *tree; - const char *commit_id_str = "8496071c1b46c854b31185ea97743be6a8774479"; - git_oid_fromstr(&tree_id, tree_oid); + git_oid_fromstr(&tree_id, tree_id_str); cl_git_pass(git_tree_lookup(&tree, g_repo, &tree_id)); - git_oid_fromstr(&parent_id, commit_id_str); + git_oid_fromstr(&parent_id, parent_id_str); cl_git_pass(git_commit_lookup(&parent, g_repo, &parent_id)); /* create signatures */ @@ -106,7 +109,7 @@ void test_commit_write__root(void) git_reflog *log; const git_reflog_entry *entry; - git_oid_fromstr(&tree_id, tree_oid); + git_oid_fromstr(&tree_id, tree_id_str); cl_git_pass(git_tree_lookup(&tree, g_repo, &tree_id)); /* create signatures */ @@ -158,3 +161,101 @@ void test_commit_write__root(void) git_signature_free(committer); git_reflog_free(log); } + +static int create_commit_from_ids( + git_oid *result, + const git_oid *tree_id, + const git_oid *parent_id) +{ + git_signature *author, *committer; + const git_oid *parent_ids[1]; + int ret; + + cl_git_pass(git_signature_new( + &committer, committer_name, committer_email, 123456789, 60)); + cl_git_pass(git_signature_new( + &author, committer_name, committer_email, 987654321, 90)); + + parent_ids[0] = parent_id; + + ret = git_commit_create_from_ids( + result, + g_repo, + NULL, + author, + committer, + NULL, + root_commit_message, + tree_id, + 1, + parent_ids); + + git_signature_free(committer); + git_signature_free(author); + + return ret; +} + +void test_commit_write__can_write_invalid_objects(void) +{ + git_oid expected_id, tree_id, parent_id, commit_id; + + cl_git_pass(git_libgit2_opts(GIT_OPT_ENABLE_STRICT_OBJECT_CREATION, 0)); + + /* this is a valid tree and parent */ + git_oid_fromstr(&tree_id, tree_id_str); + git_oid_fromstr(&parent_id, parent_id_str); + + git_oid_fromstr(&expected_id, "c8571bbec3a72c4bcad31648902e5a453f1adece"); + cl_git_pass(create_commit_from_ids(&commit_id, &tree_id, &parent_id)); + cl_assert_equal_oid(&expected_id, &commit_id); + + /* this is a wholly invented tree id */ + git_oid_fromstr(&tree_id, "1234567890123456789012345678901234567890"); + git_oid_fromstr(&parent_id, parent_id_str); + + git_oid_fromstr(&expected_id, "996008340b8e68d69bf3c28d7c57fb7ec3c8e202"); + cl_git_pass(create_commit_from_ids(&commit_id, &tree_id, &parent_id)); + cl_assert_equal_oid(&expected_id, &commit_id); + + /* this is a wholly invented parent id */ + git_oid_fromstr(&tree_id, tree_id_str); + git_oid_fromstr(&parent_id, "1234567890123456789012345678901234567890"); + + git_oid_fromstr(&expected_id, "d78f660cab89d9791ca6714b57978bf2a7e709fd"); + cl_git_pass(create_commit_from_ids(&commit_id, &tree_id, &parent_id)); + cl_assert_equal_oid(&expected_id, &commit_id); + + /* these are legitimate objects, but of the wrong type */ + git_oid_fromstr(&tree_id, parent_id_str); + git_oid_fromstr(&parent_id, tree_id_str); + + git_oid_fromstr(&expected_id, "5d80c07414e3f18792949699dfcacadf7748f361"); + cl_git_pass(create_commit_from_ids(&commit_id, &tree_id, &parent_id)); + cl_assert_equal_oid(&expected_id, &commit_id); +} + +void test_commit_write__can_validate_objects(void) +{ + git_oid tree_id, parent_id, commit_id; + + /* this is a valid tree and parent */ + git_oid_fromstr(&tree_id, tree_id_str); + git_oid_fromstr(&parent_id, parent_id_str); + cl_git_pass(create_commit_from_ids(&commit_id, &tree_id, &parent_id)); + + /* this is a wholly invented tree id */ + git_oid_fromstr(&tree_id, "1234567890123456789012345678901234567890"); + git_oid_fromstr(&parent_id, parent_id_str); + cl_git_fail(create_commit_from_ids(&commit_id, &tree_id, &parent_id)); + + /* this is a wholly invented parent id */ + git_oid_fromstr(&tree_id, tree_id_str); + git_oid_fromstr(&parent_id, "1234567890123456789012345678901234567890"); + cl_git_fail(create_commit_from_ids(&commit_id, &tree_id, &parent_id)); + + /* these are legitimate objects, but of the wrong type */ + git_oid_fromstr(&tree_id, parent_id_str); + git_oid_fromstr(&parent_id, tree_id_str); + cl_git_fail(create_commit_from_ids(&commit_id, &tree_id, &parent_id)); +} diff --git a/vendor/libgit2/tests/config/global.c b/vendor/libgit2/tests/config/global.c index 4481308d6..a149dc0be 100644 --- a/vendor/libgit2/tests/config/global.c +++ b/vendor/libgit2/tests/config/global.c @@ -6,17 +6,17 @@ void test_config_global__initialize(void) { git_buf path = GIT_BUF_INIT; - cl_git_pass(git_futils_mkdir_r("home", NULL, 0777)); + cl_git_pass(git_futils_mkdir_r("home", 0777)); cl_git_pass(git_path_prettify(&path, "home", NULL)); cl_git_pass(git_libgit2_opts( GIT_OPT_SET_SEARCH_PATH, GIT_CONFIG_LEVEL_GLOBAL, path.ptr)); - cl_git_pass(git_futils_mkdir_r("xdg/git", NULL, 0777)); + cl_git_pass(git_futils_mkdir_r("xdg/git", 0777)); cl_git_pass(git_path_prettify(&path, "xdg/git", NULL)); cl_git_pass(git_libgit2_opts( GIT_OPT_SET_SEARCH_PATH, GIT_CONFIG_LEVEL_XDG, path.ptr)); - cl_git_pass(git_futils_mkdir_r("etc", NULL, 0777)); + cl_git_pass(git_futils_mkdir_r("etc", 0777)); cl_git_pass(git_path_prettify(&path, "etc", NULL)); cl_git_pass(git_libgit2_opts( GIT_OPT_SET_SEARCH_PATH, GIT_CONFIG_LEVEL_SYSTEM, path.ptr)); @@ -65,3 +65,45 @@ void test_config_global__open_xdg(void) git_config_free(xdg); git_config_free(cfg); } + +void test_config_global__open_programdata(void) +{ + git_config *cfg; + git_repository *repo; + git_buf config_path = GIT_BUF_INIT; + git_buf var_contents = GIT_BUF_INIT; + + if (cl_is_env_set("GITTEST_INVASIVE_FS_STRUCTURE")) + cl_skip(); + + cl_git_pass(git_libgit2_opts(GIT_OPT_GET_SEARCH_PATH, + GIT_CONFIG_LEVEL_PROGRAMDATA, &config_path)); + + if (!git_path_isdir(config_path.ptr)) + cl_git_pass(p_mkdir(config_path.ptr, 0777)); + + cl_git_pass(git_buf_puts(&config_path, "/config")); + + cl_git_pass(git_config_open_ondisk(&cfg, config_path.ptr)); + cl_git_pass(git_config_set_string(cfg, "programdata.var", "even higher level")); + + git_buf_free(&config_path); + git_config_free(cfg); + + git_config_open_default(&cfg); + cl_git_pass(git_config_get_string_buf(&var_contents, cfg, "programdata.var")); + cl_assert_equal_s("even higher level", var_contents.ptr); + + git_config_free(cfg); + git_buf_free(&var_contents); + + cl_git_pass(git_repository_init(&repo, "./foo.git", true)); + cl_git_pass(git_repository_config(&cfg, repo)); + cl_git_pass(git_config_get_string_buf(&var_contents, cfg, "programdata.var")); + cl_assert_equal_s("even higher level", var_contents.ptr); + + git_config_free(cfg); + git_buf_free(&var_contents); + git_repository_free(repo); + cl_fixture_cleanup("./foo.git"); +} diff --git a/vendor/libgit2/tests/config/multivar.c b/vendor/libgit2/tests/config/multivar.c index 015008992..d1b8c4cda 100644 --- a/vendor/libgit2/tests/config/multivar.c +++ b/vendor/libgit2/tests/config/multivar.c @@ -163,7 +163,7 @@ void test_config_multivar__add_new(void) cl_git_pass(git_config_open_ondisk(&cfg, "config/config11")); - cl_git_pass(git_config_set_multivar(cfg, var, "", "variable")); + cl_git_pass(git_config_set_multivar(cfg, var, "$^", "variable")); n = 0; cl_git_pass(git_config_get_multivar_foreach(cfg, var, NULL, cb, &n)); cl_assert_equal_i(n, 1); diff --git a/vendor/libgit2/tests/config/stress.c b/vendor/libgit2/tests/config/stress.c index 503f44f03..a6b665590 100644 --- a/vendor/libgit2/tests/config/stress.c +++ b/vendor/libgit2/tests/config/stress.c @@ -107,3 +107,26 @@ void test_config_stress__complex(void) git_config_free(config); } + +void test_config_stress__quick_write(void) +{ + git_config *config_w, *config_r; + const char *path = "./config-quick-write"; + const char *key = "quick.write"; + int32_t i; + + /* Create an external writer for one instance with the other one */ + cl_git_pass(git_config_open_ondisk(&config_w, path)); + cl_git_pass(git_config_open_ondisk(&config_r, path)); + + /* Write and read in the same second (repeat to increase the chance of it happening) */ + for (i = 0; i < 10; i++) { + int32_t val; + cl_git_pass(git_config_set_int32(config_w, key, i)); + cl_git_pass(git_config_get_int32(&val, config_r, key)); + cl_assert_equal_i(i, val); + } + + git_config_free(config_r); + git_config_free(config_w); +} diff --git a/vendor/libgit2/tests/config/write.c b/vendor/libgit2/tests/config/write.c index 2e7b8182a..56ef2e9fb 100644 --- a/vendor/libgit2/tests/config/write.c +++ b/vendor/libgit2/tests/config/write.c @@ -1,6 +1,9 @@ #include "clar_libgit2.h" #include "buffer.h" #include "fileops.h" +#include "git2/sys/config.h" +#include "config_file.h" +#include "config.h" void test_config_write__initialize(void) { @@ -527,6 +530,9 @@ void test_config_write__outside_change(void) git_config_free(cfg); } +#define FOO_COMMENT \ + "; another comment!\n" + #define SECTION_FOO \ "\n" \ " \n" \ @@ -534,7 +540,8 @@ void test_config_write__outside_change(void) " # here's a comment\n" \ "\tname = \"value\"\n" \ " name2 = \"value2\"\n" \ - "; another comment!\n" + +#define SECTION_FOO_WITH_COMMENT SECTION_FOO FOO_COMMENT #define SECTION_BAR \ "[section \"bar\"]\t\n" \ @@ -550,7 +557,7 @@ void test_config_write__preserves_whitespace_and_comments(void) git_buf newfile = GIT_BUF_INIT; /* This config can occur after removing and re-adding the origin remote */ - const char *file_content = SECTION_FOO SECTION_BAR; + const char *file_content = SECTION_FOO_WITH_COMMENT SECTION_BAR; /* Write the test config and make sure the expected entry exists */ cl_git_mkfile(file_name, file_content); @@ -564,9 +571,10 @@ void test_config_write__preserves_whitespace_and_comments(void) cl_assert_equal_strn(SECTION_FOO, n, strlen(SECTION_FOO)); n += strlen(SECTION_FOO); - cl_assert_equal_strn("\tother = otherval\n", n, strlen("\tother = otherval\n")); n += strlen("\tother = otherval\n"); + cl_assert_equal_strn(FOO_COMMENT, n, strlen(FOO_COMMENT)); + n += strlen(FOO_COMMENT); cl_assert_equal_strn(SECTION_BAR, n, strlen(SECTION_BAR)); n += strlen(SECTION_BAR); @@ -630,3 +638,87 @@ void test_config_write__to_file_with_only_comment(void) git_buf_free(&result); } +void test_config_write__locking(void) +{ + git_config *cfg, *cfg2; + git_config_entry *entry; + git_transaction *tx; + const char *filename = "locked-file"; + + /* Open the config and lock it */ + cl_git_mkfile(filename, "[section]\n\tname = value\n"); + cl_git_pass(git_config_open_ondisk(&cfg, filename)); + cl_git_pass(git_config_get_entry(&entry, cfg, "section.name")); + cl_assert_equal_s("value", entry->value); + git_config_entry_free(entry); + cl_git_pass(git_config_lock(&tx, cfg)); + + /* Change entries in the locked backend */ + cl_git_pass(git_config_set_string(cfg, "section.name", "other value")); + cl_git_pass(git_config_set_string(cfg, "section2.name3", "more value")); + + /* We can see that the file we read from hasn't changed */ + cl_git_pass(git_config_open_ondisk(&cfg2, filename)); + cl_git_pass(git_config_get_entry(&entry, cfg2, "section.name")); + cl_assert_equal_s("value", entry->value); + git_config_entry_free(entry); + cl_git_fail_with(GIT_ENOTFOUND, git_config_get_entry(&entry, cfg2, "section2.name3")); + git_config_free(cfg2); + + /* And we also get the old view when we read from the locked config */ + cl_git_pass(git_config_get_entry(&entry, cfg, "section.name")); + cl_assert_equal_s("value", entry->value); + git_config_entry_free(entry); + cl_git_fail_with(GIT_ENOTFOUND, git_config_get_entry(&entry, cfg, "section2.name3")); + + cl_git_pass(git_transaction_commit(tx)); + git_transaction_free(tx); + + /* Now that we've unlocked it, we should see both updates */ + cl_git_pass(git_config_get_entry(&entry, cfg, "section.name")); + cl_assert_equal_s("other value", entry->value); + git_config_entry_free(entry); + cl_git_pass(git_config_get_entry(&entry, cfg, "section2.name3")); + cl_assert_equal_s("more value", entry->value); + git_config_entry_free(entry); + + git_config_free(cfg); + + /* We should also see the changes after reopening the config */ + cl_git_pass(git_config_open_ondisk(&cfg, filename)); + cl_git_pass(git_config_get_entry(&entry, cfg, "section.name")); + cl_assert_equal_s("other value", entry->value); + git_config_entry_free(entry); + cl_git_pass(git_config_get_entry(&entry, cfg, "section2.name3")); + cl_assert_equal_s("more value", entry->value); + git_config_entry_free(entry); + + git_config_free(cfg); +} + +void test_config_write__repeated(void) +{ + const char *filename = "config-repeated"; + git_config *cfg; + git_buf result = GIT_BUF_INIT; + const char *expected = "[sample \"prefix\"]\n\ +\tsetting1 = someValue1\n\ +\tsetting2 = someValue2\n\ +\tsetting3 = someValue3\n\ +\tsetting4 = someValue4\n\ +"; + cl_git_pass(git_config_open_ondisk(&cfg, filename)); + cl_git_pass(git_config_set_string(cfg, "sample.prefix.setting1", "someValue1")); + cl_git_pass(git_config_set_string(cfg, "sample.prefix.setting2", "someValue2")); + cl_git_pass(git_config_set_string(cfg, "sample.prefix.setting3", "someValue3")); + cl_git_pass(git_config_set_string(cfg, "sample.prefix.setting4", "someValue4")); + git_config_free(cfg); + + cl_git_pass(git_config_open_ondisk(&cfg, filename)); + + cl_git_pass(git_futils_readbuffer(&result, filename)); + cl_assert_equal_s(expected, result.ptr); + git_buf_free(&result); + + git_config_free(cfg); +} diff --git a/vendor/libgit2/tests/core/array.c b/vendor/libgit2/tests/core/array.c new file mode 100644 index 000000000..8e626a506 --- /dev/null +++ b/vendor/libgit2/tests/core/array.c @@ -0,0 +1,57 @@ +#include "clar_libgit2.h" +#include "array.h" + +static int int_lookup(const void *k, const void *a) +{ + const int *one = (const int *)k; + int *two = (int *)a; + + return *one - *two; +} + +#define expect_pos(k, n, ret) \ + key = (k); \ + cl_assert_equal_i((ret), \ + git_array_search(&p, integers, int_lookup, &key)); \ + cl_assert_equal_i((n), p); + +void test_core_array__bsearch2(void) +{ + git_array_t(int) integers = GIT_ARRAY_INIT; + int *i, key; + size_t p; + + i = git_array_alloc(integers); *i = 2; + i = git_array_alloc(integers); *i = 3; + i = git_array_alloc(integers); *i = 5; + i = git_array_alloc(integers); *i = 7; + i = git_array_alloc(integers); *i = 7; + i = git_array_alloc(integers); *i = 8; + i = git_array_alloc(integers); *i = 13; + i = git_array_alloc(integers); *i = 21; + i = git_array_alloc(integers); *i = 25; + i = git_array_alloc(integers); *i = 42; + i = git_array_alloc(integers); *i = 69; + i = git_array_alloc(integers); *i = 121; + i = git_array_alloc(integers); *i = 256; + i = git_array_alloc(integers); *i = 512; + i = git_array_alloc(integers); *i = 513; + i = git_array_alloc(integers); *i = 514; + i = git_array_alloc(integers); *i = 516; + i = git_array_alloc(integers); *i = 516; + i = git_array_alloc(integers); *i = 517; + + /* value to search for, expected position, return code */ + expect_pos(3, 1, GIT_OK); + expect_pos(2, 0, GIT_OK); + expect_pos(1, 0, GIT_ENOTFOUND); + expect_pos(25, 8, GIT_OK); + expect_pos(26, 9, GIT_ENOTFOUND); + expect_pos(42, 9, GIT_OK); + expect_pos(50, 10, GIT_ENOTFOUND); + expect_pos(68, 10, GIT_ENOTFOUND); + expect_pos(256, 12, GIT_OK); + + git_array_clear(integers); +} + diff --git a/vendor/libgit2/tests/core/buffer.c b/vendor/libgit2/tests/core/buffer.c index 0e7026a9c..9872af7f4 100644 --- a/vendor/libgit2/tests/core/buffer.c +++ b/vendor/libgit2/tests/core/buffer.c @@ -929,7 +929,7 @@ void test_core_buffer__similarity_metric(void) cl_git_pass(git_buf_sets(&buf, SIMILARITY_TEST_DATA_1)); cl_git_pass(git_hashsig_create(&a, buf.ptr, buf.size, GIT_HASHSIG_NORMAL)); - cl_git_pass(git_futils_mkdir("scratch", NULL, 0755, GIT_MKDIR_PATH)); + cl_git_pass(git_futils_mkdir("scratch", 0755, GIT_MKDIR_PATH)); cl_git_mkfile("scratch/testdata", SIMILARITY_TEST_DATA_1); cl_git_pass(git_hashsig_create_fromfile( &b, "scratch/testdata", GIT_HASHSIG_NORMAL)); diff --git a/vendor/libgit2/tests/core/copy.c b/vendor/libgit2/tests/core/copy.c index 04b2dfab5..967748cc5 100644 --- a/vendor/libgit2/tests/core/copy.c +++ b/vendor/libgit2/tests/core/copy.c @@ -25,7 +25,7 @@ void test_core_copy__file_in_dir(void) struct stat st; const char *content = "This is some other stuff to copy\n"; - cl_git_pass(git_futils_mkdir("an_dir/in_a_dir", NULL, 0775, GIT_MKDIR_PATH)); + cl_git_pass(git_futils_mkdir("an_dir/in_a_dir", 0775, GIT_MKDIR_PATH)); cl_git_mkfile("an_dir/in_a_dir/copy_me", content); cl_assert(git_path_isdir("an_dir")); @@ -60,9 +60,9 @@ void test_core_copy__tree(void) struct stat st; const char *content = "File content\n"; - cl_git_pass(git_futils_mkdir("src/b", NULL, 0775, GIT_MKDIR_PATH)); - cl_git_pass(git_futils_mkdir("src/c/d", NULL, 0775, GIT_MKDIR_PATH)); - cl_git_pass(git_futils_mkdir("src/c/e", NULL, 0775, GIT_MKDIR_PATH)); + cl_git_pass(git_futils_mkdir("src/b", 0775, GIT_MKDIR_PATH)); + cl_git_pass(git_futils_mkdir("src/c/d", 0775, GIT_MKDIR_PATH)); + cl_git_pass(git_futils_mkdir("src/c/e", 0775, GIT_MKDIR_PATH)); cl_git_mkfile("src/f1", content); cl_git_mkfile("src/b/f2", content); diff --git a/vendor/libgit2/tests/core/dirent.c b/vendor/libgit2/tests/core/dirent.c index d95e44196..2bd60269d 100644 --- a/vendor/libgit2/tests/core/dirent.c +++ b/vendor/libgit2/tests/core/dirent.c @@ -275,3 +275,32 @@ void test_core_dirent__diriter_with_fullname(void) check_counts(&sub); } + +void test_core_dirent__diriter_at_directory_root(void) +{ + git_path_diriter diriter = GIT_PATH_DIRITER_INIT; + const char *sandbox_path, *path; + char *root_path; + size_t path_len; + int root_offset, error; + + sandbox_path = clar_sandbox_path(); + cl_assert((root_offset = git_path_root(sandbox_path)) >= 0); + + cl_assert(root_path = git__calloc(1, root_offset + 2)); + strncpy(root_path, sandbox_path, root_offset + 1); + + cl_git_pass(git_path_diriter_init(&diriter, root_path, 0)); + + while ((error = git_path_diriter_next(&diriter)) == 0) { + cl_git_pass(git_path_diriter_fullpath(&path, &path_len, &diriter)); + + cl_assert(path_len > (size_t)(root_offset + 1)); + cl_assert(path[root_offset+1] != '/'); + } + + cl_assert_equal_i(error, GIT_ITEROVER); + + git_path_diriter_free(&diriter); + git__free(root_path); +} diff --git a/vendor/libgit2/tests/core/env.c b/vendor/libgit2/tests/core/env.c index 293b786db..ee08258a6 100644 --- a/vendor/libgit2/tests/core/env.c +++ b/vendor/libgit2/tests/core/env.c @@ -30,14 +30,8 @@ static char *home_values[] = { void test_core_env__initialize(void) { int i; - for (i = 0; i < NUM_VARS; ++i) { - const char *original = cl_getenv(env_vars[i]); -#ifdef GIT_WIN32 - env_save[i] = (char *)original; -#else - env_save[i] = original ? git__strdup(original) : NULL; -#endif - } + for (i = 0; i < NUM_VARS; ++i) + env_save[i] = cl_getenv(env_vars[i]); } static void set_global_search_path_from_env(void) @@ -77,12 +71,14 @@ static void setenv_and_check(const char *name, const char *value) char *check; cl_git_pass(cl_setenv(name, value)); - check = cl_getenv(name); - cl_assert_equal_s(value, check); -#ifdef GIT_WIN32 + + if (value) + cl_assert_equal_s(value, check); + else + cl_assert(check == NULL); + git__free(check); -#endif } void test_core_env__0(void) diff --git a/vendor/libgit2/tests/core/errors.c b/vendor/libgit2/tests/core/errors.c index a06ec4abc..ab18951a6 100644 --- a/vendor/libgit2/tests/core/errors.c +++ b/vendor/libgit2/tests/core/errors.c @@ -93,23 +93,69 @@ void test_core_errors__restore(void) giterr_clear(); cl_assert(giterr_last() == NULL); - cl_assert_equal_i(0, giterr_capture(&err_state, 0)); + cl_assert_equal_i(0, giterr_state_capture(&err_state, 0)); memset(&err_state, 0x0, sizeof(git_error_state)); giterr_set(42, "Foo: %s", "bar"); - cl_assert_equal_i(-1, giterr_capture(&err_state, -1)); + cl_assert_equal_i(-1, giterr_state_capture(&err_state, -1)); cl_assert(giterr_last() == NULL); giterr_set(99, "Bar: %s", "foo"); - giterr_restore(&err_state); + giterr_state_restore(&err_state); cl_assert_equal_i(42, giterr_last()->klass); cl_assert_equal_s("Foo: bar", giterr_last()->message); } +void test_core_errors__free_state(void) +{ + git_error_state err_state = {0}; + + giterr_clear(); + + giterr_set(42, "Foo: %s", "bar"); + cl_assert_equal_i(-1, giterr_state_capture(&err_state, -1)); + + giterr_set(99, "Bar: %s", "foo"); + + giterr_state_free(&err_state); + + cl_assert_equal_i(99, giterr_last()->klass); + cl_assert_equal_s("Bar: foo", giterr_last()->message); + + giterr_state_restore(&err_state); + + cl_assert(giterr_last() == NULL); +} + +void test_core_errors__restore_oom(void) +{ + git_error_state err_state = {0}; + const git_error *oom_error = NULL; + + giterr_clear(); + + giterr_set_oom(); /* internal fn */ + oom_error = giterr_last(); + cl_assert(oom_error); + + cl_assert_equal_i(-1, giterr_state_capture(&err_state, -1)); + + cl_assert(giterr_last() == NULL); + cl_assert_equal_i(GITERR_NOMEMORY, err_state.error_msg.klass); + cl_assert_equal_s("Out of memory", err_state.error_msg.message); + + giterr_state_restore(&err_state); + + cl_assert(giterr_last()->klass == GITERR_NOMEMORY); + cl_assert_(giterr_last() == oom_error, "static oom error not restored"); + + giterr_clear(); +} + static int test_arraysize_multiply(size_t nelem, size_t size) { size_t out; diff --git a/vendor/libgit2/tests/core/features.c b/vendor/libgit2/tests/core/features.c index 5eeb05e81..85cddfeff 100644 --- a/vendor/libgit2/tests/core/features.c +++ b/vendor/libgit2/tests/core/features.c @@ -28,4 +28,10 @@ void test_core_features__0(void) #else cl_assert((caps & GIT_FEATURE_SSH) == 0); #endif + +#if defined(GIT_USE_NSEC) + cl_assert((caps & GIT_FEATURE_NSEC) != 0); +#else + cl_assert((caps & GIT_FEATURE_NSEC) == 0); +#endif } diff --git a/vendor/libgit2/tests/core/filebuf.c b/vendor/libgit2/tests/core/filebuf.c index 39d98ff7e..04a380b20 100644 --- a/vendor/libgit2/tests/core/filebuf.c +++ b/vendor/libgit2/tests/core/filebuf.c @@ -204,3 +204,38 @@ void test_core_filebuf__symlink_depth(void) cl_git_pass(git_futils_rmdir_r(dir, NULL, GIT_RMDIR_REMOVE_FILES)); } + +void test_core_filebuf__hidden_file(void) +{ +#ifndef GIT_WIN32 + cl_skip(); +#else + git_filebuf file = GIT_FILEBUF_INIT; + char *dir = "hidden", *test = "hidden/test"; + bool hidden; + + cl_git_pass(p_mkdir(dir, 0666)); + cl_git_mkfile(test, "dummy content"); + + cl_git_pass(git_win32__set_hidden(test, true)); + cl_git_pass(git_win32__hidden(&hidden, test)); + cl_assert(hidden); + + cl_git_pass(git_filebuf_open(&file, test, 0, 0666)); + + cl_git_pass(git_filebuf_printf(&file, "%s\n", "libgit2 rocks")); + + cl_git_pass(git_filebuf_commit(&file)); + + git_filebuf_cleanup(&file); +#endif +} + +void test_core_filebuf__detects_directory(void) +{ + git_filebuf file = GIT_FILEBUF_INIT; + + cl_must_pass(p_mkdir("foo", 0777)); + cl_git_fail_with(GIT_EDIRECTORY, git_filebuf_open(&file, "foo", 0, 0666)); + cl_must_pass(p_rmdir("foo")); +} diff --git a/vendor/libgit2/tests/core/ftruncate.c b/vendor/libgit2/tests/core/ftruncate.c index 21981d677..2f4729fc2 100644 --- a/vendor/libgit2/tests/core/ftruncate.c +++ b/vendor/libgit2/tests/core/ftruncate.c @@ -10,7 +10,7 @@ static int fd = -1; void test_core_ftruncate__initialize(void) { - if (!cl_getenv("GITTEST_INVASIVE_FS_SIZE")) + if (!cl_is_env_set("GITTEST_INVASIVE_FS_SIZE")) cl_skip(); cl_must_pass((fd = p_open(filename, O_CREAT | O_RDWR, 0644))); diff --git a/vendor/libgit2/tests/core/futils.c b/vendor/libgit2/tests/core/futils.c new file mode 100644 index 000000000..e7f7154ed --- /dev/null +++ b/vendor/libgit2/tests/core/futils.c @@ -0,0 +1,68 @@ +#include "clar_libgit2.h" +#include "fileops.h" + +// Fixture setup and teardown +void test_core_futils__initialize(void) +{ + cl_must_pass(p_mkdir("futils", 0777)); +} + +void test_core_futils__cleanup(void) +{ + cl_fixture_cleanup("futils"); +} + +void test_core_futils__writebuffer(void) +{ + git_buf out = GIT_BUF_INIT, + append = GIT_BUF_INIT; + + /* create a new file */ + git_buf_puts(&out, "hello!\n"); + git_buf_printf(&out, "this is a %s\n", "test"); + + cl_git_pass(git_futils_writebuffer(&out, "futils/test-file", O_RDWR|O_CREAT, 0666)); + + cl_assert_equal_file(out.ptr, out.size, "futils/test-file"); + + /* append some more data */ + git_buf_puts(&append, "And some more!\n"); + git_buf_put(&out, append.ptr, append.size); + + cl_git_pass(git_futils_writebuffer(&append, "futils/test-file", O_RDWR|O_APPEND, 0666)); + + cl_assert_equal_file(out.ptr, out.size, "futils/test-file"); + + git_buf_free(&out); + git_buf_free(&append); +} + +void test_core_futils__write_hidden_file(void) +{ +#ifndef GIT_WIN32 + cl_skip(); +#else + git_buf out = GIT_BUF_INIT, append = GIT_BUF_INIT; + bool hidden; + + git_buf_puts(&out, "hidden file.\n"); + git_futils_writebuffer(&out, "futils/test-file", O_RDWR | O_CREAT, 0666); + + cl_git_pass(git_win32__set_hidden("futils/test-file", true)); + + /* append some more data */ + git_buf_puts(&append, "And some more!\n"); + git_buf_put(&out, append.ptr, append.size); + + cl_git_pass(git_futils_writebuffer(&append, "futils/test-file", O_RDWR | O_APPEND, 0666)); + + cl_assert_equal_file(out.ptr, out.size, "futils/test-file"); + + cl_git_pass(git_win32__hidden(&hidden, "futils/test-file")); + cl_assert(hidden); + + git_buf_free(&out); + git_buf_free(&append); +#endif +} + diff --git a/vendor/libgit2/tests/core/mkdir.c b/vendor/libgit2/tests/core/mkdir.c index f76fe1da9..96c972396 100644 --- a/vendor/libgit2/tests/core/mkdir.c +++ b/vendor/libgit2/tests/core/mkdir.c @@ -13,43 +13,82 @@ static void cleanup_basic_dirs(void *ref) git_futils_rmdir_r("d4", NULL, GIT_RMDIR_EMPTY_HIERARCHY); } +void test_core_mkdir__absolute(void) +{ + git_buf path = GIT_BUF_INIT; + + cl_set_cleanup(cleanup_basic_dirs, NULL); + + git_buf_joinpath(&path, clar_sandbox_path(), "d0"); + + /* make a directory */ + cl_assert(!git_path_isdir(path.ptr)); + cl_git_pass(git_futils_mkdir(path.ptr, 0755, 0)); + cl_assert(git_path_isdir(path.ptr)); + + git_buf_joinpath(&path, path.ptr, "subdir"); + cl_assert(!git_path_isdir(path.ptr)); + cl_git_pass(git_futils_mkdir(path.ptr, 0755, 0)); + cl_assert(git_path_isdir(path.ptr)); + + /* ensure mkdir_r works for a single subdir */ + git_buf_joinpath(&path, path.ptr, "another"); + cl_assert(!git_path_isdir(path.ptr)); + cl_git_pass(git_futils_mkdir_r(path.ptr, 0755)); + cl_assert(git_path_isdir(path.ptr)); + + /* ensure mkdir_r works */ + git_buf_joinpath(&path, clar_sandbox_path(), "d1/foo/bar/asdf"); + cl_assert(!git_path_isdir(path.ptr)); + cl_git_pass(git_futils_mkdir_r(path.ptr, 0755)); + cl_assert(git_path_isdir(path.ptr)); + + /* ensure we don't imply recursive */ + git_buf_joinpath(&path, clar_sandbox_path(), "d2/foo/bar/asdf"); + cl_assert(!git_path_isdir(path.ptr)); + cl_git_fail(git_futils_mkdir(path.ptr, 0755, 0)); + cl_assert(!git_path_isdir(path.ptr)); + + git_buf_free(&path); +} + void test_core_mkdir__basic(void) { cl_set_cleanup(cleanup_basic_dirs, NULL); /* make a directory */ cl_assert(!git_path_isdir("d0")); - cl_git_pass(git_futils_mkdir("d0", NULL, 0755, 0)); + cl_git_pass(git_futils_mkdir("d0", 0755, 0)); cl_assert(git_path_isdir("d0")); /* make a path */ cl_assert(!git_path_isdir("d1")); - cl_git_pass(git_futils_mkdir("d1/d1.1/d1.2", NULL, 0755, GIT_MKDIR_PATH)); + cl_git_pass(git_futils_mkdir("d1/d1.1/d1.2", 0755, GIT_MKDIR_PATH)); cl_assert(git_path_isdir("d1")); cl_assert(git_path_isdir("d1/d1.1")); cl_assert(git_path_isdir("d1/d1.1/d1.2")); /* make a dir exclusively */ cl_assert(!git_path_isdir("d2")); - cl_git_pass(git_futils_mkdir("d2", NULL, 0755, GIT_MKDIR_EXCL)); + cl_git_pass(git_futils_mkdir("d2", 0755, GIT_MKDIR_EXCL)); cl_assert(git_path_isdir("d2")); /* make exclusive failure */ - cl_git_fail(git_futils_mkdir("d2", NULL, 0755, GIT_MKDIR_EXCL)); + cl_git_fail(git_futils_mkdir("d2", 0755, GIT_MKDIR_EXCL)); /* make a path exclusively */ cl_assert(!git_path_isdir("d3")); - cl_git_pass(git_futils_mkdir("d3/d3.1/d3.2", NULL, 0755, GIT_MKDIR_PATH | GIT_MKDIR_EXCL)); + cl_git_pass(git_futils_mkdir("d3/d3.1/d3.2", 0755, GIT_MKDIR_PATH | GIT_MKDIR_EXCL)); cl_assert(git_path_isdir("d3")); cl_assert(git_path_isdir("d3/d3.1/d3.2")); /* make exclusive path failure */ - cl_git_fail(git_futils_mkdir("d3/d3.1/d3.2", NULL, 0755, GIT_MKDIR_PATH | GIT_MKDIR_EXCL)); + cl_git_fail(git_futils_mkdir("d3/d3.1/d3.2", 0755, GIT_MKDIR_PATH | GIT_MKDIR_EXCL)); /* ??? Should EXCL only apply to the last item in the path? */ /* path with trailing slash? */ cl_assert(!git_path_isdir("d4")); - cl_git_pass(git_futils_mkdir("d4/d4.1/", NULL, 0755, GIT_MKDIR_PATH)); + cl_git_pass(git_futils_mkdir("d4/d4.1/", 0755, GIT_MKDIR_PATH)); cl_assert(git_path_isdir("d4/d4.1")); } @@ -65,38 +104,38 @@ void test_core_mkdir__with_base(void) cl_set_cleanup(cleanup_basedir, NULL); - cl_git_pass(git_futils_mkdir(BASEDIR, NULL, 0755, GIT_MKDIR_PATH)); + cl_git_pass(git_futils_mkdir(BASEDIR, 0755, GIT_MKDIR_PATH)); - cl_git_pass(git_futils_mkdir("a", BASEDIR, 0755, 0)); + cl_git_pass(git_futils_mkdir_relative("a", BASEDIR, 0755, 0, NULL)); cl_assert(git_path_isdir(BASEDIR "/a")); - cl_git_pass(git_futils_mkdir("b/b1/b2", BASEDIR, 0755, GIT_MKDIR_PATH)); + cl_git_pass(git_futils_mkdir_relative("b/b1/b2", BASEDIR, 0755, GIT_MKDIR_PATH, NULL)); cl_assert(git_path_isdir(BASEDIR "/b/b1/b2")); /* exclusive with existing base */ - cl_git_pass(git_futils_mkdir("c/c1/c2", BASEDIR, 0755, GIT_MKDIR_PATH | GIT_MKDIR_EXCL)); + cl_git_pass(git_futils_mkdir_relative("c/c1/c2", BASEDIR, 0755, GIT_MKDIR_PATH | GIT_MKDIR_EXCL, NULL)); /* fail: exclusive with duplicated suffix */ - cl_git_fail(git_futils_mkdir("c/c1/c3", BASEDIR, 0755, GIT_MKDIR_PATH | GIT_MKDIR_EXCL)); + cl_git_fail(git_futils_mkdir_relative("c/c1/c3", BASEDIR, 0755, GIT_MKDIR_PATH | GIT_MKDIR_EXCL, NULL)); /* fail: exclusive with any duplicated component */ - cl_git_fail(git_futils_mkdir("c/cz/cz", BASEDIR, 0755, GIT_MKDIR_PATH | GIT_MKDIR_EXCL)); + cl_git_fail(git_futils_mkdir_relative("c/cz/cz", BASEDIR, 0755, GIT_MKDIR_PATH | GIT_MKDIR_EXCL, NULL)); /* success: exclusive without path */ - cl_git_pass(git_futils_mkdir("c/c1/c3", BASEDIR, 0755, GIT_MKDIR_EXCL)); + cl_git_pass(git_futils_mkdir_relative("c/c1/c3", BASEDIR, 0755, GIT_MKDIR_EXCL, NULL)); /* path with shorter base and existing dirs */ - cl_git_pass(git_futils_mkdir("dir/here/d/", "base", 0755, GIT_MKDIR_PATH)); + cl_git_pass(git_futils_mkdir_relative("dir/here/d/", "base", 0755, GIT_MKDIR_PATH, NULL)); cl_assert(git_path_isdir("base/dir/here/d")); /* fail: path with shorter base and existing dirs */ - cl_git_fail(git_futils_mkdir("dir/here/e/", "base", 0755, GIT_MKDIR_PATH | GIT_MKDIR_EXCL)); + cl_git_fail(git_futils_mkdir_relative("dir/here/e/", "base", 0755, GIT_MKDIR_PATH | GIT_MKDIR_EXCL, NULL)); /* fail: base with missing components */ - cl_git_fail(git_futils_mkdir("f/", "base/missing", 0755, GIT_MKDIR_PATH)); + cl_git_fail(git_futils_mkdir_relative("f/", "base/missing", 0755, GIT_MKDIR_PATH, NULL)); /* success: shift missing component to path */ - cl_git_pass(git_futils_mkdir("missing/f/", "base/", 0755, GIT_MKDIR_PATH)); + cl_git_pass(git_futils_mkdir_relative("missing/f/", "base/", 0755, GIT_MKDIR_PATH, NULL)); } static void cleanup_chmod_root(void *ref) @@ -135,9 +174,9 @@ void test_core_mkdir__chmods(void) cl_set_cleanup(cleanup_chmod_root, old); - cl_git_pass(git_futils_mkdir("r", NULL, 0777, 0)); + cl_git_pass(git_futils_mkdir("r", 0777, 0)); - cl_git_pass(git_futils_mkdir("mode/is/important", "r", 0777, GIT_MKDIR_PATH)); + cl_git_pass(git_futils_mkdir_relative("mode/is/important", "r", 0777, GIT_MKDIR_PATH, NULL)); cl_git_pass(git_path_lstat("r/mode", &st)); check_mode(0755, st.st_mode); @@ -146,7 +185,7 @@ void test_core_mkdir__chmods(void) cl_git_pass(git_path_lstat("r/mode/is/important", &st)); check_mode(0755, st.st_mode); - cl_git_pass(git_futils_mkdir("mode2/is2/important2", "r", 0777, GIT_MKDIR_PATH | GIT_MKDIR_CHMOD)); + cl_git_pass(git_futils_mkdir_relative("mode2/is2/important2", "r", 0777, GIT_MKDIR_PATH | GIT_MKDIR_CHMOD, NULL)); cl_git_pass(git_path_lstat("r/mode2", &st)); check_mode(0755, st.st_mode); @@ -155,7 +194,7 @@ void test_core_mkdir__chmods(void) cl_git_pass(git_path_lstat("r/mode2/is2/important2", &st)); check_mode(0777, st.st_mode); - cl_git_pass(git_futils_mkdir("mode3/is3/important3", "r", 0777, GIT_MKDIR_PATH | GIT_MKDIR_CHMOD_PATH)); + cl_git_pass(git_futils_mkdir_relative("mode3/is3/important3", "r", 0777, GIT_MKDIR_PATH | GIT_MKDIR_CHMOD_PATH, NULL)); cl_git_pass(git_path_lstat("r/mode3", &st)); check_mode(0777, st.st_mode); @@ -166,7 +205,7 @@ void test_core_mkdir__chmods(void) /* test that we chmod existing dir */ - cl_git_pass(git_futils_mkdir("mode/is/important", "r", 0777, GIT_MKDIR_PATH | GIT_MKDIR_CHMOD)); + cl_git_pass(git_futils_mkdir_relative("mode/is/important", "r", 0777, GIT_MKDIR_PATH | GIT_MKDIR_CHMOD, NULL)); cl_git_pass(git_path_lstat("r/mode", &st)); check_mode(0755, st.st_mode); @@ -177,7 +216,7 @@ void test_core_mkdir__chmods(void) /* test that we chmod even existing dirs if CHMOD_PATH is set */ - cl_git_pass(git_futils_mkdir("mode2/is2/important2.1", "r", 0777, GIT_MKDIR_PATH | GIT_MKDIR_CHMOD_PATH)); + cl_git_pass(git_futils_mkdir_relative("mode2/is2/important2.1", "r", 0777, GIT_MKDIR_PATH | GIT_MKDIR_CHMOD_PATH, NULL)); cl_git_pass(git_path_lstat("r/mode2", &st)); check_mode(0777, st.st_mode); @@ -187,6 +226,40 @@ void test_core_mkdir__chmods(void) check_mode(0777, st.st_mode); } +void test_core_mkdir__keeps_parent_symlinks(void) +{ +#ifndef GIT_WIN32 + git_buf path = GIT_BUF_INIT; + + cl_set_cleanup(cleanup_basic_dirs, NULL); + + /* make a directory */ + cl_assert(!git_path_isdir("d0")); + cl_git_pass(git_futils_mkdir("d0", 0755, 0)); + cl_assert(git_path_isdir("d0")); + + cl_must_pass(symlink("d0", "d1")); + cl_assert(git_path_islink("d1")); + + cl_git_pass(git_futils_mkdir("d1/foo/bar", 0755, GIT_MKDIR_PATH|GIT_MKDIR_REMOVE_SYMLINKS)); + cl_assert(git_path_islink("d1")); + cl_assert(git_path_isdir("d1/foo/bar")); + cl_assert(git_path_isdir("d0/foo/bar")); + + cl_must_pass(symlink("d0", "d2")); + cl_assert(git_path_islink("d2")); + + git_buf_joinpath(&path, clar_sandbox_path(), "d2/other/dir"); + + cl_git_pass(git_futils_mkdir(path.ptr, 0755, GIT_MKDIR_PATH|GIT_MKDIR_REMOVE_SYMLINKS)); + cl_assert(git_path_islink("d2")); + cl_assert(git_path_isdir("d2/other/dir")); + cl_assert(git_path_isdir("d0/other/dir")); + + git_buf_free(&path); +#endif +} + void test_core_mkdir__mkdir_path_inside_unwriteable_parent(void) { struct stat st; @@ -200,8 +273,8 @@ void test_core_mkdir__mkdir_path_inside_unwriteable_parent(void) *old = p_umask(022); cl_set_cleanup(cleanup_chmod_root, old); - cl_git_pass(git_futils_mkdir("r", NULL, 0777, 0)); - cl_git_pass(git_futils_mkdir("mode/is/important", "r", 0777, GIT_MKDIR_PATH)); + cl_git_pass(git_futils_mkdir("r", 0777, 0)); + cl_git_pass(git_futils_mkdir_relative("mode/is/important", "r", 0777, GIT_MKDIR_PATH, NULL)); cl_git_pass(git_path_lstat("r/mode", &st)); check_mode(0755, st.st_mode); @@ -210,10 +283,9 @@ void test_core_mkdir__mkdir_path_inside_unwriteable_parent(void) check_mode(0111, st.st_mode); cl_git_pass( - git_futils_mkdir("mode/is/okay/inside", "r", 0777, GIT_MKDIR_PATH)); + git_futils_mkdir_relative("mode/is/okay/inside", "r", 0777, GIT_MKDIR_PATH, NULL)); cl_git_pass(git_path_lstat("r/mode/is/okay/inside", &st)); check_mode(0755, st.st_mode); cl_must_pass(p_chmod("r/mode", 0777)); } - diff --git a/vendor/libgit2/tests/core/opts.c b/vendor/libgit2/tests/core/opts.c index 3173c648b..72408cbe8 100644 --- a/vendor/libgit2/tests/core/opts.c +++ b/vendor/libgit2/tests/core/opts.c @@ -17,3 +17,9 @@ void test_core_opts__readwrite(void) cl_assert(new_val == old_val); } + +void test_core_opts__invalid_option(void) +{ + cl_git_fail(git_libgit2_opts(-1, "foobar")); +} + diff --git a/vendor/libgit2/tests/core/pool.c b/vendor/libgit2/tests/core/pool.c index a7ec8801b..b07da0abd 100644 --- a/vendor/libgit2/tests/core/pool.c +++ b/vendor/libgit2/tests/core/pool.c @@ -8,7 +8,7 @@ void test_core_pool__0(void) git_pool p; void *ptr; - cl_git_pass(git_pool_init(&p, 1, 4000)); + git_pool_init(&p, 1); for (i = 1; i < 10000; i *= 2) { ptr = git_pool_malloc(&p, i); @@ -17,13 +17,6 @@ void test_core_pool__0(void) cl_assert(!git_pool__ptr_in_pool(&p, &i)); } - /* 1+2+4+8+16+32+64+128+256+512+1024 -> original block */ - /* 2048 -> 1 block */ - /* 4096 -> 1 block */ - /* 8192 -> 1 block */ - - cl_assert(git_pool__open_pages(&p) + git_pool__full_pages(&p) == 4); - git_pool_clear(&p); } @@ -32,26 +25,28 @@ void test_core_pool__1(void) int i; git_pool p; - cl_git_pass(git_pool_init(&p, 1, 4000)); + git_pool_init(&p, 1); + p.page_size = 4000; for (i = 2010; i > 0; i--) cl_assert(git_pool_malloc(&p, i) != NULL); +#ifndef GIT_DEBUG_POOL /* with fixed page size, allocation must end up with these values */ - cl_assert_equal_i(1, git_pool__open_pages(&p)); - cl_assert_equal_i(507, git_pool__full_pages(&p)); - + cl_assert_equal_i(591, git_pool__open_pages(&p)); +#endif git_pool_clear(&p); - cl_git_pass(git_pool_init(&p, 1, 4120)); + git_pool_init(&p, 1); + p.page_size = 4120; for (i = 2010; i > 0; i--) cl_assert(git_pool_malloc(&p, i) != NULL); +#ifndef GIT_DEBUG_POOL /* with fixed page size, allocation must end up with these values */ - cl_assert_equal_i(1, git_pool__open_pages(&p)); - cl_assert_equal_i(492, git_pool__full_pages(&p)); - + cl_assert_equal_i(sizeof(void *) == 8 ? 575 : 573, git_pool__open_pages(&p)); +#endif git_pool_clear(&p); } @@ -66,7 +61,8 @@ void test_core_pool__2(void) memset(oid_hex, '0', sizeof(oid_hex)); - cl_git_pass(git_pool_init(&p, sizeof(git_oid), 100)); + git_pool_init(&p, sizeof(git_oid)); + p.page_size = 4000; for (i = 1000; i < 10000; i++) { oid = git_pool_malloc(&p, 1); @@ -77,60 +73,10 @@ void test_core_pool__2(void) cl_git_pass(git_oid_fromstr(oid, oid_hex)); } +#ifndef GIT_DEBUG_POOL /* with fixed page size, allocation must end up with these values */ - cl_assert(git_pool__open_pages(&p) == 0); - cl_assert(git_pool__full_pages(&p) == 90); - - git_pool_clear(&p); -} - -void test_core_pool__free_list(void) -{ - int i; - git_pool p; - void *ptr, *ptrs[50]; - - cl_git_pass(git_pool_init(&p, 100, 100)); - - for (i = 0; i < 10; ++i) { - ptr = git_pool_malloc(&p, 1); - cl_assert(ptr != NULL); - } - cl_assert_equal_i(10, (int)p.items); - - for (i = 0; i < 50; ++i) { - ptrs[i] = git_pool_malloc(&p, 1); - cl_assert(ptrs[i] != NULL); - } - cl_assert_equal_i(60, (int)p.items); - - git_pool_free(&p, ptr); - cl_assert_equal_i(60, (int)p.items); - - git_pool_free_array(&p, 50, ptrs); - cl_assert_equal_i(60, (int)p.items); - - for (i = 0; i < 50; ++i) { - ptrs[i] = git_pool_malloc(&p, 1); - cl_assert(ptrs[i] != NULL); - } - cl_assert_equal_i(60, (int)p.items); - - for (i = 0; i < 111; ++i) { - ptr = git_pool_malloc(&p, 1); - cl_assert(ptr != NULL); - } - cl_assert_equal_i(170, (int)p.items); - - git_pool_free_array(&p, 50, ptrs); - cl_assert_equal_i(170, (int)p.items); - - for (i = 0; i < 50; ++i) { - ptrs[i] = git_pool_malloc(&p, 1); - cl_assert(ptrs[i] != NULL); - } - cl_assert_equal_i(170, (int)p.items); - + cl_assert_equal_i(sizeof(void *) == 8 ? 55 : 45, git_pool__open_pages(&p)); +#endif git_pool_clear(&p); } @@ -138,7 +84,7 @@ void test_core_pool__strndup_limit(void) { git_pool p; - cl_git_pass(git_pool_init(&p, 1, 100)); + git_pool_init(&p, 1); /* ensure 64 bit doesn't overflow */ cl_assert(git_pool_strndup(&p, "foo", (size_t)-1) == NULL); git_pool_clear(&p); diff --git a/vendor/libgit2/tests/core/posix.c b/vendor/libgit2/tests/core/posix.c index 5a9e24899..34a67bf47 100644 --- a/vendor/libgit2/tests/core/posix.c +++ b/vendor/libgit2/tests/core/posix.c @@ -100,7 +100,7 @@ void test_core_posix__inet_pton(void) void test_core_posix__utimes(void) { - struct timeval times[2]; + struct p_timeval times[2]; struct stat st; time_t curtime; int fd; diff --git a/vendor/libgit2/tests/core/stat.c b/vendor/libgit2/tests/core/stat.c index bd9b990e3..ef2e45a15 100644 --- a/vendor/libgit2/tests/core/stat.c +++ b/vendor/libgit2/tests/core/stat.c @@ -5,7 +5,7 @@ void test_core_stat__initialize(void) { - cl_git_pass(git_futils_mkdir("root/d1/d2", NULL, 0755, GIT_MKDIR_PATH)); + cl_git_pass(git_futils_mkdir("root/d1/d2", 0755, GIT_MKDIR_PATH)); cl_git_mkfile("root/file", "whatever\n"); cl_git_mkfile("root/d1/file", "whatever\n"); } diff --git a/vendor/libgit2/tests/core/stream.c b/vendor/libgit2/tests/core/stream.c new file mode 100644 index 000000000..0cbf44230 --- /dev/null +++ b/vendor/libgit2/tests/core/stream.c @@ -0,0 +1,51 @@ +#include "clar_libgit2.h" +#include "git2/sys/stream.h" +#include "tls_stream.h" +#include "stream.h" + +static git_stream test_stream; +static int ctor_called; + +static int test_ctor(git_stream **out, const char *host, const char *port) +{ + GIT_UNUSED(host); + GIT_UNUSED(port); + + ctor_called = 1; + *out = &test_stream; + + return 0; +} + +void test_core_stream__register_tls(void) +{ + git_stream *stream; + int error; + + ctor_called = 0; + cl_git_pass(git_stream_register_tls(test_ctor)); + cl_git_pass(git_tls_stream_new(&stream, "localhost", "443")); + cl_assert_equal_i(1, ctor_called); + cl_assert_equal_p(&test_stream, stream); + + ctor_called = 0; + stream = NULL; + cl_git_pass(git_stream_register_tls(NULL)); + error = git_tls_stream_new(&stream, "localhost", "443"); + + /* We don't have arbitrary TLS stream support on Windows + * or when openssl support is disabled (except on OSX + * with Security framework). + */ +#if defined(GIT_WIN32) || \ + (!defined(GIT_SECURE_TRANSPORT) && !defined(GIT_OPENSSL)) + cl_git_fail_with(-1, error); +#else + cl_git_pass(error); +#endif + + cl_assert_equal_i(0, ctor_called); + cl_assert(&test_stream != stream); + + git_stream_free(stream); +} diff --git a/vendor/libgit2/tests/core/useragent.c b/vendor/libgit2/tests/core/useragent.c new file mode 100644 index 000000000..6d06693a8 --- /dev/null +++ b/vendor/libgit2/tests/core/useragent.c @@ -0,0 +1,11 @@ +#include "clar_libgit2.h" +#include "global.h" + +void test_core_useragent__get(void) +{ + const char *custom_name = "super duper git"; + + cl_assert_equal_p(NULL, git_libgit2__user_agent()); + cl_git_pass(git_libgit2_opts(GIT_OPT_SET_USER_AGENT, custom_name)); + cl_assert_equal_s(custom_name, git_libgit2__user_agent()); +} diff --git a/vendor/libgit2/tests/diff/format_email.c b/vendor/libgit2/tests/diff/format_email.c index 18ad99bd5..e55afe958 100644 --- a/vendor/libgit2/tests/diff/format_email.c +++ b/vendor/libgit2/tests/diff/format_email.c @@ -97,6 +97,47 @@ void test_diff_format_email__simple(void) email, "9264b96c6d104d0e07ae33d3007b6a48246c6f92", &opts); } +void test_diff_format_email__with_message(void) +{ + git_diff_format_email_options opts = GIT_DIFF_FORMAT_EMAIL_OPTIONS_INIT; + const char *email = "From 627e7e12d87e07a83fad5b6bfa25e86ead4a5270 Mon Sep 17 00:00:00 2001\n" \ + "From: Patrick Steinhardt \n" \ + "Date: Tue, 24 Nov 2015 13:34:39 +0100\n" \ + "Subject: [PATCH] Modify content with message\n" \ + "\n" \ + "Modify content of file3.txt by appending a new line. Make this\n" \ + "commit message somewhat longer to test behavior with newlines\n" \ + "embedded in the message body.\n" \ + "\n" \ + "Also test if new paragraphs are included correctly.\n" \ + "---\n" \ + " file3.txt | 1 +\n" \ + " 1 file changed, 1 insertion(+), 0 deletions(-)\n" \ + "\n" \ + "diff --git a/file3.txt b/file3.txt\n" \ + "index 9a2d780..7309653 100644\n" \ + "--- a/file3.txt\n" \ + "+++ b/file3.txt\n" \ + "@@ -3,3 +3,4 @@ file3!\n" \ + " file3\n" \ + " file3\n" \ + " file3\n" \ + "+file3\n" \ + "--\n" \ + "libgit2 " LIBGIT2_VERSION "\n" \ + "\n"; + + opts.body = "Modify content of file3.txt by appending a new line. Make this\n" \ + "commit message somewhat longer to test behavior with newlines\n" \ + "embedded in the message body.\n" \ + "\n" \ + "Also test if new paragraphs are included correctly."; + + assert_email_match( + email, "627e7e12d87e07a83fad5b6bfa25e86ead4a5270", &opts); +} + + void test_diff_format_email__multiple(void) { git_oid oid; diff --git a/vendor/libgit2/tests/diff/index.c b/vendor/libgit2/tests/diff/index.c index f702568bf..0293b7821 100644 --- a/vendor/libgit2/tests/diff/index.c +++ b/vendor/libgit2/tests/diff/index.c @@ -185,9 +185,9 @@ static void do_conflicted_diff(diff_expects *exp, unsigned long flags) ancestor.path = ours.path = theirs.path = "staged_changes"; ancestor.mode = ours.mode = theirs.mode = GIT_FILEMODE_BLOB; - git_oid_fromstr(&ancestor.id, "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef"); - git_oid_fromstr(&ours.id, "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef"); - git_oid_fromstr(&theirs.id, "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef"); + git_oid_fromstr(&ancestor.id, "d427e0b2e138501a3d15cc376077a3631e15bd46"); + git_oid_fromstr(&ours.id, "ee3fa1b8c00aff7fe02065fdb50864bb0d932ccf"); + git_oid_fromstr(&theirs.id, "2bd0a343aeef7a2cf0d158478966a6e587ff3863"); cl_git_pass(git_index_conflict_add(index, &ancestor, &ours, &theirs)); cl_git_pass(git_diff_tree_to_index(&diff, g_repo, a, index, &opts)); @@ -255,7 +255,7 @@ void test_diff_index__not_in_head_conflicted(void) theirs.path = "file_not_in_head"; theirs.mode = GIT_FILEMODE_BLOB; - git_oid_fromstr(&theirs.id, "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef"); + git_oid_fromstr(&theirs.id, "2bd0a343aeef7a2cf0d158478966a6e587ff3863"); cl_git_pass(git_index_conflict_add(index, NULL, NULL, &theirs)); cl_git_pass(git_diff_tree_to_index(&diff, g_repo, a, index, NULL)); @@ -268,3 +268,35 @@ void test_diff_index__not_in_head_conflicted(void) git_index_free(index); git_tree_free(a); } + +void test_diff_index__to_index(void) +{ + const char *a_commit = "26a125ee1bf"; /* the current HEAD */ + git_tree *old_tree; + git_index *old_index; + git_index *new_index; + git_diff *diff; + diff_expects exp; + + cl_git_pass(git_index_new(&old_index)); + old_tree = resolve_commit_oid_to_tree(g_repo, a_commit); + cl_git_pass(git_index_read_tree(old_index, old_tree)); + + cl_git_pass(git_repository_index(&new_index, g_repo)); + + cl_git_pass(git_diff_index_to_index(&diff, g_repo, old_index, new_index, NULL)); + + memset(&exp, 0, sizeof(diff_expects)); + cl_git_pass(git_diff_foreach( + diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); + cl_assert_equal_i(8, exp.files); + cl_assert_equal_i(3, exp.file_status[GIT_DELTA_ADDED]); + cl_assert_equal_i(2, exp.file_status[GIT_DELTA_DELETED]); + cl_assert_equal_i(3, exp.file_status[GIT_DELTA_MODIFIED]); + cl_assert_equal_i(0, exp.file_status[GIT_DELTA_CONFLICTED]); + + git_diff_free(diff); + git_index_free(new_index); + git_index_free(old_index); + git_tree_free(old_tree); +} diff --git a/vendor/libgit2/tests/diff/iterator.c b/vendor/libgit2/tests/diff/iterator.c index 6011c6a9b..25a23eda7 100644 --- a/vendor/libgit2/tests/diff/iterator.c +++ b/vendor/libgit2/tests/diff/iterator.c @@ -30,13 +30,17 @@ static void tree_iterator_test( { git_tree *t; git_iterator *i; + git_iterator_options i_opts = GIT_ITERATOR_OPTIONS_INIT; const git_index_entry *entry; int error, count = 0, count_post_reset = 0; git_repository *repo = cl_git_sandbox_init(sandbox); + i_opts.flags = GIT_ITERATOR_DONT_IGNORE_CASE; + i_opts.start = start; + i_opts.end = end; + cl_assert(t = resolve_commit_oid_to_tree(repo, treeish)); - cl_git_pass(git_iterator_for_tree( - &i, t, GIT_ITERATOR_DONT_IGNORE_CASE, start, end)); + cl_git_pass(git_iterator_for_tree(&i, t, &i_opts)); /* test loop */ while (!(error = git_iterator_advance(&entry, i))) { @@ -264,7 +268,7 @@ static void check_tree_entry( cl_git_pass(git_iterator_current_tree_entry(&te, i)); cl_assert(te); - cl_assert(git_oid_streq(&te->oid, oid) == 0); + cl_assert(git_oid_streq(te->oid, oid) == 0); cl_git_pass(git_iterator_current(&ie, i)); cl_git_pass(git_buf_sets(&path, ie->path)); @@ -297,6 +301,7 @@ void test_diff_iterator__tree_special_functions(void) { git_tree *t; git_iterator *i; + git_iterator_options i_opts = GIT_ITERATOR_OPTIONS_INIT; const git_index_entry *entry; git_repository *repo = cl_git_sandbox_init("attr"); int error, cases = 0; @@ -306,8 +311,9 @@ void test_diff_iterator__tree_special_functions(void) repo, "24fa9a9fc4e202313e24b648087495441dab432b"); cl_assert(t != NULL); - cl_git_pass(git_iterator_for_tree( - &i, t, GIT_ITERATOR_DONT_IGNORE_CASE, NULL, NULL)); + i_opts.flags = GIT_ITERATOR_DONT_IGNORE_CASE; + + cl_git_pass(git_iterator_for_tree(&i, t, &i_opts)); while (!(error = git_iterator_advance(&entry, i))) { cl_assert(entry); @@ -365,11 +371,16 @@ static void index_iterator_test( const git_index_entry *entry; int error, count = 0, caps; git_repository *repo = cl_git_sandbox_init(sandbox); + git_iterator_options iter_opts = GIT_ITERATOR_OPTIONS_INIT; cl_git_pass(git_repository_index(&index, repo)); caps = git_index_caps(index); - cl_git_pass(git_iterator_for_index(&i, index, flags, start, end)); + iter_opts.flags = flags; + iter_opts.start = start; + iter_opts.end = end; + + cl_git_pass(git_iterator_for_index(&i, repo, index, &iter_opts)); while (!(error = git_iterator_advance(&entry, i))) { cl_assert(entry); @@ -581,12 +592,16 @@ static void workdir_iterator_test( const char *an_ignored_name) { git_iterator *i; + git_iterator_options i_opts = GIT_ITERATOR_OPTIONS_INIT; const git_index_entry *entry; int error, count = 0, count_all = 0, count_all_post_reset = 0; git_repository *repo = cl_git_sandbox_init(sandbox); - cl_git_pass(git_iterator_for_workdir( - &i, repo, NULL, NULL, GIT_ITERATOR_DONT_AUTOEXPAND, start, end)); + i_opts.flags = GIT_ITERATOR_DONT_AUTOEXPAND; + i_opts.start = start; + i_opts.end = end; + + cl_git_pass(git_iterator_for_workdir(&i, repo, NULL, NULL, &i_opts)); error = git_iterator_current(&entry, i); cl_assert((error == 0 && entry != NULL) || @@ -765,6 +780,7 @@ void test_diff_iterator__workdir_builtin_ignores(void) { git_repository *repo = cl_git_sandbox_init("attr"); git_iterator *i; + git_iterator_options i_opts = GIT_ITERATOR_OPTIONS_INIT; const git_index_entry *entry; int idx; static struct { @@ -796,8 +812,12 @@ void test_diff_iterator__workdir_builtin_ignores(void) cl_git_pass(p_mkdir("attr/sub/sub/.git", 0777)); cl_git_mkfile("attr/sub/.git", "whatever"); + i_opts.flags = GIT_ITERATOR_DONT_AUTOEXPAND; + i_opts.start = "dir"; + i_opts.end = "sub/sub/file"; + cl_git_pass(git_iterator_for_workdir( - &i, repo, NULL, NULL, GIT_ITERATOR_DONT_AUTOEXPAND, "dir", "sub/sub/file")); + &i, repo, NULL, NULL, &i_opts)); cl_git_pass(git_iterator_current(&entry, i)); for (idx = 0; entry != NULL; ++idx) { @@ -827,12 +847,17 @@ static void check_wd_first_through_third_range( git_repository *repo, const char *start, const char *end) { git_iterator *i; + git_iterator_options i_opts = GIT_ITERATOR_OPTIONS_INIT; const git_index_entry *entry; int error, idx; static const char *expected[] = { "FIRST", "second", "THIRD", NULL }; + i_opts.flags = GIT_ITERATOR_IGNORE_CASE; + i_opts.start = start; + i_opts.end = end; + cl_git_pass(git_iterator_for_workdir( - &i, repo, NULL, NULL, GIT_ITERATOR_IGNORE_CASE, start, end)); + &i, repo, NULL, NULL, &i_opts)); cl_git_pass(git_iterator_current(&entry, i)); for (idx = 0; entry != NULL; ++idx) { @@ -877,14 +902,16 @@ static void check_tree_range( { git_tree *head; git_iterator *i; + git_iterator_options i_opts = GIT_ITERATOR_OPTIONS_INIT; int error, count; + i_opts.flags = ignore_case ? GIT_ITERATOR_IGNORE_CASE : GIT_ITERATOR_DONT_IGNORE_CASE; + i_opts.start = start; + i_opts.end = end; + cl_git_pass(git_repository_head_tree(&head, repo)); - cl_git_pass(git_iterator_for_tree( - &i, head, - ignore_case ? GIT_ITERATOR_IGNORE_CASE : GIT_ITERATOR_DONT_IGNORE_CASE, - start, end)); + cl_git_pass(git_iterator_for_tree(&i, head, &i_opts)); for (count = 0; !(error = git_iterator_advance(NULL, i)); ++count) /* count em up */; @@ -931,6 +958,7 @@ static void check_index_range( { git_index *index; git_iterator *i; + git_iterator_options i_opts = GIT_ITERATOR_OPTIONS_INIT; int error, count, caps; bool is_ignoring_case; @@ -942,7 +970,11 @@ static void check_index_range( if (ignore_case != is_ignoring_case) cl_git_pass(git_index_set_caps(index, caps ^ GIT_INDEXCAP_IGNORE_CASE)); - cl_git_pass(git_iterator_for_index(&i, index, 0, start, end)); + i_opts.flags = 0; + i_opts.start = start; + i_opts.end = end; + + cl_git_pass(git_iterator_for_index(&i, repo, index, &i_opts)); cl_assert(git_iterator_ignore_case(i) == ignore_case); diff --git a/vendor/libgit2/tests/diff/notify.c b/vendor/libgit2/tests/diff/notify.c index 6ef4af573..653512795 100644 --- a/vendor/libgit2/tests/diff/notify.c +++ b/vendor/libgit2/tests/diff/notify.c @@ -55,7 +55,7 @@ static void test_notify( opts.pathspec.strings = searched_pathspecs; opts.pathspec.count = pathspecs_count; - opts.notify_payload = expected_matched_pathspecs; + opts.payload = expected_matched_pathspecs; memset(&exp, 0, sizeof(exp)); cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); @@ -228,3 +228,31 @@ void test_diff_notify__notify_cb_can_be_used_as_filtering_function(void) git_diff_free(diff); } + +static int progress_abort_diff( + const git_diff *diff_so_far, + const char *old_path, + const char *new_path, + void *payload) +{ + GIT_UNUSED(diff_so_far); + GIT_UNUSED(old_path); + GIT_UNUSED(new_path); + GIT_UNUSED(payload); + + return -42; +} + +void test_diff_notify__progress_cb_can_abort_diff(void) +{ + git_diff_options opts = GIT_DIFF_OPTIONS_INIT; + git_diff *diff = NULL; + + g_repo = cl_git_sandbox_init("status"); + + opts.flags |= GIT_DIFF_INCLUDE_IGNORED | GIT_DIFF_INCLUDE_UNTRACKED; + opts.progress_cb = progress_abort_diff; + + cl_git_fail_with( + git_diff_index_to_workdir(&diff, g_repo, NULL, &opts), -42); +} diff --git a/vendor/libgit2/tests/diff/tree.c b/vendor/libgit2/tests/diff/tree.c index 2bc9e6a55..e4b2a8bbe 100644 --- a/vendor/libgit2/tests/diff/tree.c +++ b/vendor/libgit2/tests/diff/tree.c @@ -90,7 +90,7 @@ void test_diff_tree__0(void) #define DIFF_OPTS(FLAGS, CTXT) \ {GIT_DIFF_OPTIONS_VERSION, (FLAGS), GIT_SUBMODULE_IGNORE_UNSPECIFIED, \ - {NULL,0}, NULL, NULL, (CTXT), 1} + {NULL,0}, NULL, NULL, NULL, (CTXT), 1} void test_diff_tree__options(void) { diff --git a/vendor/libgit2/tests/diff/workdir.c b/vendor/libgit2/tests/diff/workdir.c index 8a23f53ae..e1bbce8fb 100644 --- a/vendor/libgit2/tests/diff/workdir.c +++ b/vendor/libgit2/tests/diff/workdir.c @@ -85,9 +85,11 @@ void test_diff_workdir__to_index_with_conflicts(void) /* Adding an entry that represents a rename gets two files in conflict */ our_entry.path = "subdir/modified_file"; our_entry.mode = 0100644; + git_oid_fromstr(&our_entry.id, "ee3fa1b8c00aff7fe02065fdb50864bb0d932ccf"); their_entry.path = "subdir/rename_conflict"; their_entry.mode = 0100644; + git_oid_fromstr(&their_entry.id, "2bd0a343aeef7a2cf0d158478966a6e587ff3863"); cl_git_pass(git_repository_index(&index, g_repo)); cl_git_pass(git_index_conflict_add(index, NULL, &our_entry, &their_entry)); @@ -444,6 +446,216 @@ void test_diff_workdir__to_index_with_pathspec(void) git_diff_free(diff); } +void test_diff_workdir__to_index_with_pathlist_disabling_fnmatch(void) +{ + git_diff_options opts = GIT_DIFF_OPTIONS_INIT; + git_diff *diff = NULL; + diff_expects exp; + char *pathspec = NULL; + int use_iterator; + + g_repo = cl_git_sandbox_init("status"); + + opts.context_lines = 3; + opts.interhunk_lines = 1; + opts.flags |= GIT_DIFF_INCLUDE_IGNORED | GIT_DIFF_INCLUDE_UNTRACKED | + GIT_DIFF_DISABLE_PATHSPEC_MATCH; + opts.pathspec.strings = &pathspec; + opts.pathspec.count = 0; + + /* ensure that an empty pathspec list is ignored */ + cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); + + for (use_iterator = 0; use_iterator <= 1; use_iterator++) { + memset(&exp, 0, sizeof(exp)); + + if (use_iterator) + cl_git_pass(diff_foreach_via_iterator( + diff, diff_file_cb, NULL, NULL, NULL, &exp)); + else + cl_git_pass(git_diff_foreach(diff, diff_file_cb, NULL, NULL, NULL, &exp)); + + cl_assert_equal_i(13, exp.files); + cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); + cl_assert_equal_i(4, exp.file_status[GIT_DELTA_DELETED]); + cl_assert_equal_i(4, exp.file_status[GIT_DELTA_MODIFIED]); + cl_assert_equal_i(1, exp.file_status[GIT_DELTA_IGNORED]); + cl_assert_equal_i(4, exp.file_status[GIT_DELTA_UNTRACKED]); + } + + git_diff_free(diff); + + /* ensure that a single NULL pathspec is filtered out (like when using + * fnmatch filtering) + */ + + opts.pathspec.count = 1; + + cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); + + for (use_iterator = 0; use_iterator <= 1; use_iterator++) { + memset(&exp, 0, sizeof(exp)); + + if (use_iterator) + cl_git_pass(diff_foreach_via_iterator( + diff, diff_file_cb, NULL, NULL, NULL, &exp)); + else + cl_git_pass(git_diff_foreach(diff, diff_file_cb, NULL, NULL, NULL, &exp)); + + cl_assert_equal_i(13, exp.files); + cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); + cl_assert_equal_i(4, exp.file_status[GIT_DELTA_DELETED]); + cl_assert_equal_i(4, exp.file_status[GIT_DELTA_MODIFIED]); + cl_assert_equal_i(1, exp.file_status[GIT_DELTA_IGNORED]); + cl_assert_equal_i(4, exp.file_status[GIT_DELTA_UNTRACKED]); + } + + git_diff_free(diff); + + pathspec = "modified_file"; + + cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); + + for (use_iterator = 0; use_iterator <= 1; use_iterator++) { + memset(&exp, 0, sizeof(exp)); + + if (use_iterator) + cl_git_pass(diff_foreach_via_iterator( + diff, diff_file_cb, NULL, NULL, NULL, &exp)); + else + cl_git_pass(git_diff_foreach(diff, diff_file_cb, NULL, NULL, NULL, &exp)); + + cl_assert_equal_i(1, exp.files); + cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); + cl_assert_equal_i(0, exp.file_status[GIT_DELTA_DELETED]); + cl_assert_equal_i(1, exp.file_status[GIT_DELTA_MODIFIED]); + cl_assert_equal_i(0, exp.file_status[GIT_DELTA_IGNORED]); + cl_assert_equal_i(0, exp.file_status[GIT_DELTA_UNTRACKED]); + } + + git_diff_free(diff); + + /* ensure that subdirs can be specified */ + pathspec = "subdir"; + + cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); + + for (use_iterator = 0; use_iterator <= 1; use_iterator++) { + memset(&exp, 0, sizeof(exp)); + + if (use_iterator) + cl_git_pass(diff_foreach_via_iterator( + diff, diff_file_cb, NULL, NULL, NULL, &exp)); + else + cl_git_pass(git_diff_foreach(diff, diff_file_cb, NULL, NULL, NULL, &exp)); + + cl_assert_equal_i(3, exp.files); + cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); + cl_assert_equal_i(1, exp.file_status[GIT_DELTA_DELETED]); + cl_assert_equal_i(1, exp.file_status[GIT_DELTA_MODIFIED]); + cl_assert_equal_i(0, exp.file_status[GIT_DELTA_IGNORED]); + cl_assert_equal_i(1, exp.file_status[GIT_DELTA_UNTRACKED]); + } + + git_diff_free(diff); + + /* ensure that subdirs can be specified with a trailing slash */ + pathspec = "subdir/"; + + cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); + + for (use_iterator = 0; use_iterator <= 1; use_iterator++) { + memset(&exp, 0, sizeof(exp)); + + if (use_iterator) + cl_git_pass(diff_foreach_via_iterator( + diff, diff_file_cb, NULL, NULL, NULL, &exp)); + else + cl_git_pass(git_diff_foreach(diff, diff_file_cb, NULL, NULL, NULL, &exp)); + + cl_assert_equal_i(3, exp.files); + cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); + cl_assert_equal_i(1, exp.file_status[GIT_DELTA_DELETED]); + cl_assert_equal_i(1, exp.file_status[GIT_DELTA_MODIFIED]); + cl_assert_equal_i(0, exp.file_status[GIT_DELTA_IGNORED]); + cl_assert_equal_i(1, exp.file_status[GIT_DELTA_UNTRACKED]); + } + + git_diff_free(diff); + + /* ensure that fnmatching is completely disabled */ + pathspec = "subdir/*"; + + cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); + + for (use_iterator = 0; use_iterator <= 1; use_iterator++) { + memset(&exp, 0, sizeof(exp)); + + if (use_iterator) + cl_git_pass(diff_foreach_via_iterator( + diff, diff_file_cb, NULL, NULL, NULL, &exp)); + else + cl_git_pass(git_diff_foreach(diff, diff_file_cb, NULL, NULL, NULL, &exp)); + + cl_assert_equal_i(0, exp.files); + cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); + cl_assert_equal_i(0, exp.file_status[GIT_DELTA_DELETED]); + cl_assert_equal_i(0, exp.file_status[GIT_DELTA_MODIFIED]); + cl_assert_equal_i(0, exp.file_status[GIT_DELTA_IGNORED]); + cl_assert_equal_i(0, exp.file_status[GIT_DELTA_UNTRACKED]); + } + + git_diff_free(diff); + + /* ensure that the prefix matching isn't completely braindead */ + pathspec = "subdi"; + + cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); + + for (use_iterator = 0; use_iterator <= 1; use_iterator++) { + memset(&exp, 0, sizeof(exp)); + + if (use_iterator) + cl_git_pass(diff_foreach_via_iterator( + diff, diff_file_cb, NULL, NULL, NULL, &exp)); + else + cl_git_pass(git_diff_foreach(diff, diff_file_cb, NULL, NULL, NULL, &exp)); + + cl_assert_equal_i(0, exp.files); + cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); + cl_assert_equal_i(0, exp.file_status[GIT_DELTA_DELETED]); + cl_assert_equal_i(0, exp.file_status[GIT_DELTA_MODIFIED]); + cl_assert_equal_i(0, exp.file_status[GIT_DELTA_IGNORED]); + cl_assert_equal_i(0, exp.file_status[GIT_DELTA_UNTRACKED]); + } + + git_diff_free(diff); + + /* ensure that fnmatching isn't working at all */ + pathspec = "*_deleted"; + + cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); + + for (use_iterator = 0; use_iterator <= 1; use_iterator++) { + memset(&exp, 0, sizeof(exp)); + + if (use_iterator) + cl_git_pass(diff_foreach_via_iterator( + diff, diff_file_cb, NULL, NULL, NULL, &exp)); + else + cl_git_pass(git_diff_foreach(diff, diff_file_cb, NULL, NULL, NULL, &exp)); + + cl_assert_equal_i(0, exp.files); + cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); + cl_assert_equal_i(0, exp.file_status[GIT_DELTA_DELETED]); + cl_assert_equal_i(0, exp.file_status[GIT_DELTA_MODIFIED]); + cl_assert_equal_i(0, exp.file_status[GIT_DELTA_IGNORED]); + cl_assert_equal_i(0, exp.file_status[GIT_DELTA_UNTRACKED]); + } + + git_diff_free(diff); +} + void test_diff_workdir__filemode_changes(void) { git_diff *diff = NULL; @@ -1545,7 +1757,7 @@ void test_diff_workdir__with_stale_index(void) static int touch_file(void *payload, git_buf *path) { struct stat st; - struct timeval times[2]; + struct p_timeval times[2]; GIT_UNUSED(payload); if (git_path_isdir(path->ptr)) @@ -1765,9 +1977,9 @@ void test_diff_workdir__to_index_conflicted(void) { ancestor.path = ours.path = theirs.path = "_file"; ancestor.mode = ours.mode = theirs.mode = 0100644; - git_oid_fromstr(&ancestor.id, "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef"); - git_oid_fromstr(&ours.id, "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef"); - git_oid_fromstr(&theirs.id, "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef"); + git_oid_fromstr(&ancestor.id, "d427e0b2e138501a3d15cc376077a3631e15bd46"); + git_oid_fromstr(&ours.id, "ee3fa1b8c00aff7fe02065fdb50864bb0d932ccf"); + git_oid_fromstr(&theirs.id, "2bd0a343aeef7a2cf0d158478966a6e587ff3863"); cl_git_pass(git_index_conflict_add(index, &ancestor, &ours, &theirs)); cl_git_pass(git_diff_tree_to_index(&diff1, g_repo, a, index, NULL)); @@ -1796,7 +2008,7 @@ void test_diff_workdir__only_writes_index_when_necessary(void) git_oid initial, first, second; git_buf path = GIT_BUF_INIT; struct stat st; - struct timeval times[2]; + struct p_timeval times[2]; opts.flags |= GIT_DIFF_INCLUDE_UNTRACKED | GIT_DIFF_UPDATE_INDEX; @@ -1844,3 +2056,107 @@ void test_diff_workdir__only_writes_index_when_necessary(void) git_index_free(index); } +void test_diff_workdir__to_index_pathlist(void) +{ + git_index *index; + git_diff *diff; + git_diff_options opts = GIT_DIFF_OPTIONS_INIT; + git_vector pathlist = GIT_VECTOR_INIT; + + git_vector_insert(&pathlist, "foobar/asdf"); + git_vector_insert(&pathlist, "subdir/asdf"); + git_vector_insert(&pathlist, "ignored/asdf"); + + g_repo = cl_git_sandbox_init("status"); + + cl_git_mkfile("status/.gitignore", ".gitignore\n" "ignored/\n"); + + cl_must_pass(p_mkdir("status/foobar", 0777)); + cl_git_mkfile("status/foobar/one", "one\n"); + + cl_must_pass(p_mkdir("status/ignored", 0777)); + cl_git_mkfile("status/ignored/one", "one\n"); + cl_git_mkfile("status/ignored/two", "two\n"); + cl_git_mkfile("status/ignored/three", "three\n"); + + cl_git_pass(git_repository_index(&index, g_repo)); + + opts.flags = GIT_DIFF_INCLUDE_IGNORED; + opts.pathspec.strings = (char **)pathlist.contents; + opts.pathspec.count = pathlist.length; + + cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, index, &opts)); + cl_assert_equal_i(0, git_diff_num_deltas(diff)); + git_diff_free(diff); + + opts.flags |= GIT_DIFF_DISABLE_PATHSPEC_MATCH; + + cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, index, &opts)); + cl_assert_equal_i(0, git_diff_num_deltas(diff)); + git_diff_free(diff); + + git_index_free(index); + git_vector_free(&pathlist); +} + +void test_diff_workdir__symlink_changed_on_non_symlink_platform(void) +{ + git_tree *tree; + git_diff *diff; + diff_expects exp = {0}; + const git_diff_delta *delta; + const char *commit = "7fccd7"; + git_diff_options opts = GIT_DIFF_OPTIONS_INIT; + git_vector pathlist = GIT_VECTOR_INIT; + int symlinks; + + g_repo = cl_git_sandbox_init("unsymlinked.git"); + + cl_git_pass(git_repository__cvar(&symlinks, g_repo, GIT_CVAR_SYMLINKS)); + + if (symlinks) + cl_skip(); + + cl_git_pass(git_vector_insert(&pathlist, "include/Nu/Nu.h")); + + opts.pathspec.strings = (char **)pathlist.contents; + opts.pathspec.count = pathlist.length; + + cl_must_pass(p_mkdir("symlink", 0777)); + cl_git_pass(git_repository_set_workdir(g_repo, "symlink", false)); + + cl_assert((tree = resolve_commit_oid_to_tree(g_repo, commit)) != NULL); + + /* first, do the diff with the original contents */ + + cl_git_pass(git_futils_mkpath2file("symlink/include/Nu/Nu.h", 0755)); + cl_git_mkfile("symlink/include/Nu/Nu.h", "../../objc/Nu.h"); + + cl_git_pass(git_diff_tree_to_workdir(&diff, g_repo, tree, &opts)); + cl_assert_equal_i(0, git_diff_num_deltas(diff)); + git_diff_free(diff); + + /* now update the contents and expect a difference, but that the file + * mode has persisted as a symbolic link. + */ + + cl_git_rewritefile("symlink/include/Nu/Nu.h", "awesome content\n"); + + cl_git_pass(git_diff_tree_to_workdir(&diff, g_repo, tree, &opts)); + + cl_git_pass(git_diff_foreach( + diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); + cl_assert_equal_i(1, exp.files); + + cl_assert_equal_i(1, git_diff_num_deltas(diff)); + delta = git_diff_get_delta(diff, 0); + cl_assert_equal_i(GIT_FILEMODE_LINK, delta->old_file.mode); + cl_assert_equal_i(GIT_FILEMODE_LINK, delta->new_file.mode); + + git_diff_free(diff); + + cl_git_pass(git_futils_rmdir_r("symlink", NULL, GIT_RMDIR_REMOVE_FILES)); + + git_tree_free(tree); + git_vector_free(&pathlist); +} diff --git a/vendor/libgit2/tests/filter/custom.c b/vendor/libgit2/tests/filter/custom.c index 493d26c80..fd1cd271c 100644 --- a/vendor/libgit2/tests/filter/custom.c +++ b/vendor/libgit2/tests/filter/custom.c @@ -5,6 +5,7 @@ #include "buf_text.h" #include "git2/sys/filter.h" #include "git2/sys/repository.h" +#include "custom_helpers.h" /* going TO_WORKDIR, filters are executed low to high * going TO_ODB, filters are executed high to low @@ -12,8 +13,6 @@ #define BITFLIP_FILTER_PRIORITY -1 #define REVERSE_FILTER_PRIORITY -2 -#define VERY_SECURE_ENCRYPTION(b) ((b) ^ 0xff) - #ifdef GIT_WIN32 # define NEWLINE "\r\n" #else @@ -27,6 +26,8 @@ static char workdir_data[] = "trivially" NEWLINE "scrambled." NEWLINE; +#define REVERSED_DATA_LEN 51 + /* Represents the data above scrambled (bits flipped) after \r\n -> \n * conversion, then bytewise reversed */ @@ -63,107 +64,6 @@ void test_filter_custom__cleanup(void) g_repo = NULL; } -static int bitflip_filter_apply( - git_filter *self, - void **payload, - git_buf *to, - const git_buf *from, - const git_filter_source *source) -{ - const unsigned char *src = (const unsigned char *)from->ptr; - unsigned char *dst; - size_t i; - - GIT_UNUSED(self); GIT_UNUSED(payload); - - /* verify that attribute path match worked as expected */ - cl_assert_equal_i( - 0, git__strncmp("hero", git_filter_source_path(source), 4)); - - if (!from->size) - return 0; - - cl_git_pass(git_buf_grow(to, from->size)); - - dst = (unsigned char *)to->ptr; - - for (i = 0; i < from->size; i++) - dst[i] = VERY_SECURE_ENCRYPTION(src[i]); - - to->size = from->size; - - return 0; -} - -static void bitflip_filter_free(git_filter *f) -{ - git__free(f); -} - -static git_filter *create_bitflip_filter(void) -{ - git_filter *filter = git__calloc(1, sizeof(git_filter)); - cl_assert(filter); - - filter->version = GIT_FILTER_VERSION; - filter->attributes = "+bitflip"; - filter->shutdown = bitflip_filter_free; - filter->apply = bitflip_filter_apply; - - return filter; -} - - -static int reverse_filter_apply( - git_filter *self, - void **payload, - git_buf *to, - const git_buf *from, - const git_filter_source *source) -{ - const unsigned char *src = (const unsigned char *)from->ptr; - const unsigned char *end = src + from->size; - unsigned char *dst; - - GIT_UNUSED(self); GIT_UNUSED(payload); GIT_UNUSED(source); - - /* verify that attribute path match worked as expected */ - cl_assert_equal_i( - 0, git__strncmp("hero", git_filter_source_path(source), 4)); - - if (!from->size) - return 0; - - cl_git_pass(git_buf_grow(to, from->size)); - - dst = (unsigned char *)to->ptr + from->size - 1; - - while (src < end) - *dst-- = *src++; - - to->size = from->size; - - return 0; -} - -static void reverse_filter_free(git_filter *f) -{ - git__free(f); -} - -static git_filter *create_reverse_filter(const char *attrs) -{ - git_filter *filter = git__calloc(1, sizeof(git_filter)); - cl_assert(filter); - - filter->version = GIT_FILTER_VERSION; - filter->attributes = attrs; - filter->shutdown = reverse_filter_free; - filter->apply = reverse_filter_apply; - - return filter; -} - static void register_custom_filters(void) { static int filters_registered = 0; @@ -186,7 +86,6 @@ static void register_custom_filters(void) } } - void test_filter_custom__to_odb(void) { git_filter_list *fl; diff --git a/vendor/libgit2/tests/filter/custom_helpers.c b/vendor/libgit2/tests/filter/custom_helpers.c new file mode 100644 index 000000000..2c80212be --- /dev/null +++ b/vendor/libgit2/tests/filter/custom_helpers.c @@ -0,0 +1,108 @@ +#include "clar_libgit2.h" +#include "posix.h" +#include "filter.h" +#include "buf_text.h" +#include "git2/sys/filter.h" + +#define VERY_SECURE_ENCRYPTION(b) ((b) ^ 0xff) + +int bitflip_filter_apply( + git_filter *self, + void **payload, + git_buf *to, + const git_buf *from, + const git_filter_source *source) +{ + const unsigned char *src = (const unsigned char *)from->ptr; + unsigned char *dst; + size_t i; + + GIT_UNUSED(self); GIT_UNUSED(payload); + + /* verify that attribute path match worked as expected */ + cl_assert_equal_i( + 0, git__strncmp("hero", git_filter_source_path(source), 4)); + + if (!from->size) + return 0; + + cl_git_pass(git_buf_grow(to, from->size)); + + dst = (unsigned char *)to->ptr; + + for (i = 0; i < from->size; i++) + dst[i] = VERY_SECURE_ENCRYPTION(src[i]); + + to->size = from->size; + + return 0; +} + +static void bitflip_filter_free(git_filter *f) +{ + git__free(f); +} + +git_filter *create_bitflip_filter(void) +{ + git_filter *filter = git__calloc(1, sizeof(git_filter)); + cl_assert(filter); + + filter->version = GIT_FILTER_VERSION; + filter->attributes = "+bitflip"; + filter->shutdown = bitflip_filter_free; + filter->apply = bitflip_filter_apply; + + return filter; +} + + +int reverse_filter_apply( + git_filter *self, + void **payload, + git_buf *to, + const git_buf *from, + const git_filter_source *source) +{ + const unsigned char *src = (const unsigned char *)from->ptr; + const unsigned char *end = src + from->size; + unsigned char *dst; + + GIT_UNUSED(self); GIT_UNUSED(payload); GIT_UNUSED(source); + + /* verify that attribute path match worked as expected */ + cl_assert_equal_i( + 0, git__strncmp("hero", git_filter_source_path(source), 4)); + + if (!from->size) + return 0; + + cl_git_pass(git_buf_grow(to, from->size)); + + dst = (unsigned char *)to->ptr + from->size - 1; + + while (src < end) + *dst-- = *src++; + + to->size = from->size; + + return 0; +} + +static void reverse_filter_free(git_filter *f) +{ + git__free(f); +} + +git_filter *create_reverse_filter(const char *attrs) +{ + git_filter *filter = git__calloc(1, sizeof(git_filter)); + cl_assert(filter); + + filter->version = GIT_FILTER_VERSION; + filter->attributes = attrs; + filter->shutdown = reverse_filter_free; + filter->apply = reverse_filter_apply; + + return filter; +} diff --git a/vendor/libgit2/tests/filter/custom_helpers.h b/vendor/libgit2/tests/filter/custom_helpers.h new file mode 100644 index 000000000..13cfb23ae --- /dev/null +++ b/vendor/libgit2/tests/filter/custom_helpers.h @@ -0,0 +1,18 @@ +#include "git2/sys/filter.h" + +extern git_filter *create_bitflip_filter(void); +extern git_filter *create_reverse_filter(const char *attr); + +extern int bitflip_filter_apply( + git_filter *self, + void **payload, + git_buf *to, + const git_buf *from, + const git_filter_source *source); + +extern int reverse_filter_apply( + git_filter *self, + void **payload, + git_buf *to, + const git_buf *from, + const git_filter_source *source); diff --git a/vendor/libgit2/tests/filter/stream.c b/vendor/libgit2/tests/filter/stream.c index 6bf540ce7..30f5e5027 100644 --- a/vendor/libgit2/tests/filter/stream.c +++ b/vendor/libgit2/tests/filter/stream.c @@ -209,7 +209,7 @@ void test_filter_stream__smallfile(void) /* optionally write a 500 MB file through the compression stream */ void test_filter_stream__bigfile(void) { - if (!cl_getenv("GITTEST_INVASIVE_FS_SIZE")) + if (!cl_is_env_set("GITTEST_INVASIVE_FS_SIZE")) cl_skip(); test_stream(51200); diff --git a/vendor/libgit2/tests/filter/wildcard.c b/vendor/libgit2/tests/filter/wildcard.c new file mode 100644 index 000000000..999b33653 --- /dev/null +++ b/vendor/libgit2/tests/filter/wildcard.c @@ -0,0 +1,184 @@ +#include "clar_libgit2.h" +#include "posix.h" +#include "blob.h" +#include "filter.h" +#include "buf_text.h" +#include "git2/sys/filter.h" +#include "git2/sys/repository.h" +#include "custom_helpers.h" + +static git_repository *g_repo = NULL; + +static git_filter *create_wildcard_filter(void); + +#define DATA_LEN 32 + +static unsigned char input[] = { + 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, + 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, + 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, + 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, +}; + +static unsigned char reversed[] = { + 0x1f, 0x1e, 0x1d, 0x1c, 0x1b, 0x1a, 0x19, 0x18, + 0x17, 0x16, 0x15, 0x14, 0x13, 0x12, 0x11, 0x10, + 0x0f, 0x0e, 0x0d, 0x0c, 0x0b, 0x0a, 0x09, 0x08, + 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00, +}; + +static unsigned char flipped[] = { + 0xff, 0xfe, 0xfd, 0xfc, 0xfb, 0xfa, 0xf9, 0xf8, + 0xf7, 0xf6, 0xf5, 0xf4, 0xf3, 0xf2, 0xf1, 0xf0, + 0xef, 0xee, 0xed, 0xec, 0xeb, 0xea, 0xe9, 0xe8, + 0xe7, 0xe6, 0xe5, 0xe4, 0xe3, 0xe2, 0xe1, 0xe0, +}; + +void test_filter_wildcard__initialize(void) +{ + cl_git_pass(git_filter_register( + "wildcard", create_wildcard_filter(), GIT_FILTER_DRIVER_PRIORITY)); + + g_repo = cl_git_sandbox_init("empty_standard_repo"); + + cl_git_rewritefile( + "empty_standard_repo/.gitattributes", + "* binary\n" + "hero-flip-* filter=wcflip\n" + "hero-reverse-* filter=wcreverse\n" + "none-* filter=unregistered\n"); +} + +void test_filter_wildcard__cleanup(void) +{ + cl_git_pass(git_filter_unregister("wildcard")); + + cl_git_sandbox_cleanup(); + g_repo = NULL; +} + +static int wildcard_filter_check( + git_filter *self, + void **payload, + const git_filter_source *src, + const char **attr_values) +{ + GIT_UNUSED(self); + GIT_UNUSED(src); + + if (strcmp(attr_values[0], "wcflip") == 0 || + strcmp(attr_values[0], "wcreverse") == 0) { + *payload = git__strdup(attr_values[0]); + GITERR_CHECK_ALLOC(*payload); + return 0; + } + + return GIT_PASSTHROUGH; +} + +static int wildcard_filter_apply( + git_filter *self, + void **payload, + git_buf *to, + const git_buf *from, + const git_filter_source *source) +{ + const char *filtername = *payload; + + if (filtername && strcmp(filtername, "wcflip") == 0) + return bitflip_filter_apply(self, payload, to, from, source); + else if (filtername && strcmp(filtername, "wcreverse") == 0) + return reverse_filter_apply(self, payload, to, from, source); + + cl_fail("Unexpected attribute"); + return GIT_PASSTHROUGH; +} + +static void wildcard_filter_cleanup(git_filter *self, void *payload) +{ + GIT_UNUSED(self); + git__free(payload); +} + +static void wildcard_filter_free(git_filter *f) +{ + git__free(f); +} + +static git_filter *create_wildcard_filter(void) +{ + git_filter *filter = git__calloc(1, sizeof(git_filter)); + cl_assert(filter); + + filter->version = GIT_FILTER_VERSION; + filter->attributes = "filter=*"; + filter->check = wildcard_filter_check; + filter->apply = wildcard_filter_apply; + filter->cleanup = wildcard_filter_cleanup; + filter->shutdown = wildcard_filter_free; + + return filter; +} + +void test_filter_wildcard__reverse(void) +{ + git_filter_list *fl; + git_buf in = GIT_BUF_INIT, out = GIT_BUF_INIT; + + cl_git_pass(git_filter_list_load( + &fl, g_repo, NULL, "hero-reverse-foo", GIT_FILTER_TO_ODB, 0)); + + cl_git_pass(git_buf_put(&in, (char *)input, DATA_LEN)); + cl_git_pass(git_filter_list_apply_to_data(&out, fl, &in)); + + cl_assert_equal_i(DATA_LEN, out.size); + + cl_assert_equal_i( + 0, memcmp(reversed, out.ptr, out.size)); + + git_filter_list_free(fl); + git_buf_free(&out); + git_buf_free(&in); +} + +void test_filter_wildcard__flip(void) +{ + git_filter_list *fl; + git_buf in = GIT_BUF_INIT, out = GIT_BUF_INIT; + + cl_git_pass(git_filter_list_load( + &fl, g_repo, NULL, "hero-flip-foo", GIT_FILTER_TO_ODB, 0)); + + cl_git_pass(git_buf_put(&in, (char *)input, DATA_LEN)); + cl_git_pass(git_filter_list_apply_to_data(&out, fl, &in)); + + cl_assert_equal_i(DATA_LEN, out.size); + + cl_assert_equal_i( + 0, memcmp(flipped, out.ptr, out.size)); + + git_filter_list_free(fl); + git_buf_free(&out); + git_buf_free(&in); +} + +void test_filter_wildcard__none(void) +{ + git_filter_list *fl; + git_buf in = GIT_BUF_INIT, out = GIT_BUF_INIT; + + cl_git_pass(git_filter_list_load( + &fl, g_repo, NULL, "none-foo", GIT_FILTER_TO_ODB, 0)); + + cl_git_pass(git_buf_put(&in, (char *)input, DATA_LEN)); + cl_git_pass(git_filter_list_apply_to_data(&out, fl, &in)); + + cl_assert_equal_i(DATA_LEN, out.size); + + cl_assert_equal_i( + 0, memcmp(input, out.ptr, out.size)); + + git_filter_list_free(fl); + git_buf_free(&out); + git_buf_free(&in); +} diff --git a/vendor/libgit2/tests/index/add.c b/vendor/libgit2/tests/index/add.c new file mode 100644 index 000000000..f101ea266 --- /dev/null +++ b/vendor/libgit2/tests/index/add.c @@ -0,0 +1,84 @@ +#include "clar_libgit2.h" + +static git_repository *g_repo = NULL; +static git_index *g_index = NULL; + +static const char *valid_blob_id = "fa49b077972391ad58037050f2a75f74e3671e92"; +static const char *valid_tree_id = "181037049a54a1eb5fab404658a3a250b44335d7"; +static const char *valid_commit_id = "763d71aadf09a7951596c9746c024e7eece7c7af"; +static const char *invalid_id = "1234567890123456789012345678901234567890"; + +void test_index_add__initialize(void) +{ + g_repo = cl_git_sandbox_init("testrepo"); + cl_git_pass(git_repository_index(&g_index, g_repo)); +} + +void test_index_add__cleanup(void) +{ + git_index_free(g_index); + cl_git_sandbox_cleanup(); + g_repo = NULL; + + cl_git_pass(git_libgit2_opts(GIT_OPT_ENABLE_STRICT_OBJECT_CREATION, 1)); +} + +static void test_add_entry( + bool should_succeed, const char *idstr, git_filemode_t mode) +{ + git_index_entry entry = {{0}}; + + cl_git_pass(git_oid_fromstr(&entry.id, idstr)); + + entry.path = mode == GIT_FILEMODE_TREE ? "test_folder" : "test_file"; + entry.mode = mode; + + if (should_succeed) + cl_git_pass(git_index_add(g_index, &entry)); + else + cl_git_fail(git_index_add(g_index, &entry)); +} + +void test_index_add__invalid_entries_succeeds_by_default(void) +{ + /* + * Ensure that there is validation on object ids by default + */ + + /* ensure that we can add some actually good entries */ + test_add_entry(true, valid_blob_id, GIT_FILEMODE_BLOB); + test_add_entry(true, valid_blob_id, GIT_FILEMODE_BLOB_EXECUTABLE); + test_add_entry(true, valid_blob_id, GIT_FILEMODE_LINK); + + /* test that we fail to add some invalid (missing) blobs and trees */ + test_add_entry(false, invalid_id, GIT_FILEMODE_BLOB); + test_add_entry(false, invalid_id, GIT_FILEMODE_BLOB_EXECUTABLE); + test_add_entry(false, invalid_id, GIT_FILEMODE_LINK); + + /* test that we validate the types of objects */ + test_add_entry(false, valid_commit_id, GIT_FILEMODE_BLOB); + test_add_entry(false, valid_tree_id, GIT_FILEMODE_BLOB_EXECUTABLE); + test_add_entry(false, valid_commit_id, GIT_FILEMODE_LINK); + + /* + * Ensure that there we can disable validation + */ + + cl_git_pass(git_libgit2_opts(GIT_OPT_ENABLE_STRICT_OBJECT_CREATION, 0)); + + /* ensure that we can add some actually good entries */ + test_add_entry(true, valid_blob_id, GIT_FILEMODE_BLOB); + test_add_entry(true, valid_blob_id, GIT_FILEMODE_BLOB_EXECUTABLE); + test_add_entry(true, valid_blob_id, GIT_FILEMODE_LINK); + + /* test that we can now add some invalid (missing) blobs and trees */ + test_add_entry(true, invalid_id, GIT_FILEMODE_BLOB); + test_add_entry(true, invalid_id, GIT_FILEMODE_BLOB_EXECUTABLE); + test_add_entry(true, invalid_id, GIT_FILEMODE_LINK); + + /* test that we do not validate the types of objects */ + test_add_entry(true, valid_commit_id, GIT_FILEMODE_BLOB); + test_add_entry(true, valid_tree_id, GIT_FILEMODE_BLOB_EXECUTABLE); + test_add_entry(true, valid_commit_id, GIT_FILEMODE_LINK); +} + diff --git a/vendor/libgit2/tests/index/addall.c b/vendor/libgit2/tests/index/addall.c index 9ddb27f95..7b7a178d1 100644 --- a/vendor/libgit2/tests/index/addall.c +++ b/vendor/libgit2/tests/index/addall.c @@ -307,6 +307,41 @@ void test_index_addall__files_in_folders(void) git_index_free(index); } +void test_index_addall__hidden_files(void) +{ + git_index *index; + + GIT_UNUSED(index); + +#ifdef GIT_WIN32 + addall_create_test_repo(true); + + cl_git_pass(git_repository_index(&index, g_repo)); + + cl_git_pass(git_index_add_all(index, NULL, 0, NULL, NULL)); + check_stat_data(index, TEST_DIR "/file.bar", true); + check_status(g_repo, 2, 0, 0, 0, 0, 0, 1, 0); + + cl_git_mkfile(TEST_DIR "/file.zzz", "yet another one"); + cl_git_mkfile(TEST_DIR "/more.zzz", "yet another one"); + cl_git_mkfile(TEST_DIR "/other.zzz", "yet another one"); + + check_status(g_repo, 2, 0, 0, 3, 0, 0, 1, 0); + + cl_git_pass(git_win32__set_hidden(TEST_DIR "/file.zzz", true)); + cl_git_pass(git_win32__set_hidden(TEST_DIR "/more.zzz", true)); + cl_git_pass(git_win32__set_hidden(TEST_DIR "/other.zzz", true)); + + check_status(g_repo, 2, 0, 0, 3, 0, 0, 1, 0); + + cl_git_pass(git_index_add_all(index, NULL, 0, NULL, NULL)); + check_stat_data(index, TEST_DIR "/file.bar", true); + check_status(g_repo, 5, 0, 0, 0, 0, 0, 1, 0); + + git_index_free(index); +#endif +} + static int addall_match_prefix( const char *path, const char *matched_pathspec, void *payload) { diff --git a/vendor/libgit2/tests/index/bypath.c b/vendor/libgit2/tests/index/bypath.c index 9706a8833..34a7412a8 100644 --- a/vendor/libgit2/tests/index/bypath.c +++ b/vendor/libgit2/tests/index/bypath.c @@ -46,3 +46,317 @@ void test_index_bypath__add_submodule_unregistered(void) cl_assert_equal_s(sm_head, git_oid_tostr_s(&entry->id)); cl_assert_equal_s(sm_name, entry->path); } + +void test_index_bypath__add_hidden(void) +{ + const git_index_entry *entry; + bool hidden; + + GIT_UNUSED(entry); + GIT_UNUSED(hidden); + +#ifdef GIT_WIN32 + cl_git_mkfile("submod2/hidden_file", "you can't see me"); + + cl_git_pass(git_win32__hidden(&hidden, "submod2/hidden_file")); + cl_assert(!hidden); + + cl_git_pass(git_win32__set_hidden("submod2/hidden_file", true)); + + cl_git_pass(git_win32__hidden(&hidden, "submod2/hidden_file")); + cl_assert(hidden); + + cl_git_pass(git_index_add_bypath(g_idx, "hidden_file")); + + cl_assert(entry = git_index_get_bypath(g_idx, "hidden_file", 0)); + cl_assert_equal_i(GIT_FILEMODE_BLOB, entry->mode); +#endif +} + +void test_index_bypath__add_keeps_existing_case(void) +{ + const git_index_entry *entry; + + if (!cl_repo_get_bool(g_repo, "core.ignorecase")) + clar__skip(); + + cl_git_mkfile("submod2/just_a_dir/file1.txt", "This is a file"); + cl_git_pass(git_index_add_bypath(g_idx, "just_a_dir/file1.txt")); + + cl_assert(entry = git_index_get_bypath(g_idx, "just_a_dir/file1.txt", 0)); + cl_assert_equal_s("just_a_dir/file1.txt", entry->path); + + cl_git_rewritefile("submod2/just_a_dir/file1.txt", "Updated!"); + cl_git_pass(git_index_add_bypath(g_idx, "just_a_dir/FILE1.txt")); + + cl_assert(entry = git_index_get_bypath(g_idx, "just_a_dir/FILE1.txt", 0)); + cl_assert_equal_s("just_a_dir/file1.txt", entry->path); +} + +void test_index_bypath__add_honors_existing_case(void) +{ + const git_index_entry *entry; + + if (!cl_repo_get_bool(g_repo, "core.ignorecase")) + clar__skip(); + + cl_git_mkfile("submod2/just_a_dir/file1.txt", "This is a file"); + cl_git_mkfile("submod2/just_a_dir/file2.txt", "This is another file"); + cl_git_mkfile("submod2/just_a_dir/file3.txt", "This is another file"); + cl_git_mkfile("submod2/just_a_dir/file4.txt", "And another file"); + + cl_git_pass(git_index_add_bypath(g_idx, "just_a_dir/File1.txt")); + cl_git_pass(git_index_add_bypath(g_idx, "JUST_A_DIR/file2.txt")); + cl_git_pass(git_index_add_bypath(g_idx, "Just_A_Dir/FILE3.txt")); + + cl_assert(entry = git_index_get_bypath(g_idx, "just_a_dir/File1.txt", 0)); + cl_assert_equal_s("just_a_dir/File1.txt", entry->path); + + cl_assert(entry = git_index_get_bypath(g_idx, "JUST_A_DIR/file2.txt", 0)); + cl_assert_equal_s("just_a_dir/file2.txt", entry->path); + + cl_assert(entry = git_index_get_bypath(g_idx, "Just_A_Dir/FILE3.txt", 0)); + cl_assert_equal_s("just_a_dir/FILE3.txt", entry->path); + + cl_git_rewritefile("submod2/just_a_dir/file3.txt", "Rewritten"); + cl_git_pass(git_index_add_bypath(g_idx, "Just_A_Dir/file3.txt")); + + cl_assert(entry = git_index_get_bypath(g_idx, "Just_A_Dir/file3.txt", 0)); + cl_assert_equal_s("just_a_dir/FILE3.txt", entry->path); +} + +void test_index_bypath__add_honors_existing_case_2(void) +{ + git_index_entry dummy = { { 0 } }; + const git_index_entry *entry; + + if (!cl_repo_get_bool(g_repo, "core.ignorecase")) + clar__skip(); + + dummy.mode = GIT_FILEMODE_BLOB; + cl_git_pass(git_oid_fromstr(&dummy.id, "f990a25a74d1a8281ce2ab018ea8df66795cd60b")); + + /* note that `git_index_add` does no checking to canonical directories */ + dummy.path = "Just_a_dir/file0.txt"; + cl_git_pass(git_index_add(g_idx, &dummy)); + + dummy.path = "just_a_dir/fileA.txt"; + cl_git_pass(git_index_add(g_idx, &dummy)); + + dummy.path = "Just_A_Dir/fileB.txt"; + cl_git_pass(git_index_add(g_idx, &dummy)); + + dummy.path = "JUST_A_DIR/fileC.txt"; + cl_git_pass(git_index_add(g_idx, &dummy)); + + dummy.path = "just_A_dir/fileD.txt"; + cl_git_pass(git_index_add(g_idx, &dummy)); + + dummy.path = "JUST_a_DIR/fileE.txt"; + cl_git_pass(git_index_add(g_idx, &dummy)); + + cl_git_mkfile("submod2/just_a_dir/file1.txt", "This is a file"); + cl_git_mkfile("submod2/just_a_dir/file2.txt", "This is another file"); + cl_git_mkfile("submod2/just_a_dir/file3.txt", "This is another file"); + cl_git_mkfile("submod2/just_a_dir/file4.txt", "And another file"); + + cl_git_pass(git_index_add_bypath(g_idx, "just_a_dir/File1.txt")); + cl_git_pass(git_index_add_bypath(g_idx, "JUST_A_DIR/file2.txt")); + cl_git_pass(git_index_add_bypath(g_idx, "Just_A_Dir/FILE3.txt")); + cl_git_pass(git_index_add_bypath(g_idx, "JusT_A_DIR/FILE4.txt")); + + cl_assert(entry = git_index_get_bypath(g_idx, "just_a_dir/File1.txt", 0)); + cl_assert_equal_s("just_a_dir/File1.txt", entry->path); + + cl_assert(entry = git_index_get_bypath(g_idx, "JUST_A_DIR/file2.txt", 0)); + cl_assert_equal_s("JUST_A_DIR/file2.txt", entry->path); + + cl_assert(entry = git_index_get_bypath(g_idx, "Just_A_Dir/FILE3.txt", 0)); + cl_assert_equal_s("Just_A_Dir/FILE3.txt", entry->path); + + cl_git_rewritefile("submod2/just_a_dir/file3.txt", "Rewritten"); + cl_git_pass(git_index_add_bypath(g_idx, "Just_A_Dir/file3.txt")); + + cl_assert(entry = git_index_get_bypath(g_idx, "Just_A_Dir/file3.txt", 0)); + cl_assert_equal_s("Just_A_Dir/FILE3.txt", entry->path); +} + +void test_index_bypath__add_honors_existing_case_3(void) +{ + git_index_entry dummy = { { 0 } }; + const git_index_entry *entry; + + if (!cl_repo_get_bool(g_repo, "core.ignorecase")) + clar__skip(); + + dummy.mode = GIT_FILEMODE_BLOB; + cl_git_pass(git_oid_fromstr(&dummy.id, "f990a25a74d1a8281ce2ab018ea8df66795cd60b")); + + dummy.path = "just_a_dir/filea.txt"; + cl_git_pass(git_index_add(g_idx, &dummy)); + + dummy.path = "Just_A_Dir/fileB.txt"; + cl_git_pass(git_index_add(g_idx, &dummy)); + + dummy.path = "just_A_DIR/FILEC.txt"; + cl_git_pass(git_index_add(g_idx, &dummy)); + + dummy.path = "Just_a_DIR/FileD.txt"; + cl_git_pass(git_index_add(g_idx, &dummy)); + + cl_git_mkfile("submod2/JuSt_A_DiR/fILEE.txt", "This is a file"); + + cl_git_pass(git_index_add_bypath(g_idx, "just_a_dir/fILEE.txt")); + + cl_assert(entry = git_index_get_bypath(g_idx, "JUST_A_DIR/fILEE.txt", 0)); + cl_assert_equal_s("just_a_dir/fILEE.txt", entry->path); +} + +void test_index_bypath__add_honors_existing_case_4(void) +{ + git_index_entry dummy = { { 0 } }; + const git_index_entry *entry; + + if (!cl_repo_get_bool(g_repo, "core.ignorecase")) + clar__skip(); + + dummy.mode = GIT_FILEMODE_BLOB; + cl_git_pass(git_oid_fromstr(&dummy.id, "f990a25a74d1a8281ce2ab018ea8df66795cd60b")); + + dummy.path = "just_a_dir/a/b/c/d/e/file1.txt"; + cl_git_pass(git_index_add(g_idx, &dummy)); + + dummy.path = "just_a_dir/a/B/C/D/E/file2.txt"; + cl_git_pass(git_index_add(g_idx, &dummy)); + + cl_must_pass(p_mkdir("submod2/just_a_dir/a", 0777)); + cl_must_pass(p_mkdir("submod2/just_a_dir/a/b", 0777)); + cl_must_pass(p_mkdir("submod2/just_a_dir/a/b/z", 0777)); + cl_must_pass(p_mkdir("submod2/just_a_dir/a/b/z/y", 0777)); + cl_must_pass(p_mkdir("submod2/just_a_dir/a/b/z/y/x", 0777)); + + cl_git_mkfile("submod2/just_a_dir/a/b/z/y/x/FOO.txt", "This is a file"); + + cl_git_pass(git_index_add_bypath(g_idx, "just_a_dir/A/b/Z/y/X/foo.txt")); + + cl_assert(entry = git_index_get_bypath(g_idx, "just_a_dir/A/b/Z/y/X/foo.txt", 0)); + cl_assert_equal_s("just_a_dir/a/b/Z/y/X/foo.txt", entry->path); +} + +void test_index_bypath__add_honors_mode(void) +{ + const git_index_entry *entry; + git_index_entry new_entry; + + cl_assert((entry = git_index_get_bypath(g_idx, "README.txt", 0)) != NULL); + + memcpy(&new_entry, entry, sizeof(git_index_entry)); + new_entry.path = "README.txt"; + new_entry.mode = GIT_FILEMODE_BLOB_EXECUTABLE; + + cl_must_pass(p_chmod("submod2/README.txt", GIT_FILEMODE_BLOB_EXECUTABLE)); + + cl_git_pass(git_index_add(g_idx, &new_entry)); + cl_git_pass(git_index_write(g_idx)); + + cl_git_rewritefile("submod2/README.txt", "Modified but still executable"); + + cl_git_pass(git_index_add_bypath(g_idx, "README.txt")); + cl_git_pass(git_index_write(g_idx)); + + cl_assert((entry = git_index_get_bypath(g_idx, "README.txt", 0)) != NULL); + cl_assert_equal_i(GIT_FILEMODE_BLOB_EXECUTABLE, entry->mode); +} + +void test_index_bypath__add_honors_conflict_mode(void) +{ + const git_index_entry *entry; + git_index_entry new_entry; + int stage = 0; + + cl_assert((entry = git_index_get_bypath(g_idx, "README.txt", 0)) != NULL); + + memcpy(&new_entry, entry, sizeof(git_index_entry)); + new_entry.path = "README.txt"; + new_entry.mode = GIT_FILEMODE_BLOB_EXECUTABLE; + + cl_must_pass(p_chmod("submod2/README.txt", GIT_FILEMODE_BLOB_EXECUTABLE)); + + cl_git_pass(git_index_remove_bypath(g_idx, "README.txt")); + + for (stage = 1; stage <= 3; stage++) { + new_entry.flags = stage << GIT_IDXENTRY_STAGESHIFT; + cl_git_pass(git_index_add(g_idx, &new_entry)); + } + + cl_git_pass(git_index_write(g_idx)); + + cl_git_rewritefile("submod2/README.txt", "Modified but still executable"); + + cl_git_pass(git_index_add_bypath(g_idx, "README.txt")); + cl_git_pass(git_index_write(g_idx)); + + cl_assert((entry = git_index_get_bypath(g_idx, "README.txt", 0)) != NULL); + cl_assert_equal_i(GIT_FILEMODE_BLOB_EXECUTABLE, entry->mode); +} + +void test_index_bypath__add_honors_conflict_case(void) +{ + const git_index_entry *entry; + git_index_entry new_entry; + int stage = 0; + + cl_assert((entry = git_index_get_bypath(g_idx, "README.txt", 0)) != NULL); + + memcpy(&new_entry, entry, sizeof(git_index_entry)); + new_entry.path = "README.txt"; + new_entry.mode = GIT_FILEMODE_BLOB_EXECUTABLE; + + cl_must_pass(p_chmod("submod2/README.txt", GIT_FILEMODE_BLOB_EXECUTABLE)); + + cl_git_pass(git_index_remove_bypath(g_idx, "README.txt")); + + for (stage = 1; stage <= 3; stage++) { + new_entry.flags = stage << GIT_IDXENTRY_STAGESHIFT; + cl_git_pass(git_index_add(g_idx, &new_entry)); + } + + cl_git_pass(git_index_write(g_idx)); + + cl_git_rewritefile("submod2/README.txt", "Modified but still executable"); + + cl_git_pass(git_index_add_bypath(g_idx, "README.txt")); + cl_git_pass(git_index_write(g_idx)); + + cl_assert((entry = git_index_get_bypath(g_idx, "README.txt", 0)) != NULL); + cl_assert_equal_i(GIT_FILEMODE_BLOB_EXECUTABLE, entry->mode); +} + +void test_index_bypath__add_honors_symlink(void) +{ + const git_index_entry *entry; + git_index_entry new_entry; + int symlinks; + + cl_git_pass(git_repository__cvar(&symlinks, g_repo, GIT_CVAR_SYMLINKS)); + + if (symlinks) + cl_skip(); + + cl_assert((entry = git_index_get_bypath(g_idx, "README.txt", 0)) != NULL); + + memcpy(&new_entry, entry, sizeof(git_index_entry)); + new_entry.path = "README.txt"; + new_entry.mode = GIT_FILEMODE_LINK; + + cl_git_pass(git_index_add(g_idx, &new_entry)); + cl_git_pass(git_index_write(g_idx)); + + cl_git_rewritefile("submod2/README.txt", "Modified but still a (fake) symlink"); + + cl_git_pass(git_index_add_bypath(g_idx, "README.txt")); + cl_git_pass(git_index_write(g_idx)); + + cl_assert((entry = git_index_get_bypath(g_idx, "README.txt", 0)) != NULL); + cl_assert_equal_i(GIT_FILEMODE_LINK, entry->mode); +} diff --git a/vendor/libgit2/tests/index/cache.c b/vendor/libgit2/tests/index/cache.c index 3982bf183..56885aff7 100644 --- a/vendor/libgit2/tests/index/cache.c +++ b/vendor/libgit2/tests/index/cache.c @@ -111,7 +111,7 @@ void test_index_cache__read_tree_no_children(void) memset(&entry, 0x0, sizeof(git_index_entry)); entry.path = "new.txt"; entry.mode = GIT_FILEMODE_BLOB; - git_oid_fromstr(&entry.id, "45b983be36b73c0788dc9cbcb76cbb80fc7bb057"); + git_oid_fromstr(&entry.id, "d4bcc68acd4410bf836a39f20afb2c2ece09584e"); cl_git_pass(git_index_add(index, &entry)); cl_assert_equal_i(-1, index->tree->entry_count); @@ -191,7 +191,7 @@ void test_index_cache__read_tree_children(void) memset(&entry, 0x0, sizeof(git_index_entry)); entry.path = "top-level"; entry.mode = GIT_FILEMODE_BLOB; - git_oid_fromstr(&entry.id, "45b983be36b73c0788dc9cbcb76cbb80fc7bb057"); + git_oid_fromstr(&entry.id, "ee3fa1b8c00aff7fe02065fdb50864bb0d932ccf"); cl_git_pass(git_index_add(index, &entry)); @@ -217,7 +217,7 @@ void test_index_cache__read_tree_children(void) /* override with a slightly different id, also dummy */ entry.path = "subdir/some-file"; - git_oid_fromstr(&entry.id, "45b983be36b73c0788dc9cbcb76cbb80fc7bb058"); + git_oid_fromstr(&entry.id, "ee3fa1b8c00aff7fe02065fdb50864bb0d932ccf"); cl_git_pass(git_index_add(index, &entry)); cl_assert_equal_i(-1, index->tree->entry_count); diff --git a/vendor/libgit2/tests/index/conflicts.c b/vendor/libgit2/tests/index/conflicts.c index b7a2456eb..d4004686f 100644 --- a/vendor/libgit2/tests/index/conflicts.c +++ b/vendor/libgit2/tests/index/conflicts.c @@ -16,11 +16,6 @@ static git_index *repo_index; #define CONFLICTS_TWO_OUR_OID "8b3f43d2402825c200f835ca1762413e386fd0b2" #define CONFLICTS_TWO_THEIR_OID "220bd62631c8cf7a83ef39c6b94595f00517211e" -#define TEST_STAGED_OID "beefdadafeedabedcafedeedbabedeadbeaddeaf" -#define TEST_ANCESTOR_OID "f00ff00ff00ff00ff00ff00ff00ff00ff00ff00f" -#define TEST_OUR_OID "b44bb44bb44bb44bb44bb44bb44bb44bb44bb44b" -#define TEST_THEIR_OID "0123456789abcdef0123456789abcdef01234567" - // Fixture setup and teardown void test_index_conflicts__initialize(void) { @@ -49,17 +44,17 @@ void test_index_conflicts__add(void) ancestor_entry.path = "test-one.txt"; ancestor_entry.mode = 0100644; GIT_IDXENTRY_STAGE_SET(&ancestor_entry, 1); - git_oid_fromstr(&ancestor_entry.id, TEST_ANCESTOR_OID); + git_oid_fromstr(&ancestor_entry.id, CONFLICTS_ONE_ANCESTOR_OID); our_entry.path = "test-one.txt"; our_entry.mode = 0100644; GIT_IDXENTRY_STAGE_SET(&our_entry, 2); - git_oid_fromstr(&our_entry.id, TEST_OUR_OID); + git_oid_fromstr(&our_entry.id, CONFLICTS_ONE_OUR_OID); their_entry.path = "test-one.txt"; their_entry.mode = 0100644; GIT_IDXENTRY_STAGE_SET(&ancestor_entry, 2); - git_oid_fromstr(&their_entry.id, TEST_THEIR_OID); + git_oid_fromstr(&their_entry.id, CONFLICTS_ONE_THEIR_OID); cl_git_pass(git_index_conflict_add(repo_index, &ancestor_entry, &our_entry, &their_entry)); @@ -80,17 +75,17 @@ void test_index_conflicts__add_fixes_incorrect_stage(void) ancestor_entry.path = "test-one.txt"; ancestor_entry.mode = 0100644; GIT_IDXENTRY_STAGE_SET(&ancestor_entry, 3); - git_oid_fromstr(&ancestor_entry.id, TEST_ANCESTOR_OID); + git_oid_fromstr(&ancestor_entry.id, CONFLICTS_ONE_ANCESTOR_OID); our_entry.path = "test-one.txt"; our_entry.mode = 0100644; GIT_IDXENTRY_STAGE_SET(&our_entry, 1); - git_oid_fromstr(&our_entry.id, TEST_OUR_OID); + git_oid_fromstr(&our_entry.id, CONFLICTS_ONE_OUR_OID); their_entry.path = "test-one.txt"; their_entry.mode = 0100644; GIT_IDXENTRY_STAGE_SET(&their_entry, 2); - git_oid_fromstr(&their_entry.id, TEST_THEIR_OID); + git_oid_fromstr(&their_entry.id, CONFLICTS_ONE_THEIR_OID); cl_git_pass(git_index_conflict_add(repo_index, &ancestor_entry, &our_entry, &their_entry)); @@ -105,36 +100,33 @@ void test_index_conflicts__add_fixes_incorrect_stage(void) void test_index_conflicts__add_removes_stage_zero(void) { - git_index_entry staged, ancestor_entry, our_entry, their_entry; + git_index_entry ancestor_entry, our_entry, their_entry; const git_index_entry *conflict_entry[3]; cl_assert(git_index_entrycount(repo_index) == 8); - memset(&staged, 0x0, sizeof(git_index_entry)); memset(&ancestor_entry, 0x0, sizeof(git_index_entry)); memset(&our_entry, 0x0, sizeof(git_index_entry)); memset(&their_entry, 0x0, sizeof(git_index_entry)); - staged.path = "test-one.txt"; - staged.mode = 0100644; - git_oid_fromstr(&staged.id, TEST_STAGED_OID); - cl_git_pass(git_index_add(repo_index, &staged)); + cl_git_mkfile("./mergedrepo/test-one.txt", "new-file\n"); + cl_git_pass(git_index_add_bypath(repo_index, "test-one.txt")); cl_assert(git_index_entrycount(repo_index) == 9); ancestor_entry.path = "test-one.txt"; ancestor_entry.mode = 0100644; GIT_IDXENTRY_STAGE_SET(&ancestor_entry, 3); - git_oid_fromstr(&ancestor_entry.id, TEST_ANCESTOR_OID); + git_oid_fromstr(&ancestor_entry.id, CONFLICTS_ONE_ANCESTOR_OID); our_entry.path = "test-one.txt"; our_entry.mode = 0100644; GIT_IDXENTRY_STAGE_SET(&our_entry, 1); - git_oid_fromstr(&our_entry.id, TEST_OUR_OID); + git_oid_fromstr(&our_entry.id, CONFLICTS_ONE_OUR_OID); their_entry.path = "test-one.txt"; their_entry.mode = 0100644; GIT_IDXENTRY_STAGE_SET(&their_entry, 2); - git_oid_fromstr(&their_entry.id, TEST_THEIR_OID); + git_oid_fromstr(&their_entry.id, CONFLICTS_ONE_THEIR_OID); cl_git_pass(git_index_conflict_add(repo_index, &ancestor_entry, &our_entry, &their_entry)); @@ -330,7 +322,7 @@ void test_index_conflicts__partial(void) ancestor_entry.path = "test-one.txt"; ancestor_entry.mode = 0100644; GIT_IDXENTRY_STAGE_SET(&ancestor_entry, 1); - git_oid_fromstr(&ancestor_entry.id, TEST_ANCESTOR_OID); + git_oid_fromstr(&ancestor_entry.id, CONFLICTS_ONE_ANCESTOR_OID); cl_git_pass(git_index_conflict_add(repo_index, &ancestor_entry, NULL, NULL)); cl_assert(git_index_entrycount(repo_index) == 9); @@ -342,3 +334,94 @@ void test_index_conflicts__partial(void) cl_assert(conflict_entry[1] == NULL); cl_assert(conflict_entry[2] == NULL); } + +void test_index_conflicts__case_matters(void) +{ + const git_index_entry *conflict_entry[3]; + git_oid oid; + const char *upper_case = "DIFFERS-IN-CASE.TXT"; + const char *mixed_case = "Differs-In-Case.txt"; + const char *correct_case; + bool ignorecase = cl_repo_get_bool(repo, "core.ignorecase"); + + git_index_entry ancestor_entry, our_entry, their_entry; + + memset(&ancestor_entry, 0x0, sizeof(git_index_entry)); + memset(&our_entry, 0x0, sizeof(git_index_entry)); + memset(&their_entry, 0x0, sizeof(git_index_entry)); + + ancestor_entry.path = upper_case; + GIT_IDXENTRY_STAGE_SET(&ancestor_entry, GIT_INDEX_STAGE_ANCESTOR); + git_oid_fromstr(&ancestor_entry.id, CONFLICTS_ONE_ANCESTOR_OID); + ancestor_entry.mode = GIT_FILEMODE_BLOB; + + our_entry.path = upper_case; + GIT_IDXENTRY_STAGE_SET(&our_entry, GIT_INDEX_STAGE_OURS); + git_oid_fromstr(&our_entry.id, CONFLICTS_ONE_OUR_OID); + our_entry.mode = GIT_FILEMODE_BLOB; + + their_entry.path = upper_case; + GIT_IDXENTRY_STAGE_SET(&their_entry, GIT_INDEX_STAGE_THEIRS); + git_oid_fromstr(&their_entry.id, CONFLICTS_ONE_THEIR_OID); + their_entry.mode = GIT_FILEMODE_BLOB; + + cl_git_pass(git_index_conflict_add(repo_index, + &ancestor_entry, &our_entry, &their_entry)); + + ancestor_entry.path = mixed_case; + GIT_IDXENTRY_STAGE_SET(&ancestor_entry, GIT_INDEX_STAGE_ANCESTOR); + git_oid_fromstr(&ancestor_entry.id, CONFLICTS_TWO_ANCESTOR_OID); + ancestor_entry.mode = GIT_FILEMODE_BLOB; + + our_entry.path = mixed_case; + GIT_IDXENTRY_STAGE_SET(&ancestor_entry, GIT_INDEX_STAGE_ANCESTOR); + git_oid_fromstr(&our_entry.id, CONFLICTS_TWO_OUR_OID); + ancestor_entry.mode = GIT_FILEMODE_BLOB; + + their_entry.path = mixed_case; + GIT_IDXENTRY_STAGE_SET(&their_entry, GIT_INDEX_STAGE_THEIRS); + git_oid_fromstr(&their_entry.id, CONFLICTS_TWO_THEIR_OID); + their_entry.mode = GIT_FILEMODE_BLOB; + + cl_git_pass(git_index_conflict_add(repo_index, + &ancestor_entry, &our_entry, &their_entry)); + + cl_git_pass(git_index_conflict_get(&conflict_entry[0], &conflict_entry[1], + &conflict_entry[2], repo_index, upper_case)); + + /* + * We inserted with mixed case last, so on a case-insensitive + * fs we should get the mixed case. + */ + if (ignorecase) + correct_case = mixed_case; + else + correct_case = upper_case; + + cl_assert_equal_s(correct_case, conflict_entry[0]->path); + git_oid_fromstr(&oid, ignorecase ? CONFLICTS_TWO_ANCESTOR_OID : CONFLICTS_ONE_ANCESTOR_OID); + cl_assert_equal_oid(&oid, &conflict_entry[0]->id); + + cl_assert_equal_s(correct_case, conflict_entry[1]->path); + git_oid_fromstr(&oid, ignorecase ? CONFLICTS_TWO_OUR_OID : CONFLICTS_ONE_OUR_OID); + cl_assert_equal_oid(&oid, &conflict_entry[1]->id); + + cl_assert_equal_s(correct_case, conflict_entry[2]->path); + git_oid_fromstr(&oid, ignorecase ? CONFLICTS_TWO_THEIR_OID : CONFLICTS_ONE_THEIR_OID); + cl_assert_equal_oid(&oid, &conflict_entry[2]->id); + + cl_git_pass(git_index_conflict_get(&conflict_entry[0], &conflict_entry[1], + &conflict_entry[2], repo_index, mixed_case)); + + cl_assert_equal_s(mixed_case, conflict_entry[0]->path); + git_oid_fromstr(&oid, CONFLICTS_TWO_ANCESTOR_OID); + cl_assert_equal_oid(&oid, &conflict_entry[0]->id); + + cl_assert_equal_s(mixed_case, conflict_entry[1]->path); + git_oid_fromstr(&oid, CONFLICTS_TWO_OUR_OID); + cl_assert_equal_oid(&oid, &conflict_entry[1]->id); + + cl_assert_equal_s(mixed_case, conflict_entry[2]->path); + git_oid_fromstr(&oid, CONFLICTS_TWO_THEIR_OID); + cl_assert_equal_oid(&oid, &conflict_entry[2]->id); +} diff --git a/vendor/libgit2/tests/index/filemodes.c b/vendor/libgit2/tests/index/filemodes.c index b3907996b..2efad5b33 100644 --- a/vendor/libgit2/tests/index/filemodes.c +++ b/vendor/libgit2/tests/index/filemodes.c @@ -236,11 +236,19 @@ void test_index_filemodes__invalid(void) { git_index *index; git_index_entry entry; + const git_index_entry *dummy; cl_git_pass(git_repository_index(&index, g_repo)); + /* add a dummy file so that we have a valid id */ + cl_git_mkfile("./filemodes/dummy-file.txt", "new-file\n"); + cl_git_pass(git_index_add_bypath(index, "dummy-file.txt")); + cl_assert((dummy = git_index_get_bypath(index, "dummy-file.txt", 0))); + + GIT_IDXENTRY_STAGE_SET(&entry, 0); entry.path = "foo"; entry.mode = GIT_OBJ_BLOB; + git_oid_cpy(&entry.id, &dummy->id); cl_git_fail(git_index_add(index, &entry)); entry.mode = GIT_FILEMODE_BLOB; diff --git a/vendor/libgit2/tests/index/nsec.c b/vendor/libgit2/tests/index/nsec.c index 5004339f0..244ab6362 100644 --- a/vendor/libgit2/tests/index/nsec.c +++ b/vendor/libgit2/tests/index/nsec.c @@ -61,8 +61,17 @@ void test_index_nsec__staging_maintains_other_nanos(void) cl_assert_equal_b(true, has_nsecs()); cl_assert((entry = git_index_get_bypath(repo_index, "a.txt", 0))); + + /* if we are writing nanoseconds to the index, expect them to be + * nonzero. if we are *not*, expect that we truncated the entry. + */ +#ifdef GIT_USE_NSEC + cl_assert(entry->ctime.nanoseconds != 0); + cl_assert(entry->mtime.nanoseconds != 0); +#else cl_assert_equal_i(0, entry->ctime.nanoseconds); cl_assert_equal_i(0, entry->mtime.nanoseconds); +#endif } void test_index_nsec__status_doesnt_clear_nsecs(void) diff --git a/vendor/libgit2/tests/index/racy.c b/vendor/libgit2/tests/index/racy.c index 3b26aabf4..1768f5efd 100644 --- a/vendor/libgit2/tests/index/racy.c +++ b/vendor/libgit2/tests/index/racy.c @@ -54,7 +54,7 @@ void test_index_racy__write_index_just_after_file(void) git_index *index; git_diff *diff; git_buf path = GIT_BUF_INIT; - struct timeval times[2]; + struct p_timeval times[2]; /* Make sure we do have a timestamp */ cl_git_pass(git_repository_index(&index, g_repo)); @@ -63,10 +63,10 @@ void test_index_racy__write_index_just_after_file(void) cl_git_pass(git_buf_joinpath(&path, git_repository_workdir(g_repo), "A")); cl_git_mkfile(path.ptr, "A"); /* Force the file's timestamp to be a second after we wrote the index */ - times[0].tv_sec = index->stamp.mtime + 1; - times[0].tv_usec = 0; - times[1].tv_sec = index->stamp.mtime + 1; - times[1].tv_usec = 0; + times[0].tv_sec = index->stamp.mtime.tv_sec + 1; + times[0].tv_usec = index->stamp.mtime.tv_nsec / 1000; + times[1].tv_sec = index->stamp.mtime.tv_sec + 1; + times[1].tv_usec = index->stamp.mtime.tv_nsec / 1000; cl_git_pass(p_utimes(path.ptr, times)); /* @@ -79,13 +79,13 @@ void test_index_racy__write_index_just_after_file(void) cl_git_mkfile(path.ptr, "B"); /* - * Pretend this index' modification happend a second after the + * Pretend this index' modification happened a second after the * file update, and rewrite the file in that same second. */ - times[0].tv_sec = index->stamp.mtime + 2; - times[0].tv_usec = 0; - times[1].tv_sec = index->stamp.mtime + 2; - times[0].tv_usec = 0; + times[0].tv_sec = index->stamp.mtime.tv_sec + 2; + times[0].tv_usec = index->stamp.mtime.tv_nsec / 1000; + times[1].tv_sec = index->stamp.mtime.tv_sec + 2; + times[0].tv_usec = index->stamp.mtime.tv_nsec / 1000; cl_git_pass(p_utimes(git_index_path(index), times)); cl_git_pass(p_utimes(path.ptr, times)); @@ -100,13 +100,13 @@ void test_index_racy__write_index_just_after_file(void) git_index_free(index); } -void test_index_racy__empty_file_after_smudge(void) + +static void setup_race(void) { - git_index *index; - git_diff *diff; git_buf path = GIT_BUF_INIT; - int i, found_race = 0; - const git_index_entry *entry; + git_index *index; + git_index_entry *entry; + struct stat st; /* Make sure we do have a timestamp */ cl_git_pass(git_repository_index__weakptr(&index, g_repo)); @@ -114,34 +114,211 @@ void test_index_racy__empty_file_after_smudge(void) cl_git_pass(git_buf_joinpath(&path, git_repository_workdir(g_repo), "A")); - /* Make sure writing the file, adding and rewriting happen in the same second */ - for (i = 0; i < 10; i++) { - struct stat st; - cl_git_mkfile(path.ptr, "A"); + cl_git_mkfile(path.ptr, "A"); + cl_git_pass(git_index_add_bypath(index, "A")); - cl_git_pass(git_index_add_bypath(index, "A")); - cl_git_mkfile(path.ptr, "B"); - cl_git_pass(git_index_write(index)); + cl_git_mkfile(path.ptr, "B"); + cl_git_pass(git_index_write(index)); + + cl_git_mkfile(path.ptr, ""); + + cl_git_pass(p_stat(path.ptr, &st)); + cl_assert(entry = (git_index_entry *)git_index_get_bypath(index, "A", 0)); + + /* force a race */ + entry->mtime.seconds = st.st_mtime; + entry->mtime.nanoseconds = st.st_mtime_nsec; + + git_buf_free(&path); +} - cl_git_mkfile(path.ptr, ""); +void test_index_racy__smudges_index_entry_on_save(void) +{ + git_index *index; + const git_index_entry *entry; - cl_git_pass(p_stat(path.ptr, &st)); - cl_assert(entry = git_index_get_bypath(index, "A", 0)); - if (entry->mtime.seconds == (int32_t) st.st_mtime) { - found_race = 1; - break; - } + setup_race(); - } + /* write the index, which will smudge anything that had the same timestamp + * as the index when the index was loaded. that way future loads of the + * index (with the new timestamp) will know that these files were not + * clean. + */ - if (!found_race) - cl_fail("failed to find race after 10 attempts"); + cl_git_pass(git_repository_index__weakptr(&index, g_repo)); + cl_git_pass(git_index_write(index)); + cl_assert(entry = git_index_get_bypath(index, "A", 0)); cl_assert_equal_i(0, entry->file_size); +} + +void test_index_racy__detects_diff_of_change_in_identical_timestamp(void) +{ + git_index *index; + git_diff *diff; + + cl_git_pass(git_repository_index__weakptr(&index, g_repo)); + + setup_race(); cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, index, NULL)); cl_assert_equal_i(1, git_diff_num_deltas(diff)); - git_buf_free(&path); git_diff_free(diff); } + +static void setup_uptodate_files(void) +{ + git_buf path = GIT_BUF_INIT; + git_index *index; + const git_index_entry *a_entry; + git_index_entry new_entry = {{0}}; + + cl_git_pass(git_repository_index(&index, g_repo)); + + cl_git_pass(git_buf_joinpath(&path, git_repository_workdir(g_repo), "A")); + cl_git_mkfile(path.ptr, "A"); + + /* Put 'A' into the index */ + cl_git_pass(git_index_add_bypath(index, "A")); + + cl_assert((a_entry = git_index_get_bypath(index, "A", 0))); + + /* Put 'B' into the index */ + new_entry.path = "B"; + new_entry.mode = GIT_FILEMODE_BLOB; + git_oid_cpy(&new_entry.id, &a_entry->id); + cl_git_pass(git_index_add(index, &new_entry)); + + /* Put 'C' into the index */ + new_entry.path = "C"; + new_entry.mode = GIT_FILEMODE_BLOB; + cl_git_pass(git_index_add_frombuffer(index, &new_entry, "hello!\n", 7)); + + git_index_free(index); + git_buf_free(&path); +} + +void test_index_racy__adding_to_index_is_uptodate(void) +{ + git_index *index; + const git_index_entry *entry; + + setup_uptodate_files(); + + cl_git_pass(git_repository_index(&index, g_repo)); + + /* ensure that they're all uptodate */ + cl_assert((entry = git_index_get_bypath(index, "A", 0))); + cl_assert_equal_i(GIT_IDXENTRY_UPTODATE, (entry->flags_extended & GIT_IDXENTRY_UPTODATE)); + + cl_assert((entry = git_index_get_bypath(index, "B", 0))); + cl_assert_equal_i(GIT_IDXENTRY_UPTODATE, (entry->flags_extended & GIT_IDXENTRY_UPTODATE)); + + cl_assert((entry = git_index_get_bypath(index, "C", 0))); + cl_assert_equal_i(GIT_IDXENTRY_UPTODATE, (entry->flags_extended & GIT_IDXENTRY_UPTODATE)); + + cl_git_pass(git_index_write(index)); + + git_index_free(index); +} + +void test_index_racy__reading_clears_uptodate_bit(void) +{ + git_index *index; + const git_index_entry *entry; + + setup_uptodate_files(); + + cl_git_pass(git_repository_index(&index, g_repo)); + cl_git_pass(git_index_write(index)); + + cl_git_pass(git_index_read(index, true)); + + /* ensure that no files are uptodate */ + cl_assert((entry = git_index_get_bypath(index, "A", 0))); + cl_assert_equal_i(0, (entry->flags_extended & GIT_IDXENTRY_UPTODATE)); + + cl_assert((entry = git_index_get_bypath(index, "B", 0))); + cl_assert_equal_i(0, (entry->flags_extended & GIT_IDXENTRY_UPTODATE)); + + cl_assert((entry = git_index_get_bypath(index, "C", 0))); + cl_assert_equal_i(0, (entry->flags_extended & GIT_IDXENTRY_UPTODATE)); + + git_index_free(index); +} + +void test_index_racy__read_tree_clears_uptodate_bit(void) +{ + git_index *index; + git_tree *tree; + const git_index_entry *entry; + git_oid id; + + setup_uptodate_files(); + + cl_git_pass(git_repository_index(&index, g_repo)); + cl_git_pass(git_index_write_tree_to(&id, index, g_repo)); + cl_git_pass(git_tree_lookup(&tree, g_repo, &id)); + cl_git_pass(git_index_read_tree(index, tree)); + + /* ensure that no files are uptodate */ + cl_assert((entry = git_index_get_bypath(index, "A", 0))); + cl_assert_equal_i(0, (entry->flags_extended & GIT_IDXENTRY_UPTODATE)); + + cl_assert((entry = git_index_get_bypath(index, "B", 0))); + cl_assert_equal_i(0, (entry->flags_extended & GIT_IDXENTRY_UPTODATE)); + + cl_assert((entry = git_index_get_bypath(index, "C", 0))); + cl_assert_equal_i(0, (entry->flags_extended & GIT_IDXENTRY_UPTODATE)); + + git_tree_free(tree); + git_index_free(index); +} + +void test_index_racy__read_index_smudges(void) +{ + git_index *index, *newindex; + const git_index_entry *entry; + + /* if we are reading an index into our new index, ensure that any + * racy entries in the index that we're reading are smudged so that + * we don't propagate their timestamps without further investigation. + */ + setup_race(); + + cl_git_pass(git_repository_index(&index, g_repo)); + cl_git_pass(git_index_new(&newindex)); + cl_git_pass(git_index_read_index(newindex, index)); + + cl_assert(entry = git_index_get_bypath(newindex, "A", 0)); + cl_assert_equal_i(0, entry->file_size); + + git_index_free(index); + git_index_free(newindex); +} + +void test_index_racy__read_index_clears_uptodate_bit(void) +{ + git_index *index, *newindex; + const git_index_entry *entry; + + setup_uptodate_files(); + + cl_git_pass(git_repository_index(&index, g_repo)); + cl_git_pass(git_index_new(&newindex)); + cl_git_pass(git_index_read_index(newindex, index)); + + /* ensure that files brought in from the other index are not uptodate */ + cl_assert((entry = git_index_get_bypath(newindex, "A", 0))); + cl_assert_equal_i(0, (entry->flags_extended & GIT_IDXENTRY_UPTODATE)); + + cl_assert((entry = git_index_get_bypath(newindex, "B", 0))); + cl_assert_equal_i(0, (entry->flags_extended & GIT_IDXENTRY_UPTODATE)); + + cl_assert((entry = git_index_get_bypath(newindex, "C", 0))); + cl_assert_equal_i(0, (entry->flags_extended & GIT_IDXENTRY_UPTODATE)); + + git_index_free(index); + git_index_free(newindex); +} diff --git a/vendor/libgit2/tests/index/rename.c b/vendor/libgit2/tests/index/rename.c index dd3cfa732..86eaf0053 100644 --- a/vendor/libgit2/tests/index/rename.c +++ b/vendor/libgit2/tests/index/rename.c @@ -48,3 +48,39 @@ void test_index_rename__single_file(void) cl_fixture_cleanup("rename"); } + +void test_index_rename__casechanging(void) +{ + git_repository *repo; + git_index *index; + const git_index_entry *entry; + git_index_entry new = {{0}}; + + p_mkdir("rename", 0700); + + cl_git_pass(git_repository_init(&repo, "./rename", 0)); + cl_git_pass(git_repository_index(&index, repo)); + + cl_git_mkfile("./rename/lame.name.txt", "new_file\n"); + + cl_git_pass(git_index_add_bypath(index, "lame.name.txt")); + cl_assert_equal_i(1, git_index_entrycount(index)); + cl_assert((entry = git_index_get_bypath(index, "lame.name.txt", 0))); + + memcpy(&new, entry, sizeof(git_index_entry)); + new.path = "LAME.name.TXT"; + + cl_git_pass(git_index_add(index, &new)); + cl_assert((entry = git_index_get_bypath(index, "LAME.name.TXT", 0))); + + if (cl_repo_get_bool(repo, "core.ignorecase")) + cl_assert_equal_i(1, git_index_entrycount(index)); + else + cl_assert_equal_i(2, git_index_entrycount(index)); + + git_index_free(index); + git_repository_free(repo); + + cl_fixture_cleanup("rename"); +} + diff --git a/vendor/libgit2/tests/index/tests.c b/vendor/libgit2/tests/index/tests.c index e1ff12ad0..1498196b2 100644 --- a/vendor/libgit2/tests/index/tests.c +++ b/vendor/libgit2/tests/index/tests.c @@ -155,6 +155,27 @@ void test_index_tests__find_in_empty(void) git_index_free(index); } +void test_index_tests__find_prefix(void) +{ + git_index *index; + const git_index_entry *entry; + size_t pos; + + cl_git_pass(git_index_open(&index, TEST_INDEX_PATH)); + + cl_git_pass(git_index_find_prefix(&pos, index, "src")); + entry = git_index_get_byindex(index, pos); + cl_assert(git__strcmp(entry->path, "src/block-sha1/sha1.c") == 0); + + cl_git_pass(git_index_find_prefix(&pos, index, "src/co")); + entry = git_index_get_byindex(index, pos); + cl_assert(git__strcmp(entry->path, "src/commit.c") == 0); + + cl_assert(GIT_ENOTFOUND == git_index_find_prefix(NULL, index, "blah")); + + git_index_free(index); +} + void test_index_tests__write(void) { git_index *index; @@ -731,7 +752,7 @@ void test_index_tests__reload_from_disk(void) cl_set_cleanup(&cleanup_myrepo, NULL); - cl_git_pass(git_futils_mkdir("./myrepo", NULL, 0777, GIT_MKDIR_PATH)); + cl_git_pass(git_futils_mkdir("./myrepo", 0777, GIT_MKDIR_PATH)); cl_git_mkfile("./myrepo/a.txt", "a\n"); cl_git_mkfile("./myrepo/b.txt", "b\n"); @@ -792,10 +813,43 @@ void test_index_tests__reload_while_ignoring_case(void) cl_git_pass(git_index_set_caps(index, caps &= ~GIT_INDEXCAP_IGNORE_CASE)); cl_git_pass(git_index_read(index, true)); cl_git_pass(git_vector_verify_sorted(&index->entries)); + cl_assert(git_index_get_bypath(index, ".HEADER", 0)); + cl_assert_equal_p(NULL, git_index_get_bypath(index, ".header", 0)); cl_git_pass(git_index_set_caps(index, caps | GIT_INDEXCAP_IGNORE_CASE)); cl_git_pass(git_index_read(index, true)); cl_git_pass(git_vector_verify_sorted(&index->entries)); + cl_assert(git_index_get_bypath(index, ".HEADER", 0)); + cl_assert(git_index_get_bypath(index, ".header", 0)); + + git_index_free(index); +} + +void test_index_tests__change_icase_on_instance(void) +{ + git_index *index; + unsigned int caps; + const git_index_entry *e; + + cl_git_pass(git_index_open(&index, TEST_INDEX_PATH)); + cl_git_pass(git_vector_verify_sorted(&index->entries)); + + caps = git_index_caps(index); + cl_git_pass(git_index_set_caps(index, caps &= ~GIT_INDEXCAP_IGNORE_CASE)); + cl_assert_equal_i(false, index->ignore_case); + cl_git_pass(git_vector_verify_sorted(&index->entries)); + cl_assert(e = git_index_get_bypath(index, "src/common.h", 0)); + cl_assert_equal_p(NULL, e = git_index_get_bypath(index, "SRC/Common.h", 0)); + cl_assert(e = git_index_get_bypath(index, "COPYING", 0)); + cl_assert_equal_p(NULL, e = git_index_get_bypath(index, "copying", 0)); + + cl_git_pass(git_index_set_caps(index, caps | GIT_INDEXCAP_IGNORE_CASE)); + cl_assert_equal_i(true, index->ignore_case); + cl_git_pass(git_vector_verify_sorted(&index->entries)); + cl_assert(e = git_index_get_bypath(index, "COPYING", 0)); + cl_assert_equal_s("COPYING", e->path); + cl_assert(e = git_index_get_bypath(index, "copying", 0)); + cl_assert_equal_s("COPYING", e->path); git_index_free(index); } diff --git a/vendor/libgit2/tests/main.c b/vendor/libgit2/tests/main.c index 56326da1c..f67c8ffbc 100644 --- a/vendor/libgit2/tests/main.c +++ b/vendor/libgit2/tests/main.c @@ -1,10 +1,3 @@ - -#if defined(GIT_MSVC_CRTDBG) -/* Enable MSVC CRTDBG memory leak reporting. See src/util.h for details. */ -#include -#include -#endif - #include "clar_libgit2.h" #include "clar_libgit2_trace.h" @@ -16,18 +9,6 @@ int main(int argc, char *argv[]) { int res; -#if defined(GIT_MSVC_CRTDBG) - _CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF); - - _CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_DEBUG | _CRTDBG_MODE_FILE); - _CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_DEBUG | _CRTDBG_MODE_FILE); - _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_DEBUG | _CRTDBG_MODE_FILE); - - _CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR); - _CrtSetReportFile(_CRT_ERROR, _CRTDBG_FILE_STDERR); - _CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR); -#endif - clar_test_init(argc, argv); git_libgit2_init(); diff --git a/vendor/libgit2/tests/merge/conflict_data.h b/vendor/libgit2/tests/merge/conflict_data.h new file mode 100644 index 000000000..e6394a9e8 --- /dev/null +++ b/vendor/libgit2/tests/merge/conflict_data.h @@ -0,0 +1,103 @@ +#define AUTOMERGEABLE_MERGED_FILE \ + "this file is changed in master\n" \ + "this file is automergeable\n" \ + "this file is automergeable\n" \ + "this file is automergeable\n" \ + "this file is automergeable\n" \ + "this file is automergeable\n" \ + "this file is automergeable\n" \ + "this file is automergeable\n" \ + "this file is changed in branch\n" + +#define AUTOMERGEABLE_MERGED_FILE_CRLF \ + "this file is changed in master\r\n" \ + "this file is automergeable\r\n" \ + "this file is automergeable\r\n" \ + "this file is automergeable\r\n" \ + "this file is automergeable\r\n" \ + "this file is automergeable\r\n" \ + "this file is automergeable\r\n" \ + "this file is automergeable\r\n" \ + "this file is changed in branch\r\n" + +#define CONFLICTING_MERGE_FILE \ + "<<<<<<< HEAD\n" \ + "this file is changed in master and branch\n" \ + "=======\n" \ + "this file is changed in branch and master\n" \ + ">>>>>>> 7cb63eed597130ba4abb87b3e544b85021905520\n" + +#define CONFLICTING_DIFF3_FILE \ + "<<<<<<< HEAD\n" \ + "this file is changed in master and branch\n" \ + "||||||| initial\n" \ + "this file is a conflict\n" \ + "=======\n" \ + "this file is changed in branch and master\n" \ + ">>>>>>> 7cb63eed597130ba4abb87b3e544b85021905520\n" + +#define CONFLICTING_UNION_FILE \ + "this file is changed in master and branch\n" \ + "this file is changed in branch and master\n" + +#define CONFLICTING_RECURSIVE_F1_TO_F2 \ + "VEAL SOUP.\n" \ + "\n" \ + "<<<<<<< HEAD\n" \ + "PUT INTO A POT THREE QUARTS OF WATER, three onions cut small, ONE\n" \ + "=======\n" \ + "PUT INTO A POT THREE QUARTS OF WATER, three onions cut not too small, one\n" \ + ">>>>>>> branchF-2\n" \ + "spoonful of black pepper pounded, and two of salt, with two or three\n" \ + "slices of lean ham; let it boil steadily two hours; skim it\n" \ + "occasionally, then put into it a shin of veal, let it boil two hours\n" \ + "longer; take out the slices of ham, and skim off the grease if any\n" \ + "should rise, take a gill of good cream, mix with it two table-spoonsful\n" \ + "of flour very nicely, and the yelks of two eggs beaten well, strain this\n" \ + "mixture, and add some chopped parsley; pour some soup on by degrees,\n" \ + "stir it well, and pour it into the pot, continuing to stir until it has\n" \ + "boiled two or three minutes to take off the raw taste of the eggs. If\n" \ + "the cream be not perfectly sweet, and the eggs quite new, the thickening\n" \ + "will curdle in the soup. For a change you may put a dozen ripe tomatos\n" \ + "in, first taking off their skins, by letting them stand a few minutes in\n" \ + "hot water, when they may be easily peeled. When made in this way you\n" \ + "must thicken it with the flour only. Any part of the veal may be used,\n" \ + "but the shin or knuckle is the nicest.\n" \ + "\n" \ + "<<<<<<< HEAD\n" \ + "This certainly is a mighty fine recipe.\n" \ + "=======\n" \ + "This is a mighty fine recipe!\n" \ + ">>>>>>> branchF-2\n" + +#define CONFLICTING_RECURSIVE_H1_TO_H2_WITH_DIFF3 \ + "VEAL SOUP.\n" \ + "\n" \ + "<<<<<<< HEAD\n" \ + "put into a pot three quarts of water, three onions cut small, one\n" \ + "||||||| merged common ancestors\n" \ + "<<<<<<< Temporary merge branch 1\n" \ + "Put into a pot three quarts of water, THREE ONIONS CUT SMALL, one\n" \ + "||||||| merged common ancestors\n" \ + "Put into a pot three quarts of water, three onions cut small, one\n" \ + "=======\n" \ + "PUT INTO A POT three quarts of water, three onions cut small, one\n" \ + ">>>>>>> Temporary merge branch 2\n" \ + "=======\n" \ + "Put Into A Pot Three Quarts of Water, Three Onions Cut Small, One\n" \ + ">>>>>>> branchH-2\n" \ + "spoonful of black pepper pounded, and two of salt, with two or three\n" \ + "slices of lean ham; let it boil steadily two hours; skim it\n" \ + "occasionally, then put into it a shin of veal, let it boil two hours\n" \ + "longer; take out the slices of ham, and skim off the grease if any\n" \ + "should rise, take a gill of good cream, mix with it two table-spoonsful\n" \ + "of flour very nicely, and the yelks of two eggs beaten well, strain this\n" \ + "mixture, and add some chopped parsley; pour some soup on by degrees,\n" \ + "stir it well, and pour it into the pot, continuing to stir until it has\n" \ + "boiled two or three minutes to take off the raw taste of the eggs. If\n" \ + "the cream be not perfectly sweet, and the eggs quite new, the thickening\n" \ + "will curdle in the soup. For a change you may put a dozen ripe tomatos\n" \ + "in, first taking off their skins, by letting them stand a few minutes in\n" \ + "hot water, when they may be easily peeled. When made in this way you\n" \ + "must thicken it with the flour only. Any part of the veal may be used,\n" \ + "but the shin or knuckle is the nicest.\n" diff --git a/vendor/libgit2/tests/merge/files.c b/vendor/libgit2/tests/merge/files.c index 2d55df2b2..daa73fada 100644 --- a/vendor/libgit2/tests/merge/files.c +++ b/vendor/libgit2/tests/merge/files.c @@ -4,6 +4,7 @@ #include "buffer.h" #include "merge.h" #include "merge_helpers.h" +#include "conflict_data.h" #include "refs.h" #include "fileops.h" #include "diff_xdiff.h" diff --git a/vendor/libgit2/tests/merge/merge_helpers.c b/vendor/libgit2/tests/merge/merge_helpers.c index f81471424..4b1b7d262 100644 --- a/vendor/libgit2/tests/merge/merge_helpers.c +++ b/vendor/libgit2/tests/merge/merge_helpers.c @@ -4,6 +4,7 @@ #include "tree.h" #include "merge_helpers.h" #include "merge.h" +#include "index.h" #include "git2/merge.h" #include "git2/sys/index.h" #include "git2/annotated_commit.h" @@ -40,7 +41,7 @@ int merge_trees_from_branches( cl_git_pass(git_commit_tree(&our_tree, our_commit)); cl_git_pass(git_commit_tree(&their_tree, their_commit)); - cl_git_pass(git_merge_trees(index, repo, ancestor_tree, our_tree, their_tree, opts)); + error = git_merge_trees(index, repo, ancestor_tree, our_tree, their_tree, opts); git_buf_free(&branch_buf); git_tree_free(our_tree); @@ -50,7 +51,7 @@ int merge_trees_from_branches( git_commit_free(their_commit); git_commit_free(ancestor_commit); - return 0; + return error; } int merge_commits_from_branches( @@ -61,6 +62,7 @@ int merge_commits_from_branches( git_commit *our_commit, *their_commit; git_oid our_oid, their_oid; git_buf branch_buf = GIT_BUF_INIT; + int error; git_buf_printf(&branch_buf, "%s%s", GIT_REFS_HEADS_DIR, ours_name); cl_git_pass(git_reference_name_to_id(&our_oid, repo, branch_buf.ptr)); @@ -71,13 +73,13 @@ int merge_commits_from_branches( cl_git_pass(git_reference_name_to_id(&their_oid, repo, branch_buf.ptr)); cl_git_pass(git_commit_lookup(&their_commit, repo, &their_oid)); - cl_git_pass(git_merge_commits(index, repo, our_commit, their_commit, opts)); + error = git_merge_commits(index, repo, our_commit, their_commit, opts); git_buf_free(&branch_buf); git_commit_free(our_commit); git_commit_free(their_commit); - return 0; + return error; } int merge_branches(git_repository *repo, @@ -238,7 +240,7 @@ int merge_test_index(git_index *index, const struct merge_index_entry expected[] const git_index_entry *index_entry; /* - dump_index_entries(&index->entries); + merge__dump_index_entries(&index->entries); */ if (git_index_entrycount(index) != expected_len) diff --git a/vendor/libgit2/tests/merge/merge_helpers.h b/vendor/libgit2/tests/merge/merge_helpers.h index 554c24b7c..e407c7d13 100644 --- a/vendor/libgit2/tests/merge/merge_helpers.h +++ b/vendor/libgit2/tests/merge/merge_helpers.h @@ -4,49 +4,6 @@ #include "merge.h" #include "git2/merge.h" -#define AUTOMERGEABLE_MERGED_FILE \ - "this file is changed in master\n" \ - "this file is automergeable\n" \ - "this file is automergeable\n" \ - "this file is automergeable\n" \ - "this file is automergeable\n" \ - "this file is automergeable\n" \ - "this file is automergeable\n" \ - "this file is automergeable\n" \ - "this file is changed in branch\n" - -#define AUTOMERGEABLE_MERGED_FILE_CRLF \ - "this file is changed in master\r\n" \ - "this file is automergeable\r\n" \ - "this file is automergeable\r\n" \ - "this file is automergeable\r\n" \ - "this file is automergeable\r\n" \ - "this file is automergeable\r\n" \ - "this file is automergeable\r\n" \ - "this file is automergeable\r\n" \ - "this file is changed in branch\r\n" - -#define CONFLICTING_MERGE_FILE \ - "<<<<<<< HEAD\n" \ - "this file is changed in master and branch\n" \ - "=======\n" \ - "this file is changed in branch and master\n" \ - ">>>>>>> 7cb63eed597130ba4abb87b3e544b85021905520\n" - -#define CONFLICTING_DIFF3_FILE \ - "<<<<<<< HEAD\n" \ - "this file is changed in master and branch\n" \ - "||||||| initial\n" \ - "this file is a conflict\n" \ - "=======\n" \ - "this file is changed in branch and master\n" \ - ">>>>>>> 7cb63eed597130ba4abb87b3e544b85021905520\n" - -#define CONFLICTING_UNION_FILE \ - "this file is changed in master and branch\n" \ - "this file is changed in branch and master\n" - - struct merge_index_entry { uint16_t mode; char oid_str[GIT_OID_HEXSZ+1]; diff --git a/vendor/libgit2/tests/merge/trees/automerge.c b/vendor/libgit2/tests/merge/trees/automerge.c index c18881d7c..67f2cf786 100644 --- a/vendor/libgit2/tests/merge/trees/automerge.c +++ b/vendor/libgit2/tests/merge/trees/automerge.c @@ -3,8 +3,9 @@ #include "git2/merge.h" #include "buffer.h" #include "merge.h" -#include "../merge_helpers.h" #include "fileops.h" +#include "../merge_helpers.h" +#include "../conflict_data.h" static git_repository *repo; diff --git a/vendor/libgit2/tests/merge/trees/commits.c b/vendor/libgit2/tests/merge/trees/commits.c index c4e470997..786a77a8b 100644 --- a/vendor/libgit2/tests/merge/trees/commits.c +++ b/vendor/libgit2/tests/merge/trees/commits.c @@ -3,6 +3,7 @@ #include "git2/merge.h" #include "merge.h" #include "../merge_helpers.h" +#include "../conflict_data.h" static git_repository *repo; @@ -94,7 +95,6 @@ void test_merge_trees_commits__no_ancestor(void) git_index_free(index); } - void test_merge_trees_commits__df_conflict(void) { git_index *index; @@ -129,3 +129,20 @@ void test_merge_trees_commits__df_conflict(void) git_index_free(index); } + +void test_merge_trees_commits__fail_on_conflict(void) +{ + git_index *index; + git_merge_options opts = GIT_MERGE_OPTIONS_INIT; + + opts.flags |= GIT_MERGE_FAIL_ON_CONFLICT; + + cl_git_fail_with(GIT_EMERGECONFLICT, + merge_trees_from_branches(&index, repo, "df_side1", "df_side2", &opts)); + + cl_git_fail_with(GIT_EMERGECONFLICT, + merge_commits_from_branches(&index, repo, "master", "unrelated", &opts)); + cl_git_fail_with(GIT_EMERGECONFLICT, + merge_commits_from_branches(&index, repo, "master", "branch", &opts)); +} + diff --git a/vendor/libgit2/tests/merge/trees/recursive.c b/vendor/libgit2/tests/merge/trees/recursive.c new file mode 100644 index 000000000..c5b129bf8 --- /dev/null +++ b/vendor/libgit2/tests/merge/trees/recursive.c @@ -0,0 +1,410 @@ +#include "clar_libgit2.h" +#include "git2/repository.h" +#include "git2/merge.h" +#include "merge.h" +#include "../merge_helpers.h" + +static git_repository *repo; + +#define TEST_REPO_PATH "merge-recursive" + +void test_merge_trees_recursive__initialize(void) +{ + repo = cl_git_sandbox_init(TEST_REPO_PATH); +} + +void test_merge_trees_recursive__cleanup(void) +{ + cl_git_sandbox_cleanup(); +} + +void test_merge_trees_recursive__one_base_commit(void) +{ + git_index *index; + git_merge_options opts = GIT_MERGE_OPTIONS_INIT; + + struct merge_index_entry merge_index_entries[] = { + { 0100644, "dea7215f259b2cced87d1bda6c72f8b4ce37a2ff", 0, "asparagus.txt" }, + { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" }, + { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" }, + { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" }, + { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" }, + { 0100644, "94d2c01087f48213bd157222d54edfefd77c9bba", 0, "veal.txt" }, + }; + + cl_git_pass(merge_commits_from_branches(&index, repo, "branchA-1", "branchA-2", &opts)); + + cl_assert(merge_test_index(index, merge_index_entries, 6)); + + git_index_free(index); +} + +void test_merge_trees_recursive__one_base_commit_norecursive(void) +{ + git_index *index; + git_merge_options opts = GIT_MERGE_OPTIONS_INIT; + + struct merge_index_entry merge_index_entries[] = { + { 0100644, "dea7215f259b2cced87d1bda6c72f8b4ce37a2ff", 0, "asparagus.txt" }, + { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" }, + { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" }, + { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" }, + { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" }, + { 0100644, "94d2c01087f48213bd157222d54edfefd77c9bba", 0, "veal.txt" }, + }; + + opts.flags |= GIT_MERGE_NO_RECURSIVE; + + cl_git_pass(merge_commits_from_branches(&index, repo, "branchA-1", "branchA-2", &opts)); + + cl_assert(merge_test_index(index, merge_index_entries, 6)); + + git_index_free(index); +} + +void test_merge_trees_recursive__two_base_commits(void) +{ + git_index *index; + git_merge_options opts = GIT_MERGE_OPTIONS_INIT; + + struct merge_index_entry merge_index_entries[] = { + { 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "asparagus.txt" }, + { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" }, + { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" }, + { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" }, + { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" }, + { 0100644, "666ffdfcf1eaa5641fa31064bf2607327e843c09", 0, "veal.txt" }, + }; + + cl_git_pass(merge_commits_from_branches(&index, repo, "branchB-1", "branchB-2", &opts)); + + cl_assert(merge_test_index(index, merge_index_entries, 6)); + + git_index_free(index); +} + +void test_merge_trees_recursive__two_base_commits_norecursive(void) +{ + git_index *index; + git_merge_options opts = GIT_MERGE_OPTIONS_INIT; + + struct merge_index_entry merge_index_entries[] = { + { 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "asparagus.txt" }, + { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" }, + { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" }, + { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" }, + { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" }, + { 0100644, "cb49ad76147f5f9439cbd6133708b76142660660", 1, "veal.txt" }, + { 0100644, "b2a81ead9e722af0099fccfb478cea88eea749a2", 2, "veal.txt" }, + { 0100644, "4e21d2d63357bde5027d1625f5ec6b430cdeb143", 3, "veal.txt" }, + }; + + opts.flags |= GIT_MERGE_NO_RECURSIVE; + + cl_git_pass(merge_commits_from_branches(&index, repo, "branchB-1", "branchB-2", &opts)); + + cl_assert(merge_test_index(index, merge_index_entries, 8)); + + git_index_free(index); +} + +void test_merge_trees_recursive__two_levels_of_multiple_bases(void) +{ + git_index *index; + git_merge_options opts = GIT_MERGE_OPTIONS_INIT; + + struct merge_index_entry merge_index_entries[] = { + { 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "asparagus.txt" }, + { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" }, + { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" }, + { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" }, + { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" }, + { 0100644, "15faa0c9991f2d65686e844651faa2ff9827887b", 0, "veal.txt" }, + }; + + cl_git_pass(merge_commits_from_branches(&index, repo, "branchC-1", "branchC-2", &opts)); + + cl_assert(merge_test_index(index, merge_index_entries, 6)); + + git_index_free(index); +} + +void test_merge_trees_recursive__two_levels_of_multiple_bases_norecursive(void) +{ + git_index *index; + git_merge_options opts = GIT_MERGE_OPTIONS_INIT; + + struct merge_index_entry merge_index_entries[] = { + { 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "asparagus.txt" }, + { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" }, + { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" }, + { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" }, + { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" }, + { 0100644, "b2a81ead9e722af0099fccfb478cea88eea749a2", 1, "veal.txt" }, + { 0100644, "898d12687fb35be271c27c795a6b32c8b51da79e", 2, "veal.txt" }, + { 0100644, "68a2e1ee61a23a4728fe6b35580fbbbf729df370", 3, "veal.txt" }, + }; + + opts.flags |= GIT_MERGE_NO_RECURSIVE; + + cl_git_pass(merge_commits_from_branches(&index, repo, "branchC-1", "branchC-2", &opts)); + + cl_assert(merge_test_index(index, merge_index_entries, 8)); + + git_index_free(index); +} + +void test_merge_trees_recursive__three_levels_of_multiple_bases(void) +{ + git_index *index; + git_merge_options opts = GIT_MERGE_OPTIONS_INIT; + + struct merge_index_entry merge_index_entries[] = { + { 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "asparagus.txt" }, + { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" }, + { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" }, + { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" }, + { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" }, + { 0100644, "d55e5dc038c52f1a36548625bcb666cbc06db9e6", 0, "veal.txt" }, + }; + + cl_git_pass(merge_commits_from_branches(&index, repo, "branchD-2", "branchD-1", &opts)); + + cl_assert(merge_test_index(index, merge_index_entries, 6)); + + git_index_free(index); +} + +void test_merge_trees_recursive__three_levels_of_multiple_bases_norecursive(void) +{ + git_index *index; + git_merge_options opts = GIT_MERGE_OPTIONS_INIT; + + struct merge_index_entry merge_index_entries[] = { + { 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "asparagus.txt" }, + { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" }, + { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" }, + { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" }, + { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" }, + { 0100644, "898d12687fb35be271c27c795a6b32c8b51da79e", 1, "veal.txt" }, + { 0100644, "f1b44c04989a3a1c14b036cfadfa328d53a7bc5e", 2, "veal.txt" }, + { 0100644, "5e8747f5200fac0f945a07daf6163ca9cb1a8da9", 3, "veal.txt" }, + }; + + opts.flags |= GIT_MERGE_NO_RECURSIVE; + + cl_git_pass(merge_commits_from_branches(&index, repo, "branchD-2", "branchD-1", &opts)); + + cl_assert(merge_test_index(index, merge_index_entries, 8)); + + git_index_free(index); +} + +void test_merge_trees_recursive__three_base_commits(void) +{ + git_index *index; + git_merge_options opts = GIT_MERGE_OPTIONS_INIT; + + struct merge_index_entry merge_index_entries[] = { + { 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "asparagus.txt" }, + { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" }, + { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" }, + { 0100644, "c4f7269b07c76d02755d75ccaf05c0b4c36cdc6c", 0, "gravy.txt" }, + { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" }, + { 0100644, "a7b066537e6be7109abfe4ff97b675d4e077da20", 0, "veal.txt" }, + }; + + cl_git_pass(merge_commits_from_branches(&index, repo, "branchE-1", "branchE-2", &opts)); + + cl_assert(merge_test_index(index, merge_index_entries, 6)); + + git_index_free(index); +} + +void test_merge_trees_recursive__three_base_commits_norecursive(void) +{ + git_index *index; + git_merge_options opts = GIT_MERGE_OPTIONS_INIT; + + struct merge_index_entry merge_index_entries[] = { + { 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "asparagus.txt" }, + { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" }, + { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" }, + { 0100644, "9e12bce04446d097ae1782967a5888c2e2a0d35b", 1, "gravy.txt" }, + { 0100644, "d8dd349b78f19a4ebe3357bacb8138f00bf5ed41", 2, "gravy.txt" }, + { 0100644, "e50fbbd701458757bdfe9815f58ed717c588d1b5", 3, "gravy.txt" }, + { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" }, + { 0100644, "a7b066537e6be7109abfe4ff97b675d4e077da20", 0, "veal.txt" }, + }; + + opts.flags |= GIT_MERGE_NO_RECURSIVE; + + cl_git_pass(merge_commits_from_branches(&index, repo, "branchE-1", "branchE-2", &opts)); + + cl_assert(merge_test_index(index, merge_index_entries, 8)); + + git_index_free(index); +} + +void test_merge_trees_recursive__conflict(void) +{ + git_index *index; + git_merge_options opts = GIT_MERGE_OPTIONS_INIT; + + struct merge_index_entry merge_index_entries[] = { + { 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "asparagus.txt" }, + { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" }, + { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" }, + { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" }, + { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" }, + { 0100644, "fa567f568ed72157c0c617438d077695b99d9aac", 1, "veal.txt" }, + { 0100644, "21950d5e4e4d1a871b4dfcf72ecb6b9c162c434e", 2, "veal.txt" }, + { 0100644, "3855170cef875708da06ab9ad7fc6a73b531cda1", 3, "veal.txt" }, + }; + + cl_git_pass(merge_commits_from_branches(&index, repo, "branchF-1", "branchF-2", &opts)); + + cl_assert(merge_test_index(index, merge_index_entries, 8)); + + git_index_free(index); +} + +/* + * Branch G-1 and G-2 have three common ancestors (815b5a1, ad2ace9, 483065d). + * The merge-base of the first two has two common ancestors (723181f, a34e5a1) + * which themselves have two common ancestors (8f35f30, 3a3f5a6), which + * finally has a common ancestor of 7c7bf85. This virtual merge base will + * be computed and merged with 483065d which also has a common ancestor of + * 7c7bf85. + */ +void test_merge_trees_recursive__oh_so_many_levels_of_recursion(void) +{ + git_index *index; + git_merge_options opts = GIT_MERGE_OPTIONS_INIT; + + struct merge_index_entry merge_index_entries[] = { + { 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "asparagus.txt" }, + { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" }, + { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" }, + { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" }, + { 0100644, "7c7e08f9559d9e1551b91e1cf68f1d0066109add", 0, "oyster.txt" }, + { 0100644, "898d12687fb35be271c27c795a6b32c8b51da79e", 0, "veal.txt" }, + }; + + cl_git_pass(merge_commits_from_branches(&index, repo, "branchG-1", "branchG-2", &opts)); + + cl_assert(merge_test_index(index, merge_index_entries, 6)); + + git_index_free(index); +} + +/* Branch H-1 and H-2 have two common ancestors (aa9e263, 6ef31d3). The two + * ancestors themselves conflict. + */ +void test_merge_trees_recursive__conflicting_merge_base(void) +{ + git_index *index; + git_merge_options opts = GIT_MERGE_OPTIONS_INIT; + + struct merge_index_entry merge_index_entries[] = { + { 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "asparagus.txt" }, + { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" }, + { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" }, + { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" }, + { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" }, + { 0100644, "3a66812fed1e03ea4a6a7ee28d8a57aec1ca6537", 1, "veal.txt" }, + { 0100644, "d604c75019c282144bdbbf3fd3462ba74b240efc", 2, "veal.txt" }, + { 0100644, "37a5054a9f9b4628e3924c5cb8f2147c6e2a3efc", 3, "veal.txt" }, + }; + + cl_git_pass(merge_commits_from_branches(&index, repo, "branchH-1", "branchH-2", &opts)); + + cl_assert(merge_test_index(index, merge_index_entries, 8)); + + git_index_free(index); +} + +/* Branch H-1 and H-2 have two common ancestors (aa9e263, 6ef31d3). The two + * ancestors themselves conflict. The generated common ancestor file will + * have diff3 style conflicts inside it. + */ +void test_merge_trees_recursive__conflicting_merge_base_with_diff3(void) +{ + git_index *index; + git_merge_options opts = GIT_MERGE_OPTIONS_INIT; + + struct merge_index_entry merge_index_entries[] = { + { 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "asparagus.txt" }, + { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" }, + { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" }, + { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" }, + { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" }, + { 0100644, "cd17a91513f3aee9e44114d1ede67932dd41d2fc", 1, "veal.txt" }, + { 0100644, "d604c75019c282144bdbbf3fd3462ba74b240efc", 2, "veal.txt" }, + { 0100644, "37a5054a9f9b4628e3924c5cb8f2147c6e2a3efc", 3, "veal.txt" }, + }; + + opts.file_flags |= GIT_MERGE_FILE_STYLE_DIFF3; + + cl_git_pass(merge_commits_from_branches(&index, repo, "branchH-1", "branchH-2", &opts)); + + cl_assert(merge_test_index(index, merge_index_entries, 8)); + + git_index_free(index); +} + +/* Branch I-1 and I-2 have two common ancestors (aa9e263, 6ef31d3). The two + * ancestors themselves conflict, but when each was merged, the conflicts were + * resolved identically, thus merging I-1 into I-2 does not conflict. + */ +void test_merge_trees_recursive__conflicting_merge_base_since_resolved(void) +{ + git_index *index; + git_merge_options opts = GIT_MERGE_OPTIONS_INIT; + + struct merge_index_entry merge_index_entries[] = { + { 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "asparagus.txt" }, + { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" }, + { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" }, + { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" }, + { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" }, + { 0100644, "a02d4fd126e0cc8fb46ee48cf38bad36d44f2dbc", 0, "veal.txt" }, + }; + + cl_git_pass(merge_commits_from_branches(&index, repo, "branchI-1", "branchI-2", &opts)); + + cl_assert(merge_test_index(index, merge_index_entries, 6)); + + git_index_free(index); +} + +/* There are multiple levels of criss-cross merges, and multiple recursive + * merges would create a common ancestor that allows the merge to complete + * successfully. Test that we can build a single virtual base, then stop, + * which will produce a conflicting merge. + */ +void test_merge_trees_recursive__recursionlimit(void) +{ + git_index *index; + git_merge_options opts = GIT_MERGE_OPTIONS_INIT; + + struct merge_index_entry merge_index_entries[] = { + { 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "asparagus.txt" }, + { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" }, + { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" }, + { 0100644, "ce7e553c6feb6e5f3bd67e3c3be04182fe3094b4", 1, "gravy.txt" }, + { 0100644, "d8dd349b78f19a4ebe3357bacb8138f00bf5ed41", 2, "gravy.txt" }, + { 0100644, "e50fbbd701458757bdfe9815f58ed717c588d1b5", 3, "gravy.txt" }, + { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" }, + { 0100644, "a7b066537e6be7109abfe4ff97b675d4e077da20", 0, "veal.txt" }, + }; + + opts.recursion_limit = 1; + + cl_git_pass(merge_commits_from_branches(&index, repo, "branchE-1", "branchE-2", &opts)); + + cl_assert(merge_test_index(index, merge_index_entries, 8)); + + git_index_free(index); +} + diff --git a/vendor/libgit2/tests/merge/trees/treediff.c b/vendor/libgit2/tests/merge/trees/treediff.c index b96c4c4db..3634568de 100644 --- a/vendor/libgit2/tests/merge/trees/treediff.c +++ b/vendor/libgit2/tests/merge/trees/treediff.c @@ -44,9 +44,10 @@ static void test_find_differences( git_oid ancestor_oid, ours_oid, theirs_oid; git_tree *ancestor_tree, *ours_tree, *theirs_tree; git_iterator *ancestor_iter, *ours_iter, *theirs_iter; + git_iterator_options iter_opts = GIT_ITERATOR_OPTIONS_INIT; git_merge_options opts = GIT_MERGE_OPTIONS_INIT; - opts.tree_flags |= GIT_MERGE_TREE_FIND_RENAMES; + opts.flags |= GIT_MERGE_FIND_RENAMES; opts.target_limit = 1000; opts.rename_threshold = 50; @@ -67,12 +68,11 @@ static void test_find_differences( cl_git_pass(git_tree_lookup(&ours_tree, repo, &ours_oid)); cl_git_pass(git_tree_lookup(&theirs_tree, repo, &theirs_oid)); - cl_git_pass(git_iterator_for_tree(&ancestor_iter, ancestor_tree, - GIT_ITERATOR_DONT_IGNORE_CASE, NULL, NULL)); - cl_git_pass(git_iterator_for_tree(&ours_iter, ours_tree, - GIT_ITERATOR_DONT_IGNORE_CASE, NULL, NULL)); - cl_git_pass(git_iterator_for_tree(&theirs_iter, theirs_tree, - GIT_ITERATOR_DONT_IGNORE_CASE, NULL, NULL)); + iter_opts.flags = GIT_ITERATOR_DONT_IGNORE_CASE; + + cl_git_pass(git_iterator_for_tree(&ancestor_iter, ancestor_tree, &iter_opts)); + cl_git_pass(git_iterator_for_tree(&ours_iter, ours_tree, &iter_opts)); + cl_git_pass(git_iterator_for_tree(&theirs_iter, theirs_tree, &iter_opts)); cl_git_pass(git_merge_diff_list__find_differences(merge_diff_list, ancestor_iter, ours_iter, theirs_iter)); cl_git_pass(git_merge_diff_list__find_renames(repo, merge_diff_list, &opts)); diff --git a/vendor/libgit2/tests/merge/workdir/dirty.c b/vendor/libgit2/tests/merge/workdir/dirty.c index 4bf984c23..99e33e0cd 100644 --- a/vendor/libgit2/tests/merge/workdir/dirty.c +++ b/vendor/libgit2/tests/merge/workdir/dirty.c @@ -133,7 +133,7 @@ static void hack_index(char *files[]) struct stat statbuf; git_buf path = GIT_BUF_INIT; git_index_entry *entry; - struct timeval times[2]; + struct p_timeval times[2]; time_t now; size_t i; @@ -162,15 +162,20 @@ static void hack_index(char *files[]) cl_git_pass(p_utimes(path.ptr, times)); cl_git_pass(p_stat(path.ptr, &statbuf)); - entry->ctime.seconds = (git_time_t)statbuf.st_ctime; + entry->ctime.seconds = (int32_t)statbuf.st_ctime; + entry->mtime.seconds = (int32_t)statbuf.st_mtime; +#if defined(GIT_USE_NSEC) + entry->ctime.nanoseconds = statbuf.st_ctim.tv_nsec; + entry->mtime.nanoseconds = statbuf.st_mtim.tv_nsec; +#else entry->ctime.nanoseconds = 0; - entry->mtime.seconds = (git_time_t)statbuf.st_mtime; entry->mtime.nanoseconds = 0; +#endif entry->dev = statbuf.st_dev; entry->ino = statbuf.st_ino; entry->uid = statbuf.st_uid; entry->gid = statbuf.st_gid; - entry->file_size = statbuf.st_size; + entry->file_size = (uint32_t)statbuf.st_size; } git_buf_free(&path); diff --git a/vendor/libgit2/tests/merge/workdir/recursive.c b/vendor/libgit2/tests/merge/workdir/recursive.c new file mode 100644 index 000000000..795126255 --- /dev/null +++ b/vendor/libgit2/tests/merge/workdir/recursive.c @@ -0,0 +1,84 @@ +#include "clar_libgit2.h" +#include "git2/repository.h" +#include "git2/merge.h" +#include "merge.h" +#include "../merge_helpers.h" +#include "../conflict_data.h" + +static git_repository *repo; + +#define TEST_REPO_PATH "merge-recursive" + +void test_merge_workdir_recursive__initialize(void) +{ + repo = cl_git_sandbox_init(TEST_REPO_PATH); +} + +void test_merge_workdir_recursive__cleanup(void) +{ + cl_git_sandbox_cleanup(); +} + +void test_merge_workdir_recursive__writes_conflict_with_virtual_base(void) +{ + git_index *index; + git_merge_options opts = GIT_MERGE_OPTIONS_INIT; + git_buf conflicting_buf = GIT_BUF_INIT; + + struct merge_index_entry merge_index_entries[] = { + { 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "asparagus.txt" }, + { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" }, + { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" }, + { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" }, + { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" }, + { 0100644, "fa567f568ed72157c0c617438d077695b99d9aac", 1, "veal.txt" }, + { 0100644, "21950d5e4e4d1a871b4dfcf72ecb6b9c162c434e", 2, "veal.txt" }, + { 0100644, "3855170cef875708da06ab9ad7fc6a73b531cda1", 3, "veal.txt" }, + }; + + cl_git_pass(merge_branches(repo, GIT_REFS_HEADS_DIR "branchF-1", GIT_REFS_HEADS_DIR "branchF-2", &opts, NULL)); + + cl_git_pass(git_repository_index(&index, repo)); + cl_assert(merge_test_index(index, merge_index_entries, 8)); + + cl_git_pass(git_futils_readbuffer(&conflicting_buf, "merge-recursive/veal.txt")); + + cl_assert_equal_s(CONFLICTING_RECURSIVE_F1_TO_F2, conflicting_buf.ptr); + + git_index_free(index); + git_buf_free(&conflicting_buf); +} + +void test_merge_workdir_recursive__conflicting_merge_base_with_diff3(void) +{ + git_index *index; + git_merge_options opts = GIT_MERGE_OPTIONS_INIT; + git_checkout_options checkout_opts = GIT_CHECKOUT_OPTIONS_INIT; + git_buf conflicting_buf = GIT_BUF_INIT; + + struct merge_index_entry merge_index_entries[] = { + { 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "asparagus.txt" }, + { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" }, + { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" }, + { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" }, + { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" }, + { 0100644, "cd17a91513f3aee9e44114d1ede67932dd41d2fc", 1, "veal.txt" }, + { 0100644, "d604c75019c282144bdbbf3fd3462ba74b240efc", 2, "veal.txt" }, + { 0100644, "37a5054a9f9b4628e3924c5cb8f2147c6e2a3efc", 3, "veal.txt" }, + }; + + opts.file_flags |= GIT_MERGE_FILE_STYLE_DIFF3; + checkout_opts.checkout_strategy |= GIT_CHECKOUT_CONFLICT_STYLE_DIFF3; + + cl_git_pass(merge_branches(repo, GIT_REFS_HEADS_DIR "branchH-1", GIT_REFS_HEADS_DIR "branchH-2", &opts, &checkout_opts)); + + cl_git_pass(git_repository_index(&index, repo)); + cl_assert(merge_test_index(index, merge_index_entries, 8)); + + cl_git_pass(git_futils_readbuffer(&conflicting_buf, "merge-recursive/veal.txt")); + + cl_assert_equal_s(CONFLICTING_RECURSIVE_H1_TO_H2_WITH_DIFF3, conflicting_buf.ptr); + + git_index_free(index); + git_buf_free(&conflicting_buf); +} diff --git a/vendor/libgit2/tests/merge/workdir/renames.c b/vendor/libgit2/tests/merge/workdir/renames.c index 83006a703..fabcda2a8 100644 --- a/vendor/libgit2/tests/merge/workdir/renames.c +++ b/vendor/libgit2/tests/merge/workdir/renames.c @@ -63,7 +63,7 @@ void test_merge_workdir_renames__renames(void) { 0100644, "b69fe837e4cecfd4c9a40cdca7c138468687df07", 0, "7-both-renamed.txt~rename_conflict_theirs" }, }; - merge_opts.tree_flags |= GIT_MERGE_TREE_FIND_RENAMES; + merge_opts.flags |= GIT_MERGE_FIND_RENAMES; merge_opts.rename_threshold = 50; cl_git_pass(merge_branches(repo, GIT_REFS_HEADS_DIR BRANCH_RENAME_OURS, GIT_REFS_HEADS_DIR BRANCH_RENAME_THEIRS, &merge_opts, NULL)); @@ -99,7 +99,7 @@ void test_merge_workdir_renames__ours(void) { 0100644, "b42712cfe99a1a500b2a51fe984e0b8a7702ba11", 0, "7-both-renamed.txt" }, }; - merge_opts.tree_flags |= GIT_MERGE_TREE_FIND_RENAMES; + merge_opts.flags |= GIT_MERGE_FIND_RENAMES; merge_opts.rename_threshold = 50; checkout_opts.checkout_strategy = GIT_CHECKOUT_SAFE | GIT_CHECKOUT_USE_OURS; @@ -147,7 +147,7 @@ void test_merge_workdir_renames__similar(void) { 0100644, "b69fe837e4cecfd4c9a40cdca7c138468687df07", 0, "7-both-renamed.txt~rename_conflict_theirs" }, }; - merge_opts.tree_flags |= GIT_MERGE_TREE_FIND_RENAMES; + merge_opts.flags |= GIT_MERGE_FIND_RENAMES; merge_opts.rename_threshold = 50; cl_git_pass(merge_branches(repo, GIT_REFS_HEADS_DIR BRANCH_RENAME_OURS, GIT_REFS_HEADS_DIR BRANCH_RENAME_THEIRS, &merge_opts, NULL)); diff --git a/vendor/libgit2/tests/merge/workdir/simple.c b/vendor/libgit2/tests/merge/workdir/simple.c index abc0777f7..3cdd15b5a 100644 --- a/vendor/libgit2/tests/merge/workdir/simple.c +++ b/vendor/libgit2/tests/merge/workdir/simple.c @@ -4,6 +4,7 @@ #include "buffer.h" #include "merge.h" #include "../merge_helpers.h" +#include "../conflict_data.h" #include "refs.h" #include "fileops.h" diff --git a/vendor/libgit2/tests/network/fetchlocal.c b/vendor/libgit2/tests/network/fetchlocal.c index 06ee3dd36..17c8f26e3 100644 --- a/vendor/libgit2/tests/network/fetchlocal.c +++ b/vendor/libgit2/tests/network/fetchlocal.c @@ -369,17 +369,46 @@ void test_network_fetchlocal__clone_into_mirror(void) { git_clone_options opts = GIT_CLONE_OPTIONS_INIT; git_repository *repo; - git_reference *head; + git_reference *ref; opts.bare = true; opts.remote_cb = remote_mirror_cb; cl_git_pass(git_clone(&repo, cl_git_fixture_url("testrepo.git"), "./foo.git", &opts)); - cl_git_pass(git_reference_lookup(&head, repo, "HEAD")); - cl_assert_equal_i(GIT_REF_SYMBOLIC, git_reference_type(head)); - cl_assert_equal_s("refs/heads/master", git_reference_symbolic_target(head)); + cl_git_pass(git_reference_lookup(&ref, repo, "HEAD")); + cl_assert_equal_i(GIT_REF_SYMBOLIC, git_reference_type(ref)); + cl_assert_equal_s("refs/heads/master", git_reference_symbolic_target(ref)); + + git_reference_free(ref); + cl_git_pass(git_reference_lookup(&ref, repo, "refs/remotes/test/master")); + + git_reference_free(ref); + git_repository_free(repo); + cl_fixture_cleanup("./foo.git"); +} - git_reference_free(head); +void test_network_fetchlocal__all_refs(void) +{ + git_repository *repo; + git_remote *remote; + git_reference *ref; + char *allrefs = "+refs/*:refs/*"; + git_strarray refspecs = { + &allrefs, + 1, + }; + + cl_git_pass(git_repository_init(&repo, "./foo.git", true)); + cl_git_pass(git_remote_create_anonymous(&remote, repo, cl_git_fixture_url("testrepo.git"))); + cl_git_pass(git_remote_fetch(remote, &refspecs, NULL, NULL)); + + cl_git_pass(git_reference_lookup(&ref, repo, "refs/remotes/test/master")); + git_reference_free(ref); + + cl_git_pass(git_reference_lookup(&ref, repo, "refs/tags/test")); + git_reference_free(ref); + + git_remote_free(remote); git_repository_free(repo); cl_fixture_cleanup("./foo.git"); } diff --git a/vendor/libgit2/tests/network/remote/defaultbranch.c b/vendor/libgit2/tests/network/remote/defaultbranch.c index e83755ef6..5edd79fb8 100644 --- a/vendor/libgit2/tests/network/remote/defaultbranch.c +++ b/vendor/libgit2/tests/network/remote/defaultbranch.c @@ -26,7 +26,7 @@ static void assert_default_branch(const char *should) { git_buf name = GIT_BUF_INIT; - cl_git_pass(git_remote_connect(g_remote, GIT_DIRECTION_FETCH, NULL)); + cl_git_pass(git_remote_connect(g_remote, GIT_DIRECTION_FETCH, NULL, NULL)); cl_git_pass(git_remote_default_branch(&name, g_remote)); cl_assert_equal_s(should, name.ptr); git_buf_free(&name); @@ -57,7 +57,7 @@ void test_network_remote_defaultbranch__no_default_branch(void) git_buf buf = GIT_BUF_INIT; cl_git_pass(git_remote_create(&remote_b, g_repo_b, "self", git_repository_path(g_repo_b))); - cl_git_pass(git_remote_connect(remote_b, GIT_DIRECTION_FETCH, NULL)); + cl_git_pass(git_remote_connect(remote_b, GIT_DIRECTION_FETCH, NULL, NULL)); cl_git_pass(git_remote_ls(&heads, &len, remote_b)); cl_assert_equal_i(0, len); @@ -80,7 +80,7 @@ void test_network_remote_defaultbranch__detached_sharing_nonbranch_id(void) cl_git_pass(git_reference_create(&ref, g_repo_a, "refs/foo/bar", &id, 1, NULL)); git_reference_free(ref); - cl_git_pass(git_remote_connect(g_remote, GIT_DIRECTION_FETCH, NULL)); + cl_git_pass(git_remote_connect(g_remote, GIT_DIRECTION_FETCH, NULL, NULL)); cl_git_fail_with(GIT_ENOTFOUND, git_remote_default_branch(&buf, g_remote)); cl_git_pass(git_clone(&cloned_repo, git_repository_path(g_repo_a), "./local-detached", NULL)); diff --git a/vendor/libgit2/tests/network/remote/local.c b/vendor/libgit2/tests/network/remote/local.c index 5d726c958..4d990ab71 100644 --- a/vendor/libgit2/tests/network/remote/local.c +++ b/vendor/libgit2/tests/network/remote/local.c @@ -40,7 +40,7 @@ static void connect_to_local_repository(const char *local_repository) git_buf_sets(&file_path_buf, cl_git_path_url(local_repository)); cl_git_pass(git_remote_create_anonymous(&remote, repo, git_buf_cstr(&file_path_buf))); - cl_git_pass(git_remote_connect(remote, GIT_DIRECTION_FETCH, NULL)); + cl_git_pass(git_remote_connect(remote, GIT_DIRECTION_FETCH, NULL, NULL)); } void test_network_remote_local__connected(void) @@ -214,7 +214,7 @@ void test_network_remote_local__push_to_bare_remote(void) /* Connect to the bare repo */ cl_git_pass(git_remote_create_anonymous(&localremote, repo, "./localbare.git")); - cl_git_pass(git_remote_connect(localremote, GIT_DIRECTION_PUSH, NULL)); + cl_git_pass(git_remote_connect(localremote, GIT_DIRECTION_PUSH, NULL, NULL)); /* Try to push */ cl_git_pass(git_remote_upload(localremote, &push_array, NULL)); @@ -253,7 +253,7 @@ void test_network_remote_local__push_to_bare_remote_with_file_url(void) /* Connect to the bare repo */ cl_git_pass(git_remote_create_anonymous(&localremote, repo, url)); - cl_git_pass(git_remote_connect(localremote, GIT_DIRECTION_PUSH, NULL)); + cl_git_pass(git_remote_connect(localremote, GIT_DIRECTION_PUSH, NULL, NULL)); /* Try to push */ cl_git_pass(git_remote_upload(localremote, &push_array, NULL)); @@ -290,7 +290,7 @@ void test_network_remote_local__push_to_non_bare_remote(void) /* Connect to the bare repo */ cl_git_pass(git_remote_create_anonymous(&localremote, repo, "./localnonbare")); - cl_git_pass(git_remote_connect(localremote, GIT_DIRECTION_PUSH, NULL)); + cl_git_pass(git_remote_connect(localremote, GIT_DIRECTION_PUSH, NULL, NULL)); /* Try to push */ cl_git_fail_with(GIT_EBAREREPO, git_remote_upload(localremote, &push_array, NULL)); diff --git a/vendor/libgit2/tests/network/remote/remotes.c b/vendor/libgit2/tests/network/remote/remotes.c index 2fa21d460..46abc6d33 100644 --- a/vendor/libgit2/tests/network/remote/remotes.c +++ b/vendor/libgit2/tests/network/remote/remotes.c @@ -93,7 +93,7 @@ void test_network_remote_remotes__error_when_no_push_available(void) cl_git_pass(git_remote_create_anonymous(&r, _repo, cl_fixture("testrepo.git"))); callbacks.transport = git_transport_local; - cl_git_pass(git_remote_connect(r, GIT_DIRECTION_PUSH, &callbacks)); + cl_git_pass(git_remote_connect(r, GIT_DIRECTION_PUSH, &callbacks, NULL)); /* Make sure that push is really not available */ r->transport->push = NULL; @@ -359,7 +359,7 @@ void test_network_remote_remotes__can_load_with_an_empty_url(void) cl_assert(remote->url == NULL); cl_assert(remote->pushurl == NULL); - cl_git_fail(git_remote_connect(remote, GIT_DIRECTION_FETCH, NULL)); + cl_git_fail(git_remote_connect(remote, GIT_DIRECTION_FETCH, NULL, NULL)); cl_assert(giterr_last() != NULL); cl_assert(giterr_last()->klass == GITERR_INVALID); @@ -376,7 +376,7 @@ void test_network_remote_remotes__can_load_with_only_an_empty_pushurl(void) cl_assert(remote->url == NULL); cl_assert(remote->pushurl == NULL); - cl_git_fail(git_remote_connect(remote, GIT_DIRECTION_FETCH, NULL)); + cl_git_fail(git_remote_connect(remote, GIT_DIRECTION_FETCH, NULL, NULL)); git_remote_free(remote); } diff --git a/vendor/libgit2/tests/object/tree/attributes.c b/vendor/libgit2/tests/object/tree/attributes.c index 413514c48..8654dfa31 100644 --- a/vendor/libgit2/tests/object/tree/attributes.c +++ b/vendor/libgit2/tests/object/tree/attributes.c @@ -82,6 +82,7 @@ void test_object_tree_attributes__normalize_attributes_when_creating_a_tree_from cl_git_pass(git_treebuilder_new(&builder, repo, tree)); entry = git_treebuilder_get(builder, "old_mode.txt"); + cl_assert(entry != NULL); cl_assert_equal_i( GIT_FILEMODE_BLOB, git_tree_entry_filemode(entry)); @@ -92,6 +93,7 @@ void test_object_tree_attributes__normalize_attributes_when_creating_a_tree_from cl_git_pass(git_tree_lookup(&tree, repo, &tid2)); entry = git_tree_entry_byname(tree, "old_mode.txt"); + cl_assert(entry != NULL); cl_assert_equal_i( GIT_FILEMODE_BLOB, git_tree_entry_filemode(entry)); diff --git a/vendor/libgit2/tests/object/tree/write.c b/vendor/libgit2/tests/object/tree/write.c index 5433e5f03..a9decf9c1 100644 --- a/vendor/libgit2/tests/object/tree/write.c +++ b/vendor/libgit2/tests/object/tree/write.c @@ -18,6 +18,8 @@ void test_object_tree_write__initialize(void) void test_object_tree_write__cleanup(void) { cl_git_sandbox_cleanup(); + + cl_git_pass(git_libgit2_opts(GIT_OPT_ENABLE_STRICT_OBJECT_CREATION, 1)); } void test_object_tree_write__from_memory(void) @@ -131,15 +133,18 @@ void test_object_tree_write__sorted_subtrees(void) { GIT_FILEMODE_TREE, "vendors"} }; - git_oid blank_oid, tree_oid; + git_oid bid, tid, tree_oid; - memset(&blank_oid, 0x0, sizeof(blank_oid)); + cl_git_pass(git_oid_fromstr(&bid, blob_oid)); + cl_git_pass(git_oid_fromstr(&tid, first_tree)); cl_git_pass(git_treebuilder_new(&builder, g_repo, NULL)); for (i = 0; i < ARRAY_SIZE(entries); ++i) { + git_oid *id = entries[i].attr == GIT_FILEMODE_TREE ? &tid : &bid; + cl_git_pass(git_treebuilder_insert(NULL, - builder, entries[i].filename, &blank_oid, entries[i].attr)); + builder, entries[i].filename, id, entries[i].attr)); } cl_git_pass(git_treebuilder_write(&tree_oid, builder)); @@ -187,10 +192,10 @@ void test_object_tree_write__removing_and_re_adding_in_treebuilder(void) { git_treebuilder *builder; int i, aardvark_i, apple_i, apple_after_i, apple_extra_i, last_i; - git_oid blank_oid, tree_oid; + git_oid entry_oid, tree_oid; git_tree *tree; - memset(&blank_oid, 0x0, sizeof(blank_oid)); + cl_git_pass(git_oid_fromstr(&entry_oid, blob_oid)); cl_git_pass(git_treebuilder_new(&builder, g_repo, NULL)); @@ -198,7 +203,7 @@ void test_object_tree_write__removing_and_re_adding_in_treebuilder(void) for (i = 0; _entries[i].filename; ++i) cl_git_pass(git_treebuilder_insert(NULL, - builder, _entries[i].filename, &blank_oid, _entries[i].attr)); + builder, _entries[i].filename, &entry_oid, _entries[i].attr)); cl_assert_equal_i(6, (int)git_treebuilder_entrycount(builder)); @@ -209,12 +214,12 @@ void test_object_tree_write__removing_and_re_adding_in_treebuilder(void) cl_assert_equal_i(4, (int)git_treebuilder_entrycount(builder)); cl_git_pass(git_treebuilder_insert( - NULL, builder, "before_last", &blank_oid, GIT_FILEMODE_BLOB)); + NULL, builder, "before_last", &entry_oid, GIT_FILEMODE_BLOB)); cl_assert_equal_i(5, (int)git_treebuilder_entrycount(builder)); /* reinsert apple_after */ cl_git_pass(git_treebuilder_insert( - NULL, builder, "apple_after", &blank_oid, GIT_FILEMODE_BLOB)); + NULL, builder, "apple_after", &entry_oid, GIT_FILEMODE_BLOB)); cl_assert_equal_i(6, (int)git_treebuilder_entrycount(builder)); cl_git_pass(git_treebuilder_remove(builder, "last")); @@ -222,11 +227,11 @@ void test_object_tree_write__removing_and_re_adding_in_treebuilder(void) /* reinsert last */ cl_git_pass(git_treebuilder_insert( - NULL, builder, "last", &blank_oid, GIT_FILEMODE_BLOB)); + NULL, builder, "last", &entry_oid, GIT_FILEMODE_BLOB)); cl_assert_equal_i(6, (int)git_treebuilder_entrycount(builder)); cl_git_pass(git_treebuilder_insert( - NULL, builder, "apple_extra", &blank_oid, GIT_FILEMODE_BLOB)); + NULL, builder, "apple_extra", &entry_oid, GIT_FILEMODE_BLOB)); cl_assert_equal_i(7, (int)git_treebuilder_entrycount(builder)); cl_git_pass(git_treebuilder_write(&tree_oid, builder)); @@ -278,16 +283,16 @@ void test_object_tree_write__filtering(void) { git_treebuilder *builder; int i; - git_oid blank_oid, tree_oid; + git_oid entry_oid, tree_oid; git_tree *tree; - memset(&blank_oid, 0x0, sizeof(blank_oid)); + git_oid_fromstr(&entry_oid, blob_oid); cl_git_pass(git_treebuilder_new(&builder, g_repo, NULL)); for (i = 0; _entries[i].filename; ++i) cl_git_pass(git_treebuilder_insert(NULL, - builder, _entries[i].filename, &blank_oid, _entries[i].attr)); + builder, _entries[i].filename, &entry_oid, _entries[i].attr)); cl_assert_equal_i(6, (int)git_treebuilder_entrycount(builder)); @@ -406,6 +411,8 @@ void test_object_tree_write__protect_filesystems(void) git_treebuilder *builder; git_oid bid; + cl_git_pass(git_oid_fromstr(&bid, "fa49b077972391ad58037050f2a75f74e3671e92")); + /* Ensure that (by default) we can write objects with funny names on * platforms that are not affected. */ @@ -440,3 +447,68 @@ void test_object_tree_write__protect_filesystems(void) git_treebuilder_free(builder); } + +static void test_invalid_objects(bool should_allow_invalid) +{ + git_treebuilder *builder; + git_oid valid_blob_id, invalid_blob_id, valid_tree_id, invalid_tree_id; + +#define assert_allowed(expr) \ + clar__assert(!(expr) == should_allow_invalid, __FILE__, __LINE__, \ + (should_allow_invalid ? \ + "Expected function call to succeed: " #expr : \ + "Expected function call to fail: " #expr), \ + NULL, 1) + + cl_git_pass(git_oid_fromstr(&valid_blob_id, blob_oid)); + cl_git_pass(git_oid_fromstr(&invalid_blob_id, + "1234567890123456789012345678901234567890")); + cl_git_pass(git_oid_fromstr(&valid_tree_id, first_tree)); + cl_git_pass(git_oid_fromstr(&invalid_tree_id, + "0000000000111111111122222222223333333333")); + + cl_git_pass(git_treebuilder_new(&builder, g_repo, NULL)); + + /* test valid blobs and trees (these should always pass) */ + cl_git_pass(git_treebuilder_insert(NULL, builder, "file.txt", &valid_blob_id, GIT_FILEMODE_BLOB)); + cl_git_pass(git_treebuilder_insert(NULL, builder, "folder", &valid_tree_id, GIT_FILEMODE_TREE)); + + /* replace valid files and folders with invalid ones */ + assert_allowed(git_treebuilder_insert(NULL, builder, "file.txt", &invalid_blob_id, GIT_FILEMODE_BLOB)); + assert_allowed(git_treebuilder_insert(NULL, builder, "folder", &invalid_blob_id, GIT_FILEMODE_BLOB)); + + /* insert new invalid files and folders */ + assert_allowed(git_treebuilder_insert(NULL, builder, "invalid_file.txt", &invalid_blob_id, GIT_FILEMODE_BLOB)); + assert_allowed(git_treebuilder_insert(NULL, builder, "invalid_folder", &invalid_blob_id, GIT_FILEMODE_BLOB)); + + /* insert valid blobs as trees and trees as blobs */ + assert_allowed(git_treebuilder_insert(NULL, builder, "file_as_folder", &valid_blob_id, GIT_FILEMODE_TREE)); + assert_allowed(git_treebuilder_insert(NULL, builder, "folder_as_file.txt", &valid_tree_id, GIT_FILEMODE_BLOB)); + +#undef assert_allowed + + git_treebuilder_free(builder); +} + +static void test_inserting_submodule(void) +{ + git_treebuilder *bld; + git_oid sm_id; + + cl_git_pass(git_treebuilder_new(&bld, g_repo, NULL)); + cl_git_pass(git_treebuilder_insert(NULL, bld, "sm", &sm_id, GIT_FILEMODE_COMMIT)); + git_treebuilder_free(bld); +} + +void test_object_tree_write__object_validity(void) +{ + /* Ensure that we cannot add invalid objects by default */ + test_invalid_objects(false); + test_inserting_submodule(); + + /* Ensure that we can turn off validation */ + cl_git_pass(git_libgit2_opts(GIT_OPT_ENABLE_STRICT_OBJECT_CREATION, 0)); + test_invalid_objects(true); + test_inserting_submodule(); +} + diff --git a/vendor/libgit2/tests/odb/alternates.c b/vendor/libgit2/tests/odb/alternates.c index c75f6feaa..b5c0e79c0 100644 --- a/vendor/libgit2/tests/odb/alternates.c +++ b/vendor/libgit2/tests/odb/alternates.c @@ -29,7 +29,7 @@ static void init_linked_repo(const char *path, const char *alternate) cl_git_pass(git_path_prettify(&destpath, alternate, NULL)); cl_git_pass(git_buf_joinpath(&destpath, destpath.ptr, "objects")); cl_git_pass(git_buf_joinpath(&filepath, git_repository_path(repo), "objects/info")); - cl_git_pass(git_futils_mkdir(filepath.ptr, NULL, 0755, GIT_MKDIR_PATH)); + cl_git_pass(git_futils_mkdir(filepath.ptr, 0755, GIT_MKDIR_PATH)); cl_git_pass(git_buf_joinpath(&filepath, filepath.ptr , "alternates")); cl_git_pass(git_filebuf_open(&file, git_buf_cstr(&filepath), 0, 0666)); diff --git a/vendor/libgit2/tests/odb/sorting.c b/vendor/libgit2/tests/odb/sorting.c index 22d057b3b..6af8b0d1b 100644 --- a/vendor/libgit2/tests/odb/sorting.c +++ b/vendor/libgit2/tests/odb/sorting.c @@ -14,6 +14,7 @@ static git_odb_backend *new_backend(size_t position) if (b == NULL) return NULL; + b->base.free = (void (*)(git_odb_backend *)) git__free; b->base.version = GIT_ODB_BACKEND_VERSION; b->position = position; return (git_odb_backend *)b; diff --git a/vendor/libgit2/tests/online/badssl.c b/vendor/libgit2/tests/online/badssl.c new file mode 100644 index 000000000..66b090df4 --- /dev/null +++ b/vendor/libgit2/tests/online/badssl.c @@ -0,0 +1,46 @@ +#include "clar_libgit2.h" + +#include "git2/clone.h" + +static git_repository *g_repo; + +#if defined(GIT_OPENSSL) || defined(GIT_WINHTTP) || defined(GIT_SECURE_TRANSPORT) +static bool g_has_ssl = true; +#else +static bool g_has_ssl = false; +#endif + +void test_online_badssl__expired(void) +{ + if (!g_has_ssl) + cl_skip(); + + cl_git_fail_with(GIT_ECERTIFICATE, + git_clone(&g_repo, "https://expired.badssl.com/fake.git", "./fake", NULL)); +} + +void test_online_badssl__wrong_host(void) +{ + if (!g_has_ssl) + cl_skip(); + + cl_git_fail_with(GIT_ECERTIFICATE, + git_clone(&g_repo, "https://wrong.host.badssl.com/fake.git", "./fake", NULL)); +} + +void test_online_badssl__self_signed(void) +{ + if (!g_has_ssl) + cl_skip(); + + cl_git_fail_with(GIT_ECERTIFICATE, + git_clone(&g_repo, "https://self-signed.badssl.com/fake.git", "./fake", NULL)); +} + +void test_online_badssl__old_cipher(void) +{ + if (!g_has_ssl) + cl_skip(); + + cl_git_fail(git_clone(&g_repo, "https://rc4.badssl.com/fake.git", "./fake", NULL)); +} diff --git a/vendor/libgit2/tests/online/clone.c b/vendor/libgit2/tests/online/clone.c index e63cf55f1..b84be405c 100644 --- a/vendor/libgit2/tests/online/clone.c +++ b/vendor/libgit2/tests/online/clone.c @@ -17,6 +17,15 @@ static git_repository *g_repo; static git_clone_options g_options; +static char *_remote_url = NULL; +static char *_remote_user = NULL; +static char *_remote_pass = NULL; +static char *_remote_ssh_pubkey = NULL; +static char *_remote_ssh_privkey = NULL; +static char *_remote_ssh_passphrase = NULL; +static char *_remote_ssh_fingerprint = NULL; + + void test_online_clone__initialize(void) { git_checkout_options dummy_opts = GIT_CHECKOUT_OPTIONS_INIT; @@ -29,6 +38,14 @@ void test_online_clone__initialize(void) g_options.checkout_opts = dummy_opts; g_options.checkout_opts.checkout_strategy = GIT_CHECKOUT_SAFE; g_options.fetch_opts = dummy_fetch; + + _remote_url = cl_getenv("GITTEST_REMOTE_URL"); + _remote_user = cl_getenv("GITTEST_REMOTE_USER"); + _remote_pass = cl_getenv("GITTEST_REMOTE_PASS"); + _remote_ssh_pubkey = cl_getenv("GITTEST_REMOTE_SSH_PUBKEY"); + _remote_ssh_privkey = cl_getenv("GITTEST_REMOTE_SSH_KEY"); + _remote_ssh_passphrase = cl_getenv("GITTEST_REMOTE_SSH_PASSPHRASE"); + _remote_ssh_fingerprint = cl_getenv("GITTEST_REMOTE_SSH_FINGERPRINT"); } void test_online_clone__cleanup(void) @@ -38,6 +55,14 @@ void test_online_clone__cleanup(void) g_repo = NULL; } cl_fixture_cleanup("./foo"); + + git__free(_remote_url); + git__free(_remote_user); + git__free(_remote_pass); + git__free(_remote_ssh_pubkey); + git__free(_remote_ssh_privkey); + git__free(_remote_ssh_passphrase); + git__free(_remote_ssh_fingerprint); } void test_online_clone__network_full(void) @@ -188,6 +213,33 @@ void test_online_clone__custom_remote_callbacks(void) cl_assert(callcount > 0); } +void test_online_clone__custom_headers(void) +{ + char *empty_header = ""; + char *unnamed_header = "this is a header about nothing"; + char *newlines = "X-Custom: almost OK\n"; + char *conflict = "Accept: defined-by-git"; + char *ok = "X-Custom: this should be ok"; + + g_options.fetch_opts.custom_headers.count = 1; + + g_options.fetch_opts.custom_headers.strings = &empty_header; + cl_git_fail(git_clone(&g_repo, LIVE_REPO_URL, "./foo", &g_options)); + + g_options.fetch_opts.custom_headers.strings = &unnamed_header; + cl_git_fail(git_clone(&g_repo, LIVE_REPO_URL, "./foo", &g_options)); + + g_options.fetch_opts.custom_headers.strings = &newlines; + cl_git_fail(git_clone(&g_repo, LIVE_REPO_URL, "./foo", &g_options)); + + g_options.fetch_opts.custom_headers.strings = &conflict; + cl_git_fail(git_clone(&g_repo, LIVE_REPO_URL, "./foo", &g_options)); + + /* Finally, we got it right! */ + g_options.fetch_opts.custom_headers.strings = &ok; + cl_git_pass(git_clone(&g_repo, LIVE_REPO_URL, "./foo", &g_options)); +} + static int cred_failure_cb( git_cred **cred, const char *url, @@ -202,15 +254,12 @@ static int cred_failure_cb( void test_online_clone__cred_callback_failure_return_code_is_tunnelled(void) { - const char *remote_url = cl_getenv("GITTEST_REMOTE_URL"); - const char *remote_user = cl_getenv("GITTEST_REMOTE_USER"); - - if (!remote_url || !remote_user) + if (!_remote_url || !_remote_user) clar__skip(); g_options.fetch_opts.callbacks.credentials = cred_failure_cb; - cl_git_fail_with(-172, git_clone(&g_repo, remote_url, "./foo", &g_options)); + cl_git_fail_with(-172, git_clone(&g_repo, _remote_url, "./foo", &g_options)); } static int cred_count_calls_cb(git_cred **cred, const char *url, const char *user, @@ -233,17 +282,15 @@ static int cred_count_calls_cb(git_cred **cred, const char *url, const char *use void test_online_clone__cred_callback_called_again_on_auth_failure(void) { - const char *remote_url = cl_getenv("GITTEST_REMOTE_URL"); - const char *remote_user = cl_getenv("GITTEST_REMOTE_USER"); size_t counter = 0; - if (!remote_url || !remote_user) + if (!_remote_url || !_remote_user) clar__skip(); g_options.fetch_opts.callbacks.credentials = cred_count_calls_cb; g_options.fetch_opts.callbacks.payload = &counter; - cl_git_fail_with(GIT_EUSER, git_clone(&g_repo, remote_url, "./foo", &g_options)); + cl_git_fail_with(GIT_EUSER, git_clone(&g_repo, _remote_url, "./foo", &g_options)); cl_assert_equal_i(3, counter); } @@ -269,22 +316,22 @@ void test_online_clone__credentials(void) /* Remote URL environment variable must be set. * User and password are optional. */ - const char *remote_url = cl_getenv("GITTEST_REMOTE_URL"); git_cred_userpass_payload user_pass = { - cl_getenv("GITTEST_REMOTE_USER"), - cl_getenv("GITTEST_REMOTE_PASS") + _remote_user, + _remote_pass }; - if (!remote_url) return; + if (!_remote_url) + clar__skip(); - if (cl_getenv("GITTEST_REMOTE_DEFAULT")) { + if (cl_is_env_set("GITTEST_REMOTE_DEFAULT")) { g_options.fetch_opts.callbacks.credentials = cred_default; } else { g_options.fetch_opts.callbacks.credentials = git_cred_userpass; g_options.fetch_opts.callbacks.payload = &user_pass; } - cl_git_pass(git_clone(&g_repo, remote_url, "./foo", &g_options)); + cl_git_pass(git_clone(&g_repo, _remote_url, "./foo", &g_options)); git_repository_free(g_repo); g_repo = NULL; cl_fixture_cleanup("./foo"); } @@ -335,18 +382,15 @@ void test_online_clone__can_cancel(void) static int cred_cb(git_cred **cred, const char *url, const char *user_from_url, unsigned int allowed_types, void *payload) { - const char *remote_user = cl_getenv("GITTEST_REMOTE_USER"); - const char *pubkey = cl_getenv("GITTEST_REMOTE_SSH_PUBKEY"); - const char *privkey = cl_getenv("GITTEST_REMOTE_SSH_KEY"); - const char *passphrase = cl_getenv("GITTEST_REMOTE_SSH_PASSPHRASE"); - GIT_UNUSED(url); GIT_UNUSED(user_from_url); GIT_UNUSED(payload); if (allowed_types & GIT_CREDTYPE_USERNAME) - return git_cred_username_new(cred, remote_user); + return git_cred_username_new(cred, _remote_user); if (allowed_types & GIT_CREDTYPE_SSH_KEY) - return git_cred_ssh_key_new(cred, remote_user, pubkey, privkey, passphrase); + return git_cred_ssh_key_new(cred, + _remote_user, _remote_ssh_pubkey, + _remote_ssh_privkey, _remote_ssh_passphrase); giterr_set(GITERR_NET, "unexpected cred type"); return -1; @@ -417,13 +461,10 @@ void test_online_clone__ssh_with_paths(void) 2, }; - const char *remote_url = cl_getenv("GITTEST_REMOTE_URL"); - const char *remote_user = cl_getenv("GITTEST_REMOTE_USER"); - #ifndef GIT_SSH clar__skip(); #endif - if (!remote_url || !remote_user || strncmp(remote_url, "ssh://", 5) != 0) + if (!_remote_url || !_remote_user || strncmp(_remote_url, "ssh://", 5) != 0) clar__skip(); g_options.remote_cb = custom_remote_ssh_with_paths; @@ -431,10 +472,10 @@ void test_online_clone__ssh_with_paths(void) g_options.fetch_opts.callbacks.credentials = cred_cb; g_options.fetch_opts.callbacks.payload = &arr; - cl_git_fail(git_clone(&g_repo, remote_url, "./foo", &g_options)); + cl_git_fail(git_clone(&g_repo, _remote_url, "./foo", &g_options)); arr.strings = good_paths; - cl_git_pass(git_clone(&g_repo, remote_url, "./foo", &g_options)); + cl_git_pass(git_clone(&g_repo, _remote_url, "./foo", &g_options)); } static int cred_foo_bar(git_cred **cred, const char *url, const char *username_from_url, @@ -460,15 +501,13 @@ int ssh_certificate_check(git_cert *cert, int valid, const char *host, void *pay { git_cert_hostkey *key; git_oid expected = {{0}}, actual = {{0}}; - const char *expected_str; GIT_UNUSED(valid); GIT_UNUSED(payload); - expected_str = cl_getenv("GITTEST_REMOTE_SSH_FINGERPRINT"); - cl_assert(expected_str); + cl_assert(_remote_ssh_fingerprint); - cl_git_pass(git_oid_fromstrp(&expected, expected_str)); + cl_git_pass(git_oid_fromstrp(&expected, _remote_ssh_fingerprint)); cl_assert_equal_i(GIT_CERT_HOSTKEY_LIBSSH2, cert->cert_type); key = (git_cert_hostkey *) cert; @@ -477,9 +516,9 @@ int ssh_certificate_check(git_cert *cert, int valid, const char *host, void *pay * the type. Here we abuse the fact that both hashes fit into * our git_oid type. */ - if (strlen(expected_str) == 32 && key->type & GIT_CERT_SSH_MD5) { + if (strlen(_remote_ssh_fingerprint) == 32 && key->type & GIT_CERT_SSH_MD5) { memcpy(&actual.id, key->hash_md5, 16); - } else if (strlen(expected_str) == 40 && key->type & GIT_CERT_SSH_SHA1) { + } else if (strlen(_remote_ssh_fingerprint) == 40 && key->type & GIT_CERT_SSH_SHA1) { memcpy(&actual, key->hash_sha1, 20); } else { cl_fail("Cannot find a usable SSH hash"); @@ -496,7 +535,7 @@ void test_online_clone__ssh_cert(void) { g_options.fetch_opts.callbacks.certificate_check = ssh_certificate_check; - if (!cl_getenv("GITTEST_REMOTE_SSH_FINGERPRINT")) + if (!_remote_ssh_fingerprint) cl_skip(); cl_git_fail_with(GIT_EUSER, git_clone(&g_repo, "ssh://localhost/foo", "./foo", &g_options)); @@ -525,22 +564,17 @@ static char *read_key_file(const char *path) static int ssh_memory_cred_cb(git_cred **cred, const char *url, const char *user_from_url, unsigned int allowed_types, void *payload) { - const char *remote_user = cl_getenv("GITTEST_REMOTE_USER"); - const char *pubkey_path = cl_getenv("GITTEST_REMOTE_SSH_PUBKEY"); - const char *privkey_path = cl_getenv("GITTEST_REMOTE_SSH_KEY"); - const char *passphrase = cl_getenv("GITTEST_REMOTE_SSH_PASSPHRASE"); - GIT_UNUSED(url); GIT_UNUSED(user_from_url); GIT_UNUSED(payload); if (allowed_types & GIT_CREDTYPE_USERNAME) - return git_cred_username_new(cred, remote_user); + return git_cred_username_new(cred, _remote_user); if (allowed_types & GIT_CREDTYPE_SSH_KEY) { - char *pubkey = read_key_file(pubkey_path); - char *privkey = read_key_file(privkey_path); + char *pubkey = read_key_file(_remote_ssh_pubkey); + char *privkey = read_key_file(_remote_ssh_privkey); - int ret = git_cred_ssh_key_memory_new(cred, remote_user, pubkey, privkey, passphrase); + int ret = git_cred_ssh_key_memory_new(cred, _remote_user, pubkey, privkey, _remote_ssh_passphrase); if (privkey) free(privkey); @@ -555,19 +589,15 @@ static int ssh_memory_cred_cb(git_cred **cred, const char *url, const char *user void test_online_clone__ssh_memory_auth(void) { - const char *remote_url = cl_getenv("GITTEST_REMOTE_URL"); - const char *remote_user = cl_getenv("GITTEST_REMOTE_USER"); - const char *privkey = cl_getenv("GITTEST_REMOTE_SSH_KEY"); - #ifndef GIT_SSH_MEMORY_CREDENTIALS clar__skip(); #endif - if (!remote_url || !remote_user || !privkey || strncmp(remote_url, "ssh://", 5) != 0) + if (!_remote_url || !_remote_user || !_remote_ssh_privkey || strncmp(_remote_url, "ssh://", 5) != 0) clar__skip(); g_options.fetch_opts.callbacks.credentials = ssh_memory_cred_cb; - cl_git_pass(git_clone(&g_repo, remote_url, "./foo", &g_options)); + cl_git_pass(git_clone(&g_repo, _remote_url, "./foo", &g_options)); } void test_online_clone__url_with_no_path_returns_EINVALIDSPEC(void) diff --git a/vendor/libgit2/tests/online/fetch.c b/vendor/libgit2/tests/online/fetch.c index 72e7c24e3..c12df069f 100644 --- a/vendor/libgit2/tests/online/fetch.c +++ b/vendor/libgit2/tests/online/fetch.c @@ -81,11 +81,11 @@ void test_online_fetch__fetch_twice(void) { git_remote *remote; cl_git_pass(git_remote_create(&remote, _repo, "test", "git://github.com/libgit2/TestGitRepository.git")); - cl_git_pass(git_remote_connect(remote, GIT_DIRECTION_FETCH, NULL)); + cl_git_pass(git_remote_connect(remote, GIT_DIRECTION_FETCH, NULL, NULL)); cl_git_pass(git_remote_download(remote, NULL, NULL)); git_remote_disconnect(remote); - git_remote_connect(remote, GIT_DIRECTION_FETCH, NULL); + git_remote_connect(remote, GIT_DIRECTION_FETCH, NULL, NULL); cl_git_pass(git_remote_download(remote, NULL, NULL)); git_remote_disconnect(remote); @@ -117,7 +117,7 @@ void test_online_fetch__doesnt_retrieve_a_pack_when_the_repository_is_up_to_date cl_git_pass(git_repository_open(&_repository, "./fetch/lg2")); cl_git_pass(git_remote_lookup(&remote, _repository, "origin")); - cl_git_pass(git_remote_connect(remote, GIT_DIRECTION_FETCH, NULL)); + cl_git_pass(git_remote_connect(remote, GIT_DIRECTION_FETCH, NULL, NULL)); cl_assert_equal_i(false, invoked); @@ -155,7 +155,7 @@ void test_online_fetch__can_cancel(void) options.callbacks.transfer_progress = cancel_at_half; options.callbacks.payload = &bytes_received; - cl_git_pass(git_remote_connect(remote, GIT_DIRECTION_FETCH, NULL)); + cl_git_pass(git_remote_connect(remote, GIT_DIRECTION_FETCH, NULL, NULL)); cl_git_fail_with(git_remote_download(remote, NULL, &options), -4321); git_remote_disconnect(remote); git_remote_free(remote); @@ -169,7 +169,7 @@ void test_online_fetch__ls_disconnected(void) cl_git_pass(git_remote_create(&remote, _repo, "test", "http://github.com/libgit2/TestGitRepository.git")); - cl_git_pass(git_remote_connect(remote, GIT_DIRECTION_FETCH, NULL)); + cl_git_pass(git_remote_connect(remote, GIT_DIRECTION_FETCH, NULL, NULL)); cl_git_pass(git_remote_ls(&refs, &refs_len_before, remote)); git_remote_disconnect(remote); cl_git_pass(git_remote_ls(&refs, &refs_len_after, remote)); @@ -187,7 +187,7 @@ void test_online_fetch__remote_symrefs(void) cl_git_pass(git_remote_create(&remote, _repo, "test", "http://github.com/libgit2/TestGitRepository.git")); - cl_git_pass(git_remote_connect(remote, GIT_DIRECTION_FETCH, NULL)); + cl_git_pass(git_remote_connect(remote, GIT_DIRECTION_FETCH, NULL, NULL)); git_remote_disconnect(remote); cl_git_pass(git_remote_ls(&refs, &refs_len, remote)); diff --git a/vendor/libgit2/tests/online/push.c b/vendor/libgit2/tests/online/push.c index 6cd444320..77c437622 100644 --- a/vendor/libgit2/tests/online/push.c +++ b/vendor/libgit2/tests/online/push.c @@ -9,16 +9,16 @@ static git_repository *_repo; -static char *_remote_url; +static char *_remote_url = NULL; -static char *_remote_ssh_key; -static char *_remote_ssh_pubkey; -static char *_remote_ssh_passphrase; +static char *_remote_user = NULL; +static char *_remote_pass = NULL; -static char *_remote_user; -static char *_remote_pass; +static char *_remote_ssh_key = NULL; +static char *_remote_ssh_pubkey = NULL; +static char *_remote_ssh_passphrase = NULL; -static char *_remote_default; +static char *_remote_default = NULL; static int cred_acquire_cb(git_cred **, const char *, const char *, unsigned int, void *); @@ -91,7 +91,6 @@ static int cred_acquire_cb( /** * git_push_status_foreach callback that records status entries. - * @param data (git_vector *) of push_status instances */ static int record_push_status_cb(const char *ref, const char *msg, void *payload) { @@ -299,7 +298,7 @@ static void verify_update_tips_callback(git_remote *remote, expected_ref expecte goto failed; } - if (git_oid_cmp(expected_refs[i].oid, tip->new_oid) != 0) { + if (git_oid_cmp(expected_refs[i].oid, &tip->new_oid) != 0) { git_buf_printf(&msg, "Updated tip ID does not match expected ID"); failed = 1; goto failed; @@ -355,6 +354,7 @@ void test_online_push__initialize(void) git_oid_fromstr(&_tag_tag, "eea4f2705eeec2db3813f2430829afce99cd00b5"); /* Remote URL environment variable must be set. User and password are optional. */ + _remote_url = cl_getenv("GITTEST_REMOTE_URL"); _remote_user = cl_getenv("GITTEST_REMOTE_USER"); _remote_pass = cl_getenv("GITTEST_REMOTE_PASS"); @@ -372,7 +372,7 @@ void test_online_push__initialize(void) record_callbacks_data_clear(&_record_cbs_data); - cl_git_pass(git_remote_connect(_remote, GIT_DIRECTION_PUSH, &_record_cbs)); + cl_git_pass(git_remote_connect(_remote, GIT_DIRECTION_PUSH, &_record_cbs, NULL)); /* Clean up previously pushed branches. Fails if receive.denyDeletes is * set on the remote. Also, on Git 1.7.0 and newer, you must run @@ -406,6 +406,14 @@ void test_online_push__cleanup(void) git_remote_free(_remote); _remote = NULL; + git__free(_remote_url); + git__free(_remote_user); + git__free(_remote_pass); + git__free(_remote_ssh_key); + git__free(_remote_ssh_pubkey); + git__free(_remote_ssh_passphrase); + git__free(_remote_default); + /* Freed by cl_git_sandbox_cleanup */ _repo = NULL; diff --git a/vendor/libgit2/tests/online/push_util.c b/vendor/libgit2/tests/online/push_util.c index cd483c7c0..eafec2f05 100644 --- a/vendor/libgit2/tests/online/push_util.c +++ b/vendor/libgit2/tests/online/push_util.c @@ -9,8 +9,6 @@ const git_oid OID_ZERO = {{ 0 }}; void updated_tip_free(updated_tip *t) { git__free(t->name); - git__free(t->old_oid); - git__free(t->new_oid); git__free(t); } @@ -46,14 +44,11 @@ int record_update_tips_cb(const char *refname, const git_oid *a, const git_oid * updated_tip *t; record_callbacks_data *record_data = (record_callbacks_data *)data; - cl_assert(t = git__malloc(sizeof(*t))); + cl_assert(t = git__calloc(1, sizeof(*t))); cl_assert(t->name = git__strdup(refname)); - cl_assert(t->old_oid = git__malloc(sizeof(*t->old_oid))); - git_oid_cpy(t->old_oid, a); - - cl_assert(t->new_oid = git__malloc(sizeof(*t->new_oid))); - git_oid_cpy(t->new_oid, b); + git_oid_cpy(&t->old_oid, a); + git_oid_cpy(&t->new_oid, b); git_vector_insert(&record_data->updated_tips, t); diff --git a/vendor/libgit2/tests/online/push_util.h b/vendor/libgit2/tests/online/push_util.h index 822341bd2..570873cfe 100644 --- a/vendor/libgit2/tests/online/push_util.h +++ b/vendor/libgit2/tests/online/push_util.h @@ -16,8 +16,8 @@ extern const git_oid OID_ZERO; typedef struct { char *name; - git_oid *old_oid; - git_oid *new_oid; + git_oid old_oid; + git_oid new_oid; } updated_tip; typedef struct { diff --git a/vendor/libgit2/tests/path/core.c b/vendor/libgit2/tests/path/core.c index 064f1492a..3dccfe5fb 100644 --- a/vendor/libgit2/tests/path/core.c +++ b/vendor/libgit2/tests/path/core.c @@ -105,12 +105,12 @@ void test_path_core__isvalid_dot_git(void) cl_assert_equal_b(true, git_path_isvalid(NULL, "foo/.GIT/bar", 0)); cl_assert_equal_b(true, git_path_isvalid(NULL, "foo/bar/.Git", 0)); - cl_assert_equal_b(false, git_path_isvalid(NULL, ".git", GIT_PATH_REJECT_DOT_GIT)); - cl_assert_equal_b(false, git_path_isvalid(NULL, ".git/foo", GIT_PATH_REJECT_DOT_GIT)); - cl_assert_equal_b(false, git_path_isvalid(NULL, "foo/.git", GIT_PATH_REJECT_DOT_GIT)); - cl_assert_equal_b(false, git_path_isvalid(NULL, "foo/.git/bar", GIT_PATH_REJECT_DOT_GIT)); - cl_assert_equal_b(false, git_path_isvalid(NULL, "foo/.GIT/bar", GIT_PATH_REJECT_DOT_GIT)); - cl_assert_equal_b(false, git_path_isvalid(NULL, "foo/bar/.Git", GIT_PATH_REJECT_DOT_GIT)); + cl_assert_equal_b(false, git_path_isvalid(NULL, ".git", GIT_PATH_REJECT_DOT_GIT_LITERAL)); + cl_assert_equal_b(false, git_path_isvalid(NULL, ".git/foo", GIT_PATH_REJECT_DOT_GIT_LITERAL)); + cl_assert_equal_b(false, git_path_isvalid(NULL, "foo/.git", GIT_PATH_REJECT_DOT_GIT_LITERAL)); + cl_assert_equal_b(false, git_path_isvalid(NULL, "foo/.git/bar", GIT_PATH_REJECT_DOT_GIT_LITERAL)); + cl_assert_equal_b(false, git_path_isvalid(NULL, "foo/.GIT/bar", GIT_PATH_REJECT_DOT_GIT_LITERAL)); + cl_assert_equal_b(false, git_path_isvalid(NULL, "foo/bar/.Git", GIT_PATH_REJECT_DOT_GIT_LITERAL)); cl_assert_equal_b(true, git_path_isvalid(NULL, "!git", 0)); cl_assert_equal_b(true, git_path_isvalid(NULL, "foo/!git", 0)); diff --git a/vendor/libgit2/tests/rebase/inmemory.c b/vendor/libgit2/tests/rebase/inmemory.c new file mode 100644 index 000000000..d5d89c719 --- /dev/null +++ b/vendor/libgit2/tests/rebase/inmemory.c @@ -0,0 +1,116 @@ +#include "clar_libgit2.h" +#include "git2/rebase.h" +#include "posix.h" + +#include + +static git_repository *repo; + +// Fixture setup and teardown +void test_rebase_inmemory__initialize(void) +{ + repo = cl_git_sandbox_init("rebase"); +} + +void test_rebase_inmemory__cleanup(void) +{ + cl_git_sandbox_cleanup(); +} + +void test_rebase_inmemory__not_in_rebase_state(void) +{ + git_rebase *rebase; + git_reference *branch_ref, *upstream_ref; + git_annotated_commit *branch_head, *upstream_head; + git_rebase_options opts = GIT_REBASE_OPTIONS_INIT; + + opts.inmemory = true; + + cl_git_pass(git_reference_lookup(&branch_ref, repo, "refs/heads/beef")); + cl_git_pass(git_reference_lookup(&upstream_ref, repo, "refs/heads/master")); + + cl_git_pass(git_annotated_commit_from_ref(&branch_head, repo, branch_ref)); + cl_git_pass(git_annotated_commit_from_ref(&upstream_head, repo, upstream_ref)); + + cl_git_pass(git_rebase_init(&rebase, repo, branch_head, upstream_head, NULL, &opts)); + + cl_assert_equal_i(GIT_REPOSITORY_STATE_NONE, git_repository_state(repo)); + + git_rebase_free(rebase); + + git_annotated_commit_free(branch_head); + git_annotated_commit_free(upstream_head); + + git_reference_free(branch_ref); + git_reference_free(upstream_ref); +} + +void test_rebase_inmemory__can_resolve_conflicts(void) +{ + git_rebase *rebase; + git_reference *branch_ref, *upstream_ref; + git_annotated_commit *branch_head, *upstream_head; + git_rebase_operation *rebase_operation; + git_status_list *status_list; + git_oid pick_id, commit_id, expected_commit_id; + git_signature *signature; + git_index *rebase_index, *repo_index; + git_index_entry resolution = {{0}}; + git_rebase_options opts = GIT_REBASE_OPTIONS_INIT; + + cl_git_pass(git_signature_new(&signature, + "Rebaser", "rebaser@rebaser.rb", 1405694510, 0)); + + opts.inmemory = true; + + cl_git_pass(git_reference_lookup(&branch_ref, repo, "refs/heads/asparagus")); + cl_git_pass(git_reference_lookup(&upstream_ref, repo, "refs/heads/master")); + + cl_git_pass(git_annotated_commit_from_ref(&branch_head, repo, branch_ref)); + cl_git_pass(git_annotated_commit_from_ref(&upstream_head, repo, upstream_ref)); + + cl_git_pass(git_rebase_init(&rebase, repo, branch_head, upstream_head, NULL, &opts)); + + cl_git_pass(git_rebase_next(&rebase_operation, rebase)); + + git_oid_fromstr(&pick_id, "33f915f9e4dbd9f4b24430e48731a59b45b15500"); + + cl_assert_equal_i(GIT_REBASE_OPERATION_PICK, rebase_operation->type); + cl_assert_equal_oid(&pick_id, &rebase_operation->id); + + /* ensure that we did not do anything stupid to the workdir or repo index */ + cl_git_pass(git_repository_index(&repo_index, repo)); + cl_assert(!git_index_has_conflicts(repo_index)); + + cl_git_pass(git_status_list_new(&status_list, repo, NULL)); + cl_assert_equal_i(0, git_status_list_entrycount(status_list)); + + /* but that the index returned from rebase does have conflicts */ + cl_git_pass(git_rebase_inmemory_index(&rebase_index, rebase)); + cl_assert(git_index_has_conflicts(rebase_index)); + + cl_git_fail_with(GIT_EUNMERGED, git_rebase_commit(&commit_id, rebase, NULL, signature, NULL, NULL)); + + /* ensure that we can work with the in-memory index to resolve the conflict */ + resolution.path = "asparagus.txt"; + resolution.mode = GIT_FILEMODE_BLOB; + git_oid_fromstr(&resolution.id, "414dfc71ead79c07acd4ea47fecf91f289afc4b9"); + cl_git_pass(git_index_conflict_remove(rebase_index, "asparagus.txt")); + cl_git_pass(git_index_add(rebase_index, &resolution)); + + /* and finally create a commit for the resolved rebase operation */ + cl_git_pass(git_rebase_commit(&commit_id, rebase, NULL, signature, NULL, NULL)); + + cl_git_pass(git_oid_fromstr(&expected_commit_id, "db7af47222181e548810da2ab5fec0e9357c5637")); + cl_assert_equal_oid(&commit_id, &expected_commit_id); + + git_signature_free(signature); + git_status_list_free(status_list); + git_annotated_commit_free(branch_head); + git_annotated_commit_free(upstream_head); + git_reference_free(branch_ref); + git_reference_free(upstream_ref); + git_index_free(repo_index); + git_index_free(rebase_index); + git_rebase_free(rebase); +} diff --git a/vendor/libgit2/tests/rebase/iterator.c b/vendor/libgit2/tests/rebase/iterator.c index acf2a92db..db57b0a83 100644 --- a/vendor/libgit2/tests/rebase/iterator.c +++ b/vendor/libgit2/tests/rebase/iterator.c @@ -13,7 +13,8 @@ void test_rebase_iterator__initialize(void) { repo = cl_git_sandbox_init("rebase"); cl_git_pass(git_repository_index(&_index, repo)); - cl_git_pass(git_signature_now(&signature, "Rebaser", "rebaser@rebaser.rb")); + cl_git_pass(git_signature_new(&signature, "Rebaser", + "rebaser@rebaser.rb", 1405694510, 0)); } void test_rebase_iterator__cleanup(void) @@ -46,54 +47,77 @@ static void test_operations(git_rebase *rebase, size_t expected_current) } } -void test_rebase_iterator__iterates(void) +void test_iterator(bool inmemory) { git_rebase *rebase; + git_rebase_options opts = GIT_REBASE_OPTIONS_INIT; git_reference *branch_ref, *upstream_ref; git_annotated_commit *branch_head, *upstream_head; git_rebase_operation *rebase_operation; - git_oid commit_id; + git_oid commit_id, expected_id; int error; + opts.inmemory = inmemory; + cl_git_pass(git_reference_lookup(&branch_ref, repo, "refs/heads/beef")); cl_git_pass(git_reference_lookup(&upstream_ref, repo, "refs/heads/master")); cl_git_pass(git_annotated_commit_from_ref(&branch_head, repo, branch_ref)); cl_git_pass(git_annotated_commit_from_ref(&upstream_head, repo, upstream_ref)); - cl_git_pass(git_rebase_init(&rebase, repo, branch_head, upstream_head, NULL, NULL)); + cl_git_pass(git_rebase_init(&rebase, repo, branch_head, upstream_head, NULL, &opts)); test_operations(rebase, GIT_REBASE_NO_OPERATION); - git_rebase_free(rebase); - cl_git_pass(git_rebase_open(&rebase, repo, NULL)); + if (!inmemory) { + git_rebase_free(rebase); + cl_git_pass(git_rebase_open(&rebase, repo, NULL)); + } + cl_git_pass(git_rebase_next(&rebase_operation, rebase)); cl_git_pass(git_rebase_commit(&commit_id, rebase, NULL, signature, NULL, NULL)); test_operations(rebase, 0); + git_oid_fromstr(&expected_id, "776e4c48922799f903f03f5f6e51da8b01e4cce0"); + cl_assert_equal_oid(&expected_id, &commit_id); + cl_git_pass(git_rebase_next(&rebase_operation, rebase)); cl_git_pass(git_rebase_commit(&commit_id, rebase, NULL, signature, NULL, NULL)); test_operations(rebase, 1); + git_oid_fromstr(&expected_id, "ba1f9b4fd5cf8151f7818be2111cc0869f1eb95a"); + cl_assert_equal_oid(&expected_id, &commit_id); + cl_git_pass(git_rebase_next(&rebase_operation, rebase)); cl_git_pass(git_rebase_commit(&commit_id, rebase, NULL, signature, NULL, NULL)); test_operations(rebase, 2); - git_rebase_free(rebase); - cl_git_pass(git_rebase_open(&rebase, repo, NULL)); + git_oid_fromstr(&expected_id, "948b12fe18b84f756223a61bece4c307787cd5d4"); + cl_assert_equal_oid(&expected_id, &commit_id); + + if (!inmemory) { + git_rebase_free(rebase); + cl_git_pass(git_rebase_open(&rebase, repo, NULL)); + } cl_git_pass(git_rebase_next(&rebase_operation, rebase)); cl_git_pass(git_rebase_commit(&commit_id, rebase, NULL, signature, NULL, NULL)); test_operations(rebase, 3); + git_oid_fromstr(&expected_id, "d9d5d59d72c9968687f9462578d79878cd80e781"); + cl_assert_equal_oid(&expected_id, &commit_id); + cl_git_pass(git_rebase_next(&rebase_operation, rebase)); cl_git_pass(git_rebase_commit(&commit_id, rebase, NULL, signature, NULL, NULL)); test_operations(rebase, 4); + git_oid_fromstr(&expected_id, "9cf383c0a125d89e742c5dec58ed277dd07588b3"); + cl_assert_equal_oid(&expected_id, &commit_id); + cl_git_fail(error = git_rebase_next(&rebase_operation, rebase)); cl_assert_equal_i(GIT_ITEROVER, error); test_operations(rebase, 4); @@ -104,3 +128,13 @@ void test_rebase_iterator__iterates(void) git_reference_free(upstream_ref); git_rebase_free(rebase); } + +void test_rebase_iterator__iterates(void) +{ + test_iterator(false); +} + +void test_rebase_iterator__iterates_inmemory(void) +{ + test_iterator(true); +} diff --git a/vendor/libgit2/tests/rebase/merge.c b/vendor/libgit2/tests/rebase/merge.c index 33eadb7ed..c60113b64 100644 --- a/vendor/libgit2/tests/rebase/merge.c +++ b/vendor/libgit2/tests/rebase/merge.c @@ -565,3 +565,33 @@ void test_rebase_merge__custom_checkout_options(void) git_reference_free(upstream_ref); git_rebase_free(rebase); } + +void test_rebase_merge__custom_merge_options(void) +{ + git_rebase *rebase; + git_reference *branch_ref, *upstream_ref; + git_annotated_commit *branch_head, *upstream_head; + git_rebase_options rebase_options = GIT_REBASE_OPTIONS_INIT; + git_rebase_operation *rebase_operation; + + rebase_options.merge_options.flags |= + GIT_MERGE_FAIL_ON_CONFLICT | + GIT_MERGE_SKIP_REUC; + + cl_git_pass(git_reference_lookup(&branch_ref, repo, "refs/heads/asparagus")); + cl_git_pass(git_reference_lookup(&upstream_ref, repo, "refs/heads/master")); + + cl_git_pass(git_annotated_commit_from_ref(&branch_head, repo, branch_ref)); + cl_git_pass(git_annotated_commit_from_ref(&upstream_head, repo, upstream_ref)); + + cl_git_pass(git_rebase_init(&rebase, repo, branch_head, upstream_head, NULL, &rebase_options)); + + cl_git_fail_with(GIT_EMERGECONFLICT, git_rebase_next(&rebase_operation, rebase)); + + git_annotated_commit_free(branch_head); + git_annotated_commit_free(upstream_head); + git_reference_free(branch_ref); + git_reference_free(upstream_ref); + git_rebase_free(rebase); +} + diff --git a/vendor/libgit2/tests/refs/branches/delete.c b/vendor/libgit2/tests/refs/branches/delete.c index 343ff0f50..8807db231 100644 --- a/vendor/libgit2/tests/refs/branches/delete.c +++ b/vendor/libgit2/tests/refs/branches/delete.c @@ -132,6 +132,8 @@ void test_refs_branches_delete__removes_reflog(void) cl_git_pass(git_branch_delete(branch)); git_reference_free(branch); + cl_assert_equal_i(false, git_reference_has_log(repo, "refs/heads/track-local")); + /* Reading a nonexistant reflog creates it, but it should be empty */ cl_git_pass(git_reflog_read(&log, repo, "refs/heads/track-local")); cl_assert_equal_i(0, git_reflog_entrycount(log)); diff --git a/vendor/libgit2/tests/refs/create.c b/vendor/libgit2/tests/refs/create.c index 192551dbd..6d5a5f1f6 100644 --- a/vendor/libgit2/tests/refs/create.c +++ b/vendor/libgit2/tests/refs/create.c @@ -18,6 +18,8 @@ void test_refs_create__initialize(void) void test_refs_create__cleanup(void) { cl_git_sandbox_cleanup(); + + cl_git_pass(git_libgit2_opts(GIT_OPT_ENABLE_STRICT_OBJECT_CREATION, 1)); } void test_refs_create__symbolic(void) @@ -119,9 +121,30 @@ void test_refs_create__oid(void) git_reference_free(looked_up_ref); } -void test_refs_create__oid_unknown(void) +/* Can by default create a reference that targets at an unknown id */ +void test_refs_create__oid_unknown_succeeds_without_strict(void) +{ + git_reference *new_reference, *looked_up_ref; + git_oid id; + + const char *new_head = "refs/heads/new-head"; + + git_oid_fromstr(&id, "deadbeef3f795b2b4353bcce3a527ad0a4f7f644"); + + cl_git_pass(git_libgit2_opts(GIT_OPT_ENABLE_STRICT_OBJECT_CREATION, 0)); + + /* Create and write the new object id reference */ + cl_git_pass(git_reference_create(&new_reference, g_repo, new_head, &id, 0, NULL)); + git_reference_free(new_reference); + + /* Ensure the reference can't be looked-up... */ + cl_git_pass(git_reference_lookup(&looked_up_ref, g_repo, new_head)); + git_reference_free(looked_up_ref); +} + +/* Strict object enforcement enforces valid object id */ +void test_refs_create__oid_unknown_fails_by_default(void) { - // Can not create a new OID reference which targets at an unknown id git_reference *new_reference, *looked_up_ref; git_oid id; @@ -151,6 +174,23 @@ void test_refs_create__propagate_eexists(void) cl_assert(error == GIT_EEXISTS); } +void test_refs_create__existing_dir_propagates_edirectory(void) +{ + git_reference *new_reference, *fail_reference; + git_oid id; + const char *dir_head = "refs/heads/new-dir/new-head", + *fail_head = "refs/heads/new-dir"; + + git_oid_fromstr(&id, current_master_tip); + + /* Create and write the new object id reference */ + cl_git_pass(git_reference_create(&new_reference, g_repo, dir_head, &id, 1, NULL)); + cl_git_fail_with(GIT_EDIRECTORY, + git_reference_create(&fail_reference, g_repo, fail_head, &id, false, NULL)); + + git_reference_free(new_reference); +} + static void test_invalid_name(const char *name) { git_reference *new_reference; diff --git a/vendor/libgit2/tests/refs/lookup.c b/vendor/libgit2/tests/refs/lookup.c index d076e491f..456d0d2a8 100644 --- a/vendor/libgit2/tests/refs/lookup.c +++ b/vendor/libgit2/tests/refs/lookup.c @@ -58,3 +58,11 @@ void test_refs_lookup__namespace(void) error = git_reference_lookup(&ref, g_repo, "refs/heads/"); cl_assert_equal_i(error, GIT_EINVALIDSPEC); } + +void test_refs_lookup__dwim_notfound(void) +{ + git_reference *ref; + + cl_git_fail_with(GIT_ENOTFOUND, git_reference_dwim(&ref, g_repo, "idontexist")); + cl_assert_equal_s("no reference found for shorthand 'idontexist'", giterr_last()->message); +} diff --git a/vendor/libgit2/tests/refs/pack.c b/vendor/libgit2/tests/refs/pack.c index 7dfaf6d8f..bda86f69a 100644 --- a/vendor/libgit2/tests/refs/pack.c +++ b/vendor/libgit2/tests/refs/pack.c @@ -36,7 +36,7 @@ void test_refs_pack__empty(void) git_buf temp_path = GIT_BUF_INIT; cl_git_pass(git_buf_join_n(&temp_path, '/', 3, git_repository_path(g_repo), GIT_REFS_HEADS_DIR, "empty_dir")); - cl_git_pass(git_futils_mkdir_r(temp_path.ptr, NULL, GIT_REFS_DIR_MODE)); + cl_git_pass(git_futils_mkdir_r(temp_path.ptr, GIT_REFS_DIR_MODE)); git_buf_free(&temp_path); packall(); diff --git a/vendor/libgit2/tests/refs/reflog/reflog.c b/vendor/libgit2/tests/refs/reflog/reflog.c index 3fbf412e4..fdb15502c 100644 --- a/vendor/libgit2/tests/refs/reflog/reflog.c +++ b/vendor/libgit2/tests/refs/reflog/reflog.c @@ -125,6 +125,77 @@ void test_refs_reflog_reflog__renaming_the_reference_moves_the_reflog(void) git_buf_free(&master_log_path); } +void test_refs_reflog_reflog__deleting_the_reference_deletes_the_reflog(void) +{ + git_reference *master; + git_buf master_log_path = GIT_BUF_INIT; + + git_buf_joinpath(&master_log_path, git_repository_path(g_repo), GIT_REFLOG_DIR); + git_buf_joinpath(&master_log_path, git_buf_cstr(&master_log_path), "refs/heads/master"); + + cl_assert_equal_i(true, git_path_isfile(git_buf_cstr(&master_log_path))); + + cl_git_pass(git_reference_lookup(&master, g_repo, "refs/heads/master")); + cl_git_pass(git_reference_delete(master)); + git_reference_free(master); + + cl_assert_equal_i(false, git_path_isfile(git_buf_cstr(&master_log_path))); + git_buf_free(&master_log_path); +} + +void test_refs_reflog_reflog__removes_empty_reflog_dir(void) +{ + git_reference *ref; + git_buf log_path = GIT_BUF_INIT; + git_oid id; + + /* Create a new branch pointing at the HEAD */ + git_oid_fromstr(&id, current_master_tip); + cl_git_pass(git_reference_create(&ref, g_repo, "refs/heads/new-dir/new-head", &id, 0, NULL)); + + git_buf_joinpath(&log_path, git_repository_path(g_repo), GIT_REFLOG_DIR); + git_buf_joinpath(&log_path, git_buf_cstr(&log_path), "refs/heads/new-dir/new-head"); + + cl_assert_equal_i(true, git_path_isfile(git_buf_cstr(&log_path))); + + cl_git_pass(git_reference_delete(ref)); + git_reference_free(ref); + + /* new ref creation should succeed since new-dir is empty */ + git_oid_fromstr(&id, current_master_tip); + cl_git_pass(git_reference_create(&ref, g_repo, "refs/heads/new-dir", &id, 0, NULL)); + git_reference_free(ref); + + git_buf_free(&log_path); +} + +void test_refs_reflog_reflog__fails_gracefully_on_nonempty_reflog_dir(void) +{ + git_reference *ref; + git_buf log_path = GIT_BUF_INIT; + git_oid id; + + /* Create a new branch pointing at the HEAD */ + git_oid_fromstr(&id, current_master_tip); + cl_git_pass(git_reference_create(&ref, g_repo, "refs/heads/new-dir/new-head", &id, 0, NULL)); + git_reference_free(ref); + + git_buf_joinpath(&log_path, git_repository_path(g_repo), GIT_REFLOG_DIR); + git_buf_joinpath(&log_path, git_buf_cstr(&log_path), "refs/heads/new-dir/new-head"); + + cl_assert_equal_i(true, git_path_isfile(git_buf_cstr(&log_path))); + + /* delete the ref manually, leave the reflog */ + cl_must_pass(p_unlink("testrepo.git/refs/heads/new-dir/new-head")); + + /* new ref creation should fail since new-dir contains reflogs still */ + git_oid_fromstr(&id, current_master_tip); + cl_git_fail_with(GIT_EDIRECTORY, git_reference_create(&ref, g_repo, "refs/heads/new-dir", &id, 0, NULL)); + git_reference_free(ref); + + git_buf_free(&log_path); +} + static void assert_has_reflog(bool expected_result, const char *name) { cl_assert_equal_i(expected_result, git_reference_has_log(g_repo, name)); diff --git a/vendor/libgit2/tests/repo/discover.c b/vendor/libgit2/tests/repo/discover.c index 7904b6496..86bd7458f 100644 --- a/vendor/libgit2/tests/repo/discover.c +++ b/vendor/libgit2/tests/repo/discover.c @@ -77,7 +77,7 @@ void test_repo_discover__0(void) const char *ceiling_dirs; const mode_t mode = 0777; - git_futils_mkdir_r(DISCOVER_FOLDER, NULL, mode); + git_futils_mkdir_r(DISCOVER_FOLDER, mode); append_ceiling_dir(&ceiling_dirs_buf, TEMP_REPO_FOLDER); ceiling_dirs = git_buf_cstr(&ceiling_dirs_buf); @@ -88,15 +88,15 @@ void test_repo_discover__0(void) git_repository_free(repo); cl_git_pass(git_repository_init(&repo, SUB_REPOSITORY_FOLDER, 0)); - cl_git_pass(git_futils_mkdir_r(SUB_REPOSITORY_FOLDER_SUB_SUB_SUB, NULL, mode)); + cl_git_pass(git_futils_mkdir_r(SUB_REPOSITORY_FOLDER_SUB_SUB_SUB, mode)); cl_git_pass(git_repository_discover(&sub_repository_path, SUB_REPOSITORY_FOLDER, 0, ceiling_dirs)); - cl_git_pass(git_futils_mkdir_r(SUB_REPOSITORY_FOLDER_SUB_SUB_SUB, NULL, mode)); + cl_git_pass(git_futils_mkdir_r(SUB_REPOSITORY_FOLDER_SUB_SUB_SUB, mode)); ensure_repository_discover(SUB_REPOSITORY_FOLDER_SUB, ceiling_dirs, &sub_repository_path); ensure_repository_discover(SUB_REPOSITORY_FOLDER_SUB_SUB, ceiling_dirs, &sub_repository_path); ensure_repository_discover(SUB_REPOSITORY_FOLDER_SUB_SUB_SUB, ceiling_dirs, &sub_repository_path); - cl_git_pass(git_futils_mkdir_r(REPOSITORY_ALTERNATE_FOLDER_SUB_SUB_SUB, NULL, mode)); + cl_git_pass(git_futils_mkdir_r(REPOSITORY_ALTERNATE_FOLDER_SUB_SUB_SUB, mode)); write_file(REPOSITORY_ALTERNATE_FOLDER "/" DOT_GIT, "gitdir: ../" SUB_REPOSITORY_FOLDER_NAME "/" DOT_GIT); write_file(REPOSITORY_ALTERNATE_FOLDER_SUB_SUB "/" DOT_GIT, "gitdir: ../../../" SUB_REPOSITORY_FOLDER_NAME "/" DOT_GIT); write_file(REPOSITORY_ALTERNATE_FOLDER_SUB_SUB_SUB "/" DOT_GIT, "gitdir: ../../../../"); @@ -105,13 +105,13 @@ void test_repo_discover__0(void) ensure_repository_discover(REPOSITORY_ALTERNATE_FOLDER_SUB_SUB, ceiling_dirs, &sub_repository_path); ensure_repository_discover(REPOSITORY_ALTERNATE_FOLDER_SUB_SUB_SUB, ceiling_dirs, &repository_path); - cl_git_pass(git_futils_mkdir_r(ALTERNATE_MALFORMED_FOLDER1, NULL, mode)); + cl_git_pass(git_futils_mkdir_r(ALTERNATE_MALFORMED_FOLDER1, mode)); write_file(ALTERNATE_MALFORMED_FOLDER1 "/" DOT_GIT, "Anything but not gitdir:"); - cl_git_pass(git_futils_mkdir_r(ALTERNATE_MALFORMED_FOLDER2, NULL, mode)); + cl_git_pass(git_futils_mkdir_r(ALTERNATE_MALFORMED_FOLDER2, mode)); write_file(ALTERNATE_MALFORMED_FOLDER2 "/" DOT_GIT, "gitdir:"); - cl_git_pass(git_futils_mkdir_r(ALTERNATE_MALFORMED_FOLDER3, NULL, mode)); + cl_git_pass(git_futils_mkdir_r(ALTERNATE_MALFORMED_FOLDER3, mode)); write_file(ALTERNATE_MALFORMED_FOLDER3 "/" DOT_GIT, "gitdir: \n\n\n"); - cl_git_pass(git_futils_mkdir_r(ALTERNATE_NOT_FOUND_FOLDER, NULL, mode)); + cl_git_pass(git_futils_mkdir_r(ALTERNATE_NOT_FOUND_FOLDER, mode)); write_file(ALTERNATE_NOT_FOUND_FOLDER "/" DOT_GIT, "gitdir: a_repository_that_surely_does_not_exist"); cl_git_fail(git_repository_discover(&found_path, ALTERNATE_MALFORMED_FOLDER1, 0, ceiling_dirs)); cl_git_fail(git_repository_discover(&found_path, ALTERNATE_MALFORMED_FOLDER2, 0, ceiling_dirs)); diff --git a/vendor/libgit2/tests/repo/init.c b/vendor/libgit2/tests/repo/init.c index 525020f5a..04d4a5c5e 100644 --- a/vendor/libgit2/tests/repo/init.c +++ b/vendor/libgit2/tests/repo/init.c @@ -11,6 +11,8 @@ enum repo_mode { }; static git_repository *_repo = NULL; +static git_buf _global_path = GIT_BUF_INIT; +static git_buf _tmp_path = GIT_BUF_INIT; static mode_t g_umask = 0; void test_repo_init__initialize(void) @@ -22,6 +24,20 @@ void test_repo_init__initialize(void) g_umask = p_umask(022); (void)p_umask(g_umask); } + + git_libgit2_opts(GIT_OPT_GET_SEARCH_PATH, GIT_CONFIG_LEVEL_GLOBAL, + &_global_path); +} + +void test_repo_init__cleanup(void) +{ + git_libgit2_opts(GIT_OPT_SET_SEARCH_PATH, GIT_CONFIG_LEVEL_GLOBAL, + _global_path.ptr); + git_buf_free(&_global_path); + + if (_tmp_path.size > 0 && git_path_isdir(_tmp_path.ptr)) + git_futils_rmdir_r(_tmp_path.ptr, NULL, GIT_RMDIR_REMOVE_FILES); + git_buf_free(&_tmp_path); } static void cleanup_repository(void *path) @@ -99,7 +115,7 @@ void test_repo_init__bare_repo_escaping_current_workdir(void) cl_git_pass(git_path_prettify_dir(&path_current_workdir, ".", NULL)); cl_git_pass(git_buf_joinpath(&path_repository, git_buf_cstr(&path_current_workdir), "a/b/c")); - cl_git_pass(git_futils_mkdir_r(git_buf_cstr(&path_repository), NULL, GIT_DIR_MODE)); + cl_git_pass(git_futils_mkdir_r(git_buf_cstr(&path_repository), GIT_DIR_MODE)); /* Change the current working directory */ cl_git_pass(chdir(git_buf_cstr(&path_repository))); @@ -312,7 +328,7 @@ void test_repo_init__extended_0(void) cl_git_fail(git_repository_init_ext(&_repo, "extended", &opts)); /* make the directory first, then it should succeed */ - cl_git_pass(git_futils_mkdir("extended", NULL, 0775, 0)); + cl_git_pass(git_futils_mkdir("extended", 0775, 0)); cl_git_pass(git_repository_init_ext(&_repo, "extended", &opts)); cl_assert(!git__suffixcmp(git_repository_workdir(_repo), "/extended/")); @@ -503,7 +519,8 @@ static void assert_mode_seems_okay( static const char *template_sandbox(const char *name) { - git_buf hooks_path = GIT_BUF_INIT, link_path = GIT_BUF_INIT; + git_buf hooks_path = GIT_BUF_INIT, link_path = GIT_BUF_INIT, + dotfile_path = GIT_BUF_INIT; const char *path = cl_fixture(name); cl_fixture_sandbox(name); @@ -521,19 +538,84 @@ static const char *template_sandbox(const char *name) cl_must_pass(symlink("update.sample", link_path.ptr)); #endif + /* create a file starting with a dot */ + cl_git_pass(git_buf_joinpath(&dotfile_path, hooks_path.ptr, ".dotfile")); + cl_git_mkfile(dotfile_path.ptr, "something\n"); + git_buf_free(&dotfile_path); + + git_buf_free(&dotfile_path); git_buf_free(&link_path); git_buf_free(&hooks_path); return path; } -void test_repo_init__extended_with_template(void) +static void configure_templatedir(const char *template_path) +{ + git_buf config_path = GIT_BUF_INIT; + git_buf config_data = GIT_BUF_INIT; + + cl_git_pass(git_libgit2_opts(GIT_OPT_GET_SEARCH_PATH, + GIT_CONFIG_LEVEL_GLOBAL, &_tmp_path)); + cl_git_pass(git_buf_puts(&_tmp_path, ".tmp")); + cl_git_pass(git_libgit2_opts(GIT_OPT_SET_SEARCH_PATH, + GIT_CONFIG_LEVEL_GLOBAL, _tmp_path.ptr)); + + cl_must_pass(p_mkdir(_tmp_path.ptr, 0777)); + + cl_git_pass(git_buf_joinpath(&config_path, _tmp_path.ptr, ".gitconfig")); + + cl_git_pass(git_buf_printf(&config_data, + "[init]\n\ttemplatedir = \"%s\"\n", template_path)); + + cl_git_mkfile(config_path.ptr, config_data.ptr); + + git_buf_free(&config_path); + git_buf_free(&config_data); +} + +static void validate_templates(git_repository *repo, const char *template_path) { + git_buf template_description = GIT_BUF_INIT; + git_buf repo_description = GIT_BUF_INIT; git_buf expected = GIT_BUF_INIT; git_buf actual = GIT_BUF_INIT; - git_repository_init_options opts = GIT_REPOSITORY_INIT_OPTIONS_INIT; int filemode; + cl_git_pass(git_buf_joinpath(&template_description, template_path, + "description")); + cl_git_pass(git_buf_joinpath(&repo_description, git_repository_path(repo), + "description")); + + cl_git_pass(git_futils_readbuffer(&expected, template_description.ptr)); + cl_git_pass(git_futils_readbuffer(&actual, repo_description.ptr)); + + cl_assert_equal_s(expected.ptr, actual.ptr); + + filemode = cl_repo_get_bool(repo, "core.filemode"); + + assert_hooks_match( + template_path, git_repository_path(repo), + "hooks/update.sample", filemode); + + assert_hooks_match( + template_path, git_repository_path(repo), + "hooks/link.sample", filemode); + + assert_hooks_match( + template_path, git_repository_path(repo), + "hooks/.dotfile", filemode); + + git_buf_free(&expected); + git_buf_free(&actual); + git_buf_free(&repo_description); + git_buf_free(&template_description); +} + +void test_repo_init__external_templates_specified_in_options(void) +{ + git_repository_init_options opts = GIT_REPOSITORY_INIT_OPTIONS_INIT; + cl_set_cleanup(&cleanup_repository, "templated.git"); template_sandbox("template"); @@ -547,32 +629,64 @@ void test_repo_init__extended_with_template(void) cl_assert(!git__suffixcmp(git_repository_path(_repo), "/templated.git/")); - cl_git_pass(git_futils_readbuffer(&expected, "template/description")); - cl_git_pass(git_futils_readbuffer( - &actual, "templated.git/description")); + validate_templates(_repo, "template"); + cl_fixture_cleanup("template"); +} - cl_assert_equal_s(expected.ptr, actual.ptr); +void test_repo_init__external_templates_specified_in_config(void) +{ + git_buf template_path = GIT_BUF_INIT; - git_buf_free(&expected); - git_buf_free(&actual); + git_repository_init_options opts = GIT_REPOSITORY_INIT_OPTIONS_INIT; - filemode = cl_repo_get_bool(_repo, "core.filemode"); + cl_set_cleanup(&cleanup_repository, "templated.git"); + template_sandbox("template"); - assert_hooks_match( - "template", git_repository_path(_repo), - "hooks/update.sample", filemode); + cl_git_pass(git_buf_joinpath(&template_path, clar_sandbox_path(), + "template")); - assert_hooks_match( - "template", git_repository_path(_repo), - "hooks/link.sample", filemode); + configure_templatedir(template_path.ptr); + + opts.flags = GIT_REPOSITORY_INIT_MKPATH | GIT_REPOSITORY_INIT_BARE | + GIT_REPOSITORY_INIT_EXTERNAL_TEMPLATE; + + cl_git_pass(git_repository_init_ext(&_repo, "templated.git", &opts)); + validate_templates(_repo, "template"); cl_fixture_cleanup("template"); + + git_buf_free(&template_path); +} + +void test_repo_init__external_templates_with_leading_dot(void) +{ + git_buf template_path = GIT_BUF_INIT; + + git_repository_init_options opts = GIT_REPOSITORY_INIT_OPTIONS_INIT; + + cl_set_cleanup(&cleanup_repository, "templated.git"); + template_sandbox("template"); + + cl_must_pass(p_rename("template", ".template_with_leading_dot")); + + cl_git_pass(git_buf_joinpath(&template_path, clar_sandbox_path(), + ".template_with_leading_dot")); + + configure_templatedir(template_path.ptr); + + opts.flags = GIT_REPOSITORY_INIT_MKPATH | GIT_REPOSITORY_INIT_BARE | + GIT_REPOSITORY_INIT_EXTERNAL_TEMPLATE; + + cl_git_pass(git_repository_init_ext(&_repo, "templated.git", &opts)); + + validate_templates(_repo, ".template_with_leading_dot"); + cl_fixture_cleanup(".template_with_leading_dot"); + + git_buf_free(&template_path); } void test_repo_init__extended_with_template_and_shared_mode(void) { - git_buf expected = GIT_BUF_INIT; - git_buf actual = GIT_BUF_INIT; git_repository_init_options opts = GIT_REPOSITORY_INIT_OPTIONS_INIT; int filemode = true; const char *repo_path = NULL; @@ -592,16 +706,6 @@ void test_repo_init__extended_with_template_and_shared_mode(void) filemode = cl_repo_get_bool(_repo, "core.filemode"); - cl_git_pass(git_futils_readbuffer( - &expected, "template/description")); - cl_git_pass(git_futils_readbuffer( - &actual, "init_shared_from_tpl/.git/description")); - - cl_assert_equal_s(expected.ptr, actual.ptr); - - git_buf_free(&expected); - git_buf_free(&actual); - repo_path = git_repository_path(_repo); assert_mode_seems_okay(repo_path, "hooks", GIT_FILEMODE_TREE | GIT_REPOSITORY_INIT_SHARED_GROUP, true, filemode); @@ -610,17 +714,7 @@ void test_repo_init__extended_with_template_and_shared_mode(void) assert_mode_seems_okay(repo_path, "description", GIT_FILEMODE_BLOB, false, filemode); - /* for a non-symlinked hook, it should have shared permissions now */ - assert_hooks_match( - "template", git_repository_path(_repo), - "hooks/update.sample", filemode); - - /* for a symlinked hook, the permissions still should match the - * source link, not the GIT_REPOSITORY_INIT_SHARED_GROUP value - */ - assert_hooks_match( - "template", git_repository_path(_repo), - "hooks/link.sample", filemode); + validate_templates(_repo, "template"); cl_fixture_cleanup("template"); } @@ -631,7 +725,7 @@ void test_repo_init__can_reinit_an_initialized_repository(void) cl_set_cleanup(&cleanup_repository, "extended"); - cl_git_pass(git_futils_mkdir("extended", NULL, 0775, 0)); + cl_git_pass(git_futils_mkdir("extended", 0775, 0)); cl_git_pass(git_repository_init(&_repo, "extended", false)); cl_git_pass(git_repository_init(&reinit, "extended", false)); @@ -713,7 +807,7 @@ void test_repo_init__at_filesystem_root(void) git_buf root = GIT_BUF_INIT; int root_len; - if (!cl_getenv("GITTEST_INVASIVE_FS_STRUCTURE")) + if (!cl_is_env_set("GITTEST_INVASIVE_FS_STRUCTURE")) cl_skip(); root_len = git_path_root(sandbox); diff --git a/vendor/libgit2/tests/repo/iterator.c b/vendor/libgit2/tests/repo/iterator.c index bb2d3a186..6b5795b9c 100644 --- a/vendor/libgit2/tests/repo/iterator.c +++ b/vendor/libgit2/tests/repo/iterator.c @@ -126,6 +126,7 @@ static void expect_iterator_items( void test_repo_iterator__index(void) { git_iterator *i; + git_iterator_options i_opts = GIT_ITERATOR_OPTIONS_INIT; git_index *index; g_repo = cl_git_sandbox_init("icase"); @@ -133,19 +134,19 @@ void test_repo_iterator__index(void) cl_git_pass(git_repository_index(&index, g_repo)); /* autoexpand with no tree entries for index */ - cl_git_pass(git_iterator_for_index(&i, index, 0, NULL, NULL)); + cl_git_pass(git_iterator_for_index(&i, g_repo, index, NULL)); expect_iterator_items(i, 20, NULL, 20, NULL); git_iterator_free(i); /* auto expand with tree entries */ - cl_git_pass(git_iterator_for_index( - &i, index, GIT_ITERATOR_INCLUDE_TREES, NULL, NULL)); + i_opts.flags = GIT_ITERATOR_INCLUDE_TREES; + cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts)); expect_iterator_items(i, 22, NULL, 22, NULL); git_iterator_free(i); /* no auto expand (implies trees included) */ - cl_git_pass(git_iterator_for_index( - &i, index, GIT_ITERATOR_DONT_AUTOEXPAND, NULL, NULL)); + i_opts.flags = GIT_ITERATOR_DONT_AUTOEXPAND; + cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts)); expect_iterator_items(i, 12, NULL, 22, NULL); git_iterator_free(i); @@ -155,6 +156,7 @@ void test_repo_iterator__index(void) void test_repo_iterator__index_icase(void) { git_iterator *i; + git_iterator_options i_opts = GIT_ITERATOR_OPTIONS_INIT; git_index *index; int caps; @@ -167,32 +169,45 @@ void test_repo_iterator__index_icase(void) cl_git_pass(git_index_set_caps(index, caps & ~GIT_INDEXCAP_IGNORE_CASE)); /* autoexpand with no tree entries over range */ - cl_git_pass(git_iterator_for_index(&i, index, 0, "c", "k/D")); + i_opts.start = "c"; + i_opts.end = "k/D"; + cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts)); expect_iterator_items(i, 7, NULL, 7, NULL); git_iterator_free(i); - cl_git_pass(git_iterator_for_index(&i, index, 0, "k", "k/Z")); + i_opts.start = "k"; + i_opts.end = "k/Z"; + cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts)); expect_iterator_items(i, 3, NULL, 3, NULL); git_iterator_free(i); /* auto expand with tree entries */ - cl_git_pass(git_iterator_for_index( - &i, index, GIT_ITERATOR_INCLUDE_TREES, "c", "k/D")); + i_opts.flags = GIT_ITERATOR_INCLUDE_TREES; + + i_opts.start = "c"; + i_opts.end = "k/D"; + cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts)); expect_iterator_items(i, 8, NULL, 8, NULL); git_iterator_free(i); - cl_git_pass(git_iterator_for_index( - &i, index, GIT_ITERATOR_INCLUDE_TREES, "k", "k/Z")); + + i_opts.start = "k"; + i_opts.end = "k/Z"; + cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts)); expect_iterator_items(i, 4, NULL, 4, NULL); git_iterator_free(i); /* no auto expand (implies trees included) */ - cl_git_pass(git_iterator_for_index( - &i, index, GIT_ITERATOR_DONT_AUTOEXPAND, "c", "k/D")); + i_opts.flags = GIT_ITERATOR_DONT_AUTOEXPAND; + + i_opts.start = "c"; + i_opts.end = "k/D"; + cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts)); expect_iterator_items(i, 5, NULL, 8, NULL); git_iterator_free(i); - cl_git_pass(git_iterator_for_index( - &i, index, GIT_ITERATOR_DONT_AUTOEXPAND, "k", "k/Z")); + i_opts.start = "k"; + i_opts.end = "k/Z"; + cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts)); expect_iterator_items(i, 1, NULL, 4, NULL); git_iterator_free(i); @@ -200,33 +215,47 @@ void test_repo_iterator__index_icase(void) cl_git_pass(git_index_set_caps(index, caps | GIT_INDEXCAP_IGNORE_CASE)); /* autoexpand with no tree entries over range */ - cl_git_pass(git_iterator_for_index(&i, index, 0, "c", "k/D")); + i_opts.flags = 0; + + i_opts.start = "c"; + i_opts.end = "k/D"; + cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts)); expect_iterator_items(i, 13, NULL, 13, NULL); git_iterator_free(i); - cl_git_pass(git_iterator_for_index(&i, index, 0, "k", "k/Z")); + i_opts.start = "k"; + i_opts.end = "k/Z"; + cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts)); expect_iterator_items(i, 5, NULL, 5, NULL); git_iterator_free(i); /* auto expand with tree entries */ - cl_git_pass(git_iterator_for_index( - &i, index, GIT_ITERATOR_INCLUDE_TREES, "c", "k/D")); + i_opts.flags = GIT_ITERATOR_INCLUDE_TREES; + + i_opts.start = "c"; + i_opts.end = "k/D"; + cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts)); expect_iterator_items(i, 14, NULL, 14, NULL); git_iterator_free(i); - cl_git_pass(git_iterator_for_index( - &i, index, GIT_ITERATOR_INCLUDE_TREES, "k", "k/Z")); + i_opts.start = "k"; + i_opts.end = "k/Z"; + cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts)); expect_iterator_items(i, 6, NULL, 6, NULL); git_iterator_free(i); /* no auto expand (implies trees included) */ - cl_git_pass(git_iterator_for_index( - &i, index, GIT_ITERATOR_DONT_AUTOEXPAND, "c", "k/D")); + i_opts.flags = GIT_ITERATOR_DONT_AUTOEXPAND; + + i_opts.start = "c"; + i_opts.end = "k/D"; + cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts)); expect_iterator_items(i, 9, NULL, 14, NULL); git_iterator_free(i); - cl_git_pass(git_iterator_for_index( - &i, index, GIT_ITERATOR_DONT_AUTOEXPAND, "k", "k/Z")); + i_opts.start = "k"; + i_opts.end = "k/Z"; + cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts)); expect_iterator_items(i, 1, NULL, 6, NULL); git_iterator_free(i); @@ -237,6 +266,7 @@ void test_repo_iterator__index_icase(void) void test_repo_iterator__tree(void) { git_iterator *i; + git_iterator_options i_opts = GIT_ITERATOR_OPTIONS_INIT; git_tree *head; g_repo = cl_git_sandbox_init("icase"); @@ -244,19 +274,21 @@ void test_repo_iterator__tree(void) cl_git_pass(git_repository_head_tree(&head, g_repo)); /* auto expand with no tree entries */ - cl_git_pass(git_iterator_for_tree(&i, head, 0, NULL, NULL)); + cl_git_pass(git_iterator_for_tree(&i, head, NULL)); expect_iterator_items(i, 20, NULL, 20, NULL); git_iterator_free(i); /* auto expand with tree entries */ - cl_git_pass(git_iterator_for_tree( - &i, head, GIT_ITERATOR_INCLUDE_TREES, NULL, NULL)); + i_opts.flags = GIT_ITERATOR_INCLUDE_TREES; + + cl_git_pass(git_iterator_for_tree(&i, head, &i_opts)); expect_iterator_items(i, 22, NULL, 22, NULL); git_iterator_free(i); /* no auto expand (implies trees included) */ - cl_git_pass(git_iterator_for_tree( - &i, head, GIT_ITERATOR_DONT_AUTOEXPAND, NULL, NULL)); + i_opts.flags = GIT_ITERATOR_DONT_AUTOEXPAND; + + cl_git_pass(git_iterator_for_tree(&i, head, &i_opts)); expect_iterator_items(i, 12, NULL, 22, NULL); git_iterator_free(i); @@ -267,75 +299,98 @@ void test_repo_iterator__tree_icase(void) { git_iterator *i; git_tree *head; - git_iterator_flag_t flag; + git_iterator_options i_opts = GIT_ITERATOR_OPTIONS_INIT; g_repo = cl_git_sandbox_init("icase"); cl_git_pass(git_repository_head_tree(&head, g_repo)); - flag = GIT_ITERATOR_DONT_IGNORE_CASE; + i_opts.flags = GIT_ITERATOR_DONT_IGNORE_CASE; /* auto expand with no tree entries */ - cl_git_pass(git_iterator_for_tree(&i, head, flag, "c", "k/D")); + i_opts.start = "c"; + i_opts.end = "k/D"; + cl_git_pass(git_iterator_for_tree(&i, head, &i_opts)); expect_iterator_items(i, 7, NULL, 7, NULL); git_iterator_free(i); - cl_git_pass(git_iterator_for_tree(&i, head, flag, "k", "k/Z")); + i_opts.start = "k"; + i_opts.end = "k/Z"; + cl_git_pass(git_iterator_for_tree(&i, head, &i_opts)); expect_iterator_items(i, 3, NULL, 3, NULL); git_iterator_free(i); + i_opts.flags = GIT_ITERATOR_DONT_IGNORE_CASE | GIT_ITERATOR_INCLUDE_TREES; + /* auto expand with tree entries */ - cl_git_pass(git_iterator_for_tree( - &i, head, flag | GIT_ITERATOR_INCLUDE_TREES, "c", "k/D")); + i_opts.start = "c"; + i_opts.end = "k/Z"; + cl_git_pass(git_iterator_for_tree(&i, head, &i_opts)); expect_iterator_items(i, 8, NULL, 8, NULL); git_iterator_free(i); - cl_git_pass(git_iterator_for_tree( - &i, head, flag | GIT_ITERATOR_INCLUDE_TREES, "k", "k/Z")); + i_opts.start = "k"; + i_opts.end = "k/Z"; + cl_git_pass(git_iterator_for_tree(&i, head, &i_opts)); expect_iterator_items(i, 4, NULL, 4, NULL); git_iterator_free(i); /* no auto expand (implies trees included) */ - cl_git_pass(git_iterator_for_tree( - &i, head, flag | GIT_ITERATOR_DONT_AUTOEXPAND, "c", "k/D")); + i_opts.flags = GIT_ITERATOR_DONT_IGNORE_CASE | GIT_ITERATOR_DONT_AUTOEXPAND; + i_opts.start = "c"; + i_opts.end = "k/D"; + cl_git_pass(git_iterator_for_tree(&i, head, &i_opts)); expect_iterator_items(i, 5, NULL, 8, NULL); git_iterator_free(i); - cl_git_pass(git_iterator_for_tree( - &i, head, flag | GIT_ITERATOR_DONT_AUTOEXPAND, "k", "k/Z")); + i_opts.start = "k"; + i_opts.end = "k/D"; + cl_git_pass(git_iterator_for_tree(&i, head, &i_opts)); expect_iterator_items(i, 1, NULL, 4, NULL); git_iterator_free(i); - flag = GIT_ITERATOR_IGNORE_CASE; - /* auto expand with no tree entries */ - cl_git_pass(git_iterator_for_tree(&i, head, flag, "c", "k/D")); + i_opts.flags = GIT_ITERATOR_IGNORE_CASE; + + i_opts.start = "c"; + i_opts.end = "k/D"; + cl_git_pass(git_iterator_for_tree(&i, head, &i_opts)); expect_iterator_items(i, 13, NULL, 13, NULL); git_iterator_free(i); - cl_git_pass(git_iterator_for_tree(&i, head, flag, "k", "k/Z")); + i_opts.start = "k"; + i_opts.end = "k/Z"; + cl_git_pass(git_iterator_for_tree(&i, head, &i_opts)); expect_iterator_items(i, 5, NULL, 5, NULL); git_iterator_free(i); /* auto expand with tree entries */ - cl_git_pass(git_iterator_for_tree( - &i, head, flag | GIT_ITERATOR_INCLUDE_TREES, "c", "k/D")); + i_opts.flags = GIT_ITERATOR_IGNORE_CASE | GIT_ITERATOR_INCLUDE_TREES; + + i_opts.start = "c"; + i_opts.end = "k/D"; + cl_git_pass(git_iterator_for_tree(&i, head, &i_opts)); expect_iterator_items(i, 14, NULL, 14, NULL); git_iterator_free(i); - cl_git_pass(git_iterator_for_tree( - &i, head, flag | GIT_ITERATOR_INCLUDE_TREES, "k", "k/Z")); + i_opts.start = "k"; + i_opts.end = "k/Z"; + cl_git_pass(git_iterator_for_tree(&i, head, &i_opts)); expect_iterator_items(i, 6, NULL, 6, NULL); git_iterator_free(i); /* no auto expand (implies trees included) */ - cl_git_pass(git_iterator_for_tree( - &i, head, flag | GIT_ITERATOR_DONT_AUTOEXPAND, "c", "k/D")); + i_opts.flags = GIT_ITERATOR_IGNORE_CASE | GIT_ITERATOR_DONT_AUTOEXPAND; + + i_opts.start = "c"; + i_opts.end = "k/D"; + cl_git_pass(git_iterator_for_tree(&i, head, &i_opts)); expect_iterator_items(i, 9, NULL, 14, NULL); git_iterator_free(i); - cl_git_pass(git_iterator_for_tree( - &i, head, flag | GIT_ITERATOR_DONT_AUTOEXPAND, "k", "k/Z")); + i_opts.start = "k"; + i_opts.end = "k/Z"; + cl_git_pass(git_iterator_for_tree(&i, head, &i_opts)); expect_iterator_items(i, 1, NULL, 6, NULL); git_iterator_free(i); @@ -345,6 +400,7 @@ void test_repo_iterator__tree_icase(void) void test_repo_iterator__tree_more(void) { git_iterator *i; + git_iterator_options i_opts = GIT_ITERATOR_OPTIONS_INIT; git_tree *head; static const char *expect_basic[] = { "current_file", @@ -396,19 +452,21 @@ void test_repo_iterator__tree_more(void) cl_git_pass(git_repository_head_tree(&head, g_repo)); /* auto expand with no tree entries */ - cl_git_pass(git_iterator_for_tree(&i, head, 0, NULL, NULL)); + cl_git_pass(git_iterator_for_tree(&i, head, NULL)); expect_iterator_items(i, 12, expect_basic, 12, expect_basic); git_iterator_free(i); /* auto expand with tree entries */ - cl_git_pass(git_iterator_for_tree( - &i, head, GIT_ITERATOR_INCLUDE_TREES, NULL, NULL)); + i_opts.flags = GIT_ITERATOR_INCLUDE_TREES; + + cl_git_pass(git_iterator_for_tree(&i, head, &i_opts)); expect_iterator_items(i, 13, expect_trees, 13, expect_trees); git_iterator_free(i); /* no auto expand (implies trees included) */ - cl_git_pass(git_iterator_for_tree( - &i, head, GIT_ITERATOR_DONT_AUTOEXPAND, NULL, NULL)); + i_opts.flags = GIT_ITERATOR_DONT_AUTOEXPAND; + + cl_git_pass(git_iterator_for_tree(&i, head, &i_opts)); expect_iterator_items(i, 10, expect_noauto, 13, expect_trees); git_iterator_free(i); @@ -463,6 +521,8 @@ void test_repo_iterator__tree_case_conflicts_0(void) git_tree *tree; git_oid blob_id, biga_id, littlea_id, tree_id; git_iterator *i; + git_iterator_options i_opts = GIT_ITERATOR_OPTIONS_INIT; + const char *expect_cs[] = { "A/1.file", "A/3.file", "a/2.file", "a/4.file" }; const char *expect_ci[] = { @@ -486,25 +546,23 @@ void test_repo_iterator__tree_case_conflicts_0(void) cl_git_pass(git_tree_lookup(&tree, g_repo, &tree_id)); - cl_git_pass(git_iterator_for_tree( - &i, tree, GIT_ITERATOR_DONT_IGNORE_CASE, NULL, NULL)); + i_opts.flags = GIT_ITERATOR_DONT_IGNORE_CASE; + cl_git_pass(git_iterator_for_tree(&i, tree, &i_opts)); expect_iterator_items(i, 4, expect_cs, 4, expect_cs); git_iterator_free(i); - cl_git_pass(git_iterator_for_tree( - &i, tree, GIT_ITERATOR_IGNORE_CASE, NULL, NULL)); + i_opts.flags = GIT_ITERATOR_IGNORE_CASE; + cl_git_pass(git_iterator_for_tree(&i, tree, &i_opts)); expect_iterator_items(i, 4, expect_ci, 4, expect_ci); git_iterator_free(i); - cl_git_pass(git_iterator_for_tree( - &i, tree, GIT_ITERATOR_DONT_IGNORE_CASE | - GIT_ITERATOR_INCLUDE_TREES, NULL, NULL)); + i_opts.flags = GIT_ITERATOR_DONT_IGNORE_CASE | GIT_ITERATOR_INCLUDE_TREES; + cl_git_pass(git_iterator_for_tree(&i, tree, &i_opts)); expect_iterator_items(i, 6, expect_cs_trees, 6, expect_cs_trees); git_iterator_free(i); - cl_git_pass(git_iterator_for_tree( - &i, tree, GIT_ITERATOR_IGNORE_CASE | - GIT_ITERATOR_INCLUDE_TREES, NULL, NULL)); + i_opts.flags = GIT_ITERATOR_IGNORE_CASE | GIT_ITERATOR_INCLUDE_TREES; + cl_git_pass(git_iterator_for_tree(&i, tree, &i_opts)); expect_iterator_items(i, 5, expect_ci_trees, 5, expect_ci_trees); git_iterator_free(i); @@ -517,6 +575,8 @@ void test_repo_iterator__tree_case_conflicts_1(void) git_tree *tree; git_oid blob_id, Ab_id, biga_id, littlea_id, tree_id; git_iterator *i; + git_iterator_options i_opts = GIT_ITERATOR_OPTIONS_INIT; + const char *expect_cs[] = { "A/a", "A/b/1", "A/c", "a/C", "a/a", "a/b" }; const char *expect_ci[] = { @@ -541,25 +601,23 @@ void test_repo_iterator__tree_case_conflicts_1(void) cl_git_pass(git_tree_lookup(&tree, g_repo, &tree_id)); - cl_git_pass(git_iterator_for_tree( - &i, tree, GIT_ITERATOR_DONT_IGNORE_CASE, NULL, NULL)); + i_opts.flags = GIT_ITERATOR_DONT_IGNORE_CASE; + cl_git_pass(git_iterator_for_tree(&i, tree, &i_opts)); expect_iterator_items(i, 6, expect_cs, 6, expect_cs); git_iterator_free(i); - cl_git_pass(git_iterator_for_tree( - &i, tree, GIT_ITERATOR_IGNORE_CASE, NULL, NULL)); + i_opts.flags = GIT_ITERATOR_IGNORE_CASE; + cl_git_pass(git_iterator_for_tree(&i, tree, &i_opts)); expect_iterator_items(i, 4, expect_ci, 4, expect_ci); git_iterator_free(i); - cl_git_pass(git_iterator_for_tree( - &i, tree, GIT_ITERATOR_DONT_IGNORE_CASE | - GIT_ITERATOR_INCLUDE_TREES, NULL, NULL)); + i_opts.flags = GIT_ITERATOR_DONT_IGNORE_CASE | GIT_ITERATOR_INCLUDE_TREES; + cl_git_pass(git_iterator_for_tree(&i, tree, &i_opts)); expect_iterator_items(i, 9, expect_cs_trees, 9, expect_cs_trees); git_iterator_free(i); - cl_git_pass(git_iterator_for_tree( - &i, tree, GIT_ITERATOR_IGNORE_CASE | - GIT_ITERATOR_INCLUDE_TREES, NULL, NULL)); + i_opts.flags = GIT_ITERATOR_IGNORE_CASE | GIT_ITERATOR_INCLUDE_TREES; + cl_git_pass(git_iterator_for_tree(&i, tree, &i_opts)); expect_iterator_items(i, 6, expect_ci_trees, 6, expect_ci_trees); git_iterator_free(i); @@ -572,6 +630,8 @@ void test_repo_iterator__tree_case_conflicts_2(void) git_tree *tree; git_oid blob_id, d1, d2, c1, c2, b1, b2, a1, a2, tree_id; git_iterator *i; + git_iterator_options i_opts = GIT_ITERATOR_OPTIONS_INIT; + const char *expect_cs[] = { "A/B/C/D/16", "A/B/C/D/foo", "A/B/C/d/15", "A/B/C/d/FOO", "A/B/c/D/14", "A/B/c/D/foo", "A/B/c/d/13", "A/B/c/d/FOO", @@ -639,19 +699,18 @@ void test_repo_iterator__tree_case_conflicts_2(void) cl_git_pass(git_tree_lookup(&tree, g_repo, &tree_id)); - cl_git_pass(git_iterator_for_tree( - &i, tree, GIT_ITERATOR_DONT_IGNORE_CASE, NULL, NULL)); + i_opts.flags = GIT_ITERATOR_DONT_IGNORE_CASE; + cl_git_pass(git_iterator_for_tree(&i, tree, &i_opts)); expect_iterator_items(i, 32, expect_cs, 32, expect_cs); git_iterator_free(i); - cl_git_pass(git_iterator_for_tree( - &i, tree, GIT_ITERATOR_IGNORE_CASE, NULL, NULL)); + i_opts.flags = GIT_ITERATOR_IGNORE_CASE; + cl_git_pass(git_iterator_for_tree(&i, tree, &i_opts)); expect_iterator_items(i, 17, expect_ci, 17, expect_ci); git_iterator_free(i); - cl_git_pass(git_iterator_for_tree( - &i, tree, GIT_ITERATOR_IGNORE_CASE | - GIT_ITERATOR_INCLUDE_TREES, NULL, NULL)); + i_opts.flags = GIT_ITERATOR_IGNORE_CASE | GIT_ITERATOR_INCLUDE_TREES; + cl_git_pass(git_iterator_for_tree(&i, tree, &i_opts)); expect_iterator_items(i, 21, expect_ci_trees, 21, expect_ci_trees); git_iterator_free(i); @@ -661,23 +720,24 @@ void test_repo_iterator__tree_case_conflicts_2(void) void test_repo_iterator__workdir(void) { git_iterator *i; + git_iterator_options i_opts = GIT_ITERATOR_OPTIONS_INIT; g_repo = cl_git_sandbox_init("icase"); /* auto expand with no tree entries */ - cl_git_pass(git_iterator_for_workdir(&i, g_repo, NULL, NULL, 0, NULL, NULL)); + cl_git_pass(git_iterator_for_workdir(&i, g_repo, NULL, NULL, &i_opts)); expect_iterator_items(i, 20, NULL, 20, NULL); git_iterator_free(i); /* auto expand with tree entries */ - cl_git_pass(git_iterator_for_workdir( - &i, g_repo, NULL, NULL, GIT_ITERATOR_INCLUDE_TREES, NULL, NULL)); + i_opts.flags = GIT_ITERATOR_INCLUDE_TREES; + cl_git_pass(git_iterator_for_workdir(&i, g_repo, NULL, NULL, &i_opts)); expect_iterator_items(i, 22, NULL, 22, NULL); git_iterator_free(i); /* no auto expand (implies trees included) */ - cl_git_pass(git_iterator_for_workdir( - &i, g_repo, NULL, NULL, GIT_ITERATOR_DONT_AUTOEXPAND, NULL, NULL)); + i_opts.flags = GIT_ITERATOR_DONT_AUTOEXPAND; + cl_git_pass(git_iterator_for_workdir(&i, g_repo, NULL, NULL, &i_opts)); expect_iterator_items(i, 12, NULL, 22, NULL); git_iterator_free(i); } @@ -685,73 +745,97 @@ void test_repo_iterator__workdir(void) void test_repo_iterator__workdir_icase(void) { git_iterator *i; - git_iterator_flag_t flag; + git_iterator_options i_opts = GIT_ITERATOR_OPTIONS_INIT; g_repo = cl_git_sandbox_init("icase"); - flag = GIT_ITERATOR_DONT_IGNORE_CASE; - /* auto expand with no tree entries */ - cl_git_pass(git_iterator_for_workdir(&i, g_repo, NULL, NULL, flag, "c", "k/D")); + i_opts.flags = GIT_ITERATOR_DONT_IGNORE_CASE; + + i_opts.start = "c"; + i_opts.end = "k/D"; + cl_git_pass(git_iterator_for_workdir(&i, g_repo, NULL, NULL, &i_opts)); expect_iterator_items(i, 7, NULL, 7, NULL); git_iterator_free(i); - cl_git_pass(git_iterator_for_workdir(&i, g_repo, NULL, NULL, flag, "k", "k/Z")); + i_opts.start = "k"; + i_opts.end = "k/Z"; + cl_git_pass(git_iterator_for_workdir(&i, g_repo, NULL, NULL, &i_opts)); expect_iterator_items(i, 3, NULL, 3, NULL); git_iterator_free(i); /* auto expand with tree entries */ - cl_git_pass(git_iterator_for_workdir( - &i, g_repo, NULL, NULL, flag | GIT_ITERATOR_INCLUDE_TREES, "c", "k/D")); + i_opts.flags = GIT_ITERATOR_DONT_IGNORE_CASE | GIT_ITERATOR_INCLUDE_TREES; + + i_opts.start = "c"; + i_opts.end = "k/D"; + cl_git_pass(git_iterator_for_workdir(&i, g_repo, NULL, NULL, &i_opts)); expect_iterator_items(i, 8, NULL, 8, NULL); git_iterator_free(i); - cl_git_pass(git_iterator_for_workdir( - &i, g_repo, NULL, NULL, flag | GIT_ITERATOR_INCLUDE_TREES, "k", "k/Z")); + i_opts.start = "k"; + i_opts.end = "k/Z"; + cl_git_pass(git_iterator_for_workdir(&i, g_repo, NULL, NULL, &i_opts)); expect_iterator_items(i, 4, NULL, 4, NULL); git_iterator_free(i); /* no auto expand (implies trees included) */ - cl_git_pass(git_iterator_for_workdir( - &i, g_repo, NULL, NULL, flag | GIT_ITERATOR_DONT_AUTOEXPAND, "c", "k/D")); + i_opts.flags = GIT_ITERATOR_DONT_IGNORE_CASE | GIT_ITERATOR_DONT_AUTOEXPAND; + + i_opts.start = "c"; + i_opts.end = "k/D"; + cl_git_pass(git_iterator_for_workdir(&i, g_repo, NULL, NULL, &i_opts)); expect_iterator_items(i, 5, NULL, 8, NULL); git_iterator_free(i); - cl_git_pass(git_iterator_for_workdir( - &i, g_repo, NULL, NULL, flag | GIT_ITERATOR_DONT_AUTOEXPAND, "k", "k/Z")); + i_opts.start = "k"; + i_opts.end = "k/Z"; + cl_git_pass(git_iterator_for_workdir(&i, g_repo, NULL, NULL, &i_opts)); expect_iterator_items(i, 1, NULL, 4, NULL); git_iterator_free(i); - flag = GIT_ITERATOR_IGNORE_CASE; - /* auto expand with no tree entries */ - cl_git_pass(git_iterator_for_workdir(&i, g_repo, NULL, NULL, flag, "c", "k/D")); + i_opts.flags = GIT_ITERATOR_IGNORE_CASE; + + i_opts.start = "c"; + i_opts.end = "k/D"; + cl_git_pass(git_iterator_for_workdir(&i, g_repo, NULL, NULL, &i_opts)); expect_iterator_items(i, 13, NULL, 13, NULL); git_iterator_free(i); - cl_git_pass(git_iterator_for_workdir(&i, g_repo, NULL, NULL, flag, "k", "k/Z")); + i_opts.start = "k"; + i_opts.end = "k/Z"; + cl_git_pass(git_iterator_for_workdir(&i, g_repo, NULL, NULL, &i_opts)); expect_iterator_items(i, 5, NULL, 5, NULL); git_iterator_free(i); /* auto expand with tree entries */ - cl_git_pass(git_iterator_for_workdir( - &i, g_repo, NULL, NULL, flag | GIT_ITERATOR_INCLUDE_TREES, "c", "k/D")); + i_opts.flags = GIT_ITERATOR_IGNORE_CASE | GIT_ITERATOR_INCLUDE_TREES; + + i_opts.start = "c"; + i_opts.end = "k/D"; + cl_git_pass(git_iterator_for_workdir(&i, g_repo, NULL, NULL, &i_opts)); expect_iterator_items(i, 14, NULL, 14, NULL); git_iterator_free(i); - cl_git_pass(git_iterator_for_workdir( - &i, g_repo, NULL, NULL, flag | GIT_ITERATOR_INCLUDE_TREES, "k", "k/Z")); + i_opts.start = "k"; + i_opts.end = "k/Z"; + cl_git_pass(git_iterator_for_workdir(&i, g_repo, NULL, NULL, &i_opts)); expect_iterator_items(i, 6, NULL, 6, NULL); git_iterator_free(i); /* no auto expand (implies trees included) */ - cl_git_pass(git_iterator_for_workdir( - &i, g_repo, NULL, NULL, flag | GIT_ITERATOR_DONT_AUTOEXPAND, "c", "k/D")); + i_opts.flags = GIT_ITERATOR_IGNORE_CASE | GIT_ITERATOR_DONT_AUTOEXPAND; + + i_opts.start = "c"; + i_opts.end = "k/D"; + cl_git_pass(git_iterator_for_workdir(&i, g_repo, NULL, NULL, &i_opts)); expect_iterator_items(i, 9, NULL, 14, NULL); git_iterator_free(i); - cl_git_pass(git_iterator_for_workdir( - &i, g_repo, NULL, NULL, flag | GIT_ITERATOR_DONT_AUTOEXPAND, "k", "k/Z")); + i_opts.start = "k"; + i_opts.end = "k/Z"; + cl_git_pass(git_iterator_for_workdir(&i, g_repo, NULL, NULL, &i_opts)); expect_iterator_items(i, 1, NULL, 6, NULL); git_iterator_free(i); } @@ -764,14 +848,14 @@ static void build_workdir_tree(const char *root, int dirs, int subs) for (i = 0; i < dirs; ++i) { if (i % 2 == 0) { p_snprintf(buf, sizeof(buf), "%s/dir%02d", root, i); - cl_git_pass(git_futils_mkdir(buf, NULL, 0775, GIT_MKDIR_PATH)); + cl_git_pass(git_futils_mkdir(buf, 0775, GIT_MKDIR_PATH)); p_snprintf(buf, sizeof(buf), "%s/dir%02d/file", root, i); cl_git_mkfile(buf, buf); buf[strlen(buf) - 5] = '\0'; } else { p_snprintf(buf, sizeof(buf), "%s/DIR%02d", root, i); - cl_git_pass(git_futils_mkdir(buf, NULL, 0775, GIT_MKDIR_PATH)); + cl_git_pass(git_futils_mkdir(buf, 0775, GIT_MKDIR_PATH)); } for (j = 0; j < subs; ++j) { @@ -781,7 +865,7 @@ static void build_workdir_tree(const char *root, int dirs, int subs) case 2: p_snprintf(sub, sizeof(sub), "%s/Sub%02d", buf, j); break; case 3: p_snprintf(sub, sizeof(sub), "%s/SUB%02d", buf, j); break; } - cl_git_pass(git_futils_mkdir(sub, NULL, 0775, GIT_MKDIR_PATH)); + cl_git_pass(git_futils_mkdir(sub, 0775, GIT_MKDIR_PATH)); if (j % 2 == 0) { size_t sublen = strlen(sub); @@ -796,6 +880,7 @@ static void build_workdir_tree(const char *root, int dirs, int subs) void test_repo_iterator__workdir_depth(void) { git_iterator *iter; + git_iterator_options iter_opts = GIT_ITERATOR_OPTIONS_INIT; g_repo = cl_git_sandbox_init("icase"); @@ -804,13 +889,13 @@ void test_repo_iterator__workdir_depth(void) build_workdir_tree("icase/dir02/sUB01", 50, 0); /* auto expand with no tree entries */ - cl_git_pass(git_iterator_for_workdir(&iter, g_repo, NULL, NULL, 0, NULL, NULL)); + cl_git_pass(git_iterator_for_workdir(&iter, g_repo, NULL, NULL, &iter_opts)); expect_iterator_items(iter, 125, NULL, 125, NULL); git_iterator_free(iter); /* auto expand with tree entries (empty dirs silently skipped) */ - cl_git_pass(git_iterator_for_workdir( - &iter, g_repo, NULL, NULL, GIT_ITERATOR_INCLUDE_TREES, NULL, NULL)); + iter_opts.flags = GIT_ITERATOR_INCLUDE_TREES; + cl_git_pass(git_iterator_for_workdir(&iter, g_repo, NULL, NULL, &iter_opts)); expect_iterator_items(iter, 337, NULL, 337, NULL); git_iterator_free(iter); } @@ -818,6 +903,8 @@ void test_repo_iterator__workdir_depth(void) void test_repo_iterator__fs(void) { git_iterator *i; + git_iterator_options i_opts = GIT_ITERATOR_OPTIONS_INIT; + static const char *expect_base[] = { "DIR01/Sub02/file", "DIR01/sub00/file", @@ -863,18 +950,17 @@ void test_repo_iterator__fs(void) build_workdir_tree("status/subdir", 2, 4); - cl_git_pass(git_iterator_for_filesystem( - &i, "status/subdir", 0, NULL, NULL)); + cl_git_pass(git_iterator_for_filesystem(&i, "status/subdir", NULL)); expect_iterator_items(i, 8, expect_base, 8, expect_base); git_iterator_free(i); - cl_git_pass(git_iterator_for_filesystem( - &i, "status/subdir", GIT_ITERATOR_INCLUDE_TREES, NULL, NULL)); + i_opts.flags = GIT_ITERATOR_INCLUDE_TREES; + cl_git_pass(git_iterator_for_filesystem(&i, "status/subdir", &i_opts)); expect_iterator_items(i, 18, expect_trees, 18, expect_trees); git_iterator_free(i); - cl_git_pass(git_iterator_for_filesystem( - &i, "status/subdir", GIT_ITERATOR_DONT_AUTOEXPAND, NULL, NULL)); + i_opts.flags = GIT_ITERATOR_DONT_AUTOEXPAND; + cl_git_pass(git_iterator_for_filesystem(&i, "status/subdir", &i_opts)); expect_iterator_items(i, 5, expect_noauto, 18, expect_trees); git_iterator_free(i); @@ -882,20 +968,18 @@ void test_repo_iterator__fs(void) git__tsort((void **)expect_trees, 18, (git__tsort_cmp)git__strcasecmp); git__tsort((void **)expect_noauto, 5, (git__tsort_cmp)git__strcasecmp); - cl_git_pass(git_iterator_for_filesystem( - &i, "status/subdir", GIT_ITERATOR_IGNORE_CASE, NULL, NULL)); + i_opts.flags = GIT_ITERATOR_IGNORE_CASE; + cl_git_pass(git_iterator_for_filesystem(&i, "status/subdir", &i_opts)); expect_iterator_items(i, 8, expect_base, 8, expect_base); git_iterator_free(i); - cl_git_pass(git_iterator_for_filesystem( - &i, "status/subdir", GIT_ITERATOR_IGNORE_CASE | - GIT_ITERATOR_INCLUDE_TREES, NULL, NULL)); + i_opts.flags = GIT_ITERATOR_IGNORE_CASE | GIT_ITERATOR_INCLUDE_TREES; + cl_git_pass(git_iterator_for_filesystem(&i, "status/subdir", &i_opts)); expect_iterator_items(i, 18, expect_trees, 18, expect_trees); git_iterator_free(i); - cl_git_pass(git_iterator_for_filesystem( - &i, "status/subdir", GIT_ITERATOR_IGNORE_CASE | - GIT_ITERATOR_DONT_AUTOEXPAND, NULL, NULL)); + i_opts.flags = GIT_ITERATOR_IGNORE_CASE | GIT_ITERATOR_DONT_AUTOEXPAND; + cl_git_pass(git_iterator_for_filesystem(&i, "status/subdir", &i_opts)); expect_iterator_items(i, 5, expect_noauto, 18, expect_trees); git_iterator_free(i); } @@ -923,7 +1007,7 @@ void test_repo_iterator__fs2(void) g_repo = cl_git_sandbox_init("testrepo"); cl_git_pass(git_iterator_for_filesystem( - &i, "testrepo/.git/refs", 0, NULL, NULL)); + &i, "testrepo/.git/refs", NULL)); expect_iterator_items(i, 13, expect_base, 13, expect_base); git_iterator_free(i); } @@ -936,6 +1020,11 @@ void test_repo_iterator__unreadable_dir(void) if (!cl_is_chmod_supported()) return; +#ifndef GIT_WIN32 + if (geteuid() == 0) + cl_skip(); +#endif + g_repo = cl_git_sandbox_init("empty_standard_repo"); cl_must_pass(p_mkdir("empty_standard_repo/r", 0777)); @@ -947,7 +1036,7 @@ void test_repo_iterator__unreadable_dir(void) cl_git_mkfile("empty_standard_repo/r/d", "final"); cl_git_pass(git_iterator_for_filesystem( - &i, "empty_standard_repo/r", 0, NULL, NULL)); + &i, "empty_standard_repo/r", NULL)); cl_git_pass(git_iterator_advance(&e, i)); /* a */ cl_git_fail(git_iterator_advance(&e, i)); /* b */ @@ -963,6 +1052,7 @@ void test_repo_iterator__skips_fifos_and_such(void) #ifndef GIT_WIN32 git_iterator *i; const git_index_entry *e; + git_iterator_options i_opts = GIT_ITERATOR_OPTIONS_INIT; g_repo = cl_git_sandbox_init("empty_standard_repo"); @@ -972,9 +1062,11 @@ void test_repo_iterator__skips_fifos_and_such(void) cl_assert(!mkfifo("empty_standard_repo/fifo", 0777)); cl_assert(!access("empty_standard_repo/fifo", F_OK)); + i_opts.flags = GIT_ITERATOR_INCLUDE_TREES | + GIT_ITERATOR_DONT_AUTOEXPAND; + cl_git_pass(git_iterator_for_filesystem( - &i, "empty_standard_repo", GIT_ITERATOR_INCLUDE_TREES | - GIT_ITERATOR_DONT_AUTOEXPAND, NULL, NULL)); + &i, "empty_standard_repo", &i_opts)); cl_git_pass(git_iterator_advance(&e, i)); /* .git */ cl_assert(S_ISDIR(e->mode)); @@ -989,3 +1081,469 @@ void test_repo_iterator__skips_fifos_and_such(void) git_iterator_free(i); #endif } + +void test_repo_iterator__indexfilelist(void) +{ + git_iterator *i; + git_iterator_options i_opts = GIT_ITERATOR_OPTIONS_INIT; + git_index *index; + git_vector filelist; + int default_icase; + int expect; + + cl_git_pass(git_vector_init(&filelist, 100, &git__strcmp_cb)); + cl_git_pass(git_vector_insert(&filelist, "a")); + cl_git_pass(git_vector_insert(&filelist, "B")); + cl_git_pass(git_vector_insert(&filelist, "c")); + cl_git_pass(git_vector_insert(&filelist, "D")); + cl_git_pass(git_vector_insert(&filelist, "e")); + cl_git_pass(git_vector_insert(&filelist, "k/1")); + cl_git_pass(git_vector_insert(&filelist, "k/a")); + cl_git_pass(git_vector_insert(&filelist, "L/1")); + + g_repo = cl_git_sandbox_init("icase"); + + cl_git_pass(git_repository_index(&index, g_repo)); + + /* In this test we DO NOT force a case setting on the index. */ + default_icase = ((git_index_caps(index) & GIT_INDEXCAP_IGNORE_CASE) != 0); + + i_opts.pathlist.strings = (char **)filelist.contents; + i_opts.pathlist.count = filelist.length; + + /* All indexfilelist iterator tests are "autoexpand with no tree entries" */ + + cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts)); + expect_iterator_items(i, 8, NULL, 8, NULL); + git_iterator_free(i); + + i_opts.start = "c"; + i_opts.end = NULL; + + cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts)); + /* (c D e k/1 k/a L ==> 6) vs (c e k/1 k/a ==> 4) */ + expect = ((default_icase) ? 6 : 4); + expect_iterator_items(i, expect, NULL, expect, NULL); + git_iterator_free(i); + + i_opts.start = NULL; + i_opts.end = "e"; + + cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts)); + /* (a B c D e ==> 5) vs (B D L/1 a c e ==> 6) */ + expect = ((default_icase) ? 5 : 6); + expect_iterator_items(i, expect, NULL, expect, NULL); + git_iterator_free(i); + + git_index_free(index); + git_vector_free(&filelist); +} + +void test_repo_iterator__indexfilelist_2(void) +{ + git_iterator *i; + git_iterator_options i_opts = GIT_ITERATOR_OPTIONS_INIT; + git_index *index; + git_vector filelist = GIT_VECTOR_INIT; + int default_icase, expect; + + g_repo = cl_git_sandbox_init("icase"); + + cl_git_pass(git_repository_index(&index, g_repo)); + + cl_git_pass(git_vector_init(&filelist, 100, &git__strcmp_cb)); + cl_git_pass(git_vector_insert(&filelist, "0")); + cl_git_pass(git_vector_insert(&filelist, "c")); + cl_git_pass(git_vector_insert(&filelist, "D")); + cl_git_pass(git_vector_insert(&filelist, "e")); + cl_git_pass(git_vector_insert(&filelist, "k/1")); + cl_git_pass(git_vector_insert(&filelist, "k/a")); + + /* In this test we DO NOT force a case setting on the index. */ + default_icase = ((git_index_caps(index) & GIT_INDEXCAP_IGNORE_CASE) != 0); + + i_opts.pathlist.strings = (char **)filelist.contents; + i_opts.pathlist.count = filelist.length; + + i_opts.start = "b"; + i_opts.end = "k/D"; + + /* (c D e k/1 k/a ==> 5) vs (c e k/1 ==> 3) */ + expect = default_icase ? 5 : 3; + + cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts)); + expect_iterator_items(i, expect, NULL, expect, NULL); + git_iterator_free(i); + + git_index_free(index); + git_vector_free(&filelist); +} + +void test_repo_iterator__indexfilelist_3(void) +{ + git_iterator *i; + git_iterator_options i_opts = GIT_ITERATOR_OPTIONS_INIT; + git_index *index; + git_vector filelist = GIT_VECTOR_INIT; + int default_icase, expect; + + g_repo = cl_git_sandbox_init("icase"); + + cl_git_pass(git_repository_index(&index, g_repo)); + + cl_git_pass(git_vector_init(&filelist, 100, &git__strcmp_cb)); + cl_git_pass(git_vector_insert(&filelist, "0")); + cl_git_pass(git_vector_insert(&filelist, "c")); + cl_git_pass(git_vector_insert(&filelist, "D")); + cl_git_pass(git_vector_insert(&filelist, "e")); + cl_git_pass(git_vector_insert(&filelist, "k/")); + cl_git_pass(git_vector_insert(&filelist, "k.a")); + cl_git_pass(git_vector_insert(&filelist, "k.b")); + cl_git_pass(git_vector_insert(&filelist, "kZZZZZZZ")); + + /* In this test we DO NOT force a case setting on the index. */ + default_icase = ((git_index_caps(index) & GIT_INDEXCAP_IGNORE_CASE) != 0); + + i_opts.pathlist.strings = (char **)filelist.contents; + i_opts.pathlist.count = filelist.length; + + i_opts.start = "b"; + i_opts.end = "k/D"; + + /* (c D e k/1 k/a k/B k/c k/D) vs (c e k/1 k/B k/D) */ + expect = default_icase ? 8 : 5; + + cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts)); + expect_iterator_items(i, expect, NULL, expect, NULL); + git_iterator_free(i); + + git_index_free(index); + git_vector_free(&filelist); +} + +void test_repo_iterator__indexfilelist_4(void) +{ + git_iterator *i; + git_iterator_options i_opts = GIT_ITERATOR_OPTIONS_INIT; + git_index *index; + git_vector filelist = GIT_VECTOR_INIT; + int default_icase, expect; + + g_repo = cl_git_sandbox_init("icase"); + + cl_git_pass(git_repository_index(&index, g_repo)); + + cl_git_pass(git_vector_init(&filelist, 100, &git__strcmp_cb)); + cl_git_pass(git_vector_insert(&filelist, "0")); + cl_git_pass(git_vector_insert(&filelist, "c")); + cl_git_pass(git_vector_insert(&filelist, "D")); + cl_git_pass(git_vector_insert(&filelist, "e")); + cl_git_pass(git_vector_insert(&filelist, "k")); + cl_git_pass(git_vector_insert(&filelist, "k.a")); + cl_git_pass(git_vector_insert(&filelist, "k.b")); + cl_git_pass(git_vector_insert(&filelist, "kZZZZZZZ")); + + /* In this test we DO NOT force a case setting on the index. */ + default_icase = ((git_index_caps(index) & GIT_INDEXCAP_IGNORE_CASE) != 0); + + i_opts.pathlist.strings = (char **)filelist.contents; + i_opts.pathlist.count = filelist.length; + + i_opts.start = "b"; + i_opts.end = "k/D"; + + /* (c D e k/1 k/a k/B k/c k/D) vs (c e k/1 k/B k/D) */ + expect = default_icase ? 8 : 5; + + cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts)); + expect_iterator_items(i, expect, NULL, expect, NULL); + git_iterator_free(i); + + git_index_free(index); + git_vector_free(&filelist); +} + +void test_repo_iterator__indexfilelist_icase(void) +{ + git_iterator *i; + git_iterator_options i_opts = GIT_ITERATOR_OPTIONS_INIT; + git_index *index; + int caps; + git_vector filelist; + + cl_git_pass(git_vector_init(&filelist, 100, &git__strcmp_cb)); + cl_git_pass(git_vector_insert(&filelist, "a")); + cl_git_pass(git_vector_insert(&filelist, "B")); + cl_git_pass(git_vector_insert(&filelist, "c")); + cl_git_pass(git_vector_insert(&filelist, "D")); + cl_git_pass(git_vector_insert(&filelist, "e")); + cl_git_pass(git_vector_insert(&filelist, "k/1")); + cl_git_pass(git_vector_insert(&filelist, "k/a")); + cl_git_pass(git_vector_insert(&filelist, "L/1")); + + g_repo = cl_git_sandbox_init("icase"); + + cl_git_pass(git_repository_index(&index, g_repo)); + caps = git_index_caps(index); + + /* force case sensitivity */ + cl_git_pass(git_index_set_caps(index, caps & ~GIT_INDEXCAP_IGNORE_CASE)); + + /* All indexfilelist iterator tests are "autoexpand with no tree entries" */ + + i_opts.pathlist.strings = (char **)filelist.contents; + i_opts.pathlist.count = filelist.length; + + i_opts.start = "c"; + i_opts.end = "k/D"; + cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts)); + expect_iterator_items(i, 3, NULL, 3, NULL); + git_iterator_free(i); + + i_opts.start = "k"; + i_opts.end = "k/Z"; + cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts)); + expect_iterator_items(i, 1, NULL, 1, NULL); + git_iterator_free(i); + + /* force case insensitivity */ + cl_git_pass(git_index_set_caps(index, caps | GIT_INDEXCAP_IGNORE_CASE)); + + i_opts.start = "c"; + i_opts.end = "k/D"; + cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts)); + expect_iterator_items(i, 5, NULL, 5, NULL); + git_iterator_free(i); + + i_opts.start = "k"; + i_opts.end = "k/Z"; + cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts)); + expect_iterator_items(i, 2, NULL, 2, NULL); + git_iterator_free(i); + + cl_git_pass(git_index_set_caps(index, caps)); + git_index_free(index); + git_vector_free(&filelist); +} + +void test_repo_iterator__workdirfilelist(void) +{ + git_iterator *i; + git_iterator_options i_opts = GIT_ITERATOR_OPTIONS_INIT; + git_vector filelist; + bool default_icase; + int expect; + + cl_git_pass(git_vector_init(&filelist, 100, &git__strcmp_cb)); + cl_git_pass(git_vector_insert(&filelist, "a")); + cl_git_pass(git_vector_insert(&filelist, "B")); + cl_git_pass(git_vector_insert(&filelist, "c")); + cl_git_pass(git_vector_insert(&filelist, "D")); + cl_git_pass(git_vector_insert(&filelist, "e")); + cl_git_pass(git_vector_insert(&filelist, "k.a")); + cl_git_pass(git_vector_insert(&filelist, "k.b")); + cl_git_pass(git_vector_insert(&filelist, "k/1")); + cl_git_pass(git_vector_insert(&filelist, "k/a")); + cl_git_pass(git_vector_insert(&filelist, "kZZZZZZZ")); + cl_git_pass(git_vector_insert(&filelist, "L/1")); + + g_repo = cl_git_sandbox_init("icase"); + + /* All indexfilelist iterator tests are "autoexpand with no tree entries" */ + /* In this test we DO NOT force a case on the iteratords and verify default behavior. */ + + i_opts.pathlist.strings = (char **)filelist.contents; + i_opts.pathlist.count = filelist.length; + + cl_git_pass(git_iterator_for_workdir(&i, g_repo, NULL, NULL, &i_opts)); + expect_iterator_items(i, 8, NULL, 8, NULL); + git_iterator_free(i); + + i_opts.start = "c"; + i_opts.end = NULL; + cl_git_pass(git_iterator_for_workdir(&i, g_repo, NULL, NULL, &i_opts)); + default_icase = git_iterator_ignore_case(i); + /* (c D e k/1 k/a L ==> 6) vs (c e k/1 k/a ==> 4) */ + expect = ((default_icase) ? 6 : 4); + expect_iterator_items(i, expect, NULL, expect, NULL); + git_iterator_free(i); + + i_opts.start = NULL; + i_opts.end = "e"; + cl_git_pass(git_iterator_for_workdir(&i, g_repo, NULL, NULL, &i_opts)); + default_icase = git_iterator_ignore_case(i); + /* (a B c D e ==> 5) vs (B D L/1 a c e ==> 6) */ + expect = ((default_icase) ? 5 : 6); + expect_iterator_items(i, expect, NULL, expect, NULL); + git_iterator_free(i); + + git_vector_free(&filelist); +} + +void test_repo_iterator__workdirfilelist_icase(void) +{ + git_iterator *i; + git_iterator_options i_opts = GIT_ITERATOR_OPTIONS_INIT; + git_vector filelist; + + cl_git_pass(git_vector_init(&filelist, 100, &git__strcmp_cb)); + cl_git_pass(git_vector_insert(&filelist, "a")); + cl_git_pass(git_vector_insert(&filelist, "B")); + cl_git_pass(git_vector_insert(&filelist, "c")); + cl_git_pass(git_vector_insert(&filelist, "D")); + cl_git_pass(git_vector_insert(&filelist, "e")); + cl_git_pass(git_vector_insert(&filelist, "k.a")); + cl_git_pass(git_vector_insert(&filelist, "k.b")); + cl_git_pass(git_vector_insert(&filelist, "k/1")); + cl_git_pass(git_vector_insert(&filelist, "k/a")); + cl_git_pass(git_vector_insert(&filelist, "kZZZZ")); + cl_git_pass(git_vector_insert(&filelist, "L/1")); + + g_repo = cl_git_sandbox_init("icase"); + + i_opts.flags = GIT_ITERATOR_DONT_IGNORE_CASE; + i_opts.pathlist.strings = (char **)filelist.contents; + i_opts.pathlist.count = filelist.length; + + i_opts.start = "c"; + i_opts.end = "k/D"; + cl_git_pass(git_iterator_for_workdir(&i, g_repo, NULL, NULL, &i_opts)); + expect_iterator_items(i, 3, NULL, 3, NULL); + git_iterator_free(i); + + i_opts.start = "k"; + i_opts.end = "k/Z"; + cl_git_pass(git_iterator_for_workdir(&i, g_repo, NULL, NULL, &i_opts)); + expect_iterator_items(i, 1, NULL, 1, NULL); + git_iterator_free(i); + + i_opts.flags = GIT_ITERATOR_IGNORE_CASE; + + i_opts.start = "c"; + i_opts.end = "k/D"; + cl_git_pass(git_iterator_for_workdir(&i, g_repo, NULL, NULL, &i_opts)); + expect_iterator_items(i, 5, NULL, 5, NULL); + git_iterator_free(i); + + i_opts.start = "k"; + i_opts.end = "k/Z"; + cl_git_pass(git_iterator_for_workdir(&i, g_repo, NULL, NULL, &i_opts)); + expect_iterator_items(i, 2, NULL, 2, NULL); + git_iterator_free(i); + + git_vector_free(&filelist); +} + +void test_repo_iterator__treefilelist(void) +{ + git_iterator *i; + git_iterator_options i_opts = GIT_ITERATOR_OPTIONS_INIT; + git_vector filelist; + git_tree *tree; + bool default_icase; + int expect; + + cl_git_pass(git_vector_init(&filelist, 100, &git__strcmp_cb)); + cl_git_pass(git_vector_insert(&filelist, "a")); + cl_git_pass(git_vector_insert(&filelist, "B")); + cl_git_pass(git_vector_insert(&filelist, "c")); + cl_git_pass(git_vector_insert(&filelist, "D")); + cl_git_pass(git_vector_insert(&filelist, "e")); + cl_git_pass(git_vector_insert(&filelist, "k.a")); + cl_git_pass(git_vector_insert(&filelist, "k.b")); + cl_git_pass(git_vector_insert(&filelist, "k/1")); + cl_git_pass(git_vector_insert(&filelist, "k/a")); + cl_git_pass(git_vector_insert(&filelist, "kZZZZZZZ")); + cl_git_pass(git_vector_insert(&filelist, "L/1")); + + g_repo = cl_git_sandbox_init("icase"); + git_repository_head_tree(&tree, g_repo); + + /* All indexfilelist iterator tests are "autoexpand with no tree entries" */ + /* In this test we DO NOT force a case on the iteratords and verify default behavior. */ + + i_opts.pathlist.strings = (char **)filelist.contents; + i_opts.pathlist.count = filelist.length; + + cl_git_pass(git_iterator_for_tree(&i, tree, &i_opts)); + expect_iterator_items(i, 8, NULL, 8, NULL); + git_iterator_free(i); + + i_opts.start = "c"; + i_opts.end = NULL; + cl_git_pass(git_iterator_for_tree(&i, tree, &i_opts)); + default_icase = git_iterator_ignore_case(i); + /* (c D e k/1 k/a L ==> 6) vs (c e k/1 k/a ==> 4) */ + expect = ((default_icase) ? 6 : 4); + expect_iterator_items(i, expect, NULL, expect, NULL); + git_iterator_free(i); + + i_opts.start = NULL; + i_opts.end = "e"; + cl_git_pass(git_iterator_for_tree(&i, tree, &i_opts)); + default_icase = git_iterator_ignore_case(i); + /* (a B c D e ==> 5) vs (B D L/1 a c e ==> 6) */ + expect = ((default_icase) ? 5 : 6); + expect_iterator_items(i, expect, NULL, expect, NULL); + git_iterator_free(i); + + git_vector_free(&filelist); + git_tree_free(tree); +} + +void test_repo_iterator__treefilelist_icase(void) +{ + git_iterator *i; + git_iterator_options i_opts = GIT_ITERATOR_OPTIONS_INIT; + git_vector filelist; + git_tree *tree; + + cl_git_pass(git_vector_init(&filelist, 100, &git__strcmp_cb)); + cl_git_pass(git_vector_insert(&filelist, "a")); + cl_git_pass(git_vector_insert(&filelist, "B")); + cl_git_pass(git_vector_insert(&filelist, "c")); + cl_git_pass(git_vector_insert(&filelist, "D")); + cl_git_pass(git_vector_insert(&filelist, "e")); + cl_git_pass(git_vector_insert(&filelist, "k.a")); + cl_git_pass(git_vector_insert(&filelist, "k.b")); + cl_git_pass(git_vector_insert(&filelist, "k/1")); + cl_git_pass(git_vector_insert(&filelist, "k/a")); + cl_git_pass(git_vector_insert(&filelist, "kZZZZ")); + cl_git_pass(git_vector_insert(&filelist, "L/1")); + + g_repo = cl_git_sandbox_init("icase"); + git_repository_head_tree(&tree, g_repo); + + i_opts.flags = GIT_ITERATOR_DONT_IGNORE_CASE; + i_opts.pathlist.strings = (char **)filelist.contents; + i_opts.pathlist.count = filelist.length; + + i_opts.start = "c"; + i_opts.end = "k/D"; + cl_git_pass(git_iterator_for_tree(&i, tree, &i_opts)); + expect_iterator_items(i, 3, NULL, 3, NULL); + git_iterator_free(i); + + i_opts.start = "k"; + i_opts.end = "k/Z"; + cl_git_pass(git_iterator_for_tree(&i, tree, &i_opts)); + expect_iterator_items(i, 1, NULL, 1, NULL); + git_iterator_free(i); + + i_opts.flags = GIT_ITERATOR_IGNORE_CASE; + + i_opts.start = "c"; + i_opts.end = "k/D"; + cl_git_pass(git_iterator_for_tree(&i, tree, &i_opts)); + expect_iterator_items(i, 5, NULL, 5, NULL); + git_iterator_free(i); + + i_opts.start = "k"; + i_opts.end = "k/Z"; + cl_git_pass(git_iterator_for_tree(&i, tree, &i_opts)); + expect_iterator_items(i, 2, NULL, 2, NULL); + git_iterator_free(i); + + git_vector_free(&filelist); + git_tree_free(tree); +} diff --git a/vendor/libgit2/tests/repo/open.c b/vendor/libgit2/tests/repo/open.c index eb459e51d..d3d087231 100644 --- a/vendor/libgit2/tests/repo/open.c +++ b/vendor/libgit2/tests/repo/open.c @@ -91,7 +91,7 @@ static void make_gitlink_dir(const char *dir, const char *linktext) { git_buf path = GIT_BUF_INIT; - cl_git_pass(git_futils_mkdir(dir, NULL, 0777, GIT_MKDIR_VERIFY_DIR)); + cl_git_pass(git_futils_mkdir(dir, 0777, GIT_MKDIR_VERIFY_DIR)); cl_git_pass(git_buf_joinpath(&path, dir, ".git")); cl_git_rewritefile(path.ptr, linktext); git_buf_free(&path); @@ -222,7 +222,7 @@ void test_repo_open__bad_gitlinks(void) cl_git_sandbox_init("attr"); cl_git_pass(p_mkdir("invalid", 0777)); - cl_git_pass(git_futils_mkdir_r("invalid2/.git", NULL, 0777)); + cl_git_pass(git_futils_mkdir_r("invalid2/.git", 0777)); for (scan = bad_links; *scan != NULL; scan++) { make_gitlink_dir("alternate", *scan); diff --git a/vendor/libgit2/tests/repo/reservedname.c b/vendor/libgit2/tests/repo/reservedname.c index faea0cc2b..2a5b38239 100644 --- a/vendor/libgit2/tests/repo/reservedname.c +++ b/vendor/libgit2/tests/repo/reservedname.c @@ -106,3 +106,27 @@ void test_repo_reservedname__submodule_pointer(void) git_repository_free(sub_repo); #endif } + +/* Like the `submodule_pointer` test (above), this ensures that we do not + * follow the gitlink to the submodule's repository location and treat that + * as a reserved name. This tests at an initial submodule update, where the + * submodule repo is being created. + */ +void test_repo_reservedname__submodule_pointer_during_create(void) +{ + git_repository *repo; + git_submodule *sm; + git_submodule_update_options update_options = GIT_SUBMODULE_UPDATE_OPTIONS_INIT; + git_buf url = GIT_BUF_INIT; + + repo = setup_fixture_super(); + + cl_git_pass(git_buf_joinpath(&url, clar_sandbox_path(), "sub.git")); + cl_repo_set_string(repo, "submodule.sub.url", url.ptr); + + cl_git_pass(git_submodule_lookup(&sm, repo, "sub")); + cl_git_pass(git_submodule_update(sm, 1, &update_options)); + + git_submodule_free(sm); + git_buf_free(&url); +} diff --git a/vendor/libgit2/tests/repo/state.c b/vendor/libgit2/tests/repo/state.c index bf2633c17..7f20eebe8 100644 --- a/vendor/libgit2/tests/repo/state.c +++ b/vendor/libgit2/tests/repo/state.c @@ -57,6 +57,15 @@ void test_repo_state__revert(void) assert_repo_state(GIT_REPOSITORY_STATE_NONE); } +void test_repo_state__revert_sequence(void) +{ + setup_simple_state(GIT_REVERT_HEAD_FILE); + setup_simple_state(GIT_SEQUENCER_TODO_FILE); + assert_repo_state(GIT_REPOSITORY_STATE_REVERT_SEQUENCE); + cl_git_pass(git_repository_state_cleanup(_repo)); + assert_repo_state(GIT_REPOSITORY_STATE_NONE); +} + void test_repo_state__cherry_pick(void) { setup_simple_state(GIT_CHERRYPICK_HEAD_FILE); @@ -65,6 +74,15 @@ void test_repo_state__cherry_pick(void) assert_repo_state(GIT_REPOSITORY_STATE_NONE); } +void test_repo_state__cherrypick_sequence(void) +{ + setup_simple_state(GIT_CHERRYPICK_HEAD_FILE); + setup_simple_state(GIT_SEQUENCER_TODO_FILE); + assert_repo_state(GIT_REPOSITORY_STATE_CHERRYPICK_SEQUENCE); + cl_git_pass(git_repository_state_cleanup(_repo)); + assert_repo_state(GIT_REPOSITORY_STATE_NONE); +} + void test_repo_state__bisect(void) { setup_simple_state(GIT_BISECT_LOG_FILE); diff --git a/vendor/libgit2/tests/reset/hard.c b/vendor/libgit2/tests/reset/hard.c index 88055adda..e461f8093 100644 --- a/vendor/libgit2/tests/reset/hard.c +++ b/vendor/libgit2/tests/reset/hard.c @@ -122,9 +122,9 @@ static void unmerged_index_init(git_index *index, int entries) int write_theirs = 4; git_oid ancestor, ours, theirs; - git_oid_fromstr(&ancestor, "6bb0d9f700543ba3d318ba7075fc3bd696b4287b"); - git_oid_fromstr(&ours, "b19a1e93bec1317dc6097229e12afaffbfa74dc2"); - git_oid_fromstr(&theirs, "950b81b7eee953d050aa05a641f8e056c85dd1bd"); + git_oid_fromstr(&ancestor, "452e4244b5d083ddf0460acf1ecc74db9dcfa11a"); + git_oid_fromstr(&ours, "32504b727382542f9f089e24fddac5e78533e96c"); + git_oid_fromstr(&theirs, "061d42a44cacde5726057b67558821d95db96f19"); cl_git_rewritefile("status/conflicting_file", "conflicting file\n"); @@ -235,3 +235,55 @@ void test_reset_hard__reflog_is_correct(void) git_annotated_commit_free(annotated); } + +void test_reset_hard__switch_file_to_dir(void) +{ + git_index_entry entry = {{ 0 }}; + git_index *idx; + git_object *commit; + git_tree *tree; + git_signature *sig; + git_oid src_tree_id, tgt_tree_id; + git_oid src_id, tgt_id; + + entry.mode = GIT_FILEMODE_BLOB; + cl_git_pass(git_oid_fromstr(&entry.id, "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391")); + cl_git_pass(git_index_new(&idx)); + cl_git_pass(git_signature_now(&sig, "foo", "bar")); + + /* Create the old tree */ + entry.path = "README"; + cl_git_pass(git_index_add(idx, &entry)); + entry.path = "dir"; + cl_git_pass(git_index_add(idx, &entry)); + + cl_git_pass(git_index_write_tree_to(&src_tree_id, idx, repo)); + cl_git_pass(git_index_clear(idx)); + + cl_git_pass(git_tree_lookup(&tree, repo, &src_tree_id)); + cl_git_pass(git_commit_create(&src_id, repo, NULL, sig, sig, NULL, "foo", tree, 0, NULL)); + git_tree_free(tree); + + /* Create the new tree */ + entry.path = "README"; + cl_git_pass(git_index_add(idx, &entry)); + entry.path = "dir/FILE"; + cl_git_pass(git_index_add(idx, &entry)); + + cl_git_pass(git_index_write_tree_to(&tgt_tree_id, idx, repo)); + cl_git_pass(git_tree_lookup(&tree, repo, &tgt_tree_id)); + cl_git_pass(git_commit_create(&tgt_id, repo, NULL, sig, sig, NULL, "foo", tree, 0, NULL)); + git_tree_free(tree); + git_index_free(idx); + git_signature_free(sig); + + /* Let's go to a known state of the src commit with the file named 'dir' */ + cl_git_pass(git_object_lookup(&commit, repo, &src_id, GIT_OBJ_COMMIT)); + cl_git_pass(git_reset(repo, commit, GIT_RESET_HARD, NULL)); + git_object_free(commit); + + /* And now we move over to the commit with the directory named 'dir' */ + cl_git_pass(git_object_lookup(&commit, repo, &tgt_id, GIT_OBJ_COMMIT)); + cl_git_pass(git_reset(repo, commit, GIT_RESET_HARD, NULL)); + git_object_free(commit); +} diff --git a/vendor/libgit2/tests/resources/blametest.git/objects/37/681a80ca21064efd5c3bf2ef41eb3d05a1428b b/vendor/libgit2/tests/resources/blametest.git/objects/37/681a80ca21064efd5c3bf2ef41eb3d05a1428b new file mode 100644 index 0000000000000000000000000000000000000000..a6ca0fb71bc4e4628b259c54724aefb548e19f20 GIT binary patch literal 106 zcmV-w0G0oE0V^p=O;s>7Fk&z?FfcPQQApG)sVHIK*|p_L{584Ig(oxX=g-+tCG;@F z1F9eitl+)TeP7jy&XdhWk9!9GG`iWToN^JWAfq%r6|5#ITu*OGQ+&wI5b;;17Ia=s MIJ)#D0Ko1mZLd!-CIA2c literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/blametest.git/objects/4e/ecfea484f8005d101e547f6bfb07c99e2b114e b/vendor/libgit2/tests/resources/blametest.git/objects/4e/ecfea484f8005d101e547f6bfb07c99e2b114e new file mode 100644 index 0000000000000000000000000000000000000000..79e0ada916ce5490fbde3d8007cf2b9dc2483c7b GIT binary patch literal 163 zcmV;U09^lg0gcZ~3c@fDfMM4;MRr{XlF4%lB7)#r@C1`&LQCm`G~QoO58wel`2V!d z^Vp<@{?ID3G{GYfsze%;w_LJICKk=b0!NdTBd{8y*r@W-WK1DBN;*LE=r8w`vFfo40Hcy7m3*$}=mr8YUcQU}R?FkuVr#U<5*a K0)x|A=6C=U8&RYH literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/blametest.git/objects/66/53ff42313eb5c82806f145391b18a9699800c7 b/vendor/libgit2/tests/resources/blametest.git/objects/66/53ff42313eb5c82806f145391b18a9699800c7 new file mode 100644 index 0000000000000000000000000000000000000000..1f1140931319f17adda09ce614c93aca093ec200 GIT binary patch literal 160 zcmV;R0AK%j0hP~93c@fDKw;N8MRr{Xl9^7L1VjWEZUs*;NhVlIe@Nr~1wDZWc<{Zn z&hywbLO8T4qB(~YNjPDj3l^~gI1qZr);knNhEjY)wQ-fDX%b0Am^>A4jLl#`EV(ko z5{*kC2u1)B#qai7tA22+W194{$+*0@=BCfve%+@1G|m?dM83Dy1L>myV^sS3n*3j? O+i$JAcj^PtVntJpk4Ve_ literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/blametest.git/objects/ad/9cb4eac23df2fe5e1264287a5872ea2a1ff8b2 b/vendor/libgit2/tests/resources/blametest.git/objects/ad/9cb4eac23df2fe5e1264287a5872ea2a1ff8b2 new file mode 100644 index 0000000000000000000000000000000000000000..077e658643b8f7d336e451489a3471e959f84683 GIT binary patch literal 106 zcmV-w0G0oE0V^p=O;s>7Fk&z?FfcPQQApG)sVHIK*|p_L{584Ig(oxX=g-+tCG;@F z1F9eitl+)TeP7jy&XdhWk9!9GG`iWToN^JWAfq%r6|Cmo{KxS#*&fdH;M1& literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/blametest.git/refs/heads/master b/vendor/libgit2/tests/resources/blametest.git/refs/heads/master index b763025d8..d1bc4ca6b 100644 --- a/vendor/libgit2/tests/resources/blametest.git/refs/heads/master +++ b/vendor/libgit2/tests/resources/blametest.git/refs/heads/master @@ -1 +1 @@ -bc7c5ac2bafe828a68e9d1d460343718d6fbe136 +6653ff42313eb5c82806f145391b18a9699800c7 diff --git a/vendor/libgit2/tests/resources/diff_format_email/.gitted/index b/vendor/libgit2/tests/resources/diff_format_email/.gitted/index index f73027e565387ebbe041eab863c6cce17c04085c..d94f87de830619993545c15c09363479043f1d9c 100644 GIT binary patch delta 222 zcmZo*TF7MJ;u+-3z`(!+#LS^82OT)v#q41;1H(T?h6eE`3=EBLfzmHPc%p%h3QQhG zL)AS6s#^kA*Pv1x7UC%*{ozgpnC@0)g{pgotPW_eYB6W3iR+sW7MCC2op&|vcFtDE zCA%0n(=u~XjrB?@N*F?dTwQ_cBpHkq47jfTPcQRn`mVXrMs2~=vT)uG-)ZfJIakiP VoZfL{_Pq~(g)TTLO|xf=002wANY?-W delta 189 zcmZ3;)WBrm;u+-3z`(!+#LU4SkugA;0Y)7k2CH-1tpHTF1g@?@B?gB&MPzkAbL3~~R&X79#r10M&PyxGp6&ksv0BH4fio>L hC)HT5q@sjjCbK1To7|RzlX5z99et-tKipgw3jp#`G1UM7 diff --git a/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/62/7e7e12d87e07a83fad5b6bfa25e86ead4a5270 b/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/62/7e7e12d87e07a83fad5b6bfa25e86ead4a5270 new file mode 100644 index 000000000..269a5bcf4 --- /dev/null +++ b/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/62/7e7e12d87e07a83fad5b6bfa25e86ead4a5270 @@ -0,0 +1 @@ +x•MNÃ0…Yû³GŠ’ر] !8@%$NàŸqb5±#{Jéíq+`ÁŽõèûÞ›çò¶E!¦*ˆà§¤RR8=5ìÀÝ(M˜”œTïµþ µb»)˜´âº—A†Q¡äÚÞŽ…¤E3Ú`Ü Wœ™3-¹À›¡Ý Þ cZLñO{}ÙOµ‹Û3 Bh.µPx쇾gîÞðÿ$;fÃ\Ntkz‰´À†µšÙßc⊼£O{³ï˜|L3Hx5&ìàhN´Äú]ëG5oxY ÁšÓܺRÂÚL¸˜ØÞ¾‡7ÑÍSn½G15þjlö׎±×µ~ó1ÜÓÛÖf.f_*´ÕåÖó w¹t´6è T¡–; \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/73/09653445ecf038d3e3dd9ed55edb6cb541a4ba b/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/73/09653445ecf038d3e3dd9ed55edb6cb541a4ba new file mode 100644 index 0000000000000000000000000000000000000000..ba9c5fa577c6b40c213f96f53b4f253d2d919394 GIT binary patch literal 28 jcmb7v}7^;7QRxSqar2Nv% zoSaO!t8lt&Dyn&mZAYG+S^OsJfk@va!=FXr_j?TG7~>f@(~A5GG{O}FfcPQQAjKi J1OUKwTBN=BVB7!z literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/00/7f1ee2af8e5d99906867c4237510e1790a89b8 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/00/7f1ee2af8e5d99906867c4237510e1790a89b8 new file mode 100644 index 000000000..d9399d71c --- /dev/null +++ b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/00/7f1ee2af8e5d99906867c4237510e1790a89b8 @@ -0,0 +1,3 @@ +x¥NI +1ô<¯ÈF²tgA05AV|0V^p=O;s>5GG{O}FfcPQQAjKNcK?DVcI~22@p9YGMvp&D4qwehTf=^DNYqjI@`Ot#YvJ KJq`f;l3aIJ+G3Re literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/05/c6a04ac101ab1a9836a95d5ec8d16b6f6304fd b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/05/c6a04ac101ab1a9836a95d5ec8d16b6f6304fd new file mode 100644 index 0000000000000000000000000000000000000000..c6a3a3b8def22521b0be327923d3bb028613e4e4 GIT binary patch literal 208 zcmV;>05AV|0V^p=O;s>5GG{O}FfcPQQAjKdv{d K)&Ky^dR($J31Z&> literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/06/db153c36829fc656e05cdf5a3bf7183f3c10aa b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/06/db153c36829fc656e05cdf5a3bf7183f3c10aa new file mode 100644 index 000000000..85887e0f5 --- /dev/null +++ b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/06/db153c36829fc656e05cdf5a3bf7183f3c10aa @@ -0,0 +1,2 @@ +x%P»nÃ@ ë|_ÁH‚ŠN™Š.}%)Q¶eû€óÉ8É1ò÷Õ9›@R$¥&Iƒ—×ç§÷ßãߧ¯Ë÷!„w6pFÃ,KîÒ£*ÊHL s¿ß¯¤#¢¡Ý0ÊÝ+3î²”0‹í0/`#Cib'‡Â]äl +RôR°q£o©,ók´ñ¹>ü\ŽŸçóµvXɸìP£zIIÖM6iY],ÜW®z’p²Bîë¡zûPdF4òVÊåæ½ .¨·xÂV!‹y©“®~9˜Ö€¦0uõÌho°U`Ô$Þë,’µ_Rí:-êa2¡%Sw^cJ ®…>fFŸèæO‚ùvý×;„+‹Ÿ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/07/10c3c796e0704361472ecb904413fca0107a25 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/07/10c3c796e0704361472ecb904413fca0107a25 new file mode 100644 index 0000000000000000000000000000000000000000..9f48594b5e9dd2d86998975017e8b841120dcc46 GIT binary patch literal 208 zcmV;>05AV|0V^p=O;s>5GG{O}FfcPQQAjKNcK?DVcI~22@p9YGMvp&6G05AV|0V^p=O;s>5GG{O}FfcPQQAjK9+jN$ zO%DLOR++W2fmr~9up}2^BE;EY8b=2(r$nAcM=`1=R(>=s*0GHgVqbY79#}-sM+Sn) z4Pd}HV6h6fwv?(b>4i1v>r(Ps9{R{V{irj4i=R7C$tP_AyoYJ_M(;bvsGjz-jsL_b PT>E>xZL4|%(vDH^g)m9w literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/0e/8126647ec607f0a14122cec4b15315d790c8ff b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/0e/8126647ec607f0a14122cec4b15315d790c8ff new file mode 100644 index 0000000000000000000000000000000000000000..c99a6865c2694d0e01ab408d95c2303c75596416 GIT binary patch literal 208 zcmV;>05AV|0V^p=O;s>5GG{O}FfcPQQAjK*bF-)ZbitUz~A8-NutKB~y;hfT}7>P0RtSS-v4HxGwv-z^wgG{!ialdgVd+ KEd>DYnqMw)Z)Roy literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/0f/a6ead2731b9d138afe38c336c9727ea05027a7 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/0f/a6ead2731b9d138afe38c336c9727ea05027a7 new file mode 100644 index 000000000..b06362dd8 --- /dev/null +++ b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/0f/a6ead2731b9d138afe38c336c9727ea05027a7 @@ -0,0 +1 @@ +x¥»JAEç+*Ûh¥k«ú"ÂbhæTwÕ8Ì´´-ûûŽ¯\0»/ÜÚÖõ2€<ÝŒnŒKIÊÎò\9¹Dµº`5TdÏ©Ä4½J·m€› ³I)ꈼ"-鄱晴ˆOú»'„3–YÉG ŠJAXSd#´(NPx’÷±´z•®ð¼´õ­mpg{ú©ì«øq·µ­÷€Ì>eÌ9ÁѱsÓžîç†ý3=Y1ø¦Áá¯pÙFƒÒe«ËùˆÓ2Õoz \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/12/4d4fe29d3433fdaa2f0f455d226f2c79d89cf3 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/12/4d4fe29d3433fdaa2f0f455d226f2c79d89cf3 new file mode 100644 index 0000000000000000000000000000000000000000..f0ea020fb001f27b4f65ca32006f9280676ad0e1 GIT binary patch literal 208 zcmV;>05AV|0V^p=O;s>5GG{O}FfcPQQAjKv0G{d^~5I z7I;MXskJ>b=jK#CR`l%o>z7Zy?6x;_w|_XSjd`;yy4r0&n8U+8UEkjCX-kLwJ>@Pj z)8lAU7K$xRHgj5?w_|WI2-RaI>87mz24v6(RP^J8KwOs)mR*$6uMhLRHo4DDm-=zJ087$Z!@b+qZ-_eBAKQvlgko}U&O z1v(laZ9OOgZ<;AU80A$&1g4q&sR*T|d^`$OjCci_ShFNKS+LEW6N5o{OaP;`wrNOW z&s292_B1ruB%bGu`jnOi^KM(lX4?W`EJ5mQSJ&aOj=FlN|}f<^bUuE|c=famI(PEej}x^9jBDKdgJ1v~@< zt>ro+88R^g$3>?i&Ex3MB=A&np{mp;4!~$8HKra@yp4pds6P_Xh1V0CCEy(MB*R~bm_Q0DrJM0F^qlsT?Z^~Sjz08H6$D*;luKjRmHj@k z6(-lg;${S$d`rm*Lx%RT)H`3m^f9*7;5gb$?$?C?#HoO6YtNqwMgd0yrJaXG=uI01 zfKgusA~bF6#{x=Ax$lK)wi%vR)71JD%X%jG6WLGR8b4^WeP@g+`?2LXCjBrgMX3SdZxXG9dS(%~Z#;KtB zu{bmdyq398D$U3N8qKP~G)rnd@>5<&8}4`X5EF8128(&1EiN?Kt<009HvR_Zu1=g^D_t1WDRayobo6It5Zuwb?oYP83U`9SO{JP?Q6U$TCA0F*VC^zbG5Bpqhk#Z#F~8I==~LNlF6$@t$me|db>MGGVSkT;MBOoNrj^%~6Yxstxo^mZp7Iv;f>@s$ z+FYKFlXO5E@vh^#(X$OS+2u^0K`m1oohQj`d*}B$HN}$TOftI#7fkFrD_{mjyHe#q z>rEBrEy?79F8|3Eod1VaRu#?o7)DNK%64Xo7zYmhV+BHoj=D4sL;XJ{w!-8FNZgG8 z$@i3;FlZ=_rP29n%ot-&9j*gralZ}+Ku!r{+j@RqZ4~%uz;y7C2)=2j0Ao~FH4&V4 z_H#8#M|m8DT1H5LHr7NWCkwTCa$>M3mjp68Yx|xgE==7N5l>I6P2zb!YfkC-C9$l? zl-iwohB%hSNOnnMIN%kj-p5I;joO6bG}OhAT_`S$gf`Wwf)lT^lNF;eVr%WeHFY=< zN=ED$IDEhQn(T%HWUi^{2Gx0@%V6}Q+6dJYP*@ag;4Y&XvN40l&8KS3TX6shywzT) zE8WZi9L=V|bS3p3`Kez>8|qK=7!z{qCW}7M9t$mYuYI!A$KUWdxs}0qu{nxyp`pPg zL6UY>?bm9+Gc+Ygqh6wMum-+Nyug{71`WLZ)$f9tpym45Hf=EO?sYYEqGVeAl^G76 z=!gDaY=0&01cSR$HA_(ot-gxerXqN+roGj_zMDjI UDBY|+At``qBPE~AAEX6|z4XmEIRF3v literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/1c/1bdb80c04233d1a9b9755913ee233987be6175 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/1c/1bdb80c04233d1a9b9755913ee233987be6175 new file mode 100644 index 0000000000000000000000000000000000000000..a2146496decf282eba468c692c6f7e10bf64d1c0 GIT binary patch literal 208 zcmV;>05AV|0V^p=O;s>5GG{O}FfcPQQAjKTiU*U#^-LkMR!aGYktDm4!Z8PN+BWhADIj(I$tHqsf<(C--K0g3Jn zh#7aOC9GmctaS%$W+*M} zHA+gd?XtB<&#D+=;oi7$&6DgIS1aVc9uS(h4@K%UgP@Ub{IF6kH}7R|LA%8h_6k|d zOHEj$aP!N-gtP^8g=uJKMtg^C0;4YRNmr4qV@<8=Qq{v`K~JXcyv3A2!vG3n%#1P7 S&7TDG?e-h5cL@L5MT~_s`-Tqy literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/21/950d5e4e4d1a871b4dfcf72ecb6b9c162c434e b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/21/950d5e4e4d1a871b4dfcf72ecb6b9c162c434e new file mode 100644 index 0000000000000000000000000000000000000000..a87732611a38ea041d580d75e7e8b5a865babf96 GIT binary patch literal 670 zcmV;P0%84l0Zo*_Zrd;rM0@5}><738f&#txBtjIaa;d87*LRk( z+ukgRT+X~1y7IB2hlfv}KYTwOztZdZ?XoxK@^+=C=j)k{bU9z?`sL+xqHk} z)CFRF-qGT6zr9J@Xd~X$EV{z84b9_Ib1Zev7cgCn4b@nVF{Asn5r8-qkZtApW5FokXrQ$9un4_r zr2sJMt3ZUNmHkja=~nJKp^9yW=Y=&9$;rZP?wuGMl;;F7y4N-hNgSE#J|domCY!|b zdeEHG_DSMAA!VvoY8d8Nc1E&Gig6pSlgfI$DS#Ez6p?8iLv~?yp(AiFyJo!cy0^Dt zG)A0SdT>h}B*L5#J2q_GZ(NgI@B*1@YI=hD+|yHQ^r2vcYYH)=YpLZrqZzU=L&u#{ zLGxpF7!r6Xy-+IkzyTV~qQTU2YCQ5&UPv46_w*POa;tlbKF}Ix8tq#8WT}b2!8y5! zp?I`8ig95_txJL=?V#Ro)c`XzCCE-$qH#b2E05AV|0V^p=O;s>5GG{O}FfcPQQAjKg)K0v6%kS0w9qzZ~QX{-|)@a!g+#;RjyK8Fy*hv#=r z3%r2vQ)~O~e*c`kk9&G?adr9Z^LBGf54%tID`Q?Qi>|kucjkV~QX^5F}mze2k zv?&Y4mL{7yRrGlMal576-OcXqf!=<4q=yfi+uMp_VDn>H)N?v;Lv`%?7|4d2CC4QH zIbj(bgNs3^1}N#R_sfLW%QE*Ed~^4>qYd5f9{+~*U!C48i>$rki_4crh8ROTdZoJe zwm#Cp!@vnzjG^JC0*{9B6!n5wpDUVN?v|ajATZ(`xatkhHc)5#HGVrC*M$V!hoTDEFGLL!W?3Rt+~sf=Wo)P|+Kb}IL=QzEZ2A@mh8 z8?pLUkWG?N-rkE!wSPxXS^V85dGF~PUG zv&aL@airePB~O-`_#HYYH!u+QHb*foRMfg8aMB)?`zadG3`q%6sg_6_q=7CS_fV#| zK`l?e_`6^_a5;S_CQUHz&Sf-sB4ir5BwmAWJg2Gv$ntoIu3(4YHd1s)u x20ZmiOuG26OW$mw+4+s@3SfH*d1k#m|T6BTCc9KbA#j%6OCWNo&jMDVGs)~06qwj`R)7qM_6GAf&{vQ)tVR8c~?nW@l_mrG4 zVCWo6qw`gmF~*)clw-`|ejN$`oC3(U_58ZZDA3UW>EJ;Tc+*Y+!YHpQA~5aj=PH!8 z@;C~$43h$Ftd2-d7Hsq6#9&b_31GC>_B}~ln7S##o}N~l#PfbupVIM5Vp%B$YIo`x zrf(;4BOFg z=ziBV*$ofyTwT)*%JW1|gVB#FBUn>FU=g%|yNqPW#ta+}ovJiHio=k=Tg`>4(#;%z z(QIl=S5oicpXvp-!Tv;_VuEkoWRVBjW1+?FHBXlM_!~MWw=xhfHb*foG&Hy*aMI4o z{T>ZyhNJ{(R7)fd(m~`6+lS~pTjvYJ>A^dv2aa!Qk z*z@>aZslV|4-X$dz59MTexaB1>t%1u<@HKWU$196(&c=m>*wdwiN3uapRX@;ex$eK z_4K@>+$Uy=!Nnj{&zVBZlw%|rt@k_Ju#qXo(9WJ>OO?0vKod_BCz|3M8g6!ELqmCq zS|HZv9W5^R+ezA181b%V(F)HtP;bWrer0l*s^~mPX4^Qwmaaa|Ne(1~8&P0lU0VS{ zAX*hN2buuYg&eitlJqX<=$~wX`Twzss!TIJhK|#LvK>Ge?U+OVPyx`!qb!YWTkgBW zR+wB1imMS!@(m>?3>Z4cQs;aTri-zm8s!)>x?h_D0H*-5tvr7yG75AwK-zjx1m3h# zfH2CdhzLw8`=JP>t=x4&726EX3#%iNlLgz{J26<4=L9g?Ynz57j!bnQVNXMoP2zby zs84CTk~mNBl&X~)2050Uk?fMnxQ*9Ir5-0mV3lc#@U)I0yD+=ZAs~Q(t{Ep@dwVNJ zZN%1+gPZG6BFq`KqhZtirfaeb4&b@ErW=&!o}OBxA4Nv6E@4E_TCOvaAqz8b+;u9_ z{Fohv1YSxmRF!(*0E}i)W9m6I9{#Cba2xFR^cWL-t9y$)&>CkN?OO6=sfoX#b8-^{ z@n~}tK^~{ZW0Y)t_Rf#PGOiPQZoKSt_YbPS`g{_yh4edM@68|Lp^zqDFGSh^ literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/3a/3f5a6ec1c968d1d2d5d20dee0d161a4351f279 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/3a/3f5a6ec1c968d1d2d5d20dee0d161a4351f279 new file mode 100644 index 000000000..f39a1271f --- /dev/null +++ b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/3a/3f5a6ec1c968d1d2d5d20dee0d161a4351f279 @@ -0,0 +1 @@ +x¥OÛ !ô›*h@³àÂBbŒ?× ðXr&Þaµ}ÑØóÈLfR]–K—qÓ³°Q{— Ž€ `OzãÉšètɤµ¸…Æk—”(gØ“+*+—ÀX[F8뉬>¹ŒE„GŸk“S~…–åy®Ë½®òÀCý Û¥º¥B4Æ€³NnÄPÇØÎÖˆ)ËOWñ¯N: \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/3b/919b6e8a575b4779c8243ebea3e3beb436e88f b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/3b/919b6e8a575b4779c8243ebea3e3beb436e88f new file mode 100644 index 0000000000000000000000000000000000000000..c85731d6bddd857db09da0d014be4038dfe35be3 GIT binary patch literal 208 zcmV;>05AV|0V^p=O;s>5GG{O}FfcPQQAjKTj;SFV484ZsWk8T$lY^VAlR8|EF&&z4D;^ KmI44rFkeE4X<!?*!?#? z_;cH~%K&1!8C?~Sa}e~BEm}!d;zB_p7uLKK8&ar&(AQ#KrRzRmsl=5qRmI4bY7Dt9 zBED2y$cvKKNJ;c}PePR?Xtp_qNi42#aadGw;;ndMTisnW@;27i;jz3+FYvs!?b>!Y z=}bS>S-*-OcbnUG57v8TwhjXv(Ic9f&T~Wmi7`*wUlhJ+aQN$m16=meAa&XE`fzmS I18dK3v%N-Vt^fc4 literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/41/71bb8d40e9fc830d79b757dc06ec6c14548b78 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/41/71bb8d40e9fc830d79b757dc06ec6c14548b78 new file mode 100644 index 0000000000000000000000000000000000000000..5dc102d358917edae09f34364facca556412efae GIT binary patch literal 207 zcmV;=05Jb}0V^p=O;s>5GG{O}FfcPQQAjKKV#Ms+PV JoB-JMTjB{mWX1ph literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/42/1b392106e079df6d412babd5636697938269ec b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/42/1b392106e079df6d412babd5636697938269ec new file mode 100644 index 000000000..3a8324c1b --- /dev/null +++ b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/42/1b392106e079df6d412babd5636697938269ec @@ -0,0 +1,2 @@ +x¥Q +Â0DýÎ)re7ÉDüé ¼@“Ý¥‚m¤F½¾U¼3o`˜)uš.ÍzÄM[D¬Š‚Ó½,˜‚PH^‚w*)c&Îæ6,27›JÊJAºDêØQ£&ðìKN)ÆÜbT3<ÚXÛókXØžÇ:Ýël²Ò:É7ø¹]©ÓÑ:Ä¢‹v `VºŽmògéy½ü”ájÞ=ïO“ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/42/44d13e2bbc38510320443bbb003f3967d12436 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/42/44d13e2bbc38510320443bbb003f3967d12436 new file mode 100644 index 0000000000000000000000000000000000000000..a19b1912041308d6bd7c6d11d312053712c29500 GIT binary patch literal 207 zcmV;=05Jb}0V^p=O;s>5GG{O}FfcPQQAjK05AV|0V^p=O;s>5GG{O}FfcPQQAjKþ~WöŠ€EŒNéYZGj¡ +“RSÓÀj2¾Ièû´^ž'Ìy³¦Î51ìΆi05ù¥™99™`eÞ5a Ýz%õ潎’½Ç×ÐÊU–^”XV VtäÙ™Åo²ˆô]2üY~¿ÇPŽ1ª(¿²¸$µbãzùãõ7×Þg\Q·ñdLÉ”£3 ªÊRsÀjü/]3ßû”©VLõë›lgž{ÄW[ÿ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/43/5424798e5e1b21dd4588d1c291ba4eb179a838 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/43/5424798e5e1b21dd4588d1c291ba4eb179a838 new file mode 100644 index 0000000000000000000000000000000000000000..58ab2391707739b6ce0fe4b0c7c9f33400b20ee7 GIT binary patch literal 208 zcmV;>05AV|0V^p=O;s>5GG{O}FfcPQQAjKX{GYz9^vZ+s KTM7VwgIs}8-eWre literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/43/6ea75c99f527e4b42fddb46abedf7726eb719d b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/43/6ea75c99f527e4b42fddb46abedf7726eb719d new file mode 100644 index 000000000..e8825d867 --- /dev/null +++ b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/43/6ea75c99f527e4b42fddb46abedf7726eb719d @@ -0,0 +1,2 @@ +x¥ŽKj1D³Ö)t‡n©õc¼™ev¾@»ÕÃÌbFf,“ëG ¹¡U¯ (iÛ¶vë}ôCÕ‚ft1RR‰f`$tNTèŽÁc¨©€äy6>tï–]‡R€ÙÇ!Þ=@̱Tä\ +Ç”½áW_Úa§úÍGµ·¥m϶۳úë®úWü§OiÛÅ"QÈ%ø”ì À :Îv}sÆ|µºÎ«p_Ç…¡éäÌ7QA \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/48/3065df53c0f4a02cdc6b2910b05d388fc17ffb b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/48/3065df53c0f4a02cdc6b2910b05d388fc17ffb new file mode 100644 index 0000000000000000000000000000000000000000..298251b3c681d267273687ff05e384797aa3c050 GIT binary patch literal 165 zcmV;W09yZe0i};k4#FT1gvzPwlJ zvRs>X5O!@9(J**$fRV(D&CW7|Ct_P%v^jxfi!sqa>Yi4)HH`)HL|!7&WZ6D%8Onl|EL(9jB2A{ZB9%z(Q zDp~`0c9}Zy!LU4TnP`R_a2j)I$sDeGffp+4!3AhA43rTJ zWFou6(+HCX3{H(@VP2uCCwfgfFK{R0k?|pZ5Tn=5VX^q(kEe+?4x#DTDaRH8q9={` zWw}8EEsSAvd9G9{tKCHm=?0zGU48B3V`RP-+bXJ(v;jb>SGxw2^@RZPNXkU^> z6Gz{R_OmI(24P;kl#I&RsBV>}TARmX?7g^Q>{EiS6pz508ZlJQ-6Vs%~M z*Ma+pM6e6PV2lD}J@`D|vUsK*C(2mlkIO%jE^wf>mCH&U9&2BqrrV&ut0!AnSYv1%RxAJj literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/4d/fc1be85a9d6c9898152444d32b238b4aecf8cc b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/4d/fc1be85a9d6c9898152444d32b238b4aecf8cc new file mode 100644 index 0000000000000000000000000000000000000000..9db684d40b16434bca775fe6138b14567c1a4a89 GIT binary patch literal 168 zcmV;Z09XHb0i{k`3IZV%?b}t{4NR!xYak+sKKp9}SG_WRIEEQ*KZ|w{95^pHoKQ>2 z9i&#f-iQFBAmlR05LD7Sh?tVI-f`s4NN&*1&S~=Oj*Yes0o4)(I&Xw9DUnAhjj?{P z(FwIQW5J?l`0Q(KaEUK$5pHWOkGjEuM*2}F`W8R8549XYD5c$^=4FA2E6&+S$JtJQ W&ai8ZIpu&oj|&6mNw7CPgj3meM@@$S literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/4e/21d2d63357bde5027d1625f5ec6b430cdeb143 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/4e/21d2d63357bde5027d1625f5ec6b430cdeb143 new file mode 100644 index 0000000000000000000000000000000000000000..34f183dd17d3105fc11c39606b2e10b2924c3024 GIT binary patch literal 662 zcmV;H0%`qt0Zo)abJH*og*oe2EccL^a^R9v4(ZSthJ-eyXW3rc8q1Q=${6$Oc`GNt zt&yeGd*6F%kLet8AD4_Hxcb!nhHpBD6nuz3N;Wqb93@*xZf*3t(n}#HgOm!a-PeYSU;(0x2 zPHFojah{MVRVy_Nb1XX}*(Jrejn_$KKUNB0#WY1^TE~!Gm|f@y+{>vMD_+m`R*c4o zTT2gase?qAGh)Yqjr)yjvI`cFxu&K!sLwq;wMKswjBrgMW^^sJTxT>x7G~(Ub1Gh&ahNcABDN8gCXuzfC5oAgl)bjGzzYC^^mjyW{ybf(J_O9h> z_(aLH`V%t5GG{O}FfcPQQAjKg*oR}_y-IlIB-C7+5<={A$BEp;heVaG-?`m~s}LV~uvbi@u*}<#pvutJE~`a3Y@uDx25^^|7323uQV^ z^3mF93_Z7rk$s}cFBghjC=}`>MAE{32yt&!lhmvi(m5=+;H2-pLKzh8CY2MdkQh=C ztM{Z+NH+W@duaZ@t*L6=T$FU>e4*lJCP6v+&_7iWbogjPWgOf8Yi6%ZVT8rqDLTc0 za!`g0>*MJfVgqv(8K}o~v{}Nhg8;;tfa1HzZyQDhM+c>2ghlAhJ0*ZIUkxHO?HuO@ z%1ZfqRq7ZaCEC~$(ULvfmMN&ipi(o$SgjuhQdyY#Nf6IKtIryFzgSNB_@z=;WJ=vm z1H&Ba$!Q7MFdpr#Q@f9o2G}sIf=qi!C8QeCmB77KRh&etoxD1W5mVb9+)@XLR10E9 z!NL8;HTw+*$lOx13Fh-m_oK6qh7qnQNx`n=k^6$p(2W^7UO6>1FEyY^;;rq4QR!z+ z(C9V`rmuO3$j^8oZMZ+vXUWK|pFH+~cB!=Zz3r2yL4JdC4l6_P;)|#Y=|p45iX{DP z-fyb`X4sUZCu50?0~&CdcmbJ~293P^^&gU(;N|w%Hrrs_-P>sR#FE+SugoBLrXTiy z@xx7cP!#Sa)h*S8941?4?VZ8eu}_lXex|#GR(Rj9Z0%LNPO6Ic>blqUZ|^44oN7NC RCnSYtwvk%S?hhNSg)?_+K#TwY literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/50/e4facaafb746cfed89287206274193c1417288 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/50/e4facaafb746cfed89287206274193c1417288 new file mode 100644 index 000000000..b1eaee557 --- /dev/null +++ b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/50/e4facaafb746cfed89287206274193c1417288 @@ -0,0 +1,2 @@ +x+)JMU022g040031QH,.H,JL/-Ö+©(aø¿9/Ð>þ~WöŠ€EŒNéYZGj¡ +“RSÓÀj2¾Ièû´^ž'Ìy³¦Î51ìΆi05ù¥™99™`eÞ5a Ýz%õ潎’½Ç×ÐÊU–^”XV VtäÙ™Åo²ˆô]2üY~¿ÇPŽ1ª(¿²¸$µbãzùãõ7×Þg\Q·ñdLÉ”£3 ªÊRsÀjD-89S^75#¯Å-ð×¢ÿ3Ô;ªÊ\¥ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/53/9bd011c4822c560c1d17cab095006b7a10f707 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/53/9bd011c4822c560c1d17cab095006b7a10f707 new file mode 100644 index 0000000000000000000000000000000000000000..3fa1e1f9458515e943efedf0aaa0bd442f2f8f0a GIT binary patch literal 163 zcmV;U09^lg0i};k3c@fDgm7XuWuD^;O_mv<9oSI z)1_IDxM_>3W%BI2Q|{v6TnI=Kg~ex~sM+@gV(Ett%#9bFnZsr1=XSYH2kQ_&04er%3kYD=bcJpD R=ZrbYdikk*HE-92PWSkwP(uI! literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/56/07a8c4601a737daadd1f470bde3142aff57026 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/56/07a8c4601a737daadd1f470bde3142aff57026 new file mode 100644 index 000000000..bf3639d05 --- /dev/null +++ b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/56/07a8c4601a737daadd1f470bde3142aff57026 @@ -0,0 +1 @@ +x¥MJ1„]Ï)ú#éÎ?<Ä‹·pç:Žó3‘¼ˆ×w=Ô¦ê£((éû~›`Mx˜CrB‰Y‹MSµ‰P£-}®âðtŽjè–zL`ÎJÁRv­R §jåBV8‰Ze&þõƒ6‹Õz¶ÍsTr͵̽2š±©.ü9·>à¥~ñ¨ð¶õýÞ¸èIÜó~“Ñï½ÍGéû s1GŠ!Áj¼1ËIÏcSÿ1±¼êxW(ƒÙàºÜŽÙóuÅå#rbV \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/5a/ba269b3be41fc8db38068d3948c8af543fe609 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/5a/ba269b3be41fc8db38068d3948c8af543fe609 new file mode 100644 index 0000000000000000000000000000000000000000..85bc8f569e855cbf01f67de58f490d51f7e8b5f8 GIT binary patch literal 208 zcmV;>05AV|0V^p=O;s>5GG{O}FfcPQQAjKP}<4`%GqoWfxRYer0h< zY7xZ7_43CZ>Tj;SFV484ZsWk8T$lY^VAlR8|EF&&z4D;^ KmI45u^05AV|0V^p=O;s>5GG{O}FfcPQQAjK-wLp;;n{f K7XkpfJzPUFfMJ;c literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/5e/8747f5200fac0f945a07daf6163ca9cb1a8da9 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/5e/8747f5200fac0f945a07daf6163ca9cb1a8da9 new file mode 100644 index 0000000000000000000000000000000000000000..fa1c9e5dc44270905b8af66ec3cf6e38bbcb0a1f GIT binary patch literal 672 zcmV;R0$=@j0acVwkJB&^#X0*^4EIoJLE_R=4@J8Y+Ah0Y_EF)01=Xc+ahp+TFAo z@=c>7)Irl)p&vV%A=9|zrCw7UjFZ+sS=;KrwxX(ZQ`Wnl!=92JnLNtThyJO8pv_0Q z)OTIk?*r?|WI9+}RYWJ-QZSJrL;7gyjV)k$?^|kc9Bn4^Ya;-0A|UD7@`r*kf}?`c z&cY(}hLs$^h_3<>npU=B0VSo}_mOJW37!|Wa2He1aGM4b6)s9SK#bJtwx#GNre^Sn zr=?kkXnEaBPGQ@MKF>&+>XllCIgXWz$ppc;wULB5ALhLBmxL>&jyEOKNh1_}tM$r{tqxgllp>Vb(&&O~Pcv zg&8_-oC=yB*`SHzrObs;X-0O?s1^yP$)UB#Pk141xZlwiACOx!Xv_nxKGUSvGEbUX z{~MfxnHh>FoqSZrRn(afk)$5Q`*k$H43pwwB`h(>Km#rVPasp$ppKWn{*6-uye!Bu z;C09ZjxZRW^-m9u_<6quQpwZ=K6i!GA&152D!hgs4{^3OyHH`E_T0z1w1#Up-z4`;| Ggp305AV|0V^p=O;s>5GG{O}FfcPQQAjKsMr4E8`L(}{dV`nm Ki30$}rCe1lgkm%R literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/63/e8773becdea9c3699c95a5740be5baa8be8d69 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/63/e8773becdea9c3699c95a5740be5baa8be8d69 new file mode 100644 index 0000000000000000000000000000000000000000..6d5c320fe3eafb23ef1b8056324cabfef9ee5260 GIT binary patch literal 207 zcmV;=05Jb}0V^p=O;s>5GG{O}FfcPQQAjKOO?0vKod_BCz|3M8g6!ELqmCq zxK)oFg_$!mkR7K}WGTX-awVdkXoa8_Py%U3r@|++>&)TLTi6c|pN5s?6WRrMa z51LcjK1rM>q)gRH4Z|GE&PaAiF>d2^QrVA{0$4Fk5t-I8WEW-^Is*4{YQ~D!v%M9g zG2+(JgKO#_5$258abV+q<(lk*1!S(N=?&_0PY^Q-~Q|OD)$K&5(r|I&Pc_ znjf>nkibjng;J>p4$x>84W^z`3Ia1k_NTB{PpjG>EUHTjtQ?r8;rec zxf(uEGOhl^41#-l*YBfkuEL$*;Hpy1IIED&WXY_&Gg#aD6oX&)bPO0}Q@*j)S8=;( y7Q9ze-RfW7O`;*p^`M-P6ozRdCF6g`1trr(3nN{hSC9xyiE9x0X#N1NX^iCWjYJFp literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/68/a2e1ee61a23a4728fe6b35580fbbbf729df370 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/68/a2e1ee61a23a4728fe6b35580fbbbf729df370 new file mode 100644 index 0000000000000000000000000000000000000000..6d7c948c9dd91c54e87877ae3982a8b1a9415fea GIT binary patch literal 665 zcmV;K0%rYq0Zo)abJH*og*oe2EccL^a^R9v4(YTrOjFvFo@IM&Yb;AfD`U*B=dGLo zw^-7y-uvDvm5&wO-F^P@;rr?Mm0r(p&wFE@-!Am{bUD+Jp3fJ$JiMGv^zH5Va(Sim zJ-r_OO?0vKod_BCz|3M8g6!ELqmCq zdO)ntJ6c@sx0STDHsW2)q9;7tK)oFg_?5|Js-p8GnQi0zTB`auCpnM|Zo~l->)HyG zLD8yGInV@&F65~7mZWz!6@KpptSX{2)${g z05IySK!m21{ZK$@DR-Sv#Wut9!kUQWWZ^dVP7E%}bAlMHwM|13N2a=uh^L{+Ch@!; zG^ey}Nt`F7Ow~#a!yL=bNOnmvZtb;GIggbBSTRiznbt967iJea0{2oiW5sK2Z^dYg zxV6l|HFb~(b4Kha*tlQ0Cc9t(nQLl#gZkXlV{7!IV1#Q5F=N(J%XP+N$ifUAH%B#F7cGo*eO^H#FeR=*=%e`qr0I-=FuYHp literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/68/af1fc7407fd9addf1701a87eb1c95c7494c598 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/68/af1fc7407fd9addf1701a87eb1c95c7494c598 new file mode 100644 index 0000000000000000000000000000000000000000..6aaf79fcbfc06afb1e1f44d7b4d3b28dc0039f73 GIT binary patch literal 443 zcmV;s0Yv_I0cBD^J)#)~`ji=kUB$8BMjIypcL0h$;xRP)6!ZczhVDt&1Uz7p0H#<{OJl97U zgcwL^i5W6ZZB!^p_&s_KCn&Y+wT76b&1wP);T2CVV{KWjLBcUKIyRwQV5gK<6 z)~_RqSxxl-GK~?&j23};H_~@_E=n^{u@yQ>XL$7&gwgEO=&L0>iH;?yFt$ALrztI(nqaC8z&a>7Zp&I8pAN0WCFP$2O-q(?ym5+LeLvPrCSY~yt{$?L+G6)tk4kU%Y>M`aoYkefxZI?kit~>LRrGIFjO%(nP(;)X}h2946ur z+LbAYF6|e45M+MnQfz#Cg!Q=4 zcScoIbgOWsAqe9+zywtAm4JvTr`nO`;^Q?4rJEG{3*AXqz;l)RAP<^TiqjU1LQY#8 zWu!jvaHT9cOX*tOx+lA!9O@(b7D2)2Q&eZP)c?X6q-l}(Qc33dRH8Kk2>NQ?wqlvpHMgV+B-53jsBV)y09GA#Q*rNI9BU?-PR8n4rX8b{NiUDrkJS z#>IVIL}6sEP#W!F$k9Vhr9Eu{287ne%oiFZ_yGf?T1>7bFzwL9(DilYug92+rlY;JP3e_oWtY%)Op0?3(po5hq;V1r2sz+akEz z?=)AlD5y6_xc@uC++(7eNLWJI3%(6++bHOZXKwxdU$y}81q;%xsW4ST4JU=CT4mqHf5nW&}uWMhMvEC zyS=4{`@4txC;IgAOiy2LPN#-qU?WS6VJKd&x88OWExat8fLB7#eM2_%l-H;i#QNOO z>hidsqepG` z&~jCUc}p_7pv!-<_04~<%BrFnAH$i`k+PkbBF2G3|5$<0uA?rE!%+X96I)?&10-%n zfaH5hP8c*4$I{vPYRoyto;q9y%Qupr*V)mE(HOC{_TZ8_ zoCqZ&b`0#kUwln=#Q`$c)O3UDJkZ@>^rPAc)f7-z6m8%xqZzU?gU8jUYRzkL013R- zUZ^YG!~q=5s=;(6^&a`DUq~D35A-=EMI$Gc^qwc>Sy21v5g+<*}{WVBFp6YUo7CwE7D( z96Znu{Xg6OLfi=kH>GOkqC|F)HM9E8AZ_nc41PP%O#l?$_tjf{71vEg@Lo-Ot$%$t WiKbAxNqs_60MkZFKA1nlLWC2#0zgav literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/6e/f31d35a3f5abc1e24f4f9afa5cb2016f03fa2d b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/6e/f31d35a3f5abc1e24f4f9afa5cb2016f03fa2d new file mode 100644 index 000000000..e95a5e2db --- /dev/null +++ b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/6e/f31d35a3f5abc1e24f4f9afa5cb2016f03fa2d @@ -0,0 +1 @@ +x¥AN!]sŠ¾€¦ahcÜüx ÿ$2õúŽgpW©Eå½:zß8‡5UA-YG„ “¤ˆÎzõAƒl²+ë&LLd>óÔcW.-’&ŽÍŠ)„ÆèÄÕÂBI5Šo&­û˜p“Ÿ<Þã€g½ì½ö½ÎqŽ¶žêè/`½çÄnÛ,<"!šË^C—þ#anr]ýÖüû]ç»Bɧš_*íPV \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/71/3e438567b28543235faf265c4c5b02b437c7fd b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/71/3e438567b28543235faf265c4c5b02b437c7fd new file mode 100644 index 0000000000000000000000000000000000000000..8b1f688ca1a56193372ab7dc452b28bc4379796f GIT binary patch literal 207 zcmV;=05Jb}0V^p=O;s>5GG{O}FfcPQQAjKTj;SFV484ZsW05AV|0V^p=O;s>5GG{O}FfcPQQAjKTj;SFV484ZsWk8T$lY^VAlR8|EF&&z4D;^ KmI443F<*?<6J%rn literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/74/4df1bdf0f7bca20deb23e5a5eb8255fc237901 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/74/4df1bdf0f7bca20deb23e5a5eb8255fc237901 new file mode 100644 index 0000000000000000000000000000000000000000..c05cdad8f6c0414a80c9cedf91966abd41f0682e GIT binary patch literal 207 zcmV;=05Jb}0V^p=O;s>5GG{O}FfcPQQAjKO^aWb JodCsxT!hleVc-A& literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/75/c653822173a8e5795153ec3773dfe44bb9bb63 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/75/c653822173a8e5795153ec3773dfe44bb9bb63 new file mode 100644 index 000000000..1495f70f4 --- /dev/null +++ b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/75/c653822173a8e5795153ec3773dfe44bb9bb63 @@ -0,0 +1 @@ +x¥»J1†­÷)¦;Õ‘LfrYÄÒΘdfÝSìFbÄ×w½õ‚Ýヿ¶m»  @W£›cÂR²²³y©™œ¦¹¤´ºh5VäÀ¹¤<½H·}@ò„,‹’3N•¢°æÄFhIœ ðï^ˆ-ÆŤuDA"‘ˆ–ì1Õy!-²Nò6ÖÖáAߥ+<­m{m;ÜØ‘~ª;û*~ÜumÛ- sȳwÞÁÙ±sÓ‘ç†ý3=Z6ø¦Áé¯NpÙGƒÒe¯ëýÙOƒp< \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/78/3d6539dde96b8873c5b5da3e79cc14cd64830b b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/78/3d6539dde96b8873c5b5da3e79cc14cd64830b new file mode 100644 index 000000000..e2f34d6bb --- /dev/null +++ b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/78/3d6539dde96b8873c5b5da3e79cc14cd64830b @@ -0,0 +1,4 @@ +x¥k +Â0„ýSì*y4/DOà6Ù-ØFjÄë[Åøoæfr¦±vrÓfÈèÉ(GŽ"–I÷Aq ’\HÞ³õš‚,ìÅž éÙ¢r…1%’ÆXtÆ R +Zù‹¡„6Àgê'záBpêô¨3ìx¥uàoðsÛ\§=¨¾·18#tÒJ)VºŽmüg8Ö¹ÜÆÜÆù +Lëý×Ø8wZ¼´Uò \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/7a/9277e0c5ec75339f011c176d0c20e513c4de1c b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/7a/9277e0c5ec75339f011c176d0c20e513c4de1c new file mode 100644 index 000000000..9fb34f7ee --- /dev/null +++ b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/7a/9277e0c5ec75339f011c176d0c20e513c4de1c @@ -0,0 +1 @@ +x¥OANE!sýNÁ¾™>‰1nLܸóÃ0øÞ‚‡ác¼¾¸Ð ˜nÚ¦iSé­Ó õws¨¢âP!gÁ«wÁaÎÙZ¬˜B,ÃöÁCÏi˜“B@HT Ô°P’(g@á«(*ƒh´ñ7´¢+è«ç,N*ÕÄ•½d°.Ô5ÃP6þœ{æ¹|ñ(æmïíÖOó ËýaOíÑo½Î{éíÑ8¢˜"Pôæb½µÛr×±©ÿ¨Ø^u¼«ÉƒOÙ_.`Žsö?é¶o0Xa£ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/7c/7bf85e978f1d18c0566f702d2cb7766b9c8d4f b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/7c/7bf85e978f1d18c0566f702d2cb7766b9c8d4f new file mode 100644 index 000000000..fe8b15777 --- /dev/null +++ b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/7c/7bf85e978f1d18c0566f702d2cb7766b9c8d4f @@ -0,0 +1 @@ +x¥±NÄ0D©ý««ádç'‘‚ úýÆÞ\VŠ½‘í\~Ÿ€øº™÷¤/1r…¦w5m|À0è Òt¡ntƺ®%×öû‘¬ékcnu– ïaÇà:K,’à™ú“^éWüµ³—øÆêÖ5¦í55hsg|M4jumFDc(8Lr00^ z_eYM2M|gbv`sw-4%j>tF@bdiY$7kn$`x?RL8Rp_CgX|1%%@?V_0r;qbr4Fz)0g1Q* zXV^)iJ__PTr`x?Y4!3X4#JR#0dE0P?wrN3ex!meC(S)5Kq0bQgstl;T#hH@olRUx5 zlz^0$Qi6hWn-q#Oeu+MX0jhMp)({J~MNL2@yyD;rN-Jt5A|!fiGy`Sf{@z$lGip__ zP6OsN6x1Bv{TjKulPk~xz97^V0!@Tj(gCy14?Q`FG+po{tlYLUp}?)Uy0In^TIw80 zzs@KYHPr(sG)0&SS_J0ZL?4(gy;$ilWZYfy>H(Lf!ibu)t^iZ|NXSFL9ahRsG*usT z6CLNKi}C_gZH12V1HAeR!en+Nda;CO*0Ib2Q!8_NH>E{W6HK)MSO;a7+Pc*zs93IO z(|5l;ZeQgd;t9W_64~___4i0QXUzR9bn`RSiMtIGX)Ahg{{W#06#c{j+qVD! literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/7e/3056f6765b3044ab09701077dbe1eb5b0e9ad0 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/7e/3056f6765b3044ab09701077dbe1eb5b0e9ad0 new file mode 100644 index 0000000000000000000000000000000000000000..c4b8355186272c1eb916727bae0a16c6ad75a545 GIT binary patch literal 208 zcmV;>05AV|0V^p=O;s>5GG{O}FfcPQQAjKgOR@qzp6TSus({L12z z)FOzD>*bF-)ZbitUz~A8-NutKB~y;hfT}7>P0RtSS-v4HxGwv-z^wgG{!ialdgVd+ KEd>AsJzr5;MP&d0 literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/81/5b5a1c80ca749d705c7aa0cb294a00cbedd340 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/81/5b5a1c80ca749d705c7aa0cb294a00cbedd340 new file mode 100644 index 000000000..12eb0662a --- /dev/null +++ b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/81/5b5a1c80ca749d705c7aa0cb294a00cbedd340 @@ -0,0 +1,5 @@ +x¥ŽK +1D]ç}‘|:é ˆâ ¼@’é`™HŒx}Gñîª^AñR«µ Ðw£32Éà¢t99^e/sŒ„F“Ç™I‘dŽ9‹{è¼ ›œ5^kE&x¶4[e 'Cd–̈1Î1:#ÂsÜZ‡Ëò +}ë­ÕG[áÀý¤‡_Û§V ­ŸµU“D)ÅF7ÙÁÞˆÚ–’K +£l +e…ó¤Å6Rb \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/88/8588a782ad433fbf0cc526e07cfe6f4a6b60b3 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/88/8588a782ad433fbf0cc526e07cfe6f4a6b60b3 new file mode 100644 index 0000000000000000000000000000000000000000..44efd3315b4326a3f381c0ce6633451ce0b1ef91 GIT binary patch literal 208 zcmV;>05AV|0V^p=O;s>5GG{O}FfcPQQAjK&1{U>Y&HCDgS(&Liz*)u&&*EO64-efAr_ LELMF1OGsspd1+=4 literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/89/8d12687fb35be271c27c795a6b32c8b51da79e b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/89/8d12687fb35be271c27c795a6b32c8b51da79e new file mode 100644 index 0000000000000000000000000000000000000000..2ce4f7f0a4c72bf27a73631283d2ad87f508e7ba GIT binary patch literal 663 zcmV;I0%-ks0Zo)abJH*og*oe2EO(QcmSaviq(f(zrnD(N%l6vVSeA@d#+YBvTO|Q* zjV!I+``%M)A8We1yTAYN{do9Fucx=?oiWdEXL@`(pXfl(r!$?uyd018?d|Y#ex=g` zy&ulUmx?}93@!$tX2~Rz^}eFh)6vKrW9Sx7v7_4CW~7w$5+m)DV{>dy>&j*kEGQSb;Jq z+A7TBKrDy+M8M=&>{UqhN$<3NfQ=spBT28L~1%$Bk1# z^J8%s5_m1WP%6#H0UFJ!!8A*1J@QjtNE_~V^biwrYX*xx&=wb(>{j|@sg1wEIk}mk zc(OT)aiOBlB|(yQRPWbnfEk(+q*9h>9MFKvz!S)nG^peCuYVWJ052z> z)$oauY4vAj5ZuwbexGc6748HFHF~8I==~!Z2;5Wc=Saqhz{hVWc1O1`>fOaRWjh%^z&2iu=paO|$?2 literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/8a/bda8de114a93f2d3c5a975ee2960f31e24be58 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/8a/bda8de114a93f2d3c5a975ee2960f31e24be58 new file mode 100644 index 000000000..a03624d81 --- /dev/null +++ b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/8a/bda8de114a93f2d3c5a975ee2960f31e24be58 @@ -0,0 +1,2 @@ +x¥N; +1´Î)r•üó"6[ÚyìË ›"Y#^ß(Þ@˜b>Ì0Øj-+k}'⤒›#(Ÿ,Hm¢K ™2 Z£³N»Ç¶Î=ú%ƒ¥à!ËQEaË^¨¤pñÞ¹% $“Y|öµí|N¯¸'~[[}´Ÿh¸v¡oðSGlõÌ¥1‚•ÎñI!ØpÇÙNΰkK%Œ½Œ ó¤Ù[„RÀ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/8f/35f30bfe09513f96cf8aa4df0834ae34e93bae b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/8f/35f30bfe09513f96cf8aa4df0834ae34e93bae new file mode 100644 index 000000000..1011a885d --- /dev/null +++ b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/8f/35f30bfe09513f96cf8aa4df0834ae34e93bae @@ -0,0 +1 @@ +x¥OË 1õœ*Ò€’fAÄËv`™Ì„\#1jûF±oïï“뺞»4Îmzc–l&‹…ˆtoQôÀ‚ Å*p:9qK¯]Ʊ€ç)BѤ!+B‰ÊÉc8e WDzô¥69Ó+5’§¥®÷z•{êùküØ.×õ µsÞûÑgåV9¥ÄPÇØÎƈ™Æå'§‹xxO» \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/94/d2c01087f48213bd157222d54edfefd77c9bba b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/94/d2c01087f48213bd157222d54edfefd77c9bba new file mode 100644 index 0000000000000000000000000000000000000000..76ffe4ea7983ef339264078ca8ee74ff68cdbd64 GIT binary patch literal 621 zcmV-z0+RiB0ZmgqkJK;_rS`8F`mln60$p_lNGBn25(4T;GTB&h?3~9YgkR4aXBQ~r zc;37(_aXK4?(K*7ufBhL{7hfJe0zTF+;c7DV@brcr9x%SBJ@%@7o{}O&P8%}J5JH3 zs5D?iR}P`06vgS5Qk-hA>wVy1p-r|;GVp2~W$cLKNM%oUK{=F;c3zVALLE5QQ@Nl(JJ(P;zT>A#b=A* zgg2yiA1AFgW)q6j(U4;CvHEx=w5d&1oCKSlS)Ij*t*r;Q)Zs*|1+in`^!?^*<{byf z+)}d*rt?Bile3RzBUDpFVNtY6hJt43E&?8RpPDr<)dM8T-g;rK42wi?bh`yJ)I0{{ zXMQ1VsK3ysl#$yoGx|VBs zmuMWUfiJVHaHgd}lk9)>`{-t9xjnYs8jQO~TMeBknN@!ifrA(NVgFYiZ^XS~@Gz=w ztw!V&*)nVI4ARa%r5KJ2Jw`y`ec!#cS8?A|74Oyc_xiVYlWB={Sj;CR1u$!*mW%rX H{Cb92!PzdT literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/95/78b04e2087976e382622322ba476aa40398dc7 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/95/78b04e2087976e382622322ba476aa40398dc7 new file mode 100644 index 0000000000000000000000000000000000000000..e3d15aac36c0fbbfd053d8ab640d1422fdfebd9f GIT binary patch literal 620 zcmV-y0+aoC0Zmi8uGBCPrS?}0eON(3fwrOm2?>cSA)uZllZ_R}&h^-Y@b#Q=c7ZaE z=gfJz52>d&uiw3W@%_X5&-C@nx2KoRJ=H=!mPAZjDpckyLeG_RQA!i-TqJk*;}m_0 zN&`l8kI*SooTMzE3!--f6V#mPg``y>fI}VV! zrDhvU=Y>8^&OVxrP)!kqMbRc13Yww22zWevYSuhg50EH(>xH>8EE2)d?H0^X^B9ny z`GvHh{z4y9MsCB*=mQ<8(#l8c6VsS}!{_Wb0ppcRQs-kwlh2AIc`@zxYQQrzC2D70 zqH(YWzRa@1nU)4kvj5fZqnn}S{@8YFFzz00HFTn6R{c!`4qoVo{a<;!6ZeY2!>GEo z8j(|E%dEXKNIUzKVmL1JJ^~8w`{AvÏ€ˆ›YºóI§Ãd1‰¯oo Ô¢ê…uÛJçÊÀ¡7"žBtÑhíu™¬ÕŠ¬2ypHç@²b÷ÐhïÜ¡‹ÙšÏ2IÂX›PIatÎÚ8£OYxöµ6¾¤Wh‰ßÖº=êÎO4èÇ]è[üÒëvæÀøÙH| tœíôç »ÖTrÁÐ˸0´LŠ½Ì#S; \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/97/3b70322e758da87e1ce21d2195d86c5e4e9647 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/97/3b70322e758da87e1ce21d2195d86c5e4e9647 new file mode 100644 index 000000000..a90a61cd7 --- /dev/null +++ b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/97/3b70322e758da87e1ce21d2195d86c5e4e9647 @@ -0,0 +1 @@ +x¥½N1 „©÷)Ü]uÈ^Ç!‘Nè„DIÇ 8‰Ã^±”[Äëþz$ºñø›‘&·u½ìÀÂ7{7”ìfBÒD{RÄr(䓯žÑÕ2½j·m•«¨·L9úA”¹H™±˜áÀI Õù.þò¡²TÆT £×ès ª®T ìÔØYä¤6éÛ¾´å]{祭׶ÁɆû©Îöõø¹ns[(pD‡8 wŒÛíŸ5Ó“õƒï68üuÂ.ÛÞ uÝòòp¤é`p3 \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/98/1c79eb38518d3821e73bb159dc413bb42d6614 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/98/1c79eb38518d3821e73bb159dc413bb42d6614 new file mode 100644 index 0000000000000000000000000000000000000000..d5787b44da4db0a272e3062b08e6d0ccfa2325b5 GIT binary patch literal 208 zcmV;>05AV|0V^p=O;s>5GG{O}FfcPQQAjKVPQ*YAg{gCj>9$&Adwya|2+?dw#|1oN4@;2*WrMgr0Tws_-Fx5r z5=9_JG4{E}-YbvAk3Q$=HMg>KzTx%E9=*e7$S6zMHLNytMp%EDpWsqhj znEQ^IEtkd?)d_xlDHLPj4!z|f9nB7SV z^oUNWdgejjw)3)vlfCO|;px0gmt_ujzSGb2;9tYF-L_@A513MB$;dGrAps0K-Jh}f qKhF%0zCL@XtIqB0mvHz_rz0JL&i2>iA-v4nay3s!96kWmDSDv#$acp7 literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/9b/258ad4c39f40c24f66bf1faf48eb6202d59c85 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/9b/258ad4c39f40c24f66bf1faf48eb6202d59c85 new file mode 100644 index 0000000000000000000000000000000000000000..305e1f3e92c78d686d7e067ced299cfdb8a3b3ee GIT binary patch literal 240 zcmV_5Q>b2+>?g#|wDZUhaxyQ3&Go2|q`D5}p0c zc%*Ud^L*Z1On9@cW=@o;G>LiQRsaey!XzNx7b>N(mtawihgVr`*&InxAvN!#aA>HZ zCgCZWA!lg88^&UZF8-oCF+oLCkC=d~D*M!SOr$AS(jbO#@pHxyGBs#5Wz?(`AxtRd zC#|v8fSSAz4D!C6`s$AQA*;IQQ=i}Z;_hvyU(=&~3%}cK?el~4F(%@KF}njqfMKWm qGdBBY%05AV|0V^p=O;s>5GG{O}FfcPQQAjKTiU*U#^-QwV1^aGYktDm4!Z8PN+BWhADIj(I#DH_{o=(C--K0g3Jn zh#7aOC9GlxtaS%$W+*M}FLD0xIepo4&oA)xfpxxpLdxb3K zr6w#=xcTK^LfQhl!ZfrqqrJm6fl-(EsH;fUv8L8_sp?^}peIvz-eO9iVE~0OX2zK4 S=1+q8cKeOjdk+8Yk&Keol8Ar+ literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/a0/2d4fd126e0cc8fb46ee48cf38bad36d44f2dbc b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/a0/2d4fd126e0cc8fb46ee48cf38bad36d44f2dbc new file mode 100644 index 0000000000000000000000000000000000000000..566976715362ed5477f8ad2709fec752840cb658 GIT binary patch literal 649 zcmV;40(Sj)0aa7Wj?*v{W$mxH9}p^7us~f^sECnEU!e(}AAOSGsFAq@=c?o z@lIR2R={INbH=DkUgkB$!8n2b$=X)`!3wK_rmS~8hdm`dGI@*xhyJkwp-o3w>btId z?*r?|WI9M(RRof4DVWHhAvl_PV~a7p_boNJ4w%XO+8h8mA&_)!`E9W=!bb(BorOg3 z4J$bqBf5%-;Iy(Gi%~MleIKc2ouGMP3w1FC4Yg@7QDITa0c2!Ww=G3KF*SonJT1*S zM9b@5athn0=<`h8QN2>j5XZ4nF_|DXZt#Ls?&G8wEH=#^nKs@fr;=&9b zcb|$iKe7Rcw?ZxlQ5_CD}FxvcBC zX+Yex%B(FQp)f=ma2SMA0x^Q)NB~YC`$!>X8PqLRzBcW%pCybOeGp4FWHUM^-T* +‡†jž’r†¼a,–h÷íÔWwÔYÕ=ŸúüÖwo;ýší[øÝnkŸœ1'Dï†îÏØìŸ1Ó­/æ~ÒÜxmåñîrrmëÑ—­»²ÊROÇŸ™‹a \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/a2/fa36ffc4a565a223e225d15b18774f87d0c4f0 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/a2/fa36ffc4a565a223e225d15b18774f87d0c4f0 new file mode 100644 index 000000000..347139464 --- /dev/null +++ b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/a2/fa36ffc4a565a223e225d15b18774f87d0c4f0 @@ -0,0 +1,3 @@ +x¥A D]s +. ¡ðáCbŒ›ÞÀ ðác]´˜–Æë‹Æ¸›™—LfRçG“¡­ÌÒP9öÑ¢%@ Ék0L bÓ¡/âW^šÄ„T¼å€¾ yðIYç +*u"Dç¨d("îmª«ó+®YÞ¦:ou‘gîéG]ù ~î”ê|‘€µà²ò¨@)ÑÓ>¶ñŸ5bÌýrÜú…xß7ñQù \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/a3/4e5a16feabbd0335a633aadb8217c9f3dba58d b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/a3/4e5a16feabbd0335a633aadb8217c9f3dba58d new file mode 100644 index 0000000000000000000000000000000000000000..00f9c2ddd1d8e6b2df28ccc58ebedb4e3369507d GIT binary patch literal 164 zcmV;V09*ff0i}=K4FVw$gngz88qn~wu#gzz%XMG_!0zQtJTZvczG&>gx0!E}$xNy1 zdhXHyYQpSGzyV#(Xy$BVF0%$gaZ8P_T}HGSl{JRZ1xf)~7dD!V zj*fyaj)9{G6zS2I+T=v9)JUF|y58$m?s?FUI`TL8xm~I2L23Z!oHoJBtpcUQpkr+3 SKWoH9lIJ-a@ z$8+Yq+=tZD+c)puz54#)=`(%(^6mNJ+;c7DV@brcr9x%SBJ@%@7o{}O&P8%}KTgr7 zs5D?iR}P`06vgS5Qk-hA>wVy1p-r|;GVp2~W$cLKNM%oUK{=F;c3<2ht)u`f#+VIn}IJ(#5a1;LR5xTw{XwHZoM`8?_-rwp z@P^dxM!&$W#l%@j6TqjDy@99J~55yH+;^16EI%6By~P^H2JJZk{8o{uLe9rQ=)d} zB^n27;L9v4oM~y$B>P|eKDrrN?vHJ^2IKD0RzoLBX4T(B;NXRR*#DKsJ8`cVJdCPa zs}VUxw#?c)gS4|xDTd=hPZ3af-w$u?RXjFT#d~%AqyFvPWLjb!7V`;70n8ey<>LMT HT=<4_?*22G literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/a8/2a121ea36b115548d6dad2cd86ec27f06f7b30 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/a8/2a121ea36b115548d6dad2cd86ec27f06f7b30 new file mode 100644 index 0000000000000000000000000000000000000000..e740872fa03f7c70cd80cba278edec8365618b7b GIT binary patch literal 208 zcmV;>05AV|0V^p=O;s>5GG{O}FfcPQQAjKTj;SFV484ZsWRS0W8c16-eS26m%ajNX&p z+CITYe3(NOm^m_MVxMbRS1X1h(I-U`(_|s1lCZ4qGY>r`kWev>x)Iw_7Z!{u8KJLU z3Qt+Awwe2$c*=;^aZ!fTfKpXiLH+aN|=q`H= do%)Z2yVdLJx8@Jn4`@2x6-qwU{Q?TRQDDTZQfvSK literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/ad/1ea02c2cc4f55c1dff87b80a086206a73885eb b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/ad/1ea02c2cc4f55c1dff87b80a086206a73885eb new file mode 100644 index 000000000..99207a9dd --- /dev/null +++ b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/ad/1ea02c2cc4f55c1dff87b80a086206a73885eb @@ -0,0 +1,2 @@ +x+)JMU022g040031QH,.H,JL/-Ö+©(aø¿9/Ð>þ~WöŠ€EŒNéYZGj¡ +“RSÓÀj2¾Ièû´^ž'Ìy³¦Î51ìΆi05ù¥™99™`eÞ5a Ýz%õ潎’½Ç×ÐÊU–^”XV VtäÙ™Åo²ˆô]2üY~¿ÇPŽ1ª(¿²¸$µbãzùãõ7×Þg\Q·ñdLÉ”£3 ªÊRsÀjâÚÝ¿*ð¯áŸÅ~뛘ÍÊÓR½+»<[{ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/ad/2ace9e15f66b3d1138922e6ffdc3ea3f967fa6 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/ad/2ace9e15f66b3d1138922e6ffdc3ea3f967fa6 new file mode 100644 index 0000000000000000000000000000000000000000..8ae3ba5a744f2a3f167491861e15ec70c7ba69f5 GIT binary patch literal 170 zcmV;b09F5Z0i}+?3c@fDL_Oy#@&n3dlQb!a2;$M3Kd{~1Vh?SkM*MxF_y@uqX5PRs zT;_SI7Gv1dRn;;K0x47H1ep;zB2#3AK!dPwWOf;QHFsKdsTM}+lmwG^Lod!}8r5g^ zzT-Y&Qi2GWC>eUzTUqT{UbKq6-pc$ai`{FZA9vJm@k=`{^TE0hV(u|Uuv-WKrqOn` Y>Yp>_Qe+w@raH9?O{c9hZ%Q&#vn`5F+W-In literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/ad/98bfa4679fb00b89207a0a11b8bbf91a3e4de9 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/ad/98bfa4679fb00b89207a0a11b8bbf91a3e4de9 new file mode 100644 index 0000000000000000000000000000000000000000..457f9da1f1bc3fc5daa3c7f492f9fb2685f6700c GIT binary patch literal 208 zcmV;>05AV|0V^p=O;s>5GG{O}FfcPQQAjKTj;SFV484ZsWk8T$lY^VAlR8|EF&&z4D;^ KmI44|zFlT3oMPwz literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/b2/a81ead9e722af0099fccfb478cea88eea749a2 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/b2/a81ead9e722af0099fccfb478cea88eea749a2 new file mode 100644 index 0000000000000000000000000000000000000000..7a8ffe58a65ef3a9c38de40dd9727e7261d202b5 GIT binary patch literal 664 zcmV;J0%!er0Zo*_Zrd;rM0@5}><738(nBvk`QV@dir7t@=1fT|i4aAqT&k-2^_`{c zwzrrfmosmMseG*H;o;Ng58qG6uk?C;yX=j*yj|((`Ff@!UCvj!et9{a=-b=z<@!qJ zM|wYAPcJ*lePX5oJmIO{f^GhCnHmgp`AU&mMU-SfhL|NPBg_iG~DdShKBMI zb%R)+ceJ?NZ!2jVZN$5pMR$0%fqFY0@K+|6sfx~%WVVg-YdO`&Imv-!a3eODSl3pd z42o8j%7G?GbRkDQZ%KL=bo5WQ(ER^cRaK@LA4A9KK-ms3isP6=|5QQH=A&F1+qQh~ z5?f(%EiA4^Fv&NRoG@hQ97~<^1xy!XLp8Qz%;9dX&3PsA8Mpd0|aNaam3&>nk(;L+1o}OBxKMF>;rVul_mRhbenjs4_blf== zG(TpCA%U0D3#C#I9H7xG8caQ>#v?!Fg|y**PmeJnx4O6J1FdnU(XORWmYVn*oRgav zibtEH7#DWbx+F-_4(k0@4KPDfg6xzf8V5As((?#1B@JqM`Rm^W)5FVx91~uLHW+)? zay5LSWLo`+83gzAuHQ%7+=M&9!BwT2aaJLl$&y)lXRx;QDF(mp=@>A|rhI3sui}2w yEO@V`y4SzFn?ysH>p?joDGbv_O2+?=D@vw|7Dl>0uOJba64xNKH-7-HgN*UF>qEl; literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/b4/cefb3c75770e57bb8bb44e4a50d9578009e847 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/b4/cefb3c75770e57bb8bb44e4a50d9578009e847 new file mode 100644 index 0000000000000000000000000000000000000000..836bb4edcb1dec682ff243dd480df1024b5c1553 GIT binary patch literal 639 zcmV-_0)YK^0Zml9uGBCPrS@0M2ZWWNpxNpcAR!@fC0_L;nQW{$cCN=JgsoAr8w1K*ZaW3LYr)xWZ=~}%GeRdk;Ep1!KGnf1v4-@jH*Q19;z_Uq_dB<{HHKD z{|{@d8k!3!-XveC@FJ8j4jlT&3WQD_ZE2dO_WhQHRme|}csK=87%6)d&@ddPn-9&H zTS_AhxDJ@r|2iE2IU`WG5AwR%sPNH&=@cLleDgsO#+a^VA~+oqmS&WV%I&7q3qp#t zizT8ZGt`#ZtHYvFGsxI1k0WVXg@!pHo{=`r8sxZIPWk+#scy)W`h!M+IML2&@!4WH z;SH(X$4RS=*@WVBG^AL3tUlfdZE8~$C&6ZCR%bC{YwN*1bvO}gLF^bfeZTvfdB*`V zx72Kd>AcX#$=Q!)BUDpFVNtY6hJt43E&?78pPDr<)dM8T-g;rK42wi?bh`yJ)I0{{ zXMQ1VsK3yMl#$yoGx|VBs zmuMWUfiJVHaHgd}lk9)>`{-t9xj(ku8jQO~TMeBknN@!ifrA(NVc%CC@5H@g@Gz=w ztw!V&*)nVI4ARa%r5KJ2Jw-s_eLuXlSMk_X74OyckNUTFlWB={Sj;CR1u$!*7W{X7 ZMak@tA>=lf15QMtECU?6xIZ-FkkMG{L{P z0v8ZIwYF#G`*RLH9_Yo@^~-0Ux0^e9*nQfsjCr*zy4h~tnf;i_g&fJ!5Hsa2G1Jp% zQx=LXO*V6?=<(*`c1yea+ui*Gz5Vn^4<9yncNN9J=Et(A=XB(T>e%-&kPS6Uj!FJ= z!ZJ7p7lTj@P|{oPmkFW6{9v{YRSRbbtn!K!C4O0Jxz~*!XsB;=qL1-o`&i473#GJm8l2=4C;&FpF}Bm6 RG3@+3J^GhPuov*HPsMvROWptg literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/c0/bd078a61d2cc22c52ca5ce04abdcdc5cc1829e b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/c0/bd078a61d2cc22c52ca5ce04abdcdc5cc1829e new file mode 100644 index 0000000000000000000000000000000000000000..3dde6c243e93aec666ae3ef6a209106eb9e07e14 GIT binary patch literal 207 zcmV;=05Jb}0V^p=O;s>5GG{O}FfcPQQAjKNiI}Dm+wE8I^5xVyo=( Jc>u|AT#}r9UuXaT literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/c4/83ca4bb087174af5cb51d7caa9c09fe4a28ccb b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/c4/83ca4bb087174af5cb51d7caa9c09fe4a28ccb new file mode 100644 index 000000000..643a98280 --- /dev/null +++ b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/c4/83ca4bb087174af5cb51d7caa9c09fe4a28ccb @@ -0,0 +1 @@ +x¥PKNÅ@ cÝSÌ®«¢dþ#!„„+v\ “dè[´E}E\ŸÞ`Û±lɼ-Ëé0.ç›cW5Î熱5Òš\sX(V#ù$V‚ÚÄÃ;íºÆg1H Ž¡y˱ڂP!HmŒ©µzõ“Xb-Š¡ÅX º\¬Õ^)ì”\+15ŠWÆP!g`J¾H‚À‰¸wôº~UÄyè㘷Ý<É'íb^çm9o«¹Ó®~£ýy\Ø-o˽AïdC2€¡«}ŒCÿ3¼èþ¦¦î´ò¬g3þ¢Ç GC«üq;šÓzlçó„Ã<©{ê \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/c4/e6cca3ec6ae0148ed231f97257df8c311e015f b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/c4/e6cca3ec6ae0148ed231f97257df8c311e015f new file mode 100644 index 000000000..2bbf28f57 --- /dev/null +++ b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/c4/e6cca3ec6ae0148ed231f97257df8c311e015f @@ -0,0 +1 @@ +x%P1nÄ0 ëìWð¹CNE§N7¶è¡:*‰’p¬Ô’/¸ßWÎmI‘”ú$=^^ŸŸ._ï?¿¸~|žC¸°ã¼6©yTÈ„A¨(#1eôÌÓé´“.ˆ†áÀ(Hto@̸K-aë°Õ°…¡´²“sá1r6)&)8¸Å·TêÖa¶<0ׇ¿JÙ¢Ý[‡ŒK‡5IJ²²­ÈÀªcáÁ¸q͓쌫r_ÍÛ‡"u^@ÐÈ7~X)—›÷2¸ Ýâ G…,æ¥f¬R¸ùå`BÚúÂ4¶3£½ÁvQŸø¤›HÖ©¦Öu­êa²b SwÞcJ q…)fÆ”èæO‚ùvû×;‡í«ŒŸ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/ca/224bba0a8a24f1768804fe5f565b1014af7ef2 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/ca/224bba0a8a24f1768804fe5f565b1014af7ef2 new file mode 100644 index 0000000000000000000000000000000000000000..0dd861f2c43e7f10a1ccbaf4ad794e9b7bac5091 GIT binary patch literal 170 zcmV;b09F5Z0i}*j3c@fHgk9$pxj^N;{5Bxsrb~BT;3avbU9^!H@%l#b2Er_6zJXy< z*|xPwWzC^gX6adjb+hx%Mh(VLgx~?e`y3fL+6WvdgSb=Wy~#lAbTl+3h8ahUDr1H) z29I8ALeNUNfL_qEEv3pSzo=$;Tgvt*yF78HA9vwz@k_^4wzEWI>=>-JP7YuIM5q01 Y<3DG_wd8eP6ScKp=$Zx;Z>2v`!Lnvk6951J literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/ca/49d1a8b6116ffeba22667bba265fa5261df7ab b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/ca/49d1a8b6116ffeba22667bba265fa5261df7ab new file mode 100644 index 000000000..1ea596763 --- /dev/null +++ b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/ca/49d1a8b6116ffeba22667bba265fa5261df7ab @@ -0,0 +1,2 @@ +x¥»N1 D©÷+ÜÝê¢8q^BHˆ’Žð:{‹Ý Äï^=•Çgì‘FÚ¾_8ï®FWo”* s]#©ZR¶)Zl$ÌN0Ú”–îz àbY4+úÂê +¢›VC­Eœ²«9ÄÊá÷>¡_=£$#)—h¼Df#«ÍÄfN-Å‘Yøml­ÃCyç^àikûk;àF'ýTwúeül×Òö[@"Ÿ2Yôp6dÌ2é,7ôŸ1Ë£ög…ï48ýµÂ .Çh°v>d»?ãò;NoÁ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/ca/7d316d6d9af99d2481e980d68b77e572d80fe7 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/ca/7d316d6d9af99d2481e980d68b77e572d80fe7 new file mode 100644 index 0000000000000000000000000000000000000000..0733fa232bf68c48a5dc822e57159816e07198d7 GIT binary patch literal 207 zcmV;=05Jb}0V^p=O;s>5GG{O}FfcPQQAjKOT{yeRq_OJQS&u^q;^Fzm zX@Micr`Gn&e1Fct#{*rxdVTZa%VvE~kK3o+(wH~%qT9{-gV{ap>F!~_r8Vugd&+HM zrsu(?EEF3WZRWH%Z^z(b5UPeu(pm2p6a$-|^P-N^k!z}A*Tq0KR4h3rF*{s$AxE;* z$NWDN-p=bEJMC{jZ#J}jxZ6HF(tFT*{ItHmpRvB17u|4keN|r@>0=Dd;FapZ+v-F; z_dO>d9YW3Z0z7KUW7G>`eO}P$ay##&nTrwcz*TQ}wt-sPt?&z^GaaJyB$;jP{8Xyi zI3!t-oLq+sCRUXds0uYFm6-$e7rjt#Nm>`Q^*6TA`|q}js&q3xh9jpHWqV?ZC`TXq zg9?CV9%X23nsRTMFw(@K3x^O3}%M;_@gQOzL7vM`ceQXA&>+Ns>fP6?#Sgh(!s*^pfr zTsRVPTB-)@c&%-%7_|{oOAgMiLy0hC*p7l(_p`3aj@W?b>Y7eao=duGjQ%Myf;9y^ z1q7|(DkB*(G6Tm&ry|Ys;Ls%SSaPANR3{F=Xht=r8dB}ypXvp-!G1{}V}fs0Ymo<< z;y|69N}ep$@dtEHu4f?bY>r}FSWx4Vz)5>j?&oMgGbAO*LbXKVAPsbBxq~vr4QhD& z&EEyng3I|sF=~QwcPgX76Cu;+_smdmNniE6v-KIc6BJGg)pUabnMoGU$~yzKIZrY8 uX-VsVR`@nuwAEK}nKTIAt2tcaU*1ikQy8j~>IA3IOcN=2X?_9!X2$$2(9 literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/cb/49ad76147f5f9439cbd6133708b76142660660 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/cb/49ad76147f5f9439cbd6133708b76142660660 new file mode 100644 index 0000000000000000000000000000000000000000..849668c8b64d036d37466e7d3036b4c2dd30ec16 GIT binary patch literal 641 zcmV-{0)G8?0ZmiOlG88{G*}7&o7UAV;)~F^zij^rXxL`FLe3*bUM+um*dmrna-c+ z^>{fw?I;h4nPPA;2(=}XOxF7yPT0sCW9W;g*i++eJJQVa%!%e$LdV^XZ0IO2Q7?$~ zc}I)O!*-H3Xd~XWEPBJU4KfM1zhrY1U1lG%37uXSpOCCPzgbQ3O^*tS-{42)K# z%7JE3bRkEbw zRTIH!Wj|J|n)cjM!Rx za7!Idgpv_E1~%Vsz9zfi0GVrQx7h6Jr`ibB6klA#JGN)2En_TRT|vf!0`PvTN;=r7r%4&&kaU#*@ua zj0-#JT@oZ|N7a6-20TMkg6z~wG!E9lmw_iZQ`4ZHm%sX5FaxwK$T8t{XoGQgt*fCE zCDZE9%y4i|uljwm-Ho^t46aJmOht)oB5P*#ok7~xrx^UYr(*z=P5JJvzKZ*%B6zQ+ bx!1qGn?z$M?WjH>DS&AsCGX82&R2r-HC8|q literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/d0/dd5d9083bda65ec99aa8b9b64a5a278771b70a b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/d0/dd5d9083bda65ec99aa8b9b64a5a278771b70a new file mode 100644 index 0000000000000000000000000000000000000000..b0d951c9e75d5555fc1c0b95e1b8d44bbee483e4 GIT binary patch literal 620 zcmV-y0+aoC0Zmi8uGBCPrS?}0eON(3fwrOm2?>cSA)uZllZ_R}&h^-Y@b#Q=c7ZaE z=gfJz52>d&uiw3W@%_X5&-C@nx2KD9PqmPbB@xq>3Y9sF&~xQnl+r{y7s=iII7OeL z(tr_NIfRZ<6sKECajLeVNabd_p@7evq~? z2uGTEy;2ZRE7T_+NQ?03!_lVZRI^@57r)|yOT)klW?*y}Rf)7cRAHV;XCH0(PhoKW zAJ$kkG#665Nxo9yMJQn$IP{Md2%S3G(lkx&|1Arvke?v&a0;X_QuZpKVK_`TADS_@ zltvnG9Wbl^bvgiYMxbyXa5^L`%_tj{+fAt#gcNBP zOGHa%s4cTshef4kkg-`FN7A$k4Rb;~BW;{D$Z@rt^7%_s-H<8u2aN)8qMg&?v&C@2 z8&bQElU5tE3B~DXNU``>eY_Fc)TSyanl;bW10>4cdSR{%i$rjAy9G1UJO<=v zej#nBztG2&k=rmc`anmjwDQsV#5AVg@HzWUz*0QkATAaet2uI;<2eJ-mB{$^>6Pc(-P~jm`_LwVAe=2FWnzp G-iBs$mNeu5 literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/d2/682aaf9594080ce877b5eeee110850fd6e3480 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/d2/682aaf9594080ce877b5eeee110850fd6e3480 new file mode 100644 index 000000000..c79a3bb0f --- /dev/null +++ b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/d2/682aaf9594080ce877b5eeee110850fd6e3480 @@ -0,0 +1 @@ +x%P»nÃ@ ë|_ÁîIP SÑ)SÐ¥¯$2ʶp>'9Fþ¾:gHŠ¤Ô$iðúöòtøÝÿ]pü:?‡p`Çë`˜dÎBz´BE‰)£aî·Û…t@4´+F¹C¢{bÆ]æ&± ¦yl`(ìäµp9›‚½¬Üà[*ó´Ámx`®?çýçéãt©2.Ô¨^R’e•MEZVE ·Æ•«žd;­ûz@¨Þ>™¯ùÆ+åró^Ô[fFŸèæO‚ùvý×Û…ðЋ’ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/d6/04c75019c282144bdbbf3fd3462ba74b240efc b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/d6/04c75019c282144bdbbf3fd3462ba74b240efc new file mode 100644 index 0000000000000000000000000000000000000000..059fcfe72f6598e0a631ed1165559606dacc47cc GIT binary patch literal 620 zcmV-y0+aoC0Zmi8uGBCPrS@0M2ZR+A6lkkkfP{nu5(4T;GTB&h>|Bpc2w%?`XZJ!G z$8+Yq+=tZD+c)puz54Ot=`(%%^8M?@xvduRu_R*JQlTh&?eg^8F)30GIqpqq_QWwpd3m^yD#&3l22%-!4J|l z2H{9EuU85JYK8jb18ET+eK^|GoNCr9>Ec&haA_D=!3>NJqbiYJRAHV;XCH0(FJW;0 zAJ$kkG#665Nxo9yMJPcbaOfW^5IS|VrD>Yl|63MTAwNOl;S@+=r0i8d!*G~xJ~U%) zDUCGXI$&1+`*Z;0j6mT&$m?dK!bbno%|?x0_Ng2r1Go zmWYy}M%p-QkmG7O<@1-Ox*=2Q4;lsHL_4R&XN%#4 zH>7qSC#^PS6N=N(kYe$%`gkL>sZCX!1e={%oyCZ)tq1qi;Y6$jv18!${qAe#9S6wV zQnL-F^Fp5{XCKW*sHTX*qG*#01)})ML^+wKfJY9@z_)q@748>`nPwJX^C}M%qJuTFl(fii~9@Y GSca3)DKNPJ literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/d7/1c24b3b113fd1d1909998c5bfe33b86a65ee03 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/d7/1c24b3b113fd1d1909998c5bfe33b86a65ee03 new file mode 100644 index 0000000000000000000000000000000000000000..66720086ccd376bee2122815f5ceae9c1cb81267 GIT binary patch literal 240 zcmVl)gY-kImz{;W8NI*V`lb|l~@J_p~haqvqTGWOXV@0tR zb8$|4g)k~%D={^SSHI5)F-Qx@&^&=-;aFXeZiZsDUhJU`oD7g20Ig zxMzC2ql%!1fj*CU+s(6l(Jtn7-j5lYGkOc6D6x7#hG1H7SGHHs|) z-HYHO?lLDgiES~>t6&2|Y2AlPuv(6uVj)v<6NEgha;-54_C6Ynq=+=5Y+RHA5qHbmbnah zpxlxhR)i>)p?Zvxxa37=LRt#y#MG8Ey}iR0fl(cJr;|w3ZVrWYoHduph=xpa^5R1P bwJpeXJ~FyMxBMhn-Y&n%cpLW*MV5+%UnhpR literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/d8/e05a90b3c2240d71a20c2502c937d9b7d22777 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/d8/e05a90b3c2240d71a20c2502c937d9b7d22777 new file mode 100644 index 000000000..b157ba17c --- /dev/null +++ b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/d8/e05a90b3c2240d71a20c2502c937d9b7d22777 @@ -0,0 +1,2 @@ +x%P»nÃ@ ë|_ÁìIQ SÑ)SÐ¥¯$2ʶp>'9Fþ¾:gHŠ¤Ô$iðúöòtøÝÿ]pü:oB8°ãu0L2çN!=Z¡¢ŒÄ”Ñ0÷»ÝB: Ú£Ü!ѽ1ã.s “ØÓ¼60”FvòZ¸‹œMAŠ^ +Vnð-•yÚb‰6<0ׇŸóþóôqºÔ —-jT/)ɲʦ"-«¢‹…[ãÊUO²g­ûz@¨Þ>™¯ùÆ+åró^Ô[fFŸèæO‚ùvý×Û„𶋅 \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/da/b7b53383a1fec46632e60a1d847ce4f9ae14f2 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/da/b7b53383a1fec46632e60a1d847ce4f9ae14f2 new file mode 100644 index 0000000000000000000000000000000000000000..cc4f2436978fb00dbe6924319fbfc1ace3025a15 GIT binary patch literal 208 zcmV;>05AV|0V^p=O;s>5GG{O}FfcPQQAjK$0B<%-a9t|MYF8S00q# KQUCxBQe1Jq@?@z1 literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/db/203155a789fb749aa3c14e93eea2c744a9c6c7 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/db/203155a789fb749aa3c14e93eea2c744a9c6c7 new file mode 100644 index 000000000..e9f7fd8fd --- /dev/null +++ b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/db/203155a789fb749aa3c14e93eea2c744a9c6c7 @@ -0,0 +1 @@ +x¥MJ1„]ç¹À“$_qóÀ;/Ðét;³ÈDòòðúŽ ½€Ô¦ê£((½ïKƒ k2ëœS‚ÊÔ A,…JÀ¼©*b®œ[,ê'KG° ‚¬dÙyñRP0PuÆF1 èÚo±°‹àŠ—æ$žj…«ÂL ŒŽ8™¤ð¾¶1õµ}álú}ý6ýÄ'ýq/}§9nCÖ#þ¬­÷©$çmÖŒQ'=-þÇ„zãùÁºN@Wr4)?}<@**_Fn#prM3k@~cSqjC8xFpVeu4PBXW==v* zDL5I0NTxD3=ZgKp{7+VNlKDCVPUT?hR2cg8tJQY)*ff`Fhu89L3O^L z=+_N|zp7KA5+~g?P%wwn+hK#xIo5NtRh)dws#`QO@&USLM1D+ZN7vcenJ%>`4MNCh z5MgPfXwVe(r4{kt@!+&*SmZxcpFqR5fno&aZyOu;%p<7L;o0GYmGop-Q4L7ebc)~- z4ln^{J(kK@OsUi4tdpSrMkChOg09+KbMkl$AghX%^?_cTU$(T8zxykw>B0N}=djOq D3bL=J literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/e1/512550f09d980214e46e6d3f5a2b20c3d75755 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/e1/512550f09d980214e46e6d3f5a2b20c3d75755 new file mode 100644 index 0000000000000000000000000000000000000000..a5f506fb30b11082e62870bbc305d849e835ca39 GIT binary patch literal 208 zcmV;>05AV|0V^p=O;s>5GG{O}FfcPQQAjKܶ{nÛDŸ2Z›à¨Qk5ÝYnÈÿ0hnõ,ýUà‡‡¿V8Àe –N;¯G«>>MpM \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/e2/93bfdddb81a853bbb16b8b58e68626f30841a4 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/e2/93bfdddb81a853bbb16b8b58e68626f30841a4 new file mode 100644 index 0000000000000000000000000000000000000000..fab55fea641a6f1468010aec61395fccd7374c4b GIT binary patch literal 207 zcmV;=05Jb}0V^p=O;s>5GG{O}FfcPQQAjK05AV|0V^p=O;s>5GG{O}FfcPQQAjK05AV|0V^p=O;s>5GG{O}FfcPQQAjK*bF-)ZbitUz~A8-NutKB~y;hfT}7>P0RtSS-v4HxGwv-z^wgG{!ialdgVd+ KEd>C}tX{rBZ(}Y1 literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/e5/0fbbd701458757bdfe9815f58ed717c588d1b5 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/e5/0fbbd701458757bdfe9815f58ed717c588d1b5 new file mode 100644 index 000000000..96467c106 --- /dev/null +++ b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/e5/0fbbd701458757bdfe9815f58ed717c588d1b5 @@ -0,0 +1,3 @@ +x%P1nÄ0 ëìW°ûÝ¡@§¢S§¢KC¯CG%QŽXr‚û}åÜ&I©KÒáõíåi*´Ý¡R×KŸlà8͆Uj2¢*ÊHLóx>ï¤3¢¡?0ÊÝ3îRKXÅNXëØÌPZØÉ©ð9›‚£Üì[-þ„=ÚüÀ\®¿ß·¯Û_ë°“q9¡E’’ì‡l-Ò³*†X¸7n\ó$»àÇ +¹¯„æíC‘:Í häVÊeó^´[<á¨Å¼Ô„E +7¿LH[@W˜†vf´wØ.0êŸuÉ:ÖÔº.U=LôdêÎ{L 4  0ÆÌmþ$˜o·ßx½çðµàŒ² \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/ef/1783444b61a8671beea4ce1f4d0202677dfbfb b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/ef/1783444b61a8671beea4ce1f4d0202677dfbfb new file mode 100644 index 000000000..67e6e8a5e --- /dev/null +++ b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/ef/1783444b61a8671beea4ce1f4d0202677dfbfb @@ -0,0 +1,3 @@ +x¥O[ +Â0ô;§Ø T²Iš¤ "ˆžÀ l“-˜FjÄëÅø3̆™Prž+(+7ue†~ôŒÜÛ0û”bžxLÖ4¢ôAŠ;­¼TpJ£Ç„cŠZ²qd#FmÉDï kdG’Œ gÊ +§ø¢5Âe*ùQØqs?ìÀß৶¡ä= 1ýà­Vì¥Ímc+ÿY#ŽeI·9Ôy¹Çvÿ5× ÎŠ70‘UÞ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/f1/3e1bc6ba935fce2efffa5be4c4832404034ef1 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/f1/3e1bc6ba935fce2efffa5be4c4832404034ef1 new file mode 100644 index 0000000000000000000000000000000000000000..e115747a27463e7a9ead594d12413c330a9eaa46 GIT binary patch literal 206 zcmV;<05Sh~0i};QP6RO!MTz?ql}$9ruEmRl5Cnu|T)<12o}k;v7;$}?Ek`2zo1XMb z-?qyH61tj06}%;73gUdmAWTToQbQ+&i)4eD$rs=1@{)$`6B4#WuC>BRoFqh2M5$J? z4c>DLzM8_#{O%cTrij)!H9pqnDqGAcS8?QA^pOI(sAWlSbL|5j>U$a$p4Ps-_8o5Y zNI%t`eic9Ny7cW9EVBrQXc5kajaiQLI5+j5nB`H&v%)tGPJg{{g3CTTTiU*U#^-=Mc_p;5f~ORcam-GNKnM%1BHZ9rJiRZlp7!q2Dpe0}|aE z5Hs#lOIXDYSnCeh%urg`$*J%VIh%qMqZI7i>{}{zJz$GAKQPyaze?Gn-CKu^jLQKn zYLt{@+huE!o>ei#!o6|hnkU%_S1aVc9uS(h4@K%UgP@Ub{IF6kH}7R|LA%8h_6k|d zOHEj$aP!N-gtP^8g=uJKMtg^C0;4YRQCE?yV@<8=Qq{v`K~JXcyv3A2!vG3n%#1P7 S&7TDG?e-h5cMAX7UyPDbtcA4z literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/f1/b44c04989a3a1c14b036cfadfa328d53a7bc5e b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/f1/b44c04989a3a1c14b036cfadfa328d53a7bc5e new file mode 100644 index 0000000000000000000000000000000000000000..7cbaaeecf596e2fa780fe9255822559fc9527259 GIT binary patch literal 672 zcmV;R0$=@j0Zo)okJB&^#X0*^4A&}DT9CN()I(Rh651}iT{t_*B(dVy!G8$h)APn@ zfm>sH#_#>!xV7~)-Q9is{O;T7_=R52Z_j(Bp5HF?_;fkbk)F>Nx;(s`PW1Kd_;Pur z^F4h(UQRC+eIoCScafT$C{Ehiiq20b6=&~Vmo52@YO9-(W}asbH2dsYZY$ERrL=fC z5VcJeEhY`yN}x0ZW)-bzILZmj+R>n=1AZkkiE3{w#l*Tbb}dzd&mkTtj%LCE<(o!F zD1)N4LO*siL!xoXOTDHz7$>cNvWDjW+ls2vOXf;J!JQr~rD zzYnYF?(akQDtuZ;l2iGZYQ%O48H2#yL$I}3}@ z8&+}vBfbhmXj<8h1(cL>-$$xhCwN|15{W5jxJ`qJ3KyjuAVz9++fwusQ!{wP)6%R% zw7ec9r?72BpJ${@^-3+n9LGwicf{M(4xzxK`?T zz0m&a<$&4a;X;?!({4xKuG`b)OotbG-(Gg76{RjPlXu3uNOevW2W{;NC#>S=y=${2 z-%@3D-P6e9$bm+mUBk_av}-6$UIwDJX+@Js-EtBZXceugIm(1(?Wohk2EP)SM3py| zVq)DGJD07_=MXm(doy4_`MTB-%)n?Cs_bY4MdOl}eNC}5PN09X2Iv1_g;haQ*1H>r z4JF+}DAs{P|5$<0qN7~u+qQha1=f+tw2(Nf2qfE3Fp)t+a5UYFEymouZ>YvNUt-VXeW#euH-^*6UiIv?>MTts4gxImL_Kq!2{KPM$4fSh! z@d3HjokkyM_L&Afmp*A~{BQUi%*bFo=;Wg^ZbhvL5lQM^wBM@%&(IVXSK=ia2W#L< z#{--xX;914U;W0Z4q7JU81Ooz!I+)P)zFEON%co&IJl;F`9A38PTWK+&O%iUS%@qm zOJ?PrLE6$M@9ey$tpk(}>EW%sipNbk;=QWsQUCI80`)G}z4(Nr049x$X|4VMzm1CR DzwlOd literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/f5/1658077d85f2264fa179b4d0848268cb3475c3 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/f5/1658077d85f2264fa179b4d0848268cb3475c3 new file mode 100644 index 000000000..3b4eb97e9 --- /dev/null +++ b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/f5/1658077d85f2264fa179b4d0848268cb3475c3 @@ -0,0 +1,2 @@ +xER»N1¤öW,}D‡@J•Š’ˆØóíå¬slÇ^'Êß3ö¨üšÇ®z}{Úö»¯ÝÇñ@‡ÏãþÙ˜o^„¦X3yÎ'¡¡;K¡8—Ä™Oµl¨ØÌIÈ)gÅß7d«3Q ¸F‰AÎBðFðÝÛÍÏtc•Œ¢9¦Ž*Ê~)–@Ôa1´ÕL. ÝœÎÄ”œXiV¶1€öa2t³PÓ*–$%É°°×­áq$½EºTÎÚã<< ÑùUPï;úuáKu*T⤛ +&Uß-Ÿq̱žš­âä*«nÑÌÈèšùÑ¥ Ýfgg:×¢4!£A„¥µ¢ASÔm»Ä¹ãÁiQ°È¨Þ†m E Ìß4Ü3 F…g‡FÒ“aD5 YÓ)‚G8@œõ*g1¥N“³N‚ú;_ ºjwÍÉã3€¬*FÖzv~y¤•|í¿ ¦ósÿÏö \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/f7/929c5a67a4bdc98247fb4b5098675723932a64 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/f7/929c5a67a4bdc98247fb4b5098675723932a64 new file mode 100644 index 0000000000000000000000000000000000000000..2861579e8554903dfcac5862b5881c7a8f3dea92 GIT binary patch literal 207 zcmV;=05Jb}0i};iPQ)+}L|Nw)eSsi%`xi?i#AX(=V8;d8?Ka6GG4dGA^$8N30M(}I zsZ>%)+xKmNHQ{M=RY(g;Oq%WDaVd5o)M#@?pNcpbslTxshTrE_?sgguFlNDY>tul#56DR%}YwK_=5AFrt*S6o= z0T(^#k9*xW>FwU?c$T)m06G^_q=*4#v78DTp{`^~qR Jrf(5uVo0VDWGVmv literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/fa/567f568ed72157c0c617438d077695b99d9aac b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/fa/567f568ed72157c0c617438d077695b99d9aac new file mode 100644 index 0000000000000000000000000000000000000000..ad5a3cf4f2289302c712888568f61f6afd43fa1a GIT binary patch literal 662 zcmV;H0%`qt0Zo*_a?~&oL^*we5nZCWAp06)- zd7!t`_555>9uhOf;9?MJmP|5P?<=gZkvYcDEuLaWwYSYkGtV<8n&T2$ZY#2(rMyPn zAlB!KR+oo;CGDe)c-OG#4$n5wV5cMg%H%TD(Rq^0wsn3hr-ryBIg*TS!UhwY#tM`{ z(WX*4&4&H{>c`a{~xQW$~5C+=s6uJ+Yv@_9CPTODhS$rluKjRmG6CG zD@?9~#mxvN`IeFsh76r!sdv7B>0@lE!FG(9+^?Mg#HoO6YtQcsMgd0yrJaXG=uI01 zfKgusA~bF6#{x=^a^DNpY%@HstcgfY7H;$4#NeX5B#6|30E2cRj(5<&8}1ME5EF8128%w>78jcAR{CVAjlaP;xtXDO zvN?)zp`y+uL6UY<@3(4z8JZHLQkG~O(16Rp6UdY_sN?moe;3REFDr6Pcpchc?A^-M z@QIRX^=D=fJkXndpKN;*?gR%nm1?F%h3qCvX62p1+TN!a{C1#Iz$lyYovpr#`%R1B wy_))7|MG4UjbUj<<%Fa#OdBZ~|2wWInJ!uw>4&_5L|{tXfY8DG0Xe~qQL@xg)c^nh literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/fd/8b5fe88cda995e70a22ed98701e65b843e05ec b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/fd/8b5fe88cda995e70a22ed98701e65b843e05ec new file mode 100644 index 0000000000000000000000000000000000000000..b6f14634e403147301851fbcdffc67b275b3bd7c GIT binary patch literal 165 zcmV;W09yZe0i}=44FVw$g*{UR4QPNJU`UMdvK`m}FhkbEieWLv?nPq<-ri60<-J_j z_1dKYx9g2r!eqgK56G5vGMWf1BI#^`P7ye1A0kdD?y>Q$OP_rzXgPQ+nlxr*ohx1$ zGC6tgTnZTpiinTC)Fx+o#zyk8)OD*jdE}9P)S17<&mD4IPf`O|3+N`4dj(2~k&dyQ T|HO!y#^w6j21&dDYs63!76MG; literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/fe/f01f3104c8047d05e8572e521c454f8fd4b8db b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/fe/f01f3104c8047d05e8572e521c454f8fd4b8db new file mode 100644 index 0000000000000000000000000000000000000000..715b6a8657cb82115e844624d7b8153d1d17b9f3 GIT binary patch literal 207 zcmV;=05Jb}0V^p=O;s>5GG{O}FfcPQQAjKnBG<2*eK(fL(So$ovP zbpzpRbt+Wiq?-l`CRN`pUvSK^o|~=WB!phksfhaE=JlVLJ)Dn`~DdU1Yvrj>l_zo4eA`2mp_&;vFX BuR#C+ literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchA-1 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchA-1 new file mode 100644 index 000000000..b55325c3e --- /dev/null +++ b/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchA-1 @@ -0,0 +1 @@ +539bd011c4822c560c1d17cab095006b7a10f707 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchA-2 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchA-2 new file mode 100644 index 000000000..d35574340 --- /dev/null +++ b/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchA-2 @@ -0,0 +1 @@ +0bb7ed583d7e9ad507e8b902594f5c9126ea456b diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchB-1 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchB-1 new file mode 100644 index 000000000..d2eecb741 --- /dev/null +++ b/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchB-1 @@ -0,0 +1 @@ +a34e5a16feabbd0335a633aadb8217c9f3dba58d diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchB-2 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchB-2 new file mode 100644 index 000000000..d5cfb2762 --- /dev/null +++ b/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchB-2 @@ -0,0 +1 @@ +723181f1bfd30e47a6d1d36a4d874e31e7a0a1a4 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchC-1 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchC-1 new file mode 100644 index 000000000..346b039b4 --- /dev/null +++ b/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchC-1 @@ -0,0 +1 @@ +ad2ace9e15f66b3d1138922e6ffdc3ea3f967fa6 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchC-2 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchC-2 new file mode 100644 index 000000000..67f3153f5 --- /dev/null +++ b/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchC-2 @@ -0,0 +1 @@ +815b5a1c80ca749d705c7aa0cb294a00cbedd340 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchD-1 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchD-1 new file mode 100644 index 000000000..fa96ccb28 --- /dev/null +++ b/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchD-1 @@ -0,0 +1 @@ +4dfc1be85a9d6c9898152444d32b238b4aecf8cc diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchD-2 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchD-2 new file mode 100644 index 000000000..8a87f9868 --- /dev/null +++ b/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchD-2 @@ -0,0 +1 @@ +007f1ee2af8e5d99906867c4237510e1790a89b8 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchE-1 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchE-1 new file mode 100644 index 000000000..b8d011e2d --- /dev/null +++ b/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchE-1 @@ -0,0 +1 @@ +ca224bba0a8a24f1768804fe5f565b1014af7ef2 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchE-2 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchE-2 new file mode 100644 index 000000000..5e1e1acd9 --- /dev/null +++ b/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchE-2 @@ -0,0 +1 @@ +436ea75c99f527e4b42fddb46abedf7726eb719d diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchE-3 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchE-3 new file mode 100644 index 000000000..eaec8d81a --- /dev/null +++ b/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchE-3 @@ -0,0 +1 @@ +9b258ad4c39f40c24f66bf1faf48eb6202d59c85 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchF-1 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchF-1 new file mode 100644 index 000000000..5f2ca915b --- /dev/null +++ b/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchF-1 @@ -0,0 +1 @@ +783d6539dde96b8873c5b5da3e79cc14cd64830b diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchF-2 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchF-2 new file mode 100644 index 000000000..abe2ea947 --- /dev/null +++ b/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchF-2 @@ -0,0 +1 @@ +ef1783444b61a8671beea4ce1f4d0202677dfbfb diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchG-1 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchG-1 new file mode 100644 index 000000000..af511439b --- /dev/null +++ b/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchG-1 @@ -0,0 +1 @@ +c483ca4bb087174af5cb51d7caa9c09fe4a28ccb diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchG-2 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchG-2 new file mode 100644 index 000000000..24177a247 --- /dev/null +++ b/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchG-2 @@ -0,0 +1 @@ +d71c24b3b113fd1d1909998c5bfe33b86a65ee03 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchH-1 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchH-1 new file mode 100644 index 000000000..ffe9f8cf3 --- /dev/null +++ b/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchH-1 @@ -0,0 +1 @@ +7a9277e0c5ec75339f011c176d0c20e513c4de1c diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchH-2 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchH-2 new file mode 100644 index 000000000..84ed1a2a9 --- /dev/null +++ b/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchH-2 @@ -0,0 +1 @@ +db203155a789fb749aa3c14e93eea2c744a9c6c7 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchI-1 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchI-1 new file mode 100644 index 000000000..2d1ecd026 --- /dev/null +++ b/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchI-1 @@ -0,0 +1 @@ +5607a8c4601a737daadd1f470bde3142aff57026 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchI-2 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchI-2 new file mode 100644 index 000000000..fc360bae2 --- /dev/null +++ b/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchI-2 @@ -0,0 +1 @@ +f7929c5a67a4bdc98247fb4b5098675723932a64 diff --git a/vendor/libgit2/tests/resources/merge-recursive/asparagus.txt b/vendor/libgit2/tests/resources/merge-recursive/asparagus.txt new file mode 100644 index 000000000..ffb36e513 --- /dev/null +++ b/vendor/libgit2/tests/resources/merge-recursive/asparagus.txt @@ -0,0 +1,10 @@ +ASPARAGUS SOUP. + +Take four large bunches of asparagus, scrape it nicely, cut off one inch +of the tops, and lay them in water, chop the stalks and put them on the +fire with a piece of bacon, a large onion cut up, and pepper and salt; +add two quarts of water, boil them till the stalks are quite soft, then +pulp them through a sieve, and strain the water to it, which must be put +back in the pot; put into it a chicken cut up, with the tops of +asparagus which had been laid by, boil it until these last articles are +sufficiently done, thicken with flour, butter and milk, and serve it up. diff --git a/vendor/libgit2/tests/resources/merge-recursive/beef.txt b/vendor/libgit2/tests/resources/merge-recursive/beef.txt new file mode 100644 index 000000000..68f6182f4 --- /dev/null +++ b/vendor/libgit2/tests/resources/merge-recursive/beef.txt @@ -0,0 +1,22 @@ +BEEF SOUP. + +Take the hind shin of beef, cut off all the flesh off the leg-bone, +which must be taken away entirely, or the soup will be greasy. Wash the +meat clean and lay it in a pot, sprinkle over it one small +table-spoonful of pounded black pepper, and two of salt; three onions +the size of a hen's egg, cut small, six small carrots scraped and cut +up, two small turnips pared and cut into dice; pour on three quarts of +water, cover the pot close, and keep it gently and steadily boiling five +hours, which will leave about three pints of clear soup; do not let the +pot boil over, but take off the scum carefully, as it rises. When it has +boiled four hours, put in a small bundle of thyme and parsley, and a +pint of celery cut small, or a tea-spoonful of celery seed pounded. +These latter ingredients would lose their delicate flavour if boiled too +much. Just before you take it up, brown it in the following manner: put +a small table-spoonful of nice brown sugar into an iron skillet, set it +on the fire and stir it till it melts and looks very dark, pour into it +a ladle full of the soup, a little at a time; stirring it all the while. +Strain this browning and mix it well with the soup; take out the bundle +of thyme and parsley, put the nicest pieces of meat in your tureen, and +pour on the soup and vegetables; put in some toasted bread cut in dice, +and serve it up. diff --git a/vendor/libgit2/tests/resources/merge-recursive/bouilli.txt b/vendor/libgit2/tests/resources/merge-recursive/bouilli.txt new file mode 100644 index 000000000..4b7c56500 --- /dev/null +++ b/vendor/libgit2/tests/resources/merge-recursive/bouilli.txt @@ -0,0 +1,18 @@ +SOUP WITH BOUILLI. + +Take the nicest part of the thick brisket of beef, about eight pounds, +put it into a pot with every thing directed for the other soup; make it +exactly in the same way, only put it on an hour sooner, that you may +have time to prepare the bouilli; after it has boiled five hours, take +out the beef, cover up the soup and set it near the fire that it may +keep hot. Take the skin off the beef, have the yelk of an egg well +beaten, dip a feather in it and wash the top of your beef, sprinkle over +it the crumb of stale bread finely grated, put it in a Dutch oven +previously heated, put the top on with coals enough to brown, but not +burn the beef; let it stand nearly an hour, and prepare your gravy +thus:--Take a sufficient quantity of soup and the vegetables boiled in +it; add to it a table-spoonful of red wine, and two of mushroom catsup, +thicken with a little bit of butter and a little brown flour; make it +very hot, pour it in your dish, and put the beef on it. Garnish it with +green pickle, cut in thin slices, serve up the soup in a tureen with +bits of toasted bread. diff --git a/vendor/libgit2/tests/resources/merge-recursive/gravy.txt b/vendor/libgit2/tests/resources/merge-recursive/gravy.txt new file mode 100644 index 000000000..c4e6cca3e --- /dev/null +++ b/vendor/libgit2/tests/resources/merge-recursive/gravy.txt @@ -0,0 +1,8 @@ +GRAVY SOUP. + +Get eight pounds of coarse lean beef--wash it clean and lay it in your +pot, put in the same ingredients as for the shin soup, with the same +quantity of water, and follow the process directed for that. Strain the +soup through a sieve, and serve it up clear, with nothing more than +toasted bread in it; two table-spoonsful of mushroom catsup will add a +fine flavour to the soup. diff --git a/vendor/libgit2/tests/resources/merge-recursive/oyster.txt b/vendor/libgit2/tests/resources/merge-recursive/oyster.txt new file mode 100644 index 000000000..7c7e08f95 --- /dev/null +++ b/vendor/libgit2/tests/resources/merge-recursive/oyster.txt @@ -0,0 +1,13 @@ +OYSTER SOUP! + +Wash and drain two quarts of oysters, put them on with three quarts of +water, three onions chopped up, two or three slices of lean ham, pepper +and salt; boil it till reduced one-half, strain it through a sieve, +return the liquid into the pot, put in one quart of fresh oysters, boil +it till they are sufficiently done, and thicken the soup with four +spoonsful of flour, two gills of rich cream, and the yelks of six new +laid eggs beaten well; boil it a few minutes after the thickening is put +in. Take care that it does not curdle, and that the flour is not in +lumps; serve it up with the last oysters that were put in. If the +flavour of thyme be agreeable, you may put in a little, but take care +that it does not boil in it long enough to discolour the soup. diff --git a/vendor/libgit2/tests/resources/merge-recursive/veal.txt b/vendor/libgit2/tests/resources/merge-recursive/veal.txt new file mode 100644 index 000000000..898d12687 --- /dev/null +++ b/vendor/libgit2/tests/resources/merge-recursive/veal.txt @@ -0,0 +1,20 @@ +VEAL SOUP. + +PUT INTO A POT THREE QUARTS OF WATER, 3 onions cut small, ONE +spoonful of black pepper pounded, and two of salt, with two or three +slices of lean ham; let it boil steadily two hours; skim it +occasionally, then put into it a shin of veal, let it boil two hours +longer; take out the slices of ham, and skim off the grease if any +should rise, take a gill of good cream, mix with it two table-spoonsful +of flour very nicely, and the yelks of two eggs beaten well, strain this +mixture, and add some chopped parsley; pour some soup on by degrees, +stir it well, and pour it into the pot, continuing to stir until it has +boiled two or three minutes to take off the raw taste of the eggs. If +the cream be not perfectly sweet, and the eggs quite new, the thickening +will curdle in the soup. For a change you may put a dozen ripe tomatos +in, first taking off their skins, by letting them stand a few minutes in +hot water, when they may be easily peeled. When made in this way you +must thicken it with the flour only. Any part of the veal may be used, +but the shin or knuckle is the nicest. + +This is a mighty fine recipe! diff --git a/vendor/libgit2/tests/resources/status/.gitted/objects/2b/d0a343aeef7a2cf0d158478966a6e587ff3863 b/vendor/libgit2/tests/resources/status/.gitted/objects/2b/d0a343aeef7a2cf0d158478966a6e587ff3863 new file mode 100644 index 0000000000000000000000000000000000000000..d10ca636b6bf5f66bce633362d871d17d9a292c6 GIT binary patch literal 56 zcmV-80LTA$0ZYosPf{>3VkpVTELKR%%t=)M(#aW#dFiPs3YmEdNkxfy$r%cXc_|9H OiNz(UMO*-@y%7?c&=$P_ literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/status/.gitted/objects/d4/27e0b2e138501a3d15cc376077a3631e15bd46 b/vendor/libgit2/tests/resources/status/.gitted/objects/d4/27e0b2e138501a3d15cc376077a3631e15bd46 new file mode 100644 index 0000000000000000000000000000000000000000..0b3611ae4c9dc635dafd5dc9560cbc2ff5e92198 GIT binary patch literal 38 ucmb4F=r^r$ShV!%gjkt0Mf}BiFxU%DGHf+3b~2JC8SOTvLu;?`=J4eDP*<*dE;n62`k)BYy+6Fc>Nra9wz(d_-EKB)6_f kRq%Rq_qhtM=fz>Ee_l3S@LMBvbgC8SC8;G(PQUH}02WnsssI20 literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/sub.git/logs/HEAD b/vendor/libgit2/tests/resources/sub.git/logs/HEAD new file mode 100644 index 000000000..f636268f6 --- /dev/null +++ b/vendor/libgit2/tests/resources/sub.git/logs/HEAD @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 b7a59b3f4ea13b985f8a1e0d3757d5cd3331add8 Edward Thomson 1442522322 -0400 commit (initial): Initial revision diff --git a/vendor/libgit2/tests/resources/sub.git/logs/refs/heads/master b/vendor/libgit2/tests/resources/sub.git/logs/refs/heads/master new file mode 100644 index 000000000..f636268f6 --- /dev/null +++ b/vendor/libgit2/tests/resources/sub.git/logs/refs/heads/master @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 b7a59b3f4ea13b985f8a1e0d3757d5cd3331add8 Edward Thomson 1442522322 -0400 commit (initial): Initial revision diff --git a/vendor/libgit2/tests/resources/sub.git/objects/10/ddd6d257e01349d514541981aeecea6b2e741d b/vendor/libgit2/tests/resources/sub.git/objects/10/ddd6d257e01349d514541981aeecea6b2e741d new file mode 100644 index 0000000000000000000000000000000000000000..a095b3fb822e3cde46d5d39ff21528c1e1fc70cf GIT binary patch literal 22 ecmb7F=sF|FfcPQQP4}zEJ-XWDauSLElDkA5YKY$pYq^UP|>;c z!`Yv?vtOS2rVLe?n3rFYky@lzQc=PnaQE7!@CU-4S4Bc38`r&gm91AI3sshunUjiB mjfnveC={0_F?TvpB(Aj# zP#zDX=M3Jai6%!5lQ)JGd5n0DNmG`}854s;^h*@sHCFC$qfh7rkCp4j4d%StA6;un toi|>_DRI4kvR0$kMr$}qE2Y@&J|6jxgt)gdN_axg@3Iwc;tNWyL3_OFJ+1%% literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/sub.git/objects/d0/ee23c41b28746d7e822511d7838bce784ae773 b/vendor/libgit2/tests/resources/sub.git/objects/d0/ee23c41b28746d7e822511d7838bce784ae773 new file mode 100644 index 0000000000000000000000000000000000000000..d9bb9c84d8053600309e1bd6393d26b61c47bd78 GIT binary patch literal 54 zcmV-60LlM&0V^p=O;s>9XD~D{Ff%bxNY2R2Nzp5*C}9w|d+k#A17XjrA|aBE>)yP| M)+><(08@Jq$s_(2XaE2J literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/sub.git/refs/heads/master b/vendor/libgit2/tests/resources/sub.git/refs/heads/master new file mode 100644 index 000000000..0e4d6e2a7 --- /dev/null +++ b/vendor/libgit2/tests/resources/sub.git/refs/heads/master @@ -0,0 +1 @@ +b7a59b3f4ea13b985f8a1e0d3757d5cd3331add8 diff --git a/vendor/libgit2/tests/resources/submodule_with_path/.gitmodules b/vendor/libgit2/tests/resources/submodule_with_path/.gitmodules new file mode 100644 index 000000000..ba34c47dc --- /dev/null +++ b/vendor/libgit2/tests/resources/submodule_with_path/.gitmodules @@ -0,0 +1,3 @@ +[submodule "testrepo"] + path = lib/testrepo + url = ../testrepo.git diff --git a/vendor/libgit2/tests/resources/submodule_with_path/.gitted/HEAD b/vendor/libgit2/tests/resources/submodule_with_path/.gitted/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/vendor/libgit2/tests/resources/submodule_with_path/.gitted/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/vendor/libgit2/tests/resources/submodule_with_path/.gitted/config b/vendor/libgit2/tests/resources/submodule_with_path/.gitted/config new file mode 100644 index 000000000..78387c50b --- /dev/null +++ b/vendor/libgit2/tests/resources/submodule_with_path/.gitted/config @@ -0,0 +1,8 @@ +[core] + repositoryformatversion = 0 + filemode = false + bare = false + logallrefupdates = true + symlinks = false + ignorecase = true + hideDotFiles = dotGitOnly diff --git a/vendor/libgit2/tests/resources/submodule_with_path/.gitted/index b/vendor/libgit2/tests/resources/submodule_with_path/.gitted/index new file mode 100644 index 0000000000000000000000000000000000000000..a740b4b91e5595fef2e2b0983480d834da7bdf9e GIT binary patch literal 253 zcmZ?q402{*U|<5_Fsqa(Ak7eFmF@zf5ukAig3aK(%j8Jy$;%fu?lz8gJ$Wg6;fFsH zjx%uUrDvAp=BJeAq!vRJ1I-HqF@ba>l71lb0Sb3n{M*m7-alcwygN_jzOR4$laTTN z2A-VEB>j@q;*z4&f_#YbkRVrAAj_1&NWqY6V-nw|q+S8Xtd@&&D(sB!xQ3lP4AjD4 ys9?Z#)%8!d!<%{O#@bo3x^GY4mj3@b`_cPT!M_=Km$h&Qx=xo~|8AY~c_{$IhD+W6 literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/submodule_with_path/.gitted/objects/18/372280a56a54340fa600aa91315065c6c4c693 b/vendor/libgit2/tests/resources/submodule_with_path/.gitted/objects/18/372280a56a54340fa600aa91315065c6c4c693 new file mode 100644 index 0000000000000000000000000000000000000000..d9b4313e187ed50eb03ad8c99a11ae9bbfa14879 GIT binary patch literal 85 zcmV-b0IL6Z0V^p=O;s?nWH2-^Ff%bx&`ZxO$<0qG%}Fh0Fv~DB3~ws^w&Jf$@I2nw r1vl3IS2HmH0)?E+B!;W5f3h9k%u6@c&XU!Ad-}HY|JT_795W{55>P0GzrDa}b$P%23+E-6Ya$XANx;w(rk$xyIW$jMC7 VhY53WmKNmz#q{(LLI7Du7m_mY8dU%Q literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/submodule_with_path/.gitted/objects/89/ca686bb21bfb75dda99a02313831a0c418f921 b/vendor/libgit2/tests/resources/submodule_with_path/.gitted/objects/89/ca686bb21bfb75dda99a02313831a0c418f921 new file mode 100644 index 0000000000000000000000000000000000000000..7c1af6645b3678f7cddabf69568fbe93b73c26c7 GIT binary patch literal 161 zcmV;S0ABxi0i}-14Z<)GL^-<(HvsbbvvDMZxX=L&*z1jwgW1S2qJ2yaoM!Z-HyV;! zx2~;&Q*X>V16sq2MH>qk5167aFw+zrJ6FhufHad+dusgZnxfB3m~yf<_%dP`IS_J& z1oOf%7sIBYO7Ff((~t5=t?1_}^^ljo@}R$VuNyTvWa$@@deh)NB1W*F&n6h71|3H` P|1qIN_CtLE2lz_SuD?t; literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/submodule_with_path/.gitted/objects/b1/620ef2628d10416a84d19c783e33dc4556c9c3 b/vendor/libgit2/tests/resources/submodule_with_path/.gitted/objects/b1/620ef2628d10416a84d19c783e33dc4556c9c3 new file mode 100644 index 0000000000000000000000000000000000000000..4475582597be6c70d7350a9d6e9dd3106b6d7d31 GIT binary patch literal 86 zcmV-c0IC0Y0V^p=O;s?nWH2-^Ff%bx&`ZxO$<0qG%}Fh0*ky90_T=RY8+RK=yPmw1 sz3{`I3CB$gfIuN9Gl}7<>z{0gH}leswX5XNWE?P0GzrDa}b$P%23+E-6Ya$XANx;w(rk$xyIW$jMC7 ahY53WmKNmz#q{*xLVD?$C0qc#AQ=eHq#alQ literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/submodule_with_path/.gitted/objects/c8/4bf57ba2254dba216ab5c6eb1a19fe8bd0e0d6 b/vendor/libgit2/tests/resources/submodule_with_path/.gitted/objects/c8/4bf57ba2254dba216ab5c6eb1a19fe8bd0e0d6 new file mode 100644 index 0000000000000000000000000000000000000000..9f664569ce0477eeddf845279556266ded79ab69 GIT binary patch literal 127 zcmV-_0D%8^0i})04Z<)CKsjd$F933WZYm+v3mdS2up4eLK1{#Z}`(UZSY*b+*WvPS`U50JrDb%rS8)7 h(9&9V=y!`00M=Q)Z&t&)Pj75W$|x6&wBra>GJM8mHWQ_@lQg^ J0{~*65=1l57(D<0 literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/submodule_with_path/.gitted/refs/heads/master b/vendor/libgit2/tests/resources/submodule_with_path/.gitted/refs/heads/master new file mode 100644 index 000000000..4b5a5a21d --- /dev/null +++ b/vendor/libgit2/tests/resources/submodule_with_path/.gitted/refs/heads/master @@ -0,0 +1 @@ +89ca686bb21bfb75dda99a02313831a0c418f921 diff --git a/vendor/libgit2/tests/resources/super/.gitted/COMMIT_EDITMSG b/vendor/libgit2/tests/resources/super/.gitted/COMMIT_EDITMSG new file mode 100644 index 000000000..e2d6b8987 --- /dev/null +++ b/vendor/libgit2/tests/resources/super/.gitted/COMMIT_EDITMSG @@ -0,0 +1 @@ +submodule diff --git a/vendor/libgit2/tests/resources/super/.gitted/HEAD b/vendor/libgit2/tests/resources/super/.gitted/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/vendor/libgit2/tests/resources/super/.gitted/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/vendor/libgit2/tests/resources/super/.gitted/config b/vendor/libgit2/tests/resources/super/.gitted/config new file mode 100644 index 000000000..06a8b7790 --- /dev/null +++ b/vendor/libgit2/tests/resources/super/.gitted/config @@ -0,0 +1,10 @@ +[core] + repositoryformatversion = 0 + filemode = false + bare = false + logallrefupdates = true + symlinks = false + ignorecase = true + hideDotFiles = dotGitOnly +[submodule "sub"] + url = ../sub.git diff --git a/vendor/libgit2/tests/resources/super/.gitted/index b/vendor/libgit2/tests/resources/super/.gitted/index new file mode 100644 index 0000000000000000000000000000000000000000..cc2ffffb980f6eade02621e7431faffc830c96e9 GIT binary patch literal 217 zcmZ?q402{*U|<5_(BFmvK$-zYgV+$zxCF)m(!qfda}>M3SM{!ZdE@qh>DRML)YXnK zaOp0i)X@;dTKg{30SZ^EfSPb1kPO Nt$y+J!W`S|A^_*II9C7w literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/super/.gitted/objects/51/589c218bf77a8da9e9d8dbc097d76a742726c4 b/vendor/libgit2/tests/resources/super/.gitted/objects/51/589c218bf77a8da9e9d8dbc097d76a742726c4 new file mode 100644 index 0000000000000000000000000000000000000000..727d3a696894fe8d07899ae0b520da02596720cd GIT binary patch literal 90 zcmV-g0HyzU0ZYosPg1ZjW{55>P0GzrDa}b$Py#ZQV!1dA5=$}^Y!!e!F3!@T93V5< wDkdg9vm_=aCo>618|fOy#FV5KmlVgu6r~pDmlh?b0+~P!dO%q&0A7+GCFlAeGXMYp literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/super/.gitted/objects/79/d0d58ca6aa1688a073d280169908454cad5b91 b/vendor/libgit2/tests/resources/super/.gitted/objects/79/d0d58ca6aa1688a073d280169908454cad5b91 new file mode 100644 index 0000000000000000000000000000000000000000..7fd889d5f1cfe79f0b769d2682e3f5a888f0fa3b GIT binary patch literal 132 zcmV-~0DJ#<0i}&e3IZ_@06pgw{Q;%3nFxb;@dth&Nw>^^u^|h7-|-FJiaJyksdXEm zV?2z;3>16_=a_xK6fH+2G)$#vw1%>FK3Mi>ol0}8(%?>?)CeA{)GlvWc(*^g)vYw? m@*Jlk^$OZKAU@$Z=Ff%bx&`ZxO$<0qG%}Fh02#lDc*!{h#cje0)w+~Fe to>ii*cEr%k004F=r^r$ShV!%gjkt0Mf}BiFxU%DGHf+3b~2JC8WaR~zh<5!@R2oUp#XSw!IdGIQz z=v?~Y?9bfUFHe0_X5iCH&n!tSDJjZKDlJJZhL|Jy2bqSLXZjY+JiS{5F=8+@FfcPQQP4}zEJ-XWDauSLElDkA5YKY$pYq^UP|>;c z!`Yv?vtOS2rVLf-?C-~LE6Hl_)a*@v8-k8=9DnQlAy!h?94hToP-2KrJ~1&-ucV@c xq2G1YwNKVlIe%2-B-TkDR9{z?Fbir#Vrd0F6VftsQVAJRRaJ#k2>{B;WqZ3*KK=jz literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/win32-forbidden/.gitted/objects/17/6a458f94e0ea5272ce67c36bf30b6be9caf623 b/vendor/libgit2/tests/resources/win32-forbidden/.gitted/objects/17/6a458f94e0ea5272ce67c36bf30b6be9caf623 new file mode 100644 index 0000000000000000000000000000000000000000..ef83166706c43aabd3c68d155be9c92a23960f0f GIT binary patch literal 28 kcmb5Fkmn=FfcPQQE>M6W4M)MwRdXvroRnA$2pF_b^Z`5scR0E z_9-Ya#3!Gan5b7$QNqygy6V~|>#3YSDsmF*BoC^uD@&LKH6pRJ0-p(KnK`M1jHs%r L!l?uR{HIf1PD3w2 literal 0 HcmV?d00001 diff --git a/vendor/libgit2/tests/resources/win32-forbidden/.gitted/objects/34/96991d72d500af36edef68bbfcccd1661d88db b/vendor/libgit2/tests/resources/win32-forbidden/.gitted/objects/34/96991d72d500af36edef68bbfcccd1661d88db new file mode 100644 index 000000000..71b6172c6 --- /dev/null +++ b/vendor/libgit2/tests/resources/win32-forbidden/.gitted/objects/34/96991d72d500af36edef68bbfcccd1661d88db @@ -0,0 +1,3 @@ +x•Í +!…[ûw„ãï†hÓ¢}/à8šB*8N½~½@guÎÇÕœS‡ Í¡7ïa¢ +©fš2ËÐ"s e.È%ŒÁQ —ŠØ½ÇÚ຾m[ákÞjÙúm—Gêq_N®æ3LBJÅ”FG:B¯Ýÿã ®„ùùäVROö Í¿Ò–j!èÖ=ö \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/win32-forbidden/.gitted/objects/8f/45aad6f23b9509f8786c617e19c127ae76609a b/vendor/libgit2/tests/resources/win32-forbidden/.gitted/objects/8f/45aad6f23b9509f8786c617e19c127ae76609a new file mode 100644 index 000000000..8bcd980c4 --- /dev/null +++ b/vendor/libgit2/tests/resources/win32-forbidden/.gitted/objects/8f/45aad6f23b9509f8786c617e19c127ae76609a @@ -0,0 +1,2 @@ +xÁA +€ ÐÖâ/kÓ.ð ]`„™¾ŽhÞ¾÷"=â Ë•ò€e*’ ¨·UŠÂ+¶äMí%çý´O4ÊcÞ˱þá– \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/win32-forbidden/.gitted/objects/da/623abd956bb2fd8052c708c7ed43f05d192d37 b/vendor/libgit2/tests/resources/win32-forbidden/.gitted/objects/da/623abd956bb2fd8052c708c7ed43f05d192d37 new file mode 100644 index 0000000000000000000000000000000000000000..923462306f0fb2612820702c6b18f53f3c95b479 GIT binary patch literal 59 zcmbFMi#hOzsp>a%59Po8VGq(58w PWV-n4LPmy_m?ÛBgôqàãøVJ ³=FÀ ‰¤ÕdJTæqDd­BáæNå¼'Îì6Rëp ÛÜS+k«pŠÓþÖå™GÚÜÁ·rAR*Tz!Øó ›vVGü÷Ïn5l_Ðã;¯¹Uö>H \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/win32-forbidden/.gitted/refs/heads/master b/vendor/libgit2/tests/resources/win32-forbidden/.gitted/refs/heads/master new file mode 100644 index 000000000..47fce0fe3 --- /dev/null +++ b/vendor/libgit2/tests/resources/win32-forbidden/.gitted/refs/heads/master @@ -0,0 +1 @@ +3496991d72d500af36edef68bbfcccd1661d88db diff --git a/vendor/libgit2/tests/revert/workdir.c b/vendor/libgit2/tests/revert/workdir.c index 9f83bd842..802819c75 100644 --- a/vendor/libgit2/tests/revert/workdir.c +++ b/vendor/libgit2/tests/revert/workdir.c @@ -410,7 +410,7 @@ void test_revert_workdir__rename_1_of_2(void) { 0100644, "0f5bfcf58c558d865da6be0281d7795993646cee", 2, "file6.txt" }, }; - opts.merge_opts.tree_flags |= GIT_MERGE_TREE_FIND_RENAMES; + opts.merge_opts.flags |= GIT_MERGE_FIND_RENAMES; opts.merge_opts.rename_threshold = 50; git_oid_fromstr(&head_oid, "cef56612d71a6af8d8015691e4865f7fece905b5"); @@ -444,7 +444,7 @@ void test_revert_workdir__rename(void) { "file4.txt", "file5.txt", "" }, }; - opts.merge_opts.tree_flags |= GIT_MERGE_TREE_FIND_RENAMES; + opts.merge_opts.flags |= GIT_MERGE_FIND_RENAMES; opts.merge_opts.rename_threshold = 50; git_oid_fromstr(&head_oid, "55568c8de5322ff9a95d72747a239cdb64a19965"); diff --git a/vendor/libgit2/tests/revwalk/basic.c b/vendor/libgit2/tests/revwalk/basic.c index 829d8e844..5ed7da4eb 100644 --- a/vendor/libgit2/tests/revwalk/basic.c +++ b/vendor/libgit2/tests/revwalk/basic.c @@ -456,7 +456,8 @@ void test_revwalk_basic__big_timestamp(void) cl_git_pass(git_signature_new(&sig, "Joe", "joe@example.com", 2399662595, 0)); cl_git_pass(git_commit_tree(&tree, tip)); - cl_git_pass(git_commit_create(&id, _repo, "HEAD", sig, sig, NULL, "some message", tree, 1, (const git_commit **) &tip)); + cl_git_pass(git_commit_create(&id, _repo, "HEAD", sig, sig, NULL, "some message", tree, 1, + (const git_commit **)&tip)); cl_git_pass(git_revwalk_push_head(_walk)); diff --git a/vendor/libgit2/tests/status/ignore.c b/vendor/libgit2/tests/status/ignore.c index ba1d69a99..c318046da 100644 --- a/vendor/libgit2/tests/status/ignore.c +++ b/vendor/libgit2/tests/status/ignore.c @@ -148,7 +148,7 @@ void test_status_ignore__ignore_pattern_contains_space(void) cl_git_pass(git_status_file(&flags, g_repo, "foo bar.txt")); cl_assert(flags == GIT_STATUS_IGNORED); - cl_git_pass(git_futils_mkdir_r("empty_standard_repo/foo", NULL, mode)); + cl_git_pass(git_futils_mkdir_r("empty_standard_repo/foo", mode)); cl_git_mkfile("empty_standard_repo/foo/look-ma.txt", "I'm not going to be ignored!"); cl_git_pass(git_status_file(&flags, g_repo, "foo/look-ma.txt")); @@ -206,7 +206,7 @@ void test_status_ignore__subdirectories(void) * used a rooted path for an ignore, so I changed this behavior. */ cl_git_pass(git_futils_mkdir_r( - "empty_standard_repo/test/ignore_me", NULL, 0775)); + "empty_standard_repo/test/ignore_me", 0775)); cl_git_mkfile( "empty_standard_repo/test/ignore_me/file", "I'm going to be ignored!"); cl_git_mkfile( @@ -230,9 +230,9 @@ static void make_test_data(const char *reponame, const char **files) g_repo = cl_git_sandbox_init(reponame); for (scan = files; *scan != NULL; ++scan) { - cl_git_pass(git_futils_mkdir( + cl_git_pass(git_futils_mkdir_relative( *scan + repolen, reponame, - 0777, GIT_MKDIR_PATH | GIT_MKDIR_SKIP_LAST)); + 0777, GIT_MKDIR_PATH | GIT_MKDIR_SKIP_LAST, NULL)); cl_git_mkfile(*scan, "contents"); } } @@ -612,7 +612,7 @@ void test_status_ignore__issue_1766_negated_ignores(void) g_repo = cl_git_sandbox_init("empty_standard_repo"); cl_git_pass(git_futils_mkdir_r( - "empty_standard_repo/a", NULL, 0775)); + "empty_standard_repo/a", 0775)); cl_git_mkfile( "empty_standard_repo/a/.gitignore", "*\n!.gitignore\n"); cl_git_mkfile( @@ -622,7 +622,7 @@ void test_status_ignore__issue_1766_negated_ignores(void) assert_is_ignored("a/ignoreme"); cl_git_pass(git_futils_mkdir_r( - "empty_standard_repo/b", NULL, 0775)); + "empty_standard_repo/b", 0775)); cl_git_mkfile( "empty_standard_repo/b/.gitignore", "*\n!.gitignore\n"); cl_git_mkfile( @@ -1022,3 +1022,20 @@ void test_status_ignore__negate_exact_previous(void) cl_git_pass(git_ignore_path_is_ignored(&ignored, g_repo, ".buildpath")); cl_assert_equal_i(1, ignored); } + +void test_status_ignore__negate_starstar(void) +{ + int ignored; + + g_repo = cl_git_sandbox_init("empty_standard_repo"); + + cl_git_mkfile("empty_standard_repo/.gitignore", + "code/projects/**/packages/*\n" + "!code/projects/**/packages/repositories.config"); + + cl_git_pass(git_futils_mkdir_r("empty_standard_repo/code/projects/foo/bar/packages", 0777)); + cl_git_mkfile("empty_standard_repo/code/projects/foo/bar/packages/repositories.config", ""); + + cl_git_pass(git_ignore_path_is_ignored(&ignored, g_repo, "code/projects/foo/bar/packages/repositories.config")); + cl_assert_equal_i(0, ignored); +} diff --git a/vendor/libgit2/tests/status/worktree.c b/vendor/libgit2/tests/status/worktree.c index 75c7b71b0..5d3b4d55e 100644 --- a/vendor/libgit2/tests/status/worktree.c +++ b/vendor/libgit2/tests/status/worktree.c @@ -195,7 +195,7 @@ void test_status_worktree__swap_subdir_with_recurse_and_pathspec(void) cl_git_pass(p_rename("status/subdir", "status/current_file")); cl_git_pass(p_rename("status/swap", "status/subdir")); cl_git_mkfile("status/.new_file", "dummy"); - cl_git_pass(git_futils_mkdir_r("status/zzz_new_dir", NULL, 0777)); + cl_git_pass(git_futils_mkdir_r("status/zzz_new_dir", 0777)); cl_git_mkfile("status/zzz_new_dir/new_file", "dummy"); cl_git_mkfile("status/zzz_new_file", "dummy"); @@ -657,7 +657,7 @@ void test_status_worktree__conflict_has_no_oid(void) entry.mode = 0100644; entry.path = "modified_file"; - git_oid_fromstr(&entry.id, "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef"); + git_oid_fromstr(&entry.id, "452e4244b5d083ddf0460acf1ecc74db9dcfa11a"); cl_git_pass(git_repository_index(&index, repo)); cl_git_pass(git_index_conflict_add(index, &entry, &entry, &entry)); @@ -917,7 +917,7 @@ void test_status_worktree__long_filenames(void) // Create directory with amazingly long filename sprintf(path, "empty_standard_repo/%s", longname); - cl_git_pass(git_futils_mkdir_r(path, NULL, 0777)); + cl_git_pass(git_futils_mkdir_r(path, 0777)); sprintf(path, "empty_standard_repo/%s/foo", longname); cl_git_mkfile(path, "dummy"); @@ -1006,8 +1006,11 @@ void test_status_worktree__unreadable(void) git_status_options opts = GIT_STATUS_OPTIONS_INIT; status_entry_counts counts = {0}; + if (geteuid() == 0) + cl_skip(); + /* Create directory with no read permission */ - cl_git_pass(git_futils_mkdir_r("empty_standard_repo/no_permission", NULL, 0777)); + cl_git_pass(git_futils_mkdir_r("empty_standard_repo/no_permission", 0777)); cl_git_mkfile("empty_standard_repo/no_permission/foo", "dummy"); p_chmod("empty_standard_repo/no_permission", 0644); @@ -1041,7 +1044,7 @@ void test_status_worktree__unreadable_not_included(void) status_entry_counts counts = {0}; /* Create directory with no read permission */ - cl_git_pass(git_futils_mkdir_r("empty_standard_repo/no_permission", NULL, 0777)); + cl_git_pass(git_futils_mkdir_r("empty_standard_repo/no_permission", 0777)); cl_git_mkfile("empty_standard_repo/no_permission/foo", "dummy"); p_chmod("empty_standard_repo/no_permission", 0644); @@ -1074,7 +1077,7 @@ void test_status_worktree__unreadable_as_untracked(void) status_entry_counts counts = {0}; /* Create directory with no read permission */ - cl_git_pass(git_futils_mkdir_r("empty_standard_repo/no_permission", NULL, 0777)); + cl_git_pass(git_futils_mkdir_r("empty_standard_repo/no_permission", 0777)); cl_git_mkfile("empty_standard_repo/no_permission/foo", "dummy"); p_chmod("empty_standard_repo/no_permission", 0644); diff --git a/vendor/libgit2/tests/status/worktree_init.c b/vendor/libgit2/tests/status/worktree_init.c index cc7e126f1..9d5cfa5a3 100644 --- a/vendor/libgit2/tests/status/worktree_init.c +++ b/vendor/libgit2/tests/status/worktree_init.c @@ -191,10 +191,10 @@ void test_status_worktree_init__bracket_in_filename(void) cl_git_pass(git_status_file(&status_flags, repo, FILE_WITHOUT_BRACKET)); cl_assert(status_flags == GIT_STATUS_WT_NEW); - cl_git_pass(git_status_file(&status_flags, repo, "LICENSE\\[1\\].md")); - cl_assert(status_flags == GIT_STATUS_INDEX_NEW); + cl_git_fail_with(git_status_file(&status_flags, repo, "LICENSE\\[1\\].md"), GIT_ENOTFOUND); cl_git_pass(git_status_file(&status_flags, repo, FILE_WITH_BRACKET)); + cl_assert(status_flags == GIT_STATUS_INDEX_NEW); git_index_free(index); git_repository_free(repo); diff --git a/vendor/libgit2/tests/submodule/lookup.c b/vendor/libgit2/tests/submodule/lookup.c index ecea694e5..148f9273e 100644 --- a/vendor/libgit2/tests/submodule/lookup.c +++ b/vendor/libgit2/tests/submodule/lookup.c @@ -333,3 +333,58 @@ void test_submodule_lookup__prefix_name(void) git_submodule_free(sm); } + +void test_submodule_lookup__renamed(void) +{ + const char *newpath = "sm_actually_changed"; + git_index *idx; + sm_lookup_data data; + + cl_git_pass(git_repository_index__weakptr(&idx, g_repo)); + + /* We're replicating 'git mv sm_unchanged sm_actually_changed' in this test */ + + cl_git_pass(p_rename("submod2/sm_unchanged", "submod2/sm_actually_changed")); + + /* Change the path in .gitmodules and stage it*/ + { + git_config *cfg; + + cl_git_pass(git_config_open_ondisk(&cfg, "submod2/.gitmodules")); + cl_git_pass(git_config_set_string(cfg, "submodule.sm_unchanged.path", newpath)); + git_config_free(cfg); + + cl_git_pass(git_index_add_bypath(idx, ".gitmodules")); + } + + /* Change the worktree info in the submodule's config */ + { + git_config *cfg; + + cl_git_pass(git_config_open_ondisk(&cfg, "submod2/.git/modules/sm_unchanged/config")); + cl_git_pass(git_config_set_string(cfg, "core.worktree", "../../../sm_actually_changed")); + git_config_free(cfg); + } + + /* Rename the entry in the index */ + { + const git_index_entry *e; + git_index_entry entry = {{ 0 }}; + + e = git_index_get_bypath(idx, "sm_unchanged", 0); + cl_assert(e); + cl_assert_equal_i(GIT_FILEMODE_COMMIT, e->mode); + + entry.path = newpath; + entry.mode = GIT_FILEMODE_COMMIT; + git_oid_cpy(&entry.id, &e->id); + + cl_git_pass(git_index_remove(idx, "sm_unchanged", 0)); + cl_git_pass(git_index_add(idx, &entry)); + cl_git_pass(git_index_write(idx)); + } + + memset(&data, 0, sizeof(data)); + cl_git_pass(git_submodule_foreach(g_repo, sm_lookup_cb, &data)); + cl_assert_equal_i(8, data.count); +} diff --git a/vendor/libgit2/tests/submodule/status.c b/vendor/libgit2/tests/submodule/status.c index 6721ee92a..10f385ce9 100644 --- a/vendor/libgit2/tests/submodule/status.c +++ b/vendor/libgit2/tests/submodule/status.c @@ -92,7 +92,7 @@ void test_submodule_status__ignore_none(void) cl_assert((status & GIT_SUBMODULE_STATUS_WD_DELETED) != 0); /* now mkdir sm_unchanged to test uninitialized */ - cl_git_pass(git_futils_mkdir("sm_unchanged", "submod2", 0755, 0)); + cl_git_pass(git_futils_mkdir_relative("sm_unchanged", "submod2", 0755, 0, NULL)); status = get_submodule_status(g_repo, "sm_unchanged"); cl_assert((status & GIT_SUBMODULE_STATUS_WD_UNINITIALIZED) != 0); @@ -141,7 +141,7 @@ void test_submodule_status__ignore_untracked(void) cl_assert((status & GIT_SUBMODULE_STATUS_WD_DELETED) != 0); /* now mkdir sm_unchanged to test uninitialized */ - cl_git_pass(git_futils_mkdir("sm_unchanged", "submod2", 0755, 0)); + cl_git_pass(git_futils_mkdir_relative("sm_unchanged", "submod2", 0755, 0, NULL)); cl_git_pass(git_submodule_status(&status, g_repo,"sm_unchanged", ign)); cl_assert((status & GIT_SUBMODULE_STATUS_WD_UNINITIALIZED) != 0); @@ -185,7 +185,7 @@ void test_submodule_status__ignore_dirty(void) cl_assert((status & GIT_SUBMODULE_STATUS_WD_DELETED) != 0); /* now mkdir sm_unchanged to test uninitialized */ - cl_git_pass(git_futils_mkdir("sm_unchanged", "submod2", 0755, 0)); + cl_git_pass(git_futils_mkdir_relative("sm_unchanged", "submod2", 0755, 0, NULL)); cl_git_pass(git_submodule_status(&status, g_repo,"sm_unchanged", ign)); cl_assert((status & GIT_SUBMODULE_STATUS_WD_UNINITIALIZED) != 0); @@ -229,7 +229,7 @@ void test_submodule_status__ignore_all(void) cl_assert(GIT_SUBMODULE_STATUS_IS_UNMODIFIED(status)); /* now mkdir sm_unchanged to test uninitialized */ - cl_git_pass(git_futils_mkdir("sm_unchanged", "submod2", 0755, 0)); + cl_git_pass(git_futils_mkdir_relative("sm_unchanged", "submod2", 0755, 0, NULL)); cl_git_pass(git_submodule_status(&status, g_repo,"sm_unchanged", ign)); cl_assert(GIT_SUBMODULE_STATUS_IS_UNMODIFIED(status)); @@ -264,6 +264,7 @@ static int confirm_submodule_status( void test_submodule_status__iterator(void) { git_iterator *iter; + git_iterator_options iter_opts = GIT_ITERATOR_OPTIONS_INIT; const git_index_entry *entry; size_t i; static const char *expected[] = { @@ -308,9 +309,10 @@ void test_submodule_status__iterator(void) git_status_options opts = GIT_STATUS_OPTIONS_INIT; git_index *index; + iter_opts.flags = GIT_ITERATOR_IGNORE_CASE | GIT_ITERATOR_INCLUDE_TREES; + cl_git_pass(git_repository_index(&index, g_repo)); - cl_git_pass(git_iterator_for_workdir(&iter, g_repo, index, NULL, - GIT_ITERATOR_IGNORE_CASE | GIT_ITERATOR_INCLUDE_TREES, NULL, NULL)); + cl_git_pass(git_iterator_for_workdir(&iter, g_repo, index, NULL, &iter_opts)); for (i = 0; !git_iterator_advance(&entry, iter); ++i) cl_assert_equal_s(expected[i], entry->path); @@ -336,7 +338,7 @@ void test_submodule_status__untracked_dirs_containing_ignored_files(void) "submod2/.git/modules/sm_unchanged/info/exclude", "\n*.ignored\n"); cl_git_pass( - git_futils_mkdir("sm_unchanged/directory", "submod2", 0755, 0)); + git_futils_mkdir_relative("sm_unchanged/directory", "submod2", 0755, 0, NULL)); cl_git_mkfile( "submod2/sm_unchanged/directory/i_am.ignored", "ignore this file, please\n"); diff --git a/vendor/libgit2/tests/submodule/submodule_helpers.c b/vendor/libgit2/tests/submodule/submodule_helpers.c index 1dc687231..4ff4b4da7 100644 --- a/vendor/libgit2/tests/submodule/submodule_helpers.c +++ b/vendor/libgit2/tests/submodule/submodule_helpers.c @@ -126,6 +126,22 @@ git_repository *setup_fixture_submod2(void) return repo; } +git_repository *setup_fixture_super(void) +{ + git_repository *repo = cl_git_sandbox_init("super"); + + cl_fixture_sandbox("sub.git"); + p_mkdir("super/sub", 0777); + + rewrite_gitmodules(git_repository_workdir(repo)); + + cl_set_cleanup(cleanup_fixture_submodules, "sub.git"); + + cl_git_pass(git_repository_reinit_filesystem(repo, 1)); + + return repo; +} + git_repository *setup_fixture_submodule_simple(void) { git_repository *repo = cl_git_sandbox_init("submodule_simple"); @@ -140,6 +156,21 @@ git_repository *setup_fixture_submodule_simple(void) return repo; } +git_repository *setup_fixture_submodule_with_path(void) +{ + git_repository *repo = cl_git_sandbox_init("submodule_with_path"); + + cl_fixture_sandbox("testrepo.git"); + p_mkdir("submodule_with_path/lib", 0777); + p_mkdir("submodule_with_path/lib/testrepo", 0777); + + cl_set_cleanup(cleanup_fixture_submodules, "testrepo.git"); + + cl_git_pass(git_repository_reinit_filesystem(repo, 1)); + + return repo; +} + void assert__submodule_exists( git_repository *repo, const char *name, const char *msg, const char *file, int line) diff --git a/vendor/libgit2/tests/submodule/submodule_helpers.h b/vendor/libgit2/tests/submodule/submodule_helpers.h index 1493f245f..42b14a7bc 100644 --- a/vendor/libgit2/tests/submodule/submodule_helpers.h +++ b/vendor/libgit2/tests/submodule/submodule_helpers.h @@ -4,6 +4,8 @@ extern void rewrite_gitmodules(const char *workdir); extern git_repository *setup_fixture_submodules(void); extern git_repository *setup_fixture_submod2(void); extern git_repository *setup_fixture_submodule_simple(void); +extern git_repository *setup_fixture_super(void); +extern git_repository *setup_fixture_submodule_with_path(void); extern unsigned int get_submodule_status(git_repository *, const char *); diff --git a/vendor/libgit2/tests/submodule/update.c b/vendor/libgit2/tests/submodule/update.c index 40d24d0a7..cbd519d81 100644 --- a/vendor/libgit2/tests/submodule/update.c +++ b/vendor/libgit2/tests/submodule/update.c @@ -131,6 +131,53 @@ void test_submodule_update__update_submodule(void) git_submodule_free(sm); } +void test_submodule_update__update_submodule_with_path(void) +{ + git_submodule *sm; + git_submodule_update_options update_options = GIT_SUBMODULE_UPDATE_OPTIONS_INIT; + unsigned int submodule_status = 0; + struct update_submodule_cb_payload update_payload = { 0 }; + + g_repo = setup_fixture_submodule_with_path(); + + update_options.checkout_opts.progress_cb = checkout_progress_cb; + update_options.checkout_opts.progress_payload = &update_payload; + + update_options.fetch_opts.callbacks.update_tips = update_tips; + update_options.fetch_opts.callbacks.payload = &update_payload; + + /* get the submodule */ + cl_git_pass(git_submodule_lookup(&sm, g_repo, "testrepo")); + + /* verify the initial state of the submodule */ + cl_git_pass(git_submodule_status(&submodule_status, g_repo, "testrepo", GIT_SUBMODULE_IGNORE_UNSPECIFIED)); + cl_assert_equal_i(submodule_status, GIT_SUBMODULE_STATUS_IN_HEAD | + GIT_SUBMODULE_STATUS_IN_INDEX | + GIT_SUBMODULE_STATUS_IN_CONFIG | + GIT_SUBMODULE_STATUS_WD_UNINITIALIZED); + + /* initialize and update the submodule */ + cl_git_pass(git_submodule_init(sm, 0)); + cl_git_pass(git_submodule_update(sm, 0, &update_options)); + + /* verify state */ + cl_git_pass(git_submodule_status(&submodule_status, g_repo, "testrepo", GIT_SUBMODULE_IGNORE_UNSPECIFIED)); + cl_assert_equal_i(submodule_status, GIT_SUBMODULE_STATUS_IN_HEAD | + GIT_SUBMODULE_STATUS_IN_INDEX | + GIT_SUBMODULE_STATUS_IN_CONFIG | + GIT_SUBMODULE_STATUS_IN_WD); + + cl_assert(git_oid_streq(git_submodule_head_id(sm), "a65fedf39aefe402d3bb6e24df4d4f5fe4547750") == 0); + cl_assert(git_oid_streq(git_submodule_wd_id(sm), "a65fedf39aefe402d3bb6e24df4d4f5fe4547750") == 0); + cl_assert(git_oid_streq(git_submodule_index_id(sm), "a65fedf39aefe402d3bb6e24df4d4f5fe4547750") == 0); + + /* verify that the expected callbacks have been called. */ + cl_assert_equal_i(1, update_payload.checkout_progress_called); + cl_assert_equal_i(1, update_payload.update_tips_called); + + git_submodule_free(sm); +} + void test_submodule_update__update_and_init_submodule(void) { git_submodule *sm; @@ -390,3 +437,4 @@ void test_submodule_update__can_force_update(void) git_object_free(branch_commit); git_reference_free(branch_reference); } + diff --git a/vendor/libgit2/tests/threads/iterator.c b/vendor/libgit2/tests/threads/iterator.c index 8a2d79c2e..6b86cf1a0 100644 --- a/vendor/libgit2/tests/threads/iterator.c +++ b/vendor/libgit2/tests/threads/iterator.c @@ -13,10 +13,13 @@ static void *run_workdir_iterator(void *arg) { int error = 0; git_iterator *iter; + git_iterator_options iter_opts = GIT_ITERATOR_OPTIONS_INIT; const git_index_entry *entry = NULL; + iter_opts.flags = GIT_ITERATOR_DONT_AUTOEXPAND; + cl_git_pass(git_iterator_for_workdir( - &iter, _repo, NULL, NULL, GIT_ITERATOR_DONT_AUTOEXPAND, NULL, NULL)); + &iter, _repo, NULL, NULL, &iter_opts)); while (!error) { if (entry && entry->mode == GIT_FILEMODE_TREE) { diff --git a/vendor/libgit2/tests/trace/windows/stacktrace.c b/vendor/libgit2/tests/trace/windows/stacktrace.c new file mode 100644 index 000000000..c00c1b774 --- /dev/null +++ b/vendor/libgit2/tests/trace/windows/stacktrace.c @@ -0,0 +1,151 @@ +#include "clar_libgit2.h" +#include "win32/w32_stack.h" + +#if defined(GIT_MSVC_CRTDBG) +static void a(void) +{ + char buf[10000]; + + cl_assert(git_win32__stack(buf, sizeof(buf), 0, NULL, NULL) == 0); + +#if 0 + fprintf(stderr, "Stacktrace from [%s:%d]:\n%s\n", __FILE__, __LINE__, buf); +#endif +} + +static void b(void) +{ + a(); +} + +static void c(void) +{ + b(); +} +#endif + +void test_trace_windows_stacktrace__basic(void) +{ +#if defined(GIT_MSVC_CRTDBG) + c(); +#endif +} + + +void test_trace_windows_stacktrace__leaks(void) +{ +#if defined(GIT_MSVC_CRTDBG) + void * p1; + void * p2; + void * p3; + void * p4; + int before, after; + int leaks; + int error; + + /* remember outstanding leaks due to set setup + * and set mark/checkpoint. + */ + before = git_win32__crtdbg_stacktrace__dump( + GIT_WIN32__CRTDBG_STACKTRACE__QUIET | + GIT_WIN32__CRTDBG_STACKTRACE__LEAKS_TOTAL | + GIT_WIN32__CRTDBG_STACKTRACE__SET_MARK, + NULL); + + p1 = git__malloc(5); + leaks = git_win32__crtdbg_stacktrace__dump( + GIT_WIN32__CRTDBG_STACKTRACE__QUIET | + GIT_WIN32__CRTDBG_STACKTRACE__LEAKS_SINCE_MARK, + "p1"); + cl_assert((leaks == 1)); + + p2 = git__malloc(5); + leaks = git_win32__crtdbg_stacktrace__dump( + GIT_WIN32__CRTDBG_STACKTRACE__QUIET | + GIT_WIN32__CRTDBG_STACKTRACE__LEAKS_SINCE_MARK, + "p1,p2"); + cl_assert((leaks == 2)); + + p3 = git__malloc(5); + leaks = git_win32__crtdbg_stacktrace__dump( + GIT_WIN32__CRTDBG_STACKTRACE__QUIET | + GIT_WIN32__CRTDBG_STACKTRACE__LEAKS_SINCE_MARK, + "p1,p2,p3"); + cl_assert((leaks == 3)); + + git__free(p2); + leaks = git_win32__crtdbg_stacktrace__dump( + GIT_WIN32__CRTDBG_STACKTRACE__QUIET | + GIT_WIN32__CRTDBG_STACKTRACE__LEAKS_SINCE_MARK, + "p1,p3"); + cl_assert((leaks == 2)); + + /* move the mark. only new leaks should appear afterwards */ + error = git_win32__crtdbg_stacktrace__dump( + GIT_WIN32__CRTDBG_STACKTRACE__SET_MARK, + NULL); + cl_assert((error == 0)); + + leaks = git_win32__crtdbg_stacktrace__dump( + GIT_WIN32__CRTDBG_STACKTRACE__QUIET | + GIT_WIN32__CRTDBG_STACKTRACE__LEAKS_SINCE_MARK, + "not_p1,not_p3"); + cl_assert((leaks == 0)); + + p4 = git__malloc(5); + leaks = git_win32__crtdbg_stacktrace__dump( + GIT_WIN32__CRTDBG_STACKTRACE__QUIET | + GIT_WIN32__CRTDBG_STACKTRACE__LEAKS_SINCE_MARK, + "p4,not_p1,not_p3"); + cl_assert((leaks == 1)); + + git__free(p1); + git__free(p3); + leaks = git_win32__crtdbg_stacktrace__dump( + GIT_WIN32__CRTDBG_STACKTRACE__QUIET | + GIT_WIN32__CRTDBG_STACKTRACE__LEAKS_SINCE_MARK, + "p4"); + cl_assert((leaks == 1)); + + git__free(p4); + leaks = git_win32__crtdbg_stacktrace__dump( + GIT_WIN32__CRTDBG_STACKTRACE__QUIET | + GIT_WIN32__CRTDBG_STACKTRACE__LEAKS_SINCE_MARK, + "end"); + cl_assert((leaks == 0)); + + /* confirm current absolute leaks count matches beginning value. */ + after = git_win32__crtdbg_stacktrace__dump( + GIT_WIN32__CRTDBG_STACKTRACE__QUIET | + GIT_WIN32__CRTDBG_STACKTRACE__LEAKS_TOTAL, + "total"); + cl_assert((before == after)); +#endif +} + +#if defined(GIT_MSVC_CRTDBG) +static void aux_cb_alloc__1(unsigned int *aux_id) +{ + static unsigned int aux_counter = 0; + + *aux_id = aux_counter++; +} + +static void aux_cb_lookup__1(unsigned int aux_id, char *aux_msg, unsigned int aux_msg_len) +{ + p_snprintf(aux_msg, aux_msg_len, "\tQQ%08x\n", aux_id); +} + +#endif + +void test_trace_windows_stacktrace__aux1(void) +{ +#if defined(GIT_MSVC_CRTDBG) + git_win32__stack__set_aux_cb(aux_cb_alloc__1, aux_cb_lookup__1); + c(); + c(); + c(); + c(); + git_win32__stack__set_aux_cb(NULL, NULL); +#endif +} diff --git a/vendor/libgit2/tests/transport/register.c b/vendor/libgit2/tests/transport/register.c index ea917d5d3..97aae6b20 100644 --- a/vendor/libgit2/tests/transport/register.c +++ b/vendor/libgit2/tests/transport/register.c @@ -40,15 +40,23 @@ void test_transport_register__custom_transport_error_remove_non_existing(void) void test_transport_register__custom_transport_ssh(void) { + const char *urls[] = { + "ssh://somehost:somepath", + "ssh+git://somehost:somepath", + "git+ssh://somehost:somepath", + "git@somehost:somepath", + }; git_transport *transport; + unsigned i; + for (i = 0; i < ARRAY_SIZE(urls); i++) { #ifndef GIT_SSH - cl_git_fail_with(git_transport_new(&transport, NULL, "ssh://somehost:somepath"), -1); - cl_git_fail_with(git_transport_new(&transport, NULL, "git@somehost:somepath"), -1); + cl_git_fail_with(git_transport_new(&transport, NULL, urls[i]), -1); #else - cl_git_pass(git_transport_new(&transport, NULL, "git@somehost:somepath")); - transport->free(transport); + cl_git_pass(git_transport_new(&transport, NULL, urls[i])); + transport->free(transport); #endif + } cl_git_pass(git_transport_register("ssh", dummy_transport, NULL)); @@ -58,11 +66,12 @@ void test_transport_register__custom_transport_ssh(void) cl_git_pass(git_transport_unregister("ssh")); + for (i = 0; i < ARRAY_SIZE(urls); i++) { #ifndef GIT_SSH - cl_git_fail_with(git_transport_new(&transport, NULL, "ssh://somehost:somepath"), -1); - cl_git_fail_with(git_transport_new(&transport, NULL, "git@somehost:somepath"), -1); + cl_git_fail_with(git_transport_new(&transport, NULL, urls[i]), -1); #else - cl_git_pass(git_transport_new(&transport, NULL, "git@somehost:somepath")); - transport->free(transport); + cl_git_pass(git_transport_new(&transport, NULL, urls[i])); + transport->free(transport); #endif + } } diff --git a/vendor/libgit2/tests/win32/forbidden.c b/vendor/libgit2/tests/win32/forbidden.c new file mode 100644 index 000000000..e02f41179 --- /dev/null +++ b/vendor/libgit2/tests/win32/forbidden.c @@ -0,0 +1,183 @@ +#include "clar_libgit2.h" + +#include "repository.h" +#include "buffer.h" +#include "submodule.h" + +static const char *repo_name = "win32-forbidden"; +static git_repository *repo; + +void test_win32_forbidden__initialize(void) +{ + repo = cl_git_sandbox_init(repo_name); +} + +void test_win32_forbidden__cleanup(void) +{ + cl_git_sandbox_cleanup(); +} + +void test_win32_forbidden__can_open_index(void) +{ + git_index *index; + cl_git_pass(git_repository_index(&index, repo)); + cl_assert_equal_i(7, git_index_entrycount(index)); + + /* ensure we can even write the unmodified index */ + cl_git_pass(git_index_write(index)); + + git_index_free(index); +} + +void test_win32_forbidden__can_add_forbidden_filename_with_entry(void) +{ + git_index *index; + git_index_entry entry = {{0}}; + + cl_git_pass(git_repository_index(&index, repo)); + + entry.path = "aux"; + entry.mode = GIT_FILEMODE_BLOB; + git_oid_fromstr(&entry.id, "da623abd956bb2fd8052c708c7ed43f05d192d37"); + + cl_git_pass(git_index_add(index, &entry)); + + git_index_free(index); +} + +void test_win32_forbidden__cannot_add_dot_git_even_with_entry(void) +{ + git_index *index; + git_index_entry entry = {{0}}; + + cl_git_pass(git_repository_index(&index, repo)); + + entry.path = "foo/.git"; + entry.mode = GIT_FILEMODE_BLOB; + git_oid_fromstr(&entry.id, "da623abd956bb2fd8052c708c7ed43f05d192d37"); + + cl_git_fail(git_index_add(index, &entry)); + + git_index_free(index); +} + +void test_win32_forbidden__cannot_add_forbidden_filename_from_filesystem(void) +{ + git_index *index; + + /* since our function calls are very low-level, we can create `aux.`, + * but we should not be able to add it to the index + */ + cl_git_pass(git_repository_index(&index, repo)); + cl_git_write2file("win32-forbidden/aux.", "foo\n", 4, O_RDWR | O_CREAT, 0666); + +#ifdef GIT_WIN32 + cl_git_fail(git_index_add_bypath(index, "aux.")); +#else + cl_git_pass(git_index_add_bypath(index, "aux.")); +#endif + + cl_must_pass(p_unlink("win32-forbidden/aux.")); + git_index_free(index); +} + +static int dummy_submodule_cb( + git_submodule *sm, const char *name, void *payload) +{ + GIT_UNUSED(sm); + GIT_UNUSED(name); + GIT_UNUSED(payload); + return 0; +} + +void test_win32_forbidden__can_diff_tree_to_index(void) +{ + git_diff *diff; + git_tree *tree; + + cl_git_pass(git_repository_head_tree(&tree, repo)); + cl_git_pass(git_diff_tree_to_index(&diff, repo, tree, NULL, NULL)); + cl_assert_equal_i(0, git_diff_num_deltas(diff)); + git_diff_free(diff); + git_tree_free(tree); +} + +void test_win32_forbidden__can_diff_tree_to_tree(void) +{ + git_diff *diff; + git_tree *tree; + + cl_git_pass(git_repository_head_tree(&tree, repo)); + cl_git_pass(git_diff_tree_to_tree(&diff, repo, tree, tree, NULL)); + cl_assert_equal_i(0, git_diff_num_deltas(diff)); + git_diff_free(diff); + git_tree_free(tree); +} + +void test_win32_forbidden__can_diff_index_to_workdir(void) +{ + git_index *index; + git_diff *diff; + const git_diff_delta *delta; + git_tree *tree; + size_t i; + + cl_git_pass(git_repository_index(&index, repo)); + cl_git_pass(git_repository_head_tree(&tree, repo)); + cl_git_pass(git_diff_index_to_workdir(&diff, repo, index, NULL)); + + for (i = 0; i < git_diff_num_deltas(diff); i++) { + delta = git_diff_get_delta(diff, i); + cl_assert_equal_i(GIT_DELTA_DELETED, delta->status); + } + + git_diff_free(diff); + git_tree_free(tree); + git_index_free(index); +} + +void test_win32_forbidden__checking_out_forbidden_index_fails(void) +{ +#ifdef GIT_WIN32 + git_index *index; + git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; + git_diff *diff; + const git_diff_delta *delta; + git_tree *tree; + size_t num_deltas, i; + + opts.checkout_strategy = GIT_CHECKOUT_FORCE; + + cl_git_pass(git_repository_index(&index, repo)); + cl_git_fail(git_checkout_index(repo, index, &opts)); + + cl_git_pass(git_repository_head_tree(&tree, repo)); + cl_git_pass(git_diff_index_to_workdir(&diff, repo, index, NULL)); + + num_deltas = git_diff_num_deltas(diff); + + cl_assert(num_deltas > 0); + + for (i = 0; i < num_deltas; i++) { + delta = git_diff_get_delta(diff, i); + cl_assert_equal_i(GIT_DELTA_DELETED, delta->status); + } + + git_diff_free(diff); + git_tree_free(tree); + git_index_free(index); +#endif +} + +void test_win32_forbidden__can_query_submodules(void) +{ + cl_git_pass(git_submodule_foreach(repo, dummy_submodule_cb, NULL)); +} + +void test_win32_forbidden__can_blame_file(void) +{ + git_blame *blame; + + cl_git_pass(git_blame_file(&blame, repo, "aux", NULL)); + git_blame_free(blame); +} diff --git a/vendor/libgit2/tests/win32/longpath.c b/vendor/libgit2/tests/win32/longpath.c index 6de7d389a..5a36875ed 100644 --- a/vendor/libgit2/tests/win32/longpath.c +++ b/vendor/libgit2/tests/win32/longpath.c @@ -36,7 +36,7 @@ void assert_name_too_long(void) { const git_error *err; size_t expected_len, actual_len; - const char *expected_msg; + char *expected_msg; err = giterr_last(); actual_len = strlen(err->message); @@ -46,6 +46,8 @@ void assert_name_too_long(void) /* check the suffix */ cl_assert_equal_s(expected_msg, err->message + (actual_len - expected_len)); + + git__free(expected_msg); } #endif From 35580b5de51d2a7683216d685301a3e96a927dc5 Mon Sep 17 00:00:00 2001 From: John Haley Date: Thu, 21 Apr 2016 16:13:49 -0700 Subject: [PATCH 23/61] Sorted file sources in `libgit2.gyp` --- vendor/libgit2.gyp | 72 +++++++++++++++++++++++----------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/vendor/libgit2.gyp b/vendor/libgit2.gyp index 8880a2438..5b87172e8 100644 --- a/vendor/libgit2.gyp +++ b/vendor/libgit2.gyp @@ -27,20 +27,21 @@ "libssh2" ], "sources": [ - "libgit2/src/annotated_commit.h", + "libgit2/include/git2/sys/hashsig.h", "libgit2/src/annotated_commit.c", + "libgit2/src/annotated_commit.h", "libgit2/src/array.h", - "libgit2/src/attr.c", - "libgit2/src/attr.h", "libgit2/src/attr_file.c", "libgit2/src/attr_file.h", + "libgit2/src/attr.c", + "libgit2/src/attr.h", "libgit2/src/attrcache.c", "libgit2/src/attrcache.h", "libgit2/src/bitvec.h", - "libgit2/src/blame.c", - "libgit2/src/blame.h", "libgit2/src/blame_git.c", "libgit2/src/blame_git.h", + "libgit2/src/blame.c", + "libgit2/src/blame.h", "libgit2/src/blob.c", "libgit2/src/blob.h", "libgit2/src/branch.c", @@ -58,24 +59,22 @@ "libgit2/src/cherrypick.c", "libgit2/src/clone.c", "libgit2/src/clone.h", - "libgit2/src/commit.c", - "libgit2/src/commit.h", "libgit2/src/commit_list.c", "libgit2/src/commit_list.h", + "libgit2/src/commit.c", + "libgit2/src/commit.h", "libgit2/src/common.h", - "libgit2/src/config.c", - "libgit2/src/config.h", "libgit2/src/config_cache.c", "libgit2/src/config_file.c", "libgit2/src/config_file.h", + "libgit2/src/config.c", + "libgit2/src/config.h", "libgit2/src/crlf.c", "libgit2/src/date.c", "libgit2/src/delta-apply.c", "libgit2/src/delta-apply.h", "libgit2/src/delta.c", "libgit2/src/delta.h", - "libgit2/src/diff.c", - "libgit2/src/diff.h", "libgit2/src/diff_driver.c", "libgit2/src/diff_driver.h", "libgit2/src/diff_file.c", @@ -87,6 +86,8 @@ "libgit2/src/diff_tform.c", "libgit2/src/diff_xdiff.c", "libgit2/src/diff_xdiff.h", + "libgit2/src/diff.c", + "libgit2/src/diff.h", "libgit2/src/errors.c", "libgit2/src/fetch.c", "libgit2/src/fetch.h", @@ -105,8 +106,10 @@ "libgit2/src/graph.c", "libgit2/src/hash.c", "libgit2/src/hash.h", + "libgit2/src/hash/hash_generic.c", + "libgit2/src/hash/hash_generic.h", + "libgit2/src/hash/hash_openssl.h", "libgit2/src/hashsig.c", - "libgit2/include/git2/sys/hashsig.h", "libgit2/src/ident.c", "libgit2/src/ignore.c", "libgit2/src/ignore.h", @@ -117,10 +120,10 @@ "libgit2/src/iterator.h", "libgit2/src/khash.h", "libgit2/src/map.h", - "libgit2/src/merge.c", - "libgit2/src/merge.h", "libgit2/src/merge_file.c", "libgit2/src/merge_file.h", + "libgit2/src/merge.c", + "libgit2/src/merge.h", "libgit2/src/message.c", "libgit2/src/message.h", "libgit2/src/mwindow.c", @@ -129,14 +132,14 @@ "libgit2/src/netops.h", "libgit2/src/notes.c", "libgit2/src/notes.h", + "libgit2/src/object_api.c", "libgit2/src/object.c", "libgit2/src/object.h", - "libgit2/src/object_api.c", - "libgit2/src/odb.c", - "libgit2/src/odb.h", "libgit2/src/odb_loose.c", "libgit2/src/odb_mempack.c", "libgit2/src/odb_pack.c", + "libgit2/src/odb.c", + "libgit2/src/odb.h", "libgit2/src/offmap.h", "libgit2/src/oid.c", "libgit2/src/oid.h", @@ -162,10 +165,10 @@ "libgit2/src/push.c", "libgit2/src/push.h", "libgit2/src/rebase.c", - "libgit2/src/refdb.c", - "libgit2/src/refdb.h", "libgit2/src/refdb_fs.c", "libgit2/src/refdb_fs.h", + "libgit2/src/refdb.c", + "libgit2/src/refdb.h", "libgit2/src/reflog.c", "libgit2/src/reflog.h", "libgit2/src/refs.c", @@ -209,6 +212,18 @@ "libgit2/src/trace.h", "libgit2/src/transaction.c", "libgit2/src/transport.c", + "libgit2/src/transports/auth.c", + "libgit2/src/transports/auth.h", + "libgit2/src/transports/cred_helpers.c", + "libgit2/src/transports/cred.c", + "libgit2/src/transports/git.c", + "libgit2/src/transports/http.c", + "libgit2/src/transports/local.c", + "libgit2/src/transports/smart_pkt.c", + "libgit2/src/transports/smart_protocol.c", + "libgit2/src/transports/smart.c", + "libgit2/src/transports/smart.h", + "libgit2/src/transports/ssh.c", "libgit2/src/tree-cache.c", "libgit2/src/tree-cache.h", "libgit2/src/tree.c", @@ -219,23 +234,6 @@ "libgit2/src/util.h", "libgit2/src/vector.c", "libgit2/src/vector.h", - "libgit2/src/zstream.c", - "libgit2/src/zstream.h", - "libgit2/src/hash/hash_generic.c", - "libgit2/src/hash/hash_generic.h", - "libgit2/src/hash/hash_openssl.h", - "libgit2/src/transports/auth.c", - "libgit2/src/transports/auth.h", - "libgit2/src/transports/cred.c", - "libgit2/src/transports/cred_helpers.c", - "libgit2/src/transports/git.c", - "libgit2/src/transports/http.c", - "libgit2/src/transports/local.c", - "libgit2/src/transports/smart.c", - "libgit2/src/transports/smart.h", - "libgit2/src/transports/smart_pkt.c", - "libgit2/src/transports/smart_protocol.c", - "libgit2/src/transports/ssh.c", "libgit2/src/xdiff/xdiff.h", "libgit2/src/xdiff/xdiffi.c", "libgit2/src/xdiff/xdiffi.h", @@ -251,6 +249,8 @@ "libgit2/src/xdiff/xtypes.h", "libgit2/src/xdiff/xutils.c", "libgit2/src/xdiff/xutils.h", + "libgit2/src/zstream.c", + "libgit2/src/zstream.h" ], "conditions": [ ["OS=='mac'", { From 49dcb78fd475c9524cf18cfd02b66275978a9730 Mon Sep 17 00:00:00 2001 From: John Haley Date: Mon, 25 Apr 2016 11:29:18 -0700 Subject: [PATCH 24/61] libgit2 builds now --- vendor/libgit2.gyp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vendor/libgit2.gyp b/vendor/libgit2.gyp index 5b87172e8..fdcf123f0 100644 --- a/vendor/libgit2.gyp +++ b/vendor/libgit2.gyp @@ -255,7 +255,8 @@ "conditions": [ ["OS=='mac'", { "defines": [ - "GIT_SECURE_TRANSPORT" + "GIT_SECURE_TRANSPORT", + "GIT_USE_STAT_MTIMESPEC" ], "sources": [ "libgit2/src/stransport_stream.c", From e4e495f17c3628b1dacc58833d34c50c34a1f309 Mon Sep 17 00:00:00 2001 From: John Haley Date: Tue, 26 Apr 2016 10:59:36 -0700 Subject: [PATCH 25/61] NodeGit builds... AGAIN!!! --- generate/input/callbacks.json | 25 ++++++ generate/input/descriptor.json | 6 ++ generate/input/libgit2-supplement.json | 106 ------------------------- 3 files changed, 31 insertions(+), 106 deletions(-) diff --git a/generate/input/callbacks.json b/generate/input/callbacks.json index eb6b128a3..999ccd57f 100644 --- a/generate/input/callbacks.json +++ b/generate/input/callbacks.json @@ -285,6 +285,31 @@ "success": 0, "error": -1 } + },"git_diff_progress_cb": { + "args": [ + { + "name": "diff_so_far", + "cType": "const git_diff *" + }, + { + "name": "old_path", + "cType": "const char *" + }, + { + "name": "new_path", + "cType": "const char *" + }, + { + "name": "payload", + "cType": "void *" + } + ], + "return": { + "type": "int", + "noResults": 1, + "success": 0, + "error": -1 + } }, "git_index_matched_path_cb": { "args": [ diff --git a/generate/input/descriptor.json b/generate/input/descriptor.json index b4577b092..608ca3498 100644 --- a/generate/input/descriptor.json +++ b/generate/input/descriptor.json @@ -416,12 +416,18 @@ } } }, + "git_commit_create_buffer": { + "ignore": true + }, "git_commit_create_from_callback": { "ignore": true }, "git_commit_create_from_ids": { "ignore": true }, + "git_commit_extract_signature": { + "ignore": true + }, "git_commit_id": { "return": { "ownedByThis": true diff --git a/generate/input/libgit2-supplement.json b/generate/input/libgit2-supplement.json index f525a6390..5e7028f35 100644 --- a/generate/input/libgit2-supplement.json +++ b/generate/input/libgit2-supplement.json @@ -522,48 +522,6 @@ ] } ], - [ - "git_merge_options", - { - "type": "struct", - "fields": [ - { - "type": "unsigned int", - "name": "version" - }, - { - "type": "git_merge_tree_flag_t", - "name": "tree_flags" - }, - { - "type": "unsigned int", - "name": "rename_threshold" - }, - { - "type": "unsigned int", - "name": "target_limit" - }, - { - "type": "git_diff_similarity_metric *", - "name": "metric", - "ignore": true - }, - { - "type": "git_merge_file_favor_t", - "name": "file_favor" - }, - { - "type": "unsigned int", - "name": "file_flags" - } - ], - "used": { - "needs": [ - "git_merge_init_options" - ] - } - } - ], [ "git_off_t", { @@ -691,70 +649,6 @@ } } ], - [ - "git_diff_options", - { - "type": "struct", - "fields": [ - { - "type": "unsigned int", - "name": "version" - }, - { - "type": "uint32_t", - "name": "flags" - }, - { - "type": "git_submodule_ignore_t", - "name": "ignore_submodules" - }, - { - "type": "git_strarray", - "name": "pathspec" - }, - { - "type": "git_diff_notify_cb", - "name": "notify_cb" - }, - { - "type": "void *", - "name": "notify_payload" - }, - { - "type": "uint32_t", - "name": "context_lines" - }, - { - "type": "uint32_t", - "name": "interhunk_lines" - }, - { - "type": "uint16_t", - "name": "id_abbrev" - }, - { - "type": "git_off_t", - "name": "max_size" - }, - { - "type": "const char *", - "name": "old_prefix" - }, - { - "type": "const char *", - "name": "new_prefix" - } - ], - "used": { - "needs": [ - "git_diff_init_options", - "git_diff_tree_to_workdir", - "git_diff_tree_to_workdirext", - "git_diff_tree_to_tree" - ] - } - } - ], [ "git_stash_apply_options", { From 8cca9b4d8ed04efda3ba68d2eb2f858ba7f89222 Mon Sep 17 00:00:00 2001 From: Chris Bargren Date: Wed, 6 Apr 2016 11:46:35 -0700 Subject: [PATCH 26/61] Fixing checkout test --- lib/checkout.js | 6 +++--- test/tests/checkout.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/checkout.js b/lib/checkout.js index 01f0ef59b..652f6116a 100644 --- a/lib/checkout.js +++ b/lib/checkout.js @@ -15,7 +15,7 @@ var _tree = Checkout.tree; * @return {Void} checkout complete */ Checkout.head = function(url, options) { - options = normalizeOptions(options, NodeGit.CheckoutOptions); + options = normalizeOptions(options || {}, NodeGit.CheckoutOptions); return _head.call(this, url, options); }; @@ -30,7 +30,7 @@ Checkout.head = function(url, options) { * @return {Void} checkout complete */ Checkout.index = function(repo, index, options) { - options = normalizeOptions(options, NodeGit.CheckoutOptions); + options = normalizeOptions(options || {}, NodeGit.CheckoutOptions); return _index.call(this, repo, index, options); }; @@ -45,7 +45,7 @@ Checkout.index = function(repo, index, options) { * @return {Void} checkout complete */ Checkout.tree = function(repo, treeish, options) { - options = normalizeOptions(options, NodeGit.CheckoutOptions); + options = normalizeOptions(options || {}, NodeGit.CheckoutOptions); return _tree.call(this, repo, treeish, options); }; diff --git a/test/tests/checkout.js b/test/tests/checkout.js index cdde973ed..e3815a35f 100644 --- a/test/tests/checkout.js +++ b/test/tests/checkout.js @@ -75,7 +75,7 @@ describe("Checkout", function() { var test = this; return test.repository.getTagByName("annotated-tag").then(function(tag) { - return Checkout.tree(test.repository, test.tag); + return Checkout.tree(test.repository, tag); }).then(function() { return test.repository.getHeadCommit(); }).then(function(commit) { From ad097c7917c09225b600a2ebb3fd7e010a57efce Mon Sep 17 00:00:00 2001 From: John Haley Date: Mon, 25 Apr 2016 17:19:50 -0700 Subject: [PATCH 27/61] Make graph error test more resilient. --- test/tests/graph.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/test/tests/graph.js b/test/tests/graph.js index abeaefa4c..34805cda0 100644 --- a/test/tests/graph.js +++ b/test/tests/graph.js @@ -9,9 +9,6 @@ describe("Graph", function() { var reposPath = local("../repos/workdir"); - var expectedError = "Object not found - no match for id " + - "(81b06facd90fe7a6e9bbd9cee59736a79105b7be)"; - beforeEach(function() { var test = this; @@ -54,14 +51,14 @@ describe("Graph", function() { }); }); - it("will error if provided bad commits", function() { + it("descendantOf will error if provided bad commits", function() { return Graph.descendantOf( this.repository, "81b06facd90fe7a6e9bbd9cee59736a79105b7be", "26744fc697849d370246749b67ac43b792a4af0c" ) .catch(function(result) { - assert.equal(result.message, expectedError); + assert(~result.message.indexOf("81b06fac")); }); }); }); From 76fb03cf5823854c7335155e6de6b63a631d483a Mon Sep 17 00:00:00 2001 From: John Haley Date: Mon, 25 Apr 2016 17:32:32 -0700 Subject: [PATCH 28/61] Fix remote tests --- lib/remote.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/remote.js b/lib/remote.js index 949702100..29b157c1a 100644 --- a/lib/remote.js +++ b/lib/remote.js @@ -25,13 +25,20 @@ Remote.lookup = lookupWrapper(Remote); * @async * @param {Enums.DIRECTION} direction The direction for the connection * @param {RemoteCallbacks} callbacks The callback functions for the connection + * @param {ProxyOptions} proxyOpts Proxy settings + * @param {Array[String]} customHeaders extra HTTP headers to use * @param {Function} callback * @return {Number} error code */ -Remote.prototype.connect = function(direction, callbacks) { +Remote.prototype.connect = function( + direction, + callbacks, + customHeaders +) { callbacks = normalizeOptions(callbacks, NodeGit.RemoteCallbacks); + customHeaders = customHeaders || []; - return connect.call(this, direction, callbacks); + return connect.call(this, direction, callbacks, customHeaders); }; /** From 295f50703e6d995ff02de37f96c3ab91336e56b4 Mon Sep 17 00:00:00 2001 From: John Haley Date: Tue, 26 Apr 2016 10:18:08 -0700 Subject: [PATCH 29/61] Fix `TreeEntry` --- generate/input/libgit2-supplement.json | 45 +++++++++++++------------- lib/tree_entry.js | 17 +++++----- test/tests/tree_entry.js | 6 ++-- 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/generate/input/libgit2-supplement.json b/generate/input/libgit2-supplement.json index 5e7028f35..78f954255 100644 --- a/generate/input/libgit2-supplement.json +++ b/generate/input/libgit2-supplement.json @@ -82,28 +82,6 @@ }, "git_note_iterator": { "decl": "git_iterator" - }, - "git_tree_entry": { - "fields": [ - { - "name": "attr", - "type": "uint16_t" - }, - { - "name": "oid", - "type": "git_oid" - }, - { - "name": "filename_len", - "type": "size_t" - }, - { - "name": "filename", - "structType": "char", - "structName": "filename[1]", - "type": "char *" - } - ] } }, "new" : { @@ -305,6 +283,18 @@ "git_status_list_get_perfdata", "git_status_list_new" ] + ], + [ + "tree_entry", + [ + "git_tree_entry_filemode", + "git_tree_entry_filemode_raw", + "git_tree_entry_free", + "git_tree_entry_id", + "git_tree_entry_name", + "git_tree_entry_to_object", + "git_tree_entry_type" + ] ] ], "types": [ @@ -722,6 +712,17 @@ "git_status_list_get_perfdata", "git_status_list_new" ] + }, + "tree": { + "functions": [ + "git_tree_entry_filemode", + "git_tree_entry_filemode_raw", + "git_tree_entry_free", + "git_tree_entry_id", + "git_tree_entry_name", + "git_tree_entry_to_object", + "git_tree_entry_type" + ] } }, "groups": { diff --git a/lib/tree_entry.js b/lib/tree_entry.js index f13e27a99..3b084c32e 100644 --- a/lib/tree_entry.js +++ b/lib/tree_entry.js @@ -1,6 +1,5 @@ var path = require("path"); var NodeGit = require("../"); -var Tree = NodeGit.Tree; var TreeEntry = NodeGit.TreeEntry; /** @@ -8,8 +7,8 @@ var TreeEntry = NodeGit.TreeEntry; * @return {Boolean} */ TreeEntry.prototype.isFile = function() { - return this.attr() === TreeEntry.FILEMODE.BLOB || - this.attr() === TreeEntry.FILEMODE.EXECUTABLE; + return this.filemode() === TreeEntry.FILEMODE.BLOB || + this.filemode() === TreeEntry.FILEMODE.EXECUTABLE; }; /** @@ -17,7 +16,7 @@ TreeEntry.prototype.isFile = function() { * @return {Boolean} */ TreeEntry.prototype.isTree = function() { - return this.attr() === TreeEntry.FILEMODE.TREE; + return this.filemode() === TreeEntry.FILEMODE.TREE; }; /** @@ -37,7 +36,7 @@ TreeEntry.prototype.isBlob = TreeEntry.prototype.isFile; * @return {String} */ TreeEntry.prototype.sha = function() { - return this.oid().toString(); + return this.id().toString(); }; /** @@ -48,7 +47,7 @@ TreeEntry.prototype.sha = function() { TreeEntry.prototype.getTree = function(callback) { var entry = this; - return this.parent.repo.getTree(this.oid()).then(function(tree) { + return this.parent.repo.getTree(this.id()).then(function(tree) { tree.entry = entry; if (typeof callback === "function") { @@ -65,7 +64,7 @@ TreeEntry.prototype.getTree = function(callback) { * @return {Blob} */ TreeEntry.prototype.getBlob = function(callback) { - return this.parent.repo.getBlob(this.oid()).then(function(blob) { + return this.parent.repo.getBlob(this.id()).then(function(blob) { if (typeof callback === "function") { callback(null, blob); } @@ -80,7 +79,7 @@ TreeEntry.prototype.getBlob = function(callback) { */ TreeEntry.prototype.path = function(callback) { var dirtoparent = this.dirtoparent || ""; - return path.join(this.parent.path(), dirtoparent, this.filename()); + return path.join(this.parent.path(), dirtoparent, this.name()); }; /** @@ -91,5 +90,5 @@ TreeEntry.prototype.toString = function() { }; TreeEntry.prototype.oid = function() { - return Tree.entryId(this).toString(); + return this.id().toString(); }; diff --git a/test/tests/tree_entry.js b/test/tests/tree_entry.js index 6585b4b94..b4d3abb18 100644 --- a/test/tests/tree_entry.js +++ b/test/tests/tree_entry.js @@ -41,14 +41,14 @@ describe("TreeEntry", function() { it("provides the correct length for a file", function() { return this.commit.getEntry("README.md") .then(function(entry) { - assert.equal(entry.filenameLen(), 9); + assert.equal(entry.name().length, 9); }); }); it("provides the filename", function() { return this.commit.getEntry("test/raw-commit.js") .then(function(entry) { - assert.equal(entry.filename(), "raw-commit.js"); + assert.equal(entry.name(), "raw-commit.js"); }); }); @@ -64,7 +64,7 @@ describe("TreeEntry", function() { var dir = _dir || "", testPromises = []; tree.entries().forEach(function(entry) { - var currentPath = path.join(dir, entry.filename()); + var currentPath = path.join(dir, entry.name()); if (entry.isTree()) { testPromises.push( entry.getTree().then(function (subtree) { From 099ecab2141ed068edb02b73327b4e865b61d1da Mon Sep 17 00:00:00 2001 From: Kyle Smith Date: Mon, 25 Apr 2016 17:17:31 -0700 Subject: [PATCH 30/61] Use diff options even if the commit has no parent --- lib/commit.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/commit.js b/lib/commit.js index 116af204b..28145ecae 100644 --- a/lib/commit.js +++ b/lib/commit.js @@ -197,7 +197,7 @@ Commit.prototype.getDiffWithOptions = function(options, callback) { }); }); } else { - diffs = [thisTree.diff(null)]; + diffs = [thisTree.diffWithOptions(null, options)]; } return Promise.all(diffs); From 6adcde393b7c6b90c6df37a54b75e1c263d8a6b6 Mon Sep 17 00:00:00 2001 From: Kyle Smith Date: Mon, 25 Apr 2016 13:01:09 -0700 Subject: [PATCH 31/61] Added more Diff.merge tests --- test/tests/diff.js | 98 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 97 insertions(+), 1 deletion(-) diff --git a/test/tests/diff.js b/test/tests/diff.js index 4b2cdfe33..43d14a3ec 100644 --- a/test/tests/diff.js +++ b/test/tests/diff.js @@ -349,7 +349,7 @@ describe("Diff", function() { }); - it("can merge two diffs", function() { + it("can merge two commit diffs", function() { var linesOfFirstDiff; var linesOfSecondDiff; var firstDiff = this.diff[0]; @@ -385,6 +385,102 @@ describe("Diff", function() { }); }); + describe( + "merge between commit diff and workdir and index diff", function() { + beforeEach(function() { + var test = this; + var diffOptions = new NodeGit.DiffOptions(); + var IGNORE_CASE_FLAG = 1 << 10; + diffOptions.flags = diffOptions.flags |= IGNORE_CASE_FLAG; + return fse.writeFile( + path.join(test.repository.workdir(), "newFile.txt"), "some line\n" + ) + .then(function() { + return test.index.addAll(undefined, undefined, function() { + // ensure that there is no deadlock if we call + // a sync libgit2 function from the callback + test.repository.path(); + + return 0; // confirm add + }); + }) + .then(function() { + return test.repository.getHeadCommit(); + }) + .then(function(headCommit) { + return headCommit.getTree(); + }) + .then(function(headTree) { + return Promise.all([ + Diff.treeToWorkdirWithIndex(test.repository, headTree, diffOptions), + test.commit.getDiffWithOptions(diffOptions) + ]); + }) + .then(function(diffs) { + test.workDirWithIndexDiff = diffs[0]; + // The second item in `diffs` is the commit diff which contains and + // array of diffs, one for each parent + test.commitDiff = diffs[1][0]; + }); + }); + + it("can merge a diff from a commit into a diff from a work dir and index", + function() { + var test = this; + var linesOfWorkDirWithIndexDiff; + var linesOfCommitDiff; + return Promise.all([ + getLinesFromDiff(test.workDirWithIndexDiff), + getLinesFromDiff(test.commitDiff) + ]) + .then(function(linesOfDiffs) { + linesOfWorkDirWithIndexDiff = linesOfDiffs[0]; + linesOfCommitDiff = linesOfDiffs[1]; + return test.workDirWithIndexDiff.merge(test.commitDiff); + }) + .then(function() { + return getLinesFromDiff(test.workDirWithIndexDiff); + }) + .then(function(linesOfMergedDiff) { + var allDiffLines = _.flatten([ + linesOfWorkDirWithIndexDiff, + linesOfCommitDiff + ]); + _.forEach(allDiffLines, function(diffLine) { + assert.ok(_.includes(linesOfMergedDiff, diffLine)); + }); + }); + }); + + it("can merge a diff from a workdir and index into a diff from a commit", + function() { + var test = this; + var linesOfWorkDirWithIndexDiff; + var linesOfCommitDiff; + return Promise.all([ + getLinesFromDiff(test.workDirWithIndexDiff), + getLinesFromDiff(test.commitDiff) + ]) + .then(function(linesOfDiffs) { + linesOfWorkDirWithIndexDiff = linesOfDiffs[0]; + linesOfCommitDiff = linesOfDiffs[1]; + return test.commitDiff.merge(test.workDirWithIndexDiff); + }) + .then(function() { + return getLinesFromDiff(test.commitDiff); + }) + .then(function(linesOfMergedDiff) { + var allDiffLines = _.flatten([ + linesOfWorkDirWithIndexDiff, + linesOfCommitDiff + ]); + _.forEach(allDiffLines, function(diffLine) { + assert.ok(_.includes(linesOfMergedDiff, diffLine)); + }); + }); + }); + }); + // This wasn't working before. It was only passing because the promise chain // was broken it.skip("can find similar files in a diff", function() { From 2139c33913b30e9f2cb60e9c862f87140f71ae79 Mon Sep 17 00:00:00 2001 From: Stjepan Rajko Date: Mon, 25 Apr 2016 11:52:14 -0700 Subject: [PATCH 32/61] Fix annotated_commit annotation Removing free from the list because it was not being honored anyway, and we have a test that uses this free --- generate/input/descriptor.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/generate/input/descriptor.json b/generate/input/descriptor.json index 608ca3498..64cd60655 100644 --- a/generate/input/descriptor.json +++ b/generate/input/descriptor.json @@ -71,11 +71,8 @@ }, "types": { - "annotated": { + "annotated_commit": { "functions": { - "git_annotated_commit_free": { - "ignore": true - } } }, "attr": { From 5aa7822554c4e29cf31e2ec307007de7b0caf646 Mon Sep 17 00:00:00 2001 From: Stjepan Rajko Date: Mon, 25 Apr 2016 11:52:57 -0700 Subject: [PATCH 33/61] Fix git_remote_stats ownedByThis descriptor --- generate/input/descriptor.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/generate/input/descriptor.json b/generate/input/descriptor.json index 64cd60655..55b7742f1 100644 --- a/generate/input/descriptor.json +++ b/generate/input/descriptor.json @@ -1870,7 +1870,9 @@ "ignore": true }, "git_remote_stats": { - "ownedByThis": true + "return": { + "ownedByThis": true + } } } }, From 859a17a4b8d59b934e599f928f41613f30e2470c Mon Sep 17 00:00:00 2001 From: Stjepan Rajko Date: Mon, 25 Apr 2016 11:56:13 -0700 Subject: [PATCH 34/61] Fix memory leak on ignoreInit --- generate/templates/templates/struct_content.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/generate/templates/templates/struct_content.cc b/generate/templates/templates/struct_content.cc index 3bb619d92..bc620d582 100644 --- a/generate/templates/templates/struct_content.cc +++ b/generate/templates/templates/struct_content.cc @@ -32,14 +32,12 @@ using namespace std; {{ cppClassName }}::{{ cppClassName }}() : NodeGitWrapper<{{ cppClassName }}Traits>(NULL, true, v8::Local()) { {% if ignoreInit == true %} - // TODO: this looks like a memory leak to me - we are allocating wrappedValue - // then copying it below, but never freeing it - {{ cType }}* wrappedValue = new {{ cType }}; + this->raw = new {{ cType }}; {% else %} {{ cType }} wrappedValue = {{ cType|upper }}_INIT; - {% endif %} this->raw = ({{ cType }}*) malloc(sizeof({{ cType }})); memcpy(this->raw, &wrappedValue, sizeof({{ cType }})); + {% endif %} this->ConstructFields(); } From 395602e523baf561bab9f6e5a6f7f7413fd09c1b Mon Sep 17 00:00:00 2001 From: Stjepan Rajko Date: Mon, 25 Apr 2016 18:00:02 -0700 Subject: [PATCH 35/61] Move reflog entry methods to ReflogEntry --- generate/input/libgit2-supplement.json | 17 +++++++++++++++++ test/tests/commit.js | 4 ++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/generate/input/libgit2-supplement.json b/generate/input/libgit2-supplement.json index 78f954255..d8d34e5fa 100644 --- a/generate/input/libgit2-supplement.json +++ b/generate/input/libgit2-supplement.json @@ -268,6 +268,15 @@ "git_patch_convenient_from_diff" ] ], + [ + "reflog_entry", + [ + "git_reflog_entry_committer", + "git_reflog_entry_id_new", + "git_reflog_entry_id_old", + "git_reflog_entry_message" + ] + ], [ "revwalk", [ @@ -705,6 +714,14 @@ "git_merge_head_id" ] }, + "reflog": { + "functions": [ + "git_reflog_entry_committer", + "git_reflog_entry_id_new", + "git_reflog_entry_id_old", + "git_reflog_entry_message" + ] + }, "status": { "functions": [ "git_status_list_entrycount", diff --git a/test/tests/commit.js b/test/tests/commit.js index f4e7d94ac..c21aa6df9 100644 --- a/test/tests/commit.js +++ b/test/tests/commit.js @@ -367,11 +367,11 @@ describe("Commit", function() { }).then(function(reflog) { var reflogEntry = reflog.entryByIndex(0); assert.equal( - NodeGit.Reflog.entryMessage(reflogEntry), + reflogEntry.message(), customReflogMessage ); assert.equal( - NodeGit.Reflog.entryIdNew(reflogEntry).toString(), + reflogEntry.idNew().toString(), oid ); // only setTarget should have added to the entrycount From c6ecb2480c7db0289a71ae11f4651d44ba7e09ba Mon Sep 17 00:00:00 2001 From: Stjepan Rajko Date: Mon, 25 Apr 2016 12:03:54 -0700 Subject: [PATCH 36/61] Mark oid as selfFreeing --- generate/input/descriptor.json | 1 + 1 file changed, 1 insertion(+) diff --git a/generate/input/descriptor.json b/generate/input/descriptor.json index 55b7742f1..3b7c994c8 100644 --- a/generate/input/descriptor.json +++ b/generate/input/descriptor.json @@ -1418,6 +1418,7 @@ "ignore": true }, "oid": { + "selfFreeing": "true", "cpyFunction": "git_oid_cpy", "freeFunctionName": "free", "shouldAlloc": true, From 35b29408e6d726a7297358c4e09a1b21b1b5f9fc Mon Sep 17 00:00:00 2001 From: Stjepan Rajko Date: Mon, 25 Apr 2016 12:04:13 -0700 Subject: [PATCH 37/61] Mark functions returning owned oids --- generate/input/descriptor.json | 64 ++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/generate/input/descriptor.json b/generate/input/descriptor.json index 3b7c994c8..ca9773742 100644 --- a/generate/input/descriptor.json +++ b/generate/input/descriptor.json @@ -73,6 +73,11 @@ { "annotated_commit": { "functions": { + "git_annotated_commit_id": { + "return": { + "ownedByThis": true + } + } } }, "attr": { @@ -1002,6 +1007,11 @@ "git_index_add_frombuffer": { "ignore": true }, + "git_index_checksum": { + "return": { + "ownedByThis": true + } + }, "git_index_clear": { "isAsync": true, "return": { @@ -1198,6 +1208,11 @@ "git_indexer_append": { "ignore": true }, + "git_indexer_hash": { + "return": { + "ownedByThis": true + } + }, "git_indexer_new": { "ignore": true } @@ -1277,6 +1292,11 @@ } } }, + "git_note_id": { + "return": { + "ownedByThis": true + } + }, "git_note_remove": { "isAsync": true, "return": { @@ -1293,6 +1313,11 @@ }, "object": { "functions": { + "git_object_id": { + "return": { + "ownedByThis": true + } + }, "git_object_short_id": { "args": { "out": { @@ -1404,6 +1429,11 @@ "cppClassName": "Wrapper", "jsClassName": "Buffer" } + }, + "git_odb_object_id": { + "return": { + "ownedByThis": true + } } }, "dependencies": [ @@ -1480,6 +1510,11 @@ "git_packbuilder_foreach": { "ignore": true }, + "git_packbuilder_hash": { + "return": { + "ownedByThis": true + } + }, "git_packbuilder_new": { "isAsync": false }, @@ -1723,6 +1758,20 @@ "needsForwardDeclaration": false, "ignore": true }, + "reflog_entry": { + "functions": { + "git_reflog_entry_id_new": { + "return": { + "ownedByThis": true + } + }, + "git_reflog_entry_id_old": { + "return": { + "ownedByThis": true + } + } + } + }, "refspec": { "cType": "git_refspec", "functions": { @@ -2192,6 +2241,11 @@ "isErrorCode": true } }, + "git_submodule_head_id": { + "return": { + "ownedByThis": true + } + }, "git_submodule_init": { "isAsync": true, "return": { @@ -2212,6 +2266,16 @@ "type": "int" } }, + "git_submodule_index_id": { + "return": { + "ownedByThis": true + } + }, + "git_submodule_wd_id": { + "return": { + "ownedByThis": true + } + }, "git_submodule_location": { "isAsync": true, "args": { From 2e6b27c51dd03b7135cb98b659b1179113bc6d65 Mon Sep 17 00:00:00 2001 From: Stjepan Rajko Date: Mon, 25 Apr 2016 12:04:44 -0700 Subject: [PATCH 38/61] Mark all fields as owned --- generate/scripts/helpers.js | 1 + 1 file changed, 1 insertion(+) diff --git a/generate/scripts/helpers.js b/generate/scripts/helpers.js index bd8d61fc5..b1c265201 100644 --- a/generate/scripts/helpers.js +++ b/generate/scripts/helpers.js @@ -220,6 +220,7 @@ var Helpers = { field.jsFunctionName = utils.camelCase(field.name); field.cppClassName = Helpers.cTypeToCppName(field.type); field.jsClassName = utils.titleCase(Helpers.cTypeToJsName(field.type)); + field.ownedByThis = true; if (Helpers.isCallbackFunction(field.cType)) { Helpers.processCallback(field); From 0f9e54203e08b184f063bc45c478fb14ff4f2c68 Mon Sep 17 00:00:00 2001 From: Stjepan Rajko Date: Wed, 27 Apr 2016 10:10:43 -0700 Subject: [PATCH 39/61] Add oid leak tests --- test/tests/commit.js | 28 ++++------------------------ test/tests/oid.js | 22 ++++++++++++++++++++++ test/utils/leak_test.js | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+), 24 deletions(-) create mode 100644 test/utils/leak_test.js diff --git a/test/tests/commit.js b/test/tests/commit.js index c21aa6df9..0f12d0884 100644 --- a/test/tests/commit.js +++ b/test/tests/commit.js @@ -4,6 +4,7 @@ var promisify = require("promisify-node"); var fse = promisify(require("fs-extra")); var garbageCollect = require("../utils/garbage_collect.js"); +var leakTest = require("../utils/leak_test"); var local = path.join.bind(path, __dirname); @@ -627,30 +628,9 @@ describe("Commit", function() { it("does not leak", function() { var test = this; - garbageCollect(); - var Commit = NodeGit.Commit; - var startSelfFreeingCount = Commit.getSelfFreeingInstanceCount(); - var startNonSelfFreeingCount = Commit.getNonSelfFreeingConstructedCount(); - - var resolve; - var promise = new Promise(function(_resolve) { resolve = _resolve; }); - - NodeGit.Commit.lookup(test.repository, oid) - .then(function() { - // get out of this promise chain to help GC get rid of the commit - setTimeout(resolve, 0); - }); - - return promise - .then(function() { - garbageCollect(); - var endSelfFreeingCount = Commit.getSelfFreeingInstanceCount(); - var endNonSelfFreeingCount = Commit.getNonSelfFreeingConstructedCount(); - // any new self-freeing commits should have been freed - assert.equal(startSelfFreeingCount, endSelfFreeingCount); - // no new non-self-freeing commits should have been constructed - assert.equal(startNonSelfFreeingCount, endNonSelfFreeingCount); - }); + return leakTest(NodeGit.Commit, function() { + return NodeGit.Commit.lookup(test.repository, oid); + }); }); it("duplicates signature", function() { diff --git a/test/tests/oid.js b/test/tests/oid.js index c9a482329..4c2fbcdad 100644 --- a/test/tests/oid.js +++ b/test/tests/oid.js @@ -2,6 +2,8 @@ var assert = require("assert"); var path = require("path"); var local = path.join.bind(path, __dirname); +var leakTest = require("../utils/leak_test"); + describe("Oid", function() { var NodeGit = require("../../"); var Oid = NodeGit.Oid; @@ -70,4 +72,24 @@ describe("Oid", function() { var oid2 = Oid.fromString("13c633665257696a3800b0a39ff636b4593f918f"); assert(!this.oid.equal(oid2)); }); + + it("does not leak constructed Oid", function() { + return leakTest(Oid, function() { + return Promise.resolve( + Oid.fromString("13c633665257696a3800b0a39ff636b4593f918f") + ); + }); + }); + + it("does not leak owned Oid", function() { + return leakTest(Oid, function() { + return NodeGit.Repository.open(local("../repos/workdir")) + .then(function(repo) { + return NodeGit.Commit.lookup(repo, oid); + }) + .then(function(commit) { + return commit.id(); + }); + }); + }); }); diff --git a/test/utils/leak_test.js b/test/utils/leak_test.js new file mode 100644 index 000000000..a784facb1 --- /dev/null +++ b/test/utils/leak_test.js @@ -0,0 +1,33 @@ +var assert = require("assert"); + +var garbageCollect = require("./garbage_collect"); + +function leakTest(Type, getInstance) { + garbageCollect(); + var startSelfFreeingCount = Type.getSelfFreeingInstanceCount(); + var startNonSelfFreeingCount = Type.getNonSelfFreeingConstructedCount(); + + var resolve; + var promise = new Promise(function(_resolve) { resolve = _resolve; }); + + getInstance() + .then(function() { + var selfFreeingCount = Type.getSelfFreeingInstanceCount(); + assert.equal(startSelfFreeingCount + 1, selfFreeingCount); + // get out of this promise chain to help GC get rid of the commit + setTimeout(resolve, 0); + }); + + return promise + .then(function() { + garbageCollect(); + var endSelfFreeingCount = Type.getSelfFreeingInstanceCount(); + var endNonSelfFreeingCount = Type.getNonSelfFreeingConstructedCount(); + // any new self-freeing commits should have been freed + assert.equal(startSelfFreeingCount, endSelfFreeingCount); + // no new non-self-freeing commits should have been constructed + assert.equal(startNonSelfFreeingCount, endNonSelfFreeingCount); + }); +} + +module.exports = leakTest; From 4cb018ef4eacaab522092623966959f0cbadd48f Mon Sep 17 00:00:00 2001 From: Stjepan Rajko Date: Wed, 27 Apr 2016 13:59:52 -0700 Subject: [PATCH 40/61] Revert "Merge pull request #1006 from nodegit/oid-leak-fix" This reverts commit 206d27d8d12729f3766837eb37a2182819382e2e. --- generate/input/descriptor.json | 65 -------------------------- generate/input/libgit2-supplement.json | 17 ------- generate/scripts/helpers.js | 1 - test/tests/commit.js | 32 ++++++++++--- test/tests/oid.js | 22 --------- test/utils/leak_test.js | 33 ------------- 6 files changed, 26 insertions(+), 144 deletions(-) delete mode 100644 test/utils/leak_test.js diff --git a/generate/input/descriptor.json b/generate/input/descriptor.json index ca9773742..55b7742f1 100644 --- a/generate/input/descriptor.json +++ b/generate/input/descriptor.json @@ -73,11 +73,6 @@ { "annotated_commit": { "functions": { - "git_annotated_commit_id": { - "return": { - "ownedByThis": true - } - } } }, "attr": { @@ -1007,11 +1002,6 @@ "git_index_add_frombuffer": { "ignore": true }, - "git_index_checksum": { - "return": { - "ownedByThis": true - } - }, "git_index_clear": { "isAsync": true, "return": { @@ -1208,11 +1198,6 @@ "git_indexer_append": { "ignore": true }, - "git_indexer_hash": { - "return": { - "ownedByThis": true - } - }, "git_indexer_new": { "ignore": true } @@ -1292,11 +1277,6 @@ } } }, - "git_note_id": { - "return": { - "ownedByThis": true - } - }, "git_note_remove": { "isAsync": true, "return": { @@ -1313,11 +1293,6 @@ }, "object": { "functions": { - "git_object_id": { - "return": { - "ownedByThis": true - } - }, "git_object_short_id": { "args": { "out": { @@ -1429,11 +1404,6 @@ "cppClassName": "Wrapper", "jsClassName": "Buffer" } - }, - "git_odb_object_id": { - "return": { - "ownedByThis": true - } } }, "dependencies": [ @@ -1448,7 +1418,6 @@ "ignore": true }, "oid": { - "selfFreeing": "true", "cpyFunction": "git_oid_cpy", "freeFunctionName": "free", "shouldAlloc": true, @@ -1510,11 +1479,6 @@ "git_packbuilder_foreach": { "ignore": true }, - "git_packbuilder_hash": { - "return": { - "ownedByThis": true - } - }, "git_packbuilder_new": { "isAsync": false }, @@ -1758,20 +1722,6 @@ "needsForwardDeclaration": false, "ignore": true }, - "reflog_entry": { - "functions": { - "git_reflog_entry_id_new": { - "return": { - "ownedByThis": true - } - }, - "git_reflog_entry_id_old": { - "return": { - "ownedByThis": true - } - } - } - }, "refspec": { "cType": "git_refspec", "functions": { @@ -2241,11 +2191,6 @@ "isErrorCode": true } }, - "git_submodule_head_id": { - "return": { - "ownedByThis": true - } - }, "git_submodule_init": { "isAsync": true, "return": { @@ -2266,16 +2211,6 @@ "type": "int" } }, - "git_submodule_index_id": { - "return": { - "ownedByThis": true - } - }, - "git_submodule_wd_id": { - "return": { - "ownedByThis": true - } - }, "git_submodule_location": { "isAsync": true, "args": { diff --git a/generate/input/libgit2-supplement.json b/generate/input/libgit2-supplement.json index d8d34e5fa..78f954255 100644 --- a/generate/input/libgit2-supplement.json +++ b/generate/input/libgit2-supplement.json @@ -268,15 +268,6 @@ "git_patch_convenient_from_diff" ] ], - [ - "reflog_entry", - [ - "git_reflog_entry_committer", - "git_reflog_entry_id_new", - "git_reflog_entry_id_old", - "git_reflog_entry_message" - ] - ], [ "revwalk", [ @@ -714,14 +705,6 @@ "git_merge_head_id" ] }, - "reflog": { - "functions": [ - "git_reflog_entry_committer", - "git_reflog_entry_id_new", - "git_reflog_entry_id_old", - "git_reflog_entry_message" - ] - }, "status": { "functions": [ "git_status_list_entrycount", diff --git a/generate/scripts/helpers.js b/generate/scripts/helpers.js index b1c265201..bd8d61fc5 100644 --- a/generate/scripts/helpers.js +++ b/generate/scripts/helpers.js @@ -220,7 +220,6 @@ var Helpers = { field.jsFunctionName = utils.camelCase(field.name); field.cppClassName = Helpers.cTypeToCppName(field.type); field.jsClassName = utils.titleCase(Helpers.cTypeToJsName(field.type)); - field.ownedByThis = true; if (Helpers.isCallbackFunction(field.cType)) { Helpers.processCallback(field); diff --git a/test/tests/commit.js b/test/tests/commit.js index 0f12d0884..f4e7d94ac 100644 --- a/test/tests/commit.js +++ b/test/tests/commit.js @@ -4,7 +4,6 @@ var promisify = require("promisify-node"); var fse = promisify(require("fs-extra")); var garbageCollect = require("../utils/garbage_collect.js"); -var leakTest = require("../utils/leak_test"); var local = path.join.bind(path, __dirname); @@ -368,11 +367,11 @@ describe("Commit", function() { }).then(function(reflog) { var reflogEntry = reflog.entryByIndex(0); assert.equal( - reflogEntry.message(), + NodeGit.Reflog.entryMessage(reflogEntry), customReflogMessage ); assert.equal( - reflogEntry.idNew().toString(), + NodeGit.Reflog.entryIdNew(reflogEntry).toString(), oid ); // only setTarget should have added to the entrycount @@ -628,9 +627,30 @@ describe("Commit", function() { it("does not leak", function() { var test = this; - return leakTest(NodeGit.Commit, function() { - return NodeGit.Commit.lookup(test.repository, oid); - }); + garbageCollect(); + var Commit = NodeGit.Commit; + var startSelfFreeingCount = Commit.getSelfFreeingInstanceCount(); + var startNonSelfFreeingCount = Commit.getNonSelfFreeingConstructedCount(); + + var resolve; + var promise = new Promise(function(_resolve) { resolve = _resolve; }); + + NodeGit.Commit.lookup(test.repository, oid) + .then(function() { + // get out of this promise chain to help GC get rid of the commit + setTimeout(resolve, 0); + }); + + return promise + .then(function() { + garbageCollect(); + var endSelfFreeingCount = Commit.getSelfFreeingInstanceCount(); + var endNonSelfFreeingCount = Commit.getNonSelfFreeingConstructedCount(); + // any new self-freeing commits should have been freed + assert.equal(startSelfFreeingCount, endSelfFreeingCount); + // no new non-self-freeing commits should have been constructed + assert.equal(startNonSelfFreeingCount, endNonSelfFreeingCount); + }); }); it("duplicates signature", function() { diff --git a/test/tests/oid.js b/test/tests/oid.js index 4c2fbcdad..c9a482329 100644 --- a/test/tests/oid.js +++ b/test/tests/oid.js @@ -2,8 +2,6 @@ var assert = require("assert"); var path = require("path"); var local = path.join.bind(path, __dirname); -var leakTest = require("../utils/leak_test"); - describe("Oid", function() { var NodeGit = require("../../"); var Oid = NodeGit.Oid; @@ -72,24 +70,4 @@ describe("Oid", function() { var oid2 = Oid.fromString("13c633665257696a3800b0a39ff636b4593f918f"); assert(!this.oid.equal(oid2)); }); - - it("does not leak constructed Oid", function() { - return leakTest(Oid, function() { - return Promise.resolve( - Oid.fromString("13c633665257696a3800b0a39ff636b4593f918f") - ); - }); - }); - - it("does not leak owned Oid", function() { - return leakTest(Oid, function() { - return NodeGit.Repository.open(local("../repos/workdir")) - .then(function(repo) { - return NodeGit.Commit.lookup(repo, oid); - }) - .then(function(commit) { - return commit.id(); - }); - }); - }); }); diff --git a/test/utils/leak_test.js b/test/utils/leak_test.js deleted file mode 100644 index a784facb1..000000000 --- a/test/utils/leak_test.js +++ /dev/null @@ -1,33 +0,0 @@ -var assert = require("assert"); - -var garbageCollect = require("./garbage_collect"); - -function leakTest(Type, getInstance) { - garbageCollect(); - var startSelfFreeingCount = Type.getSelfFreeingInstanceCount(); - var startNonSelfFreeingCount = Type.getNonSelfFreeingConstructedCount(); - - var resolve; - var promise = new Promise(function(_resolve) { resolve = _resolve; }); - - getInstance() - .then(function() { - var selfFreeingCount = Type.getSelfFreeingInstanceCount(); - assert.equal(startSelfFreeingCount + 1, selfFreeingCount); - // get out of this promise chain to help GC get rid of the commit - setTimeout(resolve, 0); - }); - - return promise - .then(function() { - garbageCollect(); - var endSelfFreeingCount = Type.getSelfFreeingInstanceCount(); - var endNonSelfFreeingCount = Type.getNonSelfFreeingConstructedCount(); - // any new self-freeing commits should have been freed - assert.equal(startSelfFreeingCount, endSelfFreeingCount); - // no new non-self-freeing commits should have been constructed - assert.equal(startNonSelfFreeingCount, endNonSelfFreeingCount); - }); -} - -module.exports = leakTest; From d05cc6640c280c4c2455f0e39a61e2cd1fc795d6 Mon Sep 17 00:00:00 2001 From: Stjepan Rajko Date: Mon, 25 Apr 2016 18:00:02 -0700 Subject: [PATCH 41/61] Move reflog entry methods to ReflogEntry --- generate/input/libgit2-supplement.json | 17 +++++++++++++++++ test/tests/commit.js | 4 ++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/generate/input/libgit2-supplement.json b/generate/input/libgit2-supplement.json index 78f954255..d8d34e5fa 100644 --- a/generate/input/libgit2-supplement.json +++ b/generate/input/libgit2-supplement.json @@ -268,6 +268,15 @@ "git_patch_convenient_from_diff" ] ], + [ + "reflog_entry", + [ + "git_reflog_entry_committer", + "git_reflog_entry_id_new", + "git_reflog_entry_id_old", + "git_reflog_entry_message" + ] + ], [ "revwalk", [ @@ -705,6 +714,14 @@ "git_merge_head_id" ] }, + "reflog": { + "functions": [ + "git_reflog_entry_committer", + "git_reflog_entry_id_new", + "git_reflog_entry_id_old", + "git_reflog_entry_message" + ] + }, "status": { "functions": [ "git_status_list_entrycount", diff --git a/test/tests/commit.js b/test/tests/commit.js index f4e7d94ac..c21aa6df9 100644 --- a/test/tests/commit.js +++ b/test/tests/commit.js @@ -367,11 +367,11 @@ describe("Commit", function() { }).then(function(reflog) { var reflogEntry = reflog.entryByIndex(0); assert.equal( - NodeGit.Reflog.entryMessage(reflogEntry), + reflogEntry.message(), customReflogMessage ); assert.equal( - NodeGit.Reflog.entryIdNew(reflogEntry).toString(), + reflogEntry.idNew().toString(), oid ); // only setTarget should have added to the entrycount From 6a3cc4652278d98312c34172eb1e8e9e13091f3a Mon Sep 17 00:00:00 2001 From: John Haley Date: Wed, 27 Apr 2016 14:10:52 -0700 Subject: [PATCH 42/61] Add Node v6 support --- .travis.yml | 4 ++++ appveyor.yml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 319b4eeea..3bc67c522 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,7 @@ env: - export NODE_VERSION="0.12" TARGET_ARCH="x64" - export NODE_VERSION="4.1" TARGET_ARCH="x64" - export NODE_VERSION="5.8" TARGET_ARCH="x64" + - export NODE_VERSION="6" TARGET_ARCH="x64" matrix: fast_finish: true @@ -29,6 +30,9 @@ matrix: - os: linux env: export NODE_VERSION="5.8" TARGET_ARCH="ia32" sudo: required + - os: linux + env: export NODE_VERSION="6" TARGET_ARCH="ia32" + sudo: required git: depth: 1 diff --git a/appveyor.yml b/appveyor.yml index b8a98ec40..298baf957 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -29,9 +29,9 @@ environment: matrix: # Node.js - nodejs_version: "0.12" - # Node.js - nodejs_version: "4.1" - nodejs_version: "5.8" + - nodejs_version: "6" matrix: fast_finish: true From ac19506da083572cc1e1864ce9daa296b6259168 Mon Sep 17 00:00:00 2001 From: Stjepan Rajko Date: Wed, 27 Apr 2016 15:39:00 -0700 Subject: [PATCH 43/61] Move git_tree_entry_free descriptor to correct group --- generate/input/descriptor.json | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/generate/input/descriptor.json b/generate/input/descriptor.json index 55b7742f1..abd8f8530 100644 --- a/generate/input/descriptor.json +++ b/generate/input/descriptor.json @@ -2424,11 +2424,6 @@ "ownedByThis": true } }, - "git_tree_entry_id": { - "return": { - "ownedByThis": true - } - }, "git_tree_entrycount": { "jsFunctionName": "entryCount" }, @@ -2465,7 +2460,14 @@ }, "tree_entry": { "dupFunction": "git_tree_entry_dup", - "freeFunctionName": "git_tree_entry_free" + "freeFunctionName": "git_tree_entry_free", + "functions": { + "git_tree_entry_id": { + "return": { + "ownedByThis": true + } + } + } }, "writestream": { "cType": "git_writestream", From 4d94c1f8e57a1c04aeafdc7f66ef910b0622af30 Mon Sep 17 00:00:00 2001 From: Stjepan Rajko Date: Mon, 25 Apr 2016 12:03:54 -0700 Subject: [PATCH 44/61] Mark oid as selfFreeing --- generate/input/descriptor.json | 1 + 1 file changed, 1 insertion(+) diff --git a/generate/input/descriptor.json b/generate/input/descriptor.json index abd8f8530..041c1c9ff 100644 --- a/generate/input/descriptor.json +++ b/generate/input/descriptor.json @@ -1418,6 +1418,7 @@ "ignore": true }, "oid": { + "selfFreeing": "true", "cpyFunction": "git_oid_cpy", "freeFunctionName": "free", "shouldAlloc": true, From d4ea645c53acdf47e951a0d7f49f4a689d3b415e Mon Sep 17 00:00:00 2001 From: Stjepan Rajko Date: Mon, 25 Apr 2016 12:04:13 -0700 Subject: [PATCH 45/61] Mark functions returning owned oids --- generate/input/descriptor.json | 64 ++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/generate/input/descriptor.json b/generate/input/descriptor.json index 041c1c9ff..1b49c91cd 100644 --- a/generate/input/descriptor.json +++ b/generate/input/descriptor.json @@ -73,6 +73,11 @@ { "annotated_commit": { "functions": { + "git_annotated_commit_id": { + "return": { + "ownedByThis": true + } + } } }, "attr": { @@ -1002,6 +1007,11 @@ "git_index_add_frombuffer": { "ignore": true }, + "git_index_checksum": { + "return": { + "ownedByThis": true + } + }, "git_index_clear": { "isAsync": true, "return": { @@ -1198,6 +1208,11 @@ "git_indexer_append": { "ignore": true }, + "git_indexer_hash": { + "return": { + "ownedByThis": true + } + }, "git_indexer_new": { "ignore": true } @@ -1277,6 +1292,11 @@ } } }, + "git_note_id": { + "return": { + "ownedByThis": true + } + }, "git_note_remove": { "isAsync": true, "return": { @@ -1293,6 +1313,11 @@ }, "object": { "functions": { + "git_object_id": { + "return": { + "ownedByThis": true + } + }, "git_object_short_id": { "args": { "out": { @@ -1404,6 +1429,11 @@ "cppClassName": "Wrapper", "jsClassName": "Buffer" } + }, + "git_odb_object_id": { + "return": { + "ownedByThis": true + } } }, "dependencies": [ @@ -1480,6 +1510,11 @@ "git_packbuilder_foreach": { "ignore": true }, + "git_packbuilder_hash": { + "return": { + "ownedByThis": true + } + }, "git_packbuilder_new": { "isAsync": false }, @@ -1723,6 +1758,20 @@ "needsForwardDeclaration": false, "ignore": true }, + "reflog_entry": { + "functions": { + "git_reflog_entry_id_new": { + "return": { + "ownedByThis": true + } + }, + "git_reflog_entry_id_old": { + "return": { + "ownedByThis": true + } + } + } + }, "refspec": { "cType": "git_refspec", "functions": { @@ -2192,6 +2241,11 @@ "isErrorCode": true } }, + "git_submodule_head_id": { + "return": { + "ownedByThis": true + } + }, "git_submodule_init": { "isAsync": true, "return": { @@ -2212,6 +2266,16 @@ "type": "int" } }, + "git_submodule_index_id": { + "return": { + "ownedByThis": true + } + }, + "git_submodule_wd_id": { + "return": { + "ownedByThis": true + } + }, "git_submodule_location": { "isAsync": true, "args": { From 4ee0bc855ea176cd0bda9a46e95cd97c28700ed6 Mon Sep 17 00:00:00 2001 From: Stjepan Rajko Date: Mon, 25 Apr 2016 12:04:44 -0700 Subject: [PATCH 46/61] Mark all fields as owned --- generate/scripts/helpers.js | 1 + 1 file changed, 1 insertion(+) diff --git a/generate/scripts/helpers.js b/generate/scripts/helpers.js index bd8d61fc5..b1c265201 100644 --- a/generate/scripts/helpers.js +++ b/generate/scripts/helpers.js @@ -220,6 +220,7 @@ var Helpers = { field.jsFunctionName = utils.camelCase(field.name); field.cppClassName = Helpers.cTypeToCppName(field.type); field.jsClassName = utils.titleCase(Helpers.cTypeToJsName(field.type)); + field.ownedByThis = true; if (Helpers.isCallbackFunction(field.cType)) { Helpers.processCallback(field); From 3643cde635c794adac631dba641e22c9a32cd079 Mon Sep 17 00:00:00 2001 From: Stjepan Rajko Date: Wed, 27 Apr 2016 10:10:43 -0700 Subject: [PATCH 47/61] Add oid leak tests --- test/tests/commit.js | 28 ++++------------------------ test/tests/oid.js | 22 ++++++++++++++++++++++ test/utils/leak_test.js | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+), 24 deletions(-) create mode 100644 test/utils/leak_test.js diff --git a/test/tests/commit.js b/test/tests/commit.js index c21aa6df9..0f12d0884 100644 --- a/test/tests/commit.js +++ b/test/tests/commit.js @@ -4,6 +4,7 @@ var promisify = require("promisify-node"); var fse = promisify(require("fs-extra")); var garbageCollect = require("../utils/garbage_collect.js"); +var leakTest = require("../utils/leak_test"); var local = path.join.bind(path, __dirname); @@ -627,30 +628,9 @@ describe("Commit", function() { it("does not leak", function() { var test = this; - garbageCollect(); - var Commit = NodeGit.Commit; - var startSelfFreeingCount = Commit.getSelfFreeingInstanceCount(); - var startNonSelfFreeingCount = Commit.getNonSelfFreeingConstructedCount(); - - var resolve; - var promise = new Promise(function(_resolve) { resolve = _resolve; }); - - NodeGit.Commit.lookup(test.repository, oid) - .then(function() { - // get out of this promise chain to help GC get rid of the commit - setTimeout(resolve, 0); - }); - - return promise - .then(function() { - garbageCollect(); - var endSelfFreeingCount = Commit.getSelfFreeingInstanceCount(); - var endNonSelfFreeingCount = Commit.getNonSelfFreeingConstructedCount(); - // any new self-freeing commits should have been freed - assert.equal(startSelfFreeingCount, endSelfFreeingCount); - // no new non-self-freeing commits should have been constructed - assert.equal(startNonSelfFreeingCount, endNonSelfFreeingCount); - }); + return leakTest(NodeGit.Commit, function() { + return NodeGit.Commit.lookup(test.repository, oid); + }); }); it("duplicates signature", function() { diff --git a/test/tests/oid.js b/test/tests/oid.js index c9a482329..4c2fbcdad 100644 --- a/test/tests/oid.js +++ b/test/tests/oid.js @@ -2,6 +2,8 @@ var assert = require("assert"); var path = require("path"); var local = path.join.bind(path, __dirname); +var leakTest = require("../utils/leak_test"); + describe("Oid", function() { var NodeGit = require("../../"); var Oid = NodeGit.Oid; @@ -70,4 +72,24 @@ describe("Oid", function() { var oid2 = Oid.fromString("13c633665257696a3800b0a39ff636b4593f918f"); assert(!this.oid.equal(oid2)); }); + + it("does not leak constructed Oid", function() { + return leakTest(Oid, function() { + return Promise.resolve( + Oid.fromString("13c633665257696a3800b0a39ff636b4593f918f") + ); + }); + }); + + it("does not leak owned Oid", function() { + return leakTest(Oid, function() { + return NodeGit.Repository.open(local("../repos/workdir")) + .then(function(repo) { + return NodeGit.Commit.lookup(repo, oid); + }) + .then(function(commit) { + return commit.id(); + }); + }); + }); }); diff --git a/test/utils/leak_test.js b/test/utils/leak_test.js new file mode 100644 index 000000000..a784facb1 --- /dev/null +++ b/test/utils/leak_test.js @@ -0,0 +1,33 @@ +var assert = require("assert"); + +var garbageCollect = require("./garbage_collect"); + +function leakTest(Type, getInstance) { + garbageCollect(); + var startSelfFreeingCount = Type.getSelfFreeingInstanceCount(); + var startNonSelfFreeingCount = Type.getNonSelfFreeingConstructedCount(); + + var resolve; + var promise = new Promise(function(_resolve) { resolve = _resolve; }); + + getInstance() + .then(function() { + var selfFreeingCount = Type.getSelfFreeingInstanceCount(); + assert.equal(startSelfFreeingCount + 1, selfFreeingCount); + // get out of this promise chain to help GC get rid of the commit + setTimeout(resolve, 0); + }); + + return promise + .then(function() { + garbageCollect(); + var endSelfFreeingCount = Type.getSelfFreeingInstanceCount(); + var endNonSelfFreeingCount = Type.getNonSelfFreeingConstructedCount(); + // any new self-freeing commits should have been freed + assert.equal(startSelfFreeingCount, endSelfFreeingCount); + // no new non-self-freeing commits should have been constructed + assert.equal(startNonSelfFreeingCount, endNonSelfFreeingCount); + }); +} + +module.exports = leakTest; From c5806d87fe5fc1ce248482985cb066e2cbb5d0fa Mon Sep 17 00:00:00 2001 From: Chris Bargren Date: Thu, 28 Apr 2016 09:23:53 -0700 Subject: [PATCH 48/61] Sort scripts --- package.json | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index dd165323f..4a74f1e70 100644 --- a/package.json +++ b/package.json @@ -68,26 +68,26 @@ "host": "https://nodegit.s3.amazonaws.com/nodegit/nodegit/" }, "scripts": { - "lint": "jshint lib test/tests test/utils examples lifecycleScripts", + "cov": "npm run cppcov && npm run filtercov && npm run mergecov", "coveralls": "cat ./test/coverage/merged.lcov | coveralls", - "filtercov": "./lcov-1.10/bin/lcov --extract test/coverage/cpp/lcov_full.info $(pwd)/src/* $(pwd)/src/**/* $(pwd)/include/* $(pwd)/include/**/* --output-file test/coverage/cpp/lcov.info && rm test/coverage/cpp/lcov_full.info", "cppcov": "mkdir -p test/coverage/cpp && ./lcov-1.10/bin/lcov --gcov-tool /usr/bin/gcov-4.9 --capture --directory build/Release/obj.target/nodegit/src --output-file test/coverage/cpp/lcov_full.info", - "mergecov": "lcov-result-merger 'test/**/*.info' 'test/coverage/merged.lcov' && ./lcov-1.10/bin/genhtml test/coverage/merged.lcov --output-directory test/coverage/report", - "cov": "npm run cppcov && npm run filtercov && npm run mergecov", - "mocha": "mocha test/runner test/tests --timeout 15000", - "mochaDebug": "mocha --debug-brk test/runner test/tests --timeout 15000", - "test": "npm run lint && node --expose-gc test", + "filtercov": "./lcov-1.10/bin/lcov --extract test/coverage/cpp/lcov_full.info $(pwd)/src/* $(pwd)/src/**/* $(pwd)/include/* $(pwd)/include/**/* --output-file test/coverage/cpp/lcov.info && rm test/coverage/cpp/lcov_full.info", "generateJson": "node generate/scripts/generateJson", - "generateNativeCode": "node generate/scripts/generateNativeCode", "generateMissingTests": "node generate/scripts/generateMissingTests", - "prepublish": "node lifecycleScripts/prepareForBuild.js", + "generateNativeCode": "node generate/scripts/generateNativeCode", "install": "node lifecycleScripts/install", "installDebug": "BUILD_DEBUG=true npm install", - "recompile": "node-gyp configure build", + "lint": "jshint lib test/tests test/utils examples lifecycleScripts", + "mergecov": "lcov-result-merger 'test/**/*.info' 'test/coverage/merged.lcov' && ./lcov-1.10/bin/genhtml test/coverage/merged.lcov --output-directory test/coverage/report", + "mocha": "mocha test/runner test/tests --timeout 15000", + "mochaDebug": "mocha --debug-brk test/runner test/tests --timeout 15000", + "postinstall": "node postinstall.js", + "prepublish": "node lifecycleScripts/prepareForBuild.js", "rebuild": "node generate && node-gyp configure build", - "recompileDebug": "node-gyp configure --debug build", "rebuildDebug": "node generate && node-gyp configure --debug build", - "xcodeDebug": "node-gyp configure -- -f xcode", - "postinstall": "node postinstall.js" + "recompile": "node-gyp configure build", + "recompileDebug": "node-gyp configure --debug build", + "test": "npm run lint && node --expose-gc test", + "xcodeDebug": "node-gyp configure -- -f xcode" } } From 6b5ee5ba3c3adf5e097c2fba20b0731e43573590 Mon Sep 17 00:00:00 2001 From: Chris Bargren Date: Thu, 28 Apr 2016 11:39:59 -0700 Subject: [PATCH 49/61] Adding babel and babel scripts --- .gitignore | 15 +++++++------- .npmignore | 1 + lifecycleScripts/install.js | 39 +++++++++++++++++++++++++++++++++++++ package.json | 11 +++++++---- postinstall.js | 2 +- 5 files changed, 56 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 44dbf2004..5529ab114 100644 --- a/.gitignore +++ b/.gitignore @@ -1,14 +1,15 @@ -/node_modules/ /build/ -/test/coverage/ -/test/repos/ -/test/test/ -/test/home/ -/src/ +/coverage/ +/dist/ /include/ /lib/enums.js /lib/nodegit.js -/coverage/ +/node_modules/ +/src/ +/test/coverage/ +/test/home/ +/test/repos/ +/test/test/ /generate/output /generate/**/*.json diff --git a/.npmignore b/.npmignore index 8fdc41f76..2485a5668 100644 --- a/.npmignore +++ b/.npmignore @@ -1,6 +1,7 @@ /build/ /example/ /examples/ +/lib/ /test/ /vendor/Release/ diff --git a/lifecycleScripts/install.js b/lifecycleScripts/install.js index 4fc3363e8..c3c7cb2ca 100644 --- a/lifecycleScripts/install.js +++ b/lifecycleScripts/install.js @@ -12,6 +12,7 @@ var fromRegistry; try { fs.statSync(path.join(__dirname, "..", "include")); fs.statSync(path.join(__dirname, "..", "src")); + fs.statSync(path.join(__dirname, "..", "dist")); fromRegistry = true; } catch(e) { @@ -63,7 +64,45 @@ function prepareAndBuild() { return prepareForBuild() .then(function() { return build(); + }) + .then(function() { + return transpileJavascript(); + }); +} + +function transpileJavascript() { + var cmd = pathForTool("babel"); + var args = [ + "--presets", + "es2015", + "-d", + "./dist", + "./lib" + ]; + var opts = { + cwd: ".", + maxBuffer: Number.MAX_VALUE, + env: process.env, + stdio: "inherit" + }; + var home = process.platform == "win32" ? + process.env.USERPROFILE : process.env.HOME; + + opts.env.HOME = path.join(home, ".nodegit-gyp"); + + return new Promise(function(resolve, reject) { + var child = cp.spawn(cmd, args, opts); + child.on("close", function(code) { + console.log(code); + if (code) { + reject(code); + process.exitCode = 13; + } + else { + resolve(); + } }); + }); } function build() { diff --git a/package.json b/package.json index 4a74f1e70..1849e850d 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "email": "maxkorp@8bytealchemy.com" } ], - "main": "lib/nodegit.js", + "main": "dist/nodegit.js", "repository": { "type": "git", "url": "git://github.com/nodegit/nodegit.git" @@ -42,6 +42,8 @@ "promisify-node": "~0.3.0" }, "devDependencies": { + "babel-cli": "^6.7.7", + "babel-preset-es2015": "^6.6.0", "clean-for-publish": "~1.0.2", "combyne": "~0.8.1", "coveralls": "~2.11.4", @@ -68,6 +70,7 @@ "host": "https://nodegit.s3.amazonaws.com/nodegit/nodegit/" }, "scripts": { + "babel": "babel --presets es2015 -d ./dist ./lib", "cov": "npm run cppcov && npm run filtercov && npm run mergecov", "coveralls": "cat ./test/coverage/merged.lcov | coveralls", "cppcov": "mkdir -p test/coverage/cpp && ./lcov-1.10/bin/lcov --gcov-tool /usr/bin/gcov-4.9 --capture --directory build/Release/obj.target/nodegit/src --output-file test/coverage/cpp/lcov_full.info", @@ -82,9 +85,9 @@ "mocha": "mocha test/runner test/tests --timeout 15000", "mochaDebug": "mocha --debug-brk test/runner test/tests --timeout 15000", "postinstall": "node postinstall.js", - "prepublish": "node lifecycleScripts/prepareForBuild.js", - "rebuild": "node generate && node-gyp configure build", - "rebuildDebug": "node generate && node-gyp configure --debug build", + "prepublish": "node lifecycleScripts/prepareForBuild.js && npm run babel", + "rebuild": "node generate && npm run babel && node-gyp configure build", + "rebuildDebug": "node generate && npm run babel && node-gyp configure --debug build", "recompile": "node-gyp configure build", "recompileDebug": "node-gyp configure --debug build", "test": "npm run lint && node --expose-gc test", diff --git a/postinstall.js b/postinstall.js index d022f3607..88047959f 100755 --- a/postinstall.js +++ b/postinstall.js @@ -7,7 +7,7 @@ if (process.platform !== "linux") { return; } -child_process.exec("node lib/nodegit.js", function(error, stdout, stderr) { +child_process.exec("node dist/nodegit.js", function(error, stdout, stderr) { if (stderr && ~stderr.indexOf("libstdc++")) { console.log("[ERROR] Seems like the latest libstdc++ is missing on your system!"); console.log(""); From d31e7c142822b6a867069ac6cfeec9a31229de31 Mon Sep 17 00:00:00 2001 From: Chris Bargren Date: Thu, 28 Apr 2016 11:41:15 -0700 Subject: [PATCH 50/61] Fixing actually broken code found by es6 revWalk.repo only has a getter and you don't need to set it because it's already handled at the libgit2 level. --- lib/repository.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/repository.js b/lib/repository.js index 234166722..371f4d0b2 100644 --- a/lib/repository.js +++ b/lib/repository.js @@ -428,9 +428,7 @@ Repository.prototype.deleteTagByName = function(name) { * @return {RevWalk} */ Repository.prototype.createRevWalk = function() { - var revWalk = Revwalk.create(this); - revWalk.repo = this; - return revWalk; + return Revwalk.create(this); }; /** From 4a03d24003d4319cc6b3bfb756e100d4782c1bf6 Mon Sep 17 00:00:00 2001 From: John Haley Date: Fri, 29 Apr 2016 07:10:45 -0700 Subject: [PATCH 51/61] Remove libgit2 directory --- vendor/libgit2/.HEADER | 24 - vendor/libgit2/.editorconfig | 14 - vendor/libgit2/.gitattributes | 1 - vendor/libgit2/.gitignore | 33 - vendor/libgit2/.mailmap | 22 - vendor/libgit2/.travis.yml | 87 - vendor/libgit2/AUTHORS | 76 - vendor/libgit2/CHANGELOG.md | 647 --- vendor/libgit2/CMakeLists.txt | 714 --- vendor/libgit2/CODE_OF_CONDUCT.md | 75 - vendor/libgit2/CONTRIBUTING.md | 146 - vendor/libgit2/CONVENTIONS.md | 266 - vendor/libgit2/COPYING | 960 ---- vendor/libgit2/Makefile.embed | 60 - vendor/libgit2/PROJECTS.md | 97 - vendor/libgit2/README.md | 250 - vendor/libgit2/THREADING.md | 113 - vendor/libgit2/api.docurium | 13 - vendor/libgit2/appveyor.yml | 43 - .../cmake/Modules/AddCFlagIfSupported.cmake | 16 - .../cmake/Modules/FindCoreFoundation.cmake | 9 - vendor/libgit2/cmake/Modules/FindGSSAPI.cmake | 324 -- .../cmake/Modules/FindHTTP_Parser.cmake | 39 - vendor/libgit2/cmake/Modules/FindIconv.cmake | 40 - .../libgit2/cmake/Modules/FindSecurity.cmake | 9 - vendor/libgit2/deps/http-parser/LICENSE-MIT | 23 - vendor/libgit2/deps/http-parser/http_parser.c | 2177 -------- vendor/libgit2/deps/http-parser/http_parser.h | 305 -- vendor/libgit2/deps/regex/config.h | 7 - vendor/libgit2/deps/regex/regcomp.c | 3857 --------------- vendor/libgit2/deps/regex/regex.c | 92 - vendor/libgit2/deps/regex/regex.h | 582 --- vendor/libgit2/deps/regex/regex_internal.c | 1744 ------- vendor/libgit2/deps/regex/regex_internal.h | 819 --- vendor/libgit2/deps/regex/regexec.c | 4369 ----------------- vendor/libgit2/deps/winhttp/urlmon.h | 45 - vendor/libgit2/deps/winhttp/winhttp.def | 29 - vendor/libgit2/deps/winhttp/winhttp.h | 592 --- vendor/libgit2/deps/winhttp/winhttp64.def | 29 - vendor/libgit2/deps/zlib/adler32.c | 179 - vendor/libgit2/deps/zlib/crc32.c | 425 -- vendor/libgit2/deps/zlib/crc32.h | 441 -- vendor/libgit2/deps/zlib/deflate.c | 1967 -------- vendor/libgit2/deps/zlib/deflate.h | 346 -- vendor/libgit2/deps/zlib/infback.c | 640 --- vendor/libgit2/deps/zlib/inffast.c | 340 -- vendor/libgit2/deps/zlib/inffast.h | 11 - vendor/libgit2/deps/zlib/inffixed.h | 94 - vendor/libgit2/deps/zlib/inflate.c | 1512 ------ vendor/libgit2/deps/zlib/inflate.h | 122 - vendor/libgit2/deps/zlib/inftrees.c | 306 -- vendor/libgit2/deps/zlib/inftrees.h | 62 - vendor/libgit2/deps/zlib/trees.c | 1226 ----- vendor/libgit2/deps/zlib/trees.h | 128 - vendor/libgit2/deps/zlib/zconf.h | 58 - vendor/libgit2/deps/zlib/zlib.h | 1768 ------- vendor/libgit2/deps/zlib/zutil.c | 321 -- vendor/libgit2/deps/zlib/zutil.h | 253 - vendor/libgit2/docs/checkout-internals.md | 204 - vendor/libgit2/docs/diff-internals.md | 92 - vendor/libgit2/docs/error-handling.md | 270 - vendor/libgit2/docs/merge-df_conflicts.txt | 41 - vendor/libgit2/examples/.gitignore | 15 - vendor/libgit2/examples/CMakeLists.txt | 16 - vendor/libgit2/examples/COPYING | 121 - vendor/libgit2/examples/Makefile | 17 - vendor/libgit2/examples/README.md | 22 - vendor/libgit2/examples/add.c | 159 - vendor/libgit2/examples/blame.c | 212 - vendor/libgit2/examples/cat-file.c | 246 - vendor/libgit2/examples/common.c | 218 - vendor/libgit2/examples/common.h | 96 - vendor/libgit2/examples/describe.c | 184 - vendor/libgit2/examples/diff.c | 337 -- vendor/libgit2/examples/for-each-ref.c | 49 - vendor/libgit2/examples/general.c | 531 -- vendor/libgit2/examples/init.c | 253 - vendor/libgit2/examples/log.c | 479 -- vendor/libgit2/examples/network/.gitignore | 1 - vendor/libgit2/examples/network/Makefile | 22 - vendor/libgit2/examples/network/clone.c | 113 - vendor/libgit2/examples/network/common.c | 34 - vendor/libgit2/examples/network/common.h | 30 - vendor/libgit2/examples/network/fetch.c | 124 - vendor/libgit2/examples/network/git2.c | 73 - vendor/libgit2/examples/network/index-pack.c | 88 - vendor/libgit2/examples/network/ls-remote.c | 64 - vendor/libgit2/examples/remote.c | 269 - vendor/libgit2/examples/rev-list.c | 121 - vendor/libgit2/examples/rev-parse.c | 115 - vendor/libgit2/examples/showindex.c | 70 - vendor/libgit2/examples/status.c | 517 -- vendor/libgit2/examples/tag.c | 319 -- vendor/libgit2/examples/test/test-rev-list.sh | 95 - vendor/libgit2/git.git-authors | 75 - vendor/libgit2/include/git2.h | 65 - .../libgit2/include/git2/annotated_commit.h | 116 - vendor/libgit2/include/git2/attr.h | 245 - vendor/libgit2/include/git2/blame.h | 212 - vendor/libgit2/include/git2/blob.h | 221 - vendor/libgit2/include/git2/branch.h | 280 -- vendor/libgit2/include/git2/buffer.h | 128 - vendor/libgit2/include/git2/checkout.h | 358 -- vendor/libgit2/include/git2/cherrypick.h | 90 - vendor/libgit2/include/git2/clone.h | 207 - vendor/libgit2/include/git2/commit.h | 399 -- vendor/libgit2/include/git2/common.h | 287 -- vendor/libgit2/include/git2/config.h | 728 --- vendor/libgit2/include/git2/cred_helpers.h | 53 - vendor/libgit2/include/git2/describe.h | 163 - vendor/libgit2/include/git2/diff.h | 1352 ----- vendor/libgit2/include/git2/errors.h | 148 - vendor/libgit2/include/git2/filter.h | 217 - vendor/libgit2/include/git2/global.h | 44 - vendor/libgit2/include/git2/graph.h | 55 - vendor/libgit2/include/git2/ignore.h | 78 - vendor/libgit2/include/git2/index.h | 786 --- vendor/libgit2/include/git2/indexer.h | 76 - vendor/libgit2/include/git2/inttypes.h | 309 -- vendor/libgit2/include/git2/merge.h | 573 --- vendor/libgit2/include/git2/message.h | 44 - vendor/libgit2/include/git2/net.h | 59 - vendor/libgit2/include/git2/notes.h | 217 - vendor/libgit2/include/git2/object.h | 242 - vendor/libgit2/include/git2/odb.h | 495 -- vendor/libgit2/include/git2/odb_backend.h | 134 - vendor/libgit2/include/git2/oid.h | 269 - vendor/libgit2/include/git2/oidarray.h | 40 - vendor/libgit2/include/git2/pack.h | 240 - vendor/libgit2/include/git2/patch.h | 274 -- vendor/libgit2/include/git2/pathspec.h | 263 - vendor/libgit2/include/git2/rebase.h | 320 -- vendor/libgit2/include/git2/refdb.h | 68 - vendor/libgit2/include/git2/reflog.h | 170 - vendor/libgit2/include/git2/refs.h | 735 --- vendor/libgit2/include/git2/refspec.h | 104 - vendor/libgit2/include/git2/remote.h | 811 --- vendor/libgit2/include/git2/repository.h | 756 --- vendor/libgit2/include/git2/reset.h | 111 - vendor/libgit2/include/git2/revert.h | 89 - vendor/libgit2/include/git2/revparse.h | 113 - vendor/libgit2/include/git2/revwalk.h | 297 -- vendor/libgit2/include/git2/signature.h | 90 - vendor/libgit2/include/git2/stash.h | 257 - vendor/libgit2/include/git2/status.h | 370 -- vendor/libgit2/include/git2/stdint.h | 247 - vendor/libgit2/include/git2/strarray.h | 60 - vendor/libgit2/include/git2/submodule.h | 637 --- vendor/libgit2/include/git2/sys/commit.h | 80 - vendor/libgit2/include/git2/sys/config.h | 127 - vendor/libgit2/include/git2/sys/diff.h | 94 - vendor/libgit2/include/git2/sys/filter.h | 321 -- vendor/libgit2/include/git2/sys/hashsig.h | 106 - vendor/libgit2/include/git2/sys/index.h | 177 - vendor/libgit2/include/git2/sys/mempack.h | 85 - vendor/libgit2/include/git2/sys/odb_backend.h | 112 - vendor/libgit2/include/git2/sys/openssl.h | 38 - .../libgit2/include/git2/sys/refdb_backend.h | 218 - vendor/libgit2/include/git2/sys/reflog.h | 21 - vendor/libgit2/include/git2/sys/refs.h | 49 - vendor/libgit2/include/git2/sys/repository.h | 140 - vendor/libgit2/include/git2/sys/stream.h | 57 - vendor/libgit2/include/git2/sys/transport.h | 381 -- vendor/libgit2/include/git2/tag.h | 352 -- vendor/libgit2/include/git2/trace.h | 67 - vendor/libgit2/include/git2/transaction.h | 111 - vendor/libgit2/include/git2/transport.h | 342 -- vendor/libgit2/include/git2/tree.h | 415 -- vendor/libgit2/include/git2/types.h | 436 -- vendor/libgit2/include/git2/version.h | 18 - vendor/libgit2/libgit2.pc.in | 13 - vendor/libgit2/libgit2_clar.supp | 49 - vendor/libgit2/script/appveyor-mingw.sh | 23 - vendor/libgit2/script/cibuild.sh | 62 - vendor/libgit2/script/coverity.sh | 72 - vendor/libgit2/script/install-deps-osx.sh | 6 - vendor/libgit2/script/user_nodefs.h | 34 - vendor/libgit2/src/annotated_commit.c | 202 - vendor/libgit2/src/annotated_commit.h | 47 - vendor/libgit2/src/array.h | 125 - vendor/libgit2/src/attr.c | 544 -- vendor/libgit2/src/attr.h | 13 - vendor/libgit2/src/attr_file.c | 866 ---- vendor/libgit2/src/attr_file.h | 218 - vendor/libgit2/src/attrcache.c | 456 -- vendor/libgit2/src/attrcache.h | 57 - vendor/libgit2/src/bitvec.h | 75 - vendor/libgit2/src/blame.c | 516 -- vendor/libgit2/src/blame.h | 93 - vendor/libgit2/src/blame_git.c | 650 --- vendor/libgit2/src/blame_git.h | 20 - vendor/libgit2/src/blob.c | 375 -- vendor/libgit2/src/blob.h | 33 - vendor/libgit2/src/branch.c | 658 --- vendor/libgit2/src/branch.h | 17 - vendor/libgit2/src/buf_text.c | 315 -- vendor/libgit2/src/buf_text.h | 122 - vendor/libgit2/src/buffer.c | 768 --- vendor/libgit2/src/buffer.h | 209 - vendor/libgit2/src/cache.c | 281 -- vendor/libgit2/src/cache.h | 67 - vendor/libgit2/src/cc-compat.h | 87 - vendor/libgit2/src/checkout.c | 2722 ---------- vendor/libgit2/src/checkout.h | 25 - vendor/libgit2/src/cherrypick.c | 229 - vendor/libgit2/src/clone.c | 566 --- vendor/libgit2/src/clone.h | 12 - vendor/libgit2/src/commit.c | 741 --- vendor/libgit2/src/commit.h | 37 - vendor/libgit2/src/commit_list.c | 200 - vendor/libgit2/src/commit_list.h | 52 - vendor/libgit2/src/common.h | 240 - vendor/libgit2/src/config.c | 1483 ------ vendor/libgit2/src/config.h | 107 - vendor/libgit2/src/config_cache.c | 129 - vendor/libgit2/src/config_file.c | 1949 -------- vendor/libgit2/src/config_file.h | 71 - vendor/libgit2/src/crlf.c | 382 -- vendor/libgit2/src/curl_stream.c | 262 - vendor/libgit2/src/curl_stream.h | 14 - vendor/libgit2/src/date.c | 904 ---- vendor/libgit2/src/delta-apply.c | 135 - vendor/libgit2/src/delta-apply.h | 50 - vendor/libgit2/src/delta.c | 443 -- vendor/libgit2/src/delta.h | 114 - vendor/libgit2/src/describe.c | 893 ---- vendor/libgit2/src/diff.c | 1863 ------- vendor/libgit2/src/diff.h | 174 - vendor/libgit2/src/diff_driver.c | 523 -- vendor/libgit2/src/diff_driver.h | 49 - vendor/libgit2/src/diff_file.c | 464 -- vendor/libgit2/src/diff_file.h | 62 - vendor/libgit2/src/diff_patch.c | 1142 ----- vendor/libgit2/src/diff_patch.h | 83 - vendor/libgit2/src/diff_print.c | 668 --- vendor/libgit2/src/diff_stats.c | 336 -- vendor/libgit2/src/diff_tform.c | 1114 ----- vendor/libgit2/src/diff_xdiff.c | 248 - vendor/libgit2/src/diff_xdiff.h | 33 - vendor/libgit2/src/errors.c | 211 - vendor/libgit2/src/fetch.c | 156 - vendor/libgit2/src/fetch.h | 18 - vendor/libgit2/src/fetchhead.c | 302 -- vendor/libgit2/src/fetchhead.h | 32 - vendor/libgit2/src/filebuf.c | 580 --- vendor/libgit2/src/filebuf.h | 89 - vendor/libgit2/src/fileops.c | 1090 ---- vendor/libgit2/src/fileops.h | 353 -- vendor/libgit2/src/filter.c | 1014 ---- vendor/libgit2/src/filter.h | 54 - vendor/libgit2/src/fnmatch.c | 235 - vendor/libgit2/src/fnmatch.h | 49 - vendor/libgit2/src/global.c | 352 -- vendor/libgit2/src/global.h | 41 - vendor/libgit2/src/graph.c | 192 - vendor/libgit2/src/hash.c | 47 - vendor/libgit2/src/hash.h | 41 - vendor/libgit2/src/hash/hash_common_crypto.h | 44 - vendor/libgit2/src/hash/hash_generic.c | 288 -- vendor/libgit2/src/hash/hash_generic.h | 23 - vendor/libgit2/src/hash/hash_openssl.h | 44 - vendor/libgit2/src/hash/hash_win32.c | 276 -- vendor/libgit2/src/hash/hash_win32.h | 140 - vendor/libgit2/src/hashsig.c | 359 -- vendor/libgit2/src/ident.c | 127 - vendor/libgit2/src/idxmap.h | 93 - vendor/libgit2/src/ignore.c | 583 --- vendor/libgit2/src/ignore.h | 63 - vendor/libgit2/src/index.c | 3426 ------------- vendor/libgit2/src/index.h | 171 - vendor/libgit2/src/indexer.c | 1095 ----- vendor/libgit2/src/integer.h | 96 - vendor/libgit2/src/iterator.c | 2201 --------- vendor/libgit2/src/iterator.h | 321 -- vendor/libgit2/src/khash.h | 622 --- vendor/libgit2/src/map.h | 46 - vendor/libgit2/src/merge.c | 3074 ------------ vendor/libgit2/src/merge.h | 155 - vendor/libgit2/src/merge_file.c | 346 -- vendor/libgit2/src/message.c | 62 - vendor/libgit2/src/message.h | 15 - vendor/libgit2/src/mwindow.c | 440 -- vendor/libgit2/src/mwindow.h | 53 - vendor/libgit2/src/netops.c | 286 -- vendor/libgit2/src/netops.h | 98 - vendor/libgit2/src/notes.c | 694 --- vendor/libgit2/src/notes.h | 32 - vendor/libgit2/src/object.c | 490 -- vendor/libgit2/src/object.h | 54 - vendor/libgit2/src/object_api.c | 129 - vendor/libgit2/src/odb.c | 1252 ----- vendor/libgit2/src/odb.h | 104 - vendor/libgit2/src/odb_loose.c | 982 ---- vendor/libgit2/src/odb_mempack.c | 188 - vendor/libgit2/src/odb_pack.c | 617 --- vendor/libgit2/src/offmap.h | 66 - vendor/libgit2/src/oid.c | 441 -- vendor/libgit2/src/oid.h | 56 - vendor/libgit2/src/oidarray.c | 21 - vendor/libgit2/src/oidarray.h | 18 - vendor/libgit2/src/oidmap.h | 54 - vendor/libgit2/src/openssl_stream.c | 630 --- vendor/libgit2/src/openssl_stream.h | 16 - vendor/libgit2/src/pack-objects.c | 1755 ------- vendor/libgit2/src/pack-objects.h | 105 - vendor/libgit2/src/pack.c | 1402 ------ vendor/libgit2/src/pack.h | 163 - vendor/libgit2/src/path.c | 1717 ------- vendor/libgit2/src/path.h | 615 --- vendor/libgit2/src/pathspec.c | 720 --- vendor/libgit2/src/pathspec.h | 75 - vendor/libgit2/src/pool.c | 236 - vendor/libgit2/src/pool.h | 132 - vendor/libgit2/src/posix.c | 269 - vendor/libgit2/src/posix.h | 161 - vendor/libgit2/src/pqueue.c | 117 - vendor/libgit2/src/pqueue.h | 56 - vendor/libgit2/src/push.c | 718 --- vendor/libgit2/src/push.h | 137 - vendor/libgit2/src/rebase.c | 1337 ----- vendor/libgit2/src/refdb.c | 259 - vendor/libgit2/src/refdb.h | 57 - vendor/libgit2/src/refdb_fs.c | 1978 -------- vendor/libgit2/src/refdb_fs.h | 15 - vendor/libgit2/src/reflog.c | 232 - vendor/libgit2/src/reflog.h | 40 - vendor/libgit2/src/refs.c | 1302 ----- vendor/libgit2/src/refs.h | 117 - vendor/libgit2/src/refspec.c | 365 -- vendor/libgit2/src/refspec.h | 49 - vendor/libgit2/src/remote.c | 2539 ---------- vendor/libgit2/src/remote.h | 43 - vendor/libgit2/src/repo_template.h | 58 - vendor/libgit2/src/repository.c | 2352 --------- vendor/libgit2/src/repository.h | 215 - vendor/libgit2/src/reset.c | 199 - vendor/libgit2/src/revert.c | 231 - vendor/libgit2/src/revparse.c | 913 ---- vendor/libgit2/src/revwalk.c | 669 --- vendor/libgit2/src/revwalk.h | 50 - vendor/libgit2/src/settings.c | 221 - vendor/libgit2/src/sha1_lookup.c | 249 - vendor/libgit2/src/sha1_lookup.h | 23 - vendor/libgit2/src/signature.c | 296 -- vendor/libgit2/src/signature.h | 21 - vendor/libgit2/src/socket_stream.c | 212 - vendor/libgit2/src/socket_stream.h | 21 - vendor/libgit2/src/sortedcache.c | 381 -- vendor/libgit2/src/sortedcache.h | 178 - vendor/libgit2/src/stash.c | 1079 ---- vendor/libgit2/src/status.c | 564 --- vendor/libgit2/src/status.h | 23 - vendor/libgit2/src/stransport_stream.c | 286 -- vendor/libgit2/src/stransport_stream.h | 14 - vendor/libgit2/src/stream.h | 71 - vendor/libgit2/src/strmap.c | 32 - vendor/libgit2/src/strmap.h | 78 - vendor/libgit2/src/strnlen.h | 24 - vendor/libgit2/src/submodule.c | 2078 -------- vendor/libgit2/src/submodule.h | 146 - vendor/libgit2/src/sysdir.c | 283 -- vendor/libgit2/src/sysdir.h | 111 - vendor/libgit2/src/tag.c | 511 -- vendor/libgit2/src/tag.h | 28 - vendor/libgit2/src/thread-utils.c | 57 - vendor/libgit2/src/thread-utils.h | 286 -- vendor/libgit2/src/tls_stream.c | 41 - vendor/libgit2/src/tls_stream.h | 21 - vendor/libgit2/src/trace.c | 38 - vendor/libgit2/src/trace.h | 62 - vendor/libgit2/src/transaction.c | 393 -- vendor/libgit2/src/transaction.h | 14 - vendor/libgit2/src/transport.c | 222 - vendor/libgit2/src/transports/auth.c | 71 - vendor/libgit2/src/transports/auth.h | 63 - .../libgit2/src/transports/auth_negotiate.c | 275 -- .../libgit2/src/transports/auth_negotiate.h | 27 - vendor/libgit2/src/transports/cred.c | 388 -- vendor/libgit2/src/transports/cred.h | 14 - vendor/libgit2/src/transports/cred_helpers.c | 52 - vendor/libgit2/src/transports/git.c | 368 -- vendor/libgit2/src/transports/http.c | 1082 ---- vendor/libgit2/src/transports/local.c | 718 --- vendor/libgit2/src/transports/smart.c | 514 -- vendor/libgit2/src/transports/smart.h | 190 - vendor/libgit2/src/transports/smart_pkt.c | 609 --- .../libgit2/src/transports/smart_protocol.c | 1081 ---- vendor/libgit2/src/transports/ssh.c | 909 ---- vendor/libgit2/src/transports/ssh.h | 12 - vendor/libgit2/src/transports/winhttp.c | 1409 ------ vendor/libgit2/src/tree-cache.c | 269 - vendor/libgit2/src/tree-cache.h | 37 - vendor/libgit2/src/tree.c | 1036 ---- vendor/libgit2/src/tree.h | 66 - vendor/libgit2/src/tsort.c | 385 -- vendor/libgit2/src/unix/map.c | 73 - vendor/libgit2/src/unix/posix.h | 83 - vendor/libgit2/src/unix/realpath.c | 31 - vendor/libgit2/src/userdiff.h | 208 - vendor/libgit2/src/util.c | 810 --- vendor/libgit2/src/util.h | 607 --- vendor/libgit2/src/vector.c | 361 -- vendor/libgit2/src/vector.h | 118 - vendor/libgit2/src/win32/dir.c | 119 - vendor/libgit2/src/win32/dir.h | 43 - vendor/libgit2/src/win32/error.c | 53 - vendor/libgit2/src/win32/error.h | 13 - vendor/libgit2/src/win32/findfile.c | 227 - vendor/libgit2/src/win32/findfile.h | 17 - vendor/libgit2/src/win32/git2.rc | 44 - vendor/libgit2/src/win32/map.c | 141 - vendor/libgit2/src/win32/mingw-compat.h | 23 - vendor/libgit2/src/win32/msvc-compat.h | 22 - vendor/libgit2/src/win32/path_w32.c | 387 -- vendor/libgit2/src/win32/path_w32.h | 85 - vendor/libgit2/src/win32/posix.h | 60 - vendor/libgit2/src/win32/posix_w32.c | 723 --- vendor/libgit2/src/win32/precompiled.c | 1 - vendor/libgit2/src/win32/precompiled.h | 23 - vendor/libgit2/src/win32/pthread.c | 269 - vendor/libgit2/src/win32/pthread.h | 92 - vendor/libgit2/src/win32/reparse.h | 57 - vendor/libgit2/src/win32/utf-conv.c | 147 - vendor/libgit2/src/win32/utf-conv.h | 59 - vendor/libgit2/src/win32/version.h | 37 - vendor/libgit2/src/win32/w32_buffer.c | 54 - vendor/libgit2/src/win32/w32_buffer.h | 18 - .../libgit2/src/win32/w32_crtdbg_stacktrace.c | 343 -- .../libgit2/src/win32/w32_crtdbg_stacktrace.h | 93 - vendor/libgit2/src/win32/w32_stack.c | 192 - vendor/libgit2/src/win32/w32_stack.h | 138 - vendor/libgit2/src/win32/w32_util.c | 163 - vendor/libgit2/src/win32/w32_util.h | 186 - vendor/libgit2/src/win32/win32-compat.h | 52 - vendor/libgit2/src/xdiff/xdiff.h | 141 - vendor/libgit2/src/xdiff/xdiffi.c | 618 --- vendor/libgit2/src/xdiff/xdiffi.h | 64 - vendor/libgit2/src/xdiff/xemit.c | 290 -- vendor/libgit2/src/xdiff/xemit.h | 36 - vendor/libgit2/src/xdiff/xhistogram.c | 373 -- vendor/libgit2/src/xdiff/xinclude.h | 46 - vendor/libgit2/src/xdiff/xmacros.h | 54 - vendor/libgit2/src/xdiff/xmerge.c | 678 --- vendor/libgit2/src/xdiff/xpatience.c | 358 -- vendor/libgit2/src/xdiff/xprepare.c | 483 -- vendor/libgit2/src/xdiff/xprepare.h | 34 - vendor/libgit2/src/xdiff/xtypes.h | 67 - vendor/libgit2/src/xdiff/xutils.c | 403 -- vendor/libgit2/src/xdiff/xutils.h | 50 - vendor/libgit2/src/zstream.c | 156 - vendor/libgit2/src/zstream.h | 39 - vendor/libgit2/tests/README.md | 22 - vendor/libgit2/tests/attr/attr_expect.h | 43 - vendor/libgit2/tests/attr/file.c | 224 - vendor/libgit2/tests/attr/flags.c | 108 - vendor/libgit2/tests/attr/ignore.c | 267 - vendor/libgit2/tests/attr/lookup.c | 262 - vendor/libgit2/tests/attr/repo.c | 378 -- vendor/libgit2/tests/blame/blame_helpers.c | 67 - vendor/libgit2/tests/blame/blame_helpers.h | 14 - vendor/libgit2/tests/blame/buffer.c | 166 - vendor/libgit2/tests/blame/getters.c | 56 - vendor/libgit2/tests/blame/harder.c | 79 - vendor/libgit2/tests/blame/simple.c | 336 -- vendor/libgit2/tests/buf/basic.c | 51 - vendor/libgit2/tests/buf/oom.c | 41 - vendor/libgit2/tests/buf/splice.c | 93 - vendor/libgit2/tests/checkout/binaryunicode.c | 58 - .../libgit2/tests/checkout/checkout_helpers.c | 151 - .../libgit2/tests/checkout/checkout_helpers.h | 31 - vendor/libgit2/tests/checkout/conflict.c | 1137 ----- vendor/libgit2/tests/checkout/crlf.c | 464 -- vendor/libgit2/tests/checkout/head.c | 62 - vendor/libgit2/tests/checkout/icase.c | 303 -- vendor/libgit2/tests/checkout/index.c | 774 --- vendor/libgit2/tests/checkout/nasty.c | 366 -- vendor/libgit2/tests/checkout/tree.c | 1418 ------ vendor/libgit2/tests/checkout/typechange.c | 240 - vendor/libgit2/tests/cherrypick/bare.c | 106 - vendor/libgit2/tests/cherrypick/workdir.c | 470 -- vendor/libgit2/tests/clar.c | 642 --- vendor/libgit2/tests/clar.h | 161 - vendor/libgit2/tests/clar/fixtures.h | 51 - vendor/libgit2/tests/clar/fs.h | 333 -- vendor/libgit2/tests/clar/print.h | 66 - vendor/libgit2/tests/clar/sandbox.h | 139 - vendor/libgit2/tests/clar_libgit2.c | 584 --- vendor/libgit2/tests/clar_libgit2.h | 170 - vendor/libgit2/tests/clar_libgit2_timer.c | 31 - vendor/libgit2/tests/clar_libgit2_timer.h | 35 - vendor/libgit2/tests/clar_libgit2_trace.c | 248 - vendor/libgit2/tests/clar_libgit2_trace.h | 7 - vendor/libgit2/tests/clone/empty.c | 85 - vendor/libgit2/tests/clone/local.c | 211 - vendor/libgit2/tests/clone/nonetwork.c | 407 -- vendor/libgit2/tests/clone/transport.c | 51 - vendor/libgit2/tests/commit/commit.c | 126 - vendor/libgit2/tests/commit/parent.c | 60 - vendor/libgit2/tests/commit/parse.c | 553 --- vendor/libgit2/tests/commit/signature.c | 88 - vendor/libgit2/tests/commit/write.c | 261 - vendor/libgit2/tests/config/add.c | 37 - vendor/libgit2/tests/config/backend.c | 24 - vendor/libgit2/tests/config/config_helpers.c | 68 - vendor/libgit2/tests/config/config_helpers.h | 13 - vendor/libgit2/tests/config/configlevel.c | 73 - vendor/libgit2/tests/config/global.c | 109 - vendor/libgit2/tests/config/include.c | 133 - vendor/libgit2/tests/config/multivar.c | 288 -- vendor/libgit2/tests/config/new.c | 34 - vendor/libgit2/tests/config/read.c | 705 --- vendor/libgit2/tests/config/rename.c | 89 - vendor/libgit2/tests/config/snapshot.c | 78 - vendor/libgit2/tests/config/stress.c | 132 - vendor/libgit2/tests/config/validkeyname.c | 49 - vendor/libgit2/tests/config/write.c | 724 --- vendor/libgit2/tests/core/array.c | 57 - vendor/libgit2/tests/core/bitvec.c | 64 - vendor/libgit2/tests/core/buffer.c | 1168 ----- vendor/libgit2/tests/core/copy.c | 152 - vendor/libgit2/tests/core/dirent.c | 306 -- vendor/libgit2/tests/core/env.c | 300 -- vendor/libgit2/tests/core/errors.c | 222 - vendor/libgit2/tests/core/features.c | 37 - vendor/libgit2/tests/core/filebuf.c | 241 - vendor/libgit2/tests/core/ftruncate.c | 48 - vendor/libgit2/tests/core/futils.c | 68 - vendor/libgit2/tests/core/hex.c | 22 - vendor/libgit2/tests/core/iconv.c | 78 - vendor/libgit2/tests/core/init.c | 14 - vendor/libgit2/tests/core/link.c | 632 --- vendor/libgit2/tests/core/mkdir.c | 291 -- vendor/libgit2/tests/core/oid.c | 70 - vendor/libgit2/tests/core/oidmap.c | 110 - vendor/libgit2/tests/core/opts.c | 25 - vendor/libgit2/tests/core/path.c | 654 --- vendor/libgit2/tests/core/pool.c | 92 - vendor/libgit2/tests/core/posix.c | 148 - vendor/libgit2/tests/core/pqueue.c | 128 - vendor/libgit2/tests/core/rmdir.c | 98 - vendor/libgit2/tests/core/sortedcache.c | 363 -- vendor/libgit2/tests/core/stat.c | 114 - vendor/libgit2/tests/core/stream.c | 51 - vendor/libgit2/tests/core/string.c | 83 - vendor/libgit2/tests/core/strmap.c | 100 - vendor/libgit2/tests/core/strtol.c | 37 - vendor/libgit2/tests/core/structinit.c | 168 - vendor/libgit2/tests/core/useragent.c | 11 - vendor/libgit2/tests/core/vector.c | 276 -- vendor/libgit2/tests/core/zstream.c | 143 - vendor/libgit2/tests/date/date.c | 15 - vendor/libgit2/tests/date/rfc2822.c | 40 - vendor/libgit2/tests/describe/describe.c | 55 - .../libgit2/tests/describe/describe_helpers.c | 42 - .../libgit2/tests/describe/describe_helpers.h | 15 - vendor/libgit2/tests/describe/t6120.c | 156 - vendor/libgit2/tests/diff/binary.c | 545 -- vendor/libgit2/tests/diff/blob.c | 1008 ---- vendor/libgit2/tests/diff/diff_helpers.c | 243 - vendor/libgit2/tests/diff/diff_helpers.h | 70 - vendor/libgit2/tests/diff/diffiter.c | 453 -- vendor/libgit2/tests/diff/drivers.c | 278 -- vendor/libgit2/tests/diff/format_email.c | 508 -- vendor/libgit2/tests/diff/index.c | 302 -- vendor/libgit2/tests/diff/iterator.c | 1012 ---- vendor/libgit2/tests/diff/notify.c | 258 - vendor/libgit2/tests/diff/patch.c | 612 --- vendor/libgit2/tests/diff/pathspec.c | 93 - vendor/libgit2/tests/diff/rename.c | 1704 ------- vendor/libgit2/tests/diff/stats.c | 289 -- vendor/libgit2/tests/diff/submodules.c | 495 -- vendor/libgit2/tests/diff/tree.c | 526 -- vendor/libgit2/tests/diff/workdir.c | 2162 -------- .../libgit2/tests/fetchhead/fetchhead_data.h | 48 - vendor/libgit2/tests/fetchhead/nonetwork.c | 400 -- vendor/libgit2/tests/filter/blob.c | 117 - vendor/libgit2/tests/filter/crlf.c | 235 - vendor/libgit2/tests/filter/crlf.h | 30 - vendor/libgit2/tests/filter/custom.c | 237 - vendor/libgit2/tests/filter/custom_helpers.c | 108 - vendor/libgit2/tests/filter/custom_helpers.h | 18 - vendor/libgit2/tests/filter/file.c | 99 - vendor/libgit2/tests/filter/ident.c | 133 - vendor/libgit2/tests/filter/query.c | 91 - vendor/libgit2/tests/filter/stream.c | 216 - vendor/libgit2/tests/filter/wildcard.c | 184 - vendor/libgit2/tests/generate.py | 244 - vendor/libgit2/tests/generate_crlf.sh | 73 - vendor/libgit2/tests/graph/descendant_of.c | 55 - vendor/libgit2/tests/index/add.c | 84 - vendor/libgit2/tests/index/addall.c | 481 -- vendor/libgit2/tests/index/bypath.c | 362 -- vendor/libgit2/tests/index/cache.c | 238 - vendor/libgit2/tests/index/collision.c | 106 - vendor/libgit2/tests/index/conflicts.c | 427 -- vendor/libgit2/tests/index/crlf.c | 154 - vendor/libgit2/tests/index/filemodes.c | 258 - vendor/libgit2/tests/index/inmemory.c | 22 - vendor/libgit2/tests/index/names.c | 148 - vendor/libgit2/tests/index/nsec.c | 87 - vendor/libgit2/tests/index/racy.c | 324 -- vendor/libgit2/tests/index/read_index.c | 73 - vendor/libgit2/tests/index/read_tree.c | 46 - vendor/libgit2/tests/index/rename.c | 86 - vendor/libgit2/tests/index/reuc.c | 372 -- vendor/libgit2/tests/index/stage.c | 62 - vendor/libgit2/tests/index/tests.c | 876 ---- vendor/libgit2/tests/main.c | 27 - vendor/libgit2/tests/merge/conflict_data.h | 103 - vendor/libgit2/tests/merge/files.c | 379 -- vendor/libgit2/tests/merge/merge_helpers.c | 365 -- vendor/libgit2/tests/merge/merge_helpers.h | 68 - vendor/libgit2/tests/merge/trees/automerge.c | 196 - vendor/libgit2/tests/merge/trees/commits.c | 148 - .../libgit2/tests/merge/trees/modeconflict.c | 59 - vendor/libgit2/tests/merge/trees/recursive.c | 410 -- vendor/libgit2/tests/merge/trees/renames.c | 252 - vendor/libgit2/tests/merge/trees/treediff.c | 554 --- vendor/libgit2/tests/merge/trees/trivial.c | 306 -- vendor/libgit2/tests/merge/trees/whitespace.c | 82 - vendor/libgit2/tests/merge/workdir/analysis.c | 141 - vendor/libgit2/tests/merge/workdir/dirty.c | 352 -- .../libgit2/tests/merge/workdir/recursive.c | 84 - vendor/libgit2/tests/merge/workdir/renames.c | 156 - vendor/libgit2/tests/merge/workdir/setup.c | 1096 ----- vendor/libgit2/tests/merge/workdir/simple.c | 636 --- .../libgit2/tests/merge/workdir/submodules.c | 95 - vendor/libgit2/tests/merge/workdir/trivial.c | 262 - vendor/libgit2/tests/network/cred.c | 50 - vendor/libgit2/tests/network/fetchlocal.c | 520 -- vendor/libgit2/tests/network/matchhost.c | 13 - vendor/libgit2/tests/network/refspecs.c | 160 - .../tests/network/remote/createthenload.c | 37 - .../tests/network/remote/defaultbranch.c | 108 - vendor/libgit2/tests/network/remote/delete.c | 46 - .../tests/network/remote/isvalidname.c | 17 - vendor/libgit2/tests/network/remote/local.c | 467 -- vendor/libgit2/tests/network/remote/push.c | 114 - vendor/libgit2/tests/network/remote/remotes.c | 469 -- vendor/libgit2/tests/network/remote/rename.c | 255 - vendor/libgit2/tests/network/urlparse.c | 211 - vendor/libgit2/tests/notes/notes.c | 390 -- vendor/libgit2/tests/notes/notesref.c | 68 - vendor/libgit2/tests/object/blob/filter.c | 150 - vendor/libgit2/tests/object/blob/fromchunks.c | 156 - vendor/libgit2/tests/object/blob/write.c | 69 - vendor/libgit2/tests/object/cache.c | 287 -- .../tests/object/commit/commitstagedfile.c | 219 - vendor/libgit2/tests/object/lookup.c | 65 - vendor/libgit2/tests/object/lookupbypath.c | 83 - vendor/libgit2/tests/object/message.c | 199 - vendor/libgit2/tests/object/peel.c | 118 - vendor/libgit2/tests/object/raw/chars.c | 41 - vendor/libgit2/tests/object/raw/compare.c | 123 - vendor/libgit2/tests/object/raw/convert.c | 112 - vendor/libgit2/tests/object/raw/data.h | 323 -- vendor/libgit2/tests/object/raw/fromstr.c | 30 - vendor/libgit2/tests/object/raw/hash.c | 166 - vendor/libgit2/tests/object/raw/short.c | 137 - vendor/libgit2/tests/object/raw/size.c | 13 - vendor/libgit2/tests/object/raw/type2string.c | 54 - vendor/libgit2/tests/object/raw/write.c | 462 -- vendor/libgit2/tests/object/shortid.c | 51 - vendor/libgit2/tests/object/tag/list.c | 115 - vendor/libgit2/tests/object/tag/peel.c | 61 - vendor/libgit2/tests/object/tag/read.c | 142 - vendor/libgit2/tests/object/tag/write.c | 260 - vendor/libgit2/tests/object/tree/attributes.c | 118 - .../tests/object/tree/duplicateentries.c | 157 - vendor/libgit2/tests/object/tree/frompath.c | 68 - vendor/libgit2/tests/object/tree/read.c | 75 - vendor/libgit2/tests/object/tree/walk.c | 177 - vendor/libgit2/tests/object/tree/write.c | 514 -- vendor/libgit2/tests/odb/alternates.c | 80 - vendor/libgit2/tests/odb/backend/nobackend.c | 46 - .../libgit2/tests/odb/backend/nonrefreshing.c | 274 -- vendor/libgit2/tests/odb/emptyobjects.c | 57 - vendor/libgit2/tests/odb/foreach.c | 126 - vendor/libgit2/tests/odb/loose.c | 152 - vendor/libgit2/tests/odb/loose_data.h | 522 -- vendor/libgit2/tests/odb/mixed.c | 110 - vendor/libgit2/tests/odb/pack_data.h | 151 - vendor/libgit2/tests/odb/pack_data_one.h | 19 - vendor/libgit2/tests/odb/packed.c | 79 - vendor/libgit2/tests/odb/packed_one.c | 60 - vendor/libgit2/tests/odb/sorting.c | 70 - vendor/libgit2/tests/odb/streamwrite.c | 56 - vendor/libgit2/tests/online/badssl.c | 46 - vendor/libgit2/tests/online/clone.c | 655 --- vendor/libgit2/tests/online/fetch.c | 209 - vendor/libgit2/tests/online/fetchhead.c | 103 - vendor/libgit2/tests/online/push.c | 906 ---- vendor/libgit2/tests/online/push_util.c | 141 - vendor/libgit2/tests/online/push_util.h | 83 - vendor/libgit2/tests/online/remotes.c | 55 - vendor/libgit2/tests/pack/indexer.c | 127 - vendor/libgit2/tests/pack/packbuilder.c | 225 - vendor/libgit2/tests/pack/sharing.c | 42 - vendor/libgit2/tests/path/core.c | 354 -- vendor/libgit2/tests/path/win32.c | 217 - .../tests/perf/helper__perf__do_merge.c | 75 - .../tests/perf/helper__perf__do_merge.h | 4 - .../libgit2/tests/perf/helper__perf__timer.c | 73 - .../libgit2/tests/perf/helper__perf__timer.h | 27 - vendor/libgit2/tests/perf/merge.c | 44 - vendor/libgit2/tests/rebase/abort.c | 150 - vendor/libgit2/tests/rebase/inmemory.c | 116 - vendor/libgit2/tests/rebase/iterator.c | 140 - vendor/libgit2/tests/rebase/merge.c | 597 --- vendor/libgit2/tests/rebase/setup.c | 391 -- vendor/libgit2/tests/refs/branches/create.c | 300 -- vendor/libgit2/tests/refs/branches/delete.c | 142 - vendor/libgit2/tests/refs/branches/ishead.c | 98 - vendor/libgit2/tests/refs/branches/iterator.c | 151 - vendor/libgit2/tests/refs/branches/lookup.c | 45 - vendor/libgit2/tests/refs/branches/move.c | 248 - vendor/libgit2/tests/refs/branches/name.c | 45 - vendor/libgit2/tests/refs/branches/remote.c | 68 - vendor/libgit2/tests/refs/branches/upstream.c | 193 - .../tests/refs/branches/upstreamname.c | 36 - vendor/libgit2/tests/refs/crashes.c | 20 - vendor/libgit2/tests/refs/create.c | 250 - vendor/libgit2/tests/refs/createwithlog.c | 47 - vendor/libgit2/tests/refs/delete.c | 107 - vendor/libgit2/tests/refs/foreachglob.c | 95 - vendor/libgit2/tests/refs/isvalidname.c | 31 - vendor/libgit2/tests/refs/iterator.c | 221 - vendor/libgit2/tests/refs/list.c | 57 - vendor/libgit2/tests/refs/listall.c | 47 - vendor/libgit2/tests/refs/lookup.c | 68 - vendor/libgit2/tests/refs/normalize.c | 403 -- vendor/libgit2/tests/refs/overwrite.c | 136 - vendor/libgit2/tests/refs/pack.c | 105 - vendor/libgit2/tests/refs/peel.c | 119 - vendor/libgit2/tests/refs/races.c | 152 - vendor/libgit2/tests/refs/read.c | 299 -- vendor/libgit2/tests/refs/ref_helpers.c | 25 - vendor/libgit2/tests/refs/ref_helpers.h | 1 - vendor/libgit2/tests/refs/reflog/drop.c | 115 - vendor/libgit2/tests/refs/reflog/reflog.c | 450 -- vendor/libgit2/tests/refs/rename.c | 387 -- vendor/libgit2/tests/refs/revparse.c | 829 ---- vendor/libgit2/tests/refs/settargetwithlog.c | 51 - vendor/libgit2/tests/refs/setter.c | 99 - vendor/libgit2/tests/refs/shorthand.c | 27 - vendor/libgit2/tests/refs/transactions.c | 110 - vendor/libgit2/tests/refs/unicode.c | 54 - vendor/libgit2/tests/refs/update.c | 26 - vendor/libgit2/tests/remote/insteadof.c | 72 - vendor/libgit2/tests/repo/config.c | 211 - vendor/libgit2/tests/repo/discover.c | 143 - vendor/libgit2/tests/repo/getters.c | 40 - vendor/libgit2/tests/repo/hashfile.c | 85 - vendor/libgit2/tests/repo/head.c | 461 -- vendor/libgit2/tests/repo/headtree.c | 53 - vendor/libgit2/tests/repo/init.c | 827 ---- vendor/libgit2/tests/repo/iterator.c | 1549 ------ vendor/libgit2/tests/repo/message.c | 39 - vendor/libgit2/tests/repo/new.c | 27 - vendor/libgit2/tests/repo/open.c | 396 -- vendor/libgit2/tests/repo/pathspec.c | 385 -- vendor/libgit2/tests/repo/repo_helpers.c | 22 - vendor/libgit2/tests/repo/repo_helpers.h | 6 - vendor/libgit2/tests/repo/reservedname.c | 132 - vendor/libgit2/tests/repo/setters.c | 109 - vendor/libgit2/tests/repo/shallow.c | 39 - vendor/libgit2/tests/repo/state.c | 132 - vendor/libgit2/tests/reset/default.c | 212 - vendor/libgit2/tests/reset/hard.c | 289 -- vendor/libgit2/tests/reset/mixed.c | 85 - vendor/libgit2/tests/reset/reset_helpers.c | 20 - vendor/libgit2/tests/reset/reset_helpers.h | 7 - vendor/libgit2/tests/reset/soft.c | 189 - vendor/libgit2/tests/resources/.gitattributes | 1 - vendor/libgit2/tests/resources/.gitignore | 1 - .../libgit2/tests/resources/attr/.gitted/HEAD | 1 - .../tests/resources/attr/.gitted/config | 6 - .../tests/resources/attr/.gitted/description | 1 - .../tests/resources/attr/.gitted/index | Bin 1856 -> 0 bytes .../resources/attr/.gitted/info/attributes | 4 - .../tests/resources/attr/.gitted/info/exclude | 6 - .../tests/resources/attr/.gitted/logs/HEAD | 9 - .../attr/.gitted/logs/refs/heads/master | 9 - .../10/8bb4e7fd7b16490dc33ff7d972151e73d7166e | Bin 130 -> 0 bytes .../16/983da6643656bb44c43965ecb6855c6d574512 | Bin 446 -> 0 bytes .../21/7878ab49e1314388ea2e32dc6fdb58a1b969e0 | 4 - .../24/fa9a9fc4e202313e24b648087495441dab432b | Bin 180 -> 0 bytes .../29/29de282ce999e95183aedac6451d3384559c4b | Bin 58 -> 0 bytes .../2b/40c5aca159b04ea8d20ffe36cdf8b09369b14a | 1 - .../2c/66e14f77196ea763fb1e41612c1aa2bc2d8ed2 | Bin 316 -> 0 bytes .../2d/e7dfe3588f3c7e9ad59e7d50ba90e3329df9d9 | Bin 124 -> 0 bytes .../37/0fe9ec224ce33e71f9e5ec2bd1142ce9937a6a | Bin 177 -> 0 bytes .../3a/6df026462ebafe455af9867d27eda20a9e0974 | Bin 84 -> 0 bytes .../3b/74db7ab381105dc0d28f8295a77f6a82989292 | Bin 276 -> 0 bytes .../3e/42ffc54a663f9401cc25843d6c0e71a33e4249 | Bin 596 -> 0 bytes .../45/141a79a77842c59a63229403220a4e4be74e3d | Bin 36 -> 0 bytes .../45/5a314fa848d52ae1f11d254da4f60858fc97f4 | Bin 446 -> 0 bytes .../45/b983be36b73c0788dc9cbcb76cbb80fc7bb057 | Bin 18 -> 0 bytes .../4d/713dc48e6b1bd75b0d61ad078ba9ca3a56745d | 2 - .../4e/49ba8c5b6c32ff28cd9dcb60be34df50fcc485 | Bin 81 -> 0 bytes .../55/6f8c827b8e4a02ad5cab77dca2bcb3e226b0b3 | Bin 24 -> 0 bytes .../58/19a185d77b03325aaf87cafc771db36f6ddca7 | Bin 19 -> 0 bytes .../60/5812ab7fe421fdd325a935d35cb06a9234a7d7 | 2 - .../6b/ab5c79cd5140d0f800917f550eb2a3dc32b0da | 3 - .../6d/968d62c89c7d9ea23a4c9a7b665d017c3d8ffd | Bin 422 -> 0 bytes .../71/7fc31f6b84f9d6fc3a4edbca259d7fc92beee2 | Bin 422 -> 0 bytes .../8d/0b9df9bd30be7910ddda60548d485bc302b911 | 1 - .../93/61f40bb97239cf55811892e14de2e344168ba1 | Bin 45 -> 0 bytes .../94/da4faa0a6bfb8ee6ccf7153801a69202b31857 | Bin 124 -> 0 bytes .../96/089fd31ce1d3ee2afb0ba09ba063066932f027 | Bin 422 -> 0 bytes .../99/eae476896f4907224978b88e5ecaa6c5bb67a9 | Bin 95 -> 0 bytes .../9e/5bdc47d6a80f2be0ea3049ad74231b94609242 | Bin 20 -> 0 bytes .../9f/b40b6675dde60b5697afceae91b66d908c02d9 | Bin 151 -> 0 bytes .../a0/f7217ae99f5ac3e88534f5cea267febc5fa85b | 1 - .../a5/6bbcecaeac760cc26239384d2d4c614e7e4320 | Bin 351 -> 0 bytes .../a5/d76cad53f66f1312bd995909a5bab3c0820770 | 4 - .../a9/7cc019851d401a4f1d091cb91a15890a0dd1ba | 2 - .../b4/35cd5689a0fb54afbeda4ac20368aa480e8f04 | Bin 40 -> 0 bytes .../c0/091889c0c77142b87a1fa5123a6398a61d33e7 | Bin 290 -> 0 bytes .../c4/85abe35abd4aa6fd83b076a78bbea9e2e7e06c | Bin 129 -> 0 bytes .../c7/aadd770d5907a8475c29e9ee21a27b88bf675d | Bin 60 -> 0 bytes .../c9/6bbb2c2557a8325ae1559e3ba79cdcecb23076 | 2 - .../ce/39a97a7fb1fa90bcf5e711249c1e507476ae0e | Bin 446 -> 0 bytes .../d5/7da33c16b14326ecb05d19bbea908f5e4c47d9 | Bin 379 -> 0 bytes .../d8/00886d9c86731ae5c4a62b0b77c437015e00d2 | Bin 18 -> 0 bytes .../dc/cada462d3df8ac6de596fb8c896aba9344f941 | Bin 35 -> 0 bytes .../de/863bff4976c9ed7e17a4da0fd524908dc84049 | Bin 4115 -> 0 bytes .../e5/63cf4758f0d646f1b14b76016aa17fa9e549a4 | Bin 39 -> 0 bytes .../ec/b97df2a174987475ac816e3847fc8e9f6c596b | Bin 171 -> 0 bytes .../ed/f3dcee4003d71f139777898882ccd097e34c53 | Bin 6289 -> 0 bytes .../f2/c6d717cf4a5a3e6b02684155ab07b766982165 | Bin 44 -> 0 bytes .../f5/b0af1fb4f5c0cd7aad880711d368a07333c307 | 2 - .../fb/5067b1aef3ac1ada4b379dbcb7d17255df7d78 | Bin 28 -> 0 bytes .../fe/773770c5a6cc7185580c9204b1ff18a33ff3fc | 1 - .../ff/69f8639ce2e6010b3f33a74160aad98b48da2b | Bin 18 -> 0 bytes .../resources/attr/.gitted/refs/heads/master | 1 - vendor/libgit2/tests/resources/attr/attr0 | 1 - vendor/libgit2/tests/resources/attr/attr1 | 29 - vendor/libgit2/tests/resources/attr/attr2 | 21 - vendor/libgit2/tests/resources/attr/attr3 | 4 - vendor/libgit2/tests/resources/attr/binfile | 1 - vendor/libgit2/tests/resources/attr/dir/file | 0 vendor/libgit2/tests/resources/attr/file | 1 - .../tests/resources/attr/gitattributes | 29 - vendor/libgit2/tests/resources/attr/gitignore | 2 - vendor/libgit2/tests/resources/attr/ign | 1 - vendor/libgit2/tests/resources/attr/macro_bad | 1 - .../libgit2/tests/resources/attr/macro_test | 1 - .../libgit2/tests/resources/attr/root_test1 | 1 - .../libgit2/tests/resources/attr/root_test2 | 6 - .../libgit2/tests/resources/attr/root_test3 | 19 - .../tests/resources/attr/root_test4.txt | 14 - .../tests/resources/attr/sub/.gitattributes | 7 - vendor/libgit2/tests/resources/attr/sub/abc | 37 - .../libgit2/tests/resources/attr/sub/dir/file | 0 vendor/libgit2/tests/resources/attr/sub/file | 1 - .../libgit2/tests/resources/attr/sub/ign/file | 1 - .../tests/resources/attr/sub/ign/sub/file | 1 - .../resources/attr/sub/sub/.gitattributes | 3 - .../libgit2/tests/resources/attr/sub/sub/dir | 0 .../libgit2/tests/resources/attr/sub/sub/file | 1 - .../tests/resources/attr/sub/sub/subsub.txt | 1 - .../tests/resources/attr/sub/subdir_test1 | 2 - .../tests/resources/attr/sub/subdir_test2.txt | 1 - .../tests/resources/attr_index/.gitted/HEAD | 1 - .../tests/resources/attr_index/.gitted/config | 6 - .../resources/attr_index/.gitted/description | 1 - .../tests/resources/attr_index/.gitted/index | Bin 520 -> 0 bytes .../resources/attr_index/.gitted/info/exclude | 6 - .../resources/attr_index/.gitted/info/refs | 1 - .../resources/attr_index/.gitted/logs/HEAD | 4 - .../attr_index/.gitted/logs/refs/heads/master | 4 - .../38/12cfef36615db1788d4e63f90028007e17a348 | 3 - .../59/d942b8be2784bc96db9b22202c10815c9a077b | 1 - .../cd/f17ea3fe625ef812f4dce7f423f4f299287505 | Bin 61 -> 0 bytes .../f7/2502ddd01412bb20796ff812af56fd53b82b52 | Bin 149 -> 0 bytes .../attr_index/.gitted/objects/info/packs | 2 - ...6438607204ce78827e3885594b2c0bb4f13895.idx | Bin 1492 -> 0 bytes ...438607204ce78827e3885594b2c0bb4f13895.pack | Bin 1106 -> 0 bytes .../resources/attr_index/.gitted/packed-refs | 2 - .../attr_index/.gitted/refs/heads/master | 1 - .../tests/resources/attr_index/README.md | 1 - .../tests/resources/attr_index/README.txt | 1 - .../tests/resources/attr_index/gitattributes | 4 - .../attr_index/sub/sub/.gitattributes | 3 - .../resources/attr_index/sub/sub/README.md | 1 - .../resources/attr_index/sub/sub/README.txt | 1 - vendor/libgit2/tests/resources/bad.index | Bin 412 -> 0 bytes .../libgit2/tests/resources/bad_tag.git/HEAD | 1 - .../tests/resources/bad_tag.git/config | 5 - ...28f4e000a17f49a41d7a79fc2f762a8a7d9164.idx | Bin 1268 -> 0 bytes ...8f4e000a17f49a41d7a79fc2f762a8a7d9164.pack | Bin 596 -> 0 bytes .../tests/resources/bad_tag.git/packed-refs | 5 - .../bad_tag.git/refs/dummy-marker.txt | 0 vendor/libgit2/tests/resources/big.index | Bin 335272 -> 0 bytes .../resources/binaryunicode/.gitted/HEAD | 1 - .../resources/binaryunicode/.gitted/config | 6 - .../binaryunicode/.gitted/description | 1 - .../resources/binaryunicode/.gitted/index | Bin 104 -> 0 bytes .../binaryunicode/.gitted/info/exclude | 6 - .../resources/binaryunicode/.gitted/info/refs | 3 - .../binaryunicode/.gitted/objects/info/packs | 2 - ...bfca875b4995d7aba6e5abf36241f3c397327d.idx | Bin 1380 -> 0 bytes ...fca875b4995d7aba6e5abf36241f3c397327d.pack | Bin 20879 -> 0 bytes .../binaryunicode/.gitted/refs/heads/branch1 | 1 - .../binaryunicode/.gitted/refs/heads/branch2 | 1 - .../binaryunicode/.gitted/refs/heads/master | 1 - .../tests/resources/binaryunicode/file.txt | 1 - .../tests/resources/blametest.git/HEAD | 1 - .../tests/resources/blametest.git/config | 5 - .../tests/resources/blametest.git/description | 1 - .../0c/bab4d45fd61e55a1c9697f9f9cb07a12e15448 | Bin 46 -> 0 bytes .../1a/ac69ae5d96461afc4d81d0066cb12f5b05a35b | Bin 28 -> 0 bytes .../1b/5f0775af166331c854bd8d1bca3450eaf2532a | Bin 35 -> 0 bytes .../37/681a80ca21064efd5c3bf2ef41eb3d05a1428b | Bin 106 -> 0 bytes .../48/2f2c370e35c2c314fc1f96db2beb33f955a26a | Bin 35 -> 0 bytes .../4e/ecfea484f8005d101e547f6bfb07c99e2b114e | Bin 163 -> 0 bytes .../5a/572e2e94825f54b95417eacaa089d560c5a5e9 | Bin 324 -> 0 bytes .../63/d671eb32d250e4a83766ebbc60e818c1e1e93a | 3 - .../63/eb57322e363e18d460da5ea8284f3cd2340b36 | Bin 76 -> 0 bytes .../66/53ff42313eb5c82806f145391b18a9699800c7 | Bin 160 -> 0 bytes .../8b/137891791fe96927ad78e64b0aad7bded08bdc | Bin 16 -> 0 bytes .../96/679d59cf9f74d69b3c920f258559b5e8c9a18a | Bin 47 -> 0 bytes .../98/89d6e5557761aa8e3607e80c874a6dc51ada7c | Bin 43 -> 0 bytes .../aa/06ecca6c4ad6432ab9313e556ca92ba4bcf9e9 | 1 - .../ad/9cb4eac23df2fe5e1264287a5872ea2a1ff8b2 | Bin 106 -> 0 bytes .../b1/76dfc3a4dc8734e4c579f77236a9c8d0a965d2 | Bin 76 -> 0 bytes .../b9/0bb887b7c03750ae6b352ffe76ab9d2e86ee7d | Bin 56 -> 0 bytes .../b9/9f7ac0b88909253d829554c14af488c3b0f3a5 | 2 - .../bc/7c5ac2bafe828a68e9d1d460343718d6fbe136 | 3 - .../cf/e0e1e1e3ba18f149fd47f5e1aef6016b2260c3 | Bin 76 -> 0 bytes .../d0/67729932057cdb7527a833d6799c4ddc520640 | 1 - .../da/237394e6132d20d30f175b9b73c8638fddddda | 4 - .../de/9fe35f9906e1994e083cc59c87232bf418795b | Bin 331 -> 0 bytes .../e5/b41c1ea533f87388ab69b13baf0b5a562d6243 | Bin 76 -> 0 bytes .../ef/32df4d259143933715c74951f932d9892364d1 | Bin 42 -> 0 bytes .../resources/blametest.git/refs/heads/master | 1 - .../tests/resources/cherrypick/.gitted/HEAD | 1 - .../tests/resources/cherrypick/.gitted/config | 7 - .../tests/resources/cherrypick/.gitted/index | Bin 248 -> 0 bytes .../resources/cherrypick/.gitted/info/exclude | 6 - .../01/a2b453c2647c71ccfefc285f2266d1f00b8253 | Bin 30 -> 0 bytes .../02/67838e09bbc5969bba035be2d27c8a6de694d8 | Bin 38 -> 0 bytes .../06/3fc9f01e6e9ec2a8d8f749885e931875e50d37 | Bin 141 -> 0 bytes .../08/9ac03f76058b5ba0b44bb268f317f9242481e9 | 3 - .../0d/447a6c2528b06616cde3b209a4b4ea3dcb8d65 | Bin 107 -> 0 bytes .../11/24c2c1ae07b26fded662d6c3f3631d9dc16f88 | Bin 31 -> 0 bytes .../12/905f4ea5b76f9d3fdcfe73e462201c06ae632a | Bin 108 -> 0 bytes .../19/c5c7207054604b69c84d08a7571ef9672bb5c2 | Bin 28 -> 0 bytes .../1c/2116845780455ecf916538c1cc27c4222452af | Bin 116 -> 0 bytes .../1c/c85eb4ff0a8438fde1b14274c6f87f891b36a0 | Bin 117 -> 0 bytes .../1e/1cb7391d25dcd8daba88f1f627f3045982286c | Bin 32 -> 0 bytes .../20/fc1a4c9d994021f43d33ab75e4252e27ca661d | Bin 126 -> 0 bytes .../28/d9eb4208074ad1cc84e71ccc908b34573f05d2 | Bin 28 -> 0 bytes .../2a/26c7e88b285613b302ba76712bc998863f3cbc | 1 - .../2a/c3b376093de405b0a951bff578655b1c2b7fa1 | 1 - .../2c/acbcaabf785f1ac231e8519849d4ad38692f2c | Bin 26 -> 0 bytes .../35/cb210149022c7379b0a67b0dec13cc628ff87d | Bin 137 -> 0 bytes .../38/c05a857e831a7e759d83778bfc85d003e21c45 | Bin 27 -> 0 bytes .../3f/9eed8946df9e2c737d3b8dc0b8e78959aacd92 | 5 - .../40/9a1bec58bf35348e8b62b72bb9c1f45cf5a587 | Bin 33 -> 0 bytes .../44/cd2ed2052c9c68f9a439d208e9614dc2a55c70 | 1 - .../48/7434cace79238a7091e2220611d4f20a765690 | Bin 33 -> 0 bytes .../49/20ad2f17162dcc8823ad491444dcb87f5899c9 | Bin 36 -> 0 bytes .../4b/825dc642cb6eb9a060e54bf8d69288fbee4904 | Bin 15 -> 0 bytes .../4c/532774cc1fea37f6efc2256763a64d38c8cdde | Bin 26 -> 0 bytes .../51/145af30d411a50195b66517d825e69bf57ed22 | Bin 107 -> 0 bytes .../54/61de53ffadbf15be4dd6345997c15689573209 | 4 - .../54/784f10955e92ab27e4fa832e40cb2baf1edbdc | Bin 74 -> 0 bytes .../56/3f6473a3858f99b80e5f93c660512ed38e1e6f | Bin 31 -> 0 bytes .../58/a957ef0061c1a8ef995c855dfab4f5da8d6617 | Bin 32 -> 0 bytes .../5d/c7e1f440ce74d5503a0dfbc6c30e091475f774 | Bin 31 -> 0 bytes .../5e/2206cda1c56430ad107a6866a829c159e0b9ea | 1 - .../5f/77a2a13935ac62a629553f8944ad57b1ed8b4a | Bin 106 -> 0 bytes .../63/c0d92b95253c4a40d3883f423a54be47d2c4c8 | Bin 30 -> 0 bytes .../6c/e83eb5f0fd34a10c3d25c6b36d2ed7ec0d6ce7 | Bin 108 -> 0 bytes .../6d/1c2afe5eeb9e497528e2780ac468a5465cbc96 | 1 - .../74/f06b5bfec6d33d7264f73606b57a7c0b963819 | Bin 141 -> 0 bytes .../82/8b08c52d2cba30952e0e008f60b25b5ba0d41a | Bin 107 -> 0 bytes .../85/36dd6f0ec3ddecb9f9b6c8c64c6d322cd01211 | Bin 36 -> 0 bytes .../85/a4a1d791973644f24c72f5e89420d3064cc452 | Bin 27 -> 0 bytes .../8b/5c30499a71001189b647f4d5b57fa8f04897ce | Bin 107 -> 0 bytes .../96/4ea3da044d9083181a88ba6701de9e35778bf4 | Bin 181 -> 0 bytes .../9c/c39fca3765a2facbe31157f7d60c2602193f36 | Bin 107 -> 0 bytes .../9c/cb9bf50c011fd58dcbaa65df917bf79539717f | Bin 30 -> 0 bytes .../a1/0b59f4280491afe6e430c30654a7acc67d4a33 | Bin 30 -> 0 bytes .../a2/1b4bfe7a04ab18024fb57f4ae9a52a1acef394 | Bin 173 -> 0 bytes .../a4/3a050c588d4e92f11a6b139680923e9728477d | 1 - .../a5/8ca3fee5eb68b11adc2703e5843f968c9dad1e | Bin 28 -> 0 bytes .../a6/61b5dec1004e2c62654ded3762370c27cf266b | Bin 27 -> 0 bytes .../a6/9ef8fcbb9a2c509a7dbf4f23d257eb551d5610 | 1 - .../a8/3c6f70297b805dedc549e6583582966f6ebcab | Bin 138 -> 0 bytes .../a9/020cd240774e4d672732bcb82d516d9685da76 | Bin 26 -> 0 bytes .../ab/4115f808bc585b60f822da7020af86d20f62c8 | Bin 213 -> 0 bytes .../ab/e4603bc7cd5b8167a267e0e2418fd2348f8cff | 4 - .../b8/26e9b36e22e949ec885e7a1f3db496bbab6cd0 | Bin 108 -> 0 bytes .../ba/fbf6912c09505ac60575cd43d3f2aba3bd84d8 | Bin 175 -> 0 bytes .../bb/14296ffa9dfbf935ec9ce2f9ed7808d952226b | Bin 38 -> 0 bytes .../bc/4dd0744364d1db380a9811bd264c101065231e | Bin 55 -> 0 bytes .../bd/65d4083845ed5ed4e1fe5feb85ac395d0760c8 | 2 - .../bd/6ffc8c6c41f0f85ff9e3d61c9479516bac0024 | Bin 31 -> 0 bytes .../bd/a51965cb36c0c5731c8cb50b80a36cac81018e | Bin 107 -> 0 bytes .../ce/d8fb81b6ec534d5deaf2a48b4b96c799712507 | 1 - .../cf/c4f0999a8367568e049af4f72e452d40828a15 | Bin 180 -> 0 bytes .../d0/f21e17beb5b9d953b1d8349049818a4f2edd1e | 1 - .../d3/d77487660ee3c0194ee01dc5eaf478782b1c7e | 1 - .../e2/33b9ed408a95e9d4b65fec7fc34943a556deb2 | Bin 31 -> 0 bytes .../e5/183bfd18e3a0a691fadde2f0d5610b73282d31 | Bin 33 -> 0 bytes .../e6/ae8889c40c77d7be02758235b5b3f7a4f2a129 | Bin 107 -> 0 bytes .../e7/811a2bc55635f182750f0420da5ad232c1af91 | Bin 107 -> 0 bytes .../e9/b63f3655b2ad80c0ff587389b5a9589a3a7110 | 2 - .../eb/da71fe44dcb60c53b8fbd53208a1204d32e959 | Bin 36 -> 0 bytes .../f0/5ed049854c1596a7cc0e957fab34961077f3ae | Bin 36 -> 0 bytes .../f0/a4e1c66bb548cd2b22eebefda703872e969775 | Bin 191 -> 0 bytes .../f2/ec8c8cf1a9fb7aa047a25a4308bfe860237ad4 | Bin 32 -> 0 bytes .../f5/684c96bf40c709877b56404cd8a5dd2d2a7978 | Bin 106 -> 0 bytes .../f9/0f9dcbdac2cce5cc166346160e19cb693ef4e8 | Bin 31 -> 0 bytes .../.gitted/refs/heads/automerge-branch | 1 - .../cherrypick/.gitted/refs/heads/master | 1 - .../.gitted/refs/heads/merge-branch | 1 - .../.gitted/refs/heads/merge-conflicts | 1 - .../.gitted/refs/heads/merge-mainline | 1 - .../cherrypick/.gitted/refs/heads/orphan | 1 - .../cherrypick/.gitted/refs/heads/renames | 1 - .../tests/resources/cherrypick/file1.txt | 15 - .../tests/resources/cherrypick/file2.txt | 15 - .../tests/resources/cherrypick/file3.txt | 15 - .../libgit2/tests/resources/config/.gitconfig | 3 - .../tests/resources/config/config-include | 2 - .../tests/resources/config/config-included | 2 - vendor/libgit2/tests/resources/config/config0 | 7 - vendor/libgit2/tests/resources/config/config1 | 5 - .../libgit2/tests/resources/config/config10 | 1 - .../libgit2/tests/resources/config/config11 | 5 - .../libgit2/tests/resources/config/config12 | 13 - .../libgit2/tests/resources/config/config13 | 2 - .../libgit2/tests/resources/config/config14 | 4 - .../libgit2/tests/resources/config/config15 | 3 - .../libgit2/tests/resources/config/config16 | 3 - .../libgit2/tests/resources/config/config17 | 3 - .../libgit2/tests/resources/config/config18 | 5 - .../libgit2/tests/resources/config/config19 | 5 - vendor/libgit2/tests/resources/config/config2 | 5 - .../libgit2/tests/resources/config/config20 | 11 - vendor/libgit2/tests/resources/config/config3 | 3 - vendor/libgit2/tests/resources/config/config4 | 5 - vendor/libgit2/tests/resources/config/config5 | 9 - vendor/libgit2/tests/resources/config/config6 | 5 - vendor/libgit2/tests/resources/config/config7 | 5 - vendor/libgit2/tests/resources/config/config8 | 0 vendor/libgit2/tests/resources/config/config9 | 9 - .../libgit2/tests/resources/crlf/.gitted/HEAD | 1 - .../tests/resources/crlf/.gitted/config | 0 .../tests/resources/crlf/.gitted/index | Bin 1912 -> 0 bytes .../04/4bcd5c9bf5ebdd51e514a9a36457018f06f6e1 | 1 - .../04/de00b358f13389948756732158eaaaefa1448c | Bin 28 -> 0 bytes .../09/7722be9b67b48dfe3b19396d02fd535300ee46 | Bin 344 -> 0 bytes .../0a/a76e474d259bd7c13eb726a1396c381db55c88 | Bin 27 -> 0 bytes .../0d/06894e14df22e066763ae906e0ed3eb79c205f | Bin 134 -> 0 bytes .../0e/052888828a954ca17e5882638e3c6a083e75c0 | Bin 107 -> 0 bytes .../0f/f5a53f19bfd2b5eea1ba550295c47515678987 | Bin 29 -> 0 bytes .../16/78031ee023a23bd3515e4e1693b661a69f0a73 | Bin 193 -> 0 bytes .../16/c72b67861f8524a5bebc05cd20472d3fca00da | Bin 64 -> 0 bytes .../18/c637c5d9aba6eed226ee1840cd1ca2e6c4e4c5 | Bin 442 -> 0 bytes .../20/3555c5676d75cd80d69b50beb1f4b588c59ceb | Bin 36 -> 0 bytes .../23/f4582779e60bfa7f14750ad507399a58876611 | Bin 219 -> 0 bytes .../2a/d3df895f68f4dda6a0a815c620b909bdd27c05 | Bin 462 -> 0 bytes .../2b/55b4b94f655c857635b6a9005c056aa7de3532 | 2 - .../2b/d9d81b51a867352bab307b89cbb5b4a69adfe1 | Bin 336 -> 0 bytes .../2c/03f9f407b576eae80327864bab572e282a33ea | Bin 455 -> 0 bytes .../33/cdead44e1c3ec178e39a4a69085280dbacf01b | Bin 221 -> 0 bytes .../38/1cfe630df902bc29271a202d3277981180e4a6 | Bin 25 -> 0 bytes .../3f/96bdca0e37616026afaa325c148cec4aa62d04 | Bin 164 -> 0 bytes .../41/7786fc35b3c71aa546e3f95eb5da3c8dad8c41 | Bin 36 -> 0 bytes .../47/fbc2c28a18df0dc773276a253eb85c7516ca50 | Bin 36 -> 0 bytes .../4b/825dc642cb6eb9a060e54bf8d69288fbee4904 | Bin 15 -> 0 bytes .../5a/fb6a14a864e30787857dd92af837e8cdd2cb1b | Bin 194 -> 0 bytes .../68/03c385642cebc8103fddd526ef395d75678a7e | 2 - .../69/597764abeaa1a403ebf589d2ea579c6a8f877e | 1 - .../6a/e3e9c11a51f0aabebcffcbd5c00f4beed143c9 | Bin 87 -> 0 bytes .../6c/589757f65a970a6cc07c71c3f3d2528c611cbc | 2 - .../77/afe26d93c49279ca90604c125496920753fede | Bin 178 -> 0 bytes .../78/db270c1841841f75a8157321bdcb50ab12e6c3 | Bin 156 -> 0 bytes .../79/9770d1cff46753a57db7a066159b5610da6e3a | Bin 20 -> 0 bytes .../7c/ce67e58173e2b01f7db124ceaabe3183d19c49 | Bin 24 -> 0 bytes .../85/340755cfe5e28c2835781978bb1cece91b3d0f | Bin 37 -> 0 bytes .../92/0e90a663bea5d740989d5f935f6dfb473a0c5d | Bin 303 -> 0 bytes .../96/87e444bcbb85645cb496080434c292f1b57182 | 1 - .../97/449da2d225557c558ac244384d487e66c3e591 | Bin 177 -> 0 bytes .../9a/6c3533fef19abd6eec8e61206b5c51982b80d9 | Bin 58 -> 0 bytes .../9d/29b5bb165bf65637ffcb5ededb82ddd7c3fd13 | Bin 227 -> 0 bytes .../a2/34455d62297f1856c4603686150c59fcb0aafe | Bin 189 -> 0 bytes .../a9/a2e8913c1dbe2812fac5e6b4e0a4bd5d0d5966 | 1 - .../aa/f083a9cb53dac3669dcfa0e48921580d629ec7 | Bin 37 -> 0 bytes .../af/6fcf6da196f615d7cda269b55b5c4ecfb4a5b3 | Bin 36 -> 0 bytes .../bb/29a7b46b5d4ba3ea17b238ae561b81d59dc818 | Bin 170 -> 0 bytes .../c3/e11722855ff260bd27418988ac1467c4e9e73a | Bin 261 -> 0 bytes .../c8/d0b1ebcaccdd8f968c4aae3c2175e7fed651fe | 2 - .../cd/574f5a2baa4c79504f8837b730fa0b11defe99 | Bin 62 -> 0 bytes .../cd/d3dacc5c0501d5ea57bbdf90e3d80176606139 | Bin 565 -> 0 bytes .../d1/1e7ef63ba7db1db3b1b99cdbafc57a8549f8a4 | Bin 35 -> 0 bytes .../dc/88e3b917de821e25962bea7ec1f55c4ce2112c | Bin 32 -> 0 bytes .../de/5bfa165999d9d6c6dbafad2a7e709f93ec30fd | Bin 179 -> 0 bytes .../e5/062da7d7802cf492975eda580f09ac4876bd88 | 1 - .../e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 | Bin 15 -> 0 bytes .../ea/030d3c6cec212069eca698cabaa5b4550f1511 | Bin 32 -> 0 bytes .../ef/0dcd356d77221e9c27f4f3928ad28e80b87ceb | Bin 168 -> 0 bytes .../f2/b745d7f47d114a3a6b31a7b628e61e804d1a58 | Bin 561 -> 0 bytes .../f4/d25b796d86387205a5498175d66e91d1e5006a | Bin 106 -> 0 bytes .../fe/085d9ace90cc675b87df15e1aeed0c3a31407f | Bin 139 -> 0 bytes .../fe/ab3713c4659bb22700042b3c55b8d60d0a952b | Bin 568 -> 0 bytes .../crlf/.gitted/refs/heads/empty-files | 1 - .../resources/crlf/.gitted/refs/heads/master | 1 - .../tests/resources/crlf_data/.gitattributes | 1 - .../posix/autocrlf_false,-crlf/all-crlf | 4 - .../autocrlf_false,-crlf/all-crlf-utf8bom | 4 - .../posix/autocrlf_false,-crlf/all-lf | 5 - .../posix/autocrlf_false,-crlf/all-lf-utf8bom | 5 - .../autocrlf_false,-crlf/binary-all-crlf | 4 - .../posix/autocrlf_false,-crlf/binary-all-lf | 4 - .../autocrlf_false,-crlf/binary-mixed-lf-cr | 3 - .../binary-mixed-lf-cr-crlf | 3 - .../autocrlf_false,-crlf/few-utf8-chars-crlf | 22 - .../autocrlf_false,-crlf/few-utf8-chars-lf | 22 - .../autocrlf_false,-crlf/many-utf8-chars-crlf | 4 - .../autocrlf_false,-crlf/many-utf8-chars-lf | 4 - .../posix/autocrlf_false,-crlf/mixed-lf-cr | 3 - .../autocrlf_false,-crlf/mixed-lf-cr-crlf | 3 - .../posix/autocrlf_false,-crlf/more-crlf | 5 - .../autocrlf_false,-crlf/more-crlf-utf8bom | 5 - .../posix/autocrlf_false,-crlf/more-lf | 5 - .../autocrlf_false,-crlf/more-lf-utf8bom | 5 - .../posix/autocrlf_false,-crlf/zero-byte | 0 .../posix/autocrlf_false,-text/all-crlf | 4 - .../autocrlf_false,-text/all-crlf-utf8bom | 4 - .../posix/autocrlf_false,-text/all-lf | 5 - .../posix/autocrlf_false,-text/all-lf-utf8bom | 5 - .../autocrlf_false,-text/binary-all-crlf | 4 - .../posix/autocrlf_false,-text/binary-all-lf | 4 - .../autocrlf_false,-text/binary-mixed-lf-cr | 3 - .../binary-mixed-lf-cr-crlf | 3 - .../autocrlf_false,-text/few-utf8-chars-crlf | 22 - .../autocrlf_false,-text/few-utf8-chars-lf | 22 - .../autocrlf_false,-text/many-utf8-chars-crlf | 4 - .../autocrlf_false,-text/many-utf8-chars-lf | 4 - .../posix/autocrlf_false,-text/mixed-lf-cr | 3 - .../autocrlf_false,-text/mixed-lf-cr-crlf | 3 - .../posix/autocrlf_false,-text/more-crlf | 5 - .../autocrlf_false,-text/more-crlf-utf8bom | 5 - .../posix/autocrlf_false,-text/more-lf | 5 - .../autocrlf_false,-text/more-lf-utf8bom | 5 - .../posix/autocrlf_false,-text/zero-byte | 0 .../posix/autocrlf_false,crlf/all-crlf | 4 - .../autocrlf_false,crlf/all-crlf-utf8bom | 4 - .../posix/autocrlf_false,crlf/all-lf | 5 - .../posix/autocrlf_false,crlf/all-lf-utf8bom | 5 - .../posix/autocrlf_false,crlf/binary-all-crlf | 4 - .../posix/autocrlf_false,crlf/binary-all-lf | 4 - .../autocrlf_false,crlf/binary-mixed-lf-cr | 3 - .../binary-mixed-lf-cr-crlf | 3 - .../autocrlf_false,crlf/few-utf8-chars-crlf | 22 - .../autocrlf_false,crlf/few-utf8-chars-lf | 22 - .../autocrlf_false,crlf/many-utf8-chars-crlf | 4 - .../autocrlf_false,crlf/many-utf8-chars-lf | 4 - .../posix/autocrlf_false,crlf/mixed-lf-cr | 3 - .../autocrlf_false,crlf/mixed-lf-cr-crlf | 3 - .../posix/autocrlf_false,crlf/more-crlf | 5 - .../autocrlf_false,crlf/more-crlf-utf8bom | 5 - .../posix/autocrlf_false,crlf/more-lf | 5 - .../posix/autocrlf_false,crlf/more-lf-utf8bom | 5 - .../posix/autocrlf_false,crlf/zero-byte | 0 .../posix/autocrlf_false,eol_crlf/all-crlf | 4 - .../autocrlf_false,eol_crlf/all-crlf-utf8bom | 4 - .../posix/autocrlf_false,eol_crlf/all-lf | 5 - .../autocrlf_false,eol_crlf/all-lf-utf8bom | 5 - .../autocrlf_false,eol_crlf/binary-all-crlf | 4 - .../autocrlf_false,eol_crlf/binary-all-lf | 4 - .../binary-mixed-lf-cr | 3 - .../binary-mixed-lf-cr-crlf | 3 - .../few-utf8-chars-crlf | 22 - .../autocrlf_false,eol_crlf/few-utf8-chars-lf | 22 - .../many-utf8-chars-crlf | 4 - .../many-utf8-chars-lf | 4 - .../posix/autocrlf_false,eol_crlf/mixed-lf-cr | 3 - .../autocrlf_false,eol_crlf/mixed-lf-cr-crlf | 3 - .../posix/autocrlf_false,eol_crlf/more-crlf | 5 - .../autocrlf_false,eol_crlf/more-crlf-utf8bom | 5 - .../posix/autocrlf_false,eol_crlf/more-lf | 5 - .../autocrlf_false,eol_crlf/more-lf-utf8bom | 5 - .../posix/autocrlf_false,eol_crlf/zero-byte | 0 .../posix/autocrlf_false,eol_lf/all-crlf | 4 - .../autocrlf_false,eol_lf/all-crlf-utf8bom | 4 - .../posix/autocrlf_false,eol_lf/all-lf | 5 - .../autocrlf_false,eol_lf/all-lf-utf8bom | 5 - .../autocrlf_false,eol_lf/binary-all-crlf | 4 - .../posix/autocrlf_false,eol_lf/binary-all-lf | 4 - .../autocrlf_false,eol_lf/binary-mixed-lf-cr | 3 - .../binary-mixed-lf-cr-crlf | 3 - .../autocrlf_false,eol_lf/few-utf8-chars-crlf | 22 - .../autocrlf_false,eol_lf/few-utf8-chars-lf | 22 - .../many-utf8-chars-crlf | 4 - .../autocrlf_false,eol_lf/many-utf8-chars-lf | 4 - .../posix/autocrlf_false,eol_lf/mixed-lf-cr | 3 - .../autocrlf_false,eol_lf/mixed-lf-cr-crlf | 3 - .../posix/autocrlf_false,eol_lf/more-crlf | 5 - .../autocrlf_false,eol_lf/more-crlf-utf8bom | 5 - .../posix/autocrlf_false,eol_lf/more-lf | 5 - .../autocrlf_false,eol_lf/more-lf-utf8bom | 5 - .../posix/autocrlf_false,eol_lf/zero-byte | 0 .../autocrlf_false,text,eol_crlf/all-crlf | 4 - .../all-crlf-utf8bom | 4 - .../posix/autocrlf_false,text,eol_crlf/all-lf | 5 - .../all-lf-utf8bom | 5 - .../binary-all-crlf | 4 - .../binary-all-lf | 4 - .../binary-mixed-lf-cr | 3 - .../binary-mixed-lf-cr-crlf | 3 - .../few-utf8-chars-crlf | 22 - .../few-utf8-chars-lf | 22 - .../many-utf8-chars-crlf | 4 - .../many-utf8-chars-lf | 4 - .../autocrlf_false,text,eol_crlf/mixed-lf-cr | 3 - .../mixed-lf-cr-crlf | 3 - .../autocrlf_false,text,eol_crlf/more-crlf | 5 - .../more-crlf-utf8bom | 5 - .../autocrlf_false,text,eol_crlf/more-lf | 5 - .../more-lf-utf8bom | 5 - .../autocrlf_false,text,eol_crlf/zero-byte | 0 .../posix/autocrlf_false,text,eol_lf/all-crlf | 4 - .../all-crlf-utf8bom | 4 - .../posix/autocrlf_false,text,eol_lf/all-lf | 5 - .../autocrlf_false,text,eol_lf/all-lf-utf8bom | 5 - .../binary-all-crlf | 4 - .../autocrlf_false,text,eol_lf/binary-all-lf | 4 - .../binary-mixed-lf-cr | 3 - .../binary-mixed-lf-cr-crlf | 3 - .../few-utf8-chars-crlf | 22 - .../few-utf8-chars-lf | 22 - .../many-utf8-chars-crlf | 4 - .../many-utf8-chars-lf | 4 - .../autocrlf_false,text,eol_lf/mixed-lf-cr | 3 - .../mixed-lf-cr-crlf | 3 - .../autocrlf_false,text,eol_lf/more-crlf | 5 - .../more-crlf-utf8bom | 5 - .../posix/autocrlf_false,text,eol_lf/more-lf | 5 - .../more-lf-utf8bom | 5 - .../autocrlf_false,text,eol_lf/zero-byte | 0 .../posix/autocrlf_false,text/all-crlf | 4 - .../autocrlf_false,text/all-crlf-utf8bom | 4 - .../posix/autocrlf_false,text/all-lf | 5 - .../posix/autocrlf_false,text/all-lf-utf8bom | 5 - .../posix/autocrlf_false,text/binary-all-crlf | 4 - .../posix/autocrlf_false,text/binary-all-lf | 4 - .../autocrlf_false,text/binary-mixed-lf-cr | 3 - .../binary-mixed-lf-cr-crlf | 3 - .../autocrlf_false,text/few-utf8-chars-crlf | 22 - .../autocrlf_false,text/few-utf8-chars-lf | 22 - .../autocrlf_false,text/many-utf8-chars-crlf | 4 - .../autocrlf_false,text/many-utf8-chars-lf | 4 - .../posix/autocrlf_false,text/mixed-lf-cr | 3 - .../autocrlf_false,text/mixed-lf-cr-crlf | 3 - .../posix/autocrlf_false,text/more-crlf | 5 - .../autocrlf_false,text/more-crlf-utf8bom | 5 - .../posix/autocrlf_false,text/more-lf | 5 - .../posix/autocrlf_false,text/more-lf-utf8bom | 5 - .../posix/autocrlf_false,text/zero-byte | 0 .../all-crlf | 4 - .../all-crlf-utf8bom | 4 - .../autocrlf_false,text_auto,eol_crlf/all-lf | 5 - .../all-lf-utf8bom | 5 - .../binary-all-crlf | 4 - .../binary-all-lf | 4 - .../binary-mixed-lf-cr | 3 - .../binary-mixed-lf-cr-crlf | 3 - .../few-utf8-chars-crlf | 22 - .../few-utf8-chars-lf | 22 - .../many-utf8-chars-crlf | 4 - .../many-utf8-chars-lf | 4 - .../mixed-lf-cr | 3 - .../mixed-lf-cr-crlf | 3 - .../more-crlf | 5 - .../more-crlf-utf8bom | 5 - .../autocrlf_false,text_auto,eol_crlf/more-lf | 5 - .../more-lf-utf8bom | 5 - .../zero-byte | 0 .../autocrlf_false,text_auto,eol_lf/all-crlf | 4 - .../all-crlf-utf8bom | 4 - .../autocrlf_false,text_auto,eol_lf/all-lf | 5 - .../all-lf-utf8bom | 5 - .../binary-all-crlf | 4 - .../binary-all-lf | 4 - .../binary-mixed-lf-cr | 3 - .../binary-mixed-lf-cr-crlf | 3 - .../few-utf8-chars-crlf | 22 - .../few-utf8-chars-lf | 22 - .../many-utf8-chars-crlf | 4 - .../many-utf8-chars-lf | 4 - .../mixed-lf-cr | 3 - .../mixed-lf-cr-crlf | 3 - .../autocrlf_false,text_auto,eol_lf/more-crlf | 5 - .../more-crlf-utf8bom | 5 - .../autocrlf_false,text_auto,eol_lf/more-lf | 5 - .../more-lf-utf8bom | 5 - .../autocrlf_false,text_auto,eol_lf/zero-byte | 0 .../posix/autocrlf_false,text_auto/all-crlf | 4 - .../autocrlf_false,text_auto/all-crlf-utf8bom | 4 - .../posix/autocrlf_false,text_auto/all-lf | 5 - .../autocrlf_false,text_auto/all-lf-utf8bom | 5 - .../autocrlf_false,text_auto/binary-all-crlf | 4 - .../autocrlf_false,text_auto/binary-all-lf | 4 - .../binary-mixed-lf-cr | 3 - .../binary-mixed-lf-cr-crlf | 3 - .../few-utf8-chars-crlf | 22 - .../few-utf8-chars-lf | 22 - .../many-utf8-chars-crlf | 4 - .../many-utf8-chars-lf | 4 - .../autocrlf_false,text_auto/mixed-lf-cr | 3 - .../autocrlf_false,text_auto/mixed-lf-cr-crlf | 3 - .../posix/autocrlf_false,text_auto/more-crlf | 5 - .../more-crlf-utf8bom | 5 - .../posix/autocrlf_false,text_auto/more-lf | 5 - .../autocrlf_false,text_auto/more-lf-utf8bom | 5 - .../posix/autocrlf_false,text_auto/zero-byte | 0 .../crlf_data/posix/autocrlf_false/all-crlf | 4 - .../posix/autocrlf_false/all-crlf-utf8bom | 4 - .../crlf_data/posix/autocrlf_false/all-lf | 5 - .../posix/autocrlf_false/all-lf-utf8bom | 5 - .../posix/autocrlf_false/binary-all-crlf | 4 - .../posix/autocrlf_false/binary-all-lf | 4 - .../posix/autocrlf_false/binary-mixed-lf-cr | 3 - .../autocrlf_false/binary-mixed-lf-cr-crlf | 3 - .../posix/autocrlf_false/few-utf8-chars-crlf | 22 - .../posix/autocrlf_false/few-utf8-chars-lf | 22 - .../posix/autocrlf_false/many-utf8-chars-crlf | 4 - .../posix/autocrlf_false/many-utf8-chars-lf | 4 - .../posix/autocrlf_false/mixed-lf-cr | 3 - .../posix/autocrlf_false/mixed-lf-cr-crlf | 3 - .../crlf_data/posix/autocrlf_false/more-crlf | 5 - .../posix/autocrlf_false/more-crlf-utf8bom | 5 - .../crlf_data/posix/autocrlf_false/more-lf | 5 - .../posix/autocrlf_false/more-lf-utf8bom | 5 - .../crlf_data/posix/autocrlf_false/zero-byte | 0 .../posix/autocrlf_input,-crlf/all-crlf | 4 - .../autocrlf_input,-crlf/all-crlf-utf8bom | 4 - .../posix/autocrlf_input,-crlf/all-lf | 5 - .../posix/autocrlf_input,-crlf/all-lf-utf8bom | 5 - .../autocrlf_input,-crlf/binary-all-crlf | 4 - .../posix/autocrlf_input,-crlf/binary-all-lf | 4 - .../autocrlf_input,-crlf/binary-mixed-lf-cr | 3 - .../binary-mixed-lf-cr-crlf | 3 - .../autocrlf_input,-crlf/few-utf8-chars-crlf | 22 - .../autocrlf_input,-crlf/few-utf8-chars-lf | 22 - .../autocrlf_input,-crlf/many-utf8-chars-crlf | 4 - .../autocrlf_input,-crlf/many-utf8-chars-lf | 4 - .../posix/autocrlf_input,-crlf/mixed-lf-cr | 3 - .../autocrlf_input,-crlf/mixed-lf-cr-crlf | 3 - .../posix/autocrlf_input,-crlf/more-crlf | 5 - .../autocrlf_input,-crlf/more-crlf-utf8bom | 5 - .../posix/autocrlf_input,-crlf/more-lf | 5 - .../autocrlf_input,-crlf/more-lf-utf8bom | 5 - .../posix/autocrlf_input,-crlf/zero-byte | 0 .../posix/autocrlf_input,-text/all-crlf | 4 - .../autocrlf_input,-text/all-crlf-utf8bom | 4 - .../posix/autocrlf_input,-text/all-lf | 5 - .../posix/autocrlf_input,-text/all-lf-utf8bom | 5 - .../autocrlf_input,-text/binary-all-crlf | 4 - .../posix/autocrlf_input,-text/binary-all-lf | 4 - .../autocrlf_input,-text/binary-mixed-lf-cr | 3 - .../binary-mixed-lf-cr-crlf | 3 - .../autocrlf_input,-text/few-utf8-chars-crlf | 22 - .../autocrlf_input,-text/few-utf8-chars-lf | 22 - .../autocrlf_input,-text/many-utf8-chars-crlf | 4 - .../autocrlf_input,-text/many-utf8-chars-lf | 4 - .../posix/autocrlf_input,-text/mixed-lf-cr | 3 - .../autocrlf_input,-text/mixed-lf-cr-crlf | 3 - .../posix/autocrlf_input,-text/more-crlf | 5 - .../autocrlf_input,-text/more-crlf-utf8bom | 5 - .../posix/autocrlf_input,-text/more-lf | 5 - .../autocrlf_input,-text/more-lf-utf8bom | 5 - .../posix/autocrlf_input,-text/zero-byte | 0 .../posix/autocrlf_input,crlf/all-crlf | 4 - .../autocrlf_input,crlf/all-crlf-utf8bom | 4 - .../posix/autocrlf_input,crlf/all-lf | 5 - .../posix/autocrlf_input,crlf/all-lf-utf8bom | 5 - .../posix/autocrlf_input,crlf/binary-all-crlf | 4 - .../posix/autocrlf_input,crlf/binary-all-lf | 4 - .../autocrlf_input,crlf/binary-mixed-lf-cr | 3 - .../binary-mixed-lf-cr-crlf | 3 - .../autocrlf_input,crlf/few-utf8-chars-crlf | 22 - .../autocrlf_input,crlf/few-utf8-chars-lf | 22 - .../autocrlf_input,crlf/many-utf8-chars-crlf | 4 - .../autocrlf_input,crlf/many-utf8-chars-lf | 4 - .../posix/autocrlf_input,crlf/mixed-lf-cr | 3 - .../autocrlf_input,crlf/mixed-lf-cr-crlf | 3 - .../posix/autocrlf_input,crlf/more-crlf | 5 - .../autocrlf_input,crlf/more-crlf-utf8bom | 5 - .../posix/autocrlf_input,crlf/more-lf | 5 - .../posix/autocrlf_input,crlf/more-lf-utf8bom | 5 - .../posix/autocrlf_input,crlf/zero-byte | 0 .../posix/autocrlf_input,eol_crlf/all-crlf | 4 - .../autocrlf_input,eol_crlf/all-crlf-utf8bom | 4 - .../posix/autocrlf_input,eol_crlf/all-lf | 5 - .../autocrlf_input,eol_crlf/all-lf-utf8bom | 5 - .../autocrlf_input,eol_crlf/binary-all-crlf | 4 - .../autocrlf_input,eol_crlf/binary-all-lf | 4 - .../binary-mixed-lf-cr | 3 - .../binary-mixed-lf-cr-crlf | 3 - .../few-utf8-chars-crlf | 22 - .../autocrlf_input,eol_crlf/few-utf8-chars-lf | 22 - .../many-utf8-chars-crlf | 4 - .../many-utf8-chars-lf | 4 - .../posix/autocrlf_input,eol_crlf/mixed-lf-cr | 3 - .../autocrlf_input,eol_crlf/mixed-lf-cr-crlf | 3 - .../posix/autocrlf_input,eol_crlf/more-crlf | 5 - .../autocrlf_input,eol_crlf/more-crlf-utf8bom | 5 - .../posix/autocrlf_input,eol_crlf/more-lf | 5 - .../autocrlf_input,eol_crlf/more-lf-utf8bom | 5 - .../posix/autocrlf_input,eol_crlf/zero-byte | 0 .../posix/autocrlf_input,eol_lf/all-crlf | 4 - .../autocrlf_input,eol_lf/all-crlf-utf8bom | 4 - .../posix/autocrlf_input,eol_lf/all-lf | 5 - .../autocrlf_input,eol_lf/all-lf-utf8bom | 5 - .../autocrlf_input,eol_lf/binary-all-crlf | 4 - .../posix/autocrlf_input,eol_lf/binary-all-lf | 4 - .../autocrlf_input,eol_lf/binary-mixed-lf-cr | 3 - .../binary-mixed-lf-cr-crlf | 3 - .../autocrlf_input,eol_lf/few-utf8-chars-crlf | 22 - .../autocrlf_input,eol_lf/few-utf8-chars-lf | 22 - .../many-utf8-chars-crlf | 4 - .../autocrlf_input,eol_lf/many-utf8-chars-lf | 4 - .../posix/autocrlf_input,eol_lf/mixed-lf-cr | 3 - .../autocrlf_input,eol_lf/mixed-lf-cr-crlf | 3 - .../posix/autocrlf_input,eol_lf/more-crlf | 5 - .../autocrlf_input,eol_lf/more-crlf-utf8bom | 5 - .../posix/autocrlf_input,eol_lf/more-lf | 5 - .../autocrlf_input,eol_lf/more-lf-utf8bom | 5 - .../posix/autocrlf_input,eol_lf/zero-byte | 0 .../autocrlf_input,text,eol_crlf/all-crlf | 4 - .../all-crlf-utf8bom | 4 - .../posix/autocrlf_input,text,eol_crlf/all-lf | 5 - .../all-lf-utf8bom | 5 - .../binary-all-crlf | 4 - .../binary-all-lf | 4 - .../binary-mixed-lf-cr | 3 - .../binary-mixed-lf-cr-crlf | 3 - .../few-utf8-chars-crlf | 22 - .../few-utf8-chars-lf | 22 - .../many-utf8-chars-crlf | 4 - .../many-utf8-chars-lf | 4 - .../autocrlf_input,text,eol_crlf/mixed-lf-cr | 3 - .../mixed-lf-cr-crlf | 3 - .../autocrlf_input,text,eol_crlf/more-crlf | 5 - .../more-crlf-utf8bom | 5 - .../autocrlf_input,text,eol_crlf/more-lf | 5 - .../more-lf-utf8bom | 5 - .../autocrlf_input,text,eol_crlf/zero-byte | 0 .../posix/autocrlf_input,text,eol_lf/all-crlf | 4 - .../all-crlf-utf8bom | 4 - .../posix/autocrlf_input,text,eol_lf/all-lf | 5 - .../autocrlf_input,text,eol_lf/all-lf-utf8bom | 5 - .../binary-all-crlf | 4 - .../autocrlf_input,text,eol_lf/binary-all-lf | 4 - .../binary-mixed-lf-cr | 3 - .../binary-mixed-lf-cr-crlf | 3 - .../few-utf8-chars-crlf | 22 - .../few-utf8-chars-lf | 22 - .../many-utf8-chars-crlf | 4 - .../many-utf8-chars-lf | 4 - .../autocrlf_input,text,eol_lf/mixed-lf-cr | 3 - .../mixed-lf-cr-crlf | 3 - .../autocrlf_input,text,eol_lf/more-crlf | 5 - .../more-crlf-utf8bom | 5 - .../posix/autocrlf_input,text,eol_lf/more-lf | 5 - .../more-lf-utf8bom | 5 - .../autocrlf_input,text,eol_lf/zero-byte | 0 .../posix/autocrlf_input,text/all-crlf | 4 - .../autocrlf_input,text/all-crlf-utf8bom | 4 - .../posix/autocrlf_input,text/all-lf | 5 - .../posix/autocrlf_input,text/all-lf-utf8bom | 5 - .../posix/autocrlf_input,text/binary-all-crlf | 4 - .../posix/autocrlf_input,text/binary-all-lf | 4 - .../autocrlf_input,text/binary-mixed-lf-cr | 3 - .../binary-mixed-lf-cr-crlf | 3 - .../autocrlf_input,text/few-utf8-chars-crlf | 22 - .../autocrlf_input,text/few-utf8-chars-lf | 22 - .../autocrlf_input,text/many-utf8-chars-crlf | 4 - .../autocrlf_input,text/many-utf8-chars-lf | 4 - .../posix/autocrlf_input,text/mixed-lf-cr | 3 - .../autocrlf_input,text/mixed-lf-cr-crlf | 3 - .../posix/autocrlf_input,text/more-crlf | 5 - .../autocrlf_input,text/more-crlf-utf8bom | 5 - .../posix/autocrlf_input,text/more-lf | 5 - .../posix/autocrlf_input,text/more-lf-utf8bom | 5 - .../posix/autocrlf_input,text/zero-byte | 0 .../all-crlf | 4 - .../all-crlf-utf8bom | 4 - .../autocrlf_input,text_auto,eol_crlf/all-lf | 5 - .../all-lf-utf8bom | 5 - .../binary-all-crlf | 4 - .../binary-all-lf | 4 - .../binary-mixed-lf-cr | 3 - .../binary-mixed-lf-cr-crlf | 3 - .../few-utf8-chars-crlf | 22 - .../few-utf8-chars-lf | 22 - .../many-utf8-chars-crlf | 4 - .../many-utf8-chars-lf | 4 - .../mixed-lf-cr | 3 - .../mixed-lf-cr-crlf | 3 - .../more-crlf | 5 - .../more-crlf-utf8bom | 5 - .../autocrlf_input,text_auto,eol_crlf/more-lf | 5 - .../more-lf-utf8bom | 5 - .../zero-byte | 0 .../autocrlf_input,text_auto,eol_lf/all-crlf | 4 - .../all-crlf-utf8bom | 4 - .../autocrlf_input,text_auto,eol_lf/all-lf | 5 - .../all-lf-utf8bom | 5 - .../binary-all-crlf | 4 - .../binary-all-lf | 4 - .../binary-mixed-lf-cr | 3 - .../binary-mixed-lf-cr-crlf | 3 - .../few-utf8-chars-crlf | 22 - .../few-utf8-chars-lf | 22 - .../many-utf8-chars-crlf | 4 - .../many-utf8-chars-lf | 4 - .../mixed-lf-cr | 3 - .../mixed-lf-cr-crlf | 3 - .../autocrlf_input,text_auto,eol_lf/more-crlf | 5 - .../more-crlf-utf8bom | 5 - .../autocrlf_input,text_auto,eol_lf/more-lf | 5 - .../more-lf-utf8bom | 5 - .../autocrlf_input,text_auto,eol_lf/zero-byte | 0 .../posix/autocrlf_input,text_auto/all-crlf | 4 - .../autocrlf_input,text_auto/all-crlf-utf8bom | 4 - .../posix/autocrlf_input,text_auto/all-lf | 5 - .../autocrlf_input,text_auto/all-lf-utf8bom | 5 - .../autocrlf_input,text_auto/binary-all-crlf | 4 - .../autocrlf_input,text_auto/binary-all-lf | 4 - .../binary-mixed-lf-cr | 3 - .../binary-mixed-lf-cr-crlf | 3 - .../few-utf8-chars-crlf | 22 - .../few-utf8-chars-lf | 22 - .../many-utf8-chars-crlf | 4 - .../many-utf8-chars-lf | 4 - .../autocrlf_input,text_auto/mixed-lf-cr | 3 - .../autocrlf_input,text_auto/mixed-lf-cr-crlf | 3 - .../posix/autocrlf_input,text_auto/more-crlf | 5 - .../more-crlf-utf8bom | 5 - .../posix/autocrlf_input,text_auto/more-lf | 5 - .../autocrlf_input,text_auto/more-lf-utf8bom | 5 - .../posix/autocrlf_input,text_auto/zero-byte | 0 .../crlf_data/posix/autocrlf_input/all-crlf | 4 - .../posix/autocrlf_input/all-crlf-utf8bom | 4 - .../crlf_data/posix/autocrlf_input/all-lf | 5 - .../posix/autocrlf_input/all-lf-utf8bom | 5 - .../posix/autocrlf_input/binary-all-crlf | 4 - .../posix/autocrlf_input/binary-all-lf | 4 - .../posix/autocrlf_input/binary-mixed-lf-cr | 3 - .../autocrlf_input/binary-mixed-lf-cr-crlf | 3 - .../posix/autocrlf_input/few-utf8-chars-crlf | 22 - .../posix/autocrlf_input/few-utf8-chars-lf | 22 - .../posix/autocrlf_input/many-utf8-chars-crlf | 4 - .../posix/autocrlf_input/many-utf8-chars-lf | 4 - .../posix/autocrlf_input/mixed-lf-cr | 3 - .../posix/autocrlf_input/mixed-lf-cr-crlf | 3 - .../crlf_data/posix/autocrlf_input/more-crlf | 5 - .../posix/autocrlf_input/more-crlf-utf8bom | 5 - .../crlf_data/posix/autocrlf_input/more-lf | 5 - .../posix/autocrlf_input/more-lf-utf8bom | 5 - .../crlf_data/posix/autocrlf_input/zero-byte | 0 .../posix/autocrlf_true,-crlf/all-crlf | 4 - .../autocrlf_true,-crlf/all-crlf-utf8bom | 4 - .../posix/autocrlf_true,-crlf/all-lf | 5 - .../posix/autocrlf_true,-crlf/all-lf-utf8bom | 5 - .../posix/autocrlf_true,-crlf/binary-all-crlf | 4 - .../posix/autocrlf_true,-crlf/binary-all-lf | 4 - .../autocrlf_true,-crlf/binary-mixed-lf-cr | 3 - .../binary-mixed-lf-cr-crlf | 3 - .../autocrlf_true,-crlf/few-utf8-chars-crlf | 22 - .../autocrlf_true,-crlf/few-utf8-chars-lf | 22 - .../autocrlf_true,-crlf/many-utf8-chars-crlf | 4 - .../autocrlf_true,-crlf/many-utf8-chars-lf | 4 - .../posix/autocrlf_true,-crlf/mixed-lf-cr | 3 - .../autocrlf_true,-crlf/mixed-lf-cr-crlf | 3 - .../posix/autocrlf_true,-crlf/more-crlf | 5 - .../autocrlf_true,-crlf/more-crlf-utf8bom | 5 - .../posix/autocrlf_true,-crlf/more-lf | 5 - .../posix/autocrlf_true,-crlf/more-lf-utf8bom | 5 - .../posix/autocrlf_true,-crlf/zero-byte | 0 .../posix/autocrlf_true,-text/all-crlf | 4 - .../autocrlf_true,-text/all-crlf-utf8bom | 4 - .../posix/autocrlf_true,-text/all-lf | 5 - .../posix/autocrlf_true,-text/all-lf-utf8bom | 5 - .../posix/autocrlf_true,-text/binary-all-crlf | 4 - .../posix/autocrlf_true,-text/binary-all-lf | 4 - .../autocrlf_true,-text/binary-mixed-lf-cr | 3 - .../binary-mixed-lf-cr-crlf | 3 - .../autocrlf_true,-text/few-utf8-chars-crlf | 22 - .../autocrlf_true,-text/few-utf8-chars-lf | 22 - .../autocrlf_true,-text/many-utf8-chars-crlf | 4 - .../autocrlf_true,-text/many-utf8-chars-lf | 4 - .../posix/autocrlf_true,-text/mixed-lf-cr | 3 - .../autocrlf_true,-text/mixed-lf-cr-crlf | 3 - .../posix/autocrlf_true,-text/more-crlf | 5 - .../autocrlf_true,-text/more-crlf-utf8bom | 5 - .../posix/autocrlf_true,-text/more-lf | 5 - .../posix/autocrlf_true,-text/more-lf-utf8bom | 5 - .../posix/autocrlf_true,-text/zero-byte | 0 .../posix/autocrlf_true,crlf/all-crlf | 4 - .../posix/autocrlf_true,crlf/all-crlf-utf8bom | 4 - .../crlf_data/posix/autocrlf_true,crlf/all-lf | 5 - .../posix/autocrlf_true,crlf/all-lf-utf8bom | 5 - .../posix/autocrlf_true,crlf/binary-all-crlf | 4 - .../posix/autocrlf_true,crlf/binary-all-lf | 4 - .../autocrlf_true,crlf/binary-mixed-lf-cr | 3 - .../binary-mixed-lf-cr-crlf | 3 - .../autocrlf_true,crlf/few-utf8-chars-crlf | 22 - .../autocrlf_true,crlf/few-utf8-chars-lf | 22 - .../autocrlf_true,crlf/many-utf8-chars-crlf | 4 - .../autocrlf_true,crlf/many-utf8-chars-lf | 4 - .../posix/autocrlf_true,crlf/mixed-lf-cr | 3 - .../posix/autocrlf_true,crlf/mixed-lf-cr-crlf | 3 - .../posix/autocrlf_true,crlf/more-crlf | 5 - .../autocrlf_true,crlf/more-crlf-utf8bom | 5 - .../posix/autocrlf_true,crlf/more-lf | 5 - .../posix/autocrlf_true,crlf/more-lf-utf8bom | 5 - .../posix/autocrlf_true,crlf/zero-byte | 0 .../posix/autocrlf_true,eol_crlf/all-crlf | 4 - .../autocrlf_true,eol_crlf/all-crlf-utf8bom | 4 - .../posix/autocrlf_true,eol_crlf/all-lf | 5 - .../autocrlf_true,eol_crlf/all-lf-utf8bom | 5 - .../autocrlf_true,eol_crlf/binary-all-crlf | 4 - .../autocrlf_true,eol_crlf/binary-all-lf | 4 - .../autocrlf_true,eol_crlf/binary-mixed-lf-cr | 3 - .../binary-mixed-lf-cr-crlf | 3 - .../few-utf8-chars-crlf | 22 - .../autocrlf_true,eol_crlf/few-utf8-chars-lf | 22 - .../many-utf8-chars-crlf | 4 - .../autocrlf_true,eol_crlf/many-utf8-chars-lf | 4 - .../posix/autocrlf_true,eol_crlf/mixed-lf-cr | 3 - .../autocrlf_true,eol_crlf/mixed-lf-cr-crlf | 3 - .../posix/autocrlf_true,eol_crlf/more-crlf | 5 - .../autocrlf_true,eol_crlf/more-crlf-utf8bom | 5 - .../posix/autocrlf_true,eol_crlf/more-lf | 5 - .../autocrlf_true,eol_crlf/more-lf-utf8bom | 5 - .../posix/autocrlf_true,eol_crlf/zero-byte | 0 .../posix/autocrlf_true,eol_lf/all-crlf | 4 - .../autocrlf_true,eol_lf/all-crlf-utf8bom | 4 - .../posix/autocrlf_true,eol_lf/all-lf | 5 - .../posix/autocrlf_true,eol_lf/all-lf-utf8bom | 5 - .../autocrlf_true,eol_lf/binary-all-crlf | 4 - .../posix/autocrlf_true,eol_lf/binary-all-lf | 4 - .../autocrlf_true,eol_lf/binary-mixed-lf-cr | 3 - .../binary-mixed-lf-cr-crlf | 3 - .../autocrlf_true,eol_lf/few-utf8-chars-crlf | 22 - .../autocrlf_true,eol_lf/few-utf8-chars-lf | 22 - .../autocrlf_true,eol_lf/many-utf8-chars-crlf | 4 - .../autocrlf_true,eol_lf/many-utf8-chars-lf | 4 - .../posix/autocrlf_true,eol_lf/mixed-lf-cr | 3 - .../autocrlf_true,eol_lf/mixed-lf-cr-crlf | 3 - .../posix/autocrlf_true,eol_lf/more-crlf | 5 - .../autocrlf_true,eol_lf/more-crlf-utf8bom | 5 - .../posix/autocrlf_true,eol_lf/more-lf | 5 - .../autocrlf_true,eol_lf/more-lf-utf8bom | 5 - .../posix/autocrlf_true,eol_lf/zero-byte | 0 .../autocrlf_true,text,eol_crlf/all-crlf | 4 - .../all-crlf-utf8bom | 4 - .../posix/autocrlf_true,text,eol_crlf/all-lf | 5 - .../all-lf-utf8bom | 5 - .../binary-all-crlf | 4 - .../autocrlf_true,text,eol_crlf/binary-all-lf | 4 - .../binary-mixed-lf-cr | 3 - .../binary-mixed-lf-cr-crlf | 3 - .../few-utf8-chars-crlf | 22 - .../few-utf8-chars-lf | 22 - .../many-utf8-chars-crlf | 4 - .../many-utf8-chars-lf | 4 - .../autocrlf_true,text,eol_crlf/mixed-lf-cr | 3 - .../mixed-lf-cr-crlf | 3 - .../autocrlf_true,text,eol_crlf/more-crlf | 5 - .../more-crlf-utf8bom | 5 - .../posix/autocrlf_true,text,eol_crlf/more-lf | 5 - .../more-lf-utf8bom | 5 - .../autocrlf_true,text,eol_crlf/zero-byte | 0 .../posix/autocrlf_true,text,eol_lf/all-crlf | 4 - .../all-crlf-utf8bom | 4 - .../posix/autocrlf_true,text,eol_lf/all-lf | 5 - .../autocrlf_true,text,eol_lf/all-lf-utf8bom | 5 - .../autocrlf_true,text,eol_lf/binary-all-crlf | 4 - .../autocrlf_true,text,eol_lf/binary-all-lf | 4 - .../binary-mixed-lf-cr | 3 - .../binary-mixed-lf-cr-crlf | 3 - .../few-utf8-chars-crlf | 22 - .../few-utf8-chars-lf | 22 - .../many-utf8-chars-crlf | 4 - .../many-utf8-chars-lf | 4 - .../autocrlf_true,text,eol_lf/mixed-lf-cr | 3 - .../mixed-lf-cr-crlf | 3 - .../posix/autocrlf_true,text,eol_lf/more-crlf | 5 - .../more-crlf-utf8bom | 5 - .../posix/autocrlf_true,text,eol_lf/more-lf | 5 - .../autocrlf_true,text,eol_lf/more-lf-utf8bom | 5 - .../posix/autocrlf_true,text,eol_lf/zero-byte | 0 .../posix/autocrlf_true,text/all-crlf | 4 - .../posix/autocrlf_true,text/all-crlf-utf8bom | 4 - .../crlf_data/posix/autocrlf_true,text/all-lf | 5 - .../posix/autocrlf_true,text/all-lf-utf8bom | 5 - .../posix/autocrlf_true,text/binary-all-crlf | 4 - .../posix/autocrlf_true,text/binary-all-lf | 4 - .../autocrlf_true,text/binary-mixed-lf-cr | 3 - .../binary-mixed-lf-cr-crlf | 3 - .../autocrlf_true,text/few-utf8-chars-crlf | 22 - .../autocrlf_true,text/few-utf8-chars-lf | 22 - .../autocrlf_true,text/many-utf8-chars-crlf | 4 - .../autocrlf_true,text/many-utf8-chars-lf | 4 - .../posix/autocrlf_true,text/mixed-lf-cr | 3 - .../posix/autocrlf_true,text/mixed-lf-cr-crlf | 3 - .../posix/autocrlf_true,text/more-crlf | 5 - .../autocrlf_true,text/more-crlf-utf8bom | 5 - .../posix/autocrlf_true,text/more-lf | 5 - .../posix/autocrlf_true,text/more-lf-utf8bom | 5 - .../posix/autocrlf_true,text/zero-byte | 0 .../autocrlf_true,text_auto,eol_crlf/all-crlf | 4 - .../all-crlf-utf8bom | 4 - .../autocrlf_true,text_auto,eol_crlf/all-lf | 5 - .../all-lf-utf8bom | 5 - .../binary-all-crlf | 4 - .../binary-all-lf | 4 - .../binary-mixed-lf-cr | 3 - .../binary-mixed-lf-cr-crlf | 3 - .../few-utf8-chars-crlf | 22 - .../few-utf8-chars-lf | 22 - .../many-utf8-chars-crlf | 4 - .../many-utf8-chars-lf | 4 - .../mixed-lf-cr | 3 - .../mixed-lf-cr-crlf | 3 - .../more-crlf | 5 - .../more-crlf-utf8bom | 5 - .../autocrlf_true,text_auto,eol_crlf/more-lf | 5 - .../more-lf-utf8bom | 5 - .../zero-byte | 0 .../autocrlf_true,text_auto,eol_lf/all-crlf | 4 - .../all-crlf-utf8bom | 4 - .../autocrlf_true,text_auto,eol_lf/all-lf | 5 - .../all-lf-utf8bom | 5 - .../binary-all-crlf | 4 - .../binary-all-lf | 4 - .../binary-mixed-lf-cr | 3 - .../binary-mixed-lf-cr-crlf | 3 - .../few-utf8-chars-crlf | 22 - .../few-utf8-chars-lf | 22 - .../many-utf8-chars-crlf | 4 - .../many-utf8-chars-lf | 4 - .../mixed-lf-cr | 3 - .../mixed-lf-cr-crlf | 3 - .../autocrlf_true,text_auto,eol_lf/more-crlf | 5 - .../more-crlf-utf8bom | 5 - .../autocrlf_true,text_auto,eol_lf/more-lf | 5 - .../more-lf-utf8bom | 5 - .../autocrlf_true,text_auto,eol_lf/zero-byte | 0 .../posix/autocrlf_true,text_auto/all-crlf | 4 - .../autocrlf_true,text_auto/all-crlf-utf8bom | 4 - .../posix/autocrlf_true,text_auto/all-lf | 5 - .../autocrlf_true,text_auto/all-lf-utf8bom | 5 - .../autocrlf_true,text_auto/binary-all-crlf | 4 - .../autocrlf_true,text_auto/binary-all-lf | 4 - .../binary-mixed-lf-cr | 3 - .../binary-mixed-lf-cr-crlf | 3 - .../few-utf8-chars-crlf | 22 - .../autocrlf_true,text_auto/few-utf8-chars-lf | 22 - .../many-utf8-chars-crlf | 4 - .../many-utf8-chars-lf | 4 - .../posix/autocrlf_true,text_auto/mixed-lf-cr | 3 - .../autocrlf_true,text_auto/mixed-lf-cr-crlf | 3 - .../posix/autocrlf_true,text_auto/more-crlf | 5 - .../autocrlf_true,text_auto/more-crlf-utf8bom | 5 - .../posix/autocrlf_true,text_auto/more-lf | 5 - .../autocrlf_true,text_auto/more-lf-utf8bom | 5 - .../posix/autocrlf_true,text_auto/zero-byte | 0 .../crlf_data/posix/autocrlf_true/all-crlf | 4 - .../posix/autocrlf_true/all-crlf-utf8bom | 4 - .../crlf_data/posix/autocrlf_true/all-lf | 5 - .../posix/autocrlf_true/all-lf-utf8bom | 5 - .../posix/autocrlf_true/binary-all-crlf | 4 - .../posix/autocrlf_true/binary-all-lf | 4 - .../posix/autocrlf_true/binary-mixed-lf-cr | 3 - .../autocrlf_true/binary-mixed-lf-cr-crlf | 3 - .../posix/autocrlf_true/few-utf8-chars-crlf | 22 - .../posix/autocrlf_true/few-utf8-chars-lf | 22 - .../posix/autocrlf_true/many-utf8-chars-crlf | 4 - .../posix/autocrlf_true/many-utf8-chars-lf | 4 - .../crlf_data/posix/autocrlf_true/mixed-lf-cr | 3 - .../posix/autocrlf_true/mixed-lf-cr-crlf | 3 - .../crlf_data/posix/autocrlf_true/more-crlf | 5 - .../posix/autocrlf_true/more-crlf-utf8bom | 5 - .../crlf_data/posix/autocrlf_true/more-lf | 5 - .../posix/autocrlf_true/more-lf-utf8bom | 5 - .../crlf_data/posix/autocrlf_true/zero-byte | 0 .../windows/autocrlf_false,-crlf/all-crlf | 4 - .../autocrlf_false,-crlf/all-crlf-utf8bom | 4 - .../windows/autocrlf_false,-crlf/all-lf | 5 - .../autocrlf_false,-crlf/all-lf-utf8bom | 5 - .../autocrlf_false,-crlf/binary-all-crlf | 4 - .../autocrlf_false,-crlf/binary-all-lf | 4 - .../autocrlf_false,-crlf/binary-mixed-lf-cr | 3 - .../binary-mixed-lf-cr-crlf | 3 - .../autocrlf_false,-crlf/few-utf8-chars-crlf | 22 - .../autocrlf_false,-crlf/few-utf8-chars-lf | 22 - .../autocrlf_false,-crlf/many-utf8-chars-crlf | 4 - .../autocrlf_false,-crlf/many-utf8-chars-lf | 4 - .../windows/autocrlf_false,-crlf/mixed-lf-cr | 3 - .../autocrlf_false,-crlf/mixed-lf-cr-crlf | 3 - .../windows/autocrlf_false,-crlf/more-crlf | 5 - .../autocrlf_false,-crlf/more-crlf-utf8bom | 5 - .../windows/autocrlf_false,-crlf/more-lf | 5 - .../autocrlf_false,-crlf/more-lf-utf8bom | 5 - .../windows/autocrlf_false,-crlf/zero-byte | 0 .../windows/autocrlf_false,-text/all-crlf | 4 - .../autocrlf_false,-text/all-crlf-utf8bom | 4 - .../windows/autocrlf_false,-text/all-lf | 5 - .../autocrlf_false,-text/all-lf-utf8bom | 5 - .../autocrlf_false,-text/binary-all-crlf | 4 - .../autocrlf_false,-text/binary-all-lf | 4 - .../autocrlf_false,-text/binary-mixed-lf-cr | 3 - .../binary-mixed-lf-cr-crlf | 3 - .../autocrlf_false,-text/few-utf8-chars-crlf | 22 - .../autocrlf_false,-text/few-utf8-chars-lf | 22 - .../autocrlf_false,-text/many-utf8-chars-crlf | 4 - .../autocrlf_false,-text/many-utf8-chars-lf | 4 - .../windows/autocrlf_false,-text/mixed-lf-cr | 3 - .../autocrlf_false,-text/mixed-lf-cr-crlf | 3 - .../windows/autocrlf_false,-text/more-crlf | 5 - .../autocrlf_false,-text/more-crlf-utf8bom | 5 - .../windows/autocrlf_false,-text/more-lf | 5 - .../autocrlf_false,-text/more-lf-utf8bom | 5 - .../windows/autocrlf_false,-text/zero-byte | 0 .../windows/autocrlf_false,crlf/all-crlf | 4 - .../autocrlf_false,crlf/all-crlf-utf8bom | 4 - .../windows/autocrlf_false,crlf/all-lf | 5 - .../autocrlf_false,crlf/all-lf-utf8bom | 5 - .../autocrlf_false,crlf/binary-all-crlf | 4 - .../windows/autocrlf_false,crlf/binary-all-lf | 4 - .../autocrlf_false,crlf/binary-mixed-lf-cr | 3 - .../binary-mixed-lf-cr-crlf | 3 - .../autocrlf_false,crlf/few-utf8-chars-crlf | 22 - .../autocrlf_false,crlf/few-utf8-chars-lf | 22 - .../autocrlf_false,crlf/many-utf8-chars-crlf | 4 - .../autocrlf_false,crlf/many-utf8-chars-lf | 4 - .../windows/autocrlf_false,crlf/mixed-lf-cr | 3 - .../autocrlf_false,crlf/mixed-lf-cr-crlf | 3 - .../windows/autocrlf_false,crlf/more-crlf | 5 - .../autocrlf_false,crlf/more-crlf-utf8bom | 5 - .../windows/autocrlf_false,crlf/more-lf | 5 - .../autocrlf_false,crlf/more-lf-utf8bom | 5 - .../windows/autocrlf_false,crlf/zero-byte | 0 .../windows/autocrlf_false,eol_crlf/all-crlf | 4 - .../autocrlf_false,eol_crlf/all-crlf-utf8bom | 4 - .../windows/autocrlf_false,eol_crlf/all-lf | 5 - .../autocrlf_false,eol_crlf/all-lf-utf8bom | 5 - .../autocrlf_false,eol_crlf/binary-all-crlf | 4 - .../autocrlf_false,eol_crlf/binary-all-lf | 4 - .../binary-mixed-lf-cr | 3 - .../binary-mixed-lf-cr-crlf | 3 - .../few-utf8-chars-crlf | 22 - .../autocrlf_false,eol_crlf/few-utf8-chars-lf | 22 - .../many-utf8-chars-crlf | 4 - .../many-utf8-chars-lf | 4 - .../autocrlf_false,eol_crlf/mixed-lf-cr | 3 - .../autocrlf_false,eol_crlf/mixed-lf-cr-crlf | 3 - .../windows/autocrlf_false,eol_crlf/more-crlf | 5 - .../autocrlf_false,eol_crlf/more-crlf-utf8bom | 5 - .../windows/autocrlf_false,eol_crlf/more-lf | 5 - .../autocrlf_false,eol_crlf/more-lf-utf8bom | 5 - .../windows/autocrlf_false,eol_crlf/zero-byte | 0 .../windows/autocrlf_false,eol_lf/all-crlf | 4 - .../autocrlf_false,eol_lf/all-crlf-utf8bom | 4 - .../windows/autocrlf_false,eol_lf/all-lf | 5 - .../autocrlf_false,eol_lf/all-lf-utf8bom | 5 - .../autocrlf_false,eol_lf/binary-all-crlf | 4 - .../autocrlf_false,eol_lf/binary-all-lf | 4 - .../autocrlf_false,eol_lf/binary-mixed-lf-cr | 3 - .../binary-mixed-lf-cr-crlf | 3 - .../autocrlf_false,eol_lf/few-utf8-chars-crlf | 22 - .../autocrlf_false,eol_lf/few-utf8-chars-lf | 22 - .../many-utf8-chars-crlf | 4 - .../autocrlf_false,eol_lf/many-utf8-chars-lf | 4 - .../windows/autocrlf_false,eol_lf/mixed-lf-cr | 3 - .../autocrlf_false,eol_lf/mixed-lf-cr-crlf | 3 - .../windows/autocrlf_false,eol_lf/more-crlf | 5 - .../autocrlf_false,eol_lf/more-crlf-utf8bom | 5 - .../windows/autocrlf_false,eol_lf/more-lf | 5 - .../autocrlf_false,eol_lf/more-lf-utf8bom | 5 - .../windows/autocrlf_false,eol_lf/zero-byte | 0 .../autocrlf_false,text,eol_crlf/all-crlf | 4 - .../all-crlf-utf8bom | 4 - .../autocrlf_false,text,eol_crlf/all-lf | 5 - .../all-lf-utf8bom | 5 - .../binary-all-crlf | 4 - .../binary-all-lf | 4 - .../binary-mixed-lf-cr | 3 - .../binary-mixed-lf-cr-crlf | 3 - .../few-utf8-chars-crlf | 22 - .../few-utf8-chars-lf | 22 - .../many-utf8-chars-crlf | 4 - .../many-utf8-chars-lf | 4 - .../autocrlf_false,text,eol_crlf/mixed-lf-cr | 3 - .../mixed-lf-cr-crlf | 3 - .../autocrlf_false,text,eol_crlf/more-crlf | 5 - .../more-crlf-utf8bom | 5 - .../autocrlf_false,text,eol_crlf/more-lf | 5 - .../more-lf-utf8bom | 5 - .../autocrlf_false,text,eol_crlf/zero-byte | 0 .../autocrlf_false,text,eol_lf/all-crlf | 4 - .../all-crlf-utf8bom | 4 - .../windows/autocrlf_false,text,eol_lf/all-lf | 5 - .../autocrlf_false,text,eol_lf/all-lf-utf8bom | 5 - .../binary-all-crlf | 4 - .../autocrlf_false,text,eol_lf/binary-all-lf | 4 - .../binary-mixed-lf-cr | 3 - .../binary-mixed-lf-cr-crlf | 3 - .../few-utf8-chars-crlf | 22 - .../few-utf8-chars-lf | 22 - .../many-utf8-chars-crlf | 4 - .../many-utf8-chars-lf | 4 - .../autocrlf_false,text,eol_lf/mixed-lf-cr | 3 - .../mixed-lf-cr-crlf | 3 - .../autocrlf_false,text,eol_lf/more-crlf | 5 - .../more-crlf-utf8bom | 5 - .../autocrlf_false,text,eol_lf/more-lf | 5 - .../more-lf-utf8bom | 5 - .../autocrlf_false,text,eol_lf/zero-byte | 0 .../windows/autocrlf_false,text/all-crlf | 4 - .../autocrlf_false,text/all-crlf-utf8bom | 4 - .../windows/autocrlf_false,text/all-lf | 5 - .../autocrlf_false,text/all-lf-utf8bom | 5 - .../autocrlf_false,text/binary-all-crlf | 4 - .../windows/autocrlf_false,text/binary-all-lf | 4 - .../autocrlf_false,text/binary-mixed-lf-cr | 3 - .../binary-mixed-lf-cr-crlf | 3 - .../autocrlf_false,text/few-utf8-chars-crlf | 22 - .../autocrlf_false,text/few-utf8-chars-lf | 22 - .../autocrlf_false,text/many-utf8-chars-crlf | 4 - .../autocrlf_false,text/many-utf8-chars-lf | 4 - .../windows/autocrlf_false,text/mixed-lf-cr | 3 - .../autocrlf_false,text/mixed-lf-cr-crlf | 3 - .../windows/autocrlf_false,text/more-crlf | 5 - .../autocrlf_false,text/more-crlf-utf8bom | 5 - .../windows/autocrlf_false,text/more-lf | 5 - .../autocrlf_false,text/more-lf-utf8bom | 5 - .../windows/autocrlf_false,text/zero-byte | 0 .../all-crlf | 4 - .../all-crlf-utf8bom | 4 - .../autocrlf_false,text_auto,eol_crlf/all-lf | 5 - .../all-lf-utf8bom | 5 - .../binary-all-crlf | 4 - .../binary-all-lf | 4 - .../binary-mixed-lf-cr | 3 - .../binary-mixed-lf-cr-crlf | 3 - .../few-utf8-chars-crlf | 22 - .../few-utf8-chars-lf | 22 - .../many-utf8-chars-crlf | 4 - .../many-utf8-chars-lf | 4 - .../mixed-lf-cr | 3 - .../mixed-lf-cr-crlf | 3 - .../more-crlf | 5 - .../more-crlf-utf8bom | 5 - .../autocrlf_false,text_auto,eol_crlf/more-lf | 5 - .../more-lf-utf8bom | 5 - .../zero-byte | 0 .../autocrlf_false,text_auto,eol_lf/all-crlf | 4 - .../all-crlf-utf8bom | 4 - .../autocrlf_false,text_auto,eol_lf/all-lf | 5 - .../all-lf-utf8bom | 5 - .../binary-all-crlf | 4 - .../binary-all-lf | 4 - .../binary-mixed-lf-cr | 3 - .../binary-mixed-lf-cr-crlf | 3 - .../few-utf8-chars-crlf | 22 - .../few-utf8-chars-lf | 22 - .../many-utf8-chars-crlf | 4 - .../many-utf8-chars-lf | 4 - .../mixed-lf-cr | 3 - .../mixed-lf-cr-crlf | 3 - .../autocrlf_false,text_auto,eol_lf/more-crlf | 5 - .../more-crlf-utf8bom | 5 - .../autocrlf_false,text_auto,eol_lf/more-lf | 5 - .../more-lf-utf8bom | 5 - .../autocrlf_false,text_auto,eol_lf/zero-byte | 0 .../windows/autocrlf_false,text_auto/all-crlf | 4 - .../autocrlf_false,text_auto/all-crlf-utf8bom | 4 - .../windows/autocrlf_false,text_auto/all-lf | 5 - .../autocrlf_false,text_auto/all-lf-utf8bom | 5 - .../autocrlf_false,text_auto/binary-all-crlf | 4 - .../autocrlf_false,text_auto/binary-all-lf | 4 - .../binary-mixed-lf-cr | 3 - .../binary-mixed-lf-cr-crlf | 3 - .../few-utf8-chars-crlf | 22 - .../few-utf8-chars-lf | 22 - .../many-utf8-chars-crlf | 4 - .../many-utf8-chars-lf | 4 - .../autocrlf_false,text_auto/mixed-lf-cr | 3 - .../autocrlf_false,text_auto/mixed-lf-cr-crlf | 3 - .../autocrlf_false,text_auto/more-crlf | 5 - .../more-crlf-utf8bom | 5 - .../windows/autocrlf_false,text_auto/more-lf | 5 - .../autocrlf_false,text_auto/more-lf-utf8bom | 5 - .../autocrlf_false,text_auto/zero-byte | 0 .../crlf_data/windows/autocrlf_false/all-crlf | 4 - .../windows/autocrlf_false/all-crlf-utf8bom | 4 - .../crlf_data/windows/autocrlf_false/all-lf | 5 - .../windows/autocrlf_false/all-lf-utf8bom | 5 - .../windows/autocrlf_false/binary-all-crlf | 4 - .../windows/autocrlf_false/binary-all-lf | 4 - .../windows/autocrlf_false/binary-mixed-lf-cr | 3 - .../autocrlf_false/binary-mixed-lf-cr-crlf | 3 - .../autocrlf_false/few-utf8-chars-crlf | 22 - .../windows/autocrlf_false/few-utf8-chars-lf | 22 - .../autocrlf_false/many-utf8-chars-crlf | 4 - .../windows/autocrlf_false/many-utf8-chars-lf | 4 - .../windows/autocrlf_false/mixed-lf-cr | 3 - .../windows/autocrlf_false/mixed-lf-cr-crlf | 3 - .../windows/autocrlf_false/more-crlf | 5 - .../windows/autocrlf_false/more-crlf-utf8bom | 5 - .../crlf_data/windows/autocrlf_false/more-lf | 5 - .../windows/autocrlf_false/more-lf-utf8bom | 5 - .../windows/autocrlf_false/zero-byte | 0 .../windows/autocrlf_input,-crlf/all-crlf | 4 - .../autocrlf_input,-crlf/all-crlf-utf8bom | 4 - .../windows/autocrlf_input,-crlf/all-lf | 5 - .../autocrlf_input,-crlf/all-lf-utf8bom | 5 - .../autocrlf_input,-crlf/binary-all-crlf | 4 - .../autocrlf_input,-crlf/binary-all-lf | 4 - .../autocrlf_input,-crlf/binary-mixed-lf-cr | 3 - .../binary-mixed-lf-cr-crlf | 3 - .../autocrlf_input,-crlf/few-utf8-chars-crlf | 22 - .../autocrlf_input,-crlf/few-utf8-chars-lf | 22 - .../autocrlf_input,-crlf/many-utf8-chars-crlf | 4 - .../autocrlf_input,-crlf/many-utf8-chars-lf | 4 - .../windows/autocrlf_input,-crlf/mixed-lf-cr | 3 - .../autocrlf_input,-crlf/mixed-lf-cr-crlf | 3 - .../windows/autocrlf_input,-crlf/more-crlf | 5 - .../autocrlf_input,-crlf/more-crlf-utf8bom | 5 - .../windows/autocrlf_input,-crlf/more-lf | 5 - .../autocrlf_input,-crlf/more-lf-utf8bom | 5 - .../windows/autocrlf_input,-crlf/zero-byte | 0 .../windows/autocrlf_input,-text/all-crlf | 4 - .../autocrlf_input,-text/all-crlf-utf8bom | 4 - .../windows/autocrlf_input,-text/all-lf | 5 - .../autocrlf_input,-text/all-lf-utf8bom | 5 - .../autocrlf_input,-text/binary-all-crlf | 4 - .../autocrlf_input,-text/binary-all-lf | 4 - .../autocrlf_input,-text/binary-mixed-lf-cr | 3 - .../binary-mixed-lf-cr-crlf | 3 - .../autocrlf_input,-text/few-utf8-chars-crlf | 22 - .../autocrlf_input,-text/few-utf8-chars-lf | 22 - .../autocrlf_input,-text/many-utf8-chars-crlf | 4 - .../autocrlf_input,-text/many-utf8-chars-lf | 4 - .../windows/autocrlf_input,-text/mixed-lf-cr | 3 - .../autocrlf_input,-text/mixed-lf-cr-crlf | 3 - .../windows/autocrlf_input,-text/more-crlf | 5 - .../autocrlf_input,-text/more-crlf-utf8bom | 5 - .../windows/autocrlf_input,-text/more-lf | 5 - .../autocrlf_input,-text/more-lf-utf8bom | 5 - .../windows/autocrlf_input,-text/zero-byte | 0 .../windows/autocrlf_input,crlf/all-crlf | 4 - .../autocrlf_input,crlf/all-crlf-utf8bom | 4 - .../windows/autocrlf_input,crlf/all-lf | 5 - .../autocrlf_input,crlf/all-lf-utf8bom | 5 - .../autocrlf_input,crlf/binary-all-crlf | 4 - .../windows/autocrlf_input,crlf/binary-all-lf | 4 - .../autocrlf_input,crlf/binary-mixed-lf-cr | 3 - .../binary-mixed-lf-cr-crlf | 3 - .../autocrlf_input,crlf/few-utf8-chars-crlf | 22 - .../autocrlf_input,crlf/few-utf8-chars-lf | 22 - .../autocrlf_input,crlf/many-utf8-chars-crlf | 4 - .../autocrlf_input,crlf/many-utf8-chars-lf | 4 - .../windows/autocrlf_input,crlf/mixed-lf-cr | 3 - .../autocrlf_input,crlf/mixed-lf-cr-crlf | 3 - .../windows/autocrlf_input,crlf/more-crlf | 5 - .../autocrlf_input,crlf/more-crlf-utf8bom | 5 - .../windows/autocrlf_input,crlf/more-lf | 5 - .../autocrlf_input,crlf/more-lf-utf8bom | 5 - .../windows/autocrlf_input,crlf/zero-byte | 0 .../windows/autocrlf_input,eol_crlf/all-crlf | 4 - .../autocrlf_input,eol_crlf/all-crlf-utf8bom | 4 - .../windows/autocrlf_input,eol_crlf/all-lf | 5 - .../autocrlf_input,eol_crlf/all-lf-utf8bom | 5 - .../autocrlf_input,eol_crlf/binary-all-crlf | 4 - .../autocrlf_input,eol_crlf/binary-all-lf | 4 - .../binary-mixed-lf-cr | 3 - .../binary-mixed-lf-cr-crlf | 3 - .../few-utf8-chars-crlf | 22 - .../autocrlf_input,eol_crlf/few-utf8-chars-lf | 22 - .../many-utf8-chars-crlf | 4 - .../many-utf8-chars-lf | 4 - .../autocrlf_input,eol_crlf/mixed-lf-cr | 3 - .../autocrlf_input,eol_crlf/mixed-lf-cr-crlf | 3 - .../windows/autocrlf_input,eol_crlf/more-crlf | 5 - .../autocrlf_input,eol_crlf/more-crlf-utf8bom | 5 - .../windows/autocrlf_input,eol_crlf/more-lf | 5 - .../autocrlf_input,eol_crlf/more-lf-utf8bom | 5 - .../windows/autocrlf_input,eol_crlf/zero-byte | 0 .../windows/autocrlf_input,eol_lf/all-crlf | 4 - .../autocrlf_input,eol_lf/all-crlf-utf8bom | 4 - .../windows/autocrlf_input,eol_lf/all-lf | 5 - .../autocrlf_input,eol_lf/all-lf-utf8bom | 5 - .../autocrlf_input,eol_lf/binary-all-crlf | 4 - .../autocrlf_input,eol_lf/binary-all-lf | 4 - .../autocrlf_input,eol_lf/binary-mixed-lf-cr | 3 - .../binary-mixed-lf-cr-crlf | 3 - .../autocrlf_input,eol_lf/few-utf8-chars-crlf | 22 - .../autocrlf_input,eol_lf/few-utf8-chars-lf | 22 - .../many-utf8-chars-crlf | 4 - .../autocrlf_input,eol_lf/many-utf8-chars-lf | 4 - .../windows/autocrlf_input,eol_lf/mixed-lf-cr | 3 - .../autocrlf_input,eol_lf/mixed-lf-cr-crlf | 3 - .../windows/autocrlf_input,eol_lf/more-crlf | 5 - .../autocrlf_input,eol_lf/more-crlf-utf8bom | 5 - .../windows/autocrlf_input,eol_lf/more-lf | 5 - .../autocrlf_input,eol_lf/more-lf-utf8bom | 5 - .../windows/autocrlf_input,eol_lf/zero-byte | 0 .../autocrlf_input,text,eol_crlf/all-crlf | 4 - .../all-crlf-utf8bom | 4 - .../autocrlf_input,text,eol_crlf/all-lf | 5 - .../all-lf-utf8bom | 5 - .../binary-all-crlf | 4 - .../binary-all-lf | 4 - .../binary-mixed-lf-cr | 3 - .../binary-mixed-lf-cr-crlf | 3 - .../few-utf8-chars-crlf | 22 - .../few-utf8-chars-lf | 22 - .../many-utf8-chars-crlf | 4 - .../many-utf8-chars-lf | 4 - .../autocrlf_input,text,eol_crlf/mixed-lf-cr | 3 - .../mixed-lf-cr-crlf | 3 - .../autocrlf_input,text,eol_crlf/more-crlf | 5 - .../more-crlf-utf8bom | 5 - .../autocrlf_input,text,eol_crlf/more-lf | 5 - .../more-lf-utf8bom | 5 - .../autocrlf_input,text,eol_crlf/zero-byte | 0 .../autocrlf_input,text,eol_lf/all-crlf | 4 - .../all-crlf-utf8bom | 4 - .../windows/autocrlf_input,text,eol_lf/all-lf | 5 - .../autocrlf_input,text,eol_lf/all-lf-utf8bom | 5 - .../binary-all-crlf | 4 - .../autocrlf_input,text,eol_lf/binary-all-lf | 4 - .../binary-mixed-lf-cr | 3 - .../binary-mixed-lf-cr-crlf | 3 - .../few-utf8-chars-crlf | 22 - .../few-utf8-chars-lf | 22 - .../many-utf8-chars-crlf | 4 - .../many-utf8-chars-lf | 4 - .../autocrlf_input,text,eol_lf/mixed-lf-cr | 3 - .../mixed-lf-cr-crlf | 3 - .../autocrlf_input,text,eol_lf/more-crlf | 5 - .../more-crlf-utf8bom | 5 - .../autocrlf_input,text,eol_lf/more-lf | 5 - .../more-lf-utf8bom | 5 - .../autocrlf_input,text,eol_lf/zero-byte | 0 .../windows/autocrlf_input,text/all-crlf | 4 - .../autocrlf_input,text/all-crlf-utf8bom | 4 - .../windows/autocrlf_input,text/all-lf | 5 - .../autocrlf_input,text/all-lf-utf8bom | 5 - .../autocrlf_input,text/binary-all-crlf | 4 - .../windows/autocrlf_input,text/binary-all-lf | 4 - .../autocrlf_input,text/binary-mixed-lf-cr | 3 - .../binary-mixed-lf-cr-crlf | 3 - .../autocrlf_input,text/few-utf8-chars-crlf | 22 - .../autocrlf_input,text/few-utf8-chars-lf | 22 - .../autocrlf_input,text/many-utf8-chars-crlf | 4 - .../autocrlf_input,text/many-utf8-chars-lf | 4 - .../windows/autocrlf_input,text/mixed-lf-cr | 3 - .../autocrlf_input,text/mixed-lf-cr-crlf | 3 - .../windows/autocrlf_input,text/more-crlf | 5 - .../autocrlf_input,text/more-crlf-utf8bom | 5 - .../windows/autocrlf_input,text/more-lf | 5 - .../autocrlf_input,text/more-lf-utf8bom | 5 - .../windows/autocrlf_input,text/zero-byte | 0 .../all-crlf | 4 - .../all-crlf-utf8bom | 4 - .../autocrlf_input,text_auto,eol_crlf/all-lf | 5 - .../all-lf-utf8bom | 5 - .../binary-all-crlf | 4 - .../binary-all-lf | 4 - .../binary-mixed-lf-cr | 3 - .../binary-mixed-lf-cr-crlf | 3 - .../few-utf8-chars-crlf | 22 - .../few-utf8-chars-lf | 22 - .../many-utf8-chars-crlf | 4 - .../many-utf8-chars-lf | 4 - .../mixed-lf-cr | 3 - .../mixed-lf-cr-crlf | 3 - .../more-crlf | 5 - .../more-crlf-utf8bom | 5 - .../autocrlf_input,text_auto,eol_crlf/more-lf | 5 - .../more-lf-utf8bom | 5 - .../zero-byte | 0 .../autocrlf_input,text_auto,eol_lf/all-crlf | 4 - .../all-crlf-utf8bom | 4 - .../autocrlf_input,text_auto,eol_lf/all-lf | 5 - .../all-lf-utf8bom | 5 - .../binary-all-crlf | 4 - .../binary-all-lf | 4 - .../binary-mixed-lf-cr | 3 - .../binary-mixed-lf-cr-crlf | 3 - .../few-utf8-chars-crlf | 22 - .../few-utf8-chars-lf | 22 - .../many-utf8-chars-crlf | 4 - .../many-utf8-chars-lf | 4 - .../mixed-lf-cr | 3 - .../mixed-lf-cr-crlf | 3 - .../autocrlf_input,text_auto,eol_lf/more-crlf | 5 - .../more-crlf-utf8bom | 5 - .../autocrlf_input,text_auto,eol_lf/more-lf | 5 - .../more-lf-utf8bom | 5 - .../autocrlf_input,text_auto,eol_lf/zero-byte | 0 .../windows/autocrlf_input,text_auto/all-crlf | 4 - .../autocrlf_input,text_auto/all-crlf-utf8bom | 4 - .../windows/autocrlf_input,text_auto/all-lf | 5 - .../autocrlf_input,text_auto/all-lf-utf8bom | 5 - .../autocrlf_input,text_auto/binary-all-crlf | 4 - .../autocrlf_input,text_auto/binary-all-lf | 4 - .../binary-mixed-lf-cr | 3 - .../binary-mixed-lf-cr-crlf | 3 - .../few-utf8-chars-crlf | 22 - .../few-utf8-chars-lf | 22 - .../many-utf8-chars-crlf | 4 - .../many-utf8-chars-lf | 4 - .../autocrlf_input,text_auto/mixed-lf-cr | 3 - .../autocrlf_input,text_auto/mixed-lf-cr-crlf | 3 - .../autocrlf_input,text_auto/more-crlf | 5 - .../more-crlf-utf8bom | 5 - .../windows/autocrlf_input,text_auto/more-lf | 5 - .../autocrlf_input,text_auto/more-lf-utf8bom | 5 - .../autocrlf_input,text_auto/zero-byte | 0 .../crlf_data/windows/autocrlf_input/all-crlf | 4 - .../windows/autocrlf_input/all-crlf-utf8bom | 4 - .../crlf_data/windows/autocrlf_input/all-lf | 5 - .../windows/autocrlf_input/all-lf-utf8bom | 5 - .../windows/autocrlf_input/binary-all-crlf | 4 - .../windows/autocrlf_input/binary-all-lf | 4 - .../windows/autocrlf_input/binary-mixed-lf-cr | 3 - .../autocrlf_input/binary-mixed-lf-cr-crlf | 3 - .../autocrlf_input/few-utf8-chars-crlf | 22 - .../windows/autocrlf_input/few-utf8-chars-lf | 22 - .../autocrlf_input/many-utf8-chars-crlf | 4 - .../windows/autocrlf_input/many-utf8-chars-lf | 4 - .../windows/autocrlf_input/mixed-lf-cr | 3 - .../windows/autocrlf_input/mixed-lf-cr-crlf | 3 - .../windows/autocrlf_input/more-crlf | 5 - .../windows/autocrlf_input/more-crlf-utf8bom | 5 - .../crlf_data/windows/autocrlf_input/more-lf | 5 - .../windows/autocrlf_input/more-lf-utf8bom | 5 - .../windows/autocrlf_input/zero-byte | 0 .../windows/autocrlf_true,-crlf/all-crlf | 4 - .../autocrlf_true,-crlf/all-crlf-utf8bom | 4 - .../windows/autocrlf_true,-crlf/all-lf | 5 - .../autocrlf_true,-crlf/all-lf-utf8bom | 5 - .../autocrlf_true,-crlf/binary-all-crlf | 4 - .../windows/autocrlf_true,-crlf/binary-all-lf | 4 - .../autocrlf_true,-crlf/binary-mixed-lf-cr | 3 - .../binary-mixed-lf-cr-crlf | 3 - .../autocrlf_true,-crlf/few-utf8-chars-crlf | 22 - .../autocrlf_true,-crlf/few-utf8-chars-lf | 22 - .../autocrlf_true,-crlf/many-utf8-chars-crlf | 4 - .../autocrlf_true,-crlf/many-utf8-chars-lf | 4 - .../windows/autocrlf_true,-crlf/mixed-lf-cr | 3 - .../autocrlf_true,-crlf/mixed-lf-cr-crlf | 3 - .../windows/autocrlf_true,-crlf/more-crlf | 5 - .../autocrlf_true,-crlf/more-crlf-utf8bom | 5 - .../windows/autocrlf_true,-crlf/more-lf | 5 - .../autocrlf_true,-crlf/more-lf-utf8bom | 5 - .../windows/autocrlf_true,-crlf/zero-byte | 0 .../windows/autocrlf_true,-text/all-crlf | 4 - .../autocrlf_true,-text/all-crlf-utf8bom | 4 - .../windows/autocrlf_true,-text/all-lf | 5 - .../autocrlf_true,-text/all-lf-utf8bom | 5 - .../autocrlf_true,-text/binary-all-crlf | 4 - .../windows/autocrlf_true,-text/binary-all-lf | 4 - .../autocrlf_true,-text/binary-mixed-lf-cr | 3 - .../binary-mixed-lf-cr-crlf | 3 - .../autocrlf_true,-text/few-utf8-chars-crlf | 22 - .../autocrlf_true,-text/few-utf8-chars-lf | 22 - .../autocrlf_true,-text/many-utf8-chars-crlf | 4 - .../autocrlf_true,-text/many-utf8-chars-lf | 4 - .../windows/autocrlf_true,-text/mixed-lf-cr | 3 - .../autocrlf_true,-text/mixed-lf-cr-crlf | 3 - .../windows/autocrlf_true,-text/more-crlf | 5 - .../autocrlf_true,-text/more-crlf-utf8bom | 5 - .../windows/autocrlf_true,-text/more-lf | 5 - .../autocrlf_true,-text/more-lf-utf8bom | 5 - .../windows/autocrlf_true,-text/zero-byte | 0 .../windows/autocrlf_true,crlf/all-crlf | 4 - .../autocrlf_true,crlf/all-crlf-utf8bom | 4 - .../windows/autocrlf_true,crlf/all-lf | 5 - .../windows/autocrlf_true,crlf/all-lf-utf8bom | 5 - .../autocrlf_true,crlf/binary-all-crlf | 4 - .../windows/autocrlf_true,crlf/binary-all-lf | 4 - .../autocrlf_true,crlf/binary-mixed-lf-cr | 3 - .../binary-mixed-lf-cr-crlf | 3 - .../autocrlf_true,crlf/few-utf8-chars-crlf | 22 - .../autocrlf_true,crlf/few-utf8-chars-lf | 22 - .../autocrlf_true,crlf/many-utf8-chars-crlf | 4 - .../autocrlf_true,crlf/many-utf8-chars-lf | 4 - .../windows/autocrlf_true,crlf/mixed-lf-cr | 3 - .../autocrlf_true,crlf/mixed-lf-cr-crlf | 3 - .../windows/autocrlf_true,crlf/more-crlf | 5 - .../autocrlf_true,crlf/more-crlf-utf8bom | 5 - .../windows/autocrlf_true,crlf/more-lf | 5 - .../autocrlf_true,crlf/more-lf-utf8bom | 5 - .../windows/autocrlf_true,crlf/zero-byte | 0 .../windows/autocrlf_true,eol_crlf/all-crlf | 4 - .../autocrlf_true,eol_crlf/all-crlf-utf8bom | 4 - .../windows/autocrlf_true,eol_crlf/all-lf | 5 - .../autocrlf_true,eol_crlf/all-lf-utf8bom | 5 - .../autocrlf_true,eol_crlf/binary-all-crlf | 4 - .../autocrlf_true,eol_crlf/binary-all-lf | 4 - .../autocrlf_true,eol_crlf/binary-mixed-lf-cr | 3 - .../binary-mixed-lf-cr-crlf | 3 - .../few-utf8-chars-crlf | 22 - .../autocrlf_true,eol_crlf/few-utf8-chars-lf | 22 - .../many-utf8-chars-crlf | 4 - .../autocrlf_true,eol_crlf/many-utf8-chars-lf | 4 - .../autocrlf_true,eol_crlf/mixed-lf-cr | 3 - .../autocrlf_true,eol_crlf/mixed-lf-cr-crlf | 3 - .../windows/autocrlf_true,eol_crlf/more-crlf | 5 - .../autocrlf_true,eol_crlf/more-crlf-utf8bom | 5 - .../windows/autocrlf_true,eol_crlf/more-lf | 5 - .../autocrlf_true,eol_crlf/more-lf-utf8bom | 5 - .../windows/autocrlf_true,eol_crlf/zero-byte | 0 .../windows/autocrlf_true,eol_lf/all-crlf | 4 - .../autocrlf_true,eol_lf/all-crlf-utf8bom | 4 - .../windows/autocrlf_true,eol_lf/all-lf | 5 - .../autocrlf_true,eol_lf/all-lf-utf8bom | 5 - .../autocrlf_true,eol_lf/binary-all-crlf | 4 - .../autocrlf_true,eol_lf/binary-all-lf | 4 - .../autocrlf_true,eol_lf/binary-mixed-lf-cr | 3 - .../binary-mixed-lf-cr-crlf | 3 - .../autocrlf_true,eol_lf/few-utf8-chars-crlf | 22 - .../autocrlf_true,eol_lf/few-utf8-chars-lf | 22 - .../autocrlf_true,eol_lf/many-utf8-chars-crlf | 4 - .../autocrlf_true,eol_lf/many-utf8-chars-lf | 4 - .../windows/autocrlf_true,eol_lf/mixed-lf-cr | 3 - .../autocrlf_true,eol_lf/mixed-lf-cr-crlf | 3 - .../windows/autocrlf_true,eol_lf/more-crlf | 5 - .../autocrlf_true,eol_lf/more-crlf-utf8bom | 5 - .../windows/autocrlf_true,eol_lf/more-lf | 5 - .../autocrlf_true,eol_lf/more-lf-utf8bom | 5 - .../windows/autocrlf_true,eol_lf/zero-byte | 0 .../autocrlf_true,text,eol_crlf/all-crlf | 4 - .../all-crlf-utf8bom | 4 - .../autocrlf_true,text,eol_crlf/all-lf | 5 - .../all-lf-utf8bom | 5 - .../binary-all-crlf | 4 - .../autocrlf_true,text,eol_crlf/binary-all-lf | 4 - .../binary-mixed-lf-cr | 3 - .../binary-mixed-lf-cr-crlf | 3 - .../few-utf8-chars-crlf | 22 - .../few-utf8-chars-lf | 22 - .../many-utf8-chars-crlf | 4 - .../many-utf8-chars-lf | 4 - .../autocrlf_true,text,eol_crlf/mixed-lf-cr | 3 - .../mixed-lf-cr-crlf | 3 - .../autocrlf_true,text,eol_crlf/more-crlf | 5 - .../more-crlf-utf8bom | 5 - .../autocrlf_true,text,eol_crlf/more-lf | 5 - .../more-lf-utf8bom | 5 - .../autocrlf_true,text,eol_crlf/zero-byte | 0 .../autocrlf_true,text,eol_lf/all-crlf | 4 - .../all-crlf-utf8bom | 4 - .../windows/autocrlf_true,text,eol_lf/all-lf | 5 - .../autocrlf_true,text,eol_lf/all-lf-utf8bom | 5 - .../autocrlf_true,text,eol_lf/binary-all-crlf | 4 - .../autocrlf_true,text,eol_lf/binary-all-lf | 4 - .../binary-mixed-lf-cr | 3 - .../binary-mixed-lf-cr-crlf | 3 - .../few-utf8-chars-crlf | 22 - .../few-utf8-chars-lf | 22 - .../many-utf8-chars-crlf | 4 - .../many-utf8-chars-lf | 4 - .../autocrlf_true,text,eol_lf/mixed-lf-cr | 3 - .../mixed-lf-cr-crlf | 3 - .../autocrlf_true,text,eol_lf/more-crlf | 5 - .../more-crlf-utf8bom | 5 - .../windows/autocrlf_true,text,eol_lf/more-lf | 5 - .../autocrlf_true,text,eol_lf/more-lf-utf8bom | 5 - .../autocrlf_true,text,eol_lf/zero-byte | 0 .../windows/autocrlf_true,text/all-crlf | 4 - .../autocrlf_true,text/all-crlf-utf8bom | 4 - .../windows/autocrlf_true,text/all-lf | 5 - .../windows/autocrlf_true,text/all-lf-utf8bom | 5 - .../autocrlf_true,text/binary-all-crlf | 4 - .../windows/autocrlf_true,text/binary-all-lf | 4 - .../autocrlf_true,text/binary-mixed-lf-cr | 3 - .../binary-mixed-lf-cr-crlf | 3 - .../autocrlf_true,text/few-utf8-chars-crlf | 22 - .../autocrlf_true,text/few-utf8-chars-lf | 22 - .../autocrlf_true,text/many-utf8-chars-crlf | 4 - .../autocrlf_true,text/many-utf8-chars-lf | 4 - .../windows/autocrlf_true,text/mixed-lf-cr | 3 - .../autocrlf_true,text/mixed-lf-cr-crlf | 3 - .../windows/autocrlf_true,text/more-crlf | 5 - .../autocrlf_true,text/more-crlf-utf8bom | 5 - .../windows/autocrlf_true,text/more-lf | 5 - .../autocrlf_true,text/more-lf-utf8bom | 5 - .../windows/autocrlf_true,text/zero-byte | 0 .../autocrlf_true,text_auto,eol_crlf/all-crlf | 4 - .../all-crlf-utf8bom | 4 - .../autocrlf_true,text_auto,eol_crlf/all-lf | 5 - .../all-lf-utf8bom | 5 - .../binary-all-crlf | 4 - .../binary-all-lf | 4 - .../binary-mixed-lf-cr | 3 - .../binary-mixed-lf-cr-crlf | 3 - .../few-utf8-chars-crlf | 22 - .../few-utf8-chars-lf | 22 - .../many-utf8-chars-crlf | 4 - .../many-utf8-chars-lf | 4 - .../mixed-lf-cr | 3 - .../mixed-lf-cr-crlf | 3 - .../more-crlf | 5 - .../more-crlf-utf8bom | 5 - .../autocrlf_true,text_auto,eol_crlf/more-lf | 5 - .../more-lf-utf8bom | 5 - .../zero-byte | 0 .../autocrlf_true,text_auto,eol_lf/all-crlf | 4 - .../all-crlf-utf8bom | 4 - .../autocrlf_true,text_auto,eol_lf/all-lf | 5 - .../all-lf-utf8bom | 5 - .../binary-all-crlf | 4 - .../binary-all-lf | 4 - .../binary-mixed-lf-cr | 3 - .../binary-mixed-lf-cr-crlf | 3 - .../few-utf8-chars-crlf | 22 - .../few-utf8-chars-lf | 22 - .../many-utf8-chars-crlf | 4 - .../many-utf8-chars-lf | 4 - .../mixed-lf-cr | 3 - .../mixed-lf-cr-crlf | 3 - .../autocrlf_true,text_auto,eol_lf/more-crlf | 5 - .../more-crlf-utf8bom | 5 - .../autocrlf_true,text_auto,eol_lf/more-lf | 5 - .../more-lf-utf8bom | 5 - .../autocrlf_true,text_auto,eol_lf/zero-byte | 0 .../windows/autocrlf_true,text_auto/all-crlf | 4 - .../autocrlf_true,text_auto/all-crlf-utf8bom | 4 - .../windows/autocrlf_true,text_auto/all-lf | 5 - .../autocrlf_true,text_auto/all-lf-utf8bom | 5 - .../autocrlf_true,text_auto/binary-all-crlf | 4 - .../autocrlf_true,text_auto/binary-all-lf | 4 - .../binary-mixed-lf-cr | 3 - .../binary-mixed-lf-cr-crlf | 3 - .../few-utf8-chars-crlf | 22 - .../autocrlf_true,text_auto/few-utf8-chars-lf | 22 - .../many-utf8-chars-crlf | 4 - .../many-utf8-chars-lf | 4 - .../autocrlf_true,text_auto/mixed-lf-cr | 3 - .../autocrlf_true,text_auto/mixed-lf-cr-crlf | 3 - .../windows/autocrlf_true,text_auto/more-crlf | 5 - .../autocrlf_true,text_auto/more-crlf-utf8bom | 5 - .../windows/autocrlf_true,text_auto/more-lf | 5 - .../autocrlf_true,text_auto/more-lf-utf8bom | 5 - .../windows/autocrlf_true,text_auto/zero-byte | 0 .../crlf_data/windows/autocrlf_true/all-crlf | 4 - .../windows/autocrlf_true/all-crlf-utf8bom | 4 - .../crlf_data/windows/autocrlf_true/all-lf | 5 - .../windows/autocrlf_true/all-lf-utf8bom | 5 - .../windows/autocrlf_true/binary-all-crlf | 4 - .../windows/autocrlf_true/binary-all-lf | 4 - .../windows/autocrlf_true/binary-mixed-lf-cr | 3 - .../autocrlf_true/binary-mixed-lf-cr-crlf | 3 - .../windows/autocrlf_true/few-utf8-chars-crlf | 22 - .../windows/autocrlf_true/few-utf8-chars-lf | 22 - .../autocrlf_true/many-utf8-chars-crlf | 4 - .../windows/autocrlf_true/many-utf8-chars-lf | 4 - .../windows/autocrlf_true/mixed-lf-cr | 3 - .../windows/autocrlf_true/mixed-lf-cr-crlf | 3 - .../crlf_data/windows/autocrlf_true/more-crlf | 5 - .../windows/autocrlf_true/more-crlf-utf8bom | 5 - .../crlf_data/windows/autocrlf_true/more-lf | 5 - .../windows/autocrlf_true/more-lf-utf8bom | 5 - .../crlf_data/windows/autocrlf_true/zero-byte | 0 .../tests/resources/deprecated-mode.git/HEAD | 1 - .../resources/deprecated-mode.git/config | 6 - .../resources/deprecated-mode.git/description | 1 - .../tests/resources/deprecated-mode.git/index | Bin 112 -> 0 bytes .../deprecated-mode.git/info/exclude | 2 - .../06/262edc257418e9987caf999f9a7a3e1547adff | Bin 124 -> 0 bytes .../08/10fb7818088ff5ac41ee49199b51473b1bd6c7 | Bin 350 -> 0 bytes .../1b/05fdaa881ee45b48cbaa5e9b037d667a47745e | Bin 57 -> 0 bytes .../3d/0970ec547fc41ef8a5882dde99c6adce65b021 | Bin 29 -> 0 bytes .../deprecated-mode.git/refs/heads/master | 1 - .../tests/resources/describe/.gitted/HEAD | 1 - .../tests/resources/describe/.gitted/config | 8 - .../tests/resources/describe/.gitted/index | Bin 262 -> 0 bytes .../resources/describe/.gitted/logs/HEAD | 14 - .../describe/.gitted/logs/refs/heads/master | 14 - .../03/00021985931292d0611b9232e757035fefc04d | Bin 108 -> 0 bytes .../10/8b485d8268ea595df8ffea74f0f4b186577d32 | Bin 125 -> 0 bytes .../10/bd08b099ecb79184c60183f5c94ca915f427ad | Bin 127 -> 0 bytes .../17/8481050188cf00d7d9cd5a11e43ab8fab9294f | Bin 17 -> 0 bytes .../19/1faf88a5826a99f475baaf8b13652c4e40bfe6 | Bin 19 -> 0 bytes .../1e/016431ec7b22dd3e23f3e6f5f68f358f9227cf | Bin 156 -> 0 bytes .../22/3b7836fb19fdf64ba2d3cd6173c6a283141f78 | Bin 17 -> 0 bytes .../25/d5edf8c0ef17e8a13b8da75913dcec4ea7afc1 | Bin 87 -> 0 bytes .../2b/df67abb163a4ffb2d7f3f0880c9fe5068ce782 | Bin 21 -> 0 bytes .../31/fc9136820b507e938a9c6b88bf2c567a9f6f4b | Bin 153 -> 0 bytes .../42/8f9554a2eec22de29898819b579466af7c1583 | Bin 80 -> 0 bytes .../4d/6558b8fa764baeb0f19c1e857df91e0eda5a0f | Bin 155 -> 0 bytes .../4f/2d9ce01ad5249cabdc6565366af8aff85b1525 | Bin 18 -> 0 bytes .../52/912fbab0715dec53d43053966e78ad213ba359 | Bin 127 -> 0 bytes .../56/26abf0f72e58d7a153368ba57db4c673c0e171 | Bin 19 -> 0 bytes .../61/26a5f9c57ebc81e64370ec3095184ad92dab1c | Bin 151 -> 0 bytes .../62/d8fe9f6db631bd3a19140699101c9e281c9f9d | Bin 17 -> 0 bytes .../65/a91bc2262480dce4c5979519aae6668368eb4e | Bin 77 -> 0 bytes .../68/0166b6cd31f76354fee2572618e6b0142d05e6 | 2 - .../69/3a3de402bb23897ed5c931273e53c78eff0495 | Bin 49 -> 0 bytes .../6a/12b56088706aa6c39ccd23b7c7ce60f3a0b9a1 | Bin 154 -> 0 bytes .../6d/218e42592043041c4da016ff298cf241b86c3c | Bin 77 -> 0 bytes .../75/bb152c600647586c226d98411b1d2f9861af5a | Bin 80 -> 0 bytes .../81/f4b1aac643e6983fab370eae8aefccecbf3a4c | Bin 152 -> 0 bytes .../8e/c1d96451ff05451720e4e8968812c46b35e5e4 | Bin 49 -> 0 bytes .../94/9b98e208015bfc0e2f573debc34ae2f97a7f0e | Bin 186 -> 0 bytes .../9c/06d71b8406ab97537e3acdc39a2c4ade7a9411 | Bin 49 -> 0 bytes .../a6/095f816e81f64651595d488badc42399837d6a | Bin 153 -> 0 bytes .../a9/e3325a07117aa5381e044a8d96c26eb30d729d | Bin 49 -> 0 bytes .../a9/eb02af13df030159e39f70330d5c8a47655691 | 2 - .../aa/d8d5cef3915ab78b3227abaaac99b62db9eb54 | Bin 49 -> 0 bytes .../aa/ddd4f14847e0e323924ec262c2343249a84f8b | Bin 125 -> 0 bytes .../b2/40c0fb88c5a629e00ebc1275fa1f33e364a705 | 3 - .../ce/1c4f8b6120122e23d4442925d98c56c41917d8 | Bin 187 -> 0 bytes .../d5/aab219a814ddbe4b3aaedf03cdea491b218ec4 | Bin 80 -> 0 bytes .../f2/ad6c76f0115a6ba5b00456a849810e7ec0af20 | Bin 17 -> 0 bytes .../f7/0f10e4db19068f79bc43844b49f3eece45c4e8 | Bin 17 -> 0 bytes .../f7/19efd430d52bcfc8566a43b2eb655688d38871 | Bin 19 -> 0 bytes .../describe/.gitted/refs/heads/master | 1 - .../libgit2/tests/resources/describe/another | 1 - vendor/libgit2/tests/resources/describe/file | 1 - vendor/libgit2/tests/resources/describe/side | 1 - .../libgit2/tests/resources/diff/.gitted/HEAD | 1 - .../tests/resources/diff/.gitted/config | 6 - .../tests/resources/diff/.gitted/description | 1 - .../tests/resources/diff/.gitted/index | Bin 225 -> 0 bytes .../tests/resources/diff/.gitted/info/exclude | 6 - .../tests/resources/diff/.gitted/logs/HEAD | 2 - .../diff/.gitted/logs/refs/heads/master | 2 - .../29/ab7053bb4dde0298e03e2c179e890b7dd465a7 | Bin 730 -> 0 bytes .../3e/5bcbad2a68e5bc60a53b8388eea53a1a7ab847 | Bin 1108 -> 0 bytes .../54/6c735f16a3b44d9784075c2c0dab2ac9bf1989 | Bin 1110 -> 0 bytes .../7a/9e0b02e63179929fed24f0a3e0f19168114d10 | Bin 160 -> 0 bytes .../7b/808f723a8ca90df319682c221187235af76693 | Bin 922 -> 0 bytes .../88/789109439c1e1c3cd45224001edee5304ed53c | 1 - .../cb/8294e696339863df760b2ff5d1e275bee72455 | Bin 86 -> 0 bytes .../d7/0d245ed97ed2aa596dd1af6536e4bfdb047b69 | 1 - .../resources/diff/.gitted/refs/heads/master | 1 - .../libgit2/tests/resources/diff/another.txt | 38 - .../libgit2/tests/resources/diff/readme.txt | 36 - .../resources/diff_format_email/.gitted/HEAD | 1 - .../diff_format_email/.gitted/config | 7 - .../resources/diff_format_email/.gitted/index | Bin 289 -> 0 bytes .../diff_format_email/.gitted/info/exclude | 6 - .../0a/37045ca6d8503e9bcf06a12abbbc8e92664cce | Bin 29 -> 0 bytes .../10/808fe9c9be5a190c0ba68d1a002233fb363508 | Bin 176 -> 0 bytes .../13/ecf3d572dbc5e5b32c8ba067d1d1e0939572e8 | Bin 34 -> 0 bytes .../17/cfad36e93db7706b16bef5ef842ba1e5ca06ab | Bin 155 -> 0 bytes .../1a/9932083f96b0db42552103d40076f62fa8235e | Bin 54 -> 0 bytes .../1a/e3be57f869687d983066a0f5d2aaea1b82ddc5 | Bin 162 -> 0 bytes .../1b/525b0a6c5218b069b601ce91fce8eaf0a54e20 | Bin 31 -> 0 bytes .../1e/82c3b234e37da82e5b23e0e2a70bca68ee12c6 | Bin 28 -> 0 bytes .../1e/875da9b1e67f853b2eec3e202c21c867097234 | Bin 121 -> 0 bytes .../20/609dbbc32bbfc827528eec3fcea2d024e6dd8a | Bin 121 -> 0 bytes .../23/f92946d3f38bd090f700d3e8e7b728ffc58264 | Bin 155 -> 0 bytes .../24/97c5249408494e66e25070a8c74e49eaeeb6c3 | Bin 162 -> 0 bytes .../24/9a4263be23b4d1c02484cb840b6eca4c6cf74d | Bin 171 -> 0 bytes .../25/2a3e19fd2c6fb7b20c111142c5bd5fb9ea6b8e | Bin 121 -> 0 bytes .../27/93544db9060bab4f9169e5b89c82f9fa7c7fa6 | Bin 120 -> 0 bytes .../29/1f1ff3cbb9a6f153678d9657679e3d4bf257df | Bin 29 -> 0 bytes .../2f/f7b811eee62a73959350b1f7349f6f4d0c882d | Bin 54 -> 0 bytes .../39/91dce9e71a0641ca49a6a4eea6c9e7ff402ed4 | Bin 166 -> 0 bytes .../45/eef2a9317e179984649de247269e38cd5d99cf | 2 - .../4a/076277b884c519a932be67e346db2ac80a98fa | Bin 40 -> 0 bytes .../4c/3bd7182ad66ea7aa20ba47ae82812b710d169c | Bin 179 -> 0 bytes .../4c/a10087e696d2ba78d07b146a118e9a7096ed4f | Bin 173 -> 0 bytes .../4d/de2b17d1c982cd988f21d24350a214401e4a1e | Bin 121 -> 0 bytes .../4f/31e0248ac800a1edc78b74f74e86f5eba90e87 | Bin 54 -> 0 bytes .../50/17c9456d013b2c7712d29aab73b681c880f509 | Bin 54 -> 0 bytes .../50/438cfa585c1d15cf3650ed1bf641da937cc261 | Bin 123 -> 0 bytes .../52/c3cd1ff6234b95fecbaf9ef13624da17697b8d | Bin 41 -> 0 bytes .../55/0d730ba1b8c4937ea170b37c7ba91d792c0aaa | Bin 123 -> 0 bytes .../62/7e7e12d87e07a83fad5b6bfa25e86ead4a5270 | 1 - .../66/81f1844dc677e5ff07ffd993461f5c441e6af5 | Bin 35 -> 0 bytes .../69/ddefb5c245e2f9ee62bd4cabd8ebe60a01e448 | Bin 54 -> 0 bytes .../6b/6c2067c6d968f9bddb9b900ee1ab7e5b067430 | 2 - .../6b/ef49b206b29d9c46456e075722cd1a48b41e4c | Bin 121 -> 0 bytes .../6c/15659c036377aebf3b4569959ca1f5bedb551f | Bin 167 -> 0 bytes .../6e/05acc5a5dab507d91a0a0cc0fb05a3dd98892d | 2 - .../73/09653445ecf038d3e3dd9ed55edb6cb541a4ba | Bin 28 -> 0 bytes .../74/6d514eae0c330261d37940cab33aa97fefbd93 | 1 - .../74/a4d5394ebcfa7e9f445680897dfbc96586bc86 | Bin 38 -> 0 bytes .../77/d0a3ed37236a7941d564f08d68d3b36462d231 | 2 - .../7a/de76dd34bba4733cf9878079f9fd4a456a9189 | 3 - .../7a/ff11da95ca2be0bfb74b06e7cc1c480559dbe7 | Bin 26 -> 0 bytes .../7f/854619451620f7fbcec7ea171675e615ce92b6 | Bin 179 -> 0 bytes .../87/3806f6f27e631eb0b23e4b56bea2bfac14a373 | Bin 181 -> 0 bytes .../89/47a46e2097638ca6040ad4877246f4186ec3bd | 2 - .../89/7d3af16ca9e420cd071b1c4541bd2b91d04c8c | 1 - .../8d/7523f6fcb2404257889abe0d96f093d9f524f9 | 1 - .../8d/fa038554d5b682a51bda8ee3038cee6c63be76 | Bin 120 -> 0 bytes .../92/64b96c6d104d0e07ae33d3007b6a48246c6f92 | Bin 181 -> 0 bytes .../94/350226b3aa14efac831c803a51f7a09f3fc31a | Bin 24 -> 0 bytes .../94/75e21dcbc515af8f641576400e4b450e5f4c03 | Bin 62 -> 0 bytes .../94/aaae8954e8bb613de636071da663a621695911 | Bin 29 -> 0 bytes .../9a/2d780ac2ea0aeabdb9d2a876e6bbfff17b2c44 | Bin 28 -> 0 bytes .../9a/c0329b8b7a4046210d8b8b02ac02055667de63 | Bin 29 -> 0 bytes .../9a/c35ff15cd8864aeafd889e4826a3150f0b06c4 | Bin 20 -> 0 bytes .../9b/997daca2a0beb5cc44b32c64f100a9a26d4d4b | Bin 22 -> 0 bytes .../a3/ac918e3a6604294b239cb956363e83d71abb3b | 1 - .../a5/ac978d4f2a1784f847f41223a34c3e78934238 | Bin 54 -> 0 bytes .../a7/29eab45c84563135e8631d4010230bc0479f1f | Bin 40 -> 0 bytes .../a9/7157a0d0571698728b6f2f7675b456c98c5961 | Bin 62 -> 0 bytes .../af/8f41d0cb7a3079a8f8e231ea2ab8b97837ce13 | Bin 50 -> 0 bytes .../b0/5cecf1949d192b6df852b3f71853ef820ee235 | Bin 37 -> 0 bytes .../b4/f457c219dbb3517be908d4e70f0ada2fd8b8f9 | Bin 54 -> 0 bytes .../bd/474b2519cc15eab801ff851cc7d50f0dee49a1 | Bin 18 -> 0 bytes .../bd/f7ba6bc5c4e57ca6595928dcbe6753c8a663ff | Bin 35 -> 0 bytes .../cb/a89408dc016f4caddb6dc886fcb58f587a78df | 3 - .../cd/471f0d8770371e1bc78bcbb38db4c7e4106bd2 | Bin 180 -> 0 bytes .../cd/ed722d05305c6b181f188c118d2d9810f39bb8 | Bin 163 -> 0 bytes .../ce/2792fcae8d704a56901754a0583a7418a21d8a | Bin 121 -> 0 bytes .../d1/4aa252e52a709d03a3d3d0d965e177eb0a674e | 1 - .../d5/ff67764c82f729b13c26a09576570d884d9687 | Bin 121 -> 0 bytes .../d7/bb447df12c6a8aba8727005482fb211f11297a | Bin 156 -> 0 bytes .../db/e8727e4806ae88ccc3f0755cae8f8cb7efa2cc | Bin 175 -> 0 bytes .../e1/2af77c510e8ce4c261a3758736109c2c2dd1f0 | Bin 51 -> 0 bytes .../e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 | Bin 15 -> 0 bytes .../e9/091231467304a5ef112de02361d795ef051ee1 | Bin 24 -> 0 bytes .../ee/251372f131d82e575f16fe51c778406d88f8c2 | 2 - .../f3/d35bd592fefd8280fc0c302fa9f27dbdd721a3 | 1 - .../f4/07be01334e07bfb8f57cd2078f0ee3eb61e085 | 1 - .../f9/e215d309644e24fa50d6bd6e6eedba166e56bc | 2 - .../fc/a0c10eb9f1af6494a448d5733d283f5232a514 | Bin 176 -> 0 bytes .../ff/8d35b41494f7f0dc92f95d67f54fff274d3fcb | Bin 29 -> 0 bytes .../.gitted/refs/heads/binary | 1 - .../.gitted/refs/heads/master | 1 - .../.gitted/refs/heads/multihunk | 1 - .../.gitted/refs/heads/rename | 1 - .../diff_format_email/file1.txt.renamed | 17 - .../resources/diff_format_email/file2.txt | 5 - .../resources/diff_format_email/file3.txt | 6 - .../resources/duplicate.git/COMMIT_EDITMSG | 1 - .../tests/resources/duplicate.git/HEAD | 1 - .../tests/resources/duplicate.git/config | 5 - .../tests/resources/duplicate.git/description | 1 - .../tests/resources/duplicate.git/index | Bin 104 -> 0 bytes .../resources/duplicate.git/info/exclude | 6 - .../tests/resources/duplicate.git/info/refs | 1 - .../tests/resources/duplicate.git/logs/HEAD | 1 - .../duplicate.git/logs/refs/heads/master | 1 - .../03/8d718da6a1ebbc6a7780a96ed75a70cc2ad6e2 | Bin 23 -> 0 bytes .../0d/deadede9e6d6ccddce0ee1e5749eed0485e5ea | Bin 22 -> 0 bytes .../ce/013625030ba8dba906f756967f9e9ca394464a | Bin 21 -> 0 bytes .../duplicate.git/objects/info/packs | 3 - ...a4896f0a0b9c9947b0927c57a5c03dcae052e3.idx | Bin 1184 -> 0 bytes ...4896f0a0b9c9947b0927c57a5c03dcae052e3.pack | Bin 249 -> 0 bytes ...8eeacbd65cbd30a365d7564b45a468e8bd43d6.idx | Bin 1268 -> 0 bytes ...eeacbd65cbd30a365d7564b45a468e8bd43d6.pack | Bin 369 -> 0 bytes ...7994ad581c9af946de0eb890175c08cd005f38.idx | Bin 1156 -> 0 bytes ...994ad581c9af946de0eb890175c08cd005f38.pack | Bin 213 -> 0 bytes ...ef1aa326265de7d05018ee51acc0a8717fe1ea.idx | Bin 1100 -> 0 bytes ...f1aa326265de7d05018ee51acc0a8717fe1ea.pack | Bin 47 -> 0 bytes .../tests/resources/duplicate.git/packed-refs | 2 - .../duplicate.git/refs/heads/dummy-marker.txt | 1 - .../tests/resources/empty_bare.git/HEAD | 1 - .../tests/resources/empty_bare.git/config | 7 - .../resources/empty_bare.git/description | 1 - .../resources/empty_bare.git/info/exclude | 6 - .../objects/info/dummy-marker.txt | 0 .../objects/pack/dummy-marker.txt | 0 .../refs/heads/dummy-marker.txt | 0 .../empty_standard_repo/.gitted/HEAD | 1 - .../empty_standard_repo/.gitted/config | 8 - .../empty_standard_repo/.gitted/description | 1 - .../empty_standard_repo/.gitted/info/exclude | 6 - .../.gitted/objects/info/dummy-marker.txt | 0 .../.gitted/objects/pack/dummy-marker.txt | 0 .../.gitted/refs/heads/dummy-marker.txt | 0 .../tests/resources/filemodes/.gitted/HEAD | 1 - .../tests/resources/filemodes/.gitted/config | 6 - .../resources/filemodes/.gitted/description | 1 - .../tests/resources/filemodes/.gitted/index | Bin 528 -> 0 bytes .../resources/filemodes/.gitted/info/exclude | 6 - .../resources/filemodes/.gitted/logs/HEAD | 1 - .../filemodes/.gitted/logs/refs/heads/master | 1 - .../99/62c8453ba6f0cf8dac7c5dcc2fa2897fa9964a | Bin 139 -> 0 bytes .../a5/c5dd0fc6c313159a69b1d19d7f61a9f978e8f1 | Bin 21 -> 0 bytes .../e7/48d196331bcb20267eaaee4ff3326cb73b8182 | Bin 99 -> 0 bytes .../filemodes/.gitted/refs/heads/master | 1 - .../tests/resources/filemodes/exec_off | 1 - .../resources/filemodes/exec_off2on_staged | 1 - .../resources/filemodes/exec_off2on_workdir | 1 - .../resources/filemodes/exec_off_untracked | 1 - .../libgit2/tests/resources/filemodes/exec_on | 1 - .../resources/filemodes/exec_on2off_staged | 1 - .../resources/filemodes/exec_on2off_workdir | 1 - .../resources/filemodes/exec_on_untracked | 1 - vendor/libgit2/tests/resources/gitgit.index | Bin 134799 -> 0 bytes .../tests/resources/icase/.gitted/HEAD | 1 - .../tests/resources/icase/.gitted/config | 7 - .../tests/resources/icase/.gitted/description | 1 - .../tests/resources/icase/.gitted/index | Bin 1392 -> 0 bytes .../resources/icase/.gitted/info/exclude | 6 - .../tests/resources/icase/.gitted/logs/HEAD | 1 - .../icase/.gitted/logs/refs/heads/master | 1 - .../3e/257c57f136a1cb8f2b8e9a2e5bc8ec0258bdce | Bin 114 -> 0 bytes .../4d/d6027d083575c7431396dc2a3174afeb393c93 | Bin 61 -> 0 bytes .../62/e0af52c199ec731fe4ad230041cd3286192d49 | Bin 19 -> 0 bytes .../76/d6e1d231b1085fcce151427e9899335de74be6 | 3 - .../d4/4e18fb93b7107b5cd1b95d601591d77869a1b6 | Bin 21 -> 0 bytes .../resources/icase/.gitted/refs/heads/master | 1 - vendor/libgit2/tests/resources/icase/B | 1 - vendor/libgit2/tests/resources/icase/D | 1 - vendor/libgit2/tests/resources/icase/F | 1 - vendor/libgit2/tests/resources/icase/H | 1 - vendor/libgit2/tests/resources/icase/J | 1 - vendor/libgit2/tests/resources/icase/L/1 | 1 - vendor/libgit2/tests/resources/icase/L/B | 1 - vendor/libgit2/tests/resources/icase/L/D | 1 - vendor/libgit2/tests/resources/icase/L/a | 1 - vendor/libgit2/tests/resources/icase/L/c | 1 - vendor/libgit2/tests/resources/icase/a | 1 - vendor/libgit2/tests/resources/icase/c | 1 - vendor/libgit2/tests/resources/icase/e | 1 - vendor/libgit2/tests/resources/icase/g | 1 - vendor/libgit2/tests/resources/icase/i | 1 - vendor/libgit2/tests/resources/icase/k/1 | 1 - vendor/libgit2/tests/resources/icase/k/B | 1 - vendor/libgit2/tests/resources/icase/k/D | 1 - vendor/libgit2/tests/resources/icase/k/a | 1 - vendor/libgit2/tests/resources/icase/k/c | 1 - .../tests/resources/issue_1397/.gitted/HEAD | 1 - .../tests/resources/issue_1397/.gitted/config | 6 - .../tests/resources/issue_1397/.gitted/index | Bin 233 -> 0 bytes .../7f/483a738f867e5b21c8f377d70311f011eb48b5 | 3 - .../83/12e0889a9cbab77c732b6bc39b51a683e3a318 | Bin 48 -> 0 bytes .../8a/7ef047fc933edb62e84e7977b0612ec3f6f283 | Bin 141 -> 0 bytes .../8e/8f80088a9274fd23584992f587083ca1bcbbac | Bin 63 -> 0 bytes .../f2/c62dea0372a0578e053697d5c1ba1ac05e774a | Bin 94 -> 0 bytes .../ff/3578d64d199d5b48d92bbb569e0a273e411741 | Bin 73 -> 0 bytes .../issue_1397/.gitted/refs/heads/master | 1 - .../tests/resources/issue_1397/crlf_file.txt | 3 - .../issue_1397/some_other_crlf_file.txt | 3 - .../issue_592/.gitted/COMMIT_EDITMSG | 1 - .../tests/resources/issue_592/.gitted/HEAD | 1 - .../tests/resources/issue_592/.gitted/config | 8 - .../tests/resources/issue_592/.gitted/index | Bin 392 -> 0 bytes .../resources/issue_592/.gitted/info/exclude | 6 - .../resources/issue_592/.gitted/logs/HEAD | 2 - .../issue_592/.gitted/logs/refs/heads/master | 2 - .../06/07ee9d4ccce8e4c4fa13c2c7d727e7faba4e0e | Bin 87 -> 0 bytes .../49/363a72a90d9424240258cd3759f23788ecf1d8 | Bin 55 -> 0 bytes .../4d/383e87f0371ba8fa353f3912db6862b2625e85 | 2 - .../71/44be264b61825fbff68046fe999bdfe96a1792 | Bin 50 -> 0 bytes .../be/de83ee10b5b3f00239660b00acec2d55fd0b84 | Bin 107 -> 0 bytes .../e3/8fcc7a6060f5eb5b876e836b52ae4769363f21 | Bin 137 -> 0 bytes .../f1/adef63cb08891a0942b76fc4b9c50c6c494bc7 | Bin 29 -> 0 bytes .../issue_592/.gitted/refs/heads/master | 1 - .../libgit2/tests/resources/issue_592/a.txt | 1 - .../libgit2/tests/resources/issue_592/c/a.txt | 1 - .../libgit2/tests/resources/issue_592/l.txt | 1 - .../libgit2/tests/resources/issue_592/t/a.txt | 1 - .../libgit2/tests/resources/issue_592/t/b.txt | 1 - .../tests/resources/issue_592b/.gitted/HEAD | 1 - .../tests/resources/issue_592b/.gitted/config | 6 - .../resources/issue_592b/.gitted/description | 1 - .../tests/resources/issue_592b/.gitted/index | Bin 376 -> 0 bytes .../resources/issue_592b/.gitted/info/exclude | 6 - .../resources/issue_592b/.gitted/logs/HEAD | 1 - .../issue_592b/.gitted/logs/refs/heads/master | 1 - .../3f/bf1852f72fd268e36457b13a18cdd9a4c9ea35 | 2 - .../6f/a891d3e578c83e1c03bdb9e0fdd8e6e934157f | Bin 28 -> 0 bytes .../80/07d41d5794e6ce4d4d2c97e370d5a9aa6d5213 | Bin 24 -> 0 bytes .../a6/5fb6583a7c425284142f285bc359a2d6565513 | Bin 93 -> 0 bytes .../ae/be7a55922c7097ef91ca3a7bc327a901d87c2c | Bin 122 -> 0 bytes .../b3/44b055867fcdc1f01eaa75056a43e868eb4fbc | Bin 36 -> 0 bytes .../f7/d75fbfad8b1d2e307ced287ea78aad403cdce3 | Bin 57 -> 0 bytes .../issue_592b/.gitted/refs/heads/master | 1 - .../tests/resources/issue_592b/gitignore | 1 - .../issue_592b/ignored/contained/ignored3.txt | 1 - .../issue_592b/ignored/contained/tracked3.txt | 1 - .../resources/issue_592b/ignored/ignored2.txt | 1 - .../resources/issue_592b/ignored/tracked2.txt | 1 - .../tests/resources/issue_592b/ignored1.txt | 1 - .../tests/resources/issue_592b/tracked1.txt | 1 - .../resources/merge-recursive/.gitted/HEAD | 1 - .../resources/merge-recursive/.gitted/config | 7 - .../resources/merge-recursive/.gitted/index | Bin 619 -> 0 bytes .../merge-recursive/.gitted/info/refs | 1 - .../00/6b298c5702b04c00370d0414959765b82fd722 | Bin 207 -> 0 bytes .../00/7f1ee2af8e5d99906867c4237510e1790a89b8 | 3 - .../01/6eef4a6fefd36bdcaa93ad773449ddc5c73cbb | Bin 208 -> 0 bytes .../05/c6a04ac101ab1a9836a95d5ec8d16b6f6304fd | Bin 208 -> 0 bytes .../06/db153c36829fc656e05cdf5a3bf7183f3c10aa | 2 - .../07/10c3c796e0704361472ecb904413fca0107a25 | Bin 208 -> 0 bytes .../07/2d89dcf3a7671ac34a8e875bb72fb39bcf14d7 | Bin 208 -> 0 bytes .../0b/b7ed583d7e9ad507e8b902594f5c9126ea456b | Bin 161 -> 0 bytes .../0e/8126647ec607f0a14122cec4b15315d790c8ff | Bin 208 -> 0 bytes .../0f/a6ead2731b9d138afe38c336c9727ea05027a7 | 1 - .../12/4d4fe29d3433fdaa2f0f455d226f2c79d89cf3 | Bin 208 -> 0 bytes .../15/311229e70fa62653f73dde1d4deef1a8e47a11 | Bin 710 -> 0 bytes .../15/faa0c9991f2d65686e844651faa2ff9827887b | Bin 665 -> 0 bytes .../16/895aa5e13f8907d4adab81285557d938fad342 | Bin 634 -> 0 bytes .../1c/1bdb80c04233d1a9b9755913ee233987be6175 | Bin 208 -> 0 bytes .../1e/8dff96faaaa24f84943d2d9601dde61cb0398a | Bin 268 -> 0 bytes .../21/950d5e4e4d1a871b4dfcf72ecb6b9c162c434e | Bin 670 -> 0 bytes .../34/8f16ffaeb73f319a75cec5b16a0a47d2d5e27c | Bin 208 -> 0 bytes .../37/185b25a204309bf74817da1a607518f13ca3ed | Bin 715 -> 0 bytes .../37/a5054a9f9b4628e3924c5cb8f2147c6e2a3efc | Bin 630 -> 0 bytes .../38/55170cef875708da06ab9ad7fc6a73b531cda1 | Bin 664 -> 0 bytes .../3a/3f5a6ec1c968d1d2d5d20dee0d161a4351f279 | 1 - .../3b/919b6e8a575b4779c8243ebea3e3beb436e88f | Bin 208 -> 0 bytes .../3f/d41804a7906db846af5e868444782e546af46a | Bin 206 -> 0 bytes .../41/71bb8d40e9fc830d79b757dc06ec6c14548b78 | Bin 207 -> 0 bytes .../42/1b392106e079df6d412babd5636697938269ec | 2 - .../42/44d13e2bbc38510320443bbb003f3967d12436 | Bin 207 -> 0 bytes .../42/cdad903aef3e7b614675e6584a8be417941911 | Bin 208 -> 0 bytes .../43/2faca0c62dc556ad71a22f23e541a46a8b0f6f | 2 - .../43/5424798e5e1b21dd4588d1c291ba4eb179a838 | Bin 208 -> 0 bytes .../43/6ea75c99f527e4b42fddb46abedf7726eb719d | 2 - .../48/3065df53c0f4a02cdc6b2910b05d388fc17ffb | Bin 165 -> 0 bytes .../4b/7c5650008b2e747fe1809eeb5a1dde0e80850a | Bin 615 -> 0 bytes .../4c/49317a0912ca559d2048bc329994eb7d10474f | Bin 183 -> 0 bytes .../4d/fc1be85a9d6c9898152444d32b238b4aecf8cc | Bin 168 -> 0 bytes .../4e/21d2d63357bde5027d1625f5ec6b430cdeb143 | Bin 662 -> 0 bytes .../4e/70a6b06fc62481f80fbb74327849e7170eebff | Bin 207 -> 0 bytes .../4f/4e85a0ab8515e34302721fbcec06fa9d9c1a9a | Bin 631 -> 0 bytes .../50/e4facaafb746cfed89287206274193c1417288 | 2 - .../53/9bd011c4822c560c1d17cab095006b7a10f707 | Bin 163 -> 0 bytes .../56/07a8c4601a737daadd1f470bde3142aff57026 | 1 - .../5a/ba269b3be41fc8db38068d3948c8af543fe609 | Bin 208 -> 0 bytes .../5b/8e1e56cb99e8b99ac22eec8aebf6422ecd08c0 | Bin 208 -> 0 bytes .../5e/8747f5200fac0f945a07daf6163ca9cb1a8da9 | Bin 672 -> 0 bytes .../5f/18576d464946eb2338daeb8b4030019961f505 | Bin 208 -> 0 bytes .../63/e8773becdea9c3699c95a5740be5baa8be8d69 | Bin 207 -> 0 bytes .../65/bea8448ca5b3104628ffbca553c54bde54b0fc | 3 - .../66/6ffdfcf1eaa5641fa31064bf2607327e843c09 | Bin 664 -> 0 bytes .../68/a2e1ee61a23a4728fe6b35580fbbbf729df370 | Bin 665 -> 0 bytes .../68/af1fc7407fd9addf1701a87eb1c95c7494c598 | Bin 443 -> 0 bytes .../68/f6182f4c85d39e1309d97c7e456156dc9c0096 | Bin 755 -> 0 bytes .../6c/778edd0e4cf394f5a3df8b96db516024cc1bb8 | Bin 636 -> 0 bytes .../6e/f31d35a3f5abc1e24f4f9afa5cb2016f03fa2d | 1 - .../71/3e438567b28543235faf265c4c5b02b437c7fd | Bin 207 -> 0 bytes .../72/3181f1bfd30e47a6d1d36a4d874e31e7a0a1a4 | 2 - .../73/b20c8e09fa2726d69ff66969186014165da3c3 | Bin 208 -> 0 bytes .../74/4df1bdf0f7bca20deb23e5a5eb8255fc237901 | Bin 207 -> 0 bytes .../75/c653822173a8e5795153ec3773dfe44bb9bb63 | 1 - .../78/3d6539dde96b8873c5b5da3e79cc14cd64830b | 4 - .../7a/9277e0c5ec75339f011c176d0c20e513c4de1c | 1 - .../7c/7bf85e978f1d18c0566f702d2cb7766b9c8d4f | 1 - .../7c/7e08f9559d9e1551b91e1cf68f1d0066109add | Bin 443 -> 0 bytes .../7e/3056f6765b3044ab09701077dbe1eb5b0e9ad0 | Bin 208 -> 0 bytes .../81/5b5a1c80ca749d705c7aa0cb294a00cbedd340 | 5 - .../88/8588a782ad433fbf0cc526e07cfe6f4a6b60b3 | Bin 208 -> 0 bytes .../88/eb3f98849f4b8d0555395f514800900a01dc8f | Bin 209 -> 0 bytes .../89/8d12687fb35be271c27c795a6b32c8b51da79e | Bin 663 -> 0 bytes .../8a/bda8de114a93f2d3c5a975ee2960f31e24be58 | 2 - .../8f/35f30bfe09513f96cf8aa4df0834ae34e93bae | 1 - .../94/d2c01087f48213bd157222d54edfefd77c9bba | Bin 621 -> 0 bytes .../95/78b04e2087976e382622322ba476aa40398dc7 | Bin 620 -> 0 bytes .../96/23368f0fc562d6d840372ae17dc4cc32d51a80 | 2 - .../97/3b70322e758da87e1ce21d2195d86c5e4e9647 | 1 - .../98/1c79eb38518d3821e73bb159dc413bb42d6614 | Bin 208 -> 0 bytes .../9a/e63b4a8ce0f181b2d1d098971733a103226917 | Bin 240 -> 0 bytes .../9b/258ad4c39f40c24f66bf1faf48eb6202d59c85 | Bin 240 -> 0 bytes .../9c/3f1c70db28c00ce74b22ba3edafe16d9cf03d4 | Bin 208 -> 0 bytes .../9e/12bce04446d097ae1782967a5888c2e2a0d35b | Bin 268 -> 0 bytes .../a0/2d4fd126e0cc8fb46ee48cf38bad36d44f2dbc | Bin 649 -> 0 bytes .../a0/65d3022e99a1943177c10a53cce38bc2127042 | Bin 162 -> 0 bytes .../a2/8c21c90aa36580641b345011869d1a899a6783 | 2 - .../a2/fa36ffc4a565a223e225d15b18774f87d0c4f0 | 3 - .../a3/4e5a16feabbd0335a633aadb8217c9f3dba58d | Bin 164 -> 0 bytes .../a7/b066537e6be7109abfe4ff97b675d4e077da20 | Bin 621 -> 0 bytes .../a8/2a121ea36b115548d6dad2cd86ec27f06f7b30 | Bin 208 -> 0 bytes .../aa/9e263294fd2f6f6fd9ceab23ca8ce3ea2ce707 | Bin 175 -> 0 bytes .../ad/1ea02c2cc4f55c1dff87b80a086206a73885eb | 2 - .../ad/2ace9e15f66b3d1138922e6ffdc3ea3f967fa6 | Bin 170 -> 0 bytes .../ad/98bfa4679fb00b89207a0a11b8bbf91a3e4de9 | Bin 208 -> 0 bytes .../b2/a81ead9e722af0099fccfb478cea88eea749a2 | Bin 664 -> 0 bytes .../b4/cefb3c75770e57bb8bb44e4a50d9578009e847 | Bin 639 -> 0 bytes .../b9/1ef5ffa8612616c8e76051901caafd723f0e2c | Bin 712 -> 0 bytes .../bd/97980c22d122509cdd915fd9788d56c8d3ae20 | Bin 163 -> 0 bytes .../c0/bd078a61d2cc22c52ca5ce04abdcdc5cc1829e | Bin 207 -> 0 bytes .../c4/83ca4bb087174af5cb51d7caa9c09fe4a28ccb | 1 - .../c4/e6cca3ec6ae0148ed231f97257df8c311e015f | 1 - .../ca/224bba0a8a24f1768804fe5f565b1014af7ef2 | Bin 170 -> 0 bytes .../ca/49d1a8b6116ffeba22667bba265fa5261df7ab | 2 - .../ca/7d316d6d9af99d2481e980d68b77e572d80fe7 | Bin 207 -> 0 bytes .../ca/fa936d25f0b397432a27201f6b3284c47df8be | Bin 712 -> 0 bytes .../cb/49ad76147f5f9439cbd6133708b76142660660 | Bin 641 -> 0 bytes .../d0/dd5d9083bda65ec99aa8b9b64a5a278771b70a | Bin 620 -> 0 bytes .../d2/682aaf9594080ce877b5eeee110850fd6e3480 | 1 - .../d6/04c75019c282144bdbbf3fd3462ba74b240efc | Bin 620 -> 0 bytes .../d7/1c24b3b113fd1d1909998c5bfe33b86a65ee03 | Bin 240 -> 0 bytes .../d8/dd349b78f19a4ebe3357bacb8138f00bf5ed41 | Bin 277 -> 0 bytes .../d8/e05a90b3c2240d71a20c2502c937d9b7d22777 | 2 - .../da/b7b53383a1fec46632e60a1d847ce4f9ae14f2 | Bin 208 -> 0 bytes .../db/203155a789fb749aa3c14e93eea2c744a9c6c7 | 1 - .../de/a7215f259b2cced87d1bda6c72f8b4ce37a2ff | Bin 357 -> 0 bytes .../e1/512550f09d980214e46e6d3f5a2b20c3d75755 | Bin 208 -> 0 bytes .../e1/dcfc3038be54195a59817c89782b261e46cb05 | 1 - .../e2/93bfdddb81a853bbb16b8b58e68626f30841a4 | Bin 207 -> 0 bytes .../e2/c84bb33992a455b1a7a5019f0e38d883d3f475 | Bin 208 -> 0 bytes .../e2/d185fa827d58134cea20b9e1df893833c6560e | Bin 208 -> 0 bytes .../e5/0fbbd701458757bdfe9815f58ed717c588d1b5 | 3 - .../ef/1783444b61a8671beea4ce1f4d0202677dfbfb | 3 - .../f1/3e1bc6ba935fce2efffa5be4c4832404034ef1 | Bin 206 -> 0 bytes .../f1/72517a8cf39e009ffff541ee52429b89e418f3 | Bin 268 -> 0 bytes .../f1/b44c04989a3a1c14b036cfadfa328d53a7bc5e | Bin 672 -> 0 bytes .../f3/5f159ff5d44dfd9f52d63dd5b659f0521ff569 | Bin 669 -> 0 bytes .../f5/1658077d85f2264fa179b4d0848268cb3475c3 | 2 - .../f7/929c5a67a4bdc98247fb4b5098675723932a64 | Bin 207 -> 0 bytes .../fa/567f568ed72157c0c617438d077695b99d9aac | Bin 662 -> 0 bytes .../fd/8b5fe88cda995e70a22ed98701e65b843e05ec | Bin 165 -> 0 bytes .../fe/f01f3104c8047d05e8572e521c454f8fd4b8db | Bin 207 -> 0 bytes .../ff/b36e513f5fdf8a6ba850a20142676a2ac4807d | Bin 355 -> 0 bytes .../.gitted/refs/heads/branchA-1 | 1 - .../.gitted/refs/heads/branchA-2 | 1 - .../.gitted/refs/heads/branchB-1 | 1 - .../.gitted/refs/heads/branchB-2 | 1 - .../.gitted/refs/heads/branchC-1 | 1 - .../.gitted/refs/heads/branchC-2 | 1 - .../.gitted/refs/heads/branchD-1 | 1 - .../.gitted/refs/heads/branchD-2 | 1 - .../.gitted/refs/heads/branchE-1 | 1 - .../.gitted/refs/heads/branchE-2 | 1 - .../.gitted/refs/heads/branchE-3 | 1 - .../.gitted/refs/heads/branchF-1 | 1 - .../.gitted/refs/heads/branchF-2 | 1 - .../.gitted/refs/heads/branchG-1 | 1 - .../.gitted/refs/heads/branchG-2 | 1 - .../.gitted/refs/heads/branchH-1 | 1 - .../.gitted/refs/heads/branchH-2 | 1 - .../.gitted/refs/heads/branchI-1 | 1 - .../.gitted/refs/heads/branchI-2 | 1 - .../resources/merge-recursive/asparagus.txt | 10 - .../tests/resources/merge-recursive/beef.txt | 22 - .../resources/merge-recursive/bouilli.txt | 18 - .../tests/resources/merge-recursive/gravy.txt | 8 - .../resources/merge-recursive/oyster.txt | 13 - .../tests/resources/merge-recursive/veal.txt | 20 - .../merge-resolve/.gitted/COMMIT_EDITMSG | 1 - .../resources/merge-resolve/.gitted/HEAD | 1 - .../resources/merge-resolve/.gitted/ORIG_HEAD | 1 - .../resources/merge-resolve/.gitted/config | 8 - .../merge-resolve/.gitted/description | 1 - .../resources/merge-resolve/.gitted/index | Bin 624 -> 0 bytes .../resources/merge-resolve/.gitted/logs/HEAD | 236 - .../.gitted/logs/refs/heads/branch | 2 - .../.gitted/logs/refs/heads/df_ancestor | 5 - .../.gitted/logs/refs/heads/df_side1 | 14 - .../.gitted/logs/refs/heads/df_side2 | 9 - .../.gitted/logs/refs/heads/ff_branch | 5 - .../.gitted/logs/refs/heads/master | 5 - .../.gitted/logs/refs/heads/octo1 | 2 - .../.gitted/logs/refs/heads/octo2 | 2 - .../.gitted/logs/refs/heads/octo3 | 2 - .../.gitted/logs/refs/heads/octo4 | 2 - .../.gitted/logs/refs/heads/octo5 | 2 - .../.gitted/logs/refs/heads/octo6 | 3 - .../.gitted/logs/refs/heads/renames1 | 2 - .../.gitted/logs/refs/heads/renames2 | 3 - .../.gitted/logs/refs/heads/trivial-10 | 3 - .../.gitted/logs/refs/heads/trivial-10-branch | 2 - .../.gitted/logs/refs/heads/trivial-11 | 3 - .../.gitted/logs/refs/heads/trivial-11-branch | 2 - .../.gitted/logs/refs/heads/trivial-13 | 3 - .../.gitted/logs/refs/heads/trivial-13-branch | 2 - .../.gitted/logs/refs/heads/trivial-14 | 3 - .../.gitted/logs/refs/heads/trivial-14-branch | 2 - .../.gitted/logs/refs/heads/trivial-2alt | 2 - .../logs/refs/heads/trivial-2alt-branch | 2 - .../.gitted/logs/refs/heads/trivial-3alt | 3 - .../logs/refs/heads/trivial-3alt-branch | 1 - .../.gitted/logs/refs/heads/trivial-4 | 2 - .../.gitted/logs/refs/heads/trivial-4-branch | 2 - .../.gitted/logs/refs/heads/trivial-5alt-1 | 2 - .../logs/refs/heads/trivial-5alt-1-branch | 2 - .../.gitted/logs/refs/heads/trivial-5alt-2 | 3 - .../logs/refs/heads/trivial-5alt-2-branch | 2 - .../.gitted/logs/refs/heads/trivial-6 | 3 - .../.gitted/logs/refs/heads/trivial-6-branch | 2 - .../.gitted/logs/refs/heads/trivial-7 | 3 - .../.gitted/logs/refs/heads/trivial-7-branch | 5 - .../.gitted/logs/refs/heads/trivial-8 | 3 - .../.gitted/logs/refs/heads/trivial-8-branch | 2 - .../.gitted/logs/refs/heads/trivial-9 | 3 - .../.gitted/logs/refs/heads/trivial-9-branch | 2 - .../.gitted/logs/refs/heads/unrelated | 1 - .../.gitted/modules/submodule/HEAD | 1 - .../.gitted/modules/submodule/ORIG_HEAD | 1 - .../.gitted/modules/submodule/config | 15 - .../.gitted/modules/submodule/index | Bin 153 -> 0 bytes .../.gitted/modules/submodule/info/exclude | 6 - .../18/fae1354bba0a5f1e6a531f9988369142c24a9e | Bin 54 -> 0 bytes .../29/7aa6cd028b3336c7802c7a6f49143da4e1602d | Bin 161 -> 0 bytes .../38/6c80dc813b89d719797668f40c1be0a6efa996 | Bin 32 -> 0 bytes .../ab/435a147bae6d5906ecfd0916a570c4ab3eeea8 | Bin 64 -> 0 bytes .../ad/16e0a7684ea95bf892980a2ee412293ae979cc | Bin 64 -> 0 bytes .../ae/39c77c70cb6bad18bb471912460c4e1ba0f586 | 2 - .../c2/0765f6e24e8bbb63a648d0d11d84da63170190 | Bin 52 -> 0 bytes .../d3/d806a4bef96889117fd7ebac0e3cb5ec152932 | 3 - .../f1/065ff5593604072837fecaad3e2e268cb0147b | Bin 64 -> 0 bytes .../.gitted/modules/submodule/packed-refs | 3 - .../modules/submodule/refs/heads/master | 1 - .../submodule/refs/remotes/origin/HEAD | 1 - .../00/5b6fcc8fec71d2550bef8462d169b3c26aa14b | Bin 168 -> 0 bytes .../00/9b9cab6fdac02915a88ecd078b7a792ed802d8 | Bin 164 -> 0 bytes .../00/c7d33f1ffa79d19c2272b370fcaeaadba49c08 | Bin 147 -> 0 bytes .../01/f149e1b8f84bd8896aaff6d6b22af88459ded0 | Bin 166 -> 0 bytes .../02/04a84f822acbf6386b36d33f1f6bc68bbbf858 | Bin 168 -> 0 bytes .../02/251f990ca8e92e7ae61d3426163fa821c64001 | Bin 264 -> 0 bytes .../03/21415405cb906c46869919af56d51dbbe5e85c | Bin 271 -> 0 bytes .../03/2ebc5ab85d9553bb187d3cd40875ff23a63ed0 | Bin 29 -> 0 bytes .../03/b87706555accbf874ccd410dbda01e8e70a67f | Bin 353 -> 0 bytes .../03/dad1005e5d06d418f50b12e0bcd48ff2306a03 | Bin 264 -> 0 bytes .../05/1ffd7901a442faf56b226161649074f15c7c47 | 1 - .../05/8541fc37114bfc1dddf6bd6bffc7fae5c2e6fe | Bin 63 -> 0 bytes .../05/f3c1a2a56ca95c3d2ef28dc9ddf32b5cd6c91c | Bin 170 -> 0 bytes .../07/a759da919f737221791d542f176ab49c88837f | Bin 165 -> 0 bytes .../07/c514b04698e068892b31c8d352b85813b99c6e | Bin 32 -> 0 bytes .../09/055301463b7f2f8ee5d368f8ed5c0a40ad8515 | Bin 41 -> 0 bytes .../09/17bb159596aea4d295f4857da77e8f96b3c7dc | Bin 36 -> 0 bytes .../09/2ce8682d7f3a2a3a769a6daca58950168ba5c4 | Bin 163 -> 0 bytes .../09/3bebf072dd4bbba88833667d6ffe454df199e1 | Bin 266 -> 0 bytes .../09/768bed22680cdb0859683fa9677ccc8d5a25c1 | Bin 275 -> 0 bytes .../0a/75d9aac1dc84fb5aa51f7325c0ab53242ddef7 | Bin 275 -> 0 bytes .../0c/fd6c54ef6532d862408f562309dc9c74a401e8 | Bin 28 -> 0 bytes .../0d/52e3a556e189ba0948ae56780918011c1b167d | Bin 235 -> 0 bytes .../0d/872f8e871a30208305978ecbf9e66d864f1638 | Bin 89 -> 0 bytes .../0e/c5f433959cd46177f745903353efb5be08d151 | Bin 165 -> 0 bytes .../0f/3fc5dddc8964b9ac1040d0e957f9eb02d9efb3 | Bin 47 -> 0 bytes .../11/aeee27ac45a8402c2fd5b875d66dd844e5df00 | Bin 51 -> 0 bytes .../11/deab00b2d3a6f5a3073988ac050c2d7b6655e2 | Bin 34 -> 0 bytes .../11/f4f3c08b737f5fd896cbefa1425ee63b21b2fa | 1 - .../13/d1be4ea52a6ced1d7a1d832f0ee3c399348e5e | Bin 168 -> 0 bytes .../14/39088f509b79b1535b64193137d3ce4b240734 | Bin 58 -> 0 bytes .../15/8dc7bedb202f5b26502bf3574faa7f4238d56c | 2 - .../16/f825815cfd20a07a75c71554e82d8eede0b061 | 1 - .../17/8940b450f238a56c0d75b7955cb57b38191982 | Bin 65 -> 0 bytes .../18/3310e30fb1499af8c619108ffea4d300b5e778 | Bin 170 -> 0 bytes .../18/cb316b1cefa0f8a6946f0e201a8e1a6f845ab9 | Bin 68 -> 0 bytes .../19/b7ac485269b672a101060894de3ba9c2a24dd1 | Bin 53 -> 0 bytes .../1a/010b1c0f081b2e8901d55307a15c29ff30af0e | Bin 19 -> 0 bytes .../1c/51d885170f57a0c4e8c69ff6363d91a5b51f85 | Bin 30 -> 0 bytes .../1c/ff9ec6a47a537380dedfdd17c9e76d74259a2b | Bin 33 -> 0 bytes .../1e/4ff029aee68d0d69ef9eb6efa6cbf1ec732f99 | Bin 29 -> 0 bytes .../1f/81433e3161efbf250576c58fede7f6b836f3d3 | Bin 262 -> 0 bytes .../20/91d94c8bd3eb0835dc5220de5e8bb310fa1513 | Bin 271 -> 0 bytes .../21/671e290278286fb2ce4c63d01699b67adce331 | Bin 79 -> 0 bytes .../22/7792b52aaa0b238bea00ec7e509b02623f168c | Bin 102 -> 0 bytes .../23/3c0919c998ed110a4b6ff36f353aec8b713487 | Bin 43 -> 0 bytes .../23/92a2dacc9efb562b8635d6579fb458751c7c5b | Bin 142 -> 0 bytes .../23/ed141a6ae1e798b2f721afedbe947c119111ba | Bin 30 -> 0 bytes .../24/1a1005cd9b980732741b74385b891142bcba28 | Bin 67 -> 0 bytes .../24/2591eb280ee9eeb2ce63524b9a8b9bc4cb515d | Bin 30 -> 0 bytes .../24/90b9f1a079420870027deefb49f51d6656cf74 | Bin 268 -> 0 bytes .../25/9d08ca43af9200e9ea9a098e44a5a350ebd9b3 | Bin 381 -> 0 bytes .../25/c40b7660c08c8fb581f770312f41b9b03119d1 | Bin 31 -> 0 bytes .../26/153a3ff3649b6c2bb652d3f06878c6e0a172f9 | Bin 48 -> 0 bytes .../27/133da702ba3c60af2a01e96c2555ff4045d692 | Bin 32 -> 0 bytes .../27/4bbe983022fb4c02f8a2bf2ebe8da4fe130054 | Bin 24 -> 0 bytes .../2b/0de5dc27505dcdd83a75c8bf1fcd9462cd7add | Bin 147 -> 0 bytes .../2b/5f1f181ee3b58ea751f5dd5d8f9b445520a136 | Bin 53 -> 0 bytes .../2b/d0a343aeef7a2cf0d158478966a6e587ff3863 | Bin 56 -> 0 bytes .../2b/fdd7e1b6c6ae993f23dfe8e84a8e06a772fa2a | Bin 231 -> 0 bytes .../2d/a538570bc1e5b2c3e855bf702f35248ad0735f | 2 - .../2f/2e37b7ebbae467978610896ca3aafcdad2ee67 | Bin 52 -> 0 bytes .../2f/4024ce528d36d8670c289cce5a7963e625bb0c | Bin 179 -> 0 bytes .../2f/56120107d680129a5d9791b521cb1e73a2ed31 | 3 - .../2f/598248eeccfc27e5ca44d9d96383f6dfea7b16 | 1 - .../31/68dca1a561889b045a6441909f4c56145e666d | 2 - .../31/d5472536041a83d986829240bbbdc897c6f8a6 | Bin 41 -> 0 bytes .../32/21dd512b7e2dc4b5bd03046df6c81b2ab2070b | Bin 47 -> 0 bytes .../33/46d64325b39e5323733492cd55f808994a2475 | Bin 33 -> 0 bytes .../33/d500f588fbbe65901d82b4e6b008e549064be0 | 2 - .../34/8dcd41e2b467991578e92bedd16971b877ef1e | Bin 51 -> 0 bytes .../34/bfafff88eaf118402b44e6f3e2dbbf1a582b05 | 1 - .../35/0c6eb3010efc403a6bed682332635314e9ed58 | Bin 92 -> 0 bytes .../35/411bfb77cd2cc431f3a03a2b4976ed94b5d241 | Bin 31 -> 0 bytes .../35/4704d3613ad4228e4786fc76656b11e98236c4 | Bin 41 -> 0 bytes .../35/632e43612c06a3ea924bfbacd48333da874c29 | 1 - .../35/75826c96a975031d2c14368529cc5c4353a8fd | Bin 163 -> 0 bytes .../36/219b49367146cb2e6a1555b5a9ebd4d0328495 | Bin 68 -> 0 bytes .../36/4bbe4ce80c7bd31e6307dce77d46e3e1759fb3 | Bin 35 -> 0 bytes .../37/48859b001c6e627e712a07951aee40afd19b41 | Bin 41 -> 0 bytes .../38/5c8a0f26ddf79e9041e15e17dc352ed2c4cced | 2 - .../3b/47b031b3e55ae11e14a05260b1c3ffd6838d55 | Bin 161 -> 0 bytes .../3b/bf0bf59b20df5d5fc58b9fc1dc07be637c301f | Bin 269 -> 0 bytes .../3e/f4d30382ca33fdeba9fda895a99e0891ba37aa | Bin 36 -> 0 bytes .../3e/f9bfe82f9635518ae89152322f3b46fd4ba25b | Bin 172 -> 0 bytes .../40/2784a46a4a3982294231594cbeb431f506d22c | Bin 83 -> 0 bytes .../41/2b32fb66137366147f1801ecc962452757d48a | 2 - .../42/18670ab81cc219a9f94befb5c5dad90ec52648 | Bin 47 -> 0 bytes .../43/aafd43bea779ec74317dc361f45ae3f532a505 | Bin 37 -> 0 bytes .../43/c338656342227a3a3cd3aa85cbf784061f5425 | Bin 266 -> 0 bytes .../45/299c1ca5e07bba1fd90843056fb559f96b1f5a | Bin 58 -> 0 bytes .../46/6daf8552b891e5c22bc58c9d7fc1a2eb8f0289 | Bin 382 -> 0 bytes .../47/6dbb3e207313d1d8aaa120c6ad204bf1295e53 | Bin 522 -> 0 bytes .../47/8172cb2f5ff9b514bc9d04d3bd5ef5840cb3b2 | Bin 165 -> 0 bytes .../49/130a28ef567af9a6a6104c38773fedfa5f9742 | Bin 37 -> 0 bytes .../49/9df817155e4bdd3c6ee192a72c52f481818230 | Bin 35 -> 0 bytes .../49/fd9edac79d15c8fbfca2d481cbb900beba22a6 | 3 - .../4a/9550ebcc97ce22b22f45af7b829bb030d003f5 | Bin 53 -> 0 bytes .../4b/253da36a0ae8bfce63aeabd8c5b58429925594 | 2 - .../4b/48deed3a433909bfd6b6ab3d4b91348b6af464 | Bin 24 -> 0 bytes .../4b/825dc642cb6eb9a060e54bf8d69288fbee4904 | Bin 15 -> 0 bytes .../4c/9fac0707f8d4195037ae5a681aa48626491541 | Bin 167 -> 0 bytes .../4c/a408a8c88655f7586a1b580be6fad138121e98 | Bin 159 -> 0 bytes .../4e/0d9401aee78eb345a8685a859d37c8c3c0bbed | Bin 262 -> 0 bytes .../4e/886e602529caa9ab11d71f86634bd1b6e0de10 | Bin 56 -> 0 bytes .../4e/b04c9e79e88f6640d01ff5b25ca2a60764f216 | Bin 34 -> 0 bytes .../4f/e93c0ec83eb6305cbace3dace88ecee1b63cb6 | Bin 161 -> 0 bytes .../50/12fd565b1393bdfda1805d4ec38ce6619e1fd1 | Bin 29 -> 0 bytes .../50/4f75ac95a71ef98051817618576a68505b92f9 | Bin 93 -> 0 bytes .../50/84fc2a88b6bdba8db93bd3953a8f4fdb470238 | Bin 53 -> 0 bytes .../50/ce7d7d01217679e26c55939eef119e0c93e272 | Bin 159 -> 0 bytes .../51/95a1b480f66691b667f10a9e41e70115a78351 | Bin 170 -> 0 bytes .../52/d8bc572af2b6d4ee0d5e62ed5d1fbad92210a9 | 3 - .../53/825f41ac8d640612f9423a2f03a69f3d96809a | Bin 164 -> 0 bytes .../54/269b3f6ec3d7d4ede24dd350dd5d605495c3ae | 2 - .../54/59c89aa0026d543ce8343bd89871bce543f9c2 | 3 - .../54/7607c690372fe81fab8e3bb44c530e129118fd | Bin 58 -> 0 bytes .../55/b4e4687e7a0d9ca367016ed930f385d4022e6f | 1 - .../56/6ab53c220a2eafc1212af1a024513230280ab9 | 3 - .../56/a638b76b75e068590ac999c2f8621e7f3e264c | 1 - .../57/079a46233ae2b6df62e9ade71c4948512abefb | Bin 168 -> 0 bytes .../58/43febcb23480df0b5edb22a21c59c772bb8e29 | Bin 71 -> 0 bytes .../58/87a5e516c53bd58efb0f02ec6aa031b6fe9ad7 | Bin 47 -> 0 bytes .../58/e853f66699fd02629fd50bde08082bc005933a | Bin 160 -> 0 bytes .../59/6803b523203a4851c824c07366906f8353f4ad | Bin 163 -> 0 bytes .../5c/2411f8075f48a6b2fdb85ebc0d371747c4df15 | Bin 37 -> 0 bytes .../5c/341ead2ba6f2af98ce5ec3fe84f6b6d2899c0d | Bin 37 -> 0 bytes .../5c/3b68a71fc4fa5d362fd3875e53137c6a5ab7a5 | Bin 40 -> 0 bytes .../5d/c1018e90b19654bee986b7a0c268804d39659d | Bin 168 -> 0 bytes .../5d/dd0fe66f990dc0e5cf9fec6d9b465240e9537f | Bin 43 -> 0 bytes .../5e/b7bb6a146eb3c7fd3990b240a2308eceb1cf8d | Bin 268 -> 0 bytes .../5f/bfbdc04b4eca46f54f4853a3c5a1dce28f5165 | Bin 283 -> 0 bytes .../60/61fe116ecba0800c26113ea1a7dfac2e16eeaf | Bin 87 -> 0 bytes .../60/91fc2c036a382a69489e3f518ee5aae9a4e567 | Bin 258 -> 0 bytes .../61/340eeed7340fa6a8792def9a5938bb5d4434bb | Bin 92 -> 0 bytes .../61/78885b38fe96e825ac0f492c0a941f288b37f6 | Bin 289 -> 0 bytes .../62/12c31dab5e482247d7977e4f0dd3601decf13b | Bin 45 -> 0 bytes .../62/269111c3b02a9355badcb9da8678b1bf41787b | Bin 269 -> 0 bytes .../62/33c6a0670228627f93c01cef32485a30403670 | Bin 44 -> 0 bytes .../62/c4f6533c9a3894191fdcb96a3be935ade63f1a | Bin 53 -> 0 bytes .../63/247125386de9ec90a27ad36169307bf8a11a38 | 1 - .../67/110d77886b2af6309b9212961e72b8583e5fa9 | 1 - .../67/18a45909532d1fcf5600d0877f7fe7e78f0b86 | 1 - .../68/c6c84b091926c7d90aa6a79b2bc3bb6adccd8e | Bin 55 -> 0 bytes .../69/f570c57b24ea7c086e94c5e574964798321435 | Bin 266 -> 0 bytes .../6a/e1a3967031a42cf955d9d5c2395211ac82f6cf | Bin 272 -> 0 bytes .../6b/7e37be8ce0b897093f2878a9dcd8f396beda2c | Bin 53 -> 0 bytes .../6c/06dcd163587c2cc18be44857e0b71116382aeb | Bin 30 -> 0 bytes .../6e/3b9eb35214d4e31ed5789afc7d520ac798ce55 | Bin 51 -> 0 bytes .../6f/32739c3724d1d5f855299309f388606f407468 | Bin 630 -> 0 bytes .../6f/a33014764bf1120a454eb8437ae098238e409b | Bin 168 -> 0 bytes .../6f/be9fb85c86d7d1435f728da418bdff52c640a9 | Bin 83 -> 0 bytes .../71/17467b18605a660ebe5586df69e2311ed5609f | Bin 265 -> 0 bytes .../71/2ebba6669ea847d9829e4f1059d6c830c8b531 | Bin 152 -> 0 bytes .../71/add2d7b93d55bf3600f8a1582beceebbd050c8 | Bin 264 -> 0 bytes .../72/cdb057b340205164478565e91eb71647e66891 | Bin 65 -> 0 bytes .../72/ea499e108df5ff0a4a913e7655bbeeb1fb69f2 | Bin 26 -> 0 bytes .../74/df13f0793afdaa972150bba976f7de8284914e | Bin 26 -> 0 bytes .../75/a811bf6bc57694adb3fe604786f3a4efd1cd1b | 2 - .../76/63fce0130db092936b137cabd693ec234eb060 | Bin 49 -> 0 bytes .../76/ab0e2868197ec158ddd6c78d8a0d2fd73d38f9 | Bin 37 -> 0 bytes .../7a/a3edf2bcfee22398e6b55295aa56366b7aaf76 | Bin 271 -> 0 bytes .../7a/f14d9c679baaef35555095f4f5d33e9a569ab9 | Bin 149 -> 0 bytes .../7c/04ca611203ed320c5f495b9813054dd23be3be | 2 - .../7c/2c5228c9e90170d4a35e6558e47163daf092e5 | Bin 172 -> 0 bytes .../7c/b63eed597130ba4abb87b3e544b85021905520 | 3 - .../7e/2d058d5fedf8329db44db4fac610d6b1a89159 | Bin 165 -> 0 bytes .../7f/7a2da58126226986d71c6ddfab4afba693280d | Bin 199 -> 0 bytes .../80/a8fbb3abb1ba423d554e9630b8fc2e5698f86b | Bin 168 -> 0 bytes .../81/1c70fcb6d5bbd022d04cc31836d30b436f9551 | Bin 169 -> 0 bytes .../81/87117062b750eed4f93fd7e899f17b52ce554d | Bin 170 -> 0 bytes .../83/07d93a155903a5c49576583f0ce1f6ff897c0e | Bin 30 -> 0 bytes .../83/6b8b82b26cab22eaaed8820877c76d6c8bca19 | Bin 30 -> 0 bytes .../83/824a8c6658768e2013905219cc8c64cc3d9a2e | Bin 382 -> 0 bytes .../84/9619b03ae540acee4d1edec96b86993da6b497 | 3 - .../84/de84f8f3a6d63e636ee9ad81f4b80512fa9bbe | Bin 41 -> 0 bytes .../86/088dae8bade454995b21a1c88107b0e1accdab | Bin 47 -> 0 bytes .../87/b4926260d77a3b851e71ecce06839bd650b231 | Bin 43 -> 0 bytes .../88/e185910a15cd13bdf44854ad037f4842b03b29 | Bin 177 -> 0 bytes .../8a/ad9d0ea334951da47b621a475b39cc6ed759bf | Bin 51 -> 0 bytes .../8a/ae714f7d939309d7f132b30646d96743134a9f | 1 - .../8b/095d8fd01594f4d14454d073e3ac57b9ce485f | Bin 201 -> 0 bytes .../8b/5b53cb2aa9ceb1139f5312fcfa3cc3c5a47c9a | 1 - .../8b/7cd60d49ce3a1a770ece43b7d29b5cf462a33a | Bin 82 -> 0 bytes .../8b/fb012a6d809e499bd8d3e194a3929bc8995b93 | Bin 34 -> 0 bytes .../8c/749d9968d4b10dcfb06c9f97d0e5d92d337071 | 2 - .../8f/4433f8593ddd65b7dd43dd4564d841f4d9c8aa | Bin 164 -> 0 bytes .../90/a336c7dacbe295159413559b0043b8bdc60d57 | Bin 271 -> 0 bytes .../91/2b2d7819cf9c1029e414883857ed61d597a1a5 | Bin 295 -> 0 bytes .../91/8bb3e09090a9995d48af9a2a6296d7e6088d1c | Bin 38 -> 0 bytes .../91/f44111cb1cb1358ac6944ad356ca1738813ea1 | Bin 149 -> 0 bytes .../92/7d4943cdbdc9a667db8e62cfd0a41870235c51 | Bin 535 -> 0 bytes .../93/77fccdb210540b8c0520cc6e80eb632c20bd25 | Bin 53 -> 0 bytes .../94/4f5dd1a867cab4c2bbcb896493435cae1dcc1a | 2 - .../94/8ba6e701c1edab0c2d394fb7c5538334129793 | Bin 71 -> 0 bytes .../95/646149ab6b6ba6edc83cff678582538b457b2b | 3 - .../95/9de65e568274120fdf9e3af9f77b1550122149 | Bin 40 -> 0 bytes .../96/8ca794a4597f7f6abbb2b8d940b4078a0f3fd4 | Bin 53 -> 0 bytes .../96/bca8d4f05cc4c5e33e4389f80a1309e86fe054 | Bin 149 -> 0 bytes .../97/7c696519c5a3004c5f1d15d60c89dbeb8f235f | Bin 160 -> 0 bytes .../98/ba4205fcf31f5dd93c916d35fe3f3b3d0e6714 | 1 - .../98/d52d07c0b0bbf2b46548f6aa521295c2cb55db | 3 - .../99/b4f7e4f24470fa06b980bc21f1095c2a9425c0 | Bin 164 -> 0 bytes .../9a/301fbe6fada7dcb74fcd7c20269b5c743459a7 | Bin 163 -> 0 bytes .../9a/f731fa116d1eb9a6c0109562472cfee6f5a979 | Bin 48 -> 0 bytes .../9c/0b6c34ef379a42d858f03fef38630f476b9102 | Bin 38 -> 0 bytes .../9e/7f4359c469f309b6057febf4c6e80742cbed5b | Bin 539 -> 0 bytes .../9e/fe7723802d4305142eee177e018fee1572c4f4 | Bin 36 -> 0 bytes .../9f/74397a3397b3585faf09e9926b110d7f654254 | Bin 621 -> 0 bytes .../a0/31a28ae70e33a641ce4b8a8f6317f1ab79dee4 | Bin 37 -> 0 bytes .../a3/9a620dae5bc8b4e771cd4d251b7d080401a21e | Bin 29 -> 0 bytes .../a3/fabece9eb8748da810e1e08266fef9b7136ad4 | Bin 164 -> 0 bytes .../a4/1b1bb6d0be3c22fb654234c33b428e15c8cc27 | Bin 92 -> 0 bytes .../a4/3150a738849c59376cf30bb2a68348a83c8f48 | Bin 162 -> 0 bytes .../a5/563304ddf6caba25cb50323a2ea6f7dbfcadca | Bin 48 -> 0 bytes .../a7/08b253bd507417ec42d1467a7fd2d7519c4956 | Bin 40 -> 0 bytes .../a7/65fb87eb2f7a1920b73b2d5a057f8f8476a42b | Bin 170 -> 0 bytes .../a7/7a56a49f8f3ae242e02717f18ebbc60c5cc543 | Bin 65 -> 0 bytes .../a7/dbfcbfc1a60709cb80b5ca24539008456531d0 | 1 - .../a8/02e06f1782a9645b9851bc7202cee74a8a4972 | Bin 172 -> 0 bytes .../a8/87dd39ad3edd610fc9083dcb61e40ab50673d1 | 1 - .../a9/0bc3fb6f15181972a2959a921429efbd81a473 | 2 - .../ab/40af3cb8a3ed2e2843e96d9aa7871336b94573 | Bin 161 -> 0 bytes .../ab/6c44a2e84492ad4b41bb6bac87353e9d02ac8b | Bin 33 -> 0 bytes .../ab/929391ac42572f92110f3deeb4f0844a951e22 | Bin 40 -> 0 bytes .../ac/4045f965119e6998f4340ed0f411decfb3ec05 | Bin 29 -> 0 bytes .../ad/01aebfdf2ac13145efafe3f9fcf798882f1730 | Bin 158 -> 0 bytes .../ad/26b598134264fd284292cb233fc0b2f25851da | Bin 43 -> 0 bytes .../ad/a14492498136771f69dd451866cabcb0e9ef9a | Bin 39 -> 0 bytes .../ad/a55a45d14527dc3dfc714ea1c65d2e1e6fbe87 | 1 - .../b2/d399ae15224e1d58066e3c8df70ce37de7a656 | 2 - .../b4/2712cfe99a1a500b2a51fe984e0b8a7702ba11 | 5 - .../b6/9fe837e4cecfd4c9a40cdca7c138468687df07 | 2 - .../b6/f610aef53bd343e6c96227de874c66f00ee8e8 | Bin 162 -> 0 bytes .../b7/a2576f9fc20024ac9ef17cb134acbd1ac73127 | Bin 320 -> 0 bytes .../b8/a3a806d3950e8c0a03a34f234a92eff0e2c68d | Bin 286 -> 0 bytes .../ba/cac9b3493509aa15e1730e1545fc0919d1dae0 | Bin 29 -> 0 bytes .../bc/744705e1d8a019993cf88f62bc4020f1b80919 | 2 - .../bc/95c75d59386147d1e79a87c33068d8dbfd71f2 | Bin 348 -> 0 bytes .../bd/593285fc7fe4ca18ccdbabf027f5d689101452 | Bin 159 -> 0 bytes .../bd/867fbae2faa80b920b002b80b1c91bcade7784 | Bin 48 -> 0 bytes .../bd/9cb4cd0a770cb9adcb5fce212142ef40ea1c35 | Bin 51 -> 0 bytes .../be/f6e37b3ee632ba74159168836f382fed21d77d | 2 - .../c0/6a9be584ac49aa02c5551312d9e2982c91df10 | Bin 348 -> 0 bytes .../c1/b17981db0840109a820dae8674ee29684134ff | Bin 348 -> 0 bytes .../c1/b6a51bbb87c2f82b161412c3d20b59fc69b090 | Bin 47 -> 0 bytes .../c3/5dee9bcc0e989f3b0c40f68372a9a51b6c4e6a | Bin 162 -> 0 bytes .../c3/d02eeef75183df7584d8d13ac03053910c1301 | Bin 67 -> 0 bytes .../c4/efe31e9decccc8b2b4d3df9aac2cdfe2995618 | Bin 538 -> 0 bytes .../c5/0d0f1cb60b8b0fe1615ad20ace557e9d68d7bd | 1 - .../c5/bbe550b9f09444bdddd3ecf3d97c0b42aa786c | Bin 269 -> 0 bytes .../c6/07fc30883e335def28cd686b51f6cfa02b06ec | 2 - .../c6/92ecf62007c0ac9fb26e2aa884de2933de15ed | Bin 40 -> 0 bytes .../c8/f06f2e3bb2964174677e91f0abead0e43c9e5d | Bin 45 -> 0 bytes .../c9/174cef549ec94ecbc43ef03cdc775b4950becb | 2 - .../c9/4b27e41064c521120627e07e2035cca1d24ffa | Bin 162 -> 0 bytes .../ca/b2cf23998b40f1af2d9d9a756dc9e285a8df4b | Bin 40 -> 0 bytes .../ca/ff6b7d44973f53e3e0cf31d0d695188b19aec6 | Bin 54 -> 0 bytes .../cb/491780d82e46dc88a065b965ab307a038f2bc2 | Bin 163 -> 0 bytes .../cb/6693a788715b82440a54e0eacd19ba9f6ec559 | Bin 41 -> 0 bytes .../cc/338e4710c9b257106b8d16d82f86458d5beaf1 | 2 - .../cc/3e3009134cb88014129fc8858d1101359e5e2f | 2 - .../ce/8860d49e3bea6fd745874a01b7c3e46da8cbc3 | Bin 48 -> 0 bytes .../ce/e656c392ad0557b3aae0fb411475c206e2926f | Bin 32 -> 0 bytes .../cf/8c5cc8a85a1ff5a4ba51e0bc7cf5665669924d | Bin 29 -> 0 bytes .../d0/7ec190c306ec690bac349e87d01c4358e49bb2 | 2 - .../d0/d4594e16f2e19107e3fa7ea63e7aaaff305ffb | Bin 51 -> 0 bytes .../d2/f8637f2eab2507a1e13cbc9df4729ec386627e | Bin 268 -> 0 bytes .../d3/3cedf513c059e0515653fa2c2e386631387a05 | Bin 46 -> 0 bytes .../d3/719a5ae8e4d92276b5313ce976f6ee5af2b436 | 2 - .../d3/7aa3bbfe1c0c49b909781251b956dbabe85f96 | Bin 80 -> 0 bytes .../d3/7ad72a2052685fc6201c2af90103ad42d2079b | Bin 233 -> 0 bytes .../d4/207f77243500bec335ab477f9227fcdb1e271a | 2 - .../d4/27e0b2e138501a3d15cc376077a3631e15bd46 | Bin 38 -> 0 bytes .../d5/093787ef302b941b6aab081b99fb4880038bd8 | Bin 30 -> 0 bytes .../d5/a61b0b4992a4f0caa887fa08b52431e727bb6f | Bin 81 -> 0 bytes .../d5/b6fc965c926a1bfc9ee456042b94088b5c5d21 | Bin 319 -> 0 bytes .../d5/ec1152fe25e9fec00189eb00b3db71db24c218 | Bin 24 -> 0 bytes .../d6/42b9770c66bba94a08df09b5efb095001f76d7 | Bin 539 -> 0 bytes .../d6/462fa3f5292857db599c54aea2bf91616230c5 | Bin 48 -> 0 bytes .../d6/cf6c7741b3316826af1314042550c97ded1d50 | 2 - .../d7/308cc367b2cc23f710834ec1fd8ffbacf1b460 | 1 - .../d8/74671ef5b20184836cb983bb273e5280384d0b | Bin 162 -> 0 bytes .../d8/dec75ff2f8b41d1c5bfef0cd57b7300c834f66 | Bin 164 -> 0 bytes .../d8/fa77b6833082c1ea36b7828a582d4c43882450 | 1 - .../d9/63979c237d08b6ba39062ee7bf64c7d34a27f8 | Bin 48 -> 0 bytes .../da/178208145ef585a1bd5ca5f4c9785d738df2cf | Bin 41 -> 0 bytes .../db/6261a7c65c7fd678520c9bb6f2c47582ab9ed5 | Bin 624 -> 0 bytes .../dd/2ae5ab264e5592aa754235d5ad5eac8f0ecdfd | Bin 149 -> 0 bytes .../dd/9a570c3400e6e07bc4d7651d6e20b08926b3d9 | Bin 36 -> 0 bytes .../de/872ee3618b894992e9d1e18ba2ebe256a112f9 | 1 - .../df/e3f22baa1f6fce5447901c3086bae368de6bdd | Bin 40 -> 0 bytes .../e0/67f9361140f19391472df8a82d6610813c73b7 | Bin 53 -> 0 bytes .../e1/129b3cfb5898e0fbd606e0cb80b2755e50d161 | Bin 92 -> 0 bytes .../e1/7ace1492648c9dc5701bad5c47af9d1b60c4e9 | Bin 264 -> 0 bytes .../e2/c6abbd55fed5ac71a5f2751e29b4a34726a595 | 1 - .../e3/1e7ad3ed298f24e383c4950f4671993ec078e4 | Bin 210 -> 0 bytes .../e3/76fbdd06ebf021c92724da9f26f44212734e3e | 3 - .../e4/9f917b448d1340b31d76e54ba388268fd4c922 | Bin 36 -> 0 bytes .../e4/f618a2c3ed0669308735727df5ebf2447f022f | 2 - .../e5/060729746ca9888239cba08fdcf4bee907b406 | Bin 24 -> 0 bytes .../e6/5a9bb2af9f4c2d1c375dd0f8f8a46cf9c68812 | Bin 160 -> 0 bytes .../e8/107f24196736b870a318a0e28f048e29f6feff | 3 - .../e9/2cdb7017dc6c5aed25cb4202c5b0104b872246 | Bin 48 -> 0 bytes .../e9/ad6ec3e38364a3d07feda7c4197d4d845c53b5 | Bin 36 -> 0 bytes .../e9/f48beccc62d535739bfbdebe0a55ed716d8366 | Bin 382 -> 0 bytes .../eb/c09d0137cfb0c26697aed0109fb943ad906f3f | Bin 166 -> 0 bytes .../ec/67e5a86adff465359f1c8f995e12dbdfa08d8a | Bin 166 -> 0 bytes .../ed/9523e62e453e50dd9be1606af19399b96e397a | Bin 87 -> 0 bytes .../ee/1d6f164893c1866a323f072eeed36b855656be | Bin 291 -> 0 bytes .../ee/3fa1b8c00aff7fe02065fdb50864bb0d932ccf | Bin 64 -> 0 bytes .../ee/a9286df54245fea72c5b557291470eb825f38f | Bin 235 -> 0 bytes .../ef/58fdd8086c243bdc81f99e379acacfd21d32d6 | 2 - .../ef/c499524cf105d5264ac7fc54e07e95764e8075 | Bin 32 -> 0 bytes .../ef/c9121fdedaf08ba180b53ebfbcf71bd488ed09 | Bin 160 -> 0 bytes .../f0/053b8060bb3f0be5cbcc3147a07ece26bf097e | Bin 163 -> 0 bytes .../f0/ce2b8e4986084d9b308fb72709e414c23eb5e6 | Bin 125 -> 0 bytes .../f2/0c9063fa0bda9a397c96947a7b687305c49753 | Bin 29 -> 0 bytes .../f2/9e7fb590551095230c6149cbe72f2e9104a796 | Bin 41 -> 0 bytes .../f2/e1550a0c9e53d5811175864a29536642ae3821 | Bin 73 -> 0 bytes .../f3/293571dcd708b6a3faf03818cd2844d000e198 | 1 - .../f3/f1164b68b57b1995b658a828320e6df3081fae | Bin 310 -> 0 bytes .../f4/15caf3fcad16304cb424b67f0ee6b12dc03aae | Bin 320 -> 0 bytes .../f4/8097eb340dc5a7cae55aabcf1faf4548aa821f | Bin 165 -> 0 bytes .../f5/504f36e6f4eb797a56fc5bac6c6c7f32969bf2 | Bin 42 -> 0 bytes .../f5/b50c85a87cac64d7eb3254cdd1aec9564c0293 | Bin 35 -> 0 bytes .../f5/f9dd5886a6ee20272be0aafc790cba43b31931 | Bin 244 -> 0 bytes .../f6/65b45cde9b568009c6e6b7b568e89cfe717df8 | Bin 132 -> 0 bytes .../f6/be049e284c0f9dcbbc745543885be3502ea521 | Bin 265 -> 0 bytes .../f7/c332bd4d4d4b777366cae4d24d1687477576bf | Bin 156 -> 0 bytes .../f8/958bdf4d365a84a9a178b1f5f35ff1dacbd884 | 2 - .../fa/c03f2c5139618d87d53614c153823bf1f31396 | Bin 76 -> 0 bytes .../fa/da9356aa3f74622327a3038ae9c6f92e1c5c1d | Bin 168 -> 0 bytes .../fb/738a106cfd097a4acb96ce132ecb1ad6c46b03 | Bin 264 -> 0 bytes .../fc/4c636d6515e9e261f9260dbcf3cc6eca97ea08 | Bin 29 -> 0 bytes .../fc/7d7b805f7a9428574f4f802b2e34cd20ab9d99 | Bin 575 -> 0 bytes .../fc/90237dc4891fa6c69827fc465632225e391618 | Bin 163 -> 0 bytes .../fd/57d2d6770fad8e9959124793a17f441b571e66 | Bin 279 -> 0 bytes .../fd/89f8cffb663ac89095a0f9764902e93ceaca6a | 2 - .../fe/5407fc50a53aecb41d1a6e9ea7b612e581af87 | Bin 48 -> 0 bytes .../ff/49d07869831ad761bbdaea026086f8789bcb00 | Bin 24 -> 0 bytes .../ff/b312248d607284c290023f9502eea010d34efd | Bin 68 -> 0 bytes .../merge-resolve/.gitted/refs/heads/branch | 1 - .../.gitted/refs/heads/df_ancestor | 1 - .../merge-resolve/.gitted/refs/heads/df_side1 | 1 - .../merge-resolve/.gitted/refs/heads/df_side2 | 1 - .../.gitted/refs/heads/ff_branch | 1 - .../merge-resolve/.gitted/refs/heads/master | 1 - .../merge-resolve/.gitted/refs/heads/octo1 | 1 - .../merge-resolve/.gitted/refs/heads/octo2 | 1 - .../merge-resolve/.gitted/refs/heads/octo3 | 1 - .../merge-resolve/.gitted/refs/heads/octo4 | 1 - .../merge-resolve/.gitted/refs/heads/octo5 | 1 - .../merge-resolve/.gitted/refs/heads/octo6 | 1 - .../merge-resolve/.gitted/refs/heads/previous | 1 - .../refs/heads/rename_conflict_ancestor | 1 - .../.gitted/refs/heads/rename_conflict_ours | 1 - .../.gitted/refs/heads/rename_conflict_theirs | 1 - .../merge-resolve/.gitted/refs/heads/renames1 | 1 - .../merge-resolve/.gitted/refs/heads/renames2 | 1 - .../.gitted/refs/heads/submodules | 1 - .../.gitted/refs/heads/submodules-branch | 1 - .../.gitted/refs/heads/submodules-branch2 | 1 - .../.gitted/refs/heads/trivial-10 | 1 - .../.gitted/refs/heads/trivial-10-branch | 1 - .../.gitted/refs/heads/trivial-11 | 1 - .../.gitted/refs/heads/trivial-11-branch | 1 - .../.gitted/refs/heads/trivial-13 | 1 - .../.gitted/refs/heads/trivial-13-branch | 1 - .../.gitted/refs/heads/trivial-14 | 1 - .../.gitted/refs/heads/trivial-14-branch | 1 - .../.gitted/refs/heads/trivial-2alt | 1 - .../.gitted/refs/heads/trivial-2alt-branch | 1 - .../.gitted/refs/heads/trivial-3alt | 1 - .../.gitted/refs/heads/trivial-3alt-branch | 1 - .../.gitted/refs/heads/trivial-4 | 1 - .../.gitted/refs/heads/trivial-4-branch | 1 - .../.gitted/refs/heads/trivial-5alt-1 | 1 - .../.gitted/refs/heads/trivial-5alt-1-branch | 1 - .../.gitted/refs/heads/trivial-5alt-2 | 1 - .../.gitted/refs/heads/trivial-5alt-2-branch | 1 - .../.gitted/refs/heads/trivial-6 | 1 - .../.gitted/refs/heads/trivial-6-branch | 1 - .../.gitted/refs/heads/trivial-7 | 1 - .../.gitted/refs/heads/trivial-7-branch | 1 - .../.gitted/refs/heads/trivial-8 | 1 - .../.gitted/refs/heads/trivial-8-branch | 1 - .../.gitted/refs/heads/trivial-9 | 1 - .../.gitted/refs/heads/trivial-9-branch | 1 - .../.gitted/refs/heads/unrelated | 1 - .../merge-resolve/added-in-master.txt | 1 - .../resources/merge-resolve/automergeable.txt | 9 - .../merge-resolve/changed-in-branch.txt | 1 - .../merge-resolve/changed-in-master.txt | 1 - .../resources/merge-resolve/conflicting.txt | 1 - .../merge-resolve/removed-in-branch.txt | 1 - .../resources/merge-resolve/unchanged.txt | 1 - .../resources/merge-whitespace/.gitted/HEAD | 1 - .../resources/merge-whitespace/.gitted/config | 7 - .../resources/merge-whitespace/.gitted/index | Bin 137 -> 0 bytes .../01/bd650462136a4f0a266dfc91ab93b3fef0f7cb | Bin 49 -> 0 bytes .../08/3f868fb4324e32a4999173b2437b31d7a1ef25 | Bin 53 -> 0 bytes .../0a/a2acaa63cacc7a99fab0c2ce3d56572911df19 | 1 - .../11/89e10a62aadf2fea8cd018afb52c1980f40b4f | Bin 183 -> 0 bytes .../24/2c8f6cf388e96e2c12b6e49cb7ae60167cba1e | Bin 50 -> 0 bytes .../25/246acb001858ffeffb03ea399fd2c0a163b832 | Bin 53 -> 0 bytes .../26/2f67de0de2e535a59ae1bc3c739601e98c354d | Bin 38 -> 0 bytes .../2f/6727d2e570bf962d9dd926423cf6fe5072071a | Bin 169 -> 0 bytes .../3c/43e7fc2a56fc825c31dfee65abd6dda8d16dca | Bin 52 -> 0 bytes .../40/26a6c83f39c56881c9ac62e7582db9e3d33a4f | Bin 40 -> 0 bytes .../42/dabb8d5dba2de103815a77e4369bb3966e64ef | Bin 138 -> 0 bytes .../43/9230587f2eb38e9540a5c99e9831f65641eab9 | Bin 214 -> 0 bytes .../43/ad73e75e15f03bb0b4398a48a57ecfc20788e2 | Bin 53 -> 0 bytes .../4b/825dc642cb6eb9a060e54bf8d69288fbee4904 | Bin 15 -> 0 bytes .../54/74989173042512ab630191ad71cdcedb646b9a | Bin 53 -> 0 bytes .../5e/fb9bc29c482e023e40e0a2b3b7e49cec842034 | Bin 53 -> 0 bytes .../70/d3d2e7d51a18fcc6f035a67e5c3f33069be04d | Bin 53 -> 0 bytes .../74/e83b6c5df14f1fba7c4ea1f99c6d007b591002 | Bin 43 -> 0 bytes .../77/f40c621ceae77ad8d756ef507bdbafe2713aa7 | Bin 53 -> 0 bytes .../9c/5362069759fb37ae036cef6e4b2f95c6c5eaab | Bin 184 -> 0 bytes .../a2/9e7dabd68dfb38a717e6b1648713cd5c7adee2 | Bin 53 -> 0 bytes .../a4/e6a86e07ef5afe036e26602fbbaa27496d00a9 | 2 - .../a8/27eab4fd66ab37a6ebcfaa7b7e341abfd55947 | Bin 51 -> 0 bytes .../a9/66acc271e50b5d4595911752a77def0a5e5d40 | Bin 132 -> 0 bytes .../b2/a69114f4897109fedf1aafea363cb2d2557029 | Bin 178 -> 0 bytes .../bc/83ac0422ba1082c80e406234910377984cfbb6 | Bin 137 -> 0 bytes .../bf/e4ea5805af22a5b194259bda6f5f634486f891 | 1 - .../c3/b1fb31424c98072542cc8e42b48c92e52f494a | Bin 39 -> 0 bytes .../c7/e2f386736445936f5ba181269a0e0967e280e8 | 2 - .../d9/5182053c31f8aa09df4fa225f4e668c5320b59 | 5 - .../e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 | Bin 15 -> 0 bytes .../ec/5a35c75b8d3ee29bed37996b14e909d04fdcee | Bin 52 -> 0 bytes .../ee/3c2aac8e03224c323b58ecb1f9eef616745467 | Bin 38 -> 0 bytes .../ef/e94a4bf4e697f7f0270f0d1b8a93af784a19d0 | Bin 72 -> 0 bytes .../f0/0c965d8307308469e537302baa73048488f162 | Bin 37 -> 0 bytes .../f1/90a0d111ca1688778657798743ddfb4ed4bd64 | 2 - .../f4/9b2c244e9d3b0647fdfb95954c38fbfeecf3ad | 2 - .../f8/7905f99f0e66d179a8379d8ca4d8cbbd32c231 | 1 - .../.gitted/refs/heads/branch_a_change | 1 - .../.gitted/refs/heads/branch_a_eol | 1 - .../.gitted/refs/heads/branch_b_change | 1 - .../.gitted/refs/heads/branch_b_eol | 1 - .../.gitted/refs/heads/master | 1 - .../tests/resources/merge-whitespace/test.txt | 11 - .../mergedrepo/.gitted/COMMIT_EDITMSG | 1 - .../tests/resources/mergedrepo/.gitted/HEAD | 1 - .../resources/mergedrepo/.gitted/MERGE_HEAD | 1 - .../resources/mergedrepo/.gitted/MERGE_MODE | 0 .../resources/mergedrepo/.gitted/MERGE_MSG | 5 - .../resources/mergedrepo/.gitted/ORIG_HEAD | 1 - .../tests/resources/mergedrepo/.gitted/config | 6 - .../resources/mergedrepo/.gitted/description | 1 - .../tests/resources/mergedrepo/.gitted/index | Bin 842 -> 0 bytes .../resources/mergedrepo/.gitted/info/exclude | 6 - .../resources/mergedrepo/.gitted/logs/HEAD | 5 - .../mergedrepo/.gitted/logs/refs/heads/branch | 2 - .../mergedrepo/.gitted/logs/refs/heads/master | 2 - .../03/db1d37504ca0c4f7c26d7776b0e28bdea08712 | Bin 141 -> 0 bytes .../17/0efc1023e0ed2390150bb4469c8456b63e8f91 | Bin 141 -> 0 bytes .../1f/85ca51b8e0aac893a621b61a9c2661d6aa6d81 | Bin 34 -> 0 bytes .../22/0bd62631c8cf7a83ef39c6b94595f00517211e | Bin 42 -> 0 bytes .../32/d55d59265db86dd690f0a7fc563db43e2bc6a6 | Bin 159 -> 0 bytes .../38/e2d82b9065a237904af4b780b4d68da6950534 | Bin 74 -> 0 bytes .../3a/34580a35add43a4cf361e8e9a30060a905c876 | 2 - .../44/58b8bc9e72b6c8755ae456f60e9844d0538d8c | Bin 39 -> 0 bytes .../47/8871385b9cd03908c5383acfd568bef023c6b3 | Bin 36 -> 0 bytes .../51/6bd85f78061e09ccc714561d7b504672cb52da | Bin 36 -> 0 bytes .../53/c1d95a01f4514b162066fc98564500c96c46ad | Bin 45 -> 0 bytes .../6a/ea5f295304c36144ad6e9247a291b7f8112399 | Bin 49 -> 0 bytes .../70/68e30a7f0090ae32db35dfa1e4189d8780fcb8 | Bin 85 -> 0 bytes .../75/938de1e367098b3e9a7b1ec3c4ac4548afffe4 | Bin 41 -> 0 bytes .../7b/26923aaf452b1977eb08617c59475fb3f74b71 | Bin 41 -> 0 bytes .../84/af62840be1b1c47b778a8a249f3ff45155038c | Bin 40 -> 0 bytes .../88/71f7a2ee3addfc4ba39fbd0783c8e738d04cda | Bin 66 -> 0 bytes .../88/7b153b165d32409c70163e0f734c090f12f673 | Bin 38 -> 0 bytes .../8a/ad34cc83733590e74b93d0f7cf00375e2a735a | Bin 78 -> 0 bytes .../8b/3f43d2402825c200f835ca1762413e386fd0b2 | Bin 57 -> 0 bytes .../8b/72416545c7e761b64cecad4f1686eae4078aa8 | Bin 38 -> 0 bytes .../8f/3c06cff9a83757cec40c80bc9bf31a2582bde9 | Bin 39 -> 0 bytes .../8f/fcc405925511824a2240a6d3686aa7f8c7ac50 | Bin 140 -> 0 bytes .../9a/05ccb4e0f948de03128e095f39dae6976751c5 | 1 - .../9d/81f82fccc7dcd7de7a1ffead1815294c2e092c | Bin 36 -> 0 bytes .../b7/cedb8ad4cbb22b6363f9578cbd749797f7ef0d | Bin 66 -> 0 bytes .../d0/1885ea594926eae9ba5b54ad76692af5969f51 | Bin 55 -> 0 bytes .../e2/809157a7766f272e4cfe26e61ef2678a5357ff | 3 - .../e6/2cac5c88b9928f2695b934c70efa4285324478 | Bin 87 -> 0 bytes .../f7/2784290c151092abf04ce6b875068547f70406 | Bin 141 -> 0 bytes .../mergedrepo/.gitted/refs/heads/branch | 1 - .../mergedrepo/.gitted/refs/heads/master | 1 - .../resources/mergedrepo/conflicts-one.txt | 5 - .../resources/mergedrepo/conflicts-two.txt | 5 - .../tests/resources/mergedrepo/one.txt | 10 - .../tests/resources/mergedrepo/two.txt | 12 - .../tests/resources/nasty/.gitted/HEAD | 1 - .../tests/resources/nasty/.gitted/index | Bin 120 -> 0 bytes .../02/28b21d477f67b9f7720565da9e760b84c8b85b | 3 - .../04/18f28a75dc0c4951c01842e0d794843a88178a | Bin 46 -> 0 bytes .../04/fab819d8388295cbe3496310e4e53ef8f4a115 | Bin 49 -> 0 bytes .../05/1229bf9d30ec923052ff42db8069ccdc17159d | Bin 53 -> 0 bytes .../09/9ed86cb8501ae483b1855c351fe1a506ac9631 | Bin 133 -> 0 bytes .../0a/78e40e54cc471c0415ca0680550f242e7843e2 | Bin 51 -> 0 bytes .../0b/8206dd72a3b3b932fb562f92d29199b9398390 | Bin 50 -> 0 bytes .../0d/45fb57852c2229346a800bd3fc58e32527a21c | Bin 45 -> 0 bytes .../10/cb44a89d1a9e8bf74de3f11a2a61ee833f13b1 | Bin 50 -> 0 bytes .../11/9f6cd3535de0e2a15654947a7b1a5affbf1406 | Bin 50 -> 0 bytes .../12/12c12915820e1ad523b6305c0dcdefea8b7e97 | 1 - .../13/e5f8be09e8b7db074fb39b96e08215cc4a36f1 | Bin 56 -> 0 bytes .../14/e70ab559b4c6a8a6fc9b6f538bd1f3934be725 | Bin 48 -> 0 bytes .../15/f7d9f9514eeb65b9588c49b10b1da145a729a2 | 2 - .../16/35c47d80914f0abfa43dd4234a948db5bdb107 | 2 - .../16/a701796bc3670e5c2fdaeccb7f1280c60b373f | Bin 62 -> 0 bytes .../19/1381ee74dec49c89f99a62d055cb1058ba0de9 | Bin 19 -> 0 bytes .../1e/3c845808fa5883aa4bcf2f882172edb72a7a32 | 2 - .../24/676d5e93f9fa7b568f38d7bce01772908e982b | Bin 47 -> 0 bytes .../26/b665c162f67acae67779445f3c7b9782b0a6d7 | 1 - .../27/db66b046536a0e4f64c4f8c3a490641c3fa5e5 | Bin 44 -> 0 bytes .../2b/4b774d8c5441b22786531f34ffc77800cda8cf | Bin 50 -> 0 bytes .../2d/23d51590ec2f53fe4b5bb3e5ca62e35e4ef85a | Bin 49 -> 0 bytes .../35/ae236308929a536fb4e852278a9b98c42babb3 | 1 - .../38/0b9e58872ccf1d858be4b0fc612514a080bc40 | Bin 49 -> 0 bytes .../39/fb3af508440cf970b92767f6d081c811574d2a | 2 - .../3b/24e5c751ee9c7c89df32a0d959748aa3d0112c | 2 - .../44/14ac920acabc3eb00e3cf9375eeb0cb6859c15 | Bin 135 -> 0 bytes .../44/2894787eddb1e84a952f17a027590e2c6c02cd | Bin 137 -> 0 bytes .../46/fe10fa23259b089ab050788b06df979cd7d054 | Bin 137 -> 0 bytes .../4a/a347c8bb0456230f43f34833c97b9f52c40f62 | 3 - .../4d/83272d0d372e1232ddc4ff3260d76fdfa2015a | 2 - .../53/41a7b545d71198b076b8ba3374a75c9a290640 | 3 - .../5d/1ee4f24f66dcd62a30248588d33804656b2073 | Bin 46 -> 0 bytes .../65/94bdbad86bbc8d3ed0806a23827203fbab56c6 | Bin 132 -> 0 bytes .../68/e8bce48725490c376d57ebc60f0170605951a5 | Bin 58 -> 0 bytes .../69/7dc3d723a018538eb819d5db2035c15109af73 | Bin 132 -> 0 bytes .../6b/7d8a5a48a3c753b75a8fe5196f9c8704ac64ad | Bin 50 -> 0 bytes .../6c/1f5f6fec515d33036b44c596bfae28fc460cba | Bin 47 -> 0 bytes .../71/2ceb8eb3e57072447715bc4057c57aa50f629a | Bin 138 -> 0 bytes .../7a/0538bc4e20aecb36ef221f2077eb30ebe0bcb2 | 2 - .../7a/e174dda8f105a582c593b52d74545a3565819d | Bin 51 -> 0 bytes .../7b/b1dd08b2c7d73084934954e4196e67004b0279 | Bin 83 -> 0 bytes .../7d/4e382485ace068fb83b768ba1a1c674afbdc1d | Bin 62 -> 0 bytes .../7f/924ca37670afa06c7a481a2487b728b2c0185a | Bin 47 -> 0 bytes .../80/24458e7ee49c456fd8c45d3591e9936bf613b3 | Bin 50 -> 0 bytes .../80/a8fe4f10626c50b3a4fd065a4604bafc9f30fa | Bin 23 -> 0 bytes .../81/e2b84864f16ebd285b34a2b1e87ebb41f4c230 | Bin 49 -> 0 bytes .../82/482ad2e683edfc14f7de359e4f9a5e88909c51 | Bin 45 -> 0 bytes .../88/6c0f5f71057d846f71f05a05fdffad332bc070 | Bin 50 -> 0 bytes .../89/9ff28744bed5bece69c78ba752c7dc3e954629 | Bin 136 -> 0 bytes .../8b/cbb6e0c0f9554efd5401e1ec14a4b2595eb3bf | 2 - .../8c/e7a3ef59c3d602a0296321eb964218f3d52fae | Bin 56 -> 0 bytes .../8f/1dcd43aa0164eb6ec319c3ec8879ca5cf62c1e | 2 - .../91/602c85bb50dd834205edd30435b77d5bb9ccf0 | 3 - .../91/cd2c95af92883550b45fcc838013ae7e2954df | Bin 138 -> 0 bytes .../94/f37c29173c8fa45a232b17e745c82132b2fafd | Bin 132 -> 0 bytes .../96/156716851c0afb4702b0d2c4ac8c496a730e29 | 1 - .../96/3fdf003bf7261b9155c5748dc0945349b69e68 | Bin 44 -> 0 bytes .../9a/b85e507899c19dca57778c9b6e5f1ec799b911 | 3 - .../9d/5898503adc01d763e279ac8fcefbe865b19031 | 4 - .../9e/24726d64589ba02430da8cebb5712dad35593d | Bin 136 -> 0 bytes .../9e/683cdaf9ea2727c891b4cf8f7f11e9e28a67ca | Bin 50 -> 0 bytes .../a0/d89aa95628fcd6b64fd5b23dd56b906b06bfe2 | Bin 166 -> 0 bytes .../a5/76a98d3279989226992610372035b76a01a3e9 | Bin 136 -> 0 bytes .../a7/8dde970cffbb71d67bef2a74aa72c6621d9819 | Bin 86 -> 0 bytes .../ac/84d85a425b2a21fd0ffccacac6c48823fc98c8 | Bin 48 -> 0 bytes .../af/45aa1eb7edf804ed10f70efb96fd178527c17c | Bin 58 -> 0 bytes .../b1/1df9aee97a65817e8904a74f5e6a1c62c7a275 | Bin 50 -> 0 bytes .../b8/3795b1e0eb54f22f7056119db132500d0cdc05 | Bin 56 -> 0 bytes .../bb/29ec85546d29b0bcc314242660d7772b0a3803 | Bin 50 -> 0 bytes .../bc/e2dabe5766838216d95f199d95aa4fd479a084 | Bin 83 -> 0 bytes .../bf/7ab4723fcc57ecc7fceccf591d6c4773491569 | 2 - .../c2/a2ddd339574e5cbfd9228be840eb1bf496de4e | Bin 137 -> 0 bytes .../c3/a70f8a376f17adccfb52b48e2831bfef2a2172 | 2 - .../c4/89e70ed6d9f6331770eae21a77d15afd11cd99 | Bin 56 -> 0 bytes .../c6/72414d4d08111145ef8202f21c95fa7e688aee | Bin 56 -> 0 bytes .../c8/f98a1762ec016c30f0d73512df399dedefc3fd | 3 - .../cc/bbfdb796f9b03298f5c7225e8f830784e1a3b1 | 2 - .../cd/44b4ea1066b3fa1d4b3baad8dc1531aec287a6 | Bin 47 -> 0 bytes .../ce/22b3cd9a01efafc370879c1938e0c32fb6f195 | 3 - .../cf/6fcf8cdf7e8d4cda3b11b0ba02d0d5125fbbd7 | 2 - .../d2/eb26d4938550487de59a017a7bfee8ca46b5f4 | 2 - .../dc/37c5f1521fb76fe1c1ac7b13187f9396a59247 | Bin 58 -> 0 bytes .../de/bdc4a004fda6141a17d9c297617be70d40248f | 2 - .../e2/377bdbc93b30a34ed5deefedded89b947ff8f4 | 2 - .../e3/99c4fc4c07cb7947d2f3d966bc374df6ccc691 | 2 - .../e4/edb361e51932b5ccedbc7ee41b4d3a4289aece | Bin 50 -> 0 bytes .../e5/1c3fa44fe981ec290c8f47fea736f3ff2af2a6 | Bin 51 -> 0 bytes .../e7/3a04f71f11ab9d7dde72ff793882757a03f16e | Bin 50 -> 0 bytes .../e8/68b1d6833710021785581a9e11dba8468f3a55 | Bin 49 -> 0 bytes .../e8/7caf56c91ab8d14e4ee8eb56308533503d1885 | 2 - .../eb/82bf596b66f90e25f881ce9b92cb55bab4fdf5 | Bin 50 -> 0 bytes .../ed/4bc023f61dc345ff0084b922b229d24de206e7 | Bin 47 -> 0 bytes .../ef/6ed8a2b15f95795aed82a974b995cace02dbfe | Bin 43 -> 0 bytes .../f2/c059dab35f6534b3f16d90b2f1de308615320c | Bin 50 -> 0 bytes .../fa/9cfdbeaaf3a91ff4b84d74412cd59d9b16a615 | Bin 136 -> 0 bytes .../fd/7a37d92197267e55e1fc0cc4f283a815bd79b8 | Bin 43 -> 0 bytes .../heads/dot_backslash_dotcapitalgit_path | 1 - .../.gitted/refs/heads/dot_dotcapitalgit_path | 1 - .../nasty/.gitted/refs/heads/dot_dotgit_path | 1 - .../nasty/.gitted/refs/heads/dot_dotgit_tree | 1 - .../nasty/.gitted/refs/heads/dot_git_colon | 1 - .../.gitted/refs/heads/dot_git_colon_stuff | 1 - .../nasty/.gitted/refs/heads/dot_git_dot | 1 - .../nasty/.gitted/refs/heads/dot_path | 1 - .../nasty/.gitted/refs/heads/dot_path_two | 1 - .../nasty/.gitted/refs/heads/dot_tree | 1 - .../refs/heads/dotcapitalgit_backslash_path | 1 - .../.gitted/refs/heads/dotcapitalgit_path | 1 - .../.gitted/refs/heads/dotcapitalgit_tree | 1 - .../refs/heads/dotdot_dotcapitalgit_path | 1 - .../.gitted/refs/heads/dotdot_dotgit_path | 1 - .../.gitted/refs/heads/dotdot_dotgit_tree | 1 - .../nasty/.gitted/refs/heads/dotdot_path | 1 - .../nasty/.gitted/refs/heads/dotdot_tree | 1 - .../.gitted/refs/heads/dotgit_backslash_path | 1 - .../.gitted/refs/heads/dotgit_hfs_ignorable_1 | 1 - .../refs/heads/dotgit_hfs_ignorable_10 | 1 - .../refs/heads/dotgit_hfs_ignorable_11 | 1 - .../refs/heads/dotgit_hfs_ignorable_12 | 1 - .../refs/heads/dotgit_hfs_ignorable_13 | 1 - .../refs/heads/dotgit_hfs_ignorable_14 | 1 - .../refs/heads/dotgit_hfs_ignorable_15 | 1 - .../refs/heads/dotgit_hfs_ignorable_16 | 1 - .../.gitted/refs/heads/dotgit_hfs_ignorable_2 | 1 - .../.gitted/refs/heads/dotgit_hfs_ignorable_3 | 1 - .../.gitted/refs/heads/dotgit_hfs_ignorable_4 | 1 - .../.gitted/refs/heads/dotgit_hfs_ignorable_5 | 1 - .../.gitted/refs/heads/dotgit_hfs_ignorable_6 | 1 - .../.gitted/refs/heads/dotgit_hfs_ignorable_7 | 1 - .../.gitted/refs/heads/dotgit_hfs_ignorable_8 | 1 - .../.gitted/refs/heads/dotgit_hfs_ignorable_9 | 1 - .../nasty/.gitted/refs/heads/dotgit_path | 1 - .../nasty/.gitted/refs/heads/dotgit_tree | 1 - .../nasty/.gitted/refs/heads/git_tilde1 | 1 - .../nasty/.gitted/refs/heads/git_tilde2 | 1 - .../nasty/.gitted/refs/heads/git_tilde3 | 1 - .../resources/nasty/.gitted/refs/heads/master | 1 - .../nasty/.gitted/refs/heads/symlink1 | 1 - .../nasty/.gitted/refs/heads/symlink2 | 1 - .../nasty/.gitted/refs/heads/symlink3 | 1 - .../tests/resources/nsecs/.gitted/HEAD | 1 - .../tests/resources/nsecs/.gitted/config | 8 - .../tests/resources/nsecs/.gitted/index | Bin 281 -> 0 bytes .../03/1986a8372d1442cfe9e3b54906a9aadc524a7e | 2 - .../03/9afd91c98f82c14e425bb6796d8ca98e9c8cac | Bin 102 -> 0 bytes .../6d/8b18077cc99abd8dda05a6062c646406abb2d4 | Bin 22 -> 0 bytes .../c5/12b6c64656b87ea8caf37a32bc5a562d797745 | Bin 22 -> 0 bytes .../df/78d3d51c369e1d2f1eadb73464aadd931d56b4 | Bin 22 -> 0 bytes .../resources/nsecs/.gitted/refs/heads/master | 1 - vendor/libgit2/tests/resources/nsecs/a.txt | 1 - vendor/libgit2/tests/resources/nsecs/b.txt | 1 - vendor/libgit2/tests/resources/nsecs/c.txt | 1 - .../resources/partial-testrepo/.gitted/HEAD | 1 - .../resources/partial-testrepo/.gitted/config | 7 - .../resources/partial-testrepo/.gitted/index | Bin 328 -> 0 bytes .../13/85f264afb75a56a5bec74243be9b367ba4ca08 | Bin 19 -> 0 bytes .../14/4344043ba4d4a405da03de3844aa829ae8be0e | Bin 163 -> 0 bytes .../16/8e4ebd1c667499548ae12403b19b22a5c5e925 | Bin 147 -> 0 bytes .../18/1037049a54a1eb5fab404658a3a250b44335d7 | Bin 51 -> 0 bytes .../18/10dff58d8a660512d4832e740f692884338ccd | Bin 119 -> 0 bytes .../45/b983be36b73c0788dc9cbcb76cbb80fc7bb057 | Bin 18 -> 0 bytes .../4a/202b346bb0fb0db7eff3cffeb3c70babbd2045 | 2 - .../4e/0883eeeeebc1fb1735161cea82f7cb5fab7e63 | Bin 50 -> 0 bytes .../5b/5b025afb0b4c913b4c338a42934a3863bf3644 | 2 - .../62/eb56dabb4b9929bc15dd9263c2c733b13d2dcc | Bin 50 -> 0 bytes .../66/3adb09143767984f7be83a91effa47e128c735 | Bin 19 -> 0 bytes .../75/057dd4114e74cca1d750d0aee1647c903cb60a | Bin 119 -> 0 bytes .../81/4889a078c031f61ed08ab5fa863aea9314344d | Bin 82 -> 0 bytes .../84/96071c1b46c854b31185ea97743be6a8774479 | Bin 126 -> 0 bytes .../9f/d738e8f7967c078dceed8190330fc8648ee56a | 3 - .../a4/a7dce85cf63874e984719f4fdd239f5145052f | 2 - .../a7/1586c1dfe8a71c6cbf6c129f404c5642ff31bd | Bin 28 -> 0 bytes .../a8/233120f6ad708f843d861ce2b7228ec4e3dec6 | Bin 26 -> 0 bytes .../c4/7800c7266a2be04c571c04d5a6614691ea99bd | 3 - .../cf/80f8de9f1185bf3a05f993f6121880dd0cfbc9 | Bin 162 -> 0 bytes .../d5/2a8fe84ceedf260afe4f0287bbfca04a117e83 | Bin 147 -> 0 bytes .../f6/0079018b664e4e79329a7ef9559c8d9e0378d1 | Bin 82 -> 0 bytes .../fa/49b077972391ad58037050f2a75f74e3671e92 | Bin 24 -> 0 bytes .../fd/093bff70906175335656e6ce6ae05783708765 | Bin 82 -> 0 bytes .../.gitted/objects/pack/.gitkeep | 0 .../partial-testrepo/.gitted/refs/heads/dir | 1 - .../libgit2/tests/resources/peeled.git/HEAD | 1 - .../libgit2/tests/resources/peeled.git/config | 8 - .../resources/peeled.git/objects/info/packs | 2 - ...4773eaf3fce1774755580e3dbb8d9f3a1adc45.idx | Bin 1156 -> 0 bytes ...773eaf3fce1774755580e3dbb8d9f3a1adc45.pack | Bin 274 -> 0 bytes .../tests/resources/peeled.git/packed-refs | 6 - .../resources/peeled.git/refs/heads/master | 1 - vendor/libgit2/tests/resources/push.sh | 55 - .../resources/push_src/.gitted/COMMIT_EDITMSG | 1 - .../tests/resources/push_src/.gitted/HEAD | 1 - .../resources/push_src/.gitted/ORIG_HEAD | 1 - .../tests/resources/push_src/.gitted/config | 10 - .../resources/push_src/.gitted/description | 1 - .../tests/resources/push_src/.gitted/index | Bin 470 -> 0 bytes .../resources/push_src/.gitted/info/exclude | 6 - .../resources/push_src/.gitted/logs/HEAD | 10 - .../push_src/.gitted/logs/refs/heads/b1 | 1 - .../push_src/.gitted/logs/refs/heads/b2 | 1 - .../push_src/.gitted/logs/refs/heads/b3 | 2 - .../push_src/.gitted/logs/refs/heads/b4 | 2 - .../push_src/.gitted/logs/refs/heads/b5 | 2 - .../push_src/.gitted/logs/refs/heads/master | 3 - .../push_src/.gitted/modules/submodule/HEAD | 1 - .../push_src/.gitted/modules/submodule/config | 15 - .../.gitted/modules/submodule/description | 1 - .../push_src/.gitted/modules/submodule/index | Bin 256 -> 0 bytes .../.gitted/modules/submodule/info/exclude | 6 - .../.gitted/modules/submodule/logs/HEAD | 1 - .../modules/submodule/logs/refs/heads/master | 1 - .../submodule/logs/refs/remotes/origin/HEAD | 1 - .../08/b041783f40edfe12bb406c9c9a8a040177c125 | Bin 54 -> 0 bytes .../13/85f264afb75a56a5bec74243be9b367ba4ca08 | Bin 19 -> 0 bytes .../18/1037049a54a1eb5fab404658a3a250b44335d7 | Bin 51 -> 0 bytes .../18/10dff58d8a660512d4832e740f692884338ccd | Bin 119 -> 0 bytes .../1a/443023183e3f2bfbef8ac923cd81c1018a18fd | Bin 122 -> 0 bytes .../1b/8cbad43e867676df601306689fe7c3def5e689 | Bin 51 -> 0 bytes .../1f/67fc4386b2d171e0d21be1c447e12660561f9b | Bin 21 -> 0 bytes .../25/8f0e2a959a364e40ed6603d5d44fbb24765b10 | Bin 168 -> 0 bytes .../27/0b8ea76056d5cad83af921837702d3e3c2924d | Bin 21 -> 0 bytes .../2d/59075e0681f540482d4f6223a68e0fef790bc7 | Bin 44 -> 0 bytes .../32/59a6bd5b57fb9c1281bb7ed3167b50f224cb54 | Bin 50 -> 0 bytes .../36/97d64be941a53d4ae8f6a271e4e3fa56b022cc | Bin 23 -> 0 bytes .../45/b983be36b73c0788dc9cbcb76cbb80fc7bb057 | Bin 18 -> 0 bytes .../4a/202b346bb0fb0db7eff3cffeb3c70babbd2045 | 2 - .../4b/22b35d44b5a4f589edf3dc89196399771796ea | Bin 44 -> 0 bytes .../52/1d87c1ec3aef9824daf6d96cc0ae3710766d91 | Bin 152 -> 0 bytes .../5b/5b025afb0b4c913b4c338a42934a3863bf3644 | 2 - .../75/057dd4114e74cca1d750d0aee1647c903cb60a | Bin 119 -> 0 bytes .../76/3d71aadf09a7951596c9746c024e7eece7c7af | 1 - .../7b/4384978d2493e851f9cca7858815fac9b10980 | Bin 145 -> 0 bytes .../81/4889a078c031f61ed08ab5fa863aea9314344d | Bin 82 -> 0 bytes .../84/96071c1b46c854b31185ea97743be6a8774479 | Bin 126 -> 0 bytes .../84/9a5e34a26815e821f865b8479f5815a47af0fe | 2 - .../94/4c0f6e4dfa41595e6eb3ceecdb14f50fe18162 | 1 - .../9a/03079b8a8ee85a0bee58bf9be3da8b62414ed4 | Bin 50 -> 0 bytes .../9f/13f7d0a9402c681f91dc590cf7b5470e6a77d2 | 2 - .../9f/d738e8f7967c078dceed8190330fc8648ee56a | 3 - .../a4/a7dce85cf63874e984719f4fdd239f5145052f | 2 - .../a6/5fedf39aefe402d3bb6e24df4d4f5fe4547750 | 3 - .../a7/1586c1dfe8a71c6cbf6c129f404c5642ff31bd | Bin 28 -> 0 bytes .../a8/233120f6ad708f843d861ce2b7228ec4e3dec6 | Bin 26 -> 0 bytes .../ae/90f12eea699729ed24555e40b9fd669da12a12 | Bin 148 -> 0 bytes .../b2/5fa35b38051e4ae45d4222e795f9df2e43f1d1 | 2 - .../b6/361fc6a97178d8fc8639fdeed71c775ab52593 | Bin 80 -> 0 bytes .../be/3563ae3f795b2b4353bcce3a527ad0a4f7f644 | 3 - .../c4/7800c7266a2be04c571c04d5a6614691ea99bd | 3 - .../d0/7b0f9a8c89f1d9e74dc4fce6421dec5ef8a659 | Bin 149 -> 0 bytes .../d6/c93164c249c8000205dd4ec5cbca1b516d487f | Bin 21 -> 0 bytes .../d7/1aab4f9b04b45ce09bcaa636a9be6231474759 | Bin 79 -> 0 bytes .../e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 | Bin 15 -> 0 bytes .../e7/b4ad382349ff96dd8199000580b9b1e2042eb0 | Bin 21 -> 0 bytes .../f1/425cef211cc08caa31e7b545ffb232acb098c3 | Bin 103 -> 0 bytes .../f6/0079018b664e4e79329a7ef9559c8d9e0378d1 | Bin 82 -> 0 bytes .../fa/49b077972391ad58037050f2a75f74e3671e92 | Bin 24 -> 0 bytes .../fd/093bff70906175335656e6ce6ae05783708765 | Bin 82 -> 0 bytes .../fd/4959ce7510db09d4d8217fa2d1780413e05a09 | Bin 152 -> 0 bytes ...1e489679b7d3418f9ab594bda8ceb37dd4c695.idx | Bin 46656 -> 0 bytes ...e489679b7d3418f9ab594bda8ceb37dd4c695.pack | Bin 386089 -> 0 bytes ...c6adf9f61318f041845b01440d09aa7a91e1b5.idx | Bin 1240 -> 0 bytes ...6adf9f61318f041845b01440d09aa7a91e1b5.pack | Bin 491 -> 0 bytes ...5f5d483273108c9d8dd0e4728ccf0b2982423a.idx | Bin 1240 -> 0 bytes ...f5d483273108c9d8dd0e4728ccf0b2982423a.pack | Bin 498 -> 0 bytes .../.gitted/modules/submodule/packed-refs | 24 - .../modules/submodule/refs/heads/master | 1 - .../submodule/refs/remotes/origin/HEAD | 1 - .../08/585692ce06452da6f82ae66b90d98b55536fca | 1 - .../27/b7ce66243eb1403862d05f958c002312df173d | 4 - .../28/905c54ea45a4bed8d7b90f51bd8bd81eec8840 | Bin 109 -> 0 bytes .../36/6226fb970ac0caa9d3f55967ab01334a548f60 | Bin 20 -> 0 bytes .../36/f79b2846017d3761e0a02d0bccd573e0f90c57 | 2 - .../5c/0bb3d1b9449d1cc69d7519fd05166f01840915 | Bin 128 -> 0 bytes .../61/780798228d17af2d34fce4cfbdf35556832472 | Bin 17 -> 0 bytes .../64/fd55f9b6390202db5e5666fd1fb339089fba4d | Bin 176 -> 0 bytes .../78/981922613b2afb6025042ff6bd878ac1994e85 | Bin 17 -> 0 bytes .../80/5c54522e614f29f70d2413a0470247d8b424ac | Bin 131 -> 0 bytes .../95/1bbbb90e2259a4c8950db78946784fb53fcbce | 2 - .../a7/8705c3b2725f931d3ee05348d83cc26700f247 | Bin 166 -> 0 bytes .../b4/83ae7ba66decee9aee971f501221dea84b1498 | 3 - .../b4/e1f2b375a64c1ccd40c5ff6aa8bc96839ba4fd | Bin 148 -> 0 bytes .../c1/0409136a7a75e025fa502a1b2fd7b62b77d279 | Bin 22 -> 0 bytes .../cd/881f90f2933db2e4cc26b8c71fe6037ac7fe4c | Bin 80 -> 0 bytes .../d9/b63a88223d8367516f50bd131a5f7349b7f3e4 | 2 - .../dc/ab83249f6f9d1ed735d651352a80519339b591 | Bin 80 -> 0 bytes .../ee/a4f2705eeec2db3813f2430829afce99cd00b5 | Bin 141 -> 0 bytes .../f7/8a3106c85fb549c65198b2a2086276c6174928 | Bin 65 -> 0 bytes .../f8/f7aefc2900a3d737cea9eee45729fd55761e1a | Bin 50 -> 0 bytes .../fa/38b91f199934685819bea316186d8b008c52a2 | 2 - .../ff/83aa4c5e5d28e3bcba2f5c6e2adc61286a4e5e | 4 - .../ff/fe95c7fd0a37fa2ed702f8f93b56b2196b3925 | Bin 109 -> 0 bytes .../push_src/.gitted/objects/pack/dummy | 0 .../resources/push_src/.gitted/refs/heads/b1 | 1 - .../resources/push_src/.gitted/refs/heads/b2 | 1 - .../resources/push_src/.gitted/refs/heads/b3 | 1 - .../resources/push_src/.gitted/refs/heads/b4 | 1 - .../resources/push_src/.gitted/refs/heads/b5 | 1 - .../resources/push_src/.gitted/refs/heads/b6 | 1 - vendor/libgit2/tests/resources/push_src/a.txt | 2 - .../tests/resources/push_src/fold/b.txt | 1 - .../tests/resources/push_src/foldb.txt | 1 - .../tests/resources/push_src/gitmodules | 3 - .../resources/push_src/submodule/.gitted | 1 - .../tests/resources/push_src/submodule/README | 1 - .../push_src/submodule/branch_file.txt | 2 - .../resources/push_src/submodule/new.txt | 1 - .../tests/resources/rebase/.gitted/HEAD | 1 - .../tests/resources/rebase/.gitted/config | 4 - .../tests/resources/rebase/.gitted/index | Bin 488 -> 0 bytes .../resources/rebase/.gitted/info/exclude | 6 - .../tests/resources/rebase/.gitted/logs/HEAD | 1 - .../00/66204dd469ee930e551fbcf123f98e211c99ce | Bin 806 -> 0 bytes .../00/f1b9a0948a7d5d14405eba6030efcdfbb8ff4a | 3 - .../01/3cc32d341bab0e6f039f50f153c18986f16c58 | Bin 175 -> 0 bytes .../01/a17f7d154ab5bf9f8bfede3d82dd00ddf7e7dc | Bin 370 -> 0 bytes .../02/2d3b6bbd0bfbdf147319476fb8bf405691cb0d | Bin 208 -> 0 bytes .../05/3808a709cf91385985369159b296cf61a177ac | Bin 241 -> 0 bytes .../0e/f2e2b2a2b8d6e1f8dff5e621e0eca21b693d0c | 3 - .../0f/5f6d3353be1a9966fa5767b7d604b051798224 | Bin 183 -> 0 bytes .../11/fac10ca1b9318ce361a0be0c3d889d777e299c | Bin 208 -> 0 bytes .../12/c084412b952396962eb420716df01022b847cc | 2 - .../12/f28ed978639d331269d9dc2b74e87db58e1057 | 3 - .../19/14d57ddf6c5c997664521cc94f190df46dc1c2 | Bin 277 -> 0 bytes .../1b/1d19799fcc89fa3cb821581fcf7f2e8fd2cc4d | Bin 178 -> 0 bytes .../1f/2214c1b13b134d5508f41f6a3b77cc6a8f5182 | Bin 209 -> 0 bytes .../20/db906c85e78c6dde82eb2ec6d3231c4b96fce8 | Bin 796 -> 0 bytes .../22/adb22bef75a0371e85ff6d82e5e60e4b425501 | Bin 380 -> 0 bytes .../2a/a3ce842094e08ebac152b3d6d5b0fff39f9c6e | 1 - .../2b/4ebffd3111546d278bb5df62e5630930b605fb | Bin 208 -> 0 bytes .../30/69cc907e6294623e5917ef6de663928c1febfb | 1 - .../32/52a0692ace4c4c709f22011227d9dc4845f289 | Bin 209 -> 0 bytes .../33/f915f9e4dbd9f4b24430e48731a59b45b15500 | 1 - .../34/86a9d4cdf0b7b4a702c199eed541dc3af13a03 | 1 - .../3c/33b080bf75724c8899d8e703614cb59bfbd047 | Bin 208 -> 0 bytes .../3d/a85aca38a95b44d77ef55a8deb445e49ba19b4 | Bin 55 -> 0 bytes .../3e/8989b5a16d5258c935d998ef0e6bb139cc4757 | 2 - .../3f/05a038dd89f51ba2b3d7b14ba1f8c00f0e31ac | Bin 209 -> 0 bytes .../3f/d8d53cf02de539b9a25a5941030451f76a152f | Bin 89 -> 0 bytes .../40/0d89e8ee6cd91b67b1f45de1ca190e1c580c6f | 1 - .../41/4dfc71ead79c07acd4ea47fecf91f289afc4b9 | Bin 376 -> 0 bytes .../41/c5a0a761bb4a7670924c1af0800b30fe9a21be | Bin 384 -> 0 bytes .../42/cdad903aef3e7b614675e6584a8be417941911 | Bin 208 -> 0 bytes .../44/c801fe026abbc141b52a4dec5df15fa98249c6 | Bin 367 -> 0 bytes .../4b/21eb6eeeec7f8fc89a1d334faff9bd5f5f8c34 | 2 - .../4b/7c5650008b2e747fe1809eeb5a1dde0e80850a | Bin 615 -> 0 bytes .../4b/ed71df7017283cac61bbf726197ad6a5a18b84 | 2 - .../4c/acc6f6e740a5bc64faa33e04b8ef0733d8a127 | Bin 169 -> 0 bytes .../4f/b698bde45d7d2833e3f2aacfbfe8a7e7f60a65 | Bin 208 -> 0 bytes .../50/8be4ff49d38465ad3de58f66d38f70e59f881f | Bin 241 -> 0 bytes .../53/f75e45a463033854e52fa8d39dc858e45537d0 | Bin 209 -> 0 bytes .../58/8e5d2f04d49707fe4aab865e1deacaf7ef6787 | 1 - .../5b/1e8bccf7787e942aecf61912f94a2c274f85a5 | Bin 368 -> 0 bytes .../60/29cb003b59f710f9a8ebd9da9ece2d73070b69 | Bin 655 -> 0 bytes .../61/139b9b40a3e489f4abbc6af14e10ae14006e47 | Bin 224 -> 0 bytes .../61/30e5fcbdce2aa8b3cfd84706c58a892e7d8dd0 | Bin 208 -> 0 bytes .../63/c18bf188b8a1ab0bad85161dc3fb43c48ed0db | Bin 208 -> 0 bytes .../67/ed7afb256807556f9b74fa4f7c9284aaec1120 | Bin 391 -> 0 bytes .../68/af1fc7407fd9addf1701a87eb1c95c7494c598 | Bin 443 -> 0 bytes .../68/f6182f4c85d39e1309d97c7e456156dc9c0096 | Bin 755 -> 0 bytes .../6c/8e16469b6ca09a07e00f0e07a5143c31dcfb64 | 1 - .../6d/77ce8fa2cd93c6489236e33e45e35203ca748c | 1 - .../6d/fb87d20f3dbca02da4a39890114fd9ba6a51e7 | Bin 364 -> 0 bytes .../73/f346c88d965227a03c0af8d555870b8c5021d4 | Bin 89 -> 0 bytes .../74/0a804e8963759c98e5b8cb912e15ae74a7a4a6 | Bin 207 -> 0 bytes .../78/c320b06544e23d786a9ec84ee93861f2933094 | Bin 55 -> 0 bytes .../79/e28694aae0d3064b06f96a5207b943a2357f07 | Bin 287 -> 0 bytes .../7a/05900f340af0252aaa4e34941f040c5d2fe7f7 | Bin 176 -> 0 bytes .../7a/677f6201c8f9d46bdfe1f4b08cb504e360a34e | Bin 208 -> 0 bytes .../7c/7bf85e978f1d18c0566f702d2cb7766b9c8d4f | 1 - .../7f/37fe2d7320360f8a9118b1ed8fba6f38481679 | 1 - .../80/32d630f37266bace093e353f7b97d7f8b20950 | Bin 209 -> 0 bytes .../80/dce0e74f0534811db734a68c23b49f98584d7a | 2 - .../83/53b9f9deff7c707f280e0f656c80772cca7cd9 | 2 - .../85/258e426a341cc1aa035ac7f6d18f84fed2ab38 | Bin 208 -> 0 bytes .../85/f34ce9ca9e0f33d4146afec9cbe5a26757500a | Bin 185 -> 0 bytes .../86/a5415741ed3754ccb0cac1fc19fd82587840a4 | Bin 634 -> 0 bytes .../8d/1f13f93c4995760ac07d129246ac1ff64c0be9 | 2 - .../8d/95ea62e621f1d38d230d9e7d206e41096d76af | Bin 773 -> 0 bytes .../8f/4de6c781b9ff9cedfd7f9f9f224e744f97b259 | 1 - .../92/54a37fde7e97f9a28dee2967fdb2c5d1ed94e9 | 1 - .../95/39b2cc291d6a6b1b266df8474d31fdd344dd79 | Bin 173 -> 0 bytes .../9a/8535dfcaf7554c728d874f047c5461fb2c71d1 | Bin 208 -> 0 bytes .../9c/d483e7da23819d7f71d24e9843812337886753 | 1 - .../a0/1a6ee390f65d834375e072952deaee0c5e92f7 | Bin 90 -> 0 bytes .../a0/fa65f96c1e3bdc7287e334229279dcc1248fa4 | 3 - .../a1/25b9b655932711abceaf8962948e6b601d67b6 | Bin 89 -> 0 bytes .../a7/00acc970eccccc73be53cd269462176544e6d1 | Bin 373 -> 0 bytes .../a7/b066537e6be7109abfe4ff97b675d4e077da20 | Bin 621 -> 0 bytes .../aa/4c42aecdfc7cd989bbc3209934ea7cda3f4d88 | 1 - .../ab/25a53ef5622d443ecb0492b7516725f0deac8f | Bin 208 -> 0 bytes .../ad/c97cfb874cdfb9d5ab17b54f3771dea6e02ccf | Bin 240 -> 0 bytes .../ae/87cae12879a3c37d7cc994afc6395bcb0eaf99 | Bin 209 -> 0 bytes .../b1/46bd7608eac53d9bf9e1a6963543588b555c64 | 1 - .../b1/b94ec02f8ed87d0efa4c65fb38d5d6da7e8b32 | Bin 208 -> 0 bytes .../b6/72b141d48c369fee6c4deeb32a904387594365 | Bin 174 -> 0 bytes .../b7/c536a5883c8adaeb34d5e198c5a3dbbdc608b5 | Bin 209 -> 0 bytes .../b9/f72b9158fa8c49fb4e4c10b26817ed867be803 | 3 - .../bc/cc8eabb5cfe2ec09959c7f4155aa73429fd604 | Bin 207 -> 0 bytes .../c4/e6cca3ec6ae0148ed231f97257df8c311e015f | 1 - .../c5/17380440ed78865ffe3fa130b9738615c76618 | Bin 649 -> 0 bytes .../cb/20a10406172afd6ca3138ce36ecaf8b1269e8e | Bin 213 -> 0 bytes .../d4/82e77aecb8e07da43e4cad6e0dcb59219e12af | Bin 175 -> 0 bytes .../d6/16d97082eb7bb2dc6f180a7cca940993b7a56f | 1 - .../d6/b9ec0dfb972a6815ace42545cde5f2631cd776 | Bin 790 -> 0 bytes .../da/82b3a60c50cf5ac524ec3000d743447329465d | Bin 369 -> 0 bytes .../da/9c51a23d02d931a486f45ad18cda05cf5d2b94 | 2 - .../dc/12ac1e10f2be70e8ecd52132a08da98a309c3a | 1 - .../df/d3d25264693fcd7348ad286f3c34f3f6b30918 | Bin 177 -> 0 bytes .../e4/f809f826c1a9fc929874bc0e4644dd2f2a1af4 | 3 - .../e5/2ff405da5b7e1e9b0929939fa8405d81fe8a45 | 3 - .../e7/bb00c4eab291e08361fda376733a12b4150aa9 | Bin 241 -> 0 bytes .../e8/8cc0a6919a74599ce8e1dcb81eb2bbae33a645 | Bin 208 -> 0 bytes .../e9/5f47e016dcc70b0b888df8e40e97b8aabafd4c | Bin 279 -> 0 bytes .../e9/f22c10ffb378446c0bbcab7ee3d9d5a0040672 | 2 - .../ec/725f5639730640f91cd0be5f2d6d7ac5d69c79 | Bin 377 -> 0 bytes .../ed/f7b3ffde1624c60d2d6b1a2bb792d86de172e0 | 3 - .../ee/23c5eeedadf8595c0ff60a366d970a165e373d | Bin 372 -> 0 bytes .../ee/f0edde5daa94da5f297d4ddb5dfbc1980f0902 | Bin 55 -> 0 bytes .../ef/ad0b11c47cb2f0220cbd6f5b0f93bb99064b00 | 1 - .../f5/56d5fef35003561dc0b64b37057d7541239105 | Bin 90 -> 0 bytes .../f6/3fa37e285bd11b0a7b48fa584a4091814a3ada | Bin 55 -> 0 bytes .../f7/5c193a1df47186727179f24867bc4d27a8991f | Bin 802 -> 0 bytes .../f8/7d14a4a236582a0278a916340a793714256864 | 2 - .../fc/e0584b379f535e50e036db587db71884ea6b36 | Bin 281 -> 0 bytes .../ff/b36e513f5fdf8a6ba850a20142676a2ac4807d | Bin 355 -> 0 bytes .../ff/dfa89389040a87008c4ab1834120d3046daaea | Bin 208 -> 0 bytes .../rebase/.gitted/refs/heads/asparagus | 1 - .../rebase/.gitted/refs/heads/barley | 1 - .../resources/rebase/.gitted/refs/heads/beef | 1 - .../rebase/.gitted/refs/heads/dried_pea | 1 - .../resources/rebase/.gitted/refs/heads/gravy | 1 - .../rebase/.gitted/refs/heads/green_pea | 1 - .../rebase/.gitted/refs/heads/master | 1 - .../resources/rebase/.gitted/refs/heads/veal | 1 - .../tests/resources/rebase/asparagus.txt | 10 - .../libgit2/tests/resources/rebase/beef.txt | 22 - .../tests/resources/rebase/bouilli.txt | 18 - .../libgit2/tests/resources/rebase/gravy.txt | 8 - .../libgit2/tests/resources/rebase/oyster.txt | 13 - .../libgit2/tests/resources/rebase/veal.txt | 18 - .../tests/resources/redundant.git/HEAD | 1 - .../tests/resources/redundant.git/config | 5 - .../redundant.git/objects/info/packs | 2 - ...944c0c5bcb6b16209af847052c6ff1a521529d.idx | Bin 121136 -> 0 bytes ...44c0c5bcb6b16209af847052c6ff1a521529d.pack | Bin 309860 -> 0 bytes .../tests/resources/redundant.git/packed-refs | 3 - .../resources/redundant.git/refs/.gitkeep | 0 .../tests/resources/renames/.gitted/HEAD | 1 - .../tests/resources/renames/.gitted/config | 7 - .../resources/renames/.gitted/description | 1 - .../tests/resources/renames/.gitted/index | Bin 352 -> 0 bytes .../resources/renames/.gitted/info/exclude | 6 - .../tests/resources/renames/.gitted/logs/HEAD | 4 - .../renames/.gitted/logs/refs/heads/master | 4 - .../03/da7ad872536bd448da8d88eb7165338bf923a7 | Bin 90 -> 0 bytes .../17/58bdd7c16a72ff7c17d8de0c957ced3ccad645 | 5 - .../19/dd32dfb1520a64e5bbaae8dce6ef423dfa2f13 | 1 - .../1c/068dee5790ef1580cfc4cd670915b48d790084 | Bin 176 -> 0 bytes .../2b/c7f351d20b53f1c72c16c4b036e491c478c49a | Bin 173 -> 0 bytes .../31/e47d8c1fa36d7f8d537b96158e3f024de0a9f2 | Bin 131 -> 0 bytes .../35/92953ff3ea5e8ba700c429f3aefe33c8806754 | Bin 80 -> 0 bytes .../36/020db6cdacaa93497f31edcd8f242ff9bc366d | Bin 431 -> 0 bytes .../3c/04741dd4b96c4ae4b00ec0f6e10c816a30aad2 | Bin 159 -> 0 bytes .../42/10ffd5c390b21dd5483375e75288dea9ede512 | Bin 1145 -> 0 bytes .../44/4a76ed3e45b183753f49376af30da8c3fe276a | Bin 135 -> 0 bytes .../47/184c1e7eb22abcbed2bf4ee87d4e38096f7951 | Bin 229 -> 0 bytes .../4e/4cae3e7dd56ed74bff39526d0469e554432953 | Bin 452 -> 0 bytes .../50/e90273af7d826ff0a95865bcd3ba8412c447d9 | 3 - .../5e/26abc56a5a84d89790f45416648899cbe13109 | Bin 163 -> 0 bytes .../61/8c6f2f8740bd6049b2fb9eb93fc15726462745 | Bin 106 -> 0 bytes .../66/311f5cfbe7836c27510a3ba2f43e282e2c8bba | Bin 1155 -> 0 bytes .../93/f538c45a57a87eb4c1e86f91c6ee41d66c7ba7 | Bin 229 -> 0 bytes .../9a/69d960ae94b060f56c2a8702545e2bb1abb935 | Bin 464 -> 0 bytes .../ad/0a8e55a104ac54a8a29ed4b84b49e76837a113 | Bin 415 -> 0 bytes .../b9/25b224cc91f897001a9993fbce169fdaa8858f | Bin 76 -> 0 bytes .../d7/9b202de198fa61b02424b9e25e840dc75e1323 | Bin 421 -> 0 bytes .../ea/c43f5195a2cee53b7458d8dad16aedde10711b | Bin 118 -> 0 bytes .../ea/f4a3e3bfe68585e90cada20736ace491cd100b | 5 - .../f9/0d4fc20ecddf21eebe6a37e9225d244339d2b5 | Bin 441 -> 0 bytes .../renames/.gitted/refs/heads/master | 1 - .../.gitted/refs/heads/renames_similar | 1 - .../.gitted/refs/heads/renames_similar_two | 1 - .../tests/resources/renames/ikeepsix.txt | 27 - .../tests/resources/renames/sixserving.txt | 25 - .../tests/resources/renames/songof7cities.txt | 49 - .../tests/resources/renames/untimely.txt | 24 - .../tests/resources/revert/.gitted/HEAD | 1 - .../tests/resources/revert/.gitted/config | 8 - .../tests/resources/revert/.gitted/index | Bin 464 -> 0 bytes .../resources/revert/.gitted/info/exclude | 6 - .../00/c97c9299419874a7bfc4d853d462c568e1be2d | Bin 137 -> 0 bytes .../0a/a8c7e40d342fff78d60b29a4ba8e993ed79c51 | 2 - .../0a/b09ea6d4c3634bdf6c221626d8b6f7dd890767 | Bin 28 -> 0 bytes .../0a/d19525be6d8cae5e5deb2770fc244b65255057 | Bin 133 -> 0 bytes .../0c/db66192ee192f70f891f05a47636057420e871 | Bin 35 -> 0 bytes .../0f/5bfcf58c558d865da6be0281d7795993646cee | Bin 45 -> 0 bytes .../10/10c8f4711d60d04bad16197a0f4b0d4d19c542 | Bin 53 -> 0 bytes .../13/a6fdfd10bd74b1f258fb58801215985dd2e797 | Bin 121 -> 0 bytes .../13/ee9cd5d8e1023c218e0e1ea684ec0c582b5050 | Bin 161 -> 0 bytes .../15/6ef9bcb968dccec8472a0f2eff49f1a713bc6b | Bin 133 -> 0 bytes .../18/1aab27ddb37b40d9a284fb4733497006d57091 | Bin 133 -> 0 bytes .../1b/c915c5cb7185a9438de28a7b1a7dfe8c01ee7f | Bin 1169 -> 0 bytes .../1f/a4e069a641f10f5fb7588138b2d147fcd22c36 | Bin 133 -> 0 bytes .../1f/f0c423042b46cb1d617b81efb715defbe8054d | Bin 751 -> 0 bytes .../21/a96a98ed84d45866e1de6e266fd3a61a4ae9dc | Bin 19 -> 0 bytes .../29/6a6d3be1dff05c5d1f631d2459389fa7b619eb | Bin 40 -> 0 bytes .../2d/440f2b3147d3dc7ad1085813478d6d869d5a4d | 2 - .../33/c6fd981c49a2abf2971482089350bfc5cda8ea | Bin 47 -> 0 bytes .../39/467716290f6df775a91cdb9a4eb39295018145 | Bin 162 -> 0 bytes .../39/9fb3aba3d9d13f7d40a9254ce4402067ef3149 | 2 - .../3a/3ef367eaf3fe79effbfb0a56b269c04c2b59fe | Bin 33 -> 0 bytes .../46/ff0854663aeb2182b9838c8da68e33ac23bc1e | Bin 20 -> 0 bytes .../4b/8fcff56437e60f58e9a6bc630dd242ebf6ea2c | Bin 43 -> 0 bytes .../52/c95c4264245469a0617e289a7d737f156826b4 | 2 - .../55/568c8de5322ff9a95d72747a239cdb64a19965 | 1 - .../55/acf326a69f0aab7a974ec53ffa55a50bcac14e | Bin 30 -> 0 bytes .../5a/cdc74af27172ec491d213ee36cea7eb9ef2579 | 3 - .../6b/ccd0dc58cea5ccff86014f3d64b31bd8c02a37 | Bin 171 -> 0 bytes .../71/eb9c2b53dbbf3c45fb28b27c850db4b7fb8011 | Bin 148 -> 0 bytes .../72/333f47d4e83616630ff3b0ffe4c0faebcc3c45 | Bin 172 -> 0 bytes .../73/ec36fa120f8066963a0bc9105bb273dbd903d7 | Bin 31 -> 0 bytes .../74/7726e021bc5f44b86de60e3032fd6f9f1b8383 | Bin 28 -> 0 bytes .../75/ec9929465623f17ff3ad68c0438ea56faba815 | Bin 163 -> 0 bytes .../77/31926a337c4eaba1e2187d90ebfa0a93659382 | Bin 37 -> 0 bytes .../83/f65df4606c4f8dbf8da43de25de1b7e4c03238 | Bin 113 -> 0 bytes .../87/59ad453cf01cf7daf14e2a668f8218f9a678eb | Bin 122 -> 0 bytes .../8b/e77695228eadd004606af0508462457961ca4a | Bin 52 -> 0 bytes .../8f/d40e13fff575b63e86af87175e70fa7fb92f80 | Bin 80 -> 0 bytes .../97/e52d5e81f541080cd6b92829fb85bc4d81d90b | Bin 163 -> 0 bytes .../97/f3574e92f1730d365fb9e00c10e3c507c1cfe9 | Bin 115 -> 0 bytes .../9a/95fd974e03c5b93828ceedd28755965b5d5c60 | Bin 122 -> 0 bytes .../a6/9f74efcb51634b88e04ea81273158a85257f41 | Bin 146 -> 0 bytes .../a8/c86221b400b836010567cc3593db6e96c1a83a | Bin 24 -> 0 bytes .../aa/7e281435d1fe6740d712f4bcc6fe89c425bedc | Bin 53 -> 0 bytes .../ac/c4d33902092efeb3b714aa0b1007c329e2f2e6 | 2 - .../b7/a55408832174c54708906a372a9be2ffe3649b | Bin 133 -> 0 bytes .../be/ead165e017269e8dc0dd6f01195726a2e1e01b | Bin 133 -> 0 bytes .../ce/f56612d71a6af8d8015691e4865f7fece905b5 | Bin 174 -> 0 bytes .../d1/d403d22cbe24592d725f442835cf46fe60c8ac | Bin 164 -> 0 bytes .../dd/9a159c89509e73fd37d6af99619994cf7dfc06 | Bin 133 -> 0 bytes .../e3/4ef1afe54eb526fd92eec66084125f340f1d65 | Bin 150 -> 0 bytes .../e5/f831f064adf9224d8c3ce556959d9d61b3c0a9 | 1 - .../ea/392a157085bc32daccd59aa1998fe2f5fb9fc0 | Bin 134 -> 0 bytes .../eb/b03002cee5d66c7732dd06241119fe72ab96a5 | 2 - .../ee/c6adcb2f3ceca0cadeccfe01b19382252ece9b | Bin 66 -> 0 bytes .../f4/e107c230d08a60fb419d19869f1f282b272d9c | Bin 30 -> 0 bytes .../revert/.gitted/refs/heads/master | 1 - .../revert/.gitted/refs/heads/merges | 1 - .../revert/.gitted/refs/heads/merges-branch | 1 - .../revert/.gitted/refs/heads/reverted-branch | 1 - .../resources/revert/.gitted/refs/heads/two | 1 - .../libgit2/tests/resources/revert/file1.txt | 14 - .../libgit2/tests/resources/revert/file2.txt | 16 - .../libgit2/tests/resources/revert/file3.txt | 16 - .../libgit2/tests/resources/revert/file6.txt | 14 - .../libgit2/tests/resources/shallow.git/HEAD | 1 - .../tests/resources/shallow.git/config | 8 - ...6e49b161700946489570d96153e5be4dc31ad4.idx | Bin 1324 -> 0 bytes ...e49b161700946489570d96153e5be4dc31ad4.pack | Bin 791 -> 0 bytes .../tests/resources/shallow.git/packed-refs | 2 - .../tests/resources/shallow.git/refs/.gitkeep | 0 .../tests/resources/shallow.git/shallow | 1 - .../tests/resources/short_tag.git/HEAD | 1 - .../tests/resources/short_tag.git/config | 5 - .../tests/resources/short_tag.git/index | Bin 104 -> 0 bytes .../4a/5ed60bafcf4638b7c8356bd4ce1916bfede93c | Bin 169 -> 0 bytes .../4d/5fcadc293a348e88f777dc0920f11e7d71441c | Bin 48 -> 0 bytes .../5d/a7760512a953e3c7c4e47e4392c7a4338fb729 | 1 - .../e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 | Bin 15 -> 0 bytes .../tests/resources/short_tag.git/packed-refs | 1 - .../resources/short_tag.git/refs/heads/master | 1 - .../resources/status/.gitted/COMMIT_EDITMSG | 1 - .../tests/resources/status/.gitted/HEAD | 1 - .../tests/resources/status/.gitted/ORIG_HEAD | 1 - .../tests/resources/status/.gitted/config | 6 - .../resources/status/.gitted/description | 1 - .../tests/resources/status/.gitted/index | Bin 1160 -> 0 bytes .../resources/status/.gitted/info/exclude | 8 - .../tests/resources/status/.gitted/logs/HEAD | 3 - .../status/.gitted/logs/refs/heads/master | 3 - .../00/17bd4ab1ec30440b17bae1680cff124ab5f1f6 | 2 - .../06/1d42a44cacde5726057b67558821d95db96f19 | Bin 44 -> 0 bytes .../18/88c805345ba265b0ee9449b8877b6064592058 | Bin 36 -> 0 bytes .../19/d9cc8584ac2c7dcf57d2680375e80f099dc481 | Bin 22 -> 0 bytes .../26/a125ee1bfc5df1e1b2e9441bbe63c8a7ae989f | 2 - .../2b/d0a343aeef7a2cf0d158478966a6e587ff3863 | Bin 56 -> 0 bytes .../32/504b727382542f9f089e24fddac5e78533e96c | Bin 31 -> 0 bytes .../37/fcb02ccc1a85d1941e7f106d52dc3702dcf0d0 | Bin 331 -> 0 bytes .../45/2e4244b5d083ddf0460acf1ecc74db9dcfa11a | Bin 30 -> 0 bytes .../52/9a16e8e762d4acb7b9636ff540a00831f9155a | Bin 32 -> 0 bytes .../53/ace0d1cc1145a5f4fe4f78a186a60263190733 | Bin 36 -> 0 bytes .../54/52d32f1dd538eb0405e8a83cc185f79e25e80f | Bin 29 -> 0 bytes .../55/d316c9ba708999f1918e9677d01dfcae69c6b9 | Bin 33 -> 0 bytes .../70/bd9443ada07063e7fbf0b3ff5c13f7494d89c2 | Bin 44 -> 0 bytes .../73/5b6a258cd196a8f7c9428419b02c1dca93fd75 | Bin 160 -> 0 bytes .../75/6e27627e67bfbc048d01ece5819c6de733d7ea | Bin 301 -> 0 bytes .../90/6ee7711f4f4928ddcb2a5f8fbc500deba0d2a8 | Bin 46 -> 0 bytes .../90/b8c29d8ba39434d1c63e1b093daaa26e5bd972 | Bin 41 -> 0 bytes .../9c/2e02cdffa8d73e6c189074594477a6baf87960 | Bin 268 -> 0 bytes .../a0/de7e0ac200c489c41c59dfa910154a70264e6e | Bin 29 -> 0 bytes .../a6/191982709b746d5650e93c2acf34ef74e11504 | Bin 37 -> 0 bytes .../a6/be623522ce87a1d862128ac42672604f7b468b | Bin 46 -> 0 bytes .../aa/27a641456848200fdb7f7c99ba36f8a0952877 | Bin 120 -> 0 bytes .../d4/27e0b2e138501a3d15cc376077a3631e15bd46 | Bin 38 -> 0 bytes .../da/bc8af9bd6e9f5bbe96a176f1a24baf3d1f8916 | Bin 42 -> 0 bytes .../e8/ee89e15bbe9b20137715232387b3de5b28972e | Bin 38 -> 0 bytes .../e9/b9107f290627c04d097733a10055af941f6bca | Bin 37 -> 0 bytes .../ed/062903b8f6f3dccb2fa81117ba6590944ef9bd | Bin 42 -> 0 bytes .../ee/3fa1b8c00aff7fe02065fdb50864bb0d932ccf | Bin 64 -> 0 bytes .../status/.gitted/refs/heads/master | 1 - .../tests/resources/status/current_file | 1 - .../tests/resources/status/ignored_file | 1 - .../tests/resources/status/modified_file | 2 - .../libgit2/tests/resources/status/new_file | 1 - .../tests/resources/status/staged_changes | 2 - .../status/staged_changes_modified_file | 3 - .../status/staged_delete_modified_file | 1 - .../tests/resources/status/staged_new_file | 1 - .../status/staged_new_file_modified_file | 2 - .../libgit2/tests/resources/status/subdir.txt | 2 - .../resources/status/subdir/current_file | 1 - .../resources/status/subdir/modified_file | 2 - .../tests/resources/status/subdir/new_file | 1 - .../tests/resources/status/\350\277\231" | 1 - vendor/libgit2/tests/resources/sub.git/HEAD | 1 - vendor/libgit2/tests/resources/sub.git/config | 8 - vendor/libgit2/tests/resources/sub.git/index | Bin 405 -> 0 bytes .../libgit2/tests/resources/sub.git/logs/HEAD | 1 - .../resources/sub.git/logs/refs/heads/master | 1 - .../10/ddd6d257e01349d514541981aeecea6b2e741d | Bin 22 -> 0 bytes .../17/6a458f94e0ea5272ce67c36bf30b6be9caf623 | Bin 28 -> 0 bytes .../94/c7d78d85c933d1d95b56bc2de01833ba8559fb | Bin 132 -> 0 bytes .../b7/a59b3f4ea13b985f8a1e0d3757d5cd3331add8 | Bin 139 -> 0 bytes .../d0/ee23c41b28746d7e822511d7838bce784ae773 | Bin 54 -> 0 bytes .../tests/resources/sub.git/refs/heads/master | 1 - .../tests/resources/submod2/.gitted/HEAD | 1 - .../tests/resources/submod2/.gitted/config | 20 - .../resources/submod2/.gitted/description | 1 - .../tests/resources/submod2/.gitted/index | Bin 944 -> 0 bytes .../resources/submod2/.gitted/info/exclude | 6 - .../tests/resources/submod2/.gitted/logs/HEAD | 4 - .../submod2/.gitted/logs/refs/heads/master | 4 - .../modules/sm_added_and_uncommited/HEAD | 1 - .../modules/sm_added_and_uncommited/config | 13 - .../sm_added_and_uncommited/description | 1 - .../modules/sm_added_and_uncommited/index | Bin 192 -> 0 bytes .../sm_added_and_uncommited/info/exclude | 6 - .../modules/sm_added_and_uncommited/logs/HEAD | 1 - .../logs/refs/heads/master | 1 - .../logs/refs/remotes/origin/HEAD | 1 - .../06/362fe2fdb7010d0e447b4fb450d405420479a1 | Bin 55 -> 0 bytes .../0e/6a3ca48bd47cfe67681acf39aa0b10a0b92484 | Bin 53 -> 0 bytes .../17/d0ece6e96460a06592d9d9d000de37ba4232c5 | Bin 93 -> 0 bytes .../41/bd4bc3df978de695f67ace64c560913da11653 | Bin 163 -> 0 bytes .../48/0095882d281ed676fe5b863569520e54a7d5c0 | Bin 163 -> 0 bytes .../5e/4963595a9774b90524d35a807169049de8ccad | Bin 167 -> 0 bytes .../6b/31c659545507c381e9cd34ec508f16c04e149e | 2 - .../73/ba924a80437097795ae839e66e187c55d3babf | Bin 93 -> 0 bytes .../78/0d7397f5e8f8f477fb55b7af3accc2154b2d4a | 2 - .../78/9efbdadaa4a582778d4584385495559ea0994b | 2 - .../88/34b635dd468a83cb012f6feace968c1c9f5d6e | Bin 81 -> 0 bytes .../d0/5f2cd5cc77addf68ed6f50d622c9a4f732e6c5 | Bin 93 -> 0 bytes .../sm_added_and_uncommited/packed-refs | 2 - .../sm_added_and_uncommited/refs/heads/master | 1 - .../refs/remotes/origin/HEAD | 1 - .../.gitted/modules/sm_changed_file/HEAD | 1 - .../.gitted/modules/sm_changed_file/config | 13 - .../modules/sm_changed_file/description | 1 - .../.gitted/modules/sm_changed_file/index | Bin 192 -> 0 bytes .../modules/sm_changed_file/info/exclude | 6 - .../.gitted/modules/sm_changed_file/logs/HEAD | 1 - .../sm_changed_file/logs/refs/heads/master | 1 - .../logs/refs/remotes/origin/HEAD | 1 - .../06/362fe2fdb7010d0e447b4fb450d405420479a1 | Bin 55 -> 0 bytes .../0e/6a3ca48bd47cfe67681acf39aa0b10a0b92484 | Bin 53 -> 0 bytes .../17/d0ece6e96460a06592d9d9d000de37ba4232c5 | Bin 93 -> 0 bytes .../41/bd4bc3df978de695f67ace64c560913da11653 | Bin 163 -> 0 bytes .../48/0095882d281ed676fe5b863569520e54a7d5c0 | Bin 163 -> 0 bytes .../5e/4963595a9774b90524d35a807169049de8ccad | Bin 167 -> 0 bytes .../6b/31c659545507c381e9cd34ec508f16c04e149e | 2 - .../73/ba924a80437097795ae839e66e187c55d3babf | Bin 93 -> 0 bytes .../78/0d7397f5e8f8f477fb55b7af3accc2154b2d4a | 2 - .../78/9efbdadaa4a582778d4584385495559ea0994b | 2 - .../88/34b635dd468a83cb012f6feace968c1c9f5d6e | Bin 81 -> 0 bytes .../d0/5f2cd5cc77addf68ed6f50d622c9a4f732e6c5 | Bin 93 -> 0 bytes .../modules/sm_changed_file/packed-refs | 2 - .../modules/sm_changed_file/refs/heads/master | 1 - .../sm_changed_file/refs/remotes/origin/HEAD | 1 - .../modules/sm_changed_head/COMMIT_EDITMSG | 1 - .../.gitted/modules/sm_changed_head/HEAD | 1 - .../.gitted/modules/sm_changed_head/config | 13 - .../modules/sm_changed_head/description | 1 - .../.gitted/modules/sm_changed_head/index | Bin 192 -> 0 bytes .../modules/sm_changed_head/info/exclude | 6 - .../.gitted/modules/sm_changed_head/logs/HEAD | 2 - .../sm_changed_head/logs/refs/heads/master | 2 - .../logs/refs/remotes/origin/HEAD | 1 - .../06/362fe2fdb7010d0e447b4fb450d405420479a1 | Bin 55 -> 0 bytes .../0e/6a3ca48bd47cfe67681acf39aa0b10a0b92484 | Bin 53 -> 0 bytes .../17/d0ece6e96460a06592d9d9d000de37ba4232c5 | Bin 93 -> 0 bytes .../3d/9386c507f6b093471a3e324085657a3c2b4247 | 3 - .../41/bd4bc3df978de695f67ace64c560913da11653 | Bin 163 -> 0 bytes .../48/0095882d281ed676fe5b863569520e54a7d5c0 | Bin 163 -> 0 bytes .../5e/4963595a9774b90524d35a807169049de8ccad | Bin 167 -> 0 bytes .../6b/31c659545507c381e9cd34ec508f16c04e149e | 2 - .../73/ba924a80437097795ae839e66e187c55d3babf | Bin 93 -> 0 bytes .../77/fb0ed3e58568d6ad362c78de08ab8649d76e29 | Bin 93 -> 0 bytes .../78/0d7397f5e8f8f477fb55b7af3accc2154b2d4a | 2 - .../78/9efbdadaa4a582778d4584385495559ea0994b | 2 - .../88/34b635dd468a83cb012f6feace968c1c9f5d6e | Bin 81 -> 0 bytes .../8e/b1e637ed9fc8e5454fa20d38f809091f9395f4 | 2 - .../d0/5f2cd5cc77addf68ed6f50d622c9a4f732e6c5 | Bin 93 -> 0 bytes .../modules/sm_changed_head/packed-refs | 2 - .../modules/sm_changed_head/refs/heads/master | 1 - .../sm_changed_head/refs/remotes/origin/HEAD | 1 - .../.gitted/modules/sm_changed_index/HEAD | 1 - .../.gitted/modules/sm_changed_index/config | 13 - .../modules/sm_changed_index/description | 1 - .../.gitted/modules/sm_changed_index/index | Bin 192 -> 0 bytes .../modules/sm_changed_index/info/exclude | 6 - .../modules/sm_changed_index/logs/HEAD | 1 - .../sm_changed_index/logs/refs/heads/master | 1 - .../logs/refs/remotes/origin/HEAD | 1 - .../06/362fe2fdb7010d0e447b4fb450d405420479a1 | Bin 55 -> 0 bytes .../0e/6a3ca48bd47cfe67681acf39aa0b10a0b92484 | Bin 53 -> 0 bytes .../17/d0ece6e96460a06592d9d9d000de37ba4232c5 | Bin 93 -> 0 bytes .../41/bd4bc3df978de695f67ace64c560913da11653 | Bin 163 -> 0 bytes .../48/0095882d281ed676fe5b863569520e54a7d5c0 | Bin 163 -> 0 bytes .../5e/4963595a9774b90524d35a807169049de8ccad | Bin 167 -> 0 bytes .../6b/31c659545507c381e9cd34ec508f16c04e149e | 2 - .../73/ba924a80437097795ae839e66e187c55d3babf | Bin 93 -> 0 bytes .../78/0d7397f5e8f8f477fb55b7af3accc2154b2d4a | 2 - .../78/9efbdadaa4a582778d4584385495559ea0994b | 2 - .../88/34b635dd468a83cb012f6feace968c1c9f5d6e | Bin 81 -> 0 bytes .../a0/2d31770687965547ab7a04cee199b29ee458d6 | Bin 134 -> 0 bytes .../d0/5f2cd5cc77addf68ed6f50d622c9a4f732e6c5 | Bin 93 -> 0 bytes .../modules/sm_changed_index/packed-refs | 2 - .../sm_changed_index/refs/heads/master | 1 - .../sm_changed_index/refs/remotes/origin/HEAD | 1 - .../modules/sm_changed_untracked_file/HEAD | 1 - .../modules/sm_changed_untracked_file/config | 13 - .../sm_changed_untracked_file/description | 1 - .../modules/sm_changed_untracked_file/index | Bin 192 -> 0 bytes .../sm_changed_untracked_file/info/exclude | 6 - .../sm_changed_untracked_file/logs/HEAD | 1 - .../logs/refs/heads/master | 1 - .../logs/refs/remotes/origin/HEAD | 1 - .../06/362fe2fdb7010d0e447b4fb450d405420479a1 | Bin 55 -> 0 bytes .../0e/6a3ca48bd47cfe67681acf39aa0b10a0b92484 | Bin 53 -> 0 bytes .../17/d0ece6e96460a06592d9d9d000de37ba4232c5 | Bin 93 -> 0 bytes .../41/bd4bc3df978de695f67ace64c560913da11653 | Bin 163 -> 0 bytes .../48/0095882d281ed676fe5b863569520e54a7d5c0 | Bin 163 -> 0 bytes .../5e/4963595a9774b90524d35a807169049de8ccad | Bin 167 -> 0 bytes .../6b/31c659545507c381e9cd34ec508f16c04e149e | 2 - .../73/ba924a80437097795ae839e66e187c55d3babf | Bin 93 -> 0 bytes .../78/0d7397f5e8f8f477fb55b7af3accc2154b2d4a | 2 - .../78/9efbdadaa4a582778d4584385495559ea0994b | 2 - .../88/34b635dd468a83cb012f6feace968c1c9f5d6e | Bin 81 -> 0 bytes .../d0/5f2cd5cc77addf68ed6f50d622c9a4f732e6c5 | Bin 93 -> 0 bytes .../sm_changed_untracked_file/packed-refs | 2 - .../refs/heads/master | 1 - .../refs/remotes/origin/HEAD | 1 - .../.gitted/modules/sm_missing_commits/HEAD | 1 - .../.gitted/modules/sm_missing_commits/config | 13 - .../modules/sm_missing_commits/description | 1 - .../.gitted/modules/sm_missing_commits/index | Bin 192 -> 0 bytes .../modules/sm_missing_commits/info/exclude | 6 - .../modules/sm_missing_commits/logs/HEAD | 1 - .../sm_missing_commits/logs/refs/heads/master | 1 - .../logs/refs/remotes/origin/HEAD | 1 - .../06/362fe2fdb7010d0e447b4fb450d405420479a1 | Bin 55 -> 0 bytes .../0e/6a3ca48bd47cfe67681acf39aa0b10a0b92484 | Bin 53 -> 0 bytes .../17/d0ece6e96460a06592d9d9d000de37ba4232c5 | Bin 93 -> 0 bytes .../41/bd4bc3df978de695f67ace64c560913da11653 | Bin 163 -> 0 bytes .../5e/4963595a9774b90524d35a807169049de8ccad | Bin 167 -> 0 bytes .../6b/31c659545507c381e9cd34ec508f16c04e149e | 2 - .../78/0d7397f5e8f8f477fb55b7af3accc2154b2d4a | 2 - .../88/34b635dd468a83cb012f6feace968c1c9f5d6e | Bin 81 -> 0 bytes .../d0/5f2cd5cc77addf68ed6f50d622c9a4f732e6c5 | Bin 93 -> 0 bytes .../modules/sm_missing_commits/packed-refs | 2 - .../sm_missing_commits/refs/heads/master | 1 - .../refs/remotes/origin/HEAD | 1 - .../submod2/.gitted/modules/sm_unchanged/HEAD | 1 - .../.gitted/modules/sm_unchanged/config | 13 - .../.gitted/modules/sm_unchanged/description | 1 - .../.gitted/modules/sm_unchanged/index | Bin 192 -> 0 bytes .../.gitted/modules/sm_unchanged/info/exclude | 6 - .../.gitted/modules/sm_unchanged/logs/HEAD | 1 - .../sm_unchanged/logs/refs/heads/master | 1 - .../logs/refs/remotes/origin/HEAD | 1 - .../06/362fe2fdb7010d0e447b4fb450d405420479a1 | Bin 55 -> 0 bytes .../0e/6a3ca48bd47cfe67681acf39aa0b10a0b92484 | Bin 53 -> 0 bytes .../17/d0ece6e96460a06592d9d9d000de37ba4232c5 | Bin 93 -> 0 bytes .../41/bd4bc3df978de695f67ace64c560913da11653 | Bin 163 -> 0 bytes .../48/0095882d281ed676fe5b863569520e54a7d5c0 | Bin 163 -> 0 bytes .../5e/4963595a9774b90524d35a807169049de8ccad | Bin 167 -> 0 bytes .../6b/31c659545507c381e9cd34ec508f16c04e149e | 2 - .../73/ba924a80437097795ae839e66e187c55d3babf | Bin 93 -> 0 bytes .../78/0d7397f5e8f8f477fb55b7af3accc2154b2d4a | 2 - .../78/9efbdadaa4a582778d4584385495559ea0994b | 2 - .../88/34b635dd468a83cb012f6feace968c1c9f5d6e | Bin 81 -> 0 bytes .../d0/5f2cd5cc77addf68ed6f50d622c9a4f732e6c5 | Bin 93 -> 0 bytes .../.gitted/modules/sm_unchanged/packed-refs | 2 - .../modules/sm_unchanged/refs/heads/master | 1 - .../sm_unchanged/refs/remotes/origin/HEAD | 1 - .../09/460e5b6cbcb05a3e404593c32a3aa7221eca0e | Bin 197 -> 0 bytes .../14/fe9ccf104058df25e0a08361c4494e167ef243 | 1 - .../22/ce3e0311dda73a5992d54a4a595518d3876ea7 | 4 - .../25/5546424b0efb847b1bfc91dbf7348b277f8970 | Bin 157 -> 0 bytes .../2a/30f1e6f94b20917005a21273f65b406d0f8bad | Bin 144 -> 0 bytes .../42/cfb95cd01bf9225b659b5ee3edcc78e8eeb478 | Bin 40 -> 0 bytes .../57/958699c2dc394f81cfc76950e9c3ac3025c398 | Bin 136 -> 0 bytes .../59/01da4f1c67756eeadc5121d206bec2431f253b | 2 - .../60/7d96653d4d0a4f733107f7890c2e67b55b620d | Bin 53 -> 0 bytes .../74/84482eb8db738cafa696993664607500a3f2b9 | Bin 173 -> 0 bytes .../7b/a4c5c3561daa5ab1a86215cfb0587e96d404d6 | Bin 48 -> 0 bytes .../87/3585b94bdeabccea991ea5e3ec1a277895b698 | Bin 137 -> 0 bytes .../97/4cf7c73de336b0c4e019f918f3cee367d72e84 | 2 - .../9d/bc299bc013ea253583b40bf327b5a6e4037b89 | Bin 80 -> 0 bytes .../a9/104bf89e911387244ef499413960ba472066d9 | Bin 165 -> 0 bytes .../b6/14088620bbdc1d29549d223ceba0f4419fd4cb | Bin 110 -> 0 bytes .../d4/07f19e50c1da1ff584beafe0d6dac7237c5d06 | Bin 55 -> 0 bytes .../d9/3e95571d92cceb5de28c205f1d5f3cc8b88bc8 | 2 - .../e3/b83bf274ee065eee48734cf8c6dfaf5e81471c | Bin 246 -> 0 bytes .../f5/4414c25e6d24fe39f5c3f128d7c8a17bc23833 | 2 - .../f9/90a25a74d1a8281ce2ab018ea8df66795cd60b | 1 - .../submod2/.gitted/refs/heads/master | 1 - .../tests/resources/submod2/README.txt | 3 - .../tests/resources/submod2/gitmodules | 24 - .../resources/submod2/just_a_dir/contents | 1 - .../tests/resources/submod2/just_a_file | 1 - .../submod2/not-submodule/.gitted/HEAD | 1 - .../submod2/not-submodule/.gitted/config | 6 - .../submod2/not-submodule/.gitted/description | 1 - .../submod2/not-submodule/.gitted/index | Bin 112 -> 0 bytes .../not-submodule/.gitted/info/exclude | 6 - .../submod2/not-submodule/.gitted/logs/HEAD | 1 - .../.gitted/logs/refs/heads/master | 1 - .../68/e92c611b80ee1ed8f38314ff9577f0d15b2444 | Bin 132 -> 0 bytes .../71/ff9927d7c8a5639e062c38a7d35c433c424627 | Bin 52 -> 0 bytes .../f0/1d56b18efd353ef2bb93a4585d590a0847195e | Bin 55 -> 0 bytes .../not-submodule/.gitted/refs/heads/master | 1 - .../submod2/not-submodule/README.txt | 1 - .../resources/submod2/not/.gitted/notempty | 1 - .../tests/resources/submod2/not/README.txt | 1 - .../submod2/sm_added_and_uncommited/.gitted | 1 - .../sm_added_and_uncommited/README.txt | 3 - .../sm_added_and_uncommited/file_to_modify | 3 - .../resources/submod2/sm_changed_file/.gitted | 1 - .../submod2/sm_changed_file/README.txt | 3 - .../submod2/sm_changed_file/file_to_modify | 4 - .../resources/submod2/sm_changed_head/.gitted | 1 - .../submod2/sm_changed_head/README.txt | 3 - .../submod2/sm_changed_head/file_to_modify | 4 - .../submod2/sm_changed_index/.gitted | 1 - .../submod2/sm_changed_index/README.txt | 3 - .../submod2/sm_changed_index/file_to_modify | 4 - .../submod2/sm_changed_untracked_file/.gitted | 1 - .../sm_changed_untracked_file/README.txt | 3 - .../sm_changed_untracked_file/file_to_modify | 3 - .../sm_changed_untracked_file/i_am_untracked | 1 - .../submod2/sm_missing_commits/.gitted | 1 - .../submod2/sm_missing_commits/README.txt | 3 - .../submod2/sm_missing_commits/file_to_modify | 3 - .../resources/submod2/sm_unchanged/.gitted | 1 - .../resources/submod2/sm_unchanged/README.txt | 3 - .../submod2/sm_unchanged/file_to_modify | 3 - .../resources/submod2_target/.gitted/HEAD | 1 - .../resources/submod2_target/.gitted/config | 6 - .../submod2_target/.gitted/description | 1 - .../resources/submod2_target/.gitted/index | Bin 192 -> 0 bytes .../submod2_target/.gitted/info/exclude | 6 - .../submod2_target/.gitted/logs/HEAD | 4 - .../.gitted/logs/refs/heads/master | 4 - .../06/362fe2fdb7010d0e447b4fb450d405420479a1 | Bin 55 -> 0 bytes .../0e/6a3ca48bd47cfe67681acf39aa0b10a0b92484 | Bin 53 -> 0 bytes .../17/d0ece6e96460a06592d9d9d000de37ba4232c5 | Bin 93 -> 0 bytes .../41/bd4bc3df978de695f67ace64c560913da11653 | Bin 163 -> 0 bytes .../48/0095882d281ed676fe5b863569520e54a7d5c0 | Bin 163 -> 0 bytes .../5e/4963595a9774b90524d35a807169049de8ccad | Bin 167 -> 0 bytes .../6b/31c659545507c381e9cd34ec508f16c04e149e | 2 - .../73/ba924a80437097795ae839e66e187c55d3babf | Bin 93 -> 0 bytes .../78/0d7397f5e8f8f477fb55b7af3accc2154b2d4a | 2 - .../78/9efbdadaa4a582778d4584385495559ea0994b | 2 - .../88/34b635dd468a83cb012f6feace968c1c9f5d6e | Bin 81 -> 0 bytes .../d0/5f2cd5cc77addf68ed6f50d622c9a4f732e6c5 | Bin 93 -> 0 bytes .../submod2_target/.gitted/refs/heads/master | 1 - .../tests/resources/submod2_target/README.txt | 3 - .../resources/submod2_target/file_to_modify | 3 - .../resources/submodule_simple/.gitmodules | 3 - .../resources/submodule_simple/.gitted/HEAD | 1 - .../resources/submodule_simple/.gitted/config | 8 - .../submodule_simple/.gitted/description | 1 - .../resources/submodule_simple/.gitted/index | Bin 184 -> 0 bytes .../22/9cea838964f435d4fc2c11561ddb7447003609 | Bin 134 -> 0 bytes .../5b/19f7523fbf55c96153ff5a94875583f1115a36 | Bin 91 -> 0 bytes .../a8/575e6aaececba78823993e4f11abbc6172aabd | Bin 174 -> 0 bytes .../b4/f28943fad380f4ee3a9c6b95259b28204cc25a | Bin 65 -> 0 bytes .../d6/9ff504a3ba631f2fdb35bff93cc8cb8e85f4f8 | Bin 92 -> 0 bytes .../submodule_simple/.gitted/packed-refs | 3 - .../.gitted/refs/heads/alternate_1 | 1 - .../.gitted/refs/heads/master | 1 - .../resources/submodule_with_path/.gitmodules | 3 - .../submodule_with_path/.gitted/HEAD | 1 - .../submodule_with_path/.gitted/config | 8 - .../submodule_with_path/.gitted/index | Bin 253 -> 0 bytes .../18/372280a56a54340fa600aa91315065c6c4c693 | Bin 85 -> 0 bytes .../36/683131578275f6a8fd1c539e0d5da0d8adff26 | Bin 63 -> 0 bytes .../89/ca686bb21bfb75dda99a02313831a0c418f921 | Bin 161 -> 0 bytes .../b1/620ef2628d10416a84d19c783e33dc4556c9c3 | Bin 86 -> 0 bytes .../ba/34c47dc9d3d0b1bb335b45c9d26ba1f0fc90c7 | Bin 68 -> 0 bytes .../c8/4bf57ba2254dba216ab5c6eb1a19fe8bd0e0d6 | Bin 127 -> 0 bytes .../d5/45fc6b40ec9e67332b6a1d2dedcbdb1bffeb6b | Bin 51 -> 0 bytes .../.gitted/refs/heads/master | 1 - .../tests/resources/submodules/.gitted/HEAD | 1 - .../tests/resources/submodules/.gitted/config | 6 - .../resources/submodules/.gitted/description | 1 - .../tests/resources/submodules/.gitted/index | Bin 408 -> 0 bytes .../resources/submodules/.gitted/info/exclude | 8 - .../resources/submodules/.gitted/info/refs | 1 - .../resources/submodules/.gitted/logs/HEAD | 2 - .../submodules/.gitted/logs/refs/heads/master | 2 - .../26/a3b32a9b7d97486c5557f5902e8ac94638145e | 2 - .../78/308c9251cf4eee8b25a76c7d2790c73d797357 | Bin 97 -> 0 bytes .../97/896810b3210244a62a82458b8e0819ecfc6850 | 3 - .../b6/0fd986699ba4e9e68bea07cf8e793f323ef888 | Bin 138 -> 0 bytes .../d5/f7fc3f74f7dec08280f370a975b112e8f60818 | Bin 21 -> 0 bytes .../e3/50052cc767cd1fcb37e84e9a89e701925be4ae | Bin 120 -> 0 bytes .../submodules/.gitted/objects/info/packs | 2 - ...9d04bb39ac274669e2184e45bd90015d02ef5b.idx | Bin 1156 -> 0 bytes ...d04bb39ac274669e2184e45bd90015d02ef5b.pack | Bin 228 -> 0 bytes .../resources/submodules/.gitted/packed-refs | 2 - .../submodules/.gitted/refs/heads/master | 1 - .../libgit2/tests/resources/submodules/added | 1 - .../tests/resources/submodules/gitmodules | 6 - .../tests/resources/submodules/ignored | 1 - .../tests/resources/submodules/modified | 2 - .../submodules/testrepo/.gitted/HEAD | 1 - .../submodules/testrepo/.gitted/config | 12 - .../submodules/testrepo/.gitted/description | 1 - .../submodules/testrepo/.gitted/index | Bin 256 -> 0 bytes .../submodules/testrepo/.gitted/info/exclude | 6 - .../submodules/testrepo/.gitted/logs/HEAD | 1 - .../testrepo/.gitted/logs/refs/heads/master | 1 - .../13/85f264afb75a56a5bec74243be9b367ba4ca08 | Bin 19 -> 0 bytes .../18/1037049a54a1eb5fab404658a3a250b44335d7 | Bin 51 -> 0 bytes .../18/10dff58d8a660512d4832e740f692884338ccd | Bin 119 -> 0 bytes .../1f/67fc4386b2d171e0d21be1c447e12660561f9b | Bin 21 -> 0 bytes .../27/0b8ea76056d5cad83af921837702d3e3c2924d | Bin 21 -> 0 bytes .../32/59a6bd5b57fb9c1281bb7ed3167b50f224cb54 | Bin 50 -> 0 bytes .../36/97d64be941a53d4ae8f6a271e4e3fa56b022cc | Bin 23 -> 0 bytes .../45/b983be36b73c0788dc9cbcb76cbb80fc7bb057 | Bin 18 -> 0 bytes .../4a/202b346bb0fb0db7eff3cffeb3c70babbd2045 | 2 - .../5b/5b025afb0b4c913b4c338a42934a3863bf3644 | 2 - .../75/057dd4114e74cca1d750d0aee1647c903cb60a | Bin 119 -> 0 bytes .../76/3d71aadf09a7951596c9746c024e7eece7c7af | 1 - .../7b/4384978d2493e851f9cca7858815fac9b10980 | Bin 145 -> 0 bytes .../81/4889a078c031f61ed08ab5fa863aea9314344d | Bin 82 -> 0 bytes .../84/96071c1b46c854b31185ea97743be6a8774479 | Bin 126 -> 0 bytes .../94/4c0f6e4dfa41595e6eb3ceecdb14f50fe18162 | 1 - .../9a/03079b8a8ee85a0bee58bf9be3da8b62414ed4 | Bin 50 -> 0 bytes .../9f/d738e8f7967c078dceed8190330fc8648ee56a | 3 - .../a4/a7dce85cf63874e984719f4fdd239f5145052f | 2 - .../a6/5fedf39aefe402d3bb6e24df4d4f5fe4547750 | 3 - .../a7/1586c1dfe8a71c6cbf6c129f404c5642ff31bd | Bin 28 -> 0 bytes .../a8/233120f6ad708f843d861ce2b7228ec4e3dec6 | Bin 26 -> 0 bytes .../ae/90f12eea699729ed24555e40b9fd669da12a12 | Bin 148 -> 0 bytes .../b2/5fa35b38051e4ae45d4222e795f9df2e43f1d1 | 2 - .../b6/361fc6a97178d8fc8639fdeed71c775ab52593 | Bin 80 -> 0 bytes .../be/3563ae3f795b2b4353bcce3a527ad0a4f7f644 | 3 - .../c4/7800c7266a2be04c571c04d5a6614691ea99bd | 3 - .../d6/c93164c249c8000205dd4ec5cbca1b516d487f | Bin 21 -> 0 bytes .../e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 | Bin 15 -> 0 bytes .../e7/b4ad382349ff96dd8199000580b9b1e2042eb0 | Bin 21 -> 0 bytes .../f1/425cef211cc08caa31e7b545ffb232acb098c3 | Bin 103 -> 0 bytes .../f6/0079018b664e4e79329a7ef9559c8d9e0378d1 | Bin 82 -> 0 bytes .../fa/49b077972391ad58037050f2a75f74e3671e92 | Bin 24 -> 0 bytes .../fd/093bff70906175335656e6ce6ae05783708765 | Bin 82 -> 0 bytes ...1e489679b7d3418f9ab594bda8ceb37dd4c695.idx | Bin 46656 -> 0 bytes ...e489679b7d3418f9ab594bda8ceb37dd4c695.pack | Bin 386089 -> 0 bytes ...c6adf9f61318f041845b01440d09aa7a91e1b5.idx | Bin 1240 -> 0 bytes ...6adf9f61318f041845b01440d09aa7a91e1b5.pack | Bin 491 -> 0 bytes ...5f5d483273108c9d8dd0e4728ccf0b2982423a.idx | Bin 1240 -> 0 bytes ...f5d483273108c9d8dd0e4728ccf0b2982423a.pack | Bin 498 -> 0 bytes .../submodules/testrepo/.gitted/packed-refs | 12 - .../testrepo/.gitted/refs/heads/master | 1 - .../testrepo/.gitted/refs/remotes/origin/HEAD | 1 - .../resources/submodules/testrepo/README | 1 - .../submodules/testrepo/branch_file.txt | 2 - .../resources/submodules/testrepo/new.txt | 1 - .../tests/resources/submodules/unmodified | 1 - .../tests/resources/submodules/untracked | 1 - .../resources/super/.gitted/COMMIT_EDITMSG | 1 - .../tests/resources/super/.gitted/HEAD | 1 - .../tests/resources/super/.gitted/config | 10 - .../tests/resources/super/.gitted/index | Bin 217 -> 0 bytes .../51/589c218bf77a8da9e9d8dbc097d76a742726c4 | Bin 90 -> 0 bytes .../79/d0d58ca6aa1688a073d280169908454cad5b91 | Bin 132 -> 0 bytes .../d7/57768b570a83e80d02edcc1032db14573e5034 | Bin 87 -> 0 bytes .../resources/super/.gitted/refs/heads/master | 1 - .../libgit2/tests/resources/super/gitmodules | 3 - .../resources/template/branches/.gitignore | 2 - .../tests/resources/template/description | 1 - .../resources/template/hooks/update.sample | 9 - .../tests/resources/template/info/exclude | 6 - .../tests/resources/testrepo.git/FETCH_HEAD | 2 - .../libgit2/tests/resources/testrepo.git/HEAD | 1 - .../tests/resources/testrepo.git/HEAD_TRACKER | 1 - .../tests/resources/testrepo.git/config | 40 - .../tests/resources/testrepo.git/index | Bin 10041 -> 0 bytes .../tests/resources/testrepo.git/logs/HEAD | 7 - .../testrepo.git/logs/refs/heads/br2 | 2 - .../testrepo.git/logs/refs/heads/master | 2 - .../testrepo.git/logs/refs/heads/not-good | 1 - .../logs/refs/remotes/origin/HEAD | 1 - .../logs/refs/remotes/test/master | 2 - .../08/b041783f40edfe12bb406c9c9a8a040177c125 | Bin 54 -> 0 bytes .../13/85f264afb75a56a5bec74243be9b367ba4ca08 | Bin 19 -> 0 bytes .../18/1037049a54a1eb5fab404658a3a250b44335d7 | Bin 51 -> 0 bytes .../18/10dff58d8a660512d4832e740f692884338ccd | Bin 119 -> 0 bytes .../1a/443023183e3f2bfbef8ac923cd81c1018a18fd | Bin 122 -> 0 bytes .../1b/8cbad43e867676df601306689fe7c3def5e689 | Bin 51 -> 0 bytes .../1f/67fc4386b2d171e0d21be1c447e12660561f9b | Bin 21 -> 0 bytes .../25/8f0e2a959a364e40ed6603d5d44fbb24765b10 | Bin 168 -> 0 bytes .../27/0b8ea76056d5cad83af921837702d3e3c2924d | Bin 21 -> 0 bytes .../2d/59075e0681f540482d4f6223a68e0fef790bc7 | Bin 44 -> 0 bytes .../32/59a6bd5b57fb9c1281bb7ed3167b50f224cb54 | Bin 50 -> 0 bytes .../36/97d64be941a53d4ae8f6a271e4e3fa56b022cc | Bin 23 -> 0 bytes .../45/b983be36b73c0788dc9cbcb76cbb80fc7bb057 | Bin 18 -> 0 bytes .../4a/202b346bb0fb0db7eff3cffeb3c70babbd2045 | 2 - .../4a/23e2e65ad4e31c4c9db7dc746650bfad082679 | Bin 83 -> 0 bytes .../4b/22b35d44b5a4f589edf3dc89196399771796ea | Bin 44 -> 0 bytes .../52/1d87c1ec3aef9824daf6d96cc0ae3710766d91 | Bin 152 -> 0 bytes .../5b/5b025afb0b4c913b4c338a42934a3863bf3644 | 2 - .../75/057dd4114e74cca1d750d0aee1647c903cb60a | Bin 119 -> 0 bytes .../76/3d71aadf09a7951596c9746c024e7eece7c7af | 1 - .../7b/4384978d2493e851f9cca7858815fac9b10980 | Bin 145 -> 0 bytes .../81/4889a078c031f61ed08ab5fa863aea9314344d | Bin 82 -> 0 bytes .../84/96071c1b46c854b31185ea97743be6a8774479 | Bin 126 -> 0 bytes .../84/9a5e34a26815e821f865b8479f5815a47af0fe | 2 - .../94/4c0f6e4dfa41595e6eb3ceecdb14f50fe18162 | 1 - .../9a/03079b8a8ee85a0bee58bf9be3da8b62414ed4 | Bin 50 -> 0 bytes .../9f/13f7d0a9402c681f91dc590cf7b5470e6a77d2 | 2 - .../9f/d738e8f7967c078dceed8190330fc8648ee56a | 3 - .../a4/a7dce85cf63874e984719f4fdd239f5145052f | 2 - .../a6/5fedf39aefe402d3bb6e24df4d4f5fe4547750 | 3 - .../a7/1586c1dfe8a71c6cbf6c129f404c5642ff31bd | Bin 28 -> 0 bytes .../a8/233120f6ad708f843d861ce2b7228ec4e3dec6 | Bin 26 -> 0 bytes .../ae/90f12eea699729ed24555e40b9fd669da12a12 | Bin 148 -> 0 bytes .../b2/5fa35b38051e4ae45d4222e795f9df2e43f1d1 | 2 - .../b6/361fc6a97178d8fc8639fdeed71c775ab52593 | Bin 80 -> 0 bytes .../be/3563ae3f795b2b4353bcce3a527ad0a4f7f644 | 3 - .../c4/7800c7266a2be04c571c04d5a6614691ea99bd | 3 - .../d0/7b0f9a8c89f1d9e74dc4fce6421dec5ef8a659 | Bin 149 -> 0 bytes .../d6/c93164c249c8000205dd4ec5cbca1b516d487f | Bin 21 -> 0 bytes .../d7/1aab4f9b04b45ce09bcaa636a9be6231474759 | Bin 79 -> 0 bytes .../e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 | Bin 15 -> 0 bytes .../e7/b4ad382349ff96dd8199000580b9b1e2042eb0 | Bin 21 -> 0 bytes .../f1/425cef211cc08caa31e7b545ffb232acb098c3 | Bin 103 -> 0 bytes .../f6/0079018b664e4e79329a7ef9559c8d9e0378d1 | Bin 82 -> 0 bytes .../fa/49b077972391ad58037050f2a75f74e3671e92 | Bin 24 -> 0 bytes .../fd/093bff70906175335656e6ce6ae05783708765 | Bin 82 -> 0 bytes .../fd/4959ce7510db09d4d8217fa2d1780413e05a09 | Bin 152 -> 0 bytes ...1e489679b7d3418f9ab594bda8ceb37dd4c695.idx | Bin 46656 -> 0 bytes ...e489679b7d3418f9ab594bda8ceb37dd4c695.pack | Bin 386089 -> 0 bytes ...c6adf9f61318f041845b01440d09aa7a91e1b5.idx | Bin 1240 -> 0 bytes ...6adf9f61318f041845b01440d09aa7a91e1b5.pack | Bin 491 -> 0 bytes ...5f5d483273108c9d8dd0e4728ccf0b2982423a.idx | Bin 1240 -> 0 bytes ...f5d483273108c9d8dd0e4728ccf0b2982423a.pack | Bin 498 -> 0 bytes .../tests/resources/testrepo.git/packed-refs | 3 - .../resources/testrepo.git/refs/heads/br2 | 1 - .../testrepo.git/refs/heads/cannot-fetch | 1 - .../resources/testrepo.git/refs/heads/chomped | 1 - .../resources/testrepo.git/refs/heads/haacked | 1 - .../resources/testrepo.git/refs/heads/master | 1 - .../testrepo.git/refs/heads/not-good | 1 - .../testrepo.git/refs/heads/packed-test | 1 - .../testrepo.git/refs/heads/subtrees | 1 - .../resources/testrepo.git/refs/heads/test | 1 - .../testrepo.git/refs/heads/track-local | 1 - .../testrepo.git/refs/heads/trailing | 1 - .../resources/testrepo.git/refs/notes/fanout | 1 - .../testrepo.git/refs/remotes/test/master | 1 - .../tests/resources/testrepo/.gitted/HEAD | 1 - .../resources/testrepo/.gitted/HEAD_TRACKER | 1 - .../tests/resources/testrepo/.gitted/config | 8 - .../tests/resources/testrepo/.gitted/index | Bin 10041 -> 0 bytes .../09/9fabac3a9ea935598528c27f866e34089c2eff | 1 - .../13/85f264afb75a56a5bec74243be9b367ba4ca08 | Bin 19 -> 0 bytes .../14/4344043ba4d4a405da03de3844aa829ae8be0e | Bin 163 -> 0 bytes .../16/8e4ebd1c667499548ae12403b19b22a5c5e925 | Bin 147 -> 0 bytes .../18/1037049a54a1eb5fab404658a3a250b44335d7 | Bin 51 -> 0 bytes .../18/10dff58d8a660512d4832e740f692884338ccd | Bin 119 -> 0 bytes .../1d/d0968be3ff95fcaecb6fa4245662db9fdc4568 | Bin 73 -> 0 bytes .../1f/67fc4386b2d171e0d21be1c447e12660561f9b | Bin 21 -> 0 bytes .../27/0b8ea76056d5cad83af921837702d3e3c2924d | Bin 21 -> 0 bytes .../2b/d0a343aeef7a2cf0d158478966a6e587ff3863 | Bin 56 -> 0 bytes .../32/59a6bd5b57fb9c1281bb7ed3167b50f224cb54 | Bin 50 -> 0 bytes .../36/97d64be941a53d4ae8f6a271e4e3fa56b022cc | Bin 23 -> 0 bytes .../45/b983be36b73c0788dc9cbcb76cbb80fc7bb057 | Bin 18 -> 0 bytes .../45/dd856fdd4d89b884c340ba0e047752d9b085d6 | Bin 156 -> 0 bytes .../4a/202b346bb0fb0db7eff3cffeb3c70babbd2045 | 2 - .../4e/0883eeeeebc1fb1735161cea82f7cb5fab7e63 | Bin 50 -> 0 bytes .../4e/886e602529caa9ab11d71f86634bd1b6e0de10 | Bin 56 -> 0 bytes .../5b/5b025afb0b4c913b4c338a42934a3863bf3644 | 2 - .../62/eb56dabb4b9929bc15dd9263c2c733b13d2dcc | Bin 50 -> 0 bytes .../66/3adb09143767984f7be83a91effa47e128c735 | Bin 19 -> 0 bytes .../6b/377958d8c6a4906e8573b53672a1a23a4e8ce6 | Bin 167 -> 0 bytes .../6b/9b767af9992b4abad5e24ffb1ba2d688ca602e | Bin 41 -> 0 bytes .../6f/d5c7dd2ab27b48c493023f794be09861e9045f | 1 - .../75/057dd4114e74cca1d750d0aee1647c903cb60a | Bin 119 -> 0 bytes .../76/3d71aadf09a7951596c9746c024e7eece7c7af | 1 - .../7b/2417a23b63e1fdde88c80e14b33247c6e5785a | Bin 187 -> 0 bytes .../7b/4384978d2493e851f9cca7858815fac9b10980 | Bin 145 -> 0 bytes .../81/4889a078c031f61ed08ab5fa863aea9314344d | Bin 82 -> 0 bytes .../84/96071c1b46c854b31185ea97743be6a8774479 | Bin 126 -> 0 bytes .../87/380ae84009e9c503506c2f6143a4fc6c60bf80 | Bin 161 -> 0 bytes .../94/4c0f6e4dfa41595e6eb3ceecdb14f50fe18162 | 1 - .../9a/03079b8a8ee85a0bee58bf9be3da8b62414ed4 | Bin 50 -> 0 bytes .../9f/d738e8f7967c078dceed8190330fc8648ee56a | 3 - .../a4/a7dce85cf63874e984719f4fdd239f5145052f | 2 - .../a6/5fedf39aefe402d3bb6e24df4d4f5fe4547750 | 3 - .../a7/1586c1dfe8a71c6cbf6c129f404c5642ff31bd | Bin 28 -> 0 bytes .../a8/233120f6ad708f843d861ce2b7228ec4e3dec6 | Bin 26 -> 0 bytes .../ae/90f12eea699729ed24555e40b9fd669da12a12 | Bin 148 -> 0 bytes .../af/e4393b2b2a965f06acf2ca9658eaa01e0cd6b6 | Bin 171 -> 0 bytes .../b2/5fa35b38051e4ae45d4222e795f9df2e43f1d1 | 2 - .../b6/361fc6a97178d8fc8639fdeed71c775ab52593 | Bin 80 -> 0 bytes .../be/3563ae3f795b2b4353bcce3a527ad0a4f7f644 | 3 - .../c0/528fd6cc988c0a40ce0be11bc192fc8dc5346e | Bin 22 -> 0 bytes .../c3/6d8ea75da8cb510fcb0c408c1d7e53f9a99dbe | Bin 192 -> 0 bytes .../c4/7800c7266a2be04c571c04d5a6614691ea99bd | 3 - .../ce/054d4c5e3c83522aed8bc061987b46b7ede3be | Bin 194 -> 0 bytes .../cf/80f8de9f1185bf3a05f993f6121880dd0cfbc9 | Bin 162 -> 0 bytes .../d4/27e0b2e138501a3d15cc376077a3631e15bd46 | Bin 38 -> 0 bytes .../d5/2a8fe84ceedf260afe4f0287bbfca04a117e83 | Bin 147 -> 0 bytes .../d6/c93164c249c8000205dd4ec5cbca1b516d487f | Bin 21 -> 0 bytes .../e3/6900c3224db4adf4c7f7a09d4ac80247978a13 | Bin 59 -> 0 bytes .../e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 | Bin 15 -> 0 bytes .../e7/b4ad382349ff96dd8199000580b9b1e2042eb0 | Bin 21 -> 0 bytes .../ee/3fa1b8c00aff7fe02065fdb50864bb0d932ccf | Bin 64 -> 0 bytes .../f1/425cef211cc08caa31e7b545ffb232acb098c3 | Bin 103 -> 0 bytes .../f6/0079018b664e4e79329a7ef9559c8d9e0378d1 | Bin 82 -> 0 bytes .../fa/49b077972391ad58037050f2a75f74e3671e92 | Bin 24 -> 0 bytes .../fd/093bff70906175335656e6ce6ae05783708765 | Bin 82 -> 0 bytes ...1e489679b7d3418f9ab594bda8ceb37dd4c695.idx | Bin 46656 -> 0 bytes ...e489679b7d3418f9ab594bda8ceb37dd4c695.pack | Bin 386089 -> 0 bytes ...c6adf9f61318f041845b01440d09aa7a91e1b5.idx | Bin 1240 -> 0 bytes ...6adf9f61318f041845b01440d09aa7a91e1b5.pack | Bin 491 -> 0 bytes ...5f5d483273108c9d8dd0e4728ccf0b2982423a.idx | Bin 1240 -> 0 bytes ...f5d483273108c9d8dd0e4728ccf0b2982423a.pack | Bin 498 -> 0 bytes .../resources/testrepo/.gitted/packed-refs | 4 - .../resources/testrepo/.gitted/refs/heads/br2 | 1 - .../resources/testrepo/.gitted/refs/heads/dir | 1 - .../testrepo/.gitted/refs/heads/ident | 1 - .../.gitted/refs/heads/long-file-name | 1 - .../testrepo/.gitted/refs/heads/master | 1 - .../testrepo/.gitted/refs/heads/packed-test | 1 - .../testrepo/.gitted/refs/heads/subtrees | 1 - .../testrepo/.gitted/refs/heads/test | 1 - .../tests/resources/testrepo2/.gitted/HEAD | 1 - .../tests/resources/testrepo2/.gitted/config | 26 - .../resources/testrepo2/.gitted/description | 1 - .../tests/resources/testrepo2/.gitted/index | Bin 512 -> 0 bytes .../resources/testrepo2/.gitted/info/exclude | 6 - .../resources/testrepo2/.gitted/logs/HEAD | 1 - .../testrepo2/.gitted/logs/refs/heads/master | 1 - .../.gitted/logs/refs/remotes/origin/HEAD | 1 - .../0c/37a5391bbff43c37f0d0371823a5509eed5b1d | Bin 134 -> 0 bytes .../13/85f264afb75a56a5bec74243be9b367ba4ca08 | Bin 19 -> 0 bytes .../18/1037049a54a1eb5fab404658a3a250b44335d7 | Bin 51 -> 0 bytes .../18/10dff58d8a660512d4832e740f692884338ccd | Bin 119 -> 0 bytes .../2d/2eff63372b08adf0a9eb84109ccf7d19e2f3a2 | Bin 125 -> 0 bytes .../36/060c58702ed4c2a40832c51758d5344201d89a | 2 - .../45/b983be36b73c0788dc9cbcb76cbb80fc7bb057 | Bin 18 -> 0 bytes .../4a/202b346bb0fb0db7eff3cffeb3c70babbd2045 | 2 - .../5b/5b025afb0b4c913b4c338a42934a3863bf3644 | 2 - .../61/9f9935957e010c419cb9d15621916ddfcc0b96 | Bin 116 -> 0 bytes .../75/057dd4114e74cca1d750d0aee1647c903cb60a | Bin 119 -> 0 bytes .../7f/043268ea43ce18e3540acaabf9e090c91965b0 | Bin 55 -> 0 bytes .../81/4889a078c031f61ed08ab5fa863aea9314344d | Bin 82 -> 0 bytes .../84/96071c1b46c854b31185ea97743be6a8774479 | Bin 126 -> 0 bytes .../9f/d738e8f7967c078dceed8190330fc8648ee56a | 3 - .../a4/a7dce85cf63874e984719f4fdd239f5145052f | 2 - .../a7/1586c1dfe8a71c6cbf6c129f404c5642ff31bd | Bin 28 -> 0 bytes .../a8/233120f6ad708f843d861ce2b7228ec4e3dec6 | Bin 26 -> 0 bytes .../be/3563ae3f795b2b4353bcce3a527ad0a4f7f644 | 3 - .../c4/7800c7266a2be04c571c04d5a6614691ea99bd | 3 - .../c4/dc1555e4d4fa0e0c9c3fc46734c7c35b3ce90b | Bin 116 -> 0 bytes .../e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 | Bin 15 -> 0 bytes .../f6/0079018b664e4e79329a7ef9559c8d9e0378d1 | Bin 82 -> 0 bytes .../fa/49b077972391ad58037050f2a75f74e3671e92 | Bin 24 -> 0 bytes .../fd/093bff70906175335656e6ce6ae05783708765 | Bin 82 -> 0 bytes ...c6adf9f61318f041845b01440d09aa7a91e1b5.idx | Bin 1240 -> 0 bytes ...6adf9f61318f041845b01440d09aa7a91e1b5.pack | Bin 491 -> 0 bytes .../resources/testrepo2/.gitted/packed-refs | 6 - .../testrepo2/.gitted/refs/heads/master | 1 - .../.gitted/refs/remotes/origin/HEAD | 1 - .../libgit2/tests/resources/testrepo2/README | 1 - .../libgit2/tests/resources/testrepo2/new.txt | 1 - .../tests/resources/testrepo2/subdir/README | 1 - .../tests/resources/testrepo2/subdir/new.txt | 1 - .../resources/testrepo2/subdir/subdir2/README | 1 - .../testrepo2/subdir/subdir2/new.txt | 1 - .../tests/resources/twowaymerge.git/HEAD | 1 - .../tests/resources/twowaymerge.git/config | 5 - .../resources/twowaymerge.git/description | 1 - .../resources/twowaymerge.git/info/exclude | 6 - .../0c/8a3f1f3d5f421cf83048c7c73ee3b55a5e0f29 | Bin 157 -> 0 bytes .../10/2dce8e3081f398e4bdd9fd894dc85ac3ca6a67 | Bin 54 -> 0 bytes .../17/7d8634a28e26ec7819284752757ebe01a479d5 | Bin 80 -> 0 bytes .../1c/30b88f5f3ee66d78df6520a7de9e89b890818b | 3 - .../1f/4c0311a24b63f6fc209a59a1e404942d4a5006 | 2 - .../22/24e191514cb4bd8c566d80dac22dfcb1e9bb83 | 3 - .../29/6e56023cdc034d2735fee8c0d85a659d1b07f4 | Bin 51 -> 0 bytes .../31/51880ae2b363f1c262cf98b750c1f169a0d432 | Bin 68 -> 0 bytes .../3b/287f8730c81d0b763c2d294618a5e32b67b4f8 | Bin 54 -> 0 bytes .../42/b7311aa626e712891940c1ec5d5cba201946a4 | 3 - .../49/6d6428b9cf92981dc9495211e6e1120fb6f2ba | Bin 46 -> 0 bytes .../59/b0cf7d74659e1cdb13305319d6d4ce2733c118 | Bin 65 -> 0 bytes .../6a/b5d28acbf3c3bdff276f7ccfdf29c1520e542f | 1 - .../6c/fca542b55b8b37017e6125a4b8f59a6eae6f11 | Bin 68 -> 0 bytes .../76/5b32c65d38f04c4f287abda055818ec0f26912 | Bin 54 -> 0 bytes .../7b/8c336c45fc6895c1c60827260fe5d798e5d247 | 3 - .../82/bf9a1a10a4b25c1f14c9607b60970705e92545 | 1 - .../8b/82fb1794cb1c8c7f172ec730a4c2db0ae3e650 | 3 - .../9a/40a2f11c191f180c47e54b11567cb3c1e89b30 | Bin 62 -> 0 bytes .../9b/219343610c88a1187c996d0dc58330b55cee28 | 2 - .../9f/e06a50f4d1634d6c6879854d01d80857388706 | Bin 65 -> 0 bytes .../a4/1a49f8f5cd9b6cb14a076bf8394881ed0b4d19 | 3 - .../a9/53a018c5b10b20c86e69fef55ebc8ad4c5a417 | 1 - .../a9/cce3cd1b3efbda5b1f4a6dcc3f1570b2d3d74c | 1 - .../bd/1732c43c68d712ad09e1d872b9be6d4b9efdc4 | Bin 158 -> 0 bytes .../c3/7a783c20d92ac92362a78a32860f7eebf938ef | Bin 158 -> 0 bytes .../cb/dd40facab1682754eb67f7a43f29e672903cf6 | Bin 51 -> 0 bytes .../cd/f97fd3bb48eb3827638bb33d208f5fd32d0aa6 | Bin 158 -> 0 bytes .../d6/f10d549cb335b9e6d38afc1f0088be69b50494 | Bin 62 -> 0 bytes .../d9/acdc7ae7632adfeec67fa73c1e343cf4d1f47e | 1 - .../e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 | Bin 15 -> 0 bytes .../ef/0488f0b722f0be8bcb90a7730ac7efafd1d694 | 1 - .../fc/f7e3f51c11d199ab7a78403ee4f9ccd028da25 | Bin 62 -> 0 bytes .../twowaymerge.git/refs/heads/first-branch | 1 - .../twowaymerge.git/refs/heads/master | 1 - .../twowaymerge.git/refs/heads/second-branch | 1 - .../tests/resources/typechanges/.gitted/HEAD | 1 - .../resources/typechanges/.gitted/config | 12 - .../resources/typechanges/.gitted/description | 1 - .../tests/resources/typechanges/.gitted/index | Bin 184 -> 0 bytes .../typechanges/.gitted/info/exclude | 6 - .../typechanges/.gitted/modules/b/HEAD | 1 - .../typechanges/.gitted/modules/b/config | 13 - .../typechanges/.gitted/modules/b/description | 1 - .../typechanges/.gitted/modules/b/index | Bin 192 -> 0 bytes .../.gitted/modules/b/info/exclude | 6 - .../06/362fe2fdb7010d0e447b4fb450d405420479a1 | Bin 55 -> 0 bytes .../0e/6a3ca48bd47cfe67681acf39aa0b10a0b92484 | Bin 53 -> 0 bytes .../17/d0ece6e96460a06592d9d9d000de37ba4232c5 | Bin 93 -> 0 bytes .../41/bd4bc3df978de695f67ace64c560913da11653 | Bin 163 -> 0 bytes .../48/0095882d281ed676fe5b863569520e54a7d5c0 | Bin 163 -> 0 bytes .../5e/4963595a9774b90524d35a807169049de8ccad | Bin 167 -> 0 bytes .../6b/31c659545507c381e9cd34ec508f16c04e149e | 2 - .../73/ba924a80437097795ae839e66e187c55d3babf | Bin 93 -> 0 bytes .../78/0d7397f5e8f8f477fb55b7af3accc2154b2d4a | 2 - .../78/9efbdadaa4a582778d4584385495559ea0994b | 2 - .../88/34b635dd468a83cb012f6feace968c1c9f5d6e | Bin 81 -> 0 bytes .../d0/5f2cd5cc77addf68ed6f50d622c9a4f732e6c5 | Bin 93 -> 0 bytes .../typechanges/.gitted/modules/b/packed-refs | 2 - .../.gitted/modules/b/refs/heads/master | 1 - .../modules/b/refs/remotes/origin/HEAD | 1 - .../typechanges/.gitted/modules/d/HEAD | 1 - .../typechanges/.gitted/modules/d/config | 13 - .../typechanges/.gitted/modules/d/description | 1 - .../typechanges/.gitted/modules/d/index | Bin 192 -> 0 bytes .../.gitted/modules/d/info/exclude | 6 - .../06/362fe2fdb7010d0e447b4fb450d405420479a1 | Bin 55 -> 0 bytes .../0e/6a3ca48bd47cfe67681acf39aa0b10a0b92484 | Bin 53 -> 0 bytes .../17/d0ece6e96460a06592d9d9d000de37ba4232c5 | Bin 93 -> 0 bytes .../41/bd4bc3df978de695f67ace64c560913da11653 | Bin 163 -> 0 bytes .../48/0095882d281ed676fe5b863569520e54a7d5c0 | Bin 163 -> 0 bytes .../5e/4963595a9774b90524d35a807169049de8ccad | Bin 167 -> 0 bytes .../6b/31c659545507c381e9cd34ec508f16c04e149e | 2 - .../73/ba924a80437097795ae839e66e187c55d3babf | Bin 93 -> 0 bytes .../78/0d7397f5e8f8f477fb55b7af3accc2154b2d4a | 2 - .../78/9efbdadaa4a582778d4584385495559ea0994b | 2 - .../88/34b635dd468a83cb012f6feace968c1c9f5d6e | Bin 81 -> 0 bytes .../d0/5f2cd5cc77addf68ed6f50d622c9a4f732e6c5 | Bin 93 -> 0 bytes .../typechanges/.gitted/modules/d/packed-refs | 2 - .../.gitted/modules/d/refs/heads/master | 1 - .../modules/d/refs/remotes/origin/HEAD | 1 - .../typechanges/.gitted/modules/e/HEAD | 1 - .../typechanges/.gitted/modules/e/config | 13 - .../typechanges/.gitted/modules/e/description | 1 - .../typechanges/.gitted/modules/e/index | Bin 192 -> 0 bytes .../.gitted/modules/e/info/exclude | 6 - .../06/362fe2fdb7010d0e447b4fb450d405420479a1 | Bin 55 -> 0 bytes .../0e/6a3ca48bd47cfe67681acf39aa0b10a0b92484 | Bin 53 -> 0 bytes .../17/d0ece6e96460a06592d9d9d000de37ba4232c5 | Bin 93 -> 0 bytes .../41/bd4bc3df978de695f67ace64c560913da11653 | Bin 163 -> 0 bytes .../48/0095882d281ed676fe5b863569520e54a7d5c0 | Bin 163 -> 0 bytes .../5e/4963595a9774b90524d35a807169049de8ccad | Bin 167 -> 0 bytes .../6b/31c659545507c381e9cd34ec508f16c04e149e | 2 - .../73/ba924a80437097795ae839e66e187c55d3babf | Bin 93 -> 0 bytes .../78/0d7397f5e8f8f477fb55b7af3accc2154b2d4a | 2 - .../78/9efbdadaa4a582778d4584385495559ea0994b | 2 - .../88/34b635dd468a83cb012f6feace968c1c9f5d6e | Bin 81 -> 0 bytes .../d0/5f2cd5cc77addf68ed6f50d622c9a4f732e6c5 | Bin 93 -> 0 bytes .../typechanges/.gitted/modules/e/packed-refs | 2 - .../.gitted/modules/e/refs/heads/master | 1 - .../modules/e/refs/remotes/origin/HEAD | 1 - .../0d/78578795b7ca49fd8df6c4b6d27c5c02d991d8 | Bin 76 -> 0 bytes .../0e/7ed140b514b8cae23254cb8656fe1674403aff | Bin 162 -> 0 bytes .../0f/f461da9689266f482d8f6654a4400b4e33c586 | Bin 486 -> 0 bytes .../18/aa7e45bbe4c3cc24a0b079696c59d36675af97 | Bin 89 -> 0 bytes .../1b/63caae4a5ca96f78e8dfefc376c6a39a142475 | Bin 161 -> 0 bytes .../1e/abe82aa3b2365a394f6108f24435df6e193d02 | Bin 549 -> 0 bytes .../42/061c01a1c70097d1e4579f29a5adf40abdec95 | Bin 24 -> 0 bytes .../46/2838cee476a87e7cff32196b66fa18ed756592 | Bin 76 -> 0 bytes .../63/499e4ea8e096b831515ceb1d5a7593e4d87ae5 | Bin 18 -> 0 bytes .../68/1af94e10eaf262f3ab7cb9b8fd5f4158ba4d3e | Bin 24 -> 0 bytes .../6a/9008602b811e69a9b7a2d83496f39a794fdeeb | Bin 602 -> 0 bytes .../6e/ae26c90e8ccc4d16208972119c40635489c6f0 | Bin 160 -> 0 bytes .../6f/39eabbb8a7541515e0d35971078bccb502e7e0 | Bin 66 -> 0 bytes .../71/54d3083461536dfc71ad5542f3e65e723a06c4 | Bin 657 -> 0 bytes .../75/56c1d893a4c0ca85ac8ac51de47ff399758729 | Bin 226 -> 0 bytes .../76/fef844064c26d5e06c2508240dae661e7231b2 | Bin 66 -> 0 bytes .../79/b9f23e85f55ea36a472a902e875bc1121a94cb | 2 - .../85/28da0ea65eacf1f74f9ed6696adbac547963ad | Bin 451 -> 0 bytes .../8b/3726b365824ad5a07c537247f4bc73ed7d37ea | Bin 76 -> 0 bytes .../93/3e28c1c8a68838a763d250bdf0b2c6068289c3 | Bin 226 -> 0 bytes .../96/2710fe5b4e453e9e827945b3487c525968ec4a | Bin 76 -> 0 bytes .../96/6cf1b3598e195b31b2cde3784f9a19f0728a6f | Bin 226 -> 0 bytes .../99/e8bab9ece009f0fba7eb41f850f4c12bedb9b7 | Bin 701 -> 0 bytes .../9b/19edf33a03a0c59cdfc113bfa5c06179bf9b1a | 5 - .../9b/db75b73836a99e3dbeea640a81de81031fdc29 | Bin 162 -> 0 bytes .../9d/0235c7a7edc0889a18f97a42ee6db9fe688447 | Bin 160 -> 0 bytes .../9e/ffc457877f109b2a4319e14bee613a15f2a00d | Bin 226 -> 0 bytes .../a0/a9bad6f6f40325198f938a0e3ae981622d7707 | Bin 54 -> 0 bytes .../b1/977dc4e573b812d4619754c98138c56999dc0d | Bin 518 -> 0 bytes .../d7/5992dd02391e128dac332dcc78d649dd9ab095 | Bin 577 -> 0 bytes .../da/e2709d638df52212b1f43ff61797ebfedfcc7c | Bin 78 -> 0 bytes .../e1/152adcb9adf37ec551ada9ba377ab53aec3bad | Bin 19 -> 0 bytes .../e4/ed436a9eb0f198cda722886a5f8d6d6c836b7b | Bin 225 -> 0 bytes .../e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 | Bin 15 -> 0 bytes .../f2/0b79342712e0b2315647cd8227a573fd3bc46e | Bin 66 -> 0 bytes .../fd/e0147e3b59f381635a3b016e3fe6dacb70779d | Bin 53 -> 0 bytes .../typechanges/.gitted/refs/heads/master | 1 - .../tests/resources/typechanges/README.md | 43 - .../tests/resources/typechanges/gitmodules | 0 .../tests/resources/unsymlinked.git/HEAD | 1 - .../tests/resources/unsymlinked.git/config | 6 - .../resources/unsymlinked.git/description | 1 - .../resources/unsymlinked.git/info/exclude | 2 - .../08/8b64704e0d6b8bd061dea879418cb5442a3fbf | Bin 49 -> 0 bytes .../13/a5e939bca25940c069fd2169d993dba328e30b | Bin 44 -> 0 bytes .../19/bf568e59e3a0b363cafb4106226e62d4a4c41c | Bin 29 -> 0 bytes .../58/1fadd35b4cf320d102a152f918729011604773 | Bin 47 -> 0 bytes .../5c/87b6791e8b13da658a14d1ef7e09b5dc3bac8c | Bin 78 -> 0 bytes .../6f/e5f5398af85fb3de8a6aba0339b6d3bfa26a27 | Bin 49 -> 0 bytes .../7f/ccd75616ec188b8f1b23d67506a334cc34a49d | Bin 132 -> 0 bytes .../80/6999882bf91d24241e4077906b9017605eb1f3 | Bin 170 -> 0 bytes .../83/7d176303c5005505ec1e4a30231c40930c0230 | Bin 44 -> 0 bytes .../a8/595ccca04f40818ae0155c8f9c77a230e597b6 | 2 - .../cf/8f1cf5cce859c438d6cc067284cb5e161206e7 | Bin 49 -> 0 bytes .../d5/278d05c8607ec420bfee4cf219fbc0eeebfd6a | Bin 49 -> 0 bytes .../f4/e16fb76536591a41454194058d048d8e4dd2e9 | Bin 44 -> 0 bytes .../f9/e65619d93fdf2673882e0a261c5e93b1a84006 | Bin 32 -> 0 bytes .../unsymlinked.git/refs/heads/exe-file | 1 - .../unsymlinked.git/refs/heads/master | 1 - .../unsymlinked.git/refs/heads/reg-file | 1 - .../tests/resources/userdiff/.gitted/HEAD | 1 - .../tests/resources/userdiff/.gitted/config | 7 - .../resources/userdiff/.gitted/description | 1 - .../tests/resources/userdiff/.gitted/index | Bin 1558 -> 0 bytes .../resources/userdiff/.gitted/info/refs | 1 - .../09/65b377c214bbe5e0d18fcdaf556df7fa7ed7c8 | Bin 850 -> 0 bytes .../0c/20ef1409ae1df4d5a76cdbd98d5c33ccdb6bcc | Bin 120 -> 0 bytes .../39/ea75107a09091ba54ff86fcc780b59477e42cd | Bin 854 -> 0 bytes .../3c/c08384deae5957247bc36776ab626cc9e0582b | Bin 116 -> 0 bytes .../46/8d6f2afc940e14c76347fa9af26e429a3c9044 | Bin 851 -> 0 bytes .../53/917973acfe0111f93c2cfaacf854be245880e8 | Bin 846 -> 0 bytes .../63/1d44e0c72e8cd1b594fa11d7d1ee8a6d67ff67 | Bin 183 -> 0 bytes .../f3/be389d351e4bcc6dcc4b5fe22134ef0f63f8bd | Bin 117 -> 0 bytes .../userdiff/.gitted/objects/info/packs | 2 - ...52578900ac63564f2a24b9714529821276ceb9.idx | Bin 2500 -> 0 bytes ...2578900ac63564f2a24b9714529821276ceb9.pack | Bin 7102 -> 0 bytes .../resources/userdiff/.gitted/packed-refs | 2 - .../userdiff/.gitted/refs/dummy-marker.txt | 0 .../tests/resources/userdiff/after/file.html | 41 - .../resources/userdiff/after/file.javascript | 108 - .../tests/resources/userdiff/after/file.php | 50 - .../tests/resources/userdiff/before/file.html | 41 - .../resources/userdiff/before/file.javascript | 109 - .../tests/resources/userdiff/before/file.php | 49 - .../userdiff/expected/driver/diff.html | 26 - .../userdiff/expected/driver/diff.javascript | 27 - .../userdiff/expected/driver/diff.php | 26 - .../userdiff/expected/nodriver/diff.html | 26 - .../expected/nodriver/diff.javascript | 27 - .../userdiff/expected/nodriver/diff.php | 26 - .../tests/resources/userdiff/files/file.html | 41 - .../resources/userdiff/files/file.javascript | 108 - .../tests/resources/userdiff/files/file.php | 50 - .../resources/win32-forbidden/.gitted/HEAD | 1 - .../resources/win32-forbidden/.gitted/config | 7 - .../resources/win32-forbidden/.gitted/index | Bin 577 -> 0 bytes .../win32-forbidden/.gitted/info/exclude | 6 - .../10/68072702a28a82c78902cf5bf82c3864cf4356 | Bin 143 -> 0 bytes .../17/6a458f94e0ea5272ce67c36bf30b6be9caf623 | Bin 28 -> 0 bytes .../2d/7445a749d25269f32724aa621cb70b196bcc40 | Bin 105 -> 0 bytes .../34/96991d72d500af36edef68bbfcccd1661d88db | 3 - .../8f/45aad6f23b9509f8786c617e19c127ae76609a | 2 - .../da/623abd956bb2fd8052c708c7ed43f05d192d37 | Bin 59 -> 0 bytes .../ea/c7621a652e5261ef1c1d3e7ae31b0d84fcbaba | 3 - .../win32-forbidden/.gitted/refs/heads/master | 1 - vendor/libgit2/tests/revert/bare.c | 107 - vendor/libgit2/tests/revert/workdir.c | 577 --- vendor/libgit2/tests/revwalk/basic.c | 475 -- vendor/libgit2/tests/revwalk/hidecb.c | 201 - vendor/libgit2/tests/revwalk/mergebase.c | 514 -- .../libgit2/tests/revwalk/signatureparsing.c | 47 - vendor/libgit2/tests/revwalk/simplify.c | 55 - vendor/libgit2/tests/stash/apply.c | 449 -- vendor/libgit2/tests/stash/drop.c | 174 - vendor/libgit2/tests/stash/foreach.c | 126 - vendor/libgit2/tests/stash/save.c | 428 -- vendor/libgit2/tests/stash/stash_helpers.c | 57 - vendor/libgit2/tests/stash/stash_helpers.h | 8 - vendor/libgit2/tests/stash/submodules.c | 83 - vendor/libgit2/tests/status/ignore.c | 1041 ---- vendor/libgit2/tests/status/renames.c | 715 --- vendor/libgit2/tests/status/single.c | 45 - vendor/libgit2/tests/status/status_data.h | 326 -- vendor/libgit2/tests/status/status_helpers.c | 97 - vendor/libgit2/tests/status/status_helpers.h | 49 - vendor/libgit2/tests/status/submodules.c | 526 -- vendor/libgit2/tests/status/worktree.c | 1151 ----- vendor/libgit2/tests/status/worktree_init.c | 338 -- vendor/libgit2/tests/stress/diff.c | 146 - vendor/libgit2/tests/submodule/add.c | 130 - vendor/libgit2/tests/submodule/init.c | 115 - vendor/libgit2/tests/submodule/lookup.c | 390 -- vendor/libgit2/tests/submodule/modify.c | 212 - vendor/libgit2/tests/submodule/nosubs.c | 130 - .../libgit2/tests/submodule/repository_init.c | 38 - vendor/libgit2/tests/submodule/status.c | 354 -- .../tests/submodule/submodule_helpers.c | 220 - .../tests/submodule/submodule_helpers.h | 24 - vendor/libgit2/tests/submodule/update.c | 440 -- vendor/libgit2/tests/threads/basic.c | 50 - vendor/libgit2/tests/threads/diff.c | 196 - vendor/libgit2/tests/threads/iterator.c | 52 - vendor/libgit2/tests/threads/refdb.c | 221 - vendor/libgit2/tests/threads/thread_helpers.c | 44 - vendor/libgit2/tests/threads/thread_helpers.h | 8 - vendor/libgit2/tests/trace/trace.c | 106 - .../libgit2/tests/trace/windows/stacktrace.c | 151 - vendor/libgit2/tests/transport/register.c | 77 - vendor/libgit2/tests/valgrind-supp-mac.txt | 176 - vendor/libgit2/tests/win32/forbidden.c | 183 - vendor/libgit2/tests/win32/longpath.c | 62 - 4970 files changed, 246080 deletions(-) delete mode 100644 vendor/libgit2/.HEADER delete mode 100644 vendor/libgit2/.editorconfig delete mode 100644 vendor/libgit2/.gitattributes delete mode 100644 vendor/libgit2/.gitignore delete mode 100644 vendor/libgit2/.mailmap delete mode 100644 vendor/libgit2/.travis.yml delete mode 100644 vendor/libgit2/AUTHORS delete mode 100644 vendor/libgit2/CHANGELOG.md delete mode 100644 vendor/libgit2/CMakeLists.txt delete mode 100644 vendor/libgit2/CODE_OF_CONDUCT.md delete mode 100644 vendor/libgit2/CONTRIBUTING.md delete mode 100644 vendor/libgit2/CONVENTIONS.md delete mode 100644 vendor/libgit2/COPYING delete mode 100644 vendor/libgit2/Makefile.embed delete mode 100644 vendor/libgit2/PROJECTS.md delete mode 100644 vendor/libgit2/README.md delete mode 100644 vendor/libgit2/THREADING.md delete mode 100644 vendor/libgit2/api.docurium delete mode 100644 vendor/libgit2/appveyor.yml delete mode 100644 vendor/libgit2/cmake/Modules/AddCFlagIfSupported.cmake delete mode 100644 vendor/libgit2/cmake/Modules/FindCoreFoundation.cmake delete mode 100644 vendor/libgit2/cmake/Modules/FindGSSAPI.cmake delete mode 100644 vendor/libgit2/cmake/Modules/FindHTTP_Parser.cmake delete mode 100644 vendor/libgit2/cmake/Modules/FindIconv.cmake delete mode 100644 vendor/libgit2/cmake/Modules/FindSecurity.cmake delete mode 100644 vendor/libgit2/deps/http-parser/LICENSE-MIT delete mode 100644 vendor/libgit2/deps/http-parser/http_parser.c delete mode 100644 vendor/libgit2/deps/http-parser/http_parser.h delete mode 100644 vendor/libgit2/deps/regex/config.h delete mode 100644 vendor/libgit2/deps/regex/regcomp.c delete mode 100644 vendor/libgit2/deps/regex/regex.c delete mode 100644 vendor/libgit2/deps/regex/regex.h delete mode 100644 vendor/libgit2/deps/regex/regex_internal.c delete mode 100644 vendor/libgit2/deps/regex/regex_internal.h delete mode 100644 vendor/libgit2/deps/regex/regexec.c delete mode 100644 vendor/libgit2/deps/winhttp/urlmon.h delete mode 100644 vendor/libgit2/deps/winhttp/winhttp.def delete mode 100644 vendor/libgit2/deps/winhttp/winhttp.h delete mode 100644 vendor/libgit2/deps/winhttp/winhttp64.def delete mode 100644 vendor/libgit2/deps/zlib/adler32.c delete mode 100644 vendor/libgit2/deps/zlib/crc32.c delete mode 100644 vendor/libgit2/deps/zlib/crc32.h delete mode 100644 vendor/libgit2/deps/zlib/deflate.c delete mode 100644 vendor/libgit2/deps/zlib/deflate.h delete mode 100644 vendor/libgit2/deps/zlib/infback.c delete mode 100644 vendor/libgit2/deps/zlib/inffast.c delete mode 100644 vendor/libgit2/deps/zlib/inffast.h delete mode 100644 vendor/libgit2/deps/zlib/inffixed.h delete mode 100644 vendor/libgit2/deps/zlib/inflate.c delete mode 100644 vendor/libgit2/deps/zlib/inflate.h delete mode 100644 vendor/libgit2/deps/zlib/inftrees.c delete mode 100644 vendor/libgit2/deps/zlib/inftrees.h delete mode 100644 vendor/libgit2/deps/zlib/trees.c delete mode 100644 vendor/libgit2/deps/zlib/trees.h delete mode 100644 vendor/libgit2/deps/zlib/zconf.h delete mode 100644 vendor/libgit2/deps/zlib/zlib.h delete mode 100644 vendor/libgit2/deps/zlib/zutil.c delete mode 100644 vendor/libgit2/deps/zlib/zutil.h delete mode 100644 vendor/libgit2/docs/checkout-internals.md delete mode 100644 vendor/libgit2/docs/diff-internals.md delete mode 100644 vendor/libgit2/docs/error-handling.md delete mode 100644 vendor/libgit2/docs/merge-df_conflicts.txt delete mode 100644 vendor/libgit2/examples/.gitignore delete mode 100644 vendor/libgit2/examples/CMakeLists.txt delete mode 100644 vendor/libgit2/examples/COPYING delete mode 100644 vendor/libgit2/examples/Makefile delete mode 100644 vendor/libgit2/examples/README.md delete mode 100644 vendor/libgit2/examples/add.c delete mode 100644 vendor/libgit2/examples/blame.c delete mode 100644 vendor/libgit2/examples/cat-file.c delete mode 100644 vendor/libgit2/examples/common.c delete mode 100644 vendor/libgit2/examples/common.h delete mode 100644 vendor/libgit2/examples/describe.c delete mode 100644 vendor/libgit2/examples/diff.c delete mode 100644 vendor/libgit2/examples/for-each-ref.c delete mode 100644 vendor/libgit2/examples/general.c delete mode 100644 vendor/libgit2/examples/init.c delete mode 100644 vendor/libgit2/examples/log.c delete mode 100644 vendor/libgit2/examples/network/.gitignore delete mode 100644 vendor/libgit2/examples/network/Makefile delete mode 100644 vendor/libgit2/examples/network/clone.c delete mode 100644 vendor/libgit2/examples/network/common.c delete mode 100644 vendor/libgit2/examples/network/common.h delete mode 100644 vendor/libgit2/examples/network/fetch.c delete mode 100644 vendor/libgit2/examples/network/git2.c delete mode 100644 vendor/libgit2/examples/network/index-pack.c delete mode 100644 vendor/libgit2/examples/network/ls-remote.c delete mode 100644 vendor/libgit2/examples/remote.c delete mode 100644 vendor/libgit2/examples/rev-list.c delete mode 100644 vendor/libgit2/examples/rev-parse.c delete mode 100644 vendor/libgit2/examples/showindex.c delete mode 100644 vendor/libgit2/examples/status.c delete mode 100644 vendor/libgit2/examples/tag.c delete mode 100755 vendor/libgit2/examples/test/test-rev-list.sh delete mode 100644 vendor/libgit2/git.git-authors delete mode 100644 vendor/libgit2/include/git2.h delete mode 100644 vendor/libgit2/include/git2/annotated_commit.h delete mode 100644 vendor/libgit2/include/git2/attr.h delete mode 100644 vendor/libgit2/include/git2/blame.h delete mode 100644 vendor/libgit2/include/git2/blob.h delete mode 100644 vendor/libgit2/include/git2/branch.h delete mode 100644 vendor/libgit2/include/git2/buffer.h delete mode 100644 vendor/libgit2/include/git2/checkout.h delete mode 100644 vendor/libgit2/include/git2/cherrypick.h delete mode 100644 vendor/libgit2/include/git2/clone.h delete mode 100644 vendor/libgit2/include/git2/commit.h delete mode 100644 vendor/libgit2/include/git2/common.h delete mode 100644 vendor/libgit2/include/git2/config.h delete mode 100644 vendor/libgit2/include/git2/cred_helpers.h delete mode 100644 vendor/libgit2/include/git2/describe.h delete mode 100644 vendor/libgit2/include/git2/diff.h delete mode 100644 vendor/libgit2/include/git2/errors.h delete mode 100644 vendor/libgit2/include/git2/filter.h delete mode 100644 vendor/libgit2/include/git2/global.h delete mode 100644 vendor/libgit2/include/git2/graph.h delete mode 100644 vendor/libgit2/include/git2/ignore.h delete mode 100644 vendor/libgit2/include/git2/index.h delete mode 100644 vendor/libgit2/include/git2/indexer.h delete mode 100644 vendor/libgit2/include/git2/inttypes.h delete mode 100644 vendor/libgit2/include/git2/merge.h delete mode 100644 vendor/libgit2/include/git2/message.h delete mode 100644 vendor/libgit2/include/git2/net.h delete mode 100644 vendor/libgit2/include/git2/notes.h delete mode 100644 vendor/libgit2/include/git2/object.h delete mode 100644 vendor/libgit2/include/git2/odb.h delete mode 100644 vendor/libgit2/include/git2/odb_backend.h delete mode 100644 vendor/libgit2/include/git2/oid.h delete mode 100644 vendor/libgit2/include/git2/oidarray.h delete mode 100644 vendor/libgit2/include/git2/pack.h delete mode 100644 vendor/libgit2/include/git2/patch.h delete mode 100644 vendor/libgit2/include/git2/pathspec.h delete mode 100644 vendor/libgit2/include/git2/rebase.h delete mode 100644 vendor/libgit2/include/git2/refdb.h delete mode 100644 vendor/libgit2/include/git2/reflog.h delete mode 100644 vendor/libgit2/include/git2/refs.h delete mode 100644 vendor/libgit2/include/git2/refspec.h delete mode 100644 vendor/libgit2/include/git2/remote.h delete mode 100644 vendor/libgit2/include/git2/repository.h delete mode 100644 vendor/libgit2/include/git2/reset.h delete mode 100644 vendor/libgit2/include/git2/revert.h delete mode 100644 vendor/libgit2/include/git2/revparse.h delete mode 100644 vendor/libgit2/include/git2/revwalk.h delete mode 100644 vendor/libgit2/include/git2/signature.h delete mode 100644 vendor/libgit2/include/git2/stash.h delete mode 100644 vendor/libgit2/include/git2/status.h delete mode 100644 vendor/libgit2/include/git2/stdint.h delete mode 100644 vendor/libgit2/include/git2/strarray.h delete mode 100644 vendor/libgit2/include/git2/submodule.h delete mode 100644 vendor/libgit2/include/git2/sys/commit.h delete mode 100644 vendor/libgit2/include/git2/sys/config.h delete mode 100644 vendor/libgit2/include/git2/sys/diff.h delete mode 100644 vendor/libgit2/include/git2/sys/filter.h delete mode 100644 vendor/libgit2/include/git2/sys/hashsig.h delete mode 100644 vendor/libgit2/include/git2/sys/index.h delete mode 100644 vendor/libgit2/include/git2/sys/mempack.h delete mode 100644 vendor/libgit2/include/git2/sys/odb_backend.h delete mode 100644 vendor/libgit2/include/git2/sys/openssl.h delete mode 100644 vendor/libgit2/include/git2/sys/refdb_backend.h delete mode 100644 vendor/libgit2/include/git2/sys/reflog.h delete mode 100644 vendor/libgit2/include/git2/sys/refs.h delete mode 100644 vendor/libgit2/include/git2/sys/repository.h delete mode 100644 vendor/libgit2/include/git2/sys/stream.h delete mode 100644 vendor/libgit2/include/git2/sys/transport.h delete mode 100644 vendor/libgit2/include/git2/tag.h delete mode 100644 vendor/libgit2/include/git2/trace.h delete mode 100644 vendor/libgit2/include/git2/transaction.h delete mode 100644 vendor/libgit2/include/git2/transport.h delete mode 100644 vendor/libgit2/include/git2/tree.h delete mode 100644 vendor/libgit2/include/git2/types.h delete mode 100644 vendor/libgit2/include/git2/version.h delete mode 100644 vendor/libgit2/libgit2.pc.in delete mode 100644 vendor/libgit2/libgit2_clar.supp delete mode 100755 vendor/libgit2/script/appveyor-mingw.sh delete mode 100755 vendor/libgit2/script/cibuild.sh delete mode 100755 vendor/libgit2/script/coverity.sh delete mode 100755 vendor/libgit2/script/install-deps-osx.sh delete mode 100644 vendor/libgit2/script/user_nodefs.h delete mode 100644 vendor/libgit2/src/annotated_commit.c delete mode 100644 vendor/libgit2/src/annotated_commit.h delete mode 100644 vendor/libgit2/src/array.h delete mode 100644 vendor/libgit2/src/attr.c delete mode 100644 vendor/libgit2/src/attr.h delete mode 100644 vendor/libgit2/src/attr_file.c delete mode 100644 vendor/libgit2/src/attr_file.h delete mode 100644 vendor/libgit2/src/attrcache.c delete mode 100644 vendor/libgit2/src/attrcache.h delete mode 100644 vendor/libgit2/src/bitvec.h delete mode 100644 vendor/libgit2/src/blame.c delete mode 100644 vendor/libgit2/src/blame.h delete mode 100644 vendor/libgit2/src/blame_git.c delete mode 100644 vendor/libgit2/src/blame_git.h delete mode 100644 vendor/libgit2/src/blob.c delete mode 100644 vendor/libgit2/src/blob.h delete mode 100644 vendor/libgit2/src/branch.c delete mode 100644 vendor/libgit2/src/branch.h delete mode 100644 vendor/libgit2/src/buf_text.c delete mode 100644 vendor/libgit2/src/buf_text.h delete mode 100644 vendor/libgit2/src/buffer.c delete mode 100644 vendor/libgit2/src/buffer.h delete mode 100644 vendor/libgit2/src/cache.c delete mode 100644 vendor/libgit2/src/cache.h delete mode 100644 vendor/libgit2/src/cc-compat.h delete mode 100644 vendor/libgit2/src/checkout.c delete mode 100644 vendor/libgit2/src/checkout.h delete mode 100644 vendor/libgit2/src/cherrypick.c delete mode 100644 vendor/libgit2/src/clone.c delete mode 100644 vendor/libgit2/src/clone.h delete mode 100644 vendor/libgit2/src/commit.c delete mode 100644 vendor/libgit2/src/commit.h delete mode 100644 vendor/libgit2/src/commit_list.c delete mode 100644 vendor/libgit2/src/commit_list.h delete mode 100644 vendor/libgit2/src/common.h delete mode 100644 vendor/libgit2/src/config.c delete mode 100644 vendor/libgit2/src/config.h delete mode 100644 vendor/libgit2/src/config_cache.c delete mode 100644 vendor/libgit2/src/config_file.c delete mode 100644 vendor/libgit2/src/config_file.h delete mode 100644 vendor/libgit2/src/crlf.c delete mode 100644 vendor/libgit2/src/curl_stream.c delete mode 100644 vendor/libgit2/src/curl_stream.h delete mode 100644 vendor/libgit2/src/date.c delete mode 100644 vendor/libgit2/src/delta-apply.c delete mode 100644 vendor/libgit2/src/delta-apply.h delete mode 100644 vendor/libgit2/src/delta.c delete mode 100644 vendor/libgit2/src/delta.h delete mode 100644 vendor/libgit2/src/describe.c delete mode 100644 vendor/libgit2/src/diff.c delete mode 100644 vendor/libgit2/src/diff.h delete mode 100644 vendor/libgit2/src/diff_driver.c delete mode 100644 vendor/libgit2/src/diff_driver.h delete mode 100644 vendor/libgit2/src/diff_file.c delete mode 100644 vendor/libgit2/src/diff_file.h delete mode 100644 vendor/libgit2/src/diff_patch.c delete mode 100644 vendor/libgit2/src/diff_patch.h delete mode 100644 vendor/libgit2/src/diff_print.c delete mode 100644 vendor/libgit2/src/diff_stats.c delete mode 100644 vendor/libgit2/src/diff_tform.c delete mode 100644 vendor/libgit2/src/diff_xdiff.c delete mode 100644 vendor/libgit2/src/diff_xdiff.h delete mode 100644 vendor/libgit2/src/errors.c delete mode 100644 vendor/libgit2/src/fetch.c delete mode 100644 vendor/libgit2/src/fetch.h delete mode 100644 vendor/libgit2/src/fetchhead.c delete mode 100644 vendor/libgit2/src/fetchhead.h delete mode 100644 vendor/libgit2/src/filebuf.c delete mode 100644 vendor/libgit2/src/filebuf.h delete mode 100644 vendor/libgit2/src/fileops.c delete mode 100644 vendor/libgit2/src/fileops.h delete mode 100644 vendor/libgit2/src/filter.c delete mode 100644 vendor/libgit2/src/filter.h delete mode 100644 vendor/libgit2/src/fnmatch.c delete mode 100644 vendor/libgit2/src/fnmatch.h delete mode 100644 vendor/libgit2/src/global.c delete mode 100644 vendor/libgit2/src/global.h delete mode 100644 vendor/libgit2/src/graph.c delete mode 100644 vendor/libgit2/src/hash.c delete mode 100644 vendor/libgit2/src/hash.h delete mode 100644 vendor/libgit2/src/hash/hash_common_crypto.h delete mode 100644 vendor/libgit2/src/hash/hash_generic.c delete mode 100644 vendor/libgit2/src/hash/hash_generic.h delete mode 100644 vendor/libgit2/src/hash/hash_openssl.h delete mode 100644 vendor/libgit2/src/hash/hash_win32.c delete mode 100644 vendor/libgit2/src/hash/hash_win32.h delete mode 100644 vendor/libgit2/src/hashsig.c delete mode 100644 vendor/libgit2/src/ident.c delete mode 100644 vendor/libgit2/src/idxmap.h delete mode 100644 vendor/libgit2/src/ignore.c delete mode 100644 vendor/libgit2/src/ignore.h delete mode 100644 vendor/libgit2/src/index.c delete mode 100644 vendor/libgit2/src/index.h delete mode 100644 vendor/libgit2/src/indexer.c delete mode 100644 vendor/libgit2/src/integer.h delete mode 100644 vendor/libgit2/src/iterator.c delete mode 100644 vendor/libgit2/src/iterator.h delete mode 100644 vendor/libgit2/src/khash.h delete mode 100644 vendor/libgit2/src/map.h delete mode 100644 vendor/libgit2/src/merge.c delete mode 100644 vendor/libgit2/src/merge.h delete mode 100644 vendor/libgit2/src/merge_file.c delete mode 100644 vendor/libgit2/src/message.c delete mode 100644 vendor/libgit2/src/message.h delete mode 100644 vendor/libgit2/src/mwindow.c delete mode 100644 vendor/libgit2/src/mwindow.h delete mode 100644 vendor/libgit2/src/netops.c delete mode 100644 vendor/libgit2/src/netops.h delete mode 100644 vendor/libgit2/src/notes.c delete mode 100644 vendor/libgit2/src/notes.h delete mode 100644 vendor/libgit2/src/object.c delete mode 100644 vendor/libgit2/src/object.h delete mode 100644 vendor/libgit2/src/object_api.c delete mode 100644 vendor/libgit2/src/odb.c delete mode 100644 vendor/libgit2/src/odb.h delete mode 100644 vendor/libgit2/src/odb_loose.c delete mode 100644 vendor/libgit2/src/odb_mempack.c delete mode 100644 vendor/libgit2/src/odb_pack.c delete mode 100644 vendor/libgit2/src/offmap.h delete mode 100644 vendor/libgit2/src/oid.c delete mode 100644 vendor/libgit2/src/oid.h delete mode 100644 vendor/libgit2/src/oidarray.c delete mode 100644 vendor/libgit2/src/oidarray.h delete mode 100644 vendor/libgit2/src/oidmap.h delete mode 100644 vendor/libgit2/src/openssl_stream.c delete mode 100644 vendor/libgit2/src/openssl_stream.h delete mode 100644 vendor/libgit2/src/pack-objects.c delete mode 100644 vendor/libgit2/src/pack-objects.h delete mode 100644 vendor/libgit2/src/pack.c delete mode 100644 vendor/libgit2/src/pack.h delete mode 100644 vendor/libgit2/src/path.c delete mode 100644 vendor/libgit2/src/path.h delete mode 100644 vendor/libgit2/src/pathspec.c delete mode 100644 vendor/libgit2/src/pathspec.h delete mode 100644 vendor/libgit2/src/pool.c delete mode 100644 vendor/libgit2/src/pool.h delete mode 100644 vendor/libgit2/src/posix.c delete mode 100644 vendor/libgit2/src/posix.h delete mode 100644 vendor/libgit2/src/pqueue.c delete mode 100644 vendor/libgit2/src/pqueue.h delete mode 100644 vendor/libgit2/src/push.c delete mode 100644 vendor/libgit2/src/push.h delete mode 100644 vendor/libgit2/src/rebase.c delete mode 100644 vendor/libgit2/src/refdb.c delete mode 100644 vendor/libgit2/src/refdb.h delete mode 100644 vendor/libgit2/src/refdb_fs.c delete mode 100644 vendor/libgit2/src/refdb_fs.h delete mode 100644 vendor/libgit2/src/reflog.c delete mode 100644 vendor/libgit2/src/reflog.h delete mode 100644 vendor/libgit2/src/refs.c delete mode 100644 vendor/libgit2/src/refs.h delete mode 100644 vendor/libgit2/src/refspec.c delete mode 100644 vendor/libgit2/src/refspec.h delete mode 100644 vendor/libgit2/src/remote.c delete mode 100644 vendor/libgit2/src/remote.h delete mode 100644 vendor/libgit2/src/repo_template.h delete mode 100644 vendor/libgit2/src/repository.c delete mode 100644 vendor/libgit2/src/repository.h delete mode 100644 vendor/libgit2/src/reset.c delete mode 100644 vendor/libgit2/src/revert.c delete mode 100644 vendor/libgit2/src/revparse.c delete mode 100644 vendor/libgit2/src/revwalk.c delete mode 100644 vendor/libgit2/src/revwalk.h delete mode 100644 vendor/libgit2/src/settings.c delete mode 100644 vendor/libgit2/src/sha1_lookup.c delete mode 100644 vendor/libgit2/src/sha1_lookup.h delete mode 100644 vendor/libgit2/src/signature.c delete mode 100644 vendor/libgit2/src/signature.h delete mode 100644 vendor/libgit2/src/socket_stream.c delete mode 100644 vendor/libgit2/src/socket_stream.h delete mode 100644 vendor/libgit2/src/sortedcache.c delete mode 100644 vendor/libgit2/src/sortedcache.h delete mode 100644 vendor/libgit2/src/stash.c delete mode 100644 vendor/libgit2/src/status.c delete mode 100644 vendor/libgit2/src/status.h delete mode 100644 vendor/libgit2/src/stransport_stream.c delete mode 100644 vendor/libgit2/src/stransport_stream.h delete mode 100644 vendor/libgit2/src/stream.h delete mode 100644 vendor/libgit2/src/strmap.c delete mode 100644 vendor/libgit2/src/strmap.h delete mode 100644 vendor/libgit2/src/strnlen.h delete mode 100644 vendor/libgit2/src/submodule.c delete mode 100644 vendor/libgit2/src/submodule.h delete mode 100644 vendor/libgit2/src/sysdir.c delete mode 100644 vendor/libgit2/src/sysdir.h delete mode 100644 vendor/libgit2/src/tag.c delete mode 100644 vendor/libgit2/src/tag.h delete mode 100644 vendor/libgit2/src/thread-utils.c delete mode 100644 vendor/libgit2/src/thread-utils.h delete mode 100644 vendor/libgit2/src/tls_stream.c delete mode 100644 vendor/libgit2/src/tls_stream.h delete mode 100644 vendor/libgit2/src/trace.c delete mode 100644 vendor/libgit2/src/trace.h delete mode 100644 vendor/libgit2/src/transaction.c delete mode 100644 vendor/libgit2/src/transaction.h delete mode 100644 vendor/libgit2/src/transport.c delete mode 100644 vendor/libgit2/src/transports/auth.c delete mode 100644 vendor/libgit2/src/transports/auth.h delete mode 100644 vendor/libgit2/src/transports/auth_negotiate.c delete mode 100644 vendor/libgit2/src/transports/auth_negotiate.h delete mode 100644 vendor/libgit2/src/transports/cred.c delete mode 100644 vendor/libgit2/src/transports/cred.h delete mode 100644 vendor/libgit2/src/transports/cred_helpers.c delete mode 100644 vendor/libgit2/src/transports/git.c delete mode 100644 vendor/libgit2/src/transports/http.c delete mode 100644 vendor/libgit2/src/transports/local.c delete mode 100644 vendor/libgit2/src/transports/smart.c delete mode 100644 vendor/libgit2/src/transports/smart.h delete mode 100644 vendor/libgit2/src/transports/smart_pkt.c delete mode 100644 vendor/libgit2/src/transports/smart_protocol.c delete mode 100644 vendor/libgit2/src/transports/ssh.c delete mode 100644 vendor/libgit2/src/transports/ssh.h delete mode 100644 vendor/libgit2/src/transports/winhttp.c delete mode 100644 vendor/libgit2/src/tree-cache.c delete mode 100644 vendor/libgit2/src/tree-cache.h delete mode 100644 vendor/libgit2/src/tree.c delete mode 100644 vendor/libgit2/src/tree.h delete mode 100644 vendor/libgit2/src/tsort.c delete mode 100644 vendor/libgit2/src/unix/map.c delete mode 100644 vendor/libgit2/src/unix/posix.h delete mode 100644 vendor/libgit2/src/unix/realpath.c delete mode 100644 vendor/libgit2/src/userdiff.h delete mode 100644 vendor/libgit2/src/util.c delete mode 100644 vendor/libgit2/src/util.h delete mode 100644 vendor/libgit2/src/vector.c delete mode 100644 vendor/libgit2/src/vector.h delete mode 100644 vendor/libgit2/src/win32/dir.c delete mode 100644 vendor/libgit2/src/win32/dir.h delete mode 100644 vendor/libgit2/src/win32/error.c delete mode 100644 vendor/libgit2/src/win32/error.h delete mode 100644 vendor/libgit2/src/win32/findfile.c delete mode 100644 vendor/libgit2/src/win32/findfile.h delete mode 100644 vendor/libgit2/src/win32/git2.rc delete mode 100644 vendor/libgit2/src/win32/map.c delete mode 100644 vendor/libgit2/src/win32/mingw-compat.h delete mode 100644 vendor/libgit2/src/win32/msvc-compat.h delete mode 100644 vendor/libgit2/src/win32/path_w32.c delete mode 100644 vendor/libgit2/src/win32/path_w32.h delete mode 100644 vendor/libgit2/src/win32/posix.h delete mode 100644 vendor/libgit2/src/win32/posix_w32.c delete mode 100644 vendor/libgit2/src/win32/precompiled.c delete mode 100644 vendor/libgit2/src/win32/precompiled.h delete mode 100644 vendor/libgit2/src/win32/pthread.c delete mode 100644 vendor/libgit2/src/win32/pthread.h delete mode 100644 vendor/libgit2/src/win32/reparse.h delete mode 100644 vendor/libgit2/src/win32/utf-conv.c delete mode 100644 vendor/libgit2/src/win32/utf-conv.h delete mode 100644 vendor/libgit2/src/win32/version.h delete mode 100644 vendor/libgit2/src/win32/w32_buffer.c delete mode 100644 vendor/libgit2/src/win32/w32_buffer.h delete mode 100644 vendor/libgit2/src/win32/w32_crtdbg_stacktrace.c delete mode 100644 vendor/libgit2/src/win32/w32_crtdbg_stacktrace.h delete mode 100644 vendor/libgit2/src/win32/w32_stack.c delete mode 100644 vendor/libgit2/src/win32/w32_stack.h delete mode 100644 vendor/libgit2/src/win32/w32_util.c delete mode 100644 vendor/libgit2/src/win32/w32_util.h delete mode 100644 vendor/libgit2/src/win32/win32-compat.h delete mode 100644 vendor/libgit2/src/xdiff/xdiff.h delete mode 100644 vendor/libgit2/src/xdiff/xdiffi.c delete mode 100644 vendor/libgit2/src/xdiff/xdiffi.h delete mode 100644 vendor/libgit2/src/xdiff/xemit.c delete mode 100644 vendor/libgit2/src/xdiff/xemit.h delete mode 100644 vendor/libgit2/src/xdiff/xhistogram.c delete mode 100644 vendor/libgit2/src/xdiff/xinclude.h delete mode 100644 vendor/libgit2/src/xdiff/xmacros.h delete mode 100644 vendor/libgit2/src/xdiff/xmerge.c delete mode 100644 vendor/libgit2/src/xdiff/xpatience.c delete mode 100644 vendor/libgit2/src/xdiff/xprepare.c delete mode 100644 vendor/libgit2/src/xdiff/xprepare.h delete mode 100644 vendor/libgit2/src/xdiff/xtypes.h delete mode 100644 vendor/libgit2/src/xdiff/xutils.c delete mode 100644 vendor/libgit2/src/xdiff/xutils.h delete mode 100644 vendor/libgit2/src/zstream.c delete mode 100644 vendor/libgit2/src/zstream.h delete mode 100644 vendor/libgit2/tests/README.md delete mode 100644 vendor/libgit2/tests/attr/attr_expect.h delete mode 100644 vendor/libgit2/tests/attr/file.c delete mode 100644 vendor/libgit2/tests/attr/flags.c delete mode 100644 vendor/libgit2/tests/attr/ignore.c delete mode 100644 vendor/libgit2/tests/attr/lookup.c delete mode 100644 vendor/libgit2/tests/attr/repo.c delete mode 100644 vendor/libgit2/tests/blame/blame_helpers.c delete mode 100644 vendor/libgit2/tests/blame/blame_helpers.h delete mode 100644 vendor/libgit2/tests/blame/buffer.c delete mode 100644 vendor/libgit2/tests/blame/getters.c delete mode 100644 vendor/libgit2/tests/blame/harder.c delete mode 100644 vendor/libgit2/tests/blame/simple.c delete mode 100644 vendor/libgit2/tests/buf/basic.c delete mode 100644 vendor/libgit2/tests/buf/oom.c delete mode 100644 vendor/libgit2/tests/buf/splice.c delete mode 100644 vendor/libgit2/tests/checkout/binaryunicode.c delete mode 100644 vendor/libgit2/tests/checkout/checkout_helpers.c delete mode 100644 vendor/libgit2/tests/checkout/checkout_helpers.h delete mode 100644 vendor/libgit2/tests/checkout/conflict.c delete mode 100644 vendor/libgit2/tests/checkout/crlf.c delete mode 100644 vendor/libgit2/tests/checkout/head.c delete mode 100644 vendor/libgit2/tests/checkout/icase.c delete mode 100644 vendor/libgit2/tests/checkout/index.c delete mode 100644 vendor/libgit2/tests/checkout/nasty.c delete mode 100644 vendor/libgit2/tests/checkout/tree.c delete mode 100644 vendor/libgit2/tests/checkout/typechange.c delete mode 100644 vendor/libgit2/tests/cherrypick/bare.c delete mode 100644 vendor/libgit2/tests/cherrypick/workdir.c delete mode 100644 vendor/libgit2/tests/clar.c delete mode 100644 vendor/libgit2/tests/clar.h delete mode 100644 vendor/libgit2/tests/clar/fixtures.h delete mode 100644 vendor/libgit2/tests/clar/fs.h delete mode 100644 vendor/libgit2/tests/clar/print.h delete mode 100644 vendor/libgit2/tests/clar/sandbox.h delete mode 100644 vendor/libgit2/tests/clar_libgit2.c delete mode 100644 vendor/libgit2/tests/clar_libgit2.h delete mode 100644 vendor/libgit2/tests/clar_libgit2_timer.c delete mode 100644 vendor/libgit2/tests/clar_libgit2_timer.h delete mode 100644 vendor/libgit2/tests/clar_libgit2_trace.c delete mode 100644 vendor/libgit2/tests/clar_libgit2_trace.h delete mode 100644 vendor/libgit2/tests/clone/empty.c delete mode 100644 vendor/libgit2/tests/clone/local.c delete mode 100644 vendor/libgit2/tests/clone/nonetwork.c delete mode 100644 vendor/libgit2/tests/clone/transport.c delete mode 100644 vendor/libgit2/tests/commit/commit.c delete mode 100644 vendor/libgit2/tests/commit/parent.c delete mode 100644 vendor/libgit2/tests/commit/parse.c delete mode 100644 vendor/libgit2/tests/commit/signature.c delete mode 100644 vendor/libgit2/tests/commit/write.c delete mode 100644 vendor/libgit2/tests/config/add.c delete mode 100644 vendor/libgit2/tests/config/backend.c delete mode 100644 vendor/libgit2/tests/config/config_helpers.c delete mode 100644 vendor/libgit2/tests/config/config_helpers.h delete mode 100644 vendor/libgit2/tests/config/configlevel.c delete mode 100644 vendor/libgit2/tests/config/global.c delete mode 100644 vendor/libgit2/tests/config/include.c delete mode 100644 vendor/libgit2/tests/config/multivar.c delete mode 100644 vendor/libgit2/tests/config/new.c delete mode 100644 vendor/libgit2/tests/config/read.c delete mode 100644 vendor/libgit2/tests/config/rename.c delete mode 100644 vendor/libgit2/tests/config/snapshot.c delete mode 100644 vendor/libgit2/tests/config/stress.c delete mode 100644 vendor/libgit2/tests/config/validkeyname.c delete mode 100644 vendor/libgit2/tests/config/write.c delete mode 100644 vendor/libgit2/tests/core/array.c delete mode 100644 vendor/libgit2/tests/core/bitvec.c delete mode 100644 vendor/libgit2/tests/core/buffer.c delete mode 100644 vendor/libgit2/tests/core/copy.c delete mode 100644 vendor/libgit2/tests/core/dirent.c delete mode 100644 vendor/libgit2/tests/core/env.c delete mode 100644 vendor/libgit2/tests/core/errors.c delete mode 100644 vendor/libgit2/tests/core/features.c delete mode 100644 vendor/libgit2/tests/core/filebuf.c delete mode 100644 vendor/libgit2/tests/core/ftruncate.c delete mode 100644 vendor/libgit2/tests/core/futils.c delete mode 100644 vendor/libgit2/tests/core/hex.c delete mode 100644 vendor/libgit2/tests/core/iconv.c delete mode 100644 vendor/libgit2/tests/core/init.c delete mode 100644 vendor/libgit2/tests/core/link.c delete mode 100644 vendor/libgit2/tests/core/mkdir.c delete mode 100644 vendor/libgit2/tests/core/oid.c delete mode 100644 vendor/libgit2/tests/core/oidmap.c delete mode 100644 vendor/libgit2/tests/core/opts.c delete mode 100644 vendor/libgit2/tests/core/path.c delete mode 100644 vendor/libgit2/tests/core/pool.c delete mode 100644 vendor/libgit2/tests/core/posix.c delete mode 100644 vendor/libgit2/tests/core/pqueue.c delete mode 100644 vendor/libgit2/tests/core/rmdir.c delete mode 100644 vendor/libgit2/tests/core/sortedcache.c delete mode 100644 vendor/libgit2/tests/core/stat.c delete mode 100644 vendor/libgit2/tests/core/stream.c delete mode 100644 vendor/libgit2/tests/core/string.c delete mode 100644 vendor/libgit2/tests/core/strmap.c delete mode 100644 vendor/libgit2/tests/core/strtol.c delete mode 100644 vendor/libgit2/tests/core/structinit.c delete mode 100644 vendor/libgit2/tests/core/useragent.c delete mode 100644 vendor/libgit2/tests/core/vector.c delete mode 100644 vendor/libgit2/tests/core/zstream.c delete mode 100644 vendor/libgit2/tests/date/date.c delete mode 100644 vendor/libgit2/tests/date/rfc2822.c delete mode 100644 vendor/libgit2/tests/describe/describe.c delete mode 100644 vendor/libgit2/tests/describe/describe_helpers.c delete mode 100644 vendor/libgit2/tests/describe/describe_helpers.h delete mode 100644 vendor/libgit2/tests/describe/t6120.c delete mode 100644 vendor/libgit2/tests/diff/binary.c delete mode 100644 vendor/libgit2/tests/diff/blob.c delete mode 100644 vendor/libgit2/tests/diff/diff_helpers.c delete mode 100644 vendor/libgit2/tests/diff/diff_helpers.h delete mode 100644 vendor/libgit2/tests/diff/diffiter.c delete mode 100644 vendor/libgit2/tests/diff/drivers.c delete mode 100644 vendor/libgit2/tests/diff/format_email.c delete mode 100644 vendor/libgit2/tests/diff/index.c delete mode 100644 vendor/libgit2/tests/diff/iterator.c delete mode 100644 vendor/libgit2/tests/diff/notify.c delete mode 100644 vendor/libgit2/tests/diff/patch.c delete mode 100644 vendor/libgit2/tests/diff/pathspec.c delete mode 100644 vendor/libgit2/tests/diff/rename.c delete mode 100644 vendor/libgit2/tests/diff/stats.c delete mode 100644 vendor/libgit2/tests/diff/submodules.c delete mode 100644 vendor/libgit2/tests/diff/tree.c delete mode 100644 vendor/libgit2/tests/diff/workdir.c delete mode 100644 vendor/libgit2/tests/fetchhead/fetchhead_data.h delete mode 100644 vendor/libgit2/tests/fetchhead/nonetwork.c delete mode 100644 vendor/libgit2/tests/filter/blob.c delete mode 100644 vendor/libgit2/tests/filter/crlf.c delete mode 100644 vendor/libgit2/tests/filter/crlf.h delete mode 100644 vendor/libgit2/tests/filter/custom.c delete mode 100644 vendor/libgit2/tests/filter/custom_helpers.c delete mode 100644 vendor/libgit2/tests/filter/custom_helpers.h delete mode 100644 vendor/libgit2/tests/filter/file.c delete mode 100644 vendor/libgit2/tests/filter/ident.c delete mode 100644 vendor/libgit2/tests/filter/query.c delete mode 100644 vendor/libgit2/tests/filter/stream.c delete mode 100644 vendor/libgit2/tests/filter/wildcard.c delete mode 100644 vendor/libgit2/tests/generate.py delete mode 100644 vendor/libgit2/tests/generate_crlf.sh delete mode 100644 vendor/libgit2/tests/graph/descendant_of.c delete mode 100644 vendor/libgit2/tests/index/add.c delete mode 100644 vendor/libgit2/tests/index/addall.c delete mode 100644 vendor/libgit2/tests/index/bypath.c delete mode 100644 vendor/libgit2/tests/index/cache.c delete mode 100644 vendor/libgit2/tests/index/collision.c delete mode 100644 vendor/libgit2/tests/index/conflicts.c delete mode 100644 vendor/libgit2/tests/index/crlf.c delete mode 100644 vendor/libgit2/tests/index/filemodes.c delete mode 100644 vendor/libgit2/tests/index/inmemory.c delete mode 100644 vendor/libgit2/tests/index/names.c delete mode 100644 vendor/libgit2/tests/index/nsec.c delete mode 100644 vendor/libgit2/tests/index/racy.c delete mode 100644 vendor/libgit2/tests/index/read_index.c delete mode 100644 vendor/libgit2/tests/index/read_tree.c delete mode 100644 vendor/libgit2/tests/index/rename.c delete mode 100644 vendor/libgit2/tests/index/reuc.c delete mode 100644 vendor/libgit2/tests/index/stage.c delete mode 100644 vendor/libgit2/tests/index/tests.c delete mode 100644 vendor/libgit2/tests/main.c delete mode 100644 vendor/libgit2/tests/merge/conflict_data.h delete mode 100644 vendor/libgit2/tests/merge/files.c delete mode 100644 vendor/libgit2/tests/merge/merge_helpers.c delete mode 100644 vendor/libgit2/tests/merge/merge_helpers.h delete mode 100644 vendor/libgit2/tests/merge/trees/automerge.c delete mode 100644 vendor/libgit2/tests/merge/trees/commits.c delete mode 100644 vendor/libgit2/tests/merge/trees/modeconflict.c delete mode 100644 vendor/libgit2/tests/merge/trees/recursive.c delete mode 100644 vendor/libgit2/tests/merge/trees/renames.c delete mode 100644 vendor/libgit2/tests/merge/trees/treediff.c delete mode 100644 vendor/libgit2/tests/merge/trees/trivial.c delete mode 100644 vendor/libgit2/tests/merge/trees/whitespace.c delete mode 100644 vendor/libgit2/tests/merge/workdir/analysis.c delete mode 100644 vendor/libgit2/tests/merge/workdir/dirty.c delete mode 100644 vendor/libgit2/tests/merge/workdir/recursive.c delete mode 100644 vendor/libgit2/tests/merge/workdir/renames.c delete mode 100644 vendor/libgit2/tests/merge/workdir/setup.c delete mode 100644 vendor/libgit2/tests/merge/workdir/simple.c delete mode 100644 vendor/libgit2/tests/merge/workdir/submodules.c delete mode 100644 vendor/libgit2/tests/merge/workdir/trivial.c delete mode 100644 vendor/libgit2/tests/network/cred.c delete mode 100644 vendor/libgit2/tests/network/fetchlocal.c delete mode 100644 vendor/libgit2/tests/network/matchhost.c delete mode 100644 vendor/libgit2/tests/network/refspecs.c delete mode 100644 vendor/libgit2/tests/network/remote/createthenload.c delete mode 100644 vendor/libgit2/tests/network/remote/defaultbranch.c delete mode 100644 vendor/libgit2/tests/network/remote/delete.c delete mode 100644 vendor/libgit2/tests/network/remote/isvalidname.c delete mode 100644 vendor/libgit2/tests/network/remote/local.c delete mode 100644 vendor/libgit2/tests/network/remote/push.c delete mode 100644 vendor/libgit2/tests/network/remote/remotes.c delete mode 100644 vendor/libgit2/tests/network/remote/rename.c delete mode 100644 vendor/libgit2/tests/network/urlparse.c delete mode 100644 vendor/libgit2/tests/notes/notes.c delete mode 100644 vendor/libgit2/tests/notes/notesref.c delete mode 100644 vendor/libgit2/tests/object/blob/filter.c delete mode 100644 vendor/libgit2/tests/object/blob/fromchunks.c delete mode 100644 vendor/libgit2/tests/object/blob/write.c delete mode 100644 vendor/libgit2/tests/object/cache.c delete mode 100644 vendor/libgit2/tests/object/commit/commitstagedfile.c delete mode 100644 vendor/libgit2/tests/object/lookup.c delete mode 100644 vendor/libgit2/tests/object/lookupbypath.c delete mode 100644 vendor/libgit2/tests/object/message.c delete mode 100644 vendor/libgit2/tests/object/peel.c delete mode 100644 vendor/libgit2/tests/object/raw/chars.c delete mode 100644 vendor/libgit2/tests/object/raw/compare.c delete mode 100644 vendor/libgit2/tests/object/raw/convert.c delete mode 100644 vendor/libgit2/tests/object/raw/data.h delete mode 100644 vendor/libgit2/tests/object/raw/fromstr.c delete mode 100644 vendor/libgit2/tests/object/raw/hash.c delete mode 100644 vendor/libgit2/tests/object/raw/short.c delete mode 100644 vendor/libgit2/tests/object/raw/size.c delete mode 100644 vendor/libgit2/tests/object/raw/type2string.c delete mode 100644 vendor/libgit2/tests/object/raw/write.c delete mode 100644 vendor/libgit2/tests/object/shortid.c delete mode 100644 vendor/libgit2/tests/object/tag/list.c delete mode 100644 vendor/libgit2/tests/object/tag/peel.c delete mode 100644 vendor/libgit2/tests/object/tag/read.c delete mode 100644 vendor/libgit2/tests/object/tag/write.c delete mode 100644 vendor/libgit2/tests/object/tree/attributes.c delete mode 100644 vendor/libgit2/tests/object/tree/duplicateentries.c delete mode 100644 vendor/libgit2/tests/object/tree/frompath.c delete mode 100644 vendor/libgit2/tests/object/tree/read.c delete mode 100644 vendor/libgit2/tests/object/tree/walk.c delete mode 100644 vendor/libgit2/tests/object/tree/write.c delete mode 100644 vendor/libgit2/tests/odb/alternates.c delete mode 100644 vendor/libgit2/tests/odb/backend/nobackend.c delete mode 100644 vendor/libgit2/tests/odb/backend/nonrefreshing.c delete mode 100644 vendor/libgit2/tests/odb/emptyobjects.c delete mode 100644 vendor/libgit2/tests/odb/foreach.c delete mode 100644 vendor/libgit2/tests/odb/loose.c delete mode 100644 vendor/libgit2/tests/odb/loose_data.h delete mode 100644 vendor/libgit2/tests/odb/mixed.c delete mode 100644 vendor/libgit2/tests/odb/pack_data.h delete mode 100644 vendor/libgit2/tests/odb/pack_data_one.h delete mode 100644 vendor/libgit2/tests/odb/packed.c delete mode 100644 vendor/libgit2/tests/odb/packed_one.c delete mode 100644 vendor/libgit2/tests/odb/sorting.c delete mode 100644 vendor/libgit2/tests/odb/streamwrite.c delete mode 100644 vendor/libgit2/tests/online/badssl.c delete mode 100644 vendor/libgit2/tests/online/clone.c delete mode 100644 vendor/libgit2/tests/online/fetch.c delete mode 100644 vendor/libgit2/tests/online/fetchhead.c delete mode 100644 vendor/libgit2/tests/online/push.c delete mode 100644 vendor/libgit2/tests/online/push_util.c delete mode 100644 vendor/libgit2/tests/online/push_util.h delete mode 100644 vendor/libgit2/tests/online/remotes.c delete mode 100644 vendor/libgit2/tests/pack/indexer.c delete mode 100644 vendor/libgit2/tests/pack/packbuilder.c delete mode 100644 vendor/libgit2/tests/pack/sharing.c delete mode 100644 vendor/libgit2/tests/path/core.c delete mode 100644 vendor/libgit2/tests/path/win32.c delete mode 100644 vendor/libgit2/tests/perf/helper__perf__do_merge.c delete mode 100644 vendor/libgit2/tests/perf/helper__perf__do_merge.h delete mode 100644 vendor/libgit2/tests/perf/helper__perf__timer.c delete mode 100644 vendor/libgit2/tests/perf/helper__perf__timer.h delete mode 100644 vendor/libgit2/tests/perf/merge.c delete mode 100644 vendor/libgit2/tests/rebase/abort.c delete mode 100644 vendor/libgit2/tests/rebase/inmemory.c delete mode 100644 vendor/libgit2/tests/rebase/iterator.c delete mode 100644 vendor/libgit2/tests/rebase/merge.c delete mode 100644 vendor/libgit2/tests/rebase/setup.c delete mode 100644 vendor/libgit2/tests/refs/branches/create.c delete mode 100644 vendor/libgit2/tests/refs/branches/delete.c delete mode 100644 vendor/libgit2/tests/refs/branches/ishead.c delete mode 100644 vendor/libgit2/tests/refs/branches/iterator.c delete mode 100644 vendor/libgit2/tests/refs/branches/lookup.c delete mode 100644 vendor/libgit2/tests/refs/branches/move.c delete mode 100644 vendor/libgit2/tests/refs/branches/name.c delete mode 100644 vendor/libgit2/tests/refs/branches/remote.c delete mode 100644 vendor/libgit2/tests/refs/branches/upstream.c delete mode 100644 vendor/libgit2/tests/refs/branches/upstreamname.c delete mode 100644 vendor/libgit2/tests/refs/crashes.c delete mode 100644 vendor/libgit2/tests/refs/create.c delete mode 100644 vendor/libgit2/tests/refs/createwithlog.c delete mode 100644 vendor/libgit2/tests/refs/delete.c delete mode 100644 vendor/libgit2/tests/refs/foreachglob.c delete mode 100644 vendor/libgit2/tests/refs/isvalidname.c delete mode 100644 vendor/libgit2/tests/refs/iterator.c delete mode 100644 vendor/libgit2/tests/refs/list.c delete mode 100644 vendor/libgit2/tests/refs/listall.c delete mode 100644 vendor/libgit2/tests/refs/lookup.c delete mode 100644 vendor/libgit2/tests/refs/normalize.c delete mode 100644 vendor/libgit2/tests/refs/overwrite.c delete mode 100644 vendor/libgit2/tests/refs/pack.c delete mode 100644 vendor/libgit2/tests/refs/peel.c delete mode 100644 vendor/libgit2/tests/refs/races.c delete mode 100644 vendor/libgit2/tests/refs/read.c delete mode 100644 vendor/libgit2/tests/refs/ref_helpers.c delete mode 100644 vendor/libgit2/tests/refs/ref_helpers.h delete mode 100644 vendor/libgit2/tests/refs/reflog/drop.c delete mode 100644 vendor/libgit2/tests/refs/reflog/reflog.c delete mode 100644 vendor/libgit2/tests/refs/rename.c delete mode 100644 vendor/libgit2/tests/refs/revparse.c delete mode 100644 vendor/libgit2/tests/refs/settargetwithlog.c delete mode 100644 vendor/libgit2/tests/refs/setter.c delete mode 100644 vendor/libgit2/tests/refs/shorthand.c delete mode 100644 vendor/libgit2/tests/refs/transactions.c delete mode 100644 vendor/libgit2/tests/refs/unicode.c delete mode 100644 vendor/libgit2/tests/refs/update.c delete mode 100644 vendor/libgit2/tests/remote/insteadof.c delete mode 100644 vendor/libgit2/tests/repo/config.c delete mode 100644 vendor/libgit2/tests/repo/discover.c delete mode 100644 vendor/libgit2/tests/repo/getters.c delete mode 100644 vendor/libgit2/tests/repo/hashfile.c delete mode 100644 vendor/libgit2/tests/repo/head.c delete mode 100644 vendor/libgit2/tests/repo/headtree.c delete mode 100644 vendor/libgit2/tests/repo/init.c delete mode 100644 vendor/libgit2/tests/repo/iterator.c delete mode 100644 vendor/libgit2/tests/repo/message.c delete mode 100644 vendor/libgit2/tests/repo/new.c delete mode 100644 vendor/libgit2/tests/repo/open.c delete mode 100644 vendor/libgit2/tests/repo/pathspec.c delete mode 100644 vendor/libgit2/tests/repo/repo_helpers.c delete mode 100644 vendor/libgit2/tests/repo/repo_helpers.h delete mode 100644 vendor/libgit2/tests/repo/reservedname.c delete mode 100644 vendor/libgit2/tests/repo/setters.c delete mode 100644 vendor/libgit2/tests/repo/shallow.c delete mode 100644 vendor/libgit2/tests/repo/state.c delete mode 100644 vendor/libgit2/tests/reset/default.c delete mode 100644 vendor/libgit2/tests/reset/hard.c delete mode 100644 vendor/libgit2/tests/reset/mixed.c delete mode 100644 vendor/libgit2/tests/reset/reset_helpers.c delete mode 100644 vendor/libgit2/tests/reset/reset_helpers.h delete mode 100644 vendor/libgit2/tests/reset/soft.c delete mode 100644 vendor/libgit2/tests/resources/.gitattributes delete mode 100644 vendor/libgit2/tests/resources/.gitignore delete mode 100644 vendor/libgit2/tests/resources/attr/.gitted/HEAD delete mode 100644 vendor/libgit2/tests/resources/attr/.gitted/config delete mode 100644 vendor/libgit2/tests/resources/attr/.gitted/description delete mode 100644 vendor/libgit2/tests/resources/attr/.gitted/index delete mode 100644 vendor/libgit2/tests/resources/attr/.gitted/info/attributes delete mode 100644 vendor/libgit2/tests/resources/attr/.gitted/info/exclude delete mode 100644 vendor/libgit2/tests/resources/attr/.gitted/logs/HEAD delete mode 100644 vendor/libgit2/tests/resources/attr/.gitted/logs/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/attr/.gitted/objects/10/8bb4e7fd7b16490dc33ff7d972151e73d7166e delete mode 100644 vendor/libgit2/tests/resources/attr/.gitted/objects/16/983da6643656bb44c43965ecb6855c6d574512 delete mode 100644 vendor/libgit2/tests/resources/attr/.gitted/objects/21/7878ab49e1314388ea2e32dc6fdb58a1b969e0 delete mode 100644 vendor/libgit2/tests/resources/attr/.gitted/objects/24/fa9a9fc4e202313e24b648087495441dab432b delete mode 100644 vendor/libgit2/tests/resources/attr/.gitted/objects/29/29de282ce999e95183aedac6451d3384559c4b delete mode 100644 vendor/libgit2/tests/resources/attr/.gitted/objects/2b/40c5aca159b04ea8d20ffe36cdf8b09369b14a delete mode 100644 vendor/libgit2/tests/resources/attr/.gitted/objects/2c/66e14f77196ea763fb1e41612c1aa2bc2d8ed2 delete mode 100644 vendor/libgit2/tests/resources/attr/.gitted/objects/2d/e7dfe3588f3c7e9ad59e7d50ba90e3329df9d9 delete mode 100644 vendor/libgit2/tests/resources/attr/.gitted/objects/37/0fe9ec224ce33e71f9e5ec2bd1142ce9937a6a delete mode 100644 vendor/libgit2/tests/resources/attr/.gitted/objects/3a/6df026462ebafe455af9867d27eda20a9e0974 delete mode 100644 vendor/libgit2/tests/resources/attr/.gitted/objects/3b/74db7ab381105dc0d28f8295a77f6a82989292 delete mode 100644 vendor/libgit2/tests/resources/attr/.gitted/objects/3e/42ffc54a663f9401cc25843d6c0e71a33e4249 delete mode 100644 vendor/libgit2/tests/resources/attr/.gitted/objects/45/141a79a77842c59a63229403220a4e4be74e3d delete mode 100644 vendor/libgit2/tests/resources/attr/.gitted/objects/45/5a314fa848d52ae1f11d254da4f60858fc97f4 delete mode 100644 vendor/libgit2/tests/resources/attr/.gitted/objects/45/b983be36b73c0788dc9cbcb76cbb80fc7bb057 delete mode 100644 vendor/libgit2/tests/resources/attr/.gitted/objects/4d/713dc48e6b1bd75b0d61ad078ba9ca3a56745d delete mode 100644 vendor/libgit2/tests/resources/attr/.gitted/objects/4e/49ba8c5b6c32ff28cd9dcb60be34df50fcc485 delete mode 100644 vendor/libgit2/tests/resources/attr/.gitted/objects/55/6f8c827b8e4a02ad5cab77dca2bcb3e226b0b3 delete mode 100644 vendor/libgit2/tests/resources/attr/.gitted/objects/58/19a185d77b03325aaf87cafc771db36f6ddca7 delete mode 100644 vendor/libgit2/tests/resources/attr/.gitted/objects/60/5812ab7fe421fdd325a935d35cb06a9234a7d7 delete mode 100644 vendor/libgit2/tests/resources/attr/.gitted/objects/6b/ab5c79cd5140d0f800917f550eb2a3dc32b0da delete mode 100644 vendor/libgit2/tests/resources/attr/.gitted/objects/6d/968d62c89c7d9ea23a4c9a7b665d017c3d8ffd delete mode 100644 vendor/libgit2/tests/resources/attr/.gitted/objects/71/7fc31f6b84f9d6fc3a4edbca259d7fc92beee2 delete mode 100644 vendor/libgit2/tests/resources/attr/.gitted/objects/8d/0b9df9bd30be7910ddda60548d485bc302b911 delete mode 100644 vendor/libgit2/tests/resources/attr/.gitted/objects/93/61f40bb97239cf55811892e14de2e344168ba1 delete mode 100644 vendor/libgit2/tests/resources/attr/.gitted/objects/94/da4faa0a6bfb8ee6ccf7153801a69202b31857 delete mode 100644 vendor/libgit2/tests/resources/attr/.gitted/objects/96/089fd31ce1d3ee2afb0ba09ba063066932f027 delete mode 100644 vendor/libgit2/tests/resources/attr/.gitted/objects/99/eae476896f4907224978b88e5ecaa6c5bb67a9 delete mode 100644 vendor/libgit2/tests/resources/attr/.gitted/objects/9e/5bdc47d6a80f2be0ea3049ad74231b94609242 delete mode 100644 vendor/libgit2/tests/resources/attr/.gitted/objects/9f/b40b6675dde60b5697afceae91b66d908c02d9 delete mode 100644 vendor/libgit2/tests/resources/attr/.gitted/objects/a0/f7217ae99f5ac3e88534f5cea267febc5fa85b delete mode 100644 vendor/libgit2/tests/resources/attr/.gitted/objects/a5/6bbcecaeac760cc26239384d2d4c614e7e4320 delete mode 100644 vendor/libgit2/tests/resources/attr/.gitted/objects/a5/d76cad53f66f1312bd995909a5bab3c0820770 delete mode 100644 vendor/libgit2/tests/resources/attr/.gitted/objects/a9/7cc019851d401a4f1d091cb91a15890a0dd1ba delete mode 100644 vendor/libgit2/tests/resources/attr/.gitted/objects/b4/35cd5689a0fb54afbeda4ac20368aa480e8f04 delete mode 100644 vendor/libgit2/tests/resources/attr/.gitted/objects/c0/091889c0c77142b87a1fa5123a6398a61d33e7 delete mode 100644 vendor/libgit2/tests/resources/attr/.gitted/objects/c4/85abe35abd4aa6fd83b076a78bbea9e2e7e06c delete mode 100644 vendor/libgit2/tests/resources/attr/.gitted/objects/c7/aadd770d5907a8475c29e9ee21a27b88bf675d delete mode 100644 vendor/libgit2/tests/resources/attr/.gitted/objects/c9/6bbb2c2557a8325ae1559e3ba79cdcecb23076 delete mode 100644 vendor/libgit2/tests/resources/attr/.gitted/objects/ce/39a97a7fb1fa90bcf5e711249c1e507476ae0e delete mode 100644 vendor/libgit2/tests/resources/attr/.gitted/objects/d5/7da33c16b14326ecb05d19bbea908f5e4c47d9 delete mode 100644 vendor/libgit2/tests/resources/attr/.gitted/objects/d8/00886d9c86731ae5c4a62b0b77c437015e00d2 delete mode 100644 vendor/libgit2/tests/resources/attr/.gitted/objects/dc/cada462d3df8ac6de596fb8c896aba9344f941 delete mode 100644 vendor/libgit2/tests/resources/attr/.gitted/objects/de/863bff4976c9ed7e17a4da0fd524908dc84049 delete mode 100644 vendor/libgit2/tests/resources/attr/.gitted/objects/e5/63cf4758f0d646f1b14b76016aa17fa9e549a4 delete mode 100644 vendor/libgit2/tests/resources/attr/.gitted/objects/ec/b97df2a174987475ac816e3847fc8e9f6c596b delete mode 100644 vendor/libgit2/tests/resources/attr/.gitted/objects/ed/f3dcee4003d71f139777898882ccd097e34c53 delete mode 100644 vendor/libgit2/tests/resources/attr/.gitted/objects/f2/c6d717cf4a5a3e6b02684155ab07b766982165 delete mode 100644 vendor/libgit2/tests/resources/attr/.gitted/objects/f5/b0af1fb4f5c0cd7aad880711d368a07333c307 delete mode 100644 vendor/libgit2/tests/resources/attr/.gitted/objects/fb/5067b1aef3ac1ada4b379dbcb7d17255df7d78 delete mode 100644 vendor/libgit2/tests/resources/attr/.gitted/objects/fe/773770c5a6cc7185580c9204b1ff18a33ff3fc delete mode 100644 vendor/libgit2/tests/resources/attr/.gitted/objects/ff/69f8639ce2e6010b3f33a74160aad98b48da2b delete mode 100644 vendor/libgit2/tests/resources/attr/.gitted/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/attr/attr0 delete mode 100644 vendor/libgit2/tests/resources/attr/attr1 delete mode 100644 vendor/libgit2/tests/resources/attr/attr2 delete mode 100644 vendor/libgit2/tests/resources/attr/attr3 delete mode 100644 vendor/libgit2/tests/resources/attr/binfile delete mode 100644 vendor/libgit2/tests/resources/attr/dir/file delete mode 100644 vendor/libgit2/tests/resources/attr/file delete mode 100644 vendor/libgit2/tests/resources/attr/gitattributes delete mode 100644 vendor/libgit2/tests/resources/attr/gitignore delete mode 100644 vendor/libgit2/tests/resources/attr/ign delete mode 100644 vendor/libgit2/tests/resources/attr/macro_bad delete mode 100644 vendor/libgit2/tests/resources/attr/macro_test delete mode 100644 vendor/libgit2/tests/resources/attr/root_test1 delete mode 100644 vendor/libgit2/tests/resources/attr/root_test2 delete mode 100644 vendor/libgit2/tests/resources/attr/root_test3 delete mode 100644 vendor/libgit2/tests/resources/attr/root_test4.txt delete mode 100644 vendor/libgit2/tests/resources/attr/sub/.gitattributes delete mode 100644 vendor/libgit2/tests/resources/attr/sub/abc delete mode 100644 vendor/libgit2/tests/resources/attr/sub/dir/file delete mode 100644 vendor/libgit2/tests/resources/attr/sub/file delete mode 100644 vendor/libgit2/tests/resources/attr/sub/ign/file delete mode 100644 vendor/libgit2/tests/resources/attr/sub/ign/sub/file delete mode 100644 vendor/libgit2/tests/resources/attr/sub/sub/.gitattributes delete mode 100644 vendor/libgit2/tests/resources/attr/sub/sub/dir delete mode 100644 vendor/libgit2/tests/resources/attr/sub/sub/file delete mode 100644 vendor/libgit2/tests/resources/attr/sub/sub/subsub.txt delete mode 100644 vendor/libgit2/tests/resources/attr/sub/subdir_test1 delete mode 100644 vendor/libgit2/tests/resources/attr/sub/subdir_test2.txt delete mode 100644 vendor/libgit2/tests/resources/attr_index/.gitted/HEAD delete mode 100644 vendor/libgit2/tests/resources/attr_index/.gitted/config delete mode 100644 vendor/libgit2/tests/resources/attr_index/.gitted/description delete mode 100644 vendor/libgit2/tests/resources/attr_index/.gitted/index delete mode 100644 vendor/libgit2/tests/resources/attr_index/.gitted/info/exclude delete mode 100644 vendor/libgit2/tests/resources/attr_index/.gitted/info/refs delete mode 100644 vendor/libgit2/tests/resources/attr_index/.gitted/logs/HEAD delete mode 100644 vendor/libgit2/tests/resources/attr_index/.gitted/logs/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/attr_index/.gitted/objects/38/12cfef36615db1788d4e63f90028007e17a348 delete mode 100644 vendor/libgit2/tests/resources/attr_index/.gitted/objects/59/d942b8be2784bc96db9b22202c10815c9a077b delete mode 100644 vendor/libgit2/tests/resources/attr_index/.gitted/objects/cd/f17ea3fe625ef812f4dce7f423f4f299287505 delete mode 100644 vendor/libgit2/tests/resources/attr_index/.gitted/objects/f7/2502ddd01412bb20796ff812af56fd53b82b52 delete mode 100644 vendor/libgit2/tests/resources/attr_index/.gitted/objects/info/packs delete mode 100644 vendor/libgit2/tests/resources/attr_index/.gitted/objects/pack/pack-4e6438607204ce78827e3885594b2c0bb4f13895.idx delete mode 100644 vendor/libgit2/tests/resources/attr_index/.gitted/objects/pack/pack-4e6438607204ce78827e3885594b2c0bb4f13895.pack delete mode 100644 vendor/libgit2/tests/resources/attr_index/.gitted/packed-refs delete mode 100644 vendor/libgit2/tests/resources/attr_index/.gitted/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/attr_index/README.md delete mode 100644 vendor/libgit2/tests/resources/attr_index/README.txt delete mode 100644 vendor/libgit2/tests/resources/attr_index/gitattributes delete mode 100644 vendor/libgit2/tests/resources/attr_index/sub/sub/.gitattributes delete mode 100644 vendor/libgit2/tests/resources/attr_index/sub/sub/README.md delete mode 100644 vendor/libgit2/tests/resources/attr_index/sub/sub/README.txt delete mode 100644 vendor/libgit2/tests/resources/bad.index delete mode 100644 vendor/libgit2/tests/resources/bad_tag.git/HEAD delete mode 100644 vendor/libgit2/tests/resources/bad_tag.git/config delete mode 100644 vendor/libgit2/tests/resources/bad_tag.git/objects/pack/pack-7a28f4e000a17f49a41d7a79fc2f762a8a7d9164.idx delete mode 100644 vendor/libgit2/tests/resources/bad_tag.git/objects/pack/pack-7a28f4e000a17f49a41d7a79fc2f762a8a7d9164.pack delete mode 100644 vendor/libgit2/tests/resources/bad_tag.git/packed-refs delete mode 100644 vendor/libgit2/tests/resources/bad_tag.git/refs/dummy-marker.txt delete mode 100644 vendor/libgit2/tests/resources/big.index delete mode 100644 vendor/libgit2/tests/resources/binaryunicode/.gitted/HEAD delete mode 100644 vendor/libgit2/tests/resources/binaryunicode/.gitted/config delete mode 100644 vendor/libgit2/tests/resources/binaryunicode/.gitted/description delete mode 100644 vendor/libgit2/tests/resources/binaryunicode/.gitted/index delete mode 100644 vendor/libgit2/tests/resources/binaryunicode/.gitted/info/exclude delete mode 100644 vendor/libgit2/tests/resources/binaryunicode/.gitted/info/refs delete mode 100644 vendor/libgit2/tests/resources/binaryunicode/.gitted/objects/info/packs delete mode 100644 vendor/libgit2/tests/resources/binaryunicode/.gitted/objects/pack/pack-c5bfca875b4995d7aba6e5abf36241f3c397327d.idx delete mode 100644 vendor/libgit2/tests/resources/binaryunicode/.gitted/objects/pack/pack-c5bfca875b4995d7aba6e5abf36241f3c397327d.pack delete mode 100644 vendor/libgit2/tests/resources/binaryunicode/.gitted/refs/heads/branch1 delete mode 100644 vendor/libgit2/tests/resources/binaryunicode/.gitted/refs/heads/branch2 delete mode 100644 vendor/libgit2/tests/resources/binaryunicode/.gitted/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/binaryunicode/file.txt delete mode 100644 vendor/libgit2/tests/resources/blametest.git/HEAD delete mode 100644 vendor/libgit2/tests/resources/blametest.git/config delete mode 100644 vendor/libgit2/tests/resources/blametest.git/description delete mode 100644 vendor/libgit2/tests/resources/blametest.git/objects/0c/bab4d45fd61e55a1c9697f9f9cb07a12e15448 delete mode 100644 vendor/libgit2/tests/resources/blametest.git/objects/1a/ac69ae5d96461afc4d81d0066cb12f5b05a35b delete mode 100644 vendor/libgit2/tests/resources/blametest.git/objects/1b/5f0775af166331c854bd8d1bca3450eaf2532a delete mode 100644 vendor/libgit2/tests/resources/blametest.git/objects/37/681a80ca21064efd5c3bf2ef41eb3d05a1428b delete mode 100644 vendor/libgit2/tests/resources/blametest.git/objects/48/2f2c370e35c2c314fc1f96db2beb33f955a26a delete mode 100644 vendor/libgit2/tests/resources/blametest.git/objects/4e/ecfea484f8005d101e547f6bfb07c99e2b114e delete mode 100644 vendor/libgit2/tests/resources/blametest.git/objects/5a/572e2e94825f54b95417eacaa089d560c5a5e9 delete mode 100644 vendor/libgit2/tests/resources/blametest.git/objects/63/d671eb32d250e4a83766ebbc60e818c1e1e93a delete mode 100644 vendor/libgit2/tests/resources/blametest.git/objects/63/eb57322e363e18d460da5ea8284f3cd2340b36 delete mode 100644 vendor/libgit2/tests/resources/blametest.git/objects/66/53ff42313eb5c82806f145391b18a9699800c7 delete mode 100644 vendor/libgit2/tests/resources/blametest.git/objects/8b/137891791fe96927ad78e64b0aad7bded08bdc delete mode 100644 vendor/libgit2/tests/resources/blametest.git/objects/96/679d59cf9f74d69b3c920f258559b5e8c9a18a delete mode 100644 vendor/libgit2/tests/resources/blametest.git/objects/98/89d6e5557761aa8e3607e80c874a6dc51ada7c delete mode 100644 vendor/libgit2/tests/resources/blametest.git/objects/aa/06ecca6c4ad6432ab9313e556ca92ba4bcf9e9 delete mode 100644 vendor/libgit2/tests/resources/blametest.git/objects/ad/9cb4eac23df2fe5e1264287a5872ea2a1ff8b2 delete mode 100644 vendor/libgit2/tests/resources/blametest.git/objects/b1/76dfc3a4dc8734e4c579f77236a9c8d0a965d2 delete mode 100644 vendor/libgit2/tests/resources/blametest.git/objects/b9/0bb887b7c03750ae6b352ffe76ab9d2e86ee7d delete mode 100644 vendor/libgit2/tests/resources/blametest.git/objects/b9/9f7ac0b88909253d829554c14af488c3b0f3a5 delete mode 100644 vendor/libgit2/tests/resources/blametest.git/objects/bc/7c5ac2bafe828a68e9d1d460343718d6fbe136 delete mode 100644 vendor/libgit2/tests/resources/blametest.git/objects/cf/e0e1e1e3ba18f149fd47f5e1aef6016b2260c3 delete mode 100644 vendor/libgit2/tests/resources/blametest.git/objects/d0/67729932057cdb7527a833d6799c4ddc520640 delete mode 100644 vendor/libgit2/tests/resources/blametest.git/objects/da/237394e6132d20d30f175b9b73c8638fddddda delete mode 100644 vendor/libgit2/tests/resources/blametest.git/objects/de/9fe35f9906e1994e083cc59c87232bf418795b delete mode 100644 vendor/libgit2/tests/resources/blametest.git/objects/e5/b41c1ea533f87388ab69b13baf0b5a562d6243 delete mode 100644 vendor/libgit2/tests/resources/blametest.git/objects/ef/32df4d259143933715c74951f932d9892364d1 delete mode 100644 vendor/libgit2/tests/resources/blametest.git/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/HEAD delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/config delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/index delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/info/exclude delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/01/a2b453c2647c71ccfefc285f2266d1f00b8253 delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/02/67838e09bbc5969bba035be2d27c8a6de694d8 delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/06/3fc9f01e6e9ec2a8d8f749885e931875e50d37 delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/08/9ac03f76058b5ba0b44bb268f317f9242481e9 delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/0d/447a6c2528b06616cde3b209a4b4ea3dcb8d65 delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/11/24c2c1ae07b26fded662d6c3f3631d9dc16f88 delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/12/905f4ea5b76f9d3fdcfe73e462201c06ae632a delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/19/c5c7207054604b69c84d08a7571ef9672bb5c2 delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/1c/2116845780455ecf916538c1cc27c4222452af delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/1c/c85eb4ff0a8438fde1b14274c6f87f891b36a0 delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/1e/1cb7391d25dcd8daba88f1f627f3045982286c delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/20/fc1a4c9d994021f43d33ab75e4252e27ca661d delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/28/d9eb4208074ad1cc84e71ccc908b34573f05d2 delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/2a/26c7e88b285613b302ba76712bc998863f3cbc delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/2a/c3b376093de405b0a951bff578655b1c2b7fa1 delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/2c/acbcaabf785f1ac231e8519849d4ad38692f2c delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/35/cb210149022c7379b0a67b0dec13cc628ff87d delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/38/c05a857e831a7e759d83778bfc85d003e21c45 delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/3f/9eed8946df9e2c737d3b8dc0b8e78959aacd92 delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/40/9a1bec58bf35348e8b62b72bb9c1f45cf5a587 delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/44/cd2ed2052c9c68f9a439d208e9614dc2a55c70 delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/48/7434cace79238a7091e2220611d4f20a765690 delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/49/20ad2f17162dcc8823ad491444dcb87f5899c9 delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/4c/532774cc1fea37f6efc2256763a64d38c8cdde delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/51/145af30d411a50195b66517d825e69bf57ed22 delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/54/61de53ffadbf15be4dd6345997c15689573209 delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/54/784f10955e92ab27e4fa832e40cb2baf1edbdc delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/56/3f6473a3858f99b80e5f93c660512ed38e1e6f delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/58/a957ef0061c1a8ef995c855dfab4f5da8d6617 delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/5d/c7e1f440ce74d5503a0dfbc6c30e091475f774 delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/5e/2206cda1c56430ad107a6866a829c159e0b9ea delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/5f/77a2a13935ac62a629553f8944ad57b1ed8b4a delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/63/c0d92b95253c4a40d3883f423a54be47d2c4c8 delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/6c/e83eb5f0fd34a10c3d25c6b36d2ed7ec0d6ce7 delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/6d/1c2afe5eeb9e497528e2780ac468a5465cbc96 delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/74/f06b5bfec6d33d7264f73606b57a7c0b963819 delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/82/8b08c52d2cba30952e0e008f60b25b5ba0d41a delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/85/36dd6f0ec3ddecb9f9b6c8c64c6d322cd01211 delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/85/a4a1d791973644f24c72f5e89420d3064cc452 delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/8b/5c30499a71001189b647f4d5b57fa8f04897ce delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/96/4ea3da044d9083181a88ba6701de9e35778bf4 delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/9c/c39fca3765a2facbe31157f7d60c2602193f36 delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/9c/cb9bf50c011fd58dcbaa65df917bf79539717f delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/a1/0b59f4280491afe6e430c30654a7acc67d4a33 delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/a2/1b4bfe7a04ab18024fb57f4ae9a52a1acef394 delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/a4/3a050c588d4e92f11a6b139680923e9728477d delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/a5/8ca3fee5eb68b11adc2703e5843f968c9dad1e delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/a6/61b5dec1004e2c62654ded3762370c27cf266b delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/a6/9ef8fcbb9a2c509a7dbf4f23d257eb551d5610 delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/a8/3c6f70297b805dedc549e6583582966f6ebcab delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/a9/020cd240774e4d672732bcb82d516d9685da76 delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/ab/4115f808bc585b60f822da7020af86d20f62c8 delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/ab/e4603bc7cd5b8167a267e0e2418fd2348f8cff delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/b8/26e9b36e22e949ec885e7a1f3db496bbab6cd0 delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/ba/fbf6912c09505ac60575cd43d3f2aba3bd84d8 delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/bb/14296ffa9dfbf935ec9ce2f9ed7808d952226b delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/bc/4dd0744364d1db380a9811bd264c101065231e delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/bd/65d4083845ed5ed4e1fe5feb85ac395d0760c8 delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/bd/6ffc8c6c41f0f85ff9e3d61c9479516bac0024 delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/bd/a51965cb36c0c5731c8cb50b80a36cac81018e delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/ce/d8fb81b6ec534d5deaf2a48b4b96c799712507 delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/cf/c4f0999a8367568e049af4f72e452d40828a15 delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/d0/f21e17beb5b9d953b1d8349049818a4f2edd1e delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/d3/d77487660ee3c0194ee01dc5eaf478782b1c7e delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/e2/33b9ed408a95e9d4b65fec7fc34943a556deb2 delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/e5/183bfd18e3a0a691fadde2f0d5610b73282d31 delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/e6/ae8889c40c77d7be02758235b5b3f7a4f2a129 delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/e7/811a2bc55635f182750f0420da5ad232c1af91 delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/e9/b63f3655b2ad80c0ff587389b5a9589a3a7110 delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/eb/da71fe44dcb60c53b8fbd53208a1204d32e959 delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/f0/5ed049854c1596a7cc0e957fab34961077f3ae delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/f0/a4e1c66bb548cd2b22eebefda703872e969775 delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/f2/ec8c8cf1a9fb7aa047a25a4308bfe860237ad4 delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/f5/684c96bf40c709877b56404cd8a5dd2d2a7978 delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/objects/f9/0f9dcbdac2cce5cc166346160e19cb693ef4e8 delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/refs/heads/automerge-branch delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/refs/heads/merge-branch delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/refs/heads/merge-conflicts delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/refs/heads/merge-mainline delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/refs/heads/orphan delete mode 100644 vendor/libgit2/tests/resources/cherrypick/.gitted/refs/heads/renames delete mode 100644 vendor/libgit2/tests/resources/cherrypick/file1.txt delete mode 100644 vendor/libgit2/tests/resources/cherrypick/file2.txt delete mode 100644 vendor/libgit2/tests/resources/cherrypick/file3.txt delete mode 100644 vendor/libgit2/tests/resources/config/.gitconfig delete mode 100644 vendor/libgit2/tests/resources/config/config-include delete mode 100644 vendor/libgit2/tests/resources/config/config-included delete mode 100644 vendor/libgit2/tests/resources/config/config0 delete mode 100644 vendor/libgit2/tests/resources/config/config1 delete mode 100644 vendor/libgit2/tests/resources/config/config10 delete mode 100644 vendor/libgit2/tests/resources/config/config11 delete mode 100644 vendor/libgit2/tests/resources/config/config12 delete mode 100644 vendor/libgit2/tests/resources/config/config13 delete mode 100644 vendor/libgit2/tests/resources/config/config14 delete mode 100644 vendor/libgit2/tests/resources/config/config15 delete mode 100644 vendor/libgit2/tests/resources/config/config16 delete mode 100644 vendor/libgit2/tests/resources/config/config17 delete mode 100644 vendor/libgit2/tests/resources/config/config18 delete mode 100644 vendor/libgit2/tests/resources/config/config19 delete mode 100644 vendor/libgit2/tests/resources/config/config2 delete mode 100644 vendor/libgit2/tests/resources/config/config20 delete mode 100644 vendor/libgit2/tests/resources/config/config3 delete mode 100644 vendor/libgit2/tests/resources/config/config4 delete mode 100644 vendor/libgit2/tests/resources/config/config5 delete mode 100644 vendor/libgit2/tests/resources/config/config6 delete mode 100644 vendor/libgit2/tests/resources/config/config7 delete mode 100644 vendor/libgit2/tests/resources/config/config8 delete mode 100644 vendor/libgit2/tests/resources/config/config9 delete mode 100644 vendor/libgit2/tests/resources/crlf/.gitted/HEAD delete mode 100644 vendor/libgit2/tests/resources/crlf/.gitted/config delete mode 100644 vendor/libgit2/tests/resources/crlf/.gitted/index delete mode 100644 vendor/libgit2/tests/resources/crlf/.gitted/objects/04/4bcd5c9bf5ebdd51e514a9a36457018f06f6e1 delete mode 100644 vendor/libgit2/tests/resources/crlf/.gitted/objects/04/de00b358f13389948756732158eaaaefa1448c delete mode 100644 vendor/libgit2/tests/resources/crlf/.gitted/objects/09/7722be9b67b48dfe3b19396d02fd535300ee46 delete mode 100644 vendor/libgit2/tests/resources/crlf/.gitted/objects/0a/a76e474d259bd7c13eb726a1396c381db55c88 delete mode 100644 vendor/libgit2/tests/resources/crlf/.gitted/objects/0d/06894e14df22e066763ae906e0ed3eb79c205f delete mode 100644 vendor/libgit2/tests/resources/crlf/.gitted/objects/0e/052888828a954ca17e5882638e3c6a083e75c0 delete mode 100644 vendor/libgit2/tests/resources/crlf/.gitted/objects/0f/f5a53f19bfd2b5eea1ba550295c47515678987 delete mode 100644 vendor/libgit2/tests/resources/crlf/.gitted/objects/16/78031ee023a23bd3515e4e1693b661a69f0a73 delete mode 100644 vendor/libgit2/tests/resources/crlf/.gitted/objects/16/c72b67861f8524a5bebc05cd20472d3fca00da delete mode 100644 vendor/libgit2/tests/resources/crlf/.gitted/objects/18/c637c5d9aba6eed226ee1840cd1ca2e6c4e4c5 delete mode 100644 vendor/libgit2/tests/resources/crlf/.gitted/objects/20/3555c5676d75cd80d69b50beb1f4b588c59ceb delete mode 100644 vendor/libgit2/tests/resources/crlf/.gitted/objects/23/f4582779e60bfa7f14750ad507399a58876611 delete mode 100644 vendor/libgit2/tests/resources/crlf/.gitted/objects/2a/d3df895f68f4dda6a0a815c620b909bdd27c05 delete mode 100644 vendor/libgit2/tests/resources/crlf/.gitted/objects/2b/55b4b94f655c857635b6a9005c056aa7de3532 delete mode 100644 vendor/libgit2/tests/resources/crlf/.gitted/objects/2b/d9d81b51a867352bab307b89cbb5b4a69adfe1 delete mode 100644 vendor/libgit2/tests/resources/crlf/.gitted/objects/2c/03f9f407b576eae80327864bab572e282a33ea delete mode 100644 vendor/libgit2/tests/resources/crlf/.gitted/objects/33/cdead44e1c3ec178e39a4a69085280dbacf01b delete mode 100644 vendor/libgit2/tests/resources/crlf/.gitted/objects/38/1cfe630df902bc29271a202d3277981180e4a6 delete mode 100644 vendor/libgit2/tests/resources/crlf/.gitted/objects/3f/96bdca0e37616026afaa325c148cec4aa62d04 delete mode 100644 vendor/libgit2/tests/resources/crlf/.gitted/objects/41/7786fc35b3c71aa546e3f95eb5da3c8dad8c41 delete mode 100644 vendor/libgit2/tests/resources/crlf/.gitted/objects/47/fbc2c28a18df0dc773276a253eb85c7516ca50 delete mode 100644 vendor/libgit2/tests/resources/crlf/.gitted/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 delete mode 100644 vendor/libgit2/tests/resources/crlf/.gitted/objects/5a/fb6a14a864e30787857dd92af837e8cdd2cb1b delete mode 100644 vendor/libgit2/tests/resources/crlf/.gitted/objects/68/03c385642cebc8103fddd526ef395d75678a7e delete mode 100644 vendor/libgit2/tests/resources/crlf/.gitted/objects/69/597764abeaa1a403ebf589d2ea579c6a8f877e delete mode 100644 vendor/libgit2/tests/resources/crlf/.gitted/objects/6a/e3e9c11a51f0aabebcffcbd5c00f4beed143c9 delete mode 100644 vendor/libgit2/tests/resources/crlf/.gitted/objects/6c/589757f65a970a6cc07c71c3f3d2528c611cbc delete mode 100644 vendor/libgit2/tests/resources/crlf/.gitted/objects/77/afe26d93c49279ca90604c125496920753fede delete mode 100644 vendor/libgit2/tests/resources/crlf/.gitted/objects/78/db270c1841841f75a8157321bdcb50ab12e6c3 delete mode 100644 vendor/libgit2/tests/resources/crlf/.gitted/objects/79/9770d1cff46753a57db7a066159b5610da6e3a delete mode 100644 vendor/libgit2/tests/resources/crlf/.gitted/objects/7c/ce67e58173e2b01f7db124ceaabe3183d19c49 delete mode 100644 vendor/libgit2/tests/resources/crlf/.gitted/objects/85/340755cfe5e28c2835781978bb1cece91b3d0f delete mode 100644 vendor/libgit2/tests/resources/crlf/.gitted/objects/92/0e90a663bea5d740989d5f935f6dfb473a0c5d delete mode 100644 vendor/libgit2/tests/resources/crlf/.gitted/objects/96/87e444bcbb85645cb496080434c292f1b57182 delete mode 100644 vendor/libgit2/tests/resources/crlf/.gitted/objects/97/449da2d225557c558ac244384d487e66c3e591 delete mode 100644 vendor/libgit2/tests/resources/crlf/.gitted/objects/9a/6c3533fef19abd6eec8e61206b5c51982b80d9 delete mode 100644 vendor/libgit2/tests/resources/crlf/.gitted/objects/9d/29b5bb165bf65637ffcb5ededb82ddd7c3fd13 delete mode 100644 vendor/libgit2/tests/resources/crlf/.gitted/objects/a2/34455d62297f1856c4603686150c59fcb0aafe delete mode 100644 vendor/libgit2/tests/resources/crlf/.gitted/objects/a9/a2e8913c1dbe2812fac5e6b4e0a4bd5d0d5966 delete mode 100644 vendor/libgit2/tests/resources/crlf/.gitted/objects/aa/f083a9cb53dac3669dcfa0e48921580d629ec7 delete mode 100644 vendor/libgit2/tests/resources/crlf/.gitted/objects/af/6fcf6da196f615d7cda269b55b5c4ecfb4a5b3 delete mode 100644 vendor/libgit2/tests/resources/crlf/.gitted/objects/bb/29a7b46b5d4ba3ea17b238ae561b81d59dc818 delete mode 100644 vendor/libgit2/tests/resources/crlf/.gitted/objects/c3/e11722855ff260bd27418988ac1467c4e9e73a delete mode 100644 vendor/libgit2/tests/resources/crlf/.gitted/objects/c8/d0b1ebcaccdd8f968c4aae3c2175e7fed651fe delete mode 100644 vendor/libgit2/tests/resources/crlf/.gitted/objects/cd/574f5a2baa4c79504f8837b730fa0b11defe99 delete mode 100644 vendor/libgit2/tests/resources/crlf/.gitted/objects/cd/d3dacc5c0501d5ea57bbdf90e3d80176606139 delete mode 100644 vendor/libgit2/tests/resources/crlf/.gitted/objects/d1/1e7ef63ba7db1db3b1b99cdbafc57a8549f8a4 delete mode 100644 vendor/libgit2/tests/resources/crlf/.gitted/objects/dc/88e3b917de821e25962bea7ec1f55c4ce2112c delete mode 100644 vendor/libgit2/tests/resources/crlf/.gitted/objects/de/5bfa165999d9d6c6dbafad2a7e709f93ec30fd delete mode 100644 vendor/libgit2/tests/resources/crlf/.gitted/objects/e5/062da7d7802cf492975eda580f09ac4876bd88 delete mode 100644 vendor/libgit2/tests/resources/crlf/.gitted/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 delete mode 100644 vendor/libgit2/tests/resources/crlf/.gitted/objects/ea/030d3c6cec212069eca698cabaa5b4550f1511 delete mode 100644 vendor/libgit2/tests/resources/crlf/.gitted/objects/ef/0dcd356d77221e9c27f4f3928ad28e80b87ceb delete mode 100644 vendor/libgit2/tests/resources/crlf/.gitted/objects/f2/b745d7f47d114a3a6b31a7b628e61e804d1a58 delete mode 100644 vendor/libgit2/tests/resources/crlf/.gitted/objects/f4/d25b796d86387205a5498175d66e91d1e5006a delete mode 100644 vendor/libgit2/tests/resources/crlf/.gitted/objects/fe/085d9ace90cc675b87df15e1aeed0c3a31407f delete mode 100644 vendor/libgit2/tests/resources/crlf/.gitted/objects/fe/ab3713c4659bb22700042b3c55b8d60d0a952b delete mode 100644 vendor/libgit2/tests/resources/crlf/.gitted/refs/heads/empty-files delete mode 100644 vendor/libgit2/tests/resources/crlf/.gitted/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/crlf_data/.gitattributes delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,-crlf/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,-crlf/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,-crlf/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,-crlf/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,-crlf/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,-crlf/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,-crlf/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,-crlf/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,-crlf/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,-crlf/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,-crlf/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,-crlf/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,-crlf/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,-crlf/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,-crlf/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,-crlf/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,-crlf/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,-crlf/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,-crlf/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,-text/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,-text/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,-text/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,-text/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,-text/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,-text/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,-text/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,-text/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,-text/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,-text/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,-text/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,-text/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,-text/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,-text/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,-text/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,-text/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,-text/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,-text/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,-text/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,crlf/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,crlf/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,crlf/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,crlf/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,crlf/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,crlf/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,crlf/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,crlf/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,crlf/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,crlf/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,crlf/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,crlf/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,crlf/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,crlf/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,crlf/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,crlf/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,crlf/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,crlf/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,crlf/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,eol_crlf/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,eol_crlf/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,eol_crlf/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,eol_crlf/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,eol_crlf/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,eol_crlf/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,eol_crlf/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,eol_crlf/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,eol_crlf/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,eol_crlf/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,eol_crlf/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,eol_crlf/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,eol_crlf/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,eol_crlf/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,eol_crlf/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,eol_crlf/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,eol_crlf/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,eol_crlf/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,eol_crlf/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,eol_lf/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,eol_lf/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,eol_lf/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,eol_lf/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,eol_lf/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,eol_lf/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,eol_lf/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,eol_lf/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,eol_lf/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,eol_lf/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,eol_lf/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,eol_lf/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,eol_lf/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,eol_lf/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,eol_lf/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,eol_lf/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,eol_lf/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,eol_lf/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,eol_lf/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text,eol_crlf/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text,eol_crlf/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text,eol_crlf/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text,eol_crlf/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text,eol_crlf/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text,eol_crlf/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text,eol_crlf/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text,eol_crlf/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text,eol_crlf/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text,eol_crlf/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text,eol_crlf/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text,eol_crlf/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text,eol_crlf/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text,eol_crlf/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text,eol_crlf/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text,eol_crlf/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text,eol_crlf/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text,eol_crlf/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text,eol_crlf/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text,eol_lf/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text,eol_lf/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text,eol_lf/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text,eol_lf/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text,eol_lf/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text,eol_lf/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text,eol_lf/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text,eol_lf/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text,eol_lf/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text,eol_lf/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text,eol_lf/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text,eol_lf/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text,eol_lf/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text,eol_lf/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text,eol_lf/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text,eol_lf/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text,eol_lf/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text,eol_lf/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text,eol_lf/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_crlf/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_crlf/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_crlf/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_crlf/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_crlf/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_crlf/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_crlf/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_crlf/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_crlf/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_crlf/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_crlf/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_crlf/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_crlf/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_crlf/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_crlf/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_crlf/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_crlf/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_crlf/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_crlf/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_lf/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_lf/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_lf/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_lf/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_lf/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_lf/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_lf/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_lf/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_lf/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_lf/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_lf/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_lf/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_lf/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_lf/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_lf/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_lf/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_lf/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_lf/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_lf/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text_auto/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text_auto/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text_auto/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text_auto/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text_auto/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text_auto/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text_auto/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text_auto/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text_auto/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text_auto/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text_auto/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text_auto/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text_auto/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text_auto/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text_auto/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text_auto/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text_auto/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text_auto/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false,text_auto/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_false/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,-crlf/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,-crlf/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,-crlf/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,-crlf/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,-crlf/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,-crlf/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,-crlf/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,-crlf/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,-crlf/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,-crlf/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,-crlf/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,-crlf/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,-crlf/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,-crlf/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,-crlf/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,-crlf/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,-crlf/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,-crlf/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,-crlf/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,-text/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,-text/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,-text/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,-text/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,-text/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,-text/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,-text/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,-text/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,-text/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,-text/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,-text/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,-text/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,-text/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,-text/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,-text/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,-text/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,-text/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,-text/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,-text/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,crlf/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,crlf/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,crlf/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,crlf/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,crlf/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,crlf/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,crlf/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,crlf/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,crlf/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,crlf/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,crlf/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,crlf/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,crlf/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,crlf/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,crlf/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,crlf/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,crlf/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,crlf/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,crlf/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,eol_crlf/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,eol_crlf/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,eol_crlf/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,eol_crlf/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,eol_crlf/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,eol_crlf/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,eol_crlf/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,eol_crlf/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,eol_crlf/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,eol_crlf/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,eol_crlf/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,eol_crlf/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,eol_crlf/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,eol_crlf/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,eol_crlf/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,eol_crlf/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,eol_crlf/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,eol_crlf/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,eol_crlf/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,eol_lf/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,eol_lf/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,eol_lf/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,eol_lf/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,eol_lf/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,eol_lf/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,eol_lf/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,eol_lf/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,eol_lf/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,eol_lf/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,eol_lf/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,eol_lf/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,eol_lf/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,eol_lf/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,eol_lf/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,eol_lf/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,eol_lf/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,eol_lf/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,eol_lf/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text,eol_crlf/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text,eol_crlf/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text,eol_crlf/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text,eol_crlf/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text,eol_crlf/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text,eol_crlf/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text,eol_crlf/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text,eol_crlf/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text,eol_crlf/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text,eol_crlf/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text,eol_crlf/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text,eol_crlf/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text,eol_crlf/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text,eol_crlf/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text,eol_crlf/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text,eol_crlf/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text,eol_crlf/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text,eol_crlf/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text,eol_crlf/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text,eol_lf/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text,eol_lf/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text,eol_lf/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text,eol_lf/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text,eol_lf/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text,eol_lf/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text,eol_lf/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text,eol_lf/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text,eol_lf/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text,eol_lf/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text,eol_lf/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text,eol_lf/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text,eol_lf/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text,eol_lf/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text,eol_lf/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text,eol_lf/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text,eol_lf/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text,eol_lf/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text,eol_lf/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_crlf/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_crlf/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_crlf/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_crlf/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_crlf/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_crlf/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_crlf/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_crlf/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_crlf/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_crlf/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_crlf/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_crlf/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_crlf/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_crlf/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_crlf/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_crlf/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_crlf/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_crlf/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_crlf/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_lf/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_lf/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_lf/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_lf/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_lf/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_lf/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_lf/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_lf/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_lf/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_lf/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_lf/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_lf/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_lf/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_lf/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_lf/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_lf/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_lf/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_lf/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_lf/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text_auto/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text_auto/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text_auto/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text_auto/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text_auto/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text_auto/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text_auto/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text_auto/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text_auto/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text_auto/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text_auto/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text_auto/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text_auto/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text_auto/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text_auto/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text_auto/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text_auto/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text_auto/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input,text_auto/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_input/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,-crlf/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,-crlf/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,-crlf/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,-crlf/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,-crlf/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,-crlf/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,-crlf/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,-crlf/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,-crlf/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,-crlf/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,-crlf/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,-crlf/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,-crlf/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,-crlf/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,-crlf/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,-crlf/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,-crlf/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,-crlf/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,-crlf/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,-text/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,-text/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,-text/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,-text/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,-text/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,-text/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,-text/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,-text/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,-text/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,-text/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,-text/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,-text/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,-text/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,-text/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,-text/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,-text/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,-text/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,-text/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,-text/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,crlf/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,crlf/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,crlf/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,crlf/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,crlf/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,crlf/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,crlf/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,crlf/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,crlf/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,crlf/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,crlf/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,crlf/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,crlf/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,crlf/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,crlf/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,crlf/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,crlf/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,crlf/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,crlf/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,eol_crlf/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,eol_crlf/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,eol_crlf/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,eol_crlf/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,eol_crlf/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,eol_crlf/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,eol_crlf/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,eol_crlf/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,eol_crlf/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,eol_crlf/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,eol_crlf/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,eol_crlf/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,eol_crlf/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,eol_crlf/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,eol_crlf/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,eol_crlf/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,eol_crlf/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,eol_crlf/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,eol_crlf/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,eol_lf/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,eol_lf/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,eol_lf/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,eol_lf/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,eol_lf/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,eol_lf/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,eol_lf/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,eol_lf/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,eol_lf/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,eol_lf/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,eol_lf/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,eol_lf/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,eol_lf/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,eol_lf/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,eol_lf/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,eol_lf/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,eol_lf/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,eol_lf/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,eol_lf/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text,eol_crlf/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text,eol_crlf/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text,eol_crlf/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text,eol_crlf/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text,eol_crlf/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text,eol_crlf/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text,eol_crlf/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text,eol_crlf/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text,eol_crlf/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text,eol_crlf/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text,eol_crlf/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text,eol_crlf/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text,eol_crlf/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text,eol_crlf/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text,eol_crlf/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text,eol_crlf/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text,eol_crlf/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text,eol_crlf/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text,eol_crlf/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text,eol_lf/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text,eol_lf/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text,eol_lf/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text,eol_lf/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text,eol_lf/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text,eol_lf/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text,eol_lf/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text,eol_lf/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text,eol_lf/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text,eol_lf/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text,eol_lf/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text,eol_lf/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text,eol_lf/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text,eol_lf/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text,eol_lf/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text,eol_lf/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text,eol_lf/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text,eol_lf/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text,eol_lf/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_crlf/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_crlf/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_crlf/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_crlf/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_crlf/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_crlf/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_crlf/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_crlf/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_crlf/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_crlf/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_crlf/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_crlf/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_crlf/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_crlf/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_crlf/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_crlf/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_crlf/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_crlf/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_crlf/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_lf/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_lf/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_lf/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_lf/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_lf/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_lf/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_lf/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_lf/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_lf/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_lf/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_lf/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_lf/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_lf/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_lf/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_lf/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_lf/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_lf/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_lf/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_lf/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text_auto/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text_auto/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text_auto/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text_auto/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text_auto/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text_auto/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text_auto/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text_auto/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text_auto/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text_auto/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text_auto/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text_auto/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text_auto/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text_auto/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text_auto/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text_auto/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text_auto/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text_auto/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true,text_auto/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/posix/autocrlf_true/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,-crlf/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,-crlf/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,-crlf/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,-crlf/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,-crlf/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,-crlf/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,-crlf/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,-crlf/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,-crlf/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,-crlf/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,-crlf/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,-crlf/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,-crlf/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,-crlf/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,-crlf/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,-crlf/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,-crlf/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,-crlf/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,-crlf/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,-text/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,-text/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,-text/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,-text/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,-text/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,-text/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,-text/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,-text/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,-text/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,-text/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,-text/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,-text/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,-text/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,-text/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,-text/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,-text/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,-text/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,-text/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,-text/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,crlf/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,crlf/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,crlf/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,crlf/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,crlf/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,crlf/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,crlf/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,crlf/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,crlf/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,crlf/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,crlf/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,crlf/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,crlf/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,crlf/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,crlf/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,crlf/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,crlf/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,crlf/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,crlf/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,eol_crlf/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,eol_crlf/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,eol_crlf/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,eol_crlf/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,eol_crlf/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,eol_crlf/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,eol_crlf/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,eol_crlf/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,eol_crlf/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,eol_crlf/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,eol_crlf/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,eol_crlf/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,eol_crlf/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,eol_crlf/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,eol_crlf/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,eol_crlf/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,eol_crlf/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,eol_crlf/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,eol_crlf/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,eol_lf/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,eol_lf/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,eol_lf/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,eol_lf/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,eol_lf/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,eol_lf/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,eol_lf/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,eol_lf/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,eol_lf/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,eol_lf/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,eol_lf/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,eol_lf/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,eol_lf/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,eol_lf/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,eol_lf/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,eol_lf/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,eol_lf/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,eol_lf/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,eol_lf/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text,eol_crlf/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text,eol_crlf/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text,eol_crlf/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text,eol_crlf/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text,eol_crlf/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text,eol_crlf/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text,eol_crlf/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text,eol_crlf/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text,eol_crlf/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text,eol_crlf/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text,eol_crlf/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text,eol_crlf/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text,eol_crlf/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text,eol_crlf/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text,eol_crlf/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text,eol_crlf/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text,eol_crlf/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text,eol_crlf/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text,eol_crlf/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text,eol_lf/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text,eol_lf/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text,eol_lf/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text,eol_lf/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text,eol_lf/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text,eol_lf/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text,eol_lf/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text,eol_lf/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text,eol_lf/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text,eol_lf/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text,eol_lf/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text,eol_lf/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text,eol_lf/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text,eol_lf/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text,eol_lf/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text,eol_lf/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text,eol_lf/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text,eol_lf/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text,eol_lf/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_crlf/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_crlf/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_crlf/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_crlf/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_crlf/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_crlf/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_crlf/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_crlf/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_crlf/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_crlf/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_crlf/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_crlf/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_crlf/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_crlf/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_crlf/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_crlf/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_crlf/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_crlf/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_crlf/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_lf/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_lf/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_lf/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_lf/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_lf/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_lf/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_lf/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_lf/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_lf/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_lf/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_lf/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_lf/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_lf/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_lf/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_lf/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_lf/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_lf/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_lf/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_lf/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text_auto/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text_auto/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text_auto/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text_auto/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text_auto/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text_auto/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text_auto/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text_auto/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text_auto/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text_auto/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text_auto/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text_auto/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text_auto/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text_auto/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text_auto/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text_auto/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text_auto/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text_auto/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false,text_auto/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_false/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,-crlf/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,-crlf/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,-crlf/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,-crlf/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,-crlf/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,-crlf/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,-crlf/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,-crlf/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,-crlf/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,-crlf/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,-crlf/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,-crlf/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,-crlf/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,-crlf/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,-crlf/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,-crlf/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,-crlf/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,-crlf/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,-crlf/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,-text/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,-text/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,-text/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,-text/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,-text/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,-text/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,-text/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,-text/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,-text/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,-text/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,-text/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,-text/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,-text/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,-text/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,-text/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,-text/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,-text/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,-text/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,-text/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,crlf/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,crlf/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,crlf/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,crlf/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,crlf/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,crlf/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,crlf/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,crlf/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,crlf/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,crlf/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,crlf/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,crlf/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,crlf/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,crlf/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,crlf/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,crlf/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,crlf/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,crlf/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,crlf/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,eol_crlf/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,eol_crlf/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,eol_crlf/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,eol_crlf/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,eol_crlf/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,eol_crlf/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,eol_crlf/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,eol_crlf/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,eol_crlf/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,eol_crlf/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,eol_crlf/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,eol_crlf/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,eol_crlf/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,eol_crlf/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,eol_crlf/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,eol_crlf/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,eol_crlf/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,eol_crlf/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,eol_crlf/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,eol_lf/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,eol_lf/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,eol_lf/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,eol_lf/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,eol_lf/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,eol_lf/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,eol_lf/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,eol_lf/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,eol_lf/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,eol_lf/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,eol_lf/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,eol_lf/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,eol_lf/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,eol_lf/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,eol_lf/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,eol_lf/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,eol_lf/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,eol_lf/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,eol_lf/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text,eol_crlf/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text,eol_crlf/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text,eol_crlf/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text,eol_crlf/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text,eol_crlf/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text,eol_crlf/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text,eol_crlf/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text,eol_crlf/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text,eol_crlf/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text,eol_crlf/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text,eol_crlf/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text,eol_crlf/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text,eol_crlf/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text,eol_crlf/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text,eol_crlf/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text,eol_crlf/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text,eol_crlf/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text,eol_crlf/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text,eol_crlf/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text,eol_lf/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text,eol_lf/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text,eol_lf/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text,eol_lf/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text,eol_lf/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text,eol_lf/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text,eol_lf/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text,eol_lf/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text,eol_lf/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text,eol_lf/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text,eol_lf/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text,eol_lf/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text,eol_lf/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text,eol_lf/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text,eol_lf/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text,eol_lf/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text,eol_lf/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text,eol_lf/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text,eol_lf/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_crlf/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_crlf/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_crlf/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_crlf/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_crlf/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_crlf/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_crlf/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_crlf/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_crlf/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_crlf/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_crlf/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_crlf/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_crlf/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_crlf/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_crlf/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_crlf/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_crlf/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_crlf/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_crlf/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_lf/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_lf/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_lf/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_lf/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_lf/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_lf/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_lf/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_lf/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_lf/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_lf/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_lf/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_lf/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_lf/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_lf/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_lf/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_lf/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_lf/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_lf/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_lf/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text_auto/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text_auto/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text_auto/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text_auto/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text_auto/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text_auto/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text_auto/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text_auto/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text_auto/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text_auto/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text_auto/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text_auto/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text_auto/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text_auto/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text_auto/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text_auto/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text_auto/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text_auto/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input,text_auto/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_input/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,-crlf/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,-crlf/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,-crlf/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,-crlf/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,-crlf/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,-crlf/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,-crlf/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,-crlf/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,-crlf/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,-crlf/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,-crlf/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,-crlf/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,-crlf/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,-crlf/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,-crlf/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,-crlf/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,-crlf/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,-crlf/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,-crlf/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,-text/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,-text/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,-text/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,-text/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,-text/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,-text/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,-text/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,-text/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,-text/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,-text/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,-text/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,-text/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,-text/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,-text/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,-text/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,-text/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,-text/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,-text/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,-text/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,crlf/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,crlf/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,crlf/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,crlf/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,crlf/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,crlf/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,crlf/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,crlf/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,crlf/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,crlf/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,crlf/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,crlf/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,crlf/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,crlf/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,crlf/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,crlf/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,crlf/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,crlf/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,crlf/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,eol_crlf/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,eol_crlf/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,eol_crlf/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,eol_crlf/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,eol_crlf/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,eol_crlf/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,eol_crlf/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,eol_crlf/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,eol_crlf/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,eol_crlf/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,eol_crlf/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,eol_crlf/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,eol_crlf/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,eol_crlf/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,eol_crlf/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,eol_crlf/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,eol_crlf/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,eol_crlf/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,eol_crlf/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,eol_lf/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,eol_lf/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,eol_lf/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,eol_lf/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,eol_lf/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,eol_lf/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,eol_lf/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,eol_lf/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,eol_lf/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,eol_lf/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,eol_lf/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,eol_lf/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,eol_lf/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,eol_lf/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,eol_lf/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,eol_lf/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,eol_lf/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,eol_lf/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,eol_lf/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text,eol_crlf/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text,eol_crlf/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text,eol_crlf/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text,eol_crlf/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text,eol_crlf/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text,eol_crlf/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text,eol_crlf/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text,eol_crlf/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text,eol_crlf/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text,eol_crlf/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text,eol_crlf/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text,eol_crlf/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text,eol_crlf/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text,eol_crlf/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text,eol_crlf/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text,eol_crlf/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text,eol_crlf/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text,eol_crlf/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text,eol_crlf/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text,eol_lf/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text,eol_lf/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text,eol_lf/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text,eol_lf/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text,eol_lf/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text,eol_lf/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text,eol_lf/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text,eol_lf/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text,eol_lf/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text,eol_lf/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text,eol_lf/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text,eol_lf/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text,eol_lf/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text,eol_lf/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text,eol_lf/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text,eol_lf/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text,eol_lf/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text,eol_lf/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text,eol_lf/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_crlf/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_crlf/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_crlf/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_crlf/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_crlf/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_crlf/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_crlf/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_crlf/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_crlf/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_crlf/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_crlf/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_crlf/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_crlf/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_crlf/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_crlf/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_crlf/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_crlf/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_crlf/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_crlf/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_lf/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_lf/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_lf/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_lf/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_lf/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_lf/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_lf/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_lf/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_lf/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_lf/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_lf/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_lf/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_lf/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_lf/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_lf/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_lf/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_lf/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_lf/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_lf/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text_auto/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text_auto/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text_auto/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text_auto/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text_auto/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text_auto/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text_auto/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text_auto/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text_auto/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text_auto/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text_auto/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text_auto/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text_auto/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text_auto/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text_auto/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text_auto/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text_auto/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text_auto/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true,text_auto/zero-byte delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true/all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true/all-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true/all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true/all-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true/binary-all-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true/binary-all-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true/binary-mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true/binary-mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true/few-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true/few-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true/many-utf8-chars-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true/many-utf8-chars-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true/mixed-lf-cr delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true/mixed-lf-cr-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true/more-crlf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true/more-crlf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true/more-lf delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true/more-lf-utf8bom delete mode 100644 vendor/libgit2/tests/resources/crlf_data/windows/autocrlf_true/zero-byte delete mode 100644 vendor/libgit2/tests/resources/deprecated-mode.git/HEAD delete mode 100644 vendor/libgit2/tests/resources/deprecated-mode.git/config delete mode 100644 vendor/libgit2/tests/resources/deprecated-mode.git/description delete mode 100644 vendor/libgit2/tests/resources/deprecated-mode.git/index delete mode 100644 vendor/libgit2/tests/resources/deprecated-mode.git/info/exclude delete mode 100644 vendor/libgit2/tests/resources/deprecated-mode.git/objects/06/262edc257418e9987caf999f9a7a3e1547adff delete mode 100644 vendor/libgit2/tests/resources/deprecated-mode.git/objects/08/10fb7818088ff5ac41ee49199b51473b1bd6c7 delete mode 100644 vendor/libgit2/tests/resources/deprecated-mode.git/objects/1b/05fdaa881ee45b48cbaa5e9b037d667a47745e delete mode 100644 vendor/libgit2/tests/resources/deprecated-mode.git/objects/3d/0970ec547fc41ef8a5882dde99c6adce65b021 delete mode 100644 vendor/libgit2/tests/resources/deprecated-mode.git/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/describe/.gitted/HEAD delete mode 100644 vendor/libgit2/tests/resources/describe/.gitted/config delete mode 100644 vendor/libgit2/tests/resources/describe/.gitted/index delete mode 100644 vendor/libgit2/tests/resources/describe/.gitted/logs/HEAD delete mode 100644 vendor/libgit2/tests/resources/describe/.gitted/logs/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/describe/.gitted/objects/03/00021985931292d0611b9232e757035fefc04d delete mode 100644 vendor/libgit2/tests/resources/describe/.gitted/objects/10/8b485d8268ea595df8ffea74f0f4b186577d32 delete mode 100644 vendor/libgit2/tests/resources/describe/.gitted/objects/10/bd08b099ecb79184c60183f5c94ca915f427ad delete mode 100644 vendor/libgit2/tests/resources/describe/.gitted/objects/17/8481050188cf00d7d9cd5a11e43ab8fab9294f delete mode 100644 vendor/libgit2/tests/resources/describe/.gitted/objects/19/1faf88a5826a99f475baaf8b13652c4e40bfe6 delete mode 100644 vendor/libgit2/tests/resources/describe/.gitted/objects/1e/016431ec7b22dd3e23f3e6f5f68f358f9227cf delete mode 100644 vendor/libgit2/tests/resources/describe/.gitted/objects/22/3b7836fb19fdf64ba2d3cd6173c6a283141f78 delete mode 100644 vendor/libgit2/tests/resources/describe/.gitted/objects/25/d5edf8c0ef17e8a13b8da75913dcec4ea7afc1 delete mode 100644 vendor/libgit2/tests/resources/describe/.gitted/objects/2b/df67abb163a4ffb2d7f3f0880c9fe5068ce782 delete mode 100644 vendor/libgit2/tests/resources/describe/.gitted/objects/31/fc9136820b507e938a9c6b88bf2c567a9f6f4b delete mode 100644 vendor/libgit2/tests/resources/describe/.gitted/objects/42/8f9554a2eec22de29898819b579466af7c1583 delete mode 100644 vendor/libgit2/tests/resources/describe/.gitted/objects/4d/6558b8fa764baeb0f19c1e857df91e0eda5a0f delete mode 100644 vendor/libgit2/tests/resources/describe/.gitted/objects/4f/2d9ce01ad5249cabdc6565366af8aff85b1525 delete mode 100644 vendor/libgit2/tests/resources/describe/.gitted/objects/52/912fbab0715dec53d43053966e78ad213ba359 delete mode 100644 vendor/libgit2/tests/resources/describe/.gitted/objects/56/26abf0f72e58d7a153368ba57db4c673c0e171 delete mode 100644 vendor/libgit2/tests/resources/describe/.gitted/objects/61/26a5f9c57ebc81e64370ec3095184ad92dab1c delete mode 100644 vendor/libgit2/tests/resources/describe/.gitted/objects/62/d8fe9f6db631bd3a19140699101c9e281c9f9d delete mode 100644 vendor/libgit2/tests/resources/describe/.gitted/objects/65/a91bc2262480dce4c5979519aae6668368eb4e delete mode 100644 vendor/libgit2/tests/resources/describe/.gitted/objects/68/0166b6cd31f76354fee2572618e6b0142d05e6 delete mode 100644 vendor/libgit2/tests/resources/describe/.gitted/objects/69/3a3de402bb23897ed5c931273e53c78eff0495 delete mode 100644 vendor/libgit2/tests/resources/describe/.gitted/objects/6a/12b56088706aa6c39ccd23b7c7ce60f3a0b9a1 delete mode 100644 vendor/libgit2/tests/resources/describe/.gitted/objects/6d/218e42592043041c4da016ff298cf241b86c3c delete mode 100644 vendor/libgit2/tests/resources/describe/.gitted/objects/75/bb152c600647586c226d98411b1d2f9861af5a delete mode 100644 vendor/libgit2/tests/resources/describe/.gitted/objects/81/f4b1aac643e6983fab370eae8aefccecbf3a4c delete mode 100644 vendor/libgit2/tests/resources/describe/.gitted/objects/8e/c1d96451ff05451720e4e8968812c46b35e5e4 delete mode 100644 vendor/libgit2/tests/resources/describe/.gitted/objects/94/9b98e208015bfc0e2f573debc34ae2f97a7f0e delete mode 100644 vendor/libgit2/tests/resources/describe/.gitted/objects/9c/06d71b8406ab97537e3acdc39a2c4ade7a9411 delete mode 100644 vendor/libgit2/tests/resources/describe/.gitted/objects/a6/095f816e81f64651595d488badc42399837d6a delete mode 100644 vendor/libgit2/tests/resources/describe/.gitted/objects/a9/e3325a07117aa5381e044a8d96c26eb30d729d delete mode 100644 vendor/libgit2/tests/resources/describe/.gitted/objects/a9/eb02af13df030159e39f70330d5c8a47655691 delete mode 100644 vendor/libgit2/tests/resources/describe/.gitted/objects/aa/d8d5cef3915ab78b3227abaaac99b62db9eb54 delete mode 100644 vendor/libgit2/tests/resources/describe/.gitted/objects/aa/ddd4f14847e0e323924ec262c2343249a84f8b delete mode 100644 vendor/libgit2/tests/resources/describe/.gitted/objects/b2/40c0fb88c5a629e00ebc1275fa1f33e364a705 delete mode 100644 vendor/libgit2/tests/resources/describe/.gitted/objects/ce/1c4f8b6120122e23d4442925d98c56c41917d8 delete mode 100644 vendor/libgit2/tests/resources/describe/.gitted/objects/d5/aab219a814ddbe4b3aaedf03cdea491b218ec4 delete mode 100644 vendor/libgit2/tests/resources/describe/.gitted/objects/f2/ad6c76f0115a6ba5b00456a849810e7ec0af20 delete mode 100644 vendor/libgit2/tests/resources/describe/.gitted/objects/f7/0f10e4db19068f79bc43844b49f3eece45c4e8 delete mode 100644 vendor/libgit2/tests/resources/describe/.gitted/objects/f7/19efd430d52bcfc8566a43b2eb655688d38871 delete mode 100644 vendor/libgit2/tests/resources/describe/.gitted/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/describe/another delete mode 100644 vendor/libgit2/tests/resources/describe/file delete mode 100644 vendor/libgit2/tests/resources/describe/side delete mode 100644 vendor/libgit2/tests/resources/diff/.gitted/HEAD delete mode 100644 vendor/libgit2/tests/resources/diff/.gitted/config delete mode 100644 vendor/libgit2/tests/resources/diff/.gitted/description delete mode 100644 vendor/libgit2/tests/resources/diff/.gitted/index delete mode 100644 vendor/libgit2/tests/resources/diff/.gitted/info/exclude delete mode 100644 vendor/libgit2/tests/resources/diff/.gitted/logs/HEAD delete mode 100644 vendor/libgit2/tests/resources/diff/.gitted/logs/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/diff/.gitted/objects/29/ab7053bb4dde0298e03e2c179e890b7dd465a7 delete mode 100644 vendor/libgit2/tests/resources/diff/.gitted/objects/3e/5bcbad2a68e5bc60a53b8388eea53a1a7ab847 delete mode 100644 vendor/libgit2/tests/resources/diff/.gitted/objects/54/6c735f16a3b44d9784075c2c0dab2ac9bf1989 delete mode 100644 vendor/libgit2/tests/resources/diff/.gitted/objects/7a/9e0b02e63179929fed24f0a3e0f19168114d10 delete mode 100644 vendor/libgit2/tests/resources/diff/.gitted/objects/7b/808f723a8ca90df319682c221187235af76693 delete mode 100644 vendor/libgit2/tests/resources/diff/.gitted/objects/88/789109439c1e1c3cd45224001edee5304ed53c delete mode 100644 vendor/libgit2/tests/resources/diff/.gitted/objects/cb/8294e696339863df760b2ff5d1e275bee72455 delete mode 100644 vendor/libgit2/tests/resources/diff/.gitted/objects/d7/0d245ed97ed2aa596dd1af6536e4bfdb047b69 delete mode 100644 vendor/libgit2/tests/resources/diff/.gitted/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/diff/another.txt delete mode 100644 vendor/libgit2/tests/resources/diff/readme.txt delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/HEAD delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/config delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/index delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/info/exclude delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/0a/37045ca6d8503e9bcf06a12abbbc8e92664cce delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/10/808fe9c9be5a190c0ba68d1a002233fb363508 delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/13/ecf3d572dbc5e5b32c8ba067d1d1e0939572e8 delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/17/cfad36e93db7706b16bef5ef842ba1e5ca06ab delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/1a/9932083f96b0db42552103d40076f62fa8235e delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/1a/e3be57f869687d983066a0f5d2aaea1b82ddc5 delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/1b/525b0a6c5218b069b601ce91fce8eaf0a54e20 delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/1e/82c3b234e37da82e5b23e0e2a70bca68ee12c6 delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/1e/875da9b1e67f853b2eec3e202c21c867097234 delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/20/609dbbc32bbfc827528eec3fcea2d024e6dd8a delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/23/f92946d3f38bd090f700d3e8e7b728ffc58264 delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/24/97c5249408494e66e25070a8c74e49eaeeb6c3 delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/24/9a4263be23b4d1c02484cb840b6eca4c6cf74d delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/25/2a3e19fd2c6fb7b20c111142c5bd5fb9ea6b8e delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/27/93544db9060bab4f9169e5b89c82f9fa7c7fa6 delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/29/1f1ff3cbb9a6f153678d9657679e3d4bf257df delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/2f/f7b811eee62a73959350b1f7349f6f4d0c882d delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/39/91dce9e71a0641ca49a6a4eea6c9e7ff402ed4 delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/45/eef2a9317e179984649de247269e38cd5d99cf delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/4a/076277b884c519a932be67e346db2ac80a98fa delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/4c/3bd7182ad66ea7aa20ba47ae82812b710d169c delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/4c/a10087e696d2ba78d07b146a118e9a7096ed4f delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/4d/de2b17d1c982cd988f21d24350a214401e4a1e delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/4f/31e0248ac800a1edc78b74f74e86f5eba90e87 delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/50/17c9456d013b2c7712d29aab73b681c880f509 delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/50/438cfa585c1d15cf3650ed1bf641da937cc261 delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/52/c3cd1ff6234b95fecbaf9ef13624da17697b8d delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/55/0d730ba1b8c4937ea170b37c7ba91d792c0aaa delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/62/7e7e12d87e07a83fad5b6bfa25e86ead4a5270 delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/66/81f1844dc677e5ff07ffd993461f5c441e6af5 delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/69/ddefb5c245e2f9ee62bd4cabd8ebe60a01e448 delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/6b/6c2067c6d968f9bddb9b900ee1ab7e5b067430 delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/6b/ef49b206b29d9c46456e075722cd1a48b41e4c delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/6c/15659c036377aebf3b4569959ca1f5bedb551f delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/6e/05acc5a5dab507d91a0a0cc0fb05a3dd98892d delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/73/09653445ecf038d3e3dd9ed55edb6cb541a4ba delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/74/6d514eae0c330261d37940cab33aa97fefbd93 delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/74/a4d5394ebcfa7e9f445680897dfbc96586bc86 delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/77/d0a3ed37236a7941d564f08d68d3b36462d231 delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/7a/de76dd34bba4733cf9878079f9fd4a456a9189 delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/7a/ff11da95ca2be0bfb74b06e7cc1c480559dbe7 delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/7f/854619451620f7fbcec7ea171675e615ce92b6 delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/87/3806f6f27e631eb0b23e4b56bea2bfac14a373 delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/89/47a46e2097638ca6040ad4877246f4186ec3bd delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/89/7d3af16ca9e420cd071b1c4541bd2b91d04c8c delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/8d/7523f6fcb2404257889abe0d96f093d9f524f9 delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/8d/fa038554d5b682a51bda8ee3038cee6c63be76 delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/92/64b96c6d104d0e07ae33d3007b6a48246c6f92 delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/94/350226b3aa14efac831c803a51f7a09f3fc31a delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/94/75e21dcbc515af8f641576400e4b450e5f4c03 delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/94/aaae8954e8bb613de636071da663a621695911 delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/9a/2d780ac2ea0aeabdb9d2a876e6bbfff17b2c44 delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/9a/c0329b8b7a4046210d8b8b02ac02055667de63 delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/9a/c35ff15cd8864aeafd889e4826a3150f0b06c4 delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/9b/997daca2a0beb5cc44b32c64f100a9a26d4d4b delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/a3/ac918e3a6604294b239cb956363e83d71abb3b delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/a5/ac978d4f2a1784f847f41223a34c3e78934238 delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/a7/29eab45c84563135e8631d4010230bc0479f1f delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/a9/7157a0d0571698728b6f2f7675b456c98c5961 delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/af/8f41d0cb7a3079a8f8e231ea2ab8b97837ce13 delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/b0/5cecf1949d192b6df852b3f71853ef820ee235 delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/b4/f457c219dbb3517be908d4e70f0ada2fd8b8f9 delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/bd/474b2519cc15eab801ff851cc7d50f0dee49a1 delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/bd/f7ba6bc5c4e57ca6595928dcbe6753c8a663ff delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/cb/a89408dc016f4caddb6dc886fcb58f587a78df delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/cd/471f0d8770371e1bc78bcbb38db4c7e4106bd2 delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/cd/ed722d05305c6b181f188c118d2d9810f39bb8 delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/ce/2792fcae8d704a56901754a0583a7418a21d8a delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/d1/4aa252e52a709d03a3d3d0d965e177eb0a674e delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/d5/ff67764c82f729b13c26a09576570d884d9687 delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/d7/bb447df12c6a8aba8727005482fb211f11297a delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/db/e8727e4806ae88ccc3f0755cae8f8cb7efa2cc delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/e1/2af77c510e8ce4c261a3758736109c2c2dd1f0 delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/e9/091231467304a5ef112de02361d795ef051ee1 delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/ee/251372f131d82e575f16fe51c778406d88f8c2 delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/f3/d35bd592fefd8280fc0c302fa9f27dbdd721a3 delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/f4/07be01334e07bfb8f57cd2078f0ee3eb61e085 delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/f9/e215d309644e24fa50d6bd6e6eedba166e56bc delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/fc/a0c10eb9f1af6494a448d5733d283f5232a514 delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/ff/8d35b41494f7f0dc92f95d67f54fff274d3fcb delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/refs/heads/binary delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/refs/heads/multihunk delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/.gitted/refs/heads/rename delete mode 100755 vendor/libgit2/tests/resources/diff_format_email/file1.txt.renamed delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/file2.txt delete mode 100644 vendor/libgit2/tests/resources/diff_format_email/file3.txt delete mode 100644 vendor/libgit2/tests/resources/duplicate.git/COMMIT_EDITMSG delete mode 100644 vendor/libgit2/tests/resources/duplicate.git/HEAD delete mode 100644 vendor/libgit2/tests/resources/duplicate.git/config delete mode 100644 vendor/libgit2/tests/resources/duplicate.git/description delete mode 100644 vendor/libgit2/tests/resources/duplicate.git/index delete mode 100644 vendor/libgit2/tests/resources/duplicate.git/info/exclude delete mode 100644 vendor/libgit2/tests/resources/duplicate.git/info/refs delete mode 100644 vendor/libgit2/tests/resources/duplicate.git/logs/HEAD delete mode 100644 vendor/libgit2/tests/resources/duplicate.git/logs/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/duplicate.git/objects/03/8d718da6a1ebbc6a7780a96ed75a70cc2ad6e2 delete mode 100644 vendor/libgit2/tests/resources/duplicate.git/objects/0d/deadede9e6d6ccddce0ee1e5749eed0485e5ea delete mode 100644 vendor/libgit2/tests/resources/duplicate.git/objects/ce/013625030ba8dba906f756967f9e9ca394464a delete mode 100644 vendor/libgit2/tests/resources/duplicate.git/objects/info/packs delete mode 100644 vendor/libgit2/tests/resources/duplicate.git/objects/pack/pack-29a4896f0a0b9c9947b0927c57a5c03dcae052e3.idx delete mode 100644 vendor/libgit2/tests/resources/duplicate.git/objects/pack/pack-29a4896f0a0b9c9947b0927c57a5c03dcae052e3.pack delete mode 100644 vendor/libgit2/tests/resources/duplicate.git/objects/pack/pack-b18eeacbd65cbd30a365d7564b45a468e8bd43d6.idx delete mode 100644 vendor/libgit2/tests/resources/duplicate.git/objects/pack/pack-b18eeacbd65cbd30a365d7564b45a468e8bd43d6.pack delete mode 100644 vendor/libgit2/tests/resources/duplicate.git/objects/pack/pack-e87994ad581c9af946de0eb890175c08cd005f38.idx delete mode 100644 vendor/libgit2/tests/resources/duplicate.git/objects/pack/pack-e87994ad581c9af946de0eb890175c08cd005f38.pack delete mode 100644 vendor/libgit2/tests/resources/duplicate.git/objects/pack/pack-f4ef1aa326265de7d05018ee51acc0a8717fe1ea.idx delete mode 100644 vendor/libgit2/tests/resources/duplicate.git/objects/pack/pack-f4ef1aa326265de7d05018ee51acc0a8717fe1ea.pack delete mode 100644 vendor/libgit2/tests/resources/duplicate.git/packed-refs delete mode 100644 vendor/libgit2/tests/resources/duplicate.git/refs/heads/dummy-marker.txt delete mode 100644 vendor/libgit2/tests/resources/empty_bare.git/HEAD delete mode 100644 vendor/libgit2/tests/resources/empty_bare.git/config delete mode 100644 vendor/libgit2/tests/resources/empty_bare.git/description delete mode 100644 vendor/libgit2/tests/resources/empty_bare.git/info/exclude delete mode 100644 vendor/libgit2/tests/resources/empty_bare.git/objects/info/dummy-marker.txt delete mode 100644 vendor/libgit2/tests/resources/empty_bare.git/objects/pack/dummy-marker.txt delete mode 100644 vendor/libgit2/tests/resources/empty_bare.git/refs/heads/dummy-marker.txt delete mode 100644 vendor/libgit2/tests/resources/empty_standard_repo/.gitted/HEAD delete mode 100644 vendor/libgit2/tests/resources/empty_standard_repo/.gitted/config delete mode 100644 vendor/libgit2/tests/resources/empty_standard_repo/.gitted/description delete mode 100644 vendor/libgit2/tests/resources/empty_standard_repo/.gitted/info/exclude delete mode 100644 vendor/libgit2/tests/resources/empty_standard_repo/.gitted/objects/info/dummy-marker.txt delete mode 100644 vendor/libgit2/tests/resources/empty_standard_repo/.gitted/objects/pack/dummy-marker.txt delete mode 100644 vendor/libgit2/tests/resources/empty_standard_repo/.gitted/refs/heads/dummy-marker.txt delete mode 100644 vendor/libgit2/tests/resources/filemodes/.gitted/HEAD delete mode 100644 vendor/libgit2/tests/resources/filemodes/.gitted/config delete mode 100644 vendor/libgit2/tests/resources/filemodes/.gitted/description delete mode 100644 vendor/libgit2/tests/resources/filemodes/.gitted/index delete mode 100644 vendor/libgit2/tests/resources/filemodes/.gitted/info/exclude delete mode 100644 vendor/libgit2/tests/resources/filemodes/.gitted/logs/HEAD delete mode 100644 vendor/libgit2/tests/resources/filemodes/.gitted/logs/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/filemodes/.gitted/objects/99/62c8453ba6f0cf8dac7c5dcc2fa2897fa9964a delete mode 100644 vendor/libgit2/tests/resources/filemodes/.gitted/objects/a5/c5dd0fc6c313159a69b1d19d7f61a9f978e8f1 delete mode 100644 vendor/libgit2/tests/resources/filemodes/.gitted/objects/e7/48d196331bcb20267eaaee4ff3326cb73b8182 delete mode 100644 vendor/libgit2/tests/resources/filemodes/.gitted/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/filemodes/exec_off delete mode 100755 vendor/libgit2/tests/resources/filemodes/exec_off2on_staged delete mode 100755 vendor/libgit2/tests/resources/filemodes/exec_off2on_workdir delete mode 100644 vendor/libgit2/tests/resources/filemodes/exec_off_untracked delete mode 100755 vendor/libgit2/tests/resources/filemodes/exec_on delete mode 100644 vendor/libgit2/tests/resources/filemodes/exec_on2off_staged delete mode 100644 vendor/libgit2/tests/resources/filemodes/exec_on2off_workdir delete mode 100755 vendor/libgit2/tests/resources/filemodes/exec_on_untracked delete mode 100644 vendor/libgit2/tests/resources/gitgit.index delete mode 100644 vendor/libgit2/tests/resources/icase/.gitted/HEAD delete mode 100644 vendor/libgit2/tests/resources/icase/.gitted/config delete mode 100644 vendor/libgit2/tests/resources/icase/.gitted/description delete mode 100644 vendor/libgit2/tests/resources/icase/.gitted/index delete mode 100644 vendor/libgit2/tests/resources/icase/.gitted/info/exclude delete mode 100644 vendor/libgit2/tests/resources/icase/.gitted/logs/HEAD delete mode 100644 vendor/libgit2/tests/resources/icase/.gitted/logs/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/icase/.gitted/objects/3e/257c57f136a1cb8f2b8e9a2e5bc8ec0258bdce delete mode 100644 vendor/libgit2/tests/resources/icase/.gitted/objects/4d/d6027d083575c7431396dc2a3174afeb393c93 delete mode 100644 vendor/libgit2/tests/resources/icase/.gitted/objects/62/e0af52c199ec731fe4ad230041cd3286192d49 delete mode 100644 vendor/libgit2/tests/resources/icase/.gitted/objects/76/d6e1d231b1085fcce151427e9899335de74be6 delete mode 100644 vendor/libgit2/tests/resources/icase/.gitted/objects/d4/4e18fb93b7107b5cd1b95d601591d77869a1b6 delete mode 100644 vendor/libgit2/tests/resources/icase/.gitted/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/icase/B delete mode 100644 vendor/libgit2/tests/resources/icase/D delete mode 100644 vendor/libgit2/tests/resources/icase/F delete mode 100644 vendor/libgit2/tests/resources/icase/H delete mode 100644 vendor/libgit2/tests/resources/icase/J delete mode 100644 vendor/libgit2/tests/resources/icase/L/1 delete mode 100644 vendor/libgit2/tests/resources/icase/L/B delete mode 100644 vendor/libgit2/tests/resources/icase/L/D delete mode 100644 vendor/libgit2/tests/resources/icase/L/a delete mode 100644 vendor/libgit2/tests/resources/icase/L/c delete mode 100644 vendor/libgit2/tests/resources/icase/a delete mode 100644 vendor/libgit2/tests/resources/icase/c delete mode 100644 vendor/libgit2/tests/resources/icase/e delete mode 100644 vendor/libgit2/tests/resources/icase/g delete mode 100644 vendor/libgit2/tests/resources/icase/i delete mode 100644 vendor/libgit2/tests/resources/icase/k/1 delete mode 100644 vendor/libgit2/tests/resources/icase/k/B delete mode 100644 vendor/libgit2/tests/resources/icase/k/D delete mode 100644 vendor/libgit2/tests/resources/icase/k/a delete mode 100644 vendor/libgit2/tests/resources/icase/k/c delete mode 100644 vendor/libgit2/tests/resources/issue_1397/.gitted/HEAD delete mode 100644 vendor/libgit2/tests/resources/issue_1397/.gitted/config delete mode 100644 vendor/libgit2/tests/resources/issue_1397/.gitted/index delete mode 100644 vendor/libgit2/tests/resources/issue_1397/.gitted/objects/7f/483a738f867e5b21c8f377d70311f011eb48b5 delete mode 100644 vendor/libgit2/tests/resources/issue_1397/.gitted/objects/83/12e0889a9cbab77c732b6bc39b51a683e3a318 delete mode 100644 vendor/libgit2/tests/resources/issue_1397/.gitted/objects/8a/7ef047fc933edb62e84e7977b0612ec3f6f283 delete mode 100644 vendor/libgit2/tests/resources/issue_1397/.gitted/objects/8e/8f80088a9274fd23584992f587083ca1bcbbac delete mode 100644 vendor/libgit2/tests/resources/issue_1397/.gitted/objects/f2/c62dea0372a0578e053697d5c1ba1ac05e774a delete mode 100644 vendor/libgit2/tests/resources/issue_1397/.gitted/objects/ff/3578d64d199d5b48d92bbb569e0a273e411741 delete mode 100644 vendor/libgit2/tests/resources/issue_1397/.gitted/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/issue_1397/crlf_file.txt delete mode 100644 vendor/libgit2/tests/resources/issue_1397/some_other_crlf_file.txt delete mode 100644 vendor/libgit2/tests/resources/issue_592/.gitted/COMMIT_EDITMSG delete mode 100644 vendor/libgit2/tests/resources/issue_592/.gitted/HEAD delete mode 100644 vendor/libgit2/tests/resources/issue_592/.gitted/config delete mode 100644 vendor/libgit2/tests/resources/issue_592/.gitted/index delete mode 100644 vendor/libgit2/tests/resources/issue_592/.gitted/info/exclude delete mode 100644 vendor/libgit2/tests/resources/issue_592/.gitted/logs/HEAD delete mode 100644 vendor/libgit2/tests/resources/issue_592/.gitted/logs/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/issue_592/.gitted/objects/06/07ee9d4ccce8e4c4fa13c2c7d727e7faba4e0e delete mode 100644 vendor/libgit2/tests/resources/issue_592/.gitted/objects/49/363a72a90d9424240258cd3759f23788ecf1d8 delete mode 100644 vendor/libgit2/tests/resources/issue_592/.gitted/objects/4d/383e87f0371ba8fa353f3912db6862b2625e85 delete mode 100644 vendor/libgit2/tests/resources/issue_592/.gitted/objects/71/44be264b61825fbff68046fe999bdfe96a1792 delete mode 100644 vendor/libgit2/tests/resources/issue_592/.gitted/objects/be/de83ee10b5b3f00239660b00acec2d55fd0b84 delete mode 100644 vendor/libgit2/tests/resources/issue_592/.gitted/objects/e3/8fcc7a6060f5eb5b876e836b52ae4769363f21 delete mode 100644 vendor/libgit2/tests/resources/issue_592/.gitted/objects/f1/adef63cb08891a0942b76fc4b9c50c6c494bc7 delete mode 100644 vendor/libgit2/tests/resources/issue_592/.gitted/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/issue_592/a.txt delete mode 100644 vendor/libgit2/tests/resources/issue_592/c/a.txt delete mode 100644 vendor/libgit2/tests/resources/issue_592/l.txt delete mode 100644 vendor/libgit2/tests/resources/issue_592/t/a.txt delete mode 100644 vendor/libgit2/tests/resources/issue_592/t/b.txt delete mode 100644 vendor/libgit2/tests/resources/issue_592b/.gitted/HEAD delete mode 100644 vendor/libgit2/tests/resources/issue_592b/.gitted/config delete mode 100644 vendor/libgit2/tests/resources/issue_592b/.gitted/description delete mode 100644 vendor/libgit2/tests/resources/issue_592b/.gitted/index delete mode 100644 vendor/libgit2/tests/resources/issue_592b/.gitted/info/exclude delete mode 100644 vendor/libgit2/tests/resources/issue_592b/.gitted/logs/HEAD delete mode 100644 vendor/libgit2/tests/resources/issue_592b/.gitted/logs/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/issue_592b/.gitted/objects/3f/bf1852f72fd268e36457b13a18cdd9a4c9ea35 delete mode 100644 vendor/libgit2/tests/resources/issue_592b/.gitted/objects/6f/a891d3e578c83e1c03bdb9e0fdd8e6e934157f delete mode 100644 vendor/libgit2/tests/resources/issue_592b/.gitted/objects/80/07d41d5794e6ce4d4d2c97e370d5a9aa6d5213 delete mode 100644 vendor/libgit2/tests/resources/issue_592b/.gitted/objects/a6/5fb6583a7c425284142f285bc359a2d6565513 delete mode 100644 vendor/libgit2/tests/resources/issue_592b/.gitted/objects/ae/be7a55922c7097ef91ca3a7bc327a901d87c2c delete mode 100644 vendor/libgit2/tests/resources/issue_592b/.gitted/objects/b3/44b055867fcdc1f01eaa75056a43e868eb4fbc delete mode 100644 vendor/libgit2/tests/resources/issue_592b/.gitted/objects/f7/d75fbfad8b1d2e307ced287ea78aad403cdce3 delete mode 100644 vendor/libgit2/tests/resources/issue_592b/.gitted/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/issue_592b/gitignore delete mode 100644 vendor/libgit2/tests/resources/issue_592b/ignored/contained/ignored3.txt delete mode 100644 vendor/libgit2/tests/resources/issue_592b/ignored/contained/tracked3.txt delete mode 100644 vendor/libgit2/tests/resources/issue_592b/ignored/ignored2.txt delete mode 100644 vendor/libgit2/tests/resources/issue_592b/ignored/tracked2.txt delete mode 100644 vendor/libgit2/tests/resources/issue_592b/ignored1.txt delete mode 100644 vendor/libgit2/tests/resources/issue_592b/tracked1.txt delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/HEAD delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/config delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/index delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/info/refs delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/00/6b298c5702b04c00370d0414959765b82fd722 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/00/7f1ee2af8e5d99906867c4237510e1790a89b8 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/01/6eef4a6fefd36bdcaa93ad773449ddc5c73cbb delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/05/c6a04ac101ab1a9836a95d5ec8d16b6f6304fd delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/06/db153c36829fc656e05cdf5a3bf7183f3c10aa delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/07/10c3c796e0704361472ecb904413fca0107a25 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/07/2d89dcf3a7671ac34a8e875bb72fb39bcf14d7 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/0b/b7ed583d7e9ad507e8b902594f5c9126ea456b delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/0e/8126647ec607f0a14122cec4b15315d790c8ff delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/0f/a6ead2731b9d138afe38c336c9727ea05027a7 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/12/4d4fe29d3433fdaa2f0f455d226f2c79d89cf3 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/15/311229e70fa62653f73dde1d4deef1a8e47a11 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/15/faa0c9991f2d65686e844651faa2ff9827887b delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/16/895aa5e13f8907d4adab81285557d938fad342 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/1c/1bdb80c04233d1a9b9755913ee233987be6175 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/1e/8dff96faaaa24f84943d2d9601dde61cb0398a delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/21/950d5e4e4d1a871b4dfcf72ecb6b9c162c434e delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/34/8f16ffaeb73f319a75cec5b16a0a47d2d5e27c delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/37/185b25a204309bf74817da1a607518f13ca3ed delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/37/a5054a9f9b4628e3924c5cb8f2147c6e2a3efc delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/38/55170cef875708da06ab9ad7fc6a73b531cda1 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/3a/3f5a6ec1c968d1d2d5d20dee0d161a4351f279 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/3b/919b6e8a575b4779c8243ebea3e3beb436e88f delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/3f/d41804a7906db846af5e868444782e546af46a delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/41/71bb8d40e9fc830d79b757dc06ec6c14548b78 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/42/1b392106e079df6d412babd5636697938269ec delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/42/44d13e2bbc38510320443bbb003f3967d12436 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/42/cdad903aef3e7b614675e6584a8be417941911 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/43/2faca0c62dc556ad71a22f23e541a46a8b0f6f delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/43/5424798e5e1b21dd4588d1c291ba4eb179a838 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/43/6ea75c99f527e4b42fddb46abedf7726eb719d delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/48/3065df53c0f4a02cdc6b2910b05d388fc17ffb delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/4b/7c5650008b2e747fe1809eeb5a1dde0e80850a delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/4c/49317a0912ca559d2048bc329994eb7d10474f delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/4d/fc1be85a9d6c9898152444d32b238b4aecf8cc delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/4e/21d2d63357bde5027d1625f5ec6b430cdeb143 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/4e/70a6b06fc62481f80fbb74327849e7170eebff delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/4f/4e85a0ab8515e34302721fbcec06fa9d9c1a9a delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/50/e4facaafb746cfed89287206274193c1417288 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/53/9bd011c4822c560c1d17cab095006b7a10f707 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/56/07a8c4601a737daadd1f470bde3142aff57026 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/5a/ba269b3be41fc8db38068d3948c8af543fe609 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/5b/8e1e56cb99e8b99ac22eec8aebf6422ecd08c0 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/5e/8747f5200fac0f945a07daf6163ca9cb1a8da9 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/5f/18576d464946eb2338daeb8b4030019961f505 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/63/e8773becdea9c3699c95a5740be5baa8be8d69 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/65/bea8448ca5b3104628ffbca553c54bde54b0fc delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/66/6ffdfcf1eaa5641fa31064bf2607327e843c09 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/68/a2e1ee61a23a4728fe6b35580fbbbf729df370 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/68/af1fc7407fd9addf1701a87eb1c95c7494c598 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/68/f6182f4c85d39e1309d97c7e456156dc9c0096 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/6c/778edd0e4cf394f5a3df8b96db516024cc1bb8 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/6e/f31d35a3f5abc1e24f4f9afa5cb2016f03fa2d delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/71/3e438567b28543235faf265c4c5b02b437c7fd delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/72/3181f1bfd30e47a6d1d36a4d874e31e7a0a1a4 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/73/b20c8e09fa2726d69ff66969186014165da3c3 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/74/4df1bdf0f7bca20deb23e5a5eb8255fc237901 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/75/c653822173a8e5795153ec3773dfe44bb9bb63 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/78/3d6539dde96b8873c5b5da3e79cc14cd64830b delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/7a/9277e0c5ec75339f011c176d0c20e513c4de1c delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/7c/7bf85e978f1d18c0566f702d2cb7766b9c8d4f delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/7c/7e08f9559d9e1551b91e1cf68f1d0066109add delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/7e/3056f6765b3044ab09701077dbe1eb5b0e9ad0 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/81/5b5a1c80ca749d705c7aa0cb294a00cbedd340 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/88/8588a782ad433fbf0cc526e07cfe6f4a6b60b3 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/88/eb3f98849f4b8d0555395f514800900a01dc8f delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/89/8d12687fb35be271c27c795a6b32c8b51da79e delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/8a/bda8de114a93f2d3c5a975ee2960f31e24be58 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/8f/35f30bfe09513f96cf8aa4df0834ae34e93bae delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/94/d2c01087f48213bd157222d54edfefd77c9bba delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/95/78b04e2087976e382622322ba476aa40398dc7 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/96/23368f0fc562d6d840372ae17dc4cc32d51a80 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/97/3b70322e758da87e1ce21d2195d86c5e4e9647 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/98/1c79eb38518d3821e73bb159dc413bb42d6614 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/9a/e63b4a8ce0f181b2d1d098971733a103226917 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/9b/258ad4c39f40c24f66bf1faf48eb6202d59c85 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/9c/3f1c70db28c00ce74b22ba3edafe16d9cf03d4 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/9e/12bce04446d097ae1782967a5888c2e2a0d35b delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/a0/2d4fd126e0cc8fb46ee48cf38bad36d44f2dbc delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/a0/65d3022e99a1943177c10a53cce38bc2127042 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/a2/8c21c90aa36580641b345011869d1a899a6783 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/a2/fa36ffc4a565a223e225d15b18774f87d0c4f0 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/a3/4e5a16feabbd0335a633aadb8217c9f3dba58d delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/a7/b066537e6be7109abfe4ff97b675d4e077da20 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/a8/2a121ea36b115548d6dad2cd86ec27f06f7b30 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/aa/9e263294fd2f6f6fd9ceab23ca8ce3ea2ce707 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/ad/1ea02c2cc4f55c1dff87b80a086206a73885eb delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/ad/2ace9e15f66b3d1138922e6ffdc3ea3f967fa6 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/ad/98bfa4679fb00b89207a0a11b8bbf91a3e4de9 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/b2/a81ead9e722af0099fccfb478cea88eea749a2 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/b4/cefb3c75770e57bb8bb44e4a50d9578009e847 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/b9/1ef5ffa8612616c8e76051901caafd723f0e2c delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/bd/97980c22d122509cdd915fd9788d56c8d3ae20 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/c0/bd078a61d2cc22c52ca5ce04abdcdc5cc1829e delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/c4/83ca4bb087174af5cb51d7caa9c09fe4a28ccb delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/c4/e6cca3ec6ae0148ed231f97257df8c311e015f delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/ca/224bba0a8a24f1768804fe5f565b1014af7ef2 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/ca/49d1a8b6116ffeba22667bba265fa5261df7ab delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/ca/7d316d6d9af99d2481e980d68b77e572d80fe7 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/ca/fa936d25f0b397432a27201f6b3284c47df8be delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/cb/49ad76147f5f9439cbd6133708b76142660660 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/d0/dd5d9083bda65ec99aa8b9b64a5a278771b70a delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/d2/682aaf9594080ce877b5eeee110850fd6e3480 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/d6/04c75019c282144bdbbf3fd3462ba74b240efc delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/d7/1c24b3b113fd1d1909998c5bfe33b86a65ee03 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/d8/dd349b78f19a4ebe3357bacb8138f00bf5ed41 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/d8/e05a90b3c2240d71a20c2502c937d9b7d22777 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/da/b7b53383a1fec46632e60a1d847ce4f9ae14f2 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/db/203155a789fb749aa3c14e93eea2c744a9c6c7 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/de/a7215f259b2cced87d1bda6c72f8b4ce37a2ff delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/e1/512550f09d980214e46e6d3f5a2b20c3d75755 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/e1/dcfc3038be54195a59817c89782b261e46cb05 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/e2/93bfdddb81a853bbb16b8b58e68626f30841a4 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/e2/c84bb33992a455b1a7a5019f0e38d883d3f475 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/e2/d185fa827d58134cea20b9e1df893833c6560e delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/e5/0fbbd701458757bdfe9815f58ed717c588d1b5 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/ef/1783444b61a8671beea4ce1f4d0202677dfbfb delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/f1/3e1bc6ba935fce2efffa5be4c4832404034ef1 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/f1/72517a8cf39e009ffff541ee52429b89e418f3 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/f1/b44c04989a3a1c14b036cfadfa328d53a7bc5e delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/f3/5f159ff5d44dfd9f52d63dd5b659f0521ff569 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/f5/1658077d85f2264fa179b4d0848268cb3475c3 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/f7/929c5a67a4bdc98247fb4b5098675723932a64 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/fa/567f568ed72157c0c617438d077695b99d9aac delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/fd/8b5fe88cda995e70a22ed98701e65b843e05ec delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/fe/f01f3104c8047d05e8572e521c454f8fd4b8db delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/ff/b36e513f5fdf8a6ba850a20142676a2ac4807d delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchA-1 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchA-2 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchB-1 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchB-2 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchC-1 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchC-2 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchD-1 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchD-2 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchE-1 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchE-2 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchE-3 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchF-1 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchF-2 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchG-1 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchG-2 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchH-1 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchH-2 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchI-1 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchI-2 delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/asparagus.txt delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/beef.txt delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/bouilli.txt delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/gravy.txt delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/oyster.txt delete mode 100644 vendor/libgit2/tests/resources/merge-recursive/veal.txt delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/COMMIT_EDITMSG delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/HEAD delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/ORIG_HEAD delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/config delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/description delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/index delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/HEAD delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/branch delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/df_ancestor delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/df_side1 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/df_side2 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/ff_branch delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/octo1 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/octo2 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/octo3 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/octo4 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/octo5 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/octo6 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/renames1 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/renames2 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-10 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-10-branch delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-11 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-11-branch delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-13 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-13-branch delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-14 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-14-branch delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-2alt delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-2alt-branch delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-3alt delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-3alt-branch delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-4 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-4-branch delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-5alt-1 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-5alt-1-branch delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-5alt-2 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-5alt-2-branch delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-6 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-6-branch delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-7 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-7-branch delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-8 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-8-branch delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-9 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-9-branch delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/unrelated delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/modules/submodule/HEAD delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/modules/submodule/ORIG_HEAD delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/modules/submodule/config delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/modules/submodule/index delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/modules/submodule/info/exclude delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/modules/submodule/objects/18/fae1354bba0a5f1e6a531f9988369142c24a9e delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/modules/submodule/objects/29/7aa6cd028b3336c7802c7a6f49143da4e1602d delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/modules/submodule/objects/38/6c80dc813b89d719797668f40c1be0a6efa996 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/modules/submodule/objects/ab/435a147bae6d5906ecfd0916a570c4ab3eeea8 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/modules/submodule/objects/ad/16e0a7684ea95bf892980a2ee412293ae979cc delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/modules/submodule/objects/ae/39c77c70cb6bad18bb471912460c4e1ba0f586 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/modules/submodule/objects/c2/0765f6e24e8bbb63a648d0d11d84da63170190 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/modules/submodule/objects/d3/d806a4bef96889117fd7ebac0e3cb5ec152932 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/modules/submodule/objects/f1/065ff5593604072837fecaad3e2e268cb0147b delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/modules/submodule/packed-refs delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/modules/submodule/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/modules/submodule/refs/remotes/origin/HEAD delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/00/5b6fcc8fec71d2550bef8462d169b3c26aa14b delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/00/9b9cab6fdac02915a88ecd078b7a792ed802d8 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/00/c7d33f1ffa79d19c2272b370fcaeaadba49c08 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/01/f149e1b8f84bd8896aaff6d6b22af88459ded0 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/02/04a84f822acbf6386b36d33f1f6bc68bbbf858 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/02/251f990ca8e92e7ae61d3426163fa821c64001 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/03/21415405cb906c46869919af56d51dbbe5e85c delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/03/2ebc5ab85d9553bb187d3cd40875ff23a63ed0 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/03/b87706555accbf874ccd410dbda01e8e70a67f delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/03/dad1005e5d06d418f50b12e0bcd48ff2306a03 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/05/1ffd7901a442faf56b226161649074f15c7c47 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/05/8541fc37114bfc1dddf6bd6bffc7fae5c2e6fe delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/05/f3c1a2a56ca95c3d2ef28dc9ddf32b5cd6c91c delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/07/a759da919f737221791d542f176ab49c88837f delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/07/c514b04698e068892b31c8d352b85813b99c6e delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/09/055301463b7f2f8ee5d368f8ed5c0a40ad8515 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/09/17bb159596aea4d295f4857da77e8f96b3c7dc delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/09/2ce8682d7f3a2a3a769a6daca58950168ba5c4 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/09/3bebf072dd4bbba88833667d6ffe454df199e1 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/09/768bed22680cdb0859683fa9677ccc8d5a25c1 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/0a/75d9aac1dc84fb5aa51f7325c0ab53242ddef7 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/0c/fd6c54ef6532d862408f562309dc9c74a401e8 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/0d/52e3a556e189ba0948ae56780918011c1b167d delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/0d/872f8e871a30208305978ecbf9e66d864f1638 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/0e/c5f433959cd46177f745903353efb5be08d151 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/0f/3fc5dddc8964b9ac1040d0e957f9eb02d9efb3 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/11/aeee27ac45a8402c2fd5b875d66dd844e5df00 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/11/deab00b2d3a6f5a3073988ac050c2d7b6655e2 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/11/f4f3c08b737f5fd896cbefa1425ee63b21b2fa delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/13/d1be4ea52a6ced1d7a1d832f0ee3c399348e5e delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/14/39088f509b79b1535b64193137d3ce4b240734 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/15/8dc7bedb202f5b26502bf3574faa7f4238d56c delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/16/f825815cfd20a07a75c71554e82d8eede0b061 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/17/8940b450f238a56c0d75b7955cb57b38191982 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/18/3310e30fb1499af8c619108ffea4d300b5e778 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/18/cb316b1cefa0f8a6946f0e201a8e1a6f845ab9 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/19/b7ac485269b672a101060894de3ba9c2a24dd1 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/1a/010b1c0f081b2e8901d55307a15c29ff30af0e delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/1c/51d885170f57a0c4e8c69ff6363d91a5b51f85 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/1c/ff9ec6a47a537380dedfdd17c9e76d74259a2b delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/1e/4ff029aee68d0d69ef9eb6efa6cbf1ec732f99 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/1f/81433e3161efbf250576c58fede7f6b836f3d3 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/20/91d94c8bd3eb0835dc5220de5e8bb310fa1513 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/21/671e290278286fb2ce4c63d01699b67adce331 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/22/7792b52aaa0b238bea00ec7e509b02623f168c delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/23/3c0919c998ed110a4b6ff36f353aec8b713487 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/23/92a2dacc9efb562b8635d6579fb458751c7c5b delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/23/ed141a6ae1e798b2f721afedbe947c119111ba delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/24/1a1005cd9b980732741b74385b891142bcba28 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/24/2591eb280ee9eeb2ce63524b9a8b9bc4cb515d delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/24/90b9f1a079420870027deefb49f51d6656cf74 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/25/9d08ca43af9200e9ea9a098e44a5a350ebd9b3 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/25/c40b7660c08c8fb581f770312f41b9b03119d1 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/26/153a3ff3649b6c2bb652d3f06878c6e0a172f9 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/27/133da702ba3c60af2a01e96c2555ff4045d692 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/27/4bbe983022fb4c02f8a2bf2ebe8da4fe130054 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/2b/0de5dc27505dcdd83a75c8bf1fcd9462cd7add delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/2b/5f1f181ee3b58ea751f5dd5d8f9b445520a136 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/2b/d0a343aeef7a2cf0d158478966a6e587ff3863 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/2b/fdd7e1b6c6ae993f23dfe8e84a8e06a772fa2a delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/2d/a538570bc1e5b2c3e855bf702f35248ad0735f delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/2f/2e37b7ebbae467978610896ca3aafcdad2ee67 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/2f/4024ce528d36d8670c289cce5a7963e625bb0c delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/2f/56120107d680129a5d9791b521cb1e73a2ed31 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/2f/598248eeccfc27e5ca44d9d96383f6dfea7b16 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/31/68dca1a561889b045a6441909f4c56145e666d delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/31/d5472536041a83d986829240bbbdc897c6f8a6 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/32/21dd512b7e2dc4b5bd03046df6c81b2ab2070b delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/33/46d64325b39e5323733492cd55f808994a2475 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/33/d500f588fbbe65901d82b4e6b008e549064be0 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/34/8dcd41e2b467991578e92bedd16971b877ef1e delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/34/bfafff88eaf118402b44e6f3e2dbbf1a582b05 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/35/0c6eb3010efc403a6bed682332635314e9ed58 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/35/411bfb77cd2cc431f3a03a2b4976ed94b5d241 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/35/4704d3613ad4228e4786fc76656b11e98236c4 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/35/632e43612c06a3ea924bfbacd48333da874c29 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/35/75826c96a975031d2c14368529cc5c4353a8fd delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/36/219b49367146cb2e6a1555b5a9ebd4d0328495 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/36/4bbe4ce80c7bd31e6307dce77d46e3e1759fb3 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/37/48859b001c6e627e712a07951aee40afd19b41 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/38/5c8a0f26ddf79e9041e15e17dc352ed2c4cced delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/3b/47b031b3e55ae11e14a05260b1c3ffd6838d55 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/3b/bf0bf59b20df5d5fc58b9fc1dc07be637c301f delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/3e/f4d30382ca33fdeba9fda895a99e0891ba37aa delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/3e/f9bfe82f9635518ae89152322f3b46fd4ba25b delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/40/2784a46a4a3982294231594cbeb431f506d22c delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/41/2b32fb66137366147f1801ecc962452757d48a delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/42/18670ab81cc219a9f94befb5c5dad90ec52648 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/43/aafd43bea779ec74317dc361f45ae3f532a505 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/43/c338656342227a3a3cd3aa85cbf784061f5425 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/45/299c1ca5e07bba1fd90843056fb559f96b1f5a delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/46/6daf8552b891e5c22bc58c9d7fc1a2eb8f0289 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/47/6dbb3e207313d1d8aaa120c6ad204bf1295e53 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/47/8172cb2f5ff9b514bc9d04d3bd5ef5840cb3b2 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/49/130a28ef567af9a6a6104c38773fedfa5f9742 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/49/9df817155e4bdd3c6ee192a72c52f481818230 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/49/fd9edac79d15c8fbfca2d481cbb900beba22a6 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/4a/9550ebcc97ce22b22f45af7b829bb030d003f5 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/4b/253da36a0ae8bfce63aeabd8c5b58429925594 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/4b/48deed3a433909bfd6b6ab3d4b91348b6af464 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/4c/9fac0707f8d4195037ae5a681aa48626491541 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/4c/a408a8c88655f7586a1b580be6fad138121e98 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/4e/0d9401aee78eb345a8685a859d37c8c3c0bbed delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/4e/886e602529caa9ab11d71f86634bd1b6e0de10 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/4e/b04c9e79e88f6640d01ff5b25ca2a60764f216 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/4f/e93c0ec83eb6305cbace3dace88ecee1b63cb6 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/50/12fd565b1393bdfda1805d4ec38ce6619e1fd1 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/50/4f75ac95a71ef98051817618576a68505b92f9 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/50/84fc2a88b6bdba8db93bd3953a8f4fdb470238 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/50/ce7d7d01217679e26c55939eef119e0c93e272 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/51/95a1b480f66691b667f10a9e41e70115a78351 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/52/d8bc572af2b6d4ee0d5e62ed5d1fbad92210a9 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/53/825f41ac8d640612f9423a2f03a69f3d96809a delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/54/269b3f6ec3d7d4ede24dd350dd5d605495c3ae delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/54/59c89aa0026d543ce8343bd89871bce543f9c2 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/54/7607c690372fe81fab8e3bb44c530e129118fd delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/55/b4e4687e7a0d9ca367016ed930f385d4022e6f delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/56/6ab53c220a2eafc1212af1a024513230280ab9 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/56/a638b76b75e068590ac999c2f8621e7f3e264c delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/57/079a46233ae2b6df62e9ade71c4948512abefb delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/58/43febcb23480df0b5edb22a21c59c772bb8e29 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/58/87a5e516c53bd58efb0f02ec6aa031b6fe9ad7 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/58/e853f66699fd02629fd50bde08082bc005933a delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/59/6803b523203a4851c824c07366906f8353f4ad delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/5c/2411f8075f48a6b2fdb85ebc0d371747c4df15 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/5c/341ead2ba6f2af98ce5ec3fe84f6b6d2899c0d delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/5c/3b68a71fc4fa5d362fd3875e53137c6a5ab7a5 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/5d/c1018e90b19654bee986b7a0c268804d39659d delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/5d/dd0fe66f990dc0e5cf9fec6d9b465240e9537f delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/5e/b7bb6a146eb3c7fd3990b240a2308eceb1cf8d delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/5f/bfbdc04b4eca46f54f4853a3c5a1dce28f5165 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/60/61fe116ecba0800c26113ea1a7dfac2e16eeaf delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/60/91fc2c036a382a69489e3f518ee5aae9a4e567 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/61/340eeed7340fa6a8792def9a5938bb5d4434bb delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/61/78885b38fe96e825ac0f492c0a941f288b37f6 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/62/12c31dab5e482247d7977e4f0dd3601decf13b delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/62/269111c3b02a9355badcb9da8678b1bf41787b delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/62/33c6a0670228627f93c01cef32485a30403670 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/62/c4f6533c9a3894191fdcb96a3be935ade63f1a delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/63/247125386de9ec90a27ad36169307bf8a11a38 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/67/110d77886b2af6309b9212961e72b8583e5fa9 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/67/18a45909532d1fcf5600d0877f7fe7e78f0b86 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/68/c6c84b091926c7d90aa6a79b2bc3bb6adccd8e delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/69/f570c57b24ea7c086e94c5e574964798321435 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/6a/e1a3967031a42cf955d9d5c2395211ac82f6cf delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/6b/7e37be8ce0b897093f2878a9dcd8f396beda2c delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/6c/06dcd163587c2cc18be44857e0b71116382aeb delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/6e/3b9eb35214d4e31ed5789afc7d520ac798ce55 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/6f/32739c3724d1d5f855299309f388606f407468 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/6f/a33014764bf1120a454eb8437ae098238e409b delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/6f/be9fb85c86d7d1435f728da418bdff52c640a9 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/71/17467b18605a660ebe5586df69e2311ed5609f delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/71/2ebba6669ea847d9829e4f1059d6c830c8b531 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/71/add2d7b93d55bf3600f8a1582beceebbd050c8 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/72/cdb057b340205164478565e91eb71647e66891 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/72/ea499e108df5ff0a4a913e7655bbeeb1fb69f2 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/74/df13f0793afdaa972150bba976f7de8284914e delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/75/a811bf6bc57694adb3fe604786f3a4efd1cd1b delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/76/63fce0130db092936b137cabd693ec234eb060 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/76/ab0e2868197ec158ddd6c78d8a0d2fd73d38f9 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/7a/a3edf2bcfee22398e6b55295aa56366b7aaf76 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/7a/f14d9c679baaef35555095f4f5d33e9a569ab9 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/7c/04ca611203ed320c5f495b9813054dd23be3be delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/7c/2c5228c9e90170d4a35e6558e47163daf092e5 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/7c/b63eed597130ba4abb87b3e544b85021905520 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/7e/2d058d5fedf8329db44db4fac610d6b1a89159 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/7f/7a2da58126226986d71c6ddfab4afba693280d delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/80/a8fbb3abb1ba423d554e9630b8fc2e5698f86b delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/81/1c70fcb6d5bbd022d04cc31836d30b436f9551 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/81/87117062b750eed4f93fd7e899f17b52ce554d delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/83/07d93a155903a5c49576583f0ce1f6ff897c0e delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/83/6b8b82b26cab22eaaed8820877c76d6c8bca19 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/83/824a8c6658768e2013905219cc8c64cc3d9a2e delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/84/9619b03ae540acee4d1edec96b86993da6b497 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/84/de84f8f3a6d63e636ee9ad81f4b80512fa9bbe delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/86/088dae8bade454995b21a1c88107b0e1accdab delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/87/b4926260d77a3b851e71ecce06839bd650b231 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/88/e185910a15cd13bdf44854ad037f4842b03b29 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/8a/ad9d0ea334951da47b621a475b39cc6ed759bf delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/8a/ae714f7d939309d7f132b30646d96743134a9f delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/8b/095d8fd01594f4d14454d073e3ac57b9ce485f delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/8b/5b53cb2aa9ceb1139f5312fcfa3cc3c5a47c9a delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/8b/7cd60d49ce3a1a770ece43b7d29b5cf462a33a delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/8b/fb012a6d809e499bd8d3e194a3929bc8995b93 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/8c/749d9968d4b10dcfb06c9f97d0e5d92d337071 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/8f/4433f8593ddd65b7dd43dd4564d841f4d9c8aa delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/90/a336c7dacbe295159413559b0043b8bdc60d57 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/91/2b2d7819cf9c1029e414883857ed61d597a1a5 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/91/8bb3e09090a9995d48af9a2a6296d7e6088d1c delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/91/f44111cb1cb1358ac6944ad356ca1738813ea1 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/92/7d4943cdbdc9a667db8e62cfd0a41870235c51 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/93/77fccdb210540b8c0520cc6e80eb632c20bd25 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/94/4f5dd1a867cab4c2bbcb896493435cae1dcc1a delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/94/8ba6e701c1edab0c2d394fb7c5538334129793 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/95/646149ab6b6ba6edc83cff678582538b457b2b delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/95/9de65e568274120fdf9e3af9f77b1550122149 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/96/8ca794a4597f7f6abbb2b8d940b4078a0f3fd4 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/96/bca8d4f05cc4c5e33e4389f80a1309e86fe054 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/97/7c696519c5a3004c5f1d15d60c89dbeb8f235f delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/98/ba4205fcf31f5dd93c916d35fe3f3b3d0e6714 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/98/d52d07c0b0bbf2b46548f6aa521295c2cb55db delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/99/b4f7e4f24470fa06b980bc21f1095c2a9425c0 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/9a/301fbe6fada7dcb74fcd7c20269b5c743459a7 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/9a/f731fa116d1eb9a6c0109562472cfee6f5a979 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/9c/0b6c34ef379a42d858f03fef38630f476b9102 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/9e/7f4359c469f309b6057febf4c6e80742cbed5b delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/9e/fe7723802d4305142eee177e018fee1572c4f4 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/9f/74397a3397b3585faf09e9926b110d7f654254 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/a0/31a28ae70e33a641ce4b8a8f6317f1ab79dee4 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/a3/9a620dae5bc8b4e771cd4d251b7d080401a21e delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/a3/fabece9eb8748da810e1e08266fef9b7136ad4 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/a4/1b1bb6d0be3c22fb654234c33b428e15c8cc27 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/a4/3150a738849c59376cf30bb2a68348a83c8f48 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/a5/563304ddf6caba25cb50323a2ea6f7dbfcadca delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/a7/08b253bd507417ec42d1467a7fd2d7519c4956 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/a7/65fb87eb2f7a1920b73b2d5a057f8f8476a42b delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/a7/7a56a49f8f3ae242e02717f18ebbc60c5cc543 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/a7/dbfcbfc1a60709cb80b5ca24539008456531d0 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/a8/02e06f1782a9645b9851bc7202cee74a8a4972 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/a8/87dd39ad3edd610fc9083dcb61e40ab50673d1 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/a9/0bc3fb6f15181972a2959a921429efbd81a473 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/ab/40af3cb8a3ed2e2843e96d9aa7871336b94573 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/ab/6c44a2e84492ad4b41bb6bac87353e9d02ac8b delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/ab/929391ac42572f92110f3deeb4f0844a951e22 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/ac/4045f965119e6998f4340ed0f411decfb3ec05 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/ad/01aebfdf2ac13145efafe3f9fcf798882f1730 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/ad/26b598134264fd284292cb233fc0b2f25851da delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/ad/a14492498136771f69dd451866cabcb0e9ef9a delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/ad/a55a45d14527dc3dfc714ea1c65d2e1e6fbe87 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/b2/d399ae15224e1d58066e3c8df70ce37de7a656 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/b4/2712cfe99a1a500b2a51fe984e0b8a7702ba11 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/b6/9fe837e4cecfd4c9a40cdca7c138468687df07 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/b6/f610aef53bd343e6c96227de874c66f00ee8e8 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/b7/a2576f9fc20024ac9ef17cb134acbd1ac73127 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/b8/a3a806d3950e8c0a03a34f234a92eff0e2c68d delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/ba/cac9b3493509aa15e1730e1545fc0919d1dae0 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/bc/744705e1d8a019993cf88f62bc4020f1b80919 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/bc/95c75d59386147d1e79a87c33068d8dbfd71f2 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/bd/593285fc7fe4ca18ccdbabf027f5d689101452 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/bd/867fbae2faa80b920b002b80b1c91bcade7784 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/bd/9cb4cd0a770cb9adcb5fce212142ef40ea1c35 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/be/f6e37b3ee632ba74159168836f382fed21d77d delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/c0/6a9be584ac49aa02c5551312d9e2982c91df10 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/c1/b17981db0840109a820dae8674ee29684134ff delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/c1/b6a51bbb87c2f82b161412c3d20b59fc69b090 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/c3/5dee9bcc0e989f3b0c40f68372a9a51b6c4e6a delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/c3/d02eeef75183df7584d8d13ac03053910c1301 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/c4/efe31e9decccc8b2b4d3df9aac2cdfe2995618 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/c5/0d0f1cb60b8b0fe1615ad20ace557e9d68d7bd delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/c5/bbe550b9f09444bdddd3ecf3d97c0b42aa786c delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/c6/07fc30883e335def28cd686b51f6cfa02b06ec delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/c6/92ecf62007c0ac9fb26e2aa884de2933de15ed delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/c8/f06f2e3bb2964174677e91f0abead0e43c9e5d delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/c9/174cef549ec94ecbc43ef03cdc775b4950becb delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/c9/4b27e41064c521120627e07e2035cca1d24ffa delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/ca/b2cf23998b40f1af2d9d9a756dc9e285a8df4b delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/ca/ff6b7d44973f53e3e0cf31d0d695188b19aec6 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/cb/491780d82e46dc88a065b965ab307a038f2bc2 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/cb/6693a788715b82440a54e0eacd19ba9f6ec559 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/cc/338e4710c9b257106b8d16d82f86458d5beaf1 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/cc/3e3009134cb88014129fc8858d1101359e5e2f delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/ce/8860d49e3bea6fd745874a01b7c3e46da8cbc3 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/ce/e656c392ad0557b3aae0fb411475c206e2926f delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/cf/8c5cc8a85a1ff5a4ba51e0bc7cf5665669924d delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/d0/7ec190c306ec690bac349e87d01c4358e49bb2 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/d0/d4594e16f2e19107e3fa7ea63e7aaaff305ffb delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/d2/f8637f2eab2507a1e13cbc9df4729ec386627e delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/d3/3cedf513c059e0515653fa2c2e386631387a05 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/d3/719a5ae8e4d92276b5313ce976f6ee5af2b436 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/d3/7aa3bbfe1c0c49b909781251b956dbabe85f96 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/d3/7ad72a2052685fc6201c2af90103ad42d2079b delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/d4/207f77243500bec335ab477f9227fcdb1e271a delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/d4/27e0b2e138501a3d15cc376077a3631e15bd46 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/d5/093787ef302b941b6aab081b99fb4880038bd8 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/d5/a61b0b4992a4f0caa887fa08b52431e727bb6f delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/d5/b6fc965c926a1bfc9ee456042b94088b5c5d21 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/d5/ec1152fe25e9fec00189eb00b3db71db24c218 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/d6/42b9770c66bba94a08df09b5efb095001f76d7 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/d6/462fa3f5292857db599c54aea2bf91616230c5 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/d6/cf6c7741b3316826af1314042550c97ded1d50 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/d7/308cc367b2cc23f710834ec1fd8ffbacf1b460 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/d8/74671ef5b20184836cb983bb273e5280384d0b delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/d8/dec75ff2f8b41d1c5bfef0cd57b7300c834f66 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/d8/fa77b6833082c1ea36b7828a582d4c43882450 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/d9/63979c237d08b6ba39062ee7bf64c7d34a27f8 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/da/178208145ef585a1bd5ca5f4c9785d738df2cf delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/db/6261a7c65c7fd678520c9bb6f2c47582ab9ed5 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/dd/2ae5ab264e5592aa754235d5ad5eac8f0ecdfd delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/dd/9a570c3400e6e07bc4d7651d6e20b08926b3d9 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/de/872ee3618b894992e9d1e18ba2ebe256a112f9 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/df/e3f22baa1f6fce5447901c3086bae368de6bdd delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/e0/67f9361140f19391472df8a82d6610813c73b7 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/e1/129b3cfb5898e0fbd606e0cb80b2755e50d161 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/e1/7ace1492648c9dc5701bad5c47af9d1b60c4e9 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/e2/c6abbd55fed5ac71a5f2751e29b4a34726a595 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/e3/1e7ad3ed298f24e383c4950f4671993ec078e4 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/e3/76fbdd06ebf021c92724da9f26f44212734e3e delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/e4/9f917b448d1340b31d76e54ba388268fd4c922 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/e4/f618a2c3ed0669308735727df5ebf2447f022f delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/e5/060729746ca9888239cba08fdcf4bee907b406 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/e6/5a9bb2af9f4c2d1c375dd0f8f8a46cf9c68812 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/e8/107f24196736b870a318a0e28f048e29f6feff delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/e9/2cdb7017dc6c5aed25cb4202c5b0104b872246 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/e9/ad6ec3e38364a3d07feda7c4197d4d845c53b5 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/e9/f48beccc62d535739bfbdebe0a55ed716d8366 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/eb/c09d0137cfb0c26697aed0109fb943ad906f3f delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/ec/67e5a86adff465359f1c8f995e12dbdfa08d8a delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/ed/9523e62e453e50dd9be1606af19399b96e397a delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/ee/1d6f164893c1866a323f072eeed36b855656be delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/ee/3fa1b8c00aff7fe02065fdb50864bb0d932ccf delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/ee/a9286df54245fea72c5b557291470eb825f38f delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/ef/58fdd8086c243bdc81f99e379acacfd21d32d6 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/ef/c499524cf105d5264ac7fc54e07e95764e8075 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/ef/c9121fdedaf08ba180b53ebfbcf71bd488ed09 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/f0/053b8060bb3f0be5cbcc3147a07ece26bf097e delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/f0/ce2b8e4986084d9b308fb72709e414c23eb5e6 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/f2/0c9063fa0bda9a397c96947a7b687305c49753 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/f2/9e7fb590551095230c6149cbe72f2e9104a796 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/f2/e1550a0c9e53d5811175864a29536642ae3821 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/f3/293571dcd708b6a3faf03818cd2844d000e198 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/f3/f1164b68b57b1995b658a828320e6df3081fae delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/f4/15caf3fcad16304cb424b67f0ee6b12dc03aae delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/f4/8097eb340dc5a7cae55aabcf1faf4548aa821f delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/f5/504f36e6f4eb797a56fc5bac6c6c7f32969bf2 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/f5/b50c85a87cac64d7eb3254cdd1aec9564c0293 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/f5/f9dd5886a6ee20272be0aafc790cba43b31931 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/f6/65b45cde9b568009c6e6b7b568e89cfe717df8 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/f6/be049e284c0f9dcbbc745543885be3502ea521 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/f7/c332bd4d4d4b777366cae4d24d1687477576bf delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/f8/958bdf4d365a84a9a178b1f5f35ff1dacbd884 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/fa/c03f2c5139618d87d53614c153823bf1f31396 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/fa/da9356aa3f74622327a3038ae9c6f92e1c5c1d delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/fb/738a106cfd097a4acb96ce132ecb1ad6c46b03 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/fc/4c636d6515e9e261f9260dbcf3cc6eca97ea08 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/fc/7d7b805f7a9428574f4f802b2e34cd20ab9d99 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/fc/90237dc4891fa6c69827fc465632225e391618 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/fd/57d2d6770fad8e9959124793a17f441b571e66 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/fd/89f8cffb663ac89095a0f9764902e93ceaca6a delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/fe/5407fc50a53aecb41d1a6e9ea7b612e581af87 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/ff/49d07869831ad761bbdaea026086f8789bcb00 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/ff/b312248d607284c290023f9502eea010d34efd delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/refs/heads/branch delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/refs/heads/df_ancestor delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/refs/heads/df_side1 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/refs/heads/df_side2 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/refs/heads/ff_branch delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/refs/heads/octo1 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/refs/heads/octo2 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/refs/heads/octo3 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/refs/heads/octo4 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/refs/heads/octo5 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/refs/heads/octo6 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/refs/heads/previous delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/refs/heads/rename_conflict_ancestor delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/refs/heads/rename_conflict_ours delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/refs/heads/rename_conflict_theirs delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/refs/heads/renames1 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/refs/heads/renames2 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/refs/heads/submodules delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/refs/heads/submodules-branch delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/refs/heads/submodules-branch2 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/refs/heads/trivial-10 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/refs/heads/trivial-10-branch delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/refs/heads/trivial-11 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/refs/heads/trivial-11-branch delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/refs/heads/trivial-13 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/refs/heads/trivial-13-branch delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/refs/heads/trivial-14 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/refs/heads/trivial-14-branch delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/refs/heads/trivial-2alt delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/refs/heads/trivial-2alt-branch delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/refs/heads/trivial-3alt delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/refs/heads/trivial-3alt-branch delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/refs/heads/trivial-4 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/refs/heads/trivial-4-branch delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/refs/heads/trivial-5alt-1 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/refs/heads/trivial-5alt-1-branch delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/refs/heads/trivial-5alt-2 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/refs/heads/trivial-5alt-2-branch delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/refs/heads/trivial-6 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/refs/heads/trivial-6-branch delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/refs/heads/trivial-7 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/refs/heads/trivial-7-branch delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/refs/heads/trivial-8 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/refs/heads/trivial-8-branch delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/refs/heads/trivial-9 delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/refs/heads/trivial-9-branch delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/.gitted/refs/heads/unrelated delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/added-in-master.txt delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/automergeable.txt delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/changed-in-branch.txt delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/changed-in-master.txt delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/conflicting.txt delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/removed-in-branch.txt delete mode 100644 vendor/libgit2/tests/resources/merge-resolve/unchanged.txt delete mode 100644 vendor/libgit2/tests/resources/merge-whitespace/.gitted/HEAD delete mode 100644 vendor/libgit2/tests/resources/merge-whitespace/.gitted/config delete mode 100644 vendor/libgit2/tests/resources/merge-whitespace/.gitted/index delete mode 100644 vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/01/bd650462136a4f0a266dfc91ab93b3fef0f7cb delete mode 100644 vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/08/3f868fb4324e32a4999173b2437b31d7a1ef25 delete mode 100644 vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/0a/a2acaa63cacc7a99fab0c2ce3d56572911df19 delete mode 100644 vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/11/89e10a62aadf2fea8cd018afb52c1980f40b4f delete mode 100644 vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/24/2c8f6cf388e96e2c12b6e49cb7ae60167cba1e delete mode 100644 vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/25/246acb001858ffeffb03ea399fd2c0a163b832 delete mode 100644 vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/26/2f67de0de2e535a59ae1bc3c739601e98c354d delete mode 100644 vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/2f/6727d2e570bf962d9dd926423cf6fe5072071a delete mode 100644 vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/3c/43e7fc2a56fc825c31dfee65abd6dda8d16dca delete mode 100644 vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/40/26a6c83f39c56881c9ac62e7582db9e3d33a4f delete mode 100644 vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/42/dabb8d5dba2de103815a77e4369bb3966e64ef delete mode 100644 vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/43/9230587f2eb38e9540a5c99e9831f65641eab9 delete mode 100644 vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/43/ad73e75e15f03bb0b4398a48a57ecfc20788e2 delete mode 100644 vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 delete mode 100644 vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/54/74989173042512ab630191ad71cdcedb646b9a delete mode 100644 vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/5e/fb9bc29c482e023e40e0a2b3b7e49cec842034 delete mode 100644 vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/70/d3d2e7d51a18fcc6f035a67e5c3f33069be04d delete mode 100644 vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/74/e83b6c5df14f1fba7c4ea1f99c6d007b591002 delete mode 100644 vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/77/f40c621ceae77ad8d756ef507bdbafe2713aa7 delete mode 100644 vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/9c/5362069759fb37ae036cef6e4b2f95c6c5eaab delete mode 100644 vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/a2/9e7dabd68dfb38a717e6b1648713cd5c7adee2 delete mode 100644 vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/a4/e6a86e07ef5afe036e26602fbbaa27496d00a9 delete mode 100644 vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/a8/27eab4fd66ab37a6ebcfaa7b7e341abfd55947 delete mode 100644 vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/a9/66acc271e50b5d4595911752a77def0a5e5d40 delete mode 100644 vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/b2/a69114f4897109fedf1aafea363cb2d2557029 delete mode 100644 vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/bc/83ac0422ba1082c80e406234910377984cfbb6 delete mode 100644 vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/bf/e4ea5805af22a5b194259bda6f5f634486f891 delete mode 100644 vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/c3/b1fb31424c98072542cc8e42b48c92e52f494a delete mode 100644 vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/c7/e2f386736445936f5ba181269a0e0967e280e8 delete mode 100644 vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/d9/5182053c31f8aa09df4fa225f4e668c5320b59 delete mode 100644 vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 delete mode 100644 vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/ec/5a35c75b8d3ee29bed37996b14e909d04fdcee delete mode 100644 vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/ee/3c2aac8e03224c323b58ecb1f9eef616745467 delete mode 100644 vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/ef/e94a4bf4e697f7f0270f0d1b8a93af784a19d0 delete mode 100644 vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/f0/0c965d8307308469e537302baa73048488f162 delete mode 100644 vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/f1/90a0d111ca1688778657798743ddfb4ed4bd64 delete mode 100644 vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/f4/9b2c244e9d3b0647fdfb95954c38fbfeecf3ad delete mode 100644 vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/f8/7905f99f0e66d179a8379d8ca4d8cbbd32c231 delete mode 100644 vendor/libgit2/tests/resources/merge-whitespace/.gitted/refs/heads/branch_a_change delete mode 100644 vendor/libgit2/tests/resources/merge-whitespace/.gitted/refs/heads/branch_a_eol delete mode 100644 vendor/libgit2/tests/resources/merge-whitespace/.gitted/refs/heads/branch_b_change delete mode 100644 vendor/libgit2/tests/resources/merge-whitespace/.gitted/refs/heads/branch_b_eol delete mode 100644 vendor/libgit2/tests/resources/merge-whitespace/.gitted/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/merge-whitespace/test.txt delete mode 100644 vendor/libgit2/tests/resources/mergedrepo/.gitted/COMMIT_EDITMSG delete mode 100644 vendor/libgit2/tests/resources/mergedrepo/.gitted/HEAD delete mode 100644 vendor/libgit2/tests/resources/mergedrepo/.gitted/MERGE_HEAD delete mode 100644 vendor/libgit2/tests/resources/mergedrepo/.gitted/MERGE_MODE delete mode 100644 vendor/libgit2/tests/resources/mergedrepo/.gitted/MERGE_MSG delete mode 100644 vendor/libgit2/tests/resources/mergedrepo/.gitted/ORIG_HEAD delete mode 100644 vendor/libgit2/tests/resources/mergedrepo/.gitted/config delete mode 100644 vendor/libgit2/tests/resources/mergedrepo/.gitted/description delete mode 100644 vendor/libgit2/tests/resources/mergedrepo/.gitted/index delete mode 100644 vendor/libgit2/tests/resources/mergedrepo/.gitted/info/exclude delete mode 100644 vendor/libgit2/tests/resources/mergedrepo/.gitted/logs/HEAD delete mode 100644 vendor/libgit2/tests/resources/mergedrepo/.gitted/logs/refs/heads/branch delete mode 100644 vendor/libgit2/tests/resources/mergedrepo/.gitted/logs/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/03/db1d37504ca0c4f7c26d7776b0e28bdea08712 delete mode 100644 vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/17/0efc1023e0ed2390150bb4469c8456b63e8f91 delete mode 100644 vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/1f/85ca51b8e0aac893a621b61a9c2661d6aa6d81 delete mode 100644 vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/22/0bd62631c8cf7a83ef39c6b94595f00517211e delete mode 100644 vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/32/d55d59265db86dd690f0a7fc563db43e2bc6a6 delete mode 100644 vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/38/e2d82b9065a237904af4b780b4d68da6950534 delete mode 100644 vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/3a/34580a35add43a4cf361e8e9a30060a905c876 delete mode 100644 vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/44/58b8bc9e72b6c8755ae456f60e9844d0538d8c delete mode 100644 vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/47/8871385b9cd03908c5383acfd568bef023c6b3 delete mode 100644 vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/51/6bd85f78061e09ccc714561d7b504672cb52da delete mode 100644 vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/53/c1d95a01f4514b162066fc98564500c96c46ad delete mode 100644 vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/6a/ea5f295304c36144ad6e9247a291b7f8112399 delete mode 100644 vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/70/68e30a7f0090ae32db35dfa1e4189d8780fcb8 delete mode 100644 vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/75/938de1e367098b3e9a7b1ec3c4ac4548afffe4 delete mode 100644 vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/7b/26923aaf452b1977eb08617c59475fb3f74b71 delete mode 100644 vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/84/af62840be1b1c47b778a8a249f3ff45155038c delete mode 100644 vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/88/71f7a2ee3addfc4ba39fbd0783c8e738d04cda delete mode 100644 vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/88/7b153b165d32409c70163e0f734c090f12f673 delete mode 100644 vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/8a/ad34cc83733590e74b93d0f7cf00375e2a735a delete mode 100644 vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/8b/3f43d2402825c200f835ca1762413e386fd0b2 delete mode 100644 vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/8b/72416545c7e761b64cecad4f1686eae4078aa8 delete mode 100644 vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/8f/3c06cff9a83757cec40c80bc9bf31a2582bde9 delete mode 100644 vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/8f/fcc405925511824a2240a6d3686aa7f8c7ac50 delete mode 100644 vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/9a/05ccb4e0f948de03128e095f39dae6976751c5 delete mode 100644 vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/9d/81f82fccc7dcd7de7a1ffead1815294c2e092c delete mode 100644 vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/b7/cedb8ad4cbb22b6363f9578cbd749797f7ef0d delete mode 100644 vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/d0/1885ea594926eae9ba5b54ad76692af5969f51 delete mode 100644 vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/e2/809157a7766f272e4cfe26e61ef2678a5357ff delete mode 100644 vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/e6/2cac5c88b9928f2695b934c70efa4285324478 delete mode 100644 vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/f7/2784290c151092abf04ce6b875068547f70406 delete mode 100644 vendor/libgit2/tests/resources/mergedrepo/.gitted/refs/heads/branch delete mode 100644 vendor/libgit2/tests/resources/mergedrepo/.gitted/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/mergedrepo/conflicts-one.txt delete mode 100644 vendor/libgit2/tests/resources/mergedrepo/conflicts-two.txt delete mode 100644 vendor/libgit2/tests/resources/mergedrepo/one.txt delete mode 100644 vendor/libgit2/tests/resources/mergedrepo/two.txt delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/HEAD delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/index delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/02/28b21d477f67b9f7720565da9e760b84c8b85b delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/04/18f28a75dc0c4951c01842e0d794843a88178a delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/04/fab819d8388295cbe3496310e4e53ef8f4a115 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/05/1229bf9d30ec923052ff42db8069ccdc17159d delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/09/9ed86cb8501ae483b1855c351fe1a506ac9631 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/0a/78e40e54cc471c0415ca0680550f242e7843e2 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/0b/8206dd72a3b3b932fb562f92d29199b9398390 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/0d/45fb57852c2229346a800bd3fc58e32527a21c delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/10/cb44a89d1a9e8bf74de3f11a2a61ee833f13b1 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/11/9f6cd3535de0e2a15654947a7b1a5affbf1406 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/12/12c12915820e1ad523b6305c0dcdefea8b7e97 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/13/e5f8be09e8b7db074fb39b96e08215cc4a36f1 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/14/e70ab559b4c6a8a6fc9b6f538bd1f3934be725 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/15/f7d9f9514eeb65b9588c49b10b1da145a729a2 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/16/35c47d80914f0abfa43dd4234a948db5bdb107 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/16/a701796bc3670e5c2fdaeccb7f1280c60b373f delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/19/1381ee74dec49c89f99a62d055cb1058ba0de9 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/1e/3c845808fa5883aa4bcf2f882172edb72a7a32 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/24/676d5e93f9fa7b568f38d7bce01772908e982b delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/26/b665c162f67acae67779445f3c7b9782b0a6d7 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/27/db66b046536a0e4f64c4f8c3a490641c3fa5e5 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/2b/4b774d8c5441b22786531f34ffc77800cda8cf delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/2d/23d51590ec2f53fe4b5bb3e5ca62e35e4ef85a delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/35/ae236308929a536fb4e852278a9b98c42babb3 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/38/0b9e58872ccf1d858be4b0fc612514a080bc40 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/39/fb3af508440cf970b92767f6d081c811574d2a delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/3b/24e5c751ee9c7c89df32a0d959748aa3d0112c delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/44/14ac920acabc3eb00e3cf9375eeb0cb6859c15 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/44/2894787eddb1e84a952f17a027590e2c6c02cd delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/46/fe10fa23259b089ab050788b06df979cd7d054 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/4a/a347c8bb0456230f43f34833c97b9f52c40f62 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/4d/83272d0d372e1232ddc4ff3260d76fdfa2015a delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/53/41a7b545d71198b076b8ba3374a75c9a290640 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/5d/1ee4f24f66dcd62a30248588d33804656b2073 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/65/94bdbad86bbc8d3ed0806a23827203fbab56c6 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/68/e8bce48725490c376d57ebc60f0170605951a5 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/69/7dc3d723a018538eb819d5db2035c15109af73 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/6b/7d8a5a48a3c753b75a8fe5196f9c8704ac64ad delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/6c/1f5f6fec515d33036b44c596bfae28fc460cba delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/71/2ceb8eb3e57072447715bc4057c57aa50f629a delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/7a/0538bc4e20aecb36ef221f2077eb30ebe0bcb2 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/7a/e174dda8f105a582c593b52d74545a3565819d delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/7b/b1dd08b2c7d73084934954e4196e67004b0279 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/7d/4e382485ace068fb83b768ba1a1c674afbdc1d delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/7f/924ca37670afa06c7a481a2487b728b2c0185a delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/80/24458e7ee49c456fd8c45d3591e9936bf613b3 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/80/a8fe4f10626c50b3a4fd065a4604bafc9f30fa delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/81/e2b84864f16ebd285b34a2b1e87ebb41f4c230 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/82/482ad2e683edfc14f7de359e4f9a5e88909c51 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/88/6c0f5f71057d846f71f05a05fdffad332bc070 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/89/9ff28744bed5bece69c78ba752c7dc3e954629 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/8b/cbb6e0c0f9554efd5401e1ec14a4b2595eb3bf delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/8c/e7a3ef59c3d602a0296321eb964218f3d52fae delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/8f/1dcd43aa0164eb6ec319c3ec8879ca5cf62c1e delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/91/602c85bb50dd834205edd30435b77d5bb9ccf0 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/91/cd2c95af92883550b45fcc838013ae7e2954df delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/94/f37c29173c8fa45a232b17e745c82132b2fafd delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/96/156716851c0afb4702b0d2c4ac8c496a730e29 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/96/3fdf003bf7261b9155c5748dc0945349b69e68 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/9a/b85e507899c19dca57778c9b6e5f1ec799b911 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/9d/5898503adc01d763e279ac8fcefbe865b19031 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/9e/24726d64589ba02430da8cebb5712dad35593d delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/9e/683cdaf9ea2727c891b4cf8f7f11e9e28a67ca delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/a0/d89aa95628fcd6b64fd5b23dd56b906b06bfe2 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/a5/76a98d3279989226992610372035b76a01a3e9 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/a7/8dde970cffbb71d67bef2a74aa72c6621d9819 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/ac/84d85a425b2a21fd0ffccacac6c48823fc98c8 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/af/45aa1eb7edf804ed10f70efb96fd178527c17c delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/b1/1df9aee97a65817e8904a74f5e6a1c62c7a275 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/b8/3795b1e0eb54f22f7056119db132500d0cdc05 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/bb/29ec85546d29b0bcc314242660d7772b0a3803 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/bc/e2dabe5766838216d95f199d95aa4fd479a084 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/bf/7ab4723fcc57ecc7fceccf591d6c4773491569 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/c2/a2ddd339574e5cbfd9228be840eb1bf496de4e delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/c3/a70f8a376f17adccfb52b48e2831bfef2a2172 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/c4/89e70ed6d9f6331770eae21a77d15afd11cd99 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/c6/72414d4d08111145ef8202f21c95fa7e688aee delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/c8/f98a1762ec016c30f0d73512df399dedefc3fd delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/cc/bbfdb796f9b03298f5c7225e8f830784e1a3b1 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/cd/44b4ea1066b3fa1d4b3baad8dc1531aec287a6 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/ce/22b3cd9a01efafc370879c1938e0c32fb6f195 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/cf/6fcf8cdf7e8d4cda3b11b0ba02d0d5125fbbd7 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/d2/eb26d4938550487de59a017a7bfee8ca46b5f4 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/dc/37c5f1521fb76fe1c1ac7b13187f9396a59247 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/de/bdc4a004fda6141a17d9c297617be70d40248f delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/e2/377bdbc93b30a34ed5deefedded89b947ff8f4 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/e3/99c4fc4c07cb7947d2f3d966bc374df6ccc691 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/e4/edb361e51932b5ccedbc7ee41b4d3a4289aece delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/e5/1c3fa44fe981ec290c8f47fea736f3ff2af2a6 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/e7/3a04f71f11ab9d7dde72ff793882757a03f16e delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/e8/68b1d6833710021785581a9e11dba8468f3a55 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/e8/7caf56c91ab8d14e4ee8eb56308533503d1885 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/eb/82bf596b66f90e25f881ce9b92cb55bab4fdf5 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/ed/4bc023f61dc345ff0084b922b229d24de206e7 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/ef/6ed8a2b15f95795aed82a974b995cace02dbfe delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/f2/c059dab35f6534b3f16d90b2f1de308615320c delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/fa/9cfdbeaaf3a91ff4b84d74412cd59d9b16a615 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/objects/fd/7a37d92197267e55e1fc0cc4f283a815bd79b8 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dot_backslash_dotcapitalgit_path delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dot_dotcapitalgit_path delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dot_dotgit_path delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dot_dotgit_tree delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dot_git_colon delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dot_git_colon_stuff delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dot_git_dot delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dot_path delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dot_path_two delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dot_tree delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotcapitalgit_backslash_path delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotcapitalgit_path delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotcapitalgit_tree delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotdot_dotcapitalgit_path delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotdot_dotgit_path delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotdot_dotgit_tree delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotdot_path delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotdot_tree delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_backslash_path delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_hfs_ignorable_1 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_hfs_ignorable_10 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_hfs_ignorable_11 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_hfs_ignorable_12 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_hfs_ignorable_13 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_hfs_ignorable_14 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_hfs_ignorable_15 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_hfs_ignorable_16 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_hfs_ignorable_2 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_hfs_ignorable_3 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_hfs_ignorable_4 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_hfs_ignorable_5 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_hfs_ignorable_6 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_hfs_ignorable_7 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_hfs_ignorable_8 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_hfs_ignorable_9 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_path delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_tree delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/git_tilde1 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/git_tilde2 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/git_tilde3 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/symlink1 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/symlink2 delete mode 100644 vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/symlink3 delete mode 100644 vendor/libgit2/tests/resources/nsecs/.gitted/HEAD delete mode 100644 vendor/libgit2/tests/resources/nsecs/.gitted/config delete mode 100644 vendor/libgit2/tests/resources/nsecs/.gitted/index delete mode 100644 vendor/libgit2/tests/resources/nsecs/.gitted/objects/03/1986a8372d1442cfe9e3b54906a9aadc524a7e delete mode 100644 vendor/libgit2/tests/resources/nsecs/.gitted/objects/03/9afd91c98f82c14e425bb6796d8ca98e9c8cac delete mode 100644 vendor/libgit2/tests/resources/nsecs/.gitted/objects/6d/8b18077cc99abd8dda05a6062c646406abb2d4 delete mode 100644 vendor/libgit2/tests/resources/nsecs/.gitted/objects/c5/12b6c64656b87ea8caf37a32bc5a562d797745 delete mode 100644 vendor/libgit2/tests/resources/nsecs/.gitted/objects/df/78d3d51c369e1d2f1eadb73464aadd931d56b4 delete mode 100644 vendor/libgit2/tests/resources/nsecs/.gitted/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/nsecs/a.txt delete mode 100644 vendor/libgit2/tests/resources/nsecs/b.txt delete mode 100644 vendor/libgit2/tests/resources/nsecs/c.txt delete mode 100644 vendor/libgit2/tests/resources/partial-testrepo/.gitted/HEAD delete mode 100644 vendor/libgit2/tests/resources/partial-testrepo/.gitted/config delete mode 100644 vendor/libgit2/tests/resources/partial-testrepo/.gitted/index delete mode 100644 vendor/libgit2/tests/resources/partial-testrepo/.gitted/objects/13/85f264afb75a56a5bec74243be9b367ba4ca08 delete mode 100644 vendor/libgit2/tests/resources/partial-testrepo/.gitted/objects/14/4344043ba4d4a405da03de3844aa829ae8be0e delete mode 100644 vendor/libgit2/tests/resources/partial-testrepo/.gitted/objects/16/8e4ebd1c667499548ae12403b19b22a5c5e925 delete mode 100644 vendor/libgit2/tests/resources/partial-testrepo/.gitted/objects/18/1037049a54a1eb5fab404658a3a250b44335d7 delete mode 100644 vendor/libgit2/tests/resources/partial-testrepo/.gitted/objects/18/10dff58d8a660512d4832e740f692884338ccd delete mode 100644 vendor/libgit2/tests/resources/partial-testrepo/.gitted/objects/45/b983be36b73c0788dc9cbcb76cbb80fc7bb057 delete mode 100644 vendor/libgit2/tests/resources/partial-testrepo/.gitted/objects/4a/202b346bb0fb0db7eff3cffeb3c70babbd2045 delete mode 100644 vendor/libgit2/tests/resources/partial-testrepo/.gitted/objects/4e/0883eeeeebc1fb1735161cea82f7cb5fab7e63 delete mode 100644 vendor/libgit2/tests/resources/partial-testrepo/.gitted/objects/5b/5b025afb0b4c913b4c338a42934a3863bf3644 delete mode 100644 vendor/libgit2/tests/resources/partial-testrepo/.gitted/objects/62/eb56dabb4b9929bc15dd9263c2c733b13d2dcc delete mode 100644 vendor/libgit2/tests/resources/partial-testrepo/.gitted/objects/66/3adb09143767984f7be83a91effa47e128c735 delete mode 100644 vendor/libgit2/tests/resources/partial-testrepo/.gitted/objects/75/057dd4114e74cca1d750d0aee1647c903cb60a delete mode 100644 vendor/libgit2/tests/resources/partial-testrepo/.gitted/objects/81/4889a078c031f61ed08ab5fa863aea9314344d delete mode 100644 vendor/libgit2/tests/resources/partial-testrepo/.gitted/objects/84/96071c1b46c854b31185ea97743be6a8774479 delete mode 100644 vendor/libgit2/tests/resources/partial-testrepo/.gitted/objects/9f/d738e8f7967c078dceed8190330fc8648ee56a delete mode 100644 vendor/libgit2/tests/resources/partial-testrepo/.gitted/objects/a4/a7dce85cf63874e984719f4fdd239f5145052f delete mode 100644 vendor/libgit2/tests/resources/partial-testrepo/.gitted/objects/a7/1586c1dfe8a71c6cbf6c129f404c5642ff31bd delete mode 100644 vendor/libgit2/tests/resources/partial-testrepo/.gitted/objects/a8/233120f6ad708f843d861ce2b7228ec4e3dec6 delete mode 100644 vendor/libgit2/tests/resources/partial-testrepo/.gitted/objects/c4/7800c7266a2be04c571c04d5a6614691ea99bd delete mode 100644 vendor/libgit2/tests/resources/partial-testrepo/.gitted/objects/cf/80f8de9f1185bf3a05f993f6121880dd0cfbc9 delete mode 100644 vendor/libgit2/tests/resources/partial-testrepo/.gitted/objects/d5/2a8fe84ceedf260afe4f0287bbfca04a117e83 delete mode 100644 vendor/libgit2/tests/resources/partial-testrepo/.gitted/objects/f6/0079018b664e4e79329a7ef9559c8d9e0378d1 delete mode 100644 vendor/libgit2/tests/resources/partial-testrepo/.gitted/objects/fa/49b077972391ad58037050f2a75f74e3671e92 delete mode 100644 vendor/libgit2/tests/resources/partial-testrepo/.gitted/objects/fd/093bff70906175335656e6ce6ae05783708765 delete mode 100644 vendor/libgit2/tests/resources/partial-testrepo/.gitted/objects/pack/.gitkeep delete mode 100644 vendor/libgit2/tests/resources/partial-testrepo/.gitted/refs/heads/dir delete mode 100644 vendor/libgit2/tests/resources/peeled.git/HEAD delete mode 100644 vendor/libgit2/tests/resources/peeled.git/config delete mode 100644 vendor/libgit2/tests/resources/peeled.git/objects/info/packs delete mode 100644 vendor/libgit2/tests/resources/peeled.git/objects/pack/pack-e84773eaf3fce1774755580e3dbb8d9f3a1adc45.idx delete mode 100644 vendor/libgit2/tests/resources/peeled.git/objects/pack/pack-e84773eaf3fce1774755580e3dbb8d9f3a1adc45.pack delete mode 100644 vendor/libgit2/tests/resources/peeled.git/packed-refs delete mode 100644 vendor/libgit2/tests/resources/peeled.git/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/push.sh delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/COMMIT_EDITMSG delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/HEAD delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/ORIG_HEAD delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/config delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/description delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/index delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/info/exclude delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/logs/HEAD delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/logs/refs/heads/b1 delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/logs/refs/heads/b2 delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/logs/refs/heads/b3 delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/logs/refs/heads/b4 delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/logs/refs/heads/b5 delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/logs/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/HEAD delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/config delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/description delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/index delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/info/exclude delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/logs/HEAD delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/logs/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/logs/refs/remotes/origin/HEAD delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/08/b041783f40edfe12bb406c9c9a8a040177c125 delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/13/85f264afb75a56a5bec74243be9b367ba4ca08 delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/18/1037049a54a1eb5fab404658a3a250b44335d7 delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/18/10dff58d8a660512d4832e740f692884338ccd delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/1a/443023183e3f2bfbef8ac923cd81c1018a18fd delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/1b/8cbad43e867676df601306689fe7c3def5e689 delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/1f/67fc4386b2d171e0d21be1c447e12660561f9b delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/25/8f0e2a959a364e40ed6603d5d44fbb24765b10 delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/27/0b8ea76056d5cad83af921837702d3e3c2924d delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/2d/59075e0681f540482d4f6223a68e0fef790bc7 delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/32/59a6bd5b57fb9c1281bb7ed3167b50f224cb54 delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/36/97d64be941a53d4ae8f6a271e4e3fa56b022cc delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/45/b983be36b73c0788dc9cbcb76cbb80fc7bb057 delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/4a/202b346bb0fb0db7eff3cffeb3c70babbd2045 delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/4b/22b35d44b5a4f589edf3dc89196399771796ea delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/52/1d87c1ec3aef9824daf6d96cc0ae3710766d91 delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/5b/5b025afb0b4c913b4c338a42934a3863bf3644 delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/75/057dd4114e74cca1d750d0aee1647c903cb60a delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/76/3d71aadf09a7951596c9746c024e7eece7c7af delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/7b/4384978d2493e851f9cca7858815fac9b10980 delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/81/4889a078c031f61ed08ab5fa863aea9314344d delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/84/96071c1b46c854b31185ea97743be6a8774479 delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/84/9a5e34a26815e821f865b8479f5815a47af0fe delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/94/4c0f6e4dfa41595e6eb3ceecdb14f50fe18162 delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/9a/03079b8a8ee85a0bee58bf9be3da8b62414ed4 delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/9f/13f7d0a9402c681f91dc590cf7b5470e6a77d2 delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/9f/d738e8f7967c078dceed8190330fc8648ee56a delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/a4/a7dce85cf63874e984719f4fdd239f5145052f delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/a6/5fedf39aefe402d3bb6e24df4d4f5fe4547750 delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/a7/1586c1dfe8a71c6cbf6c129f404c5642ff31bd delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/a8/233120f6ad708f843d861ce2b7228ec4e3dec6 delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/ae/90f12eea699729ed24555e40b9fd669da12a12 delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/b2/5fa35b38051e4ae45d4222e795f9df2e43f1d1 delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/b6/361fc6a97178d8fc8639fdeed71c775ab52593 delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/be/3563ae3f795b2b4353bcce3a527ad0a4f7f644 delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/c4/7800c7266a2be04c571c04d5a6614691ea99bd delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/d0/7b0f9a8c89f1d9e74dc4fce6421dec5ef8a659 delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/d6/c93164c249c8000205dd4ec5cbca1b516d487f delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/d7/1aab4f9b04b45ce09bcaa636a9be6231474759 delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/e7/b4ad382349ff96dd8199000580b9b1e2042eb0 delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/f1/425cef211cc08caa31e7b545ffb232acb098c3 delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/f6/0079018b664e4e79329a7ef9559c8d9e0378d1 delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/fa/49b077972391ad58037050f2a75f74e3671e92 delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/fd/093bff70906175335656e6ce6ae05783708765 delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/fd/4959ce7510db09d4d8217fa2d1780413e05a09 delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/pack/pack-a81e489679b7d3418f9ab594bda8ceb37dd4c695.idx delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/pack/pack-a81e489679b7d3418f9ab594bda8ceb37dd4c695.pack delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/pack/pack-d7c6adf9f61318f041845b01440d09aa7a91e1b5.idx delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/pack/pack-d7c6adf9f61318f041845b01440d09aa7a91e1b5.pack delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/pack/pack-d85f5d483273108c9d8dd0e4728ccf0b2982423a.idx delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/pack/pack-d85f5d483273108c9d8dd0e4728ccf0b2982423a.pack delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/packed-refs delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/refs/remotes/origin/HEAD delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/objects/08/585692ce06452da6f82ae66b90d98b55536fca delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/objects/27/b7ce66243eb1403862d05f958c002312df173d delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/objects/28/905c54ea45a4bed8d7b90f51bd8bd81eec8840 delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/objects/36/6226fb970ac0caa9d3f55967ab01334a548f60 delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/objects/36/f79b2846017d3761e0a02d0bccd573e0f90c57 delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/objects/5c/0bb3d1b9449d1cc69d7519fd05166f01840915 delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/objects/61/780798228d17af2d34fce4cfbdf35556832472 delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/objects/64/fd55f9b6390202db5e5666fd1fb339089fba4d delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/objects/78/981922613b2afb6025042ff6bd878ac1994e85 delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/objects/80/5c54522e614f29f70d2413a0470247d8b424ac delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/objects/95/1bbbb90e2259a4c8950db78946784fb53fcbce delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/objects/a7/8705c3b2725f931d3ee05348d83cc26700f247 delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/objects/b4/83ae7ba66decee9aee971f501221dea84b1498 delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/objects/b4/e1f2b375a64c1ccd40c5ff6aa8bc96839ba4fd delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/objects/c1/0409136a7a75e025fa502a1b2fd7b62b77d279 delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/objects/cd/881f90f2933db2e4cc26b8c71fe6037ac7fe4c delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/objects/d9/b63a88223d8367516f50bd131a5f7349b7f3e4 delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/objects/dc/ab83249f6f9d1ed735d651352a80519339b591 delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/objects/ee/a4f2705eeec2db3813f2430829afce99cd00b5 delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/objects/f7/8a3106c85fb549c65198b2a2086276c6174928 delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/objects/f8/f7aefc2900a3d737cea9eee45729fd55761e1a delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/objects/fa/38b91f199934685819bea316186d8b008c52a2 delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/objects/ff/83aa4c5e5d28e3bcba2f5c6e2adc61286a4e5e delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/objects/ff/fe95c7fd0a37fa2ed702f8f93b56b2196b3925 delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/objects/pack/dummy delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/refs/heads/b1 delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/refs/heads/b2 delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/refs/heads/b3 delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/refs/heads/b4 delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/refs/heads/b5 delete mode 100644 vendor/libgit2/tests/resources/push_src/.gitted/refs/heads/b6 delete mode 100644 vendor/libgit2/tests/resources/push_src/a.txt delete mode 100644 vendor/libgit2/tests/resources/push_src/fold/b.txt delete mode 100644 vendor/libgit2/tests/resources/push_src/foldb.txt delete mode 100644 vendor/libgit2/tests/resources/push_src/gitmodules delete mode 100644 vendor/libgit2/tests/resources/push_src/submodule/.gitted delete mode 100644 vendor/libgit2/tests/resources/push_src/submodule/README delete mode 100644 vendor/libgit2/tests/resources/push_src/submodule/branch_file.txt delete mode 100644 vendor/libgit2/tests/resources/push_src/submodule/new.txt delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/HEAD delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/config delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/index delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/info/exclude delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/logs/HEAD delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/00/66204dd469ee930e551fbcf123f98e211c99ce delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/00/f1b9a0948a7d5d14405eba6030efcdfbb8ff4a delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/01/3cc32d341bab0e6f039f50f153c18986f16c58 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/01/a17f7d154ab5bf9f8bfede3d82dd00ddf7e7dc delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/02/2d3b6bbd0bfbdf147319476fb8bf405691cb0d delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/05/3808a709cf91385985369159b296cf61a177ac delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/0e/f2e2b2a2b8d6e1f8dff5e621e0eca21b693d0c delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/0f/5f6d3353be1a9966fa5767b7d604b051798224 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/11/fac10ca1b9318ce361a0be0c3d889d777e299c delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/12/c084412b952396962eb420716df01022b847cc delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/12/f28ed978639d331269d9dc2b74e87db58e1057 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/19/14d57ddf6c5c997664521cc94f190df46dc1c2 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/1b/1d19799fcc89fa3cb821581fcf7f2e8fd2cc4d delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/1f/2214c1b13b134d5508f41f6a3b77cc6a8f5182 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/20/db906c85e78c6dde82eb2ec6d3231c4b96fce8 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/22/adb22bef75a0371e85ff6d82e5e60e4b425501 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/2a/a3ce842094e08ebac152b3d6d5b0fff39f9c6e delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/2b/4ebffd3111546d278bb5df62e5630930b605fb delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/30/69cc907e6294623e5917ef6de663928c1febfb delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/32/52a0692ace4c4c709f22011227d9dc4845f289 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/33/f915f9e4dbd9f4b24430e48731a59b45b15500 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/34/86a9d4cdf0b7b4a702c199eed541dc3af13a03 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/3c/33b080bf75724c8899d8e703614cb59bfbd047 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/3d/a85aca38a95b44d77ef55a8deb445e49ba19b4 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/3e/8989b5a16d5258c935d998ef0e6bb139cc4757 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/3f/05a038dd89f51ba2b3d7b14ba1f8c00f0e31ac delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/3f/d8d53cf02de539b9a25a5941030451f76a152f delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/40/0d89e8ee6cd91b67b1f45de1ca190e1c580c6f delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/41/4dfc71ead79c07acd4ea47fecf91f289afc4b9 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/41/c5a0a761bb4a7670924c1af0800b30fe9a21be delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/42/cdad903aef3e7b614675e6584a8be417941911 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/44/c801fe026abbc141b52a4dec5df15fa98249c6 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/4b/21eb6eeeec7f8fc89a1d334faff9bd5f5f8c34 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/4b/7c5650008b2e747fe1809eeb5a1dde0e80850a delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/4b/ed71df7017283cac61bbf726197ad6a5a18b84 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/4c/acc6f6e740a5bc64faa33e04b8ef0733d8a127 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/4f/b698bde45d7d2833e3f2aacfbfe8a7e7f60a65 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/50/8be4ff49d38465ad3de58f66d38f70e59f881f delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/53/f75e45a463033854e52fa8d39dc858e45537d0 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/58/8e5d2f04d49707fe4aab865e1deacaf7ef6787 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/5b/1e8bccf7787e942aecf61912f94a2c274f85a5 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/60/29cb003b59f710f9a8ebd9da9ece2d73070b69 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/61/139b9b40a3e489f4abbc6af14e10ae14006e47 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/61/30e5fcbdce2aa8b3cfd84706c58a892e7d8dd0 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/63/c18bf188b8a1ab0bad85161dc3fb43c48ed0db delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/67/ed7afb256807556f9b74fa4f7c9284aaec1120 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/68/af1fc7407fd9addf1701a87eb1c95c7494c598 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/68/f6182f4c85d39e1309d97c7e456156dc9c0096 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/6c/8e16469b6ca09a07e00f0e07a5143c31dcfb64 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/6d/77ce8fa2cd93c6489236e33e45e35203ca748c delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/6d/fb87d20f3dbca02da4a39890114fd9ba6a51e7 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/73/f346c88d965227a03c0af8d555870b8c5021d4 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/74/0a804e8963759c98e5b8cb912e15ae74a7a4a6 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/78/c320b06544e23d786a9ec84ee93861f2933094 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/79/e28694aae0d3064b06f96a5207b943a2357f07 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/7a/05900f340af0252aaa4e34941f040c5d2fe7f7 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/7a/677f6201c8f9d46bdfe1f4b08cb504e360a34e delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/7c/7bf85e978f1d18c0566f702d2cb7766b9c8d4f delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/7f/37fe2d7320360f8a9118b1ed8fba6f38481679 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/80/32d630f37266bace093e353f7b97d7f8b20950 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/80/dce0e74f0534811db734a68c23b49f98584d7a delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/83/53b9f9deff7c707f280e0f656c80772cca7cd9 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/85/258e426a341cc1aa035ac7f6d18f84fed2ab38 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/85/f34ce9ca9e0f33d4146afec9cbe5a26757500a delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/86/a5415741ed3754ccb0cac1fc19fd82587840a4 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/8d/1f13f93c4995760ac07d129246ac1ff64c0be9 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/8d/95ea62e621f1d38d230d9e7d206e41096d76af delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/8f/4de6c781b9ff9cedfd7f9f9f224e744f97b259 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/92/54a37fde7e97f9a28dee2967fdb2c5d1ed94e9 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/95/39b2cc291d6a6b1b266df8474d31fdd344dd79 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/9a/8535dfcaf7554c728d874f047c5461fb2c71d1 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/9c/d483e7da23819d7f71d24e9843812337886753 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/a0/1a6ee390f65d834375e072952deaee0c5e92f7 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/a0/fa65f96c1e3bdc7287e334229279dcc1248fa4 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/a1/25b9b655932711abceaf8962948e6b601d67b6 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/a7/00acc970eccccc73be53cd269462176544e6d1 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/a7/b066537e6be7109abfe4ff97b675d4e077da20 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/aa/4c42aecdfc7cd989bbc3209934ea7cda3f4d88 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/ab/25a53ef5622d443ecb0492b7516725f0deac8f delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/ad/c97cfb874cdfb9d5ab17b54f3771dea6e02ccf delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/ae/87cae12879a3c37d7cc994afc6395bcb0eaf99 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/b1/46bd7608eac53d9bf9e1a6963543588b555c64 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/b1/b94ec02f8ed87d0efa4c65fb38d5d6da7e8b32 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/b6/72b141d48c369fee6c4deeb32a904387594365 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/b7/c536a5883c8adaeb34d5e198c5a3dbbdc608b5 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/b9/f72b9158fa8c49fb4e4c10b26817ed867be803 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/bc/cc8eabb5cfe2ec09959c7f4155aa73429fd604 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/c4/e6cca3ec6ae0148ed231f97257df8c311e015f delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/c5/17380440ed78865ffe3fa130b9738615c76618 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/cb/20a10406172afd6ca3138ce36ecaf8b1269e8e delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/d4/82e77aecb8e07da43e4cad6e0dcb59219e12af delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/d6/16d97082eb7bb2dc6f180a7cca940993b7a56f delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/d6/b9ec0dfb972a6815ace42545cde5f2631cd776 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/da/82b3a60c50cf5ac524ec3000d743447329465d delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/da/9c51a23d02d931a486f45ad18cda05cf5d2b94 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/dc/12ac1e10f2be70e8ecd52132a08da98a309c3a delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/df/d3d25264693fcd7348ad286f3c34f3f6b30918 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/e4/f809f826c1a9fc929874bc0e4644dd2f2a1af4 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/e5/2ff405da5b7e1e9b0929939fa8405d81fe8a45 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/e7/bb00c4eab291e08361fda376733a12b4150aa9 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/e8/8cc0a6919a74599ce8e1dcb81eb2bbae33a645 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/e9/5f47e016dcc70b0b888df8e40e97b8aabafd4c delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/e9/f22c10ffb378446c0bbcab7ee3d9d5a0040672 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/ec/725f5639730640f91cd0be5f2d6d7ac5d69c79 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/ed/f7b3ffde1624c60d2d6b1a2bb792d86de172e0 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/ee/23c5eeedadf8595c0ff60a366d970a165e373d delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/ee/f0edde5daa94da5f297d4ddb5dfbc1980f0902 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/ef/ad0b11c47cb2f0220cbd6f5b0f93bb99064b00 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/f5/56d5fef35003561dc0b64b37057d7541239105 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/f6/3fa37e285bd11b0a7b48fa584a4091814a3ada delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/f7/5c193a1df47186727179f24867bc4d27a8991f delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/f8/7d14a4a236582a0278a916340a793714256864 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/fc/e0584b379f535e50e036db587db71884ea6b36 delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/ff/b36e513f5fdf8a6ba850a20142676a2ac4807d delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/objects/ff/dfa89389040a87008c4ab1834120d3046daaea delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/refs/heads/asparagus delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/refs/heads/barley delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/refs/heads/beef delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/refs/heads/dried_pea delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/refs/heads/gravy delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/refs/heads/green_pea delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/rebase/.gitted/refs/heads/veal delete mode 100644 vendor/libgit2/tests/resources/rebase/asparagus.txt delete mode 100644 vendor/libgit2/tests/resources/rebase/beef.txt delete mode 100644 vendor/libgit2/tests/resources/rebase/bouilli.txt delete mode 100644 vendor/libgit2/tests/resources/rebase/gravy.txt delete mode 100644 vendor/libgit2/tests/resources/rebase/oyster.txt delete mode 100644 vendor/libgit2/tests/resources/rebase/veal.txt delete mode 100644 vendor/libgit2/tests/resources/redundant.git/HEAD delete mode 100755 vendor/libgit2/tests/resources/redundant.git/config delete mode 100644 vendor/libgit2/tests/resources/redundant.git/objects/info/packs delete mode 100644 vendor/libgit2/tests/resources/redundant.git/objects/pack/pack-3d944c0c5bcb6b16209af847052c6ff1a521529d.idx delete mode 100644 vendor/libgit2/tests/resources/redundant.git/objects/pack/pack-3d944c0c5bcb6b16209af847052c6ff1a521529d.pack delete mode 100644 vendor/libgit2/tests/resources/redundant.git/packed-refs delete mode 100644 vendor/libgit2/tests/resources/redundant.git/refs/.gitkeep delete mode 100644 vendor/libgit2/tests/resources/renames/.gitted/HEAD delete mode 100644 vendor/libgit2/tests/resources/renames/.gitted/config delete mode 100644 vendor/libgit2/tests/resources/renames/.gitted/description delete mode 100644 vendor/libgit2/tests/resources/renames/.gitted/index delete mode 100644 vendor/libgit2/tests/resources/renames/.gitted/info/exclude delete mode 100644 vendor/libgit2/tests/resources/renames/.gitted/logs/HEAD delete mode 100644 vendor/libgit2/tests/resources/renames/.gitted/logs/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/renames/.gitted/objects/03/da7ad872536bd448da8d88eb7165338bf923a7 delete mode 100644 vendor/libgit2/tests/resources/renames/.gitted/objects/17/58bdd7c16a72ff7c17d8de0c957ced3ccad645 delete mode 100644 vendor/libgit2/tests/resources/renames/.gitted/objects/19/dd32dfb1520a64e5bbaae8dce6ef423dfa2f13 delete mode 100644 vendor/libgit2/tests/resources/renames/.gitted/objects/1c/068dee5790ef1580cfc4cd670915b48d790084 delete mode 100644 vendor/libgit2/tests/resources/renames/.gitted/objects/2b/c7f351d20b53f1c72c16c4b036e491c478c49a delete mode 100644 vendor/libgit2/tests/resources/renames/.gitted/objects/31/e47d8c1fa36d7f8d537b96158e3f024de0a9f2 delete mode 100644 vendor/libgit2/tests/resources/renames/.gitted/objects/35/92953ff3ea5e8ba700c429f3aefe33c8806754 delete mode 100644 vendor/libgit2/tests/resources/renames/.gitted/objects/36/020db6cdacaa93497f31edcd8f242ff9bc366d delete mode 100644 vendor/libgit2/tests/resources/renames/.gitted/objects/3c/04741dd4b96c4ae4b00ec0f6e10c816a30aad2 delete mode 100644 vendor/libgit2/tests/resources/renames/.gitted/objects/42/10ffd5c390b21dd5483375e75288dea9ede512 delete mode 100644 vendor/libgit2/tests/resources/renames/.gitted/objects/44/4a76ed3e45b183753f49376af30da8c3fe276a delete mode 100644 vendor/libgit2/tests/resources/renames/.gitted/objects/47/184c1e7eb22abcbed2bf4ee87d4e38096f7951 delete mode 100644 vendor/libgit2/tests/resources/renames/.gitted/objects/4e/4cae3e7dd56ed74bff39526d0469e554432953 delete mode 100644 vendor/libgit2/tests/resources/renames/.gitted/objects/50/e90273af7d826ff0a95865bcd3ba8412c447d9 delete mode 100644 vendor/libgit2/tests/resources/renames/.gitted/objects/5e/26abc56a5a84d89790f45416648899cbe13109 delete mode 100644 vendor/libgit2/tests/resources/renames/.gitted/objects/61/8c6f2f8740bd6049b2fb9eb93fc15726462745 delete mode 100644 vendor/libgit2/tests/resources/renames/.gitted/objects/66/311f5cfbe7836c27510a3ba2f43e282e2c8bba delete mode 100644 vendor/libgit2/tests/resources/renames/.gitted/objects/93/f538c45a57a87eb4c1e86f91c6ee41d66c7ba7 delete mode 100644 vendor/libgit2/tests/resources/renames/.gitted/objects/9a/69d960ae94b060f56c2a8702545e2bb1abb935 delete mode 100644 vendor/libgit2/tests/resources/renames/.gitted/objects/ad/0a8e55a104ac54a8a29ed4b84b49e76837a113 delete mode 100644 vendor/libgit2/tests/resources/renames/.gitted/objects/b9/25b224cc91f897001a9993fbce169fdaa8858f delete mode 100644 vendor/libgit2/tests/resources/renames/.gitted/objects/d7/9b202de198fa61b02424b9e25e840dc75e1323 delete mode 100644 vendor/libgit2/tests/resources/renames/.gitted/objects/ea/c43f5195a2cee53b7458d8dad16aedde10711b delete mode 100644 vendor/libgit2/tests/resources/renames/.gitted/objects/ea/f4a3e3bfe68585e90cada20736ace491cd100b delete mode 100644 vendor/libgit2/tests/resources/renames/.gitted/objects/f9/0d4fc20ecddf21eebe6a37e9225d244339d2b5 delete mode 100644 vendor/libgit2/tests/resources/renames/.gitted/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/renames/.gitted/refs/heads/renames_similar delete mode 100644 vendor/libgit2/tests/resources/renames/.gitted/refs/heads/renames_similar_two delete mode 100644 vendor/libgit2/tests/resources/renames/ikeepsix.txt delete mode 100644 vendor/libgit2/tests/resources/renames/sixserving.txt delete mode 100644 vendor/libgit2/tests/resources/renames/songof7cities.txt delete mode 100644 vendor/libgit2/tests/resources/renames/untimely.txt delete mode 100644 vendor/libgit2/tests/resources/revert/.gitted/HEAD delete mode 100644 vendor/libgit2/tests/resources/revert/.gitted/config delete mode 100644 vendor/libgit2/tests/resources/revert/.gitted/index delete mode 100644 vendor/libgit2/tests/resources/revert/.gitted/info/exclude delete mode 100644 vendor/libgit2/tests/resources/revert/.gitted/objects/00/c97c9299419874a7bfc4d853d462c568e1be2d delete mode 100644 vendor/libgit2/tests/resources/revert/.gitted/objects/0a/a8c7e40d342fff78d60b29a4ba8e993ed79c51 delete mode 100644 vendor/libgit2/tests/resources/revert/.gitted/objects/0a/b09ea6d4c3634bdf6c221626d8b6f7dd890767 delete mode 100644 vendor/libgit2/tests/resources/revert/.gitted/objects/0a/d19525be6d8cae5e5deb2770fc244b65255057 delete mode 100644 vendor/libgit2/tests/resources/revert/.gitted/objects/0c/db66192ee192f70f891f05a47636057420e871 delete mode 100644 vendor/libgit2/tests/resources/revert/.gitted/objects/0f/5bfcf58c558d865da6be0281d7795993646cee delete mode 100644 vendor/libgit2/tests/resources/revert/.gitted/objects/10/10c8f4711d60d04bad16197a0f4b0d4d19c542 delete mode 100644 vendor/libgit2/tests/resources/revert/.gitted/objects/13/a6fdfd10bd74b1f258fb58801215985dd2e797 delete mode 100644 vendor/libgit2/tests/resources/revert/.gitted/objects/13/ee9cd5d8e1023c218e0e1ea684ec0c582b5050 delete mode 100644 vendor/libgit2/tests/resources/revert/.gitted/objects/15/6ef9bcb968dccec8472a0f2eff49f1a713bc6b delete mode 100644 vendor/libgit2/tests/resources/revert/.gitted/objects/18/1aab27ddb37b40d9a284fb4733497006d57091 delete mode 100644 vendor/libgit2/tests/resources/revert/.gitted/objects/1b/c915c5cb7185a9438de28a7b1a7dfe8c01ee7f delete mode 100644 vendor/libgit2/tests/resources/revert/.gitted/objects/1f/a4e069a641f10f5fb7588138b2d147fcd22c36 delete mode 100644 vendor/libgit2/tests/resources/revert/.gitted/objects/1f/f0c423042b46cb1d617b81efb715defbe8054d delete mode 100644 vendor/libgit2/tests/resources/revert/.gitted/objects/21/a96a98ed84d45866e1de6e266fd3a61a4ae9dc delete mode 100644 vendor/libgit2/tests/resources/revert/.gitted/objects/29/6a6d3be1dff05c5d1f631d2459389fa7b619eb delete mode 100644 vendor/libgit2/tests/resources/revert/.gitted/objects/2d/440f2b3147d3dc7ad1085813478d6d869d5a4d delete mode 100644 vendor/libgit2/tests/resources/revert/.gitted/objects/33/c6fd981c49a2abf2971482089350bfc5cda8ea delete mode 100644 vendor/libgit2/tests/resources/revert/.gitted/objects/39/467716290f6df775a91cdb9a4eb39295018145 delete mode 100644 vendor/libgit2/tests/resources/revert/.gitted/objects/39/9fb3aba3d9d13f7d40a9254ce4402067ef3149 delete mode 100644 vendor/libgit2/tests/resources/revert/.gitted/objects/3a/3ef367eaf3fe79effbfb0a56b269c04c2b59fe delete mode 100644 vendor/libgit2/tests/resources/revert/.gitted/objects/46/ff0854663aeb2182b9838c8da68e33ac23bc1e delete mode 100644 vendor/libgit2/tests/resources/revert/.gitted/objects/4b/8fcff56437e60f58e9a6bc630dd242ebf6ea2c delete mode 100644 vendor/libgit2/tests/resources/revert/.gitted/objects/52/c95c4264245469a0617e289a7d737f156826b4 delete mode 100644 vendor/libgit2/tests/resources/revert/.gitted/objects/55/568c8de5322ff9a95d72747a239cdb64a19965 delete mode 100644 vendor/libgit2/tests/resources/revert/.gitted/objects/55/acf326a69f0aab7a974ec53ffa55a50bcac14e delete mode 100644 vendor/libgit2/tests/resources/revert/.gitted/objects/5a/cdc74af27172ec491d213ee36cea7eb9ef2579 delete mode 100644 vendor/libgit2/tests/resources/revert/.gitted/objects/6b/ccd0dc58cea5ccff86014f3d64b31bd8c02a37 delete mode 100644 vendor/libgit2/tests/resources/revert/.gitted/objects/71/eb9c2b53dbbf3c45fb28b27c850db4b7fb8011 delete mode 100644 vendor/libgit2/tests/resources/revert/.gitted/objects/72/333f47d4e83616630ff3b0ffe4c0faebcc3c45 delete mode 100644 vendor/libgit2/tests/resources/revert/.gitted/objects/73/ec36fa120f8066963a0bc9105bb273dbd903d7 delete mode 100644 vendor/libgit2/tests/resources/revert/.gitted/objects/74/7726e021bc5f44b86de60e3032fd6f9f1b8383 delete mode 100644 vendor/libgit2/tests/resources/revert/.gitted/objects/75/ec9929465623f17ff3ad68c0438ea56faba815 delete mode 100644 vendor/libgit2/tests/resources/revert/.gitted/objects/77/31926a337c4eaba1e2187d90ebfa0a93659382 delete mode 100644 vendor/libgit2/tests/resources/revert/.gitted/objects/83/f65df4606c4f8dbf8da43de25de1b7e4c03238 delete mode 100644 vendor/libgit2/tests/resources/revert/.gitted/objects/87/59ad453cf01cf7daf14e2a668f8218f9a678eb delete mode 100644 vendor/libgit2/tests/resources/revert/.gitted/objects/8b/e77695228eadd004606af0508462457961ca4a delete mode 100644 vendor/libgit2/tests/resources/revert/.gitted/objects/8f/d40e13fff575b63e86af87175e70fa7fb92f80 delete mode 100644 vendor/libgit2/tests/resources/revert/.gitted/objects/97/e52d5e81f541080cd6b92829fb85bc4d81d90b delete mode 100644 vendor/libgit2/tests/resources/revert/.gitted/objects/97/f3574e92f1730d365fb9e00c10e3c507c1cfe9 delete mode 100644 vendor/libgit2/tests/resources/revert/.gitted/objects/9a/95fd974e03c5b93828ceedd28755965b5d5c60 delete mode 100644 vendor/libgit2/tests/resources/revert/.gitted/objects/a6/9f74efcb51634b88e04ea81273158a85257f41 delete mode 100644 vendor/libgit2/tests/resources/revert/.gitted/objects/a8/c86221b400b836010567cc3593db6e96c1a83a delete mode 100644 vendor/libgit2/tests/resources/revert/.gitted/objects/aa/7e281435d1fe6740d712f4bcc6fe89c425bedc delete mode 100644 vendor/libgit2/tests/resources/revert/.gitted/objects/ac/c4d33902092efeb3b714aa0b1007c329e2f2e6 delete mode 100644 vendor/libgit2/tests/resources/revert/.gitted/objects/b7/a55408832174c54708906a372a9be2ffe3649b delete mode 100644 vendor/libgit2/tests/resources/revert/.gitted/objects/be/ead165e017269e8dc0dd6f01195726a2e1e01b delete mode 100644 vendor/libgit2/tests/resources/revert/.gitted/objects/ce/f56612d71a6af8d8015691e4865f7fece905b5 delete mode 100644 vendor/libgit2/tests/resources/revert/.gitted/objects/d1/d403d22cbe24592d725f442835cf46fe60c8ac delete mode 100644 vendor/libgit2/tests/resources/revert/.gitted/objects/dd/9a159c89509e73fd37d6af99619994cf7dfc06 delete mode 100644 vendor/libgit2/tests/resources/revert/.gitted/objects/e3/4ef1afe54eb526fd92eec66084125f340f1d65 delete mode 100644 vendor/libgit2/tests/resources/revert/.gitted/objects/e5/f831f064adf9224d8c3ce556959d9d61b3c0a9 delete mode 100644 vendor/libgit2/tests/resources/revert/.gitted/objects/ea/392a157085bc32daccd59aa1998fe2f5fb9fc0 delete mode 100644 vendor/libgit2/tests/resources/revert/.gitted/objects/eb/b03002cee5d66c7732dd06241119fe72ab96a5 delete mode 100644 vendor/libgit2/tests/resources/revert/.gitted/objects/ee/c6adcb2f3ceca0cadeccfe01b19382252ece9b delete mode 100644 vendor/libgit2/tests/resources/revert/.gitted/objects/f4/e107c230d08a60fb419d19869f1f282b272d9c delete mode 100644 vendor/libgit2/tests/resources/revert/.gitted/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/revert/.gitted/refs/heads/merges delete mode 100644 vendor/libgit2/tests/resources/revert/.gitted/refs/heads/merges-branch delete mode 100644 vendor/libgit2/tests/resources/revert/.gitted/refs/heads/reverted-branch delete mode 100644 vendor/libgit2/tests/resources/revert/.gitted/refs/heads/two delete mode 100644 vendor/libgit2/tests/resources/revert/file1.txt delete mode 100644 vendor/libgit2/tests/resources/revert/file2.txt delete mode 100644 vendor/libgit2/tests/resources/revert/file3.txt delete mode 100644 vendor/libgit2/tests/resources/revert/file6.txt delete mode 100644 vendor/libgit2/tests/resources/shallow.git/HEAD delete mode 100644 vendor/libgit2/tests/resources/shallow.git/config delete mode 100644 vendor/libgit2/tests/resources/shallow.git/objects/pack/pack-706e49b161700946489570d96153e5be4dc31ad4.idx delete mode 100644 vendor/libgit2/tests/resources/shallow.git/objects/pack/pack-706e49b161700946489570d96153e5be4dc31ad4.pack delete mode 100644 vendor/libgit2/tests/resources/shallow.git/packed-refs delete mode 100644 vendor/libgit2/tests/resources/shallow.git/refs/.gitkeep delete mode 100644 vendor/libgit2/tests/resources/shallow.git/shallow delete mode 100644 vendor/libgit2/tests/resources/short_tag.git/HEAD delete mode 100644 vendor/libgit2/tests/resources/short_tag.git/config delete mode 100644 vendor/libgit2/tests/resources/short_tag.git/index delete mode 100644 vendor/libgit2/tests/resources/short_tag.git/objects/4a/5ed60bafcf4638b7c8356bd4ce1916bfede93c delete mode 100644 vendor/libgit2/tests/resources/short_tag.git/objects/4d/5fcadc293a348e88f777dc0920f11e7d71441c delete mode 100644 vendor/libgit2/tests/resources/short_tag.git/objects/5d/a7760512a953e3c7c4e47e4392c7a4338fb729 delete mode 100644 vendor/libgit2/tests/resources/short_tag.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 delete mode 100644 vendor/libgit2/tests/resources/short_tag.git/packed-refs delete mode 100644 vendor/libgit2/tests/resources/short_tag.git/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/status/.gitted/COMMIT_EDITMSG delete mode 100644 vendor/libgit2/tests/resources/status/.gitted/HEAD delete mode 100644 vendor/libgit2/tests/resources/status/.gitted/ORIG_HEAD delete mode 100644 vendor/libgit2/tests/resources/status/.gitted/config delete mode 100644 vendor/libgit2/tests/resources/status/.gitted/description delete mode 100644 vendor/libgit2/tests/resources/status/.gitted/index delete mode 100644 vendor/libgit2/tests/resources/status/.gitted/info/exclude delete mode 100644 vendor/libgit2/tests/resources/status/.gitted/logs/HEAD delete mode 100644 vendor/libgit2/tests/resources/status/.gitted/logs/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/status/.gitted/objects/00/17bd4ab1ec30440b17bae1680cff124ab5f1f6 delete mode 100644 vendor/libgit2/tests/resources/status/.gitted/objects/06/1d42a44cacde5726057b67558821d95db96f19 delete mode 100644 vendor/libgit2/tests/resources/status/.gitted/objects/18/88c805345ba265b0ee9449b8877b6064592058 delete mode 100644 vendor/libgit2/tests/resources/status/.gitted/objects/19/d9cc8584ac2c7dcf57d2680375e80f099dc481 delete mode 100644 vendor/libgit2/tests/resources/status/.gitted/objects/26/a125ee1bfc5df1e1b2e9441bbe63c8a7ae989f delete mode 100644 vendor/libgit2/tests/resources/status/.gitted/objects/2b/d0a343aeef7a2cf0d158478966a6e587ff3863 delete mode 100644 vendor/libgit2/tests/resources/status/.gitted/objects/32/504b727382542f9f089e24fddac5e78533e96c delete mode 100644 vendor/libgit2/tests/resources/status/.gitted/objects/37/fcb02ccc1a85d1941e7f106d52dc3702dcf0d0 delete mode 100644 vendor/libgit2/tests/resources/status/.gitted/objects/45/2e4244b5d083ddf0460acf1ecc74db9dcfa11a delete mode 100644 vendor/libgit2/tests/resources/status/.gitted/objects/52/9a16e8e762d4acb7b9636ff540a00831f9155a delete mode 100644 vendor/libgit2/tests/resources/status/.gitted/objects/53/ace0d1cc1145a5f4fe4f78a186a60263190733 delete mode 100644 vendor/libgit2/tests/resources/status/.gitted/objects/54/52d32f1dd538eb0405e8a83cc185f79e25e80f delete mode 100644 vendor/libgit2/tests/resources/status/.gitted/objects/55/d316c9ba708999f1918e9677d01dfcae69c6b9 delete mode 100644 vendor/libgit2/tests/resources/status/.gitted/objects/70/bd9443ada07063e7fbf0b3ff5c13f7494d89c2 delete mode 100644 vendor/libgit2/tests/resources/status/.gitted/objects/73/5b6a258cd196a8f7c9428419b02c1dca93fd75 delete mode 100644 vendor/libgit2/tests/resources/status/.gitted/objects/75/6e27627e67bfbc048d01ece5819c6de733d7ea delete mode 100644 vendor/libgit2/tests/resources/status/.gitted/objects/90/6ee7711f4f4928ddcb2a5f8fbc500deba0d2a8 delete mode 100644 vendor/libgit2/tests/resources/status/.gitted/objects/90/b8c29d8ba39434d1c63e1b093daaa26e5bd972 delete mode 100644 vendor/libgit2/tests/resources/status/.gitted/objects/9c/2e02cdffa8d73e6c189074594477a6baf87960 delete mode 100644 vendor/libgit2/tests/resources/status/.gitted/objects/a0/de7e0ac200c489c41c59dfa910154a70264e6e delete mode 100644 vendor/libgit2/tests/resources/status/.gitted/objects/a6/191982709b746d5650e93c2acf34ef74e11504 delete mode 100644 vendor/libgit2/tests/resources/status/.gitted/objects/a6/be623522ce87a1d862128ac42672604f7b468b delete mode 100644 vendor/libgit2/tests/resources/status/.gitted/objects/aa/27a641456848200fdb7f7c99ba36f8a0952877 delete mode 100644 vendor/libgit2/tests/resources/status/.gitted/objects/d4/27e0b2e138501a3d15cc376077a3631e15bd46 delete mode 100644 vendor/libgit2/tests/resources/status/.gitted/objects/da/bc8af9bd6e9f5bbe96a176f1a24baf3d1f8916 delete mode 100644 vendor/libgit2/tests/resources/status/.gitted/objects/e8/ee89e15bbe9b20137715232387b3de5b28972e delete mode 100644 vendor/libgit2/tests/resources/status/.gitted/objects/e9/b9107f290627c04d097733a10055af941f6bca delete mode 100644 vendor/libgit2/tests/resources/status/.gitted/objects/ed/062903b8f6f3dccb2fa81117ba6590944ef9bd delete mode 100644 vendor/libgit2/tests/resources/status/.gitted/objects/ee/3fa1b8c00aff7fe02065fdb50864bb0d932ccf delete mode 100644 vendor/libgit2/tests/resources/status/.gitted/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/status/current_file delete mode 100644 vendor/libgit2/tests/resources/status/ignored_file delete mode 100644 vendor/libgit2/tests/resources/status/modified_file delete mode 100644 vendor/libgit2/tests/resources/status/new_file delete mode 100644 vendor/libgit2/tests/resources/status/staged_changes delete mode 100644 vendor/libgit2/tests/resources/status/staged_changes_modified_file delete mode 100644 vendor/libgit2/tests/resources/status/staged_delete_modified_file delete mode 100644 vendor/libgit2/tests/resources/status/staged_new_file delete mode 100644 vendor/libgit2/tests/resources/status/staged_new_file_modified_file delete mode 100644 vendor/libgit2/tests/resources/status/subdir.txt delete mode 100644 vendor/libgit2/tests/resources/status/subdir/current_file delete mode 100644 vendor/libgit2/tests/resources/status/subdir/modified_file delete mode 100644 vendor/libgit2/tests/resources/status/subdir/new_file delete mode 100644 "vendor/libgit2/tests/resources/status/\350\277\231" delete mode 100644 vendor/libgit2/tests/resources/sub.git/HEAD delete mode 100644 vendor/libgit2/tests/resources/sub.git/config delete mode 100644 vendor/libgit2/tests/resources/sub.git/index delete mode 100644 vendor/libgit2/tests/resources/sub.git/logs/HEAD delete mode 100644 vendor/libgit2/tests/resources/sub.git/logs/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/sub.git/objects/10/ddd6d257e01349d514541981aeecea6b2e741d delete mode 100644 vendor/libgit2/tests/resources/sub.git/objects/17/6a458f94e0ea5272ce67c36bf30b6be9caf623 delete mode 100644 vendor/libgit2/tests/resources/sub.git/objects/94/c7d78d85c933d1d95b56bc2de01833ba8559fb delete mode 100644 vendor/libgit2/tests/resources/sub.git/objects/b7/a59b3f4ea13b985f8a1e0d3757d5cd3331add8 delete mode 100644 vendor/libgit2/tests/resources/sub.git/objects/d0/ee23c41b28746d7e822511d7838bce784ae773 delete mode 100644 vendor/libgit2/tests/resources/sub.git/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/HEAD delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/config delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/description delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/index delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/info/exclude delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/logs/HEAD delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/logs/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/HEAD delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/config delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/description delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/index delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/info/exclude delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/logs/HEAD delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/logs/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/logs/refs/remotes/origin/HEAD delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/objects/06/362fe2fdb7010d0e447b4fb450d405420479a1 delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/objects/0e/6a3ca48bd47cfe67681acf39aa0b10a0b92484 delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/objects/17/d0ece6e96460a06592d9d9d000de37ba4232c5 delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/objects/41/bd4bc3df978de695f67ace64c560913da11653 delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/objects/48/0095882d281ed676fe5b863569520e54a7d5c0 delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/objects/5e/4963595a9774b90524d35a807169049de8ccad delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/objects/6b/31c659545507c381e9cd34ec508f16c04e149e delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/objects/73/ba924a80437097795ae839e66e187c55d3babf delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/objects/78/0d7397f5e8f8f477fb55b7af3accc2154b2d4a delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/objects/78/9efbdadaa4a582778d4584385495559ea0994b delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/objects/88/34b635dd468a83cb012f6feace968c1c9f5d6e delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/objects/d0/5f2cd5cc77addf68ed6f50d622c9a4f732e6c5 delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/packed-refs delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/refs/remotes/origin/HEAD delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/HEAD delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/config delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/description delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/index delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/info/exclude delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/logs/HEAD delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/logs/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/logs/refs/remotes/origin/HEAD delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/objects/06/362fe2fdb7010d0e447b4fb450d405420479a1 delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/objects/0e/6a3ca48bd47cfe67681acf39aa0b10a0b92484 delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/objects/17/d0ece6e96460a06592d9d9d000de37ba4232c5 delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/objects/41/bd4bc3df978de695f67ace64c560913da11653 delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/objects/48/0095882d281ed676fe5b863569520e54a7d5c0 delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/objects/5e/4963595a9774b90524d35a807169049de8ccad delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/objects/6b/31c659545507c381e9cd34ec508f16c04e149e delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/objects/73/ba924a80437097795ae839e66e187c55d3babf delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/objects/78/0d7397f5e8f8f477fb55b7af3accc2154b2d4a delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/objects/78/9efbdadaa4a582778d4584385495559ea0994b delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/objects/88/34b635dd468a83cb012f6feace968c1c9f5d6e delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/objects/d0/5f2cd5cc77addf68ed6f50d622c9a4f732e6c5 delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/packed-refs delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/refs/remotes/origin/HEAD delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/COMMIT_EDITMSG delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/HEAD delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/config delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/description delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/index delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/info/exclude delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/logs/HEAD delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/logs/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/logs/refs/remotes/origin/HEAD delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/objects/06/362fe2fdb7010d0e447b4fb450d405420479a1 delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/objects/0e/6a3ca48bd47cfe67681acf39aa0b10a0b92484 delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/objects/17/d0ece6e96460a06592d9d9d000de37ba4232c5 delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/objects/3d/9386c507f6b093471a3e324085657a3c2b4247 delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/objects/41/bd4bc3df978de695f67ace64c560913da11653 delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/objects/48/0095882d281ed676fe5b863569520e54a7d5c0 delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/objects/5e/4963595a9774b90524d35a807169049de8ccad delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/objects/6b/31c659545507c381e9cd34ec508f16c04e149e delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/objects/73/ba924a80437097795ae839e66e187c55d3babf delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/objects/77/fb0ed3e58568d6ad362c78de08ab8649d76e29 delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/objects/78/0d7397f5e8f8f477fb55b7af3accc2154b2d4a delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/objects/78/9efbdadaa4a582778d4584385495559ea0994b delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/objects/88/34b635dd468a83cb012f6feace968c1c9f5d6e delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/objects/8e/b1e637ed9fc8e5454fa20d38f809091f9395f4 delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/objects/d0/5f2cd5cc77addf68ed6f50d622c9a4f732e6c5 delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/packed-refs delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/refs/remotes/origin/HEAD delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/HEAD delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/config delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/description delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/index delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/info/exclude delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/logs/HEAD delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/logs/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/logs/refs/remotes/origin/HEAD delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/objects/06/362fe2fdb7010d0e447b4fb450d405420479a1 delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/objects/0e/6a3ca48bd47cfe67681acf39aa0b10a0b92484 delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/objects/17/d0ece6e96460a06592d9d9d000de37ba4232c5 delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/objects/41/bd4bc3df978de695f67ace64c560913da11653 delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/objects/48/0095882d281ed676fe5b863569520e54a7d5c0 delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/objects/5e/4963595a9774b90524d35a807169049de8ccad delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/objects/6b/31c659545507c381e9cd34ec508f16c04e149e delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/objects/73/ba924a80437097795ae839e66e187c55d3babf delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/objects/78/0d7397f5e8f8f477fb55b7af3accc2154b2d4a delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/objects/78/9efbdadaa4a582778d4584385495559ea0994b delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/objects/88/34b635dd468a83cb012f6feace968c1c9f5d6e delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/objects/a0/2d31770687965547ab7a04cee199b29ee458d6 delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/objects/d0/5f2cd5cc77addf68ed6f50d622c9a4f732e6c5 delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/packed-refs delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/refs/remotes/origin/HEAD delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/HEAD delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/config delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/description delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/index delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/info/exclude delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/logs/HEAD delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/logs/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/logs/refs/remotes/origin/HEAD delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/objects/06/362fe2fdb7010d0e447b4fb450d405420479a1 delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/objects/0e/6a3ca48bd47cfe67681acf39aa0b10a0b92484 delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/objects/17/d0ece6e96460a06592d9d9d000de37ba4232c5 delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/objects/41/bd4bc3df978de695f67ace64c560913da11653 delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/objects/48/0095882d281ed676fe5b863569520e54a7d5c0 delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/objects/5e/4963595a9774b90524d35a807169049de8ccad delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/objects/6b/31c659545507c381e9cd34ec508f16c04e149e delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/objects/73/ba924a80437097795ae839e66e187c55d3babf delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/objects/78/0d7397f5e8f8f477fb55b7af3accc2154b2d4a delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/objects/78/9efbdadaa4a582778d4584385495559ea0994b delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/objects/88/34b635dd468a83cb012f6feace968c1c9f5d6e delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/objects/d0/5f2cd5cc77addf68ed6f50d622c9a4f732e6c5 delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/packed-refs delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/refs/remotes/origin/HEAD delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_missing_commits/HEAD delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_missing_commits/config delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_missing_commits/description delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_missing_commits/index delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_missing_commits/info/exclude delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_missing_commits/logs/HEAD delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_missing_commits/logs/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_missing_commits/logs/refs/remotes/origin/HEAD delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_missing_commits/objects/06/362fe2fdb7010d0e447b4fb450d405420479a1 delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_missing_commits/objects/0e/6a3ca48bd47cfe67681acf39aa0b10a0b92484 delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_missing_commits/objects/17/d0ece6e96460a06592d9d9d000de37ba4232c5 delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_missing_commits/objects/41/bd4bc3df978de695f67ace64c560913da11653 delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_missing_commits/objects/5e/4963595a9774b90524d35a807169049de8ccad delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_missing_commits/objects/6b/31c659545507c381e9cd34ec508f16c04e149e delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_missing_commits/objects/78/0d7397f5e8f8f477fb55b7af3accc2154b2d4a delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_missing_commits/objects/88/34b635dd468a83cb012f6feace968c1c9f5d6e delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_missing_commits/objects/d0/5f2cd5cc77addf68ed6f50d622c9a4f732e6c5 delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_missing_commits/packed-refs delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_missing_commits/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_missing_commits/refs/remotes/origin/HEAD delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/HEAD delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/config delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/description delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/index delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/info/exclude delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/logs/HEAD delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/logs/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/logs/refs/remotes/origin/HEAD delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/objects/06/362fe2fdb7010d0e447b4fb450d405420479a1 delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/objects/0e/6a3ca48bd47cfe67681acf39aa0b10a0b92484 delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/objects/17/d0ece6e96460a06592d9d9d000de37ba4232c5 delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/objects/41/bd4bc3df978de695f67ace64c560913da11653 delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/objects/48/0095882d281ed676fe5b863569520e54a7d5c0 delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/objects/5e/4963595a9774b90524d35a807169049de8ccad delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/objects/6b/31c659545507c381e9cd34ec508f16c04e149e delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/objects/73/ba924a80437097795ae839e66e187c55d3babf delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/objects/78/0d7397f5e8f8f477fb55b7af3accc2154b2d4a delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/objects/78/9efbdadaa4a582778d4584385495559ea0994b delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/objects/88/34b635dd468a83cb012f6feace968c1c9f5d6e delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/objects/d0/5f2cd5cc77addf68ed6f50d622c9a4f732e6c5 delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/packed-refs delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/refs/remotes/origin/HEAD delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/objects/09/460e5b6cbcb05a3e404593c32a3aa7221eca0e delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/objects/14/fe9ccf104058df25e0a08361c4494e167ef243 delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/objects/22/ce3e0311dda73a5992d54a4a595518d3876ea7 delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/objects/25/5546424b0efb847b1bfc91dbf7348b277f8970 delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/objects/2a/30f1e6f94b20917005a21273f65b406d0f8bad delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/objects/42/cfb95cd01bf9225b659b5ee3edcc78e8eeb478 delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/objects/57/958699c2dc394f81cfc76950e9c3ac3025c398 delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/objects/59/01da4f1c67756eeadc5121d206bec2431f253b delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/objects/60/7d96653d4d0a4f733107f7890c2e67b55b620d delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/objects/74/84482eb8db738cafa696993664607500a3f2b9 delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/objects/7b/a4c5c3561daa5ab1a86215cfb0587e96d404d6 delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/objects/87/3585b94bdeabccea991ea5e3ec1a277895b698 delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/objects/97/4cf7c73de336b0c4e019f918f3cee367d72e84 delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/objects/9d/bc299bc013ea253583b40bf327b5a6e4037b89 delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/objects/a9/104bf89e911387244ef499413960ba472066d9 delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/objects/b6/14088620bbdc1d29549d223ceba0f4419fd4cb delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/objects/d4/07f19e50c1da1ff584beafe0d6dac7237c5d06 delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/objects/d9/3e95571d92cceb5de28c205f1d5f3cc8b88bc8 delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/objects/e3/b83bf274ee065eee48734cf8c6dfaf5e81471c delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/objects/f5/4414c25e6d24fe39f5c3f128d7c8a17bc23833 delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/objects/f9/90a25a74d1a8281ce2ab018ea8df66795cd60b delete mode 100644 vendor/libgit2/tests/resources/submod2/.gitted/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/submod2/README.txt delete mode 100644 vendor/libgit2/tests/resources/submod2/gitmodules delete mode 100644 vendor/libgit2/tests/resources/submod2/just_a_dir/contents delete mode 100644 vendor/libgit2/tests/resources/submod2/just_a_file delete mode 100644 vendor/libgit2/tests/resources/submod2/not-submodule/.gitted/HEAD delete mode 100644 vendor/libgit2/tests/resources/submod2/not-submodule/.gitted/config delete mode 100644 vendor/libgit2/tests/resources/submod2/not-submodule/.gitted/description delete mode 100644 vendor/libgit2/tests/resources/submod2/not-submodule/.gitted/index delete mode 100644 vendor/libgit2/tests/resources/submod2/not-submodule/.gitted/info/exclude delete mode 100644 vendor/libgit2/tests/resources/submod2/not-submodule/.gitted/logs/HEAD delete mode 100644 vendor/libgit2/tests/resources/submod2/not-submodule/.gitted/logs/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/submod2/not-submodule/.gitted/objects/68/e92c611b80ee1ed8f38314ff9577f0d15b2444 delete mode 100644 vendor/libgit2/tests/resources/submod2/not-submodule/.gitted/objects/71/ff9927d7c8a5639e062c38a7d35c433c424627 delete mode 100644 vendor/libgit2/tests/resources/submod2/not-submodule/.gitted/objects/f0/1d56b18efd353ef2bb93a4585d590a0847195e delete mode 100644 vendor/libgit2/tests/resources/submod2/not-submodule/.gitted/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/submod2/not-submodule/README.txt delete mode 100644 vendor/libgit2/tests/resources/submod2/not/.gitted/notempty delete mode 100644 vendor/libgit2/tests/resources/submod2/not/README.txt delete mode 100644 vendor/libgit2/tests/resources/submod2/sm_added_and_uncommited/.gitted delete mode 100644 vendor/libgit2/tests/resources/submod2/sm_added_and_uncommited/README.txt delete mode 100644 vendor/libgit2/tests/resources/submod2/sm_added_and_uncommited/file_to_modify delete mode 100644 vendor/libgit2/tests/resources/submod2/sm_changed_file/.gitted delete mode 100644 vendor/libgit2/tests/resources/submod2/sm_changed_file/README.txt delete mode 100644 vendor/libgit2/tests/resources/submod2/sm_changed_file/file_to_modify delete mode 100644 vendor/libgit2/tests/resources/submod2/sm_changed_head/.gitted delete mode 100644 vendor/libgit2/tests/resources/submod2/sm_changed_head/README.txt delete mode 100644 vendor/libgit2/tests/resources/submod2/sm_changed_head/file_to_modify delete mode 100644 vendor/libgit2/tests/resources/submod2/sm_changed_index/.gitted delete mode 100644 vendor/libgit2/tests/resources/submod2/sm_changed_index/README.txt delete mode 100644 vendor/libgit2/tests/resources/submod2/sm_changed_index/file_to_modify delete mode 100644 vendor/libgit2/tests/resources/submod2/sm_changed_untracked_file/.gitted delete mode 100644 vendor/libgit2/tests/resources/submod2/sm_changed_untracked_file/README.txt delete mode 100644 vendor/libgit2/tests/resources/submod2/sm_changed_untracked_file/file_to_modify delete mode 100644 vendor/libgit2/tests/resources/submod2/sm_changed_untracked_file/i_am_untracked delete mode 100644 vendor/libgit2/tests/resources/submod2/sm_missing_commits/.gitted delete mode 100644 vendor/libgit2/tests/resources/submod2/sm_missing_commits/README.txt delete mode 100644 vendor/libgit2/tests/resources/submod2/sm_missing_commits/file_to_modify delete mode 100644 vendor/libgit2/tests/resources/submod2/sm_unchanged/.gitted delete mode 100644 vendor/libgit2/tests/resources/submod2/sm_unchanged/README.txt delete mode 100644 vendor/libgit2/tests/resources/submod2/sm_unchanged/file_to_modify delete mode 100644 vendor/libgit2/tests/resources/submod2_target/.gitted/HEAD delete mode 100644 vendor/libgit2/tests/resources/submod2_target/.gitted/config delete mode 100644 vendor/libgit2/tests/resources/submod2_target/.gitted/description delete mode 100644 vendor/libgit2/tests/resources/submod2_target/.gitted/index delete mode 100644 vendor/libgit2/tests/resources/submod2_target/.gitted/info/exclude delete mode 100644 vendor/libgit2/tests/resources/submod2_target/.gitted/logs/HEAD delete mode 100644 vendor/libgit2/tests/resources/submod2_target/.gitted/logs/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/submod2_target/.gitted/objects/06/362fe2fdb7010d0e447b4fb450d405420479a1 delete mode 100644 vendor/libgit2/tests/resources/submod2_target/.gitted/objects/0e/6a3ca48bd47cfe67681acf39aa0b10a0b92484 delete mode 100644 vendor/libgit2/tests/resources/submod2_target/.gitted/objects/17/d0ece6e96460a06592d9d9d000de37ba4232c5 delete mode 100644 vendor/libgit2/tests/resources/submod2_target/.gitted/objects/41/bd4bc3df978de695f67ace64c560913da11653 delete mode 100644 vendor/libgit2/tests/resources/submod2_target/.gitted/objects/48/0095882d281ed676fe5b863569520e54a7d5c0 delete mode 100644 vendor/libgit2/tests/resources/submod2_target/.gitted/objects/5e/4963595a9774b90524d35a807169049de8ccad delete mode 100644 vendor/libgit2/tests/resources/submod2_target/.gitted/objects/6b/31c659545507c381e9cd34ec508f16c04e149e delete mode 100644 vendor/libgit2/tests/resources/submod2_target/.gitted/objects/73/ba924a80437097795ae839e66e187c55d3babf delete mode 100644 vendor/libgit2/tests/resources/submod2_target/.gitted/objects/78/0d7397f5e8f8f477fb55b7af3accc2154b2d4a delete mode 100644 vendor/libgit2/tests/resources/submod2_target/.gitted/objects/78/9efbdadaa4a582778d4584385495559ea0994b delete mode 100644 vendor/libgit2/tests/resources/submod2_target/.gitted/objects/88/34b635dd468a83cb012f6feace968c1c9f5d6e delete mode 100644 vendor/libgit2/tests/resources/submod2_target/.gitted/objects/d0/5f2cd5cc77addf68ed6f50d622c9a4f732e6c5 delete mode 100644 vendor/libgit2/tests/resources/submod2_target/.gitted/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/submod2_target/README.txt delete mode 100644 vendor/libgit2/tests/resources/submod2_target/file_to_modify delete mode 100644 vendor/libgit2/tests/resources/submodule_simple/.gitmodules delete mode 100644 vendor/libgit2/tests/resources/submodule_simple/.gitted/HEAD delete mode 100644 vendor/libgit2/tests/resources/submodule_simple/.gitted/config delete mode 100644 vendor/libgit2/tests/resources/submodule_simple/.gitted/description delete mode 100644 vendor/libgit2/tests/resources/submodule_simple/.gitted/index delete mode 100644 vendor/libgit2/tests/resources/submodule_simple/.gitted/objects/22/9cea838964f435d4fc2c11561ddb7447003609 delete mode 100644 vendor/libgit2/tests/resources/submodule_simple/.gitted/objects/5b/19f7523fbf55c96153ff5a94875583f1115a36 delete mode 100644 vendor/libgit2/tests/resources/submodule_simple/.gitted/objects/a8/575e6aaececba78823993e4f11abbc6172aabd delete mode 100644 vendor/libgit2/tests/resources/submodule_simple/.gitted/objects/b4/f28943fad380f4ee3a9c6b95259b28204cc25a delete mode 100644 vendor/libgit2/tests/resources/submodule_simple/.gitted/objects/d6/9ff504a3ba631f2fdb35bff93cc8cb8e85f4f8 delete mode 100644 vendor/libgit2/tests/resources/submodule_simple/.gitted/packed-refs delete mode 100644 vendor/libgit2/tests/resources/submodule_simple/.gitted/refs/heads/alternate_1 delete mode 100644 vendor/libgit2/tests/resources/submodule_simple/.gitted/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/submodule_with_path/.gitmodules delete mode 100644 vendor/libgit2/tests/resources/submodule_with_path/.gitted/HEAD delete mode 100644 vendor/libgit2/tests/resources/submodule_with_path/.gitted/config delete mode 100644 vendor/libgit2/tests/resources/submodule_with_path/.gitted/index delete mode 100644 vendor/libgit2/tests/resources/submodule_with_path/.gitted/objects/18/372280a56a54340fa600aa91315065c6c4c693 delete mode 100644 vendor/libgit2/tests/resources/submodule_with_path/.gitted/objects/36/683131578275f6a8fd1c539e0d5da0d8adff26 delete mode 100644 vendor/libgit2/tests/resources/submodule_with_path/.gitted/objects/89/ca686bb21bfb75dda99a02313831a0c418f921 delete mode 100644 vendor/libgit2/tests/resources/submodule_with_path/.gitted/objects/b1/620ef2628d10416a84d19c783e33dc4556c9c3 delete mode 100644 vendor/libgit2/tests/resources/submodule_with_path/.gitted/objects/ba/34c47dc9d3d0b1bb335b45c9d26ba1f0fc90c7 delete mode 100644 vendor/libgit2/tests/resources/submodule_with_path/.gitted/objects/c8/4bf57ba2254dba216ab5c6eb1a19fe8bd0e0d6 delete mode 100644 vendor/libgit2/tests/resources/submodule_with_path/.gitted/objects/d5/45fc6b40ec9e67332b6a1d2dedcbdb1bffeb6b delete mode 100644 vendor/libgit2/tests/resources/submodule_with_path/.gitted/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/submodules/.gitted/HEAD delete mode 100644 vendor/libgit2/tests/resources/submodules/.gitted/config delete mode 100644 vendor/libgit2/tests/resources/submodules/.gitted/description delete mode 100644 vendor/libgit2/tests/resources/submodules/.gitted/index delete mode 100644 vendor/libgit2/tests/resources/submodules/.gitted/info/exclude delete mode 100644 vendor/libgit2/tests/resources/submodules/.gitted/info/refs delete mode 100644 vendor/libgit2/tests/resources/submodules/.gitted/logs/HEAD delete mode 100644 vendor/libgit2/tests/resources/submodules/.gitted/logs/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/submodules/.gitted/objects/26/a3b32a9b7d97486c5557f5902e8ac94638145e delete mode 100644 vendor/libgit2/tests/resources/submodules/.gitted/objects/78/308c9251cf4eee8b25a76c7d2790c73d797357 delete mode 100644 vendor/libgit2/tests/resources/submodules/.gitted/objects/97/896810b3210244a62a82458b8e0819ecfc6850 delete mode 100644 vendor/libgit2/tests/resources/submodules/.gitted/objects/b6/0fd986699ba4e9e68bea07cf8e793f323ef888 delete mode 100644 vendor/libgit2/tests/resources/submodules/.gitted/objects/d5/f7fc3f74f7dec08280f370a975b112e8f60818 delete mode 100644 vendor/libgit2/tests/resources/submodules/.gitted/objects/e3/50052cc767cd1fcb37e84e9a89e701925be4ae delete mode 100644 vendor/libgit2/tests/resources/submodules/.gitted/objects/info/packs delete mode 100644 vendor/libgit2/tests/resources/submodules/.gitted/objects/pack/pack-b69d04bb39ac274669e2184e45bd90015d02ef5b.idx delete mode 100644 vendor/libgit2/tests/resources/submodules/.gitted/objects/pack/pack-b69d04bb39ac274669e2184e45bd90015d02ef5b.pack delete mode 100644 vendor/libgit2/tests/resources/submodules/.gitted/packed-refs delete mode 100644 vendor/libgit2/tests/resources/submodules/.gitted/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/submodules/added delete mode 100644 vendor/libgit2/tests/resources/submodules/gitmodules delete mode 100644 vendor/libgit2/tests/resources/submodules/ignored delete mode 100644 vendor/libgit2/tests/resources/submodules/modified delete mode 100644 vendor/libgit2/tests/resources/submodules/testrepo/.gitted/HEAD delete mode 100644 vendor/libgit2/tests/resources/submodules/testrepo/.gitted/config delete mode 100644 vendor/libgit2/tests/resources/submodules/testrepo/.gitted/description delete mode 100644 vendor/libgit2/tests/resources/submodules/testrepo/.gitted/index delete mode 100644 vendor/libgit2/tests/resources/submodules/testrepo/.gitted/info/exclude delete mode 100644 vendor/libgit2/tests/resources/submodules/testrepo/.gitted/logs/HEAD delete mode 100644 vendor/libgit2/tests/resources/submodules/testrepo/.gitted/logs/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/13/85f264afb75a56a5bec74243be9b367ba4ca08 delete mode 100644 vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/18/1037049a54a1eb5fab404658a3a250b44335d7 delete mode 100644 vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/18/10dff58d8a660512d4832e740f692884338ccd delete mode 100644 vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/1f/67fc4386b2d171e0d21be1c447e12660561f9b delete mode 100644 vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/27/0b8ea76056d5cad83af921837702d3e3c2924d delete mode 100644 vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/32/59a6bd5b57fb9c1281bb7ed3167b50f224cb54 delete mode 100644 vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/36/97d64be941a53d4ae8f6a271e4e3fa56b022cc delete mode 100644 vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/45/b983be36b73c0788dc9cbcb76cbb80fc7bb057 delete mode 100644 vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/4a/202b346bb0fb0db7eff3cffeb3c70babbd2045 delete mode 100644 vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/5b/5b025afb0b4c913b4c338a42934a3863bf3644 delete mode 100644 vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/75/057dd4114e74cca1d750d0aee1647c903cb60a delete mode 100644 vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/76/3d71aadf09a7951596c9746c024e7eece7c7af delete mode 100644 vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/7b/4384978d2493e851f9cca7858815fac9b10980 delete mode 100644 vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/81/4889a078c031f61ed08ab5fa863aea9314344d delete mode 100644 vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/84/96071c1b46c854b31185ea97743be6a8774479 delete mode 100644 vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/94/4c0f6e4dfa41595e6eb3ceecdb14f50fe18162 delete mode 100644 vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/9a/03079b8a8ee85a0bee58bf9be3da8b62414ed4 delete mode 100644 vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/9f/d738e8f7967c078dceed8190330fc8648ee56a delete mode 100644 vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/a4/a7dce85cf63874e984719f4fdd239f5145052f delete mode 100644 vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/a6/5fedf39aefe402d3bb6e24df4d4f5fe4547750 delete mode 100644 vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/a7/1586c1dfe8a71c6cbf6c129f404c5642ff31bd delete mode 100644 vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/a8/233120f6ad708f843d861ce2b7228ec4e3dec6 delete mode 100644 vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/ae/90f12eea699729ed24555e40b9fd669da12a12 delete mode 100644 vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/b2/5fa35b38051e4ae45d4222e795f9df2e43f1d1 delete mode 100644 vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/b6/361fc6a97178d8fc8639fdeed71c775ab52593 delete mode 100644 vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/be/3563ae3f795b2b4353bcce3a527ad0a4f7f644 delete mode 100644 vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/c4/7800c7266a2be04c571c04d5a6614691ea99bd delete mode 100644 vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/d6/c93164c249c8000205dd4ec5cbca1b516d487f delete mode 100644 vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 delete mode 100644 vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/e7/b4ad382349ff96dd8199000580b9b1e2042eb0 delete mode 100644 vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/f1/425cef211cc08caa31e7b545ffb232acb098c3 delete mode 100644 vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/f6/0079018b664e4e79329a7ef9559c8d9e0378d1 delete mode 100644 vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/fa/49b077972391ad58037050f2a75f74e3671e92 delete mode 100644 vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/fd/093bff70906175335656e6ce6ae05783708765 delete mode 100644 vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/pack/pack-a81e489679b7d3418f9ab594bda8ceb37dd4c695.idx delete mode 100644 vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/pack/pack-a81e489679b7d3418f9ab594bda8ceb37dd4c695.pack delete mode 100644 vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/pack/pack-d7c6adf9f61318f041845b01440d09aa7a91e1b5.idx delete mode 100644 vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/pack/pack-d7c6adf9f61318f041845b01440d09aa7a91e1b5.pack delete mode 100644 vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/pack/pack-d85f5d483273108c9d8dd0e4728ccf0b2982423a.idx delete mode 100644 vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/pack/pack-d85f5d483273108c9d8dd0e4728ccf0b2982423a.pack delete mode 100644 vendor/libgit2/tests/resources/submodules/testrepo/.gitted/packed-refs delete mode 100644 vendor/libgit2/tests/resources/submodules/testrepo/.gitted/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/submodules/testrepo/.gitted/refs/remotes/origin/HEAD delete mode 100644 vendor/libgit2/tests/resources/submodules/testrepo/README delete mode 100644 vendor/libgit2/tests/resources/submodules/testrepo/branch_file.txt delete mode 100644 vendor/libgit2/tests/resources/submodules/testrepo/new.txt delete mode 100644 vendor/libgit2/tests/resources/submodules/unmodified delete mode 100644 vendor/libgit2/tests/resources/submodules/untracked delete mode 100644 vendor/libgit2/tests/resources/super/.gitted/COMMIT_EDITMSG delete mode 100644 vendor/libgit2/tests/resources/super/.gitted/HEAD delete mode 100644 vendor/libgit2/tests/resources/super/.gitted/config delete mode 100644 vendor/libgit2/tests/resources/super/.gitted/index delete mode 100644 vendor/libgit2/tests/resources/super/.gitted/objects/51/589c218bf77a8da9e9d8dbc097d76a742726c4 delete mode 100644 vendor/libgit2/tests/resources/super/.gitted/objects/79/d0d58ca6aa1688a073d280169908454cad5b91 delete mode 100644 vendor/libgit2/tests/resources/super/.gitted/objects/d7/57768b570a83e80d02edcc1032db14573e5034 delete mode 100644 vendor/libgit2/tests/resources/super/.gitted/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/super/gitmodules delete mode 100644 vendor/libgit2/tests/resources/template/branches/.gitignore delete mode 100644 vendor/libgit2/tests/resources/template/description delete mode 100755 vendor/libgit2/tests/resources/template/hooks/update.sample delete mode 100644 vendor/libgit2/tests/resources/template/info/exclude delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/FETCH_HEAD delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/HEAD delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/HEAD_TRACKER delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/config delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/index delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/logs/HEAD delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/logs/refs/heads/br2 delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/logs/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/logs/refs/heads/not-good delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/logs/refs/remotes/origin/HEAD delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/logs/refs/remotes/test/master delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/objects/08/b041783f40edfe12bb406c9c9a8a040177c125 delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/objects/13/85f264afb75a56a5bec74243be9b367ba4ca08 delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/objects/18/1037049a54a1eb5fab404658a3a250b44335d7 delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/objects/18/10dff58d8a660512d4832e740f692884338ccd delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/objects/1a/443023183e3f2bfbef8ac923cd81c1018a18fd delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/objects/1b/8cbad43e867676df601306689fe7c3def5e689 delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/objects/1f/67fc4386b2d171e0d21be1c447e12660561f9b delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/objects/25/8f0e2a959a364e40ed6603d5d44fbb24765b10 delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/objects/27/0b8ea76056d5cad83af921837702d3e3c2924d delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/objects/2d/59075e0681f540482d4f6223a68e0fef790bc7 delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/objects/32/59a6bd5b57fb9c1281bb7ed3167b50f224cb54 delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/objects/36/97d64be941a53d4ae8f6a271e4e3fa56b022cc delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/objects/45/b983be36b73c0788dc9cbcb76cbb80fc7bb057 delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/objects/4a/202b346bb0fb0db7eff3cffeb3c70babbd2045 delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/objects/4a/23e2e65ad4e31c4c9db7dc746650bfad082679 delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/objects/4b/22b35d44b5a4f589edf3dc89196399771796ea delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/objects/52/1d87c1ec3aef9824daf6d96cc0ae3710766d91 delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/objects/5b/5b025afb0b4c913b4c338a42934a3863bf3644 delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/objects/75/057dd4114e74cca1d750d0aee1647c903cb60a delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/objects/76/3d71aadf09a7951596c9746c024e7eece7c7af delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/objects/7b/4384978d2493e851f9cca7858815fac9b10980 delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/objects/81/4889a078c031f61ed08ab5fa863aea9314344d delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/objects/84/96071c1b46c854b31185ea97743be6a8774479 delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/objects/84/9a5e34a26815e821f865b8479f5815a47af0fe delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/objects/94/4c0f6e4dfa41595e6eb3ceecdb14f50fe18162 delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/objects/9a/03079b8a8ee85a0bee58bf9be3da8b62414ed4 delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/objects/9f/13f7d0a9402c681f91dc590cf7b5470e6a77d2 delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/objects/9f/d738e8f7967c078dceed8190330fc8648ee56a delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/objects/a4/a7dce85cf63874e984719f4fdd239f5145052f delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/objects/a6/5fedf39aefe402d3bb6e24df4d4f5fe4547750 delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/objects/a7/1586c1dfe8a71c6cbf6c129f404c5642ff31bd delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/objects/a8/233120f6ad708f843d861ce2b7228ec4e3dec6 delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/objects/ae/90f12eea699729ed24555e40b9fd669da12a12 delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/objects/b2/5fa35b38051e4ae45d4222e795f9df2e43f1d1 delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/objects/b6/361fc6a97178d8fc8639fdeed71c775ab52593 delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/objects/be/3563ae3f795b2b4353bcce3a527ad0a4f7f644 delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/objects/c4/7800c7266a2be04c571c04d5a6614691ea99bd delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/objects/d0/7b0f9a8c89f1d9e74dc4fce6421dec5ef8a659 delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/objects/d6/c93164c249c8000205dd4ec5cbca1b516d487f delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/objects/d7/1aab4f9b04b45ce09bcaa636a9be6231474759 delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/objects/e7/b4ad382349ff96dd8199000580b9b1e2042eb0 delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/objects/f1/425cef211cc08caa31e7b545ffb232acb098c3 delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/objects/f6/0079018b664e4e79329a7ef9559c8d9e0378d1 delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/objects/fa/49b077972391ad58037050f2a75f74e3671e92 delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/objects/fd/093bff70906175335656e6ce6ae05783708765 delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/objects/fd/4959ce7510db09d4d8217fa2d1780413e05a09 delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/objects/pack/pack-a81e489679b7d3418f9ab594bda8ceb37dd4c695.idx delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/objects/pack/pack-a81e489679b7d3418f9ab594bda8ceb37dd4c695.pack delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/objects/pack/pack-d7c6adf9f61318f041845b01440d09aa7a91e1b5.idx delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/objects/pack/pack-d7c6adf9f61318f041845b01440d09aa7a91e1b5.pack delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/objects/pack/pack-d85f5d483273108c9d8dd0e4728ccf0b2982423a.idx delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/objects/pack/pack-d85f5d483273108c9d8dd0e4728ccf0b2982423a.pack delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/packed-refs delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/refs/heads/br2 delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/refs/heads/cannot-fetch delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/refs/heads/chomped delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/refs/heads/haacked delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/refs/heads/not-good delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/refs/heads/packed-test delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/refs/heads/subtrees delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/refs/heads/test delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/refs/heads/track-local delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/refs/heads/trailing delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/refs/notes/fanout delete mode 100644 vendor/libgit2/tests/resources/testrepo.git/refs/remotes/test/master delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/HEAD delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/HEAD_TRACKER delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/config delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/index delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/objects/09/9fabac3a9ea935598528c27f866e34089c2eff delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/objects/13/85f264afb75a56a5bec74243be9b367ba4ca08 delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/objects/14/4344043ba4d4a405da03de3844aa829ae8be0e delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/objects/16/8e4ebd1c667499548ae12403b19b22a5c5e925 delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/objects/18/1037049a54a1eb5fab404658a3a250b44335d7 delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/objects/18/10dff58d8a660512d4832e740f692884338ccd delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/objects/1d/d0968be3ff95fcaecb6fa4245662db9fdc4568 delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/objects/1f/67fc4386b2d171e0d21be1c447e12660561f9b delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/objects/27/0b8ea76056d5cad83af921837702d3e3c2924d delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/objects/2b/d0a343aeef7a2cf0d158478966a6e587ff3863 delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/objects/32/59a6bd5b57fb9c1281bb7ed3167b50f224cb54 delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/objects/36/97d64be941a53d4ae8f6a271e4e3fa56b022cc delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/objects/45/b983be36b73c0788dc9cbcb76cbb80fc7bb057 delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/objects/45/dd856fdd4d89b884c340ba0e047752d9b085d6 delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/objects/4a/202b346bb0fb0db7eff3cffeb3c70babbd2045 delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/objects/4e/0883eeeeebc1fb1735161cea82f7cb5fab7e63 delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/objects/4e/886e602529caa9ab11d71f86634bd1b6e0de10 delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/objects/5b/5b025afb0b4c913b4c338a42934a3863bf3644 delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/objects/62/eb56dabb4b9929bc15dd9263c2c733b13d2dcc delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/objects/66/3adb09143767984f7be83a91effa47e128c735 delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/objects/6b/377958d8c6a4906e8573b53672a1a23a4e8ce6 delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/objects/6b/9b767af9992b4abad5e24ffb1ba2d688ca602e delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/objects/6f/d5c7dd2ab27b48c493023f794be09861e9045f delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/objects/75/057dd4114e74cca1d750d0aee1647c903cb60a delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/objects/76/3d71aadf09a7951596c9746c024e7eece7c7af delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/objects/7b/2417a23b63e1fdde88c80e14b33247c6e5785a delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/objects/7b/4384978d2493e851f9cca7858815fac9b10980 delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/objects/81/4889a078c031f61ed08ab5fa863aea9314344d delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/objects/84/96071c1b46c854b31185ea97743be6a8774479 delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/objects/87/380ae84009e9c503506c2f6143a4fc6c60bf80 delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/objects/94/4c0f6e4dfa41595e6eb3ceecdb14f50fe18162 delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/objects/9a/03079b8a8ee85a0bee58bf9be3da8b62414ed4 delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/objects/9f/d738e8f7967c078dceed8190330fc8648ee56a delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/objects/a4/a7dce85cf63874e984719f4fdd239f5145052f delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/objects/a6/5fedf39aefe402d3bb6e24df4d4f5fe4547750 delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/objects/a7/1586c1dfe8a71c6cbf6c129f404c5642ff31bd delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/objects/a8/233120f6ad708f843d861ce2b7228ec4e3dec6 delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/objects/ae/90f12eea699729ed24555e40b9fd669da12a12 delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/objects/af/e4393b2b2a965f06acf2ca9658eaa01e0cd6b6 delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/objects/b2/5fa35b38051e4ae45d4222e795f9df2e43f1d1 delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/objects/b6/361fc6a97178d8fc8639fdeed71c775ab52593 delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/objects/be/3563ae3f795b2b4353bcce3a527ad0a4f7f644 delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/objects/c0/528fd6cc988c0a40ce0be11bc192fc8dc5346e delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/objects/c3/6d8ea75da8cb510fcb0c408c1d7e53f9a99dbe delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/objects/c4/7800c7266a2be04c571c04d5a6614691ea99bd delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/objects/ce/054d4c5e3c83522aed8bc061987b46b7ede3be delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/objects/cf/80f8de9f1185bf3a05f993f6121880dd0cfbc9 delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/objects/d4/27e0b2e138501a3d15cc376077a3631e15bd46 delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/objects/d5/2a8fe84ceedf260afe4f0287bbfca04a117e83 delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/objects/d6/c93164c249c8000205dd4ec5cbca1b516d487f delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/objects/e3/6900c3224db4adf4c7f7a09d4ac80247978a13 delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/objects/e7/b4ad382349ff96dd8199000580b9b1e2042eb0 delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/objects/ee/3fa1b8c00aff7fe02065fdb50864bb0d932ccf delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/objects/f1/425cef211cc08caa31e7b545ffb232acb098c3 delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/objects/f6/0079018b664e4e79329a7ef9559c8d9e0378d1 delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/objects/fa/49b077972391ad58037050f2a75f74e3671e92 delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/objects/fd/093bff70906175335656e6ce6ae05783708765 delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/objects/pack/pack-a81e489679b7d3418f9ab594bda8ceb37dd4c695.idx delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/objects/pack/pack-a81e489679b7d3418f9ab594bda8ceb37dd4c695.pack delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/objects/pack/pack-d7c6adf9f61318f041845b01440d09aa7a91e1b5.idx delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/objects/pack/pack-d7c6adf9f61318f041845b01440d09aa7a91e1b5.pack delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/objects/pack/pack-d85f5d483273108c9d8dd0e4728ccf0b2982423a.idx delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/objects/pack/pack-d85f5d483273108c9d8dd0e4728ccf0b2982423a.pack delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/packed-refs delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/refs/heads/br2 delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/refs/heads/dir delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/refs/heads/ident delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/refs/heads/long-file-name delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/refs/heads/packed-test delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/refs/heads/subtrees delete mode 100644 vendor/libgit2/tests/resources/testrepo/.gitted/refs/heads/test delete mode 100644 vendor/libgit2/tests/resources/testrepo2/.gitted/HEAD delete mode 100644 vendor/libgit2/tests/resources/testrepo2/.gitted/config delete mode 100644 vendor/libgit2/tests/resources/testrepo2/.gitted/description delete mode 100644 vendor/libgit2/tests/resources/testrepo2/.gitted/index delete mode 100644 vendor/libgit2/tests/resources/testrepo2/.gitted/info/exclude delete mode 100644 vendor/libgit2/tests/resources/testrepo2/.gitted/logs/HEAD delete mode 100644 vendor/libgit2/tests/resources/testrepo2/.gitted/logs/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/testrepo2/.gitted/logs/refs/remotes/origin/HEAD delete mode 100644 vendor/libgit2/tests/resources/testrepo2/.gitted/objects/0c/37a5391bbff43c37f0d0371823a5509eed5b1d delete mode 100644 vendor/libgit2/tests/resources/testrepo2/.gitted/objects/13/85f264afb75a56a5bec74243be9b367ba4ca08 delete mode 100644 vendor/libgit2/tests/resources/testrepo2/.gitted/objects/18/1037049a54a1eb5fab404658a3a250b44335d7 delete mode 100644 vendor/libgit2/tests/resources/testrepo2/.gitted/objects/18/10dff58d8a660512d4832e740f692884338ccd delete mode 100644 vendor/libgit2/tests/resources/testrepo2/.gitted/objects/2d/2eff63372b08adf0a9eb84109ccf7d19e2f3a2 delete mode 100644 vendor/libgit2/tests/resources/testrepo2/.gitted/objects/36/060c58702ed4c2a40832c51758d5344201d89a delete mode 100644 vendor/libgit2/tests/resources/testrepo2/.gitted/objects/45/b983be36b73c0788dc9cbcb76cbb80fc7bb057 delete mode 100644 vendor/libgit2/tests/resources/testrepo2/.gitted/objects/4a/202b346bb0fb0db7eff3cffeb3c70babbd2045 delete mode 100644 vendor/libgit2/tests/resources/testrepo2/.gitted/objects/5b/5b025afb0b4c913b4c338a42934a3863bf3644 delete mode 100644 vendor/libgit2/tests/resources/testrepo2/.gitted/objects/61/9f9935957e010c419cb9d15621916ddfcc0b96 delete mode 100644 vendor/libgit2/tests/resources/testrepo2/.gitted/objects/75/057dd4114e74cca1d750d0aee1647c903cb60a delete mode 100644 vendor/libgit2/tests/resources/testrepo2/.gitted/objects/7f/043268ea43ce18e3540acaabf9e090c91965b0 delete mode 100644 vendor/libgit2/tests/resources/testrepo2/.gitted/objects/81/4889a078c031f61ed08ab5fa863aea9314344d delete mode 100644 vendor/libgit2/tests/resources/testrepo2/.gitted/objects/84/96071c1b46c854b31185ea97743be6a8774479 delete mode 100644 vendor/libgit2/tests/resources/testrepo2/.gitted/objects/9f/d738e8f7967c078dceed8190330fc8648ee56a delete mode 100644 vendor/libgit2/tests/resources/testrepo2/.gitted/objects/a4/a7dce85cf63874e984719f4fdd239f5145052f delete mode 100644 vendor/libgit2/tests/resources/testrepo2/.gitted/objects/a7/1586c1dfe8a71c6cbf6c129f404c5642ff31bd delete mode 100644 vendor/libgit2/tests/resources/testrepo2/.gitted/objects/a8/233120f6ad708f843d861ce2b7228ec4e3dec6 delete mode 100644 vendor/libgit2/tests/resources/testrepo2/.gitted/objects/be/3563ae3f795b2b4353bcce3a527ad0a4f7f644 delete mode 100644 vendor/libgit2/tests/resources/testrepo2/.gitted/objects/c4/7800c7266a2be04c571c04d5a6614691ea99bd delete mode 100644 vendor/libgit2/tests/resources/testrepo2/.gitted/objects/c4/dc1555e4d4fa0e0c9c3fc46734c7c35b3ce90b delete mode 100644 vendor/libgit2/tests/resources/testrepo2/.gitted/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 delete mode 100644 vendor/libgit2/tests/resources/testrepo2/.gitted/objects/f6/0079018b664e4e79329a7ef9559c8d9e0378d1 delete mode 100644 vendor/libgit2/tests/resources/testrepo2/.gitted/objects/fa/49b077972391ad58037050f2a75f74e3671e92 delete mode 100644 vendor/libgit2/tests/resources/testrepo2/.gitted/objects/fd/093bff70906175335656e6ce6ae05783708765 delete mode 100644 vendor/libgit2/tests/resources/testrepo2/.gitted/objects/pack/pack-d7c6adf9f61318f041845b01440d09aa7a91e1b5.idx delete mode 100644 vendor/libgit2/tests/resources/testrepo2/.gitted/objects/pack/pack-d7c6adf9f61318f041845b01440d09aa7a91e1b5.pack delete mode 100644 vendor/libgit2/tests/resources/testrepo2/.gitted/packed-refs delete mode 100644 vendor/libgit2/tests/resources/testrepo2/.gitted/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/testrepo2/.gitted/refs/remotes/origin/HEAD delete mode 100644 vendor/libgit2/tests/resources/testrepo2/README delete mode 100644 vendor/libgit2/tests/resources/testrepo2/new.txt delete mode 100644 vendor/libgit2/tests/resources/testrepo2/subdir/README delete mode 100644 vendor/libgit2/tests/resources/testrepo2/subdir/new.txt delete mode 100644 vendor/libgit2/tests/resources/testrepo2/subdir/subdir2/README delete mode 100644 vendor/libgit2/tests/resources/testrepo2/subdir/subdir2/new.txt delete mode 100644 vendor/libgit2/tests/resources/twowaymerge.git/HEAD delete mode 100644 vendor/libgit2/tests/resources/twowaymerge.git/config delete mode 100644 vendor/libgit2/tests/resources/twowaymerge.git/description delete mode 100644 vendor/libgit2/tests/resources/twowaymerge.git/info/exclude delete mode 100644 vendor/libgit2/tests/resources/twowaymerge.git/objects/0c/8a3f1f3d5f421cf83048c7c73ee3b55a5e0f29 delete mode 100644 vendor/libgit2/tests/resources/twowaymerge.git/objects/10/2dce8e3081f398e4bdd9fd894dc85ac3ca6a67 delete mode 100644 vendor/libgit2/tests/resources/twowaymerge.git/objects/17/7d8634a28e26ec7819284752757ebe01a479d5 delete mode 100644 vendor/libgit2/tests/resources/twowaymerge.git/objects/1c/30b88f5f3ee66d78df6520a7de9e89b890818b delete mode 100644 vendor/libgit2/tests/resources/twowaymerge.git/objects/1f/4c0311a24b63f6fc209a59a1e404942d4a5006 delete mode 100644 vendor/libgit2/tests/resources/twowaymerge.git/objects/22/24e191514cb4bd8c566d80dac22dfcb1e9bb83 delete mode 100644 vendor/libgit2/tests/resources/twowaymerge.git/objects/29/6e56023cdc034d2735fee8c0d85a659d1b07f4 delete mode 100644 vendor/libgit2/tests/resources/twowaymerge.git/objects/31/51880ae2b363f1c262cf98b750c1f169a0d432 delete mode 100644 vendor/libgit2/tests/resources/twowaymerge.git/objects/3b/287f8730c81d0b763c2d294618a5e32b67b4f8 delete mode 100644 vendor/libgit2/tests/resources/twowaymerge.git/objects/42/b7311aa626e712891940c1ec5d5cba201946a4 delete mode 100644 vendor/libgit2/tests/resources/twowaymerge.git/objects/49/6d6428b9cf92981dc9495211e6e1120fb6f2ba delete mode 100644 vendor/libgit2/tests/resources/twowaymerge.git/objects/59/b0cf7d74659e1cdb13305319d6d4ce2733c118 delete mode 100644 vendor/libgit2/tests/resources/twowaymerge.git/objects/6a/b5d28acbf3c3bdff276f7ccfdf29c1520e542f delete mode 100644 vendor/libgit2/tests/resources/twowaymerge.git/objects/6c/fca542b55b8b37017e6125a4b8f59a6eae6f11 delete mode 100644 vendor/libgit2/tests/resources/twowaymerge.git/objects/76/5b32c65d38f04c4f287abda055818ec0f26912 delete mode 100644 vendor/libgit2/tests/resources/twowaymerge.git/objects/7b/8c336c45fc6895c1c60827260fe5d798e5d247 delete mode 100644 vendor/libgit2/tests/resources/twowaymerge.git/objects/82/bf9a1a10a4b25c1f14c9607b60970705e92545 delete mode 100644 vendor/libgit2/tests/resources/twowaymerge.git/objects/8b/82fb1794cb1c8c7f172ec730a4c2db0ae3e650 delete mode 100644 vendor/libgit2/tests/resources/twowaymerge.git/objects/9a/40a2f11c191f180c47e54b11567cb3c1e89b30 delete mode 100644 vendor/libgit2/tests/resources/twowaymerge.git/objects/9b/219343610c88a1187c996d0dc58330b55cee28 delete mode 100644 vendor/libgit2/tests/resources/twowaymerge.git/objects/9f/e06a50f4d1634d6c6879854d01d80857388706 delete mode 100644 vendor/libgit2/tests/resources/twowaymerge.git/objects/a4/1a49f8f5cd9b6cb14a076bf8394881ed0b4d19 delete mode 100644 vendor/libgit2/tests/resources/twowaymerge.git/objects/a9/53a018c5b10b20c86e69fef55ebc8ad4c5a417 delete mode 100644 vendor/libgit2/tests/resources/twowaymerge.git/objects/a9/cce3cd1b3efbda5b1f4a6dcc3f1570b2d3d74c delete mode 100644 vendor/libgit2/tests/resources/twowaymerge.git/objects/bd/1732c43c68d712ad09e1d872b9be6d4b9efdc4 delete mode 100644 vendor/libgit2/tests/resources/twowaymerge.git/objects/c3/7a783c20d92ac92362a78a32860f7eebf938ef delete mode 100644 vendor/libgit2/tests/resources/twowaymerge.git/objects/cb/dd40facab1682754eb67f7a43f29e672903cf6 delete mode 100644 vendor/libgit2/tests/resources/twowaymerge.git/objects/cd/f97fd3bb48eb3827638bb33d208f5fd32d0aa6 delete mode 100644 vendor/libgit2/tests/resources/twowaymerge.git/objects/d6/f10d549cb335b9e6d38afc1f0088be69b50494 delete mode 100644 vendor/libgit2/tests/resources/twowaymerge.git/objects/d9/acdc7ae7632adfeec67fa73c1e343cf4d1f47e delete mode 100644 vendor/libgit2/tests/resources/twowaymerge.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 delete mode 100644 vendor/libgit2/tests/resources/twowaymerge.git/objects/ef/0488f0b722f0be8bcb90a7730ac7efafd1d694 delete mode 100644 vendor/libgit2/tests/resources/twowaymerge.git/objects/fc/f7e3f51c11d199ab7a78403ee4f9ccd028da25 delete mode 100644 vendor/libgit2/tests/resources/twowaymerge.git/refs/heads/first-branch delete mode 100644 vendor/libgit2/tests/resources/twowaymerge.git/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/twowaymerge.git/refs/heads/second-branch delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/HEAD delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/config delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/description delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/index delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/info/exclude delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/modules/b/HEAD delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/modules/b/config delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/modules/b/description delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/modules/b/index delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/modules/b/info/exclude delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/modules/b/objects/06/362fe2fdb7010d0e447b4fb450d405420479a1 delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/modules/b/objects/0e/6a3ca48bd47cfe67681acf39aa0b10a0b92484 delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/modules/b/objects/17/d0ece6e96460a06592d9d9d000de37ba4232c5 delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/modules/b/objects/41/bd4bc3df978de695f67ace64c560913da11653 delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/modules/b/objects/48/0095882d281ed676fe5b863569520e54a7d5c0 delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/modules/b/objects/5e/4963595a9774b90524d35a807169049de8ccad delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/modules/b/objects/6b/31c659545507c381e9cd34ec508f16c04e149e delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/modules/b/objects/73/ba924a80437097795ae839e66e187c55d3babf delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/modules/b/objects/78/0d7397f5e8f8f477fb55b7af3accc2154b2d4a delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/modules/b/objects/78/9efbdadaa4a582778d4584385495559ea0994b delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/modules/b/objects/88/34b635dd468a83cb012f6feace968c1c9f5d6e delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/modules/b/objects/d0/5f2cd5cc77addf68ed6f50d622c9a4f732e6c5 delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/modules/b/packed-refs delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/modules/b/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/modules/b/refs/remotes/origin/HEAD delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/modules/d/HEAD delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/modules/d/config delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/modules/d/description delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/modules/d/index delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/modules/d/info/exclude delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/modules/d/objects/06/362fe2fdb7010d0e447b4fb450d405420479a1 delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/modules/d/objects/0e/6a3ca48bd47cfe67681acf39aa0b10a0b92484 delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/modules/d/objects/17/d0ece6e96460a06592d9d9d000de37ba4232c5 delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/modules/d/objects/41/bd4bc3df978de695f67ace64c560913da11653 delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/modules/d/objects/48/0095882d281ed676fe5b863569520e54a7d5c0 delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/modules/d/objects/5e/4963595a9774b90524d35a807169049de8ccad delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/modules/d/objects/6b/31c659545507c381e9cd34ec508f16c04e149e delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/modules/d/objects/73/ba924a80437097795ae839e66e187c55d3babf delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/modules/d/objects/78/0d7397f5e8f8f477fb55b7af3accc2154b2d4a delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/modules/d/objects/78/9efbdadaa4a582778d4584385495559ea0994b delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/modules/d/objects/88/34b635dd468a83cb012f6feace968c1c9f5d6e delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/modules/d/objects/d0/5f2cd5cc77addf68ed6f50d622c9a4f732e6c5 delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/modules/d/packed-refs delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/modules/d/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/modules/d/refs/remotes/origin/HEAD delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/modules/e/HEAD delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/modules/e/config delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/modules/e/description delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/modules/e/index delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/modules/e/info/exclude delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/modules/e/objects/06/362fe2fdb7010d0e447b4fb450d405420479a1 delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/modules/e/objects/0e/6a3ca48bd47cfe67681acf39aa0b10a0b92484 delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/modules/e/objects/17/d0ece6e96460a06592d9d9d000de37ba4232c5 delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/modules/e/objects/41/bd4bc3df978de695f67ace64c560913da11653 delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/modules/e/objects/48/0095882d281ed676fe5b863569520e54a7d5c0 delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/modules/e/objects/5e/4963595a9774b90524d35a807169049de8ccad delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/modules/e/objects/6b/31c659545507c381e9cd34ec508f16c04e149e delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/modules/e/objects/73/ba924a80437097795ae839e66e187c55d3babf delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/modules/e/objects/78/0d7397f5e8f8f477fb55b7af3accc2154b2d4a delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/modules/e/objects/78/9efbdadaa4a582778d4584385495559ea0994b delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/modules/e/objects/88/34b635dd468a83cb012f6feace968c1c9f5d6e delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/modules/e/objects/d0/5f2cd5cc77addf68ed6f50d622c9a4f732e6c5 delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/modules/e/packed-refs delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/modules/e/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/modules/e/refs/remotes/origin/HEAD delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/objects/0d/78578795b7ca49fd8df6c4b6d27c5c02d991d8 delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/objects/0e/7ed140b514b8cae23254cb8656fe1674403aff delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/objects/0f/f461da9689266f482d8f6654a4400b4e33c586 delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/objects/18/aa7e45bbe4c3cc24a0b079696c59d36675af97 delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/objects/1b/63caae4a5ca96f78e8dfefc376c6a39a142475 delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/objects/1e/abe82aa3b2365a394f6108f24435df6e193d02 delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/objects/42/061c01a1c70097d1e4579f29a5adf40abdec95 delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/objects/46/2838cee476a87e7cff32196b66fa18ed756592 delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/objects/63/499e4ea8e096b831515ceb1d5a7593e4d87ae5 delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/objects/68/1af94e10eaf262f3ab7cb9b8fd5f4158ba4d3e delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/objects/6a/9008602b811e69a9b7a2d83496f39a794fdeeb delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/objects/6e/ae26c90e8ccc4d16208972119c40635489c6f0 delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/objects/6f/39eabbb8a7541515e0d35971078bccb502e7e0 delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/objects/71/54d3083461536dfc71ad5542f3e65e723a06c4 delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/objects/75/56c1d893a4c0ca85ac8ac51de47ff399758729 delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/objects/76/fef844064c26d5e06c2508240dae661e7231b2 delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/objects/79/b9f23e85f55ea36a472a902e875bc1121a94cb delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/objects/85/28da0ea65eacf1f74f9ed6696adbac547963ad delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/objects/8b/3726b365824ad5a07c537247f4bc73ed7d37ea delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/objects/93/3e28c1c8a68838a763d250bdf0b2c6068289c3 delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/objects/96/2710fe5b4e453e9e827945b3487c525968ec4a delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/objects/96/6cf1b3598e195b31b2cde3784f9a19f0728a6f delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/objects/99/e8bab9ece009f0fba7eb41f850f4c12bedb9b7 delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/objects/9b/19edf33a03a0c59cdfc113bfa5c06179bf9b1a delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/objects/9b/db75b73836a99e3dbeea640a81de81031fdc29 delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/objects/9d/0235c7a7edc0889a18f97a42ee6db9fe688447 delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/objects/9e/ffc457877f109b2a4319e14bee613a15f2a00d delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/objects/a0/a9bad6f6f40325198f938a0e3ae981622d7707 delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/objects/b1/977dc4e573b812d4619754c98138c56999dc0d delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/objects/d7/5992dd02391e128dac332dcc78d649dd9ab095 delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/objects/da/e2709d638df52212b1f43ff61797ebfedfcc7c delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/objects/e1/152adcb9adf37ec551ada9ba377ab53aec3bad delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/objects/e4/ed436a9eb0f198cda722886a5f8d6d6c836b7b delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/objects/f2/0b79342712e0b2315647cd8227a573fd3bc46e delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/objects/fd/e0147e3b59f381635a3b016e3fe6dacb70779d delete mode 100644 vendor/libgit2/tests/resources/typechanges/.gitted/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/typechanges/README.md delete mode 100644 vendor/libgit2/tests/resources/typechanges/gitmodules delete mode 100644 vendor/libgit2/tests/resources/unsymlinked.git/HEAD delete mode 100644 vendor/libgit2/tests/resources/unsymlinked.git/config delete mode 100644 vendor/libgit2/tests/resources/unsymlinked.git/description delete mode 100644 vendor/libgit2/tests/resources/unsymlinked.git/info/exclude delete mode 100644 vendor/libgit2/tests/resources/unsymlinked.git/objects/08/8b64704e0d6b8bd061dea879418cb5442a3fbf delete mode 100644 vendor/libgit2/tests/resources/unsymlinked.git/objects/13/a5e939bca25940c069fd2169d993dba328e30b delete mode 100644 vendor/libgit2/tests/resources/unsymlinked.git/objects/19/bf568e59e3a0b363cafb4106226e62d4a4c41c delete mode 100644 vendor/libgit2/tests/resources/unsymlinked.git/objects/58/1fadd35b4cf320d102a152f918729011604773 delete mode 100644 vendor/libgit2/tests/resources/unsymlinked.git/objects/5c/87b6791e8b13da658a14d1ef7e09b5dc3bac8c delete mode 100644 vendor/libgit2/tests/resources/unsymlinked.git/objects/6f/e5f5398af85fb3de8a6aba0339b6d3bfa26a27 delete mode 100644 vendor/libgit2/tests/resources/unsymlinked.git/objects/7f/ccd75616ec188b8f1b23d67506a334cc34a49d delete mode 100644 vendor/libgit2/tests/resources/unsymlinked.git/objects/80/6999882bf91d24241e4077906b9017605eb1f3 delete mode 100644 vendor/libgit2/tests/resources/unsymlinked.git/objects/83/7d176303c5005505ec1e4a30231c40930c0230 delete mode 100644 vendor/libgit2/tests/resources/unsymlinked.git/objects/a8/595ccca04f40818ae0155c8f9c77a230e597b6 delete mode 100644 vendor/libgit2/tests/resources/unsymlinked.git/objects/cf/8f1cf5cce859c438d6cc067284cb5e161206e7 delete mode 100644 vendor/libgit2/tests/resources/unsymlinked.git/objects/d5/278d05c8607ec420bfee4cf219fbc0eeebfd6a delete mode 100644 vendor/libgit2/tests/resources/unsymlinked.git/objects/f4/e16fb76536591a41454194058d048d8e4dd2e9 delete mode 100644 vendor/libgit2/tests/resources/unsymlinked.git/objects/f9/e65619d93fdf2673882e0a261c5e93b1a84006 delete mode 100644 vendor/libgit2/tests/resources/unsymlinked.git/refs/heads/exe-file delete mode 100644 vendor/libgit2/tests/resources/unsymlinked.git/refs/heads/master delete mode 100644 vendor/libgit2/tests/resources/unsymlinked.git/refs/heads/reg-file delete mode 100644 vendor/libgit2/tests/resources/userdiff/.gitted/HEAD delete mode 100644 vendor/libgit2/tests/resources/userdiff/.gitted/config delete mode 100644 vendor/libgit2/tests/resources/userdiff/.gitted/description delete mode 100644 vendor/libgit2/tests/resources/userdiff/.gitted/index delete mode 100644 vendor/libgit2/tests/resources/userdiff/.gitted/info/refs delete mode 100644 vendor/libgit2/tests/resources/userdiff/.gitted/objects/09/65b377c214bbe5e0d18fcdaf556df7fa7ed7c8 delete mode 100644 vendor/libgit2/tests/resources/userdiff/.gitted/objects/0c/20ef1409ae1df4d5a76cdbd98d5c33ccdb6bcc delete mode 100644 vendor/libgit2/tests/resources/userdiff/.gitted/objects/39/ea75107a09091ba54ff86fcc780b59477e42cd delete mode 100644 vendor/libgit2/tests/resources/userdiff/.gitted/objects/3c/c08384deae5957247bc36776ab626cc9e0582b delete mode 100644 vendor/libgit2/tests/resources/userdiff/.gitted/objects/46/8d6f2afc940e14c76347fa9af26e429a3c9044 delete mode 100644 vendor/libgit2/tests/resources/userdiff/.gitted/objects/53/917973acfe0111f93c2cfaacf854be245880e8 delete mode 100644 vendor/libgit2/tests/resources/userdiff/.gitted/objects/63/1d44e0c72e8cd1b594fa11d7d1ee8a6d67ff67 delete mode 100644 vendor/libgit2/tests/resources/userdiff/.gitted/objects/f3/be389d351e4bcc6dcc4b5fe22134ef0f63f8bd delete mode 100644 vendor/libgit2/tests/resources/userdiff/.gitted/objects/info/packs delete mode 100644 vendor/libgit2/tests/resources/userdiff/.gitted/objects/pack/pack-1652578900ac63564f2a24b9714529821276ceb9.idx delete mode 100644 vendor/libgit2/tests/resources/userdiff/.gitted/objects/pack/pack-1652578900ac63564f2a24b9714529821276ceb9.pack delete mode 100644 vendor/libgit2/tests/resources/userdiff/.gitted/packed-refs delete mode 100644 vendor/libgit2/tests/resources/userdiff/.gitted/refs/dummy-marker.txt delete mode 100644 vendor/libgit2/tests/resources/userdiff/after/file.html delete mode 100644 vendor/libgit2/tests/resources/userdiff/after/file.javascript delete mode 100644 vendor/libgit2/tests/resources/userdiff/after/file.php delete mode 100644 vendor/libgit2/tests/resources/userdiff/before/file.html delete mode 100644 vendor/libgit2/tests/resources/userdiff/before/file.javascript delete mode 100644 vendor/libgit2/tests/resources/userdiff/before/file.php delete mode 100644 vendor/libgit2/tests/resources/userdiff/expected/driver/diff.html delete mode 100644 vendor/libgit2/tests/resources/userdiff/expected/driver/diff.javascript delete mode 100644 vendor/libgit2/tests/resources/userdiff/expected/driver/diff.php delete mode 100644 vendor/libgit2/tests/resources/userdiff/expected/nodriver/diff.html delete mode 100644 vendor/libgit2/tests/resources/userdiff/expected/nodriver/diff.javascript delete mode 100644 vendor/libgit2/tests/resources/userdiff/expected/nodriver/diff.php delete mode 100644 vendor/libgit2/tests/resources/userdiff/files/file.html delete mode 100644 vendor/libgit2/tests/resources/userdiff/files/file.javascript delete mode 100644 vendor/libgit2/tests/resources/userdiff/files/file.php delete mode 100644 vendor/libgit2/tests/resources/win32-forbidden/.gitted/HEAD delete mode 100644 vendor/libgit2/tests/resources/win32-forbidden/.gitted/config delete mode 100644 vendor/libgit2/tests/resources/win32-forbidden/.gitted/index delete mode 100644 vendor/libgit2/tests/resources/win32-forbidden/.gitted/info/exclude delete mode 100644 vendor/libgit2/tests/resources/win32-forbidden/.gitted/objects/10/68072702a28a82c78902cf5bf82c3864cf4356 delete mode 100644 vendor/libgit2/tests/resources/win32-forbidden/.gitted/objects/17/6a458f94e0ea5272ce67c36bf30b6be9caf623 delete mode 100644 vendor/libgit2/tests/resources/win32-forbidden/.gitted/objects/2d/7445a749d25269f32724aa621cb70b196bcc40 delete mode 100644 vendor/libgit2/tests/resources/win32-forbidden/.gitted/objects/34/96991d72d500af36edef68bbfcccd1661d88db delete mode 100644 vendor/libgit2/tests/resources/win32-forbidden/.gitted/objects/8f/45aad6f23b9509f8786c617e19c127ae76609a delete mode 100644 vendor/libgit2/tests/resources/win32-forbidden/.gitted/objects/da/623abd956bb2fd8052c708c7ed43f05d192d37 delete mode 100644 vendor/libgit2/tests/resources/win32-forbidden/.gitted/objects/ea/c7621a652e5261ef1c1d3e7ae31b0d84fcbaba delete mode 100644 vendor/libgit2/tests/resources/win32-forbidden/.gitted/refs/heads/master delete mode 100644 vendor/libgit2/tests/revert/bare.c delete mode 100644 vendor/libgit2/tests/revert/workdir.c delete mode 100644 vendor/libgit2/tests/revwalk/basic.c delete mode 100644 vendor/libgit2/tests/revwalk/hidecb.c delete mode 100644 vendor/libgit2/tests/revwalk/mergebase.c delete mode 100644 vendor/libgit2/tests/revwalk/signatureparsing.c delete mode 100644 vendor/libgit2/tests/revwalk/simplify.c delete mode 100644 vendor/libgit2/tests/stash/apply.c delete mode 100644 vendor/libgit2/tests/stash/drop.c delete mode 100644 vendor/libgit2/tests/stash/foreach.c delete mode 100644 vendor/libgit2/tests/stash/save.c delete mode 100644 vendor/libgit2/tests/stash/stash_helpers.c delete mode 100644 vendor/libgit2/tests/stash/stash_helpers.h delete mode 100644 vendor/libgit2/tests/stash/submodules.c delete mode 100644 vendor/libgit2/tests/status/ignore.c delete mode 100644 vendor/libgit2/tests/status/renames.c delete mode 100644 vendor/libgit2/tests/status/single.c delete mode 100644 vendor/libgit2/tests/status/status_data.h delete mode 100644 vendor/libgit2/tests/status/status_helpers.c delete mode 100644 vendor/libgit2/tests/status/status_helpers.h delete mode 100644 vendor/libgit2/tests/status/submodules.c delete mode 100644 vendor/libgit2/tests/status/worktree.c delete mode 100644 vendor/libgit2/tests/status/worktree_init.c delete mode 100644 vendor/libgit2/tests/stress/diff.c delete mode 100644 vendor/libgit2/tests/submodule/add.c delete mode 100644 vendor/libgit2/tests/submodule/init.c delete mode 100644 vendor/libgit2/tests/submodule/lookup.c delete mode 100644 vendor/libgit2/tests/submodule/modify.c delete mode 100644 vendor/libgit2/tests/submodule/nosubs.c delete mode 100644 vendor/libgit2/tests/submodule/repository_init.c delete mode 100644 vendor/libgit2/tests/submodule/status.c delete mode 100644 vendor/libgit2/tests/submodule/submodule_helpers.c delete mode 100644 vendor/libgit2/tests/submodule/submodule_helpers.h delete mode 100644 vendor/libgit2/tests/submodule/update.c delete mode 100644 vendor/libgit2/tests/threads/basic.c delete mode 100644 vendor/libgit2/tests/threads/diff.c delete mode 100644 vendor/libgit2/tests/threads/iterator.c delete mode 100644 vendor/libgit2/tests/threads/refdb.c delete mode 100644 vendor/libgit2/tests/threads/thread_helpers.c delete mode 100644 vendor/libgit2/tests/threads/thread_helpers.h delete mode 100644 vendor/libgit2/tests/trace/trace.c delete mode 100644 vendor/libgit2/tests/trace/windows/stacktrace.c delete mode 100644 vendor/libgit2/tests/transport/register.c delete mode 100644 vendor/libgit2/tests/valgrind-supp-mac.txt delete mode 100644 vendor/libgit2/tests/win32/forbidden.c delete mode 100644 vendor/libgit2/tests/win32/longpath.c diff --git a/vendor/libgit2/.HEADER b/vendor/libgit2/.HEADER deleted file mode 100644 index fd8430bc8..000000000 --- a/vendor/libgit2/.HEADER +++ /dev/null @@ -1,24 +0,0 @@ -/* - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2, - * as published by the Free Software Foundation. - * - * In addition to the permissions in the GNU General Public License, - * the authors give you unlimited permission to link the compiled - * version of this file into combinations with other programs, - * and to distribute those combinations without any restriction - * coming from the use of this file. (The General Public License - * restrictions do apply in other respects; for example, they cover - * modification of the file, and distribution when not linked into - * a combined executable.) - * - * This file is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; see the file COPYING. If not, write to - * the Free Software Foundation, 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - */ diff --git a/vendor/libgit2/.editorconfig b/vendor/libgit2/.editorconfig deleted file mode 100644 index be59274e8..000000000 --- a/vendor/libgit2/.editorconfig +++ /dev/null @@ -1,14 +0,0 @@ -; Check http://editorconfig.org/ for more informations -; Top-most EditorConfig file -root = true - -; tab indentation -[*] -indent_style = tab -trim_trailing_whitespace = true -insert_final_newline = true - -; 4-column space indentation -[*.md] -indent_style = space -indent_size = 4 diff --git a/vendor/libgit2/.gitattributes b/vendor/libgit2/.gitattributes deleted file mode 100644 index 176a458f9..000000000 --- a/vendor/libgit2/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -* text=auto diff --git a/vendor/libgit2/.gitignore b/vendor/libgit2/.gitignore deleted file mode 100644 index 1ef1ec730..000000000 --- a/vendor/libgit2/.gitignore +++ /dev/null @@ -1,33 +0,0 @@ -/tests/clar.suite -/tests/clar.suite.rule -/tests/.clarcache -/apidocs -/trash-*.exe -/libgit2.pc -/config.mak -*.o -*.a -*.exe -*.gcda -*.gcno -*.gcov -.lock-wafbuild -.waf* -build/ -build-amiga/ -tests/tmp/ -msvc/Debug/ -msvc/Release/ -*.sln -*.suo -*.vc*proj* -*.sdf -*.opensdf -*.aps -*.cmake -!cmake/Modules/*.cmake -.DS_Store -*~ -.*.swp -tags -mkmf.log diff --git a/vendor/libgit2/.mailmap b/vendor/libgit2/.mailmap deleted file mode 100644 index 8479cf6c4..000000000 --- a/vendor/libgit2/.mailmap +++ /dev/null @@ -1,22 +0,0 @@ -Vicent Martí Vicent Marti -Vicent Martí Vicent Martí -Michael Schubert schu -Ben Straub Ben Straub -Ben Straub Ben Straub -Carlos Martín Nieto -Carlos Martín Nieto -nulltoken -Scott J. Goldman -Martin Woodward -Peter DrahoÅ¡ -Adam Roben -Adam Roben -Xavier L. -Xavier L. -Sascha Cunz -Authmillenon -Authmillenon -Edward Thomson -Edward Thomson -J. David Ibáñez -Russell Belfer diff --git a/vendor/libgit2/.travis.yml b/vendor/libgit2/.travis.yml deleted file mode 100644 index 2f3ffe355..000000000 --- a/vendor/libgit2/.travis.yml +++ /dev/null @@ -1,87 +0,0 @@ -# Travis-CI Build for libgit2 -# see travis-ci.org for details - -language: c - -os: - - linux - - osx - -compiler: - - gcc - - clang - -# Settings to try -env: - global: - - secure: "YnhS+8n6B+uoyaYfaJ3Lei7cSJqHDPiKJCKFIF2c87YDfmCvAJke8QtE7IzjYDs7UFkTCM4ox+ph2bERUrxZbSCyEkHdjIZpKuMJfYWja/jgMqTMxdyOH9y8JLFbZsSXDIXDwqBlC6vVyl1fP90M35wuWcNTs6tctfVWVofEFbs=" - - GITTEST_INVASIVE_FS_SIZE=1 - matrix: - - OPTIONS="-DTHREADSAFE=ON -DCMAKE_BUILD_TYPE=Release" - - OPTIONS="-DTHREADSAFE=OFF -DBUILD_EXAMPLES=ON" - -addons: - apt: - packages: - - cmake - - libssh2-1-dev - - openssh-client - - openssh-server - - valgrind - -sudo: false - -matrix: - fast_finish: true - exclude: - - os: osx - compiler: gcc - include: - - compiler: i586-mingw32msvc-gcc - env: OPTIONS="-DCMAKE_TOOLCHAIN_FILE=../script/toolchain-mingw32.cmake" SKIP_TESTS=1 - os: linux - - compiler: gcc - env: COVERITY=1 - os: linux - - compiler: gcc - env: - - VALGRIND=1 - OPTIONS="-DBUILD_CLAR=ON -DBUILD_EXAMPLES=OFF -DDEBUG_POOL=ON -DCMAKE_BUILD_TYPE=Debug" - os: linux - allow_failures: - - env: COVERITY=1 - - env: - - VALGRIND=1 - OPTIONS="-DBUILD_CLAR=ON -DBUILD_EXAMPLES=OFF -DDEBUG_POOL=ON -DCMAKE_BUILD_TYPE=Debug" - -install: - - if [ "$TRAVIS_OS_NAME" = "osx" ]; then ./script/install-deps-${TRAVIS_OS_NAME}.sh; fi - -# Run the Build script and tests -script: - - script/cibuild.sh - -# Run Tests -after_success: - - if [ "$TRAVIS_OS_NAME" = "linux" -a -n "$VALGRIND" ]; then valgrind --leak-check=full --show-reachable=yes --suppressions=./libgit2_clar.supp _build/libgit2_clar -ionline; fi - -# Only watch the development and master branches -branches: - only: - - master - - /^maint.*/ - -# Notify development list when needed -notifications: - irc: - channels: - - irc.freenode.net#libgit2 - on_success: change - on_failure: always - use_notice: true - skip_join: true - campfire: - on_success: always - on_failure: always - rooms: - - secure: "sH0dpPWMirbEe7AvLddZ2yOp8rzHalGmv0bYL/LIhVw3JDI589HCYckeLMSB\n3e/FeXw4bn0EqXWEXijVa4ijbilVY6d8oprdqMdWHEodng4KvY5vID3iZSGT\nxylhahO1XHmRynKQLOAvxlc93IlpVW38vQfby8giIY1nkpspb2w=" diff --git a/vendor/libgit2/AUTHORS b/vendor/libgit2/AUTHORS deleted file mode 100644 index 61e2113ec..000000000 --- a/vendor/libgit2/AUTHORS +++ /dev/null @@ -1,76 +0,0 @@ -The following people contribute or have contributed -to the libgit2 project (sorted alphabetically): - -Alex Budovski -Alexei Sholik -Andreas Ericsson -Anton "antong" Gyllenberg -Ankur Sethi -Arthur Schreiber -Ben Noordhuis -Ben Straub -Benjamin C Meyer -Brian Downing -Brian Lopez -Carlos Martín Nieto -Colin Timmermans -Daniel Huckstep -Dave Borowitz -David Boyce -David Glesser -Dmitry Kakurin -Dmitry Kovega -Emeric Fermas -Emmanuel Rodriguez -Florian Forster -Holger Weiss -Ingmar Vanhassel -J. David Ibáñez -Jacques Germishuys -Jakob Pfender -Jason Penny -Jason R. McNeil -Jerome Lambourg -Johan 't Hart -John Wiegley -Jonathan "Duke" Leto -Julien Miotte -Julio Espinoza-Sokal -Justin Love -Kelly "kelly.leahy" Leahy -Kirill A. Shutemov -Lambert CLARA -Luc Bertrand -Marc Pegon -Marcel Groothuis -Marco Villegas -Michael "schu" Schubert -Microsoft Corporation -Olivier Ramonat -Peter DrahoÅ¡ -Pierre Habouzit -Pierre-Olivier Latour -Przemyslaw Pawelczyk -Ramsay Jones -Robert G. Jakabosky -Romain Geissler -Romain Muller -Russell Belfer -Sakari Jokinen -Samuel Charles "Sam" Day -Sarath Lakshman -Sascha Cunz -Sascha Peilicke -Scott Chacon -Sebastian Schuberth -Sergey Nikishin -Shawn O. Pearce -Shuhei Tanuma -Steve Frécinaux -Sven Strickroth -Tim Branyen -Tim Clem -Tim Harder -Torsten Bögershausen -Trent Mick -Vicent Marti diff --git a/vendor/libgit2/CHANGELOG.md b/vendor/libgit2/CHANGELOG.md deleted file mode 100644 index 43476b99a..000000000 --- a/vendor/libgit2/CHANGELOG.md +++ /dev/null @@ -1,647 +0,0 @@ -v0.24 + 1 -------- - -### Changes or improvements - -### API additions - -### API removals - -### Breaking API changes - -v0.24 -------- - -### Changes or improvements - -* Custom filters can now be registered with wildcard attributes, for - example `filter=*`. Consumers should examine the attributes parameter - of the `check` function for details. - -* Symlinks are now followed when locking a file, which can be - necessary when multiple worktrees share a base repository. - -* You can now set your own user-agent to be sent for HTTP requests by - using the `GIT_OPT_SET_USER_AGENT` with `git_libgit2_opts()`. - -* You can set custom HTTP header fields to be sent along with requests - by passing them in the fetch and push options. - -* Tree objects are now assumed to be sorted. If a tree is not - correctly formed, it will give bad results. This is the git approach - and cuts a significant amount of time when reading the trees. - -* Filter registration is now protected against concurrent - registration. - -* Filenames which are not valid on Windows in an index no longer cause - to fail to parse it on that OS. - -* Rebases can now be performed purely in-memory, without touching the - repository's workdir. - -* When adding objects to the index, or when creating new tree or commit - objects, the inputs are validated to ensure that the dependent objects - exist and are of the correct type. This object validation can be - disabled with the GIT_OPT_ENABLE_STRICT_OBJECT_CREATION option. - -* The WinHTTP transport's handling of bad credentials now behaves like - the others, asking for credentials again. - -### API additions - -* `git_config_lock()` has been added, which allow for - transactional/atomic complex updates to the configuration, removing - the opportunity for concurrent operations and not committing any - changes until the unlock. - -* `git_diff_options` added a new callback `progress_cb` to report on the - progress of the diff as files are being compared. The documentation of - the existing callback `notify_cb` was updated to reflect that it only - gets called when new deltas are added to the diff. - -* `git_fetch_options` and `git_push_options` have gained a `custom_headers` - field to set the extra HTTP header fields to send. - -* `git_stream_register_tls()` lets you register a callback to be used - as the constructor for a TLS stream instead of the libgit2 built-in - one. - -* `git_commit_header_field()` allows you to look up a specific header - field in a commit. - -* `git_commit_extract_signature()` extracts the signature from a - commit and gives you both the signature and the signed data so you - can verify it. - -### API removals - -* No APIs were removed in this version. - -### Breaking API changes - -* The `git_merge_tree_flag_t` is now `git_merge_flag_t`. Subsequently, - its members are no longer prefixed with `GIT_MERGE_TREE_FLAG` but are - now prefixed with `GIT_MERGE_FLAG`, and the `tree_flags` field of the - `git_merge_options` structure is now named `flags`. - -* The `git_merge_file_flags_t` enum is now `git_merge_file_flag_t` for - consistency with other enum type names. - -* `git_cert` descendent types now have a proper `parent` member - -* It is the responsibility of the refdb backend to decide what to do - with the reflog on ref deletion. The file-based backend must delete - it, a database-backed one may wish to archive it. - -* `git_config_backend` has gained two entries. `lock` and `unlock` - with which to implement the transactional/atomic semantics for the - configuration backend. - -* `git_index_add` and `git_index_conflict_add()` will now use the case - as provided by the caller on case insensitive systems. Previous - versions would keep the case as it existed in the index. This does - not affect the higher-level `git_index_add_bypath` or - `git_index_add_frombuffer` functions. - -* The `notify_payload` field of `git_diff_options` was renamed to `payload` - to reflect that it's also the payload for the new progress callback. - -* The `git_config_level_t` enum has gained a higher-priority value - `GIT_CONFIG_LEVEL_PROGRAMDATA` which represent a rough Windows equivalent - to the system level configuration. - -* `git_rebase_init()` not also takes a merge options. - -* The index no longer performs locking itself. This is not something - users of the library should have been relying on as it's not part of - the concurrency guarantees. - -v0.23 ------- - -### Changes or improvements - -* Patience and minimal diff drivers can now be used for merges. - -* Merges can now ignore whitespace changes. - -* Updated binary identification in CRLF filtering to avoid false positives in - UTF-8 files. - -* Rename and copy detection is enabled for small files. - -* Checkout can now handle an initial checkout of a repository, making - `GIT_CHECKOUT_SAFE_CREATE` unnecessary for users of clone. - -* The signature parameter in the ref-modifying functions has been - removed. Use `git_repository_set_ident()` and - `git_repository_ident()` to override the signature to be used. - -* The local transport now auto-scales the number of threads to use - when creating the packfile instead of sticking to one. - -* Reference renaming now uses the right id for the old value. - -* The annotated version of branch creation, HEAD detaching and reset - allow for specifying the expression from the user to be put into the - reflog. - -* `git_rebase_commit` now returns `GIT_EUNMERGED` when you attempt to - commit with unstaged changes. - -* On Mac OS X, we now use SecureTransport to provide the cryptographic - support for HTTPS connections insead of OpenSSL. - -* Checkout can now accept an index for the baseline computations via the - `baseline_index` member. - -* The configuration for fetching is no longer stored inside the - `git_remote` struct but has been moved to a `git_fetch_options`. The - remote functions now take these options or the callbacks instead of - setting them beforehand. - -* `git_submodule` instances are no longer cached or shared across - lookup. Each submodule represents the configuration at the time of - loading. - -* The index now uses diffs for `add_all()` and `update_all()` which - gives it a speed boost and closer semantics to git. - -* The ssh transport now reports the stderr output from the server as - the error message, which allows you to get the "repository not - found" messages. - -* `git_index_conflict_add()` will remove staged entries that exist for - conflicted paths. - -* The flags for a `git_diff_file` will now have the `GIT_DIFF_FLAG_EXISTS` - bit set when a file exists on that side of the diff. This is useful - for understanding whether a side of the diff exists in the presence of - a conflict. - -* The constructor for a write-stream into the odb now takes - `git_off_t` instead of `size_t` for the size of the blob, which - allows putting large files into the odb on 32-bit systems. - -* The remote's push and pull URLs now honor the url.$URL.insteadOf - configuration. This allows modifying URL prefixes to a custom - value via gitconfig. - -* `git_diff_foreach`, `git_diff_blobs`, `git_diff_blob_to_buffer`, - and `git_diff_buffers` now accept a new binary callback of type - `git_diff_binary_cb` that includes the binary diff information. - -* The race condition mitigations described in `racy-git.txt` have been - implemented. - -* If libcurl is installed, we will use it to connect to HTTP(S) - servers. - -### API additions - -* The `git_merge_options` gained a `file_flags` member. - -* Parsing and retrieving a configuration value as a path is exposed - via `git_config_parse_path()` and `git_config_get_path()` - respectively. - -* `git_repository_set_ident()` and `git_repository_ident()` serve to - set and query which identity will be used when writing to the - reflog. - -* `git_config_entry_free()` frees a config entry. - -* `git_config_get_string_buf()` provides a way to safely retrieve a - string from a non-snapshot configuration. - -* `git_annotated_commit_from_revspec()` allows to get an annotated - commit from an extended sha synatx string. - -* `git_repository_set_head_detached_from_annotated()`, - `git_branch_create_from_annotated()` and - `git_reset_from_annotated()` allow for the caller to provide an - annotated commit through which they can control what expression is - put into the reflog as the source/target. - -* `git_index_add_frombuffer()` can now create a blob from memory - buffer and add it to the index which is attached to a repository. - -* The structure `git_fetch_options` has been added to determine the - runtime configuration for fetching, such as callbacks, pruning and - autotag behaviour. It has the runtime initializer - `git_fetch_init_options()`. - -* The enum `git_fetch_prune_t` has been added, letting you specify the - pruning behaviour for a fetch. - -* A push operation will notify the caller of what updates it indends - to perform on the remote, which provides similar information to - git's pre-push hook. - -* `git_stash_apply()` can now apply a stashed state from the stash list, - placing the data into the working directory and index. - -* `git_stash_pop()` will apply a stashed state (like `git_stash_apply()`) - but will remove the stashed state after a successful application. - -* A new error code `GIT_EEOF` indicates an early EOF from the - server. This typically indicates an error with the URL or - configuration of the server, and tools can use this to show messages - about failing to communicate with the server. - -* A new error code `GIT_EINVALID` indicates that an argument to a - function is invalid, or an invalid operation was requested. - -* `git_diff_index_to_workdir()` and `git_diff_tree_to_index()` will now - produce deltas of type `GIT_DELTA_CONFLICTED` to indicate that the index - side of the delta is a conflict. - -* The `git_status` family of functions will now produce status of type - `GIT_STATUS_CONFLICTED` to indicate that a conflict exists for that file - in the index. - -* `git_index_entry_is_conflict()` is a utility function to determine if - a given index entry has a non-zero stage entry, indicating that it is - one side of a conflict. - -* It is now possible to pass a keypair via a buffer instead of a - path. For this, `GIT_CREDTYPE_SSH_MEMORY` and - `git_cred_ssh_key_memory_new()` have been added. - -* `git_filter_list_contains` will indicate whether a particular - filter will be run in the given filter list. - -* `git_commit_header_field()` has been added, which allows retrieving - the contents of an arbitrary header field. - -* `git_submodule_set_branch()` allows to set the configured branch for - a submodule. - -### API removals - -* `git_remote_save()` and `git_remote_clear_refspecs()` have been - removed. Remote's configuration is changed via the configuration - directly or through a convenience function which performs changes to - the configuration directly. - -* `git_remote_set_callbacks()`, `git_remote_get_callbacks()` and - `git_remote_set_transport()` have been removed and the remote no - longer stores this configuration. - -* `git_remote_set_fetch_refpecs()` and - `git_remote_set_push_refspecs()` have been removed. There is no - longer a way to set the base refspecs at run-time. - -* `git_submodule_save()` has been removed. The submodules are no - longer configured via the objects. - -* `git_submodule_reload_all()` has been removed as we no longer cache - submodules. - -### Breaking API changes - -* `git_smart_subtransport_cb` now has a `param` parameter. - -* The `git_merge_options` structure member `flags` has been renamed - to `tree_flags`. - -* The `git_merge_file_options` structure member `flags` is now - an unsigned int. It was previously a `git_merge_file_flags_t`. - -* `GIT_CHECKOUT_SAFE_CREATE` has been removed. Most users will generally - be able to switch to `GIT_CHECKOUT_SAFE`, but if you require missing - file handling during checkout, you may now use `GIT_CHECKOUT_SAFE | - GIT_CHECKOUT_RECREATE_MISSING`. - -* The `git_clone_options` and `git_submodule_update_options` - structures no longer have a `signature` field. - -* The following functions have removed the signature and/or log message - parameters in favour of git-emulating ones. - - * `git_branch_create()`, `git_branch_move()` - * `git_rebase_init()`, `git_rebase_abort()` - * `git_reference_symbolic_create_matching()`, - `git_reference_symbolic_create()`, `git_reference_create()`, - `git_reference_create_matching()`, - `git_reference_symbolic_set_target()`, - `git_reference_set_target()`, `git_reference_rename()` - * `git_remote_update_tips()`, `git_remote_fetch()`, `git_remote_push()` - * `git_repository_set_head()`, - `git_repository_set_head_detached()`, - `git_repository_detach_head()` - * `git_reset()` - -* `git_config_get_entry()` now gives back a ref-counted - `git_config_entry`. You must free it when you no longer need it. - -* `git_config_get_string()` will return an error if used on a - non-snapshot configuration, as there can be no guarantee that the - returned pointer is valid. - -* `git_note_default_ref()` now uses a `git_buf` to return the string, - as the string is otherwise not guaranteed to stay allocated. - -* `git_rebase_operation_current()` will return `GIT_REBASE_NO_OPERATION` - if it is called immediately after creating a rebase session but before - you have applied the first patch. - -* `git_rebase_options` now contains a `git_checkout_options` struct - that will be used for functions that modify the working directory, - namely `git_rebase_init`, `git_rebase_next` and - `git_rebase_abort`. As a result, `git_rebase_open` now also takes - a `git_rebase_options` and only the `git_rebase_init` and - `git_rebase_open` functions take a `git_rebase_options`, where they - will persist the options to subsequent `git_rebase` calls. - -* The `git_clone_options` struct now has fetch options in a - `fetch_opts` field instead of remote callbacks in - `remote_callbacks`. - -* The remote callbacks has gained a new member `push_negotiation` - which gets called before sending the update commands to the server. - -* The following functions no longer act on a remote instance but - change the repository's configuration. Their signatures have changed - accordingly: - - * `git_remote_set_url()`, `git_remote_seturl()` - * `git_remote_add_fetch()`, `git_remote_add_push()` and - * `git_remote_set_autotag()` - -* `git_remote_connect()` and `git_remote_prune()` now take a pointer - to the callbacks. - -* `git_remote_fetch()` and `git_remote_download()` now take a pointer - to fetch options which determine the runtime configuration. - -* The `git_remote_autotag_option_t` values have been changed. It has - gained a `_UNSPECIFIED` default value to specify no override for the - configured setting. - -* `git_remote_update_tips()` now takes a pointer to the callbacks as - well as a boolean whether to write `FETCH_HEAD` and the autotag - setting. - -* `git_remote_create_anonymous()` no longer takes a fetch refspec as - url-only remotes cannot have configured refspecs. - -* The `git_submodule_update_options` struct now has fetch options in - the `fetch_opts` field instead of callbacks in the - `remote_callbacks` field. - -* The following functions no longer act on a submodule instance but - change the repository's configuration. Their signatures have changed - accordingly: - - * `git_submodule_set_url()`, `git_submodule_set_ignore()`, - `git_submodule_set_update()`, - `git_submodule_set_fetch_recurse_submodules()`. - -* `git_submodule_status()` no longer takes a submodule instance but a - repsitory, a submodule name and an ignore setting. - -* The `push` function in the `git_transport` interface now takes a - pointer to the remote callbacks. - -* The `git_index_entry` struct's fields' types have been changed to - more accurately reflect what is in fact stored in the - index. Specifically, time and file size are 32 bits intead of 64, as - these values are truncated. - -* `GIT_EMERGECONFLICT` is now `GIT_ECONFLICT`, which more accurately - describes the nature of the error. - -* It is no longer allowed to call `git_buf_grow()` on buffers - borrowing the memory they point to. - -v0.22 ------- - -### Changes or improvements - -* `git_signature_new()` now requires a non-empty email address. - -* Use CommonCrypto libraries for SHA-1 calculation on Mac OS X. - -* Disable SSL compression and SSLv2 and SSLv3 ciphers in favor of TLSv1 - in OpenSSL. - -* The fetch behavior of remotes with autotag set to `GIT_REMOTE_DOWNLOAD_TAGS_ALL` - has been changed to match git 1.9.0 and later. In this mode, libgit2 now - fetches all tags in addition to whatever else needs to be fetched. - -* `git_checkout()` now handles case-changing renames correctly on - case-insensitive filesystems; for example renaming "readme" to "README". - -* The search for libssh2 is now done via pkg-config instead of a - custom search of a few directories. - -* Add support for core.protectHFS and core.protectNTFS. Add more - validation for filenames which we write such as references. - -* The local transport now generates textual progress output like - git-upload-pack does ("counting objects"). - -* `git_checkout_index()` can now check out an in-memory index that is not - necessarily the repository's index, so you may check out an index - that was produced by git_merge and friends while retaining the cached - information. - -* Remove the default timeout for receiving / sending data over HTTP using - the WinHTTP transport layer. - -* Add SPNEGO (Kerberos) authentication using GSSAPI on Unix systems. - -* Provide built-in objects for the empty blob (e69de29) and empty - tree (4b825dc) objects. - -* The index' tree cache is now filled upon read-tree and write-tree - and the cache is written to disk. - -* LF -> CRLF filter refuses to handle mixed-EOL files - -* LF -> CRLF filter now runs when * text = auto (with Git for Windows 1.9.4) - -* File unlocks are atomic again via rename. Read-only files on Windows are - made read-write if necessary. - -* Share open packfiles across repositories to share descriptors and mmaps. - -* Use a map for the treebuilder, making insertion O(1) - -* The build system now accepts an option EMBED_SSH_PATH which when set - tells it to include a copy of libssh2 at the given location. This is - enabled for MSVC. - -* Add support for refspecs with the asterisk in the middle of a - pattern. - -* Fetching now performs opportunistic updates. To achieve this, we - introduce a difference between active and passive refspecs, which - make `git_remote_download()` and `git_remote_fetch()` to take a list of - resfpecs to be the active list, similarly to how git fetch accepts a - list on the command-line. - -* The THREADSAFE option to build libgit2 with threading support has - been flipped to be on by default. - -* The remote object has learnt to prune remote-tracking branches. If - the remote is configured to do so, this will happen via - `git_remote_fetch()`. You can also call `git_remote_prune()` after - connecting or fetching to perform the prune. - - -### API additions - -* Introduce `git_buf_text_is_binary()` and `git_buf_text_contains_nul()` for - consumers to perform binary detection on a git_buf. - -* `git_branch_upstream_remote()` has been introduced to provide the - branch..remote configuration value. - -* Introduce `git_describe_commit()` and `git_describe_workdir()` to provide - a description of the current commit (and working tree, respectively) - based on the nearest tag or reference - -* Introduce `git_merge_bases()` and the `git_oidarray` type to expose all - merge bases between two commits. - -* Introduce `git_merge_bases_many()` to expose all merge bases between - multiple commits. - -* Introduce rebase functionality (using the merge algorithm only). - Introduce `git_rebase_init()` to begin a new rebase session, - `git_rebase_open()` to open an in-progress rebase session, - `git_rebase_commit()` to commit the current rebase operation, - `git_rebase_next()` to apply the next rebase operation, - `git_rebase_abort()` to abort an in-progress rebase and `git_rebase_finish()` - to complete a rebase operation. - -* Introduce `git_note_author()` and `git_note_committer()` to get the author - and committer information on a `git_note`, respectively. - -* A factory function for ssh has been added which allows to change the - path of the programs to execute for receive-pack and upload-pack on - the server, `git_transport_ssh_with_paths()`. - -* The ssh transport supports asking the remote host for accepted - credential types as well as multiple challeges using a single - connection. This requires to know which username you want to connect - as, so this introduces the USERNAME credential type which the ssh - transport will use to ask for the username. - -* The `GIT_EPEEL` error code has been introduced when we cannot peel a tag - to the requested object type; if the given object otherwise cannot be - peeled, `GIT_EINVALIDSPEC` is returned. - -* Introduce `GIT_REPOSITORY_INIT_RELATIVE_GITLINK` to use relative paths - when writing gitlinks, as is used by git core for submodules. - -* `git_remote_prune()` has been added. See above for description. - - -* Introduce reference transactions, which allow multiple references to - be locked at the same time and updates be queued. This also allows - us to safely update a reflog with arbitrary contents, as we need to - do for stash. - -### API removals - -* `git_remote_supported_url()` and `git_remote_is_valid_url()` have been - removed as they have become essentially useless with rsync-style ssh paths. - -* `git_clone_into()` and `git_clone_local_into()` have been removed from the - public API in favour of `git_clone callbacks`. - -* The option to ignore certificate errors via `git_remote_cert_check()` - is no longer present. Instead, `git_remote_callbacks` has gained a new - entry which lets the user perform their own certificate checks. - -### Breaking API changes - -* `git_cherry_pick()` is now `git_cherrypick()`. - -* The `git_submodule_update()` function was renamed to - `git_submodule_update_strategy()`. `git_submodule_update()` is now used to - provide functionalty similar to "git submodule update". - -* `git_treebuilder_create()` was renamed to `git_treebuilder_new()` to better - reflect it being a constructor rather than something which writes to - disk. - -* `git_treebuilder_new()` (was `git_treebuilder_create()`) now takes a - repository so that it can query repository configuration. - Subsequently, `git_treebuilder_write()` no longer takes a repository. - -* `git_threads_init()` and `git_threads_shutdown()` have been renamed to - `git_libgit2_init()` and `git_libgit2_shutdown()` to better explain what - their purpose is, as it's grown to be more than just about threads. - -* `git_libgit2_init()` and `git_libgit2_shutdown()` now return the number of - initializations of the library, so consumers may schedule work on the - first initialization. - -* The `git_transport_register()` function no longer takes a priority and takes - a URL scheme name (eg "http") instead of a prefix like "http://" - -* `git_index_name_entrycount()` and `git_index_reuc_entrycount()` now - return size_t instead of unsigned int. - -* The `context_lines` and `interhunk_lines` fields in `git_diff`_options are - now `uint32_t` instead of `uint16_t`. This allows to set them to `UINT_MAX`, - in effect asking for "infinite" context e.g. to iterate over all the - unmodified lines of a diff. - -* `git_status_file()` now takes an exact path. Use `git_status_list_new()` if - pathspec searching is needed. - -* `git_note_create()` has changed the position of the notes reference - name to match `git_note_remove()`. - -* Rename `git_remote_load()` to `git_remote_lookup()` to bring it in line - with the rest of the lookup functions. - -* `git_remote_rename()` now takes the repository and the remote's - current name. Accepting a remote indicates we want to change it, - which we only did partially. It is much clearer if we accept a name - and no loaded objects are changed. - -* `git_remote_delete()` now accepts the repository and the remote's name - instead of a loaded remote. - -* `git_merge_head` is now `git_annotated_commit`, to better reflect its usage - for multiple functions (including rebase) - -* The `git_clone_options` struct no longer provides the `ignore_cert_errors` or - `remote_name` members for remote customization. - - Instead, the `git_clone_options` struct has two new members, `remote_cb` and - `remote_cb_payload`, which allow the caller to completely override the remote - creation process. If needed, the caller can use this callback to give their - remote a name other than the default (origin) or disable cert checking. - - The `remote_callbacks` member has been preserved for convenience, although it - is not used when a remote creation callback is supplied. - -* The `git_clone`_options struct now provides `repository_cb` and - `repository_cb_payload` to allow the user to create a repository with - custom options. - -* The `git_push` struct to perform a push has been replaced with - `git_remote_upload()`. The refspecs and options are passed as a - function argument. `git_push_update_tips()` is now also - `git_remote_update_tips()` and the callbacks are in the same struct as - the rest. - -* The `git_remote_set_transport()` function now sets a transport factory function, - rather than a pre-existing transport instance. - -* The `git_transport` structure definition has moved into the sys/transport.h - file. - -* libgit2 no longer automatically sets the OpenSSL locking - functions. This is not something which we can know to do. A - last-resort convenience function is provided in sys/openssl.h, - `git_openssl_set_locking()` which can be used to set the locking. diff --git a/vendor/libgit2/CMakeLists.txt b/vendor/libgit2/CMakeLists.txt deleted file mode 100644 index c79b2637c..000000000 --- a/vendor/libgit2/CMakeLists.txt +++ /dev/null @@ -1,714 +0,0 @@ -# CMake build script for the libgit2 project -# -# Building (out of source build): -# > mkdir build && cd build -# > cmake .. [-DSETTINGS=VALUE] -# > cmake --build . -# -# Testing: -# > ctest -V -# -# Install: -# > cmake --build . --target install - -PROJECT(libgit2 C) -CMAKE_MINIMUM_REQUIRED(VERSION 2.8) -CMAKE_POLICY(SET CMP0015 NEW) - -# Add find modules to the path -SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/") - -INCLUDE(CheckLibraryExists) -INCLUDE(CheckFunctionExists) -INCLUDE(CheckStructHasMember) -INCLUDE(AddCFlagIfSupported) -INCLUDE(FindPkgConfig) - -# Build options -# -OPTION( SONAME "Set the (SO)VERSION of the target" ON ) -OPTION( BUILD_SHARED_LIBS "Build Shared Library (OFF for Static)" ON ) -OPTION( THREADSAFE "Build libgit2 as threadsafe" ON ) -OPTION( BUILD_CLAR "Build Tests using the Clar suite" ON ) -OPTION( BUILD_EXAMPLES "Build library usage example apps" OFF ) -OPTION( TAGS "Generate tags" OFF ) -OPTION( PROFILE "Generate profiling information" OFF ) -OPTION( ENABLE_TRACE "Enables tracing support" OFF ) -OPTION( LIBGIT2_FILENAME "Name of the produced binary" OFF ) - -OPTION( USE_ICONV "Link with and use iconv library" OFF ) -OPTION( USE_SSH "Link with libssh to enable SSH support" ON ) -OPTION( USE_GSSAPI "Link with libgssapi for SPNEGO auth" OFF ) -OPTION( VALGRIND "Configure build for valgrind" OFF ) -OPTION( CURL "User curl for HTTP if available" ON) -OPTION( DEBUG_POOL "Enable debug pool allocator" OFF ) - -IF(DEBUG_POOL) - ADD_DEFINITIONS(-DGIT_DEBUG_POOL) -ENDIF() - -IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - SET( USE_ICONV ON ) - FIND_PACKAGE(Security) - FIND_PACKAGE(CoreFoundation REQUIRED) -ENDIF() - -IF(MSVC) - # This option is only available when building with MSVC. By default, libgit2 - # is build using the cdecl calling convention, which is useful if you're - # writing C. However, the CLR and Win32 API both expect stdcall. - # - # If you are writing a CLR program and want to link to libgit2, you'll want - # to turn this on by invoking CMake with the "-DSTDCALL=ON" argument. - OPTION( STDCALL "Build libgit2 with the __stdcall convention" OFF ) - - # This option must match the settings used in your program, in particular if you - # are linking statically - OPTION( STATIC_CRT "Link the static CRT libraries" ON ) - - # If you want to embed a copy of libssh2 into libgit2, pass a - # path to libssh2 - OPTION( EMBED_SSH_PATH "Path to libssh2 to embed (Windows)" OFF ) - - ADD_DEFINITIONS(-D_SCL_SECURE_NO_WARNINGS) - ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE) - ADD_DEFINITIONS(-D_CRT_NONSTDC_NO_DEPRECATE) -ENDIF() - - -IF(WIN32) - # By default, libgit2 is built with WinHTTP. To use the built-in - # HTTP transport, invoke CMake with the "-DWINHTTP=OFF" argument. - OPTION( WINHTTP "Use Win32 WinHTTP routines" ON ) -ENDIF() - -IF(MSVC) - # Enable MSVC CRTDBG memory leak reporting when in debug mode. - OPTION(MSVC_CRTDBG "Enable CRTDBG memory leak reporting" OFF) -ENDIF() - -IF (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - OPTION( USE_OPENSSL "Link with and use openssl library" ON ) -ENDIF() - -CHECK_STRUCT_HAS_MEMBER ("struct stat" st_mtim "sys/types.h;sys/stat.h" - HAVE_STRUCT_STAT_ST_MTIM LANGUAGE C) -CHECK_STRUCT_HAS_MEMBER ("struct stat" st_mtimespec "sys/types.h;sys/stat.h" - HAVE_STRUCT_STAT_ST_MTIMESPEC LANGUAGE C) -CHECK_STRUCT_HAS_MEMBER("struct stat" st_mtime_nsec sys/stat.h - HAVE_STRUCT_STAT_MTIME_NSEC LANGUAGE C) - -IF (HAVE_STRUCT_STAT_ST_MTIM) - CHECK_STRUCT_HAS_MEMBER("struct stat" st_mtim.tv_nsec sys/stat.h - HAVE_STRUCT_STAT_NSEC LANGUAGE C) -ELSEIF (HAVE_STRUCT_STAT_ST_MTIMESPEC) - CHECK_STRUCT_HAS_MEMBER("struct stat" st_mtimespec.tv_nsec sys/stat.h - HAVE_STRUCT_STAT_NSEC LANGUAGE C) -ELSE () - SET( HAVE_STRUCT_STAT_NSEC ON ) -ENDIF() - -IF (HAVE_STRUCT_STAT_NSEC OR WIN32) - OPTION( USE_NSEC "Care about sub-second file mtimes and ctimes" OFF ) -ENDIF() - -# This variable will contain the libraries we need to put into -# libgit2.pc's Requires.private. That is, what we're linking to or -# what someone who's statically linking us needs to link to. -SET(LIBGIT2_PC_REQUIRES "") -# This will be set later if we use the system's http-parser library or -# use iconv (OSX) and will be written to the Libs.private field in the -# pc file. -SET(LIBGIT2_PC_LIBS "") - -# Installation paths -# -SET(BIN_INSTALL_DIR bin CACHE PATH "Where to install binaries to.") -SET(LIB_INSTALL_DIR lib CACHE PATH "Where to install libraries to.") -SET(INCLUDE_INSTALL_DIR include CACHE PATH "Where to install headers to.") - -# Set a couple variables to be substituted inside the .pc file. -# We can't just use LIB_INSTALL_DIR in the .pc file, as passing them as absolue -# or relative paths is both valid and supported by cmake. -SET (PKGCONFIG_PREFIX ${CMAKE_INSTALL_PREFIX}) - -IF(IS_ABSOLUTE ${LIB_INSTALL_DIR}) - SET (PKGCONFIG_LIBDIR ${LIB_INSTALL_DIR}) -ELSE(IS_ABSOLUTE ${LIB_INSTALL_DIR}) - SET (PKGCONFIG_LIBDIR "\${prefix}/${LIB_INSTALL_DIR}") -ENDIF (IS_ABSOLUTE ${LIB_INSTALL_DIR}) - -IF(IS_ABSOLUTE ${INCLUDE_INSTALL_DIR}) - SET (PKGCONFIG_INCLUDEDIR ${INCLUDE_INSTALL_DIR}) -ELSE(IS_ABSOLUTE ${INCLUDE_INSTALL_DIR}) - SET (PKGCONFIG_INCLUDEDIR "\${prefix}/${INCLUDE_INSTALL_DIR}") -ENDIF(IS_ABSOLUTE ${INCLUDE_INSTALL_DIR}) - -FUNCTION(TARGET_OS_LIBRARIES target) - IF(WIN32) - TARGET_LINK_LIBRARIES(${target} ws2_32) - ELSEIF(CMAKE_SYSTEM_NAME MATCHES "(Solaris|SunOS)") - TARGET_LINK_LIBRARIES(${target} socket nsl) - LIST(APPEND LIBGIT2_PC_LIBS "-lsocket" "-lnsl") - SET(LIBGIT2_PC_LIBS ${LIBGIT2_PC_LIBS} PARENT_SCOPE) - ENDIF() - CHECK_LIBRARY_EXISTS(rt clock_gettime "time.h" NEED_LIBRT) - IF(NEED_LIBRT) - TARGET_LINK_LIBRARIES(${target} rt) - LIST(APPEND LIBGIT2_PC_LIBS "-lrt") - SET(LIBGIT2_PC_LIBS ${LIBGIT2_PC_LIBS} PARENT_SCOPE) - ENDIF() - - IF(THREADSAFE) - TARGET_LINK_LIBRARIES(${target} ${CMAKE_THREAD_LIBS_INIT}) - ENDIF() -ENDFUNCTION() - -# This function splits the sources files up into their appropriate -# subdirectories. This is especially useful for IDEs like Xcode and -# Visual Studio, so that you can navigate into the libgit2_clar project, -# and see the folders within the tests folder (instead of just seeing all -# source and tests in a single folder.) -FUNCTION(IDE_SPLIT_SOURCES target) - IF(MSVC_IDE OR CMAKE_GENERATOR STREQUAL Xcode) - GET_TARGET_PROPERTY(sources ${target} SOURCES) - FOREACH(source ${sources}) - IF(source MATCHES ".*/") - STRING(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" rel ${source}) - IF(rel) - STRING(REGEX REPLACE "/([^/]*)$" "" rel ${rel}) - IF(rel) - STRING(REPLACE "/" "\\\\" rel ${rel}) - SOURCE_GROUP(${rel} FILES ${source}) - ENDIF() - ENDIF() - ENDIF() - ENDFOREACH() - ENDIF() -ENDFUNCTION() - -FILE(STRINGS "include/git2/version.h" GIT2_HEADER REGEX "^#define LIBGIT2_VERSION \"[^\"]*\"$") - -STRING(REGEX REPLACE "^.*LIBGIT2_VERSION \"([0-9]+).*$" "\\1" LIBGIT2_VERSION_MAJOR "${GIT2_HEADER}") -STRING(REGEX REPLACE "^.*LIBGIT2_VERSION \"[0-9]+\\.([0-9]+).*$" "\\1" LIBGIT2_VERSION_MINOR "${GIT2_HEADER}") -STRING(REGEX REPLACE "^.*LIBGIT2_VERSION \"[0-9]+\\.[0-9]+\\.([0-9]+).*$" "\\1" LIBGIT2_VERSION_REV "${GIT2_HEADER}") -SET(LIBGIT2_VERSION_STRING "${LIBGIT2_VERSION_MAJOR}.${LIBGIT2_VERSION_MINOR}.${LIBGIT2_VERSION_REV}") - -FILE(STRINGS "include/git2/version.h" GIT2_HEADER_SOVERSION REGEX "^#define LIBGIT2_SOVERSION [0-9]+$") -STRING(REGEX REPLACE "^.*LIBGIT2_SOVERSION ([0-9]+)$" "\\1" LIBGIT2_SOVERSION "${GIT2_HEADER_SOVERSION}") - -# Find required dependencies -INCLUDE_DIRECTORIES(src include) - -IF (SECURITY_FOUND) - # OS X 10.7 and older do not have some functions we use, fall back to OpenSSL there - CHECK_LIBRARY_EXISTS("${SECURITY_DIRS}" SSLCreateContext "Security/SecureTransport.h" HAVE_NEWER_SECURITY) - IF (HAVE_NEWER_SECURITY) - MESSAGE("-- Found Security ${SECURITY_DIRS}") - LIST(APPEND LIBGIT2_PC_LIBS "-framework Security") - ELSE() - MESSAGE("-- Security framework is too old, falling back to OpenSSL") - SET(SECURITY_FOUND "NO") - SET(SECURITY_DIRS "") - SET(SECURITY_DIR "") - SET(USE_OPENSSL "ON") - ENDIF() -ENDIF() - -IF (COREFOUNDATION_FOUND) - MESSAGE("-- Found CoreFoundation ${COREFOUNDATION_DIRS}") - LIST(APPEND LIBGIT2_PC_LIBS "-framework CoreFoundation") -ENDIF() - - -IF (WIN32 AND EMBED_SSH_PATH) - FILE(GLOB SRC_SSH "${EMBED_SSH_PATH}/src/*.c") - INCLUDE_DIRECTORIES("${EMBED_SSH_PATH}/include") - FILE(WRITE "${EMBED_SSH_PATH}/src/libssh2_config.h" "#define HAVE_WINCNG\n#define LIBSSH2_WINCNG\n#include \"../win32/libssh2_config.h\"") - ADD_DEFINITIONS(-DGIT_SSH) -ENDIF() - -IF (WIN32 AND WINHTTP) - ADD_DEFINITIONS(-DGIT_WINHTTP) - INCLUDE_DIRECTORIES(deps/http-parser) - FILE(GLOB SRC_HTTP deps/http-parser/*.c deps/http-parser/*.h) - - # Since MinGW does not come with headers or an import library for winhttp, - # we have to include a private header and generate our own import library - IF (MINGW) - FIND_PROGRAM(DLLTOOL dlltool CMAKE_FIND_ROOT_PATH_BOTH) - IF (NOT DLLTOOL) - MESSAGE(FATAL_ERROR "Could not find dlltool command") - ENDIF () - - SET(LIBWINHTTP_PATH "${CMAKE_CURRENT_BINARY_DIR}/deps/winhttp") - FILE(MAKE_DIRECTORY ${LIBWINHTTP_PATH}) - - IF (CMAKE_SIZEOF_VOID_P EQUAL 8) - set(WINHTTP_DEF "${CMAKE_CURRENT_SOURCE_DIR}/deps/winhttp/winhttp64.def") - ELSE() - set(WINHTTP_DEF "${CMAKE_CURRENT_SOURCE_DIR}/deps/winhttp/winhttp.def") - ENDIF() - - ADD_CUSTOM_COMMAND( - OUTPUT ${LIBWINHTTP_PATH}/libwinhttp.a - COMMAND ${DLLTOOL} -d ${WINHTTP_DEF} -k -D winhttp.dll -l libwinhttp.a - DEPENDS ${WINHTTP_DEF} - WORKING_DIRECTORY ${LIBWINHTTP_PATH} - ) - - SET_SOURCE_FILES_PROPERTIES( - ${CMAKE_CURRENT_SOURCE_DIR}/src/transports/winhttp.c - PROPERTIES OBJECT_DEPENDS ${LIBWINHTTP_PATH}/libwinhttp.a - ) - - INCLUDE_DIRECTORIES(deps/winhttp) - LINK_DIRECTORIES(${LIBWINHTTP_PATH}) - ENDIF () - - LINK_LIBRARIES(winhttp rpcrt4 crypt32 ole32) - LIST(APPEND LIBGIT2_PC_LIBS "-lwinhttp" "-lrpcrt4" "-lcrypt32" "-lole32") -ELSE () - IF (CURL) - PKG_CHECK_MODULES(CURL libcurl) - ENDIF () - - IF (NOT AMIGA AND USE_OPENSSL) - FIND_PACKAGE(OpenSSL) - ENDIF () - - IF (CURL_FOUND) - ADD_DEFINITIONS(-DGIT_CURL) - INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIRS}) - LINK_LIBRARIES(${CURL_LIBRARIES}) - LIST(APPEND LIBGIT2_PC_LIBS ${CURL_LDFLAGS}) - ENDIF() - - FIND_PACKAGE(HTTP_Parser) - IF (HTTP_PARSER_FOUND AND HTTP_PARSER_VERSION_MAJOR EQUAL 2) - INCLUDE_DIRECTORIES(${HTTP_PARSER_INCLUDE_DIRS}) - LINK_LIBRARIES(${HTTP_PARSER_LIBRARIES}) - LIST(APPEND LIBGIT2_PC_LIBS "-lhttp_parser") - ELSE() - MESSAGE(STATUS "http-parser was not found or is too old; using bundled 3rd-party sources.") - INCLUDE_DIRECTORIES(deps/http-parser) - FILE(GLOB SRC_HTTP deps/http-parser/*.c deps/http-parser/*.h) - ENDIF() -ENDIF() - -# Specify sha1 implementation -IF (WIN32 AND NOT MINGW AND NOT SHA1_TYPE STREQUAL "builtin") - ADD_DEFINITIONS(-DWIN32_SHA1) - FILE(GLOB SRC_SHA1 src/hash/hash_win32.c) -ELSEIF (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - ADD_DEFINITIONS(-DGIT_COMMON_CRYPTO) -ELSEIF (OPENSSL_FOUND AND NOT SHA1_TYPE STREQUAL "builtin") - ADD_DEFINITIONS(-DOPENSSL_SHA1) - IF (CMAKE_SYSTEM_NAME MATCHES "FreeBSD") - LIST(APPEND LIBGIT2_PC_LIBS "-lssl") - ELSE() - SET(LIBGIT2_PC_REQUIRES "${LIBGIT2_PC_REQUIRES} openssl") - ENDIF () -ELSE() - FILE(GLOB SRC_SHA1 src/hash/hash_generic.c) -ENDIF() - -# Enable tracing -IF (ENABLE_TRACE STREQUAL "ON") - ADD_DEFINITIONS(-DGIT_TRACE) -ENDIF() - -# Include POSIX regex when it is required -IF(WIN32 OR AMIGA OR CMAKE_SYSTEM_NAME MATCHES "(Solaris|SunOS)") - INCLUDE_DIRECTORIES(deps/regex) - SET(SRC_REGEX deps/regex/regex.c) -ENDIF() - -# Optional external dependency: zlib -FIND_PACKAGE(ZLIB) -IF (ZLIB_FOUND) - INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIRS}) - LINK_LIBRARIES(${ZLIB_LIBRARIES}) - IF(APPLE OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD") - LIST(APPEND LIBGIT2_PC_LIBS "-lz") - ELSE() - SET(LIBGIT2_PC_REQUIRES "${LIBGIT2_PC_REQUIRES} zlib") - ENDIF() -ELSE() - MESSAGE(STATUS "zlib was not found; using bundled 3rd-party sources." ) - INCLUDE_DIRECTORIES(deps/zlib) - ADD_DEFINITIONS(-DNO_VIZ -DSTDC -DNO_GZIP) - FILE(GLOB SRC_ZLIB deps/zlib/*.c deps/zlib/*.h) -ENDIF() - -# Optional external dependency: libssh2 -IF (USE_SSH) - PKG_CHECK_MODULES(LIBSSH2 libssh2) -ENDIF() -IF (LIBSSH2_FOUND) - ADD_DEFINITIONS(-DGIT_SSH) - INCLUDE_DIRECTORIES(${LIBSSH2_INCLUDE_DIRS}) - LINK_DIRECTORIES(${LIBSSH2_LIBRARY_DIRS}) - LIST(APPEND LIBGIT2_PC_LIBS ${LIBSSH2_LDFLAGS}) - #SET(LIBGIT2_PC_LIBS "${LIBGIT2_PC_LIBS} ${LIBSSH2_LDFLAGS}") - SET(SSH_LIBRARIES ${LIBSSH2_LIBRARIES}) - - CHECK_LIBRARY_EXISTS("${LIBSSH2_LIBRARIES}" libssh2_userauth_publickey_frommemory "${LIBSSH2_LIBRARY_DIRS}" HAVE_LIBSSH2_MEMORY_CREDENTIALS) - IF (HAVE_LIBSSH2_MEMORY_CREDENTIALS) - ADD_DEFINITIONS(-DGIT_SSH_MEMORY_CREDENTIALS) - ENDIF() -ELSE() - MESSAGE(STATUS "LIBSSH2 not found. Set CMAKE_PREFIX_PATH if it is installed outside of the default search path.") -ENDIF() - -# Optional external dependency: libgssapi -IF (USE_GSSAPI) - FIND_PACKAGE(GSSAPI) -ENDIF() -IF (GSSAPI_FOUND) - ADD_DEFINITIONS(-DGIT_GSSAPI) -ENDIF() - -# Optional external dependency: iconv -IF (USE_ICONV) - FIND_PACKAGE(Iconv) -ENDIF() -IF (ICONV_FOUND) - ADD_DEFINITIONS(-DGIT_USE_ICONV) - INCLUDE_DIRECTORIES(${ICONV_INCLUDE_DIR}) - LIST(APPEND LIBGIT2_PC_LIBS ${ICONV_LIBRARIES}) -ENDIF() - -# Platform specific compilation flags -IF (MSVC) - - STRING(REPLACE "/Zm1000" " " CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") - - # /GF - String pooling - # /MP - Parallel build - SET(CMAKE_C_FLAGS "/GF /MP /nologo ${CMAKE_C_FLAGS}") - - IF (STDCALL) - # /Gz - stdcall calling convention - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /Gz") - ENDIF () - - IF (STATIC_CRT) - SET(CRT_FLAG_DEBUG "/MTd") - SET(CRT_FLAG_RELEASE "/MT") - ELSE() - SET(CRT_FLAG_DEBUG "/MDd") - SET(CRT_FLAG_RELEASE "/MD") - ENDIF() - - IF (MSVC_CRTDBG) - SET(CRT_FLAG_DEBUG "${CRT_FLAG_DEBUG} /DGIT_MSVC_CRTDBG") - SET(CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES}" "Dbghelp.lib") - ENDIF() - - # /Zi - Create debugging information - # /Od - Disable optimization - # /D_DEBUG - #define _DEBUG - # /MTd - Statically link the multithreaded debug version of the CRT - # /MDd - Dynamically link the multithreaded debug version of the CRT - # /RTC1 - Run time checks - SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /Zi /Od /D_DEBUG /RTC1 ${CRT_FLAG_DEBUG}") - - # /DNDEBUG - Disables asserts - # /MT - Statically link the multithreaded release version of the CRT - # /MD - Dynamically link the multithreaded release version of the CRT - # /O2 - Optimize for speed - # /Oy - Enable frame pointer omission (FPO) (otherwise CMake will automatically turn it off) - # /GL - Link time code generation (whole program optimization) - # /Gy - Function-level linking - SET(CMAKE_C_FLAGS_RELEASE "/DNDEBUG /O2 /Oy /GL /Gy ${CRT_FLAG_RELEASE}") - - # /Oy- - Disable frame pointer omission (FPO) - SET(CMAKE_C_FLAGS_RELWITHDEBINFO "/DNDEBUG /Zi /O2 /Oy- /GL /Gy ${CRT_FLAG_RELEASE}") - - # /O1 - Optimize for size - SET(CMAKE_C_FLAGS_MINSIZEREL "/DNDEBUG /O1 /Oy /GL /Gy ${CRT_FLAG_RELEASE}") - - # /DYNAMICBASE - Address space load randomization (ASLR) - # /NXCOMPAT - Data execution prevention (DEP) - # /LARGEADDRESSAWARE - >2GB user address space on x86 - # /VERSION - Embed version information in PE header - SET(CMAKE_EXE_LINKER_FLAGS "/DYNAMICBASE /NXCOMPAT /LARGEADDRESSAWARE /VERSION:${LIBGIT2_VERSION_MAJOR}.${LIBGIT2_VERSION_MINOR}") - - # /DEBUG - Create a PDB - # /LTCG - Link time code generation (whole program optimization) - # /OPT:REF /OPT:ICF - Fold out duplicate code at link step - # /INCREMENTAL:NO - Required to use /LTCG - # /DEBUGTYPE:cv,fixup - Additional data embedded in the PDB (requires /INCREMENTAL:NO, so not on for Debug) - SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "/DEBUG") - SET(CMAKE_EXE_LINKER_FLAGS_RELEASE "/RELEASE /LTCG /OPT:REF /OPT:ICF /INCREMENTAL:NO") - SET(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "/DEBUG /RELEASE /LTCG /OPT:REF /OPT:ICF /INCREMENTAL:NO /DEBUGTYPE:cv,fixup") - SET(CMAKE_EXE_LINKER_FLAGS_MINSIZEREL "/RELEASE /LTCG /OPT:REF /OPT:ICF /INCREMENTAL:NO") - - # Same linker settings for DLL as EXE - SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}") - SET(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG}") - SET(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE}") - SET(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO}") - SET(CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL "${CMAKE_EXE_LINKER_FLAGS_MINSIZEREL}") - - SET(WIN_RC "src/win32/git2.rc") - - # Precompiled headers - -ELSE () - SET(CMAKE_C_FLAGS "-D_GNU_SOURCE -Wall -Wextra ${CMAKE_C_FLAGS}") - - IF (CMAKE_SYSTEM_NAME MATCHES "(Solaris|SunOS)") - SET(CMAKE_C_FLAGS "-std=c99 -D_POSIX_C_SOURCE=200112L -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS ${CMAKE_C_FLAGS}") - ENDIF() - - IF (WIN32 AND NOT CYGWIN) - SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG") - ENDIF () - - IF (MINGW) # MinGW always does PIC and complains if we tell it to - STRING(REGEX REPLACE "-fPIC" "" CMAKE_SHARED_LIBRARY_C_FLAGS "${CMAKE_SHARED_LIBRARY_C_FLAGS}") - # MinGW >= 3.14 uses the C99-style stdio functions - # automatically, but forks like mingw-w64 still want - # us to define this in order to use them - ADD_DEFINITIONS(-D__USE_MINGW_ANSI_STDIO=1) - - ELSEIF (BUILD_SHARED_LIBS) - ADD_C_FLAG_IF_SUPPORTED(-fvisibility=hidden) - - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") - ENDIF () - - ADD_C_FLAG_IF_SUPPORTED(-Wdocumentation) - ADD_C_FLAG_IF_SUPPORTED(-Wno-missing-field-initializers) - ADD_C_FLAG_IF_SUPPORTED(-Wstrict-aliasing=2) - ADD_C_FLAG_IF_SUPPORTED(-Wstrict-prototypes) - ADD_C_FLAG_IF_SUPPORTED(-Wdeclaration-after-statement) - ADD_C_FLAG_IF_SUPPORTED(-Wno-unused-const-variable) - ADD_C_FLAG_IF_SUPPORTED(-Wno-unused-function) - - IF (APPLE) # Apple deprecated OpenSSL - ADD_C_FLAG_IF_SUPPORTED(-Wno-deprecated-declarations) - ENDIF() - - IF (PROFILE) - SET(CMAKE_C_FLAGS "-pg ${CMAKE_C_FLAGS}") - SET(CMAKE_EXE_LINKER_FLAGS "-pg ${CMAKE_EXE_LINKER_FLAGS}") - ENDIF () -ENDIF() - -CHECK_FUNCTION_EXISTS(futimens HAVE_FUTIMENS) -IF (HAVE_FUTIMENS) - ADD_DEFINITIONS(-DHAVE_FUTIMENS) -ENDIF () - -CHECK_FUNCTION_EXISTS(qsort_r HAVE_QSORT_R) -IF (HAVE_QSORT_R) - ADD_DEFINITIONS(-DHAVE_QSORT_R) -ENDIF () - -CHECK_FUNCTION_EXISTS(qsort_s HAVE_QSORT_S) -IF (HAVE_QSORT_S) - ADD_DEFINITIONS(-DHAVE_QSORT_S) -ENDIF () - -IF( NOT CMAKE_CONFIGURATION_TYPES ) - # Build Debug by default - IF (NOT CMAKE_BUILD_TYPE) - SET(CMAKE_BUILD_TYPE "Debug" CACHE STRING "Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel." FORCE) - ENDIF () -ELSE() - # Using a multi-configuration generator eg MSVC or Xcode - # that uses CMAKE_CONFIGURATION_TYPES and not CMAKE_BUILD_TYPE -ENDIF() - -IF (SECURITY_FOUND) - ADD_DEFINITIONS(-DGIT_SECURE_TRANSPORT) - INCLUDE_DIRECTORIES(${SECURITY_INCLUDE_DIR}) -ENDIF () - -IF (OPENSSL_FOUND) - ADD_DEFINITIONS(-DGIT_OPENSSL) - INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR}) - SET(SSL_LIBRARIES ${OPENSSL_LIBRARIES}) -ENDIF() - - - -IF (THREADSAFE) - IF (NOT WIN32) - FIND_PACKAGE(Threads REQUIRED) - ENDIF() - - ADD_DEFINITIONS(-DGIT_THREADS) -ENDIF() - -IF (USE_NSEC) - ADD_DEFINITIONS(-DGIT_USE_NSEC) -ENDIF() - -IF (HAVE_STRUCT_STAT_ST_MTIM) - ADD_DEFINITIONS(-DGIT_USE_STAT_MTIM) -ELSEIF (HAVE_STRUCT_STAT_ST_MTIMESPEC) - ADD_DEFINITIONS(-DGIT_USE_STAT_MTIMESPEC) -ELSEIF (HAVE_STRUCT_STAT_ST_MTIME_NSEC) - ADD_DEFINITIONS(-DGIT_USE_STAT_MTIME_NSEC) -ENDIF() - -ADD_DEFINITIONS(-D_FILE_OFFSET_BITS=64) - -# Collect sourcefiles -FILE(GLOB SRC_H include/git2.h include/git2/*.h include/git2/sys/*.h) - -# On Windows use specific platform sources -IF (WIN32 AND NOT CYGWIN) - ADD_DEFINITIONS(-DWIN32 -D_WIN32_WINNT=0x0501) - FILE(GLOB SRC_OS src/win32/*.c src/win32/*.h) -ELSEIF (AMIGA) - ADD_DEFINITIONS(-DNO_ADDRINFO -DNO_READDIR_R -DNO_MMAP) -ELSE() - IF (VALGRIND) - ADD_DEFINITIONS(-DNO_MMAP) - ENDIF() - FILE(GLOB SRC_OS src/unix/*.c src/unix/*.h) -ENDIF() -FILE(GLOB SRC_GIT2 src/*.c src/*.h src/transports/*.c src/transports/*.h src/xdiff/*.c src/xdiff/*.h) - -# Determine architecture of the machine -IF (CMAKE_SIZEOF_VOID_P EQUAL 8) - ADD_DEFINITIONS(-DGIT_ARCH_64) -ELSEIF (CMAKE_SIZEOF_VOID_P EQUAL 4) - ADD_DEFINITIONS(-DGIT_ARCH_32) -ELSE() - MESSAGE(FATAL_ERROR "Unsupported architecture") -ENDIF() - -# Compile and link libgit2 -ADD_LIBRARY(git2 ${SRC_H} ${SRC_GIT2} ${SRC_OS} ${SRC_ZLIB} ${SRC_HTTP} ${SRC_REGEX} ${SRC_SSH} ${SRC_SHA1} ${WIN_RC}) -TARGET_LINK_LIBRARIES(git2 ${SECURITY_DIRS}) -TARGET_LINK_LIBRARIES(git2 ${COREFOUNDATION_DIRS}) -TARGET_LINK_LIBRARIES(git2 ${SSL_LIBRARIES}) -TARGET_LINK_LIBRARIES(git2 ${SSH_LIBRARIES}) -TARGET_LINK_LIBRARIES(git2 ${GSSAPI_LIBRARIES}) -TARGET_LINK_LIBRARIES(git2 ${ICONV_LIBRARIES}) -TARGET_OS_LIBRARIES(git2) - -# Workaround for Cmake bug #0011240 (see http://public.kitware.com/Bug/view.php?id=11240) -# Win64+MSVC+static libs = linker error -IF(MSVC AND GIT_ARCH_64 AND NOT BUILD_SHARED_LIBS) - SET_TARGET_PROPERTIES(git2 PROPERTIES STATIC_LIBRARY_FLAGS "/MACHINE:x64") -ENDIF() - -IDE_SPLIT_SOURCES(git2) - -IF (SONAME) - SET_TARGET_PROPERTIES(git2 PROPERTIES VERSION ${LIBGIT2_VERSION_STRING}) - SET_TARGET_PROPERTIES(git2 PROPERTIES SOVERSION ${LIBGIT2_SOVERSION}) - IF (LIBGIT2_FILENAME) - ADD_DEFINITIONS(-DLIBGIT2_FILENAME=\"${LIBGIT2_FILENAME}\") - SET_TARGET_PROPERTIES(git2 PROPERTIES OUTPUT_NAME ${LIBGIT2_FILENAME}) - ELSEIF (DEFINED LIBGIT2_PREFIX) - SET_TARGET_PROPERTIES(git2 PROPERTIES PREFIX "${LIBGIT2_PREFIX}") - ENDIF() -ENDIF() -STRING(REPLACE ";" " " LIBGIT2_PC_LIBS "${LIBGIT2_PC_LIBS}") -CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libgit2.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libgit2.pc @ONLY) - -IF (MSVC_IDE) - # Precompiled headers - SET_TARGET_PROPERTIES(git2 PROPERTIES COMPILE_FLAGS "/Yuprecompiled.h /FIprecompiled.h") - SET_SOURCE_FILES_PROPERTIES(src/win32/precompiled.c COMPILE_FLAGS "/Ycprecompiled.h") -ENDIF () - -# Install -INSTALL(TARGETS git2 - RUNTIME DESTINATION ${BIN_INSTALL_DIR} - LIBRARY DESTINATION ${LIB_INSTALL_DIR} - ARCHIVE DESTINATION ${LIB_INSTALL_DIR} -) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libgit2.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig ) -INSTALL(DIRECTORY include/git2 DESTINATION ${INCLUDE_INSTALL_DIR} ) -INSTALL(FILES include/git2.h DESTINATION ${INCLUDE_INSTALL_DIR} ) - -# Tests -IF (BUILD_CLAR) - FIND_PACKAGE(PythonInterp) - - IF(NOT PYTHONINTERP_FOUND) - MESSAGE(FATAL_ERROR "Could not find a python interpeter, which is needed to build the tests. " - "Make sure python is available, or pass -DBUILD_CLAR=OFF to skip building the tests") - ENDIF() - - SET(CLAR_FIXTURES "${CMAKE_CURRENT_SOURCE_DIR}/tests/resources/") - SET(CLAR_PATH "${CMAKE_CURRENT_SOURCE_DIR}/tests") - SET(CLAR_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/tests/resources" CACHE PATH "Path to test resources.") - ADD_DEFINITIONS(-DCLAR_FIXTURE_PATH=\"${CLAR_FIXTURES}\") - ADD_DEFINITIONS(-DCLAR_RESOURCES=\"${TEST_RESOURCES}\") - ADD_DEFINITIONS(-DCLAR_TMPDIR=\"libgit2_tests\") - - INCLUDE_DIRECTORIES(${CLAR_PATH}) - FILE(GLOB_RECURSE SRC_TEST ${CLAR_PATH}/*/*.c ${CLAR_PATH}/*/*.h) - SET(SRC_CLAR "${CLAR_PATH}/main.c" "${CLAR_PATH}/clar_libgit2.c" "${CLAR_PATH}/clar_libgit2_trace.c" "${CLAR_PATH}/clar_libgit2_timer.c" "${CLAR_PATH}/clar.c") - - ADD_CUSTOM_COMMAND( - OUTPUT ${CLAR_PATH}/clar.suite - COMMAND ${PYTHON_EXECUTABLE} generate.py -f -xonline -xstress . - DEPENDS ${SRC_TEST} - WORKING_DIRECTORY ${CLAR_PATH} - ) - - SET_SOURCE_FILES_PROPERTIES( - ${CLAR_PATH}/clar.c - PROPERTIES OBJECT_DEPENDS ${CLAR_PATH}/clar.suite) - - ADD_EXECUTABLE(libgit2_clar ${SRC_H} ${SRC_GIT2} ${SRC_OS} ${SRC_CLAR} ${SRC_TEST} ${SRC_ZLIB} ${SRC_HTTP} ${SRC_REGEX} ${SRC_SSH} ${SRC_SHA1}) - - TARGET_LINK_LIBRARIES(libgit2_clar ${COREFOUNDATION_DIRS}) - TARGET_LINK_LIBRARIES(libgit2_clar ${SECURITY_DIRS}) - TARGET_LINK_LIBRARIES(libgit2_clar ${SSL_LIBRARIES}) - TARGET_LINK_LIBRARIES(libgit2_clar ${SSH_LIBRARIES}) - TARGET_LINK_LIBRARIES(libgit2_clar ${GSSAPI_LIBRARIES}) - TARGET_LINK_LIBRARIES(libgit2_clar ${ICONV_LIBRARIES}) - TARGET_OS_LIBRARIES(libgit2_clar) - IDE_SPLIT_SOURCES(libgit2_clar) - - IF (MSVC_IDE) - # Precompiled headers - SET_TARGET_PROPERTIES(libgit2_clar PROPERTIES COMPILE_FLAGS "/Yuprecompiled.h /FIprecompiled.h") - ENDIF () - - ENABLE_TESTING() - IF (WINHTTP OR OPENSSL_FOUND OR SECURITY_FOUND) - ADD_TEST(libgit2_clar libgit2_clar -ionline) - ELSE () - ADD_TEST(libgit2_clar libgit2_clar -v) - ENDIF () - - # Add a test target which runs the cred callback tests, to be - # called after setting the url and user - ADD_TEST(libgit2_clar-cred_callback libgit2_clar -v -sonline::clone::cred_callback) -ENDIF () - -IF (TAGS) - FIND_PROGRAM(CTAGS ctags) - IF (NOT CTAGS) - MESSAGE(FATAL_ERROR "Could not find ctags command") - ENDIF () - - FILE(GLOB_RECURSE SRC_ALL *.[ch]) - - ADD_CUSTOM_COMMAND( - OUTPUT tags - COMMAND ${CTAGS} -a ${SRC_ALL} - DEPENDS ${SRC_ALL} - ) - ADD_CUSTOM_TARGET( - do_tags ALL - DEPENDS tags - ) -ENDIF () - -IF (BUILD_EXAMPLES) - ADD_SUBDIRECTORY(examples) -ENDIF () diff --git a/vendor/libgit2/CODE_OF_CONDUCT.md b/vendor/libgit2/CODE_OF_CONDUCT.md deleted file mode 100644 index 0a0e4ebab..000000000 --- a/vendor/libgit2/CODE_OF_CONDUCT.md +++ /dev/null @@ -1,75 +0,0 @@ -# Contributor Covenant Code of Conduct - -## Our Pledge - -In the interest of fostering an open and welcoming environment, we as -contributors and maintainers pledge to making participation in our project and -our community a harassment-free experience for everyone, regardless of age, body -size, disability, ethnicity, gender identity and expression, level of experience, -nationality, personal appearance, race, religion, or sexual identity and -orientation. - -## Our Standards - -Examples of behavior that contributes to creating a positive environment -include: - -* Using welcoming and inclusive language -* Being respectful of differing viewpoints and experiences -* Gracefully accepting constructive criticism -* Focusing on what is best for the community -* Showing empathy towards other community members - -Examples of unacceptable behavior by participants include: - -* The use of sexualized language or imagery and unwelcome sexual attention or -advances -* Trolling, insulting/derogatory comments, and personal or political attacks -* Public or private harassment -* Publishing others' private information, such as a physical or electronic - address, without explicit permission -* Other conduct which could reasonably be considered inappropriate in a - professional setting - -## Our Responsibilities - -Project maintainers are responsible for clarifying the standards of acceptable -behavior and are expected to take appropriate and fair corrective action in -response to any instances of unacceptable behavior. - -Project maintainers have the right and responsibility to remove, edit, or -reject comments, commits, code, wiki edits, issues, and other contributions -that are not aligned to this Code of Conduct, or to ban temporarily or -permanently any contributor for other behaviors that they deem inappropriate, -threatening, offensive, or harmful. - -## Scope - -This Code of Conduct applies both within project spaces and in public spaces -when an individual is representing the project or its community. Examples of -representing a project or community include using an official project e-mail -address, posting via an official social media account, or acting as an appointed -representative at an online or offline event. Representation of a project may be -further defined and clarified by project maintainers. - -## Enforcement - -Instances of abusive, harassing, or otherwise unacceptable behavior may be -reported by contacting the project team at [libgit2@gmail.com][email]. All -complaints will be reviewed and investigated and will result in a response that -is deemed necessary and appropriate to the circumstances. The project team is -obligated to maintain confidentiality with regard to the reporter of an incident. -Further details of specific enforcement policies may be posted separately. - -Project maintainers who do not follow or enforce the Code of Conduct in good -faith may face temporary or permanent repercussions as determined by other -members of the project's leadership. - -## Attribution - -This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, -available at [http://contributor-covenant.org/version/1/4][version] - -[email]: mailto:libgit2@gmail.com -[homepage]: http://contributor-covenant.org -[version]: http://contributor-covenant.org/version/1/4/ diff --git a/vendor/libgit2/CONTRIBUTING.md b/vendor/libgit2/CONTRIBUTING.md deleted file mode 100644 index 71fad63a9..000000000 --- a/vendor/libgit2/CONTRIBUTING.md +++ /dev/null @@ -1,146 +0,0 @@ -# Welcome to libgit2! - -We're making it easy to do interesting things with git, and we'd love to have -your help. - -## Licensing - -By contributing to libgit2, you agree to release your contribution under -the terms of the license. Except for the `examples` directory, all code -is released under the [GPL v2 with linking exception](COPYING). - -The `examples` code is governed by the -[CC0 Public Domain Dedication](examples/COPYING), so that you may copy -from them into your own application. - -## Discussion & Chat - -We hang out in the -[`#libgit2`](http://webchat.freenode.net/?channels=#libgit2)) channel on -irc.freenode.net. - -Also, feel free to open an -[Issue](https://github.com/libgit2/libgit2/issues/new) to start a discussion -about any concerns you have. We like to use Issues for that so there is an -easily accessible permanent record of the conversation. - -## Libgit2 Versions - -The `master` branch is the main branch where development happens. -Releases are tagged -(e.g. [v0.21.0](https://github.com/libgit2/libgit2/releases/tag/v0.21.0) ) -and when a critical bug fix needs to be backported, it will be done on a -`-maint` maintenance branch. - -## Reporting Bugs - -First, know which version of libgit2 your problem is in and include it in -your bug report. This can either be a tag (e.g. -[v0.17.0](https://github.com/libgit2/libgit2/releases/tag/v0.17.0)) or a -commit SHA -(e.g. [01be7863](https://github.com/libgit2/libgit2/commit/01be7863)). -Using [`git describe`](http://git-scm.com/docs/git-describe) is a -great way to tell us what version you're working with. - -If you're not running against the latest `master` branch version, -please compile and test against that to avoid re-reporting an issue that's -already been fixed. - -It's *incredibly* helpful to be able to reproduce the problem. Please -include a list of steps, a bit of code, and/or a zipped repository (if -possible). Note that some of the libgit2 developers are employees of -GitHub, so if your repository is private, find us on IRC and we'll figure -out a way to help you. - -## Pull Requests - -Our work flow is a [typical GitHub -flow](https://guides.github.com/introduction/flow/index.html), where -contributors fork the [libgit2 repository](https://github.com/libgit2/libgit2), -make their changes on branch, and submit a -[Pull Request](https://help.github.com/articles/using-pull-requests) -(a.k.a. "PR"). Pull requests should usually be targeted at the `master` -branch. - -Life will be a lot easier for you (and us) if you follow this pattern -(i.e. fork, named branch, submit PR). If you use your fork's `master` -branch directly, things can get messy. - -Please include a nice description of your changes when you submit your PR; -if we have to read the whole diff to figure out why you're contributing -in the first place, you're less likely to get feedback and have your change -merged in. - -If you are starting to work on a particular area, feel free to submit a PR -that highlights your work in progress (and note in the PR title that it's -not ready to merge). These early PRs are welcome and will help in getting -visibility for your fix, allow others to comment early on the changes and -also let others know that you are currently working on something. - -Before wrapping up a PR, you should be sure to: - -* Write tests to cover any functional changes -* Update documentation for any changed public APIs -* Add to the [`CHANGELOG.md`](CHANGELOG.md) file describing any major changes - -## Unit Tests - -We believe that our unit tests allow us to keep the quality of libgit2 -high: any new changes must not cause unit test failures, and new changes -should include unit tests that cover the bug fixes or new features. -For bug fixes, we prefer unit tests that illustrate the failure before -the change, but pass with your changes. - -In addition to new tests, please ensure that your changes do not cause -any other test failures. Running the entire test suite is helpful -before you submit a pull request. When you build libgit2, the test -suite will also be built. You can run all tests by simply running -the resultant `libgit2_clar` binary. If you want to run a specific -unit test, you can name it with the `-s` option. For example: - - libgit2_clar -sstatus::worktree::long_filenames - -Or you can run an entire class of tests. For example, to run all the -worktree status tests: - - libgit2_clar -sstatus::worktree - -## Porting Code From Other Open-Source Projects - -`libgit2` is licensed under the terms of the GPL v2 with a linking -exception. Any code brought in must be compatible with those terms. - -The most common case is porting code from core Git. Git is a pure GPL -project, which means that in order to port code to this project, we need the -explicit permission of the author. Check the -[`git.git-authors`](https://github.com/libgit2/libgit2/blob/development/git.git-authors) -file for authors who have already consented. - -Other licenses have other requirements; check the license of the library -you're porting code *from* to see what you need to do. As a general rule, -MIT and BSD (3-clause) licenses are typically no problem. Apache 2.0 -license typically doesn't work due to GPL incompatibility. - -If your pull request uses code from core Git, another project, or code -from a forum / Stack Overflow, then *please* flag this in your PR and make -sure you've given proper credit to the original author in the code -snippet. - -## Style Guide - -The public API of `libgit2` is [ANSI C](http://en.wikipedia.org/wiki/ANSI_C) -(a.k.a. C89) compatible. Internally, `libgit2` is written using a portable -subset of C99 - in order to compile with GCC, Clang, MSVC, etc., we keep -local variable declarations at the tops of blocks only and avoid `//` style -comments. Additionally, `libgit2` follows some extra conventions for -function and type naming, code formatting, and testing. - -We like to keep the source code consistent and easy to read. Maintaining -this takes some discipline, but it's been more than worth it. Take a look -at the [conventions -file](https://github.com/libgit2/libgit2/blob/development/CONVENTIONS.md). - -## Starter Projects - -See our [projects -list](https://github.com/libgit2/libgit2/blob/development/PROJECTS.md). diff --git a/vendor/libgit2/CONVENTIONS.md b/vendor/libgit2/CONVENTIONS.md deleted file mode 100644 index 0be4b33cc..000000000 --- a/vendor/libgit2/CONVENTIONS.md +++ /dev/null @@ -1,266 +0,0 @@ -# Libgit2 Conventions - -We like to keep the source consistent and readable. Herein are some -guidelines that should help with that. - -## External API - -We have a few rules to avoid surprising ways of calling functions and -some rules for consumers of the library to avoid stepping on each -other's toes. - - - Property accessors return the value directly (e.g. an `int` or - `const char *`) but if a function can fail, we return a `int` value - and the output parameters go first in the parameter list, followed - by the object that a function is operating on, and then any other - arguments the function may need. - - - If a function returns an object as a return value, that function is - a getter and the object's lifetime is tied to the parent - object. Objects which are returned as the first argument as a - pointer-to-pointer are owned by the caller and it is repsponsible - for freeing it. Strings are returned via `git_buf` in order to - allow for re-use and safe freeing. - - - Most of what libgit2 does relates to I/O so you as a general rule - you should assume that any function can fail due to errors as even - getting data from the filesystem can result in all sorts of errors - and complex failure cases. - - - Paths inside the Git system are separated by a slash (0x2F). If a - function accepts a path on disk, then backslashes (0x5C) are also - accepted on Windows. - - - Do not mix allocators. If something has been allocated by libgit2, - you do not know which is the right free function in the general - case. Use the free functions provided for each object type. - -## Compatibility - -`libgit2` runs on many different platforms with many different compilers. - -The public API of `libgit2` is [ANSI C](http://en.wikipedia.org/wiki/ANSI_C) -(a.k.a. C89) compatible. - -Internally, `libgit2` is written using a portable subset of C99 - in order -to maximize compatibility (e.g. with MSVC) we avoid certain C99 -extensions. Specifically, we keep local variable declarations at the tops -of blocks only and we avoid `//` style comments. - -Also, to the greatest extent possible, we try to avoid lots of `#ifdef`s -inside the core code base. This is somewhat unavoidable, but since it can -really hamper maintainability, we keep it to a minimum. - -## Match Surrounding Code - -If there is one rule to take away from this document, it is *new code should -match the surrounding code in a way that makes it impossible to distinguish -the new from the old.* Consistency is more important to us than anyone's -personal opinion about where braces should be placed or spaces vs. tabs. - -If a section of code is being completely rewritten, it is okay to bring it -in line with the standards that are laid out here, but we will not accept -submissions that contain a large number of changes that are merely -reformatting. - -## Naming Things - -All external types and functions start with `git_` and all `#define` macros -start with `GIT_`. The `libgit2` API is mostly broken into related -functional modules each with a corresponding header. All functions in a -module should be named like `git_modulename_functioname()` -(e.g. `git_repository_open()`). - -Functions with a single output parameter should name that parameter `out`. -Multiple outputs should be named `foo_out`, `bar_out`, etc. - -Parameters of type `git_oid` should be named `id`, or `foo_id`. Calls that -return an OID should be named `git_foo_id`. - -Where a callback function is used, the function should also include a -user-supplied extra input that is a `void *` named "payload" that will be -passed through to the callback at each invocation. - -## Typedefs - -Wherever possible, use `typedef`. In some cases, if a structure is just a -collection of function pointers, the pointer types don't need to be -separately typedef'd, but loose function pointer types should be. - -## Exports - -All exported functions must be declared as: - -```c -GIT_EXTERN(result_type) git_modulename_functionname(arg_list); -``` - -## Internals - -Functions whose *modulename* is followed by two underscores, -for example `git_odb__read_packed`, are semi-private functions. -They are primarily intended for use within the library itself, -and may disappear or change their signature in a future release. - -## Parameters - -Out parameters come first. - -Whenever possible, pass argument pointers as `const`. Some structures (such -as `git_repository` and `git_index`) have mutable internal structure that -prevents this. - -Callbacks should always take a `void *` payload as their last parameter. -Callback pointers are grouped with their payloads, and typically come last -when passed as arguments: - -```c -int git_foo(git_repository *repo, git_foo_cb callback, void *payload); -``` - -## Memory Ownership - -Some APIs allocate memory which the caller is responsible for freeing; others -return a pointer into a buffer that's owned by some other object. Make this -explicit in the documentation. - -## Return codes - -Most public APIs should return an `int` error code. As is typical with most -C library functions, a zero value indicates success and a negative value -indicates failure. - -Some bindings will transform these returned error codes into exception -types, so returning a semantically appropriate error code is important. -Check -[`include/git2/errors.h`](https://github.com/libgit2/libgit2/blob/development/include/git2/errors.h) -for the return codes already defined. - -In your implementation, use `giterr_set()` to provide extended error -information to callers. - -If a `libgit2` function internally invokes another function that reports an -error, but the error is not propagated up, use `giterr_clear()` to prevent -callers from getting the wrong error message later on. - - -## Structs - -Most public types should be opaque, e.g.: - -```C -typedef struct git_odb git_odb; -``` - -...with allocation functions returning an "instance" created within -the library, and not within the application. This allows the type -to grow (or shrink) in size without rebuilding client code. - -To preserve ABI compatibility, include an `int version` field in all opaque -structures, and initialize to the latest version in the construction call. -Increment the "latest" version whenever the structure changes, and try to only -append to the end of the structure. - -## Option Structures - -If a function's parameter count is too high, it may be desirable to package -up the options in a structure. Make them transparent, include a version -field, and provide an initializer constant or constructor. Using these -structures should be this easy: - -```C -git_foo_options opts = GIT_FOO_OPTIONS_INIT; -opts.baz = BAZ_OPTION_ONE; -git_foo(&opts); -``` - -## Enumerations - -Typedef all enumerated types. If each option stands alone, use the enum -type for passing them as parameters; if they are flags to be OR'ed together, -pass them as `unsigned int` or `uint32_t` or some appropriate type. - -## Code Layout - -Try to keep lines less than 80 characters long. This is a loose -requirement, but going significantly over 80 columns is not nice. - -Use common sense to wrap most code lines; public function declarations -can use a couple of different styles: - -```c -/** All on one line is okay if it fits */ -GIT_EXTERN(int) git_foo_simple(git_oid *id); - -/** Otherwise one argument per line is a good next step */ -GIT_EXTERN(int) git_foo_id( - git_oid **out, - int a, - int b); -``` - -Indent with tabs; set your editor's tab width to 4 for best effect. - -Avoid trailing whitespace and only commit Unix-style newlines (i.e. no CRLF -in the repository - just set `core.autocrlf` to true if you are writing code -on a Windows machine). - -## Documentation - -All comments should conform to Doxygen "javadoc" style conventions for -formatting the public API documentation. Try to document every parameter, -and keep the comments up to date if you change the parameter list. - -## Public Header Template - -Use this template when creating a new public header. - -```C -#ifndef INCLUDE_git_${filename}_h__ -#define INCLUDE_git_${filename}_h__ - -#include "git/common.h" - -/** - * @file git/${filename}.h - * @brief Git some description - * @defgroup git_${filename} some description routines - * @ingroup Git - * @{ - */ -GIT_BEGIN_DECL - -/* ... definitions ... */ - -/** @} */ -GIT_END_DECL -#endif -``` - -## Inlined functions - -All inlined functions must be declared as: - -```C -GIT_INLINE(result_type) git_modulename_functionname(arg_list); -``` - -`GIT_INLINE` (or `inline`) should not be used in public headers in order -to preserve ANSI C compatibility. - -## Tests - -`libgit2` uses the [clar](https://github.com/vmg/clar) testing framework. - -All PRs should have corresponding tests. - -* If the PR fixes an existing issue, the test should fail prior to applying - the PR and succeed after applying it. -* If the PR is for new functionality, then the tests should exercise that - new functionality to a certain extent. We don't require 100% coverage - right now (although we are getting stricter over time). - -When adding new tests, we prefer if you attempt to reuse existing test data -(in `tests-clar/resources/`) if possible. If you are going to add new test -repositories, please try to strip them of unnecessary files (e.g. sample -hooks, etc). diff --git a/vendor/libgit2/COPYING b/vendor/libgit2/COPYING deleted file mode 100644 index 1b88b9b8e..000000000 --- a/vendor/libgit2/COPYING +++ /dev/null @@ -1,960 +0,0 @@ - libgit2 is Copyright (C) the libgit2 contributors, - unless otherwise stated. See the AUTHORS file for details. - - Note that the only valid version of the GPL as far as this project - is concerned is _this_ particular version of the license (ie v2, not - v2.2 or v3.x or whatever), unless explicitly otherwise stated. - ----------------------------------------------------------------------- - - LINKING EXCEPTION - - In addition to the permissions in the GNU General Public License, - the authors give you unlimited permission to link the compiled - version of this library into combinations with other programs, - and to distribute those combinations without any restriction - coming from the use of this file. (The General Public License - restrictions do apply in other respects; for example, they cover - modification of the file, and distribution when not linked into - a combined executable.) - ----------------------------------------------------------------------- - - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. - ----------------------------------------------------------------------- - -The bundled ZLib code is licensed under the ZLib license: - -Copyright (C) 1995-2010 Jean-loup Gailly and Mark Adler - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. - - Jean-loup Gailly Mark Adler - jloup@gzip.org madler@alumni.caltech.edu - ----------------------------------------------------------------------- - -The Clar framework is licensed under the ISC license: - -Copyright (c) 2011-2015 Vicent Marti - -Permission to use, copy, modify, and/or distribute this software for any -purpose with or without fee is hereby granted, provided that the above -copyright notice and this permission notice appear in all copies. - -THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - ----------------------------------------------------------------------- - -The regex library (deps/regex/) is licensed under the GNU LGPL -(available at the end of this file). - -Definitions for data structures and routines for the regular -expression library. - -Copyright (C) 1985,1989-93,1995-98,2000,2001,2002,2003,2005,2006,2008 -Free Software Foundation, Inc. -This file is part of the GNU C Library. - -The GNU C Library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 2.1 of the License, or (at your option) any later version. - -The GNU C Library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with the GNU C Library; if not, write to the Free -Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -02110-1301 USA. - ----------------------------------------------------------------------- - -The bundled winhttp definition files (deps/winhttp/) are licensed under -the GNU LGPL (available at the end of this file). - -Copyright (C) 2007 Francois Gouget - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 2.1 of the License, or (at your option) any later version. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - ----------------------------------------------------------------------- - - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! - ----------------------------------------------------------------------- diff --git a/vendor/libgit2/Makefile.embed b/vendor/libgit2/Makefile.embed deleted file mode 100644 index eb8a78ebf..000000000 --- a/vendor/libgit2/Makefile.embed +++ /dev/null @@ -1,60 +0,0 @@ -PLATFORM=$(shell uname -s) - -ifneq (,$(CROSS_COMPILE)) - PREFIX=$(CROSS_COMPILE)- -else - PREFIX= -endif - -MINGW=0 -ifneq (,$(findstring MINGW32,$(PLATFORM))) - MINGW=1 -endif -ifneq (,$(findstring mingw,$(CROSS_COMPILE))) - MINGW=1 -endif - -rm=rm -f -AR=$(PREFIX)ar cq -RANLIB=$(PREFIX)ranlib - -LIBNAME=libgit2.a - -ifeq ($(MINGW),1) - CC=gcc -else - CC=cc -endif - -CC:=$(PREFIX)$(CC) - -INCLUDES= -I. -Isrc -Iinclude -Ideps/http-parser -Ideps/zlib - -DEFINES= $(INCLUDES) -DNO_VIZ -DSTDC -DNO_GZIP -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $(EXTRA_DEFINES) -CFLAGS= -g $(DEFINES) -Wall -Wextra -Wno-missing-field-initializers -O2 $(EXTRA_CFLAGS) - -SRCS = $(wildcard src/*.c) $(wildcard src/transports/*.c) $(wildcard src/xdiff/*.c) $(wildcard deps/http-parser/*.c) $(wildcard deps/zlib/*.c) src/hash/hash_generic.c - -ifeq ($(MINGW),1) - SRCS += $(wildcard src/win32/*.c) $(wildcard src/compat/*.c) deps/regex/regex.c - INCLUDES += -Ideps/regex - DEFINES += -DWIN32 -D_WIN32_WINNT=0x0501 -D__USE_MINGW_ANSI_STDIO=1 -else - SRCS += $(wildcard src/unix/*.c) - CFLAGS += -fPIC -endif - -OBJS = $(patsubst %.c,%.o,$(SRCS)) - -%.c.o: - $(CC) $(CFLAGS) -c $*.c - -all: $(LIBNAME) - -$(LIBNAME): $(OBJS) - $(rm) $@ - $(AR) $@ $(OBJS) - $(RANLIB) $@ - -clean: - $(rm) $(OBJS) $(LIBNAME) diff --git a/vendor/libgit2/PROJECTS.md b/vendor/libgit2/PROJECTS.md deleted file mode 100644 index 87ce78f02..000000000 --- a/vendor/libgit2/PROJECTS.md +++ /dev/null @@ -1,97 +0,0 @@ -Projects For LibGit2 -==================== - -So, you want to start helping out with `libgit2`? That's fantastic! We -welcome contributions and we promise we'll try to be nice. - -This is a list of libgit2 related projects that new contributors can take -on. It includes a number of good starter projects and well as some larger -ideas that no one is actively working on. - -## Before You Start - -Please start by reading the [README.md](README.md), -[CONTRIBUTING.md](CONTRIBUTING.md), and [CONVENTIONS.md](CONVENTIONS.md) -files before diving into one of these projects. Those explain our work -flow and coding conventions to help ensure that your work will be easily -integrated into libgit2. - -Next, work through the build instructions and make sure you can clone the -repository, compile it, and run the tests successfully. That will make -sure that your development environment is set up correctly and you are -ready to start on libgit2 development. - -## Starter Projects - -These are good small projects to get started with libgit2. - -* Look at the `examples/` programs, find an existing one that mirrors a - core Git command and add a missing command-line option. There are many - gaps right now and this helps demonstrate how to use the library. Here - are some specific ideas (though there are many more): - * Fix the `examples/diff.c` implementation of the `-B` - (a.k.a. `--break-rewrites`) command line option to actually look for - the optional `[][/]` configuration values. There is an - existing comment that reads `/* TODO: parse thresholds */`. The - trick to this one will be doing it in a manner that is clean and - simple, but still handles the various cases correctly (e.g. `-B/70%` - is apparently a legal setting). - * Implement the `--log-size` option for `examples/log.c`. I think all - the data is available, you would just need to add the code into the - `print_commit()` routine (along with a way of passing the option - into that function). - * As an extension to the matching idea for `examples/log.c`, add the - `-i` option to use `strcasestr()` for matches. - * For `examples/log.c`, implement the `--first-parent` option now that - libgit2 supports it in the revwalk API. -* Pick a Git command that is not already emulated in `examples/` and write - a new example that mirrors the behavior. Examples don't have to be - perfect emulations, but should demonstrate how to use the libgit2 APIs - to get results that are similar to Git commands. This lets you (and us) - easily exercise a particular facet of the API and measure compatibility - and feature parity with core git. -* Submit a PR to clarify documentation! While we do try to document all of - the APIs, your fresh eyes on the documentation will find areas that are - confusing much more easily. - -If none of these appeal to you, take a look at our issues list to see if -there are any unresolved issues you'd like to jump in on. - -## Larger Projects - -These are ideas for larger projects mostly taken from our backlog of -[Issues](https://github.com/libgit2/libgit2/issues). Please don't dive -into one of these as a first project for libgit2 - we'd rather get to -know you first by successfully shipping your work on one of the smaller -projects above. - -Some of these projects are broken down into subprojects and/or have -some incremental steps listed towards the larger goal. Those steps -might make good smaller projects by themselves. - -* Port part of the Git test suite to run against the command line emulation - in examples/ - * Pick a Git command that is emulated in our examples/ area - * Extract the Git tests that exercise that command - * Convert the tests to call our emulation - * These tests could go in examples/tests/... -* Add hooks API to enumerate and manage hooks (not run them at this point) - * Enumeration of available hooks - * Lookup API to see which hooks have a script and get the script - * Read/write API to load a hook script and write a hook script - * Eventually, callback API to invoke a hook callback when libgit2 - executes the action in question -* Isolate logic of ignore evaluation into a standalone API -* Upgrade internal libxdiff code to latest from core Git -* Tree builder improvements: - * Extend to allow building a tree hierarchy -* Apply-patch API -* Add a patch editing API to enable "git add -p" type operations -* Textconv API to filter binary data before generating diffs (something - like the current Filter API, probably). -* Performance profiling and improvement -* Support "git replace" ref replacements -* Include conflicts in diff results and in status - * GIT_DELTA_CONFLICT for items in conflict (with multiple files) - * Appropriate flags for status -* Support sparse checkout (i.e. "core.sparsecheckout" and ".git/info/sparse-checkout") diff --git a/vendor/libgit2/README.md b/vendor/libgit2/README.md deleted file mode 100644 index 8ea787b3e..000000000 --- a/vendor/libgit2/README.md +++ /dev/null @@ -1,250 +0,0 @@ -libgit2 - the Git linkable library -================================== - -[![Travis Build Status](https://secure.travis-ci.org/libgit2/libgit2.svg?branch=master)](http://travis-ci.org/libgit2/libgit2) -[![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/xvof5b4t5480a2q3/branch/master?svg=true)](https://ci.appveyor.com/project/libgit2/libgit2/branch/master) -[![Coverity Scan Build Status](https://scan.coverity.com/projects/639/badge.svg)](https://scan.coverity.com/projects/639) - -`libgit2` is a portable, pure C implementation of the Git core methods -provided as a re-entrant linkable library with a solid API, allowing you to -write native speed custom Git applications in any language with bindings. - -`libgit2` is licensed under a **very permissive license** (GPLv2 with a special -Linking Exception). This basically means that you can link it (unmodified) -with any kind of software without having to release its source code. -Additionally, the example code has been released to the public domain (see the -[separate license](examples/COPYING) for more information). - -* Website: [libgit2.github.com](http://libgit2.github.com) -* StackOverflow Tag: [libgit2](http://stackoverflow.com/questions/tagged/libgit2) -* Issues: [GitHub Issues](https://github.com/libgit2/libgit2/issues) (Right here!) -* API documentation: -* IRC: [#libgit2](irc://irc.freenode.net/libgit2) on irc.freenode.net. -* Mailing list: The libgit2 mailing list was - traditionally hosted in Librelist but has been deprecated. We encourage you to - [use StackOverflow](http://stackoverflow.com/questions/tagged/libgit2) instead for any questions regarding - the library, or [open an issue](https://github.com/libgit2/libgit2/issues) - on GitHub for bug reports. The mailing list archives are still available at - . - - -What It Can Do -============== - -`libgit2` is already very usable and is being used in production for many -applications including the GitHub.com site, in Plastic SCM and also powering -Microsoft's Visual Studio tools for Git. The library provides: - -* SHA conversions, formatting and shortening -* abstracted ODB backend system -* commit, tag, tree and blob parsing, editing, and write-back -* tree traversal -* revision walking -* index file (staging area) manipulation -* reference management (including packed references) -* config file management -* high level repository management -* thread safety and reentrancy -* descriptive and detailed error messages -* ...and more (over 175 different API calls) - -Optional dependencies -===================== - -While the library provides git functionality without the need for -dependencies, it can make use of a few libraries to add to it: - -- pthreads (non-Windows) to enable threadsafe access as well as multi-threaded pack generation -- OpenSSL (non-Windows) to talk over HTTPS and provide the SHA-1 functions -- LibSSH2 to enable the SSH transport -- iconv (OSX) to handle the HFS+ path encoding peculiarities - -Initialization -=============== - -The library needs to keep track of some global state. Call - - git_libgit2_init(); - -before calling any other libgit2 functions. You can call this function many times. A matching number of calls to - - git_libgit2_shutdown(); - -will free the resources. Note that if you have worker threads, you should -call `git_libgit2_shutdown` *after* those threads have exited. If you -require assistance coordinating this, simply have the worker threads call -`git_libgit2_init` at startup and `git_libgit2_shutdown` at shutdown. - -Threading -========= - -See [THREADING](THREADING.md) for information - -Conventions -=========== - -See [CONVENTIONS](CONVENTIONS.md) for an overview of the external -and internal API/coding conventions we use. - -Building libgit2 - Using CMake -============================== - -`libgit2` builds cleanly on most platforms without any external dependencies. -Under Unix-like systems, like Linux, \*BSD and Mac OS X, libgit2 expects `pthreads` to be available; -they should be installed by default on all systems. Under Windows, libgit2 uses the native Windows API -for threading. - -The `libgit2` library is built using [CMake]() (version 2.8 or newer) on all platforms. - -On most systems you can build the library using the following commands - - $ mkdir build && cd build - $ cmake .. - $ cmake --build . - -Alternatively you can point the CMake GUI tool to the CMakeLists.txt file and generate platform specific build project or IDE workspace. - -To install the library you can specify the install prefix by setting: - - $ cmake .. -DCMAKE_INSTALL_PREFIX=/install/prefix - $ cmake --build . --target install - -For more advanced use or questions about CMake please read . - -The following CMake variables are declared: - -- `BIN_INSTALL_DIR`: Where to install binaries to. -- `LIB_INSTALL_DIR`: Where to install libraries to. -- `INCLUDE_INSTALL_DIR`: Where to install headers to. -- `BUILD_SHARED_LIBS`: Build libgit2 as a Shared Library (defaults to ON) -- `BUILD_CLAR`: Build [Clar](https://github.com/vmg/clar)-based test suite (defaults to ON) -- `THREADSAFE`: Build libgit2 with threading support (defaults to ON) -- `STDCALL`: Build libgit2 as `stdcall`. Turn off for `cdecl` (Windows; defaults to ON) - -Compiler and linker options ---------------------------- - -CMake lets you specify a few variables to control the behavior of the -compiler and linker. These flags are rarely used but can be useful for -64-bit to 32-bit cross-compilation. - -- `CMAKE_C_FLAGS`: Set your own compiler flags -- `CMAKE_FIND_ROOT_PATH`: Override the search path for libraries -- `ZLIB_LIBRARY`, `OPENSSL_SSL_LIBRARY` AND `OPENSSL_CRYPTO_LIBRARY`: -Tell CMake where to find those specific libraries - -MacOS X -------- - -If you want to build a universal binary for Mac OS X, CMake sets it -all up for you if you use `-DCMAKE_OSX_ARCHITECTURES="i386;x86_64"` -when configuring. - -Windows -------- - -You need to run the CMake commands from the Visual Studio command -prompt, not the regular or Windows SDK one. Select the right generator -for your version with the `-G "Visual Studio X" option. - -See [the website](http://libgit2.github.com/docs/guides/build-and-link/) -for more detailed instructions. - -Android -------- - -Extract toolchain from NDK using, `make-standalone-toolchain.sh` script. -Optionally, crosscompile and install OpenSSL inside of it. Then create CMake -toolchain file that configures paths to your crosscompiler (substitute `{PATH}` -with full path to the toolchain): - - SET(CMAKE_SYSTEM_NAME Linux) - SET(CMAKE_SYSTEM_VERSION Android) - - SET(CMAKE_C_COMPILER {PATH}/bin/arm-linux-androideabi-gcc) - SET(CMAKE_CXX_COMPILER {PATH}/bin/arm-linux-androideabi-g++) - SET(CMAKE_FIND_ROOT_PATH {PATH}/sysroot/) - - SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) - SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) - SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) - -Add `-DCMAKE_TOOLCHAIN_FILE={pathToToolchainFile}` to cmake command -when configuring. - -Language Bindings -================================== - -Here are the bindings to libgit2 that are currently available: - -* C++ - * libqgit2, Qt bindings -* Chicken Scheme - * chicken-git -* D - * dlibgit -* Delphi - * GitForDelphi -* Erlang - * Geef -* Go - * git2go -* GObject - * libgit2-glib -* Haskell - * hgit2 -* Java - * Jagged -* Julia - * LibGit2.jl -* Lua - * luagit2 -* .NET - * libgit2sharp -* Node.js - * node-gitteh - * nodegit -* Objective-C - * objective-git -* OCaml - * ocaml-libgit2 -* Parrot Virtual Machine - * parrot-libgit2 -* Perl - * Git-Raw -* PHP - * php-git -* PowerShell - * GitPowerShell -* Python - * pygit2 -* R - * git2r -* Ruby - * Rugged -* Rust - * git2-rs -* Swift - * Gift -* Vala - * libgit2.vapi - -If you start another language binding to libgit2, please let us know so -we can add it to the list. - -How Can I Contribute? -================================== - -Check the [contribution guidelines](CONTRIBUTING.md) to understand our -workflow, the libgit2 [coding conventions](CONVENTIONS.md), and our list of -[good starting projects](PROJECTS.md). - -License -================================== - -`libgit2` is under GPL2 **with linking exception**. This means you can link to -and use the library from any program, proprietary or open source; paid or -gratis. However, you cannot modify libgit2 and distribute it without -supplying the source. - -See the [COPYING file](COPYING) for the full license text. diff --git a/vendor/libgit2/THREADING.md b/vendor/libgit2/THREADING.md deleted file mode 100644 index 0b9e50286..000000000 --- a/vendor/libgit2/THREADING.md +++ /dev/null @@ -1,113 +0,0 @@ -Threads in libgit2 -================== - -You may safely use any libgit2 object from any thread, though there -may be issues depending on the cryptographic libraries libgit2 or its -dependencies link to (more on this later). For libgit2 itself, -provided you take the following into consideration you won't run into -issues: - -Sharing objects ---------------- - -Use an object from a single thread at a time. Most data structures do -not guard against concurrent access themselves. This is because they -are rarely used in isolation and it makes more sense to synchronize -access via a larger lock or similar mechanism. - -There are some objects which are read-only/immutable and are thus safe -to share across threads, such as references and configuration -snapshots. - -Error messages --------------- - -The error message is thread-local. The `giterr_last()` call must -happen on the same thread as the error in order to get the -message. Often this will be the case regardless, but if you use -something like the [GCD](http://en.wikipedia.org/wiki/Grand_Central_Dispatch) -on Mac OS X (where code is executed on an arbitrary thread), the code -must make sure to retrieve the error code on the thread where the error -happened. - -Threads and cryptographic libraries -======================================= - -On Windows ----------- - -When built as a native Windows DLL, libgit2 uses WinCNG and WinHTTP, -both of which are thread-safe. You do not need to do anything special. - -When using libssh2 which itself uses WinCNG, there are no special -steps necessary. If you are using a MinGW or similar environment where -libssh2 uses OpenSSL or libgcrypt, then the general case affects -you. - -On Mac OS X ------------ - -By default we use libcurl to perform the encryption. The -system-provided libcurl uses SecureTransport, so no special steps are -necessary. If you link against another libcurl (e.g. from homebrew) -refer to the general case. - -If the option to use libcurl was deactivated, the library makes use of -CommonCrypto and SecureTransport for cryptographic support. These are -thread-safe and you do not need to do anything special. - -Note that libssh2 may still use OpenSSL itself. In that case, the -general case still affects you if you use ssh. - -General Case ------------- - -By default we use libcurl, which has its own ![recommendations for -thread safety](http://curl.haxx.se/libcurl/c/libcurl-tutorial.html#Multi-threading). - -If libcurl was not found or was disabled, libgit2 uses OpenSSL to be -able to use HTTPS as a transport. This library is made to be -thread-implementation agnostic, and the users of the library must set -which locking function it should use. This means that libgit2 cannot -know what to set as the user of libgit2 may use OpenSSL independently -and the locking settings must survive libgit2 shutting down. - -Even if libgit2 doesn't use OpenSSL directly, OpenSSL can still be used -by libssh2 depending on the configuration. If OpenSSL is used both by -libgit2 and libssh2, you only need to set up threading for OpenSSL once. - -libgit2 does provide a last-resort convenience function -`git_openssl_set_locking()` (available in `sys/openssl.h`) to use the -platform-native mutex mechanisms to perform the locking, which you may -rely on if you do not want to use OpenSSL outside of libgit2, or you -know that libgit2 will outlive the rest of the operations. It is not -safe to use OpenSSL multi-threaded after libgit2's shutdown function -has been called. Note `git_openssl_set_locking()` only works if -libgit2 uses OpenSSL directly - if OpenSSL is only used as a dependency -of libssh2 as described above, `git_openssl_set_locking()` is a no-op. - -If your programming language offers a package/bindings for OpenSSL, -you should very strongly prefer to use that in order to set up -locking, as they provide a level of coördination which is impossible -when using this function. - -See the -[OpenSSL documentation](https://www.openssl.org/docs/crypto/threads.html) -on threading for more details, and http://trac.libssh2.org/wiki/MultiThreading -for a specific example of providing the threading callbacks. - -Be also aware that libgit2 does not always link against OpenSSL -if there are alternatives provided by the system. - -libssh2 may be linked against OpenSSL or libgcrypt. If it uses OpenSSL, -see the above paragraphs. If it uses libgcrypt, then you need to -set up its locking before using it multi-threaded. libgit2 has no -direct connection to libgcrypt and thus has not convenience functions for -it (but libgcrypt has macros). Read libgcrypt's -[threading documentation for more information](http://www.gnupg.org/documentation/manuals/gcrypt/Multi_002dThreading.html) - -It is your responsibility as an application author or packager to know -what your dependencies are linked against and to take the appropriate -steps to ensure the cryptographic libraries are thread-safe. We agree -that this situation is far from ideal but at this time it is something -the application authors need to deal with. diff --git a/vendor/libgit2/api.docurium b/vendor/libgit2/api.docurium deleted file mode 100644 index 9e17817db..000000000 --- a/vendor/libgit2/api.docurium +++ /dev/null @@ -1,13 +0,0 @@ -{ - "name": "libgit2", - "github": "libgit2/libgit2", - "input": "include/git2", - "prefix": "git_", - "output": "docs", - "branch": "gh-pages", - "examples": "examples", - "legacy": { - "input": {"src/git": ["v0.1.0"], - "src/git2": ["v0.2.0", "v0.3.0"]} - } -} diff --git a/vendor/libgit2/appveyor.yml b/vendor/libgit2/appveyor.yml deleted file mode 100644 index 3ed3c49a1..000000000 --- a/vendor/libgit2/appveyor.yml +++ /dev/null @@ -1,43 +0,0 @@ -version: '{build}' -branches: - only: - - master - - /^maint.*/ -environment: - GITTEST_INVASIVE_FS_STRUCTURE: 1 - GITTEST_INVASIVE_FS_SIZE: 1 - - matrix: - - GENERATOR: "Visual Studio 11" - ARCH: 32 - - GENERATOR: "Visual Studio 11 Win64" - ARCH: 64 - - GENERATOR: "MSYS Makefiles" - ARCH: 32 - - GENERATOR: "MSYS Makefiles" - ARCH: i686 # this is for 32-bit MinGW-w64 - - GENERATOR: "MSYS Makefiles" - ARCH: 64 -matrix: - allow_failures: - - GENERATOR: "MSYS Makefiles" - ARCH: 32 -cache: -- i686-4.9.2-release-win32-sjlj-rt_v3-rev1.7z -- x86_64-4.9.2-release-win32-seh-rt_v3-rev1.7z -build_script: -- ps: | - mkdir build - cd build - if ($env:GENERATOR -ne "MSYS Makefiles") { - cmake -D ENABLE_TRACE=ON -D BUILD_CLAR=ON -D MSVC_CRTDBG=ON .. -G"$env:GENERATOR" - cmake --build . --config Debug - } -- cmd: | - if "%GENERATOR%"=="MSYS Makefiles" (C:\MinGW\msys\1.0\bin\sh --login /c/projects/libgit2/script/appveyor-mingw.sh) -test_script: -- ps: | - ctest -V -R libgit2_clar - $env:GITTEST_REMOTE_URL="https://github.com/libgit2/non-existent" - $env:GITTEST_REMOTE_USER="libgit2test" - ctest -V -R libgit2_clar-cred_callback diff --git a/vendor/libgit2/cmake/Modules/AddCFlagIfSupported.cmake b/vendor/libgit2/cmake/Modules/AddCFlagIfSupported.cmake deleted file mode 100644 index 67fc89510..000000000 --- a/vendor/libgit2/cmake/Modules/AddCFlagIfSupported.cmake +++ /dev/null @@ -1,16 +0,0 @@ -# - Append compiler flag to CMAKE_C_FLAGS if compiler supports it -# ADD_C_FLAG_IF_SUPPORTED() -# - the compiler flag to test -# This internally calls the CHECK_C_COMPILER_FLAG macro. - -INCLUDE(CheckCCompilerFlag) - -MACRO(ADD_C_FLAG_IF_SUPPORTED _FLAG) - STRING(TOUPPER ${_FLAG} UPCASE) - STRING(REGEX REPLACE "^-" "" UPCASE_PRETTY ${UPCASE}) - CHECK_C_COMPILER_FLAG(${_FLAG} IS_${UPCASE_PRETTY}_SUPPORTED) - - IF(IS_${UPCASE_PRETTY}_SUPPORTED) - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${_FLAG}") - ENDIF() -ENDMACRO() diff --git a/vendor/libgit2/cmake/Modules/FindCoreFoundation.cmake b/vendor/libgit2/cmake/Modules/FindCoreFoundation.cmake deleted file mode 100644 index ebd619a53..000000000 --- a/vendor/libgit2/cmake/Modules/FindCoreFoundation.cmake +++ /dev/null @@ -1,9 +0,0 @@ -IF (COREFOUNDATION_INCLUDE_DIR AND COREFOUNDATION_DIRS) - SET(COREFOUNDATION_FOUND TRUE) -ELSE () - FIND_PATH(COREFOUNDATION_INCLUDE_DIR NAMES CoreFoundation.h) - FIND_LIBRARY(COREFOUNDATION_DIRS NAMES CoreFoundation) - IF (COREFOUNDATION_INCLUDE_DIR AND COREFOUNDATION_DIRS) - SET(COREFOUNDATION_FOUND TRUE) - ENDIF () -ENDIF () diff --git a/vendor/libgit2/cmake/Modules/FindGSSAPI.cmake b/vendor/libgit2/cmake/Modules/FindGSSAPI.cmake deleted file mode 100644 index 8520d35df..000000000 --- a/vendor/libgit2/cmake/Modules/FindGSSAPI.cmake +++ /dev/null @@ -1,324 +0,0 @@ -# - Try to find GSSAPI -# Once done this will define -# -# KRB5_CONFIG - Path to krb5-config -# GSSAPI_ROOT_DIR - Set this variable to the root installation of GSSAPI -# -# Read-Only variables: -# GSSAPI_FLAVOR_MIT - set to TURE if MIT Kerberos has been found -# GSSAPI_FLAVOR_HEIMDAL - set to TRUE if Heimdal Keberos has been found -# GSSAPI_FOUND - system has GSSAPI -# GSSAPI_INCLUDE_DIR - the GSSAPI include directory -# GSSAPI_LIBRARIES - Link these to use GSSAPI -# GSSAPI_DEFINITIONS - Compiler switches required for using GSSAPI -# -#============================================================================= -# Copyright (c) 2013 Andreas Schneider -# -# Distributed under the OSI-approved BSD License (the "License"); -# see accompanying file Copyright.txt for details. -# -# This software is distributed WITHOUT ANY WARRANTY; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# See the License for more information. -#============================================================================= -# - -find_path(GSSAPI_ROOT_DIR - NAMES - include/gssapi.h - include/gssapi/gssapi.h - HINTS - ${_GSSAPI_ROOT_HINTS} - PATHS - ${_GSSAPI_ROOT_PATHS} -) -mark_as_advanced(GSSAPI_ROOT_DIR) - -if (UNIX) - find_program(KRB5_CONFIG - NAMES - krb5-config - PATHS - ${GSSAPI_ROOT_DIR}/bin - /opt/local/bin) - mark_as_advanced(KRB5_CONFIG) - - if (KRB5_CONFIG) - # Check if we have MIT KRB5 - execute_process( - COMMAND - ${KRB5_CONFIG} --vendor - RESULT_VARIABLE - _GSSAPI_VENDOR_RESULT - OUTPUT_VARIABLE - _GSSAPI_VENDOR_STRING) - - if (_GSSAPI_VENDOR_STRING MATCHES ".*Massachusetts.*") - set(GSSAPI_FLAVOR_MIT TRUE) - else() - execute_process( - COMMAND - ${KRB5_CONFIG} --libs gssapi - RESULT_VARIABLE - _GSSAPI_LIBS_RESULT - OUTPUT_VARIABLE - _GSSAPI_LIBS_STRING) - - if (_GSSAPI_LIBS_STRING MATCHES ".*roken.*") - set(GSSAPI_FLAVOR_HEIMDAL TRUE) - endif() - endif() - - # Get the include dir - execute_process( - COMMAND - ${KRB5_CONFIG} --cflags gssapi - RESULT_VARIABLE - _GSSAPI_INCLUDE_RESULT - OUTPUT_VARIABLE - _GSSAPI_INCLUDE_STRING) - string(REGEX REPLACE "(\r?\n)+$" "" _GSSAPI_INCLUDE_STRING "${_GSSAPI_INCLUDE_STRING}") - string(REGEX REPLACE " *-I" "" _GSSAPI_INCLUDEDIR "${_GSSAPI_INCLUDE_STRING}") - endif() - - if (NOT GSSAPI_FLAVOR_MIT AND NOT GSSAPI_FLAVOR_HEIMDAL) - # Check for HEIMDAL - find_package(PkgConfig) - if (PKG_CONFIG_FOUND) - pkg_check_modules(_GSSAPI heimdal-gssapi) - endif (PKG_CONFIG_FOUND) - - if (_GSSAPI_FOUND) - set(GSSAPI_FLAVOR_HEIMDAL TRUE) - else() - find_path(_GSSAPI_ROKEN - NAMES - roken.h - PATHS - ${GSSAPI_ROOT_DIR}/include - ${_GSSAPI_INCLUDEDIR}) - if (_GSSAPI_ROKEN) - set(GSSAPI_FLAVOR_HEIMDAL TRUE) - endif() - endif () - endif() -endif (UNIX) - -find_path(GSSAPI_INCLUDE_DIR - NAMES - gssapi.h - gssapi/gssapi.h - PATHS - ${GSSAPI_ROOT_DIR}/include - ${_GSSAPI_INCLUDEDIR} -) - -if (GSSAPI_FLAVOR_MIT) - find_library(GSSAPI_LIBRARY - NAMES - gssapi_krb5 - PATHS - ${GSSAPI_ROOT_DIR}/lib - ${_GSSAPI_LIBDIR} - ) - - find_library(KRB5_LIBRARY - NAMES - krb5 - PATHS - ${GSSAPI_ROOT_DIR}/lib - ${_GSSAPI_LIBDIR} - ) - - find_library(K5CRYPTO_LIBRARY - NAMES - k5crypto - PATHS - ${GSSAPI_ROOT_DIR}/lib - ${_GSSAPI_LIBDIR} - ) - - find_library(COM_ERR_LIBRARY - NAMES - com_err - PATHS - ${GSSAPI_ROOT_DIR}/lib - ${_GSSAPI_LIBDIR} - ) - - if (GSSAPI_LIBRARY) - set(GSSAPI_LIBRARIES - ${GSSAPI_LIBRARIES} - ${GSSAPI_LIBRARY} - ) - endif (GSSAPI_LIBRARY) - - if (KRB5_LIBRARY) - set(GSSAPI_LIBRARIES - ${GSSAPI_LIBRARIES} - ${KRB5_LIBRARY} - ) - endif (KRB5_LIBRARY) - - if (K5CRYPTO_LIBRARY) - set(GSSAPI_LIBRARIES - ${GSSAPI_LIBRARIES} - ${K5CRYPTO_LIBRARY} - ) - endif (K5CRYPTO_LIBRARY) - - if (COM_ERR_LIBRARY) - set(GSSAPI_LIBRARIES - ${GSSAPI_LIBRARIES} - ${COM_ERR_LIBRARY} - ) - endif (COM_ERR_LIBRARY) -endif (GSSAPI_FLAVOR_MIT) - -if (GSSAPI_FLAVOR_HEIMDAL) - find_library(GSSAPI_LIBRARY - NAMES - gssapi - PATHS - ${GSSAPI_ROOT_DIR}/lib - ${_GSSAPI_LIBDIR} - ) - - find_library(KRB5_LIBRARY - NAMES - krb5 - PATHS - ${GSSAPI_ROOT_DIR}/lib - ${_GSSAPI_LIBDIR} - ) - - find_library(HCRYPTO_LIBRARY - NAMES - hcrypto - PATHS - ${GSSAPI_ROOT_DIR}/lib - ${_GSSAPI_LIBDIR} - ) - - find_library(COM_ERR_LIBRARY - NAMES - com_err - PATHS - ${GSSAPI_ROOT_DIR}/lib - ${_GSSAPI_LIBDIR} - ) - - find_library(HEIMNTLM_LIBRARY - NAMES - heimntlm - PATHS - ${GSSAPI_ROOT_DIR}/lib - ${_GSSAPI_LIBDIR} - ) - - find_library(HX509_LIBRARY - NAMES - hx509 - PATHS - ${GSSAPI_ROOT_DIR}/lib - ${_GSSAPI_LIBDIR} - ) - - find_library(ASN1_LIBRARY - NAMES - asn1 - PATHS - ${GSSAPI_ROOT_DIR}/lib - ${_GSSAPI_LIBDIR} - ) - - find_library(WIND_LIBRARY - NAMES - wind - PATHS - ${GSSAPI_ROOT_DIR}/lib - ${_GSSAPI_LIBDIR} - ) - - find_library(ROKEN_LIBRARY - NAMES - roken - PATHS - ${GSSAPI_ROOT_DIR}/lib - ${_GSSAPI_LIBDIR} - ) - - if (GSSAPI_LIBRARY) - set(GSSAPI_LIBRARIES - ${GSSAPI_LIBRARIES} - ${GSSAPI_LIBRARY} - ) - endif (GSSAPI_LIBRARY) - - if (KRB5_LIBRARY) - set(GSSAPI_LIBRARIES - ${GSSAPI_LIBRARIES} - ${KRB5_LIBRARY} - ) - endif (KRB5_LIBRARY) - - if (HCRYPTO_LIBRARY) - set(GSSAPI_LIBRARIES - ${GSSAPI_LIBRARIES} - ${HCRYPTO_LIBRARY} - ) - endif (HCRYPTO_LIBRARY) - - if (COM_ERR_LIBRARY) - set(GSSAPI_LIBRARIES - ${GSSAPI_LIBRARIES} - ${COM_ERR_LIBRARY} - ) - endif (COM_ERR_LIBRARY) - - if (HEIMNTLM_LIBRARY) - set(GSSAPI_LIBRARIES - ${GSSAPI_LIBRARIES} - ${HEIMNTLM_LIBRARY} - ) - endif (HEIMNTLM_LIBRARY) - - if (HX509_LIBRARY) - set(GSSAPI_LIBRARIES - ${GSSAPI_LIBRARIES} - ${HX509_LIBRARY} - ) - endif (HX509_LIBRARY) - - if (ASN1_LIBRARY) - set(GSSAPI_LIBRARIES - ${GSSAPI_LIBRARIES} - ${ASN1_LIBRARY} - ) - endif (ASN1_LIBRARY) - - if (WIND_LIBRARY) - set(GSSAPI_LIBRARIES - ${GSSAPI_LIBRARIES} - ${WIND_LIBRARY} - ) - endif (WIND_LIBRARY) - - if (ROKEN_LIBRARY) - set(GSSAPI_LIBRARIES - ${GSSAPI_LIBRARIES} - ${WIND_LIBRARY} - ) - endif (ROKEN_LIBRARY) -endif (GSSAPI_FLAVOR_HEIMDAL) - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(GSSAPI DEFAULT_MSG GSSAPI_LIBRARIES GSSAPI_INCLUDE_DIR) - -if (GSSAPI_INCLUDE_DIRS AND GSSAPI_LIBRARIES) - set(GSSAPI_FOUND TRUE) -endif (GSSAPI_INCLUDE_DIRS AND GSSAPI_LIBRARIES) - -# show the GSSAPI_INCLUDE_DIRS and GSSAPI_LIBRARIES variables only in the advanced view -mark_as_advanced(GSSAPI_INCLUDE_DIRS GSSAPI_LIBRARIES) diff --git a/vendor/libgit2/cmake/Modules/FindHTTP_Parser.cmake b/vendor/libgit2/cmake/Modules/FindHTTP_Parser.cmake deleted file mode 100644 index d92bf75cc..000000000 --- a/vendor/libgit2/cmake/Modules/FindHTTP_Parser.cmake +++ /dev/null @@ -1,39 +0,0 @@ -# - Try to find http-parser -# -# Defines the following variables: -# -# HTTP_PARSER_FOUND - system has http-parser -# HTTP_PARSER_INCLUDE_DIR - the http-parser include directory -# HTTP_PARSER_LIBRARIES - Link these to use http-parser -# HTTP_PARSER_VERSION_MAJOR - major version -# HTTP_PARSER_VERSION_MINOR - minor version -# HTTP_PARSER_VERSION_STRING - the version of http-parser found - -# Find the header and library -FIND_PATH(HTTP_PARSER_INCLUDE_DIR NAMES http_parser.h) -FIND_LIBRARY(HTTP_PARSER_LIBRARY NAMES http_parser libhttp_parser) - -# Found the header, read version -if (HTTP_PARSER_INCLUDE_DIR AND EXISTS "${HTTP_PARSER_INCLUDE_DIR}/http_parser.h") - FILE(READ "${HTTP_PARSER_INCLUDE_DIR}/http_parser.h" HTTP_PARSER_H) - IF (HTTP_PARSER_H) - STRING(REGEX REPLACE ".*#define[\t ]+HTTP_PARSER_VERSION_MAJOR[\t ]+([0-9]+).*" "\\1" HTTP_PARSER_VERSION_MAJOR "${HTTP_PARSER_H}") - STRING(REGEX REPLACE ".*#define[\t ]+HTTP_PARSER_VERSION_MINOR[\t ]+([0-9]+).*" "\\1" HTTP_PARSER_VERSION_MINOR "${HTTP_PARSER_H}") - SET(HTTP_PARSER_VERSION_STRING "${HTTP_PARSER_VERSION_MAJOR}.${HTTP_PARSER_VERSION_MINOR}") - ENDIF() - UNSET(HTTP_PARSER_H) -ENDIF() - -# Handle the QUIETLY and REQUIRED arguments and set HTTP_PARSER_FOUND -# to TRUE if all listed variables are TRUE -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(HTTP_Parser REQUIRED_VARS HTTP_PARSER_INCLUDE_DIR HTTP_PARSER_LIBRARY) - -# Hide advanced variables -MARK_AS_ADVANCED(HTTP_PARSER_INCLUDE_DIR HTTP_PARSER_LIBRARY) - -# Set standard variables -IF (HTTP_PARSER_FOUND) - SET(HTTP_PARSER_LIBRARIES ${HTTP_PARSER_LIBRARY}) - set(HTTP_PARSER_INCLUDE_DIRS ${HTTP_PARSER_INCLUDE_DIR}) -ENDIF() diff --git a/vendor/libgit2/cmake/Modules/FindIconv.cmake b/vendor/libgit2/cmake/Modules/FindIconv.cmake deleted file mode 100644 index 95414bda6..000000000 --- a/vendor/libgit2/cmake/Modules/FindIconv.cmake +++ /dev/null @@ -1,40 +0,0 @@ -# - Try to find Iconv -# Once done this will define -# -# ICONV_FOUND - system has Iconv -# ICONV_INCLUDE_DIR - the Iconv include directory -# ICONV_LIBRARIES - Link these to use Iconv -# - -IF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) - # Already in cache, be silent - SET(ICONV_FIND_QUIETLY TRUE) -ENDIF() - -FIND_PATH(ICONV_INCLUDE_DIR iconv.h) -FIND_LIBRARY(iconv_lib NAMES iconv libiconv libiconv-2 c) - -IF(ICONV_INCLUDE_DIR AND iconv_lib) - SET(ICONV_FOUND TRUE) -ENDIF() - -IF(ICONV_FOUND) - # split iconv into -L and -l linker options, so we can set them for pkg-config - GET_FILENAME_COMPONENT(iconv_path ${iconv_lib} PATH) - GET_FILENAME_COMPONENT(iconv_name ${iconv_lib} NAME_WE) - STRING(REGEX REPLACE "^lib" "" iconv_name ${iconv_name}) - SET(ICONV_LIBRARIES "-L${iconv_path} -l${iconv_name}") - - IF(NOT ICONV_FIND_QUIETLY) - MESSAGE(STATUS "Found Iconv: ${ICONV_LIBRARIES}") - ENDIF(NOT ICONV_FIND_QUIETLY) -ELSE() - IF(Iconv_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "Could not find Iconv") - ENDIF(Iconv_FIND_REQUIRED) -ENDIF() - -MARK_AS_ADVANCED( - ICONV_INCLUDE_DIR - ICONV_LIBRARIES -) diff --git a/vendor/libgit2/cmake/Modules/FindSecurity.cmake b/vendor/libgit2/cmake/Modules/FindSecurity.cmake deleted file mode 100644 index 0decdde92..000000000 --- a/vendor/libgit2/cmake/Modules/FindSecurity.cmake +++ /dev/null @@ -1,9 +0,0 @@ -IF (SECURITY_INCLUDE_DIR AND SECURITY_DIRS) - SET(SECURITY_FOUND TRUE) -ELSE () - FIND_PATH(SECURITY_INCLUDE_DIR NAMES Security/Security.h) - FIND_LIBRARY(SECURITY_DIRS NAMES Security) - IF (SECURITY_INCLUDE_DIR AND SECURITY_DIRS) - SET(SECURITY_FOUND TRUE) - ENDIF () -ENDIF () diff --git a/vendor/libgit2/deps/http-parser/LICENSE-MIT b/vendor/libgit2/deps/http-parser/LICENSE-MIT deleted file mode 100644 index 58010b388..000000000 --- a/vendor/libgit2/deps/http-parser/LICENSE-MIT +++ /dev/null @@ -1,23 +0,0 @@ -http_parser.c is based on src/http/ngx_http_parse.c from NGINX copyright -Igor Sysoev. - -Additional changes are licensed under the same terms as NGINX and -copyright Joyent, Inc. and other Node contributors. All rights reserved. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to -deal in the Software without restriction, including without limitation the -rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -sell copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -IN THE SOFTWARE. diff --git a/vendor/libgit2/deps/http-parser/http_parser.c b/vendor/libgit2/deps/http-parser/http_parser.c deleted file mode 100644 index 27bdd2081..000000000 --- a/vendor/libgit2/deps/http-parser/http_parser.c +++ /dev/null @@ -1,2177 +0,0 @@ -/* Based on src/http/ngx_http_parse.c from NGINX copyright Igor Sysoev - * - * Additional changes are licensed under the same terms as NGINX and - * copyright Joyent, Inc. and other Node contributors. All rights reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to - * deal in the Software without restriction, including without limitation the - * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS - * IN THE SOFTWARE. - */ -#include "http_parser.h" -#include -#include -#include -#include -#include -#include - -#ifndef ULLONG_MAX -# define ULLONG_MAX ((uint64_t) -1) /* 2^64-1 */ -#endif - -#ifndef MIN -# define MIN(a,b) ((a) < (b) ? (a) : (b)) -#endif - -#ifndef ARRAY_SIZE -# define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0])) -#endif - -#ifndef BIT_AT -# define BIT_AT(a, i) \ - (!!((unsigned int) (a)[(unsigned int) (i) >> 3] & \ - (1 << ((unsigned int) (i) & 7)))) -#endif - -#ifndef ELEM_AT -# define ELEM_AT(a, i, v) ((unsigned int) (i) < ARRAY_SIZE(a) ? (a)[(i)] : (v)) -#endif - -#define SET_ERRNO(e) \ -do { \ - parser->http_errno = (e); \ -} while(0) - - -/* Run the notify callback FOR, returning ER if it fails */ -#define CALLBACK_NOTIFY_(FOR, ER) \ -do { \ - assert(HTTP_PARSER_ERRNO(parser) == HPE_OK); \ - \ - if (settings->on_##FOR) { \ - if (0 != settings->on_##FOR(parser)) { \ - SET_ERRNO(HPE_CB_##FOR); \ - } \ - \ - /* We either errored above or got paused; get out */ \ - if (HTTP_PARSER_ERRNO(parser) != HPE_OK) { \ - return (ER); \ - } \ - } \ -} while (0) - -/* Run the notify callback FOR and consume the current byte */ -#define CALLBACK_NOTIFY(FOR) CALLBACK_NOTIFY_(FOR, p - data + 1) - -/* Run the notify callback FOR and don't consume the current byte */ -#define CALLBACK_NOTIFY_NOADVANCE(FOR) CALLBACK_NOTIFY_(FOR, p - data) - -/* Run data callback FOR with LEN bytes, returning ER if it fails */ -#define CALLBACK_DATA_(FOR, LEN, ER) \ -do { \ - assert(HTTP_PARSER_ERRNO(parser) == HPE_OK); \ - \ - if (FOR##_mark) { \ - if (settings->on_##FOR) { \ - if (0 != settings->on_##FOR(parser, FOR##_mark, (LEN))) { \ - SET_ERRNO(HPE_CB_##FOR); \ - } \ - \ - /* We either errored above or got paused; get out */ \ - if (HTTP_PARSER_ERRNO(parser) != HPE_OK) { \ - return (ER); \ - } \ - } \ - FOR##_mark = NULL; \ - } \ -} while (0) - -/* Run the data callback FOR and consume the current byte */ -#define CALLBACK_DATA(FOR) \ - CALLBACK_DATA_(FOR, p - FOR##_mark, p - data + 1) - -/* Run the data callback FOR and don't consume the current byte */ -#define CALLBACK_DATA_NOADVANCE(FOR) \ - CALLBACK_DATA_(FOR, p - FOR##_mark, p - data) - -/* Set the mark FOR; non-destructive if mark is already set */ -#define MARK(FOR) \ -do { \ - if (!FOR##_mark) { \ - FOR##_mark = p; \ - } \ -} while (0) - - -#define PROXY_CONNECTION "proxy-connection" -#define CONNECTION "connection" -#define CONTENT_LENGTH "content-length" -#define TRANSFER_ENCODING "transfer-encoding" -#define UPGRADE "upgrade" -#define CHUNKED "chunked" -#define KEEP_ALIVE "keep-alive" -#define CLOSE "close" - - -static const char *method_strings[] = - { -#define XX(num, name, string) #string, - HTTP_METHOD_MAP(XX) -#undef XX - }; - - -/* Tokens as defined by rfc 2616. Also lowercases them. - * token = 1* - * separators = "(" | ")" | "<" | ">" | "@" - * | "," | ";" | ":" | "\" | <"> - * | "/" | "[" | "]" | "?" | "=" - * | "{" | "}" | SP | HT - */ -static const char tokens[256] = { -/* 0 nul 1 soh 2 stx 3 etx 4 eot 5 enq 6 ack 7 bel */ - 0, 0, 0, 0, 0, 0, 0, 0, -/* 8 bs 9 ht 10 nl 11 vt 12 np 13 cr 14 so 15 si */ - 0, 0, 0, 0, 0, 0, 0, 0, -/* 16 dle 17 dc1 18 dc2 19 dc3 20 dc4 21 nak 22 syn 23 etb */ - 0, 0, 0, 0, 0, 0, 0, 0, -/* 24 can 25 em 26 sub 27 esc 28 fs 29 gs 30 rs 31 us */ - 0, 0, 0, 0, 0, 0, 0, 0, -/* 32 sp 33 ! 34 " 35 # 36 $ 37 % 38 & 39 ' */ - 0, '!', 0, '#', '$', '%', '&', '\'', -/* 40 ( 41 ) 42 * 43 + 44 , 45 - 46 . 47 / */ - 0, 0, '*', '+', 0, '-', '.', 0, -/* 48 0 49 1 50 2 51 3 52 4 53 5 54 6 55 7 */ - '0', '1', '2', '3', '4', '5', '6', '7', -/* 56 8 57 9 58 : 59 ; 60 < 61 = 62 > 63 ? */ - '8', '9', 0, 0, 0, 0, 0, 0, -/* 64 @ 65 A 66 B 67 C 68 D 69 E 70 F 71 G */ - 0, 'a', 'b', 'c', 'd', 'e', 'f', 'g', -/* 72 H 73 I 74 J 75 K 76 L 77 M 78 N 79 O */ - 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', -/* 80 P 81 Q 82 R 83 S 84 T 85 U 86 V 87 W */ - 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', -/* 88 X 89 Y 90 Z 91 [ 92 \ 93 ] 94 ^ 95 _ */ - 'x', 'y', 'z', 0, 0, 0, '^', '_', -/* 96 ` 97 a 98 b 99 c 100 d 101 e 102 f 103 g */ - '`', 'a', 'b', 'c', 'd', 'e', 'f', 'g', -/* 104 h 105 i 106 j 107 k 108 l 109 m 110 n 111 o */ - 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', -/* 112 p 113 q 114 r 115 s 116 t 117 u 118 v 119 w */ - 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', -/* 120 x 121 y 122 z 123 { 124 | 125 } 126 ~ 127 del */ - 'x', 'y', 'z', 0, '|', 0, '~', 0 }; - - -static const int8_t unhex[256] = - {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1 - ,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1 - ,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1 - , 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,-1,-1,-1,-1,-1,-1 - ,-1,10,11,12,13,14,15,-1,-1,-1,-1,-1,-1,-1,-1,-1 - ,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1 - ,-1,10,11,12,13,14,15,-1,-1,-1,-1,-1,-1,-1,-1,-1 - ,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1 - }; - - -#if HTTP_PARSER_STRICT -# define T(v) 0 -#else -# define T(v) v -#endif - - -static const uint8_t normal_url_char[32] = { -/* 0 nul 1 soh 2 stx 3 etx 4 eot 5 enq 6 ack 7 bel */ - 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0, -/* 8 bs 9 ht 10 nl 11 vt 12 np 13 cr 14 so 15 si */ - 0 | T(2) | 0 | 0 | T(16) | 0 | 0 | 0, -/* 16 dle 17 dc1 18 dc2 19 dc3 20 dc4 21 nak 22 syn 23 etb */ - 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0, -/* 24 can 25 em 26 sub 27 esc 28 fs 29 gs 30 rs 31 us */ - 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0, -/* 32 sp 33 ! 34 " 35 # 36 $ 37 % 38 & 39 ' */ - 0 | 2 | 4 | 0 | 16 | 32 | 64 | 128, -/* 40 ( 41 ) 42 * 43 + 44 , 45 - 46 . 47 / */ - 1 | 2 | 4 | 8 | 16 | 32 | 64 | 128, -/* 48 0 49 1 50 2 51 3 52 4 53 5 54 6 55 7 */ - 1 | 2 | 4 | 8 | 16 | 32 | 64 | 128, -/* 56 8 57 9 58 : 59 ; 60 < 61 = 62 > 63 ? */ - 1 | 2 | 4 | 8 | 16 | 32 | 64 | 0, -/* 64 @ 65 A 66 B 67 C 68 D 69 E 70 F 71 G */ - 1 | 2 | 4 | 8 | 16 | 32 | 64 | 128, -/* 72 H 73 I 74 J 75 K 76 L 77 M 78 N 79 O */ - 1 | 2 | 4 | 8 | 16 | 32 | 64 | 128, -/* 80 P 81 Q 82 R 83 S 84 T 85 U 86 V 87 W */ - 1 | 2 | 4 | 8 | 16 | 32 | 64 | 128, -/* 88 X 89 Y 90 Z 91 [ 92 \ 93 ] 94 ^ 95 _ */ - 1 | 2 | 4 | 8 | 16 | 32 | 64 | 128, -/* 96 ` 97 a 98 b 99 c 100 d 101 e 102 f 103 g */ - 1 | 2 | 4 | 8 | 16 | 32 | 64 | 128, -/* 104 h 105 i 106 j 107 k 108 l 109 m 110 n 111 o */ - 1 | 2 | 4 | 8 | 16 | 32 | 64 | 128, -/* 112 p 113 q 114 r 115 s 116 t 117 u 118 v 119 w */ - 1 | 2 | 4 | 8 | 16 | 32 | 64 | 128, -/* 120 x 121 y 122 z 123 { 124 | 125 } 126 ~ 127 del */ - 1 | 2 | 4 | 8 | 16 | 32 | 64 | 0, }; - -#undef T - -enum state - { s_dead = 1 /* important that this is > 0 */ - - , s_start_req_or_res - , s_res_or_resp_H - , s_start_res - , s_res_H - , s_res_HT - , s_res_HTT - , s_res_HTTP - , s_res_first_http_major - , s_res_http_major - , s_res_first_http_minor - , s_res_http_minor - , s_res_first_status_code - , s_res_status_code - , s_res_status - , s_res_line_almost_done - - , s_start_req - - , s_req_method - , s_req_spaces_before_url - , s_req_schema - , s_req_schema_slash - , s_req_schema_slash_slash - , s_req_server_start - , s_req_server - , s_req_server_with_at - , s_req_path - , s_req_query_string_start - , s_req_query_string - , s_req_fragment_start - , s_req_fragment - , s_req_http_start - , s_req_http_H - , s_req_http_HT - , s_req_http_HTT - , s_req_http_HTTP - , s_req_first_http_major - , s_req_http_major - , s_req_first_http_minor - , s_req_http_minor - , s_req_line_almost_done - - , s_header_field_start - , s_header_field - , s_header_value_start - , s_header_value - , s_header_value_lws - - , s_header_almost_done - - , s_chunk_size_start - , s_chunk_size - , s_chunk_parameters - , s_chunk_size_almost_done - - , s_headers_almost_done - , s_headers_done - - /* Important: 's_headers_done' must be the last 'header' state. All - * states beyond this must be 'body' states. It is used for overflow - * checking. See the PARSING_HEADER() macro. - */ - - , s_chunk_data - , s_chunk_data_almost_done - , s_chunk_data_done - - , s_body_identity - , s_body_identity_eof - - , s_message_done - }; - - -#define PARSING_HEADER(state) (state <= s_headers_done) - - -enum header_states - { h_general = 0 - , h_C - , h_CO - , h_CON - - , h_matching_connection - , h_matching_proxy_connection - , h_matching_content_length - , h_matching_transfer_encoding - , h_matching_upgrade - - , h_connection - , h_content_length - , h_transfer_encoding - , h_upgrade - - , h_matching_transfer_encoding_chunked - , h_matching_connection_keep_alive - , h_matching_connection_close - - , h_transfer_encoding_chunked - , h_connection_keep_alive - , h_connection_close - }; - -enum http_host_state - { - s_http_host_dead = 1 - , s_http_userinfo_start - , s_http_userinfo - , s_http_host_start - , s_http_host_v6_start - , s_http_host - , s_http_host_v6 - , s_http_host_v6_end - , s_http_host_port_start - , s_http_host_port -}; - -/* Macros for character classes; depends on strict-mode */ -#define CR '\r' -#define LF '\n' -#define LOWER(c) (unsigned char)(c | 0x20) -#define IS_ALPHA(c) (LOWER(c) >= 'a' && LOWER(c) <= 'z') -#define IS_NUM(c) ((c) >= '0' && (c) <= '9') -#define IS_ALPHANUM(c) (IS_ALPHA(c) || IS_NUM(c)) -#define IS_HEX(c) (IS_NUM(c) || (LOWER(c) >= 'a' && LOWER(c) <= 'f')) -#define IS_MARK(c) ((c) == '-' || (c) == '_' || (c) == '.' || \ - (c) == '!' || (c) == '~' || (c) == '*' || (c) == '\'' || (c) == '(' || \ - (c) == ')') -#define IS_USERINFO_CHAR(c) (IS_ALPHANUM(c) || IS_MARK(c) || (c) == '%' || \ - (c) == ';' || (c) == ':' || (c) == '&' || (c) == '=' || (c) == '+' || \ - (c) == '$' || (c) == ',') - -#if HTTP_PARSER_STRICT -#define TOKEN(c) (tokens[(unsigned char)c]) -#define IS_URL_CHAR(c) (BIT_AT(normal_url_char, (unsigned char)c)) -#define IS_HOST_CHAR(c) (IS_ALPHANUM(c) || (c) == '.' || (c) == '-') -#else -#define TOKEN(c) ((c == ' ') ? ' ' : tokens[(unsigned char)c]) -#define IS_URL_CHAR(c) \ - (BIT_AT(normal_url_char, (unsigned char)c) || ((c) & 0x80)) -#define IS_HOST_CHAR(c) \ - (IS_ALPHANUM(c) || (c) == '.' || (c) == '-' || (c) == '_') -#endif - - -#define start_state (parser->type == HTTP_REQUEST ? s_start_req : s_start_res) - - -#if HTTP_PARSER_STRICT -# define STRICT_CHECK(cond) \ -do { \ - if (cond) { \ - SET_ERRNO(HPE_STRICT); \ - goto error; \ - } \ -} while (0) -# define NEW_MESSAGE() (http_should_keep_alive(parser) ? start_state : s_dead) -#else -# define STRICT_CHECK(cond) -# define NEW_MESSAGE() start_state -#endif - - -/* Map errno values to strings for human-readable output */ -#define HTTP_STRERROR_GEN(n, s) { "HPE_" #n, s }, -static struct { - const char *name; - const char *description; -} http_strerror_tab[] = { - HTTP_ERRNO_MAP(HTTP_STRERROR_GEN) -}; -#undef HTTP_STRERROR_GEN - -int http_message_needs_eof(const http_parser *parser); - -/* Our URL parser. - * - * This is designed to be shared by http_parser_execute() for URL validation, - * hence it has a state transition + byte-for-byte interface. In addition, it - * is meant to be embedded in http_parser_parse_url(), which does the dirty - * work of turning state transitions URL components for its API. - * - * This function should only be invoked with non-space characters. It is - * assumed that the caller cares about (and can detect) the transition between - * URL and non-URL states by looking for these. - */ -static enum state -parse_url_char(enum state s, const char ch) -{ - if (ch == ' ' || ch == '\r' || ch == '\n') { - return s_dead; - } - -#if HTTP_PARSER_STRICT - if (ch == '\t' || ch == '\f') { - return s_dead; - } -#endif - - switch (s) { - case s_req_spaces_before_url: - /* Proxied requests are followed by scheme of an absolute URI (alpha). - * All methods except CONNECT are followed by '/' or '*'. - */ - - if (ch == '/' || ch == '*') { - return s_req_path; - } - - /* The schema must start with an alpha character. After that, it may - * consist of digits, '+', '-' or '.', followed by a ':'. - */ - if (IS_ALPHA(ch)) { - return s_req_schema; - } - - break; - - case s_req_schema: - if (IS_ALPHANUM(ch) || ch == '+' || ch == '-' || ch == '.') { - return s; - } - - if (ch == ':') { - return s_req_schema_slash; - } - - break; - - case s_req_schema_slash: - if (ch == '/') { - return s_req_schema_slash_slash; - } - - break; - - case s_req_schema_slash_slash: - if (ch == '/') { - return s_req_server_start; - } - - break; - - case s_req_server_with_at: - if (ch == '@') { - return s_dead; - } - - /* FALLTHROUGH */ - case s_req_server_start: - case s_req_server: - if (ch == '/') { - return s_req_path; - } - - if (ch == '?') { - return s_req_query_string_start; - } - - if (ch == '@') { - return s_req_server_with_at; - } - - if (IS_USERINFO_CHAR(ch) || ch == '[' || ch == ']') { - return s_req_server; - } - - break; - - case s_req_path: - if (IS_URL_CHAR(ch)) { - return s; - } - - switch (ch) { - case '?': - return s_req_query_string_start; - - case '#': - return s_req_fragment_start; - } - - break; - - case s_req_query_string_start: - case s_req_query_string: - if (IS_URL_CHAR(ch)) { - return s_req_query_string; - } - - switch (ch) { - case '?': - /* allow extra '?' in query string */ - return s_req_query_string; - - case '#': - return s_req_fragment_start; - } - - break; - - case s_req_fragment_start: - if (IS_URL_CHAR(ch)) { - return s_req_fragment; - } - - switch (ch) { - case '?': - return s_req_fragment; - - case '#': - return s; - } - - break; - - case s_req_fragment: - if (IS_URL_CHAR(ch)) { - return s; - } - - switch (ch) { - case '?': - case '#': - return s; - } - - break; - - default: - break; - } - - /* We should never fall out of the switch above unless there's an error */ - return s_dead; -} - -size_t http_parser_execute (http_parser *parser, - const http_parser_settings *settings, - const char *data, - size_t len) -{ - char c, ch; - int8_t unhex_val; - const char *p = data; - const char *header_field_mark = 0; - const char *header_value_mark = 0; - const char *url_mark = 0; - const char *body_mark = 0; - - /* We're in an error state. Don't bother doing anything. */ - if (HTTP_PARSER_ERRNO(parser) != HPE_OK) { - return 0; - } - - if (len == 0) { - switch (parser->state) { - case s_body_identity_eof: - /* Use of CALLBACK_NOTIFY() here would erroneously return 1 byte read if - * we got paused. - */ - CALLBACK_NOTIFY_NOADVANCE(message_complete); - return 0; - - case s_dead: - case s_start_req_or_res: - case s_start_res: - case s_start_req: - return 0; - - default: - SET_ERRNO(HPE_INVALID_EOF_STATE); - return 1; - } - } - - - if (parser->state == s_header_field) - header_field_mark = data; - if (parser->state == s_header_value) - header_value_mark = data; - switch (parser->state) { - case s_req_path: - case s_req_schema: - case s_req_schema_slash: - case s_req_schema_slash_slash: - case s_req_server_start: - case s_req_server: - case s_req_server_with_at: - case s_req_query_string_start: - case s_req_query_string: - case s_req_fragment_start: - case s_req_fragment: - url_mark = data; - break; - } - - for (p=data; p != data + len; p++) { - ch = *p; - - if (PARSING_HEADER(parser->state)) { - ++parser->nread; - /* Buffer overflow attack */ - if (parser->nread > HTTP_MAX_HEADER_SIZE) { - SET_ERRNO(HPE_HEADER_OVERFLOW); - goto error; - } - } - - reexecute_byte: - switch (parser->state) { - - case s_dead: - /* this state is used after a 'Connection: close' message - * the parser will error out if it reads another message - */ - if (ch == CR || ch == LF) - break; - - SET_ERRNO(HPE_CLOSED_CONNECTION); - goto error; - - case s_start_req_or_res: - { - if (ch == CR || ch == LF) - break; - parser->flags = 0; - parser->content_length = ULLONG_MAX; - - if (ch == 'H') { - parser->state = s_res_or_resp_H; - - CALLBACK_NOTIFY(message_begin); - } else { - parser->type = HTTP_REQUEST; - parser->state = s_start_req; - goto reexecute_byte; - } - - break; - } - - case s_res_or_resp_H: - if (ch == 'T') { - parser->type = HTTP_RESPONSE; - parser->state = s_res_HT; - } else { - if (ch != 'E') { - SET_ERRNO(HPE_INVALID_CONSTANT); - goto error; - } - - parser->type = HTTP_REQUEST; - parser->method = HTTP_HEAD; - parser->index = 2; - parser->state = s_req_method; - } - break; - - case s_start_res: - { - parser->flags = 0; - parser->content_length = ULLONG_MAX; - - switch (ch) { - case 'H': - parser->state = s_res_H; - break; - - case CR: - case LF: - break; - - default: - SET_ERRNO(HPE_INVALID_CONSTANT); - goto error; - } - - CALLBACK_NOTIFY(message_begin); - break; - } - - case s_res_H: - STRICT_CHECK(ch != 'T'); - parser->state = s_res_HT; - break; - - case s_res_HT: - STRICT_CHECK(ch != 'T'); - parser->state = s_res_HTT; - break; - - case s_res_HTT: - STRICT_CHECK(ch != 'P'); - parser->state = s_res_HTTP; - break; - - case s_res_HTTP: - STRICT_CHECK(ch != '/'); - parser->state = s_res_first_http_major; - break; - - case s_res_first_http_major: - if (ch < '0' || ch > '9') { - SET_ERRNO(HPE_INVALID_VERSION); - goto error; - } - - parser->http_major = ch - '0'; - parser->state = s_res_http_major; - break; - - /* major HTTP version or dot */ - case s_res_http_major: - { - if (ch == '.') { - parser->state = s_res_first_http_minor; - break; - } - - if (!IS_NUM(ch)) { - SET_ERRNO(HPE_INVALID_VERSION); - goto error; - } - - parser->http_major *= 10; - parser->http_major += ch - '0'; - - if (parser->http_major > 999) { - SET_ERRNO(HPE_INVALID_VERSION); - goto error; - } - - break; - } - - /* first digit of minor HTTP version */ - case s_res_first_http_minor: - if (!IS_NUM(ch)) { - SET_ERRNO(HPE_INVALID_VERSION); - goto error; - } - - parser->http_minor = ch - '0'; - parser->state = s_res_http_minor; - break; - - /* minor HTTP version or end of request line */ - case s_res_http_minor: - { - if (ch == ' ') { - parser->state = s_res_first_status_code; - break; - } - - if (!IS_NUM(ch)) { - SET_ERRNO(HPE_INVALID_VERSION); - goto error; - } - - parser->http_minor *= 10; - parser->http_minor += ch - '0'; - - if (parser->http_minor > 999) { - SET_ERRNO(HPE_INVALID_VERSION); - goto error; - } - - break; - } - - case s_res_first_status_code: - { - if (!IS_NUM(ch)) { - if (ch == ' ') { - break; - } - - SET_ERRNO(HPE_INVALID_STATUS); - goto error; - } - parser->status_code = ch - '0'; - parser->state = s_res_status_code; - break; - } - - case s_res_status_code: - { - if (!IS_NUM(ch)) { - switch (ch) { - case ' ': - parser->state = s_res_status; - break; - case CR: - parser->state = s_res_line_almost_done; - break; - case LF: - parser->state = s_header_field_start; - break; - default: - SET_ERRNO(HPE_INVALID_STATUS); - goto error; - } - break; - } - - parser->status_code *= 10; - parser->status_code += ch - '0'; - - if (parser->status_code > 999) { - SET_ERRNO(HPE_INVALID_STATUS); - goto error; - } - - break; - } - - case s_res_status: - /* the human readable status. e.g. "NOT FOUND" - * we are not humans so just ignore this */ - if (ch == CR) { - parser->state = s_res_line_almost_done; - break; - } - - if (ch == LF) { - parser->state = s_header_field_start; - break; - } - break; - - case s_res_line_almost_done: - STRICT_CHECK(ch != LF); - parser->state = s_header_field_start; - break; - - case s_start_req: - { - if (ch == CR || ch == LF) - break; - parser->flags = 0; - parser->content_length = ULLONG_MAX; - - if (!IS_ALPHA(ch)) { - SET_ERRNO(HPE_INVALID_METHOD); - goto error; - } - - parser->method = (enum http_method) 0; - parser->index = 1; - switch (ch) { - case 'C': parser->method = HTTP_CONNECT; /* or COPY, CHECKOUT */ break; - case 'D': parser->method = HTTP_DELETE; break; - case 'G': parser->method = HTTP_GET; break; - case 'H': parser->method = HTTP_HEAD; break; - case 'L': parser->method = HTTP_LOCK; break; - case 'M': parser->method = HTTP_MKCOL; /* or MOVE, MKACTIVITY, MERGE, M-SEARCH */ break; - case 'N': parser->method = HTTP_NOTIFY; break; - case 'O': parser->method = HTTP_OPTIONS; break; - case 'P': parser->method = HTTP_POST; - /* or PROPFIND|PROPPATCH|PUT|PATCH|PURGE */ - break; - case 'R': parser->method = HTTP_REPORT; break; - case 'S': parser->method = HTTP_SUBSCRIBE; /* or SEARCH */ break; - case 'T': parser->method = HTTP_TRACE; break; - case 'U': parser->method = HTTP_UNLOCK; /* or UNSUBSCRIBE */ break; - default: - SET_ERRNO(HPE_INVALID_METHOD); - goto error; - } - parser->state = s_req_method; - - CALLBACK_NOTIFY(message_begin); - - break; - } - - case s_req_method: - { - const char *matcher; - if (ch == '\0') { - SET_ERRNO(HPE_INVALID_METHOD); - goto error; - } - - matcher = method_strings[parser->method]; - if (ch == ' ' && matcher[parser->index] == '\0') { - parser->state = s_req_spaces_before_url; - } else if (ch == matcher[parser->index]) { - ; /* nada */ - } else if (parser->method == HTTP_CONNECT) { - if (parser->index == 1 && ch == 'H') { - parser->method = HTTP_CHECKOUT; - } else if (parser->index == 2 && ch == 'P') { - parser->method = HTTP_COPY; - } else { - goto error; - } - } else if (parser->method == HTTP_MKCOL) { - if (parser->index == 1 && ch == 'O') { - parser->method = HTTP_MOVE; - } else if (parser->index == 1 && ch == 'E') { - parser->method = HTTP_MERGE; - } else if (parser->index == 1 && ch == '-') { - parser->method = HTTP_MSEARCH; - } else if (parser->index == 2 && ch == 'A') { - parser->method = HTTP_MKACTIVITY; - } else { - goto error; - } - } else if (parser->method == HTTP_SUBSCRIBE) { - if (parser->index == 1 && ch == 'E') { - parser->method = HTTP_SEARCH; - } else { - goto error; - } - } else if (parser->index == 1 && parser->method == HTTP_POST) { - if (ch == 'R') { - parser->method = HTTP_PROPFIND; /* or HTTP_PROPPATCH */ - } else if (ch == 'U') { - parser->method = HTTP_PUT; /* or HTTP_PURGE */ - } else if (ch == 'A') { - parser->method = HTTP_PATCH; - } else { - goto error; - } - } else if (parser->index == 2) { - if (parser->method == HTTP_PUT) { - if (ch == 'R') parser->method = HTTP_PURGE; - } else if (parser->method == HTTP_UNLOCK) { - if (ch == 'S') parser->method = HTTP_UNSUBSCRIBE; - } - } else if (parser->index == 4 && parser->method == HTTP_PROPFIND && ch == 'P') { - parser->method = HTTP_PROPPATCH; - } else { - SET_ERRNO(HPE_INVALID_METHOD); - goto error; - } - - ++parser->index; - break; - } - - case s_req_spaces_before_url: - { - if (ch == ' ') break; - - MARK(url); - if (parser->method == HTTP_CONNECT) { - parser->state = s_req_server_start; - } - - parser->state = parse_url_char((enum state)parser->state, ch); - if (parser->state == s_dead) { - SET_ERRNO(HPE_INVALID_URL); - goto error; - } - - break; - } - - case s_req_schema: - case s_req_schema_slash: - case s_req_schema_slash_slash: - case s_req_server_start: - { - switch (ch) { - /* No whitespace allowed here */ - case ' ': - case CR: - case LF: - SET_ERRNO(HPE_INVALID_URL); - goto error; - default: - parser->state = parse_url_char((enum state)parser->state, ch); - if (parser->state == s_dead) { - SET_ERRNO(HPE_INVALID_URL); - goto error; - } - } - - break; - } - - case s_req_server: - case s_req_server_with_at: - case s_req_path: - case s_req_query_string_start: - case s_req_query_string: - case s_req_fragment_start: - case s_req_fragment: - { - switch (ch) { - case ' ': - parser->state = s_req_http_start; - CALLBACK_DATA(url); - break; - case CR: - case LF: - parser->http_major = 0; - parser->http_minor = 9; - parser->state = (ch == CR) ? - s_req_line_almost_done : - s_header_field_start; - CALLBACK_DATA(url); - break; - default: - parser->state = parse_url_char((enum state)parser->state, ch); - if (parser->state == s_dead) { - SET_ERRNO(HPE_INVALID_URL); - goto error; - } - } - break; - } - - case s_req_http_start: - switch (ch) { - case 'H': - parser->state = s_req_http_H; - break; - case ' ': - break; - default: - SET_ERRNO(HPE_INVALID_CONSTANT); - goto error; - } - break; - - case s_req_http_H: - STRICT_CHECK(ch != 'T'); - parser->state = s_req_http_HT; - break; - - case s_req_http_HT: - STRICT_CHECK(ch != 'T'); - parser->state = s_req_http_HTT; - break; - - case s_req_http_HTT: - STRICT_CHECK(ch != 'P'); - parser->state = s_req_http_HTTP; - break; - - case s_req_http_HTTP: - STRICT_CHECK(ch != '/'); - parser->state = s_req_first_http_major; - break; - - /* first digit of major HTTP version */ - case s_req_first_http_major: - if (ch < '1' || ch > '9') { - SET_ERRNO(HPE_INVALID_VERSION); - goto error; - } - - parser->http_major = ch - '0'; - parser->state = s_req_http_major; - break; - - /* major HTTP version or dot */ - case s_req_http_major: - { - if (ch == '.') { - parser->state = s_req_first_http_minor; - break; - } - - if (!IS_NUM(ch)) { - SET_ERRNO(HPE_INVALID_VERSION); - goto error; - } - - parser->http_major *= 10; - parser->http_major += ch - '0'; - - if (parser->http_major > 999) { - SET_ERRNO(HPE_INVALID_VERSION); - goto error; - } - - break; - } - - /* first digit of minor HTTP version */ - case s_req_first_http_minor: - if (!IS_NUM(ch)) { - SET_ERRNO(HPE_INVALID_VERSION); - goto error; - } - - parser->http_minor = ch - '0'; - parser->state = s_req_http_minor; - break; - - /* minor HTTP version or end of request line */ - case s_req_http_minor: - { - if (ch == CR) { - parser->state = s_req_line_almost_done; - break; - } - - if (ch == LF) { - parser->state = s_header_field_start; - break; - } - - /* XXX allow spaces after digit? */ - - if (!IS_NUM(ch)) { - SET_ERRNO(HPE_INVALID_VERSION); - goto error; - } - - parser->http_minor *= 10; - parser->http_minor += ch - '0'; - - if (parser->http_minor > 999) { - SET_ERRNO(HPE_INVALID_VERSION); - goto error; - } - - break; - } - - /* end of request line */ - case s_req_line_almost_done: - { - if (ch != LF) { - SET_ERRNO(HPE_LF_EXPECTED); - goto error; - } - - parser->state = s_header_field_start; - break; - } - - case s_header_field_start: - { - if (ch == CR) { - parser->state = s_headers_almost_done; - break; - } - - if (ch == LF) { - /* they might be just sending \n instead of \r\n so this would be - * the second \n to denote the end of headers*/ - parser->state = s_headers_almost_done; - goto reexecute_byte; - } - - c = TOKEN(ch); - - if (!c) { - SET_ERRNO(HPE_INVALID_HEADER_TOKEN); - goto error; - } - - MARK(header_field); - - parser->index = 0; - parser->state = s_header_field; - - switch (c) { - case 'c': - parser->header_state = h_C; - break; - - case 'p': - parser->header_state = h_matching_proxy_connection; - break; - - case 't': - parser->header_state = h_matching_transfer_encoding; - break; - - case 'u': - parser->header_state = h_matching_upgrade; - break; - - default: - parser->header_state = h_general; - break; - } - break; - } - - case s_header_field: - { - c = TOKEN(ch); - - if (c) { - switch (parser->header_state) { - case h_general: - break; - - case h_C: - parser->index++; - parser->header_state = (c == 'o' ? h_CO : h_general); - break; - - case h_CO: - parser->index++; - parser->header_state = (c == 'n' ? h_CON : h_general); - break; - - case h_CON: - parser->index++; - switch (c) { - case 'n': - parser->header_state = h_matching_connection; - break; - case 't': - parser->header_state = h_matching_content_length; - break; - default: - parser->header_state = h_general; - break; - } - break; - - /* connection */ - - case h_matching_connection: - parser->index++; - if (parser->index > sizeof(CONNECTION)-1 - || c != CONNECTION[parser->index]) { - parser->header_state = h_general; - } else if (parser->index == sizeof(CONNECTION)-2) { - parser->header_state = h_connection; - } - break; - - /* proxy-connection */ - - case h_matching_proxy_connection: - parser->index++; - if (parser->index > sizeof(PROXY_CONNECTION)-1 - || c != PROXY_CONNECTION[parser->index]) { - parser->header_state = h_general; - } else if (parser->index == sizeof(PROXY_CONNECTION)-2) { - parser->header_state = h_connection; - } - break; - - /* content-length */ - - case h_matching_content_length: - parser->index++; - if (parser->index > sizeof(CONTENT_LENGTH)-1 - || c != CONTENT_LENGTH[parser->index]) { - parser->header_state = h_general; - } else if (parser->index == sizeof(CONTENT_LENGTH)-2) { - parser->header_state = h_content_length; - } - break; - - /* transfer-encoding */ - - case h_matching_transfer_encoding: - parser->index++; - if (parser->index > sizeof(TRANSFER_ENCODING)-1 - || c != TRANSFER_ENCODING[parser->index]) { - parser->header_state = h_general; - } else if (parser->index == sizeof(TRANSFER_ENCODING)-2) { - parser->header_state = h_transfer_encoding; - } - break; - - /* upgrade */ - - case h_matching_upgrade: - parser->index++; - if (parser->index > sizeof(UPGRADE)-1 - || c != UPGRADE[parser->index]) { - parser->header_state = h_general; - } else if (parser->index == sizeof(UPGRADE)-2) { - parser->header_state = h_upgrade; - } - break; - - case h_connection: - case h_content_length: - case h_transfer_encoding: - case h_upgrade: - if (ch != ' ') parser->header_state = h_general; - break; - - default: - assert(0 && "Unknown header_state"); - break; - } - break; - } - - if (ch == ':') { - parser->state = s_header_value_start; - CALLBACK_DATA(header_field); - break; - } - - if (ch == CR) { - parser->state = s_header_almost_done; - CALLBACK_DATA(header_field); - break; - } - - if (ch == LF) { - parser->state = s_header_field_start; - CALLBACK_DATA(header_field); - break; - } - - SET_ERRNO(HPE_INVALID_HEADER_TOKEN); - goto error; - } - - case s_header_value_start: - { - if (ch == ' ' || ch == '\t') break; - - MARK(header_value); - - parser->state = s_header_value; - parser->index = 0; - - if (ch == CR) { - parser->header_state = h_general; - parser->state = s_header_almost_done; - CALLBACK_DATA(header_value); - break; - } - - if (ch == LF) { - parser->state = s_header_field_start; - CALLBACK_DATA(header_value); - break; - } - - c = LOWER(ch); - - switch (parser->header_state) { - case h_upgrade: - parser->flags |= F_UPGRADE; - parser->header_state = h_general; - break; - - case h_transfer_encoding: - /* looking for 'Transfer-Encoding: chunked' */ - if ('c' == c) { - parser->header_state = h_matching_transfer_encoding_chunked; - } else { - parser->header_state = h_general; - } - break; - - case h_content_length: - if (!IS_NUM(ch)) { - SET_ERRNO(HPE_INVALID_CONTENT_LENGTH); - goto error; - } - - parser->content_length = ch - '0'; - break; - - case h_connection: - /* looking for 'Connection: keep-alive' */ - if (c == 'k') { - parser->header_state = h_matching_connection_keep_alive; - /* looking for 'Connection: close' */ - } else if (c == 'c') { - parser->header_state = h_matching_connection_close; - } else { - parser->header_state = h_general; - } - break; - - default: - parser->header_state = h_general; - break; - } - break; - } - - case s_header_value: - { - - if (ch == CR) { - parser->state = s_header_almost_done; - CALLBACK_DATA(header_value); - break; - } - - if (ch == LF) { - parser->state = s_header_almost_done; - CALLBACK_DATA_NOADVANCE(header_value); - goto reexecute_byte; - } - - c = LOWER(ch); - - switch (parser->header_state) { - case h_general: - break; - - case h_connection: - case h_transfer_encoding: - assert(0 && "Shouldn't get here."); - break; - - case h_content_length: - { - uint64_t t; - - if (ch == ' ') break; - - if (!IS_NUM(ch)) { - SET_ERRNO(HPE_INVALID_CONTENT_LENGTH); - goto error; - } - - t = parser->content_length; - t *= 10; - t += ch - '0'; - - /* Overflow? */ - if (t < parser->content_length || t == ULLONG_MAX) { - SET_ERRNO(HPE_INVALID_CONTENT_LENGTH); - goto error; - } - - parser->content_length = t; - break; - } - - /* Transfer-Encoding: chunked */ - case h_matching_transfer_encoding_chunked: - parser->index++; - if (parser->index > sizeof(CHUNKED)-1 - || c != CHUNKED[parser->index]) { - parser->header_state = h_general; - } else if (parser->index == sizeof(CHUNKED)-2) { - parser->header_state = h_transfer_encoding_chunked; - } - break; - - /* looking for 'Connection: keep-alive' */ - case h_matching_connection_keep_alive: - parser->index++; - if (parser->index > sizeof(KEEP_ALIVE)-1 - || c != KEEP_ALIVE[parser->index]) { - parser->header_state = h_general; - } else if (parser->index == sizeof(KEEP_ALIVE)-2) { - parser->header_state = h_connection_keep_alive; - } - break; - - /* looking for 'Connection: close' */ - case h_matching_connection_close: - parser->index++; - if (parser->index > sizeof(CLOSE)-1 || c != CLOSE[parser->index]) { - parser->header_state = h_general; - } else if (parser->index == sizeof(CLOSE)-2) { - parser->header_state = h_connection_close; - } - break; - - case h_transfer_encoding_chunked: - case h_connection_keep_alive: - case h_connection_close: - if (ch != ' ') parser->header_state = h_general; - break; - - default: - parser->state = s_header_value; - parser->header_state = h_general; - break; - } - break; - } - - case s_header_almost_done: - { - STRICT_CHECK(ch != LF); - - parser->state = s_header_value_lws; - - switch (parser->header_state) { - case h_connection_keep_alive: - parser->flags |= F_CONNECTION_KEEP_ALIVE; - break; - case h_connection_close: - parser->flags |= F_CONNECTION_CLOSE; - break; - case h_transfer_encoding_chunked: - parser->flags |= F_CHUNKED; - break; - default: - break; - } - - break; - } - - case s_header_value_lws: - { - if (ch == ' ' || ch == '\t') - parser->state = s_header_value_start; - else - { - parser->state = s_header_field_start; - goto reexecute_byte; - } - break; - } - - case s_headers_almost_done: - { - STRICT_CHECK(ch != LF); - - if (parser->flags & F_TRAILING) { - /* End of a chunked request */ - parser->state = NEW_MESSAGE(); - CALLBACK_NOTIFY(message_complete); - break; - } - - parser->state = s_headers_done; - - /* Set this here so that on_headers_complete() callbacks can see it */ - parser->upgrade = - (parser->flags & F_UPGRADE || parser->method == HTTP_CONNECT); - - /* Here we call the headers_complete callback. This is somewhat - * different than other callbacks because if the user returns 1, we - * will interpret that as saying that this message has no body. This - * is needed for the annoying case of recieving a response to a HEAD - * request. - * - * We'd like to use CALLBACK_NOTIFY_NOADVANCE() here but we cannot, so - * we have to simulate it by handling a change in errno below. - */ - if (settings->on_headers_complete) { - switch (settings->on_headers_complete(parser)) { - case 0: - break; - - case 1: - parser->flags |= F_SKIPBODY; - break; - - default: - SET_ERRNO(HPE_CB_headers_complete); - return p - data; /* Error */ - } - } - - if (HTTP_PARSER_ERRNO(parser) != HPE_OK) { - return p - data; - } - - goto reexecute_byte; - } - - case s_headers_done: - { - STRICT_CHECK(ch != LF); - - parser->nread = 0; - - /* Exit, the rest of the connect is in a different protocol. */ - if (parser->upgrade) { - parser->state = NEW_MESSAGE(); - CALLBACK_NOTIFY(message_complete); - return (p - data) + 1; - } - - if (parser->flags & F_SKIPBODY) { - parser->state = NEW_MESSAGE(); - CALLBACK_NOTIFY(message_complete); - } else if (parser->flags & F_CHUNKED) { - /* chunked encoding - ignore Content-Length header */ - parser->state = s_chunk_size_start; - } else { - if (parser->content_length == 0) { - /* Content-Length header given but zero: Content-Length: 0\r\n */ - parser->state = NEW_MESSAGE(); - CALLBACK_NOTIFY(message_complete); - } else if (parser->content_length != ULLONG_MAX) { - /* Content-Length header given and non-zero */ - parser->state = s_body_identity; - } else { - if (parser->type == HTTP_REQUEST || - !http_message_needs_eof(parser)) { - /* Assume content-length 0 - read the next */ - parser->state = NEW_MESSAGE(); - CALLBACK_NOTIFY(message_complete); - } else { - /* Read body until EOF */ - parser->state = s_body_identity_eof; - } - } - } - - break; - } - - case s_body_identity: - { - uint64_t to_read = MIN(parser->content_length, - (uint64_t) ((data + len) - p)); - - assert(parser->content_length != 0 - && parser->content_length != ULLONG_MAX); - - /* The difference between advancing content_length and p is because - * the latter will automaticaly advance on the next loop iteration. - * Further, if content_length ends up at 0, we want to see the last - * byte again for our message complete callback. - */ - MARK(body); - parser->content_length -= to_read; - p += to_read - 1; - - if (parser->content_length == 0) { - parser->state = s_message_done; - - /* Mimic CALLBACK_DATA_NOADVANCE() but with one extra byte. - * - * The alternative to doing this is to wait for the next byte to - * trigger the data callback, just as in every other case. The - * problem with this is that this makes it difficult for the test - * harness to distinguish between complete-on-EOF and - * complete-on-length. It's not clear that this distinction is - * important for applications, but let's keep it for now. - */ - CALLBACK_DATA_(body, p - body_mark + 1, p - data); - goto reexecute_byte; - } - - break; - } - - /* read until EOF */ - case s_body_identity_eof: - MARK(body); - p = data + len - 1; - - break; - - case s_message_done: - parser->state = NEW_MESSAGE(); - CALLBACK_NOTIFY(message_complete); - break; - - case s_chunk_size_start: - { - assert(parser->nread == 1); - assert(parser->flags & F_CHUNKED); - - unhex_val = unhex[(unsigned char)ch]; - if (unhex_val == -1) { - SET_ERRNO(HPE_INVALID_CHUNK_SIZE); - goto error; - } - - parser->content_length = unhex_val; - parser->state = s_chunk_size; - break; - } - - case s_chunk_size: - { - uint64_t t; - - assert(parser->flags & F_CHUNKED); - - if (ch == CR) { - parser->state = s_chunk_size_almost_done; - break; - } - - unhex_val = unhex[(unsigned char)ch]; - - if (unhex_val == -1) { - if (ch == ';' || ch == ' ') { - parser->state = s_chunk_parameters; - break; - } - - SET_ERRNO(HPE_INVALID_CHUNK_SIZE); - goto error; - } - - t = parser->content_length; - t *= 16; - t += unhex_val; - - /* Overflow? */ - if (t < parser->content_length || t == ULLONG_MAX) { - SET_ERRNO(HPE_INVALID_CONTENT_LENGTH); - goto error; - } - - parser->content_length = t; - break; - } - - case s_chunk_parameters: - { - assert(parser->flags & F_CHUNKED); - /* just ignore this. TODO check for overflow */ - if (ch == CR) { - parser->state = s_chunk_size_almost_done; - break; - } - break; - } - - case s_chunk_size_almost_done: - { - assert(parser->flags & F_CHUNKED); - STRICT_CHECK(ch != LF); - - parser->nread = 0; - - if (parser->content_length == 0) { - parser->flags |= F_TRAILING; - parser->state = s_header_field_start; - } else { - parser->state = s_chunk_data; - } - break; - } - - case s_chunk_data: - { - uint64_t to_read = MIN(parser->content_length, - (uint64_t) ((data + len) - p)); - - assert(parser->flags & F_CHUNKED); - assert(parser->content_length != 0 - && parser->content_length != ULLONG_MAX); - - /* See the explanation in s_body_identity for why the content - * length and data pointers are managed this way. - */ - MARK(body); - parser->content_length -= to_read; - p += to_read - 1; - - if (parser->content_length == 0) { - parser->state = s_chunk_data_almost_done; - } - - break; - } - - case s_chunk_data_almost_done: - assert(parser->flags & F_CHUNKED); - assert(parser->content_length == 0); - STRICT_CHECK(ch != CR); - parser->state = s_chunk_data_done; - CALLBACK_DATA(body); - break; - - case s_chunk_data_done: - assert(parser->flags & F_CHUNKED); - STRICT_CHECK(ch != LF); - parser->nread = 0; - parser->state = s_chunk_size_start; - break; - - default: - assert(0 && "unhandled state"); - SET_ERRNO(HPE_INVALID_INTERNAL_STATE); - goto error; - } - } - - /* Run callbacks for any marks that we have leftover after we ran our of - * bytes. There should be at most one of these set, so it's OK to invoke - * them in series (unset marks will not result in callbacks). - * - * We use the NOADVANCE() variety of callbacks here because 'p' has already - * overflowed 'data' and this allows us to correct for the off-by-one that - * we'd otherwise have (since CALLBACK_DATA() is meant to be run with a 'p' - * value that's in-bounds). - */ - - assert(((header_field_mark ? 1 : 0) + - (header_value_mark ? 1 : 0) + - (url_mark ? 1 : 0) + - (body_mark ? 1 : 0)) <= 1); - - CALLBACK_DATA_NOADVANCE(header_field); - CALLBACK_DATA_NOADVANCE(header_value); - CALLBACK_DATA_NOADVANCE(url); - CALLBACK_DATA_NOADVANCE(body); - - return len; - -error: - if (HTTP_PARSER_ERRNO(parser) == HPE_OK) { - SET_ERRNO(HPE_UNKNOWN); - } - - return (p - data); -} - - -/* Does the parser need to see an EOF to find the end of the message? */ -int -http_message_needs_eof (const http_parser *parser) -{ - if (parser->type == HTTP_REQUEST) { - return 0; - } - - /* See RFC 2616 section 4.4 */ - if (parser->status_code / 100 == 1 || /* 1xx e.g. Continue */ - parser->status_code == 204 || /* No Content */ - parser->status_code == 304 || /* Not Modified */ - parser->flags & F_SKIPBODY) { /* response to a HEAD request */ - return 0; - } - - if ((parser->flags & F_CHUNKED) || parser->content_length != ULLONG_MAX) { - return 0; - } - - return 1; -} - - -int -http_should_keep_alive (const http_parser *parser) -{ - if (parser->http_major > 0 && parser->http_minor > 0) { - /* HTTP/1.1 */ - if (parser->flags & F_CONNECTION_CLOSE) { - return 0; - } - } else { - /* HTTP/1.0 or earlier */ - if (!(parser->flags & F_CONNECTION_KEEP_ALIVE)) { - return 0; - } - } - - return !http_message_needs_eof(parser); -} - - -const char * -http_method_str (enum http_method m) -{ - return ELEM_AT(method_strings, m, ""); -} - - -void -http_parser_init (http_parser *parser, enum http_parser_type t) -{ - void *data = parser->data; /* preserve application data */ - memset(parser, 0, sizeof(*parser)); - parser->data = data; - parser->type = t; - parser->state = (t == HTTP_REQUEST ? s_start_req : (t == HTTP_RESPONSE ? s_start_res : s_start_req_or_res)); - parser->http_errno = HPE_OK; -} - -const char * -http_errno_name(enum http_errno err) { - assert(err < (sizeof(http_strerror_tab)/sizeof(http_strerror_tab[0]))); - return http_strerror_tab[err].name; -} - -const char * -http_errno_description(enum http_errno err) { - assert(err < (sizeof(http_strerror_tab)/sizeof(http_strerror_tab[0]))); - return http_strerror_tab[err].description; -} - -static enum http_host_state -http_parse_host_char(enum http_host_state s, const char ch) { - switch(s) { - case s_http_userinfo: - case s_http_userinfo_start: - if (ch == '@') { - return s_http_host_start; - } - - if (IS_USERINFO_CHAR(ch)) { - return s_http_userinfo; - } - break; - - case s_http_host_start: - if (ch == '[') { - return s_http_host_v6_start; - } - - if (IS_HOST_CHAR(ch)) { - return s_http_host; - } - - break; - - case s_http_host: - if (IS_HOST_CHAR(ch)) { - return s_http_host; - } - - /* FALLTHROUGH */ - case s_http_host_v6_end: - if (ch == ':') { - return s_http_host_port_start; - } - - break; - - case s_http_host_v6: - if (ch == ']') { - return s_http_host_v6_end; - } - - /* FALLTHROUGH */ - case s_http_host_v6_start: - if (IS_HEX(ch) || ch == ':') { - return s_http_host_v6; - } - - break; - - case s_http_host_port: - case s_http_host_port_start: - if (IS_NUM(ch)) { - return s_http_host_port; - } - - break; - - default: - break; - } - return s_http_host_dead; -} - -static int -http_parse_host(const char * buf, struct http_parser_url *u, int found_at) { - enum http_host_state s; - - const char *p; - size_t buflen = u->field_data[UF_HOST].off + u->field_data[UF_HOST].len; - - u->field_data[UF_HOST].len = 0; - - s = found_at ? s_http_userinfo_start : s_http_host_start; - - for (p = buf + u->field_data[UF_HOST].off; p < buf + buflen; p++) { - enum http_host_state new_s = http_parse_host_char(s, *p); - - if (new_s == s_http_host_dead) { - return 1; - } - - switch(new_s) { - case s_http_host: - if (s != s_http_host) { - u->field_data[UF_HOST].off = p - buf; - } - u->field_data[UF_HOST].len++; - break; - - case s_http_host_v6: - if (s != s_http_host_v6) { - u->field_data[UF_HOST].off = p - buf; - } - u->field_data[UF_HOST].len++; - break; - - case s_http_host_port: - if (s != s_http_host_port) { - u->field_data[UF_PORT].off = p - buf; - u->field_data[UF_PORT].len = 0; - u->field_set |= (1 << UF_PORT); - } - u->field_data[UF_PORT].len++; - break; - - case s_http_userinfo: - if (s != s_http_userinfo) { - u->field_data[UF_USERINFO].off = p - buf ; - u->field_data[UF_USERINFO].len = 0; - u->field_set |= (1 << UF_USERINFO); - } - u->field_data[UF_USERINFO].len++; - break; - - default: - break; - } - s = new_s; - } - - /* Make sure we don't end somewhere unexpected */ - switch (s) { - case s_http_host_start: - case s_http_host_v6_start: - case s_http_host_v6: - case s_http_host_port_start: - case s_http_userinfo: - case s_http_userinfo_start: - return 1; - default: - break; - } - - return 0; -} - -int -http_parser_parse_url(const char *buf, size_t buflen, int is_connect, - struct http_parser_url *u) -{ - enum state s; - const char *p; - enum http_parser_url_fields uf, old_uf; - int found_at = 0; - - u->port = u->field_set = 0; - s = is_connect ? s_req_server_start : s_req_spaces_before_url; - uf = old_uf = UF_MAX; - - for (p = buf; p < buf + buflen; p++) { - s = parse_url_char(s, *p); - - /* Figure out the next field that we're operating on */ - switch (s) { - case s_dead: - return 1; - - /* Skip delimeters */ - case s_req_schema_slash: - case s_req_schema_slash_slash: - case s_req_server_start: - case s_req_query_string_start: - case s_req_fragment_start: - continue; - - case s_req_schema: - uf = UF_SCHEMA; - break; - - case s_req_server_with_at: - found_at = 1; - - /* FALLTROUGH */ - case s_req_server: - uf = UF_HOST; - break; - - case s_req_path: - uf = UF_PATH; - break; - - case s_req_query_string: - uf = UF_QUERY; - break; - - case s_req_fragment: - uf = UF_FRAGMENT; - break; - - default: - assert(!"Unexpected state"); - return 1; - } - - /* Nothing's changed; soldier on */ - if (uf == old_uf) { - u->field_data[uf].len++; - continue; - } - - u->field_data[uf].off = p - buf; - u->field_data[uf].len = 1; - - u->field_set |= (1 << uf); - old_uf = uf; - } - - /* host must be present if there is a schema */ - /* parsing http:///toto will fail */ - if ((u->field_set & ((1 << UF_SCHEMA) | (1 << UF_HOST))) != 0) { - if (http_parse_host(buf, u, found_at) != 0) { - return 1; - } - } - - /* CONNECT requests can only contain "hostname:port" */ - if (is_connect && u->field_set != ((1 << UF_HOST)|(1 << UF_PORT))) { - return 1; - } - - if (u->field_set & (1 << UF_PORT)) { - /* Don't bother with endp; we've already validated the string */ - unsigned long v = strtoul(buf + u->field_data[UF_PORT].off, NULL, 10); - - /* Ports have a max value of 2^16 */ - if (v > 0xffff) { - return 1; - } - - u->port = (uint16_t) v; - } - - return 0; -} - -void -http_parser_pause(http_parser *parser, int paused) { - /* Users should only be pausing/unpausing a parser that is not in an error - * state. In non-debug builds, there's not much that we can do about this - * other than ignore it. - */ - if (HTTP_PARSER_ERRNO(parser) == HPE_OK || - HTTP_PARSER_ERRNO(parser) == HPE_PAUSED) { - SET_ERRNO((paused) ? HPE_PAUSED : HPE_OK); - } else { - assert(0 && "Attempting to pause parser in error state"); - } -} - -int -http_body_is_final(const struct http_parser *parser) { - return parser->state == s_message_done; -} diff --git a/vendor/libgit2/deps/http-parser/http_parser.h b/vendor/libgit2/deps/http-parser/http_parser.h deleted file mode 100644 index 67e1d95dd..000000000 --- a/vendor/libgit2/deps/http-parser/http_parser.h +++ /dev/null @@ -1,305 +0,0 @@ -/* Copyright Joyent, Inc. and other Node contributors. All rights reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to - * deal in the Software without restriction, including without limitation the - * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS - * IN THE SOFTWARE. - */ -#ifndef http_parser_h -#define http_parser_h -#ifdef __cplusplus -extern "C" { -#endif - -#define HTTP_PARSER_VERSION_MAJOR 2 -#define HTTP_PARSER_VERSION_MINOR 0 - -#include -#if defined(_WIN32) && !defined(__MINGW32__) && (!defined(_MSC_VER) || _MSC_VER<1600) -#include -typedef __int8 int8_t; -typedef unsigned __int8 uint8_t; -typedef __int16 int16_t; -typedef unsigned __int16 uint16_t; -typedef __int32 int32_t; -typedef unsigned __int32 uint32_t; -typedef __int64 int64_t; -typedef unsigned __int64 uint64_t; -typedef SIZE_T size_t; -typedef SSIZE_T ssize_t; -#elif defined(__sun) || defined(__sun__) -#include -#else -#include -#endif - -/* Compile with -DHTTP_PARSER_STRICT=0 to make less checks, but run - * faster - */ -#ifndef HTTP_PARSER_STRICT -# define HTTP_PARSER_STRICT 1 -#endif - -/* Maximium header size allowed */ -#define HTTP_MAX_HEADER_SIZE (80*1024) - - -typedef struct http_parser http_parser; -typedef struct http_parser_settings http_parser_settings; - - -/* Callbacks should return non-zero to indicate an error. The parser will - * then halt execution. - * - * The one exception is on_headers_complete. In a HTTP_RESPONSE parser - * returning '1' from on_headers_complete will tell the parser that it - * should not expect a body. This is used when receiving a response to a - * HEAD request which may contain 'Content-Length' or 'Transfer-Encoding: - * chunked' headers that indicate the presence of a body. - * - * http_data_cb does not return data chunks. It will be call arbitrarally - * many times for each string. E.G. you might get 10 callbacks for "on_url" - * each providing just a few characters more data. - */ -typedef int (*http_data_cb) (http_parser*, const char *at, size_t length); -typedef int (*http_cb) (http_parser*); - - -/* Request Methods */ -#define HTTP_METHOD_MAP(XX) \ - XX(0, DELETE, DELETE) \ - XX(1, GET, GET) \ - XX(2, HEAD, HEAD) \ - XX(3, POST, POST) \ - XX(4, PUT, PUT) \ - /* pathological */ \ - XX(5, CONNECT, CONNECT) \ - XX(6, OPTIONS, OPTIONS) \ - XX(7, TRACE, TRACE) \ - /* webdav */ \ - XX(8, COPY, COPY) \ - XX(9, LOCK, LOCK) \ - XX(10, MKCOL, MKCOL) \ - XX(11, MOVE, MOVE) \ - XX(12, PROPFIND, PROPFIND) \ - XX(13, PROPPATCH, PROPPATCH) \ - XX(14, SEARCH, SEARCH) \ - XX(15, UNLOCK, UNLOCK) \ - /* subversion */ \ - XX(16, REPORT, REPORT) \ - XX(17, MKACTIVITY, MKACTIVITY) \ - XX(18, CHECKOUT, CHECKOUT) \ - XX(19, MERGE, MERGE) \ - /* upnp */ \ - XX(20, MSEARCH, M-SEARCH) \ - XX(21, NOTIFY, NOTIFY) \ - XX(22, SUBSCRIBE, SUBSCRIBE) \ - XX(23, UNSUBSCRIBE, UNSUBSCRIBE) \ - /* RFC-5789 */ \ - XX(24, PATCH, PATCH) \ - XX(25, PURGE, PURGE) \ - -enum http_method - { -#define XX(num, name, string) HTTP_##name = num, - HTTP_METHOD_MAP(XX) -#undef XX - }; - - -enum http_parser_type { HTTP_REQUEST, HTTP_RESPONSE, HTTP_BOTH }; - - -/* Flag values for http_parser.flags field */ -enum flags - { F_CHUNKED = 1 << 0 - , F_CONNECTION_KEEP_ALIVE = 1 << 1 - , F_CONNECTION_CLOSE = 1 << 2 - , F_TRAILING = 1 << 3 - , F_UPGRADE = 1 << 4 - , F_SKIPBODY = 1 << 5 - }; - - -/* Map for errno-related constants - * - * The provided argument should be a macro that takes 2 arguments. - */ -#define HTTP_ERRNO_MAP(XX) \ - /* No error */ \ - XX(OK, "success") \ - \ - /* Callback-related errors */ \ - XX(CB_message_begin, "the on_message_begin callback failed") \ - XX(CB_url, "the on_url callback failed") \ - XX(CB_header_field, "the on_header_field callback failed") \ - XX(CB_header_value, "the on_header_value callback failed") \ - XX(CB_headers_complete, "the on_headers_complete callback failed") \ - XX(CB_body, "the on_body callback failed") \ - XX(CB_message_complete, "the on_message_complete callback failed") \ - \ - /* Parsing-related errors */ \ - XX(INVALID_EOF_STATE, "stream ended at an unexpected time") \ - XX(HEADER_OVERFLOW, \ - "too many header bytes seen; overflow detected") \ - XX(CLOSED_CONNECTION, \ - "data received after completed connection: close message") \ - XX(INVALID_VERSION, "invalid HTTP version") \ - XX(INVALID_STATUS, "invalid HTTP status code") \ - XX(INVALID_METHOD, "invalid HTTP method") \ - XX(INVALID_URL, "invalid URL") \ - XX(INVALID_HOST, "invalid host") \ - XX(INVALID_PORT, "invalid port") \ - XX(INVALID_PATH, "invalid path") \ - XX(INVALID_QUERY_STRING, "invalid query string") \ - XX(INVALID_FRAGMENT, "invalid fragment") \ - XX(LF_EXPECTED, "LF character expected") \ - XX(INVALID_HEADER_TOKEN, "invalid character in header") \ - XX(INVALID_CONTENT_LENGTH, \ - "invalid character in content-length header") \ - XX(INVALID_CHUNK_SIZE, \ - "invalid character in chunk size header") \ - XX(INVALID_CONSTANT, "invalid constant string") \ - XX(INVALID_INTERNAL_STATE, "encountered unexpected internal state")\ - XX(STRICT, "strict mode assertion failed") \ - XX(PAUSED, "parser is paused") \ - XX(UNKNOWN, "an unknown error occurred") - - -/* Define HPE_* values for each errno value above */ -#define HTTP_ERRNO_GEN(n, s) HPE_##n, -enum http_errno { - HTTP_ERRNO_MAP(HTTP_ERRNO_GEN) -}; -#undef HTTP_ERRNO_GEN - - -/* Get an http_errno value from an http_parser */ -#define HTTP_PARSER_ERRNO(p) ((enum http_errno) (p)->http_errno) - - -struct http_parser { - /** PRIVATE **/ - unsigned char type : 2; /* enum http_parser_type */ - unsigned char flags : 6; /* F_* values from 'flags' enum; semi-public */ - unsigned char state; /* enum state from http_parser.c */ - unsigned char header_state; /* enum header_state from http_parser.c */ - unsigned char index; /* index into current matcher */ - - uint32_t nread; /* # bytes read in various scenarios */ - uint64_t content_length; /* # bytes in body (0 if no Content-Length header) */ - - /** READ-ONLY **/ - unsigned short http_major; - unsigned short http_minor; - unsigned short status_code; /* responses only */ - unsigned char method; /* requests only */ - unsigned char http_errno : 7; - - /* 1 = Upgrade header was present and the parser has exited because of that. - * 0 = No upgrade header present. - * Should be checked when http_parser_execute() returns in addition to - * error checking. - */ - unsigned char upgrade : 1; - - /** PUBLIC **/ - void *data; /* A pointer to get hook to the "connection" or "socket" object */ -}; - - -struct http_parser_settings { - http_cb on_message_begin; - http_data_cb on_url; - http_data_cb on_header_field; - http_data_cb on_header_value; - http_cb on_headers_complete; - http_data_cb on_body; - http_cb on_message_complete; -}; - - -enum http_parser_url_fields - { UF_SCHEMA = 0 - , UF_HOST = 1 - , UF_PORT = 2 - , UF_PATH = 3 - , UF_QUERY = 4 - , UF_FRAGMENT = 5 - , UF_USERINFO = 6 - , UF_MAX = 7 - }; - - -/* Result structure for http_parser_parse_url(). - * - * Callers should index into field_data[] with UF_* values iff field_set - * has the relevant (1 << UF_*) bit set. As a courtesy to clients (and - * because we probably have padding left over), we convert any port to - * a uint16_t. - */ -struct http_parser_url { - uint16_t field_set; /* Bitmask of (1 << UF_*) values */ - uint16_t port; /* Converted UF_PORT string */ - - struct { - uint16_t off; /* Offset into buffer in which field starts */ - uint16_t len; /* Length of run in buffer */ - } field_data[UF_MAX]; -}; - - -void http_parser_init(http_parser *parser, enum http_parser_type type); - - -size_t http_parser_execute(http_parser *parser, - const http_parser_settings *settings, - const char *data, - size_t len); - - -/* If http_should_keep_alive() in the on_headers_complete or - * on_message_complete callback returns 0, then this should be - * the last message on the connection. - * If you are the server, respond with the "Connection: close" header. - * If you are the client, close the connection. - */ -int http_should_keep_alive(const http_parser *parser); - -/* Returns a string version of the HTTP method. */ -const char *http_method_str(enum http_method m); - -/* Return a string name of the given error */ -const char *http_errno_name(enum http_errno err); - -/* Return a string description of the given error */ -const char *http_errno_description(enum http_errno err); - -/* Parse a URL; return nonzero on failure */ -int http_parser_parse_url(const char *buf, size_t buflen, - int is_connect, - struct http_parser_url *u); - -/* Pause or un-pause the parser; a nonzero value pauses */ -void http_parser_pause(http_parser *parser, int paused); - -/* Checks if this is the final chunk of the body. */ -int http_body_is_final(const http_parser *parser); - -#ifdef __cplusplus -} -#endif -#endif diff --git a/vendor/libgit2/deps/regex/config.h b/vendor/libgit2/deps/regex/config.h deleted file mode 100644 index 95370690e..000000000 --- a/vendor/libgit2/deps/regex/config.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef _REGEX_CONFIG_H_ -#define _REGEX_CONFIG_H_ - -# define GAWK -# define NO_MBSUPPORT - -#endif diff --git a/vendor/libgit2/deps/regex/regcomp.c b/vendor/libgit2/deps/regex/regcomp.c deleted file mode 100644 index 43bffbc21..000000000 --- a/vendor/libgit2/deps/regex/regcomp.c +++ /dev/null @@ -1,3857 +0,0 @@ -/* Extended regular expression matching and search library. - Copyright (C) 2002-2007,2009,2010 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Isamu Hasegawa . - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301 USA. */ - -static reg_errcode_t re_compile_internal (regex_t *preg, const char * pattern, - size_t length, reg_syntax_t syntax); -static void re_compile_fastmap_iter (regex_t *bufp, - const re_dfastate_t *init_state, - char *fastmap); -static reg_errcode_t init_dfa (re_dfa_t *dfa, size_t pat_len); -#ifdef RE_ENABLE_I18N -static void free_charset (re_charset_t *cset); -#endif /* RE_ENABLE_I18N */ -static void free_workarea_compile (regex_t *preg); -static reg_errcode_t create_initial_state (re_dfa_t *dfa); -#ifdef RE_ENABLE_I18N -static void optimize_utf8 (re_dfa_t *dfa); -#endif -static reg_errcode_t analyze (regex_t *preg); -static reg_errcode_t preorder (bin_tree_t *root, - reg_errcode_t (fn (void *, bin_tree_t *)), - void *extra); -static reg_errcode_t postorder (bin_tree_t *root, - reg_errcode_t (fn (void *, bin_tree_t *)), - void *extra); -static reg_errcode_t optimize_subexps (void *extra, bin_tree_t *node); -static reg_errcode_t lower_subexps (void *extra, bin_tree_t *node); -static bin_tree_t *lower_subexp (reg_errcode_t *err, regex_t *preg, - bin_tree_t *node); -static reg_errcode_t calc_first (void *extra, bin_tree_t *node); -static reg_errcode_t calc_next (void *extra, bin_tree_t *node); -static reg_errcode_t link_nfa_nodes (void *extra, bin_tree_t *node); -static int duplicate_node (re_dfa_t *dfa, int org_idx, unsigned int constraint); -static int search_duplicated_node (const re_dfa_t *dfa, int org_node, - unsigned int constraint); -static reg_errcode_t calc_eclosure (re_dfa_t *dfa); -static reg_errcode_t calc_eclosure_iter (re_node_set *new_set, re_dfa_t *dfa, - int node, int root); -static reg_errcode_t calc_inveclosure (re_dfa_t *dfa); -static int fetch_number (re_string_t *input, re_token_t *token, - reg_syntax_t syntax); -static int peek_token (re_token_t *token, re_string_t *input, - reg_syntax_t syntax) internal_function; -static bin_tree_t *parse (re_string_t *regexp, regex_t *preg, - reg_syntax_t syntax, reg_errcode_t *err); -static bin_tree_t *parse_reg_exp (re_string_t *regexp, regex_t *preg, - re_token_t *token, reg_syntax_t syntax, - int nest, reg_errcode_t *err); -static bin_tree_t *parse_branch (re_string_t *regexp, regex_t *preg, - re_token_t *token, reg_syntax_t syntax, - int nest, reg_errcode_t *err); -static bin_tree_t *parse_expression (re_string_t *regexp, regex_t *preg, - re_token_t *token, reg_syntax_t syntax, - int nest, reg_errcode_t *err); -static bin_tree_t *parse_sub_exp (re_string_t *regexp, regex_t *preg, - re_token_t *token, reg_syntax_t syntax, - int nest, reg_errcode_t *err); -static bin_tree_t *parse_dup_op (bin_tree_t *dup_elem, re_string_t *regexp, - re_dfa_t *dfa, re_token_t *token, - reg_syntax_t syntax, reg_errcode_t *err); -static bin_tree_t *parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, - re_token_t *token, reg_syntax_t syntax, - reg_errcode_t *err); -static reg_errcode_t parse_bracket_element (bracket_elem_t *elem, - re_string_t *regexp, - re_token_t *token, int token_len, - re_dfa_t *dfa, - reg_syntax_t syntax, - int accept_hyphen); -static reg_errcode_t parse_bracket_symbol (bracket_elem_t *elem, - re_string_t *regexp, - re_token_t *token); -#ifdef RE_ENABLE_I18N -static reg_errcode_t build_equiv_class (bitset_t sbcset, - re_charset_t *mbcset, - int *equiv_class_alloc, - const unsigned char *name); -static reg_errcode_t build_charclass (RE_TRANSLATE_TYPE trans, - bitset_t sbcset, - re_charset_t *mbcset, - int *char_class_alloc, - const char *class_name, - reg_syntax_t syntax); -#else /* not RE_ENABLE_I18N */ -static reg_errcode_t build_equiv_class (bitset_t sbcset, - const unsigned char *name); -static reg_errcode_t build_charclass (RE_TRANSLATE_TYPE trans, - bitset_t sbcset, - const char *class_name, - reg_syntax_t syntax); -#endif /* not RE_ENABLE_I18N */ -static bin_tree_t *build_charclass_op (re_dfa_t *dfa, - RE_TRANSLATE_TYPE trans, - const char *class_name, - const char *extra, - int non_match, reg_errcode_t *err); -static bin_tree_t *create_tree (re_dfa_t *dfa, - bin_tree_t *left, bin_tree_t *right, - re_token_type_t type); -static bin_tree_t *create_token_tree (re_dfa_t *dfa, - bin_tree_t *left, bin_tree_t *right, - const re_token_t *token); -static bin_tree_t *duplicate_tree (const bin_tree_t *src, re_dfa_t *dfa); -static void free_token (re_token_t *node); -static reg_errcode_t free_tree (void *extra, bin_tree_t *node); -static reg_errcode_t mark_opt_subexp (void *extra, bin_tree_t *node); - -/* This table gives an error message for each of the error codes listed - in regex.h. Obviously the order here has to be same as there. - POSIX doesn't require that we do anything for REG_NOERROR, - but why not be nice? */ - -const char __re_error_msgid[] attribute_hidden = - { -#define REG_NOERROR_IDX 0 - gettext_noop ("Success") /* REG_NOERROR */ - "\0" -#define REG_NOMATCH_IDX (REG_NOERROR_IDX + sizeof "Success") - gettext_noop ("No match") /* REG_NOMATCH */ - "\0" -#define REG_BADPAT_IDX (REG_NOMATCH_IDX + sizeof "No match") - gettext_noop ("Invalid regular expression") /* REG_BADPAT */ - "\0" -#define REG_ECOLLATE_IDX (REG_BADPAT_IDX + sizeof "Invalid regular expression") - gettext_noop ("Invalid collation character") /* REG_ECOLLATE */ - "\0" -#define REG_ECTYPE_IDX (REG_ECOLLATE_IDX + sizeof "Invalid collation character") - gettext_noop ("Invalid character class name") /* REG_ECTYPE */ - "\0" -#define REG_EESCAPE_IDX (REG_ECTYPE_IDX + sizeof "Invalid character class name") - gettext_noop ("Trailing backslash") /* REG_EESCAPE */ - "\0" -#define REG_ESUBREG_IDX (REG_EESCAPE_IDX + sizeof "Trailing backslash") - gettext_noop ("Invalid back reference") /* REG_ESUBREG */ - "\0" -#define REG_EBRACK_IDX (REG_ESUBREG_IDX + sizeof "Invalid back reference") - gettext_noop ("Unmatched [ or [^") /* REG_EBRACK */ - "\0" -#define REG_EPAREN_IDX (REG_EBRACK_IDX + sizeof "Unmatched [ or [^") - gettext_noop ("Unmatched ( or \\(") /* REG_EPAREN */ - "\0" -#define REG_EBRACE_IDX (REG_EPAREN_IDX + sizeof "Unmatched ( or \\(") - gettext_noop ("Unmatched \\{") /* REG_EBRACE */ - "\0" -#define REG_BADBR_IDX (REG_EBRACE_IDX + sizeof "Unmatched \\{") - gettext_noop ("Invalid content of \\{\\}") /* REG_BADBR */ - "\0" -#define REG_ERANGE_IDX (REG_BADBR_IDX + sizeof "Invalid content of \\{\\}") - gettext_noop ("Invalid range end") /* REG_ERANGE */ - "\0" -#define REG_ESPACE_IDX (REG_ERANGE_IDX + sizeof "Invalid range end") - gettext_noop ("Memory exhausted") /* REG_ESPACE */ - "\0" -#define REG_BADRPT_IDX (REG_ESPACE_IDX + sizeof "Memory exhausted") - gettext_noop ("Invalid preceding regular expression") /* REG_BADRPT */ - "\0" -#define REG_EEND_IDX (REG_BADRPT_IDX + sizeof "Invalid preceding regular expression") - gettext_noop ("Premature end of regular expression") /* REG_EEND */ - "\0" -#define REG_ESIZE_IDX (REG_EEND_IDX + sizeof "Premature end of regular expression") - gettext_noop ("Regular expression too big") /* REG_ESIZE */ - "\0" -#define REG_ERPAREN_IDX (REG_ESIZE_IDX + sizeof "Regular expression too big") - gettext_noop ("Unmatched ) or \\)") /* REG_ERPAREN */ - }; - -const size_t __re_error_msgid_idx[] attribute_hidden = - { - REG_NOERROR_IDX, - REG_NOMATCH_IDX, - REG_BADPAT_IDX, - REG_ECOLLATE_IDX, - REG_ECTYPE_IDX, - REG_EESCAPE_IDX, - REG_ESUBREG_IDX, - REG_EBRACK_IDX, - REG_EPAREN_IDX, - REG_EBRACE_IDX, - REG_BADBR_IDX, - REG_ERANGE_IDX, - REG_ESPACE_IDX, - REG_BADRPT_IDX, - REG_EEND_IDX, - REG_ESIZE_IDX, - REG_ERPAREN_IDX - }; - -/* Entry points for GNU code. */ - - -#ifdef ZOS_USS - -/* For ZOS USS we must define btowc */ - -wchar_t -btowc (int c) -{ - wchar_t wtmp[2]; - char tmp[2]; - - tmp[0] = c; - tmp[1] = 0; - - mbtowc (wtmp, tmp, 1); - return wtmp[0]; -} -#endif - -/* re_compile_pattern is the GNU regular expression compiler: it - compiles PATTERN (of length LENGTH) and puts the result in BUFP. - Returns 0 if the pattern was valid, otherwise an error string. - - Assumes the `allocated' (and perhaps `buffer') and `translate' fields - are set in BUFP on entry. */ - -const char * -re_compile_pattern (const char *pattern, - size_t length, - struct re_pattern_buffer *bufp) -{ - reg_errcode_t ret; - - /* And GNU code determines whether or not to get register information - by passing null for the REGS argument to re_match, etc., not by - setting no_sub, unless RE_NO_SUB is set. */ - bufp->no_sub = !!(re_syntax_options & RE_NO_SUB); - - /* Match anchors at newline. */ - bufp->newline_anchor = 1; - - ret = re_compile_internal (bufp, pattern, length, re_syntax_options); - - if (!ret) - return NULL; - return gettext (__re_error_msgid + __re_error_msgid_idx[(int) ret]); -} -#ifdef _LIBC -weak_alias (__re_compile_pattern, re_compile_pattern) -#endif - -/* Set by `re_set_syntax' to the current regexp syntax to recognize. Can - also be assigned to arbitrarily: each pattern buffer stores its own - syntax, so it can be changed between regex compilations. */ -/* This has no initializer because initialized variables in Emacs - become read-only after dumping. */ -reg_syntax_t re_syntax_options; - - -/* Specify the precise syntax of regexps for compilation. This provides - for compatibility for various utilities which historically have - different, incompatible syntaxes. - - The argument SYNTAX is a bit mask comprised of the various bits - defined in regex.h. We return the old syntax. */ - -reg_syntax_t -re_set_syntax (reg_syntax_t syntax) -{ - reg_syntax_t ret = re_syntax_options; - - re_syntax_options = syntax; - return ret; -} -#ifdef _LIBC -weak_alias (__re_set_syntax, re_set_syntax) -#endif - -int -re_compile_fastmap (struct re_pattern_buffer *bufp) -{ - re_dfa_t *dfa = (re_dfa_t *) bufp->buffer; - char *fastmap = bufp->fastmap; - - memset (fastmap, '\0', sizeof (char) * SBC_MAX); - re_compile_fastmap_iter (bufp, dfa->init_state, fastmap); - if (dfa->init_state != dfa->init_state_word) - re_compile_fastmap_iter (bufp, dfa->init_state_word, fastmap); - if (dfa->init_state != dfa->init_state_nl) - re_compile_fastmap_iter (bufp, dfa->init_state_nl, fastmap); - if (dfa->init_state != dfa->init_state_begbuf) - re_compile_fastmap_iter (bufp, dfa->init_state_begbuf, fastmap); - bufp->fastmap_accurate = 1; - return 0; -} -#ifdef _LIBC -weak_alias (__re_compile_fastmap, re_compile_fastmap) -#endif - -static inline void -__attribute ((always_inline)) -re_set_fastmap (char *fastmap, int icase, int ch) -{ - fastmap[ch] = 1; - if (icase) - fastmap[tolower (ch)] = 1; -} - -/* Helper function for re_compile_fastmap. - Compile fastmap for the initial_state INIT_STATE. */ - -static void -re_compile_fastmap_iter (regex_t *bufp, const re_dfastate_t *init_state, - char *fastmap) -{ - volatile re_dfa_t *dfa = (re_dfa_t *) bufp->buffer; - int node_cnt; - int icase = (dfa->mb_cur_max == 1 && (bufp->syntax & RE_ICASE)); - for (node_cnt = 0; node_cnt < init_state->nodes.nelem; ++node_cnt) - { - int node = init_state->nodes.elems[node_cnt]; - re_token_type_t type = dfa->nodes[node].type; - - if (type == CHARACTER) - { - re_set_fastmap (fastmap, icase, dfa->nodes[node].opr.c); -#ifdef RE_ENABLE_I18N - if ((bufp->syntax & RE_ICASE) && dfa->mb_cur_max > 1) - { - unsigned char *buf = re_malloc (unsigned char, dfa->mb_cur_max), *p; - wchar_t wc; - mbstate_t state; - - p = buf; - *p++ = dfa->nodes[node].opr.c; - while (++node < dfa->nodes_len - && dfa->nodes[node].type == CHARACTER - && dfa->nodes[node].mb_partial) - *p++ = dfa->nodes[node].opr.c; - memset (&state, '\0', sizeof (state)); - if (__mbrtowc (&wc, (const char *) buf, p - buf, - &state) == p - buf - && (__wcrtomb ((char *) buf, towlower (wc), &state) - != (size_t) -1)) - re_set_fastmap (fastmap, 0, buf[0]); - re_free (buf); - } -#endif - } - else if (type == SIMPLE_BRACKET) - { - int i, ch; - for (i = 0, ch = 0; i < BITSET_WORDS; ++i) - { - int j; - bitset_word_t w = dfa->nodes[node].opr.sbcset[i]; - for (j = 0; j < BITSET_WORD_BITS; ++j, ++ch) - if (w & ((bitset_word_t) 1 << j)) - re_set_fastmap (fastmap, icase, ch); - } - } -#ifdef RE_ENABLE_I18N - else if (type == COMPLEX_BRACKET) - { - re_charset_t *cset = dfa->nodes[node].opr.mbcset; - int i; - -# ifdef _LIBC - /* See if we have to try all bytes which start multiple collation - elements. - e.g. In da_DK, we want to catch 'a' since "aa" is a valid - collation element, and don't catch 'b' since 'b' is - the only collation element which starts from 'b' (and - it is caught by SIMPLE_BRACKET). */ - if (_NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES) != 0 - && (cset->ncoll_syms || cset->nranges)) - { - const int32_t *table = (const int32_t *) - _NL_CURRENT (LC_COLLATE, _NL_COLLATE_TABLEMB); - for (i = 0; i < SBC_MAX; ++i) - if (table[i] < 0) - re_set_fastmap (fastmap, icase, i); - } -# endif /* _LIBC */ - - /* See if we have to start the match at all multibyte characters, - i.e. where we would not find an invalid sequence. This only - applies to multibyte character sets; for single byte character - sets, the SIMPLE_BRACKET again suffices. */ - if (dfa->mb_cur_max > 1 - && (cset->nchar_classes || cset->non_match || cset->nranges -# ifdef _LIBC - || cset->nequiv_classes -# endif /* _LIBC */ - )) - { - unsigned char c = 0; - do - { - mbstate_t mbs; - memset (&mbs, 0, sizeof (mbs)); - if (__mbrtowc (NULL, (char *) &c, 1, &mbs) == (size_t) -2) - re_set_fastmap (fastmap, false, (int) c); - } - while (++c != 0); - } - - else - { - /* ... Else catch all bytes which can start the mbchars. */ - for (i = 0; i < cset->nmbchars; ++i) - { - char buf[256]; - mbstate_t state; - memset (&state, '\0', sizeof (state)); - if (__wcrtomb (buf, cset->mbchars[i], &state) != (size_t) -1) - re_set_fastmap (fastmap, icase, *(unsigned char *) buf); - if ((bufp->syntax & RE_ICASE) && dfa->mb_cur_max > 1) - { - if (__wcrtomb (buf, towlower (cset->mbchars[i]), &state) - != (size_t) -1) - re_set_fastmap (fastmap, false, *(unsigned char *) buf); - } - } - } - } -#endif /* RE_ENABLE_I18N */ - else if (type == OP_PERIOD -#ifdef RE_ENABLE_I18N - || type == OP_UTF8_PERIOD -#endif /* RE_ENABLE_I18N */ - || type == END_OF_RE) - { - memset (fastmap, '\1', sizeof (char) * SBC_MAX); - if (type == END_OF_RE) - bufp->can_be_null = 1; - return; - } - } -} - -/* Entry point for POSIX code. */ -/* regcomp takes a regular expression as a string and compiles it. - - PREG is a regex_t *. We do not expect any fields to be initialized, - since POSIX says we shouldn't. Thus, we set - - `buffer' to the compiled pattern; - `used' to the length of the compiled pattern; - `syntax' to RE_SYNTAX_POSIX_EXTENDED if the - REG_EXTENDED bit in CFLAGS is set; otherwise, to - RE_SYNTAX_POSIX_BASIC; - `newline_anchor' to REG_NEWLINE being set in CFLAGS; - `fastmap' to an allocated space for the fastmap; - `fastmap_accurate' to zero; - `re_nsub' to the number of subexpressions in PATTERN. - - PATTERN is the address of the pattern string. - - CFLAGS is a series of bits which affect compilation. - - If REG_EXTENDED is set, we use POSIX extended syntax; otherwise, we - use POSIX basic syntax. - - If REG_NEWLINE is set, then . and [^...] don't match newline. - Also, regexec will try a match beginning after every newline. - - If REG_ICASE is set, then we considers upper- and lowercase - versions of letters to be equivalent when matching. - - If REG_NOSUB is set, then when PREG is passed to regexec, that - routine will report only success or failure, and nothing about the - registers. - - It returns 0 if it succeeds, nonzero if it doesn't. (See regex.h for - the return codes and their meanings.) */ - -int -regcomp (regex_t *__restrict preg, - const char *__restrict pattern, - int cflags) -{ - reg_errcode_t ret; - reg_syntax_t syntax = ((cflags & REG_EXTENDED) ? RE_SYNTAX_POSIX_EXTENDED - : RE_SYNTAX_POSIX_BASIC); - - preg->buffer = NULL; - preg->allocated = 0; - preg->used = 0; - - /* Try to allocate space for the fastmap. */ - preg->fastmap = re_malloc (char, SBC_MAX); - if (BE (preg->fastmap == NULL, 0)) - return REG_ESPACE; - - syntax |= (cflags & REG_ICASE) ? RE_ICASE : 0; - - /* If REG_NEWLINE is set, newlines are treated differently. */ - if (cflags & REG_NEWLINE) - { /* REG_NEWLINE implies neither . nor [^...] match newline. */ - syntax &= ~RE_DOT_NEWLINE; - syntax |= RE_HAT_LISTS_NOT_NEWLINE; - /* It also changes the matching behavior. */ - preg->newline_anchor = 1; - } - else - preg->newline_anchor = 0; - preg->no_sub = !!(cflags & REG_NOSUB); - preg->translate = NULL; - - ret = re_compile_internal (preg, pattern, strlen (pattern), syntax); - - /* POSIX doesn't distinguish between an unmatched open-group and an - unmatched close-group: both are REG_EPAREN. */ - if (ret == REG_ERPAREN) - ret = REG_EPAREN; - - /* We have already checked preg->fastmap != NULL. */ - if (BE (ret == REG_NOERROR, 1)) - /* Compute the fastmap now, since regexec cannot modify the pattern - buffer. This function never fails in this implementation. */ - (void) re_compile_fastmap (preg); - else - { - /* Some error occurred while compiling the expression. */ - re_free (preg->fastmap); - preg->fastmap = NULL; - } - - return (int) ret; -} -#ifdef _LIBC -weak_alias (__regcomp, regcomp) -#endif - -/* Returns a message corresponding to an error code, ERRCODE, returned - from either regcomp or regexec. We don't use PREG here. */ - -size_t -regerror(int errcode, UNUSED const regex_t *__restrict preg, - char *__restrict errbuf, size_t errbuf_size) -{ - const char *msg; - size_t msg_size; - - if (BE (errcode < 0 - || errcode >= (int) (sizeof (__re_error_msgid_idx) - / sizeof (__re_error_msgid_idx[0])), 0)) - /* Only error codes returned by the rest of the code should be passed - to this routine. If we are given anything else, or if other regex - code generates an invalid error code, then the program has a bug. - Dump core so we can fix it. */ - abort (); - - msg = gettext (__re_error_msgid + __re_error_msgid_idx[errcode]); - - msg_size = strlen (msg) + 1; /* Includes the null. */ - - if (BE (errbuf_size != 0, 1)) - { - if (BE (msg_size > errbuf_size, 0)) - { - memcpy (errbuf, msg, errbuf_size - 1); - errbuf[errbuf_size - 1] = 0; - } - else - memcpy (errbuf, msg, msg_size); - } - - return msg_size; -} -#ifdef _LIBC -weak_alias (__regerror, regerror) -#endif - - -#ifdef RE_ENABLE_I18N -/* This static array is used for the map to single-byte characters when - UTF-8 is used. Otherwise we would allocate memory just to initialize - it the same all the time. UTF-8 is the preferred encoding so this is - a worthwhile optimization. */ -#if __GNUC__ >= 3 -static const bitset_t utf8_sb_map = { - /* Set the first 128 bits. */ - [0 ... 0x80 / BITSET_WORD_BITS - 1] = BITSET_WORD_MAX -}; -#else /* ! (__GNUC__ >= 3) */ -static bitset_t utf8_sb_map; -#endif /* __GNUC__ >= 3 */ -#endif /* RE_ENABLE_I18N */ - - -static void -free_dfa_content (re_dfa_t *dfa) -{ - unsigned int i; - int j; - - if (dfa->nodes) - for (i = 0; i < dfa->nodes_len; ++i) - free_token (dfa->nodes + i); - re_free (dfa->nexts); - for (i = 0; i < dfa->nodes_len; ++i) - { - if (dfa->eclosures != NULL) - re_node_set_free (dfa->eclosures + i); - if (dfa->inveclosures != NULL) - re_node_set_free (dfa->inveclosures + i); - if (dfa->edests != NULL) - re_node_set_free (dfa->edests + i); - } - re_free (dfa->edests); - re_free (dfa->eclosures); - re_free (dfa->inveclosures); - re_free (dfa->nodes); - - if (dfa->state_table) - for (i = 0; i <= dfa->state_hash_mask; ++i) - { - struct re_state_table_entry *entry = dfa->state_table + i; - for (j = 0; j < entry->num; ++j) - { - re_dfastate_t *state = entry->array[j]; - free_state (state); - } - re_free (entry->array); - } - re_free (dfa->state_table); -#ifdef RE_ENABLE_I18N - if (dfa->sb_char != utf8_sb_map) - re_free (dfa->sb_char); -#endif - re_free (dfa->subexp_map); -#ifdef DEBUG - re_free (dfa->re_str); -#endif - - re_free (dfa); -} - - -/* Free dynamically allocated space used by PREG. */ - -void -regfree (regex_t *preg) -{ - re_dfa_t *dfa = (re_dfa_t *) preg->buffer; - if (BE (dfa != NULL, 1)) - free_dfa_content (dfa); - preg->buffer = NULL; - preg->allocated = 0; - - re_free (preg->fastmap); - preg->fastmap = NULL; - - re_free (preg->translate); - preg->translate = NULL; -} -#ifdef _LIBC -weak_alias (__regfree, regfree) -#endif - -/* Entry points compatible with 4.2 BSD regex library. We don't define - them unless specifically requested. */ - -#if defined _REGEX_RE_COMP || defined _LIBC - -/* BSD has one and only one pattern buffer. */ -static struct re_pattern_buffer re_comp_buf; - -char * -# ifdef _LIBC -/* Make these definitions weak in libc, so POSIX programs can redefine - these names if they don't use our functions, and still use - regcomp/regexec above without link errors. */ -weak_function -# endif -re_comp (s) - const char *s; -{ - reg_errcode_t ret; - char *fastmap; - - if (!s) - { - if (!re_comp_buf.buffer) - return gettext ("No previous regular expression"); - return 0; - } - - if (re_comp_buf.buffer) - { - fastmap = re_comp_buf.fastmap; - re_comp_buf.fastmap = NULL; - __regfree (&re_comp_buf); - memset (&re_comp_buf, '\0', sizeof (re_comp_buf)); - re_comp_buf.fastmap = fastmap; - } - - if (re_comp_buf.fastmap == NULL) - { - re_comp_buf.fastmap = (char *) malloc (SBC_MAX); - if (re_comp_buf.fastmap == NULL) - return (char *) gettext (__re_error_msgid - + __re_error_msgid_idx[(int) REG_ESPACE]); - } - - /* Since `re_exec' always passes NULL for the `regs' argument, we - don't need to initialize the pattern buffer fields which affect it. */ - - /* Match anchors at newlines. */ - re_comp_buf.newline_anchor = 1; - - ret = re_compile_internal (&re_comp_buf, s, strlen (s), re_syntax_options); - - if (!ret) - return NULL; - - /* Yes, we're discarding `const' here if !HAVE_LIBINTL. */ - return (char *) gettext (__re_error_msgid + __re_error_msgid_idx[(int) ret]); -} - -#ifdef _LIBC -libc_freeres_fn (free_mem) -{ - __regfree (&re_comp_buf); -} -#endif - -#endif /* _REGEX_RE_COMP */ - -/* Internal entry point. - Compile the regular expression PATTERN, whose length is LENGTH. - SYNTAX indicate regular expression's syntax. */ - -static reg_errcode_t -re_compile_internal (regex_t *preg, const char * pattern, size_t length, - reg_syntax_t syntax) -{ - reg_errcode_t err = REG_NOERROR; - re_dfa_t *dfa; - re_string_t regexp; - - /* Initialize the pattern buffer. */ - preg->fastmap_accurate = 0; - preg->syntax = syntax; - preg->not_bol = preg->not_eol = 0; - preg->used = 0; - preg->re_nsub = 0; - preg->can_be_null = 0; - preg->regs_allocated = REGS_UNALLOCATED; - - /* Initialize the dfa. */ - dfa = (re_dfa_t *) preg->buffer; - if (BE (preg->allocated < sizeof (re_dfa_t), 0)) - { - /* If zero allocated, but buffer is non-null, try to realloc - enough space. This loses if buffer's address is bogus, but - that is the user's responsibility. If ->buffer is NULL this - is a simple allocation. */ - dfa = re_realloc (preg->buffer, re_dfa_t, 1); - if (dfa == NULL) - return REG_ESPACE; - preg->allocated = sizeof (re_dfa_t); - preg->buffer = (unsigned char *) dfa; - } - preg->used = sizeof (re_dfa_t); - - err = init_dfa (dfa, length); - if (BE (err != REG_NOERROR, 0)) - { - free_dfa_content (dfa); - preg->buffer = NULL; - preg->allocated = 0; - return err; - } -#ifdef DEBUG - /* Note: length+1 will not overflow since it is checked in init_dfa. */ - dfa->re_str = re_malloc (char, length + 1); - strncpy (dfa->re_str, pattern, length + 1); -#endif - - __libc_lock_init (dfa->lock); - - err = re_string_construct (®exp, pattern, length, preg->translate, - syntax & RE_ICASE, dfa); - if (BE (err != REG_NOERROR, 0)) - { - re_compile_internal_free_return: - free_workarea_compile (preg); - re_string_destruct (®exp); - free_dfa_content (dfa); - preg->buffer = NULL; - preg->allocated = 0; - return err; - } - - /* Parse the regular expression, and build a structure tree. */ - preg->re_nsub = 0; - dfa->str_tree = parse (®exp, preg, syntax, &err); - if (BE (dfa->str_tree == NULL, 0)) - goto re_compile_internal_free_return; - - /* Analyze the tree and create the nfa. */ - err = analyze (preg); - if (BE (err != REG_NOERROR, 0)) - goto re_compile_internal_free_return; - -#ifdef RE_ENABLE_I18N - /* If possible, do searching in single byte encoding to speed things up. */ - if (dfa->is_utf8 && !(syntax & RE_ICASE) && preg->translate == NULL) - optimize_utf8 (dfa); -#endif - - /* Then create the initial state of the dfa. */ - err = create_initial_state (dfa); - - /* Release work areas. */ - free_workarea_compile (preg); - re_string_destruct (®exp); - - if (BE (err != REG_NOERROR, 0)) - { - free_dfa_content (dfa); - preg->buffer = NULL; - preg->allocated = 0; - } - - return err; -} - -/* Initialize DFA. We use the length of the regular expression PAT_LEN - as the initial length of some arrays. */ - -static reg_errcode_t -init_dfa (re_dfa_t *dfa, size_t pat_len) -{ - unsigned int table_size; - - memset (dfa, '\0', sizeof (re_dfa_t)); - - /* Force allocation of str_tree_storage the first time. */ - dfa->str_tree_storage_idx = BIN_TREE_STORAGE_SIZE; - - /* Avoid overflows. */ - if (pat_len == SIZE_MAX) - return REG_ESPACE; - - dfa->nodes_alloc = pat_len + 1; - dfa->nodes = re_malloc (re_token_t, dfa->nodes_alloc); - - /* table_size = 2 ^ ceil(log pat_len) */ - for (table_size = 1; ; table_size <<= 1) - if (table_size > pat_len) - break; - - dfa->state_table = calloc (sizeof (struct re_state_table_entry), table_size); - dfa->state_hash_mask = table_size - 1; - - dfa->mb_cur_max = MB_CUR_MAX; -#ifdef _LIBC - if (dfa->mb_cur_max == 6 - && strcmp (_NL_CURRENT (LC_CTYPE, _NL_CTYPE_CODESET_NAME), "UTF-8") == 0) - dfa->is_utf8 = 1; - dfa->map_notascii = (_NL_CURRENT_WORD (LC_CTYPE, _NL_CTYPE_MAP_TO_NONASCII) - != 0); -#else - dfa->is_utf8 = 1; - /* We check exhaustively in the loop below if this charset is a - superset of ASCII. */ - dfa->map_notascii = 0; -#endif - -#ifdef RE_ENABLE_I18N - if (dfa->mb_cur_max > 1) - { - if (dfa->is_utf8) - { -#if !defined(__GNUC__) || __GNUC__ < 3 - static short utf8_sb_map_inited = 0; - - if (! utf8_sb_map_inited) - { - int i; - - utf8_sb_map_inited = 0; - for (i = 0; i <= 0x80 / BITSET_WORD_BITS - 1; i++) - utf8_sb_map[i] = BITSET_WORD_MAX; - } -#endif - dfa->sb_char = (re_bitset_ptr_t) utf8_sb_map; - } - else - { - int i, j, ch; - - dfa->sb_char = (re_bitset_ptr_t) calloc (sizeof (bitset_t), 1); - if (BE (dfa->sb_char == NULL, 0)) - return REG_ESPACE; - - /* Set the bits corresponding to single byte chars. */ - for (i = 0, ch = 0; i < BITSET_WORDS; ++i) - for (j = 0; j < BITSET_WORD_BITS; ++j, ++ch) - { - wint_t wch = __btowc (ch); - if (wch != WEOF) - dfa->sb_char[i] |= (bitset_word_t) 1 << j; -# ifndef _LIBC - if (isascii (ch) && wch != ch) - dfa->map_notascii = 1; -# endif - } - } - } -#endif - - if (BE (dfa->nodes == NULL || dfa->state_table == NULL, 0)) - return REG_ESPACE; - return REG_NOERROR; -} - -/* Initialize WORD_CHAR table, which indicate which character is - "word". In this case "word" means that it is the word construction - character used by some operators like "\<", "\>", etc. */ - -static void -internal_function -init_word_char (re_dfa_t *dfa) -{ - int i, j, ch; - dfa->word_ops_used = 1; - for (i = 0, ch = 0; i < BITSET_WORDS; ++i) - for (j = 0; j < BITSET_WORD_BITS; ++j, ++ch) - if (isalnum (ch) || ch == '_') - dfa->word_char[i] |= (bitset_word_t) 1 << j; -} - -/* Free the work area which are only used while compiling. */ - -static void -free_workarea_compile (regex_t *preg) -{ - re_dfa_t *dfa = (re_dfa_t *) preg->buffer; - bin_tree_storage_t *storage, *next; - for (storage = dfa->str_tree_storage; storage; storage = next) - { - next = storage->next; - re_free (storage); - } - dfa->str_tree_storage = NULL; - dfa->str_tree_storage_idx = BIN_TREE_STORAGE_SIZE; - dfa->str_tree = NULL; - re_free (dfa->org_indices); - dfa->org_indices = NULL; -} - -/* Create initial states for all contexts. */ - -static reg_errcode_t -create_initial_state (re_dfa_t *dfa) -{ - int first, i; - reg_errcode_t err; - re_node_set init_nodes; - - /* Initial states have the epsilon closure of the node which is - the first node of the regular expression. */ - first = dfa->str_tree->first->node_idx; - dfa->init_node = first; - err = re_node_set_init_copy (&init_nodes, dfa->eclosures + first); - if (BE (err != REG_NOERROR, 0)) - return err; - - /* The back-references which are in initial states can epsilon transit, - since in this case all of the subexpressions can be null. - Then we add epsilon closures of the nodes which are the next nodes of - the back-references. */ - if (dfa->nbackref > 0) - for (i = 0; i < init_nodes.nelem; ++i) - { - int node_idx = init_nodes.elems[i]; - re_token_type_t type = dfa->nodes[node_idx].type; - - int clexp_idx; - if (type != OP_BACK_REF) - continue; - for (clexp_idx = 0; clexp_idx < init_nodes.nelem; ++clexp_idx) - { - re_token_t *clexp_node; - clexp_node = dfa->nodes + init_nodes.elems[clexp_idx]; - if (clexp_node->type == OP_CLOSE_SUBEXP - && clexp_node->opr.idx == dfa->nodes[node_idx].opr.idx) - break; - } - if (clexp_idx == init_nodes.nelem) - continue; - - if (type == OP_BACK_REF) - { - int dest_idx = dfa->edests[node_idx].elems[0]; - if (!re_node_set_contains (&init_nodes, dest_idx)) - { - reg_errcode_t err = re_node_set_merge (&init_nodes, - dfa->eclosures - + dest_idx); - if (err != REG_NOERROR) - return err; - i = 0; - } - } - } - - /* It must be the first time to invoke acquire_state. */ - dfa->init_state = re_acquire_state_context (&err, dfa, &init_nodes, 0); - /* We don't check ERR here, since the initial state must not be NULL. */ - if (BE (dfa->init_state == NULL, 0)) - return err; - if (dfa->init_state->has_constraint) - { - dfa->init_state_word = re_acquire_state_context (&err, dfa, &init_nodes, - CONTEXT_WORD); - dfa->init_state_nl = re_acquire_state_context (&err, dfa, &init_nodes, - CONTEXT_NEWLINE); - dfa->init_state_begbuf = re_acquire_state_context (&err, dfa, - &init_nodes, - CONTEXT_NEWLINE - | CONTEXT_BEGBUF); - if (BE (dfa->init_state_word == NULL || dfa->init_state_nl == NULL - || dfa->init_state_begbuf == NULL, 0)) - return err; - } - else - dfa->init_state_word = dfa->init_state_nl - = dfa->init_state_begbuf = dfa->init_state; - - re_node_set_free (&init_nodes); - return REG_NOERROR; -} - -#ifdef RE_ENABLE_I18N -/* If it is possible to do searching in single byte encoding instead of UTF-8 - to speed things up, set dfa->mb_cur_max to 1, clear is_utf8 and change - DFA nodes where needed. */ - -static void -optimize_utf8 (re_dfa_t *dfa) -{ - int node, i, mb_chars = 0, has_period = 0; - - for (node = 0; node < dfa->nodes_len; ++node) - switch (dfa->nodes[node].type) - { - case CHARACTER: - if (dfa->nodes[node].opr.c >= 0x80) - mb_chars = 1; - break; - case ANCHOR: - switch (dfa->nodes[node].opr.ctx_type) - { - case LINE_FIRST: - case LINE_LAST: - case BUF_FIRST: - case BUF_LAST: - break; - default: - /* Word anchors etc. cannot be handled. It's okay to test - opr.ctx_type since constraints (for all DFA nodes) are - created by ORing one or more opr.ctx_type values. */ - return; - } - break; - case OP_PERIOD: - has_period = 1; - break; - case OP_BACK_REF: - case OP_ALT: - case END_OF_RE: - case OP_DUP_ASTERISK: - case OP_OPEN_SUBEXP: - case OP_CLOSE_SUBEXP: - break; - case COMPLEX_BRACKET: - return; - case SIMPLE_BRACKET: - /* Just double check. The non-ASCII range starts at 0x80. */ - assert (0x80 % BITSET_WORD_BITS == 0); - for (i = 0x80 / BITSET_WORD_BITS; i < BITSET_WORDS; ++i) - if (dfa->nodes[node].opr.sbcset[i]) - return; - break; - default: - abort (); - } - - if (mb_chars || has_period) - for (node = 0; node < dfa->nodes_len; ++node) - { - if (dfa->nodes[node].type == CHARACTER - && dfa->nodes[node].opr.c >= 0x80) - dfa->nodes[node].mb_partial = 0; - else if (dfa->nodes[node].type == OP_PERIOD) - dfa->nodes[node].type = OP_UTF8_PERIOD; - } - - /* The search can be in single byte locale. */ - dfa->mb_cur_max = 1; - dfa->is_utf8 = 0; - dfa->has_mb_node = dfa->nbackref > 0 || has_period; -} -#endif - -/* Analyze the structure tree, and calculate "first", "next", "edest", - "eclosure", and "inveclosure". */ - -static reg_errcode_t -analyze (regex_t *preg) -{ - re_dfa_t *dfa = (re_dfa_t *) preg->buffer; - reg_errcode_t ret; - - /* Allocate arrays. */ - dfa->nexts = re_malloc (int, dfa->nodes_alloc); - dfa->org_indices = re_malloc (int, dfa->nodes_alloc); - dfa->edests = re_malloc (re_node_set, dfa->nodes_alloc); - dfa->eclosures = re_malloc (re_node_set, dfa->nodes_alloc); - if (BE (dfa->nexts == NULL || dfa->org_indices == NULL || dfa->edests == NULL - || dfa->eclosures == NULL, 0)) - return REG_ESPACE; - - dfa->subexp_map = re_malloc (int, preg->re_nsub); - if (dfa->subexp_map != NULL) - { - unsigned int i; - for (i = 0; i < preg->re_nsub; i++) - dfa->subexp_map[i] = i; - preorder (dfa->str_tree, optimize_subexps, dfa); - for (i = 0; i < preg->re_nsub; i++) - if (dfa->subexp_map[i] != (int)i) - break; - if (i == preg->re_nsub) - { - free (dfa->subexp_map); - dfa->subexp_map = NULL; - } - } - - ret = postorder (dfa->str_tree, lower_subexps, preg); - if (BE (ret != REG_NOERROR, 0)) - return ret; - ret = postorder (dfa->str_tree, calc_first, dfa); - if (BE (ret != REG_NOERROR, 0)) - return ret; - preorder (dfa->str_tree, calc_next, dfa); - ret = preorder (dfa->str_tree, link_nfa_nodes, dfa); - if (BE (ret != REG_NOERROR, 0)) - return ret; - ret = calc_eclosure (dfa); - if (BE (ret != REG_NOERROR, 0)) - return ret; - - /* We only need this during the prune_impossible_nodes pass in regexec.c; - skip it if p_i_n will not run, as calc_inveclosure can be quadratic. */ - if ((!preg->no_sub && preg->re_nsub > 0 && dfa->has_plural_match) - || dfa->nbackref) - { - dfa->inveclosures = re_malloc (re_node_set, dfa->nodes_len); - if (BE (dfa->inveclosures == NULL, 0)) - return REG_ESPACE; - ret = calc_inveclosure (dfa); - } - - return ret; -} - -/* Our parse trees are very unbalanced, so we cannot use a stack to - implement parse tree visits. Instead, we use parent pointers and - some hairy code in these two functions. */ -static reg_errcode_t -postorder (bin_tree_t *root, reg_errcode_t (fn (void *, bin_tree_t *)), - void *extra) -{ - bin_tree_t *node, *prev; - - for (node = root; ; ) - { - /* Descend down the tree, preferably to the left (or to the right - if that's the only child). */ - while (node->left || node->right) - if (node->left) - node = node->left; - else - node = node->right; - - do - { - reg_errcode_t err = fn (extra, node); - if (BE (err != REG_NOERROR, 0)) - return err; - if (node->parent == NULL) - return REG_NOERROR; - prev = node; - node = node->parent; - } - /* Go up while we have a node that is reached from the right. */ - while (node->right == prev || node->right == NULL); - node = node->right; - } -} - -static reg_errcode_t -preorder (bin_tree_t *root, reg_errcode_t (fn (void *, bin_tree_t *)), - void *extra) -{ - bin_tree_t *node; - - for (node = root; ; ) - { - reg_errcode_t err = fn (extra, node); - if (BE (err != REG_NOERROR, 0)) - return err; - - /* Go to the left node, or up and to the right. */ - if (node->left) - node = node->left; - else - { - bin_tree_t *prev = NULL; - while (node->right == prev || node->right == NULL) - { - prev = node; - node = node->parent; - if (!node) - return REG_NOERROR; - } - node = node->right; - } - } -} - -/* Optimization pass: if a SUBEXP is entirely contained, strip it and tell - re_search_internal to map the inner one's opr.idx to this one's. Adjust - backreferences as well. Requires a preorder visit. */ -static reg_errcode_t -optimize_subexps (void *extra, bin_tree_t *node) -{ - re_dfa_t *dfa = (re_dfa_t *) extra; - - if (node->token.type == OP_BACK_REF && dfa->subexp_map) - { - int idx = node->token.opr.idx; - node->token.opr.idx = dfa->subexp_map[idx]; - dfa->used_bkref_map |= 1 << node->token.opr.idx; - } - - else if (node->token.type == SUBEXP - && node->left && node->left->token.type == SUBEXP) - { - int other_idx = node->left->token.opr.idx; - - node->left = node->left->left; - if (node->left) - node->left->parent = node; - - dfa->subexp_map[other_idx] = dfa->subexp_map[node->token.opr.idx]; - if (other_idx < BITSET_WORD_BITS) - dfa->used_bkref_map &= ~((bitset_word_t) 1 << other_idx); - } - - return REG_NOERROR; -} - -/* Lowering pass: Turn each SUBEXP node into the appropriate concatenation - of OP_OPEN_SUBEXP, the body of the SUBEXP (if any) and OP_CLOSE_SUBEXP. */ -static reg_errcode_t -lower_subexps (void *extra, bin_tree_t *node) -{ - regex_t *preg = (regex_t *) extra; - reg_errcode_t err = REG_NOERROR; - - if (node->left && node->left->token.type == SUBEXP) - { - node->left = lower_subexp (&err, preg, node->left); - if (node->left) - node->left->parent = node; - } - if (node->right && node->right->token.type == SUBEXP) - { - node->right = lower_subexp (&err, preg, node->right); - if (node->right) - node->right->parent = node; - } - - return err; -} - -static bin_tree_t * -lower_subexp (reg_errcode_t *err, regex_t *preg, bin_tree_t *node) -{ - re_dfa_t *dfa = (re_dfa_t *) preg->buffer; - bin_tree_t *body = node->left; - bin_tree_t *op, *cls, *tree1, *tree; - - if (preg->no_sub - /* We do not optimize empty subexpressions, because otherwise we may - have bad CONCAT nodes with NULL children. This is obviously not - very common, so we do not lose much. An example that triggers - this case is the sed "script" /\(\)/x. */ - && node->left != NULL - && (node->token.opr.idx >= BITSET_WORD_BITS - || !(dfa->used_bkref_map - & ((bitset_word_t) 1 << node->token.opr.idx)))) - return node->left; - - /* Convert the SUBEXP node to the concatenation of an - OP_OPEN_SUBEXP, the contents, and an OP_CLOSE_SUBEXP. */ - op = create_tree (dfa, NULL, NULL, OP_OPEN_SUBEXP); - cls = create_tree (dfa, NULL, NULL, OP_CLOSE_SUBEXP); - tree1 = body ? create_tree (dfa, body, cls, CONCAT) : cls; - tree = create_tree (dfa, op, tree1, CONCAT); - if (BE (tree == NULL || tree1 == NULL || op == NULL || cls == NULL, 0)) - { - *err = REG_ESPACE; - return NULL; - } - - op->token.opr.idx = cls->token.opr.idx = node->token.opr.idx; - op->token.opt_subexp = cls->token.opt_subexp = node->token.opt_subexp; - return tree; -} - -/* Pass 1 in building the NFA: compute FIRST and create unlinked automaton - nodes. Requires a postorder visit. */ -static reg_errcode_t -calc_first (void *extra, bin_tree_t *node) -{ - re_dfa_t *dfa = (re_dfa_t *) extra; - if (node->token.type == CONCAT) - { - node->first = node->left->first; - node->node_idx = node->left->node_idx; - } - else - { - node->first = node; - node->node_idx = re_dfa_add_node (dfa, node->token); - if (BE (node->node_idx == -1, 0)) - return REG_ESPACE; - if (node->token.type == ANCHOR) - dfa->nodes[node->node_idx].constraint = node->token.opr.ctx_type; - } - return REG_NOERROR; -} - -/* Pass 2: compute NEXT on the tree. Preorder visit. */ -static reg_errcode_t -calc_next (UNUSED void *extra, bin_tree_t *node) -{ - switch (node->token.type) - { - case OP_DUP_ASTERISK: - node->left->next = node; - break; - case CONCAT: - node->left->next = node->right->first; - node->right->next = node->next; - break; - default: - if (node->left) - node->left->next = node->next; - if (node->right) - node->right->next = node->next; - break; - } - return REG_NOERROR; -} - -/* Pass 3: link all DFA nodes to their NEXT node (any order will do). */ -static reg_errcode_t -link_nfa_nodes (void *extra, bin_tree_t *node) -{ - re_dfa_t *dfa = (re_dfa_t *) extra; - int idx = node->node_idx; - reg_errcode_t err = REG_NOERROR; - - switch (node->token.type) - { - case CONCAT: - break; - - case END_OF_RE: - assert (node->next == NULL); - break; - - case OP_DUP_ASTERISK: - case OP_ALT: - { - int left, right; - dfa->has_plural_match = 1; - if (node->left != NULL) - left = node->left->first->node_idx; - else - left = node->next->node_idx; - if (node->right != NULL) - right = node->right->first->node_idx; - else - right = node->next->node_idx; - assert (left > -1); - assert (right > -1); - err = re_node_set_init_2 (dfa->edests + idx, left, right); - } - break; - - case ANCHOR: - case OP_OPEN_SUBEXP: - case OP_CLOSE_SUBEXP: - err = re_node_set_init_1 (dfa->edests + idx, node->next->node_idx); - break; - - case OP_BACK_REF: - dfa->nexts[idx] = node->next->node_idx; - if (node->token.type == OP_BACK_REF) - err = re_node_set_init_1 (dfa->edests + idx, dfa->nexts[idx]); - break; - - default: - assert (!IS_EPSILON_NODE (node->token.type)); - dfa->nexts[idx] = node->next->node_idx; - break; - } - - return err; -} - -/* Duplicate the epsilon closure of the node ROOT_NODE. - Note that duplicated nodes have constraint INIT_CONSTRAINT in addition - to their own constraint. */ - -static reg_errcode_t -internal_function -duplicate_node_closure (re_dfa_t *dfa, int top_org_node, int top_clone_node, - int root_node, unsigned int init_constraint) -{ - int org_node, clone_node, ret; - unsigned int constraint = init_constraint; - for (org_node = top_org_node, clone_node = top_clone_node;;) - { - int org_dest, clone_dest; - if (dfa->nodes[org_node].type == OP_BACK_REF) - { - /* If the back reference epsilon-transit, its destination must - also have the constraint. Then duplicate the epsilon closure - of the destination of the back reference, and store it in - edests of the back reference. */ - org_dest = dfa->nexts[org_node]; - re_node_set_empty (dfa->edests + clone_node); - clone_dest = duplicate_node (dfa, org_dest, constraint); - if (BE (clone_dest == -1, 0)) - return REG_ESPACE; - dfa->nexts[clone_node] = dfa->nexts[org_node]; - ret = re_node_set_insert (dfa->edests + clone_node, clone_dest); - if (BE (ret < 0, 0)) - return REG_ESPACE; - } - else if (dfa->edests[org_node].nelem == 0) - { - /* In case of the node can't epsilon-transit, don't duplicate the - destination and store the original destination as the - destination of the node. */ - dfa->nexts[clone_node] = dfa->nexts[org_node]; - break; - } - else if (dfa->edests[org_node].nelem == 1) - { - /* In case of the node can epsilon-transit, and it has only one - destination. */ - org_dest = dfa->edests[org_node].elems[0]; - re_node_set_empty (dfa->edests + clone_node); - /* If the node is root_node itself, it means the epsilon clsoure - has a loop. Then tie it to the destination of the root_node. */ - if (org_node == root_node && clone_node != org_node) - { - ret = re_node_set_insert (dfa->edests + clone_node, org_dest); - if (BE (ret < 0, 0)) - return REG_ESPACE; - break; - } - /* In case of the node has another constraint, add it. */ - constraint |= dfa->nodes[org_node].constraint; - clone_dest = duplicate_node (dfa, org_dest, constraint); - if (BE (clone_dest == -1, 0)) - return REG_ESPACE; - ret = re_node_set_insert (dfa->edests + clone_node, clone_dest); - if (BE (ret < 0, 0)) - return REG_ESPACE; - } - else /* dfa->edests[org_node].nelem == 2 */ - { - /* In case of the node can epsilon-transit, and it has two - destinations. In the bin_tree_t and DFA, that's '|' and '*'. */ - org_dest = dfa->edests[org_node].elems[0]; - re_node_set_empty (dfa->edests + clone_node); - /* Search for a duplicated node which satisfies the constraint. */ - clone_dest = search_duplicated_node (dfa, org_dest, constraint); - if (clone_dest == -1) - { - /* There is no such duplicated node, create a new one. */ - reg_errcode_t err; - clone_dest = duplicate_node (dfa, org_dest, constraint); - if (BE (clone_dest == -1, 0)) - return REG_ESPACE; - ret = re_node_set_insert (dfa->edests + clone_node, clone_dest); - if (BE (ret < 0, 0)) - return REG_ESPACE; - err = duplicate_node_closure (dfa, org_dest, clone_dest, - root_node, constraint); - if (BE (err != REG_NOERROR, 0)) - return err; - } - else - { - /* There is a duplicated node which satisfies the constraint, - use it to avoid infinite loop. */ - ret = re_node_set_insert (dfa->edests + clone_node, clone_dest); - if (BE (ret < 0, 0)) - return REG_ESPACE; - } - - org_dest = dfa->edests[org_node].elems[1]; - clone_dest = duplicate_node (dfa, org_dest, constraint); - if (BE (clone_dest == -1, 0)) - return REG_ESPACE; - ret = re_node_set_insert (dfa->edests + clone_node, clone_dest); - if (BE (ret < 0, 0)) - return REG_ESPACE; - } - org_node = org_dest; - clone_node = clone_dest; - } - return REG_NOERROR; -} - -/* Search for a node which is duplicated from the node ORG_NODE, and - satisfies the constraint CONSTRAINT. */ - -static int -search_duplicated_node (const re_dfa_t *dfa, int org_node, - unsigned int constraint) -{ - int idx; - for (idx = dfa->nodes_len - 1; dfa->nodes[idx].duplicated && idx > 0; --idx) - { - if (org_node == dfa->org_indices[idx] - && constraint == dfa->nodes[idx].constraint) - return idx; /* Found. */ - } - return -1; /* Not found. */ -} - -/* Duplicate the node whose index is ORG_IDX and set the constraint CONSTRAINT. - Return the index of the new node, or -1 if insufficient storage is - available. */ - -static int -duplicate_node (re_dfa_t *dfa, int org_idx, unsigned int constraint) -{ - int dup_idx = re_dfa_add_node (dfa, dfa->nodes[org_idx]); - if (BE (dup_idx != -1, 1)) - { - dfa->nodes[dup_idx].constraint = constraint; - dfa->nodes[dup_idx].constraint |= dfa->nodes[org_idx].constraint; - dfa->nodes[dup_idx].duplicated = 1; - - /* Store the index of the original node. */ - dfa->org_indices[dup_idx] = org_idx; - } - return dup_idx; -} - -static reg_errcode_t -calc_inveclosure (re_dfa_t *dfa) -{ - int ret; - unsigned int src, idx; - for (idx = 0; idx < dfa->nodes_len; ++idx) - re_node_set_init_empty (dfa->inveclosures + idx); - - for (src = 0; src < dfa->nodes_len; ++src) - { - int *elems = dfa->eclosures[src].elems; - int idx; - for (idx = 0; idx < dfa->eclosures[src].nelem; ++idx) - { - ret = re_node_set_insert_last (dfa->inveclosures + elems[idx], src); - if (BE (ret == -1, 0)) - return REG_ESPACE; - } - } - - return REG_NOERROR; -} - -/* Calculate "eclosure" for all the node in DFA. */ - -static reg_errcode_t -calc_eclosure (re_dfa_t *dfa) -{ - size_t node_idx; - int incomplete; -#ifdef DEBUG - assert (dfa->nodes_len > 0); -#endif - incomplete = 0; - /* For each nodes, calculate epsilon closure. */ - for (node_idx = 0; ; ++node_idx) - { - reg_errcode_t err; - re_node_set eclosure_elem; - if (node_idx == dfa->nodes_len) - { - if (!incomplete) - break; - incomplete = 0; - node_idx = 0; - } - -#ifdef DEBUG - assert (dfa->eclosures[node_idx].nelem != -1); -#endif - - /* If we have already calculated, skip it. */ - if (dfa->eclosures[node_idx].nelem != 0) - continue; - /* Calculate epsilon closure of `node_idx'. */ - err = calc_eclosure_iter (&eclosure_elem, dfa, node_idx, 1); - if (BE (err != REG_NOERROR, 0)) - return err; - - if (dfa->eclosures[node_idx].nelem == 0) - { - incomplete = 1; - re_node_set_free (&eclosure_elem); - } - } - return REG_NOERROR; -} - -/* Calculate epsilon closure of NODE. */ - -static reg_errcode_t -calc_eclosure_iter (re_node_set *new_set, re_dfa_t *dfa, int node, int root) -{ - reg_errcode_t err; - int i; - re_node_set eclosure; - int ret; - int incomplete = 0; - err = re_node_set_alloc (&eclosure, dfa->edests[node].nelem + 1); - if (BE (err != REG_NOERROR, 0)) - return err; - - /* This indicates that we are calculating this node now. - We reference this value to avoid infinite loop. */ - dfa->eclosures[node].nelem = -1; - - /* If the current node has constraints, duplicate all nodes - since they must inherit the constraints. */ - if (dfa->nodes[node].constraint - && dfa->edests[node].nelem - && !dfa->nodes[dfa->edests[node].elems[0]].duplicated) - { - err = duplicate_node_closure (dfa, node, node, node, - dfa->nodes[node].constraint); - if (BE (err != REG_NOERROR, 0)) - return err; - } - - /* Expand each epsilon destination nodes. */ - if (IS_EPSILON_NODE(dfa->nodes[node].type)) - for (i = 0; i < dfa->edests[node].nelem; ++i) - { - re_node_set eclosure_elem; - int edest = dfa->edests[node].elems[i]; - /* If calculating the epsilon closure of `edest' is in progress, - return intermediate result. */ - if (dfa->eclosures[edest].nelem == -1) - { - incomplete = 1; - continue; - } - /* If we haven't calculated the epsilon closure of `edest' yet, - calculate now. Otherwise use calculated epsilon closure. */ - if (dfa->eclosures[edest].nelem == 0) - { - err = calc_eclosure_iter (&eclosure_elem, dfa, edest, 0); - if (BE (err != REG_NOERROR, 0)) - return err; - } - else - eclosure_elem = dfa->eclosures[edest]; - /* Merge the epsilon closure of `edest'. */ - err = re_node_set_merge (&eclosure, &eclosure_elem); - if (BE (err != REG_NOERROR, 0)) - return err; - /* If the epsilon closure of `edest' is incomplete, - the epsilon closure of this node is also incomplete. */ - if (dfa->eclosures[edest].nelem == 0) - { - incomplete = 1; - re_node_set_free (&eclosure_elem); - } - } - - /* An epsilon closure includes itself. */ - ret = re_node_set_insert (&eclosure, node); - if (BE (ret < 0, 0)) - return REG_ESPACE; - if (incomplete && !root) - dfa->eclosures[node].nelem = 0; - else - dfa->eclosures[node] = eclosure; - *new_set = eclosure; - return REG_NOERROR; -} - -/* Functions for token which are used in the parser. */ - -/* Fetch a token from INPUT. - We must not use this function inside bracket expressions. */ - -static void -internal_function -fetch_token (re_token_t *result, re_string_t *input, reg_syntax_t syntax) -{ - re_string_skip_bytes (input, peek_token (result, input, syntax)); -} - -/* Peek a token from INPUT, and return the length of the token. - We must not use this function inside bracket expressions. */ - -static int -internal_function -peek_token (re_token_t *token, re_string_t *input, reg_syntax_t syntax) -{ - unsigned char c; - - if (re_string_eoi (input)) - { - token->type = END_OF_RE; - return 0; - } - - c = re_string_peek_byte (input, 0); - token->opr.c = c; - - token->word_char = 0; -#ifdef RE_ENABLE_I18N - token->mb_partial = 0; - if (input->mb_cur_max > 1 && - !re_string_first_byte (input, re_string_cur_idx (input))) - { - token->type = CHARACTER; - token->mb_partial = 1; - return 1; - } -#endif - if (c == '\\') - { - unsigned char c2; - if (re_string_cur_idx (input) + 1 >= re_string_length (input)) - { - token->type = BACK_SLASH; - return 1; - } - - c2 = re_string_peek_byte_case (input, 1); - token->opr.c = c2; - token->type = CHARACTER; -#ifdef RE_ENABLE_I18N - if (input->mb_cur_max > 1) - { - wint_t wc = re_string_wchar_at (input, - re_string_cur_idx (input) + 1); - token->word_char = IS_WIDE_WORD_CHAR (wc) != 0; - } - else -#endif - token->word_char = IS_WORD_CHAR (c2) != 0; - - switch (c2) - { - case '|': - if (!(syntax & RE_LIMITED_OPS) && !(syntax & RE_NO_BK_VBAR)) - token->type = OP_ALT; - break; - case '1': case '2': case '3': case '4': case '5': - case '6': case '7': case '8': case '9': - if (!(syntax & RE_NO_BK_REFS)) - { - token->type = OP_BACK_REF; - token->opr.idx = c2 - '1'; - } - break; - case '<': - if (!(syntax & RE_NO_GNU_OPS)) - { - token->type = ANCHOR; - token->opr.ctx_type = WORD_FIRST; - } - break; - case '>': - if (!(syntax & RE_NO_GNU_OPS)) - { - token->type = ANCHOR; - token->opr.ctx_type = WORD_LAST; - } - break; - case 'b': - if (!(syntax & RE_NO_GNU_OPS)) - { - token->type = ANCHOR; - token->opr.ctx_type = WORD_DELIM; - } - break; - case 'B': - if (!(syntax & RE_NO_GNU_OPS)) - { - token->type = ANCHOR; - token->opr.ctx_type = NOT_WORD_DELIM; - } - break; - case 'w': - if (!(syntax & RE_NO_GNU_OPS)) - token->type = OP_WORD; - break; - case 'W': - if (!(syntax & RE_NO_GNU_OPS)) - token->type = OP_NOTWORD; - break; - case 's': - if (!(syntax & RE_NO_GNU_OPS)) - token->type = OP_SPACE; - break; - case 'S': - if (!(syntax & RE_NO_GNU_OPS)) - token->type = OP_NOTSPACE; - break; - case '`': - if (!(syntax & RE_NO_GNU_OPS)) - { - token->type = ANCHOR; - token->opr.ctx_type = BUF_FIRST; - } - break; - case '\'': - if (!(syntax & RE_NO_GNU_OPS)) - { - token->type = ANCHOR; - token->opr.ctx_type = BUF_LAST; - } - break; - case '(': - if (!(syntax & RE_NO_BK_PARENS)) - token->type = OP_OPEN_SUBEXP; - break; - case ')': - if (!(syntax & RE_NO_BK_PARENS)) - token->type = OP_CLOSE_SUBEXP; - break; - case '+': - if (!(syntax & RE_LIMITED_OPS) && (syntax & RE_BK_PLUS_QM)) - token->type = OP_DUP_PLUS; - break; - case '?': - if (!(syntax & RE_LIMITED_OPS) && (syntax & RE_BK_PLUS_QM)) - token->type = OP_DUP_QUESTION; - break; - case '{': - if ((syntax & RE_INTERVALS) && (!(syntax & RE_NO_BK_BRACES))) - token->type = OP_OPEN_DUP_NUM; - break; - case '}': - if ((syntax & RE_INTERVALS) && (!(syntax & RE_NO_BK_BRACES))) - token->type = OP_CLOSE_DUP_NUM; - break; - default: - break; - } - return 2; - } - - token->type = CHARACTER; -#ifdef RE_ENABLE_I18N - if (input->mb_cur_max > 1) - { - wint_t wc = re_string_wchar_at (input, re_string_cur_idx (input)); - token->word_char = IS_WIDE_WORD_CHAR (wc) != 0; - } - else -#endif - token->word_char = IS_WORD_CHAR (token->opr.c); - - switch (c) - { - case '\n': - if (syntax & RE_NEWLINE_ALT) - token->type = OP_ALT; - break; - case '|': - if (!(syntax & RE_LIMITED_OPS) && (syntax & RE_NO_BK_VBAR)) - token->type = OP_ALT; - break; - case '*': - token->type = OP_DUP_ASTERISK; - break; - case '+': - if (!(syntax & RE_LIMITED_OPS) && !(syntax & RE_BK_PLUS_QM)) - token->type = OP_DUP_PLUS; - break; - case '?': - if (!(syntax & RE_LIMITED_OPS) && !(syntax & RE_BK_PLUS_QM)) - token->type = OP_DUP_QUESTION; - break; - case '{': - if ((syntax & RE_INTERVALS) && (syntax & RE_NO_BK_BRACES)) - token->type = OP_OPEN_DUP_NUM; - break; - case '}': - if ((syntax & RE_INTERVALS) && (syntax & RE_NO_BK_BRACES)) - token->type = OP_CLOSE_DUP_NUM; - break; - case '(': - if (syntax & RE_NO_BK_PARENS) - token->type = OP_OPEN_SUBEXP; - break; - case ')': - if (syntax & RE_NO_BK_PARENS) - token->type = OP_CLOSE_SUBEXP; - break; - case '[': - token->type = OP_OPEN_BRACKET; - break; - case '.': - token->type = OP_PERIOD; - break; - case '^': - if (!(syntax & (RE_CONTEXT_INDEP_ANCHORS | RE_CARET_ANCHORS_HERE)) && - re_string_cur_idx (input) != 0) - { - char prev = re_string_peek_byte (input, -1); - if (!(syntax & RE_NEWLINE_ALT) || prev != '\n') - break; - } - token->type = ANCHOR; - token->opr.ctx_type = LINE_FIRST; - break; - case '$': - if (!(syntax & RE_CONTEXT_INDEP_ANCHORS) && - re_string_cur_idx (input) + 1 != re_string_length (input)) - { - re_token_t next; - re_string_skip_bytes (input, 1); - peek_token (&next, input, syntax); - re_string_skip_bytes (input, -1); - if (next.type != OP_ALT && next.type != OP_CLOSE_SUBEXP) - break; - } - token->type = ANCHOR; - token->opr.ctx_type = LINE_LAST; - break; - default: - break; - } - return 1; -} - -/* Peek a token from INPUT, and return the length of the token. - We must not use this function out of bracket expressions. */ - -static int -internal_function -peek_token_bracket (re_token_t *token, re_string_t *input, reg_syntax_t syntax) -{ - unsigned char c; - if (re_string_eoi (input)) - { - token->type = END_OF_RE; - return 0; - } - c = re_string_peek_byte (input, 0); - token->opr.c = c; - -#ifdef RE_ENABLE_I18N - if (input->mb_cur_max > 1 && - !re_string_first_byte (input, re_string_cur_idx (input))) - { - token->type = CHARACTER; - return 1; - } -#endif /* RE_ENABLE_I18N */ - - if (c == '\\' && (syntax & RE_BACKSLASH_ESCAPE_IN_LISTS) - && re_string_cur_idx (input) + 1 < re_string_length (input)) - { - /* In this case, '\' escape a character. */ - unsigned char c2; - re_string_skip_bytes (input, 1); - c2 = re_string_peek_byte (input, 0); - token->opr.c = c2; - token->type = CHARACTER; - return 1; - } - if (c == '[') /* '[' is a special char in a bracket exps. */ - { - unsigned char c2; - int token_len; - if (re_string_cur_idx (input) + 1 < re_string_length (input)) - c2 = re_string_peek_byte (input, 1); - else - c2 = 0; - token->opr.c = c2; - token_len = 2; - switch (c2) - { - case '.': - token->type = OP_OPEN_COLL_ELEM; - break; - case '=': - token->type = OP_OPEN_EQUIV_CLASS; - break; - case ':': - if (syntax & RE_CHAR_CLASSES) - { - token->type = OP_OPEN_CHAR_CLASS; - break; - } - /* else fall through. */ - default: - token->type = CHARACTER; - token->opr.c = c; - token_len = 1; - break; - } - return token_len; - } - switch (c) - { - case '-': - token->type = OP_CHARSET_RANGE; - break; - case ']': - token->type = OP_CLOSE_BRACKET; - break; - case '^': - token->type = OP_NON_MATCH_LIST; - break; - default: - token->type = CHARACTER; - } - return 1; -} - -/* Functions for parser. */ - -/* Entry point of the parser. - Parse the regular expression REGEXP and return the structure tree. - If an error is occured, ERR is set by error code, and return NULL. - This function build the following tree, from regular expression : - CAT - / \ - / \ - EOR - - CAT means concatenation. - EOR means end of regular expression. */ - -static bin_tree_t * -parse (re_string_t *regexp, regex_t *preg, reg_syntax_t syntax, - reg_errcode_t *err) -{ - re_dfa_t *dfa = (re_dfa_t *) preg->buffer; - bin_tree_t *tree, *eor, *root; - re_token_t current_token; - dfa->syntax = syntax; - fetch_token (¤t_token, regexp, syntax | RE_CARET_ANCHORS_HERE); - tree = parse_reg_exp (regexp, preg, ¤t_token, syntax, 0, err); - if (BE (*err != REG_NOERROR && tree == NULL, 0)) - return NULL; - eor = create_tree (dfa, NULL, NULL, END_OF_RE); - if (tree != NULL) - root = create_tree (dfa, tree, eor, CONCAT); - else - root = eor; - if (BE (eor == NULL || root == NULL, 0)) - { - *err = REG_ESPACE; - return NULL; - } - return root; -} - -/* This function build the following tree, from regular expression - |: - ALT - / \ - / \ - - - ALT means alternative, which represents the operator `|'. */ - -static bin_tree_t * -parse_reg_exp (re_string_t *regexp, regex_t *preg, re_token_t *token, - reg_syntax_t syntax, int nest, reg_errcode_t *err) -{ - re_dfa_t *dfa = (re_dfa_t *) preg->buffer; - bin_tree_t *tree, *branch = NULL; - tree = parse_branch (regexp, preg, token, syntax, nest, err); - if (BE (*err != REG_NOERROR && tree == NULL, 0)) - return NULL; - - while (token->type == OP_ALT) - { - fetch_token (token, regexp, syntax | RE_CARET_ANCHORS_HERE); - if (token->type != OP_ALT && token->type != END_OF_RE - && (nest == 0 || token->type != OP_CLOSE_SUBEXP)) - { - branch = parse_branch (regexp, preg, token, syntax, nest, err); - if (BE (*err != REG_NOERROR && branch == NULL, 0)) - return NULL; - } - else - branch = NULL; - tree = create_tree (dfa, tree, branch, OP_ALT); - if (BE (tree == NULL, 0)) - { - *err = REG_ESPACE; - return NULL; - } - } - return tree; -} - -/* This function build the following tree, from regular expression - : - CAT - / \ - / \ - - - CAT means concatenation. */ - -static bin_tree_t * -parse_branch (re_string_t *regexp, regex_t *preg, re_token_t *token, - reg_syntax_t syntax, int nest, reg_errcode_t *err) -{ - bin_tree_t *tree, *exp; - re_dfa_t *dfa = (re_dfa_t *) preg->buffer; - tree = parse_expression (regexp, preg, token, syntax, nest, err); - if (BE (*err != REG_NOERROR && tree == NULL, 0)) - return NULL; - - while (token->type != OP_ALT && token->type != END_OF_RE - && (nest == 0 || token->type != OP_CLOSE_SUBEXP)) - { - exp = parse_expression (regexp, preg, token, syntax, nest, err); - if (BE (*err != REG_NOERROR && exp == NULL, 0)) - { - return NULL; - } - if (tree != NULL && exp != NULL) - { - tree = create_tree (dfa, tree, exp, CONCAT); - if (tree == NULL) - { - *err = REG_ESPACE; - return NULL; - } - } - else if (tree == NULL) - tree = exp; - /* Otherwise exp == NULL, we don't need to create new tree. */ - } - return tree; -} - -/* This function build the following tree, from regular expression a*: - * - | - a -*/ - -static bin_tree_t * -parse_expression (re_string_t *regexp, regex_t *preg, re_token_t *token, - reg_syntax_t syntax, int nest, reg_errcode_t *err) -{ - re_dfa_t *dfa = (re_dfa_t *) preg->buffer; - bin_tree_t *tree; - switch (token->type) - { - case CHARACTER: - tree = create_token_tree (dfa, NULL, NULL, token); - if (BE (tree == NULL, 0)) - { - *err = REG_ESPACE; - return NULL; - } -#ifdef RE_ENABLE_I18N - if (dfa->mb_cur_max > 1) - { - while (!re_string_eoi (regexp) - && !re_string_first_byte (regexp, re_string_cur_idx (regexp))) - { - bin_tree_t *mbc_remain; - fetch_token (token, regexp, syntax); - mbc_remain = create_token_tree (dfa, NULL, NULL, token); - tree = create_tree (dfa, tree, mbc_remain, CONCAT); - if (BE (mbc_remain == NULL || tree == NULL, 0)) - { - *err = REG_ESPACE; - return NULL; - } - } - } -#endif - break; - case OP_OPEN_SUBEXP: - tree = parse_sub_exp (regexp, preg, token, syntax, nest + 1, err); - if (BE (*err != REG_NOERROR && tree == NULL, 0)) - return NULL; - break; - case OP_OPEN_BRACKET: - tree = parse_bracket_exp (regexp, dfa, token, syntax, err); - if (BE (*err != REG_NOERROR && tree == NULL, 0)) - return NULL; - break; - case OP_BACK_REF: - if (!BE (dfa->completed_bkref_map & (1 << token->opr.idx), 1)) - { - *err = REG_ESUBREG; - return NULL; - } - dfa->used_bkref_map |= 1 << token->opr.idx; - tree = create_token_tree (dfa, NULL, NULL, token); - if (BE (tree == NULL, 0)) - { - *err = REG_ESPACE; - return NULL; - } - ++dfa->nbackref; - dfa->has_mb_node = 1; - break; - case OP_OPEN_DUP_NUM: - if (syntax & RE_CONTEXT_INVALID_DUP) - { - *err = REG_BADRPT; - return NULL; - } - /* FALLTHROUGH */ - case OP_DUP_ASTERISK: - case OP_DUP_PLUS: - case OP_DUP_QUESTION: - if (syntax & RE_CONTEXT_INVALID_OPS) - { - *err = REG_BADRPT; - return NULL; - } - else if (syntax & RE_CONTEXT_INDEP_OPS) - { - fetch_token (token, regexp, syntax); - return parse_expression (regexp, preg, token, syntax, nest, err); - } - /* else fall through */ - case OP_CLOSE_SUBEXP: - if ((token->type == OP_CLOSE_SUBEXP) && - !(syntax & RE_UNMATCHED_RIGHT_PAREN_ORD)) - { - *err = REG_ERPAREN; - return NULL; - } - /* else fall through */ - case OP_CLOSE_DUP_NUM: - /* We treat it as a normal character. */ - - /* Then we can these characters as normal characters. */ - token->type = CHARACTER; - /* mb_partial and word_char bits should be initialized already - by peek_token. */ - tree = create_token_tree (dfa, NULL, NULL, token); - if (BE (tree == NULL, 0)) - { - *err = REG_ESPACE; - return NULL; - } - break; - case ANCHOR: - if ((token->opr.ctx_type - & (WORD_DELIM | NOT_WORD_DELIM | WORD_FIRST | WORD_LAST)) - && dfa->word_ops_used == 0) - init_word_char (dfa); - if (token->opr.ctx_type == WORD_DELIM - || token->opr.ctx_type == NOT_WORD_DELIM) - { - bin_tree_t *tree_first, *tree_last; - if (token->opr.ctx_type == WORD_DELIM) - { - token->opr.ctx_type = WORD_FIRST; - tree_first = create_token_tree (dfa, NULL, NULL, token); - token->opr.ctx_type = WORD_LAST; - } - else - { - token->opr.ctx_type = INSIDE_WORD; - tree_first = create_token_tree (dfa, NULL, NULL, token); - token->opr.ctx_type = INSIDE_NOTWORD; - } - tree_last = create_token_tree (dfa, NULL, NULL, token); - tree = create_tree (dfa, tree_first, tree_last, OP_ALT); - if (BE (tree_first == NULL || tree_last == NULL || tree == NULL, 0)) - { - *err = REG_ESPACE; - return NULL; - } - } - else - { - tree = create_token_tree (dfa, NULL, NULL, token); - if (BE (tree == NULL, 0)) - { - *err = REG_ESPACE; - return NULL; - } - } - /* We must return here, since ANCHORs can't be followed - by repetition operators. - eg. RE"^*" is invalid or "", - it must not be "". */ - fetch_token (token, regexp, syntax); - return tree; - case OP_PERIOD: - tree = create_token_tree (dfa, NULL, NULL, token); - if (BE (tree == NULL, 0)) - { - *err = REG_ESPACE; - return NULL; - } - if (dfa->mb_cur_max > 1) - dfa->has_mb_node = 1; - break; - case OP_WORD: - case OP_NOTWORD: - tree = build_charclass_op (dfa, regexp->trans, - "alnum", - "_", - token->type == OP_NOTWORD, err); - if (BE (*err != REG_NOERROR && tree == NULL, 0)) - return NULL; - break; - case OP_SPACE: - case OP_NOTSPACE: - tree = build_charclass_op (dfa, regexp->trans, - "space", - "", - token->type == OP_NOTSPACE, err); - if (BE (*err != REG_NOERROR && tree == NULL, 0)) - return NULL; - break; - case OP_ALT: - case END_OF_RE: - return NULL; - case BACK_SLASH: - *err = REG_EESCAPE; - return NULL; - default: - /* Must not happen? */ -#ifdef DEBUG - assert (0); -#endif - return NULL; - } - fetch_token (token, regexp, syntax); - - while (token->type == OP_DUP_ASTERISK || token->type == OP_DUP_PLUS - || token->type == OP_DUP_QUESTION || token->type == OP_OPEN_DUP_NUM) - { - tree = parse_dup_op (tree, regexp, dfa, token, syntax, err); - if (BE (*err != REG_NOERROR && tree == NULL, 0)) - return NULL; - /* In BRE consecutive duplications are not allowed. */ - if ((syntax & RE_CONTEXT_INVALID_DUP) - && (token->type == OP_DUP_ASTERISK - || token->type == OP_OPEN_DUP_NUM)) - { - *err = REG_BADRPT; - return NULL; - } - } - - return tree; -} - -/* This function build the following tree, from regular expression - (): - SUBEXP - | - -*/ - -static bin_tree_t * -parse_sub_exp (re_string_t *regexp, regex_t *preg, re_token_t *token, - reg_syntax_t syntax, int nest, reg_errcode_t *err) -{ - re_dfa_t *dfa = (re_dfa_t *) preg->buffer; - bin_tree_t *tree; - size_t cur_nsub; - cur_nsub = preg->re_nsub++; - - fetch_token (token, regexp, syntax | RE_CARET_ANCHORS_HERE); - - /* The subexpression may be a null string. */ - if (token->type == OP_CLOSE_SUBEXP) - tree = NULL; - else - { - tree = parse_reg_exp (regexp, preg, token, syntax, nest, err); - if (BE (*err == REG_NOERROR && token->type != OP_CLOSE_SUBEXP, 0)) - *err = REG_EPAREN; - if (BE (*err != REG_NOERROR, 0)) - return NULL; - } - - if (cur_nsub <= '9' - '1') - dfa->completed_bkref_map |= 1 << cur_nsub; - - tree = create_tree (dfa, tree, NULL, SUBEXP); - if (BE (tree == NULL, 0)) - { - *err = REG_ESPACE; - return NULL; - } - tree->token.opr.idx = cur_nsub; - return tree; -} - -/* This function parse repetition operators like "*", "+", "{1,3}" etc. */ - -static bin_tree_t * -parse_dup_op (bin_tree_t *elem, re_string_t *regexp, re_dfa_t *dfa, - re_token_t *token, reg_syntax_t syntax, reg_errcode_t *err) -{ - bin_tree_t *tree = NULL, *old_tree = NULL; - int i, start, end, start_idx = re_string_cur_idx (regexp); -#ifndef RE_TOKEN_INIT_BUG - re_token_t start_token = *token; -#else - re_token_t start_token; - - memcpy ((void *) &start_token, (void *) token, sizeof start_token); -#endif - - if (token->type == OP_OPEN_DUP_NUM) - { - end = 0; - start = fetch_number (regexp, token, syntax); - if (start == -1) - { - if (token->type == CHARACTER && token->opr.c == ',') - start = 0; /* We treat "{,m}" as "{0,m}". */ - else - { - *err = REG_BADBR; /* {} is invalid. */ - return NULL; - } - } - if (BE (start != -2, 1)) - { - /* We treat "{n}" as "{n,n}". */ - end = ((token->type == OP_CLOSE_DUP_NUM) ? start - : ((token->type == CHARACTER && token->opr.c == ',') - ? fetch_number (regexp, token, syntax) : -2)); - } - if (BE (start == -2 || end == -2, 0)) - { - /* Invalid sequence. */ - if (BE (!(syntax & RE_INVALID_INTERVAL_ORD), 0)) - { - if (token->type == END_OF_RE) - *err = REG_EBRACE; - else - *err = REG_BADBR; - - return NULL; - } - - /* If the syntax bit is set, rollback. */ - re_string_set_index (regexp, start_idx); - *token = start_token; - token->type = CHARACTER; - /* mb_partial and word_char bits should be already initialized by - peek_token. */ - return elem; - } - - if (BE ((end != -1 && start > end) || token->type != OP_CLOSE_DUP_NUM, 0)) - { - /* First number greater than second. */ - *err = REG_BADBR; - return NULL; - } - } - else - { - start = (token->type == OP_DUP_PLUS) ? 1 : 0; - end = (token->type == OP_DUP_QUESTION) ? 1 : -1; - } - - fetch_token (token, regexp, syntax); - - if (BE (elem == NULL, 0)) - return NULL; - if (BE (start == 0 && end == 0, 0)) - { - postorder (elem, free_tree, NULL); - return NULL; - } - - /* Extract "{n,m}" to "...{0,}". */ - if (BE (start > 0, 0)) - { - tree = elem; - for (i = 2; i <= start; ++i) - { - elem = duplicate_tree (elem, dfa); - tree = create_tree (dfa, tree, elem, CONCAT); - if (BE (elem == NULL || tree == NULL, 0)) - goto parse_dup_op_espace; - } - - if (start == end) - return tree; - - /* Duplicate ELEM before it is marked optional. */ - elem = duplicate_tree (elem, dfa); - old_tree = tree; - } - else - old_tree = NULL; - - if (elem->token.type == SUBEXP) - postorder (elem, mark_opt_subexp, (void *) (long) elem->token.opr.idx); - - tree = create_tree (dfa, elem, NULL, (end == -1 ? OP_DUP_ASTERISK : OP_ALT)); - if (BE (tree == NULL, 0)) - goto parse_dup_op_espace; - - /* This loop is actually executed only when end != -1, - to rewrite {0,n} as ((...?)?)?... We have - already created the start+1-th copy. */ - for (i = start + 2; i <= end; ++i) - { - elem = duplicate_tree (elem, dfa); - tree = create_tree (dfa, tree, elem, CONCAT); - if (BE (elem == NULL || tree == NULL, 0)) - goto parse_dup_op_espace; - - tree = create_tree (dfa, tree, NULL, OP_ALT); - if (BE (tree == NULL, 0)) - goto parse_dup_op_espace; - } - - if (old_tree) - tree = create_tree (dfa, old_tree, tree, CONCAT); - - return tree; - - parse_dup_op_espace: - *err = REG_ESPACE; - return NULL; -} - -/* Size of the names for collating symbol/equivalence_class/character_class. - I'm not sure, but maybe enough. */ -#define BRACKET_NAME_BUF_SIZE 32 - -#ifndef _LIBC - /* Local function for parse_bracket_exp only used in case of NOT _LIBC. - Build the range expression which starts from START_ELEM, and ends - at END_ELEM. The result are written to MBCSET and SBCSET. - RANGE_ALLOC is the allocated size of mbcset->range_starts, and - mbcset->range_ends, is a pointer argument sinse we may - update it. */ - -static reg_errcode_t -internal_function -# ifdef RE_ENABLE_I18N -build_range_exp (bitset_t sbcset, re_charset_t *mbcset, int *range_alloc, - bracket_elem_t *start_elem, bracket_elem_t *end_elem) -# else /* not RE_ENABLE_I18N */ -build_range_exp (bitset_t sbcset, bracket_elem_t *start_elem, - bracket_elem_t *end_elem) -# endif /* not RE_ENABLE_I18N */ -{ - unsigned int start_ch, end_ch; - /* Equivalence Classes and Character Classes can't be a range start/end. */ - if (BE (start_elem->type == EQUIV_CLASS || start_elem->type == CHAR_CLASS - || end_elem->type == EQUIV_CLASS || end_elem->type == CHAR_CLASS, - 0)) - return REG_ERANGE; - - /* We can handle no multi character collating elements without libc - support. */ - if (BE ((start_elem->type == COLL_SYM - && strlen ((char *) start_elem->opr.name) > 1) - || (end_elem->type == COLL_SYM - && strlen ((char *) end_elem->opr.name) > 1), 0)) - return REG_ECOLLATE; - -# ifdef RE_ENABLE_I18N - { - wchar_t wc; - wint_t start_wc; - wint_t end_wc; - wchar_t cmp_buf[6] = {L'\0', L'\0', L'\0', L'\0', L'\0', L'\0'}; - - start_ch = ((start_elem->type == SB_CHAR) ? start_elem->opr.ch - : ((start_elem->type == COLL_SYM) ? start_elem->opr.name[0] - : 0)); - end_ch = ((end_elem->type == SB_CHAR) ? end_elem->opr.ch - : ((end_elem->type == COLL_SYM) ? end_elem->opr.name[0] - : 0)); -#ifdef GAWK - /* - * Fedora Core 2, maybe others, have broken `btowc' that returns -1 - * for any value > 127. Sigh. Note that `start_ch' and `end_ch' are - * unsigned, so we don't have sign extension problems. - */ - start_wc = ((start_elem->type == SB_CHAR || start_elem->type == COLL_SYM) - ? start_ch : start_elem->opr.wch); - end_wc = ((end_elem->type == SB_CHAR || end_elem->type == COLL_SYM) - ? end_ch : end_elem->opr.wch); -#else - start_wc = ((start_elem->type == SB_CHAR || start_elem->type == COLL_SYM) - ? __btowc (start_ch) : start_elem->opr.wch); - end_wc = ((end_elem->type == SB_CHAR || end_elem->type == COLL_SYM) - ? __btowc (end_ch) : end_elem->opr.wch); -#endif - if (start_wc == WEOF || end_wc == WEOF) - return REG_ECOLLATE; - cmp_buf[0] = start_wc; - cmp_buf[4] = end_wc; - if (wcscoll (cmp_buf, cmp_buf + 4) > 0) - return REG_ERANGE; - - /* Got valid collation sequence values, add them as a new entry. - However, for !_LIBC we have no collation elements: if the - character set is single byte, the single byte character set - that we build below suffices. parse_bracket_exp passes - no MBCSET if dfa->mb_cur_max == 1. */ - if (mbcset) - { - /* Check the space of the arrays. */ - if (BE (*range_alloc == mbcset->nranges, 0)) - { - /* There is not enough space, need realloc. */ - wchar_t *new_array_start, *new_array_end; - int new_nranges; - - /* +1 in case of mbcset->nranges is 0. */ - new_nranges = 2 * mbcset->nranges + 1; - /* Use realloc since mbcset->range_starts and mbcset->range_ends - are NULL if *range_alloc == 0. */ - new_array_start = re_realloc (mbcset->range_starts, wchar_t, - new_nranges); - new_array_end = re_realloc (mbcset->range_ends, wchar_t, - new_nranges); - - if (BE (new_array_start == NULL || new_array_end == NULL, 0)) - return REG_ESPACE; - - mbcset->range_starts = new_array_start; - mbcset->range_ends = new_array_end; - *range_alloc = new_nranges; - } - - mbcset->range_starts[mbcset->nranges] = start_wc; - mbcset->range_ends[mbcset->nranges++] = end_wc; - } - - /* Build the table for single byte characters. */ - for (wc = 0; wc < SBC_MAX; ++wc) - { - cmp_buf[2] = wc; - if (wcscoll (cmp_buf, cmp_buf + 2) <= 0 - && wcscoll (cmp_buf + 2, cmp_buf + 4) <= 0) - bitset_set (sbcset, wc); - } - } -# else /* not RE_ENABLE_I18N */ - { - unsigned int ch; - start_ch = ((start_elem->type == SB_CHAR ) ? start_elem->opr.ch - : ((start_elem->type == COLL_SYM) ? start_elem->opr.name[0] - : 0)); - end_ch = ((end_elem->type == SB_CHAR ) ? end_elem->opr.ch - : ((end_elem->type == COLL_SYM) ? end_elem->opr.name[0] - : 0)); - if (start_ch > end_ch) - return REG_ERANGE; - /* Build the table for single byte characters. */ - for (ch = 0; ch < SBC_MAX; ++ch) - if (start_ch <= ch && ch <= end_ch) - bitset_set (sbcset, ch); - } -# endif /* not RE_ENABLE_I18N */ - return REG_NOERROR; -} -#endif /* not _LIBC */ - -#ifndef _LIBC -/* Helper function for parse_bracket_exp only used in case of NOT _LIBC.. - Build the collating element which is represented by NAME. - The result are written to MBCSET and SBCSET. - COLL_SYM_ALLOC is the allocated size of mbcset->coll_sym, is a - pointer argument since we may update it. */ - -static reg_errcode_t -internal_function -# ifdef RE_ENABLE_I18N -build_collating_symbol (bitset_t sbcset, re_charset_t *mbcset, - int *coll_sym_alloc, const unsigned char *name) -# else /* not RE_ENABLE_I18N */ -build_collating_symbol (bitset_t sbcset, const unsigned char *name) -# endif /* not RE_ENABLE_I18N */ -{ - size_t name_len = strlen ((const char *) name); - if (BE (name_len != 1, 0)) - return REG_ECOLLATE; - else - { - bitset_set (sbcset, name[0]); - return REG_NOERROR; - } -} -#endif /* not _LIBC */ - -/* This function parse bracket expression like "[abc]", "[a-c]", - "[[.a-a.]]" etc. */ - -static bin_tree_t * -parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token, - reg_syntax_t syntax, reg_errcode_t *err) -{ -#ifdef _LIBC - const unsigned char *collseqmb; - const char *collseqwc; - uint32_t nrules; - int32_t table_size; - const int32_t *symb_table; - const unsigned char *extra; - - /* Local function for parse_bracket_exp used in _LIBC environement. - Seek the collating symbol entry correspondings to NAME. - Return the index of the symbol in the SYMB_TABLE. */ - - auto inline int32_t - __attribute ((always_inline)) - seek_collating_symbol_entry (name, name_len) - const unsigned char *name; - size_t name_len; - { - int32_t hash = elem_hash ((const char *) name, name_len); - int32_t elem = hash % table_size; - if (symb_table[2 * elem] != 0) - { - int32_t second = hash % (table_size - 2) + 1; - - do - { - /* First compare the hashing value. */ - if (symb_table[2 * elem] == hash - /* Compare the length of the name. */ - && name_len == extra[symb_table[2 * elem + 1]] - /* Compare the name. */ - && memcmp (name, &extra[symb_table[2 * elem + 1] + 1], - name_len) == 0) - { - /* Yep, this is the entry. */ - break; - } - - /* Next entry. */ - elem += second; - } - while (symb_table[2 * elem] != 0); - } - return elem; - } - - /* Local function for parse_bracket_exp used in _LIBC environment. - Look up the collation sequence value of BR_ELEM. - Return the value if succeeded, UINT_MAX otherwise. */ - - auto inline unsigned int - __attribute ((always_inline)) - lookup_collation_sequence_value (br_elem) - bracket_elem_t *br_elem; - { - if (br_elem->type == SB_CHAR) - { - /* - if (MB_CUR_MAX == 1) - */ - if (nrules == 0) - return collseqmb[br_elem->opr.ch]; - else - { - wint_t wc = __btowc (br_elem->opr.ch); - return __collseq_table_lookup (collseqwc, wc); - } - } - else if (br_elem->type == MB_CHAR) - { - if (nrules != 0) - return __collseq_table_lookup (collseqwc, br_elem->opr.wch); - } - else if (br_elem->type == COLL_SYM) - { - size_t sym_name_len = strlen ((char *) br_elem->opr.name); - if (nrules != 0) - { - int32_t elem, idx; - elem = seek_collating_symbol_entry (br_elem->opr.name, - sym_name_len); - if (symb_table[2 * elem] != 0) - { - /* We found the entry. */ - idx = symb_table[2 * elem + 1]; - /* Skip the name of collating element name. */ - idx += 1 + extra[idx]; - /* Skip the byte sequence of the collating element. */ - idx += 1 + extra[idx]; - /* Adjust for the alignment. */ - idx = (idx + 3) & ~3; - /* Skip the multibyte collation sequence value. */ - idx += sizeof (unsigned int); - /* Skip the wide char sequence of the collating element. */ - idx += sizeof (unsigned int) * - (1 + *(unsigned int *) (extra + idx)); - /* Return the collation sequence value. */ - return *(unsigned int *) (extra + idx); - } - else if (symb_table[2 * elem] == 0 && sym_name_len == 1) - { - /* No valid character. Match it as a single byte - character. */ - return collseqmb[br_elem->opr.name[0]]; - } - } - else if (sym_name_len == 1) - return collseqmb[br_elem->opr.name[0]]; - } - return UINT_MAX; - } - - /* Local function for parse_bracket_exp used in _LIBC environement. - Build the range expression which starts from START_ELEM, and ends - at END_ELEM. The result are written to MBCSET and SBCSET. - RANGE_ALLOC is the allocated size of mbcset->range_starts, and - mbcset->range_ends, is a pointer argument sinse we may - update it. */ - - auto inline reg_errcode_t - __attribute ((always_inline)) - build_range_exp (sbcset, mbcset, range_alloc, start_elem, end_elem) - re_charset_t *mbcset; - int *range_alloc; - bitset_t sbcset; - bracket_elem_t *start_elem, *end_elem; - { - unsigned int ch; - uint32_t start_collseq; - uint32_t end_collseq; - - /* Equivalence Classes and Character Classes can't be a range - start/end. */ - if (BE (start_elem->type == EQUIV_CLASS || start_elem->type == CHAR_CLASS - || end_elem->type == EQUIV_CLASS || end_elem->type == CHAR_CLASS, - 0)) - return REG_ERANGE; - - start_collseq = lookup_collation_sequence_value (start_elem); - end_collseq = lookup_collation_sequence_value (end_elem); - /* Check start/end collation sequence values. */ - if (BE (start_collseq == UINT_MAX || end_collseq == UINT_MAX, 0)) - return REG_ECOLLATE; - if (BE ((syntax & RE_NO_EMPTY_RANGES) && start_collseq > end_collseq, 0)) - return REG_ERANGE; - - /* Got valid collation sequence values, add them as a new entry. - However, if we have no collation elements, and the character set - is single byte, the single byte character set that we - build below suffices. */ - if (nrules > 0 || dfa->mb_cur_max > 1) - { - /* Check the space of the arrays. */ - if (BE (*range_alloc == mbcset->nranges, 0)) - { - /* There is not enough space, need realloc. */ - uint32_t *new_array_start; - uint32_t *new_array_end; - int new_nranges; - - /* +1 in case of mbcset->nranges is 0. */ - new_nranges = 2 * mbcset->nranges + 1; - new_array_start = re_realloc (mbcset->range_starts, uint32_t, - new_nranges); - new_array_end = re_realloc (mbcset->range_ends, uint32_t, - new_nranges); - - if (BE (new_array_start == NULL || new_array_end == NULL, 0)) - return REG_ESPACE; - - mbcset->range_starts = new_array_start; - mbcset->range_ends = new_array_end; - *range_alloc = new_nranges; - } - - mbcset->range_starts[mbcset->nranges] = start_collseq; - mbcset->range_ends[mbcset->nranges++] = end_collseq; - } - - /* Build the table for single byte characters. */ - for (ch = 0; ch < SBC_MAX; ch++) - { - uint32_t ch_collseq; - /* - if (MB_CUR_MAX == 1) - */ - if (nrules == 0) - ch_collseq = collseqmb[ch]; - else - ch_collseq = __collseq_table_lookup (collseqwc, __btowc (ch)); - if (start_collseq <= ch_collseq && ch_collseq <= end_collseq) - bitset_set (sbcset, ch); - } - return REG_NOERROR; - } - - /* Local function for parse_bracket_exp used in _LIBC environement. - Build the collating element which is represented by NAME. - The result are written to MBCSET and SBCSET. - COLL_SYM_ALLOC is the allocated size of mbcset->coll_sym, is a - pointer argument sinse we may update it. */ - - auto inline reg_errcode_t - __attribute ((always_inline)) - build_collating_symbol (sbcset, mbcset, coll_sym_alloc, name) - re_charset_t *mbcset; - int *coll_sym_alloc; - bitset_t sbcset; - const unsigned char *name; - { - int32_t elem, idx; - size_t name_len = strlen ((const char *) name); - if (nrules != 0) - { - elem = seek_collating_symbol_entry (name, name_len); - if (symb_table[2 * elem] != 0) - { - /* We found the entry. */ - idx = symb_table[2 * elem + 1]; - /* Skip the name of collating element name. */ - idx += 1 + extra[idx]; - } - else if (symb_table[2 * elem] == 0 && name_len == 1) - { - /* No valid character, treat it as a normal - character. */ - bitset_set (sbcset, name[0]); - return REG_NOERROR; - } - else - return REG_ECOLLATE; - - /* Got valid collation sequence, add it as a new entry. */ - /* Check the space of the arrays. */ - if (BE (*coll_sym_alloc == mbcset->ncoll_syms, 0)) - { - /* Not enough, realloc it. */ - /* +1 in case of mbcset->ncoll_syms is 0. */ - int new_coll_sym_alloc = 2 * mbcset->ncoll_syms + 1; - /* Use realloc since mbcset->coll_syms is NULL - if *alloc == 0. */ - int32_t *new_coll_syms = re_realloc (mbcset->coll_syms, int32_t, - new_coll_sym_alloc); - if (BE (new_coll_syms == NULL, 0)) - return REG_ESPACE; - mbcset->coll_syms = new_coll_syms; - *coll_sym_alloc = new_coll_sym_alloc; - } - mbcset->coll_syms[mbcset->ncoll_syms++] = idx; - return REG_NOERROR; - } - else - { - if (BE (name_len != 1, 0)) - return REG_ECOLLATE; - else - { - bitset_set (sbcset, name[0]); - return REG_NOERROR; - } - } - } -#endif - - re_token_t br_token; - re_bitset_ptr_t sbcset; -#ifdef RE_ENABLE_I18N - re_charset_t *mbcset; - int coll_sym_alloc = 0, range_alloc = 0, mbchar_alloc = 0; - int equiv_class_alloc = 0, char_class_alloc = 0; -#endif /* not RE_ENABLE_I18N */ - int non_match = 0; - bin_tree_t *work_tree; - int token_len; - int first_round = 1; -#ifdef _LIBC - collseqmb = (const unsigned char *) - _NL_CURRENT (LC_COLLATE, _NL_COLLATE_COLLSEQMB); - nrules = _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES); - if (nrules) - { - /* - if (MB_CUR_MAX > 1) - */ - collseqwc = _NL_CURRENT (LC_COLLATE, _NL_COLLATE_COLLSEQWC); - table_size = _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_SYMB_HASH_SIZEMB); - symb_table = (const int32_t *) _NL_CURRENT (LC_COLLATE, - _NL_COLLATE_SYMB_TABLEMB); - extra = (const unsigned char *) _NL_CURRENT (LC_COLLATE, - _NL_COLLATE_SYMB_EXTRAMB); - } -#endif - sbcset = (re_bitset_ptr_t) calloc (sizeof (bitset_t), 1); -#ifdef RE_ENABLE_I18N - mbcset = (re_charset_t *) calloc (sizeof (re_charset_t), 1); -#endif /* RE_ENABLE_I18N */ -#ifdef RE_ENABLE_I18N - if (BE (sbcset == NULL || mbcset == NULL, 0)) -#else - if (BE (sbcset == NULL, 0)) -#endif /* RE_ENABLE_I18N */ - { - *err = REG_ESPACE; - return NULL; - } - - token_len = peek_token_bracket (token, regexp, syntax); - if (BE (token->type == END_OF_RE, 0)) - { - *err = REG_BADPAT; - goto parse_bracket_exp_free_return; - } - if (token->type == OP_NON_MATCH_LIST) - { -#ifdef RE_ENABLE_I18N - mbcset->non_match = 1; -#endif /* not RE_ENABLE_I18N */ - non_match = 1; - if (syntax & RE_HAT_LISTS_NOT_NEWLINE) - bitset_set (sbcset, '\n'); - re_string_skip_bytes (regexp, token_len); /* Skip a token. */ - token_len = peek_token_bracket (token, regexp, syntax); - if (BE (token->type == END_OF_RE, 0)) - { - *err = REG_BADPAT; - goto parse_bracket_exp_free_return; - } - } - - /* We treat the first ']' as a normal character. */ - if (token->type == OP_CLOSE_BRACKET) - token->type = CHARACTER; - - while (1) - { - bracket_elem_t start_elem, end_elem; - unsigned char start_name_buf[BRACKET_NAME_BUF_SIZE]; - unsigned char end_name_buf[BRACKET_NAME_BUF_SIZE]; - reg_errcode_t ret; - int token_len2 = 0, is_range_exp = 0; - re_token_t token2; - - start_elem.opr.name = start_name_buf; - ret = parse_bracket_element (&start_elem, regexp, token, token_len, dfa, - syntax, first_round); - if (BE (ret != REG_NOERROR, 0)) - { - *err = ret; - goto parse_bracket_exp_free_return; - } - first_round = 0; - - /* Get information about the next token. We need it in any case. */ - token_len = peek_token_bracket (token, regexp, syntax); - - /* Do not check for ranges if we know they are not allowed. */ - if (start_elem.type != CHAR_CLASS && start_elem.type != EQUIV_CLASS) - { - if (BE (token->type == END_OF_RE, 0)) - { - *err = REG_EBRACK; - goto parse_bracket_exp_free_return; - } - if (token->type == OP_CHARSET_RANGE) - { - re_string_skip_bytes (regexp, token_len); /* Skip '-'. */ - token_len2 = peek_token_bracket (&token2, regexp, syntax); - if (BE (token2.type == END_OF_RE, 0)) - { - *err = REG_EBRACK; - goto parse_bracket_exp_free_return; - } - if (token2.type == OP_CLOSE_BRACKET) - { - /* We treat the last '-' as a normal character. */ - re_string_skip_bytes (regexp, -token_len); - token->type = CHARACTER; - } - else - is_range_exp = 1; - } - } - - if (is_range_exp == 1) - { - end_elem.opr.name = end_name_buf; - ret = parse_bracket_element (&end_elem, regexp, &token2, token_len2, - dfa, syntax, 1); - if (BE (ret != REG_NOERROR, 0)) - { - *err = ret; - goto parse_bracket_exp_free_return; - } - - token_len = peek_token_bracket (token, regexp, syntax); - -#ifdef _LIBC - *err = build_range_exp (sbcset, mbcset, &range_alloc, - &start_elem, &end_elem); -#else -# ifdef RE_ENABLE_I18N - *err = build_range_exp (sbcset, - dfa->mb_cur_max > 1 ? mbcset : NULL, - &range_alloc, &start_elem, &end_elem); -# else - *err = build_range_exp (sbcset, &start_elem, &end_elem); -# endif -#endif /* RE_ENABLE_I18N */ - if (BE (*err != REG_NOERROR, 0)) - goto parse_bracket_exp_free_return; - } - else - { - switch (start_elem.type) - { - case SB_CHAR: - bitset_set (sbcset, start_elem.opr.ch); - break; -#ifdef RE_ENABLE_I18N - case MB_CHAR: - /* Check whether the array has enough space. */ - if (BE (mbchar_alloc == mbcset->nmbchars, 0)) - { - wchar_t *new_mbchars; - /* Not enough, realloc it. */ - /* +1 in case of mbcset->nmbchars is 0. */ - mbchar_alloc = 2 * mbcset->nmbchars + 1; - /* Use realloc since array is NULL if *alloc == 0. */ - new_mbchars = re_realloc (mbcset->mbchars, wchar_t, - mbchar_alloc); - if (BE (new_mbchars == NULL, 0)) - goto parse_bracket_exp_espace; - mbcset->mbchars = new_mbchars; - } - mbcset->mbchars[mbcset->nmbchars++] = start_elem.opr.wch; - break; -#endif /* RE_ENABLE_I18N */ - case EQUIV_CLASS: - *err = build_equiv_class (sbcset, -#ifdef RE_ENABLE_I18N - mbcset, &equiv_class_alloc, -#endif /* RE_ENABLE_I18N */ - start_elem.opr.name); - if (BE (*err != REG_NOERROR, 0)) - goto parse_bracket_exp_free_return; - break; - case COLL_SYM: - *err = build_collating_symbol (sbcset, -#ifdef RE_ENABLE_I18N - mbcset, &coll_sym_alloc, -#endif /* RE_ENABLE_I18N */ - start_elem.opr.name); - if (BE (*err != REG_NOERROR, 0)) - goto parse_bracket_exp_free_return; - break; - case CHAR_CLASS: - *err = build_charclass (regexp->trans, sbcset, -#ifdef RE_ENABLE_I18N - mbcset, &char_class_alloc, -#endif /* RE_ENABLE_I18N */ - (const char *) start_elem.opr.name, syntax); - if (BE (*err != REG_NOERROR, 0)) - goto parse_bracket_exp_free_return; - break; - default: - assert (0); - break; - } - } - if (BE (token->type == END_OF_RE, 0)) - { - *err = REG_EBRACK; - goto parse_bracket_exp_free_return; - } - if (token->type == OP_CLOSE_BRACKET) - break; - } - - re_string_skip_bytes (regexp, token_len); /* Skip a token. */ - - /* If it is non-matching list. */ - if (non_match) - bitset_not (sbcset); - -#ifdef RE_ENABLE_I18N - /* Ensure only single byte characters are set. */ - if (dfa->mb_cur_max > 1) - bitset_mask (sbcset, dfa->sb_char); - - if (mbcset->nmbchars || mbcset->ncoll_syms || mbcset->nequiv_classes - || mbcset->nranges || (dfa->mb_cur_max > 1 && (mbcset->nchar_classes - || mbcset->non_match))) - { - bin_tree_t *mbc_tree; - int sbc_idx; - /* Build a tree for complex bracket. */ - dfa->has_mb_node = 1; - br_token.type = COMPLEX_BRACKET; - br_token.opr.mbcset = mbcset; - mbc_tree = create_token_tree (dfa, NULL, NULL, &br_token); - if (BE (mbc_tree == NULL, 0)) - goto parse_bracket_exp_espace; - for (sbc_idx = 0; sbc_idx < BITSET_WORDS; ++sbc_idx) - if (sbcset[sbc_idx]) - break; - /* If there are no bits set in sbcset, there is no point - of having both SIMPLE_BRACKET and COMPLEX_BRACKET. */ - if (sbc_idx < BITSET_WORDS) - { - /* Build a tree for simple bracket. */ - br_token.type = SIMPLE_BRACKET; - br_token.opr.sbcset = sbcset; - work_tree = create_token_tree (dfa, NULL, NULL, &br_token); - if (BE (work_tree == NULL, 0)) - goto parse_bracket_exp_espace; - - /* Then join them by ALT node. */ - work_tree = create_tree (dfa, work_tree, mbc_tree, OP_ALT); - if (BE (work_tree == NULL, 0)) - goto parse_bracket_exp_espace; - } - else - { - re_free (sbcset); - work_tree = mbc_tree; - } - } - else -#endif /* not RE_ENABLE_I18N */ - { -#ifdef RE_ENABLE_I18N - free_charset (mbcset); -#endif - /* Build a tree for simple bracket. */ - br_token.type = SIMPLE_BRACKET; - br_token.opr.sbcset = sbcset; - work_tree = create_token_tree (dfa, NULL, NULL, &br_token); - if (BE (work_tree == NULL, 0)) - goto parse_bracket_exp_espace; - } - return work_tree; - - parse_bracket_exp_espace: - *err = REG_ESPACE; - parse_bracket_exp_free_return: - re_free (sbcset); -#ifdef RE_ENABLE_I18N - free_charset (mbcset); -#endif /* RE_ENABLE_I18N */ - return NULL; -} - -/* Parse an element in the bracket expression. */ - -static reg_errcode_t -parse_bracket_element (bracket_elem_t *elem, re_string_t *regexp, - re_token_t *token, int token_len, UNUSED re_dfa_t *dfa, - reg_syntax_t syntax, int accept_hyphen) -{ -#ifdef RE_ENABLE_I18N - int cur_char_size; - cur_char_size = re_string_char_size_at (regexp, re_string_cur_idx (regexp)); - if (cur_char_size > 1) - { - elem->type = MB_CHAR; - elem->opr.wch = re_string_wchar_at (regexp, re_string_cur_idx (regexp)); - re_string_skip_bytes (regexp, cur_char_size); - return REG_NOERROR; - } -#endif /* RE_ENABLE_I18N */ - re_string_skip_bytes (regexp, token_len); /* Skip a token. */ - if (token->type == OP_OPEN_COLL_ELEM || token->type == OP_OPEN_CHAR_CLASS - || token->type == OP_OPEN_EQUIV_CLASS) - return parse_bracket_symbol (elem, regexp, token); - if (BE (token->type == OP_CHARSET_RANGE, 0) && !accept_hyphen) - { - /* A '-' must only appear as anything but a range indicator before - the closing bracket. Everything else is an error. */ - re_token_t token2; - (void) peek_token_bracket (&token2, regexp, syntax); - if (token2.type != OP_CLOSE_BRACKET) - /* The actual error value is not standardized since this whole - case is undefined. But ERANGE makes good sense. */ - return REG_ERANGE; - } - elem->type = SB_CHAR; - elem->opr.ch = token->opr.c; - return REG_NOERROR; -} - -/* Parse a bracket symbol in the bracket expression. Bracket symbols are - such as [::], [..], and - [==]. */ - -static reg_errcode_t -parse_bracket_symbol (bracket_elem_t *elem, re_string_t *regexp, - re_token_t *token) -{ - unsigned char ch, delim = token->opr.c; - int i = 0; - if (re_string_eoi(regexp)) - return REG_EBRACK; - for (;; ++i) - { - if (i >= BRACKET_NAME_BUF_SIZE) - return REG_EBRACK; - if (token->type == OP_OPEN_CHAR_CLASS) - ch = re_string_fetch_byte_case (regexp); - else - ch = re_string_fetch_byte (regexp); - if (re_string_eoi(regexp)) - return REG_EBRACK; - if (ch == delim && re_string_peek_byte (regexp, 0) == ']') - break; - elem->opr.name[i] = ch; - } - re_string_skip_bytes (regexp, 1); - elem->opr.name[i] = '\0'; - switch (token->type) - { - case OP_OPEN_COLL_ELEM: - elem->type = COLL_SYM; - break; - case OP_OPEN_EQUIV_CLASS: - elem->type = EQUIV_CLASS; - break; - case OP_OPEN_CHAR_CLASS: - elem->type = CHAR_CLASS; - break; - default: - break; - } - return REG_NOERROR; -} - - /* Helper function for parse_bracket_exp. - Build the equivalence class which is represented by NAME. - The result are written to MBCSET and SBCSET. - EQUIV_CLASS_ALLOC is the allocated size of mbcset->equiv_classes, - is a pointer argument sinse we may update it. */ - -static reg_errcode_t -#ifdef RE_ENABLE_I18N -build_equiv_class (bitset_t sbcset, re_charset_t *mbcset, - int *equiv_class_alloc, const unsigned char *name) -#else /* not RE_ENABLE_I18N */ -build_equiv_class (bitset_t sbcset, const unsigned char *name) -#endif /* not RE_ENABLE_I18N */ -{ -#ifdef _LIBC - uint32_t nrules = _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES); - if (nrules != 0) - { - const int32_t *table, *indirect; - const unsigned char *weights, *extra, *cp; - unsigned char char_buf[2]; - int32_t idx1, idx2; - unsigned int ch; - size_t len; - /* This #include defines a local function! */ -# include - /* Calculate the index for equivalence class. */ - cp = name; - table = (const int32_t *) _NL_CURRENT (LC_COLLATE, _NL_COLLATE_TABLEMB); - weights = (const unsigned char *) _NL_CURRENT (LC_COLLATE, - _NL_COLLATE_WEIGHTMB); - extra = (const unsigned char *) _NL_CURRENT (LC_COLLATE, - _NL_COLLATE_EXTRAMB); - indirect = (const int32_t *) _NL_CURRENT (LC_COLLATE, - _NL_COLLATE_INDIRECTMB); - idx1 = findidx (&cp); - if (BE (idx1 == 0 || cp < name + strlen ((const char *) name), 0)) - /* This isn't a valid character. */ - return REG_ECOLLATE; - - /* Build single byte matcing table for this equivalence class. */ - char_buf[1] = (unsigned char) '\0'; - len = weights[idx1 & 0xffffff]; - for (ch = 0; ch < SBC_MAX; ++ch) - { - char_buf[0] = ch; - cp = char_buf; - idx2 = findidx (&cp); -/* - idx2 = table[ch]; -*/ - if (idx2 == 0) - /* This isn't a valid character. */ - continue; - /* Compare only if the length matches and the collation rule - index is the same. */ - if (len == weights[idx2 & 0xffffff] && (idx1 >> 24) == (idx2 >> 24)) - { - int cnt = 0; - - while (cnt <= len && - weights[(idx1 & 0xffffff) + 1 + cnt] - == weights[(idx2 & 0xffffff) + 1 + cnt]) - ++cnt; - - if (cnt > len) - bitset_set (sbcset, ch); - } - } - /* Check whether the array has enough space. */ - if (BE (*equiv_class_alloc == mbcset->nequiv_classes, 0)) - { - /* Not enough, realloc it. */ - /* +1 in case of mbcset->nequiv_classes is 0. */ - int new_equiv_class_alloc = 2 * mbcset->nequiv_classes + 1; - /* Use realloc since the array is NULL if *alloc == 0. */ - int32_t *new_equiv_classes = re_realloc (mbcset->equiv_classes, - int32_t, - new_equiv_class_alloc); - if (BE (new_equiv_classes == NULL, 0)) - return REG_ESPACE; - mbcset->equiv_classes = new_equiv_classes; - *equiv_class_alloc = new_equiv_class_alloc; - } - mbcset->equiv_classes[mbcset->nequiv_classes++] = idx1; - } - else -#endif /* _LIBC */ - { - if (BE (strlen ((const char *) name) != 1, 0)) - return REG_ECOLLATE; - bitset_set (sbcset, *name); - } - return REG_NOERROR; -} - - /* Helper function for parse_bracket_exp. - Build the character class which is represented by NAME. - The result are written to MBCSET and SBCSET. - CHAR_CLASS_ALLOC is the allocated size of mbcset->char_classes, - is a pointer argument sinse we may update it. */ - -static reg_errcode_t -#ifdef RE_ENABLE_I18N -build_charclass (RE_TRANSLATE_TYPE trans, bitset_t sbcset, - re_charset_t *mbcset, int *char_class_alloc, - const char *class_name, reg_syntax_t syntax) -#else /* not RE_ENABLE_I18N */ -build_charclass (RE_TRANSLATE_TYPE trans, bitset_t sbcset, - const char *class_name, reg_syntax_t syntax) -#endif /* not RE_ENABLE_I18N */ -{ - int i; - - /* In case of REG_ICASE "upper" and "lower" match the both of - upper and lower cases. */ - if ((syntax & RE_ICASE) - && (strcmp (class_name, "upper") == 0 || strcmp (class_name, "lower") == 0)) - class_name = "alpha"; - -#ifdef RE_ENABLE_I18N - /* Check the space of the arrays. */ - if (BE (*char_class_alloc == mbcset->nchar_classes, 0)) - { - /* Not enough, realloc it. */ - /* +1 in case of mbcset->nchar_classes is 0. */ - int new_char_class_alloc = 2 * mbcset->nchar_classes + 1; - /* Use realloc since array is NULL if *alloc == 0. */ - wctype_t *new_char_classes = re_realloc (mbcset->char_classes, wctype_t, - new_char_class_alloc); - if (BE (new_char_classes == NULL, 0)) - return REG_ESPACE; - mbcset->char_classes = new_char_classes; - *char_class_alloc = new_char_class_alloc; - } - mbcset->char_classes[mbcset->nchar_classes++] = __wctype (class_name); -#endif /* RE_ENABLE_I18N */ - -#define BUILD_CHARCLASS_LOOP(ctype_func) \ - do { \ - if (BE (trans != NULL, 0)) \ - { \ - for (i = 0; i < SBC_MAX; ++i) \ - if (ctype_func (i)) \ - bitset_set (sbcset, trans[i]); \ - } \ - else \ - { \ - for (i = 0; i < SBC_MAX; ++i) \ - if (ctype_func (i)) \ - bitset_set (sbcset, i); \ - } \ - } while (0) - - if (strcmp (class_name, "alnum") == 0) - BUILD_CHARCLASS_LOOP (isalnum); - else if (strcmp (class_name, "cntrl") == 0) - BUILD_CHARCLASS_LOOP (iscntrl); - else if (strcmp (class_name, "lower") == 0) - BUILD_CHARCLASS_LOOP (islower); - else if (strcmp (class_name, "space") == 0) - BUILD_CHARCLASS_LOOP (isspace); - else if (strcmp (class_name, "alpha") == 0) - BUILD_CHARCLASS_LOOP (isalpha); - else if (strcmp (class_name, "digit") == 0) - BUILD_CHARCLASS_LOOP (isdigit); - else if (strcmp (class_name, "print") == 0) - BUILD_CHARCLASS_LOOP (isprint); - else if (strcmp (class_name, "upper") == 0) - BUILD_CHARCLASS_LOOP (isupper); - else if (strcmp (class_name, "blank") == 0) -#ifndef GAWK - BUILD_CHARCLASS_LOOP (isblank); -#else - /* see comments above */ - BUILD_CHARCLASS_LOOP (is_blank); -#endif - else if (strcmp (class_name, "graph") == 0) - BUILD_CHARCLASS_LOOP (isgraph); - else if (strcmp (class_name, "punct") == 0) - BUILD_CHARCLASS_LOOP (ispunct); - else if (strcmp (class_name, "xdigit") == 0) - BUILD_CHARCLASS_LOOP (isxdigit); - else - return REG_ECTYPE; - - return REG_NOERROR; -} - -static bin_tree_t * -build_charclass_op (re_dfa_t *dfa, RE_TRANSLATE_TYPE trans, - const char *class_name, - const char *extra, int non_match, - reg_errcode_t *err) -{ - re_bitset_ptr_t sbcset; -#ifdef RE_ENABLE_I18N - re_charset_t *mbcset; - int alloc = 0; -#endif /* not RE_ENABLE_I18N */ - reg_errcode_t ret; - re_token_t br_token; - bin_tree_t *tree; - - sbcset = (re_bitset_ptr_t) calloc (sizeof (bitset_t), 1); -#ifdef RE_ENABLE_I18N - mbcset = (re_charset_t *) calloc (sizeof (re_charset_t), 1); -#endif /* RE_ENABLE_I18N */ - -#ifdef RE_ENABLE_I18N - if (BE (sbcset == NULL || mbcset == NULL, 0)) -#else /* not RE_ENABLE_I18N */ - if (BE (sbcset == NULL, 0)) -#endif /* not RE_ENABLE_I18N */ - { - *err = REG_ESPACE; - return NULL; - } - - if (non_match) - { -#ifdef RE_ENABLE_I18N - mbcset->non_match = 1; -#endif /* not RE_ENABLE_I18N */ - } - - /* We don't care the syntax in this case. */ - ret = build_charclass (trans, sbcset, -#ifdef RE_ENABLE_I18N - mbcset, &alloc, -#endif /* RE_ENABLE_I18N */ - class_name, 0); - - if (BE (ret != REG_NOERROR, 0)) - { - re_free (sbcset); -#ifdef RE_ENABLE_I18N - free_charset (mbcset); -#endif /* RE_ENABLE_I18N */ - *err = ret; - return NULL; - } - /* \w match '_' also. */ - for (; *extra; extra++) - bitset_set (sbcset, *extra); - - /* If it is non-matching list. */ - if (non_match) - bitset_not (sbcset); - -#ifdef RE_ENABLE_I18N - /* Ensure only single byte characters are set. */ - if (dfa->mb_cur_max > 1) - bitset_mask (sbcset, dfa->sb_char); -#endif - - /* Build a tree for simple bracket. */ - br_token.type = SIMPLE_BRACKET; - br_token.opr.sbcset = sbcset; - tree = create_token_tree (dfa, NULL, NULL, &br_token); - if (BE (tree == NULL, 0)) - goto build_word_op_espace; - -#ifdef RE_ENABLE_I18N - if (dfa->mb_cur_max > 1) - { - bin_tree_t *mbc_tree; - /* Build a tree for complex bracket. */ - br_token.type = COMPLEX_BRACKET; - br_token.opr.mbcset = mbcset; - dfa->has_mb_node = 1; - mbc_tree = create_token_tree (dfa, NULL, NULL, &br_token); - if (BE (mbc_tree == NULL, 0)) - goto build_word_op_espace; - /* Then join them by ALT node. */ - tree = create_tree (dfa, tree, mbc_tree, OP_ALT); - if (BE (mbc_tree != NULL, 1)) - return tree; - } - else - { - free_charset (mbcset); - return tree; - } -#else /* not RE_ENABLE_I18N */ - return tree; -#endif /* not RE_ENABLE_I18N */ - - build_word_op_espace: - re_free (sbcset); -#ifdef RE_ENABLE_I18N - free_charset (mbcset); -#endif /* RE_ENABLE_I18N */ - *err = REG_ESPACE; - return NULL; -} - -/* This is intended for the expressions like "a{1,3}". - Fetch a number from `input', and return the number. - Return -1, if the number field is empty like "{,1}". - Return -2, If an error is occured. */ - -static int -fetch_number (re_string_t *input, re_token_t *token, reg_syntax_t syntax) -{ - int num = -1; - unsigned char c; - while (1) - { - fetch_token (token, input, syntax); - c = token->opr.c; - if (BE (token->type == END_OF_RE, 0)) - return -2; - if (token->type == OP_CLOSE_DUP_NUM || c == ',') - break; - num = ((token->type != CHARACTER || c < '0' || '9' < c || num == -2) - ? -2 : ((num == -1) ? c - '0' : num * 10 + c - '0')); - num = (num > RE_DUP_MAX) ? -2 : num; - } - return num; -} - -#ifdef RE_ENABLE_I18N -static void -free_charset (re_charset_t *cset) -{ - re_free (cset->mbchars); -# ifdef _LIBC - re_free (cset->coll_syms); - re_free (cset->equiv_classes); - re_free (cset->range_starts); - re_free (cset->range_ends); -# endif - re_free (cset->char_classes); - re_free (cset); -} -#endif /* RE_ENABLE_I18N */ - -/* Functions for binary tree operation. */ - -/* Create a tree node. */ - -static bin_tree_t * -create_tree (re_dfa_t *dfa, bin_tree_t *left, bin_tree_t *right, - re_token_type_t type) -{ - re_token_t t; - t.type = type; - return create_token_tree (dfa, left, right, &t); -} - -static bin_tree_t * -create_token_tree (re_dfa_t *dfa, bin_tree_t *left, bin_tree_t *right, - const re_token_t *token) -{ - bin_tree_t *tree; - if (BE (dfa->str_tree_storage_idx == BIN_TREE_STORAGE_SIZE, 0)) - { - bin_tree_storage_t *storage = re_malloc (bin_tree_storage_t, 1); - - if (storage == NULL) - return NULL; - storage->next = dfa->str_tree_storage; - dfa->str_tree_storage = storage; - dfa->str_tree_storage_idx = 0; - } - tree = &dfa->str_tree_storage->data[dfa->str_tree_storage_idx++]; - - tree->parent = NULL; - tree->left = left; - tree->right = right; - tree->token = *token; - tree->token.duplicated = 0; - tree->token.opt_subexp = 0; - tree->first = NULL; - tree->next = NULL; - tree->node_idx = -1; - - if (left != NULL) - left->parent = tree; - if (right != NULL) - right->parent = tree; - return tree; -} - -/* Mark the tree SRC as an optional subexpression. - To be called from preorder or postorder. */ - -static reg_errcode_t -mark_opt_subexp (void *extra, bin_tree_t *node) -{ - int idx = (int) (long) extra; - if (node->token.type == SUBEXP && node->token.opr.idx == idx) - node->token.opt_subexp = 1; - - return REG_NOERROR; -} - -/* Free the allocated memory inside NODE. */ - -static void -free_token (re_token_t *node) -{ -#ifdef RE_ENABLE_I18N - if (node->type == COMPLEX_BRACKET && node->duplicated == 0) - free_charset (node->opr.mbcset); - else -#endif /* RE_ENABLE_I18N */ - if (node->type == SIMPLE_BRACKET && node->duplicated == 0) - re_free (node->opr.sbcset); -} - -/* Worker function for tree walking. Free the allocated memory inside NODE - and its children. */ - -static reg_errcode_t -free_tree (UNUSED void *extra, bin_tree_t *node) -{ - free_token (&node->token); - return REG_NOERROR; -} - - -/* Duplicate the node SRC, and return new node. This is a preorder - visit similar to the one implemented by the generic visitor, but - we need more infrastructure to maintain two parallel trees --- so, - it's easier to duplicate. */ - -static bin_tree_t * -duplicate_tree (const bin_tree_t *root, re_dfa_t *dfa) -{ - const bin_tree_t *node; - bin_tree_t *dup_root; - bin_tree_t **p_new = &dup_root, *dup_node = root->parent; - - for (node = root; ; ) - { - /* Create a new tree and link it back to the current parent. */ - *p_new = create_token_tree (dfa, NULL, NULL, &node->token); - if (*p_new == NULL) - return NULL; - (*p_new)->parent = dup_node; - (*p_new)->token.duplicated = 1; - dup_node = *p_new; - - /* Go to the left node, or up and to the right. */ - if (node->left) - { - node = node->left; - p_new = &dup_node->left; - } - else - { - const bin_tree_t *prev = NULL; - while (node->right == prev || node->right == NULL) - { - prev = node; - node = node->parent; - dup_node = dup_node->parent; - if (!node) - return dup_root; - } - node = node->right; - p_new = &dup_node->right; - } - } -} diff --git a/vendor/libgit2/deps/regex/regex.c b/vendor/libgit2/deps/regex/regex.c deleted file mode 100644 index 225a001ee..000000000 --- a/vendor/libgit2/deps/regex/regex.c +++ /dev/null @@ -1,92 +0,0 @@ -/* Extended regular expression matching and search library. - Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Isamu Hasegawa . - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301 USA. */ - -#include "config.h" - -/* Make sure noone compiles this code with a C++ compiler. */ -#ifdef __cplusplus -# error "This is C code, use a C compiler" -#endif - -#ifdef _LIBC -/* We have to keep the namespace clean. */ -# define regfree(preg) __regfree (preg) -# define regexec(pr, st, nm, pm, ef) __regexec (pr, st, nm, pm, ef) -# define regcomp(preg, pattern, cflags) __regcomp (preg, pattern, cflags) -# define regerror(errcode, preg, errbuf, errbuf_size) \ - __regerror(errcode, preg, errbuf, errbuf_size) -# define re_set_registers(bu, re, nu, st, en) \ - __re_set_registers (bu, re, nu, st, en) -# define re_match_2(bufp, string1, size1, string2, size2, pos, regs, stop) \ - __re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop) -# define re_match(bufp, string, size, pos, regs) \ - __re_match (bufp, string, size, pos, regs) -# define re_search(bufp, string, size, startpos, range, regs) \ - __re_search (bufp, string, size, startpos, range, regs) -# define re_compile_pattern(pattern, length, bufp) \ - __re_compile_pattern (pattern, length, bufp) -# define re_set_syntax(syntax) __re_set_syntax (syntax) -# define re_search_2(bufp, st1, s1, st2, s2, startpos, range, regs, stop) \ - __re_search_2 (bufp, st1, s1, st2, s2, startpos, range, regs, stop) -# define re_compile_fastmap(bufp) __re_compile_fastmap (bufp) - -# include "../locale/localeinfo.h" -#endif - -#if defined (_MSC_VER) -#include /* for size_t */ -#endif - -/* On some systems, limits.h sets RE_DUP_MAX to a lower value than - GNU regex allows. Include it before , which correctly - #undefs RE_DUP_MAX and sets it to the right value. */ -#include - -#ifdef GAWK -#undef alloca -#define alloca alloca_is_bad_you_should_never_use_it -#endif -#include -#include "regex_internal.h" - -#include "regex_internal.c" - -#ifdef GAWK -# define bool int - -# ifndef true -# define true (1) -# endif - -# ifndef false -# define false (0) -# endif -#endif -#include "regcomp.c" -#include "regexec.c" - -/* Binary backward compatibility. */ -#if _LIBC -# include -# if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_3) -link_warning (re_max_failures, "the 're_max_failures' variable is obsolete and will go away.") -int re_max_failures = 2000; -# endif -#endif diff --git a/vendor/libgit2/deps/regex/regex.h b/vendor/libgit2/deps/regex/regex.h deleted file mode 100644 index 61c968387..000000000 --- a/vendor/libgit2/deps/regex/regex.h +++ /dev/null @@ -1,582 +0,0 @@ -#include -#include - -/* Definitions for data structures and routines for the regular - expression library. - Copyright (C) 1985,1989-93,1995-98,2000,2001,2002,2003,2005,2006,2008 - Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301 USA. */ - -#ifndef _REGEX_H -#define _REGEX_H 1 - -#ifdef HAVE_STDDEF_H -#include -#endif - -#ifdef HAVE_SYS_TYPES_H -#include -#endif - -#ifndef _LIBC -#define __USE_GNU 1 -#endif - -/* Allow the use in C++ code. */ -#ifdef __cplusplus -extern "C" { -#endif - -/* The following two types have to be signed and unsigned integer type - wide enough to hold a value of a pointer. For most ANSI compilers - ptrdiff_t and size_t should be likely OK. Still size of these two - types is 2 for Microsoft C. Ugh... */ -typedef long int s_reg_t; -typedef unsigned long int active_reg_t; - -/* The following bits are used to determine the regexp syntax we - recognize. The set/not-set meanings are chosen so that Emacs syntax - remains the value 0. The bits are given in alphabetical order, and - the definitions shifted by one from the previous bit; thus, when we - add or remove a bit, only one other definition need change. */ -typedef unsigned long int reg_syntax_t; - -#ifdef __USE_GNU -/* If this bit is not set, then \ inside a bracket expression is literal. - If set, then such a \ quotes the following character. */ -# define RE_BACKSLASH_ESCAPE_IN_LISTS ((unsigned long int) 1) - -/* If this bit is not set, then + and ? are operators, and \+ and \? are - literals. - If set, then \+ and \? are operators and + and ? are literals. */ -# define RE_BK_PLUS_QM (RE_BACKSLASH_ESCAPE_IN_LISTS << 1) - -/* If this bit is set, then character classes are supported. They are: - [:alpha:], [:upper:], [:lower:], [:digit:], [:alnum:], [:xdigit:], - [:space:], [:print:], [:punct:], [:graph:], and [:cntrl:]. - If not set, then character classes are not supported. */ -# define RE_CHAR_CLASSES (RE_BK_PLUS_QM << 1) - -/* If this bit is set, then ^ and $ are always anchors (outside bracket - expressions, of course). - If this bit is not set, then it depends: - ^ is an anchor if it is at the beginning of a regular - expression or after an open-group or an alternation operator; - $ is an anchor if it is at the end of a regular expression, or - before a close-group or an alternation operator. - - This bit could be (re)combined with RE_CONTEXT_INDEP_OPS, because - POSIX draft 11.2 says that * etc. in leading positions is undefined. - We already implemented a previous draft which made those constructs - invalid, though, so we haven't changed the code back. */ -# define RE_CONTEXT_INDEP_ANCHORS (RE_CHAR_CLASSES << 1) - -/* If this bit is set, then special characters are always special - regardless of where they are in the pattern. - If this bit is not set, then special characters are special only in - some contexts; otherwise they are ordinary. Specifically, - * + ? and intervals are only special when not after the beginning, - open-group, or alternation operator. */ -# define RE_CONTEXT_INDEP_OPS (RE_CONTEXT_INDEP_ANCHORS << 1) - -/* If this bit is set, then *, +, ?, and { cannot be first in an re or - immediately after an alternation or begin-group operator. */ -# define RE_CONTEXT_INVALID_OPS (RE_CONTEXT_INDEP_OPS << 1) - -/* If this bit is set, then . matches newline. - If not set, then it doesn't. */ -# define RE_DOT_NEWLINE (RE_CONTEXT_INVALID_OPS << 1) - -/* If this bit is set, then . doesn't match NUL. - If not set, then it does. */ -# define RE_DOT_NOT_NULL (RE_DOT_NEWLINE << 1) - -/* If this bit is set, nonmatching lists [^...] do not match newline. - If not set, they do. */ -# define RE_HAT_LISTS_NOT_NEWLINE (RE_DOT_NOT_NULL << 1) - -/* If this bit is set, either \{...\} or {...} defines an - interval, depending on RE_NO_BK_BRACES. - If not set, \{, \}, {, and } are literals. */ -# define RE_INTERVALS (RE_HAT_LISTS_NOT_NEWLINE << 1) - -/* If this bit is set, +, ? and | aren't recognized as operators. - If not set, they are. */ -# define RE_LIMITED_OPS (RE_INTERVALS << 1) - -/* If this bit is set, newline is an alternation operator. - If not set, newline is literal. */ -# define RE_NEWLINE_ALT (RE_LIMITED_OPS << 1) - -/* If this bit is set, then `{...}' defines an interval, and \{ and \} - are literals. - If not set, then `\{...\}' defines an interval. */ -# define RE_NO_BK_BRACES (RE_NEWLINE_ALT << 1) - -/* If this bit is set, (...) defines a group, and \( and \) are literals. - If not set, \(...\) defines a group, and ( and ) are literals. */ -# define RE_NO_BK_PARENS (RE_NO_BK_BRACES << 1) - -/* If this bit is set, then \ matches . - If not set, then \ is a back-reference. */ -# define RE_NO_BK_REFS (RE_NO_BK_PARENS << 1) - -/* If this bit is set, then | is an alternation operator, and \| is literal. - If not set, then \| is an alternation operator, and | is literal. */ -# define RE_NO_BK_VBAR (RE_NO_BK_REFS << 1) - -/* If this bit is set, then an ending range point collating higher - than the starting range point, as in [z-a], is invalid. - If not set, then when ending range point collates higher than the - starting range point, the range is ignored. */ -# define RE_NO_EMPTY_RANGES (RE_NO_BK_VBAR << 1) - -/* If this bit is set, then an unmatched ) is ordinary. - If not set, then an unmatched ) is invalid. */ -# define RE_UNMATCHED_RIGHT_PAREN_ORD (RE_NO_EMPTY_RANGES << 1) - -/* If this bit is set, succeed as soon as we match the whole pattern, - without further backtracking. */ -# define RE_NO_POSIX_BACKTRACKING (RE_UNMATCHED_RIGHT_PAREN_ORD << 1) - -/* If this bit is set, do not process the GNU regex operators. - If not set, then the GNU regex operators are recognized. */ -# define RE_NO_GNU_OPS (RE_NO_POSIX_BACKTRACKING << 1) - -/* If this bit is set, a syntactically invalid interval is treated as - a string of ordinary characters. For example, the ERE 'a{1' is - treated as 'a\{1'. */ -# define RE_INVALID_INTERVAL_ORD (RE_NO_GNU_OPS << 1) - -/* If this bit is set, then ignore case when matching. - If not set, then case is significant. */ -# define RE_ICASE (RE_INVALID_INTERVAL_ORD << 1) - -/* This bit is used internally like RE_CONTEXT_INDEP_ANCHORS but only - for ^, because it is difficult to scan the regex backwards to find - whether ^ should be special. */ -# define RE_CARET_ANCHORS_HERE (RE_ICASE << 1) - -/* If this bit is set, then \{ cannot be first in an bre or - immediately after an alternation or begin-group operator. */ -# define RE_CONTEXT_INVALID_DUP (RE_CARET_ANCHORS_HERE << 1) - -/* If this bit is set, then no_sub will be set to 1 during - re_compile_pattern. */ -#define RE_NO_SUB (RE_CONTEXT_INVALID_DUP << 1) -#endif - -/* This global variable defines the particular regexp syntax to use (for - some interfaces). When a regexp is compiled, the syntax used is - stored in the pattern buffer, so changing this does not affect - already-compiled regexps. */ -extern reg_syntax_t re_syntax_options; - -#ifdef __USE_GNU -/* Define combinations of the above bits for the standard possibilities. - (The [[[ comments delimit what gets put into the Texinfo file, so - don't delete them!) */ -/* [[[begin syntaxes]]] */ -#define RE_SYNTAX_EMACS 0 - -#define RE_SYNTAX_AWK \ - (RE_BACKSLASH_ESCAPE_IN_LISTS | RE_DOT_NOT_NULL \ - | RE_NO_BK_PARENS | RE_NO_BK_REFS \ - | RE_NO_BK_VBAR | RE_NO_EMPTY_RANGES \ - | RE_DOT_NEWLINE | RE_CONTEXT_INDEP_ANCHORS \ - | RE_UNMATCHED_RIGHT_PAREN_ORD | RE_NO_GNU_OPS) - -#define RE_SYNTAX_GNU_AWK \ - ((RE_SYNTAX_POSIX_EXTENDED | RE_BACKSLASH_ESCAPE_IN_LISTS \ - | RE_INVALID_INTERVAL_ORD) \ - & ~(RE_DOT_NOT_NULL | RE_CONTEXT_INDEP_OPS \ - | RE_CONTEXT_INVALID_OPS )) - -#define RE_SYNTAX_POSIX_AWK \ - (RE_SYNTAX_POSIX_EXTENDED | RE_BACKSLASH_ESCAPE_IN_LISTS \ - | RE_INTERVALS | RE_NO_GNU_OPS \ - | RE_INVALID_INTERVAL_ORD) - -#define RE_SYNTAX_GREP \ - (RE_BK_PLUS_QM | RE_CHAR_CLASSES \ - | RE_HAT_LISTS_NOT_NEWLINE | RE_INTERVALS \ - | RE_NEWLINE_ALT) - -#define RE_SYNTAX_EGREP \ - (RE_CHAR_CLASSES | RE_CONTEXT_INDEP_ANCHORS \ - | RE_CONTEXT_INDEP_OPS | RE_HAT_LISTS_NOT_NEWLINE \ - | RE_NEWLINE_ALT | RE_NO_BK_PARENS \ - | RE_NO_BK_VBAR) - -#define RE_SYNTAX_POSIX_EGREP \ - (RE_SYNTAX_EGREP | RE_INTERVALS | RE_NO_BK_BRACES \ - | RE_INVALID_INTERVAL_ORD) - -/* P1003.2/D11.2, section 4.20.7.1, lines 5078ff. */ -#define RE_SYNTAX_ED RE_SYNTAX_POSIX_BASIC - -#define RE_SYNTAX_SED RE_SYNTAX_POSIX_BASIC - -/* Syntax bits common to both basic and extended POSIX regex syntax. */ -#define _RE_SYNTAX_POSIX_COMMON \ - (RE_CHAR_CLASSES | RE_DOT_NEWLINE | RE_DOT_NOT_NULL \ - | RE_INTERVALS | RE_NO_EMPTY_RANGES) - -#define RE_SYNTAX_POSIX_BASIC \ - (_RE_SYNTAX_POSIX_COMMON | RE_BK_PLUS_QM | RE_CONTEXT_INVALID_DUP) - -/* Differs from ..._POSIX_BASIC only in that RE_BK_PLUS_QM becomes - RE_LIMITED_OPS, i.e., \? \+ \| are not recognized. Actually, this - isn't minimal, since other operators, such as \`, aren't disabled. */ -#define RE_SYNTAX_POSIX_MINIMAL_BASIC \ - (_RE_SYNTAX_POSIX_COMMON | RE_LIMITED_OPS) - -#define RE_SYNTAX_POSIX_EXTENDED \ - (_RE_SYNTAX_POSIX_COMMON | RE_CONTEXT_INDEP_ANCHORS \ - | RE_CONTEXT_INDEP_OPS | RE_NO_BK_BRACES \ - | RE_NO_BK_PARENS | RE_NO_BK_VBAR \ - | RE_CONTEXT_INVALID_OPS | RE_UNMATCHED_RIGHT_PAREN_ORD) - -/* Differs from ..._POSIX_EXTENDED in that RE_CONTEXT_INDEP_OPS is - removed and RE_NO_BK_REFS is added. */ -#define RE_SYNTAX_POSIX_MINIMAL_EXTENDED \ - (_RE_SYNTAX_POSIX_COMMON | RE_CONTEXT_INDEP_ANCHORS \ - | RE_CONTEXT_INVALID_OPS | RE_NO_BK_BRACES \ - | RE_NO_BK_PARENS | RE_NO_BK_REFS \ - | RE_NO_BK_VBAR | RE_UNMATCHED_RIGHT_PAREN_ORD) -/* [[[end syntaxes]]] */ - -/* Maximum number of duplicates an interval can allow. Some systems - (erroneously) define this in other header files, but we want our - value, so remove any previous define. */ -# ifdef RE_DUP_MAX -# undef RE_DUP_MAX -# endif -/* If sizeof(int) == 2, then ((1 << 15) - 1) overflows. */ -# define RE_DUP_MAX (0x7fff) -#endif - - -/* POSIX `cflags' bits (i.e., information for `regcomp'). */ - -/* If this bit is set, then use extended regular expression syntax. - If not set, then use basic regular expression syntax. */ -#define REG_EXTENDED 1 - -/* If this bit is set, then ignore case when matching. - If not set, then case is significant. */ -#define REG_ICASE (REG_EXTENDED << 1) - -/* If this bit is set, then anchors do not match at newline - characters in the string. - If not set, then anchors do match at newlines. */ -#define REG_NEWLINE (REG_ICASE << 1) - -/* If this bit is set, then report only success or fail in regexec. - If not set, then returns differ between not matching and errors. */ -#define REG_NOSUB (REG_NEWLINE << 1) - - -/* POSIX `eflags' bits (i.e., information for regexec). */ - -/* If this bit is set, then the beginning-of-line operator doesn't match - the beginning of the string (presumably because it's not the - beginning of a line). - If not set, then the beginning-of-line operator does match the - beginning of the string. */ -#define REG_NOTBOL 1 - -/* Like REG_NOTBOL, except for the end-of-line. */ -#define REG_NOTEOL (1 << 1) - -/* Use PMATCH[0] to delimit the start and end of the search in the - buffer. */ -#define REG_STARTEND (1 << 2) - - -/* If any error codes are removed, changed, or added, update the - `re_error_msg' table in regex.c. */ -typedef enum -{ -#if defined _XOPEN_SOURCE || defined __USE_XOPEN2K - REG_ENOSYS = -1, /* This will never happen for this implementation. */ -#endif - - REG_NOERROR = 0, /* Success. */ - REG_NOMATCH, /* Didn't find a match (for regexec). */ - - /* POSIX regcomp return error codes. (In the order listed in the - standard.) */ - REG_BADPAT, /* Invalid pattern. */ - REG_ECOLLATE, /* Inalid collating element. */ - REG_ECTYPE, /* Invalid character class name. */ - REG_EESCAPE, /* Trailing backslash. */ - REG_ESUBREG, /* Invalid back reference. */ - REG_EBRACK, /* Unmatched left bracket. */ - REG_EPAREN, /* Parenthesis imbalance. */ - REG_EBRACE, /* Unmatched \{. */ - REG_BADBR, /* Invalid contents of \{\}. */ - REG_ERANGE, /* Invalid range end. */ - REG_ESPACE, /* Ran out of memory. */ - REG_BADRPT, /* No preceding re for repetition op. */ - - /* Error codes we've added. */ - REG_EEND, /* Premature end. */ - REG_ESIZE, /* Compiled pattern bigger than 2^16 bytes. */ - REG_ERPAREN /* Unmatched ) or \); not returned from regcomp. */ -} reg_errcode_t; - -/* This data structure represents a compiled pattern. Before calling - the pattern compiler, the fields `buffer', `allocated', `fastmap', - `translate', and `no_sub' can be set. After the pattern has been - compiled, the `re_nsub' field is available. All other fields are - private to the regex routines. */ - -#ifndef RE_TRANSLATE_TYPE -# define __RE_TRANSLATE_TYPE unsigned char * -# ifdef __USE_GNU -# define RE_TRANSLATE_TYPE __RE_TRANSLATE_TYPE -# endif -#endif - -#ifdef __USE_GNU -# define __REPB_PREFIX(name) name -#else -# define __REPB_PREFIX(name) __##name -#endif - -struct re_pattern_buffer -{ - /* Space that holds the compiled pattern. It is declared as - `unsigned char *' because its elements are sometimes used as - array indexes. */ - unsigned char *__REPB_PREFIX(buffer); - - /* Number of bytes to which `buffer' points. */ - unsigned long int __REPB_PREFIX(allocated); - - /* Number of bytes actually used in `buffer'. */ - unsigned long int __REPB_PREFIX(used); - - /* Syntax setting with which the pattern was compiled. */ - reg_syntax_t __REPB_PREFIX(syntax); - - /* Pointer to a fastmap, if any, otherwise zero. re_search uses the - fastmap, if there is one, to skip over impossible starting points - for matches. */ - char *__REPB_PREFIX(fastmap); - - /* Either a translate table to apply to all characters before - comparing them, or zero for no translation. The translation is - applied to a pattern when it is compiled and to a string when it - is matched. */ - __RE_TRANSLATE_TYPE __REPB_PREFIX(translate); - - /* Number of subexpressions found by the compiler. */ - size_t re_nsub; - - /* Zero if this pattern cannot match the empty string, one else. - Well, in truth it's used only in `re_search_2', to see whether or - not we should use the fastmap, so we don't set this absolutely - perfectly; see `re_compile_fastmap' (the `duplicate' case). */ - unsigned __REPB_PREFIX(can_be_null) : 1; - - /* If REGS_UNALLOCATED, allocate space in the `regs' structure - for `max (RE_NREGS, re_nsub + 1)' groups. - If REGS_REALLOCATE, reallocate space if necessary. - If REGS_FIXED, use what's there. */ -#ifdef __USE_GNU -# define REGS_UNALLOCATED 0 -# define REGS_REALLOCATE 1 -# define REGS_FIXED 2 -#endif - unsigned __REPB_PREFIX(regs_allocated) : 2; - - /* Set to zero when `regex_compile' compiles a pattern; set to one - by `re_compile_fastmap' if it updates the fastmap. */ - unsigned __REPB_PREFIX(fastmap_accurate) : 1; - - /* If set, `re_match_2' does not return information about - subexpressions. */ - unsigned __REPB_PREFIX(no_sub) : 1; - - /* If set, a beginning-of-line anchor doesn't match at the beginning - of the string. */ - unsigned __REPB_PREFIX(not_bol) : 1; - - /* Similarly for an end-of-line anchor. */ - unsigned __REPB_PREFIX(not_eol) : 1; - - /* If true, an anchor at a newline matches. */ - unsigned __REPB_PREFIX(newline_anchor) : 1; -}; - -typedef struct re_pattern_buffer regex_t; - -/* Type for byte offsets within the string. POSIX mandates this. */ -typedef int regoff_t; - - -#ifdef __USE_GNU -/* This is the structure we store register match data in. See - regex.texinfo for a full description of what registers match. */ -struct re_registers -{ - unsigned num_regs; - regoff_t *start; - regoff_t *end; -}; - - -/* If `regs_allocated' is REGS_UNALLOCATED in the pattern buffer, - `re_match_2' returns information about at least this many registers - the first time a `regs' structure is passed. */ -# ifndef RE_NREGS -# define RE_NREGS 30 -# endif -#endif - - -/* POSIX specification for registers. Aside from the different names than - `re_registers', POSIX uses an array of structures, instead of a - structure of arrays. */ -typedef struct -{ - regoff_t rm_so; /* Byte offset from string's start to substring's start. */ - regoff_t rm_eo; /* Byte offset from string's start to substring's end. */ -} regmatch_t; - -/* Declarations for routines. */ - -#ifdef __USE_GNU -/* Sets the current default syntax to SYNTAX, and return the old syntax. - You can also simply assign to the `re_syntax_options' variable. */ -extern reg_syntax_t re_set_syntax (reg_syntax_t __syntax); - -/* Compile the regular expression PATTERN, with length LENGTH - and syntax given by the global `re_syntax_options', into the buffer - BUFFER. Return NULL if successful, and an error string if not. */ -extern const char *re_compile_pattern (const char *__pattern, size_t __length, - struct re_pattern_buffer *__buffer); - - -/* Compile a fastmap for the compiled pattern in BUFFER; used to - accelerate searches. Return 0 if successful and -2 if was an - internal error. */ -extern int re_compile_fastmap (struct re_pattern_buffer *__buffer); - - -/* Search in the string STRING (with length LENGTH) for the pattern - compiled into BUFFER. Start searching at position START, for RANGE - characters. Return the starting position of the match, -1 for no - match, or -2 for an internal error. Also return register - information in REGS (if REGS and BUFFER->no_sub are nonzero). */ -extern int re_search (struct re_pattern_buffer *__buffer, const char *__cstring, - int __length, int __start, int __range, - struct re_registers *__regs); - - -/* Like `re_search', but search in the concatenation of STRING1 and - STRING2. Also, stop searching at index START + STOP. */ -extern int re_search_2 (struct re_pattern_buffer *__buffer, - const char *__string1, int __length1, - const char *__string2, int __length2, int __start, - int __range, struct re_registers *__regs, int __stop); - - -/* Like `re_search', but return how many characters in STRING the regexp - in BUFFER matched, starting at position START. */ -extern int re_match (struct re_pattern_buffer *__buffer, const char *__cstring, - int __length, int __start, struct re_registers *__regs); - - -/* Relates to `re_match' as `re_search_2' relates to `re_search'. */ -extern int re_match_2 (struct re_pattern_buffer *__buffer, - const char *__string1, int __length1, - const char *__string2, int __length2, int __start, - struct re_registers *__regs, int __stop); - - -/* Set REGS to hold NUM_REGS registers, storing them in STARTS and - ENDS. Subsequent matches using BUFFER and REGS will use this memory - for recording register information. STARTS and ENDS must be - allocated with malloc, and must each be at least `NUM_REGS * sizeof - (regoff_t)' bytes long. - - If NUM_REGS == 0, then subsequent matches should allocate their own - register data. - - Unless this function is called, the first search or match using - PATTERN_BUFFER will allocate its own register data, without - freeing the old data. */ -extern void re_set_registers (struct re_pattern_buffer *__buffer, - struct re_registers *__regs, - unsigned int __num_regs, - regoff_t *__starts, regoff_t *__ends); -#endif /* Use GNU */ - -#if defined _REGEX_RE_COMP || (defined _LIBC && defined __USE_BSD) -# ifndef _CRAY -/* 4.2 bsd compatibility. */ -extern char *re_comp (const char *); -extern int re_exec (const char *); -# endif -#endif - -/* GCC 2.95 and later have "__restrict"; C99 compilers have - "restrict", and "configure" may have defined "restrict". */ -#ifndef __restrict -# if ! (2 < __GNUC__ || (2 == __GNUC__ && 95 <= __GNUC_MINOR__)) -# if defined restrict || 199901L <= __STDC_VERSION__ -# define __restrict restrict -# else -# define __restrict -# endif -# endif -#endif -/* gcc 3.1 and up support the [restrict] syntax. */ -#ifndef __restrict_arr -# if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)) \ - && !defined __GNUG__ -# define __restrict_arr __restrict -# else -# define __restrict_arr -# endif -#endif - -/* POSIX compatibility. */ -extern int regcomp (regex_t *__restrict __preg, - const char *__restrict __pattern, - int __cflags); - -extern int regexec (const regex_t *__restrict __preg, - const char *__restrict __cstring, size_t __nmatch, - regmatch_t __pmatch[__restrict_arr], - int __eflags); - -extern size_t regerror (int __errcode, const regex_t *__restrict __preg, - char *__restrict __errbuf, size_t __errbuf_size); - -extern void regfree (regex_t *__preg); - - -#ifdef __cplusplus -} -#endif /* C++ */ - -#endif /* regex.h */ diff --git a/vendor/libgit2/deps/regex/regex_internal.c b/vendor/libgit2/deps/regex/regex_internal.c deleted file mode 100644 index ad57c20dd..000000000 --- a/vendor/libgit2/deps/regex/regex_internal.c +++ /dev/null @@ -1,1744 +0,0 @@ -/* Extended regular expression matching and search library. - Copyright (C) 2002-2006, 2010 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Isamu Hasegawa . - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301 USA. */ - -static void re_string_construct_common (const char *str, int len, - re_string_t *pstr, - RE_TRANSLATE_TYPE trans, int icase, - const re_dfa_t *dfa) internal_function; -static re_dfastate_t *create_ci_newstate (const re_dfa_t *dfa, - const re_node_set *nodes, - unsigned int hash) internal_function; -static re_dfastate_t *create_cd_newstate (const re_dfa_t *dfa, - const re_node_set *nodes, - unsigned int context, - unsigned int hash) internal_function; - -#ifdef GAWK -#undef MAX /* safety */ -static size_t -MAX(size_t a, size_t b) -{ - return (a > b ? a : b); -} -#endif - -/* Functions for string operation. */ - -/* This function allocate the buffers. It is necessary to call - re_string_reconstruct before using the object. */ - -static reg_errcode_t -internal_function -re_string_allocate (re_string_t *pstr, const char *str, int len, int init_len, - RE_TRANSLATE_TYPE trans, int icase, const re_dfa_t *dfa) -{ - reg_errcode_t ret; - int init_buf_len; - - /* Ensure at least one character fits into the buffers. */ - if (init_len < dfa->mb_cur_max) - init_len = dfa->mb_cur_max; - init_buf_len = (len + 1 < init_len) ? len + 1: init_len; - re_string_construct_common (str, len, pstr, trans, icase, dfa); - - ret = re_string_realloc_buffers (pstr, init_buf_len); - if (BE (ret != REG_NOERROR, 0)) - return ret; - - pstr->word_char = dfa->word_char; - pstr->word_ops_used = dfa->word_ops_used; - pstr->mbs = pstr->mbs_allocated ? pstr->mbs : (unsigned char *) str; - pstr->valid_len = (pstr->mbs_allocated || dfa->mb_cur_max > 1) ? 0 : len; - pstr->valid_raw_len = pstr->valid_len; - return REG_NOERROR; -} - -/* This function allocate the buffers, and initialize them. */ - -static reg_errcode_t -internal_function -re_string_construct (re_string_t *pstr, const char *str, int len, - RE_TRANSLATE_TYPE trans, int icase, const re_dfa_t *dfa) -{ - reg_errcode_t ret; - memset (pstr, '\0', sizeof (re_string_t)); - re_string_construct_common (str, len, pstr, trans, icase, dfa); - - if (len > 0) - { - ret = re_string_realloc_buffers (pstr, len + 1); - if (BE (ret != REG_NOERROR, 0)) - return ret; - } - pstr->mbs = pstr->mbs_allocated ? pstr->mbs : (unsigned char *) str; - - if (icase) - { -#ifdef RE_ENABLE_I18N - if (dfa->mb_cur_max > 1) - { - while (1) - { - ret = build_wcs_upper_buffer (pstr); - if (BE (ret != REG_NOERROR, 0)) - return ret; - if (pstr->valid_raw_len >= len) - break; - if (pstr->bufs_len > pstr->valid_len + dfa->mb_cur_max) - break; - ret = re_string_realloc_buffers (pstr, pstr->bufs_len * 2); - if (BE (ret != REG_NOERROR, 0)) - return ret; - } - } - else -#endif /* RE_ENABLE_I18N */ - build_upper_buffer (pstr); - } - else - { -#ifdef RE_ENABLE_I18N - if (dfa->mb_cur_max > 1) - build_wcs_buffer (pstr); - else -#endif /* RE_ENABLE_I18N */ - { - if (trans != NULL) - re_string_translate_buffer (pstr); - else - { - pstr->valid_len = pstr->bufs_len; - pstr->valid_raw_len = pstr->bufs_len; - } - } - } - - return REG_NOERROR; -} - -/* Helper functions for re_string_allocate, and re_string_construct. */ - -static reg_errcode_t -internal_function -re_string_realloc_buffers (re_string_t *pstr, int new_buf_len) -{ -#ifdef RE_ENABLE_I18N - if (pstr->mb_cur_max > 1) - { - wint_t *new_wcs; - - /* Avoid overflow in realloc. */ - const size_t max_object_size = MAX (sizeof (wint_t), sizeof (int)); - if (BE (SIZE_MAX / max_object_size < new_buf_len, 0)) - return REG_ESPACE; - - new_wcs = re_realloc (pstr->wcs, wint_t, new_buf_len); - if (BE (new_wcs == NULL, 0)) - return REG_ESPACE; - pstr->wcs = new_wcs; - if (pstr->offsets != NULL) - { - int *new_offsets = re_realloc (pstr->offsets, int, new_buf_len); - if (BE (new_offsets == NULL, 0)) - return REG_ESPACE; - pstr->offsets = new_offsets; - } - } -#endif /* RE_ENABLE_I18N */ - if (pstr->mbs_allocated) - { - unsigned char *new_mbs = re_realloc (pstr->mbs, unsigned char, - new_buf_len); - if (BE (new_mbs == NULL, 0)) - return REG_ESPACE; - pstr->mbs = new_mbs; - } - pstr->bufs_len = new_buf_len; - return REG_NOERROR; -} - - -static void -internal_function -re_string_construct_common (const char *str, int len, re_string_t *pstr, - RE_TRANSLATE_TYPE trans, int icase, - const re_dfa_t *dfa) -{ - pstr->raw_mbs = (const unsigned char *) str; - pstr->len = len; - pstr->raw_len = len; - pstr->trans = trans; - pstr->icase = icase ? 1 : 0; - pstr->mbs_allocated = (trans != NULL || icase); - pstr->mb_cur_max = dfa->mb_cur_max; - pstr->is_utf8 = dfa->is_utf8; - pstr->map_notascii = dfa->map_notascii; - pstr->stop = pstr->len; - pstr->raw_stop = pstr->stop; -} - -#ifdef RE_ENABLE_I18N - -/* Build wide character buffer PSTR->WCS. - If the byte sequence of the string are: - (0), (1), (0), (1), - Then wide character buffer will be: - , WEOF , , WEOF , - We use WEOF for padding, they indicate that the position isn't - a first byte of a multibyte character. - - Note that this function assumes PSTR->VALID_LEN elements are already - built and starts from PSTR->VALID_LEN. */ - -static void -internal_function -build_wcs_buffer (re_string_t *pstr) -{ -#ifdef _LIBC - unsigned char buf[MB_LEN_MAX]; - assert (MB_LEN_MAX >= pstr->mb_cur_max); -#else - unsigned char buf[64]; -#endif - mbstate_t prev_st; - int byte_idx, end_idx, remain_len; - size_t mbclen; - - /* Build the buffers from pstr->valid_len to either pstr->len or - pstr->bufs_len. */ - end_idx = (pstr->bufs_len > pstr->len) ? pstr->len : pstr->bufs_len; - for (byte_idx = pstr->valid_len; byte_idx < end_idx;) - { - wchar_t wc; - const char *p; - - remain_len = end_idx - byte_idx; - prev_st = pstr->cur_state; - /* Apply the translation if we need. */ - if (BE (pstr->trans != NULL, 0)) - { - int i, ch; - - for (i = 0; i < pstr->mb_cur_max && i < remain_len; ++i) - { - ch = pstr->raw_mbs [pstr->raw_mbs_idx + byte_idx + i]; - buf[i] = pstr->mbs[byte_idx + i] = pstr->trans[ch]; - } - p = (const char *) buf; - } - else - p = (const char *) pstr->raw_mbs + pstr->raw_mbs_idx + byte_idx; - mbclen = __mbrtowc (&wc, p, remain_len, &pstr->cur_state); - if (BE (mbclen == (size_t) -2, 0)) - { - /* The buffer doesn't have enough space, finish to build. */ - pstr->cur_state = prev_st; - break; - } - else if (BE (mbclen == (size_t) -1 || mbclen == 0, 0)) - { - /* We treat these cases as a singlebyte character. */ - mbclen = 1; - wc = (wchar_t) pstr->raw_mbs[pstr->raw_mbs_idx + byte_idx]; - if (BE (pstr->trans != NULL, 0)) - wc = pstr->trans[wc]; - pstr->cur_state = prev_st; - } - - /* Write wide character and padding. */ - pstr->wcs[byte_idx++] = wc; - /* Write paddings. */ - for (remain_len = byte_idx + mbclen - 1; byte_idx < remain_len ;) - pstr->wcs[byte_idx++] = WEOF; - } - pstr->valid_len = byte_idx; - pstr->valid_raw_len = byte_idx; -} - -/* Build wide character buffer PSTR->WCS like build_wcs_buffer, - but for REG_ICASE. */ - -static reg_errcode_t -internal_function -build_wcs_upper_buffer (re_string_t *pstr) -{ - mbstate_t prev_st; - int src_idx, byte_idx, end_idx, remain_len; - size_t mbclen; -#ifdef _LIBC - char buf[MB_LEN_MAX]; - assert (MB_LEN_MAX >= pstr->mb_cur_max); -#else - char buf[64]; -#endif - - byte_idx = pstr->valid_len; - end_idx = (pstr->bufs_len > pstr->len) ? pstr->len : pstr->bufs_len; - - /* The following optimization assumes that ASCII characters can be - mapped to wide characters with a simple cast. */ - if (! pstr->map_notascii && pstr->trans == NULL && !pstr->offsets_needed) - { - while (byte_idx < end_idx) - { - wchar_t wc; - - if (isascii (pstr->raw_mbs[pstr->raw_mbs_idx + byte_idx]) - && mbsinit (&pstr->cur_state)) - { - /* In case of a singlebyte character. */ - pstr->mbs[byte_idx] - = toupper (pstr->raw_mbs[pstr->raw_mbs_idx + byte_idx]); - /* The next step uses the assumption that wchar_t is encoded - ASCII-safe: all ASCII values can be converted like this. */ - pstr->wcs[byte_idx] = (wchar_t) pstr->mbs[byte_idx]; - ++byte_idx; - continue; - } - - remain_len = end_idx - byte_idx; - prev_st = pstr->cur_state; - mbclen = __mbrtowc (&wc, - ((const char *) pstr->raw_mbs + pstr->raw_mbs_idx - + byte_idx), remain_len, &pstr->cur_state); - if (BE (mbclen + 2 > 2, 1)) - { - wchar_t wcu = wc; - if (iswlower (wc)) - { - size_t mbcdlen; - - wcu = towupper (wc); - mbcdlen = wcrtomb (buf, wcu, &prev_st); - if (BE (mbclen == mbcdlen, 1)) - memcpy (pstr->mbs + byte_idx, buf, mbclen); - else - { - src_idx = byte_idx; - goto offsets_needed; - } - } - else - memcpy (pstr->mbs + byte_idx, - pstr->raw_mbs + pstr->raw_mbs_idx + byte_idx, mbclen); - pstr->wcs[byte_idx++] = wcu; - /* Write paddings. */ - for (remain_len = byte_idx + mbclen - 1; byte_idx < remain_len ;) - pstr->wcs[byte_idx++] = WEOF; - } - else if (mbclen == (size_t) -1 || mbclen == 0) - { - /* It is an invalid character or '\0'. Just use the byte. */ - int ch = pstr->raw_mbs[pstr->raw_mbs_idx + byte_idx]; - pstr->mbs[byte_idx] = ch; - /* And also cast it to wide char. */ - pstr->wcs[byte_idx++] = (wchar_t) ch; - if (BE (mbclen == (size_t) -1, 0)) - pstr->cur_state = prev_st; - } - else - { - /* The buffer doesn't have enough space, finish to build. */ - pstr->cur_state = prev_st; - break; - } - } - pstr->valid_len = byte_idx; - pstr->valid_raw_len = byte_idx; - return REG_NOERROR; - } - else - for (src_idx = pstr->valid_raw_len; byte_idx < end_idx;) - { - wchar_t wc; - const char *p; - offsets_needed: - remain_len = end_idx - byte_idx; - prev_st = pstr->cur_state; - if (BE (pstr->trans != NULL, 0)) - { - int i, ch; - - for (i = 0; i < pstr->mb_cur_max && i < remain_len; ++i) - { - ch = pstr->raw_mbs [pstr->raw_mbs_idx + src_idx + i]; - buf[i] = pstr->trans[ch]; - } - p = (const char *) buf; - } - else - p = (const char *) pstr->raw_mbs + pstr->raw_mbs_idx + src_idx; - mbclen = __mbrtowc (&wc, p, remain_len, &pstr->cur_state); - if (BE (mbclen + 2 > 2, 1)) - { - wchar_t wcu = wc; - if (iswlower (wc)) - { - size_t mbcdlen; - - wcu = towupper (wc); - mbcdlen = wcrtomb ((char *) buf, wcu, &prev_st); - if (BE (mbclen == mbcdlen, 1)) - memcpy (pstr->mbs + byte_idx, buf, mbclen); - else if (mbcdlen != (size_t) -1) - { - size_t i; - - if (byte_idx + mbcdlen > pstr->bufs_len) - { - pstr->cur_state = prev_st; - break; - } - - if (pstr->offsets == NULL) - { - pstr->offsets = re_malloc (int, pstr->bufs_len); - - if (pstr->offsets == NULL) - return REG_ESPACE; - } - if (!pstr->offsets_needed) - { - for (i = 0; i < (size_t) byte_idx; ++i) - pstr->offsets[i] = i; - pstr->offsets_needed = 1; - } - - memcpy (pstr->mbs + byte_idx, buf, mbcdlen); - pstr->wcs[byte_idx] = wcu; - pstr->offsets[byte_idx] = src_idx; - for (i = 1; i < mbcdlen; ++i) - { - pstr->offsets[byte_idx + i] - = src_idx + (i < mbclen ? i : mbclen - 1); - pstr->wcs[byte_idx + i] = WEOF; - } - pstr->len += mbcdlen - mbclen; - if (pstr->raw_stop > src_idx) - pstr->stop += mbcdlen - mbclen; - end_idx = (pstr->bufs_len > pstr->len) - ? pstr->len : pstr->bufs_len; - byte_idx += mbcdlen; - src_idx += mbclen; - continue; - } - else - memcpy (pstr->mbs + byte_idx, p, mbclen); - } - else - memcpy (pstr->mbs + byte_idx, p, mbclen); - - if (BE (pstr->offsets_needed != 0, 0)) - { - size_t i; - for (i = 0; i < mbclen; ++i) - pstr->offsets[byte_idx + i] = src_idx + i; - } - src_idx += mbclen; - - pstr->wcs[byte_idx++] = wcu; - /* Write paddings. */ - for (remain_len = byte_idx + mbclen - 1; byte_idx < remain_len ;) - pstr->wcs[byte_idx++] = WEOF; - } - else if (mbclen == (size_t) -1 || mbclen == 0) - { - /* It is an invalid character or '\0'. Just use the byte. */ - int ch = pstr->raw_mbs[pstr->raw_mbs_idx + src_idx]; - - if (BE (pstr->trans != NULL, 0)) - ch = pstr->trans [ch]; - pstr->mbs[byte_idx] = ch; - - if (BE (pstr->offsets_needed != 0, 0)) - pstr->offsets[byte_idx] = src_idx; - ++src_idx; - - /* And also cast it to wide char. */ - pstr->wcs[byte_idx++] = (wchar_t) ch; - if (BE (mbclen == (size_t) -1, 0)) - pstr->cur_state = prev_st; - } - else - { - /* The buffer doesn't have enough space, finish to build. */ - pstr->cur_state = prev_st; - break; - } - } - pstr->valid_len = byte_idx; - pstr->valid_raw_len = src_idx; - return REG_NOERROR; -} - -/* Skip characters until the index becomes greater than NEW_RAW_IDX. - Return the index. */ - -static int -internal_function -re_string_skip_chars (re_string_t *pstr, int new_raw_idx, wint_t *last_wc) -{ - mbstate_t prev_st; - int rawbuf_idx; - size_t mbclen; - wint_t wc = WEOF; - - /* Skip the characters which are not necessary to check. */ - for (rawbuf_idx = pstr->raw_mbs_idx + pstr->valid_raw_len; - rawbuf_idx < new_raw_idx;) - { - wchar_t wc2; - int remain_len = pstr->len - rawbuf_idx; - prev_st = pstr->cur_state; - mbclen = __mbrtowc (&wc2, (const char *) pstr->raw_mbs + rawbuf_idx, - remain_len, &pstr->cur_state); - if (BE (mbclen == (size_t) -2 || mbclen == (size_t) -1 || mbclen == 0, 0)) - { - /* We treat these cases as a single byte character. */ - if (mbclen == 0 || remain_len == 0) - wc = L'\0'; - else - wc = *(unsigned char *) (pstr->raw_mbs + rawbuf_idx); - mbclen = 1; - pstr->cur_state = prev_st; - } - else - wc = (wint_t) wc2; - /* Then proceed the next character. */ - rawbuf_idx += mbclen; - } - *last_wc = (wint_t) wc; - return rawbuf_idx; -} -#endif /* RE_ENABLE_I18N */ - -/* Build the buffer PSTR->MBS, and apply the translation if we need. - This function is used in case of REG_ICASE. */ - -static void -internal_function -build_upper_buffer (re_string_t *pstr) -{ - int char_idx, end_idx; - end_idx = (pstr->bufs_len > pstr->len) ? pstr->len : pstr->bufs_len; - - for (char_idx = pstr->valid_len; char_idx < end_idx; ++char_idx) - { - int ch = pstr->raw_mbs[pstr->raw_mbs_idx + char_idx]; - if (BE (pstr->trans != NULL, 0)) - ch = pstr->trans[ch]; - if (islower (ch)) - pstr->mbs[char_idx] = toupper (ch); - else - pstr->mbs[char_idx] = ch; - } - pstr->valid_len = char_idx; - pstr->valid_raw_len = char_idx; -} - -/* Apply TRANS to the buffer in PSTR. */ - -static void -internal_function -re_string_translate_buffer (re_string_t *pstr) -{ - int buf_idx, end_idx; - end_idx = (pstr->bufs_len > pstr->len) ? pstr->len : pstr->bufs_len; - - for (buf_idx = pstr->valid_len; buf_idx < end_idx; ++buf_idx) - { - int ch = pstr->raw_mbs[pstr->raw_mbs_idx + buf_idx]; - pstr->mbs[buf_idx] = pstr->trans[ch]; - } - - pstr->valid_len = buf_idx; - pstr->valid_raw_len = buf_idx; -} - -/* This function re-construct the buffers. - Concretely, convert to wide character in case of pstr->mb_cur_max > 1, - convert to upper case in case of REG_ICASE, apply translation. */ - -static reg_errcode_t -internal_function -re_string_reconstruct (re_string_t *pstr, int idx, int eflags) -{ - int offset = idx - pstr->raw_mbs_idx; - if (BE (offset < 0, 0)) - { - /* Reset buffer. */ -#ifdef RE_ENABLE_I18N - if (pstr->mb_cur_max > 1) - memset (&pstr->cur_state, '\0', sizeof (mbstate_t)); -#endif /* RE_ENABLE_I18N */ - pstr->len = pstr->raw_len; - pstr->stop = pstr->raw_stop; - pstr->valid_len = 0; - pstr->raw_mbs_idx = 0; - pstr->valid_raw_len = 0; - pstr->offsets_needed = 0; - pstr->tip_context = ((eflags & REG_NOTBOL) ? CONTEXT_BEGBUF - : CONTEXT_NEWLINE | CONTEXT_BEGBUF); - if (!pstr->mbs_allocated) - pstr->mbs = (unsigned char *) pstr->raw_mbs; - offset = idx; - } - - if (BE (offset != 0, 1)) - { - /* Should the already checked characters be kept? */ - if (BE (offset < pstr->valid_raw_len, 1)) - { - /* Yes, move them to the front of the buffer. */ -#ifdef RE_ENABLE_I18N - if (BE (pstr->offsets_needed, 0)) - { - int low = 0, high = pstr->valid_len, mid; - do - { - mid = (high + low) / 2; - if (pstr->offsets[mid] > offset) - high = mid; - else if (pstr->offsets[mid] < offset) - low = mid + 1; - else - break; - } - while (low < high); - if (pstr->offsets[mid] < offset) - ++mid; - pstr->tip_context = re_string_context_at (pstr, mid - 1, - eflags); - /* This can be quite complicated, so handle specially - only the common and easy case where the character with - different length representation of lower and upper - case is present at or after offset. */ - if (pstr->valid_len > offset - && mid == offset && pstr->offsets[mid] == offset) - { - memmove (pstr->wcs, pstr->wcs + offset, - (pstr->valid_len - offset) * sizeof (wint_t)); - memmove (pstr->mbs, pstr->mbs + offset, pstr->valid_len - offset); - pstr->valid_len -= offset; - pstr->valid_raw_len -= offset; - for (low = 0; low < pstr->valid_len; low++) - pstr->offsets[low] = pstr->offsets[low + offset] - offset; - } - else - { - /* Otherwise, just find out how long the partial multibyte - character at offset is and fill it with WEOF/255. */ - pstr->len = pstr->raw_len - idx + offset; - pstr->stop = pstr->raw_stop - idx + offset; - pstr->offsets_needed = 0; - while (mid > 0 && pstr->offsets[mid - 1] == offset) - --mid; - while (mid < pstr->valid_len) - if (pstr->wcs[mid] != WEOF) - break; - else - ++mid; - if (mid == pstr->valid_len) - pstr->valid_len = 0; - else - { - pstr->valid_len = pstr->offsets[mid] - offset; - if (pstr->valid_len) - { - for (low = 0; low < pstr->valid_len; ++low) - pstr->wcs[low] = WEOF; - memset (pstr->mbs, 255, pstr->valid_len); - } - } - pstr->valid_raw_len = pstr->valid_len; - } - } - else -#endif - { - pstr->tip_context = re_string_context_at (pstr, offset - 1, - eflags); -#ifdef RE_ENABLE_I18N - if (pstr->mb_cur_max > 1) - memmove (pstr->wcs, pstr->wcs + offset, - (pstr->valid_len - offset) * sizeof (wint_t)); -#endif /* RE_ENABLE_I18N */ - if (BE (pstr->mbs_allocated, 0)) - memmove (pstr->mbs, pstr->mbs + offset, - pstr->valid_len - offset); - pstr->valid_len -= offset; - pstr->valid_raw_len -= offset; -#if DEBUG - assert (pstr->valid_len > 0); -#endif - } - } - else - { -#ifdef RE_ENABLE_I18N - /* No, skip all characters until IDX. */ - int prev_valid_len = pstr->valid_len; - - if (BE (pstr->offsets_needed, 0)) - { - pstr->len = pstr->raw_len - idx + offset; - pstr->stop = pstr->raw_stop - idx + offset; - pstr->offsets_needed = 0; - } -#endif - pstr->valid_len = 0; -#ifdef RE_ENABLE_I18N - if (pstr->mb_cur_max > 1) - { - int wcs_idx; - wint_t wc = WEOF; - - if (pstr->is_utf8) - { - const unsigned char *raw, *p, *end; - - /* Special case UTF-8. Multi-byte chars start with any - byte other than 0x80 - 0xbf. */ - raw = pstr->raw_mbs + pstr->raw_mbs_idx; - end = raw + (offset - pstr->mb_cur_max); - if (end < pstr->raw_mbs) - end = pstr->raw_mbs; - p = raw + offset - 1; -#ifdef _LIBC - /* We know the wchar_t encoding is UCS4, so for the simple - case, ASCII characters, skip the conversion step. */ - if (isascii (*p) && BE (pstr->trans == NULL, 1)) - { - memset (&pstr->cur_state, '\0', sizeof (mbstate_t)); - /* pstr->valid_len = 0; */ - wc = (wchar_t) *p; - } - else -#endif - for (; p >= end; --p) - if ((*p & 0xc0) != 0x80) - { - mbstate_t cur_state; - wchar_t wc2; - int mlen = raw + pstr->len - p; - unsigned char buf[6]; - size_t mbclen; - - if (BE (pstr->trans != NULL, 0)) - { - int i = mlen < 6 ? mlen : 6; - while (--i >= 0) - buf[i] = pstr->trans[p[i]]; - } - /* XXX Don't use mbrtowc, we know which conversion - to use (UTF-8 -> UCS4). */ - memset (&cur_state, 0, sizeof (cur_state)); - mbclen = __mbrtowc (&wc2, (const char *) p, mlen, - &cur_state); - if (raw + offset - p <= mbclen - && mbclen < (size_t) -2) - { - memset (&pstr->cur_state, '\0', - sizeof (mbstate_t)); - pstr->valid_len = mbclen - (raw + offset - p); - wc = wc2; - } - break; - } - } - - if (wc == WEOF) - pstr->valid_len = re_string_skip_chars (pstr, idx, &wc) - idx; - if (wc == WEOF) - pstr->tip_context - = re_string_context_at (pstr, prev_valid_len - 1, eflags); - else - pstr->tip_context = ((BE (pstr->word_ops_used != 0, 0) - && IS_WIDE_WORD_CHAR (wc)) - ? CONTEXT_WORD - : ((IS_WIDE_NEWLINE (wc) - && pstr->newline_anchor) - ? CONTEXT_NEWLINE : 0)); - if (BE (pstr->valid_len, 0)) - { - for (wcs_idx = 0; wcs_idx < pstr->valid_len; ++wcs_idx) - pstr->wcs[wcs_idx] = WEOF; - if (pstr->mbs_allocated) - memset (pstr->mbs, 255, pstr->valid_len); - } - pstr->valid_raw_len = pstr->valid_len; - } - else -#endif /* RE_ENABLE_I18N */ - { - int c = pstr->raw_mbs[pstr->raw_mbs_idx + offset - 1]; - pstr->valid_raw_len = 0; - if (pstr->trans) - c = pstr->trans[c]; - pstr->tip_context = (bitset_contain (pstr->word_char, c) - ? CONTEXT_WORD - : ((IS_NEWLINE (c) && pstr->newline_anchor) - ? CONTEXT_NEWLINE : 0)); - } - } - if (!BE (pstr->mbs_allocated, 0)) - pstr->mbs += offset; - } - pstr->raw_mbs_idx = idx; - pstr->len -= offset; - pstr->stop -= offset; - - /* Then build the buffers. */ -#ifdef RE_ENABLE_I18N - if (pstr->mb_cur_max > 1) - { - if (pstr->icase) - { - reg_errcode_t ret = build_wcs_upper_buffer (pstr); - if (BE (ret != REG_NOERROR, 0)) - return ret; - } - else - build_wcs_buffer (pstr); - } - else -#endif /* RE_ENABLE_I18N */ - if (BE (pstr->mbs_allocated, 0)) - { - if (pstr->icase) - build_upper_buffer (pstr); - else if (pstr->trans != NULL) - re_string_translate_buffer (pstr); - } - else - pstr->valid_len = pstr->len; - - pstr->cur_idx = 0; - return REG_NOERROR; -} - -static unsigned char -internal_function __attribute ((pure)) -re_string_peek_byte_case (const re_string_t *pstr, int idx) -{ - int ch, off; - - /* Handle the common (easiest) cases first. */ - if (BE (!pstr->mbs_allocated, 1)) - return re_string_peek_byte (pstr, idx); - -#ifdef RE_ENABLE_I18N - if (pstr->mb_cur_max > 1 - && ! re_string_is_single_byte_char (pstr, pstr->cur_idx + idx)) - return re_string_peek_byte (pstr, idx); -#endif - - off = pstr->cur_idx + idx; -#ifdef RE_ENABLE_I18N - if (pstr->offsets_needed) - off = pstr->offsets[off]; -#endif - - ch = pstr->raw_mbs[pstr->raw_mbs_idx + off]; - -#ifdef RE_ENABLE_I18N - /* Ensure that e.g. for tr_TR.UTF-8 BACKSLASH DOTLESS SMALL LETTER I - this function returns CAPITAL LETTER I instead of first byte of - DOTLESS SMALL LETTER I. The latter would confuse the parser, - since peek_byte_case doesn't advance cur_idx in any way. */ - if (pstr->offsets_needed && !isascii (ch)) - return re_string_peek_byte (pstr, idx); -#endif - - return ch; -} - -static unsigned char -internal_function __attribute ((pure)) -re_string_fetch_byte_case (re_string_t *pstr) -{ - if (BE (!pstr->mbs_allocated, 1)) - return re_string_fetch_byte (pstr); - -#ifdef RE_ENABLE_I18N - if (pstr->offsets_needed) - { - int off, ch; - - /* For tr_TR.UTF-8 [[:islower:]] there is - [[: CAPITAL LETTER I WITH DOT lower:]] in mbs. Skip - in that case the whole multi-byte character and return - the original letter. On the other side, with - [[: DOTLESS SMALL LETTER I return [[:I, as doing - anything else would complicate things too much. */ - - if (!re_string_first_byte (pstr, pstr->cur_idx)) - return re_string_fetch_byte (pstr); - - off = pstr->offsets[pstr->cur_idx]; - ch = pstr->raw_mbs[pstr->raw_mbs_idx + off]; - - if (! isascii (ch)) - return re_string_fetch_byte (pstr); - - re_string_skip_bytes (pstr, - re_string_char_size_at (pstr, pstr->cur_idx)); - return ch; - } -#endif - - return pstr->raw_mbs[pstr->raw_mbs_idx + pstr->cur_idx++]; -} - -static void -internal_function -re_string_destruct (re_string_t *pstr) -{ -#ifdef RE_ENABLE_I18N - re_free (pstr->wcs); - re_free (pstr->offsets); -#endif /* RE_ENABLE_I18N */ - if (pstr->mbs_allocated) - re_free (pstr->mbs); -} - -/* Return the context at IDX in INPUT. */ - -static unsigned int -internal_function -re_string_context_at (const re_string_t *input, int idx, int eflags) -{ - int c; - if (BE (idx < 0, 0)) - /* In this case, we use the value stored in input->tip_context, - since we can't know the character in input->mbs[-1] here. */ - return input->tip_context; - if (BE (idx == input->len, 0)) - return ((eflags & REG_NOTEOL) ? CONTEXT_ENDBUF - : CONTEXT_NEWLINE | CONTEXT_ENDBUF); -#ifdef RE_ENABLE_I18N - if (input->mb_cur_max > 1) - { - wint_t wc; - int wc_idx = idx; - while(input->wcs[wc_idx] == WEOF) - { -#ifdef DEBUG - /* It must not happen. */ - assert (wc_idx >= 0); -#endif - --wc_idx; - if (wc_idx < 0) - return input->tip_context; - } - wc = input->wcs[wc_idx]; - if (BE (input->word_ops_used != 0, 0) && IS_WIDE_WORD_CHAR (wc)) - return CONTEXT_WORD; - return (IS_WIDE_NEWLINE (wc) && input->newline_anchor - ? CONTEXT_NEWLINE : 0); - } - else -#endif - { - c = re_string_byte_at (input, idx); - if (bitset_contain (input->word_char, c)) - return CONTEXT_WORD; - return IS_NEWLINE (c) && input->newline_anchor ? CONTEXT_NEWLINE : 0; - } -} - -/* Functions for set operation. */ - -static reg_errcode_t -internal_function -re_node_set_alloc (re_node_set *set, int size) -{ - /* - * ADR: valgrind says size can be 0, which then doesn't - * free the block of size 0. Harumph. This seems - * to work ok, though. - */ - if (size == 0) - { - memset(set, 0, sizeof(*set)); - return REG_NOERROR; - } - set->alloc = size; - set->nelem = 0; - set->elems = re_malloc (int, size); - if (BE (set->elems == NULL, 0)) - return REG_ESPACE; - return REG_NOERROR; -} - -static reg_errcode_t -internal_function -re_node_set_init_1 (re_node_set *set, int elem) -{ - set->alloc = 1; - set->nelem = 1; - set->elems = re_malloc (int, 1); - if (BE (set->elems == NULL, 0)) - { - set->alloc = set->nelem = 0; - return REG_ESPACE; - } - set->elems[0] = elem; - return REG_NOERROR; -} - -static reg_errcode_t -internal_function -re_node_set_init_2 (re_node_set *set, int elem1, int elem2) -{ - set->alloc = 2; - set->elems = re_malloc (int, 2); - if (BE (set->elems == NULL, 0)) - return REG_ESPACE; - if (elem1 == elem2) - { - set->nelem = 1; - set->elems[0] = elem1; - } - else - { - set->nelem = 2; - if (elem1 < elem2) - { - set->elems[0] = elem1; - set->elems[1] = elem2; - } - else - { - set->elems[0] = elem2; - set->elems[1] = elem1; - } - } - return REG_NOERROR; -} - -static reg_errcode_t -internal_function -re_node_set_init_copy (re_node_set *dest, const re_node_set *src) -{ - dest->nelem = src->nelem; - if (src->nelem > 0) - { - dest->alloc = dest->nelem; - dest->elems = re_malloc (int, dest->alloc); - if (BE (dest->elems == NULL, 0)) - { - dest->alloc = dest->nelem = 0; - return REG_ESPACE; - } - memcpy (dest->elems, src->elems, src->nelem * sizeof (int)); - } - else - re_node_set_init_empty (dest); - return REG_NOERROR; -} - -/* Calculate the intersection of the sets SRC1 and SRC2. And merge it to - DEST. Return value indicate the error code or REG_NOERROR if succeeded. - Note: We assume dest->elems is NULL, when dest->alloc is 0. */ - -static reg_errcode_t -internal_function -re_node_set_add_intersect (re_node_set *dest, const re_node_set *src1, - const re_node_set *src2) -{ - int i1, i2, is, id, delta, sbase; - if (src1->nelem == 0 || src2->nelem == 0) - return REG_NOERROR; - - /* We need dest->nelem + 2 * elems_in_intersection; this is a - conservative estimate. */ - if (src1->nelem + src2->nelem + dest->nelem > dest->alloc) - { - int new_alloc = src1->nelem + src2->nelem + dest->alloc; - int *new_elems = re_realloc (dest->elems, int, new_alloc); - if (BE (new_elems == NULL, 0)) - return REG_ESPACE; - dest->elems = new_elems; - dest->alloc = new_alloc; - } - - /* Find the items in the intersection of SRC1 and SRC2, and copy - into the top of DEST those that are not already in DEST itself. */ - sbase = dest->nelem + src1->nelem + src2->nelem; - i1 = src1->nelem - 1; - i2 = src2->nelem - 1; - id = dest->nelem - 1; - for (;;) - { - if (src1->elems[i1] == src2->elems[i2]) - { - /* Try to find the item in DEST. Maybe we could binary search? */ - while (id >= 0 && dest->elems[id] > src1->elems[i1]) - --id; - - if (id < 0 || dest->elems[id] != src1->elems[i1]) - dest->elems[--sbase] = src1->elems[i1]; - - if (--i1 < 0 || --i2 < 0) - break; - } - - /* Lower the highest of the two items. */ - else if (src1->elems[i1] < src2->elems[i2]) - { - if (--i2 < 0) - break; - } - else - { - if (--i1 < 0) - break; - } - } - - id = dest->nelem - 1; - is = dest->nelem + src1->nelem + src2->nelem - 1; - delta = is - sbase + 1; - - /* Now copy. When DELTA becomes zero, the remaining - DEST elements are already in place; this is more or - less the same loop that is in re_node_set_merge. */ - dest->nelem += delta; - if (delta > 0 && id >= 0) - for (;;) - { - if (dest->elems[is] > dest->elems[id]) - { - /* Copy from the top. */ - dest->elems[id + delta--] = dest->elems[is--]; - if (delta == 0) - break; - } - else - { - /* Slide from the bottom. */ - dest->elems[id + delta] = dest->elems[id]; - if (--id < 0) - break; - } - } - - /* Copy remaining SRC elements. */ - memcpy (dest->elems, dest->elems + sbase, delta * sizeof (int)); - - return REG_NOERROR; -} - -/* Calculate the union set of the sets SRC1 and SRC2. And store it to - DEST. Return value indicate the error code or REG_NOERROR if succeeded. */ - -static reg_errcode_t -internal_function -re_node_set_init_union (re_node_set *dest, const re_node_set *src1, - const re_node_set *src2) -{ - int i1, i2, id; - if (src1 != NULL && src1->nelem > 0 && src2 != NULL && src2->nelem > 0) - { - dest->alloc = src1->nelem + src2->nelem; - dest->elems = re_malloc (int, dest->alloc); - if (BE (dest->elems == NULL, 0)) - return REG_ESPACE; - } - else - { - if (src1 != NULL && src1->nelem > 0) - return re_node_set_init_copy (dest, src1); - else if (src2 != NULL && src2->nelem > 0) - return re_node_set_init_copy (dest, src2); - else - re_node_set_init_empty (dest); - return REG_NOERROR; - } - for (i1 = i2 = id = 0 ; i1 < src1->nelem && i2 < src2->nelem ;) - { - if (src1->elems[i1] > src2->elems[i2]) - { - dest->elems[id++] = src2->elems[i2++]; - continue; - } - if (src1->elems[i1] == src2->elems[i2]) - ++i2; - dest->elems[id++] = src1->elems[i1++]; - } - if (i1 < src1->nelem) - { - memcpy (dest->elems + id, src1->elems + i1, - (src1->nelem - i1) * sizeof (int)); - id += src1->nelem - i1; - } - else if (i2 < src2->nelem) - { - memcpy (dest->elems + id, src2->elems + i2, - (src2->nelem - i2) * sizeof (int)); - id += src2->nelem - i2; - } - dest->nelem = id; - return REG_NOERROR; -} - -/* Calculate the union set of the sets DEST and SRC. And store it to - DEST. Return value indicate the error code or REG_NOERROR if succeeded. */ - -static reg_errcode_t -internal_function -re_node_set_merge (re_node_set *dest, const re_node_set *src) -{ - int is, id, sbase, delta; - if (src == NULL || src->nelem == 0) - return REG_NOERROR; - if (dest->alloc < 2 * src->nelem + dest->nelem) - { - int new_alloc = 2 * (src->nelem + dest->alloc); - int *new_buffer = re_realloc (dest->elems, int, new_alloc); - if (BE (new_buffer == NULL, 0)) - return REG_ESPACE; - dest->elems = new_buffer; - dest->alloc = new_alloc; - } - - if (BE (dest->nelem == 0, 0)) - { - dest->nelem = src->nelem; - memcpy (dest->elems, src->elems, src->nelem * sizeof (int)); - return REG_NOERROR; - } - - /* Copy into the top of DEST the items of SRC that are not - found in DEST. Maybe we could binary search in DEST? */ - for (sbase = dest->nelem + 2 * src->nelem, - is = src->nelem - 1, id = dest->nelem - 1; is >= 0 && id >= 0; ) - { - if (dest->elems[id] == src->elems[is]) - is--, id--; - else if (dest->elems[id] < src->elems[is]) - dest->elems[--sbase] = src->elems[is--]; - else /* if (dest->elems[id] > src->elems[is]) */ - --id; - } - - if (is >= 0) - { - /* If DEST is exhausted, the remaining items of SRC must be unique. */ - sbase -= is + 1; - memcpy (dest->elems + sbase, src->elems, (is + 1) * sizeof (int)); - } - - id = dest->nelem - 1; - is = dest->nelem + 2 * src->nelem - 1; - delta = is - sbase + 1; - if (delta == 0) - return REG_NOERROR; - - /* Now copy. When DELTA becomes zero, the remaining - DEST elements are already in place. */ - dest->nelem += delta; - for (;;) - { - if (dest->elems[is] > dest->elems[id]) - { - /* Copy from the top. */ - dest->elems[id + delta--] = dest->elems[is--]; - if (delta == 0) - break; - } - else - { - /* Slide from the bottom. */ - dest->elems[id + delta] = dest->elems[id]; - if (--id < 0) - { - /* Copy remaining SRC elements. */ - memcpy (dest->elems, dest->elems + sbase, - delta * sizeof (int)); - break; - } - } - } - - return REG_NOERROR; -} - -/* Insert the new element ELEM to the re_node_set* SET. - SET should not already have ELEM. - return -1 if an error is occured, return 1 otherwise. */ - -static int -internal_function -re_node_set_insert (re_node_set *set, int elem) -{ - int idx; - /* In case the set is empty. */ - if (set->alloc == 0) - { - if (BE (re_node_set_init_1 (set, elem) == REG_NOERROR, 1)) - return 1; - else - return -1; - } - - if (BE (set->nelem, 0) == 0) - { - /* We already guaranteed above that set->alloc != 0. */ - set->elems[0] = elem; - ++set->nelem; - return 1; - } - - /* Realloc if we need. */ - if (set->alloc == set->nelem) - { - int *new_elems; - set->alloc = set->alloc * 2; - new_elems = re_realloc (set->elems, int, set->alloc); - if (BE (new_elems == NULL, 0)) - return -1; - set->elems = new_elems; - } - - /* Move the elements which follows the new element. Test the - first element separately to skip a check in the inner loop. */ - if (elem < set->elems[0]) - { - idx = 0; - for (idx = set->nelem; idx > 0; idx--) - set->elems[idx] = set->elems[idx - 1]; - } - else - { - for (idx = set->nelem; set->elems[idx - 1] > elem; idx--) - set->elems[idx] = set->elems[idx - 1]; - } - - /* Insert the new element. */ - set->elems[idx] = elem; - ++set->nelem; - return 1; -} - -/* Insert the new element ELEM to the re_node_set* SET. - SET should not already have any element greater than or equal to ELEM. - Return -1 if an error is occured, return 1 otherwise. */ - -static int -internal_function -re_node_set_insert_last (re_node_set *set, int elem) -{ - /* Realloc if we need. */ - if (set->alloc == set->nelem) - { - int *new_elems; - set->alloc = (set->alloc + 1) * 2; - new_elems = re_realloc (set->elems, int, set->alloc); - if (BE (new_elems == NULL, 0)) - return -1; - set->elems = new_elems; - } - - /* Insert the new element. */ - set->elems[set->nelem++] = elem; - return 1; -} - -/* Compare two node sets SET1 and SET2. - return 1 if SET1 and SET2 are equivalent, return 0 otherwise. */ - -static int -internal_function __attribute ((pure)) -re_node_set_compare (const re_node_set *set1, const re_node_set *set2) -{ - int i; - if (set1 == NULL || set2 == NULL || set1->nelem != set2->nelem) - return 0; - for (i = set1->nelem ; --i >= 0 ; ) - if (set1->elems[i] != set2->elems[i]) - return 0; - return 1; -} - -/* Return (idx + 1) if SET contains the element ELEM, return 0 otherwise. */ - -static int -internal_function __attribute ((pure)) -re_node_set_contains (const re_node_set *set, int elem) -{ - unsigned int idx, right, mid; - if (set->nelem <= 0) - return 0; - - /* Binary search the element. */ - idx = 0; - right = set->nelem - 1; - while (idx < right) - { - mid = (idx + right) / 2; - if (set->elems[mid] < elem) - idx = mid + 1; - else - right = mid; - } - return set->elems[idx] == elem ? idx + 1 : 0; -} - -static void -internal_function -re_node_set_remove_at (re_node_set *set, int idx) -{ - if (idx < 0 || idx >= set->nelem) - return; - --set->nelem; - for (; idx < set->nelem; idx++) - set->elems[idx] = set->elems[idx + 1]; -} - - -/* Add the token TOKEN to dfa->nodes, and return the index of the token. - Or return -1, if an error will be occured. */ - -static int -internal_function -re_dfa_add_node (re_dfa_t *dfa, re_token_t token) -{ - if (BE (dfa->nodes_len >= dfa->nodes_alloc, 0)) - { - size_t new_nodes_alloc = dfa->nodes_alloc * 2; - int *new_nexts, *new_indices; - re_node_set *new_edests, *new_eclosures; - re_token_t *new_nodes; - - /* Avoid overflows in realloc. */ - const size_t max_object_size = MAX (sizeof (re_token_t), - MAX (sizeof (re_node_set), - sizeof (int))); - if (BE (SIZE_MAX / max_object_size < new_nodes_alloc, 0)) - return -1; - - new_nodes = re_realloc (dfa->nodes, re_token_t, new_nodes_alloc); - if (BE (new_nodes == NULL, 0)) - return -1; - dfa->nodes = new_nodes; - new_nexts = re_realloc (dfa->nexts, int, new_nodes_alloc); - new_indices = re_realloc (dfa->org_indices, int, new_nodes_alloc); - new_edests = re_realloc (dfa->edests, re_node_set, new_nodes_alloc); - new_eclosures = re_realloc (dfa->eclosures, re_node_set, new_nodes_alloc); - if (BE (new_nexts == NULL || new_indices == NULL - || new_edests == NULL || new_eclosures == NULL, 0)) - return -1; - dfa->nexts = new_nexts; - dfa->org_indices = new_indices; - dfa->edests = new_edests; - dfa->eclosures = new_eclosures; - dfa->nodes_alloc = new_nodes_alloc; - } - dfa->nodes[dfa->nodes_len] = token; - dfa->nodes[dfa->nodes_len].constraint = 0; -#ifdef RE_ENABLE_I18N - dfa->nodes[dfa->nodes_len].accept_mb = - (token.type == OP_PERIOD && dfa->mb_cur_max > 1) || token.type == COMPLEX_BRACKET; -#endif - dfa->nexts[dfa->nodes_len] = -1; - re_node_set_init_empty (dfa->edests + dfa->nodes_len); - re_node_set_init_empty (dfa->eclosures + dfa->nodes_len); - return dfa->nodes_len++; -} - -static inline unsigned int -internal_function -calc_state_hash (const re_node_set *nodes, unsigned int context) -{ - unsigned int hash = nodes->nelem + context; - int i; - for (i = 0 ; i < nodes->nelem ; i++) - hash += nodes->elems[i]; - return hash; -} - -/* Search for the state whose node_set is equivalent to NODES. - Return the pointer to the state, if we found it in the DFA. - Otherwise create the new one and return it. In case of an error - return NULL and set the error code in ERR. - Note: - We assume NULL as the invalid state, then it is possible that - return value is NULL and ERR is REG_NOERROR. - - We never return non-NULL value in case of any errors, it is for - optimization. */ - -static re_dfastate_t * -internal_function -re_acquire_state (reg_errcode_t *err, const re_dfa_t *dfa, - const re_node_set *nodes) -{ - unsigned int hash; - re_dfastate_t *new_state; - struct re_state_table_entry *spot; - int i; - if (BE (nodes->nelem == 0, 0)) - { - *err = REG_NOERROR; - return NULL; - } - hash = calc_state_hash (nodes, 0); - spot = dfa->state_table + (hash & dfa->state_hash_mask); - - for (i = 0 ; i < spot->num ; i++) - { - re_dfastate_t *state = spot->array[i]; - if (hash != state->hash) - continue; - if (re_node_set_compare (&state->nodes, nodes)) - return state; - } - - /* There are no appropriate state in the dfa, create the new one. */ - new_state = create_ci_newstate (dfa, nodes, hash); - if (BE (new_state == NULL, 0)) - *err = REG_ESPACE; - - return new_state; -} - -/* Search for the state whose node_set is equivalent to NODES and - whose context is equivalent to CONTEXT. - Return the pointer to the state, if we found it in the DFA. - Otherwise create the new one and return it. In case of an error - return NULL and set the error code in ERR. - Note: - We assume NULL as the invalid state, then it is possible that - return value is NULL and ERR is REG_NOERROR. - - We never return non-NULL value in case of any errors, it is for - optimization. */ - -static re_dfastate_t * -internal_function -re_acquire_state_context (reg_errcode_t *err, const re_dfa_t *dfa, - const re_node_set *nodes, unsigned int context) -{ - unsigned int hash; - re_dfastate_t *new_state; - struct re_state_table_entry *spot; - int i; - if (nodes->nelem == 0) - { - *err = REG_NOERROR; - return NULL; - } - hash = calc_state_hash (nodes, context); - spot = dfa->state_table + (hash & dfa->state_hash_mask); - - for (i = 0 ; i < spot->num ; i++) - { - re_dfastate_t *state = spot->array[i]; - if (state->hash == hash - && state->context == context - && re_node_set_compare (state->entrance_nodes, nodes)) - return state; - } - /* There are no appropriate state in `dfa', create the new one. */ - new_state = create_cd_newstate (dfa, nodes, context, hash); - if (BE (new_state == NULL, 0)) - *err = REG_ESPACE; - - return new_state; -} - -/* Finish initialization of the new state NEWSTATE, and using its hash value - HASH put in the appropriate bucket of DFA's state table. Return value - indicates the error code if failed. */ - -static reg_errcode_t -register_state (const re_dfa_t *dfa, re_dfastate_t *newstate, - unsigned int hash) -{ - struct re_state_table_entry *spot; - reg_errcode_t err; - int i; - - newstate->hash = hash; - err = re_node_set_alloc (&newstate->non_eps_nodes, newstate->nodes.nelem); - if (BE (err != REG_NOERROR, 0)) - return REG_ESPACE; - for (i = 0; i < newstate->nodes.nelem; i++) - { - int elem = newstate->nodes.elems[i]; - if (!IS_EPSILON_NODE (dfa->nodes[elem].type)) - if (re_node_set_insert_last (&newstate->non_eps_nodes, elem) < 0) - return REG_ESPACE; - } - - spot = dfa->state_table + (hash & dfa->state_hash_mask); - if (BE (spot->alloc <= spot->num, 0)) - { - int new_alloc = 2 * spot->num + 2; - re_dfastate_t **new_array = re_realloc (spot->array, re_dfastate_t *, - new_alloc); - if (BE (new_array == NULL, 0)) - return REG_ESPACE; - spot->array = new_array; - spot->alloc = new_alloc; - } - spot->array[spot->num++] = newstate; - return REG_NOERROR; -} - -static void -free_state (re_dfastate_t *state) -{ - re_node_set_free (&state->non_eps_nodes); - re_node_set_free (&state->inveclosure); - if (state->entrance_nodes != &state->nodes) - { - re_node_set_free (state->entrance_nodes); - re_free (state->entrance_nodes); - } - re_node_set_free (&state->nodes); - re_free (state->word_trtable); - re_free (state->trtable); - re_free (state); -} - -/* Create the new state which is independ of contexts. - Return the new state if succeeded, otherwise return NULL. */ - -static re_dfastate_t * -internal_function -create_ci_newstate (const re_dfa_t *dfa, const re_node_set *nodes, - unsigned int hash) -{ - int i; - reg_errcode_t err; - re_dfastate_t *newstate; - - newstate = (re_dfastate_t *) calloc (sizeof (re_dfastate_t), 1); - if (BE (newstate == NULL, 0)) - return NULL; - err = re_node_set_init_copy (&newstate->nodes, nodes); - if (BE (err != REG_NOERROR, 0)) - { - re_free (newstate); - return NULL; - } - - newstate->entrance_nodes = &newstate->nodes; - for (i = 0 ; i < nodes->nelem ; i++) - { - re_token_t *node = dfa->nodes + nodes->elems[i]; - re_token_type_t type = node->type; - if (type == CHARACTER && !node->constraint) - continue; -#ifdef RE_ENABLE_I18N - newstate->accept_mb |= node->accept_mb; -#endif /* RE_ENABLE_I18N */ - - /* If the state has the halt node, the state is a halt state. */ - if (type == END_OF_RE) - newstate->halt = 1; - else if (type == OP_BACK_REF) - newstate->has_backref = 1; - else if (type == ANCHOR || node->constraint) - newstate->has_constraint = 1; - } - err = register_state (dfa, newstate, hash); - if (BE (err != REG_NOERROR, 0)) - { - free_state (newstate); - newstate = NULL; - } - return newstate; -} - -/* Create the new state which is depend on the context CONTEXT. - Return the new state if succeeded, otherwise return NULL. */ - -static re_dfastate_t * -internal_function -create_cd_newstate (const re_dfa_t *dfa, const re_node_set *nodes, - unsigned int context, unsigned int hash) -{ - int i, nctx_nodes = 0; - reg_errcode_t err; - re_dfastate_t *newstate; - - newstate = (re_dfastate_t *) calloc (sizeof (re_dfastate_t), 1); - if (BE (newstate == NULL, 0)) - return NULL; - err = re_node_set_init_copy (&newstate->nodes, nodes); - if (BE (err != REG_NOERROR, 0)) - { - re_free (newstate); - return NULL; - } - - newstate->context = context; - newstate->entrance_nodes = &newstate->nodes; - - for (i = 0 ; i < nodes->nelem ; i++) - { - re_token_t *node = dfa->nodes + nodes->elems[i]; - re_token_type_t type = node->type; - unsigned int constraint = node->constraint; - - if (type == CHARACTER && !constraint) - continue; -#ifdef RE_ENABLE_I18N - newstate->accept_mb |= node->accept_mb; -#endif /* RE_ENABLE_I18N */ - - /* If the state has the halt node, the state is a halt state. */ - if (type == END_OF_RE) - newstate->halt = 1; - else if (type == OP_BACK_REF) - newstate->has_backref = 1; - - if (constraint) - { - if (newstate->entrance_nodes == &newstate->nodes) - { - newstate->entrance_nodes = re_malloc (re_node_set, 1); - if (BE (newstate->entrance_nodes == NULL, 0)) - { - free_state (newstate); - return NULL; - } - if (re_node_set_init_copy (newstate->entrance_nodes, nodes) - != REG_NOERROR) - return NULL; - nctx_nodes = 0; - newstate->has_constraint = 1; - } - - if (NOT_SATISFY_PREV_CONSTRAINT (constraint,context)) - { - re_node_set_remove_at (&newstate->nodes, i - nctx_nodes); - ++nctx_nodes; - } - } - } - err = register_state (dfa, newstate, hash); - if (BE (err != REG_NOERROR, 0)) - { - free_state (newstate); - newstate = NULL; - } - return newstate; -} diff --git a/vendor/libgit2/deps/regex/regex_internal.h b/vendor/libgit2/deps/regex/regex_internal.h deleted file mode 100644 index 53ccebecd..000000000 --- a/vendor/libgit2/deps/regex/regex_internal.h +++ /dev/null @@ -1,819 +0,0 @@ -/* Extended regular expression matching and search library. - Copyright (C) 2002-2005, 2007, 2008, 2010 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Isamu Hasegawa . - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ - -#ifndef _REGEX_INTERNAL_H -#define _REGEX_INTERNAL_H 1 - -#include -#include -#include -#include -#include - -#ifndef UNUSED -# ifdef __GNUC__ -# define UNUSED __attribute__((unused)) -# else -# define UNUSED -# endif -#endif - -#if defined HAVE_LANGINFO_H || defined HAVE_LANGINFO_CODESET || defined _LIBC -# include -#endif -#if defined HAVE_LOCALE_H || defined _LIBC -# include -#endif -#if defined HAVE_WCHAR_H || defined _LIBC -# include -#endif /* HAVE_WCHAR_H || _LIBC */ -#if defined HAVE_WCTYPE_H || defined _LIBC -# include -#endif /* HAVE_WCTYPE_H || _LIBC */ -#if defined HAVE_STDBOOL_H || defined _LIBC -# include -#endif /* HAVE_STDBOOL_H || _LIBC */ -#if !defined(ZOS_USS) -#if defined HAVE_STDINT_H || defined _LIBC -# include -#endif /* HAVE_STDINT_H || _LIBC */ -#endif /* !ZOS_USS */ -#if defined _LIBC -# include -#else -# define __libc_lock_define(CLASS,NAME) -# define __libc_lock_init(NAME) do { } while (0) -# define __libc_lock_lock(NAME) do { } while (0) -# define __libc_lock_unlock(NAME) do { } while (0) -#endif - -#ifndef GAWK -/* In case that the system doesn't have isblank(). */ -#if !defined _LIBC && !defined HAVE_ISBLANK && !defined isblank -# define isblank(ch) ((ch) == ' ' || (ch) == '\t') -#endif -#else /* GAWK */ -/* - * This is a mess. On glibc systems you have to define - * a magic constant to get isblank() out of , since it's - * a C99 function. To heck with all that and borrow a page from - * dfa.c's book. - */ - -static int -is_blank (int c) -{ - return (c == ' ' || c == '\t'); -} -#endif /* GAWK */ - -#ifdef _LIBC -# ifndef _RE_DEFINE_LOCALE_FUNCTIONS -# define _RE_DEFINE_LOCALE_FUNCTIONS 1 -# include -# include -# include -# endif -#endif - -/* This is for other GNU distributions with internationalized messages. */ -#if (HAVE_LIBINTL_H && ENABLE_NLS) || defined _LIBC -# include -# ifdef _LIBC -# undef gettext -# define gettext(msgid) \ - INTUSE(__dcgettext) (_libc_intl_domainname, msgid, LC_MESSAGES) -# endif -#else -# define gettext(msgid) (msgid) -#endif - -#ifndef gettext_noop -/* This define is so xgettext can find the internationalizable - strings. */ -# define gettext_noop(String) String -#endif - -/* For loser systems without the definition. */ -#ifndef SIZE_MAX -# define SIZE_MAX ((size_t) -1) -#endif - -#ifndef NO_MBSUPPORT -#include "mbsupport.h" /* gawk */ -#endif -#ifndef MB_CUR_MAX -#define MB_CUR_MAX 1 -#endif - -#if (defined MBS_SUPPORT) || _LIBC -# define RE_ENABLE_I18N -#endif - -#if __GNUC__ >= 3 -# define BE(expr, val) __builtin_expect (expr, val) -#else -# define BE(expr, val) (expr) -# ifdef inline -# undef inline -# endif -# define inline -#endif - -/* Number of single byte character. */ -#define SBC_MAX 256 - -#define COLL_ELEM_LEN_MAX 8 - -/* The character which represents newline. */ -#define NEWLINE_CHAR '\n' -#define WIDE_NEWLINE_CHAR L'\n' - -/* Rename to standard API for using out of glibc. */ -#ifndef _LIBC -# ifdef __wctype -# undef __wctype -# endif -# define __wctype wctype -# ifdef __iswctype -# undef __iswctype -# endif -# define __iswctype iswctype -# define __btowc btowc -# define __mbrtowc mbrtowc -#undef __mempcpy /* GAWK */ -# define __mempcpy mempcpy -# define __wcrtomb wcrtomb -# define __regfree regfree -# define attribute_hidden -#endif /* not _LIBC */ - -#ifdef __GNUC__ -# define __attribute(arg) __attribute__ (arg) -#else -# define __attribute(arg) -#endif - -extern const char __re_error_msgid[] attribute_hidden; -extern const size_t __re_error_msgid_idx[] attribute_hidden; - -/* An integer used to represent a set of bits. It must be unsigned, - and must be at least as wide as unsigned int. */ -typedef unsigned long int bitset_word_t; -/* All bits set in a bitset_word_t. */ -#define BITSET_WORD_MAX ULONG_MAX -/* Number of bits in a bitset_word_t. Cast to int as most code use it - * like that for counting */ -#define BITSET_WORD_BITS ((int)(sizeof (bitset_word_t) * CHAR_BIT)) -/* Number of bitset_word_t in a bit_set. */ -#define BITSET_WORDS (SBC_MAX / BITSET_WORD_BITS) -typedef bitset_word_t bitset_t[BITSET_WORDS]; -typedef bitset_word_t *re_bitset_ptr_t; -typedef const bitset_word_t *re_const_bitset_ptr_t; - -#define bitset_set(set,i) \ - (set[i / BITSET_WORD_BITS] |= (bitset_word_t) 1 << i % BITSET_WORD_BITS) -#define bitset_clear(set,i) \ - (set[i / BITSET_WORD_BITS] &= ~((bitset_word_t) 1 << i % BITSET_WORD_BITS)) -#define bitset_contain(set,i) \ - (set[i / BITSET_WORD_BITS] & ((bitset_word_t) 1 << i % BITSET_WORD_BITS)) -#define bitset_empty(set) memset (set, '\0', sizeof (bitset_t)) -#define bitset_set_all(set) memset (set, '\xff', sizeof (bitset_t)) -#define bitset_copy(dest,src) memcpy (dest, src, sizeof (bitset_t)) - -#define PREV_WORD_CONSTRAINT 0x0001 -#define PREV_NOTWORD_CONSTRAINT 0x0002 -#define NEXT_WORD_CONSTRAINT 0x0004 -#define NEXT_NOTWORD_CONSTRAINT 0x0008 -#define PREV_NEWLINE_CONSTRAINT 0x0010 -#define NEXT_NEWLINE_CONSTRAINT 0x0020 -#define PREV_BEGBUF_CONSTRAINT 0x0040 -#define NEXT_ENDBUF_CONSTRAINT 0x0080 -#define WORD_DELIM_CONSTRAINT 0x0100 -#define NOT_WORD_DELIM_CONSTRAINT 0x0200 - -typedef enum -{ - INSIDE_WORD = PREV_WORD_CONSTRAINT | NEXT_WORD_CONSTRAINT, - WORD_FIRST = PREV_NOTWORD_CONSTRAINT | NEXT_WORD_CONSTRAINT, - WORD_LAST = PREV_WORD_CONSTRAINT | NEXT_NOTWORD_CONSTRAINT, - INSIDE_NOTWORD = PREV_NOTWORD_CONSTRAINT | NEXT_NOTWORD_CONSTRAINT, - LINE_FIRST = PREV_NEWLINE_CONSTRAINT, - LINE_LAST = NEXT_NEWLINE_CONSTRAINT, - BUF_FIRST = PREV_BEGBUF_CONSTRAINT, - BUF_LAST = NEXT_ENDBUF_CONSTRAINT, - WORD_DELIM = WORD_DELIM_CONSTRAINT, - NOT_WORD_DELIM = NOT_WORD_DELIM_CONSTRAINT -} re_context_type; - -typedef struct -{ - int alloc; - int nelem; - int *elems; -} re_node_set; - -typedef enum -{ - NON_TYPE = 0, - - /* Node type, These are used by token, node, tree. */ - CHARACTER = 1, - END_OF_RE = 2, - SIMPLE_BRACKET = 3, - OP_BACK_REF = 4, - OP_PERIOD = 5, -#ifdef RE_ENABLE_I18N - COMPLEX_BRACKET = 6, - OP_UTF8_PERIOD = 7, -#endif /* RE_ENABLE_I18N */ - - /* We define EPSILON_BIT as a macro so that OP_OPEN_SUBEXP is used - when the debugger shows values of this enum type. */ -#define EPSILON_BIT 8 - OP_OPEN_SUBEXP = EPSILON_BIT | 0, - OP_CLOSE_SUBEXP = EPSILON_BIT | 1, - OP_ALT = EPSILON_BIT | 2, - OP_DUP_ASTERISK = EPSILON_BIT | 3, - ANCHOR = EPSILON_BIT | 4, - - /* Tree type, these are used only by tree. */ - CONCAT = 16, - SUBEXP = 17, - - /* Token type, these are used only by token. */ - OP_DUP_PLUS = 18, - OP_DUP_QUESTION, - OP_OPEN_BRACKET, - OP_CLOSE_BRACKET, - OP_CHARSET_RANGE, - OP_OPEN_DUP_NUM, - OP_CLOSE_DUP_NUM, - OP_NON_MATCH_LIST, - OP_OPEN_COLL_ELEM, - OP_CLOSE_COLL_ELEM, - OP_OPEN_EQUIV_CLASS, - OP_CLOSE_EQUIV_CLASS, - OP_OPEN_CHAR_CLASS, - OP_CLOSE_CHAR_CLASS, - OP_WORD, - OP_NOTWORD, - OP_SPACE, - OP_NOTSPACE, - BACK_SLASH - -} re_token_type_t; - -#ifdef RE_ENABLE_I18N -typedef struct -{ - /* Multibyte characters. */ - wchar_t *mbchars; - - /* Collating symbols. */ -# ifdef _LIBC - int32_t *coll_syms; -# endif - - /* Equivalence classes. */ -# ifdef _LIBC - int32_t *equiv_classes; -# endif - - /* Range expressions. */ -# ifdef _LIBC - uint32_t *range_starts; - uint32_t *range_ends; -# else /* not _LIBC */ - wchar_t *range_starts; - wchar_t *range_ends; -# endif /* not _LIBC */ - - /* Character classes. */ - wctype_t *char_classes; - - /* If this character set is the non-matching list. */ - unsigned int non_match : 1; - - /* # of multibyte characters. */ - int nmbchars; - - /* # of collating symbols. */ - int ncoll_syms; - - /* # of equivalence classes. */ - int nequiv_classes; - - /* # of range expressions. */ - int nranges; - - /* # of character classes. */ - int nchar_classes; -} re_charset_t; -#endif /* RE_ENABLE_I18N */ - -typedef struct -{ - union - { - unsigned char c; /* for CHARACTER */ - re_bitset_ptr_t sbcset; /* for SIMPLE_BRACKET */ -#ifdef RE_ENABLE_I18N - re_charset_t *mbcset; /* for COMPLEX_BRACKET */ -#endif /* RE_ENABLE_I18N */ - int idx; /* for BACK_REF */ - re_context_type ctx_type; /* for ANCHOR */ - } opr; -#if __GNUC__ >= 2 - re_token_type_t type : 8; -#else - re_token_type_t type; -#endif - unsigned int constraint : 10; /* context constraint */ - unsigned int duplicated : 1; - unsigned int opt_subexp : 1; -#ifdef RE_ENABLE_I18N - unsigned int accept_mb : 1; - /* These 2 bits can be moved into the union if needed (e.g. if running out - of bits; move opr.c to opr.c.c and move the flags to opr.c.flags). */ - unsigned int mb_partial : 1; -#endif - unsigned int word_char : 1; -} re_token_t; - -#define IS_EPSILON_NODE(type) ((type) & EPSILON_BIT) - -struct re_string_t -{ - /* Indicate the raw buffer which is the original string passed as an - argument of regexec(), re_search(), etc.. */ - const unsigned char *raw_mbs; - /* Store the multibyte string. In case of "case insensitive mode" like - REG_ICASE, upper cases of the string are stored, otherwise MBS points - the same address that RAW_MBS points. */ - unsigned char *mbs; -#ifdef RE_ENABLE_I18N - /* Store the wide character string which is corresponding to MBS. */ - wint_t *wcs; - int *offsets; - mbstate_t cur_state; -#endif - /* Index in RAW_MBS. Each character mbs[i] corresponds to - raw_mbs[raw_mbs_idx + i]. */ - int raw_mbs_idx; - /* The length of the valid characters in the buffers. */ - int valid_len; - /* The corresponding number of bytes in raw_mbs array. */ - int valid_raw_len; - /* The length of the buffers MBS and WCS. */ - int bufs_len; - /* The index in MBS, which is updated by re_string_fetch_byte. */ - int cur_idx; - /* length of RAW_MBS array. */ - int raw_len; - /* This is RAW_LEN - RAW_MBS_IDX + VALID_LEN - VALID_RAW_LEN. */ - int len; - /* End of the buffer may be shorter than its length in the cases such - as re_match_2, re_search_2. Then, we use STOP for end of the buffer - instead of LEN. */ - int raw_stop; - /* This is RAW_STOP - RAW_MBS_IDX adjusted through OFFSETS. */ - int stop; - - /* The context of mbs[0]. We store the context independently, since - the context of mbs[0] may be different from raw_mbs[0], which is - the beginning of the input string. */ - unsigned int tip_context; - /* The translation passed as a part of an argument of re_compile_pattern. */ - RE_TRANSLATE_TYPE trans; - /* Copy of re_dfa_t's word_char. */ - re_const_bitset_ptr_t word_char; - /* 1 if REG_ICASE. */ - unsigned char icase; - unsigned char is_utf8; - unsigned char map_notascii; - unsigned char mbs_allocated; - unsigned char offsets_needed; - unsigned char newline_anchor; - unsigned char word_ops_used; - int mb_cur_max; -}; -typedef struct re_string_t re_string_t; - - -struct re_dfa_t; -typedef struct re_dfa_t re_dfa_t; - -#ifndef _LIBC -# ifdef __i386__ -# define internal_function __attribute ((regparm (3), stdcall)) -# else -# define internal_function -# endif -#endif - -#ifndef NOT_IN_libc -static reg_errcode_t re_string_realloc_buffers (re_string_t *pstr, - int new_buf_len) - internal_function; -# ifdef RE_ENABLE_I18N -static void build_wcs_buffer (re_string_t *pstr) internal_function; -static reg_errcode_t build_wcs_upper_buffer (re_string_t *pstr) - internal_function; -# endif /* RE_ENABLE_I18N */ -static void build_upper_buffer (re_string_t *pstr) internal_function; -static void re_string_translate_buffer (re_string_t *pstr) internal_function; -static unsigned int re_string_context_at (const re_string_t *input, int idx, - int eflags) - internal_function __attribute ((pure)); -#endif -#define re_string_peek_byte(pstr, offset) \ - ((pstr)->mbs[(pstr)->cur_idx + offset]) -#define re_string_fetch_byte(pstr) \ - ((pstr)->mbs[(pstr)->cur_idx++]) -#define re_string_first_byte(pstr, idx) \ - ((idx) == (pstr)->valid_len || (pstr)->wcs[idx] != WEOF) -#define re_string_is_single_byte_char(pstr, idx) \ - ((pstr)->wcs[idx] != WEOF && ((pstr)->valid_len == (idx) + 1 \ - || (pstr)->wcs[(idx) + 1] != WEOF)) -#define re_string_eoi(pstr) ((pstr)->stop <= (pstr)->cur_idx) -#define re_string_cur_idx(pstr) ((pstr)->cur_idx) -#define re_string_get_buffer(pstr) ((pstr)->mbs) -#define re_string_length(pstr) ((pstr)->len) -#define re_string_byte_at(pstr,idx) ((pstr)->mbs[idx]) -#define re_string_skip_bytes(pstr,idx) ((pstr)->cur_idx += (idx)) -#define re_string_set_index(pstr,idx) ((pstr)->cur_idx = (idx)) - -#ifndef _LIBC -# if HAVE_ALLOCA -# if (_MSC_VER) -# include -# define __libc_use_alloca(n) 0 -# else -# include -/* The OS usually guarantees only one guard page at the bottom of the stack, - and a page size can be as small as 4096 bytes. So we cannot safely - allocate anything larger than 4096 bytes. Also care for the possibility - of a few compiler-allocated temporary stack slots. */ -# define __libc_use_alloca(n) ((n) < 4032) -# endif -# else -/* alloca is implemented with malloc, so just use malloc. */ -# define __libc_use_alloca(n) 0 -# endif -#endif - -#define re_malloc(t,n) ((t *) malloc ((n) * sizeof (t))) -/* SunOS 4.1.x realloc doesn't accept null pointers: pre-Standard C. Sigh. */ -#define re_realloc(p,t,n) ((p != NULL) ? (t *) realloc (p,(n)*sizeof(t)) : (t *) calloc(n,sizeof(t))) -#define re_free(p) free (p) - -struct bin_tree_t -{ - struct bin_tree_t *parent; - struct bin_tree_t *left; - struct bin_tree_t *right; - struct bin_tree_t *first; - struct bin_tree_t *next; - - re_token_t token; - - /* `node_idx' is the index in dfa->nodes, if `type' == 0. - Otherwise `type' indicate the type of this node. */ - int node_idx; -}; -typedef struct bin_tree_t bin_tree_t; - -#define BIN_TREE_STORAGE_SIZE \ - ((1024 - sizeof (void *)) / sizeof (bin_tree_t)) - -struct bin_tree_storage_t -{ - struct bin_tree_storage_t *next; - bin_tree_t data[BIN_TREE_STORAGE_SIZE]; -}; -typedef struct bin_tree_storage_t bin_tree_storage_t; - -#define CONTEXT_WORD 1 -#define CONTEXT_NEWLINE (CONTEXT_WORD << 1) -#define CONTEXT_BEGBUF (CONTEXT_NEWLINE << 1) -#define CONTEXT_ENDBUF (CONTEXT_BEGBUF << 1) - -#define IS_WORD_CONTEXT(c) ((c) & CONTEXT_WORD) -#define IS_NEWLINE_CONTEXT(c) ((c) & CONTEXT_NEWLINE) -#define IS_BEGBUF_CONTEXT(c) ((c) & CONTEXT_BEGBUF) -#define IS_ENDBUF_CONTEXT(c) ((c) & CONTEXT_ENDBUF) -#define IS_ORDINARY_CONTEXT(c) ((c) == 0) - -#define IS_WORD_CHAR(ch) (isalnum (ch) || (ch) == '_') -#define IS_NEWLINE(ch) ((ch) == NEWLINE_CHAR) -#define IS_WIDE_WORD_CHAR(ch) (iswalnum (ch) || (ch) == L'_') -#define IS_WIDE_NEWLINE(ch) ((ch) == WIDE_NEWLINE_CHAR) - -#define NOT_SATISFY_PREV_CONSTRAINT(constraint,context) \ - ((((constraint) & PREV_WORD_CONSTRAINT) && !IS_WORD_CONTEXT (context)) \ - || ((constraint & PREV_NOTWORD_CONSTRAINT) && IS_WORD_CONTEXT (context)) \ - || ((constraint & PREV_NEWLINE_CONSTRAINT) && !IS_NEWLINE_CONTEXT (context))\ - || ((constraint & PREV_BEGBUF_CONSTRAINT) && !IS_BEGBUF_CONTEXT (context))) - -#define NOT_SATISFY_NEXT_CONSTRAINT(constraint,context) \ - ((((constraint) & NEXT_WORD_CONSTRAINT) && !IS_WORD_CONTEXT (context)) \ - || (((constraint) & NEXT_NOTWORD_CONSTRAINT) && IS_WORD_CONTEXT (context)) \ - || (((constraint) & NEXT_NEWLINE_CONSTRAINT) && !IS_NEWLINE_CONTEXT (context)) \ - || (((constraint) & NEXT_ENDBUF_CONSTRAINT) && !IS_ENDBUF_CONTEXT (context))) - -struct re_dfastate_t -{ - unsigned int hash; - re_node_set nodes; - re_node_set non_eps_nodes; - re_node_set inveclosure; - re_node_set *entrance_nodes; - struct re_dfastate_t **trtable, **word_trtable; - unsigned int context : 4; - unsigned int halt : 1; - /* If this state can accept `multi byte'. - Note that we refer to multibyte characters, and multi character - collating elements as `multi byte'. */ - unsigned int accept_mb : 1; - /* If this state has backreference node(s). */ - unsigned int has_backref : 1; - unsigned int has_constraint : 1; -}; -typedef struct re_dfastate_t re_dfastate_t; - -struct re_state_table_entry -{ - int num; - int alloc; - re_dfastate_t **array; -}; - -/* Array type used in re_sub_match_last_t and re_sub_match_top_t. */ - -typedef struct -{ - int next_idx; - int alloc; - re_dfastate_t **array; -} state_array_t; - -/* Store information about the node NODE whose type is OP_CLOSE_SUBEXP. */ - -typedef struct -{ - int node; - int str_idx; /* The position NODE match at. */ - state_array_t path; -} re_sub_match_last_t; - -/* Store information about the node NODE whose type is OP_OPEN_SUBEXP. - And information about the node, whose type is OP_CLOSE_SUBEXP, - corresponding to NODE is stored in LASTS. */ - -typedef struct -{ - int str_idx; - int node; - state_array_t *path; - int alasts; /* Allocation size of LASTS. */ - int nlasts; /* The number of LASTS. */ - re_sub_match_last_t **lasts; -} re_sub_match_top_t; - -struct re_backref_cache_entry -{ - int node; - int str_idx; - int subexp_from; - int subexp_to; - char more; - char unused; - unsigned short int eps_reachable_subexps_map; -}; - -typedef struct -{ - /* The string object corresponding to the input string. */ - re_string_t input; -#if defined _LIBC || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L) - const re_dfa_t *const dfa; -#else - const re_dfa_t *dfa; -#endif - /* EFLAGS of the argument of regexec. */ - int eflags; - /* Where the matching ends. */ - int match_last; - int last_node; - /* The state log used by the matcher. */ - re_dfastate_t **state_log; - int state_log_top; - /* Back reference cache. */ - int nbkref_ents; - int abkref_ents; - struct re_backref_cache_entry *bkref_ents; - int max_mb_elem_len; - int nsub_tops; - int asub_tops; - re_sub_match_top_t **sub_tops; -} re_match_context_t; - -typedef struct -{ - re_dfastate_t **sifted_states; - re_dfastate_t **limited_states; - int last_node; - int last_str_idx; - re_node_set limits; -} re_sift_context_t; - -struct re_fail_stack_ent_t -{ - int idx; - int node; - regmatch_t *regs; - re_node_set eps_via_nodes; -}; - -struct re_fail_stack_t -{ - int num; - int alloc; - struct re_fail_stack_ent_t *stack; -}; - -struct re_dfa_t -{ - re_token_t *nodes; - size_t nodes_alloc; - size_t nodes_len; - int *nexts; - int *org_indices; - re_node_set *edests; - re_node_set *eclosures; - re_node_set *inveclosures; - struct re_state_table_entry *state_table; - re_dfastate_t *init_state; - re_dfastate_t *init_state_word; - re_dfastate_t *init_state_nl; - re_dfastate_t *init_state_begbuf; - bin_tree_t *str_tree; - bin_tree_storage_t *str_tree_storage; - re_bitset_ptr_t sb_char; - int str_tree_storage_idx; - - /* number of subexpressions `re_nsub' is in regex_t. */ - unsigned int state_hash_mask; - int init_node; - int nbackref; /* The number of backreference in this dfa. */ - - /* Bitmap expressing which backreference is used. */ - bitset_word_t used_bkref_map; - bitset_word_t completed_bkref_map; - - unsigned int has_plural_match : 1; - /* If this dfa has "multibyte node", which is a backreference or - a node which can accept multibyte character or multi character - collating element. */ - unsigned int has_mb_node : 1; - unsigned int is_utf8 : 1; - unsigned int map_notascii : 1; - unsigned int word_ops_used : 1; - int mb_cur_max; - bitset_t word_char; - reg_syntax_t syntax; - int *subexp_map; -#ifdef DEBUG - char* re_str; -#endif -#if defined _LIBC - __libc_lock_define (, lock) -#endif -}; - -#define re_node_set_init_empty(set) memset (set, '\0', sizeof (re_node_set)) -#define re_node_set_remove(set,id) \ - (re_node_set_remove_at (set, re_node_set_contains (set, id) - 1)) -#define re_node_set_empty(p) ((p)->nelem = 0) -#define re_node_set_free(set) re_free ((set)->elems) - - -typedef enum -{ - SB_CHAR, - MB_CHAR, - EQUIV_CLASS, - COLL_SYM, - CHAR_CLASS -} bracket_elem_type; - -typedef struct -{ - bracket_elem_type type; - union - { - unsigned char ch; - unsigned char *name; - wchar_t wch; - } opr; -} bracket_elem_t; - - -/* Inline functions for bitset operation. */ -static inline void -bitset_not (bitset_t set) -{ - int bitset_i; - for (bitset_i = 0; bitset_i < BITSET_WORDS; ++bitset_i) - set[bitset_i] = ~set[bitset_i]; -} - -static inline void -bitset_merge (bitset_t dest, const bitset_t src) -{ - int bitset_i; - for (bitset_i = 0; bitset_i < BITSET_WORDS; ++bitset_i) - dest[bitset_i] |= src[bitset_i]; -} - -static inline void -bitset_mask (bitset_t dest, const bitset_t src) -{ - int bitset_i; - for (bitset_i = 0; bitset_i < BITSET_WORDS; ++bitset_i) - dest[bitset_i] &= src[bitset_i]; -} - -#ifdef RE_ENABLE_I18N -/* Inline functions for re_string. */ -static inline int -internal_function __attribute ((pure)) -re_string_char_size_at (const re_string_t *pstr, int idx) -{ - int byte_idx; - if (pstr->mb_cur_max == 1) - return 1; - for (byte_idx = 1; idx + byte_idx < pstr->valid_len; ++byte_idx) - if (pstr->wcs[idx + byte_idx] != WEOF) - break; - return byte_idx; -} - -static inline wint_t -internal_function __attribute ((pure)) -re_string_wchar_at (const re_string_t *pstr, int idx) -{ - if (pstr->mb_cur_max == 1) - return (wint_t) pstr->mbs[idx]; - return (wint_t) pstr->wcs[idx]; -} - -# ifndef NOT_IN_libc -static int -internal_function __attribute ((pure)) -re_string_elem_size_at (const re_string_t *pstr, int idx) -{ -# ifdef _LIBC - const unsigned char *p, *extra; - const int32_t *table, *indirect; - int32_t tmp; -# include - uint_fast32_t nrules = _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES); - - if (nrules != 0) - { - table = (const int32_t *) _NL_CURRENT (LC_COLLATE, _NL_COLLATE_TABLEMB); - extra = (const unsigned char *) - _NL_CURRENT (LC_COLLATE, _NL_COLLATE_EXTRAMB); - indirect = (const int32_t *) _NL_CURRENT (LC_COLLATE, - _NL_COLLATE_INDIRECTMB); - p = pstr->mbs + idx; - tmp = findidx (&p); - return p - pstr->mbs - idx; - } - else -# endif /* _LIBC */ - return 1; -} -# endif -#endif /* RE_ENABLE_I18N */ - -#endif /* _REGEX_INTERNAL_H */ diff --git a/vendor/libgit2/deps/regex/regexec.c b/vendor/libgit2/deps/regex/regexec.c deleted file mode 100644 index 0a1602e5a..000000000 --- a/vendor/libgit2/deps/regex/regexec.c +++ /dev/null @@ -1,4369 +0,0 @@ -/* Extended regular expression matching and search library. - Copyright (C) 2002-2005, 2007, 2009, 2010 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Isamu Hasegawa . - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301 USA. */ - -static reg_errcode_t match_ctx_init (re_match_context_t *cache, int eflags, - int n) internal_function; -static void match_ctx_clean (re_match_context_t *mctx) internal_function; -static void match_ctx_free (re_match_context_t *cache) internal_function; -static reg_errcode_t match_ctx_add_entry (re_match_context_t *cache, int node, - int str_idx, int from, int to) - internal_function; -static int search_cur_bkref_entry (const re_match_context_t *mctx, int str_idx) - internal_function; -static reg_errcode_t match_ctx_add_subtop (re_match_context_t *mctx, int node, - int str_idx) internal_function; -static re_sub_match_last_t * match_ctx_add_sublast (re_sub_match_top_t *subtop, - int node, int str_idx) - internal_function; -static void sift_ctx_init (re_sift_context_t *sctx, re_dfastate_t **sifted_sts, - re_dfastate_t **limited_sts, int last_node, - int last_str_idx) - internal_function; -static reg_errcode_t re_search_internal (const regex_t *preg, - const char *string, int length, - int start, int range, int stop, - size_t nmatch, regmatch_t pmatch[], - int eflags); -static int re_search_2_stub (struct re_pattern_buffer *bufp, - const char *string1, int length1, - const char *string2, int length2, - int start, int range, struct re_registers *regs, - int stop, int ret_len); -static int re_search_stub (struct re_pattern_buffer *bufp, - const char *string, int length, int start, - int range, int stop, struct re_registers *regs, - int ret_len); -static unsigned re_copy_regs (struct re_registers *regs, regmatch_t *pmatch, - unsigned int nregs, int regs_allocated); -static reg_errcode_t prune_impossible_nodes (re_match_context_t *mctx); -static int check_matching (re_match_context_t *mctx, int fl_longest_match, - int *p_match_first) internal_function; -static int check_halt_state_context (const re_match_context_t *mctx, - const re_dfastate_t *state, int idx) - internal_function; -static void update_regs (const re_dfa_t *dfa, regmatch_t *pmatch, - regmatch_t *prev_idx_match, int cur_node, - int cur_idx, int nmatch) internal_function; -static reg_errcode_t push_fail_stack (struct re_fail_stack_t *fs, - int str_idx, int dest_node, int nregs, - regmatch_t *regs, - re_node_set *eps_via_nodes) - internal_function; -static reg_errcode_t set_regs (const regex_t *preg, - const re_match_context_t *mctx, - size_t nmatch, regmatch_t *pmatch, - int fl_backtrack) internal_function; -static reg_errcode_t free_fail_stack_return (struct re_fail_stack_t *fs) - internal_function; - -#ifdef RE_ENABLE_I18N -static int sift_states_iter_mb (const re_match_context_t *mctx, - re_sift_context_t *sctx, - int node_idx, int str_idx, int max_str_idx) - internal_function; -#endif /* RE_ENABLE_I18N */ -static reg_errcode_t sift_states_backward (const re_match_context_t *mctx, - re_sift_context_t *sctx) - internal_function; -static reg_errcode_t build_sifted_states (const re_match_context_t *mctx, - re_sift_context_t *sctx, int str_idx, - re_node_set *cur_dest) - internal_function; -static reg_errcode_t update_cur_sifted_state (const re_match_context_t *mctx, - re_sift_context_t *sctx, - int str_idx, - re_node_set *dest_nodes) - internal_function; -static reg_errcode_t add_epsilon_src_nodes (const re_dfa_t *dfa, - re_node_set *dest_nodes, - const re_node_set *candidates) - internal_function; -static int check_dst_limits (const re_match_context_t *mctx, - re_node_set *limits, - int dst_node, int dst_idx, int src_node, - int src_idx) internal_function; -static int check_dst_limits_calc_pos_1 (const re_match_context_t *mctx, - int boundaries, int subexp_idx, - int from_node, int bkref_idx) - internal_function; -static int check_dst_limits_calc_pos (const re_match_context_t *mctx, - int limit, int subexp_idx, - int node, int str_idx, - int bkref_idx) internal_function; -static reg_errcode_t check_subexp_limits (const re_dfa_t *dfa, - re_node_set *dest_nodes, - const re_node_set *candidates, - re_node_set *limits, - struct re_backref_cache_entry *bkref_ents, - int str_idx) internal_function; -static reg_errcode_t sift_states_bkref (const re_match_context_t *mctx, - re_sift_context_t *sctx, - int str_idx, const re_node_set *candidates) - internal_function; -static reg_errcode_t merge_state_array (const re_dfa_t *dfa, - re_dfastate_t **dst, - re_dfastate_t **src, int num) - internal_function; -static re_dfastate_t *find_recover_state (reg_errcode_t *err, - re_match_context_t *mctx) internal_function; -static re_dfastate_t *transit_state (reg_errcode_t *err, - re_match_context_t *mctx, - re_dfastate_t *state) internal_function; -static re_dfastate_t *merge_state_with_log (reg_errcode_t *err, - re_match_context_t *mctx, - re_dfastate_t *next_state) - internal_function; -static reg_errcode_t check_subexp_matching_top (re_match_context_t *mctx, - re_node_set *cur_nodes, - int str_idx) internal_function; -#if 0 -static re_dfastate_t *transit_state_sb (reg_errcode_t *err, - re_match_context_t *mctx, - re_dfastate_t *pstate) - internal_function; -#endif -#ifdef RE_ENABLE_I18N -static reg_errcode_t transit_state_mb (re_match_context_t *mctx, - re_dfastate_t *pstate) - internal_function; -#endif /* RE_ENABLE_I18N */ -static reg_errcode_t transit_state_bkref (re_match_context_t *mctx, - const re_node_set *nodes) - internal_function; -static reg_errcode_t get_subexp (re_match_context_t *mctx, - int bkref_node, int bkref_str_idx) - internal_function; -static reg_errcode_t get_subexp_sub (re_match_context_t *mctx, - const re_sub_match_top_t *sub_top, - re_sub_match_last_t *sub_last, - int bkref_node, int bkref_str) - internal_function; -static int find_subexp_node (const re_dfa_t *dfa, const re_node_set *nodes, - int subexp_idx, int type) internal_function; -static reg_errcode_t check_arrival (re_match_context_t *mctx, - state_array_t *path, int top_node, - int top_str, int last_node, int last_str, - int type) internal_function; -static reg_errcode_t check_arrival_add_next_nodes (re_match_context_t *mctx, - int str_idx, - re_node_set *cur_nodes, - re_node_set *next_nodes) - internal_function; -static reg_errcode_t check_arrival_expand_ecl (const re_dfa_t *dfa, - re_node_set *cur_nodes, - int ex_subexp, int type) - internal_function; -static reg_errcode_t check_arrival_expand_ecl_sub (const re_dfa_t *dfa, - re_node_set *dst_nodes, - int target, int ex_subexp, - int type) internal_function; -static reg_errcode_t expand_bkref_cache (re_match_context_t *mctx, - re_node_set *cur_nodes, int cur_str, - int subexp_num, int type) - internal_function; -static int build_trtable (const re_dfa_t *dfa, - re_dfastate_t *state) internal_function; -#ifdef RE_ENABLE_I18N -static int check_node_accept_bytes (const re_dfa_t *dfa, int node_idx, - const re_string_t *input, int idx) - internal_function; -# ifdef _LIBC -static unsigned int find_collation_sequence_value (const unsigned char *mbs, - size_t name_len) - internal_function; -# endif /* _LIBC */ -#endif /* RE_ENABLE_I18N */ -static int group_nodes_into_DFAstates (const re_dfa_t *dfa, - const re_dfastate_t *state, - re_node_set *states_node, - bitset_t *states_ch) internal_function; -static int check_node_accept (const re_match_context_t *mctx, - const re_token_t *node, int idx) - internal_function; -static reg_errcode_t extend_buffers (re_match_context_t *mctx) - internal_function; - -/* Entry point for POSIX code. */ - -/* regexec searches for a given pattern, specified by PREG, in the - string STRING. - - If NMATCH is zero or REG_NOSUB was set in the cflags argument to - `regcomp', we ignore PMATCH. Otherwise, we assume PMATCH has at - least NMATCH elements, and we set them to the offsets of the - corresponding matched substrings. - - EFLAGS specifies `execution flags' which affect matching: if - REG_NOTBOL is set, then ^ does not match at the beginning of the - string; if REG_NOTEOL is set, then $ does not match at the end. - - We return 0 if we find a match and REG_NOMATCH if not. */ - -int -regexec ( - const regex_t *__restrict preg, - const char *__restrict string, - size_t nmatch, - regmatch_t pmatch[], - int eflags) -{ - reg_errcode_t err; - int start, length; - - if (eflags & ~(REG_NOTBOL | REG_NOTEOL | REG_STARTEND)) - return REG_BADPAT; - - if (eflags & REG_STARTEND) - { - start = pmatch[0].rm_so; - length = pmatch[0].rm_eo; - } - else - { - start = 0; - length = strlen (string); - } - - __libc_lock_lock (dfa->lock); - if (preg->no_sub) - err = re_search_internal (preg, string, length, start, length - start, - length, 0, NULL, eflags); - else - err = re_search_internal (preg, string, length, start, length - start, - length, nmatch, pmatch, eflags); - __libc_lock_unlock (dfa->lock); - return err != REG_NOERROR; -} - -#ifdef _LIBC -# include -versioned_symbol (libc, __regexec, regexec, GLIBC_2_3_4); - -# if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_3_4) -__typeof__ (__regexec) __compat_regexec; - -int -attribute_compat_text_section -__compat_regexec (const regex_t *__restrict preg, - const char *__restrict string, size_t nmatch, - regmatch_t pmatch[], int eflags) -{ - return regexec (preg, string, nmatch, pmatch, - eflags & (REG_NOTBOL | REG_NOTEOL)); -} -compat_symbol (libc, __compat_regexec, regexec, GLIBC_2_0); -# endif -#endif - -/* Entry points for GNU code. */ - -/* re_match, re_search, re_match_2, re_search_2 - - The former two functions operate on STRING with length LENGTH, - while the later two operate on concatenation of STRING1 and STRING2 - with lengths LENGTH1 and LENGTH2, respectively. - - re_match() matches the compiled pattern in BUFP against the string, - starting at index START. - - re_search() first tries matching at index START, then it tries to match - starting from index START + 1, and so on. The last start position tried - is START + RANGE. (Thus RANGE = 0 forces re_search to operate the same - way as re_match().) - - The parameter STOP of re_{match,search}_2 specifies that no match exceeding - the first STOP characters of the concatenation of the strings should be - concerned. - - If REGS is not NULL, and BUFP->no_sub is not set, the offsets of the match - and all groups is stroed in REGS. (For the "_2" variants, the offsets are - computed relative to the concatenation, not relative to the individual - strings.) - - On success, re_match* functions return the length of the match, re_search* - return the position of the start of the match. Return value -1 means no - match was found and -2 indicates an internal error. */ - -int -re_match (struct re_pattern_buffer *bufp, - const char *string, - int length, - int start, - struct re_registers *regs) -{ - return re_search_stub (bufp, string, length, start, 0, length, regs, 1); -} -#ifdef _LIBC -weak_alias (__re_match, re_match) -#endif - -int -re_search (struct re_pattern_buffer *bufp, - const char *string, - int length, int start, int range, - struct re_registers *regs) -{ - return re_search_stub (bufp, string, length, start, range, length, regs, 0); -} -#ifdef _LIBC -weak_alias (__re_search, re_search) -#endif - -int -re_match_2 (struct re_pattern_buffer *bufp, - const char *string1, int length1, - const char *string2, int length2, int start, - struct re_registers *regs, int stop) -{ - return re_search_2_stub (bufp, string1, length1, string2, length2, - start, 0, regs, stop, 1); -} -#ifdef _LIBC -weak_alias (__re_match_2, re_match_2) -#endif - -int -re_search_2 (struct re_pattern_buffer *bufp, - const char *string1, int length1, - const char *string2, int length2, int start, - int range, struct re_registers *regs, int stop) -{ - return re_search_2_stub (bufp, string1, length1, string2, length2, - start, range, regs, stop, 0); -} -#ifdef _LIBC -weak_alias (__re_search_2, re_search_2) -#endif - -static int -re_search_2_stub (struct re_pattern_buffer *bufp, - const char *string1, int length1, - const char *string2, int length2, int start, - int range, struct re_registers *regs, - int stop, int ret_len) -{ - const char *str; - int rval; - int len = length1 + length2; - int free_str = 0; - - if (BE (length1 < 0 || length2 < 0 || stop < 0, 0)) - return -2; - - /* Concatenate the strings. */ - if (length2 > 0) - if (length1 > 0) - { - char *s = re_malloc (char, len); - - if (BE (s == NULL, 0)) - return -2; - memcpy (s, string1, length1); - memcpy (s + length1, string2, length2); - str = s; - free_str = 1; - } - else - str = string2; - else - str = string1; - - rval = re_search_stub (bufp, str, len, start, range, stop, regs, ret_len); - if (free_str) - re_free ((char *) str); - return rval; -} - -/* The parameters have the same meaning as those of re_search. - Additional parameters: - If RET_LEN is nonzero the length of the match is returned (re_match style); - otherwise the position of the match is returned. */ - -static int -re_search_stub (struct re_pattern_buffer *bufp, - const char *string, int length, int start, - int range, int stop, - struct re_registers *regs, int ret_len) -{ - reg_errcode_t result; - regmatch_t *pmatch; - int nregs, rval; - int eflags = 0; - - /* Check for out-of-range. */ - if (BE (start < 0 || start > length, 0)) - return -1; - if (BE (start + range > length, 0)) - range = length - start; - else if (BE (start + range < 0, 0)) - range = -start; - - __libc_lock_lock (dfa->lock); - - eflags |= (bufp->not_bol) ? REG_NOTBOL : 0; - eflags |= (bufp->not_eol) ? REG_NOTEOL : 0; - - /* Compile fastmap if we haven't yet. */ - if (range > 0 && bufp->fastmap != NULL && !bufp->fastmap_accurate) - re_compile_fastmap (bufp); - - if (BE (bufp->no_sub, 0)) - regs = NULL; - - /* We need at least 1 register. */ - if (regs == NULL) - nregs = 1; - else if (BE (bufp->regs_allocated == REGS_FIXED && - regs->num_regs < bufp->re_nsub + 1, 0)) - { - nregs = regs->num_regs; - if (BE (nregs < 1, 0)) - { - /* Nothing can be copied to regs. */ - regs = NULL; - nregs = 1; - } - } - else - nregs = bufp->re_nsub + 1; - pmatch = re_malloc (regmatch_t, nregs); - if (BE (pmatch == NULL, 0)) - { - rval = -2; - goto out; - } - - result = re_search_internal (bufp, string, length, start, range, stop, - nregs, pmatch, eflags); - - rval = 0; - - /* I hope we needn't fill ther regs with -1's when no match was found. */ - if (result != REG_NOERROR) - rval = -1; - else if (regs != NULL) - { - /* If caller wants register contents data back, copy them. */ - bufp->regs_allocated = re_copy_regs (regs, pmatch, nregs, - bufp->regs_allocated); - if (BE (bufp->regs_allocated == REGS_UNALLOCATED, 0)) - rval = -2; - } - - if (BE (rval == 0, 1)) - { - if (ret_len) - { - assert (pmatch[0].rm_so == start); - rval = pmatch[0].rm_eo - start; - } - else - rval = pmatch[0].rm_so; - } - re_free (pmatch); - out: - __libc_lock_unlock (dfa->lock); - return rval; -} - -static unsigned -re_copy_regs (struct re_registers *regs, - regmatch_t *pmatch, - unsigned int nregs, int regs_allocated) -{ - int rval = REGS_REALLOCATE; - unsigned int i; - unsigned int need_regs = nregs + 1; - /* We need one extra element beyond `num_regs' for the `-1' marker GNU code - uses. */ - - /* Have the register data arrays been allocated? */ - if (regs_allocated == REGS_UNALLOCATED) - { /* No. So allocate them with malloc. */ - regs->start = re_malloc (regoff_t, need_regs); - if (BE (regs->start == NULL, 0)) - return REGS_UNALLOCATED; - regs->end = re_malloc (regoff_t, need_regs); - if (BE (regs->end == NULL, 0)) - { - re_free (regs->start); - return REGS_UNALLOCATED; - } - regs->num_regs = need_regs; - } - else if (regs_allocated == REGS_REALLOCATE) - { /* Yes. If we need more elements than were already - allocated, reallocate them. If we need fewer, just - leave it alone. */ - if (BE (need_regs > regs->num_regs, 0)) - { - regoff_t *new_start = re_realloc (regs->start, regoff_t, need_regs); - regoff_t *new_end; - if (BE (new_start == NULL, 0)) - return REGS_UNALLOCATED; - new_end = re_realloc (regs->end, regoff_t, need_regs); - if (BE (new_end == NULL, 0)) - { - re_free (new_start); - return REGS_UNALLOCATED; - } - regs->start = new_start; - regs->end = new_end; - regs->num_regs = need_regs; - } - } - else - { - assert (regs_allocated == REGS_FIXED); - /* This function may not be called with REGS_FIXED and nregs too big. */ - assert (regs->num_regs >= nregs); - rval = REGS_FIXED; - } - - /* Copy the regs. */ - for (i = 0; i < nregs; ++i) - { - regs->start[i] = pmatch[i].rm_so; - regs->end[i] = pmatch[i].rm_eo; - } - for ( ; i < regs->num_regs; ++i) - regs->start[i] = regs->end[i] = -1; - - return rval; -} - -/* Set REGS to hold NUM_REGS registers, storing them in STARTS and - ENDS. Subsequent matches using PATTERN_BUFFER and REGS will use - this memory for recording register information. STARTS and ENDS - must be allocated using the malloc library routine, and must each - be at least NUM_REGS * sizeof (regoff_t) bytes long. - - If NUM_REGS == 0, then subsequent matches should allocate their own - register data. - - Unless this function is called, the first search or match using - PATTERN_BUFFER will allocate its own register data, without - freeing the old data. */ - -void -re_set_registers (struct re_pattern_buffer *bufp, - struct re_registers *regs, - unsigned num_regs, - regoff_t *starts, - regoff_t *ends) -{ - if (num_regs) - { - bufp->regs_allocated = REGS_REALLOCATE; - regs->num_regs = num_regs; - regs->start = starts; - regs->end = ends; - } - else - { - bufp->regs_allocated = REGS_UNALLOCATED; - regs->num_regs = 0; - regs->start = regs->end = (regoff_t *) 0; - } -} -#ifdef _LIBC -weak_alias (__re_set_registers, re_set_registers) -#endif - -/* Entry points compatible with 4.2 BSD regex library. We don't define - them unless specifically requested. */ - -#if defined _REGEX_RE_COMP || defined _LIBC -int -# ifdef _LIBC -weak_function -# endif -re_exec (s) - const char *s; -{ - return 0 == regexec (&re_comp_buf, s, 0, NULL, 0); -} -#endif /* _REGEX_RE_COMP */ - -/* Internal entry point. */ - -/* Searches for a compiled pattern PREG in the string STRING, whose - length is LENGTH. NMATCH, PMATCH, and EFLAGS have the same - mingings with regexec. START, and RANGE have the same meanings - with re_search. - Return REG_NOERROR if we find a match, and REG_NOMATCH if not, - otherwise return the error code. - Note: We assume front end functions already check ranges. - (START + RANGE >= 0 && START + RANGE <= LENGTH) */ - -static reg_errcode_t -re_search_internal (const regex_t *preg, - const char *string, - int length, int start, int range, int stop, - size_t nmatch, regmatch_t pmatch[], - int eflags) -{ - reg_errcode_t err; - const re_dfa_t *dfa = (const re_dfa_t *) preg->buffer; - int left_lim, right_lim, incr; - int fl_longest_match, match_first, match_kind, match_last = -1; - unsigned int extra_nmatch; - int sb, ch; -#if defined _LIBC || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L) - re_match_context_t mctx = { .dfa = dfa }; -#else - re_match_context_t mctx; -#endif - char *fastmap = (preg->fastmap != NULL && preg->fastmap_accurate - && range && !preg->can_be_null) ? preg->fastmap : NULL; - RE_TRANSLATE_TYPE t = preg->translate; - -#if !(defined _LIBC || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L)) - memset (&mctx, '\0', sizeof (re_match_context_t)); - mctx.dfa = dfa; -#endif - - extra_nmatch = (nmatch > preg->re_nsub) ? nmatch - (preg->re_nsub + 1) : 0; - nmatch -= extra_nmatch; - - /* Check if the DFA haven't been compiled. */ - if (BE (preg->used == 0 || dfa->init_state == NULL - || dfa->init_state_word == NULL || dfa->init_state_nl == NULL - || dfa->init_state_begbuf == NULL, 0)) - return REG_NOMATCH; - -#ifdef DEBUG - /* We assume front-end functions already check them. */ - assert (start + range >= 0 && start + range <= length); -#endif - - /* If initial states with non-begbuf contexts have no elements, - the regex must be anchored. If preg->newline_anchor is set, - we'll never use init_state_nl, so do not check it. */ - if (dfa->init_state->nodes.nelem == 0 - && dfa->init_state_word->nodes.nelem == 0 - && (dfa->init_state_nl->nodes.nelem == 0 - || !preg->newline_anchor)) - { - if (start != 0 && start + range != 0) - return REG_NOMATCH; - start = range = 0; - } - - /* We must check the longest matching, if nmatch > 0. */ - fl_longest_match = (nmatch != 0 || dfa->nbackref); - - err = re_string_allocate (&mctx.input, string, length, dfa->nodes_len + 1, - preg->translate, preg->syntax & RE_ICASE, dfa); - if (BE (err != REG_NOERROR, 0)) - goto free_return; - mctx.input.stop = stop; - mctx.input.raw_stop = stop; - mctx.input.newline_anchor = preg->newline_anchor; - - err = match_ctx_init (&mctx, eflags, dfa->nbackref * 2); - if (BE (err != REG_NOERROR, 0)) - goto free_return; - - /* We will log all the DFA states through which the dfa pass, - if nmatch > 1, or this dfa has "multibyte node", which is a - back-reference or a node which can accept multibyte character or - multi character collating element. */ - if (nmatch > 1 || dfa->has_mb_node) - { - /* Avoid overflow. */ - if (BE (SIZE_MAX / sizeof (re_dfastate_t *) <= (size_t)mctx.input.bufs_len, 0)) - { - err = REG_ESPACE; - goto free_return; - } - - mctx.state_log = re_malloc (re_dfastate_t *, mctx.input.bufs_len + 1); - if (BE (mctx.state_log == NULL, 0)) - { - err = REG_ESPACE; - goto free_return; - } - } - else - mctx.state_log = NULL; - - match_first = start; - mctx.input.tip_context = (eflags & REG_NOTBOL) ? CONTEXT_BEGBUF - : CONTEXT_NEWLINE | CONTEXT_BEGBUF; - - /* Check incrementally whether of not the input string match. */ - incr = (range < 0) ? -1 : 1; - left_lim = (range < 0) ? start + range : start; - right_lim = (range < 0) ? start : start + range; - sb = dfa->mb_cur_max == 1; - match_kind = - (fastmap - ? ((sb || !(preg->syntax & RE_ICASE || t) ? 4 : 0) - | (range >= 0 ? 2 : 0) - | (t != NULL ? 1 : 0)) - : 8); - - for (;; match_first += incr) - { - err = REG_NOMATCH; - if (match_first < left_lim || right_lim < match_first) - goto free_return; - - /* Advance as rapidly as possible through the string, until we - find a plausible place to start matching. This may be done - with varying efficiency, so there are various possibilities: - only the most common of them are specialized, in order to - save on code size. We use a switch statement for speed. */ - switch (match_kind) - { - case 8: - /* No fastmap. */ - break; - - case 7: - /* Fastmap with single-byte translation, match forward. */ - while (BE (match_first < right_lim, 1) - && !fastmap[t[(unsigned char) string[match_first]]]) - ++match_first; - goto forward_match_found_start_or_reached_end; - - case 6: - /* Fastmap without translation, match forward. */ - while (BE (match_first < right_lim, 1) - && !fastmap[(unsigned char) string[match_first]]) - ++match_first; - - forward_match_found_start_or_reached_end: - if (BE (match_first == right_lim, 0)) - { - ch = match_first >= length - ? 0 : (unsigned char) string[match_first]; - if (!fastmap[t ? t[ch] : ch]) - goto free_return; - } - break; - - case 4: - case 5: - /* Fastmap without multi-byte translation, match backwards. */ - while (match_first >= left_lim) - { - ch = match_first >= length - ? 0 : (unsigned char) string[match_first]; - if (fastmap[t ? t[ch] : ch]) - break; - --match_first; - } - if (match_first < left_lim) - goto free_return; - break; - - default: - /* In this case, we can't determine easily the current byte, - since it might be a component byte of a multibyte - character. Then we use the constructed buffer instead. */ - for (;;) - { - /* If MATCH_FIRST is out of the valid range, reconstruct the - buffers. */ - unsigned int offset = match_first - mctx.input.raw_mbs_idx; - if (BE (offset >= (unsigned int) mctx.input.valid_raw_len, 0)) - { - err = re_string_reconstruct (&mctx.input, match_first, - eflags); - if (BE (err != REG_NOERROR, 0)) - goto free_return; - - offset = match_first - mctx.input.raw_mbs_idx; - } - /* If MATCH_FIRST is out of the buffer, leave it as '\0'. - Note that MATCH_FIRST must not be smaller than 0. */ - ch = (match_first >= length - ? 0 : re_string_byte_at (&mctx.input, offset)); - if (fastmap[ch]) - break; - match_first += incr; - if (match_first < left_lim || match_first > right_lim) - { - err = REG_NOMATCH; - goto free_return; - } - } - break; - } - - /* Reconstruct the buffers so that the matcher can assume that - the matching starts from the beginning of the buffer. */ - err = re_string_reconstruct (&mctx.input, match_first, eflags); - if (BE (err != REG_NOERROR, 0)) - goto free_return; - -#ifdef RE_ENABLE_I18N - /* Don't consider this char as a possible match start if it part, - yet isn't the head, of a multibyte character. */ - if (!sb && !re_string_first_byte (&mctx.input, 0)) - continue; -#endif - - /* It seems to be appropriate one, then use the matcher. */ - /* We assume that the matching starts from 0. */ - mctx.state_log_top = mctx.nbkref_ents = mctx.max_mb_elem_len = 0; - match_last = check_matching (&mctx, fl_longest_match, - range >= 0 ? &match_first : NULL); - if (match_last != -1) - { - if (BE (match_last == -2, 0)) - { - err = REG_ESPACE; - goto free_return; - } - else - { - mctx.match_last = match_last; - if ((!preg->no_sub && nmatch > 1) || dfa->nbackref) - { - re_dfastate_t *pstate = mctx.state_log[match_last]; - mctx.last_node = check_halt_state_context (&mctx, pstate, - match_last); - } - if ((!preg->no_sub && nmatch > 1 && dfa->has_plural_match) - || dfa->nbackref) - { - err = prune_impossible_nodes (&mctx); - if (err == REG_NOERROR) - break; - if (BE (err != REG_NOMATCH, 0)) - goto free_return; - match_last = -1; - } - else - break; /* We found a match. */ - } - } - - match_ctx_clean (&mctx); - } - -#ifdef DEBUG - assert (match_last != -1); - assert (err == REG_NOERROR); -#endif - - /* Set pmatch[] if we need. */ - if (nmatch > 0) - { - unsigned int reg_idx; - - /* Initialize registers. */ - for (reg_idx = 1; reg_idx < nmatch; ++reg_idx) - pmatch[reg_idx].rm_so = pmatch[reg_idx].rm_eo = -1; - - /* Set the points where matching start/end. */ - pmatch[0].rm_so = 0; - pmatch[0].rm_eo = mctx.match_last; - - if (!preg->no_sub && nmatch > 1) - { - err = set_regs (preg, &mctx, nmatch, pmatch, - dfa->has_plural_match && dfa->nbackref > 0); - if (BE (err != REG_NOERROR, 0)) - goto free_return; - } - - /* At last, add the offset to the each registers, since we slided - the buffers so that we could assume that the matching starts - from 0. */ - for (reg_idx = 0; reg_idx < nmatch; ++reg_idx) - if (pmatch[reg_idx].rm_so != -1) - { -#ifdef RE_ENABLE_I18N - if (BE (mctx.input.offsets_needed != 0, 0)) - { - pmatch[reg_idx].rm_so = - (pmatch[reg_idx].rm_so == mctx.input.valid_len - ? mctx.input.valid_raw_len - : mctx.input.offsets[pmatch[reg_idx].rm_so]); - pmatch[reg_idx].rm_eo = - (pmatch[reg_idx].rm_eo == mctx.input.valid_len - ? mctx.input.valid_raw_len - : mctx.input.offsets[pmatch[reg_idx].rm_eo]); - } -#else - assert (mctx.input.offsets_needed == 0); -#endif - pmatch[reg_idx].rm_so += match_first; - pmatch[reg_idx].rm_eo += match_first; - } - for (reg_idx = 0; reg_idx < extra_nmatch; ++reg_idx) - { - pmatch[nmatch + reg_idx].rm_so = -1; - pmatch[nmatch + reg_idx].rm_eo = -1; - } - - if (dfa->subexp_map) - for (reg_idx = 0; reg_idx + 1 < nmatch; reg_idx++) - if (dfa->subexp_map[reg_idx] != (int)reg_idx) - { - pmatch[reg_idx + 1].rm_so - = pmatch[dfa->subexp_map[reg_idx] + 1].rm_so; - pmatch[reg_idx + 1].rm_eo - = pmatch[dfa->subexp_map[reg_idx] + 1].rm_eo; - } - } - - free_return: - re_free (mctx.state_log); - if (dfa->nbackref) - match_ctx_free (&mctx); - re_string_destruct (&mctx.input); - return err; -} - -static reg_errcode_t -prune_impossible_nodes (re_match_context_t *mctx) -{ - const re_dfa_t *const dfa = mctx->dfa; - int halt_node, match_last; - reg_errcode_t ret; - re_dfastate_t **sifted_states; - re_dfastate_t **lim_states = NULL; - re_sift_context_t sctx; -#ifdef DEBUG - assert (mctx->state_log != NULL); -#endif - match_last = mctx->match_last; - halt_node = mctx->last_node; - - /* Avoid overflow. */ - if (BE (SIZE_MAX / sizeof (re_dfastate_t *) <= (size_t)match_last, 0)) - return REG_ESPACE; - - sifted_states = re_malloc (re_dfastate_t *, match_last + 1); - if (BE (sifted_states == NULL, 0)) - { - ret = REG_ESPACE; - goto free_return; - } - if (dfa->nbackref) - { - lim_states = re_malloc (re_dfastate_t *, match_last + 1); - if (BE (lim_states == NULL, 0)) - { - ret = REG_ESPACE; - goto free_return; - } - while (1) - { - memset (lim_states, '\0', - sizeof (re_dfastate_t *) * (match_last + 1)); - sift_ctx_init (&sctx, sifted_states, lim_states, halt_node, - match_last); - ret = sift_states_backward (mctx, &sctx); - re_node_set_free (&sctx.limits); - if (BE (ret != REG_NOERROR, 0)) - goto free_return; - if (sifted_states[0] != NULL || lim_states[0] != NULL) - break; - do - { - --match_last; - if (match_last < 0) - { - ret = REG_NOMATCH; - goto free_return; - } - } while (mctx->state_log[match_last] == NULL - || !mctx->state_log[match_last]->halt); - halt_node = check_halt_state_context (mctx, - mctx->state_log[match_last], - match_last); - } - ret = merge_state_array (dfa, sifted_states, lim_states, - match_last + 1); - re_free (lim_states); - lim_states = NULL; - if (BE (ret != REG_NOERROR, 0)) - goto free_return; - } - else - { - sift_ctx_init (&sctx, sifted_states, lim_states, halt_node, match_last); - ret = sift_states_backward (mctx, &sctx); - re_node_set_free (&sctx.limits); - if (BE (ret != REG_NOERROR, 0)) - goto free_return; - if (sifted_states[0] == NULL) - { - ret = REG_NOMATCH; - goto free_return; - } - } - re_free (mctx->state_log); - mctx->state_log = sifted_states; - sifted_states = NULL; - mctx->last_node = halt_node; - mctx->match_last = match_last; - ret = REG_NOERROR; - free_return: - re_free (sifted_states); - re_free (lim_states); - return ret; -} - -/* Acquire an initial state and return it. - We must select appropriate initial state depending on the context, - since initial states may have constraints like "\<", "^", etc.. */ - -static inline re_dfastate_t * -__attribute ((always_inline)) internal_function -acquire_init_state_context (reg_errcode_t *err, const re_match_context_t *mctx, - int idx) -{ - const re_dfa_t *const dfa = mctx->dfa; - if (dfa->init_state->has_constraint) - { - unsigned int context; - context = re_string_context_at (&mctx->input, idx - 1, mctx->eflags); - if (IS_WORD_CONTEXT (context)) - return dfa->init_state_word; - else if (IS_ORDINARY_CONTEXT (context)) - return dfa->init_state; - else if (IS_BEGBUF_CONTEXT (context) && IS_NEWLINE_CONTEXT (context)) - return dfa->init_state_begbuf; - else if (IS_NEWLINE_CONTEXT (context)) - return dfa->init_state_nl; - else if (IS_BEGBUF_CONTEXT (context)) - { - /* It is relatively rare case, then calculate on demand. */ - return re_acquire_state_context (err, dfa, - dfa->init_state->entrance_nodes, - context); - } - else - /* Must not happen? */ - return dfa->init_state; - } - else - return dfa->init_state; -} - -/* Check whether the regular expression match input string INPUT or not, - and return the index where the matching end, return -1 if not match, - or return -2 in case of an error. - FL_LONGEST_MATCH means we want the POSIX longest matching. - If P_MATCH_FIRST is not NULL, and the match fails, it is set to the - next place where we may want to try matching. - Note that the matcher assume that the maching starts from the current - index of the buffer. */ - -static int -internal_function -check_matching (re_match_context_t *mctx, int fl_longest_match, - int *p_match_first) -{ - const re_dfa_t *const dfa = mctx->dfa; - reg_errcode_t err; - int match = 0; - int match_last = -1; - int cur_str_idx = re_string_cur_idx (&mctx->input); - re_dfastate_t *cur_state; - int at_init_state = p_match_first != NULL; - int next_start_idx = cur_str_idx; - - err = REG_NOERROR; - cur_state = acquire_init_state_context (&err, mctx, cur_str_idx); - /* An initial state must not be NULL (invalid). */ - if (BE (cur_state == NULL, 0)) - { - assert (err == REG_ESPACE); - return -2; - } - - if (mctx->state_log != NULL) - { - mctx->state_log[cur_str_idx] = cur_state; - - /* Check OP_OPEN_SUBEXP in the initial state in case that we use them - later. E.g. Processing back references. */ - if (BE (dfa->nbackref, 0)) - { - at_init_state = 0; - err = check_subexp_matching_top (mctx, &cur_state->nodes, 0); - if (BE (err != REG_NOERROR, 0)) - return err; - - if (cur_state->has_backref) - { - err = transit_state_bkref (mctx, &cur_state->nodes); - if (BE (err != REG_NOERROR, 0)) - return err; - } - } - } - - /* If the RE accepts NULL string. */ - if (BE (cur_state->halt, 0)) - { - if (!cur_state->has_constraint - || check_halt_state_context (mctx, cur_state, cur_str_idx)) - { - if (!fl_longest_match) - return cur_str_idx; - else - { - match_last = cur_str_idx; - match = 1; - } - } - } - - while (!re_string_eoi (&mctx->input)) - { - re_dfastate_t *old_state = cur_state; - int next_char_idx = re_string_cur_idx (&mctx->input) + 1; - - if (BE (next_char_idx >= mctx->input.bufs_len, 0) - || (BE (next_char_idx >= mctx->input.valid_len, 0) - && mctx->input.valid_len < mctx->input.len)) - { - err = extend_buffers (mctx); - if (BE (err != REG_NOERROR, 0)) - { - assert (err == REG_ESPACE); - return -2; - } - } - - cur_state = transit_state (&err, mctx, cur_state); - if (mctx->state_log != NULL) - cur_state = merge_state_with_log (&err, mctx, cur_state); - - if (cur_state == NULL) - { - /* Reached the invalid state or an error. Try to recover a valid - state using the state log, if available and if we have not - already found a valid (even if not the longest) match. */ - if (BE (err != REG_NOERROR, 0)) - return -2; - - if (mctx->state_log == NULL - || (match && !fl_longest_match) - || (cur_state = find_recover_state (&err, mctx)) == NULL) - break; - } - - if (BE (at_init_state, 0)) - { - if (old_state == cur_state) - next_start_idx = next_char_idx; - else - at_init_state = 0; - } - - if (cur_state->halt) - { - /* Reached a halt state. - Check the halt state can satisfy the current context. */ - if (!cur_state->has_constraint - || check_halt_state_context (mctx, cur_state, - re_string_cur_idx (&mctx->input))) - { - /* We found an appropriate halt state. */ - match_last = re_string_cur_idx (&mctx->input); - match = 1; - - /* We found a match, do not modify match_first below. */ - p_match_first = NULL; - if (!fl_longest_match) - break; - } - } - } - - if (p_match_first) - *p_match_first += next_start_idx; - - return match_last; -} - -/* Check NODE match the current context. */ - -static int -internal_function -check_halt_node_context (const re_dfa_t *dfa, int node, unsigned int context) -{ - re_token_type_t type = dfa->nodes[node].type; - unsigned int constraint = dfa->nodes[node].constraint; - if (type != END_OF_RE) - return 0; - if (!constraint) - return 1; - if (NOT_SATISFY_NEXT_CONSTRAINT (constraint, context)) - return 0; - return 1; -} - -/* Check the halt state STATE match the current context. - Return 0 if not match, if the node, STATE has, is a halt node and - match the context, return the node. */ - -static int -internal_function -check_halt_state_context (const re_match_context_t *mctx, - const re_dfastate_t *state, int idx) -{ - int i; - unsigned int context; -#ifdef DEBUG - assert (state->halt); -#endif - context = re_string_context_at (&mctx->input, idx, mctx->eflags); - for (i = 0; i < state->nodes.nelem; ++i) - if (check_halt_node_context (mctx->dfa, state->nodes.elems[i], context)) - return state->nodes.elems[i]; - return 0; -} - -/* Compute the next node to which "NFA" transit from NODE("NFA" is a NFA - corresponding to the DFA). - Return the destination node, and update EPS_VIA_NODES, return -1 in case - of errors. */ - -static int -internal_function -proceed_next_node (const re_match_context_t *mctx, int nregs, regmatch_t *regs, - int *pidx, int node, re_node_set *eps_via_nodes, - struct re_fail_stack_t *fs) -{ - const re_dfa_t *const dfa = mctx->dfa; - int i, err; - if (IS_EPSILON_NODE (dfa->nodes[node].type)) - { - re_node_set *cur_nodes = &mctx->state_log[*pidx]->nodes; - re_node_set *edests = &dfa->edests[node]; - int dest_node; - err = re_node_set_insert (eps_via_nodes, node); - if (BE (err < 0, 0)) - return -2; - /* Pick up a valid destination, or return -1 if none is found. */ - for (dest_node = -1, i = 0; i < edests->nelem; ++i) - { - int candidate = edests->elems[i]; - if (!re_node_set_contains (cur_nodes, candidate)) - continue; - if (dest_node == -1) - dest_node = candidate; - - else - { - /* In order to avoid infinite loop like "(a*)*", return the second - epsilon-transition if the first was already considered. */ - if (re_node_set_contains (eps_via_nodes, dest_node)) - return candidate; - - /* Otherwise, push the second epsilon-transition on the fail stack. */ - else if (fs != NULL - && push_fail_stack (fs, *pidx, candidate, nregs, regs, - eps_via_nodes)) - return -2; - - /* We know we are going to exit. */ - break; - } - } - return dest_node; - } - else - { - int naccepted = 0; - re_token_type_t type = dfa->nodes[node].type; - -#ifdef RE_ENABLE_I18N - if (dfa->nodes[node].accept_mb) - naccepted = check_node_accept_bytes (dfa, node, &mctx->input, *pidx); - else -#endif /* RE_ENABLE_I18N */ - if (type == OP_BACK_REF) - { - int subexp_idx = dfa->nodes[node].opr.idx + 1; - naccepted = regs[subexp_idx].rm_eo - regs[subexp_idx].rm_so; - if (fs != NULL) - { - if (regs[subexp_idx].rm_so == -1 || regs[subexp_idx].rm_eo == -1) - return -1; - else if (naccepted) - { - char *buf = (char *) re_string_get_buffer (&mctx->input); - if (memcmp (buf + regs[subexp_idx].rm_so, buf + *pidx, - naccepted) != 0) - return -1; - } - } - - if (naccepted == 0) - { - int dest_node; - err = re_node_set_insert (eps_via_nodes, node); - if (BE (err < 0, 0)) - return -2; - dest_node = dfa->edests[node].elems[0]; - if (re_node_set_contains (&mctx->state_log[*pidx]->nodes, - dest_node)) - return dest_node; - } - } - - if (naccepted != 0 - || check_node_accept (mctx, dfa->nodes + node, *pidx)) - { - int dest_node = dfa->nexts[node]; - *pidx = (naccepted == 0) ? *pidx + 1 : *pidx + naccepted; - if (fs && (*pidx > mctx->match_last || mctx->state_log[*pidx] == NULL - || !re_node_set_contains (&mctx->state_log[*pidx]->nodes, - dest_node))) - return -1; - re_node_set_empty (eps_via_nodes); - return dest_node; - } - } - return -1; -} - -static reg_errcode_t -internal_function -push_fail_stack (struct re_fail_stack_t *fs, int str_idx, int dest_node, - int nregs, regmatch_t *regs, re_node_set *eps_via_nodes) -{ - reg_errcode_t err; - int num = fs->num++; - if (fs->num == fs->alloc) - { - struct re_fail_stack_ent_t *new_array; - new_array = realloc (fs->stack, (sizeof (struct re_fail_stack_ent_t) - * fs->alloc * 2)); - if (new_array == NULL) - return REG_ESPACE; - fs->alloc *= 2; - fs->stack = new_array; - } - fs->stack[num].idx = str_idx; - fs->stack[num].node = dest_node; - fs->stack[num].regs = re_malloc (regmatch_t, nregs); - if (fs->stack[num].regs == NULL) - return REG_ESPACE; - memcpy (fs->stack[num].regs, regs, sizeof (regmatch_t) * nregs); - err = re_node_set_init_copy (&fs->stack[num].eps_via_nodes, eps_via_nodes); - return err; -} - -static int -internal_function -pop_fail_stack (struct re_fail_stack_t *fs, int *pidx, int nregs, - regmatch_t *regs, re_node_set *eps_via_nodes) -{ - int num = --fs->num; - assert (num >= 0); - *pidx = fs->stack[num].idx; - memcpy (regs, fs->stack[num].regs, sizeof (regmatch_t) * nregs); - re_node_set_free (eps_via_nodes); - re_free (fs->stack[num].regs); - *eps_via_nodes = fs->stack[num].eps_via_nodes; - return fs->stack[num].node; -} - -/* Set the positions where the subexpressions are starts/ends to registers - PMATCH. - Note: We assume that pmatch[0] is already set, and - pmatch[i].rm_so == pmatch[i].rm_eo == -1 for 0 < i < nmatch. */ - -static reg_errcode_t -internal_function -set_regs (const regex_t *preg, const re_match_context_t *mctx, size_t nmatch, - regmatch_t *pmatch, int fl_backtrack) -{ - const re_dfa_t *dfa = (const re_dfa_t *) preg->buffer; - int idx, cur_node; - re_node_set eps_via_nodes; - struct re_fail_stack_t *fs; - struct re_fail_stack_t fs_body = { 0, 2, NULL }; - regmatch_t *prev_idx_match; - int prev_idx_match_malloced = 0; - -#ifdef DEBUG - assert (nmatch > 1); - assert (mctx->state_log != NULL); -#endif - if (fl_backtrack) - { - fs = &fs_body; - fs->stack = re_malloc (struct re_fail_stack_ent_t, fs->alloc); - if (fs->stack == NULL) - return REG_ESPACE; - } - else - fs = NULL; - - cur_node = dfa->init_node; - re_node_set_init_empty (&eps_via_nodes); - -#ifdef HAVE_ALLOCA - if (__libc_use_alloca (nmatch * sizeof (regmatch_t))) - prev_idx_match = (regmatch_t *) alloca (nmatch * sizeof (regmatch_t)); - else -#endif - { - prev_idx_match = re_malloc (regmatch_t, nmatch); - if (prev_idx_match == NULL) - { - free_fail_stack_return (fs); - return REG_ESPACE; - } - prev_idx_match_malloced = 1; - } - memcpy (prev_idx_match, pmatch, sizeof (regmatch_t) * nmatch); - - for (idx = pmatch[0].rm_so; idx <= pmatch[0].rm_eo ;) - { - update_regs (dfa, pmatch, prev_idx_match, cur_node, idx, nmatch); - - if (idx == pmatch[0].rm_eo && cur_node == mctx->last_node) - { - unsigned int reg_idx; - if (fs) - { - for (reg_idx = 0; reg_idx < nmatch; ++reg_idx) - if (pmatch[reg_idx].rm_so > -1 && pmatch[reg_idx].rm_eo == -1) - break; - if (reg_idx == nmatch) - { - re_node_set_free (&eps_via_nodes); - if (prev_idx_match_malloced) - re_free (prev_idx_match); - return free_fail_stack_return (fs); - } - cur_node = pop_fail_stack (fs, &idx, nmatch, pmatch, - &eps_via_nodes); - } - else - { - re_node_set_free (&eps_via_nodes); - if (prev_idx_match_malloced) - re_free (prev_idx_match); - return REG_NOERROR; - } - } - - /* Proceed to next node. */ - cur_node = proceed_next_node (mctx, nmatch, pmatch, &idx, cur_node, - &eps_via_nodes, fs); - - if (BE (cur_node < 0, 0)) - { - if (BE (cur_node == -2, 0)) - { - re_node_set_free (&eps_via_nodes); - if (prev_idx_match_malloced) - re_free (prev_idx_match); - free_fail_stack_return (fs); - return REG_ESPACE; - } - if (fs) - cur_node = pop_fail_stack (fs, &idx, nmatch, pmatch, - &eps_via_nodes); - else - { - re_node_set_free (&eps_via_nodes); - if (prev_idx_match_malloced) - re_free (prev_idx_match); - return REG_NOMATCH; - } - } - } - re_node_set_free (&eps_via_nodes); - if (prev_idx_match_malloced) - re_free (prev_idx_match); - return free_fail_stack_return (fs); -} - -static reg_errcode_t -internal_function -free_fail_stack_return (struct re_fail_stack_t *fs) -{ - if (fs) - { - int fs_idx; - for (fs_idx = 0; fs_idx < fs->num; ++fs_idx) - { - re_node_set_free (&fs->stack[fs_idx].eps_via_nodes); - re_free (fs->stack[fs_idx].regs); - } - re_free (fs->stack); - } - return REG_NOERROR; -} - -static void -internal_function -update_regs (const re_dfa_t *dfa, regmatch_t *pmatch, - regmatch_t *prev_idx_match, int cur_node, int cur_idx, int nmatch) -{ - int type = dfa->nodes[cur_node].type; - if (type == OP_OPEN_SUBEXP) - { - int reg_num = dfa->nodes[cur_node].opr.idx + 1; - - /* We are at the first node of this sub expression. */ - if (reg_num < nmatch) - { - pmatch[reg_num].rm_so = cur_idx; - pmatch[reg_num].rm_eo = -1; - } - } - else if (type == OP_CLOSE_SUBEXP) - { - int reg_num = dfa->nodes[cur_node].opr.idx + 1; - if (reg_num < nmatch) - { - /* We are at the last node of this sub expression. */ - if (pmatch[reg_num].rm_so < cur_idx) - { - pmatch[reg_num].rm_eo = cur_idx; - /* This is a non-empty match or we are not inside an optional - subexpression. Accept this right away. */ - memcpy (prev_idx_match, pmatch, sizeof (regmatch_t) * nmatch); - } - else - { - if (dfa->nodes[cur_node].opt_subexp - && prev_idx_match[reg_num].rm_so != -1) - /* We transited through an empty match for an optional - subexpression, like (a?)*, and this is not the subexp's - first match. Copy back the old content of the registers - so that matches of an inner subexpression are undone as - well, like in ((a?))*. */ - memcpy (pmatch, prev_idx_match, sizeof (regmatch_t) * nmatch); - else - /* We completed a subexpression, but it may be part of - an optional one, so do not update PREV_IDX_MATCH. */ - pmatch[reg_num].rm_eo = cur_idx; - } - } - } -} - -/* This function checks the STATE_LOG from the SCTX->last_str_idx to 0 - and sift the nodes in each states according to the following rules. - Updated state_log will be wrote to STATE_LOG. - - Rules: We throw away the Node `a' in the STATE_LOG[STR_IDX] if... - 1. When STR_IDX == MATCH_LAST(the last index in the state_log): - If `a' isn't the LAST_NODE and `a' can't epsilon transit to - the LAST_NODE, we throw away the node `a'. - 2. When 0 <= STR_IDX < MATCH_LAST and `a' accepts - string `s' and transit to `b': - i. If 'b' isn't in the STATE_LOG[STR_IDX+strlen('s')], we throw - away the node `a'. - ii. If 'b' is in the STATE_LOG[STR_IDX+strlen('s')] but 'b' is - thrown away, we throw away the node `a'. - 3. When 0 <= STR_IDX < MATCH_LAST and 'a' epsilon transit to 'b': - i. If 'b' isn't in the STATE_LOG[STR_IDX], we throw away the - node `a'. - ii. If 'b' is in the STATE_LOG[STR_IDX] but 'b' is thrown away, - we throw away the node `a'. */ - -#define STATE_NODE_CONTAINS(state,node) \ - ((state) != NULL && re_node_set_contains (&(state)->nodes, node)) - -static reg_errcode_t -internal_function -sift_states_backward (const re_match_context_t *mctx, re_sift_context_t *sctx) -{ - reg_errcode_t err; - int null_cnt = 0; - int str_idx = sctx->last_str_idx; - re_node_set cur_dest; - -#ifdef DEBUG - assert (mctx->state_log != NULL && mctx->state_log[str_idx] != NULL); -#endif - - /* Build sifted state_log[str_idx]. It has the nodes which can epsilon - transit to the last_node and the last_node itself. */ - err = re_node_set_init_1 (&cur_dest, sctx->last_node); - if (BE (err != REG_NOERROR, 0)) - return err; - err = update_cur_sifted_state (mctx, sctx, str_idx, &cur_dest); - if (BE (err != REG_NOERROR, 0)) - goto free_return; - - /* Then check each states in the state_log. */ - while (str_idx > 0) - { - /* Update counters. */ - null_cnt = (sctx->sifted_states[str_idx] == NULL) ? null_cnt + 1 : 0; - if (null_cnt > mctx->max_mb_elem_len) - { - memset (sctx->sifted_states, '\0', - sizeof (re_dfastate_t *) * str_idx); - re_node_set_free (&cur_dest); - return REG_NOERROR; - } - re_node_set_empty (&cur_dest); - --str_idx; - - if (mctx->state_log[str_idx]) - { - err = build_sifted_states (mctx, sctx, str_idx, &cur_dest); - if (BE (err != REG_NOERROR, 0)) - goto free_return; - } - - /* Add all the nodes which satisfy the following conditions: - - It can epsilon transit to a node in CUR_DEST. - - It is in CUR_SRC. - And update state_log. */ - err = update_cur_sifted_state (mctx, sctx, str_idx, &cur_dest); - if (BE (err != REG_NOERROR, 0)) - goto free_return; - } - err = REG_NOERROR; - free_return: - re_node_set_free (&cur_dest); - return err; -} - -static reg_errcode_t -internal_function -build_sifted_states (const re_match_context_t *mctx, re_sift_context_t *sctx, - int str_idx, re_node_set *cur_dest) -{ - const re_dfa_t *const dfa = mctx->dfa; - const re_node_set *cur_src = &mctx->state_log[str_idx]->non_eps_nodes; - int i; - - /* Then build the next sifted state. - We build the next sifted state on `cur_dest', and update - `sifted_states[str_idx]' with `cur_dest'. - Note: - `cur_dest' is the sifted state from `state_log[str_idx + 1]'. - `cur_src' points the node_set of the old `state_log[str_idx]' - (with the epsilon nodes pre-filtered out). */ - for (i = 0; i < cur_src->nelem; i++) - { - int prev_node = cur_src->elems[i]; - int naccepted = 0; - int ret; - -#ifdef DEBUG - re_token_type_t type = dfa->nodes[prev_node].type; - assert (!IS_EPSILON_NODE (type)); -#endif -#ifdef RE_ENABLE_I18N - /* If the node may accept `multi byte'. */ - if (dfa->nodes[prev_node].accept_mb) - naccepted = sift_states_iter_mb (mctx, sctx, prev_node, - str_idx, sctx->last_str_idx); -#endif /* RE_ENABLE_I18N */ - - /* We don't check backreferences here. - See update_cur_sifted_state(). */ - if (!naccepted - && check_node_accept (mctx, dfa->nodes + prev_node, str_idx) - && STATE_NODE_CONTAINS (sctx->sifted_states[str_idx + 1], - dfa->nexts[prev_node])) - naccepted = 1; - - if (naccepted == 0) - continue; - - if (sctx->limits.nelem) - { - int to_idx = str_idx + naccepted; - if (check_dst_limits (mctx, &sctx->limits, - dfa->nexts[prev_node], to_idx, - prev_node, str_idx)) - continue; - } - ret = re_node_set_insert (cur_dest, prev_node); - if (BE (ret == -1, 0)) - return REG_ESPACE; - } - - return REG_NOERROR; -} - -/* Helper functions. */ - -static reg_errcode_t -internal_function -clean_state_log_if_needed (re_match_context_t *mctx, int next_state_log_idx) -{ - int top = mctx->state_log_top; - - if (next_state_log_idx >= mctx->input.bufs_len - || (next_state_log_idx >= mctx->input.valid_len - && mctx->input.valid_len < mctx->input.len)) - { - reg_errcode_t err; - err = extend_buffers (mctx); - if (BE (err != REG_NOERROR, 0)) - return err; - } - - if (top < next_state_log_idx) - { - memset (mctx->state_log + top + 1, '\0', - sizeof (re_dfastate_t *) * (next_state_log_idx - top)); - mctx->state_log_top = next_state_log_idx; - } - return REG_NOERROR; -} - -static reg_errcode_t -internal_function -merge_state_array (const re_dfa_t *dfa, re_dfastate_t **dst, - re_dfastate_t **src, int num) -{ - int st_idx; - reg_errcode_t err; - for (st_idx = 0; st_idx < num; ++st_idx) - { - if (dst[st_idx] == NULL) - dst[st_idx] = src[st_idx]; - else if (src[st_idx] != NULL) - { - re_node_set merged_set; - err = re_node_set_init_union (&merged_set, &dst[st_idx]->nodes, - &src[st_idx]->nodes); - if (BE (err != REG_NOERROR, 0)) - return err; - dst[st_idx] = re_acquire_state (&err, dfa, &merged_set); - re_node_set_free (&merged_set); - if (BE (err != REG_NOERROR, 0)) - return err; - } - } - return REG_NOERROR; -} - -static reg_errcode_t -internal_function -update_cur_sifted_state (const re_match_context_t *mctx, - re_sift_context_t *sctx, int str_idx, - re_node_set *dest_nodes) -{ - const re_dfa_t *const dfa = mctx->dfa; - reg_errcode_t err = REG_NOERROR; - const re_node_set *candidates; - candidates = ((mctx->state_log[str_idx] == NULL) ? NULL - : &mctx->state_log[str_idx]->nodes); - - if (dest_nodes->nelem == 0) - sctx->sifted_states[str_idx] = NULL; - else - { - if (candidates) - { - /* At first, add the nodes which can epsilon transit to a node in - DEST_NODE. */ - err = add_epsilon_src_nodes (dfa, dest_nodes, candidates); - if (BE (err != REG_NOERROR, 0)) - return err; - - /* Then, check the limitations in the current sift_context. */ - if (sctx->limits.nelem) - { - err = check_subexp_limits (dfa, dest_nodes, candidates, &sctx->limits, - mctx->bkref_ents, str_idx); - if (BE (err != REG_NOERROR, 0)) - return err; - } - } - - sctx->sifted_states[str_idx] = re_acquire_state (&err, dfa, dest_nodes); - if (BE (err != REG_NOERROR, 0)) - return err; - } - - if (candidates && mctx->state_log[str_idx]->has_backref) - { - err = sift_states_bkref (mctx, sctx, str_idx, candidates); - if (BE (err != REG_NOERROR, 0)) - return err; - } - return REG_NOERROR; -} - -static reg_errcode_t -internal_function -add_epsilon_src_nodes (const re_dfa_t *dfa, re_node_set *dest_nodes, - const re_node_set *candidates) -{ - reg_errcode_t err = REG_NOERROR; - int i; - - re_dfastate_t *state = re_acquire_state (&err, dfa, dest_nodes); - if (BE (err != REG_NOERROR, 0)) - return err; - - if (!state->inveclosure.alloc) - { - err = re_node_set_alloc (&state->inveclosure, dest_nodes->nelem); - if (BE (err != REG_NOERROR, 0)) - return REG_ESPACE; - for (i = 0; i < dest_nodes->nelem; i++) - { - err = re_node_set_merge (&state->inveclosure, - dfa->inveclosures + dest_nodes->elems[i]); - if (BE (err != REG_NOERROR, 0)) - return REG_ESPACE; - } - } - return re_node_set_add_intersect (dest_nodes, candidates, - &state->inveclosure); -} - -static reg_errcode_t -internal_function -sub_epsilon_src_nodes (const re_dfa_t *dfa, int node, re_node_set *dest_nodes, - const re_node_set *candidates) -{ - int ecl_idx; - reg_errcode_t err; - re_node_set *inv_eclosure = dfa->inveclosures + node; - re_node_set except_nodes; - re_node_set_init_empty (&except_nodes); - for (ecl_idx = 0; ecl_idx < inv_eclosure->nelem; ++ecl_idx) - { - int cur_node = inv_eclosure->elems[ecl_idx]; - if (cur_node == node) - continue; - if (IS_EPSILON_NODE (dfa->nodes[cur_node].type)) - { - int edst1 = dfa->edests[cur_node].elems[0]; - int edst2 = ((dfa->edests[cur_node].nelem > 1) - ? dfa->edests[cur_node].elems[1] : -1); - if ((!re_node_set_contains (inv_eclosure, edst1) - && re_node_set_contains (dest_nodes, edst1)) - || (edst2 > 0 - && !re_node_set_contains (inv_eclosure, edst2) - && re_node_set_contains (dest_nodes, edst2))) - { - err = re_node_set_add_intersect (&except_nodes, candidates, - dfa->inveclosures + cur_node); - if (BE (err != REG_NOERROR, 0)) - { - re_node_set_free (&except_nodes); - return err; - } - } - } - } - for (ecl_idx = 0; ecl_idx < inv_eclosure->nelem; ++ecl_idx) - { - int cur_node = inv_eclosure->elems[ecl_idx]; - if (!re_node_set_contains (&except_nodes, cur_node)) - { - int idx = re_node_set_contains (dest_nodes, cur_node) - 1; - re_node_set_remove_at (dest_nodes, idx); - } - } - re_node_set_free (&except_nodes); - return REG_NOERROR; -} - -static int -internal_function -check_dst_limits (const re_match_context_t *mctx, re_node_set *limits, - int dst_node, int dst_idx, int src_node, int src_idx) -{ - const re_dfa_t *const dfa = mctx->dfa; - int lim_idx, src_pos, dst_pos; - - int dst_bkref_idx = search_cur_bkref_entry (mctx, dst_idx); - int src_bkref_idx = search_cur_bkref_entry (mctx, src_idx); - for (lim_idx = 0; lim_idx < limits->nelem; ++lim_idx) - { - int subexp_idx; - struct re_backref_cache_entry *ent; - ent = mctx->bkref_ents + limits->elems[lim_idx]; - subexp_idx = dfa->nodes[ent->node].opr.idx; - - dst_pos = check_dst_limits_calc_pos (mctx, limits->elems[lim_idx], - subexp_idx, dst_node, dst_idx, - dst_bkref_idx); - src_pos = check_dst_limits_calc_pos (mctx, limits->elems[lim_idx], - subexp_idx, src_node, src_idx, - src_bkref_idx); - - /* In case of: - ( ) - ( ) - ( ) */ - if (src_pos == dst_pos) - continue; /* This is unrelated limitation. */ - else - return 1; - } - return 0; -} - -static int -internal_function -check_dst_limits_calc_pos_1 (const re_match_context_t *mctx, int boundaries, - int subexp_idx, int from_node, int bkref_idx) -{ - const re_dfa_t *const dfa = mctx->dfa; - const re_node_set *eclosures = dfa->eclosures + from_node; - int node_idx; - - /* Else, we are on the boundary: examine the nodes on the epsilon - closure. */ - for (node_idx = 0; node_idx < eclosures->nelem; ++node_idx) - { - int node = eclosures->elems[node_idx]; - switch (dfa->nodes[node].type) - { - case OP_BACK_REF: - if (bkref_idx != -1) - { - struct re_backref_cache_entry *ent = mctx->bkref_ents + bkref_idx; - do - { - int dst, cpos; - - if (ent->node != node) - continue; - - if (subexp_idx < BITSET_WORD_BITS - && !(ent->eps_reachable_subexps_map - & ((bitset_word_t) 1 << subexp_idx))) - continue; - - /* Recurse trying to reach the OP_OPEN_SUBEXP and - OP_CLOSE_SUBEXP cases below. But, if the - destination node is the same node as the source - node, don't recurse because it would cause an - infinite loop: a regex that exhibits this behavior - is ()\1*\1* */ - dst = dfa->edests[node].elems[0]; - if (dst == from_node) - { - if (boundaries & 1) - return -1; - else /* if (boundaries & 2) */ - return 0; - } - - cpos = - check_dst_limits_calc_pos_1 (mctx, boundaries, subexp_idx, - dst, bkref_idx); - if (cpos == -1 /* && (boundaries & 1) */) - return -1; - if (cpos == 0 && (boundaries & 2)) - return 0; - - if (subexp_idx < BITSET_WORD_BITS) - ent->eps_reachable_subexps_map - &= ~((bitset_word_t) 1 << subexp_idx); - } - while (ent++->more); - } - break; - - case OP_OPEN_SUBEXP: - if ((boundaries & 1) && subexp_idx == dfa->nodes[node].opr.idx) - return -1; - break; - - case OP_CLOSE_SUBEXP: - if ((boundaries & 2) && subexp_idx == dfa->nodes[node].opr.idx) - return 0; - break; - - default: - break; - } - } - - return (boundaries & 2) ? 1 : 0; -} - -static int -internal_function -check_dst_limits_calc_pos (const re_match_context_t *mctx, int limit, - int subexp_idx, int from_node, int str_idx, - int bkref_idx) -{ - struct re_backref_cache_entry *lim = mctx->bkref_ents + limit; - int boundaries; - - /* If we are outside the range of the subexpression, return -1 or 1. */ - if (str_idx < lim->subexp_from) - return -1; - - if (lim->subexp_to < str_idx) - return 1; - - /* If we are within the subexpression, return 0. */ - boundaries = (str_idx == lim->subexp_from); - boundaries |= (str_idx == lim->subexp_to) << 1; - if (boundaries == 0) - return 0; - - /* Else, examine epsilon closure. */ - return check_dst_limits_calc_pos_1 (mctx, boundaries, subexp_idx, - from_node, bkref_idx); -} - -/* Check the limitations of sub expressions LIMITS, and remove the nodes - which are against limitations from DEST_NODES. */ - -static reg_errcode_t -internal_function -check_subexp_limits (const re_dfa_t *dfa, re_node_set *dest_nodes, - const re_node_set *candidates, re_node_set *limits, - struct re_backref_cache_entry *bkref_ents, int str_idx) -{ - reg_errcode_t err; - int node_idx, lim_idx; - - for (lim_idx = 0; lim_idx < limits->nelem; ++lim_idx) - { - int subexp_idx; - struct re_backref_cache_entry *ent; - ent = bkref_ents + limits->elems[lim_idx]; - - if (str_idx <= ent->subexp_from || ent->str_idx < str_idx) - continue; /* This is unrelated limitation. */ - - subexp_idx = dfa->nodes[ent->node].opr.idx; - if (ent->subexp_to == str_idx) - { - int ops_node = -1; - int cls_node = -1; - for (node_idx = 0; node_idx < dest_nodes->nelem; ++node_idx) - { - int node = dest_nodes->elems[node_idx]; - re_token_type_t type = dfa->nodes[node].type; - if (type == OP_OPEN_SUBEXP - && subexp_idx == dfa->nodes[node].opr.idx) - ops_node = node; - else if (type == OP_CLOSE_SUBEXP - && subexp_idx == dfa->nodes[node].opr.idx) - cls_node = node; - } - - /* Check the limitation of the open subexpression. */ - /* Note that (ent->subexp_to = str_idx != ent->subexp_from). */ - if (ops_node >= 0) - { - err = sub_epsilon_src_nodes (dfa, ops_node, dest_nodes, - candidates); - if (BE (err != REG_NOERROR, 0)) - return err; - } - - /* Check the limitation of the close subexpression. */ - if (cls_node >= 0) - for (node_idx = 0; node_idx < dest_nodes->nelem; ++node_idx) - { - int node = dest_nodes->elems[node_idx]; - if (!re_node_set_contains (dfa->inveclosures + node, - cls_node) - && !re_node_set_contains (dfa->eclosures + node, - cls_node)) - { - /* It is against this limitation. - Remove it form the current sifted state. */ - err = sub_epsilon_src_nodes (dfa, node, dest_nodes, - candidates); - if (BE (err != REG_NOERROR, 0)) - return err; - --node_idx; - } - } - } - else /* (ent->subexp_to != str_idx) */ - { - for (node_idx = 0; node_idx < dest_nodes->nelem; ++node_idx) - { - int node = dest_nodes->elems[node_idx]; - re_token_type_t type = dfa->nodes[node].type; - if (type == OP_CLOSE_SUBEXP || type == OP_OPEN_SUBEXP) - { - if (subexp_idx != dfa->nodes[node].opr.idx) - continue; - /* It is against this limitation. - Remove it form the current sifted state. */ - err = sub_epsilon_src_nodes (dfa, node, dest_nodes, - candidates); - if (BE (err != REG_NOERROR, 0)) - return err; - } - } - } - } - return REG_NOERROR; -} - -static reg_errcode_t -internal_function -sift_states_bkref (const re_match_context_t *mctx, re_sift_context_t *sctx, - int str_idx, const re_node_set *candidates) -{ - const re_dfa_t *const dfa = mctx->dfa; - reg_errcode_t err; - int node_idx, node; - re_sift_context_t local_sctx; - int first_idx = search_cur_bkref_entry (mctx, str_idx); - - if (first_idx == -1) - return REG_NOERROR; - - local_sctx.sifted_states = NULL; /* Mark that it hasn't been initialized. */ - - for (node_idx = 0; node_idx < candidates->nelem; ++node_idx) - { - int enabled_idx; - re_token_type_t type; - struct re_backref_cache_entry *entry; - node = candidates->elems[node_idx]; - type = dfa->nodes[node].type; - /* Avoid infinite loop for the REs like "()\1+". */ - if (node == sctx->last_node && str_idx == sctx->last_str_idx) - continue; - if (type != OP_BACK_REF) - continue; - - entry = mctx->bkref_ents + first_idx; - enabled_idx = first_idx; - do - { - int subexp_len; - int to_idx; - int dst_node; - int ret; - re_dfastate_t *cur_state; - - if (entry->node != node) - continue; - subexp_len = entry->subexp_to - entry->subexp_from; - to_idx = str_idx + subexp_len; - dst_node = (subexp_len ? dfa->nexts[node] - : dfa->edests[node].elems[0]); - - if (to_idx > sctx->last_str_idx - || sctx->sifted_states[to_idx] == NULL - || !STATE_NODE_CONTAINS (sctx->sifted_states[to_idx], dst_node) - || check_dst_limits (mctx, &sctx->limits, node, - str_idx, dst_node, to_idx)) - continue; - - if (local_sctx.sifted_states == NULL) - { - local_sctx = *sctx; - err = re_node_set_init_copy (&local_sctx.limits, &sctx->limits); - if (BE (err != REG_NOERROR, 0)) - goto free_return; - } - local_sctx.last_node = node; - local_sctx.last_str_idx = str_idx; - ret = re_node_set_insert (&local_sctx.limits, enabled_idx); - if (BE (ret < 0, 0)) - { - err = REG_ESPACE; - goto free_return; - } - cur_state = local_sctx.sifted_states[str_idx]; - err = sift_states_backward (mctx, &local_sctx); - if (BE (err != REG_NOERROR, 0)) - goto free_return; - if (sctx->limited_states != NULL) - { - err = merge_state_array (dfa, sctx->limited_states, - local_sctx.sifted_states, - str_idx + 1); - if (BE (err != REG_NOERROR, 0)) - goto free_return; - } - local_sctx.sifted_states[str_idx] = cur_state; - re_node_set_remove (&local_sctx.limits, enabled_idx); - - /* mctx->bkref_ents may have changed, reload the pointer. */ - entry = mctx->bkref_ents + enabled_idx; - } - while (enabled_idx++, entry++->more); - } - err = REG_NOERROR; - free_return: - if (local_sctx.sifted_states != NULL) - { - re_node_set_free (&local_sctx.limits); - } - - return err; -} - - -#ifdef RE_ENABLE_I18N -static int -internal_function -sift_states_iter_mb (const re_match_context_t *mctx, re_sift_context_t *sctx, - int node_idx, int str_idx, int max_str_idx) -{ - const re_dfa_t *const dfa = mctx->dfa; - int naccepted; - /* Check the node can accept `multi byte'. */ - naccepted = check_node_accept_bytes (dfa, node_idx, &mctx->input, str_idx); - if (naccepted > 0 && str_idx + naccepted <= max_str_idx && - !STATE_NODE_CONTAINS (sctx->sifted_states[str_idx + naccepted], - dfa->nexts[node_idx])) - /* The node can't accept the `multi byte', or the - destination was already thrown away, then the node - could't accept the current input `multi byte'. */ - naccepted = 0; - /* Otherwise, it is sure that the node could accept - `naccepted' bytes input. */ - return naccepted; -} -#endif /* RE_ENABLE_I18N */ - - -/* Functions for state transition. */ - -/* Return the next state to which the current state STATE will transit by - accepting the current input byte, and update STATE_LOG if necessary. - If STATE can accept a multibyte char/collating element/back reference - update the destination of STATE_LOG. */ - -static re_dfastate_t * -internal_function -transit_state (reg_errcode_t *err, re_match_context_t *mctx, - re_dfastate_t *state) -{ - re_dfastate_t **trtable; - unsigned char ch; - -#ifdef RE_ENABLE_I18N - /* If the current state can accept multibyte. */ - if (BE (state->accept_mb, 0)) - { - *err = transit_state_mb (mctx, state); - if (BE (*err != REG_NOERROR, 0)) - return NULL; - } -#endif /* RE_ENABLE_I18N */ - - /* Then decide the next state with the single byte. */ -#if 0 - if (0) - /* don't use transition table */ - return transit_state_sb (err, mctx, state); -#endif - - /* Use transition table */ - ch = re_string_fetch_byte (&mctx->input); - for (;;) - { - trtable = state->trtable; - if (BE (trtable != NULL, 1)) - return trtable[ch]; - - trtable = state->word_trtable; - if (BE (trtable != NULL, 1)) - { - unsigned int context; - context - = re_string_context_at (&mctx->input, - re_string_cur_idx (&mctx->input) - 1, - mctx->eflags); - if (IS_WORD_CONTEXT (context)) - return trtable[ch + SBC_MAX]; - else - return trtable[ch]; - } - - if (!build_trtable (mctx->dfa, state)) - { - *err = REG_ESPACE; - return NULL; - } - - /* Retry, we now have a transition table. */ - } -} - -/* Update the state_log if we need */ -re_dfastate_t * -internal_function -merge_state_with_log (reg_errcode_t *err, re_match_context_t *mctx, - re_dfastate_t *next_state) -{ - const re_dfa_t *const dfa = mctx->dfa; - int cur_idx = re_string_cur_idx (&mctx->input); - - if (cur_idx > mctx->state_log_top) - { - mctx->state_log[cur_idx] = next_state; - mctx->state_log_top = cur_idx; - } - else if (mctx->state_log[cur_idx] == 0) - { - mctx->state_log[cur_idx] = next_state; - } - else - { - re_dfastate_t *pstate; - unsigned int context; - re_node_set next_nodes, *log_nodes, *table_nodes = NULL; - /* If (state_log[cur_idx] != 0), it implies that cur_idx is - the destination of a multibyte char/collating element/ - back reference. Then the next state is the union set of - these destinations and the results of the transition table. */ - pstate = mctx->state_log[cur_idx]; - log_nodes = pstate->entrance_nodes; - if (next_state != NULL) - { - table_nodes = next_state->entrance_nodes; - *err = re_node_set_init_union (&next_nodes, table_nodes, - log_nodes); - if (BE (*err != REG_NOERROR, 0)) - return NULL; - } - else - next_nodes = *log_nodes; - /* Note: We already add the nodes of the initial state, - then we don't need to add them here. */ - - context = re_string_context_at (&mctx->input, - re_string_cur_idx (&mctx->input) - 1, - mctx->eflags); - next_state = mctx->state_log[cur_idx] - = re_acquire_state_context (err, dfa, &next_nodes, context); - /* We don't need to check errors here, since the return value of - this function is next_state and ERR is already set. */ - - if (table_nodes != NULL) - re_node_set_free (&next_nodes); - } - - if (BE (dfa->nbackref, 0) && next_state != NULL) - { - /* Check OP_OPEN_SUBEXP in the current state in case that we use them - later. We must check them here, since the back references in the - next state might use them. */ - *err = check_subexp_matching_top (mctx, &next_state->nodes, - cur_idx); - if (BE (*err != REG_NOERROR, 0)) - return NULL; - - /* If the next state has back references. */ - if (next_state->has_backref) - { - *err = transit_state_bkref (mctx, &next_state->nodes); - if (BE (*err != REG_NOERROR, 0)) - return NULL; - next_state = mctx->state_log[cur_idx]; - } - } - - return next_state; -} - -/* Skip bytes in the input that correspond to part of a - multi-byte match, then look in the log for a state - from which to restart matching. */ -re_dfastate_t * -internal_function -find_recover_state (reg_errcode_t *err, re_match_context_t *mctx) -{ - re_dfastate_t *cur_state; - do - { - int max = mctx->state_log_top; - int cur_str_idx = re_string_cur_idx (&mctx->input); - - do - { - if (++cur_str_idx > max) - return NULL; - re_string_skip_bytes (&mctx->input, 1); - } - while (mctx->state_log[cur_str_idx] == NULL); - - cur_state = merge_state_with_log (err, mctx, NULL); - } - while (*err == REG_NOERROR && cur_state == NULL); - return cur_state; -} - -/* Helper functions for transit_state. */ - -/* From the node set CUR_NODES, pick up the nodes whose types are - OP_OPEN_SUBEXP and which have corresponding back references in the regular - expression. And register them to use them later for evaluating the - correspoding back references. */ - -static reg_errcode_t -internal_function -check_subexp_matching_top (re_match_context_t *mctx, re_node_set *cur_nodes, - int str_idx) -{ - const re_dfa_t *const dfa = mctx->dfa; - int node_idx; - reg_errcode_t err; - - /* TODO: This isn't efficient. - Because there might be more than one nodes whose types are - OP_OPEN_SUBEXP and whose index is SUBEXP_IDX, we must check all - nodes. - E.g. RE: (a){2} */ - for (node_idx = 0; node_idx < cur_nodes->nelem; ++node_idx) - { - int node = cur_nodes->elems[node_idx]; - if (dfa->nodes[node].type == OP_OPEN_SUBEXP - && dfa->nodes[node].opr.idx < BITSET_WORD_BITS - && (dfa->used_bkref_map - & ((bitset_word_t) 1 << dfa->nodes[node].opr.idx))) - { - err = match_ctx_add_subtop (mctx, node, str_idx); - if (BE (err != REG_NOERROR, 0)) - return err; - } - } - return REG_NOERROR; -} - -#if 0 -/* Return the next state to which the current state STATE will transit by - accepting the current input byte. */ - -static re_dfastate_t * -transit_state_sb (reg_errcode_t *err, re_match_context_t *mctx, - re_dfastate_t *state) -{ - const re_dfa_t *const dfa = mctx->dfa; - re_node_set next_nodes; - re_dfastate_t *next_state; - int node_cnt, cur_str_idx = re_string_cur_idx (&mctx->input); - unsigned int context; - - *err = re_node_set_alloc (&next_nodes, state->nodes.nelem + 1); - if (BE (*err != REG_NOERROR, 0)) - return NULL; - for (node_cnt = 0; node_cnt < state->nodes.nelem; ++node_cnt) - { - int cur_node = state->nodes.elems[node_cnt]; - if (check_node_accept (mctx, dfa->nodes + cur_node, cur_str_idx)) - { - *err = re_node_set_merge (&next_nodes, - dfa->eclosures + dfa->nexts[cur_node]); - if (BE (*err != REG_NOERROR, 0)) - { - re_node_set_free (&next_nodes); - return NULL; - } - } - } - context = re_string_context_at (&mctx->input, cur_str_idx, mctx->eflags); - next_state = re_acquire_state_context (err, dfa, &next_nodes, context); - /* We don't need to check errors here, since the return value of - this function is next_state and ERR is already set. */ - - re_node_set_free (&next_nodes); - re_string_skip_bytes (&mctx->input, 1); - return next_state; -} -#endif - -#ifdef RE_ENABLE_I18N -static reg_errcode_t -internal_function -transit_state_mb (re_match_context_t *mctx, re_dfastate_t *pstate) -{ - const re_dfa_t *const dfa = mctx->dfa; - reg_errcode_t err; - int i; - - for (i = 0; i < pstate->nodes.nelem; ++i) - { - re_node_set dest_nodes, *new_nodes; - int cur_node_idx = pstate->nodes.elems[i]; - int naccepted, dest_idx; - unsigned int context; - re_dfastate_t *dest_state; - - if (!dfa->nodes[cur_node_idx].accept_mb) - continue; - - if (dfa->nodes[cur_node_idx].constraint) - { - context = re_string_context_at (&mctx->input, - re_string_cur_idx (&mctx->input), - mctx->eflags); - if (NOT_SATISFY_NEXT_CONSTRAINT (dfa->nodes[cur_node_idx].constraint, - context)) - continue; - } - - /* How many bytes the node can accept? */ - naccepted = check_node_accept_bytes (dfa, cur_node_idx, &mctx->input, - re_string_cur_idx (&mctx->input)); - if (naccepted == 0) - continue; - - /* The node can accepts `naccepted' bytes. */ - dest_idx = re_string_cur_idx (&mctx->input) + naccepted; - mctx->max_mb_elem_len = ((mctx->max_mb_elem_len < naccepted) ? naccepted - : mctx->max_mb_elem_len); - err = clean_state_log_if_needed (mctx, dest_idx); - if (BE (err != REG_NOERROR, 0)) - return err; -#ifdef DEBUG - assert (dfa->nexts[cur_node_idx] != -1); -#endif - new_nodes = dfa->eclosures + dfa->nexts[cur_node_idx]; - - dest_state = mctx->state_log[dest_idx]; - if (dest_state == NULL) - dest_nodes = *new_nodes; - else - { - err = re_node_set_init_union (&dest_nodes, - dest_state->entrance_nodes, new_nodes); - if (BE (err != REG_NOERROR, 0)) - return err; - } - context = re_string_context_at (&mctx->input, dest_idx - 1, - mctx->eflags); - mctx->state_log[dest_idx] - = re_acquire_state_context (&err, dfa, &dest_nodes, context); - if (dest_state != NULL) - re_node_set_free (&dest_nodes); - if (BE (mctx->state_log[dest_idx] == NULL && err != REG_NOERROR, 0)) - return err; - } - return REG_NOERROR; -} -#endif /* RE_ENABLE_I18N */ - -static reg_errcode_t -internal_function -transit_state_bkref (re_match_context_t *mctx, const re_node_set *nodes) -{ - const re_dfa_t *const dfa = mctx->dfa; - reg_errcode_t err; - int i; - int cur_str_idx = re_string_cur_idx (&mctx->input); - - for (i = 0; i < nodes->nelem; ++i) - { - int dest_str_idx, prev_nelem, bkc_idx; - int node_idx = nodes->elems[i]; - unsigned int context; - const re_token_t *node = dfa->nodes + node_idx; - re_node_set *new_dest_nodes; - - /* Check whether `node' is a backreference or not. */ - if (node->type != OP_BACK_REF) - continue; - - if (node->constraint) - { - context = re_string_context_at (&mctx->input, cur_str_idx, - mctx->eflags); - if (NOT_SATISFY_NEXT_CONSTRAINT (node->constraint, context)) - continue; - } - - /* `node' is a backreference. - Check the substring which the substring matched. */ - bkc_idx = mctx->nbkref_ents; - err = get_subexp (mctx, node_idx, cur_str_idx); - if (BE (err != REG_NOERROR, 0)) - goto free_return; - - /* And add the epsilon closures (which is `new_dest_nodes') of - the backreference to appropriate state_log. */ -#ifdef DEBUG - assert (dfa->nexts[node_idx] != -1); -#endif - for (; bkc_idx < mctx->nbkref_ents; ++bkc_idx) - { - int subexp_len; - re_dfastate_t *dest_state; - struct re_backref_cache_entry *bkref_ent; - bkref_ent = mctx->bkref_ents + bkc_idx; - if (bkref_ent->node != node_idx || bkref_ent->str_idx != cur_str_idx) - continue; - subexp_len = bkref_ent->subexp_to - bkref_ent->subexp_from; - new_dest_nodes = (subexp_len == 0 - ? dfa->eclosures + dfa->edests[node_idx].elems[0] - : dfa->eclosures + dfa->nexts[node_idx]); - dest_str_idx = (cur_str_idx + bkref_ent->subexp_to - - bkref_ent->subexp_from); - context = re_string_context_at (&mctx->input, dest_str_idx - 1, - mctx->eflags); - dest_state = mctx->state_log[dest_str_idx]; - prev_nelem = ((mctx->state_log[cur_str_idx] == NULL) ? 0 - : mctx->state_log[cur_str_idx]->nodes.nelem); - /* Add `new_dest_node' to state_log. */ - if (dest_state == NULL) - { - mctx->state_log[dest_str_idx] - = re_acquire_state_context (&err, dfa, new_dest_nodes, - context); - if (BE (mctx->state_log[dest_str_idx] == NULL - && err != REG_NOERROR, 0)) - goto free_return; - } - else - { - re_node_set dest_nodes; - err = re_node_set_init_union (&dest_nodes, - dest_state->entrance_nodes, - new_dest_nodes); - if (BE (err != REG_NOERROR, 0)) - { - re_node_set_free (&dest_nodes); - goto free_return; - } - mctx->state_log[dest_str_idx] - = re_acquire_state_context (&err, dfa, &dest_nodes, context); - re_node_set_free (&dest_nodes); - if (BE (mctx->state_log[dest_str_idx] == NULL - && err != REG_NOERROR, 0)) - goto free_return; - } - /* We need to check recursively if the backreference can epsilon - transit. */ - if (subexp_len == 0 - && mctx->state_log[cur_str_idx]->nodes.nelem > prev_nelem) - { - err = check_subexp_matching_top (mctx, new_dest_nodes, - cur_str_idx); - if (BE (err != REG_NOERROR, 0)) - goto free_return; - err = transit_state_bkref (mctx, new_dest_nodes); - if (BE (err != REG_NOERROR, 0)) - goto free_return; - } - } - } - err = REG_NOERROR; - free_return: - return err; -} - -/* Enumerate all the candidates which the backreference BKREF_NODE can match - at BKREF_STR_IDX, and register them by match_ctx_add_entry(). - Note that we might collect inappropriate candidates here. - However, the cost of checking them strictly here is too high, then we - delay these checking for prune_impossible_nodes(). */ - -static reg_errcode_t -internal_function -get_subexp (re_match_context_t *mctx, int bkref_node, int bkref_str_idx) -{ - const re_dfa_t *const dfa = mctx->dfa; - int subexp_num, sub_top_idx; - const char *buf = (const char *) re_string_get_buffer (&mctx->input); - /* Return if we have already checked BKREF_NODE at BKREF_STR_IDX. */ - int cache_idx = search_cur_bkref_entry (mctx, bkref_str_idx); - if (cache_idx != -1) - { - const struct re_backref_cache_entry *entry - = mctx->bkref_ents + cache_idx; - do - if (entry->node == bkref_node) - return REG_NOERROR; /* We already checked it. */ - while (entry++->more); - } - - subexp_num = dfa->nodes[bkref_node].opr.idx; - - /* For each sub expression */ - for (sub_top_idx = 0; sub_top_idx < mctx->nsub_tops; ++sub_top_idx) - { - reg_errcode_t err; - re_sub_match_top_t *sub_top = mctx->sub_tops[sub_top_idx]; - re_sub_match_last_t *sub_last; - int sub_last_idx, sl_str, bkref_str_off; - - if (dfa->nodes[sub_top->node].opr.idx != subexp_num) - continue; /* It isn't related. */ - - sl_str = sub_top->str_idx; - bkref_str_off = bkref_str_idx; - /* At first, check the last node of sub expressions we already - evaluated. */ - for (sub_last_idx = 0; sub_last_idx < sub_top->nlasts; ++sub_last_idx) - { - int sl_str_diff; - sub_last = sub_top->lasts[sub_last_idx]; - sl_str_diff = sub_last->str_idx - sl_str; - /* The matched string by the sub expression match with the substring - at the back reference? */ - if (sl_str_diff > 0) - { - if (BE (bkref_str_off + sl_str_diff > mctx->input.valid_len, 0)) - { - /* Not enough chars for a successful match. */ - if (bkref_str_off + sl_str_diff > mctx->input.len) - break; - - err = clean_state_log_if_needed (mctx, - bkref_str_off - + sl_str_diff); - if (BE (err != REG_NOERROR, 0)) - return err; - buf = (const char *) re_string_get_buffer (&mctx->input); - } - if (memcmp (buf + bkref_str_off, buf + sl_str, sl_str_diff) != 0) - /* We don't need to search this sub expression any more. */ - break; - } - bkref_str_off += sl_str_diff; - sl_str += sl_str_diff; - err = get_subexp_sub (mctx, sub_top, sub_last, bkref_node, - bkref_str_idx); - - /* Reload buf, since the preceding call might have reallocated - the buffer. */ - buf = (const char *) re_string_get_buffer (&mctx->input); - - if (err == REG_NOMATCH) - continue; - if (BE (err != REG_NOERROR, 0)) - return err; - } - - if (sub_last_idx < sub_top->nlasts) - continue; - if (sub_last_idx > 0) - ++sl_str; - /* Then, search for the other last nodes of the sub expression. */ - for (; sl_str <= bkref_str_idx; ++sl_str) - { - int cls_node, sl_str_off; - const re_node_set *nodes; - sl_str_off = sl_str - sub_top->str_idx; - /* The matched string by the sub expression match with the substring - at the back reference? */ - if (sl_str_off > 0) - { - if (BE (bkref_str_off >= mctx->input.valid_len, 0)) - { - /* If we are at the end of the input, we cannot match. */ - if (bkref_str_off >= mctx->input.len) - break; - - err = extend_buffers (mctx); - if (BE (err != REG_NOERROR, 0)) - return err; - - buf = (const char *) re_string_get_buffer (&mctx->input); - } - if (buf [bkref_str_off++] != buf[sl_str - 1]) - break; /* We don't need to search this sub expression - any more. */ - } - if (mctx->state_log[sl_str] == NULL) - continue; - /* Does this state have a ')' of the sub expression? */ - nodes = &mctx->state_log[sl_str]->nodes; - cls_node = find_subexp_node (dfa, nodes, subexp_num, - OP_CLOSE_SUBEXP); - if (cls_node == -1) - continue; /* No. */ - if (sub_top->path == NULL) - { - sub_top->path = calloc (sizeof (state_array_t), - sl_str - sub_top->str_idx + 1); - if (sub_top->path == NULL) - return REG_ESPACE; - } - /* Can the OP_OPEN_SUBEXP node arrive the OP_CLOSE_SUBEXP node - in the current context? */ - err = check_arrival (mctx, sub_top->path, sub_top->node, - sub_top->str_idx, cls_node, sl_str, - OP_CLOSE_SUBEXP); - if (err == REG_NOMATCH) - continue; - if (BE (err != REG_NOERROR, 0)) - return err; - sub_last = match_ctx_add_sublast (sub_top, cls_node, sl_str); - if (BE (sub_last == NULL, 0)) - return REG_ESPACE; - err = get_subexp_sub (mctx, sub_top, sub_last, bkref_node, - bkref_str_idx); - if (err == REG_NOMATCH) - continue; - } - } - return REG_NOERROR; -} - -/* Helper functions for get_subexp(). */ - -/* Check SUB_LAST can arrive to the back reference BKREF_NODE at BKREF_STR. - If it can arrive, register the sub expression expressed with SUB_TOP - and SUB_LAST. */ - -static reg_errcode_t -internal_function -get_subexp_sub (re_match_context_t *mctx, const re_sub_match_top_t *sub_top, - re_sub_match_last_t *sub_last, int bkref_node, int bkref_str) -{ - reg_errcode_t err; - int to_idx; - /* Can the subexpression arrive the back reference? */ - err = check_arrival (mctx, &sub_last->path, sub_last->node, - sub_last->str_idx, bkref_node, bkref_str, - OP_OPEN_SUBEXP); - if (err != REG_NOERROR) - return err; - err = match_ctx_add_entry (mctx, bkref_node, bkref_str, sub_top->str_idx, - sub_last->str_idx); - if (BE (err != REG_NOERROR, 0)) - return err; - to_idx = bkref_str + sub_last->str_idx - sub_top->str_idx; - return clean_state_log_if_needed (mctx, to_idx); -} - -/* Find the first node which is '(' or ')' and whose index is SUBEXP_IDX. - Search '(' if FL_OPEN, or search ')' otherwise. - TODO: This function isn't efficient... - Because there might be more than one nodes whose types are - OP_OPEN_SUBEXP and whose index is SUBEXP_IDX, we must check all - nodes. - E.g. RE: (a){2} */ - -static int -internal_function -find_subexp_node (const re_dfa_t *dfa, const re_node_set *nodes, - int subexp_idx, int type) -{ - int cls_idx; - for (cls_idx = 0; cls_idx < nodes->nelem; ++cls_idx) - { - int cls_node = nodes->elems[cls_idx]; - const re_token_t *node = dfa->nodes + cls_node; - if (node->type == type - && node->opr.idx == subexp_idx) - return cls_node; - } - return -1; -} - -/* Check whether the node TOP_NODE at TOP_STR can arrive to the node - LAST_NODE at LAST_STR. We record the path onto PATH since it will be - heavily reused. - Return REG_NOERROR if it can arrive, or REG_NOMATCH otherwise. */ - -static reg_errcode_t -internal_function -check_arrival (re_match_context_t *mctx, state_array_t *path, int top_node, - int top_str, int last_node, int last_str, int type) -{ - const re_dfa_t *const dfa = mctx->dfa; - reg_errcode_t err = REG_NOERROR; - int subexp_num, backup_cur_idx, str_idx, null_cnt; - re_dfastate_t *cur_state = NULL; - re_node_set *cur_nodes, next_nodes; - re_dfastate_t **backup_state_log; - unsigned int context; - - subexp_num = dfa->nodes[top_node].opr.idx; - /* Extend the buffer if we need. */ - if (BE (path->alloc < last_str + mctx->max_mb_elem_len + 1, 0)) - { - re_dfastate_t **new_array; - int old_alloc = path->alloc; - path->alloc += last_str + mctx->max_mb_elem_len + 1; - new_array = re_realloc (path->array, re_dfastate_t *, path->alloc); - if (BE (new_array == NULL, 0)) - { - path->alloc = old_alloc; - return REG_ESPACE; - } - path->array = new_array; - memset (new_array + old_alloc, '\0', - sizeof (re_dfastate_t *) * (path->alloc - old_alloc)); - } - - str_idx = path->next_idx ? path->next_idx : top_str; - - /* Temporary modify MCTX. */ - backup_state_log = mctx->state_log; - backup_cur_idx = mctx->input.cur_idx; - mctx->state_log = path->array; - mctx->input.cur_idx = str_idx; - - /* Setup initial node set. */ - context = re_string_context_at (&mctx->input, str_idx - 1, mctx->eflags); - if (str_idx == top_str) - { - err = re_node_set_init_1 (&next_nodes, top_node); - if (BE (err != REG_NOERROR, 0)) - return err; - err = check_arrival_expand_ecl (dfa, &next_nodes, subexp_num, type); - if (BE (err != REG_NOERROR, 0)) - { - re_node_set_free (&next_nodes); - return err; - } - } - else - { - cur_state = mctx->state_log[str_idx]; - if (cur_state && cur_state->has_backref) - { - err = re_node_set_init_copy (&next_nodes, &cur_state->nodes); - if (BE (err != REG_NOERROR, 0)) - return err; - } - else - re_node_set_init_empty (&next_nodes); - } - if (str_idx == top_str || (cur_state && cur_state->has_backref)) - { - if (next_nodes.nelem) - { - err = expand_bkref_cache (mctx, &next_nodes, str_idx, - subexp_num, type); - if (BE (err != REG_NOERROR, 0)) - { - re_node_set_free (&next_nodes); - return err; - } - } - cur_state = re_acquire_state_context (&err, dfa, &next_nodes, context); - if (BE (cur_state == NULL && err != REG_NOERROR, 0)) - { - re_node_set_free (&next_nodes); - return err; - } - mctx->state_log[str_idx] = cur_state; - } - - for (null_cnt = 0; str_idx < last_str && null_cnt <= mctx->max_mb_elem_len;) - { - re_node_set_empty (&next_nodes); - if (mctx->state_log[str_idx + 1]) - { - err = re_node_set_merge (&next_nodes, - &mctx->state_log[str_idx + 1]->nodes); - if (BE (err != REG_NOERROR, 0)) - { - re_node_set_free (&next_nodes); - return err; - } - } - if (cur_state) - { - err = check_arrival_add_next_nodes (mctx, str_idx, - &cur_state->non_eps_nodes, - &next_nodes); - if (BE (err != REG_NOERROR, 0)) - { - re_node_set_free (&next_nodes); - return err; - } - } - ++str_idx; - if (next_nodes.nelem) - { - err = check_arrival_expand_ecl (dfa, &next_nodes, subexp_num, type); - if (BE (err != REG_NOERROR, 0)) - { - re_node_set_free (&next_nodes); - return err; - } - err = expand_bkref_cache (mctx, &next_nodes, str_idx, - subexp_num, type); - if (BE (err != REG_NOERROR, 0)) - { - re_node_set_free (&next_nodes); - return err; - } - } - context = re_string_context_at (&mctx->input, str_idx - 1, mctx->eflags); - cur_state = re_acquire_state_context (&err, dfa, &next_nodes, context); - if (BE (cur_state == NULL && err != REG_NOERROR, 0)) - { - re_node_set_free (&next_nodes); - return err; - } - mctx->state_log[str_idx] = cur_state; - null_cnt = cur_state == NULL ? null_cnt + 1 : 0; - } - re_node_set_free (&next_nodes); - cur_nodes = (mctx->state_log[last_str] == NULL ? NULL - : &mctx->state_log[last_str]->nodes); - path->next_idx = str_idx; - - /* Fix MCTX. */ - mctx->state_log = backup_state_log; - mctx->input.cur_idx = backup_cur_idx; - - /* Then check the current node set has the node LAST_NODE. */ - if (cur_nodes != NULL && re_node_set_contains (cur_nodes, last_node)) - return REG_NOERROR; - - return REG_NOMATCH; -} - -/* Helper functions for check_arrival. */ - -/* Calculate the destination nodes of CUR_NODES at STR_IDX, and append them - to NEXT_NODES. - TODO: This function is similar to the functions transit_state*(), - however this function has many additional works. - Can't we unify them? */ - -static reg_errcode_t -internal_function -check_arrival_add_next_nodes (re_match_context_t *mctx, int str_idx, - re_node_set *cur_nodes, re_node_set *next_nodes) -{ - const re_dfa_t *const dfa = mctx->dfa; - int result; - int cur_idx; -#ifdef RE_ENABLE_I18N - reg_errcode_t err = REG_NOERROR; -#endif - re_node_set union_set; - re_node_set_init_empty (&union_set); - for (cur_idx = 0; cur_idx < cur_nodes->nelem; ++cur_idx) - { - int naccepted = 0; - int cur_node = cur_nodes->elems[cur_idx]; -#ifdef DEBUG - re_token_type_t type = dfa->nodes[cur_node].type; - assert (!IS_EPSILON_NODE (type)); -#endif -#ifdef RE_ENABLE_I18N - /* If the node may accept `multi byte'. */ - if (dfa->nodes[cur_node].accept_mb) - { - naccepted = check_node_accept_bytes (dfa, cur_node, &mctx->input, - str_idx); - if (naccepted > 1) - { - re_dfastate_t *dest_state; - int next_node = dfa->nexts[cur_node]; - int next_idx = str_idx + naccepted; - dest_state = mctx->state_log[next_idx]; - re_node_set_empty (&union_set); - if (dest_state) - { - err = re_node_set_merge (&union_set, &dest_state->nodes); - if (BE (err != REG_NOERROR, 0)) - { - re_node_set_free (&union_set); - return err; - } - } - result = re_node_set_insert (&union_set, next_node); - if (BE (result < 0, 0)) - { - re_node_set_free (&union_set); - return REG_ESPACE; - } - mctx->state_log[next_idx] = re_acquire_state (&err, dfa, - &union_set); - if (BE (mctx->state_log[next_idx] == NULL - && err != REG_NOERROR, 0)) - { - re_node_set_free (&union_set); - return err; - } - } - } -#endif /* RE_ENABLE_I18N */ - if (naccepted - || check_node_accept (mctx, dfa->nodes + cur_node, str_idx)) - { - result = re_node_set_insert (next_nodes, dfa->nexts[cur_node]); - if (BE (result < 0, 0)) - { - re_node_set_free (&union_set); - return REG_ESPACE; - } - } - } - re_node_set_free (&union_set); - return REG_NOERROR; -} - -/* For all the nodes in CUR_NODES, add the epsilon closures of them to - CUR_NODES, however exclude the nodes which are: - - inside the sub expression whose number is EX_SUBEXP, if FL_OPEN. - - out of the sub expression whose number is EX_SUBEXP, if !FL_OPEN. -*/ - -static reg_errcode_t -internal_function -check_arrival_expand_ecl (const re_dfa_t *dfa, re_node_set *cur_nodes, - int ex_subexp, int type) -{ - reg_errcode_t err; - int idx, outside_node; - re_node_set new_nodes; -#ifdef DEBUG - assert (cur_nodes->nelem); -#endif - err = re_node_set_alloc (&new_nodes, cur_nodes->nelem); - if (BE (err != REG_NOERROR, 0)) - return err; - /* Create a new node set NEW_NODES with the nodes which are epsilon - closures of the node in CUR_NODES. */ - - for (idx = 0; idx < cur_nodes->nelem; ++idx) - { - int cur_node = cur_nodes->elems[idx]; - const re_node_set *eclosure = dfa->eclosures + cur_node; - outside_node = find_subexp_node (dfa, eclosure, ex_subexp, type); - if (outside_node == -1) - { - /* There are no problematic nodes, just merge them. */ - err = re_node_set_merge (&new_nodes, eclosure); - if (BE (err != REG_NOERROR, 0)) - { - re_node_set_free (&new_nodes); - return err; - } - } - else - { - /* There are problematic nodes, re-calculate incrementally. */ - err = check_arrival_expand_ecl_sub (dfa, &new_nodes, cur_node, - ex_subexp, type); - if (BE (err != REG_NOERROR, 0)) - { - re_node_set_free (&new_nodes); - return err; - } - } - } - re_node_set_free (cur_nodes); - *cur_nodes = new_nodes; - return REG_NOERROR; -} - -/* Helper function for check_arrival_expand_ecl. - Check incrementally the epsilon closure of TARGET, and if it isn't - problematic append it to DST_NODES. */ - -static reg_errcode_t -internal_function -check_arrival_expand_ecl_sub (const re_dfa_t *dfa, re_node_set *dst_nodes, - int target, int ex_subexp, int type) -{ - int cur_node; - for (cur_node = target; !re_node_set_contains (dst_nodes, cur_node);) - { - int err; - - if (dfa->nodes[cur_node].type == type - && dfa->nodes[cur_node].opr.idx == ex_subexp) - { - if (type == OP_CLOSE_SUBEXP) - { - err = re_node_set_insert (dst_nodes, cur_node); - if (BE (err == -1, 0)) - return REG_ESPACE; - } - break; - } - err = re_node_set_insert (dst_nodes, cur_node); - if (BE (err == -1, 0)) - return REG_ESPACE; - if (dfa->edests[cur_node].nelem == 0) - break; - if (dfa->edests[cur_node].nelem == 2) - { - err = check_arrival_expand_ecl_sub (dfa, dst_nodes, - dfa->edests[cur_node].elems[1], - ex_subexp, type); - if (BE (err != REG_NOERROR, 0)) - return err; - } - cur_node = dfa->edests[cur_node].elems[0]; - } - return REG_NOERROR; -} - - -/* For all the back references in the current state, calculate the - destination of the back references by the appropriate entry - in MCTX->BKREF_ENTS. */ - -static reg_errcode_t -internal_function -expand_bkref_cache (re_match_context_t *mctx, re_node_set *cur_nodes, - int cur_str, int subexp_num, int type) -{ - const re_dfa_t *const dfa = mctx->dfa; - reg_errcode_t err; - int cache_idx_start = search_cur_bkref_entry (mctx, cur_str); - struct re_backref_cache_entry *ent; - - if (cache_idx_start == -1) - return REG_NOERROR; - - restart: - ent = mctx->bkref_ents + cache_idx_start; - do - { - int to_idx, next_node; - - /* Is this entry ENT is appropriate? */ - if (!re_node_set_contains (cur_nodes, ent->node)) - continue; /* No. */ - - to_idx = cur_str + ent->subexp_to - ent->subexp_from; - /* Calculate the destination of the back reference, and append it - to MCTX->STATE_LOG. */ - if (to_idx == cur_str) - { - /* The backreference did epsilon transit, we must re-check all the - node in the current state. */ - re_node_set new_dests; - reg_errcode_t err2, err3; - next_node = dfa->edests[ent->node].elems[0]; - if (re_node_set_contains (cur_nodes, next_node)) - continue; - err = re_node_set_init_1 (&new_dests, next_node); - err2 = check_arrival_expand_ecl (dfa, &new_dests, subexp_num, type); - err3 = re_node_set_merge (cur_nodes, &new_dests); - re_node_set_free (&new_dests); - if (BE (err != REG_NOERROR || err2 != REG_NOERROR - || err3 != REG_NOERROR, 0)) - { - err = (err != REG_NOERROR ? err - : (err2 != REG_NOERROR ? err2 : err3)); - return err; - } - /* TODO: It is still inefficient... */ - goto restart; - } - else - { - re_node_set union_set; - next_node = dfa->nexts[ent->node]; - if (mctx->state_log[to_idx]) - { - int ret; - if (re_node_set_contains (&mctx->state_log[to_idx]->nodes, - next_node)) - continue; - err = re_node_set_init_copy (&union_set, - &mctx->state_log[to_idx]->nodes); - ret = re_node_set_insert (&union_set, next_node); - if (BE (err != REG_NOERROR || ret < 0, 0)) - { - re_node_set_free (&union_set); - err = err != REG_NOERROR ? err : REG_ESPACE; - return err; - } - } - else - { - err = re_node_set_init_1 (&union_set, next_node); - if (BE (err != REG_NOERROR, 0)) - return err; - } - mctx->state_log[to_idx] = re_acquire_state (&err, dfa, &union_set); - re_node_set_free (&union_set); - if (BE (mctx->state_log[to_idx] == NULL - && err != REG_NOERROR, 0)) - return err; - } - } - while (ent++->more); - return REG_NOERROR; -} - -/* Build transition table for the state. - Return 1 if succeeded, otherwise return NULL. */ - -static int -internal_function -build_trtable (const re_dfa_t *dfa, re_dfastate_t *state) -{ - reg_errcode_t err; - int i, j, ch, need_word_trtable = 0; - bitset_word_t elem, mask; - bool dests_node_malloced = false; - bool dest_states_malloced = false; - int ndests; /* Number of the destination states from `state'. */ - re_dfastate_t **trtable; - re_dfastate_t **dest_states = NULL, **dest_states_word, **dest_states_nl; - re_node_set follows, *dests_node; - bitset_t *dests_ch; - bitset_t acceptable; - - struct dests_alloc - { - re_node_set dests_node[SBC_MAX]; - bitset_t dests_ch[SBC_MAX]; - } *dests_alloc; - - /* We build DFA states which corresponds to the destination nodes - from `state'. `dests_node[i]' represents the nodes which i-th - destination state contains, and `dests_ch[i]' represents the - characters which i-th destination state accepts. */ -#ifdef HAVE_ALLOCA - if (__libc_use_alloca (sizeof (struct dests_alloc))) - dests_alloc = (struct dests_alloc *) alloca (sizeof (struct dests_alloc)); - else -#endif - { - dests_alloc = re_malloc (struct dests_alloc, 1); - if (BE (dests_alloc == NULL, 0)) - return 0; - dests_node_malloced = true; - } - dests_node = dests_alloc->dests_node; - dests_ch = dests_alloc->dests_ch; - - /* Initialize transiton table. */ - state->word_trtable = state->trtable = NULL; - - /* At first, group all nodes belonging to `state' into several - destinations. */ - ndests = group_nodes_into_DFAstates (dfa, state, dests_node, dests_ch); - if (BE (ndests <= 0, 0)) - { - if (dests_node_malloced) - free (dests_alloc); - /* Return 0 in case of an error, 1 otherwise. */ - if (ndests == 0) - { - state->trtable = (re_dfastate_t **) - calloc (sizeof (re_dfastate_t *), SBC_MAX); - return 1; - } - return 0; - } - - err = re_node_set_alloc (&follows, ndests + 1); - if (BE (err != REG_NOERROR, 0)) - goto out_free; - - /* Avoid arithmetic overflow in size calculation. */ - if (BE ((((SIZE_MAX - (sizeof (re_node_set) + sizeof (bitset_t)) * SBC_MAX) - / (3 * sizeof (re_dfastate_t *))) - < (size_t)ndests), - 0)) - goto out_free; - -#ifdef HAVE_ALLOCA - if (__libc_use_alloca ((sizeof (re_node_set) + sizeof (bitset_t)) * SBC_MAX - + ndests * 3 * sizeof (re_dfastate_t *))) - dest_states = (re_dfastate_t **) - alloca (ndests * 3 * sizeof (re_dfastate_t *)); - else -#endif - { - dest_states = (re_dfastate_t **) - malloc (ndests * 3 * sizeof (re_dfastate_t *)); - if (BE (dest_states == NULL, 0)) - { -out_free: - if (dest_states_malloced) - free (dest_states); - re_node_set_free (&follows); - for (i = 0; i < ndests; ++i) - re_node_set_free (dests_node + i); - if (dests_node_malloced) - free (dests_alloc); - return 0; - } - dest_states_malloced = true; - } - dest_states_word = dest_states + ndests; - dest_states_nl = dest_states_word + ndests; - bitset_empty (acceptable); - - /* Then build the states for all destinations. */ - for (i = 0; i < ndests; ++i) - { - int next_node; - re_node_set_empty (&follows); - /* Merge the follows of this destination states. */ - for (j = 0; j < dests_node[i].nelem; ++j) - { - next_node = dfa->nexts[dests_node[i].elems[j]]; - if (next_node != -1) - { - err = re_node_set_merge (&follows, dfa->eclosures + next_node); - if (BE (err != REG_NOERROR, 0)) - goto out_free; - } - } - dest_states[i] = re_acquire_state_context (&err, dfa, &follows, 0); - if (BE (dest_states[i] == NULL && err != REG_NOERROR, 0)) - goto out_free; - /* If the new state has context constraint, - build appropriate states for these contexts. */ - if (dest_states[i]->has_constraint) - { - dest_states_word[i] = re_acquire_state_context (&err, dfa, &follows, - CONTEXT_WORD); - if (BE (dest_states_word[i] == NULL && err != REG_NOERROR, 0)) - goto out_free; - - if (dest_states[i] != dest_states_word[i] && dfa->mb_cur_max > 1) - need_word_trtable = 1; - - dest_states_nl[i] = re_acquire_state_context (&err, dfa, &follows, - CONTEXT_NEWLINE); - if (BE (dest_states_nl[i] == NULL && err != REG_NOERROR, 0)) - goto out_free; - } - else - { - dest_states_word[i] = dest_states[i]; - dest_states_nl[i] = dest_states[i]; - } - bitset_merge (acceptable, dests_ch[i]); - } - - if (!BE (need_word_trtable, 0)) - { - /* We don't care about whether the following character is a word - character, or we are in a single-byte character set so we can - discern by looking at the character code: allocate a - 256-entry transition table. */ - trtable = state->trtable = - (re_dfastate_t **) calloc (sizeof (re_dfastate_t *), SBC_MAX); - if (BE (trtable == NULL, 0)) - goto out_free; - - /* For all characters ch...: */ - for (i = 0; i < BITSET_WORDS; ++i) - for (ch = i * BITSET_WORD_BITS, elem = acceptable[i], mask = 1; - elem; - mask <<= 1, elem >>= 1, ++ch) - if (BE (elem & 1, 0)) - { - /* There must be exactly one destination which accepts - character ch. See group_nodes_into_DFAstates. */ - for (j = 0; (dests_ch[j][i] & mask) == 0; ++j) - ; - - /* j-th destination accepts the word character ch. */ - if (dfa->word_char[i] & mask) - trtable[ch] = dest_states_word[j]; - else - trtable[ch] = dest_states[j]; - } - } - else - { - /* We care about whether the following character is a word - character, and we are in a multi-byte character set: discern - by looking at the character code: build two 256-entry - transition tables, one starting at trtable[0] and one - starting at trtable[SBC_MAX]. */ - trtable = state->word_trtable = - (re_dfastate_t **) calloc (sizeof (re_dfastate_t *), 2 * SBC_MAX); - if (BE (trtable == NULL, 0)) - goto out_free; - - /* For all characters ch...: */ - for (i = 0; i < BITSET_WORDS; ++i) - for (ch = i * BITSET_WORD_BITS, elem = acceptable[i], mask = 1; - elem; - mask <<= 1, elem >>= 1, ++ch) - if (BE (elem & 1, 0)) - { - /* There must be exactly one destination which accepts - character ch. See group_nodes_into_DFAstates. */ - for (j = 0; (dests_ch[j][i] & mask) == 0; ++j) - ; - - /* j-th destination accepts the word character ch. */ - trtable[ch] = dest_states[j]; - trtable[ch + SBC_MAX] = dest_states_word[j]; - } - } - - /* new line */ - if (bitset_contain (acceptable, NEWLINE_CHAR)) - { - /* The current state accepts newline character. */ - for (j = 0; j < ndests; ++j) - if (bitset_contain (dests_ch[j], NEWLINE_CHAR)) - { - /* k-th destination accepts newline character. */ - trtable[NEWLINE_CHAR] = dest_states_nl[j]; - if (need_word_trtable) - trtable[NEWLINE_CHAR + SBC_MAX] = dest_states_nl[j]; - /* There must be only one destination which accepts - newline. See group_nodes_into_DFAstates. */ - break; - } - } - - if (dest_states_malloced) - free (dest_states); - - re_node_set_free (&follows); - for (i = 0; i < ndests; ++i) - re_node_set_free (dests_node + i); - - if (dests_node_malloced) - free (dests_alloc); - - return 1; -} - -/* Group all nodes belonging to STATE into several destinations. - Then for all destinations, set the nodes belonging to the destination - to DESTS_NODE[i] and set the characters accepted by the destination - to DEST_CH[i]. This function return the number of destinations. */ - -static int -internal_function -group_nodes_into_DFAstates (const re_dfa_t *dfa, const re_dfastate_t *state, - re_node_set *dests_node, bitset_t *dests_ch) -{ - reg_errcode_t err; - int result; - int i, j, k; - int ndests; /* Number of the destinations from `state'. */ - bitset_t accepts; /* Characters a node can accept. */ - const re_node_set *cur_nodes = &state->nodes; - bitset_empty (accepts); - ndests = 0; - - /* For all the nodes belonging to `state', */ - for (i = 0; i < cur_nodes->nelem; ++i) - { - re_token_t *node = &dfa->nodes[cur_nodes->elems[i]]; - re_token_type_t type = node->type; - unsigned int constraint = node->constraint; - - /* Enumerate all single byte character this node can accept. */ - if (type == CHARACTER) - bitset_set (accepts, node->opr.c); - else if (type == SIMPLE_BRACKET) - { - bitset_merge (accepts, node->opr.sbcset); - } - else if (type == OP_PERIOD) - { -#ifdef RE_ENABLE_I18N - if (dfa->mb_cur_max > 1) - bitset_merge (accepts, dfa->sb_char); - else -#endif - bitset_set_all (accepts); - if (!(dfa->syntax & RE_DOT_NEWLINE)) - bitset_clear (accepts, '\n'); - if (dfa->syntax & RE_DOT_NOT_NULL) - bitset_clear (accepts, '\0'); - } -#ifdef RE_ENABLE_I18N - else if (type == OP_UTF8_PERIOD) - { - memset (accepts, '\xff', sizeof (bitset_t) / 2); - if (!(dfa->syntax & RE_DOT_NEWLINE)) - bitset_clear (accepts, '\n'); - if (dfa->syntax & RE_DOT_NOT_NULL) - bitset_clear (accepts, '\0'); - } -#endif - else - continue; - - /* Check the `accepts' and sift the characters which are not - match it the context. */ - if (constraint) - { - if (constraint & NEXT_NEWLINE_CONSTRAINT) - { - bool accepts_newline = bitset_contain (accepts, NEWLINE_CHAR); - bitset_empty (accepts); - if (accepts_newline) - bitset_set (accepts, NEWLINE_CHAR); - else - continue; - } - if (constraint & NEXT_ENDBUF_CONSTRAINT) - { - bitset_empty (accepts); - continue; - } - - if (constraint & NEXT_WORD_CONSTRAINT) - { - bitset_word_t any_set = 0; - if (type == CHARACTER && !node->word_char) - { - bitset_empty (accepts); - continue; - } -#ifdef RE_ENABLE_I18N - if (dfa->mb_cur_max > 1) - for (j = 0; j < BITSET_WORDS; ++j) - any_set |= (accepts[j] &= (dfa->word_char[j] | ~dfa->sb_char[j])); - else -#endif - for (j = 0; j < BITSET_WORDS; ++j) - any_set |= (accepts[j] &= dfa->word_char[j]); - if (!any_set) - continue; - } - if (constraint & NEXT_NOTWORD_CONSTRAINT) - { - bitset_word_t any_set = 0; - if (type == CHARACTER && node->word_char) - { - bitset_empty (accepts); - continue; - } -#ifdef RE_ENABLE_I18N - if (dfa->mb_cur_max > 1) - for (j = 0; j < BITSET_WORDS; ++j) - any_set |= (accepts[j] &= ~(dfa->word_char[j] & dfa->sb_char[j])); - else -#endif - for (j = 0; j < BITSET_WORDS; ++j) - any_set |= (accepts[j] &= ~dfa->word_char[j]); - if (!any_set) - continue; - } - } - - /* Then divide `accepts' into DFA states, or create a new - state. Above, we make sure that accepts is not empty. */ - for (j = 0; j < ndests; ++j) - { - bitset_t intersec; /* Intersection sets, see below. */ - bitset_t remains; - /* Flags, see below. */ - bitset_word_t has_intersec, not_subset, not_consumed; - - /* Optimization, skip if this state doesn't accept the character. */ - if (type == CHARACTER && !bitset_contain (dests_ch[j], node->opr.c)) - continue; - - /* Enumerate the intersection set of this state and `accepts'. */ - has_intersec = 0; - for (k = 0; k < BITSET_WORDS; ++k) - has_intersec |= intersec[k] = accepts[k] & dests_ch[j][k]; - /* And skip if the intersection set is empty. */ - if (!has_intersec) - continue; - - /* Then check if this state is a subset of `accepts'. */ - not_subset = not_consumed = 0; - for (k = 0; k < BITSET_WORDS; ++k) - { - not_subset |= remains[k] = ~accepts[k] & dests_ch[j][k]; - not_consumed |= accepts[k] = accepts[k] & ~dests_ch[j][k]; - } - - /* If this state isn't a subset of `accepts', create a - new group state, which has the `remains'. */ - if (not_subset) - { - bitset_copy (dests_ch[ndests], remains); - bitset_copy (dests_ch[j], intersec); - err = re_node_set_init_copy (dests_node + ndests, &dests_node[j]); - if (BE (err != REG_NOERROR, 0)) - goto error_return; - ++ndests; - } - - /* Put the position in the current group. */ - result = re_node_set_insert (&dests_node[j], cur_nodes->elems[i]); - if (BE (result < 0, 0)) - goto error_return; - - /* If all characters are consumed, go to next node. */ - if (!not_consumed) - break; - } - /* Some characters remain, create a new group. */ - if (j == ndests) - { - bitset_copy (dests_ch[ndests], accepts); - err = re_node_set_init_1 (dests_node + ndests, cur_nodes->elems[i]); - if (BE (err != REG_NOERROR, 0)) - goto error_return; - ++ndests; - bitset_empty (accepts); - } - } - return ndests; - error_return: - for (j = 0; j < ndests; ++j) - re_node_set_free (dests_node + j); - return -1; -} - -#ifdef RE_ENABLE_I18N -/* Check how many bytes the node `dfa->nodes[node_idx]' accepts. - Return the number of the bytes the node accepts. - STR_IDX is the current index of the input string. - - This function handles the nodes which can accept one character, or - one collating element like '.', '[a-z]', opposite to the other nodes - can only accept one byte. */ - -static int -internal_function -check_node_accept_bytes (const re_dfa_t *dfa, int node_idx, - const re_string_t *input, int str_idx) -{ - const re_token_t *node = dfa->nodes + node_idx; - int char_len, elem_len; - int i; - wint_t wc; - - if (BE (node->type == OP_UTF8_PERIOD, 0)) - { - unsigned char c = re_string_byte_at (input, str_idx), d; - if (BE (c < 0xc2, 1)) - return 0; - - if (str_idx + 2 > input->len) - return 0; - - d = re_string_byte_at (input, str_idx + 1); - if (c < 0xe0) - return (d < 0x80 || d > 0xbf) ? 0 : 2; - else if (c < 0xf0) - { - char_len = 3; - if (c == 0xe0 && d < 0xa0) - return 0; - } - else if (c < 0xf8) - { - char_len = 4; - if (c == 0xf0 && d < 0x90) - return 0; - } - else if (c < 0xfc) - { - char_len = 5; - if (c == 0xf8 && d < 0x88) - return 0; - } - else if (c < 0xfe) - { - char_len = 6; - if (c == 0xfc && d < 0x84) - return 0; - } - else - return 0; - - if (str_idx + char_len > input->len) - return 0; - - for (i = 1; i < char_len; ++i) - { - d = re_string_byte_at (input, str_idx + i); - if (d < 0x80 || d > 0xbf) - return 0; - } - return char_len; - } - - char_len = re_string_char_size_at (input, str_idx); - if (node->type == OP_PERIOD) - { - if (char_len <= 1) - return 0; - /* FIXME: I don't think this if is needed, as both '\n' - and '\0' are char_len == 1. */ - /* '.' accepts any one character except the following two cases. */ - if ((!(dfa->syntax & RE_DOT_NEWLINE) && - re_string_byte_at (input, str_idx) == '\n') || - ((dfa->syntax & RE_DOT_NOT_NULL) && - re_string_byte_at (input, str_idx) == '\0')) - return 0; - return char_len; - } - - elem_len = re_string_elem_size_at (input, str_idx); - wc = __btowc(*(input->mbs+str_idx)); - if (((elem_len <= 1 && char_len <= 1) || char_len == 0) && (wc != WEOF && wc < SBC_MAX)) - return 0; - - if (node->type == COMPLEX_BRACKET) - { - const re_charset_t *cset = node->opr.mbcset; -# ifdef _LIBC - const unsigned char *pin - = ((const unsigned char *) re_string_get_buffer (input) + str_idx); - int j; - uint32_t nrules; -# endif /* _LIBC */ - int match_len = 0; - wchar_t wc = ((cset->nranges || cset->nchar_classes || cset->nmbchars) - ? re_string_wchar_at (input, str_idx) : 0); - - /* match with multibyte character? */ - for (i = 0; i < cset->nmbchars; ++i) - if (wc == cset->mbchars[i]) - { - match_len = char_len; - goto check_node_accept_bytes_match; - } - /* match with character_class? */ - for (i = 0; i < cset->nchar_classes; ++i) - { - wctype_t wt = cset->char_classes[i]; - if (__iswctype (wc, wt)) - { - match_len = char_len; - goto check_node_accept_bytes_match; - } - } - -# ifdef _LIBC - nrules = _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES); - if (nrules != 0) - { - unsigned int in_collseq = 0; - const int32_t *table, *indirect; - const unsigned char *weights, *extra; - const char *collseqwc; - /* This #include defines a local function! */ -# include - - /* match with collating_symbol? */ - if (cset->ncoll_syms) - extra = (const unsigned char *) - _NL_CURRENT (LC_COLLATE, _NL_COLLATE_SYMB_EXTRAMB); - for (i = 0; i < cset->ncoll_syms; ++i) - { - const unsigned char *coll_sym = extra + cset->coll_syms[i]; - /* Compare the length of input collating element and - the length of current collating element. */ - if (*coll_sym != elem_len) - continue; - /* Compare each bytes. */ - for (j = 0; j < *coll_sym; j++) - if (pin[j] != coll_sym[1 + j]) - break; - if (j == *coll_sym) - { - /* Match if every bytes is equal. */ - match_len = j; - goto check_node_accept_bytes_match; - } - } - - if (cset->nranges) - { - if (elem_len <= char_len) - { - collseqwc = _NL_CURRENT (LC_COLLATE, _NL_COLLATE_COLLSEQWC); - in_collseq = __collseq_table_lookup (collseqwc, wc); - } - else - in_collseq = find_collation_sequence_value (pin, elem_len); - } - /* match with range expression? */ - for (i = 0; i < cset->nranges; ++i) - if (cset->range_starts[i] <= in_collseq - && in_collseq <= cset->range_ends[i]) - { - match_len = elem_len; - goto check_node_accept_bytes_match; - } - - /* match with equivalence_class? */ - if (cset->nequiv_classes) - { - const unsigned char *cp = pin; - table = (const int32_t *) - _NL_CURRENT (LC_COLLATE, _NL_COLLATE_TABLEMB); - weights = (const unsigned char *) - _NL_CURRENT (LC_COLLATE, _NL_COLLATE_WEIGHTMB); - extra = (const unsigned char *) - _NL_CURRENT (LC_COLLATE, _NL_COLLATE_EXTRAMB); - indirect = (const int32_t *) - _NL_CURRENT (LC_COLLATE, _NL_COLLATE_INDIRECTMB); - int32_t idx = findidx (&cp); - if (idx > 0) - for (i = 0; i < cset->nequiv_classes; ++i) - { - int32_t equiv_class_idx = cset->equiv_classes[i]; - size_t weight_len = weights[idx & 0xffffff]; - if (weight_len == weights[equiv_class_idx & 0xffffff] - && (idx >> 24) == (equiv_class_idx >> 24)) - { - int cnt = 0; - - idx &= 0xffffff; - equiv_class_idx &= 0xffffff; - - while (cnt <= weight_len - && (weights[equiv_class_idx + 1 + cnt] - == weights[idx + 1 + cnt])) - ++cnt; - if (cnt > weight_len) - { - match_len = elem_len; - goto check_node_accept_bytes_match; - } - } - } - } - } - else -# endif /* _LIBC */ - { - /* match with range expression? */ -#if __GNUC__ >= 2 - wchar_t cmp_buf[] = {L'\0', L'\0', wc, L'\0', L'\0', L'\0'}; -#else - wchar_t cmp_buf[] = {L'\0', L'\0', L'\0', L'\0', L'\0', L'\0'}; - cmp_buf[2] = wc; -#endif - for (i = 0; i < cset->nranges; ++i) - { - cmp_buf[0] = cset->range_starts[i]; - cmp_buf[4] = cset->range_ends[i]; - if (wcscoll (cmp_buf, cmp_buf + 2) <= 0 - && wcscoll (cmp_buf + 2, cmp_buf + 4) <= 0) - { - match_len = char_len; - goto check_node_accept_bytes_match; - } - } - } - check_node_accept_bytes_match: - if (!cset->non_match) - return match_len; - else - { - if (match_len > 0) - return 0; - else - return (elem_len > char_len) ? elem_len : char_len; - } - } - return 0; -} - -# ifdef _LIBC -static unsigned int -internal_function -find_collation_sequence_value (const unsigned char *mbs, size_t mbs_len) -{ - uint32_t nrules = _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES); - if (nrules == 0) - { - if (mbs_len == 1) - { - /* No valid character. Match it as a single byte character. */ - const unsigned char *collseq = (const unsigned char *) - _NL_CURRENT (LC_COLLATE, _NL_COLLATE_COLLSEQMB); - return collseq[mbs[0]]; - } - return UINT_MAX; - } - else - { - int32_t idx; - const unsigned char *extra = (const unsigned char *) - _NL_CURRENT (LC_COLLATE, _NL_COLLATE_SYMB_EXTRAMB); - int32_t extrasize = (const unsigned char *) - _NL_CURRENT (LC_COLLATE, _NL_COLLATE_SYMB_EXTRAMB + 1) - extra; - - for (idx = 0; idx < extrasize;) - { - int mbs_cnt, found = 0; - int32_t elem_mbs_len; - /* Skip the name of collating element name. */ - idx = idx + extra[idx] + 1; - elem_mbs_len = extra[idx++]; - if (mbs_len == elem_mbs_len) - { - for (mbs_cnt = 0; mbs_cnt < elem_mbs_len; ++mbs_cnt) - if (extra[idx + mbs_cnt] != mbs[mbs_cnt]) - break; - if (mbs_cnt == elem_mbs_len) - /* Found the entry. */ - found = 1; - } - /* Skip the byte sequence of the collating element. */ - idx += elem_mbs_len; - /* Adjust for the alignment. */ - idx = (idx + 3) & ~3; - /* Skip the collation sequence value. */ - idx += sizeof (uint32_t); - /* Skip the wide char sequence of the collating element. */ - idx = idx + sizeof (uint32_t) * (extra[idx] + 1); - /* If we found the entry, return the sequence value. */ - if (found) - return *(uint32_t *) (extra + idx); - /* Skip the collation sequence value. */ - idx += sizeof (uint32_t); - } - return UINT_MAX; - } -} -# endif /* _LIBC */ -#endif /* RE_ENABLE_I18N */ - -/* Check whether the node accepts the byte which is IDX-th - byte of the INPUT. */ - -static int -internal_function -check_node_accept (const re_match_context_t *mctx, const re_token_t *node, - int idx) -{ - unsigned char ch; - ch = re_string_byte_at (&mctx->input, idx); - switch (node->type) - { - case CHARACTER: - if (node->opr.c != ch) - return 0; - break; - - case SIMPLE_BRACKET: - if (!bitset_contain (node->opr.sbcset, ch)) - return 0; - break; - -#ifdef RE_ENABLE_I18N - case OP_UTF8_PERIOD: - if (ch >= 0x80) - return 0; - /* FALLTHROUGH */ -#endif - case OP_PERIOD: - if ((ch == '\n' && !(mctx->dfa->syntax & RE_DOT_NEWLINE)) - || (ch == '\0' && (mctx->dfa->syntax & RE_DOT_NOT_NULL))) - return 0; - break; - - default: - return 0; - } - - if (node->constraint) - { - /* The node has constraints. Check whether the current context - satisfies the constraints. */ - unsigned int context = re_string_context_at (&mctx->input, idx, - mctx->eflags); - if (NOT_SATISFY_NEXT_CONSTRAINT (node->constraint, context)) - return 0; - } - - return 1; -} - -/* Extend the buffers, if the buffers have run out. */ - -static reg_errcode_t -internal_function -extend_buffers (re_match_context_t *mctx) -{ - reg_errcode_t ret; - re_string_t *pstr = &mctx->input; - - /* Avoid overflow. */ - if (BE (INT_MAX / 2 / sizeof (re_dfastate_t *) <= (size_t)pstr->bufs_len, 0)) - return REG_ESPACE; - - /* Double the lengthes of the buffers. */ - ret = re_string_realloc_buffers (pstr, pstr->bufs_len * 2); - if (BE (ret != REG_NOERROR, 0)) - return ret; - - if (mctx->state_log != NULL) - { - /* And double the length of state_log. */ - /* XXX We have no indication of the size of this buffer. If this - allocation fail we have no indication that the state_log array - does not have the right size. */ - re_dfastate_t **new_array = re_realloc (mctx->state_log, re_dfastate_t *, - pstr->bufs_len + 1); - if (BE (new_array == NULL, 0)) - return REG_ESPACE; - mctx->state_log = new_array; - } - - /* Then reconstruct the buffers. */ - if (pstr->icase) - { -#ifdef RE_ENABLE_I18N - if (pstr->mb_cur_max > 1) - { - ret = build_wcs_upper_buffer (pstr); - if (BE (ret != REG_NOERROR, 0)) - return ret; - } - else -#endif /* RE_ENABLE_I18N */ - build_upper_buffer (pstr); - } - else - { -#ifdef RE_ENABLE_I18N - if (pstr->mb_cur_max > 1) - build_wcs_buffer (pstr); - else -#endif /* RE_ENABLE_I18N */ - { - if (pstr->trans != NULL) - re_string_translate_buffer (pstr); - } - } - return REG_NOERROR; -} - - -/* Functions for matching context. */ - -/* Initialize MCTX. */ - -static reg_errcode_t -internal_function -match_ctx_init (re_match_context_t *mctx, int eflags, int n) -{ - mctx->eflags = eflags; - mctx->match_last = -1; - if (n > 0) - { - mctx->bkref_ents = re_malloc (struct re_backref_cache_entry, n); - mctx->sub_tops = re_malloc (re_sub_match_top_t *, n); - if (BE (mctx->bkref_ents == NULL || mctx->sub_tops == NULL, 0)) - return REG_ESPACE; - } - /* Already zero-ed by the caller. - else - mctx->bkref_ents = NULL; - mctx->nbkref_ents = 0; - mctx->nsub_tops = 0; */ - mctx->abkref_ents = n; - mctx->max_mb_elem_len = 1; - mctx->asub_tops = n; - return REG_NOERROR; -} - -/* Clean the entries which depend on the current input in MCTX. - This function must be invoked when the matcher changes the start index - of the input, or changes the input string. */ - -static void -internal_function -match_ctx_clean (re_match_context_t *mctx) -{ - int st_idx; - for (st_idx = 0; st_idx < mctx->nsub_tops; ++st_idx) - { - int sl_idx; - re_sub_match_top_t *top = mctx->sub_tops[st_idx]; - for (sl_idx = 0; sl_idx < top->nlasts; ++sl_idx) - { - re_sub_match_last_t *last = top->lasts[sl_idx]; - re_free (last->path.array); - re_free (last); - } - re_free (top->lasts); - if (top->path) - { - re_free (top->path->array); - re_free (top->path); - } - free (top); - } - - mctx->nsub_tops = 0; - mctx->nbkref_ents = 0; -} - -/* Free all the memory associated with MCTX. */ - -static void -internal_function -match_ctx_free (re_match_context_t *mctx) -{ - /* First, free all the memory associated with MCTX->SUB_TOPS. */ - match_ctx_clean (mctx); - re_free (mctx->sub_tops); - re_free (mctx->bkref_ents); -} - -/* Add a new backreference entry to MCTX. - Note that we assume that caller never call this function with duplicate - entry, and call with STR_IDX which isn't smaller than any existing entry. -*/ - -static reg_errcode_t -internal_function -match_ctx_add_entry (re_match_context_t *mctx, int node, int str_idx, int from, - int to) -{ - if (mctx->nbkref_ents >= mctx->abkref_ents) - { - struct re_backref_cache_entry* new_entry; - new_entry = re_realloc (mctx->bkref_ents, struct re_backref_cache_entry, - mctx->abkref_ents * 2); - if (BE (new_entry == NULL, 0)) - { - re_free (mctx->bkref_ents); - return REG_ESPACE; - } - mctx->bkref_ents = new_entry; - memset (mctx->bkref_ents + mctx->nbkref_ents, '\0', - sizeof (struct re_backref_cache_entry) * mctx->abkref_ents); - mctx->abkref_ents *= 2; - } - if (mctx->nbkref_ents > 0 - && mctx->bkref_ents[mctx->nbkref_ents - 1].str_idx == str_idx) - mctx->bkref_ents[mctx->nbkref_ents - 1].more = 1; - - mctx->bkref_ents[mctx->nbkref_ents].node = node; - mctx->bkref_ents[mctx->nbkref_ents].str_idx = str_idx; - mctx->bkref_ents[mctx->nbkref_ents].subexp_from = from; - mctx->bkref_ents[mctx->nbkref_ents].subexp_to = to; - - /* This is a cache that saves negative results of check_dst_limits_calc_pos. - If bit N is clear, means that this entry won't epsilon-transition to - an OP_OPEN_SUBEXP or OP_CLOSE_SUBEXP for the N+1-th subexpression. If - it is set, check_dst_limits_calc_pos_1 will recurse and try to find one - such node. - - A backreference does not epsilon-transition unless it is empty, so set - to all zeros if FROM != TO. */ - mctx->bkref_ents[mctx->nbkref_ents].eps_reachable_subexps_map - = (from == to ? ~0 : 0); - - mctx->bkref_ents[mctx->nbkref_ents++].more = 0; - if (mctx->max_mb_elem_len < to - from) - mctx->max_mb_elem_len = to - from; - return REG_NOERROR; -} - -/* Search for the first entry which has the same str_idx, or -1 if none is - found. Note that MCTX->BKREF_ENTS is already sorted by MCTX->STR_IDX. */ - -static int -internal_function -search_cur_bkref_entry (const re_match_context_t *mctx, int str_idx) -{ - int left, right, mid, last; - last = right = mctx->nbkref_ents; - for (left = 0; left < right;) - { - mid = (left + right) / 2; - if (mctx->bkref_ents[mid].str_idx < str_idx) - left = mid + 1; - else - right = mid; - } - if (left < last && mctx->bkref_ents[left].str_idx == str_idx) - return left; - else - return -1; -} - -/* Register the node NODE, whose type is OP_OPEN_SUBEXP, and which matches - at STR_IDX. */ - -static reg_errcode_t -internal_function -match_ctx_add_subtop (re_match_context_t *mctx, int node, int str_idx) -{ -#ifdef DEBUG - assert (mctx->sub_tops != NULL); - assert (mctx->asub_tops > 0); -#endif - if (BE (mctx->nsub_tops == mctx->asub_tops, 0)) - { - int new_asub_tops = mctx->asub_tops * 2; - re_sub_match_top_t **new_array = re_realloc (mctx->sub_tops, - re_sub_match_top_t *, - new_asub_tops); - if (BE (new_array == NULL, 0)) - return REG_ESPACE; - mctx->sub_tops = new_array; - mctx->asub_tops = new_asub_tops; - } - mctx->sub_tops[mctx->nsub_tops] = calloc (1, sizeof (re_sub_match_top_t)); - if (BE (mctx->sub_tops[mctx->nsub_tops] == NULL, 0)) - return REG_ESPACE; - mctx->sub_tops[mctx->nsub_tops]->node = node; - mctx->sub_tops[mctx->nsub_tops++]->str_idx = str_idx; - return REG_NOERROR; -} - -/* Register the node NODE, whose type is OP_CLOSE_SUBEXP, and which matches - at STR_IDX, whose corresponding OP_OPEN_SUBEXP is SUB_TOP. */ - -static re_sub_match_last_t * -internal_function -match_ctx_add_sublast (re_sub_match_top_t *subtop, int node, int str_idx) -{ - re_sub_match_last_t *new_entry; - if (BE (subtop->nlasts == subtop->alasts, 0)) - { - int new_alasts = 2 * subtop->alasts + 1; - re_sub_match_last_t **new_array = re_realloc (subtop->lasts, - re_sub_match_last_t *, - new_alasts); - if (BE (new_array == NULL, 0)) - return NULL; - subtop->lasts = new_array; - subtop->alasts = new_alasts; - } - new_entry = calloc (1, sizeof (re_sub_match_last_t)); - if (BE (new_entry != NULL, 1)) - { - subtop->lasts[subtop->nlasts] = new_entry; - new_entry->node = node; - new_entry->str_idx = str_idx; - ++subtop->nlasts; - } - return new_entry; -} - -static void -internal_function -sift_ctx_init (re_sift_context_t *sctx, re_dfastate_t **sifted_sts, - re_dfastate_t **limited_sts, int last_node, int last_str_idx) -{ - sctx->sifted_states = sifted_sts; - sctx->limited_states = limited_sts; - sctx->last_node = last_node; - sctx->last_str_idx = last_str_idx; - re_node_set_init_empty (&sctx->limits); -} diff --git a/vendor/libgit2/deps/winhttp/urlmon.h b/vendor/libgit2/deps/winhttp/urlmon.h deleted file mode 100644 index 4143d501e..000000000 --- a/vendor/libgit2/deps/winhttp/urlmon.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#if defined(__MINGW_VERSION) || defined(__MINGW32_VERSION) - -#ifndef __CUSTOM_URLMON_H -#define __CUSTOM_URLMON_H - -typedef struct IInternetSecurityManager IInternetSecurityManager; - -typedef struct IInternetSecurityManagerVtbl -{ - HRESULT(STDMETHODCALLTYPE *QueryInterface)(IInternetSecurityManager *, REFIID, void **); - ULONG(STDMETHODCALLTYPE *AddRef)(IInternetSecurityManager *); - ULONG(STDMETHODCALLTYPE *Release)(IInternetSecurityManager *); - LPVOID SetSecuritySite; - LPVOID GetSecuritySite; - HRESULT(STDMETHODCALLTYPE *MapUrlToZone)(IInternetSecurityManager *, LPCWSTR, DWORD *, DWORD); - LPVOID GetSecurityId; - LPVOID ProcessUrlAction; - LPVOID QueryCustomPolicy; - LPVOID SetZoneMapping; - LPVOID GetZoneMappings; -} IInternetSecurityManagerVtbl; - -struct IInternetSecurityManager -{ - CONST_VTBL struct IInternetSecurityManagerVtbl *lpVtbl; -}; - -#define URLZONE_LOCAL_MACHINE 0 -#define URLZONE_INTRANET 1 -#define URLZONE_TRUSTED 2 - -#endif /* __CUSTOM_URLMON_H */ - -#else - -#include_next - -#endif diff --git a/vendor/libgit2/deps/winhttp/winhttp.def b/vendor/libgit2/deps/winhttp/winhttp.def deleted file mode 100644 index eecce59c3..000000000 --- a/vendor/libgit2/deps/winhttp/winhttp.def +++ /dev/null @@ -1,29 +0,0 @@ -LIBRARY WINHTTP -EXPORTS -WinHttpAddRequestHeaders@16 -WinHttpCheckPlatform@0 -WinHttpCloseHandle@4 -WinHttpConnect@16 -WinHttpCrackUrl@16 -WinHttpCreateUrl@16 -WinHttpDetectAutoProxyConfigUrl@8 -WinHttpGetDefaultProxyConfiguration@4 -WinHttpGetIEProxyConfigForCurrentUser@4 -WinHttpGetProxyForUrl@16 -WinHttpOpen@20 -WinHttpOpenRequest@28 -WinHttpQueryAuthSchemes@16 -WinHttpQueryDataAvailable@8 -WinHttpQueryHeaders@24 -WinHttpQueryOption@16 -WinHttpReadData@16 -WinHttpReceiveResponse@8 -WinHttpSendRequest@28 -WinHttpSetCredentials@24 -WinHttpSetDefaultProxyConfiguration@4 -WinHttpSetOption@16 -WinHttpSetStatusCallback@16 -WinHttpSetTimeouts@20 -WinHttpTimeFromSystemTime@8 -WinHttpTimeToSystemTime@8 -WinHttpWriteData@16 diff --git a/vendor/libgit2/deps/winhttp/winhttp.h b/vendor/libgit2/deps/winhttp/winhttp.h deleted file mode 100644 index dd1986a66..000000000 --- a/vendor/libgit2/deps/winhttp/winhttp.h +++ /dev/null @@ -1,592 +0,0 @@ -/* - * Copyright (C) 2007 Francois Gouget - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#if defined(__MINGW_VERSION) || defined(__MINGW32_VERSION) - -#ifndef __WINE_WINHTTP_H -#define __WINE_WINHTTP_H - -#ifdef _WIN64 -#include -#else -#include -#endif - -#define WINHTTPAPI -#define BOOLAPI WINHTTPAPI BOOL WINAPI - - -typedef LPVOID HINTERNET; -typedef HINTERNET *LPHINTERNET; - -#define INTERNET_DEFAULT_PORT 0 -#define INTERNET_DEFAULT_HTTP_PORT 80 -#define INTERNET_DEFAULT_HTTPS_PORT 443 -typedef WORD INTERNET_PORT; -typedef INTERNET_PORT *LPINTERNET_PORT; - -#define INTERNET_SCHEME_HTTP 1 -#define INTERNET_SCHEME_HTTPS 2 -typedef int INTERNET_SCHEME, *LPINTERNET_SCHEME; - -#define ICU_ESCAPE 0x80000000 - -/* flags for WinHttpOpen */ -#define WINHTTP_FLAG_ASYNC 0x10000000 - -/* flags for WinHttpOpenRequest */ -#define WINHTTP_FLAG_ESCAPE_PERCENT 0x00000004 -#define WINHTTP_FLAG_NULL_CODEPAGE 0x00000008 -#define WINHTTP_FLAG_ESCAPE_DISABLE 0x00000040 -#define WINHTTP_FLAG_ESCAPE_DISABLE_QUERY 0x00000080 -#define WINHTTP_FLAG_BYPASS_PROXY_CACHE 0x00000100 -#define WINHTTP_FLAG_REFRESH WINHTTP_FLAG_BYPASS_PROXY_CACHE -#define WINHTTP_FLAG_SECURE 0x00800000 - -#define WINHTTP_ACCESS_TYPE_DEFAULT_PROXY 0 -#define WINHTTP_ACCESS_TYPE_NO_PROXY 1 -#define WINHTTP_ACCESS_TYPE_NAMED_PROXY 3 - -#define WINHTTP_NO_PROXY_NAME NULL -#define WINHTTP_NO_PROXY_BYPASS NULL - -#define WINHTTP_NO_REFERER NULL -#define WINHTTP_DEFAULT_ACCEPT_TYPES NULL - -#define WINHTTP_NO_ADDITIONAL_HEADERS NULL -#define WINHTTP_NO_REQUEST_DATA NULL - -#define WINHTTP_HEADER_NAME_BY_INDEX NULL -#define WINHTTP_NO_OUTPUT_BUFFER NULL -#define WINHTTP_NO_HEADER_INDEX NULL - -#define WINHTTP_ADDREQ_INDEX_MASK 0x0000FFFF -#define WINHTTP_ADDREQ_FLAGS_MASK 0xFFFF0000 -#define WINHTTP_ADDREQ_FLAG_ADD_IF_NEW 0x10000000 -#define WINHTTP_ADDREQ_FLAG_ADD 0x20000000 -#define WINHTTP_ADDREQ_FLAG_COALESCE_WITH_COMMA 0x40000000 -#define WINHTTP_ADDREQ_FLAG_COALESCE_WITH_SEMICOLON 0x01000000 -#define WINHTTP_ADDREQ_FLAG_COALESCE WINHTTP_ADDREQ_FLAG_COALESCE_WITH_COMMA -#define WINHTTP_ADDREQ_FLAG_REPLACE 0x80000000 - -#define WINHTTP_IGNORE_REQUEST_TOTAL_LENGTH 0 - -/* flags for WinHttp{Set/Query}Options */ -#define WINHTTP_FIRST_OPTION WINHTTP_OPTION_CALLBACK -#define WINHTTP_OPTION_CALLBACK 1 -#define WINHTTP_OPTION_RESOLVE_TIMEOUT 2 -#define WINHTTP_OPTION_CONNECT_TIMEOUT 3 -#define WINHTTP_OPTION_CONNECT_RETRIES 4 -#define WINHTTP_OPTION_SEND_TIMEOUT 5 -#define WINHTTP_OPTION_RECEIVE_TIMEOUT 6 -#define WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT 7 -#define WINHTTP_OPTION_HANDLE_TYPE 9 -#define WINHTTP_OPTION_READ_BUFFER_SIZE 12 -#define WINHTTP_OPTION_WRITE_BUFFER_SIZE 13 -#define WINHTTP_OPTION_PARENT_HANDLE 21 -#define WINHTTP_OPTION_EXTENDED_ERROR 24 -#define WINHTTP_OPTION_SECURITY_FLAGS 31 -#define WINHTTP_OPTION_SECURITY_CERTIFICATE_STRUCT 32 -#define WINHTTP_OPTION_URL 34 -#define WINHTTP_OPTION_SECURITY_KEY_BITNESS 36 -#define WINHTTP_OPTION_PROXY 38 -#define WINHTTP_OPTION_USER_AGENT 41 -#define WINHTTP_OPTION_CONTEXT_VALUE 45 -#define WINHTTP_OPTION_CLIENT_CERT_CONTEXT 47 -#define WINHTTP_OPTION_REQUEST_PRIORITY 58 -#define WINHTTP_OPTION_HTTP_VERSION 59 -#define WINHTTP_OPTION_DISABLE_FEATURE 63 -#define WINHTTP_OPTION_CODEPAGE 68 -#define WINHTTP_OPTION_MAX_CONNS_PER_SERVER 73 -#define WINHTTP_OPTION_MAX_CONNS_PER_1_0_SERVER 74 -#define WINHTTP_OPTION_AUTOLOGON_POLICY 77 -#define WINHTTP_OPTION_SERVER_CERT_CONTEXT 78 -#define WINHTTP_OPTION_ENABLE_FEATURE 79 -#define WINHTTP_OPTION_WORKER_THREAD_COUNT 80 -#define WINHTTP_OPTION_PASSPORT_COBRANDING_TEXT 81 -#define WINHTTP_OPTION_PASSPORT_COBRANDING_URL 82 -#define WINHTTP_OPTION_CONFIGURE_PASSPORT_AUTH 83 -#define WINHTTP_OPTION_SECURE_PROTOCOLS 84 -#define WINHTTP_OPTION_ENABLETRACING 85 -#define WINHTTP_OPTION_PASSPORT_SIGN_OUT 86 -#define WINHTTP_OPTION_PASSPORT_RETURN_URL 87 -#define WINHTTP_OPTION_REDIRECT_POLICY 88 -#define WINHTTP_OPTION_MAX_HTTP_AUTOMATIC_REDIRECTS 89 -#define WINHTTP_OPTION_MAX_HTTP_STATUS_CONTINUE 90 -#define WINHTTP_OPTION_MAX_RESPONSE_HEADER_SIZE 91 -#define WINHTTP_OPTION_MAX_RESPONSE_DRAIN_SIZE 92 -#define WINHTTP_OPTION_CONNECTION_INFO 93 -#define WINHTTP_OPTION_CLIENT_CERT_ISSUER_LIST 94 -#define WINHTTP_OPTION_SPN 96 -#define WINHTTP_OPTION_GLOBAL_PROXY_CREDS 97 -#define WINHTTP_OPTION_GLOBAL_SERVER_CREDS 98 -#define WINHTTP_OPTION_UNLOAD_NOTIFY_EVENT 99 -#define WINHTTP_OPTION_REJECT_USERPWD_IN_URL 100 -#define WINHTTP_OPTION_USE_GLOBAL_SERVER_CREDENTIALS 101 -#define WINHTTP_LAST_OPTION WINHTTP_OPTION_USE_GLOBAL_SERVER_CREDENTIALS -#define WINHTTP_OPTION_USERNAME 0x1000 -#define WINHTTP_OPTION_PASSWORD 0x1001 -#define WINHTTP_OPTION_PROXY_USERNAME 0x1002 -#define WINHTTP_OPTION_PROXY_PASSWORD 0x1003 - -#define WINHTTP_CONNS_PER_SERVER_UNLIMITED 0xFFFFFFFF - -#define WINHTTP_AUTOLOGON_SECURITY_LEVEL_MEDIUM 0 -#define WINHTTP_AUTOLOGON_SECURITY_LEVEL_LOW 1 -#define WINHTTP_AUTOLOGON_SECURITY_LEVEL_HIGH 2 -#define WINHTTP_AUTOLOGON_SECURITY_LEVEL_DEFAULT WINHTTP_AUTOLOGON_SECURITY_LEVEL_MEDIUM - -#define WINHTTP_OPTION_REDIRECT_POLICY_NEVER 0 -#define WINHTTP_OPTION_REDIRECT_POLICY_DISALLOW_HTTPS_TO_HTTP 1 -#define WINHTTP_OPTION_REDIRECT_POLICY_ALWAYS 2 -#define WINHTTP_OPTION_REDIRECT_POLICY_LAST WINHTTP_OPTION_REDIRECT_POLICY_ALWAYS -#define WINHTTP_OPTION_REDIRECT_POLICY_DEFAULT WINHTTP_OPTION_REDIRECT_POLICY_DISALLOW_HTTPS_TO_HTTP - -#define WINHTTP_DISABLE_PASSPORT_AUTH 0x00000000 -#define WINHTTP_ENABLE_PASSPORT_AUTH 0x10000000 -#define WINHTTP_DISABLE_PASSPORT_KEYRING 0x20000000 -#define WINHTTP_ENABLE_PASSPORT_KEYRING 0x40000000 - -#define WINHTTP_DISABLE_COOKIES 0x00000001 -#define WINHTTP_DISABLE_REDIRECTS 0x00000002 -#define WINHTTP_DISABLE_AUTHENTICATION 0x00000004 -#define WINHTTP_DISABLE_KEEP_ALIVE 0x00000008 -#define WINHTTP_ENABLE_SSL_REVOCATION 0x00000001 -#define WINHTTP_ENABLE_SSL_REVERT_IMPERSONATION 0x00000002 -#define WINHTTP_DISABLE_SPN_SERVER_PORT 0x00000000 -#define WINHTTP_ENABLE_SPN_SERVER_PORT 0x00000001 -#define WINHTTP_OPTION_SPN_MASK WINHTTP_ENABLE_SPN_SERVER_PORT - -/* Options for WinHttpOpenRequest */ -#define WINHTTP_NO_REFERER NULL -#define WINHTTP_DEFAULT_ACCEPT_TYPES NULL - -/* Options for WinHttpSendRequest */ -#define WINHTTP_NO_ADDITIONAL_HEADERS NULL -#define WINHTTP_NO_REQUEST_DATA NULL - -/* WinHTTP error codes */ -#define WINHTTP_ERROR_BASE 12000 -#define ERROR_WINHTTP_OUT_OF_HANDLES (WINHTTP_ERROR_BASE + 1) -#define ERROR_WINHTTP_TIMEOUT (WINHTTP_ERROR_BASE + 2) -#define ERROR_WINHTTP_INTERNAL_ERROR (WINHTTP_ERROR_BASE + 4) -#define ERROR_WINHTTP_INVALID_URL (WINHTTP_ERROR_BASE + 5) -#define ERROR_WINHTTP_UNRECOGNIZED_SCHEME (WINHTTP_ERROR_BASE + 6) -#define ERROR_WINHTTP_NAME_NOT_RESOLVED (WINHTTP_ERROR_BASE + 7) -#define ERROR_WINHTTP_INVALID_OPTION (WINHTTP_ERROR_BASE + 9) -#define ERROR_WINHTTP_OPTION_NOT_SETTABLE (WINHTTP_ERROR_BASE + 11) -#define ERROR_WINHTTP_SHUTDOWN (WINHTTP_ERROR_BASE + 12) -#define ERROR_WINHTTP_LOGIN_FAILURE (WINHTTP_ERROR_BASE + 15) -#define ERROR_WINHTTP_OPERATION_CANCELLED (WINHTTP_ERROR_BASE + 17) -#define ERROR_WINHTTP_INCORRECT_HANDLE_TYPE (WINHTTP_ERROR_BASE + 18) -#define ERROR_WINHTTP_INCORRECT_HANDLE_STATE (WINHTTP_ERROR_BASE + 19) -#define ERROR_WINHTTP_CANNOT_CONNECT (WINHTTP_ERROR_BASE + 29) -#define ERROR_WINHTTP_CONNECTION_ERROR (WINHTTP_ERROR_BASE + 30) -#define ERROR_WINHTTP_RESEND_REQUEST (WINHTTP_ERROR_BASE + 32) -#define ERROR_WINHTTP_SECURE_CERT_DATE_INVALID (WINHTTP_ERROR_BASE + 37) -#define ERROR_WINHTTP_SECURE_CERT_CN_INVALID (WINHTTP_ERROR_BASE + 38) -#define ERROR_WINHTTP_CLIENT_AUTH_CERT_NEEDED (WINHTTP_ERROR_BASE + 44) -#define ERROR_WINHTTP_SECURE_INVALID_CA (WINHTTP_ERROR_BASE + 45) -#define ERROR_WINHTTP_SECURE_CERT_REV_FAILED (WINHTTP_ERROR_BASE + 57) -#define ERROR_WINHTTP_CANNOT_CALL_BEFORE_OPEN (WINHTTP_ERROR_BASE + 100) -#define ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND (WINHTTP_ERROR_BASE + 101) -#define ERROR_WINHTTP_CANNOT_CALL_AFTER_SEND (WINHTTP_ERROR_BASE + 102) -#define ERROR_WINHTTP_CANNOT_CALL_AFTER_OPEN (WINHTTP_ERROR_BASE + 103) -#define ERROR_WINHTTP_HEADER_NOT_FOUND (WINHTTP_ERROR_BASE + 150) -#define ERROR_WINHTTP_INVALID_SERVER_RESPONSE (WINHTTP_ERROR_BASE + 152) -#define ERROR_WINHTTP_INVALID_HEADER (WINHTTP_ERROR_BASE + 153) -#define ERROR_WINHTTP_INVALID_QUERY_REQUEST (WINHTTP_ERROR_BASE + 154) -#define ERROR_WINHTTP_HEADER_ALREADY_EXISTS (WINHTTP_ERROR_BASE + 155) -#define ERROR_WINHTTP_REDIRECT_FAILED (WINHTTP_ERROR_BASE + 156) -#define ERROR_WINHTTP_SECURE_CHANNEL_ERROR (WINHTTP_ERROR_BASE + 157) -#define ERROR_WINHTTP_BAD_AUTO_PROXY_SCRIPT (WINHTTP_ERROR_BASE + 166) -#define ERROR_WINHTTP_UNABLE_TO_DOWNLOAD_SCRIPT (WINHTTP_ERROR_BASE + 167) -#define ERROR_WINHTTP_SECURE_INVALID_CERT (WINHTTP_ERROR_BASE + 169) -#define ERROR_WINHTTP_SECURE_CERT_REVOKED (WINHTTP_ERROR_BASE + 170) -#define ERROR_WINHTTP_NOT_INITIALIZED (WINHTTP_ERROR_BASE + 172) -#define ERROR_WINHTTP_SECURE_FAILURE (WINHTTP_ERROR_BASE + 175) -#define ERROR_WINHTTP_AUTO_PROXY_SERVICE_ERROR (WINHTTP_ERROR_BASE + 178) -#define ERROR_WINHTTP_SECURE_CERT_WRONG_USAGE (WINHTTP_ERROR_BASE + 179) -#define ERROR_WINHTTP_AUTODETECTION_FAILED (WINHTTP_ERROR_BASE + 180) -#define ERROR_WINHTTP_HEADER_COUNT_EXCEEDED (WINHTTP_ERROR_BASE + 181) -#define ERROR_WINHTTP_HEADER_SIZE_OVERFLOW (WINHTTP_ERROR_BASE + 182) -#define ERROR_WINHTTP_CHUNKED_ENCODING_HEADER_SIZE_OVERFLOW (WINHTTP_ERROR_BASE + 183) -#define ERROR_WINHTTP_RESPONSE_DRAIN_OVERFLOW (WINHTTP_ERROR_BASE + 184) -#define ERROR_WINHTTP_CLIENT_CERT_NO_PRIVATE_KEY (WINHTTP_ERROR_BASE + 185) -#define ERROR_WINHTTP_CLIENT_CERT_NO_ACCESS_PRIVATE_KEY (WINHTTP_ERROR_BASE + 186) -#define WINHTTP_ERROR_LAST (WINHTTP_ERROR_BASE + 186) - -/* WinHttp status codes */ -#define HTTP_STATUS_CONTINUE 100 -#define HTTP_STATUS_SWITCH_PROTOCOLS 101 -#define HTTP_STATUS_OK 200 -#define HTTP_STATUS_CREATED 201 -#define HTTP_STATUS_ACCEPTED 202 -#define HTTP_STATUS_PARTIAL 203 -#define HTTP_STATUS_NO_CONTENT 204 -#define HTTP_STATUS_RESET_CONTENT 205 -#define HTTP_STATUS_PARTIAL_CONTENT 206 -#define HTTP_STATUS_WEBDAV_MULTI_STATUS 207 -#define HTTP_STATUS_AMBIGUOUS 300 -#define HTTP_STATUS_MOVED 301 -#define HTTP_STATUS_REDIRECT 302 -#define HTTP_STATUS_REDIRECT_METHOD 303 -#define HTTP_STATUS_NOT_MODIFIED 304 -#define HTTP_STATUS_USE_PROXY 305 -#define HTTP_STATUS_REDIRECT_KEEP_VERB 307 -#define HTTP_STATUS_BAD_REQUEST 400 -#define HTTP_STATUS_DENIED 401 -#define HTTP_STATUS_PAYMENT_REQ 402 -#define HTTP_STATUS_FORBIDDEN 403 -#define HTTP_STATUS_NOT_FOUND 404 -#define HTTP_STATUS_BAD_METHOD 405 -#define HTTP_STATUS_NONE_ACCEPTABLE 406 -#define HTTP_STATUS_PROXY_AUTH_REQ 407 -#define HTTP_STATUS_REQUEST_TIMEOUT 408 -#define HTTP_STATUS_CONFLICT 409 -#define HTTP_STATUS_GONE 410 -#define HTTP_STATUS_LENGTH_REQUIRED 411 -#define HTTP_STATUS_PRECOND_FAILED 412 -#define HTTP_STATUS_REQUEST_TOO_LARGE 413 -#define HTTP_STATUS_URI_TOO_LONG 414 -#define HTTP_STATUS_UNSUPPORTED_MEDIA 415 -#define HTTP_STATUS_RETRY_WITH 449 -#define HTTP_STATUS_SERVER_ERROR 500 -#define HTTP_STATUS_NOT_SUPPORTED 501 -#define HTTP_STATUS_BAD_GATEWAY 502 -#define HTTP_STATUS_SERVICE_UNAVAIL 503 -#define HTTP_STATUS_GATEWAY_TIMEOUT 504 -#define HTTP_STATUS_VERSION_NOT_SUP 505 -#define HTTP_STATUS_FIRST HTTP_STATUS_CONTINUE -#define HTTP_STATUS_LAST HTTP_STATUS_VERSION_NOT_SUP - -#define SECURITY_FLAG_IGNORE_UNKNOWN_CA 0x00000100 -#define SECURITY_FLAG_IGNORE_CERT_DATE_INVALID 0x00002000 -#define SECURITY_FLAG_IGNORE_CERT_CN_INVALID 0x00001000 -#define SECURITY_FLAG_IGNORE_CERT_WRONG_USAGE 0x00000200 -#define SECURITY_FLAG_SECURE 0x00000001 -#define SECURITY_FLAG_STRENGTH_WEAK 0x10000000 -#define SECURITY_FLAG_STRENGTH_MEDIUM 0x40000000 -#define SECURITY_FLAG_STRENGTH_STRONG 0x20000000 - -#define ICU_NO_ENCODE 0x20000000 -#define ICU_DECODE 0x10000000 -#define ICU_NO_META 0x08000000 -#define ICU_ENCODE_SPACES_ONLY 0x04000000 -#define ICU_BROWSER_MODE 0x02000000 -#define ICU_ENCODE_PERCENT 0x00001000 - -/* Query flags */ -#define WINHTTP_QUERY_MIME_VERSION 0 -#define WINHTTP_QUERY_CONTENT_TYPE 1 -#define WINHTTP_QUERY_CONTENT_TRANSFER_ENCODING 2 -#define WINHTTP_QUERY_CONTENT_ID 3 -#define WINHTTP_QUERY_CONTENT_DESCRIPTION 4 -#define WINHTTP_QUERY_CONTENT_LENGTH 5 -#define WINHTTP_QUERY_CONTENT_LANGUAGE 6 -#define WINHTTP_QUERY_ALLOW 7 -#define WINHTTP_QUERY_PUBLIC 8 -#define WINHTTP_QUERY_DATE 9 -#define WINHTTP_QUERY_EXPIRES 10 -#define WINHTTP_QUERY_LAST_MODIFIED 11 -#define WINHTTP_QUERY_MESSAGE_ID 12 -#define WINHTTP_QUERY_URI 13 -#define WINHTTP_QUERY_DERIVED_FROM 14 -#define WINHTTP_QUERY_COST 15 -#define WINHTTP_QUERY_LINK 16 -#define WINHTTP_QUERY_PRAGMA 17 -#define WINHTTP_QUERY_VERSION 18 -#define WINHTTP_QUERY_STATUS_CODE 19 -#define WINHTTP_QUERY_STATUS_TEXT 20 -#define WINHTTP_QUERY_RAW_HEADERS 21 -#define WINHTTP_QUERY_RAW_HEADERS_CRLF 22 -#define WINHTTP_QUERY_CONNECTION 23 -#define WINHTTP_QUERY_ACCEPT 24 -#define WINHTTP_QUERY_ACCEPT_CHARSET 25 -#define WINHTTP_QUERY_ACCEPT_ENCODING 26 -#define WINHTTP_QUERY_ACCEPT_LANGUAGE 27 -#define WINHTTP_QUERY_AUTHORIZATION 28 -#define WINHTTP_QUERY_CONTENT_ENCODING 29 -#define WINHTTP_QUERY_FORWARDED 30 -#define WINHTTP_QUERY_FROM 31 -#define WINHTTP_QUERY_IF_MODIFIED_SINCE 32 -#define WINHTTP_QUERY_LOCATION 33 -#define WINHTTP_QUERY_ORIG_URI 34 -#define WINHTTP_QUERY_REFERER 35 -#define WINHTTP_QUERY_RETRY_AFTER 36 -#define WINHTTP_QUERY_SERVER 37 -#define WINHTTP_QUERY_TITLE 38 -#define WINHTTP_QUERY_USER_AGENT 39 -#define WINHTTP_QUERY_WWW_AUTHENTICATE 40 -#define WINHTTP_QUERY_PROXY_AUTHENTICATE 41 -#define WINHTTP_QUERY_ACCEPT_RANGES 42 -#define WINHTTP_QUERY_SET_COOKIE 43 -#define WINHTTP_QUERY_COOKIE 44 -#define WINHTTP_QUERY_REQUEST_METHOD 45 -#define WINHTTP_QUERY_REFRESH 46 -#define WINHTTP_QUERY_CONTENT_DISPOSITION 47 -#define WINHTTP_QUERY_AGE 48 -#define WINHTTP_QUERY_CACHE_CONTROL 49 -#define WINHTTP_QUERY_CONTENT_BASE 50 -#define WINHTTP_QUERY_CONTENT_LOCATION 51 -#define WINHTTP_QUERY_CONTENT_MD5 52 -#define WINHTTP_QUERY_CONTENT_RANGE 53 -#define WINHTTP_QUERY_ETAG 54 -#define WINHTTP_QUERY_HOST 55 -#define WINHTTP_QUERY_IF_MATCH 56 -#define WINHTTP_QUERY_IF_NONE_MATCH 57 -#define WINHTTP_QUERY_IF_RANGE 58 -#define WINHTTP_QUERY_IF_UNMODIFIED_SINCE 59 -#define WINHTTP_QUERY_MAX_FORWARDS 60 -#define WINHTTP_QUERY_PROXY_AUTHORIZATION 61 -#define WINHTTP_QUERY_RANGE 62 -#define WINHTTP_QUERY_TRANSFER_ENCODING 63 -#define WINHTTP_QUERY_UPGRADE 64 -#define WINHTTP_QUERY_VARY 65 -#define WINHTTP_QUERY_VIA 66 -#define WINHTTP_QUERY_WARNING 67 -#define WINHTTP_QUERY_EXPECT 68 -#define WINHTTP_QUERY_PROXY_CONNECTION 69 -#define WINHTTP_QUERY_UNLESS_MODIFIED_SINCE 70 -#define WINHTTP_QUERY_PROXY_SUPPORT 75 -#define WINHTTP_QUERY_AUTHENTICATION_INFO 76 -#define WINHTTP_QUERY_PASSPORT_URLS 77 -#define WINHTTP_QUERY_PASSPORT_CONFIG 78 -#define WINHTTP_QUERY_MAX 78 -#define WINHTTP_QUERY_CUSTOM 65535 -#define WINHTTP_QUERY_FLAG_REQUEST_HEADERS 0x80000000 -#define WINHTTP_QUERY_FLAG_SYSTEMTIME 0x40000000 -#define WINHTTP_QUERY_FLAG_NUMBER 0x20000000 - -/* Callback options */ -#define WINHTTP_CALLBACK_STATUS_RESOLVING_NAME 0x00000001 -#define WINHTTP_CALLBACK_STATUS_NAME_RESOLVED 0x00000002 -#define WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER 0x00000004 -#define WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER 0x00000008 -#define WINHTTP_CALLBACK_STATUS_SENDING_REQUEST 0x00000010 -#define WINHTTP_CALLBACK_STATUS_REQUEST_SENT 0x00000020 -#define WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE 0x00000040 -#define WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED 0x00000080 -#define WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION 0x00000100 -#define WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED 0x00000200 -#define WINHTTP_CALLBACK_STATUS_HANDLE_CREATED 0x00000400 -#define WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING 0x00000800 -#define WINHTTP_CALLBACK_STATUS_DETECTING_PROXY 0x00001000 -#define WINHTTP_CALLBACK_STATUS_REDIRECT 0x00004000 -#define WINHTTP_CALLBACK_STATUS_INTERMEDIATE_RESPONSE 0x00008000 -#define WINHTTP_CALLBACK_STATUS_SECURE_FAILURE 0x00010000 -#define WINHTTP_CALLBACK_STATUS_HEADERS_AVAILABLE 0x00020000 -#define WINHTTP_CALLBACK_STATUS_DATA_AVAILABLE 0x00040000 -#define WINHTTP_CALLBACK_STATUS_READ_COMPLETE 0x00080000 -#define WINHTTP_CALLBACK_STATUS_WRITE_COMPLETE 0x00100000 -#define WINHTTP_CALLBACK_STATUS_REQUEST_ERROR 0x00200000 -#define WINHTTP_CALLBACK_STATUS_SENDREQUEST_COMPLETE 0x00400000 -#define WINHTTP_CALLBACK_FLAG_RESOLVE_NAME (WINHTTP_CALLBACK_STATUS_RESOLVING_NAME | WINHTTP_CALLBACK_STATUS_NAME_RESOLVED) -#define WINHTTP_CALLBACK_FLAG_CONNECT_TO_SERVER (WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER | WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER) -#define WINHTTP_CALLBACK_FLAG_SEND_REQUEST (WINHTTP_CALLBACK_STATUS_SENDING_REQUEST | WINHTTP_CALLBACK_STATUS_REQUEST_SENT) -#define WINHTTP_CALLBACK_FLAG_RECEIVE_RESPONSE (WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE | WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED) -#define WINHTTP_CALLBACK_FLAG_CLOSE_CONNECTION (WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION | WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED) -#define WINHTTP_CALLBACK_FLAG_HANDLES (WINHTTP_CALLBACK_STATUS_HANDLE_CREATED | WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING) -#define WINHTTP_CALLBACK_FLAG_DETECTING_PROXY WINHTTP_CALLBACK_STATUS_DETECTING_PROXY -#define WINHTTP_CALLBACK_FLAG_REDIRECT WINHTTP_CALLBACK_STATUS_REDIRECT -#define WINHTTP_CALLBACK_FLAG_INTERMEDIATE_RESPONSE WINHTTP_CALLBACK_STATUS_INTERMEDIATE_RESPONSE -#define WINHTTP_CALLBACK_FLAG_SECURE_FAILURE WINHTTP_CALLBACK_STATUS_SECURE_FAILURE -#define WINHTTP_CALLBACK_FLAG_SENDREQUEST_COMPLETE WINHTTP_CALLBACK_STATUS_SENDREQUEST_COMPLETE -#define WINHTTP_CALLBACK_FLAG_HEADERS_AVAILABLE WINHTTP_CALLBACK_STATUS_HEADERS_AVAILABLE -#define WINHTTP_CALLBACK_FLAG_DATA_AVAILABLE WINHTTP_CALLBACK_STATUS_DATA_AVAILABLE -#define WINHTTP_CALLBACK_FLAG_READ_COMPLETE WINHTTP_CALLBACK_STATUS_READ_COMPLETE -#define WINHTTP_CALLBACK_FLAG_WRITE_COMPLETE WINHTTP_CALLBACK_STATUS_WRITE_COMPLETE -#define WINHTTP_CALLBACK_FLAG_REQUEST_ERROR WINHTTP_CALLBACK_STATUS_REQUEST_ERROR -#define WINHTTP_CALLBACK_FLAG_ALL_COMPLETIONS (WINHTTP_CALLBACK_STATUS_SENDREQUEST_COMPLETE | WINHTTP_CALLBACK_STATUS_HEADERS_AVAILABLE \ - | WINHTTP_CALLBACK_STATUS_DATA_AVAILABLE | WINHTTP_CALLBACK_STATUS_READ_COMPLETE \ - | WINHTTP_CALLBACK_STATUS_WRITE_COMPLETE | WINHTTP_CALLBACK_STATUS_REQUEST_ERROR) -#define WINHTTP_CALLBACK_FLAG_ALL_NOTIFICATIONS 0xffffffff -#define WINHTTP_INVALID_STATUS_CALLBACK ((WINHTTP_STATUS_CALLBACK)(-1)) - -#define API_RECEIVE_RESPONSE (1) -#define API_QUERY_DATA_AVAILABLE (2) -#define API_READ_DATA (3) -#define API_WRITE_DATA (4) -#define API_SEND_REQUEST (5) - -#define WINHTTP_HANDLE_TYPE_SESSION 1 -#define WINHTTP_HANDLE_TYPE_CONNECT 2 -#define WINHTTP_HANDLE_TYPE_REQUEST 3 - -#define WINHTTP_CALLBACK_STATUS_FLAG_CERT_REV_FAILED 0x00000001 -#define WINHTTP_CALLBACK_STATUS_FLAG_INVALID_CERT 0x00000002 -#define WINHTTP_CALLBACK_STATUS_FLAG_CERT_REVOKED 0x00000004 -#define WINHTTP_CALLBACK_STATUS_FLAG_INVALID_CA 0x00000008 -#define WINHTTP_CALLBACK_STATUS_FLAG_CERT_CN_INVALID 0x00000010 -#define WINHTTP_CALLBACK_STATUS_FLAG_CERT_DATE_INVALID 0x00000020 -#define WINHTTP_CALLBACK_STATUS_FLAG_CERT_WRONG_USAGE 0x00000040 -#define WINHTTP_CALLBACK_STATUS_FLAG_SECURITY_CHANNEL_ERROR 0x80000000 - -#define WINHTTP_FLAG_SECURE_PROTOCOL_SSL2 0x00000008 -#define WINHTTP_FLAG_SECURE_PROTOCOL_SSL3 0x00000020 -#define WINHTTP_FLAG_SECURE_PROTOCOL_TLS1 0x00000080 -#define WINHTTP_FLAG_SECURE_PROTOCOL_ALL (WINHTTP_FLAG_SECURE_PROTOCOL_SSL2 | WINHTTP_FLAG_SECURE_PROTOCOL_SSL3 | WINHTTP_FLAG_SECURE_PROTOCOL_TLS1) - -#define WINHTTP_AUTH_SCHEME_BASIC 0x00000001 -#define WINHTTP_AUTH_SCHEME_NTLM 0x00000002 -#define WINHTTP_AUTH_SCHEME_PASSPORT 0x00000004 -#define WINHTTP_AUTH_SCHEME_DIGEST 0x00000008 -#define WINHTTP_AUTH_SCHEME_NEGOTIATE 0x00000010 - -#define WINHTTP_AUTH_TARGET_SERVER 0x00000000 -#define WINHTTP_AUTH_TARGET_PROXY 0x00000001 - -#define WINHTTP_TIME_FORMAT_BUFSIZE 62 - -typedef struct -{ - DWORD dwStructSize; - LPWSTR lpszScheme; - DWORD dwSchemeLength; - INTERNET_SCHEME nScheme; - LPWSTR lpszHostName; - DWORD dwHostNameLength; - INTERNET_PORT nPort; - LPWSTR lpszUserName; - DWORD dwUserNameLength; - LPWSTR lpszPassword; - DWORD dwPasswordLength; - LPWSTR lpszUrlPath; - DWORD dwUrlPathLength; - LPWSTR lpszExtraInfo; - DWORD dwExtraInfoLength; -} URL_COMPONENTS, *LPURL_COMPONENTS; -typedef URL_COMPONENTS URL_COMPONENTSW; -typedef LPURL_COMPONENTS LPURL_COMPONENTSW; - -typedef struct -{ - DWORD_PTR dwResult; - DWORD dwError; -} WINHTTP_ASYNC_RESULT, *LPWINHTTP_ASYNC_RESULT; - -typedef struct -{ - FILETIME ftExpiry; - FILETIME ftStart; - LPWSTR lpszSubjectInfo; - LPWSTR lpszIssuerInfo; - LPWSTR lpszProtocolName; - LPWSTR lpszSignatureAlgName; - LPWSTR lpszEncryptionAlgName; - DWORD dwKeySize; -} WINHTTP_CERTIFICATE_INFO; - -typedef struct -{ - DWORD dwAccessType; - LPWSTR lpszProxy; - LPWSTR lpszProxyBypass; -} WINHTTP_PROXY_INFO, *LPWINHTTP_PROXY_INFO; -typedef WINHTTP_PROXY_INFO WINHTTP_PROXY_INFOW; -typedef LPWINHTTP_PROXY_INFO LPWINHTTP_PROXY_INFOW; - -typedef struct -{ - BOOL fAutoDetect; - LPWSTR lpszAutoConfigUrl; - LPWSTR lpszProxy; - LPWSTR lpszProxyBypass; -} WINHTTP_CURRENT_USER_IE_PROXY_CONFIG; - -typedef VOID (CALLBACK *WINHTTP_STATUS_CALLBACK)(HINTERNET,DWORD_PTR,DWORD,LPVOID,DWORD); - -#define WINHTTP_AUTO_DETECT_TYPE_DHCP 0x00000001 -#define WINHTTP_AUTO_DETECT_TYPE_DNS_A 0x00000002 - -#define WINHTTP_AUTOPROXY_AUTO_DETECT 0x00000001 -#define WINHTTP_AUTOPROXY_CONFIG_URL 0x00000002 -#define WINHTTP_AUTOPROXY_RUN_INPROCESS 0x00010000 -#define WINHTTP_AUTOPROXY_RUN_OUTPROCESS_ONLY 0x00020000 - -typedef struct -{ - DWORD dwFlags; - DWORD dwAutoDetectFlags; - LPCWSTR lpszAutoConfigUrl; - LPVOID lpvReserved; - DWORD dwReserved; - BOOL fAutoLogonIfChallenged; -} WINHTTP_AUTOPROXY_OPTIONS; - -typedef struct -{ - DWORD dwMajorVersion; - DWORD dwMinorVersion; -} HTTP_VERSION_INFO, *LPHTTP_VERSION_INFO; - -#ifdef _WS2DEF_ -typedef struct -{ - DWORD cbSize; - SOCKADDR_STORAGE LocalAddress; - SOCKADDR_STORAGE RemoteAddress; -} WINHTTP_CONNECTION_INFO; -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -BOOL WINAPI WinHttpAddRequestHeaders(HINTERNET,LPCWSTR,DWORD,DWORD); -BOOL WINAPI WinHttpDetectAutoProxyConfigUrl(DWORD,LPWSTR*); -BOOL WINAPI WinHttpCheckPlatform(void); -BOOL WINAPI WinHttpCloseHandle(HINTERNET); -HINTERNET WINAPI WinHttpConnect(HINTERNET,LPCWSTR,INTERNET_PORT,DWORD); -BOOL WINAPI WinHttpCrackUrl(LPCWSTR,DWORD,DWORD,LPURL_COMPONENTS); -BOOL WINAPI WinHttpCreateUrl(LPURL_COMPONENTS,DWORD,LPWSTR,LPDWORD); -BOOL WINAPI WinHttpGetDefaultProxyConfiguration(WINHTTP_PROXY_INFO*); -BOOL WINAPI WinHttpGetIEProxyConfigForCurrentUser(WINHTTP_CURRENT_USER_IE_PROXY_CONFIG*); -BOOL WINAPI WinHttpGetProxyForUrl(HINTERNET,LPCWSTR,WINHTTP_AUTOPROXY_OPTIONS*,WINHTTP_PROXY_INFO*); -HINTERNET WINAPI WinHttpOpen(LPCWSTR,DWORD,LPCWSTR,LPCWSTR,DWORD); -HINTERNET WINAPI WinHttpOpenRequest(HINTERNET,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR*,DWORD); -BOOL WINAPI WinHttpQueryAuthParams(HINTERNET,DWORD,LPVOID*); -BOOL WINAPI WinHttpQueryAuthSchemes(HINTERNET,LPDWORD,LPDWORD,LPDWORD); -BOOL WINAPI WinHttpQueryDataAvailable(HINTERNET,LPDWORD); -BOOL WINAPI WinHttpQueryHeaders(HINTERNET,DWORD,LPCWSTR,LPVOID,LPDWORD,LPDWORD); -BOOL WINAPI WinHttpQueryOption(HINTERNET,DWORD,LPVOID,LPDWORD); -BOOL WINAPI WinHttpReadData(HINTERNET,LPVOID,DWORD,LPDWORD); -BOOL WINAPI WinHttpReceiveResponse(HINTERNET,LPVOID); -BOOL WINAPI WinHttpSendRequest(HINTERNET,LPCWSTR,DWORD,LPVOID,DWORD,DWORD,DWORD_PTR); -BOOL WINAPI WinHttpSetDefaultProxyConfiguration(WINHTTP_PROXY_INFO*); -BOOL WINAPI WinHttpSetCredentials(HINTERNET,DWORD,DWORD,LPCWSTR,LPCWSTR,LPVOID); -BOOL WINAPI WinHttpSetOption(HINTERNET,DWORD,LPVOID,DWORD); -WINHTTP_STATUS_CALLBACK WINAPI WinHttpSetStatusCallback(HINTERNET,WINHTTP_STATUS_CALLBACK,DWORD,DWORD_PTR); -BOOL WINAPI WinHttpSetTimeouts(HINTERNET,int,int,int,int); -BOOL WINAPI WinHttpTimeFromSystemTime(const SYSTEMTIME *,LPWSTR); -BOOL WINAPI WinHttpTimeToSystemTime(LPCWSTR,SYSTEMTIME*); -BOOL WINAPI WinHttpWriteData(HINTERNET,LPCVOID,DWORD,LPDWORD); - -#ifdef __cplusplus -} -#endif - -#include - -#endif /* __WINE_WINHTTP_H */ - -#else - -#include_next - -#endif diff --git a/vendor/libgit2/deps/winhttp/winhttp64.def b/vendor/libgit2/deps/winhttp/winhttp64.def deleted file mode 100644 index bfad3a0ce..000000000 --- a/vendor/libgit2/deps/winhttp/winhttp64.def +++ /dev/null @@ -1,29 +0,0 @@ -LIBRARY WINHTTP -EXPORTS -WinHttpAddRequestHeaders -WinHttpCheckPlatform -WinHttpCloseHandle -WinHttpConnect -WinHttpCrackUrl -WinHttpCreateUrl -WinHttpDetectAutoProxyConfigUrl -WinHttpGetDefaultProxyConfiguration -WinHttpGetIEProxyConfigForCurrentUser -WinHttpGetProxyForUrl -WinHttpOpen -WinHttpOpenRequest -WinHttpQueryAuthSchemes -WinHttpQueryDataAvailable -WinHttpQueryHeaders -WinHttpQueryOption -WinHttpReadData -WinHttpReceiveResponse -WinHttpSendRequest -WinHttpSetCredentials -WinHttpSetDefaultProxyConfiguration -WinHttpSetOption -WinHttpSetStatusCallback -WinHttpSetTimeouts -WinHttpTimeFromSystemTime -WinHttpTimeToSystemTime -WinHttpWriteData diff --git a/vendor/libgit2/deps/zlib/adler32.c b/vendor/libgit2/deps/zlib/adler32.c deleted file mode 100644 index a868f073d..000000000 --- a/vendor/libgit2/deps/zlib/adler32.c +++ /dev/null @@ -1,179 +0,0 @@ -/* adler32.c -- compute the Adler-32 checksum of a data stream - * Copyright (C) 1995-2011 Mark Adler - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -/* @(#) $Id$ */ - -#include "zutil.h" - -#define local static - -local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2)); - -#define BASE 65521 /* largest prime smaller than 65536 */ -#define NMAX 5552 -/* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */ - -#define DO1(buf,i) {adler += (buf)[i]; sum2 += adler;} -#define DO2(buf,i) DO1(buf,i); DO1(buf,i+1); -#define DO4(buf,i) DO2(buf,i); DO2(buf,i+2); -#define DO8(buf,i) DO4(buf,i); DO4(buf,i+4); -#define DO16(buf) DO8(buf,0); DO8(buf,8); - -/* use NO_DIVIDE if your processor does not do division in hardware -- - try it both ways to see which is faster */ -#ifdef NO_DIVIDE -/* note that this assumes BASE is 65521, where 65536 % 65521 == 15 - (thank you to John Reiser for pointing this out) */ -# define CHOP(a) \ - do { \ - unsigned long tmp = a >> 16; \ - a &= 0xffffUL; \ - a += (tmp << 4) - tmp; \ - } while (0) -# define MOD28(a) \ - do { \ - CHOP(a); \ - if (a >= BASE) a -= BASE; \ - } while (0) -# define MOD(a) \ - do { \ - CHOP(a); \ - MOD28(a); \ - } while (0) -# define MOD63(a) \ - do { /* this assumes a is not negative */ \ - z_off64_t tmp = a >> 32; \ - a &= 0xffffffffL; \ - a += (tmp << 8) - (tmp << 5) + tmp; \ - tmp = a >> 16; \ - a &= 0xffffL; \ - a += (tmp << 4) - tmp; \ - tmp = a >> 16; \ - a &= 0xffffL; \ - a += (tmp << 4) - tmp; \ - if (a >= BASE) a -= BASE; \ - } while (0) -#else -# define MOD(a) a %= BASE -# define MOD28(a) a %= BASE -# define MOD63(a) a %= BASE -#endif - -/* ========================================================================= */ -uLong ZEXPORT adler32(adler, buf, len) - uLong adler; - const Bytef *buf; - uInt len; -{ - unsigned long sum2; - unsigned n; - - /* split Adler-32 into component sums */ - sum2 = (adler >> 16) & 0xffff; - adler &= 0xffff; - - /* in case user likes doing a byte at a time, keep it fast */ - if (len == 1) { - adler += buf[0]; - if (adler >= BASE) - adler -= BASE; - sum2 += adler; - if (sum2 >= BASE) - sum2 -= BASE; - return adler | (sum2 << 16); - } - - /* initial Adler-32 value (deferred check for len == 1 speed) */ - if (buf == Z_NULL) - return 1L; - - /* in case short lengths are provided, keep it somewhat fast */ - if (len < 16) { - while (len--) { - adler += *buf++; - sum2 += adler; - } - if (adler >= BASE) - adler -= BASE; - MOD28(sum2); /* only added so many BASE's */ - return adler | (sum2 << 16); - } - - /* do length NMAX blocks -- requires just one modulo operation */ - while (len >= NMAX) { - len -= NMAX; - n = NMAX / 16; /* NMAX is divisible by 16 */ - do { - DO16(buf); /* 16 sums unrolled */ - buf += 16; - } while (--n); - MOD(adler); - MOD(sum2); - } - - /* do remaining bytes (less than NMAX, still just one modulo) */ - if (len) { /* avoid modulos if none remaining */ - while (len >= 16) { - len -= 16; - DO16(buf); - buf += 16; - } - while (len--) { - adler += *buf++; - sum2 += adler; - } - MOD(adler); - MOD(sum2); - } - - /* return recombined sums */ - return adler | (sum2 << 16); -} - -/* ========================================================================= */ -local uLong adler32_combine_(adler1, adler2, len2) - uLong adler1; - uLong adler2; - z_off64_t len2; -{ - unsigned long sum1; - unsigned long sum2; - unsigned rem; - - /* for negative len, return invalid adler32 as a clue for debugging */ - if (len2 < 0) - return 0xffffffffUL; - - /* the derivation of this formula is left as an exercise for the reader */ - MOD63(len2); /* assumes len2 >= 0 */ - rem = (unsigned)len2; - sum1 = adler1 & 0xffff; - sum2 = rem * sum1; - MOD(sum2); - sum1 += (adler2 & 0xffff) + BASE - 1; - sum2 += ((adler1 >> 16) & 0xffff) + ((adler2 >> 16) & 0xffff) + BASE - rem; - if (sum1 >= BASE) sum1 -= BASE; - if (sum1 >= BASE) sum1 -= BASE; - if (sum2 >= (BASE << 1)) sum2 -= (BASE << 1); - if (sum2 >= BASE) sum2 -= BASE; - return sum1 | (sum2 << 16); -} - -/* ========================================================================= */ -uLong ZEXPORT adler32_combine(adler1, adler2, len2) - uLong adler1; - uLong adler2; - z_off_t len2; -{ - return adler32_combine_(adler1, adler2, len2); -} - -uLong ZEXPORT adler32_combine64(adler1, adler2, len2) - uLong adler1; - uLong adler2; - z_off64_t len2; -{ - return adler32_combine_(adler1, adler2, len2); -} diff --git a/vendor/libgit2/deps/zlib/crc32.c b/vendor/libgit2/deps/zlib/crc32.c deleted file mode 100644 index 979a7190a..000000000 --- a/vendor/libgit2/deps/zlib/crc32.c +++ /dev/null @@ -1,425 +0,0 @@ -/* crc32.c -- compute the CRC-32 of a data stream - * Copyright (C) 1995-2006, 2010, 2011, 2012 Mark Adler - * For conditions of distribution and use, see copyright notice in zlib.h - * - * Thanks to Rodney Brown for his contribution of faster - * CRC methods: exclusive-oring 32 bits of data at a time, and pre-computing - * tables for updating the shift register in one step with three exclusive-ors - * instead of four steps with four exclusive-ors. This results in about a - * factor of two increase in speed on a Power PC G4 (PPC7455) using gcc -O3. - */ - -/* @(#) $Id$ */ - -/* - Note on the use of DYNAMIC_CRC_TABLE: there is no mutex or semaphore - protection on the static variables used to control the first-use generation - of the crc tables. Therefore, if you #define DYNAMIC_CRC_TABLE, you should - first call get_crc_table() to initialize the tables before allowing more than - one thread to use crc32(). - - DYNAMIC_CRC_TABLE and MAKECRCH can be #defined to write out crc32.h. - */ - -#ifdef MAKECRCH -# include -# ifndef DYNAMIC_CRC_TABLE -# define DYNAMIC_CRC_TABLE -# endif /* !DYNAMIC_CRC_TABLE */ -#endif /* MAKECRCH */ - -#include "zutil.h" /* for STDC and FAR definitions */ - -#define local static - -/* Definitions for doing the crc four data bytes at a time. */ -#if !defined(NOBYFOUR) && defined(Z_U4) -# define BYFOUR -#endif -#ifdef BYFOUR - local unsigned long crc32_little OF((unsigned long, - const unsigned char FAR *, unsigned)); - local unsigned long crc32_big OF((unsigned long, - const unsigned char FAR *, unsigned)); -# define TBLS 8 -#else -# define TBLS 1 -#endif /* BYFOUR */ - -/* Local functions for crc concatenation */ -local unsigned long gf2_matrix_times OF((unsigned long *mat, - unsigned long vec)); -local void gf2_matrix_square OF((unsigned long *square, unsigned long *mat)); -local uLong crc32_combine_ OF((uLong crc1, uLong crc2, z_off64_t len2)); - - -#ifdef DYNAMIC_CRC_TABLE - -local volatile int crc_table_empty = 1; -local z_crc_t FAR crc_table[TBLS][256]; -local void make_crc_table OF((void)); -#ifdef MAKECRCH - local void write_table OF((FILE *, const z_crc_t FAR *)); -#endif /* MAKECRCH */ -/* - Generate tables for a byte-wise 32-bit CRC calculation on the polynomial: - x^32+x^26+x^23+x^22+x^16+x^12+x^11+x^10+x^8+x^7+x^5+x^4+x^2+x+1. - - Polynomials over GF(2) are represented in binary, one bit per coefficient, - with the lowest powers in the most significant bit. Then adding polynomials - is just exclusive-or, and multiplying a polynomial by x is a right shift by - one. If we call the above polynomial p, and represent a byte as the - polynomial q, also with the lowest power in the most significant bit (so the - byte 0xb1 is the polynomial x^7+x^3+x+1), then the CRC is (q*x^32) mod p, - where a mod b means the remainder after dividing a by b. - - This calculation is done using the shift-register method of multiplying and - taking the remainder. The register is initialized to zero, and for each - incoming bit, x^32 is added mod p to the register if the bit is a one (where - x^32 mod p is p+x^32 = x^26+...+1), and the register is multiplied mod p by - x (which is shifting right by one and adding x^32 mod p if the bit shifted - out is a one). We start with the highest power (least significant bit) of - q and repeat for all eight bits of q. - - The first table is simply the CRC of all possible eight bit values. This is - all the information needed to generate CRCs on data a byte at a time for all - combinations of CRC register values and incoming bytes. The remaining tables - allow for word-at-a-time CRC calculation for both big-endian and little- - endian machines, where a word is four bytes. -*/ -local void make_crc_table() -{ - z_crc_t c; - int n, k; - z_crc_t poly; /* polynomial exclusive-or pattern */ - /* terms of polynomial defining this crc (except x^32): */ - static volatile int first = 1; /* flag to limit concurrent making */ - static const unsigned char p[] = {0,1,2,4,5,7,8,10,11,12,16,22,23,26}; - - /* See if another task is already doing this (not thread-safe, but better - than nothing -- significantly reduces duration of vulnerability in - case the advice about DYNAMIC_CRC_TABLE is ignored) */ - if (first) { - first = 0; - - /* make exclusive-or pattern from polynomial (0xedb88320UL) */ - poly = 0; - for (n = 0; n < (int)(sizeof(p)/sizeof(unsigned char)); n++) - poly |= (z_crc_t)1 << (31 - p[n]); - - /* generate a crc for every 8-bit value */ - for (n = 0; n < 256; n++) { - c = (z_crc_t)n; - for (k = 0; k < 8; k++) - c = c & 1 ? poly ^ (c >> 1) : c >> 1; - crc_table[0][n] = c; - } - -#ifdef BYFOUR - /* generate crc for each value followed by one, two, and three zeros, - and then the byte reversal of those as well as the first table */ - for (n = 0; n < 256; n++) { - c = crc_table[0][n]; - crc_table[4][n] = ZSWAP32(c); - for (k = 1; k < 4; k++) { - c = crc_table[0][c & 0xff] ^ (c >> 8); - crc_table[k][n] = c; - crc_table[k + 4][n] = ZSWAP32(c); - } - } -#endif /* BYFOUR */ - - crc_table_empty = 0; - } - else { /* not first */ - /* wait for the other guy to finish (not efficient, but rare) */ - while (crc_table_empty) - ; - } - -#ifdef MAKECRCH - /* write out CRC tables to crc32.h */ - { - FILE *out; - - out = fopen("crc32.h", "w"); - if (out == NULL) return; - fprintf(out, "/* crc32.h -- tables for rapid CRC calculation\n"); - fprintf(out, " * Generated automatically by crc32.c\n */\n\n"); - fprintf(out, "local const z_crc_t FAR "); - fprintf(out, "crc_table[TBLS][256] =\n{\n {\n"); - write_table(out, crc_table[0]); -# ifdef BYFOUR - fprintf(out, "#ifdef BYFOUR\n"); - for (k = 1; k < 8; k++) { - fprintf(out, " },\n {\n"); - write_table(out, crc_table[k]); - } - fprintf(out, "#endif\n"); -# endif /* BYFOUR */ - fprintf(out, " }\n};\n"); - fclose(out); - } -#endif /* MAKECRCH */ -} - -#ifdef MAKECRCH -local void write_table(out, table) - FILE *out; - const z_crc_t FAR *table; -{ - int n; - - for (n = 0; n < 256; n++) - fprintf(out, "%s0x%08lxUL%s", n % 5 ? "" : " ", - (unsigned long)(table[n]), - n == 255 ? "\n" : (n % 5 == 4 ? ",\n" : ", ")); -} -#endif /* MAKECRCH */ - -#else /* !DYNAMIC_CRC_TABLE */ -/* ======================================================================== - * Tables of CRC-32s of all single-byte values, made by make_crc_table(). - */ -#include "crc32.h" -#endif /* DYNAMIC_CRC_TABLE */ - -/* ========================================================================= - * This function can be used by asm versions of crc32() - */ -const z_crc_t FAR * ZEXPORT get_crc_table() -{ -#ifdef DYNAMIC_CRC_TABLE - if (crc_table_empty) - make_crc_table(); -#endif /* DYNAMIC_CRC_TABLE */ - return (const z_crc_t FAR *)crc_table; -} - -/* ========================================================================= */ -#define DO1 crc = crc_table[0][((int)crc ^ (*buf++)) & 0xff] ^ (crc >> 8) -#define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1 - -/* ========================================================================= */ -unsigned long ZEXPORT crc32(crc, buf, len) - unsigned long crc; - const unsigned char FAR *buf; - uInt len; -{ - if (buf == Z_NULL) return 0UL; - -#ifdef DYNAMIC_CRC_TABLE - if (crc_table_empty) - make_crc_table(); -#endif /* DYNAMIC_CRC_TABLE */ - -#ifdef BYFOUR - if (sizeof(void *) == sizeof(ptrdiff_t)) { - z_crc_t endian; - - endian = 1; - if (*((unsigned char *)(&endian))) - return crc32_little(crc, buf, len); - else - return crc32_big(crc, buf, len); - } -#endif /* BYFOUR */ - crc = crc ^ 0xffffffffUL; - while (len >= 8) { - DO8; - len -= 8; - } - if (len) do { - DO1; - } while (--len); - return crc ^ 0xffffffffUL; -} - -#ifdef BYFOUR - -/* ========================================================================= */ -#define DOLIT4 c ^= *buf4++; \ - c = crc_table[3][c & 0xff] ^ crc_table[2][(c >> 8) & 0xff] ^ \ - crc_table[1][(c >> 16) & 0xff] ^ crc_table[0][c >> 24] -#define DOLIT32 DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4 - -/* ========================================================================= */ -local unsigned long crc32_little(crc, buf, len) - unsigned long crc; - const unsigned char FAR *buf; - unsigned len; -{ - register z_crc_t c; - register const z_crc_t FAR *buf4; - - c = (z_crc_t)crc; - c = ~c; - while (len && ((ptrdiff_t)buf & 3)) { - c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8); - len--; - } - - buf4 = (const z_crc_t FAR *)(const void FAR *)buf; - while (len >= 32) { - DOLIT32; - len -= 32; - } - while (len >= 4) { - DOLIT4; - len -= 4; - } - buf = (const unsigned char FAR *)buf4; - - if (len) do { - c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8); - } while (--len); - c = ~c; - return (unsigned long)c; -} - -/* ========================================================================= */ -#define DOBIG4 c ^= *++buf4; \ - c = crc_table[4][c & 0xff] ^ crc_table[5][(c >> 8) & 0xff] ^ \ - crc_table[6][(c >> 16) & 0xff] ^ crc_table[7][c >> 24] -#define DOBIG32 DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4 - -/* ========================================================================= */ -local unsigned long crc32_big(crc, buf, len) - unsigned long crc; - const unsigned char FAR *buf; - unsigned len; -{ - register z_crc_t c; - register const z_crc_t FAR *buf4; - - c = ZSWAP32((z_crc_t)crc); - c = ~c; - while (len && ((ptrdiff_t)buf & 3)) { - c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8); - len--; - } - - buf4 = (const z_crc_t FAR *)(const void FAR *)buf; - buf4--; - while (len >= 32) { - DOBIG32; - len -= 32; - } - while (len >= 4) { - DOBIG4; - len -= 4; - } - buf4++; - buf = (const unsigned char FAR *)buf4; - - if (len) do { - c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8); - } while (--len); - c = ~c; - return (unsigned long)(ZSWAP32(c)); -} - -#endif /* BYFOUR */ - -#define GF2_DIM 32 /* dimension of GF(2) vectors (length of CRC) */ - -/* ========================================================================= */ -local unsigned long gf2_matrix_times(mat, vec) - unsigned long *mat; - unsigned long vec; -{ - unsigned long sum; - - sum = 0; - while (vec) { - if (vec & 1) - sum ^= *mat; - vec >>= 1; - mat++; - } - return sum; -} - -/* ========================================================================= */ -local void gf2_matrix_square(square, mat) - unsigned long *square; - unsigned long *mat; -{ - int n; - - for (n = 0; n < GF2_DIM; n++) - square[n] = gf2_matrix_times(mat, mat[n]); -} - -/* ========================================================================= */ -local uLong crc32_combine_(crc1, crc2, len2) - uLong crc1; - uLong crc2; - z_off64_t len2; -{ - int n; - unsigned long row; - unsigned long even[GF2_DIM]; /* even-power-of-two zeros operator */ - unsigned long odd[GF2_DIM]; /* odd-power-of-two zeros operator */ - - /* degenerate case (also disallow negative lengths) */ - if (len2 <= 0) - return crc1; - - /* put operator for one zero bit in odd */ - odd[0] = 0xedb88320UL; /* CRC-32 polynomial */ - row = 1; - for (n = 1; n < GF2_DIM; n++) { - odd[n] = row; - row <<= 1; - } - - /* put operator for two zero bits in even */ - gf2_matrix_square(even, odd); - - /* put operator for four zero bits in odd */ - gf2_matrix_square(odd, even); - - /* apply len2 zeros to crc1 (first square will put the operator for one - zero byte, eight zero bits, in even) */ - do { - /* apply zeros operator for this bit of len2 */ - gf2_matrix_square(even, odd); - if (len2 & 1) - crc1 = gf2_matrix_times(even, crc1); - len2 >>= 1; - - /* if no more bits set, then done */ - if (len2 == 0) - break; - - /* another iteration of the loop with odd and even swapped */ - gf2_matrix_square(odd, even); - if (len2 & 1) - crc1 = gf2_matrix_times(odd, crc1); - len2 >>= 1; - - /* if no more bits set, then done */ - } while (len2 != 0); - - /* return combined crc */ - crc1 ^= crc2; - return crc1; -} - -/* ========================================================================= */ -uLong ZEXPORT crc32_combine(crc1, crc2, len2) - uLong crc1; - uLong crc2; - z_off_t len2; -{ - return crc32_combine_(crc1, crc2, len2); -} - -uLong ZEXPORT crc32_combine64(crc1, crc2, len2) - uLong crc1; - uLong crc2; - z_off64_t len2; -{ - return crc32_combine_(crc1, crc2, len2); -} diff --git a/vendor/libgit2/deps/zlib/crc32.h b/vendor/libgit2/deps/zlib/crc32.h deleted file mode 100644 index 9e0c77810..000000000 --- a/vendor/libgit2/deps/zlib/crc32.h +++ /dev/null @@ -1,441 +0,0 @@ -/* crc32.h -- tables for rapid CRC calculation - * Generated automatically by crc32.c - */ - -local const z_crc_t FAR crc_table[TBLS][256] = -{ - { - 0x00000000UL, 0x77073096UL, 0xee0e612cUL, 0x990951baUL, 0x076dc419UL, - 0x706af48fUL, 0xe963a535UL, 0x9e6495a3UL, 0x0edb8832UL, 0x79dcb8a4UL, - 0xe0d5e91eUL, 0x97d2d988UL, 0x09b64c2bUL, 0x7eb17cbdUL, 0xe7b82d07UL, - 0x90bf1d91UL, 0x1db71064UL, 0x6ab020f2UL, 0xf3b97148UL, 0x84be41deUL, - 0x1adad47dUL, 0x6ddde4ebUL, 0xf4d4b551UL, 0x83d385c7UL, 0x136c9856UL, - 0x646ba8c0UL, 0xfd62f97aUL, 0x8a65c9ecUL, 0x14015c4fUL, 0x63066cd9UL, - 0xfa0f3d63UL, 0x8d080df5UL, 0x3b6e20c8UL, 0x4c69105eUL, 0xd56041e4UL, - 0xa2677172UL, 0x3c03e4d1UL, 0x4b04d447UL, 0xd20d85fdUL, 0xa50ab56bUL, - 0x35b5a8faUL, 0x42b2986cUL, 0xdbbbc9d6UL, 0xacbcf940UL, 0x32d86ce3UL, - 0x45df5c75UL, 0xdcd60dcfUL, 0xabd13d59UL, 0x26d930acUL, 0x51de003aUL, - 0xc8d75180UL, 0xbfd06116UL, 0x21b4f4b5UL, 0x56b3c423UL, 0xcfba9599UL, - 0xb8bda50fUL, 0x2802b89eUL, 0x5f058808UL, 0xc60cd9b2UL, 0xb10be924UL, - 0x2f6f7c87UL, 0x58684c11UL, 0xc1611dabUL, 0xb6662d3dUL, 0x76dc4190UL, - 0x01db7106UL, 0x98d220bcUL, 0xefd5102aUL, 0x71b18589UL, 0x06b6b51fUL, - 0x9fbfe4a5UL, 0xe8b8d433UL, 0x7807c9a2UL, 0x0f00f934UL, 0x9609a88eUL, - 0xe10e9818UL, 0x7f6a0dbbUL, 0x086d3d2dUL, 0x91646c97UL, 0xe6635c01UL, - 0x6b6b51f4UL, 0x1c6c6162UL, 0x856530d8UL, 0xf262004eUL, 0x6c0695edUL, - 0x1b01a57bUL, 0x8208f4c1UL, 0xf50fc457UL, 0x65b0d9c6UL, 0x12b7e950UL, - 0x8bbeb8eaUL, 0xfcb9887cUL, 0x62dd1ddfUL, 0x15da2d49UL, 0x8cd37cf3UL, - 0xfbd44c65UL, 0x4db26158UL, 0x3ab551ceUL, 0xa3bc0074UL, 0xd4bb30e2UL, - 0x4adfa541UL, 0x3dd895d7UL, 0xa4d1c46dUL, 0xd3d6f4fbUL, 0x4369e96aUL, - 0x346ed9fcUL, 0xad678846UL, 0xda60b8d0UL, 0x44042d73UL, 0x33031de5UL, - 0xaa0a4c5fUL, 0xdd0d7cc9UL, 0x5005713cUL, 0x270241aaUL, 0xbe0b1010UL, - 0xc90c2086UL, 0x5768b525UL, 0x206f85b3UL, 0xb966d409UL, 0xce61e49fUL, - 0x5edef90eUL, 0x29d9c998UL, 0xb0d09822UL, 0xc7d7a8b4UL, 0x59b33d17UL, - 0x2eb40d81UL, 0xb7bd5c3bUL, 0xc0ba6cadUL, 0xedb88320UL, 0x9abfb3b6UL, - 0x03b6e20cUL, 0x74b1d29aUL, 0xead54739UL, 0x9dd277afUL, 0x04db2615UL, - 0x73dc1683UL, 0xe3630b12UL, 0x94643b84UL, 0x0d6d6a3eUL, 0x7a6a5aa8UL, - 0xe40ecf0bUL, 0x9309ff9dUL, 0x0a00ae27UL, 0x7d079eb1UL, 0xf00f9344UL, - 0x8708a3d2UL, 0x1e01f268UL, 0x6906c2feUL, 0xf762575dUL, 0x806567cbUL, - 0x196c3671UL, 0x6e6b06e7UL, 0xfed41b76UL, 0x89d32be0UL, 0x10da7a5aUL, - 0x67dd4accUL, 0xf9b9df6fUL, 0x8ebeeff9UL, 0x17b7be43UL, 0x60b08ed5UL, - 0xd6d6a3e8UL, 0xa1d1937eUL, 0x38d8c2c4UL, 0x4fdff252UL, 0xd1bb67f1UL, - 0xa6bc5767UL, 0x3fb506ddUL, 0x48b2364bUL, 0xd80d2bdaUL, 0xaf0a1b4cUL, - 0x36034af6UL, 0x41047a60UL, 0xdf60efc3UL, 0xa867df55UL, 0x316e8eefUL, - 0x4669be79UL, 0xcb61b38cUL, 0xbc66831aUL, 0x256fd2a0UL, 0x5268e236UL, - 0xcc0c7795UL, 0xbb0b4703UL, 0x220216b9UL, 0x5505262fUL, 0xc5ba3bbeUL, - 0xb2bd0b28UL, 0x2bb45a92UL, 0x5cb36a04UL, 0xc2d7ffa7UL, 0xb5d0cf31UL, - 0x2cd99e8bUL, 0x5bdeae1dUL, 0x9b64c2b0UL, 0xec63f226UL, 0x756aa39cUL, - 0x026d930aUL, 0x9c0906a9UL, 0xeb0e363fUL, 0x72076785UL, 0x05005713UL, - 0x95bf4a82UL, 0xe2b87a14UL, 0x7bb12baeUL, 0x0cb61b38UL, 0x92d28e9bUL, - 0xe5d5be0dUL, 0x7cdcefb7UL, 0x0bdbdf21UL, 0x86d3d2d4UL, 0xf1d4e242UL, - 0x68ddb3f8UL, 0x1fda836eUL, 0x81be16cdUL, 0xf6b9265bUL, 0x6fb077e1UL, - 0x18b74777UL, 0x88085ae6UL, 0xff0f6a70UL, 0x66063bcaUL, 0x11010b5cUL, - 0x8f659effUL, 0xf862ae69UL, 0x616bffd3UL, 0x166ccf45UL, 0xa00ae278UL, - 0xd70dd2eeUL, 0x4e048354UL, 0x3903b3c2UL, 0xa7672661UL, 0xd06016f7UL, - 0x4969474dUL, 0x3e6e77dbUL, 0xaed16a4aUL, 0xd9d65adcUL, 0x40df0b66UL, - 0x37d83bf0UL, 0xa9bcae53UL, 0xdebb9ec5UL, 0x47b2cf7fUL, 0x30b5ffe9UL, - 0xbdbdf21cUL, 0xcabac28aUL, 0x53b39330UL, 0x24b4a3a6UL, 0xbad03605UL, - 0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL, - 0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL, - 0x2d02ef8dUL -#ifdef BYFOUR - }, - { - 0x00000000UL, 0x191b3141UL, 0x32366282UL, 0x2b2d53c3UL, 0x646cc504UL, - 0x7d77f445UL, 0x565aa786UL, 0x4f4196c7UL, 0xc8d98a08UL, 0xd1c2bb49UL, - 0xfaefe88aUL, 0xe3f4d9cbUL, 0xacb54f0cUL, 0xb5ae7e4dUL, 0x9e832d8eUL, - 0x87981ccfUL, 0x4ac21251UL, 0x53d92310UL, 0x78f470d3UL, 0x61ef4192UL, - 0x2eaed755UL, 0x37b5e614UL, 0x1c98b5d7UL, 0x05838496UL, 0x821b9859UL, - 0x9b00a918UL, 0xb02dfadbUL, 0xa936cb9aUL, 0xe6775d5dUL, 0xff6c6c1cUL, - 0xd4413fdfUL, 0xcd5a0e9eUL, 0x958424a2UL, 0x8c9f15e3UL, 0xa7b24620UL, - 0xbea97761UL, 0xf1e8e1a6UL, 0xe8f3d0e7UL, 0xc3de8324UL, 0xdac5b265UL, - 0x5d5daeaaUL, 0x44469febUL, 0x6f6bcc28UL, 0x7670fd69UL, 0x39316baeUL, - 0x202a5aefUL, 0x0b07092cUL, 0x121c386dUL, 0xdf4636f3UL, 0xc65d07b2UL, - 0xed705471UL, 0xf46b6530UL, 0xbb2af3f7UL, 0xa231c2b6UL, 0x891c9175UL, - 0x9007a034UL, 0x179fbcfbUL, 0x0e848dbaUL, 0x25a9de79UL, 0x3cb2ef38UL, - 0x73f379ffUL, 0x6ae848beUL, 0x41c51b7dUL, 0x58de2a3cUL, 0xf0794f05UL, - 0xe9627e44UL, 0xc24f2d87UL, 0xdb541cc6UL, 0x94158a01UL, 0x8d0ebb40UL, - 0xa623e883UL, 0xbf38d9c2UL, 0x38a0c50dUL, 0x21bbf44cUL, 0x0a96a78fUL, - 0x138d96ceUL, 0x5ccc0009UL, 0x45d73148UL, 0x6efa628bUL, 0x77e153caUL, - 0xbabb5d54UL, 0xa3a06c15UL, 0x888d3fd6UL, 0x91960e97UL, 0xded79850UL, - 0xc7cca911UL, 0xece1fad2UL, 0xf5facb93UL, 0x7262d75cUL, 0x6b79e61dUL, - 0x4054b5deUL, 0x594f849fUL, 0x160e1258UL, 0x0f152319UL, 0x243870daUL, - 0x3d23419bUL, 0x65fd6ba7UL, 0x7ce65ae6UL, 0x57cb0925UL, 0x4ed03864UL, - 0x0191aea3UL, 0x188a9fe2UL, 0x33a7cc21UL, 0x2abcfd60UL, 0xad24e1afUL, - 0xb43fd0eeUL, 0x9f12832dUL, 0x8609b26cUL, 0xc94824abUL, 0xd05315eaUL, - 0xfb7e4629UL, 0xe2657768UL, 0x2f3f79f6UL, 0x362448b7UL, 0x1d091b74UL, - 0x04122a35UL, 0x4b53bcf2UL, 0x52488db3UL, 0x7965de70UL, 0x607eef31UL, - 0xe7e6f3feUL, 0xfefdc2bfUL, 0xd5d0917cUL, 0xcccba03dUL, 0x838a36faUL, - 0x9a9107bbUL, 0xb1bc5478UL, 0xa8a76539UL, 0x3b83984bUL, 0x2298a90aUL, - 0x09b5fac9UL, 0x10aecb88UL, 0x5fef5d4fUL, 0x46f46c0eUL, 0x6dd93fcdUL, - 0x74c20e8cUL, 0xf35a1243UL, 0xea412302UL, 0xc16c70c1UL, 0xd8774180UL, - 0x9736d747UL, 0x8e2de606UL, 0xa500b5c5UL, 0xbc1b8484UL, 0x71418a1aUL, - 0x685abb5bUL, 0x4377e898UL, 0x5a6cd9d9UL, 0x152d4f1eUL, 0x0c367e5fUL, - 0x271b2d9cUL, 0x3e001cddUL, 0xb9980012UL, 0xa0833153UL, 0x8bae6290UL, - 0x92b553d1UL, 0xddf4c516UL, 0xc4eff457UL, 0xefc2a794UL, 0xf6d996d5UL, - 0xae07bce9UL, 0xb71c8da8UL, 0x9c31de6bUL, 0x852aef2aUL, 0xca6b79edUL, - 0xd37048acUL, 0xf85d1b6fUL, 0xe1462a2eUL, 0x66de36e1UL, 0x7fc507a0UL, - 0x54e85463UL, 0x4df36522UL, 0x02b2f3e5UL, 0x1ba9c2a4UL, 0x30849167UL, - 0x299fa026UL, 0xe4c5aeb8UL, 0xfdde9ff9UL, 0xd6f3cc3aUL, 0xcfe8fd7bUL, - 0x80a96bbcUL, 0x99b25afdUL, 0xb29f093eUL, 0xab84387fUL, 0x2c1c24b0UL, - 0x350715f1UL, 0x1e2a4632UL, 0x07317773UL, 0x4870e1b4UL, 0x516bd0f5UL, - 0x7a468336UL, 0x635db277UL, 0xcbfad74eUL, 0xd2e1e60fUL, 0xf9ccb5ccUL, - 0xe0d7848dUL, 0xaf96124aUL, 0xb68d230bUL, 0x9da070c8UL, 0x84bb4189UL, - 0x03235d46UL, 0x1a386c07UL, 0x31153fc4UL, 0x280e0e85UL, 0x674f9842UL, - 0x7e54a903UL, 0x5579fac0UL, 0x4c62cb81UL, 0x8138c51fUL, 0x9823f45eUL, - 0xb30ea79dUL, 0xaa1596dcUL, 0xe554001bUL, 0xfc4f315aUL, 0xd7626299UL, - 0xce7953d8UL, 0x49e14f17UL, 0x50fa7e56UL, 0x7bd72d95UL, 0x62cc1cd4UL, - 0x2d8d8a13UL, 0x3496bb52UL, 0x1fbbe891UL, 0x06a0d9d0UL, 0x5e7ef3ecUL, - 0x4765c2adUL, 0x6c48916eUL, 0x7553a02fUL, 0x3a1236e8UL, 0x230907a9UL, - 0x0824546aUL, 0x113f652bUL, 0x96a779e4UL, 0x8fbc48a5UL, 0xa4911b66UL, - 0xbd8a2a27UL, 0xf2cbbce0UL, 0xebd08da1UL, 0xc0fdde62UL, 0xd9e6ef23UL, - 0x14bce1bdUL, 0x0da7d0fcUL, 0x268a833fUL, 0x3f91b27eUL, 0x70d024b9UL, - 0x69cb15f8UL, 0x42e6463bUL, 0x5bfd777aUL, 0xdc656bb5UL, 0xc57e5af4UL, - 0xee530937UL, 0xf7483876UL, 0xb809aeb1UL, 0xa1129ff0UL, 0x8a3fcc33UL, - 0x9324fd72UL - }, - { - 0x00000000UL, 0x01c26a37UL, 0x0384d46eUL, 0x0246be59UL, 0x0709a8dcUL, - 0x06cbc2ebUL, 0x048d7cb2UL, 0x054f1685UL, 0x0e1351b8UL, 0x0fd13b8fUL, - 0x0d9785d6UL, 0x0c55efe1UL, 0x091af964UL, 0x08d89353UL, 0x0a9e2d0aUL, - 0x0b5c473dUL, 0x1c26a370UL, 0x1de4c947UL, 0x1fa2771eUL, 0x1e601d29UL, - 0x1b2f0bacUL, 0x1aed619bUL, 0x18abdfc2UL, 0x1969b5f5UL, 0x1235f2c8UL, - 0x13f798ffUL, 0x11b126a6UL, 0x10734c91UL, 0x153c5a14UL, 0x14fe3023UL, - 0x16b88e7aUL, 0x177ae44dUL, 0x384d46e0UL, 0x398f2cd7UL, 0x3bc9928eUL, - 0x3a0bf8b9UL, 0x3f44ee3cUL, 0x3e86840bUL, 0x3cc03a52UL, 0x3d025065UL, - 0x365e1758UL, 0x379c7d6fUL, 0x35dac336UL, 0x3418a901UL, 0x3157bf84UL, - 0x3095d5b3UL, 0x32d36beaUL, 0x331101ddUL, 0x246be590UL, 0x25a98fa7UL, - 0x27ef31feUL, 0x262d5bc9UL, 0x23624d4cUL, 0x22a0277bUL, 0x20e69922UL, - 0x2124f315UL, 0x2a78b428UL, 0x2bbade1fUL, 0x29fc6046UL, 0x283e0a71UL, - 0x2d711cf4UL, 0x2cb376c3UL, 0x2ef5c89aUL, 0x2f37a2adUL, 0x709a8dc0UL, - 0x7158e7f7UL, 0x731e59aeUL, 0x72dc3399UL, 0x7793251cUL, 0x76514f2bUL, - 0x7417f172UL, 0x75d59b45UL, 0x7e89dc78UL, 0x7f4bb64fUL, 0x7d0d0816UL, - 0x7ccf6221UL, 0x798074a4UL, 0x78421e93UL, 0x7a04a0caUL, 0x7bc6cafdUL, - 0x6cbc2eb0UL, 0x6d7e4487UL, 0x6f38fadeUL, 0x6efa90e9UL, 0x6bb5866cUL, - 0x6a77ec5bUL, 0x68315202UL, 0x69f33835UL, 0x62af7f08UL, 0x636d153fUL, - 0x612bab66UL, 0x60e9c151UL, 0x65a6d7d4UL, 0x6464bde3UL, 0x662203baUL, - 0x67e0698dUL, 0x48d7cb20UL, 0x4915a117UL, 0x4b531f4eUL, 0x4a917579UL, - 0x4fde63fcUL, 0x4e1c09cbUL, 0x4c5ab792UL, 0x4d98dda5UL, 0x46c49a98UL, - 0x4706f0afUL, 0x45404ef6UL, 0x448224c1UL, 0x41cd3244UL, 0x400f5873UL, - 0x4249e62aUL, 0x438b8c1dUL, 0x54f16850UL, 0x55330267UL, 0x5775bc3eUL, - 0x56b7d609UL, 0x53f8c08cUL, 0x523aaabbUL, 0x507c14e2UL, 0x51be7ed5UL, - 0x5ae239e8UL, 0x5b2053dfUL, 0x5966ed86UL, 0x58a487b1UL, 0x5deb9134UL, - 0x5c29fb03UL, 0x5e6f455aUL, 0x5fad2f6dUL, 0xe1351b80UL, 0xe0f771b7UL, - 0xe2b1cfeeUL, 0xe373a5d9UL, 0xe63cb35cUL, 0xe7fed96bUL, 0xe5b86732UL, - 0xe47a0d05UL, 0xef264a38UL, 0xeee4200fUL, 0xeca29e56UL, 0xed60f461UL, - 0xe82fe2e4UL, 0xe9ed88d3UL, 0xebab368aUL, 0xea695cbdUL, 0xfd13b8f0UL, - 0xfcd1d2c7UL, 0xfe976c9eUL, 0xff5506a9UL, 0xfa1a102cUL, 0xfbd87a1bUL, - 0xf99ec442UL, 0xf85cae75UL, 0xf300e948UL, 0xf2c2837fUL, 0xf0843d26UL, - 0xf1465711UL, 0xf4094194UL, 0xf5cb2ba3UL, 0xf78d95faUL, 0xf64fffcdUL, - 0xd9785d60UL, 0xd8ba3757UL, 0xdafc890eUL, 0xdb3ee339UL, 0xde71f5bcUL, - 0xdfb39f8bUL, 0xddf521d2UL, 0xdc374be5UL, 0xd76b0cd8UL, 0xd6a966efUL, - 0xd4efd8b6UL, 0xd52db281UL, 0xd062a404UL, 0xd1a0ce33UL, 0xd3e6706aUL, - 0xd2241a5dUL, 0xc55efe10UL, 0xc49c9427UL, 0xc6da2a7eUL, 0xc7184049UL, - 0xc25756ccUL, 0xc3953cfbUL, 0xc1d382a2UL, 0xc011e895UL, 0xcb4dafa8UL, - 0xca8fc59fUL, 0xc8c97bc6UL, 0xc90b11f1UL, 0xcc440774UL, 0xcd866d43UL, - 0xcfc0d31aUL, 0xce02b92dUL, 0x91af9640UL, 0x906dfc77UL, 0x922b422eUL, - 0x93e92819UL, 0x96a63e9cUL, 0x976454abUL, 0x9522eaf2UL, 0x94e080c5UL, - 0x9fbcc7f8UL, 0x9e7eadcfUL, 0x9c381396UL, 0x9dfa79a1UL, 0x98b56f24UL, - 0x99770513UL, 0x9b31bb4aUL, 0x9af3d17dUL, 0x8d893530UL, 0x8c4b5f07UL, - 0x8e0de15eUL, 0x8fcf8b69UL, 0x8a809decUL, 0x8b42f7dbUL, 0x89044982UL, - 0x88c623b5UL, 0x839a6488UL, 0x82580ebfUL, 0x801eb0e6UL, 0x81dcdad1UL, - 0x8493cc54UL, 0x8551a663UL, 0x8717183aUL, 0x86d5720dUL, 0xa9e2d0a0UL, - 0xa820ba97UL, 0xaa6604ceUL, 0xaba46ef9UL, 0xaeeb787cUL, 0xaf29124bUL, - 0xad6fac12UL, 0xacadc625UL, 0xa7f18118UL, 0xa633eb2fUL, 0xa4755576UL, - 0xa5b73f41UL, 0xa0f829c4UL, 0xa13a43f3UL, 0xa37cfdaaUL, 0xa2be979dUL, - 0xb5c473d0UL, 0xb40619e7UL, 0xb640a7beUL, 0xb782cd89UL, 0xb2cddb0cUL, - 0xb30fb13bUL, 0xb1490f62UL, 0xb08b6555UL, 0xbbd72268UL, 0xba15485fUL, - 0xb853f606UL, 0xb9919c31UL, 0xbcde8ab4UL, 0xbd1ce083UL, 0xbf5a5edaUL, - 0xbe9834edUL - }, - { - 0x00000000UL, 0xb8bc6765UL, 0xaa09c88bUL, 0x12b5afeeUL, 0x8f629757UL, - 0x37def032UL, 0x256b5fdcUL, 0x9dd738b9UL, 0xc5b428efUL, 0x7d084f8aUL, - 0x6fbde064UL, 0xd7018701UL, 0x4ad6bfb8UL, 0xf26ad8ddUL, 0xe0df7733UL, - 0x58631056UL, 0x5019579fUL, 0xe8a530faUL, 0xfa109f14UL, 0x42acf871UL, - 0xdf7bc0c8UL, 0x67c7a7adUL, 0x75720843UL, 0xcdce6f26UL, 0x95ad7f70UL, - 0x2d111815UL, 0x3fa4b7fbUL, 0x8718d09eUL, 0x1acfe827UL, 0xa2738f42UL, - 0xb0c620acUL, 0x087a47c9UL, 0xa032af3eUL, 0x188ec85bUL, 0x0a3b67b5UL, - 0xb28700d0UL, 0x2f503869UL, 0x97ec5f0cUL, 0x8559f0e2UL, 0x3de59787UL, - 0x658687d1UL, 0xdd3ae0b4UL, 0xcf8f4f5aUL, 0x7733283fUL, 0xeae41086UL, - 0x525877e3UL, 0x40edd80dUL, 0xf851bf68UL, 0xf02bf8a1UL, 0x48979fc4UL, - 0x5a22302aUL, 0xe29e574fUL, 0x7f496ff6UL, 0xc7f50893UL, 0xd540a77dUL, - 0x6dfcc018UL, 0x359fd04eUL, 0x8d23b72bUL, 0x9f9618c5UL, 0x272a7fa0UL, - 0xbafd4719UL, 0x0241207cUL, 0x10f48f92UL, 0xa848e8f7UL, 0x9b14583dUL, - 0x23a83f58UL, 0x311d90b6UL, 0x89a1f7d3UL, 0x1476cf6aUL, 0xaccaa80fUL, - 0xbe7f07e1UL, 0x06c36084UL, 0x5ea070d2UL, 0xe61c17b7UL, 0xf4a9b859UL, - 0x4c15df3cUL, 0xd1c2e785UL, 0x697e80e0UL, 0x7bcb2f0eUL, 0xc377486bUL, - 0xcb0d0fa2UL, 0x73b168c7UL, 0x6104c729UL, 0xd9b8a04cUL, 0x446f98f5UL, - 0xfcd3ff90UL, 0xee66507eUL, 0x56da371bUL, 0x0eb9274dUL, 0xb6054028UL, - 0xa4b0efc6UL, 0x1c0c88a3UL, 0x81dbb01aUL, 0x3967d77fUL, 0x2bd27891UL, - 0x936e1ff4UL, 0x3b26f703UL, 0x839a9066UL, 0x912f3f88UL, 0x299358edUL, - 0xb4446054UL, 0x0cf80731UL, 0x1e4da8dfUL, 0xa6f1cfbaUL, 0xfe92dfecUL, - 0x462eb889UL, 0x549b1767UL, 0xec277002UL, 0x71f048bbUL, 0xc94c2fdeUL, - 0xdbf98030UL, 0x6345e755UL, 0x6b3fa09cUL, 0xd383c7f9UL, 0xc1366817UL, - 0x798a0f72UL, 0xe45d37cbUL, 0x5ce150aeUL, 0x4e54ff40UL, 0xf6e89825UL, - 0xae8b8873UL, 0x1637ef16UL, 0x048240f8UL, 0xbc3e279dUL, 0x21e91f24UL, - 0x99557841UL, 0x8be0d7afUL, 0x335cb0caUL, 0xed59b63bUL, 0x55e5d15eUL, - 0x47507eb0UL, 0xffec19d5UL, 0x623b216cUL, 0xda874609UL, 0xc832e9e7UL, - 0x708e8e82UL, 0x28ed9ed4UL, 0x9051f9b1UL, 0x82e4565fUL, 0x3a58313aUL, - 0xa78f0983UL, 0x1f336ee6UL, 0x0d86c108UL, 0xb53aa66dUL, 0xbd40e1a4UL, - 0x05fc86c1UL, 0x1749292fUL, 0xaff54e4aUL, 0x322276f3UL, 0x8a9e1196UL, - 0x982bbe78UL, 0x2097d91dUL, 0x78f4c94bUL, 0xc048ae2eUL, 0xd2fd01c0UL, - 0x6a4166a5UL, 0xf7965e1cUL, 0x4f2a3979UL, 0x5d9f9697UL, 0xe523f1f2UL, - 0x4d6b1905UL, 0xf5d77e60UL, 0xe762d18eUL, 0x5fdeb6ebUL, 0xc2098e52UL, - 0x7ab5e937UL, 0x680046d9UL, 0xd0bc21bcUL, 0x88df31eaUL, 0x3063568fUL, - 0x22d6f961UL, 0x9a6a9e04UL, 0x07bda6bdUL, 0xbf01c1d8UL, 0xadb46e36UL, - 0x15080953UL, 0x1d724e9aUL, 0xa5ce29ffUL, 0xb77b8611UL, 0x0fc7e174UL, - 0x9210d9cdUL, 0x2aacbea8UL, 0x38191146UL, 0x80a57623UL, 0xd8c66675UL, - 0x607a0110UL, 0x72cfaefeUL, 0xca73c99bUL, 0x57a4f122UL, 0xef189647UL, - 0xfdad39a9UL, 0x45115eccUL, 0x764dee06UL, 0xcef18963UL, 0xdc44268dUL, - 0x64f841e8UL, 0xf92f7951UL, 0x41931e34UL, 0x5326b1daUL, 0xeb9ad6bfUL, - 0xb3f9c6e9UL, 0x0b45a18cUL, 0x19f00e62UL, 0xa14c6907UL, 0x3c9b51beUL, - 0x842736dbUL, 0x96929935UL, 0x2e2efe50UL, 0x2654b999UL, 0x9ee8defcUL, - 0x8c5d7112UL, 0x34e11677UL, 0xa9362eceUL, 0x118a49abUL, 0x033fe645UL, - 0xbb838120UL, 0xe3e09176UL, 0x5b5cf613UL, 0x49e959fdUL, 0xf1553e98UL, - 0x6c820621UL, 0xd43e6144UL, 0xc68bceaaUL, 0x7e37a9cfUL, 0xd67f4138UL, - 0x6ec3265dUL, 0x7c7689b3UL, 0xc4caeed6UL, 0x591dd66fUL, 0xe1a1b10aUL, - 0xf3141ee4UL, 0x4ba87981UL, 0x13cb69d7UL, 0xab770eb2UL, 0xb9c2a15cUL, - 0x017ec639UL, 0x9ca9fe80UL, 0x241599e5UL, 0x36a0360bUL, 0x8e1c516eUL, - 0x866616a7UL, 0x3eda71c2UL, 0x2c6fde2cUL, 0x94d3b949UL, 0x090481f0UL, - 0xb1b8e695UL, 0xa30d497bUL, 0x1bb12e1eUL, 0x43d23e48UL, 0xfb6e592dUL, - 0xe9dbf6c3UL, 0x516791a6UL, 0xccb0a91fUL, 0x740cce7aUL, 0x66b96194UL, - 0xde0506f1UL - }, - { - 0x00000000UL, 0x96300777UL, 0x2c610eeeUL, 0xba510999UL, 0x19c46d07UL, - 0x8ff46a70UL, 0x35a563e9UL, 0xa395649eUL, 0x3288db0eUL, 0xa4b8dc79UL, - 0x1ee9d5e0UL, 0x88d9d297UL, 0x2b4cb609UL, 0xbd7cb17eUL, 0x072db8e7UL, - 0x911dbf90UL, 0x6410b71dUL, 0xf220b06aUL, 0x4871b9f3UL, 0xde41be84UL, - 0x7dd4da1aUL, 0xebe4dd6dUL, 0x51b5d4f4UL, 0xc785d383UL, 0x56986c13UL, - 0xc0a86b64UL, 0x7af962fdUL, 0xecc9658aUL, 0x4f5c0114UL, 0xd96c0663UL, - 0x633d0ffaUL, 0xf50d088dUL, 0xc8206e3bUL, 0x5e10694cUL, 0xe44160d5UL, - 0x727167a2UL, 0xd1e4033cUL, 0x47d4044bUL, 0xfd850dd2UL, 0x6bb50aa5UL, - 0xfaa8b535UL, 0x6c98b242UL, 0xd6c9bbdbUL, 0x40f9bcacUL, 0xe36cd832UL, - 0x755cdf45UL, 0xcf0dd6dcUL, 0x593dd1abUL, 0xac30d926UL, 0x3a00de51UL, - 0x8051d7c8UL, 0x1661d0bfUL, 0xb5f4b421UL, 0x23c4b356UL, 0x9995bacfUL, - 0x0fa5bdb8UL, 0x9eb80228UL, 0x0888055fUL, 0xb2d90cc6UL, 0x24e90bb1UL, - 0x877c6f2fUL, 0x114c6858UL, 0xab1d61c1UL, 0x3d2d66b6UL, 0x9041dc76UL, - 0x0671db01UL, 0xbc20d298UL, 0x2a10d5efUL, 0x8985b171UL, 0x1fb5b606UL, - 0xa5e4bf9fUL, 0x33d4b8e8UL, 0xa2c90778UL, 0x34f9000fUL, 0x8ea80996UL, - 0x18980ee1UL, 0xbb0d6a7fUL, 0x2d3d6d08UL, 0x976c6491UL, 0x015c63e6UL, - 0xf4516b6bUL, 0x62616c1cUL, 0xd8306585UL, 0x4e0062f2UL, 0xed95066cUL, - 0x7ba5011bUL, 0xc1f40882UL, 0x57c40ff5UL, 0xc6d9b065UL, 0x50e9b712UL, - 0xeab8be8bUL, 0x7c88b9fcUL, 0xdf1ddd62UL, 0x492dda15UL, 0xf37cd38cUL, - 0x654cd4fbUL, 0x5861b24dUL, 0xce51b53aUL, 0x7400bca3UL, 0xe230bbd4UL, - 0x41a5df4aUL, 0xd795d83dUL, 0x6dc4d1a4UL, 0xfbf4d6d3UL, 0x6ae96943UL, - 0xfcd96e34UL, 0x468867adUL, 0xd0b860daUL, 0x732d0444UL, 0xe51d0333UL, - 0x5f4c0aaaUL, 0xc97c0dddUL, 0x3c710550UL, 0xaa410227UL, 0x10100bbeUL, - 0x86200cc9UL, 0x25b56857UL, 0xb3856f20UL, 0x09d466b9UL, 0x9fe461ceUL, - 0x0ef9de5eUL, 0x98c9d929UL, 0x2298d0b0UL, 0xb4a8d7c7UL, 0x173db359UL, - 0x810db42eUL, 0x3b5cbdb7UL, 0xad6cbac0UL, 0x2083b8edUL, 0xb6b3bf9aUL, - 0x0ce2b603UL, 0x9ad2b174UL, 0x3947d5eaUL, 0xaf77d29dUL, 0x1526db04UL, - 0x8316dc73UL, 0x120b63e3UL, 0x843b6494UL, 0x3e6a6d0dUL, 0xa85a6a7aUL, - 0x0bcf0ee4UL, 0x9dff0993UL, 0x27ae000aUL, 0xb19e077dUL, 0x44930ff0UL, - 0xd2a30887UL, 0x68f2011eUL, 0xfec20669UL, 0x5d5762f7UL, 0xcb676580UL, - 0x71366c19UL, 0xe7066b6eUL, 0x761bd4feUL, 0xe02bd389UL, 0x5a7ada10UL, - 0xcc4add67UL, 0x6fdfb9f9UL, 0xf9efbe8eUL, 0x43beb717UL, 0xd58eb060UL, - 0xe8a3d6d6UL, 0x7e93d1a1UL, 0xc4c2d838UL, 0x52f2df4fUL, 0xf167bbd1UL, - 0x6757bca6UL, 0xdd06b53fUL, 0x4b36b248UL, 0xda2b0dd8UL, 0x4c1b0aafUL, - 0xf64a0336UL, 0x607a0441UL, 0xc3ef60dfUL, 0x55df67a8UL, 0xef8e6e31UL, - 0x79be6946UL, 0x8cb361cbUL, 0x1a8366bcUL, 0xa0d26f25UL, 0x36e26852UL, - 0x95770cccUL, 0x03470bbbUL, 0xb9160222UL, 0x2f260555UL, 0xbe3bbac5UL, - 0x280bbdb2UL, 0x925ab42bUL, 0x046ab35cUL, 0xa7ffd7c2UL, 0x31cfd0b5UL, - 0x8b9ed92cUL, 0x1daede5bUL, 0xb0c2649bUL, 0x26f263ecUL, 0x9ca36a75UL, - 0x0a936d02UL, 0xa906099cUL, 0x3f360eebUL, 0x85670772UL, 0x13570005UL, - 0x824abf95UL, 0x147ab8e2UL, 0xae2bb17bUL, 0x381bb60cUL, 0x9b8ed292UL, - 0x0dbed5e5UL, 0xb7efdc7cUL, 0x21dfdb0bUL, 0xd4d2d386UL, 0x42e2d4f1UL, - 0xf8b3dd68UL, 0x6e83da1fUL, 0xcd16be81UL, 0x5b26b9f6UL, 0xe177b06fUL, - 0x7747b718UL, 0xe65a0888UL, 0x706a0fffUL, 0xca3b0666UL, 0x5c0b0111UL, - 0xff9e658fUL, 0x69ae62f8UL, 0xd3ff6b61UL, 0x45cf6c16UL, 0x78e20aa0UL, - 0xeed20dd7UL, 0x5483044eUL, 0xc2b30339UL, 0x612667a7UL, 0xf71660d0UL, - 0x4d476949UL, 0xdb776e3eUL, 0x4a6ad1aeUL, 0xdc5ad6d9UL, 0x660bdf40UL, - 0xf03bd837UL, 0x53aebca9UL, 0xc59ebbdeUL, 0x7fcfb247UL, 0xe9ffb530UL, - 0x1cf2bdbdUL, 0x8ac2bacaUL, 0x3093b353UL, 0xa6a3b424UL, 0x0536d0baUL, - 0x9306d7cdUL, 0x2957de54UL, 0xbf67d923UL, 0x2e7a66b3UL, 0xb84a61c4UL, - 0x021b685dUL, 0x942b6f2aUL, 0x37be0bb4UL, 0xa18e0cc3UL, 0x1bdf055aUL, - 0x8def022dUL - }, - { - 0x00000000UL, 0x41311b19UL, 0x82623632UL, 0xc3532d2bUL, 0x04c56c64UL, - 0x45f4777dUL, 0x86a75a56UL, 0xc796414fUL, 0x088ad9c8UL, 0x49bbc2d1UL, - 0x8ae8effaUL, 0xcbd9f4e3UL, 0x0c4fb5acUL, 0x4d7eaeb5UL, 0x8e2d839eUL, - 0xcf1c9887UL, 0x5112c24aUL, 0x1023d953UL, 0xd370f478UL, 0x9241ef61UL, - 0x55d7ae2eUL, 0x14e6b537UL, 0xd7b5981cUL, 0x96848305UL, 0x59981b82UL, - 0x18a9009bUL, 0xdbfa2db0UL, 0x9acb36a9UL, 0x5d5d77e6UL, 0x1c6c6cffUL, - 0xdf3f41d4UL, 0x9e0e5acdUL, 0xa2248495UL, 0xe3159f8cUL, 0x2046b2a7UL, - 0x6177a9beUL, 0xa6e1e8f1UL, 0xe7d0f3e8UL, 0x2483dec3UL, 0x65b2c5daUL, - 0xaaae5d5dUL, 0xeb9f4644UL, 0x28cc6b6fUL, 0x69fd7076UL, 0xae6b3139UL, - 0xef5a2a20UL, 0x2c09070bUL, 0x6d381c12UL, 0xf33646dfUL, 0xb2075dc6UL, - 0x715470edUL, 0x30656bf4UL, 0xf7f32abbUL, 0xb6c231a2UL, 0x75911c89UL, - 0x34a00790UL, 0xfbbc9f17UL, 0xba8d840eUL, 0x79dea925UL, 0x38efb23cUL, - 0xff79f373UL, 0xbe48e86aUL, 0x7d1bc541UL, 0x3c2ade58UL, 0x054f79f0UL, - 0x447e62e9UL, 0x872d4fc2UL, 0xc61c54dbUL, 0x018a1594UL, 0x40bb0e8dUL, - 0x83e823a6UL, 0xc2d938bfUL, 0x0dc5a038UL, 0x4cf4bb21UL, 0x8fa7960aUL, - 0xce968d13UL, 0x0900cc5cUL, 0x4831d745UL, 0x8b62fa6eUL, 0xca53e177UL, - 0x545dbbbaUL, 0x156ca0a3UL, 0xd63f8d88UL, 0x970e9691UL, 0x5098d7deUL, - 0x11a9ccc7UL, 0xd2fae1ecUL, 0x93cbfaf5UL, 0x5cd76272UL, 0x1de6796bUL, - 0xdeb55440UL, 0x9f844f59UL, 0x58120e16UL, 0x1923150fUL, 0xda703824UL, - 0x9b41233dUL, 0xa76bfd65UL, 0xe65ae67cUL, 0x2509cb57UL, 0x6438d04eUL, - 0xa3ae9101UL, 0xe29f8a18UL, 0x21cca733UL, 0x60fdbc2aUL, 0xafe124adUL, - 0xeed03fb4UL, 0x2d83129fUL, 0x6cb20986UL, 0xab2448c9UL, 0xea1553d0UL, - 0x29467efbUL, 0x687765e2UL, 0xf6793f2fUL, 0xb7482436UL, 0x741b091dUL, - 0x352a1204UL, 0xf2bc534bUL, 0xb38d4852UL, 0x70de6579UL, 0x31ef7e60UL, - 0xfef3e6e7UL, 0xbfc2fdfeUL, 0x7c91d0d5UL, 0x3da0cbccUL, 0xfa368a83UL, - 0xbb07919aUL, 0x7854bcb1UL, 0x3965a7a8UL, 0x4b98833bUL, 0x0aa99822UL, - 0xc9fab509UL, 0x88cbae10UL, 0x4f5def5fUL, 0x0e6cf446UL, 0xcd3fd96dUL, - 0x8c0ec274UL, 0x43125af3UL, 0x022341eaUL, 0xc1706cc1UL, 0x804177d8UL, - 0x47d73697UL, 0x06e62d8eUL, 0xc5b500a5UL, 0x84841bbcUL, 0x1a8a4171UL, - 0x5bbb5a68UL, 0x98e87743UL, 0xd9d96c5aUL, 0x1e4f2d15UL, 0x5f7e360cUL, - 0x9c2d1b27UL, 0xdd1c003eUL, 0x120098b9UL, 0x533183a0UL, 0x9062ae8bUL, - 0xd153b592UL, 0x16c5f4ddUL, 0x57f4efc4UL, 0x94a7c2efUL, 0xd596d9f6UL, - 0xe9bc07aeUL, 0xa88d1cb7UL, 0x6bde319cUL, 0x2aef2a85UL, 0xed796bcaUL, - 0xac4870d3UL, 0x6f1b5df8UL, 0x2e2a46e1UL, 0xe136de66UL, 0xa007c57fUL, - 0x6354e854UL, 0x2265f34dUL, 0xe5f3b202UL, 0xa4c2a91bUL, 0x67918430UL, - 0x26a09f29UL, 0xb8aec5e4UL, 0xf99fdefdUL, 0x3accf3d6UL, 0x7bfde8cfUL, - 0xbc6ba980UL, 0xfd5ab299UL, 0x3e099fb2UL, 0x7f3884abUL, 0xb0241c2cUL, - 0xf1150735UL, 0x32462a1eUL, 0x73773107UL, 0xb4e17048UL, 0xf5d06b51UL, - 0x3683467aUL, 0x77b25d63UL, 0x4ed7facbUL, 0x0fe6e1d2UL, 0xccb5ccf9UL, - 0x8d84d7e0UL, 0x4a1296afUL, 0x0b238db6UL, 0xc870a09dUL, 0x8941bb84UL, - 0x465d2303UL, 0x076c381aUL, 0xc43f1531UL, 0x850e0e28UL, 0x42984f67UL, - 0x03a9547eUL, 0xc0fa7955UL, 0x81cb624cUL, 0x1fc53881UL, 0x5ef42398UL, - 0x9da70eb3UL, 0xdc9615aaUL, 0x1b0054e5UL, 0x5a314ffcUL, 0x996262d7UL, - 0xd85379ceUL, 0x174fe149UL, 0x567efa50UL, 0x952dd77bUL, 0xd41ccc62UL, - 0x138a8d2dUL, 0x52bb9634UL, 0x91e8bb1fUL, 0xd0d9a006UL, 0xecf37e5eUL, - 0xadc26547UL, 0x6e91486cUL, 0x2fa05375UL, 0xe836123aUL, 0xa9070923UL, - 0x6a542408UL, 0x2b653f11UL, 0xe479a796UL, 0xa548bc8fUL, 0x661b91a4UL, - 0x272a8abdUL, 0xe0bccbf2UL, 0xa18dd0ebUL, 0x62defdc0UL, 0x23efe6d9UL, - 0xbde1bc14UL, 0xfcd0a70dUL, 0x3f838a26UL, 0x7eb2913fUL, 0xb924d070UL, - 0xf815cb69UL, 0x3b46e642UL, 0x7a77fd5bUL, 0xb56b65dcUL, 0xf45a7ec5UL, - 0x370953eeUL, 0x763848f7UL, 0xb1ae09b8UL, 0xf09f12a1UL, 0x33cc3f8aUL, - 0x72fd2493UL - }, - { - 0x00000000UL, 0x376ac201UL, 0x6ed48403UL, 0x59be4602UL, 0xdca80907UL, - 0xebc2cb06UL, 0xb27c8d04UL, 0x85164f05UL, 0xb851130eUL, 0x8f3bd10fUL, - 0xd685970dUL, 0xe1ef550cUL, 0x64f91a09UL, 0x5393d808UL, 0x0a2d9e0aUL, - 0x3d475c0bUL, 0x70a3261cUL, 0x47c9e41dUL, 0x1e77a21fUL, 0x291d601eUL, - 0xac0b2f1bUL, 0x9b61ed1aUL, 0xc2dfab18UL, 0xf5b56919UL, 0xc8f23512UL, - 0xff98f713UL, 0xa626b111UL, 0x914c7310UL, 0x145a3c15UL, 0x2330fe14UL, - 0x7a8eb816UL, 0x4de47a17UL, 0xe0464d38UL, 0xd72c8f39UL, 0x8e92c93bUL, - 0xb9f80b3aUL, 0x3cee443fUL, 0x0b84863eUL, 0x523ac03cUL, 0x6550023dUL, - 0x58175e36UL, 0x6f7d9c37UL, 0x36c3da35UL, 0x01a91834UL, 0x84bf5731UL, - 0xb3d59530UL, 0xea6bd332UL, 0xdd011133UL, 0x90e56b24UL, 0xa78fa925UL, - 0xfe31ef27UL, 0xc95b2d26UL, 0x4c4d6223UL, 0x7b27a022UL, 0x2299e620UL, - 0x15f32421UL, 0x28b4782aUL, 0x1fdeba2bUL, 0x4660fc29UL, 0x710a3e28UL, - 0xf41c712dUL, 0xc376b32cUL, 0x9ac8f52eUL, 0xada2372fUL, 0xc08d9a70UL, - 0xf7e75871UL, 0xae591e73UL, 0x9933dc72UL, 0x1c259377UL, 0x2b4f5176UL, - 0x72f11774UL, 0x459bd575UL, 0x78dc897eUL, 0x4fb64b7fUL, 0x16080d7dUL, - 0x2162cf7cUL, 0xa4748079UL, 0x931e4278UL, 0xcaa0047aUL, 0xfdcac67bUL, - 0xb02ebc6cUL, 0x87447e6dUL, 0xdefa386fUL, 0xe990fa6eUL, 0x6c86b56bUL, - 0x5bec776aUL, 0x02523168UL, 0x3538f369UL, 0x087faf62UL, 0x3f156d63UL, - 0x66ab2b61UL, 0x51c1e960UL, 0xd4d7a665UL, 0xe3bd6464UL, 0xba032266UL, - 0x8d69e067UL, 0x20cbd748UL, 0x17a11549UL, 0x4e1f534bUL, 0x7975914aUL, - 0xfc63de4fUL, 0xcb091c4eUL, 0x92b75a4cUL, 0xa5dd984dUL, 0x989ac446UL, - 0xaff00647UL, 0xf64e4045UL, 0xc1248244UL, 0x4432cd41UL, 0x73580f40UL, - 0x2ae64942UL, 0x1d8c8b43UL, 0x5068f154UL, 0x67023355UL, 0x3ebc7557UL, - 0x09d6b756UL, 0x8cc0f853UL, 0xbbaa3a52UL, 0xe2147c50UL, 0xd57ebe51UL, - 0xe839e25aUL, 0xdf53205bUL, 0x86ed6659UL, 0xb187a458UL, 0x3491eb5dUL, - 0x03fb295cUL, 0x5a456f5eUL, 0x6d2fad5fUL, 0x801b35e1UL, 0xb771f7e0UL, - 0xeecfb1e2UL, 0xd9a573e3UL, 0x5cb33ce6UL, 0x6bd9fee7UL, 0x3267b8e5UL, - 0x050d7ae4UL, 0x384a26efUL, 0x0f20e4eeUL, 0x569ea2ecUL, 0x61f460edUL, - 0xe4e22fe8UL, 0xd388ede9UL, 0x8a36abebUL, 0xbd5c69eaUL, 0xf0b813fdUL, - 0xc7d2d1fcUL, 0x9e6c97feUL, 0xa90655ffUL, 0x2c101afaUL, 0x1b7ad8fbUL, - 0x42c49ef9UL, 0x75ae5cf8UL, 0x48e900f3UL, 0x7f83c2f2UL, 0x263d84f0UL, - 0x115746f1UL, 0x944109f4UL, 0xa32bcbf5UL, 0xfa958df7UL, 0xcdff4ff6UL, - 0x605d78d9UL, 0x5737bad8UL, 0x0e89fcdaUL, 0x39e33edbUL, 0xbcf571deUL, - 0x8b9fb3dfUL, 0xd221f5ddUL, 0xe54b37dcUL, 0xd80c6bd7UL, 0xef66a9d6UL, - 0xb6d8efd4UL, 0x81b22dd5UL, 0x04a462d0UL, 0x33cea0d1UL, 0x6a70e6d3UL, - 0x5d1a24d2UL, 0x10fe5ec5UL, 0x27949cc4UL, 0x7e2adac6UL, 0x494018c7UL, - 0xcc5657c2UL, 0xfb3c95c3UL, 0xa282d3c1UL, 0x95e811c0UL, 0xa8af4dcbUL, - 0x9fc58fcaUL, 0xc67bc9c8UL, 0xf1110bc9UL, 0x740744ccUL, 0x436d86cdUL, - 0x1ad3c0cfUL, 0x2db902ceUL, 0x4096af91UL, 0x77fc6d90UL, 0x2e422b92UL, - 0x1928e993UL, 0x9c3ea696UL, 0xab546497UL, 0xf2ea2295UL, 0xc580e094UL, - 0xf8c7bc9fUL, 0xcfad7e9eUL, 0x9613389cUL, 0xa179fa9dUL, 0x246fb598UL, - 0x13057799UL, 0x4abb319bUL, 0x7dd1f39aUL, 0x3035898dUL, 0x075f4b8cUL, - 0x5ee10d8eUL, 0x698bcf8fUL, 0xec9d808aUL, 0xdbf7428bUL, 0x82490489UL, - 0xb523c688UL, 0x88649a83UL, 0xbf0e5882UL, 0xe6b01e80UL, 0xd1dadc81UL, - 0x54cc9384UL, 0x63a65185UL, 0x3a181787UL, 0x0d72d586UL, 0xa0d0e2a9UL, - 0x97ba20a8UL, 0xce0466aaUL, 0xf96ea4abUL, 0x7c78ebaeUL, 0x4b1229afUL, - 0x12ac6fadUL, 0x25c6adacUL, 0x1881f1a7UL, 0x2feb33a6UL, 0x765575a4UL, - 0x413fb7a5UL, 0xc429f8a0UL, 0xf3433aa1UL, 0xaafd7ca3UL, 0x9d97bea2UL, - 0xd073c4b5UL, 0xe71906b4UL, 0xbea740b6UL, 0x89cd82b7UL, 0x0cdbcdb2UL, - 0x3bb10fb3UL, 0x620f49b1UL, 0x55658bb0UL, 0x6822d7bbUL, 0x5f4815baUL, - 0x06f653b8UL, 0x319c91b9UL, 0xb48adebcUL, 0x83e01cbdUL, 0xda5e5abfUL, - 0xed3498beUL - }, - { - 0x00000000UL, 0x6567bcb8UL, 0x8bc809aaUL, 0xeeafb512UL, 0x5797628fUL, - 0x32f0de37UL, 0xdc5f6b25UL, 0xb938d79dUL, 0xef28b4c5UL, 0x8a4f087dUL, - 0x64e0bd6fUL, 0x018701d7UL, 0xb8bfd64aUL, 0xddd86af2UL, 0x3377dfe0UL, - 0x56106358UL, 0x9f571950UL, 0xfa30a5e8UL, 0x149f10faUL, 0x71f8ac42UL, - 0xc8c07bdfUL, 0xada7c767UL, 0x43087275UL, 0x266fcecdUL, 0x707fad95UL, - 0x1518112dUL, 0xfbb7a43fUL, 0x9ed01887UL, 0x27e8cf1aUL, 0x428f73a2UL, - 0xac20c6b0UL, 0xc9477a08UL, 0x3eaf32a0UL, 0x5bc88e18UL, 0xb5673b0aUL, - 0xd00087b2UL, 0x6938502fUL, 0x0c5fec97UL, 0xe2f05985UL, 0x8797e53dUL, - 0xd1878665UL, 0xb4e03addUL, 0x5a4f8fcfUL, 0x3f283377UL, 0x8610e4eaUL, - 0xe3775852UL, 0x0dd8ed40UL, 0x68bf51f8UL, 0xa1f82bf0UL, 0xc49f9748UL, - 0x2a30225aUL, 0x4f579ee2UL, 0xf66f497fUL, 0x9308f5c7UL, 0x7da740d5UL, - 0x18c0fc6dUL, 0x4ed09f35UL, 0x2bb7238dUL, 0xc518969fUL, 0xa07f2a27UL, - 0x1947fdbaUL, 0x7c204102UL, 0x928ff410UL, 0xf7e848a8UL, 0x3d58149bUL, - 0x583fa823UL, 0xb6901d31UL, 0xd3f7a189UL, 0x6acf7614UL, 0x0fa8caacUL, - 0xe1077fbeUL, 0x8460c306UL, 0xd270a05eUL, 0xb7171ce6UL, 0x59b8a9f4UL, - 0x3cdf154cUL, 0x85e7c2d1UL, 0xe0807e69UL, 0x0e2fcb7bUL, 0x6b4877c3UL, - 0xa20f0dcbUL, 0xc768b173UL, 0x29c70461UL, 0x4ca0b8d9UL, 0xf5986f44UL, - 0x90ffd3fcUL, 0x7e5066eeUL, 0x1b37da56UL, 0x4d27b90eUL, 0x284005b6UL, - 0xc6efb0a4UL, 0xa3880c1cUL, 0x1ab0db81UL, 0x7fd76739UL, 0x9178d22bUL, - 0xf41f6e93UL, 0x03f7263bUL, 0x66909a83UL, 0x883f2f91UL, 0xed589329UL, - 0x546044b4UL, 0x3107f80cUL, 0xdfa84d1eUL, 0xbacff1a6UL, 0xecdf92feUL, - 0x89b82e46UL, 0x67179b54UL, 0x027027ecUL, 0xbb48f071UL, 0xde2f4cc9UL, - 0x3080f9dbUL, 0x55e74563UL, 0x9ca03f6bUL, 0xf9c783d3UL, 0x176836c1UL, - 0x720f8a79UL, 0xcb375de4UL, 0xae50e15cUL, 0x40ff544eUL, 0x2598e8f6UL, - 0x73888baeUL, 0x16ef3716UL, 0xf8408204UL, 0x9d273ebcUL, 0x241fe921UL, - 0x41785599UL, 0xafd7e08bUL, 0xcab05c33UL, 0x3bb659edUL, 0x5ed1e555UL, - 0xb07e5047UL, 0xd519ecffUL, 0x6c213b62UL, 0x094687daUL, 0xe7e932c8UL, - 0x828e8e70UL, 0xd49eed28UL, 0xb1f95190UL, 0x5f56e482UL, 0x3a31583aUL, - 0x83098fa7UL, 0xe66e331fUL, 0x08c1860dUL, 0x6da63ab5UL, 0xa4e140bdUL, - 0xc186fc05UL, 0x2f294917UL, 0x4a4ef5afUL, 0xf3762232UL, 0x96119e8aUL, - 0x78be2b98UL, 0x1dd99720UL, 0x4bc9f478UL, 0x2eae48c0UL, 0xc001fdd2UL, - 0xa566416aUL, 0x1c5e96f7UL, 0x79392a4fUL, 0x97969f5dUL, 0xf2f123e5UL, - 0x05196b4dUL, 0x607ed7f5UL, 0x8ed162e7UL, 0xebb6de5fUL, 0x528e09c2UL, - 0x37e9b57aUL, 0xd9460068UL, 0xbc21bcd0UL, 0xea31df88UL, 0x8f566330UL, - 0x61f9d622UL, 0x049e6a9aUL, 0xbda6bd07UL, 0xd8c101bfUL, 0x366eb4adUL, - 0x53090815UL, 0x9a4e721dUL, 0xff29cea5UL, 0x11867bb7UL, 0x74e1c70fUL, - 0xcdd91092UL, 0xa8beac2aUL, 0x46111938UL, 0x2376a580UL, 0x7566c6d8UL, - 0x10017a60UL, 0xfeaecf72UL, 0x9bc973caUL, 0x22f1a457UL, 0x479618efUL, - 0xa939adfdUL, 0xcc5e1145UL, 0x06ee4d76UL, 0x6389f1ceUL, 0x8d2644dcUL, - 0xe841f864UL, 0x51792ff9UL, 0x341e9341UL, 0xdab12653UL, 0xbfd69aebUL, - 0xe9c6f9b3UL, 0x8ca1450bUL, 0x620ef019UL, 0x07694ca1UL, 0xbe519b3cUL, - 0xdb362784UL, 0x35999296UL, 0x50fe2e2eUL, 0x99b95426UL, 0xfcdee89eUL, - 0x12715d8cUL, 0x7716e134UL, 0xce2e36a9UL, 0xab498a11UL, 0x45e63f03UL, - 0x208183bbUL, 0x7691e0e3UL, 0x13f65c5bUL, 0xfd59e949UL, 0x983e55f1UL, - 0x2106826cUL, 0x44613ed4UL, 0xaace8bc6UL, 0xcfa9377eUL, 0x38417fd6UL, - 0x5d26c36eUL, 0xb389767cUL, 0xd6eecac4UL, 0x6fd61d59UL, 0x0ab1a1e1UL, - 0xe41e14f3UL, 0x8179a84bUL, 0xd769cb13UL, 0xb20e77abUL, 0x5ca1c2b9UL, - 0x39c67e01UL, 0x80fea99cUL, 0xe5991524UL, 0x0b36a036UL, 0x6e511c8eUL, - 0xa7166686UL, 0xc271da3eUL, 0x2cde6f2cUL, 0x49b9d394UL, 0xf0810409UL, - 0x95e6b8b1UL, 0x7b490da3UL, 0x1e2eb11bUL, 0x483ed243UL, 0x2d596efbUL, - 0xc3f6dbe9UL, 0xa6916751UL, 0x1fa9b0ccUL, 0x7ace0c74UL, 0x9461b966UL, - 0xf10605deUL -#endif - } -}; diff --git a/vendor/libgit2/deps/zlib/deflate.c b/vendor/libgit2/deps/zlib/deflate.c deleted file mode 100644 index 696957705..000000000 --- a/vendor/libgit2/deps/zlib/deflate.c +++ /dev/null @@ -1,1967 +0,0 @@ -/* deflate.c -- compress data using the deflation algorithm - * Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -/* - * ALGORITHM - * - * The "deflation" process depends on being able to identify portions - * of the input text which are identical to earlier input (within a - * sliding window trailing behind the input currently being processed). - * - * The most straightforward technique turns out to be the fastest for - * most input files: try all possible matches and select the longest. - * The key feature of this algorithm is that insertions into the string - * dictionary are very simple and thus fast, and deletions are avoided - * completely. Insertions are performed at each input character, whereas - * string matches are performed only when the previous match ends. So it - * is preferable to spend more time in matches to allow very fast string - * insertions and avoid deletions. The matching algorithm for small - * strings is inspired from that of Rabin & Karp. A brute force approach - * is used to find longer strings when a small match has been found. - * A similar algorithm is used in comic (by Jan-Mark Wams) and freeze - * (by Leonid Broukhis). - * A previous version of this file used a more sophisticated algorithm - * (by Fiala and Greene) which is guaranteed to run in linear amortized - * time, but has a larger average cost, uses more memory and is patented. - * However the F&G algorithm may be faster for some highly redundant - * files if the parameter max_chain_length (described below) is too large. - * - * ACKNOWLEDGEMENTS - * - * The idea of lazy evaluation of matches is due to Jan-Mark Wams, and - * I found it in 'freeze' written by Leonid Broukhis. - * Thanks to many people for bug reports and testing. - * - * REFERENCES - * - * Deutsch, L.P.,"DEFLATE Compressed Data Format Specification". - * Available in http://tools.ietf.org/html/rfc1951 - * - * A description of the Rabin and Karp algorithm is given in the book - * "Algorithms" by R. Sedgewick, Addison-Wesley, p252. - * - * Fiala,E.R., and Greene,D.H. - * Data Compression with Finite Windows, Comm.ACM, 32,4 (1989) 490-595 - * - */ - -/* @(#) $Id$ */ - -#include "deflate.h" - -const char deflate_copyright[] = - " deflate 1.2.8 Copyright 1995-2013 Jean-loup Gailly and Mark Adler "; -/* - If you use the zlib library in a product, an acknowledgment is welcome - in the documentation of your product. If for some reason you cannot - include such an acknowledgment, I would appreciate that you keep this - copyright string in the executable of your product. - */ - -/* =========================================================================== - * Function prototypes. - */ -typedef enum { - need_more, /* block not completed, need more input or more output */ - block_done, /* block flush performed */ - finish_started, /* finish started, need only more output at next deflate */ - finish_done /* finish done, accept no more input or output */ -} block_state; - -typedef block_state (*compress_func) OF((deflate_state *s, int flush)); -/* Compression function. Returns the block state after the call. */ - -local void fill_window OF((deflate_state *s)); -local block_state deflate_stored OF((deflate_state *s, int flush)); -local block_state deflate_fast OF((deflate_state *s, int flush)); -#ifndef FASTEST -local block_state deflate_slow OF((deflate_state *s, int flush)); -#endif -local block_state deflate_rle OF((deflate_state *s, int flush)); -local block_state deflate_huff OF((deflate_state *s, int flush)); -local void lm_init OF((deflate_state *s)); -local void putShortMSB OF((deflate_state *s, uInt b)); -local void flush_pending OF((z_streamp strm)); -local int read_buf OF((z_streamp strm, Bytef *buf, unsigned size)); -#ifdef ASMV - void match_init OF((void)); /* asm code initialization */ - uInt longest_match OF((deflate_state *s, IPos cur_match)); -#else -local uInt longest_match OF((deflate_state *s, IPos cur_match)); -#endif - -#ifdef DEBUG -local void check_match OF((deflate_state *s, IPos start, IPos match, - int length)); -#endif - -/* =========================================================================== - * Local data - */ - -#define NIL 0 -/* Tail of hash chains */ - -#ifndef TOO_FAR -# define TOO_FAR 4096 -#endif -/* Matches of length 3 are discarded if their distance exceeds TOO_FAR */ - -/* Values for max_lazy_match, good_match and max_chain_length, depending on - * the desired pack level (0..9). The values given below have been tuned to - * exclude worst case performance for pathological files. Better values may be - * found for specific files. - */ -typedef struct config_s { - ush good_length; /* reduce lazy search above this match length */ - ush max_lazy; /* do not perform lazy search above this match length */ - ush nice_length; /* quit search above this match length */ - ush max_chain; - compress_func func; -} config; - -#ifdef FASTEST -local const config configuration_table[2] = { -/* good lazy nice chain */ -/* 0 */ {0, 0, 0, 0, deflate_stored}, /* store only */ -/* 1 */ {4, 4, 8, 4, deflate_fast}}; /* max speed, no lazy matches */ -#else -local const config configuration_table[10] = { -/* good lazy nice chain */ -/* 0 */ {0, 0, 0, 0, deflate_stored}, /* store only */ -/* 1 */ {4, 4, 8, 4, deflate_fast}, /* max speed, no lazy matches */ -/* 2 */ {4, 5, 16, 8, deflate_fast}, -/* 3 */ {4, 6, 32, 32, deflate_fast}, - -/* 4 */ {4, 4, 16, 16, deflate_slow}, /* lazy matches */ -/* 5 */ {8, 16, 32, 32, deflate_slow}, -/* 6 */ {8, 16, 128, 128, deflate_slow}, -/* 7 */ {8, 32, 128, 256, deflate_slow}, -/* 8 */ {32, 128, 258, 1024, deflate_slow}, -/* 9 */ {32, 258, 258, 4096, deflate_slow}}; /* max compression */ -#endif - -/* Note: the deflate() code requires max_lazy >= MIN_MATCH and max_chain >= 4 - * For deflate_fast() (levels <= 3) good is ignored and lazy has a different - * meaning. - */ - -#define EQUAL 0 -/* result of memcmp for equal strings */ - -#ifndef NO_DUMMY_DECL -struct static_tree_desc_s {int dummy;}; /* for buggy compilers */ -#endif - -/* rank Z_BLOCK between Z_NO_FLUSH and Z_PARTIAL_FLUSH */ -#define RANK(f) (((f) << 1) - ((f) > 4 ? 9 : 0)) - -/* =========================================================================== - * Update a hash value with the given input byte - * IN assertion: all calls to to UPDATE_HASH are made with consecutive - * input characters, so that a running hash key can be computed from the - * previous key instead of complete recalculation each time. - */ -#define UPDATE_HASH(s,h,c) (h = (((h)<hash_shift) ^ (c)) & s->hash_mask) - - -/* =========================================================================== - * Insert string str in the dictionary and set match_head to the previous head - * of the hash chain (the most recent string with same hash key). Return - * the previous length of the hash chain. - * If this file is compiled with -DFASTEST, the compression level is forced - * to 1, and no hash chains are maintained. - * IN assertion: all calls to to INSERT_STRING are made with consecutive - * input characters and the first MIN_MATCH bytes of str are valid - * (except for the last MIN_MATCH-1 bytes of the input file). - */ -#ifdef FASTEST -#define INSERT_STRING(s, str, match_head) \ - (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \ - match_head = s->head[s->ins_h], \ - s->head[s->ins_h] = (Pos)(str)) -#else -#define INSERT_STRING(s, str, match_head) \ - (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \ - match_head = s->prev[(str) & s->w_mask] = s->head[s->ins_h], \ - s->head[s->ins_h] = (Pos)(str)) -#endif - -/* =========================================================================== - * Initialize the hash table (avoiding 64K overflow for 16 bit systems). - * prev[] will be initialized on the fly. - */ -#define CLEAR_HASH(s) \ - s->head[s->hash_size-1] = NIL; \ - zmemzero((Bytef *)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head)); - -/* ========================================================================= */ -int ZEXPORT deflateInit_(strm, level, version, stream_size) - z_streamp strm; - int level; - const char *version; - int stream_size; -{ - return deflateInit2_(strm, level, Z_DEFLATED, MAX_WBITS, DEF_MEM_LEVEL, - Z_DEFAULT_STRATEGY, version, stream_size); - /* To do: ignore strm->next_in if we use it as window */ -} - -/* ========================================================================= */ -int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy, - version, stream_size) - z_streamp strm; - int level; - int method; - int windowBits; - int memLevel; - int strategy; - const char *version; - int stream_size; -{ - deflate_state *s; - int wrap = 1; - static const char my_version[] = ZLIB_VERSION; - - ushf *overlay; - /* We overlay pending_buf and d_buf+l_buf. This works since the average - * output size for (length,distance) codes is <= 24 bits. - */ - - if (version == Z_NULL || version[0] != my_version[0] || - stream_size != sizeof(z_stream)) { - return Z_VERSION_ERROR; - } - if (strm == Z_NULL) return Z_STREAM_ERROR; - - strm->msg = Z_NULL; - if (strm->zalloc == (alloc_func)0) { -#ifdef Z_SOLO - return Z_STREAM_ERROR; -#else - strm->zalloc = zcalloc; - strm->opaque = (voidpf)0; -#endif - } - if (strm->zfree == (free_func)0) -#ifdef Z_SOLO - return Z_STREAM_ERROR; -#else - strm->zfree = zcfree; -#endif - -#ifdef FASTEST - if (level != 0) level = 1; -#else - if (level == Z_DEFAULT_COMPRESSION) level = 6; -#endif - - if (windowBits < 0) { /* suppress zlib wrapper */ - wrap = 0; - windowBits = -windowBits; - } -#ifdef GZIP - else if (windowBits > 15) { - wrap = 2; /* write gzip wrapper instead */ - windowBits -= 16; - } -#endif - if (memLevel < 1 || memLevel > MAX_MEM_LEVEL || method != Z_DEFLATED || - windowBits < 8 || windowBits > 15 || level < 0 || level > 9 || - strategy < 0 || strategy > Z_FIXED) { - return Z_STREAM_ERROR; - } - if (windowBits == 8) windowBits = 9; /* until 256-byte window bug fixed */ - s = (deflate_state *) ZALLOC(strm, 1, sizeof(deflate_state)); - if (s == Z_NULL) return Z_MEM_ERROR; - strm->state = (struct internal_state FAR *)s; - s->strm = strm; - - s->wrap = wrap; - s->gzhead = Z_NULL; - s->w_bits = windowBits; - s->w_size = 1 << s->w_bits; - s->w_mask = s->w_size - 1; - - s->hash_bits = memLevel + 7; - s->hash_size = 1 << s->hash_bits; - s->hash_mask = s->hash_size - 1; - s->hash_shift = ((s->hash_bits+MIN_MATCH-1)/MIN_MATCH); - - s->window = (Bytef *) ZALLOC(strm, s->w_size, 2*sizeof(Byte)); - s->prev = (Posf *) ZALLOC(strm, s->w_size, sizeof(Pos)); - s->head = (Posf *) ZALLOC(strm, s->hash_size, sizeof(Pos)); - - s->high_water = 0; /* nothing written to s->window yet */ - - s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */ - - overlay = (ushf *) ZALLOC(strm, s->lit_bufsize, sizeof(ush)+2); - s->pending_buf = (uchf *) overlay; - s->pending_buf_size = (ulg)s->lit_bufsize * (sizeof(ush)+2L); - - if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL || - s->pending_buf == Z_NULL) { - s->status = FINISH_STATE; - strm->msg = ERR_MSG(Z_MEM_ERROR); - deflateEnd (strm); - return Z_MEM_ERROR; - } - s->d_buf = overlay + s->lit_bufsize/sizeof(ush); - s->l_buf = s->pending_buf + (1+sizeof(ush))*s->lit_bufsize; - - s->level = level; - s->strategy = strategy; - s->method = (Byte)method; - - return deflateReset(strm); -} - -/* ========================================================================= */ -int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength) - z_streamp strm; - const Bytef *dictionary; - uInt dictLength; -{ - deflate_state *s; - uInt str, n; - int wrap; - unsigned avail; - z_const unsigned char *next; - - if (strm == Z_NULL || strm->state == Z_NULL || dictionary == Z_NULL) - return Z_STREAM_ERROR; - s = strm->state; - wrap = s->wrap; - if (wrap == 2 || (wrap == 1 && s->status != INIT_STATE) || s->lookahead) - return Z_STREAM_ERROR; - - /* when using zlib wrappers, compute Adler-32 for provided dictionary */ - if (wrap == 1) - strm->adler = adler32(strm->adler, dictionary, dictLength); - s->wrap = 0; /* avoid computing Adler-32 in read_buf */ - - /* if dictionary would fill window, just replace the history */ - if (dictLength >= s->w_size) { - if (wrap == 0) { /* already empty otherwise */ - CLEAR_HASH(s); - s->strstart = 0; - s->block_start = 0L; - s->insert = 0; - } - dictionary += dictLength - s->w_size; /* use the tail */ - dictLength = s->w_size; - } - - /* insert dictionary into window and hash */ - avail = strm->avail_in; - next = strm->next_in; - strm->avail_in = dictLength; - strm->next_in = (z_const Bytef *)dictionary; - fill_window(s); - while (s->lookahead >= MIN_MATCH) { - str = s->strstart; - n = s->lookahead - (MIN_MATCH-1); - do { - UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]); -#ifndef FASTEST - s->prev[str & s->w_mask] = s->head[s->ins_h]; -#endif - s->head[s->ins_h] = (Pos)str; - str++; - } while (--n); - s->strstart = str; - s->lookahead = MIN_MATCH-1; - fill_window(s); - } - s->strstart += s->lookahead; - s->block_start = (long)s->strstart; - s->insert = s->lookahead; - s->lookahead = 0; - s->match_length = s->prev_length = MIN_MATCH-1; - s->match_available = 0; - strm->next_in = next; - strm->avail_in = avail; - s->wrap = wrap; - return Z_OK; -} - -/* ========================================================================= */ -int ZEXPORT deflateResetKeep (strm) - z_streamp strm; -{ - deflate_state *s; - - if (strm == Z_NULL || strm->state == Z_NULL || - strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0) { - return Z_STREAM_ERROR; - } - - strm->total_in = strm->total_out = 0; - strm->msg = Z_NULL; /* use zfree if we ever allocate msg dynamically */ - strm->data_type = Z_UNKNOWN; - - s = (deflate_state *)strm->state; - s->pending = 0; - s->pending_out = s->pending_buf; - - if (s->wrap < 0) { - s->wrap = -s->wrap; /* was made negative by deflate(..., Z_FINISH); */ - } - s->status = s->wrap ? INIT_STATE : BUSY_STATE; - strm->adler = -#ifdef GZIP - s->wrap == 2 ? crc32(0L, Z_NULL, 0) : -#endif - adler32(0L, Z_NULL, 0); - s->last_flush = Z_NO_FLUSH; - - _tr_init(s); - - return Z_OK; -} - -/* ========================================================================= */ -int ZEXPORT deflateReset (strm) - z_streamp strm; -{ - int ret; - - ret = deflateResetKeep(strm); - if (ret == Z_OK) - lm_init(strm->state); - return ret; -} - -/* ========================================================================= */ -int ZEXPORT deflateSetHeader (strm, head) - z_streamp strm; - gz_headerp head; -{ - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; - if (strm->state->wrap != 2) return Z_STREAM_ERROR; - strm->state->gzhead = head; - return Z_OK; -} - -/* ========================================================================= */ -int ZEXPORT deflatePending (strm, pending, bits) - unsigned *pending; - int *bits; - z_streamp strm; -{ - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; - if (pending != Z_NULL) - *pending = strm->state->pending; - if (bits != Z_NULL) - *bits = strm->state->bi_valid; - return Z_OK; -} - -/* ========================================================================= */ -int ZEXPORT deflatePrime (strm, bits, value) - z_streamp strm; - int bits; - int value; -{ - deflate_state *s; - int put; - - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; - s = strm->state; - if ((Bytef *)(s->d_buf) < s->pending_out + ((Buf_size + 7) >> 3)) - return Z_BUF_ERROR; - do { - put = Buf_size - s->bi_valid; - if (put > bits) - put = bits; - s->bi_buf |= (ush)((value & ((1 << put) - 1)) << s->bi_valid); - s->bi_valid += put; - _tr_flush_bits(s); - value >>= put; - bits -= put; - } while (bits); - return Z_OK; -} - -/* ========================================================================= */ -int ZEXPORT deflateParams(strm, level, strategy) - z_streamp strm; - int level; - int strategy; -{ - deflate_state *s; - compress_func func; - int err = Z_OK; - - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; - s = strm->state; - -#ifdef FASTEST - if (level != 0) level = 1; -#else - if (level == Z_DEFAULT_COMPRESSION) level = 6; -#endif - if (level < 0 || level > 9 || strategy < 0 || strategy > Z_FIXED) { - return Z_STREAM_ERROR; - } - func = configuration_table[s->level].func; - - if ((strategy != s->strategy || func != configuration_table[level].func) && - strm->total_in != 0) { - /* Flush the last buffer: */ - err = deflate(strm, Z_BLOCK); - if (err == Z_BUF_ERROR && s->pending == 0) - err = Z_OK; - } - if (s->level != level) { - s->level = level; - s->max_lazy_match = configuration_table[level].max_lazy; - s->good_match = configuration_table[level].good_length; - s->nice_match = configuration_table[level].nice_length; - s->max_chain_length = configuration_table[level].max_chain; - } - s->strategy = strategy; - return err; -} - -/* ========================================================================= */ -int ZEXPORT deflateTune(strm, good_length, max_lazy, nice_length, max_chain) - z_streamp strm; - int good_length; - int max_lazy; - int nice_length; - int max_chain; -{ - deflate_state *s; - - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; - s = strm->state; - s->good_match = good_length; - s->max_lazy_match = max_lazy; - s->nice_match = nice_length; - s->max_chain_length = max_chain; - return Z_OK; -} - -/* ========================================================================= - * For the default windowBits of 15 and memLevel of 8, this function returns - * a close to exact, as well as small, upper bound on the compressed size. - * They are coded as constants here for a reason--if the #define's are - * changed, then this function needs to be changed as well. The return - * value for 15 and 8 only works for those exact settings. - * - * For any setting other than those defaults for windowBits and memLevel, - * the value returned is a conservative worst case for the maximum expansion - * resulting from using fixed blocks instead of stored blocks, which deflate - * can emit on compressed data for some combinations of the parameters. - * - * This function could be more sophisticated to provide closer upper bounds for - * every combination of windowBits and memLevel. But even the conservative - * upper bound of about 14% expansion does not seem onerous for output buffer - * allocation. - */ -uLong ZEXPORT deflateBound(strm, sourceLen) - z_streamp strm; - uLong sourceLen; -{ - deflate_state *s; - uLong complen, wraplen; - Bytef *str; - - /* conservative upper bound for compressed data */ - complen = sourceLen + - ((sourceLen + 7) >> 3) + ((sourceLen + 63) >> 6) + 5; - - /* if can't get parameters, return conservative bound plus zlib wrapper */ - if (strm == Z_NULL || strm->state == Z_NULL) - return complen + 6; - - /* compute wrapper length */ - s = strm->state; - switch (s->wrap) { - case 0: /* raw deflate */ - wraplen = 0; - break; - case 1: /* zlib wrapper */ - wraplen = 6 + (s->strstart ? 4 : 0); - break; - case 2: /* gzip wrapper */ - wraplen = 18; - if (s->gzhead != Z_NULL) { /* user-supplied gzip header */ - if (s->gzhead->extra != Z_NULL) - wraplen += 2 + s->gzhead->extra_len; - str = s->gzhead->name; - if (str != Z_NULL) - do { - wraplen++; - } while (*str++); - str = s->gzhead->comment; - if (str != Z_NULL) - do { - wraplen++; - } while (*str++); - if (s->gzhead->hcrc) - wraplen += 2; - } - break; - default: /* for compiler happiness */ - wraplen = 6; - } - - /* if not default parameters, return conservative bound */ - if (s->w_bits != 15 || s->hash_bits != 8 + 7) - return complen + wraplen; - - /* default settings: return tight bound for that case */ - return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) + - (sourceLen >> 25) + 13 - 6 + wraplen; -} - -/* ========================================================================= - * Put a short in the pending buffer. The 16-bit value is put in MSB order. - * IN assertion: the stream state is correct and there is enough room in - * pending_buf. - */ -local void putShortMSB (s, b) - deflate_state *s; - uInt b; -{ - put_byte(s, (Byte)(b >> 8)); - put_byte(s, (Byte)(b & 0xff)); -} - -/* ========================================================================= - * Flush as much pending output as possible. All deflate() output goes - * through this function so some applications may wish to modify it - * to avoid allocating a large strm->next_out buffer and copying into it. - * (See also read_buf()). - */ -local void flush_pending(strm) - z_streamp strm; -{ - unsigned len; - deflate_state *s = strm->state; - - _tr_flush_bits(s); - len = s->pending; - if (len > strm->avail_out) len = strm->avail_out; - if (len == 0) return; - - zmemcpy(strm->next_out, s->pending_out, len); - strm->next_out += len; - s->pending_out += len; - strm->total_out += len; - strm->avail_out -= len; - s->pending -= len; - if (s->pending == 0) { - s->pending_out = s->pending_buf; - } -} - -/* ========================================================================= */ -int ZEXPORT deflate (strm, flush) - z_streamp strm; - int flush; -{ - int old_flush; /* value of flush param for previous deflate call */ - deflate_state *s; - - if (strm == Z_NULL || strm->state == Z_NULL || - flush > Z_BLOCK || flush < 0) { - return Z_STREAM_ERROR; - } - s = strm->state; - - if (strm->next_out == Z_NULL || - (strm->next_in == Z_NULL && strm->avail_in != 0) || - (s->status == FINISH_STATE && flush != Z_FINISH)) { - ERR_RETURN(strm, Z_STREAM_ERROR); - } - if (strm->avail_out == 0) ERR_RETURN(strm, Z_BUF_ERROR); - - s->strm = strm; /* just in case */ - old_flush = s->last_flush; - s->last_flush = flush; - - /* Write the header */ - if (s->status == INIT_STATE) { -#ifdef GZIP - if (s->wrap == 2) { - strm->adler = crc32(0L, Z_NULL, 0); - put_byte(s, 31); - put_byte(s, 139); - put_byte(s, 8); - if (s->gzhead == Z_NULL) { - put_byte(s, 0); - put_byte(s, 0); - put_byte(s, 0); - put_byte(s, 0); - put_byte(s, 0); - put_byte(s, s->level == 9 ? 2 : - (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ? - 4 : 0)); - put_byte(s, OS_CODE); - s->status = BUSY_STATE; - } - else { - put_byte(s, (s->gzhead->text ? 1 : 0) + - (s->gzhead->hcrc ? 2 : 0) + - (s->gzhead->extra == Z_NULL ? 0 : 4) + - (s->gzhead->name == Z_NULL ? 0 : 8) + - (s->gzhead->comment == Z_NULL ? 0 : 16) - ); - put_byte(s, (Byte)(s->gzhead->time & 0xff)); - put_byte(s, (Byte)((s->gzhead->time >> 8) & 0xff)); - put_byte(s, (Byte)((s->gzhead->time >> 16) & 0xff)); - put_byte(s, (Byte)((s->gzhead->time >> 24) & 0xff)); - put_byte(s, s->level == 9 ? 2 : - (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ? - 4 : 0)); - put_byte(s, s->gzhead->os & 0xff); - if (s->gzhead->extra != Z_NULL) { - put_byte(s, s->gzhead->extra_len & 0xff); - put_byte(s, (s->gzhead->extra_len >> 8) & 0xff); - } - if (s->gzhead->hcrc) - strm->adler = crc32(strm->adler, s->pending_buf, - s->pending); - s->gzindex = 0; - s->status = EXTRA_STATE; - } - } - else -#endif - { - uInt header = (Z_DEFLATED + ((s->w_bits-8)<<4)) << 8; - uInt level_flags; - - if (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2) - level_flags = 0; - else if (s->level < 6) - level_flags = 1; - else if (s->level == 6) - level_flags = 2; - else - level_flags = 3; - header |= (level_flags << 6); - if (s->strstart != 0) header |= PRESET_DICT; - header += 31 - (header % 31); - - s->status = BUSY_STATE; - putShortMSB(s, header); - - /* Save the adler32 of the preset dictionary: */ - if (s->strstart != 0) { - putShortMSB(s, (uInt)(strm->adler >> 16)); - putShortMSB(s, (uInt)(strm->adler & 0xffff)); - } - strm->adler = adler32(0L, Z_NULL, 0); - } - } -#ifdef GZIP - if (s->status == EXTRA_STATE) { - if (s->gzhead->extra != Z_NULL) { - uInt beg = s->pending; /* start of bytes to update crc */ - - while (s->gzindex < (s->gzhead->extra_len & 0xffff)) { - if (s->pending == s->pending_buf_size) { - if (s->gzhead->hcrc && s->pending > beg) - strm->adler = crc32(strm->adler, s->pending_buf + beg, - s->pending - beg); - flush_pending(strm); - beg = s->pending; - if (s->pending == s->pending_buf_size) - break; - } - put_byte(s, s->gzhead->extra[s->gzindex]); - s->gzindex++; - } - if (s->gzhead->hcrc && s->pending > beg) - strm->adler = crc32(strm->adler, s->pending_buf + beg, - s->pending - beg); - if (s->gzindex == s->gzhead->extra_len) { - s->gzindex = 0; - s->status = NAME_STATE; - } - } - else - s->status = NAME_STATE; - } - if (s->status == NAME_STATE) { - if (s->gzhead->name != Z_NULL) { - uInt beg = s->pending; /* start of bytes to update crc */ - int val; - - do { - if (s->pending == s->pending_buf_size) { - if (s->gzhead->hcrc && s->pending > beg) - strm->adler = crc32(strm->adler, s->pending_buf + beg, - s->pending - beg); - flush_pending(strm); - beg = s->pending; - if (s->pending == s->pending_buf_size) { - val = 1; - break; - } - } - val = s->gzhead->name[s->gzindex++]; - put_byte(s, val); - } while (val != 0); - if (s->gzhead->hcrc && s->pending > beg) - strm->adler = crc32(strm->adler, s->pending_buf + beg, - s->pending - beg); - if (val == 0) { - s->gzindex = 0; - s->status = COMMENT_STATE; - } - } - else - s->status = COMMENT_STATE; - } - if (s->status == COMMENT_STATE) { - if (s->gzhead->comment != Z_NULL) { - uInt beg = s->pending; /* start of bytes to update crc */ - int val; - - do { - if (s->pending == s->pending_buf_size) { - if (s->gzhead->hcrc && s->pending > beg) - strm->adler = crc32(strm->adler, s->pending_buf + beg, - s->pending - beg); - flush_pending(strm); - beg = s->pending; - if (s->pending == s->pending_buf_size) { - val = 1; - break; - } - } - val = s->gzhead->comment[s->gzindex++]; - put_byte(s, val); - } while (val != 0); - if (s->gzhead->hcrc && s->pending > beg) - strm->adler = crc32(strm->adler, s->pending_buf + beg, - s->pending - beg); - if (val == 0) - s->status = HCRC_STATE; - } - else - s->status = HCRC_STATE; - } - if (s->status == HCRC_STATE) { - if (s->gzhead->hcrc) { - if (s->pending + 2 > s->pending_buf_size) - flush_pending(strm); - if (s->pending + 2 <= s->pending_buf_size) { - put_byte(s, (Byte)(strm->adler & 0xff)); - put_byte(s, (Byte)((strm->adler >> 8) & 0xff)); - strm->adler = crc32(0L, Z_NULL, 0); - s->status = BUSY_STATE; - } - } - else - s->status = BUSY_STATE; - } -#endif - - /* Flush as much pending output as possible */ - if (s->pending != 0) { - flush_pending(strm); - if (strm->avail_out == 0) { - /* Since avail_out is 0, deflate will be called again with - * more output space, but possibly with both pending and - * avail_in equal to zero. There won't be anything to do, - * but this is not an error situation so make sure we - * return OK instead of BUF_ERROR at next call of deflate: - */ - s->last_flush = -1; - return Z_OK; - } - - /* Make sure there is something to do and avoid duplicate consecutive - * flushes. For repeated and useless calls with Z_FINISH, we keep - * returning Z_STREAM_END instead of Z_BUF_ERROR. - */ - } else if (strm->avail_in == 0 && RANK(flush) <= RANK(old_flush) && - flush != Z_FINISH) { - ERR_RETURN(strm, Z_BUF_ERROR); - } - - /* User must not provide more input after the first FINISH: */ - if (s->status == FINISH_STATE && strm->avail_in != 0) { - ERR_RETURN(strm, Z_BUF_ERROR); - } - - /* Start a new block or continue the current one. - */ - if (strm->avail_in != 0 || s->lookahead != 0 || - (flush != Z_NO_FLUSH && s->status != FINISH_STATE)) { - block_state bstate; - - bstate = s->strategy == Z_HUFFMAN_ONLY ? deflate_huff(s, flush) : - (s->strategy == Z_RLE ? deflate_rle(s, flush) : - (*(configuration_table[s->level].func))(s, flush)); - - if (bstate == finish_started || bstate == finish_done) { - s->status = FINISH_STATE; - } - if (bstate == need_more || bstate == finish_started) { - if (strm->avail_out == 0) { - s->last_flush = -1; /* avoid BUF_ERROR next call, see above */ - } - return Z_OK; - /* If flush != Z_NO_FLUSH && avail_out == 0, the next call - * of deflate should use the same flush parameter to make sure - * that the flush is complete. So we don't have to output an - * empty block here, this will be done at next call. This also - * ensures that for a very small output buffer, we emit at most - * one empty block. - */ - } - if (bstate == block_done) { - if (flush == Z_PARTIAL_FLUSH) { - _tr_align(s); - } else if (flush != Z_BLOCK) { /* FULL_FLUSH or SYNC_FLUSH */ - _tr_stored_block(s, (char*)0, 0L, 0); - /* For a full flush, this empty block will be recognized - * as a special marker by inflate_sync(). - */ - if (flush == Z_FULL_FLUSH) { - CLEAR_HASH(s); /* forget history */ - if (s->lookahead == 0) { - s->strstart = 0; - s->block_start = 0L; - s->insert = 0; - } - } - } - flush_pending(strm); - if (strm->avail_out == 0) { - s->last_flush = -1; /* avoid BUF_ERROR at next call, see above */ - return Z_OK; - } - } - } - Assert(strm->avail_out > 0, "bug2"); - - if (flush != Z_FINISH) return Z_OK; - if (s->wrap <= 0) return Z_STREAM_END; - - /* Write the trailer */ -#ifdef GZIP - if (s->wrap == 2) { - put_byte(s, (Byte)(strm->adler & 0xff)); - put_byte(s, (Byte)((strm->adler >> 8) & 0xff)); - put_byte(s, (Byte)((strm->adler >> 16) & 0xff)); - put_byte(s, (Byte)((strm->adler >> 24) & 0xff)); - put_byte(s, (Byte)(strm->total_in & 0xff)); - put_byte(s, (Byte)((strm->total_in >> 8) & 0xff)); - put_byte(s, (Byte)((strm->total_in >> 16) & 0xff)); - put_byte(s, (Byte)((strm->total_in >> 24) & 0xff)); - } - else -#endif - { - putShortMSB(s, (uInt)(strm->adler >> 16)); - putShortMSB(s, (uInt)(strm->adler & 0xffff)); - } - flush_pending(strm); - /* If avail_out is zero, the application will call deflate again - * to flush the rest. - */ - if (s->wrap > 0) s->wrap = -s->wrap; /* write the trailer only once! */ - return s->pending != 0 ? Z_OK : Z_STREAM_END; -} - -/* ========================================================================= */ -int ZEXPORT deflateEnd (strm) - z_streamp strm; -{ - int status; - - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; - - status = strm->state->status; - if (status != INIT_STATE && - status != EXTRA_STATE && - status != NAME_STATE && - status != COMMENT_STATE && - status != HCRC_STATE && - status != BUSY_STATE && - status != FINISH_STATE) { - return Z_STREAM_ERROR; - } - - /* Deallocate in reverse order of allocations: */ - TRY_FREE(strm, strm->state->pending_buf); - TRY_FREE(strm, strm->state->head); - TRY_FREE(strm, strm->state->prev); - TRY_FREE(strm, strm->state->window); - - ZFREE(strm, strm->state); - strm->state = Z_NULL; - - return status == BUSY_STATE ? Z_DATA_ERROR : Z_OK; -} - -/* ========================================================================= - * Copy the source state to the destination state. - * To simplify the source, this is not supported for 16-bit MSDOS (which - * doesn't have enough memory anyway to duplicate compression states). - */ -int ZEXPORT deflateCopy (dest, source) - z_streamp dest; - z_streamp source; -{ -#ifdef MAXSEG_64K - return Z_STREAM_ERROR; -#else - deflate_state *ds; - deflate_state *ss; - ushf *overlay; - - - if (source == Z_NULL || dest == Z_NULL || source->state == Z_NULL) { - return Z_STREAM_ERROR; - } - - ss = source->state; - - zmemcpy((voidpf)dest, (voidpf)source, sizeof(z_stream)); - - ds = (deflate_state *) ZALLOC(dest, 1, sizeof(deflate_state)); - if (ds == Z_NULL) return Z_MEM_ERROR; - dest->state = (struct internal_state FAR *) ds; - zmemcpy((voidpf)ds, (voidpf)ss, sizeof(deflate_state)); - ds->strm = dest; - - ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte)); - ds->prev = (Posf *) ZALLOC(dest, ds->w_size, sizeof(Pos)); - ds->head = (Posf *) ZALLOC(dest, ds->hash_size, sizeof(Pos)); - overlay = (ushf *) ZALLOC(dest, ds->lit_bufsize, sizeof(ush)+2); - ds->pending_buf = (uchf *) overlay; - - if (ds->window == Z_NULL || ds->prev == Z_NULL || ds->head == Z_NULL || - ds->pending_buf == Z_NULL) { - deflateEnd (dest); - return Z_MEM_ERROR; - } - /* following zmemcpy do not work for 16-bit MSDOS */ - zmemcpy(ds->window, ss->window, ds->w_size * 2 * sizeof(Byte)); - zmemcpy((voidpf)ds->prev, (voidpf)ss->prev, ds->w_size * sizeof(Pos)); - zmemcpy((voidpf)ds->head, (voidpf)ss->head, ds->hash_size * sizeof(Pos)); - zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size); - - ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf); - ds->d_buf = overlay + ds->lit_bufsize/sizeof(ush); - ds->l_buf = ds->pending_buf + (1+sizeof(ush))*ds->lit_bufsize; - - ds->l_desc.dyn_tree = ds->dyn_ltree; - ds->d_desc.dyn_tree = ds->dyn_dtree; - ds->bl_desc.dyn_tree = ds->bl_tree; - - return Z_OK; -#endif /* MAXSEG_64K */ -} - -/* =========================================================================== - * Read a new buffer from the current input stream, update the adler32 - * and total number of bytes read. All deflate() input goes through - * this function so some applications may wish to modify it to avoid - * allocating a large strm->next_in buffer and copying from it. - * (See also flush_pending()). - */ -local int read_buf(strm, buf, size) - z_streamp strm; - Bytef *buf; - unsigned size; -{ - unsigned len = strm->avail_in; - - if (len > size) len = size; - if (len == 0) return 0; - - strm->avail_in -= len; - - zmemcpy(buf, strm->next_in, len); - if (strm->state->wrap == 1) { - strm->adler = adler32(strm->adler, buf, len); - } -#ifdef GZIP - else if (strm->state->wrap == 2) { - strm->adler = crc32(strm->adler, buf, len); - } -#endif - strm->next_in += len; - strm->total_in += len; - - return (int)len; -} - -/* =========================================================================== - * Initialize the "longest match" routines for a new zlib stream - */ -local void lm_init (s) - deflate_state *s; -{ - s->window_size = (ulg)2L*s->w_size; - - CLEAR_HASH(s); - - /* Set the default configuration parameters: - */ - s->max_lazy_match = configuration_table[s->level].max_lazy; - s->good_match = configuration_table[s->level].good_length; - s->nice_match = configuration_table[s->level].nice_length; - s->max_chain_length = configuration_table[s->level].max_chain; - - s->strstart = 0; - s->block_start = 0L; - s->lookahead = 0; - s->insert = 0; - s->match_length = s->prev_length = MIN_MATCH-1; - s->match_available = 0; - s->ins_h = 0; -#ifndef FASTEST -#ifdef ASMV - match_init(); /* initialize the asm code */ -#endif -#endif -} - -#ifndef FASTEST -/* =========================================================================== - * Set match_start to the longest match starting at the given string and - * return its length. Matches shorter or equal to prev_length are discarded, - * in which case the result is equal to prev_length and match_start is - * garbage. - * IN assertions: cur_match is the head of the hash chain for the current - * string (strstart) and its distance is <= MAX_DIST, and prev_length >= 1 - * OUT assertion: the match length is not greater than s->lookahead. - */ -#ifndef ASMV -/* For 80x86 and 680x0, an optimized version will be provided in match.asm or - * match.S. The code will be functionally equivalent. - */ -local uInt longest_match(s, cur_match) - deflate_state *s; - IPos cur_match; /* current match */ -{ - unsigned chain_length = s->max_chain_length;/* max hash chain length */ - register Bytef *scan = s->window + s->strstart; /* current string */ - register Bytef *match; /* matched string */ - register int len; /* length of current match */ - int best_len = s->prev_length; /* best match length so far */ - int nice_match = s->nice_match; /* stop if match long enough */ - IPos limit = s->strstart > (IPos)MAX_DIST(s) ? - s->strstart - (IPos)MAX_DIST(s) : NIL; - /* Stop when cur_match becomes <= limit. To simplify the code, - * we prevent matches with the string of window index 0. - */ - Posf *prev = s->prev; - uInt wmask = s->w_mask; - -#ifdef UNALIGNED_OK - /* Compare two bytes at a time. Note: this is not always beneficial. - * Try with and without -DUNALIGNED_OK to check. - */ - register Bytef *strend = s->window + s->strstart + MAX_MATCH - 1; - register ush scan_start = *(ushf*)scan; - register ush scan_end = *(ushf*)(scan+best_len-1); -#else - register Bytef *strend = s->window + s->strstart + MAX_MATCH; - register Byte scan_end1 = scan[best_len-1]; - register Byte scan_end = scan[best_len]; -#endif - - /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16. - * It is easy to get rid of this optimization if necessary. - */ - Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever"); - - /* Do not waste too much time if we already have a good match: */ - if (s->prev_length >= s->good_match) { - chain_length >>= 2; - } - /* Do not look for matches beyond the end of the input. This is necessary - * to make deflate deterministic. - */ - if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead; - - Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead"); - - do { - Assert(cur_match < s->strstart, "no future"); - match = s->window + cur_match; - - /* Skip to next match if the match length cannot increase - * or if the match length is less than 2. Note that the checks below - * for insufficient lookahead only occur occasionally for performance - * reasons. Therefore uninitialized memory will be accessed, and - * conditional jumps will be made that depend on those values. - * However the length of the match is limited to the lookahead, so - * the output of deflate is not affected by the uninitialized values. - */ -#if (defined(UNALIGNED_OK) && MAX_MATCH == 258) - /* This code assumes sizeof(unsigned short) == 2. Do not use - * UNALIGNED_OK if your compiler uses a different size. - */ - if (*(ushf*)(match+best_len-1) != scan_end || - *(ushf*)match != scan_start) continue; - - /* It is not necessary to compare scan[2] and match[2] since they are - * always equal when the other bytes match, given that the hash keys - * are equal and that HASH_BITS >= 8. Compare 2 bytes at a time at - * strstart+3, +5, ... up to strstart+257. We check for insufficient - * lookahead only every 4th comparison; the 128th check will be made - * at strstart+257. If MAX_MATCH-2 is not a multiple of 8, it is - * necessary to put more guard bytes at the end of the window, or - * to check more often for insufficient lookahead. - */ - Assert(scan[2] == match[2], "scan[2]?"); - scan++, match++; - do { - } while (*(ushf*)(scan+=2) == *(ushf*)(match+=2) && - *(ushf*)(scan+=2) == *(ushf*)(match+=2) && - *(ushf*)(scan+=2) == *(ushf*)(match+=2) && - *(ushf*)(scan+=2) == *(ushf*)(match+=2) && - scan < strend); - /* The funny "do {}" generates better code on most compilers */ - - /* Here, scan <= window+strstart+257 */ - Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan"); - if (*scan == *match) scan++; - - len = (MAX_MATCH - 1) - (int)(strend-scan); - scan = strend - (MAX_MATCH-1); - -#else /* UNALIGNED_OK */ - - if (match[best_len] != scan_end || - match[best_len-1] != scan_end1 || - *match != *scan || - *++match != scan[1]) continue; - - /* The check at best_len-1 can be removed because it will be made - * again later. (This heuristic is not always a win.) - * It is not necessary to compare scan[2] and match[2] since they - * are always equal when the other bytes match, given that - * the hash keys are equal and that HASH_BITS >= 8. - */ - scan += 2, match++; - Assert(*scan == *match, "match[2]?"); - - /* We check for insufficient lookahead only every 8th comparison; - * the 256th check will be made at strstart+258. - */ - do { - } while (*++scan == *++match && *++scan == *++match && - *++scan == *++match && *++scan == *++match && - *++scan == *++match && *++scan == *++match && - *++scan == *++match && *++scan == *++match && - scan < strend); - - Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan"); - - len = MAX_MATCH - (int)(strend - scan); - scan = strend - MAX_MATCH; - -#endif /* UNALIGNED_OK */ - - if (len > best_len) { - s->match_start = cur_match; - best_len = len; - if (len >= nice_match) break; -#ifdef UNALIGNED_OK - scan_end = *(ushf*)(scan+best_len-1); -#else - scan_end1 = scan[best_len-1]; - scan_end = scan[best_len]; -#endif - } - } while ((cur_match = prev[cur_match & wmask]) > limit - && --chain_length != 0); - - if ((uInt)best_len <= s->lookahead) return (uInt)best_len; - return s->lookahead; -} -#endif /* ASMV */ - -#else /* FASTEST */ - -/* --------------------------------------------------------------------------- - * Optimized version for FASTEST only - */ -local uInt longest_match(s, cur_match) - deflate_state *s; - IPos cur_match; /* current match */ -{ - register Bytef *scan = s->window + s->strstart; /* current string */ - register Bytef *match; /* matched string */ - register int len; /* length of current match */ - register Bytef *strend = s->window + s->strstart + MAX_MATCH; - - /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16. - * It is easy to get rid of this optimization if necessary. - */ - Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever"); - - Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead"); - - Assert(cur_match < s->strstart, "no future"); - - match = s->window + cur_match; - - /* Return failure if the match length is less than 2: - */ - if (match[0] != scan[0] || match[1] != scan[1]) return MIN_MATCH-1; - - /* The check at best_len-1 can be removed because it will be made - * again later. (This heuristic is not always a win.) - * It is not necessary to compare scan[2] and match[2] since they - * are always equal when the other bytes match, given that - * the hash keys are equal and that HASH_BITS >= 8. - */ - scan += 2, match += 2; - Assert(*scan == *match, "match[2]?"); - - /* We check for insufficient lookahead only every 8th comparison; - * the 256th check will be made at strstart+258. - */ - do { - } while (*++scan == *++match && *++scan == *++match && - *++scan == *++match && *++scan == *++match && - *++scan == *++match && *++scan == *++match && - *++scan == *++match && *++scan == *++match && - scan < strend); - - Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan"); - - len = MAX_MATCH - (int)(strend - scan); - - if (len < MIN_MATCH) return MIN_MATCH - 1; - - s->match_start = cur_match; - return (uInt)len <= s->lookahead ? (uInt)len : s->lookahead; -} - -#endif /* FASTEST */ - -#ifdef DEBUG -/* =========================================================================== - * Check that the match at match_start is indeed a match. - */ -local void check_match(s, start, match, length) - deflate_state *s; - IPos start, match; - int length; -{ - /* check that the match is indeed a match */ - if (zmemcmp(s->window + match, - s->window + start, length) != EQUAL) { - fprintf(stderr, " start %u, match %u, length %d\n", - start, match, length); - do { - fprintf(stderr, "%c%c", s->window[match++], s->window[start++]); - } while (--length != 0); - z_error("invalid match"); - } - if (z_verbose > 1) { - fprintf(stderr,"\\[%d,%d]", start-match, length); - do { putc(s->window[start++], stderr); } while (--length != 0); - } -} -#else -# define check_match(s, start, match, length) -#endif /* DEBUG */ - -/* =========================================================================== - * Fill the window when the lookahead becomes insufficient. - * Updates strstart and lookahead. - * - * IN assertion: lookahead < MIN_LOOKAHEAD - * OUT assertions: strstart <= window_size-MIN_LOOKAHEAD - * At least one byte has been read, or avail_in == 0; reads are - * performed for at least two bytes (required for the zip translate_eol - * option -- not supported here). - */ -local void fill_window(s) - deflate_state *s; -{ - register unsigned n, m; - register Posf *p; - unsigned more; /* Amount of free space at the end of the window. */ - uInt wsize = s->w_size; - - Assert(s->lookahead < MIN_LOOKAHEAD, "already enough lookahead"); - - do { - more = (unsigned)(s->window_size -(ulg)s->lookahead -(ulg)s->strstart); - - /* Deal with !@#$% 64K limit: */ - if (sizeof(int) <= 2) { - if (more == 0 && s->strstart == 0 && s->lookahead == 0) { - more = wsize; - - } else if (more == (unsigned)(-1)) { - /* Very unlikely, but possible on 16 bit machine if - * strstart == 0 && lookahead == 1 (input done a byte at time) - */ - more--; - } - } - - /* If the window is almost full and there is insufficient lookahead, - * move the upper half to the lower one to make room in the upper half. - */ - if (s->strstart >= wsize+MAX_DIST(s)) { - - zmemcpy(s->window, s->window+wsize, (unsigned)wsize); - s->match_start -= wsize; - s->strstart -= wsize; /* we now have strstart >= MAX_DIST */ - s->block_start -= (long) wsize; - - /* Slide the hash table (could be avoided with 32 bit values - at the expense of memory usage). We slide even when level == 0 - to keep the hash table consistent if we switch back to level > 0 - later. (Using level 0 permanently is not an optimal usage of - zlib, so we don't care about this pathological case.) - */ - n = s->hash_size; - p = &s->head[n]; - do { - m = *--p; - *p = (Pos)(m >= wsize ? m-wsize : NIL); - } while (--n); - - n = wsize; -#ifndef FASTEST - p = &s->prev[n]; - do { - m = *--p; - *p = (Pos)(m >= wsize ? m-wsize : NIL); - /* If n is not on any hash chain, prev[n] is garbage but - * its value will never be used. - */ - } while (--n); -#endif - more += wsize; - } - if (s->strm->avail_in == 0) break; - - /* If there was no sliding: - * strstart <= WSIZE+MAX_DIST-1 && lookahead <= MIN_LOOKAHEAD - 1 && - * more == window_size - lookahead - strstart - * => more >= window_size - (MIN_LOOKAHEAD-1 + WSIZE + MAX_DIST-1) - * => more >= window_size - 2*WSIZE + 2 - * In the BIG_MEM or MMAP case (not yet supported), - * window_size == input_size + MIN_LOOKAHEAD && - * strstart + s->lookahead <= input_size => more >= MIN_LOOKAHEAD. - * Otherwise, window_size == 2*WSIZE so more >= 2. - * If there was sliding, more >= WSIZE. So in all cases, more >= 2. - */ - Assert(more >= 2, "more < 2"); - - n = read_buf(s->strm, s->window + s->strstart + s->lookahead, more); - s->lookahead += n; - - /* Initialize the hash value now that we have some input: */ - if (s->lookahead + s->insert >= MIN_MATCH) { - uInt str = s->strstart - s->insert; - s->ins_h = s->window[str]; - UPDATE_HASH(s, s->ins_h, s->window[str + 1]); -#if MIN_MATCH != 3 - Call UPDATE_HASH() MIN_MATCH-3 more times -#endif - while (s->insert) { - UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]); -#ifndef FASTEST - s->prev[str & s->w_mask] = s->head[s->ins_h]; -#endif - s->head[s->ins_h] = (Pos)str; - str++; - s->insert--; - if (s->lookahead + s->insert < MIN_MATCH) - break; - } - } - /* If the whole input has less than MIN_MATCH bytes, ins_h is garbage, - * but this is not important since only literal bytes will be emitted. - */ - - } while (s->lookahead < MIN_LOOKAHEAD && s->strm->avail_in != 0); - - /* If the WIN_INIT bytes after the end of the current data have never been - * written, then zero those bytes in order to avoid memory check reports of - * the use of uninitialized (or uninitialised as Julian writes) bytes by - * the longest match routines. Update the high water mark for the next - * time through here. WIN_INIT is set to MAX_MATCH since the longest match - * routines allow scanning to strstart + MAX_MATCH, ignoring lookahead. - */ - if (s->high_water < s->window_size) { - ulg curr = s->strstart + (ulg)(s->lookahead); - ulg init; - - if (s->high_water < curr) { - /* Previous high water mark below current data -- zero WIN_INIT - * bytes or up to end of window, whichever is less. - */ - init = s->window_size - curr; - if (init > WIN_INIT) - init = WIN_INIT; - zmemzero(s->window + curr, (unsigned)init); - s->high_water = curr + init; - } - else if (s->high_water < (ulg)curr + WIN_INIT) { - /* High water mark at or above current data, but below current data - * plus WIN_INIT -- zero out to current data plus WIN_INIT, or up - * to end of window, whichever is less. - */ - init = (ulg)curr + WIN_INIT - s->high_water; - if (init > s->window_size - s->high_water) - init = s->window_size - s->high_water; - zmemzero(s->window + s->high_water, (unsigned)init); - s->high_water += init; - } - } - - Assert((ulg)s->strstart <= s->window_size - MIN_LOOKAHEAD, - "not enough room for search"); -} - -/* =========================================================================== - * Flush the current block, with given end-of-file flag. - * IN assertion: strstart is set to the end of the current match. - */ -#define FLUSH_BLOCK_ONLY(s, last) { \ - _tr_flush_block(s, (s->block_start >= 0L ? \ - (charf *)&s->window[(unsigned)s->block_start] : \ - (charf *)Z_NULL), \ - (ulg)((long)s->strstart - s->block_start), \ - (last)); \ - s->block_start = s->strstart; \ - flush_pending(s->strm); \ - Tracev((stderr,"[FLUSH]")); \ -} - -/* Same but force premature exit if necessary. */ -#define FLUSH_BLOCK(s, last) { \ - FLUSH_BLOCK_ONLY(s, last); \ - if (s->strm->avail_out == 0) return (last) ? finish_started : need_more; \ -} - -/* =========================================================================== - * Copy without compression as much as possible from the input stream, return - * the current block state. - * This function does not insert new strings in the dictionary since - * uncompressible data is probably not useful. This function is used - * only for the level=0 compression option. - * NOTE: this function should be optimized to avoid extra copying from - * window to pending_buf. - */ -local block_state deflate_stored(s, flush) - deflate_state *s; - int flush; -{ - /* Stored blocks are limited to 0xffff bytes, pending_buf is limited - * to pending_buf_size, and each stored block has a 5 byte header: - */ - ulg max_block_size = 0xffff; - ulg max_start; - - if (max_block_size > s->pending_buf_size - 5) { - max_block_size = s->pending_buf_size - 5; - } - - /* Copy as much as possible from input to output: */ - for (;;) { - /* Fill the window as much as possible: */ - if (s->lookahead <= 1) { - - Assert(s->strstart < s->w_size+MAX_DIST(s) || - s->block_start >= (long)s->w_size, "slide too late"); - - fill_window(s); - if (s->lookahead == 0 && flush == Z_NO_FLUSH) return need_more; - - if (s->lookahead == 0) break; /* flush the current block */ - } - Assert(s->block_start >= 0L, "block gone"); - - s->strstart += s->lookahead; - s->lookahead = 0; - - /* Emit a stored block if pending_buf will be full: */ - max_start = s->block_start + max_block_size; - if (s->strstart == 0 || (ulg)s->strstart >= max_start) { - /* strstart == 0 is possible when wraparound on 16-bit machine */ - s->lookahead = (uInt)(s->strstart - max_start); - s->strstart = (uInt)max_start; - FLUSH_BLOCK(s, 0); - } - /* Flush if we may have to slide, otherwise block_start may become - * negative and the data will be gone: - */ - if (s->strstart - (uInt)s->block_start >= MAX_DIST(s)) { - FLUSH_BLOCK(s, 0); - } - } - s->insert = 0; - if (flush == Z_FINISH) { - FLUSH_BLOCK(s, 1); - return finish_done; - } - if ((long)s->strstart > s->block_start) - FLUSH_BLOCK(s, 0); - return block_done; -} - -/* =========================================================================== - * Compress as much as possible from the input stream, return the current - * block state. - * This function does not perform lazy evaluation of matches and inserts - * new strings in the dictionary only for unmatched strings or for short - * matches. It is used only for the fast compression options. - */ -local block_state deflate_fast(s, flush) - deflate_state *s; - int flush; -{ - IPos hash_head; /* head of the hash chain */ - int bflush; /* set if current block must be flushed */ - - for (;;) { - /* Make sure that we always have enough lookahead, except - * at the end of the input file. We need MAX_MATCH bytes - * for the next match, plus MIN_MATCH bytes to insert the - * string following the next match. - */ - if (s->lookahead < MIN_LOOKAHEAD) { - fill_window(s); - if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) { - return need_more; - } - if (s->lookahead == 0) break; /* flush the current block */ - } - - /* Insert the string window[strstart .. strstart+2] in the - * dictionary, and set hash_head to the head of the hash chain: - */ - hash_head = NIL; - if (s->lookahead >= MIN_MATCH) { - INSERT_STRING(s, s->strstart, hash_head); - } - - /* Find the longest match, discarding those <= prev_length. - * At this point we have always match_length < MIN_MATCH - */ - if (hash_head != NIL && s->strstart - hash_head <= MAX_DIST(s)) { - /* To simplify the code, we prevent matches with the string - * of window index 0 (in particular we have to avoid a match - * of the string with itself at the start of the input file). - */ - s->match_length = longest_match (s, hash_head); - /* longest_match() sets match_start */ - } - if (s->match_length >= MIN_MATCH) { - check_match(s, s->strstart, s->match_start, s->match_length); - - _tr_tally_dist(s, s->strstart - s->match_start, - s->match_length - MIN_MATCH, bflush); - - s->lookahead -= s->match_length; - - /* Insert new strings in the hash table only if the match length - * is not too large. This saves time but degrades compression. - */ -#ifndef FASTEST - if (s->match_length <= s->max_insert_length && - s->lookahead >= MIN_MATCH) { - s->match_length--; /* string at strstart already in table */ - do { - s->strstart++; - INSERT_STRING(s, s->strstart, hash_head); - /* strstart never exceeds WSIZE-MAX_MATCH, so there are - * always MIN_MATCH bytes ahead. - */ - } while (--s->match_length != 0); - s->strstart++; - } else -#endif - { - s->strstart += s->match_length; - s->match_length = 0; - s->ins_h = s->window[s->strstart]; - UPDATE_HASH(s, s->ins_h, s->window[s->strstart+1]); -#if MIN_MATCH != 3 - Call UPDATE_HASH() MIN_MATCH-3 more times -#endif - /* If lookahead < MIN_MATCH, ins_h is garbage, but it does not - * matter since it will be recomputed at next deflate call. - */ - } - } else { - /* No match, output a literal byte */ - Tracevv((stderr,"%c", s->window[s->strstart])); - _tr_tally_lit (s, s->window[s->strstart], bflush); - s->lookahead--; - s->strstart++; - } - if (bflush) FLUSH_BLOCK(s, 0); - } - s->insert = s->strstart < MIN_MATCH-1 ? s->strstart : MIN_MATCH-1; - if (flush == Z_FINISH) { - FLUSH_BLOCK(s, 1); - return finish_done; - } - if (s->last_lit) - FLUSH_BLOCK(s, 0); - return block_done; -} - -#ifndef FASTEST -/* =========================================================================== - * Same as above, but achieves better compression. We use a lazy - * evaluation for matches: a match is finally adopted only if there is - * no better match at the next window position. - */ -local block_state deflate_slow(s, flush) - deflate_state *s; - int flush; -{ - IPos hash_head; /* head of hash chain */ - int bflush; /* set if current block must be flushed */ - - /* Process the input block. */ - for (;;) { - /* Make sure that we always have enough lookahead, except - * at the end of the input file. We need MAX_MATCH bytes - * for the next match, plus MIN_MATCH bytes to insert the - * string following the next match. - */ - if (s->lookahead < MIN_LOOKAHEAD) { - fill_window(s); - if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) { - return need_more; - } - if (s->lookahead == 0) break; /* flush the current block */ - } - - /* Insert the string window[strstart .. strstart+2] in the - * dictionary, and set hash_head to the head of the hash chain: - */ - hash_head = NIL; - if (s->lookahead >= MIN_MATCH) { - INSERT_STRING(s, s->strstart, hash_head); - } - - /* Find the longest match, discarding those <= prev_length. - */ - s->prev_length = s->match_length, s->prev_match = s->match_start; - s->match_length = MIN_MATCH-1; - - if (hash_head != NIL && s->prev_length < s->max_lazy_match && - s->strstart - hash_head <= MAX_DIST(s)) { - /* To simplify the code, we prevent matches with the string - * of window index 0 (in particular we have to avoid a match - * of the string with itself at the start of the input file). - */ - s->match_length = longest_match (s, hash_head); - /* longest_match() sets match_start */ - - if (s->match_length <= 5 && (s->strategy == Z_FILTERED -#if TOO_FAR <= 32767 - || (s->match_length == MIN_MATCH && - s->strstart - s->match_start > TOO_FAR) -#endif - )) { - - /* If prev_match is also MIN_MATCH, match_start is garbage - * but we will ignore the current match anyway. - */ - s->match_length = MIN_MATCH-1; - } - } - /* If there was a match at the previous step and the current - * match is not better, output the previous match: - */ - if (s->prev_length >= MIN_MATCH && s->match_length <= s->prev_length) { - uInt max_insert = s->strstart + s->lookahead - MIN_MATCH; - /* Do not insert strings in hash table beyond this. */ - - check_match(s, s->strstart-1, s->prev_match, s->prev_length); - - _tr_tally_dist(s, s->strstart -1 - s->prev_match, - s->prev_length - MIN_MATCH, bflush); - - /* Insert in hash table all strings up to the end of the match. - * strstart-1 and strstart are already inserted. If there is not - * enough lookahead, the last two strings are not inserted in - * the hash table. - */ - s->lookahead -= s->prev_length-1; - s->prev_length -= 2; - do { - if (++s->strstart <= max_insert) { - INSERT_STRING(s, s->strstart, hash_head); - } - } while (--s->prev_length != 0); - s->match_available = 0; - s->match_length = MIN_MATCH-1; - s->strstart++; - - if (bflush) FLUSH_BLOCK(s, 0); - - } else if (s->match_available) { - /* If there was no match at the previous position, output a - * single literal. If there was a match but the current match - * is longer, truncate the previous match to a single literal. - */ - Tracevv((stderr,"%c", s->window[s->strstart-1])); - _tr_tally_lit(s, s->window[s->strstart-1], bflush); - if (bflush) { - FLUSH_BLOCK_ONLY(s, 0); - } - s->strstart++; - s->lookahead--; - if (s->strm->avail_out == 0) return need_more; - } else { - /* There is no previous match to compare with, wait for - * the next step to decide. - */ - s->match_available = 1; - s->strstart++; - s->lookahead--; - } - } - Assert (flush != Z_NO_FLUSH, "no flush?"); - if (s->match_available) { - Tracevv((stderr,"%c", s->window[s->strstart-1])); - _tr_tally_lit(s, s->window[s->strstart-1], bflush); - s->match_available = 0; - } - s->insert = s->strstart < MIN_MATCH-1 ? s->strstart : MIN_MATCH-1; - if (flush == Z_FINISH) { - FLUSH_BLOCK(s, 1); - return finish_done; - } - if (s->last_lit) - FLUSH_BLOCK(s, 0); - return block_done; -} -#endif /* FASTEST */ - -/* =========================================================================== - * For Z_RLE, simply look for runs of bytes, generate matches only of distance - * one. Do not maintain a hash table. (It will be regenerated if this run of - * deflate switches away from Z_RLE.) - */ -local block_state deflate_rle(s, flush) - deflate_state *s; - int flush; -{ - int bflush; /* set if current block must be flushed */ - uInt prev; /* byte at distance one to match */ - Bytef *scan, *strend; /* scan goes up to strend for length of run */ - - for (;;) { - /* Make sure that we always have enough lookahead, except - * at the end of the input file. We need MAX_MATCH bytes - * for the longest run, plus one for the unrolled loop. - */ - if (s->lookahead <= MAX_MATCH) { - fill_window(s); - if (s->lookahead <= MAX_MATCH && flush == Z_NO_FLUSH) { - return need_more; - } - if (s->lookahead == 0) break; /* flush the current block */ - } - - /* See how many times the previous byte repeats */ - s->match_length = 0; - if (s->lookahead >= MIN_MATCH && s->strstart > 0) { - scan = s->window + s->strstart - 1; - prev = *scan; - if (prev == *++scan && prev == *++scan && prev == *++scan) { - strend = s->window + s->strstart + MAX_MATCH; - do { - } while (prev == *++scan && prev == *++scan && - prev == *++scan && prev == *++scan && - prev == *++scan && prev == *++scan && - prev == *++scan && prev == *++scan && - scan < strend); - s->match_length = MAX_MATCH - (int)(strend - scan); - if (s->match_length > s->lookahead) - s->match_length = s->lookahead; - } - Assert(scan <= s->window+(uInt)(s->window_size-1), "wild scan"); - } - - /* Emit match if have run of MIN_MATCH or longer, else emit literal */ - if (s->match_length >= MIN_MATCH) { - check_match(s, s->strstart, s->strstart - 1, s->match_length); - - _tr_tally_dist(s, 1, s->match_length - MIN_MATCH, bflush); - - s->lookahead -= s->match_length; - s->strstart += s->match_length; - s->match_length = 0; - } else { - /* No match, output a literal byte */ - Tracevv((stderr,"%c", s->window[s->strstart])); - _tr_tally_lit (s, s->window[s->strstart], bflush); - s->lookahead--; - s->strstart++; - } - if (bflush) FLUSH_BLOCK(s, 0); - } - s->insert = 0; - if (flush == Z_FINISH) { - FLUSH_BLOCK(s, 1); - return finish_done; - } - if (s->last_lit) - FLUSH_BLOCK(s, 0); - return block_done; -} - -/* =========================================================================== - * For Z_HUFFMAN_ONLY, do not look for matches. Do not maintain a hash table. - * (It will be regenerated if this run of deflate switches away from Huffman.) - */ -local block_state deflate_huff(s, flush) - deflate_state *s; - int flush; -{ - int bflush; /* set if current block must be flushed */ - - for (;;) { - /* Make sure that we have a literal to write. */ - if (s->lookahead == 0) { - fill_window(s); - if (s->lookahead == 0) { - if (flush == Z_NO_FLUSH) - return need_more; - break; /* flush the current block */ - } - } - - /* Output a literal byte */ - s->match_length = 0; - Tracevv((stderr,"%c", s->window[s->strstart])); - _tr_tally_lit (s, s->window[s->strstart], bflush); - s->lookahead--; - s->strstart++; - if (bflush) FLUSH_BLOCK(s, 0); - } - s->insert = 0; - if (flush == Z_FINISH) { - FLUSH_BLOCK(s, 1); - return finish_done; - } - if (s->last_lit) - FLUSH_BLOCK(s, 0); - return block_done; -} diff --git a/vendor/libgit2/deps/zlib/deflate.h b/vendor/libgit2/deps/zlib/deflate.h deleted file mode 100644 index a17c8365c..000000000 --- a/vendor/libgit2/deps/zlib/deflate.h +++ /dev/null @@ -1,346 +0,0 @@ -/* deflate.h -- internal compression state - * Copyright (C) 1995-2012 Jean-loup Gailly - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -/* WARNING: this file should *not* be used by applications. It is - part of the implementation of the compression library and is - subject to change. Applications should only use zlib.h. - */ - -/* @(#) $Id$ */ - -#ifndef DEFLATE_H -#define DEFLATE_H - -#include "zutil.h" - -/* define NO_GZIP when compiling if you want to disable gzip header and - trailer creation by deflate(). NO_GZIP would be used to avoid linking in - the crc code when it is not needed. For shared libraries, gzip encoding - should be left enabled. */ -#ifndef NO_GZIP -# define GZIP -#endif - -/* =========================================================================== - * Internal compression state. - */ - -#define LENGTH_CODES 29 -/* number of length codes, not counting the special END_BLOCK code */ - -#define LITERALS 256 -/* number of literal bytes 0..255 */ - -#define L_CODES (LITERALS+1+LENGTH_CODES) -/* number of Literal or Length codes, including the END_BLOCK code */ - -#define D_CODES 30 -/* number of distance codes */ - -#define BL_CODES 19 -/* number of codes used to transfer the bit lengths */ - -#define HEAP_SIZE (2*L_CODES+1) -/* maximum heap size */ - -#define MAX_BITS 15 -/* All codes must not exceed MAX_BITS bits */ - -#define Buf_size 16 -/* size of bit buffer in bi_buf */ - -#define INIT_STATE 42 -#define EXTRA_STATE 69 -#define NAME_STATE 73 -#define COMMENT_STATE 91 -#define HCRC_STATE 103 -#define BUSY_STATE 113 -#define FINISH_STATE 666 -/* Stream status */ - - -/* Data structure describing a single value and its code string. */ -typedef struct ct_data_s { - union { - ush freq; /* frequency count */ - ush code; /* bit string */ - } fc; - union { - ush dad; /* father node in Huffman tree */ - ush len; /* length of bit string */ - } dl; -} FAR ct_data; - -#define Freq fc.freq -#define Code fc.code -#define Dad dl.dad -#define Len dl.len - -typedef struct static_tree_desc_s static_tree_desc; - -typedef struct tree_desc_s { - ct_data *dyn_tree; /* the dynamic tree */ - int max_code; /* largest code with non zero frequency */ - static_tree_desc *stat_desc; /* the corresponding static tree */ -} FAR tree_desc; - -typedef ush Pos; -typedef Pos FAR Posf; -typedef unsigned IPos; - -/* A Pos is an index in the character window. We use short instead of int to - * save space in the various tables. IPos is used only for parameter passing. - */ - -typedef struct internal_state { - z_streamp strm; /* pointer back to this zlib stream */ - int status; /* as the name implies */ - Bytef *pending_buf; /* output still pending */ - ulg pending_buf_size; /* size of pending_buf */ - Bytef *pending_out; /* next pending byte to output to the stream */ - uInt pending; /* nb of bytes in the pending buffer */ - int wrap; /* bit 0 true for zlib, bit 1 true for gzip */ - gz_headerp gzhead; /* gzip header information to write */ - uInt gzindex; /* where in extra, name, or comment */ - Byte method; /* can only be DEFLATED */ - int last_flush; /* value of flush param for previous deflate call */ - - /* used by deflate.c: */ - - uInt w_size; /* LZ77 window size (32K by default) */ - uInt w_bits; /* log2(w_size) (8..16) */ - uInt w_mask; /* w_size - 1 */ - - Bytef *window; - /* Sliding window. Input bytes are read into the second half of the window, - * and move to the first half later to keep a dictionary of at least wSize - * bytes. With this organization, matches are limited to a distance of - * wSize-MAX_MATCH bytes, but this ensures that IO is always - * performed with a length multiple of the block size. Also, it limits - * the window size to 64K, which is quite useful on MSDOS. - * To do: use the user input buffer as sliding window. - */ - - ulg window_size; - /* Actual size of window: 2*wSize, except when the user input buffer - * is directly used as sliding window. - */ - - Posf *prev; - /* Link to older string with same hash index. To limit the size of this - * array to 64K, this link is maintained only for the last 32K strings. - * An index in this array is thus a window index modulo 32K. - */ - - Posf *head; /* Heads of the hash chains or NIL. */ - - uInt ins_h; /* hash index of string to be inserted */ - uInt hash_size; /* number of elements in hash table */ - uInt hash_bits; /* log2(hash_size) */ - uInt hash_mask; /* hash_size-1 */ - - uInt hash_shift; - /* Number of bits by which ins_h must be shifted at each input - * step. It must be such that after MIN_MATCH steps, the oldest - * byte no longer takes part in the hash key, that is: - * hash_shift * MIN_MATCH >= hash_bits - */ - - long block_start; - /* Window position at the beginning of the current output block. Gets - * negative when the window is moved backwards. - */ - - uInt match_length; /* length of best match */ - IPos prev_match; /* previous match */ - int match_available; /* set if previous match exists */ - uInt strstart; /* start of string to insert */ - uInt match_start; /* start of matching string */ - uInt lookahead; /* number of valid bytes ahead in window */ - - uInt prev_length; - /* Length of the best match at previous step. Matches not greater than this - * are discarded. This is used in the lazy match evaluation. - */ - - uInt max_chain_length; - /* To speed up deflation, hash chains are never searched beyond this - * length. A higher limit improves compression ratio but degrades the - * speed. - */ - - uInt max_lazy_match; - /* Attempt to find a better match only when the current match is strictly - * smaller than this value. This mechanism is used only for compression - * levels >= 4. - */ -# define max_insert_length max_lazy_match - /* Insert new strings in the hash table only if the match length is not - * greater than this length. This saves time but degrades compression. - * max_insert_length is used only for compression levels <= 3. - */ - - int level; /* compression level (1..9) */ - int strategy; /* favor or force Huffman coding*/ - - uInt good_match; - /* Use a faster search when the previous match is longer than this */ - - int nice_match; /* Stop searching when current match exceeds this */ - - /* used by trees.c: */ - /* Didn't use ct_data typedef below to suppress compiler warning */ - struct ct_data_s dyn_ltree[HEAP_SIZE]; /* literal and length tree */ - struct ct_data_s dyn_dtree[2*D_CODES+1]; /* distance tree */ - struct ct_data_s bl_tree[2*BL_CODES+1]; /* Huffman tree for bit lengths */ - - struct tree_desc_s l_desc; /* desc. for literal tree */ - struct tree_desc_s d_desc; /* desc. for distance tree */ - struct tree_desc_s bl_desc; /* desc. for bit length tree */ - - ush bl_count[MAX_BITS+1]; - /* number of codes at each bit length for an optimal tree */ - - int heap[2*L_CODES+1]; /* heap used to build the Huffman trees */ - int heap_len; /* number of elements in the heap */ - int heap_max; /* element of largest frequency */ - /* The sons of heap[n] are heap[2*n] and heap[2*n+1]. heap[0] is not used. - * The same heap array is used to build all trees. - */ - - uch depth[2*L_CODES+1]; - /* Depth of each subtree used as tie breaker for trees of equal frequency - */ - - uchf *l_buf; /* buffer for literals or lengths */ - - uInt lit_bufsize; - /* Size of match buffer for literals/lengths. There are 4 reasons for - * limiting lit_bufsize to 64K: - * - frequencies can be kept in 16 bit counters - * - if compression is not successful for the first block, all input - * data is still in the window so we can still emit a stored block even - * when input comes from standard input. (This can also be done for - * all blocks if lit_bufsize is not greater than 32K.) - * - if compression is not successful for a file smaller than 64K, we can - * even emit a stored file instead of a stored block (saving 5 bytes). - * This is applicable only for zip (not gzip or zlib). - * - creating new Huffman trees less frequently may not provide fast - * adaptation to changes in the input data statistics. (Take for - * example a binary file with poorly compressible code followed by - * a highly compressible string table.) Smaller buffer sizes give - * fast adaptation but have of course the overhead of transmitting - * trees more frequently. - * - I can't count above 4 - */ - - uInt last_lit; /* running index in l_buf */ - - ushf *d_buf; - /* Buffer for distances. To simplify the code, d_buf and l_buf have - * the same number of elements. To use different lengths, an extra flag - * array would be necessary. - */ - - ulg opt_len; /* bit length of current block with optimal trees */ - ulg static_len; /* bit length of current block with static trees */ - uInt matches; /* number of string matches in current block */ - uInt insert; /* bytes at end of window left to insert */ - -#ifdef DEBUG - ulg compressed_len; /* total bit length of compressed file mod 2^32 */ - ulg bits_sent; /* bit length of compressed data sent mod 2^32 */ -#endif - - ush bi_buf; - /* Output buffer. bits are inserted starting at the bottom (least - * significant bits). - */ - int bi_valid; - /* Number of valid bits in bi_buf. All bits above the last valid bit - * are always zero. - */ - - ulg high_water; - /* High water mark offset in window for initialized bytes -- bytes above - * this are set to zero in order to avoid memory check warnings when - * longest match routines access bytes past the input. This is then - * updated to the new high water mark. - */ - -} FAR deflate_state; - -/* Output a byte on the stream. - * IN assertion: there is enough room in pending_buf. - */ -#define put_byte(s, c) {s->pending_buf[s->pending++] = (c);} - - -#define MIN_LOOKAHEAD (MAX_MATCH+MIN_MATCH+1) -/* Minimum amount of lookahead, except at the end of the input file. - * See deflate.c for comments about the MIN_MATCH+1. - */ - -#define MAX_DIST(s) ((s)->w_size-MIN_LOOKAHEAD) -/* In order to simplify the code, particularly on 16 bit machines, match - * distances are limited to MAX_DIST instead of WSIZE. - */ - -#define WIN_INIT MAX_MATCH -/* Number of bytes after end of data in window to initialize in order to avoid - memory checker errors from longest match routines */ - - /* in trees.c */ -void ZLIB_INTERNAL _tr_init OF((deflate_state *s)); -int ZLIB_INTERNAL _tr_tally OF((deflate_state *s, unsigned dist, unsigned lc)); -void ZLIB_INTERNAL _tr_flush_block OF((deflate_state *s, charf *buf, - ulg stored_len, int last)); -void ZLIB_INTERNAL _tr_flush_bits OF((deflate_state *s)); -void ZLIB_INTERNAL _tr_align OF((deflate_state *s)); -void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf, - ulg stored_len, int last)); - -#define d_code(dist) \ - ((dist) < 256 ? _dist_code[dist] : _dist_code[256+((dist)>>7)]) -/* Mapping from a distance to a distance code. dist is the distance - 1 and - * must not have side effects. _dist_code[256] and _dist_code[257] are never - * used. - */ - -#ifndef DEBUG -/* Inline versions of _tr_tally for speed: */ - -#if defined(GEN_TREES_H) || !defined(STDC) - extern uch ZLIB_INTERNAL _length_code[]; - extern uch ZLIB_INTERNAL _dist_code[]; -#else - extern const uch ZLIB_INTERNAL _length_code[]; - extern const uch ZLIB_INTERNAL _dist_code[]; -#endif - -# define _tr_tally_lit(s, c, flush) \ - { uch cc = (uch)(c); \ - s->d_buf[s->last_lit] = 0; \ - s->l_buf[s->last_lit++] = cc; \ - s->dyn_ltree[cc].Freq++; \ - flush = (s->last_lit == s->lit_bufsize-1); \ - } -# define _tr_tally_dist(s, distance, length, flush) \ - { uch len = (uch)(length); \ - ush dist = (ush)(distance); \ - s->d_buf[s->last_lit] = dist; \ - s->l_buf[s->last_lit++] = len; \ - dist--; \ - s->dyn_ltree[_length_code[len]+LITERALS+1].Freq++; \ - s->dyn_dtree[d_code(dist)].Freq++; \ - flush = (s->last_lit == s->lit_bufsize-1); \ - } -#else -# define _tr_tally_lit(s, c, flush) flush = _tr_tally(s, 0, c) -# define _tr_tally_dist(s, distance, length, flush) \ - flush = _tr_tally(s, distance, length) -#endif - -#endif /* DEFLATE_H */ diff --git a/vendor/libgit2/deps/zlib/infback.c b/vendor/libgit2/deps/zlib/infback.c deleted file mode 100644 index f3833c2e4..000000000 --- a/vendor/libgit2/deps/zlib/infback.c +++ /dev/null @@ -1,640 +0,0 @@ -/* infback.c -- inflate using a call-back interface - * Copyright (C) 1995-2011 Mark Adler - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -/* - This code is largely copied from inflate.c. Normally either infback.o or - inflate.o would be linked into an application--not both. The interface - with inffast.c is retained so that optimized assembler-coded versions of - inflate_fast() can be used with either inflate.c or infback.c. - */ - -#include "zutil.h" -#include "inftrees.h" -#include "inflate.h" -#include "inffast.h" - -/* function prototypes */ -local void fixedtables OF((struct inflate_state FAR *state)); - -/* - strm provides memory allocation functions in zalloc and zfree, or - Z_NULL to use the library memory allocation functions. - - windowBits is in the range 8..15, and window is a user-supplied - window and output buffer that is 2**windowBits bytes. - */ -int ZEXPORT inflateBackInit_(strm, windowBits, window, version, stream_size) -z_streamp strm; -int windowBits; -unsigned char FAR *window; -const char *version; -int stream_size; -{ - struct inflate_state FAR *state; - - if (version == Z_NULL || version[0] != ZLIB_VERSION[0] || - stream_size != (int)(sizeof(z_stream))) - return Z_VERSION_ERROR; - if (strm == Z_NULL || window == Z_NULL || - windowBits < 8 || windowBits > 15) - return Z_STREAM_ERROR; - strm->msg = Z_NULL; /* in case we return an error */ - if (strm->zalloc == (alloc_func)0) { -#ifdef Z_SOLO - return Z_STREAM_ERROR; -#else - strm->zalloc = zcalloc; - strm->opaque = (voidpf)0; -#endif - } - if (strm->zfree == (free_func)0) -#ifdef Z_SOLO - return Z_STREAM_ERROR; -#else - strm->zfree = zcfree; -#endif - state = (struct inflate_state FAR *)ZALLOC(strm, 1, - sizeof(struct inflate_state)); - if (state == Z_NULL) return Z_MEM_ERROR; - Tracev((stderr, "inflate: allocated\n")); - strm->state = (struct internal_state FAR *)state; - state->dmax = 32768U; - state->wbits = windowBits; - state->wsize = 1U << windowBits; - state->window = window; - state->wnext = 0; - state->whave = 0; - return Z_OK; -} - -/* - Return state with length and distance decoding tables and index sizes set to - fixed code decoding. Normally this returns fixed tables from inffixed.h. - If BUILDFIXED is defined, then instead this routine builds the tables the - first time it's called, and returns those tables the first time and - thereafter. This reduces the size of the code by about 2K bytes, in - exchange for a little execution time. However, BUILDFIXED should not be - used for threaded applications, since the rewriting of the tables and virgin - may not be thread-safe. - */ -local void fixedtables(state) -struct inflate_state FAR *state; -{ -#ifdef BUILDFIXED - static int virgin = 1; - static code *lenfix, *distfix; - static code fixed[544]; - - /* build fixed huffman tables if first call (may not be thread safe) */ - if (virgin) { - unsigned sym, bits; - static code *next; - - /* literal/length table */ - sym = 0; - while (sym < 144) state->lens[sym++] = 8; - while (sym < 256) state->lens[sym++] = 9; - while (sym < 280) state->lens[sym++] = 7; - while (sym < 288) state->lens[sym++] = 8; - next = fixed; - lenfix = next; - bits = 9; - inflate_table(LENS, state->lens, 288, &(next), &(bits), state->work); - - /* distance table */ - sym = 0; - while (sym < 32) state->lens[sym++] = 5; - distfix = next; - bits = 5; - inflate_table(DISTS, state->lens, 32, &(next), &(bits), state->work); - - /* do this just once */ - virgin = 0; - } -#else /* !BUILDFIXED */ -# include "inffixed.h" -#endif /* BUILDFIXED */ - state->lencode = lenfix; - state->lenbits = 9; - state->distcode = distfix; - state->distbits = 5; -} - -/* Macros for inflateBack(): */ - -/* Load returned state from inflate_fast() */ -#define LOAD() \ - do { \ - put = strm->next_out; \ - left = strm->avail_out; \ - next = strm->next_in; \ - have = strm->avail_in; \ - hold = state->hold; \ - bits = state->bits; \ - } while (0) - -/* Set state from registers for inflate_fast() */ -#define RESTORE() \ - do { \ - strm->next_out = put; \ - strm->avail_out = left; \ - strm->next_in = next; \ - strm->avail_in = have; \ - state->hold = hold; \ - state->bits = bits; \ - } while (0) - -/* Clear the input bit accumulator */ -#define INITBITS() \ - do { \ - hold = 0; \ - bits = 0; \ - } while (0) - -/* Assure that some input is available. If input is requested, but denied, - then return a Z_BUF_ERROR from inflateBack(). */ -#define PULL() \ - do { \ - if (have == 0) { \ - have = in(in_desc, &next); \ - if (have == 0) { \ - next = Z_NULL; \ - ret = Z_BUF_ERROR; \ - goto inf_leave; \ - } \ - } \ - } while (0) - -/* Get a byte of input into the bit accumulator, or return from inflateBack() - with an error if there is no input available. */ -#define PULLBYTE() \ - do { \ - PULL(); \ - have--; \ - hold += (unsigned long)(*next++) << bits; \ - bits += 8; \ - } while (0) - -/* Assure that there are at least n bits in the bit accumulator. If there is - not enough available input to do that, then return from inflateBack() with - an error. */ -#define NEEDBITS(n) \ - do { \ - while (bits < (unsigned)(n)) \ - PULLBYTE(); \ - } while (0) - -/* Return the low n bits of the bit accumulator (n < 16) */ -#define BITS(n) \ - ((unsigned)hold & ((1U << (n)) - 1)) - -/* Remove n bits from the bit accumulator */ -#define DROPBITS(n) \ - do { \ - hold >>= (n); \ - bits -= (unsigned)(n); \ - } while (0) - -/* Remove zero to seven bits as needed to go to a byte boundary */ -#define BYTEBITS() \ - do { \ - hold >>= bits & 7; \ - bits -= bits & 7; \ - } while (0) - -/* Assure that some output space is available, by writing out the window - if it's full. If the write fails, return from inflateBack() with a - Z_BUF_ERROR. */ -#define ROOM() \ - do { \ - if (left == 0) { \ - put = state->window; \ - left = state->wsize; \ - state->whave = left; \ - if (out(out_desc, put, left)) { \ - ret = Z_BUF_ERROR; \ - goto inf_leave; \ - } \ - } \ - } while (0) - -/* - strm provides the memory allocation functions and window buffer on input, - and provides information on the unused input on return. For Z_DATA_ERROR - returns, strm will also provide an error message. - - in() and out() are the call-back input and output functions. When - inflateBack() needs more input, it calls in(). When inflateBack() has - filled the window with output, or when it completes with data in the - window, it calls out() to write out the data. The application must not - change the provided input until in() is called again or inflateBack() - returns. The application must not change the window/output buffer until - inflateBack() returns. - - in() and out() are called with a descriptor parameter provided in the - inflateBack() call. This parameter can be a structure that provides the - information required to do the read or write, as well as accumulated - information on the input and output such as totals and check values. - - in() should return zero on failure. out() should return non-zero on - failure. If either in() or out() fails, than inflateBack() returns a - Z_BUF_ERROR. strm->next_in can be checked for Z_NULL to see whether it - was in() or out() that caused in the error. Otherwise, inflateBack() - returns Z_STREAM_END on success, Z_DATA_ERROR for an deflate format - error, or Z_MEM_ERROR if it could not allocate memory for the state. - inflateBack() can also return Z_STREAM_ERROR if the input parameters - are not correct, i.e. strm is Z_NULL or the state was not initialized. - */ -int ZEXPORT inflateBack(strm, in, in_desc, out, out_desc) -z_streamp strm; -in_func in; -void FAR *in_desc; -out_func out; -void FAR *out_desc; -{ - struct inflate_state FAR *state; - z_const unsigned char FAR *next; /* next input */ - unsigned char FAR *put; /* next output */ - unsigned have, left; /* available input and output */ - unsigned long hold; /* bit buffer */ - unsigned bits; /* bits in bit buffer */ - unsigned copy; /* number of stored or match bytes to copy */ - unsigned char FAR *from; /* where to copy match bytes from */ - code here; /* current decoding table entry */ - code last; /* parent table entry */ - unsigned len; /* length to copy for repeats, bits to drop */ - int ret; /* return code */ - static const unsigned short order[19] = /* permutation of code lengths */ - {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15}; - - /* Check that the strm exists and that the state was initialized */ - if (strm == Z_NULL || strm->state == Z_NULL) - return Z_STREAM_ERROR; - state = (struct inflate_state FAR *)strm->state; - - /* Reset the state */ - strm->msg = Z_NULL; - state->mode = TYPE; - state->last = 0; - state->whave = 0; - next = strm->next_in; - have = next != Z_NULL ? strm->avail_in : 0; - hold = 0; - bits = 0; - put = state->window; - left = state->wsize; - - /* Inflate until end of block marked as last */ - for (;;) - switch (state->mode) { - case TYPE: - /* determine and dispatch block type */ - if (state->last) { - BYTEBITS(); - state->mode = DONE; - break; - } - NEEDBITS(3); - state->last = BITS(1); - DROPBITS(1); - switch (BITS(2)) { - case 0: /* stored block */ - Tracev((stderr, "inflate: stored block%s\n", - state->last ? " (last)" : "")); - state->mode = STORED; - break; - case 1: /* fixed block */ - fixedtables(state); - Tracev((stderr, "inflate: fixed codes block%s\n", - state->last ? " (last)" : "")); - state->mode = LEN; /* decode codes */ - break; - case 2: /* dynamic block */ - Tracev((stderr, "inflate: dynamic codes block%s\n", - state->last ? " (last)" : "")); - state->mode = TABLE; - break; - case 3: - strm->msg = (char *)"invalid block type"; - state->mode = BAD; - } - DROPBITS(2); - break; - - case STORED: - /* get and verify stored block length */ - BYTEBITS(); /* go to byte boundary */ - NEEDBITS(32); - if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) { - strm->msg = (char *)"invalid stored block lengths"; - state->mode = BAD; - break; - } - state->length = (unsigned)hold & 0xffff; - Tracev((stderr, "inflate: stored length %u\n", - state->length)); - INITBITS(); - - /* copy stored block from input to output */ - while (state->length != 0) { - copy = state->length; - PULL(); - ROOM(); - if (copy > have) copy = have; - if (copy > left) copy = left; - zmemcpy(put, next, copy); - have -= copy; - next += copy; - left -= copy; - put += copy; - state->length -= copy; - } - Tracev((stderr, "inflate: stored end\n")); - state->mode = TYPE; - break; - - case TABLE: - /* get dynamic table entries descriptor */ - NEEDBITS(14); - state->nlen = BITS(5) + 257; - DROPBITS(5); - state->ndist = BITS(5) + 1; - DROPBITS(5); - state->ncode = BITS(4) + 4; - DROPBITS(4); -#ifndef PKZIP_BUG_WORKAROUND - if (state->nlen > 286 || state->ndist > 30) { - strm->msg = (char *)"too many length or distance symbols"; - state->mode = BAD; - break; - } -#endif - Tracev((stderr, "inflate: table sizes ok\n")); - - /* get code length code lengths (not a typo) */ - state->have = 0; - while (state->have < state->ncode) { - NEEDBITS(3); - state->lens[order[state->have++]] = (unsigned short)BITS(3); - DROPBITS(3); - } - while (state->have < 19) - state->lens[order[state->have++]] = 0; - state->next = state->codes; - state->lencode = (code const FAR *)(state->next); - state->lenbits = 7; - ret = inflate_table(CODES, state->lens, 19, &(state->next), - &(state->lenbits), state->work); - if (ret) { - strm->msg = (char *)"invalid code lengths set"; - state->mode = BAD; - break; - } - Tracev((stderr, "inflate: code lengths ok\n")); - - /* get length and distance code code lengths */ - state->have = 0; - while (state->have < state->nlen + state->ndist) { - for (;;) { - here = state->lencode[BITS(state->lenbits)]; - if ((unsigned)(here.bits) <= bits) break; - PULLBYTE(); - } - if (here.val < 16) { - DROPBITS(here.bits); - state->lens[state->have++] = here.val; - } - else { - if (here.val == 16) { - NEEDBITS(here.bits + 2); - DROPBITS(here.bits); - if (state->have == 0) { - strm->msg = (char *)"invalid bit length repeat"; - state->mode = BAD; - break; - } - len = (unsigned)(state->lens[state->have - 1]); - copy = 3 + BITS(2); - DROPBITS(2); - } - else if (here.val == 17) { - NEEDBITS(here.bits + 3); - DROPBITS(here.bits); - len = 0; - copy = 3 + BITS(3); - DROPBITS(3); - } - else { - NEEDBITS(here.bits + 7); - DROPBITS(here.bits); - len = 0; - copy = 11 + BITS(7); - DROPBITS(7); - } - if (state->have + copy > state->nlen + state->ndist) { - strm->msg = (char *)"invalid bit length repeat"; - state->mode = BAD; - break; - } - while (copy--) - state->lens[state->have++] = (unsigned short)len; - } - } - - /* handle error breaks in while */ - if (state->mode == BAD) break; - - /* check for end-of-block code (better have one) */ - if (state->lens[256] == 0) { - strm->msg = (char *)"invalid code -- missing end-of-block"; - state->mode = BAD; - break; - } - - /* build code tables -- note: do not change the lenbits or distbits - values here (9 and 6) without reading the comments in inftrees.h - concerning the ENOUGH constants, which depend on those values */ - state->next = state->codes; - state->lencode = (code const FAR *)(state->next); - state->lenbits = 9; - ret = inflate_table(LENS, state->lens, state->nlen, &(state->next), - &(state->lenbits), state->work); - if (ret) { - strm->msg = (char *)"invalid literal/lengths set"; - state->mode = BAD; - break; - } - state->distcode = (code const FAR *)(state->next); - state->distbits = 6; - ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist, - &(state->next), &(state->distbits), state->work); - if (ret) { - strm->msg = (char *)"invalid distances set"; - state->mode = BAD; - break; - } - Tracev((stderr, "inflate: codes ok\n")); - state->mode = LEN; - - case LEN: - /* use inflate_fast() if we have enough input and output */ - if (have >= 6 && left >= 258) { - RESTORE(); - if (state->whave < state->wsize) - state->whave = state->wsize - left; - inflate_fast(strm, state->wsize); - LOAD(); - break; - } - - /* get a literal, length, or end-of-block code */ - for (;;) { - here = state->lencode[BITS(state->lenbits)]; - if ((unsigned)(here.bits) <= bits) break; - PULLBYTE(); - } - if (here.op && (here.op & 0xf0) == 0) { - last = here; - for (;;) { - here = state->lencode[last.val + - (BITS(last.bits + last.op) >> last.bits)]; - if ((unsigned)(last.bits + here.bits) <= bits) break; - PULLBYTE(); - } - DROPBITS(last.bits); - } - DROPBITS(here.bits); - state->length = (unsigned)here.val; - - /* process literal */ - if (here.op == 0) { - Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ? - "inflate: literal '%c'\n" : - "inflate: literal 0x%02x\n", here.val)); - ROOM(); - *put++ = (unsigned char)(state->length); - left--; - state->mode = LEN; - break; - } - - /* process end of block */ - if (here.op & 32) { - Tracevv((stderr, "inflate: end of block\n")); - state->mode = TYPE; - break; - } - - /* invalid code */ - if (here.op & 64) { - strm->msg = (char *)"invalid literal/length code"; - state->mode = BAD; - break; - } - - /* length code -- get extra bits, if any */ - state->extra = (unsigned)(here.op) & 15; - if (state->extra != 0) { - NEEDBITS(state->extra); - state->length += BITS(state->extra); - DROPBITS(state->extra); - } - Tracevv((stderr, "inflate: length %u\n", state->length)); - - /* get distance code */ - for (;;) { - here = state->distcode[BITS(state->distbits)]; - if ((unsigned)(here.bits) <= bits) break; - PULLBYTE(); - } - if ((here.op & 0xf0) == 0) { - last = here; - for (;;) { - here = state->distcode[last.val + - (BITS(last.bits + last.op) >> last.bits)]; - if ((unsigned)(last.bits + here.bits) <= bits) break; - PULLBYTE(); - } - DROPBITS(last.bits); - } - DROPBITS(here.bits); - if (here.op & 64) { - strm->msg = (char *)"invalid distance code"; - state->mode = BAD; - break; - } - state->offset = (unsigned)here.val; - - /* get distance extra bits, if any */ - state->extra = (unsigned)(here.op) & 15; - if (state->extra != 0) { - NEEDBITS(state->extra); - state->offset += BITS(state->extra); - DROPBITS(state->extra); - } - if (state->offset > state->wsize - (state->whave < state->wsize ? - left : 0)) { - strm->msg = (char *)"invalid distance too far back"; - state->mode = BAD; - break; - } - Tracevv((stderr, "inflate: distance %u\n", state->offset)); - - /* copy match from window to output */ - do { - ROOM(); - copy = state->wsize - state->offset; - if (copy < left) { - from = put + copy; - copy = left - copy; - } - else { - from = put - state->offset; - copy = left; - } - if (copy > state->length) copy = state->length; - state->length -= copy; - left -= copy; - do { - *put++ = *from++; - } while (--copy); - } while (state->length != 0); - break; - - case DONE: - /* inflate stream terminated properly -- write leftover output */ - ret = Z_STREAM_END; - if (left < state->wsize) { - if (out(out_desc, state->window, state->wsize - left)) - ret = Z_BUF_ERROR; - } - goto inf_leave; - - case BAD: - ret = Z_DATA_ERROR; - goto inf_leave; - - default: /* can't happen, but makes compilers happy */ - ret = Z_STREAM_ERROR; - goto inf_leave; - } - - /* Return unused input */ - inf_leave: - strm->next_in = next; - strm->avail_in = have; - return ret; -} - -int ZEXPORT inflateBackEnd(strm) -z_streamp strm; -{ - if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0) - return Z_STREAM_ERROR; - ZFREE(strm, strm->state); - strm->state = Z_NULL; - Tracev((stderr, "inflate: end\n")); - return Z_OK; -} diff --git a/vendor/libgit2/deps/zlib/inffast.c b/vendor/libgit2/deps/zlib/inffast.c deleted file mode 100644 index bda59ceb6..000000000 --- a/vendor/libgit2/deps/zlib/inffast.c +++ /dev/null @@ -1,340 +0,0 @@ -/* inffast.c -- fast decoding - * Copyright (C) 1995-2008, 2010, 2013 Mark Adler - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -#include "zutil.h" -#include "inftrees.h" -#include "inflate.h" -#include "inffast.h" - -#ifndef ASMINF - -/* Allow machine dependent optimization for post-increment or pre-increment. - Based on testing to date, - Pre-increment preferred for: - - PowerPC G3 (Adler) - - MIPS R5000 (Randers-Pehrson) - Post-increment preferred for: - - none - No measurable difference: - - Pentium III (Anderson) - - M68060 (Nikl) - */ -#ifdef POSTINC -# define OFF 0 -# define PUP(a) *(a)++ -#else -# define OFF 1 -# define PUP(a) *++(a) -#endif - -/* - Decode literal, length, and distance codes and write out the resulting - literal and match bytes until either not enough input or output is - available, an end-of-block is encountered, or a data error is encountered. - When large enough input and output buffers are supplied to inflate(), for - example, a 16K input buffer and a 64K output buffer, more than 95% of the - inflate execution time is spent in this routine. - - Entry assumptions: - - state->mode == LEN - strm->avail_in >= 6 - strm->avail_out >= 258 - start >= strm->avail_out - state->bits < 8 - - On return, state->mode is one of: - - LEN -- ran out of enough output space or enough available input - TYPE -- reached end of block code, inflate() to interpret next block - BAD -- error in block data - - Notes: - - - The maximum input bits used by a length/distance pair is 15 bits for the - length code, 5 bits for the length extra, 15 bits for the distance code, - and 13 bits for the distance extra. This totals 48 bits, or six bytes. - Therefore if strm->avail_in >= 6, then there is enough input to avoid - checking for available input while decoding. - - - The maximum bytes that a single length/distance pair can output is 258 - bytes, which is the maximum length that can be coded. inflate_fast() - requires strm->avail_out >= 258 for each loop to avoid checking for - output space. - */ -void ZLIB_INTERNAL inflate_fast(strm, start) -z_streamp strm; -unsigned start; /* inflate()'s starting value for strm->avail_out */ -{ - struct inflate_state FAR *state; - z_const unsigned char FAR *in; /* local strm->next_in */ - z_const unsigned char FAR *last; /* have enough input while in < last */ - unsigned char FAR *out; /* local strm->next_out */ - unsigned char FAR *beg; /* inflate()'s initial strm->next_out */ - unsigned char FAR *end; /* while out < end, enough space available */ -#ifdef INFLATE_STRICT - unsigned dmax; /* maximum distance from zlib header */ -#endif - unsigned wsize; /* window size or zero if not using window */ - unsigned whave; /* valid bytes in the window */ - unsigned wnext; /* window write index */ - unsigned char FAR *window; /* allocated sliding window, if wsize != 0 */ - unsigned long hold; /* local strm->hold */ - unsigned bits; /* local strm->bits */ - code const FAR *lcode; /* local strm->lencode */ - code const FAR *dcode; /* local strm->distcode */ - unsigned lmask; /* mask for first level of length codes */ - unsigned dmask; /* mask for first level of distance codes */ - code here; /* retrieved table entry */ - unsigned op; /* code bits, operation, extra bits, or */ - /* window position, window bytes to copy */ - unsigned len; /* match length, unused bytes */ - unsigned dist; /* match distance */ - unsigned char FAR *from; /* where to copy match from */ - - /* copy state to local variables */ - state = (struct inflate_state FAR *)strm->state; - in = strm->next_in - OFF; - last = in + (strm->avail_in - 5); - out = strm->next_out - OFF; - beg = out - (start - strm->avail_out); - end = out + (strm->avail_out - 257); -#ifdef INFLATE_STRICT - dmax = state->dmax; -#endif - wsize = state->wsize; - whave = state->whave; - wnext = state->wnext; - window = state->window; - hold = state->hold; - bits = state->bits; - lcode = state->lencode; - dcode = state->distcode; - lmask = (1U << state->lenbits) - 1; - dmask = (1U << state->distbits) - 1; - - /* decode literals and length/distances until end-of-block or not enough - input data or output space */ - do { - if (bits < 15) { - hold += (unsigned long)(PUP(in)) << bits; - bits += 8; - hold += (unsigned long)(PUP(in)) << bits; - bits += 8; - } - here = lcode[hold & lmask]; - dolen: - op = (unsigned)(here.bits); - hold >>= op; - bits -= op; - op = (unsigned)(here.op); - if (op == 0) { /* literal */ - Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ? - "inflate: literal '%c'\n" : - "inflate: literal 0x%02x\n", here.val)); - PUP(out) = (unsigned char)(here.val); - } - else if (op & 16) { /* length base */ - len = (unsigned)(here.val); - op &= 15; /* number of extra bits */ - if (op) { - if (bits < op) { - hold += (unsigned long)(PUP(in)) << bits; - bits += 8; - } - len += (unsigned)hold & ((1U << op) - 1); - hold >>= op; - bits -= op; - } - Tracevv((stderr, "inflate: length %u\n", len)); - if (bits < 15) { - hold += (unsigned long)(PUP(in)) << bits; - bits += 8; - hold += (unsigned long)(PUP(in)) << bits; - bits += 8; - } - here = dcode[hold & dmask]; - dodist: - op = (unsigned)(here.bits); - hold >>= op; - bits -= op; - op = (unsigned)(here.op); - if (op & 16) { /* distance base */ - dist = (unsigned)(here.val); - op &= 15; /* number of extra bits */ - if (bits < op) { - hold += (unsigned long)(PUP(in)) << bits; - bits += 8; - if (bits < op) { - hold += (unsigned long)(PUP(in)) << bits; - bits += 8; - } - } - dist += (unsigned)hold & ((1U << op) - 1); -#ifdef INFLATE_STRICT - if (dist > dmax) { - strm->msg = (char *)"invalid distance too far back"; - state->mode = BAD; - break; - } -#endif - hold >>= op; - bits -= op; - Tracevv((stderr, "inflate: distance %u\n", dist)); - op = (unsigned)(out - beg); /* max distance in output */ - if (dist > op) { /* see if copy from window */ - op = dist - op; /* distance back in window */ - if (op > whave) { - if (state->sane) { - strm->msg = - (char *)"invalid distance too far back"; - state->mode = BAD; - break; - } -#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR - if (len <= op - whave) { - do { - PUP(out) = 0; - } while (--len); - continue; - } - len -= op - whave; - do { - PUP(out) = 0; - } while (--op > whave); - if (op == 0) { - from = out - dist; - do { - PUP(out) = PUP(from); - } while (--len); - continue; - } -#endif - } - from = window - OFF; - if (wnext == 0) { /* very common case */ - from += wsize - op; - if (op < len) { /* some from window */ - len -= op; - do { - PUP(out) = PUP(from); - } while (--op); - from = out - dist; /* rest from output */ - } - } - else if (wnext < op) { /* wrap around window */ - from += wsize + wnext - op; - op -= wnext; - if (op < len) { /* some from end of window */ - len -= op; - do { - PUP(out) = PUP(from); - } while (--op); - from = window - OFF; - if (wnext < len) { /* some from start of window */ - op = wnext; - len -= op; - do { - PUP(out) = PUP(from); - } while (--op); - from = out - dist; /* rest from output */ - } - } - } - else { /* contiguous in window */ - from += wnext - op; - if (op < len) { /* some from window */ - len -= op; - do { - PUP(out) = PUP(from); - } while (--op); - from = out - dist; /* rest from output */ - } - } - while (len > 2) { - PUP(out) = PUP(from); - PUP(out) = PUP(from); - PUP(out) = PUP(from); - len -= 3; - } - if (len) { - PUP(out) = PUP(from); - if (len > 1) - PUP(out) = PUP(from); - } - } - else { - from = out - dist; /* copy direct from output */ - do { /* minimum length is three */ - PUP(out) = PUP(from); - PUP(out) = PUP(from); - PUP(out) = PUP(from); - len -= 3; - } while (len > 2); - if (len) { - PUP(out) = PUP(from); - if (len > 1) - PUP(out) = PUP(from); - } - } - } - else if ((op & 64) == 0) { /* 2nd level distance code */ - here = dcode[here.val + (hold & ((1U << op) - 1))]; - goto dodist; - } - else { - strm->msg = (char *)"invalid distance code"; - state->mode = BAD; - break; - } - } - else if ((op & 64) == 0) { /* 2nd level length code */ - here = lcode[here.val + (hold & ((1U << op) - 1))]; - goto dolen; - } - else if (op & 32) { /* end-of-block */ - Tracevv((stderr, "inflate: end of block\n")); - state->mode = TYPE; - break; - } - else { - strm->msg = (char *)"invalid literal/length code"; - state->mode = BAD; - break; - } - } while (in < last && out < end); - - /* return unused bytes (on entry, bits < 8, so in won't go too far back) */ - len = bits >> 3; - in -= len; - bits -= len << 3; - hold &= (1U << bits) - 1; - - /* update state and return */ - strm->next_in = in + OFF; - strm->next_out = out + OFF; - strm->avail_in = (unsigned)(in < last ? 5 + (last - in) : 5 - (in - last)); - strm->avail_out = (unsigned)(out < end ? - 257 + (end - out) : 257 - (out - end)); - state->hold = hold; - state->bits = bits; - return; -} - -/* - inflate_fast() speedups that turned out slower (on a PowerPC G3 750CXe): - - Using bit fields for code structure - - Different op definition to avoid & for extra bits (do & for table bits) - - Three separate decoding do-loops for direct, window, and wnext == 0 - - Special case for distance > 1 copies to do overlapped load and store copy - - Explicit branch predictions (based on measured branch probabilities) - - Deferring match copy and interspersed it with decoding subsequent codes - - Swapping literal/length else - - Swapping window/direct else - - Larger unrolled copy loops (three is about right) - - Moving len -= 3 statement into middle of loop - */ - -#endif /* !ASMINF */ diff --git a/vendor/libgit2/deps/zlib/inffast.h b/vendor/libgit2/deps/zlib/inffast.h deleted file mode 100644 index e5c1aa4ca..000000000 --- a/vendor/libgit2/deps/zlib/inffast.h +++ /dev/null @@ -1,11 +0,0 @@ -/* inffast.h -- header to use inffast.c - * Copyright (C) 1995-2003, 2010 Mark Adler - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -/* WARNING: this file should *not* be used by applications. It is - part of the implementation of the compression library and is - subject to change. Applications should only use zlib.h. - */ - -void ZLIB_INTERNAL inflate_fast OF((z_streamp strm, unsigned start)); diff --git a/vendor/libgit2/deps/zlib/inffixed.h b/vendor/libgit2/deps/zlib/inffixed.h deleted file mode 100644 index d62832776..000000000 --- a/vendor/libgit2/deps/zlib/inffixed.h +++ /dev/null @@ -1,94 +0,0 @@ - /* inffixed.h -- table for decoding fixed codes - * Generated automatically by makefixed(). - */ - - /* WARNING: this file should *not* be used by applications. - It is part of the implementation of this library and is - subject to change. Applications should only use zlib.h. - */ - - static const code lenfix[512] = { - {96,7,0},{0,8,80},{0,8,16},{20,8,115},{18,7,31},{0,8,112},{0,8,48}, - {0,9,192},{16,7,10},{0,8,96},{0,8,32},{0,9,160},{0,8,0},{0,8,128}, - {0,8,64},{0,9,224},{16,7,6},{0,8,88},{0,8,24},{0,9,144},{19,7,59}, - {0,8,120},{0,8,56},{0,9,208},{17,7,17},{0,8,104},{0,8,40},{0,9,176}, - {0,8,8},{0,8,136},{0,8,72},{0,9,240},{16,7,4},{0,8,84},{0,8,20}, - {21,8,227},{19,7,43},{0,8,116},{0,8,52},{0,9,200},{17,7,13},{0,8,100}, - {0,8,36},{0,9,168},{0,8,4},{0,8,132},{0,8,68},{0,9,232},{16,7,8}, - {0,8,92},{0,8,28},{0,9,152},{20,7,83},{0,8,124},{0,8,60},{0,9,216}, - {18,7,23},{0,8,108},{0,8,44},{0,9,184},{0,8,12},{0,8,140},{0,8,76}, - {0,9,248},{16,7,3},{0,8,82},{0,8,18},{21,8,163},{19,7,35},{0,8,114}, - {0,8,50},{0,9,196},{17,7,11},{0,8,98},{0,8,34},{0,9,164},{0,8,2}, - {0,8,130},{0,8,66},{0,9,228},{16,7,7},{0,8,90},{0,8,26},{0,9,148}, - {20,7,67},{0,8,122},{0,8,58},{0,9,212},{18,7,19},{0,8,106},{0,8,42}, - {0,9,180},{0,8,10},{0,8,138},{0,8,74},{0,9,244},{16,7,5},{0,8,86}, - {0,8,22},{64,8,0},{19,7,51},{0,8,118},{0,8,54},{0,9,204},{17,7,15}, - {0,8,102},{0,8,38},{0,9,172},{0,8,6},{0,8,134},{0,8,70},{0,9,236}, - {16,7,9},{0,8,94},{0,8,30},{0,9,156},{20,7,99},{0,8,126},{0,8,62}, - {0,9,220},{18,7,27},{0,8,110},{0,8,46},{0,9,188},{0,8,14},{0,8,142}, - {0,8,78},{0,9,252},{96,7,0},{0,8,81},{0,8,17},{21,8,131},{18,7,31}, - {0,8,113},{0,8,49},{0,9,194},{16,7,10},{0,8,97},{0,8,33},{0,9,162}, - {0,8,1},{0,8,129},{0,8,65},{0,9,226},{16,7,6},{0,8,89},{0,8,25}, - {0,9,146},{19,7,59},{0,8,121},{0,8,57},{0,9,210},{17,7,17},{0,8,105}, - {0,8,41},{0,9,178},{0,8,9},{0,8,137},{0,8,73},{0,9,242},{16,7,4}, - {0,8,85},{0,8,21},{16,8,258},{19,7,43},{0,8,117},{0,8,53},{0,9,202}, - {17,7,13},{0,8,101},{0,8,37},{0,9,170},{0,8,5},{0,8,133},{0,8,69}, - {0,9,234},{16,7,8},{0,8,93},{0,8,29},{0,9,154},{20,7,83},{0,8,125}, - {0,8,61},{0,9,218},{18,7,23},{0,8,109},{0,8,45},{0,9,186},{0,8,13}, - {0,8,141},{0,8,77},{0,9,250},{16,7,3},{0,8,83},{0,8,19},{21,8,195}, - {19,7,35},{0,8,115},{0,8,51},{0,9,198},{17,7,11},{0,8,99},{0,8,35}, - {0,9,166},{0,8,3},{0,8,131},{0,8,67},{0,9,230},{16,7,7},{0,8,91}, - {0,8,27},{0,9,150},{20,7,67},{0,8,123},{0,8,59},{0,9,214},{18,7,19}, - {0,8,107},{0,8,43},{0,9,182},{0,8,11},{0,8,139},{0,8,75},{0,9,246}, - {16,7,5},{0,8,87},{0,8,23},{64,8,0},{19,7,51},{0,8,119},{0,8,55}, - {0,9,206},{17,7,15},{0,8,103},{0,8,39},{0,9,174},{0,8,7},{0,8,135}, - {0,8,71},{0,9,238},{16,7,9},{0,8,95},{0,8,31},{0,9,158},{20,7,99}, - {0,8,127},{0,8,63},{0,9,222},{18,7,27},{0,8,111},{0,8,47},{0,9,190}, - {0,8,15},{0,8,143},{0,8,79},{0,9,254},{96,7,0},{0,8,80},{0,8,16}, - {20,8,115},{18,7,31},{0,8,112},{0,8,48},{0,9,193},{16,7,10},{0,8,96}, - {0,8,32},{0,9,161},{0,8,0},{0,8,128},{0,8,64},{0,9,225},{16,7,6}, - {0,8,88},{0,8,24},{0,9,145},{19,7,59},{0,8,120},{0,8,56},{0,9,209}, - {17,7,17},{0,8,104},{0,8,40},{0,9,177},{0,8,8},{0,8,136},{0,8,72}, - {0,9,241},{16,7,4},{0,8,84},{0,8,20},{21,8,227},{19,7,43},{0,8,116}, - {0,8,52},{0,9,201},{17,7,13},{0,8,100},{0,8,36},{0,9,169},{0,8,4}, - {0,8,132},{0,8,68},{0,9,233},{16,7,8},{0,8,92},{0,8,28},{0,9,153}, - {20,7,83},{0,8,124},{0,8,60},{0,9,217},{18,7,23},{0,8,108},{0,8,44}, - {0,9,185},{0,8,12},{0,8,140},{0,8,76},{0,9,249},{16,7,3},{0,8,82}, - {0,8,18},{21,8,163},{19,7,35},{0,8,114},{0,8,50},{0,9,197},{17,7,11}, - {0,8,98},{0,8,34},{0,9,165},{0,8,2},{0,8,130},{0,8,66},{0,9,229}, - {16,7,7},{0,8,90},{0,8,26},{0,9,149},{20,7,67},{0,8,122},{0,8,58}, - {0,9,213},{18,7,19},{0,8,106},{0,8,42},{0,9,181},{0,8,10},{0,8,138}, - {0,8,74},{0,9,245},{16,7,5},{0,8,86},{0,8,22},{64,8,0},{19,7,51}, - {0,8,118},{0,8,54},{0,9,205},{17,7,15},{0,8,102},{0,8,38},{0,9,173}, - {0,8,6},{0,8,134},{0,8,70},{0,9,237},{16,7,9},{0,8,94},{0,8,30}, - {0,9,157},{20,7,99},{0,8,126},{0,8,62},{0,9,221},{18,7,27},{0,8,110}, - {0,8,46},{0,9,189},{0,8,14},{0,8,142},{0,8,78},{0,9,253},{96,7,0}, - {0,8,81},{0,8,17},{21,8,131},{18,7,31},{0,8,113},{0,8,49},{0,9,195}, - {16,7,10},{0,8,97},{0,8,33},{0,9,163},{0,8,1},{0,8,129},{0,8,65}, - {0,9,227},{16,7,6},{0,8,89},{0,8,25},{0,9,147},{19,7,59},{0,8,121}, - {0,8,57},{0,9,211},{17,7,17},{0,8,105},{0,8,41},{0,9,179},{0,8,9}, - {0,8,137},{0,8,73},{0,9,243},{16,7,4},{0,8,85},{0,8,21},{16,8,258}, - {19,7,43},{0,8,117},{0,8,53},{0,9,203},{17,7,13},{0,8,101},{0,8,37}, - {0,9,171},{0,8,5},{0,8,133},{0,8,69},{0,9,235},{16,7,8},{0,8,93}, - {0,8,29},{0,9,155},{20,7,83},{0,8,125},{0,8,61},{0,9,219},{18,7,23}, - {0,8,109},{0,8,45},{0,9,187},{0,8,13},{0,8,141},{0,8,77},{0,9,251}, - {16,7,3},{0,8,83},{0,8,19},{21,8,195},{19,7,35},{0,8,115},{0,8,51}, - {0,9,199},{17,7,11},{0,8,99},{0,8,35},{0,9,167},{0,8,3},{0,8,131}, - {0,8,67},{0,9,231},{16,7,7},{0,8,91},{0,8,27},{0,9,151},{20,7,67}, - {0,8,123},{0,8,59},{0,9,215},{18,7,19},{0,8,107},{0,8,43},{0,9,183}, - {0,8,11},{0,8,139},{0,8,75},{0,9,247},{16,7,5},{0,8,87},{0,8,23}, - {64,8,0},{19,7,51},{0,8,119},{0,8,55},{0,9,207},{17,7,15},{0,8,103}, - {0,8,39},{0,9,175},{0,8,7},{0,8,135},{0,8,71},{0,9,239},{16,7,9}, - {0,8,95},{0,8,31},{0,9,159},{20,7,99},{0,8,127},{0,8,63},{0,9,223}, - {18,7,27},{0,8,111},{0,8,47},{0,9,191},{0,8,15},{0,8,143},{0,8,79}, - {0,9,255} - }; - - static const code distfix[32] = { - {16,5,1},{23,5,257},{19,5,17},{27,5,4097},{17,5,5},{25,5,1025}, - {21,5,65},{29,5,16385},{16,5,3},{24,5,513},{20,5,33},{28,5,8193}, - {18,5,9},{26,5,2049},{22,5,129},{64,5,0},{16,5,2},{23,5,385}, - {19,5,25},{27,5,6145},{17,5,7},{25,5,1537},{21,5,97},{29,5,24577}, - {16,5,4},{24,5,769},{20,5,49},{28,5,12289},{18,5,13},{26,5,3073}, - {22,5,193},{64,5,0} - }; diff --git a/vendor/libgit2/deps/zlib/inflate.c b/vendor/libgit2/deps/zlib/inflate.c deleted file mode 100644 index 870f89bb4..000000000 --- a/vendor/libgit2/deps/zlib/inflate.c +++ /dev/null @@ -1,1512 +0,0 @@ -/* inflate.c -- zlib decompression - * Copyright (C) 1995-2012 Mark Adler - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -/* - * Change history: - * - * 1.2.beta0 24 Nov 2002 - * - First version -- complete rewrite of inflate to simplify code, avoid - * creation of window when not needed, minimize use of window when it is - * needed, make inffast.c even faster, implement gzip decoding, and to - * improve code readability and style over the previous zlib inflate code - * - * 1.2.beta1 25 Nov 2002 - * - Use pointers for available input and output checking in inffast.c - * - Remove input and output counters in inffast.c - * - Change inffast.c entry and loop from avail_in >= 7 to >= 6 - * - Remove unnecessary second byte pull from length extra in inffast.c - * - Unroll direct copy to three copies per loop in inffast.c - * - * 1.2.beta2 4 Dec 2002 - * - Change external routine names to reduce potential conflicts - * - Correct filename to inffixed.h for fixed tables in inflate.c - * - Make hbuf[] unsigned char to match parameter type in inflate.c - * - Change strm->next_out[-state->offset] to *(strm->next_out - state->offset) - * to avoid negation problem on Alphas (64 bit) in inflate.c - * - * 1.2.beta3 22 Dec 2002 - * - Add comments on state->bits assertion in inffast.c - * - Add comments on op field in inftrees.h - * - Fix bug in reuse of allocated window after inflateReset() - * - Remove bit fields--back to byte structure for speed - * - Remove distance extra == 0 check in inflate_fast()--only helps for lengths - * - Change post-increments to pre-increments in inflate_fast(), PPC biased? - * - Add compile time option, POSTINC, to use post-increments instead (Intel?) - * - Make MATCH copy in inflate() much faster for when inflate_fast() not used - * - Use local copies of stream next and avail values, as well as local bit - * buffer and bit count in inflate()--for speed when inflate_fast() not used - * - * 1.2.beta4 1 Jan 2003 - * - Split ptr - 257 statements in inflate_table() to avoid compiler warnings - * - Move a comment on output buffer sizes from inffast.c to inflate.c - * - Add comments in inffast.c to introduce the inflate_fast() routine - * - Rearrange window copies in inflate_fast() for speed and simplification - * - Unroll last copy for window match in inflate_fast() - * - Use local copies of window variables in inflate_fast() for speed - * - Pull out common wnext == 0 case for speed in inflate_fast() - * - Make op and len in inflate_fast() unsigned for consistency - * - Add FAR to lcode and dcode declarations in inflate_fast() - * - Simplified bad distance check in inflate_fast() - * - Added inflateBackInit(), inflateBack(), and inflateBackEnd() in new - * source file infback.c to provide a call-back interface to inflate for - * programs like gzip and unzip -- uses window as output buffer to avoid - * window copying - * - * 1.2.beta5 1 Jan 2003 - * - Improved inflateBack() interface to allow the caller to provide initial - * input in strm. - * - Fixed stored blocks bug in inflateBack() - * - * 1.2.beta6 4 Jan 2003 - * - Added comments in inffast.c on effectiveness of POSTINC - * - Typecasting all around to reduce compiler warnings - * - Changed loops from while (1) or do {} while (1) to for (;;), again to - * make compilers happy - * - Changed type of window in inflateBackInit() to unsigned char * - * - * 1.2.beta7 27 Jan 2003 - * - Changed many types to unsigned or unsigned short to avoid warnings - * - Added inflateCopy() function - * - * 1.2.0 9 Mar 2003 - * - Changed inflateBack() interface to provide separate opaque descriptors - * for the in() and out() functions - * - Changed inflateBack() argument and in_func typedef to swap the length - * and buffer address return values for the input function - * - Check next_in and next_out for Z_NULL on entry to inflate() - * - * The history for versions after 1.2.0 are in ChangeLog in zlib distribution. - */ - -#include "zutil.h" -#include "inftrees.h" -#include "inflate.h" -#include "inffast.h" - -#ifdef MAKEFIXED -# ifndef BUILDFIXED -# define BUILDFIXED -# endif -#endif - -/* function prototypes */ -local void fixedtables OF((struct inflate_state FAR *state)); -local int updatewindow OF((z_streamp strm, const unsigned char FAR *end, - unsigned copy)); -#ifdef BUILDFIXED - void makefixed OF((void)); -#endif -local unsigned syncsearch OF((unsigned FAR *have, const unsigned char FAR *buf, - unsigned len)); - -int ZEXPORT inflateResetKeep(strm) -z_streamp strm; -{ - struct inflate_state FAR *state; - - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; - state = (struct inflate_state FAR *)strm->state; - strm->total_in = strm->total_out = state->total = 0; - strm->msg = Z_NULL; - if (state->wrap) /* to support ill-conceived Java test suite */ - strm->adler = state->wrap & 1; - state->mode = HEAD; - state->last = 0; - state->havedict = 0; - state->dmax = 32768U; - state->head = Z_NULL; - state->hold = 0; - state->bits = 0; - state->lencode = state->distcode = state->next = state->codes; - state->sane = 1; - state->back = -1; - Tracev((stderr, "inflate: reset\n")); - return Z_OK; -} - -int ZEXPORT inflateReset(strm) -z_streamp strm; -{ - struct inflate_state FAR *state; - - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; - state = (struct inflate_state FAR *)strm->state; - state->wsize = 0; - state->whave = 0; - state->wnext = 0; - return inflateResetKeep(strm); -} - -int ZEXPORT inflateReset2(strm, windowBits) -z_streamp strm; -int windowBits; -{ - int wrap; - struct inflate_state FAR *state; - - /* get the state */ - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; - state = (struct inflate_state FAR *)strm->state; - - /* extract wrap request from windowBits parameter */ - if (windowBits < 0) { - wrap = 0; - windowBits = -windowBits; - } - else { - wrap = (windowBits >> 4) + 1; -#ifdef GUNZIP - if (windowBits < 48) - windowBits &= 15; -#endif - } - - /* set number of window bits, free window if different */ - if (windowBits && (windowBits < 8 || windowBits > 15)) - return Z_STREAM_ERROR; - if (state->window != Z_NULL && state->wbits != (unsigned)windowBits) { - ZFREE(strm, state->window); - state->window = Z_NULL; - } - - /* update state and reset the rest of it */ - state->wrap = wrap; - state->wbits = (unsigned)windowBits; - return inflateReset(strm); -} - -int ZEXPORT inflateInit2_(strm, windowBits, version, stream_size) -z_streamp strm; -int windowBits; -const char *version; -int stream_size; -{ - int ret; - struct inflate_state FAR *state; - - if (version == Z_NULL || version[0] != ZLIB_VERSION[0] || - stream_size != (int)(sizeof(z_stream))) - return Z_VERSION_ERROR; - if (strm == Z_NULL) return Z_STREAM_ERROR; - strm->msg = Z_NULL; /* in case we return an error */ - if (strm->zalloc == (alloc_func)0) { -#ifdef Z_SOLO - return Z_STREAM_ERROR; -#else - strm->zalloc = zcalloc; - strm->opaque = (voidpf)0; -#endif - } - if (strm->zfree == (free_func)0) -#ifdef Z_SOLO - return Z_STREAM_ERROR; -#else - strm->zfree = zcfree; -#endif - state = (struct inflate_state FAR *) - ZALLOC(strm, 1, sizeof(struct inflate_state)); - if (state == Z_NULL) return Z_MEM_ERROR; - Tracev((stderr, "inflate: allocated\n")); - strm->state = (struct internal_state FAR *)state; - state->window = Z_NULL; - ret = inflateReset2(strm, windowBits); - if (ret != Z_OK) { - ZFREE(strm, state); - strm->state = Z_NULL; - } - return ret; -} - -int ZEXPORT inflateInit_(strm, version, stream_size) -z_streamp strm; -const char *version; -int stream_size; -{ - return inflateInit2_(strm, DEF_WBITS, version, stream_size); -} - -int ZEXPORT inflatePrime(strm, bits, value) -z_streamp strm; -int bits; -int value; -{ - struct inflate_state FAR *state; - - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; - state = (struct inflate_state FAR *)strm->state; - if (bits < 0) { - state->hold = 0; - state->bits = 0; - return Z_OK; - } - if (bits > 16 || state->bits + bits > 32) return Z_STREAM_ERROR; - value &= (1L << bits) - 1; - state->hold += value << state->bits; - state->bits += bits; - return Z_OK; -} - -/* - Return state with length and distance decoding tables and index sizes set to - fixed code decoding. Normally this returns fixed tables from inffixed.h. - If BUILDFIXED is defined, then instead this routine builds the tables the - first time it's called, and returns those tables the first time and - thereafter. This reduces the size of the code by about 2K bytes, in - exchange for a little execution time. However, BUILDFIXED should not be - used for threaded applications, since the rewriting of the tables and virgin - may not be thread-safe. - */ -local void fixedtables(state) -struct inflate_state FAR *state; -{ -#ifdef BUILDFIXED - static int virgin = 1; - static code *lenfix, *distfix; - static code fixed[544]; - - /* build fixed huffman tables if first call (may not be thread safe) */ - if (virgin) { - unsigned sym, bits; - static code *next; - - /* literal/length table */ - sym = 0; - while (sym < 144) state->lens[sym++] = 8; - while (sym < 256) state->lens[sym++] = 9; - while (sym < 280) state->lens[sym++] = 7; - while (sym < 288) state->lens[sym++] = 8; - next = fixed; - lenfix = next; - bits = 9; - inflate_table(LENS, state->lens, 288, &(next), &(bits), state->work); - - /* distance table */ - sym = 0; - while (sym < 32) state->lens[sym++] = 5; - distfix = next; - bits = 5; - inflate_table(DISTS, state->lens, 32, &(next), &(bits), state->work); - - /* do this just once */ - virgin = 0; - } -#else /* !BUILDFIXED */ -# include "inffixed.h" -#endif /* BUILDFIXED */ - state->lencode = lenfix; - state->lenbits = 9; - state->distcode = distfix; - state->distbits = 5; -} - -#ifdef MAKEFIXED -#include - -/* - Write out the inffixed.h that is #include'd above. Defining MAKEFIXED also - defines BUILDFIXED, so the tables are built on the fly. makefixed() writes - those tables to stdout, which would be piped to inffixed.h. A small program - can simply call makefixed to do this: - - void makefixed(void); - - int main(void) - { - makefixed(); - return 0; - } - - Then that can be linked with zlib built with MAKEFIXED defined and run: - - a.out > inffixed.h - */ -void makefixed() -{ - unsigned low, size; - struct inflate_state state; - - fixedtables(&state); - puts(" /* inffixed.h -- table for decoding fixed codes"); - puts(" * Generated automatically by makefixed()."); - puts(" */"); - puts(""); - puts(" /* WARNING: this file should *not* be used by applications."); - puts(" It is part of the implementation of this library and is"); - puts(" subject to change. Applications should only use zlib.h."); - puts(" */"); - puts(""); - size = 1U << 9; - printf(" static const code lenfix[%u] = {", size); - low = 0; - for (;;) { - if ((low % 7) == 0) printf("\n "); - printf("{%u,%u,%d}", (low & 127) == 99 ? 64 : state.lencode[low].op, - state.lencode[low].bits, state.lencode[low].val); - if (++low == size) break; - putchar(','); - } - puts("\n };"); - size = 1U << 5; - printf("\n static const code distfix[%u] = {", size); - low = 0; - for (;;) { - if ((low % 6) == 0) printf("\n "); - printf("{%u,%u,%d}", state.distcode[low].op, state.distcode[low].bits, - state.distcode[low].val); - if (++low == size) break; - putchar(','); - } - puts("\n };"); -} -#endif /* MAKEFIXED */ - -/* - Update the window with the last wsize (normally 32K) bytes written before - returning. If window does not exist yet, create it. This is only called - when a window is already in use, or when output has been written during this - inflate call, but the end of the deflate stream has not been reached yet. - It is also called to create a window for dictionary data when a dictionary - is loaded. - - Providing output buffers larger than 32K to inflate() should provide a speed - advantage, since only the last 32K of output is copied to the sliding window - upon return from inflate(), and since all distances after the first 32K of - output will fall in the output data, making match copies simpler and faster. - The advantage may be dependent on the size of the processor's data caches. - */ -local int updatewindow(strm, end, copy) -z_streamp strm; -const Bytef *end; -unsigned copy; -{ - struct inflate_state FAR *state; - unsigned dist; - - state = (struct inflate_state FAR *)strm->state; - - /* if it hasn't been done already, allocate space for the window */ - if (state->window == Z_NULL) { - state->window = (unsigned char FAR *) - ZALLOC(strm, 1U << state->wbits, - sizeof(unsigned char)); - if (state->window == Z_NULL) return 1; - } - - /* if window not in use yet, initialize */ - if (state->wsize == 0) { - state->wsize = 1U << state->wbits; - state->wnext = 0; - state->whave = 0; - } - - /* copy state->wsize or less output bytes into the circular window */ - if (copy >= state->wsize) { - zmemcpy(state->window, end - state->wsize, state->wsize); - state->wnext = 0; - state->whave = state->wsize; - } - else { - dist = state->wsize - state->wnext; - if (dist > copy) dist = copy; - zmemcpy(state->window + state->wnext, end - copy, dist); - copy -= dist; - if (copy) { - zmemcpy(state->window, end - copy, copy); - state->wnext = copy; - state->whave = state->wsize; - } - else { - state->wnext += dist; - if (state->wnext == state->wsize) state->wnext = 0; - if (state->whave < state->wsize) state->whave += dist; - } - } - return 0; -} - -/* Macros for inflate(): */ - -/* check function to use adler32() for zlib or crc32() for gzip */ -#ifdef GUNZIP -# define UPDATE(check, buf, len) \ - (state->flags ? crc32(check, buf, len) : adler32(check, buf, len)) -#else -# define UPDATE(check, buf, len) adler32(check, buf, len) -#endif - -/* check macros for header crc */ -#ifdef GUNZIP -# define CRC2(check, word) \ - do { \ - hbuf[0] = (unsigned char)(word); \ - hbuf[1] = (unsigned char)((word) >> 8); \ - check = crc32(check, hbuf, 2); \ - } while (0) - -# define CRC4(check, word) \ - do { \ - hbuf[0] = (unsigned char)(word); \ - hbuf[1] = (unsigned char)((word) >> 8); \ - hbuf[2] = (unsigned char)((word) >> 16); \ - hbuf[3] = (unsigned char)((word) >> 24); \ - check = crc32(check, hbuf, 4); \ - } while (0) -#endif - -/* Load registers with state in inflate() for speed */ -#define LOAD() \ - do { \ - put = strm->next_out; \ - left = strm->avail_out; \ - next = strm->next_in; \ - have = strm->avail_in; \ - hold = state->hold; \ - bits = state->bits; \ - } while (0) - -/* Restore state from registers in inflate() */ -#define RESTORE() \ - do { \ - strm->next_out = put; \ - strm->avail_out = left; \ - strm->next_in = next; \ - strm->avail_in = have; \ - state->hold = hold; \ - state->bits = bits; \ - } while (0) - -/* Clear the input bit accumulator */ -#define INITBITS() \ - do { \ - hold = 0; \ - bits = 0; \ - } while (0) - -/* Get a byte of input into the bit accumulator, or return from inflate() - if there is no input available. */ -#define PULLBYTE() \ - do { \ - if (have == 0) goto inf_leave; \ - have--; \ - hold += (unsigned long)(*next++) << bits; \ - bits += 8; \ - } while (0) - -/* Assure that there are at least n bits in the bit accumulator. If there is - not enough available input to do that, then return from inflate(). */ -#define NEEDBITS(n) \ - do { \ - while (bits < (unsigned)(n)) \ - PULLBYTE(); \ - } while (0) - -/* Return the low n bits of the bit accumulator (n < 16) */ -#define BITS(n) \ - ((unsigned)hold & ((1U << (n)) - 1)) - -/* Remove n bits from the bit accumulator */ -#define DROPBITS(n) \ - do { \ - hold >>= (n); \ - bits -= (unsigned)(n); \ - } while (0) - -/* Remove zero to seven bits as needed to go to a byte boundary */ -#define BYTEBITS() \ - do { \ - hold >>= bits & 7; \ - bits -= bits & 7; \ - } while (0) - -/* - inflate() uses a state machine to process as much input data and generate as - much output data as possible before returning. The state machine is - structured roughly as follows: - - for (;;) switch (state) { - ... - case STATEn: - if (not enough input data or output space to make progress) - return; - ... make progress ... - state = STATEm; - break; - ... - } - - so when inflate() is called again, the same case is attempted again, and - if the appropriate resources are provided, the machine proceeds to the - next state. The NEEDBITS() macro is usually the way the state evaluates - whether it can proceed or should return. NEEDBITS() does the return if - the requested bits are not available. The typical use of the BITS macros - is: - - NEEDBITS(n); - ... do something with BITS(n) ... - DROPBITS(n); - - where NEEDBITS(n) either returns from inflate() if there isn't enough - input left to load n bits into the accumulator, or it continues. BITS(n) - gives the low n bits in the accumulator. When done, DROPBITS(n) drops - the low n bits off the accumulator. INITBITS() clears the accumulator - and sets the number of available bits to zero. BYTEBITS() discards just - enough bits to put the accumulator on a byte boundary. After BYTEBITS() - and a NEEDBITS(8), then BITS(8) would return the next byte in the stream. - - NEEDBITS(n) uses PULLBYTE() to get an available byte of input, or to return - if there is no input available. The decoding of variable length codes uses - PULLBYTE() directly in order to pull just enough bytes to decode the next - code, and no more. - - Some states loop until they get enough input, making sure that enough - state information is maintained to continue the loop where it left off - if NEEDBITS() returns in the loop. For example, want, need, and keep - would all have to actually be part of the saved state in case NEEDBITS() - returns: - - case STATEw: - while (want < need) { - NEEDBITS(n); - keep[want++] = BITS(n); - DROPBITS(n); - } - state = STATEx; - case STATEx: - - As shown above, if the next state is also the next case, then the break - is omitted. - - A state may also return if there is not enough output space available to - complete that state. Those states are copying stored data, writing a - literal byte, and copying a matching string. - - When returning, a "goto inf_leave" is used to update the total counters, - update the check value, and determine whether any progress has been made - during that inflate() call in order to return the proper return code. - Progress is defined as a change in either strm->avail_in or strm->avail_out. - When there is a window, goto inf_leave will update the window with the last - output written. If a goto inf_leave occurs in the middle of decompression - and there is no window currently, goto inf_leave will create one and copy - output to the window for the next call of inflate(). - - In this implementation, the flush parameter of inflate() only affects the - return code (per zlib.h). inflate() always writes as much as possible to - strm->next_out, given the space available and the provided input--the effect - documented in zlib.h of Z_SYNC_FLUSH. Furthermore, inflate() always defers - the allocation of and copying into a sliding window until necessary, which - provides the effect documented in zlib.h for Z_FINISH when the entire input - stream available. So the only thing the flush parameter actually does is: - when flush is set to Z_FINISH, inflate() cannot return Z_OK. Instead it - will return Z_BUF_ERROR if it has not reached the end of the stream. - */ - -int ZEXPORT inflate(strm, flush) -z_streamp strm; -int flush; -{ - struct inflate_state FAR *state; - z_const unsigned char FAR *next; /* next input */ - unsigned char FAR *put; /* next output */ - unsigned have, left; /* available input and output */ - unsigned long hold; /* bit buffer */ - unsigned bits; /* bits in bit buffer */ - unsigned in, out; /* save starting available input and output */ - unsigned copy; /* number of stored or match bytes to copy */ - unsigned char FAR *from; /* where to copy match bytes from */ - code here; /* current decoding table entry */ - code last; /* parent table entry */ - unsigned len; /* length to copy for repeats, bits to drop */ - int ret; /* return code */ -#ifdef GUNZIP - unsigned char hbuf[4]; /* buffer for gzip header crc calculation */ -#endif - static const unsigned short order[19] = /* permutation of code lengths */ - {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15}; - - if (strm == Z_NULL || strm->state == Z_NULL || strm->next_out == Z_NULL || - (strm->next_in == Z_NULL && strm->avail_in != 0)) - return Z_STREAM_ERROR; - - state = (struct inflate_state FAR *)strm->state; - if (state->mode == TYPE) state->mode = TYPEDO; /* skip check */ - LOAD(); - in = have; - out = left; - ret = Z_OK; - for (;;) - switch (state->mode) { - case HEAD: - if (state->wrap == 0) { - state->mode = TYPEDO; - break; - } - NEEDBITS(16); -#ifdef GUNZIP - if ((state->wrap & 2) && hold == 0x8b1f) { /* gzip header */ - state->check = crc32(0L, Z_NULL, 0); - CRC2(state->check, hold); - INITBITS(); - state->mode = FLAGS; - break; - } - state->flags = 0; /* expect zlib header */ - if (state->head != Z_NULL) - state->head->done = -1; - if (!(state->wrap & 1) || /* check if zlib header allowed */ -#else - if ( -#endif - ((BITS(8) << 8) + (hold >> 8)) % 31) { - strm->msg = (char *)"incorrect header check"; - state->mode = BAD; - break; - } - if (BITS(4) != Z_DEFLATED) { - strm->msg = (char *)"unknown compression method"; - state->mode = BAD; - break; - } - DROPBITS(4); - len = BITS(4) + 8; - if (state->wbits == 0) - state->wbits = len; - else if (len > state->wbits) { - strm->msg = (char *)"invalid window size"; - state->mode = BAD; - break; - } - state->dmax = 1U << len; - Tracev((stderr, "inflate: zlib header ok\n")); - strm->adler = state->check = adler32(0L, Z_NULL, 0); - state->mode = hold & 0x200 ? DICTID : TYPE; - INITBITS(); - break; -#ifdef GUNZIP - case FLAGS: - NEEDBITS(16); - state->flags = (int)(hold); - if ((state->flags & 0xff) != Z_DEFLATED) { - strm->msg = (char *)"unknown compression method"; - state->mode = BAD; - break; - } - if (state->flags & 0xe000) { - strm->msg = (char *)"unknown header flags set"; - state->mode = BAD; - break; - } - if (state->head != Z_NULL) - state->head->text = (int)((hold >> 8) & 1); - if (state->flags & 0x0200) CRC2(state->check, hold); - INITBITS(); - state->mode = TIME; - case TIME: - NEEDBITS(32); - if (state->head != Z_NULL) - state->head->time = hold; - if (state->flags & 0x0200) CRC4(state->check, hold); - INITBITS(); - state->mode = OS; - case OS: - NEEDBITS(16); - if (state->head != Z_NULL) { - state->head->xflags = (int)(hold & 0xff); - state->head->os = (int)(hold >> 8); - } - if (state->flags & 0x0200) CRC2(state->check, hold); - INITBITS(); - state->mode = EXLEN; - case EXLEN: - if (state->flags & 0x0400) { - NEEDBITS(16); - state->length = (unsigned)(hold); - if (state->head != Z_NULL) - state->head->extra_len = (unsigned)hold; - if (state->flags & 0x0200) CRC2(state->check, hold); - INITBITS(); - } - else if (state->head != Z_NULL) - state->head->extra = Z_NULL; - state->mode = EXTRA; - case EXTRA: - if (state->flags & 0x0400) { - copy = state->length; - if (copy > have) copy = have; - if (copy) { - if (state->head != Z_NULL && - state->head->extra != Z_NULL) { - len = state->head->extra_len - state->length; - zmemcpy(state->head->extra + len, next, - len + copy > state->head->extra_max ? - state->head->extra_max - len : copy); - } - if (state->flags & 0x0200) - state->check = crc32(state->check, next, copy); - have -= copy; - next += copy; - state->length -= copy; - } - if (state->length) goto inf_leave; - } - state->length = 0; - state->mode = NAME; - case NAME: - if (state->flags & 0x0800) { - if (have == 0) goto inf_leave; - copy = 0; - do { - len = (unsigned)(next[copy++]); - if (state->head != Z_NULL && - state->head->name != Z_NULL && - state->length < state->head->name_max) - state->head->name[state->length++] = len; - } while (len && copy < have); - if (state->flags & 0x0200) - state->check = crc32(state->check, next, copy); - have -= copy; - next += copy; - if (len) goto inf_leave; - } - else if (state->head != Z_NULL) - state->head->name = Z_NULL; - state->length = 0; - state->mode = COMMENT; - case COMMENT: - if (state->flags & 0x1000) { - if (have == 0) goto inf_leave; - copy = 0; - do { - len = (unsigned)(next[copy++]); - if (state->head != Z_NULL && - state->head->comment != Z_NULL && - state->length < state->head->comm_max) - state->head->comment[state->length++] = len; - } while (len && copy < have); - if (state->flags & 0x0200) - state->check = crc32(state->check, next, copy); - have -= copy; - next += copy; - if (len) goto inf_leave; - } - else if (state->head != Z_NULL) - state->head->comment = Z_NULL; - state->mode = HCRC; - case HCRC: - if (state->flags & 0x0200) { - NEEDBITS(16); - if (hold != (state->check & 0xffff)) { - strm->msg = (char *)"header crc mismatch"; - state->mode = BAD; - break; - } - INITBITS(); - } - if (state->head != Z_NULL) { - state->head->hcrc = (int)((state->flags >> 9) & 1); - state->head->done = 1; - } - strm->adler = state->check = crc32(0L, Z_NULL, 0); - state->mode = TYPE; - break; -#endif - case DICTID: - NEEDBITS(32); - strm->adler = state->check = ZSWAP32(hold); - INITBITS(); - state->mode = DICT; - case DICT: - if (state->havedict == 0) { - RESTORE(); - return Z_NEED_DICT; - } - strm->adler = state->check = adler32(0L, Z_NULL, 0); - state->mode = TYPE; - case TYPE: - if (flush == Z_BLOCK || flush == Z_TREES) goto inf_leave; - case TYPEDO: - if (state->last) { - BYTEBITS(); - state->mode = CHECK; - break; - } - NEEDBITS(3); - state->last = BITS(1); - DROPBITS(1); - switch (BITS(2)) { - case 0: /* stored block */ - Tracev((stderr, "inflate: stored block%s\n", - state->last ? " (last)" : "")); - state->mode = STORED; - break; - case 1: /* fixed block */ - fixedtables(state); - Tracev((stderr, "inflate: fixed codes block%s\n", - state->last ? " (last)" : "")); - state->mode = LEN_; /* decode codes */ - if (flush == Z_TREES) { - DROPBITS(2); - goto inf_leave; - } - break; - case 2: /* dynamic block */ - Tracev((stderr, "inflate: dynamic codes block%s\n", - state->last ? " (last)" : "")); - state->mode = TABLE; - break; - case 3: - strm->msg = (char *)"invalid block type"; - state->mode = BAD; - } - DROPBITS(2); - break; - case STORED: - BYTEBITS(); /* go to byte boundary */ - NEEDBITS(32); - if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) { - strm->msg = (char *)"invalid stored block lengths"; - state->mode = BAD; - break; - } - state->length = (unsigned)hold & 0xffff; - Tracev((stderr, "inflate: stored length %u\n", - state->length)); - INITBITS(); - state->mode = COPY_; - if (flush == Z_TREES) goto inf_leave; - case COPY_: - state->mode = COPY; - case COPY: - copy = state->length; - if (copy) { - if (copy > have) copy = have; - if (copy > left) copy = left; - if (copy == 0) goto inf_leave; - zmemcpy(put, next, copy); - have -= copy; - next += copy; - left -= copy; - put += copy; - state->length -= copy; - break; - } - Tracev((stderr, "inflate: stored end\n")); - state->mode = TYPE; - break; - case TABLE: - NEEDBITS(14); - state->nlen = BITS(5) + 257; - DROPBITS(5); - state->ndist = BITS(5) + 1; - DROPBITS(5); - state->ncode = BITS(4) + 4; - DROPBITS(4); -#ifndef PKZIP_BUG_WORKAROUND - if (state->nlen > 286 || state->ndist > 30) { - strm->msg = (char *)"too many length or distance symbols"; - state->mode = BAD; - break; - } -#endif - Tracev((stderr, "inflate: table sizes ok\n")); - state->have = 0; - state->mode = LENLENS; - case LENLENS: - while (state->have < state->ncode) { - NEEDBITS(3); - state->lens[order[state->have++]] = (unsigned short)BITS(3); - DROPBITS(3); - } - while (state->have < 19) - state->lens[order[state->have++]] = 0; - state->next = state->codes; - state->lencode = (const code FAR *)(state->next); - state->lenbits = 7; - ret = inflate_table(CODES, state->lens, 19, &(state->next), - &(state->lenbits), state->work); - if (ret) { - strm->msg = (char *)"invalid code lengths set"; - state->mode = BAD; - break; - } - Tracev((stderr, "inflate: code lengths ok\n")); - state->have = 0; - state->mode = CODELENS; - case CODELENS: - while (state->have < state->nlen + state->ndist) { - for (;;) { - here = state->lencode[BITS(state->lenbits)]; - if ((unsigned)(here.bits) <= bits) break; - PULLBYTE(); - } - if (here.val < 16) { - DROPBITS(here.bits); - state->lens[state->have++] = here.val; - } - else { - if (here.val == 16) { - NEEDBITS(here.bits + 2); - DROPBITS(here.bits); - if (state->have == 0) { - strm->msg = (char *)"invalid bit length repeat"; - state->mode = BAD; - break; - } - len = state->lens[state->have - 1]; - copy = 3 + BITS(2); - DROPBITS(2); - } - else if (here.val == 17) { - NEEDBITS(here.bits + 3); - DROPBITS(here.bits); - len = 0; - copy = 3 + BITS(3); - DROPBITS(3); - } - else { - NEEDBITS(here.bits + 7); - DROPBITS(here.bits); - len = 0; - copy = 11 + BITS(7); - DROPBITS(7); - } - if (state->have + copy > state->nlen + state->ndist) { - strm->msg = (char *)"invalid bit length repeat"; - state->mode = BAD; - break; - } - while (copy--) - state->lens[state->have++] = (unsigned short)len; - } - } - - /* handle error breaks in while */ - if (state->mode == BAD) break; - - /* check for end-of-block code (better have one) */ - if (state->lens[256] == 0) { - strm->msg = (char *)"invalid code -- missing end-of-block"; - state->mode = BAD; - break; - } - - /* build code tables -- note: do not change the lenbits or distbits - values here (9 and 6) without reading the comments in inftrees.h - concerning the ENOUGH constants, which depend on those values */ - state->next = state->codes; - state->lencode = (const code FAR *)(state->next); - state->lenbits = 9; - ret = inflate_table(LENS, state->lens, state->nlen, &(state->next), - &(state->lenbits), state->work); - if (ret) { - strm->msg = (char *)"invalid literal/lengths set"; - state->mode = BAD; - break; - } - state->distcode = (const code FAR *)(state->next); - state->distbits = 6; - ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist, - &(state->next), &(state->distbits), state->work); - if (ret) { - strm->msg = (char *)"invalid distances set"; - state->mode = BAD; - break; - } - Tracev((stderr, "inflate: codes ok\n")); - state->mode = LEN_; - if (flush == Z_TREES) goto inf_leave; - case LEN_: - state->mode = LEN; - case LEN: - if (have >= 6 && left >= 258) { - RESTORE(); - inflate_fast(strm, out); - LOAD(); - if (state->mode == TYPE) - state->back = -1; - break; - } - state->back = 0; - for (;;) { - here = state->lencode[BITS(state->lenbits)]; - if ((unsigned)(here.bits) <= bits) break; - PULLBYTE(); - } - if (here.op && (here.op & 0xf0) == 0) { - last = here; - for (;;) { - here = state->lencode[last.val + - (BITS(last.bits + last.op) >> last.bits)]; - if ((unsigned)(last.bits + here.bits) <= bits) break; - PULLBYTE(); - } - DROPBITS(last.bits); - state->back += last.bits; - } - DROPBITS(here.bits); - state->back += here.bits; - state->length = (unsigned)here.val; - if ((int)(here.op) == 0) { - Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ? - "inflate: literal '%c'\n" : - "inflate: literal 0x%02x\n", here.val)); - state->mode = LIT; - break; - } - if (here.op & 32) { - Tracevv((stderr, "inflate: end of block\n")); - state->back = -1; - state->mode = TYPE; - break; - } - if (here.op & 64) { - strm->msg = (char *)"invalid literal/length code"; - state->mode = BAD; - break; - } - state->extra = (unsigned)(here.op) & 15; - state->mode = LENEXT; - case LENEXT: - if (state->extra) { - NEEDBITS(state->extra); - state->length += BITS(state->extra); - DROPBITS(state->extra); - state->back += state->extra; - } - Tracevv((stderr, "inflate: length %u\n", state->length)); - state->was = state->length; - state->mode = DIST; - case DIST: - for (;;) { - here = state->distcode[BITS(state->distbits)]; - if ((unsigned)(here.bits) <= bits) break; - PULLBYTE(); - } - if ((here.op & 0xf0) == 0) { - last = here; - for (;;) { - here = state->distcode[last.val + - (BITS(last.bits + last.op) >> last.bits)]; - if ((unsigned)(last.bits + here.bits) <= bits) break; - PULLBYTE(); - } - DROPBITS(last.bits); - state->back += last.bits; - } - DROPBITS(here.bits); - state->back += here.bits; - if (here.op & 64) { - strm->msg = (char *)"invalid distance code"; - state->mode = BAD; - break; - } - state->offset = (unsigned)here.val; - state->extra = (unsigned)(here.op) & 15; - state->mode = DISTEXT; - case DISTEXT: - if (state->extra) { - NEEDBITS(state->extra); - state->offset += BITS(state->extra); - DROPBITS(state->extra); - state->back += state->extra; - } -#ifdef INFLATE_STRICT - if (state->offset > state->dmax) { - strm->msg = (char *)"invalid distance too far back"; - state->mode = BAD; - break; - } -#endif - Tracevv((stderr, "inflate: distance %u\n", state->offset)); - state->mode = MATCH; - case MATCH: - if (left == 0) goto inf_leave; - copy = out - left; - if (state->offset > copy) { /* copy from window */ - copy = state->offset - copy; - if (copy > state->whave) { - if (state->sane) { - strm->msg = (char *)"invalid distance too far back"; - state->mode = BAD; - break; - } -#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR - Trace((stderr, "inflate.c too far\n")); - copy -= state->whave; - if (copy > state->length) copy = state->length; - if (copy > left) copy = left; - left -= copy; - state->length -= copy; - do { - *put++ = 0; - } while (--copy); - if (state->length == 0) state->mode = LEN; - break; -#endif - } - if (copy > state->wnext) { - copy -= state->wnext; - from = state->window + (state->wsize - copy); - } - else - from = state->window + (state->wnext - copy); - if (copy > state->length) copy = state->length; - } - else { /* copy from output */ - from = put - state->offset; - copy = state->length; - } - if (copy > left) copy = left; - left -= copy; - state->length -= copy; - do { - *put++ = *from++; - } while (--copy); - if (state->length == 0) state->mode = LEN; - break; - case LIT: - if (left == 0) goto inf_leave; - *put++ = (unsigned char)(state->length); - left--; - state->mode = LEN; - break; - case CHECK: - if (state->wrap) { - NEEDBITS(32); - out -= left; - strm->total_out += out; - state->total += out; - if (out) - strm->adler = state->check = - UPDATE(state->check, put - out, out); - out = left; - if (( -#ifdef GUNZIP - state->flags ? hold : -#endif - ZSWAP32(hold)) != state->check) { - strm->msg = (char *)"incorrect data check"; - state->mode = BAD; - break; - } - INITBITS(); - Tracev((stderr, "inflate: check matches trailer\n")); - } -#ifdef GUNZIP - state->mode = LENGTH; - case LENGTH: - if (state->wrap && state->flags) { - NEEDBITS(32); - if (hold != (state->total & 0xffffffffUL)) { - strm->msg = (char *)"incorrect length check"; - state->mode = BAD; - break; - } - INITBITS(); - Tracev((stderr, "inflate: length matches trailer\n")); - } -#endif - state->mode = DONE; - case DONE: - ret = Z_STREAM_END; - goto inf_leave; - case BAD: - ret = Z_DATA_ERROR; - goto inf_leave; - case MEM: - return Z_MEM_ERROR; - case SYNC: - default: - return Z_STREAM_ERROR; - } - - /* - Return from inflate(), updating the total counts and the check value. - If there was no progress during the inflate() call, return a buffer - error. Call updatewindow() to create and/or update the window state. - Note: a memory error from inflate() is non-recoverable. - */ - inf_leave: - RESTORE(); - if (state->wsize || (out != strm->avail_out && state->mode < BAD && - (state->mode < CHECK || flush != Z_FINISH))) - if (updatewindow(strm, strm->next_out, out - strm->avail_out)) { - state->mode = MEM; - return Z_MEM_ERROR; - } - in -= strm->avail_in; - out -= strm->avail_out; - strm->total_in += in; - strm->total_out += out; - state->total += out; - if (state->wrap && out) - strm->adler = state->check = - UPDATE(state->check, strm->next_out - out, out); - strm->data_type = state->bits + (state->last ? 64 : 0) + - (state->mode == TYPE ? 128 : 0) + - (state->mode == LEN_ || state->mode == COPY_ ? 256 : 0); - if (((in == 0 && out == 0) || flush == Z_FINISH) && ret == Z_OK) - ret = Z_BUF_ERROR; - return ret; -} - -int ZEXPORT inflateEnd(strm) -z_streamp strm; -{ - struct inflate_state FAR *state; - if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0) - return Z_STREAM_ERROR; - state = (struct inflate_state FAR *)strm->state; - if (state->window != Z_NULL) ZFREE(strm, state->window); - ZFREE(strm, strm->state); - strm->state = Z_NULL; - Tracev((stderr, "inflate: end\n")); - return Z_OK; -} - -int ZEXPORT inflateGetDictionary(strm, dictionary, dictLength) -z_streamp strm; -Bytef *dictionary; -uInt *dictLength; -{ - struct inflate_state FAR *state; - - /* check state */ - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; - state = (struct inflate_state FAR *)strm->state; - - /* copy dictionary */ - if (state->whave && dictionary != Z_NULL) { - zmemcpy(dictionary, state->window + state->wnext, - state->whave - state->wnext); - zmemcpy(dictionary + state->whave - state->wnext, - state->window, state->wnext); - } - if (dictLength != Z_NULL) - *dictLength = state->whave; - return Z_OK; -} - -int ZEXPORT inflateSetDictionary(strm, dictionary, dictLength) -z_streamp strm; -const Bytef *dictionary; -uInt dictLength; -{ - struct inflate_state FAR *state; - unsigned long dictid; - int ret; - - /* check state */ - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; - state = (struct inflate_state FAR *)strm->state; - if (state->wrap != 0 && state->mode != DICT) - return Z_STREAM_ERROR; - - /* check for correct dictionary identifier */ - if (state->mode == DICT) { - dictid = adler32(0L, Z_NULL, 0); - dictid = adler32(dictid, dictionary, dictLength); - if (dictid != state->check) - return Z_DATA_ERROR; - } - - /* copy dictionary to window using updatewindow(), which will amend the - existing dictionary if appropriate */ - ret = updatewindow(strm, dictionary + dictLength, dictLength); - if (ret) { - state->mode = MEM; - return Z_MEM_ERROR; - } - state->havedict = 1; - Tracev((stderr, "inflate: dictionary set\n")); - return Z_OK; -} - -int ZEXPORT inflateGetHeader(strm, head) -z_streamp strm; -gz_headerp head; -{ - struct inflate_state FAR *state; - - /* check state */ - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; - state = (struct inflate_state FAR *)strm->state; - if ((state->wrap & 2) == 0) return Z_STREAM_ERROR; - - /* save header structure */ - state->head = head; - head->done = 0; - return Z_OK; -} - -/* - Search buf[0..len-1] for the pattern: 0, 0, 0xff, 0xff. Return when found - or when out of input. When called, *have is the number of pattern bytes - found in order so far, in 0..3. On return *have is updated to the new - state. If on return *have equals four, then the pattern was found and the - return value is how many bytes were read including the last byte of the - pattern. If *have is less than four, then the pattern has not been found - yet and the return value is len. In the latter case, syncsearch() can be - called again with more data and the *have state. *have is initialized to - zero for the first call. - */ -local unsigned syncsearch(have, buf, len) -unsigned FAR *have; -const unsigned char FAR *buf; -unsigned len; -{ - unsigned got; - unsigned next; - - got = *have; - next = 0; - while (next < len && got < 4) { - if ((int)(buf[next]) == (got < 2 ? 0 : 0xff)) - got++; - else if (buf[next]) - got = 0; - else - got = 4 - got; - next++; - } - *have = got; - return next; -} - -int ZEXPORT inflateSync(strm) -z_streamp strm; -{ - unsigned len; /* number of bytes to look at or looked at */ - unsigned long in, out; /* temporary to save total_in and total_out */ - unsigned char buf[4]; /* to restore bit buffer to byte string */ - struct inflate_state FAR *state; - - /* check parameters */ - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; - state = (struct inflate_state FAR *)strm->state; - if (strm->avail_in == 0 && state->bits < 8) return Z_BUF_ERROR; - - /* if first time, start search in bit buffer */ - if (state->mode != SYNC) { - state->mode = SYNC; - state->hold <<= state->bits & 7; - state->bits -= state->bits & 7; - len = 0; - while (state->bits >= 8) { - buf[len++] = (unsigned char)(state->hold); - state->hold >>= 8; - state->bits -= 8; - } - state->have = 0; - syncsearch(&(state->have), buf, len); - } - - /* search available input */ - len = syncsearch(&(state->have), strm->next_in, strm->avail_in); - strm->avail_in -= len; - strm->next_in += len; - strm->total_in += len; - - /* return no joy or set up to restart inflate() on a new block */ - if (state->have != 4) return Z_DATA_ERROR; - in = strm->total_in; out = strm->total_out; - inflateReset(strm); - strm->total_in = in; strm->total_out = out; - state->mode = TYPE; - return Z_OK; -} - -/* - Returns true if inflate is currently at the end of a block generated by - Z_SYNC_FLUSH or Z_FULL_FLUSH. This function is used by one PPP - implementation to provide an additional safety check. PPP uses - Z_SYNC_FLUSH but removes the length bytes of the resulting empty stored - block. When decompressing, PPP checks that at the end of input packet, - inflate is waiting for these length bytes. - */ -int ZEXPORT inflateSyncPoint(strm) -z_streamp strm; -{ - struct inflate_state FAR *state; - - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; - state = (struct inflate_state FAR *)strm->state; - return state->mode == STORED && state->bits == 0; -} - -int ZEXPORT inflateCopy(dest, source) -z_streamp dest; -z_streamp source; -{ - struct inflate_state FAR *state; - struct inflate_state FAR *copy; - unsigned char FAR *window; - unsigned wsize; - - /* check input */ - if (dest == Z_NULL || source == Z_NULL || source->state == Z_NULL || - source->zalloc == (alloc_func)0 || source->zfree == (free_func)0) - return Z_STREAM_ERROR; - state = (struct inflate_state FAR *)source->state; - - /* allocate space */ - copy = (struct inflate_state FAR *) - ZALLOC(source, 1, sizeof(struct inflate_state)); - if (copy == Z_NULL) return Z_MEM_ERROR; - window = Z_NULL; - if (state->window != Z_NULL) { - window = (unsigned char FAR *) - ZALLOC(source, 1U << state->wbits, sizeof(unsigned char)); - if (window == Z_NULL) { - ZFREE(source, copy); - return Z_MEM_ERROR; - } - } - - /* copy state */ - zmemcpy((voidpf)dest, (voidpf)source, sizeof(z_stream)); - zmemcpy((voidpf)copy, (voidpf)state, sizeof(struct inflate_state)); - if (state->lencode >= state->codes && - state->lencode <= state->codes + ENOUGH - 1) { - copy->lencode = copy->codes + (state->lencode - state->codes); - copy->distcode = copy->codes + (state->distcode - state->codes); - } - copy->next = copy->codes + (state->next - state->codes); - if (window != Z_NULL) { - wsize = 1U << state->wbits; - zmemcpy(window, state->window, wsize); - } - copy->window = window; - dest->state = (struct internal_state FAR *)copy; - return Z_OK; -} - -int ZEXPORT inflateUndermine(strm, subvert) -z_streamp strm; -int subvert; -{ - struct inflate_state FAR *state; - - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; - state = (struct inflate_state FAR *)strm->state; - state->sane = !subvert; -#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR - return Z_OK; -#else - state->sane = 1; - return Z_DATA_ERROR; -#endif -} - -long ZEXPORT inflateMark(strm) -z_streamp strm; -{ - struct inflate_state FAR *state; - - if (strm == Z_NULL || strm->state == Z_NULL) return -1L << 16; - state = (struct inflate_state FAR *)strm->state; - return ((long)(state->back) << 16) + - (state->mode == COPY ? state->length : - (state->mode == MATCH ? state->was - state->length : 0)); -} diff --git a/vendor/libgit2/deps/zlib/inflate.h b/vendor/libgit2/deps/zlib/inflate.h deleted file mode 100644 index 95f4986d4..000000000 --- a/vendor/libgit2/deps/zlib/inflate.h +++ /dev/null @@ -1,122 +0,0 @@ -/* inflate.h -- internal inflate state definition - * Copyright (C) 1995-2009 Mark Adler - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -/* WARNING: this file should *not* be used by applications. It is - part of the implementation of the compression library and is - subject to change. Applications should only use zlib.h. - */ - -/* define NO_GZIP when compiling if you want to disable gzip header and - trailer decoding by inflate(). NO_GZIP would be used to avoid linking in - the crc code when it is not needed. For shared libraries, gzip decoding - should be left enabled. */ -#ifndef NO_GZIP -# define GUNZIP -#endif - -/* Possible inflate modes between inflate() calls */ -typedef enum { - HEAD, /* i: waiting for magic header */ - FLAGS, /* i: waiting for method and flags (gzip) */ - TIME, /* i: waiting for modification time (gzip) */ - OS, /* i: waiting for extra flags and operating system (gzip) */ - EXLEN, /* i: waiting for extra length (gzip) */ - EXTRA, /* i: waiting for extra bytes (gzip) */ - NAME, /* i: waiting for end of file name (gzip) */ - COMMENT, /* i: waiting for end of comment (gzip) */ - HCRC, /* i: waiting for header crc (gzip) */ - DICTID, /* i: waiting for dictionary check value */ - DICT, /* waiting for inflateSetDictionary() call */ - TYPE, /* i: waiting for type bits, including last-flag bit */ - TYPEDO, /* i: same, but skip check to exit inflate on new block */ - STORED, /* i: waiting for stored size (length and complement) */ - COPY_, /* i/o: same as COPY below, but only first time in */ - COPY, /* i/o: waiting for input or output to copy stored block */ - TABLE, /* i: waiting for dynamic block table lengths */ - LENLENS, /* i: waiting for code length code lengths */ - CODELENS, /* i: waiting for length/lit and distance code lengths */ - LEN_, /* i: same as LEN below, but only first time in */ - LEN, /* i: waiting for length/lit/eob code */ - LENEXT, /* i: waiting for length extra bits */ - DIST, /* i: waiting for distance code */ - DISTEXT, /* i: waiting for distance extra bits */ - MATCH, /* o: waiting for output space to copy string */ - LIT, /* o: waiting for output space to write literal */ - CHECK, /* i: waiting for 32-bit check value */ - LENGTH, /* i: waiting for 32-bit length (gzip) */ - DONE, /* finished check, done -- remain here until reset */ - BAD, /* got a data error -- remain here until reset */ - MEM, /* got an inflate() memory error -- remain here until reset */ - SYNC /* looking for synchronization bytes to restart inflate() */ -} inflate_mode; - -/* - State transitions between above modes - - - (most modes can go to BAD or MEM on error -- not shown for clarity) - - Process header: - HEAD -> (gzip) or (zlib) or (raw) - (gzip) -> FLAGS -> TIME -> OS -> EXLEN -> EXTRA -> NAME -> COMMENT -> - HCRC -> TYPE - (zlib) -> DICTID or TYPE - DICTID -> DICT -> TYPE - (raw) -> TYPEDO - Read deflate blocks: - TYPE -> TYPEDO -> STORED or TABLE or LEN_ or CHECK - STORED -> COPY_ -> COPY -> TYPE - TABLE -> LENLENS -> CODELENS -> LEN_ - LEN_ -> LEN - Read deflate codes in fixed or dynamic block: - LEN -> LENEXT or LIT or TYPE - LENEXT -> DIST -> DISTEXT -> MATCH -> LEN - LIT -> LEN - Process trailer: - CHECK -> LENGTH -> DONE - */ - -/* state maintained between inflate() calls. Approximately 10K bytes. */ -struct inflate_state { - inflate_mode mode; /* current inflate mode */ - int last; /* true if processing last block */ - int wrap; /* bit 0 true for zlib, bit 1 true for gzip */ - int havedict; /* true if dictionary provided */ - int flags; /* gzip header method and flags (0 if zlib) */ - unsigned dmax; /* zlib header max distance (INFLATE_STRICT) */ - unsigned long check; /* protected copy of check value */ - unsigned long total; /* protected copy of output count */ - gz_headerp head; /* where to save gzip header information */ - /* sliding window */ - unsigned wbits; /* log base 2 of requested window size */ - unsigned wsize; /* window size or zero if not using window */ - unsigned whave; /* valid bytes in the window */ - unsigned wnext; /* window write index */ - unsigned char FAR *window; /* allocated sliding window, if needed */ - /* bit accumulator */ - unsigned long hold; /* input bit accumulator */ - unsigned bits; /* number of bits in "in" */ - /* for string and stored block copying */ - unsigned length; /* literal or length of data to copy */ - unsigned offset; /* distance back to copy string from */ - /* for table and code decoding */ - unsigned extra; /* extra bits needed */ - /* fixed and dynamic code tables */ - code const FAR *lencode; /* starting table for length/literal codes */ - code const FAR *distcode; /* starting table for distance codes */ - unsigned lenbits; /* index bits for lencode */ - unsigned distbits; /* index bits for distcode */ - /* dynamic table building */ - unsigned ncode; /* number of code length code lengths */ - unsigned nlen; /* number of length code lengths */ - unsigned ndist; /* number of distance code lengths */ - unsigned have; /* number of code lengths in lens[] */ - code FAR *next; /* next available space in codes[] */ - unsigned short lens[320]; /* temporary storage for code lengths */ - unsigned short work[288]; /* work area for code table building */ - code codes[ENOUGH]; /* space for code tables */ - int sane; /* if false, allow invalid distance too far */ - int back; /* bits back of last unprocessed length/lit */ - unsigned was; /* initial length of match */ -}; diff --git a/vendor/libgit2/deps/zlib/inftrees.c b/vendor/libgit2/deps/zlib/inftrees.c deleted file mode 100644 index 44d89cf24..000000000 --- a/vendor/libgit2/deps/zlib/inftrees.c +++ /dev/null @@ -1,306 +0,0 @@ -/* inftrees.c -- generate Huffman trees for efficient decoding - * Copyright (C) 1995-2013 Mark Adler - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -#include "zutil.h" -#include "inftrees.h" - -#define MAXBITS 15 - -const char inflate_copyright[] = - " inflate 1.2.8 Copyright 1995-2013 Mark Adler "; -/* - If you use the zlib library in a product, an acknowledgment is welcome - in the documentation of your product. If for some reason you cannot - include such an acknowledgment, I would appreciate that you keep this - copyright string in the executable of your product. - */ - -/* - Build a set of tables to decode the provided canonical Huffman code. - The code lengths are lens[0..codes-1]. The result starts at *table, - whose indices are 0..2^bits-1. work is a writable array of at least - lens shorts, which is used as a work area. type is the type of code - to be generated, CODES, LENS, or DISTS. On return, zero is success, - -1 is an invalid code, and +1 means that ENOUGH isn't enough. table - on return points to the next available entry's address. bits is the - requested root table index bits, and on return it is the actual root - table index bits. It will differ if the request is greater than the - longest code or if it is less than the shortest code. - */ -int ZLIB_INTERNAL inflate_table(type, lens, codes, table, bits, work) -codetype type; -unsigned short FAR *lens; -unsigned codes; -code FAR * FAR *table; -unsigned FAR *bits; -unsigned short FAR *work; -{ - unsigned len; /* a code's length in bits */ - unsigned sym; /* index of code symbols */ - unsigned min, max; /* minimum and maximum code lengths */ - unsigned root; /* number of index bits for root table */ - unsigned curr; /* number of index bits for current table */ - unsigned drop; /* code bits to drop for sub-table */ - int left; /* number of prefix codes available */ - unsigned used; /* code entries in table used */ - unsigned huff; /* Huffman code */ - unsigned incr; /* for incrementing code, index */ - unsigned fill; /* index for replicating entries */ - unsigned low; /* low bits for current root entry */ - unsigned mask; /* mask for low root bits */ - code here; /* table entry for duplication */ - code FAR *next; /* next available space in table */ - const unsigned short FAR *base; /* base value table to use */ - const unsigned short FAR *extra; /* extra bits table to use */ - int end; /* use base and extra for symbol > end */ - unsigned short count[MAXBITS+1]; /* number of codes of each length */ - unsigned short offs[MAXBITS+1]; /* offsets in table for each length */ - static const unsigned short lbase[31] = { /* Length codes 257..285 base */ - 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31, - 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0}; - static const unsigned short lext[31] = { /* Length codes 257..285 extra */ - 16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18, - 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 72, 78}; - static const unsigned short dbase[32] = { /* Distance codes 0..29 base */ - 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, - 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145, - 8193, 12289, 16385, 24577, 0, 0}; - static const unsigned short dext[32] = { /* Distance codes 0..29 extra */ - 16, 16, 16, 16, 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, 22, - 23, 23, 24, 24, 25, 25, 26, 26, 27, 27, - 28, 28, 29, 29, 64, 64}; - - /* - Process a set of code lengths to create a canonical Huffman code. The - code lengths are lens[0..codes-1]. Each length corresponds to the - symbols 0..codes-1. The Huffman code is generated by first sorting the - symbols by length from short to long, and retaining the symbol order - for codes with equal lengths. Then the code starts with all zero bits - for the first code of the shortest length, and the codes are integer - increments for the same length, and zeros are appended as the length - increases. For the deflate format, these bits are stored backwards - from their more natural integer increment ordering, and so when the - decoding tables are built in the large loop below, the integer codes - are incremented backwards. - - This routine assumes, but does not check, that all of the entries in - lens[] are in the range 0..MAXBITS. The caller must assure this. - 1..MAXBITS is interpreted as that code length. zero means that that - symbol does not occur in this code. - - The codes are sorted by computing a count of codes for each length, - creating from that a table of starting indices for each length in the - sorted table, and then entering the symbols in order in the sorted - table. The sorted table is work[], with that space being provided by - the caller. - - The length counts are used for other purposes as well, i.e. finding - the minimum and maximum length codes, determining if there are any - codes at all, checking for a valid set of lengths, and looking ahead - at length counts to determine sub-table sizes when building the - decoding tables. - */ - - /* accumulate lengths for codes (assumes lens[] all in 0..MAXBITS) */ - for (len = 0; len <= MAXBITS; len++) - count[len] = 0; - for (sym = 0; sym < codes; sym++) - count[lens[sym]]++; - - /* bound code lengths, force root to be within code lengths */ - root = *bits; - for (max = MAXBITS; max >= 1; max--) - if (count[max] != 0) break; - if (root > max) root = max; - if (max == 0) { /* no symbols to code at all */ - here.op = (unsigned char)64; /* invalid code marker */ - here.bits = (unsigned char)1; - here.val = (unsigned short)0; - *(*table)++ = here; /* make a table to force an error */ - *(*table)++ = here; - *bits = 1; - return 0; /* no symbols, but wait for decoding to report error */ - } - for (min = 1; min < max; min++) - if (count[min] != 0) break; - if (root < min) root = min; - - /* check for an over-subscribed or incomplete set of lengths */ - left = 1; - for (len = 1; len <= MAXBITS; len++) { - left <<= 1; - left -= count[len]; - if (left < 0) return -1; /* over-subscribed */ - } - if (left > 0 && (type == CODES || max != 1)) - return -1; /* incomplete set */ - - /* generate offsets into symbol table for each length for sorting */ - offs[1] = 0; - for (len = 1; len < MAXBITS; len++) - offs[len + 1] = offs[len] + count[len]; - - /* sort symbols by length, by symbol order within each length */ - for (sym = 0; sym < codes; sym++) - if (lens[sym] != 0) work[offs[lens[sym]]++] = (unsigned short)sym; - - /* - Create and fill in decoding tables. In this loop, the table being - filled is at next and has curr index bits. The code being used is huff - with length len. That code is converted to an index by dropping drop - bits off of the bottom. For codes where len is less than drop + curr, - those top drop + curr - len bits are incremented through all values to - fill the table with replicated entries. - - root is the number of index bits for the root table. When len exceeds - root, sub-tables are created pointed to by the root entry with an index - of the low root bits of huff. This is saved in low to check for when a - new sub-table should be started. drop is zero when the root table is - being filled, and drop is root when sub-tables are being filled. - - When a new sub-table is needed, it is necessary to look ahead in the - code lengths to determine what size sub-table is needed. The length - counts are used for this, and so count[] is decremented as codes are - entered in the tables. - - used keeps track of how many table entries have been allocated from the - provided *table space. It is checked for LENS and DIST tables against - the constants ENOUGH_LENS and ENOUGH_DISTS to guard against changes in - the initial root table size constants. See the comments in inftrees.h - for more information. - - sym increments through all symbols, and the loop terminates when - all codes of length max, i.e. all codes, have been processed. This - routine permits incomplete codes, so another loop after this one fills - in the rest of the decoding tables with invalid code markers. - */ - - /* set up for code type */ - switch (type) { - case CODES: - base = extra = work; /* dummy value--not used */ - end = 19; - break; - case LENS: - base = lbase; - base -= 257; - extra = lext; - extra -= 257; - end = 256; - break; - default: /* DISTS */ - base = dbase; - extra = dext; - end = -1; - } - - /* initialize state for loop */ - huff = 0; /* starting code */ - sym = 0; /* starting code symbol */ - len = min; /* starting code length */ - next = *table; /* current table to fill in */ - curr = root; /* current table index bits */ - drop = 0; /* current bits to drop from code for index */ - low = (unsigned)(-1); /* trigger new sub-table when len > root */ - used = 1U << root; /* use root table entries */ - mask = used - 1; /* mask for comparing low */ - - /* check available table space */ - if ((type == LENS && used > ENOUGH_LENS) || - (type == DISTS && used > ENOUGH_DISTS)) - return 1; - - /* process all codes and make table entries */ - for (;;) { - /* create table entry */ - here.bits = (unsigned char)(len - drop); - if ((int)(work[sym]) < end) { - here.op = (unsigned char)0; - here.val = work[sym]; - } - else if ((int)(work[sym]) > end) { - here.op = (unsigned char)(extra[work[sym]]); - here.val = base[work[sym]]; - } - else { - here.op = (unsigned char)(32 + 64); /* end of block */ - here.val = 0; - } - - /* replicate for those indices with low len bits equal to huff */ - incr = 1U << (len - drop); - fill = 1U << curr; - min = fill; /* save offset to next table */ - do { - fill -= incr; - next[(huff >> drop) + fill] = here; - } while (fill != 0); - - /* backwards increment the len-bit code huff */ - incr = 1U << (len - 1); - while (huff & incr) - incr >>= 1; - if (incr != 0) { - huff &= incr - 1; - huff += incr; - } - else - huff = 0; - - /* go to next symbol, update count, len */ - sym++; - if (--(count[len]) == 0) { - if (len == max) break; - len = lens[work[sym]]; - } - - /* create new sub-table if needed */ - if (len > root && (huff & mask) != low) { - /* if first time, transition to sub-tables */ - if (drop == 0) - drop = root; - - /* increment past last table */ - next += min; /* here min is 1 << curr */ - - /* determine length of next table */ - curr = len - drop; - left = (int)(1 << curr); - while (curr + drop < max) { - left -= count[curr + drop]; - if (left <= 0) break; - curr++; - left <<= 1; - } - - /* check for enough space */ - used += 1U << curr; - if ((type == LENS && used > ENOUGH_LENS) || - (type == DISTS && used > ENOUGH_DISTS)) - return 1; - - /* point entry in root table to sub-table */ - low = huff & mask; - (*table)[low].op = (unsigned char)curr; - (*table)[low].bits = (unsigned char)root; - (*table)[low].val = (unsigned short)(next - *table); - } - } - - /* fill in remaining table entry if code is incomplete (guaranteed to have - at most one remaining entry, since if the code is incomplete, the - maximum code length that was allowed to get this far is one bit) */ - if (huff != 0) { - here.op = (unsigned char)64; /* invalid code marker */ - here.bits = (unsigned char)(len - drop); - here.val = (unsigned short)0; - next[huff] = here; - } - - /* set return parameters */ - *table += used; - *bits = root; - return 0; -} diff --git a/vendor/libgit2/deps/zlib/inftrees.h b/vendor/libgit2/deps/zlib/inftrees.h deleted file mode 100644 index baa53a0b1..000000000 --- a/vendor/libgit2/deps/zlib/inftrees.h +++ /dev/null @@ -1,62 +0,0 @@ -/* inftrees.h -- header to use inftrees.c - * Copyright (C) 1995-2005, 2010 Mark Adler - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -/* WARNING: this file should *not* be used by applications. It is - part of the implementation of the compression library and is - subject to change. Applications should only use zlib.h. - */ - -/* Structure for decoding tables. Each entry provides either the - information needed to do the operation requested by the code that - indexed that table entry, or it provides a pointer to another - table that indexes more bits of the code. op indicates whether - the entry is a pointer to another table, a literal, a length or - distance, an end-of-block, or an invalid code. For a table - pointer, the low four bits of op is the number of index bits of - that table. For a length or distance, the low four bits of op - is the number of extra bits to get after the code. bits is - the number of bits in this code or part of the code to drop off - of the bit buffer. val is the actual byte to output in the case - of a literal, the base length or distance, or the offset from - the current table to the next table. Each entry is four bytes. */ -typedef struct { - unsigned char op; /* operation, extra bits, table bits */ - unsigned char bits; /* bits in this part of the code */ - unsigned short val; /* offset in table or code value */ -} code; - -/* op values as set by inflate_table(): - 00000000 - literal - 0000tttt - table link, tttt != 0 is the number of table index bits - 0001eeee - length or distance, eeee is the number of extra bits - 01100000 - end of block - 01000000 - invalid code - */ - -/* Maximum size of the dynamic table. The maximum number of code structures is - 1444, which is the sum of 852 for literal/length codes and 592 for distance - codes. These values were found by exhaustive searches using the program - examples/enough.c found in the zlib distribtution. The arguments to that - program are the number of symbols, the initial root table size, and the - maximum bit length of a code. "enough 286 9 15" for literal/length codes - returns returns 852, and "enough 30 6 15" for distance codes returns 592. - The initial root table size (9 or 6) is found in the fifth argument of the - inflate_table() calls in inflate.c and infback.c. If the root table size is - changed, then these maximum sizes would be need to be recalculated and - updated. */ -#define ENOUGH_LENS 852 -#define ENOUGH_DISTS 592 -#define ENOUGH (ENOUGH_LENS+ENOUGH_DISTS) - -/* Type of code to build for inflate_table() */ -typedef enum { - CODES, - LENS, - DISTS -} codetype; - -int ZLIB_INTERNAL inflate_table OF((codetype type, unsigned short FAR *lens, - unsigned codes, code FAR * FAR *table, - unsigned FAR *bits, unsigned short FAR *work)); diff --git a/vendor/libgit2/deps/zlib/trees.c b/vendor/libgit2/deps/zlib/trees.c deleted file mode 100644 index bb866f012..000000000 --- a/vendor/libgit2/deps/zlib/trees.c +++ /dev/null @@ -1,1226 +0,0 @@ -/* trees.c -- output deflated data using Huffman coding - * Copyright (C) 1995-2012 Jean-loup Gailly - * detect_data_type() function provided freely by Cosmin Truta, 2006 - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -/* - * ALGORITHM - * - * The "deflation" process uses several Huffman trees. The more - * common source values are represented by shorter bit sequences. - * - * Each code tree is stored in a compressed form which is itself - * a Huffman encoding of the lengths of all the code strings (in - * ascending order by source values). The actual code strings are - * reconstructed from the lengths in the inflate process, as described - * in the deflate specification. - * - * REFERENCES - * - * Deutsch, L.P.,"'Deflate' Compressed Data Format Specification". - * Available in ftp.uu.net:/pub/archiving/zip/doc/deflate-1.1.doc - * - * Storer, James A. - * Data Compression: Methods and Theory, pp. 49-50. - * Computer Science Press, 1988. ISBN 0-7167-8156-5. - * - * Sedgewick, R. - * Algorithms, p290. - * Addison-Wesley, 1983. ISBN 0-201-06672-6. - */ - -/* @(#) $Id$ */ - -/* #define GEN_TREES_H */ - -#include "deflate.h" - -#ifdef DEBUG -# include -#endif - -/* =========================================================================== - * Constants - */ - -#define MAX_BL_BITS 7 -/* Bit length codes must not exceed MAX_BL_BITS bits */ - -#define END_BLOCK 256 -/* end of block literal code */ - -#define REP_3_6 16 -/* repeat previous bit length 3-6 times (2 bits of repeat count) */ - -#define REPZ_3_10 17 -/* repeat a zero length 3-10 times (3 bits of repeat count) */ - -#define REPZ_11_138 18 -/* repeat a zero length 11-138 times (7 bits of repeat count) */ - -local const int extra_lbits[LENGTH_CODES] /* extra bits for each length code */ - = {0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0}; - -local const int extra_dbits[D_CODES] /* extra bits for each distance code */ - = {0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13}; - -local const int extra_blbits[BL_CODES]/* extra bits for each bit length code */ - = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,3,7}; - -local const uch bl_order[BL_CODES] - = {16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15}; -/* The lengths of the bit length codes are sent in order of decreasing - * probability, to avoid transmitting the lengths for unused bit length codes. - */ - -/* =========================================================================== - * Local data. These are initialized only once. - */ - -#define DIST_CODE_LEN 512 /* see definition of array dist_code below */ - -#if defined(GEN_TREES_H) || !defined(STDC) -/* non ANSI compilers may not accept trees.h */ - -local ct_data static_ltree[L_CODES+2]; -/* The static literal tree. Since the bit lengths are imposed, there is no - * need for the L_CODES extra codes used during heap construction. However - * The codes 286 and 287 are needed to build a canonical tree (see _tr_init - * below). - */ - -local ct_data static_dtree[D_CODES]; -/* The static distance tree. (Actually a trivial tree since all codes use - * 5 bits.) - */ - -uch _dist_code[DIST_CODE_LEN]; -/* Distance codes. The first 256 values correspond to the distances - * 3 .. 258, the last 256 values correspond to the top 8 bits of - * the 15 bit distances. - */ - -uch _length_code[MAX_MATCH-MIN_MATCH+1]; -/* length code for each normalized match length (0 == MIN_MATCH) */ - -local int base_length[LENGTH_CODES]; -/* First normalized length for each code (0 = MIN_MATCH) */ - -local int base_dist[D_CODES]; -/* First normalized distance for each code (0 = distance of 1) */ - -#else -# include "trees.h" -#endif /* GEN_TREES_H */ - -struct static_tree_desc_s { - const ct_data *static_tree; /* static tree or NULL */ - const intf *extra_bits; /* extra bits for each code or NULL */ - int extra_base; /* base index for extra_bits */ - int elems; /* max number of elements in the tree */ - int max_length; /* max bit length for the codes */ -}; - -local static_tree_desc static_l_desc = -{static_ltree, extra_lbits, LITERALS+1, L_CODES, MAX_BITS}; - -local static_tree_desc static_d_desc = -{static_dtree, extra_dbits, 0, D_CODES, MAX_BITS}; - -local static_tree_desc static_bl_desc = -{(const ct_data *)0, extra_blbits, 0, BL_CODES, MAX_BL_BITS}; - -/* =========================================================================== - * Local (static) routines in this file. - */ - -local void tr_static_init OF((void)); -local void init_block OF((deflate_state *s)); -local void pqdownheap OF((deflate_state *s, ct_data *tree, int k)); -local void gen_bitlen OF((deflate_state *s, tree_desc *desc)); -local void gen_codes OF((ct_data *tree, int max_code, ushf *bl_count)); -local void build_tree OF((deflate_state *s, tree_desc *desc)); -local void scan_tree OF((deflate_state *s, ct_data *tree, int max_code)); -local void send_tree OF((deflate_state *s, ct_data *tree, int max_code)); -local int build_bl_tree OF((deflate_state *s)); -local void send_all_trees OF((deflate_state *s, int lcodes, int dcodes, - int blcodes)); -local void compress_block OF((deflate_state *s, const ct_data *ltree, - const ct_data *dtree)); -local int detect_data_type OF((deflate_state *s)); -local unsigned bi_reverse OF((unsigned value, int length)); -local void bi_windup OF((deflate_state *s)); -local void bi_flush OF((deflate_state *s)); -local void copy_block OF((deflate_state *s, charf *buf, unsigned len, - int header)); - -#ifdef GEN_TREES_H -local void gen_trees_header OF((void)); -#endif - -#ifndef DEBUG -# define send_code(s, c, tree) send_bits(s, tree[c].Code, tree[c].Len) - /* Send a code of the given tree. c and tree must not have side effects */ - -#else /* DEBUG */ -# define send_code(s, c, tree) \ - { if (z_verbose>2) fprintf(stderr,"\ncd %3d ",(c)); \ - send_bits(s, tree[c].Code, tree[c].Len); } -#endif - -/* =========================================================================== - * Output a short LSB first on the stream. - * IN assertion: there is enough room in pendingBuf. - */ -#define put_short(s, w) { \ - put_byte(s, (uch)((w) & 0xff)); \ - put_byte(s, (uch)((ush)(w) >> 8)); \ -} - -/* =========================================================================== - * Send a value on a given number of bits. - * IN assertion: length <= 16 and value fits in length bits. - */ -#ifdef DEBUG -local void send_bits OF((deflate_state *s, int value, int length)); - -local void send_bits(s, value, length) - deflate_state *s; - int value; /* value to send */ - int length; /* number of bits */ -{ - Tracevv((stderr," l %2d v %4x ", length, value)); - Assert(length > 0 && length <= 15, "invalid length"); - s->bits_sent += (ulg)length; - - /* If not enough room in bi_buf, use (valid) bits from bi_buf and - * (16 - bi_valid) bits from value, leaving (width - (16-bi_valid)) - * unused bits in value. - */ - if (s->bi_valid > (int)Buf_size - length) { - s->bi_buf |= (ush)value << s->bi_valid; - put_short(s, s->bi_buf); - s->bi_buf = (ush)value >> (Buf_size - s->bi_valid); - s->bi_valid += length - Buf_size; - } else { - s->bi_buf |= (ush)value << s->bi_valid; - s->bi_valid += length; - } -} -#else /* !DEBUG */ - -#define send_bits(s, value, length) \ -{ int len = length;\ - if (s->bi_valid > (int)Buf_size - len) {\ - int val = value;\ - s->bi_buf |= (ush)val << s->bi_valid;\ - put_short(s, s->bi_buf);\ - s->bi_buf = (ush)val >> (Buf_size - s->bi_valid);\ - s->bi_valid += len - Buf_size;\ - } else {\ - s->bi_buf |= (ush)(value) << s->bi_valid;\ - s->bi_valid += len;\ - }\ -} -#endif /* DEBUG */ - - -/* the arguments must not have side effects */ - -/* =========================================================================== - * Initialize the various 'constant' tables. - */ -local void tr_static_init() -{ -#if defined(GEN_TREES_H) || !defined(STDC) - static int static_init_done = 0; - int n; /* iterates over tree elements */ - int bits; /* bit counter */ - int length; /* length value */ - int code; /* code value */ - int dist; /* distance index */ - ush bl_count[MAX_BITS+1]; - /* number of codes at each bit length for an optimal tree */ - - if (static_init_done) return; - - /* For some embedded targets, global variables are not initialized: */ -#ifdef NO_INIT_GLOBAL_POINTERS - static_l_desc.static_tree = static_ltree; - static_l_desc.extra_bits = extra_lbits; - static_d_desc.static_tree = static_dtree; - static_d_desc.extra_bits = extra_dbits; - static_bl_desc.extra_bits = extra_blbits; -#endif - - /* Initialize the mapping length (0..255) -> length code (0..28) */ - length = 0; - for (code = 0; code < LENGTH_CODES-1; code++) { - base_length[code] = length; - for (n = 0; n < (1< dist code (0..29) */ - dist = 0; - for (code = 0 ; code < 16; code++) { - base_dist[code] = dist; - for (n = 0; n < (1<>= 7; /* from now on, all distances are divided by 128 */ - for ( ; code < D_CODES; code++) { - base_dist[code] = dist << 7; - for (n = 0; n < (1<<(extra_dbits[code]-7)); n++) { - _dist_code[256 + dist++] = (uch)code; - } - } - Assert (dist == 256, "tr_static_init: 256+dist != 512"); - - /* Construct the codes of the static literal tree */ - for (bits = 0; bits <= MAX_BITS; bits++) bl_count[bits] = 0; - n = 0; - while (n <= 143) static_ltree[n++].Len = 8, bl_count[8]++; - while (n <= 255) static_ltree[n++].Len = 9, bl_count[9]++; - while (n <= 279) static_ltree[n++].Len = 7, bl_count[7]++; - while (n <= 287) static_ltree[n++].Len = 8, bl_count[8]++; - /* Codes 286 and 287 do not exist, but we must include them in the - * tree construction to get a canonical Huffman tree (longest code - * all ones) - */ - gen_codes((ct_data *)static_ltree, L_CODES+1, bl_count); - - /* The static distance tree is trivial: */ - for (n = 0; n < D_CODES; n++) { - static_dtree[n].Len = 5; - static_dtree[n].Code = bi_reverse((unsigned)n, 5); - } - static_init_done = 1; - -# ifdef GEN_TREES_H - gen_trees_header(); -# endif -#endif /* defined(GEN_TREES_H) || !defined(STDC) */ -} - -/* =========================================================================== - * Genererate the file trees.h describing the static trees. - */ -#ifdef GEN_TREES_H -# ifndef DEBUG -# include -# endif - -# define SEPARATOR(i, last, width) \ - ((i) == (last)? "\n};\n\n" : \ - ((i) % (width) == (width)-1 ? ",\n" : ", ")) - -void gen_trees_header() -{ - FILE *header = fopen("trees.h", "w"); - int i; - - Assert (header != NULL, "Can't open trees.h"); - fprintf(header, - "/* header created automatically with -DGEN_TREES_H */\n\n"); - - fprintf(header, "local const ct_data static_ltree[L_CODES+2] = {\n"); - for (i = 0; i < L_CODES+2; i++) { - fprintf(header, "{{%3u},{%3u}}%s", static_ltree[i].Code, - static_ltree[i].Len, SEPARATOR(i, L_CODES+1, 5)); - } - - fprintf(header, "local const ct_data static_dtree[D_CODES] = {\n"); - for (i = 0; i < D_CODES; i++) { - fprintf(header, "{{%2u},{%2u}}%s", static_dtree[i].Code, - static_dtree[i].Len, SEPARATOR(i, D_CODES-1, 5)); - } - - fprintf(header, "const uch ZLIB_INTERNAL _dist_code[DIST_CODE_LEN] = {\n"); - for (i = 0; i < DIST_CODE_LEN; i++) { - fprintf(header, "%2u%s", _dist_code[i], - SEPARATOR(i, DIST_CODE_LEN-1, 20)); - } - - fprintf(header, - "const uch ZLIB_INTERNAL _length_code[MAX_MATCH-MIN_MATCH+1]= {\n"); - for (i = 0; i < MAX_MATCH-MIN_MATCH+1; i++) { - fprintf(header, "%2u%s", _length_code[i], - SEPARATOR(i, MAX_MATCH-MIN_MATCH, 20)); - } - - fprintf(header, "local const int base_length[LENGTH_CODES] = {\n"); - for (i = 0; i < LENGTH_CODES; i++) { - fprintf(header, "%1u%s", base_length[i], - SEPARATOR(i, LENGTH_CODES-1, 20)); - } - - fprintf(header, "local const int base_dist[D_CODES] = {\n"); - for (i = 0; i < D_CODES; i++) { - fprintf(header, "%5u%s", base_dist[i], - SEPARATOR(i, D_CODES-1, 10)); - } - - fclose(header); -} -#endif /* GEN_TREES_H */ - -/* =========================================================================== - * Initialize the tree data structures for a new zlib stream. - */ -void ZLIB_INTERNAL _tr_init(s) - deflate_state *s; -{ - tr_static_init(); - - s->l_desc.dyn_tree = s->dyn_ltree; - s->l_desc.stat_desc = &static_l_desc; - - s->d_desc.dyn_tree = s->dyn_dtree; - s->d_desc.stat_desc = &static_d_desc; - - s->bl_desc.dyn_tree = s->bl_tree; - s->bl_desc.stat_desc = &static_bl_desc; - - s->bi_buf = 0; - s->bi_valid = 0; -#ifdef DEBUG - s->compressed_len = 0L; - s->bits_sent = 0L; -#endif - - /* Initialize the first block of the first file: */ - init_block(s); -} - -/* =========================================================================== - * Initialize a new block. - */ -local void init_block(s) - deflate_state *s; -{ - int n; /* iterates over tree elements */ - - /* Initialize the trees. */ - for (n = 0; n < L_CODES; n++) s->dyn_ltree[n].Freq = 0; - for (n = 0; n < D_CODES; n++) s->dyn_dtree[n].Freq = 0; - for (n = 0; n < BL_CODES; n++) s->bl_tree[n].Freq = 0; - - s->dyn_ltree[END_BLOCK].Freq = 1; - s->opt_len = s->static_len = 0L; - s->last_lit = s->matches = 0; -} - -#define SMALLEST 1 -/* Index within the heap array of least frequent node in the Huffman tree */ - - -/* =========================================================================== - * Remove the smallest element from the heap and recreate the heap with - * one less element. Updates heap and heap_len. - */ -#define pqremove(s, tree, top) \ -{\ - top = s->heap[SMALLEST]; \ - s->heap[SMALLEST] = s->heap[s->heap_len--]; \ - pqdownheap(s, tree, SMALLEST); \ -} - -/* =========================================================================== - * Compares to subtrees, using the tree depth as tie breaker when - * the subtrees have equal frequency. This minimizes the worst case length. - */ -#define smaller(tree, n, m, depth) \ - (tree[n].Freq < tree[m].Freq || \ - (tree[n].Freq == tree[m].Freq && depth[n] <= depth[m])) - -/* =========================================================================== - * Restore the heap property by moving down the tree starting at node k, - * exchanging a node with the smallest of its two sons if necessary, stopping - * when the heap property is re-established (each father smaller than its - * two sons). - */ -local void pqdownheap(s, tree, k) - deflate_state *s; - ct_data *tree; /* the tree to restore */ - int k; /* node to move down */ -{ - int v = s->heap[k]; - int j = k << 1; /* left son of k */ - while (j <= s->heap_len) { - /* Set j to the smallest of the two sons: */ - if (j < s->heap_len && - smaller(tree, s->heap[j+1], s->heap[j], s->depth)) { - j++; - } - /* Exit if v is smaller than both sons */ - if (smaller(tree, v, s->heap[j], s->depth)) break; - - /* Exchange v with the smallest son */ - s->heap[k] = s->heap[j]; k = j; - - /* And continue down the tree, setting j to the left son of k */ - j <<= 1; - } - s->heap[k] = v; -} - -/* =========================================================================== - * Compute the optimal bit lengths for a tree and update the total bit length - * for the current block. - * IN assertion: the fields freq and dad are set, heap[heap_max] and - * above are the tree nodes sorted by increasing frequency. - * OUT assertions: the field len is set to the optimal bit length, the - * array bl_count contains the frequencies for each bit length. - * The length opt_len is updated; static_len is also updated if stree is - * not null. - */ -local void gen_bitlen(s, desc) - deflate_state *s; - tree_desc *desc; /* the tree descriptor */ -{ - ct_data *tree = desc->dyn_tree; - int max_code = desc->max_code; - const ct_data *stree = desc->stat_desc->static_tree; - const intf *extra = desc->stat_desc->extra_bits; - int base = desc->stat_desc->extra_base; - int max_length = desc->stat_desc->max_length; - int h; /* heap index */ - int n, m; /* iterate over the tree elements */ - int bits; /* bit length */ - int xbits; /* extra bits */ - ush f; /* frequency */ - int overflow = 0; /* number of elements with bit length too large */ - - for (bits = 0; bits <= MAX_BITS; bits++) s->bl_count[bits] = 0; - - /* In a first pass, compute the optimal bit lengths (which may - * overflow in the case of the bit length tree). - */ - tree[s->heap[s->heap_max]].Len = 0; /* root of the heap */ - - for (h = s->heap_max+1; h < HEAP_SIZE; h++) { - n = s->heap[h]; - bits = tree[tree[n].Dad].Len + 1; - if (bits > max_length) bits = max_length, overflow++; - tree[n].Len = (ush)bits; - /* We overwrite tree[n].Dad which is no longer needed */ - - if (n > max_code) continue; /* not a leaf node */ - - s->bl_count[bits]++; - xbits = 0; - if (n >= base) xbits = extra[n-base]; - f = tree[n].Freq; - s->opt_len += (ulg)f * (bits + xbits); - if (stree) s->static_len += (ulg)f * (stree[n].Len + xbits); - } - if (overflow == 0) return; - - Trace((stderr,"\nbit length overflow\n")); - /* This happens for example on obj2 and pic of the Calgary corpus */ - - /* Find the first bit length which could increase: */ - do { - bits = max_length-1; - while (s->bl_count[bits] == 0) bits--; - s->bl_count[bits]--; /* move one leaf down the tree */ - s->bl_count[bits+1] += 2; /* move one overflow item as its brother */ - s->bl_count[max_length]--; - /* The brother of the overflow item also moves one step up, - * but this does not affect bl_count[max_length] - */ - overflow -= 2; - } while (overflow > 0); - - /* Now recompute all bit lengths, scanning in increasing frequency. - * h is still equal to HEAP_SIZE. (It is simpler to reconstruct all - * lengths instead of fixing only the wrong ones. This idea is taken - * from 'ar' written by Haruhiko Okumura.) - */ - for (bits = max_length; bits != 0; bits--) { - n = s->bl_count[bits]; - while (n != 0) { - m = s->heap[--h]; - if (m > max_code) continue; - if ((unsigned) tree[m].Len != (unsigned) bits) { - Trace((stderr,"code %d bits %d->%d\n", m, tree[m].Len, bits)); - s->opt_len += ((long)bits - (long)tree[m].Len) - *(long)tree[m].Freq; - tree[m].Len = (ush)bits; - } - n--; - } - } -} - -/* =========================================================================== - * Generate the codes for a given tree and bit counts (which need not be - * optimal). - * IN assertion: the array bl_count contains the bit length statistics for - * the given tree and the field len is set for all tree elements. - * OUT assertion: the field code is set for all tree elements of non - * zero code length. - */ -local void gen_codes (tree, max_code, bl_count) - ct_data *tree; /* the tree to decorate */ - int max_code; /* largest code with non zero frequency */ - ushf *bl_count; /* number of codes at each bit length */ -{ - ush next_code[MAX_BITS+1]; /* next code value for each bit length */ - ush code = 0; /* running code value */ - int bits; /* bit index */ - int n; /* code index */ - - /* The distribution counts are first used to generate the code values - * without bit reversal. - */ - for (bits = 1; bits <= MAX_BITS; bits++) { - next_code[bits] = code = (code + bl_count[bits-1]) << 1; - } - /* Check that the bit counts in bl_count are consistent. The last code - * must be all ones. - */ - Assert (code + bl_count[MAX_BITS]-1 == (1<dyn_tree; - const ct_data *stree = desc->stat_desc->static_tree; - int elems = desc->stat_desc->elems; - int n, m; /* iterate over heap elements */ - int max_code = -1; /* largest code with non zero frequency */ - int node; /* new node being created */ - - /* Construct the initial heap, with least frequent element in - * heap[SMALLEST]. The sons of heap[n] are heap[2*n] and heap[2*n+1]. - * heap[0] is not used. - */ - s->heap_len = 0, s->heap_max = HEAP_SIZE; - - for (n = 0; n < elems; n++) { - if (tree[n].Freq != 0) { - s->heap[++(s->heap_len)] = max_code = n; - s->depth[n] = 0; - } else { - tree[n].Len = 0; - } - } - - /* The pkzip format requires that at least one distance code exists, - * and that at least one bit should be sent even if there is only one - * possible code. So to avoid special checks later on we force at least - * two codes of non zero frequency. - */ - while (s->heap_len < 2) { - node = s->heap[++(s->heap_len)] = (max_code < 2 ? ++max_code : 0); - tree[node].Freq = 1; - s->depth[node] = 0; - s->opt_len--; if (stree) s->static_len -= stree[node].Len; - /* node is 0 or 1 so it does not have extra bits */ - } - desc->max_code = max_code; - - /* The elements heap[heap_len/2+1 .. heap_len] are leaves of the tree, - * establish sub-heaps of increasing lengths: - */ - for (n = s->heap_len/2; n >= 1; n--) pqdownheap(s, tree, n); - - /* Construct the Huffman tree by repeatedly combining the least two - * frequent nodes. - */ - node = elems; /* next internal node of the tree */ - do { - pqremove(s, tree, n); /* n = node of least frequency */ - m = s->heap[SMALLEST]; /* m = node of next least frequency */ - - s->heap[--(s->heap_max)] = n; /* keep the nodes sorted by frequency */ - s->heap[--(s->heap_max)] = m; - - /* Create a new node father of n and m */ - tree[node].Freq = tree[n].Freq + tree[m].Freq; - s->depth[node] = (uch)((s->depth[n] >= s->depth[m] ? - s->depth[n] : s->depth[m]) + 1); - tree[n].Dad = tree[m].Dad = (ush)node; -#ifdef DUMP_BL_TREE - if (tree == s->bl_tree) { - fprintf(stderr,"\nnode %d(%d), sons %d(%d) %d(%d)", - node, tree[node].Freq, n, tree[n].Freq, m, tree[m].Freq); - } -#endif - /* and insert the new node in the heap */ - s->heap[SMALLEST] = node++; - pqdownheap(s, tree, SMALLEST); - - } while (s->heap_len >= 2); - - s->heap[--(s->heap_max)] = s->heap[SMALLEST]; - - /* At this point, the fields freq and dad are set. We can now - * generate the bit lengths. - */ - gen_bitlen(s, (tree_desc *)desc); - - /* The field len is now set, we can generate the bit codes */ - gen_codes ((ct_data *)tree, max_code, s->bl_count); -} - -/* =========================================================================== - * Scan a literal or distance tree to determine the frequencies of the codes - * in the bit length tree. - */ -local void scan_tree (s, tree, max_code) - deflate_state *s; - ct_data *tree; /* the tree to be scanned */ - int max_code; /* and its largest code of non zero frequency */ -{ - int n; /* iterates over all tree elements */ - int prevlen = -1; /* last emitted length */ - int curlen; /* length of current code */ - int nextlen = tree[0].Len; /* length of next code */ - int count = 0; /* repeat count of the current code */ - int max_count = 7; /* max repeat count */ - int min_count = 4; /* min repeat count */ - - if (nextlen == 0) max_count = 138, min_count = 3; - tree[max_code+1].Len = (ush)0xffff; /* guard */ - - for (n = 0; n <= max_code; n++) { - curlen = nextlen; nextlen = tree[n+1].Len; - if (++count < max_count && curlen == nextlen) { - continue; - } else if (count < min_count) { - s->bl_tree[curlen].Freq += (ush)count; - } else if (curlen != 0) { - if (curlen != prevlen) s->bl_tree[curlen].Freq++; - s->bl_tree[REP_3_6].Freq++; - } else if (count <= 10) { - s->bl_tree[REPZ_3_10].Freq++; - } else { - s->bl_tree[REPZ_11_138].Freq++; - } - count = 0; prevlen = curlen; - if (nextlen == 0) { - max_count = 138, min_count = 3; - } else if (curlen == nextlen) { - max_count = 6, min_count = 3; - } else { - max_count = 7, min_count = 4; - } - } -} - -/* =========================================================================== - * Send a literal or distance tree in compressed form, using the codes in - * bl_tree. - */ -local void send_tree (s, tree, max_code) - deflate_state *s; - ct_data *tree; /* the tree to be scanned */ - int max_code; /* and its largest code of non zero frequency */ -{ - int n; /* iterates over all tree elements */ - int prevlen = -1; /* last emitted length */ - int curlen; /* length of current code */ - int nextlen = tree[0].Len; /* length of next code */ - int count = 0; /* repeat count of the current code */ - int max_count = 7; /* max repeat count */ - int min_count = 4; /* min repeat count */ - - /* tree[max_code+1].Len = -1; */ /* guard already set */ - if (nextlen == 0) max_count = 138, min_count = 3; - - for (n = 0; n <= max_code; n++) { - curlen = nextlen; nextlen = tree[n+1].Len; - if (++count < max_count && curlen == nextlen) { - continue; - } else if (count < min_count) { - do { send_code(s, curlen, s->bl_tree); } while (--count != 0); - - } else if (curlen != 0) { - if (curlen != prevlen) { - send_code(s, curlen, s->bl_tree); count--; - } - Assert(count >= 3 && count <= 6, " 3_6?"); - send_code(s, REP_3_6, s->bl_tree); send_bits(s, count-3, 2); - - } else if (count <= 10) { - send_code(s, REPZ_3_10, s->bl_tree); send_bits(s, count-3, 3); - - } else { - send_code(s, REPZ_11_138, s->bl_tree); send_bits(s, count-11, 7); - } - count = 0; prevlen = curlen; - if (nextlen == 0) { - max_count = 138, min_count = 3; - } else if (curlen == nextlen) { - max_count = 6, min_count = 3; - } else { - max_count = 7, min_count = 4; - } - } -} - -/* =========================================================================== - * Construct the Huffman tree for the bit lengths and return the index in - * bl_order of the last bit length code to send. - */ -local int build_bl_tree(s) - deflate_state *s; -{ - int max_blindex; /* index of last bit length code of non zero freq */ - - /* Determine the bit length frequencies for literal and distance trees */ - scan_tree(s, (ct_data *)s->dyn_ltree, s->l_desc.max_code); - scan_tree(s, (ct_data *)s->dyn_dtree, s->d_desc.max_code); - - /* Build the bit length tree: */ - build_tree(s, (tree_desc *)(&(s->bl_desc))); - /* opt_len now includes the length of the tree representations, except - * the lengths of the bit lengths codes and the 5+5+4 bits for the counts. - */ - - /* Determine the number of bit length codes to send. The pkzip format - * requires that at least 4 bit length codes be sent. (appnote.txt says - * 3 but the actual value used is 4.) - */ - for (max_blindex = BL_CODES-1; max_blindex >= 3; max_blindex--) { - if (s->bl_tree[bl_order[max_blindex]].Len != 0) break; - } - /* Update opt_len to include the bit length tree and counts */ - s->opt_len += 3*(max_blindex+1) + 5+5+4; - Tracev((stderr, "\ndyn trees: dyn %ld, stat %ld", - s->opt_len, s->static_len)); - - return max_blindex; -} - -/* =========================================================================== - * Send the header for a block using dynamic Huffman trees: the counts, the - * lengths of the bit length codes, the literal tree and the distance tree. - * IN assertion: lcodes >= 257, dcodes >= 1, blcodes >= 4. - */ -local void send_all_trees(s, lcodes, dcodes, blcodes) - deflate_state *s; - int lcodes, dcodes, blcodes; /* number of codes for each tree */ -{ - int rank; /* index in bl_order */ - - Assert (lcodes >= 257 && dcodes >= 1 && blcodes >= 4, "not enough codes"); - Assert (lcodes <= L_CODES && dcodes <= D_CODES && blcodes <= BL_CODES, - "too many codes"); - Tracev((stderr, "\nbl counts: ")); - send_bits(s, lcodes-257, 5); /* not +255 as stated in appnote.txt */ - send_bits(s, dcodes-1, 5); - send_bits(s, blcodes-4, 4); /* not -3 as stated in appnote.txt */ - for (rank = 0; rank < blcodes; rank++) { - Tracev((stderr, "\nbl code %2d ", bl_order[rank])); - send_bits(s, s->bl_tree[bl_order[rank]].Len, 3); - } - Tracev((stderr, "\nbl tree: sent %ld", s->bits_sent)); - - send_tree(s, (ct_data *)s->dyn_ltree, lcodes-1); /* literal tree */ - Tracev((stderr, "\nlit tree: sent %ld", s->bits_sent)); - - send_tree(s, (ct_data *)s->dyn_dtree, dcodes-1); /* distance tree */ - Tracev((stderr, "\ndist tree: sent %ld", s->bits_sent)); -} - -/* =========================================================================== - * Send a stored block - */ -void ZLIB_INTERNAL _tr_stored_block(s, buf, stored_len, last) - deflate_state *s; - charf *buf; /* input block */ - ulg stored_len; /* length of input block */ - int last; /* one if this is the last block for a file */ -{ - send_bits(s, (STORED_BLOCK<<1)+last, 3); /* send block type */ -#ifdef DEBUG - s->compressed_len = (s->compressed_len + 3 + 7) & (ulg)~7L; - s->compressed_len += (stored_len + 4) << 3; -#endif - copy_block(s, buf, (unsigned)stored_len, 1); /* with header */ -} - -/* =========================================================================== - * Flush the bits in the bit buffer to pending output (leaves at most 7 bits) - */ -void ZLIB_INTERNAL _tr_flush_bits(s) - deflate_state *s; -{ - bi_flush(s); -} - -/* =========================================================================== - * Send one empty static block to give enough lookahead for inflate. - * This takes 10 bits, of which 7 may remain in the bit buffer. - */ -void ZLIB_INTERNAL _tr_align(s) - deflate_state *s; -{ - send_bits(s, STATIC_TREES<<1, 3); - send_code(s, END_BLOCK, static_ltree); -#ifdef DEBUG - s->compressed_len += 10L; /* 3 for block type, 7 for EOB */ -#endif - bi_flush(s); -} - -/* =========================================================================== - * Determine the best encoding for the current block: dynamic trees, static - * trees or store, and output the encoded block to the zip file. - */ -void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last) - deflate_state *s; - charf *buf; /* input block, or NULL if too old */ - ulg stored_len; /* length of input block */ - int last; /* one if this is the last block for a file */ -{ - ulg opt_lenb, static_lenb; /* opt_len and static_len in bytes */ - int max_blindex = 0; /* index of last bit length code of non zero freq */ - - /* Build the Huffman trees unless a stored block is forced */ - if (s->level > 0) { - - /* Check if the file is binary or text */ - if (s->strm->data_type == Z_UNKNOWN) - s->strm->data_type = detect_data_type(s); - - /* Construct the literal and distance trees */ - build_tree(s, (tree_desc *)(&(s->l_desc))); - Tracev((stderr, "\nlit data: dyn %ld, stat %ld", s->opt_len, - s->static_len)); - - build_tree(s, (tree_desc *)(&(s->d_desc))); - Tracev((stderr, "\ndist data: dyn %ld, stat %ld", s->opt_len, - s->static_len)); - /* At this point, opt_len and static_len are the total bit lengths of - * the compressed block data, excluding the tree representations. - */ - - /* Build the bit length tree for the above two trees, and get the index - * in bl_order of the last bit length code to send. - */ - max_blindex = build_bl_tree(s); - - /* Determine the best encoding. Compute the block lengths in bytes. */ - opt_lenb = (s->opt_len+3+7)>>3; - static_lenb = (s->static_len+3+7)>>3; - - Tracev((stderr, "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u ", - opt_lenb, s->opt_len, static_lenb, s->static_len, stored_len, - s->last_lit)); - - if (static_lenb <= opt_lenb) opt_lenb = static_lenb; - - } else { - Assert(buf != (char*)0, "lost buf"); - opt_lenb = static_lenb = stored_len + 5; /* force a stored block */ - } - -#ifdef FORCE_STORED - if (buf != (char*)0) { /* force stored block */ -#else - if (stored_len+4 <= opt_lenb && buf != (char*)0) { - /* 4: two words for the lengths */ -#endif - /* The test buf != NULL is only necessary if LIT_BUFSIZE > WSIZE. - * Otherwise we can't have processed more than WSIZE input bytes since - * the last block flush, because compression would have been - * successful. If LIT_BUFSIZE <= WSIZE, it is never too late to - * transform a block into a stored block. - */ - _tr_stored_block(s, buf, stored_len, last); - -#ifdef FORCE_STATIC - } else if (static_lenb >= 0) { /* force static trees */ -#else - } else if (s->strategy == Z_FIXED || static_lenb == opt_lenb) { -#endif - send_bits(s, (STATIC_TREES<<1)+last, 3); - compress_block(s, (const ct_data *)static_ltree, - (const ct_data *)static_dtree); -#ifdef DEBUG - s->compressed_len += 3 + s->static_len; -#endif - } else { - send_bits(s, (DYN_TREES<<1)+last, 3); - send_all_trees(s, s->l_desc.max_code+1, s->d_desc.max_code+1, - max_blindex+1); - compress_block(s, (const ct_data *)s->dyn_ltree, - (const ct_data *)s->dyn_dtree); -#ifdef DEBUG - s->compressed_len += 3 + s->opt_len; -#endif - } - Assert (s->compressed_len == s->bits_sent, "bad compressed size"); - /* The above check is made mod 2^32, for files larger than 512 MB - * and uLong implemented on 32 bits. - */ - init_block(s); - - if (last) { - bi_windup(s); -#ifdef DEBUG - s->compressed_len += 7; /* align on byte boundary */ -#endif - } - Tracev((stderr,"\ncomprlen %lu(%lu) ", s->compressed_len>>3, - s->compressed_len-7*last)); -} - -/* =========================================================================== - * Save the match info and tally the frequency counts. Return true if - * the current block must be flushed. - */ -int ZLIB_INTERNAL _tr_tally (s, dist, lc) - deflate_state *s; - unsigned dist; /* distance of matched string */ - unsigned lc; /* match length-MIN_MATCH or unmatched char (if dist==0) */ -{ - s->d_buf[s->last_lit] = (ush)dist; - s->l_buf[s->last_lit++] = (uch)lc; - if (dist == 0) { - /* lc is the unmatched char */ - s->dyn_ltree[lc].Freq++; - } else { - s->matches++; - /* Here, lc is the match length - MIN_MATCH */ - dist--; /* dist = match distance - 1 */ - Assert((ush)dist < (ush)MAX_DIST(s) && - (ush)lc <= (ush)(MAX_MATCH-MIN_MATCH) && - (ush)d_code(dist) < (ush)D_CODES, "_tr_tally: bad match"); - - s->dyn_ltree[_length_code[lc]+LITERALS+1].Freq++; - s->dyn_dtree[d_code(dist)].Freq++; - } - -#ifdef TRUNCATE_BLOCK - /* Try to guess if it is profitable to stop the current block here */ - if ((s->last_lit & 0x1fff) == 0 && s->level > 2) { - /* Compute an upper bound for the compressed length */ - ulg out_length = (ulg)s->last_lit*8L; - ulg in_length = (ulg)((long)s->strstart - s->block_start); - int dcode; - for (dcode = 0; dcode < D_CODES; dcode++) { - out_length += (ulg)s->dyn_dtree[dcode].Freq * - (5L+extra_dbits[dcode]); - } - out_length >>= 3; - Tracev((stderr,"\nlast_lit %u, in %ld, out ~%ld(%ld%%) ", - s->last_lit, in_length, out_length, - 100L - out_length*100L/in_length)); - if (s->matches < s->last_lit/2 && out_length < in_length/2) return 1; - } -#endif - return (s->last_lit == s->lit_bufsize-1); - /* We avoid equality with lit_bufsize because of wraparound at 64K - * on 16 bit machines and because stored blocks are restricted to - * 64K-1 bytes. - */ -} - -/* =========================================================================== - * Send the block data compressed using the given Huffman trees - */ -local void compress_block(s, ltree, dtree) - deflate_state *s; - const ct_data *ltree; /* literal tree */ - const ct_data *dtree; /* distance tree */ -{ - unsigned dist; /* distance of matched string */ - int lc; /* match length or unmatched char (if dist == 0) */ - unsigned lx = 0; /* running index in l_buf */ - unsigned code; /* the code to send */ - int extra; /* number of extra bits to send */ - - if (s->last_lit != 0) do { - dist = s->d_buf[lx]; - lc = s->l_buf[lx++]; - if (dist == 0) { - send_code(s, lc, ltree); /* send a literal byte */ - Tracecv(isgraph(lc), (stderr," '%c' ", lc)); - } else { - /* Here, lc is the match length - MIN_MATCH */ - code = _length_code[lc]; - send_code(s, code+LITERALS+1, ltree); /* send the length code */ - extra = extra_lbits[code]; - if (extra != 0) { - lc -= base_length[code]; - send_bits(s, lc, extra); /* send the extra length bits */ - } - dist--; /* dist is now the match distance - 1 */ - code = d_code(dist); - Assert (code < D_CODES, "bad d_code"); - - send_code(s, code, dtree); /* send the distance code */ - extra = extra_dbits[code]; - if (extra != 0) { - dist -= base_dist[code]; - send_bits(s, dist, extra); /* send the extra distance bits */ - } - } /* literal or match pair ? */ - - /* Check that the overlay between pending_buf and d_buf+l_buf is ok: */ - Assert((uInt)(s->pending) < s->lit_bufsize + 2*lx, - "pendingBuf overflow"); - - } while (lx < s->last_lit); - - send_code(s, END_BLOCK, ltree); -} - -/* =========================================================================== - * Check if the data type is TEXT or BINARY, using the following algorithm: - * - TEXT if the two conditions below are satisfied: - * a) There are no non-portable control characters belonging to the - * "black list" (0..6, 14..25, 28..31). - * b) There is at least one printable character belonging to the - * "white list" (9 {TAB}, 10 {LF}, 13 {CR}, 32..255). - * - BINARY otherwise. - * - The following partially-portable control characters form a - * "gray list" that is ignored in this detection algorithm: - * (7 {BEL}, 8 {BS}, 11 {VT}, 12 {FF}, 26 {SUB}, 27 {ESC}). - * IN assertion: the fields Freq of dyn_ltree are set. - */ -local int detect_data_type(s) - deflate_state *s; -{ - /* black_mask is the bit mask of black-listed bytes - * set bits 0..6, 14..25, and 28..31 - * 0xf3ffc07f = binary 11110011111111111100000001111111 - */ - unsigned long black_mask = 0xf3ffc07fUL; - int n; - - /* Check for non-textual ("black-listed") bytes. */ - for (n = 0; n <= 31; n++, black_mask >>= 1) - if ((black_mask & 1) && (s->dyn_ltree[n].Freq != 0)) - return Z_BINARY; - - /* Check for textual ("white-listed") bytes. */ - if (s->dyn_ltree[9].Freq != 0 || s->dyn_ltree[10].Freq != 0 - || s->dyn_ltree[13].Freq != 0) - return Z_TEXT; - for (n = 32; n < LITERALS; n++) - if (s->dyn_ltree[n].Freq != 0) - return Z_TEXT; - - /* There are no "black-listed" or "white-listed" bytes: - * this stream either is empty or has tolerated ("gray-listed") bytes only. - */ - return Z_BINARY; -} - -/* =========================================================================== - * Reverse the first len bits of a code, using straightforward code (a faster - * method would use a table) - * IN assertion: 1 <= len <= 15 - */ -local unsigned bi_reverse(code, len) - unsigned code; /* the value to invert */ - int len; /* its bit length */ -{ - register unsigned res = 0; - do { - res |= code & 1; - code >>= 1, res <<= 1; - } while (--len > 0); - return res >> 1; -} - -/* =========================================================================== - * Flush the bit buffer, keeping at most 7 bits in it. - */ -local void bi_flush(s) - deflate_state *s; -{ - if (s->bi_valid == 16) { - put_short(s, s->bi_buf); - s->bi_buf = 0; - s->bi_valid = 0; - } else if (s->bi_valid >= 8) { - put_byte(s, (Byte)s->bi_buf); - s->bi_buf >>= 8; - s->bi_valid -= 8; - } -} - -/* =========================================================================== - * Flush the bit buffer and align the output on a byte boundary - */ -local void bi_windup(s) - deflate_state *s; -{ - if (s->bi_valid > 8) { - put_short(s, s->bi_buf); - } else if (s->bi_valid > 0) { - put_byte(s, (Byte)s->bi_buf); - } - s->bi_buf = 0; - s->bi_valid = 0; -#ifdef DEBUG - s->bits_sent = (s->bits_sent+7) & ~7; -#endif -} - -/* =========================================================================== - * Copy a stored block, storing first the length and its - * one's complement if requested. - */ -local void copy_block(s, buf, len, header) - deflate_state *s; - charf *buf; /* the input data */ - unsigned len; /* its length */ - int header; /* true if block header must be written */ -{ - bi_windup(s); /* align on byte boundary */ - - if (header) { - put_short(s, (ush)len); - put_short(s, (ush)~len); -#ifdef DEBUG - s->bits_sent += 2*16; -#endif - } -#ifdef DEBUG - s->bits_sent += (ulg)len<<3; -#endif - while (len--) { - put_byte(s, *buf++); - } -} diff --git a/vendor/libgit2/deps/zlib/trees.h b/vendor/libgit2/deps/zlib/trees.h deleted file mode 100644 index d35639d82..000000000 --- a/vendor/libgit2/deps/zlib/trees.h +++ /dev/null @@ -1,128 +0,0 @@ -/* header created automatically with -DGEN_TREES_H */ - -local const ct_data static_ltree[L_CODES+2] = { -{{ 12},{ 8}}, {{140},{ 8}}, {{ 76},{ 8}}, {{204},{ 8}}, {{ 44},{ 8}}, -{{172},{ 8}}, {{108},{ 8}}, {{236},{ 8}}, {{ 28},{ 8}}, {{156},{ 8}}, -{{ 92},{ 8}}, {{220},{ 8}}, {{ 60},{ 8}}, {{188},{ 8}}, {{124},{ 8}}, -{{252},{ 8}}, {{ 2},{ 8}}, {{130},{ 8}}, {{ 66},{ 8}}, {{194},{ 8}}, -{{ 34},{ 8}}, {{162},{ 8}}, {{ 98},{ 8}}, {{226},{ 8}}, {{ 18},{ 8}}, -{{146},{ 8}}, {{ 82},{ 8}}, {{210},{ 8}}, {{ 50},{ 8}}, {{178},{ 8}}, -{{114},{ 8}}, {{242},{ 8}}, {{ 10},{ 8}}, {{138},{ 8}}, {{ 74},{ 8}}, -{{202},{ 8}}, {{ 42},{ 8}}, {{170},{ 8}}, {{106},{ 8}}, {{234},{ 8}}, -{{ 26},{ 8}}, {{154},{ 8}}, {{ 90},{ 8}}, {{218},{ 8}}, {{ 58},{ 8}}, -{{186},{ 8}}, {{122},{ 8}}, {{250},{ 8}}, {{ 6},{ 8}}, {{134},{ 8}}, -{{ 70},{ 8}}, {{198},{ 8}}, {{ 38},{ 8}}, {{166},{ 8}}, {{102},{ 8}}, -{{230},{ 8}}, {{ 22},{ 8}}, {{150},{ 8}}, {{ 86},{ 8}}, {{214},{ 8}}, -{{ 54},{ 8}}, {{182},{ 8}}, {{118},{ 8}}, {{246},{ 8}}, {{ 14},{ 8}}, -{{142},{ 8}}, {{ 78},{ 8}}, {{206},{ 8}}, {{ 46},{ 8}}, {{174},{ 8}}, -{{110},{ 8}}, {{238},{ 8}}, {{ 30},{ 8}}, {{158},{ 8}}, {{ 94},{ 8}}, -{{222},{ 8}}, {{ 62},{ 8}}, {{190},{ 8}}, {{126},{ 8}}, {{254},{ 8}}, -{{ 1},{ 8}}, {{129},{ 8}}, {{ 65},{ 8}}, {{193},{ 8}}, {{ 33},{ 8}}, -{{161},{ 8}}, {{ 97},{ 8}}, {{225},{ 8}}, {{ 17},{ 8}}, {{145},{ 8}}, -{{ 81},{ 8}}, {{209},{ 8}}, {{ 49},{ 8}}, {{177},{ 8}}, {{113},{ 8}}, -{{241},{ 8}}, {{ 9},{ 8}}, {{137},{ 8}}, {{ 73},{ 8}}, {{201},{ 8}}, -{{ 41},{ 8}}, {{169},{ 8}}, {{105},{ 8}}, {{233},{ 8}}, {{ 25},{ 8}}, -{{153},{ 8}}, {{ 89},{ 8}}, {{217},{ 8}}, {{ 57},{ 8}}, {{185},{ 8}}, -{{121},{ 8}}, {{249},{ 8}}, {{ 5},{ 8}}, {{133},{ 8}}, {{ 69},{ 8}}, -{{197},{ 8}}, {{ 37},{ 8}}, {{165},{ 8}}, {{101},{ 8}}, {{229},{ 8}}, -{{ 21},{ 8}}, {{149},{ 8}}, {{ 85},{ 8}}, {{213},{ 8}}, {{ 53},{ 8}}, -{{181},{ 8}}, {{117},{ 8}}, {{245},{ 8}}, {{ 13},{ 8}}, {{141},{ 8}}, -{{ 77},{ 8}}, {{205},{ 8}}, {{ 45},{ 8}}, {{173},{ 8}}, {{109},{ 8}}, -{{237},{ 8}}, {{ 29},{ 8}}, {{157},{ 8}}, {{ 93},{ 8}}, {{221},{ 8}}, -{{ 61},{ 8}}, {{189},{ 8}}, {{125},{ 8}}, {{253},{ 8}}, {{ 19},{ 9}}, -{{275},{ 9}}, {{147},{ 9}}, {{403},{ 9}}, {{ 83},{ 9}}, {{339},{ 9}}, -{{211},{ 9}}, {{467},{ 9}}, {{ 51},{ 9}}, {{307},{ 9}}, {{179},{ 9}}, -{{435},{ 9}}, {{115},{ 9}}, {{371},{ 9}}, {{243},{ 9}}, {{499},{ 9}}, -{{ 11},{ 9}}, {{267},{ 9}}, {{139},{ 9}}, {{395},{ 9}}, {{ 75},{ 9}}, -{{331},{ 9}}, {{203},{ 9}}, {{459},{ 9}}, {{ 43},{ 9}}, {{299},{ 9}}, -{{171},{ 9}}, {{427},{ 9}}, {{107},{ 9}}, {{363},{ 9}}, {{235},{ 9}}, -{{491},{ 9}}, {{ 27},{ 9}}, {{283},{ 9}}, {{155},{ 9}}, {{411},{ 9}}, -{{ 91},{ 9}}, {{347},{ 9}}, {{219},{ 9}}, {{475},{ 9}}, {{ 59},{ 9}}, -{{315},{ 9}}, {{187},{ 9}}, {{443},{ 9}}, {{123},{ 9}}, {{379},{ 9}}, -{{251},{ 9}}, {{507},{ 9}}, {{ 7},{ 9}}, {{263},{ 9}}, {{135},{ 9}}, -{{391},{ 9}}, {{ 71},{ 9}}, {{327},{ 9}}, {{199},{ 9}}, {{455},{ 9}}, -{{ 39},{ 9}}, {{295},{ 9}}, {{167},{ 9}}, {{423},{ 9}}, {{103},{ 9}}, -{{359},{ 9}}, {{231},{ 9}}, {{487},{ 9}}, {{ 23},{ 9}}, {{279},{ 9}}, -{{151},{ 9}}, {{407},{ 9}}, {{ 87},{ 9}}, {{343},{ 9}}, {{215},{ 9}}, -{{471},{ 9}}, {{ 55},{ 9}}, {{311},{ 9}}, {{183},{ 9}}, {{439},{ 9}}, -{{119},{ 9}}, {{375},{ 9}}, {{247},{ 9}}, {{503},{ 9}}, {{ 15},{ 9}}, -{{271},{ 9}}, {{143},{ 9}}, {{399},{ 9}}, {{ 79},{ 9}}, {{335},{ 9}}, -{{207},{ 9}}, {{463},{ 9}}, {{ 47},{ 9}}, {{303},{ 9}}, {{175},{ 9}}, -{{431},{ 9}}, {{111},{ 9}}, {{367},{ 9}}, {{239},{ 9}}, {{495},{ 9}}, -{{ 31},{ 9}}, {{287},{ 9}}, {{159},{ 9}}, {{415},{ 9}}, {{ 95},{ 9}}, -{{351},{ 9}}, {{223},{ 9}}, {{479},{ 9}}, {{ 63},{ 9}}, {{319},{ 9}}, -{{191},{ 9}}, {{447},{ 9}}, {{127},{ 9}}, {{383},{ 9}}, {{255},{ 9}}, -{{511},{ 9}}, {{ 0},{ 7}}, {{ 64},{ 7}}, {{ 32},{ 7}}, {{ 96},{ 7}}, -{{ 16},{ 7}}, {{ 80},{ 7}}, {{ 48},{ 7}}, {{112},{ 7}}, {{ 8},{ 7}}, -{{ 72},{ 7}}, {{ 40},{ 7}}, {{104},{ 7}}, {{ 24},{ 7}}, {{ 88},{ 7}}, -{{ 56},{ 7}}, {{120},{ 7}}, {{ 4},{ 7}}, {{ 68},{ 7}}, {{ 36},{ 7}}, -{{100},{ 7}}, {{ 20},{ 7}}, {{ 84},{ 7}}, {{ 52},{ 7}}, {{116},{ 7}}, -{{ 3},{ 8}}, {{131},{ 8}}, {{ 67},{ 8}}, {{195},{ 8}}, {{ 35},{ 8}}, -{{163},{ 8}}, {{ 99},{ 8}}, {{227},{ 8}} -}; - -local const ct_data static_dtree[D_CODES] = { -{{ 0},{ 5}}, {{16},{ 5}}, {{ 8},{ 5}}, {{24},{ 5}}, {{ 4},{ 5}}, -{{20},{ 5}}, {{12},{ 5}}, {{28},{ 5}}, {{ 2},{ 5}}, {{18},{ 5}}, -{{10},{ 5}}, {{26},{ 5}}, {{ 6},{ 5}}, {{22},{ 5}}, {{14},{ 5}}, -{{30},{ 5}}, {{ 1},{ 5}}, {{17},{ 5}}, {{ 9},{ 5}}, {{25},{ 5}}, -{{ 5},{ 5}}, {{21},{ 5}}, {{13},{ 5}}, {{29},{ 5}}, {{ 3},{ 5}}, -{{19},{ 5}}, {{11},{ 5}}, {{27},{ 5}}, {{ 7},{ 5}}, {{23},{ 5}} -}; - -const uch ZLIB_INTERNAL _dist_code[DIST_CODE_LEN] = { - 0, 1, 2, 3, 4, 4, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, - 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 10, 10, 10, 10, 10, 10, 10, 10, -10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, -11, 11, 11, 11, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, -12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 13, 13, 13, 13, -13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, -13, 13, 13, 13, 13, 13, 13, 13, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, -14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, -14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, -14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 15, 15, 15, 15, 15, 15, 15, 15, -15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, -15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, -15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 0, 0, 16, 17, -18, 18, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22, -23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, -24, 24, 24, 24, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, -26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, -26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, -27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, -27, 27, 27, 27, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, -28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, -28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, -28, 28, 28, 28, 28, 28, 28, 28, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, -29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, -29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, -29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29 -}; - -const uch ZLIB_INTERNAL _length_code[MAX_MATCH-MIN_MATCH+1]= { - 0, 1, 2, 3, 4, 5, 6, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 12, 12, -13, 13, 13, 13, 14, 14, 14, 14, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16, -17, 17, 17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, 19, 19, 19, 19, -19, 19, 19, 19, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, -21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 22, 22, 22, 22, -22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 23, 23, 23, 23, 23, 23, 23, 23, -23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, -24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, -25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, -25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 26, 26, 26, 26, 26, 26, 26, 26, -26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, -26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, -27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 28 -}; - -local const int base_length[LENGTH_CODES] = { -0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 14, 16, 20, 24, 28, 32, 40, 48, 56, -64, 80, 96, 112, 128, 160, 192, 224, 0 -}; - -local const int base_dist[D_CODES] = { - 0, 1, 2, 3, 4, 6, 8, 12, 16, 24, - 32, 48, 64, 96, 128, 192, 256, 384, 512, 768, - 1024, 1536, 2048, 3072, 4096, 6144, 8192, 12288, 16384, 24576 -}; - diff --git a/vendor/libgit2/deps/zlib/zconf.h b/vendor/libgit2/deps/zlib/zconf.h deleted file mode 100644 index 229c40024..000000000 --- a/vendor/libgit2/deps/zlib/zconf.h +++ /dev/null @@ -1,58 +0,0 @@ -/* zconf.h -- configuration of the zlib compression library - * Copyright (C) 1995-2010 Jean-loup Gailly. - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -/* @(#) $Id$ */ - -#ifndef ZCONF_H -#define ZCONF_H - -#include "../../src/common.h" - -/* Jeez, don't complain about non-prototype - * forms, we didn't write zlib */ -#if defined(_MSC_VER) -# pragma warning( disable : 4131 ) -# pragma warning( disable : 4142 ) /* benign redefinition of type */ -#endif - -/* Maximum value for memLevel in deflateInit2 */ -#define MAX_MEM_LEVEL 9 - -/* Maximum value for windowBits in deflateInit2 and inflateInit2. - * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files - * created by gzip. (Files created by minigzip can still be extracted by - * gzip.) - */ -#define MAX_WBITS 15 /* 32K LZ77 window */ - -#define ZEXTERN extern -#define ZEXPORT -#define ZEXPORTVA -#ifndef FAR -# define FAR -#endif -#define OF(args) args -#define Z_ARG(args) args - -typedef unsigned char Byte; /* 8 bits */ -typedef unsigned int uInt; /* 16 bits or more */ -typedef unsigned long uLong; /* 32 bits or more */ -typedef unsigned long z_crc_t; - -typedef Byte FAR Bytef; -typedef char FAR charf; -typedef int FAR intf; -typedef uInt FAR uIntf; -typedef uLong FAR uLongf; - -typedef void const *voidpc; -typedef void FAR *voidpf; -typedef void *voidp; - -#define z_off_t git_off_t -#define z_off64_t z_off_t -#define z_const const - -#endif /* ZCONF_H */ diff --git a/vendor/libgit2/deps/zlib/zlib.h b/vendor/libgit2/deps/zlib/zlib.h deleted file mode 100644 index 3e0c7672a..000000000 --- a/vendor/libgit2/deps/zlib/zlib.h +++ /dev/null @@ -1,1768 +0,0 @@ -/* zlib.h -- interface of the 'zlib' general purpose compression library - version 1.2.8, April 28th, 2013 - - Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. - - Jean-loup Gailly Mark Adler - jloup@gzip.org madler@alumni.caltech.edu - - - The data format used by the zlib library is described by RFCs (Request for - Comments) 1950 to 1952 in the files http://tools.ietf.org/html/rfc1950 - (zlib format), rfc1951 (deflate format) and rfc1952 (gzip format). -*/ - -#ifndef ZLIB_H -#define ZLIB_H - -#include "zconf.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#define ZLIB_VERSION "1.2.8" -#define ZLIB_VERNUM 0x1280 -#define ZLIB_VER_MAJOR 1 -#define ZLIB_VER_MINOR 2 -#define ZLIB_VER_REVISION 8 -#define ZLIB_VER_SUBREVISION 0 - -/* - The 'zlib' compression library provides in-memory compression and - decompression functions, including integrity checks of the uncompressed data. - This version of the library supports only one compression method (deflation) - but other algorithms will be added later and will have the same stream - interface. - - Compression can be done in a single step if the buffers are large enough, - or can be done by repeated calls of the compression function. In the latter - case, the application must provide more input and/or consume the output - (providing more output space) before each call. - - The compressed data format used by default by the in-memory functions is - the zlib format, which is a zlib wrapper documented in RFC 1950, wrapped - around a deflate stream, which is itself documented in RFC 1951. - - The library also supports reading and writing files in gzip (.gz) format - with an interface similar to that of stdio using the functions that start - with "gz". The gzip format is different from the zlib format. gzip is a - gzip wrapper, documented in RFC 1952, wrapped around a deflate stream. - - This library can optionally read and write gzip streams in memory as well. - - The zlib format was designed to be compact and fast for use in memory - and on communications channels. The gzip format was designed for single- - file compression on file systems, has a larger header than zlib to maintain - directory information, and uses a different, slower check method than zlib. - - The library does not install any signal handler. The decoder checks - the consistency of the compressed data, so the library should never crash - even in case of corrupted input. -*/ - -typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size)); -typedef void (*free_func) OF((voidpf opaque, voidpf address)); - -struct internal_state; - -typedef struct z_stream_s { - z_const Bytef *next_in; /* next input byte */ - uInt avail_in; /* number of bytes available at next_in */ - uLong total_in; /* total number of input bytes read so far */ - - Bytef *next_out; /* next output byte should be put there */ - uInt avail_out; /* remaining free space at next_out */ - uLong total_out; /* total number of bytes output so far */ - - z_const char *msg; /* last error message, NULL if no error */ - struct internal_state FAR *state; /* not visible by applications */ - - alloc_func zalloc; /* used to allocate the internal state */ - free_func zfree; /* used to free the internal state */ - voidpf opaque; /* private data object passed to zalloc and zfree */ - - int data_type; /* best guess about the data type: binary or text */ - uLong adler; /* adler32 value of the uncompressed data */ - uLong reserved; /* reserved for future use */ -} z_stream; - -typedef z_stream FAR *z_streamp; - -/* - gzip header information passed to and from zlib routines. See RFC 1952 - for more details on the meanings of these fields. -*/ -typedef struct gz_header_s { - int text; /* true if compressed data believed to be text */ - uLong time; /* modification time */ - int xflags; /* extra flags (not used when writing a gzip file) */ - int os; /* operating system */ - Bytef *extra; /* pointer to extra field or Z_NULL if none */ - uInt extra_len; /* extra field length (valid if extra != Z_NULL) */ - uInt extra_max; /* space at extra (only when reading header) */ - Bytef *name; /* pointer to zero-terminated file name or Z_NULL */ - uInt name_max; /* space at name (only when reading header) */ - Bytef *comment; /* pointer to zero-terminated comment or Z_NULL */ - uInt comm_max; /* space at comment (only when reading header) */ - int hcrc; /* true if there was or will be a header crc */ - int done; /* true when done reading gzip header (not used - when writing a gzip file) */ -} gz_header; - -typedef gz_header FAR *gz_headerp; - -/* - The application must update next_in and avail_in when avail_in has dropped - to zero. It must update next_out and avail_out when avail_out has dropped - to zero. The application must initialize zalloc, zfree and opaque before - calling the init function. All other fields are set by the compression - library and must not be updated by the application. - - The opaque value provided by the application will be passed as the first - parameter for calls of zalloc and zfree. This can be useful for custom - memory management. The compression library attaches no meaning to the - opaque value. - - zalloc must return Z_NULL if there is not enough memory for the object. - If zlib is used in a multi-threaded application, zalloc and zfree must be - thread safe. - - On 16-bit systems, the functions zalloc and zfree must be able to allocate - exactly 65536 bytes, but will not be required to allocate more than this if - the symbol MAXSEG_64K is defined (see zconf.h). WARNING: On MSDOS, pointers - returned by zalloc for objects of exactly 65536 bytes *must* have their - offset normalized to zero. The default allocation function provided by this - library ensures this (see zutil.c). To reduce memory requirements and avoid - any allocation of 64K objects, at the expense of compression ratio, compile - the library with -DMAX_WBITS=14 (see zconf.h). - - The fields total_in and total_out can be used for statistics or progress - reports. After compression, total_in holds the total size of the - uncompressed data and may be saved for use in the decompressor (particularly - if the decompressor wants to decompress everything in a single step). -*/ - - /* constants */ - -#define Z_NO_FLUSH 0 -#define Z_PARTIAL_FLUSH 1 -#define Z_SYNC_FLUSH 2 -#define Z_FULL_FLUSH 3 -#define Z_FINISH 4 -#define Z_BLOCK 5 -#define Z_TREES 6 -/* Allowed flush values; see deflate() and inflate() below for details */ - -#define Z_OK 0 -#define Z_STREAM_END 1 -#define Z_NEED_DICT 2 -#define Z_ERRNO (-1) -#define Z_STREAM_ERROR (-2) -#define Z_DATA_ERROR (-3) -#define Z_MEM_ERROR (-4) -#define Z_BUF_ERROR (-5) -#define Z_VERSION_ERROR (-6) -/* Return codes for the compression/decompression functions. Negative values - * are errors, positive values are used for special but normal events. - */ - -#define Z_NO_COMPRESSION 0 -#define Z_BEST_SPEED 1 -#define Z_BEST_COMPRESSION 9 -#define Z_DEFAULT_COMPRESSION (-1) -/* compression levels */ - -#define Z_FILTERED 1 -#define Z_HUFFMAN_ONLY 2 -#define Z_RLE 3 -#define Z_FIXED 4 -#define Z_DEFAULT_STRATEGY 0 -/* compression strategy; see deflateInit2() below for details */ - -#define Z_BINARY 0 -#define Z_TEXT 1 -#define Z_ASCII Z_TEXT /* for compatibility with 1.2.2 and earlier */ -#define Z_UNKNOWN 2 -/* Possible values of the data_type field (though see inflate()) */ - -#define Z_DEFLATED 8 -/* The deflate compression method (the only one supported in this version) */ - -#define Z_NULL 0 /* for initializing zalloc, zfree, opaque */ - -#define zlib_version zlibVersion() -/* for compatibility with versions < 1.0.2 */ - - - /* basic functions */ - -ZEXTERN const char * ZEXPORT zlibVersion OF((void)); -/* The application can compare zlibVersion and ZLIB_VERSION for consistency. - If the first character differs, the library code actually used is not - compatible with the zlib.h header file used by the application. This check - is automatically made by deflateInit and inflateInit. - */ - -/* -ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level)); - - Initializes the internal stream state for compression. The fields - zalloc, zfree and opaque must be initialized before by the caller. If - zalloc and zfree are set to Z_NULL, deflateInit updates them to use default - allocation functions. - - The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9: - 1 gives best speed, 9 gives best compression, 0 gives no compression at all - (the input data is simply copied a block at a time). Z_DEFAULT_COMPRESSION - requests a default compromise between speed and compression (currently - equivalent to level 6). - - deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough - memory, Z_STREAM_ERROR if level is not a valid compression level, or - Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible - with the version assumed by the caller (ZLIB_VERSION). msg is set to null - if there is no error message. deflateInit does not perform any compression: - this will be done by deflate(). -*/ - - -ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush)); -/* - deflate compresses as much data as possible, and stops when the input - buffer becomes empty or the output buffer becomes full. It may introduce - some output latency (reading input without producing any output) except when - forced to flush. - - The detailed semantics are as follows. deflate performs one or both of the - following actions: - - - Compress more input starting at next_in and update next_in and avail_in - accordingly. If not all input can be processed (because there is not - enough room in the output buffer), next_in and avail_in are updated and - processing will resume at this point for the next call of deflate(). - - - Provide more output starting at next_out and update next_out and avail_out - accordingly. This action is forced if the parameter flush is non zero. - Forcing flush frequently degrades the compression ratio, so this parameter - should be set only when necessary (in interactive applications). Some - output may be provided even if flush is not set. - - Before the call of deflate(), the application should ensure that at least - one of the actions is possible, by providing more input and/or consuming more - output, and updating avail_in or avail_out accordingly; avail_out should - never be zero before the call. The application can consume the compressed - output when it wants, for example when the output buffer is full (avail_out - == 0), or after each call of deflate(). If deflate returns Z_OK and with - zero avail_out, it must be called again after making room in the output - buffer because there might be more output pending. - - Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to - decide how much data to accumulate before producing output, in order to - maximize compression. - - If the parameter flush is set to Z_SYNC_FLUSH, all pending output is - flushed to the output buffer and the output is aligned on a byte boundary, so - that the decompressor can get all input data available so far. (In - particular avail_in is zero after the call if enough output space has been - provided before the call.) Flushing may degrade compression for some - compression algorithms and so it should be used only when necessary. This - completes the current deflate block and follows it with an empty stored block - that is three bits plus filler bits to the next byte, followed by four bytes - (00 00 ff ff). - - If flush is set to Z_PARTIAL_FLUSH, all pending output is flushed to the - output buffer, but the output is not aligned to a byte boundary. All of the - input data so far will be available to the decompressor, as for Z_SYNC_FLUSH. - This completes the current deflate block and follows it with an empty fixed - codes block that is 10 bits long. This assures that enough bytes are output - in order for the decompressor to finish the block before the empty fixed code - block. - - If flush is set to Z_BLOCK, a deflate block is completed and emitted, as - for Z_SYNC_FLUSH, but the output is not aligned on a byte boundary, and up to - seven bits of the current block are held to be written as the next byte after - the next deflate block is completed. In this case, the decompressor may not - be provided enough bits at this point in order to complete decompression of - the data provided so far to the compressor. It may need to wait for the next - block to be emitted. This is for advanced applications that need to control - the emission of deflate blocks. - - If flush is set to Z_FULL_FLUSH, all output is flushed as with - Z_SYNC_FLUSH, and the compression state is reset so that decompression can - restart from this point if previous compressed data has been damaged or if - random access is desired. Using Z_FULL_FLUSH too often can seriously degrade - compression. - - If deflate returns with avail_out == 0, this function must be called again - with the same value of the flush parameter and more output space (updated - avail_out), until the flush is complete (deflate returns with non-zero - avail_out). In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that - avail_out is greater than six to avoid repeated flush markers due to - avail_out == 0 on return. - - If the parameter flush is set to Z_FINISH, pending input is processed, - pending output is flushed and deflate returns with Z_STREAM_END if there was - enough output space; if deflate returns with Z_OK, this function must be - called again with Z_FINISH and more output space (updated avail_out) but no - more input data, until it returns with Z_STREAM_END or an error. After - deflate has returned Z_STREAM_END, the only possible operations on the stream - are deflateReset or deflateEnd. - - Z_FINISH can be used immediately after deflateInit if all the compression - is to be done in a single step. In this case, avail_out must be at least the - value returned by deflateBound (see below). Then deflate is guaranteed to - return Z_STREAM_END. If not enough output space is provided, deflate will - not return Z_STREAM_END, and it must be called again as described above. - - deflate() sets strm->adler to the adler32 checksum of all input read - so far (that is, total_in bytes). - - deflate() may update strm->data_type if it can make a good guess about - the input data type (Z_BINARY or Z_TEXT). In doubt, the data is considered - binary. This field is only for information purposes and does not affect the - compression algorithm in any manner. - - deflate() returns Z_OK if some progress has been made (more input - processed or more output produced), Z_STREAM_END if all input has been - consumed and all output has been produced (only when flush is set to - Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example - if next_in or next_out was Z_NULL), Z_BUF_ERROR if no progress is possible - (for example avail_in or avail_out was zero). Note that Z_BUF_ERROR is not - fatal, and deflate() can be called again with more input and more output - space to continue compressing. -*/ - - -ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm)); -/* - All dynamically allocated data structures for this stream are freed. - This function discards any unprocessed input and does not flush any pending - output. - - deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the - stream state was inconsistent, Z_DATA_ERROR if the stream was freed - prematurely (some input or output was discarded). In the error case, msg - may be set but then points to a static string (which must not be - deallocated). -*/ - - -/* -ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm)); - - Initializes the internal stream state for decompression. The fields - next_in, avail_in, zalloc, zfree and opaque must be initialized before by - the caller. If next_in is not Z_NULL and avail_in is large enough (the - exact value depends on the compression method), inflateInit determines the - compression method from the zlib header and allocates all data structures - accordingly; otherwise the allocation will be deferred to the first call of - inflate. If zalloc and zfree are set to Z_NULL, inflateInit updates them to - use default allocation functions. - - inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough - memory, Z_VERSION_ERROR if the zlib library version is incompatible with the - version assumed by the caller, or Z_STREAM_ERROR if the parameters are - invalid, such as a null pointer to the structure. msg is set to null if - there is no error message. inflateInit does not perform any decompression - apart from possibly reading the zlib header if present: actual decompression - will be done by inflate(). (So next_in and avail_in may be modified, but - next_out and avail_out are unused and unchanged.) The current implementation - of inflateInit() does not process any header information -- that is deferred - until inflate() is called. -*/ - - -ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush)); -/* - inflate decompresses as much data as possible, and stops when the input - buffer becomes empty or the output buffer becomes full. It may introduce - some output latency (reading input without producing any output) except when - forced to flush. - - The detailed semantics are as follows. inflate performs one or both of the - following actions: - - - Decompress more input starting at next_in and update next_in and avail_in - accordingly. If not all input can be processed (because there is not - enough room in the output buffer), next_in is updated and processing will - resume at this point for the next call of inflate(). - - - Provide more output starting at next_out and update next_out and avail_out - accordingly. inflate() provides as much output as possible, until there is - no more input data or no more space in the output buffer (see below about - the flush parameter). - - Before the call of inflate(), the application should ensure that at least - one of the actions is possible, by providing more input and/or consuming more - output, and updating the next_* and avail_* values accordingly. The - application can consume the uncompressed output when it wants, for example - when the output buffer is full (avail_out == 0), or after each call of - inflate(). If inflate returns Z_OK and with zero avail_out, it must be - called again after making room in the output buffer because there might be - more output pending. - - The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH, Z_FINISH, - Z_BLOCK, or Z_TREES. Z_SYNC_FLUSH requests that inflate() flush as much - output as possible to the output buffer. Z_BLOCK requests that inflate() - stop if and when it gets to the next deflate block boundary. When decoding - the zlib or gzip format, this will cause inflate() to return immediately - after the header and before the first block. When doing a raw inflate, - inflate() will go ahead and process the first block, and will return when it - gets to the end of that block, or when it runs out of data. - - The Z_BLOCK option assists in appending to or combining deflate streams. - Also to assist in this, on return inflate() will set strm->data_type to the - number of unused bits in the last byte taken from strm->next_in, plus 64 if - inflate() is currently decoding the last block in the deflate stream, plus - 128 if inflate() returned immediately after decoding an end-of-block code or - decoding the complete header up to just before the first byte of the deflate - stream. The end-of-block will not be indicated until all of the uncompressed - data from that block has been written to strm->next_out. The number of - unused bits may in general be greater than seven, except when bit 7 of - data_type is set, in which case the number of unused bits will be less than - eight. data_type is set as noted here every time inflate() returns for all - flush options, and so can be used to determine the amount of currently - consumed input in bits. - - The Z_TREES option behaves as Z_BLOCK does, but it also returns when the - end of each deflate block header is reached, before any actual data in that - block is decoded. This allows the caller to determine the length of the - deflate block header for later use in random access within a deflate block. - 256 is added to the value of strm->data_type when inflate() returns - immediately after reaching the end of the deflate block header. - - inflate() should normally be called until it returns Z_STREAM_END or an - error. However if all decompression is to be performed in a single step (a - single call of inflate), the parameter flush should be set to Z_FINISH. In - this case all pending input is processed and all pending output is flushed; - avail_out must be large enough to hold all of the uncompressed data for the - operation to complete. (The size of the uncompressed data may have been - saved by the compressor for this purpose.) The use of Z_FINISH is not - required to perform an inflation in one step. However it may be used to - inform inflate that a faster approach can be used for the single inflate() - call. Z_FINISH also informs inflate to not maintain a sliding window if the - stream completes, which reduces inflate's memory footprint. If the stream - does not complete, either because not all of the stream is provided or not - enough output space is provided, then a sliding window will be allocated and - inflate() can be called again to continue the operation as if Z_NO_FLUSH had - been used. - - In this implementation, inflate() always flushes as much output as - possible to the output buffer, and always uses the faster approach on the - first call. So the effects of the flush parameter in this implementation are - on the return value of inflate() as noted below, when inflate() returns early - when Z_BLOCK or Z_TREES is used, and when inflate() avoids the allocation of - memory for a sliding window when Z_FINISH is used. - - If a preset dictionary is needed after this call (see inflateSetDictionary - below), inflate sets strm->adler to the Adler-32 checksum of the dictionary - chosen by the compressor and returns Z_NEED_DICT; otherwise it sets - strm->adler to the Adler-32 checksum of all output produced so far (that is, - total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described - below. At the end of the stream, inflate() checks that its computed adler32 - checksum is equal to that saved by the compressor and returns Z_STREAM_END - only if the checksum is correct. - - inflate() can decompress and check either zlib-wrapped or gzip-wrapped - deflate data. The header type is detected automatically, if requested when - initializing with inflateInit2(). Any information contained in the gzip - header is not retained, so applications that need that information should - instead use raw inflate, see inflateInit2() below, or inflateBack() and - perform their own processing of the gzip header and trailer. When processing - gzip-wrapped deflate data, strm->adler32 is set to the CRC-32 of the output - producted so far. The CRC-32 is checked against the gzip trailer. - - inflate() returns Z_OK if some progress has been made (more input processed - or more output produced), Z_STREAM_END if the end of the compressed data has - been reached and all uncompressed output has been produced, Z_NEED_DICT if a - preset dictionary is needed at this point, Z_DATA_ERROR if the input data was - corrupted (input stream not conforming to the zlib format or incorrect check - value), Z_STREAM_ERROR if the stream structure was inconsistent (for example - next_in or next_out was Z_NULL), Z_MEM_ERROR if there was not enough memory, - Z_BUF_ERROR if no progress is possible or if there was not enough room in the - output buffer when Z_FINISH is used. Note that Z_BUF_ERROR is not fatal, and - inflate() can be called again with more input and more output space to - continue decompressing. If Z_DATA_ERROR is returned, the application may - then call inflateSync() to look for a good compression block if a partial - recovery of the data is desired. -*/ - - -ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm)); -/* - All dynamically allocated data structures for this stream are freed. - This function discards any unprocessed input and does not flush any pending - output. - - inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state - was inconsistent. In the error case, msg may be set but then points to a - static string (which must not be deallocated). -*/ - - - /* Advanced functions */ - -/* - The following functions are needed only in some special applications. -*/ - -/* -ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm, - int level, - int method, - int windowBits, - int memLevel, - int strategy)); - - This is another version of deflateInit with more compression options. The - fields next_in, zalloc, zfree and opaque must be initialized before by the - caller. - - The method parameter is the compression method. It must be Z_DEFLATED in - this version of the library. - - The windowBits parameter is the base two logarithm of the window size - (the size of the history buffer). It should be in the range 8..15 for this - version of the library. Larger values of this parameter result in better - compression at the expense of memory usage. The default value is 15 if - deflateInit is used instead. - - windowBits can also be -8..-15 for raw deflate. In this case, -windowBits - determines the window size. deflate() will then generate raw deflate data - with no zlib header or trailer, and will not compute an adler32 check value. - - windowBits can also be greater than 15 for optional gzip encoding. Add - 16 to windowBits to write a simple gzip header and trailer around the - compressed data instead of a zlib wrapper. The gzip header will have no - file name, no extra data, no comment, no modification time (set to zero), no - header crc, and the operating system will be set to 255 (unknown). If a - gzip stream is being written, strm->adler is a crc32 instead of an adler32. - - The memLevel parameter specifies how much memory should be allocated - for the internal compression state. memLevel=1 uses minimum memory but is - slow and reduces compression ratio; memLevel=9 uses maximum memory for - optimal speed. The default value is 8. See zconf.h for total memory usage - as a function of windowBits and memLevel. - - The strategy parameter is used to tune the compression algorithm. Use the - value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a - filter (or predictor), Z_HUFFMAN_ONLY to force Huffman encoding only (no - string match), or Z_RLE to limit match distances to one (run-length - encoding). Filtered data consists mostly of small values with a somewhat - random distribution. In this case, the compression algorithm is tuned to - compress them better. The effect of Z_FILTERED is to force more Huffman - coding and less string matching; it is somewhat intermediate between - Z_DEFAULT_STRATEGY and Z_HUFFMAN_ONLY. Z_RLE is designed to be almost as - fast as Z_HUFFMAN_ONLY, but give better compression for PNG image data. The - strategy parameter only affects the compression ratio but not the - correctness of the compressed output even if it is not set appropriately. - Z_FIXED prevents the use of dynamic Huffman codes, allowing for a simpler - decoder for special applications. - - deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough - memory, Z_STREAM_ERROR if any parameter is invalid (such as an invalid - method), or Z_VERSION_ERROR if the zlib library version (zlib_version) is - incompatible with the version assumed by the caller (ZLIB_VERSION). msg is - set to null if there is no error message. deflateInit2 does not perform any - compression: this will be done by deflate(). -*/ - -ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm, - const Bytef *dictionary, - uInt dictLength)); -/* - Initializes the compression dictionary from the given byte sequence - without producing any compressed output. When using the zlib format, this - function must be called immediately after deflateInit, deflateInit2 or - deflateReset, and before any call of deflate. When doing raw deflate, this - function must be called either before any call of deflate, or immediately - after the completion of a deflate block, i.e. after all input has been - consumed and all output has been delivered when using any of the flush - options Z_BLOCK, Z_PARTIAL_FLUSH, Z_SYNC_FLUSH, or Z_FULL_FLUSH. The - compressor and decompressor must use exactly the same dictionary (see - inflateSetDictionary). - - The dictionary should consist of strings (byte sequences) that are likely - to be encountered later in the data to be compressed, with the most commonly - used strings preferably put towards the end of the dictionary. Using a - dictionary is most useful when the data to be compressed is short and can be - predicted with good accuracy; the data can then be compressed better than - with the default empty dictionary. - - Depending on the size of the compression data structures selected by - deflateInit or deflateInit2, a part of the dictionary may in effect be - discarded, for example if the dictionary is larger than the window size - provided in deflateInit or deflateInit2. Thus the strings most likely to be - useful should be put at the end of the dictionary, not at the front. In - addition, the current implementation of deflate will use at most the window - size minus 262 bytes of the provided dictionary. - - Upon return of this function, strm->adler is set to the adler32 value - of the dictionary; the decompressor may later use this value to determine - which dictionary has been used by the compressor. (The adler32 value - applies to the whole dictionary even if only a subset of the dictionary is - actually used by the compressor.) If a raw deflate was requested, then the - adler32 value is not computed and strm->adler is not set. - - deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a - parameter is invalid (e.g. dictionary being Z_NULL) or the stream state is - inconsistent (for example if deflate has already been called for this stream - or if not at a block boundary for raw deflate). deflateSetDictionary does - not perform any compression: this will be done by deflate(). -*/ - -ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest, - z_streamp source)); -/* - Sets the destination stream as a complete copy of the source stream. - - This function can be useful when several compression strategies will be - tried, for example when there are several ways of pre-processing the input - data with a filter. The streams that will be discarded should then be freed - by calling deflateEnd. Note that deflateCopy duplicates the internal - compression state which can be quite large, so this strategy is slow and can - consume lots of memory. - - deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not - enough memory, Z_STREAM_ERROR if the source stream state was inconsistent - (such as zalloc being Z_NULL). msg is left unchanged in both source and - destination. -*/ - -ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm)); -/* - This function is equivalent to deflateEnd followed by deflateInit, - but does not free and reallocate all the internal compression state. The - stream will keep the same compression level and any other attributes that - may have been set by deflateInit2. - - deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source - stream state was inconsistent (such as zalloc or state being Z_NULL). -*/ - -ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm, - int level, - int strategy)); -/* - Dynamically update the compression level and compression strategy. The - interpretation of level and strategy is as in deflateInit2. This can be - used to switch between compression and straight copy of the input data, or - to switch to a different kind of input data requiring a different strategy. - If the compression level is changed, the input available so far is - compressed with the old level (and may be flushed); the new level will take - effect only at the next call of deflate(). - - Before the call of deflateParams, the stream state must be set as for - a call of deflate(), since the currently available input may have to be - compressed and flushed. In particular, strm->avail_out must be non-zero. - - deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source - stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR if - strm->avail_out was zero. -*/ - -ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm, - int good_length, - int max_lazy, - int nice_length, - int max_chain)); -/* - Fine tune deflate's internal compression parameters. This should only be - used by someone who understands the algorithm used by zlib's deflate for - searching for the best matching string, and even then only by the most - fanatic optimizer trying to squeeze out the last compressed bit for their - specific input data. Read the deflate.c source code for the meaning of the - max_lazy, good_length, nice_length, and max_chain parameters. - - deflateTune() can be called after deflateInit() or deflateInit2(), and - returns Z_OK on success, or Z_STREAM_ERROR for an invalid deflate stream. - */ - -ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm, - uLong sourceLen)); -/* - deflateBound() returns an upper bound on the compressed size after - deflation of sourceLen bytes. It must be called after deflateInit() or - deflateInit2(), and after deflateSetHeader(), if used. This would be used - to allocate an output buffer for deflation in a single pass, and so would be - called before deflate(). If that first deflate() call is provided the - sourceLen input bytes, an output buffer allocated to the size returned by - deflateBound(), and the flush value Z_FINISH, then deflate() is guaranteed - to return Z_STREAM_END. Note that it is possible for the compressed size to - be larger than the value returned by deflateBound() if flush options other - than Z_FINISH or Z_NO_FLUSH are used. -*/ - -ZEXTERN int ZEXPORT deflatePending OF((z_streamp strm, - unsigned *pending, - int *bits)); -/* - deflatePending() returns the number of bytes and bits of output that have - been generated, but not yet provided in the available output. The bytes not - provided would be due to the available output space having being consumed. - The number of bits of output not provided are between 0 and 7, where they - await more bits to join them in order to fill out a full byte. If pending - or bits are Z_NULL, then those values are not set. - - deflatePending returns Z_OK if success, or Z_STREAM_ERROR if the source - stream state was inconsistent. - */ - -ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm, - int bits, - int value)); -/* - deflatePrime() inserts bits in the deflate output stream. The intent - is that this function is used to start off the deflate output with the bits - leftover from a previous deflate stream when appending to it. As such, this - function can only be used for raw deflate, and must be used before the first - deflate() call after a deflateInit2() or deflateReset(). bits must be less - than or equal to 16, and that many of the least significant bits of value - will be inserted in the output. - - deflatePrime returns Z_OK if success, Z_BUF_ERROR if there was not enough - room in the internal buffer to insert the bits, or Z_STREAM_ERROR if the - source stream state was inconsistent. -*/ - -ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm, - gz_headerp head)); -/* - deflateSetHeader() provides gzip header information for when a gzip - stream is requested by deflateInit2(). deflateSetHeader() may be called - after deflateInit2() or deflateReset() and before the first call of - deflate(). The text, time, os, extra field, name, and comment information - in the provided gz_header structure are written to the gzip header (xflag is - ignored -- the extra flags are set according to the compression level). The - caller must assure that, if not Z_NULL, name and comment are terminated with - a zero byte, and that if extra is not Z_NULL, that extra_len bytes are - available there. If hcrc is true, a gzip header crc is included. Note that - the current versions of the command-line version of gzip (up through version - 1.3.x) do not support header crc's, and will report that it is a "multi-part - gzip file" and give up. - - If deflateSetHeader is not used, the default gzip header has text false, - the time set to zero, and os set to 255, with no extra, name, or comment - fields. The gzip header is returned to the default state by deflateReset(). - - deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source - stream state was inconsistent. -*/ - -/* -ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm, - int windowBits)); - - This is another version of inflateInit with an extra parameter. The - fields next_in, avail_in, zalloc, zfree and opaque must be initialized - before by the caller. - - The windowBits parameter is the base two logarithm of the maximum window - size (the size of the history buffer). It should be in the range 8..15 for - this version of the library. The default value is 15 if inflateInit is used - instead. windowBits must be greater than or equal to the windowBits value - provided to deflateInit2() while compressing, or it must be equal to 15 if - deflateInit2() was not used. If a compressed stream with a larger window - size is given as input, inflate() will return with the error code - Z_DATA_ERROR instead of trying to allocate a larger window. - - windowBits can also be zero to request that inflate use the window size in - the zlib header of the compressed stream. - - windowBits can also be -8..-15 for raw inflate. In this case, -windowBits - determines the window size. inflate() will then process raw deflate data, - not looking for a zlib or gzip header, not generating a check value, and not - looking for any check values for comparison at the end of the stream. This - is for use with other formats that use the deflate compressed data format - such as zip. Those formats provide their own check values. If a custom - format is developed using the raw deflate format for compressed data, it is - recommended that a check value such as an adler32 or a crc32 be applied to - the uncompressed data as is done in the zlib, gzip, and zip formats. For - most applications, the zlib format should be used as is. Note that comments - above on the use in deflateInit2() applies to the magnitude of windowBits. - - windowBits can also be greater than 15 for optional gzip decoding. Add - 32 to windowBits to enable zlib and gzip decoding with automatic header - detection, or add 16 to decode only the gzip format (the zlib format will - return a Z_DATA_ERROR). If a gzip stream is being decoded, strm->adler is a - crc32 instead of an adler32. - - inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough - memory, Z_VERSION_ERROR if the zlib library version is incompatible with the - version assumed by the caller, or Z_STREAM_ERROR if the parameters are - invalid, such as a null pointer to the structure. msg is set to null if - there is no error message. inflateInit2 does not perform any decompression - apart from possibly reading the zlib header if present: actual decompression - will be done by inflate(). (So next_in and avail_in may be modified, but - next_out and avail_out are unused and unchanged.) The current implementation - of inflateInit2() does not process any header information -- that is - deferred until inflate() is called. -*/ - -ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm, - const Bytef *dictionary, - uInt dictLength)); -/* - Initializes the decompression dictionary from the given uncompressed byte - sequence. This function must be called immediately after a call of inflate, - if that call returned Z_NEED_DICT. The dictionary chosen by the compressor - can be determined from the adler32 value returned by that call of inflate. - The compressor and decompressor must use exactly the same dictionary (see - deflateSetDictionary). For raw inflate, this function can be called at any - time to set the dictionary. If the provided dictionary is smaller than the - window and there is already data in the window, then the provided dictionary - will amend what's there. The application must insure that the dictionary - that was used for compression is provided. - - inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a - parameter is invalid (e.g. dictionary being Z_NULL) or the stream state is - inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the - expected one (incorrect adler32 value). inflateSetDictionary does not - perform any decompression: this will be done by subsequent calls of - inflate(). -*/ - -ZEXTERN int ZEXPORT inflateGetDictionary OF((z_streamp strm, - Bytef *dictionary, - uInt *dictLength)); -/* - Returns the sliding dictionary being maintained by inflate. dictLength is - set to the number of bytes in the dictionary, and that many bytes are copied - to dictionary. dictionary must have enough space, where 32768 bytes is - always enough. If inflateGetDictionary() is called with dictionary equal to - Z_NULL, then only the dictionary length is returned, and nothing is copied. - Similary, if dictLength is Z_NULL, then it is not set. - - inflateGetDictionary returns Z_OK on success, or Z_STREAM_ERROR if the - stream state is inconsistent. -*/ - -ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm)); -/* - Skips invalid compressed data until a possible full flush point (see above - for the description of deflate with Z_FULL_FLUSH) can be found, or until all - available input is skipped. No output is provided. - - inflateSync searches for a 00 00 FF FF pattern in the compressed data. - All full flush points have this pattern, but not all occurrences of this - pattern are full flush points. - - inflateSync returns Z_OK if a possible full flush point has been found, - Z_BUF_ERROR if no more input was provided, Z_DATA_ERROR if no flush point - has been found, or Z_STREAM_ERROR if the stream structure was inconsistent. - In the success case, the application may save the current current value of - total_in which indicates where valid compressed data was found. In the - error case, the application may repeatedly call inflateSync, providing more - input each time, until success or end of the input data. -*/ - -ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest, - z_streamp source)); -/* - Sets the destination stream as a complete copy of the source stream. - - This function can be useful when randomly accessing a large stream. The - first pass through the stream can periodically record the inflate state, - allowing restarting inflate at those points when randomly accessing the - stream. - - inflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not - enough memory, Z_STREAM_ERROR if the source stream state was inconsistent - (such as zalloc being Z_NULL). msg is left unchanged in both source and - destination. -*/ - -ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm)); -/* - This function is equivalent to inflateEnd followed by inflateInit, - but does not free and reallocate all the internal decompression state. The - stream will keep attributes that may have been set by inflateInit2. - - inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source - stream state was inconsistent (such as zalloc or state being Z_NULL). -*/ - -ZEXTERN int ZEXPORT inflateReset2 OF((z_streamp strm, - int windowBits)); -/* - This function is the same as inflateReset, but it also permits changing - the wrap and window size requests. The windowBits parameter is interpreted - the same as it is for inflateInit2. - - inflateReset2 returns Z_OK if success, or Z_STREAM_ERROR if the source - stream state was inconsistent (such as zalloc or state being Z_NULL), or if - the windowBits parameter is invalid. -*/ - -ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm, - int bits, - int value)); -/* - This function inserts bits in the inflate input stream. The intent is - that this function is used to start inflating at a bit position in the - middle of a byte. The provided bits will be used before any bytes are used - from next_in. This function should only be used with raw inflate, and - should be used before the first inflate() call after inflateInit2() or - inflateReset(). bits must be less than or equal to 16, and that many of the - least significant bits of value will be inserted in the input. - - If bits is negative, then the input stream bit buffer is emptied. Then - inflatePrime() can be called again to put bits in the buffer. This is used - to clear out bits leftover after feeding inflate a block description prior - to feeding inflate codes. - - inflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source - stream state was inconsistent. -*/ - -ZEXTERN long ZEXPORT inflateMark OF((z_streamp strm)); -/* - This function returns two values, one in the lower 16 bits of the return - value, and the other in the remaining upper bits, obtained by shifting the - return value down 16 bits. If the upper value is -1 and the lower value is - zero, then inflate() is currently decoding information outside of a block. - If the upper value is -1 and the lower value is non-zero, then inflate is in - the middle of a stored block, with the lower value equaling the number of - bytes from the input remaining to copy. If the upper value is not -1, then - it is the number of bits back from the current bit position in the input of - the code (literal or length/distance pair) currently being processed. In - that case the lower value is the number of bytes already emitted for that - code. - - A code is being processed if inflate is waiting for more input to complete - decoding of the code, or if it has completed decoding but is waiting for - more output space to write the literal or match data. - - inflateMark() is used to mark locations in the input data for random - access, which may be at bit positions, and to note those cases where the - output of a code may span boundaries of random access blocks. The current - location in the input stream can be determined from avail_in and data_type - as noted in the description for the Z_BLOCK flush parameter for inflate. - - inflateMark returns the value noted above or -1 << 16 if the provided - source stream state was inconsistent. -*/ - -ZEXTERN int ZEXPORT inflateGetHeader OF((z_streamp strm, - gz_headerp head)); -/* - inflateGetHeader() requests that gzip header information be stored in the - provided gz_header structure. inflateGetHeader() may be called after - inflateInit2() or inflateReset(), and before the first call of inflate(). - As inflate() processes the gzip stream, head->done is zero until the header - is completed, at which time head->done is set to one. If a zlib stream is - being decoded, then head->done is set to -1 to indicate that there will be - no gzip header information forthcoming. Note that Z_BLOCK or Z_TREES can be - used to force inflate() to return immediately after header processing is - complete and before any actual data is decompressed. - - The text, time, xflags, and os fields are filled in with the gzip header - contents. hcrc is set to true if there is a header CRC. (The header CRC - was valid if done is set to one.) If extra is not Z_NULL, then extra_max - contains the maximum number of bytes to write to extra. Once done is true, - extra_len contains the actual extra field length, and extra contains the - extra field, or that field truncated if extra_max is less than extra_len. - If name is not Z_NULL, then up to name_max characters are written there, - terminated with a zero unless the length is greater than name_max. If - comment is not Z_NULL, then up to comm_max characters are written there, - terminated with a zero unless the length is greater than comm_max. When any - of extra, name, or comment are not Z_NULL and the respective field is not - present in the header, then that field is set to Z_NULL to signal its - absence. This allows the use of deflateSetHeader() with the returned - structure to duplicate the header. However if those fields are set to - allocated memory, then the application will need to save those pointers - elsewhere so that they can be eventually freed. - - If inflateGetHeader is not used, then the header information is simply - discarded. The header is always checked for validity, including the header - CRC if present. inflateReset() will reset the process to discard the header - information. The application would need to call inflateGetHeader() again to - retrieve the header from the next gzip stream. - - inflateGetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source - stream state was inconsistent. -*/ - -/* -ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits, - unsigned char FAR *window)); - - Initialize the internal stream state for decompression using inflateBack() - calls. The fields zalloc, zfree and opaque in strm must be initialized - before the call. If zalloc and zfree are Z_NULL, then the default library- - derived memory allocation routines are used. windowBits is the base two - logarithm of the window size, in the range 8..15. window is a caller - supplied buffer of that size. Except for special applications where it is - assured that deflate was used with small window sizes, windowBits must be 15 - and a 32K byte window must be supplied to be able to decompress general - deflate streams. - - See inflateBack() for the usage of these routines. - - inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of - the parameters are invalid, Z_MEM_ERROR if the internal state could not be - allocated, or Z_VERSION_ERROR if the version of the library does not match - the version of the header file. -*/ - -typedef unsigned (*in_func) OF((void FAR *, - z_const unsigned char FAR * FAR *)); -typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned)); - -ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm, - in_func in, void FAR *in_desc, - out_func out, void FAR *out_desc)); -/* - inflateBack() does a raw inflate with a single call using a call-back - interface for input and output. This is potentially more efficient than - inflate() for file i/o applications, in that it avoids copying between the - output and the sliding window by simply making the window itself the output - buffer. inflate() can be faster on modern CPUs when used with large - buffers. inflateBack() trusts the application to not change the output - buffer passed by the output function, at least until inflateBack() returns. - - inflateBackInit() must be called first to allocate the internal state - and to initialize the state with the user-provided window buffer. - inflateBack() may then be used multiple times to inflate a complete, raw - deflate stream with each call. inflateBackEnd() is then called to free the - allocated state. - - A raw deflate stream is one with no zlib or gzip header or trailer. - This routine would normally be used in a utility that reads zip or gzip - files and writes out uncompressed files. The utility would decode the - header and process the trailer on its own, hence this routine expects only - the raw deflate stream to decompress. This is different from the normal - behavior of inflate(), which expects either a zlib or gzip header and - trailer around the deflate stream. - - inflateBack() uses two subroutines supplied by the caller that are then - called by inflateBack() for input and output. inflateBack() calls those - routines until it reads a complete deflate stream and writes out all of the - uncompressed data, or until it encounters an error. The function's - parameters and return types are defined above in the in_func and out_func - typedefs. inflateBack() will call in(in_desc, &buf) which should return the - number of bytes of provided input, and a pointer to that input in buf. If - there is no input available, in() must return zero--buf is ignored in that - case--and inflateBack() will return a buffer error. inflateBack() will call - out(out_desc, buf, len) to write the uncompressed data buf[0..len-1]. out() - should return zero on success, or non-zero on failure. If out() returns - non-zero, inflateBack() will return with an error. Neither in() nor out() - are permitted to change the contents of the window provided to - inflateBackInit(), which is also the buffer that out() uses to write from. - The length written by out() will be at most the window size. Any non-zero - amount of input may be provided by in(). - - For convenience, inflateBack() can be provided input on the first call by - setting strm->next_in and strm->avail_in. If that input is exhausted, then - in() will be called. Therefore strm->next_in must be initialized before - calling inflateBack(). If strm->next_in is Z_NULL, then in() will be called - immediately for input. If strm->next_in is not Z_NULL, then strm->avail_in - must also be initialized, and then if strm->avail_in is not zero, input will - initially be taken from strm->next_in[0 .. strm->avail_in - 1]. - - The in_desc and out_desc parameters of inflateBack() is passed as the - first parameter of in() and out() respectively when they are called. These - descriptors can be optionally used to pass any information that the caller- - supplied in() and out() functions need to do their job. - - On return, inflateBack() will set strm->next_in and strm->avail_in to - pass back any unused input that was provided by the last in() call. The - return values of inflateBack() can be Z_STREAM_END on success, Z_BUF_ERROR - if in() or out() returned an error, Z_DATA_ERROR if there was a format error - in the deflate stream (in which case strm->msg is set to indicate the nature - of the error), or Z_STREAM_ERROR if the stream was not properly initialized. - In the case of Z_BUF_ERROR, an input or output error can be distinguished - using strm->next_in which will be Z_NULL only if in() returned an error. If - strm->next_in is not Z_NULL, then the Z_BUF_ERROR was due to out() returning - non-zero. (in() will always be called before out(), so strm->next_in is - assured to be defined if out() returns non-zero.) Note that inflateBack() - cannot return Z_OK. -*/ - -ZEXTERN int ZEXPORT inflateBackEnd OF((z_streamp strm)); -/* - All memory allocated by inflateBackInit() is freed. - - inflateBackEnd() returns Z_OK on success, or Z_STREAM_ERROR if the stream - state was inconsistent. -*/ - -ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void)); -/* Return flags indicating compile-time options. - - Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other: - 1.0: size of uInt - 3.2: size of uLong - 5.4: size of voidpf (pointer) - 7.6: size of z_off_t - - Compiler, assembler, and debug options: - 8: DEBUG - 9: ASMV or ASMINF -- use ASM code - 10: ZLIB_WINAPI -- exported functions use the WINAPI calling convention - 11: 0 (reserved) - - One-time table building (smaller code, but not thread-safe if true): - 12: BUILDFIXED -- build static block decoding tables when needed - 13: DYNAMIC_CRC_TABLE -- build CRC calculation tables when needed - 14,15: 0 (reserved) - - Library content (indicates missing functionality): - 16: NO_GZCOMPRESS -- gz* functions cannot compress (to avoid linking - deflate code when not needed) - 17: NO_GZIP -- deflate can't write gzip streams, and inflate can't detect - and decode gzip streams (to avoid linking crc code) - 18-19: 0 (reserved) - - Operation variations (changes in library functionality): - 20: PKZIP_BUG_WORKAROUND -- slightly more permissive inflate - 21: FASTEST -- deflate algorithm with only one, lowest compression level - 22,23: 0 (reserved) - - The sprintf variant used by gzprintf (zero is best): - 24: 0 = vs*, 1 = s* -- 1 means limited to 20 arguments after the format - 25: 0 = *nprintf, 1 = *printf -- 1 means gzprintf() not secure! - 26: 0 = returns value, 1 = void -- 1 means inferred string length returned - - Remainder: - 27-31: 0 (reserved) - */ - -#ifndef Z_SOLO - - /* utility functions */ - -/* - The following utility functions are implemented on top of the basic - stream-oriented functions. To simplify the interface, some default options - are assumed (compression level and memory usage, standard memory allocation - functions). The source code of these utility functions can be modified if - you need special options. -*/ - -ZEXTERN int ZEXPORT compress OF((Bytef *dest, uLongf *destLen, - const Bytef *source, uLong sourceLen)); -/* - Compresses the source buffer into the destination buffer. sourceLen is - the byte length of the source buffer. Upon entry, destLen is the total size - of the destination buffer, which must be at least the value returned by - compressBound(sourceLen). Upon exit, destLen is the actual size of the - compressed buffer. - - compress returns Z_OK if success, Z_MEM_ERROR if there was not - enough memory, Z_BUF_ERROR if there was not enough room in the output - buffer. -*/ - -ZEXTERN int ZEXPORT compress2 OF((Bytef *dest, uLongf *destLen, - const Bytef *source, uLong sourceLen, - int level)); -/* - Compresses the source buffer into the destination buffer. The level - parameter has the same meaning as in deflateInit. sourceLen is the byte - length of the source buffer. Upon entry, destLen is the total size of the - destination buffer, which must be at least the value returned by - compressBound(sourceLen). Upon exit, destLen is the actual size of the - compressed buffer. - - compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough - memory, Z_BUF_ERROR if there was not enough room in the output buffer, - Z_STREAM_ERROR if the level parameter is invalid. -*/ - -ZEXTERN uLong ZEXPORT compressBound OF((uLong sourceLen)); -/* - compressBound() returns an upper bound on the compressed size after - compress() or compress2() on sourceLen bytes. It would be used before a - compress() or compress2() call to allocate the destination buffer. -*/ - -ZEXTERN int ZEXPORT uncompress OF((Bytef *dest, uLongf *destLen, - const Bytef *source, uLong sourceLen)); -/* - Decompresses the source buffer into the destination buffer. sourceLen is - the byte length of the source buffer. Upon entry, destLen is the total size - of the destination buffer, which must be large enough to hold the entire - uncompressed data. (The size of the uncompressed data must have been saved - previously by the compressor and transmitted to the decompressor by some - mechanism outside the scope of this compression library.) Upon exit, destLen - is the actual size of the uncompressed buffer. - - uncompress returns Z_OK if success, Z_MEM_ERROR if there was not - enough memory, Z_BUF_ERROR if there was not enough room in the output - buffer, or Z_DATA_ERROR if the input data was corrupted or incomplete. In - the case where there is not enough room, uncompress() will fill the output - buffer with the uncompressed data up to that point. -*/ - - /* gzip file access functions */ - -/* - This library supports reading and writing files in gzip (.gz) format with - an interface similar to that of stdio, using the functions that start with - "gz". The gzip format is different from the zlib format. gzip is a gzip - wrapper, documented in RFC 1952, wrapped around a deflate stream. -*/ - -typedef struct gzFile_s *gzFile; /* semi-opaque gzip file descriptor */ - -/* -ZEXTERN gzFile ZEXPORT gzopen OF((const char *path, const char *mode)); - - Opens a gzip (.gz) file for reading or writing. The mode parameter is as - in fopen ("rb" or "wb") but can also include a compression level ("wb9") or - a strategy: 'f' for filtered data as in "wb6f", 'h' for Huffman-only - compression as in "wb1h", 'R' for run-length encoding as in "wb1R", or 'F' - for fixed code compression as in "wb9F". (See the description of - deflateInit2 for more information about the strategy parameter.) 'T' will - request transparent writing or appending with no compression and not using - the gzip format. - - "a" can be used instead of "w" to request that the gzip stream that will - be written be appended to the file. "+" will result in an error, since - reading and writing to the same gzip file is not supported. The addition of - "x" when writing will create the file exclusively, which fails if the file - already exists. On systems that support it, the addition of "e" when - reading or writing will set the flag to close the file on an execve() call. - - These functions, as well as gzip, will read and decode a sequence of gzip - streams in a file. The append function of gzopen() can be used to create - such a file. (Also see gzflush() for another way to do this.) When - appending, gzopen does not test whether the file begins with a gzip stream, - nor does it look for the end of the gzip streams to begin appending. gzopen - will simply append a gzip stream to the existing file. - - gzopen can be used to read a file which is not in gzip format; in this - case gzread will directly read from the file without decompression. When - reading, this will be detected automatically by looking for the magic two- - byte gzip header. - - gzopen returns NULL if the file could not be opened, if there was - insufficient memory to allocate the gzFile state, or if an invalid mode was - specified (an 'r', 'w', or 'a' was not provided, or '+' was provided). - errno can be checked to determine if the reason gzopen failed was that the - file could not be opened. -*/ - -ZEXTERN gzFile ZEXPORT gzdopen OF((int fd, const char *mode)); -/* - gzdopen associates a gzFile with the file descriptor fd. File descriptors - are obtained from calls like open, dup, creat, pipe or fileno (if the file - has been previously opened with fopen). The mode parameter is as in gzopen. - - The next call of gzclose on the returned gzFile will also close the file - descriptor fd, just like fclose(fdopen(fd, mode)) closes the file descriptor - fd. If you want to keep fd open, use fd = dup(fd_keep); gz = gzdopen(fd, - mode);. The duplicated descriptor should be saved to avoid a leak, since - gzdopen does not close fd if it fails. If you are using fileno() to get the - file descriptor from a FILE *, then you will have to use dup() to avoid - double-close()ing the file descriptor. Both gzclose() and fclose() will - close the associated file descriptor, so they need to have different file - descriptors. - - gzdopen returns NULL if there was insufficient memory to allocate the - gzFile state, if an invalid mode was specified (an 'r', 'w', or 'a' was not - provided, or '+' was provided), or if fd is -1. The file descriptor is not - used until the next gz* read, write, seek, or close operation, so gzdopen - will not detect if fd is invalid (unless fd is -1). -*/ - -ZEXTERN int ZEXPORT gzbuffer OF((gzFile file, unsigned size)); -/* - Set the internal buffer size used by this library's functions. The - default buffer size is 8192 bytes. This function must be called after - gzopen() or gzdopen(), and before any other calls that read or write the - file. The buffer memory allocation is always deferred to the first read or - write. Two buffers are allocated, either both of the specified size when - writing, or one of the specified size and the other twice that size when - reading. A larger buffer size of, for example, 64K or 128K bytes will - noticeably increase the speed of decompression (reading). - - The new buffer size also affects the maximum length for gzprintf(). - - gzbuffer() returns 0 on success, or -1 on failure, such as being called - too late. -*/ - -ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy)); -/* - Dynamically update the compression level or strategy. See the description - of deflateInit2 for the meaning of these parameters. - - gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not - opened for writing. -*/ - -ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len)); -/* - Reads the given number of uncompressed bytes from the compressed file. If - the input file is not in gzip format, gzread copies the given number of - bytes into the buffer directly from the file. - - After reaching the end of a gzip stream in the input, gzread will continue - to read, looking for another gzip stream. Any number of gzip streams may be - concatenated in the input file, and will all be decompressed by gzread(). - If something other than a gzip stream is encountered after a gzip stream, - that remaining trailing garbage is ignored (and no error is returned). - - gzread can be used to read a gzip file that is being concurrently written. - Upon reaching the end of the input, gzread will return with the available - data. If the error code returned by gzerror is Z_OK or Z_BUF_ERROR, then - gzclearerr can be used to clear the end of file indicator in order to permit - gzread to be tried again. Z_OK indicates that a gzip stream was completed - on the last gzread. Z_BUF_ERROR indicates that the input file ended in the - middle of a gzip stream. Note that gzread does not return -1 in the event - of an incomplete gzip stream. This error is deferred until gzclose(), which - will return Z_BUF_ERROR if the last gzread ended in the middle of a gzip - stream. Alternatively, gzerror can be used before gzclose to detect this - case. - - gzread returns the number of uncompressed bytes actually read, less than - len for end of file, or -1 for error. -*/ - -ZEXTERN int ZEXPORT gzwrite OF((gzFile file, - voidpc buf, unsigned len)); -/* - Writes the given number of uncompressed bytes into the compressed file. - gzwrite returns the number of uncompressed bytes written or 0 in case of - error. -*/ - -ZEXTERN int ZEXPORTVA gzprintf Z_ARG((gzFile file, const char *format, ...)); -/* - Converts, formats, and writes the arguments to the compressed file under - control of the format string, as in fprintf. gzprintf returns the number of - uncompressed bytes actually written, or 0 in case of error. The number of - uncompressed bytes written is limited to 8191, or one less than the buffer - size given to gzbuffer(). The caller should assure that this limit is not - exceeded. If it is exceeded, then gzprintf() will return an error (0) with - nothing written. In this case, there may also be a buffer overflow with - unpredictable consequences, which is possible only if zlib was compiled with - the insecure functions sprintf() or vsprintf() because the secure snprintf() - or vsnprintf() functions were not available. This can be determined using - zlibCompileFlags(). -*/ - -ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s)); -/* - Writes the given null-terminated string to the compressed file, excluding - the terminating null character. - - gzputs returns the number of characters written, or -1 in case of error. -*/ - -ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len)); -/* - Reads bytes from the compressed file until len-1 characters are read, or a - newline character is read and transferred to buf, or an end-of-file - condition is encountered. If any characters are read or if len == 1, the - string is terminated with a null character. If no characters are read due - to an end-of-file or len < 1, then the buffer is left untouched. - - gzgets returns buf which is a null-terminated string, or it returns NULL - for end-of-file or in case of error. If there was an error, the contents at - buf are indeterminate. -*/ - -ZEXTERN int ZEXPORT gzputc OF((gzFile file, int c)); -/* - Writes c, converted to an unsigned char, into the compressed file. gzputc - returns the value that was written, or -1 in case of error. -*/ - -ZEXTERN int ZEXPORT gzgetc OF((gzFile file)); -/* - Reads one byte from the compressed file. gzgetc returns this byte or -1 - in case of end of file or error. This is implemented as a macro for speed. - As such, it does not do all of the checking the other functions do. I.e. - it does not check to see if file is NULL, nor whether the structure file - points to has been clobbered or not. -*/ - -ZEXTERN int ZEXPORT gzungetc OF((int c, gzFile file)); -/* - Push one character back onto the stream to be read as the first character - on the next read. At least one character of push-back is allowed. - gzungetc() returns the character pushed, or -1 on failure. gzungetc() will - fail if c is -1, and may fail if a character has been pushed but not read - yet. If gzungetc is used immediately after gzopen or gzdopen, at least the - output buffer size of pushed characters is allowed. (See gzbuffer above.) - The pushed character will be discarded if the stream is repositioned with - gzseek() or gzrewind(). -*/ - -ZEXTERN int ZEXPORT gzflush OF((gzFile file, int flush)); -/* - Flushes all pending output into the compressed file. The parameter flush - is as in the deflate() function. The return value is the zlib error number - (see function gzerror below). gzflush is only permitted when writing. - - If the flush parameter is Z_FINISH, the remaining data is written and the - gzip stream is completed in the output. If gzwrite() is called again, a new - gzip stream will be started in the output. gzread() is able to read such - concatented gzip streams. - - gzflush should be called only when strictly necessary because it will - degrade compression if called too often. -*/ - -/* -ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile file, - z_off_t offset, int whence)); - - Sets the starting position for the next gzread or gzwrite on the given - compressed file. The offset represents a number of bytes in the - uncompressed data stream. The whence parameter is defined as in lseek(2); - the value SEEK_END is not supported. - - If the file is opened for reading, this function is emulated but can be - extremely slow. If the file is opened for writing, only forward seeks are - supported; gzseek then compresses a sequence of zeroes up to the new - starting position. - - gzseek returns the resulting offset location as measured in bytes from - the beginning of the uncompressed stream, or -1 in case of error, in - particular if the file is opened for writing and the new starting position - would be before the current position. -*/ - -ZEXTERN int ZEXPORT gzrewind OF((gzFile file)); -/* - Rewinds the given file. This function is supported only for reading. - - gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET) -*/ - -/* -ZEXTERN z_off_t ZEXPORT gztell OF((gzFile file)); - - Returns the starting position for the next gzread or gzwrite on the given - compressed file. This position represents a number of bytes in the - uncompressed data stream, and is zero when starting, even if appending or - reading a gzip stream from the middle of a file using gzdopen(). - - gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR) -*/ - -/* -ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile file)); - - Returns the current offset in the file being read or written. This offset - includes the count of bytes that precede the gzip stream, for example when - appending or when using gzdopen() for reading. When reading, the offset - does not include as yet unused buffered input. This information can be used - for a progress indicator. On error, gzoffset() returns -1. -*/ - -ZEXTERN int ZEXPORT gzeof OF((gzFile file)); -/* - Returns true (1) if the end-of-file indicator has been set while reading, - false (0) otherwise. Note that the end-of-file indicator is set only if the - read tried to go past the end of the input, but came up short. Therefore, - just like feof(), gzeof() may return false even if there is no more data to - read, in the event that the last read request was for the exact number of - bytes remaining in the input file. This will happen if the input file size - is an exact multiple of the buffer size. - - If gzeof() returns true, then the read functions will return no more data, - unless the end-of-file indicator is reset by gzclearerr() and the input file - has grown since the previous end of file was detected. -*/ - -ZEXTERN int ZEXPORT gzdirect OF((gzFile file)); -/* - Returns true (1) if file is being copied directly while reading, or false - (0) if file is a gzip stream being decompressed. - - If the input file is empty, gzdirect() will return true, since the input - does not contain a gzip stream. - - If gzdirect() is used immediately after gzopen() or gzdopen() it will - cause buffers to be allocated to allow reading the file to determine if it - is a gzip file. Therefore if gzbuffer() is used, it should be called before - gzdirect(). - - When writing, gzdirect() returns true (1) if transparent writing was - requested ("wT" for the gzopen() mode), or false (0) otherwise. (Note: - gzdirect() is not needed when writing. Transparent writing must be - explicitly requested, so the application already knows the answer. When - linking statically, using gzdirect() will include all of the zlib code for - gzip file reading and decompression, which may not be desired.) -*/ - -ZEXTERN int ZEXPORT gzclose OF((gzFile file)); -/* - Flushes all pending output if necessary, closes the compressed file and - deallocates the (de)compression state. Note that once file is closed, you - cannot call gzerror with file, since its structures have been deallocated. - gzclose must not be called more than once on the same file, just as free - must not be called more than once on the same allocation. - - gzclose will return Z_STREAM_ERROR if file is not valid, Z_ERRNO on a - file operation error, Z_MEM_ERROR if out of memory, Z_BUF_ERROR if the - last read ended in the middle of a gzip stream, or Z_OK on success. -*/ - -ZEXTERN int ZEXPORT gzclose_r OF((gzFile file)); -ZEXTERN int ZEXPORT gzclose_w OF((gzFile file)); -/* - Same as gzclose(), but gzclose_r() is only for use when reading, and - gzclose_w() is only for use when writing or appending. The advantage to - using these instead of gzclose() is that they avoid linking in zlib - compression or decompression code that is not used when only reading or only - writing respectively. If gzclose() is used, then both compression and - decompression code will be included the application when linking to a static - zlib library. -*/ - -ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum)); -/* - Returns the error message for the last error which occurred on the given - compressed file. errnum is set to zlib error number. If an error occurred - in the file system and not in the compression library, errnum is set to - Z_ERRNO and the application may consult errno to get the exact error code. - - The application must not modify the returned string. Future calls to - this function may invalidate the previously returned string. If file is - closed, then the string previously returned by gzerror will no longer be - available. - - gzerror() should be used to distinguish errors from end-of-file for those - functions above that do not distinguish those cases in their return values. -*/ - -ZEXTERN void ZEXPORT gzclearerr OF((gzFile file)); -/* - Clears the error and end-of-file flags for file. This is analogous to the - clearerr() function in stdio. This is useful for continuing to read a gzip - file that is being written concurrently. -*/ - -#endif /* !Z_SOLO */ - - /* checksum functions */ - -/* - These functions are not related to compression but are exported - anyway because they might be useful in applications using the compression - library. -*/ - -ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len)); -/* - Update a running Adler-32 checksum with the bytes buf[0..len-1] and - return the updated checksum. If buf is Z_NULL, this function returns the - required initial value for the checksum. - - An Adler-32 checksum is almost as reliable as a CRC32 but can be computed - much faster. - - Usage example: - - uLong adler = adler32(0L, Z_NULL, 0); - - while (read_buffer(buffer, length) != EOF) { - adler = adler32(adler, buffer, length); - } - if (adler != original_adler) error(); -*/ - -/* -ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2, - z_off_t len2)); - - Combine two Adler-32 checksums into one. For two sequences of bytes, seq1 - and seq2 with lengths len1 and len2, Adler-32 checksums were calculated for - each, adler1 and adler2. adler32_combine() returns the Adler-32 checksum of - seq1 and seq2 concatenated, requiring only adler1, adler2, and len2. Note - that the z_off_t type (like off_t) is a signed integer. If len2 is - negative, the result has no meaning or utility. -*/ - -ZEXTERN uLong ZEXPORT crc32 OF((uLong crc, const Bytef *buf, uInt len)); -/* - Update a running CRC-32 with the bytes buf[0..len-1] and return the - updated CRC-32. If buf is Z_NULL, this function returns the required - initial value for the crc. Pre- and post-conditioning (one's complement) is - performed within this function so it shouldn't be done by the application. - - Usage example: - - uLong crc = crc32(0L, Z_NULL, 0); - - while (read_buffer(buffer, length) != EOF) { - crc = crc32(crc, buffer, length); - } - if (crc != original_crc) error(); -*/ - -/* -ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2)); - - Combine two CRC-32 check values into one. For two sequences of bytes, - seq1 and seq2 with lengths len1 and len2, CRC-32 check values were - calculated for each, crc1 and crc2. crc32_combine() returns the CRC-32 - check value of seq1 and seq2 concatenated, requiring only crc1, crc2, and - len2. -*/ - - - /* various hacks, don't look :) */ - -/* deflateInit and inflateInit are macros to allow checking the zlib version - * and the compiler's view of z_stream: - */ -ZEXTERN int ZEXPORT deflateInit_ OF((z_streamp strm, int level, - const char *version, int stream_size)); -ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm, - const char *version, int stream_size)); -ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int level, int method, - int windowBits, int memLevel, - int strategy, const char *version, - int stream_size)); -ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int windowBits, - const char *version, int stream_size)); -ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits, - unsigned char FAR *window, - const char *version, - int stream_size)); -#define deflateInit(strm, level) \ - deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream)) -#define inflateInit(strm) \ - inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream)) -#define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \ - deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\ - (strategy), ZLIB_VERSION, (int)sizeof(z_stream)) -#define inflateInit2(strm, windowBits) \ - inflateInit2_((strm), (windowBits), ZLIB_VERSION, \ - (int)sizeof(z_stream)) -#define inflateBackInit(strm, windowBits, window) \ - inflateBackInit_((strm), (windowBits), (window), \ - ZLIB_VERSION, (int)sizeof(z_stream)) - -#ifndef Z_SOLO - -/* gzgetc() macro and its supporting function and exposed data structure. Note - * that the real internal state is much larger than the exposed structure. - * This abbreviated structure exposes just enough for the gzgetc() macro. The - * user should not mess with these exposed elements, since their names or - * behavior could change in the future, perhaps even capriciously. They can - * only be used by the gzgetc() macro. You have been warned. - */ -struct gzFile_s { - unsigned have; - unsigned char *next; - z_off64_t pos; -}; -ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file)); /* backward compatibility */ -#ifdef Z_PREFIX_SET -# undef z_gzgetc -# define z_gzgetc(g) \ - ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g)) -#else -# define gzgetc(g) \ - ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g)) -#endif - -/* provide 64-bit offset functions if _LARGEFILE64_SOURCE defined, and/or - * change the regular functions to 64 bits if _FILE_OFFSET_BITS is 64 (if - * both are true, the application gets the *64 functions, and the regular - * functions are changed to 64 bits) -- in case these are set on systems - * without large file support, _LFS64_LARGEFILE must also be true - */ -#ifdef Z_LARGE64 - ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *)); - ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int)); - ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile)); - ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile)); - ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off64_t)); - ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off64_t)); -#endif - -#if !defined(ZLIB_INTERNAL) && defined(Z_WANT64) -# ifdef Z_PREFIX_SET -# define z_gzopen z_gzopen64 -# define z_gzseek z_gzseek64 -# define z_gztell z_gztell64 -# define z_gzoffset z_gzoffset64 -# define z_adler32_combine z_adler32_combine64 -# define z_crc32_combine z_crc32_combine64 -# else -# define gzopen gzopen64 -# define gzseek gzseek64 -# define gztell gztell64 -# define gzoffset gzoffset64 -# define adler32_combine adler32_combine64 -# define crc32_combine crc32_combine64 -# endif -# ifndef Z_LARGE64 - ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *)); - ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int)); - ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile)); - ZEXTERN z_off_t ZEXPORT gzoffset64 OF((gzFile)); - ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t)); - ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t)); -# endif -#else - ZEXTERN gzFile ZEXPORT gzopen OF((const char *, const char *)); - ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile, z_off_t, int)); - ZEXTERN z_off_t ZEXPORT gztell OF((gzFile)); - ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile)); - ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t)); - ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t)); -#endif - -#else /* Z_SOLO */ - - ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t)); - ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t)); - -#endif /* !Z_SOLO */ - -/* hack for buggy compilers */ -#if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL) - struct internal_state {int dummy;}; -#endif - -/* undocumented functions */ -ZEXTERN const char * ZEXPORT zError OF((int)); -ZEXTERN int ZEXPORT inflateSyncPoint OF((z_streamp)); -ZEXTERN const z_crc_t FAR * ZEXPORT get_crc_table OF((void)); -ZEXTERN int ZEXPORT inflateUndermine OF((z_streamp, int)); -ZEXTERN int ZEXPORT inflateResetKeep OF((z_streamp)); -ZEXTERN int ZEXPORT deflateResetKeep OF((z_streamp)); -#if defined(_WIN32) && !defined(Z_SOLO) -ZEXTERN gzFile ZEXPORT gzopen_w OF((const wchar_t *path, - const char *mode)); -#endif -#if defined(STDC) || defined(Z_HAVE_STDARG_H) -# ifndef Z_SOLO -ZEXTERN int ZEXPORTVA gzvprintf Z_ARG((gzFile file, - const char *format, - va_list va)); -# endif -#endif - -#ifdef __cplusplus -} -#endif - -#endif /* ZLIB_H */ diff --git a/vendor/libgit2/deps/zlib/zutil.c b/vendor/libgit2/deps/zlib/zutil.c deleted file mode 100644 index 2fe2a7140..000000000 --- a/vendor/libgit2/deps/zlib/zutil.c +++ /dev/null @@ -1,321 +0,0 @@ -/* zutil.c -- target dependent utility functions for the compression library - * Copyright (C) 1995-2005, 2010, 2011, 2012 Jean-loup Gailly. - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -/* @(#) $Id$ */ - -#include "zutil.h" - -#ifndef NO_DUMMY_DECL -struct internal_state {int dummy;}; /* for buggy compilers */ -#endif - -z_const char * const z_errmsg[10] = { -"need dictionary", /* Z_NEED_DICT 2 */ -"stream end", /* Z_STREAM_END 1 */ -"", /* Z_OK 0 */ -"file error", /* Z_ERRNO (-1) */ -"stream error", /* Z_STREAM_ERROR (-2) */ -"data error", /* Z_DATA_ERROR (-3) */ -"insufficient memory", /* Z_MEM_ERROR (-4) */ -"buffer error", /* Z_BUF_ERROR (-5) */ -"incompatible version",/* Z_VERSION_ERROR (-6) */ -""}; - - -const char * ZEXPORT zlibVersion() -{ - return ZLIB_VERSION; -} - -uLong ZEXPORT zlibCompileFlags() -{ - uLong flags; - - flags = 0; - switch ((int)(sizeof(uInt))) { - case 2: break; - case 4: flags += 1; break; - case 8: flags += 2; break; - default: flags += 3; - } - switch ((int)(sizeof(uLong))) { - case 2: break; - case 4: flags += 1 << 2; break; - case 8: flags += 2 << 2; break; - default: flags += 3 << 2; - } - switch ((int)(sizeof(voidpf))) { - case 2: break; - case 4: flags += 1 << 4; break; - case 8: flags += 2 << 4; break; - default: flags += 3 << 4; - } - switch ((int)(sizeof(z_off_t))) { - case 2: break; - case 4: flags += 1 << 6; break; - case 8: flags += 2 << 6; break; - default: flags += 3 << 6; - } -#ifdef DEBUG - flags += 1 << 8; -#endif -#if defined(ASMV) || defined(ASMINF) - flags += 1 << 9; -#endif -#ifdef ZLIB_WINAPI - flags += 1 << 10; -#endif -#ifdef BUILDFIXED - flags += 1 << 12; -#endif -#ifdef DYNAMIC_CRC_TABLE - flags += 1 << 13; -#endif -#ifdef NO_GZCOMPRESS - flags += 1L << 16; -#endif -#ifdef NO_GZIP - flags += 1L << 17; -#endif -#ifdef PKZIP_BUG_WORKAROUND - flags += 1L << 20; -#endif -#ifdef FASTEST - flags += 1L << 21; -#endif -#if defined(STDC) || defined(Z_HAVE_STDARG_H) -# ifdef NO_vsnprintf - flags += 1L << 25; -# ifdef HAS_vsprintf_void - flags += 1L << 26; -# endif -# else -# ifdef HAS_vsnprintf_void - flags += 1L << 26; -# endif -# endif -#else - flags += 1L << 24; -# ifdef NO_snprintf - flags += 1L << 25; -# ifdef HAS_sprintf_void - flags += 1L << 26; -# endif -# else -# ifdef HAS_snprintf_void - flags += 1L << 26; -# endif -# endif -#endif - return flags; -} - -#ifdef DEBUG - -# ifndef verbose -# define verbose 0 -# endif -int ZLIB_INTERNAL z_verbose = verbose; - -void ZLIB_INTERNAL z_error (m) - char *m; -{ - fprintf(stderr, "%s\n", m); - exit(1); -} -#endif - -/* exported to allow conversion of error code to string for compress() and - * uncompress() - */ -const char * ZEXPORT zError(err) - int err; -{ - return ERR_MSG(err); -} - -#if defined(_WIN32_WCE) - /* The Microsoft C Run-Time Library for Windows CE doesn't have - * errno. We define it as a global variable to simplify porting. - * Its value is always 0 and should not be used. - */ - int errno = 0; -#endif - -#ifndef HAVE_MEMCPY - -void ZLIB_INTERNAL zmemcpy(dest, source, len) - Bytef* dest; - const Bytef* source; - uInt len; -{ - if (len == 0) return; - do { - *dest++ = *source++; /* ??? to be unrolled */ - } while (--len != 0); -} - -int ZLIB_INTERNAL zmemcmp(s1, s2, len) - const Bytef* s1; - const Bytef* s2; - uInt len; -{ - uInt j; - - for (j = 0; j < len; j++) { - if (s1[j] != s2[j]) return 2*(s1[j] > s2[j])-1; - } - return 0; -} - -void ZLIB_INTERNAL zmemzero(dest, len) - Bytef* dest; - uInt len; -{ - if (len == 0) return; - do { - *dest++ = 0; /* ??? to be unrolled */ - } while (--len != 0); -} -#endif - -#ifndef Z_SOLO - -#ifdef SYS16BIT - -#ifdef __TURBOC__ -/* Turbo C in 16-bit mode */ - -# define MY_ZCALLOC - -/* Turbo C malloc() does not allow dynamic allocation of 64K bytes - * and farmalloc(64K) returns a pointer with an offset of 8, so we - * must fix the pointer. Warning: the pointer must be put back to its - * original form in order to free it, use zcfree(). - */ - -#define MAX_PTR 10 -/* 10*64K = 640K */ - -local int next_ptr = 0; - -typedef struct ptr_table_s { - voidpf org_ptr; - voidpf new_ptr; -} ptr_table; - -local ptr_table table[MAX_PTR]; -/* This table is used to remember the original form of pointers - * to large buffers (64K). Such pointers are normalized with a zero offset. - * Since MSDOS is not a preemptive multitasking OS, this table is not - * protected from concurrent access. This hack doesn't work anyway on - * a protected system like OS/2. Use Microsoft C instead. - */ - -voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, unsigned items, unsigned size) -{ - voidpf buf = opaque; /* just to make some compilers happy */ - ulg bsize = (ulg)items*size; - - /* If we allocate less than 65520 bytes, we assume that farmalloc - * will return a usable pointer which doesn't have to be normalized. - */ - if (bsize < 65520L) { - buf = farmalloc(bsize); - if (*(ush*)&buf != 0) return buf; - } else { - buf = farmalloc(bsize + 16L); - } - if (buf == NULL || next_ptr >= MAX_PTR) return NULL; - table[next_ptr].org_ptr = buf; - - /* Normalize the pointer to seg:0 */ - *((ush*)&buf+1) += ((ush)((uch*)buf-0) + 15) >> 4; - *(ush*)&buf = 0; - table[next_ptr++].new_ptr = buf; - return buf; -} - -void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr) -{ - int n; - if (*(ush*)&ptr != 0) { /* object < 64K */ - farfree(ptr); - return; - } - /* Find the original pointer */ - for (n = 0; n < next_ptr; n++) { - if (ptr != table[n].new_ptr) continue; - - farfree(table[n].org_ptr); - while (++n < next_ptr) { - table[n-1] = table[n]; - } - next_ptr--; - return; - } - ptr = opaque; /* just to make some compilers happy */ - Assert(0, "zcfree: ptr not found"); -} - -#endif /* __TURBOC__ */ - - -#ifdef M_I86 -/* Microsoft C in 16-bit mode */ - -# define MY_ZCALLOC - -#if (!defined(_MSC_VER) || (_MSC_VER <= 600)) -# define _halloc halloc -# define _hfree hfree -#endif - -voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, uInt items, uInt size) -{ - if (opaque) opaque = 0; /* to make compiler happy */ - return _halloc((long)items, size); -} - -void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr) -{ - if (opaque) opaque = 0; /* to make compiler happy */ - _hfree(ptr); -} - -#endif /* M_I86 */ - -#endif /* SYS16BIT */ - - -#ifndef MY_ZCALLOC /* Any system without a special alloc function */ - -#ifndef STDC -extern voidp malloc OF((uInt size)); -extern voidp calloc OF((uInt items, uInt size)); -extern void free OF((voidpf ptr)); -#endif - -voidpf ZLIB_INTERNAL zcalloc (opaque, items, size) - voidpf opaque; - unsigned items; - unsigned size; -{ - if (opaque) items += size - size; /* make compiler happy */ - return sizeof(uInt) > 2 ? (voidpf)malloc(items * size) : - (voidpf)calloc(items, size); -} - -void ZLIB_INTERNAL zcfree (opaque, ptr) - voidpf opaque; - voidpf ptr; -{ - free(ptr); - if (opaque) return; /* make compiler happy */ -} - -#endif /* MY_ZCALLOC */ - -#endif /* !Z_SOLO */ diff --git a/vendor/libgit2/deps/zlib/zutil.h b/vendor/libgit2/deps/zlib/zutil.h deleted file mode 100644 index 24ab06b1c..000000000 --- a/vendor/libgit2/deps/zlib/zutil.h +++ /dev/null @@ -1,253 +0,0 @@ -/* zutil.h -- internal interface and configuration of the compression library - * Copyright (C) 1995-2013 Jean-loup Gailly. - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -/* WARNING: this file should *not* be used by applications. It is - part of the implementation of the compression library and is - subject to change. Applications should only use zlib.h. - */ - -/* @(#) $Id$ */ - -#ifndef ZUTIL_H -#define ZUTIL_H - -#ifdef HAVE_HIDDEN -# define ZLIB_INTERNAL __attribute__((visibility ("hidden"))) -#else -# define ZLIB_INTERNAL -#endif - -#include "zlib.h" - -#if defined(STDC) && !defined(Z_SOLO) -# if !(defined(_WIN32_WCE) && defined(_MSC_VER)) -# include -# endif -# include -# include -#endif - -#ifdef Z_SOLO - typedef long ptrdiff_t; /* guess -- will be caught if guess is wrong */ -#endif - -#ifndef local -# define local static -#endif -/* compile with -Dlocal if your debugger can't find static symbols */ - -typedef unsigned char uch; -typedef uch FAR uchf; -typedef unsigned short ush; -typedef ush FAR ushf; -typedef unsigned long ulg; - -extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ -/* (size given to avoid silly warnings with Visual C++) */ - -#define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)] - -#define ERR_RETURN(strm,err) \ - return (strm->msg = ERR_MSG(err), (err)) -/* To be used only when the state is known to be valid */ - - /* common constants */ - -#ifndef DEF_WBITS -# define DEF_WBITS MAX_WBITS -#endif -/* default windowBits for decompression. MAX_WBITS is for compression only */ - -#if MAX_MEM_LEVEL >= 8 -# define DEF_MEM_LEVEL 8 -#else -# define DEF_MEM_LEVEL MAX_MEM_LEVEL -#endif -/* default memLevel */ - -#define STORED_BLOCK 0 -#define STATIC_TREES 1 -#define DYN_TREES 2 -/* The three kinds of block type */ - -#define MIN_MATCH 3 -#define MAX_MATCH 258 -/* The minimum and maximum match lengths */ - -#define PRESET_DICT 0x20 /* preset dictionary flag in zlib header */ - - /* target dependencies */ - -#if defined(MSDOS) || (defined(WINDOWS) && !defined(WIN32)) -# define OS_CODE 0x00 -# ifndef Z_SOLO -# if defined(__TURBOC__) || defined(__BORLANDC__) -# if (__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__)) - /* Allow compilation with ANSI keywords only enabled */ - void _Cdecl farfree( void *block ); - void *_Cdecl farmalloc( unsigned long nbytes ); -# else -# include -# endif -# else /* MSC or DJGPP */ -# include -# endif -# endif -#endif - -#ifdef AMIGA -# define OS_CODE 0x01 -#endif - -#if defined(VAXC) || defined(VMS) -# define OS_CODE 0x02 -# define F_OPEN(name, mode) \ - fopen((name), (mode), "mbc=60", "ctx=stm", "rfm=fix", "mrs=512") -#endif - -#if defined(ATARI) || defined(atarist) -# define OS_CODE 0x05 -#endif - -#ifdef OS2 -# define OS_CODE 0x06 -# if defined(M_I86) && !defined(Z_SOLO) -# include -# endif -#endif - -#if defined(MACOS) || defined(TARGET_OS_MAC) -# define OS_CODE 0x07 -# ifndef Z_SOLO -# if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os -# include /* for fdopen */ -# else -# ifndef fdopen -# define fdopen(fd,mode) NULL /* No fdopen() */ -# endif -# endif -# endif -#endif - -#ifdef TOPS20 -# define OS_CODE 0x0a -#endif - -#ifdef WIN32 -# ifndef __CYGWIN__ /* Cygwin is Unix, not Win32 */ -# define OS_CODE 0x0b -# endif -#endif - -#ifdef __50SERIES /* Prime/PRIMOS */ -# define OS_CODE 0x0f -#endif - -#if defined(_BEOS_) || defined(RISCOS) -# define fdopen(fd,mode) NULL /* No fdopen() */ -#endif - -#if (defined(_MSC_VER) && (_MSC_VER > 600)) && !defined __INTERIX -# if defined(_WIN32_WCE) -# define fdopen(fd,mode) NULL /* No fdopen() */ -# ifndef _PTRDIFF_T_DEFINED - typedef int ptrdiff_t; -# define _PTRDIFF_T_DEFINED -# endif -# else -# define fdopen(fd,type) _fdopen(fd,type) -# endif -#endif - -#if defined(__BORLANDC__) && !defined(MSDOS) - #pragma warn -8004 - #pragma warn -8008 - #pragma warn -8066 -#endif - -/* provide prototypes for these when building zlib without LFS */ -#if !defined(_WIN32) && \ - (!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0) - ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t)); - ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t)); -#endif - - /* common defaults */ - -#ifndef OS_CODE -# define OS_CODE 0x03 /* assume Unix */ -#endif - -#ifndef F_OPEN -# define F_OPEN(name, mode) fopen((name), (mode)) -#endif - - /* functions */ - -#if defined(pyr) || defined(Z_SOLO) -# define NO_MEMCPY -#endif -#if defined(SMALL_MEDIUM) && !defined(_MSC_VER) && !defined(__SC__) - /* Use our own functions for small and medium model with MSC <= 5.0. - * You may have to use the same strategy for Borland C (untested). - * The __SC__ check is for Symantec. - */ -# define NO_MEMCPY -#endif -#if defined(STDC) && !defined(HAVE_MEMCPY) && !defined(NO_MEMCPY) -# define HAVE_MEMCPY -#endif -#ifdef HAVE_MEMCPY -# ifdef SMALL_MEDIUM /* MSDOS small or medium model */ -# define zmemcpy _fmemcpy -# define zmemcmp _fmemcmp -# define zmemzero(dest, len) _fmemset(dest, 0, len) -# else -# define zmemcpy memcpy -# define zmemcmp memcmp -# define zmemzero(dest, len) memset(dest, 0, len) -# endif -#else - void ZLIB_INTERNAL zmemcpy OF((Bytef* dest, const Bytef* source, uInt len)); - int ZLIB_INTERNAL zmemcmp OF((const Bytef* s1, const Bytef* s2, uInt len)); - void ZLIB_INTERNAL zmemzero OF((Bytef* dest, uInt len)); -#endif - -/* Diagnostic functions */ -#ifdef DEBUG -# include - extern int ZLIB_INTERNAL z_verbose; - extern void ZLIB_INTERNAL z_error OF((char *m)); -# define Assert(cond,msg) {if(!(cond)) z_error(msg);} -# define Trace(x) {if (z_verbose>=0) fprintf x ;} -# define Tracev(x) {if (z_verbose>0) fprintf x ;} -# define Tracevv(x) {if (z_verbose>1) fprintf x ;} -# define Tracec(c,x) {if (z_verbose>0 && (c)) fprintf x ;} -# define Tracecv(c,x) {if (z_verbose>1 && (c)) fprintf x ;} -#else -# define Assert(cond,msg) -# define Trace(x) -# define Tracev(x) -# define Tracevv(x) -# define Tracec(c,x) -# define Tracecv(c,x) -#endif - -#ifndef Z_SOLO - voidpf ZLIB_INTERNAL zcalloc OF((voidpf opaque, unsigned items, - unsigned size)); - void ZLIB_INTERNAL zcfree OF((voidpf opaque, voidpf ptr)); -#endif - -#define ZALLOC(strm, items, size) \ - (*((strm)->zalloc))((strm)->opaque, (items), (size)) -#define ZFREE(strm, addr) (*((strm)->zfree))((strm)->opaque, (voidpf)(addr)) -#define TRY_FREE(s, p) {if (p) ZFREE(s, p);} - -/* Reverse the bytes in a 32-bit value */ -#define ZSWAP32(q) ((((q) >> 24) & 0xff) + (((q) >> 8) & 0xff00) + \ - (((q) & 0xff00) << 8) + (((q) & 0xff) << 24)) - -#endif /* ZUTIL_H */ diff --git a/vendor/libgit2/docs/checkout-internals.md b/vendor/libgit2/docs/checkout-internals.md deleted file mode 100644 index 6147ffdd8..000000000 --- a/vendor/libgit2/docs/checkout-internals.md +++ /dev/null @@ -1,204 +0,0 @@ -Checkout Internals -================== - -Checkout has to handle a lot of different cases. It examines the -differences between the target tree, the baseline tree and the working -directory, plus the contents of the index, and groups files into five -categories: - -1. UNMODIFIED - Files that match in all places. -2. SAFE - Files where the working directory and the baseline content - match that can be safely updated to the target. -3. DIRTY/MISSING - Files where the working directory differs from the - baseline but there is no conflicting change with the target. One - example is a file that doesn't exist in the working directory - no - data would be lost as a result of writing this file. Which action - will be taken with these files depends on the options you use. -4. CONFLICTS - Files where changes in the working directory conflict - with changes to be applied by the target. If conflicts are found, - they prevent any other modifications from being made (although there - are options to override that and force the update, of course). -5. UNTRACKED/IGNORED - Files in the working directory that are untracked - or ignored (i.e. only in the working directory, not the other places). - -Right now, this classification is done via 3 iterators (for the three -trees), with a final lookup in the index. At some point, this may move to -a 4 iterator version to incorporate the index better. - -The actual checkout is done in five phases (at least right now). - -1. The diff between the baseline and the target tree is used as a base - list of possible updates to be applied. -2. Iterate through the diff and the working directory, building a list of - actions to be taken (and sending notifications about conflicts and - dirty files). -3. Remove any files / directories as needed (because alphabetical - iteration means that an untracked directory will end up sorted *after* - a blob that should be checked out with the same name). -4. Update all blobs. -5. Update all submodules (after 4 in case a new .gitmodules blob was - checked out) - -Checkout could be driven either off a target-to-workdir diff or a -baseline-to-target diff. There are pros and cons of each. - -Target-to-workdir means the diff includes every file that could be -modified, which simplifies bookkeeping, but the code to constantly refer -back to the baseline gets complicated. - -Baseline-to-target has simpler code because the diff defines the action to -take, but needs special handling for untracked and ignored files, if they -need to be removed. - -The current checkout implementation is based on a baseline-to-target diff. - - -Picking Actions -=============== - -The most interesting aspect of this is phase 2, picking the actions that -should be taken. There are a lot of corner cases, so it may be easier to -start by looking at the rules for a simple 2-iterator diff: - -Key ---- -- B1,B2,B3 - blobs with different SHAs, -- Bi - ignored blob (WD only) -- T1,T2,T3 - trees with different SHAs, -- Ti - ignored tree (WD only) -- x - nothing - -Diff with 2 non-workdir iterators ---------------------------------- - -| | Old | New | | -|----|-----|-----|------------------------------------------------------------| -| 0 | x | x | nothing | -| 1 | x | B1 | added blob | -| 2 | x | T1 | added tree | -| 3 | B1 | x | removed blob | -| 4 | B1 | B1 | unmodified blob | -| 5 | B1 | B2 | modified blob | -| 6 | B1 | T1 | typechange blob -> tree | -| 7 | T1 | x | removed tree | -| 8 | T1 | B1 | typechange tree -> blob | -| 9 | T1 | T1 | unmodified tree | -| 10 | T1 | T2 | modified tree (implies modified/added/removed blob inside) | - - -Now, let's make the "New" iterator into a working directory iterator, so -we replace "added" items with either untracked or ignored, like this: - -Diff with non-work & workdir iterators --------------------------------------- - -| | Old | New | | -|----|-----|-----|------------------------------------------------------------| -| 0 | x | x | nothing | -| 1 | x | B1 | untracked blob | -| 2 | x | Bi | ignored file | -| 3 | x | T1 | untracked tree | -| 4 | x | Ti | ignored tree | -| 5 | B1 | x | removed blob | -| 6 | B1 | B1 | unmodified blob | -| 7 | B1 | B2 | modified blob | -| 8 | B1 | T1 | typechange blob -> tree | -| 9 | B1 | Ti | removed blob AND ignored tree as separate items | -| 10 | T1 | x | removed tree | -| 11 | T1 | B1 | typechange tree -> blob | -| 12 | T1 | Bi | removed tree AND ignored blob as separate items | -| 13 | T1 | T1 | unmodified tree | -| 14 | T1 | T2 | modified tree (implies modified/added/removed blob inside) | - -Note: if there is a corresponding entry in the old tree, then a working -directory item won't be ignored (i.e. no Bi or Ti for tracked items). - - -Now, expand this to three iterators: a baseline tree, a target tree, and -an actual working directory tree: - -Checkout From 3 Iterators (2 not workdir, 1 workdir) ----------------------------------------------------- - -(base == old HEAD; target == what to checkout; actual == working dir) - -| |base | target | actual/workdir | | -|-----|-----|------- |----------------|--------------------------------------------------------------------| -| 0 | x | x | x | nothing | -| 1 | x | x | B1/Bi/T1/Ti | untracked/ignored blob/tree (SAFE) | -| 2+ | x | B1 | x | add blob (SAFE) | -| 3 | x | B1 | B1 | independently added blob (FORCEABLE-2) | -| 4* | x | B1 | B2/Bi/T1/Ti | add blob with content conflict (FORCEABLE-2) | -| 5+ | x | T1 | x | add tree (SAFE) | -| 6* | x | T1 | B1/Bi | add tree with blob conflict (FORCEABLE-2) | -| 7 | x | T1 | T1/i | independently added tree (SAFE+MISSING) | -| 8 | B1 | x | x | independently deleted blob (SAFE+MISSING) | -| 9- | B1 | x | B1 | delete blob (SAFE) | -| 10- | B1 | x | B2 | delete of modified blob (FORCEABLE-1) | -| 11 | B1 | x | T1/Ti | independently deleted blob AND untrack/ign tree (SAFE+MISSING !!!) | -| 12 | B1 | B1 | x | locally deleted blob (DIRTY || SAFE+CREATE) | -| 13+ | B1 | B2 | x | update to deleted blob (SAFE+MISSING) | -| 14 | B1 | B1 | B1 | unmodified file (SAFE) | -| 15 | B1 | B1 | B2 | locally modified file (DIRTY) | -| 16+ | B1 | B2 | B1 | update unmodified blob (SAFE) | -| 17 | B1 | B2 | B2 | independently updated blob (FORCEABLE-1) | -| 18+ | B1 | B2 | B3 | update to modified blob (FORCEABLE-1) | -| 19 | B1 | B1 | T1/Ti | locally deleted blob AND untrack/ign tree (DIRTY) | -| 20* | B1 | B2 | T1/Ti | update to deleted blob AND untrack/ign tree (F-1) | -| 21+ | B1 | T1 | x | add tree with locally deleted blob (SAFE+MISSING) | -| 22* | B1 | T1 | B1 | add tree AND deleted blob (SAFE) | -| 23* | B1 | T1 | B2 | add tree with delete of modified blob (F-1) | -| 24 | B1 | T1 | T1 | add tree with deleted blob (F-1) | -| 25 | T1 | x | x | independently deleted tree (SAFE+MISSING) | -| 26 | T1 | x | B1/Bi | independently deleted tree AND untrack/ign blob (F-1) | -| 27- | T1 | x | T1 | deleted tree (MAYBE SAFE) | -| 28+ | T1 | B1 | x | deleted tree AND added blob (SAFE+MISSING) | -| 29 | T1 | B1 | B1 | independently typechanged tree -> blob (F-1) | -| 30+ | T1 | B1 | B2 | typechange tree->blob with conflicting blob (F-1) | -| 31* | T1 | B1 | T1/T2 | typechange tree->blob (MAYBE SAFE) | -| 32+ | T1 | T1 | x | restore locally deleted tree (SAFE+MISSING) | -| 33 | T1 | T1 | B1/Bi | locally typechange tree->untrack/ign blob (DIRTY) | -| 34 | T1 | T1 | T1/T2 | unmodified tree (MAYBE SAFE) | -| 35+ | T1 | T2 | x | update locally deleted tree (SAFE+MISSING) | -| 36* | T1 | T2 | B1/Bi | update to tree with typechanged tree->blob conflict (F-1) | -| 37 | T1 | T2 | T1/T2/T3 | update to existing tree (MAYBE SAFE) | - - -The number is followed by ' ' if no change is needed or '+' if the case -needs to write to disk or '-' if something must be deleted and '*' if -there should be a delete followed by an write. - -There are four tiers of safe cases: - -* SAFE == completely safe to update -* SAFE+MISSING == safe except the workdir is missing the expect content -* MAYBE SAFE == safe if workdir tree matches (or is missing) baseline - content, which is unknown at this point -* FORCEABLE == conflict unless FORCE is given -* DIRTY == no conflict but change is not applied unless FORCE - -Some slightly unusual circumstances: - -* 8 - parent dir is only deleted when file is, so parent will be left if - empty even though it would be deleted if the file were present -* 11 - core git does not consider this a conflict but attempts to delete T1 - and gives "unable to unlink file" error yet does not skip the rest - of the operation -* 12 - without FORCE file is left deleted (i.e. not restored) so new wd is - dirty (and warning message "D file" is printed), with FORCE, file is - restored. -* 24 - This should be considered MAYBE SAFE since effectively it is 7 and 8 - combined, but core git considers this a conflict unless forced. -* 26 - This combines two cases (1 & 25) (and also implied 8 for tree content) - which are ok on their own, but core git treat this as a conflict. - If not forced, this is a conflict. If forced, this actually doesn't - have to write anything and leaves the new blob as an untracked file. -* 32 - This is the only case where the baseline and target values match - and yet we will still write to the working directory. In all other - cases, if baseline == target, we don't touch the workdir (it is - either already right or is "dirty"). However, since this case also - implies that a ?/B1/x case will exist as well, it can be skipped. - -Cases 3, 17, 24, 26, and 29 are all considered conflicts even though -none of them will require making any updates to the working directory. - diff --git a/vendor/libgit2/docs/diff-internals.md b/vendor/libgit2/docs/diff-internals.md deleted file mode 100644 index da4c5a17c..000000000 --- a/vendor/libgit2/docs/diff-internals.md +++ /dev/null @@ -1,92 +0,0 @@ -Diff is broken into four phases: - -1. Building a list of things that have changed. These changes are called - deltas (git_diff_delta objects) and are grouped into a git_diff_list. -2. Applying file similarity measurement for rename and copy detection (and - to potentially split files that have changed radically). This step is - optional. -3. Computing the textual diff for each delta. Not all deltas have a - meaningful textual diff. For those that do, the textual diff can - either be generated on the fly and passed to output callbacks or can be - turned into a git_diff_patch object. -4. Formatting the diff and/or patch into standard text formats (such as - patches, raw lists, etc). - -In the source code, step 1 is implemented in `src/diff.c`, step 2 in -`src/diff_tform.c`, step 3 in `src/diff_patch.c`, and step 4 in -`src/diff_print.c`. Additionally, when it comes to accessing file -content, everything goes through diff drivers that are implemented in -`src/diff_driver.c`. - -External Objects ----------------- - -* `git_diff_options` represents user choices about how a diff should be - performed and is passed to most diff generating functions. -* `git_diff_file` represents an item on one side of a possible delta -* `git_diff_delta` represents a pair of items that have changed in some - way - it contains two `git_diff_file` plus a status and other stuff. -* `git_diff_list` is a list of deltas along with information about how - those particular deltas were found. -* `git_diff_patch` represents the actual diff between a pair of items. In - some cases, a delta may not have a corresponding patch, if the objects - are binary, for example. The content of a patch will be a set of hunks - and lines. -* A `hunk` is range of lines described by a `git_diff_range` (i.e. "lines - 10-20 in the old file became lines 12-23 in the new"). It will have a - header that compactly represents that information, and it will have a - number of lines of context surrounding added and deleted lines. -* A `line` is simple a line of data along with a `git_diff_line_t` value - that tells how the data should be interpreted (e.g. context or added). - -Internal Objects ----------------- - -* `git_diff_file_content` is an internal structure that represents the - data on one side of an item to be diffed; it is an augmented - `git_diff_file` with more flags and the actual file data. - - * it is created from a repository plus a) a git_diff_file, b) a git_blob, - or c) raw data and size - * there are three main operations on git_diff_file_content: - - * _initialization_ sets up the data structure and does what it can up to, - but not including loading and looking at the actual data - * _loading_ loads the data, preprocesses it (i.e. applies filters) and - potentially analyzes it (to decide if binary) - * _free_ releases loaded data and frees any allocated memory - -* The internal structure of a `git_diff_patch` stores the actual diff - between a pair of `git_diff_file_content` items - - * it may be "unset" if the items are not diffable - * "empty" if the items are the same - * otherwise it will consist of a set of hunks each of which covers some - number of lines of context, additions and deletions - * a patch is created from two git_diff_file_content items - * a patch is fully instantiated in three phases: - - * initial creation and initialization - * loading of data and preliminary data examination - * diffing of data and optional storage of diffs - * (TBD) if a patch is asked to store the diffs and the size of the diff - is significantly smaller than the raw data of the two sides, then the - patch may be flattened using a pool of string data - -* `git_diff_output` is an internal structure that represents an output - target for a `git_diff_patch` - * It consists of file, hunk, and line callbacks, plus a payload - * There is a standard flattened output that can be used for plain text output - * Typically we use a `git_xdiff_output` which drives the callbacks via the - xdiff code taken from core Git. - -* `git_diff_driver` is an internal structure that encapsulates the logic - for a given type of file - * a driver is looked up based on the name and mode of a file. - * the driver can then be used to: - * determine if a file is binary (by attributes, by git_diff_options - settings, or by examining the content) - * give you a function pointer that is used to evaluate function context - for hunk headers - * At some point, the logic for getting a filtered version of file content - or calculating the OID of a file may be moved into the driver. diff --git a/vendor/libgit2/docs/error-handling.md b/vendor/libgit2/docs/error-handling.md deleted file mode 100644 index 719244d2f..000000000 --- a/vendor/libgit2/docs/error-handling.md +++ /dev/null @@ -1,270 +0,0 @@ -Error reporting in libgit2 -========================== - -Libgit2 tries to follow the POSIX style: functions return an `int` value -with 0 (zero) indicating success and negative values indicating an error. -There are specific negative error codes for each "expected failure" -(e.g. `GIT_ENOTFOUND` for files that take a path which might be missing) -and a generic error code (-1) for all critical or non-specific failures -(e.g. running out of memory or system corruption). - -When a negative value is returned, an error message is also set. The -message can be accessed via the `giterr_last` function which will return a -pointer to a `git_error` structure containing the error message text and -the class of error (i.e. what part of the library generated the error). - -For instance: An object lookup by SHA prefix (`git_object_lookup_prefix`) -has two expected failure cases: the SHA is not found at all which returns -`GIT_ENOTFOUND` or the SHA prefix is ambiguous (i.e. two or more objects -share the prefix) which returns `GIT_EAMBIGUOUS`. There are any number of -critical failures (such as a packfile being corrupted, a loose object -having the wrong access permissions, etc.) all of which will return -1. -When the object lookup is successful, it will return 0. - -If libgit2 was compiled with threads enabled (`-DTHREADSAFE=ON` when using -CMake), then the error message will be kept in thread-local storage, so it -will not be modified by other threads. If threads are not enabled, then -the error message is in global data. - -All of the error return codes, the `git_error` type, the error access -functions, and the error classes are defined in `include/git2/errors.h`. -See the documentation there for details on the APIs for accessing, -clearing, and even setting error codes. - -When writing libgit2 code, please be smart and conservative when returning -error codes. Functions usually have a maximum of two or three "expected -errors" and in most cases only one. If you feel there are more possible -expected error scenarios, then the API you are writing may be at too high -a level for core libgit2. - -Example usage -------------- - -When using libgit2, you will typically capture the return value from -functions using an `int` variable and check to see if it is negative. -When that happens, you can, if you wish, look at the specific value or -look at the error message that was generated. - -~~~c -{ - git_repository *repo; - int error = git_repository_open(&repo, "path/to/repo"); - - if (error < 0) { - fprintf(stderr, "Could not open repository: %s\n", giterr_last()->message); - exit(1); - } - - ... use `repo` here ... - - git_repository_free(repo); /* void function - no error return code */ -} -~~~ - -Some of the error return values do have meaning. Optionally, you can look -at the specific error values to decide what to do. - -~~~c -{ - git_repository *repo; - const char *path = "path/to/repo"; - int error = git_repository_open(&repo, path); - - if (error < 0) { - if (error == GIT_ENOTFOUND) - fprintf(stderr, "Could not find repository at path '%s'\n", path); - else - fprintf(stderr, "Unable to open repository: %s\n", - giterr_last()->message); - exit(1); - } - - ... happy ... -} -~~~ - -Some of the higher-level language bindings may use a range of information -from libgit2 to convert error return codes into exceptions, including the -specific error return codes and even the class of error and the error -message returned by `giterr_last`, but the full range of that logic is -beyond the scope of this document. - -Example internal implementation -------------------------------- - -Internally, libgit2 detects error scenarios, records error messages, and -returns error values. Errors from low-level functions are generally -passed upwards (unless the higher level can either handle the error or -wants to translate the error into something more meaningful). - -~~~c -int git_repository_open(git_repository **repository, const char *path) -{ - /* perform some logic to open the repository */ - if (p_exists(path) < 0) { - giterr_set(GITERR_REPOSITORY, "The path '%s' doesn't exist", path); - return GIT_ENOTFOUND; - } - - ... -} -~~~ - -The public error API --------------------- - -- `const git_error *giterr_last(void)`: The main function used to look up - the last error. This may return NULL if no error has occurred. - Otherwise this should return a `git_error` object indicating the class - of error and the error message that was generated by the library. - - The last error is stored in thread-local storage when libgit2 is - compiled with thread support, so you do not have to worry about another - thread overwriting the value. When thread support is off, the last - error is a global value. - - _Note_ There are some known bugs in the library where this may return - NULL even when an error code was generated. Please report these as - bugs, but in the meantime, please code defensively and check for NULL - when calling this function. - -- `void giterr_clear(void)`: This function clears the last error. The - library will call this when an error is generated by low level function - and the higher level function handles the error. - - _Note_ There are some known bugs in the library where a low level - function's error message is not cleared by higher level code that - handles the error and returns zero. Please report these as bugs, but in - the meantime, a zero return value from a libgit2 API does not guarantee - that `giterr_last()` will return NULL. - -- `void giterr_set_str(int error_class, const char *message)`: This - function can be used when writing a custom backend module to set the - libgit2 error message. See the documentation on this function for its - use. Normal usage of libgit2 will probably never need to call this API. - -- `void giterr_set_oom(void)`: This is a standard function for reporting - an out-of-memory error. It is written in a manner that it doesn't have - to allocate any extra memory in order to record the error, so this is - the best way to report that scenario. - -Deviations from the standard ----------------------------- - -There are some public functions that do not return `int` values. There -are two primary cases: - -* `void` return values: If a function has a `void` return, then it will - never fail. This primary will be used for object destructors. - -* `git_xyz *` return values: These are simple accessor functions where the - only meaningful error would typically be looking something up by index - and having the index be out of bounds. In those cases, the function - will typically return NULL. - -* Boolean return values: There are some cases where a function cannot fail - and wants to return a boolean value. In those cases, we try to return 1 - for true and 0 for false. These cases are rare and the return value for - the function should probably be an `unsigned int` to denote these cases. - If you find an exception, please open an issue and let's fix it. - -There are a few other exceptions to these rules here and there in the -library, but those are extremely rare and should probably be converted -over to other to more standard patterns for usage. Feel free to open -issues pointing these out. - -There are some known bugs in the library where some functions may return a -negative value but not set an error message and some other functions may -return zero (no error) and yet leave an error message set. Please report -these cases as issues and they will be fixed. In the meanwhile, please -code defensively, checking that the return value of `giterr_last` is not -NULL before using it, and not relying on `giterr_last` to return NULL when -a function returns 0 for success. - -The internal error API ----------------------- - -- `void giterr_set(int error_class, const char *fmt, ...)`: This is the - main internal function for setting an error. It works like `printf` to - format the error message. See the notes of `giterr_set_str` for a - general description of how error messages are stored (and also about - special handling for `error_class` of `GITERR_OS`). - -Writing error messages ----------------------- - -Here are some guidelines when writing error messages: - -- Use proper English, and an impersonal or past tenses: *The given path - does not exist*, *Failed to lookup object in ODB* - -- Use short, direct and objective messages. **One line, max**. libgit2 is - a low level library: think that all the messages reported will be thrown - as Ruby or Python exceptions. Think how long are common exception - messages in those languages. - -- **Do not add redundant information to the error message**, specially - information that can be inferred from the context. - - E.g. in `git_repository_open`, do not report a message like "Failed to - open repository: path not found". Somebody is calling that - function. If it fails, they already know that the repository failed to - open! - -General guidelines for error reporting --------------------------------------- - -- Libgit2 does not handle programming errors with these - functions. Programming errors are `assert`ed, and when their source is - internal, fixed as soon as possible. This is C, people. - - Example of programming errors that would **not** be handled: passing - NULL to a function that expects a valid pointer; passing a `git_tree` - to a function that expects a `git_commit`. All these cases need to be - identified with `assert` and fixed asap. - - Example of a runtime error: failing to parse a `git_tree` because it - contains invalid data. Failing to open a file because it doesn't exist - on disk. These errors are handled, a meaningful error message is set, - and an error code is returned. - -- In general, *do not* try to overwrite errors internally and *do* - propagate error codes from lower level functions to the higher level. - There are some cases where propagating an error code will be more - confusing rather than less, so there are some exceptions to this rule, - but the default behavior should be to simply clean up and pass the error - on up to the caller. - - **WRONG** - - ~~~c - int git_commit_parent(...) - { - ... - - if (git_commit_lookup(parent, repo, parent_id) < 0) { - giterr_set(GITERR_COMMIT, "Overwrite lookup error message"); - return -1; /* mask error code */ - } - - ... - } - ~~~ - - **RIGHT** - - ~~~c - int git_commit_parent(...) - { - ... - - error = git_commit_lookup(parent, repo, parent_id); - if (error < 0) { - /* cleanup intermediate objects if necessary */ - /* leave error message and propagate error code */ - return error; - } - - ... - } - ~~~ diff --git a/vendor/libgit2/docs/merge-df_conflicts.txt b/vendor/libgit2/docs/merge-df_conflicts.txt deleted file mode 100644 index 09780ee2d..000000000 --- a/vendor/libgit2/docs/merge-df_conflicts.txt +++ /dev/null @@ -1,41 +0,0 @@ -Anc / Our / Thr represent the ancestor / ours / theirs side of a merge -from branch "branch" into HEAD. Workdir represents the expected files in -the working directory. Index represents the expected files in the index, -with stage markers. - - Anc Our Thr Workdir Index -1 D D - D/F D/F D/F [0] - -2 D D+ D~HEAD (mod/del) D/F [0] - D/F D/F D [1] - D [2] - -3 D D D/F D/F [0] - D/F - -4 D D+ D~branch (mod/del) D/F [0] - D/F D/F D [1] - D [3] - -5 D D/F (add/add) D/F [2] - D/F D/F [3] - D/F - -6 D/F D/F D D [0] - D - -7 D/F D/F+ D/F (mod/del) D/F [1] - D D~branch (fil/dir) D/F [2] - D [3] - -8 D/F D/F D D [0] - D - -9 D/F D/F+ D/F (mod/del) D/F [1] - D D~HEAD (fil/dir) D [2] - D/F [3] - -10 D/F D/F (fil/dir) D/F [0] - D D~HEAD D [2] - D diff --git a/vendor/libgit2/examples/.gitignore b/vendor/libgit2/examples/.gitignore deleted file mode 100644 index 0e491598a..000000000 --- a/vendor/libgit2/examples/.gitignore +++ /dev/null @@ -1,15 +0,0 @@ -general -showindex -diff -rev-list -blame -cat-file -init -log -rev-parse -remote -status -tag -for-each-ref -describe -*.dSYM diff --git a/vendor/libgit2/examples/CMakeLists.txt b/vendor/libgit2/examples/CMakeLists.txt deleted file mode 100644 index 596be45ed..000000000 --- a/vendor/libgit2/examples/CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -FILE(GLOB_RECURSE SRC_EXAMPLE_GIT2 network/*.c network/*.h) -ADD_EXECUTABLE(cgit2 ${SRC_EXAMPLE_GIT2}) -IF(WIN32 OR ANDROID) - TARGET_LINK_LIBRARIES(cgit2 git2) -ELSE() - TARGET_LINK_LIBRARIES(cgit2 git2 pthread) -ENDIF() - -FILE(GLOB SRC_EXAMPLE_APPS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.c) -FOREACH(src_app ${SRC_EXAMPLE_APPS}) - STRING(REPLACE ".c" "" app_name ${src_app}) - IF(NOT ${app_name} STREQUAL "common") - ADD_EXECUTABLE(${app_name} ${src_app} "common.c") - TARGET_LINK_LIBRARIES(${app_name} git2) - ENDIF() -ENDFOREACH() diff --git a/vendor/libgit2/examples/COPYING b/vendor/libgit2/examples/COPYING deleted file mode 100644 index 0e259d42c..000000000 --- a/vendor/libgit2/examples/COPYING +++ /dev/null @@ -1,121 +0,0 @@ -Creative Commons Legal Code - -CC0 1.0 Universal - - CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE - LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN - ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS - INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES - REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS - PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM - THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED - HEREUNDER. - -Statement of Purpose - -The laws of most jurisdictions throughout the world automatically confer -exclusive Copyright and Related Rights (defined below) upon the creator -and subsequent owner(s) (each and all, an "owner") of an original work of -authorship and/or a database (each, a "Work"). - -Certain owners wish to permanently relinquish those rights to a Work for -the purpose of contributing to a commons of creative, cultural and -scientific works ("Commons") that the public can reliably and without fear -of later claims of infringement build upon, modify, incorporate in other -works, reuse and redistribute as freely as possible in any form whatsoever -and for any purposes, including without limitation commercial purposes. -These owners may contribute to the Commons to promote the ideal of a free -culture and the further production of creative, cultural and scientific -works, or to gain reputation or greater distribution for their Work in -part through the use and efforts of others. - -For these and/or other purposes and motivations, and without any -expectation of additional consideration or compensation, the person -associating CC0 with a Work (the "Affirmer"), to the extent that he or she -is an owner of Copyright and Related Rights in the Work, voluntarily -elects to apply CC0 to the Work and publicly distribute the Work under its -terms, with knowledge of his or her Copyright and Related Rights in the -Work and the meaning and intended legal effect of CC0 on those rights. - -1. Copyright and Related Rights. A Work made available under CC0 may be -protected by copyright and related or neighboring rights ("Copyright and -Related Rights"). Copyright and Related Rights include, but are not -limited to, the following: - - i. the right to reproduce, adapt, distribute, perform, display, - communicate, and translate a Work; - ii. moral rights retained by the original author(s) and/or performer(s); -iii. publicity and privacy rights pertaining to a person's image or - likeness depicted in a Work; - iv. rights protecting against unfair competition in regards to a Work, - subject to the limitations in paragraph 4(a), below; - v. rights protecting the extraction, dissemination, use and reuse of data - in a Work; - vi. database rights (such as those arising under Directive 96/9/EC of the - European Parliament and of the Council of 11 March 1996 on the legal - protection of databases, and under any national implementation - thereof, including any amended or successor version of such - directive); and -vii. other similar, equivalent or corresponding rights throughout the - world based on applicable law or treaty, and any national - implementations thereof. - -2. Waiver. To the greatest extent permitted by, but not in contravention -of, applicable law, Affirmer hereby overtly, fully, permanently, -irrevocably and unconditionally waives, abandons, and surrenders all of -Affirmer's Copyright and Related Rights and associated claims and causes -of action, whether now known or unknown (including existing as well as -future claims and causes of action), in the Work (i) in all territories -worldwide, (ii) for the maximum duration provided by applicable law or -treaty (including future time extensions), (iii) in any current or future -medium and for any number of copies, and (iv) for any purpose whatsoever, -including without limitation commercial, advertising or promotional -purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each -member of the public at large and to the detriment of Affirmer's heirs and -successors, fully intending that such Waiver shall not be subject to -revocation, rescission, cancellation, termination, or any other legal or -equitable action to disrupt the quiet enjoyment of the Work by the public -as contemplated by Affirmer's express Statement of Purpose. - -3. Public License Fallback. Should any part of the Waiver for any reason -be judged legally invalid or ineffective under applicable law, then the -Waiver shall be preserved to the maximum extent permitted taking into -account Affirmer's express Statement of Purpose. In addition, to the -extent the Waiver is so judged Affirmer hereby grants to each affected -person a royalty-free, non transferable, non sublicensable, non exclusive, -irrevocable and unconditional license to exercise Affirmer's Copyright and -Related Rights in the Work (i) in all territories worldwide, (ii) for the -maximum duration provided by applicable law or treaty (including future -time extensions), (iii) in any current or future medium and for any number -of copies, and (iv) for any purpose whatsoever, including without -limitation commercial, advertising or promotional purposes (the -"License"). The License shall be deemed effective as of the date CC0 was -applied by Affirmer to the Work. Should any part of the License for any -reason be judged legally invalid or ineffective under applicable law, such -partial invalidity or ineffectiveness shall not invalidate the remainder -of the License, and in such case Affirmer hereby affirms that he or she -will not (i) exercise any of his or her remaining Copyright and Related -Rights in the Work or (ii) assert any associated claims and causes of -action with respect to the Work, in either case contrary to Affirmer's -express Statement of Purpose. - -4. Limitations and Disclaimers. - - a. No trademark or patent rights held by Affirmer are waived, abandoned, - surrendered, licensed or otherwise affected by this document. - b. Affirmer offers the Work as-is and makes no representations or - warranties of any kind concerning the Work, express, implied, - statutory or otherwise, including without limitation warranties of - title, merchantability, fitness for a particular purpose, non - infringement, or the absence of latent or other defects, accuracy, or - the present or absence of errors, whether or not discoverable, all to - the greatest extent permissible under applicable law. - c. Affirmer disclaims responsibility for clearing rights of other persons - that may apply to the Work or any use thereof, including without - limitation any person's Copyright and Related Rights in the Work. - Further, Affirmer disclaims responsibility for obtaining any necessary - consents, permissions or other rights required for any use of the - Work. - d. Affirmer understands and acknowledges that Creative Commons is not a - party to this document and has no duty or obligation with respect to - this CC0 or use of the Work. diff --git a/vendor/libgit2/examples/Makefile b/vendor/libgit2/examples/Makefile deleted file mode 100644 index bd7e92dc9..000000000 --- a/vendor/libgit2/examples/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -.PHONY: all - -CC = gcc -CFLAGS = -g -I../include -I../src -Wall -Wextra -Wmissing-prototypes -Wno-missing-field-initializers -LFLAGS = -L../build -lgit2 -lz -APPS = general showindex diff rev-list cat-file status log rev-parse init blame tag remote -APPS += for-each-ref -APPS += describe - -all: $(APPS) - -% : %.c - $(CC) -o $@ common.c $(CFLAGS) $< $(LFLAGS) - -clean: - $(RM) $(APPS) - $(RM) -r *.dSYM diff --git a/vendor/libgit2/examples/README.md b/vendor/libgit2/examples/README.md deleted file mode 100644 index 769c4b267..000000000 --- a/vendor/libgit2/examples/README.md +++ /dev/null @@ -1,22 +0,0 @@ -libgit2 examples -================ - -These examples are a mixture of basic emulation of core Git command line -functions and simple snippets demonstrating libgit2 API usage (for use -with Docurium). As a whole, they are not vetted carefully for bugs, error -handling, and cross-platform compatibility in the same manner as the rest -of the code in libgit2, so copy with caution. - -That being said, you are welcome to copy code from these examples as -desired when using libgit2. They have been [released to the public domain][cc0], -so there are no restrictions on their use. - -[cc0]: COPYING - -For annotated HTML versions, see the "Examples" section of: - - http://libgit2.github.com/libgit2 - -such as: - - http://libgit2.github.com/libgit2/ex/HEAD/general.html diff --git a/vendor/libgit2/examples/add.c b/vendor/libgit2/examples/add.c deleted file mode 100644 index 0101ab9ae..000000000 --- a/vendor/libgit2/examples/add.c +++ /dev/null @@ -1,159 +0,0 @@ -/* - * libgit2 "add" example - shows how to modify the index - * - * Written by the libgit2 contributors - * - * To the extent possible under law, the author(s) have dedicated all copyright - * and related and neighboring rights to this software to the public domain - * worldwide. This software is distributed without any warranty. - * - * You should have received a copy of the CC0 Public Domain Dedication along - * with this software. If not, see - * . - */ - -#include "common.h" -#include - -enum print_options { - SKIP = 1, - VERBOSE = 2, - UPDATE = 4, -}; - -struct print_payload { - enum print_options options; - git_repository *repo; -}; - -/* Forward declarations for helpers */ -static void parse_opts(int *options, int *count, int argc, char *argv[]); -void init_array(git_strarray *array, int argc, char **argv); -int print_matched_cb(const char *path, const char *matched_pathspec, void *payload); - -int main (int argc, char** argv) -{ - git_index_matched_path_cb matched_cb = NULL; - git_repository *repo = NULL; - git_index *index; - git_strarray array = {0}; - int options = 0, count = 0; - struct print_payload payload = {0}; - - git_libgit2_init(); - - parse_opts(&options, &count, argc, argv); - - init_array(&array, argc-count, argv+count); - - check_lg2(git_repository_open(&repo, "."), "No git repository", NULL); - check_lg2(git_repository_index(&index, repo), "Could not open repository index", NULL); - - if (options&VERBOSE || options&SKIP) { - matched_cb = &print_matched_cb; - } - - payload.options = options; - payload.repo = repo; - - if (options&UPDATE) { - git_index_update_all(index, &array, matched_cb, &payload); - } else { - git_index_add_all(index, &array, 0, matched_cb, &payload); - } - - git_index_write(index); - git_index_free(index); - git_repository_free(repo); - - git_libgit2_shutdown(); - - return 0; -} - -int print_matched_cb(const char *path, const char *matched_pathspec, void *payload) -{ - struct print_payload p = *(struct print_payload*)(payload); - int ret; - git_status_t status; - (void)matched_pathspec; - - if (git_status_file((unsigned int*)(&status), p.repo, path)) { - return -1; //abort - } - - if (status & GIT_STATUS_WT_MODIFIED || - status & GIT_STATUS_WT_NEW) { - printf("add '%s'\n", path); - ret = 0; - } else { - ret = 1; - } - - if(p.options & SKIP) { - ret = 1; - } - - return ret; -} - -void init_array(git_strarray *array, int argc, char **argv) -{ - unsigned int i; - - array->count = argc; - array->strings = malloc(sizeof(char*) * array->count); - assert(array->strings!=NULL); - - for(i=0; icount; i++) { - array->strings[i]=argv[i]; - } - - return; -} - -void print_usage(void) -{ - fprintf(stderr, "usage: add [options] [--] file-spec [file-spec] [...]\n\n"); - fprintf(stderr, "\t-n, --dry-run dry run\n"); - fprintf(stderr, "\t-v, --verbose be verbose\n"); - fprintf(stderr, "\t-u, --update update tracked files\n"); - exit(1); -} - -static void parse_opts(int *options, int *count, int argc, char *argv[]) -{ - int i; - - for (i = 1; i < argc; ++i) { - if (argv[i][0] != '-') { - break; - } - else if(!strcmp(argv[i], "--verbose") || !strcmp(argv[i], "-v")) { - *options |= VERBOSE; - } - else if(!strcmp(argv[i], "--dry-run") || !strcmp(argv[i], "-n")) { - *options |= SKIP; - } - else if(!strcmp(argv[i], "--update") || !strcmp(argv[i], "-u")) { - *options |= UPDATE; - } - else if(!strcmp(argv[i], "-h")) { - print_usage(); - break; - } - else if(!strcmp(argv[i], "--")) { - i++; - break; - } - else { - fprintf(stderr, "Unsupported option %s.\n", argv[i]); - print_usage(); - } - } - - if (argc<=i) - print_usage(); - - *count = i; -} diff --git a/vendor/libgit2/examples/blame.c b/vendor/libgit2/examples/blame.c deleted file mode 100644 index 9288352e2..000000000 --- a/vendor/libgit2/examples/blame.c +++ /dev/null @@ -1,212 +0,0 @@ -/* - * libgit2 "blame" example - shows how to use the blame API - * - * Written by the libgit2 contributors - * - * To the extent possible under law, the author(s) have dedicated all copyright - * and related and neighboring rights to this software to the public domain - * worldwide. This software is distributed without any warranty. - * - * You should have received a copy of the CC0 Public Domain Dedication along - * with this software. If not, see - * . - */ - -#include "common.h" - -#ifdef _MSC_VER -#define snprintf sprintf_s -#define strcasecmp strcmpi -#endif - -/** - * This example demonstrates how to invoke the libgit2 blame API to roughly - * simulate the output of `git blame` and a few of its command line arguments. - */ - -struct opts { - char *path; - char *commitspec; - int C; - int M; - int start_line; - int end_line; - int F; -}; -static void parse_opts(struct opts *o, int argc, char *argv[]); - -int main(int argc, char *argv[]) -{ - int line, break_on_null_hunk; - size_t i, rawsize; - char spec[1024] = {0}; - struct opts o = {0}; - const char *rawdata; - git_repository *repo = NULL; - git_revspec revspec = {0}; - git_blame_options blameopts = GIT_BLAME_OPTIONS_INIT; - git_blame *blame = NULL; - git_blob *blob; - git_object *obj; - - git_libgit2_init(); - - parse_opts(&o, argc, argv); - if (o.M) blameopts.flags |= GIT_BLAME_TRACK_COPIES_SAME_COMMIT_MOVES; - if (o.C) blameopts.flags |= GIT_BLAME_TRACK_COPIES_SAME_COMMIT_COPIES; - if (o.F) blameopts.flags |= GIT_BLAME_FIRST_PARENT; - - /** Open the repository. */ - check_lg2(git_repository_open_ext(&repo, ".", 0, NULL), "Couldn't open repository", NULL); - - /** - * The commit range comes in "commitish" form. Use the rev-parse API to - * nail down the end points. - */ - if (o.commitspec) { - check_lg2(git_revparse(&revspec, repo, o.commitspec), "Couldn't parse commit spec", NULL); - if (revspec.flags & GIT_REVPARSE_SINGLE) { - git_oid_cpy(&blameopts.newest_commit, git_object_id(revspec.from)); - git_object_free(revspec.from); - } else { - git_oid_cpy(&blameopts.oldest_commit, git_object_id(revspec.from)); - git_oid_cpy(&blameopts.newest_commit, git_object_id(revspec.to)); - git_object_free(revspec.from); - git_object_free(revspec.to); - } - } - - /** Run the blame. */ - check_lg2(git_blame_file(&blame, repo, o.path, &blameopts), "Blame error", NULL); - - /** - * Get the raw data inside the blob for output. We use the - * `commitish:path/to/file.txt` format to find it. - */ - if (git_oid_iszero(&blameopts.newest_commit)) - strcpy(spec, "HEAD"); - else - git_oid_tostr(spec, sizeof(spec), &blameopts.newest_commit); - strcat(spec, ":"); - strcat(spec, o.path); - - check_lg2(git_revparse_single(&obj, repo, spec), "Object lookup error", NULL); - check_lg2(git_blob_lookup(&blob, repo, git_object_id(obj)), "Blob lookup error", NULL); - git_object_free(obj); - - rawdata = git_blob_rawcontent(blob); - rawsize = git_blob_rawsize(blob); - - /** Produce the output. */ - line = 1; - i = 0; - break_on_null_hunk = 0; - while (i < rawsize) { - const char *eol = memchr(rawdata + i, '\n', rawsize - i); - char oid[10] = {0}; - const git_blame_hunk *hunk = git_blame_get_hunk_byline(blame, line); - - if (break_on_null_hunk && !hunk) - break; - - if (hunk) { - char sig[128] = {0}; - break_on_null_hunk = 1; - - git_oid_tostr(oid, 10, &hunk->final_commit_id); - snprintf(sig, 30, "%s <%s>", hunk->final_signature->name, hunk->final_signature->email); - - printf("%s ( %-30s %3d) %.*s\n", - oid, - sig, - line, - (int)(eol - rawdata - i), - rawdata + i); - } - - i = (int)(eol - rawdata + 1); - line++; - } - - /** Cleanup. */ - git_blob_free(blob); - git_blame_free(blame); - git_repository_free(repo); - - git_libgit2_shutdown(); - - return 0; -} - -/** Tell the user how to make this thing work. */ -static void usage(const char *msg, const char *arg) -{ - if (msg && arg) - fprintf(stderr, "%s: %s\n", msg, arg); - else if (msg) - fprintf(stderr, "%s\n", msg); - fprintf(stderr, "usage: blame [options] [] \n"); - fprintf(stderr, "\n"); - fprintf(stderr, " example: `HEAD~10..HEAD`, or `1234abcd`\n"); - fprintf(stderr, " -L process only line range n-m, counting from 1\n"); - fprintf(stderr, " -M find line moves within and across files\n"); - fprintf(stderr, " -C find line copies within and across files\n"); - fprintf(stderr, " -F follow only the first parent commits\n"); - fprintf(stderr, "\n"); - exit(1); -} - -/** Parse the arguments. */ -static void parse_opts(struct opts *o, int argc, char *argv[]) -{ - int i; - char *bare_args[3] = {0}; - - if (argc < 2) usage(NULL, NULL); - - for (i=1; i= 3) - usage("Invalid argument set", NULL); - bare_args[i] = a; - } - else if (!strcmp(a, "--")) - continue; - else if (!strcasecmp(a, "-M")) - o->M = 1; - else if (!strcasecmp(a, "-C")) - o->C = 1; - else if (!strcasecmp(a, "-F")) - o->F = 1; - else if (!strcasecmp(a, "-L")) { - i++; a = argv[i]; - if (i >= argc) fatal("Not enough arguments to -L", NULL); - check_lg2(sscanf(a, "%d,%d", &o->start_line, &o->end_line)-2, "-L format error", NULL); - } - else { - /* commit range */ - if (o->commitspec) fatal("Only one commit spec allowed", NULL); - o->commitspec = a; - } - } - - /* Handle the bare arguments */ - if (!bare_args[0]) usage("Please specify a path", NULL); - o->path = bare_args[0]; - if (bare_args[1]) { - /* */ - o->path = bare_args[1]; - o->commitspec = bare_args[0]; - } - if (bare_args[2]) { - /* */ - char spec[128] = {0}; - o->path = bare_args[2]; - sprintf(spec, "%s..%s", bare_args[0], bare_args[1]); - o->commitspec = spec; - } -} diff --git a/vendor/libgit2/examples/cat-file.c b/vendor/libgit2/examples/cat-file.c deleted file mode 100644 index f948740a1..000000000 --- a/vendor/libgit2/examples/cat-file.c +++ /dev/null @@ -1,246 +0,0 @@ -/* - * libgit2 "cat-file" example - shows how to print data from the ODB - * - * Written by the libgit2 contributors - * - * To the extent possible under law, the author(s) have dedicated all copyright - * and related and neighboring rights to this software to the public domain - * worldwide. This software is distributed without any warranty. - * - * You should have received a copy of the CC0 Public Domain Dedication along - * with this software. If not, see - * . - */ - -#include "common.h" - -static void print_signature(const char *header, const git_signature *sig) -{ - char sign; - int offset, hours, minutes; - - if (!sig) - return; - - offset = sig->when.offset; - if (offset < 0) { - sign = '-'; - offset = -offset; - } else { - sign = '+'; - } - - hours = offset / 60; - minutes = offset % 60; - - printf("%s %s <%s> %ld %c%02d%02d\n", - header, sig->name, sig->email, (long)sig->when.time, - sign, hours, minutes); -} - -/** Printing out a blob is simple, get the contents and print */ -static void show_blob(const git_blob *blob) -{ - /* ? Does this need crlf filtering? */ - fwrite(git_blob_rawcontent(blob), (size_t)git_blob_rawsize(blob), 1, stdout); -} - -/** Show each entry with its type, id and attributes */ -static void show_tree(const git_tree *tree) -{ - size_t i, max_i = (int)git_tree_entrycount(tree); - char oidstr[GIT_OID_HEXSZ + 1]; - const git_tree_entry *te; - - for (i = 0; i < max_i; ++i) { - te = git_tree_entry_byindex(tree, i); - - git_oid_tostr(oidstr, sizeof(oidstr), git_tree_entry_id(te)); - - printf("%06o %s %s\t%s\n", - git_tree_entry_filemode(te), - git_object_type2string(git_tree_entry_type(te)), - oidstr, git_tree_entry_name(te)); - } -} - -/** - * Commits and tags have a few interesting fields in their header. - */ -static void show_commit(const git_commit *commit) -{ - unsigned int i, max_i; - char oidstr[GIT_OID_HEXSZ + 1]; - - git_oid_tostr(oidstr, sizeof(oidstr), git_commit_tree_id(commit)); - printf("tree %s\n", oidstr); - - max_i = (unsigned int)git_commit_parentcount(commit); - for (i = 0; i < max_i; ++i) { - git_oid_tostr(oidstr, sizeof(oidstr), git_commit_parent_id(commit, i)); - printf("parent %s\n", oidstr); - } - - print_signature("author", git_commit_author(commit)); - print_signature("committer", git_commit_committer(commit)); - - if (git_commit_message(commit)) - printf("\n%s\n", git_commit_message(commit)); -} - -static void show_tag(const git_tag *tag) -{ - char oidstr[GIT_OID_HEXSZ + 1]; - - git_oid_tostr(oidstr, sizeof(oidstr), git_tag_target_id(tag));; - printf("object %s\n", oidstr); - printf("type %s\n", git_object_type2string(git_tag_target_type(tag))); - printf("tag %s\n", git_tag_name(tag)); - print_signature("tagger", git_tag_tagger(tag)); - - if (git_tag_message(tag)) - printf("\n%s\n", git_tag_message(tag)); -} - -enum { - SHOW_TYPE = 1, - SHOW_SIZE = 2, - SHOW_NONE = 3, - SHOW_PRETTY = 4 -}; - -/* Forward declarations for option-parsing helper */ -struct opts { - const char *dir; - const char *rev; - int action; - int verbose; -}; -static void parse_opts(struct opts *o, int argc, char *argv[]); - - -/** Entry point for this command */ -int main(int argc, char *argv[]) -{ - git_repository *repo; - struct opts o = { ".", NULL, 0, 0 }; - git_object *obj = NULL; - char oidstr[GIT_OID_HEXSZ + 1]; - - git_libgit2_init(); - - parse_opts(&o, argc, argv); - - check_lg2(git_repository_open_ext(&repo, o.dir, 0, NULL), - "Could not open repository", NULL); - check_lg2(git_revparse_single(&obj, repo, o.rev), - "Could not resolve", o.rev); - - if (o.verbose) { - char oidstr[GIT_OID_HEXSZ + 1]; - git_oid_tostr(oidstr, sizeof(oidstr), git_object_id(obj)); - - printf("%s %s\n--\n", - git_object_type2string(git_object_type(obj)), oidstr); - } - - switch (o.action) { - case SHOW_TYPE: - printf("%s\n", git_object_type2string(git_object_type(obj))); - break; - case SHOW_SIZE: { - git_odb *odb; - git_odb_object *odbobj; - - check_lg2(git_repository_odb(&odb, repo), "Could not open ODB", NULL); - check_lg2(git_odb_read(&odbobj, odb, git_object_id(obj)), - "Could not find obj", NULL); - - printf("%ld\n", (long)git_odb_object_size(odbobj)); - - git_odb_object_free(odbobj); - git_odb_free(odb); - } - break; - case SHOW_NONE: - /* just want return result */ - break; - case SHOW_PRETTY: - - switch (git_object_type(obj)) { - case GIT_OBJ_BLOB: - show_blob((const git_blob *)obj); - break; - case GIT_OBJ_COMMIT: - show_commit((const git_commit *)obj); - break; - case GIT_OBJ_TREE: - show_tree((const git_tree *)obj); - break; - case GIT_OBJ_TAG: - show_tag((const git_tag *)obj); - break; - default: - printf("unknown %s\n", oidstr); - break; - } - break; - } - - git_object_free(obj); - git_repository_free(repo); - - git_libgit2_shutdown(); - - return 0; -} - -/** Print out usage information */ -static void usage(const char *message, const char *arg) -{ - if (message && arg) - fprintf(stderr, "%s: %s\n", message, arg); - else if (message) - fprintf(stderr, "%s\n", message); - fprintf(stderr, - "usage: cat-file (-t | -s | -e | -p) [-v] [-q] " - "[-h|--help] [--git-dir=] \n"); - exit(1); -} - -/** Parse the command-line options taken from git */ -static void parse_opts(struct opts *o, int argc, char *argv[]) -{ - struct args_info args = ARGS_INFO_INIT; - - for (args.pos = 1; args.pos < argc; ++args.pos) { - char *a = argv[args.pos]; - - if (a[0] != '-') { - if (o->rev != NULL) - usage("Only one rev should be provided", NULL); - else - o->rev = a; - } - else if (!strcmp(a, "-t")) - o->action = SHOW_TYPE; - else if (!strcmp(a, "-s")) - o->action = SHOW_SIZE; - else if (!strcmp(a, "-e")) - o->action = SHOW_NONE; - else if (!strcmp(a, "-p")) - o->action = SHOW_PRETTY; - else if (!strcmp(a, "-q")) - o->verbose = 0; - else if (!strcmp(a, "-v")) - o->verbose = 1; - else if (!strcmp(a, "--help") || !strcmp(a, "-h")) - usage(NULL, NULL); - else if (!match_str_arg(&o->dir, &args, "--git-dir")) - usage("Unknown option", a); - } - - if (!o->action || !o->rev) - usage(NULL, NULL); - -} diff --git a/vendor/libgit2/examples/common.c b/vendor/libgit2/examples/common.c deleted file mode 100644 index 0f25f3787..000000000 --- a/vendor/libgit2/examples/common.c +++ /dev/null @@ -1,218 +0,0 @@ -/* - * Utilities library for libgit2 examples - * - * Written by the libgit2 contributors - * - * To the extent possible under law, the author(s) have dedicated all copyright - * and related and neighboring rights to this software to the public domain - * worldwide. This software is distributed without any warranty. - * - * You should have received a copy of the CC0 Public Domain Dedication along - * with this software. If not, see - * . - */ - -#include "common.h" - -void check_lg2(int error, const char *message, const char *extra) -{ - const git_error *lg2err; - const char *lg2msg = "", *lg2spacer = ""; - - if (!error) - return; - - if ((lg2err = giterr_last()) != NULL && lg2err->message != NULL) { - lg2msg = lg2err->message; - lg2spacer = " - "; - } - - if (extra) - fprintf(stderr, "%s '%s' [%d]%s%s\n", - message, extra, error, lg2spacer, lg2msg); - else - fprintf(stderr, "%s [%d]%s%s\n", - message, error, lg2spacer, lg2msg); - - exit(1); -} - -void fatal(const char *message, const char *extra) -{ - if (extra) - fprintf(stderr, "%s %s\n", message, extra); - else - fprintf(stderr, "%s\n", message); - - exit(1); -} - -size_t is_prefixed(const char *str, const char *pfx) -{ - size_t len = strlen(pfx); - return strncmp(str, pfx, len) ? 0 : len; -} - -int optional_str_arg( - const char **out, struct args_info *args, const char *opt, const char *def) -{ - const char *found = args->argv[args->pos]; - size_t len = is_prefixed(found, opt); - - if (!len) - return 0; - - if (!found[len]) { - if (args->pos + 1 == args->argc) { - *out = def; - return 1; - } - args->pos += 1; - *out = args->argv[args->pos]; - return 1; - } - - if (found[len] == '=') { - *out = found + len + 1; - return 1; - } - - return 0; -} - -int match_str_arg( - const char **out, struct args_info *args, const char *opt) -{ - const char *found = args->argv[args->pos]; - size_t len = is_prefixed(found, opt); - - if (!len) - return 0; - - if (!found[len]) { - if (args->pos + 1 == args->argc) - fatal("expected value following argument", opt); - args->pos += 1; - *out = args->argv[args->pos]; - return 1; - } - - if (found[len] == '=') { - *out = found + len + 1; - return 1; - } - - return 0; -} - -static const char *match_numeric_arg(struct args_info *args, const char *opt) -{ - const char *found = args->argv[args->pos]; - size_t len = is_prefixed(found, opt); - - if (!len) - return NULL; - - if (!found[len]) { - if (args->pos + 1 == args->argc) - fatal("expected numeric value following argument", opt); - args->pos += 1; - found = args->argv[args->pos]; - } else { - found = found + len; - if (*found == '=') - found++; - } - - return found; -} - -int match_uint16_arg( - uint16_t *out, struct args_info *args, const char *opt) -{ - const char *found = match_numeric_arg(args, opt); - uint16_t val; - char *endptr = NULL; - - if (!found) - return 0; - - val = (uint16_t)strtoul(found, &endptr, 0); - if (!endptr || *endptr != '\0') - fatal("expected number after argument", opt); - - if (out) - *out = val; - return 1; -} - -static int match_int_internal( - int *out, const char *str, int allow_negative, const char *opt) -{ - char *endptr = NULL; - int val = (int)strtol(str, &endptr, 10); - - if (!endptr || *endptr != '\0') - fatal("expected number", opt); - else if (val < 0 && !allow_negative) - fatal("negative values are not allowed", opt); - - if (out) - *out = val; - - return 1; -} - -int is_integer(int *out, const char *str, int allow_negative) -{ - return match_int_internal(out, str, allow_negative, NULL); -} - -int match_int_arg( - int *out, struct args_info *args, const char *opt, int allow_negative) -{ - const char *found = match_numeric_arg(args, opt); - if (!found) - return 0; - return match_int_internal(out, found, allow_negative, opt); -} - -int diff_output( - const git_diff_delta *d, - const git_diff_hunk *h, - const git_diff_line *l, - void *p) -{ - FILE *fp = (FILE*)p; - - (void)d; (void)h; - - if (!fp) - fp = stdout; - - if (l->origin == GIT_DIFF_LINE_CONTEXT || - l->origin == GIT_DIFF_LINE_ADDITION || - l->origin == GIT_DIFF_LINE_DELETION) - fputc(l->origin, fp); - - fwrite(l->content, 1, l->content_len, fp); - - return 0; -} - -void treeish_to_tree( - git_tree **out, git_repository *repo, const char *treeish) -{ - git_object *obj = NULL; - - check_lg2( - git_revparse_single(&obj, repo, treeish), - "looking up object", treeish); - - check_lg2( - git_object_peel((git_object **)out, obj, GIT_OBJ_TREE), - "resolving object to tree", treeish); - - git_object_free(obj); -} - diff --git a/vendor/libgit2/examples/common.h b/vendor/libgit2/examples/common.h deleted file mode 100644 index b9fa37ce9..000000000 --- a/vendor/libgit2/examples/common.h +++ /dev/null @@ -1,96 +0,0 @@ -/* - * Utilities library for libgit2 examples - * - * Written by the libgit2 contributors - * - * To the extent possible under law, the author(s) have dedicated all copyright - * and related and neighboring rights to this software to the public domain - * worldwide. This software is distributed without any warranty. - * - * You should have received a copy of the CC0 Public Domain Dedication along - * with this software. If not, see - * . - */ - -#include -#include -#include -#include - -/** - * Check libgit2 error code, printing error to stderr on failure and - * exiting the program. - */ -extern void check_lg2(int error, const char *message, const char *extra); - -/** - * Exit the program, printing error to stderr - */ -extern void fatal(const char *message, const char *extra); - -/** - * Check if a string has the given prefix. Returns 0 if not prefixed - * or the length of the prefix if it is. - */ -extern size_t is_prefixed(const char *str, const char *pfx); - -/** - * Match an integer string, returning 1 if matched, 0 if not. - */ -extern int is_integer(int *out, const char *str, int allow_negative); - -struct args_info { - int argc; - char **argv; - int pos; -}; -#define ARGS_INFO_INIT { argc, argv, 0 } - -/** - * Check current `args` entry against `opt` string. If it matches - * exactly, take the next arg as a string; if it matches as a prefix with - * an equal sign, take the remainder as a string; if value not supplied, - * default value `def` will be given. otherwise return 0. - */ -extern int optional_str_arg( - const char **out, struct args_info *args, const char *opt, const char *def); - -/** - * Check current `args` entry against `opt` string. If it matches - * exactly, take the next arg as a string; if it matches as a prefix with - * an equal sign, take the remainder as a string; otherwise return 0. - */ -extern int match_str_arg( - const char **out, struct args_info *args, const char *opt); - -/** - * Check current `args` entry against `opt` string parsing as uint16. If - * `opt` matches exactly, take the next arg as a uint16_t value; if `opt` - * is a prefix (equal sign optional), take the remainder of the arg as a - * uint16_t value; otherwise return 0. - */ -extern int match_uint16_arg( - uint16_t *out, struct args_info *args, const char *opt); - -/** - * Check current `args` entry against `opt` string parsing as int. If - * `opt` matches exactly, take the next arg as an int value; if it matches - * as a prefix (equal sign optional), take the remainder of the arg as a - * int value; otherwise return 0. - */ -extern int match_int_arg( - int *out, struct args_info *args, const char *opt, int allow_negative); - -/** - * Basic output function for plain text diff output - * Pass `FILE*` such as `stdout` or `stderr` as payload (or NULL == `stdout`) - */ -extern int diff_output( - const git_diff_delta*, const git_diff_hunk*, const git_diff_line*, void*); - -/** - * Convert a treeish argument to an actual tree; this will call check_lg2 - * and exit the program if `treeish` cannot be resolved to a tree - */ -extern void treeish_to_tree( - git_tree **out, git_repository *repo, const char *treeish); diff --git a/vendor/libgit2/examples/describe.c b/vendor/libgit2/examples/describe.c deleted file mode 100644 index 4cdf61f75..000000000 --- a/vendor/libgit2/examples/describe.c +++ /dev/null @@ -1,184 +0,0 @@ -/* - * libgit2 "describe" example - shows how to describe commits - * - * Written by the libgit2 contributors - * - * To the extent possible under law, the author(s) have dedicated all copyright - * and related and neighboring rights to this software to the public domain - * worldwide. This software is distributed without any warranty. - * - * You should have received a copy of the CC0 Public Domain Dedication along - * with this software. If not, see - * . - */ - -#include "common.h" -#include - -/** - * The following example partially reimplements the `git describe` command - * and some of its options. - * - * These commands should work: - - * - Describe HEAD with default options (`describe`) - * - Describe specified revision (`describe master~2`) - * - Describe specified revisions (`describe master~2 HEAD~3`) - * - Describe HEAD with dirty state suffix (`describe --dirty=*`) - * - Describe consider all refs (`describe --all master`) - * - Describe consider lightweight tags (`describe --tags temp-tag`) - * - Describe show non-default abbreviated size (`describe --abbrev=10`) - * - Describe always output the long format if matches a tag (`describe --long v1.0`) - * - Describe consider only tags of specified pattern (`describe --match v*-release`) - * - Describe show the fallback result (`describe --always`) - * - Describe follow only the first parent commit (`describe --first-parent`) - * - * The command line parsing logic is simplified and doesn't handle - * all of the use cases. - */ - -/** describe_options represents the parsed command line options */ -typedef struct { - const char **commits; - size_t commit_count; - git_describe_options describe_options; - git_describe_format_options format_options; -} describe_options; - -typedef struct args_info args_info; - -static void *xrealloc(void *oldp, size_t newsz) -{ - void *p = realloc(oldp, newsz); - if (p == NULL) { - fprintf(stderr, "Cannot allocate memory, exiting.\n"); - exit(1); - } - return p; -} - -static void opts_add_commit(describe_options *opts, const char *commit) -{ - size_t sz; - - assert(opts != NULL); - - sz = ++opts->commit_count * sizeof(opts->commits[0]); - opts->commits = xrealloc(opts->commits, sz); - opts->commits[opts->commit_count - 1] = commit; -} - -static void do_describe_single(git_repository *repo, describe_options *opts, const char *rev) -{ - git_object *commit; - git_describe_result *describe_result; - git_buf buf = { 0 }; - - if (rev) { - check_lg2(git_revparse_single(&commit, repo, rev), - "Failed to lookup rev", rev); - - check_lg2(git_describe_commit(&describe_result, commit, &opts->describe_options), - "Failed to describe rev", rev); - } - else - check_lg2(git_describe_workdir(&describe_result, repo, &opts->describe_options), - "Failed to describe workdir", NULL); - - check_lg2(git_describe_format(&buf, describe_result, &opts->format_options), - "Failed to format describe rev", rev); - - printf("%s\n", buf.ptr); -} - -static void do_describe(git_repository *repo, describe_options *opts) -{ - if (opts->commit_count == 0) - do_describe_single(repo, opts, NULL); - else - { - size_t i; - for (i = 0; i < opts->commit_count; i++) - do_describe_single(repo, opts, opts->commits[i]); - } -} - -static void print_usage(void) -{ - fprintf(stderr, "usage: see `git help describe`\n"); - exit(1); -} - -/** Parse command line arguments */ -static void parse_options(describe_options *opts, int argc, char **argv) -{ - args_info args = ARGS_INFO_INIT; - - for (args.pos = 1; args.pos < argc; ++args.pos) { - const char *curr = argv[args.pos]; - - if (curr[0] != '-') { - opts_add_commit(opts, curr); - } else if (!strcmp(curr, "--all")) { - opts->describe_options.describe_strategy = GIT_DESCRIBE_ALL; - } else if (!strcmp(curr, "--tags")) { - opts->describe_options.describe_strategy = GIT_DESCRIBE_TAGS; - } else if (!strcmp(curr, "--exact-match")) { - opts->describe_options.max_candidates_tags = 0; - } else if (!strcmp(curr, "--long")) { - opts->format_options.always_use_long_format = 1; - } else if (!strcmp(curr, "--always")) { - opts->describe_options.show_commit_oid_as_fallback = 1; - } else if (!strcmp(curr, "--first-parent")) { - opts->describe_options.only_follow_first_parent = 1; - } else if (optional_str_arg(&opts->format_options.dirty_suffix, &args, "--dirty", "-dirty")) { - } else if (match_int_arg((int *)&opts->format_options.abbreviated_size, &args, "--abbrev", 0)) { - } else if (match_int_arg((int *)&opts->describe_options.max_candidates_tags, &args, "--candidates", 0)) { - } else if (match_str_arg(&opts->describe_options.pattern, &args, "--match")) { - } else { - print_usage(); - } - } - - if (opts->commit_count > 0) { - if (opts->format_options.dirty_suffix) - fatal("--dirty is incompatible with commit-ishes", NULL); - } - else { - if (!opts->format_options.dirty_suffix || !opts->format_options.dirty_suffix[0]) { - opts_add_commit(opts, "HEAD"); - } - } -} - -/** Initialize describe_options struct */ -static void describe_options_init(describe_options *opts) -{ - memset(opts, 0, sizeof(*opts)); - - opts->commits = NULL; - opts->commit_count = 0; - git_describe_init_options(&opts->describe_options, GIT_DESCRIBE_OPTIONS_VERSION); - git_describe_init_format_options(&opts->format_options, GIT_DESCRIBE_FORMAT_OPTIONS_VERSION); -} - -int main(int argc, char **argv) -{ - git_repository *repo; - describe_options opts; - - git_libgit2_init(); - - check_lg2(git_repository_open_ext(&repo, ".", 0, NULL), - "Could not open repository", NULL); - - describe_options_init(&opts); - parse_options(&opts, argc, argv); - - do_describe(repo, &opts); - - git_repository_free(repo); - git_libgit2_shutdown(); - - return 0; -} diff --git a/vendor/libgit2/examples/diff.c b/vendor/libgit2/examples/diff.c deleted file mode 100644 index b69cb2218..000000000 --- a/vendor/libgit2/examples/diff.c +++ /dev/null @@ -1,337 +0,0 @@ -/* - * libgit2 "diff" example - shows how to use the diff API - * - * Written by the libgit2 contributors - * - * To the extent possible under law, the author(s) have dedicated all copyright - * and related and neighboring rights to this software to the public domain - * worldwide. This software is distributed without any warranty. - * - * You should have received a copy of the CC0 Public Domain Dedication along - * with this software. If not, see - * . - */ - -#include "common.h" - -/** - * This example demonstrates the use of the libgit2 diff APIs to - * create `git_diff` objects and display them, emulating a number of - * core Git `diff` command line options. - * - * This covers on a portion of the core Git diff options and doesn't - * have particularly good error handling, but it should show most of - * the core libgit2 diff APIs, including various types of diffs and - * how to do renaming detection and patch formatting. - */ - -static const char *colors[] = { - "\033[m", /* reset */ - "\033[1m", /* bold */ - "\033[31m", /* red */ - "\033[32m", /* green */ - "\033[36m" /* cyan */ -}; - -enum { - OUTPUT_DIFF = (1 << 0), - OUTPUT_STAT = (1 << 1), - OUTPUT_SHORTSTAT = (1 << 2), - OUTPUT_NUMSTAT = (1 << 3), - OUTPUT_SUMMARY = (1 << 4) -}; - -enum { - CACHE_NORMAL = 0, - CACHE_ONLY = 1, - CACHE_NONE = 2 -}; - -/** The 'opts' struct captures all the various parsed command line options. */ -struct opts { - git_diff_options diffopts; - git_diff_find_options findopts; - int color; - int cache; - int output; - git_diff_format_t format; - const char *treeish1; - const char *treeish2; - const char *dir; -}; - -/** These functions are implemented at the end */ -static void usage(const char *message, const char *arg); -static void parse_opts(struct opts *o, int argc, char *argv[]); -static int color_printer( - const git_diff_delta*, const git_diff_hunk*, const git_diff_line*, void*); -static void diff_print_stats(git_diff *diff, struct opts *o); - -int main(int argc, char *argv[]) -{ - git_repository *repo = NULL; - git_tree *t1 = NULL, *t2 = NULL; - git_diff *diff; - struct opts o = { - GIT_DIFF_OPTIONS_INIT, GIT_DIFF_FIND_OPTIONS_INIT, - -1, 0, 0, GIT_DIFF_FORMAT_PATCH, NULL, NULL, "." - }; - - git_libgit2_init(); - - parse_opts(&o, argc, argv); - - check_lg2(git_repository_open_ext(&repo, o.dir, 0, NULL), - "Could not open repository", o.dir); - - /** - * Possible argument patterns: - * - * * <sha1> <sha2> - * * <sha1> --cached - * * <sha1> - * * --cached - * * --nocache (don't use index data in diff at all) - * * nothing - * - * Currently ranged arguments like <sha1>..<sha2> and <sha1>...<sha2> - * are not supported in this example - */ - - if (o.treeish1) - treeish_to_tree(&t1, repo, o.treeish1); - if (o.treeish2) - treeish_to_tree(&t2, repo, o.treeish2); - - if (t1 && t2) - check_lg2( - git_diff_tree_to_tree(&diff, repo, t1, t2, &o.diffopts), - "diff trees", NULL); - else if (o.cache != CACHE_NORMAL) { - if (!t1) - treeish_to_tree(&t1, repo, "HEAD"); - - if (o.cache == CACHE_NONE) - check_lg2( - git_diff_tree_to_workdir(&diff, repo, t1, &o.diffopts), - "diff tree to working directory", NULL); - else - check_lg2( - git_diff_tree_to_index(&diff, repo, t1, NULL, &o.diffopts), - "diff tree to index", NULL); - } - else if (t1) - check_lg2( - git_diff_tree_to_workdir_with_index(&diff, repo, t1, &o.diffopts), - "diff tree to working directory", NULL); - else - check_lg2( - git_diff_index_to_workdir(&diff, repo, NULL, &o.diffopts), - "diff index to working directory", NULL); - - /** Apply rename and copy detection if requested. */ - - if ((o.findopts.flags & GIT_DIFF_FIND_ALL) != 0) - check_lg2( - git_diff_find_similar(diff, &o.findopts), - "finding renames and copies", NULL); - - /** Generate simple output using libgit2 display helper. */ - - if (!o.output) - o.output = OUTPUT_DIFF; - - if (o.output != OUTPUT_DIFF) - diff_print_stats(diff, &o); - - if ((o.output & OUTPUT_DIFF) != 0) { - if (o.color >= 0) - fputs(colors[0], stdout); - - check_lg2( - git_diff_print(diff, o.format, color_printer, &o.color), - "displaying diff", NULL); - - if (o.color >= 0) - fputs(colors[0], stdout); - } - - /** Cleanup before exiting. */ - - git_diff_free(diff); - git_tree_free(t1); - git_tree_free(t2); - git_repository_free(repo); - - git_libgit2_shutdown(); - - return 0; -} - -static void usage(const char *message, const char *arg) -{ - if (message && arg) - fprintf(stderr, "%s: %s\n", message, arg); - else if (message) - fprintf(stderr, "%s\n", message); - fprintf(stderr, "usage: diff [ []]\n"); - exit(1); -} - -/** This implements very rudimentary colorized output. */ -static int color_printer( - const git_diff_delta *delta, - const git_diff_hunk *hunk, - const git_diff_line *line, - void *data) -{ - int *last_color = data, color = 0; - - (void)delta; (void)hunk; - - if (*last_color >= 0) { - switch (line->origin) { - case GIT_DIFF_LINE_ADDITION: color = 3; break; - case GIT_DIFF_LINE_DELETION: color = 2; break; - case GIT_DIFF_LINE_ADD_EOFNL: color = 3; break; - case GIT_DIFF_LINE_DEL_EOFNL: color = 2; break; - case GIT_DIFF_LINE_FILE_HDR: color = 1; break; - case GIT_DIFF_LINE_HUNK_HDR: color = 4; break; - default: break; - } - - if (color != *last_color) { - if (*last_color == 1 || color == 1) - fputs(colors[0], stdout); - fputs(colors[color], stdout); - *last_color = color; - } - } - - return diff_output(delta, hunk, line, stdout); -} - -/** Parse arguments as copied from git-diff. */ -static void parse_opts(struct opts *o, int argc, char *argv[]) -{ - struct args_info args = ARGS_INFO_INIT; - - - for (args.pos = 1; args.pos < argc; ++args.pos) { - const char *a = argv[args.pos]; - - if (a[0] != '-') { - if (o->treeish1 == NULL) - o->treeish1 = a; - else if (o->treeish2 == NULL) - o->treeish2 = a; - else - usage("Only one or two tree identifiers can be provided", NULL); - } - else if (!strcmp(a, "-p") || !strcmp(a, "-u") || - !strcmp(a, "--patch")) { - o->output |= OUTPUT_DIFF; - o->format = GIT_DIFF_FORMAT_PATCH; - } - else if (!strcmp(a, "--cached")) - o->cache = CACHE_ONLY; - else if (!strcmp(a, "--nocache")) - o->cache = CACHE_NONE; - else if (!strcmp(a, "--name-only") || !strcmp(a, "--format=name")) - o->format = GIT_DIFF_FORMAT_NAME_ONLY; - else if (!strcmp(a, "--name-status") || - !strcmp(a, "--format=name-status")) - o->format = GIT_DIFF_FORMAT_NAME_STATUS; - else if (!strcmp(a, "--raw") || !strcmp(a, "--format=raw")) - o->format = GIT_DIFF_FORMAT_RAW; - else if (!strcmp(a, "--format=diff-index")) { - o->format = GIT_DIFF_FORMAT_RAW; - o->diffopts.id_abbrev = 40; - } - else if (!strcmp(a, "--color")) - o->color = 0; - else if (!strcmp(a, "--no-color")) - o->color = -1; - else if (!strcmp(a, "-R")) - o->diffopts.flags |= GIT_DIFF_REVERSE; - else if (!strcmp(a, "-a") || !strcmp(a, "--text")) - o->diffopts.flags |= GIT_DIFF_FORCE_TEXT; - else if (!strcmp(a, "--ignore-space-at-eol")) - o->diffopts.flags |= GIT_DIFF_IGNORE_WHITESPACE_EOL; - else if (!strcmp(a, "-b") || !strcmp(a, "--ignore-space-change")) - o->diffopts.flags |= GIT_DIFF_IGNORE_WHITESPACE_CHANGE; - else if (!strcmp(a, "-w") || !strcmp(a, "--ignore-all-space")) - o->diffopts.flags |= GIT_DIFF_IGNORE_WHITESPACE; - else if (!strcmp(a, "--ignored")) - o->diffopts.flags |= GIT_DIFF_INCLUDE_IGNORED; - else if (!strcmp(a, "--untracked")) - o->diffopts.flags |= GIT_DIFF_INCLUDE_UNTRACKED; - else if (!strcmp(a, "--patience")) - o->diffopts.flags |= GIT_DIFF_PATIENCE; - else if (!strcmp(a, "--minimal")) - o->diffopts.flags |= GIT_DIFF_MINIMAL; - else if (!strcmp(a, "--stat")) - o->output |= OUTPUT_STAT; - else if (!strcmp(a, "--numstat")) - o->output |= OUTPUT_NUMSTAT; - else if (!strcmp(a, "--shortstat")) - o->output |= OUTPUT_SHORTSTAT; - else if (!strcmp(a, "--summary")) - o->output |= OUTPUT_SUMMARY; - else if (match_uint16_arg( - &o->findopts.rename_threshold, &args, "-M") || - match_uint16_arg( - &o->findopts.rename_threshold, &args, "--find-renames")) - o->findopts.flags |= GIT_DIFF_FIND_RENAMES; - else if (match_uint16_arg( - &o->findopts.copy_threshold, &args, "-C") || - match_uint16_arg( - &o->findopts.copy_threshold, &args, "--find-copies")) - o->findopts.flags |= GIT_DIFF_FIND_COPIES; - else if (!strcmp(a, "--find-copies-harder")) - o->findopts.flags |= GIT_DIFF_FIND_COPIES_FROM_UNMODIFIED; - else if (is_prefixed(a, "-B") || is_prefixed(a, "--break-rewrites")) - /* TODO: parse thresholds */ - o->findopts.flags |= GIT_DIFF_FIND_REWRITES; - else if (!match_uint16_arg( - &o->diffopts.context_lines, &args, "-U") && - !match_uint16_arg( - &o->diffopts.context_lines, &args, "--unified") && - !match_uint16_arg( - &o->diffopts.interhunk_lines, &args, "--inter-hunk-context") && - !match_uint16_arg( - &o->diffopts.id_abbrev, &args, "--abbrev") && - !match_str_arg(&o->diffopts.old_prefix, &args, "--src-prefix") && - !match_str_arg(&o->diffopts.new_prefix, &args, "--dst-prefix") && - !match_str_arg(&o->dir, &args, "--git-dir")) - usage("Unknown command line argument", a); - } -} - -/** Display diff output with "--stat", "--numstat", or "--shortstat" */ -static void diff_print_stats(git_diff *diff, struct opts *o) -{ - git_diff_stats *stats; - git_buf b = GIT_BUF_INIT_CONST(NULL, 0); - git_diff_stats_format_t format = 0; - - check_lg2( - git_diff_get_stats(&stats, diff), "generating stats for diff", NULL); - - if (o->output & OUTPUT_STAT) - format |= GIT_DIFF_STATS_FULL; - if (o->output & OUTPUT_SHORTSTAT) - format |= GIT_DIFF_STATS_SHORT; - if (o->output & OUTPUT_NUMSTAT) - format |= GIT_DIFF_STATS_NUMBER; - if (o->output & OUTPUT_SUMMARY) - format |= GIT_DIFF_STATS_INCLUDE_SUMMARY; - - check_lg2( - git_diff_stats_to_buf(&b, stats, format, 80), "formatting stats", NULL); - - fputs(b.ptr, stdout); - - git_buf_free(&b); - git_diff_stats_free(stats); -} diff --git a/vendor/libgit2/examples/for-each-ref.c b/vendor/libgit2/examples/for-each-ref.c deleted file mode 100644 index a8ceaaff9..000000000 --- a/vendor/libgit2/examples/for-each-ref.c +++ /dev/null @@ -1,49 +0,0 @@ -#include -#include -#include "common.h" - -static int show_ref(git_reference *ref, void *data) -{ - git_repository *repo = data; - git_reference *resolved = NULL; - char hex[GIT_OID_HEXSZ+1]; - const git_oid *oid; - git_object *obj; - - if (git_reference_type(ref) == GIT_REF_SYMBOLIC) - check_lg2(git_reference_resolve(&resolved, ref), - "Unable to resolve symbolic reference", - git_reference_name(ref)); - - oid = git_reference_target(resolved ? resolved : ref); - git_oid_fmt(hex, oid); - hex[GIT_OID_HEXSZ] = 0; - check_lg2(git_object_lookup(&obj, repo, oid, GIT_OBJ_ANY), - "Unable to lookup object", hex); - - printf("%s %-6s\t%s\n", - hex, - git_object_type2string(git_object_type(obj)), - git_reference_name(ref)); - - if (resolved) - git_reference_free(resolved); - return 0; -} - -int main(int argc, char **argv) -{ - git_repository *repo; - git_libgit2_init(); - - if (argc != 1 || argv[1] /* silence -Wunused-parameter */) - fatal("Sorry, no for-each-ref options supported yet", NULL); - - check_lg2(git_repository_open(&repo, "."), - "Could not open repository", NULL); - check_lg2(git_reference_foreach(repo, show_ref, repo), - "Could not iterate over references", NULL); - - git_libgit2_shutdown(); - return 0; -} diff --git a/vendor/libgit2/examples/general.c b/vendor/libgit2/examples/general.c deleted file mode 100644 index 706650b67..000000000 --- a/vendor/libgit2/examples/general.c +++ /dev/null @@ -1,531 +0,0 @@ -/* - * libgit2 "general" example - shows basic libgit2 concepts - * - * Written by the libgit2 contributors - * - * To the extent possible under law, the author(s) have dedicated all copyright - * and related and neighboring rights to this software to the public domain - * worldwide. This software is distributed without any warranty. - * - * You should have received a copy of the CC0 Public Domain Dedication along - * with this software. If not, see - * . - */ - -// [**libgit2**][lg] is a portable, pure C implementation of the Git core -// methods provided as a re-entrant linkable library with a solid API, -// allowing you to write native speed custom Git applications in any -// language which supports C bindings. -// -// This file is an example of using that API in a real, compilable C file. -// As the API is updated, this file will be updated to demonstrate the new -// functionality. -// -// If you're trying to write something in C using [libgit2][lg], you should -// also check out the generated [API documentation][ap]. We try to link to -// the relevant sections of the API docs in each section in this file. -// -// **libgit2** (for the most part) only implements the core plumbing -// functions, not really the higher level porcelain stuff. For a primer on -// Git Internals that you will need to know to work with Git at this level, -// check out [Chapter 9][pg] of the Pro Git book. -// -// [lg]: http://libgit2.github.com -// [ap]: http://libgit2.github.com/libgit2 -// [pg]: http://progit.org/book/ch9-0.html - -// ### Includes - -// Including the `git2.h` header will include all the other libgit2 headers -// that you need. It should be the only thing you need to include in order -// to compile properly and get all the libgit2 API. -#include -#include - -// Almost all libgit2 functions return 0 on success or negative on error. -// This is not production quality error checking, but should be sufficient -// as an example. -static void check_error(int error_code, const char *action) -{ - const git_error *error = giterr_last(); - if (!error_code) - return; - - printf("Error %d %s - %s\n", error_code, action, - (error && error->message) ? error->message : "???"); - - exit(1); -} - -int main (int argc, char** argv) -{ - // Initialize the library, this will set up any global state which libgit2 needs - // including threading and crypto - git_libgit2_init(); - - // ### Opening the Repository - - // There are a couple of methods for opening a repository, this being the - // simplest. There are also [methods][me] for specifying the index file - // and work tree locations, here we assume they are in the normal places. - // - // (Try running this program against tests/resources/testrepo.git.) - // - // [me]: http://libgit2.github.com/libgit2/#HEAD/group/repository - int error; - const char *repo_path = (argc > 1) ? argv[1] : "/opt/libgit2-test/.git"; - git_repository *repo; - - error = git_repository_open(&repo, repo_path); - check_error(error, "opening repository"); - - // ### SHA-1 Value Conversions - - // For our first example, we will convert a 40 character hex value to the - // 20 byte raw SHA1 value. - printf("*Hex to Raw*\n"); - char hex[] = "4a202b346bb0fb0db7eff3cffeb3c70babbd2045"; - - // The `git_oid` is the structure that keeps the SHA value. We will use - // this throughout the example for storing the value of the current SHA - // key we're working with. - git_oid oid; - git_oid_fromstr(&oid, hex); - - // Once we've converted the string into the oid value, we can get the raw - // value of the SHA by accessing `oid.id` - - // Next we will convert the 20 byte raw SHA1 value to a human readable 40 - // char hex value. - printf("\n*Raw to Hex*\n"); - char out[GIT_OID_HEXSZ+1]; - out[GIT_OID_HEXSZ] = '\0'; - - // If you have a oid, you can easily get the hex value of the SHA as well. - git_oid_fmt(out, &oid); - printf("SHA hex string: %s\n", out); - - // ### Working with the Object Database - - // **libgit2** provides [direct access][odb] to the object database. The - // object database is where the actual objects are stored in Git. For - // working with raw objects, we'll need to get this structure from the - // repository. - // - // [odb]: http://libgit2.github.com/libgit2/#HEAD/group/odb - git_odb *odb; - git_repository_odb(&odb, repo); - - // #### Raw Object Reading - - printf("\n*Raw Object Read*\n"); - git_odb_object *obj; - git_otype otype; - const unsigned char *data; - const char *str_type; - - // We can read raw objects directly from the object database if we have - // the oid (SHA) of the object. This allows us to access objects without - // knowing their type and inspect the raw bytes unparsed. - error = git_odb_read(&obj, odb, &oid); - check_error(error, "finding object in repository"); - - // A raw object only has three properties - the type (commit, blob, tree - // or tag), the size of the raw data and the raw, unparsed data itself. - // For a commit or tag, that raw data is human readable plain ASCII - // text. For a blob it is just file contents, so it could be text or - // binary data. For a tree it is a special binary format, so it's unlikely - // to be hugely helpful as a raw object. - data = (const unsigned char *)git_odb_object_data(obj); - otype = git_odb_object_type(obj); - - // We provide methods to convert from the object type which is an enum, to - // a string representation of that value (and vice-versa). - str_type = git_object_type2string(otype); - printf("object length and type: %d, %s\n", - (int)git_odb_object_size(obj), - str_type); - - // For proper memory management, close the object when you are done with - // it or it will leak memory. - git_odb_object_free(obj); - - // #### Raw Object Writing - - printf("\n*Raw Object Write*\n"); - - // You can also write raw object data to Git. This is pretty cool because - // it gives you direct access to the key/value properties of Git. Here - // we'll write a new blob object that just contains a simple string. - // Notice that we have to specify the object type as the `git_otype` enum. - git_odb_write(&oid, odb, "test data", sizeof("test data") - 1, GIT_OBJ_BLOB); - - // Now that we've written the object, we can check out what SHA1 was - // generated when the object was written to our database. - git_oid_fmt(out, &oid); - printf("Written Object: %s\n", out); - - // ### Object Parsing - - // libgit2 has methods to parse every object type in Git so you don't have - // to work directly with the raw data. This is much faster and simpler - // than trying to deal with the raw data yourself. - - // #### Commit Parsing - - // [Parsing commit objects][pco] is simple and gives you access to all the - // data in the commit - the author (name, email, datetime), committer - // (same), tree, message, encoding and parent(s). - // - // [pco]: http://libgit2.github.com/libgit2/#HEAD/group/commit - - printf("\n*Commit Parsing*\n"); - - git_commit *commit; - git_oid_fromstr(&oid, "8496071c1b46c854b31185ea97743be6a8774479"); - - error = git_commit_lookup(&commit, repo, &oid); - check_error(error, "looking up commit"); - - const git_signature *author, *cmtter; - const char *message; - time_t ctime; - unsigned int parents, p; - - // Each of the properties of the commit object are accessible via methods, - // including commonly needed variations, such as `git_commit_time` which - // returns the author time and `git_commit_message` which gives you the - // commit message (as a NUL-terminated string). - message = git_commit_message(commit); - author = git_commit_author(commit); - cmtter = git_commit_committer(commit); - ctime = git_commit_time(commit); - - // The author and committer methods return [git_signature] structures, - // which give you name, email and `when`, which is a `git_time` structure, - // giving you a timestamp and timezone offset. - printf("Author: %s (%s)\n", author->name, author->email); - - // Commits can have zero or more parents. The first (root) commit will - // have no parents, most commits will have one (i.e. the commit it was - // based on) and merge commits will have two or more. Commits can - // technically have any number, though it's rare to have more than two. - parents = git_commit_parentcount(commit); - for (p = 0;p < parents;p++) { - git_commit *parent; - git_commit_parent(&parent, commit, p); - git_oid_fmt(out, git_commit_id(parent)); - printf("Parent: %s\n", out); - git_commit_free(parent); - } - - // Don't forget to close the object to prevent memory leaks. You will have - // to do this for all the objects you open and parse. - git_commit_free(commit); - - // #### Writing Commits - - // libgit2 provides a couple of methods to create commit objects easily as - // well. There are four different create signatures, we'll just show one - // of them here. You can read about the other ones in the [commit API - // docs][cd]. - // - // [cd]: http://libgit2.github.com/libgit2/#HEAD/group/commit - - printf("\n*Commit Writing*\n"); - git_oid tree_id, parent_id, commit_id; - git_tree *tree; - git_commit *parent; - - // Creating signatures for an authoring identity and time is simple. You - // will need to do this to specify who created a commit and when. Default - // values for the name and email should be found in the `user.name` and - // `user.email` configuration options. See the `config` section of this - // example file to see how to access config values. - git_signature_new((git_signature **)&author, - "Scott Chacon", "schacon@gmail.com", 123456789, 60); - git_signature_new((git_signature **)&cmtter, - "Scott A Chacon", "scott@github.com", 987654321, 90); - - // Commit objects need a tree to point to and optionally one or more - // parents. Here we're creating oid objects to create the commit with, - // but you can also use - git_oid_fromstr(&tree_id, "f60079018b664e4e79329a7ef9559c8d9e0378d1"); - git_tree_lookup(&tree, repo, &tree_id); - git_oid_fromstr(&parent_id, "5b5b025afb0b4c913b4c338a42934a3863bf3644"); - git_commit_lookup(&parent, repo, &parent_id); - - // Here we actually create the commit object with a single call with all - // the values we need to create the commit. The SHA key is written to the - // `commit_id` variable here. - git_commit_create_v( - &commit_id, /* out id */ - repo, - NULL, /* do not update the HEAD */ - author, - cmtter, - NULL, /* use default message encoding */ - "example commit", - tree, - 1, parent); - - // Now we can take a look at the commit SHA we've generated. - git_oid_fmt(out, &commit_id); - printf("New Commit: %s\n", out); - - // #### Tag Parsing - - // You can parse and create tags with the [tag management API][tm], which - // functions very similarly to the commit lookup, parsing and creation - // methods, since the objects themselves are very similar. - // - // [tm]: http://libgit2.github.com/libgit2/#HEAD/group/tag - printf("\n*Tag Parsing*\n"); - git_tag *tag; - const char *tmessage, *tname; - git_otype ttype; - - // We create an oid for the tag object if we know the SHA and look it up - // the same way that we would a commit (or any other object). - git_oid_fromstr(&oid, "b25fa35b38051e4ae45d4222e795f9df2e43f1d1"); - - error = git_tag_lookup(&tag, repo, &oid); - check_error(error, "looking up tag"); - - // Now that we have the tag object, we can extract the information it - // generally contains: the target (usually a commit object), the type of - // the target object (usually 'commit'), the name ('v1.0'), the tagger (a - // git_signature - name, email, timestamp), and the tag message. - git_tag_target((git_object **)&commit, tag); - tname = git_tag_name(tag); // "test" - ttype = git_tag_target_type(tag); // GIT_OBJ_COMMIT (otype enum) - tmessage = git_tag_message(tag); // "tag message\n" - printf("Tag Message: %s\n", tmessage); - - git_commit_free(commit); - - // #### Tree Parsing - - // [Tree parsing][tp] is a bit different than the other objects, in that - // we have a subtype which is the tree entry. This is not an actual - // object type in Git, but a useful structure for parsing and traversing - // tree entries. - // - // [tp]: http://libgit2.github.com/libgit2/#HEAD/group/tree - printf("\n*Tree Parsing*\n"); - - const git_tree_entry *entry; - git_object *objt; - - // Create the oid and lookup the tree object just like the other objects. - git_oid_fromstr(&oid, "2a741c18ac5ff082a7caaec6e74db3075a1906b5"); - git_tree_lookup(&tree, repo, &oid); - - // Getting the count of entries in the tree so you can iterate over them - // if you want to. - size_t cnt = git_tree_entrycount(tree); // 3 - printf("tree entries: %d\n", (int)cnt); - - entry = git_tree_entry_byindex(tree, 0); - printf("Entry name: %s\n", git_tree_entry_name(entry)); // "hello.c" - - // You can also access tree entries by name if you know the name of the - // entry you're looking for. - entry = git_tree_entry_byname(tree, "README"); - git_tree_entry_name(entry); // "hello.c" - - // Once you have the entry object, you can access the content or subtree - // (or commit, in the case of submodules) that it points to. You can also - // get the mode if you want. - git_tree_entry_to_object(&objt, repo, entry); // blob - - // Remember to close the looked-up object once you are done using it - git_object_free(objt); - - // #### Blob Parsing - - // The last object type is the simplest and requires the least parsing - // help. Blobs are just file contents and can contain anything, there is - // no structure to it. The main advantage to using the [simple blob - // api][ba] is that when you're creating blobs you don't have to calculate - // the size of the content. There is also a helper for reading a file - // from disk and writing it to the db and getting the oid back so you - // don't have to do all those steps yourself. - // - // [ba]: http://libgit2.github.com/libgit2/#HEAD/group/blob - - printf("\n*Blob Parsing*\n"); - git_blob *blob; - - git_oid_fromstr(&oid, "1385f264afb75a56a5bec74243be9b367ba4ca08"); - git_blob_lookup(&blob, repo, &oid); - - // You can access a buffer with the raw contents of the blob directly. - // Note that this buffer may not be contain ASCII data for certain blobs - // (e.g. binary files): do not consider the buffer a NULL-terminated - // string, and use the `git_blob_rawsize` attribute to find out its exact - // size in bytes - printf("Blob Size: %ld\n", (long)git_blob_rawsize(blob)); // 8 - git_blob_rawcontent(blob); // "content" - - // ### Revwalking - - // The libgit2 [revision walking api][rw] provides methods to traverse the - // directed graph created by the parent pointers of the commit objects. - // Since all commits point back to the commit that came directly before - // them, you can walk this parentage as a graph and find all the commits - // that were ancestors of (reachable from) a given starting point. This - // can allow you to create `git log` type functionality. - // - // [rw]: http://libgit2.github.com/libgit2/#HEAD/group/revwalk - - printf("\n*Revwalking*\n"); - git_revwalk *walk; - git_commit *wcommit; - - git_oid_fromstr(&oid, "5b5b025afb0b4c913b4c338a42934a3863bf3644"); - - // To use the revwalker, create a new walker, tell it how you want to sort - // the output and then push one or more starting points onto the walker. - // If you want to emulate the output of `git log` you would push the SHA - // of the commit that HEAD points to into the walker and then start - // traversing them. You can also 'hide' commits that you want to stop at - // or not see any of their ancestors. So if you want to emulate `git log - // branch1..branch2`, you would push the oid of `branch2` and hide the oid - // of `branch1`. - git_revwalk_new(&walk, repo); - git_revwalk_sorting(walk, GIT_SORT_TOPOLOGICAL | GIT_SORT_REVERSE); - git_revwalk_push(walk, &oid); - - const git_signature *cauth; - const char *cmsg; - - // Now that we have the starting point pushed onto the walker, we start - // asking for ancestors. It will return them in the sorting order we asked - // for as commit oids. We can then lookup and parse the committed pointed - // at by the returned OID; note that this operation is specially fast - // since the raw contents of the commit object will be cached in memory - while ((git_revwalk_next(&oid, walk)) == 0) { - error = git_commit_lookup(&wcommit, repo, &oid); - check_error(error, "looking up commit during revwalk"); - - cmsg = git_commit_message(wcommit); - cauth = git_commit_author(wcommit); - printf("%s (%s)\n", cmsg, cauth->email); - - git_commit_free(wcommit); - } - - // Like the other objects, be sure to free the revwalker when you're done - // to prevent memory leaks. Also, make sure that the repository being - // walked it not deallocated while the walk is in progress, or it will - // result in undefined behavior - git_revwalk_free(walk); - - // ### Index File Manipulation - - // The [index file API][gi] allows you to read, traverse, update and write - // the Git index file (sometimes thought of as the staging area). - // - // [gi]: http://libgit2.github.com/libgit2/#HEAD/group/index - - printf("\n*Index Walking*\n"); - - git_index *index; - unsigned int i, ecount; - - // You can either open the index from the standard location in an open - // repository, as we're doing here, or you can open and manipulate any - // index file with `git_index_open_bare()`. The index for the repository - // will be located and loaded from disk. - git_repository_index(&index, repo); - - // For each entry in the index, you can get a bunch of information - // including the SHA (oid), path and mode which map to the tree objects - // that are written out. It also has filesystem properties to help - // determine what to inspect for changes (ctime, mtime, dev, ino, uid, - // gid, file_size and flags) All these properties are exported publicly in - // the `git_index_entry` struct - ecount = git_index_entrycount(index); - for (i = 0; i < ecount; ++i) { - const git_index_entry *e = git_index_get_byindex(index, i); - - printf("path: %s\n", e->path); - printf("mtime: %d\n", (int)e->mtime.seconds); - printf("fs: %d\n", (int)e->file_size); - } - - git_index_free(index); - - // ### References - - // The [reference API][ref] allows you to list, resolve, create and update - // references such as branches, tags and remote references (everything in - // the .git/refs directory). - // - // [ref]: http://libgit2.github.com/libgit2/#HEAD/group/reference - - printf("\n*Reference Listing*\n"); - - // Here we will implement something like `git for-each-ref` simply listing - // out all available references and the object SHA they resolve to. - git_strarray ref_list; - git_reference_list(&ref_list, repo); - - const char *refname; - git_reference *ref; - - // Now that we have the list of reference names, we can lookup each ref - // one at a time and resolve them to the SHA, then print both values out. - for (i = 0; i < ref_list.count; ++i) { - refname = ref_list.strings[i]; - git_reference_lookup(&ref, repo, refname); - - switch (git_reference_type(ref)) { - case GIT_REF_OID: - git_oid_fmt(out, git_reference_target(ref)); - printf("%s [%s]\n", refname, out); - break; - - case GIT_REF_SYMBOLIC: - printf("%s => %s\n", refname, git_reference_symbolic_target(ref)); - break; - default: - fprintf(stderr, "Unexpected reference type\n"); - exit(1); - } - } - - git_strarray_free(&ref_list); - - // ### Config Files - - // The [config API][config] allows you to list and updatee config values - // in any of the accessible config file locations (system, global, local). - // - // [config]: http://libgit2.github.com/libgit2/#HEAD/group/config - - printf("\n*Config Listing*\n"); - - const char *email; - int32_t j; - - git_config *cfg; - - // Open a config object so we can read global values from it. - char config_path[256]; - sprintf(config_path, "%s/config", repo_path); - check_error(git_config_open_ondisk(&cfg, config_path), "opening config"); - - git_config_get_int32(&j, cfg, "help.autocorrect"); - printf("Autocorrect: %d\n", j); - - git_config_get_string(&email, cfg, "user.email"); - printf("Email: %s\n", email); - - // Finally, when you're done with the repository, you can free it as well. - git_repository_free(repo); - - return 0; -} - diff --git a/vendor/libgit2/examples/init.c b/vendor/libgit2/examples/init.c deleted file mode 100644 index fe7a67224..000000000 --- a/vendor/libgit2/examples/init.c +++ /dev/null @@ -1,253 +0,0 @@ -/* - * libgit2 "init" example - shows how to initialize a new repo - * - * Written by the libgit2 contributors - * - * To the extent possible under law, the author(s) have dedicated all copyright - * and related and neighboring rights to this software to the public domain - * worldwide. This software is distributed without any warranty. - * - * You should have received a copy of the CC0 Public Domain Dedication along - * with this software. If not, see - * . - */ - -#include "common.h" - -/** - * This is a sample program that is similar to "git init". See the - * documentation for that (try "git help init") to understand what this - * program is emulating. - * - * This demonstrates using the libgit2 APIs to initialize a new repository. - * - * This also contains a special additional option that regular "git init" - * does not support which is "--initial-commit" to make a first empty commit. - * That is demonstrated in the "create_initial_commit" helper function. - */ - -/** Forward declarations of helpers */ -struct opts { - int no_options; - int quiet; - int bare; - int initial_commit; - uint32_t shared; - const char *template; - const char *gitdir; - const char *dir; -}; -static void create_initial_commit(git_repository *repo); -static void parse_opts(struct opts *o, int argc, char *argv[]); - - -int main(int argc, char *argv[]) -{ - git_repository *repo = NULL; - struct opts o = { 1, 0, 0, 0, GIT_REPOSITORY_INIT_SHARED_UMASK, 0, 0, 0 }; - - git_libgit2_init(); - - parse_opts(&o, argc, argv); - - /* Initialize repository. */ - - if (o.no_options) { - /** - * No options were specified, so let's demonstrate the default - * simple case of git_repository_init() API usage... - */ - check_lg2(git_repository_init(&repo, o.dir, 0), - "Could not initialize repository", NULL); - } - else { - /** - * Some command line options were specified, so we'll use the - * extended init API to handle them - */ - git_repository_init_options initopts = GIT_REPOSITORY_INIT_OPTIONS_INIT; - initopts.flags = GIT_REPOSITORY_INIT_MKPATH; - - if (o.bare) - initopts.flags |= GIT_REPOSITORY_INIT_BARE; - - if (o.template) { - initopts.flags |= GIT_REPOSITORY_INIT_EXTERNAL_TEMPLATE; - initopts.template_path = o.template; - } - - if (o.gitdir) { - /** - * If you specified a separate git directory, then initialize - * the repository at that path and use the second path as the - * working directory of the repository (with a git-link file) - */ - initopts.workdir_path = o.dir; - o.dir = o.gitdir; - } - - if (o.shared != 0) - initopts.mode = o.shared; - - check_lg2(git_repository_init_ext(&repo, o.dir, &initopts), - "Could not initialize repository", NULL); - } - - /** Print a message to stdout like "git init" does. */ - - if (!o.quiet) { - if (o.bare || o.gitdir) - o.dir = git_repository_path(repo); - else - o.dir = git_repository_workdir(repo); - - printf("Initialized empty Git repository in %s\n", o.dir); - } - - /** - * As an extension to the basic "git init" command, this example - * gives the option to create an empty initial commit. This is - * mostly to demonstrate what it takes to do that, but also some - * people like to have that empty base commit in their repo. - */ - if (o.initial_commit) { - create_initial_commit(repo); - printf("Created empty initial commit\n"); - } - - git_repository_free(repo); - git_libgit2_shutdown(); - - return 0; -} - -/** - * Unlike regular "git init", this example shows how to create an initial - * empty commit in the repository. This is the helper function that does - * that. - */ -static void create_initial_commit(git_repository *repo) -{ - git_signature *sig; - git_index *index; - git_oid tree_id, commit_id; - git_tree *tree; - - /** First use the config to initialize a commit signature for the user. */ - - if (git_signature_default(&sig, repo) < 0) - fatal("Unable to create a commit signature.", - "Perhaps 'user.name' and 'user.email' are not set"); - - /* Now let's create an empty tree for this commit */ - - if (git_repository_index(&index, repo) < 0) - fatal("Could not open repository index", NULL); - - /** - * Outside of this example, you could call git_index_add_bypath() - * here to put actual files into the index. For our purposes, we'll - * leave it empty for now. - */ - - if (git_index_write_tree(&tree_id, index) < 0) - fatal("Unable to write initial tree from index", NULL); - - git_index_free(index); - - if (git_tree_lookup(&tree, repo, &tree_id) < 0) - fatal("Could not look up initial tree", NULL); - - /** - * Ready to create the initial commit. - * - * Normally creating a commit would involve looking up the current - * HEAD commit and making that be the parent of the initial commit, - * but here this is the first commit so there will be no parent. - */ - - if (git_commit_create_v( - &commit_id, repo, "HEAD", sig, sig, - NULL, "Initial commit", tree, 0) < 0) - fatal("Could not create the initial commit", NULL); - - /** Clean up so we don't leak memory. */ - - git_tree_free(tree); - git_signature_free(sig); -} - -static void usage(const char *error, const char *arg) -{ - fprintf(stderr, "error: %s '%s'\n", error, arg); - fprintf(stderr, - "usage: init [-q | --quiet] [--bare] [--template=]\n" - " [--shared[=perms]] [--initial-commit]\n" - " [--separate-git-dir] \n"); - exit(1); -} - -/** Parse the tail of the --shared= argument. */ -static uint32_t parse_shared(const char *shared) -{ - if (!strcmp(shared, "false") || !strcmp(shared, "umask")) - return GIT_REPOSITORY_INIT_SHARED_UMASK; - - else if (!strcmp(shared, "true") || !strcmp(shared, "group")) - return GIT_REPOSITORY_INIT_SHARED_GROUP; - - else if (!strcmp(shared, "all") || !strcmp(shared, "world") || - !strcmp(shared, "everybody")) - return GIT_REPOSITORY_INIT_SHARED_ALL; - - else if (shared[0] == '0') { - long val; - char *end = NULL; - val = strtol(shared + 1, &end, 8); - if (end == shared + 1 || *end != 0) - usage("invalid octal value for --shared", shared); - return (uint32_t)val; - } - - else - usage("unknown value for --shared", shared); - - return 0; -} - -static void parse_opts(struct opts *o, int argc, char *argv[]) -{ - struct args_info args = ARGS_INFO_INIT; - const char *sharedarg; - - /** Process arguments. */ - - for (args.pos = 1; args.pos < argc; ++args.pos) { - char *a = argv[args.pos]; - - if (a[0] == '-') - o->no_options = 0; - - if (a[0] != '-') { - if (o->dir != NULL) - usage("extra argument", a); - o->dir = a; - } - else if (!strcmp(a, "-q") || !strcmp(a, "--quiet")) - o->quiet = 1; - else if (!strcmp(a, "--bare")) - o->bare = 1; - else if (!strcmp(a, "--shared")) - o->shared = GIT_REPOSITORY_INIT_SHARED_GROUP; - else if (!strcmp(a, "--initial-commit")) - o->initial_commit = 1; - else if (match_str_arg(&sharedarg, &args, "--shared")) - o->shared = parse_shared(sharedarg); - else if (!match_str_arg(&o->template, &args, "--template") || - !match_str_arg(&o->gitdir, &args, "--separate-git-dir")) - usage("unknown option", a); - } - - if (!o->dir) - usage("must specify directory to init", NULL); -} diff --git a/vendor/libgit2/examples/log.c b/vendor/libgit2/examples/log.c deleted file mode 100644 index e54eed3ce..000000000 --- a/vendor/libgit2/examples/log.c +++ /dev/null @@ -1,479 +0,0 @@ -/* - * libgit2 "log" example - shows how to walk history and get commit info - * - * Written by the libgit2 contributors - * - * To the extent possible under law, the author(s) have dedicated all copyright - * and related and neighboring rights to this software to the public domain - * worldwide. This software is distributed without any warranty. - * - * You should have received a copy of the CC0 Public Domain Dedication along - * with this software. If not, see - * . - */ - -#include "common.h" - -/** - * This example demonstrates the libgit2 rev walker APIs to roughly - * simulate the output of `git log` and a few of command line arguments. - * `git log` has many many options and this only shows a few of them. - * - * This does not have: - * - * - Robust error handling - * - Colorized or paginated output formatting - * - Most of the `git log` options - * - * This does have: - * - * - Examples of translating command line arguments to equivalent libgit2 - * revwalker configuration calls - * - Simplified options to apply pathspec limits and to show basic diffs - */ - -/** log_state represents walker being configured while handling options */ -struct log_state { - git_repository *repo; - const char *repodir; - git_revwalk *walker; - int hide; - int sorting; - int revisions; -}; - -/** utility functions that are called to configure the walker */ -static void set_sorting(struct log_state *s, unsigned int sort_mode); -static void push_rev(struct log_state *s, git_object *obj, int hide); -static int add_revision(struct log_state *s, const char *revstr); - -/** log_options holds other command line options that affect log output */ -struct log_options { - int show_diff; - int skip, limit; - int min_parents, max_parents; - git_time_t before; - git_time_t after; - const char *author; - const char *committer; - const char *grep; -}; - -/** utility functions that parse options and help with log output */ -static int parse_options( - struct log_state *s, struct log_options *opt, int argc, char **argv); -static void print_time(const git_time *intime, const char *prefix); -static void print_commit(git_commit *commit); -static int match_with_parent(git_commit *commit, int i, git_diff_options *); - -/** utility functions for filtering */ -static int signature_matches(const git_signature *sig, const char *filter); -static int log_message_matches(const git_commit *commit, const char *filter); - -int main(int argc, char *argv[]) -{ - int i, count = 0, printed = 0, parents, last_arg; - struct log_state s; - struct log_options opt; - git_diff_options diffopts = GIT_DIFF_OPTIONS_INIT; - git_oid oid; - git_commit *commit = NULL; - git_pathspec *ps = NULL; - - git_libgit2_init(); - - /** Parse arguments and set up revwalker. */ - - last_arg = parse_options(&s, &opt, argc, argv); - - diffopts.pathspec.strings = &argv[last_arg]; - diffopts.pathspec.count = argc - last_arg; - if (diffopts.pathspec.count > 0) - check_lg2(git_pathspec_new(&ps, &diffopts.pathspec), - "Building pathspec", NULL); - - if (!s.revisions) - add_revision(&s, NULL); - - /** Use the revwalker to traverse the history. */ - - printed = count = 0; - - for (; !git_revwalk_next(&oid, s.walker); git_commit_free(commit)) { - check_lg2(git_commit_lookup(&commit, s.repo, &oid), - "Failed to look up commit", NULL); - - parents = (int)git_commit_parentcount(commit); - if (parents < opt.min_parents) - continue; - if (opt.max_parents > 0 && parents > opt.max_parents) - continue; - - if (diffopts.pathspec.count > 0) { - int unmatched = parents; - - if (parents == 0) { - git_tree *tree; - check_lg2(git_commit_tree(&tree, commit), "Get tree", NULL); - if (git_pathspec_match_tree( - NULL, tree, GIT_PATHSPEC_NO_MATCH_ERROR, ps) != 0) - unmatched = 1; - git_tree_free(tree); - } else if (parents == 1) { - unmatched = match_with_parent(commit, 0, &diffopts) ? 0 : 1; - } else { - for (i = 0; i < parents; ++i) { - if (match_with_parent(commit, i, &diffopts)) - unmatched--; - } - } - - if (unmatched > 0) - continue; - } - - if (!signature_matches(git_commit_author(commit), opt.author)) - continue; - - if (!signature_matches(git_commit_committer(commit), opt.committer)) - continue; - - if (!log_message_matches(commit, opt.grep)) - continue; - - if (count++ < opt.skip) - continue; - if (opt.limit != -1 && printed++ >= opt.limit) { - git_commit_free(commit); - break; - } - - print_commit(commit); - - if (opt.show_diff) { - git_tree *a = NULL, *b = NULL; - git_diff *diff = NULL; - - if (parents > 1) - continue; - check_lg2(git_commit_tree(&b, commit), "Get tree", NULL); - if (parents == 1) { - git_commit *parent; - check_lg2(git_commit_parent(&parent, commit, 0), "Get parent", NULL); - check_lg2(git_commit_tree(&a, parent), "Tree for parent", NULL); - git_commit_free(parent); - } - - check_lg2(git_diff_tree_to_tree( - &diff, git_commit_owner(commit), a, b, &diffopts), - "Diff commit with parent", NULL); - check_lg2( - git_diff_print(diff, GIT_DIFF_FORMAT_PATCH, diff_output, NULL), - "Displaying diff", NULL); - - git_diff_free(diff); - git_tree_free(a); - git_tree_free(b); - } - } - - git_pathspec_free(ps); - git_revwalk_free(s.walker); - git_repository_free(s.repo); - git_libgit2_shutdown(); - - return 0; -} - -/** Determine if the given git_signature does not contain the filter text. */ -static int signature_matches(const git_signature *sig, const char *filter) { - if (filter == NULL) - return 1; - - if (sig != NULL && - (strstr(sig->name, filter) != NULL || - strstr(sig->email, filter) != NULL)) - return 1; - - return 0; -} - -static int log_message_matches(const git_commit *commit, const char *filter) { - const char *message = NULL; - - if (filter == NULL) - return 1; - - if ((message = git_commit_message(commit)) != NULL && - strstr(message, filter) != NULL) - return 1; - - return 0; -} - -/** Push object (for hide or show) onto revwalker. */ -static void push_rev(struct log_state *s, git_object *obj, int hide) -{ - hide = s->hide ^ hide; - - /** Create revwalker on demand if it doesn't already exist. */ - if (!s->walker) { - check_lg2(git_revwalk_new(&s->walker, s->repo), - "Could not create revision walker", NULL); - git_revwalk_sorting(s->walker, s->sorting); - } - - if (!obj) - check_lg2(git_revwalk_push_head(s->walker), - "Could not find repository HEAD", NULL); - else if (hide) - check_lg2(git_revwalk_hide(s->walker, git_object_id(obj)), - "Reference does not refer to a commit", NULL); - else - check_lg2(git_revwalk_push(s->walker, git_object_id(obj)), - "Reference does not refer to a commit", NULL); - - git_object_free(obj); -} - -/** Parse revision string and add revs to walker. */ -static int add_revision(struct log_state *s, const char *revstr) -{ - git_revspec revs; - int hide = 0; - - /** Open repo on demand if it isn't already open. */ - if (!s->repo) { - if (!s->repodir) s->repodir = "."; - check_lg2(git_repository_open_ext(&s->repo, s->repodir, 0, NULL), - "Could not open repository", s->repodir); - } - - if (!revstr) { - push_rev(s, NULL, hide); - return 0; - } - - if (*revstr == '^') { - revs.flags = GIT_REVPARSE_SINGLE; - hide = !hide; - - if (git_revparse_single(&revs.from, s->repo, revstr + 1) < 0) - return -1; - } else if (git_revparse(&revs, s->repo, revstr) < 0) - return -1; - - if ((revs.flags & GIT_REVPARSE_SINGLE) != 0) - push_rev(s, revs.from, hide); - else { - push_rev(s, revs.to, hide); - - if ((revs.flags & GIT_REVPARSE_MERGE_BASE) != 0) { - git_oid base; - check_lg2(git_merge_base(&base, s->repo, - git_object_id(revs.from), git_object_id(revs.to)), - "Could not find merge base", revstr); - check_lg2( - git_object_lookup(&revs.to, s->repo, &base, GIT_OBJ_COMMIT), - "Could not find merge base commit", NULL); - - push_rev(s, revs.to, hide); - } - - push_rev(s, revs.from, !hide); - } - - return 0; -} - -/** Update revwalker with sorting mode. */ -static void set_sorting(struct log_state *s, unsigned int sort_mode) -{ - /** Open repo on demand if it isn't already open. */ - if (!s->repo) { - if (!s->repodir) s->repodir = "."; - check_lg2(git_repository_open_ext(&s->repo, s->repodir, 0, NULL), - "Could not open repository", s->repodir); - } - - /** Create revwalker on demand if it doesn't already exist. */ - if (!s->walker) - check_lg2(git_revwalk_new(&s->walker, s->repo), - "Could not create revision walker", NULL); - - if (sort_mode == GIT_SORT_REVERSE) - s->sorting = s->sorting ^ GIT_SORT_REVERSE; - else - s->sorting = sort_mode | (s->sorting & GIT_SORT_REVERSE); - - git_revwalk_sorting(s->walker, s->sorting); -} - -/** Helper to format a git_time value like Git. */ -static void print_time(const git_time *intime, const char *prefix) -{ - char sign, out[32]; - struct tm *intm; - int offset, hours, minutes; - time_t t; - - offset = intime->offset; - if (offset < 0) { - sign = '-'; - offset = -offset; - } else { - sign = '+'; - } - - hours = offset / 60; - minutes = offset % 60; - - t = (time_t)intime->time + (intime->offset * 60); - - intm = gmtime(&t); - strftime(out, sizeof(out), "%a %b %e %T %Y", intm); - - printf("%s%s %c%02d%02d\n", prefix, out, sign, hours, minutes); -} - -/** Helper to print a commit object. */ -static void print_commit(git_commit *commit) -{ - char buf[GIT_OID_HEXSZ + 1]; - int i, count; - const git_signature *sig; - const char *scan, *eol; - - git_oid_tostr(buf, sizeof(buf), git_commit_id(commit)); - printf("commit %s\n", buf); - - if ((count = (int)git_commit_parentcount(commit)) > 1) { - printf("Merge:"); - for (i = 0; i < count; ++i) { - git_oid_tostr(buf, 8, git_commit_parent_id(commit, i)); - printf(" %s", buf); - } - printf("\n"); - } - - if ((sig = git_commit_author(commit)) != NULL) { - printf("Author: %s <%s>\n", sig->name, sig->email); - print_time(&sig->when, "Date: "); - } - printf("\n"); - - for (scan = git_commit_message(commit); scan && *scan; ) { - for (eol = scan; *eol && *eol != '\n'; ++eol) /* find eol */; - - printf(" %.*s\n", (int)(eol - scan), scan); - scan = *eol ? eol + 1 : NULL; - } - printf("\n"); -} - -/** Helper to find how many files in a commit changed from its nth parent. */ -static int match_with_parent(git_commit *commit, int i, git_diff_options *opts) -{ - git_commit *parent; - git_tree *a, *b; - git_diff *diff; - int ndeltas; - - check_lg2( - git_commit_parent(&parent, commit, (size_t)i), "Get parent", NULL); - check_lg2(git_commit_tree(&a, parent), "Tree for parent", NULL); - check_lg2(git_commit_tree(&b, commit), "Tree for commit", NULL); - check_lg2( - git_diff_tree_to_tree(&diff, git_commit_owner(commit), a, b, opts), - "Checking diff between parent and commit", NULL); - - ndeltas = (int)git_diff_num_deltas(diff); - - git_diff_free(diff); - git_tree_free(a); - git_tree_free(b); - git_commit_free(parent); - - return ndeltas > 0; -} - -/** Print a usage message for the program. */ -static void usage(const char *message, const char *arg) -{ - if (message && arg) - fprintf(stderr, "%s: %s\n", message, arg); - else if (message) - fprintf(stderr, "%s\n", message); - fprintf(stderr, "usage: log []\n"); - exit(1); -} - -/** Parse some log command line options. */ -static int parse_options( - struct log_state *s, struct log_options *opt, int argc, char **argv) -{ - struct args_info args = ARGS_INFO_INIT; - - memset(s, 0, sizeof(*s)); - s->sorting = GIT_SORT_TIME; - - memset(opt, 0, sizeof(*opt)); - opt->max_parents = -1; - opt->limit = -1; - - for (args.pos = 1; args.pos < argc; ++args.pos) { - const char *a = argv[args.pos]; - - if (a[0] != '-') { - if (!add_revision(s, a)) - s->revisions++; - else - /** Try failed revision parse as filename. */ - break; - } else if (!strcmp(a, "--")) { - ++args.pos; - break; - } - else if (!strcmp(a, "--date-order")) - set_sorting(s, GIT_SORT_TIME); - else if (!strcmp(a, "--topo-order")) - set_sorting(s, GIT_SORT_TOPOLOGICAL); - else if (!strcmp(a, "--reverse")) - set_sorting(s, GIT_SORT_REVERSE); - else if (match_str_arg(&opt->author, &args, "--author")) - /** Found valid --author */; - else if (match_str_arg(&opt->committer, &args, "--committer")) - /** Found valid --committer */; - else if (match_str_arg(&opt->grep, &args, "--grep")) - /** Found valid --grep */; - else if (match_str_arg(&s->repodir, &args, "--git-dir")) - /** Found git-dir. */; - else if (match_int_arg(&opt->skip, &args, "--skip", 0)) - /** Found valid --skip. */; - else if (match_int_arg(&opt->limit, &args, "--max-count", 0)) - /** Found valid --max-count. */; - else if (a[1] >= '0' && a[1] <= '9') - is_integer(&opt->limit, a + 1, 0); - else if (match_int_arg(&opt->limit, &args, "-n", 0)) - /** Found valid -n. */; - else if (!strcmp(a, "--merges")) - opt->min_parents = 2; - else if (!strcmp(a, "--no-merges")) - opt->max_parents = 1; - else if (!strcmp(a, "--no-min-parents")) - opt->min_parents = 0; - else if (!strcmp(a, "--no-max-parents")) - opt->max_parents = -1; - else if (match_int_arg(&opt->max_parents, &args, "--max-parents=", 1)) - /** Found valid --max-parents. */; - else if (match_int_arg(&opt->min_parents, &args, "--min-parents=", 0)) - /** Found valid --min_parents. */; - else if (!strcmp(a, "-p") || !strcmp(a, "-u") || !strcmp(a, "--patch")) - opt->show_diff = 1; - else - usage("Unsupported argument", a); - } - - return args.pos; -} - diff --git a/vendor/libgit2/examples/network/.gitignore b/vendor/libgit2/examples/network/.gitignore deleted file mode 100644 index 1b48e66ed..000000000 --- a/vendor/libgit2/examples/network/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/git2 diff --git a/vendor/libgit2/examples/network/Makefile b/vendor/libgit2/examples/network/Makefile deleted file mode 100644 index f65c6cb26..000000000 --- a/vendor/libgit2/examples/network/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -default: all - -CC = gcc -CFLAGS += -g -CFLAGS += -I../../include -LDFLAGS += -L../../build -L../.. -LIBRARIES += -lgit2 -lpthread - -OBJECTS = \ - git2.o \ - ls-remote.o \ - fetch.o \ - clone.o \ - index-pack.o \ - common.o - -all: $(OBJECTS) - $(CC) $(CFLAGS) $(LDFLAGS) -o git2 $(OBJECTS) $(LIBRARIES) - -clean: - $(RM) $(OBJECTS) - $(RM) git2 diff --git a/vendor/libgit2/examples/network/clone.c b/vendor/libgit2/examples/network/clone.c deleted file mode 100644 index caf41cca8..000000000 --- a/vendor/libgit2/examples/network/clone.c +++ /dev/null @@ -1,113 +0,0 @@ -#include "common.h" -#include -#include -#include -#include -#include -#ifndef _WIN32 -# include -# include -#endif - -typedef struct progress_data { - git_transfer_progress fetch_progress; - size_t completed_steps; - size_t total_steps; - const char *path; -} progress_data; - -static void print_progress(const progress_data *pd) -{ - int network_percent = pd->fetch_progress.total_objects > 0 ? - (100*pd->fetch_progress.received_objects) / pd->fetch_progress.total_objects : - 0; - int index_percent = pd->fetch_progress.total_objects > 0 ? - (100*pd->fetch_progress.indexed_objects) / pd->fetch_progress.total_objects : - 0; - - int checkout_percent = pd->total_steps > 0 - ? (100 * pd->completed_steps) / pd->total_steps - : 0; - int kbytes = pd->fetch_progress.received_bytes / 1024; - - if (pd->fetch_progress.total_objects && - pd->fetch_progress.received_objects == pd->fetch_progress.total_objects) { - printf("Resolving deltas %d/%d\r", - pd->fetch_progress.indexed_deltas, - pd->fetch_progress.total_deltas); - } else { - printf("net %3d%% (%4d kb, %5d/%5d) / idx %3d%% (%5d/%5d) / chk %3d%% (%4" PRIuZ "/%4" PRIuZ ") %s\n", - network_percent, kbytes, - pd->fetch_progress.received_objects, pd->fetch_progress.total_objects, - index_percent, pd->fetch_progress.indexed_objects, pd->fetch_progress.total_objects, - checkout_percent, - pd->completed_steps, pd->total_steps, - pd->path); - } -} - -static int sideband_progress(const char *str, int len, void *payload) -{ - (void)payload; // unused - - printf("remote: %*s", len, str); - fflush(stdout); - return 0; -} - -static int fetch_progress(const git_transfer_progress *stats, void *payload) -{ - progress_data *pd = (progress_data*)payload; - pd->fetch_progress = *stats; - print_progress(pd); - return 0; -} -static void checkout_progress(const char *path, size_t cur, size_t tot, void *payload) -{ - progress_data *pd = (progress_data*)payload; - pd->completed_steps = cur; - pd->total_steps = tot; - pd->path = path; - print_progress(pd); -} - - -int do_clone(git_repository *repo, int argc, char **argv) -{ - progress_data pd = {{0}}; - git_repository *cloned_repo = NULL; - git_clone_options clone_opts = GIT_CLONE_OPTIONS_INIT; - git_checkout_options checkout_opts = GIT_CHECKOUT_OPTIONS_INIT; - const char *url = argv[1]; - const char *path = argv[2]; - int error; - - (void)repo; // unused - - // Validate args - if (argc < 3) { - printf ("USAGE: %s \n", argv[0]); - return -1; - } - - // Set up options - checkout_opts.checkout_strategy = GIT_CHECKOUT_SAFE; - checkout_opts.progress_cb = checkout_progress; - checkout_opts.progress_payload = &pd; - clone_opts.checkout_opts = checkout_opts; - clone_opts.fetch_opts.callbacks.sideband_progress = sideband_progress; - clone_opts.fetch_opts.callbacks.transfer_progress = &fetch_progress; - clone_opts.fetch_opts.callbacks.credentials = cred_acquire_cb; - clone_opts.fetch_opts.callbacks.payload = &pd; - - // Do the clone - error = git_clone(&cloned_repo, url, path, &clone_opts); - printf("\n"); - if (error != 0) { - const git_error *err = giterr_last(); - if (err) printf("ERROR %d: %s\n", err->klass, err->message); - else printf("ERROR %d: no detailed info\n", error); - } - else if (cloned_repo) git_repository_free(cloned_repo); - return error; -} diff --git a/vendor/libgit2/examples/network/common.c b/vendor/libgit2/examples/network/common.c deleted file mode 100644 index d123eedbd..000000000 --- a/vendor/libgit2/examples/network/common.c +++ /dev/null @@ -1,34 +0,0 @@ -#include "common.h" -#include - -/* Shamelessly borrowed from http://stackoverflow.com/questions/3417837/ - * with permission of the original author, Martin Pool. - * http://sourcefrog.net/weblog/software/languages/C/unused.html - */ -#ifdef UNUSED -#elif defined(__GNUC__) -# define UNUSED(x) UNUSED_ ## x __attribute__((unused)) -#elif defined(__LCLINT__) -# define UNUSED(x) /*@unused@*/ x -#else -# define UNUSED(x) x -#endif - -int cred_acquire_cb(git_cred **out, - const char * UNUSED(url), - const char * UNUSED(username_from_url), - unsigned int UNUSED(allowed_types), - void * UNUSED(payload)) -{ - char username[128] = {0}; - char password[128] = {0}; - - printf("Username: "); - scanf("%s", username); - - /* Yup. Right there on your terminal. Careful where you copy/paste output. */ - printf("Password: "); - scanf("%s", password); - - return git_cred_userpass_plaintext_new(out, username, password); -} diff --git a/vendor/libgit2/examples/network/common.h b/vendor/libgit2/examples/network/common.h deleted file mode 100644 index 1b09caad4..000000000 --- a/vendor/libgit2/examples/network/common.h +++ /dev/null @@ -1,30 +0,0 @@ -#ifndef __COMMON_H__ -#define __COMMON_H__ - -#include - -typedef int (*git_cb)(git_repository *, int , char **); - -int ls_remote(git_repository *repo, int argc, char **argv); -int parse_pkt_line(git_repository *repo, int argc, char **argv); -int show_remote(git_repository *repo, int argc, char **argv); -int fetch(git_repository *repo, int argc, char **argv); -int index_pack(git_repository *repo, int argc, char **argv); -int do_clone(git_repository *repo, int argc, char **argv); - -int cred_acquire_cb(git_cred **out, - const char * url, - const char * username_from_url, - unsigned int allowed_types, - void *payload); - -#ifndef PRIuZ -/* Define the printf format specifer to use for size_t output */ -#if defined(_MSC_VER) || defined(__MINGW32__) -# define PRIuZ "Iu" -#else -# define PRIuZ "zu" -#endif -#endif - -#endif /* __COMMON_H__ */ diff --git a/vendor/libgit2/examples/network/fetch.c b/vendor/libgit2/examples/network/fetch.c deleted file mode 100644 index 177359b88..000000000 --- a/vendor/libgit2/examples/network/fetch.c +++ /dev/null @@ -1,124 +0,0 @@ -#include "common.h" -#include -#include -#include -#include -#ifndef _WIN32 -# include -# include -#endif - -struct dl_data { - git_remote *remote; - git_fetch_options *fetch_opts; - int ret; - int finished; -}; - -static int progress_cb(const char *str, int len, void *data) -{ - (void)data; - printf("remote: %.*s", len, str); - fflush(stdout); /* We don't have the \n to force the flush */ - return 0; -} - -/** - * This function gets called for each remote-tracking branch that gets - * updated. The message we output depends on whether it's a new one or - * an update. - */ -static int update_cb(const char *refname, const git_oid *a, const git_oid *b, void *data) -{ - char a_str[GIT_OID_HEXSZ+1], b_str[GIT_OID_HEXSZ+1]; - (void)data; - - git_oid_fmt(b_str, b); - b_str[GIT_OID_HEXSZ] = '\0'; - - if (git_oid_iszero(a)) { - printf("[new] %.20s %s\n", b_str, refname); - } else { - git_oid_fmt(a_str, a); - a_str[GIT_OID_HEXSZ] = '\0'; - printf("[updated] %.10s..%.10s %s\n", a_str, b_str, refname); - } - - return 0; -} - -/** - * This gets called during the download and indexing. Here we show - * processed and total objects in the pack and the amount of received - * data. Most frontends will probably want to show a percentage and - * the download rate. - */ -static int transfer_progress_cb(const git_transfer_progress *stats, void *payload) -{ - if (stats->received_objects == stats->total_objects) { - printf("Resolving deltas %d/%d\r", - stats->indexed_deltas, stats->total_deltas); - } else if (stats->total_objects > 0) { - printf("Received %d/%d objects (%d) in %" PRIuZ " bytes\r", - stats->received_objects, stats->total_objects, - stats->indexed_objects, stats->received_bytes); - } - return 0; -} - -/** Entry point for this command */ -int fetch(git_repository *repo, int argc, char **argv) -{ - git_remote *remote = NULL; - const git_transfer_progress *stats; - struct dl_data data; - git_fetch_options fetch_opts = GIT_FETCH_OPTIONS_INIT; - - if (argc < 2) { - fprintf(stderr, "usage: %s fetch \n", argv[-1]); - return EXIT_FAILURE; - } - - // Figure out whether it's a named remote or a URL - printf("Fetching %s for repo %p\n", argv[1], repo); - if (git_remote_lookup(&remote, repo, argv[1]) < 0) { - if (git_remote_create_anonymous(&remote, repo, argv[1]) < 0) - return -1; - } - - // Set up the callbacks (only update_tips for now) - fetch_opts.callbacks.update_tips = &update_cb; - fetch_opts.callbacks.sideband_progress = &progress_cb; - fetch_opts.callbacks.transfer_progress = transfer_progress_cb; - fetch_opts.callbacks.credentials = cred_acquire_cb; - - /** - * Perform the fetch with the configured refspecs from the - * config. Update the reflog for the updated references with - * "fetch". - */ - if (git_remote_fetch(remote, NULL, &fetch_opts, "fetch") < 0) - return -1; - - /** - * If there are local objects (we got a thin pack), then tell - * the user how many objects we saved from having to cross the - * network. - */ - stats = git_remote_stats(remote); - if (stats->local_objects > 0) { - printf("\rReceived %d/%d objects in %" PRIuZ " bytes (used %d local objects)\n", - stats->indexed_objects, stats->total_objects, stats->received_bytes, stats->local_objects); - } else{ - printf("\rReceived %d/%d objects in %" PRIuZ "bytes\n", - stats->indexed_objects, stats->total_objects, stats->received_bytes); - } - - git_remote_free(remote); - - return 0; - - on_error: - git_remote_free(remote); - return -1; -} diff --git a/vendor/libgit2/examples/network/git2.c b/vendor/libgit2/examples/network/git2.c deleted file mode 100644 index 448103c46..000000000 --- a/vendor/libgit2/examples/network/git2.c +++ /dev/null @@ -1,73 +0,0 @@ -#include -#include -#include - -#include "common.h" - -// This part is not strictly libgit2-dependent, but you can use this -// as a starting point for a git-like tool - -struct { - char *name; - git_cb fn; -} commands[] = { - {"ls-remote", ls_remote}, - {"fetch", fetch}, - {"clone", do_clone}, - {"index-pack", index_pack}, - { NULL, NULL} -}; - -static int run_command(git_cb fn, int argc, char **argv) -{ - int error; - git_repository *repo; - - // Before running the actual command, create an instance of the local - // repository and pass it to the function. - - error = git_repository_open(&repo, ".git"); - if (error < 0) - repo = NULL; - - // Run the command. If something goes wrong, print the error message to stderr - error = fn(repo, argc, argv); - if (error < 0) { - if (giterr_last() == NULL) - fprintf(stderr, "Error without message"); - else - fprintf(stderr, "Bad news:\n %s\n", giterr_last()->message); - } - - if(repo) - git_repository_free(repo); - - return !!error; -} - -int main(int argc, char **argv) -{ - int i; - int return_code = 1; - - if (argc < 2) { - fprintf(stderr, "usage: %s [repo]\n", argv[0]); - exit(EXIT_FAILURE); - } - - git_libgit2_init(); - - for (i = 0; commands[i].name != NULL; ++i) { - if (!strcmp(argv[1], commands[i].name)) { - return_code = run_command(commands[i].fn, --argc, ++argv); - goto shutdown; - } - } - - fprintf(stderr, "Command not found: %s\n", argv[1]); - -shutdown: - git_libgit2_shutdown(); - - return return_code; -} diff --git a/vendor/libgit2/examples/network/index-pack.c b/vendor/libgit2/examples/network/index-pack.c deleted file mode 100644 index 314f21160..000000000 --- a/vendor/libgit2/examples/network/index-pack.c +++ /dev/null @@ -1,88 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#ifdef _WIN32 -# include -# include - -# define open _open -# define read _read -# define close _close - -#define ssize_t unsigned int -#else -# include -#endif -#include "common.h" - -// This could be run in the main loop whilst the application waits for -// the indexing to finish in a worker thread -static int index_cb(const git_transfer_progress *stats, void *data) -{ - (void)data; - printf("\rProcessing %d of %d", stats->indexed_objects, stats->total_objects); - - return 0; -} - -int index_pack(git_repository *repo, int argc, char **argv) -{ - git_indexer *idx; - git_transfer_progress stats = {0, 0}; - int error; - char hash[GIT_OID_HEXSZ + 1] = {0}; - int fd; - ssize_t read_bytes; - char buf[512]; - - (void)repo; - - if (argc < 2) { - fprintf(stderr, "usage: %s index-pack \n", argv[-1]); - return EXIT_FAILURE; - } - - if (git_indexer_new(&idx, ".", 0, NULL, NULL, NULL) < 0) { - puts("bad idx"); - return -1; - } - - if ((fd = open(argv[1], 0)) < 0) { - perror("open"); - return -1; - } - - do { - read_bytes = read(fd, buf, sizeof(buf)); - if (read_bytes < 0) - break; - - if ((error = git_indexer_append(idx, buf, read_bytes, &stats)) < 0) - goto cleanup; - - index_cb(&stats, NULL); - } while (read_bytes > 0); - - if (read_bytes < 0) { - error = -1; - perror("failed reading"); - goto cleanup; - } - - if ((error = git_indexer_commit(idx, &stats)) < 0) - goto cleanup; - - printf("\rIndexing %d of %d\n", stats.indexed_objects, stats.total_objects); - - git_oid_fmt(hash, git_indexer_hash(idx)); - puts(hash); - - cleanup: - close(fd); - git_indexer_free(idx); - return error; -} diff --git a/vendor/libgit2/examples/network/ls-remote.c b/vendor/libgit2/examples/network/ls-remote.c deleted file mode 100644 index c9da79f5f..000000000 --- a/vendor/libgit2/examples/network/ls-remote.c +++ /dev/null @@ -1,64 +0,0 @@ -#include -#include -#include -#include -#include "common.h" - -static int use_remote(git_repository *repo, char *name) -{ - git_remote *remote = NULL; - int error; - const git_remote_head **refs; - size_t refs_len, i; - git_remote_callbacks callbacks = GIT_REMOTE_CALLBACKS_INIT; - - // Find the remote by name - error = git_remote_lookup(&remote, repo, name); - if (error < 0) { - error = git_remote_create_anonymous(&remote, repo, name); - if (error < 0) - goto cleanup; - } - - /** - * Connect to the remote and call the printing function for - * each of the remote references. - */ - callbacks.credentials = cred_acquire_cb; - - error = git_remote_connect(remote, GIT_DIRECTION_FETCH, &callbacks, NULL); - if (error < 0) - goto cleanup; - - /** - * Get the list of references on the remote and print out - * their name next to what they point to. - */ - if (git_remote_ls(&refs, &refs_len, remote) < 0) - goto cleanup; - - for (i = 0; i < refs_len; i++) { - char oid[GIT_OID_HEXSZ + 1] = {0}; - git_oid_fmt(oid, &refs[i]->oid); - printf("%s\t%s\n", oid, refs[i]->name); - } - -cleanup: - git_remote_free(remote); - return error; -} - -/** Entry point for this command */ -int ls_remote(git_repository *repo, int argc, char **argv) -{ - int error; - - if (argc < 2) { - fprintf(stderr, "usage: %s ls-remote \n", argv[-1]); - return EXIT_FAILURE; - } - - error = use_remote(repo, argv[1]); - - return error; -} diff --git a/vendor/libgit2/examples/remote.c b/vendor/libgit2/examples/remote.c deleted file mode 100644 index e0d5a1406..000000000 --- a/vendor/libgit2/examples/remote.c +++ /dev/null @@ -1,269 +0,0 @@ -/* - * libgit2 "remote" example - shows how to modify remotes for a repo - * - * Written by the libgit2 contributors - * - * To the extent possible under law, the author(s) have dedicated all copyright - * and related and neighboring rights to this software to the public domain - * worldwide. This software is distributed without any warranty. - * - * You should have received a copy of the CC0 Public Domain Dedication along - * with this software. If not, see - * . - */ - -#include "common.h" - -/** - * This is a sample program that is similar to "git remote". See the - * documentation for that (try "git help remote") to understand what this - * program is emulating. - * - * This demonstrates using the libgit2 APIs to modify remotes of a repository. - */ - -enum subcmd { - subcmd_add, - subcmd_remove, - subcmd_rename, - subcmd_seturl, - subcmd_show, -}; - -struct opts { - enum subcmd cmd; - - /* for command-specific args */ - int argc; - char **argv; -}; - -static int cmd_add(git_repository *repo, struct opts *o); -static int cmd_remove(git_repository *repo, struct opts *o); -static int cmd_rename(git_repository *repo, struct opts *o); -static int cmd_seturl(git_repository *repo, struct opts *o); -static int cmd_show(git_repository *repo, struct opts *o); - -static void parse_subcmd( - struct opts *opt, int argc, char **argv); -static void usage(const char *msg, const char *arg); - -int main(int argc, char *argv[]) -{ - int retval = 0; - struct opts opt = {0}; - git_buf buf = GIT_BUF_INIT_CONST(NULL, 0); - git_repository *repo = NULL; - - parse_subcmd(&opt, argc, argv); - - git_libgit2_init(); - - check_lg2(git_repository_discover(&buf, ".", 0, NULL), - "Could not find repository", NULL); - - check_lg2(git_repository_open(&repo, buf.ptr), - "Could not open repository", NULL); - git_buf_free(&buf); - - switch (opt.cmd) - { - case subcmd_add: - retval = cmd_add(repo, &opt); - break; - case subcmd_remove: - retval = cmd_remove(repo, &opt); - break; - case subcmd_rename: - retval = cmd_rename(repo, &opt); - break; - case subcmd_seturl: - retval = cmd_seturl(repo, &opt); - break; - case subcmd_show: - retval = cmd_show(repo, &opt); - break; - } - - git_libgit2_shutdown(); - - return retval; -} - -static int cmd_add(git_repository *repo, struct opts *o) -{ - char *name, *url; - git_remote *remote = {0}; - - if (o->argc != 2) - usage("you need to specify a name and URL", NULL); - - name = o->argv[0]; - url = o->argv[1]; - - check_lg2(git_remote_create(&remote, repo, name, url), - "could not create remote", NULL); - - return 0; -} - -static int cmd_remove(git_repository *repo, struct opts *o) -{ - char *name; - - if (o->argc != 1) - usage("you need to specify a name", NULL); - - name = o->argv[0]; - - check_lg2(git_remote_delete(repo, name), - "could not delete remote", name); - - return 0; -} - -static int cmd_rename(git_repository *repo, struct opts *o) -{ - int i, retval; - char *old, *new; - git_strarray problems = {0}; - - if (o->argc != 2) - usage("you need to specify old and new remote name", NULL); - - old = o->argv[0]; - new = o->argv[1]; - - retval = git_remote_rename(&problems, repo, old, new); - if (!retval) - return 0; - - for (i = 0; i < (int) problems.count; i++) { - puts(problems.strings[0]); - } - - git_strarray_free(&problems); - - return retval; -} - -static int cmd_seturl(git_repository *repo, struct opts *o) -{ - int i, retval, push = 0; - char *name = NULL, *url = NULL; - - for (i = 0; i < o->argc; i++) { - char *arg = o->argv[i]; - - if (!strcmp(arg, "--push")) { - push = 1; - } else if (arg[0] != '-' && name == NULL) { - name = arg; - } else if (arg[0] != '-' && url == NULL) { - url = arg; - } else { - usage("invalid argument to set-url", arg); - } - } - - if (name == NULL || url == NULL) - usage("you need to specify remote and the new URL", NULL); - - if (push) - retval = git_remote_set_pushurl(repo, name, url); - else - retval = git_remote_set_url(repo, name, url); - - check_lg2(retval, "could not set URL", url); - - return 0; -} - -static int cmd_show(git_repository *repo, struct opts *o) -{ - int i; - const char *arg, *name, *fetch, *push; - int verbose = 0; - git_strarray remotes = {0}; - git_remote *remote = {0}; - - for (i = 0; i < o->argc; i++) { - arg = o->argv[i]; - - if (!strcmp(arg, "-v") || !strcmp(arg, "--verbose")) { - verbose = 1; - } - } - - check_lg2(git_remote_list(&remotes, repo), - "could not retrieve remotes", NULL); - - for (i = 0; i < (int) remotes.count; i++) { - name = remotes.strings[i]; - if (!verbose) { - puts(name); - continue; - } - - check_lg2(git_remote_lookup(&remote, repo, name), - "could not look up remote", name); - - fetch = git_remote_url(remote); - if (fetch) - printf("%s\t%s (fetch)\n", name, fetch); - push = git_remote_pushurl(remote); - /* use fetch URL if no distinct push URL has been set */ - push = push ? push : fetch; - if (push) - printf("%s\t%s (push)\n", name, push); - - git_remote_free(remote); - } - - git_strarray_free(&remotes); - - return 0; -} - -static void parse_subcmd( - struct opts *opt, int argc, char **argv) -{ - char *arg = argv[1]; - enum subcmd cmd = 0; - - if (argc < 2) - usage("no command specified", NULL); - - if (!strcmp(arg, "add")) { - cmd = subcmd_add; - } else if (!strcmp(arg, "remove")) { - cmd = subcmd_remove; - } else if (!strcmp(arg, "rename")) { - cmd = subcmd_rename; - } else if (!strcmp(arg, "set-url")) { - cmd = subcmd_seturl; - } else if (!strcmp(arg, "show")) { - cmd = subcmd_show; - } else { - usage("command is not valid", arg); - } - opt->cmd = cmd; - - opt->argc = argc - 2; /* executable and subcommand are removed */ - opt->argv = argv + 2; -} - -static void usage(const char *msg, const char *arg) -{ - fputs("usage: remote add \n", stderr); - fputs(" remote remove \n", stderr); - fputs(" remote rename \n", stderr); - fputs(" remote set-url [--push] \n", stderr); - fputs(" remote show [-v|--verbose]\n", stderr); - - if (msg && !arg) - fprintf(stderr, "\n%s\n", msg); - else if (msg && arg) - fprintf(stderr, "\n%s: %s\n", msg, arg); - exit(1); -} diff --git a/vendor/libgit2/examples/rev-list.c b/vendor/libgit2/examples/rev-list.c deleted file mode 100644 index ee9afc441..000000000 --- a/vendor/libgit2/examples/rev-list.c +++ /dev/null @@ -1,121 +0,0 @@ -/* - * libgit2 "rev-list" example - shows how to transform a rev-spec into a list - * of commit ids - * - * Written by the libgit2 contributors - * - * To the extent possible under law, the author(s) have dedicated all copyright - * and related and neighboring rights to this software to the public domain - * worldwide. This software is distributed without any warranty. - * - * You should have received a copy of the CC0 Public Domain Dedication along - * with this software. If not, see - * . - */ - -#include "common.h" - -static int revwalk_parseopts(git_repository *repo, git_revwalk *walk, int nopts, char **opts); - -int main (int argc, char **argv) -{ - git_repository *repo; - git_revwalk *walk; - git_oid oid; - char buf[GIT_OID_HEXSZ+1]; - - git_libgit2_init(); - - check_lg2(git_repository_open_ext(&repo, ".", 0, NULL), "opening repository", NULL); - check_lg2(git_revwalk_new(&walk, repo), "allocating revwalk", NULL); - check_lg2(revwalk_parseopts(repo, walk, argc-1, argv+1), "parsing options", NULL); - - while (!git_revwalk_next(&oid, walk)) { - git_oid_fmt(buf, &oid); - buf[GIT_OID_HEXSZ] = '\0'; - printf("%s\n", buf); - } - - git_libgit2_shutdown(); - return 0; -} - -static int push_commit(git_revwalk *walk, const git_oid *oid, int hide) -{ - if (hide) - return git_revwalk_hide(walk, oid); - else - return git_revwalk_push(walk, oid); -} - -static int push_spec(git_repository *repo, git_revwalk *walk, const char *spec, int hide) -{ - int error; - git_object *obj; - - if ((error = git_revparse_single(&obj, repo, spec)) < 0) - return error; - - error = push_commit(walk, git_object_id(obj), hide); - git_object_free(obj); - return error; -} - -static int push_range(git_repository *repo, git_revwalk *walk, const char *range, int hide) -{ - git_revspec revspec; - int error = 0; - - if ((error = git_revparse(&revspec, repo, range))) - return error; - - if (revspec.flags & GIT_REVPARSE_MERGE_BASE) { - /* TODO: support "..." */ - return GIT_EINVALIDSPEC; - } - - if ((error = push_commit(walk, git_object_id(revspec.from), !hide))) - goto out; - - error = push_commit(walk, git_object_id(revspec.to), hide); - -out: - git_object_free(revspec.from); - git_object_free(revspec.to); - return error; -} - -static int revwalk_parseopts(git_repository *repo, git_revwalk *walk, int nopts, char **opts) -{ - int hide, i, error; - unsigned int sorting = GIT_SORT_NONE; - - hide = 0; - for (i = 0; i < nopts; i++) { - if (!strcmp(opts[i], "--topo-order")) { - sorting = GIT_SORT_TOPOLOGICAL | (sorting & GIT_SORT_REVERSE); - git_revwalk_sorting(walk, sorting); - } else if (!strcmp(opts[i], "--date-order")) { - sorting = GIT_SORT_TIME | (sorting & GIT_SORT_REVERSE); - git_revwalk_sorting(walk, sorting); - } else if (!strcmp(opts[i], "--reverse")) { - sorting = (sorting & ~GIT_SORT_REVERSE) - | ((sorting & GIT_SORT_REVERSE) ? 0 : GIT_SORT_REVERSE); - git_revwalk_sorting(walk, sorting); - } else if (!strcmp(opts[i], "--not")) { - hide = !hide; - } else if (opts[i][0] == '^') { - if ((error = push_spec(repo, walk, opts[i] + 1, !hide))) - return error; - } else if (strstr(opts[i], "..")) { - if ((error = push_range(repo, walk, opts[i], hide))) - return error; - } else { - if ((error = push_spec(repo, walk, opts[i], hide))) - return error; - } - } - - return 0; -} - diff --git a/vendor/libgit2/examples/rev-parse.c b/vendor/libgit2/examples/rev-parse.c deleted file mode 100644 index 483d6e019..000000000 --- a/vendor/libgit2/examples/rev-parse.c +++ /dev/null @@ -1,115 +0,0 @@ -/* - * libgit2 "rev-parse" example - shows how to parse revspecs - * - * Written by the libgit2 contributors - * - * To the extent possible under law, the author(s) have dedicated all copyright - * and related and neighboring rights to this software to the public domain - * worldwide. This software is distributed without any warranty. - * - * You should have received a copy of the CC0 Public Domain Dedication along - * with this software. If not, see - * . - */ - -#include "common.h" - -/** Forward declarations for helpers. */ -struct parse_state { - git_repository *repo; - const char *repodir; - const char *spec; - int not; -}; -static void parse_opts(struct parse_state *ps, int argc, char *argv[]); -static int parse_revision(struct parse_state *ps); - - -int main(int argc, char *argv[]) -{ - struct parse_state ps = {0}; - - git_libgit2_init(); - parse_opts(&ps, argc, argv); - - check_lg2(parse_revision(&ps), "Parsing", NULL); - - git_repository_free(ps.repo); - git_libgit2_shutdown(); - - return 0; -} - -static void usage(const char *message, const char *arg) -{ - if (message && arg) - fprintf(stderr, "%s: %s\n", message, arg); - else if (message) - fprintf(stderr, "%s\n", message); - fprintf(stderr, "usage: rev-parse [ --option ] ...\n"); - exit(1); -} - -static void parse_opts(struct parse_state *ps, int argc, char *argv[]) -{ - struct args_info args = ARGS_INFO_INIT; - - for (args.pos=1; args.pos < argc; ++args.pos) { - const char *a = argv[args.pos]; - - if (a[0] != '-') { - if (ps->spec) - usage("Too many specs", a); - ps->spec = a; - } else if (!strcmp(a, "--not")) - ps->not = !ps->not; - else if (!match_str_arg(&ps->repodir, &args, "--git-dir")) - usage("Cannot handle argument", a); - } -} - -static int parse_revision(struct parse_state *ps) -{ - git_revspec rs; - char str[GIT_OID_HEXSZ + 1]; - - if (!ps->repo) { - if (!ps->repodir) - ps->repodir = "."; - check_lg2(git_repository_open_ext(&ps->repo, ps->repodir, 0, NULL), - "Could not open repository from", ps->repodir); - } - - check_lg2(git_revparse(&rs, ps->repo, ps->spec), "Could not parse", ps->spec); - - if ((rs.flags & GIT_REVPARSE_SINGLE) != 0) { - git_oid_tostr(str, sizeof(str), git_object_id(rs.from)); - printf("%s\n", str); - git_object_free(rs.from); - } - else if ((rs.flags & GIT_REVPARSE_RANGE) != 0) { - git_oid_tostr(str, sizeof(str), git_object_id(rs.to)); - printf("%s\n", str); - git_object_free(rs.to); - - if ((rs.flags & GIT_REVPARSE_MERGE_BASE) != 0) { - git_oid base; - check_lg2(git_merge_base(&base, ps->repo, - git_object_id(rs.from), git_object_id(rs.to)), - "Could not find merge base", ps->spec); - - git_oid_tostr(str, sizeof(str), &base); - printf("%s\n", str); - } - - git_oid_tostr(str, sizeof(str), git_object_id(rs.from)); - printf("^%s\n", str); - git_object_free(rs.from); - } - else { - fatal("Invalid results from git_revparse", ps->spec); - } - - return 0; -} - diff --git a/vendor/libgit2/examples/showindex.c b/vendor/libgit2/examples/showindex.c deleted file mode 100644 index 43be5e24c..000000000 --- a/vendor/libgit2/examples/showindex.c +++ /dev/null @@ -1,70 +0,0 @@ -/* - * libgit2 "showindex" example - shows how to extract data from the index - * - * Written by the libgit2 contributors - * - * To the extent possible under law, the author(s) have dedicated all copyright - * and related and neighboring rights to this software to the public domain - * worldwide. This software is distributed without any warranty. - * - * You should have received a copy of the CC0 Public Domain Dedication along - * with this software. If not, see - * . - */ - -#include "common.h" - -int main (int argc, char** argv) -{ - git_index *index; - unsigned int i, ecount; - char *dir = "."; - size_t dirlen; - char out[GIT_OID_HEXSZ+1]; - out[GIT_OID_HEXSZ] = '\0'; - - git_libgit2_init(); - - if (argc > 2) - fatal("usage: showindex []", NULL); - if (argc > 1) - dir = argv[1]; - - dirlen = strlen(dir); - if (dirlen > 5 && strcmp(dir + dirlen - 5, "index") == 0) { - check_lg2(git_index_open(&index, dir), "could not open index", dir); - } else { - git_repository *repo; - check_lg2(git_repository_open_ext(&repo, dir, 0, NULL), "could not open repository", dir); - check_lg2(git_repository_index(&index, repo), "could not open repository index", NULL); - git_repository_free(repo); - } - - git_index_read(index, 0); - - ecount = git_index_entrycount(index); - if (!ecount) - printf("Empty index\n"); - - for (i = 0; i < ecount; ++i) { - const git_index_entry *e = git_index_get_byindex(index, i); - - git_oid_fmt(out, &e->id); - - printf("File Path: %s\n", e->path); - printf(" Stage: %d\n", git_index_entry_stage(e)); - printf(" Blob SHA: %s\n", out); - printf("File Mode: %07o\n", e->mode); - printf("File Size: %d bytes\n", (int)e->file_size); - printf("Dev/Inode: %d/%d\n", (int)e->dev, (int)e->ino); - printf(" UID/GID: %d/%d\n", (int)e->uid, (int)e->gid); - printf(" ctime: %d\n", (int)e->ctime.seconds); - printf(" mtime: %d\n", (int)e->mtime.seconds); - printf("\n"); - } - - git_index_free(index); - git_libgit2_shutdown(); - - return 0; -} diff --git a/vendor/libgit2/examples/status.c b/vendor/libgit2/examples/status.c deleted file mode 100644 index 49f006dcc..000000000 --- a/vendor/libgit2/examples/status.c +++ /dev/null @@ -1,517 +0,0 @@ -/* - * libgit2 "status" example - shows how to use the status APIs - * - * Written by the libgit2 contributors - * - * To the extent possible under law, the author(s) have dedicated all copyright - * and related and neighboring rights to this software to the public domain - * worldwide. This software is distributed without any warranty. - * - * You should have received a copy of the CC0 Public Domain Dedication along - * with this software. If not, see - * . - */ - -#include "common.h" -#ifdef _WIN32 -# include -# define sleep(a) Sleep(a * 1000) -#else -# include -#endif - -/** - * This example demonstrates the use of the libgit2 status APIs, - * particularly the `git_status_list` object, to roughly simulate the - * output of running `git status`. It serves as a simple example of - * using those APIs to get basic status information. - * - * This does not have: - * - * - Robust error handling - * - Colorized or paginated output formatting - * - * This does have: - * - * - Examples of translating command line arguments to the status - * options settings to mimic `git status` results. - * - A sample status formatter that matches the default "long" format - * from `git status` - * - A sample status formatter that matches the "short" format - */ - -enum { - FORMAT_DEFAULT = 0, - FORMAT_LONG = 1, - FORMAT_SHORT = 2, - FORMAT_PORCELAIN = 3, -}; - -#define MAX_PATHSPEC 8 - -struct opts { - git_status_options statusopt; - char *repodir; - char *pathspec[MAX_PATHSPEC]; - int npaths; - int format; - int zterm; - int showbranch; - int showsubmod; - int repeat; -}; - -static void parse_opts(struct opts *o, int argc, char *argv[]); -static void show_branch(git_repository *repo, int format); -static void print_long(git_status_list *status); -static void print_short(git_repository *repo, git_status_list *status); -static int print_submod(git_submodule *sm, const char *name, void *payload); - -int main(int argc, char *argv[]) -{ - git_repository *repo = NULL; - git_status_list *status; - struct opts o = { GIT_STATUS_OPTIONS_INIT, "." }; - - git_libgit2_init(); - - o.statusopt.show = GIT_STATUS_SHOW_INDEX_AND_WORKDIR; - o.statusopt.flags = GIT_STATUS_OPT_INCLUDE_UNTRACKED | - GIT_STATUS_OPT_RENAMES_HEAD_TO_INDEX | - GIT_STATUS_OPT_SORT_CASE_SENSITIVELY; - - parse_opts(&o, argc, argv); - - /** - * Try to open the repository at the given path (or at the current - * directory if none was given). - */ - check_lg2(git_repository_open_ext(&repo, o.repodir, 0, NULL), - "Could not open repository", o.repodir); - - if (git_repository_is_bare(repo)) - fatal("Cannot report status on bare repository", - git_repository_path(repo)); - -show_status: - if (o.repeat) - printf("\033[H\033[2J"); - - /** - * Run status on the repository - * - * We use `git_status_list_new()` to generate a list of status - * information which lets us iterate over it at our - * convenience and extract the data we want to show out of - * each entry. - * - * You can use `git_status_foreach()` or - * `git_status_foreach_ext()` if you'd prefer to execute a - * callback for each entry. The latter gives you more control - * about what results are presented. - */ - check_lg2(git_status_list_new(&status, repo, &o.statusopt), - "Could not get status", NULL); - - if (o.showbranch) - show_branch(repo, o.format); - - if (o.showsubmod) { - int submod_count = 0; - check_lg2(git_submodule_foreach(repo, print_submod, &submod_count), - "Cannot iterate submodules", o.repodir); - } - - if (o.format == FORMAT_LONG) - print_long(status); - else - print_short(repo, status); - - git_status_list_free(status); - - if (o.repeat) { - sleep(o.repeat); - goto show_status; - } - - git_repository_free(repo); - git_libgit2_shutdown(); - - return 0; -} - -/** - * If the user asked for the branch, let's show the short name of the - * branch. - */ -static void show_branch(git_repository *repo, int format) -{ - int error = 0; - const char *branch = NULL; - git_reference *head = NULL; - - error = git_repository_head(&head, repo); - - if (error == GIT_EUNBORNBRANCH || error == GIT_ENOTFOUND) - branch = NULL; - else if (!error) { - branch = git_reference_shorthand(head); - } else - check_lg2(error, "failed to get current branch", NULL); - - if (format == FORMAT_LONG) - printf("# On branch %s\n", - branch ? branch : "Not currently on any branch."); - else - printf("## %s\n", branch ? branch : "HEAD (no branch)"); - - git_reference_free(head); -} - -/** - * This function print out an output similar to git's status command - * in long form, including the command-line hints. - */ -static void print_long(git_status_list *status) -{ - size_t i, maxi = git_status_list_entrycount(status); - const git_status_entry *s; - int header = 0, changes_in_index = 0; - int changed_in_workdir = 0, rm_in_workdir = 0; - const char *old_path, *new_path; - - /** Print index changes. */ - - for (i = 0; i < maxi; ++i) { - char *istatus = NULL; - - s = git_status_byindex(status, i); - - if (s->status == GIT_STATUS_CURRENT) - continue; - - if (s->status & GIT_STATUS_WT_DELETED) - rm_in_workdir = 1; - - if (s->status & GIT_STATUS_INDEX_NEW) - istatus = "new file: "; - if (s->status & GIT_STATUS_INDEX_MODIFIED) - istatus = "modified: "; - if (s->status & GIT_STATUS_INDEX_DELETED) - istatus = "deleted: "; - if (s->status & GIT_STATUS_INDEX_RENAMED) - istatus = "renamed: "; - if (s->status & GIT_STATUS_INDEX_TYPECHANGE) - istatus = "typechange:"; - - if (istatus == NULL) - continue; - - if (!header) { - printf("# Changes to be committed:\n"); - printf("# (use \"git reset HEAD ...\" to unstage)\n"); - printf("#\n"); - header = 1; - } - - old_path = s->head_to_index->old_file.path; - new_path = s->head_to_index->new_file.path; - - if (old_path && new_path && strcmp(old_path, new_path)) - printf("#\t%s %s -> %s\n", istatus, old_path, new_path); - else - printf("#\t%s %s\n", istatus, old_path ? old_path : new_path); - } - - if (header) { - changes_in_index = 1; - printf("#\n"); - } - header = 0; - - /** Print workdir changes to tracked files. */ - - for (i = 0; i < maxi; ++i) { - char *wstatus = NULL; - - s = git_status_byindex(status, i); - - /** - * With `GIT_STATUS_OPT_INCLUDE_UNMODIFIED` (not used in this example) - * `index_to_workdir` may not be `NULL` even if there are - * no differences, in which case it will be a `GIT_DELTA_UNMODIFIED`. - */ - if (s->status == GIT_STATUS_CURRENT || s->index_to_workdir == NULL) - continue; - - /** Print out the output since we know the file has some changes */ - if (s->status & GIT_STATUS_WT_MODIFIED) - wstatus = "modified: "; - if (s->status & GIT_STATUS_WT_DELETED) - wstatus = "deleted: "; - if (s->status & GIT_STATUS_WT_RENAMED) - wstatus = "renamed: "; - if (s->status & GIT_STATUS_WT_TYPECHANGE) - wstatus = "typechange:"; - - if (wstatus == NULL) - continue; - - if (!header) { - printf("# Changes not staged for commit:\n"); - printf("# (use \"git add%s ...\" to update what will be committed)\n", rm_in_workdir ? "/rm" : ""); - printf("# (use \"git checkout -- ...\" to discard changes in working directory)\n"); - printf("#\n"); - header = 1; - } - - old_path = s->index_to_workdir->old_file.path; - new_path = s->index_to_workdir->new_file.path; - - if (old_path && new_path && strcmp(old_path, new_path)) - printf("#\t%s %s -> %s\n", wstatus, old_path, new_path); - else - printf("#\t%s %s\n", wstatus, old_path ? old_path : new_path); - } - - if (header) { - changed_in_workdir = 1; - printf("#\n"); - } - - /** Print untracked files. */ - - header = 0; - - for (i = 0; i < maxi; ++i) { - s = git_status_byindex(status, i); - - if (s->status == GIT_STATUS_WT_NEW) { - - if (!header) { - printf("# Untracked files:\n"); - printf("# (use \"git add ...\" to include in what will be committed)\n"); - printf("#\n"); - header = 1; - } - - printf("#\t%s\n", s->index_to_workdir->old_file.path); - } - } - - header = 0; - - /** Print ignored files. */ - - for (i = 0; i < maxi; ++i) { - s = git_status_byindex(status, i); - - if (s->status == GIT_STATUS_IGNORED) { - - if (!header) { - printf("# Ignored files:\n"); - printf("# (use \"git add -f ...\" to include in what will be committed)\n"); - printf("#\n"); - header = 1; - } - - printf("#\t%s\n", s->index_to_workdir->old_file.path); - } - } - - if (!changes_in_index && changed_in_workdir) - printf("no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"); -} - -/** - * This version of the output prefixes each path with two status - * columns and shows submodule status information. - */ -static void print_short(git_repository *repo, git_status_list *status) -{ - size_t i, maxi = git_status_list_entrycount(status); - const git_status_entry *s; - char istatus, wstatus; - const char *extra, *a, *b, *c; - - for (i = 0; i < maxi; ++i) { - s = git_status_byindex(status, i); - - if (s->status == GIT_STATUS_CURRENT) - continue; - - a = b = c = NULL; - istatus = wstatus = ' '; - extra = ""; - - if (s->status & GIT_STATUS_INDEX_NEW) - istatus = 'A'; - if (s->status & GIT_STATUS_INDEX_MODIFIED) - istatus = 'M'; - if (s->status & GIT_STATUS_INDEX_DELETED) - istatus = 'D'; - if (s->status & GIT_STATUS_INDEX_RENAMED) - istatus = 'R'; - if (s->status & GIT_STATUS_INDEX_TYPECHANGE) - istatus = 'T'; - - if (s->status & GIT_STATUS_WT_NEW) { - if (istatus == ' ') - istatus = '?'; - wstatus = '?'; - } - if (s->status & GIT_STATUS_WT_MODIFIED) - wstatus = 'M'; - if (s->status & GIT_STATUS_WT_DELETED) - wstatus = 'D'; - if (s->status & GIT_STATUS_WT_RENAMED) - wstatus = 'R'; - if (s->status & GIT_STATUS_WT_TYPECHANGE) - wstatus = 'T'; - - if (s->status & GIT_STATUS_IGNORED) { - istatus = '!'; - wstatus = '!'; - } - - if (istatus == '?' && wstatus == '?') - continue; - - /** - * A commit in a tree is how submodules are stored, so - * let's go take a look at its status. - */ - if (s->index_to_workdir && - s->index_to_workdir->new_file.mode == GIT_FILEMODE_COMMIT) - { - unsigned int smstatus = 0; - - if (!git_submodule_status(&smstatus, repo, s->index_to_workdir->new_file.path, - GIT_SUBMODULE_IGNORE_UNSPECIFIED)) { - if (smstatus & GIT_SUBMODULE_STATUS_WD_MODIFIED) - extra = " (new commits)"; - else if (smstatus & GIT_SUBMODULE_STATUS_WD_INDEX_MODIFIED) - extra = " (modified content)"; - else if (smstatus & GIT_SUBMODULE_STATUS_WD_WD_MODIFIED) - extra = " (modified content)"; - else if (smstatus & GIT_SUBMODULE_STATUS_WD_UNTRACKED) - extra = " (untracked content)"; - } - } - - /** - * Now that we have all the information, format the output. - */ - - if (s->head_to_index) { - a = s->head_to_index->old_file.path; - b = s->head_to_index->new_file.path; - } - if (s->index_to_workdir) { - if (!a) - a = s->index_to_workdir->old_file.path; - if (!b) - b = s->index_to_workdir->old_file.path; - c = s->index_to_workdir->new_file.path; - } - - if (istatus == 'R') { - if (wstatus == 'R') - printf("%c%c %s %s %s%s\n", istatus, wstatus, a, b, c, extra); - else - printf("%c%c %s %s%s\n", istatus, wstatus, a, b, extra); - } else { - if (wstatus == 'R') - printf("%c%c %s %s%s\n", istatus, wstatus, a, c, extra); - else - printf("%c%c %s%s\n", istatus, wstatus, a, extra); - } - } - - for (i = 0; i < maxi; ++i) { - s = git_status_byindex(status, i); - - if (s->status == GIT_STATUS_WT_NEW) - printf("?? %s\n", s->index_to_workdir->old_file.path); - } -} - -static int print_submod(git_submodule *sm, const char *name, void *payload) -{ - int *count = payload; - (void)name; - - if (*count == 0) - printf("# Submodules\n"); - (*count)++; - - printf("# - submodule '%s' at %s\n", - git_submodule_name(sm), git_submodule_path(sm)); - - return 0; -} - -/** - * Parse options that git's status command supports. - */ -static void parse_opts(struct opts *o, int argc, char *argv[]) -{ - struct args_info args = ARGS_INFO_INIT; - - for (args.pos = 1; args.pos < argc; ++args.pos) { - char *a = argv[args.pos]; - - if (a[0] != '-') { - if (o->npaths < MAX_PATHSPEC) - o->pathspec[o->npaths++] = a; - else - fatal("Example only supports a limited pathspec", NULL); - } - else if (!strcmp(a, "-s") || !strcmp(a, "--short")) - o->format = FORMAT_SHORT; - else if (!strcmp(a, "--long")) - o->format = FORMAT_LONG; - else if (!strcmp(a, "--porcelain")) - o->format = FORMAT_PORCELAIN; - else if (!strcmp(a, "-b") || !strcmp(a, "--branch")) - o->showbranch = 1; - else if (!strcmp(a, "-z")) { - o->zterm = 1; - if (o->format == FORMAT_DEFAULT) - o->format = FORMAT_PORCELAIN; - } - else if (!strcmp(a, "--ignored")) - o->statusopt.flags |= GIT_STATUS_OPT_INCLUDE_IGNORED; - else if (!strcmp(a, "-uno") || - !strcmp(a, "--untracked-files=no")) - o->statusopt.flags &= ~GIT_STATUS_OPT_INCLUDE_UNTRACKED; - else if (!strcmp(a, "-unormal") || - !strcmp(a, "--untracked-files=normal")) - o->statusopt.flags |= GIT_STATUS_OPT_INCLUDE_UNTRACKED; - else if (!strcmp(a, "-uall") || - !strcmp(a, "--untracked-files=all")) - o->statusopt.flags |= GIT_STATUS_OPT_INCLUDE_UNTRACKED | - GIT_STATUS_OPT_RECURSE_UNTRACKED_DIRS; - else if (!strcmp(a, "--ignore-submodules=all")) - o->statusopt.flags |= GIT_STATUS_OPT_EXCLUDE_SUBMODULES; - else if (!strncmp(a, "--git-dir=", strlen("--git-dir="))) - o->repodir = a + strlen("--git-dir="); - else if (!strcmp(a, "--repeat")) - o->repeat = 10; - else if (match_int_arg(&o->repeat, &args, "--repeat", 0)) - /* okay */; - else if (!strcmp(a, "--list-submodules")) - o->showsubmod = 1; - else - check_lg2(-1, "Unsupported option", a); - } - - if (o->format == FORMAT_DEFAULT) - o->format = FORMAT_LONG; - if (o->format == FORMAT_LONG) - o->showbranch = 1; - if (o->npaths > 0) { - o->statusopt.pathspec.strings = o->pathspec; - o->statusopt.pathspec.count = o->npaths; - } -} diff --git a/vendor/libgit2/examples/tag.c b/vendor/libgit2/examples/tag.c deleted file mode 100644 index c6a70d90e..000000000 --- a/vendor/libgit2/examples/tag.c +++ /dev/null @@ -1,319 +0,0 @@ -/* - * libgit2 "tag" example - shows how to list, create and delete tags - * - * Written by the libgit2 contributors - * - * To the extent possible under law, the author(s) have dedicated all copyright - * and related and neighboring rights to this software to the public domain - * worldwide. This software is distributed without any warranty. - * - * You should have received a copy of the CC0 Public Domain Dedication along - * with this software. If not, see - * . - */ - -#include "common.h" - -/** - * The following example partially reimplements the `git tag` command - * and some of its options. - * - * These commands should work: - - * - Tag name listing (`tag`) - * - Filtered tag listing with messages (`tag -n3 -l "v0.1*"`) - * - Lightweight tag creation (`tag test v0.18.0`) - * - Tag creation (`tag -a -m "Test message" test v0.18.0`) - * - Tag deletion (`tag -d test`) - * - * The command line parsing logic is simplified and doesn't handle - * all of the use cases. - */ - -/** tag_options represents the parsed command line options */ -typedef struct { - const char *message; - const char *pattern; - const char *tag_name; - const char *target; - int num_lines; - int force; -} tag_options; - -/** tag_state represents the current program state for dragging around */ -typedef struct { - git_repository *repo; - tag_options *opts; -} tag_state; - -/** An action to execute based on the command line arguments */ -typedef void (*tag_action)(tag_state *state); -typedef struct args_info args_info; - -static void check(int result, const char *message) -{ - if (result) fatal(message, NULL); -} - -/** Tag listing: Print individual message lines */ -static void print_list_lines(const char *message, const tag_state *state) -{ - const char *msg = message; - int num = state->opts->num_lines - 1; - - if (!msg) return; - - /** first line - headline */ - while(*msg && *msg != '\n') printf("%c", *msg++); - - /** skip over new lines */ - while(*msg && *msg == '\n') msg++; - - printf("\n"); - - /** print just headline? */ - if (num == 0) return; - if (*msg && msg[1]) printf("\n"); - - /** print individual commit/tag lines */ - while (*msg && num-- >= 2) { - printf(" "); - - while (*msg && *msg != '\n') printf("%c", *msg++); - - /** handle consecutive new lines */ - if (*msg && *msg == '\n' && msg[1] == '\n') { - num--; - printf("\n"); - } - while(*msg && *msg == '\n') msg++; - - printf("\n"); - } -} - -/** Tag listing: Print an actual tag object */ -static void print_tag(git_tag *tag, const tag_state *state) -{ - printf("%-16s", git_tag_name(tag)); - - if (state->opts->num_lines) { - const char *msg = git_tag_message(tag); - print_list_lines(msg, state); - } else { - printf("\n"); - } -} - -/** Tag listing: Print a commit (target of a lightweight tag) */ -static void print_commit(git_commit *commit, const char *name, - const tag_state *state) -{ - printf("%-16s", name); - - if (state->opts->num_lines) { - const char *msg = git_commit_message(commit); - print_list_lines(msg, state); - } else { - printf("\n"); - } -} - -/** Tag listing: Fallback, should not happen */ -static void print_name(const char *name) -{ - printf("%s\n", name); -} - -/** Tag listing: Lookup tags based on ref name and dispatch to print */ -static int each_tag(const char *name, tag_state *state) -{ - git_repository *repo = state->repo; - git_object *obj; - - check_lg2(git_revparse_single(&obj, repo, name), - "Failed to lookup rev", name); - - switch (git_object_type(obj)) { - case GIT_OBJ_TAG: - print_tag((git_tag *) obj, state); - break; - case GIT_OBJ_COMMIT: - print_commit((git_commit *) obj, name, state); - break; - default: - print_name(name); - } - - git_object_free(obj); - return 0; -} - -static void action_list_tags(tag_state *state) -{ - const char *pattern = state->opts->pattern; - git_strarray tag_names = {0}; - size_t i; - - check_lg2(git_tag_list_match(&tag_names, pattern ? pattern : "*", state->repo), - "Unable to get list of tags", NULL); - - for(i = 0; i < tag_names.count; i++) { - each_tag(tag_names.strings[i], state); - } - - git_strarray_free(&tag_names); -} - -static void action_delete_tag(tag_state *state) -{ - tag_options *opts = state->opts; - git_object *obj; - git_buf abbrev_oid = {0}; - - check(!opts->tag_name, "Name required"); - - check_lg2(git_revparse_single(&obj, state->repo, opts->tag_name), - "Failed to lookup rev", opts->tag_name); - - check_lg2(git_object_short_id(&abbrev_oid, obj), - "Unable to get abbreviated OID", opts->tag_name); - - check_lg2(git_tag_delete(state->repo, opts->tag_name), - "Unable to delete tag", opts->tag_name); - - printf("Deleted tag '%s' (was %s)\n", opts->tag_name, abbrev_oid.ptr); - - git_buf_free(&abbrev_oid); - git_object_free(obj); -} - -static void action_create_lighweight_tag(tag_state *state) -{ - git_repository *repo = state->repo; - tag_options *opts = state->opts; - git_oid oid; - git_object *target; - - check(!opts->tag_name, "Name required"); - - if (!opts->target) opts->target = "HEAD"; - - check(!opts->target, "Target required"); - - check_lg2(git_revparse_single(&target, repo, opts->target), - "Unable to resolve spec", opts->target); - - check_lg2(git_tag_create_lightweight(&oid, repo, opts->tag_name, - target, opts->force), "Unable to create tag", NULL); - - git_object_free(target); -} - -static void action_create_tag(tag_state *state) -{ - git_repository *repo = state->repo; - tag_options *opts = state->opts; - git_signature *tagger; - git_oid oid; - git_object *target; - - check(!opts->tag_name, "Name required"); - check(!opts->message, "Message required"); - - if (!opts->target) opts->target = "HEAD"; - - check_lg2(git_revparse_single(&target, repo, opts->target), - "Unable to resolve spec", opts->target); - - check_lg2(git_signature_default(&tagger, repo), - "Unable to create signature", NULL); - - check_lg2(git_tag_create(&oid, repo, opts->tag_name, - target, tagger, opts->message, opts->force), "Unable to create tag", NULL); - - git_object_free(target); - git_signature_free(tagger); -} - -static void print_usage(void) -{ - fprintf(stderr, "usage: see `git help tag`\n"); - exit(1); -} - -/** Parse command line arguments and choose action to run when done */ -static void parse_options(tag_action *action, tag_options *opts, int argc, char **argv) -{ - args_info args = ARGS_INFO_INIT; - *action = &action_list_tags; - - for (args.pos = 1; args.pos < argc; ++args.pos) { - const char *curr = argv[args.pos]; - - if (curr[0] != '-') { - if (!opts->tag_name) - opts->tag_name = curr; - else if (!opts->target) - opts->target = curr; - else - print_usage(); - - if (*action != &action_create_tag) - *action = &action_create_lighweight_tag; - } else if (!strcmp(curr, "-n")) { - opts->num_lines = 1; - *action = &action_list_tags; - } else if (!strcmp(curr, "-a")) { - *action = &action_create_tag; - } else if (!strcmp(curr, "-f")) { - opts->force = 1; - } else if (match_int_arg(&opts->num_lines, &args, "-n", 0)) { - *action = &action_list_tags; - } else if (match_str_arg(&opts->pattern, &args, "-l")) { - *action = &action_list_tags; - } else if (match_str_arg(&opts->tag_name, &args, "-d")) { - *action = &action_delete_tag; - } else if (match_str_arg(&opts->message, &args, "-m")) { - *action = &action_create_tag; - } - } -} - -/** Initialize tag_options struct */ -static void tag_options_init(tag_options *opts) -{ - memset(opts, 0, sizeof(*opts)); - - opts->message = NULL; - opts->pattern = NULL; - opts->tag_name = NULL; - opts->target = NULL; - opts->num_lines = 0; - opts->force = 0; -} - -int main(int argc, char **argv) -{ - git_repository *repo; - tag_options opts; - tag_action action; - tag_state state; - - git_libgit2_init(); - - check_lg2(git_repository_open_ext(&repo, ".", 0, NULL), - "Could not open repository", NULL); - - tag_options_init(&opts); - parse_options(&action, &opts, argc, argv); - - state.repo = repo; - state.opts = &opts; - action(&state); - - git_repository_free(repo); - git_libgit2_shutdown(); - - return 0; -} diff --git a/vendor/libgit2/examples/test/test-rev-list.sh b/vendor/libgit2/examples/test/test-rev-list.sh deleted file mode 100755 index aa645be5e..000000000 --- a/vendor/libgit2/examples/test/test-rev-list.sh +++ /dev/null @@ -1,95 +0,0 @@ -#!/bin/bash - -THIS_FILE="$(readlink -f "$0")" -ROOT="$(dirname "$(dirname "$(dirname "$THIS_FILE")")")" -PROGRAM="$ROOT"/examples/rev-list -LIBDIR="$ROOT"/build -REPO="$ROOT"/tests/resources/testrepo.git - -cd "$REPO" - -run () { - LD_LIBRARY_PATH="$LIBDIR" "$PROGRAM" "$@" -} - -diff -u - <(run --date-order a4a7dce) </dev/null || -a4a7dce85cf63874e984719f4fdd239f5145052f -c47800c7266a2be04c571c04d5a6614691ea99bd -9fd738e8f7967c078dceed8190330fc8648ee56a -4a202b346bb0fb0db7eff3cffeb3c70babbd2045 -5b5b025afb0b4c913b4c338a42934a3863bf3644 -8496071c1b46c854b31185ea97743be6a8774479 -EOF -diff -u - <(echo "$out") </dev/null || -8496071c1b46c854b31185ea97743be6a8774479 -5b5b025afb0b4c913b4c338a42934a3863bf3644 -4a202b346bb0fb0db7eff3cffeb3c70babbd2045 -9fd738e8f7967c078dceed8190330fc8648ee56a -c47800c7266a2be04c571c04d5a6614691ea99bd -a4a7dce85cf63874e984719f4fdd239f5145052f -EOF -diff -u - <(echo "$out") </dev/null || -a4a7dce85cf63874e984719f4fdd239f5145052f -c47800c7266a2be04c571c04d5a6614691ea99bd -9fd738e8f7967c078dceed8190330fc8648ee56a -4a202b346bb0fb0db7eff3cffeb3c70babbd2045 -5b5b025afb0b4c913b4c338a42934a3863bf3644 -8496071c1b46c854b31185ea97743be6a8774479 -EOF -diff -u - <(echo "$out") <"Author""" -# -# "ok" means the author consents to relicensing all their -# contributed code (possibly with some exceptions) -# "no" means the author does not consent -# "ask" means that the contributor wants to give/withhold -# his/her consent on a patch-by-patch basis. -# "???" means the person is a prominent contributor who has -# not yet made his/her standpoint clear. -# -# Please try to keep the list alphabetically ordered. It will -# help in case we get all 600-ish git.git authors on it. -# -# (Paul Kocher is the author of the mozilla-sha1 implementation -# but has otherwise not contributed to git.) -# -ok Adam Simpkins (http transport) -ok Adrian Johnson -ok Alexey Shumkin -ok Andreas Ericsson -ok Antoine Pelisse -ok Boyd Lynn Gerber -ok Brandon Casey -ok Brian Downing -ok Brian Gernhardt -ok Christian Couder -ok Daniel Barkalow -ok Florian Forster -ok Gustaf Hendeby -ok Holger Weiss -ok Jeff King -ok Johannes Schindelin -ok Johannes Sixt -ask Jonathan Nieder -ok Junio C Hamano -ok Kristian Høgsberg -ok Linus Torvalds -ok Lukas Sandström -ok Matthieu Moy -ok Michael Haggerty -ok Nicolas Pitre -ok Paolo Bonzini -ok Paul Kocher -ok Peter Hagervall -ok Petr Onderka -ok Pierre Habouzit -ok Pieter de Bie -ok René Scharfe -ok Sebastian Schuberth -ok Shawn O. Pearce -ok Steffen Prohaska -ok Sven Verdoolaege -ask Thomas Rast (ok before 6-Oct-2013) -ok Torsten Bögershausen diff --git a/vendor/libgit2/include/git2.h b/vendor/libgit2/include/git2.h deleted file mode 100644 index ac4a63160..000000000 --- a/vendor/libgit2/include/git2.h +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#ifndef INCLUDE_git_git_h__ -#define INCLUDE_git_git_h__ - -#include "git2/annotated_commit.h" -#include "git2/attr.h" -#include "git2/blob.h" -#include "git2/blame.h" -#include "git2/branch.h" -#include "git2/buffer.h" -#include "git2/checkout.h" -#include "git2/cherrypick.h" -#include "git2/clone.h" -#include "git2/commit.h" -#include "git2/common.h" -#include "git2/config.h" -#include "git2/describe.h" -#include "git2/diff.h" -#include "git2/errors.h" -#include "git2/filter.h" -#include "git2/global.h" -#include "git2/graph.h" -#include "git2/ignore.h" -#include "git2/index.h" -#include "git2/indexer.h" -#include "git2/merge.h" -#include "git2/message.h" -#include "git2/net.h" -#include "git2/notes.h" -#include "git2/object.h" -#include "git2/odb.h" -#include "git2/odb_backend.h" -#include "git2/oid.h" -#include "git2/pack.h" -#include "git2/patch.h" -#include "git2/pathspec.h" -#include "git2/rebase.h" -#include "git2/refdb.h" -#include "git2/reflog.h" -#include "git2/refs.h" -#include "git2/refspec.h" -#include "git2/remote.h" -#include "git2/repository.h" -#include "git2/reset.h" -#include "git2/revert.h" -#include "git2/revparse.h" -#include "git2/revwalk.h" -#include "git2/signature.h" -#include "git2/stash.h" -#include "git2/status.h" -#include "git2/submodule.h" -#include "git2/tag.h" -#include "git2/transport.h" -#include "git2/transaction.h" -#include "git2/tree.h" -#include "git2/types.h" -#include "git2/version.h" - -#endif diff --git a/vendor/libgit2/include/git2/annotated_commit.h b/vendor/libgit2/include/git2/annotated_commit.h deleted file mode 100644 index 7fb896a5f..000000000 --- a/vendor/libgit2/include/git2/annotated_commit.h +++ /dev/null @@ -1,116 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_git_annotated_commit_h__ -#define INCLUDE_git_annotated_commit_h__ - -#include "common.h" -#include "repository.h" -#include "types.h" - -/** - * @file git2/annotated_commit.h - * @brief Git annotated commit routines - * @defgroup git_annotated_commit Git annotated commit routines - * @ingroup Git - * @{ - */ -GIT_BEGIN_DECL - -/** - * Creates a `git_annotated_commit` from the given reference. - * The resulting git_annotated_commit must be freed with - * `git_annotated_commit_free`. - * - * @param out pointer to store the git_annotated_commit result in - * @param repo repository that contains the given reference - * @param ref reference to use to lookup the git_annotated_commit - * @return 0 on success or error code - */ -GIT_EXTERN(int) git_annotated_commit_from_ref( - git_annotated_commit **out, - git_repository *repo, - const git_reference *ref); - -/** - * Creates a `git_annotated_commit` from the given fetch head data. - * The resulting git_annotated_commit must be freed with - * `git_annotated_commit_free`. - * - * @param out pointer to store the git_annotated_commit result in - * @param repo repository that contains the given commit - * @param branch_name name of the (remote) branch - * @param remote_url url of the remote - * @param id the commit object id of the remote branch - * @return 0 on success or error code - */ -GIT_EXTERN(int) git_annotated_commit_from_fetchhead( - git_annotated_commit **out, - git_repository *repo, - const char *branch_name, - const char *remote_url, - const git_oid *id); - -/** - * Creates a `git_annotated_commit` from the given commit id. - * The resulting git_annotated_commit must be freed with - * `git_annotated_commit_free`. - * - * An annotated commit contains information about how it was - * looked up, which may be useful for functions like merge or - * rebase to provide context to the operation. For example, - * conflict files will include the name of the source or target - * branches being merged. It is therefore preferable to use the - * most specific function (eg `git_annotated_commit_from_ref`) - * instead of this one when that data is known. - * - * @param out pointer to store the git_annotated_commit result in - * @param repo repository that contains the given commit - * @param id the commit object id to lookup - * @return 0 on success or error code - */ -GIT_EXTERN(int) git_annotated_commit_lookup( - git_annotated_commit **out, - git_repository *repo, - const git_oid *id); - -/** - * Creates a `git_annotated_comit` from a revision string. - * - * See `man gitrevisions`, or - * http://git-scm.com/docs/git-rev-parse.html#_specifying_revisions for - * information on the syntax accepted. - * - * @param out pointer to store the git_annotated_commit result in - * @param repo repository that contains the given commit - * @param revspec the extended sha syntax string to use to lookup the commit - * @return 0 on success or error code - */ -GIT_EXTERN(int) git_annotated_commit_from_revspec( - git_annotated_commit **out, - git_repository *repo, - const char *revspec); - -/** - * Gets the commit ID that the given `git_annotated_commit` refers to. - * - * @param commit the given annotated commit - * @return commit id - */ -GIT_EXTERN(const git_oid *) git_annotated_commit_id( - const git_annotated_commit *commit); - -/** - * Frees a `git_annotated_commit`. - * - * @param commit annotated commit to free - */ -GIT_EXTERN(void) git_annotated_commit_free( - git_annotated_commit *commit); - -/** @} */ -GIT_END_DECL -#endif diff --git a/vendor/libgit2/include/git2/attr.h b/vendor/libgit2/include/git2/attr.h deleted file mode 100644 index 0238f3dd7..000000000 --- a/vendor/libgit2/include/git2/attr.h +++ /dev/null @@ -1,245 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_git_attr_h__ -#define INCLUDE_git_attr_h__ - -#include "common.h" -#include "types.h" - -/** - * @file git2/attr.h - * @brief Git attribute management routines - * @defgroup git_attr Git attribute management routines - * @ingroup Git - * @{ - */ -GIT_BEGIN_DECL - -/** - * GIT_ATTR_TRUE checks if an attribute is set on. In core git - * parlance, this the value for "Set" attributes. - * - * For example, if the attribute file contains: - * - * *.c foo - * - * Then for file `xyz.c` looking up attribute "foo" gives a value for - * which `GIT_ATTR_TRUE(value)` is true. - */ -#define GIT_ATTR_TRUE(attr) (git_attr_value(attr) == GIT_ATTR_TRUE_T) - -/** - * GIT_ATTR_FALSE checks if an attribute is set off. In core git - * parlance, this is the value for attributes that are "Unset" (not to - * be confused with values that a "Unspecified"). - * - * For example, if the attribute file contains: - * - * *.h -foo - * - * Then for file `zyx.h` looking up attribute "foo" gives a value for - * which `GIT_ATTR_FALSE(value)` is true. - */ -#define GIT_ATTR_FALSE(attr) (git_attr_value(attr) == GIT_ATTR_FALSE_T) - -/** - * GIT_ATTR_UNSPECIFIED checks if an attribute is unspecified. This - * may be due to the attribute not being mentioned at all or because - * the attribute was explicitly set unspecified via the `!` operator. - * - * For example, if the attribute file contains: - * - * *.c foo - * *.h -foo - * onefile.c !foo - * - * Then for `onefile.c` looking up attribute "foo" yields a value with - * `GIT_ATTR_UNSPECIFIED(value)` of true. Also, looking up "foo" on - * file `onefile.rb` or looking up "bar" on any file will all give - * `GIT_ATTR_UNSPECIFIED(value)` of true. - */ -#define GIT_ATTR_UNSPECIFIED(attr) (git_attr_value(attr) == GIT_ATTR_UNSPECIFIED_T) - -/** - * GIT_ATTR_HAS_VALUE checks if an attribute is set to a value (as - * opposed to TRUE, FALSE or UNSPECIFIED). This would be the case if - * for a file with something like: - * - * *.txt eol=lf - * - * Given this, looking up "eol" for `onefile.txt` will give back the - * string "lf" and `GIT_ATTR_SET_TO_VALUE(attr)` will return true. - */ -#define GIT_ATTR_HAS_VALUE(attr) (git_attr_value(attr) == GIT_ATTR_VALUE_T) - -/** - * Possible states for an attribute - */ -typedef enum { - GIT_ATTR_UNSPECIFIED_T = 0, /**< The attribute has been left unspecified */ - GIT_ATTR_TRUE_T, /**< The attribute has been set */ - GIT_ATTR_FALSE_T, /**< The attribute has been unset */ - GIT_ATTR_VALUE_T, /**< This attribute has a value */ -} git_attr_t; - -/** - * Return the value type for a given attribute. - * - * This can be either `TRUE`, `FALSE`, `UNSPECIFIED` (if the attribute - * was not set at all), or `VALUE`, if the attribute was set to an - * actual string. - * - * If the attribute has a `VALUE` string, it can be accessed normally - * as a NULL-terminated C string. - * - * @param attr The attribute - * @return the value type for the attribute - */ -GIT_EXTERN(git_attr_t) git_attr_value(const char *attr); - -/** - * Check attribute flags: Reading values from index and working directory. - * - * When checking attributes, it is possible to check attribute files - * in both the working directory (if there is one) and the index (if - * there is one). You can explicitly choose where to check and in - * which order using the following flags. - * - * Core git usually checks the working directory then the index, - * except during a checkout when it checks the index first. It will - * use index only for creating archives or for a bare repo (if an - * index has been specified for the bare repo). - */ -#define GIT_ATTR_CHECK_FILE_THEN_INDEX 0 -#define GIT_ATTR_CHECK_INDEX_THEN_FILE 1 -#define GIT_ATTR_CHECK_INDEX_ONLY 2 - -/** - * Check attribute flags: Using the system attributes file. - * - * Normally, attribute checks include looking in the /etc (or system - * equivalent) directory for a `gitattributes` file. Passing this - * flag will cause attribute checks to ignore that file. - */ -#define GIT_ATTR_CHECK_NO_SYSTEM (1 << 2) - -/** - * Look up the value of one git attribute for path. - * - * @param value_out Output of the value of the attribute. Use the GIT_ATTR_... - * macros to test for TRUE, FALSE, UNSPECIFIED, etc. or just - * use the string value for attributes set to a value. You - * should NOT modify or free this value. - * @param repo The repository containing the path. - * @param flags A combination of GIT_ATTR_CHECK... flags. - * @param path The path to check for attributes. Relative paths are - * interpreted relative to the repo root. The file does - * not have to exist, but if it does not, then it will be - * treated as a plain file (not a directory). - * @param name The name of the attribute to look up. - */ -GIT_EXTERN(int) git_attr_get( - const char **value_out, - git_repository *repo, - uint32_t flags, - const char *path, - const char *name); - -/** - * Look up a list of git attributes for path. - * - * Use this if you have a known list of attributes that you want to - * look up in a single call. This is somewhat more efficient than - * calling `git_attr_get()` multiple times. - * - * For example, you might write: - * - * const char *attrs[] = { "crlf", "diff", "foo" }; - * const char **values[3]; - * git_attr_get_many(values, repo, 0, "my/fun/file.c", 3, attrs); - * - * Then you could loop through the 3 values to get the settings for - * the three attributes you asked about. - * - * @param values_out An array of num_attr entries that will have string - * pointers written into it for the values of the attributes. - * You should not modify or free the values that are written - * into this array (although of course, you should free the - * array itself if you allocated it). - * @param repo The repository containing the path. - * @param flags A combination of GIT_ATTR_CHECK... flags. - * @param path The path inside the repo to check attributes. This - * does not have to exist, but if it does not, then - * it will be treated as a plain file (i.e. not a directory). - * @param num_attr The number of attributes being looked up - * @param names An array of num_attr strings containing attribute names. - */ -GIT_EXTERN(int) git_attr_get_many( - const char **values_out, - git_repository *repo, - uint32_t flags, - const char *path, - size_t num_attr, - const char **names); - -typedef int (*git_attr_foreach_cb)(const char *name, const char *value, void *payload); - -/** - * Loop over all the git attributes for a path. - * - * @param repo The repository containing the path. - * @param flags A combination of GIT_ATTR_CHECK... flags. - * @param path Path inside the repo to check attributes. This does not have - * to exist, but if it does not, then it will be treated as a - * plain file (i.e. not a directory). - * @param callback Function to invoke on each attribute name and value. The - * value may be NULL is the attribute is explicitly set to - * UNSPECIFIED using the '!' sign. Callback will be invoked - * only once per attribute name, even if there are multiple - * rules for a given file. The highest priority rule will be - * used. Return a non-zero value from this to stop looping. - * The value will be returned from `git_attr_foreach`. - * @param payload Passed on as extra parameter to callback function. - * @return 0 on success, non-zero callback return value, or error code - */ -GIT_EXTERN(int) git_attr_foreach( - git_repository *repo, - uint32_t flags, - const char *path, - git_attr_foreach_cb callback, - void *payload); - -/** - * Flush the gitattributes cache. - * - * Call this if you have reason to believe that the attributes files on - * disk no longer match the cached contents of memory. This will cause - * the attributes files to be reloaded the next time that an attribute - * access function is called. - */ -GIT_EXTERN(void) git_attr_cache_flush( - git_repository *repo); - -/** - * Add a macro definition. - * - * Macros will automatically be loaded from the top level `.gitattributes` - * file of the repository (plus the build-in "binary" macro). This - * function allows you to add others. For example, to add the default - * macro, you would call: - * - * git_attr_add_macro(repo, "binary", "-diff -crlf"); - */ -GIT_EXTERN(int) git_attr_add_macro( - git_repository *repo, - const char *name, - const char *values); - -/** @} */ -GIT_END_DECL -#endif - diff --git a/vendor/libgit2/include/git2/blame.h b/vendor/libgit2/include/git2/blame.h deleted file mode 100644 index 84bb7f94c..000000000 --- a/vendor/libgit2/include/git2/blame.h +++ /dev/null @@ -1,212 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#ifndef INCLUDE_git_blame_h__ -#define INCLUDE_git_blame_h__ - -#include "common.h" -#include "oid.h" - -/** - * @file git2/blame.h - * @brief Git blame routines - * @defgroup git_blame Git blame routines - * @ingroup Git - * @{ - */ -GIT_BEGIN_DECL - -/** - * Flags for indicating option behavior for git_blame APIs. - */ -typedef enum { - /** Normal blame, the default */ - GIT_BLAME_NORMAL = 0, - /** Track lines that have moved within a file (like `git blame -M`). - * NOT IMPLEMENTED. */ - GIT_BLAME_TRACK_COPIES_SAME_FILE = (1<<0), - /** Track lines that have moved across files in the same commit (like `git blame -C`). - * NOT IMPLEMENTED. */ - GIT_BLAME_TRACK_COPIES_SAME_COMMIT_MOVES = (1<<1), - /** Track lines that have been copied from another file that exists in the - * same commit (like `git blame -CC`). Implies SAME_FILE. - * NOT IMPLEMENTED. */ - GIT_BLAME_TRACK_COPIES_SAME_COMMIT_COPIES = (1<<2), - /** Track lines that have been copied from another file that exists in *any* - * commit (like `git blame -CCC`). Implies SAME_COMMIT_COPIES. - * NOT IMPLEMENTED. */ - GIT_BLAME_TRACK_COPIES_ANY_COMMIT_COPIES = (1<<3), - /** Restrict the search of commits to those reachable following only the - * first parents. */ - GIT_BLAME_FIRST_PARENT = (1<<4), -} git_blame_flag_t; - -/** - * Blame options structure - * - * Use zeros to indicate default settings. It's easiest to use the - * `GIT_BLAME_OPTIONS_INIT` macro: - * git_blame_options opts = GIT_BLAME_OPTIONS_INIT; - * - * - `flags` is a combination of the `git_blame_flag_t` values above. - * - `min_match_characters` is the lower bound on the number of alphanumeric - * characters that must be detected as moving/copying within a file for it to - * associate those lines with the parent commit. The default value is 20. - * This value only takes effect if any of the `GIT_BLAME_TRACK_COPIES_*` - * flags are specified. - * - `newest_commit` is the id of the newest commit to consider. The default - * is HEAD. - * - `oldest_commit` is the id of the oldest commit to consider. The default - * is the first commit encountered with a NULL parent. - * - `min_line` is the first line in the file to blame. The default is 1 (line - * numbers start with 1). - * - `max_line` is the last line in the file to blame. The default is the last - * line of the file. - */ -typedef struct git_blame_options { - unsigned int version; - - uint32_t flags; - uint16_t min_match_characters; - git_oid newest_commit; - git_oid oldest_commit; - size_t min_line; - size_t max_line; -} git_blame_options; - -#define GIT_BLAME_OPTIONS_VERSION 1 -#define GIT_BLAME_OPTIONS_INIT {GIT_BLAME_OPTIONS_VERSION} - -/** - * Initializes a `git_blame_options` with default values. Equivalent to - * creating an instance with GIT_BLAME_OPTIONS_INIT. - * - * @param opts The `git_blame_options` struct to initialize - * @param version Version of struct; pass `GIT_BLAME_OPTIONS_VERSION` - * @return Zero on success; -1 on failure. - */ -GIT_EXTERN(int) git_blame_init_options( - git_blame_options *opts, - unsigned int version); - -/** - * Structure that represents a blame hunk. - * - * - `lines_in_hunk` is the number of lines in this hunk - * - `final_commit_id` is the OID of the commit where this line was last - * changed. - * - `final_start_line_number` is the 1-based line number where this hunk - * begins, in the final version of the file - * - `orig_commit_id` is the OID of the commit where this hunk was found. This - * will usually be the same as `final_commit_id`, except when - * `GIT_BLAME_TRACK_COPIES_ANY_COMMIT_COPIES` has been specified. - * - `orig_path` is the path to the file where this hunk originated, as of the - * commit specified by `orig_commit_id`. - * - `orig_start_line_number` is the 1-based line number where this hunk begins - * in the file named by `orig_path` in the commit specified by - * `orig_commit_id`. - * - `boundary` is 1 iff the hunk has been tracked to a boundary commit (the - * root, or the commit specified in git_blame_options.oldest_commit) - */ -typedef struct git_blame_hunk { - size_t lines_in_hunk; - - git_oid final_commit_id; - size_t final_start_line_number; - git_signature *final_signature; - - git_oid orig_commit_id; - const char *orig_path; - size_t orig_start_line_number; - git_signature *orig_signature; - - char boundary; -} git_blame_hunk; - - -/* Opaque structure to hold blame results */ -typedef struct git_blame git_blame; - -/** - * Gets the number of hunks that exist in the blame structure. - */ -GIT_EXTERN(uint32_t) git_blame_get_hunk_count(git_blame *blame); - -/** - * Gets the blame hunk at the given index. - * - * @param blame the blame structure to query - * @param index index of the hunk to retrieve - * @return the hunk at the given index, or NULL on error - */ -GIT_EXTERN(const git_blame_hunk*) git_blame_get_hunk_byindex( - git_blame *blame, - uint32_t index); - -/** - * Gets the hunk that relates to the given line number in the newest commit. - * - * @param blame the blame structure to query - * @param lineno the (1-based) line number to find a hunk for - * @return the hunk that contains the given line, or NULL on error - */ -GIT_EXTERN(const git_blame_hunk*) git_blame_get_hunk_byline( - git_blame *blame, - size_t lineno); - -/** - * Get the blame for a single file. - * - * @param out pointer that will receive the blame object - * @param repo repository whose history is to be walked - * @param path path to file to consider - * @param options options for the blame operation. If NULL, this is treated as - * though GIT_BLAME_OPTIONS_INIT were passed. - * @return 0 on success, or an error code. (use giterr_last for information - * about the error.) - */ -GIT_EXTERN(int) git_blame_file( - git_blame **out, - git_repository *repo, - const char *path, - git_blame_options *options); - - -/** - * Get blame data for a file that has been modified in memory. The `reference` - * parameter is a pre-calculated blame for the in-odb history of the file. This - * means that once a file blame is completed (which can be expensive), updating - * the buffer blame is very fast. - * - * Lines that differ between the buffer and the committed version are marked as - * having a zero OID for their final_commit_id. - * - * @param out pointer that will receive the resulting blame data - * @param reference cached blame from the history of the file (usually the output - * from git_blame_file) - * @param buffer the (possibly) modified contents of the file - * @param buffer_len number of valid bytes in the buffer - * @return 0 on success, or an error code. (use giterr_last for information - * about the error) - */ -GIT_EXTERN(int) git_blame_buffer( - git_blame **out, - git_blame *reference, - const char *buffer, - size_t buffer_len); - -/** - * Free memory allocated by git_blame_file or git_blame_buffer. - * - * @param blame the blame structure to free - */ -GIT_EXTERN(void) git_blame_free(git_blame *blame); - -/** @} */ -GIT_END_DECL -#endif - diff --git a/vendor/libgit2/include/git2/blob.h b/vendor/libgit2/include/git2/blob.h deleted file mode 100644 index 9a57c37f5..000000000 --- a/vendor/libgit2/include/git2/blob.h +++ /dev/null @@ -1,221 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_git_blob_h__ -#define INCLUDE_git_blob_h__ - -#include "common.h" -#include "types.h" -#include "oid.h" -#include "object.h" -#include "buffer.h" - -/** - * @file git2/blob.h - * @brief Git blob load and write routines - * @defgroup git_blob Git blob load and write routines - * @ingroup Git - * @{ - */ -GIT_BEGIN_DECL - -/** - * Lookup a blob object from a repository. - * - * @param blob pointer to the looked up blob - * @param repo the repo to use when locating the blob. - * @param id identity of the blob to locate. - * @return 0 or an error code - */ -GIT_EXTERN(int) git_blob_lookup(git_blob **blob, git_repository *repo, const git_oid *id); - -/** - * Lookup a blob object from a repository, - * given a prefix of its identifier (short id). - * - * @see git_object_lookup_prefix - * - * @param blob pointer to the looked up blob - * @param repo the repo to use when locating the blob. - * @param id identity of the blob to locate. - * @param len the length of the short identifier - * @return 0 or an error code - */ -GIT_EXTERN(int) git_blob_lookup_prefix(git_blob **blob, git_repository *repo, const git_oid *id, size_t len); - -/** - * Close an open blob - * - * This is a wrapper around git_object_free() - * - * IMPORTANT: - * It *is* necessary to call this method when you stop - * using a blob. Failure to do so will cause a memory leak. - * - * @param blob the blob to close - */ -GIT_EXTERN(void) git_blob_free(git_blob *blob); - -/** - * Get the id of a blob. - * - * @param blob a previously loaded blob. - * @return SHA1 hash for this blob. - */ -GIT_EXTERN(const git_oid *) git_blob_id(const git_blob *blob); - -/** - * Get the repository that contains the blob. - * - * @param blob A previously loaded blob. - * @return Repository that contains this blob. - */ -GIT_EXTERN(git_repository *) git_blob_owner(const git_blob *blob); - -/** - * Get a read-only buffer with the raw content of a blob. - * - * A pointer to the raw content of a blob is returned; - * this pointer is owned internally by the object and shall - * not be free'd. The pointer may be invalidated at a later - * time. - * - * @param blob pointer to the blob - * @return the pointer - */ -GIT_EXTERN(const void *) git_blob_rawcontent(const git_blob *blob); - -/** - * Get the size in bytes of the contents of a blob - * - * @param blob pointer to the blob - * @return size on bytes - */ -GIT_EXTERN(git_off_t) git_blob_rawsize(const git_blob *blob); - -/** - * Get a buffer with the filtered content of a blob. - * - * This applies filters as if the blob was being checked out to the - * working directory under the specified filename. This may apply - * CRLF filtering or other types of changes depending on the file - * attributes set for the blob and the content detected in it. - * - * The output is written into a `git_buf` which the caller must free - * when done (via `git_buf_free`). - * - * If no filters need to be applied, then the `out` buffer will just - * be populated with a pointer to the raw content of the blob. In - * that case, be careful to *not* free the blob until done with the - * buffer or copy it into memory you own. - * - * @param out The git_buf to be filled in - * @param blob Pointer to the blob - * @param as_path Path used for file attribute lookups, etc. - * @param check_for_binary_data Should this test if blob content contains - * NUL bytes / looks like binary data before applying filters? - * @return 0 on success or an error code - */ -GIT_EXTERN(int) git_blob_filtered_content( - git_buf *out, - git_blob *blob, - const char *as_path, - int check_for_binary_data); - -/** - * Read a file from the working folder of a repository - * and write it to the Object Database as a loose blob - * - * @param id return the id of the written blob - * @param repo repository where the blob will be written. - * this repository cannot be bare - * @param relative_path file from which the blob will be created, - * relative to the repository's working dir - * @return 0 or an error code - */ -GIT_EXTERN(int) git_blob_create_fromworkdir(git_oid *id, git_repository *repo, const char *relative_path); - -/** - * Read a file from the filesystem and write its content - * to the Object Database as a loose blob - * - * @param id return the id of the written blob - * @param repo repository where the blob will be written. - * this repository can be bare or not - * @param path file from which the blob will be created - * @return 0 or an error code - */ -GIT_EXTERN(int) git_blob_create_fromdisk(git_oid *id, git_repository *repo, const char *path); - - -typedef int (*git_blob_chunk_cb)(char *content, size_t max_length, void *payload); - -/** - * Write a loose blob to the Object Database from a - * provider of chunks of data. - * - * If the `hintpath` parameter is filled, it will be used to determine - * what git filters should be applied to the object before it is written - * to the object database. - * - * The implementation of the callback MUST respect the following rules: - * - * - `content` must be filled by the callback. The maximum number of - * bytes that the buffer can accept per call is defined by the - * `max_length` parameter. Allocation and freeing of the buffer will - * be taken care of by libgit2. - * - * - The `callback` must return the number of bytes that have been - * written to the `content` buffer. - * - * - When there is no more data to stream, `callback` should return 0. - * This will prevent it from being invoked anymore. - * - * - If an error occurs, the callback should return a negative value. - * This value will be returned to the caller. - * - * @param id Return the id of the written blob - * @param repo Repository where the blob will be written. - * This repository can be bare or not. - * @param hintpath If not NULL, will be used to select data filters - * to apply onto the content of the blob to be created. - * @return 0 or error code (from either libgit2 or callback function) - */ -GIT_EXTERN(int) git_blob_create_fromchunks( - git_oid *id, - git_repository *repo, - const char *hintpath, - git_blob_chunk_cb callback, - void *payload); - -/** - * Write an in-memory buffer to the ODB as a blob - * - * @param id return the id of the written blob - * @param repo repository where to blob will be written - * @param buffer data to be written into the blob - * @param len length of the data - * @return 0 or an error code - */ -GIT_EXTERN(int) git_blob_create_frombuffer( - git_oid *id, git_repository *repo, const void *buffer, size_t len); - -/** - * Determine if the blob content is most certainly binary or not. - * - * The heuristic used to guess if a file is binary is taken from core git: - * Searching for NUL bytes and looking for a reasonable ratio of printable - * to non-printable characters among the first 8000 bytes. - * - * @param blob The blob which content should be analyzed - * @return 1 if the content of the blob is detected - * as binary; 0 otherwise. - */ -GIT_EXTERN(int) git_blob_is_binary(const git_blob *blob); - -/** @} */ -GIT_END_DECL -#endif diff --git a/vendor/libgit2/include/git2/branch.h b/vendor/libgit2/include/git2/branch.h deleted file mode 100644 index 34354f4e5..000000000 --- a/vendor/libgit2/include/git2/branch.h +++ /dev/null @@ -1,280 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_git_branch_h__ -#define INCLUDE_git_branch_h__ - -#include "common.h" -#include "oid.h" -#include "types.h" - -/** - * @file git2/branch.h - * @brief Git branch parsing routines - * @defgroup git_branch Git branch management - * @ingroup Git - * @{ - */ -GIT_BEGIN_DECL - -/** - * Create a new branch pointing at a target commit - * - * A new direct reference will be created pointing to - * this target commit. If `force` is true and a reference - * already exists with the given name, it'll be replaced. - * - * The returned reference must be freed by the user. - * - * The branch name will be checked for validity. - * See `git_tag_create()` for rules about valid names. - * - * @param out Pointer where to store the underlying reference. - * - * @param branch_name Name for the branch; this name is - * validated for consistency. It should also not conflict with - * an already existing branch name. - * - * @param target Commit to which this branch should point. This object - * must belong to the given `repo`. - * - * @param force Overwrite existing branch. - * - * @return 0, GIT_EINVALIDSPEC or an error code. - * A proper reference is written in the refs/heads namespace - * pointing to the provided target commit. - */ -GIT_EXTERN(int) git_branch_create( - git_reference **out, - git_repository *repo, - const char *branch_name, - const git_commit *target, - int force); - -/** - * Create a new branch pointing at a target commit - * - * This behaves like `git_branch_create()` but takes an annotated - * commit, which lets you specify which extended sha syntax string was - * specified by a user, allowing for more exact reflog messages. - * - * See the documentation for `git_branch_create()`. - * - * @see git_branch_create - */ -GIT_EXTERN(int) git_branch_create_from_annotated( - git_reference **ref_out, - git_repository *repository, - const char *branch_name, - const git_annotated_commit *commit, - int force); - -/** - * Delete an existing branch reference. - * - * If the branch is successfully deleted, the passed reference - * object will be invalidated. The reference must be freed manually - * by the user. - * - * @param branch A valid reference representing a branch - * @return 0 on success, or an error code. - */ -GIT_EXTERN(int) git_branch_delete(git_reference *branch); - -/** Iterator type for branches */ -typedef struct git_branch_iterator git_branch_iterator; - -/** - * Create an iterator which loops over the requested branches. - * - * @param out the iterator - * @param repo Repository where to find the branches. - * @param list_flags Filtering flags for the branch - * listing. Valid values are GIT_BRANCH_LOCAL, GIT_BRANCH_REMOTE - * or GIT_BRANCH_ALL. - * - * @return 0 on success or an error code - */ -GIT_EXTERN(int) git_branch_iterator_new( - git_branch_iterator **out, - git_repository *repo, - git_branch_t list_flags); - -/** - * Retrieve the next branch from the iterator - * - * @param out the reference - * @param out_type the type of branch (local or remote-tracking) - * @param iter the branch iterator - * @return 0 on success, GIT_ITEROVER if there are no more branches or an error code. - */ -GIT_EXTERN(int) git_branch_next(git_reference **out, git_branch_t *out_type, git_branch_iterator *iter); - -/** - * Free a branch iterator - * - * @param iter the iterator to free - */ -GIT_EXTERN(void) git_branch_iterator_free(git_branch_iterator *iter); - -/** - * Move/rename an existing local branch reference. - * - * The new branch name will be checked for validity. - * See `git_tag_create()` for rules about valid names. - * - * @param branch Current underlying reference of the branch. - * - * @param new_branch_name Target name of the branch once the move - * is performed; this name is validated for consistency. - * - * @param force Overwrite existing branch. - * - * @return 0 on success, GIT_EINVALIDSPEC or an error code. - */ -GIT_EXTERN(int) git_branch_move( - git_reference **out, - git_reference *branch, - const char *new_branch_name, - int force); - -/** - * Lookup a branch by its name in a repository. - * - * The generated reference must be freed by the user. - * - * The branch name will be checked for validity. - * See `git_tag_create()` for rules about valid names. - * - * @param out pointer to the looked-up branch reference - * - * @param repo the repository to look up the branch - * - * @param branch_name Name of the branch to be looked-up; - * this name is validated for consistency. - * - * @param branch_type Type of the considered branch. This should - * be valued with either GIT_BRANCH_LOCAL or GIT_BRANCH_REMOTE. - * - * @return 0 on success; GIT_ENOTFOUND when no matching branch - * exists, GIT_EINVALIDSPEC, otherwise an error code. - */ -GIT_EXTERN(int) git_branch_lookup( - git_reference **out, - git_repository *repo, - const char *branch_name, - git_branch_t branch_type); - -/** - * Return the name of the given local or remote branch. - * - * The name of the branch matches the definition of the name - * for git_branch_lookup. That is, if the returned name is given - * to git_branch_lookup() then the reference is returned that - * was given to this function. - * - * @param out where the pointer of branch name is stored; - * this is valid as long as the ref is not freed. - * @param ref the reference ideally pointing to a branch - * - * @return 0 on success; otherwise an error code (e.g., if the - * ref is no local or remote branch). - */ -GIT_EXTERN(int) git_branch_name( - const char **out, - const git_reference *ref); - -/** - * Return the reference supporting the remote tracking branch, - * given a local branch reference. - * - * @param out Pointer where to store the retrieved - * reference. - * - * @param branch Current underlying reference of the branch. - * - * @return 0 on success; GIT_ENOTFOUND when no remote tracking - * reference exists, otherwise an error code. - */ -GIT_EXTERN(int) git_branch_upstream( - git_reference **out, - const git_reference *branch); - -/** - * Set the upstream configuration for a given local branch - * - * @param branch the branch to configure - * - * @param upstream_name remote-tracking or local branch to set as - * upstream. Pass NULL to unset. - * - * @return 0 or an error code - */ -GIT_EXTERN(int) git_branch_set_upstream(git_reference *branch, const char *upstream_name); - -/** - * Return the name of the reference supporting the remote tracking branch, - * given the name of a local branch reference. - * - * @param out Pointer to the user-allocated git_buf which will be - * filled with the name of the reference. - * - * @param repo the repository where the branches live - * - * @param refname reference name of the local branch. - * - * @return 0, GIT_ENOTFOUND when no remote tracking reference exists, - * otherwise an error code. - */ -GIT_EXTERN(int) git_branch_upstream_name( - git_buf *out, - git_repository *repo, - const char *refname); - -/** - * Determine if the current local branch is pointed at by HEAD. - * - * @param branch Current underlying reference of the branch. - * - * @return 1 if HEAD points at the branch, 0 if it isn't, - * error code otherwise. - */ -GIT_EXTERN(int) git_branch_is_head( - const git_reference *branch); - -/** - * Return the name of remote that the remote tracking branch belongs to. - * - * @param out Pointer to the user-allocated git_buf which will be filled with the name of the remote. - * - * @param repo The repository where the branch lives. - * - * @param canonical_branch_name name of the remote tracking branch. - * - * @return 0, GIT_ENOTFOUND - * when no remote matching remote was found, - * GIT_EAMBIGUOUS when the branch maps to several remotes, - * otherwise an error code. - */ -GIT_EXTERN(int) git_branch_remote_name( - git_buf *out, - git_repository *repo, - const char *canonical_branch_name); - - -/** - * Retrieve the name fo the upstream remote of a local branch - * - * @param buf the buffer into which to write the name - * @param repo the repository in which to look - * @param refname the full name of the branch - * @return 0 or an error code - */ - GIT_EXTERN(int) git_branch_upstream_remote(git_buf *buf, git_repository *repo, const char *refname); - -/** @} */ -GIT_END_DECL -#endif diff --git a/vendor/libgit2/include/git2/buffer.h b/vendor/libgit2/include/git2/buffer.h deleted file mode 100644 index 9fc6a5805..000000000 --- a/vendor/libgit2/include/git2/buffer.h +++ /dev/null @@ -1,128 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_git_buf_h__ -#define INCLUDE_git_buf_h__ - -#include "common.h" - -/** - * @file git2/buffer.h - * @brief Buffer export structure - * - * @ingroup Git - * @{ - */ -GIT_BEGIN_DECL - -/** - * A data buffer for exporting data from libgit2 - * - * Sometimes libgit2 wants to return an allocated data buffer to the - * caller and have the caller take responsibility for freeing that memory. - * This can be awkward if the caller does not have easy access to the same - * allocation functions that libgit2 is using. In those cases, libgit2 - * will fill in a `git_buf` and the caller can use `git_buf_free()` to - * release it when they are done. - * - * A `git_buf` may also be used for the caller to pass in a reference to - * a block of memory they hold. In this case, libgit2 will not resize or - * free the memory, but will read from it as needed. - * - * A `git_buf` is a public structure with three fields: - * - * - `ptr` points to the start of the allocated memory. If it is NULL, - * then the `git_buf` is considered empty and libgit2 will feel free - * to overwrite it with new data. - * - * - `size` holds the size (in bytes) of the data that is actually used. - * - * - `asize` holds the known total amount of allocated memory if the `ptr` - * was allocated by libgit2. It may be larger than `size`. If `ptr` - * was not allocated by libgit2 and should not be resized and/or freed, - * then `asize` will be set to zero. - * - * Some APIs may occasionally do something slightly unusual with a buffer, - * such as setting `ptr` to a value that was passed in by the user. In - * those cases, the behavior will be clearly documented by the API. - */ -typedef struct { - char *ptr; - size_t asize, size; -} git_buf; - -/** - * Static initializer for git_buf from static buffer - */ -#define GIT_BUF_INIT_CONST(STR,LEN) { (char *)(STR), 0, (size_t)(LEN) } - -/** - * Free the memory referred to by the git_buf. - * - * Note that this does not free the `git_buf` itself, just the memory - * pointed to by `buffer->ptr`. This will not free the memory if it looks - * like it was not allocated internally, but it will clear the buffer back - * to the empty state. - * - * @param buffer The buffer to deallocate - */ -GIT_EXTERN(void) git_buf_free(git_buf *buffer); - -/** - * Resize the buffer allocation to make more space. - * - * This will attempt to grow the buffer to accommodate the target size. - * - * If the buffer refers to memory that was not allocated by libgit2 (i.e. - * the `asize` field is zero), then `ptr` will be replaced with a newly - * allocated block of data. Be careful so that memory allocated by the - * caller is not lost. As a special variant, if you pass `target_size` as - * 0 and the memory is not allocated by libgit2, this will allocate a new - * buffer of size `size` and copy the external data into it. - * - * Currently, this will never shrink a buffer, only expand it. - * - * If the allocation fails, this will return an error and the buffer will be - * marked as invalid for future operations, invaliding the contents. - * - * @param buffer The buffer to be resized; may or may not be allocated yet - * @param target_size The desired available size - * @return 0 on success, -1 on allocation failure - */ -GIT_EXTERN(int) git_buf_grow(git_buf *buffer, size_t target_size); - -/** - * Set buffer to a copy of some raw data. - * - * @param buffer The buffer to set - * @param data The data to copy into the buffer - * @param datalen The length of the data to copy into the buffer - * @return 0 on success, -1 on allocation failure - */ -GIT_EXTERN(int) git_buf_set( - git_buf *buffer, const void *data, size_t datalen); - -/** -* Check quickly if buffer looks like it contains binary data -* -* @param buf Buffer to check -* @return 1 if buffer looks like non-text data -*/ -GIT_EXTERN(int) git_buf_is_binary(const git_buf *buf); - -/** -* Check quickly if buffer contains a NUL byte -* -* @param buf Buffer to check -* @return 1 if buffer contains a NUL byte -*/ -GIT_EXTERN(int) git_buf_contains_nul(const git_buf *buf); - -GIT_END_DECL - -/** @} */ - -#endif diff --git a/vendor/libgit2/include/git2/checkout.h b/vendor/libgit2/include/git2/checkout.h deleted file mode 100644 index 6cf9ed8bd..000000000 --- a/vendor/libgit2/include/git2/checkout.h +++ /dev/null @@ -1,358 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_git_checkout_h__ -#define INCLUDE_git_checkout_h__ - -#include "common.h" -#include "types.h" -#include "diff.h" - -/** - * @file git2/checkout.h - * @brief Git checkout routines - * @defgroup git_checkout Git checkout routines - * @ingroup Git - * @{ - */ -GIT_BEGIN_DECL - -/** - * Checkout behavior flags - * - * In libgit2, checkout is used to update the working directory and index - * to match a target tree. Unlike git checkout, it does not move the HEAD - * commit for you - use `git_repository_set_head` or the like to do that. - * - * Checkout looks at (up to) four things: the "target" tree you want to - * check out, the "baseline" tree of what was checked out previously, the - * working directory for actual files, and the index for staged changes. - * - * You give checkout one of three strategies for update: - * - * - `GIT_CHECKOUT_NONE` is a dry-run strategy that checks for conflicts, - * etc., but doesn't make any actual changes. - * - * - `GIT_CHECKOUT_FORCE` is at the opposite extreme, taking any action to - * make the working directory match the target (including potentially - * discarding modified files). - * - * - `GIT_CHECKOUT_SAFE` is between these two options, it will only make - * modifications that will not lose changes. - * - * | target == baseline | target != baseline | - * ---------------------|-----------------------|----------------------| - * workdir == baseline | no action | create, update, or | - * | | delete file | - * ---------------------|-----------------------|----------------------| - * workdir exists and | no action | conflict (notify | - * is != baseline | notify dirty MODIFIED | and cancel checkout) | - * ---------------------|-----------------------|----------------------| - * workdir missing, | notify dirty DELETED | create file | - * baseline present | | | - * ---------------------|-----------------------|----------------------| - * - * To emulate `git checkout`, use `GIT_CHECKOUT_SAFE` with a checkout - * notification callback (see below) that displays information about dirty - * files. The default behavior will cancel checkout on conflicts. - * - * To emulate `git checkout-index`, use `GIT_CHECKOUT_SAFE` with a - * notification callback that cancels the operation if a dirty-but-existing - * file is found in the working directory. This core git command isn't - * quite "force" but is sensitive about some types of changes. - * - * To emulate `git checkout -f`, use `GIT_CHECKOUT_FORCE`. - * - * - * There are some additional flags to modified the behavior of checkout: - * - * - GIT_CHECKOUT_ALLOW_CONFLICTS makes SAFE mode apply safe file updates - * even if there are conflicts (instead of cancelling the checkout). - * - * - GIT_CHECKOUT_REMOVE_UNTRACKED means remove untracked files (i.e. not - * in target, baseline, or index, and not ignored) from the working dir. - * - * - GIT_CHECKOUT_REMOVE_IGNORED means remove ignored files (that are also - * untracked) from the working directory as well. - * - * - GIT_CHECKOUT_UPDATE_ONLY means to only update the content of files that - * already exist. Files will not be created nor deleted. This just skips - * applying adds, deletes, and typechanges. - * - * - GIT_CHECKOUT_DONT_UPDATE_INDEX prevents checkout from writing the - * updated files' information to the index. - * - * - Normally, checkout will reload the index and git attributes from disk - * before any operations. GIT_CHECKOUT_NO_REFRESH prevents this reload. - * - * - Unmerged index entries are conflicts. GIT_CHECKOUT_SKIP_UNMERGED skips - * files with unmerged index entries instead. GIT_CHECKOUT_USE_OURS and - * GIT_CHECKOUT_USE_THEIRS to proceed with the checkout using either the - * stage 2 ("ours") or stage 3 ("theirs") version of files in the index. - * - * - GIT_CHECKOUT_DONT_OVERWRITE_IGNORED prevents ignored files from being - * overwritten. Normally, files that are ignored in the working directory - * are not considered "precious" and may be overwritten if the checkout - * target contains that file. - * - * - GIT_CHECKOUT_DONT_REMOVE_EXISTING prevents checkout from removing - * files or folders that fold to the same name on case insensitive - * filesystems. This can cause files to retain their existing names - * and write through existing symbolic links. - */ -typedef enum { - GIT_CHECKOUT_NONE = 0, /**< default is a dry run, no actual updates */ - - /** Allow safe updates that cannot overwrite uncommitted data */ - GIT_CHECKOUT_SAFE = (1u << 0), - - /** Allow all updates to force working directory to look like index */ - GIT_CHECKOUT_FORCE = (1u << 1), - - - /** Allow checkout to recreate missing files */ - GIT_CHECKOUT_RECREATE_MISSING = (1u << 2), - - /** Allow checkout to make safe updates even if conflicts are found */ - GIT_CHECKOUT_ALLOW_CONFLICTS = (1u << 4), - - /** Remove untracked files not in index (that are not ignored) */ - GIT_CHECKOUT_REMOVE_UNTRACKED = (1u << 5), - - /** Remove ignored files not in index */ - GIT_CHECKOUT_REMOVE_IGNORED = (1u << 6), - - /** Only update existing files, don't create new ones */ - GIT_CHECKOUT_UPDATE_ONLY = (1u << 7), - - /** - * Normally checkout updates index entries as it goes; this stops that. - * Implies `GIT_CHECKOUT_DONT_WRITE_INDEX`. - */ - GIT_CHECKOUT_DONT_UPDATE_INDEX = (1u << 8), - - /** Don't refresh index/config/etc before doing checkout */ - GIT_CHECKOUT_NO_REFRESH = (1u << 9), - - /** Allow checkout to skip unmerged files */ - GIT_CHECKOUT_SKIP_UNMERGED = (1u << 10), - /** For unmerged files, checkout stage 2 from index */ - GIT_CHECKOUT_USE_OURS = (1u << 11), - /** For unmerged files, checkout stage 3 from index */ - GIT_CHECKOUT_USE_THEIRS = (1u << 12), - - /** Treat pathspec as simple list of exact match file paths */ - GIT_CHECKOUT_DISABLE_PATHSPEC_MATCH = (1u << 13), - - /** Ignore directories in use, they will be left empty */ - GIT_CHECKOUT_SKIP_LOCKED_DIRECTORIES = (1u << 18), - - /** Don't overwrite ignored files that exist in the checkout target */ - GIT_CHECKOUT_DONT_OVERWRITE_IGNORED = (1u << 19), - - /** Write normal merge files for conflicts */ - GIT_CHECKOUT_CONFLICT_STYLE_MERGE = (1u << 20), - - /** Include common ancestor data in diff3 format files for conflicts */ - GIT_CHECKOUT_CONFLICT_STYLE_DIFF3 = (1u << 21), - - /** Don't overwrite existing files or folders */ - GIT_CHECKOUT_DONT_REMOVE_EXISTING = (1u << 22), - - /** Normally checkout writes the index upon completion; this prevents that. */ - GIT_CHECKOUT_DONT_WRITE_INDEX = (1u << 23), - - /** - * THE FOLLOWING OPTIONS ARE NOT YET IMPLEMENTED - */ - - /** Recursively checkout submodules with same options (NOT IMPLEMENTED) */ - GIT_CHECKOUT_UPDATE_SUBMODULES = (1u << 16), - /** Recursively checkout submodules if HEAD moved in super repo (NOT IMPLEMENTED) */ - GIT_CHECKOUT_UPDATE_SUBMODULES_IF_CHANGED = (1u << 17), - -} git_checkout_strategy_t; - -/** - * Checkout notification flags - * - * Checkout will invoke an options notification callback (`notify_cb`) for - * certain cases - you pick which ones via `notify_flags`: - * - * - GIT_CHECKOUT_NOTIFY_CONFLICT invokes checkout on conflicting paths. - * - * - GIT_CHECKOUT_NOTIFY_DIRTY notifies about "dirty" files, i.e. those that - * do not need an update but no longer match the baseline. Core git - * displays these files when checkout runs, but won't stop the checkout. - * - * - GIT_CHECKOUT_NOTIFY_UPDATED sends notification for any file changed. - * - * - GIT_CHECKOUT_NOTIFY_UNTRACKED notifies about untracked files. - * - * - GIT_CHECKOUT_NOTIFY_IGNORED notifies about ignored files. - * - * Returning a non-zero value from this callback will cancel the checkout. - * The non-zero return value will be propagated back and returned by the - * git_checkout_... call. - * - * Notification callbacks are made prior to modifying any files on disk, - * so canceling on any notification will still happen prior to any files - * being modified. - */ -typedef enum { - GIT_CHECKOUT_NOTIFY_NONE = 0, - GIT_CHECKOUT_NOTIFY_CONFLICT = (1u << 0), - GIT_CHECKOUT_NOTIFY_DIRTY = (1u << 1), - GIT_CHECKOUT_NOTIFY_UPDATED = (1u << 2), - GIT_CHECKOUT_NOTIFY_UNTRACKED = (1u << 3), - GIT_CHECKOUT_NOTIFY_IGNORED = (1u << 4), - - GIT_CHECKOUT_NOTIFY_ALL = 0x0FFFFu -} git_checkout_notify_t; - -typedef struct { - size_t mkdir_calls; - size_t stat_calls; - size_t chmod_calls; -} git_checkout_perfdata; - -/** Checkout notification callback function */ -typedef int (*git_checkout_notify_cb)( - git_checkout_notify_t why, - const char *path, - const git_diff_file *baseline, - const git_diff_file *target, - const git_diff_file *workdir, - void *payload); - -/** Checkout progress notification function */ -typedef void (*git_checkout_progress_cb)( - const char *path, - size_t completed_steps, - size_t total_steps, - void *payload); - -/** Checkout perfdata notification function */ -typedef void (*git_checkout_perfdata_cb)( - const git_checkout_perfdata *perfdata, - void *payload); - -/** - * Checkout options structure - * - * Zero out for defaults. Initialize with `GIT_CHECKOUT_OPTIONS_INIT` macro to - * correctly set the `version` field. E.g. - * - * git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - */ -typedef struct git_checkout_options { - unsigned int version; - - unsigned int checkout_strategy; /**< default will be a dry run */ - - int disable_filters; /**< don't apply filters like CRLF conversion */ - unsigned int dir_mode; /**< default is 0755 */ - unsigned int file_mode; /**< default is 0644 or 0755 as dictated by blob */ - int file_open_flags; /**< default is O_CREAT | O_TRUNC | O_WRONLY */ - - unsigned int notify_flags; /**< see `git_checkout_notify_t` above */ - git_checkout_notify_cb notify_cb; - void *notify_payload; - - /** Optional callback to notify the consumer of checkout progress. */ - git_checkout_progress_cb progress_cb; - void *progress_payload; - - /** When not zeroed out, array of fnmatch patterns specifying which - * paths should be taken into account, otherwise all files. Use - * GIT_CHECKOUT_DISABLE_PATHSPEC_MATCH to treat as simple list. - */ - git_strarray paths; - - /** The expected content of the working directory; defaults to HEAD. - * If the working directory does not match this baseline information, - * that will produce a checkout conflict. - */ - git_tree *baseline; - - /** Like `baseline` above, though expressed as an index. This - * option overrides `baseline`. - */ - git_index *baseline_index; /**< expected content of workdir, expressed as an index. */ - - const char *target_directory; /**< alternative checkout path to workdir */ - - const char *ancestor_label; /**< the name of the common ancestor side of conflicts */ - const char *our_label; /**< the name of the "our" side of conflicts */ - const char *their_label; /**< the name of the "their" side of conflicts */ - - /** Optional callback to notify the consumer of performance data. */ - git_checkout_perfdata_cb perfdata_cb; - void *perfdata_payload; -} git_checkout_options; - -#define GIT_CHECKOUT_OPTIONS_VERSION 1 -#define GIT_CHECKOUT_OPTIONS_INIT {GIT_CHECKOUT_OPTIONS_VERSION} - -/** -* Initializes a `git_checkout_options` with default values. Equivalent to -* creating an instance with GIT_CHECKOUT_OPTIONS_INIT. -* -* @param opts the `git_checkout_options` struct to initialize. -* @param version Version of struct; pass `GIT_CHECKOUT_OPTIONS_VERSION` -* @return Zero on success; -1 on failure. -*/ -GIT_EXTERN(int) git_checkout_init_options( - git_checkout_options *opts, - unsigned int version); - -/** - * Updates files in the index and the working tree to match the content of - * the commit pointed at by HEAD. - * - * @param repo repository to check out (must be non-bare) - * @param opts specifies checkout options (may be NULL) - * @return 0 on success, GIT_EUNBORNBRANCH if HEAD points to a non - * existing branch, non-zero value returned by `notify_cb`, or - * other error code < 0 (use giterr_last for error details) - */ -GIT_EXTERN(int) git_checkout_head( - git_repository *repo, - const git_checkout_options *opts); - -/** - * Updates files in the working tree to match the content of the index. - * - * @param repo repository into which to check out (must be non-bare) - * @param index index to be checked out (or NULL to use repository index) - * @param opts specifies checkout options (may be NULL) - * @return 0 on success, non-zero return value from `notify_cb`, or error - * code < 0 (use giterr_last for error details) - */ -GIT_EXTERN(int) git_checkout_index( - git_repository *repo, - git_index *index, - const git_checkout_options *opts); - -/** - * Updates files in the index and working tree to match the content of the - * tree pointed at by the treeish. - * - * @param repo repository to check out (must be non-bare) - * @param treeish a commit, tag or tree which content will be used to update - * the working directory (or NULL to use HEAD) - * @param opts specifies checkout options (may be NULL) - * @return 0 on success, non-zero return value from `notify_cb`, or error - * code < 0 (use giterr_last for error details) - */ -GIT_EXTERN(int) git_checkout_tree( - git_repository *repo, - const git_object *treeish, - const git_checkout_options *opts); - -/** @} */ -GIT_END_DECL -#endif diff --git a/vendor/libgit2/include/git2/cherrypick.h b/vendor/libgit2/include/git2/cherrypick.h deleted file mode 100644 index edec96a94..000000000 --- a/vendor/libgit2/include/git2/cherrypick.h +++ /dev/null @@ -1,90 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_git_cherrypick_h__ -#define INCLUDE_git_cherrypick_h__ - -#include "common.h" -#include "types.h" -#include "merge.h" - -/** - * @file git2/cherrypick.h - * @brief Git cherry-pick routines - * @defgroup git_cherrypick Git cherry-pick routines - * @ingroup Git - * @{ - */ -GIT_BEGIN_DECL - -/** - * Cherry-pick options - */ -typedef struct { - unsigned int version; - - /** For merge commits, the "mainline" is treated as the parent. */ - unsigned int mainline; - - git_merge_options merge_opts; /**< Options for the merging */ - git_checkout_options checkout_opts; /**< Options for the checkout */ -} git_cherrypick_options; - -#define GIT_CHERRYPICK_OPTIONS_VERSION 1 -#define GIT_CHERRYPICK_OPTIONS_INIT {GIT_CHERRYPICK_OPTIONS_VERSION, 0, GIT_MERGE_OPTIONS_INIT, GIT_CHECKOUT_OPTIONS_INIT} - -/** - * Initializes a `git_cherrypick_options` with default values. Equivalent to - * creating an instance with GIT_CHERRYPICK_OPTIONS_INIT. - * - * @param opts the `git_cherrypick_options` struct to initialize - * @param version Version of struct; pass `GIT_CHERRYPICK_OPTIONS_VERSION` - * @return Zero on success; -1 on failure. - */ -GIT_EXTERN(int) git_cherrypick_init_options( - git_cherrypick_options *opts, - unsigned int version); - -/** - * Cherry-picks the given commit against the given "our" commit, producing an - * index that reflects the result of the cherry-pick. - * - * The returned index must be freed explicitly with `git_index_free`. - * - * @param out pointer to store the index result in - * @param repo the repository that contains the given commits - * @param cherrypick_commit the commit to cherry-pick - * @param our_commit the commit to revert against (eg, HEAD) - * @param mainline the parent of the revert commit, if it is a merge - * @param merge_options the merge options (or null for defaults) - * @return zero on success, -1 on failure. - */ -GIT_EXTERN(int) git_cherrypick_commit( - git_index **out, - git_repository *repo, - git_commit *cherrypick_commit, - git_commit *our_commit, - unsigned int mainline, - const git_merge_options *merge_options); - -/** - * Cherry-pick the given commit, producing changes in the index and working directory. - * - * @param repo the repository to cherry-pick - * @param commit the commit to cherry-pick - * @param cherrypick_options the cherry-pick options (or null for defaults) - * @return zero on success, -1 on failure. - */ -GIT_EXTERN(int) git_cherrypick( - git_repository *repo, - git_commit *commit, - const git_cherrypick_options *cherrypick_options); - -/** @} */ -GIT_END_DECL - -#endif - diff --git a/vendor/libgit2/include/git2/clone.h b/vendor/libgit2/include/git2/clone.h deleted file mode 100644 index 9e23aaccb..000000000 --- a/vendor/libgit2/include/git2/clone.h +++ /dev/null @@ -1,207 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_git_clone_h__ -#define INCLUDE_git_clone_h__ - -#include "common.h" -#include "types.h" -#include "indexer.h" -#include "checkout.h" -#include "remote.h" -#include "transport.h" - - -/** - * @file git2/clone.h - * @brief Git cloning routines - * @defgroup git_clone Git cloning routines - * @ingroup Git - * @{ - */ -GIT_BEGIN_DECL - -/** - * Options for bypassing the git-aware transport on clone. Bypassing - * it means that instead of a fetch, libgit2 will copy the object - * database directory instead of figuring out what it needs, which is - * faster. If possible, it will hardlink the files to save space. - */ -typedef enum { - /** - * Auto-detect (default), libgit2 will bypass the git-aware - * transport for local paths, but use a normal fetch for - * `file://` urls. - */ - GIT_CLONE_LOCAL_AUTO, - /** - * Bypass the git-aware transport even for a `file://` url. - */ - GIT_CLONE_LOCAL, - /** - * Do no bypass the git-aware transport - */ - GIT_CLONE_NO_LOCAL, - /** - * Bypass the git-aware transport, but do not try to use - * hardlinks. - */ - GIT_CLONE_LOCAL_NO_LINKS, -} git_clone_local_t; - -/** - * The signature of a function matching git_remote_create, with an additional - * void* as a callback payload. - * - * Callers of git_clone may provide a function matching this signature to override - * the remote creation and customization process during a clone operation. - * - * @param out the resulting remote - * @param repo the repository in which to create the remote - * @param name the remote's name - * @param url the remote's url - * @param payload an opaque payload - * @return 0, GIT_EINVALIDSPEC, GIT_EEXISTS or an error code - */ -typedef int (*git_remote_create_cb)( - git_remote **out, - git_repository *repo, - const char *name, - const char *url, - void *payload); - -/** - * The signature of a function matchin git_repository_init, with an - * aditional void * as callback payload. - * - * Callers of git_clone my provide a function matching this signature - * to override the repository creation and customization process - * during a clone operation. - * - * @param out the resulting repository - * @param path path in which to create the repository - * @param bare whether the repository is bare. This is the value from the clone options - * @param payload payload specified by the options - * @return 0, or a negative value to indicate error - */ -typedef int (*git_repository_create_cb)( - git_repository **out, - const char *path, - int bare, - void *payload); - -/** - * Clone options structure - * - * Use the GIT_CLONE_OPTIONS_INIT to get the default settings, like this: - * - * git_clone_options opts = GIT_CLONE_OPTIONS_INIT; - */ -typedef struct git_clone_options { - unsigned int version; - - /** - * These options are passed to the checkout step. To disable - * checkout, set the `checkout_strategy` to - * `GIT_CHECKOUT_NONE`. - */ - git_checkout_options checkout_opts; - - /** - * Options which control the fetch, including callbacks. - * - * The callbacks are used for reporting fetch progress, and for acquiring - * credentials in the event they are needed. - */ - git_fetch_options fetch_opts; - - /** - * Set to zero (false) to create a standard repo, or non-zero - * for a bare repo - */ - int bare; - - /** - * Whether to use a fetch or copy the object database. - */ - git_clone_local_t local; - - /** - * The name of the branch to checkout. NULL means use the - * remote's default branch. - */ - const char* checkout_branch; - - /** - * A callback used to create the new repository into which to - * clone. If NULL, the 'bare' field will be used to determine - * whether to create a bare repository. - */ - git_repository_create_cb repository_cb; - - /** - * An opaque payload to pass to the git_repository creation callback. - * This parameter is ignored unless repository_cb is non-NULL. - */ - void *repository_cb_payload; - - /** - * A callback used to create the git_remote, prior to its being - * used to perform the clone operation. See the documentation for - * git_remote_create_cb for details. This parameter may be NULL, - * indicating that git_clone should provide default behavior. - */ - git_remote_create_cb remote_cb; - - /** - * An opaque payload to pass to the git_remote creation callback. - * This parameter is ignored unless remote_cb is non-NULL. - */ - void *remote_cb_payload; -} git_clone_options; - -#define GIT_CLONE_OPTIONS_VERSION 1 -#define GIT_CLONE_OPTIONS_INIT { GIT_CLONE_OPTIONS_VERSION, \ - { GIT_CHECKOUT_OPTIONS_VERSION, GIT_CHECKOUT_SAFE }, \ - GIT_FETCH_OPTIONS_INIT } - -/** - * Initializes a `git_clone_options` with default values. Equivalent to - * creating an instance with GIT_CLONE_OPTIONS_INIT. - * - * @param opts The `git_clone_options` struct to initialize - * @param version Version of struct; pass `GIT_CLONE_OPTIONS_VERSION` - * @return Zero on success; -1 on failure. - */ -GIT_EXTERN(int) git_clone_init_options( - git_clone_options *opts, - unsigned int version); - -/** - * Clone a remote repository. - * - * By default this creates its repository and initial remote to match - * git's defaults. You can use the options in the callback to - * customize how these are created. - * - * @param out pointer that will receive the resulting repository object - * @param url the remote repository to clone - * @param local_path local directory to clone to - * @param options configuration options for the clone. If NULL, the - * function works as though GIT_OPTIONS_INIT were passed. - * @return 0 on success, any non-zero return value from a callback - * function, or a negative value to indicate an error (use - * `giterr_last` for a detailed error message) - */ -GIT_EXTERN(int) git_clone( - git_repository **out, - const char *url, - const char *local_path, - const git_clone_options *options); - -/** @} */ -GIT_END_DECL -#endif diff --git a/vendor/libgit2/include/git2/commit.h b/vendor/libgit2/include/git2/commit.h deleted file mode 100644 index 3488c7440..000000000 --- a/vendor/libgit2/include/git2/commit.h +++ /dev/null @@ -1,399 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_git_commit_h__ -#define INCLUDE_git_commit_h__ - -#include "common.h" -#include "types.h" -#include "oid.h" -#include "object.h" - -/** - * @file git2/commit.h - * @brief Git commit parsing, formatting routines - * @defgroup git_commit Git commit parsing, formatting routines - * @ingroup Git - * @{ - */ -GIT_BEGIN_DECL - -/** - * Lookup a commit object from a repository. - * - * The returned object should be released with `git_commit_free` when no - * longer needed. - * - * @param commit pointer to the looked up commit - * @param repo the repo to use when locating the commit. - * @param id identity of the commit to locate. If the object is - * an annotated tag it will be peeled back to the commit. - * @return 0 or an error code - */ -GIT_EXTERN(int) git_commit_lookup( - git_commit **commit, git_repository *repo, const git_oid *id); - -/** - * Lookup a commit object from a repository, given a prefix of its - * identifier (short id). - * - * The returned object should be released with `git_commit_free` when no - * longer needed. - * - * @see git_object_lookup_prefix - * - * @param commit pointer to the looked up commit - * @param repo the repo to use when locating the commit. - * @param id identity of the commit to locate. If the object is - * an annotated tag it will be peeled back to the commit. - * @param len the length of the short identifier - * @return 0 or an error code - */ -GIT_EXTERN(int) git_commit_lookup_prefix( - git_commit **commit, git_repository *repo, const git_oid *id, size_t len); - -/** - * Close an open commit - * - * This is a wrapper around git_object_free() - * - * IMPORTANT: - * It *is* necessary to call this method when you stop - * using a commit. Failure to do so will cause a memory leak. - * - * @param commit the commit to close - */ - -GIT_EXTERN(void) git_commit_free(git_commit *commit); - -/** - * Get the id of a commit. - * - * @param commit a previously loaded commit. - * @return object identity for the commit. - */ -GIT_EXTERN(const git_oid *) git_commit_id(const git_commit *commit); - -/** - * Get the repository that contains the commit. - * - * @param commit A previously loaded commit. - * @return Repository that contains this commit. - */ -GIT_EXTERN(git_repository *) git_commit_owner(const git_commit *commit); - -/** - * Get the encoding for the message of a commit, - * as a string representing a standard encoding name. - * - * The encoding may be NULL if the `encoding` header - * in the commit is missing; in that case UTF-8 is assumed. - * - * @param commit a previously loaded commit. - * @return NULL, or the encoding - */ -GIT_EXTERN(const char *) git_commit_message_encoding(const git_commit *commit); - -/** - * Get the full message of a commit. - * - * The returned message will be slightly prettified by removing any - * potential leading newlines. - * - * @param commit a previously loaded commit. - * @return the message of a commit - */ -GIT_EXTERN(const char *) git_commit_message(const git_commit *commit); - -/** - * Get the full raw message of a commit. - * - * @param commit a previously loaded commit. - * @return the raw message of a commit - */ -GIT_EXTERN(const char *) git_commit_message_raw(const git_commit *commit); - -/** - * Get the short "summary" of the git commit message. - * - * The returned message is the summary of the commit, comprising the - * first paragraph of the message with whitespace trimmed and squashed. - * - * @param commit a previously loaded commit. - * @return the summary of a commit or NULL on error - */ -GIT_EXTERN(const char *) git_commit_summary(git_commit *commit); - -/** - * Get the long "body" of the git commit message. - * - * The returned message is the body of the commit, comprising - * everything but the first paragraph of the message. Leading and - * trailing whitespaces are trimmed. - * - * @param commit a previously loaded commit. - * @return the body of a commit or NULL when no the message only - * consists of a summary - */ -GIT_EXTERN(const char *) git_commit_body(git_commit *commit); - -/** - * Get the commit time (i.e. committer time) of a commit. - * - * @param commit a previously loaded commit. - * @return the time of a commit - */ -GIT_EXTERN(git_time_t) git_commit_time(const git_commit *commit); - -/** - * Get the commit timezone offset (i.e. committer's preferred timezone) of a commit. - * - * @param commit a previously loaded commit. - * @return positive or negative timezone offset, in minutes from UTC - */ -GIT_EXTERN(int) git_commit_time_offset(const git_commit *commit); - -/** - * Get the committer of a commit. - * - * @param commit a previously loaded commit. - * @return the committer of a commit - */ -GIT_EXTERN(const git_signature *) git_commit_committer(const git_commit *commit); - -/** - * Get the author of a commit. - * - * @param commit a previously loaded commit. - * @return the author of a commit - */ -GIT_EXTERN(const git_signature *) git_commit_author(const git_commit *commit); - -/** - * Get the full raw text of the commit header. - * - * @param commit a previously loaded commit - * @return the header text of the commit - */ -GIT_EXTERN(const char *) git_commit_raw_header(const git_commit *commit); - -/** - * Get the tree pointed to by a commit. - * - * @param tree_out pointer where to store the tree object - * @param commit a previously loaded commit. - * @return 0 or an error code - */ -GIT_EXTERN(int) git_commit_tree(git_tree **tree_out, const git_commit *commit); - -/** - * Get the id of the tree pointed to by a commit. This differs from - * `git_commit_tree` in that no attempts are made to fetch an object - * from the ODB. - * - * @param commit a previously loaded commit. - * @return the id of tree pointed to by commit. - */ -GIT_EXTERN(const git_oid *) git_commit_tree_id(const git_commit *commit); - -/** - * Get the number of parents of this commit - * - * @param commit a previously loaded commit. - * @return integer of count of parents - */ -GIT_EXTERN(unsigned int) git_commit_parentcount(const git_commit *commit); - -/** - * Get the specified parent of the commit. - * - * @param out Pointer where to store the parent commit - * @param commit a previously loaded commit. - * @param n the position of the parent (from 0 to `parentcount`) - * @return 0 or an error code - */ -GIT_EXTERN(int) git_commit_parent( - git_commit **out, - const git_commit *commit, - unsigned int n); - -/** - * Get the oid of a specified parent for a commit. This is different from - * `git_commit_parent`, which will attempt to load the parent commit from - * the ODB. - * - * @param commit a previously loaded commit. - * @param n the position of the parent (from 0 to `parentcount`) - * @return the id of the parent, NULL on error. - */ -GIT_EXTERN(const git_oid *) git_commit_parent_id( - const git_commit *commit, - unsigned int n); - -/** - * Get the commit object that is the th generation ancestor - * of the named commit object, following only the first parents. - * The returned commit has to be freed by the caller. - * - * Passing `0` as the generation number returns another instance of the - * base commit itself. - * - * @param ancestor Pointer where to store the ancestor commit - * @param commit a previously loaded commit. - * @param n the requested generation - * @return 0 on success; GIT_ENOTFOUND if no matching ancestor exists - * or an error code - */ -GIT_EXTERN(int) git_commit_nth_gen_ancestor( - git_commit **ancestor, - const git_commit *commit, - unsigned int n); - -/** - * Get an arbitrary header field - * - * @param out the buffer to fill - * @param commit the commit to look in - * @param field the header field to return - * @return 0 on succeess, GIT_ENOTFOUND if the field does not exist, - * or an error code - */ -GIT_EXTERN(int) git_commit_header_field(git_buf *out, const git_commit *commit, const char *field); - -/** - * Extract the signature from a commit - * - * If the id is not for a commit, the error class will be - * `GITERR_INVALID`. If the commit does not have a signature, the - * error class will be `GITERR_OBJECT`. - * - * @param signature the signature block - * @param signed_data signed data; this is the commit contents minus the signature block - * @param repo the repository in which the commit exists - * @param commit_id the commit from which to extract the data - * @param field the name of the header field containing the signature - * block; pass `NULL` to extract the default 'gpgsig' - * @return 0 on success, GIT_ENOTFOUND if the id is not for a commit - * or the commit does not have a signature. - */ -GIT_EXTERN(int) git_commit_extract_signature(git_buf *signature, git_buf *signed_data, git_repository *repo, git_oid *commit_id, const char *field); - -/** - * Create new commit in the repository from a list of `git_object` pointers - * - * The message will **not** be cleaned up automatically. You can do that - * with the `git_message_prettify()` function. - * - * @param id Pointer in which to store the OID of the newly created commit - * - * @param repo Repository where to store the commit - * - * @param update_ref If not NULL, name of the reference that - * will be updated to point to this commit. If the reference - * is not direct, it will be resolved to a direct reference. - * Use "HEAD" to update the HEAD of the current branch and - * make it point to this commit. If the reference doesn't - * exist yet, it will be created. If it does exist, the first - * parent must be the tip of this branch. - * - * @param author Signature with author and author time of commit - * - * @param committer Signature with committer and * commit time of commit - * - * @param message_encoding The encoding for the message in the - * commit, represented with a standard encoding name. - * E.g. "UTF-8". If NULL, no encoding header is written and - * UTF-8 is assumed. - * - * @param message Full message for this commit - * - * @param tree An instance of a `git_tree` object that will - * be used as the tree for the commit. This tree object must - * also be owned by the given `repo`. - * - * @param parent_count Number of parents for this commit - * - * @param parents Array of `parent_count` pointers to `git_commit` - * objects that will be used as the parents for this commit. This - * array may be NULL if `parent_count` is 0 (root commit). All the - * given commits must be owned by the `repo`. - * - * @return 0 or an error code - * The created commit will be written to the Object Database and - * the given reference will be updated to point to it - */ -GIT_EXTERN(int) git_commit_create( - git_oid *id, - git_repository *repo, - const char *update_ref, - const git_signature *author, - const git_signature *committer, - const char *message_encoding, - const char *message, - const git_tree *tree, - size_t parent_count, - const git_commit *parents[]); - -/** - * Create new commit in the repository using a variable argument list. - * - * The message will **not** be cleaned up automatically. You can do that - * with the `git_message_prettify()` function. - * - * The parents for the commit are specified as a variable list of pointers - * to `const git_commit *`. Note that this is a convenience method which may - * not be safe to export for certain languages or compilers - * - * All other parameters remain the same as `git_commit_create()`. - * - * @see git_commit_create - */ -GIT_EXTERN(int) git_commit_create_v( - git_oid *id, - git_repository *repo, - const char *update_ref, - const git_signature *author, - const git_signature *committer, - const char *message_encoding, - const char *message, - const git_tree *tree, - size_t parent_count, - ...); - -/** - * Amend an existing commit by replacing only non-NULL values. - * - * This creates a new commit that is exactly the same as the old commit, - * except that any non-NULL values will be updated. The new commit has - * the same parents as the old commit. - * - * The `update_ref` value works as in the regular `git_commit_create()`, - * updating the ref to point to the newly rewritten commit. If you want - * to amend a commit that is not currently the tip of the branch and then - * rewrite the following commits to reach a ref, pass this as NULL and - * update the rest of the commit chain and ref separately. - * - * Unlike `git_commit_create()`, the `author`, `committer`, `message`, - * `message_encoding`, and `tree` parameters can be NULL in which case this - * will use the values from the original `commit_to_amend`. - * - * All parameters have the same meanings as in `git_commit_create()`. - * - * @see git_commit_create - */ -GIT_EXTERN(int) git_commit_amend( - git_oid *id, - const git_commit *commit_to_amend, - const char *update_ref, - const git_signature *author, - const git_signature *committer, - const char *message_encoding, - const char *message, - const git_tree *tree); - -/** @} */ -GIT_END_DECL -#endif diff --git a/vendor/libgit2/include/git2/common.h b/vendor/libgit2/include/git2/common.h deleted file mode 100644 index d7428d811..000000000 --- a/vendor/libgit2/include/git2/common.h +++ /dev/null @@ -1,287 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_git_common_h__ -#define INCLUDE_git_common_h__ - -#include -#include - -#ifdef __cplusplus -# define GIT_BEGIN_DECL extern "C" { -# define GIT_END_DECL } -#else - /** Start declarations in C mode */ -# define GIT_BEGIN_DECL /* empty */ - /** End declarations in C mode */ -# define GIT_END_DECL /* empty */ -#endif - -#if defined(_MSC_VER) && _MSC_VER < 1800 - GIT_BEGIN_DECL -# include "inttypes.h" - GIT_END_DECL -/** This check is needed for importing this file in an iOS/OS X framework throws an error in Xcode otherwise.*/ -#elif !defined(__CLANG_INTTYPES_H) -# include -#endif - -#ifdef DOCURIUM -/* - * This is so clang's doc parser acknowledges comments on functions - * with size_t parameters. - */ -typedef size_t size_t; -#endif - -/** Declare a public function exported for application use. */ -#if __GNUC__ >= 4 -# define GIT_EXTERN(type) extern \ - __attribute__((visibility("default"))) \ - type -#elif defined(_MSC_VER) -# define GIT_EXTERN(type) __declspec(dllexport) type -#else -# define GIT_EXTERN(type) extern type -#endif - -/** Declare a function's takes printf style arguments. */ -#ifdef __GNUC__ -# define GIT_FORMAT_PRINTF(a,b) __attribute__((format (printf, a, b))) -#else -# define GIT_FORMAT_PRINTF(a,b) /* empty */ -#endif - -#if (defined(_WIN32)) && !defined(__CYGWIN__) -#define GIT_WIN32 1 -#endif - -#ifdef __amigaos4__ -#include -#endif - -/** - * @file git2/common.h - * @brief Git common platform definitions - * @defgroup git_common Git common platform definitions - * @ingroup Git - * @{ - */ - -GIT_BEGIN_DECL - -/** - * The separator used in path list strings (ie like in the PATH - * environment variable). A semi-colon ";" is used on Windows, and - * a colon ":" for all other systems. - */ -#ifdef GIT_WIN32 -#define GIT_PATH_LIST_SEPARATOR ';' -#else -#define GIT_PATH_LIST_SEPARATOR ':' -#endif - -/** - * The maximum length of a valid git path. - */ -#define GIT_PATH_MAX 4096 - -/** - * The string representation of the null object ID. - */ -#define GIT_OID_HEX_ZERO "0000000000000000000000000000000000000000" - -/** - * Return the version of the libgit2 library - * being currently used. - * - * @param major Store the major version number - * @param minor Store the minor version number - * @param rev Store the revision (patch) number - */ -GIT_EXTERN(void) git_libgit2_version(int *major, int *minor, int *rev); - -/** - * Combinations of these values describe the features with which libgit2 - * was compiled - */ -typedef enum { - GIT_FEATURE_THREADS = (1 << 0), - GIT_FEATURE_HTTPS = (1 << 1), - GIT_FEATURE_SSH = (1 << 2), - GIT_FEATURE_NSEC = (1 << 3), -} git_feature_t; - -/** - * Query compile time options for libgit2. - * - * @return A combination of GIT_FEATURE_* values. - * - * - GIT_FEATURE_THREADS - * Libgit2 was compiled with thread support. Note that thread support is - * still to be seen as a 'work in progress' - basic object lookups are - * believed to be threadsafe, but other operations may not be. - * - * - GIT_FEATURE_HTTPS - * Libgit2 supports the https:// protocol. This requires the openssl - * library to be found when compiling libgit2. - * - * - GIT_FEATURE_SSH - * Libgit2 supports the SSH protocol for network operations. This requires - * the libssh2 library to be found when compiling libgit2 - */ -GIT_EXTERN(int) git_libgit2_features(void); - -/** - * Global library options - * - * These are used to select which global option to set or get and are - * used in `git_libgit2_opts()`. - */ -typedef enum { - GIT_OPT_GET_MWINDOW_SIZE, - GIT_OPT_SET_MWINDOW_SIZE, - GIT_OPT_GET_MWINDOW_MAPPED_LIMIT, - GIT_OPT_SET_MWINDOW_MAPPED_LIMIT, - GIT_OPT_GET_SEARCH_PATH, - GIT_OPT_SET_SEARCH_PATH, - GIT_OPT_SET_CACHE_OBJECT_LIMIT, - GIT_OPT_SET_CACHE_MAX_SIZE, - GIT_OPT_ENABLE_CACHING, - GIT_OPT_GET_CACHED_MEMORY, - GIT_OPT_GET_TEMPLATE_PATH, - GIT_OPT_SET_TEMPLATE_PATH, - GIT_OPT_SET_SSL_CERT_LOCATIONS, - GIT_OPT_SET_USER_AGENT, - GIT_OPT_ENABLE_STRICT_OBJECT_CREATION, - GIT_OPT_SET_SSL_CIPHERS, -} git_libgit2_opt_t; - -/** - * Set or query a library global option - * - * Available options: - * - * * opts(GIT_OPT_GET_MWINDOW_SIZE, size_t *): - * - * > Get the maximum mmap window size - * - * * opts(GIT_OPT_SET_MWINDOW_SIZE, size_t): - * - * > Set the maximum mmap window size - * - * * opts(GIT_OPT_GET_MWINDOW_MAPPED_LIMIT, size_t *): - * - * > Get the maximum memory that will be mapped in total by the library - * - * * opts(GIT_OPT_SET_MWINDOW_MAPPED_LIMIT, size_t): - * - * >Set the maximum amount of memory that can be mapped at any time - * by the library - * - * * opts(GIT_OPT_GET_SEARCH_PATH, int level, git_buf *buf) - * - * > Get the search path for a given level of config data. "level" must - * > be one of `GIT_CONFIG_LEVEL_SYSTEM`, `GIT_CONFIG_LEVEL_GLOBAL`, - * > `GIT_CONFIG_LEVEL_XDG`, or `GIT_CONFIG_LEVEL_PROGRAMDATA`. - * > The search path is written to the `out` buffer. - * - * * opts(GIT_OPT_SET_SEARCH_PATH, int level, const char *path) - * - * > Set the search path for a level of config data. The search path - * > applied to shared attributes and ignore files, too. - * > - * > - `path` lists directories delimited by GIT_PATH_LIST_SEPARATOR. - * > Pass NULL to reset to the default (generally based on environment - * > variables). Use magic path `$PATH` to include the old value - * > of the path (if you want to prepend or append, for instance). - * > - * > - `level` must be `GIT_CONFIG_LEVEL_SYSTEM`, - * > `GIT_CONFIG_LEVEL_GLOBAL`, `GIT_CONFIG_LEVEL_XDG`, or - * > `GIT_CONFIG_LEVEL_PROGRAMDATA`. - * - * * opts(GIT_OPT_SET_CACHE_OBJECT_LIMIT, git_otype type, size_t size) - * - * > Set the maximum data size for the given type of object to be - * > considered eligible for caching in memory. Setting to value to - * > zero means that that type of object will not be cached. - * > Defaults to 0 for GIT_OBJ_BLOB (i.e. won't cache blobs) and 4k - * > for GIT_OBJ_COMMIT, GIT_OBJ_TREE, and GIT_OBJ_TAG. - * - * * opts(GIT_OPT_SET_CACHE_MAX_SIZE, ssize_t max_storage_bytes) - * - * > Set the maximum total data size that will be cached in memory - * > across all repositories before libgit2 starts evicting objects - * > from the cache. This is a soft limit, in that the library might - * > briefly exceed it, but will start aggressively evicting objects - * > from cache when that happens. The default cache size is 256MB. - * - * * opts(GIT_OPT_ENABLE_CACHING, int enabled) - * - * > Enable or disable caching completely. - * > - * > Because caches are repository-specific, disabling the cache - * > cannot immediately clear all cached objects, but each cache will - * > be cleared on the next attempt to update anything in it. - * - * * opts(GIT_OPT_GET_CACHED_MEMORY, ssize_t *current, ssize_t *allowed) - * - * > Get the current bytes in cache and the maximum that would be - * > allowed in the cache. - * - * * opts(GIT_OPT_GET_TEMPLATE_PATH, git_buf *out) - * - * > Get the default template path. - * > The path is written to the `out` buffer. - * - * * opts(GIT_OPT_SET_TEMPLATE_PATH, const char *path) - * - * > Set the default template path. - * > - * > - `path` directory of template. - * - * * opts(GIT_OPT_SET_SSL_CERT_LOCATIONS, const char *file, const char *path) - * - * > Set the SSL certificate-authority locations. - * > - * > - `file` is the location of a file containing several - * > certificates concatenated together. - * > - `path` is the location of a directory holding several - * > certificates, one per file. - * > - * > Either parameter may be `NULL`, but not both. - * - * * opts(GIT_OPT_SET_USER_AGENT, const char *user_agent) - * - * > Set the value of the User-Agent header. This value will be - * > appended to "git/1.0", for compatibility with other git clients. - * > - * > - `user_agent` is the value that will be delivered as the - * > User-Agent header on HTTP requests. - * - * * opts(GIT_OPT_ENABLE_STRICT_OBJECT_CREATION, int enabled) - * - * > Enable strict input validation when creating new objects - * > to ensure that all inputs to the new objects are valid. For - * > example, when this is enabled, the parent(s) and tree inputs - * > will be validated when creating a new commit. This defaults - * > to disabled. - * * opts(GIT_OPT_SET_SSL_CIPHERS, const char *ciphers) - * - * > Set the SSL ciphers use for HTTPS connections. - * > - * > - `ciphers` is the list of ciphers that are eanbled. - * - * @param option Option key - * @param ... value to set the option - * @return 0 on success, <0 on failure - */ -GIT_EXTERN(int) git_libgit2_opts(int option, ...); - -/** @} */ -GIT_END_DECL - -#endif diff --git a/vendor/libgit2/include/git2/config.h b/vendor/libgit2/include/git2/config.h deleted file mode 100644 index d0f1ba1b3..000000000 --- a/vendor/libgit2/include/git2/config.h +++ /dev/null @@ -1,728 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_git_config_h__ -#define INCLUDE_git_config_h__ - -#include "common.h" -#include "types.h" -#include "buffer.h" - -/** - * @file git2/config.h - * @brief Git config management routines - * @defgroup git_config Git config management routines - * @ingroup Git - * @{ - */ -GIT_BEGIN_DECL - -/** - * Priority level of a config file. - * These priority levels correspond to the natural escalation logic - * (from higher to lower) when searching for config entries in git.git. - * - * git_config_open_default() and git_repository_config() honor those - * priority levels as well. - */ -typedef enum { - /** System-wide on Windows, for compatibility with portable git */ - GIT_CONFIG_LEVEL_PROGRAMDATA = 1, - - /** System-wide configuration file; /etc/gitconfig on Linux systems */ - GIT_CONFIG_LEVEL_SYSTEM = 2, - - /** XDG compatible configuration file; typically ~/.config/git/config */ - GIT_CONFIG_LEVEL_XDG = 3, - - /** User-specific configuration file (also called Global configuration - * file); typically ~/.gitconfig - */ - GIT_CONFIG_LEVEL_GLOBAL = 4, - - /** Repository specific configuration file; $WORK_DIR/.git/config on - * non-bare repos - */ - GIT_CONFIG_LEVEL_LOCAL = 5, - - /** Application specific configuration file; freely defined by applications - */ - GIT_CONFIG_LEVEL_APP = 6, - - /** Represents the highest level available config file (i.e. the most - * specific config file available that actually is loaded) - */ - GIT_CONFIG_HIGHEST_LEVEL = -1, -} git_config_level_t; - -/** - * An entry in a configuration file - */ -typedef struct git_config_entry { - const char *name; /**< Name of the entry (normalised) */ - const char *value; /**< String value of the entry */ - git_config_level_t level; /**< Which config file this was found in */ - void (*free)(struct git_config_entry *entry); /**< Free function for this entry */ - void *payload; /**< Opaque value for the free function. Do not read or write */ -} git_config_entry; - -/** - * Free a config entry - */ -GIT_EXTERN(void) git_config_entry_free(git_config_entry *); - -typedef int (*git_config_foreach_cb)(const git_config_entry *, void *); -typedef struct git_config_iterator git_config_iterator; - -/** - * Config var type - */ -typedef enum { - GIT_CVAR_FALSE = 0, - GIT_CVAR_TRUE = 1, - GIT_CVAR_INT32, - GIT_CVAR_STRING -} git_cvar_t; - -/** - * Mapping from config variables to values. - */ -typedef struct { - git_cvar_t cvar_type; - const char *str_match; - int map_value; -} git_cvar_map; - -/** - * Locate the path to the global configuration file - * - * The user or global configuration file is usually - * located in `$HOME/.gitconfig`. - * - * This method will try to guess the full path to that - * file, if the file exists. The returned path - * may be used on any `git_config` call to load the - * global configuration file. - * - * This method will not guess the path to the xdg compatible - * config file (.config/git/config). - * - * @param out Pointer to a user-allocated git_buf in which to store the path - * @return 0 if a global configuration file has been found. Its path will be stored in `out`. - */ -GIT_EXTERN(int) git_config_find_global(git_buf *out); - -/** - * Locate the path to the global xdg compatible configuration file - * - * The xdg compatible configuration file is usually - * located in `$HOME/.config/git/config`. - * - * This method will try to guess the full path to that - * file, if the file exists. The returned path - * may be used on any `git_config` call to load the - * xdg compatible configuration file. - * - * @param out Pointer to a user-allocated git_buf in which to store the path - * @return 0 if a xdg compatible configuration file has been - * found. Its path will be stored in `out`. - */ -GIT_EXTERN(int) git_config_find_xdg(git_buf *out); - -/** - * Locate the path to the system configuration file - * - * If /etc/gitconfig doesn't exist, it will look for - * %PROGRAMFILES%\Git\etc\gitconfig. - * - * @param out Pointer to a user-allocated git_buf in which to store the path - * @return 0 if a system configuration file has been - * found. Its path will be stored in `out`. - */ -GIT_EXTERN(int) git_config_find_system(git_buf *out); - -/** - * Locate the path to the configuration file in ProgramData - * - * Look for the file in %PROGRAMDATA%\Git\config used by portable git. - * - * @param out Pointer to a user-allocated git_buf in which to store the path - * @return 0 if a ProgramData configuration file has been - * found. Its path will be stored in `out`. - */ -GIT_EXTERN(int) git_config_find_programdata(git_buf *out); - -/** - * Open the global, XDG and system configuration files - * - * Utility wrapper that finds the global, XDG and system configuration files - * and opens them into a single prioritized config object that can be - * used when accessing default config data outside a repository. - * - * @param out Pointer to store the config instance - * @return 0 or an error code - */ -GIT_EXTERN(int) git_config_open_default(git_config **out); - -/** - * Allocate a new configuration object - * - * This object is empty, so you have to add a file to it before you - * can do anything with it. - * - * @param out pointer to the new configuration - * @return 0 or an error code - */ -GIT_EXTERN(int) git_config_new(git_config **out); - -/** - * Add an on-disk config file instance to an existing config - * - * The on-disk file pointed at by `path` will be opened and - * parsed; it's expected to be a native Git config file following - * the default Git config syntax (see man git-config). - * - * If the file does not exist, the file will still be added and it - * will be created the first time we write to it. - * - * Note that the configuration object will free the file - * automatically. - * - * Further queries on this config object will access each - * of the config file instances in order (instances with - * a higher priority level will be accessed first). - * - * @param cfg the configuration to add the file to - * @param path path to the configuration file to add - * @param level the priority level of the backend - * @param force replace config file at the given priority level - * @return 0 on success, GIT_EEXISTS when adding more than one file - * for a given priority level (and force_replace set to 0), - * GIT_ENOTFOUND when the file doesn't exist or error code - */ -GIT_EXTERN(int) git_config_add_file_ondisk( - git_config *cfg, - const char *path, - git_config_level_t level, - int force); - -/** - * Create a new config instance containing a single on-disk file - * - * This method is a simple utility wrapper for the following sequence - * of calls: - * - git_config_new - * - git_config_add_file_ondisk - * - * @param out The configuration instance to create - * @param path Path to the on-disk file to open - * @return 0 on success, or an error code - */ -GIT_EXTERN(int) git_config_open_ondisk(git_config **out, const char *path); - -/** - * Build a single-level focused config object from a multi-level one. - * - * The returned config object can be used to perform get/set/delete operations - * on a single specific level. - * - * Getting several times the same level from the same parent multi-level config - * will return different config instances, but containing the same config_file - * instance. - * - * @param out The configuration instance to create - * @param parent Multi-level config to search for the given level - * @param level Configuration level to search for - * @return 0, GIT_ENOTFOUND if the passed level cannot be found in the - * multi-level parent config, or an error code - */ -GIT_EXTERN(int) git_config_open_level( - git_config **out, - const git_config *parent, - git_config_level_t level); - -/** - * Open the global/XDG configuration file according to git's rules - * - * Git allows you to store your global configuration at - * `$HOME/.config` or `$XDG_CONFIG_HOME/git/config`. For backwards - * compatability, the XDG file shouldn't be used unless the use has - * created it explicitly. With this function you'll open the correct - * one to write to. - * - * @param out pointer in which to store the config object - * @param config the config object in which to look - */ -GIT_EXTERN(int) git_config_open_global(git_config **out, git_config *config); - -/** - * Create a snapshot of the configuration - * - * Create a snapshot of the current state of a configuration, which - * allows you to look into a consistent view of the configuration for - * looking up complex values (e.g. a remote, submodule). - * - * The string returned when querying such a config object is valid - * until it is freed. - * - * @param out pointer in which to store the snapshot config object - * @param config configuration to snapshot - * @return 0 or an error code - */ -GIT_EXTERN(int) git_config_snapshot(git_config **out, git_config *config); - -/** - * Free the configuration and its associated memory and files - * - * @param cfg the configuration to free - */ -GIT_EXTERN(void) git_config_free(git_config *cfg); - -/** - * Get the git_config_entry of a config variable. - * - * Free the git_config_entry after use with `git_config_entry_free()`. - * - * @param out pointer to the variable git_config_entry - * @param cfg where to look for the variable - * @param name the variable's name - * @return 0 or an error code - */ -GIT_EXTERN(int) git_config_get_entry( - git_config_entry **out, - const git_config *cfg, - const char *name); - -/** - * Get the value of an integer config variable. - * - * All config files will be looked into, in the order of their - * defined level. A higher level means a higher priority. The - * first occurrence of the variable will be returned here. - * - * @param out pointer to the variable where the value should be stored - * @param cfg where to look for the variable - * @param name the variable's name - * @return 0 or an error code - */ -GIT_EXTERN(int) git_config_get_int32(int32_t *out, const git_config *cfg, const char *name); - -/** - * Get the value of a long integer config variable. - * - * All config files will be looked into, in the order of their - * defined level. A higher level means a higher priority. The - * first occurrence of the variable will be returned here. - * - * @param out pointer to the variable where the value should be stored - * @param cfg where to look for the variable - * @param name the variable's name - * @return 0 or an error code - */ -GIT_EXTERN(int) git_config_get_int64(int64_t *out, const git_config *cfg, const char *name); - -/** - * Get the value of a boolean config variable. - * - * This function uses the usual C convention of 0 being false and - * anything else true. - * - * All config files will be looked into, in the order of their - * defined level. A higher level means a higher priority. The - * first occurrence of the variable will be returned here. - * - * @param out pointer to the variable where the value should be stored - * @param cfg where to look for the variable - * @param name the variable's name - * @return 0 or an error code - */ -GIT_EXTERN(int) git_config_get_bool(int *out, const git_config *cfg, const char *name); - -/** - * Get the value of a path config variable. - * - * A leading '~' will be expanded to the global search path (which - * defaults to the user's home directory but can be overridden via - * `git_libgit2_opts()`. - * - * All config files will be looked into, in the order of their - * defined level. A higher level means a higher priority. The - * first occurrence of the variable will be returned here. - * - * @param out the buffer in which to store the result - * @param cfg where to look for the variable - * @param name the variable's name - * @return 0 or an error code - */ -GIT_EXTERN(int) git_config_get_path(git_buf *out, const git_config *cfg, const char *name); - -/** - * Get the value of a string config variable. - * - * This function can only be used on snapshot config objects. The - * string is owned by the config and should not be freed by the - * user. The pointer will be valid until the config is freed. - * - * All config files will be looked into, in the order of their - * defined level. A higher level means a higher priority. The - * first occurrence of the variable will be returned here. - * - * @param out pointer to the string - * @param cfg where to look for the variable - * @param name the variable's name - * @return 0 or an error code - */ -GIT_EXTERN(int) git_config_get_string(const char **out, const git_config *cfg, const char *name); - -/** - * Get the value of a string config variable. - * - * The value of the config will be copied into the buffer. - * - * All config files will be looked into, in the order of their - * defined level. A higher level means a higher priority. The - * first occurrence of the variable will be returned here. - * - * @param out buffer in which to store the string - * @param cfg where to look for the variable - * @param name the variable's name - * @return 0 or an error code - */ -GIT_EXTERN(int) git_config_get_string_buf(git_buf *out, const git_config *cfg, const char *name); - -/** - * Get each value of a multivar in a foreach callback - * - * The callback will be called on each variable found - * - * @param cfg where to look for the variable - * @param name the variable's name - * @param regexp regular expression to filter which variables we're - * interested in. Use NULL to indicate all - * @param callback the function to be called on each value of the variable - * @param payload opaque pointer to pass to the callback - */ -GIT_EXTERN(int) git_config_get_multivar_foreach(const git_config *cfg, const char *name, const char *regexp, git_config_foreach_cb callback, void *payload); - -/** - * Get each value of a multivar - * - * @param out pointer to store the iterator - * @param cfg where to look for the variable - * @param name the variable's name - * @param regexp regular expression to filter which variables we're - * interested in. Use NULL to indicate all - */ -GIT_EXTERN(int) git_config_multivar_iterator_new(git_config_iterator **out, const git_config *cfg, const char *name, const char *regexp); - -/** - * Return the current entry and advance the iterator - * - * The pointers returned by this function are valid until the iterator - * is freed. - * - * @param entry pointer to store the entry - * @param iter the iterator - * @return 0 or an error code. GIT_ITEROVER if the iteration has completed - */ -GIT_EXTERN(int) git_config_next(git_config_entry **entry, git_config_iterator *iter); - -/** - * Free a config iterator - * - * @param iter the iterator to free - */ -GIT_EXTERN(void) git_config_iterator_free(git_config_iterator *iter); - -/** - * Set the value of an integer config variable in the config file - * with the highest level (usually the local one). - * - * @param cfg where to look for the variable - * @param name the variable's name - * @param value Integer value for the variable - * @return 0 or an error code - */ -GIT_EXTERN(int) git_config_set_int32(git_config *cfg, const char *name, int32_t value); - -/** - * Set the value of a long integer config variable in the config file - * with the highest level (usually the local one). - * - * @param cfg where to look for the variable - * @param name the variable's name - * @param value Long integer value for the variable - * @return 0 or an error code - */ -GIT_EXTERN(int) git_config_set_int64(git_config *cfg, const char *name, int64_t value); - -/** - * Set the value of a boolean config variable in the config file - * with the highest level (usually the local one). - * - * @param cfg where to look for the variable - * @param name the variable's name - * @param value the value to store - * @return 0 or an error code - */ -GIT_EXTERN(int) git_config_set_bool(git_config *cfg, const char *name, int value); - -/** - * Set the value of a string config variable in the config file - * with the highest level (usually the local one). - * - * A copy of the string is made and the user is free to use it - * afterwards. - * - * @param cfg where to look for the variable - * @param name the variable's name - * @param value the string to store. - * @return 0 or an error code - */ -GIT_EXTERN(int) git_config_set_string(git_config *cfg, const char *name, const char *value); - -/** - * Set a multivar in the local config file. - * - * @param cfg where to look for the variable - * @param name the variable's name - * @param regexp a regular expression to indicate which values to replace - * @param value the new value. - */ -GIT_EXTERN(int) git_config_set_multivar(git_config *cfg, const char *name, const char *regexp, const char *value); - -/** - * Delete a config variable from the config file - * with the highest level (usually the local one). - * - * @param cfg the configuration - * @param name the variable to delete - */ -GIT_EXTERN(int) git_config_delete_entry(git_config *cfg, const char *name); - -/** - * Deletes one or several entries from a multivar in the local config file. - * - * @param cfg where to look for the variables - * @param name the variable's name - * @param regexp a regular expression to indicate which values to delete - * - * @return 0 or an error code - */ -GIT_EXTERN(int) git_config_delete_multivar(git_config *cfg, const char *name, const char *regexp); - -/** - * Perform an operation on each config variable. - * - * The callback receives the normalized name and value of each variable - * in the config backend, and the data pointer passed to this function. - * If the callback returns a non-zero value, the function stops iterating - * and returns that value to the caller. - * - * The pointers passed to the callback are only valid as long as the - * iteration is ongoing. - * - * @param cfg where to get the variables from - * @param callback the function to call on each variable - * @param payload the data to pass to the callback - * @return 0 on success, non-zero callback return value, or error code - */ -GIT_EXTERN(int) git_config_foreach( - const git_config *cfg, - git_config_foreach_cb callback, - void *payload); - -/** - * Iterate over all the config variables - * - * Use `git_config_next` to advance the iteration and - * `git_config_iterator_free` when done. - * - * @param out pointer to store the iterator - * @param cfg where to ge the variables from - */ -GIT_EXTERN(int) git_config_iterator_new(git_config_iterator **out, const git_config *cfg); - -/** - * Iterate over all the config variables whose name matches a pattern - * - * Use `git_config_next` to advance the iteration and - * `git_config_iterator_free` when done. - * - * @param out pointer to store the iterator - * @param cfg where to ge the variables from - * @param regexp regular expression to match the names - */ -GIT_EXTERN(int) git_config_iterator_glob_new(git_config_iterator **out, const git_config *cfg, const char *regexp); - -/** - * Perform an operation on each config variable matching a regular expression. - * - * This behaviors like `git_config_foreach` with an additional filter of a - * regular expression that filters which config keys are passed to the - * callback. - * - * The pointers passed to the callback are only valid as long as the - * iteration is ongoing. - * - * @param cfg where to get the variables from - * @param regexp regular expression to match against config names - * @param callback the function to call on each variable - * @param payload the data to pass to the callback - * @return 0 or the return value of the callback which didn't return 0 - */ -GIT_EXTERN(int) git_config_foreach_match( - const git_config *cfg, - const char *regexp, - git_config_foreach_cb callback, - void *payload); - -/** - * Query the value of a config variable and return it mapped to - * an integer constant. - * - * This is a helper method to easily map different possible values - * to a variable to integer constants that easily identify them. - * - * A mapping array looks as follows: - * - * git_cvar_map autocrlf_mapping[] = { - * {GIT_CVAR_FALSE, NULL, GIT_AUTO_CRLF_FALSE}, - * {GIT_CVAR_TRUE, NULL, GIT_AUTO_CRLF_TRUE}, - * {GIT_CVAR_STRING, "input", GIT_AUTO_CRLF_INPUT}, - * {GIT_CVAR_STRING, "default", GIT_AUTO_CRLF_DEFAULT}}; - * - * On any "false" value for the variable (e.g. "false", "FALSE", "no"), the - * mapping will store `GIT_AUTO_CRLF_FALSE` in the `out` parameter. - * - * The same thing applies for any "true" value such as "true", "yes" or "1", storing - * the `GIT_AUTO_CRLF_TRUE` variable. - * - * Otherwise, if the value matches the string "input" (with case insensitive comparison), - * the given constant will be stored in `out`, and likewise for "default". - * - * If not a single match can be made to store in `out`, an error code will be - * returned. - * - * @param out place to store the result of the mapping - * @param cfg config file to get the variables from - * @param name name of the config variable to lookup - * @param maps array of `git_cvar_map` objects specifying the possible mappings - * @param map_n number of mapping objects in `maps` - * @return 0 on success, error code otherwise - */ -GIT_EXTERN(int) git_config_get_mapped( - int *out, - const git_config *cfg, - const char *name, - const git_cvar_map *maps, - size_t map_n); - -/** - * Maps a string value to an integer constant - * - * @param out place to store the result of the parsing - * @param maps array of `git_cvar_map` objects specifying the possible mappings - * @param map_n number of mapping objects in `maps` - * @param value value to parse - */ -GIT_EXTERN(int) git_config_lookup_map_value( - int *out, - const git_cvar_map *maps, - size_t map_n, - const char *value); - -/** - * Parse a string value as a bool. - * - * Valid values for true are: 'true', 'yes', 'on', 1 or any - * number different from 0 - * Valid values for false are: 'false', 'no', 'off', 0 - * - * @param out place to store the result of the parsing - * @param value value to parse - */ -GIT_EXTERN(int) git_config_parse_bool(int *out, const char *value); - -/** - * Parse a string value as an int32. - * - * An optional value suffix of 'k', 'm', or 'g' will - * cause the value to be multiplied by 1024, 1048576, - * or 1073741824 prior to output. - * - * @param out place to store the result of the parsing - * @param value value to parse - */ -GIT_EXTERN(int) git_config_parse_int32(int32_t *out, const char *value); - -/** - * Parse a string value as an int64. - * - * An optional value suffix of 'k', 'm', or 'g' will - * cause the value to be multiplied by 1024, 1048576, - * or 1073741824 prior to output. - * - * @param out place to store the result of the parsing - * @param value value to parse - */ -GIT_EXTERN(int) git_config_parse_int64(int64_t *out, const char *value); - -/** - * Parse a string value as a path. - * - * A leading '~' will be expanded to the global search path (which - * defaults to the user's home directory but can be overridden via - * `git_libgit2_opts()`. - * - * If the value does not begin with a tilde, the input will be - * returned. - * - * @param out placae to store the result of parsing - * @param value the path to evaluate - */ -GIT_EXTERN(int) git_config_parse_path(git_buf *out, const char *value); - -/** - * Perform an operation on each config variable in given config backend - * matching a regular expression. - * - * This behaviors like `git_config_foreach_match` except instead of all config - * entries it just enumerates through the given backend entry. - * - * @param backend where to get the variables from - * @param regexp regular expression to match against config names (can be NULL) - * @param callback the function to call on each variable - * @param payload the data to pass to the callback - */ -GIT_EXTERN(int) git_config_backend_foreach_match( - git_config_backend *backend, - const char *regexp, - git_config_foreach_cb callback, - void *payload); - - -/** - * Lock the backend with the highest priority - * - * Locking disallows anybody else from writing to that backend. Any - * updates made after locking will not be visible to a reader until - * the file is unlocked. - * - * You can apply the changes by calling `git_transaction_commit()` - * before freeing the transaction. Either of these actions will unlock - * the config. - * - * @param tx the resulting transaction, use this to commit or undo the - * changes - * @param cfg the configuration in which to lock - * @return 0 or an error code - */ -GIT_EXTERN(int) git_config_lock(git_transaction **tx, git_config *cfg); - -/** @} */ -GIT_END_DECL -#endif diff --git a/vendor/libgit2/include/git2/cred_helpers.h b/vendor/libgit2/include/git2/cred_helpers.h deleted file mode 100644 index 1416d5642..000000000 --- a/vendor/libgit2/include/git2/cred_helpers.h +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_git_cred_helpers_h__ -#define INCLUDE_git_cred_helpers_h__ - -#include "transport.h" - -/** - * @file git2/cred_helpers.h - * @brief Utility functions for credential management - * @defgroup git_cred_helpers credential management helpers - * @ingroup Git - * @{ - */ -GIT_BEGIN_DECL - -/** - * Payload for git_cred_stock_userpass_plaintext. - */ -typedef struct git_cred_userpass_payload { - const char *username; - const char *password; -} git_cred_userpass_payload; - - -/** - * Stock callback usable as a git_cred_acquire_cb. This calls - * git_cred_userpass_plaintext_new unless the protocol has not specified - * `GIT_CREDTYPE_USERPASS_PLAINTEXT` as an allowed type. - * - * @param cred The newly created credential object. - * @param url The resource for which we are demanding a credential. - * @param user_from_url The username that was embedded in a "user\@host" - * remote url, or NULL if not included. - * @param allowed_types A bitmask stating which cred types are OK to return. - * @param payload The payload provided when specifying this callback. (This is - * interpreted as a `git_cred_userpass_payload*`.) - */ -GIT_EXTERN(int) git_cred_userpass( - git_cred **cred, - const char *url, - const char *user_from_url, - unsigned int allowed_types, - void *payload); - - -/** @} */ -GIT_END_DECL -#endif diff --git a/vendor/libgit2/include/git2/describe.h b/vendor/libgit2/include/git2/describe.h deleted file mode 100644 index 3044d9165..000000000 --- a/vendor/libgit2/include/git2/describe.h +++ /dev/null @@ -1,163 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_git_describe_h__ -#define INCLUDE_git_describe_h__ - -#include "common.h" -#include "types.h" -#include "buffer.h" - -/** - * @file git2/describe.h - * @brief Git describing routines - * @defgroup git_describe Git describing routines - * @ingroup Git - * @{ - */ -GIT_BEGIN_DECL - -/** - * Reference lookup strategy - * - * These behave like the --tags and --all optios to git-describe, - * namely they say to look for any reference in either refs/tags/ or - * refs/ respectively. - */ -typedef enum { - GIT_DESCRIBE_DEFAULT, - GIT_DESCRIBE_TAGS, - GIT_DESCRIBE_ALL, -} git_describe_strategy_t; - -/** - * Describe options structure - * - * Initialize with `GIT_DESCRIBE_OPTIONS_INIT` macro to correctly set - * the `version` field. E.g. - * - * git_describe_options opts = GIT_DESCRIBE_OPTIONS_INIT; - */ -typedef struct git_describe_options { - unsigned int version; - - unsigned int max_candidates_tags; /** default: 10 */ - unsigned int describe_strategy; /** default: GIT_DESCRIBE_DEFAULT */ - const char *pattern; - /** - * When calculating the distance from the matching tag or - * reference, only walk down the first-parent ancestry. - */ - int only_follow_first_parent; - /** - * If no matching tag or reference is found, the describe - * operation would normally fail. If this option is set, it - * will instead fall back to showing the full id of the - * commit. - */ - int show_commit_oid_as_fallback; -} git_describe_options; - -#define GIT_DESCRIBE_DEFAULT_MAX_CANDIDATES_TAGS 10 -#define GIT_DESCRIBE_DEFAULT_ABBREVIATED_SIZE 7 - -#define GIT_DESCRIBE_OPTIONS_VERSION 1 -#define GIT_DESCRIBE_OPTIONS_INIT { \ - GIT_DESCRIBE_OPTIONS_VERSION, \ - GIT_DESCRIBE_DEFAULT_MAX_CANDIDATES_TAGS, \ -} - -GIT_EXTERN(int) git_describe_init_options(git_describe_options *opts, unsigned int version); - -/** - * Options for formatting the describe string - */ -typedef struct { - unsigned int version; - - /** - * Size of the abbreviated commit id to use. This value is the - * lower bound for the length of the abbreviated string. The - * default is 7. - */ - unsigned int abbreviated_size; - - /** - * Set to use the long format even when a shorter name could be used. - */ - int always_use_long_format; - - /** - * If the workdir is dirty and this is set, this string will - * be appended to the description string. - */ - const char *dirty_suffix; -} git_describe_format_options; - -#define GIT_DESCRIBE_FORMAT_OPTIONS_VERSION 1 -#define GIT_DESCRIBE_FORMAT_OPTIONS_INIT { \ - GIT_DESCRIBE_FORMAT_OPTIONS_VERSION, \ - GIT_DESCRIBE_DEFAULT_ABBREVIATED_SIZE, \ - } - -GIT_EXTERN(int) git_describe_init_format_options(git_describe_format_options *opts, unsigned int version); - -typedef struct git_describe_result git_describe_result; - -/** - * Describe a commit - * - * Perform the describe operation on the given committish object. - * - * @param result pointer to store the result. You must free this once - * you're done with it. - * @param committish a committish to describe - * @param opts the lookup options - */ -GIT_EXTERN(int) git_describe_commit( - git_describe_result **result, - git_object *committish, - git_describe_options *opts); - -/** - * Describe a commit - * - * Perform the describe operation on the current commit and the - * worktree. After peforming describe on HEAD, a status is run and the - * description is considered to be dirty if there are. - * - * @param out pointer to store the result. You must free this once - * you're done with it. - * @param repo the repository in which to perform the describe - * @param opts the lookup options - */ -GIT_EXTERN(int) git_describe_workdir( - git_describe_result **out, - git_repository *repo, - git_describe_options *opts); - -/** - * Print the describe result to a buffer - * - * @param out The buffer to store the result - * @param result the result from `git_describe_commit()` or - * `git_describe_workdir()`. - * @param opts the formatting options - */ -GIT_EXTERN(int) git_describe_format( - git_buf *out, - const git_describe_result *result, - const git_describe_format_options *opts); - -/** - * Free the describe result. - */ -GIT_EXTERN(void) git_describe_result_free(git_describe_result *result); - -/** @} */ -GIT_END_DECL - -#endif diff --git a/vendor/libgit2/include/git2/diff.h b/vendor/libgit2/include/git2/diff.h deleted file mode 100644 index c35701a46..000000000 --- a/vendor/libgit2/include/git2/diff.h +++ /dev/null @@ -1,1352 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_git_diff_h__ -#define INCLUDE_git_diff_h__ - -#include "common.h" -#include "types.h" -#include "oid.h" -#include "tree.h" -#include "refs.h" - -/** - * @file git2/diff.h - * @brief Git tree and file differencing routines. - * - * Overview - * -------- - * - * Calculating diffs is generally done in two phases: building a list of - * diffs then traversing it. This makes is easier to share logic across - * the various types of diffs (tree vs tree, workdir vs index, etc.), and - * also allows you to insert optional diff post-processing phases, - * such as rename detection, in between the steps. When you are done with - * a diff object, it must be freed. - * - * Terminology - * ----------- - * - * To understand the diff APIs, you should know the following terms: - * - * - A `diff` represents the cumulative list of differences between two - * snapshots of a repository (possibly filtered by a set of file name - * patterns). This is the `git_diff` object. - * - * - A `delta` is a file pair with an old and new revision. The old version - * may be absent if the file was just created and the new version may be - * absent if the file was deleted. A diff is mostly just a list of deltas. - * - * - A `binary` file / delta is a file (or pair) for which no text diffs - * should be generated. A diff can contain delta entries that are - * binary, but no diff content will be output for those files. There is - * a base heuristic for binary detection and you can further tune the - * behavior with git attributes or diff flags and option settings. - * - * - A `hunk` is a span of modified lines in a delta along with some stable - * surrounding context. You can configure the amount of context and other - * properties of how hunks are generated. Each hunk also comes with a - * header that described where it starts and ends in both the old and new - * versions in the delta. - * - * - A `line` is a range of characters inside a hunk. It could be a context - * line (i.e. in both old and new versions), an added line (i.e. only in - * the new version), or a removed line (i.e. only in the old version). - * Unfortunately, we don't know anything about the encoding of data in the - * file being diffed, so we cannot tell you much about the line content. - * Line data will not be NUL-byte terminated, however, because it will be - * just a span of bytes inside the larger file. - * - * @ingroup Git - * @{ - */ -GIT_BEGIN_DECL - -/** - * Flags for diff options. A combination of these flags can be passed - * in via the `flags` value in the `git_diff_options`. - */ -typedef enum { - /** Normal diff, the default */ - GIT_DIFF_NORMAL = 0, - - /* - * Options controlling which files will be in the diff - */ - - /** Reverse the sides of the diff */ - GIT_DIFF_REVERSE = (1u << 0), - - /** Include ignored files in the diff */ - GIT_DIFF_INCLUDE_IGNORED = (1u << 1), - - /** Even with GIT_DIFF_INCLUDE_IGNORED, an entire ignored directory - * will be marked with only a single entry in the diff; this flag - * adds all files under the directory as IGNORED entries, too. - */ - GIT_DIFF_RECURSE_IGNORED_DIRS = (1u << 2), - - /** Include untracked files in the diff */ - GIT_DIFF_INCLUDE_UNTRACKED = (1u << 3), - - /** Even with GIT_DIFF_INCLUDE_UNTRACKED, an entire untracked - * directory will be marked with only a single entry in the diff - * (a la what core Git does in `git status`); this flag adds *all* - * files under untracked directories as UNTRACKED entries, too. - */ - GIT_DIFF_RECURSE_UNTRACKED_DIRS = (1u << 4), - - /** Include unmodified files in the diff */ - GIT_DIFF_INCLUDE_UNMODIFIED = (1u << 5), - - /** Normally, a type change between files will be converted into a - * DELETED record for the old and an ADDED record for the new; this - * options enabled the generation of TYPECHANGE delta records. - */ - GIT_DIFF_INCLUDE_TYPECHANGE = (1u << 6), - - /** Even with GIT_DIFF_INCLUDE_TYPECHANGE, blob->tree changes still - * generally show as a DELETED blob. This flag tries to correctly - * label blob->tree transitions as TYPECHANGE records with new_file's - * mode set to tree. Note: the tree SHA will not be available. - */ - GIT_DIFF_INCLUDE_TYPECHANGE_TREES = (1u << 7), - - /** Ignore file mode changes */ - GIT_DIFF_IGNORE_FILEMODE = (1u << 8), - - /** Treat all submodules as unmodified */ - GIT_DIFF_IGNORE_SUBMODULES = (1u << 9), - - /** Use case insensitive filename comparisons */ - GIT_DIFF_IGNORE_CASE = (1u << 10), - - /** May be combined with `GIT_DIFF_IGNORE_CASE` to specify that a file - * that has changed case will be returned as an add/delete pair. - */ - GIT_DIFF_INCLUDE_CASECHANGE = (1u << 11), - - /** If the pathspec is set in the diff options, this flags indicates - * that the paths will be treated as literal paths instead of - * fnmatch patterns. Each path in the list must either be a full - * path to a file or a directory. (A trailing slash indicates that - * the path will _only_ match a directory). If a directory is - * specified, all children will be included. - */ - GIT_DIFF_DISABLE_PATHSPEC_MATCH = (1u << 12), - - /** Disable updating of the `binary` flag in delta records. This is - * useful when iterating over a diff if you don't need hunk and data - * callbacks and want to avoid having to load file completely. - */ - GIT_DIFF_SKIP_BINARY_CHECK = (1u << 13), - - /** When diff finds an untracked directory, to match the behavior of - * core Git, it scans the contents for IGNORED and UNTRACKED files. - * If *all* contents are IGNORED, then the directory is IGNORED; if - * any contents are not IGNORED, then the directory is UNTRACKED. - * This is extra work that may not matter in many cases. This flag - * turns off that scan and immediately labels an untracked directory - * as UNTRACKED (changing the behavior to not match core Git). - */ - GIT_DIFF_ENABLE_FAST_UNTRACKED_DIRS = (1u << 14), - - /** When diff finds a file in the working directory with stat - * information different from the index, but the OID ends up being the - * same, write the correct stat information into the index. Note: - * without this flag, diff will always leave the index untouched. - */ - GIT_DIFF_UPDATE_INDEX = (1u << 15), - - /** Include unreadable files in the diff */ - GIT_DIFF_INCLUDE_UNREADABLE = (1u << 16), - - /** Include unreadable files in the diff */ - GIT_DIFF_INCLUDE_UNREADABLE_AS_UNTRACKED = (1u << 17), - - /* - * Options controlling how output will be generated - */ - - /** Treat all files as text, disabling binary attributes & detection */ - GIT_DIFF_FORCE_TEXT = (1u << 20), - /** Treat all files as binary, disabling text diffs */ - GIT_DIFF_FORCE_BINARY = (1u << 21), - - /** Ignore all whitespace */ - GIT_DIFF_IGNORE_WHITESPACE = (1u << 22), - /** Ignore changes in amount of whitespace */ - GIT_DIFF_IGNORE_WHITESPACE_CHANGE = (1u << 23), - /** Ignore whitespace at end of line */ - GIT_DIFF_IGNORE_WHITESPACE_EOL = (1u << 24), - - /** When generating patch text, include the content of untracked - * files. This automatically turns on GIT_DIFF_INCLUDE_UNTRACKED but - * it does not turn on GIT_DIFF_RECURSE_UNTRACKED_DIRS. Add that - * flag if you want the content of every single UNTRACKED file. - */ - GIT_DIFF_SHOW_UNTRACKED_CONTENT = (1u << 25), - - /** When generating output, include the names of unmodified files if - * they are included in the git_diff. Normally these are skipped in - * the formats that list files (e.g. name-only, name-status, raw). - * Even with this, these will not be included in patch format. - */ - GIT_DIFF_SHOW_UNMODIFIED = (1u << 26), - - /** Use the "patience diff" algorithm */ - GIT_DIFF_PATIENCE = (1u << 28), - /** Take extra time to find minimal diff */ - GIT_DIFF_MINIMAL = (1 << 29), - - /** Include the necessary deflate / delta information so that `git-apply` - * can apply given diff information to binary files. - */ - GIT_DIFF_SHOW_BINARY = (1 << 30), -} git_diff_option_t; - -/** - * The diff object that contains all individual file deltas. - * - * This is an opaque structure which will be allocated by one of the diff - * generator functions below (such as `git_diff_tree_to_tree`). You are - * responsible for releasing the object memory when done, using the - * `git_diff_free()` function. - */ -typedef struct git_diff git_diff; - -/** - * Flags for the delta object and the file objects on each side. - * - * These flags are used for both the `flags` value of the `git_diff_delta` - * and the flags for the `git_diff_file` objects representing the old and - * new sides of the delta. Values outside of this public range should be - * considered reserved for internal or future use. - */ -typedef enum { - GIT_DIFF_FLAG_BINARY = (1u << 0), /**< file(s) treated as binary data */ - GIT_DIFF_FLAG_NOT_BINARY = (1u << 1), /**< file(s) treated as text data */ - GIT_DIFF_FLAG_VALID_ID = (1u << 2), /**< `id` value is known correct */ - GIT_DIFF_FLAG_EXISTS = (1u << 3), /**< file exists at this side of the delta */ -} git_diff_flag_t; - -/** - * What type of change is described by a git_diff_delta? - * - * `GIT_DELTA_RENAMED` and `GIT_DELTA_COPIED` will only show up if you run - * `git_diff_find_similar()` on the diff object. - * - * `GIT_DELTA_TYPECHANGE` only shows up given `GIT_DIFF_INCLUDE_TYPECHANGE` - * in the option flags (otherwise type changes will be split into ADDED / - * DELETED pairs). - */ -typedef enum { - GIT_DELTA_UNMODIFIED = 0, /**< no changes */ - GIT_DELTA_ADDED = 1, /**< entry does not exist in old version */ - GIT_DELTA_DELETED = 2, /**< entry does not exist in new version */ - GIT_DELTA_MODIFIED = 3, /**< entry content changed between old and new */ - GIT_DELTA_RENAMED = 4, /**< entry was renamed between old and new */ - GIT_DELTA_COPIED = 5, /**< entry was copied from another old entry */ - GIT_DELTA_IGNORED = 6, /**< entry is ignored item in workdir */ - GIT_DELTA_UNTRACKED = 7, /**< entry is untracked item in workdir */ - GIT_DELTA_TYPECHANGE = 8, /**< type of entry changed between old and new */ - GIT_DELTA_UNREADABLE = 9, /**< entry is unreadable */ - GIT_DELTA_CONFLICTED = 10, /**< entry in the index is conflicted */ -} git_delta_t; - -/** - * Description of one side of a delta. - * - * Although this is called a "file", it could represent a file, a symbolic - * link, a submodule commit id, or even a tree (although that only if you - * are tracking type changes or ignored/untracked directories). - * - * The `oid` is the `git_oid` of the item. If the entry represents an - * absent side of a diff (e.g. the `old_file` of a `GIT_DELTA_ADDED` delta), - * then the oid will be zeroes. - * - * `path` is the NUL-terminated path to the entry relative to the working - * directory of the repository. - * - * `size` is the size of the entry in bytes. - * - * `flags` is a combination of the `git_diff_flag_t` types - * - * `mode` is, roughly, the stat() `st_mode` value for the item. This will - * be restricted to one of the `git_filemode_t` values. - */ -typedef struct { - git_oid id; - const char *path; - git_off_t size; - uint32_t flags; - uint16_t mode; -} git_diff_file; - -/** - * Description of changes to one entry. - * - * When iterating over a diff, this will be passed to most callbacks and - * you can use the contents to understand exactly what has changed. - * - * The `old_file` represents the "from" side of the diff and the `new_file` - * represents to "to" side of the diff. What those means depend on the - * function that was used to generate the diff and will be documented below. - * You can also use the `GIT_DIFF_REVERSE` flag to flip it around. - * - * Although the two sides of the delta are named "old_file" and "new_file", - * they actually may correspond to entries that represent a file, a symbolic - * link, a submodule commit id, or even a tree (if you are tracking type - * changes or ignored/untracked directories). - * - * Under some circumstances, in the name of efficiency, not all fields will - * be filled in, but we generally try to fill in as much as possible. One - * example is that the "flags" field may not have either the `BINARY` or the - * `NOT_BINARY` flag set to avoid examining file contents if you do not pass - * in hunk and/or line callbacks to the diff foreach iteration function. It - * will just use the git attributes for those files. - * - * The similarity score is zero unless you call `git_diff_find_similar()` - * which does a similarity analysis of files in the diff. Use that - * function to do rename and copy detection, and to split heavily modified - * files in add/delete pairs. After that call, deltas with a status of - * GIT_DELTA_RENAMED or GIT_DELTA_COPIED will have a similarity score - * between 0 and 100 indicating how similar the old and new sides are. - * - * If you ask `git_diff_find_similar` to find heavily modified files to - * break, but to not *actually* break the records, then GIT_DELTA_MODIFIED - * records may have a non-zero similarity score if the self-similarity is - * below the split threshold. To display this value like core Git, invert - * the score (a la `printf("M%03d", 100 - delta->similarity)`). - */ -typedef struct { - git_delta_t status; - uint32_t flags; /**< git_diff_flag_t values */ - uint16_t similarity; /**< for RENAMED and COPIED, value 0-100 */ - uint16_t nfiles; /**< number of files in this delta */ - git_diff_file old_file; - git_diff_file new_file; -} git_diff_delta; - -/** - * Diff notification callback function. - * - * The callback will be called for each file, just before the `git_delta_t` - * gets inserted into the diff. - * - * When the callback: - * - returns < 0, the diff process will be aborted. - * - returns > 0, the delta will not be inserted into the diff, but the - * diff process continues. - * - returns 0, the delta is inserted into the diff, and the diff process - * continues. - */ -typedef int (*git_diff_notify_cb)( - const git_diff *diff_so_far, - const git_diff_delta *delta_to_add, - const char *matched_pathspec, - void *payload); - -/** - * Diff progress callback. - * - * Called before each file comparison. - * - * @param diff_so_far The diff being generated. - * @param old_path The path to the old file or NULL. - * @param new_path The path to the new file or NULL. - * @return Non-zero to abort the diff. - */ -typedef int (*git_diff_progress_cb)( - const git_diff *diff_so_far, - const char *old_path, - const char *new_path, - void *payload); - -/** - * Structure describing options about how the diff should be executed. - * - * Setting all values of the structure to zero will yield the default - * values. Similarly, passing NULL for the options structure will - * give the defaults. The default values are marked below. - * - * - `flags` is a combination of the `git_diff_option_t` values above - * - `context_lines` is the number of unchanged lines that define the - * boundary of a hunk (and to display before and after) - * - `interhunk_lines` is the maximum number of unchanged lines between - * hunk boundaries before the hunks will be merged into a one. - * - `old_prefix` is the virtual "directory" to prefix to old file names - * in hunk headers (default "a") - * - `new_prefix` is the virtual "directory" to prefix to new file names - * in hunk headers (default "b") - * - `pathspec` is an array of paths / fnmatch patterns to constrain diff - * - `max_size` is a file size (in bytes) above which a blob will be marked - * as binary automatically; pass a negative value to disable. - * - `notify_cb` is an optional callback function, notifying the consumer of - * changes to the diff as new deltas are added. - * - `progress_cb` is an optional callback function, notifying the consumer of - * which files are being examined as the diff is generated. - * - `payload` is the payload to pass to the callback functions. - * - `ignore_submodules` overrides the submodule ignore setting for all - * submodules in the diff. - */ -typedef struct { - unsigned int version; /**< version for the struct */ - uint32_t flags; /**< defaults to GIT_DIFF_NORMAL */ - - /* options controlling which files are in the diff */ - - git_submodule_ignore_t ignore_submodules; /**< submodule ignore rule */ - git_strarray pathspec; /**< defaults to include all paths */ - git_diff_notify_cb notify_cb; - git_diff_progress_cb progress_cb; - void *payload; - - /* options controlling how to diff text is generated */ - - uint32_t context_lines; /**< defaults to 3 */ - uint32_t interhunk_lines; /**< defaults to 0 */ - uint16_t id_abbrev; /**< default 'core.abbrev' or 7 if unset */ - git_off_t max_size; /**< defaults to 512MB */ - const char *old_prefix; /**< defaults to "a" */ - const char *new_prefix; /**< defaults to "b" */ -} git_diff_options; - -/* The current version of the diff options structure */ -#define GIT_DIFF_OPTIONS_VERSION 1 - -/* Stack initializer for diff options. Alternatively use - * `git_diff_options_init` programmatic initialization. - */ -#define GIT_DIFF_OPTIONS_INIT \ - {GIT_DIFF_OPTIONS_VERSION, 0, GIT_SUBMODULE_IGNORE_UNSPECIFIED, {NULL,0}, NULL, NULL, NULL, 3} - -/** - * Initializes a `git_diff_options` with default values. Equivalent to - * creating an instance with GIT_DIFF_OPTIONS_INIT. - * - * @param opts The `git_diff_options` struct to initialize - * @param version Version of struct; pass `GIT_DIFF_OPTIONS_VERSION` - * @return Zero on success; -1 on failure. - */ -GIT_EXTERN(int) git_diff_init_options( - git_diff_options *opts, - unsigned int version); - -/** - * When iterating over a diff, callback that will be made per file. - * - * @param delta A pointer to the delta data for the file - * @param progress Goes from 0 to 1 over the diff - * @param payload User-specified pointer from foreach function - */ -typedef int (*git_diff_file_cb)( - const git_diff_delta *delta, - float progress, - void *payload); - -/** - * When producing a binary diff, the binary data returned will be - * either the deflated full ("literal") contents of the file, or - * the deflated binary delta between the two sides (whichever is - * smaller). - */ -typedef enum { - /** There is no binary delta. */ - GIT_DIFF_BINARY_NONE, - - /** The binary data is the literal contents of the file. */ - GIT_DIFF_BINARY_LITERAL, - - /** The binary data is the delta from one side to the other. */ - GIT_DIFF_BINARY_DELTA, -} git_diff_binary_t; - -/** The contents of one of the files in a binary diff. */ -typedef struct { - /** The type of binary data for this file. */ - git_diff_binary_t type; - - /** The binary data, deflated. */ - const char *data; - - /** The length of the binary data. */ - size_t datalen; - - /** The length of the binary data after inflation. */ - size_t inflatedlen; -} git_diff_binary_file; - -/** Structure describing the binary contents of a diff. */ -typedef struct { - git_diff_binary_file old_file; /**< The contents of the old file. */ - git_diff_binary_file new_file; /**< The contents of the new file. */ -} git_diff_binary; - -/** -* When iterating over a diff, callback that will be made for -* binary content within the diff. -*/ -typedef int(*git_diff_binary_cb)( - const git_diff_delta *delta, - const git_diff_binary *binary, - void *payload); - -/** - * Structure describing a hunk of a diff. - */ -typedef struct { - int old_start; /**< Starting line number in old_file */ - int old_lines; /**< Number of lines in old_file */ - int new_start; /**< Starting line number in new_file */ - int new_lines; /**< Number of lines in new_file */ - size_t header_len; /**< Number of bytes in header text */ - char header[128]; /**< Header text, NUL-byte terminated */ -} git_diff_hunk; - -/** - * When iterating over a diff, callback that will be made per hunk. - */ -typedef int (*git_diff_hunk_cb)( - const git_diff_delta *delta, - const git_diff_hunk *hunk, - void *payload); - -/** - * Line origin constants. - * - * These values describe where a line came from and will be passed to - * the git_diff_line_cb when iterating over a diff. There are some - * special origin constants at the end that are used for the text - * output callbacks to demarcate lines that are actually part of - * the file or hunk headers. - */ -typedef enum { - /* These values will be sent to `git_diff_line_cb` along with the line */ - GIT_DIFF_LINE_CONTEXT = ' ', - GIT_DIFF_LINE_ADDITION = '+', - GIT_DIFF_LINE_DELETION = '-', - - GIT_DIFF_LINE_CONTEXT_EOFNL = '=', /**< Both files have no LF at end */ - GIT_DIFF_LINE_ADD_EOFNL = '>', /**< Old has no LF at end, new does */ - GIT_DIFF_LINE_DEL_EOFNL = '<', /**< Old has LF at end, new does not */ - - /* The following values will only be sent to a `git_diff_line_cb` when - * the content of a diff is being formatted through `git_diff_print`. - */ - GIT_DIFF_LINE_FILE_HDR = 'F', - GIT_DIFF_LINE_HUNK_HDR = 'H', - GIT_DIFF_LINE_BINARY = 'B' /**< For "Binary files x and y differ" */ -} git_diff_line_t; - -/** - * Structure describing a line (or data span) of a diff. - */ -typedef struct { - char origin; /**< A git_diff_line_t value */ - int old_lineno; /**< Line number in old file or -1 for added line */ - int new_lineno; /**< Line number in new file or -1 for deleted line */ - int num_lines; /**< Number of newline characters in content */ - size_t content_len; /**< Number of bytes of data */ - git_off_t content_offset; /**< Offset in the original file to the content */ - const char *content; /**< Pointer to diff text, not NUL-byte terminated */ -} git_diff_line; - -/** - * When iterating over a diff, callback that will be made per text diff - * line. In this context, the provided range will be NULL. - * - * When printing a diff, callback that will be made to output each line - * of text. This uses some extra GIT_DIFF_LINE_... constants for output - * of lines of file and hunk headers. - */ -typedef int (*git_diff_line_cb)( - const git_diff_delta *delta, /**< delta that contains this data */ - const git_diff_hunk *hunk, /**< hunk containing this data */ - const git_diff_line *line, /**< line data */ - void *payload); /**< user reference data */ - -/** - * Flags to control the behavior of diff rename/copy detection. - */ -typedef enum { - /** Obey `diff.renames`. Overridden by any other GIT_DIFF_FIND_... flag. */ - GIT_DIFF_FIND_BY_CONFIG = 0, - - /** Look for renames? (`--find-renames`) */ - GIT_DIFF_FIND_RENAMES = (1u << 0), - - /** Consider old side of MODIFIED for renames? (`--break-rewrites=N`) */ - GIT_DIFF_FIND_RENAMES_FROM_REWRITES = (1u << 1), - - /** Look for copies? (a la `--find-copies`). */ - GIT_DIFF_FIND_COPIES = (1u << 2), - - /** Consider UNMODIFIED as copy sources? (`--find-copies-harder`). - * - * For this to work correctly, use GIT_DIFF_INCLUDE_UNMODIFIED when - * the initial `git_diff` is being generated. - */ - GIT_DIFF_FIND_COPIES_FROM_UNMODIFIED = (1u << 3), - - /** Mark significant rewrites for split (`--break-rewrites=/M`) */ - GIT_DIFF_FIND_REWRITES = (1u << 4), - /** Actually split large rewrites into delete/add pairs */ - GIT_DIFF_BREAK_REWRITES = (1u << 5), - /** Mark rewrites for split and break into delete/add pairs */ - GIT_DIFF_FIND_AND_BREAK_REWRITES = - (GIT_DIFF_FIND_REWRITES | GIT_DIFF_BREAK_REWRITES), - - /** Find renames/copies for UNTRACKED items in working directory. - * - * For this to work correctly, use GIT_DIFF_INCLUDE_UNTRACKED when the - * initial `git_diff` is being generated (and obviously the diff must - * be against the working directory for this to make sense). - */ - GIT_DIFF_FIND_FOR_UNTRACKED = (1u << 6), - - /** Turn on all finding features. */ - GIT_DIFF_FIND_ALL = (0x0ff), - - /** Measure similarity ignoring leading whitespace (default) */ - GIT_DIFF_FIND_IGNORE_LEADING_WHITESPACE = 0, - /** Measure similarity ignoring all whitespace */ - GIT_DIFF_FIND_IGNORE_WHITESPACE = (1u << 12), - /** Measure similarity including all data */ - GIT_DIFF_FIND_DONT_IGNORE_WHITESPACE = (1u << 13), - /** Measure similarity only by comparing SHAs (fast and cheap) */ - GIT_DIFF_FIND_EXACT_MATCH_ONLY = (1u << 14), - - /** Do not break rewrites unless they contribute to a rename. - * - * Normally, GIT_DIFF_FIND_AND_BREAK_REWRITES will measure the self- - * similarity of modified files and split the ones that have changed a - * lot into a DELETE / ADD pair. Then the sides of that pair will be - * considered candidates for rename and copy detection. - * - * If you add this flag in and the split pair is *not* used for an - * actual rename or copy, then the modified record will be restored to - * a regular MODIFIED record instead of being split. - */ - GIT_DIFF_BREAK_REWRITES_FOR_RENAMES_ONLY = (1u << 15), - - /** Remove any UNMODIFIED deltas after find_similar is done. - * - * Using GIT_DIFF_FIND_COPIES_FROM_UNMODIFIED to emulate the - * --find-copies-harder behavior requires building a diff with the - * GIT_DIFF_INCLUDE_UNMODIFIED flag. If you do not want UNMODIFIED - * records in the final result, pass this flag to have them removed. - */ - GIT_DIFF_FIND_REMOVE_UNMODIFIED = (1u << 16), -} git_diff_find_t; - -/** - * Pluggable similarity metric - */ -typedef struct { - int (*file_signature)( - void **out, const git_diff_file *file, - const char *fullpath, void *payload); - int (*buffer_signature)( - void **out, const git_diff_file *file, - const char *buf, size_t buflen, void *payload); - void (*free_signature)(void *sig, void *payload); - int (*similarity)(int *score, void *siga, void *sigb, void *payload); - void *payload; -} git_diff_similarity_metric; - -/** - * Control behavior of rename and copy detection - * - * These options mostly mimic parameters that can be passed to git-diff. - * - * - `rename_threshold` is the same as the -M option with a value - * - `copy_threshold` is the same as the -C option with a value - * - `rename_from_rewrite_threshold` matches the top of the -B option - * - `break_rewrite_threshold` matches the bottom of the -B option - * - `rename_limit` is the maximum number of matches to consider for - * a particular file. This is a little different from the `-l` option - * to regular Git because we will still process up to this many matches - * before abandoning the search. - * - * The `metric` option allows you to plug in a custom similarity metric. - * Set it to NULL for the default internal metric which is based on sampling - * hashes of ranges of data in the file. The default metric is a pretty - * good similarity approximation that should work fairly well for both text - * and binary data, and is pretty fast with fixed memory overhead. - */ -typedef struct { - unsigned int version; - - /** - * Combination of git_diff_find_t values (default GIT_DIFF_FIND_BY_CONFIG). - * NOTE: if you don't explicitly set this, `diff.renames` could be set - * to false, resulting in `git_diff_find_similar` doing nothing. - */ - uint32_t flags; - - /** Similarity to consider a file renamed (default 50) */ - uint16_t rename_threshold; - /** Similarity of modified to be eligible rename source (default 50) */ - uint16_t rename_from_rewrite_threshold; - /** Similarity to consider a file a copy (default 50) */ - uint16_t copy_threshold; - /** Similarity to split modify into delete/add pair (default 60) */ - uint16_t break_rewrite_threshold; - - /** Maximum similarity sources to examine for a file (somewhat like - * git-diff's `-l` option or `diff.renameLimit` config) (default 200) - */ - size_t rename_limit; - - /** Pluggable similarity metric; pass NULL to use internal metric */ - git_diff_similarity_metric *metric; -} git_diff_find_options; - -#define GIT_DIFF_FIND_OPTIONS_VERSION 1 -#define GIT_DIFF_FIND_OPTIONS_INIT {GIT_DIFF_FIND_OPTIONS_VERSION} - -/** - * Initializes a `git_diff_find_options` with default values. Equivalent to - * creating an instance with GIT_DIFF_FIND_OPTIONS_INIT. - * - * @param opts The `git_diff_find_options` struct to initialize - * @param version Version of struct; pass `GIT_DIFF_FIND_OPTIONS_VERSION` - * @return Zero on success; -1 on failure. - */ -GIT_EXTERN(int) git_diff_find_init_options( - git_diff_find_options *opts, - unsigned int version); - -/** @name Diff Generator Functions - * - * These are the functions you would use to create (or destroy) a - * git_diff from various objects in a repository. - */ -/**@{*/ - -/** - * Deallocate a diff. - * - * @param diff The previously created diff; cannot be used after free. - */ -GIT_EXTERN(void) git_diff_free(git_diff *diff); - -/** - * Create a diff with the difference between two tree objects. - * - * This is equivalent to `git diff ` - * - * The first tree will be used for the "old_file" side of the delta and the - * second tree will be used for the "new_file" side of the delta. You can - * pass NULL to indicate an empty tree, although it is an error to pass - * NULL for both the `old_tree` and `new_tree`. - * - * @param diff Output pointer to a git_diff pointer to be allocated. - * @param repo The repository containing the trees. - * @param old_tree A git_tree object to diff from, or NULL for empty tree. - * @param new_tree A git_tree object to diff to, or NULL for empty tree. - * @param opts Structure with options to influence diff or NULL for defaults. - */ -GIT_EXTERN(int) git_diff_tree_to_tree( - git_diff **diff, - git_repository *repo, - git_tree *old_tree, - git_tree *new_tree, - const git_diff_options *opts); /**< can be NULL for defaults */ - -/** - * Create a diff between a tree and repository index. - * - * This is equivalent to `git diff --cached ` or if you pass - * the HEAD tree, then like `git diff --cached`. - * - * The tree you pass will be used for the "old_file" side of the delta, and - * the index will be used for the "new_file" side of the delta. - * - * If you pass NULL for the index, then the existing index of the `repo` - * will be used. In this case, the index will be refreshed from disk - * (if it has changed) before the diff is generated. - * - * @param diff Output pointer to a git_diff pointer to be allocated. - * @param repo The repository containing the tree and index. - * @param old_tree A git_tree object to diff from, or NULL for empty tree. - * @param index The index to diff with; repo index used if NULL. - * @param opts Structure with options to influence diff or NULL for defaults. - */ -GIT_EXTERN(int) git_diff_tree_to_index( - git_diff **diff, - git_repository *repo, - git_tree *old_tree, - git_index *index, - const git_diff_options *opts); /**< can be NULL for defaults */ - -/** - * Create a diff between the repository index and the workdir directory. - * - * This matches the `git diff` command. See the note below on - * `git_diff_tree_to_workdir` for a discussion of the difference between - * `git diff` and `git diff HEAD` and how to emulate a `git diff ` - * using libgit2. - * - * The index will be used for the "old_file" side of the delta, and the - * working directory will be used for the "new_file" side of the delta. - * - * If you pass NULL for the index, then the existing index of the `repo` - * will be used. In this case, the index will be refreshed from disk - * (if it has changed) before the diff is generated. - * - * @param diff Output pointer to a git_diff pointer to be allocated. - * @param repo The repository. - * @param index The index to diff from; repo index used if NULL. - * @param opts Structure with options to influence diff or NULL for defaults. - */ -GIT_EXTERN(int) git_diff_index_to_workdir( - git_diff **diff, - git_repository *repo, - git_index *index, - const git_diff_options *opts); /**< can be NULL for defaults */ - -/** - * Create a diff between a tree and the working directory. - * - * The tree you provide will be used for the "old_file" side of the delta, - * and the working directory will be used for the "new_file" side. - * - * This is not the same as `git diff ` or `git diff-index - * `. Those commands use information from the index, whereas this - * function strictly returns the differences between the tree and the files - * in the working directory, regardless of the state of the index. Use - * `git_diff_tree_to_workdir_with_index` to emulate those commands. - * - * To see difference between this and `git_diff_tree_to_workdir_with_index`, - * consider the example of a staged file deletion where the file has then - * been put back into the working dir and further modified. The - * tree-to-workdir diff for that file is 'modified', but `git diff` would - * show status 'deleted' since there is a staged delete. - * - * @param diff A pointer to a git_diff pointer that will be allocated. - * @param repo The repository containing the tree. - * @param old_tree A git_tree object to diff from, or NULL for empty tree. - * @param opts Structure with options to influence diff or NULL for defaults. - */ -GIT_EXTERN(int) git_diff_tree_to_workdir( - git_diff **diff, - git_repository *repo, - git_tree *old_tree, - const git_diff_options *opts); /**< can be NULL for defaults */ - -/** - * Create a diff between a tree and the working directory using index data - * to account for staged deletes, tracked files, etc. - * - * This emulates `git diff ` by diffing the tree to the index and - * the index to the working directory and blending the results into a - * single diff that includes staged deleted, etc. - * - * @param diff A pointer to a git_diff pointer that will be allocated. - * @param repo The repository containing the tree. - * @param old_tree A git_tree object to diff from, or NULL for empty tree. - * @param opts Structure with options to influence diff or NULL for defaults. - */ -GIT_EXTERN(int) git_diff_tree_to_workdir_with_index( - git_diff **diff, - git_repository *repo, - git_tree *old_tree, - const git_diff_options *opts); /**< can be NULL for defaults */ - -/** - * Create a diff with the difference between two index objects. - * - * The first index will be used for the "old_file" side of the delta and the - * second index will be used for the "new_file" side of the delta. - * - * @param diff Output pointer to a git_diff pointer to be allocated. - * @param repo The repository containing the indexes. - * @param old_index A git_index object to diff from. - * @param new_index A git_index object to diff to. - * @param opts Structure with options to influence diff or NULL for defaults. - */ -GIT_EXTERN(int) git_diff_index_to_index( - git_diff **diff, - git_repository *repo, - git_index *old_index, - git_index *new_index, - const git_diff_options *opts); /**< can be NULL for defaults */ - -/** - * Merge one diff into another. - * - * This merges items from the "from" list into the "onto" list. The - * resulting diff will have all items that appear in either list. - * If an item appears in both lists, then it will be "merged" to appear - * as if the old version was from the "onto" list and the new version - * is from the "from" list (with the exception that if the item has a - * pending DELETE in the middle, then it will show as deleted). - * - * @param onto Diff to merge into. - * @param from Diff to merge. - */ -GIT_EXTERN(int) git_diff_merge( - git_diff *onto, - const git_diff *from); - -/** - * Transform a diff marking file renames, copies, etc. - * - * This modifies a diff in place, replacing old entries that look - * like renames or copies with new entries reflecting those changes. - * This also will, if requested, break modified files into add/remove - * pairs if the amount of change is above a threshold. - * - * @param diff diff to run detection algorithms on - * @param options Control how detection should be run, NULL for defaults - * @return 0 on success, -1 on failure - */ -GIT_EXTERN(int) git_diff_find_similar( - git_diff *diff, - const git_diff_find_options *options); - -/**@}*/ - - -/** @name Diff Processor Functions - * - * These are the functions you apply to a diff to process it - * or read it in some way. - */ -/**@{*/ - -/** - * Query how many diff records are there in a diff. - * - * @param diff A git_diff generated by one of the above functions - * @return Count of number of deltas in the list - */ -GIT_EXTERN(size_t) git_diff_num_deltas(const git_diff *diff); - -/** - * Query how many diff deltas are there in a diff filtered by type. - * - * This works just like `git_diff_entrycount()` with an extra parameter - * that is a `git_delta_t` and returns just the count of how many deltas - * match that particular type. - * - * @param diff A git_diff generated by one of the above functions - * @param type A git_delta_t value to filter the count - * @return Count of number of deltas matching delta_t type - */ -GIT_EXTERN(size_t) git_diff_num_deltas_of_type( - const git_diff *diff, git_delta_t type); - -/** - * Return the diff delta for an entry in the diff list. - * - * The `git_diff_delta` pointer points to internal data and you do not - * have to release it when you are done with it. It will go away when - * the * `git_diff` (or any associated `git_patch`) goes away. - * - * Note that the flags on the delta related to whether it has binary - * content or not may not be set if there are no attributes set for the - * file and there has been no reason to load the file data at this point. - * For now, if you need those flags to be up to date, your only option is - * to either use `git_diff_foreach` or create a `git_patch`. - * - * @param diff Diff list object - * @param idx Index into diff list - * @return Pointer to git_diff_delta (or NULL if `idx` out of range) - */ -GIT_EXTERN(const git_diff_delta *) git_diff_get_delta( - const git_diff *diff, size_t idx); - -/** - * Check if deltas are sorted case sensitively or insensitively. - * - * @param diff diff to check - * @return 0 if case sensitive, 1 if case is ignored - */ -GIT_EXTERN(int) git_diff_is_sorted_icase(const git_diff *diff); - -/** - * Loop over all deltas in a diff issuing callbacks. - * - * This will iterate through all of the files described in a diff. You - * should provide a file callback to learn about each file. - * - * The "hunk" and "line" callbacks are optional, and the text diff of the - * files will only be calculated if they are not NULL. Of course, these - * callbacks will not be invoked for binary files on the diff or for - * files whose only changed is a file mode change. - * - * Returning a non-zero value from any of the callbacks will terminate - * the iteration and return the value to the user. - * - * @param diff A git_diff generated by one of the above functions. - * @param file_cb Callback function to make per file in the diff. - * @param binary_cb Optional callback to make for binary files. - * @param hunk_cb Optional callback to make per hunk of text diff. This - * callback is called to describe a range of lines in the - * diff. It will not be issued for binary files. - * @param line_cb Optional callback to make per line of diff text. This - * same callback will be made for context lines, added, and - * removed lines, and even for a deleted trailing newline. - * @param payload Reference pointer that will be passed to your callbacks. - * @return 0 on success, non-zero callback return value, or error code - */ -GIT_EXTERN(int) git_diff_foreach( - git_diff *diff, - git_diff_file_cb file_cb, - git_diff_binary_cb binary_cb, - git_diff_hunk_cb hunk_cb, - git_diff_line_cb line_cb, - void *payload); - -/** - * Look up the single character abbreviation for a delta status code. - * - * When you run `git diff --name-status` it uses single letter codes in - * the output such as 'A' for added, 'D' for deleted, 'M' for modified, - * etc. This function converts a git_delta_t value into these letters for - * your own purposes. GIT_DELTA_UNTRACKED will return a space (i.e. ' '). - * - * @param status The git_delta_t value to look up - * @return The single character label for that code - */ -GIT_EXTERN(char) git_diff_status_char(git_delta_t status); - -/** - * Possible output formats for diff data - */ -typedef enum { - GIT_DIFF_FORMAT_PATCH = 1u, /**< full git diff */ - GIT_DIFF_FORMAT_PATCH_HEADER = 2u, /**< just the file headers of patch */ - GIT_DIFF_FORMAT_RAW = 3u, /**< like git diff --raw */ - GIT_DIFF_FORMAT_NAME_ONLY = 4u, /**< like git diff --name-only */ - GIT_DIFF_FORMAT_NAME_STATUS = 5u, /**< like git diff --name-status */ -} git_diff_format_t; - -/** - * Iterate over a diff generating formatted text output. - * - * Returning a non-zero value from the callbacks will terminate the - * iteration and return the non-zero value to the caller. - * - * @param diff A git_diff generated by one of the above functions. - * @param format A git_diff_format_t value to pick the text format. - * @param print_cb Callback to make per line of diff text. - * @param payload Reference pointer that will be passed to your callback. - * @return 0 on success, non-zero callback return value, or error code - */ -GIT_EXTERN(int) git_diff_print( - git_diff *diff, - git_diff_format_t format, - git_diff_line_cb print_cb, - void *payload); - -/**@}*/ - - -/* - * Misc - */ - -/** - * Directly run a diff on two blobs. - * - * Compared to a file, a blob lacks some contextual information. As such, - * the `git_diff_file` given to the callback will have some fake data; i.e. - * `mode` will be 0 and `path` will be NULL. - * - * NULL is allowed for either `old_blob` or `new_blob` and will be treated - * as an empty blob, with the `oid` set to NULL in the `git_diff_file` data. - * Passing NULL for both blobs is a noop; no callbacks will be made at all. - * - * We do run a binary content check on the blob content and if either blob - * looks like binary data, the `git_diff_delta` binary attribute will be set - * to 1 and no call to the hunk_cb nor line_cb will be made (unless you pass - * `GIT_DIFF_FORCE_TEXT` of course). - * - * @param old_blob Blob for old side of diff, or NULL for empty blob - * @param old_as_path Treat old blob as if it had this filename; can be NULL - * @param new_blob Blob for new side of diff, or NULL for empty blob - * @param new_as_path Treat new blob as if it had this filename; can be NULL - * @param options Options for diff, or NULL for default options - * @param file_cb Callback for "file"; made once if there is a diff; can be NULL - * @param binary_cb Callback for binary files; can be NULL - * @param hunk_cb Callback for each hunk in diff; can be NULL - * @param line_cb Callback for each line in diff; can be NULL - * @param payload Payload passed to each callback function - * @return 0 on success, non-zero callback return value, or error code - */ -GIT_EXTERN(int) git_diff_blobs( - const git_blob *old_blob, - const char *old_as_path, - const git_blob *new_blob, - const char *new_as_path, - const git_diff_options *options, - git_diff_file_cb file_cb, - git_diff_binary_cb binary_cb, - git_diff_hunk_cb hunk_cb, - git_diff_line_cb line_cb, - void *payload); - -/** - * Directly run a diff between a blob and a buffer. - * - * As with `git_diff_blobs`, comparing a blob and buffer lacks some context, - * so the `git_diff_file` parameters to the callbacks will be faked a la the - * rules for `git_diff_blobs()`. - * - * Passing NULL for `old_blob` will be treated as an empty blob (i.e. the - * `file_cb` will be invoked with GIT_DELTA_ADDED and the diff will be the - * entire content of the buffer added). Passing NULL to the buffer will do - * the reverse, with GIT_DELTA_REMOVED and blob content removed. - * - * @param old_blob Blob for old side of diff, or NULL for empty blob - * @param old_as_path Treat old blob as if it had this filename; can be NULL - * @param buffer Raw data for new side of diff, or NULL for empty - * @param buffer_len Length of raw data for new side of diff - * @param buffer_as_path Treat buffer as if it had this filename; can be NULL - * @param options Options for diff, or NULL for default options - * @param file_cb Callback for "file"; made once if there is a diff; can be NULL - * @param binary_cb Callback for binary files; can be NULL - * @param hunk_cb Callback for each hunk in diff; can be NULL - * @param line_cb Callback for each line in diff; can be NULL - * @param payload Payload passed to each callback function - * @return 0 on success, non-zero callback return value, or error code - */ -GIT_EXTERN(int) git_diff_blob_to_buffer( - const git_blob *old_blob, - const char *old_as_path, - const char *buffer, - size_t buffer_len, - const char *buffer_as_path, - const git_diff_options *options, - git_diff_file_cb file_cb, - git_diff_binary_cb binary_cb, - git_diff_hunk_cb hunk_cb, - git_diff_line_cb line_cb, - void *payload); - -/** - * Directly run a diff between two buffers. - * - * Even more than with `git_diff_blobs`, comparing two buffer lacks - * context, so the `git_diff_file` parameters to the callbacks will be - * faked a la the rules for `git_diff_blobs()`. - * - * @param old_buffer Raw data for old side of diff, or NULL for empty - * @param old_len Length of the raw data for old side of the diff - * @param old_as_path Treat old buffer as if it had this filename; can be NULL - * @param new_buffer Raw data for new side of diff, or NULL for empty - * @param new_len Length of raw data for new side of diff - * @param new_as_path Treat buffer as if it had this filename; can be NULL - * @param options Options for diff, or NULL for default options - * @param file_cb Callback for "file"; made once if there is a diff; can be NULL - * @param binary_cb Callback for binary files; can be NULL - * @param hunk_cb Callback for each hunk in diff; can be NULL - * @param line_cb Callback for each line in diff; can be NULL - * @param payload Payload passed to each callback function - * @return 0 on success, non-zero callback return value, or error code - */ -GIT_EXTERN(int) git_diff_buffers( - const void *old_buffer, - size_t old_len, - const char *old_as_path, - const void *new_buffer, - size_t new_len, - const char *new_as_path, - const git_diff_options *options, - git_diff_file_cb file_cb, - git_diff_binary_cb binary_cb, - git_diff_hunk_cb hunk_cb, - git_diff_line_cb line_cb, - void *payload); - -/** - * This is an opaque structure which is allocated by `git_diff_get_stats`. - * You are responsible for releasing the object memory when done, using the - * `git_diff_stats_free()` function. - */ -typedef struct git_diff_stats git_diff_stats; - -/** - * Formatting options for diff stats - */ -typedef enum { - /** No stats*/ - GIT_DIFF_STATS_NONE = 0, - - /** Full statistics, equivalent of `--stat` */ - GIT_DIFF_STATS_FULL = (1u << 0), - - /** Short statistics, equivalent of `--shortstat` */ - GIT_DIFF_STATS_SHORT = (1u << 1), - - /** Number statistics, equivalent of `--numstat` */ - GIT_DIFF_STATS_NUMBER = (1u << 2), - - /** Extended header information such as creations, renames and mode changes, equivalent of `--summary` */ - GIT_DIFF_STATS_INCLUDE_SUMMARY = (1u << 3), -} git_diff_stats_format_t; - -/** - * Accumulate diff statistics for all patches. - * - * @param out Structure containg the diff statistics. - * @param diff A git_diff generated by one of the above functions. - * @return 0 on success; non-zero on error - */ -GIT_EXTERN(int) git_diff_get_stats( - git_diff_stats **out, - git_diff *diff); - -/** - * Get the total number of files changed in a diff - * - * @param stats A `git_diff_stats` generated by one of the above functions. - * @return total number of files changed in the diff - */ -GIT_EXTERN(size_t) git_diff_stats_files_changed( - const git_diff_stats *stats); - -/** - * Get the total number of insertions in a diff - * - * @param stats A `git_diff_stats` generated by one of the above functions. - * @return total number of insertions in the diff - */ -GIT_EXTERN(size_t) git_diff_stats_insertions( - const git_diff_stats *stats); - -/** - * Get the total number of deletions in a diff - * - * @param stats A `git_diff_stats` generated by one of the above functions. - * @return total number of deletions in the diff - */ -GIT_EXTERN(size_t) git_diff_stats_deletions( - const git_diff_stats *stats); - -/** - * Print diff statistics to a `git_buf`. - * - * @param out buffer to store the formatted diff statistics in. - * @param stats A `git_diff_stats` generated by one of the above functions. - * @param format Formatting option. - * @param width Target width for output (only affects GIT_DIFF_STATS_FULL) - * @return 0 on success; non-zero on error - */ -GIT_EXTERN(int) git_diff_stats_to_buf( - git_buf *out, - const git_diff_stats *stats, - git_diff_stats_format_t format, - size_t width); - -/** - * Deallocate a `git_diff_stats`. - * - * @param stats The previously created statistics object; - * cannot be used after free. - */ -GIT_EXTERN(void) git_diff_stats_free(git_diff_stats *stats); - -/** - * Formatting options for diff e-mail generation - */ -typedef enum { - /** Normal patch, the default */ - GIT_DIFF_FORMAT_EMAIL_NONE = 0, - - /** Don't insert "[PATCH]" in the subject header*/ - GIT_DIFF_FORMAT_EMAIL_EXCLUDE_SUBJECT_PATCH_MARKER = (1 << 0), - -} git_diff_format_email_flags_t; - -/** - * Options for controlling the formatting of the generated e-mail. - */ -typedef struct { - unsigned int version; - - git_diff_format_email_flags_t flags; - - /** This patch number */ - size_t patch_no; - - /** Total number of patches in this series */ - size_t total_patches; - - /** id to use for the commit */ - const git_oid *id; - - /** Summary of the change */ - const char *summary; - - /** Commit message's body */ - const char *body; - - /** Author of the change */ - const git_signature *author; -} git_diff_format_email_options; - -#define GIT_DIFF_FORMAT_EMAIL_OPTIONS_VERSION 1 -#define GIT_DIFF_FORMAT_EMAIL_OPTIONS_INIT {GIT_DIFF_FORMAT_EMAIL_OPTIONS_VERSION, 0, 1, 1, NULL, NULL, NULL, NULL} - -/** - * Create an e-mail ready patch from a diff. - * - * @param out buffer to store the e-mail patch in - * @param diff containing the commit - * @param opts structure with options to influence content and formatting. - * @return 0 or an error code - */ -GIT_EXTERN(int) git_diff_format_email( - git_buf *out, - git_diff *diff, - const git_diff_format_email_options *opts); - -/** - * Create an e-mail ready patch for a commit. - * - * Does not support creating patches for merge commits (yet). - * - * @param out buffer to store the e-mail patch in - * @param repo containing the commit - * @param commit pointer to up commit - * @param patch_no patch number of the commit - * @param total_patches total number of patches in the patch set - * @param flags determines the formatting of the e-mail - * @param diff_opts structure with options to influence diff or NULL for defaults. - * @return 0 or an error code - */ -GIT_EXTERN(int) git_diff_commit_as_email( - git_buf *out, - git_repository *repo, - git_commit *commit, - size_t patch_no, - size_t total_patches, - git_diff_format_email_flags_t flags, - const git_diff_options *diff_opts); - -/** - * Initializes a `git_diff_format_email_options` with default values. - * - * Equivalent to creating an instance with GIT_DIFF_FORMAT_EMAIL_OPTIONS_INIT. - * - * @param opts The `git_diff_format_email_options` struct to initialize - * @param version Version of struct; pass `GIT_DIFF_FORMAT_EMAIL_OPTIONS_VERSION` - * @return Zero on success; -1 on failure. - */ -GIT_EXTERN(int) git_diff_format_email_init_options( - git_diff_format_email_options *opts, - unsigned int version); - -GIT_END_DECL - -/** @} */ - -#endif diff --git a/vendor/libgit2/include/git2/errors.h b/vendor/libgit2/include/git2/errors.h deleted file mode 100644 index 3ecea34bf..000000000 --- a/vendor/libgit2/include/git2/errors.h +++ /dev/null @@ -1,148 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_git_errors_h__ -#define INCLUDE_git_errors_h__ - -#include "common.h" - -/** - * @file git2/errors.h - * @brief Git error handling routines and variables - * @ingroup Git - * @{ - */ -GIT_BEGIN_DECL - -/** Generic return codes */ -typedef enum { - GIT_OK = 0, /**< No error */ - - GIT_ERROR = -1, /**< Generic error */ - GIT_ENOTFOUND = -3, /**< Requested object could not be found */ - GIT_EEXISTS = -4, /**< Object exists preventing operation */ - GIT_EAMBIGUOUS = -5, /**< More than one object matches */ - GIT_EBUFS = -6, /**< Output buffer too short to hold data */ - - /* GIT_EUSER is a special error that is never generated by libgit2 - * code. You can return it from a callback (e.g to stop an iteration) - * to know that it was generated by the callback and not by libgit2. - */ - GIT_EUSER = -7, - - GIT_EBAREREPO = -8, /**< Operation not allowed on bare repository */ - GIT_EUNBORNBRANCH = -9, /**< HEAD refers to branch with no commits */ - GIT_EUNMERGED = -10, /**< Merge in progress prevented operation */ - GIT_ENONFASTFORWARD = -11, /**< Reference was not fast-forwardable */ - GIT_EINVALIDSPEC = -12, /**< Name/ref spec was not in a valid format */ - GIT_ECONFLICT = -13, /**< Checkout conflicts prevented operation */ - GIT_ELOCKED = -14, /**< Lock file prevented operation */ - GIT_EMODIFIED = -15, /**< Reference value does not match expected */ - GIT_EAUTH = -16, /**< Authentication error */ - GIT_ECERTIFICATE = -17, /**< Server certificate is invalid */ - GIT_EAPPLIED = -18, /**< Patch/merge has already been applied */ - GIT_EPEEL = -19, /**< The requested peel operation is not possible */ - GIT_EEOF = -20, /**< Unexpected EOF */ - GIT_EINVALID = -21, /**< Invalid operation or input */ - GIT_EUNCOMMITTED = -22, /**< Uncommitted changes in index prevented operation */ - GIT_EDIRECTORY = -23, /**< The operation is not valid for a directory */ - GIT_EMERGECONFLICT = -24, /**< A merge conflict exists and cannot continue */ - - GIT_PASSTHROUGH = -30, /**< Internal only */ - GIT_ITEROVER = -31, /**< Signals end of iteration with iterator */ -} git_error_code; - -/** - * Structure to store extra details of the last error that occurred. - * - * This is kept on a per-thread basis if GIT_THREADS was defined when the - * library was build, otherwise one is kept globally for the library - */ -typedef struct { - char *message; - int klass; -} git_error; - -/** Error classes */ -typedef enum { - GITERR_NONE = 0, - GITERR_NOMEMORY, - GITERR_OS, - GITERR_INVALID, - GITERR_REFERENCE, - GITERR_ZLIB, - GITERR_REPOSITORY, - GITERR_CONFIG, - GITERR_REGEX, - GITERR_ODB, - GITERR_INDEX, - GITERR_OBJECT, - GITERR_NET, - GITERR_TAG, - GITERR_TREE, - GITERR_INDEXER, - GITERR_SSL, - GITERR_SUBMODULE, - GITERR_THREAD, - GITERR_STASH, - GITERR_CHECKOUT, - GITERR_FETCHHEAD, - GITERR_MERGE, - GITERR_SSH, - GITERR_FILTER, - GITERR_REVERT, - GITERR_CALLBACK, - GITERR_CHERRYPICK, - GITERR_DESCRIBE, - GITERR_REBASE, - GITERR_FILESYSTEM -} git_error_t; - -/** - * Return the last `git_error` object that was generated for the - * current thread or NULL if no error has occurred. - * - * @return A git_error object. - */ -GIT_EXTERN(const git_error *) giterr_last(void); - -/** - * Clear the last library error that occurred for this thread. - */ -GIT_EXTERN(void) giterr_clear(void); - -/** - * Set the error message string for this thread. - * - * This function is public so that custom ODB backends and the like can - * relay an error message through libgit2. Most regular users of libgit2 - * will never need to call this function -- actually, calling it in most - * circumstances (for example, calling from within a callback function) - * will just end up having the value overwritten by libgit2 internals. - * - * This error message is stored in thread-local storage and only applies - * to the particular thread that this libgit2 call is made from. - * - * @param error_class One of the `git_error_t` enum above describing the - * general subsystem that is responsible for the error. - * @param string The formatted error message to keep - */ -GIT_EXTERN(void) giterr_set_str(int error_class, const char *string); - -/** - * Set the error message to a special value for memory allocation failure. - * - * The normal `giterr_set_str()` function attempts to `strdup()` the string - * that is passed in. This is not a good idea when the error in question - * is a memory allocation failure. That circumstance has a special setter - * function that sets the error string to a known and statically allocated - * internal value. - */ -GIT_EXTERN(void) giterr_set_oom(void); - -/** @} */ -GIT_END_DECL -#endif diff --git a/vendor/libgit2/include/git2/filter.h b/vendor/libgit2/include/git2/filter.h deleted file mode 100644 index 436a0f3c8..000000000 --- a/vendor/libgit2/include/git2/filter.h +++ /dev/null @@ -1,217 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_git_filter_h__ -#define INCLUDE_git_filter_h__ - -#include "common.h" -#include "types.h" -#include "oid.h" -#include "buffer.h" - -/** - * @file git2/filter.h - * @brief Git filter APIs - * - * @ingroup Git - * @{ - */ -GIT_BEGIN_DECL - -/** - * Filters are applied in one of two directions: smudging - which is - * exporting a file from the Git object database to the working directory, - * and cleaning - which is importing a file from the working directory to - * the Git object database. These values control which direction of - * change is being applied. - */ -typedef enum { - GIT_FILTER_TO_WORKTREE = 0, - GIT_FILTER_SMUDGE = GIT_FILTER_TO_WORKTREE, - GIT_FILTER_TO_ODB = 1, - GIT_FILTER_CLEAN = GIT_FILTER_TO_ODB, -} git_filter_mode_t; - -/** - * Filter option flags. - */ -typedef enum { - GIT_FILTER_DEFAULT = 0u, - GIT_FILTER_ALLOW_UNSAFE = (1u << 0), -} git_filter_flag_t; - -/** - * A filter that can transform file data - * - * This represents a filter that can be used to transform or even replace - * file data. Libgit2 includes one built in filter and it is possible to - * write your own (see git2/sys/filter.h for information on that). - * - * The two builtin filters are: - * - * * "crlf" which uses the complex rules with the "text", "eol", and - * "crlf" file attributes to decide how to convert between LF and CRLF - * line endings - * * "ident" which replaces "$Id$" in a blob with "$Id: $" upon - * checkout and replaced "$Id: $" with "$Id$" on checkin. - */ -typedef struct git_filter git_filter; - -/** - * List of filters to be applied - * - * This represents a list of filters to be applied to a file / blob. You - * can build the list with one call, apply it with another, and dispose it - * with a third. In typical usage, there are not many occasions where a - * git_filter_list is needed directly since the library will generally - * handle conversions for you, but it can be convenient to be able to - * build and apply the list sometimes. - */ -typedef struct git_filter_list git_filter_list; - -/** - * Load the filter list for a given path. - * - * This will return 0 (success) but set the output git_filter_list to NULL - * if no filters are requested for the given file. - * - * @param filters Output newly created git_filter_list (or NULL) - * @param repo Repository object that contains `path` - * @param blob The blob to which the filter will be applied (if known) - * @param path Relative path of the file to be filtered - * @param mode Filtering direction (WT->ODB or ODB->WT) - * @param flags Combination of `git_filter_flag_t` flags - * @return 0 on success (which could still return NULL if no filters are - * needed for the requested file), <0 on error - */ -GIT_EXTERN(int) git_filter_list_load( - git_filter_list **filters, - git_repository *repo, - git_blob *blob, /* can be NULL */ - const char *path, - git_filter_mode_t mode, - uint32_t flags); - -/** - * Query the filter list to see if a given filter (by name) will run. - * The built-in filters "crlf" and "ident" can be queried, otherwise this - * is the name of the filter specified by the filter attribute. - * - * This will return 0 if the given filter is not in the list, or 1 if - * the filter will be applied. - * - * @param filters A loaded git_filter_list (or NULL) - * @param name The name of the filter to query - * @return 1 if the filter is in the list, 0 otherwise - */ -GIT_EXTERN(int) git_filter_list_contains( - git_filter_list *filters, - const char *name); - -/** - * Apply filter list to a data buffer. - * - * See `git2/buffer.h` for background on `git_buf` objects. - * - * If the `in` buffer holds data allocated by libgit2 (i.e. `in->asize` is - * not zero), then it will be overwritten when applying the filters. If - * not, then it will be left untouched. - * - * If there are no filters to apply (or `filters` is NULL), then the `out` - * buffer will reference the `in` buffer data (with `asize` set to zero) - * instead of allocating data. This keeps allocations to a minimum, but - * it means you have to be careful about freeing the `in` data since `out` - * may be pointing to it! - * - * @param out Buffer to store the result of the filtering - * @param filters A loaded git_filter_list (or NULL) - * @param in Buffer containing the data to filter - * @return 0 on success, an error code otherwise - */ -GIT_EXTERN(int) git_filter_list_apply_to_data( - git_buf *out, - git_filter_list *filters, - git_buf *in); - -/** - * Apply a filter list to the contents of a file on disk - * - * @param out buffer into which to store the filtered file - * @param filters the list of filters to apply - * @param repo the repository in which to perform the filtering - * @param path the path of the file to filter, a relative path will be - * taken as relative to the workdir - */ -GIT_EXTERN(int) git_filter_list_apply_to_file( - git_buf *out, - git_filter_list *filters, - git_repository *repo, - const char *path); - -/** - * Apply a filter list to the contents of a blob - * - * @param out buffer into which to store the filtered file - * @param filters the list of filters to apply - * @param blob the blob to filter - */ -GIT_EXTERN(int) git_filter_list_apply_to_blob( - git_buf *out, - git_filter_list *filters, - git_blob *blob); - -/** - * Apply a filter list to an arbitrary buffer as a stream - * - * @param filters the list of filters to apply - * @param data the buffer to filter - * @param target the stream into which the data will be written - */ -GIT_EXTERN(int) git_filter_list_stream_data( - git_filter_list *filters, - git_buf *data, - git_writestream *target); - -/** - * Apply a filter list to a file as a stream - * - * @param filters the list of filters to apply - * @param repo the repository in which to perform the filtering - * @param path the path of the file to filter, a relative path will be - * taken as relative to the workdir - * @param target the stream into which the data will be written - */ -GIT_EXTERN(int) git_filter_list_stream_file( - git_filter_list *filters, - git_repository *repo, - const char *path, - git_writestream *target); - -/** - * Apply a filter list to a blob as a stream - * - * @param filters the list of filters to apply - * @param blob the blob to filter - * @param target the stream into which the data will be written - */ -GIT_EXTERN(int) git_filter_list_stream_blob( - git_filter_list *filters, - git_blob *blob, - git_writestream *target); - -/** - * Free a git_filter_list - * - * @param filters A git_filter_list created by `git_filter_list_load` - */ -GIT_EXTERN(void) git_filter_list_free(git_filter_list *filters); - - -GIT_END_DECL - -/** @} */ - -#endif diff --git a/vendor/libgit2/include/git2/global.h b/vendor/libgit2/include/git2/global.h deleted file mode 100644 index ce5bdf444..000000000 --- a/vendor/libgit2/include/git2/global.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_git_global_h__ -#define INCLUDE_git_global_h__ - -#include "common.h" - -GIT_BEGIN_DECL - -/** - * Init the global state - * - * This function must the called before any other libgit2 function in - * order to set up global state and threading. - * - * This function may be called multiple times - it will return the number - * of times the initialization has been called (including this one) that have - * not subsequently been shutdown. - * - * @return the number of initializations of the library, or an error code. - */ -GIT_EXTERN(int) git_libgit2_init(void); - -/** - * Shutdown the global state - * - * Clean up the global state and threading context after calling it as - * many times as `git_libgit2_init()` was called - it will return the - * number of remainining initializations that have not been shutdown - * (after this one). - * - * @return the number of remaining initializations of the library, or an - * error code. - */ -GIT_EXTERN(int) git_libgit2_shutdown(void); - -/** @} */ -GIT_END_DECL -#endif - diff --git a/vendor/libgit2/include/git2/graph.h b/vendor/libgit2/include/git2/graph.h deleted file mode 100644 index c997d8ca9..000000000 --- a/vendor/libgit2/include/git2/graph.h +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_git_graph_h__ -#define INCLUDE_git_graph_h__ - -#include "common.h" -#include "types.h" -#include "oid.h" - -/** - * @file git2/graph.h - * @brief Git graph traversal routines - * @defgroup git_revwalk Git graph traversal routines - * @ingroup Git - * @{ - */ -GIT_BEGIN_DECL - -/** - * Count the number of unique commits between two commit objects - * - * There is no need for branches containing the commits to have any - * upstream relationship, but it helps to think of one as a branch and - * the other as its upstream, the `ahead` and `behind` values will be - * what git would report for the branches. - * - * @param ahead number of unique from commits in `upstream` - * @param behind number of unique from commits in `local` - * @param repo the repository where the commits exist - * @param local the commit for local - * @param upstream the commit for upstream - */ -GIT_EXTERN(int) git_graph_ahead_behind(size_t *ahead, size_t *behind, git_repository *repo, const git_oid *local, const git_oid *upstream); - - -/** - * Determine if a commit is the descendant of another commit. - * - * @param commit a previously loaded commit. - * @param ancestor a potential ancestor commit. - * @return 1 if the given commit is a descendant of the potential ancestor, - * 0 if not, error code otherwise. - */ -GIT_EXTERN(int) git_graph_descendant_of( - git_repository *repo, - const git_oid *commit, - const git_oid *ancestor); - -/** @} */ -GIT_END_DECL -#endif diff --git a/vendor/libgit2/include/git2/ignore.h b/vendor/libgit2/include/git2/ignore.h deleted file mode 100644 index d0c1877a8..000000000 --- a/vendor/libgit2/include/git2/ignore.h +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_git_ignore_h__ -#define INCLUDE_git_ignore_h__ - -#include "common.h" -#include "types.h" - -GIT_BEGIN_DECL - -/** - * Add ignore rules for a repository. - * - * Excludesfile rules (i.e. .gitignore rules) are generally read from - * .gitignore files in the repository tree or from a shared system file - * only if a "core.excludesfile" config value is set. The library also - * keeps a set of per-repository internal ignores that can be configured - * in-memory and will not persist. This function allows you to add to - * that internal rules list. - * - * Example usage: - * - * error = git_ignore_add_rule(myrepo, "*.c\ndir/\nFile with space\n"); - * - * This would add three rules to the ignores. - * - * @param repo The repository to add ignore rules to. - * @param rules Text of rules, a la the contents of a .gitignore file. - * It is okay to have multiple rules in the text; if so, - * each rule should be terminated with a newline. - * @return 0 on success - */ -GIT_EXTERN(int) git_ignore_add_rule( - git_repository *repo, - const char *rules); - -/** - * Clear ignore rules that were explicitly added. - * - * Resets to the default internal ignore rules. This will not turn off - * rules in .gitignore files that actually exist in the filesystem. - * - * The default internal ignores ignore ".", ".." and ".git" entries. - * - * @param repo The repository to remove ignore rules from. - * @return 0 on success - */ -GIT_EXTERN(int) git_ignore_clear_internal_rules( - git_repository *repo); - -/** - * Test if the ignore rules apply to a given path. - * - * This function checks the ignore rules to see if they would apply to the - * given file. This indicates if the file would be ignored regardless of - * whether the file is already in the index or committed to the repository. - * - * One way to think of this is if you were to do "git add ." on the - * directory containing the file, would it be added or not? - * - * @param ignored boolean returning 0 if the file is not ignored, 1 if it is - * @param repo a repository object - * @param path the file to check ignores for, relative to the repo's workdir. - * @return 0 if ignore rules could be processed for the file (regardless - * of whether it exists or not), or an error < 0 if they could not. - */ -GIT_EXTERN(int) git_ignore_path_is_ignored( - int *ignored, - git_repository *repo, - const char *path); - -GIT_END_DECL - -#endif diff --git a/vendor/libgit2/include/git2/index.h b/vendor/libgit2/include/git2/index.h deleted file mode 100644 index 466765be3..000000000 --- a/vendor/libgit2/include/git2/index.h +++ /dev/null @@ -1,786 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_git_index_h__ -#define INCLUDE_git_index_h__ - -#include "common.h" -#include "indexer.h" -#include "types.h" -#include "oid.h" -#include "strarray.h" - -/** - * @file git2/index.h - * @brief Git index parsing and manipulation routines - * @defgroup git_index Git index parsing and manipulation routines - * @ingroup Git - * @{ - */ -GIT_BEGIN_DECL - -/** Time structure used in a git index entry */ -typedef struct { - int32_t seconds; - /* nsec should not be stored as time_t compatible */ - uint32_t nanoseconds; -} git_index_time; - -/** - * In-memory representation of a file entry in the index. - * - * This is a public structure that represents a file entry in the index. - * The meaning of the fields corresponds to core Git's documentation (in - * "Documentation/technical/index-format.txt"). - * - * The `flags` field consists of a number of bit fields which can be - * accessed via the first set of `GIT_IDXENTRY_...` bitmasks below. These - * flags are all read from and persisted to disk. - * - * The `flags_extended` field also has a number of bit fields which can be - * accessed via the later `GIT_IDXENTRY_...` bitmasks below. Some of - * these flags are read from and written to disk, but some are set aside - * for in-memory only reference. - * - * Note that the time and size fields are truncated to 32 bits. This - * is enough to detect changes, which is enough for the index to - * function as a cache, but it should not be taken as an authoritative - * source for that data. - */ -typedef struct git_index_entry { - git_index_time ctime; - git_index_time mtime; - - uint32_t dev; - uint32_t ino; - uint32_t mode; - uint32_t uid; - uint32_t gid; - uint32_t file_size; - - git_oid id; - - uint16_t flags; - uint16_t flags_extended; - - const char *path; -} git_index_entry; - -/** - * Bitmasks for on-disk fields of `git_index_entry`'s `flags` - * - * These bitmasks match the four fields in the `git_index_entry` `flags` - * value both in memory and on disk. You can use them to interpret the - * data in the `flags`. - */ -#define GIT_IDXENTRY_NAMEMASK (0x0fff) -#define GIT_IDXENTRY_STAGEMASK (0x3000) -#define GIT_IDXENTRY_STAGESHIFT 12 - -/** - * Flags for index entries - */ -typedef enum { - GIT_IDXENTRY_EXTENDED = (0x4000), - GIT_IDXENTRY_VALID = (0x8000), -} git_indxentry_flag_t; - -#define GIT_IDXENTRY_STAGE(E) \ - (((E)->flags & GIT_IDXENTRY_STAGEMASK) >> GIT_IDXENTRY_STAGESHIFT) - -#define GIT_IDXENTRY_STAGE_SET(E,S) do { \ - (E)->flags = ((E)->flags & ~GIT_IDXENTRY_STAGEMASK) | \ - (((S) & 0x03) << GIT_IDXENTRY_STAGESHIFT); } while (0) - -/** - * Bitmasks for on-disk fields of `git_index_entry`'s `flags_extended` - * - * In memory, the `flags_extended` fields are divided into two parts: the - * fields that are read from and written to disk, and other fields that - * in-memory only and used by libgit2. Only the flags in - * `GIT_IDXENTRY_EXTENDED_FLAGS` will get saved on-disk. - * - * Thee first three bitmasks match the three fields in the - * `git_index_entry` `flags_extended` value that belong on disk. You - * can use them to interpret the data in the `flags_extended`. - * - * The rest of the bitmasks match the other fields in the `git_index_entry` - * `flags_extended` value that are only used in-memory by libgit2. - * You can use them to interpret the data in the `flags_extended`. - * - */ -typedef enum { - - GIT_IDXENTRY_INTENT_TO_ADD = (1 << 13), - GIT_IDXENTRY_SKIP_WORKTREE = (1 << 14), - /** Reserved for future extension */ - GIT_IDXENTRY_EXTENDED2 = (1 << 15), - - GIT_IDXENTRY_EXTENDED_FLAGS = (GIT_IDXENTRY_INTENT_TO_ADD | GIT_IDXENTRY_SKIP_WORKTREE), - GIT_IDXENTRY_UPDATE = (1 << 0), - GIT_IDXENTRY_REMOVE = (1 << 1), - GIT_IDXENTRY_UPTODATE = (1 << 2), - GIT_IDXENTRY_ADDED = (1 << 3), - - GIT_IDXENTRY_HASHED = (1 << 4), - GIT_IDXENTRY_UNHASHED = (1 << 5), - GIT_IDXENTRY_WT_REMOVE = (1 << 6), /**< remove in work directory */ - GIT_IDXENTRY_CONFLICTED = (1 << 7), - - GIT_IDXENTRY_UNPACKED = (1 << 8), - GIT_IDXENTRY_NEW_SKIP_WORKTREE = (1 << 9), -} git_idxentry_extended_flag_t; - -/** Capabilities of system that affect index actions. */ -typedef enum { - GIT_INDEXCAP_IGNORE_CASE = 1, - GIT_INDEXCAP_NO_FILEMODE = 2, - GIT_INDEXCAP_NO_SYMLINKS = 4, - GIT_INDEXCAP_FROM_OWNER = -1, -} git_indexcap_t; - -/** Callback for APIs that add/remove/update files matching pathspec */ -typedef int (*git_index_matched_path_cb)( - const char *path, const char *matched_pathspec, void *payload); - -/** Flags for APIs that add files matching pathspec */ -typedef enum { - GIT_INDEX_ADD_DEFAULT = 0, - GIT_INDEX_ADD_FORCE = (1u << 0), - GIT_INDEX_ADD_DISABLE_PATHSPEC_MATCH = (1u << 1), - GIT_INDEX_ADD_CHECK_PATHSPEC = (1u << 2), -} git_index_add_option_t; - -typedef enum { - /** - * Match any index stage. - * - * Some index APIs take a stage to match; pass this value to match - * any entry matching the path regardless of stage. - */ - GIT_INDEX_STAGE_ANY = -1, - - /** A normal staged file in the index. */ - GIT_INDEX_STAGE_NORMAL = 0, - - /** The ancestor side of a conflict. */ - GIT_INDEX_STAGE_ANCESTOR = 1, - - /** The "ours" side of a conflict. */ - GIT_INDEX_STAGE_OURS = 2, - - /** The "theirs" side of a conflict. */ - GIT_INDEX_STAGE_THEIRS = 3, -} git_index_stage_t; - -/** @name Index File Functions - * - * These functions work on the index file itself. - */ -/**@{*/ - -/** - * Create a new bare Git index object as a memory representation - * of the Git index file in 'index_path', without a repository - * to back it. - * - * Since there is no ODB or working directory behind this index, - * any Index methods which rely on these (e.g. index_add_bypath) - * will fail with the GIT_ERROR error code. - * - * If you need to access the index of an actual repository, - * use the `git_repository_index` wrapper. - * - * The index must be freed once it's no longer in use. - * - * @param out the pointer for the new index - * @param index_path the path to the index file in disk - * @return 0 or an error code - */ -GIT_EXTERN(int) git_index_open(git_index **out, const char *index_path); - -/** - * Create an in-memory index object. - * - * This index object cannot be read/written to the filesystem, - * but may be used to perform in-memory index operations. - * - * The index must be freed once it's no longer in use. - * - * @param out the pointer for the new index - * @return 0 or an error code - */ -GIT_EXTERN(int) git_index_new(git_index **out); - -/** - * Free an existing index object. - * - * @param index an existing index object - */ -GIT_EXTERN(void) git_index_free(git_index *index); - -/** - * Get the repository this index relates to - * - * @param index The index - * @return A pointer to the repository - */ -GIT_EXTERN(git_repository *) git_index_owner(const git_index *index); - -/** - * Read index capabilities flags. - * - * @param index An existing index object - * @return A combination of GIT_INDEXCAP values - */ -GIT_EXTERN(int) git_index_caps(const git_index *index); - -/** - * Set index capabilities flags. - * - * If you pass `GIT_INDEXCAP_FROM_OWNER` for the caps, then the - * capabilities will be read from the config of the owner object, - * looking at `core.ignorecase`, `core.filemode`, `core.symlinks`. - * - * @param index An existing index object - * @param caps A combination of GIT_INDEXCAP values - * @return 0 on success, -1 on failure - */ -GIT_EXTERN(int) git_index_set_caps(git_index *index, int caps); - -/** - * Update the contents of an existing index object in memory by reading - * from the hard disk. - * - * If `force` is true, this performs a "hard" read that discards in-memory - * changes and always reloads the on-disk index data. If there is no - * on-disk version, the index will be cleared. - * - * If `force` is false, this does a "soft" read that reloads the index - * data from disk only if it has changed since the last time it was - * loaded. Purely in-memory index data will be untouched. Be aware: if - * there are changes on disk, unwritten in-memory changes are discarded. - * - * @param index an existing index object - * @param force if true, always reload, vs. only read if file has changed - * @return 0 or an error code - */ -GIT_EXTERN(int) git_index_read(git_index *index, int force); - -/** - * Write an existing index object from memory back to disk - * using an atomic file lock. - * - * @param index an existing index object - * @return 0 or an error code - */ -GIT_EXTERN(int) git_index_write(git_index *index); - -/** - * Get the full path to the index file on disk. - * - * @param index an existing index object - * @return path to index file or NULL for in-memory index - */ -GIT_EXTERN(const char *) git_index_path(const git_index *index); - -/** - * Get the checksum of the index - * - * This checksum is the SHA-1 hash over the index file (except the - * last 20 bytes which are the checksum itself). In cases where the - * index does not exist on-disk, it will be zeroed out. - * - * @param index an existing index object - * @return a pointer to the checksum of the index - */ -GIT_EXTERN(const git_oid *) git_index_checksum(git_index *index); - -/** - * Read a tree into the index file with stats - * - * The current index contents will be replaced by the specified tree. - * - * @param index an existing index object - * @param tree tree to read - * @return 0 or an error code - */ -GIT_EXTERN(int) git_index_read_tree(git_index *index, const git_tree *tree); - -/** - * Write the index as a tree - * - * This method will scan the index and write a representation - * of its current state back to disk; it recursively creates - * tree objects for each of the subtrees stored in the index, - * but only returns the OID of the root tree. This is the OID - * that can be used e.g. to create a commit. - * - * The index instance cannot be bare, and needs to be associated - * to an existing repository. - * - * The index must not contain any file in conflict. - * - * @param out Pointer where to store the OID of the written tree - * @param index Index to write - * @return 0 on success, GIT_EUNMERGED when the index is not clean - * or an error code - */ -GIT_EXTERN(int) git_index_write_tree(git_oid *out, git_index *index); - -/** - * Write the index as a tree to the given repository - * - * This method will do the same as `git_index_write_tree`, but - * letting the user choose the repository where the tree will - * be written. - * - * The index must not contain any file in conflict. - * - * @param out Pointer where to store OID of the the written tree - * @param index Index to write - * @param repo Repository where to write the tree - * @return 0 on success, GIT_EUNMERGED when the index is not clean - * or an error code - */ -GIT_EXTERN(int) git_index_write_tree_to(git_oid *out, git_index *index, git_repository *repo); - -/**@}*/ - -/** @name Raw Index Entry Functions - * - * These functions work on index entries, and allow for raw manipulation - * of the entries. - */ -/**@{*/ - -/* Index entry manipulation */ - -/** - * Get the count of entries currently in the index - * - * @param index an existing index object - * @return integer of count of current entries - */ -GIT_EXTERN(size_t) git_index_entrycount(const git_index *index); - -/** - * Clear the contents (all the entries) of an index object. - * - * This clears the index object in memory; changes must be explicitly - * written to disk for them to take effect persistently. - * - * @param index an existing index object - * @return 0 on success, error code < 0 on failure - */ -GIT_EXTERN(int) git_index_clear(git_index *index); - -/** - * Get a pointer to one of the entries in the index - * - * The entry is not modifiable and should not be freed. Because the - * `git_index_entry` struct is a publicly defined struct, you should - * be able to make your own permanent copy of the data if necessary. - * - * @param index an existing index object - * @param n the position of the entry - * @return a pointer to the entry; NULL if out of bounds - */ -GIT_EXTERN(const git_index_entry *) git_index_get_byindex( - git_index *index, size_t n); - -/** - * Get a pointer to one of the entries in the index - * - * The entry is not modifiable and should not be freed. Because the - * `git_index_entry` struct is a publicly defined struct, you should - * be able to make your own permanent copy of the data if necessary. - * - * @param index an existing index object - * @param path path to search - * @param stage stage to search - * @return a pointer to the entry; NULL if it was not found - */ -GIT_EXTERN(const git_index_entry *) git_index_get_bypath( - git_index *index, const char *path, int stage); - -/** - * Remove an entry from the index - * - * @param index an existing index object - * @param path path to search - * @param stage stage to search - * @return 0 or an error code - */ -GIT_EXTERN(int) git_index_remove(git_index *index, const char *path, int stage); - -/** - * Remove all entries from the index under a given directory - * - * @param index an existing index object - * @param dir container directory path - * @param stage stage to search - * @return 0 or an error code - */ -GIT_EXTERN(int) git_index_remove_directory( - git_index *index, const char *dir, int stage); - -/** - * Add or update an index entry from an in-memory struct - * - * If a previous index entry exists that has the same path and stage - * as the given 'source_entry', it will be replaced. Otherwise, the - * 'source_entry' will be added. - * - * A full copy (including the 'path' string) of the given - * 'source_entry' will be inserted on the index. - * - * @param index an existing index object - * @param source_entry new entry object - * @return 0 or an error code - */ -GIT_EXTERN(int) git_index_add(git_index *index, const git_index_entry *source_entry); - -/** - * Return the stage number from a git index entry - * - * This entry is calculated from the entry's flag attribute like this: - * - * (entry->flags & GIT_IDXENTRY_STAGEMASK) >> GIT_IDXENTRY_STAGESHIFT - * - * @param entry The entry - * @return the stage number - */ -GIT_EXTERN(int) git_index_entry_stage(const git_index_entry *entry); - -/** - * Return whether the given index entry is a conflict (has a high stage - * entry). This is simply shorthand for `git_index_entry_stage > 0`. - * - * @param entry The entry - * @return 1 if the entry is a conflict entry, 0 otherwise - */ -GIT_EXTERN(int) git_index_entry_is_conflict(const git_index_entry *entry); - -/**@}*/ - -/** @name Workdir Index Entry Functions - * - * These functions work on index entries specifically in the working - * directory (ie, stage 0). - */ -/**@{*/ - -/** - * Add or update an index entry from a file on disk - * - * The file `path` must be relative to the repository's - * working folder and must be readable. - * - * This method will fail in bare index instances. - * - * This forces the file to be added to the index, not looking - * at gitignore rules. Those rules can be evaluated through - * the git_status APIs (in status.h) before calling this. - * - * If this file currently is the result of a merge conflict, this - * file will no longer be marked as conflicting. The data about - * the conflict will be moved to the "resolve undo" (REUC) section. - * - * @param index an existing index object - * @param path filename to add - * @return 0 or an error code - */ -GIT_EXTERN(int) git_index_add_bypath(git_index *index, const char *path); - -/** - * Add or update an index entry from a buffer in memory - * - * This method will create a blob in the repository that owns the - * index and then add the index entry to the index. The `path` of the - * entry represents the position of the blob relative to the - * repository's root folder. - * - * If a previous index entry exists that has the same path as the - * given 'entry', it will be replaced. Otherwise, the 'entry' will be - * added. The `id` and the `file_size` of the 'entry' are updated with the - * real value of the blob. - * - * This forces the file to be added to the index, not looking - * at gitignore rules. Those rules can be evaluated through - * the git_status APIs (in status.h) before calling this. - * - * If this file currently is the result of a merge conflict, this - * file will no longer be marked as conflicting. The data about - * the conflict will be moved to the "resolve undo" (REUC) section. - * - * @param index an existing index object - * @param entry filename to add - * @param buffer data to be written into the blob - * @param len length of the data - * @return 0 or an error code - */ -GIT_EXTERN(int) git_index_add_frombuffer( - git_index *index, - const git_index_entry *entry, - const void *buffer, size_t len); - -/** - * Remove an index entry corresponding to a file on disk - * - * The file `path` must be relative to the repository's - * working folder. It may exist. - * - * If this file currently is the result of a merge conflict, this - * file will no longer be marked as conflicting. The data about - * the conflict will be moved to the "resolve undo" (REUC) section. - * - * @param index an existing index object - * @param path filename to remove - * @return 0 or an error code - */ -GIT_EXTERN(int) git_index_remove_bypath(git_index *index, const char *path); - -/** - * Add or update index entries matching files in the working directory. - * - * This method will fail in bare index instances. - * - * The `pathspec` is a list of file names or shell glob patterns that will - * matched against files in the repository's working directory. Each file - * that matches will be added to the index (either updating an existing - * entry or adding a new entry). You can disable glob expansion and force - * exact matching with the `GIT_INDEX_ADD_DISABLE_PATHSPEC_MATCH` flag. - * - * Files that are ignored will be skipped (unlike `git_index_add_bypath`). - * If a file is already tracked in the index, then it *will* be updated - * even if it is ignored. Pass the `GIT_INDEX_ADD_FORCE` flag to - * skip the checking of ignore rules. - * - * To emulate `git add -A` and generate an error if the pathspec contains - * the exact path of an ignored file (when not using FORCE), add the - * `GIT_INDEX_ADD_CHECK_PATHSPEC` flag. This checks that each entry - * in the `pathspec` that is an exact match to a filename on disk is - * either not ignored or already in the index. If this check fails, the - * function will return GIT_EINVALIDSPEC. - * - * To emulate `git add -A` with the "dry-run" option, just use a callback - * function that always returns a positive value. See below for details. - * - * If any files are currently the result of a merge conflict, those files - * will no longer be marked as conflicting. The data about the conflicts - * will be moved to the "resolve undo" (REUC) section. - * - * If you provide a callback function, it will be invoked on each matching - * item in the working directory immediately *before* it is added to / - * updated in the index. Returning zero will add the item to the index, - * greater than zero will skip the item, and less than zero will abort the - * scan and return that value to the caller. - * - * @param index an existing index object - * @param pathspec array of path patterns - * @param flags combination of git_index_add_option_t flags - * @param callback notification callback for each added/updated path (also - * gets index of matching pathspec entry); can be NULL; - * return 0 to add, >0 to skip, <0 to abort scan. - * @param payload payload passed through to callback function - * @return 0 on success, negative callback return value, or error code - */ -GIT_EXTERN(int) git_index_add_all( - git_index *index, - const git_strarray *pathspec, - unsigned int flags, - git_index_matched_path_cb callback, - void *payload); - -/** - * Remove all matching index entries. - * - * If you provide a callback function, it will be invoked on each matching - * item in the index immediately *before* it is removed. Return 0 to - * remove the item, > 0 to skip the item, and < 0 to abort the scan. - * - * @param index An existing index object - * @param pathspec array of path patterns - * @param callback notification callback for each removed path (also - * gets index of matching pathspec entry); can be NULL; - * return 0 to add, >0 to skip, <0 to abort scan. - * @param payload payload passed through to callback function - * @return 0 on success, negative callback return value, or error code - */ -GIT_EXTERN(int) git_index_remove_all( - git_index *index, - const git_strarray *pathspec, - git_index_matched_path_cb callback, - void *payload); - -/** - * Update all index entries to match the working directory - * - * This method will fail in bare index instances. - * - * This scans the existing index entries and synchronizes them with the - * working directory, deleting them if the corresponding working directory - * file no longer exists otherwise updating the information (including - * adding the latest version of file to the ODB if needed). - * - * If you provide a callback function, it will be invoked on each matching - * item in the index immediately *before* it is updated (either refreshed - * or removed depending on working directory state). Return 0 to proceed - * with updating the item, > 0 to skip the item, and < 0 to abort the scan. - * - * @param index An existing index object - * @param pathspec array of path patterns - * @param callback notification callback for each updated path (also - * gets index of matching pathspec entry); can be NULL; - * return 0 to add, >0 to skip, <0 to abort scan. - * @param payload payload passed through to callback function - * @return 0 on success, negative callback return value, or error code - */ -GIT_EXTERN(int) git_index_update_all( - git_index *index, - const git_strarray *pathspec, - git_index_matched_path_cb callback, - void *payload); - -/** - * Find the first position of any entries which point to given - * path in the Git index. - * - * @param at_pos the address to which the position of the index entry is written (optional) - * @param index an existing index object - * @param path path to search - * @return a zero-based position in the index if found; GIT_ENOTFOUND otherwise - */ -GIT_EXTERN(int) git_index_find(size_t *at_pos, git_index *index, const char *path); - -/** - * Find the first position of any entries matching a prefix. To find the first position - * of a path inside a given folder, suffix the prefix with a '/'. - * - * @param at_pos the address to which the position of the index entry is written (optional) - * @param index an existing index object - * @param prefix the prefix to search for - * @return 0 with valid value in at_pos; an error code otherwise - */ -GIT_EXTERN(int) git_index_find_prefix(size_t *at_pos, git_index *index, const char *prefix); - -/**@}*/ - -/** @name Conflict Index Entry Functions - * - * These functions work on conflict index entries specifically (ie, stages 1-3) - */ -/**@{*/ - -/** - * Add or update index entries to represent a conflict. Any staged - * entries that exist at the given paths will be removed. - * - * The entries are the entries from the tree included in the merge. Any - * entry may be null to indicate that that file was not present in the - * trees during the merge. For example, ancestor_entry may be NULL to - * indicate that a file was added in both branches and must be resolved. - * - * @param index an existing index object - * @param ancestor_entry the entry data for the ancestor of the conflict - * @param our_entry the entry data for our side of the merge conflict - * @param their_entry the entry data for their side of the merge conflict - * @return 0 or an error code - */ -GIT_EXTERN(int) git_index_conflict_add( - git_index *index, - const git_index_entry *ancestor_entry, - const git_index_entry *our_entry, - const git_index_entry *their_entry); - -/** - * Get the index entries that represent a conflict of a single file. - * - * The entries are not modifiable and should not be freed. Because the - * `git_index_entry` struct is a publicly defined struct, you should - * be able to make your own permanent copy of the data if necessary. - * - * @param ancestor_out Pointer to store the ancestor entry - * @param our_out Pointer to store the our entry - * @param their_out Pointer to store the their entry - * @param index an existing index object - * @param path path to search - * @return 0 or an error code - */ -GIT_EXTERN(int) git_index_conflict_get( - const git_index_entry **ancestor_out, - const git_index_entry **our_out, - const git_index_entry **their_out, - git_index *index, - const char *path); - -/** - * Removes the index entries that represent a conflict of a single file. - * - * @param index an existing index object - * @param path path to remove conflicts for - * @return 0 or an error code - */ -GIT_EXTERN(int) git_index_conflict_remove(git_index *index, const char *path); - -/** - * Remove all conflicts in the index (entries with a stage greater than 0). - * - * @param index an existing index object - * @return 0 or an error code - */ -GIT_EXTERN(int) git_index_conflict_cleanup(git_index *index); - -/** - * Determine if the index contains entries representing file conflicts. - * - * @return 1 if at least one conflict is found, 0 otherwise. - */ -GIT_EXTERN(int) git_index_has_conflicts(const git_index *index); - -/** - * Create an iterator for the conflicts in the index. - * - * The index must not be modified while iterating; the results are undefined. - * - * @param iterator_out The newly created conflict iterator - * @param index The index to scan - * @return 0 or an error code - */ -GIT_EXTERN(int) git_index_conflict_iterator_new( - git_index_conflict_iterator **iterator_out, - git_index *index); - -/** - * Returns the current conflict (ancestor, ours and theirs entry) and - * advance the iterator internally to the next value. - * - * @param ancestor_out Pointer to store the ancestor side of the conflict - * @param our_out Pointer to store our side of the conflict - * @param their_out Pointer to store their side of the conflict - * @return 0 (no error), GIT_ITEROVER (iteration is done) or an error code - * (negative value) - */ -GIT_EXTERN(int) git_index_conflict_next( - const git_index_entry **ancestor_out, - const git_index_entry **our_out, - const git_index_entry **their_out, - git_index_conflict_iterator *iterator); - -/** - * Frees a `git_index_conflict_iterator`. - * - * @param iterator pointer to the iterator - */ -GIT_EXTERN(void) git_index_conflict_iterator_free( - git_index_conflict_iterator *iterator); - -/**@}*/ - -/** @} */ -GIT_END_DECL -#endif diff --git a/vendor/libgit2/include/git2/indexer.h b/vendor/libgit2/include/git2/indexer.h deleted file mode 100644 index d2d315e47..000000000 --- a/vendor/libgit2/include/git2/indexer.h +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef _INCLUDE_git_indexer_h__ -#define _INCLUDE_git_indexer_h__ - -#include "common.h" -#include "types.h" -#include "oid.h" - -GIT_BEGIN_DECL - -typedef struct git_indexer git_indexer; - -/** - * Create a new indexer instance - * - * @param out where to store the indexer instance - * @param path to the directory where the packfile should be stored - * @param mode permissions to use creating packfile or 0 for defaults - * @param odb object database from which to read base objects when - * fixing thin packs. Pass NULL if no thin pack is expected (an error - * will be returned if there are bases missing) - * @param progress_cb function to call with progress information - * @param progress_cb_payload payload for the progress callback - */ -GIT_EXTERN(int) git_indexer_new( - git_indexer **out, - const char *path, - unsigned int mode, - git_odb *odb, - git_transfer_progress_cb progress_cb, - void *progress_cb_payload); - -/** - * Add data to the indexer - * - * @param idx the indexer - * @param data the data to add - * @param size the size of the data in bytes - * @param stats stat storage - */ -GIT_EXTERN(int) git_indexer_append(git_indexer *idx, const void *data, size_t size, git_transfer_progress *stats); - -/** - * Finalize the pack and index - * - * Resolve any pending deltas and write out the index file - * - * @param idx the indexer - */ -GIT_EXTERN(int) git_indexer_commit(git_indexer *idx, git_transfer_progress *stats); - -/** - * Get the packfile's hash - * - * A packfile's name is derived from the sorted hashing of all object - * names. This is only correct after the index has been finalized. - * - * @param idx the indexer instance - */ -GIT_EXTERN(const git_oid *) git_indexer_hash(const git_indexer *idx); - -/** - * Free the indexer and its resources - * - * @param idx the indexer to free - */ -GIT_EXTERN(void) git_indexer_free(git_indexer *idx); - -GIT_END_DECL - -#endif diff --git a/vendor/libgit2/include/git2/inttypes.h b/vendor/libgit2/include/git2/inttypes.h deleted file mode 100644 index 17364c7f8..000000000 --- a/vendor/libgit2/include/git2/inttypes.h +++ /dev/null @@ -1,309 +0,0 @@ -// ISO C9x compliant inttypes.h for Microsoft Visual Studio -// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124 -// -// Copyright (c) 2006 Alexander Chemeris -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are met: -// -// 1. Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimer. -// -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// 3. The name of the author may be used to endorse or promote products -// derived from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _MSC_VER // [ -#error "Use this header only with Microsoft Visual C++ compilers!" -#endif // _MSC_VER ] - -#ifndef _MSC_INTTYPES_H_ // [ -#define _MSC_INTTYPES_H_ - -#if _MSC_VER > 1000 -#pragma once -#endif - -#if _MSC_VER >= 1600 -#include -#else -#include "stdint.h" -#endif - -// 7.8 Format conversion of integer types - -typedef struct { - intmax_t quot; - intmax_t rem; -} imaxdiv_t; - -// 7.8.1 Macros for format specifiers - -#if !defined(__cplusplus) || defined(__STDC_FORMAT_MACROS) // [ See footnote 185 at page 198 - -// The fprintf macros for signed integers are: -#define PRId8 "d" -#define PRIi8 "i" -#define PRIdLEAST8 "d" -#define PRIiLEAST8 "i" -#define PRIdFAST8 "d" -#define PRIiFAST8 "i" - -#define PRId16 "hd" -#define PRIi16 "hi" -#define PRIdLEAST16 "hd" -#define PRIiLEAST16 "hi" -#define PRIdFAST16 "hd" -#define PRIiFAST16 "hi" - -#define PRId32 "I32d" -#define PRIi32 "I32i" -#define PRIdLEAST32 "I32d" -#define PRIiLEAST32 "I32i" -#define PRIdFAST32 "I32d" -#define PRIiFAST32 "I32i" - -#define PRId64 "I64d" -#define PRIi64 "I64i" -#define PRIdLEAST64 "I64d" -#define PRIiLEAST64 "I64i" -#define PRIdFAST64 "I64d" -#define PRIiFAST64 "I64i" - -#define PRIdMAX "I64d" -#define PRIiMAX "I64i" - -#define PRIdPTR "Id" -#define PRIiPTR "Ii" - -// The fprintf macros for unsigned integers are: -#define PRIo8 "o" -#define PRIu8 "u" -#define PRIx8 "x" -#define PRIX8 "X" -#define PRIoLEAST8 "o" -#define PRIuLEAST8 "u" -#define PRIxLEAST8 "x" -#define PRIXLEAST8 "X" -#define PRIoFAST8 "o" -#define PRIuFAST8 "u" -#define PRIxFAST8 "x" -#define PRIXFAST8 "X" - -#define PRIo16 "ho" -#define PRIu16 "hu" -#define PRIx16 "hx" -#define PRIX16 "hX" -#define PRIoLEAST16 "ho" -#define PRIuLEAST16 "hu" -#define PRIxLEAST16 "hx" -#define PRIXLEAST16 "hX" -#define PRIoFAST16 "ho" -#define PRIuFAST16 "hu" -#define PRIxFAST16 "hx" -#define PRIXFAST16 "hX" - -#define PRIo32 "I32o" -#define PRIu32 "I32u" -#define PRIx32 "I32x" -#define PRIX32 "I32X" -#define PRIoLEAST32 "I32o" -#define PRIuLEAST32 "I32u" -#define PRIxLEAST32 "I32x" -#define PRIXLEAST32 "I32X" -#define PRIoFAST32 "I32o" -#define PRIuFAST32 "I32u" -#define PRIxFAST32 "I32x" -#define PRIXFAST32 "I32X" - -#define PRIo64 "I64o" -#define PRIu64 "I64u" -#define PRIx64 "I64x" -#define PRIX64 "I64X" -#define PRIoLEAST64 "I64o" -#define PRIuLEAST64 "I64u" -#define PRIxLEAST64 "I64x" -#define PRIXLEAST64 "I64X" -#define PRIoFAST64 "I64o" -#define PRIuFAST64 "I64u" -#define PRIxFAST64 "I64x" -#define PRIXFAST64 "I64X" - -#define PRIoMAX "I64o" -#define PRIuMAX "I64u" -#define PRIxMAX "I64x" -#define PRIXMAX "I64X" - -#define PRIoPTR "Io" -#define PRIuPTR "Iu" -#define PRIxPTR "Ix" -#define PRIXPTR "IX" - -// The fscanf macros for signed integers are: -#define SCNd8 "d" -#define SCNi8 "i" -#define SCNdLEAST8 "d" -#define SCNiLEAST8 "i" -#define SCNdFAST8 "d" -#define SCNiFAST8 "i" - -#define SCNd16 "hd" -#define SCNi16 "hi" -#define SCNdLEAST16 "hd" -#define SCNiLEAST16 "hi" -#define SCNdFAST16 "hd" -#define SCNiFAST16 "hi" - -#define SCNd32 "ld" -#define SCNi32 "li" -#define SCNdLEAST32 "ld" -#define SCNiLEAST32 "li" -#define SCNdFAST32 "ld" -#define SCNiFAST32 "li" - -#define SCNd64 "I64d" -#define SCNi64 "I64i" -#define SCNdLEAST64 "I64d" -#define SCNiLEAST64 "I64i" -#define SCNdFAST64 "I64d" -#define SCNiFAST64 "I64i" - -#define SCNdMAX "I64d" -#define SCNiMAX "I64i" - -#ifdef _WIN64 // [ -# define SCNdPTR "I64d" -# define SCNiPTR "I64i" -#else // _WIN64 ][ -# define SCNdPTR "ld" -# define SCNiPTR "li" -#endif // _WIN64 ] - -// The fscanf macros for unsigned integers are: -#define SCNo8 "o" -#define SCNu8 "u" -#define SCNx8 "x" -#define SCNX8 "X" -#define SCNoLEAST8 "o" -#define SCNuLEAST8 "u" -#define SCNxLEAST8 "x" -#define SCNXLEAST8 "X" -#define SCNoFAST8 "o" -#define SCNuFAST8 "u" -#define SCNxFAST8 "x" -#define SCNXFAST8 "X" - -#define SCNo16 "ho" -#define SCNu16 "hu" -#define SCNx16 "hx" -#define SCNX16 "hX" -#define SCNoLEAST16 "ho" -#define SCNuLEAST16 "hu" -#define SCNxLEAST16 "hx" -#define SCNXLEAST16 "hX" -#define SCNoFAST16 "ho" -#define SCNuFAST16 "hu" -#define SCNxFAST16 "hx" -#define SCNXFAST16 "hX" - -#define SCNo32 "lo" -#define SCNu32 "lu" -#define SCNx32 "lx" -#define SCNX32 "lX" -#define SCNoLEAST32 "lo" -#define SCNuLEAST32 "lu" -#define SCNxLEAST32 "lx" -#define SCNXLEAST32 "lX" -#define SCNoFAST32 "lo" -#define SCNuFAST32 "lu" -#define SCNxFAST32 "lx" -#define SCNXFAST32 "lX" - -#define SCNo64 "I64o" -#define SCNu64 "I64u" -#define SCNx64 "I64x" -#define SCNX64 "I64X" -#define SCNoLEAST64 "I64o" -#define SCNuLEAST64 "I64u" -#define SCNxLEAST64 "I64x" -#define SCNXLEAST64 "I64X" -#define SCNoFAST64 "I64o" -#define SCNuFAST64 "I64u" -#define SCNxFAST64 "I64x" -#define SCNXFAST64 "I64X" - -#define SCNoMAX "I64o" -#define SCNuMAX "I64u" -#define SCNxMAX "I64x" -#define SCNXMAX "I64X" - -#ifdef _WIN64 // [ -# define SCNoPTR "I64o" -# define SCNuPTR "I64u" -# define SCNxPTR "I64x" -# define SCNXPTR "I64X" -#else // _WIN64 ][ -# define SCNoPTR "lo" -# define SCNuPTR "lu" -# define SCNxPTR "lx" -# define SCNXPTR "lX" -#endif // _WIN64 ] - -#endif // __STDC_FORMAT_MACROS ] - -// 7.8.2 Functions for greatest-width integer types - -// 7.8.2.1 The imaxabs function -#define imaxabs _abs64 - -// 7.8.2.2 The imaxdiv function - -// This is modified version of div() function from Microsoft's div.c found -// in %MSVC.NET%\crt\src\div.c -#ifdef STATIC_IMAXDIV // [ -static -#else // STATIC_IMAXDIV ][ -_inline -#endif // STATIC_IMAXDIV ] -imaxdiv_t __cdecl imaxdiv(intmax_t numer, intmax_t denom) -{ - imaxdiv_t result; - - result.quot = numer / denom; - result.rem = numer % denom; - - if (numer < 0 && result.rem > 0) { - // did division wrong; must fix up - ++result.quot; - result.rem -= denom; - } - - return result; -} - -// 7.8.2.3 The strtoimax and strtoumax functions -#define strtoimax _strtoi64 -#define strtoumax _strtoui64 - -// 7.8.2.4 The wcstoimax and wcstoumax functions -#define wcstoimax _wcstoi64 -#define wcstoumax _wcstoui64 - - -#endif // _MSC_INTTYPES_H_ ] diff --git a/vendor/libgit2/include/git2/merge.h b/vendor/libgit2/include/git2/merge.h deleted file mode 100644 index 560797a0c..000000000 --- a/vendor/libgit2/include/git2/merge.h +++ /dev/null @@ -1,573 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_git_merge_h__ -#define INCLUDE_git_merge_h__ - -#include "common.h" -#include "types.h" -#include "oid.h" -#include "oidarray.h" -#include "checkout.h" -#include "index.h" -#include "annotated_commit.h" - -/** - * @file git2/merge.h - * @brief Git merge routines - * @defgroup git_merge Git merge routines - * @ingroup Git - * @{ - */ -GIT_BEGIN_DECL - -/** - * The file inputs to `git_merge_file`. Callers should populate the - * `git_merge_file_input` structure with descriptions of the files in - * each side of the conflict for use in producing the merge file. - */ -typedef struct { - unsigned int version; - - /** Pointer to the contents of the file. */ - const char *ptr; - - /** Size of the contents pointed to in `ptr`. */ - size_t size; - - /** File name of the conflicted file, or `NULL` to not merge the path. */ - const char *path; - - /** File mode of the conflicted file, or `0` to not merge the mode. */ - unsigned int mode; -} git_merge_file_input; - -#define GIT_MERGE_FILE_INPUT_VERSION 1 -#define GIT_MERGE_FILE_INPUT_INIT {GIT_MERGE_FILE_INPUT_VERSION} - -/** - * Initializes a `git_merge_file_input` with default values. Equivalent to - * creating an instance with GIT_MERGE_FILE_INPUT_INIT. - * - * @param opts the `git_merge_file_input` instance to initialize. - * @param version the version of the struct; you should pass - * `GIT_MERGE_FILE_INPUT_VERSION` here. - * @return Zero on success; -1 on failure. - */ -GIT_EXTERN(int) git_merge_file_init_input( - git_merge_file_input *opts, - unsigned int version); - -/** - * Flags for `git_merge` options. A combination of these flags can be - * passed in via the `flags` value in the `git_merge_options`. - */ -typedef enum { - /** - * Detect renames that occur between the common ancestor and the "ours" - * side or the common ancestor and the "theirs" side. This will enable - * the ability to merge between a modified and renamed file. - */ - GIT_MERGE_FIND_RENAMES = (1 << 0), - - /** - * If a conflict occurs, exit immediately instead of attempting to - * continue resolving conflicts. The merge operation will fail with - * GIT_EMERGECONFLICT and no index will be returned. - */ - GIT_MERGE_FAIL_ON_CONFLICT = (1 << 1), - - /** - * Do not write the REUC extension on the generated index - */ - GIT_MERGE_SKIP_REUC = (1 << 2), - - /** - * If the commits being merged have multiple merge bases, do not build - * a recursive merge base (by merging the multiple merge bases), - * instead simply use the first base. This flag provides a similar - * merge base to `git-merge-resolve`. - */ - GIT_MERGE_NO_RECURSIVE = (1 << 3), -} git_merge_flag_t; - -/** - * Merge file favor options for `git_merge_options` instruct the file-level - * merging functionality how to deal with conflicting regions of the files. - */ -typedef enum { - /** - * When a region of a file is changed in both branches, a conflict - * will be recorded in the index so that `git_checkout` can produce - * a merge file with conflict markers in the working directory. - * This is the default. - */ - GIT_MERGE_FILE_FAVOR_NORMAL = 0, - - /** - * When a region of a file is changed in both branches, the file - * created in the index will contain the "ours" side of any conflicting - * region. The index will not record a conflict. - */ - GIT_MERGE_FILE_FAVOR_OURS = 1, - - /** - * When a region of a file is changed in both branches, the file - * created in the index will contain the "theirs" side of any conflicting - * region. The index will not record a conflict. - */ - GIT_MERGE_FILE_FAVOR_THEIRS = 2, - - /** - * When a region of a file is changed in both branches, the file - * created in the index will contain each unique line from each side, - * which has the result of combining both files. The index will not - * record a conflict. - */ - GIT_MERGE_FILE_FAVOR_UNION = 3, -} git_merge_file_favor_t; - -/** - * File merging flags - */ -typedef enum { - /** Defaults */ - GIT_MERGE_FILE_DEFAULT = 0, - - /** Create standard conflicted merge files */ - GIT_MERGE_FILE_STYLE_MERGE = (1 << 0), - - /** Create diff3-style files */ - GIT_MERGE_FILE_STYLE_DIFF3 = (1 << 1), - - /** Condense non-alphanumeric regions for simplified diff file */ - GIT_MERGE_FILE_SIMPLIFY_ALNUM = (1 << 2), - - /** Ignore all whitespace */ - GIT_MERGE_FILE_IGNORE_WHITESPACE = (1 << 3), - - /** Ignore changes in amount of whitespace */ - GIT_MERGE_FILE_IGNORE_WHITESPACE_CHANGE = (1 << 4), - - /** Ignore whitespace at end of line */ - GIT_MERGE_FILE_IGNORE_WHITESPACE_EOL = (1 << 5), - - /** Use the "patience diff" algorithm */ - GIT_MERGE_FILE_DIFF_PATIENCE = (1 << 6), - - /** Take extra time to find minimal diff */ - GIT_MERGE_FILE_DIFF_MINIMAL = (1 << 7), -} git_merge_file_flag_t; - -/** - * Options for merging a file - */ -typedef struct { - unsigned int version; - - /** - * Label for the ancestor file side of the conflict which will be prepended - * to labels in diff3-format merge files. - */ - const char *ancestor_label; - - /** - * Label for our file side of the conflict which will be prepended - * to labels in merge files. - */ - const char *our_label; - - /** - * Label for their file side of the conflict which will be prepended - * to labels in merge files. - */ - const char *their_label; - - /** The file to favor in region conflicts. */ - git_merge_file_favor_t favor; - - /** see `git_merge_file_flag_t` above */ - git_merge_file_flag_t flags; -} git_merge_file_options; - -#define GIT_MERGE_FILE_OPTIONS_VERSION 1 -#define GIT_MERGE_FILE_OPTIONS_INIT {GIT_MERGE_FILE_OPTIONS_VERSION} - -/** - * Initializes a `git_merge_file_options` with default values. Equivalent to - * creating an instance with GIT_MERGE_FILE_OPTIONS_INIT. - * - * @param opts the `git_merge_file_options` instance to initialize. - * @param version the version of the struct; you should pass - * `GIT_MERGE_FILE_OPTIONS_VERSION` here. - * @return Zero on success; -1 on failure. - */ -GIT_EXTERN(int) git_merge_file_init_options( - git_merge_file_options *opts, - unsigned int version); - -/** - * Information about file-level merging - */ -typedef struct { - /** - * True if the output was automerged, false if the output contains - * conflict markers. - */ - unsigned int automergeable; - - /** - * The path that the resultant merge file should use, or NULL if a - * filename conflict would occur. - */ - const char *path; - - /** The mode that the resultant merge file should use. */ - unsigned int mode; - - /** The contents of the merge. */ - const char *ptr; - - /** The length of the merge contents. */ - size_t len; -} git_merge_file_result; - -/** - * Merging options - */ -typedef struct { - unsigned int version; - - /** See `git_merge_flag_t` above */ - git_merge_flag_t flags; - - /** - * Similarity to consider a file renamed (default 50). If - * `GIT_MERGE_FIND_RENAMES` is enabled, added files will be compared - * with deleted files to determine their similarity. Files that are - * more similar than the rename threshold (percentage-wise) will be - * treated as a rename. - */ - unsigned int rename_threshold; - - /** - * Maximum similarity sources to examine for renames (default 200). - * If the number of rename candidates (add / delete pairs) is greater - * than this value, inexact rename detection is aborted. - * - * This setting overrides the `merge.renameLimit` configuration value. - */ - unsigned int target_limit; - - /** Pluggable similarity metric; pass NULL to use internal metric */ - git_diff_similarity_metric *metric; - - /** - * Maximum number of times to merge common ancestors to build a - * virtual merge base when faced with criss-cross merges. When this - * limit is reached, the next ancestor will simply be used instead of - * attempting to merge it. The default is unlimited. - */ - unsigned int recursion_limit; - - /** Flags for handling conflicting content. */ - git_merge_file_favor_t file_favor; - - /** see `git_merge_file_flag_t` above */ - git_merge_file_flag_t file_flags; -} git_merge_options; - -#define GIT_MERGE_OPTIONS_VERSION 1 -#define GIT_MERGE_OPTIONS_INIT {GIT_MERGE_OPTIONS_VERSION} - -/** - * Initializes a `git_merge_options` with default values. Equivalent to - * creating an instance with GIT_MERGE_OPTIONS_INIT. - * - * @param opts the `git_merge_options` instance to initialize. - * @param version the version of the struct; you should pass - * `GIT_MERGE_OPTIONS_VERSION` here. - * @return Zero on success; -1 on failure. - */ -GIT_EXTERN(int) git_merge_init_options( - git_merge_options *opts, - unsigned int version); - -/** - * The results of `git_merge_analysis` indicate the merge opportunities. - */ -typedef enum { - /** No merge is possible. (Unused.) */ - GIT_MERGE_ANALYSIS_NONE = 0, - - /** - * A "normal" merge; both HEAD and the given merge input have diverged - * from their common ancestor. The divergent commits must be merged. - */ - GIT_MERGE_ANALYSIS_NORMAL = (1 << 0), - - /** - * All given merge inputs are reachable from HEAD, meaning the - * repository is up-to-date and no merge needs to be performed. - */ - GIT_MERGE_ANALYSIS_UP_TO_DATE = (1 << 1), - - /** - * The given merge input is a fast-forward from HEAD and no merge - * needs to be performed. Instead, the client can check out the - * given merge input. - */ - GIT_MERGE_ANALYSIS_FASTFORWARD = (1 << 2), - - /** - * The HEAD of the current repository is "unborn" and does not point to - * a valid commit. No merge can be performed, but the caller may wish - * to simply set HEAD to the target commit(s). - */ - GIT_MERGE_ANALYSIS_UNBORN = (1 << 3), -} git_merge_analysis_t; - -/** - * The user's stated preference for merges. - */ -typedef enum { - /** - * No configuration was found that suggests a preferred behavior for - * merge. - */ - GIT_MERGE_PREFERENCE_NONE = 0, - - /** - * There is a `merge.ff=false` configuration setting, suggesting that - * the user does not want to allow a fast-forward merge. - */ - GIT_MERGE_PREFERENCE_NO_FASTFORWARD = (1 << 0), - - /** - * There is a `merge.ff=only` configuration setting, suggesting that - * the user only wants fast-forward merges. - */ - GIT_MERGE_PREFERENCE_FASTFORWARD_ONLY = (1 << 1), -} git_merge_preference_t; - -/** - * Analyzes the given branch(es) and determines the opportunities for - * merging them into the HEAD of the repository. - * - * @param analysis_out analysis enumeration that the result is written into - * @param repo the repository to merge - * @param their_heads the heads to merge into - * @param their_heads_len the number of heads to merge - * @return 0 on success or error code - */ -GIT_EXTERN(int) git_merge_analysis( - git_merge_analysis_t *analysis_out, - git_merge_preference_t *preference_out, - git_repository *repo, - const git_annotated_commit **their_heads, - size_t their_heads_len); - -/** - * Find a merge base between two commits - * - * @param out the OID of a merge base between 'one' and 'two' - * @param repo the repository where the commits exist - * @param one one of the commits - * @param two the other commit - * @return 0 on success, GIT_ENOTFOUND if not found or error code - */ -GIT_EXTERN(int) git_merge_base( - git_oid *out, - git_repository *repo, - const git_oid *one, - const git_oid *two); - -/** - * Find merge bases between two commits - * - * @param out array in which to store the resulting ids - * @param repo the repository where the commits exist - * @param one one of the commits - * @param two the other commit - * @return 0 on success, GIT_ENOTFOUND if not found or error code - */ -GIT_EXTERN(int) git_merge_bases( - git_oidarray *out, - git_repository *repo, - const git_oid *one, - const git_oid *two); - -/** - * Find a merge base given a list of commits - * - * @param out the OID of a merge base considering all the commits - * @param repo the repository where the commits exist - * @param length The number of commits in the provided `input_array` - * @param input_array oids of the commits - * @return Zero on success; GIT_ENOTFOUND or -1 on failure. - */ -GIT_EXTERN(int) git_merge_base_many( - git_oid *out, - git_repository *repo, - size_t length, - const git_oid input_array[]); - -/** - * Find all merge bases given a list of commits - * - * @param out array in which to store the resulting ids - * @param repo the repository where the commits exist - * @param length The number of commits in the provided `input_array` - * @param input_array oids of the commits - * @return Zero on success; GIT_ENOTFOUND or -1 on failure. - */ -GIT_EXTERN(int) git_merge_bases_many( - git_oidarray *out, - git_repository *repo, - size_t length, - const git_oid input_array[]); - -/** - * Find a merge base in preparation for an octopus merge - * - * @param out the OID of a merge base considering all the commits - * @param repo the repository where the commits exist - * @param length The number of commits in the provided `input_array` - * @param input_array oids of the commits - * @return Zero on success; GIT_ENOTFOUND or -1 on failure. - */ -GIT_EXTERN(int) git_merge_base_octopus( - git_oid *out, - git_repository *repo, - size_t length, - const git_oid input_array[]); - -/** - * Merge two files as they exist in the in-memory data structures, using - * the given common ancestor as the baseline, producing a - * `git_merge_file_result` that reflects the merge result. The - * `git_merge_file_result` must be freed with `git_merge_file_result_free`. - * - * Note that this function does not reference a repository and any - * configuration must be passed as `git_merge_file_options`. - * - * @param out The git_merge_file_result to be filled in - * @param ancestor The contents of the ancestor file - * @param ours The contents of the file in "our" side - * @param theirs The contents of the file in "their" side - * @param opts The merge file options or `NULL` for defaults - * @return 0 on success or error code - */ -GIT_EXTERN(int) git_merge_file( - git_merge_file_result *out, - const git_merge_file_input *ancestor, - const git_merge_file_input *ours, - const git_merge_file_input *theirs, - const git_merge_file_options *opts); - -/** - * Merge two files as they exist in the index, using the given common - * ancestor as the baseline, producing a `git_merge_file_result` that - * reflects the merge result. The `git_merge_file_result` must be freed with - * `git_merge_file_result_free`. - * - * @param out The git_merge_file_result to be filled in - * @param repo The repository - * @param ancestor The index entry for the ancestor file (stage level 1) - * @param ours The index entry for our file (stage level 2) - * @param theirs The index entry for their file (stage level 3) - * @param opts The merge file options or NULL - * @return 0 on success or error code - */ -GIT_EXTERN(int) git_merge_file_from_index( - git_merge_file_result *out, - git_repository *repo, - const git_index_entry *ancestor, - const git_index_entry *ours, - const git_index_entry *theirs, - const git_merge_file_options *opts); - -/** - * Frees a `git_merge_file_result`. - * - * @param result The result to free or `NULL` - */ -GIT_EXTERN(void) git_merge_file_result_free(git_merge_file_result *result); - -/** - * Merge two trees, producing a `git_index` that reflects the result of - * the merge. The index may be written as-is to the working directory - * or checked out. If the index is to be converted to a tree, the caller - * should resolve any conflicts that arose as part of the merge. - * - * The returned index must be freed explicitly with `git_index_free`. - * - * @param out pointer to store the index result in - * @param repo repository that contains the given trees - * @param ancestor_tree the common ancestor between the trees (or null if none) - * @param our_tree the tree that reflects the destination tree - * @param their_tree the tree to merge in to `our_tree` - * @param opts the merge tree options (or null for defaults) - * @return 0 on success or error code - */ -GIT_EXTERN(int) git_merge_trees( - git_index **out, - git_repository *repo, - const git_tree *ancestor_tree, - const git_tree *our_tree, - const git_tree *their_tree, - const git_merge_options *opts); - -/** - * Merge two commits, producing a `git_index` that reflects the result of - * the merge. The index may be written as-is to the working directory - * or checked out. If the index is to be converted to a tree, the caller - * should resolve any conflicts that arose as part of the merge. - * - * The returned index must be freed explicitly with `git_index_free`. - * - * @param out pointer to store the index result in - * @param repo repository that contains the given trees - * @param our_commit the commit that reflects the destination tree - * @param their_commit the commit to merge in to `our_commit` - * @param opts the merge tree options (or null for defaults) - * @return 0 on success or error code - */ -GIT_EXTERN(int) git_merge_commits( - git_index **out, - git_repository *repo, - const git_commit *our_commit, - const git_commit *their_commit, - const git_merge_options *opts); - -/** - * Merges the given commit(s) into HEAD, writing the results into the working - * directory. Any changes are staged for commit and any conflicts are written - * to the index. Callers should inspect the repository's index after this - * completes, resolve any conflicts and prepare a commit. - * - * For compatibility with git, the repository is put into a merging - * state. Once the commit is done (or if the uses wishes to abort), - * you should clear this state by calling - * `git_repository_state_cleanup()`. - * - * @param repo the repository to merge - * @param their_heads the heads to merge into - * @param their_heads_len the number of heads to merge - * @param merge_opts merge options - * @param checkout_opts checkout options - * @return 0 on success or error code - */ -GIT_EXTERN(int) git_merge( - git_repository *repo, - const git_annotated_commit **their_heads, - size_t their_heads_len, - const git_merge_options *merge_opts, - const git_checkout_options *checkout_opts); - -/** @} */ -GIT_END_DECL -#endif diff --git a/vendor/libgit2/include/git2/message.h b/vendor/libgit2/include/git2/message.h deleted file mode 100644 index d78b1dce5..000000000 --- a/vendor/libgit2/include/git2/message.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_git_message_h__ -#define INCLUDE_git_message_h__ - -#include "common.h" -#include "buffer.h" - -/** - * @file git2/message.h - * @brief Git message management routines - * @ingroup Git - * @{ - */ -GIT_BEGIN_DECL - -/** - * Clean up message from excess whitespace and make sure that the last line - * ends with a '\n'. - * - * Optionally, can remove lines starting with a "#". - * - * @param out The user-allocated git_buf which will be filled with the - * cleaned up message. - * - * @param message The message to be prettified. - * - * @param strip_comments Non-zero to remove comment lines, 0 to leave them in. - * - * @param comment_char Comment character. Lines starting with this character - * are considered to be comments and removed if `strip_comments` is non-zero. - * - * @return 0 or an error code. - */ -GIT_EXTERN(int) git_message_prettify(git_buf *out, const char *message, int strip_comments, char comment_char); - -/** @} */ -GIT_END_DECL - -#endif /* INCLUDE_git_message_h__ */ diff --git a/vendor/libgit2/include/git2/net.h b/vendor/libgit2/include/git2/net.h deleted file mode 100644 index 04dff34bc..000000000 --- a/vendor/libgit2/include/git2/net.h +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_git_net_h__ -#define INCLUDE_git_net_h__ - -#include "common.h" -#include "oid.h" -#include "types.h" - -/** - * @file git2/net.h - * @brief Git networking declarations - * @ingroup Git - * @{ - */ -GIT_BEGIN_DECL - -#define GIT_DEFAULT_PORT "9418" - -/** - * Direction of the connection. - * - * We need this because we need to know whether we should call - * git-upload-pack or git-receive-pack on the remote end when get_refs - * gets called. - */ -typedef enum { - GIT_DIRECTION_FETCH = 0, - GIT_DIRECTION_PUSH = 1 -} git_direction; - -/** - * Description of a reference advertised by a remote server, given out - * on `ls` calls. - */ -struct git_remote_head { - int local; /* available locally */ - git_oid oid; - git_oid loid; - char *name; - /** - * If the server send a symref mapping for this ref, this will - * point to the target. - */ - char *symref_target; -}; - -/** - * Callback for listing the remote heads - */ -typedef int (*git_headlist_cb)(git_remote_head *rhead, void *payload); - -/** @} */ -GIT_END_DECL -#endif diff --git a/vendor/libgit2/include/git2/notes.h b/vendor/libgit2/include/git2/notes.h deleted file mode 100644 index 3a626cafd..000000000 --- a/vendor/libgit2/include/git2/notes.h +++ /dev/null @@ -1,217 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_git_note_h__ -#define INCLUDE_git_note_h__ - -#include "oid.h" - -/** - * @file git2/notes.h - * @brief Git notes management routines - * @defgroup git_note Git notes management routines - * @ingroup Git - * @{ - */ -GIT_BEGIN_DECL - -/** - * Callback for git_note_foreach. - * - * Receives: - * - blob_id: Oid of the blob containing the message - * - annotated_object_id: Oid of the git object being annotated - * - payload: Payload data passed to `git_note_foreach` - */ -typedef int (*git_note_foreach_cb)( - const git_oid *blob_id, const git_oid *annotated_object_id, void *payload); - -/** - * note iterator - */ -typedef struct git_iterator git_note_iterator; - -/** - * Creates a new iterator for notes - * - * The iterator must be freed manually by the user. - * - * @param out pointer to the iterator - * @param repo repository where to look up the note - * @param notes_ref canonical name of the reference to use (optional); defaults to - * "refs/notes/commits" - * - * @return 0 or an error code - */ -GIT_EXTERN(int) git_note_iterator_new( - git_note_iterator **out, - git_repository *repo, - const char *notes_ref); - -/** - * Frees an git_note_iterator - * - * @param it pointer to the iterator - */ -GIT_EXTERN(void) git_note_iterator_free(git_note_iterator *it); - -/** - * Return the current item (note_id and annotated_id) and advance the iterator - * internally to the next value - * - * @param note_id id of blob containing the message - * @param annotated_id id of the git object being annotated - * @param it pointer to the iterator - * - * @return 0 (no error), GIT_ITEROVER (iteration is done) or an error code - * (negative value) - */ -GIT_EXTERN(int) git_note_next( - git_oid* note_id, - git_oid* annotated_id, - git_note_iterator *it); - - -/** - * Read the note for an object - * - * The note must be freed manually by the user. - * - * @param out pointer to the read note; NULL in case of error - * @param repo repository where to look up the note - * @param notes_ref canonical name of the reference to use (optional); defaults to - * "refs/notes/commits" - * @param oid OID of the git object to read the note from - * - * @return 0 or an error code - */ -GIT_EXTERN(int) git_note_read( - git_note **out, - git_repository *repo, - const char *notes_ref, - const git_oid *oid); - -/** - * Get the note author - * - * @param note the note - * @return the author - */ -GIT_EXTERN(const git_signature *) git_note_author(const git_note *note); - -/** - * Get the note committer - * - * @param note the note - * @return the committer - */ -GIT_EXTERN(const git_signature *) git_note_committer(const git_note *note); - - -/** - * Get the note message - * - * @param note the note - * @return the note message - */ -GIT_EXTERN(const char *) git_note_message(const git_note *note); - - -/** - * Get the note object's id - * - * @param note the note - * @return the note object's id - */ -GIT_EXTERN(const git_oid *) git_note_id(const git_note *note); - -/** - * Add a note for an object - * - * @param out pointer to store the OID (optional); NULL in case of error - * @param repo repository where to store the note - * @param notes_ref canonical name of the reference to use (optional); - * defaults to "refs/notes/commits" - * @param author signature of the notes commit author - * @param committer signature of the notes commit committer - * @param oid OID of the git object to decorate - * @param note Content of the note to add for object oid - * @param force Overwrite existing note - * - * @return 0 or an error code - */ -GIT_EXTERN(int) git_note_create( - git_oid *out, - git_repository *repo, - const char *notes_ref, - const git_signature *author, - const git_signature *committer, - const git_oid *oid, - const char *note, - int force); - - -/** - * Remove the note for an object - * - * @param repo repository where the note lives - * @param notes_ref canonical name of the reference to use (optional); - * defaults to "refs/notes/commits" - * @param author signature of the notes commit author - * @param committer signature of the notes commit committer - * @param oid OID of the git object to remove the note from - * - * @return 0 or an error code - */ -GIT_EXTERN(int) git_note_remove( - git_repository *repo, - const char *notes_ref, - const git_signature *author, - const git_signature *committer, - const git_oid *oid); - -/** - * Free a git_note object - * - * @param note git_note object - */ -GIT_EXTERN(void) git_note_free(git_note *note); - -/** - * Get the default notes reference for a repository - * - * @param out buffer in which to store the name of the default notes reference - * @param repo The Git repository - * - * @return 0 or an error code - */ -GIT_EXTERN(int) git_note_default_ref(git_buf *out, git_repository *repo); - -/** - * Loop over all the notes within a specified namespace - * and issue a callback for each one. - * - * @param repo Repository where to find the notes. - * - * @param notes_ref Reference to read from (optional); defaults to - * "refs/notes/commits". - * - * @param note_cb Callback to invoke per found annotation. Return non-zero - * to stop looping. - * - * @param payload Extra parameter to callback function. - * - * @return 0 on success, non-zero callback return value, or error code - */ -GIT_EXTERN(int) git_note_foreach( - git_repository *repo, - const char *notes_ref, - git_note_foreach_cb note_cb, - void *payload); - -/** @} */ -GIT_END_DECL -#endif diff --git a/vendor/libgit2/include/git2/object.h b/vendor/libgit2/include/git2/object.h deleted file mode 100644 index a798c9dc3..000000000 --- a/vendor/libgit2/include/git2/object.h +++ /dev/null @@ -1,242 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_git_object_h__ -#define INCLUDE_git_object_h__ - -#include "common.h" -#include "types.h" -#include "oid.h" -#include "buffer.h" - -/** - * @file git2/object.h - * @brief Git revision object management routines - * @defgroup git_object Git revision object management routines - * @ingroup Git - * @{ - */ -GIT_BEGIN_DECL - -/** - * Lookup a reference to one of the objects in a repository. - * - * The generated reference is owned by the repository and - * should be closed with the `git_object_free` method - * instead of free'd manually. - * - * The 'type' parameter must match the type of the object - * in the odb; the method will fail otherwise. - * The special value 'GIT_OBJ_ANY' may be passed to let - * the method guess the object's type. - * - * @param object pointer to the looked-up object - * @param repo the repository to look up the object - * @param id the unique identifier for the object - * @param type the type of the object - * @return 0 or an error code - */ -GIT_EXTERN(int) git_object_lookup( - git_object **object, - git_repository *repo, - const git_oid *id, - git_otype type); - -/** - * Lookup a reference to one of the objects in a repository, - * given a prefix of its identifier (short id). - * - * The object obtained will be so that its identifier - * matches the first 'len' hexadecimal characters - * (packets of 4 bits) of the given 'id'. - * 'len' must be at least GIT_OID_MINPREFIXLEN, and - * long enough to identify a unique object matching - * the prefix; otherwise the method will fail. - * - * The generated reference is owned by the repository and - * should be closed with the `git_object_free` method - * instead of free'd manually. - * - * The 'type' parameter must match the type of the object - * in the odb; the method will fail otherwise. - * The special value 'GIT_OBJ_ANY' may be passed to let - * the method guess the object's type. - * - * @param object_out pointer where to store the looked-up object - * @param repo the repository to look up the object - * @param id a short identifier for the object - * @param len the length of the short identifier - * @param type the type of the object - * @return 0 or an error code - */ -GIT_EXTERN(int) git_object_lookup_prefix( - git_object **object_out, - git_repository *repo, - const git_oid *id, - size_t len, - git_otype type); - - -/** - * Lookup an object that represents a tree entry. - * - * @param out buffer that receives a pointer to the object (which must be freed - * by the caller) - * @param treeish root object that can be peeled to a tree - * @param path relative path from the root object to the desired object - * @param type type of object desired - * @return 0 on success, or an error code - */ -GIT_EXTERN(int) git_object_lookup_bypath( - git_object **out, - const git_object *treeish, - const char *path, - git_otype type); - -/** - * Get the id (SHA1) of a repository object - * - * @param obj the repository object - * @return the SHA1 id - */ -GIT_EXTERN(const git_oid *) git_object_id(const git_object *obj); - -/** - * Get a short abbreviated OID string for the object - * - * This starts at the "core.abbrev" length (default 7 characters) and - * iteratively extends to a longer string if that length is ambiguous. - * The result will be unambiguous (at least until new objects are added to - * the repository). - * - * @param out Buffer to write string into - * @param obj The object to get an ID for - * @return 0 on success, <0 for error - */ -GIT_EXTERN(int) git_object_short_id(git_buf *out, const git_object *obj); - -/** - * Get the object type of an object - * - * @param obj the repository object - * @return the object's type - */ -GIT_EXTERN(git_otype) git_object_type(const git_object *obj); - -/** - * Get the repository that owns this object - * - * Freeing or calling `git_repository_close` on the - * returned pointer will invalidate the actual object. - * - * Any other operation may be run on the repository without - * affecting the object. - * - * @param obj the object - * @return the repository who owns this object - */ -GIT_EXTERN(git_repository *) git_object_owner(const git_object *obj); - -/** - * Close an open object - * - * This method instructs the library to close an existing - * object; note that git_objects are owned and cached by the repository - * so the object may or may not be freed after this library call, - * depending on how aggressive is the caching mechanism used - * by the repository. - * - * IMPORTANT: - * It *is* necessary to call this method when you stop using - * an object. Failure to do so will cause a memory leak. - * - * @param object the object to close - */ -GIT_EXTERN(void) git_object_free(git_object *object); - -/** - * Convert an object type to its string representation. - * - * The result is a pointer to a string in static memory and - * should not be free()'ed. - * - * @param type object type to convert. - * @return the corresponding string representation. - */ -GIT_EXTERN(const char *) git_object_type2string(git_otype type); - -/** - * Convert a string object type representation to it's git_otype. - * - * @param str the string to convert. - * @return the corresponding git_otype. - */ -GIT_EXTERN(git_otype) git_object_string2type(const char *str); - -/** - * Determine if the given git_otype is a valid loose object type. - * - * @param type object type to test. - * @return true if the type represents a valid loose object type, - * false otherwise. - */ -GIT_EXTERN(int) git_object_typeisloose(git_otype type); - -/** - * Get the size in bytes for the structure which - * acts as an in-memory representation of any given - * object type. - * - * For all the core types, this would the equivalent - * of calling `sizeof(git_commit)` if the core types - * were not opaque on the external API. - * - * @param type object type to get its size - * @return size in bytes of the object - */ -GIT_EXTERN(size_t) git_object__size(git_otype type); - -/** - * Recursively peel an object until an object of the specified type is met. - * - * If the query cannot be satisfied due to the object model, - * GIT_EINVALIDSPEC will be returned (e.g. trying to peel a blob to a - * tree). - * - * If you pass `GIT_OBJ_ANY` as the target type, then the object will - * be peeled until the type changes. A tag will be peeled until the - * referenced object is no longer a tag, and a commit will be peeled - * to a tree. Any other object type will return GIT_EINVALIDSPEC. - * - * If peeling a tag we discover an object which cannot be peeled to - * the target type due to the object model, GIT_EPEEL will be - * returned. - * - * You must free the returned object. - * - * @param peeled Pointer to the peeled git_object - * @param object The object to be processed - * @param target_type The type of the requested object (a GIT_OBJ_ value) - * @return 0 on success, GIT_EINVALIDSPEC, GIT_EPEEL, or an error code - */ -GIT_EXTERN(int) git_object_peel( - git_object **peeled, - const git_object *object, - git_otype target_type); - -/** - * Create an in-memory copy of a Git object. The copy must be - * explicitly free'd or it will leak. - * - * @param dest Pointer to store the copy of the object - * @param source Original object to copy - */ -GIT_EXTERN(int) git_object_dup(git_object **dest, git_object *source); - -/** @} */ -GIT_END_DECL - -#endif diff --git a/vendor/libgit2/include/git2/odb.h b/vendor/libgit2/include/git2/odb.h deleted file mode 100644 index 4f1e18bc1..000000000 --- a/vendor/libgit2/include/git2/odb.h +++ /dev/null @@ -1,495 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_git_odb_h__ -#define INCLUDE_git_odb_h__ - -#include "common.h" -#include "types.h" -#include "oid.h" - -/** - * @file git2/odb.h - * @brief Git object database routines - * @defgroup git_odb Git object database routines - * @ingroup Git - * @{ - */ -GIT_BEGIN_DECL - -/** - * Function type for callbacks from git_odb_foreach. - */ -typedef int (*git_odb_foreach_cb)(const git_oid *id, void *payload); - -/** - * Create a new object database with no backends. - * - * Before the ODB can be used for read/writing, a custom database - * backend must be manually added using `git_odb_add_backend()` - * - * @param out location to store the database pointer, if opened. - * Set to NULL if the open failed. - * @return 0 or an error code - */ -GIT_EXTERN(int) git_odb_new(git_odb **out); - -/** - * Create a new object database and automatically add - * the two default backends: - * - * - git_odb_backend_loose: read and write loose object files - * from disk, assuming `objects_dir` as the Objects folder - * - * - git_odb_backend_pack: read objects from packfiles, - * assuming `objects_dir` as the Objects folder which - * contains a 'pack/' folder with the corresponding data - * - * @param out location to store the database pointer, if opened. - * Set to NULL if the open failed. - * @param objects_dir path of the backends' "objects" directory. - * @return 0 or an error code - */ -GIT_EXTERN(int) git_odb_open(git_odb **out, const char *objects_dir); - -/** - * Add an on-disk alternate to an existing Object DB. - * - * Note that the added path must point to an `objects`, not - * to a full repository, to use it as an alternate store. - * - * Alternate backends are always checked for objects *after* - * all the main backends have been exhausted. - * - * Writing is disabled on alternate backends. - * - * @param odb database to add the backend to - * @param path path to the objects folder for the alternate - * @return 0 on success; error code otherwise - */ -GIT_EXTERN(int) git_odb_add_disk_alternate(git_odb *odb, const char *path); - -/** - * Close an open object database. - * - * @param db database pointer to close. If NULL no action is taken. - */ -GIT_EXTERN(void) git_odb_free(git_odb *db); - -/** - * Read an object from the database. - * - * This method queries all available ODB backends - * trying to read the given OID. - * - * The returned object is reference counted and - * internally cached, so it should be closed - * by the user once it's no longer in use. - * - * @param out pointer where to store the read object - * @param db database to search for the object in. - * @param id identity of the object to read. - * @return - * - 0 if the object was read; - * - GIT_ENOTFOUND if the object is not in the database. - */ -GIT_EXTERN(int) git_odb_read(git_odb_object **out, git_odb *db, const git_oid *id); - -/** - * Read an object from the database, given a prefix - * of its identifier. - * - * This method queries all available ODB backends - * trying to match the 'len' first hexadecimal - * characters of the 'short_id'. - * The remaining (GIT_OID_HEXSZ-len)*4 bits of - * 'short_id' must be 0s. - * 'len' must be at least GIT_OID_MINPREFIXLEN, - * and the prefix must be long enough to identify - * a unique object in all the backends; the - * method will fail otherwise. - * - * The returned object is reference counted and - * internally cached, so it should be closed - * by the user once it's no longer in use. - * - * @param out pointer where to store the read object - * @param db database to search for the object in. - * @param short_id a prefix of the id of the object to read. - * @param len the length of the prefix - * @return - * - 0 if the object was read; - * - GIT_ENOTFOUND if the object is not in the database. - * - GIT_EAMBIGUOUS if the prefix is ambiguous (several objects match the prefix) - */ -GIT_EXTERN(int) git_odb_read_prefix(git_odb_object **out, git_odb *db, const git_oid *short_id, size_t len); - -/** - * Read the header of an object from the database, without - * reading its full contents. - * - * The header includes the length and the type of an object. - * - * Note that most backends do not support reading only the header - * of an object, so the whole object will be read and then the - * header will be returned. - * - * @param len_out pointer where to store the length - * @param type_out pointer where to store the type - * @param db database to search for the object in. - * @param id identity of the object to read. - * @return - * - 0 if the object was read; - * - GIT_ENOTFOUND if the object is not in the database. - */ -GIT_EXTERN(int) git_odb_read_header(size_t *len_out, git_otype *type_out, git_odb *db, const git_oid *id); - -/** - * Determine if the given object can be found in the object database. - * - * @param db database to be searched for the given object. - * @param id the object to search for. - * @return - * - 1, if the object was found - * - 0, otherwise - */ -GIT_EXTERN(int) git_odb_exists(git_odb *db, const git_oid *id); - -/** - * Determine if objects can be found in the object database from a short OID. - * - * @param out The full OID of the found object if just one is found. - * @param db The database to be searched for the given object. - * @param short_id A prefix of the id of the object to read. - * @param len The length of the prefix. - * @return 0 if found, GIT_ENOTFOUND if not found, GIT_EAMBIGUOUS if multiple - * matches were found, other value < 0 if there was a read error. - */ -GIT_EXTERN(int) git_odb_exists_prefix( - git_oid *out, git_odb *db, const git_oid *short_id, size_t len); - -/** - * Refresh the object database to load newly added files. - * - * If the object databases have changed on disk while the library - * is running, this function will force a reload of the underlying - * indexes. - * - * Use this function when you're confident that an external - * application has tampered with the ODB. - * - * NOTE that it is not necessary to call this function at all. The - * library will automatically attempt to refresh the ODB - * when a lookup fails, to see if the looked up object exists - * on disk but hasn't been loaded yet. - * - * @param db database to refresh - * @return 0 on success, error code otherwise - */ -GIT_EXTERN(int) git_odb_refresh(struct git_odb *db); - -/** - * List all objects available in the database - * - * The callback will be called for each object available in the - * database. Note that the objects are likely to be returned in the index - * order, which would make accessing the objects in that order inefficient. - * Return a non-zero value from the callback to stop looping. - * - * @param db database to use - * @param cb the callback to call for each object - * @param payload data to pass to the callback - * @return 0 on success, non-zero callback return value, or error code - */ -GIT_EXTERN(int) git_odb_foreach(git_odb *db, git_odb_foreach_cb cb, void *payload); - -/** - * Write an object directly into the ODB - * - * This method writes a full object straight into the ODB. - * For most cases, it is preferred to write objects through a write - * stream, which is both faster and less memory intensive, specially - * for big objects. - * - * This method is provided for compatibility with custom backends - * which are not able to support streaming writes - * - * @param out pointer to store the OID result of the write - * @param odb object database where to store the object - * @param data buffer with the data to store - * @param len size of the buffer - * @param type type of the data to store - * @return 0 or an error code - */ -GIT_EXTERN(int) git_odb_write(git_oid *out, git_odb *odb, const void *data, size_t len, git_otype type); - -/** - * Open a stream to write an object into the ODB - * - * The type and final length of the object must be specified - * when opening the stream. - * - * The returned stream will be of type `GIT_STREAM_WRONLY`, and it - * won't be effective until `git_odb_stream_finalize_write` is called - * and returns without an error - * - * The stream must always be freed when done with `git_odb_stream_free` or - * will leak memory. - * - * @see git_odb_stream - * - * @param out pointer where to store the stream - * @param db object database where the stream will write - * @param size final size of the object that will be written - * @param type type of the object that will be written - * @return 0 if the stream was created; error code otherwise - */ -GIT_EXTERN(int) git_odb_open_wstream(git_odb_stream **out, git_odb *db, git_off_t size, git_otype type); - -/** - * Write to an odb stream - * - * This method will fail if the total number of received bytes exceeds the - * size declared with `git_odb_open_wstream()` - * - * @param stream the stream - * @param buffer the data to write - * @param len the buffer's length - * @return 0 if the write succeeded; error code otherwise - */ -GIT_EXTERN(int) git_odb_stream_write(git_odb_stream *stream, const char *buffer, size_t len); - -/** - * Finish writing to an odb stream - * - * The object will take its final name and will be available to the - * odb. - * - * This method will fail if the total number of received bytes - * differs from the size declared with `git_odb_open_wstream()` - * - * @param out pointer to store the resulting object's id - * @param stream the stream - * @return 0 on success; an error code otherwise - */ -GIT_EXTERN(int) git_odb_stream_finalize_write(git_oid *out, git_odb_stream *stream); - -/** - * Read from an odb stream - * - * Most backends don't implement streaming reads - */ -GIT_EXTERN(int) git_odb_stream_read(git_odb_stream *stream, char *buffer, size_t len); - -/** - * Free an odb stream - * - * @param stream the stream to free - */ -GIT_EXTERN(void) git_odb_stream_free(git_odb_stream *stream); - -/** - * Open a stream to read an object from the ODB - * - * Note that most backends do *not* support streaming reads - * because they store their objects as compressed/delta'ed blobs. - * - * It's recommended to use `git_odb_read` instead, which is - * assured to work on all backends. - * - * The returned stream will be of type `GIT_STREAM_RDONLY` and - * will have the following methods: - * - * - stream->read: read `n` bytes from the stream - * - stream->free: free the stream - * - * The stream must always be free'd or will leak memory. - * - * @see git_odb_stream - * - * @param out pointer where to store the stream - * @param db object database where the stream will read from - * @param oid oid of the object the stream will read from - * @return 0 if the stream was created; error code otherwise - */ -GIT_EXTERN(int) git_odb_open_rstream(git_odb_stream **out, git_odb *db, const git_oid *oid); - -/** - * Open a stream for writing a pack file to the ODB. - * - * If the ODB layer understands pack files, then the given - * packfile will likely be streamed directly to disk (and a - * corresponding index created). If the ODB layer does not - * understand pack files, the objects will be stored in whatever - * format the ODB layer uses. - * - * @see git_odb_writepack - * - * @param out pointer to the writepack functions - * @param db object database where the stream will read from - * @param progress_cb function to call with progress information. - * Be aware that this is called inline with network and indexing operations, - * so performance may be affected. - * @param progress_payload payload for the progress callback - */ -GIT_EXTERN(int) git_odb_write_pack( - git_odb_writepack **out, - git_odb *db, - git_transfer_progress_cb progress_cb, - void *progress_payload); - -/** - * Determine the object-ID (sha1 hash) of a data buffer - * - * The resulting SHA-1 OID will be the identifier for the data - * buffer as if the data buffer it were to written to the ODB. - * - * @param out the resulting object-ID. - * @param data data to hash - * @param len size of the data - * @param type of the data to hash - * @return 0 or an error code - */ -GIT_EXTERN(int) git_odb_hash(git_oid *out, const void *data, size_t len, git_otype type); - -/** - * Read a file from disk and fill a git_oid with the object id - * that the file would have if it were written to the Object - * Database as an object of the given type (w/o applying filters). - * Similar functionality to git.git's `git hash-object` without - * the `-w` flag, however, with the --no-filters flag. - * If you need filters, see git_repository_hashfile. - * - * @param out oid structure the result is written into. - * @param path file to read and determine object id for - * @param type the type of the object that will be hashed - * @return 0 or an error code - */ -GIT_EXTERN(int) git_odb_hashfile(git_oid *out, const char *path, git_otype type); - -/** - * Create a copy of an odb_object - * - * The returned copy must be manually freed with `git_odb_object_free`. - * Note that because of an implementation detail, the returned copy will be - * the same pointer as `source`: the object is internally refcounted, so the - * copy still needs to be freed twice. - * - * @param dest pointer where to store the copy - * @param source object to copy - * @return 0 or an error code - */ -GIT_EXTERN(int) git_odb_object_dup(git_odb_object **dest, git_odb_object *source); - -/** - * Close an ODB object - * - * This method must always be called once a `git_odb_object` is no - * longer needed, otherwise memory will leak. - * - * @param object object to close - */ -GIT_EXTERN(void) git_odb_object_free(git_odb_object *object); - -/** - * Return the OID of an ODB object - * - * This is the OID from which the object was read from - * - * @param object the object - * @return a pointer to the OID - */ -GIT_EXTERN(const git_oid *) git_odb_object_id(git_odb_object *object); - -/** - * Return the data of an ODB object - * - * This is the uncompressed, raw data as read from the ODB, - * without the leading header. - * - * This pointer is owned by the object and shall not be free'd. - * - * @param object the object - * @return a pointer to the data - */ -GIT_EXTERN(const void *) git_odb_object_data(git_odb_object *object); - -/** - * Return the size of an ODB object - * - * This is the real size of the `data` buffer, not the - * actual size of the object. - * - * @param object the object - * @return the size - */ -GIT_EXTERN(size_t) git_odb_object_size(git_odb_object *object); - -/** - * Return the type of an ODB object - * - * @param object the object - * @return the type - */ -GIT_EXTERN(git_otype) git_odb_object_type(git_odb_object *object); - -/** - * Add a custom backend to an existing Object DB - * - * The backends are checked in relative ordering, based on the - * value of the `priority` parameter. - * - * Read for more information. - * - * @param odb database to add the backend to - * @param backend pointer to a git_odb_backend instance - * @param priority Value for ordering the backends queue - * @return 0 on success; error code otherwise - */ -GIT_EXTERN(int) git_odb_add_backend(git_odb *odb, git_odb_backend *backend, int priority); - -/** - * Add a custom backend to an existing Object DB; this - * backend will work as an alternate. - * - * Alternate backends are always checked for objects *after* - * all the main backends have been exhausted. - * - * The backends are checked in relative ordering, based on the - * value of the `priority` parameter. - * - * Writing is disabled on alternate backends. - * - * Read for more information. - * - * @param odb database to add the backend to - * @param backend pointer to a git_odb_backend instance - * @param priority Value for ordering the backends queue - * @return 0 on success; error code otherwise - */ -GIT_EXTERN(int) git_odb_add_alternate(git_odb *odb, git_odb_backend *backend, int priority); - -/** - * Get the number of ODB backend objects - * - * @param odb object database - * @return number of backends in the ODB - */ -GIT_EXTERN(size_t) git_odb_num_backends(git_odb *odb); - -/** - * Lookup an ODB backend object by index - * - * @param out output pointer to ODB backend at pos - * @param odb object database - * @param pos index into object database backend list - * @return 0 on success; GIT_ENOTFOUND if pos is invalid; other errors < 0 - */ -GIT_EXTERN(int) git_odb_get_backend(git_odb_backend **out, git_odb *odb, size_t pos); - -/** @} */ -GIT_END_DECL -#endif diff --git a/vendor/libgit2/include/git2/odb_backend.h b/vendor/libgit2/include/git2/odb_backend.h deleted file mode 100644 index b17cfd8ba..000000000 --- a/vendor/libgit2/include/git2/odb_backend.h +++ /dev/null @@ -1,134 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_git_odb_backend_h__ -#define INCLUDE_git_odb_backend_h__ - -#include "common.h" -#include "types.h" - -/** - * @file git2/backend.h - * @brief Git custom backend functions - * @defgroup git_odb Git object database routines - * @ingroup Git - * @{ - */ -GIT_BEGIN_DECL - -/* - * Constructors for in-box ODB backends. - */ - -/** - * Create a backend for the packfiles. - * - * @param out location to store the odb backend pointer - * @param objects_dir the Git repository's objects directory - * - * @return 0 or an error code - */ -GIT_EXTERN(int) git_odb_backend_pack(git_odb_backend **out, const char *objects_dir); - -/** - * Create a backend for loose objects - * - * @param out location to store the odb backend pointer - * @param objects_dir the Git repository's objects directory - * @param compression_level zlib compression level to use - * @param do_fsync whether to do an fsync() after writing (currently ignored) - * @param dir_mode permissions to use creating a directory or 0 for defaults - * @param file_mode permissions to use creating a file or 0 for defaults - * - * @return 0 or an error code - */ -GIT_EXTERN(int) git_odb_backend_loose( - git_odb_backend **out, - const char *objects_dir, - int compression_level, - int do_fsync, - unsigned int dir_mode, - unsigned int file_mode); - -/** - * Create a backend out of a single packfile - * - * This can be useful for inspecting the contents of a single - * packfile. - * - * @param out location to store the odb backend pointer - * @param index_file path to the packfile's .idx file - * - * @return 0 or an error code - */ -GIT_EXTERN(int) git_odb_backend_one_pack(git_odb_backend **out, const char *index_file); - -/** Streaming mode */ -typedef enum { - GIT_STREAM_RDONLY = (1 << 1), - GIT_STREAM_WRONLY = (1 << 2), - GIT_STREAM_RW = (GIT_STREAM_RDONLY | GIT_STREAM_WRONLY), -} git_odb_stream_t; - -/** - * A stream to read/write from a backend. - * - * This represents a stream of data being written to or read from a - * backend. When writing, the frontend functions take care of - * calculating the object's id and all `finalize_write` needs to do is - * store the object with the id it is passed. - */ -struct git_odb_stream { - git_odb_backend *backend; - unsigned int mode; - void *hash_ctx; - - git_off_t declared_size; - git_off_t received_bytes; - - /** - * Write at most `len` bytes into `buffer` and advance the stream. - */ - int (*read)(git_odb_stream *stream, char *buffer, size_t len); - - /** - * Write `len` bytes from `buffer` into the stream. - */ - int (*write)(git_odb_stream *stream, const char *buffer, size_t len); - - /** - * Store the contents of the stream as an object with the id - * specified in `oid`. - * - * This method might not be invoked if: - * - an error occurs earlier with the `write` callback, - * - the object referred to by `oid` already exists in any backend, or - * - the final number of received bytes differs from the size declared - * with `git_odb_open_wstream()` - */ - int (*finalize_write)(git_odb_stream *stream, const git_oid *oid); - - /** - * Free the stream's memory. - * - * This method might be called without a call to `finalize_write` if - * an error occurs or if the object is already present in the ODB. - */ - void (*free)(git_odb_stream *stream); -}; - -/** A stream to write a pack file to the ODB */ -struct git_odb_writepack { - git_odb_backend *backend; - - int (*append)(git_odb_writepack *writepack, const void *data, size_t size, git_transfer_progress *stats); - int (*commit)(git_odb_writepack *writepack, git_transfer_progress *stats); - void (*free)(git_odb_writepack *writepack); -}; - -GIT_END_DECL - -#endif diff --git a/vendor/libgit2/include/git2/oid.h b/vendor/libgit2/include/git2/oid.h deleted file mode 100644 index 8ad51c8ba..000000000 --- a/vendor/libgit2/include/git2/oid.h +++ /dev/null @@ -1,269 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_git_oid_h__ -#define INCLUDE_git_oid_h__ - -#include "common.h" -#include "types.h" - -/** - * @file git2/oid.h - * @brief Git object id routines - * @defgroup git_oid Git object id routines - * @ingroup Git - * @{ - */ -GIT_BEGIN_DECL - -/** Size (in bytes) of a raw/binary oid */ -#define GIT_OID_RAWSZ 20 - -/** Size (in bytes) of a hex formatted oid */ -#define GIT_OID_HEXSZ (GIT_OID_RAWSZ * 2) - -/** Minimum length (in number of hex characters, - * i.e. packets of 4 bits) of an oid prefix */ -#define GIT_OID_MINPREFIXLEN 4 - -/** Unique identity of any object (commit, tree, blob, tag). */ -typedef struct git_oid { - /** raw binary formatted id */ - unsigned char id[GIT_OID_RAWSZ]; -} git_oid; - -/** - * Parse a hex formatted object id into a git_oid. - * - * @param out oid structure the result is written into. - * @param str input hex string; must be pointing at the start of - * the hex sequence and have at least the number of bytes - * needed for an oid encoded in hex (40 bytes). - * @return 0 or an error code - */ -GIT_EXTERN(int) git_oid_fromstr(git_oid *out, const char *str); - -/** - * Parse a hex formatted null-terminated string into a git_oid. - * - * @param out oid structure the result is written into. - * @param str input hex string; must be at least 4 characters - * long and null-terminated. - * @return 0 or an error code - */ -GIT_EXTERN(int) git_oid_fromstrp(git_oid *out, const char *str); - -/** - * Parse N characters of a hex formatted object id into a git_oid - * - * If N is odd, N-1 characters will be parsed instead. - * The remaining space in the git_oid will be set to zero. - * - * @param out oid structure the result is written into. - * @param str input hex string of at least size `length` - * @param length length of the input string - * @return 0 or an error code - */ -GIT_EXTERN(int) git_oid_fromstrn(git_oid *out, const char *str, size_t length); - -/** - * Copy an already raw oid into a git_oid structure. - * - * @param out oid structure the result is written into. - * @param raw the raw input bytes to be copied. - */ -GIT_EXTERN(void) git_oid_fromraw(git_oid *out, const unsigned char *raw); - -/** - * Format a git_oid into a hex string. - * - * @param out output hex string; must be pointing at the start of - * the hex sequence and have at least the number of bytes - * needed for an oid encoded in hex (40 bytes). Only the - * oid digits are written; a '\\0' terminator must be added - * by the caller if it is required. - * @param id oid structure to format. - */ -GIT_EXTERN(void) git_oid_fmt(char *out, const git_oid *id); - -/** - * Format a git_oid into a partial hex string. - * - * @param out output hex string; you say how many bytes to write. - * If the number of bytes is > GIT_OID_HEXSZ, extra bytes - * will be zeroed; if not, a '\0' terminator is NOT added. - * @param n number of characters to write into out string - * @param id oid structure to format. - */ -GIT_EXTERN(void) git_oid_nfmt(char *out, size_t n, const git_oid *id); - -/** - * Format a git_oid into a loose-object path string. - * - * The resulting string is "aa/...", where "aa" is the first two - * hex digits of the oid and "..." is the remaining 38 digits. - * - * @param out output hex string; must be pointing at the start of - * the hex sequence and have at least the number of bytes - * needed for an oid encoded in hex (41 bytes). Only the - * oid digits are written; a '\\0' terminator must be added - * by the caller if it is required. - * @param id oid structure to format. - */ -GIT_EXTERN(void) git_oid_pathfmt(char *out, const git_oid *id); - -/** - * Format a git_oid into a statically allocated c-string. - * - * The c-string is owned by the library and should not be freed - * by the user. If libgit2 is built with thread support, the string - * will be stored in TLS (i.e. one buffer per thread) to allow for - * concurrent calls of the function. - * - * @param oid The oid structure to format - * @return the c-string - */ -GIT_EXTERN(char *) git_oid_tostr_s(const git_oid *oid); - -/** - * Format a git_oid into a buffer as a hex format c-string. - * - * If the buffer is smaller than GIT_OID_HEXSZ+1, then the resulting - * oid c-string will be truncated to n-1 characters (but will still be - * NUL-byte terminated). - * - * If there are any input parameter errors (out == NULL, n == 0, oid == - * NULL), then a pointer to an empty string is returned, so that the - * return value can always be printed. - * - * @param out the buffer into which the oid string is output. - * @param n the size of the out buffer. - * @param id the oid structure to format. - * @return the out buffer pointer, assuming no input parameter - * errors, otherwise a pointer to an empty string. - */ -GIT_EXTERN(char *) git_oid_tostr(char *out, size_t n, const git_oid *id); - -/** - * Copy an oid from one structure to another. - * - * @param out oid structure the result is written into. - * @param src oid structure to copy from. - */ -GIT_EXTERN(void) git_oid_cpy(git_oid *out, const git_oid *src); - -/** - * Compare two oid structures. - * - * @param a first oid structure. - * @param b second oid structure. - * @return <0, 0, >0 if a < b, a == b, a > b. - */ -GIT_EXTERN(int) git_oid_cmp(const git_oid *a, const git_oid *b); - -/** - * Compare two oid structures for equality - * - * @param a first oid structure. - * @param b second oid structure. - * @return true if equal, false otherwise - */ -GIT_EXTERN(int) git_oid_equal(const git_oid *a, const git_oid *b); - -/** - * Compare the first 'len' hexadecimal characters (packets of 4 bits) - * of two oid structures. - * - * @param a first oid structure. - * @param b second oid structure. - * @param len the number of hex chars to compare - * @return 0 in case of a match - */ -GIT_EXTERN(int) git_oid_ncmp(const git_oid *a, const git_oid *b, size_t len); - -/** - * Check if an oid equals an hex formatted object id. - * - * @param id oid structure. - * @param str input hex string of an object id. - * @return 0 in case of a match, -1 otherwise. - */ -GIT_EXTERN(int) git_oid_streq(const git_oid *id, const char *str); - -/** - * Compare an oid to an hex formatted object id. - * - * @param id oid structure. - * @param str input hex string of an object id. - * @return -1 if str is not valid, <0 if id sorts before str, - * 0 if id matches str, >0 if id sorts after str. - */ -GIT_EXTERN(int) git_oid_strcmp(const git_oid *id, const char *str); - -/** - * Check is an oid is all zeros. - * - * @return 1 if all zeros, 0 otherwise. - */ -GIT_EXTERN(int) git_oid_iszero(const git_oid *id); - -/** - * OID Shortener object - */ -typedef struct git_oid_shorten git_oid_shorten; - -/** - * Create a new OID shortener. - * - * The OID shortener is used to process a list of OIDs - * in text form and return the shortest length that would - * uniquely identify all of them. - * - * E.g. look at the result of `git log --abbrev`. - * - * @param min_length The minimal length for all identifiers, - * which will be used even if shorter OIDs would still - * be unique. - * @return a `git_oid_shorten` instance, NULL if OOM - */ -GIT_EXTERN(git_oid_shorten *) git_oid_shorten_new(size_t min_length); - -/** - * Add a new OID to set of shortened OIDs and calculate - * the minimal length to uniquely identify all the OIDs in - * the set. - * - * The OID is expected to be a 40-char hexadecimal string. - * The OID is owned by the user and will not be modified - * or freed. - * - * For performance reasons, there is a hard-limit of how many - * OIDs can be added to a single set (around ~32000, assuming - * a mostly randomized distribution), which should be enough - * for any kind of program, and keeps the algorithm fast and - * memory-efficient. - * - * Attempting to add more than those OIDs will result in a - * GITERR_INVALID error - * - * @param os a `git_oid_shorten` instance - * @param text_id an OID in text form - * @return the minimal length to uniquely identify all OIDs - * added so far to the set; or an error code (<0) if an - * error occurs. - */ -GIT_EXTERN(int) git_oid_shorten_add(git_oid_shorten *os, const char *text_id); - -/** - * Free an OID shortener instance - * - * @param os a `git_oid_shorten` instance - */ -GIT_EXTERN(void) git_oid_shorten_free(git_oid_shorten *os); - -/** @} */ -GIT_END_DECL -#endif diff --git a/vendor/libgit2/include/git2/oidarray.h b/vendor/libgit2/include/git2/oidarray.h deleted file mode 100644 index 0b3204597..000000000 --- a/vendor/libgit2/include/git2/oidarray.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_git_oidarray_h__ -#define INCLUDE_git_oidarray_h__ - -#include "common.h" -#include "oid.h" - -GIT_BEGIN_DECL - -/** Array of object ids */ -typedef struct git_oidarray { - git_oid *ids; - size_t count; -} git_oidarray; - -/** - * Free the OID array - * - * This method must (and must only) be called on `git_oidarray` - * objects where the array is allocated by the library. Not doing so, - * will result in a memory leak. - * - * This does not free the `git_oidarray` itself, since the library will - * never allocate that object directly itself (it is more commonly embedded - * inside another struct or created on the stack). - * - * @param array git_oidarray from which to free oid data - */ -GIT_EXTERN(void) git_oidarray_free(git_oidarray *array); - -/** @} */ -GIT_END_DECL - -#endif - diff --git a/vendor/libgit2/include/git2/pack.h b/vendor/libgit2/include/git2/pack.h deleted file mode 100644 index 4941998eb..000000000 --- a/vendor/libgit2/include/git2/pack.h +++ /dev/null @@ -1,240 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_git_pack_h__ -#define INCLUDE_git_pack_h__ - -#include "common.h" -#include "oid.h" - -/** - * @file git2/pack.h - * @brief Git pack management routines - * - * Packing objects - * --------------- - * - * Creation of packfiles requires two steps: - * - * - First, insert all the objects you want to put into the packfile - * using `git_packbuilder_insert` and `git_packbuilder_insert_tree`. - * It's important to add the objects in recency order ("in the order - * that they are 'reachable' from head"). - * - * "ANY order will give you a working pack, ... [but it is] the thing - * that gives packs good locality. It keeps the objects close to the - * head (whether they are old or new, but they are _reachable_ from the - * head) at the head of the pack. So packs actually have absolutely - * _wonderful_ IO patterns." - Linus Torvalds - * git.git/Documentation/technical/pack-heuristics.txt - * - * - Second, use `git_packbuilder_write` or `git_packbuilder_foreach` to - * write the resulting packfile. - * - * libgit2 will take care of the delta ordering and generation. - * `git_packbuilder_set_threads` can be used to adjust the number of - * threads used for the process. - * - * See tests/pack/packbuilder.c for an example. - * - * @ingroup Git - * @{ - */ -GIT_BEGIN_DECL - -/** - * Stages that are reported by the packbuilder progress callback. - */ -typedef enum { - GIT_PACKBUILDER_ADDING_OBJECTS = 0, - GIT_PACKBUILDER_DELTAFICATION = 1, -} git_packbuilder_stage_t; - -/** - * Initialize a new packbuilder - * - * @param out The new packbuilder object - * @param repo The repository - * - * @return 0 or an error code - */ -GIT_EXTERN(int) git_packbuilder_new(git_packbuilder **out, git_repository *repo); - -/** - * Set number of threads to spawn - * - * By default, libgit2 won't spawn any threads at all; - * when set to 0, libgit2 will autodetect the number of - * CPUs. - * - * @param pb The packbuilder - * @param n Number of threads to spawn - * @return number of actual threads to be used - */ -GIT_EXTERN(unsigned int) git_packbuilder_set_threads(git_packbuilder *pb, unsigned int n); - -/** - * Insert a single object - * - * For an optimal pack it's mandatory to insert objects in recency order, - * commits followed by trees and blobs. - * - * @param pb The packbuilder - * @param id The oid of the commit - * @param name The name; might be NULL - * - * @return 0 or an error code - */ -GIT_EXTERN(int) git_packbuilder_insert(git_packbuilder *pb, const git_oid *id, const char *name); - -/** - * Insert a root tree object - * - * This will add the tree as well as all referenced trees and blobs. - * - * @param pb The packbuilder - * @param id The oid of the root tree - * - * @return 0 or an error code - */ -GIT_EXTERN(int) git_packbuilder_insert_tree(git_packbuilder *pb, const git_oid *id); - -/** - * Insert a commit object - * - * This will add a commit as well as the completed referenced tree. - * - * @param pb The packbuilder - * @param id The oid of the commit - * - * @return 0 or an error code - */ -GIT_EXTERN(int) git_packbuilder_insert_commit(git_packbuilder *pb, const git_oid *id); - -/** - * Insert objects as given by the walk - * - * Those commits and all objects they reference will be inserted into - * the packbuilder. - * - * @param pb the packbuilder - * @param walk the revwalk to use to fill the packbuilder - * - * @return 0 or an error code - */ -GIT_EXTERN(int) git_packbuilder_insert_walk(git_packbuilder *pb, git_revwalk *walk); - -/** - * Recursively insert an object and its referenced objects - * - * Insert the object as well as any object it references. - * - * @param pb the packbuilder - * @param id the id of the root object to insert - * @param name optional name for the object - * @return 0 or an error code - */ -GIT_EXTERN(int) git_packbuilder_insert_recur(git_packbuilder *pb, const git_oid *id, const char *name); - -/** - * Write the contents of the packfile to an in-memory buffer - * - * The contents of the buffer will become a valid packfile, even though there - * will be no attached index - * - * @param buf Buffer where to write the packfile - * @param pb The packbuilder - */ -GIT_EXTERN(int) git_packbuilder_write_buf(git_buf *buf, git_packbuilder *pb); - -/** - * Write the new pack and corresponding index file to path. - * - * @param pb The packbuilder - * @param path to the directory where the packfile and index should be stored - * @param mode permissions to use creating a packfile or 0 for defaults - * @param progress_cb function to call with progress information from the indexer (optional) - * @param progress_cb_payload payload for the progress callback (optional) - * - * @return 0 or an error code - */ -GIT_EXTERN(int) git_packbuilder_write( - git_packbuilder *pb, - const char *path, - unsigned int mode, - git_transfer_progress_cb progress_cb, - void *progress_cb_payload); - -/** -* Get the packfile's hash -* -* A packfile's name is derived from the sorted hashing of all object -* names. This is only correct after the packfile has been written. -* -* @param pb The packbuilder object -*/ -GIT_EXTERN(const git_oid *) git_packbuilder_hash(git_packbuilder *pb); - -typedef int (*git_packbuilder_foreach_cb)(void *buf, size_t size, void *payload); - -/** - * Create the new pack and pass each object to the callback - * - * @param pb the packbuilder - * @param cb the callback to call with each packed object's buffer - * @param payload the callback's data - * @return 0 or an error code - */ -GIT_EXTERN(int) git_packbuilder_foreach(git_packbuilder *pb, git_packbuilder_foreach_cb cb, void *payload); - -/** - * Get the total number of objects the packbuilder will write out - * - * @param pb the packbuilder - * @return the number of objects in the packfile - */ -GIT_EXTERN(uint32_t) git_packbuilder_object_count(git_packbuilder *pb); - -/** - * Get the number of objects the packbuilder has already written out - * - * @param pb the packbuilder - * @return the number of objects which have already been written - */ -GIT_EXTERN(uint32_t) git_packbuilder_written(git_packbuilder *pb); - -/** Packbuilder progress notification function */ -typedef int (*git_packbuilder_progress)( - int stage, - unsigned int current, - unsigned int total, - void *payload); - -/** - * Set the callbacks for a packbuilder - * - * @param pb The packbuilder object - * @param progress_cb Function to call with progress information during - * pack building. Be aware that this is called inline with pack building - * operations, so performance may be affected. - * @param progress_cb_payload Payload for progress callback. - * @return 0 or an error code - */ -GIT_EXTERN(int) git_packbuilder_set_callbacks( - git_packbuilder *pb, - git_packbuilder_progress progress_cb, - void *progress_cb_payload); - -/** - * Free the packbuilder and all associated data - * - * @param pb The packbuilder - */ -GIT_EXTERN(void) git_packbuilder_free(git_packbuilder *pb); - -/** @} */ -GIT_END_DECL -#endif diff --git a/vendor/libgit2/include/git2/patch.h b/vendor/libgit2/include/git2/patch.h deleted file mode 100644 index 790cb74fc..000000000 --- a/vendor/libgit2/include/git2/patch.h +++ /dev/null @@ -1,274 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_git_patch_h__ -#define INCLUDE_git_patch_h__ - -#include "common.h" -#include "types.h" -#include "oid.h" -#include "diff.h" - -/** - * @file git2/patch.h - * @brief Patch handling routines. - * @ingroup Git - * @{ - */ -GIT_BEGIN_DECL - -/** - * The diff patch is used to store all the text diffs for a delta. - * - * You can easily loop over the content of patches and get information about - * them. - */ -typedef struct git_patch git_patch; - -/** - * Return a patch for an entry in the diff list. - * - * The `git_patch` is a newly created object contains the text diffs - * for the delta. You have to call `git_patch_free()` when you are - * done with it. You can use the patch object to loop over all the hunks - * and lines in the diff of the one delta. - * - * For an unchanged file or a binary file, no `git_patch` will be - * created, the output will be set to NULL, and the `binary` flag will be - * set true in the `git_diff_delta` structure. - * - * It is okay to pass NULL for either of the output parameters; if you pass - * NULL for the `git_patch`, then the text diff will not be calculated. - * - * @param out Output parameter for the delta patch object - * @param diff Diff list object - * @param idx Index into diff list - * @return 0 on success, other value < 0 on error - */ -GIT_EXTERN(int) git_patch_from_diff( - git_patch **out, git_diff *diff, size_t idx); - -/** - * Directly generate a patch from the difference between two blobs. - * - * This is just like `git_diff_blobs()` except it generates a patch object - * for the difference instead of directly making callbacks. You can use the - * standard `git_patch` accessor functions to read the patch data, and - * you must call `git_patch_free()` on the patch when done. - * - * @param out The generated patch; NULL on error - * @param old_blob Blob for old side of diff, or NULL for empty blob - * @param old_as_path Treat old blob as if it had this filename; can be NULL - * @param new_blob Blob for new side of diff, or NULL for empty blob - * @param new_as_path Treat new blob as if it had this filename; can be NULL - * @param opts Options for diff, or NULL for default options - * @return 0 on success or error code < 0 - */ -GIT_EXTERN(int) git_patch_from_blobs( - git_patch **out, - const git_blob *old_blob, - const char *old_as_path, - const git_blob *new_blob, - const char *new_as_path, - const git_diff_options *opts); - -/** - * Directly generate a patch from the difference between a blob and a buffer. - * - * This is just like `git_diff_blob_to_buffer()` except it generates a patch - * object for the difference instead of directly making callbacks. You can - * use the standard `git_patch` accessor functions to read the patch - * data, and you must call `git_patch_free()` on the patch when done. - * - * @param out The generated patch; NULL on error - * @param old_blob Blob for old side of diff, or NULL for empty blob - * @param old_as_path Treat old blob as if it had this filename; can be NULL - * @param buffer Raw data for new side of diff, or NULL for empty - * @param buffer_len Length of raw data for new side of diff - * @param buffer_as_path Treat buffer as if it had this filename; can be NULL - * @param opts Options for diff, or NULL for default options - * @return 0 on success or error code < 0 - */ -GIT_EXTERN(int) git_patch_from_blob_and_buffer( - git_patch **out, - const git_blob *old_blob, - const char *old_as_path, - const char *buffer, - size_t buffer_len, - const char *buffer_as_path, - const git_diff_options *opts); - -/** - * Directly generate a patch from the difference between two buffers. - * - * This is just like `git_diff_buffers()` except it generates a patch - * object for the difference instead of directly making callbacks. You can - * use the standard `git_patch` accessor functions to read the patch - * data, and you must call `git_patch_free()` on the patch when done. - * - * @param out The generated patch; NULL on error - * @param old_buffer Raw data for old side of diff, or NULL for empty - * @param old_len Length of the raw data for old side of the diff - * @param old_as_path Treat old buffer as if it had this filename; can be NULL - * @param new_buffer Raw data for new side of diff, or NULL for empty - * @param new_len Length of raw data for new side of diff - * @param new_as_path Treat buffer as if it had this filename; can be NULL - * @param opts Options for diff, or NULL for default options - * @return 0 on success or error code < 0 - */ -GIT_EXTERN(int) git_patch_from_buffers( - git_patch **out, - const void *old_buffer, - size_t old_len, - const char *old_as_path, - const char *new_buffer, - size_t new_len, - const char *new_as_path, - const git_diff_options *opts); - -/** - * Free a git_patch object. - */ -GIT_EXTERN(void) git_patch_free(git_patch *patch); - -/** - * Get the delta associated with a patch. This delta points to internal - * data and you do not have to release it when you are done with it. - */ -GIT_EXTERN(const git_diff_delta *) git_patch_get_delta(const git_patch *patch); - -/** - * Get the number of hunks in a patch - */ -GIT_EXTERN(size_t) git_patch_num_hunks(const git_patch *patch); - -/** - * Get line counts of each type in a patch. - * - * This helps imitate a diff --numstat type of output. For that purpose, - * you only need the `total_additions` and `total_deletions` values, but we - * include the `total_context` line count in case you want the total number - * of lines of diff output that will be generated. - * - * All outputs are optional. Pass NULL if you don't need a particular count. - * - * @param total_context Count of context lines in output, can be NULL. - * @param total_additions Count of addition lines in output, can be NULL. - * @param total_deletions Count of deletion lines in output, can be NULL. - * @param patch The git_patch object - * @return 0 on success, <0 on error - */ -GIT_EXTERN(int) git_patch_line_stats( - size_t *total_context, - size_t *total_additions, - size_t *total_deletions, - const git_patch *patch); - -/** - * Get the information about a hunk in a patch - * - * Given a patch and a hunk index into the patch, this returns detailed - * information about that hunk. Any of the output pointers can be passed - * as NULL if you don't care about that particular piece of information. - * - * @param out Output pointer to git_diff_hunk of hunk - * @param lines_in_hunk Output count of total lines in this hunk - * @param patch Input pointer to patch object - * @param hunk_idx Input index of hunk to get information about - * @return 0 on success, GIT_ENOTFOUND if hunk_idx out of range, <0 on error - */ -GIT_EXTERN(int) git_patch_get_hunk( - const git_diff_hunk **out, - size_t *lines_in_hunk, - git_patch *patch, - size_t hunk_idx); - -/** - * Get the number of lines in a hunk. - * - * @param patch The git_patch object - * @param hunk_idx Index of the hunk - * @return Number of lines in hunk or -1 if invalid hunk index - */ -GIT_EXTERN(int) git_patch_num_lines_in_hunk( - const git_patch *patch, - size_t hunk_idx); - -/** - * Get data about a line in a hunk of a patch. - * - * Given a patch, a hunk index, and a line index in the hunk, this - * will return a lot of details about that line. If you pass a hunk - * index larger than the number of hunks or a line index larger than - * the number of lines in the hunk, this will return -1. - * - * @param out The git_diff_line data for this line - * @param patch The patch to look in - * @param hunk_idx The index of the hunk - * @param line_of_hunk The index of the line in the hunk - * @return 0 on success, <0 on failure - */ -GIT_EXTERN(int) git_patch_get_line_in_hunk( - const git_diff_line **out, - git_patch *patch, - size_t hunk_idx, - size_t line_of_hunk); - -/** - * Look up size of patch diff data in bytes - * - * This returns the raw size of the patch data. This only includes the - * actual data from the lines of the diff, not the file or hunk headers. - * - * If you pass `include_context` as true (non-zero), this will be the size - * of all of the diff output; if you pass it as false (zero), this will - * only include the actual changed lines (as if `context_lines` was 0). - * - * @param patch A git_patch representing changes to one file - * @param include_context Include context lines in size if non-zero - * @param include_hunk_headers Include hunk header lines if non-zero - * @param include_file_headers Include file header lines if non-zero - * @return The number of bytes of data - */ -GIT_EXTERN(size_t) git_patch_size( - git_patch *patch, - int include_context, - int include_hunk_headers, - int include_file_headers); - -/** - * Serialize the patch to text via callback. - * - * Returning a non-zero value from the callback will terminate the iteration - * and return that value to the caller. - * - * @param patch A git_patch representing changes to one file - * @param print_cb Callback function to output lines of the patch. Will be - * called for file headers, hunk headers, and diff lines. - * @param payload Reference pointer that will be passed to your callbacks. - * @return 0 on success, non-zero callback return value, or error code - */ -GIT_EXTERN(int) git_patch_print( - git_patch *patch, - git_diff_line_cb print_cb, - void *payload); - -/** - * Get the content of a patch as a single diff text. - * - * @param out The git_buf to be filled in - * @param patch A git_patch representing changes to one file - * @return 0 on success, <0 on failure. - */ -GIT_EXTERN(int) git_patch_to_buf( - git_buf *out, - git_patch *patch); - -GIT_END_DECL - -/**@}*/ - -#endif diff --git a/vendor/libgit2/include/git2/pathspec.h b/vendor/libgit2/include/git2/pathspec.h deleted file mode 100644 index de6f027c5..000000000 --- a/vendor/libgit2/include/git2/pathspec.h +++ /dev/null @@ -1,263 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_git_pathspec_h__ -#define INCLUDE_git_pathspec_h__ - -#include "common.h" -#include "types.h" -#include "strarray.h" -#include "diff.h" - -GIT_BEGIN_DECL - -/** - * Compiled pathspec - */ -typedef struct git_pathspec git_pathspec; - -/** - * List of filenames matching a pathspec - */ -typedef struct git_pathspec_match_list git_pathspec_match_list; - -/** - * Options controlling how pathspec match should be executed - * - * - GIT_PATHSPEC_IGNORE_CASE forces match to ignore case; otherwise - * match will use native case sensitivity of platform filesystem - * - GIT_PATHSPEC_USE_CASE forces case sensitive match; otherwise - * match will use native case sensitivity of platform filesystem - * - GIT_PATHSPEC_NO_GLOB disables glob patterns and just uses simple - * string comparison for matching - * - GIT_PATHSPEC_NO_MATCH_ERROR means the match functions return error - * code GIT_ENOTFOUND if no matches are found; otherwise no matches is - * still success (return 0) but `git_pathspec_match_list_entrycount` - * will indicate 0 matches. - * - GIT_PATHSPEC_FIND_FAILURES means that the `git_pathspec_match_list` - * should track which patterns matched which files so that at the end of - * the match we can identify patterns that did not match any files. - * - GIT_PATHSPEC_FAILURES_ONLY means that the `git_pathspec_match_list` - * does not need to keep the actual matching filenames. Use this to - * just test if there were any matches at all or in combination with - * GIT_PATHSPEC_FIND_FAILURES to validate a pathspec. - */ -typedef enum { - GIT_PATHSPEC_DEFAULT = 0, - GIT_PATHSPEC_IGNORE_CASE = (1u << 0), - GIT_PATHSPEC_USE_CASE = (1u << 1), - GIT_PATHSPEC_NO_GLOB = (1u << 2), - GIT_PATHSPEC_NO_MATCH_ERROR = (1u << 3), - GIT_PATHSPEC_FIND_FAILURES = (1u << 4), - GIT_PATHSPEC_FAILURES_ONLY = (1u << 5), -} git_pathspec_flag_t; - -/** - * Compile a pathspec - * - * @param out Output of the compiled pathspec - * @param pathspec A git_strarray of the paths to match - * @return 0 on success, <0 on failure - */ -GIT_EXTERN(int) git_pathspec_new( - git_pathspec **out, const git_strarray *pathspec); - -/** - * Free a pathspec - * - * @param ps The compiled pathspec - */ -GIT_EXTERN(void) git_pathspec_free(git_pathspec *ps); - -/** - * Try to match a path against a pathspec - * - * Unlike most of the other pathspec matching functions, this will not - * fall back on the native case-sensitivity for your platform. You must - * explicitly pass flags to control case sensitivity or else this will - * fall back on being case sensitive. - * - * @param ps The compiled pathspec - * @param flags Combination of git_pathspec_flag_t options to control match - * @param path The pathname to attempt to match - * @return 1 is path matches spec, 0 if it does not - */ -GIT_EXTERN(int) git_pathspec_matches_path( - const git_pathspec *ps, uint32_t flags, const char *path); - -/** - * Match a pathspec against the working directory of a repository. - * - * This matches the pathspec against the current files in the working - * directory of the repository. It is an error to invoke this on a bare - * repo. This handles git ignores (i.e. ignored files will not be - * considered to match the `pathspec` unless the file is tracked in the - * index). - * - * If `out` is not NULL, this returns a `git_patchspec_match_list`. That - * contains the list of all matched filenames (unless you pass the - * `GIT_PATHSPEC_FAILURES_ONLY` flag) and may also contain the list of - * pathspecs with no match (if you used the `GIT_PATHSPEC_FIND_FAILURES` - * flag). You must call `git_pathspec_match_list_free()` on this object. - * - * @param out Output list of matches; pass NULL to just get return value - * @param repo The repository in which to match; bare repo is an error - * @param flags Combination of git_pathspec_flag_t options to control match - * @param ps Pathspec to be matched - * @return 0 on success, -1 on error, GIT_ENOTFOUND if no matches and - * the GIT_PATHSPEC_NO_MATCH_ERROR flag was given - */ -GIT_EXTERN(int) git_pathspec_match_workdir( - git_pathspec_match_list **out, - git_repository *repo, - uint32_t flags, - git_pathspec *ps); - -/** - * Match a pathspec against entries in an index. - * - * This matches the pathspec against the files in the repository index. - * - * NOTE: At the moment, the case sensitivity of this match is controlled - * by the current case-sensitivity of the index object itself and the - * USE_CASE and IGNORE_CASE flags will have no effect. This behavior will - * be corrected in a future release. - * - * If `out` is not NULL, this returns a `git_patchspec_match_list`. That - * contains the list of all matched filenames (unless you pass the - * `GIT_PATHSPEC_FAILURES_ONLY` flag) and may also contain the list of - * pathspecs with no match (if you used the `GIT_PATHSPEC_FIND_FAILURES` - * flag). You must call `git_pathspec_match_list_free()` on this object. - * - * @param out Output list of matches; pass NULL to just get return value - * @param index The index to match against - * @param flags Combination of git_pathspec_flag_t options to control match - * @param ps Pathspec to be matched - * @return 0 on success, -1 on error, GIT_ENOTFOUND if no matches and - * the GIT_PATHSPEC_NO_MATCH_ERROR flag is used - */ -GIT_EXTERN(int) git_pathspec_match_index( - git_pathspec_match_list **out, - git_index *index, - uint32_t flags, - git_pathspec *ps); - -/** - * Match a pathspec against files in a tree. - * - * This matches the pathspec against the files in the given tree. - * - * If `out` is not NULL, this returns a `git_patchspec_match_list`. That - * contains the list of all matched filenames (unless you pass the - * `GIT_PATHSPEC_FAILURES_ONLY` flag) and may also contain the list of - * pathspecs with no match (if you used the `GIT_PATHSPEC_FIND_FAILURES` - * flag). You must call `git_pathspec_match_list_free()` on this object. - * - * @param out Output list of matches; pass NULL to just get return value - * @param tree The root-level tree to match against - * @param flags Combination of git_pathspec_flag_t options to control match - * @param ps Pathspec to be matched - * @return 0 on success, -1 on error, GIT_ENOTFOUND if no matches and - * the GIT_PATHSPEC_NO_MATCH_ERROR flag is used - */ -GIT_EXTERN(int) git_pathspec_match_tree( - git_pathspec_match_list **out, - git_tree *tree, - uint32_t flags, - git_pathspec *ps); - -/** - * Match a pathspec against files in a diff list. - * - * This matches the pathspec against the files in the given diff list. - * - * If `out` is not NULL, this returns a `git_patchspec_match_list`. That - * contains the list of all matched filenames (unless you pass the - * `GIT_PATHSPEC_FAILURES_ONLY` flag) and may also contain the list of - * pathspecs with no match (if you used the `GIT_PATHSPEC_FIND_FAILURES` - * flag). You must call `git_pathspec_match_list_free()` on this object. - * - * @param out Output list of matches; pass NULL to just get return value - * @param diff A generated diff list - * @param flags Combination of git_pathspec_flag_t options to control match - * @param ps Pathspec to be matched - * @return 0 on success, -1 on error, GIT_ENOTFOUND if no matches and - * the GIT_PATHSPEC_NO_MATCH_ERROR flag is used - */ -GIT_EXTERN(int) git_pathspec_match_diff( - git_pathspec_match_list **out, - git_diff *diff, - uint32_t flags, - git_pathspec *ps); - -/** - * Free memory associates with a git_pathspec_match_list - * - * @param m The git_pathspec_match_list to be freed - */ -GIT_EXTERN(void) git_pathspec_match_list_free(git_pathspec_match_list *m); - -/** - * Get the number of items in a match list. - * - * @param m The git_pathspec_match_list object - * @return Number of items in match list - */ -GIT_EXTERN(size_t) git_pathspec_match_list_entrycount( - const git_pathspec_match_list *m); - -/** - * Get a matching filename by position. - * - * This routine cannot be used if the match list was generated by - * `git_pathspec_match_diff`. If so, it will always return NULL. - * - * @param m The git_pathspec_match_list object - * @param pos The index into the list - * @return The filename of the match - */ -GIT_EXTERN(const char *) git_pathspec_match_list_entry( - const git_pathspec_match_list *m, size_t pos); - -/** - * Get a matching diff delta by position. - * - * This routine can only be used if the match list was generated by - * `git_pathspec_match_diff`. Otherwise it will always return NULL. - * - * @param m The git_pathspec_match_list object - * @param pos The index into the list - * @return The filename of the match - */ -GIT_EXTERN(const git_diff_delta *) git_pathspec_match_list_diff_entry( - const git_pathspec_match_list *m, size_t pos); - -/** - * Get the number of pathspec items that did not match. - * - * This will be zero unless you passed GIT_PATHSPEC_FIND_FAILURES when - * generating the git_pathspec_match_list. - * - * @param m The git_pathspec_match_list object - * @return Number of items in original pathspec that had no matches - */ -GIT_EXTERN(size_t) git_pathspec_match_list_failed_entrycount( - const git_pathspec_match_list *m); - -/** - * Get an original pathspec string that had no matches. - * - * This will be return NULL for positions out of range. - * - * @param m The git_pathspec_match_list object - * @param pos The index into the failed items - * @return The pathspec pattern that didn't match anything - */ -GIT_EXTERN(const char *) git_pathspec_match_list_failed_entry( - const git_pathspec_match_list *m, size_t pos); - -GIT_END_DECL -#endif diff --git a/vendor/libgit2/include/git2/rebase.h b/vendor/libgit2/include/git2/rebase.h deleted file mode 100644 index 9b9065ee4..000000000 --- a/vendor/libgit2/include/git2/rebase.h +++ /dev/null @@ -1,320 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_git_rebase_h__ -#define INCLUDE_git_rebase_h__ - -#include "common.h" -#include "types.h" -#include "oid.h" -#include "annotated_commit.h" - -/** - * @file git2/rebase.h - * @brief Git rebase routines - * @defgroup git_rebase Git merge routines - * @ingroup Git - * @{ - */ -GIT_BEGIN_DECL - -/** - * Rebase options - * - * Use to tell the rebase machinery how to operate. - */ -typedef struct { - unsigned int version; - - /** - * Used by `git_rebase_init`, this will instruct other clients working - * on this rebase that you want a quiet rebase experience, which they - * may choose to provide in an application-specific manner. This has no - * effect upon libgit2 directly, but is provided for interoperability - * between Git tools. - */ - int quiet; - - /** - * Used by `git_rebase_init`, this will begin an in-memory rebase, - * which will allow callers to step through the rebase operations and - * commit the rebased changes, but will not rewind HEAD or update the - * repository to be in a rebasing state. This will not interfere with - * the working directory (if there is one). - */ - int inmemory; - - /** - * Used by `git_rebase_finish`, this is the name of the notes reference - * used to rewrite notes for rebased commits when finishing the rebase; - * if NULL, the contents of the configuration option `notes.rewriteRef` - * is examined, unless the configuration option `notes.rewrite.rebase` - * is set to false. If `notes.rewriteRef` is also NULL, notes will - * not be rewritten. - */ - const char *rewrite_notes_ref; - - /** - * Options to control how trees are merged during `git_rebase_next`. - */ - git_merge_options merge_options; - - /** - * Options to control how files are written during `git_rebase_init`, - * `git_rebase_next` and `git_rebase_abort`. Note that a minimum - * strategy of `GIT_CHECKOUT_SAFE` is defaulted in `init` and `next`, - * and a minimum strategy of `GIT_CHECKOUT_FORCE` is defaulted in - * `abort` to match git semantics. - */ - git_checkout_options checkout_options; -} git_rebase_options; - -/** - * Type of rebase operation in-progress after calling `git_rebase_next`. - */ -typedef enum { - /** - * The given commit is to be cherry-picked. The client should commit - * the changes and continue if there are no conflicts. - */ - GIT_REBASE_OPERATION_PICK = 0, - - /** - * The given commit is to be cherry-picked, but the client should prompt - * the user to provide an updated commit message. - */ - GIT_REBASE_OPERATION_REWORD, - - /** - * The given commit is to be cherry-picked, but the client should stop - * to allow the user to edit the changes before committing them. - */ - GIT_REBASE_OPERATION_EDIT, - - /** - * The given commit is to be squashed into the previous commit. The - * commit message will be merged with the previous message. - */ - GIT_REBASE_OPERATION_SQUASH, - - /** - * The given commit is to be squashed into the previous commit. The - * commit message from this commit will be discarded. - */ - GIT_REBASE_OPERATION_FIXUP, - - /** - * No commit will be cherry-picked. The client should run the given - * command and (if successful) continue. - */ - GIT_REBASE_OPERATION_EXEC, -} git_rebase_operation_t; - -#define GIT_REBASE_OPTIONS_VERSION 1 -#define GIT_REBASE_OPTIONS_INIT \ - { GIT_REBASE_OPTIONS_VERSION, 0, 0, NULL, GIT_MERGE_OPTIONS_INIT, \ - GIT_CHECKOUT_OPTIONS_INIT} - -/** Indicates that a rebase operation is not (yet) in progress. */ -#define GIT_REBASE_NO_OPERATION SIZE_MAX - -/** - * A rebase operation - * - * Describes a single instruction/operation to be performed during the - * rebase. - */ -typedef struct { - /** The type of rebase operation. */ - git_rebase_operation_t type; - - /** - * The commit ID being cherry-picked. This will be populated for - * all operations except those of type `GIT_REBASE_OPERATION_EXEC`. - */ - const git_oid id; - - /** - * The executable the user has requested be run. This will only - * be populated for operations of type `GIT_REBASE_OPERATION_EXEC`. - */ - const char *exec; -} git_rebase_operation; - -/** - * Initializes a `git_rebase_options` with default values. Equivalent to - * creating an instance with GIT_REBASE_OPTIONS_INIT. - * - * @param opts the `git_rebase_options` instance to initialize. - * @param version the version of the struct; you should pass - * `GIT_REBASE_OPTIONS_VERSION` here. - * @return Zero on success; -1 on failure. - */ -GIT_EXTERN(int) git_rebase_init_options( - git_rebase_options *opts, - unsigned int version); - -/** - * Initializes a rebase operation to rebase the changes in `branch` - * relative to `upstream` onto another branch. To begin the rebase - * process, call `git_rebase_next`. When you have finished with this - * object, call `git_rebase_free`. - * - * @param out Pointer to store the rebase object - * @param repo The repository to perform the rebase - * @param branch The terminal commit to rebase, or NULL to rebase the - * current branch - * @param upstream The commit to begin rebasing from, or NULL to rebase all - * reachable commits - * @param onto The branch to rebase onto, or NULL to rebase onto the given - * upstream - * @param opts Options to specify how rebase is performed, or NULL - * @return Zero on success; -1 on failure. - */ -GIT_EXTERN(int) git_rebase_init( - git_rebase **out, - git_repository *repo, - const git_annotated_commit *branch, - const git_annotated_commit *upstream, - const git_annotated_commit *onto, - const git_rebase_options *opts); - -/** - * Opens an existing rebase that was previously started by either an - * invocation of `git_rebase_init` or by another client. - * - * @param out Pointer to store the rebase object - * @param repo The repository that has a rebase in-progress - * @param opts Options to specify how rebase is performed - * @return Zero on success; -1 on failure. - */ -GIT_EXTERN(int) git_rebase_open( - git_rebase **out, - git_repository *repo, - const git_rebase_options *opts); - -/** - * Gets the count of rebase operations that are to be applied. - * - * @param rebase The in-progress rebase - * @return The number of rebase operations in total - */ -GIT_EXTERN(size_t) git_rebase_operation_entrycount(git_rebase *rebase); - -/** - * Gets the index of the rebase operation that is currently being applied. - * If the first operation has not yet been applied (because you have - * called `init` but not yet `next`) then this returns - * `GIT_REBASE_NO_OPERATION`. - * - * @param rebase The in-progress rebase - * @return The index of the rebase operation currently being applied. - */ -GIT_EXTERN(size_t) git_rebase_operation_current(git_rebase *rebase); - -/** - * Gets the rebase operation specified by the given index. - * - * @param rebase The in-progress rebase - * @param idx The index of the rebase operation to retrieve - * @return The rebase operation or NULL if `idx` was out of bounds - */ -GIT_EXTERN(git_rebase_operation *) git_rebase_operation_byindex( - git_rebase *rebase, - size_t idx); - -/** - * Performs the next rebase operation and returns the information about it. - * If the operation is one that applies a patch (which is any operation except - * GIT_REBASE_OPERATION_EXEC) then the patch will be applied and the index and - * working directory will be updated with the changes. If there are conflicts, - * you will need to address those before committing the changes. - * - * @param operation Pointer to store the rebase operation that is to be performed next - * @param rebase The rebase in progress - * @return Zero on success; -1 on failure. - */ -GIT_EXTERN(int) git_rebase_next( - git_rebase_operation **operation, - git_rebase *rebase); - -/** - * Gets the index produced by the last operation, which is the result - * of `git_rebase_next` and which will be committed by the next - * invocation of `git_rebase_commit`. This is useful for resolving - * conflicts in an in-memory rebase before committing them. You must - * call `git_index_free` when you are finished with this. - * - * This is only applicable for in-memory rebases; for rebases within - * a working directory, the changes were applied to the repository's - * index. - */ -GIT_EXTERN(int) git_rebase_inmemory_index( - git_index **index, - git_rebase *rebase); - -/** - * Commits the current patch. You must have resolved any conflicts that - * were introduced during the patch application from the `git_rebase_next` - * invocation. - * - * @param id Pointer in which to store the OID of the newly created commit - * @param rebase The rebase that is in-progress - * @param author The author of the updated commit, or NULL to keep the - * author from the original commit - * @param committer The committer of the rebase - * @param message_encoding The encoding for the message in the commit, - * represented with a standard encoding name. If message is NULL, - * this should also be NULL, and the encoding from the original - * commit will be maintained. If message is specified, this may be - * NULL to indicate that "UTF-8" is to be used. - * @param message The message for this commit, or NULL to use the message - * from the original commit. - * @return Zero on success, GIT_EUNMERGED if there are unmerged changes in - * the index, GIT_EAPPLIED if the current commit has already - * been applied to the upstream and there is nothing to commit, - * -1 on failure. - */ -GIT_EXTERN(int) git_rebase_commit( - git_oid *id, - git_rebase *rebase, - const git_signature *author, - const git_signature *committer, - const char *message_encoding, - const char *message); - -/** - * Aborts a rebase that is currently in progress, resetting the repository - * and working directory to their state before rebase began. - * - * @param rebase The rebase that is in-progress - * @return Zero on success; GIT_ENOTFOUND if a rebase is not in progress, - * -1 on other errors. - */ -GIT_EXTERN(int) git_rebase_abort(git_rebase *rebase); - -/** - * Finishes a rebase that is currently in progress once all patches have - * been applied. - * - * @param rebase The rebase that is in-progress - * @param signature The identity that is finishing the rebase (optional) - * @return Zero on success; -1 on error - */ -GIT_EXTERN(int) git_rebase_finish( - git_rebase *rebase, - const git_signature *signature); - -/** - * Frees the `git_rebase` object. - * - * @param rebase The rebase object - */ -GIT_EXTERN(void) git_rebase_free(git_rebase *rebase); - -/** @} */ -GIT_END_DECL -#endif diff --git a/vendor/libgit2/include/git2/refdb.h b/vendor/libgit2/include/git2/refdb.h deleted file mode 100644 index a315876ae..000000000 --- a/vendor/libgit2/include/git2/refdb.h +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_git_refdb_h__ -#define INCLUDE_git_refdb_h__ - -#include "common.h" -#include "types.h" -#include "oid.h" -#include "refs.h" - -/** - * @file git2/refdb.h - * @brief Git custom refs backend functions - * @defgroup git_refdb Git custom refs backend API - * @ingroup Git - * @{ - */ -GIT_BEGIN_DECL - -/** - * Create a new reference database with no backends. - * - * Before the Ref DB can be used for read/writing, a custom database - * backend must be manually set using `git_refdb_set_backend()` - * - * @param out location to store the database pointer, if opened. - * Set to NULL if the open failed. - * @param repo the repository - * @return 0 or an error code - */ -GIT_EXTERN(int) git_refdb_new(git_refdb **out, git_repository *repo); - -/** - * Create a new reference database and automatically add - * the default backends: - * - * - git_refdb_dir: read and write loose and packed refs - * from disk, assuming the repository dir as the folder - * - * @param out location to store the database pointer, if opened. - * Set to NULL if the open failed. - * @param repo the repository - * @return 0 or an error code - */ -GIT_EXTERN(int) git_refdb_open(git_refdb **out, git_repository *repo); - -/** - * Suggests that the given refdb compress or optimize its references. - * This mechanism is implementation specific. For on-disk reference - * databases, for example, this may pack all loose references. - */ -GIT_EXTERN(int) git_refdb_compress(git_refdb *refdb); - -/** - * Close an open reference database. - * - * @param refdb reference database pointer or NULL - */ -GIT_EXTERN(void) git_refdb_free(git_refdb *refdb); - -/** @} */ -GIT_END_DECL - -#endif diff --git a/vendor/libgit2/include/git2/reflog.h b/vendor/libgit2/include/git2/reflog.h deleted file mode 100644 index c949a28f0..000000000 --- a/vendor/libgit2/include/git2/reflog.h +++ /dev/null @@ -1,170 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_git_reflog_h__ -#define INCLUDE_git_reflog_h__ - -#include "common.h" -#include "types.h" -#include "oid.h" - -/** - * @file git2/reflog.h - * @brief Git reflog management routines - * @defgroup git_reflog Git reflog management routines - * @ingroup Git - * @{ - */ -GIT_BEGIN_DECL - -/** - * Read the reflog for the given reference - * - * If there is no reflog file for the given - * reference yet, an empty reflog object will - * be returned. - * - * The reflog must be freed manually by using - * git_reflog_free(). - * - * @param out pointer to reflog - * @param repo the repostiory - * @param name reference to look up - * @return 0 or an error code - */ -GIT_EXTERN(int) git_reflog_read(git_reflog **out, git_repository *repo, const char *name); - -/** - * Write an existing in-memory reflog object back to disk - * using an atomic file lock. - * - * @param reflog an existing reflog object - * @return 0 or an error code - */ -GIT_EXTERN(int) git_reflog_write(git_reflog *reflog); - -/** - * Add a new entry to the in-memory reflog. - * - * `msg` is optional and can be NULL. - * - * @param reflog an existing reflog object - * @param id the OID the reference is now pointing to - * @param committer the signature of the committer - * @param msg the reflog message - * @return 0 or an error code - */ -GIT_EXTERN(int) git_reflog_append(git_reflog *reflog, const git_oid *id, const git_signature *committer, const char *msg); - -/** - * Rename a reflog - * - * The reflog to be renamed is expected to already exist - * - * The new name will be checked for validity. - * See `git_reference_create_symbolic()` for rules about valid names. - * - * @param repo the repository - * @param old_name the old name of the reference - * @param name the new name of the reference - * @return 0 on success, GIT_EINVALIDSPEC or an error code - */ -GIT_EXTERN(int) git_reflog_rename(git_repository *repo, const char *old_name, const char *name); - -/** - * Delete the reflog for the given reference - * - * @param repo the repository - * @param name the reflog to delete - * @return 0 or an error code - */ -GIT_EXTERN(int) git_reflog_delete(git_repository *repo, const char *name); - -/** - * Get the number of log entries in a reflog - * - * @param reflog the previously loaded reflog - * @return the number of log entries - */ -GIT_EXTERN(size_t) git_reflog_entrycount(git_reflog *reflog); - -/** - * Lookup an entry by its index - * - * Requesting the reflog entry with an index of 0 (zero) will - * return the most recently created entry. - * - * @param reflog a previously loaded reflog - * @param idx the position of the entry to lookup. Should be greater than or - * equal to 0 (zero) and less than `git_reflog_entrycount()`. - * @return the entry; NULL if not found - */ -GIT_EXTERN(const git_reflog_entry *) git_reflog_entry_byindex(const git_reflog *reflog, size_t idx); - -/** - * Remove an entry from the reflog by its index - * - * To ensure there's no gap in the log history, set `rewrite_previous_entry` - * param value to 1. When deleting entry `n`, member old_oid of entry `n-1` - * (if any) will be updated with the value of member new_oid of entry `n+1`. - * - * @param reflog a previously loaded reflog. - * - * @param idx the position of the entry to remove. Should be greater than or - * equal to 0 (zero) and less than `git_reflog_entrycount()`. - * - * @param rewrite_previous_entry 1 to rewrite the history; 0 otherwise. - * - * @return 0 on success, GIT_ENOTFOUND if the entry doesn't exist - * or an error code. - */ -GIT_EXTERN(int) git_reflog_drop( - git_reflog *reflog, - size_t idx, - int rewrite_previous_entry); - -/** - * Get the old oid - * - * @param entry a reflog entry - * @return the old oid - */ -GIT_EXTERN(const git_oid *) git_reflog_entry_id_old(const git_reflog_entry *entry); - -/** - * Get the new oid - * - * @param entry a reflog entry - * @return the new oid at this time - */ -GIT_EXTERN(const git_oid *) git_reflog_entry_id_new(const git_reflog_entry *entry); - -/** - * Get the committer of this entry - * - * @param entry a reflog entry - * @return the committer - */ -GIT_EXTERN(const git_signature *) git_reflog_entry_committer(const git_reflog_entry *entry); - -/** - * Get the log message - * - * @param entry a reflog entry - * @return the log msg - */ -GIT_EXTERN(const char *) git_reflog_entry_message(const git_reflog_entry *entry); - -/** - * Free the reflog - * - * @param reflog reflog to free - */ -GIT_EXTERN(void) git_reflog_free(git_reflog *reflog); - -/** @} */ -GIT_END_DECL -#endif diff --git a/vendor/libgit2/include/git2/refs.h b/vendor/libgit2/include/git2/refs.h deleted file mode 100644 index db84ed03a..000000000 --- a/vendor/libgit2/include/git2/refs.h +++ /dev/null @@ -1,735 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_git_refs_h__ -#define INCLUDE_git_refs_h__ - -#include "common.h" -#include "types.h" -#include "oid.h" -#include "strarray.h" - -/** - * @file git2/refs.h - * @brief Git reference management routines - * @defgroup git_reference Git reference management routines - * @ingroup Git - * @{ - */ -GIT_BEGIN_DECL - -/** - * Lookup a reference by name in a repository. - * - * The returned reference must be freed by the user. - * - * The name will be checked for validity. - * See `git_reference_symbolic_create()` for rules about valid names. - * - * @param out pointer to the looked-up reference - * @param repo the repository to look up the reference - * @param name the long name for the reference (e.g. HEAD, refs/heads/master, refs/tags/v0.1.0, ...) - * @return 0 on success, GIT_ENOTFOUND, GIT_EINVALIDSPEC or an error code. - */ -GIT_EXTERN(int) git_reference_lookup(git_reference **out, git_repository *repo, const char *name); - -/** - * Lookup a reference by name and resolve immediately to OID. - * - * This function provides a quick way to resolve a reference name straight - * through to the object id that it refers to. This avoids having to - * allocate or free any `git_reference` objects for simple situations. - * - * The name will be checked for validity. - * See `git_reference_symbolic_create()` for rules about valid names. - * - * @param out Pointer to oid to be filled in - * @param repo The repository in which to look up the reference - * @param name The long name for the reference (e.g. HEAD, refs/heads/master, refs/tags/v0.1.0, ...) - * @return 0 on success, GIT_ENOTFOUND, GIT_EINVALIDSPEC or an error code. - */ -GIT_EXTERN(int) git_reference_name_to_id( - git_oid *out, git_repository *repo, const char *name); - -/** - * Lookup a reference by DWIMing its short name - * - * Apply the git precendence rules to the given shorthand to determine - * which reference the user is referring to. - * - * @param out pointer in which to store the reference - * @param repo the repository in which to look - * @param shorthand the short name for the reference - * @return 0 or an error code - */ -GIT_EXTERN(int) git_reference_dwim(git_reference **out, git_repository *repo, const char *shorthand); - -/** - * Conditionally create a new symbolic reference. - * - * A symbolic reference is a reference name that refers to another - * reference name. If the other name moves, the symbolic name will move, - * too. As a simple example, the "HEAD" reference might refer to - * "refs/heads/master" while on the "master" branch of a repository. - * - * The symbolic reference will be created in the repository and written to - * the disk. The generated reference object must be freed by the user. - * - * Valid reference names must follow one of two patterns: - * - * 1. Top-level names must contain only capital letters and underscores, - * and must begin and end with a letter. (e.g. "HEAD", "ORIG_HEAD"). - * 2. Names prefixed with "refs/" can be almost anything. You must avoid - * the characters '~', '^', ':', '\\', '?', '[', and '*', and the - * sequences ".." and "@{" which have special meaning to revparse. - * - * This function will return an error if a reference already exists with the - * given name unless `force` is true, in which case it will be overwritten. - * - * The message for the reflog will be ignored if the reference does - * not belong in the standard set (HEAD, branches and remote-tracking - * branches) and it does not have a reflog. - * - * It will return GIT_EMODIFIED if the reference's value at the time - * of updating does not match the one passed through `current_value` - * (i.e. if the ref has changed since the user read it). - * - * @param out Pointer to the newly created reference - * @param repo Repository where that reference will live - * @param name The name of the reference - * @param target The target of the reference - * @param force Overwrite existing references - * @param current_value The expected value of the reference when updating - * @param log_message The one line long message to be appended to the reflog - * @return 0 on success, GIT_EEXISTS, GIT_EINVALIDSPEC, GIT_EMODIFIED or an error code - */ -GIT_EXTERN(int) git_reference_symbolic_create_matching(git_reference **out, git_repository *repo, const char *name, const char *target, int force, const char *current_value, const char *log_message); - -/** - * Create a new symbolic reference. - * - * A symbolic reference is a reference name that refers to another - * reference name. If the other name moves, the symbolic name will move, - * too. As a simple example, the "HEAD" reference might refer to - * "refs/heads/master" while on the "master" branch of a repository. - * - * The symbolic reference will be created in the repository and written to - * the disk. The generated reference object must be freed by the user. - * - * Valid reference names must follow one of two patterns: - * - * 1. Top-level names must contain only capital letters and underscores, - * and must begin and end with a letter. (e.g. "HEAD", "ORIG_HEAD"). - * 2. Names prefixed with "refs/" can be almost anything. You must avoid - * the characters '~', '^', ':', '\\', '?', '[', and '*', and the - * sequences ".." and "@{" which have special meaning to revparse. - * - * This function will return an error if a reference already exists with the - * given name unless `force` is true, in which case it will be overwritten. - * - * The message for the reflog will be ignored if the reference does - * not belong in the standard set (HEAD, branches and remote-tracking - * branches) and it does not have a reflog. - * - * @param out Pointer to the newly created reference - * @param repo Repository where that reference will live - * @param name The name of the reference - * @param target The target of the reference - * @param force Overwrite existing references - * @param log_message The one line long message to be appended to the reflog - * @return 0 on success, GIT_EEXISTS, GIT_EINVALIDSPEC or an error code - */ -GIT_EXTERN(int) git_reference_symbolic_create(git_reference **out, git_repository *repo, const char *name, const char *target, int force, const char *log_message); - -/** - * Create a new direct reference. - * - * A direct reference (also called an object id reference) refers directly - * to a specific object id (a.k.a. OID or SHA) in the repository. The id - * permanently refers to the object (although the reference itself can be - * moved). For example, in libgit2 the direct ref "refs/tags/v0.17.0" - * refers to OID 5b9fac39d8a76b9139667c26a63e6b3f204b3977. - * - * The direct reference will be created in the repository and written to - * the disk. The generated reference object must be freed by the user. - * - * Valid reference names must follow one of two patterns: - * - * 1. Top-level names must contain only capital letters and underscores, - * and must begin and end with a letter. (e.g. "HEAD", "ORIG_HEAD"). - * 2. Names prefixed with "refs/" can be almost anything. You must avoid - * the characters '~', '^', ':', '\\', '?', '[', and '*', and the - * sequences ".." and "@{" which have special meaning to revparse. - * - * This function will return an error if a reference already exists with the - * given name unless `force` is true, in which case it will be overwritten. - * - * The message for the reflog will be ignored if the reference does - * not belong in the standard set (HEAD, branches and remote-tracking - * branches) and and it does not have a reflog. - * - * @param out Pointer to the newly created reference - * @param repo Repository where that reference will live - * @param name The name of the reference - * @param id The object id pointed to by the reference. - * @param force Overwrite existing references - * @param log_message The one line long message to be appended to the reflog - * @return 0 on success, GIT_EEXISTS, GIT_EINVALIDSPEC or an error code - */ -GIT_EXTERN(int) git_reference_create(git_reference **out, git_repository *repo, const char *name, const git_oid *id, int force, const char *log_message); - -/** - * Conditionally create new direct reference - * - * A direct reference (also called an object id reference) refers directly - * to a specific object id (a.k.a. OID or SHA) in the repository. The id - * permanently refers to the object (although the reference itself can be - * moved). For example, in libgit2 the direct ref "refs/tags/v0.17.0" - * refers to OID 5b9fac39d8a76b9139667c26a63e6b3f204b3977. - * - * The direct reference will be created in the repository and written to - * the disk. The generated reference object must be freed by the user. - * - * Valid reference names must follow one of two patterns: - * - * 1. Top-level names must contain only capital letters and underscores, - * and must begin and end with a letter. (e.g. "HEAD", "ORIG_HEAD"). - * 2. Names prefixed with "refs/" can be almost anything. You must avoid - * the characters '~', '^', ':', '\\', '?', '[', and '*', and the - * sequences ".." and "@{" which have special meaning to revparse. - * - * This function will return an error if a reference already exists with the - * given name unless `force` is true, in which case it will be overwritten. - * - * The message for the reflog will be ignored if the reference does - * not belong in the standard set (HEAD, branches and remote-tracking - * branches) and and it does not have a reflog. - * - * It will return GIT_EMODIFIED if the reference's value at the time - * of updating does not match the one passed through `current_id` - * (i.e. if the ref has changed since the user read it). - * - * @param out Pointer to the newly created reference - * @param repo Repository where that reference will live - * @param name The name of the reference - * @param id The object id pointed to by the reference. - * @param force Overwrite existing references - * @param current_id The expected value of the reference at the time of update - * @param log_message The one line long message to be appended to the reflog - * @return 0 on success, GIT_EMODIFIED if the value of the reference - * has changed, GIT_EEXISTS, GIT_EINVALIDSPEC or an error code - */ -GIT_EXTERN(int) git_reference_create_matching(git_reference **out, git_repository *repo, const char *name, const git_oid *id, int force, const git_oid *current_id, const char *log_message); - -/** - * Get the OID pointed to by a direct reference. - * - * Only available if the reference is direct (i.e. an object id reference, - * not a symbolic one). - * - * To find the OID of a symbolic ref, call `git_reference_resolve()` and - * then this function (or maybe use `git_reference_name_to_id()` to - * directly resolve a reference name all the way through to an OID). - * - * @param ref The reference - * @return a pointer to the oid if available, NULL otherwise - */ -GIT_EXTERN(const git_oid *) git_reference_target(const git_reference *ref); - -/** - * Return the peeled OID target of this reference. - * - * This peeled OID only applies to direct references that point to - * a hard Tag object: it is the result of peeling such Tag. - * - * @param ref The reference - * @return a pointer to the oid if available, NULL otherwise - */ -GIT_EXTERN(const git_oid *) git_reference_target_peel(const git_reference *ref); - -/** - * Get full name to the reference pointed to by a symbolic reference. - * - * Only available if the reference is symbolic. - * - * @param ref The reference - * @return a pointer to the name if available, NULL otherwise - */ -GIT_EXTERN(const char *) git_reference_symbolic_target(const git_reference *ref); - -/** - * Get the type of a reference. - * - * Either direct (GIT_REF_OID) or symbolic (GIT_REF_SYMBOLIC) - * - * @param ref The reference - * @return the type - */ -GIT_EXTERN(git_ref_t) git_reference_type(const git_reference *ref); - -/** - * Get the full name of a reference. - * - * See `git_reference_symbolic_create()` for rules about valid names. - * - * @param ref The reference - * @return the full name for the ref - */ -GIT_EXTERN(const char *) git_reference_name(const git_reference *ref); - -/** - * Resolve a symbolic reference to a direct reference. - * - * This method iteratively peels a symbolic reference until it resolves to - * a direct reference to an OID. - * - * The peeled reference is returned in the `resolved_ref` argument, and - * must be freed manually once it's no longer needed. - * - * If a direct reference is passed as an argument, a copy of that - * reference is returned. This copy must be manually freed too. - * - * @param out Pointer to the peeled reference - * @param ref The reference - * @return 0 or an error code - */ -GIT_EXTERN(int) git_reference_resolve(git_reference **out, const git_reference *ref); - -/** - * Get the repository where a reference resides. - * - * @param ref The reference - * @return a pointer to the repo - */ -GIT_EXTERN(git_repository *) git_reference_owner(const git_reference *ref); - -/** - * Create a new reference with the same name as the given reference but a - * different symbolic target. The reference must be a symbolic reference, - * otherwise this will fail. - * - * The new reference will be written to disk, overwriting the given reference. - * - * The target name will be checked for validity. - * See `git_reference_symbolic_create()` for rules about valid names. - * - * The message for the reflog will be ignored if the reference does - * not belong in the standard set (HEAD, branches and remote-tracking - * branches) and and it does not have a reflog. - * - * @param out Pointer to the newly created reference - * @param ref The reference - * @param target The new target for the reference - * @param log_message The one line long message to be appended to the reflog - * @return 0 on success, GIT_EINVALIDSPEC or an error code - */ -GIT_EXTERN(int) git_reference_symbolic_set_target( - git_reference **out, - git_reference *ref, - const char *target, - const char *log_message); - -/** - * Conditionally create a new reference with the same name as the given reference but a - * different OID target. The reference must be a direct reference, otherwise - * this will fail. - * - * The new reference will be written to disk, overwriting the given reference. - * - * @param out Pointer to the newly created reference - * @param ref The reference - * @param id The new target OID for the reference - * @param log_message The one line long message to be appended to the reflog - * @return 0 on success, GIT_EMODIFIED if the value of the reference - * has changed since it was read, or an error code - */ -GIT_EXTERN(int) git_reference_set_target( - git_reference **out, - git_reference *ref, - const git_oid *id, - const char *log_message); - -/** - * Rename an existing reference. - * - * This method works for both direct and symbolic references. - * - * The new name will be checked for validity. - * See `git_reference_symbolic_create()` for rules about valid names. - * - * If the `force` flag is not enabled, and there's already - * a reference with the given name, the renaming will fail. - * - * IMPORTANT: - * The user needs to write a proper reflog entry if the - * reflog is enabled for the repository. We only rename - * the reflog if it exists. - * - * @param ref The reference to rename - * @param new_name The new name for the reference - * @param force Overwrite an existing reference - * @param log_message The one line long message to be appended to the reflog - * @return 0 on success, GIT_EINVALIDSPEC, GIT_EEXISTS or an error code - * - */ -GIT_EXTERN(int) git_reference_rename( - git_reference **new_ref, - git_reference *ref, - const char *new_name, - int force, - const char *log_message); - -/** - * Delete an existing reference. - * - * This method works for both direct and symbolic references. The reference - * will be immediately removed on disk but the memory will not be freed. - * Callers must call `git_reference_free`. - * - * This function will return an error if the reference has changed - * from the time it was looked up. - * - * @param ref The reference to remove - * @return 0, GIT_EMODIFIED or an error code - */ -GIT_EXTERN(int) git_reference_delete(git_reference *ref); - -/** - * Delete an existing reference by name - * - * This method removes the named reference from the repository without - * looking at its old value. - * - * @param name The reference to remove - * @return 0 or an error code - */ -GIT_EXTERN(int) git_reference_remove(git_repository *repo, const char *name); - -/** - * Fill a list with all the references that can be found in a repository. - * - * The string array will be filled with the names of all references; these - * values are owned by the user and should be free'd manually when no - * longer needed, using `git_strarray_free()`. - * - * @param array Pointer to a git_strarray structure where - * the reference names will be stored - * @param repo Repository where to find the refs - * @return 0 or an error code - */ -GIT_EXTERN(int) git_reference_list(git_strarray *array, git_repository *repo); - -typedef int (*git_reference_foreach_cb)(git_reference *reference, void *payload); -typedef int (*git_reference_foreach_name_cb)(const char *name, void *payload); - -/** - * Perform a callback on each reference in the repository. - * - * The `callback` function will be called for each reference in the - * repository, receiving the reference object and the `payload` value - * passed to this method. Returning a non-zero value from the callback - * will terminate the iteration. - * - * @param repo Repository where to find the refs - * @param callback Function which will be called for every listed ref - * @param payload Additional data to pass to the callback - * @return 0 on success, non-zero callback return value, or error code - */ -GIT_EXTERN(int) git_reference_foreach( - git_repository *repo, - git_reference_foreach_cb callback, - void *payload); - -/** - * Perform a callback on the fully-qualified name of each reference. - * - * The `callback` function will be called for each reference in the - * repository, receiving the name of the reference and the `payload` value - * passed to this method. Returning a non-zero value from the callback - * will terminate the iteration. - * - * @param repo Repository where to find the refs - * @param callback Function which will be called for every listed ref name - * @param payload Additional data to pass to the callback - * @return 0 on success, non-zero callback return value, or error code - */ -GIT_EXTERN(int) git_reference_foreach_name( - git_repository *repo, - git_reference_foreach_name_cb callback, - void *payload); - -/** - * Free the given reference. - * - * @param ref git_reference - */ -GIT_EXTERN(void) git_reference_free(git_reference *ref); - -/** - * Compare two references. - * - * @param ref1 The first git_reference - * @param ref2 The second git_reference - * @return 0 if the same, else a stable but meaningless ordering. - */ -GIT_EXTERN(int) git_reference_cmp( - const git_reference *ref1, - const git_reference *ref2); - -/** - * Create an iterator for the repo's references - * - * @param out pointer in which to store the iterator - * @param repo the repository - * @return 0 or an error code - */ -GIT_EXTERN(int) git_reference_iterator_new( - git_reference_iterator **out, - git_repository *repo); - -/** - * Create an iterator for the repo's references that match the - * specified glob - * - * @param out pointer in which to store the iterator - * @param repo the repository - * @param glob the glob to match against the reference names - * @return 0 or an error code - */ -GIT_EXTERN(int) git_reference_iterator_glob_new( - git_reference_iterator **out, - git_repository *repo, - const char *glob); - -/** - * Get the next reference - * - * @param out pointer in which to store the reference - * @param iter the iterator - * @return 0, GIT_ITEROVER if there are no more; or an error code - */ -GIT_EXTERN(int) git_reference_next(git_reference **out, git_reference_iterator *iter); - -/** - * Get the next reference's name - * - * This function is provided for convenience in case only the names - * are interesting as it avoids the allocation of the `git_reference` - * object which `git_reference_next()` needs. - * - * @param out pointer in which to store the string - * @param iter the iterator - * @return 0, GIT_ITEROVER if there are no more; or an error code - */ -GIT_EXTERN(int) git_reference_next_name(const char **out, git_reference_iterator *iter); - -/** - * Free the iterator and its associated resources - * - * @param iter the iterator to free - */ -GIT_EXTERN(void) git_reference_iterator_free(git_reference_iterator *iter); - -/** - * Perform a callback on each reference in the repository whose name - * matches the given pattern. - * - * This function acts like `git_reference_foreach()` with an additional - * pattern match being applied to the reference name before issuing the - * callback function. See that function for more information. - * - * The pattern is matched using fnmatch or "glob" style where a '*' matches - * any sequence of letters, a '?' matches any letter, and square brackets - * can be used to define character ranges (such as "[0-9]" for digits). - * - * @param repo Repository where to find the refs - * @param glob Pattern to match (fnmatch-style) against reference name. - * @param callback Function which will be called for every listed ref - * @param payload Additional data to pass to the callback - * @return 0 on success, GIT_EUSER on non-zero callback, or error code - */ -GIT_EXTERN(int) git_reference_foreach_glob( - git_repository *repo, - const char *glob, - git_reference_foreach_name_cb callback, - void *payload); - -/** - * Check if a reflog exists for the specified reference. - * - * @param repo the repository - * @param refname the reference's name - * @return 0 when no reflog can be found, 1 when it exists; - * otherwise an error code. - */ -GIT_EXTERN(int) git_reference_has_log(git_repository *repo, const char *refname); - -/** - * Ensure there is a reflog for a particular reference. - * - * Make sure that successive updates to the reference will append to - * its log. - * - * @param repo the repository - * @param refname the reference's name - * @return 0 or an error code. - */ -GIT_EXTERN(int) git_reference_ensure_log(git_repository *repo, const char *refname); - -/** - * Check if a reference is a local branch. - * - * @param ref A git reference - * - * @return 1 when the reference lives in the refs/heads - * namespace; 0 otherwise. - */ -GIT_EXTERN(int) git_reference_is_branch(const git_reference *ref); - -/** - * Check if a reference is a remote tracking branch - * - * @param ref A git reference - * - * @return 1 when the reference lives in the refs/remotes - * namespace; 0 otherwise. - */ -GIT_EXTERN(int) git_reference_is_remote(const git_reference *ref); - -/** - * Check if a reference is a tag - * - * @param ref A git reference - * - * @return 1 when the reference lives in the refs/tags - * namespace; 0 otherwise. - */ -GIT_EXTERN(int) git_reference_is_tag(const git_reference *ref); - -/** - * Check if a reference is a note - * - * @param ref A git reference - * - * @return 1 when the reference lives in the refs/notes - * namespace; 0 otherwise. - */ -GIT_EXTERN(int) git_reference_is_note(const git_reference *ref); - -/** - * Normalization options for reference lookup - */ -typedef enum { - /** - * No particular normalization. - */ - GIT_REF_FORMAT_NORMAL = 0u, - - /** - * Control whether one-level refnames are accepted - * (i.e., refnames that do not contain multiple /-separated - * components). Those are expected to be written only using - * uppercase letters and underscore (FETCH_HEAD, ...) - */ - GIT_REF_FORMAT_ALLOW_ONELEVEL = (1u << 0), - - /** - * Interpret the provided name as a reference pattern for a - * refspec (as used with remote repositories). If this option - * is enabled, the name is allowed to contain a single * () - * in place of a one full pathname component - * (e.g., foo//bar but not foo/bar). - */ - GIT_REF_FORMAT_REFSPEC_PATTERN = (1u << 1), - - /** - * Interpret the name as part of a refspec in shorthand form - * so the `ONELEVEL` naming rules aren't enforced and 'master' - * becomes a valid name. - */ - GIT_REF_FORMAT_REFSPEC_SHORTHAND = (1u << 2), -} git_reference_normalize_t; - -/** - * Normalize reference name and check validity. - * - * This will normalize the reference name by removing any leading slash - * '/' characters and collapsing runs of adjacent slashes between name - * components into a single slash. - * - * Once normalized, if the reference name is valid, it will be returned in - * the user allocated buffer. - * - * See `git_reference_symbolic_create()` for rules about valid names. - * - * @param buffer_out User allocated buffer to store normalized name - * @param buffer_size Size of buffer_out - * @param name Reference name to be checked. - * @param flags Flags to constrain name validation rules - see the - * GIT_REF_FORMAT constants above. - * @return 0 on success, GIT_EBUFS if buffer is too small, GIT_EINVALIDSPEC - * or an error code. - */ -GIT_EXTERN(int) git_reference_normalize_name( - char *buffer_out, - size_t buffer_size, - const char *name, - unsigned int flags); - -/** - * Recursively peel reference until object of the specified type is found. - * - * The retrieved `peeled` object is owned by the repository - * and should be closed with the `git_object_free` method. - * - * If you pass `GIT_OBJ_ANY` as the target type, then the object - * will be peeled until a non-tag object is met. - * - * @param out Pointer to the peeled git_object - * @param ref The reference to be processed - * @param type The type of the requested object (GIT_OBJ_COMMIT, - * GIT_OBJ_TAG, GIT_OBJ_TREE, GIT_OBJ_BLOB or GIT_OBJ_ANY). - * @return 0 on success, GIT_EAMBIGUOUS, GIT_ENOTFOUND or an error code - */ -GIT_EXTERN(int) git_reference_peel( - git_object **out, - git_reference *ref, - git_otype type); - -/** - * Ensure the reference name is well-formed. - * - * Valid reference names must follow one of two patterns: - * - * 1. Top-level names must contain only capital letters and underscores, - * and must begin and end with a letter. (e.g. "HEAD", "ORIG_HEAD"). - * 2. Names prefixed with "refs/" can be almost anything. You must avoid - * the characters '~', '^', ':', '\\', '?', '[', and '*', and the - * sequences ".." and "@{" which have special meaning to revparse. - * - * @param refname name to be checked. - * @return 1 if the reference name is acceptable; 0 if it isn't - */ -GIT_EXTERN(int) git_reference_is_valid_name(const char *refname); - -/** - * Get the reference's short name - * - * This will transform the reference name into a name "human-readable" - * version. If no shortname is appropriate, it will return the full - * name. - * - * The memory is owned by the reference and must not be freed. - * - * @param ref a reference - * @return the human-readable version of the name - */ -GIT_EXTERN(const char *) git_reference_shorthand(const git_reference *ref); - - -/** @} */ -GIT_END_DECL -#endif diff --git a/vendor/libgit2/include/git2/refspec.h b/vendor/libgit2/include/git2/refspec.h deleted file mode 100644 index 9acdc72d5..000000000 --- a/vendor/libgit2/include/git2/refspec.h +++ /dev/null @@ -1,104 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_git_refspec_h__ -#define INCLUDE_git_refspec_h__ - -#include "common.h" -#include "types.h" -#include "net.h" -#include "buffer.h" - -/** - * @file git2/refspec.h - * @brief Git refspec attributes - * @defgroup git_refspec Git refspec attributes - * @ingroup Git - * @{ - */ -GIT_BEGIN_DECL - -/** - * Get the source specifier - * - * @param refspec the refspec - * @return the refspec's source specifier - */ -GIT_EXTERN(const char *) git_refspec_src(const git_refspec *refspec); - -/** - * Get the destination specifier - * - * @param refspec the refspec - * @return the refspec's destination specifier - */ -GIT_EXTERN(const char *) git_refspec_dst(const git_refspec *refspec); - -/** - * Get the refspec's string - * - * @param refspec the refspec - * @returns the refspec's original string - */ -GIT_EXTERN(const char *) git_refspec_string(const git_refspec *refspec); - -/** - * Get the force update setting - * - * @param refspec the refspec - * @return 1 if force update has been set, 0 otherwise - */ -GIT_EXTERN(int) git_refspec_force(const git_refspec *refspec); - -/** - * Get the refspec's direction. - * - * @param spec refspec - * @return GIT_DIRECTION_FETCH or GIT_DIRECTION_PUSH - */ -GIT_EXTERN(git_direction) git_refspec_direction(const git_refspec *spec); - -/** - * Check if a refspec's source descriptor matches a reference - * - * @param refspec the refspec - * @param refname the name of the reference to check - * @return 1 if the refspec matches, 0 otherwise - */ -GIT_EXTERN(int) git_refspec_src_matches(const git_refspec *refspec, const char *refname); - -/** - * Check if a refspec's destination descriptor matches a reference - * - * @param refspec the refspec - * @param refname the name of the reference to check - * @return 1 if the refspec matches, 0 otherwise - */ -GIT_EXTERN(int) git_refspec_dst_matches(const git_refspec *refspec, const char *refname); - -/** - * Transform a reference to its target following the refspec's rules - * - * @param out where to store the target name - * @param spec the refspec - * @param name the name of the reference to transform - * @return 0, GIT_EBUFS or another error - */ -GIT_EXTERN(int) git_refspec_transform(git_buf *out, const git_refspec *spec, const char *name); - -/** - * Transform a target reference to its source reference following the refspec's rules - * - * @param out where to store the source reference name - * @param spec the refspec - * @param name the name of the reference to transform - * @return 0, GIT_EBUFS or another error - */ -GIT_EXTERN(int) git_refspec_rtransform(git_buf *out, const git_refspec *spec, const char *name); - -GIT_END_DECL - -#endif diff --git a/vendor/libgit2/include/git2/remote.h b/vendor/libgit2/include/git2/remote.h deleted file mode 100644 index c42d96710..000000000 --- a/vendor/libgit2/include/git2/remote.h +++ /dev/null @@ -1,811 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_git_remote_h__ -#define INCLUDE_git_remote_h__ - -#include "common.h" -#include "repository.h" -#include "refspec.h" -#include "net.h" -#include "indexer.h" -#include "strarray.h" -#include "transport.h" -#include "pack.h" - -/** - * @file git2/remote.h - * @brief Git remote management functions - * @defgroup git_remote remote management functions - * @ingroup Git - * @{ - */ -GIT_BEGIN_DECL - -typedef int (*git_remote_rename_problem_cb)(const char *problematic_refspec, void *payload); - -/** - * Add a remote with the default fetch refspec to the repository's configuration. - * - * @param out the resulting remote - * @param repo the repository in which to create the remote - * @param name the remote's name - * @param url the remote's url - * @return 0, GIT_EINVALIDSPEC, GIT_EEXISTS or an error code - */ -GIT_EXTERN(int) git_remote_create( - git_remote **out, - git_repository *repo, - const char *name, - const char *url); - -/** - * Add a remote with the provided fetch refspec (or default if NULL) to the repository's - * configuration. - * - * @param out the resulting remote - * @param repo the repository in which to create the remote - * @param name the remote's name - * @param url the remote's url - * @param fetch the remote fetch value - * @return 0, GIT_EINVALIDSPEC, GIT_EEXISTS or an error code - */ -GIT_EXTERN(int) git_remote_create_with_fetchspec( - git_remote **out, - git_repository *repo, - const char *name, - const char *url, - const char *fetch); - -/** - * Create an anonymous remote - * - * Create a remote with the given url in-memory. You can use this when - * you have a URL instead of a remote's name. - * - * @param out pointer to the new remote objects - * @param repo the associated repository - * @param url the remote repository's URL - * @return 0 or an error code - */ -GIT_EXTERN(int) git_remote_create_anonymous( - git_remote **out, - git_repository *repo, - const char *url); - -/** - * Get the information for a particular remote - * - * The name will be checked for validity. - * See `git_tag_create()` for rules about valid names. - * - * @param out pointer to the new remote object - * @param repo the associated repository - * @param name the remote's name - * @return 0, GIT_ENOTFOUND, GIT_EINVALIDSPEC or an error code - */ -GIT_EXTERN(int) git_remote_lookup(git_remote **out, git_repository *repo, const char *name); - -/** - * Create a copy of an existing remote. All internal strings are also - * duplicated. Callbacks are not duplicated. - * - * Call `git_remote_free` to free the data. - * - * @param dest pointer where to store the copy - * @param source object to copy - * @return 0 or an error code - */ -GIT_EXTERN(int) git_remote_dup(git_remote **dest, git_remote *source); - -/** - * Get the remote's repository - * - * @param remote the remote - * @return a pointer to the repository - */ -GIT_EXTERN(git_repository *) git_remote_owner(const git_remote *remote); - -/** - * Get the remote's name - * - * @param remote the remote - * @return a pointer to the name or NULL for in-memory remotes - */ -GIT_EXTERN(const char *) git_remote_name(const git_remote *remote); - -/** - * Get the remote's url - * - * If url.*.insteadOf has been configured for this URL, it will - * return the modified URL. - * - * @param remote the remote - * @return a pointer to the url - */ -GIT_EXTERN(const char *) git_remote_url(const git_remote *remote); - -/** - * Get the remote's url for pushing - * - * If url.*.pushInsteadOf has been configured for this URL, it - * will return the modified URL. - * - * @param remote the remote - * @return a pointer to the url or NULL if no special url for pushing is set - */ -GIT_EXTERN(const char *) git_remote_pushurl(const git_remote *remote); - -/** - * Set the remote's url in the configuration - * - * Remote objects already in memory will not be affected. This assumes - * the common case of a single-url remote and will otherwise return an error. - * - * @param repo the repository in which to perform the change - * @param remote the remote's name - * @param url the url to set - * @return 0 or an error value - */ -GIT_EXTERN(int) git_remote_set_url(git_repository *repo, const char *remote, const char* url); - -/** - * Set the remote's url for pushing in the configuration. - * - * Remote objects already in memory will not be affected. This assumes - * the common case of a single-url remote and will otherwise return an error. - * - * - * @param repo the repository in which to perform the change - * @param remote the remote's name - * @param url the url to set - */ -GIT_EXTERN(int) git_remote_set_pushurl(git_repository *repo, const char *remote, const char* url); - -/** - * Add a fetch refspec to the remote's configuration - * - * Add the given refspec to the fetch list in the configuration. No - * loaded remote instances will be affected. - * - * @param repo the repository in which to change the configuration - * @param remote the name of the remote to change - * @param refspec the new fetch refspec - * @return 0, GIT_EINVALIDSPEC if refspec is invalid or an error value - */ -GIT_EXTERN(int) git_remote_add_fetch(git_repository *repo, const char *remote, const char *refspec); - -/** - * Get the remote's list of fetch refspecs - * - * The memory is owned by the user and should be freed with - * `git_strarray_free`. - * - * @param array pointer to the array in which to store the strings - * @param remote the remote to query - */ -GIT_EXTERN(int) git_remote_get_fetch_refspecs(git_strarray *array, const git_remote *remote); - -/** - * Add a push refspec to the remote's configuration - * - * Add the given refspec to the push list in the configuration. No - * loaded remote instances will be affected. - * - * @param repo the repository in which to change the configuration - * @param remote the name of the remote to change - * @param refspec the new push refspec - * @return 0, GIT_EINVALIDSPEC if refspec is invalid or an error value - */ -GIT_EXTERN(int) git_remote_add_push(git_repository *repo, const char *remote, const char *refspec); - -/** - * Get the remote's list of push refspecs - * - * The memory is owned by the user and should be freed with - * `git_strarray_free`. - * - * @param array pointer to the array in which to store the strings - * @param remote the remote to query - */ -GIT_EXTERN(int) git_remote_get_push_refspecs(git_strarray *array, const git_remote *remote); - -/** - * Get the number of refspecs for a remote - * - * @param remote the remote - * @return the amount of refspecs configured in this remote - */ -GIT_EXTERN(size_t) git_remote_refspec_count(const git_remote *remote); - -/** - * Get a refspec from the remote - * - * @param remote the remote to query - * @param n the refspec to get - * @return the nth refspec - */ -GIT_EXTERN(const git_refspec *)git_remote_get_refspec(const git_remote *remote, size_t n); - -/** - * Open a connection to a remote - * - * The transport is selected based on the URL. The direction argument - * is due to a limitation of the git protocol (over TCP or SSH) which - * starts up a specific binary which can only do the one or the other. - * - * @param remote the remote to connect to - * @param direction GIT_DIRECTION_FETCH if you want to fetch or - * GIT_DIRECTION_PUSH if you want to push - * @param callbacks the callbacks to use for this connection - * @param custom_headers extra HTTP headers to use in this connection - * @return 0 or an error code - */ -GIT_EXTERN(int) git_remote_connect(git_remote *remote, git_direction direction, const git_remote_callbacks *callbacks, const git_strarray *custom_headers); - -/** - * Get the remote repository's reference advertisement list - * - * Get the list of references with which the server responds to a new - * connection. - * - * The remote (or more exactly its transport) must have connected to - * the remote repository. This list is available as soon as the - * connection to the remote is initiated and it remains available - * after disconnecting. - * - * The memory belongs to the remote. The pointer will be valid as long - * as a new connection is not initiated, but it is recommended that - * you make a copy in order to make use of the data. - * - * @param out pointer to the array - * @param size the number of remote heads - * @param remote the remote - * @return 0 on success, or an error code - */ -GIT_EXTERN(int) git_remote_ls(const git_remote_head ***out, size_t *size, git_remote *remote); - -/** - * Check whether the remote is connected - * - * Check whether the remote's underlying transport is connected to the - * remote host. - * - * @param remote the remote - * @return 1 if it's connected, 0 otherwise. - */ -GIT_EXTERN(int) git_remote_connected(const git_remote *remote); - -/** - * Cancel the operation - * - * At certain points in its operation, the network code checks whether - * the operation has been cancelled and if so stops the operation. - * - * @param remote the remote - */ -GIT_EXTERN(void) git_remote_stop(git_remote *remote); - -/** - * Disconnect from the remote - * - * Close the connection to the remote. - * - * @param remote the remote to disconnect from - */ -GIT_EXTERN(void) git_remote_disconnect(git_remote *remote); - -/** - * Free the memory associated with a remote - * - * This also disconnects from the remote, if the connection - * has not been closed yet (using git_remote_disconnect). - * - * @param remote the remote to free - */ -GIT_EXTERN(void) git_remote_free(git_remote *remote); - -/** - * Get a list of the configured remotes for a repo - * - * The string array must be freed by the user. - * - * @param out a string array which receives the names of the remotes - * @param repo the repository to query - * @return 0 or an error code - */ -GIT_EXTERN(int) git_remote_list(git_strarray *out, git_repository *repo); - -/** - * Argument to the completion callback which tells it which operation - * finished. - */ -typedef enum git_remote_completion_type { - GIT_REMOTE_COMPLETION_DOWNLOAD, - GIT_REMOTE_COMPLETION_INDEXING, - GIT_REMOTE_COMPLETION_ERROR, -} git_remote_completion_type; - -/** Push network progress notification function */ -typedef int (*git_push_transfer_progress)( - unsigned int current, - unsigned int total, - size_t bytes, - void* payload); -/** - * Represents an update which will be performed on the remote during push - */ -typedef struct { - /** - * The source name of the reference - */ - char *src_refname; - /** - * The name of the reference to update on the server - */ - char *dst_refname; - /** - * The current target of the reference - */ - git_oid src; - /** - * The new target for the reference - */ - git_oid dst; -} git_push_update; - -/** - * @param updates an array containing the updates which will be sent - * as commands to the destination. - * @param len number of elements in `updates` - * @param payload Payload provided by the caller - */ -typedef int (*git_push_negotiation)(const git_push_update **updates, size_t len, void *payload); - -/** - * The callback settings structure - * - * Set the callbacks to be called by the remote when informing the user - * about the progress of the network operations. - */ -struct git_remote_callbacks { - unsigned int version; - /** - * Textual progress from the remote. Text send over the - * progress side-band will be passed to this function (this is - * the 'counting objects' output. - */ - git_transport_message_cb sideband_progress; - - /** - * Completion is called when different parts of the download - * process are done (currently unused). - */ - int (*completion)(git_remote_completion_type type, void *data); - - /** - * This will be called if the remote host requires - * authentication in order to connect to it. - * - * Returning GIT_PASSTHROUGH will make libgit2 behave as - * though this field isn't set. - */ - git_cred_acquire_cb credentials; - - /** - * If cert verification fails, this will be called to let the - * user make the final decision of whether to allow the - * connection to proceed. Returns 1 to allow the connection, 0 - * to disallow it or a negative value to indicate an error. - */ - git_transport_certificate_check_cb certificate_check; - - /** - * During the download of new data, this will be regularly - * called with the current count of progress done by the - * indexer. - */ - git_transfer_progress_cb transfer_progress; - - /** - * Each time a reference is updated locally, this function - * will be called with information about it. - */ - int (*update_tips)(const char *refname, const git_oid *a, const git_oid *b, void *data); - - /** - * Function to call with progress information during pack - * building. Be aware that this is called inline with pack - * building operations, so performance may be affected. - */ - git_packbuilder_progress pack_progress; - - /** - * Function to call with progress information during the - * upload portion of a push. Be aware that this is called - * inline with pack building operations, so performance may be - * affected. - */ - git_push_transfer_progress push_transfer_progress; - - /** - * Called for each updated reference on push. If `status` is - * not `NULL`, the update was rejected by the remote server - * and `status` contains the reason given. - */ - int (*push_update_reference)(const char *refname, const char *status, void *data); - - /** - * Called once between the negotiation step and the upload. It - * provides information about what updates will be performed. - */ - git_push_negotiation push_negotiation; - - /** - * Create the transport to use for this operation. Leave NULL - * to auto-detect. - */ - git_transport_cb transport; - - /** - * This will be passed to each of the callbacks in this struct - * as the last parameter. - */ - void *payload; -}; - -#define GIT_REMOTE_CALLBACKS_VERSION 1 -#define GIT_REMOTE_CALLBACKS_INIT {GIT_REMOTE_CALLBACKS_VERSION} - -/** - * Initializes a `git_remote_callbacks` with default values. Equivalent to - * creating an instance with GIT_REMOTE_CALLBACKS_INIT. - * - * @param opts the `git_remote_callbacks` struct to initialize - * @param version Version of struct; pass `GIT_REMOTE_CALLBACKS_VERSION` - * @return Zero on success; -1 on failure. - */ -GIT_EXTERN(int) git_remote_init_callbacks( - git_remote_callbacks *opts, - unsigned int version); - -typedef enum { - /** - * Use the setting from the configuration - */ - GIT_FETCH_PRUNE_UNSPECIFIED, - /** - * Force pruning on - */ - GIT_FETCH_PRUNE, - /** - * Force pruning off - */ - GIT_FETCH_NO_PRUNE, -} git_fetch_prune_t; - -/** - * Automatic tag following option - * - * Lets us select the --tags option to use. - */ -typedef enum { - /** - * Use the setting from the configuration. - */ - GIT_REMOTE_DOWNLOAD_TAGS_UNSPECIFIED = 0, - /** - * Ask the server for tags pointing to objects we're already - * downloading. - */ - GIT_REMOTE_DOWNLOAD_TAGS_AUTO, - /** - * Don't ask for any tags beyond the refspecs. - */ - GIT_REMOTE_DOWNLOAD_TAGS_NONE, - /** - * Ask for the all the tags. - */ - GIT_REMOTE_DOWNLOAD_TAGS_ALL, -} git_remote_autotag_option_t; - -/** - * Fetch options structure. - * - * Zero out for defaults. Initialize with `GIT_FETCH_OPTIONS_INIT` macro to - * correctly set the `version` field. E.g. - * - * git_fetch_options opts = GIT_FETCH_OPTIONS_INIT; - */ -typedef struct { - int version; - - /** - * Callbacks to use for this fetch operation - */ - git_remote_callbacks callbacks; - - /** - * Whether to perform a prune after the fetch - */ - git_fetch_prune_t prune; - - /** - * Whether to write the results to FETCH_HEAD. Defaults to - * on. Leave this default in order to behave like git. - */ - int update_fetchhead; - - /** - * Determines how to behave regarding tags on the remote, such - * as auto-downloading tags for objects we're downloading or - * downloading all of them. - * - * The default is to auto-follow tags. - */ - git_remote_autotag_option_t download_tags; - - /** - * Extra headers for this fetch operation - */ - git_strarray custom_headers; -} git_fetch_options; - -#define GIT_FETCH_OPTIONS_VERSION 1 -#define GIT_FETCH_OPTIONS_INIT { GIT_FETCH_OPTIONS_VERSION, GIT_REMOTE_CALLBACKS_INIT, GIT_FETCH_PRUNE_UNSPECIFIED, 1 } - -/** - * Initializes a `git_fetch_options` with default values. Equivalent to - * creating an instance with GIT_FETCH_OPTIONS_INIT. - * - * @param opts the `git_push_options` instance to initialize. - * @param version the version of the struct; you should pass - * `GIT_FETCH_OPTIONS_VERSION` here. - * @return Zero on success; -1 on failure. - */ -GIT_EXTERN(int) git_fetch_init_options( - git_fetch_options *opts, - unsigned int version); - - -/** - * Controls the behavior of a git_push object. - */ -typedef struct { - unsigned int version; - - /** - * If the transport being used to push to the remote requires the creation - * of a pack file, this controls the number of worker threads used by - * the packbuilder when creating that pack file to be sent to the remote. - * - * If set to 0, the packbuilder will auto-detect the number of threads - * to create. The default value is 1. - */ - unsigned int pb_parallelism; - - /** - * Callbacks to use for this push operation - */ - git_remote_callbacks callbacks; - - /** - * Extra headers for this push operation - */ - git_strarray custom_headers; -} git_push_options; - -#define GIT_PUSH_OPTIONS_VERSION 1 -#define GIT_PUSH_OPTIONS_INIT { GIT_PUSH_OPTIONS_VERSION, 0, GIT_REMOTE_CALLBACKS_INIT } - -/** - * Initializes a `git_push_options` with default values. Equivalent to - * creating an instance with GIT_PUSH_OPTIONS_INIT. - * - * @param opts the `git_push_options` instance to initialize. - * @param version the version of the struct; you should pass - * `GIT_PUSH_OPTIONS_VERSION` here. - * @return Zero on success; -1 on failure. - */ -GIT_EXTERN(int) git_push_init_options( - git_push_options *opts, - unsigned int version); - -/** - * Download and index the packfile - * - * Connect to the remote if it hasn't been done yet, negotiate with - * the remote git which objects are missing, download and index the - * packfile. - * - * The .idx file will be created and both it and the packfile with be - * renamed to their final name. - * - * @param remote the remote - * @param refspecs the refspecs to use for this negotiation and - * download. Use NULL or an empty array to use the base refspecs - * @param opts the options to use for this fetch - * @return 0 or an error code - */ - GIT_EXTERN(int) git_remote_download(git_remote *remote, const git_strarray *refspecs, const git_fetch_options *opts); - -/** - * Create a packfile and send it to the server - * - * Connect to the remote if it hasn't been done yet, negotiate with - * the remote git which objects are missing, create a packfile with the missing objects and send it. - * - * @param remote the remote - * @param refspecs the refspecs to use for this negotiation and - * upload. Use NULL or an empty array to use the base refspecs - * @param opts the options to use for this push - * @return 0 or an error code - */ -GIT_EXTERN(int) git_remote_upload(git_remote *remote, const git_strarray *refspecs, const git_push_options *opts); - -/** - * Update the tips to the new state - * - * @param remote the remote to update - * @param reflog_message The message to insert into the reflogs. If - * NULL and fetching, the default is "fetch ", where is - * the name of the remote (or its url, for in-memory remotes). This - * parameter is ignored when pushing. - * @param callbacks pointer to the callback structure to use - * @param update_fetchhead whether to write to FETCH_HEAD. Pass 1 to behave like git. - * @param download_tags what the behaviour for downloading tags is for this fetch. This is - * ignored for push. This must be the same value passed to `git_remote_download()`. - * @return 0 or an error code - */ -GIT_EXTERN(int) git_remote_update_tips( - git_remote *remote, - const git_remote_callbacks *callbacks, - int update_fetchhead, - git_remote_autotag_option_t download_tags, - const char *reflog_message); - -/** - * Download new data and update tips - * - * Convenience function to connect to a remote, download the data, - * disconnect and update the remote-tracking branches. - * - * @param remote the remote to fetch from - * @param refspecs the refspecs to use for this fetch. Pass NULL or an - * empty array to use the base refspecs. - * @param opts options to use for this fetch - * @param reflog_message The message to insert into the reflogs. If NULL, the - * default is "fetch" - * @return 0 or an error code - */ -GIT_EXTERN(int) git_remote_fetch( - git_remote *remote, - const git_strarray *refspecs, - const git_fetch_options *opts, - const char *reflog_message); - -/** - * Prune tracking refs that are no longer present on remote - * - * @param remote the remote to prune - * @param callbacks callbacks to use for this prune - * @return 0 or an error code - */ -GIT_EXTERN(int) git_remote_prune(git_remote *remote, const git_remote_callbacks *callbacks); - -/** - * Perform a push - * - * Peform all the steps from a push. - * - * @param remote the remote to push to - * @param refspecs the refspecs to use for pushing. If none are - * passed, the configured refspecs will be used - * @param opts options to use for this push - */ -GIT_EXTERN(int) git_remote_push(git_remote *remote, - const git_strarray *refspecs, - const git_push_options *opts); - -/** - * Get the statistics structure that is filled in by the fetch operation. - */ -GIT_EXTERN(const git_transfer_progress *) git_remote_stats(git_remote *remote); - -/** - * Retrieve the tag auto-follow setting - * - * @param remote the remote to query - * @return the auto-follow setting - */ -GIT_EXTERN(git_remote_autotag_option_t) git_remote_autotag(const git_remote *remote); - -/** - * Set the remote's tag following setting. - * - * The change will be made in the configuration. No loaded remotes - * will be affected. - * - * @param repo the repository in which to make the change - * @param remote the name of the remote - * @param value the new value to take. - */ -GIT_EXTERN(int) git_remote_set_autotag(git_repository *repo, const char *remote, git_remote_autotag_option_t value); -/** - * Retrieve the ref-prune setting - * - * @param remote the remote to query - * @return the ref-prune setting - */ -GIT_EXTERN(int) git_remote_prune_refs(const git_remote *remote); - -/** - * Give the remote a new name - * - * All remote-tracking branches and configuration settings - * for the remote are updated. - * - * The new name will be checked for validity. - * See `git_tag_create()` for rules about valid names. - * - * No loaded instances of a the remote with the old name will change - * their name or their list of refspecs. - * - * @param problems non-default refspecs cannot be renamed and will be - * stored here for further processing by the caller. Always free this - * strarray on successful return. - * @param repo the repository in which to rename - * @param name the current name of the remote - * @param new_name the new name the remote should bear - * @return 0, GIT_EINVALIDSPEC, GIT_EEXISTS or an error code - */ -GIT_EXTERN(int) git_remote_rename( - git_strarray *problems, - git_repository *repo, - const char *name, - const char *new_name); - -/** - * Ensure the remote name is well-formed. - * - * @param remote_name name to be checked. - * @return 1 if the reference name is acceptable; 0 if it isn't - */ -GIT_EXTERN(int) git_remote_is_valid_name(const char *remote_name); - -/** -* Delete an existing persisted remote. -* -* All remote-tracking branches and configuration settings -* for the remote will be removed. -* -* @param repo the repository in which to act -* @param name the name of the remove to delete -* @return 0 on success, or an error code. -*/ -GIT_EXTERN(int) git_remote_delete(git_repository *repo, const char *name); - -/** - * Retrieve the name of the remote's default branch - * - * The default branch of a repository is the branch which HEAD points - * to. If the remote does not support reporting this information - * directly, it performs the guess as git does; that is, if there are - * multiple branches which point to the same commit, the first one is - * chosen. If the master branch is a candidate, it wins. - * - * This function must only be called after connecting. - * - * @param out the buffern in which to store the reference name - * @param remote the remote - * @return 0, GIT_ENOTFOUND if the remote does not have any references - * or none of them point to HEAD's commit, or an error message. - */ -GIT_EXTERN(int) git_remote_default_branch(git_buf *out, git_remote *remote); - -/** @} */ -GIT_END_DECL -#endif diff --git a/vendor/libgit2/include/git2/repository.h b/vendor/libgit2/include/git2/repository.h deleted file mode 100644 index 85b7e6861..000000000 --- a/vendor/libgit2/include/git2/repository.h +++ /dev/null @@ -1,756 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_git_repository_h__ -#define INCLUDE_git_repository_h__ - -#include "common.h" -#include "types.h" -#include "oid.h" -#include "buffer.h" - -/** - * @file git2/repository.h - * @brief Git repository management routines - * @defgroup git_repository Git repository management routines - * @ingroup Git - * @{ - */ -GIT_BEGIN_DECL - -/** - * Open a git repository. - * - * The 'path' argument must point to either a git repository - * folder, or an existing work dir. - * - * The method will automatically detect if 'path' is a normal - * or bare repository or fail is 'path' is neither. - * - * @param out pointer to the repo which will be opened - * @param path the path to the repository - * @return 0 or an error code - */ -GIT_EXTERN(int) git_repository_open(git_repository **out, const char *path); - -/** - * Create a "fake" repository to wrap an object database - * - * Create a repository object to wrap an object database to be used - * with the API when all you have is an object database. This doesn't - * have any paths associated with it, so use with care. - * - * @param out pointer to the repo - * @param odb the object database to wrap - * @return 0 or an error code - */ -GIT_EXTERN(int) git_repository_wrap_odb(git_repository **out, git_odb *odb); - -/** - * Look for a git repository and copy its path in the given buffer. - * The lookup start from base_path and walk across parent directories - * if nothing has been found. The lookup ends when the first repository - * is found, or when reaching a directory referenced in ceiling_dirs - * or when the filesystem changes (in case across_fs is true). - * - * The method will automatically detect if the repository is bare - * (if there is a repository). - * - * @param out A pointer to a user-allocated git_buf which will contain - * the found path. - * - * @param start_path The base path where the lookup starts. - * - * @param across_fs If true, then the lookup will not stop when a - * filesystem device change is detected while exploring parent directories. - * - * @param ceiling_dirs A GIT_PATH_LIST_SEPARATOR separated list of - * absolute symbolic link free paths. The lookup will stop when any - * of this paths is reached. Note that the lookup always performs on - * start_path no matter start_path appears in ceiling_dirs ceiling_dirs - * might be NULL (which is equivalent to an empty string) - * - * @return 0 or an error code - */ -GIT_EXTERN(int) git_repository_discover( - git_buf *out, - const char *start_path, - int across_fs, - const char *ceiling_dirs); - -/** - * Option flags for `git_repository_open_ext`. - * - * * GIT_REPOSITORY_OPEN_NO_SEARCH - Only open the repository if it can be - * immediately found in the start_path. Do not walk up from the - * start_path looking at parent directories. - * * GIT_REPOSITORY_OPEN_CROSS_FS - Unless this flag is set, open will not - * continue searching across filesystem boundaries (i.e. when `st_dev` - * changes from the `stat` system call). (E.g. Searching in a user's home - * directory "/home/user/source/" will not return "/.git/" as the found - * repo if "/" is a different filesystem than "/home".) - * * GIT_REPOSITORY_OPEN_BARE - Open repository as a bare repo regardless - * of core.bare config, and defer loading config file for faster setup. - * Unlike `git_repository_open_bare`, this can follow gitlinks. - */ -typedef enum { - GIT_REPOSITORY_OPEN_NO_SEARCH = (1 << 0), - GIT_REPOSITORY_OPEN_CROSS_FS = (1 << 1), - GIT_REPOSITORY_OPEN_BARE = (1 << 2), -} git_repository_open_flag_t; - -/** - * Find and open a repository with extended controls. - * - * @param out Pointer to the repo which will be opened. This can - * actually be NULL if you only want to use the error code to - * see if a repo at this path could be opened. - * @param path Path to open as git repository. If the flags - * permit "searching", then this can be a path to a subdirectory - * inside the working directory of the repository. - * @param flags A combination of the GIT_REPOSITORY_OPEN flags above. - * @param ceiling_dirs A GIT_PATH_LIST_SEPARATOR delimited list of path - * prefixes at which the search for a containing repository should - * terminate. - * @return 0 on success, GIT_ENOTFOUND if no repository could be found, - * or -1 if there was a repository but open failed for some reason - * (such as repo corruption or system errors). - */ -GIT_EXTERN(int) git_repository_open_ext( - git_repository **out, - const char *path, - unsigned int flags, - const char *ceiling_dirs); - -/** - * Open a bare repository on the serverside. - * - * This is a fast open for bare repositories that will come in handy - * if you're e.g. hosting git repositories and need to access them - * efficiently - * - * @param out Pointer to the repo which will be opened. - * @param bare_path Direct path to the bare repository - * @return 0 on success, or an error code - */ -GIT_EXTERN(int) git_repository_open_bare(git_repository **out, const char *bare_path); - -/** - * Free a previously allocated repository - * - * Note that after a repository is free'd, all the objects it has spawned - * will still exist until they are manually closed by the user - * with `git_object_free`, but accessing any of the attributes of - * an object without a backing repository will result in undefined - * behavior - * - * @param repo repository handle to close. If NULL nothing occurs. - */ -GIT_EXTERN(void) git_repository_free(git_repository *repo); - -/** - * Creates a new Git repository in the given folder. - * - * TODO: - * - Reinit the repository - * - * @param out pointer to the repo which will be created or reinitialized - * @param path the path to the repository - * @param is_bare if true, a Git repository without a working directory is - * created at the pointed path. If false, provided path will be - * considered as the working directory into which the .git directory - * will be created. - * - * @return 0 or an error code - */ -GIT_EXTERN(int) git_repository_init( - git_repository **out, - const char *path, - unsigned is_bare); - -/** - * Option flags for `git_repository_init_ext`. - * - * These flags configure extra behaviors to `git_repository_init_ext`. - * In every case, the default behavior is the zero value (i.e. flag is - * not set). Just OR the flag values together for the `flags` parameter - * when initializing a new repo. Details of individual values are: - * - * * BARE - Create a bare repository with no working directory. - * * NO_REINIT - Return an GIT_EEXISTS error if the repo_path appears to - * already be an git repository. - * * NO_DOTGIT_DIR - Normally a "/.git/" will be appended to the repo - * path for non-bare repos (if it is not already there), but - * passing this flag prevents that behavior. - * * MKDIR - Make the repo_path (and workdir_path) as needed. Init is - * always willing to create the ".git" directory even without this - * flag. This flag tells init to create the trailing component of - * the repo and workdir paths as needed. - * * MKPATH - Recursively make all components of the repo and workdir - * paths as necessary. - * * EXTERNAL_TEMPLATE - libgit2 normally uses internal templates to - * initialize a new repo. This flags enables external templates, - * looking the "template_path" from the options if set, or the - * `init.templatedir` global config if not, or falling back on - * "/usr/share/git-core/templates" if it exists. - * * GIT_REPOSITORY_INIT_RELATIVE_GITLINK - If an alternate workdir is - * specified, use relative paths for the gitdir and core.worktree. - */ -typedef enum { - GIT_REPOSITORY_INIT_BARE = (1u << 0), - GIT_REPOSITORY_INIT_NO_REINIT = (1u << 1), - GIT_REPOSITORY_INIT_NO_DOTGIT_DIR = (1u << 2), - GIT_REPOSITORY_INIT_MKDIR = (1u << 3), - GIT_REPOSITORY_INIT_MKPATH = (1u << 4), - GIT_REPOSITORY_INIT_EXTERNAL_TEMPLATE = (1u << 5), - GIT_REPOSITORY_INIT_RELATIVE_GITLINK = (1u << 6), -} git_repository_init_flag_t; - -/** - * Mode options for `git_repository_init_ext`. - * - * Set the mode field of the `git_repository_init_options` structure - * either to the custom mode that you would like, or to one of the - * following modes: - * - * * SHARED_UMASK - Use permissions configured by umask - the default. - * * SHARED_GROUP - Use "--shared=group" behavior, chmod'ing the new repo - * to be group writable and "g+sx" for sticky group assignment. - * * SHARED_ALL - Use "--shared=all" behavior, adding world readability. - * * Anything else - Set to custom value. - */ -typedef enum { - GIT_REPOSITORY_INIT_SHARED_UMASK = 0, - GIT_REPOSITORY_INIT_SHARED_GROUP = 0002775, - GIT_REPOSITORY_INIT_SHARED_ALL = 0002777, -} git_repository_init_mode_t; - -/** - * Extended options structure for `git_repository_init_ext`. - * - * This contains extra options for `git_repository_init_ext` that enable - * additional initialization features. The fields are: - * - * * flags - Combination of GIT_REPOSITORY_INIT flags above. - * * mode - Set to one of the standard GIT_REPOSITORY_INIT_SHARED_... - * constants above, or to a custom value that you would like. - * * workdir_path - The path to the working dir or NULL for default (i.e. - * repo_path parent on non-bare repos). IF THIS IS RELATIVE PATH, - * IT WILL BE EVALUATED RELATIVE TO THE REPO_PATH. If this is not - * the "natural" working directory, a .git gitlink file will be - * created here linking to the repo_path. - * * description - If set, this will be used to initialize the "description" - * file in the repository, instead of using the template content. - * * template_path - When GIT_REPOSITORY_INIT_EXTERNAL_TEMPLATE is set, - * this contains the path to use for the template directory. If - * this is NULL, the config or default directory options will be - * used instead. - * * initial_head - The name of the head to point HEAD at. If NULL, then - * this will be treated as "master" and the HEAD ref will be set - * to "refs/heads/master". If this begins with "refs/" it will be - * used verbatim; otherwise "refs/heads/" will be prefixed. - * * origin_url - If this is non-NULL, then after the rest of the - * repository initialization is completed, an "origin" remote - * will be added pointing to this URL. - */ -typedef struct { - unsigned int version; - uint32_t flags; - uint32_t mode; - const char *workdir_path; - const char *description; - const char *template_path; - const char *initial_head; - const char *origin_url; -} git_repository_init_options; - -#define GIT_REPOSITORY_INIT_OPTIONS_VERSION 1 -#define GIT_REPOSITORY_INIT_OPTIONS_INIT {GIT_REPOSITORY_INIT_OPTIONS_VERSION} - -/** - * Initializes a `git_repository_init_options` with default values. Equivalent - * to creating an instance with GIT_REPOSITORY_INIT_OPTIONS_INIT. - * - * @param opts the `git_repository_init_options` struct to initialize - * @param version Version of struct; pass `GIT_REPOSITORY_INIT_OPTIONS_VERSION` - * @return Zero on success; -1 on failure. - */ -GIT_EXTERN(int) git_repository_init_init_options( - git_repository_init_options *opts, - unsigned int version); - -/** - * Create a new Git repository in the given folder with extended controls. - * - * This will initialize a new git repository (creating the repo_path - * if requested by flags) and working directory as needed. It will - * auto-detect the case sensitivity of the file system and if the - * file system supports file mode bits correctly. - * - * @param out Pointer to the repo which will be created or reinitialized. - * @param repo_path The path to the repository. - * @param opts Pointer to git_repository_init_options struct. - * @return 0 or an error code on failure. - */ -GIT_EXTERN(int) git_repository_init_ext( - git_repository **out, - const char *repo_path, - git_repository_init_options *opts); - -/** - * Retrieve and resolve the reference pointed at by HEAD. - * - * The returned `git_reference` will be owned by caller and - * `git_reference_free()` must be called when done with it to release the - * allocated memory and prevent a leak. - * - * @param out pointer to the reference which will be retrieved - * @param repo a repository object - * - * @return 0 on success, GIT_EUNBORNBRANCH when HEAD points to a non existing - * branch, GIT_ENOTFOUND when HEAD is missing; an error code otherwise - */ -GIT_EXTERN(int) git_repository_head(git_reference **out, git_repository *repo); - -/** - * Check if a repository's HEAD is detached - * - * A repository's HEAD is detached when it points directly to a commit - * instead of a branch. - * - * @param repo Repo to test - * @return 1 if HEAD is detached, 0 if it's not; error code if there - * was an error. - */ -GIT_EXTERN(int) git_repository_head_detached(git_repository *repo); - -/** - * Check if the current branch is unborn - * - * An unborn branch is one named from HEAD but which doesn't exist in - * the refs namespace, because it doesn't have any commit to point to. - * - * @param repo Repo to test - * @return 1 if the current branch is unborn, 0 if it's not; error - * code if there was an error - */ -GIT_EXTERN(int) git_repository_head_unborn(git_repository *repo); - -/** - * Check if a repository is empty - * - * An empty repository has just been initialized and contains no references - * apart from HEAD, which must be pointing to the unborn master branch. - * - * @param repo Repo to test - * @return 1 if the repository is empty, 0 if it isn't, error code - * if the repository is corrupted - */ -GIT_EXTERN(int) git_repository_is_empty(git_repository *repo); - -/** - * Get the path of this repository - * - * This is the path of the `.git` folder for normal repositories, - * or of the repository itself for bare repositories. - * - * @param repo A repository object - * @return the path to the repository - */ -GIT_EXTERN(const char *) git_repository_path(git_repository *repo); - -/** - * Get the path of the working directory for this repository - * - * If the repository is bare, this function will always return - * NULL. - * - * @param repo A repository object - * @return the path to the working dir, if it exists - */ -GIT_EXTERN(const char *) git_repository_workdir(git_repository *repo); - -/** - * Set the path to the working directory for this repository - * - * The working directory doesn't need to be the same one - * that contains the `.git` folder for this repository. - * - * If this repository is bare, setting its working directory - * will turn it into a normal repository, capable of performing - * all the common workdir operations (checkout, status, index - * manipulation, etc). - * - * @param repo A repository object - * @param workdir The path to a working directory - * @param update_gitlink Create/update gitlink in workdir and set config - * "core.worktree" (if workdir is not the parent of the .git directory) - * @return 0, or an error code - */ -GIT_EXTERN(int) git_repository_set_workdir( - git_repository *repo, const char *workdir, int update_gitlink); - -/** - * Check if a repository is bare - * - * @param repo Repo to test - * @return 1 if the repository is bare, 0 otherwise. - */ -GIT_EXTERN(int) git_repository_is_bare(git_repository *repo); - -/** - * Get the configuration file for this repository. - * - * If a configuration file has not been set, the default - * config set for the repository will be returned, including - * global and system configurations (if they are available). - * - * The configuration file must be freed once it's no longer - * being used by the user. - * - * @param out Pointer to store the loaded configuration - * @param repo A repository object - * @return 0, or an error code - */ -GIT_EXTERN(int) git_repository_config(git_config **out, git_repository *repo); - -/** - * Get a snapshot of the repository's configuration - * - * Convenience function to take a snapshot from the repository's - * configuration. The contents of this snapshot will not change, - * even if the underlying config files are modified. - * - * The configuration file must be freed once it's no longer - * being used by the user. - * - * @param out Pointer to store the loaded configuration - * @param repo the repository - * @return 0, or an error code - */ -GIT_EXTERN(int) git_repository_config_snapshot(git_config **out, git_repository *repo); - -/** - * Get the Object Database for this repository. - * - * If a custom ODB has not been set, the default - * database for the repository will be returned (the one - * located in `.git/objects`). - * - * The ODB must be freed once it's no longer being used by - * the user. - * - * @param out Pointer to store the loaded ODB - * @param repo A repository object - * @return 0, or an error code - */ -GIT_EXTERN(int) git_repository_odb(git_odb **out, git_repository *repo); - -/** - * Get the Reference Database Backend for this repository. - * - * If a custom refsdb has not been set, the default database for - * the repository will be returned (the one that manipulates loose - * and packed references in the `.git` directory). - * - * The refdb must be freed once it's no longer being used by - * the user. - * - * @param out Pointer to store the loaded refdb - * @param repo A repository object - * @return 0, or an error code - */ -GIT_EXTERN(int) git_repository_refdb(git_refdb **out, git_repository *repo); - -/** - * Get the Index file for this repository. - * - * If a custom index has not been set, the default - * index for the repository will be returned (the one - * located in `.git/index`). - * - * The index must be freed once it's no longer being used by - * the user. - * - * @param out Pointer to store the loaded index - * @param repo A repository object - * @return 0, or an error code - */ -GIT_EXTERN(int) git_repository_index(git_index **out, git_repository *repo); - -/** - * Retrieve git's prepared message - * - * Operations such as git revert/cherry-pick/merge with the -n option - * stop just short of creating a commit with the changes and save - * their prepared message in .git/MERGE_MSG so the next git-commit - * execution can present it to the user for them to amend if they - * wish. - * - * Use this function to get the contents of this file. Don't forget to - * remove the file after you create the commit. - * - * @param out git_buf to write data into - * @param repo Repository to read prepared message from - * @return 0, GIT_ENOTFOUND if no message exists or an error code - */ -GIT_EXTERN(int) git_repository_message(git_buf *out, git_repository *repo); - -/** - * Remove git's prepared message. - * - * Remove the message that `git_repository_message` retrieves. - */ -GIT_EXTERN(int) git_repository_message_remove(git_repository *repo); - -/** - * Remove all the metadata associated with an ongoing command like merge, - * revert, cherry-pick, etc. For example: MERGE_HEAD, MERGE_MSG, etc. - * - * @param repo A repository object - * @return 0 on success, or error - */ -GIT_EXTERN(int) git_repository_state_cleanup(git_repository *repo); - -typedef int (*git_repository_fetchhead_foreach_cb)(const char *ref_name, - const char *remote_url, - const git_oid *oid, - unsigned int is_merge, - void *payload); - -/** - * Invoke 'callback' for each entry in the given FETCH_HEAD file. - * - * Return a non-zero value from the callback to stop the loop. - * - * @param repo A repository object - * @param callback Callback function - * @param payload Pointer to callback data (optional) - * @return 0 on success, non-zero callback return value, GIT_ENOTFOUND if - * there is no FETCH_HEAD file, or other error code. - */ -GIT_EXTERN(int) git_repository_fetchhead_foreach( - git_repository *repo, - git_repository_fetchhead_foreach_cb callback, - void *payload); - -typedef int (*git_repository_mergehead_foreach_cb)(const git_oid *oid, - void *payload); - -/** - * If a merge is in progress, invoke 'callback' for each commit ID in the - * MERGE_HEAD file. - * - * Return a non-zero value from the callback to stop the loop. - * - * @param repo A repository object - * @param callback Callback function - * @param payload Pointer to callback data (optional) - * @return 0 on success, non-zero callback return value, GIT_ENOTFOUND if - * there is no MERGE_HEAD file, or other error code. - */ -GIT_EXTERN(int) git_repository_mergehead_foreach( - git_repository *repo, - git_repository_mergehead_foreach_cb callback, - void *payload); - -/** - * Calculate hash of file using repository filtering rules. - * - * If you simply want to calculate the hash of a file on disk with no filters, - * you can just use the `git_odb_hashfile()` API. However, if you want to - * hash a file in the repository and you want to apply filtering rules (e.g. - * crlf filters) before generating the SHA, then use this function. - * - * Note: if the repository has `core.safecrlf` set to fail and the - * filtering triggers that failure, then this function will return an - * error and not calculate the hash of the file. - * - * @param out Output value of calculated SHA - * @param repo Repository pointer - * @param path Path to file on disk whose contents should be hashed. If the - * repository is not NULL, this can be a relative path. - * @param type The object type to hash as (e.g. GIT_OBJ_BLOB) - * @param as_path The path to use to look up filtering rules. If this is - * NULL, then the `path` parameter will be used instead. If - * this is passed as the empty string, then no filters will be - * applied when calculating the hash. - * @return 0 on success, or an error code - */ -GIT_EXTERN(int) git_repository_hashfile( - git_oid *out, - git_repository *repo, - const char *path, - git_otype type, - const char *as_path); - -/** - * Make the repository HEAD point to the specified reference. - * - * If the provided reference points to a Tree or a Blob, the HEAD is - * unaltered and -1 is returned. - * - * If the provided reference points to a branch, the HEAD will point - * to that branch, staying attached, or become attached if it isn't yet. - * If the branch doesn't exist yet, no error will be return. The HEAD - * will then be attached to an unborn branch. - * - * Otherwise, the HEAD will be detached and will directly point to - * the Commit. - * - * @param repo Repository pointer - * @param refname Canonical name of the reference the HEAD should point at - * @return 0 on success, or an error code - */ -GIT_EXTERN(int) git_repository_set_head( - git_repository* repo, - const char* refname); - -/** - * Make the repository HEAD directly point to the Commit. - * - * If the provided committish cannot be found in the repository, the HEAD - * is unaltered and GIT_ENOTFOUND is returned. - * - * If the provided commitish cannot be peeled into a commit, the HEAD - * is unaltered and -1 is returned. - * - * Otherwise, the HEAD will eventually be detached and will directly point to - * the peeled Commit. - * - * @param repo Repository pointer - * @param commitish Object id of the Commit the HEAD should point to - * @return 0 on success, or an error code - */ -GIT_EXTERN(int) git_repository_set_head_detached( - git_repository* repo, - const git_oid* commitish); - -/** - * Make the repository HEAD directly point to the Commit. - * - * This behaves like `git_repository_set_head_detached()` but takes an - * annotated commit, which lets you specify which extended sha syntax - * string was specified by a user, allowing for more exact reflog - * messages. - * - * See the documentation for `git_repository_set_head_detached()`. - * - * @see git_repository_set_head_detached - */ -GIT_EXTERN(int) git_repository_set_head_detached_from_annotated( - git_repository *repo, - const git_annotated_commit *commitish); - -/** - * Detach the HEAD. - * - * If the HEAD is already detached and points to a Commit, 0 is returned. - * - * If the HEAD is already detached and points to a Tag, the HEAD is - * updated into making it point to the peeled Commit, and 0 is returned. - * - * If the HEAD is already detached and points to a non commitish, the HEAD is - * unaltered, and -1 is returned. - * - * Otherwise, the HEAD will be detached and point to the peeled Commit. - * - * @param repo Repository pointer - * @return 0 on success, GIT_EUNBORNBRANCH when HEAD points to a non existing - * branch or an error code - */ -GIT_EXTERN(int) git_repository_detach_head( - git_repository* repo); - -/** - * Repository state - * - * These values represent possible states for the repository to be in, - * based on the current operation which is ongoing. - */ -typedef enum { - GIT_REPOSITORY_STATE_NONE, - GIT_REPOSITORY_STATE_MERGE, - GIT_REPOSITORY_STATE_REVERT, - GIT_REPOSITORY_STATE_REVERT_SEQUENCE, - GIT_REPOSITORY_STATE_CHERRYPICK, - GIT_REPOSITORY_STATE_CHERRYPICK_SEQUENCE, - GIT_REPOSITORY_STATE_BISECT, - GIT_REPOSITORY_STATE_REBASE, - GIT_REPOSITORY_STATE_REBASE_INTERACTIVE, - GIT_REPOSITORY_STATE_REBASE_MERGE, - GIT_REPOSITORY_STATE_APPLY_MAILBOX, - GIT_REPOSITORY_STATE_APPLY_MAILBOX_OR_REBASE, -} git_repository_state_t; - -/** - * Determines the status of a git repository - ie, whether an operation - * (merge, cherry-pick, etc) is in progress. - * - * @param repo Repository pointer - * @return The state of the repository - */ -GIT_EXTERN(int) git_repository_state(git_repository *repo); - -/** - * Sets the active namespace for this Git Repository - * - * This namespace affects all reference operations for the repo. - * See `man gitnamespaces` - * - * @param repo The repo - * @param nmspace The namespace. This should not include the refs - * folder, e.g. to namespace all references under `refs/namespaces/foo/`, - * use `foo` as the namespace. - * @return 0 on success, -1 on error - */ -GIT_EXTERN(int) git_repository_set_namespace(git_repository *repo, const char *nmspace); - -/** - * Get the currently active namespace for this repository - * - * @param repo The repo - * @return the active namespace, or NULL if there isn't one - */ -GIT_EXTERN(const char *) git_repository_get_namespace(git_repository *repo); - - -/** - * Determine if the repository was a shallow clone - * - * @param repo The repository - * @return 1 if shallow, zero if not - */ -GIT_EXTERN(int) git_repository_is_shallow(git_repository *repo); - -/** - * Retrieve the configured identity to use for reflogs - * - * The memory is owned by the repository and must not be freed by the - * user. - * - * @param name where to store the pointer to the name - * @param email where to store the pointer to the email - * @param repo the repository - */ -GIT_EXTERN(int) git_repository_ident(const char **name, const char **email, const git_repository *repo); - -/** - * Set the identity to be used for writing reflogs - * - * If both are set, this name and email will be used to write to the - * reflog. Pass NULL to unset. When unset, the identity will be taken - * from the repository's configuration. - * - * @param repo the repository to configure - * @param name the name to use for the reflog entries - * @param email the email to use for the reflog entries - */ -GIT_EXTERN(int) git_repository_set_ident(git_repository *repo, const char *name, const char *email); - -/** @} */ -GIT_END_DECL -#endif diff --git a/vendor/libgit2/include/git2/reset.h b/vendor/libgit2/include/git2/reset.h deleted file mode 100644 index 79075291f..000000000 --- a/vendor/libgit2/include/git2/reset.h +++ /dev/null @@ -1,111 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_git_reset_h__ -#define INCLUDE_git_reset_h__ - -#include "common.h" -#include "types.h" -#include "strarray.h" -#include "checkout.h" - -/** - * @file git2/reset.h - * @brief Git reset management routines - * @ingroup Git - * @{ - */ -GIT_BEGIN_DECL - -/** - * Kinds of reset operation - */ -typedef enum { - GIT_RESET_SOFT = 1, /**< Move the head to the given commit */ - GIT_RESET_MIXED = 2, /**< SOFT plus reset index to the commit */ - GIT_RESET_HARD = 3, /**< MIXED plus changes in working tree discarded */ -} git_reset_t; - -/** - * Sets the current head to the specified commit oid and optionally - * resets the index and working tree to match. - * - * SOFT reset means the Head will be moved to the commit. - * - * MIXED reset will trigger a SOFT reset, plus the index will be replaced - * with the content of the commit tree. - * - * HARD reset will trigger a MIXED reset and the working directory will be - * replaced with the content of the index. (Untracked and ignored files - * will be left alone, however.) - * - * TODO: Implement remaining kinds of resets. - * - * @param repo Repository where to perform the reset operation. - * - * @param target Committish to which the Head should be moved to. This object - * must belong to the given `repo` and can either be a git_commit or a - * git_tag. When a git_tag is being passed, it should be dereferencable - * to a git_commit which oid will be used as the target of the branch. - * - * @param reset_type Kind of reset operation to perform. - * - * @param checkout_opts Checkout options to be used for a HARD reset. - * The checkout_strategy field will be overridden (based on reset_type). - * This parameter can be used to propagate notify and progress callbacks. - * - * @return 0 on success or an error code - */ -GIT_EXTERN(int) git_reset( - git_repository *repo, - git_object *target, - git_reset_t reset_type, - const git_checkout_options *checkout_opts); - -/** - * Sets the current head to the specified commit oid and optionally - * resets the index and working tree to match. - * - * This behaves like `git_reset()` but takes an annotated commit, - * which lets you specify which extended sha syntax string was - * specified by a user, allowing for more exact reflog messages. - * - * See the documentation for `git_reset()`. - * - * @see git_reset - */ -GIT_EXTERN(int) git_reset_from_annotated( - git_repository *repo, - git_annotated_commit *commit, - git_reset_t reset_type, - const git_checkout_options *checkout_opts); - -/** - * Updates some entries in the index from the target commit tree. - * - * The scope of the updated entries is determined by the paths - * being passed in the `pathspec` parameters. - * - * Passing a NULL `target` will result in removing - * entries in the index matching the provided pathspecs. - * - * @param repo Repository where to perform the reset operation. - * - * @param target The committish which content will be used to reset the content - * of the index. - * - * @param pathspecs List of pathspecs to operate on. - * - * @return 0 on success or an error code < 0 - */ -GIT_EXTERN(int) git_reset_default( - git_repository *repo, - git_object *target, - git_strarray* pathspecs); - -/** @} */ -GIT_END_DECL -#endif diff --git a/vendor/libgit2/include/git2/revert.h b/vendor/libgit2/include/git2/revert.h deleted file mode 100644 index 2de194219..000000000 --- a/vendor/libgit2/include/git2/revert.h +++ /dev/null @@ -1,89 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_git_revert_h__ -#define INCLUDE_git_revert_h__ - -#include "common.h" -#include "types.h" -#include "merge.h" - -/** - * @file git2/revert.h - * @brief Git revert routines - * @defgroup git_revert Git revert routines - * @ingroup Git - * @{ - */ -GIT_BEGIN_DECL - -/** - * Options for revert - */ -typedef struct { - unsigned int version; - - /** For merge commits, the "mainline" is treated as the parent. */ - unsigned int mainline; - - git_merge_options merge_opts; /**< Options for the merging */ - git_checkout_options checkout_opts; /**< Options for the checkout */ -} git_revert_options; - -#define GIT_REVERT_OPTIONS_VERSION 1 -#define GIT_REVERT_OPTIONS_INIT {GIT_REVERT_OPTIONS_VERSION, 0, GIT_MERGE_OPTIONS_INIT, GIT_CHECKOUT_OPTIONS_INIT} - -/** - * Initializes a `git_revert_options` with default values. Equivalent to - * creating an instance with GIT_REVERT_OPTIONS_INIT. - * - * @param opts the `git_revert_options` struct to initialize - * @param version Version of struct; pass `GIT_REVERT_OPTIONS_VERSION` - * @return Zero on success; -1 on failure. - */ -GIT_EXTERN(int) git_revert_init_options( - git_revert_options *opts, - unsigned int version); - -/** - * Reverts the given commit against the given "our" commit, producing an - * index that reflects the result of the revert. - * - * The returned index must be freed explicitly with `git_index_free`. - * - * @param out pointer to store the index result in - * @param repo the repository that contains the given commits - * @param revert_commit the commit to revert - * @param our_commit the commit to revert against (eg, HEAD) - * @param mainline the parent of the revert commit, if it is a merge - * @param merge_options the merge options (or null for defaults) - * @return zero on success, -1 on failure. - */ -GIT_EXTERN(int) git_revert_commit( - git_index **out, - git_repository *repo, - git_commit *revert_commit, - git_commit *our_commit, - unsigned int mainline, - const git_merge_options *merge_options); - -/** - * Reverts the given commit, producing changes in the index and working directory. - * - * @param repo the repository to revert - * @param commit the commit to revert - * @param given_opts merge flags - * @return zero on success, -1 on failure. - */ -GIT_EXTERN(int) git_revert( - git_repository *repo, - git_commit *commit, - const git_revert_options *given_opts); - -/** @} */ -GIT_END_DECL -#endif - diff --git a/vendor/libgit2/include/git2/revparse.h b/vendor/libgit2/include/git2/revparse.h deleted file mode 100644 index d170e1621..000000000 --- a/vendor/libgit2/include/git2/revparse.h +++ /dev/null @@ -1,113 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_git_revparse_h__ -#define INCLUDE_git_revparse_h__ - -#include "common.h" -#include "types.h" - -/** - * @file git2/revparse.h - * @brief Git revision parsing routines - * @defgroup git_revparse Git revision parsing routines - * @ingroup Git - * @{ - */ -GIT_BEGIN_DECL - -/** - * Find a single object, as specified by a revision string. - * - * See `man gitrevisions`, or - * http://git-scm.com/docs/git-rev-parse.html#_specifying_revisions for - * information on the syntax accepted. - * - * The returned object should be released with `git_object_free` when no - * longer needed. - * - * @param out pointer to output object - * @param repo the repository to search in - * @param spec the textual specification for an object - * @return 0 on success, GIT_ENOTFOUND, GIT_EAMBIGUOUS, GIT_EINVALIDSPEC or an error code - */ -GIT_EXTERN(int) git_revparse_single( - git_object **out, git_repository *repo, const char *spec); - -/** - * Find a single object and intermediate reference by a revision string. - * - * See `man gitrevisions`, or - * http://git-scm.com/docs/git-rev-parse.html#_specifying_revisions for - * information on the syntax accepted. - * - * In some cases (`@{<-n>}` or `@{upstream}`), the expression may - * point to an intermediate reference. When such expressions are being passed - * in, `reference_out` will be valued as well. - * - * The returned object should be released with `git_object_free` and the - * returned reference with `git_reference_free` when no longer needed. - * - * @param object_out pointer to output object - * @param reference_out pointer to output reference or NULL - * @param repo the repository to search in - * @param spec the textual specification for an object - * @return 0 on success, GIT_ENOTFOUND, GIT_EAMBIGUOUS, GIT_EINVALIDSPEC - * or an error code - */ -GIT_EXTERN(int) git_revparse_ext( - git_object **object_out, - git_reference **reference_out, - git_repository *repo, - const char *spec); - -/** - * Revparse flags. These indicate the intended behavior of the spec passed to - * git_revparse. - */ -typedef enum { - /** The spec targeted a single object. */ - GIT_REVPARSE_SINGLE = 1 << 0, - /** The spec targeted a range of commits. */ - GIT_REVPARSE_RANGE = 1 << 1, - /** The spec used the '...' operator, which invokes special semantics. */ - GIT_REVPARSE_MERGE_BASE = 1 << 2, -} git_revparse_mode_t; - -/** - * Git Revision Spec: output of a `git_revparse` operation - */ -typedef struct { - /** The left element of the revspec; must be freed by the user */ - git_object *from; - /** The right element of the revspec; must be freed by the user */ - git_object *to; - /** The intent of the revspec (i.e. `git_revparse_mode_t` flags) */ - unsigned int flags; -} git_revspec; - -/** - * Parse a revision string for `from`, `to`, and intent. - * - * See `man gitrevisions` or - * http://git-scm.com/docs/git-rev-parse.html#_specifying_revisions for - * information on the syntax accepted. - * - * @param revspec Pointer to an user-allocated git_revspec struct where - * the result of the rev-parse will be stored - * @param repo the repository to search in - * @param spec the rev-parse spec to parse - * @return 0 on success, GIT_INVALIDSPEC, GIT_ENOTFOUND, GIT_EAMBIGUOUS or an error code - */ -GIT_EXTERN(int) git_revparse( - git_revspec *revspec, - git_repository *repo, - const char *spec); - - -/** @} */ -GIT_END_DECL -#endif diff --git a/vendor/libgit2/include/git2/revwalk.h b/vendor/libgit2/include/git2/revwalk.h deleted file mode 100644 index 2cc00536e..000000000 --- a/vendor/libgit2/include/git2/revwalk.h +++ /dev/null @@ -1,297 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_git_revwalk_h__ -#define INCLUDE_git_revwalk_h__ - -#include "common.h" -#include "types.h" -#include "oid.h" - -/** - * @file git2/revwalk.h - * @brief Git revision traversal routines - * @defgroup git_revwalk Git revision traversal routines - * @ingroup Git - * @{ - */ -GIT_BEGIN_DECL - -/** - * Flags to specify the sorting which a revwalk should perform. - */ -typedef enum { - /** - * Sort the repository contents in no particular ordering; - * this sorting is arbitrary, implementation-specific - * and subject to change at any time. - * This is the default sorting for new walkers. - */ - GIT_SORT_NONE = 0, - - /** - * Sort the repository contents in topological order - * (parents before children); this sorting mode - * can be combined with time sorting. - */ - GIT_SORT_TOPOLOGICAL = 1 << 0, - - /** - * Sort the repository contents by commit time; - * this sorting mode can be combined with - * topological sorting. - */ - GIT_SORT_TIME = 1 << 1, - - /** - * Iterate through the repository contents in reverse - * order; this sorting mode can be combined with - * any of the above. - */ - GIT_SORT_REVERSE = 1 << 2, -} git_sort_t; - -/** - * Allocate a new revision walker to iterate through a repo. - * - * This revision walker uses a custom memory pool and an internal - * commit cache, so it is relatively expensive to allocate. - * - * For maximum performance, this revision walker should be - * reused for different walks. - * - * This revision walker is *not* thread safe: it may only be - * used to walk a repository on a single thread; however, - * it is possible to have several revision walkers in - * several different threads walking the same repository. - * - * @param out pointer to the new revision walker - * @param repo the repo to walk through - * @return 0 or an error code - */ -GIT_EXTERN(int) git_revwalk_new(git_revwalk **out, git_repository *repo); - -/** - * Reset the revision walker for reuse. - * - * This will clear all the pushed and hidden commits, and - * leave the walker in a blank state (just like at - * creation) ready to receive new commit pushes and - * start a new walk. - * - * The revision walk is automatically reset when a walk - * is over. - * - * @param walker handle to reset. - */ -GIT_EXTERN(void) git_revwalk_reset(git_revwalk *walker); - -/** - * Add a new root for the traversal - * - * The pushed commit will be marked as one of the roots from which to - * start the walk. This commit may not be walked if it or a child is - * hidden. - * - * At least one commit must be pushed onto the walker before a walk - * can be started. - * - * The given id must belong to a committish on the walked - * repository. - * - * @param walk the walker being used for the traversal. - * @param id the oid of the commit to start from. - * @return 0 or an error code - */ -GIT_EXTERN(int) git_revwalk_push(git_revwalk *walk, const git_oid *id); - -/** - * Push matching references - * - * The OIDs pointed to by the references that match the given glob - * pattern will be pushed to the revision walker. - * - * A leading 'refs/' is implied if not present as well as a trailing - * '/\*' if the glob lacks '?', '\*' or '['. - * - * Any references matching this glob which do not point to a - * committish will be ignored. - * - * @param walk the walker being used for the traversal - * @param glob the glob pattern references should match - * @return 0 or an error code - */ -GIT_EXTERN(int) git_revwalk_push_glob(git_revwalk *walk, const char *glob); - -/** - * Push the repository's HEAD - * - * @param walk the walker being used for the traversal - * @return 0 or an error code - */ -GIT_EXTERN(int) git_revwalk_push_head(git_revwalk *walk); - -/** - * Mark a commit (and its ancestors) uninteresting for the output. - * - * The given id must belong to a committish on the walked - * repository. - * - * The resolved commit and all its parents will be hidden from the - * output on the revision walk. - * - * @param walk the walker being used for the traversal. - * @param commit_id the oid of commit that will be ignored during the traversal - * @return 0 or an error code - */ -GIT_EXTERN(int) git_revwalk_hide(git_revwalk *walk, const git_oid *commit_id); - -/** - * Hide matching references. - * - * The OIDs pointed to by the references that match the given glob - * pattern and their ancestors will be hidden from the output on the - * revision walk. - * - * A leading 'refs/' is implied if not present as well as a trailing - * '/\*' if the glob lacks '?', '\*' or '['. - * - * Any references matching this glob which do not point to a - * committish will be ignored. - * - * @param walk the walker being used for the traversal - * @param glob the glob pattern references should match - * @return 0 or an error code - */ -GIT_EXTERN(int) git_revwalk_hide_glob(git_revwalk *walk, const char *glob); - -/** - * Hide the repository's HEAD - * - * @param walk the walker being used for the traversal - * @return 0 or an error code - */ -GIT_EXTERN(int) git_revwalk_hide_head(git_revwalk *walk); - -/** - * Push the OID pointed to by a reference - * - * The reference must point to a committish. - * - * @param walk the walker being used for the traversal - * @param refname the reference to push - * @return 0 or an error code - */ -GIT_EXTERN(int) git_revwalk_push_ref(git_revwalk *walk, const char *refname); - -/** - * Hide the OID pointed to by a reference - * - * The reference must point to a committish. - * - * @param walk the walker being used for the traversal - * @param refname the reference to hide - * @return 0 or an error code - */ -GIT_EXTERN(int) git_revwalk_hide_ref(git_revwalk *walk, const char *refname); - -/** - * Get the next commit from the revision walk. - * - * The initial call to this method is *not* blocking when - * iterating through a repo with a time-sorting mode. - * - * Iterating with Topological or inverted modes makes the initial - * call blocking to preprocess the commit list, but this block should be - * mostly unnoticeable on most repositories (topological preprocessing - * times at 0.3s on the git.git repo). - * - * The revision walker is reset when the walk is over. - * - * @param out Pointer where to store the oid of the next commit - * @param walk the walker to pop the commit from. - * @return 0 if the next commit was found; - * GIT_ITEROVER if there are no commits left to iterate - */ -GIT_EXTERN(int) git_revwalk_next(git_oid *out, git_revwalk *walk); - -/** - * Change the sorting mode when iterating through the - * repository's contents. - * - * Changing the sorting mode resets the walker. - * - * @param walk the walker being used for the traversal. - * @param sort_mode combination of GIT_SORT_XXX flags - */ -GIT_EXTERN(void) git_revwalk_sorting(git_revwalk *walk, unsigned int sort_mode); - -/** - * Push and hide the respective endpoints of the given range. - * - * The range should be of the form - * .. - * where each is in the form accepted by 'git_revparse_single'. - * The left-hand commit will be hidden and the right-hand commit pushed. - * - * @param walk the walker being used for the traversal - * @param range the range - * @return 0 or an error code - * - */ -GIT_EXTERN(int) git_revwalk_push_range(git_revwalk *walk, const char *range); - -/** - * Simplify the history by first-parent - * - * No parents other than the first for each commit will be enqueued. - */ -GIT_EXTERN(void) git_revwalk_simplify_first_parent(git_revwalk *walk); - - -/** - * Free a revision walker previously allocated. - * - * @param walk traversal handle to close. If NULL nothing occurs. - */ -GIT_EXTERN(void) git_revwalk_free(git_revwalk *walk); - -/** - * Return the repository on which this walker - * is operating. - * - * @param walk the revision walker - * @return the repository being walked - */ -GIT_EXTERN(git_repository *) git_revwalk_repository(git_revwalk *walk); - -/** - * This is a callback function that user can provide to hide a - * commit and its parents. If the callback function returns non-zero value, - * then this commit and its parents will be hidden. - * - * @param commit_id oid of Commit - * @param payload User-specified pointer to data to be passed as data payload - */ -typedef int(*git_revwalk_hide_cb)( - const git_oid *commit_id, - void *payload); - -/** - * Adds a callback function to hide a commit and its parents - * - * @param walk the revision walker - * @param hide_cb callback function to hide a commit and its parents - * @param payload data payload to be passed to callback function - */ -GIT_EXTERN(int) git_revwalk_add_hide_cb( - git_revwalk *walk, - git_revwalk_hide_cb hide_cb, - void *payload); - -/** @} */ -GIT_END_DECL -#endif diff --git a/vendor/libgit2/include/git2/signature.h b/vendor/libgit2/include/git2/signature.h deleted file mode 100644 index feb1b4073..000000000 --- a/vendor/libgit2/include/git2/signature.h +++ /dev/null @@ -1,90 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_git_signature_h__ -#define INCLUDE_git_signature_h__ - -#include "common.h" -#include "types.h" - -/** - * @file git2/signature.h - * @brief Git signature creation - * @defgroup git_signature Git signature creation - * @ingroup Git - * @{ - */ -GIT_BEGIN_DECL - -/** - * Create a new action signature. - * - * Call `git_signature_free()` to free the data. - * - * Note: angle brackets ('<' and '>') characters are not allowed - * to be used in either the `name` or the `email` parameter. - * - * @param out new signature, in case of error NULL - * @param name name of the person - * @param email email of the person - * @param time time when the action happened - * @param offset timezone offset in minutes for the time - * @return 0 or an error code - */ -GIT_EXTERN(int) git_signature_new(git_signature **out, const char *name, const char *email, git_time_t time, int offset); - -/** - * Create a new action signature with a timestamp of 'now'. - * - * Call `git_signature_free()` to free the data. - * - * @param out new signature, in case of error NULL - * @param name name of the person - * @param email email of the person - * @return 0 or an error code - */ -GIT_EXTERN(int) git_signature_now(git_signature **out, const char *name, const char *email); - -/** - * Create a new action signature with default user and now timestamp. - * - * This looks up the user.name and user.email from the configuration and - * uses the current time as the timestamp, and creates a new signature - * based on that information. It will return GIT_ENOTFOUND if either the - * user.name or user.email are not set. - * - * @param out new signature - * @param repo repository pointer - * @return 0 on success, GIT_ENOTFOUND if config is missing, or error code - */ -GIT_EXTERN(int) git_signature_default(git_signature **out, git_repository *repo); - -/** - * Create a copy of an existing signature. All internal strings are also - * duplicated. - * - * Call `git_signature_free()` to free the data. - * - * @param dest pointer where to store the copy - * @param sig signature to duplicate - * @return 0 or an error code - */ -GIT_EXTERN(int) git_signature_dup(git_signature **dest, const git_signature *sig); - -/** - * Free an existing signature. - * - * Because the signature is not an opaque structure, it is legal to free it - * manually, but be sure to free the "name" and "email" strings in addition - * to the structure itself. - * - * @param sig signature to free - */ -GIT_EXTERN(void) git_signature_free(git_signature *sig); - -/** @} */ -GIT_END_DECL -#endif diff --git a/vendor/libgit2/include/git2/stash.h b/vendor/libgit2/include/git2/stash.h deleted file mode 100644 index 733d75a7f..000000000 --- a/vendor/libgit2/include/git2/stash.h +++ /dev/null @@ -1,257 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_git_stash_h__ -#define INCLUDE_git_stash_h__ - -#include "common.h" -#include "types.h" - -/** - * @file git2/stash.h - * @brief Git stash management routines - * @ingroup Git - * @{ - */ -GIT_BEGIN_DECL - -/** - * Stash flags - */ -typedef enum { - /** - * No option, default - */ - GIT_STASH_DEFAULT = 0, - - /** - * All changes already added to the index are left intact in - * the working directory - */ - GIT_STASH_KEEP_INDEX = (1 << 0), - - /** - * All untracked files are also stashed and then cleaned up - * from the working directory - */ - GIT_STASH_INCLUDE_UNTRACKED = (1 << 1), - - /** - * All ignored files are also stashed and then cleaned up from - * the working directory - */ - GIT_STASH_INCLUDE_IGNORED = (1 << 2), -} git_stash_flags; - -/** - * Save the local modifications to a new stash. - * - * @param out Object id of the commit containing the stashed state. - * This commit is also the target of the direct reference refs/stash. - * - * @param repo The owning repository. - * - * @param stasher The identity of the person performing the stashing. - * - * @param message Optional description along with the stashed state. - * - * @param flags Flags to control the stashing process. (see GIT_STASH_* above) - * - * @return 0 on success, GIT_ENOTFOUND where there's nothing to stash, - * or error code. - */ -GIT_EXTERN(int) git_stash_save( - git_oid *out, - git_repository *repo, - const git_signature *stasher, - const char *message, - uint32_t flags); - -/** Stash application flags. */ -typedef enum { - GIT_STASH_APPLY_DEFAULT = 0, - - /* Try to reinstate not only the working tree's changes, - * but also the index's changes. - */ - GIT_STASH_APPLY_REINSTATE_INDEX = (1 << 0), -} git_stash_apply_flags; - -typedef enum { - GIT_STASH_APPLY_PROGRESS_NONE = 0, - - /** Loading the stashed data from the object database. */ - GIT_STASH_APPLY_PROGRESS_LOADING_STASH, - - /** The stored index is being analyzed. */ - GIT_STASH_APPLY_PROGRESS_ANALYZE_INDEX, - - /** The modified files are being analyzed. */ - GIT_STASH_APPLY_PROGRESS_ANALYZE_MODIFIED, - - /** The untracked and ignored files are being analyzed. */ - GIT_STASH_APPLY_PROGRESS_ANALYZE_UNTRACKED, - - /** The untracked files are being written to disk. */ - GIT_STASH_APPLY_PROGRESS_CHECKOUT_UNTRACKED, - - /** The modified files are being written to disk. */ - GIT_STASH_APPLY_PROGRESS_CHECKOUT_MODIFIED, - - /** The stash was applied successfully. */ - GIT_STASH_APPLY_PROGRESS_DONE, -} git_stash_apply_progress_t; - -/** - * Stash application progress notification function. - * Return 0 to continue processing, or a negative value to - * abort the stash application. - */ -typedef int (*git_stash_apply_progress_cb)( - git_stash_apply_progress_t progress, - void *payload); - -/** Stash application options structure. - * - * Initialize with the `GIT_STASH_APPLY_OPTIONS_INIT` macro to set - * sensible defaults; for example: - * - * git_stash_apply_options opts = GIT_STASH_APPLY_OPTIONS_INIT; - */ -typedef struct git_stash_apply_options { - unsigned int version; - - /** See `git_stash_apply_flags_t`, above. */ - git_stash_apply_flags flags; - - /** Options to use when writing files to the working directory. */ - git_checkout_options checkout_options; - - /** Optional callback to notify the consumer of application progress. */ - git_stash_apply_progress_cb progress_cb; - void *progress_payload; -} git_stash_apply_options; - -#define GIT_STASH_APPLY_OPTIONS_VERSION 1 -#define GIT_STASH_APPLY_OPTIONS_INIT { \ - GIT_STASH_APPLY_OPTIONS_VERSION, \ - GIT_STASH_APPLY_DEFAULT, \ - GIT_CHECKOUT_OPTIONS_INIT } - -/** - * Initializes a `git_stash_apply_options` with default values. Equivalent to - * creating an instance with GIT_STASH_APPLY_OPTIONS_INIT. - * - * @param opts the `git_stash_apply_options` instance to initialize. - * @param version the version of the struct; you should pass - * `GIT_STASH_APPLY_OPTIONS_INIT` here. - * @return Zero on success; -1 on failure. - */ -GIT_EXTERN(int) git_stash_apply_init_options( - git_stash_apply_options *opts, unsigned int version); - -/** - * Apply a single stashed state from the stash list. - * - * If local changes in the working directory conflict with changes in the - * stash then GIT_EMERGECONFLICT will be returned. In this case, the index - * will always remain unmodified and all files in the working directory will - * remain unmodified. However, if you are restoring untracked files or - * ignored files and there is a conflict when applying the modified files, - * then those files will remain in the working directory. - * - * If passing the GIT_STASH_APPLY_REINSTATE_INDEX flag and there would be - * conflicts when reinstating the index, the function will return - * GIT_EMERGECONFLICT and both the working directory and index will be left - * unmodified. - * - * Note that a minimum checkout strategy of `GIT_CHECKOUT_SAFE` is implied. - * - * @param repo The owning repository. - * @param index The position within the stash list. 0 points to the - * most recent stashed state. - * @param options Options to control how stashes are applied. - * - * @return 0 on success, GIT_ENOTFOUND if there's no stashed state for the - * given index, GIT_EMERGECONFLICT if changes exist in the working - * directory, or an error code - */ -GIT_EXTERN(int) git_stash_apply( - git_repository *repo, - size_t index, - const git_stash_apply_options *options); - -/** - * This is a callback function you can provide to iterate over all the - * stashed states that will be invoked per entry. - * - * @param index The position within the stash list. 0 points to the - * most recent stashed state. - * @param message The stash message. - * @param stash_id The commit oid of the stashed state. - * @param payload Extra parameter to callback function. - * @return 0 to continue iterating or non-zero to stop. - */ -typedef int (*git_stash_cb)( - size_t index, - const char* message, - const git_oid *stash_id, - void *payload); - -/** - * Loop over all the stashed states and issue a callback for each one. - * - * If the callback returns a non-zero value, this will stop looping. - * - * @param repo Repository where to find the stash. - * - * @param callback Callback to invoke per found stashed state. The most - * recent stash state will be enumerated first. - * - * @param payload Extra parameter to callback function. - * - * @return 0 on success, non-zero callback return value, or error code. - */ -GIT_EXTERN(int) git_stash_foreach( - git_repository *repo, - git_stash_cb callback, - void *payload); - -/** - * Remove a single stashed state from the stash list. - * - * @param repo The owning repository. - * - * @param index The position within the stash list. 0 points to the - * most recent stashed state. - * - * @return 0 on success, GIT_ENOTFOUND if there's no stashed state for the given - * index, or error code. - */ -GIT_EXTERN(int) git_stash_drop( - git_repository *repo, - size_t index); - -/** - * Apply a single stashed state from the stash list and remove it from the list - * if successful. - * - * @param repo The owning repository. - * @param index The position within the stash list. 0 points to the - * most recent stashed state. - * @param options Options to control how stashes are applied. - * - * @return 0 on success, GIT_ENOTFOUND if there's no stashed state for the given - * index, or error code. (see git_stash_apply() above for details) -*/ -GIT_EXTERN(int) git_stash_pop( - git_repository *repo, - size_t index, - const git_stash_apply_options *options); - -/** @} */ -GIT_END_DECL -#endif diff --git a/vendor/libgit2/include/git2/status.h b/vendor/libgit2/include/git2/status.h deleted file mode 100644 index 671113955..000000000 --- a/vendor/libgit2/include/git2/status.h +++ /dev/null @@ -1,370 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_git_status_h__ -#define INCLUDE_git_status_h__ - -#include "common.h" -#include "types.h" - -/** - * @file git2/status.h - * @brief Git file status routines - * @defgroup git_status Git file status routines - * @ingroup Git - * @{ - */ -GIT_BEGIN_DECL - -/** - * Status flags for a single file. - * - * A combination of these values will be returned to indicate the status of - * a file. Status compares the working directory, the index, and the - * current HEAD of the repository. The `GIT_STATUS_INDEX` set of flags - * represents the status of file in the index relative to the HEAD, and the - * `GIT_STATUS_WT` set of flags represent the status of the file in the - * working directory relative to the index. - */ -typedef enum { - GIT_STATUS_CURRENT = 0, - - GIT_STATUS_INDEX_NEW = (1u << 0), - GIT_STATUS_INDEX_MODIFIED = (1u << 1), - GIT_STATUS_INDEX_DELETED = (1u << 2), - GIT_STATUS_INDEX_RENAMED = (1u << 3), - GIT_STATUS_INDEX_TYPECHANGE = (1u << 4), - - GIT_STATUS_WT_NEW = (1u << 7), - GIT_STATUS_WT_MODIFIED = (1u << 8), - GIT_STATUS_WT_DELETED = (1u << 9), - GIT_STATUS_WT_TYPECHANGE = (1u << 10), - GIT_STATUS_WT_RENAMED = (1u << 11), - GIT_STATUS_WT_UNREADABLE = (1u << 12), - - GIT_STATUS_IGNORED = (1u << 14), - GIT_STATUS_CONFLICTED = (1u << 15), -} git_status_t; - -/** - * Function pointer to receive status on individual files - * - * `path` is the relative path to the file from the root of the repository. - * - * `status_flags` is a combination of `git_status_t` values that apply. - * - * `payload` is the value you passed to the foreach function as payload. - */ -typedef int (*git_status_cb)( - const char *path, unsigned int status_flags, void *payload); - -/** - * Select the files on which to report status. - * - * With `git_status_foreach_ext`, this will control which changes get - * callbacks. With `git_status_list_new`, these will control which - * changes are included in the list. - * - * - GIT_STATUS_SHOW_INDEX_AND_WORKDIR is the default. This roughly - * matches `git status --porcelain` regarding which files are - * included and in what order. - * - GIT_STATUS_SHOW_INDEX_ONLY only gives status based on HEAD to index - * comparison, not looking at working directory changes. - * - GIT_STATUS_SHOW_WORKDIR_ONLY only gives status based on index to - * working directory comparison, not comparing the index to the HEAD. - */ -typedef enum { - GIT_STATUS_SHOW_INDEX_AND_WORKDIR = 0, - GIT_STATUS_SHOW_INDEX_ONLY = 1, - GIT_STATUS_SHOW_WORKDIR_ONLY = 2, -} git_status_show_t; - -/** - * Flags to control status callbacks - * - * - GIT_STATUS_OPT_INCLUDE_UNTRACKED says that callbacks should be made - * on untracked files. These will only be made if the workdir files are - * included in the status "show" option. - * - GIT_STATUS_OPT_INCLUDE_IGNORED says that ignored files get callbacks. - * Again, these callbacks will only be made if the workdir files are - * included in the status "show" option. - * - GIT_STATUS_OPT_INCLUDE_UNMODIFIED indicates that callback should be - * made even on unmodified files. - * - GIT_STATUS_OPT_EXCLUDE_SUBMODULES indicates that submodules should be - * skipped. This only applies if there are no pending typechanges to - * the submodule (either from or to another type). - * - GIT_STATUS_OPT_RECURSE_UNTRACKED_DIRS indicates that all files in - * untracked directories should be included. Normally if an entire - * directory is new, then just the top-level directory is included (with - * a trailing slash on the entry name). This flag says to include all - * of the individual files in the directory instead. - * - GIT_STATUS_OPT_DISABLE_PATHSPEC_MATCH indicates that the given path - * should be treated as a literal path, and not as a pathspec pattern. - * - GIT_STATUS_OPT_RECURSE_IGNORED_DIRS indicates that the contents of - * ignored directories should be included in the status. This is like - * doing `git ls-files -o -i --exclude-standard` with core git. - * - GIT_STATUS_OPT_RENAMES_HEAD_TO_INDEX indicates that rename detection - * should be processed between the head and the index and enables - * the GIT_STATUS_INDEX_RENAMED as a possible status flag. - * - GIT_STATUS_OPT_RENAMES_INDEX_TO_WORKDIR indicates that rename - * detection should be run between the index and the working directory - * and enabled GIT_STATUS_WT_RENAMED as a possible status flag. - * - GIT_STATUS_OPT_SORT_CASE_SENSITIVELY overrides the native case - * sensitivity for the file system and forces the output to be in - * case-sensitive order - * - GIT_STATUS_OPT_SORT_CASE_INSENSITIVELY overrides the native case - * sensitivity for the file system and forces the output to be in - * case-insensitive order - * - GIT_STATUS_OPT_RENAMES_FROM_REWRITES indicates that rename detection - * should include rewritten files - * - GIT_STATUS_OPT_NO_REFRESH bypasses the default status behavior of - * doing a "soft" index reload (i.e. reloading the index data if the - * file on disk has been modified outside libgit2). - * - GIT_STATUS_OPT_UPDATE_INDEX tells libgit2 to refresh the stat cache - * in the index for files that are unchanged but have out of date stat - * information in the index. It will result in less work being done on - * subsequent calls to get status. This is mutually exclusive with the - * NO_REFRESH option. - * - * Calling `git_status_foreach()` is like calling the extended version - * with: GIT_STATUS_OPT_INCLUDE_IGNORED, GIT_STATUS_OPT_INCLUDE_UNTRACKED, - * and GIT_STATUS_OPT_RECURSE_UNTRACKED_DIRS. Those options are bundled - * together as `GIT_STATUS_OPT_DEFAULTS` if you want them as a baseline. - */ -typedef enum { - GIT_STATUS_OPT_INCLUDE_UNTRACKED = (1u << 0), - GIT_STATUS_OPT_INCLUDE_IGNORED = (1u << 1), - GIT_STATUS_OPT_INCLUDE_UNMODIFIED = (1u << 2), - GIT_STATUS_OPT_EXCLUDE_SUBMODULES = (1u << 3), - GIT_STATUS_OPT_RECURSE_UNTRACKED_DIRS = (1u << 4), - GIT_STATUS_OPT_DISABLE_PATHSPEC_MATCH = (1u << 5), - GIT_STATUS_OPT_RECURSE_IGNORED_DIRS = (1u << 6), - GIT_STATUS_OPT_RENAMES_HEAD_TO_INDEX = (1u << 7), - GIT_STATUS_OPT_RENAMES_INDEX_TO_WORKDIR = (1u << 8), - GIT_STATUS_OPT_SORT_CASE_SENSITIVELY = (1u << 9), - GIT_STATUS_OPT_SORT_CASE_INSENSITIVELY = (1u << 10), - GIT_STATUS_OPT_RENAMES_FROM_REWRITES = (1u << 11), - GIT_STATUS_OPT_NO_REFRESH = (1u << 12), - GIT_STATUS_OPT_UPDATE_INDEX = (1u << 13), - GIT_STATUS_OPT_INCLUDE_UNREADABLE = (1u << 14), - GIT_STATUS_OPT_INCLUDE_UNREADABLE_AS_UNTRACKED = (1u << 15), -} git_status_opt_t; - -#define GIT_STATUS_OPT_DEFAULTS \ - (GIT_STATUS_OPT_INCLUDE_IGNORED | \ - GIT_STATUS_OPT_INCLUDE_UNTRACKED | \ - GIT_STATUS_OPT_RECURSE_UNTRACKED_DIRS) - -/** - * Options to control how `git_status_foreach_ext()` will issue callbacks. - * - * This structure is set so that zeroing it out will give you relatively - * sane defaults. - * - * The `show` value is one of the `git_status_show_t` constants that - * control which files to scan and in what order. - * - * The `flags` value is an OR'ed combination of the `git_status_opt_t` - * values above. - * - * The `pathspec` is an array of path patterns to match (using - * fnmatch-style matching), or just an array of paths to match exactly if - * `GIT_STATUS_OPT_DISABLE_PATHSPEC_MATCH` is specified in the flags. - */ -typedef struct { - unsigned int version; - git_status_show_t show; - unsigned int flags; - git_strarray pathspec; -} git_status_options; - -#define GIT_STATUS_OPTIONS_VERSION 1 -#define GIT_STATUS_OPTIONS_INIT {GIT_STATUS_OPTIONS_VERSION} - -/** - * Initializes a `git_status_options` with default values. Equivalent to - * creating an instance with GIT_STATUS_OPTIONS_INIT. - * - * @param opts The `git_status_options` instance to initialize. - * @param version Version of struct; pass `GIT_STATUS_OPTIONS_VERSION` - * @return Zero on success; -1 on failure. - */ -GIT_EXTERN(int) git_status_init_options( - git_status_options *opts, - unsigned int version); - -/** - * A status entry, providing the differences between the file as it exists - * in HEAD and the index, and providing the differences between the index - * and the working directory. - * - * The `status` value provides the status flags for this file. - * - * The `head_to_index` value provides detailed information about the - * differences between the file in HEAD and the file in the index. - * - * The `index_to_workdir` value provides detailed information about the - * differences between the file in the index and the file in the - * working directory. - */ -typedef struct { - git_status_t status; - git_diff_delta *head_to_index; - git_diff_delta *index_to_workdir; -} git_status_entry; - - -/** - * Gather file statuses and run a callback for each one. - * - * The callback is passed the path of the file, the status (a combination of - * the `git_status_t` values above) and the `payload` data pointer passed - * into this function. - * - * If the callback returns a non-zero value, this function will stop looping - * and return that value to caller. - * - * @param repo A repository object - * @param callback The function to call on each file - * @param payload Pointer to pass through to callback function - * @return 0 on success, non-zero callback return value, or error code - */ -GIT_EXTERN(int) git_status_foreach( - git_repository *repo, - git_status_cb callback, - void *payload); - -/** - * Gather file status information and run callbacks as requested. - * - * This is an extended version of the `git_status_foreach()` API that - * allows for more granular control over which paths will be processed and - * in what order. See the `git_status_options` structure for details - * about the additional controls that this makes available. - * - * Note that if a `pathspec` is given in the `git_status_options` to filter - * the status, then the results from rename detection (if you enable it) may - * not be accurate. To do rename detection properly, this must be called - * with no `pathspec` so that all files can be considered. - * - * @param repo Repository object - * @param opts Status options structure - * @param callback The function to call on each file - * @param payload Pointer to pass through to callback function - * @return 0 on success, non-zero callback return value, or error code - */ -GIT_EXTERN(int) git_status_foreach_ext( - git_repository *repo, - const git_status_options *opts, - git_status_cb callback, - void *payload); - -/** - * Get file status for a single file. - * - * This tries to get status for the filename that you give. If no files - * match that name (in either the HEAD, index, or working directory), this - * returns GIT_ENOTFOUND. - * - * If the name matches multiple files (for example, if the `path` names a - * directory or if running on a case- insensitive filesystem and yet the - * HEAD has two entries that both match the path), then this returns - * GIT_EAMBIGUOUS because it cannot give correct results. - * - * This does not do any sort of rename detection. Renames require a set of - * targets and because of the path filtering, there is not enough - * information to check renames correctly. To check file status with rename - * detection, there is no choice but to do a full `git_status_list_new` and - * scan through looking for the path that you are interested in. - * - * @param status_flags Output combination of git_status_t values for file - * @param repo A repository object - * @param path The exact path to retrieve status for relative to the - * repository working directory - * @return 0 on success, GIT_ENOTFOUND if the file is not found in the HEAD, - * index, and work tree, GIT_EAMBIGUOUS if `path` matches multiple files - * or if it refers to a folder, and -1 on other errors. - */ -GIT_EXTERN(int) git_status_file( - unsigned int *status_flags, - git_repository *repo, - const char *path); - -/** - * Gather file status information and populate the `git_status_list`. - * - * Note that if a `pathspec` is given in the `git_status_options` to filter - * the status, then the results from rename detection (if you enable it) may - * not be accurate. To do rename detection properly, this must be called - * with no `pathspec` so that all files can be considered. - * - * @param out Pointer to store the status results in - * @param repo Repository object - * @param opts Status options structure - * @return 0 on success or error code - */ -GIT_EXTERN(int) git_status_list_new( - git_status_list **out, - git_repository *repo, - const git_status_options *opts); - -/** - * Gets the count of status entries in this list. - * - * If there are no changes in status (at least according the options given - * when the status list was created), this can return 0. - * - * @param statuslist Existing status list object - * @return the number of status entries - */ -GIT_EXTERN(size_t) git_status_list_entrycount( - git_status_list *statuslist); - -/** - * Get a pointer to one of the entries in the status list. - * - * The entry is not modifiable and should not be freed. - * - * @param statuslist Existing status list object - * @param idx Position of the entry - * @return Pointer to the entry; NULL if out of bounds - */ -GIT_EXTERN(const git_status_entry *) git_status_byindex( - git_status_list *statuslist, - size_t idx); - -/** - * Free an existing status list - * - * @param statuslist Existing status list object - */ -GIT_EXTERN(void) git_status_list_free( - git_status_list *statuslist); - -/** - * Test if the ignore rules apply to a given file. - * - * This function checks the ignore rules to see if they would apply to the - * given file. This indicates if the file would be ignored regardless of - * whether the file is already in the index or committed to the repository. - * - * One way to think of this is if you were to do "git add ." on the - * directory containing the file, would it be added or not? - * - * @param ignored Boolean returning 0 if the file is not ignored, 1 if it is - * @param repo A repository object - * @param path The file to check ignores for, rooted at the repo's workdir. - * @return 0 if ignore rules could be processed for the file (regardless - * of whether it exists or not), or an error < 0 if they could not. - */ -GIT_EXTERN(int) git_status_should_ignore( - int *ignored, - git_repository *repo, - const char *path); - -/** @} */ -GIT_END_DECL -#endif diff --git a/vendor/libgit2/include/git2/stdint.h b/vendor/libgit2/include/git2/stdint.h deleted file mode 100644 index c66fbb817..000000000 --- a/vendor/libgit2/include/git2/stdint.h +++ /dev/null @@ -1,247 +0,0 @@ -// ISO C9x compliant stdint.h for Microsoft Visual Studio -// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124 -// -// Copyright (c) 2006-2008 Alexander Chemeris -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are met: -// -// 1. Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimer. -// -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// 3. The name of the author may be used to endorse or promote products -// derived from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _MSC_VER // [ -#error "Use this header only with Microsoft Visual C++ compilers!" -#endif // _MSC_VER ] - -#ifndef _MSC_STDINT_H_ // [ -#define _MSC_STDINT_H_ - -#if _MSC_VER > 1000 -#pragma once -#endif - -#include - -// For Visual Studio 6 in C++ mode and for many Visual Studio versions when -// compiling for ARM we should wrap include with 'extern "C++" {}' -// or compiler give many errors like this: -// error C2733: second C linkage of overloaded function 'wmemchr' not allowed -#ifdef __cplusplus -extern "C" { -#endif -# include -#ifdef __cplusplus -} -#endif - -// Define _W64 macros to mark types changing their size, like intptr_t. -#ifndef _W64 -# if !defined(__midl) && (defined(_X86_) || defined(_M_IX86)) && _MSC_VER >= 1300 -# define _W64 __w64 -# else -# define _W64 -# endif -#endif - - -// 7.18.1 Integer types - -// 7.18.1.1 Exact-width integer types - -// Visual Studio 6 and Embedded Visual C++ 4 doesn't -// realize that, e.g. char has the same size as __int8 -// so we give up on __intX for them. -#if (_MSC_VER < 1300) - typedef signed char int8_t; - typedef signed short int16_t; - typedef signed int int32_t; - typedef unsigned char uint8_t; - typedef unsigned short uint16_t; - typedef unsigned int uint32_t; -#else - typedef signed __int8 int8_t; - typedef signed __int16 int16_t; - typedef signed __int32 int32_t; - typedef unsigned __int8 uint8_t; - typedef unsigned __int16 uint16_t; - typedef unsigned __int32 uint32_t; -#endif -typedef signed __int64 int64_t; -typedef unsigned __int64 uint64_t; - - -// 7.18.1.2 Minimum-width integer types -typedef int8_t int_least8_t; -typedef int16_t int_least16_t; -typedef int32_t int_least32_t; -typedef int64_t int_least64_t; -typedef uint8_t uint_least8_t; -typedef uint16_t uint_least16_t; -typedef uint32_t uint_least32_t; -typedef uint64_t uint_least64_t; - -// 7.18.1.3 Fastest minimum-width integer types -typedef int8_t int_fast8_t; -typedef int16_t int_fast16_t; -typedef int32_t int_fast32_t; -typedef int64_t int_fast64_t; -typedef uint8_t uint_fast8_t; -typedef uint16_t uint_fast16_t; -typedef uint32_t uint_fast32_t; -typedef uint64_t uint_fast64_t; - -// 7.18.1.4 Integer types capable of holding object pointers -#ifdef _WIN64 // [ - typedef signed __int64 intptr_t; - typedef unsigned __int64 uintptr_t; -#else // _WIN64 ][ - typedef _W64 signed int intptr_t; - typedef _W64 unsigned int uintptr_t; -#endif // _WIN64 ] - -// 7.18.1.5 Greatest-width integer types -typedef int64_t intmax_t; -typedef uint64_t uintmax_t; - - -// 7.18.2 Limits of specified-width integer types - -#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) // [ See footnote 220 at page 257 and footnote 221 at page 259 - -// 7.18.2.1 Limits of exact-width integer types -#define INT8_MIN ((int8_t)_I8_MIN) -#define INT8_MAX _I8_MAX -#define INT16_MIN ((int16_t)_I16_MIN) -#define INT16_MAX _I16_MAX -#define INT32_MIN ((int32_t)_I32_MIN) -#define INT32_MAX _I32_MAX -#define INT64_MIN ((int64_t)_I64_MIN) -#define INT64_MAX _I64_MAX -#define UINT8_MAX _UI8_MAX -#define UINT16_MAX _UI16_MAX -#define UINT32_MAX _UI32_MAX -#define UINT64_MAX _UI64_MAX - -// 7.18.2.2 Limits of minimum-width integer types -#define INT_LEAST8_MIN INT8_MIN -#define INT_LEAST8_MAX INT8_MAX -#define INT_LEAST16_MIN INT16_MIN -#define INT_LEAST16_MAX INT16_MAX -#define INT_LEAST32_MIN INT32_MIN -#define INT_LEAST32_MAX INT32_MAX -#define INT_LEAST64_MIN INT64_MIN -#define INT_LEAST64_MAX INT64_MAX -#define UINT_LEAST8_MAX UINT8_MAX -#define UINT_LEAST16_MAX UINT16_MAX -#define UINT_LEAST32_MAX UINT32_MAX -#define UINT_LEAST64_MAX UINT64_MAX - -// 7.18.2.3 Limits of fastest minimum-width integer types -#define INT_FAST8_MIN INT8_MIN -#define INT_FAST8_MAX INT8_MAX -#define INT_FAST16_MIN INT16_MIN -#define INT_FAST16_MAX INT16_MAX -#define INT_FAST32_MIN INT32_MIN -#define INT_FAST32_MAX INT32_MAX -#define INT_FAST64_MIN INT64_MIN -#define INT_FAST64_MAX INT64_MAX -#define UINT_FAST8_MAX UINT8_MAX -#define UINT_FAST16_MAX UINT16_MAX -#define UINT_FAST32_MAX UINT32_MAX -#define UINT_FAST64_MAX UINT64_MAX - -// 7.18.2.4 Limits of integer types capable of holding object pointers -#ifdef _WIN64 // [ -# define INTPTR_MIN INT64_MIN -# define INTPTR_MAX INT64_MAX -# define UINTPTR_MAX UINT64_MAX -#else // _WIN64 ][ -# define INTPTR_MIN INT32_MIN -# define INTPTR_MAX INT32_MAX -# define UINTPTR_MAX UINT32_MAX -#endif // _WIN64 ] - -// 7.18.2.5 Limits of greatest-width integer types -#define INTMAX_MIN INT64_MIN -#define INTMAX_MAX INT64_MAX -#define UINTMAX_MAX UINT64_MAX - -// 7.18.3 Limits of other integer types - -#ifdef _WIN64 // [ -# define PTRDIFF_MIN _I64_MIN -# define PTRDIFF_MAX _I64_MAX -#else // _WIN64 ][ -# define PTRDIFF_MIN _I32_MIN -# define PTRDIFF_MAX _I32_MAX -#endif // _WIN64 ] - -#define SIG_ATOMIC_MIN INT_MIN -#define SIG_ATOMIC_MAX INT_MAX - -#ifndef SIZE_MAX // [ -# ifdef _WIN64 // [ -# define SIZE_MAX _UI64_MAX -# else // _WIN64 ][ -# define SIZE_MAX _UI32_MAX -# endif // _WIN64 ] -#endif // SIZE_MAX ] - -// WCHAR_MIN and WCHAR_MAX are also defined in -#ifndef WCHAR_MIN // [ -# define WCHAR_MIN 0 -#endif // WCHAR_MIN ] -#ifndef WCHAR_MAX // [ -# define WCHAR_MAX _UI16_MAX -#endif // WCHAR_MAX ] - -#define WINT_MIN 0 -#define WINT_MAX _UI16_MAX - -#endif // __STDC_LIMIT_MACROS ] - - -// 7.18.4 Limits of other integer types - -#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) // [ See footnote 224 at page 260 - -// 7.18.4.1 Macros for minimum-width integer constants - -#define INT8_C(val) val##i8 -#define INT16_C(val) val##i16 -#define INT32_C(val) val##i32 -#define INT64_C(val) val##i64 - -#define UINT8_C(val) val##ui8 -#define UINT16_C(val) val##ui16 -#define UINT32_C(val) val##ui32 -#define UINT64_C(val) val##ui64 - -// 7.18.4.2 Macros for greatest-width integer constants -#define INTMAX_C INT64_C -#define UINTMAX_C UINT64_C - -#endif // __STDC_CONSTANT_MACROS ] - - -#endif // _MSC_STDINT_H_ ] diff --git a/vendor/libgit2/include/git2/strarray.h b/vendor/libgit2/include/git2/strarray.h deleted file mode 100644 index 86fa25f3f..000000000 --- a/vendor/libgit2/include/git2/strarray.h +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_git_strarray_h__ -#define INCLUDE_git_strarray_h__ - -#include "common.h" - -/** - * @file git2/strarray.h - * @brief Git string array routines - * @defgroup git_strarray Git string array routines - * @ingroup Git - * @{ - */ -GIT_BEGIN_DECL - -/** Array of strings */ -typedef struct git_strarray { - char **strings; - size_t count; -} git_strarray; - -/** - * Close a string array object - * - * This method should be called on `git_strarray` objects where the strings - * array is allocated and contains allocated strings, such as what you - * would get from `git_strarray_copy()`. Not doing so, will result in a - * memory leak. - * - * This does not free the `git_strarray` itself, since the library will - * never allocate that object directly itself (it is more commonly embedded - * inside another struct or created on the stack). - * - * @param array git_strarray from which to free string data - */ -GIT_EXTERN(void) git_strarray_free(git_strarray *array); - -/** - * Copy a string array object from source to target. - * - * Note: target is overwritten and hence should be empty, otherwise its - * contents are leaked. Call git_strarray_free() if necessary. - * - * @param tgt target - * @param src source - * @return 0 on success, < 0 on allocation failure - */ -GIT_EXTERN(int) git_strarray_copy(git_strarray *tgt, const git_strarray *src); - - -/** @} */ -GIT_END_DECL - -#endif - diff --git a/vendor/libgit2/include/git2/submodule.h b/vendor/libgit2/include/git2/submodule.h deleted file mode 100644 index bc94eacaa..000000000 --- a/vendor/libgit2/include/git2/submodule.h +++ /dev/null @@ -1,637 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_git_submodule_h__ -#define INCLUDE_git_submodule_h__ - -#include "common.h" -#include "types.h" -#include "oid.h" -#include "remote.h" -#include "checkout.h" - -/** - * @file git2/submodule.h - * @brief Git submodule management utilities - * - * Submodule support in libgit2 builds a list of known submodules and keeps - * it in the repository. The list is built from the .gitmodules file, the - * .git/config file, the index, and the HEAD tree. Items in the working - * directory that look like submodules (i.e. a git repo) but are not - * mentioned in those places won't be tracked. - * - * @defgroup git_submodule Git submodule management routines - * @ingroup Git - * @{ - */ -GIT_BEGIN_DECL - -/** - * Return codes for submodule status. - * - * A combination of these flags will be returned to describe the status of a - * submodule. Depending on the "ignore" property of the submodule, some of - * the flags may never be returned because they indicate changes that are - * supposed to be ignored. - * - * Submodule info is contained in 4 places: the HEAD tree, the index, config - * files (both .git/config and .gitmodules), and the working directory. Any - * or all of those places might be missing information about the submodule - * depending on what state the repo is in. We consider all four places to - * build the combination of status flags. - * - * There are four values that are not really status, but give basic info - * about what sources of submodule data are available. These will be - * returned even if ignore is set to "ALL". - * - * * IN_HEAD - superproject head contains submodule - * * IN_INDEX - superproject index contains submodule - * * IN_CONFIG - superproject gitmodules has submodule - * * IN_WD - superproject workdir has submodule - * - * The following values will be returned so long as ignore is not "ALL". - * - * * INDEX_ADDED - in index, not in head - * * INDEX_DELETED - in head, not in index - * * INDEX_MODIFIED - index and head don't match - * * WD_UNINITIALIZED - workdir contains empty directory - * * WD_ADDED - in workdir, not index - * * WD_DELETED - in index, not workdir - * * WD_MODIFIED - index and workdir head don't match - * - * The following can only be returned if ignore is "NONE" or "UNTRACKED". - * - * * WD_INDEX_MODIFIED - submodule workdir index is dirty - * * WD_WD_MODIFIED - submodule workdir has modified files - * - * Lastly, the following will only be returned for ignore "NONE". - * - * * WD_UNTRACKED - wd contains untracked files - */ -typedef enum { - GIT_SUBMODULE_STATUS_IN_HEAD = (1u << 0), - GIT_SUBMODULE_STATUS_IN_INDEX = (1u << 1), - GIT_SUBMODULE_STATUS_IN_CONFIG = (1u << 2), - GIT_SUBMODULE_STATUS_IN_WD = (1u << 3), - GIT_SUBMODULE_STATUS_INDEX_ADDED = (1u << 4), - GIT_SUBMODULE_STATUS_INDEX_DELETED = (1u << 5), - GIT_SUBMODULE_STATUS_INDEX_MODIFIED = (1u << 6), - GIT_SUBMODULE_STATUS_WD_UNINITIALIZED = (1u << 7), - GIT_SUBMODULE_STATUS_WD_ADDED = (1u << 8), - GIT_SUBMODULE_STATUS_WD_DELETED = (1u << 9), - GIT_SUBMODULE_STATUS_WD_MODIFIED = (1u << 10), - GIT_SUBMODULE_STATUS_WD_INDEX_MODIFIED = (1u << 11), - GIT_SUBMODULE_STATUS_WD_WD_MODIFIED = (1u << 12), - GIT_SUBMODULE_STATUS_WD_UNTRACKED = (1u << 13), -} git_submodule_status_t; - -#define GIT_SUBMODULE_STATUS__IN_FLAGS 0x000Fu -#define GIT_SUBMODULE_STATUS__INDEX_FLAGS 0x0070u -#define GIT_SUBMODULE_STATUS__WD_FLAGS 0x3F80u - -#define GIT_SUBMODULE_STATUS_IS_UNMODIFIED(S) \ - (((S) & ~GIT_SUBMODULE_STATUS__IN_FLAGS) == 0) - -#define GIT_SUBMODULE_STATUS_IS_INDEX_UNMODIFIED(S) \ - (((S) & GIT_SUBMODULE_STATUS__INDEX_FLAGS) == 0) - -#define GIT_SUBMODULE_STATUS_IS_WD_UNMODIFIED(S) \ - (((S) & (GIT_SUBMODULE_STATUS__WD_FLAGS & \ - ~GIT_SUBMODULE_STATUS_WD_UNINITIALIZED)) == 0) - -#define GIT_SUBMODULE_STATUS_IS_WD_DIRTY(S) \ - (((S) & (GIT_SUBMODULE_STATUS_WD_INDEX_MODIFIED | \ - GIT_SUBMODULE_STATUS_WD_WD_MODIFIED | \ - GIT_SUBMODULE_STATUS_WD_UNTRACKED)) != 0) - -/** - * Function pointer to receive each submodule - * - * @param sm git_submodule currently being visited - * @param name name of the submodule - * @param payload value you passed to the foreach function as payload - * @return 0 on success or error code - */ -typedef int (*git_submodule_cb)( - git_submodule *sm, const char *name, void *payload); - -/** - * Submodule update options structure - * - * Use the GIT_SUBMODULE_UPDATE_OPTIONS_INIT to get the default settings, - * like this: - * - * git_submodule_update_options opts = GIT_SUBMODULE_UPDATE_OPTIONS_INIT; - */ -typedef struct git_submodule_update_options { - unsigned int version; - - /** - * These options are passed to the checkout step. To disable - * checkout, set the `checkout_strategy` to - * `GIT_CHECKOUT_NONE`. Generally you will want the use - * GIT_CHECKOUT_SAFE to update files in the working - * directory. Use the `clone_checkout_strategy` field - * to set the checkout strategy that will be used in - * the case where update needs to clone the repository. - */ - git_checkout_options checkout_opts; - - /** - * Options which control the fetch, including callbacks. - * - * The callbacks to use for reporting fetch progress, and for acquiring - * credentials in the event they are needed. - */ - git_fetch_options fetch_opts; - - /** - * The checkout strategy to use when the sub repository needs to - * be cloned. Use GIT_CHECKOUT_SAFE to create all files - * in the working directory for the newly cloned repository. - */ - unsigned int clone_checkout_strategy; -} git_submodule_update_options; - -#define GIT_SUBMODULE_UPDATE_OPTIONS_VERSION 1 -#define GIT_SUBMODULE_UPDATE_OPTIONS_INIT \ - { GIT_CHECKOUT_OPTIONS_VERSION, \ - { GIT_CHECKOUT_OPTIONS_VERSION, GIT_CHECKOUT_SAFE }, \ - GIT_FETCH_OPTIONS_INIT, GIT_CHECKOUT_SAFE } - -/** - * Initializes a `git_submodule_update_options` with default values. - * Equivalent to creating an instance with GIT_SUBMODULE_UPDATE_OPTIONS_INIT. - * - * @param opts The `git_submodule_update_options` instance to initialize. - * @param version Version of struct; pass `GIT_SUBMODULE_UPDATE_OPTIONS_VERSION` - * @return Zero on success; -1 on failure. - */ -GIT_EXTERN(int) git_submodule_update_init_options( - git_submodule_update_options *opts, unsigned int version); - -/** - * Update a submodule. This will clone a missing submodule and - * checkout the subrepository to the commit specified in the index of - * containing repository. - * - * @param submodule Submodule object - * @param init If the submodule is not initialized, setting this flag to true - * will initialize the submodule before updating. Otherwise, this will - * return an error if attempting to update an uninitialzed repository. - * but setting this to true forces them to be updated. - * @param options configuration options for the update. If NULL, the - * function works as though GIT_SUBMODULE_UPDATE_OPTIONS_INIT was passed. - * @return 0 on success, any non-zero return value from a callback - * function, or a negative value to indicate an error (use - * `giterr_last` for a detailed error message). - */ -GIT_EXTERN(int) git_submodule_update(git_submodule *submodule, int init, git_submodule_update_options *options); - -/** - * Lookup submodule information by name or path. - * - * Given either the submodule name or path (they are usually the same), this - * returns a structure describing the submodule. - * - * There are two expected error scenarios: - * - * - The submodule is not mentioned in the HEAD, the index, and the config, - * but does "exist" in the working directory (i.e. there is a subdirectory - * that appears to be a Git repository). In this case, this function - * returns GIT_EEXISTS to indicate a sub-repository exists but not in a - * state where a git_submodule can be instantiated. - * - The submodule is not mentioned in the HEAD, index, or config and the - * working directory doesn't contain a value git repo at that path. - * There may or may not be anything else at that path, but nothing that - * looks like a submodule. In this case, this returns GIT_ENOTFOUND. - * - * You must call `git_submodule_free` when done with the submodule. - * - * @param out Output ptr to submodule; pass NULL to just get return code - * @param repo The parent repository - * @param name The name of or path to the submodule; trailing slashes okay - * @return 0 on success, GIT_ENOTFOUND if submodule does not exist, - * GIT_EEXISTS if a repository is found in working directory only, - * -1 on other errors. - */ -GIT_EXTERN(int) git_submodule_lookup( - git_submodule **out, - git_repository *repo, - const char *name); - -/** - * Release a submodule - * - * @param submodule Submodule object - */ -GIT_EXTERN(void) git_submodule_free(git_submodule *submodule); - -/** - * Iterate over all tracked submodules of a repository. - * - * See the note on `git_submodule` above. This iterates over the tracked - * submodules as described therein. - * - * If you are concerned about items in the working directory that look like - * submodules but are not tracked, the diff API will generate a diff record - * for workdir items that look like submodules but are not tracked, showing - * them as added in the workdir. Also, the status API will treat the entire - * subdirectory of a contained git repo as a single GIT_STATUS_WT_NEW item. - * - * @param repo The repository - * @param callback Function to be called with the name of each submodule. - * Return a non-zero value to terminate the iteration. - * @param payload Extra data to pass to callback - * @return 0 on success, -1 on error, or non-zero return value of callback - */ -GIT_EXTERN(int) git_submodule_foreach( - git_repository *repo, - git_submodule_cb callback, - void *payload); - -/** - * Set up a new git submodule for checkout. - * - * This does "git submodule add" up to the fetch and checkout of the - * submodule contents. It preps a new submodule, creates an entry in - * .gitmodules and creates an empty initialized repository either at the - * given path in the working directory or in .git/modules with a gitlink - * from the working directory to the new repo. - * - * To fully emulate "git submodule add" call this function, then open the - * submodule repo and perform the clone step as needed. Lastly, call - * `git_submodule_add_finalize()` to wrap up adding the new submodule and - * .gitmodules to the index to be ready to commit. - * - * You must call `git_submodule_free` on the submodule object when done. - * - * @param out The newly created submodule ready to open for clone - * @param repo The repository in which you want to create the submodule - * @param url URL for the submodule's remote - * @param path Path at which the submodule should be created - * @param use_gitlink Should workdir contain a gitlink to the repo in - * .git/modules vs. repo directly in workdir. - * @return 0 on success, GIT_EEXISTS if submodule already exists, - * -1 on other errors. - */ -GIT_EXTERN(int) git_submodule_add_setup( - git_submodule **out, - git_repository *repo, - const char *url, - const char *path, - int use_gitlink); - -/** - * Resolve the setup of a new git submodule. - * - * This should be called on a submodule once you have called add setup - * and done the clone of the submodule. This adds the .gitmodules file - * and the newly cloned submodule to the index to be ready to be committed - * (but doesn't actually do the commit). - * - * @param submodule The submodule to finish adding. - */ -GIT_EXTERN(int) git_submodule_add_finalize(git_submodule *submodule); - -/** - * Add current submodule HEAD commit to index of superproject. - * - * @param submodule The submodule to add to the index - * @param write_index Boolean if this should immediately write the index - * file. If you pass this as false, you will have to get the - * git_index and explicitly call `git_index_write()` on it to - * save the change. - * @return 0 on success, <0 on failure - */ -GIT_EXTERN(int) git_submodule_add_to_index( - git_submodule *submodule, - int write_index); - -/** - * Get the containing repository for a submodule. - * - * This returns a pointer to the repository that contains the submodule. - * This is a just a reference to the repository that was passed to the - * original `git_submodule_lookup()` call, so if that repository has been - * freed, then this may be a dangling reference. - * - * @param submodule Pointer to submodule object - * @return Pointer to `git_repository` - */ -GIT_EXTERN(git_repository *) git_submodule_owner(git_submodule *submodule); - -/** - * Get the name of submodule. - * - * @param submodule Pointer to submodule object - * @return Pointer to the submodule name - */ -GIT_EXTERN(const char *) git_submodule_name(git_submodule *submodule); - -/** - * Get the path to the submodule. - * - * The path is almost always the same as the submodule name, but the - * two are actually not required to match. - * - * @param submodule Pointer to submodule object - * @return Pointer to the submodule path - */ -GIT_EXTERN(const char *) git_submodule_path(git_submodule *submodule); - -/** - * Get the URL for the submodule. - * - * @param submodule Pointer to submodule object - * @return Pointer to the submodule url - */ -GIT_EXTERN(const char *) git_submodule_url(git_submodule *submodule); - -/** - * Resolve a submodule url relative to the given repository. - * - * @param out buffer to store the absolute submodule url in - * @param repo Pointer to repository object - * @param url Relative url - * @return 0 or an error code - */ -GIT_EXTERN(int) git_submodule_resolve_url(git_buf *out, git_repository *repo, const char *url); - -/** -* Get the branch for the submodule. -* -* @param submodule Pointer to submodule object -* @return Pointer to the submodule branch -*/ -GIT_EXTERN(const char *) git_submodule_branch(git_submodule *submodule); - -/** - * Set the branch for the submodule in the configuration - * - * After calling this, you may wish to call `git_submodule_sync()` to - * write the changes to the checked out submodule repository. - * - * @param repo the repository to affect - * @param name the name of the submodule to configure - * @param branch Branch that should be used for the submodule - * @return 0 on success, <0 on failure - */ -GIT_EXTERN(int) git_submodule_set_branch(git_repository *repo, const char *name, const char *branch); - -/** - * Set the URL for the submodule in the configuration - * - * - * After calling this, you may wish to call `git_submodule_sync()` to - * write the changes to the checked out submodule repository. - * - * @param repo the repository to affect - * @param name the name of the submodule to configure - * @param url URL that should be used for the submodule - * @return 0 on success, <0 on failure - */ -GIT_EXTERN(int) git_submodule_set_url(git_repository *repo, const char *name, const char *url); - -/** - * Get the OID for the submodule in the index. - * - * @param submodule Pointer to submodule object - * @return Pointer to git_oid or NULL if submodule is not in index. - */ -GIT_EXTERN(const git_oid *) git_submodule_index_id(git_submodule *submodule); - -/** - * Get the OID for the submodule in the current HEAD tree. - * - * @param submodule Pointer to submodule object - * @return Pointer to git_oid or NULL if submodule is not in the HEAD. - */ -GIT_EXTERN(const git_oid *) git_submodule_head_id(git_submodule *submodule); - -/** - * Get the OID for the submodule in the current working directory. - * - * This returns the OID that corresponds to looking up 'HEAD' in the checked - * out submodule. If there are pending changes in the index or anything - * else, this won't notice that. You should call `git_submodule_status()` - * for a more complete picture about the state of the working directory. - * - * @param submodule Pointer to submodule object - * @return Pointer to git_oid or NULL if submodule is not checked out. - */ -GIT_EXTERN(const git_oid *) git_submodule_wd_id(git_submodule *submodule); - -/** - * Get the ignore rule that will be used for the submodule. - * - * These values control the behavior of `git_submodule_status()` for this - * submodule. There are four ignore values: - * - * - **GIT_SUBMODULE_IGNORE_NONE** will consider any change to the contents - * of the submodule from a clean checkout to be dirty, including the - * addition of untracked files. This is the default if unspecified. - * - **GIT_SUBMODULE_IGNORE_UNTRACKED** examines the contents of the - * working tree (i.e. call `git_status_foreach()` on the submodule) but - * UNTRACKED files will not count as making the submodule dirty. - * - **GIT_SUBMODULE_IGNORE_DIRTY** means to only check if the HEAD of the - * submodule has moved for status. This is fast since it does not need to - * scan the working tree of the submodule at all. - * - **GIT_SUBMODULE_IGNORE_ALL** means not to open the submodule repo. - * The working directory will be consider clean so long as there is a - * checked out version present. - * - * @param submodule The submodule to check - * @return The current git_submodule_ignore_t valyue what will be used for - * this submodule. - */ -GIT_EXTERN(git_submodule_ignore_t) git_submodule_ignore( - git_submodule *submodule); - -/** - * Set the ignore rule for the submodule in the configuration - * - * This does not affect any currently-loaded instances. - * - * @param repo the repository to affect - * @param name the name of the submdule - * @param ignore The new value for the ignore rule - * @return 0 or an error code - */ -GIT_EXTERN(int) git_submodule_set_ignore( - git_repository *repo, - const char *name, - git_submodule_ignore_t ignore); - -/** - * Get the update rule that will be used for the submodule. - * - * This value controls the behavior of the `git submodule update` command. - * There are four useful values documented with `git_submodule_update_t`. - * - * @param submodule The submodule to check - * @return The current git_submodule_update_t value that will be used - * for this submodule. - */ -GIT_EXTERN(git_submodule_update_t) git_submodule_update_strategy( - git_submodule *submodule); - -/** - * Set the update rule for the submodule in the configuration - * - * This setting won't affect any existing instances. - * - * @param repo the repository to affect - * @param name the name of the submodule to configure - * @param update The new value to use - * @return 0 or an error code - */ -GIT_EXTERN(int) git_submodule_set_update( - git_repository *repo, - const char *name, - git_submodule_update_t update); - -/** - * Read the fetchRecurseSubmodules rule for a submodule. - * - * This accesses the submodule..fetchRecurseSubmodules value for - * the submodule that controls fetching behavior for the submodule. - * - * Note that at this time, libgit2 does not honor this setting and the - * fetch functionality current ignores submodules. - * - * @return 0 if fetchRecurseSubmodules is false, 1 if true - */ -GIT_EXTERN(git_submodule_recurse_t) git_submodule_fetch_recurse_submodules( - git_submodule *submodule); - -/** - * Set the fetchRecurseSubmodules rule for a submodule in the configuration - * - * This setting won't affect any existing instances. - * - * @param repo the repository to affect - * @param name the submodule to configure - * @param fetch_recurse_submodules Boolean value - * @return old value for fetchRecurseSubmodules - */ -GIT_EXTERN(int) git_submodule_set_fetch_recurse_submodules( - git_repository *repo, - const char *name, - git_submodule_recurse_t fetch_recurse_submodules); - -/** - * Copy submodule info into ".git/config" file. - * - * Just like "git submodule init", this copies information about the - * submodule into ".git/config". You can use the accessor functions - * above to alter the in-memory git_submodule object and control what - * is written to the config, overriding what is in .gitmodules. - * - * @param submodule The submodule to write into the superproject config - * @param overwrite By default, existing entries will not be overwritten, - * but setting this to true forces them to be updated. - * @return 0 on success, <0 on failure. - */ -GIT_EXTERN(int) git_submodule_init(git_submodule *submodule, int overwrite); - -/** - * Set up the subrepository for a submodule in preparation for clone. - * - * This function can be called to init and set up a submodule - * repository from a submodule in preparation to clone it from - * its remote. - * - * @param out Output pointer to the created git repository. - * @param sm The submodule to create a new subrepository from. - * @param use_gitlink Should the workdir contain a gitlink to - * the repo in .git/modules vs. repo directly in workdir. - * @return 0 on success, <0 on failure. - */ -GIT_EXTERN(int) git_submodule_repo_init( - git_repository **out, - const git_submodule *sm, - int use_gitlink); - -/** - * Copy submodule remote info into submodule repo. - * - * This copies the information about the submodules URL into the checked out - * submodule config, acting like "git submodule sync". This is useful if - * you have altered the URL for the submodule (or it has been altered by a - * fetch of upstream changes) and you need to update your local repo. - */ -GIT_EXTERN(int) git_submodule_sync(git_submodule *submodule); - -/** - * Open the repository for a submodule. - * - * This is a newly opened repository object. The caller is responsible for - * calling `git_repository_free()` on it when done. Multiple calls to this - * function will return distinct `git_repository` objects. This will only - * work if the submodule is checked out into the working directory. - * - * @param repo Pointer to the submodule repo which was opened - * @param submodule Submodule to be opened - * @return 0 on success, <0 if submodule repo could not be opened. - */ -GIT_EXTERN(int) git_submodule_open( - git_repository **repo, - git_submodule *submodule); - -/** - * Reread submodule info from config, index, and HEAD. - * - * Call this to reread cached submodule information for this submodule if - * you have reason to believe that it has changed. - * - * @param submodule The submodule to reload - * @param force Force reload even if the data doesn't seem out of date - * @return 0 on success, <0 on error - */ -GIT_EXTERN(int) git_submodule_reload(git_submodule *submodule, int force); - -/** - * Get the status for a submodule. - * - * This looks at a submodule and tries to determine the status. It - * will return a combination of the `GIT_SUBMODULE_STATUS` values above. - * How deeply it examines the working directory to do this will depend - * on the `git_submodule_ignore_t` value for the submodule. - * - * @param status Combination of `GIT_SUBMODULE_STATUS` flags - * @param repo the repository in which to look - * @param name name of the submodule - * @param ignore the ignore rules to follow - * @return 0 on success, <0 on error - */ -GIT_EXTERN(int) git_submodule_status( - unsigned int *status, - git_repository *repo, - const char *name, - git_submodule_ignore_t ignore); - -/** - * Get the locations of submodule information. - * - * This is a bit like a very lightweight version of `git_submodule_status`. - * It just returns a made of the first four submodule status values (i.e. - * the ones like GIT_SUBMODULE_STATUS_IN_HEAD, etc) that tell you where the - * submodule data comes from (i.e. the HEAD commit, gitmodules file, etc.). - * This can be useful if you want to know if the submodule is present in the - * working directory at this point in time, etc. - * - * @param location_status Combination of first four `GIT_SUBMODULE_STATUS` flags - * @param submodule Submodule for which to get status - * @return 0 on success, <0 on error - */ -GIT_EXTERN(int) git_submodule_location( - unsigned int *location_status, - git_submodule *submodule); - -/** @} */ -GIT_END_DECL -#endif diff --git a/vendor/libgit2/include/git2/sys/commit.h b/vendor/libgit2/include/git2/sys/commit.h deleted file mode 100644 index 627d3ae2e..000000000 --- a/vendor/libgit2/include/git2/sys/commit.h +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_sys_git_commit_h__ -#define INCLUDE_sys_git_commit_h__ - -#include "git2/common.h" -#include "git2/types.h" -#include "git2/oid.h" - -/** - * @file git2/sys/commit.h - * @brief Low-level Git commit creation - * @defgroup git_backend Git custom backend APIs - * @ingroup Git - * @{ - */ -GIT_BEGIN_DECL - -/** - * Create new commit in the repository from a list of `git_oid` values. - * - * See documentation for `git_commit_create()` for information about the - * parameters, as the meaning is identical excepting that `tree` and - * `parents` now take `git_oid`. This is a dangerous API in that nor - * the `tree`, neither the `parents` list of `git_oid`s are checked for - * validity. - * - * @see git_commit_create - */ -GIT_EXTERN(int) git_commit_create_from_ids( - git_oid *id, - git_repository *repo, - const char *update_ref, - const git_signature *author, - const git_signature *committer, - const char *message_encoding, - const char *message, - const git_oid *tree, - size_t parent_count, - const git_oid *parents[]); - -/** - * Callback function to return parents for commit. - * - * This is invoked with the count of the number of parents processed so far - * along with the user supplied payload. This should return a git_oid of - * the next parent or NULL if all parents have been provided. - */ -typedef const git_oid *(*git_commit_parent_callback)(size_t idx, void *payload); - -/** - * Create a new commit in the repository with an callback to supply parents. - * - * See documentation for `git_commit_create()` for information about the - * parameters, as the meaning is identical excepting that `tree` takes a - * `git_oid` and doesn't check for validity, and `parent_cb` is invoked - * with `parent_payload` and should return `git_oid` values or NULL to - * indicate that all parents are accounted for. - * - * @see git_commit_create - */ -GIT_EXTERN(int) git_commit_create_from_callback( - git_oid *id, - git_repository *repo, - const char *update_ref, - const git_signature *author, - const git_signature *committer, - const char *message_encoding, - const char *message, - const git_oid *tree, - git_commit_parent_callback parent_cb, - void *parent_payload); - -/** @} */ -GIT_END_DECL -#endif diff --git a/vendor/libgit2/include/git2/sys/config.h b/vendor/libgit2/include/git2/sys/config.h deleted file mode 100644 index 4dad6da42..000000000 --- a/vendor/libgit2/include/git2/sys/config.h +++ /dev/null @@ -1,127 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_sys_git_config_backend_h__ -#define INCLUDE_sys_git_config_backend_h__ - -#include "git2/common.h" -#include "git2/types.h" -#include "git2/config.h" - -/** - * @file git2/sys/config.h - * @brief Git config backend routines - * @defgroup git_backend Git custom backend APIs - * @ingroup Git - * @{ - */ -GIT_BEGIN_DECL - -/** - * Every iterator must have this struct as its first element, so the - * API can talk to it. You'd define your iterator as - * - * struct my_iterator { - * git_config_iterator parent; - * ... - * } - * - * and assign `iter->parent.backend` to your `git_config_backend`. - */ -struct git_config_iterator { - git_config_backend *backend; - unsigned int flags; - - /** - * Return the current entry and advance the iterator. The - * memory belongs to the library. - */ - int (*next)(git_config_entry **entry, git_config_iterator *iter); - - /** - * Free the iterator - */ - void (*free)(git_config_iterator *iter); -}; - -/** - * Generic backend that implements the interface to - * access a configuration file - */ -struct git_config_backend { - unsigned int version; - /** True if this backend is for a snapshot */ - int readonly; - struct git_config *cfg; - - /* Open means open the file/database and parse if necessary */ - int (*open)(struct git_config_backend *, git_config_level_t level); - int (*get)(struct git_config_backend *, const char *key, git_config_entry **entry); - int (*set)(struct git_config_backend *, const char *key, const char *value); - int (*set_multivar)(git_config_backend *cfg, const char *name, const char *regexp, const char *value); - int (*del)(struct git_config_backend *, const char *key); - int (*del_multivar)(struct git_config_backend *, const char *key, const char *regexp); - int (*iterator)(git_config_iterator **, struct git_config_backend *); - /** Produce a read-only version of this backend */ - int (*snapshot)(struct git_config_backend **, struct git_config_backend *); - /** - * Lock this backend. - * - * Prevent any writes to the data store backing this - * backend. Any updates must not be visible to any other - * readers. - */ - int (*lock)(struct git_config_backend *); - /** - * Unlock the data store backing this backend. If success is - * true, the changes should be committed, otherwise rolled - * back. - */ - int (*unlock)(struct git_config_backend *, int success); - void (*free)(struct git_config_backend *); -}; -#define GIT_CONFIG_BACKEND_VERSION 1 -#define GIT_CONFIG_BACKEND_INIT {GIT_CONFIG_BACKEND_VERSION} - -/** - * Initializes a `git_config_backend` with default values. Equivalent to - * creating an instance with GIT_CONFIG_BACKEND_INIT. - * - * @param backend the `git_config_backend` struct to initialize. - * @param version Version of struct; pass `GIT_CONFIG_BACKEND_VERSION` - * @return Zero on success; -1 on failure. - */ -GIT_EXTERN(int) git_config_init_backend( - git_config_backend *backend, - unsigned int version); - -/** - * Add a generic config file instance to an existing config - * - * Note that the configuration object will free the file - * automatically. - * - * Further queries on this config object will access each - * of the config file instances in order (instances with - * a higher priority level will be accessed first). - * - * @param cfg the configuration to add the file to - * @param file the configuration file (backend) to add - * @param level the priority level of the backend - * @param force if a config file already exists for the given - * priority level, replace it - * @return 0 on success, GIT_EEXISTS when adding more than one file - * for a given priority level (and force_replace set to 0), or error code - */ -GIT_EXTERN(int) git_config_add_backend( - git_config *cfg, - git_config_backend *file, - git_config_level_t level, - int force); - -/** @} */ -GIT_END_DECL -#endif diff --git a/vendor/libgit2/include/git2/sys/diff.h b/vendor/libgit2/include/git2/sys/diff.h deleted file mode 100644 index aefd7b997..000000000 --- a/vendor/libgit2/include/git2/sys/diff.h +++ /dev/null @@ -1,94 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_sys_git_diff_h__ -#define INCLUDE_sys_git_diff_h__ - -#include "git2/common.h" -#include "git2/types.h" -#include "git2/oid.h" -#include "git2/diff.h" -#include "git2/status.h" - -/** - * @file git2/sys/diff.h - * @brief Low-level Git diff utilities - * @ingroup Git - * @{ - */ -GIT_BEGIN_DECL - -/** - * Diff print callback that writes to a git_buf. - * - * This function is provided not for you to call it directly, but instead - * so you can use it as a function pointer to the `git_diff_print` or - * `git_patch_print` APIs. When using those APIs, you specify a callback - * to actually handle the diff and/or patch data. - * - * Use this callback to easily write that data to a `git_buf` buffer. You - * must pass a `git_buf *` value as the payload to the `git_diff_print` - * and/or `git_patch_print` function. The data will be appended to the - * buffer (after any existing content). - */ -GIT_EXTERN(int) git_diff_print_callback__to_buf( - const git_diff_delta *delta, - const git_diff_hunk *hunk, - const git_diff_line *line, - void *payload); /**< payload must be a `git_buf *` */ - -/** - * Diff print callback that writes to stdio FILE handle. - * - * This function is provided not for you to call it directly, but instead - * so you can use it as a function pointer to the `git_diff_print` or - * `git_patch_print` APIs. When using those APIs, you specify a callback - * to actually handle the diff and/or patch data. - * - * Use this callback to easily write that data to a stdio FILE handle. You - * must pass a `FILE *` value (such as `stdout` or `stderr` or the return - * value from `fopen()`) as the payload to the `git_diff_print` - * and/or `git_patch_print` function. If you pass NULL, this will write - * data to `stdout`. - */ -GIT_EXTERN(int) git_diff_print_callback__to_file_handle( - const git_diff_delta *delta, - const git_diff_hunk *hunk, - const git_diff_line *line, - void *payload); /**< payload must be a `FILE *` */ - - -/** - * Performance data from diffing - */ -typedef struct { - unsigned int version; - size_t stat_calls; /**< Number of stat() calls performed */ - size_t oid_calculations; /**< Number of ID calculations */ -} git_diff_perfdata; - -#define GIT_DIFF_PERFDATA_VERSION 1 -#define GIT_DIFF_PERFDATA_INIT {GIT_DIFF_PERFDATA_VERSION,0,0} - -/** - * Get performance data for a diff object. - * - * @param out Structure to be filled with diff performance data - * @param diff Diff to read performance data from - * @return 0 for success, <0 for error - */ -GIT_EXTERN(int) git_diff_get_perfdata( - git_diff_perfdata *out, const git_diff *diff); - -/** - * Get performance data for diffs from a git_status_list - */ -GIT_EXTERN(int) git_status_list_get_perfdata( - git_diff_perfdata *out, const git_status_list *status); - -/** @} */ -GIT_END_DECL -#endif diff --git a/vendor/libgit2/include/git2/sys/filter.h b/vendor/libgit2/include/git2/sys/filter.h deleted file mode 100644 index d0e5d4d6f..000000000 --- a/vendor/libgit2/include/git2/sys/filter.h +++ /dev/null @@ -1,321 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_sys_git_filter_h__ -#define INCLUDE_sys_git_filter_h__ - -#include "git2/filter.h" - -/** - * @file git2/sys/filter.h - * @brief Git filter backend and plugin routines - * @defgroup git_backend Git custom backend APIs - * @ingroup Git - * @{ - */ -GIT_BEGIN_DECL - -/** - * Look up a filter by name - * - * @param name The name of the filter - * @return Pointer to the filter object or NULL if not found - */ -GIT_EXTERN(git_filter *) git_filter_lookup(const char *name); - -#define GIT_FILTER_CRLF "crlf" -#define GIT_FILTER_IDENT "ident" - -/** - * This is priority that the internal CRLF filter will be registered with - */ -#define GIT_FILTER_CRLF_PRIORITY 0 - -/** - * This is priority that the internal ident filter will be registered with - */ -#define GIT_FILTER_IDENT_PRIORITY 100 - -/** - * This is priority to use with a custom filter to imitate a core Git - * filter driver, so that it will be run last on checkout and first on - * checkin. You do not have to use this, but it helps compatibility. - */ -#define GIT_FILTER_DRIVER_PRIORITY 200 - -/** - * Create a new empty filter list - * - * Normally you won't use this because `git_filter_list_load` will create - * the filter list for you, but you can use this in combination with the - * `git_filter_lookup` and `git_filter_list_push` functions to assemble - * your own chains of filters. - */ -GIT_EXTERN(int) git_filter_list_new( - git_filter_list **out, - git_repository *repo, - git_filter_mode_t mode, - uint32_t options); - -/** - * Add a filter to a filter list with the given payload. - * - * Normally you won't have to do this because the filter list is created - * by calling the "check" function on registered filters when the filter - * attributes are set, but this does allow more direct manipulation of - * filter lists when desired. - * - * Note that normally the "check" function can set up a payload for the - * filter. Using this function, you can either pass in a payload if you - * know the expected payload format, or you can pass NULL. Some filters - * may fail with a NULL payload. Good luck! - */ -GIT_EXTERN(int) git_filter_list_push( - git_filter_list *fl, git_filter *filter, void *payload); - -/** - * Look up how many filters are in the list - * - * We will attempt to apply all of these filters to any data passed in, - * but note that the filter apply action still has the option of skipping - * data that is passed in (for example, the CRLF filter will skip data - * that appears to be binary). - * - * @param fl A filter list - * @return The number of filters in the list - */ -GIT_EXTERN(size_t) git_filter_list_length(const git_filter_list *fl); - -/** - * A filter source represents a file/blob to be processed - */ -typedef struct git_filter_source git_filter_source; - -/** - * Get the repository that the source data is coming from. - */ -GIT_EXTERN(git_repository *) git_filter_source_repo(const git_filter_source *src); - -/** - * Get the path that the source data is coming from. - */ -GIT_EXTERN(const char *) git_filter_source_path(const git_filter_source *src); - -/** - * Get the file mode of the source file - * If the mode is unknown, this will return 0 - */ -GIT_EXTERN(uint16_t) git_filter_source_filemode(const git_filter_source *src); - -/** - * Get the OID of the source - * If the OID is unknown (often the case with GIT_FILTER_CLEAN) then - * this will return NULL. - */ -GIT_EXTERN(const git_oid *) git_filter_source_id(const git_filter_source *src); - -/** - * Get the git_filter_mode_t to be used - */ -GIT_EXTERN(git_filter_mode_t) git_filter_source_mode(const git_filter_source *src); - -/** - * Get the combination git_filter_flag_t options to be applied - */ -GIT_EXTERN(uint32_t) git_filter_source_flags(const git_filter_source *src); - -/** - * Initialize callback on filter - * - * Specified as `filter.initialize`, this is an optional callback invoked - * before a filter is first used. It will be called once at most. - * - * If non-NULL, the filter's `initialize` callback will be invoked right - * before the first use of the filter, so you can defer expensive - * initialization operations (in case libgit2 is being used in a way that - * doesn't need the filter). - */ -typedef int (*git_filter_init_fn)(git_filter *self); - -/** - * Shutdown callback on filter - * - * Specified as `filter.shutdown`, this is an optional callback invoked - * when the filter is unregistered or when libgit2 is shutting down. It - * will be called once at most and should release resources as needed. - * This may be called even if the `initialize` callback was not made. - * - * Typically this function will free the `git_filter` object itself. - */ -typedef void (*git_filter_shutdown_fn)(git_filter *self); - -/** - * Callback to decide if a given source needs this filter - * - * Specified as `filter.check`, this is an optional callback that checks - * if filtering is needed for a given source. - * - * It should return 0 if the filter should be applied (i.e. success), - * GIT_PASSTHROUGH if the filter should not be applied, or an error code - * to fail out of the filter processing pipeline and return to the caller. - * - * The `attr_values` will be set to the values of any attributes given in - * the filter definition. See `git_filter` below for more detail. - * - * The `payload` will be a pointer to a reference payload for the filter. - * This will start as NULL, but `check` can assign to this pointer for - * later use by the `apply` callback. Note that the value should be heap - * allocated (not stack), so that it doesn't go away before the `apply` - * callback can use it. If a filter allocates and assigns a value to the - * `payload`, it will need a `cleanup` callback to free the payload. - */ -typedef int (*git_filter_check_fn)( - git_filter *self, - void **payload, /* points to NULL ptr on entry, may be set */ - const git_filter_source *src, - const char **attr_values); - -/** - * Callback to actually perform the data filtering - * - * Specified as `filter.apply`, this is the callback that actually filters - * data. If it successfully writes the output, it should return 0. Like - * `check`, it can return GIT_PASSTHROUGH to indicate that the filter - * doesn't want to run. Other error codes will stop filter processing and - * return to the caller. - * - * The `payload` value will refer to any payload that was set by the - * `check` callback. It may be read from or written to as needed. - */ -typedef int (*git_filter_apply_fn)( - git_filter *self, - void **payload, /* may be read and/or set */ - git_buf *to, - const git_buf *from, - const git_filter_source *src); - -typedef int (*git_filter_stream_fn)( - git_writestream **out, - git_filter *self, - void **payload, - const git_filter_source *src, - git_writestream *next); - -/** - * Callback to clean up after filtering has been applied - * - * Specified as `filter.cleanup`, this is an optional callback invoked - * after the filter has been applied. If the `check` or `apply` callbacks - * allocated a `payload` to keep per-source filter state, use this - * callback to free that payload and release resources as required. - */ -typedef void (*git_filter_cleanup_fn)( - git_filter *self, - void *payload); - -/** - * Filter structure used to register custom filters. - * - * To associate extra data with a filter, allocate extra data and put the - * `git_filter` struct at the start of your data buffer, then cast the - * `self` pointer to your larger structure when your callback is invoked. - */ -struct git_filter { - /** The `version` field should be set to `GIT_FILTER_VERSION`. */ - unsigned int version; - - /** - * A whitespace-separated list of attribute names to check for this - * filter (e.g. "eol crlf text"). If the attribute name is bare, it - * will be simply loaded and passed to the `check` callback. If it - * has a value (i.e. "name=value"), the attribute must match that - * value for the filter to be applied. The value may be a wildcard - * (eg, "name=*"), in which case the filter will be invoked for any - * value for the given attribute name. See the attribute parameter - * of the `check` callback for the attribute value that was specified. - */ - const char *attributes; - - /** Called when the filter is first used for any file. */ - git_filter_init_fn initialize; - - /** Called when the filter is removed or unregistered from the system. */ - git_filter_shutdown_fn shutdown; - - /** - * Called to determine whether the filter should be invoked for a - * given file. If this function returns `GIT_PASSTHROUGH` then the - * `apply` function will not be invoked and the contents will be passed - * through unmodified. - */ - git_filter_check_fn check; - - /** - * Called to actually apply the filter to file contents. If this - * function returns `GIT_PASSTHROUGH` then the contents will be passed - * through unmodified. - */ - git_filter_apply_fn apply; - - /** - * Called to apply the filter in a streaming manner. If this is not - * specified then the system will call `apply` with the whole buffer. - */ - git_filter_stream_fn stream; - - /** Called when the system is done filtering for a file. */ - git_filter_cleanup_fn cleanup; -}; - -#define GIT_FILTER_VERSION 1 - -/** - * Register a filter under a given name with a given priority. - * - * As mentioned elsewhere, the initialize callback will not be invoked - * immediately. It is deferred until the filter is used in some way. - * - * A filter's attribute checks and `check` and `apply` callbacks will be - * issued in order of `priority` on smudge (to workdir), and in reverse - * order of `priority` on clean (to odb). - * - * Two filters are preregistered with libgit2: - * - GIT_FILTER_CRLF with priority 0 - * - GIT_FILTER_IDENT with priority 100 - * - * Currently the filter registry is not thread safe, so any registering or - * deregistering of filters must be done outside of any possible usage of - * the filters (i.e. during application setup or shutdown). - * - * @param name A name by which the filter can be referenced. Attempting - * to register with an in-use name will return GIT_EEXISTS. - * @param filter The filter definition. This pointer will be stored as is - * by libgit2 so it must be a durable allocation (either static - * or on the heap). - * @param priority The priority for filter application - * @return 0 on successful registry, error code <0 on failure - */ -GIT_EXTERN(int) git_filter_register( - const char *name, git_filter *filter, int priority); - -/** - * Remove the filter with the given name - * - * Attempting to remove the builtin libgit2 filters is not permitted and - * will return an error. - * - * Currently the filter registry is not thread safe, so any registering or - * deregistering of filters must be done outside of any possible usage of - * the filters (i.e. during application setup or shutdown). - * - * @param name The name under which the filter was registered - * @return 0 on success, error code <0 on failure - */ -GIT_EXTERN(int) git_filter_unregister(const char *name); - -/** @} */ -GIT_END_DECL -#endif diff --git a/vendor/libgit2/include/git2/sys/hashsig.h b/vendor/libgit2/include/git2/sys/hashsig.h deleted file mode 100644 index 09c19aec0..000000000 --- a/vendor/libgit2/include/git2/sys/hashsig.h +++ /dev/null @@ -1,106 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_sys_hashsig_h__ -#define INCLUDE_sys_hashsig_h__ - -#include "git2/common.h" - -GIT_BEGIN_DECL - -/** - * Similarity signature of arbitrary text content based on line hashes - */ -typedef struct git_hashsig git_hashsig; - -/** - * Options for hashsig computation - * - * The options GIT_HASHSIG_NORMAL, GIT_HASHSIG_IGNORE_WHITESPACE, - * GIT_HASHSIG_SMART_WHITESPACE are exclusive and should not be combined. - */ -typedef enum { - /** - * Use all data - */ - GIT_HASHSIG_NORMAL = 0, - - /** - * Ignore whitespace - */ - GIT_HASHSIG_IGNORE_WHITESPACE = (1 << 0), - - /** - * Ignore \r and all space after \n - */ - GIT_HASHSIG_SMART_WHITESPACE = (1 << 1), - - /** - * Allow hashing of small files - */ - GIT_HASHSIG_ALLOW_SMALL_FILES = (1 << 2) -} git_hashsig_option_t; - -/** - * Compute a similarity signature for a text buffer - * - * If you have passed the option GIT_HASHSIG_IGNORE_WHITESPACE, then the - * whitespace will be removed from the buffer while it is being processed, - * modifying the buffer in place. Sorry about that! - * - * @param out The computed similarity signature. - * @param buf The input buffer. - * @param buflen The input buffer size. - * @param opts The signature computation options (see above). - * @return 0 on success, GIT_EBUFS if the buffer doesn't contain enough data to - * compute a valid signature (unless GIT_HASHSIG_ALLOW_SMALL_FILES is set), or - * error code. - */ -GIT_EXTERN(int) git_hashsig_create( - git_hashsig **out, - const char *buf, - size_t buflen, - git_hashsig_option_t opts); - -/** - * Compute a similarity signature for a text file - * - * This walks through the file, only loading a maximum of 4K of file data at - * a time. Otherwise, it acts just like `git_hashsig_create`. - * - * @param out The computed similarity signature. - * @param path The path to the input file. - * @param opts The signature computation options (see above). - * @return 0 on success, GIT_EBUFS if the buffer doesn't contain enough data to - * compute a valid signature (unless GIT_HASHSIG_ALLOW_SMALL_FILES is set), or - * error code. - */ -GIT_EXTERN(int) git_hashsig_create_fromfile( - git_hashsig **out, - const char *path, - git_hashsig_option_t opts); - -/** - * Release memory for a content similarity signature - * - * @param sig The similarity signature to free. - */ -GIT_EXTERN(void) git_hashsig_free(git_hashsig *sig); - -/** - * Measure similarity score between two similarity signatures - * - * @param a The first similarity signature to compare. - * @param b The second similarity signature to compare. - * @return [0 to 100] on success as the similarity score, or error code. - */ -GIT_EXTERN(int) git_hashsig_compare( - const git_hashsig *a, - const git_hashsig *b); - -GIT_END_DECL - -#endif diff --git a/vendor/libgit2/include/git2/sys/index.h b/vendor/libgit2/include/git2/sys/index.h deleted file mode 100644 index 2e2b87e68..000000000 --- a/vendor/libgit2/include/git2/sys/index.h +++ /dev/null @@ -1,177 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_sys_git_index_h__ -#define INCLUDE_sys_git_index_h__ - -/** - * @file git2/sys/index.h - * @brief Low-level Git index manipulation routines - * @defgroup git_backend Git custom backend APIs - * @ingroup Git - * @{ - */ -GIT_BEGIN_DECL - -/** Representation of a rename conflict entry in the index. */ -typedef struct git_index_name_entry { - char *ancestor; - char *ours; - char *theirs; -} git_index_name_entry; - -/** Representation of a resolve undo entry in the index. */ -typedef struct git_index_reuc_entry { - uint32_t mode[3]; - git_oid oid[3]; - char *path; -} git_index_reuc_entry; - -/** @name Conflict Name entry functions - * - * These functions work on rename conflict entries. - */ -/**@{*/ - -/** - * Get the count of filename conflict entries currently in the index. - * - * @param index an existing index object - * @return integer of count of current filename conflict entries - */ -GIT_EXTERN(size_t) git_index_name_entrycount(git_index *index); - -/** - * Get a filename conflict entry from the index. - * - * The returned entry is read-only and should not be modified - * or freed by the caller. - * - * @param index an existing index object - * @param n the position of the entry - * @return a pointer to the filename conflict entry; NULL if out of bounds - */ -GIT_EXTERN(const git_index_name_entry *) git_index_name_get_byindex( - git_index *index, size_t n); - -/** - * Record the filenames involved in a rename conflict. - * - * @param index an existing index object - * @param ancestor the path of the file as it existed in the ancestor - * @param ours the path of the file as it existed in our tree - * @param theirs the path of the file as it existed in their tree - */ -GIT_EXTERN(int) git_index_name_add(git_index *index, - const char *ancestor, const char *ours, const char *theirs); - -/** - * Remove all filename conflict entries. - * - * @param index an existing index object - */ -GIT_EXTERN(void) git_index_name_clear(git_index *index); - -/**@}*/ - -/** @name Resolve Undo (REUC) index entry manipulation. - * - * These functions work on the Resolve Undo index extension and contains - * data about the original files that led to a merge conflict. - */ -/**@{*/ - -/** - * Get the count of resolve undo entries currently in the index. - * - * @param index an existing index object - * @return integer of count of current resolve undo entries - */ -GIT_EXTERN(size_t) git_index_reuc_entrycount(git_index *index); - -/** - * Finds the resolve undo entry that points to the given path in the Git - * index. - * - * @param at_pos the address to which the position of the reuc entry is written (optional) - * @param index an existing index object - * @param path path to search - * @return 0 if found, < 0 otherwise (GIT_ENOTFOUND) - */ -GIT_EXTERN(int) git_index_reuc_find(size_t *at_pos, git_index *index, const char *path); - -/** - * Get a resolve undo entry from the index. - * - * The returned entry is read-only and should not be modified - * or freed by the caller. - * - * @param index an existing index object - * @param path path to search - * @return the resolve undo entry; NULL if not found - */ -GIT_EXTERN(const git_index_reuc_entry *) git_index_reuc_get_bypath(git_index *index, const char *path); - -/** - * Get a resolve undo entry from the index. - * - * The returned entry is read-only and should not be modified - * or freed by the caller. - * - * @param index an existing index object - * @param n the position of the entry - * @return a pointer to the resolve undo entry; NULL if out of bounds - */ -GIT_EXTERN(const git_index_reuc_entry *) git_index_reuc_get_byindex(git_index *index, size_t n); - -/** - * Adds a resolve undo entry for a file based on the given parameters. - * - * The resolve undo entry contains the OIDs of files that were involved - * in a merge conflict after the conflict has been resolved. This allows - * conflicts to be re-resolved later. - * - * If there exists a resolve undo entry for the given path in the index, - * it will be removed. - * - * This method will fail in bare index instances. - * - * @param index an existing index object - * @param path filename to add - * @param ancestor_mode mode of the ancestor file - * @param ancestor_id oid of the ancestor file - * @param our_mode mode of our file - * @param our_id oid of our file - * @param their_mode mode of their file - * @param their_id oid of their file - * @return 0 or an error code - */ -GIT_EXTERN(int) git_index_reuc_add(git_index *index, const char *path, - int ancestor_mode, const git_oid *ancestor_id, - int our_mode, const git_oid *our_id, - int their_mode, const git_oid *their_id); - -/** - * Remove an resolve undo entry from the index - * - * @param index an existing index object - * @param n position of the resolve undo entry to remove - * @return 0 or an error code - */ -GIT_EXTERN(int) git_index_reuc_remove(git_index *index, size_t n); - -/** - * Remove all resolve undo entries from the index - * - * @param index an existing index object - */ -GIT_EXTERN(void) git_index_reuc_clear(git_index *index); - -/**@}*/ - -/** @} */ -GIT_END_DECL -#endif diff --git a/vendor/libgit2/include/git2/sys/mempack.h b/vendor/libgit2/include/git2/sys/mempack.h deleted file mode 100644 index 96074fb77..000000000 --- a/vendor/libgit2/include/git2/sys/mempack.h +++ /dev/null @@ -1,85 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_sys_git_odb_mempack_h__ -#define INCLUDE_sys_git_odb_mempack_h__ - -#include "git2/common.h" -#include "git2/types.h" -#include "git2/oid.h" -#include "git2/odb.h" - -/** - * @file git2/sys/mempack.h - * @brief Custom ODB backend that permits packing objects in-memory - * @defgroup git_backend Git custom backend APIs - * @ingroup Git - * @{ - */ -GIT_BEGIN_DECL - -/** - * Instantiate a new mempack backend. - * - * The backend must be added to an existing ODB with the highest - * priority. - * - * git_mempack_new(&mempacker); - * git_repository_odb(&odb, repository); - * git_odb_add_backend(odb, mempacker, 999); - * - * Once the backend has been loaded, all writes to the ODB will - * instead be queued in memory, and can be finalized with - * `git_mempack_dump`. - * - * Subsequent reads will also be served from the in-memory store - * to ensure consistency, until the memory store is dumped. - * - * @param out Poiter where to store the ODB backend - * @return 0 on success; error code otherwise - */ -int git_mempack_new(git_odb_backend **out); - -/** - * Dump all the queued in-memory writes to a packfile. - * - * The contents of the packfile will be stored in the given buffer. - * It is the caller's responsibility to ensure that the generated - * packfile is available to the repository (e.g. by writing it - * to disk, or doing something crazy like distributing it across - * several copies of the repository over a network). - * - * Once the generated packfile is available to the repository, - * call `git_mempack_reset` to cleanup the memory store. - * - * Calling `git_mempack_reset` before the packfile has been - * written to disk will result in an inconsistent repository - * (the objects in the memory store won't be accessible). - * - * @param pack Buffer where to store the raw packfile - * @param repo The active repository where the backend is loaded - * @param backend The mempack backend - * @return 0 on success; error code otherwise - */ -int git_mempack_dump(git_buf *pack, git_repository *repo, git_odb_backend *backend); - -/** - * Reset the memory packer by clearing all the queued objects. - * - * This assumes that `git_mempack_dump` has been called before to - * store all the queued objects into a single packfile. - * - * Alternatively, call `reset` without a previous dump to "undo" - * all the recently written objects, giving transaction-like - * semantics to the Git repository. - * - * @param backend The mempack backend - */ -void git_mempack_reset(git_odb_backend *backend); - -GIT_END_DECL - -#endif diff --git a/vendor/libgit2/include/git2/sys/odb_backend.h b/vendor/libgit2/include/git2/sys/odb_backend.h deleted file mode 100644 index e423a9236..000000000 --- a/vendor/libgit2/include/git2/sys/odb_backend.h +++ /dev/null @@ -1,112 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_sys_git_odb_backend_h__ -#define INCLUDE_sys_git_odb_backend_h__ - -#include "git2/common.h" -#include "git2/types.h" -#include "git2/oid.h" -#include "git2/odb.h" - -/** - * @file git2/sys/backend.h - * @brief Git custom backend implementors functions - * @defgroup git_backend Git custom backend APIs - * @ingroup Git - * @{ - */ -GIT_BEGIN_DECL - -/** - * An instance for a custom backend - */ -struct git_odb_backend { - unsigned int version; - git_odb *odb; - - /* read and read_prefix each return to libgit2 a buffer which - * will be freed later. The buffer should be allocated using - * the function git_odb_backend_malloc to ensure that it can - * be safely freed later. */ - int (* read)( - void **, size_t *, git_otype *, git_odb_backend *, const git_oid *); - - /* To find a unique object given a prefix of its oid. The oid given - * must be so that the remaining (GIT_OID_HEXSZ - len)*4 bits are 0s. - */ - int (* read_prefix)( - git_oid *, void **, size_t *, git_otype *, - git_odb_backend *, const git_oid *, size_t); - - int (* read_header)( - size_t *, git_otype *, git_odb_backend *, const git_oid *); - - /** - * Write an object into the backend. The id of the object has - * already been calculated and is passed in. - */ - int (* write)( - git_odb_backend *, const git_oid *, const void *, size_t, git_otype); - - int (* writestream)( - git_odb_stream **, git_odb_backend *, git_off_t, git_otype); - - int (* readstream)( - git_odb_stream **, git_odb_backend *, const git_oid *); - - int (* exists)( - git_odb_backend *, const git_oid *); - - int (* exists_prefix)( - git_oid *, git_odb_backend *, const git_oid *, size_t); - - /** - * If the backend implements a refreshing mechanism, it should be exposed - * through this endpoint. Each call to `git_odb_refresh()` will invoke it. - * - * However, the backend implementation should try to stay up-to-date as much - * as possible by itself as libgit2 will not automatically invoke - * `git_odb_refresh()`. For instance, a potential strategy for the backend - * implementation to achieve this could be to internally invoke this - * endpoint on failed lookups (ie. `exists()`, `read()`, `read_header()`). - */ - int (* refresh)(git_odb_backend *); - - int (* foreach)( - git_odb_backend *, git_odb_foreach_cb cb, void *payload); - - int (* writepack)( - git_odb_writepack **, git_odb_backend *, git_odb *odb, - git_transfer_progress_cb progress_cb, void *progress_payload); - - /** - * Frees any resources held by the odb (including the `git_odb_backend` - * itself). An odb backend implementation must provide this function. - */ - void (* free)(git_odb_backend *); -}; - -#define GIT_ODB_BACKEND_VERSION 1 -#define GIT_ODB_BACKEND_INIT {GIT_ODB_BACKEND_VERSION} - -/** - * Initializes a `git_odb_backend` with default values. Equivalent to - * creating an instance with GIT_ODB_BACKEND_INIT. - * - * @param backend the `git_odb_backend` struct to initialize. - * @param version Version the struct; pass `GIT_ODB_BACKEND_VERSION` - * @return Zero on success; -1 on failure. - */ -GIT_EXTERN(int) git_odb_init_backend( - git_odb_backend *backend, - unsigned int version); - -GIT_EXTERN(void *) git_odb_backend_malloc(git_odb_backend *backend, size_t len); - -GIT_END_DECL - -#endif diff --git a/vendor/libgit2/include/git2/sys/openssl.h b/vendor/libgit2/include/git2/sys/openssl.h deleted file mode 100644 index b41c55c6d..000000000 --- a/vendor/libgit2/include/git2/sys/openssl.h +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_git_openssl_h__ -#define INCLUDE_git_openssl_h__ - -#include "git2/common.h" - -GIT_BEGIN_DECL - -/** - * Initialize the OpenSSL locks - * - * OpenSSL requires the application to determine how it performs - * locking. - * - * This is a last-resort convenience function which libgit2 provides for - * allocating and initializing the locks as well as setting the - * locking function to use the system's native locking functions. - * - * The locking function will be cleared and the memory will be freed - * when you call git_threads_sutdown(). - * - * If your programming language has an OpenSSL package/bindings, it - * likely sets up locking. You should very strongly prefer that over - * this function. - * - * @return 0 on success, -1 if there are errors or if libgit2 was not - * built with OpenSSL and threading support. - */ -GIT_EXTERN(int) git_openssl_set_locking(void); - -GIT_END_DECL -#endif - diff --git a/vendor/libgit2/include/git2/sys/refdb_backend.h b/vendor/libgit2/include/git2/sys/refdb_backend.h deleted file mode 100644 index 5129ad84a..000000000 --- a/vendor/libgit2/include/git2/sys/refdb_backend.h +++ /dev/null @@ -1,218 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_sys_git_refdb_backend_h__ -#define INCLUDE_sys_git_refdb_backend_h__ - -#include "git2/common.h" -#include "git2/types.h" -#include "git2/oid.h" - -/** - * @file git2/refdb_backend.h - * @brief Git custom refs backend functions - * @defgroup git_refdb_backend Git custom refs backend API - * @ingroup Git - * @{ - */ -GIT_BEGIN_DECL - - -/** - * Every backend's iterator must have a pointer to itself as the first - * element, so the API can talk to it. You'd define your iterator as - * - * struct my_iterator { - * git_reference_iterator parent; - * ... - * } - * - * and assign `iter->parent.backend` to your `git_refdb_backend`. - */ -struct git_reference_iterator { - git_refdb *db; - - /** - * Return the current reference and advance the iterator. - */ - int (*next)( - git_reference **ref, - git_reference_iterator *iter); - - /** - * Return the name of the current reference and advance the iterator - */ - int (*next_name)( - const char **ref_name, - git_reference_iterator *iter); - - /** - * Free the iterator - */ - void (*free)( - git_reference_iterator *iter); -}; - -/** An instance for a custom backend */ -struct git_refdb_backend { - unsigned int version; - - /** - * Queries the refdb backend to determine if the given ref_name - * exists. A refdb implementation must provide this function. - */ - int (*exists)( - int *exists, - git_refdb_backend *backend, - const char *ref_name); - - /** - * Queries the refdb backend for a given reference. A refdb - * implementation must provide this function. - */ - int (*lookup)( - git_reference **out, - git_refdb_backend *backend, - const char *ref_name); - - /** - * Allocate an iterator object for the backend. - * - * A refdb implementation must provide this function. - */ - int (*iterator)( - git_reference_iterator **iter, - struct git_refdb_backend *backend, - const char *glob); - - /* - * Writes the given reference to the refdb. A refdb implementation - * must provide this function. - */ - int (*write)(git_refdb_backend *backend, - const git_reference *ref, int force, - const git_signature *who, const char *message, - const git_oid *old, const char *old_target); - - int (*rename)( - git_reference **out, git_refdb_backend *backend, - const char *old_name, const char *new_name, int force, - const git_signature *who, const char *message); - - /** - * Deletes the given reference (and if necessary its reflog) - * from the refdb. A refdb implementation must provide this - * function. - */ - int (*del)(git_refdb_backend *backend, const char *ref_name, const git_oid *old_id, const char *old_target); - - /** - * Suggests that the given refdb compress or optimize its references. - * This mechanism is implementation specific. (For on-disk reference - * databases, this may pack all loose references.) A refdb - * implementation may provide this function; if it is not provided, - * nothing will be done. - */ - int (*compress)(git_refdb_backend *backend); - - /** - * Query whether a particular reference has a log (may be empty) - */ - int (*has_log)(git_refdb_backend *backend, const char *refname); - - /** - * Make sure a particular reference will have a reflog which - * will be appended to on writes. - */ - int (*ensure_log)(git_refdb_backend *backend, const char *refname); - - /** - * Frees any resources held by the refdb (including the `git_refdb_backend` - * itself). A refdb backend implementation must provide this function. - */ - void (*free)(git_refdb_backend *backend); - - /** - * Read the reflog for the given reference name. - */ - int (*reflog_read)(git_reflog **out, git_refdb_backend *backend, const char *name); - - /** - * Write a reflog to disk. - */ - int (*reflog_write)(git_refdb_backend *backend, git_reflog *reflog); - - /** - * Rename a reflog - */ - int (*reflog_rename)(git_refdb_backend *_backend, const char *old_name, const char *new_name); - - /** - * Remove a reflog. - */ - int (*reflog_delete)(git_refdb_backend *backend, const char *name); - - /** - * Lock a reference. The opaque parameter will be passed to the unlock function - */ - int (*lock)(void **payload_out, git_refdb_backend *backend, const char *refname); - - /** - * Unlock a reference. Only one of target or symbolic_target - * will be set. success indicates whether to update the - * reference or discard the lock (if it's false) - */ - int (*unlock)(git_refdb_backend *backend, void *payload, int success, int update_reflog, - const git_reference *ref, const git_signature *sig, const char *message); -}; - -#define GIT_REFDB_BACKEND_VERSION 1 -#define GIT_REFDB_BACKEND_INIT {GIT_REFDB_BACKEND_VERSION} - -/** - * Initializes a `git_refdb_backend` with default values. Equivalent to - * creating an instance with GIT_REFDB_BACKEND_INIT. - * - * @param backend the `git_refdb_backend` struct to initialize - * @param version Version of struct; pass `GIT_REFDB_BACKEND_VERSION` - * @return Zero on success; -1 on failure. - */ -GIT_EXTERN(int) git_refdb_init_backend( - git_refdb_backend *backend, - unsigned int version); - -/** - * Constructors for default filesystem-based refdb backend - * - * Under normal usage, this is called for you when the repository is - * opened / created, but you can use this to explicitly construct a - * filesystem refdb backend for a repository. - * - * @param backend_out Output pointer to the git_refdb_backend object - * @param repo Git repository to access - * @return 0 on success, <0 error code on failure - */ -GIT_EXTERN(int) git_refdb_backend_fs( - git_refdb_backend **backend_out, - git_repository *repo); - -/** - * Sets the custom backend to an existing reference DB - * - * The `git_refdb` will take ownership of the `git_refdb_backend` so you - * should NOT free it after calling this function. - * - * @param refdb database to add the backend to - * @param backend pointer to a git_refdb_backend instance - * @return 0 on success; error code otherwise - */ -GIT_EXTERN(int) git_refdb_set_backend( - git_refdb *refdb, - git_refdb_backend *backend); - -GIT_END_DECL - -#endif diff --git a/vendor/libgit2/include/git2/sys/reflog.h b/vendor/libgit2/include/git2/sys/reflog.h deleted file mode 100644 index c9d0041b9..000000000 --- a/vendor/libgit2/include/git2/sys/reflog.h +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_sys_git_reflog_h__ -#define INCLUDE_sys_git_reflog_h__ - -#include "git2/common.h" -#include "git2/types.h" -#include "git2/oid.h" - -GIT_BEGIN_DECL - -GIT_EXTERN(git_reflog_entry *) git_reflog_entry__alloc(void); -GIT_EXTERN(void) git_reflog_entry__free(git_reflog_entry *entry); - -GIT_END_DECL - -#endif diff --git a/vendor/libgit2/include/git2/sys/refs.h b/vendor/libgit2/include/git2/sys/refs.h deleted file mode 100644 index d2ce2e0b9..000000000 --- a/vendor/libgit2/include/git2/sys/refs.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_sys_git_refdb_h__ -#define INCLUDE_sys_git_refdb_h__ - -#include "git2/common.h" -#include "git2/types.h" -#include "git2/oid.h" - -/** - * @file git2/sys/refs.h - * @brief Low-level Git ref creation - * @defgroup git_backend Git custom backend APIs - * @ingroup Git - * @{ - */ -GIT_BEGIN_DECL - -/** - * Create a new direct reference from an OID. - * - * @param name the reference name - * @param oid the object id for a direct reference - * @param peel the first non-tag object's OID, or NULL - * @return the created git_reference or NULL on error - */ -GIT_EXTERN(git_reference *) git_reference__alloc( - const char *name, - const git_oid *oid, - const git_oid *peel); - -/** - * Create a new symbolic reference. - * - * @param name the reference name - * @param target the target for a symbolic reference - * @return the created git_reference or NULL on error - */ -GIT_EXTERN(git_reference *) git_reference__alloc_symbolic( - const char *name, - const char *target); - -/** @} */ -GIT_END_DECL -#endif diff --git a/vendor/libgit2/include/git2/sys/repository.h b/vendor/libgit2/include/git2/sys/repository.h deleted file mode 100644 index 800396c86..000000000 --- a/vendor/libgit2/include/git2/sys/repository.h +++ /dev/null @@ -1,140 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_sys_git_repository_h__ -#define INCLUDE_sys_git_repository_h__ - -#include "git2/common.h" -#include "git2/types.h" - -/** - * @file git2/sys/repository.h - * @brief Git repository custom implementation routines - * @defgroup git_backend Git custom backend APIs - * @ingroup Git - * @{ - */ -GIT_BEGIN_DECL - -/** - * Create a new repository with neither backends nor config object - * - * Note that this is only useful if you wish to associate the repository - * with a non-filesystem-backed object database and config store. - * - * @param out The blank repository - * @return 0 on success, or an error code - */ -GIT_EXTERN(int) git_repository_new(git_repository **out); - -/** - * Reset all the internal state in a repository. - * - * This will free all the mapped memory and internal objects - * of the repository and leave it in a "blank" state. - * - * There's no need to call this function directly unless you're - * trying to aggressively cleanup the repo before its - * deallocation. `git_repository_free` already performs this operation - * before deallocation the repo. - */ -GIT_EXTERN(void) git_repository__cleanup(git_repository *repo); - -/** - * Update the filesystem config settings for an open repository - * - * When a repository is initialized, config values are set based on the - * properties of the filesystem that the repository is on, such as - * "core.ignorecase", "core.filemode", "core.symlinks", etc. If the - * repository is moved to a new filesystem, these properties may no - * longer be correct and API calls may not behave as expected. This - * call reruns the phase of repository initialization that sets those - * properties to compensate for the current filesystem of the repo. - * - * @param repo A repository object - * @param recurse_submodules Should submodules be updated recursively - * @return 0 on success, < 0 on error - */ -GIT_EXTERN(int) git_repository_reinit_filesystem( - git_repository *repo, - int recurse_submodules); - -/** - * Set the configuration file for this repository - * - * This configuration file will be used for all configuration - * queries involving this repository. - * - * The repository will keep a reference to the config file; - * the user must still free the config after setting it - * to the repository, or it will leak. - * - * @param repo A repository object - * @param config A Config object - */ -GIT_EXTERN(void) git_repository_set_config(git_repository *repo, git_config *config); - -/** - * Set the Object Database for this repository - * - * The ODB will be used for all object-related operations - * involving this repository. - * - * The repository will keep a reference to the ODB; the user - * must still free the ODB object after setting it to the - * repository, or it will leak. - * - * @param repo A repository object - * @param odb An ODB object - */ -GIT_EXTERN(void) git_repository_set_odb(git_repository *repo, git_odb *odb); - -/** - * Set the Reference Database Backend for this repository - * - * The refdb will be used for all reference related operations - * involving this repository. - * - * The repository will keep a reference to the refdb; the user - * must still free the refdb object after setting it to the - * repository, or it will leak. - * - * @param repo A repository object - * @param refdb An refdb object - */ -GIT_EXTERN(void) git_repository_set_refdb(git_repository *repo, git_refdb *refdb); - -/** - * Set the index file for this repository - * - * This index will be used for all index-related operations - * involving this repository. - * - * The repository will keep a reference to the index file; - * the user must still free the index after setting it - * to the repository, or it will leak. - * - * @param repo A repository object - * @param index An index object - */ -GIT_EXTERN(void) git_repository_set_index(git_repository *repo, git_index *index); - -/** - * Set a repository to be bare. - * - * Clear the working directory and set core.bare to true. You may also - * want to call `git_repository_set_index(repo, NULL)` since a bare repo - * typically does not have an index, but this function will not do that - * for you. - * - * @param repo Repo to make bare - * @return 0 on success, <0 on failure - */ -GIT_EXTERN(int) git_repository_set_bare(git_repository *repo); - -/** @} */ -GIT_END_DECL -#endif diff --git a/vendor/libgit2/include/git2/sys/stream.h b/vendor/libgit2/include/git2/sys/stream.h deleted file mode 100644 index 2b4ff7fd8..000000000 --- a/vendor/libgit2/include/git2/sys/stream.h +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_sys_git_stream_h__ -#define INCLUDE_sys_git_stream_h__ - -#include "git2/common.h" -#include "git2/types.h" - -GIT_BEGIN_DECL - -#define GIT_STREAM_VERSION 1 - -/** - * Every stream must have this struct as its first element, so the - * API can talk to it. You'd define your stream as - * - * struct my_stream { - * git_stream parent; - * ... - * } - * - * and fill the functions - */ -typedef struct git_stream { - int version; - - int encrypted; - int proxy_support; - int (*connect)(struct git_stream *); - int (*certificate)(git_cert **, struct git_stream *); - int (*set_proxy)(struct git_stream *, const char *proxy_url); - ssize_t (*read)(struct git_stream *, void *, size_t); - ssize_t (*write)(struct git_stream *, const char *, size_t, int); - int (*close)(struct git_stream *); - void (*free)(struct git_stream *); -} git_stream; - -typedef int (*git_stream_cb)(git_stream **out, const char *host, const char *port); - -/** - * Register a TLS stream constructor for the library to use - * - * If a constructor is already set, it will be overwritten. Pass - * `NULL` in order to deregister the current constructor. - * - * @param ctor the constructor to use - * @return 0 or an error code - */ -GIT_EXTERN(int) git_stream_register_tls(git_stream_cb ctor); - -GIT_END_DECL - -#endif diff --git a/vendor/libgit2/include/git2/sys/transport.h b/vendor/libgit2/include/git2/sys/transport.h deleted file mode 100644 index ce0234a18..000000000 --- a/vendor/libgit2/include/git2/sys/transport.h +++ /dev/null @@ -1,381 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#ifndef INCLUDE_sys_git_transport_h -#define INCLUDE_sys_git_transport_h - -#include "git2/net.h" -#include "git2/types.h" -#include "git2/strarray.h" - -/** - * @file git2/sys/transport.h - * @brief Git custom transport registration interfaces and functions - * @defgroup git_transport Git custom transport registration - * @ingroup Git - * @{ - */ - -GIT_BEGIN_DECL - -/** - * Flags to pass to transport - * - * Currently unused. - */ -typedef enum { - GIT_TRANSPORTFLAGS_NONE = 0, -} git_transport_flags_t; - -struct git_transport { - unsigned int version; - /* Set progress and error callbacks */ - int (*set_callbacks)( - git_transport *transport, - git_transport_message_cb progress_cb, - git_transport_message_cb error_cb, - git_transport_certificate_check_cb certificate_check_cb, - void *payload); - - /* Set custom headers for HTTP requests */ - int (*set_custom_headers)( - git_transport *transport, - const git_strarray *custom_headers); - - /* Connect the transport to the remote repository, using the given - * direction. */ - int (*connect)( - git_transport *transport, - const char *url, - git_cred_acquire_cb cred_acquire_cb, - void *cred_acquire_payload, - int direction, - int flags); - - /* This function may be called after a successful call to - * connect(). The array returned is owned by the transport and - * is guaranteed until the next call of a transport function. */ - int (*ls)( - const git_remote_head ***out, - size_t *size, - git_transport *transport); - - /* Executes the push whose context is in the git_push object. */ - int (*push)(git_transport *transport, git_push *push, const git_remote_callbacks *callbacks); - - /* This function may be called after a successful call to connect(), when - * the direction is FETCH. The function performs a negotiation to calculate - * the wants list for the fetch. */ - int (*negotiate_fetch)( - git_transport *transport, - git_repository *repo, - const git_remote_head * const *refs, - size_t count); - - /* This function may be called after a successful call to negotiate_fetch(), - * when the direction is FETCH. This function retrieves the pack file for - * the fetch from the remote end. */ - int (*download_pack)( - git_transport *transport, - git_repository *repo, - git_transfer_progress *stats, - git_transfer_progress_cb progress_cb, - void *progress_payload); - - /* Checks to see if the transport is connected */ - int (*is_connected)(git_transport *transport); - - /* Reads the flags value previously passed into connect() */ - int (*read_flags)(git_transport *transport, int *flags); - - /* Cancels any outstanding transport operation */ - void (*cancel)(git_transport *transport); - - /* This function is the reverse of connect() -- it terminates the - * connection to the remote end. */ - int (*close)(git_transport *transport); - - /* Frees/destructs the git_transport object. */ - void (*free)(git_transport *transport); -}; - -#define GIT_TRANSPORT_VERSION 1 -#define GIT_TRANSPORT_INIT {GIT_TRANSPORT_VERSION} - -/** - * Initializes a `git_transport` with default values. Equivalent to - * creating an instance with GIT_TRANSPORT_INIT. - * - * @param opts the `git_transport` struct to initialize - * @param version Version of struct; pass `GIT_TRANSPORT_VERSION` - * @return Zero on success; -1 on failure. - */ -GIT_EXTERN(int) git_transport_init( - git_transport *opts, - unsigned int version); - -/** - * Function to use to create a transport from a URL. The transport database - * is scanned to find a transport that implements the scheme of the URI (i.e. - * git:// or http://) and a transport object is returned to the caller. - * - * @param out The newly created transport (out) - * @param owner The git_remote which will own this transport - * @param url The URL to connect to - * @return 0 or an error code - */ -GIT_EXTERN(int) git_transport_new(git_transport **out, git_remote *owner, const char *url); - -/** - * Create an ssh transport with custom git command paths - * - * This is a factory function suitable for setting as the transport - * callback in a remote (or for a clone in the options). - * - * The payload argument must be a strarray pointer with the paths for - * the `git-upload-pack` and `git-receive-pack` at index 0 and 1. - * - * @param out the resulting transport - * @param owner the owning remote - * @param payload a strarray with the paths - * @return 0 or an error code - */ -GIT_EXTERN(int) git_transport_ssh_with_paths(git_transport **out, git_remote *owner, void *payload); - -/** - * Add a custom transport definition, to be used in addition to the built-in - * set of transports that come with libgit2. - * - * The caller is responsible for synchronizing calls to git_transport_register - * and git_transport_unregister with other calls to the library that - * instantiate transports. - * - * @param prefix The scheme (ending in "://") to match, i.e. "git://" - * @param cb The callback used to create an instance of the transport - * @param param A fixed parameter to pass to cb at creation time - * @return 0 or an error code - */ -GIT_EXTERN(int) git_transport_register( - const char *prefix, - git_transport_cb cb, - void *param); - -/** - * - * Unregister a custom transport definition which was previously registered - * with git_transport_register. - * - * @param prefix From the previous call to git_transport_register - * @return 0 or an error code - */ -GIT_EXTERN(int) git_transport_unregister( - const char *prefix); - -/* Transports which come with libgit2 (match git_transport_cb). The expected - * value for "param" is listed in-line below. */ - -/** - * Create an instance of the dummy transport. - * - * @param out The newly created transport (out) - * @param owner The git_remote which will own this transport - * @param payload You must pass NULL for this parameter. - * @return 0 or an error code - */ -GIT_EXTERN(int) git_transport_dummy( - git_transport **out, - git_remote *owner, - /* NULL */ void *payload); - -/** - * Create an instance of the local transport. - * - * @param out The newly created transport (out) - * @param owner The git_remote which will own this transport - * @param payload You must pass NULL for this parameter. - * @return 0 or an error code - */ -GIT_EXTERN(int) git_transport_local( - git_transport **out, - git_remote *owner, - /* NULL */ void *payload); - -/** - * Create an instance of the smart transport. - * - * @param out The newly created transport (out) - * @param owner The git_remote which will own this transport - * @param payload A pointer to a git_smart_subtransport_definition - * @return 0 or an error code - */ -GIT_EXTERN(int) git_transport_smart( - git_transport **out, - git_remote *owner, - /* (git_smart_subtransport_definition *) */ void *payload); - -/** - * Call the certificate check for this transport. - * - * @param transport a smart transport - * @param cert the certificate to pass to the caller - * @param valid whether we believe the certificate is valid - * @param hostname the hostname we connected to - * @return the return value of the callback - */ -GIT_EXTERN(int) git_transport_smart_certificate_check(git_transport *transport, git_cert *cert, int valid, const char *hostname); - -/** - * Call the credentials callback for this transport - * - * @param out the pointer where the creds are to be stored - * @param transport a smart transport - * @param user the user we saw on the url (if any) - * @param methods available methods for authentication - * @return the return value of the callback - */ -GIT_EXTERN(int) git_transport_smart_credentials(git_cred **out, git_transport *transport, const char *user, int methods); - -/* - *** End of base transport interface *** - *** Begin interface for subtransports for the smart transport *** - */ - -/* The smart transport knows how to speak the git protocol, but it has no - * knowledge of how to establish a connection between it and another endpoint, - * or how to move data back and forth. For this, a subtransport interface is - * declared, and the smart transport delegates this work to the subtransports. - * Three subtransports are implemented: git, http, and winhttp. (The http and - * winhttp transports each implement both http and https.) */ - -/* Subtransports can either be RPC = 0 (persistent connection) or RPC = 1 - * (request/response). The smart transport handles the differences in its own - * logic. The git subtransport is RPC = 0, while http and winhttp are both - * RPC = 1. */ - -/* Actions that the smart transport can ask - * a subtransport to perform */ -typedef enum { - GIT_SERVICE_UPLOADPACK_LS = 1, - GIT_SERVICE_UPLOADPACK = 2, - GIT_SERVICE_RECEIVEPACK_LS = 3, - GIT_SERVICE_RECEIVEPACK = 4, -} git_smart_service_t; - -typedef struct git_smart_subtransport git_smart_subtransport; -typedef struct git_smart_subtransport_stream git_smart_subtransport_stream; - -/* A stream used by the smart transport to read and write data - * from a subtransport */ -struct git_smart_subtransport_stream { - /* The owning subtransport */ - git_smart_subtransport *subtransport; - - int (*read)( - git_smart_subtransport_stream *stream, - char *buffer, - size_t buf_size, - size_t *bytes_read); - - int (*write)( - git_smart_subtransport_stream *stream, - const char *buffer, - size_t len); - - void (*free)( - git_smart_subtransport_stream *stream); -}; - -/* An implementation of a subtransport which carries data for the - * smart transport */ -struct git_smart_subtransport { - int (* action)( - git_smart_subtransport_stream **out, - git_smart_subtransport *transport, - const char *url, - git_smart_service_t action); - - /* Subtransports are guaranteed a call to close() between - * calls to action(), except for the following two "natural" progressions - * of actions against a constant URL. - * - * 1. UPLOADPACK_LS -> UPLOADPACK - * 2. RECEIVEPACK_LS -> RECEIVEPACK */ - int (*close)(git_smart_subtransport *transport); - - void (*free)(git_smart_subtransport *transport); -}; - -/* A function which creates a new subtransport for the smart transport */ -typedef int (*git_smart_subtransport_cb)( - git_smart_subtransport **out, - git_transport* owner, - void* param); - -/** - * Definition for a "subtransport" - * - * This is used to let the smart protocol code know about the protocol - * which you are implementing. - */ -typedef struct git_smart_subtransport_definition { - /** The function to use to create the git_smart_subtransport */ - git_smart_subtransport_cb callback; - - /** - * True if the protocol is stateless; false otherwise. For example, - * http:// is stateless, but git:// is not. - */ - unsigned rpc; - - /** Param of the callback - */ - void* param; -} git_smart_subtransport_definition; - -/* Smart transport subtransports that come with libgit2 */ - -/** - * Create an instance of the http subtransport. This subtransport - * also supports https. On Win32, this subtransport may be implemented - * using the WinHTTP library. - * - * @param out The newly created subtransport - * @param owner The smart transport to own this subtransport - * @return 0 or an error code - */ -GIT_EXTERN(int) git_smart_subtransport_http( - git_smart_subtransport **out, - git_transport* owner, - void *param); - -/** - * Create an instance of the git subtransport. - * - * @param out The newly created subtransport - * @param owner The smart transport to own this subtransport - * @return 0 or an error code - */ -GIT_EXTERN(int) git_smart_subtransport_git( - git_smart_subtransport **out, - git_transport* owner, - void *param); - -/** - * Create an instance of the ssh subtransport. - * - * @param out The newly created subtransport - * @param owner The smart transport to own this subtransport - * @return 0 or an error code - */ -GIT_EXTERN(int) git_smart_subtransport_ssh( - git_smart_subtransport **out, - git_transport* owner, - void *param); - -/** @} */ -GIT_END_DECL -#endif diff --git a/vendor/libgit2/include/git2/tag.h b/vendor/libgit2/include/git2/tag.h deleted file mode 100644 index c822cee7c..000000000 --- a/vendor/libgit2/include/git2/tag.h +++ /dev/null @@ -1,352 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_git_tag_h__ -#define INCLUDE_git_tag_h__ - -#include "common.h" -#include "types.h" -#include "oid.h" -#include "object.h" -#include "strarray.h" - -/** - * @file git2/tag.h - * @brief Git tag parsing routines - * @defgroup git_tag Git tag management - * @ingroup Git - * @{ - */ -GIT_BEGIN_DECL - -/** - * Lookup a tag object from the repository. - * - * @param out pointer to the looked up tag - * @param repo the repo to use when locating the tag. - * @param id identity of the tag to locate. - * @return 0 or an error code - */ -GIT_EXTERN(int) git_tag_lookup( - git_tag **out, git_repository *repo, const git_oid *id); - -/** - * Lookup a tag object from the repository, - * given a prefix of its identifier (short id). - * - * @see git_object_lookup_prefix - * - * @param out pointer to the looked up tag - * @param repo the repo to use when locating the tag. - * @param id identity of the tag to locate. - * @param len the length of the short identifier - * @return 0 or an error code - */ -GIT_EXTERN(int) git_tag_lookup_prefix( - git_tag **out, git_repository *repo, const git_oid *id, size_t len); - -/** - * Close an open tag - * - * You can no longer use the git_tag pointer after this call. - * - * IMPORTANT: You MUST call this method when you are through with a tag to - * release memory. Failure to do so will cause a memory leak. - * - * @param tag the tag to close - */ -GIT_EXTERN(void) git_tag_free(git_tag *tag); - -/** - * Get the id of a tag. - * - * @param tag a previously loaded tag. - * @return object identity for the tag. - */ -GIT_EXTERN(const git_oid *) git_tag_id(const git_tag *tag); - -/** - * Get the repository that contains the tag. - * - * @param tag A previously loaded tag. - * @return Repository that contains this tag. - */ -GIT_EXTERN(git_repository *) git_tag_owner(const git_tag *tag); - -/** - * Get the tagged object of a tag - * - * This method performs a repository lookup for the - * given object and returns it - * - * @param target_out pointer where to store the target - * @param tag a previously loaded tag. - * @return 0 or an error code - */ -GIT_EXTERN(int) git_tag_target(git_object **target_out, const git_tag *tag); - -/** - * Get the OID of the tagged object of a tag - * - * @param tag a previously loaded tag. - * @return pointer to the OID - */ -GIT_EXTERN(const git_oid *) git_tag_target_id(const git_tag *tag); - -/** - * Get the type of a tag's tagged object - * - * @param tag a previously loaded tag. - * @return type of the tagged object - */ -GIT_EXTERN(git_otype) git_tag_target_type(const git_tag *tag); - -/** - * Get the name of a tag - * - * @param tag a previously loaded tag. - * @return name of the tag - */ -GIT_EXTERN(const char *) git_tag_name(const git_tag *tag); - -/** - * Get the tagger (author) of a tag - * - * @param tag a previously loaded tag. - * @return reference to the tag's author or NULL when unspecified - */ -GIT_EXTERN(const git_signature *) git_tag_tagger(const git_tag *tag); - -/** - * Get the message of a tag - * - * @param tag a previously loaded tag. - * @return message of the tag or NULL when unspecified - */ -GIT_EXTERN(const char *) git_tag_message(const git_tag *tag); - - -/** - * Create a new tag in the repository from an object - * - * A new reference will also be created pointing to - * this tag object. If `force` is true and a reference - * already exists with the given name, it'll be replaced. - * - * The message will not be cleaned up. This can be achieved - * through `git_message_prettify()`. - * - * The tag name will be checked for validity. You must avoid - * the characters '~', '^', ':', '\\', '?', '[', and '*', and the - * sequences ".." and "@{" which have special meaning to revparse. - * - * @param oid Pointer where to store the OID of the - * newly created tag. If the tag already exists, this parameter - * will be the oid of the existing tag, and the function will - * return a GIT_EEXISTS error code. - * - * @param repo Repository where to store the tag - * - * @param tag_name Name for the tag; this name is validated - * for consistency. It should also not conflict with an - * already existing tag name - * - * @param target Object to which this tag points. This object - * must belong to the given `repo`. - * - * @param tagger Signature of the tagger for this tag, and - * of the tagging time - * - * @param message Full message for this tag - * - * @param force Overwrite existing references - * - * @return 0 on success, GIT_EINVALIDSPEC or an error code - * A tag object is written to the ODB, and a proper reference - * is written in the /refs/tags folder, pointing to it - */ -GIT_EXTERN(int) git_tag_create( - git_oid *oid, - git_repository *repo, - const char *tag_name, - const git_object *target, - const git_signature *tagger, - const char *message, - int force); - -/** - * Create a new tag in the object database pointing to a git_object - * - * The message will not be cleaned up. This can be achieved - * through `git_message_prettify()`. - * - * @param oid Pointer where to store the OID of the - * newly created tag - * - * @param repo Repository where to store the tag - * - * @param tag_name Name for the tag - * - * @param target Object to which this tag points. This object - * must belong to the given `repo`. - * - * @param tagger Signature of the tagger for this tag, and - * of the tagging time - * - * @param message Full message for this tag - * - * @return 0 on success or an error code - */ -GIT_EXTERN(int) git_tag_annotation_create( - git_oid *oid, - git_repository *repo, - const char *tag_name, - const git_object *target, - const git_signature *tagger, - const char *message); - -/** - * Create a new tag in the repository from a buffer - * - * @param oid Pointer where to store the OID of the newly created tag - * @param repo Repository where to store the tag - * @param buffer Raw tag data - * @param force Overwrite existing tags - * @return 0 on success; error code otherwise - */ -GIT_EXTERN(int) git_tag_create_frombuffer( - git_oid *oid, - git_repository *repo, - const char *buffer, - int force); - -/** - * Create a new lightweight tag pointing at a target object - * - * A new direct reference will be created pointing to - * this target object. If `force` is true and a reference - * already exists with the given name, it'll be replaced. - * - * The tag name will be checked for validity. - * See `git_tag_create()` for rules about valid names. - * - * @param oid Pointer where to store the OID of the provided - * target object. If the tag already exists, this parameter - * will be filled with the oid of the existing pointed object - * and the function will return a GIT_EEXISTS error code. - * - * @param repo Repository where to store the lightweight tag - * - * @param tag_name Name for the tag; this name is validated - * for consistency. It should also not conflict with an - * already existing tag name - * - * @param target Object to which this tag points. This object - * must belong to the given `repo`. - * - * @param force Overwrite existing references - * - * @return 0 on success, GIT_EINVALIDSPEC or an error code - * A proper reference is written in the /refs/tags folder, - * pointing to the provided target object - */ -GIT_EXTERN(int) git_tag_create_lightweight( - git_oid *oid, - git_repository *repo, - const char *tag_name, - const git_object *target, - int force); - -/** - * Delete an existing tag reference. - * - * The tag name will be checked for validity. - * See `git_tag_create()` for rules about valid names. - * - * @param repo Repository where lives the tag - * - * @param tag_name Name of the tag to be deleted; - * this name is validated for consistency. - * - * @return 0 on success, GIT_EINVALIDSPEC or an error code - */ -GIT_EXTERN(int) git_tag_delete( - git_repository *repo, - const char *tag_name); - -/** - * Fill a list with all the tags in the Repository - * - * The string array will be filled with the names of the - * matching tags; these values are owned by the user and - * should be free'd manually when no longer needed, using - * `git_strarray_free`. - * - * @param tag_names Pointer to a git_strarray structure where - * the tag names will be stored - * @param repo Repository where to find the tags - * @return 0 or an error code - */ -GIT_EXTERN(int) git_tag_list( - git_strarray *tag_names, - git_repository *repo); - -/** - * Fill a list with all the tags in the Repository - * which name match a defined pattern - * - * If an empty pattern is provided, all the tags - * will be returned. - * - * The string array will be filled with the names of the - * matching tags; these values are owned by the user and - * should be free'd manually when no longer needed, using - * `git_strarray_free`. - * - * @param tag_names Pointer to a git_strarray structure where - * the tag names will be stored - * @param pattern Standard fnmatch pattern - * @param repo Repository where to find the tags - * @return 0 or an error code - */ -GIT_EXTERN(int) git_tag_list_match( - git_strarray *tag_names, - const char *pattern, - git_repository *repo); - - -typedef int (*git_tag_foreach_cb)(const char *name, git_oid *oid, void *payload); - -/** - * Call callback `cb' for each tag in the repository - * - * @param repo Repository - * @param callback Callback function - * @param payload Pointer to callback data (optional) - */ -GIT_EXTERN(int) git_tag_foreach( - git_repository *repo, - git_tag_foreach_cb callback, - void *payload); - - -/** - * Recursively peel a tag until a non tag git_object is found - * - * The retrieved `tag_target` object is owned by the repository - * and should be closed with the `git_object_free` method. - * - * @param tag_target_out Pointer to the peeled git_object - * @param tag The tag to be processed - * @return 0 or an error code - */ -GIT_EXTERN(int) git_tag_peel( - git_object **tag_target_out, - const git_tag *tag); - -/** @} */ -GIT_END_DECL -#endif diff --git a/vendor/libgit2/include/git2/trace.h b/vendor/libgit2/include/git2/trace.h deleted file mode 100644 index f9b4d6ff6..000000000 --- a/vendor/libgit2/include/git2/trace.h +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_git_trace_h__ -#define INCLUDE_git_trace_h__ - -#include "common.h" -#include "types.h" - -/** - * @file git2/trace.h - * @brief Git tracing configuration routines - * @defgroup git_trace Git tracing configuration routines - * @ingroup Git - * @{ - */ -GIT_BEGIN_DECL - -/** - * Available tracing levels. When tracing is set to a particular level, - * callers will be provided tracing at the given level and all lower levels. - */ -typedef enum { - /** No tracing will be performed. */ - GIT_TRACE_NONE = 0, - - /** Severe errors that may impact the program's execution */ - GIT_TRACE_FATAL = 1, - - /** Errors that do not impact the program's execution */ - GIT_TRACE_ERROR = 2, - - /** Warnings that suggest abnormal data */ - GIT_TRACE_WARN = 3, - - /** Informational messages about program execution */ - GIT_TRACE_INFO = 4, - - /** Detailed data that allows for debugging */ - GIT_TRACE_DEBUG = 5, - - /** Exceptionally detailed debugging data */ - GIT_TRACE_TRACE = 6 -} git_trace_level_t; - -/** - * An instance for a tracing function - */ -typedef void (*git_trace_callback)(git_trace_level_t level, const char *msg); - -/** - * Sets the system tracing configuration to the specified level with the - * specified callback. When system events occur at a level equal to, or - * lower than, the given level they will be reported to the given callback. - * - * @param level Level to set tracing to - * @param cb Function to call with trace data - * @return 0 or an error code - */ -GIT_EXTERN(int) git_trace_set(git_trace_level_t level, git_trace_callback cb); - -/** @} */ -GIT_END_DECL -#endif diff --git a/vendor/libgit2/include/git2/transaction.h b/vendor/libgit2/include/git2/transaction.h deleted file mode 100644 index 64abb0c69..000000000 --- a/vendor/libgit2/include/git2/transaction.h +++ /dev/null @@ -1,111 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_git_transaction_h__ -#define INCLUDE_git_transaction_h__ - -#include "common.h" -GIT_BEGIN_DECL - -/** - * Create a new transaction object - * - * This does not lock anything, but sets up the transaction object to - * know from which repository to lock. - * - * @param out the resulting transaction - * @param repo the repository in which to lock - * @return 0 or an error code - */ -GIT_EXTERN(int) git_transaction_new(git_transaction **out, git_repository *repo); - -/** - * Lock a reference - * - * Lock the specified reference. This is the first step to updating a - * reference. - * - * @param tx the transaction - * @param refname the reference to lock - * @return 0 or an error message - */ -GIT_EXTERN(int) git_transaction_lock_ref(git_transaction *tx, const char *refname); - -/** - * Set the target of a reference - * - * Set the target of the specified reference. This reference must be - * locked. - * - * @param tx the transaction - * @param refname reference to update - * @param target target to set the reference to - * @param sig signature to use in the reflog; pass NULL to read the identity from the config - * @param msg message to use in the reflog - * @return 0, GIT_ENOTFOUND if the reference is not among the locked ones, or an error code - */ -GIT_EXTERN(int) git_transaction_set_target(git_transaction *tx, const char *refname, const git_oid *target, const git_signature *sig, const char *msg); - -/** - * Set the target of a reference - * - * Set the target of the specified reference. This reference must be - * locked. - * - * @param tx the transaction - * @param refname reference to update - * @param target target to set the reference to - * @param sig signature to use in the reflog; pass NULL to read the identity from the config - * @param msg message to use in the reflog - * @return 0, GIT_ENOTFOUND if the reference is not among the locked ones, or an error code - */ -GIT_EXTERN(int) git_transaction_set_symbolic_target(git_transaction *tx, const char *refname, const char *target, const git_signature *sig, const char *msg); - -/** - * Set the reflog of a reference - * - * Set the specified reference's reflog. If this is combined with - * setting the target, that update won't be written to the reflog. - * - * @param tx the transaction - * @param refname the reference whose reflog to set - * @param reflog the reflog as it should be written out - * @return 0, GIT_ENOTFOUND if the reference is not among the locked ones, or an error code - */ -GIT_EXTERN(int) git_transaction_set_reflog(git_transaction *tx, const char *refname, const git_reflog *reflog); - -/** - * Remove a reference - * - * @param tx the transaction - * @param refname the reference to remove - * @return 0, GIT_ENOTFOUND if the reference is not among the locked ones, or an error code - */ -GIT_EXTERN(int) git_transaction_remove(git_transaction *tx, const char *refname); - -/** - * Commit the changes from the transaction - * - * Perform the changes that have been queued. The updates will be made - * one by one, and the first failure will stop the processing. - * - * @param tx the transaction - * @return 0 or an error code - */ -GIT_EXTERN(int) git_transaction_commit(git_transaction *tx); - -/** - * Free the resources allocated by this transaction - * - * If any references remain locked, they will be unlocked without any - * changes made to them. - * - * @param tx the transaction - */ -GIT_EXTERN(void) git_transaction_free(git_transaction *tx); - -GIT_END_DECL -#endif diff --git a/vendor/libgit2/include/git2/transport.h b/vendor/libgit2/include/git2/transport.h deleted file mode 100644 index 0ec241699..000000000 --- a/vendor/libgit2/include/git2/transport.h +++ /dev/null @@ -1,342 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_git_transport_h__ -#define INCLUDE_git_transport_h__ - -#include "indexer.h" -#include "net.h" -#include "types.h" - -/** - * @file git2/transport.h - * @brief Git transport interfaces and functions - * @defgroup git_transport interfaces and functions - * @ingroup Git - * @{ - */ -GIT_BEGIN_DECL - -/** Signature of a function which creates a transport */ -typedef int (*git_transport_cb)(git_transport **out, git_remote *owner, void *param); - -/** - * Type of SSH host fingerprint - */ -typedef enum { - /** MD5 is available */ - GIT_CERT_SSH_MD5 = (1 << 0), - /** SHA-1 is available */ - GIT_CERT_SSH_SHA1 = (1 << 1), -} git_cert_ssh_t; - -/** - * Hostkey information taken from libssh2 - */ -typedef struct { - git_cert parent; - - /** - * A hostkey type from libssh2, either - * `GIT_CERT_SSH_MD5` or `GIT_CERT_SSH_SHA1` - */ - git_cert_ssh_t type; - - /** - * Hostkey hash. If type has `GIT_CERT_SSH_MD5` set, this will - * have the MD5 hash of the hostkey. - */ - unsigned char hash_md5[16]; - - /** - * Hostkey hash. If type has `GIT_CERT_SSH_SHA1` set, this will - * have the SHA-1 hash of the hostkey. - */ - unsigned char hash_sha1[20]; -} git_cert_hostkey; - -/** - * X.509 certificate information - */ -typedef struct { - git_cert parent; - /** - * Pointer to the X.509 certificate data - */ - void *data; - /** - * Length of the memory block pointed to by `data`. - */ - size_t len; -} git_cert_x509; - -/* - *** Begin interface for credentials acquisition *** - */ - -/** Authentication type requested */ -typedef enum { - /* git_cred_userpass_plaintext */ - GIT_CREDTYPE_USERPASS_PLAINTEXT = (1u << 0), - - /* git_cred_ssh_key */ - GIT_CREDTYPE_SSH_KEY = (1u << 1), - - /* git_cred_ssh_custom */ - GIT_CREDTYPE_SSH_CUSTOM = (1u << 2), - - /* git_cred_default */ - GIT_CREDTYPE_DEFAULT = (1u << 3), - - /* git_cred_ssh_interactive */ - GIT_CREDTYPE_SSH_INTERACTIVE = (1u << 4), - - /** - * Username-only information - * - * If the SSH transport does not know which username to use, - * it will ask via this credential type. - */ - GIT_CREDTYPE_USERNAME = (1u << 5), - - /** - * Credentials read from memory. - * - * Only available for libssh2+OpenSSL for now. - */ - GIT_CREDTYPE_SSH_MEMORY = (1u << 6), -} git_credtype_t; - -/* The base structure for all credential types */ -typedef struct git_cred git_cred; - -struct git_cred { - git_credtype_t credtype; - void (*free)(git_cred *cred); -}; - -/** A plaintext username and password */ -typedef struct { - git_cred parent; - char *username; - char *password; -} git_cred_userpass_plaintext; - - -/* - * If the user hasn't included libssh2.h before git2.h, we need to - * define a few types for the callback signatures. - */ -#ifndef LIBSSH2_VERSION -typedef struct _LIBSSH2_SESSION LIBSSH2_SESSION; -typedef struct _LIBSSH2_USERAUTH_KBDINT_PROMPT LIBSSH2_USERAUTH_KBDINT_PROMPT; -typedef struct _LIBSSH2_USERAUTH_KBDINT_RESPONSE LIBSSH2_USERAUTH_KBDINT_RESPONSE; -#endif - -typedef int (*git_cred_sign_callback)(LIBSSH2_SESSION *session, unsigned char **sig, size_t *sig_len, const unsigned char *data, size_t data_len, void **abstract); -typedef void (*git_cred_ssh_interactive_callback)(const char* name, int name_len, const char* instruction, int instruction_len, int num_prompts, const LIBSSH2_USERAUTH_KBDINT_PROMPT* prompts, LIBSSH2_USERAUTH_KBDINT_RESPONSE* responses, void **abstract); - -/** - * A ssh key from disk - */ -typedef struct git_cred_ssh_key { - git_cred parent; - char *username; - char *publickey; - char *privatekey; - char *passphrase; -} git_cred_ssh_key; - -/** - * Keyboard-interactive based ssh authentication - */ -typedef struct git_cred_ssh_interactive { - git_cred parent; - char *username; - git_cred_ssh_interactive_callback prompt_callback; - void *payload; -} git_cred_ssh_interactive; - -/** - * A key with a custom signature function - */ -typedef struct git_cred_ssh_custom { - git_cred parent; - char *username; - char *publickey; - size_t publickey_len; - git_cred_sign_callback sign_callback; - void *payload; -} git_cred_ssh_custom; - -/** A key for NTLM/Kerberos "default" credentials */ -typedef struct git_cred git_cred_default; - -/** Username-only credential information */ -typedef struct git_cred_username { - git_cred parent; - char username[1]; -} git_cred_username; - -/** - * Check whether a credential object contains username information. - * - * @param cred object to check - * @return 1 if the credential object has non-NULL username, 0 otherwise - */ -GIT_EXTERN(int) git_cred_has_username(git_cred *cred); - -/** - * Create a new plain-text username and password credential object. - * The supplied credential parameter will be internally duplicated. - * - * @param out The newly created credential object. - * @param username The username of the credential. - * @param password The password of the credential. - * @return 0 for success or an error code for failure - */ -GIT_EXTERN(int) git_cred_userpass_plaintext_new( - git_cred **out, - const char *username, - const char *password); - -/** - * Create a new passphrase-protected ssh key credential object. - * The supplied credential parameter will be internally duplicated. - * - * @param out The newly created credential object. - * @param username username to use to authenticate - * @param publickey The path to the public key of the credential. - * @param privatekey The path to the private key of the credential. - * @param passphrase The passphrase of the credential. - * @return 0 for success or an error code for failure - */ -GIT_EXTERN(int) git_cred_ssh_key_new( - git_cred **out, - const char *username, - const char *publickey, - const char *privatekey, - const char *passphrase); - -/** - * Create a new ssh keyboard-interactive based credential object. - * The supplied credential parameter will be internally duplicated. - * - * @param username Username to use to authenticate. - * @param prompt_callback The callback method used for prompts. - * @param payload Additional data to pass to the callback. - * @return 0 for success or an error code for failure. - */ -GIT_EXTERN(int) git_cred_ssh_interactive_new( - git_cred **out, - const char *username, - git_cred_ssh_interactive_callback prompt_callback, - void *payload); - -/** - * Create a new ssh key credential object used for querying an ssh-agent. - * The supplied credential parameter will be internally duplicated. - * - * @param out The newly created credential object. - * @param username username to use to authenticate - * @return 0 for success or an error code for failure - */ -GIT_EXTERN(int) git_cred_ssh_key_from_agent( - git_cred **out, - const char *username); - -/** - * Create an ssh key credential with a custom signing function. - * - * This lets you use your own function to sign the challenge. - * - * This function and its credential type is provided for completeness - * and wraps `libssh2_userauth_publickey()`, which is undocumented. - * - * The supplied credential parameter will be internally duplicated. - * - * @param out The newly created credential object. - * @param username username to use to authenticate - * @param publickey The bytes of the public key. - * @param publickey_len The length of the public key in bytes. - * @param sign_callback The callback method to sign the data during the challenge. - * @param payload Additional data to pass to the callback. - * @return 0 for success or an error code for failure - */ -GIT_EXTERN(int) git_cred_ssh_custom_new( - git_cred **out, - const char *username, - const char *publickey, - size_t publickey_len, - git_cred_sign_callback sign_callback, - void *payload); - -/** - * Create a "default" credential usable for Negotiate mechanisms like NTLM - * or Kerberos authentication. - * - * @return 0 for success or an error code for failure - */ -GIT_EXTERN(int) git_cred_default_new(git_cred **out); - -/** - * Create a credential to specify a username. - * - * This is used with ssh authentication to query for the username if - * none is specified in the url. - */ -GIT_EXTERN(int) git_cred_username_new(git_cred **cred, const char *username); - -/** - * Create a new ssh key credential object reading the keys from memory. - * - * @param out The newly created credential object. - * @param username username to use to authenticate. - * @param publickey The public key of the credential. - * @param privatekey The private key of the credential. - * @param passphrase The passphrase of the credential. - * @return 0 for success or an error code for failure - */ -GIT_EXTERN(int) git_cred_ssh_key_memory_new( - git_cred **out, - const char *username, - const char *publickey, - const char *privatekey, - const char *passphrase); - - -/** - * Free a credential. - * - * This is only necessary if you own the object; that is, if you are a - * transport. - * - * @param cred the object to free - */ -GIT_EXTERN(void) git_cred_free(git_cred *cred); - -/** - * Signature of a function which acquires a credential object. - * - * - cred: The newly created credential object. - * - url: The resource for which we are demanding a credential. - * - username_from_url: The username that was embedded in a "user\@host" - * remote url, or NULL if not included. - * - allowed_types: A bitmask stating which cred types are OK to return. - * - payload: The payload provided when specifying this callback. - * - returns 0 for success, < 0 to indicate an error, > 0 to indicate - * no credential was acquired - */ -typedef int (*git_cred_acquire_cb)( - git_cred **cred, - const char *url, - const char *username_from_url, - unsigned int allowed_types, - void *payload); - -/** @} */ -GIT_END_DECL -#endif diff --git a/vendor/libgit2/include/git2/tree.h b/vendor/libgit2/include/git2/tree.h deleted file mode 100644 index 550a44857..000000000 --- a/vendor/libgit2/include/git2/tree.h +++ /dev/null @@ -1,415 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_git_tree_h__ -#define INCLUDE_git_tree_h__ - -#include "common.h" -#include "types.h" -#include "oid.h" -#include "object.h" - -/** - * @file git2/tree.h - * @brief Git tree parsing, loading routines - * @defgroup git_tree Git tree parsing, loading routines - * @ingroup Git - * @{ - */ -GIT_BEGIN_DECL - -/** - * Lookup a tree object from the repository. - * - * @param out Pointer to the looked up tree - * @param repo The repo to use when locating the tree. - * @param id Identity of the tree to locate. - * @return 0 or an error code - */ -GIT_EXTERN(int) git_tree_lookup( - git_tree **out, git_repository *repo, const git_oid *id); - -/** - * Lookup a tree object from the repository, - * given a prefix of its identifier (short id). - * - * @see git_object_lookup_prefix - * - * @param out pointer to the looked up tree - * @param repo the repo to use when locating the tree. - * @param id identity of the tree to locate. - * @param len the length of the short identifier - * @return 0 or an error code - */ -GIT_EXTERN(int) git_tree_lookup_prefix( - git_tree **out, - git_repository *repo, - const git_oid *id, - size_t len); - -/** - * Close an open tree - * - * You can no longer use the git_tree pointer after this call. - * - * IMPORTANT: You MUST call this method when you stop using a tree to - * release memory. Failure to do so will cause a memory leak. - * - * @param tree The tree to close - */ -GIT_EXTERN(void) git_tree_free(git_tree *tree); - -/** - * Get the id of a tree. - * - * @param tree a previously loaded tree. - * @return object identity for the tree. - */ -GIT_EXTERN(const git_oid *) git_tree_id(const git_tree *tree); - -/** - * Get the repository that contains the tree. - * - * @param tree A previously loaded tree. - * @return Repository that contains this tree. - */ -GIT_EXTERN(git_repository *) git_tree_owner(const git_tree *tree); - -/** - * Get the number of entries listed in a tree - * - * @param tree a previously loaded tree. - * @return the number of entries in the tree - */ -GIT_EXTERN(size_t) git_tree_entrycount(const git_tree *tree); - -/** - * Lookup a tree entry by its filename - * - * This returns a git_tree_entry that is owned by the git_tree. You don't - * have to free it, but you must not use it after the git_tree is released. - * - * @param tree a previously loaded tree. - * @param filename the filename of the desired entry - * @return the tree entry; NULL if not found - */ -GIT_EXTERN(const git_tree_entry *) git_tree_entry_byname( - const git_tree *tree, const char *filename); - -/** - * Lookup a tree entry by its position in the tree - * - * This returns a git_tree_entry that is owned by the git_tree. You don't - * have to free it, but you must not use it after the git_tree is released. - * - * @param tree a previously loaded tree. - * @param idx the position in the entry list - * @return the tree entry; NULL if not found - */ -GIT_EXTERN(const git_tree_entry *) git_tree_entry_byindex( - const git_tree *tree, size_t idx); - -/** - * Lookup a tree entry by SHA value. - * - * This returns a git_tree_entry that is owned by the git_tree. You don't - * have to free it, but you must not use it after the git_tree is released. - * - * Warning: this must examine every entry in the tree, so it is not fast. - * - * @param tree a previously loaded tree. - * @param id the sha being looked for - * @return the tree entry; NULL if not found - */ -GIT_EXTERN(const git_tree_entry *) git_tree_entry_byid( - const git_tree *tree, const git_oid *id); - -/** - * Retrieve a tree entry contained in a tree or in any of its subtrees, - * given its relative path. - * - * Unlike the other lookup functions, the returned tree entry is owned by - * the user and must be freed explicitly with `git_tree_entry_free()`. - * - * @param out Pointer where to store the tree entry - * @param root Previously loaded tree which is the root of the relative path - * @param path Path to the contained entry - * @return 0 on success; GIT_ENOTFOUND if the path does not exist - */ -GIT_EXTERN(int) git_tree_entry_bypath( - git_tree_entry **out, - const git_tree *root, - const char *path); - -/** - * Duplicate a tree entry - * - * Create a copy of a tree entry. The returned copy is owned by the user, - * and must be freed explicitly with `git_tree_entry_free()`. - * - * @param dest pointer where to store the copy - * @param source tree entry to duplicate - * @return 0 or an error code - */ -GIT_EXTERN(int) git_tree_entry_dup(git_tree_entry **dest, const git_tree_entry *source); - -/** - * Free a user-owned tree entry - * - * IMPORTANT: This function is only needed for tree entries owned by the - * user, such as the ones returned by `git_tree_entry_dup()` or - * `git_tree_entry_bypath()`. - * - * @param entry The entry to free - */ -GIT_EXTERN(void) git_tree_entry_free(git_tree_entry *entry); - -/** - * Get the filename of a tree entry - * - * @param entry a tree entry - * @return the name of the file - */ -GIT_EXTERN(const char *) git_tree_entry_name(const git_tree_entry *entry); - -/** - * Get the id of the object pointed by the entry - * - * @param entry a tree entry - * @return the oid of the object - */ -GIT_EXTERN(const git_oid *) git_tree_entry_id(const git_tree_entry *entry); - -/** - * Get the type of the object pointed by the entry - * - * @param entry a tree entry - * @return the type of the pointed object - */ -GIT_EXTERN(git_otype) git_tree_entry_type(const git_tree_entry *entry); - -/** - * Get the UNIX file attributes of a tree entry - * - * @param entry a tree entry - * @return filemode as an integer - */ -GIT_EXTERN(git_filemode_t) git_tree_entry_filemode(const git_tree_entry *entry); - -/** - * Get the raw UNIX file attributes of a tree entry - * - * This function does not perform any normalization and is only useful - * if you need to be able to recreate the original tree object. - * - * @param entry a tree entry - * @return filemode as an integer - */ - -GIT_EXTERN(git_filemode_t) git_tree_entry_filemode_raw(const git_tree_entry *entry); -/** - * Compare two tree entries - * - * @param e1 first tree entry - * @param e2 second tree entry - * @return <0 if e1 is before e2, 0 if e1 == e2, >0 if e1 is after e2 - */ -GIT_EXTERN(int) git_tree_entry_cmp(const git_tree_entry *e1, const git_tree_entry *e2); - -/** - * Convert a tree entry to the git_object it points to. - * - * You must call `git_object_free()` on the object when you are done with it. - * - * @param object_out pointer to the converted object - * @param repo repository where to lookup the pointed object - * @param entry a tree entry - * @return 0 or an error code - */ -GIT_EXTERN(int) git_tree_entry_to_object( - git_object **object_out, - git_repository *repo, - const git_tree_entry *entry); - -/** - * Create a new tree builder. - * - * The tree builder can be used to create or modify trees in memory and - * write them as tree objects to the database. - * - * If the `source` parameter is not NULL, the tree builder will be - * initialized with the entries of the given tree. - * - * If the `source` parameter is NULL, the tree builder will start with no - * entries and will have to be filled manually. - * - * @param out Pointer where to store the tree builder - * @param repo Repository in which to store the object - * @param source Source tree to initialize the builder (optional) - * @return 0 on success; error code otherwise - */ -GIT_EXTERN(int) git_treebuilder_new( - git_treebuilder **out, git_repository *repo, const git_tree *source); - -/** - * Clear all the entires in the builder - * - * @param bld Builder to clear - */ -GIT_EXTERN(void) git_treebuilder_clear(git_treebuilder *bld); - -/** - * Get the number of entries listed in a treebuilder - * - * @param bld a previously loaded treebuilder. - * @return the number of entries in the treebuilder - */ -GIT_EXTERN(unsigned int) git_treebuilder_entrycount(git_treebuilder *bld); - -/** - * Free a tree builder - * - * This will clear all the entries and free to builder. - * Failing to free the builder after you're done using it - * will result in a memory leak - * - * @param bld Builder to free - */ -GIT_EXTERN(void) git_treebuilder_free(git_treebuilder *bld); - -/** - * Get an entry from the builder from its filename - * - * The returned entry is owned by the builder and should - * not be freed manually. - * - * @param bld Tree builder - * @param filename Name of the entry - * @return pointer to the entry; NULL if not found - */ -GIT_EXTERN(const git_tree_entry *) git_treebuilder_get( - git_treebuilder *bld, const char *filename); - -/** - * Add or update an entry to the builder - * - * Insert a new entry for `filename` in the builder with the - * given attributes. - * - * If an entry named `filename` already exists, its attributes - * will be updated with the given ones. - * - * The optional pointer `out` can be used to retrieve a pointer to the - * newly created/updated entry. Pass NULL if you do not need it. The - * pointer may not be valid past the next operation in this - * builder. Duplicate the entry if you want to keep it. - * - * No attempt is being made to ensure that the provided oid points - * to an existing git object in the object database, nor that the - * attributes make sense regarding the type of the pointed at object. - * - * @param out Pointer to store the entry (optional) - * @param bld Tree builder - * @param filename Filename of the entry - * @param id SHA1 oid of the entry - * @param filemode Folder attributes of the entry. This parameter must - * be valued with one of the following entries: 0040000, 0100644, - * 0100755, 0120000 or 0160000. - * @return 0 or an error code - */ -GIT_EXTERN(int) git_treebuilder_insert( - const git_tree_entry **out, - git_treebuilder *bld, - const char *filename, - const git_oid *id, - git_filemode_t filemode); - -/** - * Remove an entry from the builder by its filename - * - * @param bld Tree builder - * @param filename Filename of the entry to remove - */ -GIT_EXTERN(int) git_treebuilder_remove( - git_treebuilder *bld, const char *filename); - -/** - * Callback for git_treebuilder_filter - * - * The return value is treated as a boolean, with zero indicating that the - * entry should be left alone and any non-zero value meaning that the - * entry should be removed from the treebuilder list (i.e. filtered out). - */ -typedef int (*git_treebuilder_filter_cb)( - const git_tree_entry *entry, void *payload); - -/** - * Selectively remove entries in the tree - * - * The `filter` callback will be called for each entry in the tree with a - * pointer to the entry and the provided `payload`; if the callback returns - * non-zero, the entry will be filtered (removed from the builder). - * - * @param bld Tree builder - * @param filter Callback to filter entries - * @param payload Extra data to pass to filter callback - */ -GIT_EXTERN(void) git_treebuilder_filter( - git_treebuilder *bld, - git_treebuilder_filter_cb filter, - void *payload); - -/** - * Write the contents of the tree builder as a tree object - * - * The tree builder will be written to the given `repo`, and its - * identifying SHA1 hash will be stored in the `id` pointer. - * - * @param id Pointer to store the OID of the newly written tree - * @param bld Tree builder to write - * @return 0 or an error code - */ -GIT_EXTERN(int) git_treebuilder_write( - git_oid *id, git_treebuilder *bld); - - -/** Callback for the tree traversal method */ -typedef int (*git_treewalk_cb)( - const char *root, const git_tree_entry *entry, void *payload); - -/** Tree traversal modes */ -typedef enum { - GIT_TREEWALK_PRE = 0, /* Pre-order */ - GIT_TREEWALK_POST = 1, /* Post-order */ -} git_treewalk_mode; - -/** - * Traverse the entries in a tree and its subtrees in post or pre order. - * - * The entries will be traversed in the specified order, children subtrees - * will be automatically loaded as required, and the `callback` will be - * called once per entry with the current (relative) root for the entry and - * the entry data itself. - * - * If the callback returns a positive value, the passed entry will be - * skipped on the traversal (in pre mode). A negative value stops the walk. - * - * @param tree The tree to walk - * @param mode Traversal mode (pre or post-order) - * @param callback Function to call on each tree entry - * @param payload Opaque pointer to be passed on each callback - * @return 0 or an error code - */ -GIT_EXTERN(int) git_tree_walk( - const git_tree *tree, - git_treewalk_mode mode, - git_treewalk_cb callback, - void *payload); - -/** @} */ - -GIT_END_DECL -#endif diff --git a/vendor/libgit2/include/git2/types.h b/vendor/libgit2/include/git2/types.h deleted file mode 100644 index 6f41014b3..000000000 --- a/vendor/libgit2/include/git2/types.h +++ /dev/null @@ -1,436 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_git_types_h__ -#define INCLUDE_git_types_h__ - -#include "common.h" - -/** - * @file git2/types.h - * @brief libgit2 base & compatibility types - * @ingroup Git - * @{ - */ -GIT_BEGIN_DECL - -/** - * Cross-platform compatibility types for off_t / time_t - * - * NOTE: This needs to be in a public header so that both the library - * implementation and client applications both agree on the same types. - * Otherwise we get undefined behavior. - * - * Use the "best" types that each platform provides. Currently we truncate - * these intermediate representations for compatibility with the git ABI, but - * if and when it changes to support 64 bit types, our code will naturally - * adapt. - * NOTE: These types should match those that are returned by our internal - * stat() functions, for all platforms. - */ -#include -#ifdef __amigaos4__ -#include -#endif - -#if defined(_MSC_VER) - -typedef __int64 git_off_t; -typedef __time64_t git_time_t; - -#elif defined(__MINGW32__) - -typedef off64_t git_off_t; -typedef __time64_t git_time_t; - -#elif defined(__HAIKU__) - -typedef __haiku_std_int64 git_off_t; -typedef __haiku_std_int64 git_time_t; - -#else /* POSIX */ - -/* - * Note: Can't use off_t since if a client program includes - * before us (directly or indirectly), they'll get 32 bit off_t in their client - * app, even though /we/ define _FILE_OFFSET_BITS=64. - */ -typedef int64_t git_off_t; -typedef int64_t git_time_t; - -#endif - -/** Basic type (loose or packed) of any Git object. */ -typedef enum { - GIT_OBJ_ANY = -2, /**< Object can be any of the following */ - GIT_OBJ_BAD = -1, /**< Object is invalid. */ - GIT_OBJ__EXT1 = 0, /**< Reserved for future use. */ - GIT_OBJ_COMMIT = 1, /**< A commit object. */ - GIT_OBJ_TREE = 2, /**< A tree (directory listing) object. */ - GIT_OBJ_BLOB = 3, /**< A file revision object. */ - GIT_OBJ_TAG = 4, /**< An annotated tag object. */ - GIT_OBJ__EXT2 = 5, /**< Reserved for future use. */ - GIT_OBJ_OFS_DELTA = 6, /**< A delta, base is given by an offset. */ - GIT_OBJ_REF_DELTA = 7, /**< A delta, base is given by object id. */ -} git_otype; - -/** An open object database handle. */ -typedef struct git_odb git_odb; - -/** A custom backend in an ODB */ -typedef struct git_odb_backend git_odb_backend; - -/** An object read from the ODB */ -typedef struct git_odb_object git_odb_object; - -/** A stream to read/write from the ODB */ -typedef struct git_odb_stream git_odb_stream; - -/** A stream to write a packfile to the ODB */ -typedef struct git_odb_writepack git_odb_writepack; - -/** An open refs database handle. */ -typedef struct git_refdb git_refdb; - -/** A custom backend for refs */ -typedef struct git_refdb_backend git_refdb_backend; - -/** - * Representation of an existing git repository, - * including all its object contents - */ -typedef struct git_repository git_repository; - -/** Representation of a generic object in a repository */ -typedef struct git_object git_object; - -/** Representation of an in-progress walk through the commits in a repo */ -typedef struct git_revwalk git_revwalk; - -/** Parsed representation of a tag object. */ -typedef struct git_tag git_tag; - -/** In-memory representation of a blob object. */ -typedef struct git_blob git_blob; - -/** Parsed representation of a commit object. */ -typedef struct git_commit git_commit; - -/** Representation of each one of the entries in a tree object. */ -typedef struct git_tree_entry git_tree_entry; - -/** Representation of a tree object. */ -typedef struct git_tree git_tree; - -/** Constructor for in-memory trees */ -typedef struct git_treebuilder git_treebuilder; - -/** Memory representation of an index file. */ -typedef struct git_index git_index; - -/** An iterator for conflicts in the index. */ -typedef struct git_index_conflict_iterator git_index_conflict_iterator; - -/** Memory representation of a set of config files */ -typedef struct git_config git_config; - -/** Interface to access a configuration file */ -typedef struct git_config_backend git_config_backend; - -/** Representation of a reference log entry */ -typedef struct git_reflog_entry git_reflog_entry; - -/** Representation of a reference log */ -typedef struct git_reflog git_reflog; - -/** Representation of a git note */ -typedef struct git_note git_note; - -/** Representation of a git packbuilder */ -typedef struct git_packbuilder git_packbuilder; - -/** Time in a signature */ -typedef struct git_time { - git_time_t time; /**< time in seconds from epoch */ - int offset; /**< timezone offset, in minutes */ -} git_time; - -/** An action signature (e.g. for committers, taggers, etc) */ -typedef struct git_signature { - char *name; /**< full name of the author */ - char *email; /**< email of the author */ - git_time when; /**< time when the action happened */ -} git_signature; - -/** In-memory representation of a reference. */ -typedef struct git_reference git_reference; - -/** Iterator for references */ -typedef struct git_reference_iterator git_reference_iterator; - -/** Transactional interface to references */ -typedef struct git_transaction git_transaction; - -/** Annotated commits, the input to merge and rebase. */ -typedef struct git_annotated_commit git_annotated_commit; - -/** Merge result */ -typedef struct git_merge_result git_merge_result; - -/** Representation of a status collection */ -typedef struct git_status_list git_status_list; - -/** Representation of a rebase */ -typedef struct git_rebase git_rebase; - -/** Basic type of any Git reference. */ -typedef enum { - GIT_REF_INVALID = 0, /**< Invalid reference */ - GIT_REF_OID = 1, /**< A reference which points at an object id */ - GIT_REF_SYMBOLIC = 2, /**< A reference which points at another reference */ - GIT_REF_LISTALL = GIT_REF_OID|GIT_REF_SYMBOLIC, -} git_ref_t; - -/** Basic type of any Git branch. */ -typedef enum { - GIT_BRANCH_LOCAL = 1, - GIT_BRANCH_REMOTE = 2, - GIT_BRANCH_ALL = GIT_BRANCH_LOCAL|GIT_BRANCH_REMOTE, -} git_branch_t; - -/** Valid modes for index and tree entries. */ -typedef enum { - GIT_FILEMODE_UNREADABLE = 0000000, - GIT_FILEMODE_TREE = 0040000, - GIT_FILEMODE_BLOB = 0100644, - GIT_FILEMODE_BLOB_EXECUTABLE = 0100755, - GIT_FILEMODE_LINK = 0120000, - GIT_FILEMODE_COMMIT = 0160000, -} git_filemode_t; - -/* - * A refspec specifies the mapping between remote and local reference - * names when fetch or pushing. - */ -typedef struct git_refspec git_refspec; - -/** - * Git's idea of a remote repository. A remote can be anonymous (in - * which case it does not have backing configuration entires). - */ -typedef struct git_remote git_remote; - -/** - * Interface which represents a transport to communicate with a - * remote. - */ -typedef struct git_transport git_transport; - -/** - * Preparation for a push operation. Can be used to configure what to - * push and the level of parallelism of the packfile builder. - */ -typedef struct git_push git_push; - -/* documentation in the definition */ -typedef struct git_remote_head git_remote_head; -typedef struct git_remote_callbacks git_remote_callbacks; - -/** - * This is passed as the first argument to the callback to allow the - * user to see the progress. - * - * - total_objects: number of objects in the packfile being downloaded - * - indexed_objects: received objects that have been hashed - * - received_objects: objects which have been downloaded - * - local_objects: locally-available objects that have been injected - * in order to fix a thin pack. - * - received-bytes: size of the packfile received up to now - */ -typedef struct git_transfer_progress { - unsigned int total_objects; - unsigned int indexed_objects; - unsigned int received_objects; - unsigned int local_objects; - unsigned int total_deltas; - unsigned int indexed_deltas; - size_t received_bytes; -} git_transfer_progress; - -/** - * Type for progress callbacks during indexing. Return a value less than zero - * to cancel the transfer. - * - * @param stats Structure containing information about the state of the transfer - * @param payload Payload provided by caller - */ -typedef int (*git_transfer_progress_cb)(const git_transfer_progress *stats, void *payload); - -/** - * Type for messages delivered by the transport. Return a negative value - * to cancel the network operation. - * - * @param str The message from the transport - * @param len The length of the message - * @param payload Payload provided by the caller - */ -typedef int (*git_transport_message_cb)(const char *str, int len, void *payload); - - -/** - * Type of host certificate structure that is passed to the check callback - */ -typedef enum git_cert_t { - /** - * No information about the certificate is available. This may - * happen when using curl. - */ - GIT_CERT_NONE, - /** - * The `data` argument to the callback will be a pointer to - * the DER-encoded data. - */ - GIT_CERT_X509, - /** - * The `data` argument to the callback will be a pointer to a - * `git_cert_hostkey` structure. - */ - GIT_CERT_HOSTKEY_LIBSSH2, - /** - * The `data` argument to the callback will be a pointer to a - * `git_strarray` with `name:content` strings containing - * information about the certificate. This is used when using - * curl. - */ - GIT_CERT_STRARRAY, -} git_cert_t; - -/** - * Parent type for `git_cert_hostkey` and `git_cert_x509`. - */ -typedef struct { - /** - * Type of certificate. A `GIT_CERT_` value. - */ - git_cert_t cert_type; -} git_cert; - -/** - * Callback for the user's custom certificate checks. - * - * @param cert The host certificate - * @param valid Whether the libgit2 checks (OpenSSL or WinHTTP) think - * this certificate is valid - * @param host Hostname of the host libgit2 connected to - * @param payload Payload provided by the caller - */ -typedef int (*git_transport_certificate_check_cb)(git_cert *cert, int valid, const char *host, void *payload); - -/** - * Opaque structure representing a submodule. - */ -typedef struct git_submodule git_submodule; - -/** - * Submodule update values - * - * These values represent settings for the `submodule.$name.update` - * configuration value which says how to handle `git submodule update` for - * this submodule. The value is usually set in the ".gitmodules" file and - * copied to ".git/config" when the submodule is initialized. - * - * You can override this setting on a per-submodule basis with - * `git_submodule_set_update()` and write the changed value to disk using - * `git_submodule_save()`. If you have overwritten the value, you can - * revert it by passing `GIT_SUBMODULE_UPDATE_RESET` to the set function. - * - * The values are: - * - * - GIT_SUBMODULE_UPDATE_CHECKOUT: the default; when a submodule is - * updated, checkout the new detached HEAD to the submodule directory. - * - GIT_SUBMODULE_UPDATE_REBASE: update by rebasing the current checked - * out branch onto the commit from the superproject. - * - GIT_SUBMODULE_UPDATE_MERGE: update by merging the commit in the - * superproject into the current checkout out branch of the submodule. - * - GIT_SUBMODULE_UPDATE_NONE: do not update this submodule even when - * the commit in the superproject is updated. - * - GIT_SUBMODULE_UPDATE_DEFAULT: not used except as static initializer - * when we don't want any particular update rule to be specified. - */ -typedef enum { - GIT_SUBMODULE_UPDATE_CHECKOUT = 1, - GIT_SUBMODULE_UPDATE_REBASE = 2, - GIT_SUBMODULE_UPDATE_MERGE = 3, - GIT_SUBMODULE_UPDATE_NONE = 4, - - GIT_SUBMODULE_UPDATE_DEFAULT = 0 -} git_submodule_update_t; - -/** - * Submodule ignore values - * - * These values represent settings for the `submodule.$name.ignore` - * configuration value which says how deeply to look at the working - * directory when getting submodule status. - * - * You can override this value in memory on a per-submodule basis with - * `git_submodule_set_ignore()` and can write the changed value to disk - * with `git_submodule_save()`. If you have overwritten the value, you - * can revert to the on disk value by using `GIT_SUBMODULE_IGNORE_RESET`. - * - * The values are: - * - * - GIT_SUBMODULE_IGNORE_UNSPECIFIED: use the submodule's configuration - * - GIT_SUBMODULE_IGNORE_NONE: don't ignore any change - i.e. even an - * untracked file, will mark the submodule as dirty. Ignored files are - * still ignored, of course. - * - GIT_SUBMODULE_IGNORE_UNTRACKED: ignore untracked files; only changes - * to tracked files, or the index or the HEAD commit will matter. - * - GIT_SUBMODULE_IGNORE_DIRTY: ignore changes in the working directory, - * only considering changes if the HEAD of submodule has moved from the - * value in the superproject. - * - GIT_SUBMODULE_IGNORE_ALL: never check if the submodule is dirty - * - GIT_SUBMODULE_IGNORE_DEFAULT: not used except as static initializer - * when we don't want any particular ignore rule to be specified. - */ -typedef enum { - GIT_SUBMODULE_IGNORE_UNSPECIFIED = -1, /**< use the submodule's configuration */ - - GIT_SUBMODULE_IGNORE_NONE = 1, /**< any change or untracked == dirty */ - GIT_SUBMODULE_IGNORE_UNTRACKED = 2, /**< dirty if tracked files change */ - GIT_SUBMODULE_IGNORE_DIRTY = 3, /**< only dirty if HEAD moved */ - GIT_SUBMODULE_IGNORE_ALL = 4, /**< never dirty */ -} git_submodule_ignore_t; - -/** - * Options for submodule recurse. - * - * Represent the value of `submodule.$name.fetchRecurseSubmodules` - * - * * GIT_SUBMODULE_RECURSE_NO - do no recurse into submodules - * * GIT_SUBMODULE_RECURSE_YES - recurse into submodules - * * GIT_SUBMODULE_RECURSE_ONDEMAND - recurse into submodules only when - * commit not already in local clone - */ -typedef enum { - GIT_SUBMODULE_RECURSE_NO = 0, - GIT_SUBMODULE_RECURSE_YES = 1, - GIT_SUBMODULE_RECURSE_ONDEMAND = 2, -} git_submodule_recurse_t; - -/** A type to write in a streaming fashion, for example, for filters. */ -typedef struct git_writestream git_writestream; - -struct git_writestream { - int (*write)(git_writestream *stream, const char *buffer, size_t len); - int (*close)(git_writestream *stream); - void (*free)(git_writestream *stream); -}; - -/** @} */ -GIT_END_DECL - -#endif diff --git a/vendor/libgit2/include/git2/version.h b/vendor/libgit2/include/git2/version.h deleted file mode 100644 index 66a6623cd..000000000 --- a/vendor/libgit2/include/git2/version.h +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_git_version_h__ -#define INCLUDE_git_version_h__ - -#define LIBGIT2_VERSION "0.24.0" -#define LIBGIT2_VER_MAJOR 0 -#define LIBGIT2_VER_MINOR 24 -#define LIBGIT2_VER_REVISION 0 -#define LIBGIT2_VER_PATCH 0 - -#define LIBGIT2_SOVERSION 24 - -#endif diff --git a/vendor/libgit2/libgit2.pc.in b/vendor/libgit2/libgit2.pc.in deleted file mode 100644 index 329a560a7..000000000 --- a/vendor/libgit2/libgit2.pc.in +++ /dev/null @@ -1,13 +0,0 @@ -prefix=@PKGCONFIG_PREFIX@ -libdir=@PKGCONFIG_LIBDIR@ -includedir=@PKGCONFIG_INCLUDEDIR@ - -Name: libgit2 -Description: The git library, take 2 -Version: @LIBGIT2_VERSION_STRING@ - -Libs: -L"${libdir}" -lgit2 -Libs.private: @LIBGIT2_PC_LIBS@ -Requires.private: @LIBGIT2_PC_REQUIRES@ - -Cflags: -I${includedir} diff --git a/vendor/libgit2/libgit2_clar.supp b/vendor/libgit2/libgit2_clar.supp deleted file mode 100644 index bd22ada46..000000000 --- a/vendor/libgit2/libgit2_clar.supp +++ /dev/null @@ -1,49 +0,0 @@ -{ - ignore-zlib-errors-cond - Memcheck:Cond - obj:*libz.so* -} - -{ - ignore-giterr-set-leak - Memcheck:Leak - ... - fun:giterr_set -} - -{ - ignore-git-global-state-leak - Memcheck:Leak - ... - fun:git__global_state -} - -{ - ignore-openssl-ssl-leak - Memcheck:Leak - ... - obj:*libssl.so* - ... -} - -{ - ignore-openssl-crypto-leak - Memcheck:Leak - ... - obj:*libcrypto.so* - ... -} - -{ - ignore-openssl-crypto-cond - Memcheck:Cond - obj:*libcrypto.so* - ... -} - -{ - ignore-glibc-getaddrinfo-cache - Memcheck:Leak - ... - fun:__check_pf -} diff --git a/vendor/libgit2/script/appveyor-mingw.sh b/vendor/libgit2/script/appveyor-mingw.sh deleted file mode 100755 index 48e0bad0a..000000000 --- a/vendor/libgit2/script/appveyor-mingw.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -set -e -cd `dirname "$0"`/.. -if [ "$ARCH" = "32" ]; then - echo 'C:\MinGW\ /MinGW' > /etc/fstab -elif [ "$ARCH" = "i686" ]; then - f=i686-4.9.2-release-win32-sjlj-rt_v3-rev1.7z - if ! [ -e $f ]; then - curl -LsSO http://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win32/Personal%20Builds/mingw-builds/4.9.2/threads-win32/sjlj/$f - fi - 7z x $f > /dev/null - mv mingw32 /MinGW -else - f=x86_64-4.9.2-release-win32-seh-rt_v3-rev1.7z - if ! [ -e $f ]; then - curl -LsSO http://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win64/Personal%20Builds/mingw-builds/4.9.2/threads-win32/seh/$f - fi - 7z x $f > /dev/null - mv mingw64 /MinGW -fi -cd build -cmake -D ENABLE_TRACE=ON -D BUILD_CLAR=ON .. -G"$GENERATOR" -cmake --build . --config RelWithDebInfo diff --git a/vendor/libgit2/script/cibuild.sh b/vendor/libgit2/script/cibuild.sh deleted file mode 100755 index 00cde0ada..000000000 --- a/vendor/libgit2/script/cibuild.sh +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/sh - -if [ -n "$COVERITY" ]; -then - ./script/coverity.sh; - exit $?; -fi - -mkdir _build -cd _build -# shellcheck disable=SC2086 -cmake .. -DCMAKE_INSTALL_PREFIX=../_install $OPTIONS || exit $? -make -j2 install || exit $? - -# If this platform doesn't support test execution, bail out now -if [ -n "$SKIP_TESTS" ]; -then - exit $?; -fi - -# Create a test repo which we can use for the online::push tests -mkdir "$HOME"/_temp -git init --bare "$HOME"/_temp/test.git -git daemon --listen=localhost --export-all --enable=receive-pack --base-path="$HOME"/_temp "$HOME"/_temp 2>/dev/null & -export GITTEST_REMOTE_URL="git://localhost/test.git" - -# Run the test suite -ctest -V -R libgit2_clar || exit $? - -# Now that we've tested the raw git protocol, let's set up ssh to we -# can do the push tests over it - -killall git-daemon - -if [ "$TRAVIS_OS_NAME" = "osx" ]; then - echo 'PasswordAuthentication yes' | sudo tee -a /etc/sshd_config -fi - -ssh-keygen -t rsa -f ~/.ssh/id_rsa -N "" -q -cat ~/.ssh/id_rsa.pub >>~/.ssh/authorized_keys -ssh-keyscan -t rsa localhost >>~/.ssh/known_hosts - -# Get the fingerprint for localhost and remove the colons so we can parse it as a hex number -export GITTEST_REMOTE_SSH_FINGERPRINT=$(ssh-keygen -F localhost -l | tail -n 1 | cut -d ' ' -f 2 | tr -d ':') - -export GITTEST_REMOTE_URL="ssh://localhost/$HOME/_temp/test.git" -export GITTEST_REMOTE_USER=$USER -export GITTEST_REMOTE_SSH_KEY="$HOME/.ssh/id_rsa" -export GITTEST_REMOTE_SSH_PUBKEY="$HOME/.ssh/id_rsa.pub" -export GITTEST_REMOTE_SSH_PASSPHRASE="" - -if [ -e ./libgit2_clar ]; then - ./libgit2_clar -sonline::push -sonline::clone::ssh_cert && - ./libgit2_clar -sonline::clone::ssh_with_paths || exit $? - if [ "$TRAVIS_OS_NAME" = "linux" ]; then - ./libgit2_clar -sonline::clone::cred_callback || exit $? - fi -fi - -export GITTEST_REMOTE_URL="https://github.com/libgit2/non-existent" -export GITTEST_REMOTE_USER="libgit2test" -ctest -V -R libgit2_clar-cred_callback diff --git a/vendor/libgit2/script/coverity.sh b/vendor/libgit2/script/coverity.sh deleted file mode 100755 index 7fe9eb4c7..000000000 --- a/vendor/libgit2/script/coverity.sh +++ /dev/null @@ -1,72 +0,0 @@ -#!/bin/bash -set -e - -# Environment check -[ -z "$COVERITY_TOKEN" ] && echo "Need to set a coverity token" && exit 1 - -# Only run this on our branches -echo "Pull request: $TRAVIS_PULL_REQUEST | Slug: $TRAVIS_REPO_SLUG" -if [ "$TRAVIS_PULL_REQUEST" != "false" -o "$TRAVIS_REPO_SLUG" != "libgit2/libgit2" ]; -then - echo "Only analyzing 'development' on the main repo." - exit 0 -fi - -COV_VERSION=6.6.1 -case $(uname -m) in - i?86) BITS=32 ;; - amd64|x86_64) BITS=64 ;; -esac -SCAN_TOOL=https://scan.coverity.com/download/linux-${BITS} -TOOL_BASE=$(pwd)/_coverity-scan - -# Install coverity tools -if [ ! -d "$TOOL_BASE" ]; then - echo "Downloading coverity..." - mkdir -p "$TOOL_BASE" - pushd "$TOOL_BASE" - wget -O coverity_tool.tgz $SCAN_TOOL \ - --post-data "project=libgit2&token=$COVERITY_TOKEN" - tar xzf coverity_tool.tgz - popd - TOOL_DIR=$(find "$TOOL_BASE" -type d -name 'cov-analysis*') - ln -s "$TOOL_DIR" "$TOOL_BASE"/cov-analysis -fi - -cp script/user_nodefs.h "$TOOL_BASE"/cov-analysis/config/user_nodefs.h - -COV_BUILD="$TOOL_BASE/cov-analysis/bin/cov-build" - -# Configure and build -rm -rf _build -mkdir _build -cd _build -cmake .. -DTHREADSAFE=ON -COVERITY_UNSUPPORTED=1 \ - $COV_BUILD --dir cov-int \ - cmake --build . - -# Upload results -tar czf libgit2.tgz cov-int -SHA=$(git rev-parse --short HEAD) - -HTML="$(curl \ - --silent \ - --write-out "\n%{http_code}" \ - --form token="$COVERITY_TOKEN" \ - --form email=bs@github.com \ - --form file=@libgit2.tgz \ - --form version="$SHA" \ - --form description="Travis build" \ - https://scan.coverity.com/builds?project=libgit2)" -# Body is everything up to the last line -BODY="$(echo "$HTML" | head -n-1)" -# Status code is the last line -STATUS_CODE="$(echo "$HTML" | tail -n1)" - -echo "${BODY}" - -if [ "${STATUS_CODE}" != "201" ]; then - echo "Received error code ${STATUS_CODE} from Coverity" - exit 1 -fi diff --git a/vendor/libgit2/script/install-deps-osx.sh b/vendor/libgit2/script/install-deps-osx.sh deleted file mode 100755 index 5510379d4..000000000 --- a/vendor/libgit2/script/install-deps-osx.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -set -x - -brew update -brew install libssh2 diff --git a/vendor/libgit2/script/user_nodefs.h b/vendor/libgit2/script/user_nodefs.h deleted file mode 100644 index 3c06a706d..000000000 --- a/vendor/libgit2/script/user_nodefs.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#nodef GITERR_CHECK_ALLOC(ptr) if (ptr == NULL) { __coverity_panic__(); } -#nodef GITERR_CHECK_ALLOC_BUF(buf) if (buf == NULL || git_buf_oom(buf)) { __coverity_panic__(); } - -#nodef GITERR_CHECK_ALLOC_ADD(out, one, two) \ - if (GIT_ADD_SIZET_OVERFLOW(out, one, two)) { __coverity_panic__(); } - -#nodef GITERR_CHECK_ALLOC_ADD3(out, one, two, three) \ - if (GIT_ADD_SIZET_OVERFLOW(out, one, two) || \ - GIT_ADD_SIZET_OVERFLOW(out, *(out), three)) { __coverity_panic__(); } - -#nodef GITERR_CHECK_ALLOC_ADD4(out, one, two, three, four) \ - if (GIT_ADD_SIZET_OVERFLOW(out, one, two) || \ - GIT_ADD_SIZET_OVERFLOW(out, *(out), three) || \ - GIT_ADD_SIZET_OVERFLOW(out, *(out), four)) { __coverity_panic__(); } - -#nodef GITERR_CHECK_ALLOC_MULTIPLY(out, nelem, elsize) \ - if (GIT_MULTIPLY_SIZET_OVERFLOW(out, nelem, elsize)) { __coverity_panic__(); } - -#nodef GITERR_CHECK_VERSION(S,V,N) if (giterr__check_version(S,V,N) < 0) { __coverity_panic__(); } - -#nodef LOOKS_LIKE_DRIVE_PREFIX(S) (strlen(S) >= 2 && git__isalpha((S)[0]) && (S)[1] == ':') - -#nodef git_vector_foreach(v, iter, elem) \ - for ((iter) = 0; (v)->contents != NULL && (iter) < (v)->length && ((elem) = (v)->contents[(iter)], 1); (iter)++ ) - -#nodef git_vector_rforeach(v, iter, elem) \ - for ((iter) = (v)->length - 1; (v)->contents != NULL && (iter) < SIZE_MAX && ((elem) = (v)->contents[(iter)], 1); (iter)-- ) diff --git a/vendor/libgit2/src/annotated_commit.c b/vendor/libgit2/src/annotated_commit.c deleted file mode 100644 index e53b95dee..000000000 --- a/vendor/libgit2/src/annotated_commit.c +++ /dev/null @@ -1,202 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "common.h" -#include "annotated_commit.h" -#include "refs.h" -#include "cache.h" - -#include "git2/commit.h" -#include "git2/refs.h" -#include "git2/repository.h" -#include "git2/annotated_commit.h" -#include "git2/revparse.h" -#include "git2/tree.h" -#include "git2/index.h" - -static int annotated_commit_init( - git_annotated_commit **out, - git_repository *repo, - const git_oid *id, - const char *ref_name, - const char *remote_url) -{ - git_annotated_commit *annotated_commit; - git_commit *commit = NULL; - int error = 0; - - assert(out && id); - - *out = NULL; - - if ((error = git_commit_lookup(&commit, repo, id)) < 0 || - (error = git_annotated_commit_from_commit(&annotated_commit, - commit)) < 0) - goto done; - - if (ref_name) { - annotated_commit->ref_name = git__strdup(ref_name); - GITERR_CHECK_ALLOC(annotated_commit->ref_name); - } - - if (remote_url) { - annotated_commit->remote_url = git__strdup(remote_url); - GITERR_CHECK_ALLOC(annotated_commit->remote_url); - } - - *out = annotated_commit; - -done: - git_commit_free(commit); - return error; -} - -int git_annotated_commit_from_ref( - git_annotated_commit **out, - git_repository *repo, - const git_reference *ref) -{ - git_reference *resolved; - int error = 0; - - assert(out && repo && ref); - - *out = NULL; - - if ((error = git_reference_resolve(&resolved, ref)) < 0) - return error; - - error = annotated_commit_init(out, repo, git_reference_target(resolved), - git_reference_name(ref), NULL); - - git_reference_free(resolved); - return error; -} - -int git_annotated_commit_from_head( - git_annotated_commit **out, - git_repository *repo) -{ - git_reference *head; - int error; - - assert(out && repo); - - *out = NULL; - - if ((error = git_reference_lookup(&head, repo, GIT_HEAD_FILE)) < 0) - return -1; - - error = git_annotated_commit_from_ref(out, repo, head); - - git_reference_free(head); - return error; -} - -int git_annotated_commit_from_commit( - git_annotated_commit **out, - git_commit *commit) -{ - git_annotated_commit *annotated_commit; - - assert(out && commit); - - *out = NULL; - - annotated_commit = git__calloc(1, sizeof(git_annotated_commit)); - GITERR_CHECK_ALLOC(annotated_commit); - - annotated_commit->type = GIT_ANNOTATED_COMMIT_REAL; - - git_cached_obj_incref(commit); - annotated_commit->commit = commit; - - git_oid_fmt(annotated_commit->id_str, git_commit_id(commit)); - annotated_commit->id_str[GIT_OID_HEXSZ] = '\0'; - - *out = annotated_commit; - return 0; -} - -int git_annotated_commit_lookup( - git_annotated_commit **out, - git_repository *repo, - const git_oid *id) -{ - assert(out && repo && id); - - return annotated_commit_init(out, repo, id, NULL, NULL); -} - -int git_annotated_commit_from_fetchhead( - git_annotated_commit **out, - git_repository *repo, - const char *branch_name, - const char *remote_url, - const git_oid *id) -{ - assert(repo && id && branch_name && remote_url); - - return annotated_commit_init(out, repo, id, branch_name, remote_url); -} - -int git_annotated_commit_from_revspec( - git_annotated_commit **out, - git_repository *repo, - const char *revspec) -{ - git_object *obj, *commit; - int error; - - assert(out && repo && revspec); - - if ((error = git_revparse_single(&obj, repo, revspec)) < 0) - return error; - - if ((error = git_object_peel(&commit, obj, GIT_OBJ_COMMIT))) { - git_object_free(obj); - return error; - } - - error = annotated_commit_init(out, repo, git_object_id(commit), revspec, NULL); - - git_object_free(obj); - git_object_free(commit); - - return error; -} - - -const git_oid *git_annotated_commit_id( - const git_annotated_commit *annotated_commit) -{ - assert(annotated_commit); - return git_commit_id(annotated_commit->commit); -} - -void git_annotated_commit_free(git_annotated_commit *annotated_commit) -{ - if (annotated_commit == NULL) - return; - - switch (annotated_commit->type) { - case GIT_ANNOTATED_COMMIT_REAL: - git_commit_free(annotated_commit->commit); - git_tree_free(annotated_commit->tree); - git__free(annotated_commit->ref_name); - git__free(annotated_commit->remote_url); - break; - case GIT_ANNOTATED_COMMIT_VIRTUAL: - git_index_free(annotated_commit->index); - git_array_clear(annotated_commit->parents); - break; - default: - abort(); - } - - git__free(annotated_commit); -} diff --git a/vendor/libgit2/src/annotated_commit.h b/vendor/libgit2/src/annotated_commit.h deleted file mode 100644 index cbb88fd22..000000000 --- a/vendor/libgit2/src/annotated_commit.h +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_annotated_commit_h__ -#define INCLUDE_annotated_commit_h__ - -#include "oidarray.h" - -#include "git2/oid.h" - -typedef enum { - GIT_ANNOTATED_COMMIT_REAL = 1, - GIT_ANNOTATED_COMMIT_VIRTUAL = 2, -} git_annotated_commit_t; - -/** - * Internal structure for merge inputs. An annotated commit is generally - * "real" and backed by an actual commit in the repository, but merge will - * internally create "virtual" commits that are in-memory intermediate - * commits backed by an index. - */ -struct git_annotated_commit { - git_annotated_commit_t type; - - /* real commit */ - git_commit *commit; - git_tree *tree; - - /* virtual commit structure */ - git_index *index; - git_array_oid_t parents; - - char *ref_name; - char *remote_url; - - char id_str[GIT_OID_HEXSZ+1]; -}; - -extern int git_annotated_commit_from_head(git_annotated_commit **out, - git_repository *repo); -extern int git_annotated_commit_from_commit(git_annotated_commit **out, - git_commit *commit); - -#endif diff --git a/vendor/libgit2/src/array.h b/vendor/libgit2/src/array.h deleted file mode 100644 index 490e6be20..000000000 --- a/vendor/libgit2/src/array.h +++ /dev/null @@ -1,125 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_array_h__ -#define INCLUDE_array_h__ - -#include "common.h" - -/* - * Use this to declare a typesafe resizable array of items, a la: - * - * git_array_t(int) my_ints = GIT_ARRAY_INIT; - * ... - * int *i = git_array_alloc(my_ints); - * GITERR_CHECK_ALLOC(i); - * ... - * git_array_clear(my_ints); - * - * You may also want to do things like: - * - * typedef git_array_t(my_struct) my_struct_array_t; - */ -#define git_array_t(type) struct { type *ptr; size_t size, asize; } - -#define GIT_ARRAY_INIT { NULL, 0, 0 } - -#define git_array_init(a) \ - do { (a).size = (a).asize = 0; (a).ptr = NULL; } while (0) - -#define git_array_init_to_size(a, desired) \ - do { (a).size = 0; (a).asize = desired; (a).ptr = git__calloc(desired, sizeof(*(a).ptr)); } while (0) - -#define git_array_clear(a) \ - do { git__free((a).ptr); git_array_init(a); } while (0) - -#define GITERR_CHECK_ARRAY(a) GITERR_CHECK_ALLOC((a).ptr) - - -typedef git_array_t(char) git_array_generic_t; - -/* use a generic array for growth so this can return the new item */ -GIT_INLINE(void *) git_array_grow(void *_a, size_t item_size) -{ - volatile git_array_generic_t *a = _a; - size_t new_size; - char *new_array; - - if (a->size < 8) { - new_size = 8; - } else { - if (GIT_MULTIPLY_SIZET_OVERFLOW(&new_size, a->size, 3)) - goto on_oom; - new_size /= 2; - } - - if ((new_array = git__reallocarray(a->ptr, new_size, item_size)) == NULL) - goto on_oom; - - a->ptr = new_array; a->asize = new_size; a->size++; - return a->ptr + (a->size - 1) * item_size; - -on_oom: - git_array_clear(*a); - return NULL; -} - -#define git_array_alloc(a) \ - (((a).size >= (a).asize) ? \ - git_array_grow(&(a), sizeof(*(a).ptr)) : \ - ((a).ptr ? &(a).ptr[(a).size++] : NULL)) - -#define git_array_last(a) ((a).size ? &(a).ptr[(a).size - 1] : NULL) - -#define git_array_pop(a) ((a).size ? &(a).ptr[--(a).size] : NULL) - -#define git_array_get(a, i) (((i) < (a).size) ? &(a).ptr[(i)] : NULL) - -#define git_array_size(a) (a).size - -#define git_array_valid_index(a, i) ((i) < (a).size) - -#define git_array_foreach(a, i, element) \ - for ((i) = 0; (i) < (a).size && ((element) = &(a).ptr[(i)]); (i)++) - - -GIT_INLINE(int) git_array__search( - size_t *out, - void *array_ptr, - size_t item_size, - size_t array_len, - int (*compare)(const void *, const void *), - const void *key) -{ - size_t lim; - unsigned char *part, *array = array_ptr, *base = array_ptr; - int cmp; - - for (lim = array_len; lim != 0; lim >>= 1) { - part = base + (lim >> 1) * item_size; - cmp = (*compare)(key, part); - - if (cmp == 0) { - base = part; - break; - } - if (cmp > 0) { /* key > p; take right partition */ - base = part + 1 * item_size; - lim--; - } /* else take left partition */ - } - - if (out) - *out = (base - array) / item_size; - - return (cmp == 0) ? 0 : GIT_ENOTFOUND; -} - -#define git_array_search(out, a, cmp, key) \ - git_array__search(out, (a).ptr, sizeof(*(a).ptr), (a).size, \ - (cmp), (key)) - -#endif diff --git a/vendor/libgit2/src/attr.c b/vendor/libgit2/src/attr.c deleted file mode 100644 index d43a15f50..000000000 --- a/vendor/libgit2/src/attr.c +++ /dev/null @@ -1,544 +0,0 @@ -#include "common.h" -#include "repository.h" -#include "sysdir.h" -#include "config.h" -#include "attr_file.h" -#include "ignore.h" -#include "git2/oid.h" -#include - -GIT__USE_STRMAP - -const char *git_attr__true = "[internal]__TRUE__"; -const char *git_attr__false = "[internal]__FALSE__"; -const char *git_attr__unset = "[internal]__UNSET__"; - -git_attr_t git_attr_value(const char *attr) -{ - if (attr == NULL || attr == git_attr__unset) - return GIT_ATTR_UNSPECIFIED_T; - - if (attr == git_attr__true) - return GIT_ATTR_TRUE_T; - - if (attr == git_attr__false) - return GIT_ATTR_FALSE_T; - - return GIT_ATTR_VALUE_T; -} - -static int collect_attr_files( - git_repository *repo, - git_attr_session *attr_session, - uint32_t flags, - const char *path, - git_vector *files); - -static void release_attr_files(git_vector *files); - -int git_attr_get( - const char **value, - git_repository *repo, - uint32_t flags, - const char *pathname, - const char *name) -{ - int error; - git_attr_path path; - git_vector files = GIT_VECTOR_INIT; - size_t i, j; - git_attr_file *file; - git_attr_name attr; - git_attr_rule *rule; - - assert(value && repo && name); - - *value = NULL; - - if (git_attr_path__init(&path, pathname, git_repository_workdir(repo), GIT_DIR_FLAG_UNKNOWN) < 0) - return -1; - - if ((error = collect_attr_files(repo, NULL, flags, pathname, &files)) < 0) - goto cleanup; - - memset(&attr, 0, sizeof(attr)); - attr.name = name; - attr.name_hash = git_attr_file__name_hash(name); - - git_vector_foreach(&files, i, file) { - - git_attr_file__foreach_matching_rule(file, &path, j, rule) { - size_t pos; - - if (!git_vector_bsearch(&pos, &rule->assigns, &attr)) { - *value = ((git_attr_assignment *)git_vector_get( - &rule->assigns, pos))->value; - goto cleanup; - } - } - } - -cleanup: - release_attr_files(&files); - git_attr_path__free(&path); - - return error; -} - - -typedef struct { - git_attr_name name; - git_attr_assignment *found; -} attr_get_many_info; - -int git_attr_get_many_with_session( - const char **values, - git_repository *repo, - git_attr_session *attr_session, - uint32_t flags, - const char *pathname, - size_t num_attr, - const char **names) -{ - int error; - git_attr_path path; - git_vector files = GIT_VECTOR_INIT; - size_t i, j, k; - git_attr_file *file; - git_attr_rule *rule; - attr_get_many_info *info = NULL; - size_t num_found = 0; - - if (!num_attr) - return 0; - - assert(values && repo && names); - - if (git_attr_path__init(&path, pathname, git_repository_workdir(repo), GIT_DIR_FLAG_UNKNOWN) < 0) - return -1; - - if ((error = collect_attr_files(repo, attr_session, flags, pathname, &files)) < 0) - goto cleanup; - - info = git__calloc(num_attr, sizeof(attr_get_many_info)); - GITERR_CHECK_ALLOC(info); - - git_vector_foreach(&files, i, file) { - - git_attr_file__foreach_matching_rule(file, &path, j, rule) { - - for (k = 0; k < num_attr; k++) { - size_t pos; - - if (info[k].found != NULL) /* already found assignment */ - continue; - - if (!info[k].name.name) { - info[k].name.name = names[k]; - info[k].name.name_hash = git_attr_file__name_hash(names[k]); - } - - if (!git_vector_bsearch(&pos, &rule->assigns, &info[k].name)) { - info[k].found = (git_attr_assignment *) - git_vector_get(&rule->assigns, pos); - values[k] = info[k].found->value; - - if (++num_found == num_attr) - goto cleanup; - } - } - } - } - - for (k = 0; k < num_attr; k++) { - if (!info[k].found) - values[k] = NULL; - } - -cleanup: - release_attr_files(&files); - git_attr_path__free(&path); - git__free(info); - - return error; -} - -int git_attr_get_many( - const char **values, - git_repository *repo, - uint32_t flags, - const char *pathname, - size_t num_attr, - const char **names) -{ - return git_attr_get_many_with_session( - values, repo, NULL, flags, pathname, num_attr, names); -} - -int git_attr_foreach( - git_repository *repo, - uint32_t flags, - const char *pathname, - int (*callback)(const char *name, const char *value, void *payload), - void *payload) -{ - int error; - git_attr_path path; - git_vector files = GIT_VECTOR_INIT; - size_t i, j, k; - git_attr_file *file; - git_attr_rule *rule; - git_attr_assignment *assign; - git_strmap *seen = NULL; - - assert(repo && callback); - - if (git_attr_path__init(&path, pathname, git_repository_workdir(repo), GIT_DIR_FLAG_UNKNOWN) < 0) - return -1; - - if ((error = collect_attr_files(repo, NULL, flags, pathname, &files)) < 0 || - (error = git_strmap_alloc(&seen)) < 0) - goto cleanup; - - git_vector_foreach(&files, i, file) { - - git_attr_file__foreach_matching_rule(file, &path, j, rule) { - - git_vector_foreach(&rule->assigns, k, assign) { - /* skip if higher priority assignment was already seen */ - if (git_strmap_exists(seen, assign->name)) - continue; - - git_strmap_insert(seen, assign->name, assign, error); - if (error < 0) - goto cleanup; - - error = callback(assign->name, assign->value, payload); - if (error) { - giterr_set_after_callback(error); - goto cleanup; - } - } - } - } - -cleanup: - git_strmap_free(seen); - release_attr_files(&files); - git_attr_path__free(&path); - - return error; -} - -static int preload_attr_file( - git_repository *repo, - git_attr_session *attr_session, - git_attr_file_source source, - const char *base, - const char *file) -{ - int error; - git_attr_file *preload = NULL; - - if (!file) - return 0; - if (!(error = git_attr_cache__get( - &preload, repo, attr_session, source, base, file, git_attr_file__parse_buffer))) - git_attr_file__free(preload); - - return error; -} - -static int system_attr_file( - git_buf *out, - git_attr_session *attr_session) -{ - int error; - - if (!attr_session) { - error = git_sysdir_find_system_file(out, GIT_ATTR_FILE_SYSTEM); - - if (error == GIT_ENOTFOUND) - giterr_clear(); - - return error; - } - - if (!attr_session->init_sysdir) { - error = git_sysdir_find_system_file(&attr_session->sysdir, GIT_ATTR_FILE_SYSTEM); - - if (error == GIT_ENOTFOUND) - giterr_clear(); - else if (error) - return error; - - attr_session->init_sysdir = 1; - } - - if (attr_session->sysdir.size == 0) - return GIT_ENOTFOUND; - - /* We can safely provide a git_buf with no allocation (asize == 0) to - * a consumer. This allows them to treat this as a regular `git_buf`, - * but their call to `git_buf_free` will not attempt to free it. - */ - git_buf_attach_notowned( - out, attr_session->sysdir.ptr, attr_session->sysdir.size); - return 0; -} - -static int attr_setup(git_repository *repo, git_attr_session *attr_session) -{ - int error = 0; - const char *workdir = git_repository_workdir(repo); - git_index *idx = NULL; - git_buf sys = GIT_BUF_INIT; - - if (attr_session && attr_session->init_setup) - return 0; - - if ((error = git_attr_cache__init(repo)) < 0) - return error; - - /* preload attribute files that could contain macros so the - * definitions will be available for later file parsing - */ - - error = system_attr_file(&sys, attr_session); - - if (error == 0) - error = preload_attr_file( - repo, attr_session, GIT_ATTR_FILE__FROM_FILE, NULL, sys.ptr); - - if (error != GIT_ENOTFOUND) - return error; - - git_buf_free(&sys); - - if ((error = preload_attr_file( - repo, attr_session, GIT_ATTR_FILE__FROM_FILE, - NULL, git_repository_attr_cache(repo)->cfg_attr_file)) < 0) - return error; - - if ((error = preload_attr_file( - repo, attr_session, GIT_ATTR_FILE__FROM_FILE, - git_repository_path(repo), GIT_ATTR_FILE_INREPO)) < 0) - return error; - - if (workdir != NULL && - (error = preload_attr_file( - repo, attr_session, GIT_ATTR_FILE__FROM_FILE, workdir, GIT_ATTR_FILE)) < 0) - return error; - - if ((error = git_repository_index__weakptr(&idx, repo)) < 0 || - (error = preload_attr_file( - repo, attr_session, GIT_ATTR_FILE__FROM_INDEX, NULL, GIT_ATTR_FILE)) < 0) - return error; - - if (attr_session) - attr_session->init_setup = 1; - - return error; -} - -int git_attr_add_macro( - git_repository *repo, - const char *name, - const char *values) -{ - int error; - git_attr_rule *macro = NULL; - git_pool *pool; - - if ((error = git_attr_cache__init(repo)) < 0) - return error; - - macro = git__calloc(1, sizeof(git_attr_rule)); - GITERR_CHECK_ALLOC(macro); - - pool = &git_repository_attr_cache(repo)->pool; - - macro->match.pattern = git_pool_strdup(pool, name); - GITERR_CHECK_ALLOC(macro->match.pattern); - - macro->match.length = strlen(macro->match.pattern); - macro->match.flags = GIT_ATTR_FNMATCH_MACRO; - - error = git_attr_assignment__parse(repo, pool, ¯o->assigns, &values); - - if (!error) - error = git_attr_cache__insert_macro(repo, macro); - - if (error < 0) - git_attr_rule__free(macro); - - return error; -} - -typedef struct { - git_repository *repo; - git_attr_session *attr_session; - uint32_t flags; - const char *workdir; - git_index *index; - git_vector *files; -} attr_walk_up_info; - -static int attr_decide_sources( - uint32_t flags, bool has_wd, bool has_index, git_attr_file_source *srcs) -{ - int count = 0; - - switch (flags & 0x03) { - case GIT_ATTR_CHECK_FILE_THEN_INDEX: - if (has_wd) - srcs[count++] = GIT_ATTR_FILE__FROM_FILE; - if (has_index) - srcs[count++] = GIT_ATTR_FILE__FROM_INDEX; - break; - case GIT_ATTR_CHECK_INDEX_THEN_FILE: - if (has_index) - srcs[count++] = GIT_ATTR_FILE__FROM_INDEX; - if (has_wd) - srcs[count++] = GIT_ATTR_FILE__FROM_FILE; - break; - case GIT_ATTR_CHECK_INDEX_ONLY: - if (has_index) - srcs[count++] = GIT_ATTR_FILE__FROM_INDEX; - break; - } - - return count; -} - -static int push_attr_file( - git_repository *repo, - git_attr_session *attr_session, - git_vector *list, - git_attr_file_source source, - const char *base, - const char *filename) -{ - int error = 0; - git_attr_file *file = NULL; - - error = git_attr_cache__get(&file, repo, attr_session, - source, base, filename, git_attr_file__parse_buffer); - - if (error < 0) - return error; - - if (file != NULL) { - if ((error = git_vector_insert(list, file)) < 0) - git_attr_file__free(file); - } - - return error; -} - -static int push_one_attr(void *ref, const char *path) -{ - int error = 0, n_src, i; - attr_walk_up_info *info = (attr_walk_up_info *)ref; - git_attr_file_source src[2]; - - n_src = attr_decide_sources( - info->flags, info->workdir != NULL, info->index != NULL, src); - - for (i = 0; !error && i < n_src; ++i) - error = push_attr_file(info->repo, info->attr_session, - info->files, src[i], path, GIT_ATTR_FILE); - - return error; -} - -static void release_attr_files(git_vector *files) -{ - size_t i; - git_attr_file *file; - - git_vector_foreach(files, i, file) { - git_attr_file__free(file); - files->contents[i] = NULL; - } - git_vector_free(files); -} - -static int collect_attr_files( - git_repository *repo, - git_attr_session *attr_session, - uint32_t flags, - const char *path, - git_vector *files) -{ - int error = 0; - git_buf dir = GIT_BUF_INIT; - const char *workdir = git_repository_workdir(repo); - attr_walk_up_info info = { NULL }; - - if ((error = attr_setup(repo, attr_session)) < 0) - return error; - - /* Resolve path in a non-bare repo */ - if (workdir != NULL) - error = git_path_find_dir(&dir, path, workdir); - else - error = git_path_dirname_r(&dir, path); - if (error < 0) - goto cleanup; - - /* in precendence order highest to lowest: - * - $GIT_DIR/info/attributes - * - path components with .gitattributes - * - config core.attributesfile - * - $GIT_PREFIX/etc/gitattributes - */ - - error = push_attr_file( - repo, attr_session, files, GIT_ATTR_FILE__FROM_FILE, - git_repository_path(repo), GIT_ATTR_FILE_INREPO); - if (error < 0) - goto cleanup; - - info.repo = repo; - info.attr_session = attr_session; - info.flags = flags; - info.workdir = workdir; - if (git_repository_index__weakptr(&info.index, repo) < 0) - giterr_clear(); /* no error even if there is no index */ - info.files = files; - - if (!strcmp(dir.ptr, ".")) - error = push_one_attr(&info, ""); - else - error = git_path_walk_up(&dir, workdir, push_one_attr, &info); - - if (error < 0) - goto cleanup; - - if (git_repository_attr_cache(repo)->cfg_attr_file != NULL) { - error = push_attr_file( - repo, attr_session, files, GIT_ATTR_FILE__FROM_FILE, - NULL, git_repository_attr_cache(repo)->cfg_attr_file); - if (error < 0) - goto cleanup; - } - - if ((flags & GIT_ATTR_CHECK_NO_SYSTEM) == 0) { - error = system_attr_file(&dir, attr_session); - - if (!error) - error = push_attr_file( - repo, attr_session, files, GIT_ATTR_FILE__FROM_FILE, - NULL, dir.ptr); - else if (error == GIT_ENOTFOUND) - error = 0; - } - - cleanup: - if (error < 0) - release_attr_files(files); - git_buf_free(&dir); - - return error; -} diff --git a/vendor/libgit2/src/attr.h b/vendor/libgit2/src/attr.h deleted file mode 100644 index f9f216d07..000000000 --- a/vendor/libgit2/src/attr.h +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_attr_h__ -#define INCLUDE_attr_h__ - -#include "attr_file.h" -#include "attrcache.h" - -#endif diff --git a/vendor/libgit2/src/attr_file.c b/vendor/libgit2/src/attr_file.c deleted file mode 100644 index 11d149358..000000000 --- a/vendor/libgit2/src/attr_file.c +++ /dev/null @@ -1,866 +0,0 @@ -#include "common.h" -#include "repository.h" -#include "filebuf.h" -#include "attr_file.h" -#include "attrcache.h" -#include "git2/blob.h" -#include "git2/tree.h" -#include "index.h" -#include - -static void attr_file_free(git_attr_file *file) -{ - bool unlock = !git_mutex_lock(&file->lock); - git_attr_file__clear_rules(file, false); - git_pool_clear(&file->pool); - if (unlock) - git_mutex_unlock(&file->lock); - git_mutex_free(&file->lock); - - git__memzero(file, sizeof(*file)); - git__free(file); -} - -int git_attr_file__new( - git_attr_file **out, - git_attr_file_entry *entry, - git_attr_file_source source) -{ - git_attr_file *attrs = git__calloc(1, sizeof(git_attr_file)); - GITERR_CHECK_ALLOC(attrs); - - if (git_mutex_init(&attrs->lock) < 0) { - giterr_set(GITERR_OS, "Failed to initialize lock"); - git__free(attrs); - return -1; - } - - git_pool_init(&attrs->pool, 1); - GIT_REFCOUNT_INC(attrs); - attrs->entry = entry; - attrs->source = source; - *out = attrs; - return 0; -} - -int git_attr_file__clear_rules(git_attr_file *file, bool need_lock) -{ - unsigned int i; - git_attr_rule *rule; - - if (need_lock && git_mutex_lock(&file->lock) < 0) { - giterr_set(GITERR_OS, "Failed to lock attribute file"); - return -1; - } - - git_vector_foreach(&file->rules, i, rule) - git_attr_rule__free(rule); - git_vector_free(&file->rules); - - if (need_lock) - git_mutex_unlock(&file->lock); - - return 0; -} - -void git_attr_file__free(git_attr_file *file) -{ - if (!file) - return; - GIT_REFCOUNT_DEC(file, attr_file_free); -} - -static int attr_file_oid_from_index( - git_oid *oid, git_repository *repo, const char *path) -{ - int error; - git_index *idx; - size_t pos; - const git_index_entry *entry; - - if ((error = git_repository_index__weakptr(&idx, repo)) < 0 || - (error = git_index__find_pos(&pos, idx, path, 0, 0)) < 0) - return error; - - if (!(entry = git_index_get_byindex(idx, pos))) - return GIT_ENOTFOUND; - - *oid = entry->id; - return 0; -} - -int git_attr_file__load( - git_attr_file **out, - git_repository *repo, - git_attr_session *attr_session, - git_attr_file_entry *entry, - git_attr_file_source source, - git_attr_file_parser parser) -{ - int error = 0; - git_blob *blob = NULL; - git_buf content = GIT_BUF_INIT; - git_attr_file *file; - struct stat st; - bool nonexistent = false; - - *out = NULL; - - switch (source) { - case GIT_ATTR_FILE__IN_MEMORY: - /* in-memory attribute file doesn't need data */ - break; - case GIT_ATTR_FILE__FROM_INDEX: { - git_oid id; - - if ((error = attr_file_oid_from_index(&id, repo, entry->path)) < 0 || - (error = git_blob_lookup(&blob, repo, &id)) < 0) - return error; - - /* Do not assume that data straight from the ODB is NULL-terminated; - * copy the contents of a file to a buffer to work on */ - git_buf_put(&content, git_blob_rawcontent(blob), git_blob_rawsize(blob)); - break; - } - case GIT_ATTR_FILE__FROM_FILE: { - int fd = -1; - - /* For open or read errors, pretend that we got ENOTFOUND. */ - /* TODO: issue warning when warning API is available */ - - if (p_stat(entry->fullpath, &st) < 0 || - S_ISDIR(st.st_mode) || - (fd = git_futils_open_ro(entry->fullpath)) < 0 || - (error = git_futils_readbuffer_fd(&content, fd, (size_t)st.st_size)) < 0) - nonexistent = true; - - if (fd >= 0) - p_close(fd); - - break; - } - default: - giterr_set(GITERR_INVALID, "Unknown file source %d", source); - return -1; - } - - if ((error = git_attr_file__new(&file, entry, source)) < 0) - goto cleanup; - - /* store the key of the attr_reader; don't bother with cache - * invalidation during the same attr reader session. - */ - if (attr_session) - file->session_key = attr_session->key; - - if (parser && (error = parser(repo, file, git_buf_cstr(&content))) < 0) { - git_attr_file__free(file); - goto cleanup; - } - - /* write cache breakers */ - if (nonexistent) - file->nonexistent = 1; - else if (source == GIT_ATTR_FILE__FROM_INDEX) - git_oid_cpy(&file->cache_data.oid, git_blob_id(blob)); - else if (source == GIT_ATTR_FILE__FROM_FILE) - git_futils_filestamp_set_from_stat(&file->cache_data.stamp, &st); - /* else always cacheable */ - - *out = file; - -cleanup: - git_blob_free(blob); - git_buf_free(&content); - - return error; -} - -int git_attr_file__out_of_date( - git_repository *repo, - git_attr_session *attr_session, - git_attr_file *file) -{ - if (!file) - return 1; - - /* we are never out of date if we just created this data in the same - * attr_session; otherwise, nonexistent files must be invalidated - */ - if (attr_session && attr_session->key == file->session_key) - return 0; - else if (file->nonexistent) - return 1; - - switch (file->source) { - case GIT_ATTR_FILE__IN_MEMORY: - return 0; - - case GIT_ATTR_FILE__FROM_FILE: - return git_futils_filestamp_check( - &file->cache_data.stamp, file->entry->fullpath); - - case GIT_ATTR_FILE__FROM_INDEX: { - int error; - git_oid id; - - if ((error = attr_file_oid_from_index( - &id, repo, file->entry->path)) < 0) - return error; - - return (git_oid__cmp(&file->cache_data.oid, &id) != 0); - } - - default: - giterr_set(GITERR_INVALID, "Invalid file type %d", file->source); - return -1; - } -} - -static int sort_by_hash_and_name(const void *a_raw, const void *b_raw); -static void git_attr_rule__clear(git_attr_rule *rule); -static bool parse_optimized_patterns( - git_attr_fnmatch *spec, - git_pool *pool, - const char *pattern); - -int git_attr_file__parse_buffer( - git_repository *repo, git_attr_file *attrs, const char *data) -{ - int error = 0; - const char *scan = data, *context = NULL; - git_attr_rule *rule = NULL; - - /* if subdir file path, convert context for file paths */ - if (attrs->entry && - git_path_root(attrs->entry->path) < 0 && - !git__suffixcmp(attrs->entry->path, "/" GIT_ATTR_FILE)) - context = attrs->entry->path; - - if (git_mutex_lock(&attrs->lock) < 0) { - giterr_set(GITERR_OS, "Failed to lock attribute file"); - return -1; - } - - while (!error && *scan) { - /* allocate rule if needed */ - if (!rule && !(rule = git__calloc(1, sizeof(*rule)))) { - error = -1; - break; - } - - rule->match.flags = - GIT_ATTR_FNMATCH_ALLOWNEG | GIT_ATTR_FNMATCH_ALLOWMACRO; - - /* parse the next "pattern attr attr attr" line */ - if (!(error = git_attr_fnmatch__parse( - &rule->match, &attrs->pool, context, &scan)) && - !(error = git_attr_assignment__parse( - repo, &attrs->pool, &rule->assigns, &scan))) - { - if (rule->match.flags & GIT_ATTR_FNMATCH_MACRO) - /* TODO: warning if macro found in file below repo root */ - error = git_attr_cache__insert_macro(repo, rule); - else - error = git_vector_insert(&attrs->rules, rule); - } - - /* if the rule wasn't a pattern, on to the next */ - if (error < 0) { - git_attr_rule__clear(rule); /* reset rule contents */ - if (error == GIT_ENOTFOUND) - error = 0; - } else { - rule = NULL; /* vector now "owns" the rule */ - } - } - - git_mutex_unlock(&attrs->lock); - git_attr_rule__free(rule); - - return error; -} - -uint32_t git_attr_file__name_hash(const char *name) -{ - uint32_t h = 5381; - int c; - assert(name); - while ((c = (int)*name++) != 0) - h = ((h << 5) + h) + c; - return h; -} - -int git_attr_file__lookup_one( - git_attr_file *file, - git_attr_path *path, - const char *attr, - const char **value) -{ - size_t i; - git_attr_name name; - git_attr_rule *rule; - - *value = NULL; - - name.name = attr; - name.name_hash = git_attr_file__name_hash(attr); - - git_attr_file__foreach_matching_rule(file, path, i, rule) { - size_t pos; - - if (!git_vector_bsearch(&pos, &rule->assigns, &name)) { - *value = ((git_attr_assignment *) - git_vector_get(&rule->assigns, pos))->value; - break; - } - } - - return 0; -} - -int git_attr_file__load_standalone(git_attr_file **out, const char *path) -{ - int error; - git_attr_file *file; - git_buf content = GIT_BUF_INIT; - - error = git_attr_file__new(&file, NULL, GIT_ATTR_FILE__FROM_FILE); - if (error < 0) - return error; - - error = git_attr_cache__alloc_file_entry( - &file->entry, NULL, path, &file->pool); - if (error < 0) { - git_attr_file__free(file); - return error; - } - /* because the cache entry is allocated from the file's own pool, we - * don't have to free it - freeing file+pool will free cache entry, too. - */ - - if (!(error = git_futils_readbuffer(&content, path))) { - error = git_attr_file__parse_buffer(NULL, file, content.ptr); - git_buf_free(&content); - } - - if (error < 0) - git_attr_file__free(file); - else - *out = file; - - return error; -} - -bool git_attr_fnmatch__match( - git_attr_fnmatch *match, - git_attr_path *path) -{ - const char *relpath = path->path; - const char *filename; - int flags = 0; - - /* - * If the rule was generated in a subdirectory, we must only - * use it for paths inside that directory. We can thus return - * a non-match if the prefixes don't match. - */ - if (match->containing_dir) { - if (match->flags & GIT_ATTR_FNMATCH_ICASE) { - if (git__strncasecmp(path->path, match->containing_dir, match->containing_dir_length)) - return 0; - } else { - if (git__prefixcmp(path->path, match->containing_dir)) - return 0; - } - - relpath += match->containing_dir_length; - } - - if (match->flags & GIT_ATTR_FNMATCH_ICASE) - flags |= FNM_CASEFOLD; - if (match->flags & GIT_ATTR_FNMATCH_LEADINGDIR) - flags |= FNM_LEADING_DIR; - - if (match->flags & GIT_ATTR_FNMATCH_FULLPATH) { - filename = relpath; - flags |= FNM_PATHNAME; - } else { - filename = path->basename; - - if (path->is_dir) - flags |= FNM_LEADING_DIR; - } - - if ((match->flags & GIT_ATTR_FNMATCH_DIRECTORY) && !path->is_dir) { - bool samename; - - /* for attribute checks or root ignore checks, fail match */ - if (!(match->flags & GIT_ATTR_FNMATCH_IGNORE) || - path->basename == path->path) - return false; - - flags |= FNM_LEADING_DIR; - - /* fail match if this is a file with same name as ignored folder */ - samename = (match->flags & GIT_ATTR_FNMATCH_ICASE) ? - !strcasecmp(match->pattern, relpath) : - !strcmp(match->pattern, relpath); - - if (samename) - return false; - - return (p_fnmatch(match->pattern, relpath, flags) != FNM_NOMATCH); - } - - /* if path is a directory prefix of a negated pattern, then match */ - if ((match->flags & GIT_ATTR_FNMATCH_NEGATIVE) && path->is_dir) { - size_t pathlen = strlen(relpath); - bool prefixed = (pathlen <= match->length) && - ((match->flags & GIT_ATTR_FNMATCH_ICASE) ? - !strncasecmp(match->pattern, relpath, pathlen) : - !strncmp(match->pattern, relpath, pathlen)); - - if (prefixed && git_path_at_end_of_segment(&match->pattern[pathlen])) - return true; - } - - return (p_fnmatch(match->pattern, filename, flags) != FNM_NOMATCH); -} - -bool git_attr_rule__match( - git_attr_rule *rule, - git_attr_path *path) -{ - bool matched = git_attr_fnmatch__match(&rule->match, path); - - if (rule->match.flags & GIT_ATTR_FNMATCH_NEGATIVE) - matched = !matched; - - return matched; -} - -git_attr_assignment *git_attr_rule__lookup_assignment( - git_attr_rule *rule, const char *name) -{ - size_t pos; - git_attr_name key; - key.name = name; - key.name_hash = git_attr_file__name_hash(name); - - if (git_vector_bsearch(&pos, &rule->assigns, &key)) - return NULL; - - return git_vector_get(&rule->assigns, pos); -} - -int git_attr_path__init( - git_attr_path *info, const char *path, const char *base, git_dir_flag dir_flag) -{ - ssize_t root; - - /* build full path as best we can */ - git_buf_init(&info->full, 0); - - if (git_path_join_unrooted(&info->full, path, base, &root) < 0) - return -1; - - info->path = info->full.ptr + root; - - /* remove trailing slashes */ - while (info->full.size > 0) { - if (info->full.ptr[info->full.size - 1] != '/') - break; - info->full.size--; - } - info->full.ptr[info->full.size] = '\0'; - - /* skip leading slashes in path */ - while (*info->path == '/') - info->path++; - - /* find trailing basename component */ - info->basename = strrchr(info->path, '/'); - if (info->basename) - info->basename++; - if (!info->basename || !*info->basename) - info->basename = info->path; - - switch (dir_flag) - { - case GIT_DIR_FLAG_FALSE: - info->is_dir = 0; - break; - - case GIT_DIR_FLAG_TRUE: - info->is_dir = 1; - break; - - case GIT_DIR_FLAG_UNKNOWN: - default: - info->is_dir = (int)git_path_isdir(info->full.ptr); - break; - } - - return 0; -} - -void git_attr_path__free(git_attr_path *info) -{ - git_buf_free(&info->full); - info->path = NULL; - info->basename = NULL; -} - -/* - * From gitattributes(5): - * - * Patterns have the following format: - * - * - A blank line matches no files, so it can serve as a separator for - * readability. - * - * - A line starting with # serves as a comment. - * - * - An optional prefix ! which negates the pattern; any matching file - * excluded by a previous pattern will become included again. If a negated - * pattern matches, this will override lower precedence patterns sources. - * - * - If the pattern ends with a slash, it is removed for the purpose of the - * following description, but it would only find a match with a directory. In - * other words, foo/ will match a directory foo and paths underneath it, but - * will not match a regular file or a symbolic link foo (this is consistent - * with the way how pathspec works in general in git). - * - * - If the pattern does not contain a slash /, git treats it as a shell glob - * pattern and checks for a match against the pathname without leading - * directories. - * - * - Otherwise, git treats the pattern as a shell glob suitable for consumption - * by fnmatch(3) with the FNM_PATHNAME flag: wildcards in the pattern will - * not match a / in the pathname. For example, "Documentation/\*.html" matches - * "Documentation/git.html" but not "Documentation/ppc/ppc.html". A leading - * slash matches the beginning of the pathname; for example, "/\*.c" matches - * "cat-file.c" but not "mozilla-sha1/sha1.c". - */ - -/* - * This will return 0 if the spec was filled out, - * GIT_ENOTFOUND if the fnmatch does not require matching, or - * another error code there was an actual problem. - */ -int git_attr_fnmatch__parse( - git_attr_fnmatch *spec, - git_pool *pool, - const char *context, - const char **base) -{ - const char *pattern, *scan; - int slash_count, allow_space; - - assert(spec && base && *base); - - if (parse_optimized_patterns(spec, pool, *base)) - return 0; - - spec->flags = (spec->flags & GIT_ATTR_FNMATCH__INCOMING); - allow_space = ((spec->flags & GIT_ATTR_FNMATCH_ALLOWSPACE) != 0); - - pattern = *base; - - while (git__isspace(*pattern)) pattern++; - if (!*pattern || *pattern == '#') { - *base = git__next_line(pattern); - return GIT_ENOTFOUND; - } - - if (*pattern == '[' && (spec->flags & GIT_ATTR_FNMATCH_ALLOWMACRO) != 0) { - if (strncmp(pattern, "[attr]", 6) == 0) { - spec->flags = spec->flags | GIT_ATTR_FNMATCH_MACRO; - pattern += 6; - } - /* else a character range like [a-e]* which is accepted */ - } - - if (*pattern == '!' && (spec->flags & GIT_ATTR_FNMATCH_ALLOWNEG) != 0) { - spec->flags = spec->flags | - GIT_ATTR_FNMATCH_NEGATIVE | GIT_ATTR_FNMATCH_LEADINGDIR; - pattern++; - } - - slash_count = 0; - for (scan = pattern; *scan != '\0'; ++scan) { - /* scan until (non-escaped) white space */ - if (git__isspace(*scan) && *(scan - 1) != '\\') { - if (!allow_space || (*scan != ' ' && *scan != '\t' && *scan != '\r')) - break; - } - - if (*scan == '/') { - spec->flags = spec->flags | GIT_ATTR_FNMATCH_FULLPATH; - slash_count++; - if (pattern == scan) - pattern++; - } - /* remember if we see an unescaped wildcard in pattern */ - else if (git__iswildcard(*scan) && - (scan == pattern || (*(scan - 1) != '\\'))) - spec->flags = spec->flags | GIT_ATTR_FNMATCH_HASWILD; - } - - *base = scan; - - if ((spec->length = scan - pattern) == 0) - return GIT_ENOTFOUND; - - /* - * Remove one trailing \r in case this is a CRLF delimited - * file, in the case of Icon\r\r\n, we still leave the first - * \r there to match against. - */ - if (pattern[spec->length - 1] == '\r') - if (--spec->length == 0) - return GIT_ENOTFOUND; - - if (pattern[spec->length - 1] == '/') { - spec->length--; - spec->flags = spec->flags | GIT_ATTR_FNMATCH_DIRECTORY; - if (--slash_count <= 0) - spec->flags = spec->flags & ~GIT_ATTR_FNMATCH_FULLPATH; - } - if ((spec->flags & GIT_ATTR_FNMATCH_NOLEADINGDIR) == 0 && - spec->length >= 2 && - pattern[spec->length - 1] == '*' && - pattern[spec->length - 2] == '/') { - spec->length -= 2; - spec->flags = spec->flags | GIT_ATTR_FNMATCH_LEADINGDIR; - /* leave FULLPATH match on, however */ - } - - if (context) { - char *slash = strrchr(context, '/'); - size_t len; - if (slash) { - /* include the slash for easier matching */ - len = slash - context + 1; - spec->containing_dir = git_pool_strndup(pool, context, len); - spec->containing_dir_length = len; - } - } - - spec->pattern = git_pool_strndup(pool, pattern, spec->length); - - if (!spec->pattern) { - *base = git__next_line(pattern); - return -1; - } else { - /* strip '\' that might have be used for internal whitespace */ - spec->length = git__unescape(spec->pattern); - /* TODO: convert remaining '\' into '/' for POSIX ??? */ - } - - return 0; -} - -static bool parse_optimized_patterns( - git_attr_fnmatch *spec, - git_pool *pool, - const char *pattern) -{ - if (!pattern[1] && (pattern[0] == '*' || pattern[0] == '.')) { - spec->flags = GIT_ATTR_FNMATCH_MATCH_ALL; - spec->pattern = git_pool_strndup(pool, pattern, 1); - spec->length = 1; - - return true; - } - - return false; -} - -static int sort_by_hash_and_name(const void *a_raw, const void *b_raw) -{ - const git_attr_name *a = a_raw; - const git_attr_name *b = b_raw; - - if (b->name_hash < a->name_hash) - return 1; - else if (b->name_hash > a->name_hash) - return -1; - else - return strcmp(b->name, a->name); -} - -static void git_attr_assignment__free(git_attr_assignment *assign) -{ - /* name and value are stored in a git_pool associated with the - * git_attr_file, so they do not need to be freed here - */ - assign->name = NULL; - assign->value = NULL; - git__free(assign); -} - -static int merge_assignments(void **old_raw, void *new_raw) -{ - git_attr_assignment **old = (git_attr_assignment **)old_raw; - git_attr_assignment *new = (git_attr_assignment *)new_raw; - - GIT_REFCOUNT_DEC(*old, git_attr_assignment__free); - *old = new; - return GIT_EEXISTS; -} - -int git_attr_assignment__parse( - git_repository *repo, - git_pool *pool, - git_vector *assigns, - const char **base) -{ - int error; - const char *scan = *base; - git_attr_assignment *assign = NULL; - - assert(assigns && !assigns->length); - - git_vector_set_cmp(assigns, sort_by_hash_and_name); - - while (*scan && *scan != '\n') { - const char *name_start, *value_start; - - /* skip leading blanks */ - while (git__isspace(*scan) && *scan != '\n') scan++; - - /* allocate assign if needed */ - if (!assign) { - assign = git__calloc(1, sizeof(git_attr_assignment)); - GITERR_CHECK_ALLOC(assign); - GIT_REFCOUNT_INC(assign); - } - - assign->name_hash = 5381; - assign->value = git_attr__true; - - /* look for magic name prefixes */ - if (*scan == '-') { - assign->value = git_attr__false; - scan++; - } else if (*scan == '!') { - assign->value = git_attr__unset; /* explicit unspecified state */ - scan++; - } else if (*scan == '#') /* comment rest of line */ - break; - - /* find the name */ - name_start = scan; - while (*scan && !git__isspace(*scan) && *scan != '=') { - assign->name_hash = - ((assign->name_hash << 5) + assign->name_hash) + *scan; - scan++; - } - if (scan == name_start) { - /* must have found lone prefix (" - ") or leading = ("=foo") - * or end of buffer -- advance until whitespace and continue - */ - while (*scan && !git__isspace(*scan)) scan++; - continue; - } - - /* allocate permanent storage for name */ - assign->name = git_pool_strndup(pool, name_start, scan - name_start); - GITERR_CHECK_ALLOC(assign->name); - - /* if there is an equals sign, find the value */ - if (*scan == '=') { - for (value_start = ++scan; *scan && !git__isspace(*scan); ++scan); - - /* if we found a value, allocate permanent storage for it */ - if (scan > value_start) { - assign->value = git_pool_strndup(pool, value_start, scan - value_start); - GITERR_CHECK_ALLOC(assign->value); - } - } - - /* expand macros (if given a repo with a macro cache) */ - if (repo != NULL && assign->value == git_attr__true) { - git_attr_rule *macro = - git_attr_cache__lookup_macro(repo, assign->name); - - if (macro != NULL) { - unsigned int i; - git_attr_assignment *massign; - - git_vector_foreach(¯o->assigns, i, massign) { - GIT_REFCOUNT_INC(massign); - - error = git_vector_insert_sorted( - assigns, massign, &merge_assignments); - if (error < 0 && error != GIT_EEXISTS) { - git_attr_assignment__free(assign); - return error; - } - } - } - } - - /* insert allocated assign into vector */ - error = git_vector_insert_sorted(assigns, assign, &merge_assignments); - if (error < 0 && error != GIT_EEXISTS) - return error; - - /* clear assign since it is now "owned" by the vector */ - assign = NULL; - } - - if (assign != NULL) - git_attr_assignment__free(assign); - - *base = git__next_line(scan); - - return (assigns->length == 0) ? GIT_ENOTFOUND : 0; -} - -static void git_attr_rule__clear(git_attr_rule *rule) -{ - unsigned int i; - git_attr_assignment *assign; - - if (!rule) - return; - - if (!(rule->match.flags & GIT_ATTR_FNMATCH_IGNORE)) { - git_vector_foreach(&rule->assigns, i, assign) - GIT_REFCOUNT_DEC(assign, git_attr_assignment__free); - git_vector_free(&rule->assigns); - } - - /* match.pattern is stored in a git_pool, so no need to free */ - rule->match.pattern = NULL; - rule->match.length = 0; -} - -void git_attr_rule__free(git_attr_rule *rule) -{ - git_attr_rule__clear(rule); - git__free(rule); -} - -int git_attr_session__init(git_attr_session *session, git_repository *repo) -{ - assert(repo); - - session->key = git_atomic_inc(&repo->attr_session_key); - - return 0; -} - -void git_attr_session__free(git_attr_session *session) -{ - if (!session) - return; - - git_buf_free(&session->sysdir); - git_buf_free(&session->tmp); - - memset(session, 0, sizeof(git_attr_session)); -} diff --git a/vendor/libgit2/src/attr_file.h b/vendor/libgit2/src/attr_file.h deleted file mode 100644 index 388ecf4c0..000000000 --- a/vendor/libgit2/src/attr_file.h +++ /dev/null @@ -1,218 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_attr_file_h__ -#define INCLUDE_attr_file_h__ - -#include "git2/oid.h" -#include "git2/attr.h" -#include "vector.h" -#include "pool.h" -#include "buffer.h" -#include "fileops.h" - -#define GIT_ATTR_FILE ".gitattributes" -#define GIT_ATTR_FILE_INREPO "info/attributes" -#define GIT_ATTR_FILE_SYSTEM "gitattributes" -#define GIT_ATTR_FILE_XDG "attributes" - -#define GIT_ATTR_FNMATCH_NEGATIVE (1U << 0) -#define GIT_ATTR_FNMATCH_DIRECTORY (1U << 1) -#define GIT_ATTR_FNMATCH_FULLPATH (1U << 2) -#define GIT_ATTR_FNMATCH_MACRO (1U << 3) -#define GIT_ATTR_FNMATCH_IGNORE (1U << 4) -#define GIT_ATTR_FNMATCH_HASWILD (1U << 5) -#define GIT_ATTR_FNMATCH_ALLOWSPACE (1U << 6) -#define GIT_ATTR_FNMATCH_ICASE (1U << 7) -#define GIT_ATTR_FNMATCH_MATCH_ALL (1U << 8) -#define GIT_ATTR_FNMATCH_ALLOWNEG (1U << 9) -#define GIT_ATTR_FNMATCH_ALLOWMACRO (1U << 10) -#define GIT_ATTR_FNMATCH_LEADINGDIR (1U << 11) -#define GIT_ATTR_FNMATCH_NOLEADINGDIR (1U << 12) - -#define GIT_ATTR_FNMATCH__INCOMING \ - (GIT_ATTR_FNMATCH_ALLOWSPACE | GIT_ATTR_FNMATCH_ALLOWNEG | \ - GIT_ATTR_FNMATCH_ALLOWMACRO | GIT_ATTR_FNMATCH_NOLEADINGDIR) - -typedef enum { - GIT_ATTR_FILE__IN_MEMORY = 0, - GIT_ATTR_FILE__FROM_FILE = 1, - GIT_ATTR_FILE__FROM_INDEX = 2, - - GIT_ATTR_FILE_NUM_SOURCES = 3 -} git_attr_file_source; - -extern const char *git_attr__true; -extern const char *git_attr__false; -extern const char *git_attr__unset; - -typedef struct { - char *pattern; - size_t length; - char *containing_dir; - size_t containing_dir_length; - unsigned int flags; -} git_attr_fnmatch; - -typedef struct { - git_attr_fnmatch match; - git_vector assigns; /* vector of */ -} git_attr_rule; - -typedef struct { - git_refcount unused; - const char *name; - uint32_t name_hash; -} git_attr_name; - -typedef struct { - git_refcount rc; /* for macros */ - char *name; - uint32_t name_hash; - const char *value; -} git_attr_assignment; - -typedef struct git_attr_file_entry git_attr_file_entry; - -typedef struct { - git_refcount rc; - git_mutex lock; - git_attr_file_entry *entry; - git_attr_file_source source; - git_vector rules; /* vector of or */ - git_pool pool; - unsigned int nonexistent:1; - int session_key; - union { - git_oid oid; - git_futils_filestamp stamp; - } cache_data; -} git_attr_file; - -struct git_attr_file_entry { - git_attr_file *file[GIT_ATTR_FILE_NUM_SOURCES]; - const char *path; /* points into fullpath */ - char fullpath[GIT_FLEX_ARRAY]; -}; - -typedef struct { - git_buf full; - char *path; - char *basename; - int is_dir; -} git_attr_path; - -/* A git_attr_session can provide an "instance" of reading, to prevent cache - * invalidation during a single operation instance (like checkout). - */ - -typedef struct { - int key; - unsigned int init_setup:1, - init_sysdir:1; - git_buf sysdir; - git_buf tmp; -} git_attr_session; - -extern int git_attr_session__init(git_attr_session *attr_session, git_repository *repo); -extern void git_attr_session__free(git_attr_session *session); - -extern int git_attr_get_many_with_session( - const char **values_out, - git_repository *repo, - git_attr_session *attr_session, - uint32_t flags, - const char *path, - size_t num_attr, - const char **names); - -typedef int (*git_attr_file_parser)( - git_repository *repo, - git_attr_file *file, - const char *data); - -/* - * git_attr_file API - */ - -int git_attr_file__new( - git_attr_file **out, - git_attr_file_entry *entry, - git_attr_file_source source); - -void git_attr_file__free(git_attr_file *file); - -int git_attr_file__load( - git_attr_file **out, - git_repository *repo, - git_attr_session *attr_session, - git_attr_file_entry *ce, - git_attr_file_source source, - git_attr_file_parser parser); - -int git_attr_file__load_standalone( - git_attr_file **out, const char *path); - -int git_attr_file__out_of_date( - git_repository *repo, git_attr_session *session, git_attr_file *file); - -int git_attr_file__parse_buffer( - git_repository *repo, git_attr_file *attrs, const char *data); - -int git_attr_file__clear_rules( - git_attr_file *file, bool need_lock); - -int git_attr_file__lookup_one( - git_attr_file *file, - git_attr_path *path, - const char *attr, - const char **value); - -/* loop over rules in file from bottom to top */ -#define git_attr_file__foreach_matching_rule(file, path, iter, rule) \ - git_vector_rforeach(&(file)->rules, (iter), (rule)) \ - if (git_attr_rule__match((rule), (path))) - -uint32_t git_attr_file__name_hash(const char *name); - - -/* - * other utilities - */ - -extern int git_attr_fnmatch__parse( - git_attr_fnmatch *spec, - git_pool *pool, - const char *source, - const char **base); - -extern bool git_attr_fnmatch__match( - git_attr_fnmatch *rule, - git_attr_path *path); - -extern void git_attr_rule__free(git_attr_rule *rule); - -extern bool git_attr_rule__match( - git_attr_rule *rule, - git_attr_path *path); - -extern git_attr_assignment *git_attr_rule__lookup_assignment( - git_attr_rule *rule, const char *name); - -typedef enum { GIT_DIR_FLAG_TRUE = 1, GIT_DIR_FLAG_FALSE = 0, GIT_DIR_FLAG_UNKNOWN = -1 } git_dir_flag; - -extern int git_attr_path__init( - git_attr_path *info, const char *path, const char *base, git_dir_flag is_dir); - -extern void git_attr_path__free(git_attr_path *info); - -extern int git_attr_assignment__parse( - git_repository *repo, /* needed to expand macros */ - git_pool *pool, - git_vector *assigns, - const char **scan); - -#endif diff --git a/vendor/libgit2/src/attrcache.c b/vendor/libgit2/src/attrcache.c deleted file mode 100644 index a57110684..000000000 --- a/vendor/libgit2/src/attrcache.c +++ /dev/null @@ -1,456 +0,0 @@ -#include "common.h" -#include "repository.h" -#include "attr_file.h" -#include "config.h" -#include "sysdir.h" -#include "ignore.h" - -GIT__USE_STRMAP - -GIT_INLINE(int) attr_cache_lock(git_attr_cache *cache) -{ - GIT_UNUSED(cache); /* avoid warning if threading is off */ - - if (git_mutex_lock(&cache->lock) < 0) { - giterr_set(GITERR_OS, "Unable to get attr cache lock"); - return -1; - } - return 0; -} - -GIT_INLINE(void) attr_cache_unlock(git_attr_cache *cache) -{ - GIT_UNUSED(cache); /* avoid warning if threading is off */ - git_mutex_unlock(&cache->lock); -} - -GIT_INLINE(git_attr_file_entry *) attr_cache_lookup_entry( - git_attr_cache *cache, const char *path) -{ - khiter_t pos = git_strmap_lookup_index(cache->files, path); - - if (git_strmap_valid_index(cache->files, pos)) - return git_strmap_value_at(cache->files, pos); - else - return NULL; -} - -int git_attr_cache__alloc_file_entry( - git_attr_file_entry **out, - const char *base, - const char *path, - git_pool *pool) -{ - size_t baselen = 0, pathlen = strlen(path); - size_t cachesize = sizeof(git_attr_file_entry) + pathlen + 1; - git_attr_file_entry *ce; - - if (base != NULL && git_path_root(path) < 0) { - baselen = strlen(base); - cachesize += baselen; - - if (baselen && base[baselen - 1] != '/') - cachesize++; - } - - ce = git_pool_mallocz(pool, (uint32_t)cachesize); - GITERR_CHECK_ALLOC(ce); - - if (baselen) { - memcpy(ce->fullpath, base, baselen); - - if (base[baselen - 1] != '/') - ce->fullpath[baselen++] = '/'; - } - memcpy(&ce->fullpath[baselen], path, pathlen); - - ce->path = &ce->fullpath[baselen]; - *out = ce; - - return 0; -} - -/* call with attrcache locked */ -static int attr_cache_make_entry( - git_attr_file_entry **out, git_repository *repo, const char *path) -{ - int error = 0; - git_attr_cache *cache = git_repository_attr_cache(repo); - git_attr_file_entry *entry = NULL; - - error = git_attr_cache__alloc_file_entry( - &entry, git_repository_workdir(repo), path, &cache->pool); - - if (!error) { - git_strmap_insert(cache->files, entry->path, entry, error); - if (error > 0) - error = 0; - } - - *out = entry; - return error; -} - -/* insert entry or replace existing if we raced with another thread */ -static int attr_cache_upsert(git_attr_cache *cache, git_attr_file *file) -{ - git_attr_file_entry *entry; - git_attr_file *old; - - if (attr_cache_lock(cache) < 0) - return -1; - - entry = attr_cache_lookup_entry(cache, file->entry->path); - - GIT_REFCOUNT_OWN(file, entry); - GIT_REFCOUNT_INC(file); - - old = git__compare_and_swap( - &entry->file[file->source], entry->file[file->source], file); - - if (old) { - GIT_REFCOUNT_OWN(old, NULL); - git_attr_file__free(old); - } - - attr_cache_unlock(cache); - return 0; -} - -static int attr_cache_remove(git_attr_cache *cache, git_attr_file *file) -{ - int error = 0; - git_attr_file_entry *entry; - - if (!file) - return 0; - if ((error = attr_cache_lock(cache)) < 0) - return error; - - if ((entry = attr_cache_lookup_entry(cache, file->entry->path)) != NULL) - file = git__compare_and_swap(&entry->file[file->source], file, NULL); - - attr_cache_unlock(cache); - - if (file) { - GIT_REFCOUNT_OWN(file, NULL); - git_attr_file__free(file); - } - - return error; -} - -/* Look up cache entry and file. - * - If entry is not present, create it while the cache is locked. - * - If file is present, increment refcount before returning it, so the - * cache can be unlocked and it won't go away. - */ -static int attr_cache_lookup( - git_attr_file **out_file, - git_attr_file_entry **out_entry, - git_repository *repo, - git_attr_session *attr_session, - git_attr_file_source source, - const char *base, - const char *filename) -{ - int error = 0; - git_buf path = GIT_BUF_INIT; - const char *wd = git_repository_workdir(repo), *relfile; - git_attr_cache *cache = git_repository_attr_cache(repo); - git_attr_file_entry *entry = NULL; - git_attr_file *file = NULL; - - /* join base and path as needed */ - if (base != NULL && git_path_root(filename) < 0) { - git_buf *p = attr_session ? &attr_session->tmp : &path; - - if (git_buf_joinpath(p, base, filename) < 0) - return -1; - - filename = p->ptr; - } - - relfile = filename; - if (wd && !git__prefixcmp(relfile, wd)) - relfile += strlen(wd); - - /* check cache for existing entry */ - if ((error = attr_cache_lock(cache)) < 0) - goto cleanup; - - entry = attr_cache_lookup_entry(cache, relfile); - if (!entry) - error = attr_cache_make_entry(&entry, repo, relfile); - else if (entry->file[source] != NULL) { - file = entry->file[source]; - GIT_REFCOUNT_INC(file); - } - - attr_cache_unlock(cache); - -cleanup: - *out_file = file; - *out_entry = entry; - - git_buf_free(&path); - return error; -} - -int git_attr_cache__get( - git_attr_file **out, - git_repository *repo, - git_attr_session *attr_session, - git_attr_file_source source, - const char *base, - const char *filename, - git_attr_file_parser parser) -{ - int error = 0; - git_attr_cache *cache = git_repository_attr_cache(repo); - git_attr_file_entry *entry = NULL; - git_attr_file *file = NULL, *updated = NULL; - - if ((error = attr_cache_lookup( - &file, &entry, repo, attr_session, source, base, filename)) < 0) - return error; - - /* load file if we don't have one or if existing one is out of date */ - if (!file || (error = git_attr_file__out_of_date(repo, attr_session, file)) > 0) - error = git_attr_file__load(&updated, repo, attr_session, entry, source, parser); - - /* if we loaded the file, insert into and/or update cache */ - if (updated) { - if ((error = attr_cache_upsert(cache, updated)) < 0) - git_attr_file__free(updated); - else { - git_attr_file__free(file); /* offset incref from lookup */ - file = updated; - } - } - - /* if file could not be loaded */ - if (error < 0) { - /* remove existing entry */ - if (file) { - attr_cache_remove(cache, file); - git_attr_file__free(file); /* offset incref from lookup */ - file = NULL; - } - /* no error if file simply doesn't exist */ - if (error == GIT_ENOTFOUND) { - giterr_clear(); - error = 0; - } - } - - *out = file; - return error; -} - -bool git_attr_cache__is_cached( - git_repository *repo, - git_attr_file_source source, - const char *filename) -{ - git_attr_cache *cache = git_repository_attr_cache(repo); - git_strmap *files; - khiter_t pos; - git_attr_file_entry *entry; - - if (!cache || !(files = cache->files)) - return false; - - pos = git_strmap_lookup_index(files, filename); - if (!git_strmap_valid_index(files, pos)) - return false; - - entry = git_strmap_value_at(files, pos); - - return entry && (entry->file[source] != NULL); -} - - -static int attr_cache__lookup_path( - char **out, git_config *cfg, const char *key, const char *fallback) -{ - git_buf buf = GIT_BUF_INIT; - int error; - git_config_entry *entry = NULL; - - *out = NULL; - - if ((error = git_config__lookup_entry(&entry, cfg, key, false)) < 0) - return error; - - if (entry) { - const char *cfgval = entry->value; - - /* expand leading ~/ as needed */ - if (cfgval && cfgval[0] == '~' && cfgval[1] == '/' && - !git_sysdir_find_global_file(&buf, &cfgval[2])) - *out = git_buf_detach(&buf); - else if (cfgval) - *out = git__strdup(cfgval); - } - else if (!git_sysdir_find_xdg_file(&buf, fallback)) - *out = git_buf_detach(&buf); - - git_config_entry_free(entry); - git_buf_free(&buf); - - return error; -} - -static void attr_cache__free(git_attr_cache *cache) -{ - bool unlock; - - if (!cache) - return; - - unlock = (git_mutex_lock(&cache->lock) == 0); - - if (cache->files != NULL) { - git_attr_file_entry *entry; - git_attr_file *file; - int i; - - git_strmap_foreach_value(cache->files, entry, { - for (i = 0; i < GIT_ATTR_FILE_NUM_SOURCES; ++i) { - if ((file = git__swap(entry->file[i], NULL)) != NULL) { - GIT_REFCOUNT_OWN(file, NULL); - git_attr_file__free(file); - } - } - }); - git_strmap_free(cache->files); - } - - if (cache->macros != NULL) { - git_attr_rule *rule; - - git_strmap_foreach_value(cache->macros, rule, { - git_attr_rule__free(rule); - }); - git_strmap_free(cache->macros); - } - - git_pool_clear(&cache->pool); - - git__free(cache->cfg_attr_file); - cache->cfg_attr_file = NULL; - - git__free(cache->cfg_excl_file); - cache->cfg_excl_file = NULL; - - if (unlock) - git_mutex_unlock(&cache->lock); - git_mutex_free(&cache->lock); - - git__free(cache); -} - -int git_attr_cache__do_init(git_repository *repo) -{ - int ret = 0; - git_attr_cache *cache = git_repository_attr_cache(repo); - git_config *cfg = NULL; - - if (cache) - return 0; - - cache = git__calloc(1, sizeof(git_attr_cache)); - GITERR_CHECK_ALLOC(cache); - - /* set up lock */ - if (git_mutex_init(&cache->lock) < 0) { - giterr_set(GITERR_OS, "Unable to initialize lock for attr cache"); - git__free(cache); - return -1; - } - - if ((ret = git_repository_config_snapshot(&cfg, repo)) < 0) - goto cancel; - - /* cache config settings for attributes and ignores */ - ret = attr_cache__lookup_path( - &cache->cfg_attr_file, cfg, GIT_ATTR_CONFIG, GIT_ATTR_FILE_XDG); - if (ret < 0) - goto cancel; - - ret = attr_cache__lookup_path( - &cache->cfg_excl_file, cfg, GIT_IGNORE_CONFIG, GIT_IGNORE_FILE_XDG); - if (ret < 0) - goto cancel; - - /* allocate hashtable for attribute and ignore file contents, - * hashtable for attribute macros, and string pool - */ - if ((ret = git_strmap_alloc(&cache->files)) < 0 || - (ret = git_strmap_alloc(&cache->macros)) < 0) - goto cancel; - - git_pool_init(&cache->pool, 1); - - cache = git__compare_and_swap(&repo->attrcache, NULL, cache); - if (cache) - goto cancel; /* raced with another thread, free this but no error */ - - git_config_free(cfg); - - /* insert default macros */ - return git_attr_add_macro(repo, "binary", "-diff -crlf -text"); - -cancel: - attr_cache__free(cache); - git_config_free(cfg); - return ret; -} - -void git_attr_cache_flush(git_repository *repo) -{ - git_attr_cache *cache; - - /* this could be done less expensively, but for now, we'll just free - * the entire attrcache and let the next use reinitialize it... - */ - if (repo && (cache = git__swap(repo->attrcache, NULL)) != NULL) - attr_cache__free(cache); -} - -int git_attr_cache__insert_macro(git_repository *repo, git_attr_rule *macro) -{ - git_attr_cache *cache = git_repository_attr_cache(repo); - git_strmap *macros = cache->macros; - int error; - - /* TODO: generate warning log if (macro->assigns.length == 0) */ - if (macro->assigns.length == 0) - return 0; - - if (git_mutex_lock(&cache->lock) < 0) { - giterr_set(GITERR_OS, "Unable to get attr cache lock"); - error = -1; - } else { - git_strmap_insert(macros, macro->match.pattern, macro, error); - git_mutex_unlock(&cache->lock); - } - - return (error < 0) ? -1 : 0; -} - -git_attr_rule *git_attr_cache__lookup_macro( - git_repository *repo, const char *name) -{ - git_strmap *macros = git_repository_attr_cache(repo)->macros; - khiter_t pos; - - pos = git_strmap_lookup_index(macros, name); - - if (!git_strmap_valid_index(macros, pos)) - return NULL; - - return (git_attr_rule *)git_strmap_value_at(macros, pos); -} - diff --git a/vendor/libgit2/src/attrcache.h b/vendor/libgit2/src/attrcache.h deleted file mode 100644 index 44e1ffdce..000000000 --- a/vendor/libgit2/src/attrcache.h +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_attrcache_h__ -#define INCLUDE_attrcache_h__ - -#include "attr_file.h" -#include "strmap.h" - -#define GIT_ATTR_CONFIG "core.attributesfile" -#define GIT_IGNORE_CONFIG "core.excludesfile" - -typedef struct { - char *cfg_attr_file; /* cached value of core.attributesfile */ - char *cfg_excl_file; /* cached value of core.excludesfile */ - git_strmap *files; /* hash path to git_attr_cache_entry records */ - git_strmap *macros; /* hash name to vector */ - git_mutex lock; - git_pool pool; -} git_attr_cache; - -extern int git_attr_cache__do_init(git_repository *repo); - -#define git_attr_cache__init(REPO) \ - (git_repository_attr_cache(REPO) ? 0 : git_attr_cache__do_init(REPO)) - -/* get file - loading and reload as needed */ -extern int git_attr_cache__get( - git_attr_file **file, - git_repository *repo, - git_attr_session *attr_session, - git_attr_file_source source, - const char *base, - const char *filename, - git_attr_file_parser parser); - -extern bool git_attr_cache__is_cached( - git_repository *repo, - git_attr_file_source source, - const char *path); - -extern int git_attr_cache__alloc_file_entry( - git_attr_file_entry **out, - const char *base, - const char *path, - git_pool *pool); - -extern int git_attr_cache__insert_macro( - git_repository *repo, git_attr_rule *macro); - -extern git_attr_rule *git_attr_cache__lookup_macro( - git_repository *repo, const char *name); - -#endif diff --git a/vendor/libgit2/src/bitvec.h b/vendor/libgit2/src/bitvec.h deleted file mode 100644 index 544832d95..000000000 --- a/vendor/libgit2/src/bitvec.h +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_bitvec_h__ -#define INCLUDE_bitvec_h__ - -#include "common.h" - -/* - * This is a silly little fixed length bit vector type that will store - * vectors of 64 bits or less directly in the structure and allocate - * memory for vectors longer than 64 bits. You can use the two versions - * transparently through the API and avoid heap allocation completely when - * using a short bit vector as a result. - */ -typedef struct { - size_t length; - union { - uint64_t *words; - uint64_t bits; - } u; -} git_bitvec; - -GIT_INLINE(int) git_bitvec_init(git_bitvec *bv, size_t capacity) -{ - memset(bv, 0x0, sizeof(*bv)); - - if (capacity >= 64) { - bv->length = (capacity / 64) + 1; - bv->u.words = git__calloc(bv->length, sizeof(uint64_t)); - if (!bv->u.words) - return -1; - } - - return 0; -} - -#define GIT_BITVEC_MASK(BIT) ((uint64_t)1 << (BIT % 64)) -#define GIT_BITVEC_WORD(BV, BIT) (BV->length ? &BV->u.words[BIT / 64] : &BV->u.bits) - -GIT_INLINE(void) git_bitvec_set(git_bitvec *bv, size_t bit, bool on) -{ - uint64_t *word = GIT_BITVEC_WORD(bv, bit); - uint64_t mask = GIT_BITVEC_MASK(bit); - - if (on) - *word |= mask; - else - *word &= ~mask; -} - -GIT_INLINE(bool) git_bitvec_get(git_bitvec *bv, size_t bit) -{ - uint64_t *word = GIT_BITVEC_WORD(bv, bit); - return (*word & GIT_BITVEC_MASK(bit)) != 0; -} - -GIT_INLINE(void) git_bitvec_clear(git_bitvec *bv) -{ - if (!bv->length) - bv->u.bits = 0; - else - memset(bv->u.words, 0x0, bv->length * sizeof(uint64_t)); -} - -GIT_INLINE(void) git_bitvec_free(git_bitvec *bv) -{ - if (bv->length) - git__free(bv->u.words); -} - -#endif diff --git a/vendor/libgit2/src/blame.c b/vendor/libgit2/src/blame.c deleted file mode 100644 index 2c8584ba5..000000000 --- a/vendor/libgit2/src/blame.c +++ /dev/null @@ -1,516 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "blame.h" -#include "git2/commit.h" -#include "git2/revparse.h" -#include "git2/revwalk.h" -#include "git2/tree.h" -#include "git2/diff.h" -#include "git2/blob.h" -#include "git2/signature.h" -#include "util.h" -#include "repository.h" -#include "blame_git.h" - - -static int hunk_byfinalline_search_cmp(const void *key, const void *entry) -{ - git_blame_hunk *hunk = (git_blame_hunk*)entry; - - size_t lineno = *(size_t*)key; - size_t lines_in_hunk = hunk->lines_in_hunk; - size_t final_start_line_number = hunk->final_start_line_number; - - if (lineno < final_start_line_number) - return -1; - if (lineno >= final_start_line_number + lines_in_hunk) - return 1; - return 0; -} - -static int paths_cmp(const void *a, const void *b) { return git__strcmp((char*)a, (char*)b); } -static int hunk_cmp(const void *_a, const void *_b) -{ - git_blame_hunk *a = (git_blame_hunk*)_a, - *b = (git_blame_hunk*)_b; - - return a->final_start_line_number - b->final_start_line_number; -} - -static bool hunk_ends_at_or_before_line(git_blame_hunk *hunk, size_t line) -{ - return line >= (hunk->final_start_line_number + hunk->lines_in_hunk - 1); -} - -static bool hunk_starts_at_or_after_line(git_blame_hunk *hunk, size_t line) -{ - return line <= hunk->final_start_line_number; -} - -static git_blame_hunk* new_hunk( - size_t start, - size_t lines, - size_t orig_start, - const char *path) -{ - git_blame_hunk *hunk = git__calloc(1, sizeof(git_blame_hunk)); - if (!hunk) return NULL; - - hunk->lines_in_hunk = lines; - hunk->final_start_line_number = start; - hunk->orig_start_line_number = orig_start; - hunk->orig_path = path ? git__strdup(path) : NULL; - - return hunk; -} - -static git_blame_hunk* dup_hunk(git_blame_hunk *hunk) -{ - git_blame_hunk *newhunk = new_hunk( - hunk->final_start_line_number, - hunk->lines_in_hunk, - hunk->orig_start_line_number, - hunk->orig_path); - - if (!newhunk) - return NULL; - - git_oid_cpy(&newhunk->orig_commit_id, &hunk->orig_commit_id); - git_oid_cpy(&newhunk->final_commit_id, &hunk->final_commit_id); - newhunk->boundary = hunk->boundary; - git_signature_dup(&newhunk->final_signature, hunk->final_signature); - git_signature_dup(&newhunk->orig_signature, hunk->orig_signature); - return newhunk; -} - -static void free_hunk(git_blame_hunk *hunk) -{ - git__free((void*)hunk->orig_path); - git_signature_free(hunk->final_signature); - git_signature_free(hunk->orig_signature); - git__free(hunk); -} - -/* Starting with the hunk that includes start_line, shift all following hunks' - * final_start_line by shift_by lines */ -static void shift_hunks_by(git_vector *v, size_t start_line, int shift_by) -{ - size_t i; - - if (!git_vector_bsearch2(&i, v, hunk_byfinalline_search_cmp, &start_line)) { - for (; i < v->length; i++) { - git_blame_hunk *hunk = (git_blame_hunk*)v->contents[i]; - hunk->final_start_line_number += shift_by; - } - } -} - -git_blame* git_blame__alloc( - git_repository *repo, - git_blame_options opts, - const char *path) -{ - git_blame *gbr = git__calloc(1, sizeof(git_blame)); - if (!gbr) - return NULL; - - gbr->repository = repo; - gbr->options = opts; - - if (git_vector_init(&gbr->hunks, 8, hunk_cmp) < 0 || - git_vector_init(&gbr->paths, 8, paths_cmp) < 0 || - (gbr->path = git__strdup(path)) == NULL || - git_vector_insert(&gbr->paths, git__strdup(path)) < 0) - { - git_blame_free(gbr); - return NULL; - } - - return gbr; -} - -void git_blame_free(git_blame *blame) -{ - size_t i; - git_blame_hunk *hunk; - - if (!blame) return; - - git_vector_foreach(&blame->hunks, i, hunk) - free_hunk(hunk); - git_vector_free(&blame->hunks); - - git_vector_free_deep(&blame->paths); - - git_array_clear(blame->line_index); - - git__free(blame->path); - git_blob_free(blame->final_blob); - git__free(blame); -} - -uint32_t git_blame_get_hunk_count(git_blame *blame) -{ - assert(blame); - return (uint32_t)blame->hunks.length; -} - -const git_blame_hunk *git_blame_get_hunk_byindex(git_blame *blame, uint32_t index) -{ - assert(blame); - return (git_blame_hunk*)git_vector_get(&blame->hunks, index); -} - -const git_blame_hunk *git_blame_get_hunk_byline(git_blame *blame, size_t lineno) -{ - size_t i, new_lineno = lineno; - assert(blame); - - if (!git_vector_bsearch2(&i, &blame->hunks, hunk_byfinalline_search_cmp, &new_lineno)) { - return git_blame_get_hunk_byindex(blame, (uint32_t)i); - } - - return NULL; -} - -static int normalize_options( - git_blame_options *out, - const git_blame_options *in, - git_repository *repo) -{ - git_blame_options dummy = GIT_BLAME_OPTIONS_INIT; - if (!in) in = &dummy; - - memcpy(out, in, sizeof(git_blame_options)); - - /* No newest_commit => HEAD */ - if (git_oid_iszero(&out->newest_commit)) { - if (git_reference_name_to_id(&out->newest_commit, repo, "HEAD") < 0) { - return -1; - } - } - - /* min_line 0 really means 1 */ - if (!out->min_line) out->min_line = 1; - /* max_line 0 really means N, but we don't know N yet */ - - /* Fix up option implications */ - if (out->flags & GIT_BLAME_TRACK_COPIES_ANY_COMMIT_COPIES) - out->flags |= GIT_BLAME_TRACK_COPIES_SAME_COMMIT_COPIES; - if (out->flags & GIT_BLAME_TRACK_COPIES_SAME_COMMIT_COPIES) - out->flags |= GIT_BLAME_TRACK_COPIES_SAME_COMMIT_MOVES; - if (out->flags & GIT_BLAME_TRACK_COPIES_SAME_COMMIT_MOVES) - out->flags |= GIT_BLAME_TRACK_COPIES_SAME_FILE; - - return 0; -} - -static git_blame_hunk *split_hunk_in_vector( - git_vector *vec, - git_blame_hunk *hunk, - size_t rel_line, - bool return_new) -{ - size_t new_line_count; - git_blame_hunk *nh; - - /* Don't split if already at a boundary */ - if (rel_line <= 0 || - rel_line >= hunk->lines_in_hunk) - { - return hunk; - } - - new_line_count = hunk->lines_in_hunk - rel_line; - nh = new_hunk(hunk->final_start_line_number + rel_line, new_line_count, - hunk->orig_start_line_number + rel_line, hunk->orig_path); - - if (!nh) - return NULL; - - git_oid_cpy(&nh->final_commit_id, &hunk->final_commit_id); - git_oid_cpy(&nh->orig_commit_id, &hunk->orig_commit_id); - - /* Adjust hunk that was split */ - hunk->lines_in_hunk -= new_line_count; - git_vector_insert_sorted(vec, nh, NULL); - { - git_blame_hunk *ret = return_new ? nh : hunk; - return ret; - } -} - -/* - * Construct a list of char indices for where lines begin - * Adapted from core git: - * https://github.com/gitster/git/blob/be5c9fb9049ed470e7005f159bb923a5f4de1309/builtin/blame.c#L1760-L1789 - */ -static int index_blob_lines(git_blame *blame) -{ - const char *buf = blame->final_buf; - git_off_t len = blame->final_buf_size; - int num = 0, incomplete = 0, bol = 1; - size_t *i; - - if (len && buf[len-1] != '\n') - incomplete++; /* incomplete line at the end */ - while (len--) { - if (bol) { - i = git_array_alloc(blame->line_index); - GITERR_CHECK_ALLOC(i); - *i = buf - blame->final_buf; - bol = 0; - } - if (*buf++ == '\n') { - num++; - bol = 1; - } - } - i = git_array_alloc(blame->line_index); - GITERR_CHECK_ALLOC(i); - *i = buf - blame->final_buf; - blame->num_lines = num + incomplete; - return blame->num_lines; -} - -static git_blame_hunk* hunk_from_entry(git_blame__entry *e) -{ - git_blame_hunk *h = new_hunk( - e->lno+1, e->num_lines, e->s_lno+1, e->suspect->path); - - if (!h) - return NULL; - - git_oid_cpy(&h->final_commit_id, git_commit_id(e->suspect->commit)); - git_oid_cpy(&h->orig_commit_id, git_commit_id(e->suspect->commit)); - git_signature_dup(&h->final_signature, git_commit_author(e->suspect->commit)); - git_signature_dup(&h->orig_signature, git_commit_author(e->suspect->commit)); - h->boundary = e->is_boundary ? 1 : 0; - return h; -} - -static int load_blob(git_blame *blame) -{ - int error; - - if (blame->final_blob) return 0; - - error = git_commit_lookup(&blame->final, blame->repository, &blame->options.newest_commit); - if (error < 0) - goto cleanup; - error = git_object_lookup_bypath((git_object**)&blame->final_blob, - (git_object*)blame->final, blame->path, GIT_OBJ_BLOB); - -cleanup: - return error; -} - -static int blame_internal(git_blame *blame) -{ - int error; - git_blame__entry *ent = NULL; - git_blame__origin *o; - - if ((error = load_blob(blame)) < 0 || - (error = git_blame__get_origin(&o, blame, blame->final, blame->path)) < 0) - goto cleanup; - blame->final_buf = git_blob_rawcontent(blame->final_blob); - blame->final_buf_size = git_blob_rawsize(blame->final_blob); - - ent = git__calloc(1, sizeof(git_blame__entry)); - GITERR_CHECK_ALLOC(ent); - - ent->num_lines = index_blob_lines(blame); - ent->lno = blame->options.min_line - 1; - ent->num_lines = ent->num_lines - blame->options.min_line + 1; - if (blame->options.max_line > 0) - ent->num_lines = blame->options.max_line - blame->options.min_line + 1; - ent->s_lno = ent->lno; - ent->suspect = o; - - blame->ent = ent; - - error = git_blame__like_git(blame, blame->options.flags); - -cleanup: - for (ent = blame->ent; ent; ) { - git_blame__entry *e = ent->next; - git_blame_hunk *h = hunk_from_entry(ent); - - git_vector_insert(&blame->hunks, h); - - git_blame__free_entry(ent); - ent = e; - } - - return error; -} - -/******************************************************************************* - * File blaming - ******************************************************************************/ - -int git_blame_file( - git_blame **out, - git_repository *repo, - const char *path, - git_blame_options *options) -{ - int error = -1; - git_blame_options normOptions = GIT_BLAME_OPTIONS_INIT; - git_blame *blame = NULL; - - assert(out && repo && path); - if ((error = normalize_options(&normOptions, options, repo)) < 0) - goto on_error; - - blame = git_blame__alloc(repo, normOptions, path); - GITERR_CHECK_ALLOC(blame); - - if ((error = load_blob(blame)) < 0) - goto on_error; - - if ((error = blame_internal(blame)) < 0) - goto on_error; - - *out = blame; - return 0; - -on_error: - git_blame_free(blame); - return error; -} - -/******************************************************************************* - * Buffer blaming - *******************************************************************************/ - -static bool hunk_is_bufferblame(git_blame_hunk *hunk) -{ - return git_oid_iszero(&hunk->final_commit_id); -} - -static int buffer_hunk_cb( - const git_diff_delta *delta, - const git_diff_hunk *hunk, - void *payload) -{ - git_blame *blame = (git_blame*)payload; - uint32_t wedge_line; - - GIT_UNUSED(delta); - - wedge_line = (hunk->old_lines == 0) ? hunk->new_start : hunk->old_start; - blame->current_diff_line = wedge_line; - - blame->current_hunk = (git_blame_hunk*)git_blame_get_hunk_byline(blame, wedge_line); - if (!blame->current_hunk) { - /* Line added at the end of the file */ - blame->current_hunk = new_hunk(wedge_line, 0, wedge_line, blame->path); - GITERR_CHECK_ALLOC(blame->current_hunk); - - git_vector_insert(&blame->hunks, blame->current_hunk); - } else if (!hunk_starts_at_or_after_line(blame->current_hunk, wedge_line)){ - /* If this hunk doesn't start between existing hunks, split a hunk up so it does */ - blame->current_hunk = split_hunk_in_vector(&blame->hunks, blame->current_hunk, - wedge_line - blame->current_hunk->orig_start_line_number, true); - GITERR_CHECK_ALLOC(blame->current_hunk); - } - - return 0; -} - -static int ptrs_equal_cmp(const void *a, const void *b) { return ab ? 1 : 0; } -static int buffer_line_cb( - const git_diff_delta *delta, - const git_diff_hunk *hunk, - const git_diff_line *line, - void *payload) -{ - git_blame *blame = (git_blame*)payload; - - GIT_UNUSED(delta); - GIT_UNUSED(hunk); - GIT_UNUSED(line); - - if (line->origin == GIT_DIFF_LINE_ADDITION) { - if (hunk_is_bufferblame(blame->current_hunk) && - hunk_ends_at_or_before_line(blame->current_hunk, blame->current_diff_line)) { - /* Append to the current buffer-blame hunk */ - blame->current_hunk->lines_in_hunk++; - shift_hunks_by(&blame->hunks, blame->current_diff_line+1, 1); - } else { - /* Create a new buffer-blame hunk with this line */ - shift_hunks_by(&blame->hunks, blame->current_diff_line, 1); - blame->current_hunk = new_hunk(blame->current_diff_line, 1, 0, blame->path); - GITERR_CHECK_ALLOC(blame->current_hunk); - - git_vector_insert_sorted(&blame->hunks, blame->current_hunk, NULL); - } - blame->current_diff_line++; - } - - if (line->origin == GIT_DIFF_LINE_DELETION) { - /* Trim the line from the current hunk; remove it if it's now empty */ - size_t shift_base = blame->current_diff_line + blame->current_hunk->lines_in_hunk+1; - - if (--(blame->current_hunk->lines_in_hunk) == 0) { - size_t i; - shift_base--; - if (!git_vector_search2(&i, &blame->hunks, ptrs_equal_cmp, blame->current_hunk)) { - git_vector_remove(&blame->hunks, i); - free_hunk(blame->current_hunk); - blame->current_hunk = (git_blame_hunk*)git_blame_get_hunk_byindex(blame, (uint32_t)i); - } - } - shift_hunks_by(&blame->hunks, shift_base, -1); - } - return 0; -} - -int git_blame_buffer( - git_blame **out, - git_blame *reference, - const char *buffer, - size_t buffer_len) -{ - git_blame *blame; - git_diff_options diffopts = GIT_DIFF_OPTIONS_INIT; - size_t i; - git_blame_hunk *hunk; - - diffopts.context_lines = 0; - - assert(out && reference && buffer && buffer_len); - - blame = git_blame__alloc(reference->repository, reference->options, reference->path); - GITERR_CHECK_ALLOC(blame); - - /* Duplicate all of the hunk structures in the reference blame */ - git_vector_foreach(&reference->hunks, i, hunk) { - git_blame_hunk *h = dup_hunk(hunk); - GITERR_CHECK_ALLOC(h); - - git_vector_insert(&blame->hunks, h); - } - - /* Diff to the reference blob */ - git_diff_blob_to_buffer(reference->final_blob, blame->path, - buffer, buffer_len, blame->path, &diffopts, - NULL, NULL, buffer_hunk_cb, buffer_line_cb, blame); - - *out = blame; - return 0; -} - -int git_blame_init_options(git_blame_options *opts, unsigned int version) -{ - GIT_INIT_STRUCTURE_FROM_TEMPLATE( - opts, version, git_blame_options, GIT_BLAME_OPTIONS_INIT); - return 0; -} diff --git a/vendor/libgit2/src/blame.h b/vendor/libgit2/src/blame.h deleted file mode 100644 index d8db8d5c1..000000000 --- a/vendor/libgit2/src/blame.h +++ /dev/null @@ -1,93 +0,0 @@ -#ifndef INCLUDE_blame_h__ -#define INCLUDE_blame_h__ - -#include "git2/blame.h" -#include "common.h" -#include "vector.h" -#include "diff.h" -#include "array.h" -#include "git2/oid.h" - -/* - * One blob in a commit that is being suspected - */ -typedef struct git_blame__origin { - int refcnt; - struct git_blame__origin *previous; - git_commit *commit; - git_blob *blob; - char path[GIT_FLEX_ARRAY]; -} git_blame__origin; - -/* - * Each group of lines is described by a git_blame__entry; it can be split - * as we pass blame to the parents. They form a linked list in the - * scoreboard structure, sorted by the target line number. - */ -typedef struct git_blame__entry { - struct git_blame__entry *prev; - struct git_blame__entry *next; - - /* the first line of this group in the final image; - * internally all line numbers are 0 based. - */ - size_t lno; - - /* how many lines this group has */ - size_t num_lines; - - /* the commit that introduced this group into the final image */ - git_blame__origin *suspect; - - /* true if the suspect is truly guilty; false while we have not - * checked if the group came from one of its parents. - */ - bool guilty; - - /* true if the entry has been scanned for copies in the current parent - */ - bool scanned; - - /* the line number of the first line of this group in the - * suspect's file; internally all line numbers are 0 based. - */ - size_t s_lno; - - /* how significant this entry is -- cached to avoid - * scanning the lines over and over. - */ - unsigned score; - - /* Whether this entry has been tracked to a boundary commit. - */ - bool is_boundary; -} git_blame__entry; - -struct git_blame { - char *path; - git_repository *repository; - git_blame_options options; - - git_vector hunks; - git_vector paths; - - git_blob *final_blob; - git_array_t(size_t) line_index; - - size_t current_diff_line; - git_blame_hunk *current_hunk; - - /* Scoreboard fields */ - git_commit *final; - git_blame__entry *ent; - int num_lines; - const char *final_buf; - git_off_t final_buf_size; -}; - -git_blame *git_blame__alloc( - git_repository *repo, - git_blame_options opts, - const char *path); - -#endif diff --git a/vendor/libgit2/src/blame_git.c b/vendor/libgit2/src/blame_git.c deleted file mode 100644 index 700207edb..000000000 --- a/vendor/libgit2/src/blame_git.c +++ /dev/null @@ -1,650 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "blame_git.h" -#include "commit.h" -#include "blob.h" -#include "xdiff/xinclude.h" -#include "diff_xdiff.h" - -/* - * Origin is refcounted and usually we keep the blob contents to be - * reused. - */ -static git_blame__origin *origin_incref(git_blame__origin *o) -{ - if (o) - o->refcnt++; - return o; -} - -static void origin_decref(git_blame__origin *o) -{ - if (o && --o->refcnt <= 0) { - if (o->previous) - origin_decref(o->previous); - git_blob_free(o->blob); - git_commit_free(o->commit); - git__free(o); - } -} - -/* Given a commit and a path in it, create a new origin structure. */ -static int make_origin(git_blame__origin **out, git_commit *commit, const char *path) -{ - git_blame__origin *o; - size_t path_len = strlen(path), alloc_len; - int error = 0; - - GITERR_CHECK_ALLOC_ADD(&alloc_len, sizeof(*o), path_len); - GITERR_CHECK_ALLOC_ADD(&alloc_len, alloc_len, 1); - o = git__calloc(1, alloc_len); - GITERR_CHECK_ALLOC(o); - - o->commit = commit; - o->refcnt = 1; - strcpy(o->path, path); - - if (!(error = git_object_lookup_bypath((git_object**)&o->blob, (git_object*)commit, - path, GIT_OBJ_BLOB))) { - *out = o; - } else { - origin_decref(o); - } - return error; -} - -/* Locate an existing origin or create a new one. */ -int git_blame__get_origin( - git_blame__origin **out, - git_blame *blame, - git_commit *commit, - const char *path) -{ - git_blame__entry *e; - - for (e = blame->ent; e; e = e->next) { - if (e->suspect->commit == commit && !strcmp(e->suspect->path, path)) { - *out = origin_incref(e->suspect); - } - } - return make_origin(out, commit, path); -} - -typedef struct blame_chunk_cb_data { - git_blame *blame; - git_blame__origin *target; - git_blame__origin *parent; - long tlno; - long plno; -}blame_chunk_cb_data; - -static bool same_suspect(git_blame__origin *a, git_blame__origin *b) -{ - if (a == b) - return true; - if (git_oid_cmp(git_commit_id(a->commit), git_commit_id(b->commit))) - return false; - return 0 == strcmp(a->path, b->path); -} - -/* find the line number of the last line the target is suspected for */ -static bool find_last_in_target(size_t *out, git_blame *blame, git_blame__origin *target) -{ - git_blame__entry *e; - size_t last_in_target = 0; - bool found = false; - - *out = 0; - - for (e=blame->ent; e; e=e->next) { - if (e->guilty || !same_suspect(e->suspect, target)) - continue; - if (last_in_target < e->s_lno + e->num_lines) { - found = true; - last_in_target = e->s_lno + e->num_lines; - } - } - - *out = last_in_target; - return found; -} - -/* - * It is known that lines between tlno to same came from parent, and e - * has an overlap with that range. it also is known that parent's - * line plno corresponds to e's line tlno. - * - * <---- e -----> - * <------> (entirely within) - * <------------> (extends past) - * <------------> (starts before) - * <------------------> (entirely encloses) - * - * Split e into potentially three parts; before this chunk, the chunk - * to be blamed for the parent, and after that portion. - */ -static void split_overlap(git_blame__entry *split, git_blame__entry *e, - size_t tlno, size_t plno, size_t same, git_blame__origin *parent) -{ - size_t chunk_end_lno; - - if (e->s_lno < tlno) { - /* there is a pre-chunk part not blamed on the parent */ - split[0].suspect = origin_incref(e->suspect); - split[0].lno = e->lno; - split[0].s_lno = e->s_lno; - split[0].num_lines = tlno - e->s_lno; - split[1].lno = e->lno + tlno - e->s_lno; - split[1].s_lno = plno; - } else { - split[1].lno = e->lno; - split[1].s_lno = plno + (e->s_lno - tlno); - } - - if (same < e->s_lno + e->num_lines) { - /* there is a post-chunk part not blamed on parent */ - split[2].suspect = origin_incref(e->suspect); - split[2].lno = e->lno + (same - e->s_lno); - split[2].s_lno = e->s_lno + (same - e->s_lno); - split[2].num_lines = e->s_lno + e->num_lines - same; - chunk_end_lno = split[2].lno; - } else { - chunk_end_lno = e->lno + e->num_lines; - } - split[1].num_lines = chunk_end_lno - split[1].lno; - - /* - * if it turns out there is nothing to blame the parent for, forget about - * the splitting. !split[1].suspect signals this. - */ - if (split[1].num_lines < 1) - return; - split[1].suspect = origin_incref(parent); -} - -/* - * Link in a new blame entry to the scoreboard. Entries that cover the same - * line range have been removed from the scoreboard previously. - */ -static void add_blame_entry(git_blame *blame, git_blame__entry *e) -{ - git_blame__entry *ent, *prev = NULL; - - origin_incref(e->suspect); - - for (ent = blame->ent; ent && ent->lno < e->lno; ent = ent->next) - prev = ent; - - /* prev, if not NULL, is the last one that is below e */ - e->prev = prev; - if (prev) { - e->next = prev->next; - prev->next = e; - } else { - e->next = blame->ent; - blame->ent = e; - } - if (e->next) - e->next->prev = e; -} - -/* - * src typically is on-stack; we want to copy the information in it to - * a malloced blame_entry that is already on the linked list of the scoreboard. - * The origin of dst loses a refcnt while the origin of src gains one. - */ -static void dup_entry(git_blame__entry *dst, git_blame__entry *src) -{ - git_blame__entry *p, *n; - - p = dst->prev; - n = dst->next; - origin_incref(src->suspect); - origin_decref(dst->suspect); - memcpy(dst, src, sizeof(*src)); - dst->prev = p; - dst->next = n; - dst->score = 0; -} - -/* - * split_overlap() divided an existing blame e into up to three parts in split. - * Adjust the linked list of blames in the scoreboard to reflect the split. - */ -static void split_blame(git_blame *blame, git_blame__entry *split, git_blame__entry *e) -{ - git_blame__entry *new_entry; - - if (split[0].suspect && split[2].suspect) { - /* The first part (reuse storage for the existing entry e */ - dup_entry(e, &split[0]); - - /* The last part -- me */ - new_entry = git__malloc(sizeof(*new_entry)); - memcpy(new_entry, &(split[2]), sizeof(git_blame__entry)); - add_blame_entry(blame, new_entry); - - /* ... and the middle part -- parent */ - new_entry = git__malloc(sizeof(*new_entry)); - memcpy(new_entry, &(split[1]), sizeof(git_blame__entry)); - add_blame_entry(blame, new_entry); - } else if (!split[0].suspect && !split[2].suspect) { - /* - * The parent covers the entire area; reuse storage for e and replace it - * with the parent - */ - dup_entry(e, &split[1]); - } else if (split[0].suspect) { - /* me and then parent */ - dup_entry(e, &split[0]); - new_entry = git__malloc(sizeof(*new_entry)); - memcpy(new_entry, &(split[1]), sizeof(git_blame__entry)); - add_blame_entry(blame, new_entry); - } else { - /* parent and then me */ - dup_entry(e, &split[1]); - new_entry = git__malloc(sizeof(*new_entry)); - memcpy(new_entry, &(split[2]), sizeof(git_blame__entry)); - add_blame_entry(blame, new_entry); - } -} - -/* - * After splitting the blame, the origins used by the on-stack blame_entry - * should lose one refcnt each. - */ -static void decref_split(git_blame__entry *split) -{ - int i; - for (i=0; i<3; i++) - origin_decref(split[i].suspect); -} - -/* - * Helper for blame_chunk(). blame_entry e is known to overlap with the patch - * hunk; split it and pass blame to the parent. - */ -static void blame_overlap( - git_blame *blame, - git_blame__entry *e, - size_t tlno, - size_t plno, - size_t same, - git_blame__origin *parent) -{ - git_blame__entry split[3] = {{0}}; - - split_overlap(split, e, tlno, plno, same, parent); - if (split[1].suspect) - split_blame(blame, split, e); - decref_split(split); -} - -/* - * Process one hunk from the patch between the current suspect for blame_entry - * e and its parent. Find and split the overlap, and pass blame to the - * overlapping part to the parent. - */ -static void blame_chunk( - git_blame *blame, - size_t tlno, - size_t plno, - size_t same, - git_blame__origin *target, - git_blame__origin *parent) -{ - git_blame__entry *e; - - for (e = blame->ent; e; e = e->next) { - if (e->guilty || !same_suspect(e->suspect, target)) - continue; - if (same <= e->s_lno) - continue; - if (tlno < e->s_lno + e->num_lines) { - blame_overlap(blame, e, tlno, plno, same, parent); - } - } -} - -static int my_emit( - long start_a, long count_a, - long start_b, long count_b, - void *cb_data) -{ - blame_chunk_cb_data *d = (blame_chunk_cb_data *)cb_data; - - blame_chunk(d->blame, d->tlno, d->plno, start_b, d->target, d->parent); - d->plno = start_a + count_a; - d->tlno = start_b + count_b; - - return 0; -} - -static void trim_common_tail(mmfile_t *a, mmfile_t *b, long ctx) -{ - const int blk = 1024; - long trimmed = 0, recovered = 0; - char *ap = a->ptr + a->size; - char *bp = b->ptr + b->size; - long smaller = (long)((a->size < b->size) ? a->size : b->size); - - if (ctx) - return; - - while (blk + trimmed <= smaller && !memcmp(ap - blk, bp - blk, blk)) { - trimmed += blk; - ap -= blk; - bp -= blk; - } - - while (recovered < trimmed) - if (ap[recovered++] == '\n') - break; - a->size -= trimmed - recovered; - b->size -= trimmed - recovered; -} - -static int diff_hunks(mmfile_t file_a, mmfile_t file_b, void *cb_data) -{ - xpparam_t xpp = {0}; - xdemitconf_t xecfg = {0}; - xdemitcb_t ecb = {0}; - - xecfg.hunk_func = my_emit; - ecb.priv = cb_data; - - trim_common_tail(&file_a, &file_b, 0); - - if (file_a.size > GIT_XDIFF_MAX_SIZE || - file_b.size > GIT_XDIFF_MAX_SIZE) { - giterr_set(GITERR_INVALID, "file too large to blame"); - return -1; - } - - return xdl_diff(&file_a, &file_b, &xpp, &xecfg, &ecb); -} - -static void fill_origin_blob(git_blame__origin *o, mmfile_t *file) -{ - memset(file, 0, sizeof(*file)); - if (o->blob) { - file->ptr = (char*)git_blob_rawcontent(o->blob); - file->size = (size_t)git_blob_rawsize(o->blob); - } -} - -static int pass_blame_to_parent( - git_blame *blame, - git_blame__origin *target, - git_blame__origin *parent) -{ - size_t last_in_target; - mmfile_t file_p, file_o; - blame_chunk_cb_data d = { blame, target, parent, 0, 0 }; - - if (!find_last_in_target(&last_in_target, blame, target)) - return 1; /* nothing remains for this target */ - - fill_origin_blob(parent, &file_p); - fill_origin_blob(target, &file_o); - - if (diff_hunks(file_p, file_o, &d) < 0) - return -1; - - /* The reset (i.e. anything after tlno) are the same as the parent */ - blame_chunk(blame, d.tlno, d.plno, last_in_target, target, parent); - - return 0; -} - -static int paths_on_dup(void **old, void *new) -{ - GIT_UNUSED(old); - git__free(new); - return -1; -} - -static git_blame__origin* find_origin( - git_blame *blame, - git_commit *parent, - git_blame__origin *origin) -{ - git_blame__origin *porigin = NULL; - git_diff *difflist = NULL; - git_diff_options diffopts = GIT_DIFF_OPTIONS_INIT; - git_tree *otree=NULL, *ptree=NULL; - - /* Get the trees from this commit and its parent */ - if (0 != git_commit_tree(&otree, origin->commit) || - 0 != git_commit_tree(&ptree, parent)) - goto cleanup; - - /* Configure the diff */ - diffopts.context_lines = 0; - diffopts.flags = GIT_DIFF_SKIP_BINARY_CHECK; - - /* Check to see if files we're interested have changed */ - diffopts.pathspec.count = blame->paths.length; - diffopts.pathspec.strings = (char**)blame->paths.contents; - if (0 != git_diff_tree_to_tree(&difflist, blame->repository, ptree, otree, &diffopts)) - goto cleanup; - - if (!git_diff_num_deltas(difflist)) { - /* No changes; copy data */ - git_blame__get_origin(&porigin, blame, parent, origin->path); - } else { - git_diff_find_options findopts = GIT_DIFF_FIND_OPTIONS_INIT; - int i; - - /* Generate a full diff between the two trees */ - git_diff_free(difflist); - diffopts.pathspec.count = 0; - if (0 != git_diff_tree_to_tree(&difflist, blame->repository, ptree, otree, &diffopts)) - goto cleanup; - - /* Let diff find renames */ - findopts.flags = GIT_DIFF_FIND_RENAMES; - if (0 != git_diff_find_similar(difflist, &findopts)) - goto cleanup; - - /* Find one that matches */ - for (i=0; i<(int)git_diff_num_deltas(difflist); i++) { - const git_diff_delta *delta = git_diff_get_delta(difflist, i); - - if (!git_vector_bsearch(NULL, &blame->paths, delta->new_file.path)) - { - git_vector_insert_sorted(&blame->paths, (void*)git__strdup(delta->old_file.path), - paths_on_dup); - make_origin(&porigin, parent, delta->old_file.path); - } - } - } - -cleanup: - git_diff_free(difflist); - git_tree_free(otree); - git_tree_free(ptree); - return porigin; -} - -/* - * The blobs of origin and porigin exactly match, so everything origin is - * suspected for can be blamed on the parent. - */ -static void pass_whole_blame(git_blame *blame, - git_blame__origin *origin, git_blame__origin *porigin) -{ - git_blame__entry *e; - - if (!porigin->blob) - git_object_lookup((git_object**)&porigin->blob, blame->repository, - git_blob_id(origin->blob), GIT_OBJ_BLOB); - for (e=blame->ent; e; e=e->next) { - if (!same_suspect(e->suspect, origin)) - continue; - origin_incref(porigin); - origin_decref(e->suspect); - e->suspect = porigin; - } -} - -static int pass_blame(git_blame *blame, git_blame__origin *origin, uint32_t opt) -{ - git_commit *commit = origin->commit; - int i, num_parents; - git_blame__origin *sg_buf[16]; - git_blame__origin *porigin, **sg_origin = sg_buf; - int ret, error = 0; - - num_parents = git_commit_parentcount(commit); - if (!git_oid_cmp(git_commit_id(commit), &blame->options.oldest_commit)) - /* Stop at oldest specified commit */ - num_parents = 0; - else if (opt & GIT_BLAME_FIRST_PARENT && num_parents > 1) - /* Limit search to the first parent */ - num_parents = 1; - - if (!num_parents) { - git_oid_cpy(&blame->options.oldest_commit, git_commit_id(commit)); - goto finish; - } - else if (num_parents < (int)ARRAY_SIZE(sg_buf)) - memset(sg_buf, 0, sizeof(sg_buf)); - else - sg_origin = git__calloc(num_parents, sizeof(*sg_origin)); - - for (i=0; icommit, i)) < 0) - goto finish; - porigin = find_origin(blame, p, origin); - - if (!porigin) - continue; - if (porigin->blob && origin->blob && - !git_oid_cmp(git_blob_id(porigin->blob), git_blob_id(origin->blob))) { - pass_whole_blame(blame, origin, porigin); - origin_decref(porigin); - goto finish; - } - for (j = same = 0; jblob), git_blob_id(porigin->blob))) { - same = 1; - break; - } - if (!same) - sg_origin[i] = porigin; - else - origin_decref(porigin); - } - - /* Standard blame */ - for (i=0; iprevious) { - origin_incref(porigin); - origin->previous = porigin; - } - - if ((ret = pass_blame_to_parent(blame, origin, porigin)) != 0) { - if (ret < 0) - error = -1; - - goto finish; - } - } - - /* TODO: optionally find moves in parents' files */ - - /* TODO: optionally find copies in parents' files */ - -finish: - for (i=0; i pair), - * merge them together. - */ -static void coalesce(git_blame *blame) -{ - git_blame__entry *ent, *next; - - for (ent=blame->ent; ent && (next = ent->next); ent = next) { - if (same_suspect(ent->suspect, next->suspect) && - ent->guilty == next->guilty && - ent->s_lno + ent->num_lines == next->s_lno) - { - ent->num_lines += next->num_lines; - ent->next = next->next; - if (ent->next) - ent->next->prev = ent; - origin_decref(next->suspect); - git__free(next); - ent->score = 0; - next = ent; /* again */ - } - } -} - -int git_blame__like_git(git_blame *blame, uint32_t opt) -{ - while (true) { - git_blame__entry *ent; - git_blame__origin *suspect = NULL; - - /* Find a suspect to break down */ - for (ent = blame->ent; !suspect && ent; ent = ent->next) - if (!ent->guilty) - suspect = ent->suspect; - if (!suspect) - return 0; /* all done */ - - /* We'll use this suspect later in the loop, so hold on to it for now. */ - origin_incref(suspect); - - if (pass_blame(blame, suspect, opt) < 0) - return -1; - - /* Take responsibility for the remaining entries */ - for (ent = blame->ent; ent; ent = ent->next) { - if (same_suspect(ent->suspect, suspect)) { - ent->guilty = true; - ent->is_boundary = !git_oid_cmp( - git_commit_id(suspect->commit), - &blame->options.oldest_commit); - } - } - origin_decref(suspect); - } - - coalesce(blame); - - return 0; -} - -void git_blame__free_entry(git_blame__entry *ent) -{ - if (!ent) return; - origin_decref(ent->suspect); - git__free(ent); -} diff --git a/vendor/libgit2/src/blame_git.h b/vendor/libgit2/src/blame_git.h deleted file mode 100644 index 1891b0e1f..000000000 --- a/vendor/libgit2/src/blame_git.h +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_blame_git__ -#define INCLUDE_blame_git__ - -#include "blame.h" - -int git_blame__get_origin( - git_blame__origin **out, - git_blame *sb, - git_commit *commit, - const char *path); -void git_blame__free_entry(git_blame__entry *ent); -int git_blame__like_git(git_blame *sb, uint32_t flags); - -#endif diff --git a/vendor/libgit2/src/blob.c b/vendor/libgit2/src/blob.c deleted file mode 100644 index ad0f4ac62..000000000 --- a/vendor/libgit2/src/blob.c +++ /dev/null @@ -1,375 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "git2/common.h" -#include "git2/object.h" -#include "git2/repository.h" -#include "git2/odb_backend.h" - -#include "common.h" -#include "filebuf.h" -#include "blob.h" -#include "filter.h" -#include "buf_text.h" - -const void *git_blob_rawcontent(const git_blob *blob) -{ - assert(blob); - return git_odb_object_data(blob->odb_object); -} - -git_off_t git_blob_rawsize(const git_blob *blob) -{ - assert(blob); - return (git_off_t)git_odb_object_size(blob->odb_object); -} - -int git_blob__getbuf(git_buf *buffer, git_blob *blob) -{ - return git_buf_set( - buffer, - git_odb_object_data(blob->odb_object), - git_odb_object_size(blob->odb_object)); -} - -void git_blob__free(void *blob) -{ - git_odb_object_free(((git_blob *)blob)->odb_object); - git__free(blob); -} - -int git_blob__parse(void *blob, git_odb_object *odb_obj) -{ - assert(blob); - git_cached_obj_incref((git_cached_obj *)odb_obj); - ((git_blob *)blob)->odb_object = odb_obj; - return 0; -} - -int git_blob_create_frombuffer( - git_oid *id, git_repository *repo, const void *buffer, size_t len) -{ - int error; - git_odb *odb; - git_odb_stream *stream; - - assert(id && repo); - - if ((error = git_repository_odb__weakptr(&odb, repo)) < 0 || - (error = git_odb_open_wstream(&stream, odb, len, GIT_OBJ_BLOB)) < 0) - return error; - - if ((error = git_odb_stream_write(stream, buffer, len)) == 0) - error = git_odb_stream_finalize_write(id, stream); - - git_odb_stream_free(stream); - return error; -} - -static int write_file_stream( - git_oid *id, git_odb *odb, const char *path, git_off_t file_size) -{ - int fd, error; - char buffer[FILEIO_BUFSIZE]; - git_odb_stream *stream = NULL; - ssize_t read_len = -1; - git_off_t written = 0; - - if ((error = git_odb_open_wstream( - &stream, odb, file_size, GIT_OBJ_BLOB)) < 0) - return error; - - if ((fd = git_futils_open_ro(path)) < 0) { - git_odb_stream_free(stream); - return -1; - } - - while (!error && (read_len = p_read(fd, buffer, sizeof(buffer))) > 0) { - error = git_odb_stream_write(stream, buffer, read_len); - written += read_len; - } - - p_close(fd); - - if (written != file_size || read_len < 0) { - giterr_set(GITERR_OS, "Failed to read file into stream"); - error = -1; - } - - if (!error) - error = git_odb_stream_finalize_write(id, stream); - - git_odb_stream_free(stream); - return error; -} - -static int write_file_filtered( - git_oid *id, - git_off_t *size, - git_odb *odb, - const char *full_path, - git_filter_list *fl) -{ - int error; - git_buf tgt = GIT_BUF_INIT; - - error = git_filter_list_apply_to_file(&tgt, fl, NULL, full_path); - - /* Write the file to disk if it was properly filtered */ - if (!error) { - *size = tgt.size; - - error = git_odb_write(id, odb, tgt.ptr, tgt.size, GIT_OBJ_BLOB); - } - - git_buf_free(&tgt); - return error; -} - -static int write_symlink( - git_oid *id, git_odb *odb, const char *path, size_t link_size) -{ - char *link_data; - ssize_t read_len; - int error; - - link_data = git__malloc(link_size); - GITERR_CHECK_ALLOC(link_data); - - read_len = p_readlink(path, link_data, link_size); - if (read_len != (ssize_t)link_size) { - giterr_set(GITERR_OS, "Failed to create blob. Can't read symlink '%s'", path); - git__free(link_data); - return -1; - } - - error = git_odb_write(id, odb, (void *)link_data, link_size, GIT_OBJ_BLOB); - git__free(link_data); - return error; -} - -int git_blob__create_from_paths( - git_oid *id, - struct stat *out_st, - git_repository *repo, - const char *content_path, - const char *hint_path, - mode_t hint_mode, - bool try_load_filters) -{ - int error; - struct stat st; - git_odb *odb = NULL; - git_off_t size; - mode_t mode; - git_buf path = GIT_BUF_INIT; - - assert(hint_path || !try_load_filters); - - if (!content_path) { - if (git_repository__ensure_not_bare(repo, "create blob from file") < 0) - return GIT_EBAREREPO; - - if (git_buf_joinpath( - &path, git_repository_workdir(repo), hint_path) < 0) - return -1; - - content_path = path.ptr; - } - - if ((error = git_path_lstat(content_path, &st)) < 0 || - (error = git_repository_odb(&odb, repo)) < 0) - goto done; - - if (S_ISDIR(st.st_mode)) { - giterr_set(GITERR_ODB, "cannot create blob from '%s'; it is a directory", content_path); - error = GIT_EDIRECTORY; - goto done; - } - - if (out_st) - memcpy(out_st, &st, sizeof(st)); - - size = st.st_size; - mode = hint_mode ? hint_mode : st.st_mode; - - if (S_ISLNK(mode)) { - error = write_symlink(id, odb, content_path, (size_t)size); - } else { - git_filter_list *fl = NULL; - - if (try_load_filters) - /* Load the filters for writing this file to the ODB */ - error = git_filter_list_load( - &fl, repo, NULL, hint_path, - GIT_FILTER_TO_ODB, GIT_FILTER_DEFAULT); - - if (error < 0) - /* well, that didn't work */; - else if (fl == NULL) - /* No filters need to be applied to the document: we can stream - * directly from disk */ - error = write_file_stream(id, odb, content_path, size); - else { - /* We need to apply one or more filters */ - error = write_file_filtered(id, &size, odb, content_path, fl); - - git_filter_list_free(fl); - } - - /* - * TODO: eventually support streaming filtered files, for files - * which are bigger than a given threshold. This is not a priority - * because applying a filter in streaming mode changes the final - * size of the blob, and without knowing its final size, the blob - * cannot be written in stream mode to the ODB. - * - * The plan is to do streaming writes to a tempfile on disk and then - * opening streaming that file to the ODB, using - * `write_file_stream`. - * - * CAREFULLY DESIGNED APIS YO - */ - } - -done: - git_odb_free(odb); - git_buf_free(&path); - - return error; -} - -int git_blob_create_fromworkdir( - git_oid *id, git_repository *repo, const char *path) -{ - return git_blob__create_from_paths(id, NULL, repo, NULL, path, 0, true); -} - -int git_blob_create_fromdisk( - git_oid *id, git_repository *repo, const char *path) -{ - int error; - git_buf full_path = GIT_BUF_INIT; - const char *workdir, *hintpath; - - if ((error = git_path_prettify(&full_path, path, NULL)) < 0) { - git_buf_free(&full_path); - return error; - } - - hintpath = git_buf_cstr(&full_path); - workdir = git_repository_workdir(repo); - - if (workdir && !git__prefixcmp(hintpath, workdir)) - hintpath += strlen(workdir); - - error = git_blob__create_from_paths( - id, NULL, repo, git_buf_cstr(&full_path), hintpath, 0, true); - - git_buf_free(&full_path); - return error; -} - -#define BUFFER_SIZE 4096 - -int git_blob_create_fromchunks( - git_oid *id, - git_repository *repo, - const char *hintpath, - int (*source_cb)(char *content, size_t max_length, void *payload), - void *payload) -{ - int error; - char *content = NULL; - git_filebuf file = GIT_FILEBUF_INIT; - git_buf path = GIT_BUF_INIT; - - assert(id && repo && source_cb); - - if ((error = git_buf_joinpath( - &path, git_repository_path(repo), GIT_OBJECTS_DIR "streamed")) < 0) - goto cleanup; - - content = git__malloc(BUFFER_SIZE); - GITERR_CHECK_ALLOC(content); - - if ((error = git_filebuf_open( - &file, git_buf_cstr(&path), GIT_FILEBUF_TEMPORARY, 0666)) < 0) - goto cleanup; - - while (1) { - int read_bytes = source_cb(content, BUFFER_SIZE, payload); - - if (!read_bytes) - break; - - if (read_bytes > BUFFER_SIZE) { - giterr_set(GITERR_OBJECT, "Invalid chunk size while creating blob"); - error = GIT_EBUFS; - } else if (read_bytes < 0) { - error = giterr_set_after_callback(read_bytes); - } else { - error = git_filebuf_write(&file, content, read_bytes); - } - - if (error < 0) - goto cleanup; - } - - if ((error = git_filebuf_flush(&file)) < 0) - goto cleanup; - - error = git_blob__create_from_paths( - id, NULL, repo, file.path_lock, hintpath, 0, hintpath != NULL); - -cleanup: - git_buf_free(&path); - git_filebuf_cleanup(&file); - git__free(content); - - return error; -} - -int git_blob_is_binary(const git_blob *blob) -{ - git_buf content = GIT_BUF_INIT; - - assert(blob); - - git_buf_attach_notowned(&content, blob->odb_object->buffer, - min(blob->odb_object->cached.size, - GIT_FILTER_BYTES_TO_CHECK_NUL)); - return git_buf_text_is_binary(&content); -} - -int git_blob_filtered_content( - git_buf *out, - git_blob *blob, - const char *path, - int check_for_binary_data) -{ - int error = 0; - git_filter_list *fl = NULL; - - assert(blob && path && out); - - git_buf_sanitize(out); - - if (check_for_binary_data && git_blob_is_binary(blob)) - return 0; - - if (!(error = git_filter_list_load( - &fl, git_blob_owner(blob), blob, path, - GIT_FILTER_TO_WORKTREE, GIT_FILTER_DEFAULT))) { - - error = git_filter_list_apply_to_blob(out, fl, blob); - - git_filter_list_free(fl); - } - - return error; -} diff --git a/vendor/libgit2/src/blob.h b/vendor/libgit2/src/blob.h deleted file mode 100644 index 4cd9f1e0c..000000000 --- a/vendor/libgit2/src/blob.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_blob_h__ -#define INCLUDE_blob_h__ - -#include "git2/blob.h" -#include "repository.h" -#include "odb.h" -#include "fileops.h" - -struct git_blob { - git_object object; - git_odb_object *odb_object; -}; - -void git_blob__free(void *blob); -int git_blob__parse(void *blob, git_odb_object *obj); -int git_blob__getbuf(git_buf *buffer, git_blob *blob); - -extern int git_blob__create_from_paths( - git_oid *out_oid, - struct stat *out_st, - git_repository *repo, - const char *full_path, - const char *hint_path, - mode_t hint_mode, - bool apply_filters); - -#endif diff --git a/vendor/libgit2/src/branch.c b/vendor/libgit2/src/branch.c deleted file mode 100644 index 0dcc14c29..000000000 --- a/vendor/libgit2/src/branch.c +++ /dev/null @@ -1,658 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "common.h" -#include "commit.h" -#include "tag.h" -#include "config.h" -#include "refspec.h" -#include "refs.h" -#include "remote.h" -#include "annotated_commit.h" - -#include "git2/branch.h" - -static int retrieve_branch_reference( - git_reference **branch_reference_out, - git_repository *repo, - const char *branch_name, - int is_remote) -{ - git_reference *branch = NULL; - int error = 0; - char *prefix; - git_buf ref_name = GIT_BUF_INIT; - - prefix = is_remote ? GIT_REFS_REMOTES_DIR : GIT_REFS_HEADS_DIR; - - if ((error = git_buf_joinpath(&ref_name, prefix, branch_name)) < 0) - /* OOM */; - else if ((error = git_reference_lookup(&branch, repo, ref_name.ptr)) < 0) - giterr_set( - GITERR_REFERENCE, "Cannot locate %s branch '%s'", - is_remote ? "remote-tracking" : "local", branch_name); - - *branch_reference_out = branch; /* will be NULL on error */ - - git_buf_free(&ref_name); - return error; -} - -static int not_a_local_branch(const char *reference_name) -{ - giterr_set( - GITERR_INVALID, - "Reference '%s' is not a local branch.", reference_name); - return -1; -} - -static int create_branch( - git_reference **ref_out, - git_repository *repository, - const char *branch_name, - const git_commit *commit, - const char *from, - int force) -{ - int is_head = 0; - git_reference *branch = NULL; - git_buf canonical_branch_name = GIT_BUF_INIT, - log_message = GIT_BUF_INIT; - int error = -1; - - assert(branch_name && commit && ref_out); - assert(git_object_owner((const git_object *)commit) == repository); - - if (force && git_branch_lookup(&branch, repository, branch_name, GIT_BRANCH_LOCAL) == 0) { - error = git_branch_is_head(branch); - git_reference_free(branch); - branch = NULL; - - if (error < 0) - goto cleanup; - - is_head = error; - } - - if (is_head && force) { - giterr_set(GITERR_REFERENCE, "Cannot force update branch '%s' as it is " - "the current HEAD of the repository.", branch_name); - error = -1; - goto cleanup; - } - - if (git_buf_joinpath(&canonical_branch_name, GIT_REFS_HEADS_DIR, branch_name) < 0) - goto cleanup; - - if (git_buf_printf(&log_message, "branch: Created from %s", from) < 0) - goto cleanup; - - error = git_reference_create(&branch, repository, - git_buf_cstr(&canonical_branch_name), git_commit_id(commit), force, - git_buf_cstr(&log_message)); - - if (!error) - *ref_out = branch; - -cleanup: - git_buf_free(&canonical_branch_name); - git_buf_free(&log_message); - return error; -} - -int git_branch_create( - git_reference **ref_out, - git_repository *repository, - const char *branch_name, - const git_commit *commit, - int force) -{ - return create_branch(ref_out, repository, branch_name, commit, git_oid_tostr_s(git_commit_id(commit)), force); -} - -int git_branch_create_from_annotated( - git_reference **ref_out, - git_repository *repository, - const char *branch_name, - const git_annotated_commit *commit, - int force) -{ - return create_branch(ref_out, repository, branch_name, commit->commit, commit->ref_name, force); -} - -int git_branch_delete(git_reference *branch) -{ - int is_head; - git_buf config_section = GIT_BUF_INIT; - int error = -1; - - assert(branch); - - if (!git_reference_is_branch(branch) && !git_reference_is_remote(branch)) { - giterr_set(GITERR_INVALID, "Reference '%s' is not a valid branch.", - git_reference_name(branch)); - return GIT_ENOTFOUND; - } - - if ((is_head = git_branch_is_head(branch)) < 0) - return is_head; - - if (is_head) { - giterr_set(GITERR_REFERENCE, "Cannot delete branch '%s' as it is " - "the current HEAD of the repository.", git_reference_name(branch)); - return -1; - } - - if (git_buf_join(&config_section, '.', "branch", - git_reference_name(branch) + strlen(GIT_REFS_HEADS_DIR)) < 0) - goto on_error; - - if (git_config_rename_section( - git_reference_owner(branch), git_buf_cstr(&config_section), NULL) < 0) - goto on_error; - - error = git_reference_delete(branch); - -on_error: - git_buf_free(&config_section); - return error; -} - -typedef struct { - git_reference_iterator *iter; - unsigned int flags; -} branch_iter; - -int git_branch_next(git_reference **out, git_branch_t *out_type, git_branch_iterator *_iter) -{ - branch_iter *iter = (branch_iter *) _iter; - git_reference *ref; - int error; - - while ((error = git_reference_next(&ref, iter->iter)) == 0) { - if ((iter->flags & GIT_BRANCH_LOCAL) && - !git__prefixcmp(ref->name, GIT_REFS_HEADS_DIR)) { - *out = ref; - *out_type = GIT_BRANCH_LOCAL; - - return 0; - } else if ((iter->flags & GIT_BRANCH_REMOTE) && - !git__prefixcmp(ref->name, GIT_REFS_REMOTES_DIR)) { - *out = ref; - *out_type = GIT_BRANCH_REMOTE; - - return 0; - } else { - git_reference_free(ref); - } - } - - return error; -} - -int git_branch_iterator_new( - git_branch_iterator **out, - git_repository *repo, - git_branch_t list_flags) -{ - branch_iter *iter; - - iter = git__calloc(1, sizeof(branch_iter)); - GITERR_CHECK_ALLOC(iter); - - iter->flags = list_flags; - - if (git_reference_iterator_new(&iter->iter, repo) < 0) { - git__free(iter); - return -1; - } - - *out = (git_branch_iterator *) iter; - - return 0; -} - -void git_branch_iterator_free(git_branch_iterator *_iter) -{ - branch_iter *iter = (branch_iter *) _iter; - - if (iter == NULL) - return; - - git_reference_iterator_free(iter->iter); - git__free(iter); -} - -int git_branch_move( - git_reference **out, - git_reference *branch, - const char *new_branch_name, - int force) -{ - git_buf new_reference_name = GIT_BUF_INIT, - old_config_section = GIT_BUF_INIT, - new_config_section = GIT_BUF_INIT, - log_message = GIT_BUF_INIT; - int error; - - assert(branch && new_branch_name); - - if (!git_reference_is_branch(branch)) - return not_a_local_branch(git_reference_name(branch)); - - if ((error = git_buf_joinpath(&new_reference_name, GIT_REFS_HEADS_DIR, new_branch_name)) < 0) - goto done; - - if ((error = git_buf_printf(&log_message, "branch: renamed %s to %s", - git_reference_name(branch), git_buf_cstr(&new_reference_name))) < 0) - goto done; - - /* first update ref then config so failure won't trash config */ - - error = git_reference_rename( - out, branch, git_buf_cstr(&new_reference_name), force, - git_buf_cstr(&log_message)); - if (error < 0) - goto done; - - git_buf_join(&old_config_section, '.', "branch", - git_reference_name(branch) + strlen(GIT_REFS_HEADS_DIR)); - git_buf_join(&new_config_section, '.', "branch", new_branch_name); - - error = git_config_rename_section( - git_reference_owner(branch), - git_buf_cstr(&old_config_section), - git_buf_cstr(&new_config_section)); - -done: - git_buf_free(&new_reference_name); - git_buf_free(&old_config_section); - git_buf_free(&new_config_section); - git_buf_free(&log_message); - - return error; -} - -int git_branch_lookup( - git_reference **ref_out, - git_repository *repo, - const char *branch_name, - git_branch_t branch_type) -{ - assert(ref_out && repo && branch_name); - - return retrieve_branch_reference(ref_out, repo, branch_name, branch_type == GIT_BRANCH_REMOTE); -} - -int git_branch_name( - const char **out, - const git_reference *ref) -{ - const char *branch_name; - - assert(out && ref); - - branch_name = ref->name; - - if (git_reference_is_branch(ref)) { - branch_name += strlen(GIT_REFS_HEADS_DIR); - } else if (git_reference_is_remote(ref)) { - branch_name += strlen(GIT_REFS_REMOTES_DIR); - } else { - giterr_set(GITERR_INVALID, - "Reference '%s' is neither a local nor a remote branch.", ref->name); - return -1; - } - *out = branch_name; - return 0; -} - -static int retrieve_upstream_configuration( - git_buf *out, - const git_config *config, - const char *canonical_branch_name, - const char *format) -{ - git_buf buf = GIT_BUF_INIT; - int error; - - if (git_buf_printf(&buf, format, - canonical_branch_name + strlen(GIT_REFS_HEADS_DIR)) < 0) - return -1; - - error = git_config_get_string_buf(out, config, git_buf_cstr(&buf)); - git_buf_free(&buf); - return error; -} - -int git_branch_upstream_name( - git_buf *out, - git_repository *repo, - const char *refname) -{ - git_buf remote_name = GIT_BUF_INIT; - git_buf merge_name = GIT_BUF_INIT; - git_buf buf = GIT_BUF_INIT; - int error = -1; - git_remote *remote = NULL; - const git_refspec *refspec; - git_config *config; - - assert(out && refname); - - git_buf_sanitize(out); - - if (!git_reference__is_branch(refname)) - return not_a_local_branch(refname); - - if ((error = git_repository_config_snapshot(&config, repo)) < 0) - return error; - - if ((error = retrieve_upstream_configuration( - &remote_name, config, refname, "branch.%s.remote")) < 0) - goto cleanup; - - if ((error = retrieve_upstream_configuration( - &merge_name, config, refname, "branch.%s.merge")) < 0) - goto cleanup; - - if (git_buf_len(&remote_name) == 0 || git_buf_len(&merge_name) == 0) { - giterr_set(GITERR_REFERENCE, - "branch '%s' does not have an upstream", refname); - error = GIT_ENOTFOUND; - goto cleanup; - } - - if (strcmp(".", git_buf_cstr(&remote_name)) != 0) { - if ((error = git_remote_lookup(&remote, repo, git_buf_cstr(&remote_name))) < 0) - goto cleanup; - - refspec = git_remote__matching_refspec(remote, git_buf_cstr(&merge_name)); - if (!refspec) { - error = GIT_ENOTFOUND; - goto cleanup; - } - - if (git_refspec_transform(&buf, refspec, git_buf_cstr(&merge_name)) < 0) - goto cleanup; - } else - if (git_buf_set(&buf, git_buf_cstr(&merge_name), git_buf_len(&merge_name)) < 0) - goto cleanup; - - error = git_buf_set(out, git_buf_cstr(&buf), git_buf_len(&buf)); - -cleanup: - git_config_free(config); - git_remote_free(remote); - git_buf_free(&remote_name); - git_buf_free(&merge_name); - git_buf_free(&buf); - return error; -} - -int git_branch_upstream_remote(git_buf *buf, git_repository *repo, const char *refname) -{ - int error; - git_config *cfg; - - if (!git_reference__is_branch(refname)) - return not_a_local_branch(refname); - - if ((error = git_repository_config__weakptr(&cfg, repo)) < 0) - return error; - - git_buf_sanitize(buf); - - if ((error = retrieve_upstream_configuration(buf, cfg, refname, "branch.%s.remote")) < 0) - return error; - - if (git_buf_len(buf) == 0) { - giterr_set(GITERR_REFERENCE, "branch '%s' does not have an upstream remote", refname); - error = GIT_ENOTFOUND; - git_buf_clear(buf); - } - - return error; -} - -int git_branch_remote_name(git_buf *buf, git_repository *repo, const char *refname) -{ - git_strarray remote_list = {0}; - size_t i; - git_remote *remote; - const git_refspec *fetchspec; - int error = 0; - char *remote_name = NULL; - - assert(buf && repo && refname); - - git_buf_sanitize(buf); - - /* Verify that this is a remote branch */ - if (!git_reference__is_remote(refname)) { - giterr_set(GITERR_INVALID, "Reference '%s' is not a remote branch.", - refname); - error = GIT_ERROR; - goto cleanup; - } - - /* Get the remotes */ - if ((error = git_remote_list(&remote_list, repo)) < 0) - goto cleanup; - - /* Find matching remotes */ - for (i = 0; i < remote_list.count; i++) { - if ((error = git_remote_lookup(&remote, repo, remote_list.strings[i])) < 0) - continue; - - fetchspec = git_remote__matching_dst_refspec(remote, refname); - if (fetchspec) { - /* If we have not already set out yet, then set - * it to the matching remote name. Otherwise - * multiple remotes match this reference, and it - * is ambiguous. */ - if (!remote_name) { - remote_name = remote_list.strings[i]; - } else { - git_remote_free(remote); - - giterr_set(GITERR_REFERENCE, - "Reference '%s' is ambiguous", refname); - error = GIT_EAMBIGUOUS; - goto cleanup; - } - } - - git_remote_free(remote); - } - - if (remote_name) { - git_buf_clear(buf); - error = git_buf_puts(buf, remote_name); - } else { - giterr_set(GITERR_REFERENCE, - "Could not determine remote for '%s'", refname); - error = GIT_ENOTFOUND; - } - -cleanup: - if (error < 0) - git_buf_free(buf); - - git_strarray_free(&remote_list); - return error; -} - -int git_branch_upstream( - git_reference **tracking_out, - const git_reference *branch) -{ - int error; - git_buf tracking_name = GIT_BUF_INIT; - - if ((error = git_branch_upstream_name(&tracking_name, - git_reference_owner(branch), git_reference_name(branch))) < 0) - return error; - - error = git_reference_lookup( - tracking_out, - git_reference_owner(branch), - git_buf_cstr(&tracking_name)); - - git_buf_free(&tracking_name); - return error; -} - -static int unset_upstream(git_config *config, const char *shortname) -{ - git_buf buf = GIT_BUF_INIT; - - if (git_buf_printf(&buf, "branch.%s.remote", shortname) < 0) - return -1; - - if (git_config_delete_entry(config, git_buf_cstr(&buf)) < 0) - goto on_error; - - git_buf_clear(&buf); - if (git_buf_printf(&buf, "branch.%s.merge", shortname) < 0) - goto on_error; - - if (git_config_delete_entry(config, git_buf_cstr(&buf)) < 0) - goto on_error; - - git_buf_free(&buf); - return 0; - -on_error: - git_buf_free(&buf); - return -1; -} - -int git_branch_set_upstream(git_reference *branch, const char *upstream_name) -{ - git_buf key = GIT_BUF_INIT, value = GIT_BUF_INIT; - git_reference *upstream; - git_repository *repo; - git_remote *remote = NULL; - git_config *config; - const char *name, *shortname; - int local, error; - const git_refspec *fetchspec; - - name = git_reference_name(branch); - if (!git_reference__is_branch(name)) - return not_a_local_branch(name); - - if (git_repository_config__weakptr(&config, git_reference_owner(branch)) < 0) - return -1; - - shortname = name + strlen(GIT_REFS_HEADS_DIR); - - if (upstream_name == NULL) - return unset_upstream(config, shortname); - - repo = git_reference_owner(branch); - - /* First we need to figure out whether it's a branch or remote-tracking */ - if (git_branch_lookup(&upstream, repo, upstream_name, GIT_BRANCH_LOCAL) == 0) - local = 1; - else if (git_branch_lookup(&upstream, repo, upstream_name, GIT_BRANCH_REMOTE) == 0) - local = 0; - else { - giterr_set(GITERR_REFERENCE, - "Cannot set upstream for branch '%s'", shortname); - return GIT_ENOTFOUND; - } - - /* - * If it's local, the remote is "." and the branch name is - * simply the refname. Otherwise we need to figure out what - * the remote-tracking branch's name on the remote is and use - * that. - */ - if (local) - error = git_buf_puts(&value, "."); - else - error = git_branch_remote_name(&value, repo, git_reference_name(upstream)); - - if (error < 0) - goto on_error; - - if (git_buf_printf(&key, "branch.%s.remote", shortname) < 0) - goto on_error; - - if (git_config_set_string(config, git_buf_cstr(&key), git_buf_cstr(&value)) < 0) - goto on_error; - - if (local) { - git_buf_clear(&value); - if (git_buf_puts(&value, git_reference_name(upstream)) < 0) - goto on_error; - } else { - /* Get the remoe-tracking branch's refname in its repo */ - if (git_remote_lookup(&remote, repo, git_buf_cstr(&value)) < 0) - goto on_error; - - fetchspec = git_remote__matching_dst_refspec(remote, git_reference_name(upstream)); - git_buf_clear(&value); - if (!fetchspec || git_refspec_rtransform(&value, fetchspec, git_reference_name(upstream)) < 0) - goto on_error; - - git_remote_free(remote); - remote = NULL; - } - - git_buf_clear(&key); - if (git_buf_printf(&key, "branch.%s.merge", shortname) < 0) - goto on_error; - - if (git_config_set_string(config, git_buf_cstr(&key), git_buf_cstr(&value)) < 0) - goto on_error; - - git_reference_free(upstream); - git_buf_free(&key); - git_buf_free(&value); - - return 0; - -on_error: - git_reference_free(upstream); - git_buf_free(&key); - git_buf_free(&value); - git_remote_free(remote); - - return -1; -} - -int git_branch_is_head( - const git_reference *branch) -{ - git_reference *head; - bool is_same = false; - int error; - - assert(branch); - - if (!git_reference_is_branch(branch)) - return false; - - error = git_repository_head(&head, git_reference_owner(branch)); - - if (error == GIT_EUNBORNBRANCH || error == GIT_ENOTFOUND) - return false; - - if (error < 0) - return -1; - - is_same = strcmp( - git_reference_name(branch), - git_reference_name(head)) == 0; - - git_reference_free(head); - - return is_same; -} diff --git a/vendor/libgit2/src/branch.h b/vendor/libgit2/src/branch.h deleted file mode 100644 index d02f2af0d..000000000 --- a/vendor/libgit2/src/branch.h +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_branch_h__ -#define INCLUDE_branch_h__ - -#include "buffer.h" - -int git_branch_upstream__name( - git_buf *tracking_name, - git_repository *repo, - const char *canonical_branch_name); - -#endif diff --git a/vendor/libgit2/src/buf_text.c b/vendor/libgit2/src/buf_text.c deleted file mode 100644 index 7e6779d2d..000000000 --- a/vendor/libgit2/src/buf_text.c +++ /dev/null @@ -1,315 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#include "buf_text.h" - -int git_buf_text_puts_escaped( - git_buf *buf, - const char *string, - const char *esc_chars, - const char *esc_with) -{ - const char *scan; - size_t total = 0, esc_len = strlen(esc_with), count, alloclen; - - if (!string) - return 0; - - for (scan = string; *scan; ) { - /* count run of non-escaped characters */ - count = strcspn(scan, esc_chars); - total += count; - scan += count; - /* count run of escaped characters */ - count = strspn(scan, esc_chars); - total += count * (esc_len + 1); - scan += count; - } - - GITERR_CHECK_ALLOC_ADD(&alloclen, total, 1); - if (git_buf_grow_by(buf, alloclen) < 0) - return -1; - - for (scan = string; *scan; ) { - count = strcspn(scan, esc_chars); - - memmove(buf->ptr + buf->size, scan, count); - scan += count; - buf->size += count; - - for (count = strspn(scan, esc_chars); count > 0; --count) { - /* copy escape sequence */ - memmove(buf->ptr + buf->size, esc_with, esc_len); - buf->size += esc_len; - /* copy character to be escaped */ - buf->ptr[buf->size] = *scan; - buf->size++; - scan++; - } - } - - buf->ptr[buf->size] = '\0'; - - return 0; -} - -void git_buf_text_unescape(git_buf *buf) -{ - buf->size = git__unescape(buf->ptr); -} - -int git_buf_text_crlf_to_lf(git_buf *tgt, const git_buf *src) -{ - const char *scan = src->ptr; - const char *scan_end = src->ptr + src->size; - const char *next = memchr(scan, '\r', src->size); - size_t new_size; - char *out; - - assert(tgt != src); - - if (!next) - return git_buf_set(tgt, src->ptr, src->size); - - /* reduce reallocs while in the loop */ - GITERR_CHECK_ALLOC_ADD(&new_size, src->size, 1); - if (git_buf_grow(tgt, new_size) < 0) - return -1; - - out = tgt->ptr; - tgt->size = 0; - - /* Find the next \r and copy whole chunk up to there to tgt */ - for (; next; scan = next + 1, next = memchr(scan, '\r', scan_end - scan)) { - if (next > scan) { - size_t copylen = (size_t)(next - scan); - memcpy(out, scan, copylen); - out += copylen; - } - - /* Do not drop \r unless it is followed by \n */ - if (next + 1 == scan_end || next[1] != '\n') - *out++ = '\r'; - } - - /* Copy remaining input into dest */ - if (scan < scan_end) { - size_t remaining = (size_t)(scan_end - scan); - memcpy(out, scan, remaining); - out += remaining; - } - - tgt->size = (size_t)(out - tgt->ptr); - tgt->ptr[tgt->size] = '\0'; - - return 0; -} - -int git_buf_text_lf_to_crlf(git_buf *tgt, const git_buf *src) -{ - const char *start = src->ptr; - const char *end = start + src->size; - const char *scan = start; - const char *next = memchr(scan, '\n', src->size); - size_t alloclen; - - assert(tgt != src); - - if (!next) - return git_buf_set(tgt, src->ptr, src->size); - - /* attempt to reduce reallocs while in the loop */ - GITERR_CHECK_ALLOC_ADD(&alloclen, src->size, src->size >> 4); - GITERR_CHECK_ALLOC_ADD(&alloclen, alloclen, 1); - if (git_buf_grow(tgt, alloclen) < 0) - return -1; - tgt->size = 0; - - for (; next; scan = next + 1, next = memchr(scan, '\n', end - scan)) { - size_t copylen = next - scan; - - /* if we find mixed line endings, carry on */ - if (copylen && next[-1] == '\r') - copylen--; - - GITERR_CHECK_ALLOC_ADD(&alloclen, copylen, 3); - if (git_buf_grow_by(tgt, alloclen) < 0) - return -1; - - if (copylen) { - memcpy(tgt->ptr + tgt->size, scan, copylen); - tgt->size += copylen; - } - - tgt->ptr[tgt->size++] = '\r'; - tgt->ptr[tgt->size++] = '\n'; - } - - tgt->ptr[tgt->size] = '\0'; - return git_buf_put(tgt, scan, end - scan); -} - -int git_buf_text_common_prefix(git_buf *buf, const git_strarray *strings) -{ - size_t i; - const char *str, *pfx; - - git_buf_clear(buf); - - if (!strings || !strings->count) - return 0; - - /* initialize common prefix to first string */ - if (git_buf_sets(buf, strings->strings[0]) < 0) - return -1; - - /* go through the rest of the strings, truncating to shared prefix */ - for (i = 1; i < strings->count; ++i) { - - for (str = strings->strings[i], pfx = buf->ptr; - *str && *str == *pfx; str++, pfx++) - /* scanning */; - - git_buf_truncate(buf, pfx - buf->ptr); - - if (!buf->size) - break; - } - - return 0; -} - -bool git_buf_text_is_binary(const git_buf *buf) -{ - const char *scan = buf->ptr, *end = buf->ptr + buf->size; - git_bom_t bom; - int printable = 0, nonprintable = 0; - - scan += git_buf_text_detect_bom(&bom, buf, 0); - - if (bom > GIT_BOM_UTF8) - return 1; - - while (scan < end) { - unsigned char c = *scan++; - - /* Printable characters are those above SPACE (0x1F) excluding DEL, - * and including BS, ESC and FF. - */ - if ((c > 0x1F && c != 127) || c == '\b' || c == '\033' || c == '\014') - printable++; - else if (c == '\0') - return true; - else if (!git__isspace(c)) - nonprintable++; - } - - return ((printable >> 7) < nonprintable); -} - -bool git_buf_text_contains_nul(const git_buf *buf) -{ - return (memchr(buf->ptr, '\0', buf->size) != NULL); -} - -int git_buf_text_detect_bom(git_bom_t *bom, const git_buf *buf, size_t offset) -{ - const char *ptr; - size_t len; - - *bom = GIT_BOM_NONE; - /* need at least 2 bytes after offset to look for any BOM */ - if (buf->size < offset + 2) - return 0; - - ptr = buf->ptr + offset; - len = buf->size - offset; - - switch (*ptr++) { - case 0: - if (len >= 4 && ptr[0] == 0 && ptr[1] == '\xFE' && ptr[2] == '\xFF') { - *bom = GIT_BOM_UTF32_BE; - return 4; - } - break; - case '\xEF': - if (len >= 3 && ptr[0] == '\xBB' && ptr[1] == '\xBF') { - *bom = GIT_BOM_UTF8; - return 3; - } - break; - case '\xFE': - if (*ptr == '\xFF') { - *bom = GIT_BOM_UTF16_BE; - return 2; - } - break; - case '\xFF': - if (*ptr != '\xFE') - break; - if (len >= 4 && ptr[1] == 0 && ptr[2] == 0) { - *bom = GIT_BOM_UTF32_LE; - return 4; - } else { - *bom = GIT_BOM_UTF16_LE; - return 2; - } - break; - default: - break; - } - - return 0; -} - -bool git_buf_text_gather_stats( - git_buf_text_stats *stats, const git_buf *buf, bool skip_bom) -{ - const char *scan = buf->ptr, *end = buf->ptr + buf->size; - int skip; - - memset(stats, 0, sizeof(*stats)); - - /* BOM detection */ - skip = git_buf_text_detect_bom(&stats->bom, buf, 0); - if (skip_bom) - scan += skip; - - /* Ignore EOF character */ - if (buf->size > 0 && end[-1] == '\032') - end--; - - /* Counting loop */ - while (scan < end) { - unsigned char c = *scan++; - - if (c > 0x1F && c != 0x7F) - stats->printable++; - else switch (c) { - case '\0': - stats->nul++; - stats->nonprintable++; - break; - case '\n': - stats->lf++; - break; - case '\r': - stats->cr++; - if (scan < end && *scan == '\n') - stats->crlf++; - break; - case '\t': case '\f': case '\v': case '\b': case 0x1b: /*ESC*/ - stats->printable++; - break; - default: - stats->nonprintable++; - break; - } - } - - return (stats->nul > 0 || - ((stats->printable >> 7) < stats->nonprintable)); -} diff --git a/vendor/libgit2/src/buf_text.h b/vendor/libgit2/src/buf_text.h deleted file mode 100644 index c9c55af89..000000000 --- a/vendor/libgit2/src/buf_text.h +++ /dev/null @@ -1,122 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_buf_text_h__ -#define INCLUDE_buf_text_h__ - -#include "buffer.h" - -typedef enum { - GIT_BOM_NONE = 0, - GIT_BOM_UTF8 = 1, - GIT_BOM_UTF16_LE = 2, - GIT_BOM_UTF16_BE = 3, - GIT_BOM_UTF32_LE = 4, - GIT_BOM_UTF32_BE = 5 -} git_bom_t; - -typedef struct { - git_bom_t bom; /* BOM found at head of text */ - unsigned int nul, cr, lf, crlf; /* NUL, CR, LF and CRLF counts */ - unsigned int printable, nonprintable; /* These are just approximations! */ -} git_buf_text_stats; - -/** - * Append string to buffer, prefixing each character from `esc_chars` with - * `esc_with` string. - * - * @param buf Buffer to append data to - * @param string String to escape and append - * @param esc_chars Characters to be escaped - * @param esc_with String to insert in from of each found character - * @return 0 on success, <0 on failure (probably allocation problem) - */ -extern int git_buf_text_puts_escaped( - git_buf *buf, - const char *string, - const char *esc_chars, - const char *esc_with); - -/** - * Append string escaping characters that are regex special - */ -GIT_INLINE(int) git_buf_text_puts_escape_regex(git_buf *buf, const char *string) -{ - return git_buf_text_puts_escaped(buf, string, "^.[]$()|*+?{}\\", "\\"); -} - -/** - * Unescape all characters in a buffer in place - * - * I.e. remove backslashes - */ -extern void git_buf_text_unescape(git_buf *buf); - -/** - * Replace all \r\n with \n. - * - * @return 0 on success, -1 on memory error - */ -extern int git_buf_text_crlf_to_lf(git_buf *tgt, const git_buf *src); - -/** - * Replace all \n with \r\n. Does not modify existing \r\n. - * - * @return 0 on success, -1 on memory error - */ -extern int git_buf_text_lf_to_crlf(git_buf *tgt, const git_buf *src); - -/** - * Fill buffer with the common prefix of a array of strings - * - * Buffer will be set to empty if there is no common prefix - */ -extern int git_buf_text_common_prefix(git_buf *buf, const git_strarray *strs); - -/** - * Check quickly if buffer looks like it contains binary data - * - * @param buf Buffer to check - * @return true if buffer looks like non-text data - */ -extern bool git_buf_text_is_binary(const git_buf *buf); - -/** - * Check quickly if buffer contains a NUL byte - * - * @param buf Buffer to check - * @return true if buffer contains a NUL byte - */ -extern bool git_buf_text_contains_nul(const git_buf *buf); - -/** - * Check if a buffer begins with a UTF BOM - * - * @param bom Set to the type of BOM detected or GIT_BOM_NONE - * @param buf Buffer in which to check the first bytes for a BOM - * @param offset Offset into buffer to look for BOM - * @return Number of bytes of BOM data (or 0 if no BOM found) - */ -extern int git_buf_text_detect_bom( - git_bom_t *bom, const git_buf *buf, size_t offset); - -/** - * Gather stats for a piece of text - * - * Fill the `stats` structure with counts of unreadable characters, carriage - * returns, etc, so it can be used in heuristics. This automatically skips - * a trailing EOF (\032 character). Also it will look for a BOM at the - * start of the text and can be told to skip that as well. - * - * @param stats Structure to be filled in - * @param buf Text to process - * @param skip_bom Exclude leading BOM from stats if true - * @return Does the buffer heuristically look like binary data - */ -extern bool git_buf_text_gather_stats( - git_buf_text_stats *stats, const git_buf *buf, bool skip_bom); - -#endif diff --git a/vendor/libgit2/src/buffer.c b/vendor/libgit2/src/buffer.c deleted file mode 100644 index 1a5809cca..000000000 --- a/vendor/libgit2/src/buffer.c +++ /dev/null @@ -1,768 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#include "buffer.h" -#include "posix.h" -#include "git2/buffer.h" -#include "buf_text.h" -#include - -/* Used as default value for git_buf->ptr so that people can always - * assume ptr is non-NULL and zero terminated even for new git_bufs. - */ -char git_buf__initbuf[1]; - -char git_buf__oom[1]; - -#define ENSURE_SIZE(b, d) \ - if ((d) > buf->asize && git_buf_grow(b, (d)) < 0)\ - return -1; - - -void git_buf_init(git_buf *buf, size_t initial_size) -{ - buf->asize = 0; - buf->size = 0; - buf->ptr = git_buf__initbuf; - - if (initial_size) - git_buf_grow(buf, initial_size); -} - -int git_buf_try_grow( - git_buf *buf, size_t target_size, bool mark_oom) -{ - char *new_ptr; - size_t new_size; - - if (buf->ptr == git_buf__oom) - return -1; - - if (buf->asize == 0 && buf->size != 0) { - giterr_set(GITERR_INVALID, "cannot grow a borrowed buffer"); - return GIT_EINVALID; - } - - if (!target_size) - target_size = buf->size; - - if (target_size <= buf->asize) - return 0; - - if (buf->asize == 0) { - new_size = target_size; - new_ptr = NULL; - } else { - new_size = buf->asize; - new_ptr = buf->ptr; - } - - /* grow the buffer size by 1.5, until it's big enough - * to fit our target size */ - while (new_size < target_size) - new_size = (new_size << 1) - (new_size >> 1); - - /* round allocation up to multiple of 8 */ - new_size = (new_size + 7) & ~7; - - if (new_size < buf->size) { - if (mark_oom) - buf->ptr = git_buf__oom; - - giterr_set_oom(); - return -1; - } - - new_ptr = git__realloc(new_ptr, new_size); - - if (!new_ptr) { - if (mark_oom) { - if (buf->ptr && (buf->ptr != git_buf__initbuf)) - git__free(buf->ptr); - buf->ptr = git_buf__oom; - } - return -1; - } - - buf->asize = new_size; - buf->ptr = new_ptr; - - /* truncate the existing buffer size if necessary */ - if (buf->size >= buf->asize) - buf->size = buf->asize - 1; - buf->ptr[buf->size] = '\0'; - - return 0; -} - -int git_buf_grow(git_buf *buffer, size_t target_size) -{ - return git_buf_try_grow(buffer, target_size, true); -} - -int git_buf_grow_by(git_buf *buffer, size_t additional_size) -{ - size_t newsize; - - if (GIT_ADD_SIZET_OVERFLOW(&newsize, buffer->size, additional_size)) { - buffer->ptr = git_buf__oom; - return -1; - } - - return git_buf_try_grow(buffer, newsize, true); -} - -void git_buf_free(git_buf *buf) -{ - if (!buf) return; - - if (buf->asize > 0 && buf->ptr != NULL && buf->ptr != git_buf__oom) - git__free(buf->ptr); - - git_buf_init(buf, 0); -} - -void git_buf_sanitize(git_buf *buf) -{ - if (buf->ptr == NULL) { - assert(buf->size == 0 && buf->asize == 0); - buf->ptr = git_buf__initbuf; - } else if (buf->asize > buf->size) - buf->ptr[buf->size] = '\0'; -} - -void git_buf_clear(git_buf *buf) -{ - buf->size = 0; - - if (!buf->ptr) { - buf->ptr = git_buf__initbuf; - buf->asize = 0; - } - - if (buf->asize > 0) - buf->ptr[0] = '\0'; -} - -int git_buf_set(git_buf *buf, const void *data, size_t len) -{ - size_t alloclen; - - if (len == 0 || data == NULL) { - git_buf_clear(buf); - } else { - if (data != buf->ptr) { - GITERR_CHECK_ALLOC_ADD(&alloclen, len, 1); - ENSURE_SIZE(buf, alloclen); - memmove(buf->ptr, data, len); - } - - buf->size = len; - if (buf->asize > buf->size) - buf->ptr[buf->size] = '\0'; - - } - return 0; -} - -int git_buf_is_binary(const git_buf *buf) -{ - return git_buf_text_is_binary(buf); -} - -int git_buf_contains_nul(const git_buf *buf) -{ - return git_buf_text_contains_nul(buf); -} - -int git_buf_sets(git_buf *buf, const char *string) -{ - return git_buf_set(buf, string, string ? strlen(string) : 0); -} - -int git_buf_putc(git_buf *buf, char c) -{ - size_t new_size; - GITERR_CHECK_ALLOC_ADD(&new_size, buf->size, 2); - ENSURE_SIZE(buf, new_size); - buf->ptr[buf->size++] = c; - buf->ptr[buf->size] = '\0'; - return 0; -} - -int git_buf_putcn(git_buf *buf, char c, size_t len) -{ - size_t new_size; - GITERR_CHECK_ALLOC_ADD(&new_size, buf->size, len); - GITERR_CHECK_ALLOC_ADD(&new_size, new_size, 1); - ENSURE_SIZE(buf, new_size); - memset(buf->ptr + buf->size, c, len); - buf->size += len; - buf->ptr[buf->size] = '\0'; - return 0; -} - -int git_buf_put(git_buf *buf, const char *data, size_t len) -{ - if (len) { - size_t new_size; - - assert(data); - - GITERR_CHECK_ALLOC_ADD(&new_size, buf->size, len); - GITERR_CHECK_ALLOC_ADD(&new_size, new_size, 1); - ENSURE_SIZE(buf, new_size); - memmove(buf->ptr + buf->size, data, len); - buf->size += len; - buf->ptr[buf->size] = '\0'; - } - return 0; -} - -int git_buf_puts(git_buf *buf, const char *string) -{ - assert(string); - return git_buf_put(buf, string, strlen(string)); -} - -static const char base64_encode[] = - "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; - -int git_buf_encode_base64(git_buf *buf, const char *data, size_t len) -{ - size_t extra = len % 3; - uint8_t *write, a, b, c; - const uint8_t *read = (const uint8_t *)data; - size_t blocks = (len / 3) + !!extra, alloclen; - - GITERR_CHECK_ALLOC_ADD(&blocks, blocks, 1); - GITERR_CHECK_ALLOC_MULTIPLY(&alloclen, blocks, 4); - GITERR_CHECK_ALLOC_ADD(&alloclen, alloclen, buf->size); - - ENSURE_SIZE(buf, alloclen); - write = (uint8_t *)&buf->ptr[buf->size]; - - /* convert each run of 3 bytes into 4 output bytes */ - for (len -= extra; len > 0; len -= 3) { - a = *read++; - b = *read++; - c = *read++; - - *write++ = base64_encode[a >> 2]; - *write++ = base64_encode[(a & 0x03) << 4 | b >> 4]; - *write++ = base64_encode[(b & 0x0f) << 2 | c >> 6]; - *write++ = base64_encode[c & 0x3f]; - } - - if (extra > 0) { - a = *read++; - b = (extra > 1) ? *read++ : 0; - - *write++ = base64_encode[a >> 2]; - *write++ = base64_encode[(a & 0x03) << 4 | b >> 4]; - *write++ = (extra > 1) ? base64_encode[(b & 0x0f) << 2] : '='; - *write++ = '='; - } - - buf->size = ((char *)write) - buf->ptr; - buf->ptr[buf->size] = '\0'; - - return 0; -} - -/* The inverse of base64_encode, offset by '+' == 43. */ -static const int8_t base64_decode[] = { - 62, - -1, -1, -1, - 63, - 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, - -1, -1, -1, 0, -1, -1, -1, - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, - 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, - -1, -1, -1, -1, -1, -1, - 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, - 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51 -}; - -#define BASE64_DECODE_VALUE(c) (((c) < 43 || (c) > 122) ? -1 : base64_decode[c - 43]) - -int git_buf_decode_base64(git_buf *buf, const char *base64, size_t len) -{ - size_t i; - int8_t a, b, c, d; - size_t orig_size = buf->size, new_size; - - assert(len % 4 == 0); - GITERR_CHECK_ALLOC_ADD(&new_size, (len / 4 * 3), buf->size); - GITERR_CHECK_ALLOC_ADD(&new_size, new_size, 1); - ENSURE_SIZE(buf, new_size); - - for (i = 0; i < len; i += 4) { - if ((a = BASE64_DECODE_VALUE(base64[i])) < 0 || - (b = BASE64_DECODE_VALUE(base64[i+1])) < 0 || - (c = BASE64_DECODE_VALUE(base64[i+2])) < 0 || - (d = BASE64_DECODE_VALUE(base64[i+3])) < 0) { - buf->size = orig_size; - buf->ptr[buf->size] = '\0'; - - giterr_set(GITERR_INVALID, "Invalid base64 input"); - return -1; - } - - buf->ptr[buf->size++] = ((a << 2) | (b & 0x30) >> 4); - buf->ptr[buf->size++] = ((b & 0x0f) << 4) | ((c & 0x3c) >> 2); - buf->ptr[buf->size++] = (c & 0x03) << 6 | (d & 0x3f); - } - - buf->ptr[buf->size] = '\0'; - return 0; -} - -static const char b85str[] = - "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz!#$%&()*+-;<=>?@^_`{|}~"; - -int git_buf_encode_base85(git_buf *buf, const char *data, size_t len) -{ - size_t blocks = (len / 4) + !!(len % 4), alloclen; - - GITERR_CHECK_ALLOC_MULTIPLY(&alloclen, blocks, 5); - GITERR_CHECK_ALLOC_ADD(&alloclen, alloclen, buf->size); - GITERR_CHECK_ALLOC_ADD(&alloclen, alloclen, 1); - - ENSURE_SIZE(buf, alloclen); - - while (len) { - uint32_t acc = 0; - char b85[5]; - int i; - - for (i = 24; i >= 0; i -= 8) { - uint8_t ch = *data++; - acc |= ch << i; - - if (--len == 0) - break; - } - - for (i = 4; i >= 0; i--) { - int val = acc % 85; - acc /= 85; - - b85[i] = b85str[val]; - } - - for (i = 0; i < 5; i++) - buf->ptr[buf->size++] = b85[i]; - } - - buf->ptr[buf->size] = '\0'; - - return 0; -} - -int git_buf_vprintf(git_buf *buf, const char *format, va_list ap) -{ - size_t expected_size, new_size; - int len; - - GITERR_CHECK_ALLOC_MULTIPLY(&expected_size, strlen(format), 2); - GITERR_CHECK_ALLOC_ADD(&expected_size, expected_size, buf->size); - ENSURE_SIZE(buf, expected_size); - - while (1) { - va_list args; - va_copy(args, ap); - - len = p_vsnprintf( - buf->ptr + buf->size, - buf->asize - buf->size, - format, args - ); - - va_end(args); - - if (len < 0) { - git__free(buf->ptr); - buf->ptr = git_buf__oom; - return -1; - } - - if ((size_t)len + 1 <= buf->asize - buf->size) { - buf->size += len; - break; - } - - GITERR_CHECK_ALLOC_ADD(&new_size, buf->size, len); - GITERR_CHECK_ALLOC_ADD(&new_size, new_size, 1); - ENSURE_SIZE(buf, new_size); - } - - return 0; -} - -int git_buf_printf(git_buf *buf, const char *format, ...) -{ - int r; - va_list ap; - - va_start(ap, format); - r = git_buf_vprintf(buf, format, ap); - va_end(ap); - - return r; -} - -void git_buf_copy_cstr(char *data, size_t datasize, const git_buf *buf) -{ - size_t copylen; - - assert(data && datasize && buf); - - data[0] = '\0'; - - if (buf->size == 0 || buf->asize <= 0) - return; - - copylen = buf->size; - if (copylen > datasize - 1) - copylen = datasize - 1; - memmove(data, buf->ptr, copylen); - data[copylen] = '\0'; -} - -void git_buf_consume(git_buf *buf, const char *end) -{ - if (end > buf->ptr && end <= buf->ptr + buf->size) { - size_t consumed = end - buf->ptr; - memmove(buf->ptr, end, buf->size - consumed); - buf->size -= consumed; - buf->ptr[buf->size] = '\0'; - } -} - -void git_buf_truncate(git_buf *buf, size_t len) -{ - if (len >= buf->size) - return; - - buf->size = len; - if (buf->size < buf->asize) - buf->ptr[buf->size] = '\0'; -} - -void git_buf_shorten(git_buf *buf, size_t amount) -{ - if (buf->size > amount) - git_buf_truncate(buf, buf->size - amount); - else - git_buf_clear(buf); -} - -void git_buf_rtruncate_at_char(git_buf *buf, char separator) -{ - ssize_t idx = git_buf_rfind_next(buf, separator); - git_buf_truncate(buf, idx < 0 ? 0 : (size_t)idx); -} - -void git_buf_swap(git_buf *buf_a, git_buf *buf_b) -{ - git_buf t = *buf_a; - *buf_a = *buf_b; - *buf_b = t; -} - -char *git_buf_detach(git_buf *buf) -{ - char *data = buf->ptr; - - if (buf->asize == 0 || buf->ptr == git_buf__oom) - return NULL; - - git_buf_init(buf, 0); - - return data; -} - -void git_buf_attach(git_buf *buf, char *ptr, size_t asize) -{ - git_buf_free(buf); - - if (ptr) { - buf->ptr = ptr; - buf->size = strlen(ptr); - if (asize) - buf->asize = (asize < buf->size) ? buf->size + 1 : asize; - else /* pass 0 to fall back on strlen + 1 */ - buf->asize = buf->size + 1; - } else { - git_buf_grow(buf, asize); - } -} - -void git_buf_attach_notowned(git_buf *buf, const char *ptr, size_t size) -{ - if (git_buf_is_allocated(buf)) - git_buf_free(buf); - - if (!size) { - git_buf_init(buf, 0); - } else { - buf->ptr = (char *)ptr; - buf->asize = 0; - buf->size = size; - } -} - -int git_buf_join_n(git_buf *buf, char separator, int nbuf, ...) -{ - va_list ap; - int i; - size_t total_size = 0, original_size = buf->size; - char *out, *original = buf->ptr; - - if (buf->size > 0 && buf->ptr[buf->size - 1] != separator) - ++total_size; /* space for initial separator */ - - /* Make two passes to avoid multiple reallocation */ - - va_start(ap, nbuf); - for (i = 0; i < nbuf; ++i) { - const char* segment; - size_t segment_len; - - segment = va_arg(ap, const char *); - if (!segment) - continue; - - segment_len = strlen(segment); - - GITERR_CHECK_ALLOC_ADD(&total_size, total_size, segment_len); - - if (segment_len == 0 || segment[segment_len - 1] != separator) - GITERR_CHECK_ALLOC_ADD(&total_size, total_size, 1); - } - va_end(ap); - - /* expand buffer if needed */ - if (total_size == 0) - return 0; - - GITERR_CHECK_ALLOC_ADD(&total_size, total_size, 1); - if (git_buf_grow_by(buf, total_size) < 0) - return -1; - - out = buf->ptr + buf->size; - - /* append separator to existing buf if needed */ - if (buf->size > 0 && out[-1] != separator) - *out++ = separator; - - va_start(ap, nbuf); - for (i = 0; i < nbuf; ++i) { - const char* segment; - size_t segment_len; - - segment = va_arg(ap, const char *); - if (!segment) - continue; - - /* deal with join that references buffer's original content */ - if (segment >= original && segment < original + original_size) { - size_t offset = (segment - original); - segment = buf->ptr + offset; - segment_len = original_size - offset; - } else { - segment_len = strlen(segment); - } - - /* skip leading separators */ - if (out > buf->ptr && out[-1] == separator) - while (segment_len > 0 && *segment == separator) { - segment++; - segment_len--; - } - - /* copy over next buffer */ - if (segment_len > 0) { - memmove(out, segment, segment_len); - out += segment_len; - } - - /* append trailing separator (except for last item) */ - if (i < nbuf - 1 && out > buf->ptr && out[-1] != separator) - *out++ = separator; - } - va_end(ap); - - /* set size based on num characters actually written */ - buf->size = out - buf->ptr; - buf->ptr[buf->size] = '\0'; - - return 0; -} - -int git_buf_join( - git_buf *buf, - char separator, - const char *str_a, - const char *str_b) -{ - size_t strlen_a = str_a ? strlen(str_a) : 0; - size_t strlen_b = strlen(str_b); - size_t alloc_len; - int need_sep = 0; - ssize_t offset_a = -1; - - /* not safe to have str_b point internally to the buffer */ - assert(str_b < buf->ptr || str_b >= buf->ptr + buf->size); - - /* figure out if we need to insert a separator */ - if (separator && strlen_a) { - while (*str_b == separator) { str_b++; strlen_b--; } - if (str_a[strlen_a - 1] != separator) - need_sep = 1; - } - - /* str_a could be part of the buffer */ - if (str_a >= buf->ptr && str_a < buf->ptr + buf->size) - offset_a = str_a - buf->ptr; - - GITERR_CHECK_ALLOC_ADD(&alloc_len, strlen_a, strlen_b); - GITERR_CHECK_ALLOC_ADD(&alloc_len, alloc_len, need_sep); - GITERR_CHECK_ALLOC_ADD(&alloc_len, alloc_len, 1); - if (git_buf_grow(buf, alloc_len) < 0) - return -1; - assert(buf->ptr); - - /* fix up internal pointers */ - if (offset_a >= 0) - str_a = buf->ptr + offset_a; - - /* do the actual copying */ - if (offset_a != 0 && str_a) - memmove(buf->ptr, str_a, strlen_a); - if (need_sep) - buf->ptr[strlen_a] = separator; - memcpy(buf->ptr + strlen_a + need_sep, str_b, strlen_b); - - buf->size = strlen_a + strlen_b + need_sep; - buf->ptr[buf->size] = '\0'; - - return 0; -} - -int git_buf_join3( - git_buf *buf, - char separator, - const char *str_a, - const char *str_b, - const char *str_c) -{ - size_t len_a = strlen(str_a), - len_b = strlen(str_b), - len_c = strlen(str_c), - len_total; - int sep_a = 0, sep_b = 0; - char *tgt; - - /* for this function, disallow pointers into the existing buffer */ - assert(str_a < buf->ptr || str_a >= buf->ptr + buf->size); - assert(str_b < buf->ptr || str_b >= buf->ptr + buf->size); - assert(str_c < buf->ptr || str_c >= buf->ptr + buf->size); - - if (separator) { - if (len_a > 0) { - while (*str_b == separator) { str_b++; len_b--; } - sep_a = (str_a[len_a - 1] != separator); - } - if (len_a > 0 || len_b > 0) - while (*str_c == separator) { str_c++; len_c--; } - if (len_b > 0) - sep_b = (str_b[len_b - 1] != separator); - } - - GITERR_CHECK_ALLOC_ADD(&len_total, len_a, sep_a); - GITERR_CHECK_ALLOC_ADD(&len_total, len_total, len_b); - GITERR_CHECK_ALLOC_ADD(&len_total, len_total, sep_b); - GITERR_CHECK_ALLOC_ADD(&len_total, len_total, len_c); - GITERR_CHECK_ALLOC_ADD(&len_total, len_total, 1); - if (git_buf_grow(buf, len_total) < 0) - return -1; - - tgt = buf->ptr; - - if (len_a) { - memcpy(tgt, str_a, len_a); - tgt += len_a; - } - if (sep_a) - *tgt++ = separator; - if (len_b) { - memcpy(tgt, str_b, len_b); - tgt += len_b; - } - if (sep_b) - *tgt++ = separator; - if (len_c) - memcpy(tgt, str_c, len_c); - - buf->size = len_a + sep_a + len_b + sep_b + len_c; - buf->ptr[buf->size] = '\0'; - - return 0; -} - -void git_buf_rtrim(git_buf *buf) -{ - while (buf->size > 0) { - if (!git__isspace(buf->ptr[buf->size - 1])) - break; - - buf->size--; - } - - if (buf->asize > buf->size) - buf->ptr[buf->size] = '\0'; -} - -int git_buf_cmp(const git_buf *a, const git_buf *b) -{ - int result = memcmp(a->ptr, b->ptr, min(a->size, b->size)); - return (result != 0) ? result : - (a->size < b->size) ? -1 : (a->size > b->size) ? 1 : 0; -} - -int git_buf_splice( - git_buf *buf, - size_t where, - size_t nb_to_remove, - const char *data, - size_t nb_to_insert) -{ - char *splice_loc; - size_t new_size, alloc_size; - - assert(buf && where <= buf->size && nb_to_remove <= buf->size - where); - - splice_loc = buf->ptr + where; - - /* Ported from git.git - * https://github.com/git/git/blob/16eed7c/strbuf.c#L159-176 - */ - GITERR_CHECK_ALLOC_ADD(&new_size, (buf->size - nb_to_remove), nb_to_insert); - GITERR_CHECK_ALLOC_ADD(&alloc_size, new_size, 1); - ENSURE_SIZE(buf, alloc_size); - - memmove(splice_loc + nb_to_insert, - splice_loc + nb_to_remove, - buf->size - where - nb_to_remove); - - memcpy(splice_loc, data, nb_to_insert); - - buf->size = new_size; - buf->ptr[buf->size] = '\0'; - return 0; -} diff --git a/vendor/libgit2/src/buffer.h b/vendor/libgit2/src/buffer.h deleted file mode 100644 index e46ee5dd7..000000000 --- a/vendor/libgit2/src/buffer.h +++ /dev/null @@ -1,209 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_buffer_h__ -#define INCLUDE_buffer_h__ - -#include "common.h" -#include "git2/strarray.h" -#include "git2/buffer.h" - -/* typedef struct { - * char *ptr; - * size_t asize, size; - * } git_buf; - */ - -extern char git_buf__initbuf[]; -extern char git_buf__oom[]; - -/* Use to initialize buffer structure when git_buf is on stack */ -#define GIT_BUF_INIT { git_buf__initbuf, 0, 0 } - -GIT_INLINE(bool) git_buf_is_allocated(const git_buf *buf) -{ - return (buf->ptr != NULL && buf->asize > 0); -} - -/** - * Initialize a git_buf structure. - * - * For the cases where GIT_BUF_INIT cannot be used to do static - * initialization. - */ -extern void git_buf_init(git_buf *buf, size_t initial_size); - -/** - * Resize the buffer allocation to make more space. - * - * This will attempt to grow the buffer to accommodate the additional size. - * It is similar to `git_buf_grow`, but performs the new size calculation, - * checking for overflow. - * - * Like `git_buf_grow`, if this is a user-supplied buffer, this will allocate - * a new buffer. - */ -extern int git_buf_grow_by(git_buf *buffer, size_t additional_size); - -/** - * Attempt to grow the buffer to hold at least `target_size` bytes. - * - * If the allocation fails, this will return an error. If `mark_oom` is true, - * this will mark the buffer as invalid for future operations; if false, - * existing buffer content will be preserved, but calling code must handle - * that buffer was not expanded. If `preserve_external` is true, then any - * existing data pointed to be `ptr` even if `asize` is zero will be copied - * into the newly allocated buffer. - */ -extern int git_buf_try_grow( - git_buf *buf, size_t target_size, bool mark_oom); - -/** - * Sanitizes git_buf structures provided from user input. Users of the - * library, when providing git_buf's, may wish to provide a NULL ptr for - * ease of handling. The buffer routines, however, expect a non-NULL ptr - * always. This helper method simply handles NULL input, converting to a - * git_buf__initbuf. - */ -extern void git_buf_sanitize(git_buf *buf); - -extern void git_buf_swap(git_buf *buf_a, git_buf *buf_b); -extern char *git_buf_detach(git_buf *buf); -extern void git_buf_attach(git_buf *buf, char *ptr, size_t asize); - -/* Populates a `git_buf` where the contents are not "owned" by the - * buffer, and calls to `git_buf_free` will not free the given buf. - */ -extern void git_buf_attach_notowned( - git_buf *buf, const char *ptr, size_t size); - -/** - * Test if there have been any reallocation failures with this git_buf. - * - * Any function that writes to a git_buf can fail due to memory allocation - * issues. If one fails, the git_buf will be marked with an OOM error and - * further calls to modify the buffer will fail. Check git_buf_oom() at the - * end of your sequence and it will be true if you ran out of memory at any - * point with that buffer. - * - * @return false if no error, true if allocation error - */ -GIT_INLINE(bool) git_buf_oom(const git_buf *buf) -{ - return (buf->ptr == git_buf__oom); -} - -/* - * Functions below that return int value error codes will return 0 on - * success or -1 on failure (which generally means an allocation failed). - * Using a git_buf where the allocation has failed with result in -1 from - * all further calls using that buffer. As a result, you can ignore the - * return code of these functions and call them in a series then just call - * git_buf_oom at the end. - */ -int git_buf_sets(git_buf *buf, const char *string); -int git_buf_putc(git_buf *buf, char c); -int git_buf_putcn(git_buf *buf, char c, size_t len); -int git_buf_put(git_buf *buf, const char *data, size_t len); -int git_buf_puts(git_buf *buf, const char *string); -int git_buf_printf(git_buf *buf, const char *format, ...) GIT_FORMAT_PRINTF(2, 3); -int git_buf_vprintf(git_buf *buf, const char *format, va_list ap); -void git_buf_clear(git_buf *buf); -void git_buf_consume(git_buf *buf, const char *end); -void git_buf_truncate(git_buf *buf, size_t len); -void git_buf_shorten(git_buf *buf, size_t amount); -void git_buf_rtruncate_at_char(git_buf *path, char separator); - -/** General join with separator */ -int git_buf_join_n(git_buf *buf, char separator, int nbuf, ...); -/** Fast join of two strings - first may legally point into `buf` data */ -int git_buf_join(git_buf *buf, char separator, const char *str_a, const char *str_b); -/** Fast join of three strings - cannot reference `buf` data */ -int git_buf_join3(git_buf *buf, char separator, const char *str_a, const char *str_b, const char *str_c); - -/** - * Join two strings as paths, inserting a slash between as needed. - * @return 0 on success, -1 on failure - */ -GIT_INLINE(int) git_buf_joinpath(git_buf *buf, const char *a, const char *b) -{ - return git_buf_join(buf, '/', a, b); -} - -GIT_INLINE(const char *) git_buf_cstr(const git_buf *buf) -{ - return buf->ptr; -} - -GIT_INLINE(size_t) git_buf_len(const git_buf *buf) -{ - return buf->size; -} - -void git_buf_copy_cstr(char *data, size_t datasize, const git_buf *buf); - -#define git_buf_PUTS(buf, str) git_buf_put(buf, str, sizeof(str) - 1) - -GIT_INLINE(ssize_t) git_buf_rfind_next(const git_buf *buf, char ch) -{ - ssize_t idx = (ssize_t)buf->size - 1; - while (idx >= 0 && buf->ptr[idx] == ch) idx--; - while (idx >= 0 && buf->ptr[idx] != ch) idx--; - return idx; -} - -GIT_INLINE(ssize_t) git_buf_rfind(const git_buf *buf, char ch) -{ - ssize_t idx = (ssize_t)buf->size - 1; - while (idx >= 0 && buf->ptr[idx] != ch) idx--; - return idx; -} - -GIT_INLINE(ssize_t) git_buf_find(const git_buf *buf, char ch) -{ - void *found = memchr(buf->ptr, ch, buf->size); - return found ? (ssize_t)((const char *)found - buf->ptr) : -1; -} - -/* Remove whitespace from the end of the buffer */ -void git_buf_rtrim(git_buf *buf); - -int git_buf_cmp(const git_buf *a, const git_buf *b); - -/* Write data as base64 encoded in buffer */ -int git_buf_encode_base64(git_buf *buf, const char *data, size_t len); -/* Decode the given bas64 and write the result to the buffer */ -int git_buf_decode_base64(git_buf *buf, const char *base64, size_t len); - -/* Write data as "base85" encoded in buffer */ -int git_buf_encode_base85(git_buf *buf, const char *data, size_t len); - -/* - * Insert, remove or replace a portion of the buffer. - * - * @param buf The buffer to work with - * - * @param where The location in the buffer where the transformation - * should be applied. - * - * @param nb_to_remove The number of chars to be removed. 0 to not - * remove any character in the buffer. - * - * @param data A pointer to the data which should be inserted. - * - * @param nb_to_insert The number of chars to be inserted. 0 to not - * insert any character from the buffer. - * - * @return 0 or an error code. - */ -int git_buf_splice( - git_buf *buf, - size_t where, - size_t nb_to_remove, - const char *data, - size_t nb_to_insert); - -#endif diff --git a/vendor/libgit2/src/cache.c b/vendor/libgit2/src/cache.c deleted file mode 100644 index ca5173c0d..000000000 --- a/vendor/libgit2/src/cache.c +++ /dev/null @@ -1,281 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "common.h" -#include "repository.h" -#include "commit.h" -#include "thread-utils.h" -#include "util.h" -#include "cache.h" -#include "odb.h" -#include "object.h" -#include "git2/oid.h" - -GIT__USE_OIDMAP - -bool git_cache__enabled = true; -ssize_t git_cache__max_storage = (256 * 1024 * 1024); -git_atomic_ssize git_cache__current_storage = {0}; - -static size_t git_cache__max_object_size[8] = { - 0, /* GIT_OBJ__EXT1 */ - 4096, /* GIT_OBJ_COMMIT */ - 4096, /* GIT_OBJ_TREE */ - 0, /* GIT_OBJ_BLOB */ - 4096, /* GIT_OBJ_TAG */ - 0, /* GIT_OBJ__EXT2 */ - 0, /* GIT_OBJ_OFS_DELTA */ - 0 /* GIT_OBJ_REF_DELTA */ -}; - -int git_cache_set_max_object_size(git_otype type, size_t size) -{ - if (type < 0 || (size_t)type >= ARRAY_SIZE(git_cache__max_object_size)) { - giterr_set(GITERR_INVALID, "type out of range"); - return -1; - } - - git_cache__max_object_size[type] = size; - return 0; -} - -void git_cache_dump_stats(git_cache *cache) -{ - git_cached_obj *object; - - if (kh_size(cache->map) == 0) - return; - - printf("Cache %p: %d items cached, %"PRIdZ" bytes\n", - cache, kh_size(cache->map), cache->used_memory); - - kh_foreach_value(cache->map, object, { - char oid_str[9]; - printf(" %s%c %s (%"PRIuZ")\n", - git_object_type2string(object->type), - object->flags == GIT_CACHE_STORE_PARSED ? '*' : ' ', - git_oid_tostr(oid_str, sizeof(oid_str), &object->oid), - object->size - ); - }); -} - -int git_cache_init(git_cache *cache) -{ - memset(cache, 0, sizeof(*cache)); - cache->map = git_oidmap_alloc(); - GITERR_CHECK_ALLOC(cache->map); - if (git_rwlock_init(&cache->lock)) { - giterr_set(GITERR_OS, "Failed to initialize cache rwlock"); - return -1; - } - return 0; -} - -/* called with lock */ -static void clear_cache(git_cache *cache) -{ - git_cached_obj *evict = NULL; - - if (kh_size(cache->map) == 0) - return; - - kh_foreach_value(cache->map, evict, { - git_cached_obj_decref(evict); - }); - - kh_clear(oid, cache->map); - git_atomic_ssize_add(&git_cache__current_storage, -cache->used_memory); - cache->used_memory = 0; -} - -void git_cache_clear(git_cache *cache) -{ - if (git_rwlock_wrlock(&cache->lock) < 0) - return; - - clear_cache(cache); - - git_rwlock_wrunlock(&cache->lock); -} - -void git_cache_free(git_cache *cache) -{ - git_cache_clear(cache); - git_oidmap_free(cache->map); - git_rwlock_free(&cache->lock); - git__memzero(cache, sizeof(*cache)); -} - -/* Called with lock */ -static void cache_evict_entries(git_cache *cache) -{ - uint32_t seed = rand(); - size_t evict_count = 8; - ssize_t evicted_memory = 0; - - /* do not infinite loop if there's not enough entries to evict */ - if (evict_count > kh_size(cache->map)) { - clear_cache(cache); - return; - } - - while (evict_count > 0) { - khiter_t pos = seed++ % kh_end(cache->map); - - if (kh_exist(cache->map, pos)) { - git_cached_obj *evict = kh_val(cache->map, pos); - - evict_count--; - evicted_memory += evict->size; - git_cached_obj_decref(evict); - - kh_del(oid, cache->map, pos); - } - } - - cache->used_memory -= evicted_memory; - git_atomic_ssize_add(&git_cache__current_storage, -evicted_memory); -} - -static bool cache_should_store(git_otype object_type, size_t object_size) -{ - size_t max_size = git_cache__max_object_size[object_type]; - return git_cache__enabled && object_size < max_size; -} - -static void *cache_get(git_cache *cache, const git_oid *oid, unsigned int flags) -{ - khiter_t pos; - git_cached_obj *entry = NULL; - - if (!git_cache__enabled || git_rwlock_rdlock(&cache->lock) < 0) - return NULL; - - pos = kh_get(oid, cache->map, oid); - if (pos != kh_end(cache->map)) { - entry = kh_val(cache->map, pos); - - if (flags && entry->flags != flags) { - entry = NULL; - } else { - git_cached_obj_incref(entry); - } - } - - git_rwlock_rdunlock(&cache->lock); - - return entry; -} - -static void *cache_store(git_cache *cache, git_cached_obj *entry) -{ - khiter_t pos; - - git_cached_obj_incref(entry); - - if (!git_cache__enabled && cache->used_memory > 0) { - git_cache_clear(cache); - return entry; - } - - if (!cache_should_store(entry->type, entry->size)) - return entry; - - if (git_rwlock_wrlock(&cache->lock) < 0) - return entry; - - /* soften the load on the cache */ - if (git_cache__current_storage.val > git_cache__max_storage) - cache_evict_entries(cache); - - pos = kh_get(oid, cache->map, &entry->oid); - - /* not found */ - if (pos == kh_end(cache->map)) { - int rval; - - pos = kh_put(oid, cache->map, &entry->oid, &rval); - if (rval >= 0) { - kh_key(cache->map, pos) = &entry->oid; - kh_val(cache->map, pos) = entry; - git_cached_obj_incref(entry); - cache->used_memory += entry->size; - git_atomic_ssize_add(&git_cache__current_storage, (ssize_t)entry->size); - } - } - /* found */ - else { - git_cached_obj *stored_entry = kh_val(cache->map, pos); - - if (stored_entry->flags == entry->flags) { - git_cached_obj_decref(entry); - git_cached_obj_incref(stored_entry); - entry = stored_entry; - } else if (stored_entry->flags == GIT_CACHE_STORE_RAW && - entry->flags == GIT_CACHE_STORE_PARSED) { - git_cached_obj_decref(stored_entry); - git_cached_obj_incref(entry); - - kh_key(cache->map, pos) = &entry->oid; - kh_val(cache->map, pos) = entry; - } else { - /* NO OP */ - } - } - - git_rwlock_wrunlock(&cache->lock); - return entry; -} - -void *git_cache_store_raw(git_cache *cache, git_odb_object *entry) -{ - entry->cached.flags = GIT_CACHE_STORE_RAW; - return cache_store(cache, (git_cached_obj *)entry); -} - -void *git_cache_store_parsed(git_cache *cache, git_object *entry) -{ - entry->cached.flags = GIT_CACHE_STORE_PARSED; - return cache_store(cache, (git_cached_obj *)entry); -} - -git_odb_object *git_cache_get_raw(git_cache *cache, const git_oid *oid) -{ - return cache_get(cache, oid, GIT_CACHE_STORE_RAW); -} - -git_object *git_cache_get_parsed(git_cache *cache, const git_oid *oid) -{ - return cache_get(cache, oid, GIT_CACHE_STORE_PARSED); -} - -void *git_cache_get_any(git_cache *cache, const git_oid *oid) -{ - return cache_get(cache, oid, GIT_CACHE_STORE_ANY); -} - -void git_cached_obj_decref(void *_obj) -{ - git_cached_obj *obj = _obj; - - if (git_atomic_dec(&obj->refcount) == 0) { - switch (obj->flags) { - case GIT_CACHE_STORE_RAW: - git_odb_object__free(_obj); - break; - - case GIT_CACHE_STORE_PARSED: - git_object__free(_obj); - break; - - default: - git__free(_obj); - break; - } - } -} diff --git a/vendor/libgit2/src/cache.h b/vendor/libgit2/src/cache.h deleted file mode 100644 index 697123739..000000000 --- a/vendor/libgit2/src/cache.h +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_cache_h__ -#define INCLUDE_cache_h__ - -#include "git2/common.h" -#include "git2/oid.h" -#include "git2/odb.h" - -#include "thread-utils.h" -#include "oidmap.h" - -enum { - GIT_CACHE_STORE_ANY = 0, - GIT_CACHE_STORE_RAW = 1, - GIT_CACHE_STORE_PARSED = 2 -}; - -typedef struct { - git_oid oid; - int16_t type; /* git_otype value */ - uint16_t flags; /* GIT_CACHE_STORE value */ - size_t size; - git_atomic refcount; -} git_cached_obj; - -typedef struct { - git_oidmap *map; - git_rwlock lock; - ssize_t used_memory; -} git_cache; - -extern bool git_cache__enabled; -extern ssize_t git_cache__max_storage; -extern git_atomic_ssize git_cache__current_storage; - -int git_cache_set_max_object_size(git_otype type, size_t size); - -int git_cache_init(git_cache *cache); -void git_cache_free(git_cache *cache); -void git_cache_clear(git_cache *cache); - -void *git_cache_store_raw(git_cache *cache, git_odb_object *entry); -void *git_cache_store_parsed(git_cache *cache, git_object *entry); - -git_odb_object *git_cache_get_raw(git_cache *cache, const git_oid *oid); -git_object *git_cache_get_parsed(git_cache *cache, const git_oid *oid); -void *git_cache_get_any(git_cache *cache, const git_oid *oid); - -GIT_INLINE(size_t) git_cache_size(git_cache *cache) -{ - return (size_t)kh_size(cache->map); -} - -GIT_INLINE(void) git_cached_obj_incref(void *_obj) -{ - git_cached_obj *obj = _obj; - git_atomic_inc(&obj->refcount); -} - -void git_cached_obj_decref(void *_obj); - -#endif diff --git a/vendor/libgit2/src/cc-compat.h b/vendor/libgit2/src/cc-compat.h deleted file mode 100644 index cefdc928b..000000000 --- a/vendor/libgit2/src/cc-compat.h +++ /dev/null @@ -1,87 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_compat_h__ -#define INCLUDE_compat_h__ - -#include - -/* - * See if our compiler is known to support flexible array members. - */ -#ifndef GIT_FLEX_ARRAY -# if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) -# define GIT_FLEX_ARRAY /* empty */ -# elif defined(__GNUC__) -# if (__GNUC__ >= 3) -# define GIT_FLEX_ARRAY /* empty */ -# else -# define GIT_FLEX_ARRAY 0 /* older GNU extension */ -# endif -# endif - -/* Default to safer but a bit wasteful traditional style */ -# ifndef GIT_FLEX_ARRAY -# define GIT_FLEX_ARRAY 1 -# endif -#endif - -#ifdef __GNUC__ -# define GIT_TYPEOF(x) (__typeof__(x)) -#else -# define GIT_TYPEOF(x) -#endif - -#if defined(__GNUC__) -# define GIT_ALIGN(x,size) x __attribute__ ((aligned(size))) -#elif defined(_MSC_VER) -# define GIT_ALIGN(x,size) __declspec(align(size)) x -#else -# define GIT_ALIGN(x,size) x -#endif - -#define GIT_UNUSED(x) ((void)(x)) - -/* Define the printf format specifer to use for size_t output */ -#if defined(_MSC_VER) || defined(__MINGW32__) -# define PRIuZ "Iu" -# define PRIxZ "Ix" -# define PRIdZ "Id" -#else -# define PRIuZ "zu" -# define PRIxZ "zx" -# define PRIdZ "zd" -#endif - -/* Micosoft Visual C/C++ */ -#if defined(_MSC_VER) -/* disable "deprecated function" warnings */ -# pragma warning ( disable : 4996 ) -/* disable "conditional expression is constant" level 4 warnings */ -# pragma warning ( disable : 4127 ) -#endif - -#if defined (_MSC_VER) - typedef unsigned char bool; -# ifndef true -# define true 1 -# endif -# ifndef false -# define false 0 -# endif -#else -# include -#endif - -#ifndef va_copy -# ifdef __va_copy -# define va_copy(dst, src) __va_copy(dst, src) -# else -# define va_copy(dst, src) ((dst) = (src)) -# endif -#endif - -#endif /* INCLUDE_compat_h__ */ diff --git a/vendor/libgit2/src/checkout.c b/vendor/libgit2/src/checkout.c deleted file mode 100644 index deeee62e0..000000000 --- a/vendor/libgit2/src/checkout.c +++ /dev/null @@ -1,2722 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include - -#include "checkout.h" - -#include "git2/repository.h" -#include "git2/refs.h" -#include "git2/tree.h" -#include "git2/blob.h" -#include "git2/config.h" -#include "git2/diff.h" -#include "git2/submodule.h" -#include "git2/sys/index.h" -#include "git2/sys/filter.h" -#include "git2/merge.h" - -#include "refs.h" -#include "repository.h" -#include "index.h" -#include "filter.h" -#include "blob.h" -#include "diff.h" -#include "pathspec.h" -#include "buf_text.h" -#include "diff_xdiff.h" -#include "path.h" -#include "attr.h" -#include "pool.h" -#include "strmap.h" - -GIT__USE_STRMAP - -/* See docs/checkout-internals.md for more information */ - -enum { - CHECKOUT_ACTION__NONE = 0, - CHECKOUT_ACTION__REMOVE = 1, - CHECKOUT_ACTION__UPDATE_BLOB = 2, - CHECKOUT_ACTION__UPDATE_SUBMODULE = 4, - CHECKOUT_ACTION__CONFLICT = 8, - CHECKOUT_ACTION__REMOVE_CONFLICT = 16, - CHECKOUT_ACTION__UPDATE_CONFLICT = 32, - CHECKOUT_ACTION__MAX = 32, - CHECKOUT_ACTION__DEFER_REMOVE = 64, - CHECKOUT_ACTION__REMOVE_AND_UPDATE = - (CHECKOUT_ACTION__UPDATE_BLOB | CHECKOUT_ACTION__REMOVE), -}; - -typedef struct { - git_repository *repo; - git_iterator *target; - git_diff *diff; - git_checkout_options opts; - bool opts_free_baseline; - char *pfx; - git_index *index; - git_pool pool; - git_vector removes; - git_vector remove_conflicts; - git_vector update_conflicts; - git_vector *update_reuc; - git_vector *update_names; - git_buf path; - size_t workdir_len; - git_buf tmp; - unsigned int strategy; - int can_symlink; - bool reload_submodules; - size_t total_steps; - size_t completed_steps; - git_checkout_perfdata perfdata; - git_strmap *mkdir_map; - git_attr_session attr_session; -} checkout_data; - -typedef struct { - const git_index_entry *ancestor; - const git_index_entry *ours; - const git_index_entry *theirs; - - int name_collision:1, - directoryfile:1, - one_to_two:1, - binary:1, - submodule:1; -} checkout_conflictdata; - -static int checkout_notify( - checkout_data *data, - git_checkout_notify_t why, - const git_diff_delta *delta, - const git_index_entry *wditem) -{ - git_diff_file wdfile; - const git_diff_file *baseline = NULL, *target = NULL, *workdir = NULL; - const char *path = NULL; - - if (!data->opts.notify_cb || - (why & data->opts.notify_flags) == 0) - return 0; - - if (wditem) { - memset(&wdfile, 0, sizeof(wdfile)); - - git_oid_cpy(&wdfile.id, &wditem->id); - wdfile.path = wditem->path; - wdfile.size = wditem->file_size; - wdfile.flags = GIT_DIFF_FLAG_VALID_ID; - wdfile.mode = wditem->mode; - - workdir = &wdfile; - - path = wditem->path; - } - - if (delta) { - switch (delta->status) { - case GIT_DELTA_UNMODIFIED: - case GIT_DELTA_MODIFIED: - case GIT_DELTA_TYPECHANGE: - default: - baseline = &delta->old_file; - target = &delta->new_file; - break; - case GIT_DELTA_ADDED: - case GIT_DELTA_IGNORED: - case GIT_DELTA_UNTRACKED: - case GIT_DELTA_UNREADABLE: - target = &delta->new_file; - break; - case GIT_DELTA_DELETED: - baseline = &delta->old_file; - break; - } - - path = delta->old_file.path; - } - - { - int error = data->opts.notify_cb( - why, path, baseline, target, workdir, data->opts.notify_payload); - - return giterr_set_after_callback_function( - error, "git_checkout notification"); - } -} - -GIT_INLINE(bool) is_workdir_base_or_new( - const git_oid *workdir_id, - const git_diff_file *baseitem, - const git_diff_file *newitem) -{ - return (git_oid__cmp(&baseitem->id, workdir_id) == 0 || - git_oid__cmp(&newitem->id, workdir_id) == 0); -} - -static bool checkout_is_workdir_modified( - checkout_data *data, - const git_diff_file *baseitem, - const git_diff_file *newitem, - const git_index_entry *wditem) -{ - git_oid oid; - const git_index_entry *ie; - - /* handle "modified" submodule */ - if (wditem->mode == GIT_FILEMODE_COMMIT) { - git_submodule *sm; - unsigned int sm_status = 0; - const git_oid *sm_oid = NULL; - bool rval = false; - - if (git_submodule_lookup(&sm, data->repo, wditem->path) < 0) { - giterr_clear(); - return true; - } - - if (git_submodule_status(&sm_status, data->repo, wditem->path, GIT_SUBMODULE_IGNORE_UNSPECIFIED) < 0 || - GIT_SUBMODULE_STATUS_IS_WD_DIRTY(sm_status)) - rval = true; - else if ((sm_oid = git_submodule_wd_id(sm)) == NULL) - rval = false; - else - rval = (git_oid__cmp(&baseitem->id, sm_oid) != 0); - - git_submodule_free(sm); - return rval; - } - - /* Look at the cache to decide if the workdir is modified. If not, - * we can simply compare the oid in the cache to the baseitem instead - * of hashing the file. If so, we allow the checkout to proceed if the - * oid is identical (ie, the staged item is what we're trying to check - * out.) - */ - if ((ie = git_index_get_bypath(data->index, wditem->path, 0)) != NULL) { - if (git_index_time_eq(&wditem->mtime, &ie->mtime) && - wditem->file_size == ie->file_size) - return !is_workdir_base_or_new(&ie->id, baseitem, newitem); - } - - /* depending on where base is coming from, we may or may not know - * the actual size of the data, so we can't rely on this shortcut. - */ - if (baseitem->size && wditem->file_size != baseitem->size) - return true; - - if (git_diff__oid_for_entry(&oid, data->diff, wditem, wditem->mode, NULL) < 0) - return false; - - /* Allow the checkout if the workdir is not modified *or* if the checkout - * target's contents are already in the working directory. - */ - return !is_workdir_base_or_new(&oid, baseitem, newitem); -} - -#define CHECKOUT_ACTION_IF(FLAG,YES,NO) \ - ((data->strategy & GIT_CHECKOUT_##FLAG) ? CHECKOUT_ACTION__##YES : CHECKOUT_ACTION__##NO) - -static int checkout_action_common( - int *action, - checkout_data *data, - const git_diff_delta *delta, - const git_index_entry *wd) -{ - git_checkout_notify_t notify = GIT_CHECKOUT_NOTIFY_NONE; - - if ((data->strategy & GIT_CHECKOUT_UPDATE_ONLY) != 0) - *action = (*action & ~CHECKOUT_ACTION__REMOVE); - - if ((*action & CHECKOUT_ACTION__UPDATE_BLOB) != 0) { - if (S_ISGITLINK(delta->new_file.mode)) - *action = (*action & ~CHECKOUT_ACTION__UPDATE_BLOB) | - CHECKOUT_ACTION__UPDATE_SUBMODULE; - - /* to "update" a symlink, we must remove the old one first */ - if (delta->new_file.mode == GIT_FILEMODE_LINK && wd != NULL) - *action |= CHECKOUT_ACTION__REMOVE; - - /* if the file is on disk and doesn't match our mode, force update */ - if (wd && - GIT_PERMS_IS_EXEC(wd->mode) != - GIT_PERMS_IS_EXEC(delta->new_file.mode)) - *action |= CHECKOUT_ACTION__REMOVE; - - notify = GIT_CHECKOUT_NOTIFY_UPDATED; - } - - if ((*action & CHECKOUT_ACTION__CONFLICT) != 0) - notify = GIT_CHECKOUT_NOTIFY_CONFLICT; - - return checkout_notify(data, notify, delta, wd); -} - -static int checkout_action_no_wd( - int *action, - checkout_data *data, - const git_diff_delta *delta) -{ - int error = 0; - - *action = CHECKOUT_ACTION__NONE; - - switch (delta->status) { - case GIT_DELTA_UNMODIFIED: /* case 12 */ - error = checkout_notify(data, GIT_CHECKOUT_NOTIFY_DIRTY, delta, NULL); - if (error) - return error; - *action = CHECKOUT_ACTION_IF(RECREATE_MISSING, UPDATE_BLOB, NONE); - break; - case GIT_DELTA_ADDED: /* case 2 or 28 (and 5 but not really) */ - *action = CHECKOUT_ACTION_IF(SAFE, UPDATE_BLOB, NONE); - break; - case GIT_DELTA_MODIFIED: /* case 13 (and 35 but not really) */ - *action = CHECKOUT_ACTION_IF(RECREATE_MISSING, UPDATE_BLOB, CONFLICT); - break; - case GIT_DELTA_TYPECHANGE: /* case 21 (B->T) and 28 (T->B)*/ - if (delta->new_file.mode == GIT_FILEMODE_TREE) - *action = CHECKOUT_ACTION_IF(SAFE, UPDATE_BLOB, NONE); - break; - case GIT_DELTA_DELETED: /* case 8 or 25 */ - *action = CHECKOUT_ACTION_IF(SAFE, REMOVE, NONE); - break; - default: /* impossible */ - break; - } - - return checkout_action_common(action, data, delta, NULL); -} - -static bool wd_item_is_removable(git_iterator *iter, const git_index_entry *wd) -{ - git_buf *full = NULL; - - if (wd->mode != GIT_FILEMODE_TREE) - return true; - if (git_iterator_current_workdir_path(&full, iter) < 0) - return true; - return !full || !git_path_contains(full, DOT_GIT); -} - -static int checkout_queue_remove(checkout_data *data, const char *path) -{ - char *copy = git_pool_strdup(&data->pool, path); - GITERR_CHECK_ALLOC(copy); - return git_vector_insert(&data->removes, copy); -} - -/* note that this advances the iterator over the wd item */ -static int checkout_action_wd_only( - checkout_data *data, - git_iterator *workdir, - const git_index_entry **wditem, - git_vector *pathspec) -{ - int error = 0; - bool remove = false; - git_checkout_notify_t notify = GIT_CHECKOUT_NOTIFY_NONE; - const git_index_entry *wd = *wditem; - - if (!git_pathspec__match( - pathspec, wd->path, - (data->strategy & GIT_CHECKOUT_DISABLE_PATHSPEC_MATCH) != 0, - git_iterator_ignore_case(workdir), NULL, NULL)) - return git_iterator_advance(wditem, workdir); - - /* check if item is tracked in the index but not in the checkout diff */ - if (data->index != NULL) { - size_t pos; - - error = git_index__find_pos( - &pos, data->index, wd->path, 0, GIT_INDEX_STAGE_ANY); - - if (wd->mode != GIT_FILEMODE_TREE) { - if (!error) { /* found by git_index__find_pos call */ - notify = GIT_CHECKOUT_NOTIFY_DIRTY; - remove = ((data->strategy & GIT_CHECKOUT_FORCE) != 0); - } else if (error != GIT_ENOTFOUND) - return error; - else - error = 0; /* git_index__find_pos does not set error msg */ - } else { - /* for tree entries, we have to see if there are any index - * entries that are contained inside that tree - */ - const git_index_entry *e = git_index_get_byindex(data->index, pos); - - if (e != NULL && data->diff->pfxcomp(e->path, wd->path) == 0) { - notify = GIT_CHECKOUT_NOTIFY_DIRTY; - remove = ((data->strategy & GIT_CHECKOUT_FORCE) != 0); - } - } - } - - if (notify != GIT_CHECKOUT_NOTIFY_NONE) { - /* if we found something in the index, notify and advance */ - if ((error = checkout_notify(data, notify, NULL, wd)) != 0) - return error; - - if (remove && wd_item_is_removable(workdir, wd)) - error = checkout_queue_remove(data, wd->path); - - if (!error) - error = git_iterator_advance(wditem, workdir); - } else { - /* untracked or ignored - can't know which until we advance through */ - bool over = false, removable = wd_item_is_removable(workdir, wd); - git_iterator_status_t untracked_state; - - /* copy the entry for issuing notification callback later */ - git_index_entry saved_wd = *wd; - git_buf_sets(&data->tmp, wd->path); - saved_wd.path = data->tmp.ptr; - - error = git_iterator_advance_over_with_status( - wditem, &untracked_state, workdir); - if (error == GIT_ITEROVER) - over = true; - else if (error < 0) - return error; - - if (untracked_state == GIT_ITERATOR_STATUS_IGNORED) { - notify = GIT_CHECKOUT_NOTIFY_IGNORED; - remove = ((data->strategy & GIT_CHECKOUT_REMOVE_IGNORED) != 0); - } else { - notify = GIT_CHECKOUT_NOTIFY_UNTRACKED; - remove = ((data->strategy & GIT_CHECKOUT_REMOVE_UNTRACKED) != 0); - } - - if ((error = checkout_notify(data, notify, NULL, &saved_wd)) != 0) - return error; - - if (remove && removable) - error = checkout_queue_remove(data, saved_wd.path); - - if (!error && over) /* restore ITEROVER if needed */ - error = GIT_ITEROVER; - } - - return error; -} - -static bool submodule_is_config_only( - checkout_data *data, - const char *path) -{ - git_submodule *sm = NULL; - unsigned int sm_loc = 0; - bool rval = false; - - if (git_submodule_lookup(&sm, data->repo, path) < 0) - return true; - - if (git_submodule_location(&sm_loc, sm) < 0 || - sm_loc == GIT_SUBMODULE_STATUS_IN_CONFIG) - rval = true; - - git_submodule_free(sm); - - return rval; -} - -static bool checkout_is_empty_dir(checkout_data *data, const char *path) -{ - git_buf_truncate(&data->path, data->workdir_len); - if (git_buf_puts(&data->path, path) < 0) - return false; - return git_path_is_empty_dir(data->path.ptr); -} - -static int checkout_action_with_wd( - int *action, - checkout_data *data, - const git_diff_delta *delta, - git_iterator *workdir, - const git_index_entry *wd) -{ - *action = CHECKOUT_ACTION__NONE; - - switch (delta->status) { - case GIT_DELTA_UNMODIFIED: /* case 14/15 or 33 */ - if (checkout_is_workdir_modified(data, &delta->old_file, &delta->new_file, wd)) { - GITERR_CHECK_ERROR( - checkout_notify(data, GIT_CHECKOUT_NOTIFY_DIRTY, delta, wd) ); - *action = CHECKOUT_ACTION_IF(FORCE, UPDATE_BLOB, NONE); - } - break; - case GIT_DELTA_ADDED: /* case 3, 4 or 6 */ - if (git_iterator_current_is_ignored(workdir)) - *action = CHECKOUT_ACTION_IF(DONT_OVERWRITE_IGNORED, CONFLICT, UPDATE_BLOB); - else - *action = CHECKOUT_ACTION_IF(FORCE, UPDATE_BLOB, CONFLICT); - break; - case GIT_DELTA_DELETED: /* case 9 or 10 (or 26 but not really) */ - if (checkout_is_workdir_modified(data, &delta->old_file, &delta->new_file, wd)) - *action = CHECKOUT_ACTION_IF(FORCE, REMOVE, CONFLICT); - else - *action = CHECKOUT_ACTION_IF(SAFE, REMOVE, NONE); - break; - case GIT_DELTA_MODIFIED: /* case 16, 17, 18 (or 36 but not really) */ - if (checkout_is_workdir_modified(data, &delta->old_file, &delta->new_file, wd)) - *action = CHECKOUT_ACTION_IF(FORCE, UPDATE_BLOB, CONFLICT); - else - *action = CHECKOUT_ACTION_IF(SAFE, UPDATE_BLOB, NONE); - break; - case GIT_DELTA_TYPECHANGE: /* case 22, 23, 29, 30 */ - if (delta->old_file.mode == GIT_FILEMODE_TREE) { - if (wd->mode == GIT_FILEMODE_TREE) - /* either deleting items in old tree will delete the wd dir, - * or we'll get a conflict when we attempt blob update... - */ - *action = CHECKOUT_ACTION_IF(SAFE, UPDATE_BLOB, NONE); - else if (wd->mode == GIT_FILEMODE_COMMIT) { - /* workdir is possibly a "phantom" submodule - treat as a - * tree if the only submodule info came from the config - */ - if (submodule_is_config_only(data, wd->path)) - *action = CHECKOUT_ACTION_IF(SAFE, UPDATE_BLOB, NONE); - else - *action = CHECKOUT_ACTION_IF(FORCE, REMOVE_AND_UPDATE, CONFLICT); - } else - *action = CHECKOUT_ACTION_IF(FORCE, REMOVE, CONFLICT); - } - else if (checkout_is_workdir_modified(data, &delta->old_file, &delta->new_file, wd)) - *action = CHECKOUT_ACTION_IF(FORCE, REMOVE_AND_UPDATE, CONFLICT); - else - *action = CHECKOUT_ACTION_IF(SAFE, REMOVE_AND_UPDATE, NONE); - - /* don't update if the typechange is to a tree */ - if (delta->new_file.mode == GIT_FILEMODE_TREE) - *action = (*action & ~CHECKOUT_ACTION__UPDATE_BLOB); - break; - default: /* impossible */ - break; - } - - return checkout_action_common(action, data, delta, wd); -} - -static int checkout_action_with_wd_blocker( - int *action, - checkout_data *data, - const git_diff_delta *delta, - const git_index_entry *wd) -{ - *action = CHECKOUT_ACTION__NONE; - - switch (delta->status) { - case GIT_DELTA_UNMODIFIED: - /* should show delta as dirty / deleted */ - GITERR_CHECK_ERROR( - checkout_notify(data, GIT_CHECKOUT_NOTIFY_DIRTY, delta, wd) ); - *action = CHECKOUT_ACTION_IF(FORCE, REMOVE_AND_UPDATE, NONE); - break; - case GIT_DELTA_ADDED: - case GIT_DELTA_MODIFIED: - *action = CHECKOUT_ACTION_IF(FORCE, REMOVE_AND_UPDATE, CONFLICT); - break; - case GIT_DELTA_DELETED: - *action = CHECKOUT_ACTION_IF(FORCE, REMOVE, CONFLICT); - break; - case GIT_DELTA_TYPECHANGE: - /* not 100% certain about this... */ - *action = CHECKOUT_ACTION_IF(FORCE, REMOVE_AND_UPDATE, CONFLICT); - break; - default: /* impossible */ - break; - } - - return checkout_action_common(action, data, delta, wd); -} - -static int checkout_action_with_wd_dir( - int *action, - checkout_data *data, - const git_diff_delta *delta, - git_iterator *workdir, - const git_index_entry *wd) -{ - *action = CHECKOUT_ACTION__NONE; - - switch (delta->status) { - case GIT_DELTA_UNMODIFIED: /* case 19 or 24 (or 34 but not really) */ - GITERR_CHECK_ERROR( - checkout_notify(data, GIT_CHECKOUT_NOTIFY_DIRTY, delta, NULL)); - GITERR_CHECK_ERROR( - checkout_notify(data, GIT_CHECKOUT_NOTIFY_UNTRACKED, NULL, wd)); - *action = CHECKOUT_ACTION_IF(FORCE, REMOVE_AND_UPDATE, NONE); - break; - case GIT_DELTA_ADDED:/* case 4 (and 7 for dir) */ - case GIT_DELTA_MODIFIED: /* case 20 (or 37 but not really) */ - if (delta->old_file.mode == GIT_FILEMODE_COMMIT) - /* expected submodule (and maybe found one) */; - else if (delta->new_file.mode != GIT_FILEMODE_TREE) - *action = git_iterator_current_is_ignored(workdir) ? - CHECKOUT_ACTION_IF(DONT_OVERWRITE_IGNORED, CONFLICT, REMOVE_AND_UPDATE) : - CHECKOUT_ACTION_IF(FORCE, REMOVE_AND_UPDATE, CONFLICT); - break; - case GIT_DELTA_DELETED: /* case 11 (and 27 for dir) */ - if (delta->old_file.mode != GIT_FILEMODE_TREE) - GITERR_CHECK_ERROR( - checkout_notify(data, GIT_CHECKOUT_NOTIFY_UNTRACKED, NULL, wd)); - break; - case GIT_DELTA_TYPECHANGE: /* case 24 or 31 */ - if (delta->old_file.mode == GIT_FILEMODE_TREE) { - /* For typechange from dir, remove dir and add blob, but it is - * not safe to remove dir if it contains modified files. - * However, safely removing child files will remove the parent - * directory if is it left empty, so we can defer removing the - * dir and it will succeed if no children are left. - */ - *action = CHECKOUT_ACTION_IF(SAFE, UPDATE_BLOB, NONE); - } - else if (delta->new_file.mode != GIT_FILEMODE_TREE) - /* For typechange to dir, dir is already created so no action */ - *action = CHECKOUT_ACTION_IF(FORCE, REMOVE_AND_UPDATE, CONFLICT); - break; - default: /* impossible */ - break; - } - - return checkout_action_common(action, data, delta, wd); -} - -static int checkout_action_with_wd_dir_empty( - int *action, - checkout_data *data, - const git_diff_delta *delta) -{ - int error = checkout_action_no_wd(action, data, delta); - - /* We can always safely remove an empty directory. */ - if (error == 0 && *action != CHECKOUT_ACTION__NONE) - *action |= CHECKOUT_ACTION__REMOVE; - - return error; -} - -static int checkout_action( - int *action, - checkout_data *data, - git_diff_delta *delta, - git_iterator *workdir, - const git_index_entry **wditem, - git_vector *pathspec) -{ - int cmp = -1, error; - int (*strcomp)(const char *, const char *) = data->diff->strcomp; - int (*pfxcomp)(const char *str, const char *pfx) = data->diff->pfxcomp; - int (*advance)(const git_index_entry **, git_iterator *) = NULL; - - /* move workdir iterator to follow along with deltas */ - - while (1) { - const git_index_entry *wd = *wditem; - - if (!wd) - return checkout_action_no_wd(action, data, delta); - - cmp = strcomp(wd->path, delta->old_file.path); - - /* 1. wd before delta ("a/a" before "a/b") - * 2. wd prefixes delta & should expand ("a/" before "a/b") - * 3. wd prefixes delta & cannot expand ("a/b" before "a/b/c") - * 4. wd equals delta ("a/b" and "a/b") - * 5. wd after delta & delta prefixes wd ("a/b/c" after "a/b/" or "a/b") - * 6. wd after delta ("a/c" after "a/b") - */ - - if (cmp < 0) { - cmp = pfxcomp(delta->old_file.path, wd->path); - - if (cmp == 0) { - if (wd->mode == GIT_FILEMODE_TREE) { - /* case 2 - entry prefixed by workdir tree */ - error = git_iterator_advance_into_or_over(wditem, workdir); - if (error < 0 && error != GIT_ITEROVER) - goto done; - continue; - } - - /* case 3 maybe - wd contains non-dir where dir expected */ - if (delta->old_file.path[strlen(wd->path)] == '/') { - error = checkout_action_with_wd_blocker( - action, data, delta, wd); - advance = git_iterator_advance; - goto done; - } - } - - /* case 1 - handle wd item (if it matches pathspec) */ - error = checkout_action_wd_only(data, workdir, wditem, pathspec); - if (error && error != GIT_ITEROVER) - goto done; - continue; - } - - if (cmp == 0) { - /* case 4 */ - error = checkout_action_with_wd(action, data, delta, workdir, wd); - advance = git_iterator_advance; - goto done; - } - - cmp = pfxcomp(wd->path, delta->old_file.path); - - if (cmp == 0) { /* case 5 */ - if (wd->path[strlen(delta->old_file.path)] != '/') - return checkout_action_no_wd(action, data, delta); - - if (delta->status == GIT_DELTA_TYPECHANGE) { - if (delta->old_file.mode == GIT_FILEMODE_TREE) { - error = checkout_action_with_wd(action, data, delta, workdir, wd); - advance = git_iterator_advance_into; - goto done; - } - - if (delta->new_file.mode == GIT_FILEMODE_TREE || - delta->new_file.mode == GIT_FILEMODE_COMMIT || - delta->old_file.mode == GIT_FILEMODE_COMMIT) - { - error = checkout_action_with_wd(action, data, delta, workdir, wd); - advance = git_iterator_advance; - goto done; - } - } - - return checkout_is_empty_dir(data, wd->path) ? - checkout_action_with_wd_dir_empty(action, data, delta) : - checkout_action_with_wd_dir(action, data, delta, workdir, wd); - } - - /* case 6 - wd is after delta */ - return checkout_action_no_wd(action, data, delta); - } - -done: - if (!error && advance != NULL && - (error = advance(wditem, workdir)) < 0) { - *wditem = NULL; - if (error == GIT_ITEROVER) - error = 0; - } - - return error; -} - -static int checkout_remaining_wd_items( - checkout_data *data, - git_iterator *workdir, - const git_index_entry *wd, - git_vector *spec) -{ - int error = 0; - - while (wd && !error) - error = checkout_action_wd_only(data, workdir, &wd, spec); - - if (error == GIT_ITEROVER) - error = 0; - - return error; -} - -GIT_INLINE(int) checkout_idxentry_cmp( - const git_index_entry *a, - const git_index_entry *b) -{ - if (!a && !b) - return 0; - else if (!a && b) - return -1; - else if(a && !b) - return 1; - else - return strcmp(a->path, b->path); -} - -static int checkout_conflictdata_cmp(const void *a, const void *b) -{ - const checkout_conflictdata *ca = a; - const checkout_conflictdata *cb = b; - int diff; - - if ((diff = checkout_idxentry_cmp(ca->ancestor, cb->ancestor)) == 0 && - (diff = checkout_idxentry_cmp(ca->ours, cb->theirs)) == 0) - diff = checkout_idxentry_cmp(ca->theirs, cb->theirs); - - return diff; -} - -int checkout_conflictdata_empty( - const git_vector *conflicts, size_t idx, void *payload) -{ - checkout_conflictdata *conflict; - - GIT_UNUSED(payload); - - if ((conflict = git_vector_get(conflicts, idx)) == NULL) - return -1; - - if (conflict->ancestor || conflict->ours || conflict->theirs) - return 0; - - git__free(conflict); - return 1; -} - -GIT_INLINE(bool) conflict_pathspec_match( - checkout_data *data, - git_iterator *workdir, - git_vector *pathspec, - const git_index_entry *ancestor, - const git_index_entry *ours, - const git_index_entry *theirs) -{ - /* if the pathspec matches ours *or* theirs, proceed */ - if (ours && git_pathspec__match(pathspec, ours->path, - (data->strategy & GIT_CHECKOUT_DISABLE_PATHSPEC_MATCH) != 0, - git_iterator_ignore_case(workdir), NULL, NULL)) - return true; - - if (theirs && git_pathspec__match(pathspec, theirs->path, - (data->strategy & GIT_CHECKOUT_DISABLE_PATHSPEC_MATCH) != 0, - git_iterator_ignore_case(workdir), NULL, NULL)) - return true; - - if (ancestor && git_pathspec__match(pathspec, ancestor->path, - (data->strategy & GIT_CHECKOUT_DISABLE_PATHSPEC_MATCH) != 0, - git_iterator_ignore_case(workdir), NULL, NULL)) - return true; - - return false; -} - -GIT_INLINE(int) checkout_conflict_detect_submodule(checkout_conflictdata *conflict) -{ - conflict->submodule = ((conflict->ancestor && S_ISGITLINK(conflict->ancestor->mode)) || - (conflict->ours && S_ISGITLINK(conflict->ours->mode)) || - (conflict->theirs && S_ISGITLINK(conflict->theirs->mode))); - return 0; -} - -GIT_INLINE(int) checkout_conflict_detect_binary(git_repository *repo, checkout_conflictdata *conflict) -{ - git_blob *ancestor_blob = NULL, *our_blob = NULL, *their_blob = NULL; - int error = 0; - - if (conflict->submodule) - return 0; - - if (conflict->ancestor) { - if ((error = git_blob_lookup(&ancestor_blob, repo, &conflict->ancestor->id)) < 0) - goto done; - - conflict->binary = git_blob_is_binary(ancestor_blob); - } - - if (!conflict->binary && conflict->ours) { - if ((error = git_blob_lookup(&our_blob, repo, &conflict->ours->id)) < 0) - goto done; - - conflict->binary = git_blob_is_binary(our_blob); - } - - if (!conflict->binary && conflict->theirs) { - if ((error = git_blob_lookup(&their_blob, repo, &conflict->theirs->id)) < 0) - goto done; - - conflict->binary = git_blob_is_binary(their_blob); - } - -done: - git_blob_free(ancestor_blob); - git_blob_free(our_blob); - git_blob_free(their_blob); - - return error; -} - -static int checkout_conflict_append_update( - const git_index_entry *ancestor, - const git_index_entry *ours, - const git_index_entry *theirs, - void *payload) -{ - checkout_data *data = payload; - checkout_conflictdata *conflict; - int error; - - conflict = git__calloc(1, sizeof(checkout_conflictdata)); - GITERR_CHECK_ALLOC(conflict); - - conflict->ancestor = ancestor; - conflict->ours = ours; - conflict->theirs = theirs; - - if ((error = checkout_conflict_detect_submodule(conflict)) < 0 || - (error = checkout_conflict_detect_binary(data->repo, conflict)) < 0) - { - git__free(conflict); - return error; - } - - if (git_vector_insert(&data->update_conflicts, conflict)) - return -1; - - return 0; -} - -static int checkout_conflicts_foreach( - checkout_data *data, - git_index *index, - git_iterator *workdir, - git_vector *pathspec, - int (*cb)(const git_index_entry *, const git_index_entry *, const git_index_entry *, void *), - void *payload) -{ - git_index_conflict_iterator *iterator = NULL; - const git_index_entry *ancestor, *ours, *theirs; - int error = 0; - - if ((error = git_index_conflict_iterator_new(&iterator, index)) < 0) - goto done; - - /* Collect the conflicts */ - while ((error = git_index_conflict_next(&ancestor, &ours, &theirs, iterator)) == 0) { - if (!conflict_pathspec_match(data, workdir, pathspec, ancestor, ours, theirs)) - continue; - - if ((error = cb(ancestor, ours, theirs, payload)) < 0) - goto done; - } - - if (error == GIT_ITEROVER) - error = 0; - -done: - git_index_conflict_iterator_free(iterator); - - return error; -} - -static int checkout_conflicts_load(checkout_data *data, git_iterator *workdir, git_vector *pathspec) -{ - git_index *index; - - /* Only write conficts from sources that have them: indexes. */ - if ((index = git_iterator_get_index(data->target)) == NULL) - return 0; - - data->update_conflicts._cmp = checkout_conflictdata_cmp; - - if (checkout_conflicts_foreach(data, index, workdir, pathspec, checkout_conflict_append_update, data) < 0) - return -1; - - /* Collect the REUC and NAME entries */ - data->update_reuc = &index->reuc; - data->update_names = &index->names; - - return 0; -} - -GIT_INLINE(int) checkout_conflicts_cmp_entry( - const char *path, - const git_index_entry *entry) -{ - return strcmp((const char *)path, entry->path); -} - -static int checkout_conflicts_cmp_ancestor(const void *p, const void *c) -{ - const char *path = p; - const checkout_conflictdata *conflict = c; - - if (!conflict->ancestor) - return 1; - - return checkout_conflicts_cmp_entry(path, conflict->ancestor); -} - -static checkout_conflictdata *checkout_conflicts_search_ancestor( - checkout_data *data, - const char *path) -{ - size_t pos; - - if (git_vector_bsearch2(&pos, &data->update_conflicts, checkout_conflicts_cmp_ancestor, path) < 0) - return NULL; - - return git_vector_get(&data->update_conflicts, pos); -} - -static checkout_conflictdata *checkout_conflicts_search_branch( - checkout_data *data, - const char *path) -{ - checkout_conflictdata *conflict; - size_t i; - - git_vector_foreach(&data->update_conflicts, i, conflict) { - int cmp = -1; - - if (conflict->ancestor) - break; - - if (conflict->ours) - cmp = checkout_conflicts_cmp_entry(path, conflict->ours); - else if (conflict->theirs) - cmp = checkout_conflicts_cmp_entry(path, conflict->theirs); - - if (cmp == 0) - return conflict; - } - - return NULL; -} - -static int checkout_conflicts_load_byname_entry( - checkout_conflictdata **ancestor_out, - checkout_conflictdata **ours_out, - checkout_conflictdata **theirs_out, - checkout_data *data, - const git_index_name_entry *name_entry) -{ - checkout_conflictdata *ancestor, *ours = NULL, *theirs = NULL; - int error = 0; - - *ancestor_out = NULL; - *ours_out = NULL; - *theirs_out = NULL; - - if (!name_entry->ancestor) { - giterr_set(GITERR_INDEX, "A NAME entry exists without an ancestor"); - error = -1; - goto done; - } - - if (!name_entry->ours && !name_entry->theirs) { - giterr_set(GITERR_INDEX, "A NAME entry exists without an ours or theirs"); - error = -1; - goto done; - } - - if ((ancestor = checkout_conflicts_search_ancestor(data, - name_entry->ancestor)) == NULL) { - giterr_set(GITERR_INDEX, - "A NAME entry referenced ancestor entry '%s' which does not exist in the main index", - name_entry->ancestor); - error = -1; - goto done; - } - - if (name_entry->ours) { - if (strcmp(name_entry->ancestor, name_entry->ours) == 0) - ours = ancestor; - else if ((ours = checkout_conflicts_search_branch(data, name_entry->ours)) == NULL || - ours->ours == NULL) { - giterr_set(GITERR_INDEX, - "A NAME entry referenced our entry '%s' which does not exist in the main index", - name_entry->ours); - error = -1; - goto done; - } - } - - if (name_entry->theirs) { - if (strcmp(name_entry->ancestor, name_entry->theirs) == 0) - theirs = ancestor; - else if (name_entry->ours && strcmp(name_entry->ours, name_entry->theirs) == 0) - theirs = ours; - else if ((theirs = checkout_conflicts_search_branch(data, name_entry->theirs)) == NULL || - theirs->theirs == NULL) { - giterr_set(GITERR_INDEX, - "A NAME entry referenced their entry '%s' which does not exist in the main index", - name_entry->theirs); - error = -1; - goto done; - } - } - - *ancestor_out = ancestor; - *ours_out = ours; - *theirs_out = theirs; - -done: - return error; -} - -static int checkout_conflicts_coalesce_renames( - checkout_data *data) -{ - git_index *index; - const git_index_name_entry *name_entry; - checkout_conflictdata *ancestor_conflict, *our_conflict, *their_conflict; - size_t i, names; - int error = 0; - - if ((index = git_iterator_get_index(data->target)) == NULL) - return 0; - - /* Juggle entries based on renames */ - names = git_index_name_entrycount(index); - - for (i = 0; i < names; i++) { - name_entry = git_index_name_get_byindex(index, i); - - if ((error = checkout_conflicts_load_byname_entry( - &ancestor_conflict, &our_conflict, &their_conflict, - data, name_entry)) < 0) - goto done; - - if (our_conflict && our_conflict != ancestor_conflict) { - ancestor_conflict->ours = our_conflict->ours; - our_conflict->ours = NULL; - - if (our_conflict->theirs) - our_conflict->name_collision = 1; - - if (our_conflict->name_collision) - ancestor_conflict->name_collision = 1; - } - - if (their_conflict && their_conflict != ancestor_conflict) { - ancestor_conflict->theirs = their_conflict->theirs; - their_conflict->theirs = NULL; - - if (their_conflict->ours) - their_conflict->name_collision = 1; - - if (their_conflict->name_collision) - ancestor_conflict->name_collision = 1; - } - - if (our_conflict && our_conflict != ancestor_conflict && - their_conflict && their_conflict != ancestor_conflict) - ancestor_conflict->one_to_two = 1; - } - - git_vector_remove_matching( - &data->update_conflicts, checkout_conflictdata_empty, NULL); - -done: - return error; -} - -static int checkout_conflicts_mark_directoryfile( - checkout_data *data) -{ - git_index *index; - checkout_conflictdata *conflict; - const git_index_entry *entry; - size_t i, j, len; - const char *path; - int prefixed, error = 0; - - if ((index = git_iterator_get_index(data->target)) == NULL) - return 0; - - len = git_index_entrycount(index); - - /* Find d/f conflicts */ - git_vector_foreach(&data->update_conflicts, i, conflict) { - if ((conflict->ours && conflict->theirs) || - (!conflict->ours && !conflict->theirs)) - continue; - - path = conflict->ours ? - conflict->ours->path : conflict->theirs->path; - - if ((error = git_index_find(&j, index, path)) < 0) { - if (error == GIT_ENOTFOUND) - giterr_set(GITERR_INDEX, - "Index inconsistency, could not find entry for expected conflict '%s'", path); - - goto done; - } - - for (; j < len; j++) { - if ((entry = git_index_get_byindex(index, j)) == NULL) { - giterr_set(GITERR_INDEX, - "Index inconsistency, truncated index while loading expected conflict '%s'", path); - error = -1; - goto done; - } - - prefixed = git_path_equal_or_prefixed(path, entry->path, NULL); - - if (prefixed == GIT_PATH_EQUAL) - continue; - - if (prefixed == GIT_PATH_PREFIX) - conflict->directoryfile = 1; - - break; - } - } - -done: - return error; -} - -static int checkout_get_update_conflicts( - checkout_data *data, - git_iterator *workdir, - git_vector *pathspec) -{ - int error = 0; - - if (data->strategy & GIT_CHECKOUT_SKIP_UNMERGED) - return 0; - - if ((error = checkout_conflicts_load(data, workdir, pathspec)) < 0 || - (error = checkout_conflicts_coalesce_renames(data)) < 0 || - (error = checkout_conflicts_mark_directoryfile(data)) < 0) - goto done; - -done: - return error; -} - -static int checkout_conflict_append_remove( - const git_index_entry *ancestor, - const git_index_entry *ours, - const git_index_entry *theirs, - void *payload) -{ - checkout_data *data = payload; - const char *name; - - assert(ancestor || ours || theirs); - - if (ancestor) - name = git__strdup(ancestor->path); - else if (ours) - name = git__strdup(ours->path); - else if (theirs) - name = git__strdup(theirs->path); - else - abort(); - - GITERR_CHECK_ALLOC(name); - - return git_vector_insert(&data->remove_conflicts, (char *)name); -} - -static int checkout_get_remove_conflicts( - checkout_data *data, - git_iterator *workdir, - git_vector *pathspec) -{ - if ((data->strategy & GIT_CHECKOUT_DONT_UPDATE_INDEX) != 0) - return 0; - - return checkout_conflicts_foreach(data, data->index, workdir, pathspec, checkout_conflict_append_remove, data); -} - -static int checkout_verify_paths( - git_repository *repo, - int action, - git_diff_delta *delta) -{ - unsigned int flags = GIT_PATH_REJECT_WORKDIR_DEFAULTS; - - if (action & CHECKOUT_ACTION__REMOVE) { - if (!git_path_isvalid(repo, delta->old_file.path, flags)) { - giterr_set(GITERR_CHECKOUT, "Cannot remove invalid path '%s'", delta->old_file.path); - return -1; - } - } - - if (action & ~CHECKOUT_ACTION__REMOVE) { - if (!git_path_isvalid(repo, delta->new_file.path, flags)) { - giterr_set(GITERR_CHECKOUT, "Cannot checkout to invalid path '%s'", delta->new_file.path); - return -1; - } - } - - return 0; -} - -static int checkout_get_actions( - uint32_t **actions_ptr, - size_t **counts_ptr, - checkout_data *data, - git_iterator *workdir) -{ - int error = 0, act; - const git_index_entry *wditem; - git_vector pathspec = GIT_VECTOR_INIT, *deltas; - git_pool pathpool; - git_diff_delta *delta; - size_t i, *counts = NULL; - uint32_t *actions = NULL; - - git_pool_init(&pathpool, 1); - - if (data->opts.paths.count > 0 && - git_pathspec__vinit(&pathspec, &data->opts.paths, &pathpool) < 0) - return -1; - - if ((error = git_iterator_current(&wditem, workdir)) < 0 && - error != GIT_ITEROVER) - goto fail; - - deltas = &data->diff->deltas; - - *counts_ptr = counts = git__calloc(CHECKOUT_ACTION__MAX+1, sizeof(size_t)); - *actions_ptr = actions = git__calloc( - deltas->length ? deltas->length : 1, sizeof(uint32_t)); - if (!counts || !actions) { - error = -1; - goto fail; - } - - git_vector_foreach(deltas, i, delta) { - if ((error = checkout_action(&act, data, delta, workdir, &wditem, &pathspec)) == 0) - error = checkout_verify_paths(data->repo, act, delta); - - if (error != 0) - goto fail; - - actions[i] = act; - - if (act & CHECKOUT_ACTION__REMOVE) - counts[CHECKOUT_ACTION__REMOVE]++; - if (act & CHECKOUT_ACTION__UPDATE_BLOB) - counts[CHECKOUT_ACTION__UPDATE_BLOB]++; - if (act & CHECKOUT_ACTION__UPDATE_SUBMODULE) - counts[CHECKOUT_ACTION__UPDATE_SUBMODULE]++; - if (act & CHECKOUT_ACTION__CONFLICT) - counts[CHECKOUT_ACTION__CONFLICT]++; - } - - error = checkout_remaining_wd_items(data, workdir, wditem, &pathspec); - if (error) - goto fail; - - counts[CHECKOUT_ACTION__REMOVE] += data->removes.length; - - if (counts[CHECKOUT_ACTION__CONFLICT] > 0 && - (data->strategy & GIT_CHECKOUT_ALLOW_CONFLICTS) == 0) - { - giterr_set(GITERR_CHECKOUT, "%"PRIuZ" %s checkout", - counts[CHECKOUT_ACTION__CONFLICT], - counts[CHECKOUT_ACTION__CONFLICT] == 1 ? - "conflict prevents" : "conflicts prevent"); - error = GIT_ECONFLICT; - goto fail; - } - - - if ((error = checkout_get_remove_conflicts(data, workdir, &pathspec)) < 0 || - (error = checkout_get_update_conflicts(data, workdir, &pathspec)) < 0) - goto fail; - - counts[CHECKOUT_ACTION__REMOVE_CONFLICT] = git_vector_length(&data->remove_conflicts); - counts[CHECKOUT_ACTION__UPDATE_CONFLICT] = git_vector_length(&data->update_conflicts); - - git_pathspec__vfree(&pathspec); - git_pool_clear(&pathpool); - - return 0; - -fail: - *counts_ptr = NULL; - git__free(counts); - *actions_ptr = NULL; - git__free(actions); - - git_pathspec__vfree(&pathspec); - git_pool_clear(&pathpool); - - return error; -} - -static bool should_remove_existing(checkout_data *data) -{ - int ignorecase = 0; - - git_repository__cvar(&ignorecase, data->repo, GIT_CVAR_IGNORECASE); - - return (ignorecase && - (data->strategy & GIT_CHECKOUT_DONT_REMOVE_EXISTING) == 0); -} - -#define MKDIR_NORMAL \ - GIT_MKDIR_PATH | GIT_MKDIR_VERIFY_DIR -#define MKDIR_REMOVE_EXISTING \ - MKDIR_NORMAL | GIT_MKDIR_REMOVE_FILES | GIT_MKDIR_REMOVE_SYMLINKS - -static int checkout_mkdir( - checkout_data *data, - const char *path, - const char *base, - mode_t mode, - unsigned int flags) -{ - struct git_futils_mkdir_options mkdir_opts = {0}; - int error; - - mkdir_opts.dir_map = data->mkdir_map; - mkdir_opts.pool = &data->pool; - - error = git_futils_mkdir_relative( - path, base, mode, flags, &mkdir_opts); - - data->perfdata.mkdir_calls += mkdir_opts.perfdata.mkdir_calls; - data->perfdata.stat_calls += mkdir_opts.perfdata.stat_calls; - data->perfdata.chmod_calls += mkdir_opts.perfdata.chmod_calls; - - return error; -} - -static int mkpath2file( - checkout_data *data, const char *path, unsigned int mode) -{ - struct stat st; - bool remove_existing = should_remove_existing(data); - unsigned int flags = - (remove_existing ? MKDIR_REMOVE_EXISTING : MKDIR_NORMAL) | - GIT_MKDIR_SKIP_LAST; - int error; - - if ((error = checkout_mkdir( - data, path, data->opts.target_directory, mode, flags)) < 0) - return error; - - if (remove_existing) { - data->perfdata.stat_calls++; - - if (p_lstat(path, &st) == 0) { - - /* Some file, symlink or folder already exists at this name. - * We would have removed it in remove_the_old unless we're on - * a case inensitive filesystem (or the user has asked us not - * to). Remove the similarly named file to write the new. - */ - error = git_futils_rmdir_r(path, NULL, GIT_RMDIR_REMOVE_FILES); - } else if (errno != ENOENT) { - giterr_set(GITERR_OS, "Failed to stat file '%s'", path); - return GIT_EEXISTS; - } else { - giterr_clear(); - } - } - - return error; -} - -struct checkout_stream { - git_writestream base; - const char *path; - int fd; - int open; -}; - -static int checkout_stream_write( - git_writestream *s, const char *buffer, size_t len) -{ - struct checkout_stream *stream = (struct checkout_stream *)s; - int ret; - - if ((ret = p_write(stream->fd, buffer, len)) < 0) - giterr_set(GITERR_OS, "Could not write to '%s'", stream->path); - - return ret; -} - -static int checkout_stream_close(git_writestream *s) -{ - struct checkout_stream *stream = (struct checkout_stream *)s; - assert(stream && stream->open); - - stream->open = 0; - return p_close(stream->fd); -} - -static void checkout_stream_free(git_writestream *s) -{ - GIT_UNUSED(s); -} - -static int blob_content_to_file( - checkout_data *data, - struct stat *st, - git_blob *blob, - const char *path, - const char *hint_path, - mode_t entry_filemode) -{ - int flags = data->opts.file_open_flags; - mode_t file_mode = data->opts.file_mode ? - data->opts.file_mode : entry_filemode; - git_filter_options filter_opts = GIT_FILTER_OPTIONS_INIT; - struct checkout_stream writer; - mode_t mode; - git_filter_list *fl = NULL; - int fd; - int error = 0; - - if (hint_path == NULL) - hint_path = path; - - if ((error = mkpath2file(data, path, data->opts.dir_mode)) < 0) - return error; - - if (flags <= 0) - flags = O_CREAT | O_TRUNC | O_WRONLY; - if (!(mode = file_mode)) - mode = GIT_FILEMODE_BLOB; - - if ((fd = p_open(path, flags, mode)) < 0) { - giterr_set(GITERR_OS, "Could not open '%s' for writing", path); - return fd; - } - - filter_opts.attr_session = &data->attr_session; - filter_opts.temp_buf = &data->tmp; - - if (!data->opts.disable_filters && - (error = git_filter_list__load_ext( - &fl, data->repo, blob, hint_path, - GIT_FILTER_TO_WORKTREE, &filter_opts))) { - p_close(fd); - return error; - } - - /* setup the writer */ - memset(&writer, 0, sizeof(struct checkout_stream)); - writer.base.write = checkout_stream_write; - writer.base.close = checkout_stream_close; - writer.base.free = checkout_stream_free; - writer.path = path; - writer.fd = fd; - writer.open = 1; - - error = git_filter_list_stream_blob(fl, blob, &writer.base); - - assert(writer.open == 0); - - git_filter_list_free(fl); - - if (error < 0) - return error; - - if (st) { - data->perfdata.stat_calls++; - - if ((error = p_stat(path, st)) < 0) { - giterr_set(GITERR_OS, "Error statting '%s'", path); - return error; - } - - st->st_mode = entry_filemode; - } - - return 0; -} - -static int blob_content_to_link( - checkout_data *data, - struct stat *st, - git_blob *blob, - const char *path) -{ - git_buf linktarget = GIT_BUF_INIT; - int error; - - if ((error = mkpath2file(data, path, data->opts.dir_mode)) < 0) - return error; - - if ((error = git_blob__getbuf(&linktarget, blob)) < 0) - return error; - - if (data->can_symlink) { - if ((error = p_symlink(git_buf_cstr(&linktarget), path)) < 0) - giterr_set(GITERR_OS, "Could not create symlink %s", path); - } else { - error = git_futils_fake_symlink(git_buf_cstr(&linktarget), path); - } - - if (!error) { - data->perfdata.stat_calls++; - - if ((error = p_lstat(path, st)) < 0) - giterr_set(GITERR_CHECKOUT, "Could not stat symlink %s", path); - - st->st_mode = GIT_FILEMODE_LINK; - } - - git_buf_free(&linktarget); - - return error; -} - -static int checkout_update_index( - checkout_data *data, - const git_diff_file *file, - struct stat *st) -{ - git_index_entry entry; - - if (!data->index) - return 0; - - memset(&entry, 0, sizeof(entry)); - entry.path = (char *)file->path; /* cast to prevent warning */ - git_index_entry__init_from_stat(&entry, st, true); - git_oid_cpy(&entry.id, &file->id); - - return git_index_add(data->index, &entry); -} - -static int checkout_submodule_update_index( - checkout_data *data, - const git_diff_file *file) -{ - struct stat st; - - /* update the index unless prevented */ - if ((data->strategy & GIT_CHECKOUT_DONT_UPDATE_INDEX) != 0) - return 0; - - git_buf_truncate(&data->path, data->workdir_len); - if (git_buf_puts(&data->path, file->path) < 0) - return -1; - - data->perfdata.stat_calls++; - if (p_stat(git_buf_cstr(&data->path), &st) < 0) { - giterr_set( - GITERR_CHECKOUT, "Could not stat submodule %s\n", file->path); - return GIT_ENOTFOUND; - } - - st.st_mode = GIT_FILEMODE_COMMIT; - - return checkout_update_index(data, file, &st); -} - -static int checkout_submodule( - checkout_data *data, - const git_diff_file *file) -{ - bool remove_existing = should_remove_existing(data); - int error = 0; - - /* Until submodules are supported, UPDATE_ONLY means do nothing here */ - if ((data->strategy & GIT_CHECKOUT_UPDATE_ONLY) != 0) - return 0; - - if ((error = checkout_mkdir( - data, - file->path, data->opts.target_directory, data->opts.dir_mode, - remove_existing ? MKDIR_REMOVE_EXISTING : MKDIR_NORMAL)) < 0) - return error; - - if ((error = git_submodule_lookup(NULL, data->repo, file->path)) < 0) { - /* I've observed repos with submodules in the tree that do not - * have a .gitmodules - core Git just makes an empty directory - */ - if (error == GIT_ENOTFOUND) { - giterr_clear(); - return checkout_submodule_update_index(data, file); - } - - return error; - } - - /* TODO: Support checkout_strategy options. Two circumstances: - * 1 - submodule already checked out, but we need to move the HEAD - * to the new OID, or - * 2 - submodule not checked out and we should recursively check it out - * - * Checkout will not execute a pull on the submodule, but a clone - * command should probably be able to. Do we need a submodule callback? - */ - - return checkout_submodule_update_index(data, file); -} - -static void report_progress( - checkout_data *data, - const char *path) -{ - if (data->opts.progress_cb) - data->opts.progress_cb( - path, data->completed_steps, data->total_steps, - data->opts.progress_payload); -} - -static int checkout_safe_for_update_only( - checkout_data *data, const char *path, mode_t expected_mode) -{ - struct stat st; - - data->perfdata.stat_calls++; - - if (p_lstat(path, &st) < 0) { - /* if doesn't exist, then no error and no update */ - if (errno == ENOENT || errno == ENOTDIR) - return 0; - - /* otherwise, stat error and no update */ - giterr_set(GITERR_OS, "Failed to stat file '%s'", path); - return -1; - } - - /* only safe for update if this is the same type of file */ - if ((st.st_mode & ~0777) == (expected_mode & ~0777)) - return 1; - - return 0; -} - -static int checkout_write_content( - checkout_data *data, - const git_oid *oid, - const char *full_path, - const char *hint_path, - unsigned int mode, - struct stat *st) -{ - int error = 0; - git_blob *blob; - - if ((error = git_blob_lookup(&blob, data->repo, oid)) < 0) - return error; - - if (S_ISLNK(mode)) - error = blob_content_to_link(data, st, blob, full_path); - else - error = blob_content_to_file(data, st, blob, full_path, hint_path, mode); - - git_blob_free(blob); - - /* if we try to create the blob and an existing directory blocks it from - * being written, then there must have been a typechange conflict in a - * parent directory - suppress the error and try to continue. - */ - if ((data->strategy & GIT_CHECKOUT_ALLOW_CONFLICTS) != 0 && - (error == GIT_ENOTFOUND || error == GIT_EEXISTS)) - { - giterr_clear(); - error = 0; - } - - return error; -} - -static int checkout_blob( - checkout_data *data, - const git_diff_file *file) -{ - int error = 0; - struct stat st; - - git_buf_truncate(&data->path, data->workdir_len); - if (git_buf_puts(&data->path, file->path) < 0) - return -1; - - if ((data->strategy & GIT_CHECKOUT_UPDATE_ONLY) != 0) { - int rval = checkout_safe_for_update_only( - data, git_buf_cstr(&data->path), file->mode); - if (rval <= 0) - return rval; - } - - error = checkout_write_content( - data, &file->id, git_buf_cstr(&data->path), NULL, file->mode, &st); - - /* update the index unless prevented */ - if (!error && (data->strategy & GIT_CHECKOUT_DONT_UPDATE_INDEX) == 0) - error = checkout_update_index(data, file, &st); - - /* update the submodule data if this was a new .gitmodules file */ - if (!error && strcmp(file->path, ".gitmodules") == 0) - data->reload_submodules = true; - - return error; -} - -static int checkout_remove_the_old( - unsigned int *actions, - checkout_data *data) -{ - int error = 0; - git_diff_delta *delta; - const char *str; - size_t i; - const char *workdir = git_buf_cstr(&data->path); - uint32_t flg = GIT_RMDIR_EMPTY_PARENTS | - GIT_RMDIR_REMOVE_FILES | GIT_RMDIR_REMOVE_BLOCKERS; - - if (data->opts.checkout_strategy & GIT_CHECKOUT_SKIP_LOCKED_DIRECTORIES) - flg |= GIT_RMDIR_SKIP_NONEMPTY; - - git_buf_truncate(&data->path, data->workdir_len); - - git_vector_foreach(&data->diff->deltas, i, delta) { - if (actions[i] & CHECKOUT_ACTION__REMOVE) { - error = git_futils_rmdir_r(delta->old_file.path, workdir, flg); - if (error < 0) - return error; - - data->completed_steps++; - report_progress(data, delta->old_file.path); - - if ((actions[i] & CHECKOUT_ACTION__UPDATE_BLOB) == 0 && - (data->strategy & GIT_CHECKOUT_DONT_UPDATE_INDEX) == 0 && - data->index != NULL) - { - (void)git_index_remove(data->index, delta->old_file.path, 0); - } - } - } - - git_vector_foreach(&data->removes, i, str) { - error = git_futils_rmdir_r(str, workdir, flg); - if (error < 0) - return error; - - data->completed_steps++; - report_progress(data, str); - - if ((data->strategy & GIT_CHECKOUT_DONT_UPDATE_INDEX) == 0 && - data->index != NULL) - { - if (str[strlen(str) - 1] == '/') - (void)git_index_remove_directory(data->index, str, 0); - else - (void)git_index_remove(data->index, str, 0); - } - } - - return 0; -} - -static int checkout_deferred_remove(git_repository *repo, const char *path) -{ -#if 0 - int error = git_futils_rmdir_r( - path, data->opts.target_directory, GIT_RMDIR_EMPTY_PARENTS); - - if (error == GIT_ENOTFOUND) { - error = 0; - giterr_clear(); - } - - return error; -#else - GIT_UNUSED(repo); - GIT_UNUSED(path); - assert(false); - return 0; -#endif -} - -static int checkout_create_the_new( - unsigned int *actions, - checkout_data *data) -{ - int error = 0; - git_diff_delta *delta; - size_t i; - - git_vector_foreach(&data->diff->deltas, i, delta) { - if (actions[i] & CHECKOUT_ACTION__DEFER_REMOVE) { - /* this had a blocker directory that should only be removed iff - * all of the contents of the directory were safely removed - */ - if ((error = checkout_deferred_remove( - data->repo, delta->old_file.path)) < 0) - return error; - } - - if (actions[i] & CHECKOUT_ACTION__UPDATE_BLOB) { - error = checkout_blob(data, &delta->new_file); - if (error < 0) - return error; - - data->completed_steps++; - report_progress(data, delta->new_file.path); - } - } - - return 0; -} - -static int checkout_create_submodules( - unsigned int *actions, - checkout_data *data) -{ - int error = 0; - git_diff_delta *delta; - size_t i; - - git_vector_foreach(&data->diff->deltas, i, delta) { - if (actions[i] & CHECKOUT_ACTION__DEFER_REMOVE) { - /* this has a blocker directory that should only be removed iff - * all of the contents of the directory were safely removed - */ - if ((error = checkout_deferred_remove( - data->repo, delta->old_file.path)) < 0) - return error; - } - - if (actions[i] & CHECKOUT_ACTION__UPDATE_SUBMODULE) { - int error = checkout_submodule(data, &delta->new_file); - if (error < 0) - return error; - - data->completed_steps++; - report_progress(data, delta->new_file.path); - } - } - - return 0; -} - -static int checkout_lookup_head_tree(git_tree **out, git_repository *repo) -{ - int error = 0; - git_reference *ref = NULL; - git_object *head; - - if (!(error = git_repository_head(&ref, repo)) && - !(error = git_reference_peel(&head, ref, GIT_OBJ_TREE))) - *out = (git_tree *)head; - - git_reference_free(ref); - - return error; -} - - -static int conflict_entry_name( - git_buf *out, - const char *side_name, - const char *filename) -{ - if (git_buf_puts(out, side_name) < 0 || - git_buf_putc(out, ':') < 0 || - git_buf_puts(out, filename) < 0) - return -1; - - return 0; -} - -static int checkout_path_suffixed(git_buf *path, const char *suffix) -{ - size_t path_len; - int i = 0, error = 0; - - if ((error = git_buf_putc(path, '~')) < 0 || (error = git_buf_puts(path, suffix)) < 0) - return -1; - - path_len = git_buf_len(path); - - while (git_path_exists(git_buf_cstr(path)) && i < INT_MAX) { - git_buf_truncate(path, path_len); - - if ((error = git_buf_putc(path, '_')) < 0 || - (error = git_buf_printf(path, "%d", i)) < 0) - return error; - - i++; - } - - if (i == INT_MAX) { - git_buf_truncate(path, path_len); - - giterr_set(GITERR_CHECKOUT, "Could not write '%s': working directory file exists", path); - return GIT_EEXISTS; - } - - return 0; -} - -static int checkout_write_entry( - checkout_data *data, - checkout_conflictdata *conflict, - const git_index_entry *side) -{ - const char *hint_path = NULL, *suffix; - struct stat st; - int error; - - assert (side == conflict->ours || side == conflict->theirs); - - git_buf_truncate(&data->path, data->workdir_len); - if (git_buf_puts(&data->path, side->path) < 0) - return -1; - - if ((conflict->name_collision || conflict->directoryfile) && - (data->strategy & GIT_CHECKOUT_USE_OURS) == 0 && - (data->strategy & GIT_CHECKOUT_USE_THEIRS) == 0) { - - if (side == conflict->ours) - suffix = data->opts.our_label ? data->opts.our_label : - "ours"; - else - suffix = data->opts.their_label ? data->opts.their_label : - "theirs"; - - if (checkout_path_suffixed(&data->path, suffix) < 0) - return -1; - - hint_path = side->path; - } - - if ((data->strategy & GIT_CHECKOUT_UPDATE_ONLY) != 0 && - (error = checkout_safe_for_update_only(data, git_buf_cstr(&data->path), side->mode)) <= 0) - return error; - - return checkout_write_content(data, - &side->id, git_buf_cstr(&data->path), hint_path, side->mode, &st); -} - -static int checkout_write_entries( - checkout_data *data, - checkout_conflictdata *conflict) -{ - int error = 0; - - if ((error = checkout_write_entry(data, conflict, conflict->ours)) >= 0) - error = checkout_write_entry(data, conflict, conflict->theirs); - - return error; -} - -static int checkout_merge_path( - git_buf *out, - checkout_data *data, - checkout_conflictdata *conflict, - git_merge_file_result *result) -{ - const char *our_label_raw, *their_label_raw, *suffix; - int error = 0; - - if ((error = git_buf_joinpath(out, git_repository_workdir(data->repo), result->path)) < 0) - return error; - - /* Most conflicts simply use the filename in the index */ - if (!conflict->name_collision) - return 0; - - /* Rename 2->1 conflicts need the branch name appended */ - our_label_raw = data->opts.our_label ? data->opts.our_label : "ours"; - their_label_raw = data->opts.their_label ? data->opts.their_label : "theirs"; - suffix = strcmp(result->path, conflict->ours->path) == 0 ? our_label_raw : their_label_raw; - - if ((error = checkout_path_suffixed(out, suffix)) < 0) - return error; - - return 0; -} - -static int checkout_write_merge( - checkout_data *data, - checkout_conflictdata *conflict) -{ - git_buf our_label = GIT_BUF_INIT, their_label = GIT_BUF_INIT, - path_suffixed = GIT_BUF_INIT, path_workdir = GIT_BUF_INIT, - in_data = GIT_BUF_INIT, out_data = GIT_BUF_INIT; - git_merge_file_options opts = GIT_MERGE_FILE_OPTIONS_INIT; - git_merge_file_result result = {0}; - git_filebuf output = GIT_FILEBUF_INIT; - git_filter_list *fl = NULL; - git_filter_options filter_opts = GIT_FILTER_OPTIONS_INIT; - int error = 0; - - if (data->opts.checkout_strategy & GIT_CHECKOUT_CONFLICT_STYLE_DIFF3) - opts.flags |= GIT_MERGE_FILE_STYLE_DIFF3; - - opts.ancestor_label = data->opts.ancestor_label ? - data->opts.ancestor_label : "ancestor"; - opts.our_label = data->opts.our_label ? - data->opts.our_label : "ours"; - opts.their_label = data->opts.their_label ? - data->opts.their_label : "theirs"; - - /* If all the paths are identical, decorate the diff3 file with the branch - * names. Otherwise, append branch_name:path. - */ - if (conflict->ours && conflict->theirs && - strcmp(conflict->ours->path, conflict->theirs->path) != 0) { - - if ((error = conflict_entry_name( - &our_label, opts.our_label, conflict->ours->path)) < 0 || - (error = conflict_entry_name( - &their_label, opts.their_label, conflict->theirs->path)) < 0) - goto done; - - opts.our_label = git_buf_cstr(&our_label); - opts.their_label = git_buf_cstr(&their_label); - } - - if ((error = git_merge_file_from_index(&result, data->repo, - conflict->ancestor, conflict->ours, conflict->theirs, &opts)) < 0) - goto done; - - if (result.path == NULL || result.mode == 0) { - giterr_set(GITERR_CHECKOUT, "Could not merge contents of file"); - error = GIT_ECONFLICT; - goto done; - } - - if ((error = checkout_merge_path(&path_workdir, data, conflict, &result)) < 0) - goto done; - - if ((data->strategy & GIT_CHECKOUT_UPDATE_ONLY) != 0 && - (error = checkout_safe_for_update_only(data, git_buf_cstr(&path_workdir), result.mode)) <= 0) - goto done; - - if (!data->opts.disable_filters) { - in_data.ptr = (char *)result.ptr; - in_data.size = result.len; - - filter_opts.attr_session = &data->attr_session; - filter_opts.temp_buf = &data->tmp; - - if ((error = git_filter_list__load_ext( - &fl, data->repo, NULL, git_buf_cstr(&path_workdir), - GIT_FILTER_TO_WORKTREE, &filter_opts)) < 0 || - (error = git_filter_list_apply_to_data(&out_data, fl, &in_data)) < 0) - goto done; - } else { - out_data.ptr = (char *)result.ptr; - out_data.size = result.len; - } - - if ((error = mkpath2file(data, path_workdir.ptr, data->opts.dir_mode)) < 0 || - (error = git_filebuf_open(&output, git_buf_cstr(&path_workdir), GIT_FILEBUF_DO_NOT_BUFFER, result.mode)) < 0 || - (error = git_filebuf_write(&output, out_data.ptr, out_data.size)) < 0 || - (error = git_filebuf_commit(&output)) < 0) - goto done; - -done: - git_filter_list_free(fl); - - git_buf_free(&out_data); - git_buf_free(&our_label); - git_buf_free(&their_label); - - git_merge_file_result_free(&result); - git_buf_free(&path_workdir); - git_buf_free(&path_suffixed); - - return error; -} - -static int checkout_conflict_add( - checkout_data *data, - const git_index_entry *conflict) -{ - int error = git_index_remove(data->index, conflict->path, 0); - - if (error == GIT_ENOTFOUND) - giterr_clear(); - else if (error < 0) - return error; - - return git_index_add(data->index, conflict); -} - -static int checkout_conflict_update_index( - checkout_data *data, - checkout_conflictdata *conflict) -{ - int error = 0; - - if (conflict->ancestor) - error = checkout_conflict_add(data, conflict->ancestor); - - if (!error && conflict->ours) - error = checkout_conflict_add(data, conflict->ours); - - if (!error && conflict->theirs) - error = checkout_conflict_add(data, conflict->theirs); - - return error; -} - -static int checkout_create_conflicts(checkout_data *data) -{ - checkout_conflictdata *conflict; - size_t i; - int error = 0; - - git_vector_foreach(&data->update_conflicts, i, conflict) { - - /* Both deleted: nothing to do */ - if (conflict->ours == NULL && conflict->theirs == NULL) - error = 0; - - else if ((data->strategy & GIT_CHECKOUT_USE_OURS) && - conflict->ours) - error = checkout_write_entry(data, conflict, conflict->ours); - else if ((data->strategy & GIT_CHECKOUT_USE_THEIRS) && - conflict->theirs) - error = checkout_write_entry(data, conflict, conflict->theirs); - - /* Ignore the other side of name collisions. */ - else if ((data->strategy & GIT_CHECKOUT_USE_OURS) && - !conflict->ours && conflict->name_collision) - error = 0; - else if ((data->strategy & GIT_CHECKOUT_USE_THEIRS) && - !conflict->theirs && conflict->name_collision) - error = 0; - - /* For modify/delete, name collisions and d/f conflicts, write - * the file (potentially with the name mangled. - */ - else if (conflict->ours != NULL && conflict->theirs == NULL) - error = checkout_write_entry(data, conflict, conflict->ours); - else if (conflict->ours == NULL && conflict->theirs != NULL) - error = checkout_write_entry(data, conflict, conflict->theirs); - - /* Add/add conflicts and rename 1->2 conflicts, write the - * ours/theirs sides (potentially name mangled). - */ - else if (conflict->one_to_two) - error = checkout_write_entries(data, conflict); - - /* If all sides are links, write the ours side */ - else if (S_ISLNK(conflict->ours->mode) && - S_ISLNK(conflict->theirs->mode)) - error = checkout_write_entry(data, conflict, conflict->ours); - /* Link/file conflicts, write the file side */ - else if (S_ISLNK(conflict->ours->mode)) - error = checkout_write_entry(data, conflict, conflict->theirs); - else if (S_ISLNK(conflict->theirs->mode)) - error = checkout_write_entry(data, conflict, conflict->ours); - - /* If any side is a gitlink, do nothing. */ - else if (conflict->submodule) - error = 0; - - /* If any side is binary, write the ours side */ - else if (conflict->binary) - error = checkout_write_entry(data, conflict, conflict->ours); - - else if (!error) - error = checkout_write_merge(data, conflict); - - /* Update the index extensions (REUC and NAME) if we're checking - * out a different index. (Otherwise just leave them there.) - */ - if (!error && (data->strategy & GIT_CHECKOUT_DONT_UPDATE_INDEX) == 0) - error = checkout_conflict_update_index(data, conflict); - - if (error) - break; - - data->completed_steps++; - report_progress(data, - conflict->ours ? conflict->ours->path : - (conflict->theirs ? conflict->theirs->path : conflict->ancestor->path)); - } - - return error; -} - -static int checkout_remove_conflicts(checkout_data *data) -{ - const char *conflict; - size_t i; - - git_vector_foreach(&data->remove_conflicts, i, conflict) { - if (git_index_conflict_remove(data->index, conflict) < 0) - return -1; - - data->completed_steps++; - } - - return 0; -} - -static int checkout_extensions_update_index(checkout_data *data) -{ - const git_index_reuc_entry *reuc_entry; - const git_index_name_entry *name_entry; - size_t i; - int error = 0; - - if ((data->strategy & GIT_CHECKOUT_UPDATE_ONLY) != 0) - return 0; - - if (data->update_reuc) { - git_vector_foreach(data->update_reuc, i, reuc_entry) { - if ((error = git_index_reuc_add(data->index, reuc_entry->path, - reuc_entry->mode[0], &reuc_entry->oid[0], - reuc_entry->mode[1], &reuc_entry->oid[1], - reuc_entry->mode[2], &reuc_entry->oid[2])) < 0) - goto done; - } - } - - if (data->update_names) { - git_vector_foreach(data->update_names, i, name_entry) { - if ((error = git_index_name_add(data->index, name_entry->ancestor, - name_entry->ours, name_entry->theirs)) < 0) - goto done; - } - } - -done: - return error; -} - -static void checkout_data_clear(checkout_data *data) -{ - if (data->opts_free_baseline) { - git_tree_free(data->opts.baseline); - data->opts.baseline = NULL; - } - - git_vector_free(&data->removes); - git_pool_clear(&data->pool); - - git_vector_free_deep(&data->remove_conflicts); - git_vector_free_deep(&data->update_conflicts); - - git__free(data->pfx); - data->pfx = NULL; - - git_strmap_free(data->mkdir_map); - - git_buf_free(&data->path); - git_buf_free(&data->tmp); - - git_index_free(data->index); - data->index = NULL; - - git_strmap_free(data->mkdir_map); - - git_attr_session__free(&data->attr_session); -} - -static int checkout_data_init( - checkout_data *data, - git_iterator *target, - const git_checkout_options *proposed) -{ - int error = 0; - git_repository *repo = git_iterator_owner(target); - - memset(data, 0, sizeof(*data)); - - if (!repo) { - giterr_set(GITERR_CHECKOUT, "Cannot checkout nothing"); - return -1; - } - - if ((!proposed || !proposed->target_directory) && - (error = git_repository__ensure_not_bare(repo, "checkout")) < 0) - return error; - - data->repo = repo; - data->target = target; - - GITERR_CHECK_VERSION( - proposed, GIT_CHECKOUT_OPTIONS_VERSION, "git_checkout_options"); - - if (!proposed) - GIT_INIT_STRUCTURE(&data->opts, GIT_CHECKOUT_OPTIONS_VERSION); - else - memmove(&data->opts, proposed, sizeof(git_checkout_options)); - - if (!data->opts.target_directory) - data->opts.target_directory = git_repository_workdir(repo); - else if (!git_path_isdir(data->opts.target_directory) && - (error = checkout_mkdir(data, - data->opts.target_directory, NULL, - GIT_DIR_MODE, GIT_MKDIR_VERIFY_DIR)) < 0) - goto cleanup; - - /* refresh config and index content unless NO_REFRESH is given */ - if ((data->opts.checkout_strategy & GIT_CHECKOUT_NO_REFRESH) == 0) { - git_config *cfg; - - if ((error = git_repository_config__weakptr(&cfg, repo)) < 0) - goto cleanup; - - /* Get the repository index and reload it (unless we're checking - * out the index; then it has the changes we're trying to check - * out and those should not be overwritten.) - */ - if ((error = git_repository_index(&data->index, data->repo)) < 0) - goto cleanup; - - if (data->index != git_iterator_get_index(target)) { - if ((error = git_index_read(data->index, true)) < 0) - goto cleanup; - - /* cannot checkout if unresolved conflicts exist */ - if ((data->opts.checkout_strategy & GIT_CHECKOUT_FORCE) == 0 && - git_index_has_conflicts(data->index)) { - error = GIT_ECONFLICT; - giterr_set(GITERR_CHECKOUT, - "unresolved conflicts exist in the index"); - goto cleanup; - } - - /* clean conflict data in the current index */ - git_index_name_clear(data->index); - git_index_reuc_clear(data->index); - } - } - - /* if you are forcing, allow all safe updates, plus recreate missing */ - if ((data->opts.checkout_strategy & GIT_CHECKOUT_FORCE) != 0) - data->opts.checkout_strategy |= GIT_CHECKOUT_SAFE | - GIT_CHECKOUT_RECREATE_MISSING; - - /* if the repository does not actually have an index file, then this - * is an initial checkout (perhaps from clone), so we allow safe updates - */ - if (!data->index->on_disk && - (data->opts.checkout_strategy & GIT_CHECKOUT_SAFE) != 0) - data->opts.checkout_strategy |= GIT_CHECKOUT_RECREATE_MISSING; - - data->strategy = data->opts.checkout_strategy; - - /* opts->disable_filters is false by default */ - - if (!data->opts.dir_mode) - data->opts.dir_mode = GIT_DIR_MODE; - - if (!data->opts.file_open_flags) - data->opts.file_open_flags = O_CREAT | O_TRUNC | O_WRONLY; - - data->pfx = git_pathspec_prefix(&data->opts.paths); - - if ((error = git_repository__cvar( - &data->can_symlink, repo, GIT_CVAR_SYMLINKS)) < 0) - goto cleanup; - - if (!data->opts.baseline && !data->opts.baseline_index) { - data->opts_free_baseline = true; - - error = checkout_lookup_head_tree(&data->opts.baseline, repo); - - if (error == GIT_EUNBORNBRANCH) { - error = 0; - giterr_clear(); - } - - if (error < 0) - goto cleanup; - } - - if ((data->opts.checkout_strategy & - (GIT_CHECKOUT_CONFLICT_STYLE_MERGE | GIT_CHECKOUT_CONFLICT_STYLE_DIFF3)) == 0) { - git_config_entry *conflict_style = NULL; - git_config *cfg = NULL; - - if ((error = git_repository_config__weakptr(&cfg, repo)) < 0 || - (error = git_config_get_entry(&conflict_style, cfg, "merge.conflictstyle")) < 0 || - error == GIT_ENOTFOUND) - ; - else if (error) - goto cleanup; - else if (strcmp(conflict_style->value, "merge") == 0) - data->opts.checkout_strategy |= GIT_CHECKOUT_CONFLICT_STYLE_MERGE; - else if (strcmp(conflict_style->value, "diff3") == 0) - data->opts.checkout_strategy |= GIT_CHECKOUT_CONFLICT_STYLE_DIFF3; - else { - giterr_set(GITERR_CHECKOUT, "unknown style '%s' given for 'merge.conflictstyle'", - conflict_style); - error = -1; - git_config_entry_free(conflict_style); - goto cleanup; - } - git_config_entry_free(conflict_style); - } - - git_pool_init(&data->pool, 1); - - if ((error = git_vector_init(&data->removes, 0, git__strcmp_cb)) < 0 || - (error = git_vector_init(&data->remove_conflicts, 0, NULL)) < 0 || - (error = git_vector_init(&data->update_conflicts, 0, NULL)) < 0 || - (error = git_buf_puts(&data->path, data->opts.target_directory)) < 0 || - (error = git_path_to_dir(&data->path)) < 0 || - (error = git_strmap_alloc(&data->mkdir_map)) < 0) - goto cleanup; - - data->workdir_len = git_buf_len(&data->path); - - git_attr_session__init(&data->attr_session, data->repo); - -cleanup: - if (error < 0) - checkout_data_clear(data); - - return error; -} - -#define CHECKOUT_INDEX_DONT_WRITE_MASK \ - (GIT_CHECKOUT_DONT_UPDATE_INDEX | GIT_CHECKOUT_DONT_WRITE_INDEX) - -int git_checkout_iterator( - git_iterator *target, - git_index *index, - const git_checkout_options *opts) -{ - int error = 0; - git_iterator *baseline = NULL, *workdir = NULL; - git_iterator_options baseline_opts = GIT_ITERATOR_OPTIONS_INIT, - workdir_opts = GIT_ITERATOR_OPTIONS_INIT; - checkout_data data = {0}; - git_diff_options diff_opts = GIT_DIFF_OPTIONS_INIT; - uint32_t *actions = NULL; - size_t *counts = NULL; - - /* initialize structures and options */ - error = checkout_data_init(&data, target, opts); - if (error < 0) - return error; - - diff_opts.flags = - GIT_DIFF_INCLUDE_UNMODIFIED | - GIT_DIFF_INCLUDE_UNREADABLE | - GIT_DIFF_INCLUDE_UNTRACKED | - GIT_DIFF_RECURSE_UNTRACKED_DIRS | /* needed to match baseline */ - GIT_DIFF_INCLUDE_IGNORED | - GIT_DIFF_INCLUDE_TYPECHANGE | - GIT_DIFF_INCLUDE_TYPECHANGE_TREES | - GIT_DIFF_SKIP_BINARY_CHECK | - GIT_DIFF_INCLUDE_CASECHANGE; - if (data.opts.checkout_strategy & GIT_CHECKOUT_DISABLE_PATHSPEC_MATCH) - diff_opts.flags |= GIT_DIFF_DISABLE_PATHSPEC_MATCH; - if (data.opts.paths.count > 0) - diff_opts.pathspec = data.opts.paths; - - /* set up iterators */ - - workdir_opts.flags = git_iterator_ignore_case(target) ? - GIT_ITERATOR_IGNORE_CASE : GIT_ITERATOR_DONT_IGNORE_CASE; - workdir_opts.flags |= GIT_ITERATOR_DONT_AUTOEXPAND; - workdir_opts.start = data.pfx; - workdir_opts.end = data.pfx; - - if ((error = git_iterator_reset(target, data.pfx, data.pfx)) < 0 || - (error = git_iterator_for_workdir_ext( - &workdir, data.repo, data.opts.target_directory, index, NULL, - &workdir_opts)) < 0) - goto cleanup; - - baseline_opts.flags = git_iterator_ignore_case(target) ? - GIT_ITERATOR_IGNORE_CASE : GIT_ITERATOR_DONT_IGNORE_CASE; - baseline_opts.start = data.pfx; - baseline_opts.end = data.pfx; - - if (data.opts.baseline_index) { - if ((error = git_iterator_for_index( - &baseline, git_index_owner(data.opts.baseline_index), - data.opts.baseline_index, &baseline_opts)) < 0) - goto cleanup; - } else { - if ((error = git_iterator_for_tree( - &baseline, data.opts.baseline, &baseline_opts)) < 0) - goto cleanup; - } - - /* Should not have case insensitivity mismatch */ - assert(git_iterator_ignore_case(workdir) == git_iterator_ignore_case(baseline)); - - /* Generate baseline-to-target diff which will include an entry for - * every possible update that might need to be made. - */ - if ((error = git_diff__from_iterators( - &data.diff, data.repo, baseline, target, &diff_opts)) < 0) - goto cleanup; - - /* Loop through diff (and working directory iterator) building a list of - * actions to be taken, plus look for conflicts and send notifications, - * then loop through conflicts. - */ - if ((error = checkout_get_actions(&actions, &counts, &data, workdir)) != 0) - goto cleanup; - - data.total_steps = counts[CHECKOUT_ACTION__REMOVE] + - counts[CHECKOUT_ACTION__REMOVE_CONFLICT] + - counts[CHECKOUT_ACTION__UPDATE_BLOB] + - counts[CHECKOUT_ACTION__UPDATE_SUBMODULE] + - counts[CHECKOUT_ACTION__UPDATE_CONFLICT]; - - report_progress(&data, NULL); /* establish 0 baseline */ - - /* To deal with some order dependencies, perform remaining checkout - * in three passes: removes, then update blobs, then update submodules. - */ - if (counts[CHECKOUT_ACTION__REMOVE] > 0 && - (error = checkout_remove_the_old(actions, &data)) < 0) - goto cleanup; - - if (counts[CHECKOUT_ACTION__REMOVE_CONFLICT] > 0 && - (error = checkout_remove_conflicts(&data)) < 0) - goto cleanup; - - if (counts[CHECKOUT_ACTION__UPDATE_BLOB] > 0 && - (error = checkout_create_the_new(actions, &data)) < 0) - goto cleanup; - - if (counts[CHECKOUT_ACTION__UPDATE_SUBMODULE] > 0 && - (error = checkout_create_submodules(actions, &data)) < 0) - goto cleanup; - - if (counts[CHECKOUT_ACTION__UPDATE_CONFLICT] > 0 && - (error = checkout_create_conflicts(&data)) < 0) - goto cleanup; - - if (data.index != git_iterator_get_index(target) && - (error = checkout_extensions_update_index(&data)) < 0) - goto cleanup; - - assert(data.completed_steps == data.total_steps); - - if (data.opts.perfdata_cb) - data.opts.perfdata_cb(&data.perfdata, data.opts.perfdata_payload); - -cleanup: - if (!error && data.index != NULL && - (data.strategy & CHECKOUT_INDEX_DONT_WRITE_MASK) == 0) - error = git_index_write(data.index); - - git_diff_free(data.diff); - git_iterator_free(workdir); - git_iterator_free(baseline); - git__free(actions); - git__free(counts); - checkout_data_clear(&data); - - return error; -} - -int git_checkout_index( - git_repository *repo, - git_index *index, - const git_checkout_options *opts) -{ - int error, owned = 0; - git_iterator *index_i; - - if (!index && !repo) { - giterr_set(GITERR_CHECKOUT, - "Must provide either repository or index to checkout"); - return -1; - } - - if (index && repo && - git_index_owner(index) && - git_index_owner(index) != repo) { - giterr_set(GITERR_CHECKOUT, - "Index to checkout does not match repository"); - return -1; - } else if(index && repo && !git_index_owner(index)) { - GIT_REFCOUNT_OWN(index, repo); - owned = 1; - } - - if (!repo) - repo = git_index_owner(index); - - if (!index && (error = git_repository_index__weakptr(&index, repo)) < 0) - return error; - GIT_REFCOUNT_INC(index); - - if (!(error = git_iterator_for_index(&index_i, repo, index, NULL))) - error = git_checkout_iterator(index_i, index, opts); - - if (owned) - GIT_REFCOUNT_OWN(index, NULL); - - git_iterator_free(index_i); - git_index_free(index); - - return error; -} - -int git_checkout_tree( - git_repository *repo, - const git_object *treeish, - const git_checkout_options *opts) -{ - int error; - git_index *index; - git_tree *tree = NULL; - git_iterator *tree_i = NULL; - git_iterator_options iter_opts = GIT_ITERATOR_OPTIONS_INIT; - - if (!treeish && !repo) { - giterr_set(GITERR_CHECKOUT, - "Must provide either repository or tree to checkout"); - return -1; - } - if (treeish && repo && git_object_owner(treeish) != repo) { - giterr_set(GITERR_CHECKOUT, - "Object to checkout does not match repository"); - return -1; - } - - if (!repo) - repo = git_object_owner(treeish); - - if (treeish) { - if (git_object_peel((git_object **)&tree, treeish, GIT_OBJ_TREE) < 0) { - giterr_set( - GITERR_CHECKOUT, "Provided object cannot be peeled to a tree"); - return -1; - } - } - else { - if ((error = checkout_lookup_head_tree(&tree, repo)) < 0) { - if (error != GIT_EUNBORNBRANCH) - giterr_set( - GITERR_CHECKOUT, - "HEAD could not be peeled to a tree and no treeish given"); - return error; - } - } - - if ((error = git_repository_index(&index, repo)) < 0) - return error; - - if ((opts->checkout_strategy & GIT_CHECKOUT_DISABLE_PATHSPEC_MATCH)) { - iter_opts.pathlist.count = opts->paths.count; - iter_opts.pathlist.strings = opts->paths.strings; - } - - if (!(error = git_iterator_for_tree(&tree_i, tree, &iter_opts))) - error = git_checkout_iterator(tree_i, index, opts); - - git_iterator_free(tree_i); - git_index_free(index); - git_tree_free(tree); - - return error; -} - -int git_checkout_head( - git_repository *repo, - const git_checkout_options *opts) -{ - assert(repo); - return git_checkout_tree(repo, NULL, opts); -} - -int git_checkout_init_options(git_checkout_options *opts, unsigned int version) -{ - GIT_INIT_STRUCTURE_FROM_TEMPLATE( - opts, version, git_checkout_options, GIT_CHECKOUT_OPTIONS_INIT); - return 0; -} diff --git a/vendor/libgit2/src/checkout.h b/vendor/libgit2/src/checkout.h deleted file mode 100644 index 60aa29b26..000000000 --- a/vendor/libgit2/src/checkout.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_checkout_h__ -#define INCLUDE_checkout_h__ - -#include "git2/checkout.h" -#include "iterator.h" - -#define GIT_CHECKOUT__NOTIFY_CONFLICT_TREE (1u << 12) - -/** - * Update the working directory to match the target iterator. The - * expected baseline value can be passed in via the checkout options - * or else will default to the HEAD commit. - */ -extern int git_checkout_iterator( - git_iterator *target, - git_index *index, - const git_checkout_options *opts); - -#endif diff --git a/vendor/libgit2/src/cherrypick.c b/vendor/libgit2/src/cherrypick.c deleted file mode 100644 index c92975194..000000000 --- a/vendor/libgit2/src/cherrypick.c +++ /dev/null @@ -1,229 +0,0 @@ -/* -* Copyright (C) the libgit2 contributors. All rights reserved. -* -* This file is part of libgit2, distributed under the GNU GPL v2 with -* a Linking Exception. For full terms see the included COPYING file. -*/ - -#include "common.h" -#include "repository.h" -#include "filebuf.h" -#include "merge.h" -#include "vector.h" -#include "index.h" - -#include "git2/types.h" -#include "git2/merge.h" -#include "git2/cherrypick.h" -#include "git2/commit.h" -#include "git2/sys/commit.h" - -#define GIT_CHERRYPICK_FILE_MODE 0666 - -static int write_cherrypick_head( - git_repository *repo, - const char *commit_oidstr) -{ - git_filebuf file = GIT_FILEBUF_INIT; - git_buf file_path = GIT_BUF_INIT; - int error = 0; - - if ((error = git_buf_joinpath(&file_path, repo->path_repository, GIT_CHERRYPICK_HEAD_FILE)) >= 0 && - (error = git_filebuf_open(&file, file_path.ptr, GIT_FILEBUF_FORCE, GIT_CHERRYPICK_FILE_MODE)) >= 0 && - (error = git_filebuf_printf(&file, "%s\n", commit_oidstr)) >= 0) - error = git_filebuf_commit(&file); - - if (error < 0) - git_filebuf_cleanup(&file); - - git_buf_free(&file_path); - - return error; -} - -static int write_merge_msg( - git_repository *repo, - const char *commit_msg) -{ - git_filebuf file = GIT_FILEBUF_INIT; - git_buf file_path = GIT_BUF_INIT; - int error = 0; - - if ((error = git_buf_joinpath(&file_path, repo->path_repository, GIT_MERGE_MSG_FILE)) < 0 || - (error = git_filebuf_open(&file, file_path.ptr, GIT_FILEBUF_FORCE, GIT_CHERRYPICK_FILE_MODE)) < 0 || - (error = git_filebuf_printf(&file, "%s", commit_msg)) < 0) - goto cleanup; - - error = git_filebuf_commit(&file); - -cleanup: - if (error < 0) - git_filebuf_cleanup(&file); - - git_buf_free(&file_path); - - return error; -} - -static int cherrypick_normalize_opts( - git_repository *repo, - git_cherrypick_options *opts, - const git_cherrypick_options *given, - const char *their_label) -{ - int error = 0; - unsigned int default_checkout_strategy = GIT_CHECKOUT_SAFE | - GIT_CHECKOUT_ALLOW_CONFLICTS; - - GIT_UNUSED(repo); - - if (given != NULL) - memcpy(opts, given, sizeof(git_cherrypick_options)); - else { - git_cherrypick_options default_opts = GIT_CHERRYPICK_OPTIONS_INIT; - memcpy(opts, &default_opts, sizeof(git_cherrypick_options)); - } - - if (!opts->checkout_opts.checkout_strategy) - opts->checkout_opts.checkout_strategy = default_checkout_strategy; - - if (!opts->checkout_opts.our_label) - opts->checkout_opts.our_label = "HEAD"; - - if (!opts->checkout_opts.their_label) - opts->checkout_opts.their_label = their_label; - - return error; -} - -static int cherrypick_state_cleanup(git_repository *repo) -{ - const char *state_files[] = { GIT_CHERRYPICK_HEAD_FILE, GIT_MERGE_MSG_FILE }; - - return git_repository__cleanup_files(repo, state_files, ARRAY_SIZE(state_files)); -} - -static int cherrypick_seterr(git_commit *commit, const char *fmt) -{ - char commit_oidstr[GIT_OID_HEXSZ + 1]; - - giterr_set(GITERR_CHERRYPICK, fmt, - git_oid_tostr(commit_oidstr, GIT_OID_HEXSZ + 1, git_commit_id(commit))); - - return -1; -} - -int git_cherrypick_commit( - git_index **out, - git_repository *repo, - git_commit *cherrypick_commit, - git_commit *our_commit, - unsigned int mainline, - const git_merge_options *merge_opts) -{ - git_commit *parent_commit = NULL; - git_tree *parent_tree = NULL, *our_tree = NULL, *cherrypick_tree = NULL; - int parent = 0, error = 0; - - assert(out && repo && cherrypick_commit && our_commit); - - if (git_commit_parentcount(cherrypick_commit) > 1) { - if (!mainline) - return cherrypick_seterr(cherrypick_commit, - "Mainline branch is not specified but %s is a merge commit"); - - parent = mainline; - } else { - if (mainline) - return cherrypick_seterr(cherrypick_commit, - "Mainline branch specified but %s is not a merge commit"); - - parent = git_commit_parentcount(cherrypick_commit); - } - - if (parent && - ((error = git_commit_parent(&parent_commit, cherrypick_commit, (parent - 1))) < 0 || - (error = git_commit_tree(&parent_tree, parent_commit)) < 0)) - goto done; - - if ((error = git_commit_tree(&cherrypick_tree, cherrypick_commit)) < 0 || - (error = git_commit_tree(&our_tree, our_commit)) < 0) - goto done; - - error = git_merge_trees(out, repo, parent_tree, our_tree, cherrypick_tree, merge_opts); - -done: - git_tree_free(parent_tree); - git_tree_free(our_tree); - git_tree_free(cherrypick_tree); - git_commit_free(parent_commit); - - return error; -} - -int git_cherrypick( - git_repository *repo, - git_commit *commit, - const git_cherrypick_options *given_opts) -{ - git_cherrypick_options opts; - git_reference *our_ref = NULL; - git_commit *our_commit = NULL; - char commit_oidstr[GIT_OID_HEXSZ + 1]; - const char *commit_msg, *commit_summary; - git_buf their_label = GIT_BUF_INIT; - git_index *index = NULL; - git_indexwriter indexwriter = GIT_INDEXWRITER_INIT; - int error = 0; - - assert(repo && commit); - - GITERR_CHECK_VERSION(given_opts, GIT_CHERRYPICK_OPTIONS_VERSION, "git_cherrypick_options"); - - if ((error = git_repository__ensure_not_bare(repo, "cherry-pick")) < 0) - return error; - - if ((commit_msg = git_commit_message(commit)) == NULL || - (commit_summary = git_commit_summary(commit)) == NULL) { - error = -1; - goto on_error; - } - - git_oid_nfmt(commit_oidstr, sizeof(commit_oidstr), git_commit_id(commit)); - - if ((error = write_merge_msg(repo, commit_msg)) < 0 || - (error = git_buf_printf(&their_label, "%.7s... %s", commit_oidstr, commit_summary)) < 0 || - (error = cherrypick_normalize_opts(repo, &opts, given_opts, git_buf_cstr(&their_label))) < 0 || - (error = git_indexwriter_init_for_operation(&indexwriter, repo, &opts.checkout_opts.checkout_strategy)) < 0 || - (error = write_cherrypick_head(repo, commit_oidstr)) < 0 || - (error = git_repository_head(&our_ref, repo)) < 0 || - (error = git_reference_peel((git_object **)&our_commit, our_ref, GIT_OBJ_COMMIT)) < 0 || - (error = git_cherrypick_commit(&index, repo, commit, our_commit, opts.mainline, &opts.merge_opts)) < 0 || - (error = git_merge__check_result(repo, index)) < 0 || - (error = git_merge__append_conflicts_to_merge_msg(repo, index)) < 0 || - (error = git_checkout_index(repo, index, &opts.checkout_opts)) < 0 || - (error = git_indexwriter_commit(&indexwriter)) < 0) - goto on_error; - - goto done; - -on_error: - cherrypick_state_cleanup(repo); - -done: - git_indexwriter_cleanup(&indexwriter); - git_index_free(index); - git_commit_free(our_commit); - git_reference_free(our_ref); - git_buf_free(&their_label); - - return error; -} - -int git_cherrypick_init_options( - git_cherrypick_options *opts, unsigned int version) -{ - GIT_INIT_STRUCTURE_FROM_TEMPLATE( - opts, version, git_cherrypick_options, GIT_CHERRYPICK_OPTIONS_INIT); - return 0; -} diff --git a/vendor/libgit2/src/clone.c b/vendor/libgit2/src/clone.c deleted file mode 100644 index 6b4b7ae53..000000000 --- a/vendor/libgit2/src/clone.c +++ /dev/null @@ -1,566 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include - -#include "git2/clone.h" -#include "git2/remote.h" -#include "git2/revparse.h" -#include "git2/branch.h" -#include "git2/config.h" -#include "git2/checkout.h" -#include "git2/commit.h" -#include "git2/tree.h" - -#include "common.h" -#include "remote.h" -#include "fileops.h" -#include "refs.h" -#include "path.h" -#include "repository.h" -#include "odb.h" - -static int clone_local_into(git_repository *repo, git_remote *remote, const git_fetch_options *fetch_opts, const git_checkout_options *co_opts, const char *branch, int link); - -static int create_branch( - git_reference **branch, - git_repository *repo, - const git_oid *target, - const char *name, - const char *log_message) -{ - git_commit *head_obj = NULL; - git_reference *branch_ref = NULL; - git_buf refname = GIT_BUF_INIT; - int error; - - /* Find the target commit */ - if ((error = git_commit_lookup(&head_obj, repo, target)) < 0) - return error; - - /* Create the new branch */ - if ((error = git_buf_printf(&refname, GIT_REFS_HEADS_DIR "%s", name)) < 0) - return error; - - error = git_reference_create(&branch_ref, repo, git_buf_cstr(&refname), target, 0, log_message); - git_buf_free(&refname); - git_commit_free(head_obj); - - if (!error) - *branch = branch_ref; - else - git_reference_free(branch_ref); - - return error; -} - -static int setup_tracking_config( - git_repository *repo, - const char *branch_name, - const char *remote_name, - const char *merge_target) -{ - git_config *cfg; - git_buf remote_key = GIT_BUF_INIT, merge_key = GIT_BUF_INIT; - int error = -1; - - if (git_repository_config__weakptr(&cfg, repo) < 0) - return -1; - - if (git_buf_printf(&remote_key, "branch.%s.remote", branch_name) < 0) - goto cleanup; - - if (git_buf_printf(&merge_key, "branch.%s.merge", branch_name) < 0) - goto cleanup; - - if (git_config_set_string(cfg, git_buf_cstr(&remote_key), remote_name) < 0) - goto cleanup; - - if (git_config_set_string(cfg, git_buf_cstr(&merge_key), merge_target) < 0) - goto cleanup; - - error = 0; - -cleanup: - git_buf_free(&remote_key); - git_buf_free(&merge_key); - return error; -} - -static int create_tracking_branch( - git_reference **branch, - git_repository *repo, - const git_oid *target, - const char *branch_name, - const char *log_message) -{ - int error; - - if ((error = create_branch(branch, repo, target, branch_name, log_message)) < 0) - return error; - - return setup_tracking_config( - repo, - branch_name, - GIT_REMOTE_ORIGIN, - git_reference_name(*branch)); -} - -static int update_head_to_new_branch( - git_repository *repo, - const git_oid *target, - const char *name, - const char *reflog_message) -{ - git_reference *tracking_branch = NULL; - int error; - - if (!git__prefixcmp(name, GIT_REFS_HEADS_DIR)) - name += strlen(GIT_REFS_HEADS_DIR); - - error = create_tracking_branch(&tracking_branch, repo, target, name, - reflog_message); - - if (!error) - error = git_repository_set_head( - repo, git_reference_name(tracking_branch)); - - git_reference_free(tracking_branch); - - /* if it already existed, then the user's refspec created it for us, ignore it' */ - if (error == GIT_EEXISTS) - error = 0; - - return error; -} - -static int update_head_to_remote( - git_repository *repo, - git_remote *remote, - const char *reflog_message) -{ - int error = 0; - size_t refs_len; - git_refspec *refspec; - const git_remote_head *remote_head, **refs; - const git_oid *remote_head_id; - git_buf remote_master_name = GIT_BUF_INIT; - git_buf branch = GIT_BUF_INIT; - - if ((error = git_remote_ls(&refs, &refs_len, remote)) < 0) - return error; - - /* We cloned an empty repository or one with an unborn HEAD */ - if (refs_len == 0 || strcmp(refs[0]->name, GIT_HEAD_FILE)) - return setup_tracking_config( - repo, "master", GIT_REMOTE_ORIGIN, GIT_REFS_HEADS_MASTER_FILE); - - /* We know we have HEAD, let's see where it points */ - remote_head = refs[0]; - assert(remote_head); - - remote_head_id = &remote_head->oid; - - error = git_remote_default_branch(&branch, remote); - if (error == GIT_ENOTFOUND) { - error = git_repository_set_head_detached( - repo, remote_head_id); - goto cleanup; - } - - refspec = git_remote__matching_refspec(remote, git_buf_cstr(&branch)); - - if (refspec == NULL) { - giterr_set(GITERR_NET, "the remote's default branch does not fit the refspec configuration"); - error = GIT_EINVALIDSPEC; - goto cleanup; - } - - /* Determine the remote tracking reference name from the local master */ - if ((error = git_refspec_transform( - &remote_master_name, - refspec, - git_buf_cstr(&branch))) < 0) - goto cleanup; - - error = update_head_to_new_branch( - repo, - remote_head_id, - git_buf_cstr(&branch), - reflog_message); - -cleanup: - git_buf_free(&remote_master_name); - git_buf_free(&branch); - - return error; -} - -static int update_head_to_branch( - git_repository *repo, - const char *remote_name, - const char *branch, - const char *reflog_message) -{ - int retcode; - git_buf remote_branch_name = GIT_BUF_INIT; - git_reference* remote_ref = NULL; - - assert(remote_name && branch); - - if ((retcode = git_buf_printf(&remote_branch_name, GIT_REFS_REMOTES_DIR "%s/%s", - remote_name, branch)) < 0 ) - goto cleanup; - - if ((retcode = git_reference_lookup(&remote_ref, repo, git_buf_cstr(&remote_branch_name))) < 0) - goto cleanup; - - retcode = update_head_to_new_branch(repo, git_reference_target(remote_ref), branch, - reflog_message); - -cleanup: - git_reference_free(remote_ref); - git_buf_free(&remote_branch_name); - return retcode; -} - -static int default_repository_create(git_repository **out, const char *path, int bare, void *payload) -{ - GIT_UNUSED(payload); - - return git_repository_init(out, path, bare); -} - -static int default_remote_create( - git_remote **out, - git_repository *repo, - const char *name, - const char *url, - void *payload) -{ - GIT_UNUSED(payload); - - return git_remote_create(out, repo, name, url); -} - -/* - * submodules? - */ - -static int create_and_configure_origin( - git_remote **out, - git_repository *repo, - const char *url, - const git_clone_options *options) -{ - int error; - git_remote *origin = NULL; - char buf[GIT_PATH_MAX]; - git_remote_create_cb remote_create = options->remote_cb; - void *payload = options->remote_cb_payload; - - /* If the path exists and is a dir, the url should be the absolute path */ - if (git_path_root(url) < 0 && git_path_exists(url) && git_path_isdir(url)) { - if (p_realpath(url, buf) == NULL) - return -1; - - url = buf; - } - - if (!remote_create) { - remote_create = default_remote_create; - payload = NULL; - } - - if ((error = remote_create(&origin, repo, "origin", url, payload)) < 0) - goto on_error; - - *out = origin; - return 0; - -on_error: - git_remote_free(origin); - return error; -} - -static bool should_checkout( - git_repository *repo, - bool is_bare, - const git_checkout_options *opts) -{ - if (is_bare) - return false; - - if (!opts) - return false; - - if (opts->checkout_strategy == GIT_CHECKOUT_NONE) - return false; - - return !git_repository_head_unborn(repo); -} - -static int checkout_branch(git_repository *repo, git_remote *remote, const git_checkout_options *co_opts, const char *branch, const char *reflog_message) -{ - int error; - - if (branch) - error = update_head_to_branch(repo, git_remote_name(remote), branch, - reflog_message); - /* Point HEAD to the same ref as the remote's head */ - else - error = update_head_to_remote(repo, remote, reflog_message); - - if (!error && should_checkout(repo, git_repository_is_bare(repo), co_opts)) - error = git_checkout_head(repo, co_opts); - - return error; -} - -static int clone_into(git_repository *repo, git_remote *_remote, const git_fetch_options *opts, const git_checkout_options *co_opts, const char *branch) -{ - int error; - git_buf reflog_message = GIT_BUF_INIT; - git_fetch_options fetch_opts; - git_remote *remote; - - assert(repo && _remote); - - if (!git_repository_is_empty(repo)) { - giterr_set(GITERR_INVALID, "the repository is not empty"); - return -1; - } - - if ((error = git_remote_dup(&remote, _remote)) < 0) - return error; - - memcpy(&fetch_opts, opts, sizeof(git_fetch_options)); - fetch_opts.update_fetchhead = 0; - fetch_opts.download_tags = GIT_REMOTE_DOWNLOAD_TAGS_ALL; - git_buf_printf(&reflog_message, "clone: from %s", git_remote_url(remote)); - - if ((error = git_remote_fetch(remote, NULL, &fetch_opts, git_buf_cstr(&reflog_message))) != 0) - goto cleanup; - - error = checkout_branch(repo, remote, co_opts, branch, git_buf_cstr(&reflog_message)); - -cleanup: - git_remote_free(remote); - git_buf_free(&reflog_message); - - return error; -} - -int git_clone__should_clone_local(const char *url_or_path, git_clone_local_t local) -{ - git_buf fromurl = GIT_BUF_INIT; - const char *path = url_or_path; - bool is_url, is_local; - - if (local == GIT_CLONE_NO_LOCAL) - return 0; - - if ((is_url = git_path_is_local_file_url(url_or_path)) != 0) { - if (git_path_fromurl(&fromurl, url_or_path) < 0) { - is_local = -1; - goto done; - } - - path = fromurl.ptr; - } - - is_local = (!is_url || local != GIT_CLONE_LOCAL_AUTO) && - git_path_isdir(path); - -done: - git_buf_free(&fromurl); - return is_local; -} - -int git_clone( - git_repository **out, - const char *url, - const char *local_path, - const git_clone_options *_options) -{ - int error = 0; - git_repository *repo = NULL; - git_remote *origin; - git_clone_options options = GIT_CLONE_OPTIONS_INIT; - uint32_t rmdir_flags = GIT_RMDIR_REMOVE_FILES; - git_repository_create_cb repository_cb; - - assert(out && url && local_path); - - if (_options) - memcpy(&options, _options, sizeof(git_clone_options)); - - GITERR_CHECK_VERSION(&options, GIT_CLONE_OPTIONS_VERSION, "git_clone_options"); - - /* Only clone to a new directory or an empty directory */ - if (git_path_exists(local_path) && !git_path_is_empty_dir(local_path)) { - giterr_set(GITERR_INVALID, - "'%s' exists and is not an empty directory", local_path); - return GIT_EEXISTS; - } - - /* Only remove the root directory on failure if we create it */ - if (git_path_exists(local_path)) - rmdir_flags |= GIT_RMDIR_SKIP_ROOT; - - if (options.repository_cb) - repository_cb = options.repository_cb; - else - repository_cb = default_repository_create; - - if ((error = repository_cb(&repo, local_path, options.bare, options.repository_cb_payload)) < 0) - return error; - - if (!(error = create_and_configure_origin(&origin, repo, url, &options))) { - int clone_local = git_clone__should_clone_local(url, options.local); - int link = options.local != GIT_CLONE_LOCAL_NO_LINKS; - - if (clone_local == 1) - error = clone_local_into( - repo, origin, &options.fetch_opts, &options.checkout_opts, - options.checkout_branch, link); - else if (clone_local == 0) - error = clone_into( - repo, origin, &options.fetch_opts, &options.checkout_opts, - options.checkout_branch); - else - error = -1; - - git_remote_free(origin); - } - - if (error != 0) { - git_error_state last_error = {0}; - giterr_state_capture(&last_error, error); - - git_repository_free(repo); - repo = NULL; - - (void)git_futils_rmdir_r(local_path, NULL, rmdir_flags); - - giterr_state_restore(&last_error); - } - - *out = repo; - return error; -} - -int git_clone_init_options(git_clone_options *opts, unsigned int version) -{ - GIT_INIT_STRUCTURE_FROM_TEMPLATE( - opts, version, git_clone_options, GIT_CLONE_OPTIONS_INIT); - return 0; -} - -static const char *repository_base(git_repository *repo) -{ - if (git_repository_is_bare(repo)) - return git_repository_path(repo); - - return git_repository_workdir(repo); -} - -static bool can_link(const char *src, const char *dst, int link) -{ -#ifdef GIT_WIN32 - GIT_UNUSED(src); - GIT_UNUSED(dst); - GIT_UNUSED(link); - return false; -#else - - struct stat st_src, st_dst; - - if (!link) - return false; - - if (p_stat(src, &st_src) < 0) - return false; - - if (p_stat(dst, &st_dst) < 0) - return false; - - return st_src.st_dev == st_dst.st_dev; -#endif -} - -static int clone_local_into(git_repository *repo, git_remote *remote, const git_fetch_options *fetch_opts, const git_checkout_options *co_opts, const char *branch, int link) -{ - int error, flags; - git_repository *src; - git_buf src_odb = GIT_BUF_INIT, dst_odb = GIT_BUF_INIT, src_path = GIT_BUF_INIT; - git_buf reflog_message = GIT_BUF_INIT; - - assert(repo && remote); - - if (!git_repository_is_empty(repo)) { - giterr_set(GITERR_INVALID, "the repository is not empty"); - return -1; - } - - /* - * Let's figure out what path we should use for the source - * repo, if it's not rooted, the path should be relative to - * the repository's worktree/gitdir. - */ - if ((error = git_path_from_url_or_path(&src_path, git_remote_url(remote))) < 0) - return error; - - /* Copy .git/objects/ from the source to the target */ - if ((error = git_repository_open(&src, git_buf_cstr(&src_path))) < 0) { - git_buf_free(&src_path); - return error; - } - - git_buf_joinpath(&src_odb, git_repository_path(src), GIT_OBJECTS_DIR); - git_buf_joinpath(&dst_odb, git_repository_path(repo), GIT_OBJECTS_DIR); - if (git_buf_oom(&src_odb) || git_buf_oom(&dst_odb)) { - error = -1; - goto cleanup; - } - - flags = 0; - if (can_link(git_repository_path(src), git_repository_path(repo), link)) - flags |= GIT_CPDIR_LINK_FILES; - - error = git_futils_cp_r(git_buf_cstr(&src_odb), git_buf_cstr(&dst_odb), - flags, GIT_OBJECT_DIR_MODE); - - /* - * can_link() doesn't catch all variations, so if we hit an - * error and did want to link, let's try again without trying - * to link. - */ - if (error < 0 && link) { - flags &= ~GIT_CPDIR_LINK_FILES; - error = git_futils_cp_r(git_buf_cstr(&src_odb), git_buf_cstr(&dst_odb), - flags, GIT_OBJECT_DIR_MODE); - } - - if (error < 0) - goto cleanup; - - git_buf_printf(&reflog_message, "clone: from %s", git_remote_url(remote)); - - if ((error = git_remote_fetch(remote, NULL, fetch_opts, git_buf_cstr(&reflog_message))) != 0) - goto cleanup; - - error = checkout_branch(repo, remote, co_opts, branch, git_buf_cstr(&reflog_message)); - -cleanup: - git_buf_free(&reflog_message); - git_buf_free(&src_path); - git_buf_free(&src_odb); - git_buf_free(&dst_odb); - git_repository_free(src); - return error; -} diff --git a/vendor/libgit2/src/clone.h b/vendor/libgit2/src/clone.h deleted file mode 100644 index 14ca5d44c..000000000 --- a/vendor/libgit2/src/clone.h +++ /dev/null @@ -1,12 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_clone_h__ -#define INCLUDE_clone_h__ - -extern int git_clone__should_clone_local(const char *url, git_clone_local_t local); - -#endif diff --git a/vendor/libgit2/src/commit.c b/vendor/libgit2/src/commit.c deleted file mode 100644 index 5ed9c474d..000000000 --- a/vendor/libgit2/src/commit.c +++ /dev/null @@ -1,741 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "git2/common.h" -#include "git2/object.h" -#include "git2/repository.h" -#include "git2/signature.h" -#include "git2/sys/commit.h" - -#include "common.h" -#include "odb.h" -#include "commit.h" -#include "signature.h" -#include "message.h" -#include "refs.h" -#include "object.h" - -void git_commit__free(void *_commit) -{ - git_commit *commit = _commit; - - git_array_clear(commit->parent_ids); - - git_signature_free(commit->author); - git_signature_free(commit->committer); - - git__free(commit->raw_header); - git__free(commit->raw_message); - git__free(commit->message_encoding); - git__free(commit->summary); - git__free(commit->body); - - git__free(commit); -} - -static int git_commit__create_internal( - git_oid *id, - git_repository *repo, - const char *update_ref, - const git_signature *author, - const git_signature *committer, - const char *message_encoding, - const char *message, - const git_oid *tree, - git_commit_parent_callback parent_cb, - void *parent_payload, - bool validate) -{ - git_reference *ref = NULL; - int error = 0, matched_parent = 0; - const git_oid *current_id = NULL; - git_buf commit = GIT_BUF_INIT; - size_t i = 0; - git_odb *odb; - const git_oid *parent; - - assert(id && repo && tree && parent_cb); - - if (validate && !git_object__is_valid(repo, tree, GIT_OBJ_TREE)) - return -1; - - if (update_ref) { - error = git_reference_lookup_resolved(&ref, repo, update_ref, 10); - if (error < 0 && error != GIT_ENOTFOUND) - return error; - } - giterr_clear(); - - if (ref) - current_id = git_reference_target(ref); - - git_oid__writebuf(&commit, "tree ", tree); - - while ((parent = parent_cb(i, parent_payload)) != NULL) { - if (validate && !git_object__is_valid(repo, parent, GIT_OBJ_COMMIT)) { - error = -1; - goto on_error; - } - - git_oid__writebuf(&commit, "parent ", parent); - if (i == 0 && current_id && git_oid_equal(current_id, parent)) - matched_parent = 1; - i++; - } - - if (ref && !matched_parent) { - git_reference_free(ref); - git_buf_free(&commit); - giterr_set(GITERR_OBJECT, "failed to create commit: current tip is not the first parent"); - return GIT_EMODIFIED; - } - - git_signature__writebuf(&commit, "author ", author); - git_signature__writebuf(&commit, "committer ", committer); - - if (message_encoding != NULL) - git_buf_printf(&commit, "encoding %s\n", message_encoding); - - git_buf_putc(&commit, '\n'); - - if (git_buf_puts(&commit, message) < 0) - goto on_error; - - if (git_repository_odb__weakptr(&odb, repo) < 0) - goto on_error; - - if (git_odb_write(id, odb, commit.ptr, commit.size, GIT_OBJ_COMMIT) < 0) - goto on_error; - - git_buf_free(&commit); - - if (update_ref != NULL) { - error = git_reference__update_for_commit( - repo, ref, update_ref, id, "commit"); - git_reference_free(ref); - return error; - } - - return 0; - -on_error: - git_buf_free(&commit); - return -1; -} - -int git_commit_create_from_callback( - git_oid *id, - git_repository *repo, - const char *update_ref, - const git_signature *author, - const git_signature *committer, - const char *message_encoding, - const char *message, - const git_oid *tree, - git_commit_parent_callback parent_cb, - void *parent_payload) -{ - return git_commit__create_internal( - id, repo, update_ref, author, committer, message_encoding, message, - tree, parent_cb, parent_payload, true); -} - -typedef struct { - size_t total; - va_list args; -} commit_parent_varargs; - -static const git_oid *commit_parent_from_varargs(size_t curr, void *payload) -{ - commit_parent_varargs *data = payload; - const git_commit *commit; - if (curr >= data->total) - return NULL; - commit = va_arg(data->args, const git_commit *); - return commit ? git_commit_id(commit) : NULL; -} - -int git_commit_create_v( - git_oid *id, - git_repository *repo, - const char *update_ref, - const git_signature *author, - const git_signature *committer, - const char *message_encoding, - const char *message, - const git_tree *tree, - size_t parent_count, - ...) -{ - int error = 0; - commit_parent_varargs data; - - assert(tree && git_tree_owner(tree) == repo); - - data.total = parent_count; - va_start(data.args, parent_count); - - error = git_commit__create_internal( - id, repo, update_ref, author, committer, - message_encoding, message, git_tree_id(tree), - commit_parent_from_varargs, &data, false); - - va_end(data.args); - return error; -} - -typedef struct { - size_t total; - const git_oid **parents; -} commit_parent_oids; - -static const git_oid *commit_parent_from_ids(size_t curr, void *payload) -{ - commit_parent_oids *data = payload; - return (curr < data->total) ? data->parents[curr] : NULL; -} - -int git_commit_create_from_ids( - git_oid *id, - git_repository *repo, - const char *update_ref, - const git_signature *author, - const git_signature *committer, - const char *message_encoding, - const char *message, - const git_oid *tree, - size_t parent_count, - const git_oid *parents[]) -{ - commit_parent_oids data = { parent_count, parents }; - - return git_commit__create_internal( - id, repo, update_ref, author, committer, - message_encoding, message, tree, - commit_parent_from_ids, &data, true); -} - -typedef struct { - size_t total; - const git_commit **parents; - git_repository *repo; -} commit_parent_data; - -static const git_oid *commit_parent_from_array(size_t curr, void *payload) -{ - commit_parent_data *data = payload; - const git_commit *commit; - if (curr >= data->total) - return NULL; - commit = data->parents[curr]; - if (git_commit_owner(commit) != data->repo) - return NULL; - return git_commit_id(commit); -} - -int git_commit_create( - git_oid *id, - git_repository *repo, - const char *update_ref, - const git_signature *author, - const git_signature *committer, - const char *message_encoding, - const char *message, - const git_tree *tree, - size_t parent_count, - const git_commit *parents[]) -{ - commit_parent_data data = { parent_count, parents, repo }; - - assert(tree && git_tree_owner(tree) == repo); - - return git_commit__create_internal( - id, repo, update_ref, author, committer, - message_encoding, message, git_tree_id(tree), - commit_parent_from_array, &data, false); -} - -static const git_oid *commit_parent_for_amend(size_t curr, void *payload) -{ - const git_commit *commit_to_amend = payload; - if (curr >= git_array_size(commit_to_amend->parent_ids)) - return NULL; - return git_array_get(commit_to_amend->parent_ids, curr); -} - -int git_commit_amend( - git_oid *id, - const git_commit *commit_to_amend, - const char *update_ref, - const git_signature *author, - const git_signature *committer, - const char *message_encoding, - const char *message, - const git_tree *tree) -{ - git_repository *repo; - git_oid tree_id; - git_reference *ref; - int error; - - assert(id && commit_to_amend); - - repo = git_commit_owner(commit_to_amend); - - if (!author) - author = git_commit_author(commit_to_amend); - if (!committer) - committer = git_commit_committer(commit_to_amend); - if (!message_encoding) - message_encoding = git_commit_message_encoding(commit_to_amend); - if (!message) - message = git_commit_message(commit_to_amend); - - if (!tree) { - git_tree *old_tree; - GITERR_CHECK_ERROR( git_commit_tree(&old_tree, commit_to_amend) ); - git_oid_cpy(&tree_id, git_tree_id(old_tree)); - git_tree_free(old_tree); - } else { - assert(git_tree_owner(tree) == repo); - git_oid_cpy(&tree_id, git_tree_id(tree)); - } - - if (update_ref) { - if ((error = git_reference_lookup_resolved(&ref, repo, update_ref, 5)) < 0) - return error; - - if (git_oid_cmp(git_commit_id(commit_to_amend), git_reference_target(ref))) { - git_reference_free(ref); - giterr_set(GITERR_REFERENCE, "commit to amend is not the tip of the given branch"); - return -1; - } - } - - error = git_commit__create_internal( - id, repo, NULL, author, committer, message_encoding, message, - &tree_id, commit_parent_for_amend, (void *)commit_to_amend, false); - - if (!error && update_ref) { - error = git_reference__update_for_commit( - repo, ref, NULL, id, "commit"); - git_reference_free(ref); - } - - return error; -} - -int git_commit__parse(void *_commit, git_odb_object *odb_obj) -{ - git_commit *commit = _commit; - const char *buffer_start = git_odb_object_data(odb_obj), *buffer; - const char *buffer_end = buffer_start + git_odb_object_size(odb_obj); - git_oid parent_id; - size_t header_len; - git_signature dummy_sig; - - buffer = buffer_start; - - /* Allocate for one, which will allow not to realloc 90% of the time */ - git_array_init_to_size(commit->parent_ids, 1); - GITERR_CHECK_ARRAY(commit->parent_ids); - - /* The tree is always the first field */ - if (git_oid__parse(&commit->tree_id, &buffer, buffer_end, "tree ") < 0) - goto bad_buffer; - - /* - * TODO: commit grafts! - */ - - while (git_oid__parse(&parent_id, &buffer, buffer_end, "parent ") == 0) { - git_oid *new_id = git_array_alloc(commit->parent_ids); - GITERR_CHECK_ALLOC(new_id); - - git_oid_cpy(new_id, &parent_id); - } - - commit->author = git__malloc(sizeof(git_signature)); - GITERR_CHECK_ALLOC(commit->author); - - if (git_signature__parse(commit->author, &buffer, buffer_end, "author ", '\n') < 0) - return -1; - - /* Some tools create multiple author fields, ignore the extra ones */ - while ((size_t)(buffer_end - buffer) >= strlen("author ") && !git__prefixcmp(buffer, "author ")) { - if (git_signature__parse(&dummy_sig, &buffer, buffer_end, "author ", '\n') < 0) - return -1; - - git__free(dummy_sig.name); - git__free(dummy_sig.email); - } - - /* Always parse the committer; we need the commit time */ - commit->committer = git__malloc(sizeof(git_signature)); - GITERR_CHECK_ALLOC(commit->committer); - - if (git_signature__parse(commit->committer, &buffer, buffer_end, "committer ", '\n') < 0) - return -1; - - /* Parse add'l header entries */ - while (buffer < buffer_end) { - const char *eoln = buffer; - if (buffer[-1] == '\n' && buffer[0] == '\n') - break; - - while (eoln < buffer_end && *eoln != '\n') - ++eoln; - - if (git__prefixcmp(buffer, "encoding ") == 0) { - buffer += strlen("encoding "); - - commit->message_encoding = git__strndup(buffer, eoln - buffer); - GITERR_CHECK_ALLOC(commit->message_encoding); - } - - if (eoln < buffer_end && *eoln == '\n') - ++eoln; - buffer = eoln; - } - - header_len = buffer - buffer_start; - commit->raw_header = git__strndup(buffer_start, header_len); - GITERR_CHECK_ALLOC(commit->raw_header); - - /* point "buffer" to data after header, +1 for the final LF */ - buffer = buffer_start + header_len + 1; - - /* extract commit message */ - if (buffer <= buffer_end) { - commit->raw_message = git__strndup(buffer, buffer_end - buffer); - GITERR_CHECK_ALLOC(commit->raw_message); - } - - return 0; - -bad_buffer: - giterr_set(GITERR_OBJECT, "Failed to parse bad commit object"); - return -1; -} - -#define GIT_COMMIT_GETTER(_rvalue, _name, _return) \ - _rvalue git_commit_##_name(const git_commit *commit) \ - {\ - assert(commit); \ - return _return; \ - } - -GIT_COMMIT_GETTER(const git_signature *, author, commit->author) -GIT_COMMIT_GETTER(const git_signature *, committer, commit->committer) -GIT_COMMIT_GETTER(const char *, message_raw, commit->raw_message) -GIT_COMMIT_GETTER(const char *, message_encoding, commit->message_encoding) -GIT_COMMIT_GETTER(const char *, raw_header, commit->raw_header) -GIT_COMMIT_GETTER(git_time_t, time, commit->committer->when.time) -GIT_COMMIT_GETTER(int, time_offset, commit->committer->when.offset) -GIT_COMMIT_GETTER(unsigned int, parentcount, (unsigned int)git_array_size(commit->parent_ids)) -GIT_COMMIT_GETTER(const git_oid *, tree_id, &commit->tree_id) - -const char *git_commit_message(const git_commit *commit) -{ - const char *message; - - assert(commit); - - message = commit->raw_message; - - /* trim leading newlines from raw message */ - while (*message && *message == '\n') - ++message; - - return message; -} - -const char *git_commit_summary(git_commit *commit) -{ - git_buf summary = GIT_BUF_INIT; - const char *msg, *space; - bool space_contains_newline = false; - - assert(commit); - - if (!commit->summary) { - for (msg = git_commit_message(commit), space = NULL; *msg; ++msg) { - char next_character = msg[0]; - /* stop processing at the end of the first paragraph */ - if (next_character == '\n' && (!msg[1] || msg[1] == '\n')) - break; - /* record the beginning of contiguous whitespace runs */ - else if (git__isspace(next_character)) { - if(space == NULL) { - space = msg; - space_contains_newline = false; - } - space_contains_newline |= next_character == '\n'; - } - /* the next character is non-space */ - else { - /* process any recorded whitespace */ - if (space) { - if(space_contains_newline) - git_buf_putc(&summary, ' '); /* if the space contains a newline, collapse to ' ' */ - else - git_buf_put(&summary, space, (msg - space)); /* otherwise copy it */ - space = NULL; - } - /* copy the next character */ - git_buf_putc(&summary, next_character); - } - } - - commit->summary = git_buf_detach(&summary); - if (!commit->summary) - commit->summary = git__strdup(""); - } - - return commit->summary; -} - -const char *git_commit_body(git_commit *commit) -{ - const char *msg, *end; - - assert(commit); - - if (!commit->body) { - /* search for end of summary */ - for (msg = git_commit_message(commit); *msg; ++msg) - if (msg[0] == '\n' && (!msg[1] || msg[1] == '\n')) - break; - - /* trim leading and trailing whitespace */ - for (; *msg; ++msg) - if (!git__isspace(*msg)) - break; - for (end = msg + strlen(msg) - 1; msg <= end; --end) - if (!git__isspace(*end)) - break; - - if (*msg) - commit->body = git__strndup(msg, end - msg + 1); - } - - return commit->body; -} - -int git_commit_tree(git_tree **tree_out, const git_commit *commit) -{ - assert(commit); - return git_tree_lookup(tree_out, commit->object.repo, &commit->tree_id); -} - -const git_oid *git_commit_parent_id( - const git_commit *commit, unsigned int n) -{ - assert(commit); - - return git_array_get(commit->parent_ids, n); -} - -int git_commit_parent( - git_commit **parent, const git_commit *commit, unsigned int n) -{ - const git_oid *parent_id; - assert(commit); - - parent_id = git_commit_parent_id(commit, n); - if (parent_id == NULL) { - giterr_set(GITERR_INVALID, "Parent %u does not exist", n); - return GIT_ENOTFOUND; - } - - return git_commit_lookup(parent, commit->object.repo, parent_id); -} - -int git_commit_nth_gen_ancestor( - git_commit **ancestor, - const git_commit *commit, - unsigned int n) -{ - git_commit *current, *parent = NULL; - int error; - - assert(ancestor && commit); - - if (git_object_dup((git_object **) ¤t, (git_object *) commit) < 0) - return -1; - - if (n == 0) { - *ancestor = current; - return 0; - } - - while (n--) { - error = git_commit_parent(&parent, current, 0); - - git_commit_free(current); - - if (error < 0) - return error; - - current = parent; - } - - *ancestor = parent; - return 0; -} - -int git_commit_header_field(git_buf *out, const git_commit *commit, const char *field) -{ - const char *eol, *buf = commit->raw_header; - - git_buf_sanitize(out); - - while ((eol = strchr(buf, '\n'))) { - /* We can skip continuations here */ - if (buf[0] == ' ') { - buf = eol + 1; - continue; - } - - /* Skip until we find the field we're after */ - if (git__prefixcmp(buf, field)) { - buf = eol + 1; - continue; - } - - buf += strlen(field); - /* Check that we're not matching a prefix but the field itself */ - if (buf[0] != ' ') { - buf = eol + 1; - continue; - } - - buf++; /* skip the SP */ - - git_buf_put(out, buf, eol - buf); - if (git_buf_oom(out)) - goto oom; - - /* If the next line starts with SP, it's multi-line, we must continue */ - while (eol[1] == ' ') { - git_buf_putc(out, '\n'); - buf = eol + 2; - eol = strchr(buf, '\n'); - if (!eol) - goto malformed; - - git_buf_put(out, buf, eol - buf); - } - - if (git_buf_oom(out)) - goto oom; - - return 0; - } - - giterr_set(GITERR_OBJECT, "no such field '%s'", field); - return GIT_ENOTFOUND; - -malformed: - giterr_set(GITERR_OBJECT, "malformed header"); - return -1; -oom: - giterr_set_oom(); - return -1; -} - -int git_commit_extract_signature(git_buf *signature, git_buf *signed_data, git_repository *repo, git_oid *commit_id, const char *field) -{ - git_odb_object *obj; - git_odb *odb; - const char *buf; - const char *h, *eol; - int error; - - git_buf_sanitize(signature); - git_buf_sanitize(signed_data); - - if (!field) - field = "gpgsig"; - - if ((error = git_repository_odb__weakptr(&odb, repo)) < 0) - return error; - - if ((error = git_odb_read(&obj, odb, commit_id)) < 0) - return error; - - if (obj->cached.type != GIT_OBJ_COMMIT) { - giterr_set(GITERR_INVALID, "the requested type does not match the type in ODB"); - error = GIT_ENOTFOUND; - goto cleanup; - } - - buf = git_odb_object_data(obj); - - while ((h = strchr(buf, '\n')) && h[1] != '\0') { - h++; - if (git__prefixcmp(buf, field)) { - if (git_buf_put(signed_data, buf, h - buf) < 0) - return -1; - - buf = h; - continue; - } - - h = buf; - h += strlen(field); - eol = strchr(h, '\n'); - if (h[0] != ' ') { - buf = h; - continue; - } - if (!eol) - goto malformed; - - h++; /* skip the SP */ - - git_buf_put(signature, h, eol - h); - if (git_buf_oom(signature)) - goto oom; - - /* If the next line starts with SP, it's multi-line, we must continue */ - while (eol[1] == ' ') { - git_buf_putc(signature, '\n'); - h = eol + 2; - eol = strchr(h, '\n'); - if (!eol) - goto malformed; - - git_buf_put(signature, h, eol - h); - } - - if (git_buf_oom(signature)) - goto oom; - - git_odb_object_free(obj); - return git_buf_puts(signed_data, eol+1); - } - - giterr_set(GITERR_OBJECT, "this commit is not signed"); - error = GIT_ENOTFOUND; - goto cleanup; - -malformed: - giterr_set(GITERR_OBJECT, "malformed header"); - error = -1; - goto cleanup; -oom: - giterr_set_oom(); - error = -1; - goto cleanup; - -cleanup: - git_odb_object_free(obj); - git_buf_clear(signature); - git_buf_clear(signed_data); - return error; -} diff --git a/vendor/libgit2/src/commit.h b/vendor/libgit2/src/commit.h deleted file mode 100644 index d01ac2b2f..000000000 --- a/vendor/libgit2/src/commit.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_commit_h__ -#define INCLUDE_commit_h__ - -#include "git2/commit.h" -#include "tree.h" -#include "repository.h" -#include "array.h" - -#include - -struct git_commit { - git_object object; - - git_array_t(git_oid) parent_ids; - git_oid tree_id; - - git_signature *author; - git_signature *committer; - - char *message_encoding; - char *raw_message; - char *raw_header; - - char *summary; - char *body; -}; - -void git_commit__free(void *commit); -int git_commit__parse(void *commit, git_odb_object *obj); - -#endif diff --git a/vendor/libgit2/src/commit_list.c b/vendor/libgit2/src/commit_list.c deleted file mode 100644 index 28948c88b..000000000 --- a/vendor/libgit2/src/commit_list.c +++ /dev/null @@ -1,200 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "commit_list.h" -#include "common.h" -#include "revwalk.h" -#include "pool.h" -#include "odb.h" - -int git_commit_list_time_cmp(const void *a, const void *b) -{ - const git_commit_list_node *commit_a = a; - const git_commit_list_node *commit_b = b; - - return (commit_a->time < commit_b->time); -} - -git_commit_list *git_commit_list_insert(git_commit_list_node *item, git_commit_list **list_p) -{ - git_commit_list *new_list = git__malloc(sizeof(git_commit_list)); - if (new_list != NULL) { - new_list->item = item; - new_list->next = *list_p; - } - *list_p = new_list; - return new_list; -} - -git_commit_list *git_commit_list_insert_by_date(git_commit_list_node *item, git_commit_list **list_p) -{ - git_commit_list **pp = list_p; - git_commit_list *p; - - while ((p = *pp) != NULL) { - if (git_commit_list_time_cmp(p->item, item) > 0) - break; - - pp = &p->next; - } - - return git_commit_list_insert(item, pp); -} - -git_commit_list_node *git_commit_list_alloc_node(git_revwalk *walk) -{ - return (git_commit_list_node *)git_pool_mallocz(&walk->commit_pool, 1); -} - -static int commit_error(git_commit_list_node *commit, const char *msg) -{ - char commit_oid[GIT_OID_HEXSZ + 1]; - git_oid_fmt(commit_oid, &commit->oid); - commit_oid[GIT_OID_HEXSZ] = '\0'; - - giterr_set(GITERR_ODB, "Failed to parse commit %s - %s", commit_oid, msg); - - return -1; -} - -static git_commit_list_node **alloc_parents( - git_revwalk *walk, git_commit_list_node *commit, size_t n_parents) -{ - if (n_parents <= PARENTS_PER_COMMIT) - return (git_commit_list_node **)((char *)commit + sizeof(git_commit_list_node)); - - return (git_commit_list_node **)git_pool_malloc( - &walk->commit_pool, (uint32_t)(n_parents * sizeof(git_commit_list_node *))); -} - - -void git_commit_list_free(git_commit_list **list_p) -{ - git_commit_list *list = *list_p; - - if (list == NULL) - return; - - while (list) { - git_commit_list *temp = list; - list = temp->next; - git__free(temp); - } - - *list_p = NULL; -} - -git_commit_list_node *git_commit_list_pop(git_commit_list **stack) -{ - git_commit_list *top = *stack; - git_commit_list_node *item = top ? top->item : NULL; - - if (top) { - *stack = top->next; - git__free(top); - } - return item; -} - -static int commit_quick_parse( - git_revwalk *walk, - git_commit_list_node *commit, - const uint8_t *buffer, - size_t buffer_len) -{ - const size_t parent_len = strlen("parent ") + GIT_OID_HEXSZ + 1; - const uint8_t *buffer_end = buffer + buffer_len; - const uint8_t *parents_start, *committer_start; - int i, parents = 0; - int64_t commit_time; - - buffer += strlen("tree ") + GIT_OID_HEXSZ + 1; - - parents_start = buffer; - while (buffer + parent_len < buffer_end && memcmp(buffer, "parent ", strlen("parent ")) == 0) { - parents++; - buffer += parent_len; - } - - commit->parents = alloc_parents(walk, commit, parents); - GITERR_CHECK_ALLOC(commit->parents); - - buffer = parents_start; - for (i = 0; i < parents; ++i) { - git_oid oid; - - if (git_oid_fromstr(&oid, (const char *)buffer + strlen("parent ")) < 0) - return -1; - - commit->parents[i] = git_revwalk__commit_lookup(walk, &oid); - if (commit->parents[i] == NULL) - return -1; - - buffer += parent_len; - } - - commit->out_degree = (unsigned short)parents; - - if ((committer_start = buffer = memchr(buffer, '\n', buffer_end - buffer)) == NULL) - return commit_error(commit, "object is corrupted"); - - buffer++; - - if ((buffer = memchr(buffer, '\n', buffer_end - buffer)) == NULL) - return commit_error(commit, "object is corrupted"); - - /* Skip trailing spaces */ - while (buffer > committer_start && git__isspace(*buffer)) - buffer--; - - /* Seek for the beginning of the pack of digits */ - while (buffer > committer_start && git__isdigit(*buffer)) - buffer--; - - /* Skip potential timezone offset */ - if ((buffer > committer_start) && (*buffer == '+' || *buffer == '-')) { - buffer--; - - while (buffer > committer_start && git__isspace(*buffer)) - buffer--; - - while (buffer > committer_start && git__isdigit(*buffer)) - buffer--; - } - - if ((buffer == committer_start) || (git__strtol64(&commit_time, (char *)(buffer + 1), NULL, 10) < 0)) - return commit_error(commit, "cannot parse commit time"); - - commit->time = commit_time; - commit->parsed = 1; - return 0; -} - -int git_commit_list_parse(git_revwalk *walk, git_commit_list_node *commit) -{ - git_odb_object *obj; - int error; - - if (commit->parsed) - return 0; - - if ((error = git_odb_read(&obj, walk->odb, &commit->oid)) < 0) - return error; - - if (obj->cached.type != GIT_OBJ_COMMIT) { - giterr_set(GITERR_INVALID, "Object is no commit object"); - error = -1; - } else - error = commit_quick_parse( - walk, commit, - (const uint8_t *)git_odb_object_data(obj), - git_odb_object_size(obj)); - - git_odb_object_free(obj); - return error; -} - diff --git a/vendor/libgit2/src/commit_list.h b/vendor/libgit2/src/commit_list.h deleted file mode 100644 index a6967bcef..000000000 --- a/vendor/libgit2/src/commit_list.h +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_commit_list_h__ -#define INCLUDE_commit_list_h__ - -#include "git2/oid.h" - -#define PARENT1 (1 << 0) -#define PARENT2 (1 << 1) -#define RESULT (1 << 2) -#define STALE (1 << 3) -#define ALL_FLAGS (PARENT1 | PARENT2 | STALE | RESULT) - -#define PARENTS_PER_COMMIT 2 -#define COMMIT_ALLOC \ - (sizeof(git_commit_list_node) + PARENTS_PER_COMMIT * sizeof(git_commit_list_node *)) - -#define FLAG_BITS 4 - -typedef struct git_commit_list_node { - git_oid oid; - int64_t time; - unsigned int seen:1, - uninteresting:1, - topo_delay:1, - parsed:1, - flags : FLAG_BITS; - - unsigned short in_degree; - unsigned short out_degree; - - struct git_commit_list_node **parents; -} git_commit_list_node; - -typedef struct git_commit_list { - git_commit_list_node *item; - struct git_commit_list *next; -} git_commit_list; - -git_commit_list_node *git_commit_list_alloc_node(git_revwalk *walk); -int git_commit_list_time_cmp(const void *a, const void *b); -void git_commit_list_free(git_commit_list **list_p); -git_commit_list *git_commit_list_insert(git_commit_list_node *item, git_commit_list **list_p); -git_commit_list *git_commit_list_insert_by_date(git_commit_list_node *item, git_commit_list **list_p); -int git_commit_list_parse(git_revwalk *walk, git_commit_list_node *commit); -git_commit_list_node *git_commit_list_pop(git_commit_list **stack); - -#endif diff --git a/vendor/libgit2/src/common.h b/vendor/libgit2/src/common.h deleted file mode 100644 index 9abd605cb..000000000 --- a/vendor/libgit2/src/common.h +++ /dev/null @@ -1,240 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_common_h__ -#define INCLUDE_common_h__ - -#include "git2/common.h" -#include "cc-compat.h" - -/** Declare a function as always inlined. */ -#if defined(_MSC_VER) -# define GIT_INLINE(type) static __inline type -#else -# define GIT_INLINE(type) static inline type -#endif - -/** Support for gcc/clang __has_builtin intrinsic */ -#ifndef __has_builtin -# define __has_builtin(x) 0 -#endif - -#include -#include -#include -#include -#include -#include - -#include -#include - -#ifdef GIT_WIN32 - -# include -# include -# include -# include -# include -# include "win32/msvc-compat.h" -# include "win32/mingw-compat.h" -# include "win32/win32-compat.h" -# include "win32/error.h" -# include "win32/version.h" -# ifdef GIT_THREADS -# include "win32/pthread.h" -# endif -# if defined(GIT_MSVC_CRTDBG) -# include "win32/w32_stack.h" -# include "win32/w32_crtdbg_stacktrace.h" -# endif - -#else - -# include -# include -# ifdef GIT_THREADS -# include -# include -# endif -#define GIT_STDLIB_CALL - -#ifdef GIT_USE_STAT_ATIMESPEC -# define st_atim st_atimespec -# define st_ctim st_ctimespec -# define st_mtim st_mtimespec -#endif - -# include - -#endif - -#include "git2/types.h" -#include "git2/errors.h" -#include "thread-utils.h" -#include "integer.h" - -#include - -#define DEFAULT_BUFSIZE 65536 -#define FILEIO_BUFSIZE DEFAULT_BUFSIZE -#define FILTERIO_BUFSIZE DEFAULT_BUFSIZE -#define NETIO_BUFSIZE DEFAULT_BUFSIZE - -/** - * Check a pointer allocation result, returning -1 if it failed. - */ -#define GITERR_CHECK_ALLOC(ptr) if (ptr == NULL) { return -1; } - -/** - * Check a buffer allocation result, returning -1 if it failed. - */ -#define GITERR_CHECK_ALLOC_BUF(buf) if ((void *)(buf) == NULL || git_buf_oom(buf)) { return -1; } - -/** - * Check a return value and propagate result if non-zero. - */ -#define GITERR_CHECK_ERROR(code) \ - do { int _err = (code); if (_err) return _err; } while (0) - -/** - * Set the error message for this thread, formatting as needed. - */ -void giterr_set(int error_class, const char *string, ...); - -/** - * Set the error message for a regex failure, using the internal regex - * error code lookup and return a libgit error code. - */ -int giterr_set_regex(const regex_t *regex, int error_code); - -/** - * Set error message for user callback if needed. - * - * If the error code in non-zero and no error message is set, this - * sets a generic error message. - * - * @return This always returns the `error_code` parameter. - */ -GIT_INLINE(int) giterr_set_after_callback_function( - int error_code, const char *action) -{ - if (error_code) { - const git_error *e = giterr_last(); - if (!e || !e->message) - giterr_set(e ? e->klass : GITERR_CALLBACK, - "%s callback returned %d", action, error_code); - } - return error_code; -} - -#ifdef GIT_WIN32 -#define giterr_set_after_callback(code) \ - giterr_set_after_callback_function((code), __FUNCTION__) -#else -#define giterr_set_after_callback(code) \ - giterr_set_after_callback_function((code), __func__) -#endif - -/** - * Gets the system error code for this thread. - */ -int giterr_system_last(void); - -/** - * Sets the system error code for this thread. - */ -void giterr_system_set(int code); - -/** - * Structure to preserve libgit2 error state - */ -typedef struct { - int error_code; - unsigned int oom : 1; - git_error error_msg; -} git_error_state; - -/** - * Capture current error state to restore later, returning error code. - * If `error_code` is zero, this does not clear the current error state. - * You must either restore this error state, or free it. - */ -extern int giterr_state_capture(git_error_state *state, int error_code); - -/** - * Restore error state to a previous value, returning saved error code. - */ -extern int giterr_state_restore(git_error_state *state); - -/** Free an error state. */ -extern void giterr_state_free(git_error_state *state); - -/** - * Check a versioned structure for validity - */ -GIT_INLINE(int) giterr__check_version(const void *structure, unsigned int expected_max, const char *name) -{ - unsigned int actual; - - if (!structure) - return 0; - - actual = *(const unsigned int*)structure; - if (actual > 0 && actual <= expected_max) - return 0; - - giterr_set(GITERR_INVALID, "Invalid version %d on %s", actual, name); - return -1; -} -#define GITERR_CHECK_VERSION(S,V,N) if (giterr__check_version(S,V,N) < 0) return -1 - -/** - * Initialize a structure with a version. - */ -GIT_INLINE(void) git__init_structure(void *structure, size_t len, unsigned int version) -{ - memset(structure, 0, len); - *((int*)structure) = version; -} -#define GIT_INIT_STRUCTURE(S,V) git__init_structure(S, sizeof(*S), V) - -#define GIT_INIT_STRUCTURE_FROM_TEMPLATE(PTR,VERSION,TYPE,TPL) do { \ - TYPE _tmpl = TPL; \ - GITERR_CHECK_VERSION(&(VERSION), _tmpl.version, #TYPE); \ - memcpy((PTR), &_tmpl, sizeof(_tmpl)); } while (0) - - -/** Check for additive overflow, setting an error if would occur. */ -#define GIT_ADD_SIZET_OVERFLOW(out, one, two) \ - (git__add_sizet_overflow(out, one, two) ? (giterr_set_oom(), 1) : 0) - -/** Check for additive overflow, setting an error if would occur. */ -#define GIT_MULTIPLY_SIZET_OVERFLOW(out, nelem, elsize) \ - (git__multiply_sizet_overflow(out, nelem, elsize) ? (giterr_set_oom(), 1) : 0) - -/** Check for additive overflow, failing if it would occur. */ -#define GITERR_CHECK_ALLOC_ADD(out, one, two) \ - if (GIT_ADD_SIZET_OVERFLOW(out, one, two)) { return -1; } - -#define GITERR_CHECK_ALLOC_ADD3(out, one, two, three) \ - if (GIT_ADD_SIZET_OVERFLOW(out, one, two) || \ - GIT_ADD_SIZET_OVERFLOW(out, *(out), three)) { return -1; } - -#define GITERR_CHECK_ALLOC_ADD4(out, one, two, three, four) \ - if (GIT_ADD_SIZET_OVERFLOW(out, one, two) || \ - GIT_ADD_SIZET_OVERFLOW(out, *(out), three) || \ - GIT_ADD_SIZET_OVERFLOW(out, *(out), four)) { return -1; } - -/** Check for multiplicative overflow, failing if it would occur. */ -#define GITERR_CHECK_ALLOC_MULTIPLY(out, nelem, elsize) \ - if (GIT_MULTIPLY_SIZET_OVERFLOW(out, nelem, elsize)) { return -1; } - -/* NOTE: other giterr functions are in the public errors.h header file */ - -#include "util.h" - -#endif /* INCLUDE_common_h__ */ diff --git a/vendor/libgit2/src/config.c b/vendor/libgit2/src/config.c deleted file mode 100644 index f4d4cb2b9..000000000 --- a/vendor/libgit2/src/config.c +++ /dev/null @@ -1,1483 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "common.h" -#include "sysdir.h" -#include "config.h" -#include "git2/config.h" -#include "git2/sys/config.h" -#include "vector.h" -#include "buf_text.h" -#include "config_file.h" -#include "transaction.h" -#if GIT_WIN32 -# include -#endif - -#include - -void git_config_entry_free(git_config_entry *entry) -{ - if (!entry) - return; - - entry->free(entry); -} - -typedef struct { - git_refcount rc; - - git_config_backend *file; - git_config_level_t level; -} file_internal; - -static void file_internal_free(file_internal *internal) -{ - git_config_backend *file; - - file = internal->file; - file->free(file); - git__free(internal); -} - -static void config_free(git_config *cfg) -{ - size_t i; - file_internal *internal; - - for (i = 0; i < cfg->files.length; ++i) { - internal = git_vector_get(&cfg->files, i); - GIT_REFCOUNT_DEC(internal, file_internal_free); - } - - git_vector_free(&cfg->files); - - git__memzero(cfg, sizeof(*cfg)); - git__free(cfg); -} - -void git_config_free(git_config *cfg) -{ - if (cfg == NULL) - return; - - GIT_REFCOUNT_DEC(cfg, config_free); -} - -static int config_backend_cmp(const void *a, const void *b) -{ - const file_internal *bk_a = (const file_internal *)(a); - const file_internal *bk_b = (const file_internal *)(b); - - return bk_b->level - bk_a->level; -} - -int git_config_new(git_config **out) -{ - git_config *cfg; - - cfg = git__malloc(sizeof(git_config)); - GITERR_CHECK_ALLOC(cfg); - - memset(cfg, 0x0, sizeof(git_config)); - - if (git_vector_init(&cfg->files, 3, config_backend_cmp) < 0) { - git__free(cfg); - return -1; - } - - *out = cfg; - GIT_REFCOUNT_INC(cfg); - return 0; -} - -int git_config_add_file_ondisk( - git_config *cfg, - const char *path, - git_config_level_t level, - int force) -{ - git_config_backend *file = NULL; - struct stat st; - int res; - - assert(cfg && path); - - res = p_stat(path, &st); - if (res < 0 && errno != ENOENT) { - giterr_set(GITERR_CONFIG, "Error stat'ing config file '%s'", path); - return -1; - } - - if (git_config_file__ondisk(&file, path) < 0) - return -1; - - if ((res = git_config_add_backend(cfg, file, level, force)) < 0) { - /* - * free manually; the file is not owned by the config - * instance yet and will not be freed on cleanup - */ - file->free(file); - return res; - } - - return 0; -} - -int git_config_open_ondisk(git_config **out, const char *path) -{ - int error; - git_config *config; - - *out = NULL; - - if (git_config_new(&config) < 0) - return -1; - - if ((error = git_config_add_file_ondisk(config, path, GIT_CONFIG_LEVEL_LOCAL, 0)) < 0) - git_config_free(config); - else - *out = config; - - return error; -} - -int git_config_snapshot(git_config **out, git_config *in) -{ - int error = 0; - size_t i; - file_internal *internal; - git_config *config; - - *out = NULL; - - if (git_config_new(&config) < 0) - return -1; - - git_vector_foreach(&in->files, i, internal) { - git_config_backend *b; - - if ((error = internal->file->snapshot(&b, internal->file)) < 0) - break; - - if ((error = git_config_add_backend(config, b, internal->level, 0)) < 0) { - b->free(b); - break; - } - } - - if (error < 0) - git_config_free(config); - else - *out = config; - - return error; -} - -static int find_internal_file_by_level( - file_internal **internal_out, - const git_config *cfg, - git_config_level_t level) -{ - int pos = -1; - file_internal *internal; - size_t i; - - /* when passing GIT_CONFIG_HIGHEST_LEVEL, the idea is to get the config file - * which has the highest level. As config files are stored in a vector - * sorted by decreasing order of level, getting the file at position 0 - * will do the job. - */ - if (level == GIT_CONFIG_HIGHEST_LEVEL) { - pos = 0; - } else { - git_vector_foreach(&cfg->files, i, internal) { - if (internal->level == level) - pos = (int)i; - } - } - - if (pos == -1) { - giterr_set(GITERR_CONFIG, - "No config file exists for the given level '%i'", (int)level); - return GIT_ENOTFOUND; - } - - *internal_out = git_vector_get(&cfg->files, pos); - - return 0; -} - -static int duplicate_level(void **old_raw, void *new_raw) -{ - file_internal **old = (file_internal **)old_raw; - - GIT_UNUSED(new_raw); - - giterr_set(GITERR_CONFIG, "A file with the same level (%i) has already been added to the config", (int)(*old)->level); - return GIT_EEXISTS; -} - -static void try_remove_existing_file_internal( - git_config *cfg, - git_config_level_t level) -{ - int pos = -1; - file_internal *internal; - size_t i; - - git_vector_foreach(&cfg->files, i, internal) { - if (internal->level == level) - pos = (int)i; - } - - if (pos == -1) - return; - - internal = git_vector_get(&cfg->files, pos); - - if (git_vector_remove(&cfg->files, pos) < 0) - return; - - GIT_REFCOUNT_DEC(internal, file_internal_free); -} - -static int git_config__add_internal( - git_config *cfg, - file_internal *internal, - git_config_level_t level, - int force) -{ - int result; - - /* delete existing config file for level if it exists */ - if (force) - try_remove_existing_file_internal(cfg, level); - - if ((result = git_vector_insert_sorted(&cfg->files, - internal, &duplicate_level)) < 0) - return result; - - git_vector_sort(&cfg->files); - internal->file->cfg = cfg; - - GIT_REFCOUNT_INC(internal); - - return 0; -} - -int git_config_open_global(git_config **cfg_out, git_config *cfg) -{ - if (!git_config_open_level(cfg_out, cfg, GIT_CONFIG_LEVEL_XDG)) - return 0; - - return git_config_open_level(cfg_out, cfg, GIT_CONFIG_LEVEL_GLOBAL); -} - -int git_config_open_level( - git_config **cfg_out, - const git_config *cfg_parent, - git_config_level_t level) -{ - git_config *cfg; - file_internal *internal; - int res; - - if ((res = find_internal_file_by_level(&internal, cfg_parent, level)) < 0) - return res; - - if ((res = git_config_new(&cfg)) < 0) - return res; - - if ((res = git_config__add_internal(cfg, internal, level, true)) < 0) { - git_config_free(cfg); - return res; - } - - *cfg_out = cfg; - - return 0; -} - -int git_config_add_backend( - git_config *cfg, - git_config_backend *file, - git_config_level_t level, - int force) -{ - file_internal *internal; - int result; - - assert(cfg && file); - - GITERR_CHECK_VERSION(file, GIT_CONFIG_BACKEND_VERSION, "git_config_backend"); - - if ((result = file->open(file, level)) < 0) - return result; - - internal = git__malloc(sizeof(file_internal)); - GITERR_CHECK_ALLOC(internal); - - memset(internal, 0x0, sizeof(file_internal)); - - internal->file = file; - internal->level = level; - - if ((result = git_config__add_internal(cfg, internal, level, force)) < 0) { - git__free(internal); - return result; - } - - return 0; -} - -/* - * Loop over all the variables - */ - -typedef struct { - git_config_iterator parent; - git_config_iterator *current; - const git_config *cfg; - regex_t regex; - size_t i; -} all_iter; - -static int find_next_backend(size_t *out, const git_config *cfg, size_t i) -{ - file_internal *internal; - - for (; i > 0; --i) { - internal = git_vector_get(&cfg->files, i - 1); - if (!internal || !internal->file) - continue; - - *out = i; - return 0; - } - - return -1; -} - -static int all_iter_next(git_config_entry **entry, git_config_iterator *_iter) -{ - all_iter *iter = (all_iter *) _iter; - file_internal *internal; - git_config_backend *backend; - size_t i; - int error = 0; - - if (iter->current != NULL && - (error = iter->current->next(entry, iter->current)) == 0) { - return 0; - } - - if (error < 0 && error != GIT_ITEROVER) - return error; - - do { - if (find_next_backend(&i, iter->cfg, iter->i) < 0) - return GIT_ITEROVER; - - internal = git_vector_get(&iter->cfg->files, i - 1); - backend = internal->file; - iter->i = i - 1; - - if (iter->current) - iter->current->free(iter->current); - - iter->current = NULL; - error = backend->iterator(&iter->current, backend); - if (error == GIT_ENOTFOUND) - continue; - - if (error < 0) - return error; - - error = iter->current->next(entry, iter->current); - /* If this backend is empty, then keep going */ - if (error == GIT_ITEROVER) - continue; - - return error; - - } while(1); - - return GIT_ITEROVER; -} - -static int all_iter_glob_next(git_config_entry **entry, git_config_iterator *_iter) -{ - int error; - all_iter *iter = (all_iter *) _iter; - - /* - * We use the "normal" function to grab the next one across - * backends and then apply the regex - */ - while ((error = all_iter_next(entry, _iter)) == 0) { - /* skip non-matching keys if regexp was provided */ - if (regexec(&iter->regex, (*entry)->name, 0, NULL, 0) != 0) - continue; - - /* and simply return if we like the entry's name */ - return 0; - } - - return error; -} - -static void all_iter_free(git_config_iterator *_iter) -{ - all_iter *iter = (all_iter *) _iter; - - if (iter->current) - iter->current->free(iter->current); - - git__free(iter); -} - -static void all_iter_glob_free(git_config_iterator *_iter) -{ - all_iter *iter = (all_iter *) _iter; - - regfree(&iter->regex); - all_iter_free(_iter); -} - -int git_config_iterator_new(git_config_iterator **out, const git_config *cfg) -{ - all_iter *iter; - - iter = git__calloc(1, sizeof(all_iter)); - GITERR_CHECK_ALLOC(iter); - - iter->parent.free = all_iter_free; - iter->parent.next = all_iter_next; - - iter->i = cfg->files.length; - iter->cfg = cfg; - - *out = (git_config_iterator *) iter; - - return 0; -} - -int git_config_iterator_glob_new(git_config_iterator **out, const git_config *cfg, const char *regexp) -{ - all_iter *iter; - int result; - - if (regexp == NULL) - return git_config_iterator_new(out, cfg); - - iter = git__calloc(1, sizeof(all_iter)); - GITERR_CHECK_ALLOC(iter); - - if ((result = regcomp(&iter->regex, regexp, REG_EXTENDED)) != 0) { - giterr_set_regex(&iter->regex, result); - git__free(iter); - return -1; - } - - iter->parent.next = all_iter_glob_next; - iter->parent.free = all_iter_glob_free; - iter->i = cfg->files.length; - iter->cfg = cfg; - - *out = (git_config_iterator *) iter; - - return 0; -} - -int git_config_foreach( - const git_config *cfg, git_config_foreach_cb cb, void *payload) -{ - return git_config_foreach_match(cfg, NULL, cb, payload); -} - -int git_config_backend_foreach_match( - git_config_backend *backend, - const char *regexp, - git_config_foreach_cb cb, - void *payload) -{ - git_config_entry *entry; - git_config_iterator* iter; - regex_t regex; - int error = 0; - - if (regexp != NULL) { - if ((error = regcomp(®ex, regexp, REG_EXTENDED)) != 0) { - giterr_set_regex(®ex, error); - regfree(®ex); - return -1; - } - } - - if ((error = backend->iterator(&iter, backend)) < 0) { - iter = NULL; - return -1; - } - - while (!(iter->next(&entry, iter) < 0)) { - /* skip non-matching keys if regexp was provided */ - if (regexp && regexec(®ex, entry->name, 0, NULL, 0) != 0) - continue; - - /* abort iterator on non-zero return value */ - if ((error = cb(entry, payload)) != 0) { - giterr_set_after_callback(error); - break; - } - } - - if (regexp != NULL) - regfree(®ex); - - iter->free(iter); - - return error; -} - -int git_config_foreach_match( - const git_config *cfg, - const char *regexp, - git_config_foreach_cb cb, - void *payload) -{ - int error; - git_config_iterator *iter; - git_config_entry *entry; - - if ((error = git_config_iterator_glob_new(&iter, cfg, regexp)) < 0) - return error; - - while (!(error = git_config_next(&entry, iter))) { - if ((error = cb(entry, payload)) != 0) { - giterr_set_after_callback(error); - break; - } - } - - git_config_iterator_free(iter); - - if (error == GIT_ITEROVER) - error = 0; - - return error; -} - -/************** - * Setters - **************/ - -static int config_error_nofiles(const char *name) -{ - giterr_set(GITERR_CONFIG, - "Cannot set value for '%s' when no config files exist", name); - return GIT_ENOTFOUND; -} - -int git_config_delete_entry(git_config *cfg, const char *name) -{ - git_config_backend *file; - file_internal *internal; - - internal = git_vector_get(&cfg->files, 0); - if (!internal || !internal->file) - return config_error_nofiles(name); - file = internal->file; - - return file->del(file, name); -} - -int git_config_set_int64(git_config *cfg, const char *name, int64_t value) -{ - char str_value[32]; /* All numbers should fit in here */ - p_snprintf(str_value, sizeof(str_value), "%" PRId64, value); - return git_config_set_string(cfg, name, str_value); -} - -int git_config_set_int32(git_config *cfg, const char *name, int32_t value) -{ - return git_config_set_int64(cfg, name, (int64_t)value); -} - -int git_config_set_bool(git_config *cfg, const char *name, int value) -{ - return git_config_set_string(cfg, name, value ? "true" : "false"); -} - -int git_config_set_string(git_config *cfg, const char *name, const char *value) -{ - int error; - git_config_backend *file; - file_internal *internal; - - if (!value) { - giterr_set(GITERR_CONFIG, "The value to set cannot be NULL"); - return -1; - } - - internal = git_vector_get(&cfg->files, 0); - if (!internal || !internal->file) - return config_error_nofiles(name); - file = internal->file; - - error = file->set(file, name, value); - - if (!error && GIT_REFCOUNT_OWNER(cfg) != NULL) - git_repository__cvar_cache_clear(GIT_REFCOUNT_OWNER(cfg)); - - return error; -} - -int git_config__update_entry( - git_config *config, - const char *key, - const char *value, - bool overwrite_existing, - bool only_if_existing) -{ - int error = 0; - git_config_entry *ce = NULL; - - if ((error = git_config__lookup_entry(&ce, config, key, false)) < 0) - return error; - - if (!ce && only_if_existing) /* entry doesn't exist */ - return 0; - if (ce && !overwrite_existing) /* entry would be overwritten */ - return 0; - if (value && ce && ce->value && !strcmp(ce->value, value)) /* no change */ - return 0; - if (!value && (!ce || !ce->value)) /* asked to delete absent entry */ - return 0; - - if (!value) - error = git_config_delete_entry(config, key); - else - error = git_config_set_string(config, key, value); - - git_config_entry_free(ce); - return error; -} - -/*********** - * Getters - ***********/ - -static int config_error_notfound(const char *name) -{ - giterr_set(GITERR_CONFIG, "Config value '%s' was not found", name); - return GIT_ENOTFOUND; -} - -enum { - GET_ALL_ERRORS = 0, - GET_NO_MISSING = 1, - GET_NO_ERRORS = 2 -}; - -static int get_entry( - git_config_entry **out, - const git_config *cfg, - const char *name, - bool normalize_name, - int want_errors) -{ - int res = GIT_ENOTFOUND; - const char *key = name; - char *normalized = NULL; - size_t i; - file_internal *internal; - - *out = NULL; - - if (normalize_name) { - if ((res = git_config__normalize_name(name, &normalized)) < 0) - goto cleanup; - key = normalized; - } - - res = GIT_ENOTFOUND; - git_vector_foreach(&cfg->files, i, internal) { - if (!internal || !internal->file) - continue; - - res = internal->file->get(internal->file, key, out); - if (res != GIT_ENOTFOUND) - break; - } - - git__free(normalized); - -cleanup: - if (res == GIT_ENOTFOUND) - res = (want_errors > GET_ALL_ERRORS) ? 0 : config_error_notfound(name); - else if (res && (want_errors == GET_NO_ERRORS)) { - giterr_clear(); - res = 0; - } - - return res; -} - -int git_config_get_entry( - git_config_entry **out, const git_config *cfg, const char *name) -{ - return get_entry(out, cfg, name, true, GET_ALL_ERRORS); -} - -int git_config__lookup_entry( - git_config_entry **out, - const git_config *cfg, - const char *key, - bool no_errors) -{ - return get_entry( - out, cfg, key, false, no_errors ? GET_NO_ERRORS : GET_NO_MISSING); -} - -int git_config_get_mapped( - int *out, - const git_config *cfg, - const char *name, - const git_cvar_map *maps, - size_t map_n) -{ - git_config_entry *entry; - int ret; - - if ((ret = get_entry(&entry, cfg, name, true, GET_ALL_ERRORS)) < 0) - return ret; - - ret = git_config_lookup_map_value(out, maps, map_n, entry->value); - git_config_entry_free(entry); - - return ret; -} - -int git_config_get_int64(int64_t *out, const git_config *cfg, const char *name) -{ - git_config_entry *entry; - int ret; - - if ((ret = get_entry(&entry, cfg, name, true, GET_ALL_ERRORS)) < 0) - return ret; - - ret = git_config_parse_int64(out, entry->value); - git_config_entry_free(entry); - - return ret; -} - -int git_config_get_int32(int32_t *out, const git_config *cfg, const char *name) -{ - git_config_entry *entry; - int ret; - - if ((ret = get_entry(&entry, cfg, name, true, GET_ALL_ERRORS)) < 0) - return ret; - - ret = git_config_parse_int32(out, entry->value); - git_config_entry_free(entry); - - return ret; -} - -int git_config_get_bool(int *out, const git_config *cfg, const char *name) -{ - git_config_entry *entry; - int ret; - - if ((ret = get_entry(&entry, cfg, name, true, GET_ALL_ERRORS)) < 0) - return ret; - - ret = git_config_parse_bool(out, entry->value); - git_config_entry_free(entry); - - return ret; -} - -static int is_readonly(const git_config *cfg) -{ - size_t i; - file_internal *internal; - - git_vector_foreach(&cfg->files, i, internal) { - if (!internal || !internal->file) - continue; - - if (!internal->file->readonly) - return 0; - } - - return 1; -} - -int git_config_get_path(git_buf *out, const git_config *cfg, const char *name) -{ - git_config_entry *entry; - int error; - - if ((error = get_entry(&entry, cfg, name, true, GET_ALL_ERRORS)) < 0) - return error; - - error = git_config_parse_path(out, entry->value); - git_config_entry_free(entry); - - return error; -} - -int git_config_get_string( - const char **out, const git_config *cfg, const char *name) -{ - git_config_entry *entry; - int ret; - - if (!is_readonly(cfg)) { - giterr_set(GITERR_CONFIG, "get_string called on a live config object"); - return -1; - } - - ret = get_entry(&entry, cfg, name, true, GET_ALL_ERRORS); - *out = !ret ? (entry->value ? entry->value : "") : NULL; - - git_config_entry_free(entry); - - return ret; -} - -int git_config_get_string_buf( - git_buf *out, const git_config *cfg, const char *name) -{ - git_config_entry *entry; - int ret; - const char *str; - - git_buf_sanitize(out); - - ret = get_entry(&entry, cfg, name, true, GET_ALL_ERRORS); - str = !ret ? (entry->value ? entry->value : "") : NULL; - - if (str) - ret = git_buf_puts(out, str); - - git_config_entry_free(entry); - - return ret; -} - -char *git_config__get_string_force( - const git_config *cfg, const char *key, const char *fallback_value) -{ - git_config_entry *entry; - char *ret; - - get_entry(&entry, cfg, key, false, GET_NO_ERRORS); - ret = (entry && entry->value) ? git__strdup(entry->value) : fallback_value ? git__strdup(fallback_value) : NULL; - git_config_entry_free(entry); - - return ret; -} - -int git_config__get_bool_force( - const git_config *cfg, const char *key, int fallback_value) -{ - int val = fallback_value; - git_config_entry *entry; - - get_entry(&entry, cfg, key, false, GET_NO_ERRORS); - - if (entry && git_config_parse_bool(&val, entry->value) < 0) - giterr_clear(); - - git_config_entry_free(entry); - return val; -} - -int git_config__get_int_force( - const git_config *cfg, const char *key, int fallback_value) -{ - int32_t val = (int32_t)fallback_value; - git_config_entry *entry; - - get_entry(&entry, cfg, key, false, GET_NO_ERRORS); - - if (entry && git_config_parse_int32(&val, entry->value) < 0) - giterr_clear(); - - git_config_entry_free(entry); - return (int)val; -} - -int git_config_get_multivar_foreach( - const git_config *cfg, const char *name, const char *regexp, - git_config_foreach_cb cb, void *payload) -{ - int err, found; - git_config_iterator *iter; - git_config_entry *entry; - - if ((err = git_config_multivar_iterator_new(&iter, cfg, name, regexp)) < 0) - return err; - - found = 0; - while ((err = iter->next(&entry, iter)) == 0) { - found = 1; - - if ((err = cb(entry, payload)) != 0) { - giterr_set_after_callback(err); - break; - } - } - - iter->free(iter); - if (err == GIT_ITEROVER) - err = 0; - - if (found == 0 && err == 0) - err = config_error_notfound(name); - - return err; -} - -typedef struct { - git_config_iterator parent; - git_config_iterator *iter; - char *name; - regex_t regex; - int have_regex; -} multivar_iter; - -static int multivar_iter_next(git_config_entry **entry, git_config_iterator *_iter) -{ - multivar_iter *iter = (multivar_iter *) _iter; - int error = 0; - - while ((error = iter->iter->next(entry, iter->iter)) == 0) { - if (git__strcmp(iter->name, (*entry)->name)) - continue; - - if (!iter->have_regex) - return 0; - - if (regexec(&iter->regex, (*entry)->value, 0, NULL, 0) == 0) - return 0; - } - - return error; -} - -void multivar_iter_free(git_config_iterator *_iter) -{ - multivar_iter *iter = (multivar_iter *) _iter; - - iter->iter->free(iter->iter); - - git__free(iter->name); - if (iter->have_regex) - regfree(&iter->regex); - git__free(iter); -} - -int git_config_multivar_iterator_new(git_config_iterator **out, const git_config *cfg, const char *name, const char *regexp) -{ - multivar_iter *iter = NULL; - git_config_iterator *inner = NULL; - int error; - - if ((error = git_config_iterator_new(&inner, cfg)) < 0) - return error; - - iter = git__calloc(1, sizeof(multivar_iter)); - GITERR_CHECK_ALLOC(iter); - - if ((error = git_config__normalize_name(name, &iter->name)) < 0) - goto on_error; - - if (regexp != NULL) { - error = regcomp(&iter->regex, regexp, REG_EXTENDED); - if (error != 0) { - giterr_set_regex(&iter->regex, error); - error = -1; - regfree(&iter->regex); - goto on_error; - } - - iter->have_regex = 1; - } - - iter->iter = inner; - iter->parent.free = multivar_iter_free; - iter->parent.next = multivar_iter_next; - - *out = (git_config_iterator *) iter; - - return 0; - -on_error: - - inner->free(inner); - git__free(iter); - return error; -} - -int git_config_set_multivar(git_config *cfg, const char *name, const char *regexp, const char *value) -{ - git_config_backend *file; - file_internal *internal; - - internal = git_vector_get(&cfg->files, 0); - if (!internal || !internal->file) - return config_error_nofiles(name); - file = internal->file; - - return file->set_multivar(file, name, regexp, value); -} - -int git_config_delete_multivar(git_config *cfg, const char *name, const char *regexp) -{ - git_config_backend *file; - file_internal *internal; - - internal = git_vector_get(&cfg->files, 0); - if (!internal || !internal->file) - return config_error_nofiles(name); - file = internal->file; - - return file->del_multivar(file, name, regexp); -} - -int git_config_next(git_config_entry **entry, git_config_iterator *iter) -{ - return iter->next(entry, iter); -} - -void git_config_iterator_free(git_config_iterator *iter) -{ - if (iter == NULL) - return; - - iter->free(iter); -} - -int git_config_find_global(git_buf *path) -{ - git_buf_sanitize(path); - return git_sysdir_find_global_file(path, GIT_CONFIG_FILENAME_GLOBAL); -} - -int git_config_find_xdg(git_buf *path) -{ - git_buf_sanitize(path); - return git_sysdir_find_xdg_file(path, GIT_CONFIG_FILENAME_XDG); -} - -int git_config_find_system(git_buf *path) -{ - git_buf_sanitize(path); - return git_sysdir_find_system_file(path, GIT_CONFIG_FILENAME_SYSTEM); -} - -int git_config_find_programdata(git_buf *path) -{ - git_buf_sanitize(path); - return git_sysdir_find_programdata_file(path, GIT_CONFIG_FILENAME_PROGRAMDATA); -} - -int git_config__global_location(git_buf *buf) -{ - const git_buf *paths; - const char *sep, *start; - - if (git_sysdir_get(&paths, GIT_SYSDIR_GLOBAL) < 0) - return -1; - - /* no paths, so give up */ - if (!paths || !git_buf_len(paths)) - return -1; - - /* find unescaped separator or end of string */ - for (sep = start = git_buf_cstr(paths); *sep; ++sep) { - if (*sep == GIT_PATH_LIST_SEPARATOR && - (sep <= start || sep[-1] != '\\')) - break; - } - - if (git_buf_set(buf, start, (size_t)(sep - start)) < 0) - return -1; - - return git_buf_joinpath(buf, buf->ptr, GIT_CONFIG_FILENAME_GLOBAL); -} - -int git_config_open_default(git_config **out) -{ - int error; - git_config *cfg = NULL; - git_buf buf = GIT_BUF_INIT; - - if ((error = git_config_new(&cfg)) < 0) - return error; - - if (!git_config_find_global(&buf) || !git_config__global_location(&buf)) { - error = git_config_add_file_ondisk(cfg, buf.ptr, - GIT_CONFIG_LEVEL_GLOBAL, 0); - } - - if (!error && !git_config_find_xdg(&buf)) - error = git_config_add_file_ondisk(cfg, buf.ptr, - GIT_CONFIG_LEVEL_XDG, 0); - - if (!error && !git_config_find_system(&buf)) - error = git_config_add_file_ondisk(cfg, buf.ptr, - GIT_CONFIG_LEVEL_SYSTEM, 0); - - if (!error && !git_config_find_programdata(&buf)) - error = git_config_add_file_ondisk(cfg, buf.ptr, - GIT_CONFIG_LEVEL_PROGRAMDATA, 0); - - git_buf_free(&buf); - - if (error) { - git_config_free(cfg); - cfg = NULL; - } - - *out = cfg; - - return error; -} - -int git_config_lock(git_transaction **out, git_config *cfg) -{ - int error; - git_config_backend *file; - file_internal *internal; - - internal = git_vector_get(&cfg->files, 0); - if (!internal || !internal->file) { - giterr_set(GITERR_CONFIG, "cannot lock; the config has no backends/files"); - return -1; - } - file = internal->file; - - if ((error = file->lock(file)) < 0) - return error; - - return git_transaction_config_new(out, cfg); -} - -int git_config_unlock(git_config *cfg, int commit) -{ - git_config_backend *file; - file_internal *internal; - - internal = git_vector_get(&cfg->files, 0); - if (!internal || !internal->file) { - giterr_set(GITERR_CONFIG, "cannot lock; the config has no backends/files"); - return -1; - } - - file = internal->file; - - return file->unlock(file, commit); -} - -/*********** - * Parsers - ***********/ - -int git_config_lookup_map_value( - int *out, - const git_cvar_map *maps, - size_t map_n, - const char *value) -{ - size_t i; - - if (!value) - goto fail_parse; - - for (i = 0; i < map_n; ++i) { - const git_cvar_map *m = maps + i; - - switch (m->cvar_type) { - case GIT_CVAR_FALSE: - case GIT_CVAR_TRUE: { - int bool_val; - - if (git__parse_bool(&bool_val, value) == 0 && - bool_val == (int)m->cvar_type) { - *out = m->map_value; - return 0; - } - break; - } - - case GIT_CVAR_INT32: - if (git_config_parse_int32(out, value) == 0) - return 0; - break; - - case GIT_CVAR_STRING: - if (strcasecmp(value, m->str_match) == 0) { - *out = m->map_value; - return 0; - } - break; - } - } - -fail_parse: - giterr_set(GITERR_CONFIG, "Failed to map '%s'", value); - return -1; -} - -int git_config_lookup_map_enum(git_cvar_t *type_out, const char **str_out, - const git_cvar_map *maps, size_t map_n, int enum_val) -{ - size_t i; - - for (i = 0; i < map_n; i++) { - const git_cvar_map *m = &maps[i]; - - if (m->map_value != enum_val) - continue; - - *type_out = m->cvar_type; - *str_out = m->str_match; - return 0; - } - - giterr_set(GITERR_CONFIG, "invalid enum value"); - return GIT_ENOTFOUND; -} - -int git_config_parse_bool(int *out, const char *value) -{ - if (git__parse_bool(out, value) == 0) - return 0; - - if (git_config_parse_int32(out, value) == 0) { - *out = !!(*out); - return 0; - } - - giterr_set(GITERR_CONFIG, "Failed to parse '%s' as a boolean value", value); - return -1; -} - -int git_config_parse_int64(int64_t *out, const char *value) -{ - const char *num_end; - int64_t num; - - if (!value || git__strtol64(&num, value, &num_end, 0) < 0) - goto fail_parse; - - switch (*num_end) { - case 'g': - case 'G': - num *= 1024; - /* fallthrough */ - - case 'm': - case 'M': - num *= 1024; - /* fallthrough */ - - case 'k': - case 'K': - num *= 1024; - - /* check that that there are no more characters after the - * given modifier suffix */ - if (num_end[1] != '\0') - return -1; - - /* fallthrough */ - - case '\0': - *out = num; - return 0; - - default: - goto fail_parse; - } - -fail_parse: - giterr_set(GITERR_CONFIG, "Failed to parse '%s' as an integer", value ? value : "(null)"); - return -1; -} - -int git_config_parse_int32(int32_t *out, const char *value) -{ - int64_t tmp; - int32_t truncate; - - if (git_config_parse_int64(&tmp, value) < 0) - goto fail_parse; - - truncate = tmp & 0xFFFFFFFF; - if (truncate != tmp) - goto fail_parse; - - *out = truncate; - return 0; - -fail_parse: - giterr_set(GITERR_CONFIG, "Failed to parse '%s' as a 32-bit integer", value ? value : "(null)"); - return -1; -} - -int git_config_parse_path(git_buf *out, const char *value) -{ - int error = 0; - const git_buf *home; - - assert(out && value); - - git_buf_sanitize(out); - - if (value[0] == '~') { - if (value[1] != '\0' && value[1] != '/') { - giterr_set(GITERR_CONFIG, "retrieving a homedir by name is not supported"); - return -1; - } - - if ((error = git_sysdir_get(&home, GIT_SYSDIR_GLOBAL)) < 0) - return error; - - git_buf_sets(out, home->ptr); - git_buf_puts(out, value + 1); - - if (git_buf_oom(out)) - return -1; - - return 0; - } - - return git_buf_sets(out, value); -} - -/* Take something the user gave us and make it nice for our hash function */ -int git_config__normalize_name(const char *in, char **out) -{ - char *name, *fdot, *ldot; - - assert(in && out); - - name = git__strdup(in); - GITERR_CHECK_ALLOC(name); - - fdot = strchr(name, '.'); - ldot = strrchr(name, '.'); - - if (fdot == NULL || fdot == name || ldot == NULL || !ldot[1]) - goto invalid; - - /* Validate and downcase up to first dot and after last dot */ - if (git_config_file_normalize_section(name, fdot) < 0 || - git_config_file_normalize_section(ldot + 1, NULL) < 0) - goto invalid; - - /* If there is a middle range, make sure it doesn't have newlines */ - while (fdot < ldot) - if (*fdot++ == '\n') - goto invalid; - - *out = name; - return 0; - -invalid: - git__free(name); - giterr_set(GITERR_CONFIG, "Invalid config item name '%s'", in); - return GIT_EINVALIDSPEC; -} - -struct rename_data { - git_config *config; - git_buf *name; - size_t old_len; -}; - -static int rename_config_entries_cb( - const git_config_entry *entry, - void *payload) -{ - int error = 0; - struct rename_data *data = (struct rename_data *)payload; - size_t base_len = git_buf_len(data->name); - - if (base_len > 0 && - !(error = git_buf_puts(data->name, entry->name + data->old_len))) - { - error = git_config_set_string( - data->config, git_buf_cstr(data->name), entry->value); - - git_buf_truncate(data->name, base_len); - } - - if (!error) - error = git_config_delete_entry(data->config, entry->name); - - return error; -} - -int git_config_rename_section( - git_repository *repo, - const char *old_section_name, - const char *new_section_name) -{ - git_config *config; - git_buf pattern = GIT_BUF_INIT, replace = GIT_BUF_INIT; - int error = 0; - struct rename_data data; - - git_buf_text_puts_escape_regex(&pattern, old_section_name); - - if ((error = git_buf_puts(&pattern, "\\..+")) < 0) - goto cleanup; - - if ((error = git_repository_config__weakptr(&config, repo)) < 0) - goto cleanup; - - data.config = config; - data.name = &replace; - data.old_len = strlen(old_section_name) + 1; - - if ((error = git_buf_join(&replace, '.', new_section_name, "")) < 0) - goto cleanup; - - if (new_section_name != NULL && - (error = git_config_file_normalize_section( - replace.ptr, strchr(replace.ptr, '.'))) < 0) - { - giterr_set( - GITERR_CONFIG, "Invalid config section '%s'", new_section_name); - goto cleanup; - } - - error = git_config_foreach_match( - config, git_buf_cstr(&pattern), rename_config_entries_cb, &data); - -cleanup: - git_buf_free(&pattern); - git_buf_free(&replace); - - return error; -} - -int git_config_init_backend(git_config_backend *backend, unsigned int version) -{ - GIT_INIT_STRUCTURE_FROM_TEMPLATE( - backend, version, git_config_backend, GIT_CONFIG_BACKEND_INIT); - return 0; -} diff --git a/vendor/libgit2/src/config.h b/vendor/libgit2/src/config.h deleted file mode 100644 index 00c12b50d..000000000 --- a/vendor/libgit2/src/config.h +++ /dev/null @@ -1,107 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_config_h__ -#define INCLUDE_config_h__ - -#include "git2.h" -#include "git2/config.h" -#include "vector.h" -#include "repository.h" - -#define GIT_CONFIG_FILENAME_PROGRAMDATA "config" -#define GIT_CONFIG_FILENAME_SYSTEM "gitconfig" -#define GIT_CONFIG_FILENAME_GLOBAL ".gitconfig" -#define GIT_CONFIG_FILENAME_XDG "config" - -#define GIT_CONFIG_FILENAME_INREPO "config" -#define GIT_CONFIG_FILE_MODE 0666 - -struct git_config { - git_refcount rc; - git_vector files; -}; - -extern int git_config__global_location(git_buf *buf); - -extern int git_config_rename_section( - git_repository *repo, - const char *old_section_name, /* eg "branch.dummy" */ - const char *new_section_name); /* NULL to drop the old section */ - -/** - * Create a configuration file backend for ondisk files - * - * These are the normal `.gitconfig` files that Core Git - * processes. Note that you first have to add this file to a - * configuration object before you can query it for configuration - * variables. - * - * @param out the new backend - * @param path where the config file is located - */ -extern int git_config_file__ondisk(git_config_backend **out, const char *path); - -extern int git_config__normalize_name(const char *in, char **out); - -/* internal only: does not normalize key and sets out to NULL if not found */ -extern int git_config__lookup_entry( - git_config_entry **out, - const git_config *cfg, - const char *key, - bool no_errors); - -/* internal only: update and/or delete entry string with constraints */ -extern int git_config__update_entry( - git_config *cfg, - const char *key, - const char *value, - bool overwrite_existing, - bool only_if_existing); - -/* - * Lookup functions that cannot fail. These functions look up a config - * value and return a fallback value if the value is missing or if any - * failures occur while trying to access the value. - */ - -extern char *git_config__get_string_force( - const git_config *cfg, const char *key, const char *fallback_value); - -extern int git_config__get_bool_force( - const git_config *cfg, const char *key, int fallback_value); - -extern int git_config__get_int_force( - const git_config *cfg, const char *key, int fallback_value); - -/* API for repository cvar-style lookups from config - not cached, but - * uses cvar value maps and fallbacks - */ -extern int git_config__cvar( - int *out, git_config *config, git_cvar_cached cvar); - -/** - * The opposite of git_config_lookup_map_value, we take an enum value - * and map it to the string or bool value on the config. - */ -int git_config_lookup_map_enum(git_cvar_t *type_out, const char **str_out, - const git_cvar_map *maps, size_t map_n, int enum_val); - -/** - * Unlock the backend with the highest priority - * - * Unlocking will allow other writers to updat the configuration - * file. Optionally, any changes performed since the lock will be - * applied to the configuration. - * - * @param cfg the configuration - * @param commit boolean which indicates whether to commit any changes - * done since locking - * @return 0 or an error code - */ -GIT_EXTERN(int) git_config_unlock(git_config *cfg, int commit); - -#endif diff --git a/vendor/libgit2/src/config_cache.c b/vendor/libgit2/src/config_cache.c deleted file mode 100644 index dbea871b9..000000000 --- a/vendor/libgit2/src/config_cache.c +++ /dev/null @@ -1,129 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "common.h" -#include "fileops.h" -#include "repository.h" -#include "config.h" -#include "git2/config.h" -#include "vector.h" -#include "filter.h" - -struct map_data { - const char *cvar_name; - git_cvar_map *maps; - size_t map_count; - int default_value; -}; - -/* - * core.eol - * Sets the line ending type to use in the working directory for - * files that have the text property set. Alternatives are lf, crlf - * and native, which uses the platform's native line ending. The default - * value is native. See gitattributes(5) for more information on - * end-of-line conversion. - */ -static git_cvar_map _cvar_map_eol[] = { - {GIT_CVAR_FALSE, NULL, GIT_EOL_UNSET}, - {GIT_CVAR_STRING, "lf", GIT_EOL_LF}, - {GIT_CVAR_STRING, "crlf", GIT_EOL_CRLF}, - {GIT_CVAR_STRING, "native", GIT_EOL_NATIVE} -}; - -/* - * core.autocrlf - * Setting this variable to "true" is almost the same as setting - * the text attribute to "auto" on all files except that text files are - * not guaranteed to be normalized: files that contain CRLF in the - * repository will not be touched. Use this setting if you want to have - * CRLF line endings in your working directory even though the repository - * does not have normalized line endings. This variable can be set to input, - * in which case no output conversion is performed. - */ -static git_cvar_map _cvar_map_autocrlf[] = { - {GIT_CVAR_FALSE, NULL, GIT_AUTO_CRLF_FALSE}, - {GIT_CVAR_TRUE, NULL, GIT_AUTO_CRLF_TRUE}, - {GIT_CVAR_STRING, "input", GIT_AUTO_CRLF_INPUT} -}; - -static git_cvar_map _cvar_map_safecrlf[] = { - {GIT_CVAR_FALSE, NULL, GIT_SAFE_CRLF_FALSE}, - {GIT_CVAR_TRUE, NULL, GIT_SAFE_CRLF_FAIL}, - {GIT_CVAR_STRING, "warn", GIT_SAFE_CRLF_WARN} -}; - -/* - * Generic map for integer values - */ -static git_cvar_map _cvar_map_int[] = { - {GIT_CVAR_INT32, NULL, 0}, -}; - -static struct map_data _cvar_maps[] = { - {"core.autocrlf", _cvar_map_autocrlf, ARRAY_SIZE(_cvar_map_autocrlf), GIT_AUTO_CRLF_DEFAULT}, - {"core.eol", _cvar_map_eol, ARRAY_SIZE(_cvar_map_eol), GIT_EOL_DEFAULT}, - {"core.symlinks", NULL, 0, GIT_SYMLINKS_DEFAULT }, - {"core.ignorecase", NULL, 0, GIT_IGNORECASE_DEFAULT }, - {"core.filemode", NULL, 0, GIT_FILEMODE_DEFAULT }, - {"core.ignorestat", NULL, 0, GIT_IGNORESTAT_DEFAULT }, - {"core.trustctime", NULL, 0, GIT_TRUSTCTIME_DEFAULT }, - {"core.abbrev", _cvar_map_int, 1, GIT_ABBREV_DEFAULT }, - {"core.precomposeunicode", NULL, 0, GIT_PRECOMPOSE_DEFAULT }, - {"core.safecrlf", _cvar_map_safecrlf, ARRAY_SIZE(_cvar_map_safecrlf), GIT_SAFE_CRLF_DEFAULT}, - {"core.logallrefupdates", NULL, 0, GIT_LOGALLREFUPDATES_DEFAULT }, - {"core.protecthfs", NULL, 0, GIT_PROTECTHFS_DEFAULT }, - {"core.protectntfs", NULL, 0, GIT_PROTECTNTFS_DEFAULT }, -}; - -int git_config__cvar(int *out, git_config *config, git_cvar_cached cvar) -{ - int error = 0; - struct map_data *data = &_cvar_maps[(int)cvar]; - git_config_entry *entry; - - if ((error = git_config__lookup_entry(&entry, config, data->cvar_name, false)) < 0) - return error; - - if (!entry) - *out = data->default_value; - else if (data->maps) - error = git_config_lookup_map_value( - out, data->maps, data->map_count, entry->value); - else - error = git_config_parse_bool(out, entry->value); - - git_config_entry_free(entry); - return error; -} - -int git_repository__cvar(int *out, git_repository *repo, git_cvar_cached cvar) -{ - *out = repo->cvar_cache[(int)cvar]; - - if (*out == GIT_CVAR_NOT_CACHED) { - int error; - git_config *config; - - if ((error = git_repository_config__weakptr(&config, repo)) < 0 || - (error = git_config__cvar(out, config, cvar)) < 0) - return error; - - repo->cvar_cache[(int)cvar] = *out; - } - - return 0; -} - -void git_repository__cvar_cache_clear(git_repository *repo) -{ - int i; - - for (i = 0; i < GIT_CVAR_CACHE_MAX; ++i) - repo->cvar_cache[i] = GIT_CVAR_NOT_CACHED; -} - diff --git a/vendor/libgit2/src/config_file.c b/vendor/libgit2/src/config_file.c deleted file mode 100644 index ca4345cc7..000000000 --- a/vendor/libgit2/src/config_file.c +++ /dev/null @@ -1,1949 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "common.h" -#include "config.h" -#include "filebuf.h" -#include "sysdir.h" -#include "buffer.h" -#include "buf_text.h" -#include "git2/config.h" -#include "git2/sys/config.h" -#include "git2/types.h" -#include "strmap.h" -#include "array.h" - -#include -#include -#include - -GIT__USE_STRMAP - -typedef struct cvar_t { - struct cvar_t *next; - git_config_entry *entry; - bool included; /* whether this is part of [include] */ -} cvar_t; - -typedef struct git_config_file_iter { - git_config_iterator parent; - git_strmap_iter iter; - cvar_t* next_var; -} git_config_file_iter; - -/* Max depth for [include] directives */ -#define MAX_INCLUDE_DEPTH 10 - -#define CVAR_LIST_HEAD(list) ((list)->head) - -#define CVAR_LIST_TAIL(list) ((list)->tail) - -#define CVAR_LIST_NEXT(var) ((var)->next) - -#define CVAR_LIST_EMPTY(list) ((list)->head == NULL) - -#define CVAR_LIST_APPEND(list, var) do {\ - if (CVAR_LIST_EMPTY(list)) {\ - CVAR_LIST_HEAD(list) = CVAR_LIST_TAIL(list) = var;\ - } else {\ - CVAR_LIST_NEXT(CVAR_LIST_TAIL(list)) = var;\ - CVAR_LIST_TAIL(list) = var;\ - }\ -} while(0) - -#define CVAR_LIST_REMOVE_HEAD(list) do {\ - CVAR_LIST_HEAD(list) = CVAR_LIST_NEXT(CVAR_LIST_HEAD(list));\ -} while(0) - -#define CVAR_LIST_REMOVE_AFTER(var) do {\ - CVAR_LIST_NEXT(var) = CVAR_LIST_NEXT(CVAR_LIST_NEXT(var));\ -} while(0) - -#define CVAR_LIST_FOREACH(list, iter)\ - for ((iter) = CVAR_LIST_HEAD(list);\ - (iter) != NULL;\ - (iter) = CVAR_LIST_NEXT(iter)) - -/* - * Inspired by the FreeBSD functions - */ -#define CVAR_LIST_FOREACH_SAFE(start, iter, tmp)\ - for ((iter) = CVAR_LIST_HEAD(vars);\ - (iter) && (((tmp) = CVAR_LIST_NEXT(iter) || 1));\ - (iter) = (tmp)) - -struct reader { - git_oid checksum; - char *file_path; - git_buf buffer; - char *read_ptr; - int line_number; - int eof; -}; - -typedef struct { - git_atomic refcount; - git_strmap *values; -} refcounted_strmap; - -typedef struct { - git_config_backend parent; - /* mutex to coordinate accessing the values */ - git_mutex values_mutex; - refcounted_strmap *values; -} diskfile_header; - -typedef struct { - diskfile_header header; - - git_config_level_t level; - - git_array_t(struct reader) readers; - - bool locked; - git_filebuf locked_buf; - git_buf locked_content; - - char *file_path; -} diskfile_backend; - -typedef struct { - diskfile_header header; - - diskfile_backend *snapshot_from; -} diskfile_readonly_backend; - -static int config_read(git_strmap *values, diskfile_backend *cfg_file, struct reader *reader, git_config_level_t level, int depth); -static int config_write(diskfile_backend *cfg, const char *key, const regex_t *preg, const char *value); -static char *escape_value(const char *ptr); - -int git_config_file__snapshot(git_config_backend **out, diskfile_backend *in); -static int config_snapshot(git_config_backend **out, git_config_backend *in); - -static void set_parse_error(struct reader *reader, int col, const char *error_str) -{ - giterr_set(GITERR_CONFIG, "Failed to parse config file: %s (in %s:%d, column %d)", - error_str, reader->file_path, reader->line_number, col); -} - -static int config_error_readonly(void) -{ - giterr_set(GITERR_CONFIG, "this backend is read-only"); - return -1; -} - -static void cvar_free(cvar_t *var) -{ - if (var == NULL) - return; - - git__free((char*)var->entry->name); - git__free((char *)var->entry->value); - git__free(var->entry); - git__free(var); -} - -int git_config_file_normalize_section(char *start, char *end) -{ - char *scan; - - if (start == end) - return GIT_EINVALIDSPEC; - - /* Validate and downcase range */ - for (scan = start; *scan; ++scan) { - if (end && scan >= end) - break; - if (isalnum(*scan)) - *scan = (char)git__tolower(*scan); - else if (*scan != '-' || scan == start) - return GIT_EINVALIDSPEC; - } - - if (scan == start) - return GIT_EINVALIDSPEC; - - return 0; -} - -/* Add or append the new config option */ -static int append_entry(git_strmap *values, cvar_t *var) -{ - git_strmap_iter pos; - cvar_t *existing; - int error = 0; - - pos = git_strmap_lookup_index(values, var->entry->name); - if (!git_strmap_valid_index(values, pos)) { - git_strmap_insert(values, var->entry->name, var, error); - } else { - existing = git_strmap_value_at(values, pos); - while (existing->next != NULL) { - existing = existing->next; - } - existing->next = var; - } - - if (error > 0) - error = 0; - - return error; -} - -static void free_vars(git_strmap *values) -{ - cvar_t *var = NULL; - - if (values == NULL) - return; - - git_strmap_foreach_value(values, var, - while (var != NULL) { - cvar_t *next = CVAR_LIST_NEXT(var); - cvar_free(var); - var = next; - }); - - git_strmap_free(values); -} - -static void refcounted_strmap_free(refcounted_strmap *map) -{ - if (!map) - return; - - if (git_atomic_dec(&map->refcount) != 0) - return; - - free_vars(map->values); - git__free(map); -} - -/** - * Take the current values map from the backend and increase its - * refcount. This is its own function to make sure we use the mutex to - * avoid the map pointer from changing under us. - */ -static refcounted_strmap *refcounted_strmap_take(diskfile_header *h) -{ - refcounted_strmap *map; - - git_mutex_lock(&h->values_mutex); - - map = h->values; - git_atomic_inc(&map->refcount); - - git_mutex_unlock(&h->values_mutex); - - return map; -} - -static int refcounted_strmap_alloc(refcounted_strmap **out) -{ - refcounted_strmap *map; - int error; - - map = git__calloc(1, sizeof(refcounted_strmap)); - GITERR_CHECK_ALLOC(map); - - git_atomic_set(&map->refcount, 1); - - if ((error = git_strmap_alloc(&map->values)) < 0) - git__free(map); - else - *out = map; - - return error; -} - -static int config_open(git_config_backend *cfg, git_config_level_t level) -{ - int res; - struct reader *reader; - diskfile_backend *b = (diskfile_backend *)cfg; - - b->level = level; - - if ((res = refcounted_strmap_alloc(&b->header.values)) < 0) - return res; - - git_array_init(b->readers); - reader = git_array_alloc(b->readers); - if (!reader) { - refcounted_strmap_free(b->header.values); - return -1; - } - memset(reader, 0, sizeof(struct reader)); - - reader->file_path = git__strdup(b->file_path); - GITERR_CHECK_ALLOC(reader->file_path); - - git_buf_init(&reader->buffer, 0); - res = git_futils_readbuffer_updated( - &reader->buffer, b->file_path, &reader->checksum, NULL); - - /* It's fine if the file doesn't exist */ - if (res == GIT_ENOTFOUND) - return 0; - - if (res < 0 || (res = config_read(b->header.values->values, b, reader, level, 0)) < 0) { - refcounted_strmap_free(b->header.values); - b->header.values = NULL; - } - - reader = git_array_get(b->readers, 0); - git_buf_free(&reader->buffer); - - return res; -} - -/* The meat of the refresh, as we want to use it in different places */ -static int config__refresh(git_config_backend *cfg) -{ - refcounted_strmap *values = NULL, *tmp; - diskfile_backend *b = (diskfile_backend *)cfg; - struct reader *reader = NULL; - int error = 0; - - if ((error = refcounted_strmap_alloc(&values)) < 0) - goto out; - - reader = git_array_get(b->readers, git_array_size(b->readers) - 1); - GITERR_CHECK_ALLOC(reader); - - if ((error = config_read(values->values, b, reader, b->level, 0)) < 0) - goto out; - - git_mutex_lock(&b->header.values_mutex); - - tmp = b->header.values; - b->header.values = values; - values = tmp; - - git_mutex_unlock(&b->header.values_mutex); - -out: - refcounted_strmap_free(values); - if (reader) - git_buf_free(&reader->buffer); - return error; -} - -static int config_refresh(git_config_backend *cfg) -{ - int error = 0, updated = 0, any_updated = 0; - diskfile_backend *b = (diskfile_backend *)cfg; - struct reader *reader = NULL; - uint32_t i; - - for (i = 0; i < git_array_size(b->readers); i++) { - reader = git_array_get(b->readers, i); - error = git_futils_readbuffer_updated( - &reader->buffer, reader->file_path, - &reader->checksum, &updated); - - if (error < 0 && error != GIT_ENOTFOUND) - return error; - - if (updated) - any_updated = 1; - } - - if (!any_updated) - return (error == GIT_ENOTFOUND) ? 0 : error; - - return config__refresh(cfg); -} - -static void backend_free(git_config_backend *_backend) -{ - diskfile_backend *backend = (diskfile_backend *)_backend; - uint32_t i; - - if (backend == NULL) - return; - - for (i = 0; i < git_array_size(backend->readers); i++) { - struct reader *r = git_array_get(backend->readers, i); - git__free(r->file_path); - } - git_array_clear(backend->readers); - - git__free(backend->file_path); - refcounted_strmap_free(backend->header.values); - git_mutex_free(&backend->header.values_mutex); - git__free(backend); -} - -static void config_iterator_free( - git_config_iterator* iter) -{ - iter->backend->free(iter->backend); - git__free(iter); -} - -static int config_iterator_next( - git_config_entry **entry, - git_config_iterator *iter) -{ - git_config_file_iter *it = (git_config_file_iter *) iter; - diskfile_header *h = (diskfile_header *) it->parent.backend; - git_strmap *values = h->values->values; - int err = 0; - cvar_t * var; - - if (it->next_var == NULL) { - err = git_strmap_next((void**) &var, &(it->iter), values); - } else { - var = it->next_var; - } - - if (err < 0) { - it->next_var = NULL; - return err; - } - - *entry = var->entry; - it->next_var = CVAR_LIST_NEXT(var); - - return 0; -} - -static int config_iterator_new( - git_config_iterator **iter, - struct git_config_backend* backend) -{ - diskfile_header *h; - git_config_file_iter *it; - git_config_backend *snapshot; - diskfile_backend *b = (diskfile_backend *) backend; - int error; - - if ((error = config_snapshot(&snapshot, backend)) < 0) - return error; - - if ((error = snapshot->open(snapshot, b->level)) < 0) - return error; - - it = git__calloc(1, sizeof(git_config_file_iter)); - GITERR_CHECK_ALLOC(it); - - h = (diskfile_header *)snapshot; - - /* strmap_begin() is currently a macro returning 0 */ - GIT_UNUSED(h); - - it->parent.backend = snapshot; - it->iter = git_strmap_begin(h->values); - it->next_var = NULL; - - it->parent.next = config_iterator_next; - it->parent.free = config_iterator_free; - *iter = (git_config_iterator *) it; - - return 0; -} - -static int config_set(git_config_backend *cfg, const char *name, const char *value) -{ - diskfile_backend *b = (diskfile_backend *)cfg; - refcounted_strmap *map; - git_strmap *values; - char *key, *esc_value = NULL; - khiter_t pos; - int rval, ret; - - if ((rval = git_config__normalize_name(name, &key)) < 0) - return rval; - - map = refcounted_strmap_take(&b->header); - values = map->values; - - /* - * Try to find it in the existing values and update it if it - * only has one value. - */ - pos = git_strmap_lookup_index(values, key); - if (git_strmap_valid_index(values, pos)) { - cvar_t *existing = git_strmap_value_at(values, pos); - - if (existing->next != NULL) { - giterr_set(GITERR_CONFIG, "Multivar incompatible with simple set"); - ret = -1; - goto out; - } - - /* don't update if old and new values already match */ - if ((!existing->entry->value && !value) || - (existing->entry->value && value && - !strcmp(existing->entry->value, value))) { - ret = 0; - goto out; - } - } - - /* No early returns due to sanity checks, let's write it out and refresh */ - - if (value) { - esc_value = escape_value(value); - GITERR_CHECK_ALLOC(esc_value); - } - - if ((ret = config_write(b, key, NULL, esc_value)) < 0) - goto out; - - ret = config_refresh(cfg); - -out: - refcounted_strmap_free(map); - git__free(esc_value); - git__free(key); - return ret; -} - -/* release the map containing the entry as an equivalent to freeing it */ -static void release_map(git_config_entry *entry) -{ - refcounted_strmap *map = (refcounted_strmap *) entry->payload; - refcounted_strmap_free(map); -} - -/* - * Internal function that actually gets the value in string form - */ -static int config_get(git_config_backend *cfg, const char *key, git_config_entry **out) -{ - diskfile_header *h = (diskfile_header *)cfg; - refcounted_strmap *map; - git_strmap *values; - khiter_t pos; - cvar_t *var; - int error = 0; - - if (!h->parent.readonly && ((error = config_refresh(cfg)) < 0)) - return error; - - map = refcounted_strmap_take(h); - values = map->values; - - pos = git_strmap_lookup_index(values, key); - - /* no error message; the config system will write one */ - if (!git_strmap_valid_index(values, pos)) { - refcounted_strmap_free(map); - return GIT_ENOTFOUND; - } - - var = git_strmap_value_at(values, pos); - while (var->next) - var = var->next; - - *out = var->entry; - (*out)->free = release_map; - (*out)->payload = map; - - return error; -} - -static int config_set_multivar( - git_config_backend *cfg, const char *name, const char *regexp, const char *value) -{ - diskfile_backend *b = (diskfile_backend *)cfg; - char *key; - regex_t preg; - int result; - - assert(regexp); - - if ((result = git_config__normalize_name(name, &key)) < 0) - return result; - - result = regcomp(&preg, regexp, REG_EXTENDED); - if (result != 0) { - giterr_set_regex(&preg, result); - result = -1; - goto out; - } - - /* If we do have it, set call config_write() and reload */ - if ((result = config_write(b, key, &preg, value)) < 0) - goto out; - - result = config_refresh(cfg); - -out: - git__free(key); - regfree(&preg); - - return result; -} - -static int config_delete(git_config_backend *cfg, const char *name) -{ - cvar_t *var; - diskfile_backend *b = (diskfile_backend *)cfg; - refcounted_strmap *map; git_strmap *values; - char *key; - int result; - khiter_t pos; - - if ((result = git_config__normalize_name(name, &key)) < 0) - return result; - - map = refcounted_strmap_take(&b->header); - values = b->header.values->values; - - pos = git_strmap_lookup_index(values, key); - git__free(key); - - if (!git_strmap_valid_index(values, pos)) { - refcounted_strmap_free(map); - giterr_set(GITERR_CONFIG, "Could not find key '%s' to delete", name); - return GIT_ENOTFOUND; - } - - var = git_strmap_value_at(values, pos); - refcounted_strmap_free(map); - - if (var->next != NULL) { - giterr_set(GITERR_CONFIG, "Cannot delete multivar with a single delete"); - return -1; - } - - if ((result = config_write(b, var->entry->name, NULL, NULL)) < 0) - return result; - - return config_refresh(cfg); -} - -static int config_delete_multivar(git_config_backend *cfg, const char *name, const char *regexp) -{ - diskfile_backend *b = (diskfile_backend *)cfg; - refcounted_strmap *map; - git_strmap *values; - char *key; - regex_t preg; - int result; - khiter_t pos; - - if ((result = git_config__normalize_name(name, &key)) < 0) - return result; - - map = refcounted_strmap_take(&b->header); - values = b->header.values->values; - - pos = git_strmap_lookup_index(values, key); - - if (!git_strmap_valid_index(values, pos)) { - refcounted_strmap_free(map); - git__free(key); - giterr_set(GITERR_CONFIG, "Could not find key '%s' to delete", name); - return GIT_ENOTFOUND; - } - - refcounted_strmap_free(map); - - result = regcomp(&preg, regexp, REG_EXTENDED); - if (result != 0) { - giterr_set_regex(&preg, result); - result = -1; - goto out; - } - - if ((result = config_write(b, key, &preg, NULL)) < 0) - goto out; - - result = config_refresh(cfg); - -out: - git__free(key); - regfree(&preg); - return result; -} - -static int config_snapshot(git_config_backend **out, git_config_backend *in) -{ - diskfile_backend *b = (diskfile_backend *) in; - - return git_config_file__snapshot(out, b); -} - -static int config_lock(git_config_backend *_cfg) -{ - diskfile_backend *cfg = (diskfile_backend *) _cfg; - int error; - - if ((error = git_filebuf_open(&cfg->locked_buf, cfg->file_path, 0, GIT_CONFIG_FILE_MODE)) < 0) - return error; - - error = git_futils_readbuffer(&cfg->locked_content, cfg->file_path); - if (error < 0 && error != GIT_ENOTFOUND) { - git_filebuf_cleanup(&cfg->locked_buf); - return error; - } - - cfg->locked = true; - return 0; - -} - -static int config_unlock(git_config_backend *_cfg, int success) -{ - diskfile_backend *cfg = (diskfile_backend *) _cfg; - int error = 0; - - if (success) { - git_filebuf_write(&cfg->locked_buf, cfg->locked_content.ptr, cfg->locked_content.size); - error = git_filebuf_commit(&cfg->locked_buf); - } - - git_filebuf_cleanup(&cfg->locked_buf); - git_buf_free(&cfg->locked_content); - cfg->locked = false; - - return error; -} - -int git_config_file__ondisk(git_config_backend **out, const char *path) -{ - diskfile_backend *backend; - - backend = git__calloc(1, sizeof(diskfile_backend)); - GITERR_CHECK_ALLOC(backend); - - backend->header.parent.version = GIT_CONFIG_BACKEND_VERSION; - git_mutex_init(&backend->header.values_mutex); - - backend->file_path = git__strdup(path); - GITERR_CHECK_ALLOC(backend->file_path); - - backend->header.parent.open = config_open; - backend->header.parent.get = config_get; - backend->header.parent.set = config_set; - backend->header.parent.set_multivar = config_set_multivar; - backend->header.parent.del = config_delete; - backend->header.parent.del_multivar = config_delete_multivar; - backend->header.parent.iterator = config_iterator_new; - backend->header.parent.snapshot = config_snapshot; - backend->header.parent.lock = config_lock; - backend->header.parent.unlock = config_unlock; - backend->header.parent.free = backend_free; - - *out = (git_config_backend *)backend; - - return 0; -} - -static int config_set_readonly(git_config_backend *cfg, const char *name, const char *value) -{ - GIT_UNUSED(cfg); - GIT_UNUSED(name); - GIT_UNUSED(value); - - return config_error_readonly(); -} - -static int config_set_multivar_readonly( - git_config_backend *cfg, const char *name, const char *regexp, const char *value) -{ - GIT_UNUSED(cfg); - GIT_UNUSED(name); - GIT_UNUSED(regexp); - GIT_UNUSED(value); - - return config_error_readonly(); -} - -static int config_delete_multivar_readonly(git_config_backend *cfg, const char *name, const char *regexp) -{ - GIT_UNUSED(cfg); - GIT_UNUSED(name); - GIT_UNUSED(regexp); - - return config_error_readonly(); -} - -static int config_delete_readonly(git_config_backend *cfg, const char *name) -{ - GIT_UNUSED(cfg); - GIT_UNUSED(name); - - return config_error_readonly(); -} - -static int config_lock_readonly(git_config_backend *_cfg) -{ - GIT_UNUSED(_cfg); - - return config_error_readonly(); -} - -static int config_unlock_readonly(git_config_backend *_cfg, int success) -{ - GIT_UNUSED(_cfg); - GIT_UNUSED(success); - - return config_error_readonly(); -} - -static void backend_readonly_free(git_config_backend *_backend) -{ - diskfile_backend *backend = (diskfile_backend *)_backend; - - if (backend == NULL) - return; - - refcounted_strmap_free(backend->header.values); - git_mutex_free(&backend->header.values_mutex); - git__free(backend); -} - -static int config_readonly_open(git_config_backend *cfg, git_config_level_t level) -{ - diskfile_readonly_backend *b = (diskfile_readonly_backend *) cfg; - diskfile_backend *src = b->snapshot_from; - diskfile_header *src_header = &src->header; - refcounted_strmap *src_map; - int error; - - if (!src_header->parent.readonly && (error = config_refresh(&src_header->parent)) < 0) - return error; - - /* We're just copying data, don't care about the level */ - GIT_UNUSED(level); - - src_map = refcounted_strmap_take(src_header); - b->header.values = src_map; - - return 0; -} - -int git_config_file__snapshot(git_config_backend **out, diskfile_backend *in) -{ - diskfile_readonly_backend *backend; - - backend = git__calloc(1, sizeof(diskfile_readonly_backend)); - GITERR_CHECK_ALLOC(backend); - - backend->header.parent.version = GIT_CONFIG_BACKEND_VERSION; - git_mutex_init(&backend->header.values_mutex); - - backend->snapshot_from = in; - - backend->header.parent.readonly = 1; - backend->header.parent.version = GIT_CONFIG_BACKEND_VERSION; - backend->header.parent.open = config_readonly_open; - backend->header.parent.get = config_get; - backend->header.parent.set = config_set_readonly; - backend->header.parent.set_multivar = config_set_multivar_readonly; - backend->header.parent.del = config_delete_readonly; - backend->header.parent.del_multivar = config_delete_multivar_readonly; - backend->header.parent.iterator = config_iterator_new; - backend->header.parent.lock = config_lock_readonly; - backend->header.parent.unlock = config_unlock_readonly; - backend->header.parent.free = backend_readonly_free; - - *out = (git_config_backend *)backend; - - return 0; -} - -static int reader_getchar_raw(struct reader *reader) -{ - int c; - - c = *reader->read_ptr++; - - /* - Win 32 line breaks: if we find a \r\n sequence, - return only the \n as a newline - */ - if (c == '\r' && *reader->read_ptr == '\n') { - reader->read_ptr++; - c = '\n'; - } - - if (c == '\n') - reader->line_number++; - - if (c == 0) { - reader->eof = 1; - c = '\0'; - } - - return c; -} - -#define SKIP_WHITESPACE (1 << 1) -#define SKIP_COMMENTS (1 << 2) - -static int reader_getchar(struct reader *reader, int flags) -{ - const int skip_whitespace = (flags & SKIP_WHITESPACE); - const int skip_comments = (flags & SKIP_COMMENTS); - int c; - - assert(reader->read_ptr); - - do { - c = reader_getchar_raw(reader); - } while (c != '\n' && c != '\0' && skip_whitespace && git__isspace(c)); - - if (skip_comments && (c == '#' || c == ';')) { - do { - c = reader_getchar_raw(reader); - } while (c != '\n' && c != '\0'); - } - - return c; -} - -/* - * Read the next char, but don't move the reading pointer. - */ -static int reader_peek(struct reader *reader, int flags) -{ - void *old_read_ptr; - int old_lineno, old_eof; - int ret; - - assert(reader->read_ptr); - - old_read_ptr = reader->read_ptr; - old_lineno = reader->line_number; - old_eof = reader->eof; - - ret = reader_getchar(reader, flags); - - reader->read_ptr = old_read_ptr; - reader->line_number = old_lineno; - reader->eof = old_eof; - - return ret; -} - -/* - * Read and consume a line, returning it in newly-allocated memory. - */ -static char *reader_readline(struct reader *reader, bool skip_whitespace) -{ - char *line = NULL; - char *line_src, *line_end; - size_t line_len, alloc_len; - - line_src = reader->read_ptr; - - if (skip_whitespace) { - /* Skip empty empty lines */ - while (git__isspace(*line_src)) - ++line_src; - } - - line_end = strchr(line_src, '\n'); - - /* no newline at EOF */ - if (line_end == NULL) - line_end = strchr(line_src, 0); - - line_len = line_end - line_src; - - if (GIT_ADD_SIZET_OVERFLOW(&alloc_len, line_len, 1) || - (line = git__malloc(alloc_len)) == NULL) { - return NULL; - } - - memcpy(line, line_src, line_len); - - do line[line_len] = '\0'; - while (line_len-- > 0 && git__isspace(line[line_len])); - - if (*line_end == '\n') - line_end++; - - if (*line_end == '\0') - reader->eof = 1; - - reader->line_number++; - reader->read_ptr = line_end; - - return line; -} - -/* - * Consume a line, without storing it anywhere - */ -static void reader_consume_line(struct reader *reader) -{ - char *line_start, *line_end; - - line_start = reader->read_ptr; - line_end = strchr(line_start, '\n'); - /* No newline at EOF */ - if(line_end == NULL){ - line_end = strchr(line_start, '\0'); - } - - if (*line_end == '\n') - line_end++; - - if (*line_end == '\0') - reader->eof = 1; - - reader->line_number++; - reader->read_ptr = line_end; -} - -GIT_INLINE(int) config_keychar(int c) -{ - return isalnum(c) || c == '-'; -} - -static int parse_section_header_ext(struct reader *reader, const char *line, const char *base_name, char **section_name) -{ - int c, rpos; - char *first_quote, *last_quote; - git_buf buf = GIT_BUF_INIT; - size_t quoted_len, alloc_len, base_name_len = strlen(base_name); - - /* - * base_name is what came before the space. We should be at the - * first quotation mark, except for now, line isn't being kept in - * sync so we only really use it to calculate the length. - */ - - first_quote = strchr(line, '"'); - if (first_quote == NULL) { - set_parse_error(reader, 0, "Missing quotation marks in section header"); - return -1; - } - - last_quote = strrchr(line, '"'); - quoted_len = last_quote - first_quote; - - if (quoted_len == 0) { - set_parse_error(reader, 0, "Missing closing quotation mark in section header"); - return -1; - } - - GITERR_CHECK_ALLOC_ADD(&alloc_len, base_name_len, quoted_len); - GITERR_CHECK_ALLOC_ADD(&alloc_len, alloc_len, 2); - - git_buf_grow(&buf, alloc_len); - git_buf_printf(&buf, "%s.", base_name); - - rpos = 0; - - line = first_quote; - c = line[++rpos]; - - /* - * At the end of each iteration, whatever is stored in c will be - * added to the string. In case of error, jump to out - */ - do { - - switch (c) { - case 0: - set_parse_error(reader, 0, "Unexpected end-of-line in section header"); - git_buf_free(&buf); - return -1; - - case '"': - goto end_parse; - - case '\\': - c = line[++rpos]; - - if (c == 0) { - set_parse_error(reader, rpos, "Unexpected end-of-line in section header"); - git_buf_free(&buf); - return -1; - } - - default: - break; - } - - git_buf_putc(&buf, (char)c); - c = line[++rpos]; - } while (line + rpos < last_quote); - -end_parse: - if (line[rpos] != '"' || line[rpos + 1] != ']') { - set_parse_error(reader, rpos, "Unexpected text after closing quotes"); - git_buf_free(&buf); - return -1; - } - - *section_name = git_buf_detach(&buf); - return 0; -} - -static int parse_section_header(struct reader *reader, char **section_out) -{ - char *name, *name_end; - int name_length, c, pos; - int result; - char *line; - size_t line_len; - - line = reader_readline(reader, true); - if (line == NULL) - return -1; - - /* find the end of the variable's name */ - name_end = strrchr(line, ']'); - if (name_end == NULL) { - git__free(line); - set_parse_error(reader, 0, "Missing ']' in section header"); - return -1; - } - - GITERR_CHECK_ALLOC_ADD(&line_len, (size_t)(name_end - line), 1); - name = git__malloc(line_len); - GITERR_CHECK_ALLOC(name); - - name_length = 0; - pos = 0; - - /* Make sure we were given a section header */ - c = line[pos++]; - assert(c == '['); - - c = line[pos++]; - - do { - if (git__isspace(c)){ - name[name_length] = '\0'; - result = parse_section_header_ext(reader, line, name, section_out); - git__free(line); - git__free(name); - return result; - } - - if (!config_keychar(c) && c != '.') { - set_parse_error(reader, pos, "Unexpected character in header"); - goto fail_parse; - } - - name[name_length++] = (char)git__tolower(c); - - } while ((c = line[pos++]) != ']'); - - if (line[pos - 1] != ']') { - set_parse_error(reader, pos, "Unexpected end of file"); - goto fail_parse; - } - - git__free(line); - - name[name_length] = 0; - *section_out = name; - - return 0; - -fail_parse: - git__free(line); - git__free(name); - return -1; -} - -static int skip_bom(struct reader *reader) -{ - git_bom_t bom; - int bom_offset = git_buf_text_detect_bom(&bom, - &reader->buffer, reader->read_ptr - reader->buffer.ptr); - - if (bom == GIT_BOM_UTF8) - reader->read_ptr += bom_offset; - - /* TODO: reference implementation is pretty stupid with BoM */ - - return 0; -} - -/* - (* basic types *) - digit = "0".."9" - integer = digit { digit } - alphabet = "a".."z" + "A" .. "Z" - - section_char = alphabet | "." | "-" - extension_char = (* any character except newline *) - any_char = (* any character *) - variable_char = "alphabet" | "-" - - - (* actual grammar *) - config = { section } - - section = header { definition } - - header = "[" section [subsection | subsection_ext] "]" - - subsection = "." section - subsection_ext = "\"" extension "\"" - - section = section_char { section_char } - extension = extension_char { extension_char } - - definition = variable_name ["=" variable_value] "\n" - - variable_name = variable_char { variable_char } - variable_value = string | boolean | integer - - string = quoted_string | plain_string - quoted_string = "\"" plain_string "\"" - plain_string = { any_char } - - boolean = boolean_true | boolean_false - boolean_true = "yes" | "1" | "true" | "on" - boolean_false = "no" | "0" | "false" | "off" -*/ - -static int strip_comments(char *line, int in_quotes) -{ - int quote_count = in_quotes, backslash_count = 0; - char *ptr; - - for (ptr = line; *ptr; ++ptr) { - if (ptr[0] == '"' && ptr > line && ptr[-1] != '\\') - quote_count++; - - if ((ptr[0] == ';' || ptr[0] == '#') && - (quote_count % 2) == 0 && - (backslash_count % 2) == 0) { - ptr[0] = '\0'; - break; - } - - if (ptr[0] == '\\') - backslash_count++; - else - backslash_count = 0; - } - - /* skip any space at the end */ - while (ptr > line && git__isspace(ptr[-1])) { - ptr--; - } - ptr[0] = '\0'; - - return quote_count; -} - -static int included_path(git_buf *out, const char *dir, const char *path) -{ - /* From the user's home */ - if (path[0] == '~' && path[1] == '/') - return git_sysdir_find_global_file(out, &path[1]); - - return git_path_join_unrooted(out, path, dir, NULL); -} - -static const char *escapes = "ntb\"\\"; -static const char *escaped = "\n\t\b\"\\"; - -/* Escape the values to write them to the file */ -static char *escape_value(const char *ptr) -{ - git_buf buf = GIT_BUF_INIT; - size_t len; - const char *esc; - - assert(ptr); - - len = strlen(ptr); - if (!len) - return git__calloc(1, sizeof(char)); - - git_buf_grow(&buf, len); - - while (*ptr != '\0') { - if ((esc = strchr(escaped, *ptr)) != NULL) { - git_buf_putc(&buf, '\\'); - git_buf_putc(&buf, escapes[esc - escaped]); - } else { - git_buf_putc(&buf, *ptr); - } - ptr++; - } - - if (git_buf_oom(&buf)) { - git_buf_free(&buf); - return NULL; - } - - return git_buf_detach(&buf); -} - -/* '\"' -> '"' etc */ -static int unescape_line( - char **out, bool *is_multi, const char *ptr, int quote_count) -{ - char *str, *fixed, *esc; - size_t ptr_len = strlen(ptr), alloc_len; - - *is_multi = false; - - if (GIT_ADD_SIZET_OVERFLOW(&alloc_len, ptr_len, 1) || - (str = git__malloc(alloc_len)) == NULL) { - return -1; - } - - fixed = str; - - while (*ptr != '\0') { - if (*ptr == '"') { - quote_count++; - } else if (*ptr != '\\') { - *fixed++ = *ptr; - } else { - /* backslash, check the next char */ - ptr++; - /* if we're at the end, it's a multiline, so keep the backslash */ - if (*ptr == '\0') { - *is_multi = true; - goto done; - } - if ((esc = strchr(escapes, *ptr)) != NULL) { - *fixed++ = escaped[esc - escapes]; - } else { - git__free(str); - giterr_set(GITERR_CONFIG, "Invalid escape at %s", ptr); - return -1; - } - } - ptr++; - } - -done: - *fixed = '\0'; - *out = str; - - return 0; -} - -static int parse_multiline_variable(struct reader *reader, git_buf *value, int in_quotes) -{ - char *line = NULL, *proc_line = NULL; - int quote_count; - bool multiline; - - /* Check that the next line exists */ - line = reader_readline(reader, false); - if (line == NULL) - return -1; - - /* We've reached the end of the file, there is no continuation. - * (this is not an error). - */ - if (line[0] == '\0') { - git__free(line); - return 0; - } - - quote_count = strip_comments(line, !!in_quotes); - - /* If it was just a comment, pretend it didn't exist */ - if (line[0] == '\0') { - git__free(line); - return parse_multiline_variable(reader, value, quote_count); - /* TODO: unbounded recursion. This **could** be exploitable */ - } - - if (unescape_line(&proc_line, &multiline, line, in_quotes) < 0) { - git__free(line); - return -1; - } - /* add this line to the multiline var */ - - git_buf_puts(value, proc_line); - git__free(line); - git__free(proc_line); - - /* - * If we need to continue reading the next line, let's just - * keep putting stuff in the buffer - */ - if (multiline) - return parse_multiline_variable(reader, value, quote_count); - - return 0; -} - -GIT_INLINE(bool) is_namechar(char c) -{ - return isalnum(c) || c == '-'; -} - -static int parse_name( - char **name, const char **value, struct reader *reader, const char *line) -{ - const char *name_end = line, *value_start; - - *name = NULL; - *value = NULL; - - while (*name_end && is_namechar(*name_end)) - name_end++; - - if (line == name_end) { - set_parse_error(reader, 0, "Invalid configuration key"); - return -1; - } - - value_start = name_end; - - while (*value_start && git__isspace(*value_start)) - value_start++; - - if (*value_start == '=') { - *value = value_start + 1; - } else if (*value_start) { - set_parse_error(reader, 0, "Invalid configuration key"); - return -1; - } - - if ((*name = git__strndup(line, name_end - line)) == NULL) - return -1; - - return 0; -} - -static int parse_variable(struct reader *reader, char **var_name, char **var_value) -{ - const char *value_start = NULL; - char *line; - int quote_count; - bool multiline; - - line = reader_readline(reader, true); - if (line == NULL) - return -1; - - quote_count = strip_comments(line, 0); - - /* If there is no value, boolean true is assumed */ - *var_value = NULL; - - if (parse_name(var_name, &value_start, reader, line) < 0) - goto on_error; - - /* - * Now, let's try to parse the value - */ - if (value_start != NULL) { - while (git__isspace(value_start[0])) - value_start++; - - if (unescape_line(var_value, &multiline, value_start, 0) < 0) - goto on_error; - - if (multiline) { - git_buf multi_value = GIT_BUF_INIT; - git_buf_attach(&multi_value, *var_value, 0); - - if (parse_multiline_variable(reader, &multi_value, quote_count) < 0 || - git_buf_oom(&multi_value)) { - git_buf_free(&multi_value); - goto on_error; - } - - *var_value = git_buf_detach(&multi_value); - } - } - - git__free(line); - return 0; - -on_error: - git__free(*var_name); - git__free(line); - return -1; -} - -static int config_parse( - struct reader *reader, - int (*on_section)(struct reader **reader, const char *current_section, const char *line, size_t line_len, void *data), - int (*on_variable)(struct reader **reader, const char *current_section, char *var_name, char *var_value, const char *line, size_t line_len, void *data), - int (*on_comment)(struct reader **reader, const char *line, size_t line_len, void *data), - int (*on_eof)(struct reader **reader, const char *current_section, void *data), - void *data) -{ - char *current_section = NULL, *var_name, *var_value, *line_start; - char c; - size_t line_len; - int result = 0; - - skip_bom(reader); - - while (result == 0 && !reader->eof) { - line_start = reader->read_ptr; - - c = reader_peek(reader, SKIP_WHITESPACE); - - switch (c) { - case '\0': /* EOF when peeking, set EOF in the reader to exit the loop */ - reader->eof = 1; - break; - - case '[': /* section header, new section begins */ - git__free(current_section); - current_section = NULL; - - if ((result = parse_section_header(reader, ¤t_section)) == 0 && on_section) { - line_len = reader->read_ptr - line_start; - result = on_section(&reader, current_section, line_start, line_len, data); - } - break; - - case '\n': /* comment or whitespace-only */ - case ';': - case '#': - reader_consume_line(reader); - - if (on_comment) { - line_len = reader->read_ptr - line_start; - result = on_comment(&reader, line_start, line_len, data); - } - break; - - default: /* assume variable declaration */ - if ((result = parse_variable(reader, &var_name, &var_value)) == 0 && on_variable) { - line_len = reader->read_ptr - line_start; - result = on_variable(&reader, current_section, var_name, var_value, line_start, line_len, data); - } - break; - } - } - - if (on_eof) - result = on_eof(&reader, current_section, data); - - git__free(current_section); - return result; -} - -struct parse_data { - git_strmap *values; - diskfile_backend *cfg_file; - uint32_t reader_idx; - git_config_level_t level; - int depth; -}; - -static int read_on_variable( - struct reader **reader, - const char *current_section, - char *var_name, - char *var_value, - const char *line, - size_t line_len, - void *data) -{ - struct parse_data *parse_data = (struct parse_data *)data; - git_buf buf = GIT_BUF_INIT; - cvar_t *var; - int result = 0; - - GIT_UNUSED(line); - GIT_UNUSED(line_len); - - git__strtolower(var_name); - git_buf_printf(&buf, "%s.%s", current_section, var_name); - git__free(var_name); - - if (git_buf_oom(&buf)) { - git__free(var_value); - return -1; - } - - var = git__calloc(1, sizeof(cvar_t)); - GITERR_CHECK_ALLOC(var); - var->entry = git__calloc(1, sizeof(git_config_entry)); - GITERR_CHECK_ALLOC(var->entry); - - var->entry->name = git_buf_detach(&buf); - var->entry->value = var_value; - var->entry->level = parse_data->level; - var->included = !!parse_data->depth; - - if ((result = append_entry(parse_data->values, var)) < 0) - return result; - - result = 0; - - /* Add or append the new config option */ - if (!git__strcmp(var->entry->name, "include.path")) { - struct reader *r; - git_buf path = GIT_BUF_INIT; - char *dir; - uint32_t index; - - r = git_array_alloc(parse_data->cfg_file->readers); - /* The reader may have been reallocated */ - *reader = git_array_get(parse_data->cfg_file->readers, parse_data->reader_idx); - memset(r, 0, sizeof(struct reader)); - - if ((result = git_path_dirname_r(&path, (*reader)->file_path)) < 0) - return result; - - /* We need to know our index in the array, as the next config_parse call may realloc */ - index = git_array_size(parse_data->cfg_file->readers) - 1; - dir = git_buf_detach(&path); - result = included_path(&path, dir, var->entry->value); - git__free(dir); - - if (result < 0) - return result; - - r->file_path = git_buf_detach(&path); - git_buf_init(&r->buffer, 0); - - result = git_futils_readbuffer_updated( - &r->buffer, r->file_path, &r->checksum, NULL); - - if (result == 0) { - result = config_read(parse_data->values, parse_data->cfg_file, r, parse_data->level, parse_data->depth+1); - r = git_array_get(parse_data->cfg_file->readers, index); - *reader = git_array_get(parse_data->cfg_file->readers, parse_data->reader_idx); - } else if (result == GIT_ENOTFOUND) { - giterr_clear(); - result = 0; - } - - git_buf_free(&r->buffer); - } - - return result; -} - -static int config_read(git_strmap *values, diskfile_backend *cfg_file, struct reader *reader, git_config_level_t level, int depth) -{ - struct parse_data parse_data; - - if (depth >= MAX_INCLUDE_DEPTH) { - giterr_set(GITERR_CONFIG, "Maximum config include depth reached"); - return -1; - } - - /* Initialize the reading position */ - reader->read_ptr = reader->buffer.ptr; - reader->eof = 0; - - /* If the file is empty, there's nothing for us to do */ - if (*reader->read_ptr == '\0') - return 0; - - parse_data.values = values; - parse_data.cfg_file = cfg_file; - parse_data.reader_idx = git_array_size(cfg_file->readers) - 1; - parse_data.level = level; - parse_data.depth = depth; - - return config_parse(reader, NULL, read_on_variable, NULL, NULL, &parse_data); -} - -static int write_section(git_buf *fbuf, const char *key) -{ - int result; - const char *dot; - git_buf buf = GIT_BUF_INIT; - - /* All of this just for [section "subsection"] */ - dot = strchr(key, '.'); - git_buf_putc(&buf, '['); - if (dot == NULL) { - git_buf_puts(&buf, key); - } else { - char *escaped; - git_buf_put(&buf, key, dot - key); - escaped = escape_value(dot + 1); - GITERR_CHECK_ALLOC(escaped); - git_buf_printf(&buf, " \"%s\"", escaped); - git__free(escaped); - } - git_buf_puts(&buf, "]\n"); - - if (git_buf_oom(&buf)) - return -1; - - result = git_buf_put(fbuf, git_buf_cstr(&buf), buf.size); - git_buf_free(&buf); - - return result; -} - -static const char *quotes_for_value(const char *value) -{ - const char *ptr; - - if (value[0] == ' ' || value[0] == '\0') - return "\""; - - for (ptr = value; *ptr; ++ptr) { - if (*ptr == ';' || *ptr == '#') - return "\""; - } - - if (ptr[-1] == ' ') - return "\""; - - return ""; -} - -struct write_data { - git_buf *buf; - git_buf buffered_comment; - unsigned int in_section : 1, - preg_replaced : 1; - const char *section; - const char *name; - const regex_t *preg; - const char *value; -}; - -static int write_line_to(git_buf *buf, const char *line, size_t line_len) -{ - int result = git_buf_put(buf, line, line_len); - - if (!result && line_len && line[line_len-1] != '\n') - result = git_buf_printf(buf, "\n"); - - return result; -} - -static int write_line(struct write_data *write_data, const char *line, size_t line_len) -{ - return write_line_to(write_data->buf, line, line_len); -} - -static int write_value(struct write_data *write_data) -{ - const char *q; - int result; - - q = quotes_for_value(write_data->value); - result = git_buf_printf(write_data->buf, - "\t%s = %s%s%s\n", write_data->name, q, write_data->value, q); - - /* If we are updating a single name/value, we're done. Setting `value` - * to `NULL` will prevent us from trying to write it again later (in - * `write_on_section`) if we see the same section repeated. - */ - if (!write_data->preg) - write_data->value = NULL; - - return result; -} - -static int write_on_section( - struct reader **reader, - const char *current_section, - const char *line, - size_t line_len, - void *data) -{ - struct write_data *write_data = (struct write_data *)data; - int result = 0; - - GIT_UNUSED(reader); - - /* If we were previously in the correct section (but aren't anymore) - * and haven't written our value (for a simple name/value set, not - * a multivar), then append it to the end of the section before writing - * the new one. - */ - if (write_data->in_section && !write_data->preg && write_data->value) - result = write_value(write_data); - - write_data->in_section = strcmp(current_section, write_data->section) == 0; - - /* - * If there were comments just before this section, dump them as well. - */ - if (!result) { - result = git_buf_put(write_data->buf, write_data->buffered_comment.ptr, write_data->buffered_comment.size); - git_buf_clear(&write_data->buffered_comment); - } - - if (!result) - result = write_line(write_data, line, line_len); - - return result; -} - -static int write_on_variable( - struct reader **reader, - const char *current_section, - char *var_name, - char *var_value, - const char *line, - size_t line_len, - void *data) -{ - struct write_data *write_data = (struct write_data *)data; - bool has_matched = false; - int error; - - GIT_UNUSED(reader); - GIT_UNUSED(current_section); - - /* - * If there were comments just before this variable, let's dump them as well. - */ - if ((error = git_buf_put(write_data->buf, write_data->buffered_comment.ptr, write_data->buffered_comment.size)) < 0) - return error; - - git_buf_clear(&write_data->buffered_comment); - - /* See if we are to update this name/value pair; first examine name */ - if (write_data->in_section && - strcasecmp(write_data->name, var_name) == 0) - has_matched = true; - - /* If we have a regex to match the value, see if it matches */ - if (has_matched && write_data->preg != NULL) - has_matched = (regexec(write_data->preg, var_value, 0, NULL, 0) == 0); - - git__free(var_name); - git__free(var_value); - - /* If this isn't the name/value we're looking for, simply dump the - * existing data back out and continue on. - */ - if (!has_matched) - return write_line(write_data, line, line_len); - - write_data->preg_replaced = 1; - - /* If value is NULL, we are deleting this value; write nothing. */ - if (!write_data->value) - return 0; - - return write_value(write_data); -} - -static int write_on_comment(struct reader **reader, const char *line, size_t line_len, void *data) -{ - struct write_data *write_data; - - GIT_UNUSED(reader); - - write_data = (struct write_data *)data; - return write_line_to(&write_data->buffered_comment, line, line_len); -} - -static int write_on_eof( - struct reader **reader, const char *current_section, void *data) -{ - struct write_data *write_data = (struct write_data *)data; - int result = 0; - - GIT_UNUSED(reader); - - /* - * If we've buffered comments when reaching EOF, make sure to dump them. - */ - if ((result = git_buf_put(write_data->buf, write_data->buffered_comment.ptr, write_data->buffered_comment.size)) < 0) - return result; - - /* If we are at the EOF and have not written our value (again, for a - * simple name/value set, not a multivar) then we have never seen the - * section in question and should create a new section and write the - * value. - */ - if ((!write_data->preg || !write_data->preg_replaced) && write_data->value) { - /* write the section header unless we're already in it */ - if (!current_section || strcmp(current_section, write_data->section)) - result = write_section(write_data->buf, write_data->section); - - if (!result) - result = write_value(write_data); - } - - return result; -} - -/* - * This is pretty much the parsing, except we write out anything we don't have - */ -static int config_write(diskfile_backend *cfg, const char *key, const regex_t *preg, const char* value) -{ - int result; - char *section, *name, *ldot; - git_filebuf file = GIT_FILEBUF_INIT; - git_buf buf = GIT_BUF_INIT; - struct reader *reader = git_array_get(cfg->readers, 0); - struct write_data write_data; - - if (cfg->locked) { - result = git_buf_puts(&reader->buffer, git_buf_cstr(&cfg->locked_content)); - } else { - /* Lock the file */ - if ((result = git_filebuf_open( - &file, cfg->file_path, GIT_FILEBUF_HASH_CONTENTS, GIT_CONFIG_FILE_MODE)) < 0) { - git_buf_free(&reader->buffer); - return result; - } - - /* We need to read in our own config file */ - result = git_futils_readbuffer(&reader->buffer, cfg->file_path); - } - - /* Initialise the reading position */ - if (result == GIT_ENOTFOUND) { - reader->read_ptr = NULL; - reader->eof = 1; - git_buf_clear(&reader->buffer); - } else if (result == 0) { - reader->read_ptr = reader->buffer.ptr; - reader->eof = 0; - } else { - git_filebuf_cleanup(&file); - return -1; /* OS error when reading the file */ - } - - ldot = strrchr(key, '.'); - name = ldot + 1; - section = git__strndup(key, ldot - key); - - write_data.buf = &buf; - git_buf_init(&write_data.buffered_comment, 0); - write_data.section = section; - write_data.in_section = 0; - write_data.preg_replaced = 0; - write_data.name = name; - write_data.preg = preg; - write_data.value = value; - - result = config_parse(reader, write_on_section, write_on_variable, write_on_comment, write_on_eof, &write_data); - git__free(section); - git_buf_free(&write_data.buffered_comment); - - if (result < 0) { - git_filebuf_cleanup(&file); - goto done; - } - - if (cfg->locked) { - size_t len = buf.asize; - /* Update our copy with the modified contents */ - git_buf_free(&cfg->locked_content); - git_buf_attach(&cfg->locked_content, git_buf_detach(&buf), len); - } else { - git_filebuf_write(&file, git_buf_cstr(&buf), git_buf_len(&buf)); - result = git_filebuf_commit(&file); - } - -done: - git_buf_free(&buf); - git_buf_free(&reader->buffer); - return result; -} - diff --git a/vendor/libgit2/src/config_file.h b/vendor/libgit2/src/config_file.h deleted file mode 100644 index 1c52892c3..000000000 --- a/vendor/libgit2/src/config_file.h +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_config_file_h__ -#define INCLUDE_config_file_h__ - -#include "git2/config.h" - -GIT_INLINE(int) git_config_file_open(git_config_backend *cfg, unsigned int level) -{ - return cfg->open(cfg, level); -} - -GIT_INLINE(void) git_config_file_free(git_config_backend *cfg) -{ - if (cfg) - cfg->free(cfg); -} - -GIT_INLINE(int) git_config_file_get_string( - git_config_entry **out, git_config_backend *cfg, const char *name) -{ - return cfg->get(cfg, name, out); -} - -GIT_INLINE(int) git_config_file_set_string( - git_config_backend *cfg, const char *name, const char *value) -{ - return cfg->set(cfg, name, value); -} - -GIT_INLINE(int) git_config_file_delete( - git_config_backend *cfg, const char *name) -{ - return cfg->del(cfg, name); -} - -GIT_INLINE(int) git_config_file_foreach( - git_config_backend *cfg, - int (*fn)(const git_config_entry *entry, void *data), - void *data) -{ - return git_config_backend_foreach_match(cfg, NULL, fn, data); -} - -GIT_INLINE(int) git_config_file_foreach_match( - git_config_backend *cfg, - const char *regexp, - int (*fn)(const git_config_entry *entry, void *data), - void *data) -{ - return git_config_backend_foreach_match(cfg, regexp, fn, data); -} - -GIT_INLINE(int) git_config_file_lock(git_config_backend *cfg) -{ - return cfg->lock(cfg); -} - -GIT_INLINE(int) git_config_file_unlock(git_config_backend *cfg, int success) -{ - return cfg->unlock(cfg, success); -} - -extern int git_config_file_normalize_section(char *start, char *end); - -#endif - diff --git a/vendor/libgit2/src/crlf.c b/vendor/libgit2/src/crlf.c deleted file mode 100644 index 5d7510ac7..000000000 --- a/vendor/libgit2/src/crlf.c +++ /dev/null @@ -1,382 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "git2/attr.h" -#include "git2/blob.h" -#include "git2/index.h" -#include "git2/sys/filter.h" - -#include "common.h" -#include "fileops.h" -#include "hash.h" -#include "filter.h" -#include "buf_text.h" -#include "repository.h" - -struct crlf_attrs { - int crlf_action; - int eol; - int auto_crlf; - int safe_crlf; -}; - -struct crlf_filter { - git_filter f; -}; - -static int check_crlf(const char *value) -{ - if (GIT_ATTR_TRUE(value)) - return GIT_CRLF_TEXT; - - if (GIT_ATTR_FALSE(value)) - return GIT_CRLF_BINARY; - - if (GIT_ATTR_UNSPECIFIED(value)) - return GIT_CRLF_GUESS; - - if (strcmp(value, "input") == 0) - return GIT_CRLF_INPUT; - - if (strcmp(value, "auto") == 0) - return GIT_CRLF_AUTO; - - return GIT_CRLF_GUESS; -} - -static int check_eol(const char *value) -{ - if (GIT_ATTR_UNSPECIFIED(value)) - return GIT_EOL_UNSET; - - if (strcmp(value, "lf") == 0) - return GIT_EOL_LF; - - if (strcmp(value, "crlf") == 0) - return GIT_EOL_CRLF; - - return GIT_EOL_UNSET; -} - -static int crlf_input_action(struct crlf_attrs *ca) -{ - if (ca->crlf_action == GIT_CRLF_BINARY) - return GIT_CRLF_BINARY; - - if (ca->eol == GIT_EOL_LF) - return GIT_CRLF_INPUT; - - if (ca->eol == GIT_EOL_CRLF) - return GIT_CRLF_CRLF; - - return ca->crlf_action; -} - -static int has_cr_in_index(const git_filter_source *src) -{ - git_repository *repo = git_filter_source_repo(src); - const char *path = git_filter_source_path(src); - git_index *index; - const git_index_entry *entry; - git_blob *blob; - const void *blobcontent; - git_off_t blobsize; - bool found_cr; - - if (!path) - return false; - - if (git_repository_index__weakptr(&index, repo) < 0) { - giterr_clear(); - return false; - } - - if (!(entry = git_index_get_bypath(index, path, 0)) && - !(entry = git_index_get_bypath(index, path, 1))) - return false; - - if (!S_ISREG(entry->mode)) /* don't crlf filter non-blobs */ - return true; - - if (git_blob_lookup(&blob, repo, &entry->id) < 0) - return false; - - blobcontent = git_blob_rawcontent(blob); - blobsize = git_blob_rawsize(blob); - if (!git__is_sizet(blobsize)) - blobsize = (size_t)-1; - - found_cr = (blobcontent != NULL && - blobsize > 0 && - memchr(blobcontent, '\r', (size_t)blobsize) != NULL); - - git_blob_free(blob); - return found_cr; -} - -static int crlf_apply_to_odb( - struct crlf_attrs *ca, - git_buf *to, - const git_buf *from, - const git_filter_source *src) -{ - /* Empty file? Nothing to do */ - if (!git_buf_len(from)) - return 0; - - /* Heuristics to see if we can skip the conversion. - * Straight from Core Git. - */ - if (ca->crlf_action == GIT_CRLF_AUTO || ca->crlf_action == GIT_CRLF_GUESS) { - git_buf_text_stats stats; - - /* Check heuristics for binary vs text - returns true if binary */ - if (git_buf_text_gather_stats(&stats, from, false)) - return GIT_PASSTHROUGH; - - /* If there are no CR characters to filter out, then just pass */ - if (!stats.cr) - return GIT_PASSTHROUGH; - - /* If safecrlf is enabled, sanity-check the result. */ - if (stats.cr != stats.crlf || stats.lf != stats.crlf) { - switch (ca->safe_crlf) { - case GIT_SAFE_CRLF_FAIL: - giterr_set( - GITERR_FILTER, "LF would be replaced by CRLF in '%s'", - git_filter_source_path(src)); - return -1; - case GIT_SAFE_CRLF_WARN: - /* TODO: issue warning when warning API is available */; - break; - default: - break; - } - } - - /* - * We're currently not going to even try to convert stuff - * that has bare CR characters. Does anybody do that crazy - * stuff? - */ - if (stats.cr != stats.crlf) - return GIT_PASSTHROUGH; - - if (ca->crlf_action == GIT_CRLF_GUESS) { - /* - * If the file in the index has any CR in it, do not convert. - * This is the new safer autocrlf handling. - */ - if (has_cr_in_index(src)) - return GIT_PASSTHROUGH; - } - - if (!stats.cr) - return GIT_PASSTHROUGH; - } - - /* Actually drop the carriage returns */ - return git_buf_text_crlf_to_lf(to, from); -} - -static const char *line_ending(struct crlf_attrs *ca) -{ - switch (ca->crlf_action) { - case GIT_CRLF_BINARY: - case GIT_CRLF_INPUT: - return "\n"; - - case GIT_CRLF_CRLF: - return "\r\n"; - - case GIT_CRLF_GUESS: - if (ca->auto_crlf == GIT_AUTO_CRLF_FALSE) - return "\n"; - break; - - case GIT_CRLF_AUTO: - case GIT_CRLF_TEXT: - break; - - default: - goto line_ending_error; - } - - if (ca->auto_crlf == GIT_AUTO_CRLF_TRUE) - return "\r\n"; - else if (ca->auto_crlf == GIT_AUTO_CRLF_INPUT) - return "\n"; - else if (ca->eol == GIT_EOL_UNSET) - return GIT_EOL_NATIVE == GIT_EOL_CRLF ? "\r\n" : "\n"; - else if (ca->eol == GIT_EOL_LF) - return "\n"; - else if (ca->eol == GIT_EOL_CRLF) - return "\r\n"; - -line_ending_error: - giterr_set(GITERR_INVALID, "Invalid input to line ending filter"); - return NULL; -} - -static int crlf_apply_to_workdir( - struct crlf_attrs *ca, git_buf *to, const git_buf *from) -{ - git_buf_text_stats stats; - const char *workdir_ending = NULL; - bool is_binary; - - /* Empty file? Nothing to do. */ - if (git_buf_len(from) == 0) - return 0; - - /* Determine proper line ending */ - workdir_ending = line_ending(ca); - if (!workdir_ending) - return -1; - - /* only LF->CRLF conversion is supported, do nothing on LF platforms */ - if (strcmp(workdir_ending, "\r\n") != 0) - return GIT_PASSTHROUGH; - - /* If there are no LFs, or all LFs are part of a CRLF, nothing to do */ - is_binary = git_buf_text_gather_stats(&stats, from, false); - - if (stats.lf == 0 || stats.lf == stats.crlf) - return GIT_PASSTHROUGH; - - if (ca->crlf_action == GIT_CRLF_AUTO || - ca->crlf_action == GIT_CRLF_GUESS) { - - /* If we have any existing CR or CRLF line endings, do nothing */ - if (ca->crlf_action == GIT_CRLF_GUESS && - stats.cr > 0 && stats.crlf > 0) - return GIT_PASSTHROUGH; - - /* If we have bare CR characters, do nothing */ - if (stats.cr != stats.crlf) - return GIT_PASSTHROUGH; - - /* Don't filter binary files */ - if (is_binary) - return GIT_PASSTHROUGH; - } - - return git_buf_text_lf_to_crlf(to, from); -} - -static int crlf_check( - git_filter *self, - void **payload, /* points to NULL ptr on entry, may be set */ - const git_filter_source *src, - const char **attr_values) -{ - int error; - struct crlf_attrs ca; - - GIT_UNUSED(self); - - if (!attr_values) { - ca.crlf_action = GIT_CRLF_GUESS; - ca.eol = GIT_EOL_UNSET; - } else { - ca.crlf_action = check_crlf(attr_values[2]); /* text */ - if (ca.crlf_action == GIT_CRLF_GUESS) - ca.crlf_action = check_crlf(attr_values[0]); /* clrf */ - ca.eol = check_eol(attr_values[1]); /* eol */ - } - ca.auto_crlf = GIT_AUTO_CRLF_DEFAULT; - - /* - * Use the core Git logic to see if we should perform CRLF for this file - * based on its attributes & the value of `core.autocrlf` - */ - ca.crlf_action = crlf_input_action(&ca); - - if (ca.crlf_action == GIT_CRLF_BINARY) - return GIT_PASSTHROUGH; - - if (ca.crlf_action == GIT_CRLF_GUESS || - ((ca.crlf_action == GIT_CRLF_AUTO || ca.crlf_action == GIT_CRLF_TEXT) && - git_filter_source_mode(src) == GIT_FILTER_SMUDGE)) { - - error = git_repository__cvar( - &ca.auto_crlf, git_filter_source_repo(src), GIT_CVAR_AUTO_CRLF); - if (error < 0) - return error; - - if (ca.crlf_action == GIT_CRLF_GUESS && - ca.auto_crlf == GIT_AUTO_CRLF_FALSE) - return GIT_PASSTHROUGH; - - if (ca.auto_crlf == GIT_AUTO_CRLF_INPUT && - git_filter_source_mode(src) == GIT_FILTER_SMUDGE) - return GIT_PASSTHROUGH; - } - - if (git_filter_source_mode(src) == GIT_FILTER_CLEAN) { - error = git_repository__cvar( - &ca.safe_crlf, git_filter_source_repo(src), GIT_CVAR_SAFE_CRLF); - if (error < 0) - return error; - - /* downgrade FAIL to WARN if ALLOW_UNSAFE option is used */ - if ((git_filter_source_flags(src) & GIT_FILTER_ALLOW_UNSAFE) && - ca.safe_crlf == GIT_SAFE_CRLF_FAIL) - ca.safe_crlf = GIT_SAFE_CRLF_WARN; - } - - *payload = git__malloc(sizeof(ca)); - GITERR_CHECK_ALLOC(*payload); - memcpy(*payload, &ca, sizeof(ca)); - - return 0; -} - -static int crlf_apply( - git_filter *self, - void **payload, /* may be read and/or set */ - git_buf *to, - const git_buf *from, - const git_filter_source *src) -{ - /* initialize payload in case `check` was bypassed */ - if (!*payload) { - int error = crlf_check(self, payload, src, NULL); - if (error < 0) - return error; - } - - if (git_filter_source_mode(src) == GIT_FILTER_SMUDGE) - return crlf_apply_to_workdir(*payload, to, from); - else - return crlf_apply_to_odb(*payload, to, from, src); -} - -static void crlf_cleanup( - git_filter *self, - void *payload) -{ - GIT_UNUSED(self); - git__free(payload); -} - -git_filter *git_crlf_filter_new(void) -{ - struct crlf_filter *f = git__calloc(1, sizeof(struct crlf_filter)); - if (f == NULL) - return NULL; - - f->f.version = GIT_FILTER_VERSION; - f->f.attributes = "crlf eol text"; - f->f.initialize = NULL; - f->f.shutdown = git_filter_free; - f->f.check = crlf_check; - f->f.apply = crlf_apply; - f->f.cleanup = crlf_cleanup; - - return (git_filter *)f; -} diff --git a/vendor/libgit2/src/curl_stream.c b/vendor/libgit2/src/curl_stream.c deleted file mode 100644 index 9963d94cc..000000000 --- a/vendor/libgit2/src/curl_stream.c +++ /dev/null @@ -1,262 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#ifdef GIT_CURL - -#include - -#include "stream.h" -#include "git2/transport.h" -#include "buffer.h" -#include "vector.h" - -typedef struct { - git_stream parent; - CURL *handle; - curl_socket_t socket; - char curl_error[CURL_ERROR_SIZE + 1]; - git_cert_x509 cert_info; - git_strarray cert_info_strings; -} curl_stream; - -static int seterr_curl(curl_stream *s) -{ - giterr_set(GITERR_NET, "curl error: %s\n", s->curl_error); - return -1; -} - -static int curls_connect(git_stream *stream) -{ - curl_stream *s = (curl_stream *) stream; - long sockextr; - int failed_cert = 0; - CURLcode res; - res = curl_easy_perform(s->handle); - - if (res != CURLE_OK && res != CURLE_PEER_FAILED_VERIFICATION) - return seterr_curl(s); - if (res == CURLE_PEER_FAILED_VERIFICATION) - failed_cert = 1; - - if ((res = curl_easy_getinfo(s->handle, CURLINFO_LASTSOCKET, &sockextr)) != CURLE_OK) - return seterr_curl(s); - - s->socket = sockextr; - - if (s->parent.encrypted && failed_cert) - return GIT_ECERTIFICATE; - - return 0; -} - -static int curls_certificate(git_cert **out, git_stream *stream) -{ - int error; - CURLcode res; - struct curl_slist *slist; - struct curl_certinfo *certinfo; - git_vector strings = GIT_VECTOR_INIT; - curl_stream *s = (curl_stream *) stream; - - if ((res = curl_easy_getinfo(s->handle, CURLINFO_CERTINFO, &certinfo)) != CURLE_OK) - return seterr_curl(s); - - /* No information is available, can happen with SecureTransport */ - if (certinfo->num_of_certs == 0) { - s->cert_info.parent.cert_type = GIT_CERT_NONE; - s->cert_info.data = NULL; - s->cert_info.len = 0; - return 0; - } - - if ((error = git_vector_init(&strings, 8, NULL)) < 0) - return error; - - for (slist = certinfo->certinfo[0]; slist; slist = slist->next) { - char *str = git__strdup(slist->data); - GITERR_CHECK_ALLOC(str); - git_vector_insert(&strings, str); - } - - /* Copy the contents of the vector into a strarray so we can expose them */ - s->cert_info_strings.strings = (char **) strings.contents; - s->cert_info_strings.count = strings.length; - - s->cert_info.parent.cert_type = GIT_CERT_STRARRAY; - s->cert_info.data = &s->cert_info_strings; - s->cert_info.len = strings.length; - - *out = &s->cert_info.parent; - - return 0; -} - -static int curls_set_proxy(git_stream *stream, const char *proxy_url) -{ - CURLcode res; - curl_stream *s = (curl_stream *) stream; - - if ((res = curl_easy_setopt(s->handle, CURLOPT_PROXY, proxy_url)) != CURLE_OK) - return seterr_curl(s); - - return 0; -} - -static int wait_for(curl_socket_t fd, bool reading) -{ - int ret; - fd_set infd, outfd, errfd; - - FD_ZERO(&infd); - FD_ZERO(&outfd); - FD_ZERO(&errfd); - - FD_SET(fd, &errfd); - if (reading) - FD_SET(fd, &infd); - else - FD_SET(fd, &outfd); - - if ((ret = select(fd + 1, &infd, &outfd, &errfd, NULL)) < 0) { - giterr_set(GITERR_OS, "error in select"); - return -1; - } - - return 0; -} - -static ssize_t curls_write(git_stream *stream, const char *data, size_t len, int flags) -{ - int error; - size_t off = 0, sent; - CURLcode res; - curl_stream *s = (curl_stream *) stream; - - GIT_UNUSED(flags); - - do { - if ((error = wait_for(s->socket, false)) < 0) - return error; - - res = curl_easy_send(s->handle, data + off, len - off, &sent); - if (res == CURLE_OK) - off += sent; - } while ((res == CURLE_OK || res == CURLE_AGAIN) && off < len); - - if (res != CURLE_OK) - return seterr_curl(s); - - return len; -} - -static ssize_t curls_read(git_stream *stream, void *data, size_t len) -{ - int error; - size_t read; - CURLcode res; - curl_stream *s = (curl_stream *) stream; - - do { - if ((error = wait_for(s->socket, true)) < 0) - return error; - - res = curl_easy_recv(s->handle, data, len, &read); - } while (res == CURLE_AGAIN); - - if (res != CURLE_OK) - return seterr_curl(s); - - return read; -} - -static int curls_close(git_stream *stream) -{ - curl_stream *s = (curl_stream *) stream; - - if (!s->handle) - return 0; - - curl_easy_cleanup(s->handle); - s->handle = NULL; - s->socket = 0; - - return 0; -} - -static void curls_free(git_stream *stream) -{ - curl_stream *s = (curl_stream *) stream; - - curls_close(stream); - git_strarray_free(&s->cert_info_strings); - git__free(s); -} - -int git_curl_stream_new(git_stream **out, const char *host, const char *port) -{ - curl_stream *st; - CURL *handle; - int iport = 0, error; - - st = git__calloc(1, sizeof(curl_stream)); - GITERR_CHECK_ALLOC(st); - - handle = curl_easy_init(); - if (handle == NULL) { - giterr_set(GITERR_NET, "failed to create curl handle"); - git__free(st); - return -1; - } - - if ((error = git__strtol32(&iport, port, NULL, 10)) < 0) { - git__free(st); - return error; - } - - curl_easy_setopt(handle, CURLOPT_URL, host); - curl_easy_setopt(handle, CURLOPT_ERRORBUFFER, st->curl_error); - curl_easy_setopt(handle, CURLOPT_PORT, iport); - curl_easy_setopt(handle, CURLOPT_CONNECT_ONLY, 1); - curl_easy_setopt(handle, CURLOPT_SSL_VERIFYPEER, 1); - curl_easy_setopt(handle, CURLOPT_CERTINFO, 1); - curl_easy_setopt(handle, CURLOPT_HTTPPROXYTUNNEL, 1); - curl_easy_setopt(handle, CURLOPT_PROXYAUTH, CURLAUTH_ANY); - - /* curl_easy_setopt(handle, CURLOPT_VERBOSE, 1); */ - - st->parent.version = GIT_STREAM_VERSION; - st->parent.encrypted = 0; /* we don't encrypt ourselves */ - st->parent.proxy_support = 1; - st->parent.connect = curls_connect; - st->parent.certificate = curls_certificate; - st->parent.set_proxy = curls_set_proxy; - st->parent.read = curls_read; - st->parent.write = curls_write; - st->parent.close = curls_close; - st->parent.free = curls_free; - st->handle = handle; - - *out = (git_stream *) st; - return 0; -} - -#else - -#include "stream.h" - -int git_curl_stream_new(git_stream **out, const char *host, const char *port) -{ - GIT_UNUSED(out); - GIT_UNUSED(host); - GIT_UNUSED(port); - - giterr_set(GITERR_NET, "curl is not supported in this version"); - return -1; -} - - -#endif diff --git a/vendor/libgit2/src/curl_stream.h b/vendor/libgit2/src/curl_stream.h deleted file mode 100644 index 283f0fe40..000000000 --- a/vendor/libgit2/src/curl_stream.h +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_curl_stream_h__ -#define INCLUDE_curl_stream_h__ - -#include "git2/sys/stream.h" - -extern int git_curl_stream_new(git_stream **out, const char *host, const char *port); - -#endif diff --git a/vendor/libgit2/src/date.c b/vendor/libgit2/src/date.c deleted file mode 100644 index 0e1b31aee..000000000 --- a/vendor/libgit2/src/date.c +++ /dev/null @@ -1,904 +0,0 @@ -/* - * GIT - The information manager from hell - * - * Copyright (C) Linus Torvalds, 2005 - */ - -#include "common.h" - -#ifndef GIT_WIN32 -#include -#endif - -#include "util.h" -#include "cache.h" -#include "posix.h" - -#include -#include - -typedef enum { - DATE_NORMAL = 0, - DATE_RELATIVE, - DATE_SHORT, - DATE_LOCAL, - DATE_ISO8601, - DATE_RFC2822, - DATE_RAW -} date_mode; - -/* - * This is like mktime, but without normalization of tm_wday and tm_yday. - */ -static git_time_t tm_to_time_t(const struct tm *tm) -{ - static const int mdays[] = { - 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334 - }; - int year = tm->tm_year - 70; - int month = tm->tm_mon; - int day = tm->tm_mday; - - if (year < 0 || year > 129) /* algo only works for 1970-2099 */ - return -1; - if (month < 0 || month > 11) /* array bounds */ - return -1; - if (month < 2 || (year + 2) % 4) - day--; - if (tm->tm_hour < 0 || tm->tm_min < 0 || tm->tm_sec < 0) - return -1; - return (year * 365 + (year + 1) / 4 + mdays[month] + day) * 24*60*60UL + - tm->tm_hour * 60*60 + tm->tm_min * 60 + tm->tm_sec; -} - -static const char *month_names[] = { - "January", "February", "March", "April", "May", "June", - "July", "August", "September", "October", "November", "December" -}; - -static const char *weekday_names[] = { - "Sundays", "Mondays", "Tuesdays", "Wednesdays", "Thursdays", "Fridays", "Saturdays" -}; - - - -/* - * Check these. And note how it doesn't do the summer-time conversion. - * - * In my world, it's always summer, and things are probably a bit off - * in other ways too. - */ -static const struct { - const char *name; - int offset; - int dst; -} timezone_names[] = { - { "IDLW", -12, 0, }, /* International Date Line West */ - { "NT", -11, 0, }, /* Nome */ - { "CAT", -10, 0, }, /* Central Alaska */ - { "HST", -10, 0, }, /* Hawaii Standard */ - { "HDT", -10, 1, }, /* Hawaii Daylight */ - { "YST", -9, 0, }, /* Yukon Standard */ - { "YDT", -9, 1, }, /* Yukon Daylight */ - { "PST", -8, 0, }, /* Pacific Standard */ - { "PDT", -8, 1, }, /* Pacific Daylight */ - { "MST", -7, 0, }, /* Mountain Standard */ - { "MDT", -7, 1, }, /* Mountain Daylight */ - { "CST", -6, 0, }, /* Central Standard */ - { "CDT", -6, 1, }, /* Central Daylight */ - { "EST", -5, 0, }, /* Eastern Standard */ - { "EDT", -5, 1, }, /* Eastern Daylight */ - { "AST", -3, 0, }, /* Atlantic Standard */ - { "ADT", -3, 1, }, /* Atlantic Daylight */ - { "WAT", -1, 0, }, /* West Africa */ - - { "GMT", 0, 0, }, /* Greenwich Mean */ - { "UTC", 0, 0, }, /* Universal (Coordinated) */ - { "Z", 0, 0, }, /* Zulu, alias for UTC */ - - { "WET", 0, 0, }, /* Western European */ - { "BST", 0, 1, }, /* British Summer */ - { "CET", +1, 0, }, /* Central European */ - { "MET", +1, 0, }, /* Middle European */ - { "MEWT", +1, 0, }, /* Middle European Winter */ - { "MEST", +1, 1, }, /* Middle European Summer */ - { "CEST", +1, 1, }, /* Central European Summer */ - { "MESZ", +1, 1, }, /* Middle European Summer */ - { "FWT", +1, 0, }, /* French Winter */ - { "FST", +1, 1, }, /* French Summer */ - { "EET", +2, 0, }, /* Eastern Europe */ - { "EEST", +2, 1, }, /* Eastern European Daylight */ - { "WAST", +7, 0, }, /* West Australian Standard */ - { "WADT", +7, 1, }, /* West Australian Daylight */ - { "CCT", +8, 0, }, /* China Coast */ - { "JST", +9, 0, }, /* Japan Standard */ - { "EAST", +10, 0, }, /* Eastern Australian Standard */ - { "EADT", +10, 1, }, /* Eastern Australian Daylight */ - { "GST", +10, 0, }, /* Guam Standard */ - { "NZT", +12, 0, }, /* New Zealand */ - { "NZST", +12, 0, }, /* New Zealand Standard */ - { "NZDT", +12, 1, }, /* New Zealand Daylight */ - { "IDLE", +12, 0, }, /* International Date Line East */ -}; - -static size_t match_string(const char *date, const char *str) -{ - size_t i = 0; - - for (i = 0; *date; date++, str++, i++) { - if (*date == *str) - continue; - if (toupper(*date) == toupper(*str)) - continue; - if (!isalnum(*date)) - break; - return 0; - } - return i; -} - -static int skip_alpha(const char *date) -{ - int i = 0; - do { - i++; - } while (isalpha(date[i])); - return i; -} - -/* -* Parse month, weekday, or timezone name -*/ -static size_t match_alpha(const char *date, struct tm *tm, int *offset) -{ - unsigned int i; - - for (i = 0; i < 12; i++) { - size_t match = match_string(date, month_names[i]); - if (match >= 3) { - tm->tm_mon = i; - return match; - } - } - - for (i = 0; i < 7; i++) { - size_t match = match_string(date, weekday_names[i]); - if (match >= 3) { - tm->tm_wday = i; - return match; - } - } - - for (i = 0; i < ARRAY_SIZE(timezone_names); i++) { - size_t match = match_string(date, timezone_names[i].name); - if (match >= 3 || match == strlen(timezone_names[i].name)) { - int off = timezone_names[i].offset; - - /* This is bogus, but we like summer */ - off += timezone_names[i].dst; - - /* Only use the tz name offset if we don't have anything better */ - if (*offset == -1) - *offset = 60*off; - - return match; - } - } - - if (match_string(date, "PM") == 2) { - tm->tm_hour = (tm->tm_hour % 12) + 12; - return 2; - } - - if (match_string(date, "AM") == 2) { - tm->tm_hour = (tm->tm_hour % 12) + 0; - return 2; - } - - /* BAD */ - return skip_alpha(date); -} - -static int is_date(int year, int month, int day, struct tm *now_tm, time_t now, struct tm *tm) -{ - if (month > 0 && month < 13 && day > 0 && day < 32) { - struct tm check = *tm; - struct tm *r = (now_tm ? &check : tm); - time_t specified; - - r->tm_mon = month - 1; - r->tm_mday = day; - if (year == -1) { - if (!now_tm) - return 1; - r->tm_year = now_tm->tm_year; - } - else if (year >= 1970 && year < 2100) - r->tm_year = year - 1900; - else if (year > 70 && year < 100) - r->tm_year = year; - else if (year < 38) - r->tm_year = year + 100; - else - return 0; - if (!now_tm) - return 1; - - specified = tm_to_time_t(r); - - /* Be it commit time or author time, it does not make - * sense to specify timestamp way into the future. Make - * sure it is not later than ten days from now... - */ - if (now + 10*24*3600 < specified) - return 0; - tm->tm_mon = r->tm_mon; - tm->tm_mday = r->tm_mday; - if (year != -1) - tm->tm_year = r->tm_year; - return 1; - } - return 0; -} - -static size_t match_multi_number(unsigned long num, char c, const char *date, char *end, struct tm *tm) -{ - time_t now; - struct tm now_tm; - struct tm *refuse_future; - long num2, num3; - - num2 = strtol(end+1, &end, 10); - num3 = -1; - if (*end == c && isdigit(end[1])) - num3 = strtol(end+1, &end, 10); - - /* Time? Date? */ - switch (c) { - case ':': - if (num3 < 0) - num3 = 0; - if (num < 25 && num2 >= 0 && num2 < 60 && num3 >= 0 && num3 <= 60) { - tm->tm_hour = num; - tm->tm_min = num2; - tm->tm_sec = num3; - break; - } - return 0; - - case '-': - case '/': - case '.': - now = time(NULL); - refuse_future = NULL; - if (p_gmtime_r(&now, &now_tm)) - refuse_future = &now_tm; - - if (num > 70) { - /* yyyy-mm-dd? */ - if (is_date(num, num2, num3, refuse_future, now, tm)) - break; - /* yyyy-dd-mm? */ - if (is_date(num, num3, num2, refuse_future, now, tm)) - break; - } - /* Our eastern European friends say dd.mm.yy[yy] - * is the norm there, so giving precedence to - * mm/dd/yy[yy] form only when separator is not '.' - */ - if (c != '.' && - is_date(num3, num, num2, refuse_future, now, tm)) - break; - /* European dd.mm.yy[yy] or funny US dd/mm/yy[yy] */ - if (is_date(num3, num2, num, refuse_future, now, tm)) - break; - /* Funny European mm.dd.yy */ - if (c == '.' && - is_date(num3, num, num2, refuse_future, now, tm)) - break; - return 0; - } - return end - date; -} - -/* - * Have we filled in any part of the time/date yet? - * We just do a binary 'and' to see if the sign bit - * is set in all the values. - */ -static int nodate(struct tm *tm) -{ - return (tm->tm_year & - tm->tm_mon & - tm->tm_mday & - tm->tm_hour & - tm->tm_min & - tm->tm_sec) < 0; -} - -/* - * We've seen a digit. Time? Year? Date? - */ -static size_t match_digit(const char *date, struct tm *tm, int *offset, int *tm_gmt) -{ - size_t n; - char *end; - unsigned long num; - - num = strtoul(date, &end, 10); - - /* - * Seconds since 1970? We trigger on that for any numbers with - * more than 8 digits. This is because we don't want to rule out - * numbers like 20070606 as a YYYYMMDD date. - */ - if (num >= 100000000 && nodate(tm)) { - time_t time = num; - if (p_gmtime_r(&time, tm)) { - *tm_gmt = 1; - return end - date; - } - } - - /* - * Check for special formats: num[-.:/]num[same]num - */ - switch (*end) { - case ':': - case '.': - case '/': - case '-': - if (isdigit(end[1])) { - size_t match = match_multi_number(num, *end, date, end, tm); - if (match) - return match; - } - } - - /* - * None of the special formats? Try to guess what - * the number meant. We use the number of digits - * to make a more educated guess.. - */ - n = 0; - do { - n++; - } while (isdigit(date[n])); - - /* Four-digit year or a timezone? */ - if (n == 4) { - if (num <= 1400 && *offset == -1) { - unsigned int minutes = num % 100; - unsigned int hours = num / 100; - *offset = hours*60 + minutes; - } else if (num > 1900 && num < 2100) - tm->tm_year = num - 1900; - return n; - } - - /* - * Ignore lots of numerals. We took care of 4-digit years above. - * Days or months must be one or two digits. - */ - if (n > 2) - return n; - - /* - * NOTE! We will give precedence to day-of-month over month or - * year numbers in the 1-12 range. So 05 is always "mday 5", - * unless we already have a mday.. - * - * IOW, 01 Apr 05 parses as "April 1st, 2005". - */ - if (num > 0 && num < 32 && tm->tm_mday < 0) { - tm->tm_mday = num; - return n; - } - - /* Two-digit year? */ - if (n == 2 && tm->tm_year < 0) { - if (num < 10 && tm->tm_mday >= 0) { - tm->tm_year = num + 100; - return n; - } - if (num >= 70) { - tm->tm_year = num; - return n; - } - } - - if (num > 0 && num < 13 && tm->tm_mon < 0) - tm->tm_mon = num-1; - - return n; -} - -static size_t match_tz(const char *date, int *offp) -{ - char *end; - int hour = strtoul(date + 1, &end, 10); - size_t n = end - (date + 1); - int min = 0; - - if (n == 4) { - /* hhmm */ - min = hour % 100; - hour = hour / 100; - } else if (n != 2) { - min = 99; /* random stuff */ - } else if (*end == ':') { - /* hh:mm? */ - min = strtoul(end + 1, &end, 10); - if (end - (date + 1) != 5) - min = 99; /* random stuff */ - } /* otherwise we parsed "hh" */ - - /* - * Don't accept any random stuff. Even though some places have - * offset larger than 12 hours (e.g. Pacific/Kiritimati is at - * UTC+14), there is something wrong if hour part is much - * larger than that. We might also want to check that the - * minutes are divisible by 15 or something too. (Offset of - * Kathmandu, Nepal is UTC+5:45) - */ - if (min < 60 && hour < 24) { - int offset = hour * 60 + min; - if (*date == '-') - offset = -offset; - *offp = offset; - } - return end - date; -} - -/* - * Parse a string like "0 +0000" as ancient timestamp near epoch, but - * only when it appears not as part of any other string. - */ -static int match_object_header_date(const char *date, git_time_t *timestamp, int *offset) -{ - char *end; - unsigned long stamp; - int ofs; - - if (*date < '0' || '9' <= *date) - return -1; - stamp = strtoul(date, &end, 10); - if (*end != ' ' || stamp == ULONG_MAX || (end[1] != '+' && end[1] != '-')) - return -1; - date = end + 2; - ofs = strtol(date, &end, 10); - if ((*end != '\0' && (*end != '\n')) || end != date + 4) - return -1; - ofs = (ofs / 100) * 60 + (ofs % 100); - if (date[-1] == '-') - ofs = -ofs; - *timestamp = stamp; - *offset = ofs; - return 0; -} - -/* Gr. strptime is crap for this; it doesn't have a way to require RFC2822 - (i.e. English) day/month names, and it doesn't work correctly with %z. */ -static int parse_date_basic(const char *date, git_time_t *timestamp, int *offset) -{ - struct tm tm; - int tm_gmt; - git_time_t dummy_timestamp; - int dummy_offset; - - if (!timestamp) - timestamp = &dummy_timestamp; - if (!offset) - offset = &dummy_offset; - - memset(&tm, 0, sizeof(tm)); - tm.tm_year = -1; - tm.tm_mon = -1; - tm.tm_mday = -1; - tm.tm_isdst = -1; - tm.tm_hour = -1; - tm.tm_min = -1; - tm.tm_sec = -1; - *offset = -1; - tm_gmt = 0; - - if (*date == '@' && - !match_object_header_date(date + 1, timestamp, offset)) - return 0; /* success */ - for (;;) { - size_t match = 0; - unsigned char c = *date; - - /* Stop at end of string or newline */ - if (!c || c == '\n') - break; - - if (isalpha(c)) - match = match_alpha(date, &tm, offset); - else if (isdigit(c)) - match = match_digit(date, &tm, offset, &tm_gmt); - else if ((c == '-' || c == '+') && isdigit(date[1])) - match = match_tz(date, offset); - - if (!match) { - /* BAD */ - match = 1; - } - - date += match; - } - - /* mktime uses local timezone */ - *timestamp = tm_to_time_t(&tm); - if (*offset == -1) - *offset = (int)((time_t)*timestamp - mktime(&tm)) / 60; - - if (*timestamp == (git_time_t)-1) - return -1; - - if (!tm_gmt) - *timestamp -= *offset * 60; - return 0; /* success */ -} - - -/* - * Relative time update (eg "2 days ago"). If we haven't set the time - * yet, we need to set it from current time. - */ -static git_time_t update_tm(struct tm *tm, struct tm *now, unsigned long sec) -{ - time_t n; - - if (tm->tm_mday < 0) - tm->tm_mday = now->tm_mday; - if (tm->tm_mon < 0) - tm->tm_mon = now->tm_mon; - if (tm->tm_year < 0) { - tm->tm_year = now->tm_year; - if (tm->tm_mon > now->tm_mon) - tm->tm_year--; - } - - n = mktime(tm) - sec; - p_localtime_r(&n, tm); - return n; -} - -static void date_now(struct tm *tm, struct tm *now, int *num) -{ - GIT_UNUSED(num); - update_tm(tm, now, 0); -} - -static void date_yesterday(struct tm *tm, struct tm *now, int *num) -{ - GIT_UNUSED(num); - update_tm(tm, now, 24*60*60); -} - -static void date_time(struct tm *tm, struct tm *now, int hour) -{ - if (tm->tm_hour < hour) - date_yesterday(tm, now, NULL); - tm->tm_hour = hour; - tm->tm_min = 0; - tm->tm_sec = 0; -} - -static void date_midnight(struct tm *tm, struct tm *now, int *num) -{ - GIT_UNUSED(num); - date_time(tm, now, 0); -} - -static void date_noon(struct tm *tm, struct tm *now, int *num) -{ - GIT_UNUSED(num); - date_time(tm, now, 12); -} - -static void date_tea(struct tm *tm, struct tm *now, int *num) -{ - GIT_UNUSED(num); - date_time(tm, now, 17); -} - -static void date_pm(struct tm *tm, struct tm *now, int *num) -{ - int hour, n = *num; - *num = 0; - GIT_UNUSED(now); - - hour = tm->tm_hour; - if (n) { - hour = n; - tm->tm_min = 0; - tm->tm_sec = 0; - } - tm->tm_hour = (hour % 12) + 12; -} - -static void date_am(struct tm *tm, struct tm *now, int *num) -{ - int hour, n = *num; - *num = 0; - GIT_UNUSED(now); - - hour = tm->tm_hour; - if (n) { - hour = n; - tm->tm_min = 0; - tm->tm_sec = 0; - } - tm->tm_hour = (hour % 12); -} - -static void date_never(struct tm *tm, struct tm *now, int *num) -{ - time_t n = 0; - GIT_UNUSED(now); - GIT_UNUSED(num); - p_localtime_r(&n, tm); -} - -static const struct special { - const char *name; - void (*fn)(struct tm *, struct tm *, int *); -} special[] = { - { "yesterday", date_yesterday }, - { "noon", date_noon }, - { "midnight", date_midnight }, - { "tea", date_tea }, - { "PM", date_pm }, - { "AM", date_am }, - { "never", date_never }, - { "now", date_now }, - { NULL } -}; - -static const char *number_name[] = { - "zero", "one", "two", "three", "four", - "five", "six", "seven", "eight", "nine", "ten", -}; - -static const struct typelen { - const char *type; - int length; -} typelen[] = { - { "seconds", 1 }, - { "minutes", 60 }, - { "hours", 60*60 }, - { "days", 24*60*60 }, - { "weeks", 7*24*60*60 }, - { NULL } -}; - -static const char *approxidate_alpha(const char *date, struct tm *tm, struct tm *now, int *num, int *touched) -{ - const struct typelen *tl; - const struct special *s; - const char *end = date; - int i; - - while (isalpha(*++end)) - /* scan to non-alpha */; - - for (i = 0; i < 12; i++) { - size_t match = match_string(date, month_names[i]); - if (match >= 3) { - tm->tm_mon = i; - *touched = 1; - return end; - } - } - - for (s = special; s->name; s++) { - size_t len = strlen(s->name); - if (match_string(date, s->name) == len) { - s->fn(tm, now, num); - *touched = 1; - return end; - } - } - - if (!*num) { - for (i = 1; i < 11; i++) { - size_t len = strlen(number_name[i]); - if (match_string(date, number_name[i]) == len) { - *num = i; - *touched = 1; - return end; - } - } - if (match_string(date, "last") == 4) { - *num = 1; - *touched = 1; - } - return end; - } - - tl = typelen; - while (tl->type) { - size_t len = strlen(tl->type); - if (match_string(date, tl->type) >= len-1) { - update_tm(tm, now, tl->length * *num); - *num = 0; - *touched = 1; - return end; - } - tl++; - } - - for (i = 0; i < 7; i++) { - size_t match = match_string(date, weekday_names[i]); - if (match >= 3) { - int diff, n = *num -1; - *num = 0; - - diff = tm->tm_wday - i; - if (diff <= 0) - n++; - diff += 7*n; - - update_tm(tm, now, diff * 24 * 60 * 60); - *touched = 1; - return end; - } - } - - if (match_string(date, "months") >= 5) { - int n; - update_tm(tm, now, 0); /* fill in date fields if needed */ - n = tm->tm_mon - *num; - *num = 0; - while (n < 0) { - n += 12; - tm->tm_year--; - } - tm->tm_mon = n; - *touched = 1; - return end; - } - - if (match_string(date, "years") >= 4) { - update_tm(tm, now, 0); /* fill in date fields if needed */ - tm->tm_year -= *num; - *num = 0; - *touched = 1; - return end; - } - - return end; -} - -static const char *approxidate_digit(const char *date, struct tm *tm, int *num) -{ - char *end; - unsigned long number = strtoul(date, &end, 10); - - switch (*end) { - case ':': - case '.': - case '/': - case '-': - if (isdigit(end[1])) { - size_t match = match_multi_number(number, *end, date, end, tm); - if (match) - return date + match; - } - } - - /* Accept zero-padding only for small numbers ("Dec 02", never "Dec 0002") */ - if (date[0] != '0' || end - date <= 2) - *num = number; - return end; -} - -/* - * Do we have a pending number at the end, or when - * we see a new one? Let's assume it's a month day, - * as in "Dec 6, 1992" - */ -static void pending_number(struct tm *tm, int *num) -{ - int number = *num; - - if (number) { - *num = 0; - if (tm->tm_mday < 0 && number < 32) - tm->tm_mday = number; - else if (tm->tm_mon < 0 && number < 13) - tm->tm_mon = number-1; - else if (tm->tm_year < 0) { - if (number > 1969 && number < 2100) - tm->tm_year = number - 1900; - else if (number > 69 && number < 100) - tm->tm_year = number; - else if (number < 38) - tm->tm_year = 100 + number; - /* We mess up for number = 00 ? */ - } - } -} - -static git_time_t approxidate_str(const char *date, - time_t time_sec, - int *error_ret) -{ - int number = 0; - int touched = 0; - struct tm tm = {0}, now; - - p_localtime_r(&time_sec, &tm); - now = tm; - - tm.tm_year = -1; - tm.tm_mon = -1; - tm.tm_mday = -1; - - for (;;) { - unsigned char c = *date; - if (!c) - break; - date++; - if (isdigit(c)) { - pending_number(&tm, &number); - date = approxidate_digit(date-1, &tm, &number); - touched = 1; - continue; - } - if (isalpha(c)) - date = approxidate_alpha(date-1, &tm, &now, &number, &touched); - } - pending_number(&tm, &number); - if (!touched) - *error_ret = 1; - return update_tm(&tm, &now, 0); -} - -int git__date_parse(git_time_t *out, const char *date) -{ - time_t time_sec; - git_time_t timestamp; - int offset, error_ret=0; - - if (!parse_date_basic(date, ×tamp, &offset)) { - *out = timestamp; - return 0; - } - - if (time(&time_sec) == -1) - return -1; - - *out = approxidate_str(date, time_sec, &error_ret); - return error_ret; -} - -int git__date_rfc2822_fmt(char *out, size_t len, const git_time *date) -{ - int written; - struct tm gmt; - time_t t; - - assert(out && date); - - t = (time_t) (date->time + date->offset * 60); - - if (p_gmtime_r (&t, &gmt) == NULL) - return -1; - - written = p_snprintf(out, len, "%.3s, %u %.3s %.4u %02u:%02u:%02u %+03d%02d", - weekday_names[gmt.tm_wday], - gmt.tm_mday, - month_names[gmt.tm_mon], - gmt.tm_year + 1900, - gmt.tm_hour, gmt.tm_min, gmt.tm_sec, - date->offset / 60, date->offset % 60); - - if (written < 0 || (written > (int) len - 1)) - return -1; - - return 0; -} - diff --git a/vendor/libgit2/src/delta-apply.c b/vendor/libgit2/src/delta-apply.c deleted file mode 100644 index 89745faa0..000000000 --- a/vendor/libgit2/src/delta-apply.c +++ /dev/null @@ -1,135 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#include "common.h" -#include "git2/odb.h" -#include "delta-apply.h" - -/* - * This file was heavily cribbed from BinaryDelta.java in JGit, which - * itself was heavily cribbed from patch-delta.c in the - * GIT project. The original delta patching code was written by - * Nicolas Pitre . - */ - -static int hdr_sz( - size_t *size, - const unsigned char **delta, - const unsigned char *end) -{ - const unsigned char *d = *delta; - size_t r = 0; - unsigned int c, shift = 0; - - do { - if (d == end) - return -1; - c = *d++; - r |= (c & 0x7f) << shift; - shift += 7; - } while (c & 0x80); - *delta = d; - *size = r; - return 0; -} - -int git__delta_read_header( - const unsigned char *delta, - size_t delta_len, - size_t *base_sz, - size_t *res_sz) -{ - const unsigned char *delta_end = delta + delta_len; - if ((hdr_sz(base_sz, &delta, delta_end) < 0) || - (hdr_sz(res_sz, &delta, delta_end) < 0)) - return -1; - return 0; -} - -int git__delta_apply( - git_rawobj *out, - const unsigned char *base, - size_t base_len, - const unsigned char *delta, - size_t delta_len) -{ - const unsigned char *delta_end = delta + delta_len; - size_t base_sz, res_sz, alloc_sz; - unsigned char *res_dp; - - /* Check that the base size matches the data we were given; - * if not we would underflow while accessing data from the - * base object, resulting in data corruption or segfault. - */ - if ((hdr_sz(&base_sz, &delta, delta_end) < 0) || (base_sz != base_len)) { - giterr_set(GITERR_INVALID, "Failed to apply delta. Base size does not match given data"); - return -1; - } - - if (hdr_sz(&res_sz, &delta, delta_end) < 0) { - giterr_set(GITERR_INVALID, "Failed to apply delta. Base size does not match given data"); - return -1; - } - - GITERR_CHECK_ALLOC_ADD(&alloc_sz, res_sz, 1); - res_dp = git__malloc(alloc_sz); - GITERR_CHECK_ALLOC(res_dp); - - res_dp[res_sz] = '\0'; - out->data = res_dp; - out->len = res_sz; - - while (delta < delta_end) { - unsigned char cmd = *delta++; - if (cmd & 0x80) { - /* cmd is a copy instruction; copy from the base. - */ - size_t off = 0, len = 0; - - if (cmd & 0x01) off = *delta++; - if (cmd & 0x02) off |= *delta++ << 8; - if (cmd & 0x04) off |= *delta++ << 16; - if (cmd & 0x08) off |= *delta++ << 24; - - if (cmd & 0x10) len = *delta++; - if (cmd & 0x20) len |= *delta++ << 8; - if (cmd & 0x40) len |= *delta++ << 16; - if (!len) len = 0x10000; - - if (base_len < off + len || res_sz < len) - goto fail; - memcpy(res_dp, base + off, len); - res_dp += len; - res_sz -= len; - - } else if (cmd) { - /* cmd is a literal insert instruction; copy from - * the delta stream itself. - */ - if (delta_end - delta < cmd || res_sz < cmd) - goto fail; - memcpy(res_dp, delta, cmd); - delta += cmd; - res_dp += cmd; - res_sz -= cmd; - - } else { - /* cmd == 0 is reserved for future encodings. - */ - goto fail; - } - } - - if (delta != delta_end || res_sz) - goto fail; - return 0; - -fail: - git__free(out->data); - out->data = NULL; - giterr_set(GITERR_INVALID, "Failed to apply delta"); - return -1; -} diff --git a/vendor/libgit2/src/delta-apply.h b/vendor/libgit2/src/delta-apply.h deleted file mode 100644 index d7d99d04c..000000000 --- a/vendor/libgit2/src/delta-apply.h +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_delta_apply_h__ -#define INCLUDE_delta_apply_h__ - -#include "odb.h" - -/** - * Apply a git binary delta to recover the original content. - * - * @param out the output buffer to receive the original data. - * Only out->data and out->len are populated, as this is - * the only information available in the delta. - * @param base the base to copy from during copy instructions. - * @param base_len number of bytes available at base. - * @param delta the delta to execute copy/insert instructions from. - * @param delta_len total number of bytes in the delta. - * @return - * - 0 on a successful delta unpack. - * - GIT_ERROR if the delta is corrupt or doesn't match the base. - */ -extern int git__delta_apply( - git_rawobj *out, - const unsigned char *base, - size_t base_len, - const unsigned char *delta, - size_t delta_len); - -/** - * Read the header of a git binary delta. - * - * @param delta the delta to execute copy/insert instructions from. - * @param delta_len total number of bytes in the delta. - * @param base_sz pointer to store the base size field. - * @param res_sz pointer to store the result size field. - * @return - * - 0 on a successful decoding the header. - * - GIT_ERROR if the delta is corrupt. - */ -extern int git__delta_read_header( - const unsigned char *delta, - size_t delta_len, - size_t *base_sz, - size_t *res_sz); - -#endif diff --git a/vendor/libgit2/src/delta.c b/vendor/libgit2/src/delta.c deleted file mode 100644 index d72d820d8..000000000 --- a/vendor/libgit2/src/delta.c +++ /dev/null @@ -1,443 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "delta.h" - -/* maximum hash entry list for the same hash bucket */ -#define HASH_LIMIT 64 - -#define RABIN_SHIFT 23 -#define RABIN_WINDOW 16 - -static const unsigned int T[256] = { - 0x00000000, 0xab59b4d1, 0x56b369a2, 0xfdeadd73, 0x063f6795, 0xad66d344, - 0x508c0e37, 0xfbd5bae6, 0x0c7ecf2a, 0xa7277bfb, 0x5acda688, 0xf1941259, - 0x0a41a8bf, 0xa1181c6e, 0x5cf2c11d, 0xf7ab75cc, 0x18fd9e54, 0xb3a42a85, - 0x4e4ef7f6, 0xe5174327, 0x1ec2f9c1, 0xb59b4d10, 0x48719063, 0xe32824b2, - 0x1483517e, 0xbfdae5af, 0x423038dc, 0xe9698c0d, 0x12bc36eb, 0xb9e5823a, - 0x440f5f49, 0xef56eb98, 0x31fb3ca8, 0x9aa28879, 0x6748550a, 0xcc11e1db, - 0x37c45b3d, 0x9c9defec, 0x6177329f, 0xca2e864e, 0x3d85f382, 0x96dc4753, - 0x6b369a20, 0xc06f2ef1, 0x3bba9417, 0x90e320c6, 0x6d09fdb5, 0xc6504964, - 0x2906a2fc, 0x825f162d, 0x7fb5cb5e, 0xd4ec7f8f, 0x2f39c569, 0x846071b8, - 0x798aaccb, 0xd2d3181a, 0x25786dd6, 0x8e21d907, 0x73cb0474, 0xd892b0a5, - 0x23470a43, 0x881ebe92, 0x75f463e1, 0xdeadd730, 0x63f67950, 0xc8afcd81, - 0x354510f2, 0x9e1ca423, 0x65c91ec5, 0xce90aa14, 0x337a7767, 0x9823c3b6, - 0x6f88b67a, 0xc4d102ab, 0x393bdfd8, 0x92626b09, 0x69b7d1ef, 0xc2ee653e, - 0x3f04b84d, 0x945d0c9c, 0x7b0be704, 0xd05253d5, 0x2db88ea6, 0x86e13a77, - 0x7d348091, 0xd66d3440, 0x2b87e933, 0x80de5de2, 0x7775282e, 0xdc2c9cff, - 0x21c6418c, 0x8a9ff55d, 0x714a4fbb, 0xda13fb6a, 0x27f92619, 0x8ca092c8, - 0x520d45f8, 0xf954f129, 0x04be2c5a, 0xafe7988b, 0x5432226d, 0xff6b96bc, - 0x02814bcf, 0xa9d8ff1e, 0x5e738ad2, 0xf52a3e03, 0x08c0e370, 0xa39957a1, - 0x584ced47, 0xf3155996, 0x0eff84e5, 0xa5a63034, 0x4af0dbac, 0xe1a96f7d, - 0x1c43b20e, 0xb71a06df, 0x4ccfbc39, 0xe79608e8, 0x1a7cd59b, 0xb125614a, - 0x468e1486, 0xedd7a057, 0x103d7d24, 0xbb64c9f5, 0x40b17313, 0xebe8c7c2, - 0x16021ab1, 0xbd5bae60, 0x6cb54671, 0xc7ecf2a0, 0x3a062fd3, 0x915f9b02, - 0x6a8a21e4, 0xc1d39535, 0x3c394846, 0x9760fc97, 0x60cb895b, 0xcb923d8a, - 0x3678e0f9, 0x9d215428, 0x66f4eece, 0xcdad5a1f, 0x3047876c, 0x9b1e33bd, - 0x7448d825, 0xdf116cf4, 0x22fbb187, 0x89a20556, 0x7277bfb0, 0xd92e0b61, - 0x24c4d612, 0x8f9d62c3, 0x7836170f, 0xd36fa3de, 0x2e857ead, 0x85dcca7c, - 0x7e09709a, 0xd550c44b, 0x28ba1938, 0x83e3ade9, 0x5d4e7ad9, 0xf617ce08, - 0x0bfd137b, 0xa0a4a7aa, 0x5b711d4c, 0xf028a99d, 0x0dc274ee, 0xa69bc03f, - 0x5130b5f3, 0xfa690122, 0x0783dc51, 0xacda6880, 0x570fd266, 0xfc5666b7, - 0x01bcbbc4, 0xaae50f15, 0x45b3e48d, 0xeeea505c, 0x13008d2f, 0xb85939fe, - 0x438c8318, 0xe8d537c9, 0x153feaba, 0xbe665e6b, 0x49cd2ba7, 0xe2949f76, - 0x1f7e4205, 0xb427f6d4, 0x4ff24c32, 0xe4abf8e3, 0x19412590, 0xb2189141, - 0x0f433f21, 0xa41a8bf0, 0x59f05683, 0xf2a9e252, 0x097c58b4, 0xa225ec65, - 0x5fcf3116, 0xf49685c7, 0x033df00b, 0xa86444da, 0x558e99a9, 0xfed72d78, - 0x0502979e, 0xae5b234f, 0x53b1fe3c, 0xf8e84aed, 0x17bea175, 0xbce715a4, - 0x410dc8d7, 0xea547c06, 0x1181c6e0, 0xbad87231, 0x4732af42, 0xec6b1b93, - 0x1bc06e5f, 0xb099da8e, 0x4d7307fd, 0xe62ab32c, 0x1dff09ca, 0xb6a6bd1b, - 0x4b4c6068, 0xe015d4b9, 0x3eb80389, 0x95e1b758, 0x680b6a2b, 0xc352defa, - 0x3887641c, 0x93ded0cd, 0x6e340dbe, 0xc56db96f, 0x32c6cca3, 0x999f7872, - 0x6475a501, 0xcf2c11d0, 0x34f9ab36, 0x9fa01fe7, 0x624ac294, 0xc9137645, - 0x26459ddd, 0x8d1c290c, 0x70f6f47f, 0xdbaf40ae, 0x207afa48, 0x8b234e99, - 0x76c993ea, 0xdd90273b, 0x2a3b52f7, 0x8162e626, 0x7c883b55, 0xd7d18f84, - 0x2c043562, 0x875d81b3, 0x7ab75cc0, 0xd1eee811 -}; - -static const unsigned int U[256] = { - 0x00000000, 0x7eb5200d, 0x5633f4cb, 0x2886d4c6, 0x073e5d47, 0x798b7d4a, - 0x510da98c, 0x2fb88981, 0x0e7cba8e, 0x70c99a83, 0x584f4e45, 0x26fa6e48, - 0x0942e7c9, 0x77f7c7c4, 0x5f711302, 0x21c4330f, 0x1cf9751c, 0x624c5511, - 0x4aca81d7, 0x347fa1da, 0x1bc7285b, 0x65720856, 0x4df4dc90, 0x3341fc9d, - 0x1285cf92, 0x6c30ef9f, 0x44b63b59, 0x3a031b54, 0x15bb92d5, 0x6b0eb2d8, - 0x4388661e, 0x3d3d4613, 0x39f2ea38, 0x4747ca35, 0x6fc11ef3, 0x11743efe, - 0x3eccb77f, 0x40799772, 0x68ff43b4, 0x164a63b9, 0x378e50b6, 0x493b70bb, - 0x61bda47d, 0x1f088470, 0x30b00df1, 0x4e052dfc, 0x6683f93a, 0x1836d937, - 0x250b9f24, 0x5bbebf29, 0x73386bef, 0x0d8d4be2, 0x2235c263, 0x5c80e26e, - 0x740636a8, 0x0ab316a5, 0x2b7725aa, 0x55c205a7, 0x7d44d161, 0x03f1f16c, - 0x2c4978ed, 0x52fc58e0, 0x7a7a8c26, 0x04cfac2b, 0x73e5d470, 0x0d50f47d, - 0x25d620bb, 0x5b6300b6, 0x74db8937, 0x0a6ea93a, 0x22e87dfc, 0x5c5d5df1, - 0x7d996efe, 0x032c4ef3, 0x2baa9a35, 0x551fba38, 0x7aa733b9, 0x041213b4, - 0x2c94c772, 0x5221e77f, 0x6f1ca16c, 0x11a98161, 0x392f55a7, 0x479a75aa, - 0x6822fc2b, 0x1697dc26, 0x3e1108e0, 0x40a428ed, 0x61601be2, 0x1fd53bef, - 0x3753ef29, 0x49e6cf24, 0x665e46a5, 0x18eb66a8, 0x306db26e, 0x4ed89263, - 0x4a173e48, 0x34a21e45, 0x1c24ca83, 0x6291ea8e, 0x4d29630f, 0x339c4302, - 0x1b1a97c4, 0x65afb7c9, 0x446b84c6, 0x3adea4cb, 0x1258700d, 0x6ced5000, - 0x4355d981, 0x3de0f98c, 0x15662d4a, 0x6bd30d47, 0x56ee4b54, 0x285b6b59, - 0x00ddbf9f, 0x7e689f92, 0x51d01613, 0x2f65361e, 0x07e3e2d8, 0x7956c2d5, - 0x5892f1da, 0x2627d1d7, 0x0ea10511, 0x7014251c, 0x5facac9d, 0x21198c90, - 0x099f5856, 0x772a785b, 0x4c921c31, 0x32273c3c, 0x1aa1e8fa, 0x6414c8f7, - 0x4bac4176, 0x3519617b, 0x1d9fb5bd, 0x632a95b0, 0x42eea6bf, 0x3c5b86b2, - 0x14dd5274, 0x6a687279, 0x45d0fbf8, 0x3b65dbf5, 0x13e30f33, 0x6d562f3e, - 0x506b692d, 0x2ede4920, 0x06589de6, 0x78edbdeb, 0x5755346a, 0x29e01467, - 0x0166c0a1, 0x7fd3e0ac, 0x5e17d3a3, 0x20a2f3ae, 0x08242768, 0x76910765, - 0x59298ee4, 0x279caee9, 0x0f1a7a2f, 0x71af5a22, 0x7560f609, 0x0bd5d604, - 0x235302c2, 0x5de622cf, 0x725eab4e, 0x0ceb8b43, 0x246d5f85, 0x5ad87f88, - 0x7b1c4c87, 0x05a96c8a, 0x2d2fb84c, 0x539a9841, 0x7c2211c0, 0x029731cd, - 0x2a11e50b, 0x54a4c506, 0x69998315, 0x172ca318, 0x3faa77de, 0x411f57d3, - 0x6ea7de52, 0x1012fe5f, 0x38942a99, 0x46210a94, 0x67e5399b, 0x19501996, - 0x31d6cd50, 0x4f63ed5d, 0x60db64dc, 0x1e6e44d1, 0x36e89017, 0x485db01a, - 0x3f77c841, 0x41c2e84c, 0x69443c8a, 0x17f11c87, 0x38499506, 0x46fcb50b, - 0x6e7a61cd, 0x10cf41c0, 0x310b72cf, 0x4fbe52c2, 0x67388604, 0x198da609, - 0x36352f88, 0x48800f85, 0x6006db43, 0x1eb3fb4e, 0x238ebd5d, 0x5d3b9d50, - 0x75bd4996, 0x0b08699b, 0x24b0e01a, 0x5a05c017, 0x728314d1, 0x0c3634dc, - 0x2df207d3, 0x534727de, 0x7bc1f318, 0x0574d315, 0x2acc5a94, 0x54797a99, - 0x7cffae5f, 0x024a8e52, 0x06852279, 0x78300274, 0x50b6d6b2, 0x2e03f6bf, - 0x01bb7f3e, 0x7f0e5f33, 0x57888bf5, 0x293dabf8, 0x08f998f7, 0x764cb8fa, - 0x5eca6c3c, 0x207f4c31, 0x0fc7c5b0, 0x7172e5bd, 0x59f4317b, 0x27411176, - 0x1a7c5765, 0x64c97768, 0x4c4fa3ae, 0x32fa83a3, 0x1d420a22, 0x63f72a2f, - 0x4b71fee9, 0x35c4dee4, 0x1400edeb, 0x6ab5cde6, 0x42331920, 0x3c86392d, - 0x133eb0ac, 0x6d8b90a1, 0x450d4467, 0x3bb8646a -}; - -struct index_entry { - const unsigned char *ptr; - unsigned int val; - struct index_entry *next; -}; - -struct git_delta_index { - unsigned long memsize; - const void *src_buf; - unsigned long src_size; - unsigned int hash_mask; - struct index_entry *hash[GIT_FLEX_ARRAY]; -}; - -static int lookup_index_alloc( - void **out, unsigned long *out_len, size_t entries, size_t hash_count) -{ - size_t entries_len, hash_len, index_len; - - GITERR_CHECK_ALLOC_MULTIPLY(&entries_len, entries, sizeof(struct index_entry)); - GITERR_CHECK_ALLOC_MULTIPLY(&hash_len, hash_count, sizeof(struct index_entry *)); - - GITERR_CHECK_ALLOC_ADD(&index_len, sizeof(struct git_delta_index), entries_len); - GITERR_CHECK_ALLOC_ADD(&index_len, index_len, hash_len); - - if (!git__is_ulong(index_len)) { - giterr_set(GITERR_NOMEMORY, "Overly large delta"); - return -1; - } - - *out = git__malloc(index_len); - GITERR_CHECK_ALLOC(*out); - - *out_len = index_len; - return 0; -} - -struct git_delta_index * -git_delta_create_index(const void *buf, unsigned long bufsize) -{ - unsigned int i, hsize, hmask, entries, prev_val, *hash_count; - const unsigned char *data, *buffer = buf; - struct git_delta_index *index; - struct index_entry *entry, **hash; - void *mem; - unsigned long memsize; - - if (!buf || !bufsize) - return NULL; - - /* Determine index hash size. Note that indexing skips the - first byte to allow for optimizing the rabin polynomial - initialization in create_delta(). */ - entries = (unsigned int)(bufsize - 1) / RABIN_WINDOW; - if (bufsize >= 0xffffffffUL) { - /* - * Current delta format can't encode offsets into - * reference buffer with more than 32 bits. - */ - entries = 0xfffffffeU / RABIN_WINDOW; - } - hsize = entries / 4; - for (i = 4; i < 31 && (1u << i) < hsize; i++); - hsize = 1 << i; - hmask = hsize - 1; - - if (lookup_index_alloc(&mem, &memsize, entries, hsize) < 0) - return NULL; - - index = mem; - mem = index->hash; - hash = mem; - mem = hash + hsize; - entry = mem; - - index->memsize = memsize; - index->src_buf = buf; - index->src_size = bufsize; - index->hash_mask = hmask; - memset(hash, 0, hsize * sizeof(*hash)); - - /* allocate an array to count hash entries */ - hash_count = git__calloc(hsize, sizeof(*hash_count)); - if (!hash_count) { - git__free(index); - return NULL; - } - - /* then populate the index */ - prev_val = ~0; - for (data = buffer + entries * RABIN_WINDOW - RABIN_WINDOW; - data >= buffer; - data -= RABIN_WINDOW) { - unsigned int val = 0; - for (i = 1; i <= RABIN_WINDOW; i++) - val = ((val << 8) | data[i]) ^ T[val >> RABIN_SHIFT]; - if (val == prev_val) { - /* keep the lowest of consecutive identical blocks */ - entry[-1].ptr = data + RABIN_WINDOW; - } else { - prev_val = val; - i = val & hmask; - entry->ptr = data + RABIN_WINDOW; - entry->val = val; - entry->next = hash[i]; - hash[i] = entry++; - hash_count[i]++; - } - } - - /* - * Determine a limit on the number of entries in the same hash - * bucket. This guard us against patological data sets causing - * really bad hash distribution with most entries in the same hash - * bucket that would bring us to O(m*n) computing costs (m and n - * corresponding to reference and target buffer sizes). - * - * Make sure none of the hash buckets has more entries than - * we're willing to test. Otherwise we cull the entry list - * uniformly to still preserve a good repartition across - * the reference buffer. - */ - for (i = 0; i < hsize; i++) { - if (hash_count[i] < HASH_LIMIT) - continue; - - entry = hash[i]; - do { - struct index_entry *keep = entry; - int skip = hash_count[i] / HASH_LIMIT / 2; - do { - entry = entry->next; - } while(--skip && entry); - keep->next = entry; - } while (entry); - } - git__free(hash_count); - - return index; -} - -void git_delta_free_index(struct git_delta_index *index) -{ - git__free(index); -} - -unsigned long git_delta_sizeof_index(struct git_delta_index *index) -{ - if (index) - return index->memsize; - else - return 0; -} - -/* - * The maximum size for any opcode sequence, including the initial header - * plus rabin window plus biggest copy. - */ -#define MAX_OP_SIZE (5 + 5 + 1 + RABIN_WINDOW + 7) - -void * -git_delta_create( - const struct git_delta_index *index, - const void *trg_buf, - unsigned long trg_size, - unsigned long *delta_size, - unsigned long max_size) -{ - unsigned int i, outpos, outsize, moff, msize, val; - int inscnt; - const unsigned char *ref_data, *ref_top, *data, *top; - unsigned char *out; - - if (!trg_buf || !trg_size) - return NULL; - - outpos = 0; - outsize = 8192; - if (max_size && outsize >= max_size) - outsize = (unsigned int)(max_size + MAX_OP_SIZE + 1); - out = git__malloc(outsize); - if (!out) - return NULL; - - /* store reference buffer size */ - i = index->src_size; - while (i >= 0x80) { - out[outpos++] = i | 0x80; - i >>= 7; - } - out[outpos++] = i; - - /* store target buffer size */ - i = trg_size; - while (i >= 0x80) { - out[outpos++] = i | 0x80; - i >>= 7; - } - out[outpos++] = i; - - ref_data = index->src_buf; - ref_top = ref_data + index->src_size; - data = trg_buf; - top = (const unsigned char *) trg_buf + trg_size; - - outpos++; - val = 0; - for (i = 0; i < RABIN_WINDOW && data < top; i++, data++) { - out[outpos++] = *data; - val = ((val << 8) | *data) ^ T[val >> RABIN_SHIFT]; - } - inscnt = i; - - moff = 0; - msize = 0; - while (data < top) { - if (msize < 4096) { - struct index_entry *entry; - val ^= U[data[-RABIN_WINDOW]]; - val = ((val << 8) | *data) ^ T[val >> RABIN_SHIFT]; - i = val & index->hash_mask; - for (entry = index->hash[i]; entry; entry = entry->next) { - const unsigned char *ref = entry->ptr; - const unsigned char *src = data; - unsigned int ref_size = (unsigned int)(ref_top - ref); - if (entry->val != val) - continue; - if (ref_size > (unsigned int)(top - src)) - ref_size = (unsigned int)(top - src); - if (ref_size <= msize) - break; - while (ref_size-- && *src++ == *ref) - ref++; - if (msize < (unsigned int)(ref - entry->ptr)) { - /* this is our best match so far */ - msize = (unsigned int)(ref - entry->ptr); - moff = (unsigned int)(entry->ptr - ref_data); - if (msize >= 4096) /* good enough */ - break; - } - } - } - - if (msize < 4) { - if (!inscnt) - outpos++; - out[outpos++] = *data++; - inscnt++; - if (inscnt == 0x7f) { - out[outpos - inscnt - 1] = inscnt; - inscnt = 0; - } - msize = 0; - } else { - unsigned int left; - unsigned char *op; - - if (inscnt) { - while (moff && ref_data[moff-1] == data[-1]) { - /* we can match one byte back */ - msize++; - moff--; - data--; - outpos--; - if (--inscnt) - continue; - outpos--; /* remove count slot */ - inscnt--; /* make it -1 */ - break; - } - out[outpos - inscnt - 1] = inscnt; - inscnt = 0; - } - - /* A copy op is currently limited to 64KB (pack v2) */ - left = (msize < 0x10000) ? 0 : (msize - 0x10000); - msize -= left; - - op = out + outpos++; - i = 0x80; - - if (moff & 0x000000ff) - out[outpos++] = moff >> 0, i |= 0x01; - if (moff & 0x0000ff00) - out[outpos++] = moff >> 8, i |= 0x02; - if (moff & 0x00ff0000) - out[outpos++] = moff >> 16, i |= 0x04; - if (moff & 0xff000000) - out[outpos++] = moff >> 24, i |= 0x08; - - if (msize & 0x00ff) - out[outpos++] = msize >> 0, i |= 0x10; - if (msize & 0xff00) - out[outpos++] = msize >> 8, i |= 0x20; - - *op = i; - - data += msize; - moff += msize; - msize = left; - - if (msize < 4096) { - int j; - val = 0; - for (j = -RABIN_WINDOW; j < 0; j++) - val = ((val << 8) | data[j]) - ^ T[val >> RABIN_SHIFT]; - } - } - - if (outpos >= outsize - MAX_OP_SIZE) { - void *tmp = out; - outsize = outsize * 3 / 2; - if (max_size && outsize >= max_size) - outsize = max_size + MAX_OP_SIZE + 1; - if (max_size && outpos > max_size) - break; - out = git__realloc(out, outsize); - if (!out) { - git__free(tmp); - return NULL; - } - } - } - - if (inscnt) - out[outpos - inscnt - 1] = inscnt; - - if (max_size && outpos > max_size) { - git__free(out); - return NULL; - } - - *delta_size = outpos; - return out; -} diff --git a/vendor/libgit2/src/delta.h b/vendor/libgit2/src/delta.h deleted file mode 100644 index 4ca327992..000000000 --- a/vendor/libgit2/src/delta.h +++ /dev/null @@ -1,114 +0,0 @@ -/* - * diff-delta code taken from git.git. See diff-delta.c for details. - * - */ -#ifndef INCLUDE_git_delta_h__ -#define INCLUDE_git_delta_h__ - -#include "common.h" - -/* opaque object for delta index */ -struct git_delta_index; - -/* - * create_delta_index: compute index data from given buffer - * - * This returns a pointer to a struct delta_index that should be passed to - * subsequent create_delta() calls, or to free_delta_index(). A NULL pointer - * is returned on failure. The given buffer must not be freed nor altered - * before free_delta_index() is called. The returned pointer must be freed - * using free_delta_index(). - */ -extern struct git_delta_index * -git_delta_create_index(const void *buf, unsigned long bufsize); - -/* - * free_delta_index: free the index created by create_delta_index() - * - * Given pointer must be what create_delta_index() returned, or NULL. - */ -extern void git_delta_free_index(struct git_delta_index *index); - -/* - * sizeof_delta_index: returns memory usage of delta index - * - * Given pointer must be what create_delta_index() returned, or NULL. - */ -extern unsigned long git_delta_sizeof_index(struct git_delta_index *index); - -/* - * create_delta: create a delta from given index for the given buffer - * - * This function may be called multiple times with different buffers using - * the same delta_index pointer. If max_delta_size is non-zero and the - * resulting delta is to be larger than max_delta_size then NULL is returned. - * On success, a non-NULL pointer to the buffer with the delta data is - * returned and *delta_size is updated with its size. The returned buffer - * must be freed by the caller. - */ -extern void *git_delta_create( - const struct git_delta_index *index, - const void *buf, - unsigned long bufsize, - unsigned long *delta_size, - unsigned long max_delta_size); - -/* - * diff_delta: create a delta from source buffer to target buffer - * - * If max_delta_size is non-zero and the resulting delta is to be larger - * than max_delta_size then NULL is returned. On success, a non-NULL - * pointer to the buffer with the delta data is returned and *delta_size is - * updated with its size. The returned buffer must be freed by the caller. - */ -GIT_INLINE(void *) git_delta( - const void *src_buf, unsigned long src_bufsize, - const void *trg_buf, unsigned long trg_bufsize, - unsigned long *delta_size, - unsigned long max_delta_size) -{ - struct git_delta_index *index = git_delta_create_index(src_buf, src_bufsize); - if (index) { - void *delta = git_delta_create( - index, trg_buf, trg_bufsize, delta_size, max_delta_size); - git_delta_free_index(index); - return delta; - } - return NULL; -} - -/* - * patch_delta: recreate target buffer given source buffer and delta data - * - * On success, a non-NULL pointer to the target buffer is returned and - * *trg_bufsize is updated with its size. On failure a NULL pointer is - * returned. The returned buffer must be freed by the caller. - */ -extern void *git_delta_patch( - const void *src_buf, unsigned long src_size, - const void *delta_buf, unsigned long delta_size, - unsigned long *dst_size); - -/* the smallest possible delta size is 4 bytes */ -#define GIT_DELTA_SIZE_MIN 4 - -/* - * This must be called twice on the delta data buffer, first to get the - * expected source buffer size, and again to get the target buffer size. - */ -GIT_INLINE(unsigned long) git_delta_get_hdr_size( - const unsigned char **datap, const unsigned char *top) -{ - const unsigned char *data = *datap; - unsigned long cmd, size = 0; - int i = 0; - do { - cmd = *data++; - size |= (cmd & 0x7f) << i; - i += 7; - } while (cmd & 0x80 && data < top); - *datap = data; - return size; -} - -#endif diff --git a/vendor/libgit2/src/describe.c b/vendor/libgit2/src/describe.c deleted file mode 100644 index 13ddad5be..000000000 --- a/vendor/libgit2/src/describe.c +++ /dev/null @@ -1,893 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#include "git2/describe.h" -#include "git2/strarray.h" -#include "git2/diff.h" -#include "git2/status.h" - -#include "common.h" -#include "commit.h" -#include "commit_list.h" -#include "oidmap.h" -#include "refs.h" -#include "revwalk.h" -#include "tag.h" -#include "vector.h" -#include "repository.h" - -GIT__USE_OIDMAP - -/* Ported from https://github.com/git/git/blob/89dde7882f71f846ccd0359756d27bebc31108de/builtin/describe.c */ - -struct commit_name { - git_tag *tag; - unsigned prio:2; /* annotated tag = 2, tag = 1, head = 0 */ - unsigned name_checked:1; - git_oid sha1; - char *path; - - /* Khash workaround. They original key has to still be reachable */ - git_oid peeled; -}; - -static void *oidmap_value_bykey(git_oidmap *map, const git_oid *key) -{ - khint_t pos = git_oidmap_lookup_index(map, key); - - if (!git_oidmap_valid_index(map, pos)) - return NULL; - - return git_oidmap_value_at(map, pos); -} - -static struct commit_name *find_commit_name( - git_oidmap *names, - const git_oid *peeled) -{ - return (struct commit_name *)(oidmap_value_bykey(names, peeled)); -} - -static int replace_name( - git_tag **tag, - git_repository *repo, - struct commit_name *e, - unsigned int prio, - const git_oid *sha1) -{ - git_time_t e_time = 0, t_time = 0; - - if (!e || e->prio < prio) - return 1; - - if (e->prio == 2 && prio == 2) { - /* Multiple annotated tags point to the same commit. - * Select one to keep based upon their tagger date. - */ - git_tag *t = NULL; - - if (!e->tag) { - if (git_tag_lookup(&t, repo, &e->sha1) < 0) - return 1; - e->tag = t; - } - - if (git_tag_lookup(&t, repo, sha1) < 0) - return 0; - - *tag = t; - - if (e->tag->tagger) - e_time = e->tag->tagger->when.time; - - if (t->tagger) - t_time = t->tagger->when.time; - - if (e_time < t_time) - return 1; - } - - return 0; -} - -static int add_to_known_names( - git_repository *repo, - git_oidmap *names, - const char *path, - const git_oid *peeled, - unsigned int prio, - const git_oid *sha1) -{ - struct commit_name *e = find_commit_name(names, peeled); - bool found = (e != NULL); - - git_tag *tag = NULL; - if (replace_name(&tag, repo, e, prio, sha1)) { - if (!found) { - e = git__malloc(sizeof(struct commit_name)); - GITERR_CHECK_ALLOC(e); - - e->path = NULL; - e->tag = NULL; - } - - if (e->tag) - git_tag_free(e->tag); - e->tag = tag; - e->prio = prio; - e->name_checked = 0; - git_oid_cpy(&e->sha1, sha1); - git__free(e->path); - e->path = git__strdup(path); - git_oid_cpy(&e->peeled, peeled); - - if (!found) { - int ret; - - git_oidmap_insert(names, &e->peeled, e, ret); - if (ret < 0) - return -1; - } - } - else - git_tag_free(tag); - - return 0; -} - -static int retrieve_peeled_tag_or_object_oid( - git_oid *peeled_out, - git_oid *ref_target_out, - git_repository *repo, - const char *refname) -{ - git_reference *ref; - git_object *peeled = NULL; - int error; - - if ((error = git_reference_lookup_resolved(&ref, repo, refname, -1)) < 0) - return error; - - if ((error = git_reference_peel(&peeled, ref, GIT_OBJ_ANY)) < 0) - goto cleanup; - - git_oid_cpy(ref_target_out, git_reference_target(ref)); - git_oid_cpy(peeled_out, git_object_id(peeled)); - - if (git_oid_cmp(ref_target_out, peeled_out) != 0) - error = 1; /* The reference was pointing to a annotated tag */ - else - error = 0; /* Any other object */ - -cleanup: - git_reference_free(ref); - git_object_free(peeled); - return error; -} - -struct git_describe_result { - int dirty; - int exact_match; - int fallback_to_id; - git_oid commit_id; - git_repository *repo; - struct commit_name *name; - struct possible_tag *tag; -}; - -struct get_name_data -{ - git_describe_options *opts; - git_repository *repo; - git_oidmap *names; - git_describe_result *result; -}; - -static int commit_name_dup(struct commit_name **out, struct commit_name *in) -{ - struct commit_name *name; - - name = git__malloc(sizeof(struct commit_name)); - GITERR_CHECK_ALLOC(name); - - memcpy(name, in, sizeof(struct commit_name)); - name->tag = NULL; - name->path = NULL; - - if (in->tag && git_object_dup((git_object **) &name->tag, (git_object *) in->tag) < 0) - return -1; - - name->path = git__strdup(in->path); - GITERR_CHECK_ALLOC(name->path); - - *out = name; - return 0; -} - -static int get_name(const char *refname, void *payload) -{ - struct get_name_data *data; - bool is_tag, is_annotated, all; - git_oid peeled, sha1; - unsigned int prio; - int error = 0; - - data = (struct get_name_data *)payload; - is_tag = !git__prefixcmp(refname, GIT_REFS_TAGS_DIR); - all = data->opts->describe_strategy == GIT_DESCRIBE_ALL; - - /* Reject anything outside refs/tags/ unless --all */ - if (!all && !is_tag) - return 0; - - /* Accept only tags that match the pattern, if given */ - if (data->opts->pattern && (!is_tag || p_fnmatch(data->opts->pattern, - refname + strlen(GIT_REFS_TAGS_DIR), 0))) - return 0; - - /* Is it annotated? */ - if ((error = retrieve_peeled_tag_or_object_oid( - &peeled, &sha1, data->repo, refname)) < 0) - return error; - - is_annotated = error; - - /* - * By default, we only use annotated tags, but with --tags - * we fall back to lightweight ones (even without --tags, - * we still remember lightweight ones, only to give hints - * in an error message). --all allows any refs to be used. - */ - if (is_annotated) - prio = 2; - else if (is_tag) - prio = 1; - else - prio = 0; - - add_to_known_names(data->repo, data->names, - all ? refname + strlen(GIT_REFS_DIR) : refname + strlen(GIT_REFS_TAGS_DIR), - &peeled, prio, &sha1); - return 0; -} - -struct possible_tag { - struct commit_name *name; - int depth; - int found_order; - unsigned flag_within; -}; - -static int possible_tag_dup(struct possible_tag **out, struct possible_tag *in) -{ - struct possible_tag *tag; - int error; - - tag = git__malloc(sizeof(struct possible_tag)); - GITERR_CHECK_ALLOC(tag); - - memcpy(tag, in, sizeof(struct possible_tag)); - tag->name = NULL; - - if ((error = commit_name_dup(&tag->name, in->name)) < 0) { - git__free(tag); - *out = NULL; - return error; - } - - *out = tag; - return 0; -} - -static int compare_pt(const void *a_, const void *b_) -{ - struct possible_tag *a = (struct possible_tag *)a_; - struct possible_tag *b = (struct possible_tag *)b_; - if (a->depth != b->depth) - return a->depth - b->depth; - if (a->found_order != b->found_order) - return a->found_order - b->found_order; - return 0; -} - -#define SEEN (1u << 0) - -static unsigned long finish_depth_computation( - git_pqueue *list, - git_revwalk *walk, - struct possible_tag *best) -{ - unsigned long seen_commits = 0; - int error, i; - - while (git_pqueue_size(list) > 0) { - git_commit_list_node *c = git_pqueue_pop(list); - seen_commits++; - if (c->flags & best->flag_within) { - size_t index = 0; - while (git_pqueue_size(list) > index) { - git_commit_list_node *i = git_pqueue_get(list, index); - if (!(i->flags & best->flag_within)) - break; - index++; - } - if (index > git_pqueue_size(list)) - break; - } else - best->depth++; - for (i = 0; i < c->out_degree; i++) { - git_commit_list_node *p = c->parents[i]; - if ((error = git_commit_list_parse(walk, p)) < 0) - return error; - if (!(p->flags & SEEN)) - if ((error = git_pqueue_insert(list, p)) < 0) - return error; - p->flags |= c->flags; - } - } - return seen_commits; -} - -static int display_name(git_buf *buf, git_repository *repo, struct commit_name *n) -{ - if (n->prio == 2 && !n->tag) { - if (git_tag_lookup(&n->tag, repo, &n->sha1) < 0) { - giterr_set(GITERR_TAG, "Annotated tag '%s' not available", n->path); - return -1; - } - } - - if (n->tag && !n->name_checked) { - if (!git_tag_name(n->tag)) { - giterr_set(GITERR_TAG, "Annotated tag '%s' has no embedded name", n->path); - return -1; - } - - /* TODO: Cope with warnings - if (strcmp(n->tag->tag, all ? n->path + 5 : n->path)) - warning(_("tag '%s' is really '%s' here"), n->tag->tag, n->path); - */ - - n->name_checked = 1; - } - - if (n->tag) - git_buf_printf(buf, "%s", git_tag_name(n->tag)); - else - git_buf_printf(buf, "%s", n->path); - - return 0; -} - -static int find_unique_abbrev_size( - int *out, - git_repository *repo, - const git_oid *oid_in, - int abbreviated_size) -{ - size_t size = abbreviated_size; - git_odb *odb; - git_oid dummy; - int error; - - if ((error = git_repository_odb__weakptr(&odb, repo)) < 0) - return error; - - while (size < GIT_OID_HEXSZ) { - if ((error = git_odb_exists_prefix(&dummy, odb, oid_in, size)) == 0) { - *out = (int) size; - return 0; - } - - /* If the error wasn't that it's not unique, then it's a proper error */ - if (error != GIT_EAMBIGUOUS) - return error; - - /* Try again with a larger size */ - size++; - } - - /* If we didn't find any shorter prefix, we have to do the whole thing */ - *out = GIT_OID_HEXSZ; - - return 0; -} - -static int show_suffix( - git_buf *buf, - int depth, - git_repository *repo, - const git_oid* id, - size_t abbrev_size) -{ - int error, size = 0; - - char hex_oid[GIT_OID_HEXSZ]; - - if ((error = find_unique_abbrev_size(&size, repo, id, abbrev_size)) < 0) - return error; - - git_oid_fmt(hex_oid, id); - - git_buf_printf(buf, "-%d-g", depth); - - git_buf_put(buf, hex_oid, size); - - return git_buf_oom(buf) ? -1 : 0; -} - -#define MAX_CANDIDATES_TAGS FLAG_BITS - 1 - -static int describe_not_found(const git_oid *oid, const char *message_format) { - char oid_str[GIT_OID_HEXSZ + 1]; - git_oid_tostr(oid_str, sizeof(oid_str), oid); - - giterr_set(GITERR_DESCRIBE, message_format, oid_str); - return GIT_ENOTFOUND; -} - -static int describe( - struct get_name_data *data, - git_commit *commit) -{ - struct commit_name *n; - struct possible_tag *best; - bool all, tags; - git_revwalk *walk = NULL; - git_pqueue list; - git_commit_list_node *cmit, *gave_up_on = NULL; - git_vector all_matches = GIT_VECTOR_INIT; - unsigned int match_cnt = 0, annotated_cnt = 0, cur_match; - unsigned long seen_commits = 0; /* TODO: Check long */ - unsigned int unannotated_cnt = 0; - int error; - - if (git_vector_init(&all_matches, MAX_CANDIDATES_TAGS, compare_pt) < 0) - return -1; - - if ((error = git_pqueue_init(&list, 0, 2, git_commit_list_time_cmp)) < 0) - goto cleanup; - - all = data->opts->describe_strategy == GIT_DESCRIBE_ALL; - tags = data->opts->describe_strategy == GIT_DESCRIBE_TAGS; - - git_oid_cpy(&data->result->commit_id, git_commit_id(commit)); - - n = find_commit_name(data->names, git_commit_id(commit)); - if (n && (tags || all || n->prio == 2)) { - /* - * Exact match to an existing ref. - */ - data->result->exact_match = 1; - if ((error = commit_name_dup(&data->result->name, n)) < 0) - goto cleanup; - - goto cleanup; - } - - if (!data->opts->max_candidates_tags) { - error = describe_not_found( - git_commit_id(commit), - "Cannot describe - no tag exactly matches '%s'"); - - goto cleanup; - } - - if ((error = git_revwalk_new(&walk, git_commit_owner(commit))) < 0) - goto cleanup; - - if ((cmit = git_revwalk__commit_lookup(walk, git_commit_id(commit))) == NULL) - goto cleanup; - - if ((error = git_commit_list_parse(walk, cmit)) < 0) - goto cleanup; - - cmit->flags = SEEN; - - if ((error = git_pqueue_insert(&list, cmit)) < 0) - goto cleanup; - - while (git_pqueue_size(&list) > 0) - { - int i; - - git_commit_list_node *c = (git_commit_list_node *)git_pqueue_pop(&list); - seen_commits++; - - n = find_commit_name(data->names, &c->oid); - - if (n) { - if (!tags && !all && n->prio < 2) { - unannotated_cnt++; - } else if (match_cnt < data->opts->max_candidates_tags) { - struct possible_tag *t = git__malloc(sizeof(struct commit_name)); - GITERR_CHECK_ALLOC(t); - if ((error = git_vector_insert(&all_matches, t)) < 0) - goto cleanup; - - match_cnt++; - - t->name = n; - t->depth = seen_commits - 1; - t->flag_within = 1u << match_cnt; - t->found_order = match_cnt; - c->flags |= t->flag_within; - if (n->prio == 2) - annotated_cnt++; - } - else { - gave_up_on = c; - break; - } - } - - for (cur_match = 0; cur_match < match_cnt; cur_match++) { - struct possible_tag *t = git_vector_get(&all_matches, cur_match); - if (!(c->flags & t->flag_within)) - t->depth++; - } - - if (annotated_cnt && (git_pqueue_size(&list) == 0)) { - /* - if (debug) { - char oid_str[GIT_OID_HEXSZ + 1]; - git_oid_tostr(oid_str, sizeof(oid_str), &c->oid); - - fprintf(stderr, "finished search at %s\n", oid_str); - } - */ - break; - } - for (i = 0; i < c->out_degree; i++) { - git_commit_list_node *p = c->parents[i]; - if ((error = git_commit_list_parse(walk, p)) < 0) - goto cleanup; - if (!(p->flags & SEEN)) - if ((error = git_pqueue_insert(&list, p)) < 0) - goto cleanup; - p->flags |= c->flags; - - if (data->opts->only_follow_first_parent) - break; - } - } - - if (!match_cnt) { - if (data->opts->show_commit_oid_as_fallback) { - data->result->fallback_to_id = 1; - git_oid_cpy(&data->result->commit_id, &cmit->oid); - - goto cleanup; - } - if (unannotated_cnt) { - error = describe_not_found(git_commit_id(commit), - "Cannot describe - " - "No annotated tags can describe '%s'." - "However, there were unannotated tags."); - goto cleanup; - } - else { - error = describe_not_found(git_commit_id(commit), - "Cannot describe - " - "No tags can describe '%s'."); - goto cleanup; - } - } - - git_vector_sort(&all_matches); - - best = (struct possible_tag *)git_vector_get(&all_matches, 0); - - if (gave_up_on) { - if ((error = git_pqueue_insert(&list, gave_up_on)) < 0) - goto cleanup; - seen_commits--; - } - if ((error = finish_depth_computation( - &list, walk, best)) < 0) - goto cleanup; - - seen_commits += error; - if ((error = possible_tag_dup(&data->result->tag, best)) < 0) - goto cleanup; - - /* - { - static const char *prio_names[] = { - "head", "lightweight", "annotated", - }; - - char oid_str[GIT_OID_HEXSZ + 1]; - - if (debug) { - for (cur_match = 0; cur_match < match_cnt; cur_match++) { - struct possible_tag *t = (struct possible_tag *)git_vector_get(&all_matches, cur_match); - fprintf(stderr, " %-11s %8d %s\n", - prio_names[t->name->prio], - t->depth, t->name->path); - } - fprintf(stderr, "traversed %lu commits\n", seen_commits); - if (gave_up_on) { - git_oid_tostr(oid_str, sizeof(oid_str), &gave_up_on->oid); - fprintf(stderr, - "more than %i tags found; listed %i most recent\n" - "gave up search at %s\n", - data->opts->max_candidates_tags, data->opts->max_candidates_tags, - oid_str); - } - } - } - */ - - git_oid_cpy(&data->result->commit_id, &cmit->oid); - -cleanup: - { - size_t i; - struct possible_tag *match; - git_vector_foreach(&all_matches, i, match) { - git__free(match); - } - } - git_vector_free(&all_matches); - git_pqueue_free(&list); - git_revwalk_free(walk); - return error; -} - -static int normalize_options( - git_describe_options *dst, - const git_describe_options *src) -{ - git_describe_options default_options = GIT_DESCRIBE_OPTIONS_INIT; - if (!src) src = &default_options; - - *dst = *src; - - if (dst->max_candidates_tags > GIT_DESCRIBE_DEFAULT_MAX_CANDIDATES_TAGS) - dst->max_candidates_tags = GIT_DESCRIBE_DEFAULT_MAX_CANDIDATES_TAGS; - - return 0; -} - -int git_describe_commit( - git_describe_result **result, - git_object *committish, - git_describe_options *opts) -{ - struct get_name_data data; - struct commit_name *name; - git_commit *commit; - int error = -1; - git_describe_options normalized; - - assert(committish); - - data.result = git__calloc(1, sizeof(git_describe_result)); - GITERR_CHECK_ALLOC(data.result); - data.result->repo = git_object_owner(committish); - - data.repo = git_object_owner(committish); - - if ((error = normalize_options(&normalized, opts)) < 0) - return error; - - GITERR_CHECK_VERSION( - &normalized, - GIT_DESCRIBE_OPTIONS_VERSION, - "git_describe_options"); - data.opts = &normalized; - - data.names = git_oidmap_alloc(); - GITERR_CHECK_ALLOC(data.names); - - /** TODO: contains to be implemented */ - - if ((error = git_object_peel((git_object **)(&commit), committish, GIT_OBJ_COMMIT)) < 0) - goto cleanup; - - if ((error = git_reference_foreach_name( - git_object_owner(committish), - get_name, &data)) < 0) - goto cleanup; - - if (git_oidmap_size(data.names) == 0 && !opts->show_commit_oid_as_fallback) { - giterr_set(GITERR_DESCRIBE, "Cannot describe - " - "No reference found, cannot describe anything."); - error = -1; - goto cleanup; - } - - if ((error = describe(&data, commit)) < 0) - goto cleanup; - -cleanup: - git_commit_free(commit); - - git_oidmap_foreach_value(data.names, name, { - git_tag_free(name->tag); - git__free(name->path); - git__free(name); - }); - - git_oidmap_free(data.names); - - if (error < 0) - git_describe_result_free(data.result); - else - *result = data.result; - - return error; -} - -int git_describe_workdir( - git_describe_result **out, - git_repository *repo, - git_describe_options *opts) -{ - int error; - git_oid current_id; - git_status_list *status = NULL; - git_status_options status_opts = GIT_STATUS_OPTIONS_INIT; - git_describe_result *result = NULL; - git_object *commit; - - if ((error = git_reference_name_to_id(¤t_id, repo, GIT_HEAD_FILE)) < 0) - return error; - - if ((error = git_object_lookup(&commit, repo, ¤t_id, GIT_OBJ_COMMIT)) < 0) - return error; - - /* The first step is to perform a describe of HEAD, so we can leverage this */ - if ((error = git_describe_commit(&result, commit, opts)) < 0) - goto out; - - if ((error = git_status_list_new(&status, repo, &status_opts)) < 0) - goto out; - - - if (git_status_list_entrycount(status) > 0) - result->dirty = 1; - -out: - git_object_free(commit); - git_status_list_free(status); - - if (error < 0) - git_describe_result_free(result); - else - *out = result; - - return error; -} - -static int normalize_format_options( - git_describe_format_options *dst, - const git_describe_format_options *src) -{ - if (!src) { - git_describe_init_format_options(dst, GIT_DESCRIBE_FORMAT_OPTIONS_VERSION); - return 0; - } - - memcpy(dst, src, sizeof(git_describe_format_options)); - return 0; -} - -int git_describe_format(git_buf *out, const git_describe_result *result, const git_describe_format_options *given) -{ - int error; - git_repository *repo; - struct commit_name *name; - git_describe_format_options opts; - - assert(out && result); - - GITERR_CHECK_VERSION(given, GIT_DESCRIBE_FORMAT_OPTIONS_VERSION, "git_describe_format_options"); - normalize_format_options(&opts, given); - - git_buf_sanitize(out); - - - if (opts.always_use_long_format && opts.abbreviated_size == 0) { - giterr_set(GITERR_DESCRIBE, "Cannot describe - " - "'always_use_long_format' is incompatible with a zero" - "'abbreviated_size'"); - return -1; - } - - - repo = result->repo; - - /* If we did find an exact match, then it's the easier method */ - if (result->exact_match) { - name = result->name; - if ((error = display_name(out, repo, name)) < 0) - return error; - - if (opts.always_use_long_format) { - const git_oid *id = name->tag ? git_tag_target_id(name->tag) : &result->commit_id; - if ((error = show_suffix(out, 0, repo, id, opts.abbreviated_size)) < 0) - return error; - } - - if (result->dirty && opts.dirty_suffix) - git_buf_puts(out, opts.dirty_suffix); - - return git_buf_oom(out) ? -1 : 0; - } - - /* If we didn't find *any* tags, we fall back to the commit's id */ - if (result->fallback_to_id) { - char hex_oid[GIT_OID_HEXSZ + 1] = {0}; - int size = 0; - - if ((error = find_unique_abbrev_size( - &size, repo, &result->commit_id, opts.abbreviated_size)) < 0) - return -1; - - git_oid_fmt(hex_oid, &result->commit_id); - git_buf_put(out, hex_oid, size); - - if (result->dirty && opts.dirty_suffix) - git_buf_puts(out, opts.dirty_suffix); - - return git_buf_oom(out) ? -1 : 0; - } - - /* Lastly, if we found a matching tag, we show that */ - name = result->tag->name; - - if ((error = display_name(out, repo, name)) < 0) - return error; - - if (opts.abbreviated_size) { - if ((error = show_suffix(out, result->tag->depth, repo, - &result->commit_id, opts.abbreviated_size)) < 0) - return error; - } - - if (result->dirty && opts.dirty_suffix) { - git_buf_puts(out, opts.dirty_suffix); - } - - return git_buf_oom(out) ? -1 : 0; -} - -void git_describe_result_free(git_describe_result *result) -{ - if (result == NULL) - return; - - if (result->name) { - git_tag_free(result->name->tag); - git__free(result->name->path); - git__free(result->name); - } - - if (result->tag) { - git_tag_free(result->tag->name->tag); - git__free(result->tag->name->path); - git__free(result->tag->name); - git__free(result->tag); - } - - git__free(result); -} - -int git_describe_init_options(git_describe_options *opts, unsigned int version) -{ - GIT_INIT_STRUCTURE_FROM_TEMPLATE( - opts, version, git_describe_options, GIT_DESCRIBE_OPTIONS_INIT); - return 0; -} - -int git_describe_init_format_options(git_describe_format_options *opts, unsigned int version) -{ - GIT_INIT_STRUCTURE_FROM_TEMPLATE( - opts, version, git_describe_format_options, GIT_DESCRIBE_FORMAT_OPTIONS_INIT); - return 0; -} diff --git a/vendor/libgit2/src/diff.c b/vendor/libgit2/src/diff.c deleted file mode 100644 index 9ac5b9250..000000000 --- a/vendor/libgit2/src/diff.c +++ /dev/null @@ -1,1863 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#include "common.h" -#include "diff.h" -#include "fileops.h" -#include "config.h" -#include "attr_file.h" -#include "filter.h" -#include "pathspec.h" -#include "index.h" -#include "odb.h" -#include "submodule.h" - -#define DIFF_FLAG_IS_SET(DIFF,FLAG) (((DIFF)->opts.flags & (FLAG)) != 0) -#define DIFF_FLAG_ISNT_SET(DIFF,FLAG) (((DIFF)->opts.flags & (FLAG)) == 0) -#define DIFF_FLAG_SET(DIFF,FLAG,VAL) (DIFF)->opts.flags = \ - (VAL) ? ((DIFF)->opts.flags | (FLAG)) : ((DIFF)->opts.flags & ~(VAL)) - -static git_diff_delta *diff_delta__alloc( - git_diff *diff, - git_delta_t status, - const char *path) -{ - git_diff_delta *delta = git__calloc(1, sizeof(git_diff_delta)); - if (!delta) - return NULL; - - delta->old_file.path = git_pool_strdup(&diff->pool, path); - if (delta->old_file.path == NULL) { - git__free(delta); - return NULL; - } - - delta->new_file.path = delta->old_file.path; - - if (DIFF_FLAG_IS_SET(diff, GIT_DIFF_REVERSE)) { - switch (status) { - case GIT_DELTA_ADDED: status = GIT_DELTA_DELETED; break; - case GIT_DELTA_DELETED: status = GIT_DELTA_ADDED; break; - default: break; /* leave other status values alone */ - } - } - delta->status = status; - - return delta; -} - -static int diff_insert_delta( - git_diff *diff, git_diff_delta *delta, const char *matched_pathspec) -{ - int error = 0; - - if (diff->opts.notify_cb) { - error = diff->opts.notify_cb( - diff, delta, matched_pathspec, diff->opts.payload); - - if (error) { - git__free(delta); - - if (error > 0) /* positive value means to skip this delta */ - return 0; - else /* negative value means to cancel diff */ - return giterr_set_after_callback_function(error, "git_diff"); - } - } - - if ((error = git_vector_insert(&diff->deltas, delta)) < 0) - git__free(delta); - - return error; -} - -static bool diff_pathspec_match( - const char **matched_pathspec, - git_diff *diff, - const git_index_entry *entry) -{ - bool disable_pathspec_match = - DIFF_FLAG_IS_SET(diff, GIT_DIFF_DISABLE_PATHSPEC_MATCH); - - /* If we're disabling fnmatch, then the iterator has already applied - * the filters to the files for us and we don't have to do anything. - * However, this only applies to *files* - the iterator will include - * directories that we need to recurse into when not autoexpanding, - * so we still need to apply the pathspec match to directories. - */ - if ((S_ISLNK(entry->mode) || S_ISREG(entry->mode)) && - disable_pathspec_match) { - *matched_pathspec = entry->path; - return true; - } - - return git_pathspec__match( - &diff->pathspec, entry->path, disable_pathspec_match, - DIFF_FLAG_IS_SET(diff, GIT_DIFF_IGNORE_CASE), - matched_pathspec, NULL); -} - -static int diff_delta__from_one( - git_diff *diff, - git_delta_t status, - const git_index_entry *oitem, - const git_index_entry *nitem) -{ - const git_index_entry *entry = nitem; - bool has_old = false; - git_diff_delta *delta; - const char *matched_pathspec; - - assert((oitem != NULL) ^ (nitem != NULL)); - - if (oitem) { - entry = oitem; - has_old = true; - } - - if (DIFF_FLAG_IS_SET(diff, GIT_DIFF_REVERSE)) - has_old = !has_old; - - if ((entry->flags & GIT_IDXENTRY_VALID) != 0) - return 0; - - if (status == GIT_DELTA_IGNORED && - DIFF_FLAG_ISNT_SET(diff, GIT_DIFF_INCLUDE_IGNORED)) - return 0; - - if (status == GIT_DELTA_UNTRACKED && - DIFF_FLAG_ISNT_SET(diff, GIT_DIFF_INCLUDE_UNTRACKED)) - return 0; - - if (status == GIT_DELTA_UNREADABLE && - DIFF_FLAG_ISNT_SET(diff, GIT_DIFF_INCLUDE_UNREADABLE)) - return 0; - - if (!diff_pathspec_match(&matched_pathspec, diff, entry)) - return 0; - - delta = diff_delta__alloc(diff, status, entry->path); - GITERR_CHECK_ALLOC(delta); - - /* This fn is just for single-sided diffs */ - assert(status != GIT_DELTA_MODIFIED); - delta->nfiles = 1; - - if (has_old) { - delta->old_file.mode = entry->mode; - delta->old_file.size = entry->file_size; - delta->old_file.flags |= GIT_DIFF_FLAG_EXISTS; - git_oid_cpy(&delta->old_file.id, &entry->id); - } else /* ADDED, IGNORED, UNTRACKED */ { - delta->new_file.mode = entry->mode; - delta->new_file.size = entry->file_size; - delta->new_file.flags |= GIT_DIFF_FLAG_EXISTS; - git_oid_cpy(&delta->new_file.id, &entry->id); - } - - delta->old_file.flags |= GIT_DIFF_FLAG_VALID_ID; - - if (has_old || !git_oid_iszero(&delta->new_file.id)) - delta->new_file.flags |= GIT_DIFF_FLAG_VALID_ID; - - return diff_insert_delta(diff, delta, matched_pathspec); -} - -static int diff_delta__from_two( - git_diff *diff, - git_delta_t status, - const git_index_entry *old_entry, - uint32_t old_mode, - const git_index_entry *new_entry, - uint32_t new_mode, - const git_oid *new_id, - const char *matched_pathspec) -{ - const git_oid *old_id = &old_entry->id; - git_diff_delta *delta; - const char *canonical_path = old_entry->path; - - if (status == GIT_DELTA_UNMODIFIED && - DIFF_FLAG_ISNT_SET(diff, GIT_DIFF_INCLUDE_UNMODIFIED)) - return 0; - - if (!new_id) - new_id = &new_entry->id; - - if (DIFF_FLAG_IS_SET(diff, GIT_DIFF_REVERSE)) { - uint32_t temp_mode = old_mode; - const git_index_entry *temp_entry = old_entry; - const git_oid *temp_id = old_id; - - old_entry = new_entry; - new_entry = temp_entry; - old_mode = new_mode; - new_mode = temp_mode; - old_id = new_id; - new_id = temp_id; - } - - delta = diff_delta__alloc(diff, status, canonical_path); - GITERR_CHECK_ALLOC(delta); - delta->nfiles = 2; - - if (!git_index_entry_is_conflict(old_entry)) { - delta->old_file.size = old_entry->file_size; - delta->old_file.mode = old_mode; - git_oid_cpy(&delta->old_file.id, old_id); - delta->old_file.flags |= GIT_DIFF_FLAG_VALID_ID | - GIT_DIFF_FLAG_EXISTS; - } - - if (!git_index_entry_is_conflict(new_entry)) { - git_oid_cpy(&delta->new_file.id, new_id); - delta->new_file.size = new_entry->file_size; - delta->new_file.mode = new_mode; - delta->old_file.flags |= GIT_DIFF_FLAG_EXISTS; - delta->new_file.flags |= GIT_DIFF_FLAG_EXISTS; - - if (!git_oid_iszero(&new_entry->id)) - delta->new_file.flags |= GIT_DIFF_FLAG_VALID_ID; - } - - return diff_insert_delta(diff, delta, matched_pathspec); -} - -static git_diff_delta *diff_delta__last_for_item( - git_diff *diff, - const git_index_entry *item) -{ - git_diff_delta *delta = git_vector_last(&diff->deltas); - if (!delta) - return NULL; - - switch (delta->status) { - case GIT_DELTA_UNMODIFIED: - case GIT_DELTA_DELETED: - if (git_oid__cmp(&delta->old_file.id, &item->id) == 0) - return delta; - break; - case GIT_DELTA_ADDED: - if (git_oid__cmp(&delta->new_file.id, &item->id) == 0) - return delta; - break; - case GIT_DELTA_UNREADABLE: - case GIT_DELTA_UNTRACKED: - if (diff->strcomp(delta->new_file.path, item->path) == 0 && - git_oid__cmp(&delta->new_file.id, &item->id) == 0) - return delta; - break; - case GIT_DELTA_MODIFIED: - if (git_oid__cmp(&delta->old_file.id, &item->id) == 0 || - git_oid__cmp(&delta->new_file.id, &item->id) == 0) - return delta; - break; - default: - break; - } - - return NULL; -} - -static char *diff_strdup_prefix(git_pool *pool, const char *prefix) -{ - size_t len = strlen(prefix); - - /* append '/' at end if needed */ - if (len > 0 && prefix[len - 1] != '/') - return git_pool_strcat(pool, prefix, "/"); - else - return git_pool_strndup(pool, prefix, len + 1); -} - -GIT_INLINE(const char *) diff_delta__path(const git_diff_delta *delta) -{ - const char *str = delta->old_file.path; - - if (!str || - delta->status == GIT_DELTA_ADDED || - delta->status == GIT_DELTA_RENAMED || - delta->status == GIT_DELTA_COPIED) - str = delta->new_file.path; - - return str; -} - -const char *git_diff_delta__path(const git_diff_delta *delta) -{ - return diff_delta__path(delta); -} - -int git_diff_delta__cmp(const void *a, const void *b) -{ - const git_diff_delta *da = a, *db = b; - int val = strcmp(diff_delta__path(da), diff_delta__path(db)); - return val ? val : ((int)da->status - (int)db->status); -} - -int git_diff_delta__casecmp(const void *a, const void *b) -{ - const git_diff_delta *da = a, *db = b; - int val = strcasecmp(diff_delta__path(da), diff_delta__path(db)); - return val ? val : ((int)da->status - (int)db->status); -} - -GIT_INLINE(const char *) diff_delta__i2w_path(const git_diff_delta *delta) -{ - return delta->old_file.path ? - delta->old_file.path : delta->new_file.path; -} - -int git_diff_delta__i2w_cmp(const void *a, const void *b) -{ - const git_diff_delta *da = a, *db = b; - int val = strcmp(diff_delta__i2w_path(da), diff_delta__i2w_path(db)); - return val ? val : ((int)da->status - (int)db->status); -} - -int git_diff_delta__i2w_casecmp(const void *a, const void *b) -{ - const git_diff_delta *da = a, *db = b; - int val = strcasecmp(diff_delta__i2w_path(da), diff_delta__i2w_path(db)); - return val ? val : ((int)da->status - (int)db->status); -} - -bool git_diff_delta__should_skip( - const git_diff_options *opts, const git_diff_delta *delta) -{ - uint32_t flags = opts ? opts->flags : 0; - - if (delta->status == GIT_DELTA_UNMODIFIED && - (flags & GIT_DIFF_INCLUDE_UNMODIFIED) == 0) - return true; - - if (delta->status == GIT_DELTA_IGNORED && - (flags & GIT_DIFF_INCLUDE_IGNORED) == 0) - return true; - - if (delta->status == GIT_DELTA_UNTRACKED && - (flags & GIT_DIFF_INCLUDE_UNTRACKED) == 0) - return true; - - if (delta->status == GIT_DELTA_UNREADABLE && - (flags & GIT_DIFF_INCLUDE_UNREADABLE) == 0) - return true; - - return false; -} - - -static const char *diff_mnemonic_prefix( - git_iterator_type_t type, bool left_side) -{ - const char *pfx = ""; - - switch (type) { - case GIT_ITERATOR_TYPE_EMPTY: pfx = "c"; break; - case GIT_ITERATOR_TYPE_TREE: pfx = "c"; break; - case GIT_ITERATOR_TYPE_INDEX: pfx = "i"; break; - case GIT_ITERATOR_TYPE_WORKDIR: pfx = "w"; break; - case GIT_ITERATOR_TYPE_FS: pfx = left_side ? "1" : "2"; break; - default: break; - } - - /* note: without a deeper look at pathspecs, there is no easy way - * to get the (o)bject / (w)ork tree mnemonics working... - */ - - return pfx; -} - -static int diff_entry_cmp(const void *a, const void *b) -{ - const git_index_entry *entry_a = a; - const git_index_entry *entry_b = b; - - return strcmp(entry_a->path, entry_b->path); -} - -static int diff_entry_icmp(const void *a, const void *b) -{ - const git_index_entry *entry_a = a; - const git_index_entry *entry_b = b; - - return strcasecmp(entry_a->path, entry_b->path); -} - -static void diff_set_ignore_case(git_diff *diff, bool ignore_case) -{ - if (!ignore_case) { - diff->opts.flags &= ~GIT_DIFF_IGNORE_CASE; - - diff->strcomp = git__strcmp; - diff->strncomp = git__strncmp; - diff->pfxcomp = git__prefixcmp; - diff->entrycomp = diff_entry_cmp; - - git_vector_set_cmp(&diff->deltas, git_diff_delta__cmp); - } else { - diff->opts.flags |= GIT_DIFF_IGNORE_CASE; - - diff->strcomp = git__strcasecmp; - diff->strncomp = git__strncasecmp; - diff->pfxcomp = git__prefixcmp_icase; - diff->entrycomp = diff_entry_icmp; - - git_vector_set_cmp(&diff->deltas, git_diff_delta__casecmp); - } - - git_vector_sort(&diff->deltas); -} - -static git_diff *diff_list_alloc( - git_repository *repo, - git_iterator *old_iter, - git_iterator *new_iter) -{ - git_diff_options dflt = GIT_DIFF_OPTIONS_INIT; - git_diff *diff = git__calloc(1, sizeof(git_diff)); - if (!diff) - return NULL; - - assert(repo && old_iter && new_iter); - - GIT_REFCOUNT_INC(diff); - diff->repo = repo; - diff->old_src = old_iter->type; - diff->new_src = new_iter->type; - memcpy(&diff->opts, &dflt, sizeof(diff->opts)); - - git_pool_init(&diff->pool, 1); - - if (git_vector_init(&diff->deltas, 0, git_diff_delta__cmp) < 0) { - git_diff_free(diff); - return NULL; - } - - /* Use case-insensitive compare if either iterator has - * the ignore_case bit set */ - diff_set_ignore_case( - diff, - git_iterator_ignore_case(old_iter) || - git_iterator_ignore_case(new_iter)); - - return diff; -} - -static int diff_list_apply_options( - git_diff *diff, - const git_diff_options *opts) -{ - git_config *cfg = NULL; - git_repository *repo = diff->repo; - git_pool *pool = &diff->pool; - int val; - - if (opts) { - /* copy user options (except case sensitivity info from iterators) */ - bool icase = DIFF_FLAG_IS_SET(diff, GIT_DIFF_IGNORE_CASE); - memcpy(&diff->opts, opts, sizeof(diff->opts)); - DIFF_FLAG_SET(diff, GIT_DIFF_IGNORE_CASE, icase); - - /* initialize pathspec from options */ - if (git_pathspec__vinit(&diff->pathspec, &opts->pathspec, pool) < 0) - return -1; - } - - /* flag INCLUDE_TYPECHANGE_TREES implies INCLUDE_TYPECHANGE */ - if (DIFF_FLAG_IS_SET(diff, GIT_DIFF_INCLUDE_TYPECHANGE_TREES)) - diff->opts.flags |= GIT_DIFF_INCLUDE_TYPECHANGE; - - /* flag INCLUDE_UNTRACKED_CONTENT implies INCLUDE_UNTRACKED */ - if (DIFF_FLAG_IS_SET(diff, GIT_DIFF_SHOW_UNTRACKED_CONTENT)) - diff->opts.flags |= GIT_DIFF_INCLUDE_UNTRACKED; - - /* load config values that affect diff behavior */ - if ((val = git_repository_config_snapshot(&cfg, repo)) < 0) - return val; - - if (!git_config__cvar(&val, cfg, GIT_CVAR_SYMLINKS) && val) - diff->diffcaps = diff->diffcaps | GIT_DIFFCAPS_HAS_SYMLINKS; - - if (!git_config__cvar(&val, cfg, GIT_CVAR_IGNORESTAT) && val) - diff->diffcaps = diff->diffcaps | GIT_DIFFCAPS_IGNORE_STAT; - - if ((diff->opts.flags & GIT_DIFF_IGNORE_FILEMODE) == 0 && - !git_config__cvar(&val, cfg, GIT_CVAR_FILEMODE) && val) - diff->diffcaps = diff->diffcaps | GIT_DIFFCAPS_TRUST_MODE_BITS; - - if (!git_config__cvar(&val, cfg, GIT_CVAR_TRUSTCTIME) && val) - diff->diffcaps = diff->diffcaps | GIT_DIFFCAPS_TRUST_CTIME; - - /* Don't set GIT_DIFFCAPS_USE_DEV - compile time option in core git */ - - /* If not given explicit `opts`, check `diff.xyz` configs */ - if (!opts) { - int context = git_config__get_int_force(cfg, "diff.context", 3); - diff->opts.context_lines = context >= 0 ? (uint32_t)context : 3; - - /* add other defaults here */ - } - - /* Reverse src info if diff is reversed */ - if (DIFF_FLAG_IS_SET(diff, GIT_DIFF_REVERSE)) { - git_iterator_type_t tmp_src = diff->old_src; - diff->old_src = diff->new_src; - diff->new_src = tmp_src; - } - - /* Unset UPDATE_INDEX unless diffing workdir and index */ - if (DIFF_FLAG_IS_SET(diff, GIT_DIFF_UPDATE_INDEX) && - (!(diff->old_src == GIT_ITERATOR_TYPE_WORKDIR || - diff->new_src == GIT_ITERATOR_TYPE_WORKDIR) || - !(diff->old_src == GIT_ITERATOR_TYPE_INDEX || - diff->new_src == GIT_ITERATOR_TYPE_INDEX))) - diff->opts.flags &= ~GIT_DIFF_UPDATE_INDEX; - - /* if ignore_submodules not explicitly set, check diff config */ - if (diff->opts.ignore_submodules <= 0) { - git_config_entry *entry; - git_config__lookup_entry(&entry, cfg, "diff.ignoresubmodules", true); - - if (entry && git_submodule_parse_ignore( - &diff->opts.ignore_submodules, entry->value) < 0) - giterr_clear(); - git_config_entry_free(entry); - } - - /* if either prefix is not set, figure out appropriate value */ - if (!diff->opts.old_prefix || !diff->opts.new_prefix) { - const char *use_old = DIFF_OLD_PREFIX_DEFAULT; - const char *use_new = DIFF_NEW_PREFIX_DEFAULT; - - if (git_config__get_bool_force(cfg, "diff.noprefix", 0)) - use_old = use_new = ""; - else if (git_config__get_bool_force(cfg, "diff.mnemonicprefix", 0)) { - use_old = diff_mnemonic_prefix(diff->old_src, true); - use_new = diff_mnemonic_prefix(diff->new_src, false); - } - - if (!diff->opts.old_prefix) - diff->opts.old_prefix = use_old; - if (!diff->opts.new_prefix) - diff->opts.new_prefix = use_new; - } - - /* strdup prefix from pool so we're not dependent on external data */ - diff->opts.old_prefix = diff_strdup_prefix(pool, diff->opts.old_prefix); - diff->opts.new_prefix = diff_strdup_prefix(pool, diff->opts.new_prefix); - - if (DIFF_FLAG_IS_SET(diff, GIT_DIFF_REVERSE)) { - const char *tmp_prefix = diff->opts.old_prefix; - diff->opts.old_prefix = diff->opts.new_prefix; - diff->opts.new_prefix = tmp_prefix; - } - - git_config_free(cfg); - - /* check strdup results for error */ - return (!diff->opts.old_prefix || !diff->opts.new_prefix) ? -1 : 0; -} - -static void diff_list_free(git_diff *diff) -{ - git_vector_free_deep(&diff->deltas); - - git_pathspec__vfree(&diff->pathspec); - git_pool_clear(&diff->pool); - - git__memzero(diff, sizeof(*diff)); - git__free(diff); -} - -void git_diff_free(git_diff *diff) -{ - if (!diff) - return; - - GIT_REFCOUNT_DEC(diff, diff_list_free); -} - -void git_diff_addref(git_diff *diff) -{ - GIT_REFCOUNT_INC(diff); -} - -int git_diff__oid_for_file( - git_oid *out, - git_diff *diff, - const char *path, - uint16_t mode, - git_off_t size) -{ - git_index_entry entry; - - memset(&entry, 0, sizeof(entry)); - entry.mode = mode; - entry.file_size = size; - entry.path = (char *)path; - - return git_diff__oid_for_entry(out, diff, &entry, mode, NULL); -} - -int git_diff__oid_for_entry( - git_oid *out, - git_diff *diff, - const git_index_entry *src, - uint16_t mode, - const git_oid *update_match) -{ - int error = 0; - git_buf full_path = GIT_BUF_INIT; - git_index_entry entry = *src; - git_filter_list *fl = NULL; - - memset(out, 0, sizeof(*out)); - - if (git_buf_joinpath( - &full_path, git_repository_workdir(diff->repo), entry.path) < 0) - return -1; - - if (!mode) { - struct stat st; - - diff->perf.stat_calls++; - - if (p_stat(full_path.ptr, &st) < 0) { - error = git_path_set_error(errno, entry.path, "stat"); - git_buf_free(&full_path); - return error; - } - - git_index_entry__init_from_stat( - &entry, &st, (diff->diffcaps & GIT_DIFFCAPS_TRUST_MODE_BITS) != 0); - } - - /* calculate OID for file if possible */ - if (S_ISGITLINK(mode)) { - git_submodule *sm; - - if (!git_submodule_lookup(&sm, diff->repo, entry.path)) { - const git_oid *sm_oid = git_submodule_wd_id(sm); - if (sm_oid) - git_oid_cpy(out, sm_oid); - git_submodule_free(sm); - } else { - /* if submodule lookup failed probably just in an intermediate - * state where some init hasn't happened, so ignore the error - */ - giterr_clear(); - } - } else if (S_ISLNK(mode)) { - error = git_odb__hashlink(out, full_path.ptr); - diff->perf.oid_calculations++; - } else if (!git__is_sizet(entry.file_size)) { - giterr_set(GITERR_OS, "File size overflow (for 32-bits) on '%s'", - entry.path); - error = -1; - } else if (!(error = git_filter_list_load( - &fl, diff->repo, NULL, entry.path, - GIT_FILTER_TO_ODB, GIT_FILTER_ALLOW_UNSAFE))) - { - int fd = git_futils_open_ro(full_path.ptr); - if (fd < 0) - error = fd; - else { - error = git_odb__hashfd_filtered( - out, fd, (size_t)entry.file_size, GIT_OBJ_BLOB, fl); - p_close(fd); - diff->perf.oid_calculations++; - } - - git_filter_list_free(fl); - } - - /* update index for entry if requested */ - if (!error && update_match && git_oid_equal(out, update_match)) { - git_index *idx; - git_index_entry updated_entry; - - memcpy(&updated_entry, &entry, sizeof(git_index_entry)); - updated_entry.mode = mode; - git_oid_cpy(&updated_entry.id, out); - - if (!(error = git_repository_index__weakptr(&idx, diff->repo))) { - error = git_index_add(idx, &updated_entry); - diff->index_updated = true; - } - } - - git_buf_free(&full_path); - return error; -} - -typedef struct { - git_repository *repo; - git_iterator *old_iter; - git_iterator *new_iter; - const git_index_entry *oitem; - const git_index_entry *nitem; -} diff_in_progress; - -#define MODE_BITS_MASK 0000777 - -static int maybe_modified_submodule( - git_delta_t *status, - git_oid *found_oid, - git_diff *diff, - diff_in_progress *info) -{ - int error = 0; - git_submodule *sub; - unsigned int sm_status = 0; - git_submodule_ignore_t ign = diff->opts.ignore_submodules; - - *status = GIT_DELTA_UNMODIFIED; - - if (DIFF_FLAG_IS_SET(diff, GIT_DIFF_IGNORE_SUBMODULES) || - ign == GIT_SUBMODULE_IGNORE_ALL) - return 0; - - if ((error = git_submodule_lookup( - &sub, diff->repo, info->nitem->path)) < 0) { - - /* GIT_EEXISTS means dir with .git in it was found - ignore it */ - if (error == GIT_EEXISTS) { - giterr_clear(); - error = 0; - } - return error; - } - - if (ign <= 0 && git_submodule_ignore(sub) == GIT_SUBMODULE_IGNORE_ALL) - /* ignore it */; - else if ((error = git_submodule__status( - &sm_status, NULL, NULL, found_oid, sub, ign)) < 0) - /* return error below */; - - /* check IS_WD_UNMODIFIED because this case is only used - * when the new side of the diff is the working directory - */ - else if (!GIT_SUBMODULE_STATUS_IS_WD_UNMODIFIED(sm_status)) - *status = GIT_DELTA_MODIFIED; - - /* now that we have a HEAD OID, check if HEAD moved */ - else if ((sm_status & GIT_SUBMODULE_STATUS_IN_WD) != 0 && - !git_oid_equal(&info->oitem->id, found_oid)) - *status = GIT_DELTA_MODIFIED; - - git_submodule_free(sub); - return error; -} - -static int maybe_modified( - git_diff *diff, - diff_in_progress *info) -{ - git_oid noid; - git_delta_t status = GIT_DELTA_MODIFIED; - const git_index_entry *oitem = info->oitem; - const git_index_entry *nitem = info->nitem; - unsigned int omode = oitem->mode; - unsigned int nmode = nitem->mode; - bool new_is_workdir = (info->new_iter->type == GIT_ITERATOR_TYPE_WORKDIR); - bool modified_uncertain = false; - const char *matched_pathspec; - int error = 0; - - if (!diff_pathspec_match(&matched_pathspec, diff, oitem)) - return 0; - - memset(&noid, 0, sizeof(noid)); - - /* on platforms with no symlinks, preserve mode of existing symlinks */ - if (S_ISLNK(omode) && S_ISREG(nmode) && new_is_workdir && - !(diff->diffcaps & GIT_DIFFCAPS_HAS_SYMLINKS)) - nmode = omode; - - /* on platforms with no execmode, just preserve old mode */ - if (!(diff->diffcaps & GIT_DIFFCAPS_TRUST_MODE_BITS) && - (nmode & MODE_BITS_MASK) != (omode & MODE_BITS_MASK) && - new_is_workdir) - nmode = (nmode & ~MODE_BITS_MASK) | (omode & MODE_BITS_MASK); - - /* if one side is a conflict, mark the whole delta as conflicted */ - if (git_index_entry_is_conflict(oitem) || - git_index_entry_is_conflict(nitem)) { - status = GIT_DELTA_CONFLICTED; - - /* support "assume unchanged" (poorly, b/c we still stat everything) */ - } else if ((oitem->flags & GIT_IDXENTRY_VALID) != 0) { - status = GIT_DELTA_UNMODIFIED; - - /* support "skip worktree" index bit */ - } else if ((oitem->flags_extended & GIT_IDXENTRY_SKIP_WORKTREE) != 0) { - status = GIT_DELTA_UNMODIFIED; - - /* if basic type of file changed, then split into delete and add */ - } else if (GIT_MODE_TYPE(omode) != GIT_MODE_TYPE(nmode)) { - if (DIFF_FLAG_IS_SET(diff, GIT_DIFF_INCLUDE_TYPECHANGE)) { - status = GIT_DELTA_TYPECHANGE; - } - - else if (nmode == GIT_FILEMODE_UNREADABLE) { - if (!(error = diff_delta__from_one(diff, GIT_DELTA_DELETED, oitem, NULL))) - error = diff_delta__from_one(diff, GIT_DELTA_UNREADABLE, NULL, nitem); - return error; - } - - else { - if (!(error = diff_delta__from_one(diff, GIT_DELTA_DELETED, oitem, NULL))) - error = diff_delta__from_one(diff, GIT_DELTA_ADDED, NULL, nitem); - return error; - } - - /* if oids and modes match (and are valid), then file is unmodified */ - } else if (git_oid_equal(&oitem->id, &nitem->id) && - omode == nmode && - !git_oid_iszero(&oitem->id)) { - status = GIT_DELTA_UNMODIFIED; - - /* if we have an unknown OID and a workdir iterator, then check some - * circumstances that can accelerate things or need special handling - */ - } else if (git_oid_iszero(&nitem->id) && new_is_workdir) { - bool use_ctime = ((diff->diffcaps & GIT_DIFFCAPS_TRUST_CTIME) != 0); - git_index *index; - git_iterator_index(&index, info->new_iter); - - status = GIT_DELTA_UNMODIFIED; - - if (S_ISGITLINK(nmode)) { - if ((error = maybe_modified_submodule(&status, &noid, diff, info)) < 0) - return error; - } - - /* if the stat data looks different, then mark modified - this just - * means that the OID will be recalculated below to confirm change - */ - else if (omode != nmode || oitem->file_size != nitem->file_size) { - status = GIT_DELTA_MODIFIED; - modified_uncertain = - (oitem->file_size <= 0 && nitem->file_size > 0); - } - else if (!git_index_time_eq(&oitem->mtime, &nitem->mtime) || - (use_ctime && !git_index_time_eq(&oitem->ctime, &nitem->ctime)) || - oitem->ino != nitem->ino || - oitem->uid != nitem->uid || - oitem->gid != nitem->gid || - git_index_entry_newer_than_index(nitem, index)) - { - status = GIT_DELTA_MODIFIED; - modified_uncertain = true; - } - - /* if mode is GITLINK and submodules are ignored, then skip */ - } else if (S_ISGITLINK(nmode) && - DIFF_FLAG_IS_SET(diff, GIT_DIFF_IGNORE_SUBMODULES)) { - status = GIT_DELTA_UNMODIFIED; - } - - /* if we got here and decided that the files are modified, but we - * haven't calculated the OID of the new item, then calculate it now - */ - if (modified_uncertain && git_oid_iszero(&nitem->id)) { - const git_oid *update_check = - DIFF_FLAG_IS_SET(diff, GIT_DIFF_UPDATE_INDEX) && omode == nmode ? - &oitem->id : NULL; - - if ((error = git_diff__oid_for_entry( - &noid, diff, nitem, nmode, update_check)) < 0) - return error; - - /* if oid matches, then mark unmodified (except submodules, where - * the filesystem content may be modified even if the oid still - * matches between the index and the workdir HEAD) - */ - if (omode == nmode && !S_ISGITLINK(omode) && - git_oid_equal(&oitem->id, &noid)) - status = GIT_DELTA_UNMODIFIED; - } - - /* If we want case changes, then break this into a delete of the old - * and an add of the new so that consumers can act accordingly (eg, - * checkout will update the case on disk.) - */ - if (DIFF_FLAG_IS_SET(diff, GIT_DIFF_IGNORE_CASE) && - DIFF_FLAG_IS_SET(diff, GIT_DIFF_INCLUDE_CASECHANGE) && - strcmp(oitem->path, nitem->path) != 0) { - - if (!(error = diff_delta__from_one(diff, GIT_DELTA_DELETED, oitem, NULL))) - error = diff_delta__from_one(diff, GIT_DELTA_ADDED, NULL, nitem); - - return error; - } - - return diff_delta__from_two( - diff, status, oitem, omode, nitem, nmode, - git_oid_iszero(&noid) ? NULL : &noid, matched_pathspec); -} - -static bool entry_is_prefixed( - git_diff *diff, - const git_index_entry *item, - const git_index_entry *prefix_item) -{ - size_t pathlen; - - if (!item || diff->pfxcomp(item->path, prefix_item->path) != 0) - return false; - - pathlen = strlen(prefix_item->path); - - return (prefix_item->path[pathlen - 1] == '/' || - item->path[pathlen] == '\0' || - item->path[pathlen] == '/'); -} - -static int iterator_current( - const git_index_entry **entry, - git_iterator *iterator) -{ - int error; - - if ((error = git_iterator_current(entry, iterator)) == GIT_ITEROVER) { - *entry = NULL; - error = 0; - } - - return error; -} - -static int iterator_advance( - const git_index_entry **entry, - git_iterator *iterator) -{ - const git_index_entry *prev_entry = *entry; - int cmp, error; - - /* if we're looking for conflicts, we only want to report - * one conflict for each file, instead of all three sides. - * so if this entry is a conflict for this file, and the - * previous one was a conflict for the same file, skip it. - */ - while ((error = git_iterator_advance(entry, iterator)) == 0) { - if (!(iterator->flags & GIT_ITERATOR_INCLUDE_CONFLICTS) || - !git_index_entry_is_conflict(prev_entry) || - !git_index_entry_is_conflict(*entry)) - break; - - cmp = (iterator->flags & GIT_ITERATOR_IGNORE_CASE) ? - strcasecmp(prev_entry->path, (*entry)->path) : - strcmp(prev_entry->path, (*entry)->path); - - if (cmp) - break; - } - - if (error == GIT_ITEROVER) { - *entry = NULL; - error = 0; - } - - return error; -} - -static int iterator_advance_into( - const git_index_entry **entry, - git_iterator *iterator) -{ - int error; - - if ((error = git_iterator_advance_into(entry, iterator)) == GIT_ITEROVER) { - *entry = NULL; - error = 0; - } - - return error; -} - -static int iterator_advance_over_with_status( - const git_index_entry **entry, - git_iterator_status_t *status, - git_iterator *iterator) -{ - int error; - - if ((error = git_iterator_advance_over_with_status( - entry, status, iterator)) == GIT_ITEROVER) { - *entry = NULL; - error = 0; - } - - return error; -} - -static int handle_unmatched_new_item( - git_diff *diff, diff_in_progress *info) -{ - int error = 0; - const git_index_entry *nitem = info->nitem; - git_delta_t delta_type = GIT_DELTA_UNTRACKED; - bool contains_oitem; - - /* check if this is a prefix of the other side */ - contains_oitem = entry_is_prefixed(diff, info->oitem, nitem); - - /* update delta_type if this item is conflicted */ - if (git_index_entry_is_conflict(nitem)) - delta_type = GIT_DELTA_CONFLICTED; - - /* update delta_type if this item is ignored */ - else if (git_iterator_current_is_ignored(info->new_iter)) - delta_type = GIT_DELTA_IGNORED; - - if (nitem->mode == GIT_FILEMODE_TREE) { - bool recurse_into_dir = contains_oitem; - - /* check if user requests recursion into this type of dir */ - recurse_into_dir = contains_oitem || - (delta_type == GIT_DELTA_UNTRACKED && - DIFF_FLAG_IS_SET(diff, GIT_DIFF_RECURSE_UNTRACKED_DIRS)) || - (delta_type == GIT_DELTA_IGNORED && - DIFF_FLAG_IS_SET(diff, GIT_DIFF_RECURSE_IGNORED_DIRS)); - - /* do not advance into directories that contain a .git file */ - if (recurse_into_dir && !contains_oitem) { - git_buf *full = NULL; - if (git_iterator_current_workdir_path(&full, info->new_iter) < 0) - return -1; - if (full && git_path_contains(full, DOT_GIT)) { - /* TODO: warning if not a valid git repository */ - recurse_into_dir = false; - } - } - - /* still have to look into untracked directories to match core git - - * with no untracked files, directory is treated as ignored - */ - if (!recurse_into_dir && - delta_type == GIT_DELTA_UNTRACKED && - DIFF_FLAG_ISNT_SET(diff, GIT_DIFF_ENABLE_FAST_UNTRACKED_DIRS)) - { - git_diff_delta *last; - git_iterator_status_t untracked_state; - - /* attempt to insert record for this directory */ - if ((error = diff_delta__from_one(diff, delta_type, NULL, nitem)) != 0) - return error; - - /* if delta wasn't created (because of rules), just skip ahead */ - last = diff_delta__last_for_item(diff, nitem); - if (!last) - return iterator_advance(&info->nitem, info->new_iter); - - /* iterate into dir looking for an actual untracked file */ - if ((error = iterator_advance_over_with_status( - &info->nitem, &untracked_state, info->new_iter)) < 0) - return error; - - /* if we found nothing that matched our pathlist filter, exclude */ - if (untracked_state == GIT_ITERATOR_STATUS_FILTERED) { - git_vector_pop(&diff->deltas); - git__free(last); - } - - /* if we found nothing or just ignored items, update the record */ - if (untracked_state == GIT_ITERATOR_STATUS_IGNORED || - untracked_state == GIT_ITERATOR_STATUS_EMPTY) { - last->status = GIT_DELTA_IGNORED; - - /* remove the record if we don't want ignored records */ - if (DIFF_FLAG_ISNT_SET(diff, GIT_DIFF_INCLUDE_IGNORED)) { - git_vector_pop(&diff->deltas); - git__free(last); - } - } - - return 0; - } - - /* try to advance into directory if necessary */ - if (recurse_into_dir) { - error = iterator_advance_into(&info->nitem, info->new_iter); - - /* if real error or no error, proceed with iteration */ - if (error != GIT_ENOTFOUND) - return error; - giterr_clear(); - - /* if directory is empty, can't advance into it, so either skip - * it or ignore it - */ - if (contains_oitem) - return iterator_advance(&info->nitem, info->new_iter); - delta_type = GIT_DELTA_IGNORED; - } - } - - else if (delta_type == GIT_DELTA_IGNORED && - DIFF_FLAG_ISNT_SET(diff, GIT_DIFF_RECURSE_IGNORED_DIRS) && - git_iterator_current_tree_is_ignored(info->new_iter)) - /* item contained in ignored directory, so skip over it */ - return iterator_advance(&info->nitem, info->new_iter); - - else if (info->new_iter->type != GIT_ITERATOR_TYPE_WORKDIR) { - if (delta_type != GIT_DELTA_CONFLICTED) - delta_type = GIT_DELTA_ADDED; - } - - else if (nitem->mode == GIT_FILEMODE_COMMIT) { - /* ignore things that are not actual submodules */ - if (git_submodule_lookup(NULL, info->repo, nitem->path) != 0) { - giterr_clear(); - delta_type = GIT_DELTA_IGNORED; - - /* if this contains a tracked item, treat as normal TREE */ - if (contains_oitem) { - error = iterator_advance_into(&info->nitem, info->new_iter); - if (error != GIT_ENOTFOUND) - return error; - - giterr_clear(); - return iterator_advance(&info->nitem, info->new_iter); - } - } - } - - else if (nitem->mode == GIT_FILEMODE_UNREADABLE) { - if (DIFF_FLAG_IS_SET(diff, GIT_DIFF_INCLUDE_UNREADABLE_AS_UNTRACKED)) - delta_type = GIT_DELTA_UNTRACKED; - else - delta_type = GIT_DELTA_UNREADABLE; - } - - /* Actually create the record for this item if necessary */ - if ((error = diff_delta__from_one(diff, delta_type, NULL, nitem)) != 0) - return error; - - /* If user requested TYPECHANGE records, then check for that instead of - * just generating an ADDED/UNTRACKED record - */ - if (delta_type != GIT_DELTA_IGNORED && - DIFF_FLAG_IS_SET(diff, GIT_DIFF_INCLUDE_TYPECHANGE_TREES) && - contains_oitem) - { - /* this entry was prefixed with a tree - make TYPECHANGE */ - git_diff_delta *last = diff_delta__last_for_item(diff, nitem); - if (last) { - last->status = GIT_DELTA_TYPECHANGE; - last->old_file.mode = GIT_FILEMODE_TREE; - } - } - - return iterator_advance(&info->nitem, info->new_iter); -} - -static int handle_unmatched_old_item( - git_diff *diff, diff_in_progress *info) -{ - git_delta_t delta_type = GIT_DELTA_DELETED; - int error; - - /* update delta_type if this item is conflicted */ - if (git_index_entry_is_conflict(info->oitem)) - delta_type = GIT_DELTA_CONFLICTED; - - if ((error = diff_delta__from_one(diff, delta_type, info->oitem, NULL)) < 0) - return error; - - /* if we are generating TYPECHANGE records then check for that - * instead of just generating a DELETE record - */ - if (DIFF_FLAG_IS_SET(diff, GIT_DIFF_INCLUDE_TYPECHANGE_TREES) && - entry_is_prefixed(diff, info->nitem, info->oitem)) - { - /* this entry has become a tree! convert to TYPECHANGE */ - git_diff_delta *last = diff_delta__last_for_item(diff, info->oitem); - if (last) { - last->status = GIT_DELTA_TYPECHANGE; - last->new_file.mode = GIT_FILEMODE_TREE; - } - - /* If new_iter is a workdir iterator, then this situation - * will certainly be followed by a series of untracked items. - * Unless RECURSE_UNTRACKED_DIRS is set, skip over them... - */ - if (S_ISDIR(info->nitem->mode) && - DIFF_FLAG_ISNT_SET(diff, GIT_DIFF_RECURSE_UNTRACKED_DIRS)) - return iterator_advance(&info->nitem, info->new_iter); - } - - return iterator_advance(&info->oitem, info->old_iter); -} - -static int handle_matched_item( - git_diff *diff, diff_in_progress *info) -{ - int error = 0; - - if ((error = maybe_modified(diff, info)) < 0) - return error; - - if (!(error = iterator_advance(&info->oitem, info->old_iter))) - error = iterator_advance(&info->nitem, info->new_iter); - - return error; -} - -int git_diff__from_iterators( - git_diff **diff_ptr, - git_repository *repo, - git_iterator *old_iter, - git_iterator *new_iter, - const git_diff_options *opts) -{ - int error = 0; - diff_in_progress info; - git_diff *diff; - - *diff_ptr = NULL; - - diff = diff_list_alloc(repo, old_iter, new_iter); - GITERR_CHECK_ALLOC(diff); - - info.repo = repo; - info.old_iter = old_iter; - info.new_iter = new_iter; - - /* make iterators have matching icase behavior */ - if (DIFF_FLAG_IS_SET(diff, GIT_DIFF_IGNORE_CASE)) { - if ((error = git_iterator_set_ignore_case(old_iter, true)) < 0 || - (error = git_iterator_set_ignore_case(new_iter, true)) < 0) - goto cleanup; - } - - /* finish initialization */ - if ((error = diff_list_apply_options(diff, opts)) < 0) - goto cleanup; - - if ((error = iterator_current(&info.oitem, old_iter)) < 0 || - (error = iterator_current(&info.nitem, new_iter)) < 0) - goto cleanup; - - /* run iterators building diffs */ - while (!error && (info.oitem || info.nitem)) { - int cmp; - - /* report progress */ - if (opts && opts->progress_cb) { - if ((error = opts->progress_cb(diff, - info.oitem ? info.oitem->path : NULL, - info.nitem ? info.nitem->path : NULL, - opts->payload))) - break; - } - - cmp = info.oitem ? - (info.nitem ? diff->entrycomp(info.oitem, info.nitem) : -1) : 1; - - /* create DELETED records for old items not matched in new */ - if (cmp < 0) - error = handle_unmatched_old_item(diff, &info); - - /* create ADDED, TRACKED, or IGNORED records for new items not - * matched in old (and/or descend into directories as needed) - */ - else if (cmp > 0) - error = handle_unmatched_new_item(diff, &info); - - /* otherwise item paths match, so create MODIFIED record - * (or ADDED and DELETED pair if type changed) - */ - else - error = handle_matched_item(diff, &info); - } - - diff->perf.stat_calls += old_iter->stat_calls + new_iter->stat_calls; - -cleanup: - if (!error) - *diff_ptr = diff; - else - git_diff_free(diff); - - return error; -} - -#define DIFF_FROM_ITERATORS(MAKE_FIRST, FLAGS_FIRST, MAKE_SECOND, FLAGS_SECOND) do { \ - git_iterator *a = NULL, *b = NULL; \ - char *pfx = (opts && !(opts->flags & GIT_DIFF_DISABLE_PATHSPEC_MATCH)) ? \ - git_pathspec_prefix(&opts->pathspec) : NULL; \ - git_iterator_options a_opts = GIT_ITERATOR_OPTIONS_INIT, \ - b_opts = GIT_ITERATOR_OPTIONS_INIT; \ - a_opts.flags = FLAGS_FIRST; \ - a_opts.start = pfx; \ - a_opts.end = pfx; \ - b_opts.flags = FLAGS_SECOND; \ - b_opts.start = pfx; \ - b_opts.end = pfx; \ - GITERR_CHECK_VERSION(opts, GIT_DIFF_OPTIONS_VERSION, "git_diff_options"); \ - if (opts && (opts->flags & GIT_DIFF_DISABLE_PATHSPEC_MATCH)) { \ - a_opts.pathlist.strings = opts->pathspec.strings; \ - a_opts.pathlist.count = opts->pathspec.count; \ - b_opts.pathlist.strings = opts->pathspec.strings; \ - b_opts.pathlist.count = opts->pathspec.count; \ - } \ - if (!error && !(error = MAKE_FIRST) && !(error = MAKE_SECOND)) \ - error = git_diff__from_iterators(diff, repo, a, b, opts); \ - git__free(pfx); git_iterator_free(a); git_iterator_free(b); \ -} while (0) - -int git_diff_tree_to_tree( - git_diff **diff, - git_repository *repo, - git_tree *old_tree, - git_tree *new_tree, - const git_diff_options *opts) -{ - git_iterator_flag_t iflag = GIT_ITERATOR_DONT_IGNORE_CASE; - int error = 0; - - assert(diff && repo); - - /* for tree to tree diff, be case sensitive even if the index is - * currently case insensitive, unless the user explicitly asked - * for case insensitivity - */ - if (opts && (opts->flags & GIT_DIFF_IGNORE_CASE) != 0) - iflag = GIT_ITERATOR_IGNORE_CASE; - - DIFF_FROM_ITERATORS( - git_iterator_for_tree(&a, old_tree, &a_opts), iflag, - git_iterator_for_tree(&b, new_tree, &b_opts), iflag - ); - - return error; -} - -static int diff_load_index(git_index **index, git_repository *repo) -{ - int error = git_repository_index__weakptr(index, repo); - - /* reload the repository index when user did not pass one in */ - if (!error && git_index_read(*index, false) < 0) - giterr_clear(); - - return error; -} - -int git_diff_tree_to_index( - git_diff **diff, - git_repository *repo, - git_tree *old_tree, - git_index *index, - const git_diff_options *opts) -{ - git_iterator_flag_t iflag = GIT_ITERATOR_DONT_IGNORE_CASE | - GIT_ITERATOR_INCLUDE_CONFLICTS; - bool index_ignore_case = false; - int error = 0; - - assert(diff && repo); - - if (!index && (error = diff_load_index(&index, repo)) < 0) - return error; - - index_ignore_case = index->ignore_case; - - DIFF_FROM_ITERATORS( - git_iterator_for_tree(&a, old_tree, &a_opts), iflag, - git_iterator_for_index(&b, repo, index, &b_opts), iflag - ); - - /* if index is in case-insensitive order, re-sort deltas to match */ - if (!error && index_ignore_case) - diff_set_ignore_case(*diff, true); - - return error; -} - -int git_diff_index_to_workdir( - git_diff **diff, - git_repository *repo, - git_index *index, - const git_diff_options *opts) -{ - int error = 0; - - assert(diff && repo); - - if (!index && (error = diff_load_index(&index, repo)) < 0) - return error; - - DIFF_FROM_ITERATORS( - git_iterator_for_index(&a, repo, index, &a_opts), - GIT_ITERATOR_INCLUDE_CONFLICTS, - - git_iterator_for_workdir(&b, repo, index, NULL, &b_opts), - GIT_ITERATOR_DONT_AUTOEXPAND - ); - - if (!error && DIFF_FLAG_IS_SET(*diff, GIT_DIFF_UPDATE_INDEX) && (*diff)->index_updated) - error = git_index_write(index); - - return error; -} - -int git_diff_tree_to_workdir( - git_diff **diff, - git_repository *repo, - git_tree *old_tree, - const git_diff_options *opts) -{ - int error = 0; - git_index *index; - - assert(diff && repo); - - if ((error = git_repository_index__weakptr(&index, repo))) - return error; - - DIFF_FROM_ITERATORS( - git_iterator_for_tree(&a, old_tree, &a_opts), 0, - git_iterator_for_workdir(&b, repo, index, old_tree, &b_opts), GIT_ITERATOR_DONT_AUTOEXPAND - ); - - return error; -} - -int git_diff_tree_to_workdir_with_index( - git_diff **diff, - git_repository *repo, - git_tree *old_tree, - const git_diff_options *opts) -{ - int error = 0; - git_diff *d1 = NULL, *d2 = NULL; - git_index *index = NULL; - - assert(diff && repo); - - if ((error = diff_load_index(&index, repo)) < 0) - return error; - - if (!(error = git_diff_tree_to_index(&d1, repo, old_tree, index, opts)) && - !(error = git_diff_index_to_workdir(&d2, repo, index, opts))) - error = git_diff_merge(d1, d2); - - git_diff_free(d2); - - if (error) { - git_diff_free(d1); - d1 = NULL; - } - - *diff = d1; - return error; -} - -int git_diff_index_to_index( - git_diff **diff, - git_repository *repo, - git_index *old_index, - git_index *new_index, - const git_diff_options *opts) -{ - int error = 0; - - assert(diff && old_index && new_index); - - DIFF_FROM_ITERATORS( - git_iterator_for_index(&a, repo, old_index, &a_opts), GIT_ITERATOR_DONT_IGNORE_CASE, - git_iterator_for_index(&b, repo, new_index, &b_opts), GIT_ITERATOR_DONT_IGNORE_CASE - ); - - /* if index is in case-insensitive order, re-sort deltas to match */ - if (!error && (old_index->ignore_case || new_index->ignore_case)) - diff_set_ignore_case(*diff, true); - - return error; -} - -size_t git_diff_num_deltas(const git_diff *diff) -{ - assert(diff); - return diff->deltas.length; -} - -size_t git_diff_num_deltas_of_type(const git_diff *diff, git_delta_t type) -{ - size_t i, count = 0; - const git_diff_delta *delta; - - assert(diff); - - git_vector_foreach(&diff->deltas, i, delta) { - count += (delta->status == type); - } - - return count; -} - -const git_diff_delta *git_diff_get_delta(const git_diff *diff, size_t idx) -{ - assert(diff); - return git_vector_get(&diff->deltas, idx); -} - -int git_diff_is_sorted_icase(const git_diff *diff) -{ - return (diff->opts.flags & GIT_DIFF_IGNORE_CASE) != 0; -} - -int git_diff_get_perfdata(git_diff_perfdata *out, const git_diff *diff) -{ - assert(out); - GITERR_CHECK_VERSION(out, GIT_DIFF_PERFDATA_VERSION, "git_diff_perfdata"); - out->stat_calls = diff->perf.stat_calls; - out->oid_calculations = diff->perf.oid_calculations; - return 0; -} - -int git_diff__paired_foreach( - git_diff *head2idx, - git_diff *idx2wd, - int (*cb)(git_diff_delta *h2i, git_diff_delta *i2w, void *payload), - void *payload) -{ - int cmp, error = 0; - git_diff_delta *h2i, *i2w; - size_t i, j, i_max, j_max; - int (*strcomp)(const char *, const char *) = git__strcmp; - bool h2i_icase, i2w_icase, icase_mismatch; - - i_max = head2idx ? head2idx->deltas.length : 0; - j_max = idx2wd ? idx2wd->deltas.length : 0; - if (!i_max && !j_max) - return 0; - - /* At some point, tree-to-index diffs will probably never ignore case, - * even if that isn't true now. Index-to-workdir diffs may or may not - * ignore case, but the index filename for the idx2wd diff should - * still be using the canonical case-preserving name. - * - * Therefore the main thing we need to do here is make sure the diffs - * are traversed in a compatible order. To do this, we temporarily - * resort a mismatched diff to get the order correct. - * - * In order to traverse renames in the index->workdir, we need to - * ensure that we compare the index name on both sides, so we - * always sort by the old name in the i2w list. - */ - h2i_icase = head2idx != NULL && - (head2idx->opts.flags & GIT_DIFF_IGNORE_CASE) != 0; - - i2w_icase = idx2wd != NULL && - (idx2wd->opts.flags & GIT_DIFF_IGNORE_CASE) != 0; - - icase_mismatch = - (head2idx != NULL && idx2wd != NULL && h2i_icase != i2w_icase); - - if (icase_mismatch && h2i_icase) { - git_vector_set_cmp(&head2idx->deltas, git_diff_delta__cmp); - git_vector_sort(&head2idx->deltas); - } - - if (i2w_icase && !icase_mismatch) { - strcomp = git__strcasecmp; - - git_vector_set_cmp(&idx2wd->deltas, git_diff_delta__i2w_casecmp); - git_vector_sort(&idx2wd->deltas); - } else if (idx2wd != NULL) { - git_vector_set_cmp(&idx2wd->deltas, git_diff_delta__i2w_cmp); - git_vector_sort(&idx2wd->deltas); - } - - for (i = 0, j = 0; i < i_max || j < j_max; ) { - h2i = head2idx ? GIT_VECTOR_GET(&head2idx->deltas, i) : NULL; - i2w = idx2wd ? GIT_VECTOR_GET(&idx2wd->deltas, j) : NULL; - - cmp = !i2w ? -1 : !h2i ? 1 : - strcomp(h2i->new_file.path, i2w->old_file.path); - - if (cmp < 0) { - i++; i2w = NULL; - } else if (cmp > 0) { - j++; h2i = NULL; - } else { - i++; j++; - } - - if ((error = cb(h2i, i2w, payload)) != 0) { - giterr_set_after_callback(error); - break; - } - } - - /* restore case-insensitive delta sort */ - if (icase_mismatch && h2i_icase) { - git_vector_set_cmp(&head2idx->deltas, git_diff_delta__casecmp); - git_vector_sort(&head2idx->deltas); - } - - /* restore idx2wd sort by new path */ - if (idx2wd != NULL) { - git_vector_set_cmp(&idx2wd->deltas, - i2w_icase ? git_diff_delta__casecmp : git_diff_delta__cmp); - git_vector_sort(&idx2wd->deltas); - } - - return error; -} - -int git_diff__commit( - git_diff **diff, - git_repository *repo, - const git_commit *commit, - const git_diff_options *opts) -{ - git_commit *parent = NULL; - git_diff *commit_diff = NULL; - git_tree *old_tree = NULL, *new_tree = NULL; - size_t parents; - int error = 0; - - if ((parents = git_commit_parentcount(commit)) > 1) { - char commit_oidstr[GIT_OID_HEXSZ + 1]; - - error = -1; - giterr_set(GITERR_INVALID, "Commit %s is a merge commit", - git_oid_tostr(commit_oidstr, GIT_OID_HEXSZ + 1, git_commit_id(commit))); - goto on_error; - } - - if (parents > 0) - if ((error = git_commit_parent(&parent, commit, 0)) < 0 || - (error = git_commit_tree(&old_tree, parent)) < 0) - goto on_error; - - if ((error = git_commit_tree(&new_tree, commit)) < 0 || - (error = git_diff_tree_to_tree(&commit_diff, repo, old_tree, new_tree, opts)) < 0) - goto on_error; - - *diff = commit_diff; - -on_error: - git_tree_free(new_tree); - git_tree_free(old_tree); - git_commit_free(parent); - - return error; -} - -int git_diff_format_email__append_header_tobuf( - git_buf *out, - const git_oid *id, - const git_signature *author, - const char *summary, - const char *body, - size_t patch_no, - size_t total_patches, - bool exclude_patchno_marker) -{ - char idstr[GIT_OID_HEXSZ + 1]; - char date_str[GIT_DATE_RFC2822_SZ]; - int error = 0; - - git_oid_fmt(idstr, id); - idstr[GIT_OID_HEXSZ] = '\0'; - - if ((error = git__date_rfc2822_fmt(date_str, sizeof(date_str), &author->when)) < 0) - return error; - - error = git_buf_printf(out, - "From %s Mon Sep 17 00:00:00 2001\n" \ - "From: %s <%s>\n" \ - "Date: %s\n" \ - "Subject: ", - idstr, - author->name, author->email, - date_str); - - if (error < 0) - return error; - - if (!exclude_patchno_marker) { - if (total_patches == 1) { - error = git_buf_puts(out, "[PATCH] "); - } else { - error = git_buf_printf(out, "[PATCH %"PRIuZ"/%"PRIuZ"] ", patch_no, total_patches); - } - - if (error < 0) - return error; - } - - error = git_buf_printf(out, "%s\n\n", summary); - - if (body) { - git_buf_puts(out, body); - - if (out->ptr[out->size - 1] != '\n') - git_buf_putc(out, '\n'); - } - - return error; -} - -int git_diff_format_email__append_patches_tobuf( - git_buf *out, - git_diff *diff) -{ - size_t i, deltas; - int error = 0; - - deltas = git_diff_num_deltas(diff); - - for (i = 0; i < deltas; ++i) { - git_patch *patch = NULL; - - if ((error = git_patch_from_diff(&patch, diff, i)) >= 0) - error = git_patch_to_buf(out, patch); - - git_patch_free(patch); - - if (error < 0) - break; - } - - return error; -} - -int git_diff_format_email( - git_buf *out, - git_diff *diff, - const git_diff_format_email_options *opts) -{ - git_diff_stats *stats = NULL; - char *summary = NULL, *loc = NULL; - bool ignore_marker; - unsigned int format_flags = 0; - size_t allocsize; - int error; - - assert(out && diff && opts); - assert(opts->summary && opts->id && opts->author); - - GITERR_CHECK_VERSION(opts, GIT_DIFF_FORMAT_EMAIL_OPTIONS_VERSION, "git_format_email_options"); - - if ((ignore_marker = opts->flags & GIT_DIFF_FORMAT_EMAIL_EXCLUDE_SUBJECT_PATCH_MARKER) == false) { - if (opts->patch_no > opts->total_patches) { - giterr_set(GITERR_INVALID, "patch %"PRIuZ" out of range. max %"PRIuZ, opts->patch_no, opts->total_patches); - return -1; - } - - if (opts->patch_no == 0) { - giterr_set(GITERR_INVALID, "invalid patch no %"PRIuZ". should be >0", opts->patch_no); - return -1; - } - } - - /* the summary we receive may not be clean. - * it could potentially contain new line characters - * or not be set, sanitize, */ - if ((loc = strpbrk(opts->summary, "\r\n")) != NULL) { - size_t offset = 0; - - if ((offset = (loc - opts->summary)) == 0) { - giterr_set(GITERR_INVALID, "summary is empty"); - error = -1; - goto on_error; - } - - GITERR_CHECK_ALLOC_ADD(&allocsize, offset, 1); - summary = git__calloc(allocsize, sizeof(char)); - GITERR_CHECK_ALLOC(summary); - - strncpy(summary, opts->summary, offset); - } - - error = git_diff_format_email__append_header_tobuf(out, - opts->id, opts->author, summary == NULL ? opts->summary : summary, - opts->body, opts->patch_no, opts->total_patches, ignore_marker); - - if (error < 0) - goto on_error; - - format_flags = GIT_DIFF_STATS_FULL | GIT_DIFF_STATS_INCLUDE_SUMMARY; - - if ((error = git_buf_puts(out, "---\n")) < 0 || - (error = git_diff_get_stats(&stats, diff)) < 0 || - (error = git_diff_stats_to_buf(out, stats, format_flags, 0)) < 0 || - (error = git_buf_putc(out, '\n')) < 0 || - (error = git_diff_format_email__append_patches_tobuf(out, diff)) < 0) - goto on_error; - - error = git_buf_puts(out, "--\nlibgit2 " LIBGIT2_VERSION "\n\n"); - -on_error: - git__free(summary); - git_diff_stats_free(stats); - - return error; -} - -int git_diff_commit_as_email( - git_buf *out, - git_repository *repo, - git_commit *commit, - size_t patch_no, - size_t total_patches, - git_diff_format_email_flags_t flags, - const git_diff_options *diff_opts) -{ - git_diff *diff = NULL; - git_diff_format_email_options opts = GIT_DIFF_FORMAT_EMAIL_OPTIONS_INIT; - int error; - - assert (out && repo && commit); - - opts.flags = flags; - opts.patch_no = patch_no; - opts.total_patches = total_patches; - opts.id = git_commit_id(commit); - opts.summary = git_commit_summary(commit); - opts.body = git_commit_body(commit); - opts.author = git_commit_author(commit); - - if ((error = git_diff__commit(&diff, repo, commit, diff_opts)) < 0) - return error; - - error = git_diff_format_email(out, diff, &opts); - - git_diff_free(diff); - return error; -} - -int git_diff_init_options(git_diff_options *opts, unsigned int version) -{ - GIT_INIT_STRUCTURE_FROM_TEMPLATE( - opts, version, git_diff_options, GIT_DIFF_OPTIONS_INIT); - return 0; -} - -int git_diff_find_init_options( - git_diff_find_options *opts, unsigned int version) -{ - GIT_INIT_STRUCTURE_FROM_TEMPLATE( - opts, version, git_diff_find_options, GIT_DIFF_FIND_OPTIONS_INIT); - return 0; -} - -int git_diff_format_email_init_options( - git_diff_format_email_options *opts, unsigned int version) -{ - GIT_INIT_STRUCTURE_FROM_TEMPLATE( - opts, version, git_diff_format_email_options, - GIT_DIFF_FORMAT_EMAIL_OPTIONS_INIT); - return 0; -} diff --git a/vendor/libgit2/src/diff.h b/vendor/libgit2/src/diff.h deleted file mode 100644 index 47743f88b..000000000 --- a/vendor/libgit2/src/diff.h +++ /dev/null @@ -1,174 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_diff_h__ -#define INCLUDE_diff_h__ - -#include "git2/diff.h" -#include "git2/sys/diff.h" -#include "git2/oid.h" - -#include -#include "vector.h" -#include "buffer.h" -#include "iterator.h" -#include "repository.h" -#include "pool.h" -#include "odb.h" - -#define DIFF_OLD_PREFIX_DEFAULT "a/" -#define DIFF_NEW_PREFIX_DEFAULT "b/" - -enum { - GIT_DIFFCAPS_HAS_SYMLINKS = (1 << 0), /* symlinks on platform? */ - GIT_DIFFCAPS_IGNORE_STAT = (1 << 1), /* use stat? */ - GIT_DIFFCAPS_TRUST_MODE_BITS = (1 << 2), /* use st_mode? */ - GIT_DIFFCAPS_TRUST_CTIME = (1 << 3), /* use st_ctime? */ - GIT_DIFFCAPS_USE_DEV = (1 << 4), /* use st_dev? */ -}; - -#define DIFF_FLAGS_KNOWN_BINARY (GIT_DIFF_FLAG_BINARY|GIT_DIFF_FLAG_NOT_BINARY) -#define DIFF_FLAGS_NOT_BINARY (GIT_DIFF_FLAG_NOT_BINARY|GIT_DIFF_FLAG__NO_DATA) - -enum { - GIT_DIFF_FLAG__FREE_PATH = (1 << 7), /* `path` is allocated memory */ - GIT_DIFF_FLAG__FREE_DATA = (1 << 8), /* internal file data is allocated */ - GIT_DIFF_FLAG__UNMAP_DATA = (1 << 9), /* internal file data is mmap'ed */ - GIT_DIFF_FLAG__NO_DATA = (1 << 10), /* file data should not be loaded */ - GIT_DIFF_FLAG__FREE_BLOB = (1 << 11), /* release the blob when done */ - GIT_DIFF_FLAG__LOADED = (1 << 12), /* file data has been loaded */ - - GIT_DIFF_FLAG__TO_DELETE = (1 << 16), /* delete entry during rename det. */ - GIT_DIFF_FLAG__TO_SPLIT = (1 << 17), /* split entry during rename det. */ - GIT_DIFF_FLAG__IS_RENAME_TARGET = (1 << 18), - GIT_DIFF_FLAG__IS_RENAME_SOURCE = (1 << 19), - GIT_DIFF_FLAG__HAS_SELF_SIMILARITY = (1 << 20), -}; - -#define GIT_DIFF_FLAG__CLEAR_INTERNAL(F) (F) = ((F) & 0x00FFFF) - -#define GIT_DIFF__VERBOSE (1 << 30) - -struct git_diff { - git_refcount rc; - git_repository *repo; - git_diff_options opts; - git_vector pathspec; - git_vector deltas; /* vector of git_diff_delta */ - git_pool pool; - git_iterator_type_t old_src; - git_iterator_type_t new_src; - uint32_t diffcaps; - git_diff_perfdata perf; - bool index_updated; - - int (*strcomp)(const char *, const char *); - int (*strncomp)(const char *, const char *, size_t); - int (*pfxcomp)(const char *str, const char *pfx); - int (*entrycomp)(const void *a, const void *b); -}; - -extern void git_diff__cleanup_modes( - uint32_t diffcaps, uint32_t *omode, uint32_t *nmode); - -extern void git_diff_addref(git_diff *diff); - -extern int git_diff_delta__cmp(const void *a, const void *b); -extern int git_diff_delta__casecmp(const void *a, const void *b); - -extern const char *git_diff_delta__path(const git_diff_delta *delta); - -extern bool git_diff_delta__should_skip( - const git_diff_options *opts, const git_diff_delta *delta); - -extern int git_diff_delta__format_file_header( - git_buf *out, - const git_diff_delta *delta, - const char *oldpfx, - const char *newpfx, - int oid_strlen); - -extern int git_diff__oid_for_file( - git_oid *out, git_diff *, const char *, uint16_t, git_off_t); -extern int git_diff__oid_for_entry( - git_oid *out, git_diff *, const git_index_entry *, uint16_t, const git_oid *update); - -extern int git_diff__from_iterators( - git_diff **diff_ptr, - git_repository *repo, - git_iterator *old_iter, - git_iterator *new_iter, - const git_diff_options *opts); - -extern int git_diff__paired_foreach( - git_diff *idx2head, - git_diff *wd2idx, - int (*cb)(git_diff_delta *i2h, git_diff_delta *w2i, void *payload), - void *payload); - -extern int git_diff_find_similar__hashsig_for_file( - void **out, const git_diff_file *f, const char *path, void *p); - -extern int git_diff_find_similar__hashsig_for_buf( - void **out, const git_diff_file *f, const char *buf, size_t len, void *p); - -extern void git_diff_find_similar__hashsig_free(void *sig, void *payload); - -extern int git_diff_find_similar__calc_similarity( - int *score, void *siga, void *sigb, void *payload); - -extern int git_diff__commit( - git_diff **diff, git_repository *repo, const git_commit *commit, const git_diff_options *opts); - -/* Merge two `git_diff`s according to the callback given by `cb`. */ - -typedef git_diff_delta *(*git_diff__merge_cb)( - const git_diff_delta *left, - const git_diff_delta *right, - git_pool *pool); - -extern int git_diff__merge( - git_diff *onto, const git_diff *from, git_diff__merge_cb cb); - -extern git_diff_delta *git_diff__merge_like_cgit( - const git_diff_delta *a, - const git_diff_delta *b, - git_pool *pool); - -/* Duplicate a `git_diff_delta` out of the `git_pool` */ -extern git_diff_delta *git_diff__delta_dup( - const git_diff_delta *d, git_pool *pool); - -/* - * Sometimes a git_diff_file will have a zero size; this attempts to - * fill in the size without loading the blob if possible. If that is - * not possible, then it will return the git_odb_object that had to be - * loaded and the caller can use it or dispose of it as needed. - */ -GIT_INLINE(int) git_diff_file__resolve_zero_size( - git_diff_file *file, git_odb_object **odb_obj, git_repository *repo) -{ - int error; - git_odb *odb; - size_t len; - git_otype type; - - if ((error = git_repository_odb(&odb, repo)) < 0) - return error; - - error = git_odb__read_header_or_object( - odb_obj, &len, &type, odb, &file->id); - - git_odb_free(odb); - - if (!error) - file->size = (git_off_t)len; - - return error; -} - -#endif - diff --git a/vendor/libgit2/src/diff_driver.c b/vendor/libgit2/src/diff_driver.c deleted file mode 100644 index bc3518991..000000000 --- a/vendor/libgit2/src/diff_driver.c +++ /dev/null @@ -1,523 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#include "common.h" - -#include "git2/attr.h" - -#include "diff.h" -#include "diff_patch.h" -#include "diff_driver.h" -#include "strmap.h" -#include "map.h" -#include "buf_text.h" -#include "config.h" -#include "repository.h" - -GIT__USE_STRMAP - -typedef enum { - DIFF_DRIVER_AUTO = 0, - DIFF_DRIVER_BINARY = 1, - DIFF_DRIVER_TEXT = 2, - DIFF_DRIVER_PATTERNLIST = 3, -} git_diff_driver_t; - -typedef struct { - regex_t re; - int flags; -} git_diff_driver_pattern; - -enum { - REG_NEGATE = (1 << 15) /* get out of the way of existing flags */ -}; - -/* data for finding function context for a given file type */ -struct git_diff_driver { - git_diff_driver_t type; - uint32_t binary_flags; - uint32_t other_flags; - git_array_t(git_diff_driver_pattern) fn_patterns; - regex_t word_pattern; - char name[GIT_FLEX_ARRAY]; -}; - -#include "userdiff.h" - -struct git_diff_driver_registry { - git_strmap *drivers; -}; - -#define FORCE_DIFFABLE (GIT_DIFF_FORCE_TEXT | GIT_DIFF_FORCE_BINARY) - -static git_diff_driver global_drivers[3] = { - { DIFF_DRIVER_AUTO, 0, 0, }, - { DIFF_DRIVER_BINARY, GIT_DIFF_FORCE_BINARY, 0 }, - { DIFF_DRIVER_TEXT, GIT_DIFF_FORCE_TEXT, 0 }, -}; - -git_diff_driver_registry *git_diff_driver_registry_new() -{ - git_diff_driver_registry *reg = - git__calloc(1, sizeof(git_diff_driver_registry)); - if (!reg) - return NULL; - - if (git_strmap_alloc(®->drivers) < 0) { - git_diff_driver_registry_free(reg); - return NULL; - } - - return reg; -} - -void git_diff_driver_registry_free(git_diff_driver_registry *reg) -{ - git_diff_driver *drv; - - if (!reg) - return; - - git_strmap_foreach_value(reg->drivers, drv, git_diff_driver_free(drv)); - git_strmap_free(reg->drivers); - git__free(reg); -} - -static int diff_driver_add_patterns( - git_diff_driver *drv, const char *regex_str, int regex_flags) -{ - int error = 0; - const char *scan, *end; - git_diff_driver_pattern *pat = NULL; - git_buf buf = GIT_BUF_INIT; - - for (scan = regex_str; scan; scan = end) { - /* get pattern to fill in */ - if ((pat = git_array_alloc(drv->fn_patterns)) == NULL) { - return -1; - } - - pat->flags = regex_flags; - if (*scan == '!') { - pat->flags |= REG_NEGATE; - ++scan; - } - - if ((end = strchr(scan, '\n')) != NULL) { - error = git_buf_set(&buf, scan, end - scan); - end++; - } else { - error = git_buf_sets(&buf, scan); - } - if (error < 0) - break; - - if ((error = regcomp(&pat->re, buf.ptr, regex_flags)) != 0) { - /* - * TODO: issue a warning - */ - } - } - - if (error && pat != NULL) - (void)git_array_pop(drv->fn_patterns); /* release last item */ - git_buf_free(&buf); - - /* We want to ignore bad patterns, so return success regardless */ - return 0; -} - -static int diff_driver_xfuncname(const git_config_entry *entry, void *payload) -{ - return diff_driver_add_patterns(payload, entry->value, REG_EXTENDED); -} - -static int diff_driver_funcname(const git_config_entry *entry, void *payload) -{ - return diff_driver_add_patterns(payload, entry->value, 0); -} - -static git_diff_driver_registry *git_repository_driver_registry( - git_repository *repo) -{ - if (!repo->diff_drivers) { - git_diff_driver_registry *reg = git_diff_driver_registry_new(); - reg = git__compare_and_swap(&repo->diff_drivers, NULL, reg); - - if (reg != NULL) /* if we race, free losing allocation */ - git_diff_driver_registry_free(reg); - } - - if (!repo->diff_drivers) - giterr_set(GITERR_REPOSITORY, "Unable to create diff driver registry"); - - return repo->diff_drivers; -} - -static int diff_driver_alloc( - git_diff_driver **out, size_t *namelen_out, const char *name) -{ - git_diff_driver *driver; - size_t driverlen = sizeof(git_diff_driver), - namelen = strlen(name), - alloclen; - - GITERR_CHECK_ALLOC_ADD(&alloclen, driverlen, namelen); - GITERR_CHECK_ALLOC_ADD(&alloclen, alloclen, 1); - - driver = git__calloc(1, alloclen); - GITERR_CHECK_ALLOC(driver); - - memcpy(driver->name, name, namelen); - - *out = driver; - - if (namelen_out) - *namelen_out = namelen; - - return 0; -} - -static int git_diff_driver_builtin( - git_diff_driver **out, - git_diff_driver_registry *reg, - const char *driver_name) -{ - int error = 0; - git_diff_driver_definition *ddef = NULL; - git_diff_driver *drv = NULL; - size_t idx; - - for (idx = 0; idx < ARRAY_SIZE(builtin_defs); ++idx) { - if (!strcasecmp(driver_name, builtin_defs[idx].name)) { - ddef = &builtin_defs[idx]; - break; - } - } - if (!ddef) - goto done; - - if ((error = diff_driver_alloc(&drv, NULL, ddef->name)) < 0) - goto done; - - drv->type = DIFF_DRIVER_PATTERNLIST; - - if (ddef->fns && - (error = diff_driver_add_patterns( - drv, ddef->fns, ddef->flags | REG_EXTENDED)) < 0) - goto done; - - if (ddef->words && - (error = regcomp( - &drv->word_pattern, ddef->words, ddef->flags | REG_EXTENDED))) - { - error = giterr_set_regex(&drv->word_pattern, error); - goto done; - } - - git_strmap_insert(reg->drivers, drv->name, drv, error); - if (error > 0) - error = 0; - -done: - if (error && drv) - git_diff_driver_free(drv); - else - *out = drv; - - return error; -} - -static int git_diff_driver_load( - git_diff_driver **out, git_repository *repo, const char *driver_name) -{ - int error = 0; - git_diff_driver_registry *reg; - git_diff_driver *drv = NULL; - size_t namelen; - khiter_t pos; - git_config *cfg = NULL; - git_buf name = GIT_BUF_INIT; - git_config_entry *ce = NULL; - bool found_driver = false; - - if ((reg = git_repository_driver_registry(repo)) == NULL) - return -1; - - pos = git_strmap_lookup_index(reg->drivers, driver_name); - if (git_strmap_valid_index(reg->drivers, pos)) { - *out = git_strmap_value_at(reg->drivers, pos); - return 0; - } - - if ((error = diff_driver_alloc(&drv, &namelen, driver_name)) < 0) - goto done; - - drv->type = DIFF_DRIVER_AUTO; - - /* if you can't read config for repo, just use default driver */ - if (git_repository_config_snapshot(&cfg, repo) < 0) { - giterr_clear(); - goto done; - } - - if ((error = git_buf_printf(&name, "diff.%s.binary", driver_name)) < 0) - goto done; - - switch (git_config__get_bool_force(cfg, name.ptr, -1)) { - case true: - /* if diff..binary is true, just return the binary driver */ - *out = &global_drivers[DIFF_DRIVER_BINARY]; - goto done; - case false: - /* if diff..binary is false, force binary checks off */ - /* but still may have custom function context patterns, etc. */ - drv->binary_flags = GIT_DIFF_FORCE_TEXT; - found_driver = true; - break; - default: - /* diff..binary unspecified or "auto", so just continue */ - break; - } - - /* TODO: warn if diff..command or diff..textconv are set */ - - git_buf_truncate(&name, namelen + strlen("diff..")); - git_buf_put(&name, "xfuncname", strlen("xfuncname")); - if ((error = git_config_get_multivar_foreach( - cfg, name.ptr, NULL, diff_driver_xfuncname, drv)) < 0) { - if (error != GIT_ENOTFOUND) - goto done; - giterr_clear(); /* no diff..xfuncname, so just continue */ - } - - git_buf_truncate(&name, namelen + strlen("diff..")); - git_buf_put(&name, "funcname", strlen("funcname")); - if ((error = git_config_get_multivar_foreach( - cfg, name.ptr, NULL, diff_driver_funcname, drv)) < 0) { - if (error != GIT_ENOTFOUND) - goto done; - giterr_clear(); /* no diff..funcname, so just continue */ - } - - /* if we found any patterns, set driver type to use correct callback */ - if (git_array_size(drv->fn_patterns) > 0) { - drv->type = DIFF_DRIVER_PATTERNLIST; - found_driver = true; - } - - git_buf_truncate(&name, namelen + strlen("diff..")); - git_buf_put(&name, "wordregex", strlen("wordregex")); - if ((error = git_config__lookup_entry(&ce, cfg, name.ptr, false)) < 0) - goto done; - if (!ce || !ce->value) - /* no diff..wordregex, so just continue */; - else if (!(error = regcomp(&drv->word_pattern, ce->value, REG_EXTENDED))) - found_driver = true; - else { - /* TODO: warn about bad regex instead of failure */ - error = giterr_set_regex(&drv->word_pattern, error); - goto done; - } - - /* TODO: look up diff..algorithm to turn on minimal / patience - * diff in drv->other_flags - */ - - /* if no driver config found at all, fall back on AUTO driver */ - if (!found_driver) - goto done; - - /* store driver in registry */ - git_strmap_insert(reg->drivers, drv->name, drv, error); - if (error < 0) - goto done; - error = 0; - - *out = drv; - -done: - git_config_entry_free(ce); - git_buf_free(&name); - git_config_free(cfg); - - if (!*out) { - int error2 = git_diff_driver_builtin(out, reg, driver_name); - if (!error) - error = error2; - } - - if (drv && drv != *out) - git_diff_driver_free(drv); - - return error; -} - -int git_diff_driver_lookup( - git_diff_driver **out, git_repository *repo, const char *path) -{ - int error = 0; - const char *value; - - assert(out); - *out = NULL; - - if (!repo || !path || !strlen(path)) - /* just use the auto value */; - else if ((error = git_attr_get(&value, repo, 0, path, "diff")) < 0) - /* return error below */; - else if (GIT_ATTR_UNSPECIFIED(value)) - /* just use the auto value */; - else if (GIT_ATTR_FALSE(value)) - *out = &global_drivers[DIFF_DRIVER_BINARY]; - else if (GIT_ATTR_TRUE(value)) - *out = &global_drivers[DIFF_DRIVER_TEXT]; - - /* otherwise look for driver information in config and build driver */ - else if ((error = git_diff_driver_load(out, repo, value)) < 0) { - if (error == GIT_ENOTFOUND) { - error = 0; - giterr_clear(); - } - } - - if (!*out) - *out = &global_drivers[DIFF_DRIVER_AUTO]; - - return error; -} - -void git_diff_driver_free(git_diff_driver *driver) -{ - size_t i; - - if (!driver) - return; - - for (i = 0; i < git_array_size(driver->fn_patterns); ++i) - regfree(& git_array_get(driver->fn_patterns, i)->re); - git_array_clear(driver->fn_patterns); - - regfree(&driver->word_pattern); - - git__free(driver); -} - -void git_diff_driver_update_options( - uint32_t *option_flags, git_diff_driver *driver) -{ - if ((*option_flags & FORCE_DIFFABLE) == 0) - *option_flags |= driver->binary_flags; - - *option_flags |= driver->other_flags; -} - -int git_diff_driver_content_is_binary( - git_diff_driver *driver, const char *content, size_t content_len) -{ - git_buf search = GIT_BUF_INIT; - - GIT_UNUSED(driver); - - git_buf_attach_notowned(&search, content, - min(content_len, GIT_FILTER_BYTES_TO_CHECK_NUL)); - - /* TODO: provide encoding / binary detection callbacks that can - * be UTF-8 aware, etc. For now, instead of trying to be smart, - * let's just use the simple NUL-byte detection that core git uses. - */ - - /* previously was: if (git_buf_text_is_binary(&search)) */ - if (git_buf_text_contains_nul(&search)) - return 1; - - return 0; -} - -static int diff_context_line__simple( - git_diff_driver *driver, git_buf *line) -{ - char firstch = line->ptr[0]; - GIT_UNUSED(driver); - return (git__isalpha(firstch) || firstch == '_' || firstch == '$'); -} - -static int diff_context_line__pattern_match( - git_diff_driver *driver, git_buf *line) -{ - size_t i, maxi = git_array_size(driver->fn_patterns); - regmatch_t pmatch[2]; - - for (i = 0; i < maxi; ++i) { - git_diff_driver_pattern *pat = git_array_get(driver->fn_patterns, i); - - if (!regexec(&pat->re, line->ptr, 2, pmatch, 0)) { - if (pat->flags & REG_NEGATE) - return false; - - /* use pmatch data to trim line data */ - i = (pmatch[1].rm_so >= 0) ? 1 : 0; - git_buf_consume(line, git_buf_cstr(line) + pmatch[i].rm_so); - git_buf_truncate(line, pmatch[i].rm_eo - pmatch[i].rm_so); - git_buf_rtrim(line); - - return true; - } - } - - return false; -} - -static long diff_context_find( - const char *line, - long line_len, - char *out, - long out_size, - void *payload) -{ - git_diff_find_context_payload *ctxt = payload; - - if (git_buf_set(&ctxt->line, line, (size_t)line_len) < 0) - return -1; - git_buf_rtrim(&ctxt->line); - - if (!ctxt->line.size) - return -1; - - if (!ctxt->match_line || !ctxt->match_line(ctxt->driver, &ctxt->line)) - return -1; - - if (out_size > (long)ctxt->line.size) - out_size = (long)ctxt->line.size; - memcpy(out, ctxt->line.ptr, (size_t)out_size); - - return out_size; -} - -void git_diff_find_context_init( - git_diff_find_context_fn *findfn_out, - git_diff_find_context_payload *payload_out, - git_diff_driver *driver) -{ - *findfn_out = driver ? diff_context_find : NULL; - - memset(payload_out, 0, sizeof(*payload_out)); - if (driver) { - payload_out->driver = driver; - payload_out->match_line = (driver->type == DIFF_DRIVER_PATTERNLIST) ? - diff_context_line__pattern_match : diff_context_line__simple; - git_buf_init(&payload_out->line, 0); - } -} - -void git_diff_find_context_clear(git_diff_find_context_payload *payload) -{ - if (payload) { - git_buf_free(&payload->line); - payload->driver = NULL; - } -} - diff --git a/vendor/libgit2/src/diff_driver.h b/vendor/libgit2/src/diff_driver.h deleted file mode 100644 index 0706dcfc5..000000000 --- a/vendor/libgit2/src/diff_driver.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_diff_driver_h__ -#define INCLUDE_diff_driver_h__ - -#include "common.h" -#include "buffer.h" - -typedef struct git_diff_driver_registry git_diff_driver_registry; - -git_diff_driver_registry *git_diff_driver_registry_new(void); -void git_diff_driver_registry_free(git_diff_driver_registry *); - -typedef struct git_diff_driver git_diff_driver; - -int git_diff_driver_lookup(git_diff_driver **, git_repository *, const char *); -void git_diff_driver_free(git_diff_driver *); - -/* diff option flags to force off and on for this driver */ -void git_diff_driver_update_options(uint32_t *option_flags, git_diff_driver *); - -/* returns -1 meaning "unknown", 0 meaning not binary, 1 meaning binary */ -int git_diff_driver_content_is_binary( - git_diff_driver *, const char *content, size_t content_len); - -typedef long (*git_diff_find_context_fn)( - const char *, long, char *, long, void *); - -typedef int (*git_diff_find_context_line)( - git_diff_driver *, git_buf *); - -typedef struct { - git_diff_driver *driver; - git_diff_find_context_line match_line; - git_buf line; -} git_diff_find_context_payload; - -void git_diff_find_context_init( - git_diff_find_context_fn *findfn_out, - git_diff_find_context_payload *payload_out, - git_diff_driver *driver); - -void git_diff_find_context_clear(git_diff_find_context_payload *); - -#endif diff --git a/vendor/libgit2/src/diff_file.c b/vendor/libgit2/src/diff_file.c deleted file mode 100644 index ecc34cf55..000000000 --- a/vendor/libgit2/src/diff_file.c +++ /dev/null @@ -1,464 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#include "common.h" -#include "git2/blob.h" -#include "git2/submodule.h" -#include "diff.h" -#include "diff_file.h" -#include "odb.h" -#include "fileops.h" -#include "filter.h" - -#define DIFF_MAX_FILESIZE 0x20000000 - -static bool diff_file_content_binary_by_size(git_diff_file_content *fc) -{ - /* if we have diff opts, check max_size vs file size */ - if ((fc->file->flags & DIFF_FLAGS_KNOWN_BINARY) == 0 && - fc->opts_max_size > 0 && - fc->file->size > fc->opts_max_size) - fc->file->flags |= GIT_DIFF_FLAG_BINARY; - - return ((fc->file->flags & GIT_DIFF_FLAG_BINARY) != 0); -} - -static void diff_file_content_binary_by_content(git_diff_file_content *fc) -{ - if ((fc->file->flags & DIFF_FLAGS_KNOWN_BINARY) != 0) - return; - - switch (git_diff_driver_content_is_binary( - fc->driver, fc->map.data, fc->map.len)) { - case 0: fc->file->flags |= GIT_DIFF_FLAG_NOT_BINARY; break; - case 1: fc->file->flags |= GIT_DIFF_FLAG_BINARY; break; - default: break; - } -} - -static int diff_file_content_init_common( - git_diff_file_content *fc, const git_diff_options *opts) -{ - fc->opts_flags = opts ? opts->flags : GIT_DIFF_NORMAL; - - if (opts && opts->max_size >= 0) - fc->opts_max_size = opts->max_size ? - opts->max_size : DIFF_MAX_FILESIZE; - - if (fc->src == GIT_ITERATOR_TYPE_EMPTY) - fc->src = GIT_ITERATOR_TYPE_TREE; - - if (!fc->driver && - git_diff_driver_lookup(&fc->driver, fc->repo, fc->file->path) < 0) - return -1; - - /* give driver a chance to modify options */ - git_diff_driver_update_options(&fc->opts_flags, fc->driver); - - /* make sure file is conceivable mmap-able */ - if ((git_off_t)((size_t)fc->file->size) != fc->file->size) - fc->file->flags |= GIT_DIFF_FLAG_BINARY; - /* check if user is forcing text diff the file */ - else if (fc->opts_flags & GIT_DIFF_FORCE_TEXT) { - fc->file->flags &= ~GIT_DIFF_FLAG_BINARY; - fc->file->flags |= GIT_DIFF_FLAG_NOT_BINARY; - } - /* check if user is forcing binary diff the file */ - else if (fc->opts_flags & GIT_DIFF_FORCE_BINARY) { - fc->file->flags &= ~GIT_DIFF_FLAG_NOT_BINARY; - fc->file->flags |= GIT_DIFF_FLAG_BINARY; - } - - diff_file_content_binary_by_size(fc); - - if ((fc->flags & GIT_DIFF_FLAG__NO_DATA) != 0) { - fc->flags |= GIT_DIFF_FLAG__LOADED; - fc->map.len = 0; - fc->map.data = ""; - } - - if ((fc->flags & GIT_DIFF_FLAG__LOADED) != 0) - diff_file_content_binary_by_content(fc); - - return 0; -} - -int git_diff_file_content__init_from_diff( - git_diff_file_content *fc, - git_diff *diff, - git_diff_delta *delta, - bool use_old) -{ - bool has_data = true; - - memset(fc, 0, sizeof(*fc)); - fc->repo = diff->repo; - fc->file = use_old ? &delta->old_file : &delta->new_file; - fc->src = use_old ? diff->old_src : diff->new_src; - - if (git_diff_driver_lookup(&fc->driver, fc->repo, fc->file->path) < 0) - return -1; - - switch (delta->status) { - case GIT_DELTA_ADDED: - has_data = !use_old; break; - case GIT_DELTA_DELETED: - has_data = use_old; break; - case GIT_DELTA_UNTRACKED: - has_data = !use_old && - (diff->opts.flags & GIT_DIFF_SHOW_UNTRACKED_CONTENT) != 0; - break; - case GIT_DELTA_UNREADABLE: - case GIT_DELTA_MODIFIED: - case GIT_DELTA_COPIED: - case GIT_DELTA_RENAMED: - break; - default: - has_data = false; - break; - } - - if (!has_data) - fc->flags |= GIT_DIFF_FLAG__NO_DATA; - - return diff_file_content_init_common(fc, &diff->opts); -} - -int git_diff_file_content__init_from_src( - git_diff_file_content *fc, - git_repository *repo, - const git_diff_options *opts, - const git_diff_file_content_src *src, - git_diff_file *as_file) -{ - memset(fc, 0, sizeof(*fc)); - fc->repo = repo; - fc->file = as_file; - fc->blob = src->blob; - - if (!src->blob && !src->buf) { - fc->flags |= GIT_DIFF_FLAG__NO_DATA; - } else { - fc->flags |= GIT_DIFF_FLAG__LOADED; - fc->file->flags |= GIT_DIFF_FLAG_VALID_ID; - fc->file->mode = GIT_FILEMODE_BLOB; - - if (src->blob) { - fc->file->size = git_blob_rawsize(src->blob); - git_oid_cpy(&fc->file->id, git_blob_id(src->blob)); - - fc->map.len = (size_t)fc->file->size; - fc->map.data = (char *)git_blob_rawcontent(src->blob); - } else { - fc->file->size = src->buflen; - git_odb_hash(&fc->file->id, src->buf, src->buflen, GIT_OBJ_BLOB); - - fc->map.len = src->buflen; - fc->map.data = (char *)src->buf; - } - } - - return diff_file_content_init_common(fc, opts); -} - -static int diff_file_content_commit_to_str( - git_diff_file_content *fc, bool check_status) -{ - char oid[GIT_OID_HEXSZ+1]; - git_buf content = GIT_BUF_INIT; - const char *status = ""; - - if (check_status) { - int error = 0; - git_submodule *sm = NULL; - unsigned int sm_status = 0; - const git_oid *sm_head; - - if ((error = git_submodule_lookup(&sm, fc->repo, fc->file->path)) < 0) { - /* GIT_EEXISTS means a "submodule" that has not been git added */ - if (error == GIT_EEXISTS) { - giterr_clear(); - error = 0; - } - return error; - } - - if ((error = git_submodule_status(&sm_status, fc->repo, fc->file->path, GIT_SUBMODULE_IGNORE_UNSPECIFIED)) < 0) { - git_submodule_free(sm); - return error; - } - - /* update OID if we didn't have it previously */ - if ((fc->file->flags & GIT_DIFF_FLAG_VALID_ID) == 0 && - ((sm_head = git_submodule_wd_id(sm)) != NULL || - (sm_head = git_submodule_head_id(sm)) != NULL)) - { - git_oid_cpy(&fc->file->id, sm_head); - fc->file->flags |= GIT_DIFF_FLAG_VALID_ID; - } - - if (GIT_SUBMODULE_STATUS_IS_WD_DIRTY(sm_status)) - status = "-dirty"; - - git_submodule_free(sm); - } - - git_oid_tostr(oid, sizeof(oid), &fc->file->id); - if (git_buf_printf(&content, "Subproject commit %s%s\n", oid, status) < 0) - return -1; - - fc->map.len = git_buf_len(&content); - fc->map.data = git_buf_detach(&content); - fc->flags |= GIT_DIFF_FLAG__FREE_DATA; - - return 0; -} - -static int diff_file_content_load_blob( - git_diff_file_content *fc, - git_diff_options *opts) -{ - int error = 0; - git_odb_object *odb_obj = NULL; - - if (git_oid_iszero(&fc->file->id)) - return 0; - - if (fc->file->mode == GIT_FILEMODE_COMMIT) - return diff_file_content_commit_to_str(fc, false); - - /* if we don't know size, try to peek at object header first */ - if (!fc->file->size) { - if ((error = git_diff_file__resolve_zero_size( - fc->file, &odb_obj, fc->repo)) < 0) - return error; - } - - if ((opts->flags & GIT_DIFF_SHOW_BINARY) == 0 && - diff_file_content_binary_by_size(fc)) - return 0; - - if (odb_obj != NULL) { - error = git_object__from_odb_object( - (git_object **)&fc->blob, fc->repo, odb_obj, GIT_OBJ_BLOB); - git_odb_object_free(odb_obj); - } else { - error = git_blob_lookup( - (git_blob **)&fc->blob, fc->repo, &fc->file->id); - } - - if (!error) { - fc->flags |= GIT_DIFF_FLAG__FREE_BLOB; - fc->map.data = (void *)git_blob_rawcontent(fc->blob); - fc->map.len = (size_t)git_blob_rawsize(fc->blob); - } - - return error; -} - -static int diff_file_content_load_workdir_symlink_fake( - git_diff_file_content *fc, git_buf *path) -{ - git_buf target = GIT_BUF_INIT; - int error; - - if ((error = git_futils_readbuffer(&target, path->ptr)) < 0) - return error; - - fc->map.len = git_buf_len(&target); - fc->map.data = git_buf_detach(&target); - fc->flags |= GIT_DIFF_FLAG__FREE_DATA; - - git_buf_free(&target); - return error; -} - -static int diff_file_content_load_workdir_symlink( - git_diff_file_content *fc, git_buf *path) -{ - ssize_t alloc_len, read_len; - int symlink_supported, error; - - if ((error = git_repository__cvar( - &symlink_supported, fc->repo, GIT_CVAR_SYMLINKS)) < 0) - return -1; - - if (!symlink_supported) - return diff_file_content_load_workdir_symlink_fake(fc, path); - - /* link path on disk could be UTF-16, so prepare a buffer that is - * big enough to handle some UTF-8 data expansion - */ - alloc_len = (ssize_t)(fc->file->size * 2) + 1; - - fc->map.data = git__calloc(alloc_len, sizeof(char)); - GITERR_CHECK_ALLOC(fc->map.data); - - fc->flags |= GIT_DIFF_FLAG__FREE_DATA; - - read_len = p_readlink(git_buf_cstr(path), fc->map.data, alloc_len); - if (read_len < 0) { - giterr_set(GITERR_OS, "Failed to read symlink '%s'", fc->file->path); - return -1; - } - - fc->map.len = read_len; - return 0; -} - -static int diff_file_content_load_workdir_file( - git_diff_file_content *fc, - git_buf *path, - git_diff_options *diff_opts) -{ - int error = 0; - git_filter_list *fl = NULL; - git_file fd = git_futils_open_ro(git_buf_cstr(path)); - git_buf raw = GIT_BUF_INIT; - - if (fd < 0) - return fd; - - if (!fc->file->size && - !(fc->file->size = git_futils_filesize(fd))) - goto cleanup; - - if ((diff_opts->flags & GIT_DIFF_SHOW_BINARY) == 0 && - diff_file_content_binary_by_size(fc)) - goto cleanup; - - if ((error = git_filter_list_load( - &fl, fc->repo, NULL, fc->file->path, - GIT_FILTER_TO_ODB, GIT_FILTER_ALLOW_UNSAFE)) < 0) - goto cleanup; - - /* if there are no filters, try to mmap the file */ - if (fl == NULL) { - if (!(error = git_futils_mmap_ro( - &fc->map, fd, 0, (size_t)fc->file->size))) { - fc->flags |= GIT_DIFF_FLAG__UNMAP_DATA; - goto cleanup; - } - - /* if mmap failed, fall through to try readbuffer below */ - giterr_clear(); - } - - if (!(error = git_futils_readbuffer_fd(&raw, fd, (size_t)fc->file->size))) { - git_buf out = GIT_BUF_INIT; - - error = git_filter_list_apply_to_data(&out, fl, &raw); - - if (out.ptr != raw.ptr) - git_buf_free(&raw); - - if (!error) { - fc->map.len = out.size; - fc->map.data = out.ptr; - fc->flags |= GIT_DIFF_FLAG__FREE_DATA; - } - } - -cleanup: - git_filter_list_free(fl); - p_close(fd); - - return error; -} - -static int diff_file_content_load_workdir( - git_diff_file_content *fc, - git_diff_options *diff_opts) -{ - int error = 0; - git_buf path = GIT_BUF_INIT; - - if (fc->file->mode == GIT_FILEMODE_COMMIT) - return diff_file_content_commit_to_str(fc, true); - - if (fc->file->mode == GIT_FILEMODE_TREE) - return 0; - - if (git_buf_joinpath( - &path, git_repository_workdir(fc->repo), fc->file->path) < 0) - return -1; - - if (S_ISLNK(fc->file->mode)) - error = diff_file_content_load_workdir_symlink(fc, &path); - else - error = diff_file_content_load_workdir_file(fc, &path, diff_opts); - - /* once data is loaded, update OID if we didn't have it previously */ - if (!error && (fc->file->flags & GIT_DIFF_FLAG_VALID_ID) == 0) { - error = git_odb_hash( - &fc->file->id, fc->map.data, fc->map.len, GIT_OBJ_BLOB); - fc->file->flags |= GIT_DIFF_FLAG_VALID_ID; - } - - git_buf_free(&path); - return error; -} - -int git_diff_file_content__load( - git_diff_file_content *fc, - git_diff_options *diff_opts) -{ - int error = 0; - - if ((fc->flags & GIT_DIFF_FLAG__LOADED) != 0) - return 0; - - if ((fc->file->flags & GIT_DIFF_FLAG_BINARY) != 0 && - (diff_opts->flags & GIT_DIFF_SHOW_BINARY) == 0) - return 0; - - if (fc->src == GIT_ITERATOR_TYPE_WORKDIR) - error = diff_file_content_load_workdir(fc, diff_opts); - else - error = diff_file_content_load_blob(fc, diff_opts); - if (error) - return error; - - fc->flags |= GIT_DIFF_FLAG__LOADED; - - diff_file_content_binary_by_content(fc); - - return 0; -} - -void git_diff_file_content__unload(git_diff_file_content *fc) -{ - if ((fc->flags & GIT_DIFF_FLAG__LOADED) == 0) - return; - - if (fc->flags & GIT_DIFF_FLAG__FREE_DATA) { - git__free(fc->map.data); - fc->map.data = ""; - fc->map.len = 0; - fc->flags &= ~GIT_DIFF_FLAG__FREE_DATA; - } - else if (fc->flags & GIT_DIFF_FLAG__UNMAP_DATA) { - git_futils_mmap_free(&fc->map); - fc->map.data = ""; - fc->map.len = 0; - fc->flags &= ~GIT_DIFF_FLAG__UNMAP_DATA; - } - - if (fc->flags & GIT_DIFF_FLAG__FREE_BLOB) { - git_blob_free((git_blob *)fc->blob); - fc->blob = NULL; - fc->flags &= ~GIT_DIFF_FLAG__FREE_BLOB; - } - - fc->flags &= ~GIT_DIFF_FLAG__LOADED; -} - -void git_diff_file_content__clear(git_diff_file_content *fc) -{ - git_diff_file_content__unload(fc); - - /* for now, nothing else to do */ -} diff --git a/vendor/libgit2/src/diff_file.h b/vendor/libgit2/src/diff_file.h deleted file mode 100644 index 0d54b6d33..000000000 --- a/vendor/libgit2/src/diff_file.h +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_diff_file_h__ -#define INCLUDE_diff_file_h__ - -#include "common.h" -#include "diff.h" -#include "diff_driver.h" -#include "map.h" - -/* expanded information for one side of a delta */ -typedef struct { - git_repository *repo; - git_diff_file *file; - git_diff_driver *driver; - uint32_t flags; - uint32_t opts_flags; - git_off_t opts_max_size; - git_iterator_type_t src; - const git_blob *blob; - git_map map; -} git_diff_file_content; - -extern int git_diff_file_content__init_from_diff( - git_diff_file_content *fc, - git_diff *diff, - git_diff_delta *delta, - bool use_old); - -typedef struct { - const git_blob *blob; - const void *buf; - size_t buflen; - const char *as_path; -} git_diff_file_content_src; - -#define GIT_DIFF_FILE_CONTENT_SRC__BLOB(BLOB,PATH) { (BLOB),NULL,0,(PATH) } -#define GIT_DIFF_FILE_CONTENT_SRC__BUF(BUF,LEN,PATH) { NULL,(BUF),(LEN),(PATH) } - -extern int git_diff_file_content__init_from_src( - git_diff_file_content *fc, - git_repository *repo, - const git_diff_options *opts, - const git_diff_file_content_src *src, - git_diff_file *as_file); - -/* this loads the blob/file-on-disk as needed */ -extern int git_diff_file_content__load( - git_diff_file_content *fc, - git_diff_options *diff_opts); - -/* this releases the blob/file-in-memory */ -extern void git_diff_file_content__unload(git_diff_file_content *fc); - -/* this unloads and also releases any other resources */ -extern void git_diff_file_content__clear(git_diff_file_content *fc); - -#endif diff --git a/vendor/libgit2/src/diff_patch.c b/vendor/libgit2/src/diff_patch.c deleted file mode 100644 index 50faa3b3f..000000000 --- a/vendor/libgit2/src/diff_patch.c +++ /dev/null @@ -1,1142 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#include "common.h" -#include "git2/blob.h" -#include "diff.h" -#include "diff_file.h" -#include "diff_driver.h" -#include "diff_patch.h" -#include "diff_xdiff.h" -#include "delta.h" -#include "zstream.h" -#include "fileops.h" - -static void diff_output_init( - git_diff_output*, const git_diff_options*, git_diff_file_cb, - git_diff_binary_cb, git_diff_hunk_cb, git_diff_line_cb, void*); - -static void diff_output_to_patch(git_diff_output *, git_patch *); - -static void diff_patch_update_binary(git_patch *patch) -{ - if ((patch->delta->flags & DIFF_FLAGS_KNOWN_BINARY) != 0) - return; - - if ((patch->ofile.file->flags & GIT_DIFF_FLAG_BINARY) != 0 || - (patch->nfile.file->flags & GIT_DIFF_FLAG_BINARY) != 0) - patch->delta->flags |= GIT_DIFF_FLAG_BINARY; - - else if (patch->ofile.file->size > GIT_XDIFF_MAX_SIZE || - patch->nfile.file->size > GIT_XDIFF_MAX_SIZE) - patch->delta->flags |= GIT_DIFF_FLAG_BINARY; - - else if ((patch->ofile.file->flags & DIFF_FLAGS_NOT_BINARY) != 0 && - (patch->nfile.file->flags & DIFF_FLAGS_NOT_BINARY) != 0) - patch->delta->flags |= GIT_DIFF_FLAG_NOT_BINARY; -} - -static void diff_patch_init_common(git_patch *patch) -{ - diff_patch_update_binary(patch); - - patch->flags |= GIT_DIFF_PATCH_INITIALIZED; - - if (patch->diff) - git_diff_addref(patch->diff); -} - -static int diff_patch_normalize_options( - git_diff_options *out, - const git_diff_options *opts) -{ - if (opts) { - GITERR_CHECK_VERSION(opts, GIT_DIFF_OPTIONS_VERSION, "git_diff_options"); - memcpy(out, opts, sizeof(git_diff_options)); - } else { - git_diff_options default_opts = GIT_DIFF_OPTIONS_INIT; - memcpy(out, &default_opts, sizeof(git_diff_options)); - } - - out->old_prefix = opts && opts->old_prefix ? - git__strdup(opts->old_prefix) : - git__strdup(DIFF_OLD_PREFIX_DEFAULT); - - out->new_prefix = opts && opts->new_prefix ? - git__strdup(opts->new_prefix) : - git__strdup(DIFF_NEW_PREFIX_DEFAULT); - - GITERR_CHECK_ALLOC(out->old_prefix); - GITERR_CHECK_ALLOC(out->new_prefix); - - return 0; -} - -static int diff_patch_init_from_diff( - git_patch *patch, git_diff *diff, size_t delta_index) -{ - int error = 0; - - memset(patch, 0, sizeof(*patch)); - patch->diff = diff; - patch->delta = git_vector_get(&diff->deltas, delta_index); - patch->delta_index = delta_index; - - if ((error = diff_patch_normalize_options( - &patch->diff_opts, &diff->opts)) < 0 || - (error = git_diff_file_content__init_from_diff( - &patch->ofile, diff, patch->delta, true)) < 0 || - (error = git_diff_file_content__init_from_diff( - &patch->nfile, diff, patch->delta, false)) < 0) - return error; - - diff_patch_init_common(patch); - - return 0; -} - -static int diff_patch_alloc_from_diff( - git_patch **out, git_diff *diff, size_t delta_index) -{ - int error; - git_patch *patch = git__calloc(1, sizeof(git_patch)); - GITERR_CHECK_ALLOC(patch); - - if (!(error = diff_patch_init_from_diff(patch, diff, delta_index))) { - patch->flags |= GIT_DIFF_PATCH_ALLOCATED; - GIT_REFCOUNT_INC(patch); - } else { - git__free(patch); - patch = NULL; - } - - *out = patch; - return error; -} - -GIT_INLINE(bool) should_skip_binary(git_patch *patch, git_diff_file *file) -{ - if ((patch->diff_opts.flags & GIT_DIFF_SHOW_BINARY) != 0) - return false; - - return (file->flags & GIT_DIFF_FLAG_BINARY) != 0; -} - -static bool diff_patch_diffable(git_patch *patch) -{ - size_t olen, nlen; - - if (patch->delta->status == GIT_DELTA_UNMODIFIED) - return false; - - /* if we've determined this to be binary (and we are not showing binary - * data) then we have skipped loading the map data. instead, query the - * file data itself. - */ - if ((patch->delta->flags & GIT_DIFF_FLAG_BINARY) != 0 && - (patch->diff_opts.flags & GIT_DIFF_SHOW_BINARY) == 0) { - olen = (size_t)patch->ofile.file->size; - nlen = (size_t)patch->nfile.file->size; - } else { - olen = patch->ofile.map.len; - nlen = patch->nfile.map.len; - } - - /* if both sides are empty, files are identical */ - if (!olen && !nlen) - return false; - - /* otherwise, check the file sizes and the oid */ - return (olen != nlen || - !git_oid_equal(&patch->ofile.file->id, &patch->nfile.file->id)); -} - -static int diff_patch_load(git_patch *patch, git_diff_output *output) -{ - int error = 0; - bool incomplete_data; - - if ((patch->flags & GIT_DIFF_PATCH_LOADED) != 0) - return 0; - - /* if no hunk and data callbacks and user doesn't care if data looks - * binary, then there is no need to actually load the data - */ - if ((patch->ofile.opts_flags & GIT_DIFF_SKIP_BINARY_CHECK) != 0 && - output && !output->binary_cb && !output->hunk_cb && !output->data_cb) - return 0; - - incomplete_data = - (((patch->ofile.flags & GIT_DIFF_FLAG__NO_DATA) != 0 || - (patch->ofile.file->flags & GIT_DIFF_FLAG_VALID_ID) != 0) && - ((patch->nfile.flags & GIT_DIFF_FLAG__NO_DATA) != 0 || - (patch->nfile.file->flags & GIT_DIFF_FLAG_VALID_ID) != 0)); - - /* always try to load workdir content first because filtering may - * need 2x data size and this minimizes peak memory footprint - */ - if (patch->ofile.src == GIT_ITERATOR_TYPE_WORKDIR) { - if ((error = git_diff_file_content__load( - &patch->ofile, &patch->diff_opts)) < 0 || - should_skip_binary(patch, patch->ofile.file)) - goto cleanup; - } - if (patch->nfile.src == GIT_ITERATOR_TYPE_WORKDIR) { - if ((error = git_diff_file_content__load( - &patch->nfile, &patch->diff_opts)) < 0 || - should_skip_binary(patch, patch->nfile.file)) - goto cleanup; - } - - /* once workdir has been tried, load other data as needed */ - if (patch->ofile.src != GIT_ITERATOR_TYPE_WORKDIR) { - if ((error = git_diff_file_content__load( - &patch->ofile, &patch->diff_opts)) < 0 || - should_skip_binary(patch, patch->ofile.file)) - goto cleanup; - } - if (patch->nfile.src != GIT_ITERATOR_TYPE_WORKDIR) { - if ((error = git_diff_file_content__load( - &patch->nfile, &patch->diff_opts)) < 0 || - should_skip_binary(patch, patch->nfile.file)) - goto cleanup; - } - - /* if previously missing an oid, and now that we have it the two sides - * are the same (and not submodules), update MODIFIED -> UNMODIFIED - */ - if (incomplete_data && - patch->ofile.file->mode == patch->nfile.file->mode && - patch->ofile.file->mode != GIT_FILEMODE_COMMIT && - git_oid_equal(&patch->ofile.file->id, &patch->nfile.file->id) && - patch->delta->status == GIT_DELTA_MODIFIED) /* not RENAMED/COPIED! */ - patch->delta->status = GIT_DELTA_UNMODIFIED; - -cleanup: - diff_patch_update_binary(patch); - - if (!error) { - if (diff_patch_diffable(patch)) - patch->flags |= GIT_DIFF_PATCH_DIFFABLE; - - patch->flags |= GIT_DIFF_PATCH_LOADED; - } - - return error; -} - -static int diff_patch_invoke_file_callback( - git_patch *patch, git_diff_output *output) -{ - float progress = patch->diff ? - ((float)patch->delta_index / patch->diff->deltas.length) : 1.0f; - - if (!output->file_cb) - return 0; - - return giterr_set_after_callback_function( - output->file_cb(patch->delta, progress, output->payload), - "git_patch"); -} - -static int create_binary( - git_diff_binary_t *out_type, - char **out_data, - size_t *out_datalen, - size_t *out_inflatedlen, - const char *a_data, - size_t a_datalen, - const char *b_data, - size_t b_datalen) -{ - git_buf deflate = GIT_BUF_INIT, delta = GIT_BUF_INIT; - unsigned long delta_data_len; - int error; - - /* The git_delta function accepts unsigned long only */ - if (!git__is_ulong(a_datalen) || !git__is_ulong(b_datalen)) - return GIT_EBUFS; - - if ((error = git_zstream_deflatebuf(&deflate, b_data, b_datalen)) < 0) - goto done; - - /* The git_delta function accepts unsigned long only */ - if (!git__is_ulong(deflate.size)) { - error = GIT_EBUFS; - goto done; - } - - if (a_datalen && b_datalen) { - void *delta_data = git_delta( - a_data, (unsigned long)a_datalen, - b_data, (unsigned long)b_datalen, - &delta_data_len, (unsigned long)deflate.size); - - if (delta_data) { - error = git_zstream_deflatebuf( - &delta, delta_data, (size_t)delta_data_len); - - git__free(delta_data); - - if (error < 0) - goto done; - } - } - - if (delta.size && delta.size < deflate.size) { - *out_type = GIT_DIFF_BINARY_DELTA; - *out_datalen = delta.size; - *out_data = git_buf_detach(&delta); - *out_inflatedlen = delta_data_len; - } else { - *out_type = GIT_DIFF_BINARY_LITERAL; - *out_datalen = deflate.size; - *out_data = git_buf_detach(&deflate); - *out_inflatedlen = b_datalen; - } - -done: - git_buf_free(&deflate); - git_buf_free(&delta); - - return error; -} - -static int diff_binary(git_diff_output *output, git_patch *patch) -{ - git_diff_binary binary = {{0}}; - const char *old_data = patch->ofile.map.data; - const char *new_data = patch->nfile.map.data; - size_t old_len = patch->ofile.map.len, - new_len = patch->nfile.map.len; - int error; - - /* Create the old->new delta (as the "new" side of the patch), - * and the new->old delta (as the "old" side) - */ - if ((error = create_binary(&binary.old_file.type, - (char **)&binary.old_file.data, - &binary.old_file.datalen, - &binary.old_file.inflatedlen, - new_data, new_len, old_data, old_len)) < 0 || - (error = create_binary(&binary.new_file.type, - (char **)&binary.new_file.data, - &binary.new_file.datalen, - &binary.new_file.inflatedlen, - old_data, old_len, new_data, new_len)) < 0) - return error; - - error = giterr_set_after_callback_function( - output->binary_cb(patch->delta, &binary, output->payload), - "git_patch"); - - git__free((char *) binary.old_file.data); - git__free((char *) binary.new_file.data); - - return error; -} - -static int diff_patch_generate(git_patch *patch, git_diff_output *output) -{ - int error = 0; - - if ((patch->flags & GIT_DIFF_PATCH_DIFFED) != 0) - return 0; - - /* if we are not looking at the binary or text data, don't do the diff */ - if (!output->binary_cb && !output->hunk_cb && !output->data_cb) - return 0; - - if ((patch->flags & GIT_DIFF_PATCH_LOADED) == 0 && - (error = diff_patch_load(patch, output)) < 0) - return error; - - if ((patch->flags & GIT_DIFF_PATCH_DIFFABLE) == 0) - return 0; - - if ((patch->delta->flags & GIT_DIFF_FLAG_BINARY) != 0) { - if (output->binary_cb) - error = diff_binary(output, patch); - } - else { - if (output->diff_cb) - error = output->diff_cb(output, patch); - } - - patch->flags |= GIT_DIFF_PATCH_DIFFED; - return error; -} - -static void diff_patch_free(git_patch *patch) -{ - git_diff_file_content__clear(&patch->ofile); - git_diff_file_content__clear(&patch->nfile); - - git_array_clear(patch->lines); - git_array_clear(patch->hunks); - - git_diff_free(patch->diff); /* decrements refcount */ - patch->diff = NULL; - - git_pool_clear(&patch->flattened); - - git__free((char *)patch->diff_opts.old_prefix); - git__free((char *)patch->diff_opts.new_prefix); - - git__free((char *)patch->binary.old_file.data); - git__free((char *)patch->binary.new_file.data); - - if (patch->flags & GIT_DIFF_PATCH_ALLOCATED) - git__free(patch); -} - -static int diff_required(git_diff *diff, const char *action) -{ - if (diff) - return 0; - giterr_set(GITERR_INVALID, "Must provide valid diff to %s", action); - return -1; -} - -int git_diff_foreach( - git_diff *diff, - git_diff_file_cb file_cb, - git_diff_binary_cb binary_cb, - git_diff_hunk_cb hunk_cb, - git_diff_line_cb data_cb, - void *payload) -{ - int error = 0; - git_xdiff_output xo; - size_t idx; - git_patch patch; - - if ((error = diff_required(diff, "git_diff_foreach")) < 0) - return error; - - memset(&xo, 0, sizeof(xo)); - memset(&patch, 0, sizeof(patch)); - diff_output_init( - &xo.output, &diff->opts, file_cb, binary_cb, hunk_cb, data_cb, payload); - git_xdiff_init(&xo, &diff->opts); - - git_vector_foreach(&diff->deltas, idx, patch.delta) { - - /* check flags against patch status */ - if (git_diff_delta__should_skip(&diff->opts, patch.delta)) - continue; - - if (binary_cb || hunk_cb || data_cb) { - if ((error = diff_patch_init_from_diff(&patch, diff, idx)) != 0 || - (error = diff_patch_load(&patch, &xo.output)) != 0) - return error; - } - - if ((error = diff_patch_invoke_file_callback(&patch, &xo.output)) == 0) { - if (binary_cb || hunk_cb || data_cb) - error = diff_patch_generate(&patch, &xo.output); - } - - git_patch_free(&patch); - - if (error) - break; - } - - return error; -} - -typedef struct { - git_patch patch; - git_diff_delta delta; - char paths[GIT_FLEX_ARRAY]; -} diff_patch_with_delta; - -static int diff_single_generate(diff_patch_with_delta *pd, git_xdiff_output *xo) -{ - int error = 0; - git_patch *patch = &pd->patch; - bool has_old = ((patch->ofile.flags & GIT_DIFF_FLAG__NO_DATA) == 0); - bool has_new = ((patch->nfile.flags & GIT_DIFF_FLAG__NO_DATA) == 0); - - pd->delta.status = has_new ? - (has_old ? GIT_DELTA_MODIFIED : GIT_DELTA_ADDED) : - (has_old ? GIT_DELTA_DELETED : GIT_DELTA_UNTRACKED); - - if (git_oid_equal(&patch->nfile.file->id, &patch->ofile.file->id)) - pd->delta.status = GIT_DELTA_UNMODIFIED; - - patch->delta = &pd->delta; - - diff_patch_init_common(patch); - - if (pd->delta.status == GIT_DELTA_UNMODIFIED && - !(patch->ofile.opts_flags & GIT_DIFF_INCLUDE_UNMODIFIED)) - return error; - - error = diff_patch_invoke_file_callback(patch, (git_diff_output *)xo); - - if (!error) - error = diff_patch_generate(patch, (git_diff_output *)xo); - - return error; -} - -static int diff_patch_from_sources( - diff_patch_with_delta *pd, - git_xdiff_output *xo, - git_diff_file_content_src *oldsrc, - git_diff_file_content_src *newsrc, - const git_diff_options *opts) -{ - int error = 0; - git_repository *repo = - oldsrc->blob ? git_blob_owner(oldsrc->blob) : - newsrc->blob ? git_blob_owner(newsrc->blob) : NULL; - git_diff_file *lfile = &pd->delta.old_file, *rfile = &pd->delta.new_file; - git_diff_file_content *ldata = &pd->patch.ofile, *rdata = &pd->patch.nfile; - - if ((error = diff_patch_normalize_options(&pd->patch.diff_opts, opts)) < 0) - return error; - - if (opts && (opts->flags & GIT_DIFF_REVERSE) != 0) { - void *tmp = lfile; lfile = rfile; rfile = tmp; - tmp = ldata; ldata = rdata; rdata = tmp; - } - - pd->patch.delta = &pd->delta; - - if (!oldsrc->as_path) { - if (newsrc->as_path) - oldsrc->as_path = newsrc->as_path; - else - oldsrc->as_path = newsrc->as_path = "file"; - } - else if (!newsrc->as_path) - newsrc->as_path = oldsrc->as_path; - - lfile->path = oldsrc->as_path; - rfile->path = newsrc->as_path; - - if ((error = git_diff_file_content__init_from_src( - ldata, repo, opts, oldsrc, lfile)) < 0 || - (error = git_diff_file_content__init_from_src( - rdata, repo, opts, newsrc, rfile)) < 0) - return error; - - return diff_single_generate(pd, xo); -} - -static int diff_patch_with_delta_alloc( - diff_patch_with_delta **out, - const char **old_path, - const char **new_path) -{ - diff_patch_with_delta *pd; - size_t old_len = *old_path ? strlen(*old_path) : 0; - size_t new_len = *new_path ? strlen(*new_path) : 0; - size_t alloc_len; - - GITERR_CHECK_ALLOC_ADD(&alloc_len, sizeof(*pd), old_len); - GITERR_CHECK_ALLOC_ADD(&alloc_len, alloc_len, new_len); - GITERR_CHECK_ALLOC_ADD(&alloc_len, alloc_len, 2); - - *out = pd = git__calloc(1, alloc_len); - GITERR_CHECK_ALLOC(pd); - - pd->patch.flags = GIT_DIFF_PATCH_ALLOCATED; - - if (*old_path) { - memcpy(&pd->paths[0], *old_path, old_len); - *old_path = &pd->paths[0]; - } else if (*new_path) - *old_path = &pd->paths[old_len + 1]; - - if (*new_path) { - memcpy(&pd->paths[old_len + 1], *new_path, new_len); - *new_path = &pd->paths[old_len + 1]; - } else if (*old_path) - *new_path = &pd->paths[0]; - - return 0; -} - -static int diff_from_sources( - git_diff_file_content_src *oldsrc, - git_diff_file_content_src *newsrc, - const git_diff_options *opts, - git_diff_file_cb file_cb, - git_diff_binary_cb binary_cb, - git_diff_hunk_cb hunk_cb, - git_diff_line_cb data_cb, - void *payload) -{ - int error = 0; - diff_patch_with_delta pd; - git_xdiff_output xo; - - memset(&xo, 0, sizeof(xo)); - diff_output_init( - &xo.output, opts, file_cb, binary_cb, hunk_cb, data_cb, payload); - git_xdiff_init(&xo, opts); - - memset(&pd, 0, sizeof(pd)); - - error = diff_patch_from_sources(&pd, &xo, oldsrc, newsrc, opts); - - git_patch_free(&pd.patch); - - return error; -} - -static int patch_from_sources( - git_patch **out, - git_diff_file_content_src *oldsrc, - git_diff_file_content_src *newsrc, - const git_diff_options *opts) -{ - int error = 0; - diff_patch_with_delta *pd; - git_xdiff_output xo; - - assert(out); - *out = NULL; - - if ((error = diff_patch_with_delta_alloc( - &pd, &oldsrc->as_path, &newsrc->as_path)) < 0) - return error; - - memset(&xo, 0, sizeof(xo)); - diff_output_to_patch(&xo.output, &pd->patch); - git_xdiff_init(&xo, opts); - - if (!(error = diff_patch_from_sources(pd, &xo, oldsrc, newsrc, opts))) - *out = (git_patch *)pd; - else - git_patch_free((git_patch *)pd); - - return error; -} - -int git_diff_blobs( - const git_blob *old_blob, - const char *old_path, - const git_blob *new_blob, - const char *new_path, - const git_diff_options *opts, - git_diff_file_cb file_cb, - git_diff_binary_cb binary_cb, - git_diff_hunk_cb hunk_cb, - git_diff_line_cb data_cb, - void *payload) -{ - git_diff_file_content_src osrc = - GIT_DIFF_FILE_CONTENT_SRC__BLOB(old_blob, old_path); - git_diff_file_content_src nsrc = - GIT_DIFF_FILE_CONTENT_SRC__BLOB(new_blob, new_path); - return diff_from_sources( - &osrc, &nsrc, opts, file_cb, binary_cb, hunk_cb, data_cb, payload); -} - -int git_patch_from_blobs( - git_patch **out, - const git_blob *old_blob, - const char *old_path, - const git_blob *new_blob, - const char *new_path, - const git_diff_options *opts) -{ - git_diff_file_content_src osrc = - GIT_DIFF_FILE_CONTENT_SRC__BLOB(old_blob, old_path); - git_diff_file_content_src nsrc = - GIT_DIFF_FILE_CONTENT_SRC__BLOB(new_blob, new_path); - return patch_from_sources(out, &osrc, &nsrc, opts); -} - -int git_diff_blob_to_buffer( - const git_blob *old_blob, - const char *old_path, - const char *buf, - size_t buflen, - const char *buf_path, - const git_diff_options *opts, - git_diff_file_cb file_cb, - git_diff_binary_cb binary_cb, - git_diff_hunk_cb hunk_cb, - git_diff_line_cb data_cb, - void *payload) -{ - git_diff_file_content_src osrc = - GIT_DIFF_FILE_CONTENT_SRC__BLOB(old_blob, old_path); - git_diff_file_content_src nsrc = - GIT_DIFF_FILE_CONTENT_SRC__BUF(buf, buflen, buf_path); - return diff_from_sources( - &osrc, &nsrc, opts, file_cb, binary_cb, hunk_cb, data_cb, payload); -} - -int git_patch_from_blob_and_buffer( - git_patch **out, - const git_blob *old_blob, - const char *old_path, - const char *buf, - size_t buflen, - const char *buf_path, - const git_diff_options *opts) -{ - git_diff_file_content_src osrc = - GIT_DIFF_FILE_CONTENT_SRC__BLOB(old_blob, old_path); - git_diff_file_content_src nsrc = - GIT_DIFF_FILE_CONTENT_SRC__BUF(buf, buflen, buf_path); - return patch_from_sources(out, &osrc, &nsrc, opts); -} - -int git_diff_buffers( - const void *old_buf, - size_t old_len, - const char *old_path, - const void *new_buf, - size_t new_len, - const char *new_path, - const git_diff_options *opts, - git_diff_file_cb file_cb, - git_diff_binary_cb binary_cb, - git_diff_hunk_cb hunk_cb, - git_diff_line_cb data_cb, - void *payload) -{ - git_diff_file_content_src osrc = - GIT_DIFF_FILE_CONTENT_SRC__BUF(old_buf, old_len, old_path); - git_diff_file_content_src nsrc = - GIT_DIFF_FILE_CONTENT_SRC__BUF(new_buf, new_len, new_path); - return diff_from_sources( - &osrc, &nsrc, opts, file_cb, binary_cb, hunk_cb, data_cb, payload); -} - -int git_patch_from_buffers( - git_patch **out, - const void *old_buf, - size_t old_len, - const char *old_path, - const char *new_buf, - size_t new_len, - const char *new_path, - const git_diff_options *opts) -{ - git_diff_file_content_src osrc = - GIT_DIFF_FILE_CONTENT_SRC__BUF(old_buf, old_len, old_path); - git_diff_file_content_src nsrc = - GIT_DIFF_FILE_CONTENT_SRC__BUF(new_buf, new_len, new_path); - return patch_from_sources(out, &osrc, &nsrc, opts); -} - -int git_patch_from_diff( - git_patch **patch_ptr, git_diff *diff, size_t idx) -{ - int error = 0; - git_xdiff_output xo; - git_diff_delta *delta = NULL; - git_patch *patch = NULL; - - if (patch_ptr) *patch_ptr = NULL; - - if (diff_required(diff, "git_patch_from_diff") < 0) - return -1; - - delta = git_vector_get(&diff->deltas, idx); - if (!delta) { - giterr_set(GITERR_INVALID, "Index out of range for delta in diff"); - return GIT_ENOTFOUND; - } - - if (git_diff_delta__should_skip(&diff->opts, delta)) - return 0; - - /* don't load the patch data unless we need it for binary check */ - if (!patch_ptr && - ((delta->flags & DIFF_FLAGS_KNOWN_BINARY) != 0 || - (diff->opts.flags & GIT_DIFF_SKIP_BINARY_CHECK) != 0)) - return 0; - - if ((error = diff_patch_alloc_from_diff(&patch, diff, idx)) < 0) - return error; - - memset(&xo, 0, sizeof(xo)); - diff_output_to_patch(&xo.output, patch); - git_xdiff_init(&xo, &diff->opts); - - error = diff_patch_invoke_file_callback(patch, &xo.output); - - if (!error) - error = diff_patch_generate(patch, &xo.output); - - if (!error) { - /* TODO: if cumulative diff size is < 0.5 total size, flatten patch */ - /* TODO: and unload the file content */ - } - - if (error || !patch_ptr) - git_patch_free(patch); - else - *patch_ptr = patch; - - return error; -} - -void git_patch_free(git_patch *patch) -{ - if (patch) - GIT_REFCOUNT_DEC(patch, diff_patch_free); -} - -const git_diff_delta *git_patch_get_delta(const git_patch *patch) -{ - assert(patch); - return patch->delta; -} - -size_t git_patch_num_hunks(const git_patch *patch) -{ - assert(patch); - return git_array_size(patch->hunks); -} - -int git_patch_line_stats( - size_t *total_ctxt, - size_t *total_adds, - size_t *total_dels, - const git_patch *patch) -{ - size_t totals[3], idx; - - memset(totals, 0, sizeof(totals)); - - for (idx = 0; idx < git_array_size(patch->lines); ++idx) { - git_diff_line *line = git_array_get(patch->lines, idx); - if (!line) - continue; - - switch (line->origin) { - case GIT_DIFF_LINE_CONTEXT: totals[0]++; break; - case GIT_DIFF_LINE_ADDITION: totals[1]++; break; - case GIT_DIFF_LINE_DELETION: totals[2]++; break; - default: - /* diff --stat and --numstat don't count EOFNL marks because - * they will always be paired with a ADDITION or DELETION line. - */ - break; - } - } - - if (total_ctxt) - *total_ctxt = totals[0]; - if (total_adds) - *total_adds = totals[1]; - if (total_dels) - *total_dels = totals[2]; - - return 0; -} - -static int diff_error_outofrange(const char *thing) -{ - giterr_set(GITERR_INVALID, "Diff patch %s index out of range", thing); - return GIT_ENOTFOUND; -} - -int git_patch_get_hunk( - const git_diff_hunk **out, - size_t *lines_in_hunk, - git_patch *patch, - size_t hunk_idx) -{ - diff_patch_hunk *hunk; - assert(patch); - - hunk = git_array_get(patch->hunks, hunk_idx); - - if (!hunk) { - if (out) *out = NULL; - if (lines_in_hunk) *lines_in_hunk = 0; - return diff_error_outofrange("hunk"); - } - - if (out) *out = &hunk->hunk; - if (lines_in_hunk) *lines_in_hunk = hunk->line_count; - return 0; -} - -int git_patch_num_lines_in_hunk(const git_patch *patch, size_t hunk_idx) -{ - diff_patch_hunk *hunk; - assert(patch); - - if (!(hunk = git_array_get(patch->hunks, hunk_idx))) - return diff_error_outofrange("hunk"); - return (int)hunk->line_count; -} - -int git_patch_get_line_in_hunk( - const git_diff_line **out, - git_patch *patch, - size_t hunk_idx, - size_t line_of_hunk) -{ - diff_patch_hunk *hunk; - git_diff_line *line; - - assert(patch); - - if (!(hunk = git_array_get(patch->hunks, hunk_idx))) { - if (out) *out = NULL; - return diff_error_outofrange("hunk"); - } - - if (line_of_hunk >= hunk->line_count || - !(line = git_array_get( - patch->lines, hunk->line_start + line_of_hunk))) { - if (out) *out = NULL; - return diff_error_outofrange("line"); - } - - if (out) *out = line; - return 0; -} - -size_t git_patch_size( - git_patch *patch, - int include_context, - int include_hunk_headers, - int include_file_headers) -{ - size_t out; - - assert(patch); - - out = patch->content_size; - - if (!include_context) - out -= patch->context_size; - - if (include_hunk_headers) - out += patch->header_size; - - if (include_file_headers) { - git_buf file_header = GIT_BUF_INIT; - - if (git_diff_delta__format_file_header( - &file_header, patch->delta, NULL, NULL, 0) < 0) - giterr_clear(); - else - out += git_buf_len(&file_header); - - git_buf_free(&file_header); - } - - return out; -} - -git_diff *git_patch__diff(git_patch *patch) -{ - return patch->diff; -} - -git_diff_driver *git_patch__driver(git_patch *patch) -{ - /* ofile driver is representative for whole patch */ - return patch->ofile.driver; -} - -void git_patch__old_data( - char **ptr, size_t *len, git_patch *patch) -{ - *ptr = patch->ofile.map.data; - *len = patch->ofile.map.len; -} - -void git_patch__new_data( - char **ptr, size_t *len, git_patch *patch) -{ - *ptr = patch->nfile.map.data; - *len = patch->nfile.map.len; -} - -int git_patch__invoke_callbacks( - git_patch *patch, - git_diff_file_cb file_cb, - git_diff_binary_cb binary_cb, - git_diff_hunk_cb hunk_cb, - git_diff_line_cb line_cb, - void *payload) -{ - int error = 0; - uint32_t i, j; - - if (file_cb) - error = file_cb(patch->delta, 0, payload); - - if ((patch->delta->flags & GIT_DIFF_FLAG_BINARY) != 0) { - if (binary_cb) - error = binary_cb(patch->delta, &patch->binary, payload); - - return error; - } - - if (!hunk_cb && !line_cb) - return error; - - for (i = 0; !error && i < git_array_size(patch->hunks); ++i) { - diff_patch_hunk *h = git_array_get(patch->hunks, i); - - if (hunk_cb) - error = hunk_cb(patch->delta, &h->hunk, payload); - - if (!line_cb) - continue; - - for (j = 0; !error && j < h->line_count; ++j) { - git_diff_line *l = - git_array_get(patch->lines, h->line_start + j); - - error = line_cb(patch->delta, &h->hunk, l, payload); - } - } - - return error; -} - - -static int diff_patch_file_cb( - const git_diff_delta *delta, - float progress, - void *payload) -{ - GIT_UNUSED(delta); GIT_UNUSED(progress); GIT_UNUSED(payload); - return 0; -} - -static int diff_patch_binary_cb( - const git_diff_delta *delta, - const git_diff_binary *binary, - void *payload) -{ - git_patch *patch = payload; - - GIT_UNUSED(delta); - - memcpy(&patch->binary, binary, sizeof(git_diff_binary)); - - if (binary->old_file.data) { - patch->binary.old_file.data = git__malloc(binary->old_file.datalen); - GITERR_CHECK_ALLOC(patch->binary.old_file.data); - - memcpy((char *)patch->binary.old_file.data, - binary->old_file.data, binary->old_file.datalen); - } - - if (binary->new_file.data) { - patch->binary.new_file.data = git__malloc(binary->new_file.datalen); - GITERR_CHECK_ALLOC(patch->binary.new_file.data); - - memcpy((char *)patch->binary.new_file.data, - binary->new_file.data, binary->new_file.datalen); - } - - return 0; -} - -static int diff_patch_hunk_cb( - const git_diff_delta *delta, - const git_diff_hunk *hunk_, - void *payload) -{ - git_patch *patch = payload; - diff_patch_hunk *hunk; - - GIT_UNUSED(delta); - - hunk = git_array_alloc(patch->hunks); - GITERR_CHECK_ALLOC(hunk); - - memcpy(&hunk->hunk, hunk_, sizeof(hunk->hunk)); - - patch->header_size += hunk_->header_len; - - hunk->line_start = git_array_size(patch->lines); - hunk->line_count = 0; - - return 0; -} - -static int diff_patch_line_cb( - const git_diff_delta *delta, - const git_diff_hunk *hunk_, - const git_diff_line *line_, - void *payload) -{ - git_patch *patch = payload; - diff_patch_hunk *hunk; - git_diff_line *line; - - GIT_UNUSED(delta); - GIT_UNUSED(hunk_); - - hunk = git_array_last(patch->hunks); - assert(hunk); /* programmer error if no hunk is available */ - - line = git_array_alloc(patch->lines); - GITERR_CHECK_ALLOC(line); - - memcpy(line, line_, sizeof(*line)); - - /* do some bookkeeping so we can provide old/new line numbers */ - - patch->content_size += line->content_len; - - if (line->origin == GIT_DIFF_LINE_ADDITION || - line->origin == GIT_DIFF_LINE_DELETION) - patch->content_size += 1; - else if (line->origin == GIT_DIFF_LINE_CONTEXT) { - patch->content_size += 1; - patch->context_size += line->content_len + 1; - } else if (line->origin == GIT_DIFF_LINE_CONTEXT_EOFNL) - patch->context_size += line->content_len; - - hunk->line_count++; - - return 0; -} - -static void diff_output_init( - git_diff_output *out, - const git_diff_options *opts, - git_diff_file_cb file_cb, - git_diff_binary_cb binary_cb, - git_diff_hunk_cb hunk_cb, - git_diff_line_cb data_cb, - void *payload) -{ - GIT_UNUSED(opts); - - memset(out, 0, sizeof(*out)); - - out->file_cb = file_cb; - out->binary_cb = binary_cb; - out->hunk_cb = hunk_cb; - out->data_cb = data_cb; - out->payload = payload; -} - -static void diff_output_to_patch(git_diff_output *out, git_patch *patch) -{ - diff_output_init( - out, - NULL, - diff_patch_file_cb, - diff_patch_binary_cb, - diff_patch_hunk_cb, - diff_patch_line_cb, - patch); -} diff --git a/vendor/libgit2/src/diff_patch.h b/vendor/libgit2/src/diff_patch.h deleted file mode 100644 index 7b4dacdde..000000000 --- a/vendor/libgit2/src/diff_patch.h +++ /dev/null @@ -1,83 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_diff_patch_h__ -#define INCLUDE_diff_patch_h__ - -#include "common.h" -#include "diff.h" -#include "diff_file.h" -#include "array.h" -#include "git2/patch.h" - - /* cached information about a hunk in a diff */ -typedef struct diff_patch_hunk { - git_diff_hunk hunk; - size_t line_start; - size_t line_count; -} diff_patch_hunk; - -enum { - GIT_DIFF_PATCH_ALLOCATED = (1 << 0), - GIT_DIFF_PATCH_INITIALIZED = (1 << 1), - GIT_DIFF_PATCH_LOADED = (1 << 2), - /* the two sides are different */ - GIT_DIFF_PATCH_DIFFABLE = (1 << 3), - /* the difference between the two sides has been computed */ - GIT_DIFF_PATCH_DIFFED = (1 << 4), - GIT_DIFF_PATCH_FLATTENED = (1 << 5), -}; - -struct git_patch { - git_refcount rc; - git_diff *diff; /* for refcount purposes, maybe NULL for blob diffs */ - git_diff_options diff_opts; - git_diff_delta *delta; - size_t delta_index; - git_diff_file_content ofile; - git_diff_file_content nfile; - uint32_t flags; - git_diff_binary binary; - git_array_t(diff_patch_hunk) hunks; - git_array_t(git_diff_line) lines; - size_t content_size, context_size, header_size; - git_pool flattened; -}; - -extern git_diff *git_patch__diff(git_patch *); - -extern git_diff_driver *git_patch__driver(git_patch *); - -extern void git_patch__old_data(char **, size_t *, git_patch *); -extern void git_patch__new_data(char **, size_t *, git_patch *); - -extern int git_patch__invoke_callbacks( - git_patch *patch, - git_diff_file_cb file_cb, - git_diff_binary_cb binary_cb, - git_diff_hunk_cb hunk_cb, - git_diff_line_cb line_cb, - void *payload); - -typedef struct git_diff_output git_diff_output; -struct git_diff_output { - /* these callbacks are issued with the diff data */ - git_diff_file_cb file_cb; - git_diff_binary_cb binary_cb; - git_diff_hunk_cb hunk_cb; - git_diff_line_cb data_cb; - void *payload; - - /* this records the actual error in cases where it may be obscured */ - int error; - - /* this callback is used to do the diff and drive the other callbacks. - * see diff_xdiff.h for how to use this in practice for now. - */ - int (*diff_cb)(git_diff_output *output, git_patch *patch); -}; - -#endif diff --git a/vendor/libgit2/src/diff_print.c b/vendor/libgit2/src/diff_print.c deleted file mode 100644 index dae9e341d..000000000 --- a/vendor/libgit2/src/diff_print.c +++ /dev/null @@ -1,668 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#include "common.h" -#include "diff.h" -#include "diff_patch.h" -#include "fileops.h" -#include "zstream.h" -#include "blob.h" -#include "delta.h" -#include "git2/sys/diff.h" - -typedef struct { - git_diff *diff; - git_diff_format_t format; - git_diff_line_cb print_cb; - void *payload; - git_buf *buf; - uint32_t flags; - int oid_strlen; - git_diff_line line; - unsigned int - content_loaded : 1, - content_allocated : 1; - git_diff_file_content *ofile; - git_diff_file_content *nfile; -} diff_print_info; - -static int diff_print_info_init__common( - diff_print_info *pi, - git_buf *out, - git_repository *repo, - git_diff_format_t format, - git_diff_line_cb cb, - void *payload) -{ - pi->format = format; - pi->print_cb = cb; - pi->payload = payload; - pi->buf = out; - - if (!pi->oid_strlen) { - if (!repo) - pi->oid_strlen = GIT_ABBREV_DEFAULT; - else if (git_repository__cvar(&pi->oid_strlen, repo, GIT_CVAR_ABBREV) < 0) - return -1; - } - - pi->oid_strlen += 1; /* for NUL byte */ - - if (pi->oid_strlen > GIT_OID_HEXSZ + 1) - pi->oid_strlen = GIT_OID_HEXSZ + 1; - - memset(&pi->line, 0, sizeof(pi->line)); - pi->line.old_lineno = -1; - pi->line.new_lineno = -1; - pi->line.num_lines = 1; - - return 0; -} - -static int diff_print_info_init_fromdiff( - diff_print_info *pi, - git_buf *out, - git_diff *diff, - git_diff_format_t format, - git_diff_line_cb cb, - void *payload) -{ - git_repository *repo = diff ? diff->repo : NULL; - - memset(pi, 0, sizeof(diff_print_info)); - - pi->diff = diff; - - if (diff) { - pi->flags = diff->opts.flags; - pi->oid_strlen = diff->opts.id_abbrev; - } - - return diff_print_info_init__common(pi, out, repo, format, cb, payload); -} - -static int diff_print_info_init_frompatch( - diff_print_info *pi, - git_buf *out, - git_patch *patch, - git_diff_format_t format, - git_diff_line_cb cb, - void *payload) -{ - git_repository *repo; - - assert(patch); - - repo = patch->diff ? patch->diff->repo : NULL; - - memset(pi, 0, sizeof(diff_print_info)); - - pi->diff = patch->diff; - - pi->flags = patch->diff_opts.flags; - pi->oid_strlen = patch->diff_opts.id_abbrev; - - pi->content_loaded = 1; - pi->ofile = &patch->ofile; - pi->nfile = &patch->nfile; - - return diff_print_info_init__common(pi, out, repo, format, cb, payload); -} - -static char diff_pick_suffix(int mode) -{ - if (S_ISDIR(mode)) - return '/'; - else if (GIT_PERMS_IS_EXEC(mode)) /* -V536 */ - /* in git, modes are very regular, so we must have 0100755 mode */ - return '*'; - else - return ' '; -} - -char git_diff_status_char(git_delta_t status) -{ - char code; - - switch (status) { - case GIT_DELTA_ADDED: code = 'A'; break; - case GIT_DELTA_DELETED: code = 'D'; break; - case GIT_DELTA_MODIFIED: code = 'M'; break; - case GIT_DELTA_RENAMED: code = 'R'; break; - case GIT_DELTA_COPIED: code = 'C'; break; - case GIT_DELTA_IGNORED: code = 'I'; break; - case GIT_DELTA_UNTRACKED: code = '?'; break; - case GIT_DELTA_UNREADABLE: code = 'X'; break; - default: code = ' '; break; - } - - return code; -} - -static int diff_print_one_name_only( - const git_diff_delta *delta, float progress, void *data) -{ - diff_print_info *pi = data; - git_buf *out = pi->buf; - - GIT_UNUSED(progress); - - if ((pi->flags & GIT_DIFF_SHOW_UNMODIFIED) == 0 && - delta->status == GIT_DELTA_UNMODIFIED) - return 0; - - git_buf_clear(out); - git_buf_puts(out, delta->new_file.path); - git_buf_putc(out, '\n'); - if (git_buf_oom(out)) - return -1; - - pi->line.origin = GIT_DIFF_LINE_FILE_HDR; - pi->line.content = git_buf_cstr(out); - pi->line.content_len = git_buf_len(out); - - return pi->print_cb(delta, NULL, &pi->line, pi->payload); -} - -static int diff_print_one_name_status( - const git_diff_delta *delta, float progress, void *data) -{ - diff_print_info *pi = data; - git_buf *out = pi->buf; - char old_suffix, new_suffix, code = git_diff_status_char(delta->status); - int (*strcomp)(const char *, const char *) = - pi->diff ? pi->diff->strcomp : git__strcmp; - - GIT_UNUSED(progress); - - if ((pi->flags & GIT_DIFF_SHOW_UNMODIFIED) == 0 && code == ' ') - return 0; - - old_suffix = diff_pick_suffix(delta->old_file.mode); - new_suffix = diff_pick_suffix(delta->new_file.mode); - - git_buf_clear(out); - - if (delta->old_file.path != delta->new_file.path && - strcomp(delta->old_file.path,delta->new_file.path) != 0) - git_buf_printf(out, "%c\t%s%c %s%c\n", code, - delta->old_file.path, old_suffix, delta->new_file.path, new_suffix); - else if (delta->old_file.mode != delta->new_file.mode && - delta->old_file.mode != 0 && delta->new_file.mode != 0) - git_buf_printf(out, "%c\t%s%c %s%c\n", code, - delta->old_file.path, old_suffix, delta->new_file.path, new_suffix); - else if (old_suffix != ' ') - git_buf_printf(out, "%c\t%s%c\n", code, delta->old_file.path, old_suffix); - else - git_buf_printf(out, "%c\t%s\n", code, delta->old_file.path); - if (git_buf_oom(out)) - return -1; - - pi->line.origin = GIT_DIFF_LINE_FILE_HDR; - pi->line.content = git_buf_cstr(out); - pi->line.content_len = git_buf_len(out); - - return pi->print_cb(delta, NULL, &pi->line, pi->payload); -} - -static int diff_print_one_raw( - const git_diff_delta *delta, float progress, void *data) -{ - diff_print_info *pi = data; - git_buf *out = pi->buf; - char code = git_diff_status_char(delta->status); - char start_oid[GIT_OID_HEXSZ+1], end_oid[GIT_OID_HEXSZ+1]; - - GIT_UNUSED(progress); - - if ((pi->flags & GIT_DIFF_SHOW_UNMODIFIED) == 0 && code == ' ') - return 0; - - git_buf_clear(out); - - git_oid_tostr(start_oid, pi->oid_strlen, &delta->old_file.id); - git_oid_tostr(end_oid, pi->oid_strlen, &delta->new_file.id); - - git_buf_printf( - out, (pi->oid_strlen <= GIT_OID_HEXSZ) ? - ":%06o %06o %s... %s... %c" : ":%06o %06o %s %s %c", - delta->old_file.mode, delta->new_file.mode, start_oid, end_oid, code); - - if (delta->similarity > 0) - git_buf_printf(out, "%03u", delta->similarity); - - if (delta->old_file.path != delta->new_file.path) - git_buf_printf( - out, "\t%s %s\n", delta->old_file.path, delta->new_file.path); - else - git_buf_printf( - out, "\t%s\n", delta->old_file.path ? - delta->old_file.path : delta->new_file.path); - - if (git_buf_oom(out)) - return -1; - - pi->line.origin = GIT_DIFF_LINE_FILE_HDR; - pi->line.content = git_buf_cstr(out); - pi->line.content_len = git_buf_len(out); - - return pi->print_cb(delta, NULL, &pi->line, pi->payload); -} - -static int diff_print_oid_range( - git_buf *out, const git_diff_delta *delta, int oid_strlen) -{ - char start_oid[GIT_OID_HEXSZ+1], end_oid[GIT_OID_HEXSZ+1]; - - git_oid_tostr(start_oid, oid_strlen, &delta->old_file.id); - git_oid_tostr(end_oid, oid_strlen, &delta->new_file.id); - - /* TODO: Match git diff more closely */ - if (delta->old_file.mode == delta->new_file.mode) { - git_buf_printf(out, "index %s..%s %o\n", - start_oid, end_oid, delta->old_file.mode); - } else { - if (delta->old_file.mode == 0) { - git_buf_printf(out, "new file mode %o\n", delta->new_file.mode); - } else if (delta->new_file.mode == 0) { - git_buf_printf(out, "deleted file mode %o\n", delta->old_file.mode); - } else { - git_buf_printf(out, "old mode %o\n", delta->old_file.mode); - git_buf_printf(out, "new mode %o\n", delta->new_file.mode); - } - git_buf_printf(out, "index %s..%s\n", start_oid, end_oid); - } - - return git_buf_oom(out) ? -1 : 0; -} - -static int diff_delta_format_with_paths( - git_buf *out, - const git_diff_delta *delta, - const char *oldpfx, - const char *newpfx, - const char *template) -{ - const char *oldpath = delta->old_file.path; - const char *newpath = delta->new_file.path; - - if (git_oid_iszero(&delta->old_file.id)) { - oldpfx = ""; - oldpath = "/dev/null"; - } - if (git_oid_iszero(&delta->new_file.id)) { - newpfx = ""; - newpath = "/dev/null"; - } - - return git_buf_printf(out, template, oldpfx, oldpath, newpfx, newpath); -} - -int git_diff_delta__format_file_header( - git_buf *out, - const git_diff_delta *delta, - const char *oldpfx, - const char *newpfx, - int oid_strlen) -{ - if (!oldpfx) - oldpfx = DIFF_OLD_PREFIX_DEFAULT; - if (!newpfx) - newpfx = DIFF_NEW_PREFIX_DEFAULT; - if (!oid_strlen) - oid_strlen = GIT_ABBREV_DEFAULT + 1; - - git_buf_clear(out); - - git_buf_printf(out, "diff --git %s%s %s%s\n", - oldpfx, delta->old_file.path, newpfx, delta->new_file.path); - - GITERR_CHECK_ERROR(diff_print_oid_range(out, delta, oid_strlen)); - - if ((delta->flags & GIT_DIFF_FLAG_BINARY) == 0) - diff_delta_format_with_paths( - out, delta, oldpfx, newpfx, "--- %s%s\n+++ %s%s\n"); - - return git_buf_oom(out) ? -1 : 0; -} - -static int format_binary( - diff_print_info *pi, - git_diff_binary_t type, - const char *data, - size_t datalen, - size_t inflatedlen) -{ - const char *typename = type == GIT_DIFF_BINARY_DELTA ? - "delta" : "literal"; - const char *scan, *end; - - git_buf_printf(pi->buf, "%s %" PRIuZ "\n", typename, inflatedlen); - pi->line.num_lines++; - - for (scan = data, end = data + datalen; scan < end; ) { - size_t chunk_len = end - scan; - if (chunk_len > 52) - chunk_len = 52; - - if (chunk_len <= 26) - git_buf_putc(pi->buf, (char)chunk_len + 'A' - 1); - else - git_buf_putc(pi->buf, (char)chunk_len - 26 + 'a' - 1); - - git_buf_encode_base85(pi->buf, scan, chunk_len); - git_buf_putc(pi->buf, '\n'); - - if (git_buf_oom(pi->buf)) - return -1; - - scan += chunk_len; - pi->line.num_lines++; - } - git_buf_putc(pi->buf, '\n'); - - return 0; -} - -static int diff_print_load_content( - diff_print_info *pi, - git_diff_delta *delta) -{ - git_diff_file_content *ofile, *nfile; - int error; - - assert(pi->diff); - - ofile = git__calloc(1, sizeof(git_diff_file_content)); - nfile = git__calloc(1, sizeof(git_diff_file_content)); - - GITERR_CHECK_ALLOC(ofile); - GITERR_CHECK_ALLOC(nfile); - - if ((error = git_diff_file_content__init_from_diff( - ofile, pi->diff, delta, true)) < 0 || - (error = git_diff_file_content__init_from_diff( - nfile, pi->diff, delta, true)) < 0) { - - git__free(ofile); - git__free(nfile); - return error; - } - - pi->content_loaded = 1; - pi->content_allocated = 1; - pi->ofile = ofile; - pi->nfile = nfile; - - return 0; -} - -static int diff_print_patch_file_binary( - diff_print_info *pi, git_diff_delta *delta, - const char *old_pfx, const char *new_pfx, - const git_diff_binary *binary) -{ - size_t pre_binary_size; - int error; - - if ((pi->flags & GIT_DIFF_SHOW_BINARY) == 0) - goto noshow; - - if (!pi->content_loaded && - (error = diff_print_load_content(pi, delta)) < 0) - return error; - - pre_binary_size = pi->buf->size; - git_buf_printf(pi->buf, "GIT binary patch\n"); - pi->line.num_lines++; - - if ((error = format_binary(pi, binary->new_file.type, binary->new_file.data, - binary->new_file.datalen, binary->new_file.inflatedlen)) < 0 || - (error = format_binary(pi, binary->old_file.type, binary->old_file.data, - binary->old_file.datalen, binary->old_file.inflatedlen)) < 0) { - - if (error == GIT_EBUFS) { - giterr_clear(); - git_buf_truncate(pi->buf, pre_binary_size); - goto noshow; - } - } - - pi->line.num_lines++; - return error; - -noshow: - pi->line.num_lines = 1; - return diff_delta_format_with_paths( - pi->buf, delta, old_pfx, new_pfx, - "Binary files %s%s and %s%s differ\n"); -} - -static int diff_print_patch_file( - const git_diff_delta *delta, float progress, void *data) -{ - int error; - diff_print_info *pi = data; - const char *oldpfx = - pi->diff ? pi->diff->opts.old_prefix : DIFF_OLD_PREFIX_DEFAULT; - const char *newpfx = - pi->diff ? pi->diff->opts.new_prefix : DIFF_NEW_PREFIX_DEFAULT; - - bool binary = (delta->flags & GIT_DIFF_FLAG_BINARY) || - (pi->flags & GIT_DIFF_FORCE_BINARY); - bool show_binary = !!(pi->flags & GIT_DIFF_SHOW_BINARY); - int oid_strlen = binary && show_binary ? - GIT_OID_HEXSZ + 1 : pi->oid_strlen; - - GIT_UNUSED(progress); - - if (S_ISDIR(delta->new_file.mode) || - delta->status == GIT_DELTA_UNMODIFIED || - delta->status == GIT_DELTA_IGNORED || - delta->status == GIT_DELTA_UNREADABLE || - (delta->status == GIT_DELTA_UNTRACKED && - (pi->flags & GIT_DIFF_SHOW_UNTRACKED_CONTENT) == 0)) - return 0; - - if ((error = git_diff_delta__format_file_header( - pi->buf, delta, oldpfx, newpfx, oid_strlen)) < 0) - return error; - - pi->line.origin = GIT_DIFF_LINE_FILE_HDR; - pi->line.content = git_buf_cstr(pi->buf); - pi->line.content_len = git_buf_len(pi->buf); - - return pi->print_cb(delta, NULL, &pi->line, pi->payload); -} - -static int diff_print_patch_binary( - const git_diff_delta *delta, - const git_diff_binary *binary, - void *data) -{ - diff_print_info *pi = data; - const char *old_pfx = - pi->diff ? pi->diff->opts.old_prefix : DIFF_OLD_PREFIX_DEFAULT; - const char *new_pfx = - pi->diff ? pi->diff->opts.new_prefix : DIFF_NEW_PREFIX_DEFAULT; - int error; - - git_buf_clear(pi->buf); - - if ((error = diff_print_patch_file_binary( - pi, (git_diff_delta *)delta, old_pfx, new_pfx, binary)) < 0) - return error; - - pi->line.origin = GIT_DIFF_LINE_BINARY; - pi->line.content = git_buf_cstr(pi->buf); - pi->line.content_len = git_buf_len(pi->buf); - - return pi->print_cb(delta, NULL, &pi->line, pi->payload); -} - -static int diff_print_patch_hunk( - const git_diff_delta *d, - const git_diff_hunk *h, - void *data) -{ - diff_print_info *pi = data; - - if (S_ISDIR(d->new_file.mode)) - return 0; - - pi->line.origin = GIT_DIFF_LINE_HUNK_HDR; - pi->line.content = h->header; - pi->line.content_len = h->header_len; - - return pi->print_cb(d, h, &pi->line, pi->payload); -} - -static int diff_print_patch_line( - const git_diff_delta *delta, - const git_diff_hunk *hunk, - const git_diff_line *line, - void *data) -{ - diff_print_info *pi = data; - - if (S_ISDIR(delta->new_file.mode)) - return 0; - - return pi->print_cb(delta, hunk, line, pi->payload); -} - -/* print a git_diff to an output callback */ -int git_diff_print( - git_diff *diff, - git_diff_format_t format, - git_diff_line_cb print_cb, - void *payload) -{ - int error; - git_buf buf = GIT_BUF_INIT; - diff_print_info pi; - git_diff_file_cb print_file = NULL; - git_diff_binary_cb print_binary = NULL; - git_diff_hunk_cb print_hunk = NULL; - git_diff_line_cb print_line = NULL; - - switch (format) { - case GIT_DIFF_FORMAT_PATCH: - print_file = diff_print_patch_file; - print_binary = diff_print_patch_binary; - print_hunk = diff_print_patch_hunk; - print_line = diff_print_patch_line; - break; - case GIT_DIFF_FORMAT_PATCH_HEADER: - print_file = diff_print_patch_file; - break; - case GIT_DIFF_FORMAT_RAW: - print_file = diff_print_one_raw; - break; - case GIT_DIFF_FORMAT_NAME_ONLY: - print_file = diff_print_one_name_only; - break; - case GIT_DIFF_FORMAT_NAME_STATUS: - print_file = diff_print_one_name_status; - break; - default: - giterr_set(GITERR_INVALID, "Unknown diff output format (%d)", format); - return -1; - } - - if (!(error = diff_print_info_init_fromdiff( - &pi, &buf, diff, format, print_cb, payload))) { - error = git_diff_foreach( - diff, print_file, print_binary, print_hunk, print_line, &pi); - - if (error) /* make sure error message is set */ - giterr_set_after_callback_function(error, "git_diff_print"); - } - - git__free(pi.nfile); - git__free(pi.ofile); - - git_buf_free(&buf); - - return error; -} - -/* print a git_patch to an output callback */ -int git_patch_print( - git_patch *patch, - git_diff_line_cb print_cb, - void *payload) -{ - int error; - git_buf temp = GIT_BUF_INIT; - diff_print_info pi; - - assert(patch && print_cb); - - if (!(error = diff_print_info_init_frompatch( - &pi, &temp, patch, - GIT_DIFF_FORMAT_PATCH, print_cb, payload))) - { - error = git_patch__invoke_callbacks( - patch, diff_print_patch_file, diff_print_patch_binary, - diff_print_patch_hunk, diff_print_patch_line, &pi); - - if (error) /* make sure error message is set */ - giterr_set_after_callback_function(error, "git_patch_print"); - } - - git_buf_free(&temp); - - return error; -} - -int git_diff_print_callback__to_buf( - const git_diff_delta *delta, - const git_diff_hunk *hunk, - const git_diff_line *line, - void *payload) -{ - git_buf *output = payload; - GIT_UNUSED(delta); GIT_UNUSED(hunk); - - if (!output) { - giterr_set(GITERR_INVALID, "Buffer pointer must be provided"); - return -1; - } - - if (line->origin == GIT_DIFF_LINE_ADDITION || - line->origin == GIT_DIFF_LINE_DELETION || - line->origin == GIT_DIFF_LINE_CONTEXT) - git_buf_putc(output, line->origin); - - return git_buf_put(output, line->content, line->content_len); -} - -int git_diff_print_callback__to_file_handle( - const git_diff_delta *delta, - const git_diff_hunk *hunk, - const git_diff_line *line, - void *payload) -{ - FILE *fp = payload ? payload : stdout; - - GIT_UNUSED(delta); GIT_UNUSED(hunk); - - if (line->origin == GIT_DIFF_LINE_CONTEXT || - line->origin == GIT_DIFF_LINE_ADDITION || - line->origin == GIT_DIFF_LINE_DELETION) - fputc(line->origin, fp); - fwrite(line->content, 1, line->content_len, fp); - return 0; -} - -/* print a git_patch to a git_buf */ -int git_patch_to_buf(git_buf *out, git_patch *patch) -{ - assert(out && patch); - git_buf_sanitize(out); - return git_patch_print(patch, git_diff_print_callback__to_buf, out); -} diff --git a/vendor/libgit2/src/diff_stats.c b/vendor/libgit2/src/diff_stats.c deleted file mode 100644 index 42ccbfb87..000000000 --- a/vendor/libgit2/src/diff_stats.c +++ /dev/null @@ -1,336 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#include "common.h" -#include "vector.h" -#include "diff.h" -#include "diff_patch.h" - -#define DIFF_RENAME_FILE_SEPARATOR " => " -#define STATS_FULL_MIN_SCALE 7 - -typedef struct { - size_t insertions; - size_t deletions; -} diff_file_stats; - -struct git_diff_stats { - git_diff *diff; - diff_file_stats *filestats; - - size_t files_changed; - size_t insertions; - size_t deletions; - size_t renames; - - size_t max_name; - size_t max_filestat; - int max_digits; -}; - -static int digits_for_value(size_t val) -{ - int count = 1; - size_t placevalue = 10; - - while (val >= placevalue) { - ++count; - placevalue *= 10; - } - - return count; -} - -int git_diff_file_stats__full_to_buf( - git_buf *out, - const git_diff_delta *delta, - const diff_file_stats *filestat, - const git_diff_stats *stats, - size_t width) -{ - const char *old_path = NULL, *new_path = NULL; - size_t padding, old_size, new_size; - - old_path = delta->old_file.path; - new_path = delta->new_file.path; - old_size = delta->old_file.size; - new_size = delta->new_file.size; - - if (git_buf_printf(out, " %s", old_path) < 0) - goto on_error; - - if (strcmp(old_path, new_path) != 0) { - padding = stats->max_name - strlen(old_path) - strlen(new_path); - - if (git_buf_printf(out, DIFF_RENAME_FILE_SEPARATOR "%s", new_path) < 0) - goto on_error; - } else { - padding = stats->max_name - strlen(old_path); - - if (stats->renames > 0) - padding += strlen(DIFF_RENAME_FILE_SEPARATOR); - } - - if (git_buf_putcn(out, ' ', padding) < 0 || - git_buf_puts(out, " | ") < 0) - goto on_error; - - if (delta->flags & GIT_DIFF_FLAG_BINARY) { - if (git_buf_printf(out, - "Bin %" PRIuZ " -> %" PRIuZ " bytes", old_size, new_size) < 0) - goto on_error; - } - else { - if (git_buf_printf(out, - "%*" PRIuZ, stats->max_digits, - filestat->insertions + filestat->deletions) < 0) - goto on_error; - - if (filestat->insertions || filestat->deletions) { - if (git_buf_putc(out, ' ') < 0) - goto on_error; - - if (!width) { - if (git_buf_putcn(out, '+', filestat->insertions) < 0 || - git_buf_putcn(out, '-', filestat->deletions) < 0) - goto on_error; - } else { - size_t total = filestat->insertions + filestat->deletions; - size_t full = (total * width + stats->max_filestat / 2) / - stats->max_filestat; - size_t plus = full * filestat->insertions / total; - size_t minus = full - plus; - - if (git_buf_putcn(out, '+', max(plus, 1)) < 0 || - git_buf_putcn(out, '-', max(minus, 1)) < 0) - goto on_error; - } - } - } - - git_buf_putc(out, '\n'); - -on_error: - return (git_buf_oom(out) ? -1 : 0); -} - -int git_diff_file_stats__number_to_buf( - git_buf *out, - const git_diff_delta *delta, - const diff_file_stats *filestats) -{ - int error; - const char *path = delta->new_file.path; - - if (delta->flags & GIT_DIFF_FLAG_BINARY) - error = git_buf_printf(out, "%-8c" "%-8c" "%s\n", '-', '-', path); - else - error = git_buf_printf(out, "%-8" PRIuZ "%-8" PRIuZ "%s\n", - filestats->insertions, filestats->deletions, path); - - return error; -} - -int git_diff_file_stats__summary_to_buf( - git_buf *out, - const git_diff_delta *delta) -{ - if (delta->old_file.mode != delta->new_file.mode) { - if (delta->old_file.mode == 0) { - git_buf_printf(out, " create mode %06o %s\n", - delta->new_file.mode, delta->new_file.path); - } - else if (delta->new_file.mode == 0) { - git_buf_printf(out, " delete mode %06o %s\n", - delta->old_file.mode, delta->old_file.path); - } - else { - git_buf_printf(out, " mode change %06o => %06o %s\n", - delta->old_file.mode, delta->new_file.mode, delta->new_file.path); - } - } - - return 0; -} - -int git_diff_get_stats( - git_diff_stats **out, - git_diff *diff) -{ - size_t i, deltas; - size_t total_insertions = 0, total_deletions = 0; - git_diff_stats *stats = NULL; - int error = 0; - - assert(out && diff); - - stats = git__calloc(1, sizeof(git_diff_stats)); - GITERR_CHECK_ALLOC(stats); - - deltas = git_diff_num_deltas(diff); - - stats->filestats = git__calloc(deltas, sizeof(diff_file_stats)); - if (!stats->filestats) { - git__free(stats); - return -1; - } - - stats->diff = diff; - GIT_REFCOUNT_INC(diff); - - for (i = 0; i < deltas && !error; ++i) { - git_patch *patch = NULL; - size_t add = 0, remove = 0, namelen; - const git_diff_delta *delta; - - if ((error = git_patch_from_diff(&patch, diff, i)) < 0) - break; - - /* keep a count of renames because it will affect formatting */ - delta = git_patch_get_delta(patch); - - namelen = strlen(delta->new_file.path); - if (strcmp(delta->old_file.path, delta->new_file.path) != 0) { - namelen += strlen(delta->old_file.path); - stats->renames++; - } - - /* and, of course, count the line stats */ - error = git_patch_line_stats(NULL, &add, &remove, patch); - - git_patch_free(patch); - - stats->filestats[i].insertions = add; - stats->filestats[i].deletions = remove; - - total_insertions += add; - total_deletions += remove; - - if (stats->max_name < namelen) - stats->max_name = namelen; - if (stats->max_filestat < add + remove) - stats->max_filestat = add + remove; - } - - stats->files_changed = deltas; - stats->insertions = total_insertions; - stats->deletions = total_deletions; - stats->max_digits = digits_for_value(stats->max_filestat + 1); - - if (error < 0) { - git_diff_stats_free(stats); - stats = NULL; - } - - *out = stats; - return error; -} - -size_t git_diff_stats_files_changed( - const git_diff_stats *stats) -{ - assert(stats); - - return stats->files_changed; -} - -size_t git_diff_stats_insertions( - const git_diff_stats *stats) -{ - assert(stats); - - return stats->insertions; -} - -size_t git_diff_stats_deletions( - const git_diff_stats *stats) -{ - assert(stats); - - return stats->deletions; -} - -int git_diff_stats_to_buf( - git_buf *out, - const git_diff_stats *stats, - git_diff_stats_format_t format, - size_t width) -{ - int error = 0; - size_t i; - const git_diff_delta *delta; - - assert(out && stats); - - if (format & GIT_DIFF_STATS_NUMBER) { - for (i = 0; i < stats->files_changed; ++i) { - if ((delta = git_diff_get_delta(stats->diff, i)) == NULL) - continue; - - error = git_diff_file_stats__number_to_buf( - out, delta, &stats->filestats[i]); - if (error < 0) - return error; - } - } - - if (format & GIT_DIFF_STATS_FULL) { - if (width > 0) { - if (width > stats->max_name + stats->max_digits + 5) - width -= (stats->max_name + stats->max_digits + 5); - if (width < STATS_FULL_MIN_SCALE) - width = STATS_FULL_MIN_SCALE; - } - if (width > stats->max_filestat) - width = 0; - - for (i = 0; i < stats->files_changed; ++i) { - if ((delta = git_diff_get_delta(stats->diff, i)) == NULL) - continue; - - error = git_diff_file_stats__full_to_buf( - out, delta, &stats->filestats[i], stats, width); - if (error < 0) - return error; - } - } - - if (format & GIT_DIFF_STATS_FULL || format & GIT_DIFF_STATS_SHORT) { - error = git_buf_printf( - out, " %" PRIuZ " file%s changed, %" PRIuZ - " insertion%s(+), %" PRIuZ " deletion%s(-)\n", - stats->files_changed, stats->files_changed != 1 ? "s" : "", - stats->insertions, stats->insertions != 1 ? "s" : "", - stats->deletions, stats->deletions != 1 ? "s" : ""); - - if (error < 0) - return error; - } - - if (format & GIT_DIFF_STATS_INCLUDE_SUMMARY) { - for (i = 0; i < stats->files_changed; ++i) { - if ((delta = git_diff_get_delta(stats->diff, i)) == NULL) - continue; - - error = git_diff_file_stats__summary_to_buf(out, delta); - if (error < 0) - return error; - } - } - - return error; -} - -void git_diff_stats_free(git_diff_stats *stats) -{ - if (stats == NULL) - return; - - git_diff_free(stats->diff); /* bumped refcount in constructor */ - git__free(stats->filestats); - git__free(stats); -} - diff --git a/vendor/libgit2/src/diff_tform.c b/vendor/libgit2/src/diff_tform.c deleted file mode 100644 index 6a6a62811..000000000 --- a/vendor/libgit2/src/diff_tform.c +++ /dev/null @@ -1,1114 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#include "common.h" - -#include "git2/config.h" -#include "git2/blob.h" -#include "git2/sys/hashsig.h" - -#include "diff.h" -#include "path.h" -#include "fileops.h" -#include "config.h" - -git_diff_delta *git_diff__delta_dup( - const git_diff_delta *d, git_pool *pool) -{ - git_diff_delta *delta = git__malloc(sizeof(git_diff_delta)); - if (!delta) - return NULL; - - memcpy(delta, d, sizeof(git_diff_delta)); - GIT_DIFF_FLAG__CLEAR_INTERNAL(delta->flags); - - if (d->old_file.path != NULL) { - delta->old_file.path = git_pool_strdup(pool, d->old_file.path); - if (delta->old_file.path == NULL) - goto fail; - } - - if (d->new_file.path != d->old_file.path && d->new_file.path != NULL) { - delta->new_file.path = git_pool_strdup(pool, d->new_file.path); - if (delta->new_file.path == NULL) - goto fail; - } else { - delta->new_file.path = delta->old_file.path; - } - - return delta; - -fail: - git__free(delta); - return NULL; -} - -git_diff_delta *git_diff__merge_like_cgit( - const git_diff_delta *a, - const git_diff_delta *b, - git_pool *pool) -{ - git_diff_delta *dup; - - /* Emulate C git for merging two diffs (a la 'git diff '). - * - * When C git does a diff between the work dir and a tree, it actually - * diffs with the index but uses the workdir contents. This emulates - * those choices so we can emulate the type of diff. - * - * We have three file descriptions here, let's call them: - * f1 = a->old_file - * f2 = a->new_file AND b->old_file - * f3 = b->new_file - */ - - /* If one of the diffs is a conflict, just dup it */ - if (b->status == GIT_DELTA_CONFLICTED) - return git_diff__delta_dup(b, pool); - if (a->status == GIT_DELTA_CONFLICTED) - return git_diff__delta_dup(a, pool); - - /* if f2 == f3 or f2 is deleted, then just dup the 'a' diff */ - if (b->status == GIT_DELTA_UNMODIFIED || a->status == GIT_DELTA_DELETED) - return git_diff__delta_dup(a, pool); - - /* otherwise, base this diff on the 'b' diff */ - if ((dup = git_diff__delta_dup(b, pool)) == NULL) - return NULL; - - /* If 'a' status is uninteresting, then we're done */ - if (a->status == GIT_DELTA_UNMODIFIED || - a->status == GIT_DELTA_UNTRACKED || - a->status == GIT_DELTA_UNREADABLE) - return dup; - - assert(b->status != GIT_DELTA_UNMODIFIED); - - /* A cgit exception is that the diff of a file that is only in the - * index (i.e. not in HEAD nor workdir) is given as empty. - */ - if (dup->status == GIT_DELTA_DELETED) { - if (a->status == GIT_DELTA_ADDED) { - dup->status = GIT_DELTA_UNMODIFIED; - dup->nfiles = 2; - } - /* else don't overwrite DELETE status */ - } else { - dup->status = a->status; - dup->nfiles = a->nfiles; - } - - git_oid_cpy(&dup->old_file.id, &a->old_file.id); - dup->old_file.mode = a->old_file.mode; - dup->old_file.size = a->old_file.size; - dup->old_file.flags = a->old_file.flags; - - return dup; -} - -int git_diff__merge( - git_diff *onto, const git_diff *from, git_diff__merge_cb cb) -{ - int error = 0; - git_pool onto_pool; - git_vector onto_new; - git_diff_delta *delta; - bool ignore_case, reversed; - unsigned int i, j; - - assert(onto && from); - - if (!from->deltas.length) - return 0; - - ignore_case = ((onto->opts.flags & GIT_DIFF_IGNORE_CASE) != 0); - reversed = ((onto->opts.flags & GIT_DIFF_REVERSE) != 0); - - if (ignore_case != ((from->opts.flags & GIT_DIFF_IGNORE_CASE) != 0) || - reversed != ((from->opts.flags & GIT_DIFF_REVERSE) != 0)) { - giterr_set(GITERR_INVALID, - "Attempt to merge diffs created with conflicting options"); - return -1; - } - - if (git_vector_init(&onto_new, onto->deltas.length, git_diff_delta__cmp) < 0) - return -1; - - git_pool_init(&onto_pool, 1); - - for (i = 0, j = 0; i < onto->deltas.length || j < from->deltas.length; ) { - git_diff_delta *o = GIT_VECTOR_GET(&onto->deltas, i); - const git_diff_delta *f = GIT_VECTOR_GET(&from->deltas, j); - int cmp = !f ? -1 : !o ? 1 : - STRCMP_CASESELECT(ignore_case, o->old_file.path, f->old_file.path); - - if (cmp < 0) { - delta = git_diff__delta_dup(o, &onto_pool); - i++; - } else if (cmp > 0) { - delta = git_diff__delta_dup(f, &onto_pool); - j++; - } else { - const git_diff_delta *left = reversed ? f : o; - const git_diff_delta *right = reversed ? o : f; - - delta = cb(left, right, &onto_pool); - i++; - j++; - } - - /* the ignore rules for the target may not match the source - * or the result of a merged delta could be skippable... - */ - if (delta && git_diff_delta__should_skip(&onto->opts, delta)) { - git__free(delta); - continue; - } - - if ((error = !delta ? -1 : git_vector_insert(&onto_new, delta)) < 0) - break; - } - - if (!error) { - git_vector_swap(&onto->deltas, &onto_new); - git_pool_swap(&onto->pool, &onto_pool); - - if ((onto->opts.flags & GIT_DIFF_REVERSE) != 0) - onto->old_src = from->old_src; - else - onto->new_src = from->new_src; - - /* prefix strings also come from old pool, so recreate those.*/ - onto->opts.old_prefix = - git_pool_strdup_safe(&onto->pool, onto->opts.old_prefix); - onto->opts.new_prefix = - git_pool_strdup_safe(&onto->pool, onto->opts.new_prefix); - } - - git_vector_free_deep(&onto_new); - git_pool_clear(&onto_pool); - - return error; -} - -int git_diff_merge(git_diff *onto, const git_diff *from) -{ - return git_diff__merge(onto, from, git_diff__merge_like_cgit); -} - -int git_diff_find_similar__hashsig_for_file( - void **out, const git_diff_file *f, const char *path, void *p) -{ - git_hashsig_option_t opt = (git_hashsig_option_t)(intptr_t)p; - - GIT_UNUSED(f); - return git_hashsig_create_fromfile((git_hashsig **)out, path, opt); -} - -int git_diff_find_similar__hashsig_for_buf( - void **out, const git_diff_file *f, const char *buf, size_t len, void *p) -{ - git_hashsig_option_t opt = (git_hashsig_option_t)(intptr_t)p; - - GIT_UNUSED(f); - return git_hashsig_create((git_hashsig **)out, buf, len, opt); -} - -void git_diff_find_similar__hashsig_free(void *sig, void *payload) -{ - GIT_UNUSED(payload); - git_hashsig_free(sig); -} - -int git_diff_find_similar__calc_similarity( - int *score, void *siga, void *sigb, void *payload) -{ - int error; - - GIT_UNUSED(payload); - error = git_hashsig_compare(siga, sigb); - if (error < 0) - return error; - - *score = error; - return 0; -} - -#define DEFAULT_THRESHOLD 50 -#define DEFAULT_BREAK_REWRITE_THRESHOLD 60 -#define DEFAULT_RENAME_LIMIT 200 - -static int normalize_find_opts( - git_diff *diff, - git_diff_find_options *opts, - const git_diff_find_options *given) -{ - git_config *cfg = NULL; - git_hashsig_option_t hashsig_opts; - - GITERR_CHECK_VERSION(given, GIT_DIFF_FIND_OPTIONS_VERSION, "git_diff_find_options"); - - if (diff->repo != NULL && - git_repository_config__weakptr(&cfg, diff->repo) < 0) - return -1; - - if (given) - memcpy(opts, given, sizeof(*opts)); - - if (!given || - (given->flags & GIT_DIFF_FIND_ALL) == GIT_DIFF_FIND_BY_CONFIG) - { - if (cfg) { - char *rule = - git_config__get_string_force(cfg, "diff.renames", "true"); - int boolval; - - if (!git__parse_bool(&boolval, rule) && !boolval) - /* don't set FIND_RENAMES if bool value is false */; - else if (!strcasecmp(rule, "copies") || !strcasecmp(rule, "copy")) - opts->flags |= GIT_DIFF_FIND_RENAMES | GIT_DIFF_FIND_COPIES; - else - opts->flags |= GIT_DIFF_FIND_RENAMES; - - git__free(rule); - } else { - /* set default flag */ - opts->flags |= GIT_DIFF_FIND_RENAMES; - } - } - - /* some flags imply others */ - - if (opts->flags & GIT_DIFF_FIND_EXACT_MATCH_ONLY) { - /* if we are only looking for exact matches, then don't turn - * MODIFIED items into ADD/DELETE pairs because it's too picky - */ - opts->flags &= ~(GIT_DIFF_FIND_REWRITES | GIT_DIFF_BREAK_REWRITES); - - /* similarly, don't look for self-rewrites to split */ - opts->flags &= ~GIT_DIFF_FIND_RENAMES_FROM_REWRITES; - } - - if (opts->flags & GIT_DIFF_FIND_RENAMES_FROM_REWRITES) - opts->flags |= GIT_DIFF_FIND_RENAMES; - - if (opts->flags & GIT_DIFF_FIND_COPIES_FROM_UNMODIFIED) - opts->flags |= GIT_DIFF_FIND_COPIES; - - if (opts->flags & GIT_DIFF_BREAK_REWRITES) - opts->flags |= GIT_DIFF_FIND_REWRITES; - -#define USE_DEFAULT(X) ((X) == 0 || (X) > 100) - - if (USE_DEFAULT(opts->rename_threshold)) - opts->rename_threshold = DEFAULT_THRESHOLD; - - if (USE_DEFAULT(opts->rename_from_rewrite_threshold)) - opts->rename_from_rewrite_threshold = DEFAULT_THRESHOLD; - - if (USE_DEFAULT(opts->copy_threshold)) - opts->copy_threshold = DEFAULT_THRESHOLD; - - if (USE_DEFAULT(opts->break_rewrite_threshold)) - opts->break_rewrite_threshold = DEFAULT_BREAK_REWRITE_THRESHOLD; - -#undef USE_DEFAULT - - if (!opts->rename_limit) { - if (cfg) { - opts->rename_limit = git_config__get_int_force( - cfg, "diff.renamelimit", DEFAULT_RENAME_LIMIT); - } - - if (opts->rename_limit <= 0) - opts->rename_limit = DEFAULT_RENAME_LIMIT; - } - - /* assign the internal metric with whitespace flag as payload */ - if (!opts->metric) { - opts->metric = git__malloc(sizeof(git_diff_similarity_metric)); - GITERR_CHECK_ALLOC(opts->metric); - - opts->metric->file_signature = git_diff_find_similar__hashsig_for_file; - opts->metric->buffer_signature = git_diff_find_similar__hashsig_for_buf; - opts->metric->free_signature = git_diff_find_similar__hashsig_free; - opts->metric->similarity = git_diff_find_similar__calc_similarity; - - if (opts->flags & GIT_DIFF_FIND_IGNORE_WHITESPACE) - hashsig_opts = GIT_HASHSIG_IGNORE_WHITESPACE; - else if (opts->flags & GIT_DIFF_FIND_DONT_IGNORE_WHITESPACE) - hashsig_opts = GIT_HASHSIG_NORMAL; - else - hashsig_opts = GIT_HASHSIG_SMART_WHITESPACE; - hashsig_opts |= GIT_HASHSIG_ALLOW_SMALL_FILES; - opts->metric->payload = (void *)hashsig_opts; - } - - return 0; -} - -static int insert_delete_side_of_split( - git_diff *diff, git_vector *onto, const git_diff_delta *delta) -{ - /* make new record for DELETED side of split */ - git_diff_delta *deleted = git_diff__delta_dup(delta, &diff->pool); - GITERR_CHECK_ALLOC(deleted); - - deleted->status = GIT_DELTA_DELETED; - deleted->nfiles = 1; - memset(&deleted->new_file, 0, sizeof(deleted->new_file)); - deleted->new_file.path = deleted->old_file.path; - deleted->new_file.flags |= GIT_DIFF_FLAG_VALID_ID; - - return git_vector_insert(onto, deleted); -} - -static int apply_splits_and_deletes( - git_diff *diff, size_t expected_size, bool actually_split) -{ - git_vector onto = GIT_VECTOR_INIT; - size_t i; - git_diff_delta *delta; - - if (git_vector_init(&onto, expected_size, git_diff_delta__cmp) < 0) - return -1; - - /* build new delta list without TO_DELETE and splitting TO_SPLIT */ - git_vector_foreach(&diff->deltas, i, delta) { - if ((delta->flags & GIT_DIFF_FLAG__TO_DELETE) != 0) - continue; - - if ((delta->flags & GIT_DIFF_FLAG__TO_SPLIT) != 0 && actually_split) { - delta->similarity = 0; - - if (insert_delete_side_of_split(diff, &onto, delta) < 0) - goto on_error; - - if (diff->new_src == GIT_ITERATOR_TYPE_WORKDIR) - delta->status = GIT_DELTA_UNTRACKED; - else - delta->status = GIT_DELTA_ADDED; - delta->nfiles = 1; - memset(&delta->old_file, 0, sizeof(delta->old_file)); - delta->old_file.path = delta->new_file.path; - delta->old_file.flags |= GIT_DIFF_FLAG_VALID_ID; - } - - /* clean up delta before inserting into new list */ - GIT_DIFF_FLAG__CLEAR_INTERNAL(delta->flags); - - if (delta->status != GIT_DELTA_COPIED && - delta->status != GIT_DELTA_RENAMED && - (delta->status != GIT_DELTA_MODIFIED || actually_split)) - delta->similarity = 0; - - /* insert into new list */ - if (git_vector_insert(&onto, delta) < 0) - goto on_error; - } - - /* cannot return an error past this point */ - - /* free deltas from old list that didn't make it to the new one */ - git_vector_foreach(&diff->deltas, i, delta) { - if ((delta->flags & GIT_DIFF_FLAG__TO_DELETE) != 0) - git__free(delta); - } - - /* swap new delta list into place */ - git_vector_swap(&diff->deltas, &onto); - git_vector_free(&onto); - git_vector_sort(&diff->deltas); - - return 0; - -on_error: - git_vector_free_deep(&onto); - - return -1; -} - -GIT_INLINE(git_diff_file *) similarity_get_file(git_diff *diff, size_t idx) -{ - git_diff_delta *delta = git_vector_get(&diff->deltas, idx / 2); - return (idx & 1) ? &delta->new_file : &delta->old_file; -} - -typedef struct { - size_t idx; - git_iterator_type_t src; - git_repository *repo; - git_diff_file *file; - git_buf data; - git_odb_object *odb_obj; - git_blob *blob; -} similarity_info; - -static int similarity_init( - similarity_info *info, git_diff *diff, size_t file_idx) -{ - info->idx = file_idx; - info->src = (file_idx & 1) ? diff->new_src : diff->old_src; - info->repo = diff->repo; - info->file = similarity_get_file(diff, file_idx); - info->odb_obj = NULL; - info->blob = NULL; - git_buf_init(&info->data, 0); - - if (info->file->size > 0 || info->src == GIT_ITERATOR_TYPE_WORKDIR) - return 0; - - return git_diff_file__resolve_zero_size( - info->file, &info->odb_obj, info->repo); -} - -static int similarity_sig( - similarity_info *info, - const git_diff_find_options *opts, - void **cache) -{ - int error = 0; - git_diff_file *file = info->file; - - if (info->src == GIT_ITERATOR_TYPE_WORKDIR) { - if ((error = git_buf_joinpath( - &info->data, git_repository_workdir(info->repo), file->path)) < 0) - return error; - - /* if path is not a regular file, just skip this item */ - if (!git_path_isfile(info->data.ptr)) - return 0; - - /* TODO: apply wd-to-odb filters to file data if necessary */ - - error = opts->metric->file_signature( - &cache[info->idx], info->file, - info->data.ptr, opts->metric->payload); - } else { - /* if we didn't initially know the size, we might have an odb_obj - * around from earlier, so convert that, otherwise load the blob now - */ - if (info->odb_obj != NULL) - error = git_object__from_odb_object( - (git_object **)&info->blob, info->repo, - info->odb_obj, GIT_OBJ_BLOB); - else - error = git_blob_lookup(&info->blob, info->repo, &file->id); - - if (error < 0) { - /* if lookup fails, just skip this item in similarity calc */ - giterr_clear(); - } else { - size_t sz; - - /* index size may not be actual blob size if filtered */ - if (file->size != git_blob_rawsize(info->blob)) - file->size = git_blob_rawsize(info->blob); - - sz = (size_t)(git__is_sizet(file->size) ? file->size : -1); - - error = opts->metric->buffer_signature( - &cache[info->idx], info->file, - git_blob_rawcontent(info->blob), sz, opts->metric->payload); - } - } - - return error; -} - -static void similarity_unload(similarity_info *info) -{ - if (info->odb_obj) - git_odb_object_free(info->odb_obj); - - if (info->blob) - git_blob_free(info->blob); - else - git_buf_free(&info->data); -} - -#define FLAG_SET(opts,flag_name) (((opts)->flags & flag_name) != 0) - -/* - score < 0 means files cannot be compared - * - score >= 100 means files are exact match - * - score == 0 means files are completely different - */ -static int similarity_measure( - int *score, - git_diff *diff, - const git_diff_find_options *opts, - void **cache, - size_t a_idx, - size_t b_idx) -{ - git_diff_file *a_file = similarity_get_file(diff, a_idx); - git_diff_file *b_file = similarity_get_file(diff, b_idx); - bool exact_match = FLAG_SET(opts, GIT_DIFF_FIND_EXACT_MATCH_ONLY); - int error = 0; - similarity_info a_info, b_info; - - *score = -1; - - /* don't try to compare files of different types */ - if (GIT_MODE_TYPE(a_file->mode) != GIT_MODE_TYPE(b_file->mode)) - return 0; - - /* if exact match is requested, force calculation of missing OIDs now */ - if (exact_match) { - if (git_oid_iszero(&a_file->id) && - diff->old_src == GIT_ITERATOR_TYPE_WORKDIR && - !git_diff__oid_for_file(&a_file->id, - diff, a_file->path, a_file->mode, a_file->size)) - a_file->flags |= GIT_DIFF_FLAG_VALID_ID; - - if (git_oid_iszero(&b_file->id) && - diff->new_src == GIT_ITERATOR_TYPE_WORKDIR && - !git_diff__oid_for_file(&b_file->id, - diff, b_file->path, b_file->mode, b_file->size)) - b_file->flags |= GIT_DIFF_FLAG_VALID_ID; - } - - /* check OID match as a quick test */ - if (git_oid__cmp(&a_file->id, &b_file->id) == 0) { - *score = 100; - return 0; - } - - /* don't calculate signatures if we are doing exact match */ - if (exact_match) { - *score = 0; - return 0; - } - - memset(&a_info, 0, sizeof(a_info)); - memset(&b_info, 0, sizeof(b_info)); - - /* set up similarity data (will try to update missing file sizes) */ - if (!cache[a_idx] && (error = similarity_init(&a_info, diff, a_idx)) < 0) - return error; - if (!cache[b_idx] && (error = similarity_init(&b_info, diff, b_idx)) < 0) - goto cleanup; - - /* check if file sizes are nowhere near each other */ - if (a_file->size > 127 && - b_file->size > 127 && - (a_file->size > (b_file->size << 3) || - b_file->size > (a_file->size << 3))) - goto cleanup; - - /* update signature cache if needed */ - if (!cache[a_idx]) { - if ((error = similarity_sig(&a_info, opts, cache)) < 0) - goto cleanup; - } - if (!cache[b_idx]) { - if ((error = similarity_sig(&b_info, opts, cache)) < 0) - goto cleanup; - } - - /* calculate similarity provided that the metric choose to process - * both the a and b files (some may not if file is too big, etc). - */ - if (cache[a_idx] && cache[b_idx]) - error = opts->metric->similarity( - score, cache[a_idx], cache[b_idx], opts->metric->payload); - -cleanup: - similarity_unload(&a_info); - similarity_unload(&b_info); - - return error; -} - -static int calc_self_similarity( - git_diff *diff, - const git_diff_find_options *opts, - size_t delta_idx, - void **cache) -{ - int error, similarity = -1; - git_diff_delta *delta = GIT_VECTOR_GET(&diff->deltas, delta_idx); - - if ((delta->flags & GIT_DIFF_FLAG__HAS_SELF_SIMILARITY) != 0) - return 0; - - error = similarity_measure( - &similarity, diff, opts, cache, 2 * delta_idx, 2 * delta_idx + 1); - if (error < 0) - return error; - - if (similarity >= 0) { - delta->similarity = (uint16_t)similarity; - delta->flags |= GIT_DIFF_FLAG__HAS_SELF_SIMILARITY; - } - - return 0; -} - -static bool is_rename_target( - git_diff *diff, - const git_diff_find_options *opts, - size_t delta_idx, - void **cache) -{ - git_diff_delta *delta = GIT_VECTOR_GET(&diff->deltas, delta_idx); - - /* skip things that aren't plain blobs */ - if (!GIT_MODE_ISBLOB(delta->new_file.mode)) - return false; - - /* only consider ADDED, RENAMED, COPIED, and split MODIFIED as - * targets; maybe include UNTRACKED if requested. - */ - switch (delta->status) { - case GIT_DELTA_UNMODIFIED: - case GIT_DELTA_DELETED: - case GIT_DELTA_IGNORED: - case GIT_DELTA_CONFLICTED: - return false; - - case GIT_DELTA_MODIFIED: - if (!FLAG_SET(opts, GIT_DIFF_FIND_REWRITES) && - !FLAG_SET(opts, GIT_DIFF_FIND_RENAMES_FROM_REWRITES)) - return false; - - if (calc_self_similarity(diff, opts, delta_idx, cache) < 0) - return false; - - if (FLAG_SET(opts, GIT_DIFF_BREAK_REWRITES) && - delta->similarity < opts->break_rewrite_threshold) { - delta->flags |= GIT_DIFF_FLAG__TO_SPLIT; - break; - } - if (FLAG_SET(opts, GIT_DIFF_FIND_RENAMES_FROM_REWRITES) && - delta->similarity < opts->rename_from_rewrite_threshold) - break; - - return false; - - case GIT_DELTA_UNTRACKED: - if (!FLAG_SET(opts, GIT_DIFF_FIND_FOR_UNTRACKED)) - return false; - break; - - default: /* all other status values should be checked */ - break; - } - - delta->flags |= GIT_DIFF_FLAG__IS_RENAME_TARGET; - return true; -} - -static bool is_rename_source( - git_diff *diff, - const git_diff_find_options *opts, - size_t delta_idx, - void **cache) -{ - git_diff_delta *delta = GIT_VECTOR_GET(&diff->deltas, delta_idx); - - /* skip things that aren't blobs */ - if (!GIT_MODE_ISBLOB(delta->old_file.mode)) - return false; - - switch (delta->status) { - case GIT_DELTA_ADDED: - case GIT_DELTA_UNTRACKED: - case GIT_DELTA_UNREADABLE: - case GIT_DELTA_IGNORED: - case GIT_DELTA_CONFLICTED: - return false; - - case GIT_DELTA_DELETED: - case GIT_DELTA_TYPECHANGE: - break; - - case GIT_DELTA_UNMODIFIED: - if (!FLAG_SET(opts, GIT_DIFF_FIND_COPIES_FROM_UNMODIFIED)) - return false; - if (FLAG_SET(opts, GIT_DIFF_FIND_REMOVE_UNMODIFIED)) - delta->flags |= GIT_DIFF_FLAG__TO_DELETE; - break; - - default: /* MODIFIED, RENAMED, COPIED */ - /* if we're finding copies, this could be a source */ - if (FLAG_SET(opts, GIT_DIFF_FIND_COPIES)) - break; - - /* otherwise, this is only a source if we can split it */ - if (!FLAG_SET(opts, GIT_DIFF_FIND_REWRITES) && - !FLAG_SET(opts, GIT_DIFF_FIND_RENAMES_FROM_REWRITES)) - return false; - - if (calc_self_similarity(diff, opts, delta_idx, cache) < 0) - return false; - - if (FLAG_SET(opts, GIT_DIFF_BREAK_REWRITES) && - delta->similarity < opts->break_rewrite_threshold) { - delta->flags |= GIT_DIFF_FLAG__TO_SPLIT; - break; - } - - if (FLAG_SET(opts, GIT_DIFF_FIND_RENAMES_FROM_REWRITES) && - delta->similarity < opts->rename_from_rewrite_threshold) - break; - - return false; - } - - delta->flags |= GIT_DIFF_FLAG__IS_RENAME_SOURCE; - return true; -} - -GIT_INLINE(bool) delta_is_split(git_diff_delta *delta) -{ - return (delta->status == GIT_DELTA_TYPECHANGE || - (delta->flags & GIT_DIFF_FLAG__TO_SPLIT) != 0); -} - -GIT_INLINE(bool) delta_is_new_only(git_diff_delta *delta) -{ - return (delta->status == GIT_DELTA_ADDED || - delta->status == GIT_DELTA_UNTRACKED || - delta->status == GIT_DELTA_UNREADABLE || - delta->status == GIT_DELTA_IGNORED); -} - -GIT_INLINE(void) delta_make_rename( - git_diff_delta *to, const git_diff_delta *from, uint16_t similarity) -{ - to->status = GIT_DELTA_RENAMED; - to->similarity = similarity; - to->nfiles = 2; - memcpy(&to->old_file, &from->old_file, sizeof(to->old_file)); - to->flags &= ~GIT_DIFF_FLAG__TO_SPLIT; -} - -typedef struct { - size_t idx; - uint16_t similarity; -} diff_find_match; - -int git_diff_find_similar( - git_diff *diff, - const git_diff_find_options *given_opts) -{ - size_t s, t; - int error = 0, result; - uint16_t similarity; - git_diff_delta *src, *tgt; - git_diff_find_options opts = GIT_DIFF_FIND_OPTIONS_INIT; - size_t num_deltas, num_srcs = 0, num_tgts = 0; - size_t tried_srcs = 0, tried_tgts = 0; - size_t num_rewrites = 0, num_updates = 0, num_bumped = 0; - size_t sigcache_size; - void **sigcache = NULL; /* cache of similarity metric file signatures */ - diff_find_match *tgt2src = NULL; - diff_find_match *src2tgt = NULL; - diff_find_match *tgt2src_copy = NULL; - diff_find_match *best_match; - git_diff_file swap; - - if ((error = normalize_find_opts(diff, &opts, given_opts)) < 0) - return error; - - num_deltas = diff->deltas.length; - - /* TODO: maybe abort if deltas.length > rename_limit ??? */ - if (!git__is_uint32(num_deltas)) - goto cleanup; - - /* No flags set; nothing to do */ - if ((opts.flags & GIT_DIFF_FIND_ALL) == 0) - goto cleanup; - - GITERR_CHECK_ALLOC_MULTIPLY(&sigcache_size, num_deltas, 2); - sigcache = git__calloc(sigcache_size, sizeof(void *)); - GITERR_CHECK_ALLOC(sigcache); - - /* Label rename sources and targets - * - * This will also set self-similarity scores for MODIFIED files and - * mark them for splitting if break-rewrites is enabled - */ - git_vector_foreach(&diff->deltas, t, tgt) { - if (is_rename_source(diff, &opts, t, sigcache)) - ++num_srcs; - - if (is_rename_target(diff, &opts, t, sigcache)) - ++num_tgts; - - if ((tgt->flags & GIT_DIFF_FLAG__TO_SPLIT) != 0) - num_rewrites++; - } - - /* if there are no candidate srcs or tgts, we're done */ - if (!num_srcs || !num_tgts) - goto cleanup; - - src2tgt = git__calloc(num_deltas, sizeof(diff_find_match)); - GITERR_CHECK_ALLOC(src2tgt); - tgt2src = git__calloc(num_deltas, sizeof(diff_find_match)); - GITERR_CHECK_ALLOC(tgt2src); - - if (FLAG_SET(&opts, GIT_DIFF_FIND_COPIES)) { - tgt2src_copy = git__calloc(num_deltas, sizeof(diff_find_match)); - GITERR_CHECK_ALLOC(tgt2src_copy); - } - - /* - * Find best-fit matches for rename / copy candidates - */ - -find_best_matches: - tried_tgts = num_bumped = 0; - - git_vector_foreach(&diff->deltas, t, tgt) { - /* skip things that are not rename targets */ - if ((tgt->flags & GIT_DIFF_FLAG__IS_RENAME_TARGET) == 0) - continue; - - tried_srcs = 0; - - git_vector_foreach(&diff->deltas, s, src) { - /* skip things that are not rename sources */ - if ((src->flags & GIT_DIFF_FLAG__IS_RENAME_SOURCE) == 0) - continue; - - /* calculate similarity for this pair and find best match */ - if (s == t) - result = -1; /* don't measure self-similarity here */ - else if ((error = similarity_measure( - &result, diff, &opts, sigcache, 2 * s, 2 * t + 1)) < 0) - goto cleanup; - - if (result < 0) - continue; - similarity = (uint16_t)result; - - /* is this a better rename? */ - if (tgt2src[t].similarity < similarity && - src2tgt[s].similarity < similarity) - { - /* eject old mapping */ - if (src2tgt[s].similarity > 0) { - tgt2src[src2tgt[s].idx].similarity = 0; - num_bumped++; - } - if (tgt2src[t].similarity > 0) { - src2tgt[tgt2src[t].idx].similarity = 0; - num_bumped++; - } - - /* write new mapping */ - tgt2src[t].idx = s; - tgt2src[t].similarity = similarity; - src2tgt[s].idx = t; - src2tgt[s].similarity = similarity; - } - - /* keep best absolute match for copies */ - if (tgt2src_copy != NULL && - tgt2src_copy[t].similarity < similarity) - { - tgt2src_copy[t].idx = s; - tgt2src_copy[t].similarity = similarity; - } - - if (++tried_srcs >= num_srcs) - break; - - /* cap on maximum targets we'll examine (per "tgt" file) */ - if (tried_srcs > opts.rename_limit) - break; - } - - if (++tried_tgts >= num_tgts) - break; - } - - if (num_bumped > 0) /* try again if we bumped some items */ - goto find_best_matches; - - /* - * Rewrite the diffs with renames / copies - */ - - git_vector_foreach(&diff->deltas, t, tgt) { - /* skip things that are not rename targets */ - if ((tgt->flags & GIT_DIFF_FLAG__IS_RENAME_TARGET) == 0) - continue; - - /* check if this delta was the target of a similarity */ - if (tgt2src[t].similarity) - best_match = &tgt2src[t]; - else if (tgt2src_copy && tgt2src_copy[t].similarity) - best_match = &tgt2src_copy[t]; - else - continue; - - s = best_match->idx; - src = GIT_VECTOR_GET(&diff->deltas, s); - - /* possible scenarios: - * 1. from DELETE to ADD/UNTRACK/IGNORE = RENAME - * 2. from DELETE to SPLIT/TYPECHANGE = RENAME + DELETE - * 3. from SPLIT/TYPECHANGE to ADD/UNTRACK/IGNORE = ADD + RENAME - * 4. from SPLIT/TYPECHANGE to SPLIT/TYPECHANGE = RENAME + SPLIT - * 5. from OTHER to ADD/UNTRACK/IGNORE = OTHER + COPY - */ - - if (src->status == GIT_DELTA_DELETED) { - - if (delta_is_new_only(tgt)) { - - if (best_match->similarity < opts.rename_threshold) - continue; - - delta_make_rename(tgt, src, best_match->similarity); - - src->flags |= GIT_DIFF_FLAG__TO_DELETE; - num_rewrites++; - } else { - assert(delta_is_split(tgt)); - - if (best_match->similarity < opts.rename_from_rewrite_threshold) - continue; - - memcpy(&swap, &tgt->old_file, sizeof(swap)); - - delta_make_rename(tgt, src, best_match->similarity); - num_rewrites--; - - assert(src->status == GIT_DELTA_DELETED); - memcpy(&src->old_file, &swap, sizeof(src->old_file)); - memset(&src->new_file, 0, sizeof(src->new_file)); - src->new_file.path = src->old_file.path; - src->new_file.flags |= GIT_DIFF_FLAG_VALID_ID; - - num_updates++; - - if (src2tgt[t].similarity > 0 && src2tgt[t].idx > t) { - /* what used to be at src t is now at src s */ - tgt2src[src2tgt[t].idx].idx = s; - } - } - } - - else if (delta_is_split(src)) { - - if (delta_is_new_only(tgt)) { - - if (best_match->similarity < opts.rename_threshold) - continue; - - delta_make_rename(tgt, src, best_match->similarity); - - src->status = (diff->new_src == GIT_ITERATOR_TYPE_WORKDIR) ? - GIT_DELTA_UNTRACKED : GIT_DELTA_ADDED; - src->nfiles = 1; - memset(&src->old_file, 0, sizeof(src->old_file)); - src->old_file.path = src->new_file.path; - src->old_file.flags |= GIT_DIFF_FLAG_VALID_ID; - - src->flags &= ~GIT_DIFF_FLAG__TO_SPLIT; - num_rewrites--; - - num_updates++; - } else { - assert(delta_is_split(src)); - - if (best_match->similarity < opts.rename_from_rewrite_threshold) - continue; - - memcpy(&swap, &tgt->old_file, sizeof(swap)); - - delta_make_rename(tgt, src, best_match->similarity); - num_rewrites--; - num_updates++; - - memcpy(&src->old_file, &swap, sizeof(src->old_file)); - - /* if we've just swapped the new element into the correct - * place, clear the SPLIT flag - */ - if (tgt2src[s].idx == t && - tgt2src[s].similarity > - opts.rename_from_rewrite_threshold) { - src->status = GIT_DELTA_RENAMED; - src->similarity = tgt2src[s].similarity; - tgt2src[s].similarity = 0; - src->flags &= ~GIT_DIFF_FLAG__TO_SPLIT; - num_rewrites--; - } - /* otherwise, if we just overwrote a source, update mapping */ - else if (src2tgt[t].similarity > 0 && src2tgt[t].idx > t) { - /* what used to be at src t is now at src s */ - tgt2src[src2tgt[t].idx].idx = s; - } - - num_updates++; - } - } - - else if (FLAG_SET(&opts, GIT_DIFF_FIND_COPIES)) { - if (tgt2src_copy[t].similarity < opts.copy_threshold) - continue; - - /* always use best possible source for copy */ - best_match = &tgt2src_copy[t]; - src = GIT_VECTOR_GET(&diff->deltas, best_match->idx); - - if (delta_is_split(tgt)) { - error = insert_delete_side_of_split(diff, &diff->deltas, tgt); - if (error < 0) - goto cleanup; - num_rewrites--; - } - - if (!delta_is_split(tgt) && !delta_is_new_only(tgt)) - continue; - - tgt->status = GIT_DELTA_COPIED; - tgt->similarity = best_match->similarity; - tgt->nfiles = 2; - memcpy(&tgt->old_file, &src->old_file, sizeof(tgt->old_file)); - tgt->flags &= ~GIT_DIFF_FLAG__TO_SPLIT; - - num_updates++; - } - } - - /* - * Actually split and delete entries as needed - */ - - if (num_rewrites > 0 || num_updates > 0) - error = apply_splits_and_deletes( - diff, diff->deltas.length - num_rewrites, - FLAG_SET(&opts, GIT_DIFF_BREAK_REWRITES) && - !FLAG_SET(&opts, GIT_DIFF_BREAK_REWRITES_FOR_RENAMES_ONLY)); - -cleanup: - git__free(tgt2src); - git__free(src2tgt); - git__free(tgt2src_copy); - - if (sigcache) { - for (t = 0; t < num_deltas * 2; ++t) { - if (sigcache[t] != NULL) - opts.metric->free_signature(sigcache[t], opts.metric->payload); - } - git__free(sigcache); - } - - if (!given_opts || !given_opts->metric) - git__free(opts.metric); - - return error; -} - -#undef FLAG_SET diff --git a/vendor/libgit2/src/diff_xdiff.c b/vendor/libgit2/src/diff_xdiff.c deleted file mode 100644 index 1057df3aa..000000000 --- a/vendor/libgit2/src/diff_xdiff.c +++ /dev/null @@ -1,248 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#include "git2/errors.h" -#include "common.h" -#include "diff.h" -#include "diff_driver.h" -#include "diff_patch.h" -#include "diff_xdiff.h" - -static int git_xdiff_scan_int(const char **str, int *value) -{ - const char *scan = *str; - int v = 0, digits = 0; - /* find next digit */ - for (scan = *str; *scan && !git__isdigit(*scan); scan++); - /* parse next number */ - for (; git__isdigit(*scan); scan++, digits++) - v = (v * 10) + (*scan - '0'); - *str = scan; - *value = v; - return (digits > 0) ? 0 : -1; -} - -static int git_xdiff_parse_hunk(git_diff_hunk *hunk, const char *header) -{ - /* expect something of the form "@@ -%d[,%d] +%d[,%d] @@" */ - if (*header != '@') - goto fail; - if (git_xdiff_scan_int(&header, &hunk->old_start) < 0) - goto fail; - if (*header == ',') { - if (git_xdiff_scan_int(&header, &hunk->old_lines) < 0) - goto fail; - } else - hunk->old_lines = 1; - if (git_xdiff_scan_int(&header, &hunk->new_start) < 0) - goto fail; - if (*header == ',') { - if (git_xdiff_scan_int(&header, &hunk->new_lines) < 0) - goto fail; - } else - hunk->new_lines = 1; - if (hunk->old_start < 0 || hunk->new_start < 0) - goto fail; - - return 0; - -fail: - giterr_set(GITERR_INVALID, "Malformed hunk header from xdiff"); - return -1; -} - -typedef struct { - git_xdiff_output *xo; - git_patch *patch; - git_diff_hunk hunk; - int old_lineno, new_lineno; - mmfile_t xd_old_data, xd_new_data; -} git_xdiff_info; - -static int diff_update_lines( - git_xdiff_info *info, - git_diff_line *line, - const char *content, - size_t content_len) -{ - const char *scan = content, *scan_end = content + content_len; - - for (line->num_lines = 0; scan < scan_end; ++scan) - if (*scan == '\n') - ++line->num_lines; - - line->content = content; - line->content_len = content_len; - - /* expect " "/"-"/"+", then data */ - switch (line->origin) { - case GIT_DIFF_LINE_ADDITION: - case GIT_DIFF_LINE_DEL_EOFNL: - line->old_lineno = -1; - line->new_lineno = info->new_lineno; - info->new_lineno += (int)line->num_lines; - break; - case GIT_DIFF_LINE_DELETION: - case GIT_DIFF_LINE_ADD_EOFNL: - line->old_lineno = info->old_lineno; - line->new_lineno = -1; - info->old_lineno += (int)line->num_lines; - break; - case GIT_DIFF_LINE_CONTEXT: - case GIT_DIFF_LINE_CONTEXT_EOFNL: - line->old_lineno = info->old_lineno; - line->new_lineno = info->new_lineno; - info->old_lineno += (int)line->num_lines; - info->new_lineno += (int)line->num_lines; - break; - default: - giterr_set(GITERR_INVALID, "Unknown diff line origin %02x", - (unsigned int)line->origin); - return -1; - } - - return 0; -} - -static int git_xdiff_cb(void *priv, mmbuffer_t *bufs, int len) -{ - git_xdiff_info *info = priv; - git_patch *patch = info->patch; - const git_diff_delta *delta = git_patch_get_delta(patch); - git_diff_output *output = &info->xo->output; - git_diff_line line; - - if (len == 1) { - output->error = git_xdiff_parse_hunk(&info->hunk, bufs[0].ptr); - if (output->error < 0) - return output->error; - - info->hunk.header_len = bufs[0].size; - if (info->hunk.header_len >= sizeof(info->hunk.header)) - info->hunk.header_len = sizeof(info->hunk.header) - 1; - memcpy(info->hunk.header, bufs[0].ptr, info->hunk.header_len); - info->hunk.header[info->hunk.header_len] = '\0'; - - if (output->hunk_cb != NULL && - (output->error = output->hunk_cb( - delta, &info->hunk, output->payload))) - return output->error; - - info->old_lineno = info->hunk.old_start; - info->new_lineno = info->hunk.new_start; - } - - if (len == 2 || len == 3) { - /* expect " "/"-"/"+", then data */ - line.origin = - (*bufs[0].ptr == '+') ? GIT_DIFF_LINE_ADDITION : - (*bufs[0].ptr == '-') ? GIT_DIFF_LINE_DELETION : - GIT_DIFF_LINE_CONTEXT; - - if (line.origin == GIT_DIFF_LINE_ADDITION) - line.content_offset = bufs[1].ptr - info->xd_new_data.ptr; - else if (line.origin == GIT_DIFF_LINE_DELETION) - line.content_offset = bufs[1].ptr - info->xd_old_data.ptr; - else - line.content_offset = -1; - - output->error = diff_update_lines( - info, &line, bufs[1].ptr, bufs[1].size); - - if (!output->error && output->data_cb != NULL) - output->error = output->data_cb( - delta, &info->hunk, &line, output->payload); - } - - if (len == 3 && !output->error) { - /* If we have a '+' and a third buf, then we have added a line - * without a newline and the old code had one, so DEL_EOFNL. - * If we have a '-' and a third buf, then we have removed a line - * with out a newline but added a blank line, so ADD_EOFNL. - */ - line.origin = - (*bufs[0].ptr == '+') ? GIT_DIFF_LINE_DEL_EOFNL : - (*bufs[0].ptr == '-') ? GIT_DIFF_LINE_ADD_EOFNL : - GIT_DIFF_LINE_CONTEXT_EOFNL; - - line.content_offset = -1; - - output->error = diff_update_lines( - info, &line, bufs[2].ptr, bufs[2].size); - - if (!output->error && output->data_cb != NULL) - output->error = output->data_cb( - delta, &info->hunk, &line, output->payload); - } - - return output->error; -} - -static int git_xdiff(git_diff_output *output, git_patch *patch) -{ - git_xdiff_output *xo = (git_xdiff_output *)output; - git_xdiff_info info; - git_diff_find_context_payload findctxt; - - memset(&info, 0, sizeof(info)); - info.patch = patch; - info.xo = xo; - - xo->callback.priv = &info; - - git_diff_find_context_init( - &xo->config.find_func, &findctxt, git_patch__driver(patch)); - xo->config.find_func_priv = &findctxt; - - if (xo->config.find_func != NULL) - xo->config.flags |= XDL_EMIT_FUNCNAMES; - else - xo->config.flags &= ~XDL_EMIT_FUNCNAMES; - - /* TODO: check ofile.opts_flags to see if driver-specific per-file - * updates are needed to xo->params.flags - */ - - git_patch__old_data(&info.xd_old_data.ptr, &info.xd_old_data.size, patch); - git_patch__new_data(&info.xd_new_data.ptr, &info.xd_new_data.size, patch); - - if (info.xd_old_data.size > GIT_XDIFF_MAX_SIZE || - info.xd_new_data.size > GIT_XDIFF_MAX_SIZE) { - giterr_set(GITERR_INVALID, "files too large for diff"); - return -1; - } - - xdl_diff(&info.xd_old_data, &info.xd_new_data, - &xo->params, &xo->config, &xo->callback); - - git_diff_find_context_clear(&findctxt); - - return xo->output.error; -} - -void git_xdiff_init(git_xdiff_output *xo, const git_diff_options *opts) -{ - uint32_t flags = opts ? opts->flags : 0; - - xo->output.diff_cb = git_xdiff; - - xo->config.ctxlen = opts ? opts->context_lines : 3; - xo->config.interhunkctxlen = opts ? opts->interhunk_lines : 0; - - if (flags & GIT_DIFF_IGNORE_WHITESPACE) - xo->params.flags |= XDF_WHITESPACE_FLAGS; - if (flags & GIT_DIFF_IGNORE_WHITESPACE_CHANGE) - xo->params.flags |= XDF_IGNORE_WHITESPACE_CHANGE; - if (flags & GIT_DIFF_IGNORE_WHITESPACE_EOL) - xo->params.flags |= XDF_IGNORE_WHITESPACE_AT_EOL; - - if (flags & GIT_DIFF_PATIENCE) - xo->params.flags |= XDF_PATIENCE_DIFF; - if (flags & GIT_DIFF_MINIMAL) - xo->params.flags |= XDF_NEED_MINIMAL; - - xo->callback.outf = git_xdiff_cb; -} diff --git a/vendor/libgit2/src/diff_xdiff.h b/vendor/libgit2/src/diff_xdiff.h deleted file mode 100644 index 98e11b2cb..000000000 --- a/vendor/libgit2/src/diff_xdiff.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_diff_xdiff_h__ -#define INCLUDE_diff_xdiff_h__ - -#include "diff.h" -#include "diff_patch.h" -#include "xdiff/xdiff.h" - -/* xdiff cannot cope with large files. these files should not be passed to - * xdiff. callers should treat these large files as binary. - */ -#define GIT_XDIFF_MAX_SIZE (1024LL * 1024 * 1023) - -/* A git_xdiff_output is a git_diff_output with extra fields necessary - * to use libxdiff. Calling git_xdiff_init() will set the diff_cb field - * of the output to use xdiff to generate the diffs. - */ -typedef struct { - git_diff_output output; - - xdemitconf_t config; - xpparam_t params; - xdemitcb_t callback; -} git_xdiff_output; - -void git_xdiff_init(git_xdiff_output *xo, const git_diff_options *opts); - -#endif diff --git a/vendor/libgit2/src/errors.c b/vendor/libgit2/src/errors.c deleted file mode 100644 index 91acc3541..000000000 --- a/vendor/libgit2/src/errors.c +++ /dev/null @@ -1,211 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#include "common.h" -#include "global.h" -#include "posix.h" -#include "buffer.h" - -/******************************************** - * New error handling - ********************************************/ - -static git_error g_git_oom_error = { - "Out of memory", - GITERR_NOMEMORY -}; - -static void set_error_from_buffer(int error_class) -{ - git_error *error = &GIT_GLOBAL->error_t; - git_buf *buf = &GIT_GLOBAL->error_buf; - - error->message = buf->ptr; - error->klass = error_class; - - GIT_GLOBAL->last_error = error; -} - -static void set_error(int error_class, char *string) -{ - git_buf *buf = &GIT_GLOBAL->error_buf; - - git_buf_clear(buf); - if (string) { - git_buf_puts(buf, string); - git__free(string); - } - - set_error_from_buffer(error_class); -} - -void giterr_set_oom(void) -{ - GIT_GLOBAL->last_error = &g_git_oom_error; -} - -void giterr_set(int error_class, const char *string, ...) -{ - va_list arglist; -#ifdef GIT_WIN32 - DWORD win32_error_code = (error_class == GITERR_OS) ? GetLastError() : 0; -#endif - int error_code = (error_class == GITERR_OS) ? errno : 0; - git_buf *buf = &GIT_GLOBAL->error_buf; - - git_buf_clear(buf); - if (string) { - va_start(arglist, string); - git_buf_vprintf(buf, string, arglist); - va_end(arglist); - - if (error_class == GITERR_OS) - git_buf_PUTS(buf, ": "); - } - - if (error_class == GITERR_OS) { -#ifdef GIT_WIN32 - char * win32_error = git_win32_get_error_message(win32_error_code); - if (win32_error) { - git_buf_puts(buf, win32_error); - git__free(win32_error); - - SetLastError(0); - } - else -#endif - if (error_code) - git_buf_puts(buf, strerror(error_code)); - - if (error_code) - errno = 0; - } - - if (!git_buf_oom(buf)) - set_error_from_buffer(error_class); -} - -void giterr_set_str(int error_class, const char *string) -{ - git_buf *buf = &GIT_GLOBAL->error_buf; - - assert(string); - - if (!string) - return; - - git_buf_clear(buf); - git_buf_puts(buf, string); - if (!git_buf_oom(buf)) - set_error_from_buffer(error_class); -} - -int giterr_set_regex(const regex_t *regex, int error_code) -{ - char error_buf[1024]; - - assert(error_code); - - regerror(error_code, regex, error_buf, sizeof(error_buf)); - giterr_set_str(GITERR_REGEX, error_buf); - - if (error_code == REG_NOMATCH) - return GIT_ENOTFOUND; - - return GIT_EINVALIDSPEC; -} - -void giterr_clear(void) -{ - if (GIT_GLOBAL->last_error != NULL) { - set_error(0, NULL); - GIT_GLOBAL->last_error = NULL; - } - - errno = 0; -#ifdef GIT_WIN32 - SetLastError(0); -#endif -} - -const git_error *giterr_last(void) -{ - return GIT_GLOBAL->last_error; -} - -int giterr_state_capture(git_error_state *state, int error_code) -{ - git_error *error = GIT_GLOBAL->last_error; - git_buf *error_buf = &GIT_GLOBAL->error_buf; - - memset(state, 0, sizeof(git_error_state)); - - if (!error_code) - return 0; - - state->error_code = error_code; - state->oom = (error == &g_git_oom_error); - - if (error) { - state->error_msg.klass = error->klass; - - if (state->oom) - state->error_msg.message = g_git_oom_error.message; - else - state->error_msg.message = git_buf_detach(error_buf); - } - - giterr_clear(); - return error_code; -} - -int giterr_state_restore(git_error_state *state) -{ - int ret = 0; - - giterr_clear(); - - if (state && state->error_msg.message) { - if (state->oom) - giterr_set_oom(); - else - set_error(state->error_msg.klass, state->error_msg.message); - - ret = state->error_code; - memset(state, 0, sizeof(git_error_state)); - } - - return ret; -} - -void giterr_state_free(git_error_state *state) -{ - if (!state) - return; - - if (!state->oom) - git__free(state->error_msg.message); - - memset(state, 0, sizeof(git_error_state)); -} - -int giterr_system_last(void) -{ -#ifdef GIT_WIN32 - return GetLastError(); -#else - return errno; -#endif -} - -void giterr_system_set(int code) -{ -#ifdef GIT_WIN32 - SetLastError(code); -#else - errno = code; -#endif -} diff --git a/vendor/libgit2/src/fetch.c b/vendor/libgit2/src/fetch.c deleted file mode 100644 index 4d895752c..000000000 --- a/vendor/libgit2/src/fetch.c +++ /dev/null @@ -1,156 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "git2/oid.h" -#include "git2/refs.h" -#include "git2/revwalk.h" -#include "git2/transport.h" - -#include "common.h" -#include "remote.h" -#include "refspec.h" -#include "pack.h" -#include "fetch.h" -#include "netops.h" -#include "repository.h" -#include "refs.h" - -static int maybe_want(git_remote *remote, git_remote_head *head, git_odb *odb, git_refspec *tagspec, git_remote_autotag_option_t tagopt) -{ - int match = 0; - - if (!git_reference_is_valid_name(head->name)) - return 0; - - if (tagopt == GIT_REMOTE_DOWNLOAD_TAGS_ALL) { - /* - * If tagopt is --tags, always request tags - * in addition to the remote's refspecs - */ - if (git_refspec_src_matches(tagspec, head->name)) - match = 1; - } - - if (!match && git_remote__matching_refspec(remote, head->name)) - match = 1; - - if (!match) - return 0; - - /* If we have the object, mark it so we don't ask for it */ - if (git_odb_exists(odb, &head->oid)) { - head->local = 1; - } - else - remote->need_pack = 1; - - return git_vector_insert(&remote->refs, head); -} - -static int filter_wants(git_remote *remote, const git_fetch_options *opts) -{ - git_remote_head **heads; - git_refspec tagspec, head; - int error = 0; - git_odb *odb; - size_t i, heads_len; - git_remote_autotag_option_t tagopt = remote->download_tags; - - if (opts && opts->download_tags != GIT_REMOTE_DOWNLOAD_TAGS_UNSPECIFIED) - tagopt = opts->download_tags; - - git_vector_clear(&remote->refs); - if ((error = git_refspec__parse(&tagspec, GIT_REFSPEC_TAGS, true)) < 0) - return error; - - /* - * The fetch refspec can be NULL, and what this means is that the - * user didn't specify one. This is fine, as it means that we're - * not interested in any particular branch but just the remote's - * HEAD, which will be stored in FETCH_HEAD after the fetch. - */ - if (remote->active_refspecs.length == 0) { - if ((error = git_refspec__parse(&head, "HEAD", true)) < 0) - goto cleanup; - - error = git_refspec__dwim_one(&remote->active_refspecs, &head, &remote->refs); - git_refspec__free(&head); - - if (error < 0) - goto cleanup; - } - - if (git_repository_odb__weakptr(&odb, remote->repo) < 0) - goto cleanup; - - if (git_remote_ls((const git_remote_head ***)&heads, &heads_len, remote) < 0) - goto cleanup; - - for (i = 0; i < heads_len; i++) { - if ((error = maybe_want(remote, heads[i], odb, &tagspec, tagopt)) < 0) - break; - } - -cleanup: - git_refspec__free(&tagspec); - - return error; -} - -/* - * In this first version, we push all our refs in and start sending - * them out. When we get an ACK we hide that commit and continue - * traversing until we're done - */ -int git_fetch_negotiate(git_remote *remote, const git_fetch_options *opts) -{ - git_transport *t = remote->transport; - - remote->need_pack = 0; - - if (filter_wants(remote, opts) < 0) { - giterr_set(GITERR_NET, "Failed to filter the reference list for wants"); - return -1; - } - - /* Don't try to negotiate when we don't want anything */ - if (!remote->need_pack) - return 0; - - /* - * Now we have everything set up so we can start tell the - * server what we want and what we have. - */ - return t->negotiate_fetch(t, - remote->repo, - (const git_remote_head * const *)remote->refs.contents, - remote->refs.length); -} - -int git_fetch_download_pack(git_remote *remote, const git_remote_callbacks *callbacks) -{ - git_transport *t = remote->transport; - git_transfer_progress_cb progress = NULL; - void *payload = NULL; - - if (!remote->need_pack) - return 0; - - if (callbacks) { - progress = callbacks->transfer_progress; - payload = callbacks->payload; - } - - return t->download_pack(t, remote->repo, &remote->stats, progress, payload); -} - -int git_fetch_init_options(git_fetch_options *opts, unsigned int version) -{ - GIT_INIT_STRUCTURE_FROM_TEMPLATE( - opts, version, git_fetch_options, GIT_FETCH_OPTIONS_INIT); - return 0; -} diff --git a/vendor/libgit2/src/fetch.h b/vendor/libgit2/src/fetch.h deleted file mode 100644 index 0412d4e44..000000000 --- a/vendor/libgit2/src/fetch.h +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_fetch_h__ -#define INCLUDE_fetch_h__ - -#include "netops.h" - -int git_fetch_negotiate(git_remote *remote, const git_fetch_options *opts); - -int git_fetch_download_pack(git_remote *remote, const git_remote_callbacks *callbacks); - -int git_fetch_setup_walk(git_revwalk **out, git_repository *repo); - -#endif diff --git a/vendor/libgit2/src/fetchhead.c b/vendor/libgit2/src/fetchhead.c deleted file mode 100644 index a95ea4ca4..000000000 --- a/vendor/libgit2/src/fetchhead.c +++ /dev/null @@ -1,302 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "git2/types.h" -#include "git2/oid.h" - -#include "fetchhead.h" -#include "common.h" -#include "buffer.h" -#include "fileops.h" -#include "filebuf.h" -#include "refs.h" -#include "repository.h" - -int git_fetchhead_ref_cmp(const void *a, const void *b) -{ - const git_fetchhead_ref *one = (const git_fetchhead_ref *)a; - const git_fetchhead_ref *two = (const git_fetchhead_ref *)b; - - if (one->is_merge && !two->is_merge) - return -1; - if (two->is_merge && !one->is_merge) - return 1; - - if (one->ref_name && two->ref_name) - return strcmp(one->ref_name, two->ref_name); - else if (one->ref_name) - return -1; - else if (two->ref_name) - return 1; - - return 0; -} - -int git_fetchhead_ref_create( - git_fetchhead_ref **out, - git_oid *oid, - unsigned int is_merge, - const char *ref_name, - const char *remote_url) -{ - git_fetchhead_ref *fetchhead_ref; - - assert(out && oid); - - *out = NULL; - - fetchhead_ref = git__malloc(sizeof(git_fetchhead_ref)); - GITERR_CHECK_ALLOC(fetchhead_ref); - - memset(fetchhead_ref, 0x0, sizeof(git_fetchhead_ref)); - - git_oid_cpy(&fetchhead_ref->oid, oid); - fetchhead_ref->is_merge = is_merge; - - if (ref_name) - fetchhead_ref->ref_name = git__strdup(ref_name); - - if (remote_url) - fetchhead_ref->remote_url = git__strdup(remote_url); - - *out = fetchhead_ref; - - return 0; -} - -static int fetchhead_ref_write( - git_filebuf *file, - git_fetchhead_ref *fetchhead_ref) -{ - char oid[GIT_OID_HEXSZ + 1]; - const char *type, *name; - int head = 0; - - assert(file && fetchhead_ref); - - git_oid_fmt(oid, &fetchhead_ref->oid); - oid[GIT_OID_HEXSZ] = '\0'; - - if (git__prefixcmp(fetchhead_ref->ref_name, GIT_REFS_HEADS_DIR) == 0) { - type = "branch "; - name = fetchhead_ref->ref_name + strlen(GIT_REFS_HEADS_DIR); - } else if(git__prefixcmp(fetchhead_ref->ref_name, - GIT_REFS_TAGS_DIR) == 0) { - type = "tag "; - name = fetchhead_ref->ref_name + strlen(GIT_REFS_TAGS_DIR); - } else if (!git__strcmp(fetchhead_ref->ref_name, GIT_HEAD_FILE)) { - head = 1; - } else { - type = ""; - name = fetchhead_ref->ref_name; - } - - if (head) - return git_filebuf_printf(file, "%s\t\t%s\n", oid, fetchhead_ref->remote_url); - - return git_filebuf_printf(file, "%s\t%s\t%s'%s' of %s\n", - oid, - (fetchhead_ref->is_merge) ? "" : "not-for-merge", - type, - name, - fetchhead_ref->remote_url); -} - -int git_fetchhead_write(git_repository *repo, git_vector *fetchhead_refs) -{ - git_filebuf file = GIT_FILEBUF_INIT; - git_buf path = GIT_BUF_INIT; - unsigned int i; - git_fetchhead_ref *fetchhead_ref; - - assert(repo && fetchhead_refs); - - if (git_buf_joinpath(&path, repo->path_repository, GIT_FETCH_HEAD_FILE) < 0) - return -1; - - if (git_filebuf_open(&file, path.ptr, GIT_FILEBUF_FORCE, GIT_REFS_FILE_MODE) < 0) { - git_buf_free(&path); - return -1; - } - - git_buf_free(&path); - - git_vector_sort(fetchhead_refs); - - git_vector_foreach(fetchhead_refs, i, fetchhead_ref) - fetchhead_ref_write(&file, fetchhead_ref); - - return git_filebuf_commit(&file); -} - -static int fetchhead_ref_parse( - git_oid *oid, - unsigned int *is_merge, - git_buf *ref_name, - const char **remote_url, - char *line, - size_t line_num) -{ - char *oid_str, *is_merge_str, *desc, *name = NULL; - const char *type = NULL; - int error = 0; - - *remote_url = NULL; - - if (!*line) { - giterr_set(GITERR_FETCHHEAD, - "Empty line in FETCH_HEAD line %d", line_num); - return -1; - } - - /* Compat with old git clients that wrote FETCH_HEAD like a loose ref. */ - if ((oid_str = git__strsep(&line, "\t")) == NULL) { - oid_str = line; - line += strlen(line); - - *is_merge = 1; - } - - if (strlen(oid_str) != GIT_OID_HEXSZ) { - giterr_set(GITERR_FETCHHEAD, - "Invalid object ID in FETCH_HEAD line %d", line_num); - return -1; - } - - if (git_oid_fromstr(oid, oid_str) < 0) { - const git_error *oid_err = giterr_last(); - const char *err_msg = oid_err ? oid_err->message : "Invalid object ID"; - - giterr_set(GITERR_FETCHHEAD, "%s in FETCH_HEAD line %d", - err_msg, line_num); - return -1; - } - - /* Parse new data from newer git clients */ - if (*line) { - if ((is_merge_str = git__strsep(&line, "\t")) == NULL) { - giterr_set(GITERR_FETCHHEAD, - "Invalid description data in FETCH_HEAD line %d", line_num); - return -1; - } - - if (*is_merge_str == '\0') - *is_merge = 1; - else if (strcmp(is_merge_str, "not-for-merge") == 0) - *is_merge = 0; - else { - giterr_set(GITERR_FETCHHEAD, - "Invalid for-merge entry in FETCH_HEAD line %d", line_num); - return -1; - } - - if ((desc = line) == NULL) { - giterr_set(GITERR_FETCHHEAD, - "Invalid description in FETCH_HEAD line %d", line_num); - return -1; - } - - if (git__prefixcmp(desc, "branch '") == 0) { - type = GIT_REFS_HEADS_DIR; - name = desc + 8; - } else if (git__prefixcmp(desc, "tag '") == 0) { - type = GIT_REFS_TAGS_DIR; - name = desc + 5; - } else if (git__prefixcmp(desc, "'") == 0) - name = desc + 1; - - if (name) { - if ((desc = strstr(name, "' ")) == NULL || - git__prefixcmp(desc, "' of ") != 0) { - giterr_set(GITERR_FETCHHEAD, - "Invalid description in FETCH_HEAD line %d", line_num); - return -1; - } - - *desc = '\0'; - desc += 5; - } - - *remote_url = desc; - } - - git_buf_clear(ref_name); - - if (type) - git_buf_join(ref_name, '/', type, name); - else if(name) - git_buf_puts(ref_name, name); - - return error; -} - -int git_repository_fetchhead_foreach(git_repository *repo, - git_repository_fetchhead_foreach_cb cb, - void *payload) -{ - git_buf path = GIT_BUF_INIT, file = GIT_BUF_INIT, name = GIT_BUF_INIT; - const char *ref_name; - git_oid oid; - const char *remote_url; - unsigned int is_merge = 0; - char *buffer, *line; - size_t line_num = 0; - int error = 0; - - assert(repo && cb); - - if (git_buf_joinpath(&path, repo->path_repository, GIT_FETCH_HEAD_FILE) < 0) - return -1; - - if ((error = git_futils_readbuffer(&file, git_buf_cstr(&path))) < 0) - goto done; - - buffer = file.ptr; - - while ((line = git__strsep(&buffer, "\n")) != NULL) { - ++line_num; - - if ((error = fetchhead_ref_parse( - &oid, &is_merge, &name, &remote_url, line, line_num)) < 0) - goto done; - - if (git_buf_len(&name) > 0) - ref_name = git_buf_cstr(&name); - else - ref_name = NULL; - - error = cb(ref_name, remote_url, &oid, is_merge, payload); - if (error) { - giterr_set_after_callback(error); - goto done; - } - } - - if (*buffer) { - giterr_set(GITERR_FETCHHEAD, "No EOL at line %d", line_num+1); - error = -1; - goto done; - } - -done: - git_buf_free(&file); - git_buf_free(&path); - git_buf_free(&name); - - return error; -} - -void git_fetchhead_ref_free(git_fetchhead_ref *fetchhead_ref) -{ - if (fetchhead_ref == NULL) - return; - - git__free(fetchhead_ref->remote_url); - git__free(fetchhead_ref->ref_name); - git__free(fetchhead_ref); -} - diff --git a/vendor/libgit2/src/fetchhead.h b/vendor/libgit2/src/fetchhead.h deleted file mode 100644 index b03bd0f74..000000000 --- a/vendor/libgit2/src/fetchhead.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_fetchhead_h__ -#define INCLUDE_fetchhead_h__ - -#include "vector.h" - -typedef struct git_fetchhead_ref { - git_oid oid; - unsigned int is_merge; - char *ref_name; - char *remote_url; -} git_fetchhead_ref; - -int git_fetchhead_ref_create( - git_fetchhead_ref **fetchhead_ref_out, - git_oid *oid, - unsigned int is_merge, - const char *ref_name, - const char *remote_url); - -int git_fetchhead_ref_cmp(const void *a, const void *b); - -int git_fetchhead_write(git_repository *repo, git_vector *fetchhead_refs); - -void git_fetchhead_ref_free(git_fetchhead_ref *fetchhead_ref); - -#endif diff --git a/vendor/libgit2/src/filebuf.c b/vendor/libgit2/src/filebuf.c deleted file mode 100644 index 101d5082a..000000000 --- a/vendor/libgit2/src/filebuf.c +++ /dev/null @@ -1,580 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#include "common.h" -#include "filebuf.h" -#include "fileops.h" - -static const size_t WRITE_BUFFER_SIZE = (4096 * 2); - -enum buferr_t { - BUFERR_OK = 0, - BUFERR_WRITE, - BUFERR_ZLIB, - BUFERR_MEM -}; - -#define ENSURE_BUF_OK(buf) if ((buf)->last_error != BUFERR_OK) { return -1; } - -static int verify_last_error(git_filebuf *file) -{ - switch (file->last_error) { - case BUFERR_WRITE: - giterr_set(GITERR_OS, "Failed to write out file"); - return -1; - - case BUFERR_MEM: - giterr_set_oom(); - return -1; - - case BUFERR_ZLIB: - giterr_set(GITERR_ZLIB, - "Buffer error when writing out ZLib data"); - return -1; - - default: - return 0; - } -} - -static int lock_file(git_filebuf *file, int flags, mode_t mode) -{ - if (git_path_exists(file->path_lock) == true) { - if (flags & GIT_FILEBUF_FORCE) - p_unlink(file->path_lock); - else { - giterr_clear(); /* actual OS error code just confuses */ - giterr_set(GITERR_OS, - "Failed to lock file '%s' for writing", file->path_lock); - return GIT_ELOCKED; - } - } - - /* create path to the file buffer is required */ - if (flags & GIT_FILEBUF_FORCE) { - /* XXX: Should dirmode here be configurable? Or is 0777 always fine? */ - file->fd = git_futils_creat_locked_withpath(file->path_lock, 0777, mode); - } else { - file->fd = git_futils_creat_locked(file->path_lock, mode); - } - - if (file->fd < 0) - return file->fd; - - file->fd_is_open = true; - - if ((flags & GIT_FILEBUF_APPEND) && git_path_exists(file->path_original) == true) { - git_file source; - char buffer[FILEIO_BUFSIZE]; - ssize_t read_bytes; - int error; - - source = p_open(file->path_original, O_RDONLY); - if (source < 0) { - giterr_set(GITERR_OS, - "Failed to open file '%s' for reading", - file->path_original); - return -1; - } - - while ((read_bytes = p_read(source, buffer, sizeof(buffer))) > 0) { - if ((error = p_write(file->fd, buffer, read_bytes)) < 0) - break; - if (file->compute_digest) - git_hash_update(&file->digest, buffer, read_bytes); - } - - p_close(source); - - if (read_bytes < 0) { - giterr_set(GITERR_OS, "Failed to read file '%s'", file->path_original); - return -1; - } else if (error < 0) { - giterr_set(GITERR_OS, "Failed to write file '%s'", file->path_lock); - return -1; - } - } - - return 0; -} - -void git_filebuf_cleanup(git_filebuf *file) -{ - if (file->fd_is_open && file->fd >= 0) - p_close(file->fd); - - if (file->created_lock && !file->did_rename && file->path_lock && git_path_exists(file->path_lock)) - p_unlink(file->path_lock); - - if (file->compute_digest) { - git_hash_ctx_cleanup(&file->digest); - file->compute_digest = 0; - } - - if (file->buffer) - git__free(file->buffer); - - /* use the presence of z_buf to decide if we need to deflateEnd */ - if (file->z_buf) { - git__free(file->z_buf); - deflateEnd(&file->zs); - } - - if (file->path_original) - git__free(file->path_original); - if (file->path_lock) - git__free(file->path_lock); - - memset(file, 0x0, sizeof(git_filebuf)); - file->fd = -1; -} - -GIT_INLINE(int) flush_buffer(git_filebuf *file) -{ - int result = file->write(file, file->buffer, file->buf_pos); - file->buf_pos = 0; - return result; -} - -int git_filebuf_flush(git_filebuf *file) -{ - return flush_buffer(file); -} - -static int write_normal(git_filebuf *file, void *source, size_t len) -{ - if (len > 0) { - if (p_write(file->fd, (void *)source, len) < 0) { - file->last_error = BUFERR_WRITE; - return -1; - } - - if (file->compute_digest) - git_hash_update(&file->digest, source, len); - } - - return 0; -} - -static int write_deflate(git_filebuf *file, void *source, size_t len) -{ - z_stream *zs = &file->zs; - - if (len > 0 || file->flush_mode == Z_FINISH) { - zs->next_in = source; - zs->avail_in = (uInt)len; - - do { - size_t have; - - zs->next_out = file->z_buf; - zs->avail_out = (uInt)file->buf_size; - - if (deflate(zs, file->flush_mode) == Z_STREAM_ERROR) { - file->last_error = BUFERR_ZLIB; - return -1; - } - - have = file->buf_size - (size_t)zs->avail_out; - - if (p_write(file->fd, file->z_buf, have) < 0) { - file->last_error = BUFERR_WRITE; - return -1; - } - - } while (zs->avail_out == 0); - - assert(zs->avail_in == 0); - - if (file->compute_digest) - git_hash_update(&file->digest, source, len); - } - - return 0; -} - -#define MAX_SYMLINK_DEPTH 5 - -static int resolve_symlink(git_buf *out, const char *path) -{ - int i, error, root; - ssize_t ret; - struct stat st; - git_buf curpath = GIT_BUF_INIT, target = GIT_BUF_INIT; - - if ((error = git_buf_grow(&target, GIT_PATH_MAX + 1)) < 0 || - (error = git_buf_puts(&curpath, path)) < 0) - return error; - - for (i = 0; i < MAX_SYMLINK_DEPTH; i++) { - error = p_lstat(curpath.ptr, &st); - if (error < 0 && errno == ENOENT) { - error = git_buf_puts(out, curpath.ptr); - goto cleanup; - } - - if (error < 0) { - giterr_set(GITERR_OS, "failed to stat '%s'", curpath.ptr); - error = -1; - goto cleanup; - } - - if (!S_ISLNK(st.st_mode)) { - error = git_buf_puts(out, curpath.ptr); - goto cleanup; - } - - ret = p_readlink(curpath.ptr, target.ptr, GIT_PATH_MAX); - if (ret < 0) { - giterr_set(GITERR_OS, "failed to read symlink '%s'", curpath.ptr); - error = -1; - goto cleanup; - } - - if (ret == GIT_PATH_MAX) { - giterr_set(GITERR_INVALID, "symlink target too long"); - error = -1; - goto cleanup; - } - - /* readlink(2) won't NUL-terminate for us */ - target.ptr[ret] = '\0'; - target.size = ret; - - root = git_path_root(target.ptr); - if (root >= 0) { - if ((error = git_buf_puts(&curpath, target.ptr)) < 0) - goto cleanup; - } else { - git_buf dir = GIT_BUF_INIT; - - if ((error = git_path_dirname_r(&dir, curpath.ptr)) < 0) - goto cleanup; - - git_buf_swap(&curpath, &dir); - git_buf_free(&dir); - - if ((error = git_path_apply_relative(&curpath, target.ptr)) < 0) - goto cleanup; - } - } - - giterr_set(GITERR_INVALID, "maximum symlink depth reached"); - error = -1; - -cleanup: - git_buf_free(&curpath); - git_buf_free(&target); - return error; -} - -int git_filebuf_open(git_filebuf *file, const char *path, int flags, mode_t mode) -{ - int compression, error = -1; - size_t path_len, alloc_len; - - /* opening an already open buffer is a programming error; - * assert that this never happens instead of returning - * an error code */ - assert(file && path && file->buffer == NULL); - - memset(file, 0x0, sizeof(git_filebuf)); - - if (flags & GIT_FILEBUF_DO_NOT_BUFFER) - file->do_not_buffer = true; - - file->buf_size = WRITE_BUFFER_SIZE; - file->buf_pos = 0; - file->fd = -1; - file->last_error = BUFERR_OK; - - /* Allocate the main cache buffer */ - if (!file->do_not_buffer) { - file->buffer = git__malloc(file->buf_size); - GITERR_CHECK_ALLOC(file->buffer); - } - - /* If we are hashing on-write, allocate a new hash context */ - if (flags & GIT_FILEBUF_HASH_CONTENTS) { - file->compute_digest = 1; - - if (git_hash_ctx_init(&file->digest) < 0) - goto cleanup; - } - - compression = flags >> GIT_FILEBUF_DEFLATE_SHIFT; - - /* If we are deflating on-write, */ - if (compression != 0) { - /* Initialize the ZLib stream */ - if (deflateInit(&file->zs, compression) != Z_OK) { - giterr_set(GITERR_ZLIB, "Failed to initialize zlib"); - goto cleanup; - } - - /* Allocate the Zlib cache buffer */ - file->z_buf = git__malloc(file->buf_size); - GITERR_CHECK_ALLOC(file->z_buf); - - /* Never flush */ - file->flush_mode = Z_NO_FLUSH; - file->write = &write_deflate; - } else { - file->write = &write_normal; - } - - /* If we are writing to a temp file */ - if (flags & GIT_FILEBUF_TEMPORARY) { - git_buf tmp_path = GIT_BUF_INIT; - - /* Open the file as temporary for locking */ - file->fd = git_futils_mktmp(&tmp_path, path, mode); - - if (file->fd < 0) { - git_buf_free(&tmp_path); - goto cleanup; - } - file->fd_is_open = true; - file->created_lock = true; - - /* No original path */ - file->path_original = NULL; - file->path_lock = git_buf_detach(&tmp_path); - GITERR_CHECK_ALLOC(file->path_lock); - } else { - git_buf resolved_path = GIT_BUF_INIT; - - if ((error = resolve_symlink(&resolved_path, path)) < 0) - goto cleanup; - - /* Save the original path of the file */ - path_len = resolved_path.size; - file->path_original = git_buf_detach(&resolved_path); - - /* create the locking path by appending ".lock" to the original */ - GITERR_CHECK_ALLOC_ADD(&alloc_len, path_len, GIT_FILELOCK_EXTLENGTH); - file->path_lock = git__malloc(alloc_len); - GITERR_CHECK_ALLOC(file->path_lock); - - memcpy(file->path_lock, file->path_original, path_len); - memcpy(file->path_lock + path_len, GIT_FILELOCK_EXTENSION, GIT_FILELOCK_EXTLENGTH); - - if (git_path_isdir(file->path_original)) { - giterr_set(GITERR_FILESYSTEM, "path '%s' is a directory", file->path_original); - error = GIT_EDIRECTORY; - goto cleanup; - } - - /* open the file for locking */ - if ((error = lock_file(file, flags, mode)) < 0) - goto cleanup; - - file->created_lock = true; - } - - return 0; - -cleanup: - git_filebuf_cleanup(file); - return error; -} - -int git_filebuf_hash(git_oid *oid, git_filebuf *file) -{ - assert(oid && file && file->compute_digest); - - flush_buffer(file); - - if (verify_last_error(file) < 0) - return -1; - - git_hash_final(oid, &file->digest); - git_hash_ctx_cleanup(&file->digest); - file->compute_digest = 0; - - return 0; -} - -int git_filebuf_commit_at(git_filebuf *file, const char *path) -{ - git__free(file->path_original); - file->path_original = git__strdup(path); - GITERR_CHECK_ALLOC(file->path_original); - - return git_filebuf_commit(file); -} - -int git_filebuf_commit(git_filebuf *file) -{ - /* temporary files cannot be committed */ - assert(file && file->path_original); - - file->flush_mode = Z_FINISH; - flush_buffer(file); - - if (verify_last_error(file) < 0) - goto on_error; - - file->fd_is_open = false; - - if (p_close(file->fd) < 0) { - giterr_set(GITERR_OS, "Failed to close file at '%s'", file->path_lock); - goto on_error; - } - - file->fd = -1; - - if (p_rename(file->path_lock, file->path_original) < 0) { - giterr_set(GITERR_OS, "Failed to rename lockfile to '%s'", file->path_original); - goto on_error; - } - - file->did_rename = true; - - git_filebuf_cleanup(file); - return 0; - -on_error: - git_filebuf_cleanup(file); - return -1; -} - -GIT_INLINE(void) add_to_cache(git_filebuf *file, const void *buf, size_t len) -{ - memcpy(file->buffer + file->buf_pos, buf, len); - file->buf_pos += len; -} - -int git_filebuf_write(git_filebuf *file, const void *buff, size_t len) -{ - const unsigned char *buf = buff; - - ENSURE_BUF_OK(file); - - if (file->do_not_buffer) - return file->write(file, (void *)buff, len); - - for (;;) { - size_t space_left = file->buf_size - file->buf_pos; - - /* cache if it's small */ - if (space_left > len) { - add_to_cache(file, buf, len); - return 0; - } - - add_to_cache(file, buf, space_left); - if (flush_buffer(file) < 0) - return -1; - - len -= space_left; - buf += space_left; - } -} - -int git_filebuf_reserve(git_filebuf *file, void **buffer, size_t len) -{ - size_t space_left = file->buf_size - file->buf_pos; - - *buffer = NULL; - - ENSURE_BUF_OK(file); - - if (len > file->buf_size) { - file->last_error = BUFERR_MEM; - return -1; - } - - if (space_left <= len) { - if (flush_buffer(file) < 0) - return -1; - } - - *buffer = (file->buffer + file->buf_pos); - file->buf_pos += len; - - return 0; -} - -int git_filebuf_printf(git_filebuf *file, const char *format, ...) -{ - va_list arglist; - size_t space_left, len, alloclen; - int written, res; - char *tmp_buffer; - - ENSURE_BUF_OK(file); - - space_left = file->buf_size - file->buf_pos; - - do { - va_start(arglist, format); - written = p_vsnprintf((char *)file->buffer + file->buf_pos, space_left, format, arglist); - va_end(arglist); - - if (written < 0) { - file->last_error = BUFERR_MEM; - return -1; - } - - len = written; - if (len + 1 <= space_left) { - file->buf_pos += len; - return 0; - } - - if (flush_buffer(file) < 0) - return -1; - - space_left = file->buf_size - file->buf_pos; - - } while (len + 1 <= space_left); - - if (GIT_ADD_SIZET_OVERFLOW(&alloclen, len, 1) || - !(tmp_buffer = git__malloc(alloclen))) { - file->last_error = BUFERR_MEM; - return -1; - } - - va_start(arglist, format); - written = p_vsnprintf(tmp_buffer, len + 1, format, arglist); - va_end(arglist); - - if (written < 0) { - git__free(tmp_buffer); - file->last_error = BUFERR_MEM; - return -1; - } - - res = git_filebuf_write(file, tmp_buffer, len); - git__free(tmp_buffer); - - return res; -} - -int git_filebuf_stats(time_t *mtime, size_t *size, git_filebuf *file) -{ - int res; - struct stat st; - - if (file->fd_is_open) - res = p_fstat(file->fd, &st); - else - res = p_stat(file->path_original, &st); - - if (res < 0) { - giterr_set(GITERR_OS, "Could not get stat info for '%s'", - file->path_original); - return res; - } - - if (mtime) - *mtime = st.st_mtime; - if (size) - *size = (size_t)st.st_size; - - return 0; -} diff --git a/vendor/libgit2/src/filebuf.h b/vendor/libgit2/src/filebuf.h deleted file mode 100644 index f4d255b0a..000000000 --- a/vendor/libgit2/src/filebuf.h +++ /dev/null @@ -1,89 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_filebuf_h__ -#define INCLUDE_filebuf_h__ - -#include "fileops.h" -#include "hash.h" -#include - -#ifdef GIT_THREADS -# define GIT_FILEBUF_THREADS -#endif - -#define GIT_FILEBUF_HASH_CONTENTS (1 << 0) -#define GIT_FILEBUF_APPEND (1 << 2) -#define GIT_FILEBUF_FORCE (1 << 3) -#define GIT_FILEBUF_TEMPORARY (1 << 4) -#define GIT_FILEBUF_DO_NOT_BUFFER (1 << 5) -#define GIT_FILEBUF_DEFLATE_SHIFT (6) - -#define GIT_FILELOCK_EXTENSION ".lock\0" -#define GIT_FILELOCK_EXTLENGTH 6 - -typedef struct git_filebuf git_filebuf; -struct git_filebuf { - char *path_original; - char *path_lock; - - int (*write)(git_filebuf *file, void *source, size_t len); - - bool compute_digest; - git_hash_ctx digest; - - unsigned char *buffer; - unsigned char *z_buf; - - z_stream zs; - int flush_mode; - - size_t buf_size, buf_pos; - git_file fd; - bool fd_is_open; - bool created_lock; - bool did_rename; - bool do_not_buffer; - int last_error; -}; - -#define GIT_FILEBUF_INIT {0} - -/* - * The git_filebuf object lifecycle is: - * - Allocate git_filebuf, preferably using GIT_FILEBUF_INIT. - * - * - Call git_filebuf_open() to initialize the filebuf for use. - * - * - Make as many calls to git_filebuf_write(), git_filebuf_printf(), - * git_filebuf_reserve() as you like. The error codes for these - * functions don't need to be checked. They are stored internally - * by the file buffer. - * - * - While you are writing, you may call git_filebuf_hash() to get - * the hash of all you have written so far. This function will - * fail if any of the previous writes to the buffer failed. - * - * - To close the git_filebuf, you may call git_filebuf_commit() or - * git_filebuf_commit_at() to save the file, or - * git_filebuf_cleanup() to abandon the file. All of these will - * free the git_filebuf object. Likewise, all of these will fail - * if any of the previous writes to the buffer failed, and set - * an error code accordingly. - */ -int git_filebuf_write(git_filebuf *lock, const void *buff, size_t len); -int git_filebuf_reserve(git_filebuf *file, void **buff, size_t len); -int git_filebuf_printf(git_filebuf *file, const char *format, ...) GIT_FORMAT_PRINTF(2, 3); - -int git_filebuf_open(git_filebuf *lock, const char *path, int flags, mode_t mode); -int git_filebuf_commit(git_filebuf *lock); -int git_filebuf_commit_at(git_filebuf *lock, const char *path); -void git_filebuf_cleanup(git_filebuf *lock); -int git_filebuf_hash(git_oid *oid, git_filebuf *file); -int git_filebuf_flush(git_filebuf *file); -int git_filebuf_stats(time_t *mtime, size_t *size, git_filebuf *file); - -#endif diff --git a/vendor/libgit2/src/fileops.c b/vendor/libgit2/src/fileops.c deleted file mode 100644 index 22868b489..000000000 --- a/vendor/libgit2/src/fileops.c +++ /dev/null @@ -1,1090 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#include "common.h" -#include "fileops.h" -#include "global.h" -#include "strmap.h" -#include -#if GIT_WIN32 -#include "win32/findfile.h" -#endif - -GIT__USE_STRMAP - -int git_futils_mkpath2file(const char *file_path, const mode_t mode) -{ - return git_futils_mkdir( - file_path, mode, - GIT_MKDIR_PATH | GIT_MKDIR_SKIP_LAST | GIT_MKDIR_VERIFY_DIR); -} - -int git_futils_mktmp(git_buf *path_out, const char *filename, mode_t mode) -{ - int fd; - mode_t mask; - - p_umask(mask = p_umask(0)); - - git_buf_sets(path_out, filename); - git_buf_puts(path_out, "_git2_XXXXXX"); - - if (git_buf_oom(path_out)) - return -1; - - if ((fd = p_mkstemp(path_out->ptr)) < 0) { - giterr_set(GITERR_OS, - "Failed to create temporary file '%s'", path_out->ptr); - return -1; - } - - if (p_chmod(path_out->ptr, (mode & ~mask))) { - giterr_set(GITERR_OS, - "Failed to set permissions on file '%s'", path_out->ptr); - return -1; - } - - return fd; -} - -int git_futils_creat_withpath(const char *path, const mode_t dirmode, const mode_t mode) -{ - int fd; - - if (git_futils_mkpath2file(path, dirmode) < 0) - return -1; - - fd = p_creat(path, mode); - if (fd < 0) { - giterr_set(GITERR_OS, "Failed to create file '%s'", path); - return -1; - } - - return fd; -} - -int git_futils_creat_locked(const char *path, const mode_t mode) -{ - int fd = p_open(path, O_WRONLY | O_CREAT | O_TRUNC | - O_EXCL | O_BINARY | O_CLOEXEC, mode); - - if (fd < 0) { - giterr_set(GITERR_OS, "Failed to create locked file '%s'", path); - return errno == EEXIST ? GIT_ELOCKED : -1; - } - - return fd; -} - -int git_futils_creat_locked_withpath(const char *path, const mode_t dirmode, const mode_t mode) -{ - if (git_futils_mkpath2file(path, dirmode) < 0) - return -1; - - return git_futils_creat_locked(path, mode); -} - -int git_futils_open_ro(const char *path) -{ - int fd = p_open(path, O_RDONLY); - if (fd < 0) - return git_path_set_error(errno, path, "open"); - return fd; -} - -git_off_t git_futils_filesize(git_file fd) -{ - struct stat sb; - - if (p_fstat(fd, &sb)) { - giterr_set(GITERR_OS, "Failed to stat file descriptor"); - return -1; - } - - return sb.st_size; -} - -mode_t git_futils_canonical_mode(mode_t raw_mode) -{ - if (S_ISREG(raw_mode)) - return S_IFREG | GIT_PERMS_CANONICAL(raw_mode); - else if (S_ISLNK(raw_mode)) - return S_IFLNK; - else if (S_ISGITLINK(raw_mode)) - return S_IFGITLINK; - else if (S_ISDIR(raw_mode)) - return S_IFDIR; - else - return 0; -} - -int git_futils_readbuffer_fd(git_buf *buf, git_file fd, size_t len) -{ - ssize_t read_size = 0; - size_t alloc_len; - - git_buf_clear(buf); - - if (!git__is_ssizet(len)) { - giterr_set(GITERR_INVALID, "Read too large."); - return -1; - } - - GITERR_CHECK_ALLOC_ADD(&alloc_len, len, 1); - if (git_buf_grow(buf, alloc_len) < 0) - return -1; - - /* p_read loops internally to read len bytes */ - read_size = p_read(fd, buf->ptr, len); - - if (read_size != (ssize_t)len) { - giterr_set(GITERR_OS, "Failed to read descriptor"); - git_buf_free(buf); - return -1; - } - - buf->ptr[read_size] = '\0'; - buf->size = read_size; - - return 0; -} - -int git_futils_readbuffer_updated( - git_buf *out, const char *path, git_oid *checksum, int *updated) -{ - int error; - git_file fd; - struct stat st; - git_buf buf = GIT_BUF_INIT; - git_oid checksum_new; - - assert(out && path && *path); - - if (updated != NULL) - *updated = 0; - - if (p_stat(path, &st) < 0) - return git_path_set_error(errno, path, "stat"); - - - if (S_ISDIR(st.st_mode)) { - giterr_set(GITERR_INVALID, "requested file is a directory"); - return GIT_ENOTFOUND; - } - - if (!git__is_sizet(st.st_size+1)) { - giterr_set(GITERR_OS, "Invalid regular file stat for '%s'", path); - return -1; - } - - if ((fd = git_futils_open_ro(path)) < 0) - return fd; - - if (git_futils_readbuffer_fd(&buf, fd, (size_t)st.st_size) < 0) { - p_close(fd); - return -1; - } - - p_close(fd); - - if ((error = git_hash_buf(&checksum_new, buf.ptr, buf.size)) < 0) { - git_buf_free(&buf); - return error; - } - - /* - * If we were given a checksum, we only want to use it if it's different - */ - if (checksum && !git_oid__cmp(checksum, &checksum_new)) { - git_buf_free(&buf); - if (updated) - *updated = 0; - - return 0; - } - - /* - * If we're here, the file did change, or the user didn't have an old version - */ - if (checksum) - git_oid_cpy(checksum, &checksum_new); - - if (updated != NULL) - *updated = 1; - - git_buf_swap(out, &buf); - git_buf_free(&buf); - - return 0; -} - -int git_futils_readbuffer(git_buf *buf, const char *path) -{ - return git_futils_readbuffer_updated(buf, path, NULL, NULL); -} - -int git_futils_writebuffer( - const git_buf *buf, const char *path, int flags, mode_t mode) -{ - int fd, error = 0; - - if (flags <= 0) - flags = O_CREAT | O_TRUNC | O_WRONLY; - if (!mode) - mode = GIT_FILEMODE_BLOB; - - if ((fd = p_open(path, flags, mode)) < 0) { - giterr_set(GITERR_OS, "Could not open '%s' for writing", path); - return fd; - } - - if ((error = p_write(fd, git_buf_cstr(buf), git_buf_len(buf))) < 0) { - giterr_set(GITERR_OS, "Could not write to '%s'", path); - (void)p_close(fd); - return error; - } - - if ((error = p_close(fd)) < 0) - giterr_set(GITERR_OS, "Error while closing '%s'", path); - - return error; -} - -int git_futils_mv_withpath(const char *from, const char *to, const mode_t dirmode) -{ - if (git_futils_mkpath2file(to, dirmode) < 0) - return -1; - - if (p_rename(from, to) < 0) { - giterr_set(GITERR_OS, "Failed to rename '%s' to '%s'", from, to); - return -1; - } - - return 0; -} - -int git_futils_mmap_ro(git_map *out, git_file fd, git_off_t begin, size_t len) -{ - return p_mmap(out, len, GIT_PROT_READ, GIT_MAP_SHARED, fd, begin); -} - -int git_futils_mmap_ro_file(git_map *out, const char *path) -{ - git_file fd = git_futils_open_ro(path); - git_off_t len; - int result; - - if (fd < 0) - return fd; - - len = git_futils_filesize(fd); - if (!git__is_sizet(len)) { - giterr_set(GITERR_OS, "File `%s` too large to mmap", path); - return -1; - } - - result = git_futils_mmap_ro(out, fd, 0, (size_t)len); - p_close(fd); - return result; -} - -void git_futils_mmap_free(git_map *out) -{ - p_munmap(out); -} - -GIT_INLINE(int) mkdir_validate_dir( - const char *path, - struct stat *st, - mode_t mode, - uint32_t flags, - struct git_futils_mkdir_options *opts) -{ - /* with exclusive create, existing dir is an error */ - if ((flags & GIT_MKDIR_EXCL) != 0) { - giterr_set(GITERR_FILESYSTEM, - "Failed to make directory '%s': directory exists", path); - return GIT_EEXISTS; - } - - if ((S_ISREG(st->st_mode) && (flags & GIT_MKDIR_REMOVE_FILES)) || - (S_ISLNK(st->st_mode) && (flags & GIT_MKDIR_REMOVE_SYMLINKS))) { - if (p_unlink(path) < 0) { - giterr_set(GITERR_OS, "Failed to remove %s '%s'", - S_ISLNK(st->st_mode) ? "symlink" : "file", path); - return GIT_EEXISTS; - } - - opts->perfdata.mkdir_calls++; - - if (p_mkdir(path, mode) < 0) { - giterr_set(GITERR_OS, "Failed to make directory '%s'", path); - return GIT_EEXISTS; - } - } - - else if (S_ISLNK(st->st_mode)) { - /* Re-stat the target, make sure it's a directory */ - opts->perfdata.stat_calls++; - - if (p_stat(path, st) < 0) { - giterr_set(GITERR_OS, "Failed to make directory '%s'", path); - return GIT_EEXISTS; - } - } - - else if (!S_ISDIR(st->st_mode)) { - giterr_set(GITERR_FILESYSTEM, - "Failed to make directory '%s': directory exists", path); - return GIT_EEXISTS; - } - - return 0; -} - -GIT_INLINE(int) mkdir_validate_mode( - const char *path, - struct stat *st, - bool terminal_path, - mode_t mode, - uint32_t flags, - struct git_futils_mkdir_options *opts) -{ - if (((terminal_path && (flags & GIT_MKDIR_CHMOD) != 0) || - (flags & GIT_MKDIR_CHMOD_PATH) != 0) && st->st_mode != mode) { - - opts->perfdata.chmod_calls++; - - if (p_chmod(path, mode) < 0) { - giterr_set(GITERR_OS, "failed to set permissions on '%s'", path); - return -1; - } - } - - return 0; -} - -GIT_INLINE(int) mkdir_canonicalize( - git_buf *path, - uint32_t flags) -{ - ssize_t root_len; - - if (path->size == 0) { - giterr_set(GITERR_OS, "attempt to create empty path"); - return -1; - } - - /* Trim trailing slashes (except the root) */ - if ((root_len = git_path_root(path->ptr)) < 0) - root_len = 0; - else - root_len++; - - while (path->size > (size_t)root_len && path->ptr[path->size - 1] == '/') - path->ptr[--path->size] = '\0'; - - /* if we are not supposed to made the last element, truncate it */ - if ((flags & GIT_MKDIR_SKIP_LAST2) != 0) { - git_path_dirname_r(path, path->ptr); - flags |= GIT_MKDIR_SKIP_LAST; - } - if ((flags & GIT_MKDIR_SKIP_LAST) != 0) { - git_path_dirname_r(path, path->ptr); - } - - /* We were either given the root path (or trimmed it to - * the root), we don't have anything to do. - */ - if (path->size <= (size_t)root_len) - git_buf_clear(path); - - return 0; -} - -int git_futils_mkdir( - const char *path, - mode_t mode, - uint32_t flags) -{ - git_buf make_path = GIT_BUF_INIT, parent_path = GIT_BUF_INIT; - const char *relative; - struct git_futils_mkdir_options opts = { 0 }; - struct stat st; - size_t depth = 0; - int len = 0, root_len, error; - - if ((error = git_buf_puts(&make_path, path)) < 0 || - (error = mkdir_canonicalize(&make_path, flags)) < 0 || - (error = git_buf_puts(&parent_path, make_path.ptr)) < 0 || - make_path.size == 0) - goto done; - - root_len = git_path_root(make_path.ptr); - - /* find the first parent directory that exists. this will be used - * as the base to dirname_relative. - */ - for (relative = make_path.ptr; parent_path.size; ) { - error = p_lstat(parent_path.ptr, &st); - - if (error == 0) { - break; - } else if (errno != ENOENT) { - giterr_set(GITERR_OS, "failed to stat '%s'", parent_path.ptr); - goto done; - } - - depth++; - - /* examine the parent of the current path */ - if ((len = git_path_dirname_r(&parent_path, parent_path.ptr)) < 0) { - error = len; - goto done; - } - - assert(len); - - /* we've walked all the given path's parents and it's either relative - * or rooted. either way, give up and make the entire path. - */ - if ((len == 1 && parent_path.ptr[0] == '.') || len == root_len+1) { - relative = make_path.ptr; - break; - } - - relative = make_path.ptr + len + 1; - - /* not recursive? just make this directory relative to its parent. */ - if ((flags & GIT_MKDIR_PATH) == 0) - break; - } - - /* we found an item at the location we're trying to create, - * validate it. - */ - if (depth == 0) { - error = mkdir_validate_dir(make_path.ptr, &st, mode, flags, &opts); - - if (!error) - error = mkdir_validate_mode( - make_path.ptr, &st, true, mode, flags, &opts); - - goto done; - } - - /* we already took `SKIP_LAST` and `SKIP_LAST2` into account when - * canonicalizing `make_path`. - */ - flags &= ~(GIT_MKDIR_SKIP_LAST2 | GIT_MKDIR_SKIP_LAST); - - error = git_futils_mkdir_relative(relative, - parent_path.size ? parent_path.ptr : NULL, mode, flags, &opts); - -done: - git_buf_free(&make_path); - git_buf_free(&parent_path); - return error; -} - -int git_futils_mkdir_r(const char *path, const mode_t mode) -{ - return git_futils_mkdir(path, mode, GIT_MKDIR_PATH); -} - -int git_futils_mkdir_relative( - const char *relative_path, - const char *base, - mode_t mode, - uint32_t flags, - struct git_futils_mkdir_options *opts) -{ - git_buf make_path = GIT_BUF_INIT; - ssize_t root = 0, min_root_len; - char lastch = '/', *tail; - struct stat st; - struct git_futils_mkdir_options empty_opts = {0}; - int error; - - if (!opts) - opts = &empty_opts; - - /* build path and find "root" where we should start calling mkdir */ - if (git_path_join_unrooted(&make_path, relative_path, base, &root) < 0) - return -1; - - if ((error = mkdir_canonicalize(&make_path, flags)) < 0 || - make_path.size == 0) - goto done; - - /* if we are not supposed to make the whole path, reset root */ - if ((flags & GIT_MKDIR_PATH) == 0) - root = git_buf_rfind(&make_path, '/'); - - /* advance root past drive name or network mount prefix */ - min_root_len = git_path_root(make_path.ptr); - if (root < min_root_len) - root = min_root_len; - while (root >= 0 && make_path.ptr[root] == '/') - ++root; - - /* clip root to make_path length */ - if (root > (ssize_t)make_path.size) - root = (ssize_t)make_path.size; /* i.e. NUL byte of string */ - if (root < 0) - root = 0; - - /* walk down tail of path making each directory */ - for (tail = &make_path.ptr[root]; *tail; *tail = lastch) { - bool mkdir_attempted = false; - - /* advance tail to include next path component */ - while (*tail == '/') - tail++; - while (*tail && *tail != '/') - tail++; - - /* truncate path at next component */ - lastch = *tail; - *tail = '\0'; - st.st_mode = 0; - - if (opts->dir_map && git_strmap_exists(opts->dir_map, make_path.ptr)) - continue; - - /* See what's going on with this path component */ - opts->perfdata.stat_calls++; - -retry_lstat: - if (p_lstat(make_path.ptr, &st) < 0) { - if (mkdir_attempted || errno != ENOENT) { - giterr_set(GITERR_OS, "Cannot access component in path '%s'", make_path.ptr); - error = -1; - goto done; - } - - giterr_clear(); - opts->perfdata.mkdir_calls++; - mkdir_attempted = true; - if (p_mkdir(make_path.ptr, mode) < 0) { - if (errno == EEXIST) - goto retry_lstat; - giterr_set(GITERR_OS, "Failed to make directory '%s'", make_path.ptr); - error = -1; - goto done; - } - } else { - if ((error = mkdir_validate_dir( - make_path.ptr, &st, mode, flags, opts)) < 0) - goto done; - } - - /* chmod if requested and necessary */ - if ((error = mkdir_validate_mode( - make_path.ptr, &st, (lastch == '\0'), mode, flags, opts)) < 0) - goto done; - - if (opts->dir_map && opts->pool) { - char *cache_path; - size_t alloc_size; - - GITERR_CHECK_ALLOC_ADD(&alloc_size, make_path.size, 1); - if (!git__is_uint32(alloc_size)) - return -1; - cache_path = git_pool_malloc(opts->pool, (uint32_t)alloc_size); - GITERR_CHECK_ALLOC(cache_path); - - memcpy(cache_path, make_path.ptr, make_path.size + 1); - - git_strmap_insert(opts->dir_map, cache_path, cache_path, error); - if (error < 0) - goto done; - } - } - - error = 0; - - /* check that full path really is a directory if requested & needed */ - if ((flags & GIT_MKDIR_VERIFY_DIR) != 0 && - lastch != '\0') { - opts->perfdata.stat_calls++; - - if (p_stat(make_path.ptr, &st) < 0 || !S_ISDIR(st.st_mode)) { - giterr_set(GITERR_OS, "Path is not a directory '%s'", - make_path.ptr); - error = GIT_ENOTFOUND; - } - } - -done: - git_buf_free(&make_path); - return error; -} - -typedef struct { - const char *base; - size_t baselen; - uint32_t flags; - int depth; -} futils__rmdir_data; - -#define FUTILS_MAX_DEPTH 100 - -static int futils__error_cannot_rmdir(const char *path, const char *filemsg) -{ - if (filemsg) - giterr_set(GITERR_OS, "Could not remove directory. File '%s' %s", - path, filemsg); - else - giterr_set(GITERR_OS, "Could not remove directory '%s'", path); - - return -1; -} - -static int futils__rm_first_parent(git_buf *path, const char *ceiling) -{ - int error = GIT_ENOTFOUND; - struct stat st; - - while (error == GIT_ENOTFOUND) { - git_buf_rtruncate_at_char(path, '/'); - - if (!path->size || git__prefixcmp(path->ptr, ceiling) != 0) - error = 0; - else if (p_lstat_posixly(path->ptr, &st) == 0) { - if (S_ISREG(st.st_mode) || S_ISLNK(st.st_mode)) - error = p_unlink(path->ptr); - else if (!S_ISDIR(st.st_mode)) - error = -1; /* fail to remove non-regular file */ - } else if (errno != ENOTDIR) - error = -1; - } - - if (error) - futils__error_cannot_rmdir(path->ptr, "cannot remove parent"); - - return error; -} - -static int futils__rmdir_recurs_foreach(void *opaque, git_buf *path) -{ - int error = 0; - futils__rmdir_data *data = opaque; - struct stat st; - - if (data->depth > FUTILS_MAX_DEPTH) - error = futils__error_cannot_rmdir( - path->ptr, "directory nesting too deep"); - - else if ((error = p_lstat_posixly(path->ptr, &st)) < 0) { - if (errno == ENOENT) - error = 0; - else if (errno == ENOTDIR) { - /* asked to remove a/b/c/d/e and a/b is a normal file */ - if ((data->flags & GIT_RMDIR_REMOVE_BLOCKERS) != 0) - error = futils__rm_first_parent(path, data->base); - else - futils__error_cannot_rmdir( - path->ptr, "parent is not directory"); - } - else - error = git_path_set_error(errno, path->ptr, "rmdir"); - } - - else if (S_ISDIR(st.st_mode)) { - data->depth++; - - error = git_path_direach(path, 0, futils__rmdir_recurs_foreach, data); - - data->depth--; - - if (error < 0) - return error; - - if (data->depth == 0 && (data->flags & GIT_RMDIR_SKIP_ROOT) != 0) - return error; - - if ((error = p_rmdir(path->ptr)) < 0) { - if ((data->flags & GIT_RMDIR_SKIP_NONEMPTY) != 0 && - (errno == ENOTEMPTY || errno == EEXIST || errno == EBUSY)) - error = 0; - else - error = git_path_set_error(errno, path->ptr, "rmdir"); - } - } - - else if ((data->flags & GIT_RMDIR_REMOVE_FILES) != 0) { - if (p_unlink(path->ptr) < 0) - error = git_path_set_error(errno, path->ptr, "remove"); - } - - else if ((data->flags & GIT_RMDIR_SKIP_NONEMPTY) == 0) - error = futils__error_cannot_rmdir(path->ptr, "still present"); - - return error; -} - -static int futils__rmdir_empty_parent(void *opaque, const char *path) -{ - futils__rmdir_data *data = opaque; - int error = 0; - - if (strlen(path) <= data->baselen) - error = GIT_ITEROVER; - - else if (p_rmdir(path) < 0) { - int en = errno; - - if (en == ENOENT || en == ENOTDIR) { - /* do nothing */ - } else if (en == ENOTEMPTY || en == EEXIST || en == EBUSY) { - error = GIT_ITEROVER; - } else { - error = git_path_set_error(errno, path, "rmdir"); - } - } - - return error; -} - -int git_futils_rmdir_r( - const char *path, const char *base, uint32_t flags) -{ - int error; - git_buf fullpath = GIT_BUF_INIT; - futils__rmdir_data data; - - /* build path and find "root" where we should start calling mkdir */ - if (git_path_join_unrooted(&fullpath, path, base, NULL) < 0) - return -1; - - memset(&data, 0, sizeof(data)); - data.base = base ? base : ""; - data.baselen = base ? strlen(base) : 0; - data.flags = flags; - - error = futils__rmdir_recurs_foreach(&data, &fullpath); - - /* remove now-empty parents if requested */ - if (!error && (flags & GIT_RMDIR_EMPTY_PARENTS) != 0) - error = git_path_walk_up( - &fullpath, base, futils__rmdir_empty_parent, &data); - - if (error == GIT_ITEROVER) { - giterr_clear(); - error = 0; - } - - git_buf_free(&fullpath); - - return error; -} - -int git_futils_fake_symlink(const char *old, const char *new) -{ - int retcode = GIT_ERROR; - int fd = git_futils_creat_withpath(new, 0755, 0644); - if (fd >= 0) { - retcode = p_write(fd, old, strlen(old)); - p_close(fd); - } - return retcode; -} - -static int cp_by_fd(int ifd, int ofd, bool close_fd_when_done) -{ - int error = 0; - char buffer[FILEIO_BUFSIZE]; - ssize_t len = 0; - - while (!error && (len = p_read(ifd, buffer, sizeof(buffer))) > 0) - /* p_write() does not have the same semantics as write(). It loops - * internally and will return 0 when it has completed writing. - */ - error = p_write(ofd, buffer, len); - - if (len < 0) { - giterr_set(GITERR_OS, "Read error while copying file"); - error = (int)len; - } - - if (error < 0) - giterr_set(GITERR_OS, "write error while copying file"); - - if (close_fd_when_done) { - p_close(ifd); - p_close(ofd); - } - - return error; -} - -int git_futils_cp(const char *from, const char *to, mode_t filemode) -{ - int ifd, ofd; - - if ((ifd = git_futils_open_ro(from)) < 0) - return ifd; - - if ((ofd = p_open(to, O_WRONLY | O_CREAT | O_EXCL, filemode)) < 0) { - p_close(ifd); - return git_path_set_error(errno, to, "open for writing"); - } - - return cp_by_fd(ifd, ofd, true); -} - -static int cp_link(const char *from, const char *to, size_t link_size) -{ - int error = 0; - ssize_t read_len; - char *link_data; - size_t alloc_size; - - GITERR_CHECK_ALLOC_ADD(&alloc_size, link_size, 1); - link_data = git__malloc(alloc_size); - GITERR_CHECK_ALLOC(link_data); - - read_len = p_readlink(from, link_data, link_size); - if (read_len != (ssize_t)link_size) { - giterr_set(GITERR_OS, "Failed to read symlink data for '%s'", from); - error = -1; - } - else { - link_data[read_len] = '\0'; - - if (p_symlink(link_data, to) < 0) { - giterr_set(GITERR_OS, "Could not symlink '%s' as '%s'", - link_data, to); - error = -1; - } - } - - git__free(link_data); - return error; -} - -typedef struct { - const char *to_root; - git_buf to; - ssize_t from_prefix; - uint32_t flags; - uint32_t mkdir_flags; - mode_t dirmode; -} cp_r_info; - -#define GIT_CPDIR__MKDIR_DONE_FOR_TO_ROOT (1u << 10) - -static int _cp_r_mkdir(cp_r_info *info, git_buf *from) -{ - int error = 0; - - /* create root directory the first time we need to create a directory */ - if ((info->flags & GIT_CPDIR__MKDIR_DONE_FOR_TO_ROOT) == 0) { - error = git_futils_mkdir( - info->to_root, info->dirmode, - (info->flags & GIT_CPDIR_CHMOD_DIRS) ? GIT_MKDIR_CHMOD : 0); - - info->flags |= GIT_CPDIR__MKDIR_DONE_FOR_TO_ROOT; - } - - /* create directory with root as base to prevent excess chmods */ - if (!error) - error = git_futils_mkdir_relative( - from->ptr + info->from_prefix, info->to_root, - info->dirmode, info->mkdir_flags, NULL); - - return error; -} - -static int _cp_r_callback(void *ref, git_buf *from) -{ - int error = 0; - cp_r_info *info = ref; - struct stat from_st, to_st; - bool exists = false; - - if ((info->flags & GIT_CPDIR_COPY_DOTFILES) == 0 && - from->ptr[git_path_basename_offset(from)] == '.') - return 0; - - if ((error = git_buf_joinpath( - &info->to, info->to_root, from->ptr + info->from_prefix)) < 0) - return error; - - if (!(error = git_path_lstat(info->to.ptr, &to_st))) - exists = true; - else if (error != GIT_ENOTFOUND) - return error; - else { - giterr_clear(); - error = 0; - } - - if ((error = git_path_lstat(from->ptr, &from_st)) < 0) - return error; - - if (S_ISDIR(from_st.st_mode)) { - mode_t oldmode = info->dirmode; - - /* if we are not chmod'ing, then overwrite dirmode */ - if ((info->flags & GIT_CPDIR_CHMOD_DIRS) == 0) - info->dirmode = from_st.st_mode; - - /* make directory now if CREATE_EMPTY_DIRS is requested and needed */ - if (!exists && (info->flags & GIT_CPDIR_CREATE_EMPTY_DIRS) != 0) - error = _cp_r_mkdir(info, from); - - /* recurse onto target directory */ - if (!error && (!exists || S_ISDIR(to_st.st_mode))) - error = git_path_direach(from, 0, _cp_r_callback, info); - - if (oldmode != 0) - info->dirmode = oldmode; - - return error; - } - - if (exists) { - if ((info->flags & GIT_CPDIR_OVERWRITE) == 0) - return 0; - - if (p_unlink(info->to.ptr) < 0) { - giterr_set(GITERR_OS, "Cannot overwrite existing file '%s'", - info->to.ptr); - return GIT_EEXISTS; - } - } - - /* Done if this isn't a regular file or a symlink */ - if (!S_ISREG(from_st.st_mode) && - (!S_ISLNK(from_st.st_mode) || - (info->flags & GIT_CPDIR_COPY_SYMLINKS) == 0)) - return 0; - - /* Make container directory on demand if needed */ - if ((info->flags & GIT_CPDIR_CREATE_EMPTY_DIRS) == 0 && - (error = _cp_r_mkdir(info, from)) < 0) - return error; - - /* make symlink or regular file */ - if (info->flags & GIT_CPDIR_LINK_FILES) { - if ((error = p_link(from->ptr, info->to.ptr)) < 0) - giterr_set(GITERR_OS, "failed to link '%s'", from->ptr); - } else if (S_ISLNK(from_st.st_mode)) { - error = cp_link(from->ptr, info->to.ptr, (size_t)from_st.st_size); - } else { - mode_t usemode = from_st.st_mode; - - if ((info->flags & GIT_CPDIR_SIMPLE_TO_MODE) != 0) - usemode = GIT_PERMS_FOR_WRITE(usemode); - - error = git_futils_cp(from->ptr, info->to.ptr, usemode); - } - - return error; -} - -int git_futils_cp_r( - const char *from, - const char *to, - uint32_t flags, - mode_t dirmode) -{ - int error; - git_buf path = GIT_BUF_INIT; - cp_r_info info; - - if (git_buf_joinpath(&path, from, "") < 0) /* ensure trailing slash */ - return -1; - - memset(&info, 0, sizeof(info)); - info.to_root = to; - info.flags = flags; - info.dirmode = dirmode; - info.from_prefix = path.size; - git_buf_init(&info.to, 0); - - /* precalculate mkdir flags */ - if ((flags & GIT_CPDIR_CREATE_EMPTY_DIRS) == 0) { - /* if not creating empty dirs, then use mkdir to create the path on - * demand right before files are copied. - */ - info.mkdir_flags = GIT_MKDIR_PATH | GIT_MKDIR_SKIP_LAST; - if ((flags & GIT_CPDIR_CHMOD_DIRS) != 0) - info.mkdir_flags |= GIT_MKDIR_CHMOD_PATH; - } else { - /* otherwise, we will do simple mkdir as directories are encountered */ - info.mkdir_flags = - ((flags & GIT_CPDIR_CHMOD_DIRS) != 0) ? GIT_MKDIR_CHMOD : 0; - } - - error = _cp_r_callback(&info, &path); - - git_buf_free(&path); - git_buf_free(&info.to); - - return error; -} - -int git_futils_filestamp_check( - git_futils_filestamp *stamp, const char *path) -{ - struct stat st; - - /* if the stamp is NULL, then always reload */ - if (stamp == NULL) - return 1; - - if (p_stat(path, &st) < 0) - return GIT_ENOTFOUND; - - if (stamp->mtime.tv_sec == st.st_mtime && -#if defined(GIT_USE_NSEC) - stamp->mtime.tv_nsec == st.st_mtime_nsec && -#endif - stamp->size == (git_off_t)st.st_size && - stamp->ino == (unsigned int)st.st_ino) - return 0; - - stamp->mtime.tv_sec = st.st_mtime; -#if defined(GIT_USE_NSEC) - stamp->mtime.tv_nsec = st.st_mtime_nsec; -#endif - stamp->size = (git_off_t)st.st_size; - stamp->ino = (unsigned int)st.st_ino; - - return 1; -} - -void git_futils_filestamp_set( - git_futils_filestamp *target, const git_futils_filestamp *source) -{ - assert(target); - - if (source) - memcpy(target, source, sizeof(*target)); - else - memset(target, 0, sizeof(*target)); -} - - -void git_futils_filestamp_set_from_stat( - git_futils_filestamp *stamp, struct stat *st) -{ - if (st) { - stamp->mtime.tv_sec = st->st_mtime; -#if defined(GIT_USE_NSEC) - stamp->mtime.tv_nsec = st->st_mtime_nsec; -#else - stamp->mtime.tv_nsec = 0; -#endif - stamp->size = (git_off_t)st->st_size; - stamp->ino = (unsigned int)st->st_ino; - } else { - memset(stamp, 0, sizeof(*stamp)); - } -} diff --git a/vendor/libgit2/src/fileops.h b/vendor/libgit2/src/fileops.h deleted file mode 100644 index 6c6c49dcf..000000000 --- a/vendor/libgit2/src/fileops.h +++ /dev/null @@ -1,353 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_fileops_h__ -#define INCLUDE_fileops_h__ - -#include "common.h" -#include "map.h" -#include "posix.h" -#include "path.h" -#include "pool.h" -#include "strmap.h" -#include "oid.h" - -/** - * Filebuffer methods - * - * Read whole files into an in-memory buffer for processing - */ -extern int git_futils_readbuffer(git_buf *obj, const char *path); -extern int git_futils_readbuffer_updated( - git_buf *obj, const char *path, git_oid *checksum, int *updated); -extern int git_futils_readbuffer_fd(git_buf *obj, git_file fd, size_t len); - -extern int git_futils_writebuffer( - const git_buf *buf, const char *path, int open_flags, mode_t mode); - -/** - * File utils - * - * These are custom filesystem-related helper methods. They are - * rather high level, and wrap the underlying POSIX methods - * - * All these methods return 0 on success, - * or an error code on failure and an error message is set. - */ - -/** - * Create and open a file, while also - * creating all the folders in its path - */ -extern int git_futils_creat_withpath(const char *path, const mode_t dirmode, const mode_t mode); - -/** - * Create an open a process-locked file - */ -extern int git_futils_creat_locked(const char *path, const mode_t mode); - -/** - * Create an open a process-locked file, while - * also creating all the folders in its path - */ -extern int git_futils_creat_locked_withpath(const char *path, const mode_t dirmode, const mode_t mode); - -/** - * Create a path recursively. - */ -extern int git_futils_mkdir_r(const char *path, const mode_t mode); - -/** - * Flags to pass to `git_futils_mkdir`. - * - * * GIT_MKDIR_EXCL is "exclusive" - i.e. generate an error if dir exists. - * * GIT_MKDIR_PATH says to make all components in the path. - * * GIT_MKDIR_CHMOD says to chmod the final directory entry after creation - * * GIT_MKDIR_CHMOD_PATH says to chmod each directory component in the path - * * GIT_MKDIR_SKIP_LAST says to leave off the last element of the path - * * GIT_MKDIR_SKIP_LAST2 says to leave off the last 2 elements of the path - * * GIT_MKDIR_VERIFY_DIR says confirm final item is a dir, not just EEXIST - * * GIT_MKDIR_REMOVE_FILES says to remove files and recreate dirs - * * GIT_MKDIR_REMOVE_SYMLINKS says to remove symlinks and recreate dirs - * - * Note that the chmod options will be executed even if the directory already - * exists, unless GIT_MKDIR_EXCL is given. - */ -typedef enum { - GIT_MKDIR_EXCL = 1, - GIT_MKDIR_PATH = 2, - GIT_MKDIR_CHMOD = 4, - GIT_MKDIR_CHMOD_PATH = 8, - GIT_MKDIR_SKIP_LAST = 16, - GIT_MKDIR_SKIP_LAST2 = 32, - GIT_MKDIR_VERIFY_DIR = 64, - GIT_MKDIR_REMOVE_FILES = 128, - GIT_MKDIR_REMOVE_SYMLINKS = 256, -} git_futils_mkdir_flags; - -struct git_futils_mkdir_perfdata -{ - size_t stat_calls; - size_t mkdir_calls; - size_t chmod_calls; -}; - -struct git_futils_mkdir_options -{ - git_strmap *dir_map; - git_pool *pool; - struct git_futils_mkdir_perfdata perfdata; -}; - -/** - * Create a directory or entire path. - * - * This makes a directory (and the entire path leading up to it if requested), - * and optionally chmods the directory immediately after (or each part of the - * path if requested). - * - * @param path The path to create, relative to base. - * @param base Root for relative path. These directories will never be made. - * @param mode The mode to use for created directories. - * @param flags Combination of the mkdir flags above. - * @param opts Extended options, or null. - * @return 0 on success, else error code - */ -extern int git_futils_mkdir_relative(const char *path, const char *base, mode_t mode, uint32_t flags, struct git_futils_mkdir_options *opts); - -/** - * Create a directory or entire path. Similar to `git_futils_mkdir_relative` - * without performance data. - */ -extern int git_futils_mkdir(const char *path, mode_t mode, uint32_t flags); - -/** - * Create all the folders required to contain - * the full path of a file - */ -extern int git_futils_mkpath2file(const char *path, const mode_t mode); - -/** - * Flags to pass to `git_futils_rmdir_r`. - * - * * GIT_RMDIR_EMPTY_HIERARCHY - the default; remove hierarchy of empty - * dirs and generate error if any files are found. - * * GIT_RMDIR_REMOVE_FILES - attempt to remove files in the hierarchy. - * * GIT_RMDIR_SKIP_NONEMPTY - skip non-empty directories with no error. - * * GIT_RMDIR_EMPTY_PARENTS - remove containing directories up to base - * if removing this item leaves them empty - * * GIT_RMDIR_REMOVE_BLOCKERS - remove blocking file that causes ENOTDIR - * * GIT_RMDIR_SKIP_ROOT - don't remove root directory itself - */ -typedef enum { - GIT_RMDIR_EMPTY_HIERARCHY = 0, - GIT_RMDIR_REMOVE_FILES = (1 << 0), - GIT_RMDIR_SKIP_NONEMPTY = (1 << 1), - GIT_RMDIR_EMPTY_PARENTS = (1 << 2), - GIT_RMDIR_REMOVE_BLOCKERS = (1 << 3), - GIT_RMDIR_SKIP_ROOT = (1 << 4), -} git_futils_rmdir_flags; - -/** - * Remove path and any files and directories beneath it. - * - * @param path Path to the top level directory to process. - * @param base Root for relative path. - * @param flags Combination of git_futils_rmdir_flags values - * @return 0 on success; -1 on error. - */ -extern int git_futils_rmdir_r(const char *path, const char *base, uint32_t flags); - -/** - * Create and open a temporary file with a `_git2_` suffix. - * Writes the filename into path_out. - * @return On success, an open file descriptor, else an error code < 0. - */ -extern int git_futils_mktmp(git_buf *path_out, const char *filename, mode_t mode); - -/** - * Move a file on the filesystem, create the - * destination path if it doesn't exist - */ -extern int git_futils_mv_withpath(const char *from, const char *to, const mode_t dirmode); - -/** - * Copy a file - * - * The filemode will be used for the newly created file. - */ -extern int git_futils_cp( - const char *from, - const char *to, - mode_t filemode); - -/** - * Flags that can be passed to `git_futils_cp_r`. - * - * - GIT_CPDIR_CREATE_EMPTY_DIRS: create directories even if there are no - * files under them (otherwise directories will only be created lazily - * when a file inside them is copied). - * - GIT_CPDIR_COPY_SYMLINKS: copy symlinks, otherwise they are ignored. - * - GIT_CPDIR_COPY_DOTFILES: copy files with leading '.', otherwise ignored. - * - GIT_CPDIR_OVERWRITE: overwrite pre-existing files with source content, - * otherwise they are silently skipped. - * - GIT_CPDIR_CHMOD_DIRS: explicitly chmod directories to `dirmode` - * - GIT_CPDIR_SIMPLE_TO_MODE: default tries to replicate the mode of the - * source file to the target; with this flag, always use 0666 (or 0777 if - * source has exec bits set) for target. - * - GIT_CPDIR_LINK_FILES will try to use hardlinks for the files - */ -typedef enum { - GIT_CPDIR_CREATE_EMPTY_DIRS = (1u << 0), - GIT_CPDIR_COPY_SYMLINKS = (1u << 1), - GIT_CPDIR_COPY_DOTFILES = (1u << 2), - GIT_CPDIR_OVERWRITE = (1u << 3), - GIT_CPDIR_CHMOD_DIRS = (1u << 4), - GIT_CPDIR_SIMPLE_TO_MODE = (1u << 5), - GIT_CPDIR_LINK_FILES = (1u << 6), -} git_futils_cpdir_flags; - -/** - * Copy a directory tree. - * - * This copies directories and files from one root to another. You can - * pass a combinationof GIT_CPDIR flags as defined above. - * - * If you pass the CHMOD flag, then the dirmode will be applied to all - * directories that are created during the copy, overiding the natural - * permissions. If you do not pass the CHMOD flag, then the dirmode - * will actually be copied from the source files and the `dirmode` arg - * will be ignored. - */ -extern int git_futils_cp_r( - const char *from, - const char *to, - uint32_t flags, - mode_t dirmode); - -/** - * Open a file readonly and set error if needed. - */ -extern int git_futils_open_ro(const char *path); - -/** - * Get the filesize in bytes of a file - */ -extern git_off_t git_futils_filesize(git_file fd); - -#define GIT_PERMS_IS_EXEC(MODE) (((MODE) & 0111) != 0) -#define GIT_PERMS_CANONICAL(MODE) (GIT_PERMS_IS_EXEC(MODE) ? 0755 : 0644) -#define GIT_PERMS_FOR_WRITE(MODE) (GIT_PERMS_IS_EXEC(MODE) ? 0777 : 0666) - -#define GIT_MODE_PERMS_MASK 0777 -#define GIT_MODE_TYPE_MASK 0170000 -#define GIT_MODE_TYPE(MODE) ((MODE) & GIT_MODE_TYPE_MASK) -#define GIT_MODE_ISBLOB(MODE) (GIT_MODE_TYPE(MODE) == GIT_MODE_TYPE(GIT_FILEMODE_BLOB)) - -/** - * Convert a mode_t from the OS to a legal git mode_t value. - */ -extern mode_t git_futils_canonical_mode(mode_t raw_mode); - - -/** - * Read-only map all or part of a file into memory. - * When possible this function should favor a virtual memory - * style mapping over some form of malloc()+read(), as the - * data access will be random and is not likely to touch the - * majority of the region requested. - * - * @param out buffer to populate with the mapping information. - * @param fd open descriptor to configure the mapping from. - * @param begin first byte to map, this should be page aligned. - * @param len number of bytes to map. - * @return - * - 0 on success; - * - -1 on error. - */ -extern int git_futils_mmap_ro( - git_map *out, - git_file fd, - git_off_t begin, - size_t len); - -/** - * Read-only map an entire file. - * - * @param out buffer to populate with the mapping information. - * @param path path to file to be opened. - * @return - * - 0 on success; - * - GIT_ENOTFOUND if not found; - * - -1 on an unspecified OS related error. - */ -extern int git_futils_mmap_ro_file( - git_map *out, - const char *path); - -/** - * Release the memory associated with a previous memory mapping. - * @param map the mapping description previously configured. - */ -extern void git_futils_mmap_free(git_map *map); - -/** - * Create a "fake" symlink (text file containing the target path). - * - * @param new symlink file to be created - * @param old original symlink target - * @return 0 on success, -1 on error - */ -extern int git_futils_fake_symlink(const char *new, const char *old); - -/** - * A file stamp represents a snapshot of information about a file that can - * be used to test if the file changes. This portable implementation is - * based on stat data about that file, but it is possible that OS specific - * versions could be implemented in the future. - */ -typedef struct { - struct timespec mtime; - git_off_t size; - unsigned int ino; -} git_futils_filestamp; - -/** - * Compare stat information for file with reference info. - * - * This function updates the file stamp to current data for the given path - * and returns 0 if the file is up-to-date relative to the prior setting, - * 1 if the file has been changed, or GIT_ENOTFOUND if the file doesn't - * exist. This will not call giterr_set, so you must set the error if you - * plan to return an error. - * - * @param stamp File stamp to be checked - * @param path Path to stat and check if changed - * @return 0 if up-to-date, 1 if out-of-date, GIT_ENOTFOUND if cannot stat - */ -extern int git_futils_filestamp_check( - git_futils_filestamp *stamp, const char *path); - -/** - * Set or reset file stamp data - * - * This writes the target file stamp. If the source is NULL, this will set - * the target stamp to values that will definitely be out of date. If the - * source is not NULL, this copies the source values to the target. - * - * @param tgt File stamp to write to - * @param src File stamp to copy from or NULL to clear the target - */ -extern void git_futils_filestamp_set( - git_futils_filestamp *tgt, const git_futils_filestamp *src); - -/** - * Set file stamp data from stat structure - */ -extern void git_futils_filestamp_set_from_stat( - git_futils_filestamp *stamp, struct stat *st); - -#endif /* INCLUDE_fileops_h__ */ diff --git a/vendor/libgit2/src/filter.c b/vendor/libgit2/src/filter.c deleted file mode 100644 index a0628d779..000000000 --- a/vendor/libgit2/src/filter.c +++ /dev/null @@ -1,1014 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "common.h" -#include "fileops.h" -#include "hash.h" -#include "filter.h" -#include "repository.h" -#include "global.h" -#include "git2/sys/filter.h" -#include "git2/config.h" -#include "blob.h" -#include "attr_file.h" -#include "array.h" - -struct git_filter_source { - git_repository *repo; - const char *path; - git_oid oid; /* zero if unknown (which is likely) */ - uint16_t filemode; /* zero if unknown */ - git_filter_mode_t mode; - uint32_t flags; -}; - -typedef struct { - const char *filter_name; - git_filter *filter; - void *payload; -} git_filter_entry; - -struct git_filter_list { - git_array_t(git_filter_entry) filters; - git_filter_source source; - git_buf *temp_buf; - char path[GIT_FLEX_ARRAY]; -}; - -typedef struct { - char *filter_name; - git_filter *filter; - int priority; - int initialized; - size_t nattrs, nmatches; - char *attrdata; - const char *attrs[GIT_FLEX_ARRAY]; -} git_filter_def; - -static int filter_def_priority_cmp(const void *a, const void *b) -{ - int pa = ((const git_filter_def *)a)->priority; - int pb = ((const git_filter_def *)b)->priority; - return (pa < pb) ? -1 : (pa > pb) ? 1 : 0; -} - -struct git_filter_registry { - git_rwlock lock; - git_vector filters; -}; - -static struct git_filter_registry filter_registry; - -static void git_filter_global_shutdown(void); - - -static int filter_def_scan_attrs( - git_buf *attrs, size_t *nattr, size_t *nmatch, const char *attr_str) -{ - const char *start, *scan = attr_str; - int has_eq; - - *nattr = *nmatch = 0; - - if (!scan) - return 0; - - while (*scan) { - while (git__isspace(*scan)) scan++; - - for (start = scan, has_eq = 0; *scan && !git__isspace(*scan); ++scan) { - if (*scan == '=') - has_eq = 1; - } - - if (scan > start) { - (*nattr)++; - if (has_eq || *start == '-' || *start == '+' || *start == '!') - (*nmatch)++; - - if (has_eq) - git_buf_putc(attrs, '='); - git_buf_put(attrs, start, scan - start); - git_buf_putc(attrs, '\0'); - } - } - - return 0; -} - -static void filter_def_set_attrs(git_filter_def *fdef) -{ - char *scan = fdef->attrdata; - size_t i; - - for (i = 0; i < fdef->nattrs; ++i) { - const char *name, *value; - - switch (*scan) { - case '=': - name = scan + 1; - for (scan++; *scan != '='; scan++) /* find '=' */; - *scan++ = '\0'; - value = scan; - break; - case '-': - name = scan + 1; value = git_attr__false; break; - case '+': - name = scan + 1; value = git_attr__true; break; - case '!': - name = scan + 1; value = git_attr__unset; break; - default: - name = scan; value = NULL; break; - } - - fdef->attrs[i] = name; - fdef->attrs[i + fdef->nattrs] = value; - - scan += strlen(scan) + 1; - } -} - -static int filter_def_name_key_check(const void *key, const void *fdef) -{ - const char *name = - fdef ? ((const git_filter_def *)fdef)->filter_name : NULL; - return name ? git__strcmp(key, name) : -1; -} - -static int filter_def_filter_key_check(const void *key, const void *fdef) -{ - const void *filter = fdef ? ((const git_filter_def *)fdef)->filter : NULL; - return (key == filter) ? 0 : -1; -} - -/* Note: callers must lock the registry before calling this function */ -static int filter_registry_insert( - const char *name, git_filter *filter, int priority) -{ - git_filter_def *fdef; - size_t nattr = 0, nmatch = 0, alloc_len; - git_buf attrs = GIT_BUF_INIT; - - if (filter_def_scan_attrs(&attrs, &nattr, &nmatch, filter->attributes) < 0) - return -1; - - GITERR_CHECK_ALLOC_MULTIPLY(&alloc_len, nattr, 2); - GITERR_CHECK_ALLOC_MULTIPLY(&alloc_len, alloc_len, sizeof(char *)); - GITERR_CHECK_ALLOC_ADD(&alloc_len, alloc_len, sizeof(git_filter_def)); - - fdef = git__calloc(1, alloc_len); - GITERR_CHECK_ALLOC(fdef); - - fdef->filter_name = git__strdup(name); - GITERR_CHECK_ALLOC(fdef->filter_name); - - fdef->filter = filter; - fdef->priority = priority; - fdef->nattrs = nattr; - fdef->nmatches = nmatch; - fdef->attrdata = git_buf_detach(&attrs); - - filter_def_set_attrs(fdef); - - if (git_vector_insert(&filter_registry.filters, fdef) < 0) { - git__free(fdef->filter_name); - git__free(fdef->attrdata); - git__free(fdef); - return -1; - } - - git_vector_sort(&filter_registry.filters); - return 0; -} - -int git_filter_global_init(void) -{ - git_filter *crlf = NULL, *ident = NULL; - int error = 0; - - if (git_rwlock_init(&filter_registry.lock) < 0) - return -1; - - if ((error = git_vector_init(&filter_registry.filters, 2, - filter_def_priority_cmp)) < 0) - goto done; - - if ((crlf = git_crlf_filter_new()) == NULL || - filter_registry_insert( - GIT_FILTER_CRLF, crlf, GIT_FILTER_CRLF_PRIORITY) < 0 || - (ident = git_ident_filter_new()) == NULL || - filter_registry_insert( - GIT_FILTER_IDENT, ident, GIT_FILTER_IDENT_PRIORITY) < 0) - error = -1; - - git__on_shutdown(git_filter_global_shutdown); - -done: - if (error) { - git_filter_free(crlf); - git_filter_free(ident); - } - - return error; -} - -static void git_filter_global_shutdown(void) -{ - size_t pos; - git_filter_def *fdef; - - if (git_rwlock_wrlock(&filter_registry.lock) < 0) - return; - - git_vector_foreach(&filter_registry.filters, pos, fdef) { - if (fdef->filter && fdef->filter->shutdown) { - fdef->filter->shutdown(fdef->filter); - fdef->initialized = false; - } - - git__free(fdef->filter_name); - git__free(fdef->attrdata); - git__free(fdef); - } - - git_vector_free(&filter_registry.filters); - - git_rwlock_wrunlock(&filter_registry.lock); - git_rwlock_free(&filter_registry.lock); -} - -/* Note: callers must lock the registry before calling this function */ -static int filter_registry_find(size_t *pos, const char *name) -{ - return git_vector_search2( - pos, &filter_registry.filters, filter_def_name_key_check, name); -} - -/* Note: callers must lock the registry before calling this function */ -static git_filter_def *filter_registry_lookup(size_t *pos, const char *name) -{ - git_filter_def *fdef = NULL; - - if (!filter_registry_find(pos, name)) - fdef = git_vector_get(&filter_registry.filters, *pos); - - return fdef; -} - - -int git_filter_register( - const char *name, git_filter *filter, int priority) -{ - int error; - - assert(name && filter); - - if (git_rwlock_wrlock(&filter_registry.lock) < 0) { - giterr_set(GITERR_OS, "failed to lock filter registry"); - return -1; - } - - if (!filter_registry_find(NULL, name)) { - giterr_set( - GITERR_FILTER, "attempt to reregister existing filter '%s'", name); - error = GIT_EEXISTS; - goto done; - } - - error = filter_registry_insert(name, filter, priority); - -done: - git_rwlock_wrunlock(&filter_registry.lock); - return error; -} - -int git_filter_unregister(const char *name) -{ - size_t pos; - git_filter_def *fdef; - int error = 0; - - assert(name); - - /* cannot unregister default filters */ - if (!strcmp(GIT_FILTER_CRLF, name) || !strcmp(GIT_FILTER_IDENT, name)) { - giterr_set(GITERR_FILTER, "Cannot unregister filter '%s'", name); - return -1; - } - - if (git_rwlock_wrlock(&filter_registry.lock) < 0) { - giterr_set(GITERR_OS, "failed to lock filter registry"); - return -1; - } - - if ((fdef = filter_registry_lookup(&pos, name)) == NULL) { - giterr_set(GITERR_FILTER, "Cannot find filter '%s' to unregister", name); - error = GIT_ENOTFOUND; - goto done; - } - - git_vector_remove(&filter_registry.filters, pos); - - if (fdef->initialized && fdef->filter && fdef->filter->shutdown) { - fdef->filter->shutdown(fdef->filter); - fdef->initialized = false; - } - - git__free(fdef->filter_name); - git__free(fdef->attrdata); - git__free(fdef); - -done: - git_rwlock_wrunlock(&filter_registry.lock); - return error; -} - -static int filter_initialize(git_filter_def *fdef) -{ - int error = 0; - - if (!fdef->initialized && fdef->filter && fdef->filter->initialize) { - if ((error = fdef->filter->initialize(fdef->filter)) < 0) - return error; - } - - fdef->initialized = true; - return 0; -} - -git_filter *git_filter_lookup(const char *name) -{ - size_t pos; - git_filter_def *fdef; - git_filter *filter = NULL; - - if (git_rwlock_rdlock(&filter_registry.lock) < 0) { - giterr_set(GITERR_OS, "failed to lock filter registry"); - return NULL; - } - - if ((fdef = filter_registry_lookup(&pos, name)) == NULL || - (!fdef->initialized && filter_initialize(fdef) < 0)) - goto done; - - filter = fdef->filter; - -done: - git_rwlock_rdunlock(&filter_registry.lock); - return filter; -} - -void git_filter_free(git_filter *filter) -{ - git__free(filter); -} - -git_repository *git_filter_source_repo(const git_filter_source *src) -{ - return src->repo; -} - -const char *git_filter_source_path(const git_filter_source *src) -{ - return src->path; -} - -uint16_t git_filter_source_filemode(const git_filter_source *src) -{ - return src->filemode; -} - -const git_oid *git_filter_source_id(const git_filter_source *src) -{ - return git_oid_iszero(&src->oid) ? NULL : &src->oid; -} - -git_filter_mode_t git_filter_source_mode(const git_filter_source *src) -{ - return src->mode; -} - -uint32_t git_filter_source_flags(const git_filter_source *src) -{ - return src->flags; -} - -static int filter_list_new( - git_filter_list **out, const git_filter_source *src) -{ - git_filter_list *fl = NULL; - size_t pathlen = src->path ? strlen(src->path) : 0, alloclen; - - GITERR_CHECK_ALLOC_ADD(&alloclen, sizeof(git_filter_list), pathlen); - GITERR_CHECK_ALLOC_ADD(&alloclen, alloclen, 1); - - fl = git__calloc(1, alloclen); - GITERR_CHECK_ALLOC(fl); - - if (src->path) - memcpy(fl->path, src->path, pathlen); - fl->source.repo = src->repo; - fl->source.path = fl->path; - fl->source.mode = src->mode; - fl->source.flags = src->flags; - - *out = fl; - return 0; -} - -static int filter_list_check_attributes( - const char ***out, - git_repository *repo, - git_attr_session *attr_session, - git_filter_def *fdef, - const git_filter_source *src) -{ - int error; - size_t i; - const char **strs = git__calloc(fdef->nattrs, sizeof(const char *)); - GITERR_CHECK_ALLOC(strs); - - error = git_attr_get_many_with_session( - strs, repo, attr_session, 0, src->path, fdef->nattrs, fdef->attrs); - - /* if no values were found but no matches are needed, it's okay! */ - if (error == GIT_ENOTFOUND && !fdef->nmatches) { - giterr_clear(); - git__free((void *)strs); - return 0; - } - - for (i = 0; !error && i < fdef->nattrs; ++i) { - const char *want = fdef->attrs[fdef->nattrs + i]; - git_attr_t want_type, found_type; - - if (!want) - continue; - - want_type = git_attr_value(want); - found_type = git_attr_value(strs[i]); - - if (want_type != found_type) - error = GIT_ENOTFOUND; - else if (want_type == GIT_ATTR_VALUE_T && - strcmp(want, strs[i]) && - strcmp(want, "*")) - error = GIT_ENOTFOUND; - } - - if (error) - git__free((void *)strs); - else - *out = strs; - - return error; -} - -int git_filter_list_new( - git_filter_list **out, - git_repository *repo, - git_filter_mode_t mode, - uint32_t flags) -{ - git_filter_source src = { 0 }; - src.repo = repo; - src.path = NULL; - src.mode = mode; - src.flags = flags; - return filter_list_new(out, &src); -} - -int git_filter_list__load_ext( - git_filter_list **filters, - git_repository *repo, - git_blob *blob, /* can be NULL */ - const char *path, - git_filter_mode_t mode, - git_filter_options *filter_opts) -{ - int error = 0; - git_filter_list *fl = NULL; - git_filter_source src = { 0 }; - git_filter_entry *fe; - size_t idx; - git_filter_def *fdef; - - if (git_rwlock_rdlock(&filter_registry.lock) < 0) { - giterr_set(GITERR_OS, "failed to lock filter registry"); - return -1; - } - - src.repo = repo; - src.path = path; - src.mode = mode; - src.flags = filter_opts->flags; - - if (blob) - git_oid_cpy(&src.oid, git_blob_id(blob)); - - git_vector_foreach(&filter_registry.filters, idx, fdef) { - const char **values = NULL; - void *payload = NULL; - - if (!fdef || !fdef->filter) - continue; - - if (fdef->nattrs > 0) { - error = filter_list_check_attributes( - &values, repo, filter_opts->attr_session, fdef, &src); - - if (error == GIT_ENOTFOUND) { - error = 0; - continue; - } else if (error < 0) - break; - } - - if (!fdef->initialized && (error = filter_initialize(fdef)) < 0) - break; - - if (fdef->filter->check) - error = fdef->filter->check( - fdef->filter, &payload, &src, values); - - git__free((void *)values); - - if (error == GIT_PASSTHROUGH) - error = 0; - else if (error < 0) - break; - else { - if (!fl) { - if ((error = filter_list_new(&fl, &src)) < 0) - break; - - fl->temp_buf = filter_opts->temp_buf; - } - - fe = git_array_alloc(fl->filters); - GITERR_CHECK_ALLOC(fe); - - fe->filter = fdef->filter; - fe->filter_name = fdef->filter_name; - fe->payload = payload; - } - } - - git_rwlock_rdunlock(&filter_registry.lock); - - if (error && fl != NULL) { - git_array_clear(fl->filters); - git__free(fl); - fl = NULL; - } - - *filters = fl; - return error; -} - -int git_filter_list_load( - git_filter_list **filters, - git_repository *repo, - git_blob *blob, /* can be NULL */ - const char *path, - git_filter_mode_t mode, - uint32_t flags) -{ - git_filter_options filter_opts = GIT_FILTER_OPTIONS_INIT; - - filter_opts.flags = flags; - - return git_filter_list__load_ext( - filters, repo, blob, path, mode, &filter_opts); -} - -void git_filter_list_free(git_filter_list *fl) -{ - uint32_t i; - - if (!fl) - return; - - for (i = 0; i < git_array_size(fl->filters); ++i) { - git_filter_entry *fe = git_array_get(fl->filters, i); - if (fe->filter->cleanup) - fe->filter->cleanup(fe->filter, fe->payload); - } - - git_array_clear(fl->filters); - git__free(fl); -} - -int git_filter_list_contains( - git_filter_list *fl, - const char *name) -{ - size_t i; - - assert(name); - - if (!fl) - return 0; - - for (i = 0; i < fl->filters.size; i++) { - if (strcmp(fl->filters.ptr[i].filter_name, name) == 0) - return 1; - } - - return 0; -} - -int git_filter_list_push( - git_filter_list *fl, git_filter *filter, void *payload) -{ - int error = 0; - size_t pos; - git_filter_def *fdef = NULL; - git_filter_entry *fe; - - assert(fl && filter); - - if (git_rwlock_rdlock(&filter_registry.lock) < 0) { - giterr_set(GITERR_OS, "failed to lock filter registry"); - return -1; - } - - if (git_vector_search2( - &pos, &filter_registry.filters, - filter_def_filter_key_check, filter) == 0) - fdef = git_vector_get(&filter_registry.filters, pos); - - git_rwlock_rdunlock(&filter_registry.lock); - - if (fdef == NULL) { - giterr_set(GITERR_FILTER, "Cannot use an unregistered filter"); - return -1; - } - - if (!fdef->initialized && (error = filter_initialize(fdef)) < 0) - return error; - - fe = git_array_alloc(fl->filters); - GITERR_CHECK_ALLOC(fe); - fe->filter = filter; - fe->payload = payload; - - return 0; -} - -size_t git_filter_list_length(const git_filter_list *fl) -{ - return fl ? git_array_size(fl->filters) : 0; -} - -struct buf_stream { - git_writestream parent; - git_buf *target; - bool complete; -}; - -static int buf_stream_write( - git_writestream *s, const char *buffer, size_t len) -{ - struct buf_stream *buf_stream = (struct buf_stream *)s; - assert(buf_stream); - - assert(buf_stream->complete == 0); - - return git_buf_put(buf_stream->target, buffer, len); -} - -static int buf_stream_close(git_writestream *s) -{ - struct buf_stream *buf_stream = (struct buf_stream *)s; - assert(buf_stream); - - assert(buf_stream->complete == 0); - buf_stream->complete = 1; - - return 0; -} - -static void buf_stream_free(git_writestream *s) -{ - GIT_UNUSED(s); -} - -static void buf_stream_init(struct buf_stream *writer, git_buf *target) -{ - memset(writer, 0, sizeof(struct buf_stream)); - - writer->parent.write = buf_stream_write; - writer->parent.close = buf_stream_close; - writer->parent.free = buf_stream_free; - writer->target = target; - - git_buf_clear(target); -} - -int git_filter_list_apply_to_data( - git_buf *tgt, git_filter_list *filters, git_buf *src) -{ - struct buf_stream writer; - int error; - - git_buf_sanitize(tgt); - git_buf_sanitize(src); - - if (!filters) { - git_buf_attach_notowned(tgt, src->ptr, src->size); - return 0; - } - - buf_stream_init(&writer, tgt); - - if ((error = git_filter_list_stream_data(filters, src, - &writer.parent)) < 0) - return error; - - assert(writer.complete); - return error; -} - -int git_filter_list_apply_to_file( - git_buf *out, - git_filter_list *filters, - git_repository *repo, - const char *path) -{ - struct buf_stream writer; - int error; - - buf_stream_init(&writer, out); - - if ((error = git_filter_list_stream_file( - filters, repo, path, &writer.parent)) < 0) - return error; - - assert(writer.complete); - return error; -} - -static int buf_from_blob(git_buf *out, git_blob *blob) -{ - git_off_t rawsize = git_blob_rawsize(blob); - - if (!git__is_sizet(rawsize)) { - giterr_set(GITERR_OS, "Blob is too large to filter"); - return -1; - } - - git_buf_attach_notowned(out, git_blob_rawcontent(blob), (size_t)rawsize); - return 0; -} - -int git_filter_list_apply_to_blob( - git_buf *out, - git_filter_list *filters, - git_blob *blob) -{ - struct buf_stream writer; - int error; - - buf_stream_init(&writer, out); - - if ((error = git_filter_list_stream_blob( - filters, blob, &writer.parent)) < 0) - return error; - - assert(writer.complete); - return error; -} - -struct proxy_stream { - git_writestream parent; - git_filter *filter; - const git_filter_source *source; - void **payload; - git_buf input; - git_buf temp_buf; - git_buf *output; - git_writestream *target; -}; - -static int proxy_stream_write( - git_writestream *s, const char *buffer, size_t len) -{ - struct proxy_stream *proxy_stream = (struct proxy_stream *)s; - assert(proxy_stream); - - return git_buf_put(&proxy_stream->input, buffer, len); -} - -static int proxy_stream_close(git_writestream *s) -{ - struct proxy_stream *proxy_stream = (struct proxy_stream *)s; - git_buf *writebuf; - int error; - - assert(proxy_stream); - - error = proxy_stream->filter->apply( - proxy_stream->filter, - proxy_stream->payload, - proxy_stream->output, - &proxy_stream->input, - proxy_stream->source); - - if (error == GIT_PASSTHROUGH) { - writebuf = &proxy_stream->input; - } else if (error == 0) { - git_buf_sanitize(proxy_stream->output); - writebuf = proxy_stream->output; - } else { - return error; - } - - if ((error = proxy_stream->target->write( - proxy_stream->target, writebuf->ptr, writebuf->size)) == 0) - error = proxy_stream->target->close(proxy_stream->target); - - return error; -} - -static void proxy_stream_free(git_writestream *s) -{ - struct proxy_stream *proxy_stream = (struct proxy_stream *)s; - assert(proxy_stream); - - git_buf_free(&proxy_stream->input); - git_buf_free(&proxy_stream->temp_buf); - git__free(proxy_stream); -} - -static int proxy_stream_init( - git_writestream **out, - git_filter *filter, - git_buf *temp_buf, - void **payload, - const git_filter_source *source, - git_writestream *target) -{ - struct proxy_stream *proxy_stream = git__calloc(1, sizeof(struct proxy_stream)); - GITERR_CHECK_ALLOC(proxy_stream); - - proxy_stream->parent.write = proxy_stream_write; - proxy_stream->parent.close = proxy_stream_close; - proxy_stream->parent.free = proxy_stream_free; - proxy_stream->filter = filter; - proxy_stream->payload = payload; - proxy_stream->source = source; - proxy_stream->target = target; - proxy_stream->output = temp_buf ? temp_buf : &proxy_stream->temp_buf; - - if (temp_buf) - git_buf_clear(temp_buf); - - *out = (git_writestream *)proxy_stream; - return 0; -} - -static int stream_list_init( - git_writestream **out, - git_vector *streams, - git_filter_list *filters, - git_writestream *target) -{ - git_writestream *last_stream = target; - size_t i; - int error = 0; - - *out = NULL; - - if (!filters) { - *out = target; - return 0; - } - - /* Create filters last to first to get the chaining direction */ - for (i = 0; i < git_array_size(filters->filters); ++i) { - size_t filter_idx = (filters->source.mode == GIT_FILTER_TO_WORKTREE) ? - git_array_size(filters->filters) - 1 - i : i; - git_filter_entry *fe = git_array_get(filters->filters, filter_idx); - git_writestream *filter_stream; - - assert(fe->filter->stream || fe->filter->apply); - - /* If necessary, create a stream that proxies the traditional - * application. - */ - if (fe->filter->stream) - error = fe->filter->stream(&filter_stream, fe->filter, - &fe->payload, &filters->source, last_stream); - else - /* Create a stream that proxies the one-shot apply */ - error = proxy_stream_init(&filter_stream, fe->filter, - filters->temp_buf, &fe->payload, &filters->source, - last_stream); - - if (error < 0) - return error; - - git_vector_insert(streams, filter_stream); - last_stream = filter_stream; - } - - *out = last_stream; - return 0; -} - -void stream_list_free(git_vector *streams) -{ - git_writestream *stream; - size_t i; - - git_vector_foreach(streams, i, stream) - stream->free(stream); - git_vector_free(streams); -} - -int git_filter_list_stream_file( - git_filter_list *filters, - git_repository *repo, - const char *path, - git_writestream *target) -{ - char buf[FILTERIO_BUFSIZE]; - git_buf abspath = GIT_BUF_INIT; - const char *base = repo ? git_repository_workdir(repo) : NULL; - git_vector filter_streams = GIT_VECTOR_INIT; - git_writestream *stream_start; - ssize_t readlen; - int fd = -1, error; - - if ((error = stream_list_init( - &stream_start, &filter_streams, filters, target)) < 0 || - (error = git_path_join_unrooted(&abspath, path, base, NULL)) < 0) - goto done; - - if ((fd = git_futils_open_ro(abspath.ptr)) < 0) { - error = fd; - goto done; - } - - while ((readlen = p_read(fd, buf, sizeof(buf))) > 0) { - if ((error = stream_start->write(stream_start, buf, readlen)) < 0) - goto done; - } - - if (!readlen) - error = stream_start->close(stream_start); - else if (readlen < 0) - error = readlen; - - -done: - if (fd >= 0) - p_close(fd); - stream_list_free(&filter_streams); - git_buf_free(&abspath); - return error; -} - -int git_filter_list_stream_data( - git_filter_list *filters, - git_buf *data, - git_writestream *target) -{ - git_vector filter_streams = GIT_VECTOR_INIT; - git_writestream *stream_start; - int error = 0, close_error; - - git_buf_sanitize(data); - - if ((error = stream_list_init(&stream_start, &filter_streams, filters, target)) < 0) - goto out; - - error = stream_start->write(stream_start, data->ptr, data->size); - -out: - close_error = stream_start->close(stream_start); - stream_list_free(&filter_streams); - /* propagate the stream init or write error */ - return error < 0 ? error : close_error; -} - -int git_filter_list_stream_blob( - git_filter_list *filters, - git_blob *blob, - git_writestream *target) -{ - git_buf in = GIT_BUF_INIT; - - if (buf_from_blob(&in, blob) < 0) - return -1; - - if (filters) - git_oid_cpy(&filters->source.oid, git_blob_id(blob)); - - return git_filter_list_stream_data(filters, &in, target); -} diff --git a/vendor/libgit2/src/filter.h b/vendor/libgit2/src/filter.h deleted file mode 100644 index 9bd835f94..000000000 --- a/vendor/libgit2/src/filter.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_filter_h__ -#define INCLUDE_filter_h__ - -#include "common.h" -#include "attr_file.h" -#include "git2/filter.h" - -/* Amount of file to examine for NUL byte when checking binary-ness */ -#define GIT_FILTER_BYTES_TO_CHECK_NUL 8000 - -/* Possible CRLF values */ -typedef enum { - GIT_CRLF_GUESS = -1, - GIT_CRLF_BINARY = 0, - GIT_CRLF_TEXT, - GIT_CRLF_INPUT, - GIT_CRLF_CRLF, - GIT_CRLF_AUTO, -} git_crlf_t; - -typedef struct { - git_attr_session *attr_session; - git_buf *temp_buf; - uint32_t flags; -} git_filter_options; - -#define GIT_FILTER_OPTIONS_INIT {0} - -extern int git_filter_global_init(void); - -extern void git_filter_free(git_filter *filter); - -extern int git_filter_list__load_ext( - git_filter_list **filters, - git_repository *repo, - git_blob *blob, /* can be NULL */ - const char *path, - git_filter_mode_t mode, - git_filter_options *filter_opts); - -/* - * Available filters - */ - -extern git_filter *git_crlf_filter_new(void); -extern git_filter *git_ident_filter_new(void); - -#endif diff --git a/vendor/libgit2/src/fnmatch.c b/vendor/libgit2/src/fnmatch.c deleted file mode 100644 index a2945b8db..000000000 --- a/vendor/libgit2/src/fnmatch.c +++ /dev/null @@ -1,235 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -/* - * This file contains code originally derrived from OpenBSD fnmatch.c - * - * Copyright (c) 1989, 1993, 1994 - * The Regents of the University of California. All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Guido van Rossum. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -/* - * Function fnmatch() as specified in POSIX 1003.2-1992, section B.6. - * Compares a filename or pathname to a pattern. - */ - -#include -#include -#include - -#include "fnmatch.h" - -#define EOS '\0' - -#define RANGE_MATCH 1 -#define RANGE_NOMATCH 0 -#define RANGE_ERROR (-1) - -static int rangematch(const char *, char, int, char **); - -static int -p_fnmatchx(const char *pattern, const char *string, int flags, size_t recurs) -{ - const char *stringstart; - char *newp; - char c, test; - int recurs_flags = flags & ~FNM_PERIOD; - - if (recurs-- == 0) - return FNM_NORES; - - for (stringstart = string;;) - switch (c = *pattern++) { - case EOS: - if ((flags & FNM_LEADING_DIR) && *string == '/') - return (0); - return (*string == EOS ? 0 : FNM_NOMATCH); - case '?': - if (*string == EOS) - return (FNM_NOMATCH); - if (*string == '/' && (flags & FNM_PATHNAME)) - return (FNM_NOMATCH); - if (*string == '.' && (flags & FNM_PERIOD) && - (string == stringstart || - ((flags & FNM_PATHNAME) && *(string - 1) == '/'))) - return (FNM_NOMATCH); - ++string; - break; - case '*': - c = *pattern; - - /* Let '**' override PATHNAME match for this segment. - * It will be restored if/when we recurse below. - */ - if (c == '*') { - flags &= ~FNM_PATHNAME; - while (c == '*') - c = *++pattern; - if (c == '/') - c = *++pattern; - } - - if (*string == '.' && (flags & FNM_PERIOD) && - (string == stringstart || - ((flags & FNM_PATHNAME) && *(string - 1) == '/'))) - return (FNM_NOMATCH); - - /* Optimize for pattern with * at end or before /. */ - if (c == EOS) { - if (flags & FNM_PATHNAME) - return ((flags & FNM_LEADING_DIR) || - strchr(string, '/') == NULL ? - 0 : FNM_NOMATCH); - else - return (0); - } else if (c == '/' && (flags & FNM_PATHNAME)) { - if ((string = strchr(string, '/')) == NULL) - return (FNM_NOMATCH); - break; - } - - /* General case, use recursion. */ - while ((test = *string) != EOS) { - int e; - - e = p_fnmatchx(pattern, string, recurs_flags, recurs); - if (e != FNM_NOMATCH) - return e; - if (test == '/' && (flags & FNM_PATHNAME)) - break; - ++string; - } - return (FNM_NOMATCH); - case '[': - if (*string == EOS) - return (FNM_NOMATCH); - if (*string == '/' && (flags & FNM_PATHNAME)) - return (FNM_NOMATCH); - if (*string == '.' && (flags & FNM_PERIOD) && - (string == stringstart || - ((flags & FNM_PATHNAME) && *(string - 1) == '/'))) - return (FNM_NOMATCH); - - switch (rangematch(pattern, *string, flags, &newp)) { - case RANGE_ERROR: - /* not a good range, treat as normal text */ - goto normal; - case RANGE_MATCH: - pattern = newp; - break; - case RANGE_NOMATCH: - return (FNM_NOMATCH); - } - ++string; - break; - case '\\': - if (!(flags & FNM_NOESCAPE)) { - if ((c = *pattern++) == EOS) { - c = '\\'; - --pattern; - } - } - /* FALLTHROUGH */ - default: - normal: - if (c != *string && !((flags & FNM_CASEFOLD) && - (git__tolower((unsigned char)c) == - git__tolower((unsigned char)*string)))) - return (FNM_NOMATCH); - ++string; - break; - } - /* NOTREACHED */ -} - -static int -rangematch(const char *pattern, char test, int flags, char **newp) -{ - int negate, ok; - char c, c2; - - /* - * A bracket expression starting with an unquoted circumflex - * character produces unspecified results (IEEE 1003.2-1992, - * 3.13.2). This implementation treats it like '!', for - * consistency with the regular expression syntax. - * J.T. Conklin (conklin@ngai.kaleida.com) - */ - if ((negate = (*pattern == '!' || *pattern == '^')) != 0) - ++pattern; - - if (flags & FNM_CASEFOLD) - test = (char)git__tolower((unsigned char)test); - - /* - * A right bracket shall lose its special meaning and represent - * itself in a bracket expression if it occurs first in the list. - * -- POSIX.2 2.8.3.2 - */ - ok = 0; - c = *pattern++; - do { - if (c == '\\' && !(flags & FNM_NOESCAPE)) - c = *pattern++; - if (c == EOS) - return (RANGE_ERROR); - if (c == '/' && (flags & FNM_PATHNAME)) - return (RANGE_NOMATCH); - if ((flags & FNM_CASEFOLD)) - c = (char)git__tolower((unsigned char)c); - if (*pattern == '-' - && (c2 = *(pattern+1)) != EOS && c2 != ']') { - pattern += 2; - if (c2 == '\\' && !(flags & FNM_NOESCAPE)) - c2 = *pattern++; - if (c2 == EOS) - return (RANGE_ERROR); - if (flags & FNM_CASEFOLD) - c2 = (char)git__tolower((unsigned char)c2); - if (c <= test && test <= c2) - ok = 1; - } else if (c == test) - ok = 1; - } while ((c = *pattern++) != ']'); - - *newp = (char *)pattern; - return (ok == negate ? RANGE_NOMATCH : RANGE_MATCH); -} - -int -p_fnmatch(const char *pattern, const char *string, int flags) -{ - return p_fnmatchx(pattern, string, flags, 64); -} - diff --git a/vendor/libgit2/src/fnmatch.h b/vendor/libgit2/src/fnmatch.h deleted file mode 100644 index 88af45939..000000000 --- a/vendor/libgit2/src/fnmatch.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef INCLUDE_fnmatch__compat_h__ -#define INCLUDE_fnmatch__compat_h__ - -#include "common.h" - -#define FNM_NOMATCH 1 /* Match failed. */ -#define FNM_NOSYS 2 /* Function not supported (unused). */ -#define FNM_NORES 3 /* Out of resources */ - -#define FNM_NOESCAPE 0x01 /* Disable backslash escaping. */ -#define FNM_PATHNAME 0x02 /* Slash must be matched by slash. */ -#define FNM_PERIOD 0x04 /* Period must be matched by period. */ -#define FNM_LEADING_DIR 0x08 /* Ignore / after Imatch. */ -#define FNM_CASEFOLD 0x10 /* Case insensitive search. */ - -#define FNM_IGNORECASE FNM_CASEFOLD -#define FNM_FILE_NAME FNM_PATHNAME - -extern int p_fnmatch(const char *pattern, const char *string, int flags); - -#endif /* _FNMATCH_H */ - diff --git a/vendor/libgit2/src/global.c b/vendor/libgit2/src/global.c deleted file mode 100644 index adf353d35..000000000 --- a/vendor/libgit2/src/global.c +++ /dev/null @@ -1,352 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#include "common.h" -#include "global.h" -#include "hash.h" -#include "sysdir.h" -#include "filter.h" -#include "openssl_stream.h" -#include "thread-utils.h" -#include "git2/global.h" -#include "transports/ssh.h" - -#if defined(GIT_MSVC_CRTDBG) -#include "win32/w32_stack.h" -#include "win32/w32_crtdbg_stacktrace.h" -#endif - -git_mutex git__mwindow_mutex; - -#define MAX_SHUTDOWN_CB 8 - -static git_global_shutdown_fn git__shutdown_callbacks[MAX_SHUTDOWN_CB]; -static git_atomic git__n_shutdown_callbacks; -static git_atomic git__n_inits; -char *git__user_agent; -char *git__ssl_ciphers; - -void git__on_shutdown(git_global_shutdown_fn callback) -{ - int count = git_atomic_inc(&git__n_shutdown_callbacks); - assert(count <= MAX_SHUTDOWN_CB && count > 0); - git__shutdown_callbacks[count - 1] = callback; -} - -static void git__global_state_cleanup(git_global_st *st) -{ - if (!st) - return; - - git__free(st->error_t.message); - st->error_t.message = NULL; -} - -static int init_common(void) -{ - int ret; - - /* Initialize the CRT debug allocator first, before our first malloc */ -#if defined(GIT_MSVC_CRTDBG) - git_win32__crtdbg_stacktrace_init(); - git_win32__stack_init(); -#endif - - /* Initialize any other subsystems that have global state */ - if ((ret = git_hash_global_init()) == 0 && - (ret = git_sysdir_global_init()) == 0 && - (ret = git_filter_global_init()) == 0 && - (ret = git_transport_ssh_global_init()) == 0) - ret = git_openssl_stream_global_init(); - - GIT_MEMORY_BARRIER; - - return ret; -} - -static void shutdown_common(void) -{ - int pos; - - /* Shutdown subsystems that have registered */ - for (pos = git_atomic_get(&git__n_shutdown_callbacks); - pos > 0; - pos = git_atomic_dec(&git__n_shutdown_callbacks)) { - - git_global_shutdown_fn cb = git__swap( - git__shutdown_callbacks[pos - 1], NULL); - - if (cb != NULL) - cb(); - } - - git__free(git__user_agent); - git__free(git__ssl_ciphers); - -#if defined(GIT_MSVC_CRTDBG) - git_win32__crtdbg_stacktrace_cleanup(); - git_win32__stack_cleanup(); -#endif -} - -/** - * Handle the global state with TLS - * - * If libgit2 is built with GIT_THREADS enabled, - * the `git_libgit2_init()` function must be called - * before calling any other function of the library. - * - * This function allocates a TLS index (using pthreads - * or the native Win32 API) to store the global state - * on a per-thread basis. - * - * Any internal method that requires global state will - * then call `git__global_state()` which returns a pointer - * to the global state structure; this pointer is lazily - * allocated on each thread. - * - * Before shutting down the library, the - * `git_libgit2_shutdown` method must be called to free - * the previously reserved TLS index. - * - * If libgit2 is built without threading support, the - * `git__global_statestate()` call returns a pointer to a single, - * statically allocated global state. The `git_thread_` - * functions are not available in that case. - */ - -/* - * `git_libgit2_init()` allows subsystems to perform global setup, - * which may take place in the global scope. An explicit memory - * fence exists at the exit of `git_libgit2_init()`. Without this, - * CPU cores are free to reorder cache invalidation of `_tls_init` - * before cache invalidation of the subsystems' newly written global - * state. - */ -#if defined(GIT_THREADS) && defined(GIT_WIN32) - -static DWORD _tls_index; -static volatile LONG _mutex = 0; - -static int synchronized_threads_init(void) -{ - int error; - - _tls_index = TlsAlloc(); - - win32_pthread_initialize(); - - if (git_mutex_init(&git__mwindow_mutex)) - return -1; - - error = init_common(); - - return error; -} - -int git_libgit2_init(void) -{ - int ret; - - /* Enter the lock */ - while (InterlockedCompareExchange(&_mutex, 1, 0)) { Sleep(0); } - - /* Only do work on a 0 -> 1 transition of the refcount */ - if ((ret = git_atomic_inc(&git__n_inits)) == 1) { - if (synchronized_threads_init() < 0) - ret = -1; - } - - /* Exit the lock */ - InterlockedExchange(&_mutex, 0); - - return ret; -} - -int git_libgit2_shutdown(void) -{ - int ret; - - /* Enter the lock */ - while (InterlockedCompareExchange(&_mutex, 1, 0)) { Sleep(0); } - - /* Only do work on a 1 -> 0 transition of the refcount */ - if ((ret = git_atomic_dec(&git__n_inits)) == 0) { - shutdown_common(); - - git__free_tls_data(); - - TlsFree(_tls_index); - git_mutex_free(&git__mwindow_mutex); - } - - /* Exit the lock */ - InterlockedExchange(&_mutex, 0); - - return ret; -} - -git_global_st *git__global_state(void) -{ - git_global_st *ptr; - - assert(git_atomic_get(&git__n_inits) > 0); - - if ((ptr = TlsGetValue(_tls_index)) != NULL) - return ptr; - - ptr = git__calloc(1, sizeof(git_global_st)); - if (!ptr) - return NULL; - - git_buf_init(&ptr->error_buf, 0); - - TlsSetValue(_tls_index, ptr); - return ptr; -} - -/** - * Free the TLS data associated with this thread. - * This should only be used by the thread as it - * is exiting. - */ -void git__free_tls_data(void) -{ - void *ptr = TlsGetValue(_tls_index); - if (!ptr) - return; - - git__global_state_cleanup(ptr); - git__free(ptr); - TlsSetValue(_tls_index, NULL); -} - -BOOL WINAPI DllMain(HINSTANCE hInstDll, DWORD fdwReason, LPVOID lpvReserved) -{ - /* This is how Windows lets us know our thread is being shut down */ - if (fdwReason == DLL_THREAD_DETACH) { - git__free_tls_data(); - } - - /* - * Windows pays attention to this during library loading. We don't do anything - * so we trivially succeed. - */ - return TRUE; -} - -#elif defined(GIT_THREADS) && defined(_POSIX_THREADS) - -static pthread_key_t _tls_key; -static pthread_once_t _once_init = PTHREAD_ONCE_INIT; -int init_error = 0; - -static void cb__free_status(void *st) -{ - git__global_state_cleanup(st); - git__free(st); -} - -static void init_once(void) -{ - if ((init_error = git_mutex_init(&git__mwindow_mutex)) != 0) - return; - - pthread_key_create(&_tls_key, &cb__free_status); - - init_error = init_common(); -} - -int git_libgit2_init(void) -{ - int ret; - - ret = git_atomic_inc(&git__n_inits); - pthread_once(&_once_init, init_once); - - return init_error ? init_error : ret; -} - -int git_libgit2_shutdown(void) -{ - void *ptr = NULL; - pthread_once_t new_once = PTHREAD_ONCE_INIT; - int ret; - - if ((ret = git_atomic_dec(&git__n_inits)) != 0) - return ret; - - /* Shut down any subsystems that have global state */ - shutdown_common(); - - ptr = pthread_getspecific(_tls_key); - pthread_setspecific(_tls_key, NULL); - - git__global_state_cleanup(ptr); - git__free(ptr); - - pthread_key_delete(_tls_key); - git_mutex_free(&git__mwindow_mutex); - _once_init = new_once; - - return 0; -} - -git_global_st *git__global_state(void) -{ - git_global_st *ptr; - - assert(git_atomic_get(&git__n_inits) > 0); - - if ((ptr = pthread_getspecific(_tls_key)) != NULL) - return ptr; - - ptr = git__calloc(1, sizeof(git_global_st)); - if (!ptr) - return NULL; - - git_buf_init(&ptr->error_buf, 0); - pthread_setspecific(_tls_key, ptr); - return ptr; -} - -#else - -static git_global_st __state; - -int git_libgit2_init(void) -{ - int ret; - - /* Only init SSL the first time */ - if ((ret = git_atomic_inc(&git__n_inits)) != 1) - return ret; - - if ((ret = init_common()) < 0) - return ret; - - return 1; -} - -int git_libgit2_shutdown(void) -{ - int ret; - - /* Shut down any subsystems that have global state */ - if ((ret = git_atomic_dec(&git__n_inits)) == 0) { - shutdown_common(); - git__global_state_cleanup(&__state); - } - - return ret; -} - -git_global_st *git__global_state(void) -{ - return &__state; -} - -#endif /* GIT_THREADS */ diff --git a/vendor/libgit2/src/global.h b/vendor/libgit2/src/global.h deleted file mode 100644 index 219951525..000000000 --- a/vendor/libgit2/src/global.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_global_h__ -#define INCLUDE_global_h__ - -#include "common.h" -#include "mwindow.h" -#include "hash.h" - -typedef struct { - git_error *last_error; - git_error error_t; - git_buf error_buf; - char oid_fmt[GIT_OID_HEXSZ+1]; -} git_global_st; - -#ifdef GIT_OPENSSL -# include -extern SSL_CTX *git__ssl_ctx; -#endif - -git_global_st *git__global_state(void); - -extern git_mutex git__mwindow_mutex; - -#define GIT_GLOBAL (git__global_state()) - -typedef void (*git_global_shutdown_fn)(void); - -extern void git__on_shutdown(git_global_shutdown_fn callback); - -extern void git__free_tls_data(void); - -extern const char *git_libgit2__user_agent(void); -extern const char *git_libgit2__ssl_ciphers(void); - -#endif diff --git a/vendor/libgit2/src/graph.c b/vendor/libgit2/src/graph.c deleted file mode 100644 index 8accd808c..000000000 --- a/vendor/libgit2/src/graph.c +++ /dev/null @@ -1,192 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "revwalk.h" -#include "merge.h" -#include "git2/graph.h" - -static int interesting(git_pqueue *list, git_commit_list *roots) -{ - unsigned int i; - - for (i = 0; i < git_pqueue_size(list); i++) { - git_commit_list_node *commit = git_pqueue_get(list, i); - if ((commit->flags & STALE) == 0) - return 1; - } - - while(roots) { - if ((roots->item->flags & STALE) == 0) - return 1; - roots = roots->next; - } - - return 0; -} - -static int mark_parents(git_revwalk *walk, git_commit_list_node *one, - git_commit_list_node *two) -{ - unsigned int i; - git_commit_list *roots = NULL; - git_pqueue list; - - /* if the commit is repeated, we have a our merge base already */ - if (one == two) { - one->flags |= PARENT1 | PARENT2 | RESULT; - return 0; - } - - if (git_pqueue_init(&list, 0, 2, git_commit_list_time_cmp) < 0) - return -1; - - if (git_commit_list_parse(walk, one) < 0) - goto on_error; - one->flags |= PARENT1; - if (git_pqueue_insert(&list, one) < 0) - goto on_error; - - if (git_commit_list_parse(walk, two) < 0) - goto on_error; - two->flags |= PARENT2; - if (git_pqueue_insert(&list, two) < 0) - goto on_error; - - /* as long as there are non-STALE commits */ - while (interesting(&list, roots)) { - git_commit_list_node *commit = git_pqueue_pop(&list); - int flags; - - if (commit == NULL) - break; - - flags = commit->flags & (PARENT1 | PARENT2 | STALE); - if (flags == (PARENT1 | PARENT2)) { - if (!(commit->flags & RESULT)) - commit->flags |= RESULT; - /* we mark the parents of a merge stale */ - flags |= STALE; - } - - for (i = 0; i < commit->out_degree; i++) { - git_commit_list_node *p = commit->parents[i]; - if ((p->flags & flags) == flags) - continue; - - if (git_commit_list_parse(walk, p) < 0) - goto on_error; - - p->flags |= flags; - if (git_pqueue_insert(&list, p) < 0) - goto on_error; - } - - /* Keep track of root commits, to make sure the path gets marked */ - if (commit->out_degree == 0) { - if (git_commit_list_insert(commit, &roots) == NULL) - goto on_error; - } - } - - git_commit_list_free(&roots); - git_pqueue_free(&list); - return 0; - -on_error: - git_commit_list_free(&roots); - git_pqueue_free(&list); - return -1; -} - - -static int ahead_behind(git_commit_list_node *one, git_commit_list_node *two, - size_t *ahead, size_t *behind) -{ - git_commit_list_node *commit; - git_pqueue pq; - int error = 0, i; - *ahead = 0; - *behind = 0; - - if (git_pqueue_init(&pq, 0, 2, git_commit_list_time_cmp) < 0) - return -1; - - if ((error = git_pqueue_insert(&pq, one)) < 0 || - (error = git_pqueue_insert(&pq, two)) < 0) - goto done; - - while ((commit = git_pqueue_pop(&pq)) != NULL) { - if (commit->flags & RESULT || - (commit->flags & (PARENT1 | PARENT2)) == (PARENT1 | PARENT2)) - continue; - else if (commit->flags & PARENT1) - (*ahead)++; - else if (commit->flags & PARENT2) - (*behind)++; - - for (i = 0; i < commit->out_degree; i++) { - git_commit_list_node *p = commit->parents[i]; - if ((error = git_pqueue_insert(&pq, p)) < 0) - goto done; - } - commit->flags |= RESULT; - } - -done: - git_pqueue_free(&pq); - return error; -} - -int git_graph_ahead_behind(size_t *ahead, size_t *behind, git_repository *repo, - const git_oid *local, const git_oid *upstream) -{ - git_revwalk *walk; - git_commit_list_node *commit_u, *commit_l; - - if (git_revwalk_new(&walk, repo) < 0) - return -1; - - commit_u = git_revwalk__commit_lookup(walk, upstream); - if (commit_u == NULL) - goto on_error; - - commit_l = git_revwalk__commit_lookup(walk, local); - if (commit_l == NULL) - goto on_error; - - if (mark_parents(walk, commit_l, commit_u) < 0) - goto on_error; - if (ahead_behind(commit_l, commit_u, ahead, behind) < 0) - goto on_error; - - git_revwalk_free(walk); - - return 0; - -on_error: - git_revwalk_free(walk); - return -1; -} - -int git_graph_descendant_of(git_repository *repo, const git_oid *commit, const git_oid *ancestor) -{ - git_oid merge_base; - int error; - - if (git_oid_equal(commit, ancestor)) - return 0; - - error = git_merge_base(&merge_base, repo, commit, ancestor); - /* No merge-base found, it's not a descendant */ - if (error == GIT_ENOTFOUND) - return 0; - - if (error < 0) - return error; - - return git_oid_equal(&merge_base, ancestor); -} diff --git a/vendor/libgit2/src/hash.c b/vendor/libgit2/src/hash.c deleted file mode 100644 index f3645a913..000000000 --- a/vendor/libgit2/src/hash.c +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "common.h" -#include "hash.h" - -int git_hash_buf(git_oid *out, const void *data, size_t len) -{ - git_hash_ctx ctx; - int error = 0; - - if (git_hash_ctx_init(&ctx) < 0) - return -1; - - if ((error = git_hash_update(&ctx, data, len)) >= 0) - error = git_hash_final(out, &ctx); - - git_hash_ctx_cleanup(&ctx); - - return error; -} - -int git_hash_vec(git_oid *out, git_buf_vec *vec, size_t n) -{ - git_hash_ctx ctx; - size_t i; - int error = 0; - - if (git_hash_ctx_init(&ctx) < 0) - return -1; - - for (i = 0; i < n; i++) { - if ((error = git_hash_update(&ctx, vec[i].data, vec[i].len)) < 0) - goto done; - } - - error = git_hash_final(out, &ctx); - -done: - git_hash_ctx_cleanup(&ctx); - - return error; -} diff --git a/vendor/libgit2/src/hash.h b/vendor/libgit2/src/hash.h deleted file mode 100644 index 0bc02a8a9..000000000 --- a/vendor/libgit2/src/hash.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_hash_h__ -#define INCLUDE_hash_h__ - -#include "git2/oid.h" - -typedef struct git_hash_prov git_hash_prov; -typedef struct git_hash_ctx git_hash_ctx; - -int git_hash_global_init(void); -int git_hash_ctx_init(git_hash_ctx *ctx); -void git_hash_ctx_cleanup(git_hash_ctx *ctx); - -#if defined(GIT_COMMON_CRYPTO) -# include "hash/hash_common_crypto.h" -#elif defined(OPENSSL_SHA1) -# include "hash/hash_openssl.h" -#elif defined(WIN32_SHA1) -# include "hash/hash_win32.h" -#else -# include "hash/hash_generic.h" -#endif - -typedef struct { - void *data; - size_t len; -} git_buf_vec; - -int git_hash_init(git_hash_ctx *c); -int git_hash_update(git_hash_ctx *c, const void *data, size_t len); -int git_hash_final(git_oid *out, git_hash_ctx *c); - -int git_hash_buf(git_oid *out, const void *data, size_t len); -int git_hash_vec(git_oid *out, git_buf_vec *vec, size_t n); - -#endif /* INCLUDE_hash_h__ */ diff --git a/vendor/libgit2/src/hash/hash_common_crypto.h b/vendor/libgit2/src/hash/hash_common_crypto.h deleted file mode 100644 index eeeddd0cc..000000000 --- a/vendor/libgit2/src/hash/hash_common_crypto.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#ifndef INCLUDE_hash_common_crypto_h__ -#define INCLUDE_hash_common_crypto_h__ - -#include "hash.h" - -#include - -struct git_hash_ctx { - CC_SHA1_CTX c; -}; - -#define git_hash_global_init() 0 -#define git_hash_ctx_init(ctx) git_hash_init(ctx) -#define git_hash_ctx_cleanup(ctx) - -GIT_INLINE(int) git_hash_init(git_hash_ctx *ctx) -{ - assert(ctx); - CC_SHA1_Init(&ctx->c); - return 0; -} - -GIT_INLINE(int) git_hash_update(git_hash_ctx *ctx, const void *data, size_t len) -{ - assert(ctx); - CC_SHA1_Update(&ctx->c, data, len); - return 0; -} - -GIT_INLINE(int) git_hash_final(git_oid *out, git_hash_ctx *ctx) -{ - assert(ctx); - CC_SHA1_Final(out->id, &ctx->c); - return 0; -} - -#endif /* INCLUDE_hash_common_crypto_h__ */ diff --git a/vendor/libgit2/src/hash/hash_generic.c b/vendor/libgit2/src/hash/hash_generic.c deleted file mode 100644 index 472a7a696..000000000 --- a/vendor/libgit2/src/hash/hash_generic.c +++ /dev/null @@ -1,288 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "common.h" -#include "hash.h" -#include "hash/hash_generic.h" - -#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) - -/* - * Force usage of rol or ror by selecting the one with the smaller constant. - * It _can_ generate slightly smaller code (a constant of 1 is special), but - * perhaps more importantly it's possibly faster on any uarch that does a - * rotate with a loop. - */ - -#define SHA_ASM(op, x, n) (__extension__ ({ unsigned int __res; __asm__(op " %1,%0":"=r" (__res):"i" (n), "0" (x)); __res; })) -#define SHA_ROL(x,n) SHA_ASM("rol", x, n) -#define SHA_ROR(x,n) SHA_ASM("ror", x, n) - -#else - -#define SHA_ROT(X,l,r) (((X) << (l)) | ((X) >> (r))) -#define SHA_ROL(X,n) SHA_ROT(X,n,32-(n)) -#define SHA_ROR(X,n) SHA_ROT(X,32-(n),n) - -#endif - -/* - * If you have 32 registers or more, the compiler can (and should) - * try to change the array[] accesses into registers. However, on - * machines with less than ~25 registers, that won't really work, - * and at least gcc will make an unholy mess of it. - * - * So to avoid that mess which just slows things down, we force - * the stores to memory to actually happen (we might be better off - * with a 'W(t)=(val);asm("":"+m" (W(t))' there instead, as - * suggested by Artur Skawina - that will also make gcc unable to - * try to do the silly "optimize away loads" part because it won't - * see what the value will be). - * - * Ben Herrenschmidt reports that on PPC, the C version comes close - * to the optimized asm with this (ie on PPC you don't want that - * 'volatile', since there are lots of registers). - * - * On ARM we get the best code generation by forcing a full memory barrier - * between each SHA_ROUND, otherwise gcc happily get wild with spilling and - * the stack frame size simply explode and performance goes down the drain. - */ - -#if defined(__i386__) || defined(__x86_64__) - #define setW(x, val) (*(volatile unsigned int *)&W(x) = (val)) -#elif defined(__GNUC__) && defined(__arm__) - #define setW(x, val) do { W(x) = (val); __asm__("":::"memory"); } while (0) -#else - #define setW(x, val) (W(x) = (val)) -#endif - -/* - * Performance might be improved if the CPU architecture is OK with - * unaligned 32-bit loads and a fast ntohl() is available. - * Otherwise fall back to byte loads and shifts which is portable, - * and is faster on architectures with memory alignment issues. - */ - -#if defined(__i386__) || defined(__x86_64__) || \ - defined(_M_IX86) || defined(_M_X64) || \ - defined(__ppc__) || defined(__ppc64__) || \ - defined(__powerpc__) || defined(__powerpc64__) || \ - defined(__s390__) || defined(__s390x__) - -#define get_be32(p) ntohl(*(const unsigned int *)(p)) -#define put_be32(p, v) do { *(unsigned int *)(p) = htonl(v); } while (0) - -#else - -#define get_be32(p) ( \ - (*((const unsigned char *)(p) + 0) << 24) | \ - (*((const unsigned char *)(p) + 1) << 16) | \ - (*((const unsigned char *)(p) + 2) << 8) | \ - (*((const unsigned char *)(p) + 3) << 0) ) -#define put_be32(p, v) do { \ - unsigned int __v = (v); \ - *((unsigned char *)(p) + 0) = __v >> 24; \ - *((unsigned char *)(p) + 1) = __v >> 16; \ - *((unsigned char *)(p) + 2) = __v >> 8; \ - *((unsigned char *)(p) + 3) = __v >> 0; } while (0) - -#endif - -/* This "rolls" over the 512-bit array */ -#define W(x) (array[(x)&15]) - -/* - * Where do we get the source from? The first 16 iterations get it from - * the input data, the next mix it from the 512-bit array. - */ -#define SHA_SRC(t) get_be32(data + t) -#define SHA_MIX(t) SHA_ROL(W(t+13) ^ W(t+8) ^ W(t+2) ^ W(t), 1) - -#define SHA_ROUND(t, input, fn, constant, A, B, C, D, E) do { \ - unsigned int TEMP = input(t); setW(t, TEMP); \ - E += TEMP + SHA_ROL(A,5) + (fn) + (constant); \ - B = SHA_ROR(B, 2); } while (0) - -#define T_0_15(t, A, B, C, D, E) SHA_ROUND(t, SHA_SRC, (((C^D)&B)^D) , 0x5a827999, A, B, C, D, E ) -#define T_16_19(t, A, B, C, D, E) SHA_ROUND(t, SHA_MIX, (((C^D)&B)^D) , 0x5a827999, A, B, C, D, E ) -#define T_20_39(t, A, B, C, D, E) SHA_ROUND(t, SHA_MIX, (B^C^D) , 0x6ed9eba1, A, B, C, D, E ) -#define T_40_59(t, A, B, C, D, E) SHA_ROUND(t, SHA_MIX, ((B&C)+(D&(B^C))) , 0x8f1bbcdc, A, B, C, D, E ) -#define T_60_79(t, A, B, C, D, E) SHA_ROUND(t, SHA_MIX, (B^C^D) , 0xca62c1d6, A, B, C, D, E ) - -static void hash__block(git_hash_ctx *ctx, const unsigned int *data) -{ - unsigned int A,B,C,D,E; - unsigned int array[16]; - - A = ctx->H[0]; - B = ctx->H[1]; - C = ctx->H[2]; - D = ctx->H[3]; - E = ctx->H[4]; - - /* Round 1 - iterations 0-16 take their input from 'data' */ - T_0_15( 0, A, B, C, D, E); - T_0_15( 1, E, A, B, C, D); - T_0_15( 2, D, E, A, B, C); - T_0_15( 3, C, D, E, A, B); - T_0_15( 4, B, C, D, E, A); - T_0_15( 5, A, B, C, D, E); - T_0_15( 6, E, A, B, C, D); - T_0_15( 7, D, E, A, B, C); - T_0_15( 8, C, D, E, A, B); - T_0_15( 9, B, C, D, E, A); - T_0_15(10, A, B, C, D, E); - T_0_15(11, E, A, B, C, D); - T_0_15(12, D, E, A, B, C); - T_0_15(13, C, D, E, A, B); - T_0_15(14, B, C, D, E, A); - T_0_15(15, A, B, C, D, E); - - /* Round 1 - tail. Input from 512-bit mixing array */ - T_16_19(16, E, A, B, C, D); - T_16_19(17, D, E, A, B, C); - T_16_19(18, C, D, E, A, B); - T_16_19(19, B, C, D, E, A); - - /* Round 2 */ - T_20_39(20, A, B, C, D, E); - T_20_39(21, E, A, B, C, D); - T_20_39(22, D, E, A, B, C); - T_20_39(23, C, D, E, A, B); - T_20_39(24, B, C, D, E, A); - T_20_39(25, A, B, C, D, E); - T_20_39(26, E, A, B, C, D); - T_20_39(27, D, E, A, B, C); - T_20_39(28, C, D, E, A, B); - T_20_39(29, B, C, D, E, A); - T_20_39(30, A, B, C, D, E); - T_20_39(31, E, A, B, C, D); - T_20_39(32, D, E, A, B, C); - T_20_39(33, C, D, E, A, B); - T_20_39(34, B, C, D, E, A); - T_20_39(35, A, B, C, D, E); - T_20_39(36, E, A, B, C, D); - T_20_39(37, D, E, A, B, C); - T_20_39(38, C, D, E, A, B); - T_20_39(39, B, C, D, E, A); - - /* Round 3 */ - T_40_59(40, A, B, C, D, E); - T_40_59(41, E, A, B, C, D); - T_40_59(42, D, E, A, B, C); - T_40_59(43, C, D, E, A, B); - T_40_59(44, B, C, D, E, A); - T_40_59(45, A, B, C, D, E); - T_40_59(46, E, A, B, C, D); - T_40_59(47, D, E, A, B, C); - T_40_59(48, C, D, E, A, B); - T_40_59(49, B, C, D, E, A); - T_40_59(50, A, B, C, D, E); - T_40_59(51, E, A, B, C, D); - T_40_59(52, D, E, A, B, C); - T_40_59(53, C, D, E, A, B); - T_40_59(54, B, C, D, E, A); - T_40_59(55, A, B, C, D, E); - T_40_59(56, E, A, B, C, D); - T_40_59(57, D, E, A, B, C); - T_40_59(58, C, D, E, A, B); - T_40_59(59, B, C, D, E, A); - - /* Round 4 */ - T_60_79(60, A, B, C, D, E); - T_60_79(61, E, A, B, C, D); - T_60_79(62, D, E, A, B, C); - T_60_79(63, C, D, E, A, B); - T_60_79(64, B, C, D, E, A); - T_60_79(65, A, B, C, D, E); - T_60_79(66, E, A, B, C, D); - T_60_79(67, D, E, A, B, C); - T_60_79(68, C, D, E, A, B); - T_60_79(69, B, C, D, E, A); - T_60_79(70, A, B, C, D, E); - T_60_79(71, E, A, B, C, D); - T_60_79(72, D, E, A, B, C); - T_60_79(73, C, D, E, A, B); - T_60_79(74, B, C, D, E, A); - T_60_79(75, A, B, C, D, E); - T_60_79(76, E, A, B, C, D); - T_60_79(77, D, E, A, B, C); - T_60_79(78, C, D, E, A, B); - T_60_79(79, B, C, D, E, A); - - ctx->H[0] += A; - ctx->H[1] += B; - ctx->H[2] += C; - ctx->H[3] += D; - ctx->H[4] += E; -} - -int git_hash_init(git_hash_ctx *ctx) -{ - ctx->size = 0; - - /* Initialize H with the magic constants (see FIPS180 for constants) */ - ctx->H[0] = 0x67452301; - ctx->H[1] = 0xefcdab89; - ctx->H[2] = 0x98badcfe; - ctx->H[3] = 0x10325476; - ctx->H[4] = 0xc3d2e1f0; - - return 0; -} - -int git_hash_update(git_hash_ctx *ctx, const void *data, size_t len) -{ - unsigned int lenW = ctx->size & 63; - - ctx->size += len; - - /* Read the data into W and process blocks as they get full */ - if (lenW) { - unsigned int left = 64 - lenW; - if (len < left) - left = (unsigned int)len; - memcpy(lenW + (char *)ctx->W, data, left); - lenW = (lenW + left) & 63; - len -= left; - data = ((const char *)data + left); - if (lenW) - return 0; - hash__block(ctx, ctx->W); - } - while (len >= 64) { - hash__block(ctx, data); - data = ((const char *)data + 64); - len -= 64; - } - if (len) - memcpy(ctx->W, data, len); - - return 0; -} - -int git_hash_final(git_oid *out, git_hash_ctx *ctx) -{ - static const unsigned char pad[64] = { 0x80 }; - unsigned int padlen[2]; - int i; - - /* Pad with a binary 1 (ie 0x80), then zeroes, then length */ - padlen[0] = htonl((uint32_t)(ctx->size >> 29)); - padlen[1] = htonl((uint32_t)(ctx->size << 3)); - - i = ctx->size & 63; - git_hash_update(ctx, pad, 1+ (63 & (55 - i))); - git_hash_update(ctx, padlen, 8); - - /* Output hash */ - for (i = 0; i < 5; i++) - put_be32(out->id + i*4, ctx->H[i]); - - return 0; -} - diff --git a/vendor/libgit2/src/hash/hash_generic.h b/vendor/libgit2/src/hash/hash_generic.h deleted file mode 100644 index daeb1cda8..000000000 --- a/vendor/libgit2/src/hash/hash_generic.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#ifndef INCLUDE_hash_generic_h__ -#define INCLUDE_hash_generic_h__ - -#include "hash.h" - -struct git_hash_ctx { - unsigned long long size; - unsigned int H[5]; - unsigned int W[16]; -}; - -#define git_hash_global_init() 0 -#define git_hash_ctx_init(ctx) git_hash_init(ctx) -#define git_hash_ctx_cleanup(ctx) - -#endif /* INCLUDE_hash_generic_h__ */ diff --git a/vendor/libgit2/src/hash/hash_openssl.h b/vendor/libgit2/src/hash/hash_openssl.h deleted file mode 100644 index 9a55d472d..000000000 --- a/vendor/libgit2/src/hash/hash_openssl.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#ifndef INCLUDE_hash_openssl_h__ -#define INCLUDE_hash_openssl_h__ - -#include "hash.h" - -#include - -struct git_hash_ctx { - SHA_CTX c; -}; - -#define git_hash_global_init() 0 -#define git_hash_ctx_init(ctx) git_hash_init(ctx) -#define git_hash_ctx_cleanup(ctx) - -GIT_INLINE(int) git_hash_init(git_hash_ctx *ctx) -{ - assert(ctx); - SHA1_Init(&ctx->c); - return 0; -} - -GIT_INLINE(int) git_hash_update(git_hash_ctx *ctx, const void *data, size_t len) -{ - assert(ctx); - SHA1_Update(&ctx->c, data, len); - return 0; -} - -GIT_INLINE(int) git_hash_final(git_oid *out, git_hash_ctx *ctx) -{ - assert(ctx); - SHA1_Final(out->id, &ctx->c); - return 0; -} - -#endif /* INCLUDE_hash_openssl_h__ */ diff --git a/vendor/libgit2/src/hash/hash_win32.c b/vendor/libgit2/src/hash/hash_win32.c deleted file mode 100644 index 6bae53e55..000000000 --- a/vendor/libgit2/src/hash/hash_win32.c +++ /dev/null @@ -1,276 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "common.h" -#include "global.h" -#include "hash.h" -#include "hash/hash_win32.h" - -#include -#include - -static struct git_hash_prov hash_prov = {0}; - -/* Hash initialization */ - -/* Initialize CNG, if available */ -GIT_INLINE(int) hash_cng_prov_init(void) -{ - char dll_path[MAX_PATH]; - DWORD dll_path_len, size_len; - - /* Only use CNG on Windows 2008 / Vista SP1 or better (Windows 6.0 SP1) */ - if (!git_has_win32_version(6, 0, 1)) - return -1; - - /* Load bcrypt.dll explicitly from the system directory */ - if ((dll_path_len = GetSystemDirectory(dll_path, MAX_PATH)) == 0 || - dll_path_len > MAX_PATH || - StringCchCat(dll_path, MAX_PATH, "\\") < 0 || - StringCchCat(dll_path, MAX_PATH, GIT_HASH_CNG_DLL_NAME) < 0 || - (hash_prov.prov.cng.dll = LoadLibrary(dll_path)) == NULL) - return -1; - - /* Load the function addresses */ - if ((hash_prov.prov.cng.open_algorithm_provider = (hash_win32_cng_open_algorithm_provider_fn)GetProcAddress(hash_prov.prov.cng.dll, "BCryptOpenAlgorithmProvider")) == NULL || - (hash_prov.prov.cng.get_property = (hash_win32_cng_get_property_fn)GetProcAddress(hash_prov.prov.cng.dll, "BCryptGetProperty")) == NULL || - (hash_prov.prov.cng.create_hash = (hash_win32_cng_create_hash_fn)GetProcAddress(hash_prov.prov.cng.dll, "BCryptCreateHash")) == NULL || - (hash_prov.prov.cng.finish_hash = (hash_win32_cng_finish_hash_fn)GetProcAddress(hash_prov.prov.cng.dll, "BCryptFinishHash")) == NULL || - (hash_prov.prov.cng.hash_data = (hash_win32_cng_hash_data_fn)GetProcAddress(hash_prov.prov.cng.dll, "BCryptHashData")) == NULL || - (hash_prov.prov.cng.destroy_hash = (hash_win32_cng_destroy_hash_fn)GetProcAddress(hash_prov.prov.cng.dll, "BCryptDestroyHash")) == NULL || - (hash_prov.prov.cng.close_algorithm_provider = (hash_win32_cng_close_algorithm_provider_fn)GetProcAddress(hash_prov.prov.cng.dll, "BCryptCloseAlgorithmProvider")) == NULL) { - FreeLibrary(hash_prov.prov.cng.dll); - return -1; - } - - /* Load the SHA1 algorithm */ - if (hash_prov.prov.cng.open_algorithm_provider(&hash_prov.prov.cng.handle, GIT_HASH_CNG_HASH_TYPE, NULL, GIT_HASH_CNG_HASH_REUSABLE) < 0) { - FreeLibrary(hash_prov.prov.cng.dll); - return -1; - } - - /* Get storage space for the hash object */ - if (hash_prov.prov.cng.get_property(hash_prov.prov.cng.handle, GIT_HASH_CNG_HASH_OBJECT_LEN, (PBYTE)&hash_prov.prov.cng.hash_object_size, sizeof(DWORD), &size_len, 0) < 0) { - hash_prov.prov.cng.close_algorithm_provider(hash_prov.prov.cng.handle, 0); - FreeLibrary(hash_prov.prov.cng.dll); - return -1; - } - - hash_prov.type = CNG; - return 0; -} - -GIT_INLINE(void) hash_cng_prov_shutdown(void) -{ - hash_prov.prov.cng.close_algorithm_provider(hash_prov.prov.cng.handle, 0); - FreeLibrary(hash_prov.prov.cng.dll); - - hash_prov.type = INVALID; -} - -/* Initialize CryptoAPI */ -GIT_INLINE(int) hash_cryptoapi_prov_init() -{ - if (!CryptAcquireContext(&hash_prov.prov.cryptoapi.handle, NULL, 0, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT)) - return -1; - - hash_prov.type = CRYPTOAPI; - return 0; -} - -GIT_INLINE(void) hash_cryptoapi_prov_shutdown(void) -{ - CryptReleaseContext(hash_prov.prov.cryptoapi.handle, 0); - - hash_prov.type = INVALID; -} - -static void git_hash_global_shutdown(void) -{ - if (hash_prov.type == CNG) - hash_cng_prov_shutdown(); - else if(hash_prov.type == CRYPTOAPI) - hash_cryptoapi_prov_shutdown(); -} - -int git_hash_global_init(void) -{ - int error = 0; - - if (hash_prov.type != INVALID) - return 0; - - if ((error = hash_cng_prov_init()) < 0) - error = hash_cryptoapi_prov_init(); - - git__on_shutdown(git_hash_global_shutdown); - - return error; -} - -/* CryptoAPI: available in Windows XP and newer */ - -GIT_INLINE(int) hash_ctx_cryptoapi_init(git_hash_ctx *ctx) -{ - ctx->type = CRYPTOAPI; - ctx->prov = &hash_prov; - - return git_hash_init(ctx); -} - -GIT_INLINE(int) hash_cryptoapi_init(git_hash_ctx *ctx) -{ - if (ctx->ctx.cryptoapi.valid) - CryptDestroyHash(ctx->ctx.cryptoapi.hash_handle); - - if (!CryptCreateHash(ctx->prov->prov.cryptoapi.handle, CALG_SHA1, 0, 0, &ctx->ctx.cryptoapi.hash_handle)) { - ctx->ctx.cryptoapi.valid = 0; - return -1; - } - - ctx->ctx.cryptoapi.valid = 1; - return 0; -} - -GIT_INLINE(int) hash_cryptoapi_update(git_hash_ctx *ctx, const void *data, size_t len) -{ - assert(ctx->ctx.cryptoapi.valid); - - if (!CryptHashData(ctx->ctx.cryptoapi.hash_handle, (const BYTE *)data, (DWORD)len, 0)) - return -1; - - return 0; -} - -GIT_INLINE(int) hash_cryptoapi_final(git_oid *out, git_hash_ctx *ctx) -{ - DWORD len = 20; - int error = 0; - - assert(ctx->ctx.cryptoapi.valid); - - if (!CryptGetHashParam(ctx->ctx.cryptoapi.hash_handle, HP_HASHVAL, out->id, &len, 0)) - error = -1; - - CryptDestroyHash(ctx->ctx.cryptoapi.hash_handle); - ctx->ctx.cryptoapi.valid = 0; - - return error; -} - -GIT_INLINE(void) hash_ctx_cryptoapi_cleanup(git_hash_ctx *ctx) -{ - if (ctx->ctx.cryptoapi.valid) - CryptDestroyHash(ctx->ctx.cryptoapi.hash_handle); -} - -/* CNG: Available in Windows Server 2008 and newer */ - -GIT_INLINE(int) hash_ctx_cng_init(git_hash_ctx *ctx) -{ - if ((ctx->ctx.cng.hash_object = git__malloc(hash_prov.prov.cng.hash_object_size)) == NULL) - return -1; - - if (hash_prov.prov.cng.create_hash(hash_prov.prov.cng.handle, &ctx->ctx.cng.hash_handle, ctx->ctx.cng.hash_object, hash_prov.prov.cng.hash_object_size, NULL, 0, 0) < 0) { - git__free(ctx->ctx.cng.hash_object); - return -1; - } - - ctx->type = CNG; - ctx->prov = &hash_prov; - - return 0; -} - -GIT_INLINE(int) hash_cng_init(git_hash_ctx *ctx) -{ - BYTE hash[GIT_OID_RAWSZ]; - - if (!ctx->ctx.cng.updated) - return 0; - - /* CNG needs to be finished to restart */ - if (ctx->prov->prov.cng.finish_hash(ctx->ctx.cng.hash_handle, hash, GIT_OID_RAWSZ, 0) < 0) - return -1; - - ctx->ctx.cng.updated = 0; - - return 0; -} - -GIT_INLINE(int) hash_cng_update(git_hash_ctx *ctx, const void *data, size_t len) -{ - if (ctx->prov->prov.cng.hash_data(ctx->ctx.cng.hash_handle, (PBYTE)data, (ULONG)len, 0) < 0) - return -1; - - return 0; -} - -GIT_INLINE(int) hash_cng_final(git_oid *out, git_hash_ctx *ctx) -{ - if (ctx->prov->prov.cng.finish_hash(ctx->ctx.cng.hash_handle, out->id, GIT_OID_RAWSZ, 0) < 0) - return -1; - - ctx->ctx.cng.updated = 0; - - return 0; -} - -GIT_INLINE(void) hash_ctx_cng_cleanup(git_hash_ctx *ctx) -{ - ctx->prov->prov.cng.destroy_hash(ctx->ctx.cng.hash_handle); - git__free(ctx->ctx.cng.hash_object); -} - -/* Indirection between CryptoAPI and CNG */ - -int git_hash_ctx_init(git_hash_ctx *ctx) -{ - int error = 0; - - assert(ctx); - - /* - * When compiled with GIT_THREADS, the global hash_prov data is - * initialized with git_libgit2_init. Otherwise, it must be initialized - * at first use. - */ - if (hash_prov.type == INVALID && (error = git_hash_global_init()) < 0) - return error; - - memset(ctx, 0x0, sizeof(git_hash_ctx)); - - return (hash_prov.type == CNG) ? hash_ctx_cng_init(ctx) : hash_ctx_cryptoapi_init(ctx); -} - -int git_hash_init(git_hash_ctx *ctx) -{ - assert(ctx && ctx->type); - return (ctx->type == CNG) ? hash_cng_init(ctx) : hash_cryptoapi_init(ctx); -} - -int git_hash_update(git_hash_ctx *ctx, const void *data, size_t len) -{ - assert(ctx && ctx->type); - return (ctx->type == CNG) ? hash_cng_update(ctx, data, len) : hash_cryptoapi_update(ctx, data, len); -} - -int git_hash_final(git_oid *out, git_hash_ctx *ctx) -{ - assert(ctx && ctx->type); - return (ctx->type == CNG) ? hash_cng_final(out, ctx) : hash_cryptoapi_final(out, ctx); -} - -void git_hash_ctx_cleanup(git_hash_ctx *ctx) -{ - assert(ctx); - - if (ctx->type == CNG) - hash_ctx_cng_cleanup(ctx); - else if(ctx->type == CRYPTOAPI) - hash_ctx_cryptoapi_cleanup(ctx); -} diff --git a/vendor/libgit2/src/hash/hash_win32.h b/vendor/libgit2/src/hash/hash_win32.h deleted file mode 100644 index 2eee5ca79..000000000 --- a/vendor/libgit2/src/hash/hash_win32.h +++ /dev/null @@ -1,140 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#ifndef INCLUDE_hash_win32_h__ -#define INCLUDE_hash_win32_h__ - -#include "common.h" -#include "hash.h" - -#include -#include - -enum hash_win32_prov_type { - INVALID = 0, - CRYPTOAPI, - CNG -}; - -/* - * CryptoAPI is available for hashing on Windows XP and newer. - */ - -struct hash_cryptoapi_prov { - HCRYPTPROV handle; -}; - -/* - * CNG (bcrypt.dll) is significantly more performant than CryptoAPI and is - * preferred, however it is only available on Windows 2008 and newer and - * must therefore be dynamically loaded, and we must inline constants that - * would not exist when building in pre-Windows 2008 environments. - */ - -#define GIT_HASH_CNG_DLL_NAME "bcrypt.dll" - -/* BCRYPT_SHA1_ALGORITHM */ -#define GIT_HASH_CNG_HASH_TYPE L"SHA1" - -/* BCRYPT_OBJECT_LENGTH */ -#define GIT_HASH_CNG_HASH_OBJECT_LEN L"ObjectLength" - -/* BCRYPT_HASH_REUSEABLE_FLAGS */ -#define GIT_HASH_CNG_HASH_REUSABLE 0x00000020 - -/* Function declarations for CNG */ -typedef NTSTATUS (WINAPI *hash_win32_cng_open_algorithm_provider_fn)( - HANDLE /* BCRYPT_ALG_HANDLE */ *phAlgorithm, - LPCWSTR pszAlgId, - LPCWSTR pszImplementation, - DWORD dwFlags); - -typedef NTSTATUS (WINAPI *hash_win32_cng_get_property_fn)( - HANDLE /* BCRYPT_HANDLE */ hObject, - LPCWSTR pszProperty, - PUCHAR pbOutput, - ULONG cbOutput, - ULONG *pcbResult, - ULONG dwFlags); - -typedef NTSTATUS (WINAPI *hash_win32_cng_create_hash_fn)( - HANDLE /* BCRYPT_ALG_HANDLE */ hAlgorithm, - HANDLE /* BCRYPT_HASH_HANDLE */ *phHash, - PUCHAR pbHashObject, ULONG cbHashObject, - PUCHAR pbSecret, - ULONG cbSecret, - ULONG dwFlags); - -typedef NTSTATUS (WINAPI *hash_win32_cng_finish_hash_fn)( - HANDLE /* BCRYPT_HASH_HANDLE */ hHash, - PUCHAR pbOutput, - ULONG cbOutput, - ULONG dwFlags); - -typedef NTSTATUS (WINAPI *hash_win32_cng_hash_data_fn)( - HANDLE /* BCRYPT_HASH_HANDLE */ hHash, - PUCHAR pbInput, - ULONG cbInput, - ULONG dwFlags); - -typedef NTSTATUS (WINAPI *hash_win32_cng_destroy_hash_fn)( - HANDLE /* BCRYPT_HASH_HANDLE */ hHash); - -typedef NTSTATUS (WINAPI *hash_win32_cng_close_algorithm_provider_fn)( - HANDLE /* BCRYPT_ALG_HANDLE */ hAlgorithm, - ULONG dwFlags); - -struct hash_cng_prov { - /* DLL for CNG */ - HINSTANCE dll; - - /* Function pointers for CNG */ - hash_win32_cng_open_algorithm_provider_fn open_algorithm_provider; - hash_win32_cng_get_property_fn get_property; - hash_win32_cng_create_hash_fn create_hash; - hash_win32_cng_finish_hash_fn finish_hash; - hash_win32_cng_hash_data_fn hash_data; - hash_win32_cng_destroy_hash_fn destroy_hash; - hash_win32_cng_close_algorithm_provider_fn close_algorithm_provider; - - HANDLE /* BCRYPT_ALG_HANDLE */ handle; - DWORD hash_object_size; -}; - -struct git_hash_prov { - enum hash_win32_prov_type type; - - union { - struct hash_cryptoapi_prov cryptoapi; - struct hash_cng_prov cng; - } prov; -}; - -/* Hash contexts */ - -struct hash_cryptoapi_ctx { - bool valid; - HCRYPTHASH hash_handle; -}; - -struct hash_cng_ctx { - bool updated; - HANDLE /* BCRYPT_HASH_HANDLE */ hash_handle; - PBYTE hash_object; -}; - -struct git_hash_ctx { - enum hash_win32_prov_type type; - git_hash_prov *prov; - - union { - struct hash_cryptoapi_ctx cryptoapi; - struct hash_cng_ctx cng; - } ctx; -}; - -#endif /* INCLUDE_hash_openssl_h__ */ diff --git a/vendor/libgit2/src/hashsig.c b/vendor/libgit2/src/hashsig.c deleted file mode 100644 index e99637d8b..000000000 --- a/vendor/libgit2/src/hashsig.c +++ /dev/null @@ -1,359 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#include "git2/sys/hashsig.h" -#include "fileops.h" -#include "util.h" - -typedef uint32_t hashsig_t; -typedef uint64_t hashsig_state; - -#define HASHSIG_SCALE 100 - -#define HASHSIG_MAX_RUN 80 -#define HASHSIG_HASH_START 0x012345678ABCDEF0LL -#define HASHSIG_HASH_SHIFT 5 - -#define HASHSIG_HASH_MIX(S,CH) \ - (S) = ((S) << HASHSIG_HASH_SHIFT) - (S) + (hashsig_state)(CH) - -#define HASHSIG_HEAP_SIZE ((1 << 7) - 1) -#define HASHSIG_HEAP_MIN_SIZE 4 - -typedef int (*hashsig_cmp)(const void *a, const void *b, void *); - -typedef struct { - int size, asize; - hashsig_cmp cmp; - hashsig_t values[HASHSIG_HEAP_SIZE]; -} hashsig_heap; - -struct git_hashsig { - hashsig_heap mins; - hashsig_heap maxs; - size_t lines; - git_hashsig_option_t opt; -}; - -#define HEAP_LCHILD_OF(I) (((I)<<1)+1) -#define HEAP_RCHILD_OF(I) (((I)<<1)+2) -#define HEAP_PARENT_OF(I) (((I)-1)>>1) - -static void hashsig_heap_init(hashsig_heap *h, hashsig_cmp cmp) -{ - h->size = 0; - h->asize = HASHSIG_HEAP_SIZE; - h->cmp = cmp; -} - -static int hashsig_cmp_max(const void *a, const void *b, void *payload) -{ - hashsig_t av = *(const hashsig_t *)a, bv = *(const hashsig_t *)b; - GIT_UNUSED(payload); - return (av < bv) ? -1 : (av > bv) ? 1 : 0; -} - -static int hashsig_cmp_min(const void *a, const void *b, void *payload) -{ - hashsig_t av = *(const hashsig_t *)a, bv = *(const hashsig_t *)b; - GIT_UNUSED(payload); - return (av > bv) ? -1 : (av < bv) ? 1 : 0; -} - -static void hashsig_heap_up(hashsig_heap *h, int el) -{ - int parent_el = HEAP_PARENT_OF(el); - - while (el > 0 && h->cmp(&h->values[parent_el], &h->values[el], NULL) > 0) { - hashsig_t t = h->values[el]; - h->values[el] = h->values[parent_el]; - h->values[parent_el] = t; - - el = parent_el; - parent_el = HEAP_PARENT_OF(el); - } -} - -static void hashsig_heap_down(hashsig_heap *h, int el) -{ - hashsig_t v, lv, rv; - - /* 'el < h->size / 2' tests if el is bottom row of heap */ - - while (el < h->size / 2) { - int lel = HEAP_LCHILD_OF(el), rel = HEAP_RCHILD_OF(el), swapel; - - v = h->values[el]; - lv = h->values[lel]; - rv = h->values[rel]; - - if (h->cmp(&v, &lv, NULL) < 0 && h->cmp(&v, &rv, NULL) < 0) - break; - - swapel = (h->cmp(&lv, &rv, NULL) < 0) ? lel : rel; - - h->values[el] = h->values[swapel]; - h->values[swapel] = v; - - el = swapel; - } -} - -static void hashsig_heap_sort(hashsig_heap *h) -{ - /* only need to do this at the end for signature comparison */ - git__qsort_r(h->values, h->size, sizeof(hashsig_t), h->cmp, NULL); -} - -static void hashsig_heap_insert(hashsig_heap *h, hashsig_t val) -{ - /* if heap is not full, insert new element */ - if (h->size < h->asize) { - h->values[h->size++] = val; - hashsig_heap_up(h, h->size - 1); - } - - /* if heap is full, pop top if new element should replace it */ - else if (h->cmp(&val, &h->values[0], NULL) > 0) { - h->size--; - h->values[0] = h->values[h->size]; - hashsig_heap_down(h, 0); - } - -} - -typedef struct { - int use_ignores; - uint8_t ignore_ch[256]; -} hashsig_in_progress; - -static void hashsig_in_progress_init( - hashsig_in_progress *prog, git_hashsig *sig) -{ - int i; - - /* no more than one can be set */ - assert(!(sig->opt & GIT_HASHSIG_IGNORE_WHITESPACE) || - !(sig->opt & GIT_HASHSIG_SMART_WHITESPACE)); - - if (sig->opt & GIT_HASHSIG_IGNORE_WHITESPACE) { - for (i = 0; i < 256; ++i) - prog->ignore_ch[i] = git__isspace_nonlf(i); - prog->use_ignores = 1; - } else if (sig->opt & GIT_HASHSIG_SMART_WHITESPACE) { - for (i = 0; i < 256; ++i) - prog->ignore_ch[i] = git__isspace(i); - prog->use_ignores = 1; - } else { - memset(prog, 0, sizeof(*prog)); - } -} - -static int hashsig_add_hashes( - git_hashsig *sig, - const uint8_t *data, - size_t size, - hashsig_in_progress *prog) -{ - const uint8_t *scan = data, *end = data + size; - hashsig_state state = HASHSIG_HASH_START; - int use_ignores = prog->use_ignores, len; - uint8_t ch; - - while (scan < end) { - state = HASHSIG_HASH_START; - - for (len = 0; scan < end && len < HASHSIG_MAX_RUN; ) { - ch = *scan; - - if (use_ignores) - for (; scan < end && git__isspace_nonlf(ch); ch = *scan) - ++scan; - else if (sig->opt & - (GIT_HASHSIG_IGNORE_WHITESPACE | GIT_HASHSIG_SMART_WHITESPACE)) - for (; scan < end && ch == '\r'; ch = *scan) - ++scan; - - /* peek at next character to decide what to do next */ - if (sig->opt & GIT_HASHSIG_SMART_WHITESPACE) - use_ignores = (ch == '\n'); - - if (scan >= end) - break; - ++scan; - - /* check run terminator */ - if (ch == '\n' || ch == '\0') { - sig->lines++; - break; - } - - ++len; - HASHSIG_HASH_MIX(state, ch); - } - - if (len > 0) { - hashsig_heap_insert(&sig->mins, (hashsig_t)state); - hashsig_heap_insert(&sig->maxs, (hashsig_t)state); - - while (scan < end && (*scan == '\n' || !*scan)) - ++scan; - } - } - - prog->use_ignores = use_ignores; - - return 0; -} - -static int hashsig_finalize_hashes(git_hashsig *sig) -{ - if (sig->mins.size < HASHSIG_HEAP_MIN_SIZE && - !(sig->opt & GIT_HASHSIG_ALLOW_SMALL_FILES)) { - giterr_set(GITERR_INVALID, - "File too small for similarity signature calculation"); - return GIT_EBUFS; - } - - hashsig_heap_sort(&sig->mins); - hashsig_heap_sort(&sig->maxs); - - return 0; -} - -static git_hashsig *hashsig_alloc(git_hashsig_option_t opts) -{ - git_hashsig *sig = git__calloc(1, sizeof(git_hashsig)); - if (!sig) - return NULL; - - hashsig_heap_init(&sig->mins, hashsig_cmp_min); - hashsig_heap_init(&sig->maxs, hashsig_cmp_max); - sig->opt = opts; - - return sig; -} - -int git_hashsig_create( - git_hashsig **out, - const char *buf, - size_t buflen, - git_hashsig_option_t opts) -{ - int error; - hashsig_in_progress prog; - git_hashsig *sig = hashsig_alloc(opts); - GITERR_CHECK_ALLOC(sig); - - hashsig_in_progress_init(&prog, sig); - - error = hashsig_add_hashes(sig, (const uint8_t *)buf, buflen, &prog); - - if (!error) - error = hashsig_finalize_hashes(sig); - - if (!error) - *out = sig; - else - git_hashsig_free(sig); - - return error; -} - -int git_hashsig_create_fromfile( - git_hashsig **out, - const char *path, - git_hashsig_option_t opts) -{ - uint8_t buf[0x1000]; - ssize_t buflen = 0; - int error = 0, fd; - hashsig_in_progress prog; - git_hashsig *sig = hashsig_alloc(opts); - GITERR_CHECK_ALLOC(sig); - - if ((fd = git_futils_open_ro(path)) < 0) { - git__free(sig); - return fd; - } - - hashsig_in_progress_init(&prog, sig); - - while (!error) { - if ((buflen = p_read(fd, buf, sizeof(buf))) <= 0) { - if ((error = (int)buflen) < 0) - giterr_set(GITERR_OS, - "Read error on '%s' calculating similarity hashes", path); - break; - } - - error = hashsig_add_hashes(sig, buf, buflen, &prog); - } - - p_close(fd); - - if (!error) - error = hashsig_finalize_hashes(sig); - - if (!error) - *out = sig; - else - git_hashsig_free(sig); - - return error; -} - -void git_hashsig_free(git_hashsig *sig) -{ - git__free(sig); -} - -static int hashsig_heap_compare(const hashsig_heap *a, const hashsig_heap *b) -{ - int matches = 0, i, j, cmp; - - assert(a->cmp == b->cmp); - - /* hash heaps are sorted - just look for overlap vs total */ - - for (i = 0, j = 0; i < a->size && j < b->size; ) { - cmp = a->cmp(&a->values[i], &b->values[j], NULL); - - if (cmp < 0) - ++i; - else if (cmp > 0) - ++j; - else { - ++i; ++j; ++matches; - } - } - - return HASHSIG_SCALE * (matches * 2) / (a->size + b->size); -} - -int git_hashsig_compare(const git_hashsig *a, const git_hashsig *b) -{ - /* if we have no elements in either file then each file is either - * empty or blank. if we're ignoring whitespace then the files are - * similar, otherwise they're dissimilar. - */ - if (a->mins.size == 0 && b->mins.size == 0) { - if ((!a->lines && !b->lines) || - (a->opt & GIT_HASHSIG_IGNORE_WHITESPACE)) - return HASHSIG_SCALE; - else - return 0; - } - - /* if we have fewer than the maximum number of elements, then just use - * one array since the two arrays will be the same - */ - if (a->mins.size < HASHSIG_HEAP_SIZE) - return hashsig_heap_compare(&a->mins, &b->mins); - else - return (hashsig_heap_compare(&a->mins, &b->mins) + - hashsig_heap_compare(&a->maxs, &b->maxs)) / 2; -} diff --git a/vendor/libgit2/src/ident.c b/vendor/libgit2/src/ident.c deleted file mode 100644 index 4718ed664..000000000 --- a/vendor/libgit2/src/ident.c +++ /dev/null @@ -1,127 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "git2/sys/filter.h" -#include "filter.h" -#include "buffer.h" -#include "buf_text.h" - -static int ident_find_id( - const char **id_start, const char **id_end, const char *start, size_t len) -{ - const char *end = start + len, *found = NULL; - - while (len > 3 && (found = memchr(start, '$', len)) != NULL) { - size_t remaining = (size_t)(end - found) - 1; - if (remaining < 3) - return GIT_ENOTFOUND; - - start = found + 1; - len = remaining; - - if (start[0] == 'I' && start[1] == 'd') - break; - } - - if (len < 3 || !found) - return GIT_ENOTFOUND; - *id_start = found; - - if ((found = memchr(start + 2, '$', len - 2)) == NULL) - return GIT_ENOTFOUND; - - *id_end = found + 1; - return 0; -} - -static int ident_insert_id( - git_buf *to, const git_buf *from, const git_filter_source *src) -{ - char oid[GIT_OID_HEXSZ+1]; - const char *id_start, *id_end, *from_end = from->ptr + from->size; - size_t need_size; - - /* replace $Id$ with blob id */ - - if (!git_filter_source_id(src)) - return GIT_PASSTHROUGH; - - git_oid_tostr(oid, sizeof(oid), git_filter_source_id(src)); - - if (ident_find_id(&id_start, &id_end, from->ptr, from->size) < 0) - return GIT_PASSTHROUGH; - - need_size = (size_t)(id_start - from->ptr) + - 5 /* "$Id: " */ + GIT_OID_HEXSZ + 2 /* " $" */ + - (size_t)(from_end - id_end); - - if (git_buf_grow(to, need_size) < 0) - return -1; - - git_buf_set(to, from->ptr, (size_t)(id_start - from->ptr)); - git_buf_put(to, "$Id: ", 5); - git_buf_put(to, oid, GIT_OID_HEXSZ); - git_buf_put(to, " $", 2); - git_buf_put(to, id_end, (size_t)(from_end - id_end)); - - return git_buf_oom(to) ? -1 : 0; -} - -static int ident_remove_id( - git_buf *to, const git_buf *from) -{ - const char *id_start, *id_end, *from_end = from->ptr + from->size; - size_t need_size; - - if (ident_find_id(&id_start, &id_end, from->ptr, from->size) < 0) - return GIT_PASSTHROUGH; - - need_size = (size_t)(id_start - from->ptr) + - 4 /* "$Id$" */ + (size_t)(from_end - id_end); - - if (git_buf_grow(to, need_size) < 0) - return -1; - - git_buf_set(to, from->ptr, (size_t)(id_start - from->ptr)); - git_buf_put(to, "$Id$", 4); - git_buf_put(to, id_end, (size_t)(from_end - id_end)); - - return git_buf_oom(to) ? -1 : 0; -} - -static int ident_apply( - git_filter *self, - void **payload, - git_buf *to, - const git_buf *from, - const git_filter_source *src) -{ - GIT_UNUSED(self); GIT_UNUSED(payload); - - /* Don't filter binary files */ - if (git_buf_text_is_binary(from)) - return GIT_PASSTHROUGH; - - if (git_filter_source_mode(src) == GIT_FILTER_SMUDGE) - return ident_insert_id(to, from, src); - else - return ident_remove_id(to, from); -} - -git_filter *git_ident_filter_new(void) -{ - git_filter *f = git__calloc(1, sizeof(git_filter)); - if (f == NULL) - return NULL; - - f->version = GIT_FILTER_VERSION; - f->attributes = "+ident"; /* apply to files with ident attribute set */ - f->shutdown = git_filter_free; - f->apply = ident_apply; - - return f; -} diff --git a/vendor/libgit2/src/idxmap.h b/vendor/libgit2/src/idxmap.h deleted file mode 100644 index 4122a89fe..000000000 --- a/vendor/libgit2/src/idxmap.h +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_idxmap_h__ -#define INCLUDE_idxmap_h__ - -#include -#include "common.h" -#include "git2/index.h" - -#define kmalloc git__malloc -#define kcalloc git__calloc -#define krealloc git__realloc -#define kreallocarray git__reallocarray -#define kfree git__free -#include "khash.h" - -__KHASH_TYPE(idx, const git_index_entry *, git_index_entry *) -__KHASH_TYPE(idxicase, const git_index_entry *, git_index_entry *) - -typedef khash_t(idx) git_idxmap; -typedef khash_t(idxicase) git_idxmap_icase; - -typedef khiter_t git_idxmap_iter; - -/* This is __ac_X31_hash_string but with tolower and it takes the entry's stage into account */ -static kh_inline khint_t idxentry_hash(const git_index_entry *e) -{ - const char *s = e->path; - khint_t h = (khint_t)git__tolower(*s); - if (h) for (++s ; *s; ++s) h = (h << 5) - h + (khint_t)git__tolower(*s); - return h + GIT_IDXENTRY_STAGE(e); -} - -#define idxentry_equal(a, b) (GIT_IDXENTRY_STAGE(a) == GIT_IDXENTRY_STAGE(b) && strcmp(a->path, b->path) == 0) -#define idxentry_icase_equal(a, b) (GIT_IDXENTRY_STAGE(a) == GIT_IDXENTRY_STAGE(b) && strcasecmp(a->path, b->path) == 0) - -#define GIT__USE_IDXMAP \ - __KHASH_IMPL(idx, static kh_inline, const git_index_entry *, git_index_entry *, 1, idxentry_hash, idxentry_equal) - -#define GIT__USE_IDXMAP_ICASE \ - __KHASH_IMPL(idxicase, static kh_inline, const git_index_entry *, git_index_entry *, 1, idxentry_hash, idxentry_icase_equal) - -#define git_idxmap_alloc(hp) \ - ((*(hp) = kh_init(idx)) == NULL) ? giterr_set_oom(), -1 : 0 - -#define git_idxmap_icase_alloc(hp) \ - ((*(hp) = kh_init(idxicase)) == NULL) ? giterr_set_oom(), -1 : 0 - -#define git_idxmap_insert(h, key, val, rval) do { \ - khiter_t __pos = kh_put(idx, h, key, &rval); \ - if (rval >= 0) { \ - if (rval == 0) kh_key(h, __pos) = key; \ - kh_val(h, __pos) = val; \ - } } while (0) - -#define git_idxmap_icase_insert(h, key, val, rval) do { \ - khiter_t __pos = kh_put(idxicase, h, key, &rval); \ - if (rval >= 0) { \ - if (rval == 0) kh_key(h, __pos) = key; \ - kh_val(h, __pos) = val; \ - } } while (0) - -#define git_idxmap_lookup_index(h, k) kh_get(idx, h, k) -#define git_idxmap_icase_lookup_index(h, k) kh_get(idxicase, h, k) -#define git_idxmap_value_at(h, idx) kh_val(h, idx) -#define git_idxmap_valid_index(h, idx) (idx != kh_end(h)) -#define git_idxmap_has_data(h, idx) kh_exist(h, idx) - -#define git_idxmap_resize(h,s) kh_resize(idx, h, s) -#define git_idxmap_free(h) kh_destroy(idx, h), h = NULL -#define git_idxmap_clear(h) kh_clear(idx, h) - -#define git_idxmap_delete_at(h, id) kh_del(idx, h, id) -#define git_idxmap_icase_delete_at(h, id) kh_del(idxicase, h, id) - -#define git_idxmap_delete(h, key) do { \ - khiter_t __pos = git_idxmap_lookup_index(h, key); \ - if (git_idxmap_valid_index(h, __pos)) \ - git_idxmap_delete_at(h, __pos); } while (0) - -#define git_idxmap_icase_delete(h, key) do { \ - khiter_t __pos = git_idxmap_icase_lookup_index(h, key); \ - if (git_idxmap_valid_index(h, __pos)) \ - git_idxmap_icase_delete_at(h, __pos); } while (0) - -#define git_idxmap_begin kh_begin -#define git_idxmap_end kh_end - -#endif diff --git a/vendor/libgit2/src/ignore.c b/vendor/libgit2/src/ignore.c deleted file mode 100644 index ac2af4f58..000000000 --- a/vendor/libgit2/src/ignore.c +++ /dev/null @@ -1,583 +0,0 @@ -#include "git2/ignore.h" -#include "common.h" -#include "ignore.h" -#include "attrcache.h" -#include "path.h" -#include "config.h" -#include "fnmatch.h" - -#define GIT_IGNORE_INTERNAL "[internal]exclude" - -#define GIT_IGNORE_DEFAULT_RULES ".\n..\n.git\n" - -/** - * A negative ignore pattern can match a positive one without - * wildcards if its pattern equals the tail of the positive - * pattern. Thus - * - * foo/bar - * !bar - * - * would result in foo/bar being unignored again. - */ -static int does_negate_pattern(git_attr_fnmatch *rule, git_attr_fnmatch *neg) -{ - char *p; - - if ((rule->flags & GIT_ATTR_FNMATCH_NEGATIVE) == 0 - && (neg->flags & GIT_ATTR_FNMATCH_NEGATIVE) != 0) { - /* - * no chance of matching if rule is shorter than - * the negated one - */ - if (rule->length < neg->length) - return false; - - /* - * shift pattern so its tail aligns with the - * negated pattern - */ - p = rule->pattern + rule->length - neg->length; - if (strcmp(p, neg->pattern) == 0) - return true; - } - - return false; -} - -/** - * A negative ignore can only unignore a file which is given explicitly before, thus - * - * foo - * !foo/bar - * - * does not unignore 'foo/bar' as it's not in the list. However - * - * foo/ - * !foo/bar - * - * does unignore 'foo/bar', as it is contained within the 'foo/' rule. - */ -static int does_negate_rule(int *out, git_vector *rules, git_attr_fnmatch *match) -{ - int error = 0; - size_t i; - git_attr_fnmatch *rule; - char *path; - git_buf buf = GIT_BUF_INIT; - - *out = 0; - - /* path of the file relative to the workdir, so we match the rules in subdirs */ - if (match->containing_dir) { - git_buf_puts(&buf, match->containing_dir); - } - if (git_buf_puts(&buf, match->pattern) < 0) - return -1; - - path = git_buf_detach(&buf); - - git_vector_foreach(rules, i, rule) { - if (!(rule->flags & GIT_ATTR_FNMATCH_HASWILD)) { - if (does_negate_pattern(rule, match)) { - error = 0; - *out = 1; - goto out; - } - else - continue; - } - - /* - * When dealing with a directory, we add '/' so - * p_fnmatch() honours FNM_PATHNAME. Checking for LEADINGDIR - * alone isn't enough as that's also set for nagations, so we - * need to check that NEGATIVE is off. - */ - git_buf_clear(&buf); - if (rule->containing_dir) { - git_buf_puts(&buf, rule->containing_dir); - } - - error = git_buf_puts(&buf, rule->pattern); - - if ((rule->flags & (GIT_ATTR_FNMATCH_LEADINGDIR | GIT_ATTR_FNMATCH_NEGATIVE)) == GIT_ATTR_FNMATCH_LEADINGDIR) - error = git_buf_PUTS(&buf, "/*"); - - if (error < 0) - goto out; - - if ((error = p_fnmatch(git_buf_cstr(&buf), path, FNM_PATHNAME)) < 0) { - giterr_set(GITERR_INVALID, "error matching pattern"); - goto out; - } - - /* if we found a match, we want to keep this rule */ - if (error != FNM_NOMATCH) { - *out = 1; - error = 0; - goto out; - } - } - - error = 0; - -out: - git__free(path); - git_buf_free(&buf); - return error; -} - -static int parse_ignore_file( - git_repository *repo, git_attr_file *attrs, const char *data) -{ - int error = 0; - int ignore_case = false; - const char *scan = data, *context = NULL; - git_attr_fnmatch *match = NULL; - - if (git_repository__cvar(&ignore_case, repo, GIT_CVAR_IGNORECASE) < 0) - giterr_clear(); - - /* if subdir file path, convert context for file paths */ - if (attrs->entry && - git_path_root(attrs->entry->path) < 0 && - !git__suffixcmp(attrs->entry->path, "/" GIT_IGNORE_FILE)) - context = attrs->entry->path; - - if (git_mutex_lock(&attrs->lock) < 0) { - giterr_set(GITERR_OS, "Failed to lock ignore file"); - return -1; - } - - while (!error && *scan) { - int valid_rule = 1; - - if (!match && !(match = git__calloc(1, sizeof(*match)))) { - error = -1; - break; - } - - match->flags = GIT_ATTR_FNMATCH_ALLOWSPACE | GIT_ATTR_FNMATCH_ALLOWNEG; - - if (!(error = git_attr_fnmatch__parse( - match, &attrs->pool, context, &scan))) - { - match->flags |= GIT_ATTR_FNMATCH_IGNORE; - - if (ignore_case) - match->flags |= GIT_ATTR_FNMATCH_ICASE; - - scan = git__next_line(scan); - - /* if a negative match doesn't actually do anything, throw it away */ - if (match->flags & GIT_ATTR_FNMATCH_NEGATIVE) - error = does_negate_rule(&valid_rule, &attrs->rules, match); - - if (!error && valid_rule) - error = git_vector_insert(&attrs->rules, match); - } - - if (error != 0 || !valid_rule) { - match->pattern = NULL; - - if (error == GIT_ENOTFOUND) - error = 0; - } else { - match = NULL; /* vector now "owns" the match */ - } - } - - git_mutex_unlock(&attrs->lock); - git__free(match); - - return error; -} - -static int push_ignore_file( - git_ignores *ignores, - git_vector *which_list, - const char *base, - const char *filename) -{ - int error = 0; - git_attr_file *file = NULL; - - error = git_attr_cache__get( - &file, ignores->repo, NULL, GIT_ATTR_FILE__FROM_FILE, - base, filename, parse_ignore_file); - if (error < 0) - return error; - - if (file != NULL) { - if ((error = git_vector_insert(which_list, file)) < 0) - git_attr_file__free(file); - } - - return error; -} - -static int push_one_ignore(void *payload, const char *path) -{ - git_ignores *ign = payload; - ign->depth++; - return push_ignore_file(ign, &ign->ign_path, path, GIT_IGNORE_FILE); -} - -static int get_internal_ignores(git_attr_file **out, git_repository *repo) -{ - int error; - - if ((error = git_attr_cache__init(repo)) < 0) - return error; - - error = git_attr_cache__get( - out, repo, NULL, GIT_ATTR_FILE__IN_MEMORY, NULL, GIT_IGNORE_INTERNAL, NULL); - - /* if internal rules list is empty, insert default rules */ - if (!error && !(*out)->rules.length) - error = parse_ignore_file(repo, *out, GIT_IGNORE_DEFAULT_RULES); - - return error; -} - -int git_ignore__for_path( - git_repository *repo, - const char *path, - git_ignores *ignores) -{ - int error = 0; - const char *workdir = git_repository_workdir(repo); - - assert(ignores && path); - - memset(ignores, 0, sizeof(*ignores)); - ignores->repo = repo; - - /* Read the ignore_case flag */ - if ((error = git_repository__cvar( - &ignores->ignore_case, repo, GIT_CVAR_IGNORECASE)) < 0) - goto cleanup; - - if ((error = git_attr_cache__init(repo)) < 0) - goto cleanup; - - /* given a unrooted path in a non-bare repo, resolve it */ - if (workdir && git_path_root(path) < 0) { - git_buf local = GIT_BUF_INIT; - - if ((error = git_path_dirname_r(&local, path)) < 0 || - (error = git_path_resolve_relative(&local, 0)) < 0 || - (error = git_path_to_dir(&local)) < 0 || - (error = git_buf_joinpath(&ignores->dir, workdir, local.ptr)) < 0) - {;} /* Nothing, we just want to stop on the first error */ - git_buf_free(&local); - } else { - error = git_buf_joinpath(&ignores->dir, path, ""); - } - if (error < 0) - goto cleanup; - - if (workdir && !git__prefixcmp(ignores->dir.ptr, workdir)) - ignores->dir_root = strlen(workdir); - - /* set up internals */ - if ((error = get_internal_ignores(&ignores->ign_internal, repo)) < 0) - goto cleanup; - - /* load .gitignore up the path */ - if (workdir != NULL) { - error = git_path_walk_up( - &ignores->dir, workdir, push_one_ignore, ignores); - if (error < 0) - goto cleanup; - } - - /* load .git/info/exclude */ - error = push_ignore_file( - ignores, &ignores->ign_global, - git_repository_path(repo), GIT_IGNORE_FILE_INREPO); - if (error < 0) - goto cleanup; - - /* load core.excludesfile */ - if (git_repository_attr_cache(repo)->cfg_excl_file != NULL) - error = push_ignore_file( - ignores, &ignores->ign_global, NULL, - git_repository_attr_cache(repo)->cfg_excl_file); - -cleanup: - if (error < 0) - git_ignore__free(ignores); - - return error; -} - -int git_ignore__push_dir(git_ignores *ign, const char *dir) -{ - if (git_buf_joinpath(&ign->dir, ign->dir.ptr, dir) < 0) - return -1; - - ign->depth++; - - return push_ignore_file( - ign, &ign->ign_path, ign->dir.ptr, GIT_IGNORE_FILE); -} - -int git_ignore__pop_dir(git_ignores *ign) -{ - if (ign->ign_path.length > 0) { - git_attr_file *file = git_vector_last(&ign->ign_path); - const char *start = file->entry->path, *end; - - /* - ign->dir looks something like "/home/user/a/b/" (or "a/b/c/d/") - * - file->path looks something like "a/b/.gitignore - * - * We are popping the last directory off ign->dir. We also want - * to remove the file from the vector if the popped directory - * matches the ignore path. We need to test if the "a/b" part of - * the file key matches the path we are about to pop. - */ - - if ((end = strrchr(start, '/')) != NULL) { - size_t dirlen = (end - start) + 1; - const char *relpath = ign->dir.ptr + ign->dir_root; - size_t pathlen = ign->dir.size - ign->dir_root; - - if (pathlen == dirlen && !memcmp(relpath, start, dirlen)) { - git_vector_pop(&ign->ign_path); - git_attr_file__free(file); - } - } - } - - if (--ign->depth > 0) { - git_buf_rtruncate_at_char(&ign->dir, '/'); - git_path_to_dir(&ign->dir); - } - - return 0; -} - -void git_ignore__free(git_ignores *ignores) -{ - unsigned int i; - git_attr_file *file; - - git_attr_file__free(ignores->ign_internal); - - git_vector_foreach(&ignores->ign_path, i, file) { - git_attr_file__free(file); - ignores->ign_path.contents[i] = NULL; - } - git_vector_free(&ignores->ign_path); - - git_vector_foreach(&ignores->ign_global, i, file) { - git_attr_file__free(file); - ignores->ign_global.contents[i] = NULL; - } - git_vector_free(&ignores->ign_global); - - git_buf_free(&ignores->dir); -} - -static bool ignore_lookup_in_rules( - int *ignored, git_attr_file *file, git_attr_path *path) -{ - size_t j; - git_attr_fnmatch *match; - - git_vector_rforeach(&file->rules, j, match) { - if (git_attr_fnmatch__match(match, path)) { - *ignored = ((match->flags & GIT_ATTR_FNMATCH_NEGATIVE) == 0) ? - GIT_IGNORE_TRUE : GIT_IGNORE_FALSE; - return true; - } - } - - return false; -} - -int git_ignore__lookup( - int *out, git_ignores *ignores, const char *pathname, git_dir_flag dir_flag) -{ - unsigned int i; - git_attr_file *file; - git_attr_path path; - - *out = GIT_IGNORE_NOTFOUND; - - if (git_attr_path__init( - &path, pathname, git_repository_workdir(ignores->repo), dir_flag) < 0) - return -1; - - /* first process builtins - success means path was found */ - if (ignore_lookup_in_rules(out, ignores->ign_internal, &path)) - goto cleanup; - - /* next process files in the path */ - git_vector_foreach(&ignores->ign_path, i, file) { - if (ignore_lookup_in_rules(out, file, &path)) - goto cleanup; - } - - /* last process global ignores */ - git_vector_foreach(&ignores->ign_global, i, file) { - if (ignore_lookup_in_rules(out, file, &path)) - goto cleanup; - } - -cleanup: - git_attr_path__free(&path); - return 0; -} - -int git_ignore_add_rule(git_repository *repo, const char *rules) -{ - int error; - git_attr_file *ign_internal = NULL; - - if ((error = get_internal_ignores(&ign_internal, repo)) < 0) - return error; - - error = parse_ignore_file(repo, ign_internal, rules); - git_attr_file__free(ign_internal); - - return error; -} - -int git_ignore_clear_internal_rules(git_repository *repo) -{ - int error; - git_attr_file *ign_internal; - - if ((error = get_internal_ignores(&ign_internal, repo)) < 0) - return error; - - if (!(error = git_attr_file__clear_rules(ign_internal, true))) - error = parse_ignore_file( - repo, ign_internal, GIT_IGNORE_DEFAULT_RULES); - - git_attr_file__free(ign_internal); - return error; -} - -int git_ignore_path_is_ignored( - int *ignored, - git_repository *repo, - const char *pathname) -{ - int error; - const char *workdir; - git_attr_path path; - git_ignores ignores; - unsigned int i; - git_attr_file *file; - - assert(ignored && pathname); - - workdir = repo ? git_repository_workdir(repo) : NULL; - - memset(&path, 0, sizeof(path)); - memset(&ignores, 0, sizeof(ignores)); - - if ((error = git_attr_path__init(&path, pathname, workdir, GIT_DIR_FLAG_UNKNOWN)) < 0 || - (error = git_ignore__for_path(repo, path.path, &ignores)) < 0) - goto cleanup; - - while (1) { - /* first process builtins - success means path was found */ - if (ignore_lookup_in_rules(ignored, ignores.ign_internal, &path)) - goto cleanup; - - /* next process files in the path */ - git_vector_foreach(&ignores.ign_path, i, file) { - if (ignore_lookup_in_rules(ignored, file, &path)) - goto cleanup; - } - - /* last process global ignores */ - git_vector_foreach(&ignores.ign_global, i, file) { - if (ignore_lookup_in_rules(ignored, file, &path)) - goto cleanup; - } - - /* move up one directory */ - if (path.basename == path.path) - break; - path.basename[-1] = '\0'; - while (path.basename > path.path && *path.basename != '/') - path.basename--; - if (path.basename > path.path) - path.basename++; - path.is_dir = 1; - - if ((error = git_ignore__pop_dir(&ignores)) < 0) - break; - } - - *ignored = 0; - -cleanup: - git_attr_path__free(&path); - git_ignore__free(&ignores); - return error; -} - -int git_ignore__check_pathspec_for_exact_ignores( - git_repository *repo, - git_vector *vspec, - bool no_fnmatch) -{ - int error = 0; - size_t i; - git_attr_fnmatch *match; - int ignored; - git_buf path = GIT_BUF_INIT; - const char *wd, *filename; - git_index *idx; - - if ((error = git_repository__ensure_not_bare( - repo, "validate pathspec")) < 0 || - (error = git_repository_index(&idx, repo)) < 0) - return error; - - wd = git_repository_workdir(repo); - - git_vector_foreach(vspec, i, match) { - /* skip wildcard matches (if they are being used) */ - if ((match->flags & GIT_ATTR_FNMATCH_HASWILD) != 0 && - !no_fnmatch) - continue; - - filename = match->pattern; - - /* if file is already in the index, it's fine */ - if (git_index_get_bypath(idx, filename, 0) != NULL) - continue; - - if ((error = git_buf_joinpath(&path, wd, filename)) < 0) - break; - - /* is there a file on disk that matches this exactly? */ - if (!git_path_isfile(path.ptr)) - continue; - - /* is that file ignored? */ - if ((error = git_ignore_path_is_ignored(&ignored, repo, filename)) < 0) - break; - - if (ignored) { - giterr_set(GITERR_INVALID, "pathspec contains ignored file '%s'", - filename); - error = GIT_EINVALIDSPEC; - break; - } - } - - git_index_free(idx); - git_buf_free(&path); - - return error; -} - diff --git a/vendor/libgit2/src/ignore.h b/vendor/libgit2/src/ignore.h deleted file mode 100644 index d40bd60f9..000000000 --- a/vendor/libgit2/src/ignore.h +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_ignore_h__ -#define INCLUDE_ignore_h__ - -#include "repository.h" -#include "vector.h" -#include "attr_file.h" - -#define GIT_IGNORE_FILE ".gitignore" -#define GIT_IGNORE_FILE_INREPO "info/exclude" -#define GIT_IGNORE_FILE_XDG "ignore" - -/* The git_ignores structure maintains three sets of ignores: - * - internal ignores - * - per directory ignores - * - global ignores (at lower priority than the others) - * As you traverse from one directory to another, you can push and pop - * directories onto git_ignores list efficiently. - */ -typedef struct { - git_repository *repo; - git_buf dir; /* current directory reflected in ign_path */ - git_attr_file *ign_internal; - git_vector ign_path; - git_vector ign_global; - size_t dir_root; /* offset in dir to repo root */ - int ignore_case; - int depth; -} git_ignores; - -extern int git_ignore__for_path( - git_repository *repo, const char *path, git_ignores *ign); - -extern int git_ignore__push_dir(git_ignores *ign, const char *dir); - -extern int git_ignore__pop_dir(git_ignores *ign); - -extern void git_ignore__free(git_ignores *ign); - -enum { - GIT_IGNORE_UNCHECKED = -2, - GIT_IGNORE_NOTFOUND = -1, - GIT_IGNORE_FALSE = 0, - GIT_IGNORE_TRUE = 1, -}; - -extern int git_ignore__lookup(int *out, git_ignores *ign, const char *path, git_dir_flag dir_flag); - -/* command line Git sometimes generates an error message if given a - * pathspec that contains an exact match to an ignored file (provided - * --force isn't also given). This makes it easy to check it that has - * happened. Returns GIT_EINVALIDSPEC if the pathspec contains ignored - * exact matches (that are not already present in the index). - */ -extern int git_ignore__check_pathspec_for_exact_ignores( - git_repository *repo, git_vector *pathspec, bool no_fnmatch); - -#endif diff --git a/vendor/libgit2/src/index.c b/vendor/libgit2/src/index.c deleted file mode 100644 index 63e47965a..000000000 --- a/vendor/libgit2/src/index.c +++ /dev/null @@ -1,3426 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include - -#include "common.h" -#include "repository.h" -#include "index.h" -#include "tree.h" -#include "tree-cache.h" -#include "hash.h" -#include "iterator.h" -#include "pathspec.h" -#include "ignore.h" -#include "blob.h" -#include "idxmap.h" -#include "diff.h" - -#include "git2/odb.h" -#include "git2/oid.h" -#include "git2/blob.h" -#include "git2/config.h" -#include "git2/sys/index.h" - -GIT__USE_IDXMAP -GIT__USE_IDXMAP_ICASE - -#define INSERT_IN_MAP_EX(idx, map, e, err) do { \ - if ((idx)->ignore_case) \ - git_idxmap_icase_insert((khash_t(idxicase) *) (map), (e), (e), (err)); \ - else \ - git_idxmap_insert((map), (e), (e), (err)); \ - } while (0) - -#define INSERT_IN_MAP(idx, e, err) INSERT_IN_MAP_EX(idx, (idx)->entries_map, e, err) - -#define LOOKUP_IN_MAP(p, idx, k) do { \ - if ((idx)->ignore_case) \ - (p) = git_idxmap_icase_lookup_index((khash_t(idxicase) *) index->entries_map, (k)); \ - else \ - (p) = git_idxmap_lookup_index(index->entries_map, (k)); \ - } while (0) - -#define DELETE_IN_MAP(idx, e) do { \ - if ((idx)->ignore_case) \ - git_idxmap_icase_delete((khash_t(idxicase) *) (idx)->entries_map, (e)); \ - else \ - git_idxmap_delete((idx)->entries_map, (e)); \ - } while (0) - -static int index_apply_to_wd_diff(git_index *index, int action, const git_strarray *paths, - unsigned int flags, - git_index_matched_path_cb cb, void *payload); - -#define entry_size(type,len) ((offsetof(type, path) + (len) + 8) & ~7) -#define short_entry_size(len) entry_size(struct entry_short, len) -#define long_entry_size(len) entry_size(struct entry_long, len) - -#define minimal_entry_size (offsetof(struct entry_short, path)) - -static const size_t INDEX_FOOTER_SIZE = GIT_OID_RAWSZ; -static const size_t INDEX_HEADER_SIZE = 12; - -static const unsigned int INDEX_VERSION_NUMBER = 2; -static const unsigned int INDEX_VERSION_NUMBER_EXT = 3; - -static const unsigned int INDEX_HEADER_SIG = 0x44495243; -static const char INDEX_EXT_TREECACHE_SIG[] = {'T', 'R', 'E', 'E'}; -static const char INDEX_EXT_UNMERGED_SIG[] = {'R', 'E', 'U', 'C'}; -static const char INDEX_EXT_CONFLICT_NAME_SIG[] = {'N', 'A', 'M', 'E'}; - -#define INDEX_OWNER(idx) ((git_repository *)(GIT_REFCOUNT_OWNER(idx))) - -struct index_header { - uint32_t signature; - uint32_t version; - uint32_t entry_count; -}; - -struct index_extension { - char signature[4]; - uint32_t extension_size; -}; - -struct entry_time { - uint32_t seconds; - uint32_t nanoseconds; -}; - -struct entry_short { - struct entry_time ctime; - struct entry_time mtime; - uint32_t dev; - uint32_t ino; - uint32_t mode; - uint32_t uid; - uint32_t gid; - uint32_t file_size; - git_oid oid; - uint16_t flags; - char path[1]; /* arbitrary length */ -}; - -struct entry_long { - struct entry_time ctime; - struct entry_time mtime; - uint32_t dev; - uint32_t ino; - uint32_t mode; - uint32_t uid; - uint32_t gid; - uint32_t file_size; - git_oid oid; - uint16_t flags; - uint16_t flags_extended; - char path[1]; /* arbitrary length */ -}; - -struct entry_srch_key { - const char *path; - size_t pathlen; - int stage; -}; - -struct entry_internal { - git_index_entry entry; - size_t pathlen; - char path[GIT_FLEX_ARRAY]; -}; - -struct reuc_entry_internal { - git_index_reuc_entry entry; - size_t pathlen; - char path[GIT_FLEX_ARRAY]; -}; - -/* local declarations */ -static size_t read_extension(git_index *index, const char *buffer, size_t buffer_size); -static int read_header(struct index_header *dest, const void *buffer); - -static int parse_index(git_index *index, const char *buffer, size_t buffer_size); -static bool is_index_extended(git_index *index); -static int write_index(git_oid *checksum, git_index *index, git_filebuf *file); - -static void index_entry_free(git_index_entry *entry); -static void index_entry_reuc_free(git_index_reuc_entry *reuc); - -int git_index_entry_srch(const void *key, const void *array_member) -{ - const struct entry_srch_key *srch_key = key; - const struct entry_internal *entry = array_member; - int cmp; - size_t len1, len2, len; - - len1 = srch_key->pathlen; - len2 = entry->pathlen; - len = len1 < len2 ? len1 : len2; - - cmp = memcmp(srch_key->path, entry->path, len); - if (cmp) - return cmp; - if (len1 < len2) - return -1; - if (len1 > len2) - return 1; - - if (srch_key->stage != GIT_INDEX_STAGE_ANY) - return srch_key->stage - GIT_IDXENTRY_STAGE(&entry->entry); - - return 0; -} - -int git_index_entry_isrch(const void *key, const void *array_member) -{ - const struct entry_srch_key *srch_key = key; - const struct entry_internal *entry = array_member; - int cmp; - size_t len1, len2, len; - - len1 = srch_key->pathlen; - len2 = entry->pathlen; - len = len1 < len2 ? len1 : len2; - - cmp = strncasecmp(srch_key->path, entry->path, len); - - if (cmp) - return cmp; - if (len1 < len2) - return -1; - if (len1 > len2) - return 1; - - if (srch_key->stage != GIT_INDEX_STAGE_ANY) - return srch_key->stage - GIT_IDXENTRY_STAGE(&entry->entry); - - return 0; -} - -static int index_entry_srch_path(const void *path, const void *array_member) -{ - const git_index_entry *entry = array_member; - - return strcmp((const char *)path, entry->path); -} - -static int index_entry_isrch_path(const void *path, const void *array_member) -{ - const git_index_entry *entry = array_member; - - return strcasecmp((const char *)path, entry->path); -} - -int git_index_entry_cmp(const void *a, const void *b) -{ - int diff; - const git_index_entry *entry_a = a; - const git_index_entry *entry_b = b; - - diff = strcmp(entry_a->path, entry_b->path); - - if (diff == 0) - diff = (GIT_IDXENTRY_STAGE(entry_a) - GIT_IDXENTRY_STAGE(entry_b)); - - return diff; -} - -int git_index_entry_icmp(const void *a, const void *b) -{ - int diff; - const git_index_entry *entry_a = a; - const git_index_entry *entry_b = b; - - diff = strcasecmp(entry_a->path, entry_b->path); - - if (diff == 0) - diff = (GIT_IDXENTRY_STAGE(entry_a) - GIT_IDXENTRY_STAGE(entry_b)); - - return diff; -} - -static int conflict_name_cmp(const void *a, const void *b) -{ - const git_index_name_entry *name_a = a; - const git_index_name_entry *name_b = b; - - if (name_a->ancestor && !name_b->ancestor) - return 1; - - if (!name_a->ancestor && name_b->ancestor) - return -1; - - if (name_a->ancestor) - return strcmp(name_a->ancestor, name_b->ancestor); - - if (!name_a->ours || !name_b->ours) - return 0; - - return strcmp(name_a->ours, name_b->ours); -} - -/** - * TODO: enable this when resolving case insensitive conflicts - */ -#if 0 -static int conflict_name_icmp(const void *a, const void *b) -{ - const git_index_name_entry *name_a = a; - const git_index_name_entry *name_b = b; - - if (name_a->ancestor && !name_b->ancestor) - return 1; - - if (!name_a->ancestor && name_b->ancestor) - return -1; - - if (name_a->ancestor) - return strcasecmp(name_a->ancestor, name_b->ancestor); - - if (!name_a->ours || !name_b->ours) - return 0; - - return strcasecmp(name_a->ours, name_b->ours); -} -#endif - -static int reuc_srch(const void *key, const void *array_member) -{ - const git_index_reuc_entry *reuc = array_member; - - return strcmp(key, reuc->path); -} - -static int reuc_isrch(const void *key, const void *array_member) -{ - const git_index_reuc_entry *reuc = array_member; - - return strcasecmp(key, reuc->path); -} - -static int reuc_cmp(const void *a, const void *b) -{ - const git_index_reuc_entry *info_a = a; - const git_index_reuc_entry *info_b = b; - - return strcmp(info_a->path, info_b->path); -} - -static int reuc_icmp(const void *a, const void *b) -{ - const git_index_reuc_entry *info_a = a; - const git_index_reuc_entry *info_b = b; - - return strcasecmp(info_a->path, info_b->path); -} - -static void index_entry_reuc_free(git_index_reuc_entry *reuc) -{ - git__free(reuc); -} - -static void index_entry_free(git_index_entry *entry) -{ - if (!entry) - return; - - memset(&entry->id, 0, sizeof(entry->id)); - git__free(entry); -} - -unsigned int git_index__create_mode(unsigned int mode) -{ - if (S_ISLNK(mode)) - return S_IFLNK; - - if (S_ISDIR(mode) || (mode & S_IFMT) == (S_IFLNK | S_IFDIR)) - return (S_IFLNK | S_IFDIR); - - return S_IFREG | GIT_PERMS_CANONICAL(mode); -} - -static unsigned int index_merge_mode( - git_index *index, git_index_entry *existing, unsigned int mode) -{ - if (index->no_symlinks && S_ISREG(mode) && - existing && S_ISLNK(existing->mode)) - return existing->mode; - - if (index->distrust_filemode && S_ISREG(mode)) - return (existing && S_ISREG(existing->mode)) ? - existing->mode : git_index__create_mode(0666); - - return git_index__create_mode(mode); -} - -GIT_INLINE(int) index_find_in_entries( - size_t *out, git_vector *entries, git_vector_cmp entry_srch, - const char *path, size_t path_len, int stage) -{ - struct entry_srch_key srch_key; - srch_key.path = path; - srch_key.pathlen = !path_len ? strlen(path) : path_len; - srch_key.stage = stage; - return git_vector_bsearch2(out, entries, entry_srch, &srch_key); -} - -GIT_INLINE(int) index_find( - size_t *out, git_index *index, - const char *path, size_t path_len, int stage) -{ - git_vector_sort(&index->entries); - - return index_find_in_entries( - out, &index->entries, index->entries_search, path, path_len, stage); -} - -void git_index__set_ignore_case(git_index *index, bool ignore_case) -{ - index->ignore_case = ignore_case; - - if (ignore_case) { - index->entries_cmp_path = git__strcasecmp_cb; - index->entries_search = git_index_entry_isrch; - index->entries_search_path = index_entry_isrch_path; - index->reuc_search = reuc_isrch; - } else { - index->entries_cmp_path = git__strcmp_cb; - index->entries_search = git_index_entry_srch; - index->entries_search_path = index_entry_srch_path; - index->reuc_search = reuc_srch; - } - - git_vector_set_cmp(&index->entries, - ignore_case ? git_index_entry_icmp : git_index_entry_cmp); - git_vector_sort(&index->entries); - - git_vector_set_cmp(&index->reuc, ignore_case ? reuc_icmp : reuc_cmp); - git_vector_sort(&index->reuc); -} - -int git_index_open(git_index **index_out, const char *index_path) -{ - git_index *index; - int error = -1; - - assert(index_out); - - index = git__calloc(1, sizeof(git_index)); - GITERR_CHECK_ALLOC(index); - - git_pool_init(&index->tree_pool, 1); - - if (index_path != NULL) { - index->index_file_path = git__strdup(index_path); - if (!index->index_file_path) - goto fail; - - /* Check if index file is stored on disk already */ - if (git_path_exists(index->index_file_path) == true) - index->on_disk = 1; - } - - if (git_vector_init(&index->entries, 32, git_index_entry_cmp) < 0 || - git_idxmap_alloc(&index->entries_map) < 0 || - git_vector_init(&index->names, 8, conflict_name_cmp) < 0 || - git_vector_init(&index->reuc, 8, reuc_cmp) < 0 || - git_vector_init(&index->deleted, 8, git_index_entry_cmp) < 0) - goto fail; - - index->entries_cmp_path = git__strcmp_cb; - index->entries_search = git_index_entry_srch; - index->entries_search_path = index_entry_srch_path; - index->reuc_search = reuc_srch; - - if (index_path != NULL && (error = git_index_read(index, true)) < 0) - goto fail; - - *index_out = index; - GIT_REFCOUNT_INC(index); - - return 0; - -fail: - git_pool_clear(&index->tree_pool); - git_index_free(index); - return error; -} - -int git_index_new(git_index **out) -{ - return git_index_open(out, NULL); -} - -static void index_free(git_index *index) -{ - /* index iterators increment the refcount of the index, so if we - * get here then there should be no outstanding iterators. - */ - assert(!git_atomic_get(&index->readers)); - - git_index_clear(index); - git_idxmap_free(index->entries_map); - git_vector_free(&index->entries); - git_vector_free(&index->names); - git_vector_free(&index->reuc); - git_vector_free(&index->deleted); - - git__free(index->index_file_path); - - git__memzero(index, sizeof(*index)); - git__free(index); -} - -void git_index_free(git_index *index) -{ - if (index == NULL) - return; - - GIT_REFCOUNT_DEC(index, index_free); -} - -/* call with locked index */ -static void index_free_deleted(git_index *index) -{ - int readers = (int)git_atomic_get(&index->readers); - size_t i; - - if (readers > 0 || !index->deleted.length) - return; - - for (i = 0; i < index->deleted.length; ++i) { - git_index_entry *ie = git__swap(index->deleted.contents[i], NULL); - index_entry_free(ie); - } - - git_vector_clear(&index->deleted); -} - -/* call with locked index */ -static int index_remove_entry(git_index *index, size_t pos) -{ - int error = 0; - git_index_entry *entry = git_vector_get(&index->entries, pos); - - if (entry != NULL) - git_tree_cache_invalidate_path(index->tree, entry->path); - - DELETE_IN_MAP(index, entry); - error = git_vector_remove(&index->entries, pos); - - if (!error) { - if (git_atomic_get(&index->readers) > 0) { - error = git_vector_insert(&index->deleted, entry); - } else { - index_entry_free(entry); - } - } - - return error; -} - -int git_index_clear(git_index *index) -{ - int error = 0; - - assert(index); - - index->tree = NULL; - git_pool_clear(&index->tree_pool); - - git_idxmap_clear(index->entries_map); - while (!error && index->entries.length > 0) - error = index_remove_entry(index, index->entries.length - 1); - index_free_deleted(index); - - git_index_reuc_clear(index); - git_index_name_clear(index); - - git_futils_filestamp_set(&index->stamp, NULL); - - return error; -} - -static int create_index_error(int error, const char *msg) -{ - giterr_set(GITERR_INDEX, msg); - return error; -} - -int git_index_set_caps(git_index *index, int caps) -{ - unsigned int old_ignore_case; - - assert(index); - - old_ignore_case = index->ignore_case; - - if (caps == GIT_INDEXCAP_FROM_OWNER) { - git_repository *repo = INDEX_OWNER(index); - int val; - - if (!repo) - return create_index_error( - -1, "Cannot access repository to set index caps"); - - if (!git_repository__cvar(&val, repo, GIT_CVAR_IGNORECASE)) - index->ignore_case = (val != 0); - if (!git_repository__cvar(&val, repo, GIT_CVAR_FILEMODE)) - index->distrust_filemode = (val == 0); - if (!git_repository__cvar(&val, repo, GIT_CVAR_SYMLINKS)) - index->no_symlinks = (val == 0); - } - else { - index->ignore_case = ((caps & GIT_INDEXCAP_IGNORE_CASE) != 0); - index->distrust_filemode = ((caps & GIT_INDEXCAP_NO_FILEMODE) != 0); - index->no_symlinks = ((caps & GIT_INDEXCAP_NO_SYMLINKS) != 0); - } - - if (old_ignore_case != index->ignore_case) { - git_index__set_ignore_case(index, (bool)index->ignore_case); - } - - return 0; -} - -int git_index_caps(const git_index *index) -{ - return ((index->ignore_case ? GIT_INDEXCAP_IGNORE_CASE : 0) | - (index->distrust_filemode ? GIT_INDEXCAP_NO_FILEMODE : 0) | - (index->no_symlinks ? GIT_INDEXCAP_NO_SYMLINKS : 0)); -} - -const git_oid *git_index_checksum(git_index *index) -{ - return &index->checksum; -} - -/** - * Returns 1 for changed, 0 for not changed and <0 for errors - */ -static int compare_checksum(git_index *index) -{ - int fd; - ssize_t bytes_read; - git_oid checksum = {{ 0 }}; - - if ((fd = p_open(index->index_file_path, O_RDONLY)) < 0) - return fd; - - if (p_lseek(fd, -20, SEEK_END) < 0) { - p_close(fd); - giterr_set(GITERR_OS, "failed to seek to end of file"); - return -1; - } - - bytes_read = p_read(fd, &checksum, GIT_OID_RAWSZ); - p_close(fd); - - if (bytes_read < 0) - return -1; - - return !!git_oid_cmp(&checksum, &index->checksum); -} - -int git_index_read(git_index *index, int force) -{ - int error = 0, updated; - git_buf buffer = GIT_BUF_INIT; - git_futils_filestamp stamp = index->stamp; - - if (!index->index_file_path) - return create_index_error(-1, - "Failed to read index: The index is in-memory only"); - - index->on_disk = git_path_exists(index->index_file_path); - - if (!index->on_disk) { - if (force) - return git_index_clear(index); - return 0; - } - - if ((updated = git_futils_filestamp_check(&stamp, index->index_file_path) < 0) || - ((updated = compare_checksum(index)) < 0)) { - giterr_set( - GITERR_INDEX, - "Failed to read index: '%s' no longer exists", - index->index_file_path); - return updated; - } - if (!updated && !force) - return 0; - - error = git_futils_readbuffer(&buffer, index->index_file_path); - if (error < 0) - return error; - - index->tree = NULL; - git_pool_clear(&index->tree_pool); - - error = git_index_clear(index); - - if (!error) - error = parse_index(index, buffer.ptr, buffer.size); - - if (!error) - git_futils_filestamp_set(&index->stamp, &stamp); - - git_buf_free(&buffer); - return error; -} - -int git_index__changed_relative_to( - git_index *index, const git_oid *checksum) -{ - /* attempt to update index (ignoring errors) */ - if (git_index_read(index, false) < 0) - giterr_clear(); - - return !!git_oid_cmp(&index->checksum, checksum); -} - -static bool is_racy_entry(git_index *index, const git_index_entry *entry) -{ - /* Git special-cases submodules in the check */ - if (S_ISGITLINK(entry->mode)) - return false; - - return git_index_entry_newer_than_index(entry, index); -} - -/* - * Force the next diff to take a look at those entries which have the - * same timestamp as the current index. - */ -static int truncate_racily_clean(git_index *index) -{ - size_t i; - int error; - git_index_entry *entry; - git_diff_options diff_opts = GIT_DIFF_OPTIONS_INIT; - git_diff *diff = NULL; - git_vector paths = GIT_VECTOR_INIT; - git_diff_delta *delta; - - /* Nothing to do if there's no repo to talk about */ - if (!INDEX_OWNER(index)) - return 0; - - /* If there's no workdir, we can't know where to even check */ - if (!git_repository_workdir(INDEX_OWNER(index))) - return 0; - - diff_opts.flags |= GIT_DIFF_INCLUDE_TYPECHANGE | GIT_DIFF_IGNORE_SUBMODULES | GIT_DIFF_DISABLE_PATHSPEC_MATCH; - git_vector_foreach(&index->entries, i, entry) { - if ((entry->flags_extended & GIT_IDXENTRY_UPTODATE) == 0 && - is_racy_entry(index, entry)) - git_vector_insert(&paths, (char *)entry->path); - } - - if (paths.length == 0) - goto done; - - diff_opts.pathspec.count = paths.length; - diff_opts.pathspec.strings = (char **)paths.contents; - - if ((error = git_diff_index_to_workdir(&diff, INDEX_OWNER(index), index, &diff_opts)) < 0) - return error; - - git_vector_foreach(&diff->deltas, i, delta) { - entry = (git_index_entry *)git_index_get_bypath(index, delta->old_file.path, 0); - - /* Ensure that we have a stage 0 for this file (ie, it's not a - * conflict), otherwise smudging it is quite pointless. - */ - if (entry) - entry->file_size = 0; - } - -done: - git_diff_free(diff); - git_vector_free(&paths); - return 0; -} - -int git_index_write(git_index *index) -{ - git_indexwriter writer = GIT_INDEXWRITER_INIT; - int error; - - truncate_racily_clean(index); - - if ((error = git_indexwriter_init(&writer, index)) == 0) - error = git_indexwriter_commit(&writer); - - git_indexwriter_cleanup(&writer); - - return error; -} - -const char * git_index_path(const git_index *index) -{ - assert(index); - return index->index_file_path; -} - -int git_index_write_tree(git_oid *oid, git_index *index) -{ - git_repository *repo; - - assert(oid && index); - - repo = INDEX_OWNER(index); - - if (repo == NULL) - return create_index_error(-1, "Failed to write tree. " - "The index file is not backed up by an existing repository"); - - return git_tree__write_index(oid, index, repo); -} - -int git_index_write_tree_to( - git_oid *oid, git_index *index, git_repository *repo) -{ - assert(oid && index && repo); - return git_tree__write_index(oid, index, repo); -} - -size_t git_index_entrycount(const git_index *index) -{ - assert(index); - return index->entries.length; -} - -const git_index_entry *git_index_get_byindex( - git_index *index, size_t n) -{ - assert(index); - git_vector_sort(&index->entries); - return git_vector_get(&index->entries, n); -} - -const git_index_entry *git_index_get_bypath( - git_index *index, const char *path, int stage) -{ - khiter_t pos; - git_index_entry key = {{ 0 }}; - - assert(index); - - key.path = path; - GIT_IDXENTRY_STAGE_SET(&key, stage); - - LOOKUP_IN_MAP(pos, index, &key); - - if (git_idxmap_valid_index(index->entries_map, pos)) - return git_idxmap_value_at(index->entries_map, pos); - - giterr_set(GITERR_INDEX, "Index does not contain %s", path); - return NULL; -} - -void git_index_entry__init_from_stat( - git_index_entry *entry, struct stat *st, bool trust_mode) -{ - entry->ctime.seconds = (int32_t)st->st_ctime; - entry->mtime.seconds = (int32_t)st->st_mtime; -#if defined(GIT_USE_NSEC) - entry->mtime.nanoseconds = st->st_mtime_nsec; - entry->ctime.nanoseconds = st->st_ctime_nsec; -#endif - entry->dev = st->st_rdev; - entry->ino = st->st_ino; - entry->mode = (!trust_mode && S_ISREG(st->st_mode)) ? - git_index__create_mode(0666) : git_index__create_mode(st->st_mode); - entry->uid = st->st_uid; - entry->gid = st->st_gid; - entry->file_size = (uint32_t)st->st_size; -} - -static void index_entry_adjust_namemask( - git_index_entry *entry, - size_t path_length) -{ - entry->flags &= ~GIT_IDXENTRY_NAMEMASK; - - if (path_length < GIT_IDXENTRY_NAMEMASK) - entry->flags |= path_length & GIT_IDXENTRY_NAMEMASK; - else - entry->flags |= GIT_IDXENTRY_NAMEMASK; -} - -/* When `from_workdir` is true, we will validate the paths to avoid placing - * paths that are invalid for the working directory on the current filesystem - * (eg, on Windows, we will disallow `GIT~1`, `AUX`, `COM1`, etc). This - * function will *always* prevent `.git` and directory traversal `../` from - * being added to the index. - */ -static int index_entry_create( - git_index_entry **out, - git_repository *repo, - const char *path, - bool from_workdir) -{ - size_t pathlen = strlen(path), alloclen; - struct entry_internal *entry; - unsigned int path_valid_flags = GIT_PATH_REJECT_INDEX_DEFAULTS; - - /* always reject placing `.git` in the index and directory traversal. - * when requested, disallow platform-specific filenames and upgrade to - * the platform-specific `.git` tests (eg, `git~1`, etc). - */ - if (from_workdir) - path_valid_flags |= GIT_PATH_REJECT_WORKDIR_DEFAULTS; - - if (!git_path_isvalid(repo, path, path_valid_flags)) { - giterr_set(GITERR_INDEX, "invalid path: '%s'", path); - return -1; - } - - GITERR_CHECK_ALLOC_ADD(&alloclen, sizeof(struct entry_internal), pathlen); - GITERR_CHECK_ALLOC_ADD(&alloclen, alloclen, 1); - entry = git__calloc(1, alloclen); - GITERR_CHECK_ALLOC(entry); - - entry->pathlen = pathlen; - memcpy(entry->path, path, pathlen); - entry->entry.path = entry->path; - - *out = (git_index_entry *)entry; - return 0; -} - -static int index_entry_init( - git_index_entry **entry_out, - git_index *index, - const char *rel_path) -{ - int error = 0; - git_index_entry *entry = NULL; - struct stat st; - git_oid oid; - - if (INDEX_OWNER(index) == NULL) - return create_index_error(-1, - "Could not initialize index entry. " - "Index is not backed up by an existing repository."); - - if (index_entry_create(&entry, INDEX_OWNER(index), rel_path, true) < 0) - return -1; - - /* write the blob to disk and get the oid and stat info */ - error = git_blob__create_from_paths( - &oid, &st, INDEX_OWNER(index), NULL, rel_path, 0, true); - - if (error < 0) { - index_entry_free(entry); - return error; - } - - entry->id = oid; - git_index_entry__init_from_stat(entry, &st, !index->distrust_filemode); - - *entry_out = (git_index_entry *)entry; - return 0; -} - -static git_index_reuc_entry *reuc_entry_alloc(const char *path) -{ - size_t pathlen = strlen(path), - structlen = sizeof(struct reuc_entry_internal), - alloclen; - struct reuc_entry_internal *entry; - - if (GIT_ADD_SIZET_OVERFLOW(&alloclen, structlen, pathlen) || - GIT_ADD_SIZET_OVERFLOW(&alloclen, alloclen, 1)) - return NULL; - - entry = git__calloc(1, alloclen); - if (!entry) - return NULL; - - entry->pathlen = pathlen; - memcpy(entry->path, path, pathlen); - entry->entry.path = entry->path; - - return (git_index_reuc_entry *)entry; -} - -static int index_entry_reuc_init(git_index_reuc_entry **reuc_out, - const char *path, - int ancestor_mode, const git_oid *ancestor_oid, - int our_mode, const git_oid *our_oid, - int their_mode, const git_oid *their_oid) -{ - git_index_reuc_entry *reuc = NULL; - - assert(reuc_out && path); - - *reuc_out = reuc = reuc_entry_alloc(path); - GITERR_CHECK_ALLOC(reuc); - - if ((reuc->mode[0] = ancestor_mode) > 0) { - assert(ancestor_oid); - git_oid_cpy(&reuc->oid[0], ancestor_oid); - } - - if ((reuc->mode[1] = our_mode) > 0) { - assert(our_oid); - git_oid_cpy(&reuc->oid[1], our_oid); - } - - if ((reuc->mode[2] = their_mode) > 0) { - assert(their_oid); - git_oid_cpy(&reuc->oid[2], their_oid); - } - - return 0; -} - -static void index_entry_cpy( - git_index_entry *tgt, - const git_index_entry *src) -{ - const char *tgt_path = tgt->path; - memcpy(tgt, src, sizeof(*tgt)); - tgt->path = tgt_path; -} - -static int index_entry_dup( - git_index_entry **out, - git_index *index, - const git_index_entry *src) -{ - if (index_entry_create(out, INDEX_OWNER(index), src->path, false) < 0) - return -1; - - index_entry_cpy(*out, src); - return 0; -} - -static void index_entry_cpy_nocache( - git_index_entry *tgt, - const git_index_entry *src) -{ - git_oid_cpy(&tgt->id, &src->id); - tgt->mode = src->mode; - tgt->flags = src->flags; - tgt->flags_extended = (src->flags_extended & GIT_IDXENTRY_EXTENDED_FLAGS); -} - -static int index_entry_dup_nocache( - git_index_entry **out, - git_index *index, - const git_index_entry *src) -{ - if (index_entry_create(out, INDEX_OWNER(index), src->path, false) < 0) - return -1; - - index_entry_cpy_nocache(*out, src); - return 0; -} - -static int has_file_name(git_index *index, - const git_index_entry *entry, size_t pos, int ok_to_replace) -{ - int retval = 0; - size_t len = strlen(entry->path); - int stage = GIT_IDXENTRY_STAGE(entry); - const char *name = entry->path; - - while (pos < index->entries.length) { - struct entry_internal *p = index->entries.contents[pos++]; - - if (len >= p->pathlen) - break; - if (memcmp(name, p->path, len)) - break; - if (GIT_IDXENTRY_STAGE(&p->entry) != stage) - continue; - if (p->path[len] != '/') - continue; - retval = -1; - if (!ok_to_replace) - break; - - if (index_remove_entry(index, --pos) < 0) - break; - } - return retval; -} - -/* - * Do we have another file with a pathname that is a proper - * subset of the name we're trying to add? - */ -static int has_dir_name(git_index *index, - const git_index_entry *entry, int ok_to_replace) -{ - int retval = 0; - int stage = GIT_IDXENTRY_STAGE(entry); - const char *name = entry->path; - const char *slash = name + strlen(name); - - for (;;) { - size_t len, pos; - - for (;;) { - if (*--slash == '/') - break; - if (slash <= entry->path) - return retval; - } - len = slash - name; - - if (!index_find(&pos, index, name, len, stage)) { - retval = -1; - if (!ok_to_replace) - break; - - if (index_remove_entry(index, pos) < 0) - break; - continue; - } - - /* - * Trivial optimization: if we find an entry that - * already matches the sub-directory, then we know - * we're ok, and we can exit. - */ - for (; pos < index->entries.length; ++pos) { - struct entry_internal *p = index->entries.contents[pos]; - - if (p->pathlen <= len || - p->path[len] != '/' || - memcmp(p->path, name, len)) - break; /* not our subdirectory */ - - if (GIT_IDXENTRY_STAGE(&p->entry) == stage) - return retval; - } - } - - return retval; -} - -static int check_file_directory_collision(git_index *index, - git_index_entry *entry, size_t pos, int ok_to_replace) -{ - int retval = has_file_name(index, entry, pos, ok_to_replace); - retval = retval + has_dir_name(index, entry, ok_to_replace); - - if (retval) { - giterr_set(GITERR_INDEX, - "'%s' appears as both a file and a directory", entry->path); - return -1; - } - - return 0; -} - -static int canonicalize_directory_path( - git_index *index, - git_index_entry *entry, - git_index_entry *existing) -{ - const git_index_entry *match, *best = NULL; - char *search, *sep; - size_t pos, search_len, best_len; - - if (!index->ignore_case) - return 0; - - /* item already exists in the index, simply re-use the existing case */ - if (existing) { - memcpy((char *)entry->path, existing->path, strlen(existing->path)); - return 0; - } - - /* nothing to do */ - if (strchr(entry->path, '/') == NULL) - return 0; - - if ((search = git__strdup(entry->path)) == NULL) - return -1; - - /* starting at the parent directory and descending to the root, find the - * common parent directory. - */ - while (!best && (sep = strrchr(search, '/'))) { - sep[1] = '\0'; - - search_len = strlen(search); - - git_vector_bsearch2( - &pos, &index->entries, index->entries_search_path, search); - - while ((match = git_vector_get(&index->entries, pos))) { - if (GIT_IDXENTRY_STAGE(match) != 0) { - /* conflicts do not contribute to canonical paths */ - } else if (strncmp(search, match->path, search_len) == 0) { - /* prefer an exact match to the input filename */ - best = match; - best_len = search_len; - break; - } else if (strncasecmp(search, match->path, search_len) == 0) { - /* continue walking, there may be a path with an exact - * (case sensitive) match later in the index, but use this - * as the best match until that happens. - */ - if (!best) { - best = match; - best_len = search_len; - } - } else { - break; - } - - pos++; - } - - sep[0] = '\0'; - } - - if (best) - memcpy((char *)entry->path, best->path, best_len); - - git__free(search); - return 0; -} - -static int index_no_dups(void **old, void *new) -{ - const git_index_entry *entry = new; - GIT_UNUSED(old); - giterr_set(GITERR_INDEX, "'%s' appears multiple times at stage %d", - entry->path, GIT_IDXENTRY_STAGE(entry)); - return GIT_EEXISTS; -} - -static void index_existing_and_best( - git_index_entry **existing, - size_t *existing_position, - git_index_entry **best, - git_index *index, - const git_index_entry *entry) -{ - git_index_entry *e; - size_t pos; - int error; - - error = index_find(&pos, - index, entry->path, 0, GIT_IDXENTRY_STAGE(entry)); - - if (error == 0) { - *existing = index->entries.contents[pos]; - *existing_position = pos; - *best = index->entries.contents[pos]; - return; - } - - *existing = NULL; - *existing_position = 0; - *best = NULL; - - if (GIT_IDXENTRY_STAGE(entry) == 0) { - for (; pos < index->entries.length; pos++) { - int (*strcomp)(const char *a, const char *b) = - index->ignore_case ? git__strcasecmp : git__strcmp; - - e = index->entries.contents[pos]; - - if (strcomp(entry->path, e->path) != 0) - break; - - if (GIT_IDXENTRY_STAGE(e) == GIT_INDEX_STAGE_ANCESTOR) { - *best = e; - continue; - } else { - *best = e; - break; - } - } - } -} - -/* index_insert takes ownership of the new entry - if it can't insert - * it, then it will return an error **and also free the entry**. When - * it replaces an existing entry, it will update the entry_ptr with the - * actual entry in the index (and free the passed in one). - * - * trust_path is whether we use the given path, or whether (on case - * insensitive systems only) we try to canonicalize the given path to - * be within an existing directory. - * - * trust_mode is whether we trust the mode in entry_ptr. - * - * trust_id is whether we trust the id or it should be validated. - */ -static int index_insert( - git_index *index, - git_index_entry **entry_ptr, - int replace, - bool trust_path, - bool trust_mode, - bool trust_id) -{ - int error = 0; - size_t path_length, position; - git_index_entry *existing, *best, *entry; - - assert(index && entry_ptr); - - entry = *entry_ptr; - - /* make sure that the path length flag is correct */ - path_length = ((struct entry_internal *)entry)->pathlen; - index_entry_adjust_namemask(entry, path_length); - - /* this entry is now up-to-date and should not be checked for raciness */ - entry->flags_extended |= GIT_IDXENTRY_UPTODATE; - - git_vector_sort(&index->entries); - - /* look if an entry with this path already exists, either staged, or (if - * this entry is a regular staged item) as the "ours" side of a conflict. - */ - index_existing_and_best(&existing, &position, &best, index, entry); - - /* update the file mode */ - entry->mode = trust_mode ? - git_index__create_mode(entry->mode) : - index_merge_mode(index, best, entry->mode); - - /* canonicalize the directory name */ - if (!trust_path) - error = canonicalize_directory_path(index, entry, best); - - /* ensure that the given id exists (unless it's a submodule) */ - if (!error && !trust_id && INDEX_OWNER(index) && - (entry->mode & GIT_FILEMODE_COMMIT) != GIT_FILEMODE_COMMIT) { - - if (!git_object__is_valid(INDEX_OWNER(index), &entry->id, - git_object__type_from_filemode(entry->mode))) - error = -1; - } - - /* look for tree / blob name collisions, removing conflicts if requested */ - if (!error) - error = check_file_directory_collision(index, entry, position, replace); - - if (error < 0) - /* skip changes */; - - /* if we are replacing an existing item, overwrite the existing entry - * and return it in place of the passed in one. - */ - else if (existing) { - if (replace) { - index_entry_cpy(existing, entry); - - if (trust_path) - memcpy((char *)existing->path, entry->path, strlen(entry->path)); - } - - index_entry_free(entry); - *entry_ptr = entry = existing; - } - else { - /* if replace is not requested or no existing entry exists, insert - * at the sorted position. (Since we re-sort after each insert to - * check for dups, this is actually cheaper in the long run.) - */ - error = git_vector_insert_sorted(&index->entries, entry, index_no_dups); - - if (error == 0) { - INSERT_IN_MAP(index, entry, error); - } - } - - if (error < 0) { - index_entry_free(*entry_ptr); - *entry_ptr = NULL; - } - - return error; -} - -static int index_conflict_to_reuc(git_index *index, const char *path) -{ - const git_index_entry *conflict_entries[3]; - int ancestor_mode, our_mode, their_mode; - git_oid const *ancestor_oid, *our_oid, *their_oid; - int ret; - - if ((ret = git_index_conflict_get(&conflict_entries[0], - &conflict_entries[1], &conflict_entries[2], index, path)) < 0) - return ret; - - ancestor_mode = conflict_entries[0] == NULL ? 0 : conflict_entries[0]->mode; - our_mode = conflict_entries[1] == NULL ? 0 : conflict_entries[1]->mode; - their_mode = conflict_entries[2] == NULL ? 0 : conflict_entries[2]->mode; - - ancestor_oid = conflict_entries[0] == NULL ? NULL : &conflict_entries[0]->id; - our_oid = conflict_entries[1] == NULL ? NULL : &conflict_entries[1]->id; - their_oid = conflict_entries[2] == NULL ? NULL : &conflict_entries[2]->id; - - if ((ret = git_index_reuc_add(index, path, ancestor_mode, ancestor_oid, - our_mode, our_oid, their_mode, their_oid)) >= 0) - ret = git_index_conflict_remove(index, path); - - return ret; -} - -static bool valid_filemode(const int filemode) -{ - return (filemode == GIT_FILEMODE_BLOB || - filemode == GIT_FILEMODE_BLOB_EXECUTABLE || - filemode == GIT_FILEMODE_LINK || - filemode == GIT_FILEMODE_COMMIT); -} - -int git_index_add_frombuffer( - git_index *index, const git_index_entry *source_entry, - const void *buffer, size_t len) -{ - git_index_entry *entry = NULL; - int error = 0; - git_oid id; - - assert(index && source_entry->path); - - if (INDEX_OWNER(index) == NULL) - return create_index_error(-1, - "Could not initialize index entry. " - "Index is not backed up by an existing repository."); - - if (!valid_filemode(source_entry->mode)) { - giterr_set(GITERR_INDEX, "invalid filemode"); - return -1; - } - - if (index_entry_dup(&entry, index, source_entry) < 0) - return -1; - - error = git_blob_create_frombuffer(&id, INDEX_OWNER(index), buffer, len); - if (error < 0) { - index_entry_free(entry); - return error; - } - - git_oid_cpy(&entry->id, &id); - entry->file_size = len; - - if ((error = index_insert(index, &entry, 1, true, true, true)) < 0) - return error; - - /* Adding implies conflict was resolved, move conflict entries to REUC */ - if ((error = index_conflict_to_reuc(index, entry->path)) < 0 && error != GIT_ENOTFOUND) - return error; - - git_tree_cache_invalidate_path(index->tree, entry->path); - return 0; -} - -static int add_repo_as_submodule(git_index_entry **out, git_index *index, const char *path) -{ - git_repository *sub; - git_buf abspath = GIT_BUF_INIT; - git_repository *repo = INDEX_OWNER(index); - git_reference *head; - git_index_entry *entry; - struct stat st; - int error; - - if (index_entry_create(&entry, INDEX_OWNER(index), path, true) < 0) - return -1; - - if ((error = git_buf_joinpath(&abspath, git_repository_workdir(repo), path)) < 0) - return error; - - if ((error = p_stat(abspath.ptr, &st)) < 0) { - giterr_set(GITERR_OS, "failed to stat repository dir"); - return -1; - } - - git_index_entry__init_from_stat(entry, &st, !index->distrust_filemode); - - if ((error = git_repository_open(&sub, abspath.ptr)) < 0) - return error; - - if ((error = git_repository_head(&head, sub)) < 0) - return error; - - git_oid_cpy(&entry->id, git_reference_target(head)); - entry->mode = GIT_FILEMODE_COMMIT; - - git_reference_free(head); - git_repository_free(sub); - git_buf_free(&abspath); - - *out = entry; - return 0; -} - -int git_index_add_bypath(git_index *index, const char *path) -{ - git_index_entry *entry = NULL; - int ret; - - assert(index && path); - - if ((ret = index_entry_init(&entry, index, path)) == 0) - ret = index_insert(index, &entry, 1, false, false, true); - - /* If we were given a directory, let's see if it's a submodule */ - if (ret < 0 && ret != GIT_EDIRECTORY) - return ret; - - if (ret == GIT_EDIRECTORY) { - git_submodule *sm; - git_error_state err; - - giterr_state_capture(&err, ret); - - ret = git_submodule_lookup(&sm, INDEX_OWNER(index), path); - if (ret == GIT_ENOTFOUND) - return giterr_state_restore(&err); - - giterr_state_free(&err); - - /* - * EEXISTS means that there is a repository at that path, but it's not known - * as a submodule. We add its HEAD as an entry and don't register it. - */ - if (ret == GIT_EEXISTS) { - if ((ret = add_repo_as_submodule(&entry, index, path)) < 0) - return ret; - - if ((ret = index_insert(index, &entry, 1, false, false, true)) < 0) - return ret; - } else if (ret < 0) { - return ret; - } else { - ret = git_submodule_add_to_index(sm, false); - git_submodule_free(sm); - return ret; - } - } - - /* Adding implies conflict was resolved, move conflict entries to REUC */ - if ((ret = index_conflict_to_reuc(index, path)) < 0 && ret != GIT_ENOTFOUND) - return ret; - - git_tree_cache_invalidate_path(index->tree, entry->path); - return 0; -} - -int git_index_remove_bypath(git_index *index, const char *path) -{ - int ret; - - assert(index && path); - - if (((ret = git_index_remove(index, path, 0)) < 0 && - ret != GIT_ENOTFOUND) || - ((ret = index_conflict_to_reuc(index, path)) < 0 && - ret != GIT_ENOTFOUND)) - return ret; - - if (ret == GIT_ENOTFOUND) - giterr_clear(); - - return 0; -} - -int git_index__fill(git_index *index, const git_vector *source_entries) -{ - const git_index_entry *source_entry = NULL; - size_t i; - int ret = 0; - - assert(index); - - if (!source_entries->length) - return 0; - - git_vector_size_hint(&index->entries, source_entries->length); - git_idxmap_resize(index->entries_map, (khint_t)(source_entries->length * 1.3)); - - git_vector_foreach(source_entries, i, source_entry) { - git_index_entry *entry = NULL; - - if ((ret = index_entry_dup(&entry, index, source_entry)) < 0) - break; - - index_entry_adjust_namemask(entry, ((struct entry_internal *)entry)->pathlen); - entry->flags_extended |= GIT_IDXENTRY_UPTODATE; - entry->mode = git_index__create_mode(entry->mode); - - if ((ret = git_vector_insert(&index->entries, entry)) < 0) - break; - - INSERT_IN_MAP(index, entry, ret); - if (ret < 0) - break; - } - - if (!ret) - git_vector_sort(&index->entries); - - return ret; -} - - -int git_index_add(git_index *index, const git_index_entry *source_entry) -{ - git_index_entry *entry = NULL; - int ret; - - assert(index && source_entry && source_entry->path); - - if (!valid_filemode(source_entry->mode)) { - giterr_set(GITERR_INDEX, "invalid filemode"); - return -1; - } - - if ((ret = index_entry_dup(&entry, index, source_entry)) < 0 || - (ret = index_insert(index, &entry, 1, true, true, false)) < 0) - return ret; - - git_tree_cache_invalidate_path(index->tree, entry->path); - return 0; -} - -int git_index_remove(git_index *index, const char *path, int stage) -{ - int error; - size_t position; - git_index_entry remove_key = {{ 0 }}; - - remove_key.path = path; - GIT_IDXENTRY_STAGE_SET(&remove_key, stage); - - DELETE_IN_MAP(index, &remove_key); - - if (index_find(&position, index, path, 0, stage) < 0) { - giterr_set( - GITERR_INDEX, "Index does not contain %s at stage %d", path, stage); - error = GIT_ENOTFOUND; - } else { - error = index_remove_entry(index, position); - } - - return error; -} - -int git_index_remove_directory(git_index *index, const char *dir, int stage) -{ - git_buf pfx = GIT_BUF_INIT; - int error = 0; - size_t pos; - git_index_entry *entry; - - if (!(error = git_buf_sets(&pfx, dir)) && - !(error = git_path_to_dir(&pfx))) - index_find(&pos, index, pfx.ptr, pfx.size, GIT_INDEX_STAGE_ANY); - - while (!error) { - entry = git_vector_get(&index->entries, pos); - if (!entry || git__prefixcmp(entry->path, pfx.ptr) != 0) - break; - - if (GIT_IDXENTRY_STAGE(entry) != stage) { - ++pos; - continue; - } - - error = index_remove_entry(index, pos); - - /* removed entry at 'pos' so we don't need to increment */ - } - - git_buf_free(&pfx); - - return error; -} - -int git_index_find_prefix(size_t *at_pos, git_index *index, const char *prefix) -{ - int error = 0; - size_t pos; - const git_index_entry *entry; - - index_find(&pos, index, prefix, strlen(prefix), GIT_INDEX_STAGE_ANY); - entry = git_vector_get(&index->entries, pos); - if (!entry || git__prefixcmp(entry->path, prefix) != 0) - error = GIT_ENOTFOUND; - - if (!error && at_pos) - *at_pos = pos; - - return error; -} - -int git_index__find_pos( - size_t *out, git_index *index, const char *path, size_t path_len, int stage) -{ - assert(index && path); - return index_find(out, index, path, path_len, stage); -} - -int git_index_find(size_t *at_pos, git_index *index, const char *path) -{ - size_t pos; - - assert(index && path); - - if (git_vector_bsearch2( - &pos, &index->entries, index->entries_search_path, path) < 0) { - giterr_set(GITERR_INDEX, "Index does not contain %s", path); - return GIT_ENOTFOUND; - } - - /* Since our binary search only looked at path, we may be in the - * middle of a list of stages. - */ - for (; pos > 0; --pos) { - const git_index_entry *prev = git_vector_get(&index->entries, pos - 1); - - if (index->entries_cmp_path(prev->path, path) != 0) - break; - } - - if (at_pos) - *at_pos = pos; - - return 0; -} - -int git_index_conflict_add(git_index *index, - const git_index_entry *ancestor_entry, - const git_index_entry *our_entry, - const git_index_entry *their_entry) -{ - git_index_entry *entries[3] = { 0 }; - unsigned short i; - int ret = 0; - - assert (index); - - if ((ancestor_entry && - (ret = index_entry_dup(&entries[0], index, ancestor_entry)) < 0) || - (our_entry && - (ret = index_entry_dup(&entries[1], index, our_entry)) < 0) || - (their_entry && - (ret = index_entry_dup(&entries[2], index, their_entry)) < 0)) - goto on_error; - - /* Validate entries */ - for (i = 0; i < 3; i++) { - if (entries[i] && !valid_filemode(entries[i]->mode)) { - giterr_set(GITERR_INDEX, "invalid filemode for stage %d entry", - i + 1); - return -1; - } - } - - /* Remove existing index entries for each path */ - for (i = 0; i < 3; i++) { - if (entries[i] == NULL) - continue; - - if ((ret = git_index_remove(index, entries[i]->path, 0)) != 0) { - if (ret != GIT_ENOTFOUND) - goto on_error; - - giterr_clear(); - ret = 0; - } - } - - /* Add the conflict entries */ - for (i = 0; i < 3; i++) { - if (entries[i] == NULL) - continue; - - /* Make sure stage is correct */ - GIT_IDXENTRY_STAGE_SET(entries[i], i + 1); - - if ((ret = index_insert(index, &entries[i], 1, true, true, false)) < 0) - goto on_error; - - entries[i] = NULL; /* don't free if later entry fails */ - } - - return 0; - -on_error: - for (i = 0; i < 3; i++) { - if (entries[i] != NULL) - index_entry_free(entries[i]); - } - - return ret; -} - -static int index_conflict__get_byindex( - const git_index_entry **ancestor_out, - const git_index_entry **our_out, - const git_index_entry **their_out, - git_index *index, - size_t n) -{ - const git_index_entry *conflict_entry; - const char *path = NULL; - size_t count; - int stage, len = 0; - - assert(ancestor_out && our_out && their_out && index); - - *ancestor_out = NULL; - *our_out = NULL; - *their_out = NULL; - - for (count = git_index_entrycount(index); n < count; ++n) { - conflict_entry = git_vector_get(&index->entries, n); - - if (path && index->entries_cmp_path(conflict_entry->path, path) != 0) - break; - - stage = GIT_IDXENTRY_STAGE(conflict_entry); - path = conflict_entry->path; - - switch (stage) { - case 3: - *their_out = conflict_entry; - len++; - break; - case 2: - *our_out = conflict_entry; - len++; - break; - case 1: - *ancestor_out = conflict_entry; - len++; - break; - default: - break; - }; - } - - return len; -} - -int git_index_conflict_get( - const git_index_entry **ancestor_out, - const git_index_entry **our_out, - const git_index_entry **their_out, - git_index *index, - const char *path) -{ - size_t pos; - int len = 0; - - assert(ancestor_out && our_out && their_out && index && path); - - *ancestor_out = NULL; - *our_out = NULL; - *their_out = NULL; - - if (git_index_find(&pos, index, path) < 0) - return GIT_ENOTFOUND; - - if ((len = index_conflict__get_byindex( - ancestor_out, our_out, their_out, index, pos)) < 0) - return len; - else if (len == 0) - return GIT_ENOTFOUND; - - return 0; -} - -static int index_conflict_remove(git_index *index, const char *path) -{ - size_t pos = 0; - git_index_entry *conflict_entry; - int error = 0; - - if (path != NULL && git_index_find(&pos, index, path) < 0) - return GIT_ENOTFOUND; - - while ((conflict_entry = git_vector_get(&index->entries, pos)) != NULL) { - - if (path != NULL && - index->entries_cmp_path(conflict_entry->path, path) != 0) - break; - - if (GIT_IDXENTRY_STAGE(conflict_entry) == 0) { - pos++; - continue; - } - - if ((error = index_remove_entry(index, pos)) < 0) - break; - } - - return error; -} - -int git_index_conflict_remove(git_index *index, const char *path) -{ - assert(index && path); - return index_conflict_remove(index, path); -} - -int git_index_conflict_cleanup(git_index *index) -{ - assert(index); - return index_conflict_remove(index, NULL); -} - -int git_index_has_conflicts(const git_index *index) -{ - size_t i; - git_index_entry *entry; - - assert(index); - - git_vector_foreach(&index->entries, i, entry) { - if (GIT_IDXENTRY_STAGE(entry) > 0) - return 1; - } - - return 0; -} - -int git_index_conflict_iterator_new( - git_index_conflict_iterator **iterator_out, - git_index *index) -{ - git_index_conflict_iterator *it = NULL; - - assert(iterator_out && index); - - it = git__calloc(1, sizeof(git_index_conflict_iterator)); - GITERR_CHECK_ALLOC(it); - - it->index = index; - - *iterator_out = it; - return 0; -} - -int git_index_conflict_next( - const git_index_entry **ancestor_out, - const git_index_entry **our_out, - const git_index_entry **their_out, - git_index_conflict_iterator *iterator) -{ - const git_index_entry *entry; - int len; - - assert(ancestor_out && our_out && their_out && iterator); - - *ancestor_out = NULL; - *our_out = NULL; - *their_out = NULL; - - while (iterator->cur < iterator->index->entries.length) { - entry = git_index_get_byindex(iterator->index, iterator->cur); - - if (git_index_entry_is_conflict(entry)) { - if ((len = index_conflict__get_byindex( - ancestor_out, - our_out, - their_out, - iterator->index, - iterator->cur)) < 0) - return len; - - iterator->cur += len; - return 0; - } - - iterator->cur++; - } - - return GIT_ITEROVER; -} - -void git_index_conflict_iterator_free(git_index_conflict_iterator *iterator) -{ - if (iterator == NULL) - return; - - git__free(iterator); -} - -size_t git_index_name_entrycount(git_index *index) -{ - assert(index); - return index->names.length; -} - -const git_index_name_entry *git_index_name_get_byindex( - git_index *index, size_t n) -{ - assert(index); - - git_vector_sort(&index->names); - return git_vector_get(&index->names, n); -} - -static void index_name_entry_free(git_index_name_entry *ne) -{ - if (!ne) - return; - git__free(ne->ancestor); - git__free(ne->ours); - git__free(ne->theirs); - git__free(ne); -} - -int git_index_name_add(git_index *index, - const char *ancestor, const char *ours, const char *theirs) -{ - git_index_name_entry *conflict_name; - - assert((ancestor && ours) || (ancestor && theirs) || (ours && theirs)); - - conflict_name = git__calloc(1, sizeof(git_index_name_entry)); - GITERR_CHECK_ALLOC(conflict_name); - - if ((ancestor && !(conflict_name->ancestor = git__strdup(ancestor))) || - (ours && !(conflict_name->ours = git__strdup(ours))) || - (theirs && !(conflict_name->theirs = git__strdup(theirs))) || - git_vector_insert(&index->names, conflict_name) < 0) - { - index_name_entry_free(conflict_name); - return -1; - } - - return 0; -} - -void git_index_name_clear(git_index *index) -{ - size_t i; - git_index_name_entry *conflict_name; - - assert(index); - - git_vector_foreach(&index->names, i, conflict_name) - index_name_entry_free(conflict_name); - - git_vector_clear(&index->names); -} - -size_t git_index_reuc_entrycount(git_index *index) -{ - assert(index); - return index->reuc.length; -} - -static int index_reuc_on_dup(void **old, void *new) -{ - index_entry_reuc_free(*old); - *old = new; - return GIT_EEXISTS; -} - -static int index_reuc_insert( - git_index *index, - git_index_reuc_entry *reuc) -{ - int res; - - assert(index && reuc && reuc->path != NULL); - assert(git_vector_is_sorted(&index->reuc)); - - res = git_vector_insert_sorted(&index->reuc, reuc, &index_reuc_on_dup); - return res == GIT_EEXISTS ? 0 : res; -} - -int git_index_reuc_add(git_index *index, const char *path, - int ancestor_mode, const git_oid *ancestor_oid, - int our_mode, const git_oid *our_oid, - int their_mode, const git_oid *their_oid) -{ - git_index_reuc_entry *reuc = NULL; - int error = 0; - - assert(index && path); - - if ((error = index_entry_reuc_init(&reuc, path, ancestor_mode, - ancestor_oid, our_mode, our_oid, their_mode, their_oid)) < 0 || - (error = index_reuc_insert(index, reuc)) < 0) - index_entry_reuc_free(reuc); - - return error; -} - -int git_index_reuc_find(size_t *at_pos, git_index *index, const char *path) -{ - return git_vector_bsearch2(at_pos, &index->reuc, index->reuc_search, path); -} - -const git_index_reuc_entry *git_index_reuc_get_bypath( - git_index *index, const char *path) -{ - size_t pos; - assert(index && path); - - if (!index->reuc.length) - return NULL; - - assert(git_vector_is_sorted(&index->reuc)); - - if (git_index_reuc_find(&pos, index, path) < 0) - return NULL; - - return git_vector_get(&index->reuc, pos); -} - -const git_index_reuc_entry *git_index_reuc_get_byindex( - git_index *index, size_t n) -{ - assert(index); - assert(git_vector_is_sorted(&index->reuc)); - - return git_vector_get(&index->reuc, n); -} - -int git_index_reuc_remove(git_index *index, size_t position) -{ - int error; - git_index_reuc_entry *reuc; - - assert(git_vector_is_sorted(&index->reuc)); - - reuc = git_vector_get(&index->reuc, position); - error = git_vector_remove(&index->reuc, position); - - if (!error) - index_entry_reuc_free(reuc); - - return error; -} - -void git_index_reuc_clear(git_index *index) -{ - size_t i; - - assert(index); - - for (i = 0; i < index->reuc.length; ++i) - index_entry_reuc_free(git__swap(index->reuc.contents[i], NULL)); - - git_vector_clear(&index->reuc); -} - -static int index_error_invalid(const char *message) -{ - giterr_set(GITERR_INDEX, "Invalid data in index - %s", message); - return -1; -} - -static int read_reuc(git_index *index, const char *buffer, size_t size) -{ - const char *endptr; - size_t len; - int i; - - /* If called multiple times, the vector might already be initialized */ - if (index->reuc._alloc_size == 0 && - git_vector_init(&index->reuc, 16, reuc_cmp) < 0) - return -1; - - while (size) { - git_index_reuc_entry *lost; - - len = p_strnlen(buffer, size) + 1; - if (size <= len) - return index_error_invalid("reading reuc entries"); - - lost = reuc_entry_alloc(buffer); - GITERR_CHECK_ALLOC(lost); - - size -= len; - buffer += len; - - /* read 3 ASCII octal numbers for stage entries */ - for (i = 0; i < 3; i++) { - int64_t tmp; - - if (git__strtol64(&tmp, buffer, &endptr, 8) < 0 || - !endptr || endptr == buffer || *endptr || - tmp < 0) { - index_entry_reuc_free(lost); - return index_error_invalid("reading reuc entry stage"); - } - - lost->mode[i] = tmp; - - len = (endptr + 1) - buffer; - if (size <= len) { - index_entry_reuc_free(lost); - return index_error_invalid("reading reuc entry stage"); - } - - size -= len; - buffer += len; - } - - /* read up to 3 OIDs for stage entries */ - for (i = 0; i < 3; i++) { - if (!lost->mode[i]) - continue; - if (size < 20) { - index_entry_reuc_free(lost); - return index_error_invalid("reading reuc entry oid"); - } - - git_oid_fromraw(&lost->oid[i], (const unsigned char *) buffer); - size -= 20; - buffer += 20; - } - - /* entry was read successfully - insert into reuc vector */ - if (git_vector_insert(&index->reuc, lost) < 0) - return -1; - } - - /* entries are guaranteed to be sorted on-disk */ - git_vector_set_sorted(&index->reuc, true); - - return 0; -} - - -static int read_conflict_names(git_index *index, const char *buffer, size_t size) -{ - size_t len; - - /* This gets called multiple times, the vector might already be initialized */ - if (index->names._alloc_size == 0 && - git_vector_init(&index->names, 16, conflict_name_cmp) < 0) - return -1; - -#define read_conflict_name(ptr) \ - len = p_strnlen(buffer, size) + 1; \ - if (size < len) { \ - index_error_invalid("reading conflict name entries"); \ - goto out_err; \ - } \ - if (len == 1) \ - ptr = NULL; \ - else { \ - ptr = git__malloc(len); \ - GITERR_CHECK_ALLOC(ptr); \ - memcpy(ptr, buffer, len); \ - } \ - \ - buffer += len; \ - size -= len; - - while (size) { - git_index_name_entry *conflict_name = git__calloc(1, sizeof(git_index_name_entry)); - GITERR_CHECK_ALLOC(conflict_name); - - read_conflict_name(conflict_name->ancestor); - read_conflict_name(conflict_name->ours); - read_conflict_name(conflict_name->theirs); - - if (git_vector_insert(&index->names, conflict_name) < 0) - goto out_err; - - continue; - -out_err: - git__free(conflict_name->ancestor); - git__free(conflict_name->ours); - git__free(conflict_name->theirs); - git__free(conflict_name); - return -1; - } - -#undef read_conflict_name - - /* entries are guaranteed to be sorted on-disk */ - git_vector_set_sorted(&index->names, true); - - return 0; -} - -static size_t read_entry( - git_index_entry **out, - git_index *index, - const void *buffer, - size_t buffer_size) -{ - size_t path_length, entry_size; - const char *path_ptr; - struct entry_short source; - git_index_entry entry = {{0}}; - - if (INDEX_FOOTER_SIZE + minimal_entry_size > buffer_size) - return 0; - - /* buffer is not guaranteed to be aligned */ - memcpy(&source, buffer, sizeof(struct entry_short)); - - entry.ctime.seconds = (git_time_t)ntohl(source.ctime.seconds); - entry.ctime.nanoseconds = ntohl(source.ctime.nanoseconds); - entry.mtime.seconds = (git_time_t)ntohl(source.mtime.seconds); - entry.mtime.nanoseconds = ntohl(source.mtime.nanoseconds); - entry.dev = ntohl(source.dev); - entry.ino = ntohl(source.ino); - entry.mode = ntohl(source.mode); - entry.uid = ntohl(source.uid); - entry.gid = ntohl(source.gid); - entry.file_size = ntohl(source.file_size); - git_oid_cpy(&entry.id, &source.oid); - entry.flags = ntohs(source.flags); - - if (entry.flags & GIT_IDXENTRY_EXTENDED) { - uint16_t flags_raw; - size_t flags_offset; - - flags_offset = offsetof(struct entry_long, flags_extended); - memcpy(&flags_raw, (const char *) buffer + flags_offset, - sizeof(flags_raw)); - flags_raw = ntohs(flags_raw); - - memcpy(&entry.flags_extended, &flags_raw, sizeof(flags_raw)); - path_ptr = (const char *) buffer + offsetof(struct entry_long, path); - } else - path_ptr = (const char *) buffer + offsetof(struct entry_short, path); - - path_length = entry.flags & GIT_IDXENTRY_NAMEMASK; - - /* if this is a very long string, we must find its - * real length without overflowing */ - if (path_length == 0xFFF) { - const char *path_end; - - path_end = memchr(path_ptr, '\0', buffer_size); - if (path_end == NULL) - return 0; - - path_length = path_end - path_ptr; - } - - if (entry.flags & GIT_IDXENTRY_EXTENDED) - entry_size = long_entry_size(path_length); - else - entry_size = short_entry_size(path_length); - - if (INDEX_FOOTER_SIZE + entry_size > buffer_size) - return 0; - - entry.path = (char *)path_ptr; - - if (index_entry_dup(out, index, &entry) < 0) - return 0; - - return entry_size; -} - -static int read_header(struct index_header *dest, const void *buffer) -{ - const struct index_header *source = buffer; - - dest->signature = ntohl(source->signature); - if (dest->signature != INDEX_HEADER_SIG) - return index_error_invalid("incorrect header signature"); - - dest->version = ntohl(source->version); - if (dest->version != INDEX_VERSION_NUMBER_EXT && - dest->version != INDEX_VERSION_NUMBER) - return index_error_invalid("incorrect header version"); - - dest->entry_count = ntohl(source->entry_count); - return 0; -} - -static size_t read_extension(git_index *index, const char *buffer, size_t buffer_size) -{ - struct index_extension dest; - size_t total_size; - - /* buffer is not guaranteed to be aligned */ - memcpy(&dest, buffer, sizeof(struct index_extension)); - dest.extension_size = ntohl(dest.extension_size); - - total_size = dest.extension_size + sizeof(struct index_extension); - - if (dest.extension_size > total_size || - buffer_size < total_size || - buffer_size - total_size < INDEX_FOOTER_SIZE) - return 0; - - /* optional extension */ - if (dest.signature[0] >= 'A' && dest.signature[0] <= 'Z') { - /* tree cache */ - if (memcmp(dest.signature, INDEX_EXT_TREECACHE_SIG, 4) == 0) { - if (git_tree_cache_read(&index->tree, buffer + 8, dest.extension_size, &index->tree_pool) < 0) - return 0; - } else if (memcmp(dest.signature, INDEX_EXT_UNMERGED_SIG, 4) == 0) { - if (read_reuc(index, buffer + 8, dest.extension_size) < 0) - return 0; - } else if (memcmp(dest.signature, INDEX_EXT_CONFLICT_NAME_SIG, 4) == 0) { - if (read_conflict_names(index, buffer + 8, dest.extension_size) < 0) - return 0; - } - /* else, unsupported extension. We cannot parse this, but we can skip - * it by returning `total_size */ - } else { - /* we cannot handle non-ignorable extensions; - * in fact they aren't even defined in the standard */ - return 0; - } - - return total_size; -} - -static int parse_index(git_index *index, const char *buffer, size_t buffer_size) -{ - int error = 0; - unsigned int i; - struct index_header header = { 0 }; - git_oid checksum_calculated, checksum_expected; - -#define seek_forward(_increase) { \ - if (_increase >= buffer_size) { \ - error = index_error_invalid("ran out of data while parsing"); \ - goto done; } \ - buffer += _increase; \ - buffer_size -= _increase;\ -} - - if (buffer_size < INDEX_HEADER_SIZE + INDEX_FOOTER_SIZE) - return index_error_invalid("insufficient buffer space"); - - /* Precalculate the SHA1 of the files's contents -- we'll match it to - * the provided SHA1 in the footer */ - git_hash_buf(&checksum_calculated, buffer, buffer_size - INDEX_FOOTER_SIZE); - - /* Parse header */ - if ((error = read_header(&header, buffer)) < 0) - return error; - - seek_forward(INDEX_HEADER_SIZE); - - assert(!index->entries.length); - - if (index->ignore_case) - kh_resize(idxicase, (khash_t(idxicase) *) index->entries_map, header.entry_count); - else - kh_resize(idx, index->entries_map, header.entry_count); - - /* Parse all the entries */ - for (i = 0; i < header.entry_count && buffer_size > INDEX_FOOTER_SIZE; ++i) { - git_index_entry *entry; - size_t entry_size = read_entry(&entry, index, buffer, buffer_size); - - /* 0 bytes read means an object corruption */ - if (entry_size == 0) { - error = index_error_invalid("invalid entry"); - goto done; - } - - if ((error = git_vector_insert(&index->entries, entry)) < 0) { - index_entry_free(entry); - goto done; - } - - INSERT_IN_MAP(index, entry, error); - - if (error < 0) { - index_entry_free(entry); - goto done; - } - error = 0; - - seek_forward(entry_size); - } - - if (i != header.entry_count) { - error = index_error_invalid("header entries changed while parsing"); - goto done; - } - - /* There's still space for some extensions! */ - while (buffer_size > INDEX_FOOTER_SIZE) { - size_t extension_size; - - extension_size = read_extension(index, buffer, buffer_size); - - /* see if we have read any bytes from the extension */ - if (extension_size == 0) { - error = index_error_invalid("extension is truncated"); - goto done; - } - - seek_forward(extension_size); - } - - if (buffer_size != INDEX_FOOTER_SIZE) { - error = index_error_invalid( - "buffer size does not match index footer size"); - goto done; - } - - /* 160-bit SHA-1 over the content of the index file before this checksum. */ - git_oid_fromraw(&checksum_expected, (const unsigned char *)buffer); - - if (git_oid__cmp(&checksum_calculated, &checksum_expected) != 0) { - error = index_error_invalid( - "calculated checksum does not match expected"); - goto done; - } - - git_oid_cpy(&index->checksum, &checksum_calculated); - -#undef seek_forward - - /* Entries are stored case-sensitively on disk, so re-sort now if - * in-memory index is supposed to be case-insensitive - */ - git_vector_set_sorted(&index->entries, !index->ignore_case); - git_vector_sort(&index->entries); - -done: - return error; -} - -static bool is_index_extended(git_index *index) -{ - size_t i, extended; - git_index_entry *entry; - - extended = 0; - - git_vector_foreach(&index->entries, i, entry) { - entry->flags &= ~GIT_IDXENTRY_EXTENDED; - if (entry->flags_extended & GIT_IDXENTRY_EXTENDED_FLAGS) { - extended++; - entry->flags |= GIT_IDXENTRY_EXTENDED; - } - } - - return (extended > 0); -} - -static int write_disk_entry(git_filebuf *file, git_index_entry *entry) -{ - void *mem = NULL; - struct entry_short *ondisk; - size_t path_len, disk_size; - char *path; - - path_len = ((struct entry_internal *)entry)->pathlen; - - if (entry->flags & GIT_IDXENTRY_EXTENDED) - disk_size = long_entry_size(path_len); - else - disk_size = short_entry_size(path_len); - - if (git_filebuf_reserve(file, &mem, disk_size) < 0) - return -1; - - ondisk = (struct entry_short *)mem; - - memset(ondisk, 0x0, disk_size); - - /** - * Yes, we have to truncate. - * - * The on-disk format for Index entries clearly defines - * the time and size fields to be 4 bytes each -- so even if - * we store these values with 8 bytes on-memory, they must - * be truncated to 4 bytes before writing to disk. - * - * In 2038 I will be either too dead or too rich to care about this - */ - ondisk->ctime.seconds = htonl((uint32_t)entry->ctime.seconds); - ondisk->mtime.seconds = htonl((uint32_t)entry->mtime.seconds); - ondisk->ctime.nanoseconds = htonl(entry->ctime.nanoseconds); - ondisk->mtime.nanoseconds = htonl(entry->mtime.nanoseconds); - ondisk->dev = htonl(entry->dev); - ondisk->ino = htonl(entry->ino); - ondisk->mode = htonl(entry->mode); - ondisk->uid = htonl(entry->uid); - ondisk->gid = htonl(entry->gid); - ondisk->file_size = htonl((uint32_t)entry->file_size); - - git_oid_cpy(&ondisk->oid, &entry->id); - - ondisk->flags = htons(entry->flags); - - if (entry->flags & GIT_IDXENTRY_EXTENDED) { - struct entry_long *ondisk_ext; - ondisk_ext = (struct entry_long *)ondisk; - ondisk_ext->flags_extended = htons(entry->flags_extended & - GIT_IDXENTRY_EXTENDED_FLAGS); - path = ondisk_ext->path; - } - else - path = ondisk->path; - - memcpy(path, entry->path, path_len); - - return 0; -} - -static int write_entries(git_index *index, git_filebuf *file) -{ - int error = 0; - size_t i; - git_vector case_sorted, *entries; - git_index_entry *entry; - - /* If index->entries is sorted case-insensitively, then we need - * to re-sort it case-sensitively before writing */ - if (index->ignore_case) { - git_vector_dup(&case_sorted, &index->entries, git_index_entry_cmp); - git_vector_sort(&case_sorted); - entries = &case_sorted; - } else { - entries = &index->entries; - } - - git_vector_foreach(entries, i, entry) - if ((error = write_disk_entry(file, entry)) < 0) - break; - - if (index->ignore_case) - git_vector_free(&case_sorted); - - return error; -} - -static int write_extension(git_filebuf *file, struct index_extension *header, git_buf *data) -{ - struct index_extension ondisk; - - memset(&ondisk, 0x0, sizeof(struct index_extension)); - memcpy(&ondisk, header, 4); - ondisk.extension_size = htonl(header->extension_size); - - git_filebuf_write(file, &ondisk, sizeof(struct index_extension)); - return git_filebuf_write(file, data->ptr, data->size); -} - -static int create_name_extension_data(git_buf *name_buf, git_index_name_entry *conflict_name) -{ - int error = 0; - - if (conflict_name->ancestor == NULL) - error = git_buf_put(name_buf, "\0", 1); - else - error = git_buf_put(name_buf, conflict_name->ancestor, strlen(conflict_name->ancestor) + 1); - - if (error != 0) - goto on_error; - - if (conflict_name->ours == NULL) - error = git_buf_put(name_buf, "\0", 1); - else - error = git_buf_put(name_buf, conflict_name->ours, strlen(conflict_name->ours) + 1); - - if (error != 0) - goto on_error; - - if (conflict_name->theirs == NULL) - error = git_buf_put(name_buf, "\0", 1); - else - error = git_buf_put(name_buf, conflict_name->theirs, strlen(conflict_name->theirs) + 1); - -on_error: - return error; -} - -static int write_name_extension(git_index *index, git_filebuf *file) -{ - git_buf name_buf = GIT_BUF_INIT; - git_vector *out = &index->names; - git_index_name_entry *conflict_name; - struct index_extension extension; - size_t i; - int error = 0; - - git_vector_foreach(out, i, conflict_name) { - if ((error = create_name_extension_data(&name_buf, conflict_name)) < 0) - goto done; - } - - memset(&extension, 0x0, sizeof(struct index_extension)); - memcpy(&extension.signature, INDEX_EXT_CONFLICT_NAME_SIG, 4); - extension.extension_size = (uint32_t)name_buf.size; - - error = write_extension(file, &extension, &name_buf); - - git_buf_free(&name_buf); - -done: - return error; -} - -static int create_reuc_extension_data(git_buf *reuc_buf, git_index_reuc_entry *reuc) -{ - int i; - int error = 0; - - if ((error = git_buf_put(reuc_buf, reuc->path, strlen(reuc->path) + 1)) < 0) - return error; - - for (i = 0; i < 3; i++) { - if ((error = git_buf_printf(reuc_buf, "%o", reuc->mode[i])) < 0 || - (error = git_buf_put(reuc_buf, "\0", 1)) < 0) - return error; - } - - for (i = 0; i < 3; i++) { - if (reuc->mode[i] && (error = git_buf_put(reuc_buf, (char *)&reuc->oid[i].id, GIT_OID_RAWSZ)) < 0) - return error; - } - - return 0; -} - -static int write_reuc_extension(git_index *index, git_filebuf *file) -{ - git_buf reuc_buf = GIT_BUF_INIT; - git_vector *out = &index->reuc; - git_index_reuc_entry *reuc; - struct index_extension extension; - size_t i; - int error = 0; - - git_vector_foreach(out, i, reuc) { - if ((error = create_reuc_extension_data(&reuc_buf, reuc)) < 0) - goto done; - } - - memset(&extension, 0x0, sizeof(struct index_extension)); - memcpy(&extension.signature, INDEX_EXT_UNMERGED_SIG, 4); - extension.extension_size = (uint32_t)reuc_buf.size; - - error = write_extension(file, &extension, &reuc_buf); - - git_buf_free(&reuc_buf); - -done: - return error; -} - -static int write_tree_extension(git_index *index, git_filebuf *file) -{ - struct index_extension extension; - git_buf buf = GIT_BUF_INIT; - int error; - - if (index->tree == NULL) - return 0; - - if ((error = git_tree_cache_write(&buf, index->tree)) < 0) - return error; - - memset(&extension, 0x0, sizeof(struct index_extension)); - memcpy(&extension.signature, INDEX_EXT_TREECACHE_SIG, 4); - extension.extension_size = (uint32_t)buf.size; - - error = write_extension(file, &extension, &buf); - - git_buf_free(&buf); - - return error; -} - -static void clear_uptodate(git_index *index) -{ - git_index_entry *entry; - size_t i; - - git_vector_foreach(&index->entries, i, entry) - entry->flags_extended &= ~GIT_IDXENTRY_UPTODATE; -} - -static int write_index(git_oid *checksum, git_index *index, git_filebuf *file) -{ - git_oid hash_final; - struct index_header header; - bool is_extended; - uint32_t index_version_number; - - assert(index && file); - - is_extended = is_index_extended(index); - index_version_number = is_extended ? INDEX_VERSION_NUMBER_EXT : INDEX_VERSION_NUMBER; - - header.signature = htonl(INDEX_HEADER_SIG); - header.version = htonl(index_version_number); - header.entry_count = htonl((uint32_t)index->entries.length); - - if (git_filebuf_write(file, &header, sizeof(struct index_header)) < 0) - return -1; - - if (write_entries(index, file) < 0) - return -1; - - /* write the tree cache extension */ - if (index->tree != NULL && write_tree_extension(index, file) < 0) - return -1; - - /* write the rename conflict extension */ - if (index->names.length > 0 && write_name_extension(index, file) < 0) - return -1; - - /* write the reuc extension */ - if (index->reuc.length > 0 && write_reuc_extension(index, file) < 0) - return -1; - - /* get out the hash for all the contents we've appended to the file */ - git_filebuf_hash(&hash_final, file); - git_oid_cpy(checksum, &hash_final); - - /* write it at the end of the file */ - if (git_filebuf_write(file, hash_final.id, GIT_OID_RAWSZ) < 0) - return -1; - - /* file entries are no longer up to date */ - clear_uptodate(index); - - return 0; -} - -int git_index_entry_stage(const git_index_entry *entry) -{ - return GIT_IDXENTRY_STAGE(entry); -} - -int git_index_entry_is_conflict(const git_index_entry *entry) -{ - return (GIT_IDXENTRY_STAGE(entry) > 0); -} - -typedef struct read_tree_data { - git_index *index; - git_vector *old_entries; - git_vector *new_entries; - git_vector_cmp entry_cmp; - git_tree_cache *tree; -} read_tree_data; - -static int read_tree_cb( - const char *root, const git_tree_entry *tentry, void *payload) -{ - read_tree_data *data = payload; - git_index_entry *entry = NULL, *old_entry; - git_buf path = GIT_BUF_INIT; - size_t pos; - - if (git_tree_entry__is_tree(tentry)) - return 0; - - if (git_buf_joinpath(&path, root, tentry->filename) < 0) - return -1; - - if (index_entry_create(&entry, INDEX_OWNER(data->index), path.ptr, false) < 0) - return -1; - - entry->mode = tentry->attr; - git_oid_cpy(&entry->id, git_tree_entry_id(tentry)); - - /* look for corresponding old entry and copy data to new entry */ - if (data->old_entries != NULL && - !index_find_in_entries( - &pos, data->old_entries, data->entry_cmp, path.ptr, 0, 0) && - (old_entry = git_vector_get(data->old_entries, pos)) != NULL && - entry->mode == old_entry->mode && - git_oid_equal(&entry->id, &old_entry->id)) - { - index_entry_cpy(entry, old_entry); - entry->flags_extended = 0; - } - - index_entry_adjust_namemask(entry, path.size); - git_buf_free(&path); - - if (git_vector_insert(data->new_entries, entry) < 0) { - index_entry_free(entry); - return -1; - } - - return 0; -} - -int git_index_read_tree(git_index *index, const git_tree *tree) -{ - int error = 0; - git_vector entries = GIT_VECTOR_INIT; - git_idxmap *entries_map; - read_tree_data data; - size_t i; - git_index_entry *e; - - if (git_idxmap_alloc(&entries_map) < 0) - return -1; - - git_vector_set_cmp(&entries, index->entries._cmp); /* match sort */ - - data.index = index; - data.old_entries = &index->entries; - data.new_entries = &entries; - data.entry_cmp = index->entries_search; - - index->tree = NULL; - git_pool_clear(&index->tree_pool); - - git_vector_sort(&index->entries); - - if ((error = git_tree_walk(tree, GIT_TREEWALK_POST, read_tree_cb, &data)) < 0) - goto cleanup; - - if (index->ignore_case) - kh_resize(idxicase, (khash_t(idxicase) *) entries_map, entries.length); - else - kh_resize(idx, entries_map, entries.length); - - git_vector_foreach(&entries, i, e) { - INSERT_IN_MAP_EX(index, entries_map, e, error); - - if (error < 0) { - giterr_set(GITERR_INDEX, "failed to insert entry into map"); - return error; - } - } - - error = 0; - - git_vector_sort(&entries); - - if ((error = git_index_clear(index)) < 0) { - /* well, this isn't good */; - } else { - git_vector_swap(&entries, &index->entries); - entries_map = git__swap(index->entries_map, entries_map); - } - -cleanup: - git_vector_free(&entries); - git_idxmap_free(entries_map); - if (error < 0) - return error; - - error = git_tree_cache_read_tree(&index->tree, tree, &index->tree_pool); - - return error; -} - -int git_index_read_index( - git_index *index, - const git_index *new_index) -{ - git_vector new_entries = GIT_VECTOR_INIT, - remove_entries = GIT_VECTOR_INIT; - git_idxmap *new_entries_map = NULL; - git_iterator *index_iterator = NULL; - git_iterator *new_iterator = NULL; - git_iterator_options opts = GIT_ITERATOR_OPTIONS_INIT; - const git_index_entry *old_entry, *new_entry; - git_index_entry *entry; - size_t i; - int error; - - if ((error = git_vector_init(&new_entries, new_index->entries.length, index->entries._cmp)) < 0 || - (error = git_vector_init(&remove_entries, index->entries.length, NULL)) < 0 || - (error = git_idxmap_alloc(&new_entries_map)) < 0) - goto done; - - if (index->ignore_case) - kh_resize(idxicase, (khash_t(idxicase) *) new_entries_map, new_index->entries.length); - else - kh_resize(idx, new_entries_map, new_index->entries.length); - - opts.flags = GIT_ITERATOR_DONT_IGNORE_CASE; - - if ((error = git_iterator_for_index(&index_iterator, git_index_owner(index), index, &opts)) < 0 || - (error = git_iterator_for_index(&new_iterator, git_index_owner(new_index), (git_index *)new_index, &opts)) < 0) - goto done; - - if (((error = git_iterator_current(&old_entry, index_iterator)) < 0 && - error != GIT_ITEROVER) || - ((error = git_iterator_current(&new_entry, new_iterator)) < 0 && - error != GIT_ITEROVER)) - goto done; - - while (true) { - git_index_entry - *dup_entry = NULL, - *add_entry = NULL, - *remove_entry = NULL; - int diff; - - if (old_entry && new_entry) - diff = git_index_entry_cmp(old_entry, new_entry); - else if (!old_entry && new_entry) - diff = 1; - else if (old_entry && !new_entry) - diff = -1; - else - break; - - if (diff < 0) { - remove_entry = (git_index_entry *)old_entry; - } else if (diff > 0) { - dup_entry = (git_index_entry *)new_entry; - } else { - /* Path and stage are equal, if the OID is equal, keep it to - * keep the stat cache data. - */ - if (git_oid_equal(&old_entry->id, &new_entry->id)) { - add_entry = (git_index_entry *)old_entry; - } else { - dup_entry = (git_index_entry *)new_entry; - remove_entry = (git_index_entry *)old_entry; - } - } - - if (dup_entry) { - if ((error = index_entry_dup_nocache(&add_entry, index, dup_entry)) < 0) - goto done; - } - - if (add_entry) { - if ((error = git_vector_insert(&new_entries, add_entry)) == 0) - INSERT_IN_MAP_EX(index, new_entries_map, add_entry, error); - } - - if (remove_entry && error >= 0) - error = git_vector_insert(&remove_entries, remove_entry); - - if (error < 0) { - giterr_set(GITERR_INDEX, "failed to insert entry"); - return error; - } - - if (diff <= 0) { - if ((error = git_iterator_advance(&old_entry, index_iterator)) < 0 && - error != GIT_ITEROVER) - goto done; - } - - if (diff >= 0) { - if ((error = git_iterator_advance(&new_entry, new_iterator)) < 0 && - error != GIT_ITEROVER) - goto done; - } - } - - git_index_name_clear(index); - git_index_reuc_clear(index); - - git_vector_swap(&new_entries, &index->entries); - new_entries_map = git__swap(index->entries_map, new_entries_map); - - git_vector_foreach(&remove_entries, i, entry) { - if (index->tree) - git_tree_cache_invalidate_path(index->tree, entry->path); - - index_entry_free(entry); - } - - error = 0; - -done: - git_idxmap_free(new_entries_map); - git_vector_free(&new_entries); - git_vector_free(&remove_entries); - git_iterator_free(index_iterator); - git_iterator_free(new_iterator); - return error; -} - -git_repository *git_index_owner(const git_index *index) -{ - return INDEX_OWNER(index); -} - -enum { - INDEX_ACTION_NONE = 0, - INDEX_ACTION_UPDATE = 1, - INDEX_ACTION_REMOVE = 2, - INDEX_ACTION_ADDALL = 3, -}; - -int git_index_add_all( - git_index *index, - const git_strarray *paths, - unsigned int flags, - git_index_matched_path_cb cb, - void *payload) -{ - int error; - git_repository *repo; - git_iterator *wditer = NULL; - git_pathspec ps; - bool no_fnmatch = (flags & GIT_INDEX_ADD_DISABLE_PATHSPEC_MATCH) != 0; - - assert(index); - - repo = INDEX_OWNER(index); - if ((error = git_repository__ensure_not_bare(repo, "index add all")) < 0) - return error; - - if ((error = git_pathspec__init(&ps, paths)) < 0) - return error; - - /* optionally check that pathspec doesn't mention any ignored files */ - if ((flags & GIT_INDEX_ADD_CHECK_PATHSPEC) != 0 && - (flags & GIT_INDEX_ADD_FORCE) == 0 && - (error = git_ignore__check_pathspec_for_exact_ignores( - repo, &ps.pathspec, no_fnmatch)) < 0) - goto cleanup; - - error = index_apply_to_wd_diff(index, INDEX_ACTION_ADDALL, paths, flags, cb, payload); - - if (error) - giterr_set_after_callback(error); - -cleanup: - git_iterator_free(wditer); - git_pathspec__clear(&ps); - - return error; -} - -struct foreach_diff_data { - git_index *index; - const git_pathspec *pathspec; - unsigned int flags; - git_index_matched_path_cb cb; - void *payload; -}; - -static int apply_each_file(const git_diff_delta *delta, float progress, void *payload) -{ - struct foreach_diff_data *data = payload; - const char *match, *path; - int error = 0; - - GIT_UNUSED(progress); - - path = delta->old_file.path; - - /* We only want those which match the pathspecs */ - if (!git_pathspec__match( - &data->pathspec->pathspec, path, false, (bool)data->index->ignore_case, - &match, NULL)) - return 0; - - if (data->cb) - error = data->cb(path, match, data->payload); - - if (error > 0) /* skip this entry */ - return 0; - if (error < 0) /* actual error */ - return error; - - /* If the workdir item does not exist, remove it from the index. */ - if ((delta->new_file.flags & GIT_DIFF_FLAG_EXISTS) == 0) - error = git_index_remove_bypath(data->index, path); - else - error = git_index_add_bypath(data->index, delta->new_file.path); - - return error; -} - -static int index_apply_to_wd_diff(git_index *index, int action, const git_strarray *paths, - unsigned int flags, - git_index_matched_path_cb cb, void *payload) -{ - int error; - git_diff *diff; - git_pathspec ps; - git_repository *repo; - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - struct foreach_diff_data data = { - index, - NULL, - flags, - cb, - payload, - }; - - assert(index); - assert(action == INDEX_ACTION_UPDATE || action == INDEX_ACTION_ADDALL); - - repo = INDEX_OWNER(index); - - if (!repo) { - return create_index_error(-1, - "cannot run update; the index is not backed up by a repository."); - } - - /* - * We do the matching ourselves intead of passing the list to - * diff because we want to tell the callback which one - * matched, which we do not know if we ask diff to filter for us. - */ - if ((error = git_pathspec__init(&ps, paths)) < 0) - return error; - - opts.flags = GIT_DIFF_INCLUDE_TYPECHANGE; - if (action == INDEX_ACTION_ADDALL) { - opts.flags |= GIT_DIFF_INCLUDE_UNTRACKED | - GIT_DIFF_RECURSE_UNTRACKED_DIRS; - - if (flags == GIT_INDEX_ADD_FORCE) - opts.flags |= GIT_DIFF_INCLUDE_IGNORED; - } - - if ((error = git_diff_index_to_workdir(&diff, repo, index, &opts)) < 0) - goto cleanup; - - data.pathspec = &ps; - error = git_diff_foreach(diff, apply_each_file, NULL, NULL, NULL, &data); - git_diff_free(diff); - - if (error) /* make sure error is set if callback stopped iteration */ - giterr_set_after_callback(error); - -cleanup: - git_pathspec__clear(&ps); - return error; -} - -static int index_apply_to_all( - git_index *index, - int action, - const git_strarray *paths, - git_index_matched_path_cb cb, - void *payload) -{ - int error = 0; - size_t i; - git_pathspec ps; - const char *match; - git_buf path = GIT_BUF_INIT; - - assert(index); - - if ((error = git_pathspec__init(&ps, paths)) < 0) - return error; - - git_vector_sort(&index->entries); - - for (i = 0; !error && i < index->entries.length; ++i) { - git_index_entry *entry = git_vector_get(&index->entries, i); - - /* check if path actually matches */ - if (!git_pathspec__match( - &ps.pathspec, entry->path, false, (bool)index->ignore_case, - &match, NULL)) - continue; - - /* issue notification callback if requested */ - if (cb && (error = cb(entry->path, match, payload)) != 0) { - if (error > 0) { /* return > 0 means skip this one */ - error = 0; - continue; - } - if (error < 0) /* return < 0 means abort */ - break; - } - - /* index manipulation may alter entry, so don't depend on it */ - if ((error = git_buf_sets(&path, entry->path)) < 0) - break; - - switch (action) { - case INDEX_ACTION_NONE: - break; - case INDEX_ACTION_UPDATE: - error = git_index_add_bypath(index, path.ptr); - - if (error == GIT_ENOTFOUND) { - giterr_clear(); - - error = git_index_remove_bypath(index, path.ptr); - - if (!error) /* back up foreach if we removed this */ - i--; - } - break; - case INDEX_ACTION_REMOVE: - if (!(error = git_index_remove_bypath(index, path.ptr))) - i--; /* back up foreach if we removed this */ - break; - default: - giterr_set(GITERR_INVALID, "Unknown index action %d", action); - error = -1; - break; - } - } - - git_buf_free(&path); - git_pathspec__clear(&ps); - - return error; -} - -int git_index_remove_all( - git_index *index, - const git_strarray *pathspec, - git_index_matched_path_cb cb, - void *payload) -{ - int error = index_apply_to_all( - index, INDEX_ACTION_REMOVE, pathspec, cb, payload); - - if (error) /* make sure error is set if callback stopped iteration */ - giterr_set_after_callback(error); - - return error; -} - -int git_index_update_all( - git_index *index, - const git_strarray *pathspec, - git_index_matched_path_cb cb, - void *payload) -{ - int error = index_apply_to_wd_diff(index, INDEX_ACTION_UPDATE, pathspec, 0, cb, payload); - if (error) /* make sure error is set if callback stopped iteration */ - giterr_set_after_callback(error); - - return error; -} - -int git_index_snapshot_new(git_vector *snap, git_index *index) -{ - int error; - - GIT_REFCOUNT_INC(index); - - git_atomic_inc(&index->readers); - git_vector_sort(&index->entries); - - error = git_vector_dup(snap, &index->entries, index->entries._cmp); - - if (error < 0) - git_index_free(index); - - return error; -} - -void git_index_snapshot_release(git_vector *snap, git_index *index) -{ - git_vector_free(snap); - - git_atomic_dec(&index->readers); - - git_index_free(index); -} - -int git_index_snapshot_find( - size_t *out, git_vector *entries, git_vector_cmp entry_srch, - const char *path, size_t path_len, int stage) -{ - return index_find_in_entries(out, entries, entry_srch, path, path_len, stage); -} - -int git_indexwriter_init( - git_indexwriter *writer, - git_index *index) -{ - int error; - - GIT_REFCOUNT_INC(index); - - writer->index = index; - - if (!index->index_file_path) - return create_index_error(-1, - "Failed to write index: The index is in-memory only"); - - if ((error = git_filebuf_open( - &writer->file, index->index_file_path, GIT_FILEBUF_HASH_CONTENTS, GIT_INDEX_FILE_MODE)) < 0) { - - if (error == GIT_ELOCKED) - giterr_set(GITERR_INDEX, "The index is locked. This might be due to a concurrent or crashed process"); - - return error; - } - - writer->should_write = 1; - - return 0; -} - -int git_indexwriter_init_for_operation( - git_indexwriter *writer, - git_repository *repo, - unsigned int *checkout_strategy) -{ - git_index *index; - int error; - - if ((error = git_repository_index__weakptr(&index, repo)) < 0 || - (error = git_indexwriter_init(writer, index)) < 0) - return error; - - writer->should_write = (*checkout_strategy & GIT_CHECKOUT_DONT_WRITE_INDEX) == 0; - *checkout_strategy |= GIT_CHECKOUT_DONT_WRITE_INDEX; - - return 0; -} - -int git_indexwriter_commit(git_indexwriter *writer) -{ - int error; - git_oid checksum = {{ 0 }}; - - if (!writer->should_write) - return 0; - - git_vector_sort(&writer->index->entries); - git_vector_sort(&writer->index->reuc); - - if ((error = write_index(&checksum, writer->index, &writer->file)) < 0) { - git_indexwriter_cleanup(writer); - return error; - } - - if ((error = git_filebuf_commit(&writer->file)) < 0) - return error; - - if ((error = git_futils_filestamp_check( - &writer->index->stamp, writer->index->index_file_path)) < 0) { - giterr_set(GITERR_OS, "Could not read index timestamp"); - return -1; - } - - writer->index->on_disk = 1; - git_oid_cpy(&writer->index->checksum, &checksum); - - git_index_free(writer->index); - writer->index = NULL; - - return 0; -} - -void git_indexwriter_cleanup(git_indexwriter *writer) -{ - git_filebuf_cleanup(&writer->file); - - git_index_free(writer->index); - writer->index = NULL; -} diff --git a/vendor/libgit2/src/index.h b/vendor/libgit2/src/index.h deleted file mode 100644 index 8b9b49498..000000000 --- a/vendor/libgit2/src/index.h +++ /dev/null @@ -1,171 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_index_h__ -#define INCLUDE_index_h__ - -#include "fileops.h" -#include "filebuf.h" -#include "vector.h" -#include "idxmap.h" -#include "tree-cache.h" -#include "git2/odb.h" -#include "git2/index.h" - -#define GIT_INDEX_FILE "index" -#define GIT_INDEX_FILE_MODE 0666 - -struct git_index { - git_refcount rc; - - char *index_file_path; - git_futils_filestamp stamp; - git_oid checksum; /* checksum at the end of the file */ - - git_vector entries; - git_idxmap *entries_map; - - git_vector deleted; /* deleted entries if readers > 0 */ - git_atomic readers; /* number of active iterators */ - - unsigned int on_disk:1; - unsigned int ignore_case:1; - unsigned int distrust_filemode:1; - unsigned int no_symlinks:1; - - git_tree_cache *tree; - git_pool tree_pool; - - git_vector names; - git_vector reuc; - - git_vector_cmp entries_cmp_path; - git_vector_cmp entries_search; - git_vector_cmp entries_search_path; - git_vector_cmp reuc_search; -}; - -struct git_index_conflict_iterator { - git_index *index; - size_t cur; -}; - -extern void git_index_entry__init_from_stat( - git_index_entry *entry, struct stat *st, bool trust_mode); - -/* Index entry comparison functions for array sorting */ -extern int git_index_entry_cmp(const void *a, const void *b); -extern int git_index_entry_icmp(const void *a, const void *b); - -/* Index entry search functions for search using a search spec */ -extern int git_index_entry_srch(const void *a, const void *b); -extern int git_index_entry_isrch(const void *a, const void *b); - -/* Index time handling functions */ -GIT_INLINE(bool) git_index_time_eq(const git_index_time *one, const git_index_time *two) -{ - if (one->seconds != two->seconds) - return false; - -#ifdef GIT_USE_NSEC - if (one->nanoseconds != two->nanoseconds) - return false; -#endif - - return true; -} - -/* - * Test if the given index time is newer than the given existing index entry. - * If the timestamps are exactly equivalent, then the given index time is - * considered "racily newer" than the existing index entry. - */ -GIT_INLINE(bool) git_index_entry_newer_than_index( - const git_index_entry *entry, git_index *index) -{ - /* If we never read the index, we can't have this race either */ - if (!index || index->stamp.mtime.tv_sec == 0) - return false; - - /* If the timestamp is the same or newer than the index, it's racy */ -#if defined(GIT_USE_NSEC) - if ((int32_t)index->stamp.mtime.tv_sec < entry->mtime.seconds) - return true; - else if ((int32_t)index->stamp.mtime.tv_sec > entry->mtime.seconds) - return false; - else - return (uint32_t)index->stamp.mtime.tv_nsec <= entry->mtime.nanoseconds; -#else - return ((int32_t)index->stamp.mtime.tv_sec) <= entry->mtime.seconds; -#endif -} - -/* Search index for `path`, returning GIT_ENOTFOUND if it does not exist - * (but not setting an error message). - * - * `at_pos` is set to the position where it is or would be inserted. - * Pass `path_len` as strlen of path or 0 to call strlen internally. - */ -extern int git_index__find_pos( - size_t *at_pos, git_index *index, const char *path, size_t path_len, int stage); - -extern int git_index__fill(git_index *index, const git_vector *source_entries); - -extern void git_index__set_ignore_case(git_index *index, bool ignore_case); - -extern unsigned int git_index__create_mode(unsigned int mode); - -GIT_INLINE(const git_futils_filestamp *) git_index__filestamp(git_index *index) -{ - return &index->stamp; -} - -extern int git_index__changed_relative_to(git_index *index, const git_oid *checksum); - -/* Copy the current entries vector *and* increment the index refcount. - * Call `git_index__release_snapshot` when done. - */ -extern int git_index_snapshot_new(git_vector *snap, git_index *index); -extern void git_index_snapshot_release(git_vector *snap, git_index *index); - -/* Allow searching in a snapshot; entries must already be sorted! */ -extern int git_index_snapshot_find( - size_t *at_pos, git_vector *snap, git_vector_cmp entry_srch, - const char *path, size_t path_len, int stage); - -/* Replace an index with a new index */ -int git_index_read_index(git_index *index, const git_index *new_index); - -typedef struct { - git_index *index; - git_filebuf file; - unsigned int should_write:1; -} git_indexwriter; - -#define GIT_INDEXWRITER_INIT { NULL, GIT_FILEBUF_INIT } - -/* Lock the index for eventual writing. */ -extern int git_indexwriter_init(git_indexwriter *writer, git_index *index); - -/* Lock the index for eventual writing by a repository operation: a merge, - * revert, cherry-pick or a rebase. Note that the given checkout strategy - * will be updated for the operation's use so that checkout will not write - * the index. - */ -extern int git_indexwriter_init_for_operation( - git_indexwriter *writer, - git_repository *repo, - unsigned int *checkout_strategy); - -/* Write the index and unlock it. */ -extern int git_indexwriter_commit(git_indexwriter *writer); - -/* Cleanup an index writing session, unlocking the file (if it is still - * locked and freeing any data structures. - */ -extern void git_indexwriter_cleanup(git_indexwriter *writer); - -#endif diff --git a/vendor/libgit2/src/indexer.c b/vendor/libgit2/src/indexer.c deleted file mode 100644 index a3a866989..000000000 --- a/vendor/libgit2/src/indexer.c +++ /dev/null @@ -1,1095 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "git2/indexer.h" -#include "git2/object.h" - -#include "common.h" -#include "pack.h" -#include "mwindow.h" -#include "posix.h" -#include "pack.h" -#include "filebuf.h" -#include "oid.h" -#include "oidmap.h" -#include "zstream.h" - -GIT__USE_OIDMAP - -extern git_mutex git__mwindow_mutex; - -#define UINT31_MAX (0x7FFFFFFF) - -struct entry { - git_oid oid; - uint32_t crc; - uint32_t offset; - uint64_t offset_long; -}; - -struct git_indexer { - unsigned int parsed_header :1, - opened_pack :1, - have_stream :1, - have_delta :1; - struct git_pack_header hdr; - struct git_pack_file *pack; - unsigned int mode; - git_off_t off; - git_off_t entry_start; - git_packfile_stream stream; - size_t nr_objects; - git_vector objects; - git_vector deltas; - unsigned int fanout[256]; - git_hash_ctx hash_ctx; - git_oid hash; - git_transfer_progress_cb progress_cb; - void *progress_payload; - char objbuf[8*1024]; - - /* Needed to look up objects which we want to inject to fix a thin pack */ - git_odb *odb; - - /* Fields for calculating the packfile trailer (hash of everything before it) */ - char inbuf[GIT_OID_RAWSZ]; - size_t inbuf_len; - git_hash_ctx trailer; -}; - -struct delta_info { - git_off_t delta_off; -}; - -const git_oid *git_indexer_hash(const git_indexer *idx) -{ - return &idx->hash; -} - -static int parse_header(struct git_pack_header *hdr, struct git_pack_file *pack) -{ - int error; - git_map map; - - if ((error = p_mmap(&map, sizeof(*hdr), GIT_PROT_READ, GIT_MAP_SHARED, pack->mwf.fd, 0)) < 0) - return error; - - memcpy(hdr, map.data, sizeof(*hdr)); - p_munmap(&map); - - /* Verify we recognize this pack file format. */ - if (hdr->hdr_signature != ntohl(PACK_SIGNATURE)) { - giterr_set(GITERR_INDEXER, "Wrong pack signature"); - return -1; - } - - if (!pack_version_ok(hdr->hdr_version)) { - giterr_set(GITERR_INDEXER, "Wrong pack version"); - return -1; - } - - return 0; -} - -static int objects_cmp(const void *a, const void *b) -{ - const struct entry *entrya = a; - const struct entry *entryb = b; - - return git_oid__cmp(&entrya->oid, &entryb->oid); -} - -int git_indexer_new( - git_indexer **out, - const char *prefix, - unsigned int mode, - git_odb *odb, - git_transfer_progress_cb progress_cb, - void *progress_payload) -{ - git_indexer *idx; - git_buf path = GIT_BUF_INIT, tmp_path = GIT_BUF_INIT; - static const char suff[] = "/pack"; - int error, fd = -1; - - idx = git__calloc(1, sizeof(git_indexer)); - GITERR_CHECK_ALLOC(idx); - idx->odb = odb; - idx->progress_cb = progress_cb; - idx->progress_payload = progress_payload; - idx->mode = mode ? mode : GIT_PACK_FILE_MODE; - git_hash_ctx_init(&idx->hash_ctx); - git_hash_ctx_init(&idx->trailer); - - error = git_buf_joinpath(&path, prefix, suff); - if (error < 0) - goto cleanup; - - fd = git_futils_mktmp(&tmp_path, git_buf_cstr(&path), idx->mode); - git_buf_free(&path); - if (fd < 0) - goto cleanup; - - error = git_packfile_alloc(&idx->pack, git_buf_cstr(&tmp_path)); - git_buf_free(&tmp_path); - - if (error < 0) - goto cleanup; - - idx->pack->mwf.fd = fd; - if ((error = git_mwindow_file_register(&idx->pack->mwf)) < 0) - goto cleanup; - - *out = idx; - return 0; - -cleanup: - if (fd != -1) - p_close(fd); - - git_buf_free(&path); - git_buf_free(&tmp_path); - git__free(idx); - return -1; -} - -/* Try to store the delta so we can try to resolve it later */ -static int store_delta(git_indexer *idx) -{ - struct delta_info *delta; - - delta = git__calloc(1, sizeof(struct delta_info)); - GITERR_CHECK_ALLOC(delta); - delta->delta_off = idx->entry_start; - - if (git_vector_insert(&idx->deltas, delta) < 0) - return -1; - - return 0; -} - -static void hash_header(git_hash_ctx *ctx, git_off_t len, git_otype type) -{ - char buffer[64]; - size_t hdrlen; - - hdrlen = git_odb__format_object_header(buffer, sizeof(buffer), (size_t)len, type); - git_hash_update(ctx, buffer, hdrlen); -} - -static int hash_object_stream(git_indexer*idx, git_packfile_stream *stream) -{ - ssize_t read; - - assert(idx && stream); - - do { - if ((read = git_packfile_stream_read(stream, idx->objbuf, sizeof(idx->objbuf))) < 0) - break; - - git_hash_update(&idx->hash_ctx, idx->objbuf, read); - } while (read > 0); - - if (read < 0) - return (int)read; - - return 0; -} - -/* In order to create the packfile stream, we need to skip over the delta base description */ -static int advance_delta_offset(git_indexer *idx, git_otype type) -{ - git_mwindow *w = NULL; - - assert(type == GIT_OBJ_REF_DELTA || type == GIT_OBJ_OFS_DELTA); - - if (type == GIT_OBJ_REF_DELTA) { - idx->off += GIT_OID_RAWSZ; - } else { - git_off_t base_off = get_delta_base(idx->pack, &w, &idx->off, type, idx->entry_start); - git_mwindow_close(&w); - if (base_off < 0) - return (int)base_off; - } - - return 0; -} - -/* Read from the stream and discard any output */ -static int read_object_stream(git_indexer *idx, git_packfile_stream *stream) -{ - ssize_t read; - - assert(stream); - - do { - read = git_packfile_stream_read(stream, idx->objbuf, sizeof(idx->objbuf)); - } while (read > 0); - - if (read < 0) - return (int)read; - - return 0; -} - -static int crc_object(uint32_t *crc_out, git_mwindow_file *mwf, git_off_t start, git_off_t size) -{ - void *ptr; - uint32_t crc; - unsigned int left, len; - git_mwindow *w = NULL; - - crc = crc32(0L, Z_NULL, 0); - while (size) { - ptr = git_mwindow_open(mwf, &w, start, (size_t)size, &left); - if (ptr == NULL) - return -1; - - len = min(left, (unsigned int)size); - crc = crc32(crc, ptr, len); - size -= len; - start += len; - git_mwindow_close(&w); - } - - *crc_out = htonl(crc); - return 0; -} - -static int store_object(git_indexer *idx) -{ - int i, error; - khiter_t k; - git_oid oid; - struct entry *entry; - git_off_t entry_size; - struct git_pack_entry *pentry; - git_off_t entry_start = idx->entry_start; - - entry = git__calloc(1, sizeof(*entry)); - GITERR_CHECK_ALLOC(entry); - - pentry = git__calloc(1, sizeof(struct git_pack_entry)); - GITERR_CHECK_ALLOC(pentry); - - git_hash_final(&oid, &idx->hash_ctx); - entry_size = idx->off - entry_start; - if (entry_start > UINT31_MAX) { - entry->offset = UINT32_MAX; - entry->offset_long = entry_start; - } else { - entry->offset = (uint32_t)entry_start; - } - - git_oid_cpy(&pentry->sha1, &oid); - pentry->offset = entry_start; - - k = kh_put(oid, idx->pack->idx_cache, &pentry->sha1, &error); - if (error == -1) { - git__free(pentry); - giterr_set_oom(); - goto on_error; - } - - if (error == 0) { - giterr_set(GITERR_INDEXER, "duplicate object %s found in pack", git_oid_tostr_s(&pentry->sha1)); - git__free(pentry); - goto on_error; - } - - - kh_value(idx->pack->idx_cache, k) = pentry; - - git_oid_cpy(&entry->oid, &oid); - - if (crc_object(&entry->crc, &idx->pack->mwf, entry_start, entry_size) < 0) - goto on_error; - - /* Add the object to the list */ - if (git_vector_insert(&idx->objects, entry) < 0) - goto on_error; - - for (i = oid.id[0]; i < 256; ++i) { - idx->fanout[i]++; - } - - return 0; - -on_error: - git__free(entry); - - return -1; -} - -GIT_INLINE(bool) has_entry(git_indexer *idx, git_oid *id) -{ - khiter_t k; - k = kh_get(oid, idx->pack->idx_cache, id); - return (k != kh_end(idx->pack->idx_cache)); -} - -static int save_entry(git_indexer *idx, struct entry *entry, struct git_pack_entry *pentry, git_off_t entry_start) -{ - int i, error; - khiter_t k; - - if (entry_start > UINT31_MAX) { - entry->offset = UINT32_MAX; - entry->offset_long = entry_start; - } else { - entry->offset = (uint32_t)entry_start; - } - - pentry->offset = entry_start; - k = kh_put(oid, idx->pack->idx_cache, &pentry->sha1, &error); - - if (error <= 0) { - giterr_set(GITERR_INDEXER, "cannot insert object into pack"); - return -1; - } - - kh_value(idx->pack->idx_cache, k) = pentry; - - /* Add the object to the list */ - if (git_vector_insert(&idx->objects, entry) < 0) - return -1; - - for (i = entry->oid.id[0]; i < 256; ++i) { - idx->fanout[i]++; - } - - return 0; -} - -static int hash_and_save(git_indexer *idx, git_rawobj *obj, git_off_t entry_start) -{ - git_oid oid; - size_t entry_size; - struct entry *entry; - struct git_pack_entry *pentry = NULL; - - entry = git__calloc(1, sizeof(*entry)); - GITERR_CHECK_ALLOC(entry); - - if (git_odb__hashobj(&oid, obj) < 0) { - giterr_set(GITERR_INDEXER, "Failed to hash object"); - goto on_error; - } - - pentry = git__calloc(1, sizeof(struct git_pack_entry)); - GITERR_CHECK_ALLOC(pentry); - - git_oid_cpy(&pentry->sha1, &oid); - git_oid_cpy(&entry->oid, &oid); - entry->crc = crc32(0L, Z_NULL, 0); - - entry_size = (size_t)(idx->off - entry_start); - if (crc_object(&entry->crc, &idx->pack->mwf, entry_start, entry_size) < 0) - goto on_error; - - return save_entry(idx, entry, pentry, entry_start); - -on_error: - git__free(pentry); - git__free(entry); - git__free(obj->data); - return -1; -} - -static int do_progress_callback(git_indexer *idx, git_transfer_progress *stats) -{ - if (idx->progress_cb) - return giterr_set_after_callback_function( - idx->progress_cb(stats, idx->progress_payload), - "indexer progress"); - return 0; -} - -/* Hash everything but the last 20B of input */ -static void hash_partially(git_indexer *idx, const uint8_t *data, size_t size) -{ - size_t to_expell, to_keep; - - if (size == 0) - return; - - /* Easy case, dump the buffer and the data minus the last 20 bytes */ - if (size >= GIT_OID_RAWSZ) { - git_hash_update(&idx->trailer, idx->inbuf, idx->inbuf_len); - git_hash_update(&idx->trailer, data, size - GIT_OID_RAWSZ); - - data += size - GIT_OID_RAWSZ; - memcpy(idx->inbuf, data, GIT_OID_RAWSZ); - idx->inbuf_len = GIT_OID_RAWSZ; - return; - } - - /* We can just append */ - if (idx->inbuf_len + size <= GIT_OID_RAWSZ) { - memcpy(idx->inbuf + idx->inbuf_len, data, size); - idx->inbuf_len += size; - return; - } - - /* We need to partially drain the buffer and then append */ - to_keep = GIT_OID_RAWSZ - size; - to_expell = idx->inbuf_len - to_keep; - - git_hash_update(&idx->trailer, idx->inbuf, to_expell); - - memmove(idx->inbuf, idx->inbuf + to_expell, to_keep); - memcpy(idx->inbuf + to_keep, data, size); - idx->inbuf_len += size - to_expell; -} - -static int write_at(git_indexer *idx, const void *data, git_off_t offset, size_t size) -{ - git_file fd = idx->pack->mwf.fd; - size_t mmap_alignment; - size_t page_offset; - git_off_t page_start; - unsigned char *map_data; - git_map map; - int error; - - assert(data && size); - - if ((error = git__mmap_alignment(&mmap_alignment)) < 0) - return error; - - /* the offset needs to be at the mmap boundary for the platform */ - page_offset = offset % mmap_alignment; - page_start = offset - page_offset; - - if ((error = p_mmap(&map, page_offset + size, GIT_PROT_WRITE, GIT_MAP_SHARED, fd, page_start)) < 0) - return error; - - map_data = (unsigned char *)map.data; - memcpy(map_data + page_offset, data, size); - p_munmap(&map); - - return 0; -} - -static int append_to_pack(git_indexer *idx, const void *data, size_t size) -{ - git_off_t current_size = idx->pack->mwf.size; - int fd = idx->pack->mwf.fd; - - if (!size) - return 0; - - if (p_lseek(fd, current_size + size - 1, SEEK_SET) < 0 || - p_write(idx->pack->mwf.fd, data, 1) < 0) { - giterr_set(GITERR_OS, "cannot extend packfile '%s'", idx->pack->pack_name); - return -1; - } - - return write_at(idx, data, idx->pack->mwf.size, size); -} - -int git_indexer_append(git_indexer *idx, const void *data, size_t size, git_transfer_progress *stats) -{ - int error = -1; - size_t processed; - struct git_pack_header *hdr = &idx->hdr; - git_mwindow_file *mwf = &idx->pack->mwf; - - assert(idx && data && stats); - - processed = stats->indexed_objects; - - if ((error = append_to_pack(idx, data, size)) < 0) - return error; - - hash_partially(idx, data, (int)size); - - /* Make sure we set the new size of the pack */ - idx->pack->mwf.size += size; - - if (!idx->parsed_header) { - unsigned int total_objects; - - if ((unsigned)idx->pack->mwf.size < sizeof(struct git_pack_header)) - return 0; - - if ((error = parse_header(&idx->hdr, idx->pack)) < 0) - return error; - - idx->parsed_header = 1; - idx->nr_objects = ntohl(hdr->hdr_entries); - idx->off = sizeof(struct git_pack_header); - - /* for now, limit to 2^32 objects */ - assert(idx->nr_objects == (size_t)((unsigned int)idx->nr_objects)); - if (idx->nr_objects == (size_t)((unsigned int)idx->nr_objects)) - total_objects = (unsigned int)idx->nr_objects; - else - total_objects = UINT_MAX; - - idx->pack->idx_cache = git_oidmap_alloc(); - GITERR_CHECK_ALLOC(idx->pack->idx_cache); - - idx->pack->has_cache = 1; - if (git_vector_init(&idx->objects, total_objects, objects_cmp) < 0) - return -1; - - if (git_vector_init(&idx->deltas, total_objects / 2, NULL) < 0) - return -1; - - stats->received_objects = 0; - stats->local_objects = 0; - stats->total_deltas = 0; - stats->indexed_deltas = 0; - processed = stats->indexed_objects = 0; - stats->total_objects = total_objects; - - if ((error = do_progress_callback(idx, stats)) != 0) - return error; - } - - /* Now that we have data in the pack, let's try to parse it */ - - /* As the file grows any windows we try to use will be out of date */ - git_mwindow_free_all(mwf); - - while (processed < idx->nr_objects) { - git_packfile_stream *stream = &idx->stream; - git_off_t entry_start = idx->off; - size_t entry_size; - git_otype type; - git_mwindow *w = NULL; - - if (idx->pack->mwf.size <= idx->off + 20) - return 0; - - if (!idx->have_stream) { - error = git_packfile_unpack_header(&entry_size, &type, mwf, &w, &idx->off); - if (error == GIT_EBUFS) { - idx->off = entry_start; - return 0; - } - if (error < 0) - goto on_error; - - git_mwindow_close(&w); - idx->entry_start = entry_start; - git_hash_init(&idx->hash_ctx); - - if (type == GIT_OBJ_REF_DELTA || type == GIT_OBJ_OFS_DELTA) { - error = advance_delta_offset(idx, type); - if (error == GIT_EBUFS) { - idx->off = entry_start; - return 0; - } - if (error < 0) - goto on_error; - - idx->have_delta = 1; - } else { - idx->have_delta = 0; - hash_header(&idx->hash_ctx, entry_size, type); - } - - idx->have_stream = 1; - - error = git_packfile_stream_open(stream, idx->pack, idx->off); - if (error < 0) - goto on_error; - } - - if (idx->have_delta) { - error = read_object_stream(idx, stream); - } else { - error = hash_object_stream(idx, stream); - } - - idx->off = stream->curpos; - if (error == GIT_EBUFS) - return 0; - - /* We want to free the stream reasorces no matter what here */ - idx->have_stream = 0; - git_packfile_stream_free(stream); - - if (error < 0) - goto on_error; - - if (idx->have_delta) { - error = store_delta(idx); - } else { - error = store_object(idx); - } - - if (error < 0) - goto on_error; - - if (!idx->have_delta) { - stats->indexed_objects = (unsigned int)++processed; - } - stats->received_objects++; - - if ((error = do_progress_callback(idx, stats)) != 0) - goto on_error; - } - - return 0; - -on_error: - git_mwindow_free_all(mwf); - return error; -} - -static int index_path(git_buf *path, git_indexer *idx, const char *suffix) -{ - const char prefix[] = "pack-"; - size_t slash = (size_t)path->size; - - /* search backwards for '/' */ - while (slash > 0 && path->ptr[slash - 1] != '/') - slash--; - - if (git_buf_grow(path, slash + 1 + strlen(prefix) + - GIT_OID_HEXSZ + strlen(suffix) + 1) < 0) - return -1; - - git_buf_truncate(path, slash); - git_buf_puts(path, prefix); - git_oid_fmt(path->ptr + git_buf_len(path), &idx->hash); - path->size += GIT_OID_HEXSZ; - git_buf_puts(path, suffix); - - return git_buf_oom(path) ? -1 : 0; -} - -/** - * Rewind the packfile by the trailer, as we might need to fix the - * packfile by injecting objects at the tail and must overwrite it. - */ -static void seek_back_trailer(git_indexer *idx) -{ - idx->pack->mwf.size -= GIT_OID_RAWSZ; - git_mwindow_free_all(&idx->pack->mwf); -} - -static int inject_object(git_indexer *idx, git_oid *id) -{ - git_odb_object *obj; - struct entry *entry; - struct git_pack_entry *pentry = NULL; - git_oid foo = {{0}}; - unsigned char hdr[64]; - git_buf buf = GIT_BUF_INIT; - git_off_t entry_start; - const void *data; - size_t len, hdr_len; - int error; - - seek_back_trailer(idx); - entry_start = idx->pack->mwf.size; - - if (git_odb_read(&obj, idx->odb, id) < 0) { - giterr_set(GITERR_INDEXER, "missing delta bases"); - return -1; - } - - data = git_odb_object_data(obj); - len = git_odb_object_size(obj); - - entry = git__calloc(1, sizeof(*entry)); - GITERR_CHECK_ALLOC(entry); - - entry->crc = crc32(0L, Z_NULL, 0); - - /* Write out the object header */ - hdr_len = git_packfile__object_header(hdr, len, git_odb_object_type(obj)); - if ((error = append_to_pack(idx, hdr, hdr_len)) < 0) - goto cleanup; - - idx->pack->mwf.size += hdr_len; - entry->crc = crc32(entry->crc, hdr, (uInt)hdr_len); - - if ((error = git_zstream_deflatebuf(&buf, data, len)) < 0) - goto cleanup; - - /* And then the compressed object */ - if ((error = append_to_pack(idx, buf.ptr, buf.size)) < 0) - goto cleanup; - - idx->pack->mwf.size += buf.size; - entry->crc = htonl(crc32(entry->crc, (unsigned char *)buf.ptr, (uInt)buf.size)); - git_buf_free(&buf); - - /* Write a fake trailer so the pack functions play ball */ - - if ((error = append_to_pack(idx, &foo, GIT_OID_RAWSZ)) < 0) - goto cleanup; - - idx->pack->mwf.size += GIT_OID_RAWSZ; - - pentry = git__calloc(1, sizeof(struct git_pack_entry)); - GITERR_CHECK_ALLOC(pentry); - - git_oid_cpy(&pentry->sha1, id); - git_oid_cpy(&entry->oid, id); - idx->off = entry_start + hdr_len + len; - - error = save_entry(idx, entry, pentry, entry_start); - -cleanup: - if (error) { - git__free(entry); - git__free(pentry); - } - - git_odb_object_free(obj); - return error; -} - -static int fix_thin_pack(git_indexer *idx, git_transfer_progress *stats) -{ - int error, found_ref_delta = 0; - unsigned int i; - struct delta_info *delta; - size_t size; - git_otype type; - git_mwindow *w = NULL; - git_off_t curpos = 0; - unsigned char *base_info; - unsigned int left = 0; - git_oid base; - - assert(git_vector_length(&idx->deltas) > 0); - - if (idx->odb == NULL) { - giterr_set(GITERR_INDEXER, "cannot fix a thin pack without an ODB"); - return -1; - } - - /* Loop until we find the first REF delta */ - git_vector_foreach(&idx->deltas, i, delta) { - if (!delta) - continue; - - curpos = delta->delta_off; - error = git_packfile_unpack_header(&size, &type, &idx->pack->mwf, &w, &curpos); - if (error < 0) - return error; - - if (type == GIT_OBJ_REF_DELTA) { - found_ref_delta = 1; - break; - } - } - - if (!found_ref_delta) { - giterr_set(GITERR_INDEXER, "no REF_DELTA found, cannot inject object"); - return -1; - } - - /* curpos now points to the base information, which is an OID */ - base_info = git_mwindow_open(&idx->pack->mwf, &w, curpos, GIT_OID_RAWSZ, &left); - if (base_info == NULL) { - giterr_set(GITERR_INDEXER, "failed to map delta information"); - return -1; - } - - git_oid_fromraw(&base, base_info); - git_mwindow_close(&w); - - if (has_entry(idx, &base)) - return 0; - - if (inject_object(idx, &base) < 0) - return -1; - - stats->local_objects++; - - return 0; -} - -static int resolve_deltas(git_indexer *idx, git_transfer_progress *stats) -{ - unsigned int i; - struct delta_info *delta; - int progressed = 0, non_null = 0, progress_cb_result; - - while (idx->deltas.length > 0) { - progressed = 0; - non_null = 0; - git_vector_foreach(&idx->deltas, i, delta) { - git_rawobj obj = {NULL}; - - if (!delta) - continue; - - non_null = 1; - idx->off = delta->delta_off; - if (git_packfile_unpack(&obj, idx->pack, &idx->off) < 0) - continue; - - if (hash_and_save(idx, &obj, delta->delta_off) < 0) - continue; - - git__free(obj.data); - stats->indexed_objects++; - stats->indexed_deltas++; - progressed = 1; - if ((progress_cb_result = do_progress_callback(idx, stats)) < 0) - return progress_cb_result; - - /* remove from the list */ - git_vector_set(NULL, &idx->deltas, i, NULL); - git__free(delta); - } - - /* if none were actually set, we're done */ - if (!non_null) - break; - - if (!progressed && (fix_thin_pack(idx, stats) < 0)) { - return -1; - } - } - - return 0; -} - -static int update_header_and_rehash(git_indexer *idx, git_transfer_progress *stats) -{ - void *ptr; - size_t chunk = 1024*1024; - git_off_t hashed = 0; - git_mwindow *w = NULL; - git_mwindow_file *mwf; - unsigned int left; - - mwf = &idx->pack->mwf; - - git_hash_init(&idx->trailer); - - - /* Update the header to include the numer of local objects we injected */ - idx->hdr.hdr_entries = htonl(stats->total_objects + stats->local_objects); - if (write_at(idx, &idx->hdr, 0, sizeof(struct git_pack_header)) < 0) - return -1; - - /* - * We now use the same technique as before to determine the - * hash. We keep reading up to the end and let - * hash_partially() keep the existing trailer out of the - * calculation. - */ - git_mwindow_free_all(mwf); - idx->inbuf_len = 0; - while (hashed < mwf->size) { - ptr = git_mwindow_open(mwf, &w, hashed, chunk, &left); - if (ptr == NULL) - return -1; - - hash_partially(idx, ptr, left); - hashed += left; - - git_mwindow_close(&w); - } - - return 0; -} - -int git_indexer_commit(git_indexer *idx, git_transfer_progress *stats) -{ - git_mwindow *w = NULL; - unsigned int i, long_offsets = 0, left; - int error; - struct git_pack_idx_header hdr; - git_buf filename = GIT_BUF_INIT; - struct entry *entry; - git_oid trailer_hash, file_hash; - git_hash_ctx ctx; - git_filebuf index_file = {0}; - void *packfile_trailer; - - if (!idx->parsed_header) { - giterr_set(GITERR_INDEXER, "incomplete pack header"); - return -1; - } - - if (git_hash_ctx_init(&ctx) < 0) - return -1; - - /* Test for this before resolve_deltas(), as it plays with idx->off */ - if (idx->off + 20 < idx->pack->mwf.size) { - giterr_set(GITERR_INDEXER, "unexpected data at the end of the pack"); - return -1; - } - - packfile_trailer = git_mwindow_open(&idx->pack->mwf, &w, idx->pack->mwf.size - GIT_OID_RAWSZ, GIT_OID_RAWSZ, &left); - if (packfile_trailer == NULL) { - git_mwindow_close(&w); - goto on_error; - } - - /* Compare the packfile trailer as it was sent to us and what we calculated */ - git_oid_fromraw(&file_hash, packfile_trailer); - git_mwindow_close(&w); - - git_hash_final(&trailer_hash, &idx->trailer); - if (git_oid_cmp(&file_hash, &trailer_hash)) { - giterr_set(GITERR_INDEXER, "packfile trailer mismatch"); - return -1; - } - - /* Freeze the number of deltas */ - stats->total_deltas = stats->total_objects - stats->indexed_objects; - - if ((error = resolve_deltas(idx, stats)) < 0) - return error; - - if (stats->indexed_objects != stats->total_objects) { - giterr_set(GITERR_INDEXER, "early EOF"); - return -1; - } - - if (stats->local_objects > 0) { - if (update_header_and_rehash(idx, stats) < 0) - return -1; - - git_hash_final(&trailer_hash, &idx->trailer); - write_at(idx, &trailer_hash, idx->pack->mwf.size - GIT_OID_RAWSZ, GIT_OID_RAWSZ); - } - - git_vector_sort(&idx->objects); - - git_buf_sets(&filename, idx->pack->pack_name); - git_buf_shorten(&filename, strlen("pack")); - git_buf_puts(&filename, "idx"); - if (git_buf_oom(&filename)) - return -1; - - if (git_filebuf_open(&index_file, filename.ptr, - GIT_FILEBUF_HASH_CONTENTS, idx->mode) < 0) - goto on_error; - - /* Write out the header */ - hdr.idx_signature = htonl(PACK_IDX_SIGNATURE); - hdr.idx_version = htonl(2); - git_filebuf_write(&index_file, &hdr, sizeof(hdr)); - - /* Write out the fanout table */ - for (i = 0; i < 256; ++i) { - uint32_t n = htonl(idx->fanout[i]); - git_filebuf_write(&index_file, &n, sizeof(n)); - } - - /* Write out the object names (SHA-1 hashes) */ - git_vector_foreach(&idx->objects, i, entry) { - git_filebuf_write(&index_file, &entry->oid, sizeof(git_oid)); - git_hash_update(&ctx, &entry->oid, GIT_OID_RAWSZ); - } - git_hash_final(&idx->hash, &ctx); - - /* Write out the CRC32 values */ - git_vector_foreach(&idx->objects, i, entry) { - git_filebuf_write(&index_file, &entry->crc, sizeof(uint32_t)); - } - - /* Write out the offsets */ - git_vector_foreach(&idx->objects, i, entry) { - uint32_t n; - - if (entry->offset == UINT32_MAX) - n = htonl(0x80000000 | long_offsets++); - else - n = htonl(entry->offset); - - git_filebuf_write(&index_file, &n, sizeof(uint32_t)); - } - - /* Write out the long offsets */ - git_vector_foreach(&idx->objects, i, entry) { - uint32_t split[2]; - - if (entry->offset != UINT32_MAX) - continue; - - split[0] = htonl(entry->offset_long >> 32); - split[1] = htonl(entry->offset_long & 0xffffffff); - - git_filebuf_write(&index_file, &split, sizeof(uint32_t) * 2); - } - - /* Write out the packfile trailer to the index */ - if (git_filebuf_write(&index_file, &trailer_hash, GIT_OID_RAWSZ) < 0) - goto on_error; - - /* Write out the hash of the idx */ - if (git_filebuf_hash(&trailer_hash, &index_file) < 0) - goto on_error; - - git_filebuf_write(&index_file, &trailer_hash, sizeof(git_oid)); - - /* Figure out what the final name should be */ - if (index_path(&filename, idx, ".idx") < 0) - goto on_error; - - /* Commit file */ - if (git_filebuf_commit_at(&index_file, filename.ptr) < 0) - goto on_error; - - git_mwindow_free_all(&idx->pack->mwf); - /* We need to close the descriptor here so Windows doesn't choke on commit_at */ - if (p_close(idx->pack->mwf.fd) < 0) { - giterr_set(GITERR_OS, "failed to close packfile"); - goto on_error; - } - - idx->pack->mwf.fd = -1; - - if (index_path(&filename, idx, ".pack") < 0) - goto on_error; - - /* And don't forget to rename the packfile to its new place. */ - p_rename(idx->pack->pack_name, git_buf_cstr(&filename)); - - git_buf_free(&filename); - git_hash_ctx_cleanup(&ctx); - return 0; - -on_error: - git_mwindow_free_all(&idx->pack->mwf); - git_filebuf_cleanup(&index_file); - git_buf_free(&filename); - git_hash_ctx_cleanup(&ctx); - return -1; -} - -void git_indexer_free(git_indexer *idx) -{ - if (idx == NULL) - return; - - git_vector_free_deep(&idx->objects); - - if (idx->pack && idx->pack->idx_cache) { - struct git_pack_entry *pentry; - kh_foreach_value( - idx->pack->idx_cache, pentry, { git__free(pentry); }); - - git_oidmap_free(idx->pack->idx_cache); - } - - git_vector_free_deep(&idx->deltas); - - if (!git_mutex_lock(&git__mwindow_mutex)) { - git_packfile_free(idx->pack); - git_mutex_unlock(&git__mwindow_mutex); - } - - git_hash_ctx_cleanup(&idx->trailer); - git_hash_ctx_cleanup(&idx->hash_ctx); - git__free(idx); -} diff --git a/vendor/libgit2/src/integer.h b/vendor/libgit2/src/integer.h deleted file mode 100644 index b08094c2f..000000000 --- a/vendor/libgit2/src/integer.h +++ /dev/null @@ -1,96 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_integer_h__ -#define INCLUDE_integer_h__ - -/** @return true if p fits into the range of a size_t */ -GIT_INLINE(int) git__is_sizet(git_off_t p) -{ - size_t r = (size_t)p; - return p == (git_off_t)r; -} - -/** @return true if p fits into the range of an ssize_t */ -GIT_INLINE(int) git__is_ssizet(size_t p) -{ - ssize_t r = (ssize_t)p; - return p == (size_t)r; -} - -/** @return true if p fits into the range of a uint32_t */ -GIT_INLINE(int) git__is_uint32(size_t p) -{ - uint32_t r = (uint32_t)p; - return p == (size_t)r; -} - -/** @return true if p fits into the range of an unsigned long */ -GIT_INLINE(int) git__is_ulong(git_off_t p) -{ - unsigned long r = (unsigned long)p; - return p == (git_off_t)r; -} - -/** @return true if p fits into the range of an int */ -GIT_INLINE(int) git__is_int(long long p) -{ - int r = (int)p; - return p == (long long)r; -} - -/** - * Sets `one + two` into `out`, unless the arithmetic would overflow. - * @return true if the result fits in a `uint64_t`, false on overflow. - */ -GIT_INLINE(bool) git__add_uint64_overflow(uint64_t *out, uint64_t one, uint64_t two) -{ - if (UINT64_MAX - one < two) - return true; - *out = one + two; - return false; -} - -/* Use clang/gcc compiler intrinsics whenever possible */ -#if (SIZE_MAX == UINT_MAX) && __has_builtin(__builtin_uadd_overflow) -# define git__add_sizet_overflow(out, one, two) \ - __builtin_uadd_overflow(one, two, out) -# define git__multiply_sizet_overflow(out, one, two) \ - __builtin_umul_overflow(one, two, out) -#elif (SIZE_MAX == ULONG_MAX) && __has_builtin(__builtin_uaddl_overflow) -# define git__add_sizet_overflow(out, one, two) \ - __builtin_uaddl_overflow(one, two, out) -# define git__multiply_sizet_overflow(out, one, two) \ - __builtin_umull_overflow(one, two, out) -#else - -/** - * Sets `one + two` into `out`, unless the arithmetic would overflow. - * @return true if the result fits in a `size_t`, false on overflow. - */ -GIT_INLINE(bool) git__add_sizet_overflow(size_t *out, size_t one, size_t two) -{ - if (SIZE_MAX - one < two) - return true; - *out = one + two; - return false; -} - -/** - * Sets `one * two` into `out`, unless the arithmetic would overflow. - * @return true if the result fits in a `size_t`, false on overflow. - */ -GIT_INLINE(bool) git__multiply_sizet_overflow(size_t *out, size_t one, size_t two) -{ - if (one && SIZE_MAX / one < two) - return true; - *out = one * two; - return false; -} - -#endif - -#endif /* INCLUDE_integer_h__ */ diff --git a/vendor/libgit2/src/iterator.c b/vendor/libgit2/src/iterator.c deleted file mode 100644 index cb1ea6a87..000000000 --- a/vendor/libgit2/src/iterator.c +++ /dev/null @@ -1,2201 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "iterator.h" -#include "tree.h" -#include "index.h" -#include "ignore.h" -#include "buffer.h" -#include "submodule.h" -#include - -#define ITERATOR_SET_CB(P,NAME_LC) do { \ - (P)->cb.current = NAME_LC ## _iterator__current; \ - (P)->cb.advance = NAME_LC ## _iterator__advance; \ - (P)->cb.advance_into = NAME_LC ## _iterator__advance_into; \ - (P)->cb.seek = NAME_LC ## _iterator__seek; \ - (P)->cb.reset = NAME_LC ## _iterator__reset; \ - (P)->cb.at_end = NAME_LC ## _iterator__at_end; \ - (P)->cb.free = NAME_LC ## _iterator__free; \ - } while (0) - -#define ITERATOR_CASE_FLAGS \ - (GIT_ITERATOR_IGNORE_CASE | GIT_ITERATOR_DONT_IGNORE_CASE) - -#define ITERATOR_BASE_INIT(P,NAME_LC,NAME_UC,REPO) do { \ - (P)->base.type = GIT_ITERATOR_TYPE_ ## NAME_UC; \ - (P)->base.cb = &(P)->cb; \ - ITERATOR_SET_CB(P,NAME_LC); \ - (P)->base.repo = (REPO); \ - (P)->base.start = options && options->start ? \ - git__strdup(options->start) : NULL; \ - (P)->base.end = options && options->end ? \ - git__strdup(options->end) : NULL; \ - if ((options && options->start && !(P)->base.start) || \ - (options && options->end && !(P)->base.end)) { \ - git__free(P); return -1; } \ - (P)->base.strcomp = git__strcmp; \ - (P)->base.strncomp = git__strncmp; \ - (P)->base.prefixcomp = git__prefixcmp; \ - (P)->base.flags = options ? options->flags & ~ITERATOR_CASE_FLAGS : 0; \ - if ((P)->base.flags & GIT_ITERATOR_DONT_AUTOEXPAND) \ - (P)->base.flags |= GIT_ITERATOR_INCLUDE_TREES; \ - if (options && options->pathlist.count && \ - iterator_pathlist__init(&P->base, &options->pathlist) < 0) { \ - git__free(P); return -1; } \ - } while (0) - -#define iterator__flag(I,F) ((((git_iterator *)(I))->flags & GIT_ITERATOR_ ## F) != 0) -#define iterator__ignore_case(I) iterator__flag(I,IGNORE_CASE) -#define iterator__include_trees(I) iterator__flag(I,INCLUDE_TREES) -#define iterator__dont_autoexpand(I) iterator__flag(I,DONT_AUTOEXPAND) -#define iterator__do_autoexpand(I) !iterator__flag(I,DONT_AUTOEXPAND) -#define iterator__include_conflicts(I) iterator__flag(I, INCLUDE_CONFLICTS) - -#define GIT_ITERATOR_FIRST_ACCESS (1 << 15) -#define iterator__has_been_accessed(I) iterator__flag(I,FIRST_ACCESS) - -#define iterator__end(I) ((git_iterator *)(I))->end -#define iterator__past_end(I,PATH) \ - (iterator__end(I) && ((git_iterator *)(I))->prefixcomp((PATH),iterator__end(I)) > 0) - - -typedef enum { - ITERATOR_PATHLIST_NONE = 0, - ITERATOR_PATHLIST_MATCH = 1, - ITERATOR_PATHLIST_MATCH_DIRECTORY = 2, - ITERATOR_PATHLIST_MATCH_CHILD = 3, -} iterator_pathlist__match_t; - -static int iterator_pathlist__init(git_iterator *iter, git_strarray *pathspec) -{ - size_t i; - - if (git_vector_init(&iter->pathlist, pathspec->count, - (git_vector_cmp)iter->strcomp) < 0) - return -1; - - for (i = 0; i < pathspec->count; i++) { - if (!pathspec->strings[i]) - continue; - - if (git_vector_insert(&iter->pathlist, pathspec->strings[i]) < 0) - return -1; - } - - git_vector_sort(&iter->pathlist); - - return 0; -} - -static iterator_pathlist__match_t iterator_pathlist__match( - git_iterator *iter, const char *path, size_t path_len) -{ - const char *p; - size_t idx; - int error; - - error = git_vector_bsearch2(&idx, &iter->pathlist, - (git_vector_cmp)iter->strcomp, path); - - if (error == 0) - return ITERATOR_PATHLIST_MATCH; - - /* at this point, the path we're examining may be a directory (though we - * don't know that yet, since we're avoiding a stat unless it's necessary) - * so see if the pathlist contains a file beneath this directory. - */ - while ((p = git_vector_get(&iter->pathlist, idx)) != NULL) { - if (iter->prefixcomp(p, path) != 0) - break; - - /* an exact match would have been matched by the bsearch above */ - assert(p[path_len]); - - /* is this a literal directory entry (eg `foo/`) or a file beneath */ - if (p[path_len] == '/') { - return (p[path_len+1] == '\0') ? - ITERATOR_PATHLIST_MATCH_DIRECTORY : - ITERATOR_PATHLIST_MATCH_CHILD; - } - - if (p[path_len] > '/') - break; - - idx++; - } - - return ITERATOR_PATHLIST_NONE; -} - -static void iterator_pathlist_walk__reset(git_iterator *iter) -{ - iter->pathlist_walk_idx = 0; -} - -/* walker for the index iterator that allows it to walk the sorted pathlist - * entries alongside the sorted index entries. the `iter->pathlist_walk_idx` - * stores the starting position for subsequent calls, the position is advanced - * along with the index iterator, with a special case for handling directories - * in the pathlist that are specified without trailing '/'. (eg, `foo`). - * we do not advance over these entries until we're certain that the index - * iterator will not ask us for a file beneath that directory (eg, `foo/bar`). - */ -static bool iterator_pathlist_walk__contains(git_iterator *iter, const char *path) -{ - size_t i; - char *p; - size_t p_len; - int cmp; - - for (i = iter->pathlist_walk_idx; i < iter->pathlist.length; i++) { - p = iter->pathlist.contents[i]; - p_len = strlen(p); - - /* see if the pathlist entry is a prefix of this path */ - cmp = iter->strncomp(p, path, p_len); - - /* this pathlist entry sorts before the given path, try the next */ - if (!p_len || cmp < 0) - iter->pathlist_walk_idx++; - - /* this pathlist sorts after the given path, no match. */ - else if (cmp > 0) - return false; - - /* match! an exact match (`foo` vs `foo`), the path is a child of an - * explicit directory in the pathlist (`foo/` vs `foo/bar`) or the path - * is a child of an entry in the pathlist (`foo` vs `foo/bar`) - */ - else if (path[p_len] == '\0' || p[p_len - 1] == '/' || path[p_len] == '/') - return true; - - /* only advance the start index for future callers if we know that we - * will not see a child of this path. eg, a pathlist entry `foo` is - * a prefix for `foo.txt` and `foo/bar`. don't advance the start - * pathlist index when we see `foo.txt` or we would miss a subsequent - * inspection of `foo/bar`. only advance when there are no more - * potential children. - */ - else if (path[p_len] > '/') - iter->pathlist_walk_idx++; - } - - return false; -} - -static void iterator_pathlist__update_ignore_case(git_iterator *iter) -{ - git_vector_set_cmp(&iter->pathlist, (git_vector_cmp)iter->strcomp); - git_vector_sort(&iter->pathlist); - - iter->pathlist_walk_idx = 0; -} - - -static int iterator__reset_range( - git_iterator *iter, const char *start, const char *end) -{ - if (start) { - if (iter->start) - git__free(iter->start); - iter->start = git__strdup(start); - GITERR_CHECK_ALLOC(iter->start); - } - - if (end) { - if (iter->end) - git__free(iter->end); - iter->end = git__strdup(end); - GITERR_CHECK_ALLOC(iter->end); - } - - iter->flags &= ~GIT_ITERATOR_FIRST_ACCESS; - - return 0; -} - -static int iterator__update_ignore_case( - git_iterator *iter, - git_iterator_flag_t flags) -{ - bool ignore_case; - int error; - - if ((flags & GIT_ITERATOR_IGNORE_CASE) != 0) - ignore_case = true; - else if ((flags & GIT_ITERATOR_DONT_IGNORE_CASE) != 0) - ignore_case = false; - else { - git_index *index; - - if ((error = git_repository_index__weakptr(&index, iter->repo)) < 0) - return error; - - ignore_case = (index->ignore_case == 1); - } - - if (ignore_case) { - iter->flags = (iter->flags | GIT_ITERATOR_IGNORE_CASE); - - iter->strcomp = git__strcasecmp; - iter->strncomp = git__strncasecmp; - iter->prefixcomp = git__prefixcmp_icase; - } else { - iter->flags = (iter->flags & ~GIT_ITERATOR_IGNORE_CASE); - - iter->strcomp = git__strcmp; - iter->strncomp = git__strncmp; - iter->prefixcomp = git__prefixcmp; - } - - iterator_pathlist__update_ignore_case(iter); - - return 0; -} - -GIT_INLINE(void) iterator__clear_entry(const git_index_entry **entry) -{ - if (entry) *entry = NULL; -} - - -static int empty_iterator__noop(const git_index_entry **e, git_iterator *i) -{ - GIT_UNUSED(i); - iterator__clear_entry(e); - return GIT_ITEROVER; -} - -static int empty_iterator__seek(git_iterator *i, const char *p) -{ - GIT_UNUSED(i); GIT_UNUSED(p); - return -1; -} - -static int empty_iterator__reset(git_iterator *i, const char *s, const char *e) -{ - GIT_UNUSED(i); GIT_UNUSED(s); GIT_UNUSED(e); - return 0; -} - -static int empty_iterator__at_end(git_iterator *i) -{ - GIT_UNUSED(i); - return 1; -} - -static void empty_iterator__free(git_iterator *i) -{ - GIT_UNUSED(i); -} - -typedef struct { - git_iterator base; - git_iterator_callbacks cb; -} empty_iterator; - -int git_iterator_for_nothing( - git_iterator **iter, - git_iterator_options *options) -{ - empty_iterator *i = git__calloc(1, sizeof(empty_iterator)); - GITERR_CHECK_ALLOC(i); - -#define empty_iterator__current empty_iterator__noop -#define empty_iterator__advance empty_iterator__noop -#define empty_iterator__advance_into empty_iterator__noop - - ITERATOR_BASE_INIT(i, empty, EMPTY, NULL); - - if (options && (options->flags & GIT_ITERATOR_IGNORE_CASE) != 0) - i->base.flags |= GIT_ITERATOR_IGNORE_CASE; - - *iter = (git_iterator *)i; - return 0; -} - - -typedef struct tree_iterator_entry tree_iterator_entry; -struct tree_iterator_entry { - tree_iterator_entry *parent; - const git_tree_entry *te; - git_tree *tree; -}; - -typedef struct tree_iterator_frame tree_iterator_frame; -struct tree_iterator_frame { - tree_iterator_frame *up, *down; - - size_t n_entries; /* items in this frame */ - size_t current; /* start of currently active range in frame */ - size_t next; /* start of next range in frame */ - - const char *start; - size_t startlen; - - tree_iterator_entry *entries[GIT_FLEX_ARRAY]; -}; - -typedef struct { - git_iterator base; - git_iterator_callbacks cb; - tree_iterator_frame *head, *root; - git_pool pool; - git_index_entry entry; - git_buf path; - int path_ambiguities; - bool path_has_filename; - bool entry_is_current; -} tree_iterator; - -static char *tree_iterator__current_filename( - tree_iterator *ti, const git_tree_entry *te) -{ - if (!ti->path_has_filename) { - if (git_buf_joinpath(&ti->path, ti->path.ptr, te->filename) < 0) - return NULL; - - if (git_tree_entry__is_tree(te) && git_buf_putc(&ti->path, '/') < 0) - return NULL; - - ti->path_has_filename = true; - } - - return ti->path.ptr; -} - -static void tree_iterator__rewrite_filename(tree_iterator *ti) -{ - tree_iterator_entry *scan = ti->head->entries[ti->head->current]; - ssize_t strpos = ti->path.size; - const git_tree_entry *te; - - if (strpos && ti->path.ptr[strpos - 1] == '/') - strpos--; - - for (; scan && (te = scan->te); scan = scan->parent) { - strpos -= te->filename_len; - memcpy(&ti->path.ptr[strpos], te->filename, te->filename_len); - strpos -= 1; /* separator */ - } -} - -static int tree_iterator__te_cmp( - const git_tree_entry *a, - const git_tree_entry *b, - int (*compare)(const char *, const char *, size_t)) -{ - return git_path_cmp( - a->filename, a->filename_len, a->attr == GIT_FILEMODE_TREE, - b->filename, b->filename_len, b->attr == GIT_FILEMODE_TREE, - compare); -} - -static int tree_iterator__ci_cmp(const void *a, const void *b, void *p) -{ - const tree_iterator_entry *ae = a, *be = b; - int cmp = tree_iterator__te_cmp(ae->te, be->te, git__strncasecmp); - - if (!cmp) { - /* stabilize sort order among equivalent names */ - if (!ae->parent->te || !be->parent->te) - cmp = tree_iterator__te_cmp(ae->te, be->te, git__strncmp); - else - cmp = tree_iterator__ci_cmp(ae->parent, be->parent, p); - } - - return cmp; -} - -static int tree_iterator__search_cmp(const void *key, const void *val, void *p) -{ - const tree_iterator_frame *tf = key; - const git_tree_entry *te = ((tree_iterator_entry *)val)->te; - - return git_path_cmp( - tf->start, tf->startlen, false, - te->filename, te->filename_len, te->attr == GIT_FILEMODE_TREE, - ((git_iterator *)p)->strncomp); -} - -static bool tree_iterator__move_to_next( - tree_iterator *ti, tree_iterator_frame *tf) -{ - if (tf->next > tf->current + 1) - ti->path_ambiguities--; - - if (!tf->up) { /* at root */ - tf->current = tf->next; - return false; - } - - for (; tf->current < tf->next; tf->current++) { - git_tree_free(tf->entries[tf->current]->tree); - tf->entries[tf->current]->tree = NULL; - } - - return (tf->current < tf->n_entries); -} - -static int tree_iterator__set_next(tree_iterator *ti, tree_iterator_frame *tf) -{ - int error = 0; - const git_tree_entry *te, *last = NULL; - - tf->next = tf->current; - - for (; tf->next < tf->n_entries; tf->next++, last = te) { - te = tf->entries[tf->next]->te; - - if (last && tree_iterator__te_cmp(last, te, ti->base.strncomp)) - break; - - /* try to load trees for items in [current,next) range */ - if (!error && git_tree_entry__is_tree(te)) - error = git_tree_lookup( - &tf->entries[tf->next]->tree, ti->base.repo, te->oid); - } - - if (tf->next > tf->current + 1) - ti->path_ambiguities++; - - /* if a tree lookup failed, advance over this span and return failure */ - if (error < 0) { - tree_iterator__move_to_next(ti, tf); - return error; - } - - if (last && !tree_iterator__current_filename(ti, last)) - return -1; /* must have been allocation failure */ - - return 0; -} - -GIT_INLINE(bool) tree_iterator__at_tree(tree_iterator *ti) -{ - return (ti->head->current < ti->head->n_entries && - ti->head->entries[ti->head->current]->tree != NULL); -} - -static int tree_iterator__push_frame(tree_iterator *ti) -{ - int error = 0; - tree_iterator_frame *head = ti->head, *tf = NULL; - size_t i, n_entries = 0, alloclen; - - if (head->current >= head->n_entries || !head->entries[head->current]->tree) - return GIT_ITEROVER; - - for (i = head->current; i < head->next; ++i) - n_entries += git_tree_entrycount(head->entries[i]->tree); - - GITERR_CHECK_ALLOC_MULTIPLY(&alloclen, sizeof(tree_iterator_entry *), n_entries); - GITERR_CHECK_ALLOC_ADD(&alloclen, alloclen, sizeof(tree_iterator_frame)); - - tf = git__calloc(1, alloclen); - GITERR_CHECK_ALLOC(tf); - - tf->n_entries = n_entries; - - tf->up = head; - head->down = tf; - ti->head = tf; - - for (i = head->current, n_entries = 0; i < head->next; ++i) { - git_tree *tree = head->entries[i]->tree; - size_t j, max_j = git_tree_entrycount(tree); - - for (j = 0; j < max_j; ++j) { - tree_iterator_entry *entry = git_pool_malloc(&ti->pool, 1); - GITERR_CHECK_ALLOC(entry); - - entry->parent = head->entries[i]; - entry->te = git_tree_entry_byindex(tree, j); - entry->tree = NULL; - - tf->entries[n_entries++] = entry; - } - } - - /* if ignore_case, sort entries case insensitively */ - if (iterator__ignore_case(ti)) - git__tsort_r( - (void **)tf->entries, tf->n_entries, tree_iterator__ci_cmp, tf); - - /* pick tf->current based on "start" (or start at zero) */ - if (head->startlen > 0) { - git__bsearch_r((void **)tf->entries, tf->n_entries, head, - tree_iterator__search_cmp, ti, &tf->current); - - while (tf->current && - !tree_iterator__search_cmp(head, tf->entries[tf->current-1], ti)) - tf->current--; - - if ((tf->start = strchr(head->start, '/')) != NULL) { - tf->start++; - tf->startlen = strlen(tf->start); - } - } - - ti->path_has_filename = ti->entry_is_current = false; - - if ((error = tree_iterator__set_next(ti, tf)) < 0) - return error; - - /* autoexpand as needed */ - if (!iterator__include_trees(ti) && tree_iterator__at_tree(ti)) - return tree_iterator__push_frame(ti); - - return 0; -} - -static bool tree_iterator__pop_frame(tree_iterator *ti, bool final) -{ - tree_iterator_frame *tf = ti->head; - - assert(tf); - - if (!tf->up) - return false; - - ti->head = tf->up; - ti->head->down = NULL; - - tree_iterator__move_to_next(ti, tf); - - if (!final) { /* if final, don't bother to clean up */ - // TODO: maybe free the pool so far? - git_buf_rtruncate_at_char(&ti->path, '/'); - } - - git__free(tf); - - return true; -} - -static void tree_iterator__pop_all(tree_iterator *ti, bool to_end, bool final) -{ - while (tree_iterator__pop_frame(ti, final)) /* pop to root */; - - if (!final) { - assert(ti->head); - - ti->head->current = to_end ? ti->head->n_entries : 0; - ti->path_ambiguities = 0; - git_buf_clear(&ti->path); - } -} - -static int tree_iterator__update_entry(tree_iterator *ti) -{ - tree_iterator_frame *tf; - const git_tree_entry *te; - - if (ti->entry_is_current) - return 0; - - tf = ti->head; - te = tf->entries[tf->current]->te; - - ti->entry.mode = te->attr; - git_oid_cpy(&ti->entry.id, te->oid); - - ti->entry.path = tree_iterator__current_filename(ti, te); - GITERR_CHECK_ALLOC(ti->entry.path); - - if (ti->path_ambiguities > 0) - tree_iterator__rewrite_filename(ti); - - if (iterator__past_end(ti, ti->entry.path)) { - tree_iterator__pop_all(ti, true, false); - return GIT_ITEROVER; - } - - ti->entry_is_current = true; - - return 0; -} - -static int tree_iterator__current_internal( - const git_index_entry **entry, git_iterator *self) -{ - int error; - tree_iterator *ti = (tree_iterator *)self; - tree_iterator_frame *tf = ti->head; - - iterator__clear_entry(entry); - - if (tf->current >= tf->n_entries) - return GIT_ITEROVER; - - if ((error = tree_iterator__update_entry(ti)) < 0) - return error; - - if (entry) - *entry = &ti->entry; - - ti->base.flags |= GIT_ITERATOR_FIRST_ACCESS; - - return 0; -} - -static int tree_iterator__advance_into_internal(git_iterator *self) -{ - int error = 0; - tree_iterator *ti = (tree_iterator *)self; - - if (tree_iterator__at_tree(ti)) - error = tree_iterator__push_frame(ti); - - return error; -} - -static int tree_iterator__advance_internal(git_iterator *self) -{ - int error; - tree_iterator *ti = (tree_iterator *)self; - tree_iterator_frame *tf = ti->head; - - if (tf->current >= tf->n_entries) - return GIT_ITEROVER; - - if (!iterator__has_been_accessed(ti)) - return 0; - - if (iterator__do_autoexpand(ti) && iterator__include_trees(ti) && - tree_iterator__at_tree(ti)) - return tree_iterator__advance_into_internal(self); - - if (ti->path_has_filename) { - git_buf_rtruncate_at_char(&ti->path, '/'); - ti->path_has_filename = ti->entry_is_current = false; - } - - /* scan forward and up, advancing in frame or popping frame when done */ - while (!tree_iterator__move_to_next(ti, tf) && - tree_iterator__pop_frame(ti, false)) - tf = ti->head; - - /* find next and load trees */ - if ((error = tree_iterator__set_next(ti, tf)) < 0) - return error; - - /* deal with include_trees / auto_expand as needed */ - if (!iterator__include_trees(ti) && tree_iterator__at_tree(ti)) - return tree_iterator__advance_into_internal(self); - - return 0; -} - -static int tree_iterator__current( - const git_index_entry **out, git_iterator *self) -{ - const git_index_entry *entry = NULL; - iterator_pathlist__match_t m; - int error; - - do { - if ((error = tree_iterator__current_internal(&entry, self)) < 0) - return error; - - if (self->pathlist.length) { - m = iterator_pathlist__match( - self, entry->path, strlen(entry->path)); - - if (m != ITERATOR_PATHLIST_MATCH) { - if ((error = tree_iterator__advance_internal(self)) < 0) - return error; - - entry = NULL; - } - } - } while (!entry); - - if (out) - *out = entry; - - return error; -} - -static int tree_iterator__advance( - const git_index_entry **entry, git_iterator *self) -{ - int error = tree_iterator__advance_internal(self); - - iterator__clear_entry(entry); - - if (error < 0) - return error; - - return tree_iterator__current(entry, self); -} - -static int tree_iterator__advance_into( - const git_index_entry **entry, git_iterator *self) -{ - int error = tree_iterator__advance_into_internal(self); - - iterator__clear_entry(entry); - - if (error < 0) - return error; - - return tree_iterator__current(entry, self); -} - -static int tree_iterator__seek(git_iterator *self, const char *prefix) -{ - GIT_UNUSED(self); GIT_UNUSED(prefix); - return -1; -} - -static int tree_iterator__reset( - git_iterator *self, const char *start, const char *end) -{ - tree_iterator *ti = (tree_iterator *)self; - - tree_iterator__pop_all(ti, false, false); - - if (iterator__reset_range(self, start, end) < 0) - return -1; - - return tree_iterator__push_frame(ti); /* re-expand root tree */ -} - -static int tree_iterator__at_end(git_iterator *self) -{ - tree_iterator *ti = (tree_iterator *)self; - return (ti->head->current >= ti->head->n_entries); -} - -static void tree_iterator__free(git_iterator *self) -{ - tree_iterator *ti = (tree_iterator *)self; - - if (ti->head) { - tree_iterator__pop_all(ti, true, false); - git_tree_free(ti->head->entries[0]->tree); - git__free(ti->head); - } - - git_pool_clear(&ti->pool); - git_buf_free(&ti->path); -} - -static int tree_iterator__create_root_frame(tree_iterator *ti, git_tree *tree) -{ - size_t sz = sizeof(tree_iterator_frame) + sizeof(tree_iterator_entry); - tree_iterator_frame *root = git__calloc(sz, sizeof(char)); - GITERR_CHECK_ALLOC(root); - - root->n_entries = 1; - root->next = 1; - root->start = ti->base.start; - root->startlen = root->start ? strlen(root->start) : 0; - root->entries[0] = git_pool_mallocz(&ti->pool, 1); - GITERR_CHECK_ALLOC(root->entries[0]); - root->entries[0]->tree = tree; - - ti->head = ti->root = root; - - return 0; -} - -int git_iterator_for_tree( - git_iterator **iter, - git_tree *tree, - git_iterator_options *options) -{ - int error; - tree_iterator *ti; - - if (tree == NULL) - return git_iterator_for_nothing(iter, options); - - if ((error = git_object_dup((git_object **)&tree, (git_object *)tree)) < 0) - return error; - - ti = git__calloc(1, sizeof(tree_iterator)); - GITERR_CHECK_ALLOC(ti); - - ITERATOR_BASE_INIT(ti, tree, TREE, git_tree_owner(tree)); - - if ((error = iterator__update_ignore_case((git_iterator *)ti, options ? options->flags : 0)) < 0) - goto fail; - - git_pool_init(&ti->pool, sizeof(tree_iterator_entry)); - - if ((error = tree_iterator__create_root_frame(ti, tree)) < 0 || - (error = tree_iterator__push_frame(ti)) < 0) /* expand root now */ - goto fail; - - *iter = (git_iterator *)ti; - return 0; - -fail: - git_iterator_free((git_iterator *)ti); - return error; -} - - -typedef struct { - git_iterator base; - git_iterator_callbacks cb; - git_index *index; - git_vector entries; - git_vector_cmp entry_srch; - size_t current; - /* when limiting with a pathlist, this is the current index into it */ - size_t pathlist_idx; - /* when not in autoexpand mode, use these to represent "tree" state */ - git_buf partial; - size_t partial_pos; - char restore_terminator; - git_index_entry tree_entry; -} index_iterator; - -static const git_index_entry *index_iterator__index_entry(index_iterator *ii) -{ - const git_index_entry *ie = git_vector_get(&ii->entries, ii->current); - - if (ie != NULL && iterator__past_end(ii, ie->path)) { - ii->current = git_vector_length(&ii->entries); - ie = NULL; - } - - return ie; -} - -static const git_index_entry *index_iterator__advance_over_unwanted( - index_iterator *ii) -{ - const git_index_entry *ie = index_iterator__index_entry(ii); - bool match; - - while (ie) { - if (!iterator__include_conflicts(ii) && - git_index_entry_is_conflict(ie)) { - ii->current++; - ie = index_iterator__index_entry(ii); - continue; - } - - /* if we have a pathlist, this entry's path must be in it to be - * returned. walk the pathlist in unison with the index to - * compare paths. - */ - if (ii->base.pathlist.length) { - match = iterator_pathlist_walk__contains(&ii->base, ie->path); - - if (!match) { - ii->current++; - ie = index_iterator__index_entry(ii); - continue; - } - } - - break; - } - - return ie; -} - -static void index_iterator__next_prefix_tree(index_iterator *ii) -{ - const char *slash; - - if (!iterator__include_trees(ii)) - return; - - slash = strchr(&ii->partial.ptr[ii->partial_pos], '/'); - - if (slash != NULL) { - ii->partial_pos = (slash - ii->partial.ptr) + 1; - ii->restore_terminator = ii->partial.ptr[ii->partial_pos]; - ii->partial.ptr[ii->partial_pos] = '\0'; - } else { - ii->partial_pos = ii->partial.size; - } - - if (index_iterator__index_entry(ii) == NULL) - ii->partial_pos = ii->partial.size; -} - -static int index_iterator__first_prefix_tree(index_iterator *ii) -{ - const git_index_entry *ie = index_iterator__advance_over_unwanted(ii); - const char *scan, *prior, *slash; - - if (!ie || !iterator__include_trees(ii)) - return 0; - - /* find longest common prefix with prior index entry */ - for (scan = slash = ie->path, prior = ii->partial.ptr; - *scan && *scan == *prior; ++scan, ++prior) - if (*scan == '/') - slash = scan; - - if (git_buf_sets(&ii->partial, ie->path) < 0) - return -1; - - ii->partial_pos = (slash - ie->path) + 1; - index_iterator__next_prefix_tree(ii); - - return 0; -} - -#define index_iterator__at_tree(I) \ - (iterator__include_trees(I) && (I)->partial_pos < (I)->partial.size) - -static int index_iterator__current( - const git_index_entry **entry, git_iterator *self) -{ - index_iterator *ii = (index_iterator *)self; - const git_index_entry *ie = git_vector_get(&ii->entries, ii->current); - - if (ie != NULL && index_iterator__at_tree(ii)) { - ii->tree_entry.path = ii->partial.ptr; - ie = &ii->tree_entry; - } - - if (entry) - *entry = ie; - - ii->base.flags |= GIT_ITERATOR_FIRST_ACCESS; - - return (ie != NULL) ? 0 : GIT_ITEROVER; -} - -static int index_iterator__at_end(git_iterator *self) -{ - index_iterator *ii = (index_iterator *)self; - return (ii->current >= git_vector_length(&ii->entries)); -} - -static int index_iterator__advance( - const git_index_entry **entry, git_iterator *self) -{ - index_iterator *ii = (index_iterator *)self; - size_t entrycount = git_vector_length(&ii->entries); - const git_index_entry *ie; - - if (!iterator__has_been_accessed(ii)) - return index_iterator__current(entry, self); - - if (index_iterator__at_tree(ii)) { - if (iterator__do_autoexpand(ii)) { - ii->partial.ptr[ii->partial_pos] = ii->restore_terminator; - index_iterator__next_prefix_tree(ii); - } else { - /* advance to sibling tree (i.e. find entry with new prefix) */ - while (ii->current < entrycount) { - ii->current++; - - if (!(ie = git_vector_get(&ii->entries, ii->current)) || - ii->base.prefixcomp(ie->path, ii->partial.ptr) != 0) - break; - } - - if (index_iterator__first_prefix_tree(ii) < 0) - return -1; - } - } else { - if (ii->current < entrycount) - ii->current++; - - if (index_iterator__first_prefix_tree(ii) < 0) - return -1; - } - - return index_iterator__current(entry, self); -} - -static int index_iterator__advance_into( - const git_index_entry **entry, git_iterator *self) -{ - index_iterator *ii = (index_iterator *)self; - const git_index_entry *ie = git_vector_get(&ii->entries, ii->current); - - if (ie != NULL && index_iterator__at_tree(ii)) { - if (ii->restore_terminator) - ii->partial.ptr[ii->partial_pos] = ii->restore_terminator; - index_iterator__next_prefix_tree(ii); - } - - return index_iterator__current(entry, self); -} - -static int index_iterator__seek(git_iterator *self, const char *prefix) -{ - GIT_UNUSED(self); GIT_UNUSED(prefix); - return -1; -} - -static int index_iterator__reset( - git_iterator *self, const char *start, const char *end) -{ - index_iterator *ii = (index_iterator *)self; - const git_index_entry *ie; - - if (iterator__reset_range(self, start, end) < 0) - return -1; - - ii->current = 0; - - iterator_pathlist_walk__reset(self); - - /* if we're given a start prefix, find it; if we're given a pathlist, find - * the first of those. start at the later of the two. - */ - if (ii->base.start) - git_index_snapshot_find( - &ii->current, &ii->entries, ii->entry_srch, ii->base.start, 0, 0); - - if ((ie = index_iterator__advance_over_unwanted(ii)) == NULL) - return 0; - - if (git_buf_sets(&ii->partial, ie->path) < 0) - return -1; - - ii->partial_pos = 0; - - if (ii->base.start) { - size_t startlen = strlen(ii->base.start); - - ii->partial_pos = (startlen > ii->partial.size) ? - ii->partial.size : startlen; - } - - index_iterator__next_prefix_tree(ii); - - return 0; -} - -static void index_iterator__free(git_iterator *self) -{ - index_iterator *ii = (index_iterator *)self; - git_index_snapshot_release(&ii->entries, ii->index); - ii->index = NULL; - git_buf_free(&ii->partial); -} - -int git_iterator_for_index( - git_iterator **iter, - git_repository *repo, - git_index *index, - git_iterator_options *options) -{ - int error = 0; - index_iterator *ii = git__calloc(1, sizeof(index_iterator)); - GITERR_CHECK_ALLOC(ii); - - if ((error = git_index_snapshot_new(&ii->entries, index)) < 0) { - git__free(ii); - return error; - } - ii->index = index; - - ITERATOR_BASE_INIT(ii, index, INDEX, repo); - - if ((error = iterator__update_ignore_case((git_iterator *)ii, options ? options->flags : 0)) < 0) { - git_iterator_free((git_iterator *)ii); - return error; - } - - ii->entry_srch = iterator__ignore_case(ii) ? - git_index_entry_isrch : git_index_entry_srch; - - git_vector_set_cmp(&ii->entries, iterator__ignore_case(ii) ? - git_index_entry_icmp : git_index_entry_cmp); - git_vector_sort(&ii->entries); - - git_buf_init(&ii->partial, 0); - ii->tree_entry.mode = GIT_FILEMODE_TREE; - - index_iterator__reset((git_iterator *)ii, NULL, NULL); - - *iter = (git_iterator *)ii; - return 0; -} - - -typedef struct fs_iterator_frame fs_iterator_frame; -struct fs_iterator_frame { - fs_iterator_frame *next; - git_vector entries; - size_t index; - int is_ignored; -}; - -typedef struct fs_iterator fs_iterator; -struct fs_iterator { - git_iterator base; - git_iterator_callbacks cb; - fs_iterator_frame *stack; - git_index_entry entry; - git_buf path; - size_t root_len; - uint32_t dirload_flags; - int depth; - iterator_pathlist__match_t pathlist_match; - - int (*enter_dir_cb)(fs_iterator *self); - int (*leave_dir_cb)(fs_iterator *self); - int (*update_entry_cb)(fs_iterator *self); -}; - -#define FS_MAX_DEPTH 100 - -typedef struct { - struct stat st; - iterator_pathlist__match_t pathlist_match; - size_t path_len; - char path[GIT_FLEX_ARRAY]; -} fs_iterator_path_with_stat; - -static int fs_iterator_path_with_stat_cmp(const void *a, const void *b) -{ - const fs_iterator_path_with_stat *psa = a, *psb = b; - return strcmp(psa->path, psb->path); -} - -static int fs_iterator_path_with_stat_cmp_icase(const void *a, const void *b) -{ - const fs_iterator_path_with_stat *psa = a, *psb = b; - return strcasecmp(psa->path, psb->path); -} - -static fs_iterator_frame *fs_iterator__alloc_frame(fs_iterator *fi) -{ - fs_iterator_frame *ff = git__calloc(1, sizeof(fs_iterator_frame)); - git_vector_cmp entry_compare = CASESELECT( - iterator__ignore_case(fi), - fs_iterator_path_with_stat_cmp_icase, - fs_iterator_path_with_stat_cmp); - - if (ff && git_vector_init(&ff->entries, 0, entry_compare) < 0) { - git__free(ff); - ff = NULL; - } - - return ff; -} - -static void fs_iterator__free_frame(fs_iterator_frame *ff) -{ - git_vector_free_deep(&ff->entries); - git__free(ff); -} - -static void fs_iterator__pop_frame( - fs_iterator *fi, fs_iterator_frame *ff, bool pop_last) -{ - if (fi && fi->stack == ff) { - if (!ff->next && !pop_last) { - memset(&fi->entry, 0, sizeof(fi->entry)); - return; - } - - if (fi->leave_dir_cb) - (void)fi->leave_dir_cb(fi); - - fi->stack = ff->next; - fi->depth--; - } - - fs_iterator__free_frame(ff); -} - -static int fs_iterator__update_entry(fs_iterator *fi); -static int fs_iterator__advance_over( - const git_index_entry **entry, git_iterator *self); - -static int fs_iterator__entry_cmp(const void *i, const void *item) -{ - const fs_iterator *fi = (const fs_iterator *)i; - const fs_iterator_path_with_stat *ps = item; - return fi->base.prefixcomp(fi->base.start, ps->path); -} - -static void fs_iterator__seek_frame_start( - fs_iterator *fi, fs_iterator_frame *ff) -{ - if (!ff) - return; - - if (fi->base.start) - git_vector_bsearch2( - &ff->index, &ff->entries, fs_iterator__entry_cmp, fi); - else - ff->index = 0; -} - -static int dirload_with_stat(git_vector *contents, fs_iterator *fi) -{ - git_path_diriter diriter = GIT_PATH_DIRITER_INIT; - const char *path; - size_t start_len = fi->base.start ? strlen(fi->base.start) : 0; - size_t end_len = fi->base.end ? strlen(fi->base.end) : 0; - fs_iterator_path_with_stat *ps; - size_t path_len, cmp_len, ps_size; - iterator_pathlist__match_t pathlist_match = ITERATOR_PATHLIST_MATCH; - int error; - - /* Any error here is equivalent to the dir not existing, skip over it */ - if ((error = git_path_diriter_init( - &diriter, fi->path.ptr, fi->dirload_flags)) < 0) { - error = GIT_ENOTFOUND; - goto done; - } - - while ((error = git_path_diriter_next(&diriter)) == 0) { - if ((error = git_path_diriter_fullpath(&path, &path_len, &diriter)) < 0) - goto done; - - assert(path_len > fi->root_len); - - /* remove the prefix if requested */ - path += fi->root_len; - path_len -= fi->root_len; - - /* skip if before start_stat or after end_stat */ - cmp_len = min(start_len, path_len); - if (cmp_len && fi->base.strncomp(path, fi->base.start, cmp_len) < 0) - continue; - /* skip if after end_stat */ - cmp_len = min(end_len, path_len); - if (cmp_len && fi->base.strncomp(path, fi->base.end, cmp_len) > 0) - continue; - - /* if we have a pathlist that we're limiting to, examine this path. - * if the frame has already deemed us inside the path (eg, we're in - * `foo/bar` and the pathlist previously was detected to say `foo/`) - * then simply continue. otherwise, examine the pathlist looking for - * this path or children of this path. - */ - if (fi->base.pathlist.length && - fi->pathlist_match != ITERATOR_PATHLIST_MATCH && - fi->pathlist_match != ITERATOR_PATHLIST_MATCH_DIRECTORY && - !(pathlist_match = iterator_pathlist__match(&fi->base, path, path_len))) - continue; - - /* Make sure to append two bytes, one for the path's null - * termination, one for a possible trailing '/' for folders. - */ - GITERR_CHECK_ALLOC_ADD(&ps_size, sizeof(fs_iterator_path_with_stat), path_len); - GITERR_CHECK_ALLOC_ADD(&ps_size, ps_size, 2); - - ps = git__calloc(1, ps_size); - ps->path_len = path_len; - - memcpy(ps->path, path, path_len); - - /* TODO: don't stat if assume unchanged for this path */ - - if ((error = git_path_diriter_stat(&ps->st, &diriter)) < 0) { - if (error == GIT_ENOTFOUND) { - /* file was removed between readdir and lstat */ - git__free(ps); - continue; - } - - if (pathlist_match == ITERATOR_PATHLIST_MATCH_DIRECTORY) { - /* were looking for a directory, but this is a file */ - git__free(ps); - continue; - } - - /* Treat the file as unreadable if we get any other error */ - memset(&ps->st, 0, sizeof(ps->st)); - ps->st.st_mode = GIT_FILEMODE_UNREADABLE; - - giterr_clear(); - error = 0; - } else if (S_ISDIR(ps->st.st_mode)) { - /* Suffix directory paths with a '/' */ - ps->path[ps->path_len++] = '/'; - ps->path[ps->path_len] = '\0'; - } else if(!S_ISREG(ps->st.st_mode) && !S_ISLNK(ps->st.st_mode)) { - /* Ignore wacky things in the filesystem */ - git__free(ps); - continue; - } - - /* record whether this path was explicitly found in the path list - * or whether we're only examining it because something beneath it - * is in the path list. - */ - ps->pathlist_match = pathlist_match; - git_vector_insert(contents, ps); - } - - if (error == GIT_ITEROVER) - error = 0; - - /* sort now that directory suffix is added */ - git_vector_sort(contents); - -done: - git_path_diriter_free(&diriter); - return error; -} - - -static int fs_iterator__expand_dir(fs_iterator *fi) -{ - int error; - fs_iterator_frame *ff; - - if (fi->depth > FS_MAX_DEPTH) { - giterr_set(GITERR_REPOSITORY, - "Directory nesting is too deep (%d)", fi->depth); - return -1; - } - - ff = fs_iterator__alloc_frame(fi); - GITERR_CHECK_ALLOC(ff); - - error = dirload_with_stat(&ff->entries, fi); - - if (error < 0) { - git_error_state last_error = { 0 }; - giterr_state_capture(&last_error, error); - - /* these callbacks may clear the error message */ - fs_iterator__free_frame(ff); - fs_iterator__advance_over(NULL, (git_iterator *)fi); - /* next time return value we skipped to */ - fi->base.flags &= ~GIT_ITERATOR_FIRST_ACCESS; - - return giterr_state_restore(&last_error); - } - - if (ff->entries.length == 0) { - fs_iterator__free_frame(ff); - return GIT_ENOTFOUND; - } - fi->base.stat_calls += ff->entries.length; - - fs_iterator__seek_frame_start(fi, ff); - - ff->next = fi->stack; - fi->stack = ff; - fi->depth++; - - if (fi->enter_dir_cb && (error = fi->enter_dir_cb(fi)) < 0) - return error; - - return fs_iterator__update_entry(fi); -} - -static int fs_iterator__current( - const git_index_entry **entry, git_iterator *self) -{ - fs_iterator *fi = (fs_iterator *)self; - const git_index_entry *fe = (fi->entry.path == NULL) ? NULL : &fi->entry; - - if (entry) - *entry = fe; - - fi->base.flags |= GIT_ITERATOR_FIRST_ACCESS; - - return (fe != NULL) ? 0 : GIT_ITEROVER; -} - -static int fs_iterator__at_end(git_iterator *self) -{ - return (((fs_iterator *)self)->entry.path == NULL); -} - -static int fs_iterator__advance_into( - const git_index_entry **entry, git_iterator *iter) -{ - int error = 0; - fs_iterator *fi = (fs_iterator *)iter; - - iterator__clear_entry(entry); - - /* Allow you to explicitly advance into a commit/submodule (as well as a - * tree) to avoid cases where an entry is mislabeled as a submodule in - * the working directory. The fs iterator will never have COMMMIT - * entries on it's own, but a wrapper might add them. - */ - if (fi->entry.path != NULL && - (fi->entry.mode == GIT_FILEMODE_TREE || - fi->entry.mode == GIT_FILEMODE_COMMIT)) - /* returns GIT_ENOTFOUND if the directory is empty */ - error = fs_iterator__expand_dir(fi); - - if (!error && entry) - error = fs_iterator__current(entry, iter); - - if (!error && !fi->entry.path) - error = GIT_ITEROVER; - - return error; -} - -static void fs_iterator__advance_over_internal(git_iterator *self) -{ - fs_iterator *fi = (fs_iterator *)self; - fs_iterator_frame *ff; - fs_iterator_path_with_stat *next; - - while (fi->entry.path != NULL) { - ff = fi->stack; - next = git_vector_get(&ff->entries, ++ff->index); - - if (next != NULL) - break; - - fs_iterator__pop_frame(fi, ff, false); - } -} - -static int fs_iterator__advance_over( - const git_index_entry **entry, git_iterator *self) -{ - int error; - - if (entry != NULL) - *entry = NULL; - - fs_iterator__advance_over_internal(self); - - error = fs_iterator__update_entry((fs_iterator *)self); - - if (!error && entry != NULL) - error = fs_iterator__current(entry, self); - - return error; -} - -static int fs_iterator__advance( - const git_index_entry **entry, git_iterator *self) -{ - fs_iterator *fi = (fs_iterator *)self; - - if (!iterator__has_been_accessed(fi)) - return fs_iterator__current(entry, self); - - /* given include_trees & autoexpand, we might have to go into a tree */ - if (iterator__do_autoexpand(fi) && - fi->entry.path != NULL && - fi->entry.mode == GIT_FILEMODE_TREE) - { - int error = fs_iterator__advance_into(entry, self); - if (error != GIT_ENOTFOUND) - return error; - /* continue silently past empty directories if autoexpanding */ - giterr_clear(); - } - - return fs_iterator__advance_over(entry, self); -} - -static int fs_iterator__seek(git_iterator *self, const char *prefix) -{ - GIT_UNUSED(self); - GIT_UNUSED(prefix); - /* pop stack until matching prefix */ - /* find prefix item in current frame */ - /* push subdirectories as deep as possible while matching */ - return 0; -} - -static int fs_iterator__reset( - git_iterator *self, const char *start, const char *end) -{ - int error; - fs_iterator *fi = (fs_iterator *)self; - - while (fi->stack != NULL && fi->stack->next != NULL) - fs_iterator__pop_frame(fi, fi->stack, false); - fi->depth = 0; - - if ((error = iterator__reset_range(self, start, end)) < 0) - return error; - - fs_iterator__seek_frame_start(fi, fi->stack); - - error = fs_iterator__update_entry(fi); - if (error == GIT_ITEROVER) - error = 0; - - return error; -} - -static void fs_iterator__free(git_iterator *self) -{ - fs_iterator *fi = (fs_iterator *)self; - - while (fi->stack != NULL) - fs_iterator__pop_frame(fi, fi->stack, true); - - git_buf_free(&fi->path); -} - -static int fs_iterator__update_entry(fs_iterator *fi) -{ - fs_iterator_path_with_stat *ps; - - while (true) { - memset(&fi->entry, 0, sizeof(fi->entry)); - - if (!fi->stack) - return GIT_ITEROVER; - - ps = git_vector_get(&fi->stack->entries, fi->stack->index); - if (!ps) - return GIT_ITEROVER; - - git_buf_truncate(&fi->path, fi->root_len); - if (git_buf_put(&fi->path, ps->path, ps->path_len) < 0) - return -1; - - if (iterator__past_end(fi, fi->path.ptr + fi->root_len)) - return GIT_ITEROVER; - - fi->entry.path = ps->path; - fi->pathlist_match = ps->pathlist_match; - git_index_entry__init_from_stat(&fi->entry, &ps->st, true); - - /* need different mode here to keep directories during iteration */ - fi->entry.mode = git_futils_canonical_mode(ps->st.st_mode); - - /* allow wrapper to check/update the entry (can force skip) */ - if (fi->update_entry_cb && - fi->update_entry_cb(fi) == GIT_ENOTFOUND) { - fs_iterator__advance_over_internal(&fi->base); - continue; - } - - /* if this is a tree and trees aren't included, then skip */ - if (fi->entry.mode == GIT_FILEMODE_TREE && !iterator__include_trees(fi)) { - int error = fs_iterator__advance_into(NULL, &fi->base); - - if (error != GIT_ENOTFOUND) - return error; - - giterr_clear(); - fs_iterator__advance_over_internal(&fi->base); - continue; - } - - break; - } - - return 0; -} - -static int fs_iterator__initialize( - git_iterator **out, fs_iterator *fi, const char *root) -{ - int error; - - if (git_buf_sets(&fi->path, root) < 0 || git_path_to_dir(&fi->path) < 0) { - git__free(fi); - return -1; - } - fi->root_len = fi->path.size; - fi->pathlist_match = ITERATOR_PATHLIST_MATCH_CHILD; - - fi->dirload_flags = - (iterator__ignore_case(fi) ? GIT_PATH_DIR_IGNORE_CASE : 0) | - (iterator__flag(fi, PRECOMPOSE_UNICODE) ? - GIT_PATH_DIR_PRECOMPOSE_UNICODE : 0); - - if ((error = fs_iterator__expand_dir(fi)) < 0) { - if (error == GIT_ENOTFOUND || error == GIT_ITEROVER) { - giterr_clear(); - error = 0; - } else { - git_iterator_free((git_iterator *)fi); - fi = NULL; - } - } - - *out = (git_iterator *)fi; - return error; -} - -int git_iterator_for_filesystem( - git_iterator **out, - const char *root, - git_iterator_options *options) -{ - fs_iterator *fi = git__calloc(1, sizeof(fs_iterator)); - GITERR_CHECK_ALLOC(fi); - - ITERATOR_BASE_INIT(fi, fs, FS, NULL); - - if (options && (options->flags & GIT_ITERATOR_IGNORE_CASE) != 0) - fi->base.flags |= GIT_ITERATOR_IGNORE_CASE; - - return fs_iterator__initialize(out, fi, root); -} - - -typedef struct { - fs_iterator fi; - git_ignores ignores; - int is_ignored; - - /* - * We may have a tree or the index+snapshot to compare against - * when checking for submodules. - */ - git_tree *tree; - git_index *index; - git_vector index_snapshot; - git_vector_cmp entry_srch; - -} workdir_iterator; - -GIT_INLINE(bool) workdir_path_is_dotgit(const git_buf *path) -{ - size_t len; - - if (!path || (len = path->size) < 4) - return false; - - if (path->ptr[len - 1] == '/') - len--; - - if (git__tolower(path->ptr[len - 1]) != 't' || - git__tolower(path->ptr[len - 2]) != 'i' || - git__tolower(path->ptr[len - 3]) != 'g' || - git__tolower(path->ptr[len - 4]) != '.') - return false; - - return (len == 4 || path->ptr[len - 5] == '/'); -} - -/** - * Figure out if an entry is a submodule. - * - * We consider it a submodule if the path is listed as a submodule in - * either the tree or the index. - */ -static int is_submodule(workdir_iterator *wi, fs_iterator_path_with_stat *ie) -{ - int error, is_submodule = 0; - - if (wi->tree) { - git_tree_entry *e; - - /* remove the trailing slash for finding */ - ie->path[ie->path_len-1] = '\0'; - error = git_tree_entry_bypath(&e, wi->tree, ie->path); - ie->path[ie->path_len-1] = '/'; - if (error < 0 && error != GIT_ENOTFOUND) - return 0; - if (!error) { - is_submodule = e->attr == GIT_FILEMODE_COMMIT; - git_tree_entry_free(e); - } - } - - if (!is_submodule && wi->index) { - git_index_entry *e; - size_t pos; - - error = git_index_snapshot_find(&pos, &wi->index_snapshot, wi->entry_srch, ie->path, ie->path_len-1, 0); - if (error < 0 && error != GIT_ENOTFOUND) - return 0; - - if (!error) { - e = git_vector_get(&wi->index_snapshot, pos); - - is_submodule = e->mode == GIT_FILEMODE_COMMIT; - } - } - - return is_submodule; -} - -GIT_INLINE(git_dir_flag) git_entry__dir_flag(git_index_entry *entry) { -#if defined(GIT_WIN32) && !defined(__MINGW32__) - return (entry && entry->mode) - ? S_ISDIR(entry->mode) ? GIT_DIR_FLAG_TRUE : GIT_DIR_FLAG_FALSE - : GIT_DIR_FLAG_UNKNOWN; -#else - GIT_UNUSED(entry); - return GIT_DIR_FLAG_UNKNOWN; -#endif -} - -static int workdir_iterator__enter_dir(fs_iterator *fi) -{ - workdir_iterator *wi = (workdir_iterator *)fi; - fs_iterator_frame *ff = fi->stack; - size_t pos; - fs_iterator_path_with_stat *entry; - bool found_submodules = false; - - git_dir_flag dir_flag = git_entry__dir_flag(&fi->entry); - - /* check if this directory is ignored */ - if (git_ignore__lookup(&ff->is_ignored, &wi->ignores, fi->path.ptr + fi->root_len, dir_flag) < 0) { - giterr_clear(); - ff->is_ignored = GIT_IGNORE_NOTFOUND; - } - - /* if this is not the top level directory... */ - if (ff->next != NULL) { - ssize_t slash_pos = git_buf_rfind_next(&fi->path, '/'); - - /* inherit ignored from parent if no rule specified */ - if (ff->is_ignored <= GIT_IGNORE_NOTFOUND) - ff->is_ignored = ff->next->is_ignored; - - /* push new ignores for files in this directory */ - (void)git_ignore__push_dir(&wi->ignores, &fi->path.ptr[slash_pos + 1]); - } - - /* convert submodules to GITLINK and remove trailing slashes */ - git_vector_foreach(&ff->entries, pos, entry) { - if (!S_ISDIR(entry->st.st_mode) || !strcmp(GIT_DIR, entry->path)) - continue; - - if (is_submodule(wi, entry)) { - entry->st.st_mode = GIT_FILEMODE_COMMIT; - entry->path_len--; - entry->path[entry->path_len] = '\0'; - found_submodules = true; - } - } - - /* if we renamed submodules, re-sort and re-seek to start */ - if (found_submodules) { - git_vector_set_sorted(&ff->entries, 0); - git_vector_sort(&ff->entries); - fs_iterator__seek_frame_start(fi, ff); - } - - return 0; -} - -static int workdir_iterator__leave_dir(fs_iterator *fi) -{ - workdir_iterator *wi = (workdir_iterator *)fi; - git_ignore__pop_dir(&wi->ignores); - return 0; -} - -static int workdir_iterator__update_entry(fs_iterator *fi) -{ - workdir_iterator *wi = (workdir_iterator *)fi; - - /* skip over .git entries */ - if (workdir_path_is_dotgit(&fi->path)) - return GIT_ENOTFOUND; - - /* reset is_ignored since we haven't checked yet */ - wi->is_ignored = GIT_IGNORE_UNCHECKED; - - return 0; -} - -static void workdir_iterator__free(git_iterator *self) -{ - workdir_iterator *wi = (workdir_iterator *)self; - if (wi->index) - git_index_snapshot_release(&wi->index_snapshot, wi->index); - git_tree_free(wi->tree); - fs_iterator__free(self); - git_ignore__free(&wi->ignores); -} - -int git_iterator_for_workdir_ext( - git_iterator **out, - git_repository *repo, - const char *repo_workdir, - git_index *index, - git_tree *tree, - git_iterator_options *options) -{ - int error, precompose = 0; - workdir_iterator *wi; - - if (!repo_workdir) { - if (git_repository__ensure_not_bare(repo, "scan working directory") < 0) - return GIT_EBAREREPO; - repo_workdir = git_repository_workdir(repo); - } - - /* initialize as an fs iterator then do overrides */ - wi = git__calloc(1, sizeof(workdir_iterator)); - GITERR_CHECK_ALLOC(wi); - ITERATOR_BASE_INIT((&wi->fi), fs, FS, repo); - - wi->fi.base.type = GIT_ITERATOR_TYPE_WORKDIR; - wi->fi.cb.free = workdir_iterator__free; - wi->fi.enter_dir_cb = workdir_iterator__enter_dir; - wi->fi.leave_dir_cb = workdir_iterator__leave_dir; - wi->fi.update_entry_cb = workdir_iterator__update_entry; - - if ((error = iterator__update_ignore_case((git_iterator *)wi, options ? options->flags : 0)) < 0 || - (error = git_ignore__for_path(repo, ".gitignore", &wi->ignores)) < 0) - { - git_iterator_free((git_iterator *)wi); - return error; - } - - if (tree && (error = git_object_dup((git_object **)&wi->tree, (git_object *)tree)) < 0) - return error; - - wi->index = index; - if (index && (error = git_index_snapshot_new(&wi->index_snapshot, index)) < 0) { - git_iterator_free((git_iterator *)wi); - return error; - } - wi->entry_srch = iterator__ignore_case(wi) ? - git_index_entry_isrch : git_index_entry_srch; - - - /* try to look up precompose and set flag if appropriate */ - if (git_repository__cvar(&precompose, repo, GIT_CVAR_PRECOMPOSE) < 0) - giterr_clear(); - else if (precompose) - wi->fi.base.flags |= GIT_ITERATOR_PRECOMPOSE_UNICODE; - - return fs_iterator__initialize(out, &wi->fi, repo_workdir); -} - -void git_iterator_free(git_iterator *iter) -{ - if (iter == NULL) - return; - - iter->cb->free(iter); - - git_vector_free(&iter->pathlist); - git__free(iter->start); - git__free(iter->end); - - memset(iter, 0, sizeof(*iter)); - - git__free(iter); -} - -int git_iterator_set_ignore_case(git_iterator *iter, bool ignore_case) -{ - bool desire_ignore_case = (ignore_case != 0); - - if (iterator__ignore_case(iter) == desire_ignore_case) - return 0; - - if (iter->type == GIT_ITERATOR_TYPE_EMPTY) { - if (desire_ignore_case) - iter->flags |= GIT_ITERATOR_IGNORE_CASE; - else - iter->flags &= ~GIT_ITERATOR_IGNORE_CASE; - } else { - giterr_set(GITERR_INVALID, - "Cannot currently set ignore case on non-empty iterators"); - return -1; - } - - return 0; -} - -git_index *git_iterator_get_index(git_iterator *iter) -{ - if (iter->type == GIT_ITERATOR_TYPE_INDEX) - return ((index_iterator *)iter)->index; - return NULL; -} - -int git_iterator_current_tree_entry( - const git_tree_entry **tree_entry, git_iterator *iter) -{ - if (iter->type != GIT_ITERATOR_TYPE_TREE) - *tree_entry = NULL; - else { - tree_iterator_frame *tf = ((tree_iterator *)iter)->head; - *tree_entry = (tf->current < tf->n_entries) ? - tf->entries[tf->current]->te : NULL; - } - - return 0; -} - -int git_iterator_current_parent_tree( - const git_tree **tree_ptr, - git_iterator *iter, - const char *parent_path) -{ - tree_iterator *ti = (tree_iterator *)iter; - tree_iterator_frame *tf; - const char *scan = parent_path; - const git_tree_entry *te; - - *tree_ptr = NULL; - - if (iter->type != GIT_ITERATOR_TYPE_TREE) - return 0; - - for (tf = ti->root; *scan; ) { - if (!(tf = tf->down) || - tf->current >= tf->n_entries || - !(te = tf->entries[tf->current]->te) || - ti->base.strncomp(scan, te->filename, te->filename_len) != 0) - return 0; - - scan += te->filename_len; - if (*scan == '/') - scan++; - } - - *tree_ptr = tf->entries[tf->current]->tree; - return 0; -} - -static void workdir_iterator_update_is_ignored(workdir_iterator *wi) -{ - git_dir_flag dir_flag = git_entry__dir_flag(&wi->fi.entry); - - if (git_ignore__lookup(&wi->is_ignored, &wi->ignores, wi->fi.entry.path, dir_flag) < 0) { - giterr_clear(); - wi->is_ignored = GIT_IGNORE_NOTFOUND; - } - - /* use ignore from containing frame stack */ - if (wi->is_ignored <= GIT_IGNORE_NOTFOUND) - wi->is_ignored = wi->fi.stack->is_ignored; -} - -bool git_iterator_current_is_ignored(git_iterator *iter) -{ - workdir_iterator *wi = (workdir_iterator *)iter; - - if (iter->type != GIT_ITERATOR_TYPE_WORKDIR) - return false; - - if (wi->is_ignored != GIT_IGNORE_UNCHECKED) - return (bool)(wi->is_ignored == GIT_IGNORE_TRUE); - - workdir_iterator_update_is_ignored(wi); - - return (bool)(wi->is_ignored == GIT_IGNORE_TRUE); -} - -bool git_iterator_current_tree_is_ignored(git_iterator *iter) -{ - workdir_iterator *wi = (workdir_iterator *)iter; - - if (iter->type != GIT_ITERATOR_TYPE_WORKDIR) - return false; - - return (bool)(wi->fi.stack->is_ignored == GIT_IGNORE_TRUE); -} - -int git_iterator_cmp(git_iterator *iter, const char *path_prefix) -{ - const git_index_entry *entry; - - /* a "done" iterator is after every prefix */ - if (git_iterator_current(&entry, iter) < 0 || entry == NULL) - return 1; - - /* a NULL prefix is after any valid iterator */ - if (!path_prefix) - return -1; - - return iter->prefixcomp(entry->path, path_prefix); -} - -int git_iterator_current_workdir_path(git_buf **path, git_iterator *iter) -{ - workdir_iterator *wi = (workdir_iterator *)iter; - - if (iter->type != GIT_ITERATOR_TYPE_WORKDIR || !wi->fi.entry.path) - *path = NULL; - else - *path = &wi->fi.path; - - return 0; -} - -int git_iterator_index(git_index **out, git_iterator *iter) -{ - workdir_iterator *wi = (workdir_iterator *)iter; - - if (iter->type != GIT_ITERATOR_TYPE_WORKDIR) - *out = NULL; - - *out = wi->index; - - return 0; -} - -int git_iterator_advance_over_with_status( - const git_index_entry **entryptr, - git_iterator_status_t *status, - git_iterator *iter) -{ - int error = 0; - workdir_iterator *wi = (workdir_iterator *)iter; - char *base = NULL; - const git_index_entry *entry; - - *status = GIT_ITERATOR_STATUS_NORMAL; - - if (iter->type != GIT_ITERATOR_TYPE_WORKDIR) - return git_iterator_advance(entryptr, iter); - if ((error = git_iterator_current(&entry, iter)) < 0) - return error; - - if (!S_ISDIR(entry->mode)) { - workdir_iterator_update_is_ignored(wi); - if (wi->is_ignored == GIT_IGNORE_TRUE) - *status = GIT_ITERATOR_STATUS_IGNORED; - return git_iterator_advance(entryptr, iter); - } - - *status = GIT_ITERATOR_STATUS_EMPTY; - - base = git__strdup(entry->path); - GITERR_CHECK_ALLOC(base); - - /* scan inside directory looking for a non-ignored item */ - while (entry && !iter->prefixcomp(entry->path, base)) { - workdir_iterator_update_is_ignored(wi); - - /* if we found an explicitly ignored item, then update from - * EMPTY to IGNORED - */ - if (wi->is_ignored == GIT_IGNORE_TRUE) - *status = GIT_ITERATOR_STATUS_IGNORED; - else if (S_ISDIR(entry->mode)) { - error = git_iterator_advance_into(&entry, iter); - - if (!error) - continue; - - else if (error == GIT_ENOTFOUND) { - /* we entered this directory only hoping to find child matches to - * our pathlist (eg, this is `foo` and we had a pathlist entry for - * `foo/bar`). it should not be ignored, it should be excluded. - */ - if (wi->fi.pathlist_match == ITERATOR_PATHLIST_MATCH_CHILD) - *status = GIT_ITERATOR_STATUS_FILTERED; - else - wi->is_ignored = GIT_IGNORE_TRUE; /* mark empty dirs ignored */ - - error = 0; - } else - break; /* real error, stop here */ - } else { - /* we found a non-ignored item, treat parent as untracked */ - *status = GIT_ITERATOR_STATUS_NORMAL; - break; - } - - if ((error = git_iterator_advance(&entry, iter)) < 0) - break; - } - - /* wrap up scan back to base directory */ - while (entry && !iter->prefixcomp(entry->path, base)) - if ((error = git_iterator_advance(&entry, iter)) < 0) - break; - - *entryptr = entry; - git__free(base); - - return error; -} - -int git_iterator_walk( - git_iterator **iterators, - size_t cnt, - git_iterator_walk_cb cb, - void *data) -{ - const git_index_entry **iterator_item; /* next in each iterator */ - const git_index_entry **cur_items; /* current path in each iter */ - const git_index_entry *first_match; - size_t i, j; - int error = 0; - - iterator_item = git__calloc(cnt, sizeof(git_index_entry *)); - cur_items = git__calloc(cnt, sizeof(git_index_entry *)); - - GITERR_CHECK_ALLOC(iterator_item); - GITERR_CHECK_ALLOC(cur_items); - - /* Set up the iterators */ - for (i = 0; i < cnt; i++) { - error = git_iterator_current(&iterator_item[i], iterators[i]); - - if (error < 0 && error != GIT_ITEROVER) - goto done; - } - - while (true) { - for (i = 0; i < cnt; i++) - cur_items[i] = NULL; - - first_match = NULL; - - /* Find the next path(s) to consume from each iterator */ - for (i = 0; i < cnt; i++) { - if (iterator_item[i] == NULL) - continue; - - if (first_match == NULL) { - first_match = iterator_item[i]; - cur_items[i] = iterator_item[i]; - } else { - int path_diff = git_index_entry_cmp(iterator_item[i], first_match); - - if (path_diff < 0) { - /* Found an index entry that sorts before the one we're - * looking at. Forget that we've seen the other and - * look at the other iterators for this path. - */ - for (j = 0; j < i; j++) - cur_items[j] = NULL; - - first_match = iterator_item[i]; - cur_items[i] = iterator_item[i]; - } else if (path_diff == 0) { - cur_items[i] = iterator_item[i]; - } - } - } - - if (first_match == NULL) - break; - - if ((error = cb(cur_items, data)) != 0) - goto done; - - /* Advance each iterator that participated */ - for (i = 0; i < cnt; i++) { - if (cur_items[i] == NULL) - continue; - - error = git_iterator_advance(&iterator_item[i], iterators[i]); - - if (error < 0 && error != GIT_ITEROVER) - goto done; - } - } - -done: - git__free((git_index_entry **)iterator_item); - git__free((git_index_entry **)cur_items); - - if (error == GIT_ITEROVER) - error = 0; - - return error; -} diff --git a/vendor/libgit2/src/iterator.h b/vendor/libgit2/src/iterator.h deleted file mode 100644 index ac17d2970..000000000 --- a/vendor/libgit2/src/iterator.h +++ /dev/null @@ -1,321 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_iterator_h__ -#define INCLUDE_iterator_h__ - -#include "common.h" -#include "git2/index.h" -#include "vector.h" -#include "buffer.h" -#include "ignore.h" - -typedef struct git_iterator git_iterator; - -typedef enum { - GIT_ITERATOR_TYPE_EMPTY = 0, - GIT_ITERATOR_TYPE_TREE = 1, - GIT_ITERATOR_TYPE_INDEX = 2, - GIT_ITERATOR_TYPE_WORKDIR = 3, - GIT_ITERATOR_TYPE_FS = 4, -} git_iterator_type_t; - -typedef enum { - /** ignore case for entry sort order */ - GIT_ITERATOR_IGNORE_CASE = (1u << 0), - /** force case sensitivity for entry sort order */ - GIT_ITERATOR_DONT_IGNORE_CASE = (1u << 1), - /** return tree items in addition to blob items */ - GIT_ITERATOR_INCLUDE_TREES = (1u << 2), - /** don't flatten trees, requiring advance_into (implies INCLUDE_TREES) */ - GIT_ITERATOR_DONT_AUTOEXPAND = (1u << 3), - /** convert precomposed unicode to decomposed unicode */ - GIT_ITERATOR_PRECOMPOSE_UNICODE = (1u << 4), - /** include conflicts */ - GIT_ITERATOR_INCLUDE_CONFLICTS = (1u << 5), -} git_iterator_flag_t; - -typedef struct { - const char *start; - const char *end; - - /* paths to include in the iterator (literal). if set, any paths not - * listed here will be excluded from iteration. - */ - git_strarray pathlist; - - /* flags, from above */ - unsigned int flags; -} git_iterator_options; - -#define GIT_ITERATOR_OPTIONS_INIT {0} - -typedef struct { - int (*current)(const git_index_entry **, git_iterator *); - int (*advance)(const git_index_entry **, git_iterator *); - int (*advance_into)(const git_index_entry **, git_iterator *); - int (*seek)(git_iterator *, const char *prefix); - int (*reset)(git_iterator *, const char *start, const char *end); - int (*at_end)(git_iterator *); - void (*free)(git_iterator *); -} git_iterator_callbacks; - -struct git_iterator { - git_iterator_type_t type; - git_iterator_callbacks *cb; - git_repository *repo; - char *start; - char *end; - git_vector pathlist; - size_t pathlist_walk_idx; - int (*strcomp)(const char *a, const char *b); - int (*strncomp)(const char *a, const char *b, size_t n); - int (*prefixcomp)(const char *str, const char *prefix); - size_t stat_calls; - unsigned int flags; -}; - -extern int git_iterator_for_nothing( - git_iterator **out, - git_iterator_options *options); - -/* tree iterators will match the ignore_case value from the index of the - * repository, unless you override with a non-zero flag value - */ -extern int git_iterator_for_tree( - git_iterator **out, - git_tree *tree, - git_iterator_options *options); - -/* index iterators will take the ignore_case value from the index; the - * ignore_case flags are not used - */ -extern int git_iterator_for_index( - git_iterator **out, - git_repository *repo, - git_index *index, - git_iterator_options *options); - -extern int git_iterator_for_workdir_ext( - git_iterator **out, - git_repository *repo, - const char *repo_workdir, - git_index *index, - git_tree *tree, - git_iterator_options *options); - -/* workdir iterators will match the ignore_case value from the index of the - * repository, unless you override with a non-zero flag value - */ -GIT_INLINE(int) git_iterator_for_workdir( - git_iterator **out, - git_repository *repo, - git_index *index, - git_tree *tree, - git_iterator_options *options) -{ - return git_iterator_for_workdir_ext(out, repo, NULL, index, tree, options); -} - -/* for filesystem iterators, you have to explicitly pass in the ignore_case - * behavior that you desire - */ -extern int git_iterator_for_filesystem( - git_iterator **out, - const char *root, - git_iterator_options *options); - -extern void git_iterator_free(git_iterator *iter); - -/* Return a git_index_entry structure for the current value the iterator - * is looking at or NULL if the iterator is at the end. - * - * The entry may noy be fully populated. Tree iterators will only have a - * value mode, OID, and path. Workdir iterators will not have an OID (but - * you can use `git_iterator_current_oid()` to calculate it on demand). - * - * You do not need to free the entry. It is still "owned" by the iterator. - * Once you call `git_iterator_advance()` then the old entry is no longer - * guaranteed to be valid - it may be freed or just overwritten in place. - */ -GIT_INLINE(int) git_iterator_current( - const git_index_entry **entry, git_iterator *iter) -{ - return iter->cb->current(entry, iter); -} - -/** - * Advance to the next item for the iterator. - * - * If GIT_ITERATOR_INCLUDE_TREES is set, this may be a tree item. If - * GIT_ITERATOR_DONT_AUTOEXPAND is set, calling this again when on a tree - * item will skip over all the items under that tree. - */ -GIT_INLINE(int) git_iterator_advance( - const git_index_entry **entry, git_iterator *iter) -{ - return iter->cb->advance(entry, iter); -} - -/** - * Iterate into a tree item (when GIT_ITERATOR_DONT_AUTOEXPAND is set). - * - * git_iterator_advance() steps through all items being iterated over - * (either with or without trees, depending on GIT_ITERATOR_INCLUDE_TREES), - * but if GIT_ITERATOR_DONT_AUTOEXPAND is set, it will skip to the next - * sibling of a tree instead of going to the first child of the tree. In - * that case, use this function to advance to the first child of the tree. - * - * If the current item is not a tree, this is a no-op. - * - * For filesystem and working directory iterators, a tree (i.e. directory) - * can be empty. In that case, this function returns GIT_ENOTFOUND and - * does not advance. That can't happen for tree and index iterators. - */ -GIT_INLINE(int) git_iterator_advance_into( - const git_index_entry **entry, git_iterator *iter) -{ - return iter->cb->advance_into(entry, iter); -} - -/** - * Advance into a tree or skip over it if it is empty. - * - * Because `git_iterator_advance_into` may return GIT_ENOTFOUND if the - * directory is empty (only with filesystem and working directory - * iterators) and a common response is to just call `git_iterator_advance` - * when that happens, this bundles the two into a single simple call. - */ -GIT_INLINE(int) git_iterator_advance_into_or_over( - const git_index_entry **entry, git_iterator *iter) -{ - int error = iter->cb->advance_into(entry, iter); - if (error == GIT_ENOTFOUND) { - giterr_clear(); - error = iter->cb->advance(entry, iter); - } - return error; -} - -/* Seek is currently unimplemented */ -GIT_INLINE(int) git_iterator_seek( - git_iterator *iter, const char *prefix) -{ - return iter->cb->seek(iter, prefix); -} - -/** - * Go back to the start of the iteration. - * - * This resets the iterator to the start of the iteration. It also allows - * you to reset the `start` and `end` pathname boundaries of the iteration - * when doing so. - */ -GIT_INLINE(int) git_iterator_reset( - git_iterator *iter, const char *start, const char *end) -{ - return iter->cb->reset(iter, start, end); -} - -/** - * Check if the iterator is at the end - * - * @return 0 if not at end, >0 if at end - */ -GIT_INLINE(int) git_iterator_at_end(git_iterator *iter) -{ - return iter->cb->at_end(iter); -} - -GIT_INLINE(git_iterator_type_t) git_iterator_type(git_iterator *iter) -{ - return iter->type; -} - -GIT_INLINE(git_repository *) git_iterator_owner(git_iterator *iter) -{ - return iter->repo; -} - -GIT_INLINE(git_iterator_flag_t) git_iterator_flags(git_iterator *iter) -{ - return iter->flags; -} - -GIT_INLINE(bool) git_iterator_ignore_case(git_iterator *iter) -{ - return ((iter->flags & GIT_ITERATOR_IGNORE_CASE) != 0); -} - -extern int git_iterator_set_ignore_case(git_iterator *iter, bool ignore_case); - -extern int git_iterator_current_tree_entry( - const git_tree_entry **entry_out, git_iterator *iter); - -extern int git_iterator_current_parent_tree( - const git_tree **tree_out, git_iterator *iter, const char *parent_path); - -extern bool git_iterator_current_is_ignored(git_iterator *iter); - -extern bool git_iterator_current_tree_is_ignored(git_iterator *iter); - -extern int git_iterator_cmp( - git_iterator *iter, const char *path_prefix); - -/** - * Get full path of the current item from a workdir iterator. This will - * return NULL for a non-workdir iterator. The git_buf is still owned by - * the iterator; this is exposed just for efficiency. - */ -extern int git_iterator_current_workdir_path( - git_buf **path, git_iterator *iter); - -/* Return index pointer if index iterator, else NULL */ -extern git_index *git_iterator_get_index(git_iterator *iter); - -typedef enum { - GIT_ITERATOR_STATUS_NORMAL = 0, - GIT_ITERATOR_STATUS_IGNORED = 1, - GIT_ITERATOR_STATUS_EMPTY = 2, - GIT_ITERATOR_STATUS_FILTERED = 3 -} git_iterator_status_t; - -/* Advance over a directory and check if it contains no files or just - * ignored files. - * - * In a tree or the index, all directories will contain files, but in the - * working directory it is possible to have an empty directory tree or a - * tree that only contains ignored files. Many Git operations treat these - * cases specially. This advances over a directory (presumably an - * untracked directory) but checks during the scan if there are any files - * and any non-ignored files. - */ -extern int git_iterator_advance_over_with_status( - const git_index_entry **entry, git_iterator_status_t *status, git_iterator *iter); - -/** - * Retrieve the index stored in the iterator. - * - * Only implemented for the workdir iterator - */ -extern int git_iterator_index(git_index **out, git_iterator *iter); - -typedef int (*git_iterator_walk_cb)( - const git_index_entry **entries, - void *data); - -/** - * Walk the given iterators in lock-step. The given callback will be - * called for each unique path, with the index entry in each iterator - * (or NULL if the given iterator does not contain that path). - */ -extern int git_iterator_walk( - git_iterator **iterators, - size_t cnt, - git_iterator_walk_cb cb, - void *data); - -#endif diff --git a/vendor/libgit2/src/khash.h b/vendor/libgit2/src/khash.h deleted file mode 100644 index 71eb583d5..000000000 --- a/vendor/libgit2/src/khash.h +++ /dev/null @@ -1,622 +0,0 @@ -/* The MIT License - - Copyright (c) 2008, 2009, 2011 by Attractive Chaos - - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the - "Software"), to deal in the Software without restriction, including - without limitation the rights to use, copy, modify, merge, publish, - distribute, sublicense, and/or sell copies of the Software, and to - permit persons to whom the Software is furnished to do so, subject to - the following conditions: - - The above copyright notice and this permission notice shall be - included in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS - BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - SOFTWARE. -*/ - -/* - An example: - -#include "khash.h" -KHASH_MAP_INIT_INT(32, char) -int main() { - int ret, is_missing; - khiter_t k; - khash_t(32) *h = kh_init(32); - k = kh_put(32, h, 5, &ret); - kh_value(h, k) = 10; - k = kh_get(32, h, 10); - is_missing = (k == kh_end(h)); - k = kh_get(32, h, 5); - kh_del(32, h, k); - for (k = kh_begin(h); k != kh_end(h); ++k) - if (kh_exist(h, k)) kh_value(h, k) = 1; - kh_destroy(32, h); - return 0; -} -*/ - -/* - 2013-05-02 (0.2.8): - - * Use quadratic probing. When the capacity is power of 2, stepping function - i*(i+1)/2 guarantees to traverse each bucket. It is better than double - hashing on cache performance and is more robust than linear probing. - - In theory, double hashing should be more robust than quadratic probing. - However, my implementation is probably not for large hash tables, because - the second hash function is closely tied to the first hash function, - which reduce the effectiveness of double hashing. - - Reference: http://research.cs.vt.edu/AVresearch/hashing/quadratic.php - - 2011-12-29 (0.2.7): - - * Minor code clean up; no actual effect. - - 2011-09-16 (0.2.6): - - * The capacity is a power of 2. This seems to dramatically improve the - speed for simple keys. Thank Zilong Tan for the suggestion. Reference: - - - http://code.google.com/p/ulib/ - - http://nothings.org/computer/judy/ - - * Allow to optionally use linear probing which usually has better - performance for random input. Double hashing is still the default as it - is more robust to certain non-random input. - - * Added Wang's integer hash function (not used by default). This hash - function is more robust to certain non-random input. - - 2011-02-14 (0.2.5): - - * Allow to declare global functions. - - 2009-09-26 (0.2.4): - - * Improve portability - - 2008-09-19 (0.2.3): - - * Corrected the example - * Improved interfaces - - 2008-09-11 (0.2.2): - - * Improved speed a little in kh_put() - - 2008-09-10 (0.2.1): - - * Added kh_clear() - * Fixed a compiling error - - 2008-09-02 (0.2.0): - - * Changed to token concatenation which increases flexibility. - - 2008-08-31 (0.1.2): - - * Fixed a bug in kh_get(), which has not been tested previously. - - 2008-08-31 (0.1.1): - - * Added destructor -*/ - - -#ifndef __AC_KHASH_H -#define __AC_KHASH_H - -/*! - @header - - Generic hash table library. - */ - -#define AC_VERSION_KHASH_H "0.2.8" - -#include -#include -#include - -/* compiler specific configuration */ - -#if UINT_MAX == 0xffffffffu -typedef unsigned int khint32_t; -#elif ULONG_MAX == 0xffffffffu -typedef unsigned long khint32_t; -#endif - -#if ULONG_MAX == ULLONG_MAX -typedef unsigned long khint64_t; -#else -typedef unsigned long long khint64_t; -#endif - -#ifndef kh_inline -#ifdef _MSC_VER -#define kh_inline __inline -#else -#define kh_inline inline -#endif -#endif /* kh_inline */ - -typedef khint32_t khint_t; -typedef khint_t khiter_t; - -#define __ac_isempty(flag, i) ((flag[i>>4]>>((i&0xfU)<<1))&2) -#define __ac_isdel(flag, i) ((flag[i>>4]>>((i&0xfU)<<1))&1) -#define __ac_iseither(flag, i) ((flag[i>>4]>>((i&0xfU)<<1))&3) -#define __ac_set_isdel_false(flag, i) (flag[i>>4]&=~(1ul<<((i&0xfU)<<1))) -#define __ac_set_isempty_false(flag, i) (flag[i>>4]&=~(2ul<<((i&0xfU)<<1))) -#define __ac_set_isboth_false(flag, i) (flag[i>>4]&=~(3ul<<((i&0xfU)<<1))) -#define __ac_set_isdel_true(flag, i) (flag[i>>4]|=1ul<<((i&0xfU)<<1)) - -#define __ac_fsize(m) ((m) < 16? 1 : (m)>>4) - -#ifndef kroundup32 -#define kroundup32(x) (--(x), (x)|=(x)>>1, (x)|=(x)>>2, (x)|=(x)>>4, (x)|=(x)>>8, (x)|=(x)>>16, ++(x)) -#endif - -#ifndef kcalloc -#define kcalloc(N,Z) calloc(N,Z) -#endif -#ifndef kmalloc -#define kmalloc(Z) malloc(Z) -#endif -#ifndef krealloc -#define krealloc(P,Z) realloc(P,Z) -#endif -#ifndef kreallocarray -#define kreallocarray(P,N,Z) ((SIZE_MAX - N < Z) ? NULL : krealloc(P, (N*Z))) -#endif -#ifndef kfree -#define kfree(P) free(P) -#endif - -static const double __ac_HASH_UPPER = 0.77; - -#define __KHASH_TYPE(name, khkey_t, khval_t) \ - typedef struct kh_##name##_s { \ - khint_t n_buckets, size, n_occupied, upper_bound; \ - khint32_t *flags; \ - khkey_t *keys; \ - khval_t *vals; \ - } kh_##name##_t; - -#define __KHASH_PROTOTYPES(name, khkey_t, khval_t) \ - extern kh_##name##_t *kh_init_##name(void); \ - extern void kh_destroy_##name(kh_##name##_t *h); \ - extern void kh_clear_##name(kh_##name##_t *h); \ - extern khint_t kh_get_##name(const kh_##name##_t *h, khkey_t key); \ - extern int kh_resize_##name(kh_##name##_t *h, khint_t new_n_buckets); \ - extern khint_t kh_put_##name(kh_##name##_t *h, khkey_t key, int *ret); \ - extern void kh_del_##name(kh_##name##_t *h, khint_t x); - -#define __KHASH_IMPL(name, SCOPE, khkey_t, khval_t, kh_is_map, __hash_func, __hash_equal) \ - SCOPE kh_##name##_t *kh_init_##name(void) { \ - return (kh_##name##_t*)kcalloc(1, sizeof(kh_##name##_t)); \ - } \ - SCOPE void kh_destroy_##name(kh_##name##_t *h) \ - { \ - if (h) { \ - kfree((void *)h->keys); kfree(h->flags); \ - kfree((void *)h->vals); \ - kfree(h); \ - } \ - } \ - SCOPE void kh_clear_##name(kh_##name##_t *h) \ - { \ - if (h && h->flags) { \ - memset(h->flags, 0xaa, __ac_fsize(h->n_buckets) * sizeof(khint32_t)); \ - h->size = h->n_occupied = 0; \ - } \ - } \ - SCOPE khint_t kh_get_##name(const kh_##name##_t *h, khkey_t key) \ - { \ - if (h->n_buckets) { \ - khint_t k, i, last, mask, step = 0; \ - mask = h->n_buckets - 1; \ - k = __hash_func(key); i = k & mask; \ - last = i; \ - while (!__ac_isempty(h->flags, i) && (__ac_isdel(h->flags, i) || !__hash_equal(h->keys[i], key))) { \ - i = (i + (++step)) & mask; \ - if (i == last) return h->n_buckets; \ - } \ - return __ac_iseither(h->flags, i)? h->n_buckets : i; \ - } else return 0; \ - } \ - SCOPE int kh_resize_##name(kh_##name##_t *h, khint_t new_n_buckets) \ - { /* This function uses 0.25*n_buckets bytes of working space instead of [sizeof(key_t+val_t)+.25]*n_buckets. */ \ - khint32_t *new_flags = 0; \ - khint_t j = 1; \ - { \ - kroundup32(new_n_buckets); \ - if (new_n_buckets < 4) new_n_buckets = 4; \ - if (h->size >= (khint_t)(new_n_buckets * __ac_HASH_UPPER + 0.5)) j = 0; /* requested size is too small */ \ - else { /* hash table size to be changed (shrink or expand); rehash */ \ - new_flags = (khint32_t*)kreallocarray(NULL, __ac_fsize(new_n_buckets), sizeof(khint32_t)); \ - if (!new_flags) return -1; \ - memset(new_flags, 0xaa, __ac_fsize(new_n_buckets) * sizeof(khint32_t)); \ - if (h->n_buckets < new_n_buckets) { /* expand */ \ - khkey_t *new_keys = (khkey_t*)kreallocarray((void *)h->keys, new_n_buckets, sizeof(khkey_t)); \ - if (!new_keys) { kfree(new_flags); return -1; } \ - h->keys = new_keys; \ - if (kh_is_map) { \ - khval_t *new_vals = (khval_t*)kreallocarray((void *)h->vals, new_n_buckets, sizeof(khval_t)); \ - if (!new_vals) { kfree(new_flags); return -1; } \ - h->vals = new_vals; \ - } \ - } /* otherwise shrink */ \ - } \ - } \ - if (j) { /* rehashing is needed */ \ - for (j = 0; j != h->n_buckets; ++j) { \ - if (__ac_iseither(h->flags, j) == 0) { \ - khkey_t key = h->keys[j]; \ - khval_t val; \ - khint_t new_mask; \ - new_mask = new_n_buckets - 1; \ - if (kh_is_map) val = h->vals[j]; \ - __ac_set_isdel_true(h->flags, j); \ - while (1) { /* kick-out process; sort of like in Cuckoo hashing */ \ - khint_t k, i, step = 0; \ - k = __hash_func(key); \ - i = k & new_mask; \ - while (!__ac_isempty(new_flags, i)) i = (i + (++step)) & new_mask; \ - __ac_set_isempty_false(new_flags, i); \ - if (i < h->n_buckets && __ac_iseither(h->flags, i) == 0) { /* kick out the existing element */ \ - { khkey_t tmp = h->keys[i]; h->keys[i] = key; key = tmp; } \ - if (kh_is_map) { khval_t tmp = h->vals[i]; h->vals[i] = val; val = tmp; } \ - __ac_set_isdel_true(h->flags, i); /* mark it as deleted in the old hash table */ \ - } else { /* write the element and jump out of the loop */ \ - h->keys[i] = key; \ - if (kh_is_map) h->vals[i] = val; \ - break; \ - } \ - } \ - } \ - } \ - if (h->n_buckets > new_n_buckets) { /* shrink the hash table */ \ - h->keys = (khkey_t*)kreallocarray((void *)h->keys, new_n_buckets, sizeof(khkey_t)); \ - if (kh_is_map) h->vals = (khval_t*)kreallocarray((void *)h->vals, new_n_buckets, sizeof(khval_t)); \ - } \ - kfree(h->flags); /* free the working space */ \ - h->flags = new_flags; \ - h->n_buckets = new_n_buckets; \ - h->n_occupied = h->size; \ - h->upper_bound = (khint_t)(h->n_buckets * __ac_HASH_UPPER + 0.5); \ - } \ - return 0; \ - } \ - SCOPE khint_t kh_put_##name(kh_##name##_t *h, khkey_t key, int *ret) \ - { \ - khint_t x; \ - if (h->n_occupied >= h->upper_bound) { /* update the hash table */ \ - if (h->n_buckets > (h->size<<1)) { \ - if (kh_resize_##name(h, h->n_buckets - 1) < 0) { /* clear "deleted" elements */ \ - *ret = -1; return h->n_buckets; \ - } \ - } else if (kh_resize_##name(h, h->n_buckets + 1) < 0) { /* expand the hash table */ \ - *ret = -1; return h->n_buckets; \ - } \ - } /* TODO: to implement automatically shrinking; resize() already support shrinking */ \ - { \ - khint_t k, i, site, last, mask = h->n_buckets - 1, step = 0; \ - x = site = h->n_buckets; k = __hash_func(key); i = k & mask; \ - if (__ac_isempty(h->flags, i)) x = i; /* for speed up */ \ - else { \ - last = i; \ - while (!__ac_isempty(h->flags, i) && (__ac_isdel(h->flags, i) || !__hash_equal(h->keys[i], key))) { \ - if (__ac_isdel(h->flags, i)) site = i; \ - i = (i + (++step)) & mask; \ - if (i == last) { x = site; break; } \ - } \ - if (x == h->n_buckets) { \ - if (__ac_isempty(h->flags, i) && site != h->n_buckets) x = site; \ - else x = i; \ - } \ - } \ - } \ - if (__ac_isempty(h->flags, x)) { /* not present at all */ \ - h->keys[x] = key; \ - __ac_set_isboth_false(h->flags, x); \ - ++h->size; ++h->n_occupied; \ - *ret = 1; \ - } else if (__ac_isdel(h->flags, x)) { /* deleted */ \ - h->keys[x] = key; \ - __ac_set_isboth_false(h->flags, x); \ - ++h->size; \ - *ret = 2; \ - } else *ret = 0; /* Don't touch h->keys[x] if present and not deleted */ \ - return x; \ - } \ - SCOPE void kh_del_##name(kh_##name##_t *h, khint_t x) \ - { \ - if (x != h->n_buckets && !__ac_iseither(h->flags, x)) { \ - __ac_set_isdel_true(h->flags, x); \ - --h->size; \ - } \ - } - -#define KHASH_DECLARE(name, khkey_t, khval_t) \ - __KHASH_TYPE(name, khkey_t, khval_t) \ - __KHASH_PROTOTYPES(name, khkey_t, khval_t) - -#define KHASH_INIT2(name, SCOPE, khkey_t, khval_t, kh_is_map, __hash_func, __hash_equal) \ - __KHASH_TYPE(name, khkey_t, khval_t) \ - __KHASH_IMPL(name, SCOPE, khkey_t, khval_t, kh_is_map, __hash_func, __hash_equal) - -#define KHASH_INIT(name, khkey_t, khval_t, kh_is_map, __hash_func, __hash_equal) \ - KHASH_INIT2(name, static kh_inline, khkey_t, khval_t, kh_is_map, __hash_func, __hash_equal) - -/* --- BEGIN OF HASH FUNCTIONS --- */ - -/*! @function - @abstract Integer hash function - @param key The integer [khint32_t] - @return The hash value [khint_t] - */ -#define kh_int_hash_func(key) (khint32_t)(key) -/*! @function - @abstract Integer comparison function - */ -#define kh_int_hash_equal(a, b) ((a) == (b)) -/*! @function - @abstract 64-bit integer hash function - @param key The integer [khint64_t] - @return The hash value [khint_t] - */ -#define kh_int64_hash_func(key) (khint32_t)((key)>>33^(key)^(key)<<11) -/*! @function - @abstract 64-bit integer comparison function - */ -#define kh_int64_hash_equal(a, b) ((a) == (b)) -/*! @function - @abstract const char* hash function - @param s Pointer to a null terminated string - @return The hash value - */ -static kh_inline khint_t __ac_X31_hash_string(const char *s) -{ - khint_t h = (khint_t)*s; - if (h) for (++s ; *s; ++s) h = (h << 5) - h + (khint_t)*s; - return h; -} -/*! @function - @abstract Another interface to const char* hash function - @param key Pointer to a null terminated string [const char*] - @return The hash value [khint_t] - */ -#define kh_str_hash_func(key) __ac_X31_hash_string(key) -/*! @function - @abstract Const char* comparison function - */ -#define kh_str_hash_equal(a, b) (strcmp(a, b) == 0) - -static kh_inline khint_t __ac_Wang_hash(khint_t key) -{ - key += ~(key << 15); - key ^= (key >> 10); - key += (key << 3); - key ^= (key >> 6); - key += ~(key << 11); - key ^= (key >> 16); - return key; -} -#define kh_int_hash_func2(k) __ac_Wang_hash((khint_t)key) - -/* --- END OF HASH FUNCTIONS --- */ - -/* Other convenient macros... */ - -/*! - @abstract Type of the hash table. - @param name Name of the hash table [symbol] - */ -#define khash_t(name) kh_##name##_t - -/*! @function - @abstract Initiate a hash table. - @param name Name of the hash table [symbol] - @return Pointer to the hash table [khash_t(name)*] - */ -#define kh_init(name) kh_init_##name() - -/*! @function - @abstract Destroy a hash table. - @param name Name of the hash table [symbol] - @param h Pointer to the hash table [khash_t(name)*] - */ -#define kh_destroy(name, h) kh_destroy_##name(h) - -/*! @function - @abstract Reset a hash table without deallocating memory. - @param name Name of the hash table [symbol] - @param h Pointer to the hash table [khash_t(name)*] - */ -#define kh_clear(name, h) kh_clear_##name(h) - -/*! @function - @abstract Resize a hash table. - @param name Name of the hash table [symbol] - @param h Pointer to the hash table [khash_t(name)*] - @param s New size [khint_t] - */ -#define kh_resize(name, h, s) kh_resize_##name(h, s) - -/*! @function - @abstract Insert a key to the hash table. - @param name Name of the hash table [symbol] - @param h Pointer to the hash table [khash_t(name)*] - @param k Key [type of keys] - @param r Extra return code: -1 if the operation failed; - 0 if the key is present in the hash table; - 1 if the bucket is empty (never used); 2 if the element in - the bucket has been deleted [int*] - @return Iterator to the inserted element [khint_t] - */ -#define kh_put(name, h, k, r) kh_put_##name(h, k, r) - -/*! @function - @abstract Retrieve a key from the hash table. - @param name Name of the hash table [symbol] - @param h Pointer to the hash table [khash_t(name)*] - @param k Key [type of keys] - @return Iterator to the found element, or kh_end(h) if the element is absent [khint_t] - */ -#define kh_get(name, h, k) kh_get_##name(h, k) - -/*! @function - @abstract Remove a key from the hash table. - @param name Name of the hash table [symbol] - @param h Pointer to the hash table [khash_t(name)*] - @param k Iterator to the element to be deleted [khint_t] - */ -#define kh_del(name, h, k) kh_del_##name(h, k) - -/*! @function - @abstract Test whether a bucket contains data. - @param h Pointer to the hash table [khash_t(name)*] - @param x Iterator to the bucket [khint_t] - @return 1 if containing data; 0 otherwise [int] - */ -#define kh_exist(h, x) (!__ac_iseither((h)->flags, (x))) - -/*! @function - @abstract Get key given an iterator - @param h Pointer to the hash table [khash_t(name)*] - @param x Iterator to the bucket [khint_t] - @return Key [type of keys] - */ -#define kh_key(h, x) ((h)->keys[x]) - -/*! @function - @abstract Get value given an iterator - @param h Pointer to the hash table [khash_t(name)*] - @param x Iterator to the bucket [khint_t] - @return Value [type of values] - @discussion For hash sets, calling this results in segfault. - */ -#define kh_val(h, x) ((h)->vals[x]) - -/*! @function - @abstract Alias of kh_val() - */ -#define kh_value(h, x) ((h)->vals[x]) - -/*! @function - @abstract Get the start iterator - @param h Pointer to the hash table [khash_t(name)*] - @return The start iterator [khint_t] - */ -#define kh_begin(h) (khint_t)(0) - -/*! @function - @abstract Get the end iterator - @param h Pointer to the hash table [khash_t(name)*] - @return The end iterator [khint_t] - */ -#define kh_end(h) ((h)->n_buckets) - -/*! @function - @abstract Get the number of elements in the hash table - @param h Pointer to the hash table [khash_t(name)*] - @return Number of elements in the hash table [khint_t] - */ -#define kh_size(h) ((h)->size) - -/*! @function - @abstract Get the number of buckets in the hash table - @param h Pointer to the hash table [khash_t(name)*] - @return Number of buckets in the hash table [khint_t] - */ -#define kh_n_buckets(h) ((h)->n_buckets) - -/*! @function - @abstract Iterate over the entries in the hash table - @param h Pointer to the hash table [khash_t(name)*] - @param kvar Variable to which key will be assigned - @param vvar Variable to which value will be assigned - @param code Block of code to execute - */ -#define kh_foreach(h, kvar, vvar, code) { khint_t __i; \ - for (__i = kh_begin(h); __i != kh_end(h); ++__i) { \ - if (!kh_exist(h,__i)) continue; \ - (kvar) = kh_key(h,__i); \ - (vvar) = kh_val(h,__i); \ - code; \ - } } - -/*! @function - @abstract Iterate over the values in the hash table - @param h Pointer to the hash table [khash_t(name)*] - @param vvar Variable to which value will be assigned - @param code Block of code to execute - */ -#define kh_foreach_value(h, vvar, code) { khint_t __i; \ - for (__i = kh_begin(h); __i != kh_end(h); ++__i) { \ - if (!kh_exist(h,__i)) continue; \ - (vvar) = kh_val(h,__i); \ - code; \ - } } - -/* More conenient interfaces */ - -/*! @function - @abstract Instantiate a hash set containing integer keys - @param name Name of the hash table [symbol] - */ -#define KHASH_SET_INIT_INT(name) \ - KHASH_INIT(name, khint32_t, char, 0, kh_int_hash_func, kh_int_hash_equal) - -/*! @function - @abstract Instantiate a hash map containing integer keys - @param name Name of the hash table [symbol] - @param khval_t Type of values [type] - */ -#define KHASH_MAP_INIT_INT(name, khval_t) \ - KHASH_INIT(name, khint32_t, khval_t, 1, kh_int_hash_func, kh_int_hash_equal) - -/*! @function - @abstract Instantiate a hash map containing 64-bit integer keys - @param name Name of the hash table [symbol] - */ -#define KHASH_SET_INIT_INT64(name) \ - KHASH_INIT(name, khint64_t, char, 0, kh_int64_hash_func, kh_int64_hash_equal) - -/*! @function - @abstract Instantiate a hash map containing 64-bit integer keys - @param name Name of the hash table [symbol] - @param khval_t Type of values [type] - */ -#define KHASH_MAP_INIT_INT64(name, khval_t) \ - KHASH_INIT(name, khint64_t, khval_t, 1, kh_int64_hash_func, kh_int64_hash_equal) - -typedef const char *kh_cstr_t; -/*! @function - @abstract Instantiate a hash map containing const char* keys - @param name Name of the hash table [symbol] - */ -#define KHASH_SET_INIT_STR(name) \ - KHASH_INIT(name, kh_cstr_t, char, 0, kh_str_hash_func, kh_str_hash_equal) - -/*! @function - @abstract Instantiate a hash map containing const char* keys - @param name Name of the hash table [symbol] - @param khval_t Type of values [type] - */ -#define KHASH_MAP_INIT_STR(name, khval_t) \ - KHASH_INIT(name, kh_cstr_t, khval_t, 1, kh_str_hash_func, kh_str_hash_equal) - -#endif /* __AC_KHASH_H */ diff --git a/vendor/libgit2/src/map.h b/vendor/libgit2/src/map.h deleted file mode 100644 index da3d1e19a..000000000 --- a/vendor/libgit2/src/map.h +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_map_h__ -#define INCLUDE_map_h__ - -#include "common.h" - - -/* p_mmap() prot values */ -#define GIT_PROT_NONE 0x0 -#define GIT_PROT_READ 0x1 -#define GIT_PROT_WRITE 0x2 -#define GIT_PROT_EXEC 0x4 - -/* git__mmmap() flags values */ -#define GIT_MAP_FILE 0 -#define GIT_MAP_SHARED 1 -#define GIT_MAP_PRIVATE 2 -#define GIT_MAP_TYPE 0xf -#define GIT_MAP_FIXED 0x10 - -#ifdef __amigaos4__ -#define MAP_FAILED 0 -#endif - -typedef struct { /* memory mapped buffer */ - void *data; /* data bytes */ - size_t len; /* data length */ -#ifdef GIT_WIN32 - HANDLE fmh; /* file mapping handle */ -#endif -} git_map; - -#define GIT_MMAP_VALIDATE(out, len, prot, flags) do { \ - assert(out != NULL && len > 0); \ - assert((prot & GIT_PROT_WRITE) || (prot & GIT_PROT_READ)); \ - assert((flags & GIT_MAP_FIXED) == 0); } while (0) - -extern int p_mmap(git_map *out, size_t len, int prot, int flags, int fd, git_off_t offset); -extern int p_munmap(git_map *map); - -#endif /* INCLUDE_map_h__ */ diff --git a/vendor/libgit2/src/merge.c b/vendor/libgit2/src/merge.c deleted file mode 100644 index d2f92ccce..000000000 --- a/vendor/libgit2/src/merge.c +++ /dev/null @@ -1,3074 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "common.h" -#include "posix.h" -#include "buffer.h" -#include "repository.h" -#include "revwalk.h" -#include "commit_list.h" -#include "merge.h" -#include "path.h" -#include "refs.h" -#include "object.h" -#include "iterator.h" -#include "refs.h" -#include "diff.h" -#include "checkout.h" -#include "tree.h" -#include "blob.h" -#include "oid.h" -#include "index.h" -#include "filebuf.h" -#include "config.h" -#include "oidarray.h" -#include "annotated_commit.h" -#include "commit.h" -#include "oidarray.h" - -#include "git2/types.h" -#include "git2/repository.h" -#include "git2/object.h" -#include "git2/commit.h" -#include "git2/merge.h" -#include "git2/refs.h" -#include "git2/reset.h" -#include "git2/checkout.h" -#include "git2/signature.h" -#include "git2/config.h" -#include "git2/tree.h" -#include "git2/oidarray.h" -#include "git2/annotated_commit.h" -#include "git2/sys/index.h" -#include "git2/sys/hashsig.h" - -#define GIT_MERGE_INDEX_ENTRY_EXISTS(X) ((X).mode != 0) -#define GIT_MERGE_INDEX_ENTRY_ISFILE(X) S_ISREG((X).mode) - - -/** Internal merge flags. */ -enum { - /** The merge is for a virtual base in a recursive merge. */ - GIT_MERGE__VIRTUAL_BASE = (1 << 31), -}; - -enum { - /** Accept the conflict file, staging it as the merge result. */ - GIT_MERGE_FILE_FAVOR__CONFLICTED = 4, -}; - - -typedef enum { - TREE_IDX_ANCESTOR = 0, - TREE_IDX_OURS = 1, - TREE_IDX_THEIRS = 2 -} merge_tree_index_t; - -/* Tracks D/F conflicts */ -struct merge_diff_df_data { - const char *df_path; - const char *prev_path; - git_merge_diff *prev_conflict; -}; - -/* Merge base computation */ - -int merge_bases_many(git_commit_list **out, git_revwalk **walk_out, git_repository *repo, size_t length, const git_oid input_array[]) -{ - git_revwalk *walk = NULL; - git_vector list; - git_commit_list *result = NULL; - git_commit_list_node *commit; - int error = -1; - unsigned int i; - - if (length < 2) { - giterr_set(GITERR_INVALID, "At least two commits are required to find an ancestor. Provided 'length' was %" PRIuZ ".", length); - return -1; - } - - if (git_vector_init(&list, length - 1, NULL) < 0) - return -1; - - if (git_revwalk_new(&walk, repo) < 0) - goto on_error; - - for (i = 1; i < length; i++) { - commit = git_revwalk__commit_lookup(walk, &input_array[i]); - if (commit == NULL) - goto on_error; - - git_vector_insert(&list, commit); - } - - commit = git_revwalk__commit_lookup(walk, &input_array[0]); - if (commit == NULL) - goto on_error; - - if (git_merge__bases_many(&result, walk, commit, &list) < 0) - goto on_error; - - if (!result) { - giterr_set(GITERR_MERGE, "No merge base found"); - error = GIT_ENOTFOUND; - goto on_error; - } - - *out = result; - *walk_out = walk; - - git_vector_free(&list); - return 0; - -on_error: - git_vector_free(&list); - git_revwalk_free(walk); - return error; -} - -int git_merge_base_many(git_oid *out, git_repository *repo, size_t length, const git_oid input_array[]) -{ - git_revwalk *walk; - git_commit_list *result = NULL; - int error = 0; - - assert(out && repo && input_array); - - if ((error = merge_bases_many(&result, &walk, repo, length, input_array)) < 0) - return error; - - git_oid_cpy(out, &result->item->oid); - - git_commit_list_free(&result); - git_revwalk_free(walk); - - return 0; -} - -int git_merge_bases_many(git_oidarray *out, git_repository *repo, size_t length, const git_oid input_array[]) -{ - git_revwalk *walk; - git_commit_list *list, *result = NULL; - int error = 0; - git_array_oid_t array; - - assert(out && repo && input_array); - - if ((error = merge_bases_many(&result, &walk, repo, length, input_array)) < 0) - return error; - - git_array_init(array); - - list = result; - while (list) { - git_oid *id = git_array_alloc(array); - if (id == NULL) { - error = -1; - goto cleanup; - } - - git_oid_cpy(id, &list->item->oid); - list = list->next; - } - - git_oidarray__from_array(out, &array); - -cleanup: - git_commit_list_free(&result); - git_revwalk_free(walk); - - return error; -} - -int git_merge_base_octopus(git_oid *out, git_repository *repo, size_t length, const git_oid input_array[]) -{ - git_oid result; - unsigned int i; - int error = -1; - - assert(out && repo && input_array); - - if (length < 2) { - giterr_set(GITERR_INVALID, "At least two commits are required to find an ancestor. Provided 'length' was %" PRIuZ ".", length); - return -1; - } - - result = input_array[0]; - for (i = 1; i < length; i++) { - error = git_merge_base(&result, repo, &result, &input_array[i]); - if (error < 0) - return error; - } - - *out = result; - - return 0; -} - -static int merge_bases(git_commit_list **out, git_revwalk **walk_out, git_repository *repo, const git_oid *one, const git_oid *two) -{ - git_revwalk *walk; - git_vector list; - git_commit_list *result = NULL; - git_commit_list_node *commit; - void *contents[1]; - - if (git_revwalk_new(&walk, repo) < 0) - return -1; - - commit = git_revwalk__commit_lookup(walk, two); - if (commit == NULL) - goto on_error; - - /* This is just one value, so we can do it on the stack */ - memset(&list, 0x0, sizeof(git_vector)); - contents[0] = commit; - list.length = 1; - list.contents = contents; - - commit = git_revwalk__commit_lookup(walk, one); - if (commit == NULL) - goto on_error; - - if (git_merge__bases_many(&result, walk, commit, &list) < 0) - goto on_error; - - if (!result) { - git_revwalk_free(walk); - giterr_set(GITERR_MERGE, "No merge base found"); - return GIT_ENOTFOUND; - } - - *out = result; - *walk_out = walk; - - return 0; - -on_error: - git_revwalk_free(walk); - return -1; - -} - -int git_merge_base(git_oid *out, git_repository *repo, const git_oid *one, const git_oid *two) -{ - int error; - git_revwalk *walk; - git_commit_list *result; - - if ((error = merge_bases(&result, &walk, repo, one, two)) < 0) - return error; - - git_oid_cpy(out, &result->item->oid); - git_commit_list_free(&result); - git_revwalk_free(walk); - - return 0; -} - -int git_merge_bases(git_oidarray *out, git_repository *repo, const git_oid *one, const git_oid *two) -{ - int error; - git_revwalk *walk; - git_commit_list *result, *list; - git_array_oid_t array; - - git_array_init(array); - - if ((error = merge_bases(&result, &walk, repo, one, two)) < 0) - return error; - - list = result; - while (list) { - git_oid *id = git_array_alloc(array); - if (id == NULL) - goto on_error; - - git_oid_cpy(id, &list->item->oid); - list = list->next; - } - - git_oidarray__from_array(out, &array); - git_commit_list_free(&result); - git_revwalk_free(walk); - - return 0; - -on_error: - git_commit_list_free(&result); - git_revwalk_free(walk); - return -1; -} - -static int interesting(git_pqueue *list) -{ - size_t i; - - for (i = 0; i < git_pqueue_size(list); i++) { - git_commit_list_node *commit = git_pqueue_get(list, i); - if ((commit->flags & STALE) == 0) - return 1; - } - - return 0; -} - -static void clear_commit_marks_1(git_commit_list **plist, - git_commit_list_node *commit, unsigned int mark) -{ - while (commit) { - unsigned int i; - - if (!(mark & commit->flags)) - return; - - commit->flags &= ~mark; - - for (i = 1; i < commit->out_degree; i++) { - git_commit_list_node *p = commit->parents[i]; - git_commit_list_insert(p, plist); - } - - commit = commit->out_degree ? commit->parents[0] : NULL; - } -} - -static void clear_commit_marks_many(git_vector *commits, unsigned int mark) -{ - git_commit_list *list = NULL; - git_commit_list_node *c; - unsigned int i; - - git_vector_foreach(commits, i, c) { - git_commit_list_insert(c, &list); - } - - while (list) - clear_commit_marks_1(&list, git_commit_list_pop(&list), mark); -} - -static void clear_commit_marks(git_commit_list_node *commit, unsigned int mark) -{ - git_commit_list *list = NULL; - git_commit_list_insert(commit, &list); - while (list) - clear_commit_marks_1(&list, git_commit_list_pop(&list), mark); -} - -static int paint_down_to_common( - git_commit_list **out, git_revwalk *walk, git_commit_list_node *one, git_vector *twos) -{ - git_pqueue list; - git_commit_list *result = NULL; - git_commit_list_node *two; - - int error; - unsigned int i; - - if (git_pqueue_init(&list, 0, twos->length * 2, git_commit_list_time_cmp) < 0) - return -1; - - one->flags |= PARENT1; - if (git_pqueue_insert(&list, one) < 0) - return -1; - - git_vector_foreach(twos, i, two) { - if (git_commit_list_parse(walk, two) < 0) - return -1; - - two->flags |= PARENT2; - - if (git_pqueue_insert(&list, two) < 0) - return -1; - } - - /* as long as there are non-STALE commits */ - while (interesting(&list)) { - git_commit_list_node *commit = git_pqueue_pop(&list); - int flags; - - if (commit == NULL) - break; - - flags = commit->flags & (PARENT1 | PARENT2 | STALE); - if (flags == (PARENT1 | PARENT2)) { - if (!(commit->flags & RESULT)) { - commit->flags |= RESULT; - if (git_commit_list_insert(commit, &result) == NULL) - return -1; - } - /* we mark the parents of a merge stale */ - flags |= STALE; - } - - for (i = 0; i < commit->out_degree; i++) { - git_commit_list_node *p = commit->parents[i]; - if ((p->flags & flags) == flags) - continue; - - if ((error = git_commit_list_parse(walk, p)) < 0) - return error; - - p->flags |= flags; - if (git_pqueue_insert(&list, p) < 0) - return -1; - } - } - - git_pqueue_free(&list); - *out = result; - return 0; -} - -static int remove_redundant(git_revwalk *walk, git_vector *commits) -{ - git_vector work = GIT_VECTOR_INIT; - unsigned char *redundant; - unsigned int *filled_index; - unsigned int i, j; - int error = 0; - - redundant = git__calloc(commits->length, 1); - GITERR_CHECK_ALLOC(redundant); - filled_index = git__calloc((commits->length - 1), sizeof(unsigned int)); - GITERR_CHECK_ALLOC(filled_index); - - for (i = 0; i < commits->length; ++i) { - if ((error = git_commit_list_parse(walk, commits->contents[i])) < 0) - goto done; - } - - for (i = 0; i < commits->length; ++i) { - git_commit_list *common = NULL; - git_commit_list_node *commit = commits->contents[i]; - - if (redundant[i]) - continue; - - git_vector_clear(&work); - - for (j = 0; j < commits->length; j++) { - if (i == j || redundant[j]) - continue; - - filled_index[work.length] = j; - if ((error = git_vector_insert(&work, commits->contents[j])) < 0) - goto done; - } - - error = paint_down_to_common(&common, walk, commit, &work); - if (error < 0) - goto done; - - if (commit->flags & PARENT2) - redundant[i] = 1; - - for (j = 0; j < work.length; j++) { - git_commit_list_node *w = work.contents[j]; - if (w->flags & PARENT1) - redundant[filled_index[j]] = 1; - } - - clear_commit_marks(commit, ALL_FLAGS); - clear_commit_marks_many(&work, ALL_FLAGS); - - git_commit_list_free(&common); - } - - for (i = 0; i < commits->length; ++i) { - if (redundant[i]) - commits->contents[i] = NULL; - } - -done: - git__free(redundant); - git__free(filled_index); - git_vector_free(&work); - return error; -} - -int git_merge__bases_many(git_commit_list **out, git_revwalk *walk, git_commit_list_node *one, git_vector *twos) -{ - int error; - unsigned int i; - git_commit_list_node *two; - git_commit_list *result = NULL, *tmp = NULL; - - /* If there's only the one commit, there can be no merge bases */ - if (twos->length == 0) { - *out = NULL; - return 0; - } - - /* if the commit is repeated, we have a our merge base already */ - git_vector_foreach(twos, i, two) { - if (one == two) - return git_commit_list_insert(one, out) ? 0 : -1; - } - - if (git_commit_list_parse(walk, one) < 0) - return -1; - - error = paint_down_to_common(&result, walk, one, twos); - if (error < 0) - return error; - - /* filter out any stale commits in the results */ - tmp = result; - result = NULL; - - while (tmp) { - git_commit_list_node *c = git_commit_list_pop(&tmp); - if (!(c->flags & STALE)) - if (git_commit_list_insert_by_date(c, &result) == NULL) - return -1; - } - - /* - * more than one merge base -- see if there are redundant merge - * bases and remove them - */ - if (result && result->next) { - git_vector redundant = GIT_VECTOR_INIT; - - while (result) - git_vector_insert(&redundant, git_commit_list_pop(&result)); - - clear_commit_marks(one, ALL_FLAGS); - clear_commit_marks_many(twos, ALL_FLAGS); - - if ((error = remove_redundant(walk, &redundant)) < 0) { - git_vector_free(&redundant); - return error; - } - - git_vector_foreach(&redundant, i, two) { - if (two != NULL) - git_commit_list_insert_by_date(two, &result); - } - - git_vector_free(&redundant); - } - - *out = result; - return 0; -} - -int git_repository_mergehead_foreach( - git_repository *repo, - git_repository_mergehead_foreach_cb cb, - void *payload) -{ - git_buf merge_head_path = GIT_BUF_INIT, merge_head_file = GIT_BUF_INIT; - char *buffer, *line; - size_t line_num = 1; - git_oid oid; - int error = 0; - - assert(repo && cb); - - if ((error = git_buf_joinpath(&merge_head_path, repo->path_repository, - GIT_MERGE_HEAD_FILE)) < 0) - return error; - - if ((error = git_futils_readbuffer(&merge_head_file, - git_buf_cstr(&merge_head_path))) < 0) - goto cleanup; - - buffer = merge_head_file.ptr; - - while ((line = git__strsep(&buffer, "\n")) != NULL) { - if (strlen(line) != GIT_OID_HEXSZ) { - giterr_set(GITERR_INVALID, "Unable to parse OID - invalid length"); - error = -1; - goto cleanup; - } - - if ((error = git_oid_fromstr(&oid, line)) < 0) - goto cleanup; - - if ((error = cb(&oid, payload)) != 0) { - giterr_set_after_callback(error); - goto cleanup; - } - - ++line_num; - } - - if (*buffer) { - giterr_set(GITERR_MERGE, "No EOL at line %d", line_num); - error = -1; - goto cleanup; - } - -cleanup: - git_buf_free(&merge_head_path); - git_buf_free(&merge_head_file); - - return error; -} - -GIT_INLINE(int) index_entry_cmp(const git_index_entry *a, const git_index_entry *b) -{ - int value = 0; - - if (a->path == NULL) - return (b->path == NULL) ? 0 : 1; - - if ((value = a->mode - b->mode) == 0 && - (value = git_oid__cmp(&a->id, &b->id)) == 0) - value = strcmp(a->path, b->path); - - return value; -} - -/* Conflict resolution */ - -static int merge_conflict_resolve_trivial( - int *resolved, - git_merge_diff_list *diff_list, - const git_merge_diff *conflict) -{ - int ours_empty, theirs_empty; - int ours_changed, theirs_changed, ours_theirs_differ; - git_index_entry const *result = NULL; - int error = 0; - - assert(resolved && diff_list && conflict); - - *resolved = 0; - - if (conflict->type == GIT_MERGE_DIFF_DIRECTORY_FILE || - conflict->type == GIT_MERGE_DIFF_RENAMED_ADDED) - return 0; - - if (conflict->our_status == GIT_DELTA_RENAMED || - conflict->their_status == GIT_DELTA_RENAMED) - return 0; - - ours_empty = !GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->our_entry); - theirs_empty = !GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->their_entry); - - ours_changed = (conflict->our_status != GIT_DELTA_UNMODIFIED); - theirs_changed = (conflict->their_status != GIT_DELTA_UNMODIFIED); - ours_theirs_differ = ours_changed && theirs_changed && - index_entry_cmp(&conflict->our_entry, &conflict->their_entry); - - /* - * Note: with only one ancestor, some cases are not distinct: - * - * 16: ancest:anc1/anc2, head:anc1, remote:anc2 = result:no merge - * 3: ancest:(empty)^, head:head, remote:(empty) = result:no merge - * 2: ancest:(empty)^, head:(empty), remote:remote = result:no merge - * - * Note that the two cases that take D/F conflicts into account - * specifically do not need to be explicitly tested, as D/F conflicts - * would fail the *empty* test: - * - * 3ALT: ancest:(empty)+, head:head, remote:*empty* = result:head - * 2ALT: ancest:(empty)+, head:*empty*, remote:remote = result:remote - * - * Note that many of these cases need not be explicitly tested, as - * they simply degrade to "all different" cases (eg, 11): - * - * 4: ancest:(empty)^, head:head, remote:remote = result:no merge - * 7: ancest:ancest+, head:(empty), remote:remote = result:no merge - * 9: ancest:ancest+, head:head, remote:(empty) = result:no merge - * 11: ancest:ancest+, head:head, remote:remote = result:no merge - */ - - /* 5ALT: ancest:*, head:head, remote:head = result:head */ - if (ours_changed && !ours_empty && !ours_theirs_differ) - result = &conflict->our_entry; - /* 6: ancest:ancest+, head:(empty), remote:(empty) = result:no merge */ - else if (ours_changed && ours_empty && theirs_empty) - *resolved = 0; - /* 8: ancest:ancest^, head:(empty), remote:ancest = result:no merge */ - else if (ours_empty && !theirs_changed) - *resolved = 0; - /* 10: ancest:ancest^, head:ancest, remote:(empty) = result:no merge */ - else if (!ours_changed && theirs_empty) - *resolved = 0; - /* 13: ancest:ancest+, head:head, remote:ancest = result:head */ - else if (ours_changed && !theirs_changed) - result = &conflict->our_entry; - /* 14: ancest:ancest+, head:ancest, remote:remote = result:remote */ - else if (!ours_changed && theirs_changed) - result = &conflict->their_entry; - else - *resolved = 0; - - if (result != NULL && - GIT_MERGE_INDEX_ENTRY_EXISTS(*result) && - (error = git_vector_insert(&diff_list->staged, (void *)result)) >= 0) - *resolved = 1; - - /* Note: trivial resolution does not update the REUC. */ - - return error; -} - -static int merge_conflict_resolve_one_removed( - int *resolved, - git_merge_diff_list *diff_list, - const git_merge_diff *conflict) -{ - int ours_empty, theirs_empty; - int ours_changed, theirs_changed; - int error = 0; - - assert(resolved && diff_list && conflict); - - *resolved = 0; - - if (conflict->type == GIT_MERGE_DIFF_DIRECTORY_FILE || - conflict->type == GIT_MERGE_DIFF_RENAMED_ADDED) - return 0; - - ours_empty = !GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->our_entry); - theirs_empty = !GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->their_entry); - - ours_changed = (conflict->our_status != GIT_DELTA_UNMODIFIED); - theirs_changed = (conflict->their_status != GIT_DELTA_UNMODIFIED); - - /* Removed in both */ - if (ours_changed && ours_empty && theirs_empty) - *resolved = 1; - /* Removed in ours */ - else if (ours_empty && !theirs_changed) - *resolved = 1; - /* Removed in theirs */ - else if (!ours_changed && theirs_empty) - *resolved = 1; - - if (*resolved) - git_vector_insert(&diff_list->resolved, (git_merge_diff *)conflict); - - return error; -} - -static int merge_conflict_resolve_one_renamed( - int *resolved, - git_merge_diff_list *diff_list, - const git_merge_diff *conflict) -{ - int ours_renamed, theirs_renamed; - int ours_changed, theirs_changed; - git_index_entry *merged; - int error = 0; - - assert(resolved && diff_list && conflict); - - *resolved = 0; - - if (!GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->our_entry) || - !GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->their_entry)) - return 0; - - ours_renamed = (conflict->our_status == GIT_DELTA_RENAMED); - theirs_renamed = (conflict->their_status == GIT_DELTA_RENAMED); - - if (!ours_renamed && !theirs_renamed) - return 0; - - /* Reject one file in a 2->1 conflict */ - if (conflict->type == GIT_MERGE_DIFF_BOTH_RENAMED_2_TO_1 || - conflict->type == GIT_MERGE_DIFF_BOTH_RENAMED_1_TO_2 || - conflict->type == GIT_MERGE_DIFF_RENAMED_ADDED) - return 0; - - ours_changed = (git_oid__cmp(&conflict->ancestor_entry.id, &conflict->our_entry.id) != 0); - theirs_changed = (git_oid__cmp(&conflict->ancestor_entry.id, &conflict->their_entry.id) != 0); - - /* if both are modified (and not to a common target) require a merge */ - if (ours_changed && theirs_changed && - git_oid__cmp(&conflict->our_entry.id, &conflict->their_entry.id) != 0) - return 0; - - if ((merged = git_pool_malloc(&diff_list->pool, sizeof(git_index_entry))) == NULL) - return -1; - - if (ours_changed) - memcpy(merged, &conflict->our_entry, sizeof(git_index_entry)); - else - memcpy(merged, &conflict->their_entry, sizeof(git_index_entry)); - - if (ours_renamed) - merged->path = conflict->our_entry.path; - else - merged->path = conflict->their_entry.path; - - *resolved = 1; - - git_vector_insert(&diff_list->staged, merged); - git_vector_insert(&diff_list->resolved, (git_merge_diff *)conflict); - - return error; -} - -static int merge_conflict_resolve_automerge( - int *resolved, - git_merge_diff_list *diff_list, - const git_merge_diff *conflict, - const git_merge_file_options *file_opts) -{ - const git_index_entry *ancestor = NULL, *ours = NULL, *theirs = NULL; - git_merge_file_result result = {0}; - git_index_entry *index_entry; - git_odb *odb = NULL; - git_oid automerge_oid; - int error = 0; - - assert(resolved && diff_list && conflict); - - *resolved = 0; - - if (!GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->our_entry) || - !GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->their_entry)) - return 0; - - /* Reject D/F conflicts */ - if (conflict->type == GIT_MERGE_DIFF_DIRECTORY_FILE) - return 0; - - /* Reject submodules. */ - if (S_ISGITLINK(conflict->ancestor_entry.mode) || - S_ISGITLINK(conflict->our_entry.mode) || - S_ISGITLINK(conflict->their_entry.mode)) - return 0; - - /* Reject link/file conflicts. */ - if ((S_ISLNK(conflict->ancestor_entry.mode) ^ S_ISLNK(conflict->our_entry.mode)) || - (S_ISLNK(conflict->ancestor_entry.mode) ^ S_ISLNK(conflict->their_entry.mode))) - return 0; - - /* Reject name conflicts */ - if (conflict->type == GIT_MERGE_DIFF_BOTH_RENAMED_2_TO_1 || - conflict->type == GIT_MERGE_DIFF_RENAMED_ADDED) - return 0; - - if ((conflict->our_status & GIT_DELTA_RENAMED) == GIT_DELTA_RENAMED && - (conflict->their_status & GIT_DELTA_RENAMED) == GIT_DELTA_RENAMED && - strcmp(conflict->ancestor_entry.path, conflict->their_entry.path) != 0) - return 0; - - ancestor = GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->ancestor_entry) ? - &conflict->ancestor_entry : NULL; - ours = GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->our_entry) ? - &conflict->our_entry : NULL; - theirs = GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->their_entry) ? - &conflict->their_entry : NULL; - - if ((error = git_repository_odb(&odb, diff_list->repo)) < 0 || - (error = git_merge_file_from_index(&result, diff_list->repo, ancestor, ours, theirs, file_opts)) < 0 || - (!result.automergeable && !(file_opts->flags & GIT_MERGE_FILE_FAVOR__CONFLICTED)) || - (error = git_odb_write(&automerge_oid, odb, result.ptr, result.len, GIT_OBJ_BLOB)) < 0) - goto done; - - if ((index_entry = git_pool_mallocz(&diff_list->pool, sizeof(git_index_entry))) == NULL) - GITERR_CHECK_ALLOC(index_entry); - - index_entry->path = git_pool_strdup(&diff_list->pool, result.path); - GITERR_CHECK_ALLOC(index_entry->path); - - index_entry->file_size = result.len; - index_entry->mode = result.mode; - git_oid_cpy(&index_entry->id, &automerge_oid); - - git_vector_insert(&diff_list->staged, index_entry); - git_vector_insert(&diff_list->resolved, (git_merge_diff *)conflict); - - *resolved = 1; - -done: - git_merge_file_result_free(&result); - git_odb_free(odb); - - return error; -} - -static int merge_conflict_resolve( - int *out, - git_merge_diff_list *diff_list, - const git_merge_diff *conflict, - const git_merge_file_options *file_opts) -{ - int resolved = 0; - int error = 0; - - *out = 0; - - if ((error = merge_conflict_resolve_trivial(&resolved, diff_list, conflict)) < 0) - goto done; - - if (!resolved && (error = merge_conflict_resolve_one_removed(&resolved, diff_list, conflict)) < 0) - goto done; - - if (!resolved && (error = merge_conflict_resolve_one_renamed(&resolved, diff_list, conflict)) < 0) - goto done; - - if (!resolved && (error = merge_conflict_resolve_automerge(&resolved, diff_list, conflict, file_opts)) < 0) - goto done; - - *out = resolved; - -done: - return error; -} - -/* Rename detection and coalescing */ - -struct merge_diff_similarity { - unsigned char similarity; - size_t other_idx; -}; - -static int index_entry_similarity_exact( - git_repository *repo, - git_index_entry *a, - size_t a_idx, - git_index_entry *b, - size_t b_idx, - void **cache, - const git_merge_options *opts) -{ - GIT_UNUSED(repo); - GIT_UNUSED(a_idx); - GIT_UNUSED(b_idx); - GIT_UNUSED(cache); - GIT_UNUSED(opts); - - if (git_oid__cmp(&a->id, &b->id) == 0) - return 100; - - return 0; -} - -static int index_entry_similarity_calc( - void **out, - git_repository *repo, - git_index_entry *entry, - const git_merge_options *opts) -{ - git_blob *blob; - git_diff_file diff_file = {{{0}}}; - git_off_t blobsize; - int error; - - *out = NULL; - - if ((error = git_blob_lookup(&blob, repo, &entry->id)) < 0) - return error; - - git_oid_cpy(&diff_file.id, &entry->id); - diff_file.path = entry->path; - diff_file.size = entry->file_size; - diff_file.mode = entry->mode; - diff_file.flags = 0; - - blobsize = git_blob_rawsize(blob); - - /* file too big for rename processing */ - if (!git__is_sizet(blobsize)) - return 0; - - error = opts->metric->buffer_signature(out, &diff_file, - git_blob_rawcontent(blob), (size_t)blobsize, - opts->metric->payload); - - git_blob_free(blob); - - return error; -} - -static int index_entry_similarity_inexact( - git_repository *repo, - git_index_entry *a, - size_t a_idx, - git_index_entry *b, - size_t b_idx, - void **cache, - const git_merge_options *opts) -{ - int score = 0; - int error = 0; - - if (GIT_MODE_TYPE(a->mode) != GIT_MODE_TYPE(b->mode)) - return 0; - - /* update signature cache if needed */ - if (!cache[a_idx] && (error = index_entry_similarity_calc(&cache[a_idx], repo, a, opts)) < 0) - return error; - if (!cache[b_idx] && (error = index_entry_similarity_calc(&cache[b_idx], repo, b, opts)) < 0) - return error; - - /* some metrics may not wish to process this file (too big / too small) */ - if (!cache[a_idx] || !cache[b_idx]) - return 0; - - /* compare signatures */ - if (opts->metric->similarity( - &score, cache[a_idx], cache[b_idx], opts->metric->payload) < 0) - return -1; - - /* clip score */ - if (score < 0) - score = 0; - else if (score > 100) - score = 100; - - return score; -} - -static int merge_diff_mark_similarity( - git_repository *repo, - git_merge_diff_list *diff_list, - struct merge_diff_similarity *similarity_ours, - struct merge_diff_similarity *similarity_theirs, - int (*similarity_fn)(git_repository *, git_index_entry *, size_t, git_index_entry *, size_t, void **, const git_merge_options *), - void **cache, - const git_merge_options *opts) -{ - size_t i, j; - git_merge_diff *conflict_src, *conflict_tgt; - int similarity; - - git_vector_foreach(&diff_list->conflicts, i, conflict_src) { - /* Items can be the source of a rename iff they have an item in the - * ancestor slot and lack an item in the ours or theirs slot. */ - if (!GIT_MERGE_INDEX_ENTRY_EXISTS(conflict_src->ancestor_entry) || - (GIT_MERGE_INDEX_ENTRY_EXISTS(conflict_src->our_entry) && - GIT_MERGE_INDEX_ENTRY_EXISTS(conflict_src->their_entry))) - continue; - - git_vector_foreach(&diff_list->conflicts, j, conflict_tgt) { - size_t our_idx = diff_list->conflicts.length + j; - size_t their_idx = (diff_list->conflicts.length * 2) + j; - - if (GIT_MERGE_INDEX_ENTRY_EXISTS(conflict_tgt->ancestor_entry)) - continue; - - if (GIT_MERGE_INDEX_ENTRY_EXISTS(conflict_tgt->our_entry) && - !GIT_MERGE_INDEX_ENTRY_EXISTS(conflict_src->our_entry)) { - similarity = similarity_fn(repo, &conflict_src->ancestor_entry, i, &conflict_tgt->our_entry, our_idx, cache, opts); - - if (similarity == GIT_EBUFS) - continue; - else if (similarity < 0) - return similarity; - - if (similarity > similarity_ours[i].similarity && - similarity > similarity_ours[j].similarity) { - /* Clear previous best similarity */ - if (similarity_ours[i].similarity > 0) - similarity_ours[similarity_ours[i].other_idx].similarity = 0; - - if (similarity_ours[j].similarity > 0) - similarity_ours[similarity_ours[j].other_idx].similarity = 0; - - similarity_ours[i].similarity = similarity; - similarity_ours[i].other_idx = j; - - similarity_ours[j].similarity = similarity; - similarity_ours[j].other_idx = i; - } - } - - if (GIT_MERGE_INDEX_ENTRY_EXISTS(conflict_tgt->their_entry) && - !GIT_MERGE_INDEX_ENTRY_EXISTS(conflict_src->their_entry)) { - similarity = similarity_fn(repo, &conflict_src->ancestor_entry, i, &conflict_tgt->their_entry, their_idx, cache, opts); - - if (similarity > similarity_theirs[i].similarity && - similarity > similarity_theirs[j].similarity) { - /* Clear previous best similarity */ - if (similarity_theirs[i].similarity > 0) - similarity_theirs[similarity_theirs[i].other_idx].similarity = 0; - - if (similarity_theirs[j].similarity > 0) - similarity_theirs[similarity_theirs[j].other_idx].similarity = 0; - - similarity_theirs[i].similarity = similarity; - similarity_theirs[i].other_idx = j; - - similarity_theirs[j].similarity = similarity; - similarity_theirs[j].other_idx = i; - } - } - } - } - - return 0; -} - -/* - * Rename conflicts: - * - * Ancestor Ours Theirs - * - * 0a A A A No rename - * b A A* A No rename (ours was rewritten) - * c A A A* No rename (theirs rewritten) - * 1a A A B[A] Rename or rename/edit - * b A B[A] A (automergeable) - * 2 A B[A] B[A] Both renamed (automergeable) - * 3a A B[A] Rename/delete - * b A B[A] (same) - * 4a A B[A] B Rename/add [B~ours B~theirs] - * b A B B[A] (same) - * 5 A B[A] C[A] Both renamed ("1 -> 2") - * 6 A C[A] Both renamed ("2 -> 1") - * B C[B] [C~ours C~theirs] (automergeable) - */ -static void merge_diff_mark_rename_conflict( - git_merge_diff_list *diff_list, - struct merge_diff_similarity *similarity_ours, - bool ours_renamed, - size_t ours_source_idx, - struct merge_diff_similarity *similarity_theirs, - bool theirs_renamed, - size_t theirs_source_idx, - git_merge_diff *target, - const git_merge_options *opts) -{ - git_merge_diff *ours_source = NULL, *theirs_source = NULL; - - if (ours_renamed) - ours_source = diff_list->conflicts.contents[ours_source_idx]; - - if (theirs_renamed) - theirs_source = diff_list->conflicts.contents[theirs_source_idx]; - - /* Detect 2->1 conflicts */ - if (ours_renamed && theirs_renamed) { - /* Both renamed to the same target name. */ - if (ours_source_idx == theirs_source_idx) - ours_source->type = GIT_MERGE_DIFF_BOTH_RENAMED; - else { - ours_source->type = GIT_MERGE_DIFF_BOTH_RENAMED_2_TO_1; - theirs_source->type = GIT_MERGE_DIFF_BOTH_RENAMED_2_TO_1; - } - } else if (ours_renamed) { - /* If our source was also renamed in theirs, this is a 1->2 */ - if (similarity_theirs[ours_source_idx].similarity >= opts->rename_threshold) - ours_source->type = GIT_MERGE_DIFF_BOTH_RENAMED_1_TO_2; - - else if (GIT_MERGE_INDEX_ENTRY_EXISTS(target->their_entry)) { - ours_source->type = GIT_MERGE_DIFF_RENAMED_ADDED; - target->type = GIT_MERGE_DIFF_RENAMED_ADDED; - } - - else if (!GIT_MERGE_INDEX_ENTRY_EXISTS(ours_source->their_entry)) - ours_source->type = GIT_MERGE_DIFF_RENAMED_DELETED; - - else if (ours_source->type == GIT_MERGE_DIFF_MODIFIED_DELETED) - ours_source->type = GIT_MERGE_DIFF_RENAMED_MODIFIED; - } else if (theirs_renamed) { - /* If their source was also renamed in ours, this is a 1->2 */ - if (similarity_ours[theirs_source_idx].similarity >= opts->rename_threshold) - theirs_source->type = GIT_MERGE_DIFF_BOTH_RENAMED_1_TO_2; - - else if (GIT_MERGE_INDEX_ENTRY_EXISTS(target->our_entry)) { - theirs_source->type = GIT_MERGE_DIFF_RENAMED_ADDED; - target->type = GIT_MERGE_DIFF_RENAMED_ADDED; - } - - else if (!GIT_MERGE_INDEX_ENTRY_EXISTS(theirs_source->our_entry)) - theirs_source->type = GIT_MERGE_DIFF_RENAMED_DELETED; - - else if (theirs_source->type == GIT_MERGE_DIFF_MODIFIED_DELETED) - theirs_source->type = GIT_MERGE_DIFF_RENAMED_MODIFIED; - } -} - -GIT_INLINE(void) merge_diff_coalesce_rename( - git_index_entry *source_entry, - git_delta_t *source_status, - git_index_entry *target_entry, - git_delta_t *target_status) -{ - /* Coalesce the rename target into the rename source. */ - memcpy(source_entry, target_entry, sizeof(git_index_entry)); - *source_status = GIT_DELTA_RENAMED; - - memset(target_entry, 0x0, sizeof(git_index_entry)); - *target_status = GIT_DELTA_UNMODIFIED; -} - -static void merge_diff_list_coalesce_renames( - git_merge_diff_list *diff_list, - struct merge_diff_similarity *similarity_ours, - struct merge_diff_similarity *similarity_theirs, - const git_merge_options *opts) -{ - size_t i; - bool ours_renamed = 0, theirs_renamed = 0; - size_t ours_source_idx = 0, theirs_source_idx = 0; - git_merge_diff *ours_source, *theirs_source, *target; - - for (i = 0; i < diff_list->conflicts.length; i++) { - target = diff_list->conflicts.contents[i]; - - ours_renamed = 0; - theirs_renamed = 0; - - if (GIT_MERGE_INDEX_ENTRY_EXISTS(target->our_entry) && - similarity_ours[i].similarity >= opts->rename_threshold) { - ours_source_idx = similarity_ours[i].other_idx; - - ours_source = diff_list->conflicts.contents[ours_source_idx]; - - merge_diff_coalesce_rename( - &ours_source->our_entry, - &ours_source->our_status, - &target->our_entry, - &target->our_status); - - similarity_ours[ours_source_idx].similarity = 0; - similarity_ours[i].similarity = 0; - - ours_renamed = 1; - } - - /* insufficient to determine direction */ - if (GIT_MERGE_INDEX_ENTRY_EXISTS(target->their_entry) && - similarity_theirs[i].similarity >= opts->rename_threshold) { - theirs_source_idx = similarity_theirs[i].other_idx; - - theirs_source = diff_list->conflicts.contents[theirs_source_idx]; - - merge_diff_coalesce_rename( - &theirs_source->their_entry, - &theirs_source->their_status, - &target->their_entry, - &target->their_status); - - similarity_theirs[theirs_source_idx].similarity = 0; - similarity_theirs[i].similarity = 0; - - theirs_renamed = 1; - } - - merge_diff_mark_rename_conflict(diff_list, - similarity_ours, ours_renamed, ours_source_idx, - similarity_theirs, theirs_renamed, theirs_source_idx, - target, opts); - } -} - -static int merge_diff_empty(const git_vector *conflicts, size_t idx, void *p) -{ - git_merge_diff *conflict = conflicts->contents[idx]; - - GIT_UNUSED(p); - - return (!GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->ancestor_entry) && - !GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->our_entry) && - !GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->their_entry)); -} - -static void merge_diff_list_count_candidates( - git_merge_diff_list *diff_list, - size_t *src_count, - size_t *tgt_count) -{ - git_merge_diff *entry; - size_t i; - - *src_count = 0; - *tgt_count = 0; - - git_vector_foreach(&diff_list->conflicts, i, entry) { - if (GIT_MERGE_INDEX_ENTRY_EXISTS(entry->ancestor_entry) && - (!GIT_MERGE_INDEX_ENTRY_EXISTS(entry->our_entry) || - !GIT_MERGE_INDEX_ENTRY_EXISTS(entry->their_entry))) - (*src_count)++; - else if (!GIT_MERGE_INDEX_ENTRY_EXISTS(entry->ancestor_entry)) - (*tgt_count)++; - } -} - -int git_merge_diff_list__find_renames( - git_repository *repo, - git_merge_diff_list *diff_list, - const git_merge_options *opts) -{ - struct merge_diff_similarity *similarity_ours, *similarity_theirs; - void **cache = NULL; - size_t cache_size = 0; - size_t src_count, tgt_count, i; - int error = 0; - - assert(diff_list && opts); - - if ((opts->flags & GIT_MERGE_FIND_RENAMES) == 0) - return 0; - - similarity_ours = git__calloc(diff_list->conflicts.length, - sizeof(struct merge_diff_similarity)); - GITERR_CHECK_ALLOC(similarity_ours); - - similarity_theirs = git__calloc(diff_list->conflicts.length, - sizeof(struct merge_diff_similarity)); - GITERR_CHECK_ALLOC(similarity_theirs); - - /* Calculate similarity between items that were deleted from the ancestor - * and added in the other branch. - */ - if ((error = merge_diff_mark_similarity(repo, diff_list, similarity_ours, - similarity_theirs, index_entry_similarity_exact, NULL, opts)) < 0) - goto done; - - if (diff_list->conflicts.length <= opts->target_limit) { - GITERR_CHECK_ALLOC_MULTIPLY(&cache_size, diff_list->conflicts.length, 3); - cache = git__calloc(cache_size, sizeof(void *)); - GITERR_CHECK_ALLOC(cache); - - merge_diff_list_count_candidates(diff_list, &src_count, &tgt_count); - - if (src_count > opts->target_limit || tgt_count > opts->target_limit) { - /* TODO: report! */ - } else { - if ((error = merge_diff_mark_similarity( - repo, diff_list, similarity_ours, similarity_theirs, - index_entry_similarity_inexact, cache, opts)) < 0) - goto done; - } - } - - /* For entries that are appropriately similar, merge the new name's entry - * into the old name. - */ - merge_diff_list_coalesce_renames(diff_list, similarity_ours, similarity_theirs, opts); - - /* And remove any entries that were merged and are now empty. */ - git_vector_remove_matching(&diff_list->conflicts, merge_diff_empty, NULL); - -done: - if (cache != NULL) { - for (i = 0; i < cache_size; ++i) { - if (cache[i] != NULL) - opts->metric->free_signature(cache[i], opts->metric->payload); - } - - git__free(cache); - } - - git__free(similarity_ours); - git__free(similarity_theirs); - - return error; -} - -/* Directory/file conflict handling */ - -GIT_INLINE(const char *) merge_diff_path( - const git_merge_diff *conflict) -{ - if (GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->ancestor_entry)) - return conflict->ancestor_entry.path; - else if (GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->our_entry)) - return conflict->our_entry.path; - else if (GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->their_entry)) - return conflict->their_entry.path; - - return NULL; -} - -GIT_INLINE(bool) merge_diff_any_side_added_or_modified( - const git_merge_diff *conflict) -{ - if (conflict->our_status == GIT_DELTA_ADDED || - conflict->our_status == GIT_DELTA_MODIFIED || - conflict->their_status == GIT_DELTA_ADDED || - conflict->their_status == GIT_DELTA_MODIFIED) - return true; - - return false; -} - -GIT_INLINE(bool) path_is_prefixed(const char *parent, const char *child) -{ - size_t child_len = strlen(child); - size_t parent_len = strlen(parent); - - if (child_len < parent_len || - strncmp(parent, child, parent_len) != 0) - return 0; - - return (child[parent_len] == '/'); -} - -GIT_INLINE(int) merge_diff_detect_df_conflict( - struct merge_diff_df_data *df_data, - git_merge_diff *conflict) -{ - const char *cur_path = merge_diff_path(conflict); - - /* Determine if this is a D/F conflict or the child of one */ - if (df_data->df_path && - path_is_prefixed(df_data->df_path, cur_path)) - conflict->type = GIT_MERGE_DIFF_DF_CHILD; - else if(df_data->df_path) - df_data->df_path = NULL; - else if (df_data->prev_path && - merge_diff_any_side_added_or_modified(df_data->prev_conflict) && - merge_diff_any_side_added_or_modified(conflict) && - path_is_prefixed(df_data->prev_path, cur_path)) { - conflict->type = GIT_MERGE_DIFF_DF_CHILD; - - df_data->prev_conflict->type = GIT_MERGE_DIFF_DIRECTORY_FILE; - df_data->df_path = df_data->prev_path; - } - - df_data->prev_path = cur_path; - df_data->prev_conflict = conflict; - - return 0; -} - -/* Conflict handling */ - -GIT_INLINE(int) merge_diff_detect_type( - git_merge_diff *conflict) -{ - if (conflict->our_status == GIT_DELTA_ADDED && - conflict->their_status == GIT_DELTA_ADDED) - conflict->type = GIT_MERGE_DIFF_BOTH_ADDED; - else if (conflict->our_status == GIT_DELTA_MODIFIED && - conflict->their_status == GIT_DELTA_MODIFIED) - conflict->type = GIT_MERGE_DIFF_BOTH_MODIFIED; - else if (conflict->our_status == GIT_DELTA_DELETED && - conflict->their_status == GIT_DELTA_DELETED) - conflict->type = GIT_MERGE_DIFF_BOTH_DELETED; - else if (conflict->our_status == GIT_DELTA_MODIFIED && - conflict->their_status == GIT_DELTA_DELETED) - conflict->type = GIT_MERGE_DIFF_MODIFIED_DELETED; - else if (conflict->our_status == GIT_DELTA_DELETED && - conflict->their_status == GIT_DELTA_MODIFIED) - conflict->type = GIT_MERGE_DIFF_MODIFIED_DELETED; - else - conflict->type = GIT_MERGE_DIFF_NONE; - - return 0; -} - -GIT_INLINE(int) index_entry_dup_pool( - git_index_entry *out, - git_pool *pool, - const git_index_entry *src) -{ - if (src != NULL) { - memcpy(out, src, sizeof(git_index_entry)); - if ((out->path = git_pool_strdup(pool, src->path)) == NULL) - return -1; - } - - return 0; -} - -GIT_INLINE(int) merge_delta_type_from_index_entries( - const git_index_entry *ancestor, - const git_index_entry *other) -{ - if (ancestor == NULL && other == NULL) - return GIT_DELTA_UNMODIFIED; - else if (ancestor == NULL && other != NULL) - return GIT_DELTA_ADDED; - else if (ancestor != NULL && other == NULL) - return GIT_DELTA_DELETED; - else if (S_ISDIR(ancestor->mode) ^ S_ISDIR(other->mode)) - return GIT_DELTA_TYPECHANGE; - else if(S_ISLNK(ancestor->mode) ^ S_ISLNK(other->mode)) - return GIT_DELTA_TYPECHANGE; - else if (git_oid__cmp(&ancestor->id, &other->id) || - ancestor->mode != other->mode) - return GIT_DELTA_MODIFIED; - - return GIT_DELTA_UNMODIFIED; -} - -static git_merge_diff *merge_diff_from_index_entries( - git_merge_diff_list *diff_list, - const git_index_entry **entries) -{ - git_merge_diff *conflict; - git_pool *pool = &diff_list->pool; - - if ((conflict = git_pool_mallocz(pool, sizeof(git_merge_diff))) == NULL) - return NULL; - - if (index_entry_dup_pool(&conflict->ancestor_entry, pool, entries[TREE_IDX_ANCESTOR]) < 0 || - index_entry_dup_pool(&conflict->our_entry, pool, entries[TREE_IDX_OURS]) < 0 || - index_entry_dup_pool(&conflict->their_entry, pool, entries[TREE_IDX_THEIRS]) < 0) - return NULL; - - conflict->our_status = merge_delta_type_from_index_entries( - entries[TREE_IDX_ANCESTOR], entries[TREE_IDX_OURS]); - conflict->their_status = merge_delta_type_from_index_entries( - entries[TREE_IDX_ANCESTOR], entries[TREE_IDX_THEIRS]); - - return conflict; -} - -/* Merge trees */ - -static int merge_diff_list_insert_conflict( - git_merge_diff_list *diff_list, - struct merge_diff_df_data *merge_df_data, - const git_index_entry *tree_items[3]) -{ - git_merge_diff *conflict; - - if ((conflict = merge_diff_from_index_entries(diff_list, tree_items)) == NULL || - merge_diff_detect_type(conflict) < 0 || - merge_diff_detect_df_conflict(merge_df_data, conflict) < 0 || - git_vector_insert(&diff_list->conflicts, conflict) < 0) - return -1; - - return 0; -} - -static int merge_diff_list_insert_unmodified( - git_merge_diff_list *diff_list, - const git_index_entry *tree_items[3]) -{ - int error = 0; - git_index_entry *entry; - - entry = git_pool_malloc(&diff_list->pool, sizeof(git_index_entry)); - GITERR_CHECK_ALLOC(entry); - - if ((error = index_entry_dup_pool(entry, &diff_list->pool, tree_items[0])) >= 0) - error = git_vector_insert(&diff_list->staged, entry); - - return error; -} - -struct merge_diff_find_data { - git_merge_diff_list *diff_list; - struct merge_diff_df_data df_data; -}; - -static int queue_difference(const git_index_entry **entries, void *data) -{ - struct merge_diff_find_data *find_data = data; - bool item_modified = false; - size_t i; - - if (!entries[0] || !entries[1] || !entries[2]) { - item_modified = true; - } else { - for (i = 1; i < 3; i++) { - if (index_entry_cmp(entries[0], entries[i]) != 0) { - item_modified = true; - break; - } - } - } - - return item_modified ? - merge_diff_list_insert_conflict( - find_data->diff_list, &find_data->df_data, entries) : - merge_diff_list_insert_unmodified(find_data->diff_list, entries); -} - -int git_merge_diff_list__find_differences( - git_merge_diff_list *diff_list, - git_iterator *ancestor_iter, - git_iterator *our_iter, - git_iterator *their_iter) -{ - git_iterator *iterators[3] = { ancestor_iter, our_iter, their_iter }; - struct merge_diff_find_data find_data = { diff_list }; - - return git_iterator_walk(iterators, 3, queue_difference, &find_data); -} - -git_merge_diff_list *git_merge_diff_list__alloc(git_repository *repo) -{ - git_merge_diff_list *diff_list = git__calloc(1, sizeof(git_merge_diff_list)); - - if (diff_list == NULL) - return NULL; - - diff_list->repo = repo; - - git_pool_init(&diff_list->pool, 1); - - if (git_vector_init(&diff_list->staged, 0, NULL) < 0 || - git_vector_init(&diff_list->conflicts, 0, NULL) < 0 || - git_vector_init(&diff_list->resolved, 0, NULL) < 0) { - git_merge_diff_list__free(diff_list); - return NULL; - } - - return diff_list; -} - -void git_merge_diff_list__free(git_merge_diff_list *diff_list) -{ - if (!diff_list) - return; - - git_vector_free(&diff_list->staged); - git_vector_free(&diff_list->conflicts); - git_vector_free(&diff_list->resolved); - git_pool_clear(&diff_list->pool); - git__free(diff_list); -} - -static int merge_normalize_opts( - git_repository *repo, - git_merge_options *opts, - const git_merge_options *given) -{ - git_config *cfg = NULL; - int error = 0; - - assert(repo && opts); - - if ((error = git_repository_config__weakptr(&cfg, repo)) < 0) - return error; - - if (given != NULL) - memcpy(opts, given, sizeof(git_merge_options)); - else { - git_merge_options init = GIT_MERGE_OPTIONS_INIT; - memcpy(opts, &init, sizeof(init)); - - opts->flags = GIT_MERGE_FIND_RENAMES; - opts->rename_threshold = GIT_MERGE_DEFAULT_RENAME_THRESHOLD; - } - - if (!opts->target_limit) { - int limit = git_config__get_int_force(cfg, "merge.renamelimit", 0); - - if (!limit) - limit = git_config__get_int_force(cfg, "diff.renamelimit", 0); - - opts->target_limit = (limit <= 0) ? - GIT_MERGE_DEFAULT_TARGET_LIMIT : (unsigned int)limit; - } - - /* assign the internal metric with whitespace flag as payload */ - if (!opts->metric) { - opts->metric = git__malloc(sizeof(git_diff_similarity_metric)); - GITERR_CHECK_ALLOC(opts->metric); - - opts->metric->file_signature = git_diff_find_similar__hashsig_for_file; - opts->metric->buffer_signature = git_diff_find_similar__hashsig_for_buf; - opts->metric->free_signature = git_diff_find_similar__hashsig_free; - opts->metric->similarity = git_diff_find_similar__calc_similarity; - opts->metric->payload = (void *)GIT_HASHSIG_SMART_WHITESPACE; - } - - return 0; -} - - -static int merge_index_insert_reuc( - git_index *index, - size_t idx, - const git_index_entry *entry) -{ - const git_index_reuc_entry *reuc; - int mode[3] = { 0, 0, 0 }; - git_oid const *oid[3] = { NULL, NULL, NULL }; - size_t i; - - if (!GIT_MERGE_INDEX_ENTRY_EXISTS(*entry)) - return 0; - - if ((reuc = git_index_reuc_get_bypath(index, entry->path)) != NULL) { - for (i = 0; i < 3; i++) { - mode[i] = reuc->mode[i]; - oid[i] = &reuc->oid[i]; - } - } - - mode[idx] = entry->mode; - oid[idx] = &entry->id; - - return git_index_reuc_add(index, entry->path, - mode[0], oid[0], mode[1], oid[1], mode[2], oid[2]); -} - -static int index_update_reuc(git_index *index, git_merge_diff_list *diff_list) -{ - int error; - size_t i; - git_merge_diff *conflict; - - /* Add each entry in the resolved conflict to the REUC independently, since - * the paths may differ due to renames. */ - git_vector_foreach(&diff_list->resolved, i, conflict) { - const git_index_entry *ancestor = - GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->ancestor_entry) ? - &conflict->ancestor_entry : NULL; - - const git_index_entry *ours = - GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->our_entry) ? - &conflict->our_entry : NULL; - - const git_index_entry *theirs = - GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->their_entry) ? - &conflict->their_entry : NULL; - - if (ancestor != NULL && - (error = merge_index_insert_reuc(index, TREE_IDX_ANCESTOR, ancestor)) < 0) - return error; - - if (ours != NULL && - (error = merge_index_insert_reuc(index, TREE_IDX_OURS, ours)) < 0) - return error; - - if (theirs != NULL && - (error = merge_index_insert_reuc(index, TREE_IDX_THEIRS, theirs)) < 0) - return error; - } - - return 0; -} - -static int index_from_diff_list(git_index **out, - git_merge_diff_list *diff_list, bool skip_reuc) -{ - git_index *index; - size_t i; - git_merge_diff *conflict; - int error = 0; - - *out = NULL; - - if ((error = git_index_new(&index)) < 0) - return error; - - if ((error = git_index__fill(index, &diff_list->staged)) < 0) - goto on_error; - - git_vector_foreach(&diff_list->conflicts, i, conflict) { - const git_index_entry *ancestor = - GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->ancestor_entry) ? - &conflict->ancestor_entry : NULL; - - const git_index_entry *ours = - GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->our_entry) ? - &conflict->our_entry : NULL; - - const git_index_entry *theirs = - GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->their_entry) ? - &conflict->their_entry : NULL; - - if ((error = git_index_conflict_add(index, ancestor, ours, theirs)) < 0) - goto on_error; - } - - /* Add each rename entry to the rename portion of the index. */ - git_vector_foreach(&diff_list->conflicts, i, conflict) { - const char *ancestor_path, *our_path, *their_path; - - if (!GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->ancestor_entry)) - continue; - - ancestor_path = conflict->ancestor_entry.path; - - our_path = - GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->our_entry) ? - conflict->our_entry.path : NULL; - - their_path = - GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->their_entry) ? - conflict->their_entry.path : NULL; - - if ((our_path && strcmp(ancestor_path, our_path) != 0) || - (their_path && strcmp(ancestor_path, their_path) != 0)) { - if ((error = git_index_name_add(index, ancestor_path, our_path, their_path)) < 0) - goto on_error; - } - } - - if (!skip_reuc) { - if ((error = index_update_reuc(index, diff_list)) < 0) - goto on_error; - } - - *out = index; - return 0; - -on_error: - git_index_free(index); - return error; -} - -static git_iterator *iterator_given_or_empty(git_iterator **empty, git_iterator *given) -{ - git_iterator_options opts = GIT_ITERATOR_OPTIONS_INIT; - - if (given) - return given; - - opts.flags = GIT_ITERATOR_DONT_IGNORE_CASE; - - if (git_iterator_for_nothing(empty, &opts) < 0) - return NULL; - - return *empty; -} - -int git_merge__iterators( - git_index **out, - git_repository *repo, - git_iterator *ancestor_iter, - git_iterator *our_iter, - git_iterator *theirs_iter, - const git_merge_options *given_opts) -{ - git_iterator *empty_ancestor = NULL, - *empty_ours = NULL, - *empty_theirs = NULL; - git_merge_diff_list *diff_list; - git_merge_options opts; - git_merge_file_options file_opts = GIT_MERGE_FILE_OPTIONS_INIT; - git_merge_diff *conflict; - git_vector changes; - size_t i; - int error = 0; - - assert(out && repo); - - *out = NULL; - - GITERR_CHECK_VERSION( - given_opts, GIT_MERGE_OPTIONS_VERSION, "git_merge_options"); - - if ((error = merge_normalize_opts(repo, &opts, given_opts)) < 0) - return error; - - file_opts.favor = opts.file_favor; - file_opts.flags = opts.file_flags; - - /* use the git-inspired labels when virtual base building */ - if (opts.flags & GIT_MERGE__VIRTUAL_BASE) { - file_opts.ancestor_label = "merged common ancestors"; - file_opts.our_label = "Temporary merge branch 1"; - file_opts.their_label = "Temporary merge branch 2"; - file_opts.flags |= GIT_MERGE_FILE_FAVOR__CONFLICTED; - } - - diff_list = git_merge_diff_list__alloc(repo); - GITERR_CHECK_ALLOC(diff_list); - - ancestor_iter = iterator_given_or_empty(&empty_ancestor, ancestor_iter); - our_iter = iterator_given_or_empty(&empty_ours, our_iter); - theirs_iter = iterator_given_or_empty(&empty_theirs, theirs_iter); - - if ((error = git_merge_diff_list__find_differences( - diff_list, ancestor_iter, our_iter, theirs_iter)) < 0 || - (error = git_merge_diff_list__find_renames(repo, diff_list, &opts)) < 0) - goto done; - - memcpy(&changes, &diff_list->conflicts, sizeof(git_vector)); - git_vector_clear(&diff_list->conflicts); - - git_vector_foreach(&changes, i, conflict) { - int resolved = 0; - - if ((error = merge_conflict_resolve( - &resolved, diff_list, conflict, &file_opts)) < 0) - goto done; - - if (!resolved) { - if ((opts.flags & GIT_MERGE_FAIL_ON_CONFLICT)) { - giterr_set(GITERR_MERGE, "merge conflicts exist"); - error = GIT_EMERGECONFLICT; - goto done; - } - - git_vector_insert(&diff_list->conflicts, conflict); - } - } - - error = index_from_diff_list(out, diff_list, - (opts.flags & GIT_MERGE_SKIP_REUC)); - -done: - if (!given_opts || !given_opts->metric) - git__free(opts.metric); - - git_merge_diff_list__free(diff_list); - git_iterator_free(empty_ancestor); - git_iterator_free(empty_ours); - git_iterator_free(empty_theirs); - - return error; -} - -int git_merge_trees( - git_index **out, - git_repository *repo, - const git_tree *ancestor_tree, - const git_tree *our_tree, - const git_tree *their_tree, - const git_merge_options *merge_opts) -{ - git_iterator *ancestor_iter = NULL, *our_iter = NULL, *their_iter = NULL; - git_iterator_options iter_opts = GIT_ITERATOR_OPTIONS_INIT; - int error; - - iter_opts.flags = GIT_ITERATOR_DONT_IGNORE_CASE; - - if ((error = git_iterator_for_tree( - &ancestor_iter, (git_tree *)ancestor_tree, &iter_opts)) < 0 || - (error = git_iterator_for_tree( - &our_iter, (git_tree *)our_tree, &iter_opts)) < 0 || - (error = git_iterator_for_tree( - &their_iter, (git_tree *)their_tree, &iter_opts)) < 0) - goto done; - - error = git_merge__iterators( - out, repo, ancestor_iter, our_iter, their_iter, merge_opts); - -done: - git_iterator_free(ancestor_iter); - git_iterator_free(our_iter); - git_iterator_free(their_iter); - - return error; -} - -static int merge_annotated_commits( - git_index **index_out, - git_annotated_commit **base_out, - git_repository *repo, - git_annotated_commit *our_commit, - git_annotated_commit *their_commit, - size_t recursion_level, - const git_merge_options *opts); - -GIT_INLINE(int) insert_head_ids( - git_array_oid_t *ids, - const git_annotated_commit *annotated_commit) -{ - git_oid *id; - size_t i; - - if (annotated_commit->type == GIT_ANNOTATED_COMMIT_REAL) { - id = git_array_alloc(*ids); - GITERR_CHECK_ALLOC(id); - - git_oid_cpy(id, git_commit_id(annotated_commit->commit)); - } else { - for (i = 0; i < annotated_commit->parents.size; i++) { - id = git_array_alloc(*ids); - GITERR_CHECK_ALLOC(id); - - git_oid_cpy(id, &annotated_commit->parents.ptr[i]); - } - } - - return 0; -} - -static int create_virtual_base( - git_annotated_commit **out, - git_repository *repo, - git_annotated_commit *one, - git_annotated_commit *two, - const git_merge_options *opts, - size_t recursion_level) -{ - git_annotated_commit *result = NULL; - git_index *index = NULL; - git_merge_options virtual_opts = GIT_MERGE_OPTIONS_INIT; - - /* Conflicts in the merge base creation do not propagate to conflicts - * in the result; the conflicted base will act as the common ancestor. - */ - if (opts) - memcpy(&virtual_opts, opts, sizeof(git_merge_options)); - - virtual_opts.flags &= ~GIT_MERGE_FAIL_ON_CONFLICT; - virtual_opts.flags |= GIT_MERGE__VIRTUAL_BASE; - - if ((merge_annotated_commits(&index, NULL, repo, one, two, - recursion_level + 1, &virtual_opts)) < 0) - return -1; - - result = git__calloc(1, sizeof(git_annotated_commit)); - GITERR_CHECK_ALLOC(result); - result->type = GIT_ANNOTATED_COMMIT_VIRTUAL; - result->index = index; - - insert_head_ids(&result->parents, one); - insert_head_ids(&result->parents, two); - - *out = result; - return 0; -} - -static int compute_base( - git_annotated_commit **out, - git_repository *repo, - const git_annotated_commit *one, - const git_annotated_commit *two, - const git_merge_options *given_opts, - size_t recursion_level) -{ - git_array_oid_t head_ids = GIT_ARRAY_INIT; - git_oidarray bases = {0}; - git_annotated_commit *base = NULL, *other = NULL, *new_base = NULL; - git_merge_options opts = GIT_MERGE_OPTIONS_INIT; - size_t i; - int error; - - *out = NULL; - - if (given_opts) - memcpy(&opts, given_opts, sizeof(git_merge_options)); - - if ((error = insert_head_ids(&head_ids, one)) < 0 || - (error = insert_head_ids(&head_ids, two)) < 0) - goto done; - - if ((error = git_merge_bases_many(&bases, repo, - head_ids.size, head_ids.ptr)) < 0 || - (error = git_annotated_commit_lookup(&base, repo, &bases.ids[0])) < 0 || - (opts.flags & GIT_MERGE_NO_RECURSIVE)) - goto done; - - for (i = 1; i < bases.count; i++) { - recursion_level++; - - if (opts.recursion_limit && recursion_level > opts.recursion_limit) - break; - - if ((error = git_annotated_commit_lookup(&other, repo, - &bases.ids[i])) < 0 || - (error = create_virtual_base(&new_base, repo, base, other, &opts, - recursion_level)) < 0) - goto done; - - git_annotated_commit_free(base); - git_annotated_commit_free(other); - - base = new_base; - new_base = NULL; - other = NULL; - } - -done: - if (error == 0) - *out = base; - else - git_annotated_commit_free(base); - - git_annotated_commit_free(other); - git_annotated_commit_free(new_base); - git_oidarray_free(&bases); - git_array_clear(head_ids); - return error; -} - -static int iterator_for_annotated_commit( - git_iterator **out, - git_annotated_commit *commit) -{ - git_iterator_options opts = GIT_ITERATOR_OPTIONS_INIT; - int error; - - opts.flags = GIT_ITERATOR_DONT_IGNORE_CASE; - - if (commit == NULL) { - error = git_iterator_for_nothing(out, &opts); - } else if (commit->type == GIT_ANNOTATED_COMMIT_VIRTUAL) { - error = git_iterator_for_index(out, git_index_owner(commit->index), commit->index, &opts); - } else { - if (!commit->tree && - (error = git_commit_tree(&commit->tree, commit->commit)) < 0) - goto done; - - error = git_iterator_for_tree(out, commit->tree, &opts); - } - -done: - return error; -} - -static int merge_annotated_commits( - git_index **index_out, - git_annotated_commit **base_out, - git_repository *repo, - git_annotated_commit *ours, - git_annotated_commit *theirs, - size_t recursion_level, - const git_merge_options *opts) -{ - git_annotated_commit *base = NULL; - git_iterator *base_iter = NULL, *our_iter = NULL, *their_iter = NULL; - int error; - - if ((error = compute_base(&base, repo, ours, theirs, opts, - recursion_level)) < 0) { - - if (error != GIT_ENOTFOUND) - goto done; - - giterr_clear(); - } - - if ((error = iterator_for_annotated_commit(&base_iter, base)) < 0 || - (error = iterator_for_annotated_commit(&our_iter, ours)) < 0 || - (error = iterator_for_annotated_commit(&their_iter, theirs)) < 0 || - (error = git_merge__iterators(index_out, repo, base_iter, our_iter, - their_iter, opts)) < 0) - goto done; - - if (base_out) { - *base_out = base; - base = NULL; - } - -done: - git_annotated_commit_free(base); - git_iterator_free(base_iter); - git_iterator_free(our_iter); - git_iterator_free(their_iter); - return error; -} - - -int git_merge_commits( - git_index **out, - git_repository *repo, - const git_commit *our_commit, - const git_commit *their_commit, - const git_merge_options *opts) -{ - git_annotated_commit *ours = NULL, *theirs = NULL, *base = NULL; - int error = 0; - - if ((error = git_annotated_commit_from_commit(&ours, (git_commit *)our_commit)) < 0 || - (error = git_annotated_commit_from_commit(&theirs, (git_commit *)their_commit)) < 0) - goto done; - - error = merge_annotated_commits(out, &base, repo, ours, theirs, 0, opts); - -done: - git_annotated_commit_free(ours); - git_annotated_commit_free(theirs); - git_annotated_commit_free(base); - return error; -} - -/* Merge setup / cleanup */ - -static int write_merge_head( - git_repository *repo, - const git_annotated_commit *heads[], - size_t heads_len) -{ - git_filebuf file = GIT_FILEBUF_INIT; - git_buf file_path = GIT_BUF_INIT; - size_t i; - int error = 0; - - assert(repo && heads); - - if ((error = git_buf_joinpath(&file_path, repo->path_repository, GIT_MERGE_HEAD_FILE)) < 0 || - (error = git_filebuf_open(&file, file_path.ptr, GIT_FILEBUF_FORCE, GIT_MERGE_FILE_MODE)) < 0) - goto cleanup; - - for (i = 0; i < heads_len; i++) { - if ((error = git_filebuf_printf(&file, "%s\n", heads[i]->id_str)) < 0) - goto cleanup; - } - - error = git_filebuf_commit(&file); - -cleanup: - if (error < 0) - git_filebuf_cleanup(&file); - - git_buf_free(&file_path); - - return error; -} - -static int write_merge_mode(git_repository *repo) -{ - git_filebuf file = GIT_FILEBUF_INIT; - git_buf file_path = GIT_BUF_INIT; - int error = 0; - - assert(repo); - - if ((error = git_buf_joinpath(&file_path, repo->path_repository, GIT_MERGE_MODE_FILE)) < 0 || - (error = git_filebuf_open(&file, file_path.ptr, GIT_FILEBUF_FORCE, GIT_MERGE_FILE_MODE)) < 0) - goto cleanup; - - if ((error = git_filebuf_write(&file, "no-ff", 5)) < 0) - goto cleanup; - - error = git_filebuf_commit(&file); - -cleanup: - if (error < 0) - git_filebuf_cleanup(&file); - - git_buf_free(&file_path); - - return error; -} - -struct merge_msg_entry { - const git_annotated_commit *merge_head; - bool written; -}; - -static int msg_entry_is_branch( - const struct merge_msg_entry *entry, - git_vector *entries) -{ - GIT_UNUSED(entries); - - return (entry->written == 0 && - entry->merge_head->remote_url == NULL && - entry->merge_head->ref_name != NULL && - git__strncmp(GIT_REFS_HEADS_DIR, entry->merge_head->ref_name, strlen(GIT_REFS_HEADS_DIR)) == 0); -} - -static int msg_entry_is_tracking( - const struct merge_msg_entry *entry, - git_vector *entries) -{ - GIT_UNUSED(entries); - - return (entry->written == 0 && - entry->merge_head->remote_url == NULL && - entry->merge_head->ref_name != NULL && - git__strncmp(GIT_REFS_REMOTES_DIR, entry->merge_head->ref_name, strlen(GIT_REFS_REMOTES_DIR)) == 0); -} - -static int msg_entry_is_tag( - const struct merge_msg_entry *entry, - git_vector *entries) -{ - GIT_UNUSED(entries); - - return (entry->written == 0 && - entry->merge_head->remote_url == NULL && - entry->merge_head->ref_name != NULL && - git__strncmp(GIT_REFS_TAGS_DIR, entry->merge_head->ref_name, strlen(GIT_REFS_TAGS_DIR)) == 0); -} - -static int msg_entry_is_remote( - const struct merge_msg_entry *entry, - git_vector *entries) -{ - if (entry->written == 0 && - entry->merge_head->remote_url != NULL && - entry->merge_head->ref_name != NULL && - git__strncmp(GIT_REFS_HEADS_DIR, entry->merge_head->ref_name, strlen(GIT_REFS_HEADS_DIR)) == 0) - { - struct merge_msg_entry *existing; - - /* Match only branches from the same remote */ - if (entries->length == 0) - return 1; - - existing = git_vector_get(entries, 0); - - return (git__strcmp(existing->merge_head->remote_url, - entry->merge_head->remote_url) == 0); - } - - return 0; -} - -static int msg_entry_is_oid( - const struct merge_msg_entry *merge_msg_entry) -{ - return (merge_msg_entry->written == 0 && - merge_msg_entry->merge_head->ref_name == NULL && - merge_msg_entry->merge_head->remote_url == NULL); -} - -static int merge_msg_entry_written( - const struct merge_msg_entry *merge_msg_entry) -{ - return (merge_msg_entry->written == 1); -} - -static int merge_msg_entries( - git_vector *v, - const struct merge_msg_entry *entries, - size_t len, - int (*match)(const struct merge_msg_entry *entry, git_vector *entries)) -{ - size_t i; - int matches, total = 0; - - git_vector_clear(v); - - for (i = 0; i < len; i++) { - if ((matches = match(&entries[i], v)) < 0) - return matches; - else if (!matches) - continue; - - git_vector_insert(v, (struct merge_msg_entry *)&entries[i]); - total++; - } - - return total; -} - -static int merge_msg_write_entries( - git_filebuf *file, - git_vector *entries, - const char *item_name, - const char *item_plural_name, - size_t ref_name_skip, - const char *source, - char sep) -{ - struct merge_msg_entry *entry; - size_t i; - int error = 0; - - if (entries->length == 0) - return 0; - - if (sep && (error = git_filebuf_printf(file, "%c ", sep)) < 0) - goto done; - - if ((error = git_filebuf_printf(file, "%s ", - (entries->length == 1) ? item_name : item_plural_name)) < 0) - goto done; - - git_vector_foreach(entries, i, entry) { - if (i > 0 && - (error = git_filebuf_printf(file, "%s", (i == entries->length - 1) ? " and " : ", ")) < 0) - goto done; - - if ((error = git_filebuf_printf(file, "'%s'", entry->merge_head->ref_name + ref_name_skip)) < 0) - goto done; - - entry->written = 1; - } - - if (source) - error = git_filebuf_printf(file, " of %s", source); - -done: - return error; -} - -static int merge_msg_write_branches( - git_filebuf *file, - git_vector *entries, - char sep) -{ - return merge_msg_write_entries(file, entries, - "branch", "branches", strlen(GIT_REFS_HEADS_DIR), NULL, sep); -} - -static int merge_msg_write_tracking( - git_filebuf *file, - git_vector *entries, - char sep) -{ - return merge_msg_write_entries(file, entries, - "remote-tracking branch", "remote-tracking branches", 0, NULL, sep); -} - -static int merge_msg_write_tags( - git_filebuf *file, - git_vector *entries, - char sep) -{ - return merge_msg_write_entries(file, entries, - "tag", "tags", strlen(GIT_REFS_TAGS_DIR), NULL, sep); -} - -static int merge_msg_write_remotes( - git_filebuf *file, - git_vector *entries, - char sep) -{ - const char *source; - - if (entries->length == 0) - return 0; - - source = ((struct merge_msg_entry *)entries->contents[0])->merge_head->remote_url; - - return merge_msg_write_entries(file, entries, - "branch", "branches", strlen(GIT_REFS_HEADS_DIR), source, sep); -} - -static int write_merge_msg( - git_repository *repo, - const git_annotated_commit *heads[], - size_t heads_len) -{ - git_filebuf file = GIT_FILEBUF_INIT; - git_buf file_path = GIT_BUF_INIT; - struct merge_msg_entry *entries; - git_vector matching = GIT_VECTOR_INIT; - size_t i; - char sep = 0; - int error = 0; - - assert(repo && heads); - - entries = git__calloc(heads_len, sizeof(struct merge_msg_entry)); - GITERR_CHECK_ALLOC(entries); - - if (git_vector_init(&matching, heads_len, NULL) < 0) { - git__free(entries); - return -1; - } - - for (i = 0; i < heads_len; i++) - entries[i].merge_head = heads[i]; - - if ((error = git_buf_joinpath(&file_path, repo->path_repository, GIT_MERGE_MSG_FILE)) < 0 || - (error = git_filebuf_open(&file, file_path.ptr, GIT_FILEBUF_FORCE, GIT_MERGE_FILE_MODE)) < 0 || - (error = git_filebuf_write(&file, "Merge ", 6)) < 0) - goto cleanup; - - /* - * This is to emulate the format of MERGE_MSG by core git. - * - * Core git will write all the commits specified by OID, in the order - * provided, until the first named branch or tag is reached, at which - * point all branches will be written in the order provided, then all - * tags, then all remote tracking branches and finally all commits that - * were specified by OID that were not already written. - * - * Yes. Really. - */ - for (i = 0; i < heads_len; i++) { - if (!msg_entry_is_oid(&entries[i])) - break; - - if ((error = git_filebuf_printf(&file, - "%scommit '%s'", (i > 0) ? "; " : "", - entries[i].merge_head->id_str)) < 0) - goto cleanup; - - entries[i].written = 1; - } - - if (i) - sep = ';'; - - if ((error = merge_msg_entries(&matching, entries, heads_len, msg_entry_is_branch)) < 0 || - (error = merge_msg_write_branches(&file, &matching, sep)) < 0) - goto cleanup; - - if (matching.length) - sep =','; - - if ((error = merge_msg_entries(&matching, entries, heads_len, msg_entry_is_tracking)) < 0 || - (error = merge_msg_write_tracking(&file, &matching, sep)) < 0) - goto cleanup; - - if (matching.length) - sep =','; - - if ((error = merge_msg_entries(&matching, entries, heads_len, msg_entry_is_tag)) < 0 || - (error = merge_msg_write_tags(&file, &matching, sep)) < 0) - goto cleanup; - - if (matching.length) - sep =','; - - /* We should never be called with multiple remote branches, but handle - * it in case we are... */ - while ((error = merge_msg_entries(&matching, entries, heads_len, msg_entry_is_remote)) > 0) { - if ((error = merge_msg_write_remotes(&file, &matching, sep)) < 0) - goto cleanup; - - if (matching.length) - sep =','; - } - - if (error < 0) - goto cleanup; - - for (i = 0; i < heads_len; i++) { - if (merge_msg_entry_written(&entries[i])) - continue; - - if ((error = git_filebuf_printf(&file, "; commit '%s'", - entries[i].merge_head->id_str)) < 0) - goto cleanup; - } - - if ((error = git_filebuf_printf(&file, "\n")) < 0 || - (error = git_filebuf_commit(&file)) < 0) - goto cleanup; - -cleanup: - if (error < 0) - git_filebuf_cleanup(&file); - - git_buf_free(&file_path); - - git_vector_free(&matching); - git__free(entries); - - return error; -} - -int git_merge__setup( - git_repository *repo, - const git_annotated_commit *our_head, - const git_annotated_commit *heads[], - size_t heads_len) -{ - int error = 0; - - assert (repo && our_head && heads); - - if ((error = git_repository__set_orig_head(repo, git_annotated_commit_id(our_head))) == 0 && - (error = write_merge_head(repo, heads, heads_len)) == 0 && - (error = write_merge_mode(repo)) == 0) { - error = write_merge_msg(repo, heads, heads_len); - } - - return error; -} - -/* Merge branches */ - -static int merge_ancestor_head( - git_annotated_commit **ancestor_head, - git_repository *repo, - const git_annotated_commit *our_head, - const git_annotated_commit **their_heads, - size_t their_heads_len) -{ - git_oid *oids, ancestor_oid; - size_t i, alloc_len; - int error = 0; - - assert(repo && our_head && their_heads); - - GITERR_CHECK_ALLOC_ADD(&alloc_len, their_heads_len, 1); - oids = git__calloc(alloc_len, sizeof(git_oid)); - GITERR_CHECK_ALLOC(oids); - - git_oid_cpy(&oids[0], git_commit_id(our_head->commit)); - - for (i = 0; i < their_heads_len; i++) - git_oid_cpy(&oids[i + 1], git_annotated_commit_id(their_heads[i])); - - if ((error = git_merge_base_many(&ancestor_oid, repo, their_heads_len + 1, oids)) < 0) - goto on_error; - - error = git_annotated_commit_lookup(ancestor_head, repo, &ancestor_oid); - -on_error: - git__free(oids); - return error; -} - -const char *merge_their_label(const char *branchname) -{ - const char *slash; - - if ((slash = strrchr(branchname, '/')) == NULL) - return branchname; - - if (*(slash+1) == '\0') - return "theirs"; - - return slash+1; -} - -static int merge_normalize_checkout_opts( - git_checkout_options *out, - git_repository *repo, - const git_checkout_options *given_checkout_opts, - unsigned int checkout_strategy, - git_annotated_commit *ancestor, - const git_annotated_commit *our_head, - const git_annotated_commit **their_heads, - size_t their_heads_len) -{ - git_checkout_options default_checkout_opts = GIT_CHECKOUT_OPTIONS_INIT; - int error = 0; - - GIT_UNUSED(repo); - - if (given_checkout_opts != NULL) - memcpy(out, given_checkout_opts, sizeof(git_checkout_options)); - else - memcpy(out, &default_checkout_opts, sizeof(git_checkout_options)); - - out->checkout_strategy = checkout_strategy; - - if (!out->ancestor_label) { - if (ancestor && ancestor->type == GIT_ANNOTATED_COMMIT_REAL) - out->ancestor_label = git_commit_summary(ancestor->commit); - else if (ancestor) - out->ancestor_label = "merged common ancestors"; - else - out->ancestor_label = "empty base"; - } - - if (!out->our_label) { - if (our_head && our_head->ref_name) - out->our_label = our_head->ref_name; - else - out->our_label = "ours"; - } - - if (!out->their_label) { - if (their_heads_len == 1 && their_heads[0]->ref_name) - out->their_label = merge_their_label(their_heads[0]->ref_name); - else if (their_heads_len == 1) - out->their_label = their_heads[0]->id_str; - else - out->their_label = "theirs"; - } - - return error; -} - -static int merge_check_index(size_t *conflicts, git_repository *repo, git_index *index_new, git_vector *merged_paths) -{ - git_tree *head_tree = NULL; - git_index *index_repo = NULL; - git_iterator *iter_repo = NULL, *iter_new = NULL; - git_iterator_options iter_opts = GIT_ITERATOR_OPTIONS_INIT; - git_diff *staged_diff_list = NULL, *index_diff_list = NULL; - git_diff_delta *delta; - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - git_vector staged_paths = GIT_VECTOR_INIT; - size_t i; - int error = 0; - - GIT_UNUSED(merged_paths); - - *conflicts = 0; - - /* No staged changes may exist unless the change staged is identical to - * the result of the merge. This allows one to apply to merge manually, - * then run merge. Any other staged change would be overwritten by - * a reset merge. - */ - if ((error = git_repository_head_tree(&head_tree, repo)) < 0 || - (error = git_repository_index(&index_repo, repo)) < 0 || - (error = git_diff_tree_to_index(&staged_diff_list, repo, head_tree, index_repo, &opts)) < 0) - goto done; - - if (staged_diff_list->deltas.length == 0) - goto done; - - git_vector_foreach(&staged_diff_list->deltas, i, delta) { - if ((error = git_vector_insert(&staged_paths, (char *)delta->new_file.path)) < 0) - goto done; - } - - iter_opts.flags = GIT_ITERATOR_DONT_IGNORE_CASE; - iter_opts.pathlist.strings = (char **)staged_paths.contents; - iter_opts.pathlist.count = staged_paths.length; - - if ((error = git_iterator_for_index(&iter_repo, repo, index_repo, &iter_opts)) < 0 || - (error = git_iterator_for_index(&iter_new, repo, index_new, &iter_opts)) < 0 || - (error = git_diff__from_iterators(&index_diff_list, repo, iter_repo, iter_new, &opts)) < 0) - goto done; - - *conflicts = index_diff_list->deltas.length; - -done: - git_tree_free(head_tree); - git_index_free(index_repo); - git_iterator_free(iter_repo); - git_iterator_free(iter_new); - git_diff_free(staged_diff_list); - git_diff_free(index_diff_list); - git_vector_free(&staged_paths); - - return error; -} - -static int merge_check_workdir(size_t *conflicts, git_repository *repo, git_index *index_new, git_vector *merged_paths) -{ - git_diff *wd_diff_list = NULL; - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - int error = 0; - - GIT_UNUSED(index_new); - - *conflicts = 0; - - /* We need to have merged at least 1 file for the possibility to exist to - * have conflicts with the workdir. Passing 0 as the pathspec count paramter - * will consider all files in the working directory, that is, we may detect - * a conflict if there were untracked files in the workdir prior to starting - * the merge. This typically happens when cherry-picking a commmit whose - * changes have already been applied. - */ - if (merged_paths->length == 0) - return 0; - - opts.flags |= GIT_DIFF_INCLUDE_UNTRACKED; - - /* Workdir changes may exist iff they do not conflict with changes that - * will be applied by the merge (including conflicts). Ensure that there - * are no changes in the workdir to these paths. - */ - opts.flags |= GIT_DIFF_DISABLE_PATHSPEC_MATCH; - opts.pathspec.count = merged_paths->length; - opts.pathspec.strings = (char **)merged_paths->contents; - - if ((error = git_diff_index_to_workdir(&wd_diff_list, repo, NULL, &opts)) < 0) - goto done; - - *conflicts = wd_diff_list->deltas.length; - -done: - git_diff_free(wd_diff_list); - - return error; -} - -int git_merge__check_result(git_repository *repo, git_index *index_new) -{ - git_tree *head_tree = NULL; - git_iterator *iter_head = NULL, *iter_new = NULL; - git_iterator_options iter_opts = GIT_ITERATOR_OPTIONS_INIT; - git_diff *merged_list = NULL; - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - git_diff_delta *delta; - git_vector paths = GIT_VECTOR_INIT; - size_t i, index_conflicts = 0, wd_conflicts = 0, conflicts; - const git_index_entry *e; - int error = 0; - - iter_opts.flags = GIT_ITERATOR_DONT_IGNORE_CASE; - - if ((error = git_repository_head_tree(&head_tree, repo)) < 0 || - (error = git_iterator_for_tree(&iter_head, head_tree, &iter_opts)) < 0 || - (error = git_iterator_for_index(&iter_new, repo, index_new, &iter_opts)) < 0 || - (error = git_diff__from_iterators(&merged_list, repo, iter_head, iter_new, &opts)) < 0) - goto done; - - git_vector_foreach(&merged_list->deltas, i, delta) { - if ((error = git_vector_insert(&paths, (char *)delta->new_file.path)) < 0) - goto done; - } - - for (i = 0; i < git_index_entrycount(index_new); i++) { - e = git_index_get_byindex(index_new, i); - - if (git_index_entry_is_conflict(e) && - (git_vector_last(&paths) == NULL || - strcmp(git_vector_last(&paths), e->path) != 0)) { - - if ((error = git_vector_insert(&paths, (char *)e->path)) < 0) - goto done; - } - } - - /* Make sure the index and workdir state do not prevent merging */ - if ((error = merge_check_index(&index_conflicts, repo, index_new, &paths)) < 0 || - (error = merge_check_workdir(&wd_conflicts, repo, index_new, &paths)) < 0) - goto done; - - if ((conflicts = index_conflicts + wd_conflicts) > 0) { - giterr_set(GITERR_MERGE, "%" PRIuZ " uncommitted change%s would be overwritten by merge", - conflicts, (conflicts != 1) ? "s" : ""); - error = GIT_ECONFLICT; - } - -done: - git_vector_free(&paths); - git_tree_free(head_tree); - git_iterator_free(iter_head); - git_iterator_free(iter_new); - git_diff_free(merged_list); - - return error; -} - -int git_merge__append_conflicts_to_merge_msg( - git_repository *repo, - git_index *index) -{ - git_filebuf file = GIT_FILEBUF_INIT; - git_buf file_path = GIT_BUF_INIT; - const char *last = NULL; - size_t i; - int error; - - if (!git_index_has_conflicts(index)) - return 0; - - if ((error = git_buf_joinpath(&file_path, repo->path_repository, GIT_MERGE_MSG_FILE)) < 0 || - (error = git_filebuf_open(&file, file_path.ptr, GIT_FILEBUF_APPEND, GIT_MERGE_FILE_MODE)) < 0) - goto cleanup; - - git_filebuf_printf(&file, "\nConflicts:\n"); - - for (i = 0; i < git_index_entrycount(index); i++) { - const git_index_entry *e = git_index_get_byindex(index, i); - - if (!git_index_entry_is_conflict(e)) - continue; - - if (last == NULL || strcmp(e->path, last) != 0) - git_filebuf_printf(&file, "\t%s\n", e->path); - - last = e->path; - } - - error = git_filebuf_commit(&file); - -cleanup: - if (error < 0) - git_filebuf_cleanup(&file); - - git_buf_free(&file_path); - - return error; -} - -static int merge_state_cleanup(git_repository *repo) -{ - const char *state_files[] = { - GIT_MERGE_HEAD_FILE, - GIT_MERGE_MODE_FILE, - GIT_MERGE_MSG_FILE, - }; - - return git_repository__cleanup_files(repo, state_files, ARRAY_SIZE(state_files)); -} - -static int merge_heads( - git_annotated_commit **ancestor_head_out, - git_annotated_commit **our_head_out, - git_repository *repo, - const git_annotated_commit **their_heads, - size_t their_heads_len) -{ - git_annotated_commit *ancestor_head = NULL, *our_head = NULL; - git_reference *our_ref = NULL; - int error = 0; - - *ancestor_head_out = NULL; - *our_head_out = NULL; - - if ((error = git_repository__ensure_not_bare(repo, "merge")) < 0) - goto done; - - if ((error = git_reference_lookup(&our_ref, repo, GIT_HEAD_FILE)) < 0 || - (error = git_annotated_commit_from_ref(&our_head, repo, our_ref)) < 0) - goto done; - - if ((error = merge_ancestor_head(&ancestor_head, repo, our_head, their_heads, their_heads_len)) < 0) { - if (error != GIT_ENOTFOUND) - goto done; - - giterr_clear(); - error = 0; - } - - *ancestor_head_out = ancestor_head; - *our_head_out = our_head; - -done: - if (error < 0) { - git_annotated_commit_free(ancestor_head); - git_annotated_commit_free(our_head); - } - - git_reference_free(our_ref); - - return error; -} - -static int merge_preference(git_merge_preference_t *out, git_repository *repo) -{ - git_config *config; - const char *value; - int bool_value, error = 0; - - *out = GIT_MERGE_PREFERENCE_NONE; - - if ((error = git_repository_config_snapshot(&config, repo)) < 0) - goto done; - - if ((error = git_config_get_string(&value, config, "merge.ff")) < 0) { - if (error == GIT_ENOTFOUND) { - giterr_clear(); - error = 0; - } - - goto done; - } - - if (git_config_parse_bool(&bool_value, value) == 0) { - if (!bool_value) - *out |= GIT_MERGE_PREFERENCE_NO_FASTFORWARD; - } else { - if (strcasecmp(value, "only") == 0) - *out |= GIT_MERGE_PREFERENCE_FASTFORWARD_ONLY; - } - -done: - git_config_free(config); - return error; -} - -int git_merge_analysis( - git_merge_analysis_t *analysis_out, - git_merge_preference_t *preference_out, - git_repository *repo, - const git_annotated_commit **their_heads, - size_t their_heads_len) -{ - git_annotated_commit *ancestor_head = NULL, *our_head = NULL; - int error = 0; - - assert(analysis_out && preference_out && repo && their_heads); - - if (their_heads_len != 1) { - giterr_set(GITERR_MERGE, "Can only merge a single branch"); - error = -1; - goto done; - } - - *analysis_out = GIT_MERGE_ANALYSIS_NONE; - - if ((error = merge_preference(preference_out, repo)) < 0) - goto done; - - if (git_repository_head_unborn(repo)) { - *analysis_out |= GIT_MERGE_ANALYSIS_FASTFORWARD | GIT_MERGE_ANALYSIS_UNBORN; - goto done; - } - - if ((error = merge_heads(&ancestor_head, &our_head, repo, their_heads, their_heads_len)) < 0) - goto done; - - /* We're up-to-date if we're trying to merge our own common ancestor. */ - if (ancestor_head && git_oid_equal( - git_annotated_commit_id(ancestor_head), git_annotated_commit_id(their_heads[0]))) - *analysis_out |= GIT_MERGE_ANALYSIS_UP_TO_DATE; - - /* We're fastforwardable if we're our own common ancestor. */ - else if (ancestor_head && git_oid_equal( - git_annotated_commit_id(ancestor_head), git_annotated_commit_id(our_head))) - *analysis_out |= GIT_MERGE_ANALYSIS_FASTFORWARD | GIT_MERGE_ANALYSIS_NORMAL; - - /* Otherwise, just a normal merge is possible. */ - else - *analysis_out |= GIT_MERGE_ANALYSIS_NORMAL; - -done: - git_annotated_commit_free(ancestor_head); - git_annotated_commit_free(our_head); - return error; -} - -int git_merge( - git_repository *repo, - const git_annotated_commit **their_heads, - size_t their_heads_len, - const git_merge_options *merge_opts, - const git_checkout_options *given_checkout_opts) -{ - git_reference *our_ref = NULL; - git_checkout_options checkout_opts; - git_annotated_commit *our_head = NULL, *base = NULL; - git_index *index = NULL; - git_indexwriter indexwriter = GIT_INDEXWRITER_INIT; - unsigned int checkout_strategy; - int error = 0; - - assert(repo && their_heads); - - if (their_heads_len != 1) { - giterr_set(GITERR_MERGE, "Can only merge a single branch"); - return -1; - } - - if ((error = git_repository__ensure_not_bare(repo, "merge")) < 0) - goto done; - - checkout_strategy = given_checkout_opts ? - given_checkout_opts->checkout_strategy : - GIT_CHECKOUT_SAFE; - - if ((error = git_indexwriter_init_for_operation(&indexwriter, repo, - &checkout_strategy)) < 0) - goto done; - - /* Write the merge setup files to the repository. */ - if ((error = git_annotated_commit_from_head(&our_head, repo)) < 0 || - (error = git_merge__setup(repo, our_head, their_heads, - their_heads_len)) < 0) - goto done; - - /* TODO: octopus */ - - if ((error = merge_annotated_commits(&index, &base, repo, our_head, - (git_annotated_commit *)their_heads[0], 0, merge_opts)) < 0 || - (error = git_merge__check_result(repo, index)) < 0 || - (error = git_merge__append_conflicts_to_merge_msg(repo, index)) < 0) - goto done; - - /* check out the merge results */ - - if ((error = merge_normalize_checkout_opts(&checkout_opts, repo, - given_checkout_opts, checkout_strategy, - base, our_head, their_heads, their_heads_len)) < 0 || - (error = git_checkout_index(repo, index, &checkout_opts)) < 0) - goto done; - - error = git_indexwriter_commit(&indexwriter); - -done: - if (error < 0) - merge_state_cleanup(repo); - - git_indexwriter_cleanup(&indexwriter); - git_index_free(index); - git_annotated_commit_free(our_head); - git_annotated_commit_free(base); - git_reference_free(our_ref); - - return error; -} - -int git_merge_init_options(git_merge_options *opts, unsigned int version) -{ - GIT_INIT_STRUCTURE_FROM_TEMPLATE( - opts, version, git_merge_options, GIT_MERGE_OPTIONS_INIT); - return 0; -} - -int git_merge_file_init_input(git_merge_file_input *input, unsigned int version) -{ - GIT_INIT_STRUCTURE_FROM_TEMPLATE( - input, version, git_merge_file_input, GIT_MERGE_FILE_INPUT_INIT); - return 0; -} - -int git_merge_file_init_options( - git_merge_file_options *opts, unsigned int version) -{ - GIT_INIT_STRUCTURE_FROM_TEMPLATE( - opts, version, git_merge_file_options, GIT_MERGE_FILE_OPTIONS_INIT); - return 0; -} diff --git a/vendor/libgit2/src/merge.h b/vendor/libgit2/src/merge.h deleted file mode 100644 index bd839be49..000000000 --- a/vendor/libgit2/src/merge.h +++ /dev/null @@ -1,155 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_merge_h__ -#define INCLUDE_merge_h__ - -#include "vector.h" -#include "commit_list.h" -#include "pool.h" -#include "iterator.h" - -#include "git2/merge.h" -#include "git2/types.h" - -#define GIT_MERGE_MSG_FILE "MERGE_MSG" -#define GIT_MERGE_MODE_FILE "MERGE_MODE" -#define GIT_MERGE_FILE_MODE 0666 - -#define GIT_MERGE_DEFAULT_RENAME_THRESHOLD 50 -#define GIT_MERGE_DEFAULT_TARGET_LIMIT 1000 - -/** Types of changes when files are merged from branch to branch. */ -typedef enum { - /* No conflict - a change only occurs in one branch. */ - GIT_MERGE_DIFF_NONE = 0, - - /* Occurs when a file is modified in both branches. */ - GIT_MERGE_DIFF_BOTH_MODIFIED = (1 << 0), - - /* Occurs when a file is added in both branches. */ - GIT_MERGE_DIFF_BOTH_ADDED = (1 << 1), - - /* Occurs when a file is deleted in both branches. */ - GIT_MERGE_DIFF_BOTH_DELETED = (1 << 2), - - /* Occurs when a file is modified in one branch and deleted in the other. */ - GIT_MERGE_DIFF_MODIFIED_DELETED = (1 << 3), - - /* Occurs when a file is renamed in one branch and modified in the other. */ - GIT_MERGE_DIFF_RENAMED_MODIFIED = (1 << 4), - - /* Occurs when a file is renamed in one branch and deleted in the other. */ - GIT_MERGE_DIFF_RENAMED_DELETED = (1 << 5), - - /* Occurs when a file is renamed in one branch and a file with the same - * name is added in the other. Eg, A->B and new file B. Core git calls - * this a "rename/delete". */ - GIT_MERGE_DIFF_RENAMED_ADDED = (1 << 6), - - /* Occurs when both a file is renamed to the same name in the ours and - * theirs branches. Eg, A->B and A->B in both. Automergeable. */ - GIT_MERGE_DIFF_BOTH_RENAMED = (1 << 7), - - /* Occurs when a file is renamed to different names in the ours and theirs - * branches. Eg, A->B and A->C. */ - GIT_MERGE_DIFF_BOTH_RENAMED_1_TO_2 = (1 << 8), - - /* Occurs when two files are renamed to the same name in the ours and - * theirs branches. Eg, A->C and B->C. */ - GIT_MERGE_DIFF_BOTH_RENAMED_2_TO_1 = (1 << 9), - - /* Occurs when an item at a path in one branch is a directory, and an - * item at the same path in a different branch is a file. */ - GIT_MERGE_DIFF_DIRECTORY_FILE = (1 << 10), - - /* The child of a folder that is in a directory/file conflict. */ - GIT_MERGE_DIFF_DF_CHILD = (1 << 11), -} git_merge_diff_type_t; - - -typedef struct { - git_repository *repo; - git_pool pool; - - /* Vector of git_index_entry that represent the merged items that - * have been staged, either because only one side changed, or because - * the two changes were non-conflicting and mergeable. These items - * will be written as staged entries in the main index. - */ - git_vector staged; - - /* Vector of git_merge_diff entries that represent the conflicts that - * have not been automerged. These items will be written to high-stage - * entries in the main index. - */ - git_vector conflicts; - - /* Vector of git_merge_diff that have been automerged. These items - * will be written to the REUC when the index is produced. - */ - git_vector resolved; -} git_merge_diff_list; - -/** - * Description of changes to one file across three trees. - */ -typedef struct { - git_merge_diff_type_t type; - - git_index_entry ancestor_entry; - - git_index_entry our_entry; - git_delta_t our_status; - - git_index_entry their_entry; - git_delta_t their_status; - -} git_merge_diff; - -int git_merge__bases_many( - git_commit_list **out, - git_revwalk *walk, - git_commit_list_node *one, - git_vector *twos); - -/* - * Three-way tree differencing - */ - -git_merge_diff_list *git_merge_diff_list__alloc(git_repository *repo); - -int git_merge_diff_list__find_differences( - git_merge_diff_list *merge_diff_list, - git_iterator *ancestor_iterator, - git_iterator *ours_iter, - git_iterator *theirs_iter); - -int git_merge_diff_list__find_renames(git_repository *repo, git_merge_diff_list *merge_diff_list, const git_merge_options *opts); - -void git_merge_diff_list__free(git_merge_diff_list *diff_list); - -/* Merge metadata setup */ - -int git_merge__setup( - git_repository *repo, - const git_annotated_commit *our_head, - const git_annotated_commit *heads[], - size_t heads_len); - -int git_merge__iterators( - git_index **out, - git_repository *repo, - git_iterator *ancestor_iter, - git_iterator *our_iter, - git_iterator *their_iter, - const git_merge_options *given_opts); - -int git_merge__check_result(git_repository *repo, git_index *index_new); - -int git_merge__append_conflicts_to_merge_msg(git_repository *repo, git_index *index); - -#endif diff --git a/vendor/libgit2/src/merge_file.c b/vendor/libgit2/src/merge_file.c deleted file mode 100644 index 6d4738065..000000000 --- a/vendor/libgit2/src/merge_file.c +++ /dev/null @@ -1,346 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "common.h" -#include "repository.h" -#include "posix.h" -#include "fileops.h" -#include "index.h" -#include "diff_xdiff.h" - -#include "git2/repository.h" -#include "git2/object.h" -#include "git2/index.h" -#include "git2/merge.h" - -#include "xdiff/xdiff.h" - -/* only examine the first 8000 bytes for binaryness. - * https://github.com/git/git/blob/77bd3ea9f54f1584147b594abc04c26ca516d987/xdiff-interface.c#L197 - */ -#define GIT_MERGE_FILE_BINARY_SIZE 8000 - -#define GIT_MERGE_FILE_SIDE_EXISTS(X) ((X)->mode != 0) - -GIT_INLINE(const char *) merge_file_best_path( - const git_merge_file_input *ancestor, - const git_merge_file_input *ours, - const git_merge_file_input *theirs) -{ - if (!ancestor) { - if (ours && theirs && strcmp(ours->path, theirs->path) == 0) - return ours->path; - - return NULL; - } - - if (ours && strcmp(ancestor->path, ours->path) == 0) - return theirs ? theirs->path : NULL; - else if(theirs && strcmp(ancestor->path, theirs->path) == 0) - return ours ? ours->path : NULL; - - return NULL; -} - -GIT_INLINE(int) merge_file_best_mode( - const git_merge_file_input *ancestor, - const git_merge_file_input *ours, - const git_merge_file_input *theirs) -{ - /* - * If ancestor didn't exist and either ours or theirs is executable, - * assume executable. Otherwise, if any mode changed from the ancestor, - * use that one. - */ - if (!ancestor) { - if ((ours && ours->mode == GIT_FILEMODE_BLOB_EXECUTABLE) || - (theirs && theirs->mode == GIT_FILEMODE_BLOB_EXECUTABLE)) - return GIT_FILEMODE_BLOB_EXECUTABLE; - - return GIT_FILEMODE_BLOB; - } else if (ours && theirs) { - if (ancestor->mode == ours->mode) - return theirs->mode; - - return ours->mode; - } - - return 0; -} - -int git_merge_file__input_from_index( - git_merge_file_input *input_out, - git_odb_object **odb_object_out, - git_odb *odb, - const git_index_entry *entry) -{ - int error = 0; - - assert(input_out && odb_object_out && odb && entry); - - if ((error = git_odb_read(odb_object_out, odb, &entry->id)) < 0) - goto done; - - input_out->path = entry->path; - input_out->mode = entry->mode; - input_out->ptr = (char *)git_odb_object_data(*odb_object_out); - input_out->size = git_odb_object_size(*odb_object_out); - -done: - return error; -} - -static void merge_file_normalize_opts( - git_merge_file_options *out, - const git_merge_file_options *given_opts) -{ - if (given_opts) - memcpy(out, given_opts, sizeof(git_merge_file_options)); - else { - git_merge_file_options default_opts = GIT_MERGE_FILE_OPTIONS_INIT; - memcpy(out, &default_opts, sizeof(git_merge_file_options)); - } -} - -static int merge_file__xdiff( - git_merge_file_result *out, - const git_merge_file_input *ancestor, - const git_merge_file_input *ours, - const git_merge_file_input *theirs, - const git_merge_file_options *given_opts) -{ - xmparam_t xmparam; - mmfile_t ancestor_mmfile = {0}, our_mmfile = {0}, their_mmfile = {0}; - mmbuffer_t mmbuffer; - git_merge_file_options options = GIT_MERGE_FILE_OPTIONS_INIT; - const char *path; - int xdl_result; - int error = 0; - - memset(out, 0x0, sizeof(git_merge_file_result)); - - merge_file_normalize_opts(&options, given_opts); - - memset(&xmparam, 0x0, sizeof(xmparam_t)); - - if (ancestor) { - xmparam.ancestor = (options.ancestor_label) ? - options.ancestor_label : ancestor->path; - ancestor_mmfile.ptr = (char *)ancestor->ptr; - ancestor_mmfile.size = ancestor->size; - } - - xmparam.file1 = (options.our_label) ? - options.our_label : ours->path; - our_mmfile.ptr = (char *)ours->ptr; - our_mmfile.size = ours->size; - - xmparam.file2 = (options.their_label) ? - options.their_label : theirs->path; - their_mmfile.ptr = (char *)theirs->ptr; - their_mmfile.size = theirs->size; - - if (options.favor == GIT_MERGE_FILE_FAVOR_OURS) - xmparam.favor = XDL_MERGE_FAVOR_OURS; - else if (options.favor == GIT_MERGE_FILE_FAVOR_THEIRS) - xmparam.favor = XDL_MERGE_FAVOR_THEIRS; - else if (options.favor == GIT_MERGE_FILE_FAVOR_UNION) - xmparam.favor = XDL_MERGE_FAVOR_UNION; - - xmparam.level = (options.flags & GIT_MERGE_FILE_SIMPLIFY_ALNUM) ? - XDL_MERGE_ZEALOUS_ALNUM : XDL_MERGE_ZEALOUS; - - if (options.flags & GIT_MERGE_FILE_STYLE_DIFF3) - xmparam.style = XDL_MERGE_DIFF3; - - if (options.flags & GIT_MERGE_FILE_IGNORE_WHITESPACE) - xmparam.xpp.flags |= XDF_IGNORE_WHITESPACE; - if (options.flags & GIT_MERGE_FILE_IGNORE_WHITESPACE_CHANGE) - xmparam.xpp.flags |= XDF_IGNORE_WHITESPACE_CHANGE; - if (options.flags & GIT_MERGE_FILE_IGNORE_WHITESPACE_EOL) - xmparam.xpp.flags |= XDF_IGNORE_WHITESPACE_AT_EOL; - - if (options.flags & GIT_MERGE_FILE_DIFF_PATIENCE) - xmparam.xpp.flags |= XDF_PATIENCE_DIFF; - - if (options.flags & GIT_MERGE_FILE_DIFF_MINIMAL) - xmparam.xpp.flags |= XDF_NEED_MINIMAL; - - if ((xdl_result = xdl_merge(&ancestor_mmfile, &our_mmfile, - &their_mmfile, &xmparam, &mmbuffer)) < 0) { - giterr_set(GITERR_MERGE, "Failed to merge files."); - error = -1; - goto done; - } - - if ((path = merge_file_best_path(ancestor, ours, theirs)) != NULL && - (out->path = strdup(path)) == NULL) { - error = -1; - goto done; - } - - out->automergeable = (xdl_result == 0); - out->ptr = (const char *)mmbuffer.ptr; - out->len = mmbuffer.size; - out->mode = merge_file_best_mode(ancestor, ours, theirs); - -done: - if (error < 0) - git_merge_file_result_free(out); - - return error; -} - -static bool merge_file__is_binary(const git_merge_file_input *file) -{ - size_t len = file ? file->size : 0; - - if (len > GIT_XDIFF_MAX_SIZE) - return true; - if (len > GIT_MERGE_FILE_BINARY_SIZE) - len = GIT_MERGE_FILE_BINARY_SIZE; - - return len ? (memchr(file->ptr, 0, len) != NULL) : false; -} - -static int merge_file__binary( - git_merge_file_result *out, - const git_merge_file_input *ours, - const git_merge_file_input *theirs, - const git_merge_file_options *given_opts) -{ - const git_merge_file_input *favored = NULL; - - memset(out, 0x0, sizeof(git_merge_file_result)); - - if (given_opts && given_opts->favor == GIT_MERGE_FILE_FAVOR_OURS) - favored = ours; - else if (given_opts && given_opts->favor == GIT_MERGE_FILE_FAVOR_THEIRS) - favored = theirs; - else - goto done; - - if ((out->path = git__strdup(favored->path)) == NULL || - (out->ptr = git__malloc(favored->size)) == NULL) - goto done; - - memcpy((char *)out->ptr, favored->ptr, favored->size); - out->len = favored->size; - out->mode = favored->mode; - out->automergeable = 1; - -done: - return 0; -} - -static int merge_file__from_inputs( - git_merge_file_result *out, - const git_merge_file_input *ancestor, - const git_merge_file_input *ours, - const git_merge_file_input *theirs, - const git_merge_file_options *given_opts) -{ - if (merge_file__is_binary(ancestor) || - merge_file__is_binary(ours) || - merge_file__is_binary(theirs)) - return merge_file__binary(out, ours, theirs, given_opts); - - return merge_file__xdiff(out, ancestor, ours, theirs, given_opts); -} - -static git_merge_file_input *git_merge_file__normalize_inputs( - git_merge_file_input *out, - const git_merge_file_input *given) -{ - memcpy(out, given, sizeof(git_merge_file_input)); - - if (!out->path) - out->path = "file.txt"; - - if (!out->mode) - out->mode = 0100644; - - return out; -} - -int git_merge_file( - git_merge_file_result *out, - const git_merge_file_input *ancestor, - const git_merge_file_input *ours, - const git_merge_file_input *theirs, - const git_merge_file_options *options) -{ - git_merge_file_input inputs[3] = { {0} }; - - assert(out && ours && theirs); - - memset(out, 0x0, sizeof(git_merge_file_result)); - - if (ancestor) - ancestor = git_merge_file__normalize_inputs(&inputs[0], ancestor); - - ours = git_merge_file__normalize_inputs(&inputs[1], ours); - theirs = git_merge_file__normalize_inputs(&inputs[2], theirs); - - return merge_file__from_inputs(out, ancestor, ours, theirs, options); -} - -int git_merge_file_from_index( - git_merge_file_result *out, - git_repository *repo, - const git_index_entry *ancestor, - const git_index_entry *ours, - const git_index_entry *theirs, - const git_merge_file_options *options) -{ - git_merge_file_input *ancestor_ptr = NULL, - ancestor_input = {0}, our_input = {0}, their_input = {0}; - git_odb *odb = NULL; - git_odb_object *odb_object[3] = { 0 }; - int error = 0; - - assert(out && repo && ours && theirs); - - memset(out, 0x0, sizeof(git_merge_file_result)); - - if ((error = git_repository_odb(&odb, repo)) < 0) - goto done; - - if (ancestor) { - if ((error = git_merge_file__input_from_index( - &ancestor_input, &odb_object[0], odb, ancestor)) < 0) - goto done; - - ancestor_ptr = &ancestor_input; - } - - if ((error = git_merge_file__input_from_index( - &our_input, &odb_object[1], odb, ours)) < 0 || - (error = git_merge_file__input_from_index( - &their_input, &odb_object[2], odb, theirs)) < 0) - goto done; - - error = merge_file__from_inputs(out, - ancestor_ptr, &our_input, &their_input, options); - -done: - git_odb_object_free(odb_object[0]); - git_odb_object_free(odb_object[1]); - git_odb_object_free(odb_object[2]); - git_odb_free(odb); - - return error; -} - -void git_merge_file_result_free(git_merge_file_result *result) -{ - if (result == NULL) - return; - - git__free((char *)result->path); - git__free((char *)result->ptr); -} diff --git a/vendor/libgit2/src/message.c b/vendor/libgit2/src/message.c deleted file mode 100644 index 6c5a2379f..000000000 --- a/vendor/libgit2/src/message.c +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "message.h" - -static size_t line_length_without_trailing_spaces(const char *line, size_t len) -{ - while (len) { - unsigned char c = line[len - 1]; - if (!git__isspace(c)) - break; - len--; - } - - return len; -} - -/* Greatly inspired from git.git "stripspace" */ -/* see https://github.com/git/git/blob/497215d8811ac7b8955693ceaad0899ecd894ed2/builtin/stripspace.c#L4-67 */ -int git_message_prettify(git_buf *message_out, const char *message, int strip_comments, char comment_char) -{ - const size_t message_len = strlen(message); - - int consecutive_empty_lines = 0; - size_t i, line_length, rtrimmed_line_length; - char *next_newline; - - git_buf_sanitize(message_out); - - for (i = 0; i < strlen(message); i += line_length) { - next_newline = memchr(message + i, '\n', message_len - i); - - if (next_newline != NULL) { - line_length = next_newline - (message + i) + 1; - } else { - line_length = message_len - i; - } - - if (strip_comments && line_length && message[i] == comment_char) - continue; - - rtrimmed_line_length = line_length_without_trailing_spaces(message + i, line_length); - - if (!rtrimmed_line_length) { - consecutive_empty_lines++; - continue; - } - - if (consecutive_empty_lines > 0 && message_out->size > 0) - git_buf_putc(message_out, '\n'); - - consecutive_empty_lines = 0; - git_buf_put(message_out, message + i, rtrimmed_line_length); - git_buf_putc(message_out, '\n'); - } - - return git_buf_oom(message_out) ? -1 : 0; -} diff --git a/vendor/libgit2/src/message.h b/vendor/libgit2/src/message.h deleted file mode 100644 index 3c4b8dc45..000000000 --- a/vendor/libgit2/src/message.h +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_message_h__ -#define INCLUDE_message_h__ - -#include "git2/message.h" -#include "buffer.h" - -int git_message__prettify(git_buf *message_out, const char *message, int strip_comments); - -#endif /* INCLUDE_message_h__ */ diff --git a/vendor/libgit2/src/mwindow.c b/vendor/libgit2/src/mwindow.c deleted file mode 100644 index d3e9be78b..000000000 --- a/vendor/libgit2/src/mwindow.c +++ /dev/null @@ -1,440 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "common.h" -#include "mwindow.h" -#include "vector.h" -#include "fileops.h" -#include "map.h" -#include "global.h" -#include "strmap.h" -#include "pack.h" - -GIT__USE_STRMAP - -#define DEFAULT_WINDOW_SIZE \ - (sizeof(void*) >= 8 \ - ? 1 * 1024 * 1024 * 1024 \ - : 32 * 1024 * 1024) - -#define DEFAULT_MAPPED_LIMIT \ - ((1024 * 1024) * (sizeof(void*) >= 8 ? 8192ULL : 256UL)) - -size_t git_mwindow__window_size = DEFAULT_WINDOW_SIZE; -size_t git_mwindow__mapped_limit = DEFAULT_MAPPED_LIMIT; - -/* Whenever you want to read or modify this, grab git__mwindow_mutex */ -static git_mwindow_ctl mem_ctl; - -/* Global list of mwindow files, to open packs once across repos */ -git_strmap *git__pack_cache = NULL; - -/** - * Run under mwindow lock - */ -int git_mwindow_files_init(void) -{ - if (git__pack_cache) - return 0; - - git__on_shutdown(git_mwindow_files_free); - - return git_strmap_alloc(&git__pack_cache); -} - -void git_mwindow_files_free(void) -{ - git_strmap *tmp = git__pack_cache; - - git__pack_cache = NULL; - git_strmap_free(tmp); -} - -int git_mwindow_get_pack(struct git_pack_file **out, const char *path) -{ - int error; - char *packname; - git_strmap_iter pos; - struct git_pack_file *pack; - - if ((error = git_packfile__name(&packname, path)) < 0) - return error; - - if (git_mutex_lock(&git__mwindow_mutex) < 0) { - giterr_set(GITERR_OS, "failed to lock mwindow mutex"); - return -1; - } - - if (git_mwindow_files_init() < 0) { - git_mutex_unlock(&git__mwindow_mutex); - git__free(packname); - return -1; - } - - pos = git_strmap_lookup_index(git__pack_cache, packname); - git__free(packname); - - if (git_strmap_valid_index(git__pack_cache, pos)) { - pack = git_strmap_value_at(git__pack_cache, pos); - git_atomic_inc(&pack->refcount); - - git_mutex_unlock(&git__mwindow_mutex); - *out = pack; - return 0; - } - - /* If we didn't find it, we need to create it */ - if ((error = git_packfile_alloc(&pack, path)) < 0) { - git_mutex_unlock(&git__mwindow_mutex); - return error; - } - - git_atomic_inc(&pack->refcount); - - git_strmap_insert(git__pack_cache, pack->pack_name, pack, error); - git_mutex_unlock(&git__mwindow_mutex); - - if (error < 0) { - git_packfile_free(pack); - return -1; - } - - *out = pack; - return 0; -} - -void git_mwindow_put_pack(struct git_pack_file *pack) -{ - int count; - git_strmap_iter pos; - - if (git_mutex_lock(&git__mwindow_mutex) < 0) - return; - - /* put before get would be a corrupted state */ - assert(git__pack_cache); - - pos = git_strmap_lookup_index(git__pack_cache, pack->pack_name); - /* if we cannot find it, the state is corrupted */ - assert(git_strmap_valid_index(git__pack_cache, pos)); - - count = git_atomic_dec(&pack->refcount); - if (count == 0) { - git_strmap_delete_at(git__pack_cache, pos); - git_packfile_free(pack); - } - - git_mutex_unlock(&git__mwindow_mutex); - return; -} - -void git_mwindow_free_all(git_mwindow_file *mwf) -{ - if (git_mutex_lock(&git__mwindow_mutex)) { - giterr_set(GITERR_THREAD, "unable to lock mwindow mutex"); - return; - } - - git_mwindow_free_all_locked(mwf); - - git_mutex_unlock(&git__mwindow_mutex); -} - -/* - * Free all the windows in a sequence, typically because we're done - * with the file - */ -void git_mwindow_free_all_locked(git_mwindow_file *mwf) -{ - git_mwindow_ctl *ctl = &mem_ctl; - size_t i; - - /* - * Remove these windows from the global list - */ - for (i = 0; i < ctl->windowfiles.length; ++i){ - if (git_vector_get(&ctl->windowfiles, i) == mwf) { - git_vector_remove(&ctl->windowfiles, i); - break; - } - } - - if (ctl->windowfiles.length == 0) { - git_vector_free(&ctl->windowfiles); - ctl->windowfiles.contents = NULL; - } - - while (mwf->windows) { - git_mwindow *w = mwf->windows; - assert(w->inuse_cnt == 0); - - ctl->mapped -= w->window_map.len; - ctl->open_windows--; - - git_futils_mmap_free(&w->window_map); - - mwf->windows = w->next; - git__free(w); - } -} - -/* - * Check if a window 'win' contains the address 'offset' - */ -int git_mwindow_contains(git_mwindow *win, git_off_t offset) -{ - git_off_t win_off = win->offset; - return win_off <= offset - && offset <= (git_off_t)(win_off + win->window_map.len); -} - -/* - * Find the least-recently-used window in a file - */ -static void git_mwindow_scan_lru( - git_mwindow_file *mwf, - git_mwindow **lru_w, - git_mwindow **lru_l) -{ - git_mwindow *w, *w_l; - - for (w_l = NULL, w = mwf->windows; w; w = w->next) { - if (!w->inuse_cnt) { - /* - * If the current one is more recent than the last one, - * store it in the output parameter. If lru_w is NULL, - * it's the first loop, so store it as well. - */ - if (!*lru_w || w->last_used < (*lru_w)->last_used) { - *lru_w = w; - *lru_l = w_l; - } - } - w_l = w; - } -} - -/* - * Close the least recently used window. You should check to see if - * the file descriptors need closing from time to time. Called under - * lock from new_window. - */ -static int git_mwindow_close_lru(git_mwindow_file *mwf) -{ - git_mwindow_ctl *ctl = &mem_ctl; - size_t i; - git_mwindow *lru_w = NULL, *lru_l = NULL, **list = &mwf->windows; - - /* FIXME: Does this give us any advantage? */ - if(mwf->windows) - git_mwindow_scan_lru(mwf, &lru_w, &lru_l); - - for (i = 0; i < ctl->windowfiles.length; ++i) { - git_mwindow *last = lru_w; - git_mwindow_file *cur = git_vector_get(&ctl->windowfiles, i); - git_mwindow_scan_lru(cur, &lru_w, &lru_l); - if (lru_w != last) - list = &cur->windows; - } - - if (!lru_w) { - giterr_set(GITERR_OS, "Failed to close memory window. Couldn't find LRU"); - return -1; - } - - ctl->mapped -= lru_w->window_map.len; - git_futils_mmap_free(&lru_w->window_map); - - if (lru_l) - lru_l->next = lru_w->next; - else - *list = lru_w->next; - - git__free(lru_w); - ctl->open_windows--; - - return 0; -} - -/* This gets called under lock from git_mwindow_open */ -static git_mwindow *new_window( - git_mwindow_file *mwf, - git_file fd, - git_off_t size, - git_off_t offset) -{ - git_mwindow_ctl *ctl = &mem_ctl; - size_t walign = git_mwindow__window_size / 2; - git_off_t len; - git_mwindow *w; - - w = git__malloc(sizeof(*w)); - - if (w == NULL) - return NULL; - - memset(w, 0x0, sizeof(*w)); - w->offset = (offset / walign) * walign; - - len = size - w->offset; - if (len > (git_off_t)git_mwindow__window_size) - len = (git_off_t)git_mwindow__window_size; - - ctl->mapped += (size_t)len; - - while (git_mwindow__mapped_limit < ctl->mapped && - git_mwindow_close_lru(mwf) == 0) /* nop */; - - /* - * We treat `mapped_limit` as a soft limit. If we can't find a - * window to close and are above the limit, we still mmap the new - * window. - */ - - if (git_futils_mmap_ro(&w->window_map, fd, w->offset, (size_t)len) < 0) { - /* - * The first error might be down to memory fragmentation even if - * we're below our soft limits, so free up what we can and try again. - */ - - while (git_mwindow_close_lru(mwf) == 0) - /* nop */; - - if (git_futils_mmap_ro(&w->window_map, fd, w->offset, (size_t)len) < 0) { - git__free(w); - return NULL; - } - } - - ctl->mmap_calls++; - ctl->open_windows++; - - if (ctl->mapped > ctl->peak_mapped) - ctl->peak_mapped = ctl->mapped; - - if (ctl->open_windows > ctl->peak_open_windows) - ctl->peak_open_windows = ctl->open_windows; - - return w; -} - -/* - * Open a new window, closing the least recenty used until we have - * enough space. Don't forget to add it to your list - */ -unsigned char *git_mwindow_open( - git_mwindow_file *mwf, - git_mwindow **cursor, - git_off_t offset, - size_t extra, - unsigned int *left) -{ - git_mwindow_ctl *ctl = &mem_ctl; - git_mwindow *w = *cursor; - - if (git_mutex_lock(&git__mwindow_mutex)) { - giterr_set(GITERR_THREAD, "unable to lock mwindow mutex"); - return NULL; - } - - if (!w || !(git_mwindow_contains(w, offset) && git_mwindow_contains(w, offset + extra))) { - if (w) { - w->inuse_cnt--; - } - - for (w = mwf->windows; w; w = w->next) { - if (git_mwindow_contains(w, offset) && - git_mwindow_contains(w, offset + extra)) - break; - } - - /* - * If there isn't a suitable window, we need to create a new - * one. - */ - if (!w) { - w = new_window(mwf, mwf->fd, mwf->size, offset); - if (w == NULL) { - git_mutex_unlock(&git__mwindow_mutex); - return NULL; - } - w->next = mwf->windows; - mwf->windows = w; - } - } - - /* If we changed w, store it in the cursor */ - if (w != *cursor) { - w->last_used = ctl->used_ctr++; - w->inuse_cnt++; - *cursor = w; - } - - offset -= w->offset; - - if (left) - *left = (unsigned int)(w->window_map.len - offset); - - git_mutex_unlock(&git__mwindow_mutex); - return (unsigned char *) w->window_map.data + offset; -} - -int git_mwindow_file_register(git_mwindow_file *mwf) -{ - git_mwindow_ctl *ctl = &mem_ctl; - int ret; - - if (git_mutex_lock(&git__mwindow_mutex)) { - giterr_set(GITERR_THREAD, "unable to lock mwindow mutex"); - return -1; - } - - if (ctl->windowfiles.length == 0 && - git_vector_init(&ctl->windowfiles, 8, NULL) < 0) { - git_mutex_unlock(&git__mwindow_mutex); - return -1; - } - - ret = git_vector_insert(&ctl->windowfiles, mwf); - git_mutex_unlock(&git__mwindow_mutex); - - return ret; -} - -void git_mwindow_file_deregister(git_mwindow_file *mwf) -{ - git_mwindow_ctl *ctl = &mem_ctl; - git_mwindow_file *cur; - size_t i; - - if (git_mutex_lock(&git__mwindow_mutex)) - return; - - git_vector_foreach(&ctl->windowfiles, i, cur) { - if (cur == mwf) { - git_vector_remove(&ctl->windowfiles, i); - git_mutex_unlock(&git__mwindow_mutex); - return; - } - } - git_mutex_unlock(&git__mwindow_mutex); -} - -void git_mwindow_close(git_mwindow **window) -{ - git_mwindow *w = *window; - if (w) { - if (git_mutex_lock(&git__mwindow_mutex)) { - giterr_set(GITERR_THREAD, "unable to lock mwindow mutex"); - return; - } - - w->inuse_cnt--; - git_mutex_unlock(&git__mwindow_mutex); - *window = NULL; - } -} diff --git a/vendor/libgit2/src/mwindow.h b/vendor/libgit2/src/mwindow.h deleted file mode 100644 index 63418e458..000000000 --- a/vendor/libgit2/src/mwindow.h +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#ifndef INCLUDE_mwindow__ -#define INCLUDE_mwindow__ - -#include "map.h" -#include "vector.h" - -typedef struct git_mwindow { - struct git_mwindow *next; - git_map window_map; - git_off_t offset; - size_t last_used; - size_t inuse_cnt; -} git_mwindow; - -typedef struct git_mwindow_file { - git_mwindow *windows; - int fd; - git_off_t size; -} git_mwindow_file; - -typedef struct git_mwindow_ctl { - size_t mapped; - unsigned int open_windows; - unsigned int mmap_calls; - unsigned int peak_open_windows; - size_t peak_mapped; - size_t used_ctr; - git_vector windowfiles; -} git_mwindow_ctl; - -int git_mwindow_contains(git_mwindow *win, git_off_t offset); -void git_mwindow_free_all(git_mwindow_file *mwf); /* locks */ -void git_mwindow_free_all_locked(git_mwindow_file *mwf); /* run under lock */ -unsigned char *git_mwindow_open(git_mwindow_file *mwf, git_mwindow **cursor, git_off_t offset, size_t extra, unsigned int *left); -int git_mwindow_file_register(git_mwindow_file *mwf); -void git_mwindow_file_deregister(git_mwindow_file *mwf); -void git_mwindow_close(git_mwindow **w_cursor); - -int git_mwindow_files_init(void); -void git_mwindow_files_free(void); - -struct git_pack_file; /* just declaration to avoid cyclical includes */ -int git_mwindow_get_pack(struct git_pack_file **out, const char *path); -void git_mwindow_put_pack(struct git_pack_file *pack); - -#endif diff --git a/vendor/libgit2/src/netops.c b/vendor/libgit2/src/netops.c deleted file mode 100644 index c4241989f..000000000 --- a/vendor/libgit2/src/netops.c +++ /dev/null @@ -1,286 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include -#include "git2/errors.h" - -#include "common.h" -#include "netops.h" -#include "posix.h" -#include "buffer.h" -#include "http_parser.h" -#include "global.h" - -int gitno_recv(gitno_buffer *buf) -{ - return buf->recv(buf); -} - -void gitno_buffer_setup_callback( - gitno_buffer *buf, - char *data, - size_t len, - int (*recv)(gitno_buffer *buf), void *cb_data) -{ - memset(data, 0x0, len); - buf->data = data; - buf->len = len; - buf->offset = 0; - buf->recv = recv; - buf->cb_data = cb_data; -} - -static int recv_stream(gitno_buffer *buf) -{ - git_stream *io = (git_stream *) buf->cb_data; - int ret; - - ret = git_stream_read(io, buf->data + buf->offset, buf->len - buf->offset); - if (ret < 0) - return -1; - - buf->offset += ret; - return ret; -} - -void gitno_buffer_setup_fromstream(git_stream *st, gitno_buffer *buf, char *data, size_t len) -{ - memset(data, 0x0, len); - buf->data = data; - buf->len = len; - buf->offset = 0; - buf->recv = recv_stream; - buf->cb_data = st; -} - -/* Consume up to ptr and move the rest of the buffer to the beginning */ -void gitno_consume(gitno_buffer *buf, const char *ptr) -{ - size_t consumed; - - assert(ptr - buf->data >= 0); - assert(ptr - buf->data <= (int) buf->len); - - consumed = ptr - buf->data; - - memmove(buf->data, ptr, buf->offset - consumed); - memset(buf->data + buf->offset, 0x0, buf->len - buf->offset); - buf->offset -= consumed; -} - -/* Consume const bytes and move the rest of the buffer to the beginning */ -void gitno_consume_n(gitno_buffer *buf, size_t cons) -{ - memmove(buf->data, buf->data + cons, buf->len - buf->offset); - memset(buf->data + cons, 0x0, buf->len - buf->offset); - buf->offset -= cons; -} - -/* Match host names according to RFC 2818 rules */ -int gitno__match_host(const char *pattern, const char *host) -{ - for (;;) { - char c = git__tolower(*pattern++); - - if (c == '\0') - return *host ? -1 : 0; - - if (c == '*') { - c = *pattern; - /* '*' at the end matches everything left */ - if (c == '\0') - return 0; - - /* - * We've found a pattern, so move towards the next matching - * char. The '.' is handled specially because wildcards aren't - * allowed to cross subdomains. - */ - - while(*host) { - char h = git__tolower(*host); - if (c == h) - return gitno__match_host(pattern, host++); - if (h == '.') - return gitno__match_host(pattern, host); - host++; - } - return -1; - } - - if (c != git__tolower(*host++)) - return -1; - } - - return -1; -} - -static const char *prefix_http = "http://"; -static const char *prefix_https = "https://"; - -int gitno_connection_data_from_url( - gitno_connection_data *data, - const char *url, - const char *service_suffix) -{ - int error = -1; - const char *default_port = NULL, *path_search_start = NULL; - char *original_host = NULL; - - /* service_suffix is optional */ - assert(data && url); - - /* Save these for comparison later */ - original_host = data->host; - data->host = NULL; - gitno_connection_data_free_ptrs(data); - - if (!git__prefixcmp(url, prefix_http)) { - path_search_start = url + strlen(prefix_http); - default_port = "80"; - - if (data->use_ssl) { - giterr_set(GITERR_NET, "Redirect from HTTPS to HTTP is not allowed"); - goto cleanup; - } - } else if (!git__prefixcmp(url, prefix_https)) { - path_search_start = url + strlen(prefix_https); - default_port = "443"; - data->use_ssl = true; - } else if (url[0] == '/') - default_port = data->use_ssl ? "443" : "80"; - - if (!default_port) { - giterr_set(GITERR_NET, "Unrecognized URL prefix"); - goto cleanup; - } - - error = gitno_extract_url_parts( - &data->host, &data->port, &data->path, &data->user, &data->pass, - url, default_port); - - if (url[0] == '/') { - /* Relative redirect; reuse original host name and port */ - path_search_start = url; - git__free(data->host); - data->host = original_host; - original_host = NULL; - } - - if (!error) { - const char *path = strchr(path_search_start, '/'); - size_t pathlen = strlen(path); - size_t suffixlen = service_suffix ? strlen(service_suffix) : 0; - - if (suffixlen && - !memcmp(path + pathlen - suffixlen, service_suffix, suffixlen)) { - git__free(data->path); - data->path = git__strndup(path, pathlen - suffixlen); - } else { - git__free(data->path); - data->path = git__strdup(path); - } - - /* Check for errors in the resulting data */ - if (original_host && url[0] != '/' && strcmp(original_host, data->host)) { - giterr_set(GITERR_NET, "Cross host redirect not allowed"); - error = -1; - } - } - -cleanup: - if (original_host) git__free(original_host); - return error; -} - -void gitno_connection_data_free_ptrs(gitno_connection_data *d) -{ - git__free(d->host); d->host = NULL; - git__free(d->port); d->port = NULL; - git__free(d->path); d->path = NULL; - git__free(d->user); d->user = NULL; - git__free(d->pass); d->pass = NULL; -} - -#define hex2c(c) ((c | 32) % 39 - 9) -static char* unescape(char *str) -{ - int x, y; - int len = (int)strlen(str); - - for (x=y=0; str[y]; ++x, ++y) { - if ((str[x] = str[y]) == '%') { - if (y < len-2 && isxdigit(str[y+1]) && isxdigit(str[y+2])) { - str[x] = (hex2c(str[y+1]) << 4) + hex2c(str[y+2]); - y += 2; - } - } - } - str[x] = '\0'; - return str; -} - -int gitno_extract_url_parts( - char **host, - char **port, - char **path, - char **username, - char **password, - const char *url, - const char *default_port) -{ - struct http_parser_url u = {0}; - const char *_host, *_port, *_path, *_userinfo; - - if (http_parser_parse_url(url, strlen(url), false, &u)) { - giterr_set(GITERR_NET, "Malformed URL '%s'", url); - return GIT_EINVALIDSPEC; - } - - _host = url+u.field_data[UF_HOST].off; - _port = url+u.field_data[UF_PORT].off; - _path = url+u.field_data[UF_PATH].off; - _userinfo = url+u.field_data[UF_USERINFO].off; - - if (u.field_set & (1 << UF_HOST)) { - *host = git__substrdup(_host, u.field_data[UF_HOST].len); - GITERR_CHECK_ALLOC(*host); - } - - if (u.field_set & (1 << UF_PORT)) - *port = git__substrdup(_port, u.field_data[UF_PORT].len); - else - *port = git__strdup(default_port); - GITERR_CHECK_ALLOC(*port); - - if (u.field_set & (1 << UF_PATH)) { - *path = git__substrdup(_path, u.field_data[UF_PATH].len); - GITERR_CHECK_ALLOC(*path); - } else { - git__free(*port); - *port = NULL; - git__free(*host); - *host = NULL; - giterr_set(GITERR_NET, "invalid url, missing path"); - return GIT_EINVALIDSPEC; - } - - if (u.field_set & (1 << UF_USERINFO)) { - const char *colon = memchr(_userinfo, ':', u.field_data[UF_USERINFO].len); - if (colon) { - *username = unescape(git__substrdup(_userinfo, colon - _userinfo)); - *password = unescape(git__substrdup(colon+1, u.field_data[UF_USERINFO].len - (colon+1-_userinfo))); - GITERR_CHECK_ALLOC(*password); - } else { - *username = git__substrdup(_userinfo, u.field_data[UF_USERINFO].len); - } - GITERR_CHECK_ALLOC(*username); - - } - - return 0; -} diff --git a/vendor/libgit2/src/netops.h b/vendor/libgit2/src/netops.h deleted file mode 100644 index b7170a0f2..000000000 --- a/vendor/libgit2/src/netops.h +++ /dev/null @@ -1,98 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_netops_h__ -#define INCLUDE_netops_h__ - -#include "posix.h" -#include "common.h" -#include "stream.h" - -#ifdef GIT_OPENSSL -# include -#endif - -typedef struct gitno_ssl { -#ifdef GIT_OPENSSL - SSL *ssl; -#else - size_t dummy; -#endif -} gitno_ssl; - -/* Represents a socket that may or may not be using SSL */ -typedef struct gitno_socket { - GIT_SOCKET socket; - gitno_ssl ssl; -} gitno_socket; - -typedef struct gitno_buffer { - char *data; - size_t len; - size_t offset; - int (*recv)(struct gitno_buffer *buffer); - void *cb_data; -} gitno_buffer; - -/* Flags to gitno_connect */ -enum { - /* Attempt to create an SSL connection. */ - GITNO_CONNECT_SSL = 1, -}; - -/** - * Check if the name in a cert matches the wanted hostname - * - * Check if a pattern from a certificate matches the hostname we - * wanted to connect to according to RFC2818 rules (which specifies - * HTTP over TLS). Mainly, an asterisk matches anything, but is - * limited to a single url component. - * - * Note that this does not set an error message. It expects the user - * to provide the message for the user. - */ -int gitno__match_host(const char *pattern, const char *host); - -void gitno_buffer_setup_fromstream(git_stream *st, gitno_buffer *buf, char *data, size_t len); -void gitno_buffer_setup_callback(gitno_buffer *buf, char *data, size_t len, int (*recv)(gitno_buffer *buf), void *cb_data); -int gitno_recv(gitno_buffer *buf); - -void gitno_consume(gitno_buffer *buf, const char *ptr); -void gitno_consume_n(gitno_buffer *buf, size_t cons); - -typedef struct gitno_connection_data { - char *host; - char *port; - char *path; - char *user; - char *pass; - bool use_ssl; -} gitno_connection_data; - -/* - * This replaces all the pointers in `data` with freshly-allocated strings, - * that the caller is responsible for freeing. - * `gitno_connection_data_free_ptrs` is good for this. - */ - -int gitno_connection_data_from_url( - gitno_connection_data *data, - const char *url, - const char *service_suffix); - -/* This frees all the pointers IN the struct, but not the struct itself. */ -void gitno_connection_data_free_ptrs(gitno_connection_data *data); - -int gitno_extract_url_parts( - char **host, - char **port, - char **path, - char **username, - char **password, - const char *url, - const char *default_port); - -#endif diff --git a/vendor/libgit2/src/notes.c b/vendor/libgit2/src/notes.c deleted file mode 100644 index fe8d2164f..000000000 --- a/vendor/libgit2/src/notes.c +++ /dev/null @@ -1,694 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "notes.h" - -#include "git2.h" -#include "refs.h" -#include "config.h" -#include "iterator.h" -#include "signature.h" - -static int note_error_notfound(void) -{ - giterr_set(GITERR_INVALID, "Note could not be found"); - return GIT_ENOTFOUND; -} - -static int find_subtree_in_current_level( - git_tree **out, - git_repository *repo, - git_tree *parent, - const char *annotated_object_sha, - int fanout) -{ - size_t i; - const git_tree_entry *entry; - - *out = NULL; - - if (parent == NULL) - return note_error_notfound(); - - for (i = 0; i < git_tree_entrycount(parent); i++) { - entry = git_tree_entry_byindex(parent, i); - - if (!git__ishex(git_tree_entry_name(entry))) - continue; - - if (S_ISDIR(git_tree_entry_filemode(entry)) - && strlen(git_tree_entry_name(entry)) == 2 - && !strncmp(git_tree_entry_name(entry), annotated_object_sha + fanout, 2)) - return git_tree_lookup(out, repo, git_tree_entry_id(entry)); - - /* Not a DIR, so do we have an already existing blob? */ - if (!strcmp(git_tree_entry_name(entry), annotated_object_sha + fanout)) - return GIT_EEXISTS; - } - - return note_error_notfound(); -} - -static int find_subtree_r(git_tree **out, git_tree *root, - git_repository *repo, const char *target, int *fanout) -{ - int error; - git_tree *subtree = NULL; - - *out = NULL; - - error = find_subtree_in_current_level(&subtree, repo, root, target, *fanout); - if (error == GIT_EEXISTS) - return git_tree_lookup(out, repo, git_tree_id(root)); - - if (error < 0) - return error; - - *fanout += 2; - error = find_subtree_r(out, subtree, repo, target, fanout); - git_tree_free(subtree); - - return error; -} - -static int find_blob(git_oid *blob, git_tree *tree, const char *target) -{ - size_t i; - const git_tree_entry *entry; - - for (i=0; iid, note_oid); - - if (git_signature_dup(¬e->author, git_commit_author(commit)) < 0 || - git_signature_dup(¬e->committer, git_commit_committer(commit)) < 0) - return -1; - - note->message = git__strndup(git_blob_rawcontent(blob), git_blob_rawsize(blob)); - GITERR_CHECK_ALLOC(note->message); - - *out = note; - return 0; -} - -static int note_lookup( - git_note **out, - git_repository *repo, - git_commit *commit, - git_tree *tree, - const char *target) -{ - int error, fanout = 0; - git_oid oid; - git_blob *blob = NULL; - git_note *note = NULL; - git_tree *subtree = NULL; - - if ((error = find_subtree_r(&subtree, tree, repo, target, &fanout)) < 0) - goto cleanup; - - if ((error = find_blob(&oid, subtree, target + fanout)) < 0) - goto cleanup; - - if ((error = git_blob_lookup(&blob, repo, &oid)) < 0) - goto cleanup; - - if ((error = note_new(¬e, &oid, commit, blob)) < 0) - goto cleanup; - - *out = note; - -cleanup: - git_tree_free(subtree); - git_blob_free(blob); - return error; -} - -static int note_remove(git_repository *repo, - const git_signature *author, const git_signature *committer, - const char *notes_ref, git_tree *tree, - const char *target, git_commit **parents) -{ - int error; - git_tree *tree_after_removal = NULL; - git_oid oid; - - if ((error = manipulate_note_in_tree_r( - &tree_after_removal, repo, tree, NULL, target, 0, - remove_note_in_tree_eexists_cb, remove_note_in_tree_enotfound_cb)) < 0) - goto cleanup; - - error = git_commit_create(&oid, repo, notes_ref, author, committer, - NULL, GIT_NOTES_DEFAULT_MSG_RM, - tree_after_removal, - *parents == NULL ? 0 : 1, - (const git_commit **) parents); - -cleanup: - git_tree_free(tree_after_removal); - return error; -} - -static int note_get_default_ref(char **out, git_repository *repo) -{ - git_config *cfg; - int ret = git_repository_config__weakptr(&cfg, repo); - - *out = (ret != 0) ? NULL : git_config__get_string_force( - cfg, "core.notesref", GIT_NOTES_DEFAULT_REF); - - return ret; -} - -static int normalize_namespace(char **out, git_repository *repo, const char *notes_ref) -{ - if (notes_ref) { - *out = git__strdup(notes_ref); - GITERR_CHECK_ALLOC(*out); - return 0; - } - - return note_get_default_ref(out, repo); -} - -static int retrieve_note_tree_and_commit( - git_tree **tree_out, - git_commit **commit_out, - char **notes_ref_out, - git_repository *repo, - const char *notes_ref) -{ - int error; - git_oid oid; - - if ((error = normalize_namespace(notes_ref_out, repo, notes_ref)) < 0) - return error; - - if ((error = git_reference_name_to_id(&oid, repo, *notes_ref_out)) < 0) - return error; - - if (git_commit_lookup(commit_out, repo, &oid) < 0) - return error; - - if ((error = git_commit_tree(tree_out, *commit_out)) < 0) - return error; - - return 0; -} - -int git_note_read(git_note **out, git_repository *repo, - const char *notes_ref_in, const git_oid *oid) -{ - int error; - char *target = NULL, *notes_ref = NULL; - git_tree *tree = NULL; - git_commit *commit = NULL; - - target = git_oid_allocfmt(oid); - GITERR_CHECK_ALLOC(target); - - if (!(error = retrieve_note_tree_and_commit( - &tree, &commit, ¬es_ref, repo, notes_ref_in))) - error = note_lookup(out, repo, commit, tree, target); - - git__free(notes_ref); - git__free(target); - git_tree_free(tree); - git_commit_free(commit); - return error; -} - -int git_note_create( - git_oid *out, - git_repository *repo, - const char *notes_ref_in, - const git_signature *author, - const git_signature *committer, - const git_oid *oid, - const char *note, - int allow_note_overwrite) -{ - int error; - char *target = NULL, *notes_ref = NULL; - git_commit *commit = NULL; - git_tree *tree = NULL; - - target = git_oid_allocfmt(oid); - GITERR_CHECK_ALLOC(target); - - error = retrieve_note_tree_and_commit(&tree, &commit, ¬es_ref, repo, notes_ref_in); - - if (error < 0 && error != GIT_ENOTFOUND) - goto cleanup; - - error = note_write(out, repo, author, committer, notes_ref, - note, tree, target, &commit, allow_note_overwrite); - -cleanup: - git__free(notes_ref); - git__free(target); - git_commit_free(commit); - git_tree_free(tree); - return error; -} - -int git_note_remove(git_repository *repo, const char *notes_ref_in, - const git_signature *author, const git_signature *committer, - const git_oid *oid) -{ - int error; - char *target = NULL, *notes_ref; - git_commit *commit = NULL; - git_tree *tree = NULL; - - target = git_oid_allocfmt(oid); - GITERR_CHECK_ALLOC(target); - - if (!(error = retrieve_note_tree_and_commit( - &tree, &commit, ¬es_ref, repo, notes_ref_in))) - error = note_remove( - repo, author, committer, notes_ref, tree, target, &commit); - - git__free(notes_ref); - git__free(target); - git_commit_free(commit); - git_tree_free(tree); - return error; -} - -int git_note_default_ref(git_buf *out, git_repository *repo) -{ - char *default_ref; - int error; - - assert(out && repo); - - git_buf_sanitize(out); - - if ((error = note_get_default_ref(&default_ref, repo)) < 0) - return error; - - git_buf_attach(out, default_ref, strlen(default_ref)); - return 0; -} - -const git_signature *git_note_committer(const git_note *note) -{ - assert(note); - return note->committer; -} - -const git_signature *git_note_author(const git_note *note) -{ - assert(note); - return note->author; -} - -const char * git_note_message(const git_note *note) -{ - assert(note); - return note->message; -} - -const git_oid * git_note_id(const git_note *note) -{ - assert(note); - return ¬e->id; -} - -void git_note_free(git_note *note) -{ - if (note == NULL) - return; - - git_signature_free(note->committer); - git_signature_free(note->author); - git__free(note->message); - git__free(note); -} - -static int process_entry_path( - const char* entry_path, - git_oid *annotated_object_id) -{ - int error = 0; - size_t i = 0, j = 0, len; - git_buf buf = GIT_BUF_INIT; - - if ((error = git_buf_puts(&buf, entry_path)) < 0) - goto cleanup; - - len = git_buf_len(&buf); - - while (i < len) { - if (buf.ptr[i] == '/') { - i++; - continue; - } - - if (git__fromhex(buf.ptr[i]) < 0) { - /* This is not a note entry */ - goto cleanup; - } - - if (i != j) - buf.ptr[j] = buf.ptr[i]; - - i++; - j++; - } - - buf.ptr[j] = '\0'; - buf.size = j; - - if (j != GIT_OID_HEXSZ) { - /* This is not a note entry */ - goto cleanup; - } - - error = git_oid_fromstr(annotated_object_id, buf.ptr); - -cleanup: - git_buf_free(&buf); - return error; -} - -int git_note_foreach( - git_repository *repo, - const char *notes_ref, - git_note_foreach_cb note_cb, - void *payload) -{ - int error; - git_note_iterator *iter = NULL; - git_oid note_id, annotated_id; - - if ((error = git_note_iterator_new(&iter, repo, notes_ref)) < 0) - return error; - - while (!(error = git_note_next(¬e_id, &annotated_id, iter))) { - if ((error = note_cb(¬e_id, &annotated_id, payload)) != 0) { - giterr_set_after_callback(error); - break; - } - } - - if (error == GIT_ITEROVER) - error = 0; - - git_note_iterator_free(iter); - return error; -} - - -void git_note_iterator_free(git_note_iterator *it) -{ - if (it == NULL) - return; - - git_iterator_free(it); -} - - -int git_note_iterator_new( - git_note_iterator **it, - git_repository *repo, - const char *notes_ref_in) -{ - int error; - git_commit *commit = NULL; - git_tree *tree = NULL; - char *notes_ref; - - error = retrieve_note_tree_and_commit(&tree, &commit, ¬es_ref, repo, notes_ref_in); - if (error < 0) - goto cleanup; - - if ((error = git_iterator_for_tree(it, tree, NULL)) < 0) - git_iterator_free(*it); - -cleanup: - git__free(notes_ref); - git_tree_free(tree); - git_commit_free(commit); - - return error; -} - -int git_note_next( - git_oid* note_id, - git_oid* annotated_id, - git_note_iterator *it) -{ - int error; - const git_index_entry *item; - - if ((error = git_iterator_current(&item, it)) < 0) - return error; - - git_oid_cpy(note_id, &item->id); - - if (!(error = process_entry_path(item->path, annotated_id))) - git_iterator_advance(NULL, it); - - return error; -} diff --git a/vendor/libgit2/src/notes.h b/vendor/libgit2/src/notes.h deleted file mode 100644 index cfc0ca239..000000000 --- a/vendor/libgit2/src/notes.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_note_h__ -#define INCLUDE_note_h__ - -#include "common.h" - -#include "git2/oid.h" -#include "git2/types.h" - -#define GIT_NOTES_DEFAULT_REF "refs/notes/commits" - -#define GIT_NOTES_DEFAULT_MSG_ADD \ - "Notes added by 'git_note_create' from libgit2" - -#define GIT_NOTES_DEFAULT_MSG_RM \ - "Notes removed by 'git_note_remove' from libgit2" - -struct git_note { - git_oid id; - - git_signature *author; - git_signature *committer; - - char *message; -}; - -#endif /* INCLUDE_notes_h__ */ diff --git a/vendor/libgit2/src/object.c b/vendor/libgit2/src/object.c deleted file mode 100644 index 1d45f9f1b..000000000 --- a/vendor/libgit2/src/object.c +++ /dev/null @@ -1,490 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#include "git2/object.h" - -#include "common.h" -#include "repository.h" - -#include "commit.h" -#include "tree.h" -#include "blob.h" -#include "oid.h" -#include "tag.h" - -bool git_object__strict_input_validation = true; - -typedef struct { - const char *str; /* type name string */ - size_t size; /* size in bytes of the object structure */ - - int (*parse)(void *self, git_odb_object *obj); - void (*free)(void *self); -} git_object_def; - -static git_object_def git_objects_table[] = { - /* 0 = GIT_OBJ__EXT1 */ - { "", 0, NULL, NULL }, - - /* 1 = GIT_OBJ_COMMIT */ - { "commit", sizeof(git_commit), git_commit__parse, git_commit__free }, - - /* 2 = GIT_OBJ_TREE */ - { "tree", sizeof(git_tree), git_tree__parse, git_tree__free }, - - /* 3 = GIT_OBJ_BLOB */ - { "blob", sizeof(git_blob), git_blob__parse, git_blob__free }, - - /* 4 = GIT_OBJ_TAG */ - { "tag", sizeof(git_tag), git_tag__parse, git_tag__free }, - - /* 5 = GIT_OBJ__EXT2 */ - { "", 0, NULL, NULL }, - /* 6 = GIT_OBJ_OFS_DELTA */ - { "OFS_DELTA", 0, NULL, NULL }, - /* 7 = GIT_OBJ_REF_DELTA */ - { "REF_DELTA", 0, NULL, NULL }, -}; - -int git_object__from_odb_object( - git_object **object_out, - git_repository *repo, - git_odb_object *odb_obj, - git_otype type) -{ - int error; - size_t object_size; - git_object_def *def; - git_object *object = NULL; - - assert(object_out); - *object_out = NULL; - - /* Validate type match */ - if (type != GIT_OBJ_ANY && type != odb_obj->cached.type) { - giterr_set(GITERR_INVALID, - "The requested type does not match the type in the ODB"); - return GIT_ENOTFOUND; - } - - if ((object_size = git_object__size(odb_obj->cached.type)) == 0) { - giterr_set(GITERR_INVALID, "The requested type is invalid"); - return GIT_ENOTFOUND; - } - - /* Allocate and initialize base object */ - object = git__calloc(1, object_size); - GITERR_CHECK_ALLOC(object); - - git_oid_cpy(&object->cached.oid, &odb_obj->cached.oid); - object->cached.type = odb_obj->cached.type; - object->cached.size = odb_obj->cached.size; - object->repo = repo; - - /* Parse raw object data */ - def = &git_objects_table[odb_obj->cached.type]; - assert(def->free && def->parse); - - if ((error = def->parse(object, odb_obj)) < 0) - def->free(object); - else - *object_out = git_cache_store_parsed(&repo->objects, object); - - return error; -} - -void git_object__free(void *obj) -{ - git_otype type = ((git_object *)obj)->cached.type; - - if (type < 0 || ((size_t)type) >= ARRAY_SIZE(git_objects_table) || - !git_objects_table[type].free) - git__free(obj); - else - git_objects_table[type].free(obj); -} - -int git_object_lookup_prefix( - git_object **object_out, - git_repository *repo, - const git_oid *id, - size_t len, - git_otype type) -{ - git_object *object = NULL; - git_odb *odb = NULL; - git_odb_object *odb_obj = NULL; - int error = 0; - - assert(repo && object_out && id); - - if (len < GIT_OID_MINPREFIXLEN) { - giterr_set(GITERR_OBJECT, "Ambiguous lookup - OID prefix is too short"); - return GIT_EAMBIGUOUS; - } - - error = git_repository_odb__weakptr(&odb, repo); - if (error < 0) - return error; - - if (len > GIT_OID_HEXSZ) - len = GIT_OID_HEXSZ; - - if (len == GIT_OID_HEXSZ) { - git_cached_obj *cached = NULL; - - /* We want to match the full id : we can first look up in the cache, - * since there is no need to check for non ambiguousity - */ - cached = git_cache_get_any(&repo->objects, id); - if (cached != NULL) { - if (cached->flags == GIT_CACHE_STORE_PARSED) { - object = (git_object *)cached; - - if (type != GIT_OBJ_ANY && type != object->cached.type) { - git_object_free(object); - giterr_set(GITERR_INVALID, - "The requested type does not match the type in ODB"); - return GIT_ENOTFOUND; - } - - *object_out = object; - return 0; - } else if (cached->flags == GIT_CACHE_STORE_RAW) { - odb_obj = (git_odb_object *)cached; - } else { - assert(!"Wrong caching type in the global object cache"); - } - } else { - /* Object was not found in the cache, let's explore the backends. - * We could just use git_odb_read_unique_short_oid, - * it is the same cost for packed and loose object backends, - * but it may be much more costly for sqlite and hiredis. - */ - error = git_odb_read(&odb_obj, odb, id); - } - } else { - git_oid short_oid = {{ 0 }}; - - git_oid__cpy_prefix(&short_oid, id, len); - - /* If len < GIT_OID_HEXSZ (a strict short oid was given), we have - * 2 options : - * - We always search in the cache first. If we find that short oid is - * ambiguous, we can stop. But in all the other cases, we must then - * explore all the backends (to find an object if there was match, - * or to check that oid is not ambiguous if we have found 1 match in - * the cache) - * - We never explore the cache, go right to exploring the backends - * We chose the latter : we explore directly the backends. - */ - error = git_odb_read_prefix(&odb_obj, odb, &short_oid, len); - } - - if (error < 0) - return error; - - error = git_object__from_odb_object(object_out, repo, odb_obj, type); - - git_odb_object_free(odb_obj); - - return error; -} - -int git_object_lookup(git_object **object_out, git_repository *repo, const git_oid *id, git_otype type) { - return git_object_lookup_prefix(object_out, repo, id, GIT_OID_HEXSZ, type); -} - -void git_object_free(git_object *object) -{ - if (object == NULL) - return; - - git_cached_obj_decref(object); -} - -const git_oid *git_object_id(const git_object *obj) -{ - assert(obj); - return &obj->cached.oid; -} - -git_otype git_object_type(const git_object *obj) -{ - assert(obj); - return obj->cached.type; -} - -git_repository *git_object_owner(const git_object *obj) -{ - assert(obj); - return obj->repo; -} - -const char *git_object_type2string(git_otype type) -{ - if (type < 0 || ((size_t) type) >= ARRAY_SIZE(git_objects_table)) - return ""; - - return git_objects_table[type].str; -} - -git_otype git_object_string2type(const char *str) -{ - size_t i; - - if (!str || !*str) - return GIT_OBJ_BAD; - - for (i = 0; i < ARRAY_SIZE(git_objects_table); i++) - if (!strcmp(str, git_objects_table[i].str)) - return (git_otype)i; - - return GIT_OBJ_BAD; -} - -int git_object_typeisloose(git_otype type) -{ - if (type < 0 || ((size_t) type) >= ARRAY_SIZE(git_objects_table)) - return 0; - - return (git_objects_table[type].size > 0) ? 1 : 0; -} - -size_t git_object__size(git_otype type) -{ - if (type < 0 || ((size_t) type) >= ARRAY_SIZE(git_objects_table)) - return 0; - - return git_objects_table[type].size; -} - -static int dereference_object(git_object **dereferenced, git_object *obj) -{ - git_otype type = git_object_type(obj); - - switch (type) { - case GIT_OBJ_COMMIT: - return git_commit_tree((git_tree **)dereferenced, (git_commit*)obj); - - case GIT_OBJ_TAG: - return git_tag_target(dereferenced, (git_tag*)obj); - - case GIT_OBJ_BLOB: - case GIT_OBJ_TREE: - return GIT_EPEEL; - - default: - return GIT_EINVALIDSPEC; - } -} - -static int peel_error(int error, const git_oid *oid, git_otype type) -{ - const char *type_name; - char hex_oid[GIT_OID_HEXSZ + 1]; - - type_name = git_object_type2string(type); - - git_oid_fmt(hex_oid, oid); - hex_oid[GIT_OID_HEXSZ] = '\0'; - - giterr_set(GITERR_OBJECT, "The git_object of id '%s' can not be " - "successfully peeled into a %s (git_otype=%i).", hex_oid, type_name, type); - - return error; -} - -static int check_type_combination(git_otype type, git_otype target) -{ - if (type == target) - return 0; - - switch (type) { - case GIT_OBJ_BLOB: - case GIT_OBJ_TREE: - /* a blob or tree can never be peeled to anything but themselves */ - return GIT_EINVALIDSPEC; - break; - case GIT_OBJ_COMMIT: - /* a commit can only be peeled to a tree */ - if (target != GIT_OBJ_TREE && target != GIT_OBJ_ANY) - return GIT_EINVALIDSPEC; - break; - case GIT_OBJ_TAG: - /* a tag may point to anything, so we let anything through */ - break; - default: - return GIT_EINVALIDSPEC; - } - - return 0; -} - -int git_object_peel( - git_object **peeled, - const git_object *object, - git_otype target_type) -{ - git_object *source, *deref = NULL; - int error; - - assert(object && peeled); - - assert(target_type == GIT_OBJ_TAG || - target_type == GIT_OBJ_COMMIT || - target_type == GIT_OBJ_TREE || - target_type == GIT_OBJ_BLOB || - target_type == GIT_OBJ_ANY); - - if ((error = check_type_combination(git_object_type(object), target_type)) < 0) - return peel_error(error, git_object_id(object), target_type); - - if (git_object_type(object) == target_type) - return git_object_dup(peeled, (git_object *)object); - - source = (git_object *)object; - - while (!(error = dereference_object(&deref, source))) { - - if (source != object) - git_object_free(source); - - if (git_object_type(deref) == target_type) { - *peeled = deref; - return 0; - } - - if (target_type == GIT_OBJ_ANY && - git_object_type(deref) != git_object_type(object)) - { - *peeled = deref; - return 0; - } - - source = deref; - deref = NULL; - } - - if (source != object) - git_object_free(source); - - git_object_free(deref); - - if (error) - error = peel_error(error, git_object_id(object), target_type); - - return error; -} - -int git_object_dup(git_object **dest, git_object *source) -{ - git_cached_obj_incref(source); - *dest = source; - return 0; -} - -int git_object_lookup_bypath( - git_object **out, - const git_object *treeish, - const char *path, - git_otype type) -{ - int error = -1; - git_tree *tree = NULL; - git_tree_entry *entry = NULL; - - assert(out && treeish && path); - - if ((error = git_object_peel((git_object**)&tree, treeish, GIT_OBJ_TREE)) < 0 || - (error = git_tree_entry_bypath(&entry, tree, path)) < 0) - { - goto cleanup; - } - - if (type != GIT_OBJ_ANY && git_tree_entry_type(entry) != type) - { - giterr_set(GITERR_OBJECT, - "object at path '%s' is not of the asked-for type %d", - path, type); - error = GIT_EINVALIDSPEC; - goto cleanup; - } - - error = git_tree_entry_to_object(out, git_object_owner(treeish), entry); - -cleanup: - git_tree_entry_free(entry); - git_tree_free(tree); - return error; -} - -int git_object_short_id(git_buf *out, const git_object *obj) -{ - git_repository *repo; - int len = GIT_ABBREV_DEFAULT, error; - git_oid id = {{0}}; - git_odb *odb; - - assert(out && obj); - - git_buf_sanitize(out); - repo = git_object_owner(obj); - - if ((error = git_repository__cvar(&len, repo, GIT_CVAR_ABBREV)) < 0) - return error; - - if ((error = git_repository_odb(&odb, repo)) < 0) - return error; - - while (len < GIT_OID_HEXSZ) { - /* set up short oid */ - memcpy(&id.id, &obj->cached.oid.id, (len + 1) / 2); - if (len & 1) - id.id[len / 2] &= 0xf0; - - error = git_odb_exists_prefix(NULL, odb, &id, len); - if (error != GIT_EAMBIGUOUS) - break; - - giterr_clear(); - len++; - } - - if (!error && !(error = git_buf_grow(out, len + 1))) { - git_oid_tostr(out->ptr, len + 1, &id); - out->size = len; - } - - git_odb_free(odb); - - return error; -} - -bool git_object__is_valid( - git_repository *repo, const git_oid *id, git_otype expected_type) -{ - git_odb *odb; - git_otype actual_type; - size_t len; - int error; - - if (!git_object__strict_input_validation) - return true; - - if ((error = git_repository_odb__weakptr(&odb, repo)) < 0 || - (error = git_odb_read_header(&len, &actual_type, odb, id)) < 0) - return false; - - if (expected_type != GIT_OBJ_ANY && expected_type != actual_type) { - giterr_set(GITERR_INVALID, - "the requested type does not match the type in the ODB"); - return false; - } - - return true; -} - diff --git a/vendor/libgit2/src/object.h b/vendor/libgit2/src/object.h deleted file mode 100644 index dd227d16d..000000000 --- a/vendor/libgit2/src/object.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_object_h__ -#define INCLUDE_object_h__ - -#include "repository.h" - -extern bool git_object__strict_input_validation; - -/** Base git object for inheritance */ -struct git_object { - git_cached_obj cached; - git_repository *repo; -}; - -/* fully free the object; internal method, DO NOT EXPORT */ -void git_object__free(void *object); - -int git_object__from_odb_object( - git_object **object_out, - git_repository *repo, - git_odb_object *odb_obj, - git_otype type); - -int git_object__resolve_to_type(git_object **obj, git_otype type); - -int git_oid__parse(git_oid *oid, const char **buffer_out, const char *buffer_end, const char *header); - -void git_oid__writebuf(git_buf *buf, const char *header, const git_oid *oid); - -bool git_object__is_valid( - git_repository *repo, const git_oid *id, git_otype expected_type); - -GIT_INLINE(git_otype) git_object__type_from_filemode(git_filemode_t mode) -{ - switch (mode) { - case GIT_FILEMODE_TREE: - return GIT_OBJ_TREE; - case GIT_FILEMODE_COMMIT: - return GIT_OBJ_COMMIT; - case GIT_FILEMODE_BLOB: - case GIT_FILEMODE_BLOB_EXECUTABLE: - case GIT_FILEMODE_LINK: - return GIT_OBJ_BLOB; - default: - return GIT_OBJ_BAD; - } -} - -#endif diff --git a/vendor/libgit2/src/object_api.c b/vendor/libgit2/src/object_api.c deleted file mode 100644 index 838bba323..000000000 --- a/vendor/libgit2/src/object_api.c +++ /dev/null @@ -1,129 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#include "git2/object.h" - -#include "common.h" -#include "repository.h" - -#include "commit.h" -#include "tree.h" -#include "blob.h" -#include "tag.h" - -/** - * Blob - */ -int git_commit_lookup(git_commit **out, git_repository *repo, const git_oid *id) -{ - return git_object_lookup((git_object **)out, repo, id, GIT_OBJ_COMMIT); -} - -int git_commit_lookup_prefix(git_commit **out, git_repository *repo, const git_oid *id, size_t len) -{ - return git_object_lookup_prefix((git_object **)out, repo, id, len, GIT_OBJ_COMMIT); -} - -void git_commit_free(git_commit *obj) -{ - git_object_free((git_object *)obj); -} - -const git_oid *git_commit_id(const git_commit *obj) -{ - return git_object_id((const git_object *)obj); -} - -git_repository *git_commit_owner(const git_commit *obj) -{ - return git_object_owner((const git_object *)obj); -} - - -/** - * Tree - */ -int git_tree_lookup(git_tree **out, git_repository *repo, const git_oid *id) -{ - return git_object_lookup((git_object **)out, repo, id, GIT_OBJ_TREE); -} - -int git_tree_lookup_prefix(git_tree **out, git_repository *repo, const git_oid *id, size_t len) -{ - return git_object_lookup_prefix((git_object **)out, repo, id, len, GIT_OBJ_TREE); -} - -void git_tree_free(git_tree *obj) -{ - git_object_free((git_object *)obj); -} - -const git_oid *git_tree_id(const git_tree *obj) -{ - return git_object_id((const git_object *)obj); -} - -git_repository *git_tree_owner(const git_tree *obj) -{ - return git_object_owner((const git_object *)obj); -} - - -/** - * Tag - */ -int git_tag_lookup(git_tag **out, git_repository *repo, const git_oid *id) -{ - return git_object_lookup((git_object **)out, repo, id, GIT_OBJ_TAG); -} - -int git_tag_lookup_prefix(git_tag **out, git_repository *repo, const git_oid *id, size_t len) -{ - return git_object_lookup_prefix((git_object **)out, repo, id, len, GIT_OBJ_TAG); -} - -void git_tag_free(git_tag *obj) -{ - git_object_free((git_object *)obj); -} - -const git_oid *git_tag_id(const git_tag *obj) -{ - return git_object_id((const git_object *)obj); -} - -git_repository *git_tag_owner(const git_tag *obj) -{ - return git_object_owner((const git_object *)obj); -} - -/** - * Blob - */ -int git_blob_lookup(git_blob **out, git_repository *repo, const git_oid *id) -{ - return git_object_lookup((git_object **)out, repo, id, GIT_OBJ_BLOB); -} - -int git_blob_lookup_prefix(git_blob **out, git_repository *repo, const git_oid *id, size_t len) -{ - return git_object_lookup_prefix((git_object **)out, repo, id, len, GIT_OBJ_BLOB); -} - -void git_blob_free(git_blob *obj) -{ - git_object_free((git_object *)obj); -} - -const git_oid *git_blob_id(const git_blob *obj) -{ - return git_object_id((const git_object *)obj); -} - -git_repository *git_blob_owner(const git_blob *obj) -{ - return git_object_owner((const git_object *)obj); -} diff --git a/vendor/libgit2/src/odb.c b/vendor/libgit2/src/odb.c deleted file mode 100644 index cb0f70623..000000000 --- a/vendor/libgit2/src/odb.c +++ /dev/null @@ -1,1252 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "common.h" -#include -#include "git2/object.h" -#include "git2/sys/odb_backend.h" -#include "fileops.h" -#include "hash.h" -#include "odb.h" -#include "delta-apply.h" -#include "filter.h" -#include "repository.h" - -#include "git2/odb_backend.h" -#include "git2/oid.h" - -#define GIT_ALTERNATES_FILE "info/alternates" - -/* - * We work under the assumption that most objects for long-running - * operations will be packed - */ -#define GIT_LOOSE_PRIORITY 1 -#define GIT_PACKED_PRIORITY 2 - -#define GIT_ALTERNATES_MAX_DEPTH 5 - -typedef struct -{ - git_odb_backend *backend; - int priority; - bool is_alternate; - ino_t disk_inode; -} backend_internal; - -static git_cache *odb_cache(git_odb *odb) -{ - if (odb->rc.owner != NULL) { - git_repository *owner = odb->rc.owner; - return &owner->objects; - } - - return &odb->own_cache; -} - -static int load_alternates(git_odb *odb, const char *objects_dir, int alternate_depth); - -int git_odb__format_object_header(char *hdr, size_t n, git_off_t obj_len, git_otype obj_type) -{ - const char *type_str = git_object_type2string(obj_type); - int len = p_snprintf(hdr, n, "%s %lld", type_str, (long long)obj_len); - assert(len > 0 && len <= (int)n); - return len+1; -} - -int git_odb__hashobj(git_oid *id, git_rawobj *obj) -{ - git_buf_vec vec[2]; - char header[64]; - int hdrlen; - - assert(id && obj); - - if (!git_object_typeisloose(obj->type)) - return -1; - - if (!obj->data && obj->len != 0) - return -1; - - hdrlen = git_odb__format_object_header(header, sizeof(header), obj->len, obj->type); - - vec[0].data = header; - vec[0].len = hdrlen; - vec[1].data = obj->data; - vec[1].len = obj->len; - - git_hash_vec(id, vec, 2); - - return 0; -} - - -static git_odb_object *odb_object__alloc(const git_oid *oid, git_rawobj *source) -{ - git_odb_object *object = git__calloc(1, sizeof(git_odb_object)); - - if (object != NULL) { - git_oid_cpy(&object->cached.oid, oid); - object->cached.type = source->type; - object->cached.size = source->len; - object->buffer = source->data; - } - - return object; -} - -void git_odb_object__free(void *object) -{ - if (object != NULL) { - git__free(((git_odb_object *)object)->buffer); - git__free(object); - } -} - -const git_oid *git_odb_object_id(git_odb_object *object) -{ - return &object->cached.oid; -} - -const void *git_odb_object_data(git_odb_object *object) -{ - return object->buffer; -} - -size_t git_odb_object_size(git_odb_object *object) -{ - return object->cached.size; -} - -git_otype git_odb_object_type(git_odb_object *object) -{ - return object->cached.type; -} - -int git_odb_object_dup(git_odb_object **dest, git_odb_object *source) -{ - git_cached_obj_incref(source); - *dest = source; - return 0; -} - -void git_odb_object_free(git_odb_object *object) -{ - if (object == NULL) - return; - - git_cached_obj_decref(object); -} - -int git_odb__hashfd(git_oid *out, git_file fd, size_t size, git_otype type) -{ - int hdr_len; - char hdr[64], buffer[FILEIO_BUFSIZE]; - git_hash_ctx ctx; - ssize_t read_len = 0; - int error = 0; - - if (!git_object_typeisloose(type)) { - giterr_set(GITERR_INVALID, "Invalid object type for hash"); - return -1; - } - - if ((error = git_hash_ctx_init(&ctx)) < 0) - return -1; - - hdr_len = git_odb__format_object_header(hdr, sizeof(hdr), size, type); - - if ((error = git_hash_update(&ctx, hdr, hdr_len)) < 0) - goto done; - - while (size > 0 && (read_len = p_read(fd, buffer, sizeof(buffer))) > 0) { - if ((error = git_hash_update(&ctx, buffer, read_len)) < 0) - goto done; - - size -= read_len; - } - - /* If p_read returned an error code, the read obviously failed. - * If size is not zero, the file was truncated after we originally - * stat'd it, so we consider this a read failure too */ - if (read_len < 0 || size > 0) { - giterr_set(GITERR_OS, "Error reading file for hashing"); - error = -1; - - goto done; - } - - error = git_hash_final(out, &ctx); - -done: - git_hash_ctx_cleanup(&ctx); - return error; -} - -int git_odb__hashfd_filtered( - git_oid *out, git_file fd, size_t size, git_otype type, git_filter_list *fl) -{ - int error; - git_buf raw = GIT_BUF_INIT; - - if (!fl) - return git_odb__hashfd(out, fd, size, type); - - /* size of data is used in header, so we have to read the whole file - * into memory to apply filters before beginning to calculate the hash - */ - - if (!(error = git_futils_readbuffer_fd(&raw, fd, size))) { - git_buf post = GIT_BUF_INIT; - - error = git_filter_list_apply_to_data(&post, fl, &raw); - - git_buf_free(&raw); - - if (!error) - error = git_odb_hash(out, post.ptr, post.size, type); - - git_buf_free(&post); - } - - return error; -} - -int git_odb__hashlink(git_oid *out, const char *path) -{ - struct stat st; - int size; - int result; - - if (git_path_lstat(path, &st) < 0) - return -1; - - if (!git__is_int(st.st_size) || (int)st.st_size < 0) { - giterr_set(GITERR_FILESYSTEM, "File size overflow for 32-bit systems"); - return -1; - } - - size = (int)st.st_size; - - if (S_ISLNK(st.st_mode)) { - char *link_data; - int read_len; - size_t alloc_size; - - GITERR_CHECK_ALLOC_ADD(&alloc_size, size, 1); - link_data = git__malloc(alloc_size); - GITERR_CHECK_ALLOC(link_data); - - read_len = p_readlink(path, link_data, size); - link_data[size] = '\0'; - if (read_len != size) { - giterr_set(GITERR_OS, "Failed to read symlink data for '%s'", path); - git__free(link_data); - return -1; - } - - result = git_odb_hash(out, link_data, size, GIT_OBJ_BLOB); - git__free(link_data); - } else { - int fd = git_futils_open_ro(path); - if (fd < 0) - return -1; - result = git_odb__hashfd(out, fd, size, GIT_OBJ_BLOB); - p_close(fd); - } - - return result; -} - -int git_odb_hashfile(git_oid *out, const char *path, git_otype type) -{ - git_off_t size; - int result, fd = git_futils_open_ro(path); - if (fd < 0) - return fd; - - if ((size = git_futils_filesize(fd)) < 0 || !git__is_sizet(size)) { - giterr_set(GITERR_OS, "File size overflow for 32-bit systems"); - p_close(fd); - return -1; - } - - result = git_odb__hashfd(out, fd, (size_t)size, type); - p_close(fd); - return result; -} - -int git_odb_hash(git_oid *id, const void *data, size_t len, git_otype type) -{ - git_rawobj raw; - - assert(id); - - raw.data = (void *)data; - raw.len = len; - raw.type = type; - - return git_odb__hashobj(id, &raw); -} - -/** - * FAKE WSTREAM - */ - -typedef struct { - git_odb_stream stream; - char *buffer; - size_t size, written; - git_otype type; -} fake_wstream; - -static int fake_wstream__fwrite(git_odb_stream *_stream, const git_oid *oid) -{ - fake_wstream *stream = (fake_wstream *)_stream; - return _stream->backend->write(_stream->backend, oid, stream->buffer, stream->size, stream->type); -} - -static int fake_wstream__write(git_odb_stream *_stream, const char *data, size_t len) -{ - fake_wstream *stream = (fake_wstream *)_stream; - - if (stream->written + len > stream->size) - return -1; - - memcpy(stream->buffer + stream->written, data, len); - stream->written += len; - return 0; -} - -static void fake_wstream__free(git_odb_stream *_stream) -{ - fake_wstream *stream = (fake_wstream *)_stream; - - git__free(stream->buffer); - git__free(stream); -} - -static int init_fake_wstream(git_odb_stream **stream_p, git_odb_backend *backend, git_off_t size, git_otype type) -{ - fake_wstream *stream; - - if (!git__is_ssizet(size)) { - giterr_set(GITERR_ODB, "object size too large to keep in memory"); - return -1; - } - - stream = git__calloc(1, sizeof(fake_wstream)); - GITERR_CHECK_ALLOC(stream); - - stream->size = size; - stream->type = type; - stream->buffer = git__malloc(size); - if (stream->buffer == NULL) { - git__free(stream); - return -1; - } - - stream->stream.backend = backend; - stream->stream.read = NULL; /* read only */ - stream->stream.write = &fake_wstream__write; - stream->stream.finalize_write = &fake_wstream__fwrite; - stream->stream.free = &fake_wstream__free; - stream->stream.mode = GIT_STREAM_WRONLY; - - *stream_p = (git_odb_stream *)stream; - return 0; -} - -/*********************************************************** - * - * OBJECT DATABASE PUBLIC API - * - * Public calls for the ODB functionality - * - ***********************************************************/ - -static int backend_sort_cmp(const void *a, const void *b) -{ - const backend_internal *backend_a = (const backend_internal *)(a); - const backend_internal *backend_b = (const backend_internal *)(b); - - if (backend_b->priority == backend_a->priority) { - if (backend_a->is_alternate) - return -1; - if (backend_b->is_alternate) - return 1; - return 0; - } - return (backend_b->priority - backend_a->priority); -} - -int git_odb_new(git_odb **out) -{ - git_odb *db = git__calloc(1, sizeof(*db)); - GITERR_CHECK_ALLOC(db); - - if (git_cache_init(&db->own_cache) < 0 || - git_vector_init(&db->backends, 4, backend_sort_cmp) < 0) { - git__free(db); - return -1; - } - - *out = db; - GIT_REFCOUNT_INC(db); - return 0; -} - -static int add_backend_internal( - git_odb *odb, git_odb_backend *backend, - int priority, bool is_alternate, ino_t disk_inode) -{ - backend_internal *internal; - - assert(odb && backend); - - GITERR_CHECK_VERSION(backend, GIT_ODB_BACKEND_VERSION, "git_odb_backend"); - - /* Check if the backend is already owned by another ODB */ - assert(!backend->odb || backend->odb == odb); - - internal = git__malloc(sizeof(backend_internal)); - GITERR_CHECK_ALLOC(internal); - - internal->backend = backend; - internal->priority = priority; - internal->is_alternate = is_alternate; - internal->disk_inode = disk_inode; - - if (git_vector_insert(&odb->backends, internal) < 0) { - git__free(internal); - return -1; - } - - git_vector_sort(&odb->backends); - internal->backend->odb = odb; - return 0; -} - -int git_odb_add_backend(git_odb *odb, git_odb_backend *backend, int priority) -{ - return add_backend_internal(odb, backend, priority, false, 0); -} - -int git_odb_add_alternate(git_odb *odb, git_odb_backend *backend, int priority) -{ - return add_backend_internal(odb, backend, priority, true, 0); -} - -size_t git_odb_num_backends(git_odb *odb) -{ - assert(odb); - return odb->backends.length; -} - -static int git_odb__error_unsupported_in_backend(const char *action) -{ - giterr_set(GITERR_ODB, - "Cannot %s - unsupported in the loaded odb backends", action); - return -1; -} - - -int git_odb_get_backend(git_odb_backend **out, git_odb *odb, size_t pos) -{ - backend_internal *internal; - - assert(out && odb); - internal = git_vector_get(&odb->backends, pos); - - if (internal && internal->backend) { - *out = internal->backend; - return 0; - } - - giterr_set(GITERR_ODB, "No ODB backend loaded at index %" PRIuZ, pos); - return GIT_ENOTFOUND; -} - -static int add_default_backends( - git_odb *db, const char *objects_dir, - bool as_alternates, int alternate_depth) -{ - size_t i; - struct stat st; - ino_t inode; - git_odb_backend *loose, *packed; - - /* TODO: inodes are not really relevant on Win32, so we need to find - * a cross-platform workaround for this */ -#ifdef GIT_WIN32 - GIT_UNUSED(i); - GIT_UNUSED(st); - - inode = 0; -#else - if (p_stat(objects_dir, &st) < 0) { - if (as_alternates) - return 0; - - giterr_set(GITERR_ODB, "Failed to load object database in '%s'", objects_dir); - return -1; - } - - inode = st.st_ino; - - for (i = 0; i < db->backends.length; ++i) { - backend_internal *backend = git_vector_get(&db->backends, i); - if (backend->disk_inode == inode) - return 0; - } -#endif - - /* add the loose object backend */ - if (git_odb_backend_loose(&loose, objects_dir, -1, 0, 0, 0) < 0 || - add_backend_internal(db, loose, GIT_LOOSE_PRIORITY, as_alternates, inode) < 0) - return -1; - - /* add the packed file backend */ - if (git_odb_backend_pack(&packed, objects_dir) < 0 || - add_backend_internal(db, packed, GIT_PACKED_PRIORITY, as_alternates, inode) < 0) - return -1; - - return load_alternates(db, objects_dir, alternate_depth); -} - -static int load_alternates(git_odb *odb, const char *objects_dir, int alternate_depth) -{ - git_buf alternates_path = GIT_BUF_INIT; - git_buf alternates_buf = GIT_BUF_INIT; - char *buffer; - const char *alternate; - int result = 0; - - /* Git reports an error, we just ignore anything deeper */ - if (alternate_depth > GIT_ALTERNATES_MAX_DEPTH) - return 0; - - if (git_buf_joinpath(&alternates_path, objects_dir, GIT_ALTERNATES_FILE) < 0) - return -1; - - if (git_path_exists(alternates_path.ptr) == false) { - git_buf_free(&alternates_path); - return 0; - } - - if (git_futils_readbuffer(&alternates_buf, alternates_path.ptr) < 0) { - git_buf_free(&alternates_path); - return -1; - } - - buffer = (char *)alternates_buf.ptr; - - /* add each alternate as a new backend; one alternate per line */ - while ((alternate = git__strtok(&buffer, "\r\n")) != NULL) { - if (*alternate == '\0' || *alternate == '#') - continue; - - /* - * Relative path: build based on the current `objects` - * folder. However, relative paths are only allowed in - * the current repository. - */ - if (*alternate == '.' && !alternate_depth) { - if ((result = git_buf_joinpath(&alternates_path, objects_dir, alternate)) < 0) - break; - alternate = git_buf_cstr(&alternates_path); - } - - if ((result = add_default_backends(odb, alternate, true, alternate_depth + 1)) < 0) - break; - } - - git_buf_free(&alternates_path); - git_buf_free(&alternates_buf); - - return result; -} - -int git_odb_add_disk_alternate(git_odb *odb, const char *path) -{ - return add_default_backends(odb, path, true, 0); -} - -int git_odb_open(git_odb **out, const char *objects_dir) -{ - git_odb *db; - - assert(out && objects_dir); - - *out = NULL; - - if (git_odb_new(&db) < 0) - return -1; - - if (add_default_backends(db, objects_dir, 0, 0) < 0) { - git_odb_free(db); - return -1; - } - - *out = db; - return 0; -} - -static void odb_free(git_odb *db) -{ - size_t i; - - for (i = 0; i < db->backends.length; ++i) { - backend_internal *internal = git_vector_get(&db->backends, i); - git_odb_backend *backend = internal->backend; - - backend->free(backend); - - git__free(internal); - } - - git_vector_free(&db->backends); - git_cache_free(&db->own_cache); - - git__memzero(db, sizeof(*db)); - git__free(db); -} - -void git_odb_free(git_odb *db) -{ - if (db == NULL) - return; - - GIT_REFCOUNT_DEC(db, odb_free); -} - -static int odb_exists_1(git_odb *db, const git_oid *id, bool only_refreshed) -{ - size_t i; - bool found = false; - - for (i = 0; i < db->backends.length && !found; ++i) { - backend_internal *internal = git_vector_get(&db->backends, i); - git_odb_backend *b = internal->backend; - - if (only_refreshed && !b->refresh) - continue; - - if (b->exists != NULL) - found = (bool)b->exists(b, id); - } - - return (int)found; -} - -int git_odb_exists(git_odb *db, const git_oid *id) -{ - git_odb_object *object; - - assert(db && id); - - if ((object = git_cache_get_raw(odb_cache(db), id)) != NULL) { - git_odb_object_free(object); - return (int)true; - } - - if (odb_exists_1(db, id, false)) - return 1; - - if (!git_odb_refresh(db)) - return odb_exists_1(db, id, true); - - /* Failed to refresh, hence not found */ - return 0; -} - -static int odb_exists_prefix_1(git_oid *out, git_odb *db, - const git_oid *key, size_t len, bool only_refreshed) -{ - size_t i; - int error = GIT_ENOTFOUND, num_found = 0; - git_oid last_found = {{0}}, found; - - for (i = 0; i < db->backends.length; ++i) { - backend_internal *internal = git_vector_get(&db->backends, i); - git_odb_backend *b = internal->backend; - - if (only_refreshed && !b->refresh) - continue; - - if (!b->exists_prefix) - continue; - - error = b->exists_prefix(&found, b, key, len); - if (error == GIT_ENOTFOUND || error == GIT_PASSTHROUGH) - continue; - if (error) - return error; - - /* make sure found item doesn't introduce ambiguity */ - if (num_found) { - if (git_oid__cmp(&last_found, &found)) - return git_odb__error_ambiguous("multiple matches for prefix"); - } else { - git_oid_cpy(&last_found, &found); - num_found++; - } - } - - if (!num_found) - return GIT_ENOTFOUND; - - if (out) - git_oid_cpy(out, &last_found); - - return 0; -} - -int git_odb_exists_prefix( - git_oid *out, git_odb *db, const git_oid *short_id, size_t len) -{ - int error; - git_oid key = {{0}}; - - assert(db && short_id); - - if (len < GIT_OID_MINPREFIXLEN) - return git_odb__error_ambiguous("prefix length too short"); - if (len > GIT_OID_HEXSZ) - len = GIT_OID_HEXSZ; - - if (len == GIT_OID_HEXSZ) { - if (git_odb_exists(db, short_id)) { - if (out) - git_oid_cpy(out, short_id); - return 0; - } else { - return git_odb__error_notfound( - "no match for id prefix", short_id, len); - } - } - - /* just copy valid part of short_id */ - memcpy(&key.id, short_id->id, (len + 1) / 2); - if (len & 1) - key.id[len / 2] &= 0xF0; - - error = odb_exists_prefix_1(out, db, &key, len, false); - - if (error == GIT_ENOTFOUND && !git_odb_refresh(db)) - error = odb_exists_prefix_1(out, db, &key, len, true); - - if (error == GIT_ENOTFOUND) - return git_odb__error_notfound("no match for id prefix", &key, len); - - return error; -} - -int git_odb_read_header(size_t *len_p, git_otype *type_p, git_odb *db, const git_oid *id) -{ - int error; - git_odb_object *object; - - error = git_odb__read_header_or_object(&object, len_p, type_p, db, id); - - if (object) - git_odb_object_free(object); - - return error; -} - -int git_odb__read_header_or_object( - git_odb_object **out, size_t *len_p, git_otype *type_p, - git_odb *db, const git_oid *id) -{ - size_t i; - int error = GIT_ENOTFOUND; - git_odb_object *object; - - assert(db && id && out && len_p && type_p); - - if ((object = git_cache_get_raw(odb_cache(db), id)) != NULL) { - *len_p = object->cached.size; - *type_p = object->cached.type; - *out = object; - return 0; - } - - *out = NULL; - - for (i = 0; i < db->backends.length && error < 0; ++i) { - backend_internal *internal = git_vector_get(&db->backends, i); - git_odb_backend *b = internal->backend; - - if (b->read_header != NULL) - error = b->read_header(len_p, type_p, b, id); - } - - if (!error || error == GIT_PASSTHROUGH) - return 0; - - /* - * no backend could read only the header. - * try reading the whole object and freeing the contents - */ - if ((error = git_odb_read(&object, db, id)) < 0) - return error; /* error already set - pass along */ - - *len_p = object->cached.size; - *type_p = object->cached.type; - *out = object; - - return 0; -} - -static git_oid empty_blob = {{ 0xe6, 0x9d, 0xe2, 0x9b, 0xb2, 0xd1, 0xd6, 0x43, 0x4b, 0x8b, - 0x29, 0xae, 0x77, 0x5a, 0xd8, 0xc2, 0xe4, 0x8c, 0x53, 0x91 }}; -static git_oid empty_tree = {{ 0x4b, 0x82, 0x5d, 0xc6, 0x42, 0xcb, 0x6e, 0xb9, 0xa0, 0x60, - 0xe5, 0x4b, 0xf8, 0xd6, 0x92, 0x88, 0xfb, 0xee, 0x49, 0x04 }}; - -static int hardcoded_objects(git_rawobj *raw, const git_oid *id) -{ - if (!git_oid_cmp(id, &empty_blob)) { - raw->type = GIT_OBJ_BLOB; - raw->len = 0; - raw->data = git__calloc(1, sizeof(uint8_t)); - return 0; - } else if (!git_oid_cmp(id, &empty_tree)) { - raw->type = GIT_OBJ_TREE; - raw->len = 0; - raw->data = git__calloc(1, sizeof(uint8_t)); - return 0; - } else { - return GIT_ENOTFOUND; - } -} - -static int odb_read_1(git_odb_object **out, git_odb *db, const git_oid *id, - bool only_refreshed) -{ - size_t i; - git_rawobj raw; - git_odb_object *object; - bool found = false; - - if (!hardcoded_objects(&raw, id)) - found = true; - - for (i = 0; i < db->backends.length && !found; ++i) { - backend_internal *internal = git_vector_get(&db->backends, i); - git_odb_backend *b = internal->backend; - - if (only_refreshed && !b->refresh) - continue; - - if (b->read != NULL) { - int error = b->read(&raw.data, &raw.len, &raw.type, b, id); - if (error == GIT_PASSTHROUGH || error == GIT_ENOTFOUND) - continue; - - if (error < 0) - return error; - - found = true; - } - } - - if (!found) - return GIT_ENOTFOUND; - - giterr_clear(); - if ((object = odb_object__alloc(id, &raw)) == NULL) - return -1; - - *out = git_cache_store_raw(odb_cache(db), object); - return 0; -} - -int git_odb_read(git_odb_object **out, git_odb *db, const git_oid *id) -{ - int error; - - assert(out && db && id); - - *out = git_cache_get_raw(odb_cache(db), id); - if (*out != NULL) - return 0; - - error = odb_read_1(out, db, id, false); - - if (error == GIT_ENOTFOUND && !git_odb_refresh(db)) - error = odb_read_1(out, db, id, true); - - if (error == GIT_ENOTFOUND) - return git_odb__error_notfound("no match for id", id, GIT_OID_HEXSZ); - - return error; -} - -static int read_prefix_1(git_odb_object **out, git_odb *db, - const git_oid *key, size_t len, bool only_refreshed) -{ - size_t i; - int error = GIT_ENOTFOUND; - git_oid found_full_oid = {{0}}; - git_rawobj raw; - void *data = NULL; - bool found = false; - git_odb_object *object; - - for (i = 0; i < db->backends.length; ++i) { - backend_internal *internal = git_vector_get(&db->backends, i); - git_odb_backend *b = internal->backend; - - if (only_refreshed && !b->refresh) - continue; - - if (b->read_prefix != NULL) { - git_oid full_oid; - error = b->read_prefix(&full_oid, &raw.data, &raw.len, &raw.type, b, key, len); - if (error == GIT_ENOTFOUND || error == GIT_PASSTHROUGH) - continue; - - if (error) - return error; - - git__free(data); - data = raw.data; - - if (found && git_oid__cmp(&full_oid, &found_full_oid)) { - git__free(raw.data); - return git_odb__error_ambiguous("multiple matches for prefix"); - } - - found_full_oid = full_oid; - found = true; - } - } - - if (!found) - return GIT_ENOTFOUND; - - if ((object = odb_object__alloc(&found_full_oid, &raw)) == NULL) - return -1; - - *out = git_cache_store_raw(odb_cache(db), object); - return 0; -} - -int git_odb_read_prefix( - git_odb_object **out, git_odb *db, const git_oid *short_id, size_t len) -{ - git_oid key = {{0}}; - int error; - - assert(out && db); - - if (len < GIT_OID_MINPREFIXLEN) - return git_odb__error_ambiguous("prefix length too short"); - - if (len > GIT_OID_HEXSZ) - len = GIT_OID_HEXSZ; - - if (len == GIT_OID_HEXSZ) { - *out = git_cache_get_raw(odb_cache(db), short_id); - if (*out != NULL) - return 0; - } - - /* just copy valid part of short_id */ - memcpy(&key.id, short_id->id, (len + 1) / 2); - if (len & 1) - key.id[len / 2] &= 0xF0; - - error = read_prefix_1(out, db, &key, len, false); - - if (error == GIT_ENOTFOUND && !git_odb_refresh(db)) - error = read_prefix_1(out, db, &key, len, true); - - if (error == GIT_ENOTFOUND) - return git_odb__error_notfound("no match for prefix", &key, len); - - return error; -} - -int git_odb_foreach(git_odb *db, git_odb_foreach_cb cb, void *payload) -{ - unsigned int i; - backend_internal *internal; - - git_vector_foreach(&db->backends, i, internal) { - git_odb_backend *b = internal->backend; - int error = b->foreach(b, cb, payload); - if (error < 0) - return error; - } - - return 0; -} - -int git_odb_write( - git_oid *oid, git_odb *db, const void *data, size_t len, git_otype type) -{ - size_t i; - int error = GIT_ERROR; - git_odb_stream *stream; - - assert(oid && db); - - git_odb_hash(oid, data, len, type); - if (git_odb_exists(db, oid)) - return 0; - - for (i = 0; i < db->backends.length && error < 0; ++i) { - backend_internal *internal = git_vector_get(&db->backends, i); - git_odb_backend *b = internal->backend; - - /* we don't write in alternates! */ - if (internal->is_alternate) - continue; - - if (b->write != NULL) - error = b->write(b, oid, data, len, type); - } - - if (!error || error == GIT_PASSTHROUGH) - return 0; - - /* if no backends were able to write the object directly, we try a - * streaming write to the backends; just write the whole object into the - * stream in one push - */ - if ((error = git_odb_open_wstream(&stream, db, len, type)) != 0) - return error; - - stream->write(stream, data, len); - error = stream->finalize_write(stream, oid); - git_odb_stream_free(stream); - - return error; -} - -static void hash_header(git_hash_ctx *ctx, git_off_t size, git_otype type) -{ - char header[64]; - int hdrlen; - - hdrlen = git_odb__format_object_header(header, sizeof(header), size, type); - git_hash_update(ctx, header, hdrlen); -} - -int git_odb_open_wstream( - git_odb_stream **stream, git_odb *db, git_off_t size, git_otype type) -{ - size_t i, writes = 0; - int error = GIT_ERROR; - git_hash_ctx *ctx = NULL; - - assert(stream && db); - - for (i = 0; i < db->backends.length && error < 0; ++i) { - backend_internal *internal = git_vector_get(&db->backends, i); - git_odb_backend *b = internal->backend; - - /* we don't write in alternates! */ - if (internal->is_alternate) - continue; - - if (b->writestream != NULL) { - ++writes; - error = b->writestream(stream, b, size, type); - } else if (b->write != NULL) { - ++writes; - error = init_fake_wstream(stream, b, size, type); - } - } - - if (error < 0) { - if (error == GIT_PASSTHROUGH) - error = 0; - else if (!writes) - error = git_odb__error_unsupported_in_backend("write object"); - - goto done; - } - - ctx = git__malloc(sizeof(git_hash_ctx)); - GITERR_CHECK_ALLOC(ctx); - - if ((error = git_hash_ctx_init(ctx)) < 0) - goto done; - - hash_header(ctx, size, type); - (*stream)->hash_ctx = ctx; - - (*stream)->declared_size = size; - (*stream)->received_bytes = 0; - -done: - return error; -} - -static int git_odb_stream__invalid_length( - const git_odb_stream *stream, - const char *action) -{ - giterr_set(GITERR_ODB, - "Cannot %s - " - "Invalid length. %"PRIuZ" was expected. The " - "total size of the received chunks amounts to %"PRIuZ".", - action, stream->declared_size, stream->received_bytes); - - return -1; -} - -int git_odb_stream_write(git_odb_stream *stream, const char *buffer, size_t len) -{ - git_hash_update(stream->hash_ctx, buffer, len); - - stream->received_bytes += len; - - if (stream->received_bytes > stream->declared_size) - return git_odb_stream__invalid_length(stream, - "stream_write()"); - - return stream->write(stream, buffer, len); -} - -int git_odb_stream_finalize_write(git_oid *out, git_odb_stream *stream) -{ - if (stream->received_bytes != stream->declared_size) - return git_odb_stream__invalid_length(stream, - "stream_finalize_write()"); - - git_hash_final(out, stream->hash_ctx); - - if (git_odb_exists(stream->backend->odb, out)) - return 0; - - return stream->finalize_write(stream, out); -} - -int git_odb_stream_read(git_odb_stream *stream, char *buffer, size_t len) -{ - return stream->read(stream, buffer, len); -} - -void git_odb_stream_free(git_odb_stream *stream) -{ - if (stream == NULL) - return; - - git_hash_ctx_cleanup(stream->hash_ctx); - git__free(stream->hash_ctx); - stream->free(stream); -} - -int git_odb_open_rstream(git_odb_stream **stream, git_odb *db, const git_oid *oid) -{ - size_t i, reads = 0; - int error = GIT_ERROR; - - assert(stream && db); - - for (i = 0; i < db->backends.length && error < 0; ++i) { - backend_internal *internal = git_vector_get(&db->backends, i); - git_odb_backend *b = internal->backend; - - if (b->readstream != NULL) { - ++reads; - error = b->readstream(stream, b, oid); - } - } - - if (error == GIT_PASSTHROUGH) - error = 0; - if (error < 0 && !reads) - error = git_odb__error_unsupported_in_backend("read object streamed"); - - return error; -} - -int git_odb_write_pack(struct git_odb_writepack **out, git_odb *db, git_transfer_progress_cb progress_cb, void *progress_payload) -{ - size_t i, writes = 0; - int error = GIT_ERROR; - - assert(out && db); - - for (i = 0; i < db->backends.length && error < 0; ++i) { - backend_internal *internal = git_vector_get(&db->backends, i); - git_odb_backend *b = internal->backend; - - /* we don't write in alternates! */ - if (internal->is_alternate) - continue; - - if (b->writepack != NULL) { - ++writes; - error = b->writepack(out, b, db, progress_cb, progress_payload); - } - } - - if (error == GIT_PASSTHROUGH) - error = 0; - if (error < 0 && !writes) - error = git_odb__error_unsupported_in_backend("write pack"); - - return error; -} - -void *git_odb_backend_malloc(git_odb_backend *backend, size_t len) -{ - GIT_UNUSED(backend); - return git__malloc(len); -} - -int git_odb_refresh(struct git_odb *db) -{ - size_t i; - assert(db); - - for (i = 0; i < db->backends.length; ++i) { - backend_internal *internal = git_vector_get(&db->backends, i); - git_odb_backend *b = internal->backend; - - if (b->refresh != NULL) { - int error = b->refresh(b); - if (error < 0) - return error; - } - } - - return 0; -} - -int git_odb__error_notfound( - const char *message, const git_oid *oid, size_t oid_len) -{ - if (oid != NULL) { - char oid_str[GIT_OID_HEXSZ + 1]; - git_oid_tostr(oid_str, oid_len, oid); - giterr_set(GITERR_ODB, "Object not found - %s (%.*s)", - message, oid_len, oid_str); - } else - giterr_set(GITERR_ODB, "Object not found - %s", message); - - return GIT_ENOTFOUND; -} - -int git_odb__error_ambiguous(const char *message) -{ - giterr_set(GITERR_ODB, "Ambiguous SHA1 prefix - %s", message); - return GIT_EAMBIGUOUS; -} - -int git_odb_init_backend(git_odb_backend *backend, unsigned int version) -{ - GIT_INIT_STRUCTURE_FROM_TEMPLATE( - backend, version, git_odb_backend, GIT_ODB_BACKEND_INIT); - return 0; -} diff --git a/vendor/libgit2/src/odb.h b/vendor/libgit2/src/odb.h deleted file mode 100644 index 31a9fd1b9..000000000 --- a/vendor/libgit2/src/odb.h +++ /dev/null @@ -1,104 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_odb_h__ -#define INCLUDE_odb_h__ - -#include "git2/odb.h" -#include "git2/oid.h" -#include "git2/types.h" - -#include "vector.h" -#include "cache.h" -#include "posix.h" -#include "filter.h" - -#define GIT_OBJECTS_DIR "objects/" -#define GIT_OBJECT_DIR_MODE 0777 -#define GIT_OBJECT_FILE_MODE 0444 - -/* DO NOT EXPORT */ -typedef struct { - void *data; /**< Raw, decompressed object data. */ - size_t len; /**< Total number of bytes in data. */ - git_otype type; /**< Type of this object. */ -} git_rawobj; - -/* EXPORT */ -struct git_odb_object { - git_cached_obj cached; - void *buffer; -}; - -/* EXPORT */ -struct git_odb { - git_refcount rc; - git_vector backends; - git_cache own_cache; -}; - -/* - * Hash a git_rawobj internally. - * The `git_rawobj` is supposed to be previously initialized - */ -int git_odb__hashobj(git_oid *id, git_rawobj *obj); - -/* - * Format the object header such as it would appear in the on-disk object - */ -int git_odb__format_object_header(char *hdr, size_t n, git_off_t obj_len, git_otype obj_type); -/* - * Hash an open file descriptor. - * This is a performance call when the contents of a fd need to be hashed, - * but the fd is already open and we have the size of the contents. - * - * Saves us some `stat` calls. - * - * The fd is never closed, not even on error. It must be opened and closed - * by the caller - */ -int git_odb__hashfd(git_oid *out, git_file fd, size_t size, git_otype type); - -/* - * Hash an open file descriptor applying an array of filters - * Acts just like git_odb__hashfd with the addition of filters... - */ -int git_odb__hashfd_filtered( - git_oid *out, git_file fd, size_t len, git_otype type, git_filter_list *fl); - -/* - * Hash a `path`, assuming it could be a POSIX symlink: if the path is a - * symlink, then the raw contents of the symlink will be hashed. Otherwise, - * this will fallback to `git_odb__hashfd`. - * - * The hash type for this call is always `GIT_OBJ_BLOB` because symlinks may - * only point to blobs. - */ -int git_odb__hashlink(git_oid *out, const char *path); - -/* - * Generate a GIT_ENOTFOUND error for the ODB. - */ -int git_odb__error_notfound( - const char *message, const git_oid *oid, size_t oid_len); - -/* - * Generate a GIT_EAMBIGUOUS error for the ODB. - */ -int git_odb__error_ambiguous(const char *message); - -/* - * Attempt to read object header or just return whole object if it could - * not be read. - */ -int git_odb__read_header_or_object( - git_odb_object **out, size_t *len_p, git_otype *type_p, - git_odb *db, const git_oid *id); - -/* fully free the object; internal method, DO NOT EXPORT */ -void git_odb_object__free(void *object); - -#endif diff --git a/vendor/libgit2/src/odb_loose.c b/vendor/libgit2/src/odb_loose.c deleted file mode 100644 index 9d9bffd21..000000000 --- a/vendor/libgit2/src/odb_loose.c +++ /dev/null @@ -1,982 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "common.h" -#include -#include "git2/object.h" -#include "git2/sys/odb_backend.h" -#include "fileops.h" -#include "hash.h" -#include "odb.h" -#include "delta-apply.h" -#include "filebuf.h" - -#include "git2/odb_backend.h" -#include "git2/types.h" - -typedef struct { /* object header data */ - git_otype type; /* object type */ - size_t size; /* object size */ -} obj_hdr; - -typedef struct { - git_odb_stream stream; - git_filebuf fbuf; -} loose_writestream; - -typedef struct loose_backend { - git_odb_backend parent; - - int object_zlib_level; /** loose object zlib compression level. */ - int fsync_object_files; /** loose object file fsync flag. */ - mode_t object_file_mode; - mode_t object_dir_mode; - - size_t objects_dirlen; - char objects_dir[GIT_FLEX_ARRAY]; -} loose_backend; - -/* State structure for exploring directories, - * in order to locate objects matching a short oid. - */ -typedef struct { - size_t dir_len; - unsigned char short_oid[GIT_OID_HEXSZ]; /* hex formatted oid to match */ - size_t short_oid_len; - int found; /* number of matching - * objects already found */ - unsigned char res_oid[GIT_OID_HEXSZ]; /* hex formatted oid of - * the object found */ -} loose_locate_object_state; - - -/*********************************************************** - * - * MISCELLANEOUS HELPER FUNCTIONS - * - ***********************************************************/ - -static int object_file_name( - git_buf *name, const loose_backend *be, const git_oid *id) -{ - size_t alloclen; - - /* expand length for object root + 40 hex sha1 chars + 2 * '/' + '\0' */ - GITERR_CHECK_ALLOC_ADD(&alloclen, be->objects_dirlen, GIT_OID_HEXSZ); - GITERR_CHECK_ALLOC_ADD(&alloclen, alloclen, 3); - if (git_buf_grow(name, alloclen) < 0) - return -1; - - git_buf_set(name, be->objects_dir, be->objects_dirlen); - git_path_to_dir(name); - - /* loose object filename: aa/aaa... (41 bytes) */ - git_oid_pathfmt(name->ptr + name->size, id); - name->size += GIT_OID_HEXSZ + 1; - name->ptr[name->size] = '\0'; - - return 0; -} - -static int object_mkdir(const git_buf *name, const loose_backend *be) -{ - return git_futils_mkdir_relative( - name->ptr + be->objects_dirlen, be->objects_dir, be->object_dir_mode, - GIT_MKDIR_PATH | GIT_MKDIR_SKIP_LAST | GIT_MKDIR_VERIFY_DIR, NULL); -} - -static size_t get_binary_object_header(obj_hdr *hdr, git_buf *obj) -{ - unsigned char c; - unsigned char *data = (unsigned char *)obj->ptr; - size_t shift, size, used = 0; - - if (git_buf_len(obj) == 0) - return 0; - - c = data[used++]; - hdr->type = (c >> 4) & 7; - - size = c & 15; - shift = 4; - while (c & 0x80) { - if (git_buf_len(obj) <= used) - return 0; - if (sizeof(size_t) * 8 <= shift) - return 0; - c = data[used++]; - size += (c & 0x7f) << shift; - shift += 7; - } - hdr->size = size; - - return used; -} - -static size_t get_object_header(obj_hdr *hdr, unsigned char *data) -{ - char c, typename[10]; - size_t size, used = 0; - - /* - * type name string followed by space. - */ - while ((c = data[used]) != ' ') { - typename[used++] = c; - if (used >= sizeof(typename)) - return 0; - } - typename[used] = 0; - if (used == 0) - return 0; - hdr->type = git_object_string2type(typename); - used++; /* consume the space */ - - /* - * length follows immediately in decimal (without - * leading zeros). - */ - size = data[used++] - '0'; - if (size > 9) - return 0; - if (size) { - while ((c = data[used]) != '\0') { - size_t d = c - '0'; - if (d > 9) - break; - used++; - size = size * 10 + d; - } - } - hdr->size = size; - - /* - * the length must be followed by a zero byte - */ - if (data[used++] != '\0') - return 0; - - return used; -} - - - -/*********************************************************** - * - * ZLIB RELATED FUNCTIONS - * - ***********************************************************/ - -static void init_stream(z_stream *s, void *out, size_t len) -{ - memset(s, 0, sizeof(*s)); - s->next_out = out; - s->avail_out = (uInt)len; -} - -static void set_stream_input(z_stream *s, void *in, size_t len) -{ - s->next_in = in; - s->avail_in = (uInt)len; -} - -static void set_stream_output(z_stream *s, void *out, size_t len) -{ - s->next_out = out; - s->avail_out = (uInt)len; -} - - -static int start_inflate(z_stream *s, git_buf *obj, void *out, size_t len) -{ - int status; - - init_stream(s, out, len); - set_stream_input(s, obj->ptr, git_buf_len(obj)); - - if ((status = inflateInit(s)) < Z_OK) - return status; - - return inflate(s, 0); -} - -static int finish_inflate(z_stream *s) -{ - int status = Z_OK; - - while (status == Z_OK) - status = inflate(s, Z_FINISH); - - inflateEnd(s); - - if ((status != Z_STREAM_END) || (s->avail_in != 0)) { - giterr_set(GITERR_ZLIB, "Failed to finish ZLib inflation. Stream aborted prematurely"); - return -1; - } - - return 0; -} - -static int is_zlib_compressed_data(unsigned char *data) -{ - unsigned int w; - - w = ((unsigned int)(data[0]) << 8) + data[1]; - return (data[0] & 0x8F) == 0x08 && !(w % 31); -} - -static int inflate_buffer(void *in, size_t inlen, void *out, size_t outlen) -{ - z_stream zs; - int status = Z_OK; - - memset(&zs, 0x0, sizeof(zs)); - - zs.next_out = out; - zs.avail_out = (uInt)outlen; - - zs.next_in = in; - zs.avail_in = (uInt)inlen; - - if (inflateInit(&zs) < Z_OK) { - giterr_set(GITERR_ZLIB, "Failed to inflate buffer"); - return -1; - } - - while (status == Z_OK) - status = inflate(&zs, Z_FINISH); - - inflateEnd(&zs); - - if (status != Z_STREAM_END /* || zs.avail_in != 0 */ || - zs.total_out != outlen) - { - giterr_set(GITERR_ZLIB, "Failed to inflate buffer. Stream aborted prematurely"); - return -1; - } - - return 0; -} - -static void *inflate_tail(z_stream *s, void *hb, size_t used, obj_hdr *hdr) -{ - unsigned char *buf, *head = hb; - size_t tail, alloc_size; - - /* - * allocate a buffer to hold the inflated data and copy the - * initial sequence of inflated data from the tail of the - * head buffer, if any. - */ - if (GIT_ADD_SIZET_OVERFLOW(&alloc_size, hdr->size, 1) || - (buf = git__malloc(alloc_size)) == NULL) { - inflateEnd(s); - return NULL; - } - tail = s->total_out - used; - if (used > 0 && tail > 0) { - if (tail > hdr->size) - tail = hdr->size; - memcpy(buf, head + used, tail); - } - used = tail; - - /* - * inflate the remainder of the object data, if any - */ - if (hdr->size < used) - inflateEnd(s); - else { - set_stream_output(s, buf + used, hdr->size - used); - if (finish_inflate(s)) { - git__free(buf); - return NULL; - } - } - - return buf; -} - -/* - * At one point, there was a loose object format that was intended to - * mimic the format used in pack-files. This was to allow easy copying - * of loose object data into packs. This format is no longer used, but - * we must still read it. - */ -static int inflate_packlike_loose_disk_obj(git_rawobj *out, git_buf *obj) -{ - unsigned char *in, *buf; - obj_hdr hdr; - size_t len, used, alloclen; - - /* - * read the object header, which is an (uncompressed) - * binary encoding of the object type and size. - */ - if ((used = get_binary_object_header(&hdr, obj)) == 0 || - !git_object_typeisloose(hdr.type)) { - giterr_set(GITERR_ODB, "Failed to inflate loose object."); - return -1; - } - - /* - * allocate a buffer and inflate the data into it - */ - GITERR_CHECK_ALLOC_ADD(&alloclen, hdr.size, 1); - buf = git__malloc(alloclen); - GITERR_CHECK_ALLOC(buf); - - in = ((unsigned char *)obj->ptr) + used; - len = obj->size - used; - if (inflate_buffer(in, len, buf, hdr.size) < 0) { - git__free(buf); - return -1; - } - buf[hdr.size] = '\0'; - - out->data = buf; - out->len = hdr.size; - out->type = hdr.type; - - return 0; -} - -static int inflate_disk_obj(git_rawobj *out, git_buf *obj) -{ - unsigned char head[64], *buf; - z_stream zs; - obj_hdr hdr; - size_t used; - - /* - * check for a pack-like loose object - */ - if (!is_zlib_compressed_data((unsigned char *)obj->ptr)) - return inflate_packlike_loose_disk_obj(out, obj); - - /* - * inflate the initial part of the io buffer in order - * to parse the object header (type and size). - */ - if (start_inflate(&zs, obj, head, sizeof(head)) < Z_OK || - (used = get_object_header(&hdr, head)) == 0 || - !git_object_typeisloose(hdr.type)) - { - giterr_set(GITERR_ODB, "Failed to inflate disk object."); - return -1; - } - - /* - * allocate a buffer and inflate the object data into it - * (including the initial sequence in the head buffer). - */ - if ((buf = inflate_tail(&zs, head, used, &hdr)) == NULL) - return -1; - buf[hdr.size] = '\0'; - - out->data = buf; - out->len = hdr.size; - out->type = hdr.type; - - return 0; -} - - - - - - -/*********************************************************** - * - * ODB OBJECT READING & WRITING - * - * Backend for the public API; read headers and full objects - * from the ODB. Write raw data to the ODB. - * - ***********************************************************/ - -static int read_loose(git_rawobj *out, git_buf *loc) -{ - int error; - git_buf obj = GIT_BUF_INIT; - - assert(out && loc); - - if (git_buf_oom(loc)) - return -1; - - out->data = NULL; - out->len = 0; - out->type = GIT_OBJ_BAD; - - if (!(error = git_futils_readbuffer(&obj, loc->ptr))) - error = inflate_disk_obj(out, &obj); - - git_buf_free(&obj); - - return error; -} - -static int read_header_loose(git_rawobj *out, git_buf *loc) -{ - int error = 0, z_return = Z_ERRNO, read_bytes; - git_file fd; - z_stream zs; - obj_hdr header_obj; - unsigned char raw_buffer[16], inflated_buffer[64]; - - assert(out && loc); - - if (git_buf_oom(loc)) - return -1; - - out->data = NULL; - - if ((fd = git_futils_open_ro(loc->ptr)) < 0) - return fd; - - init_stream(&zs, inflated_buffer, sizeof(inflated_buffer)); - - z_return = inflateInit(&zs); - - while (z_return == Z_OK) { - if ((read_bytes = p_read(fd, raw_buffer, sizeof(raw_buffer))) > 0) { - set_stream_input(&zs, raw_buffer, read_bytes); - z_return = inflate(&zs, 0); - } else - z_return = Z_STREAM_END; - } - - if ((z_return != Z_STREAM_END && z_return != Z_BUF_ERROR) - || get_object_header(&header_obj, inflated_buffer) == 0 - || git_object_typeisloose(header_obj.type) == 0) - { - giterr_set(GITERR_ZLIB, "Failed to read loose object header"); - error = -1; - } else { - out->len = header_obj.size; - out->type = header_obj.type; - } - - finish_inflate(&zs); - p_close(fd); - - return error; -} - -static int locate_object( - git_buf *object_location, - loose_backend *backend, - const git_oid *oid) -{ - int error = object_file_name(object_location, backend, oid); - - if (!error && !git_path_exists(object_location->ptr)) - return GIT_ENOTFOUND; - - return error; -} - -/* Explore an entry of a directory and see if it matches a short oid */ -static int fn_locate_object_short_oid(void *state, git_buf *pathbuf) { - loose_locate_object_state *sstate = (loose_locate_object_state *)state; - - if (git_buf_len(pathbuf) - sstate->dir_len != GIT_OID_HEXSZ - 2) { - /* Entry cannot be an object. Continue to next entry */ - return 0; - } - - if (git_path_isdir(pathbuf->ptr) == false) { - /* We are already in the directory matching the 2 first hex characters, - * compare the first ncmp characters of the oids */ - if (!memcmp(sstate->short_oid + 2, - (unsigned char *)pathbuf->ptr + sstate->dir_len, - sstate->short_oid_len - 2)) { - - if (!sstate->found) { - sstate->res_oid[0] = sstate->short_oid[0]; - sstate->res_oid[1] = sstate->short_oid[1]; - memcpy(sstate->res_oid+2, pathbuf->ptr+sstate->dir_len, GIT_OID_HEXSZ-2); - } - sstate->found++; - } - } - - if (sstate->found > 1) - return GIT_EAMBIGUOUS; - - return 0; -} - -/* Locate an object matching a given short oid */ -static int locate_object_short_oid( - git_buf *object_location, - git_oid *res_oid, - loose_backend *backend, - const git_oid *short_oid, - size_t len) -{ - char *objects_dir = backend->objects_dir; - size_t dir_len = strlen(objects_dir), alloc_len; - loose_locate_object_state state; - int error; - - /* prealloc memory for OBJ_DIR/xx/xx..38x..xx */ - GITERR_CHECK_ALLOC_ADD(&alloc_len, dir_len, GIT_OID_HEXSZ); - GITERR_CHECK_ALLOC_ADD(&alloc_len, alloc_len, 3); - if (git_buf_grow(object_location, alloc_len) < 0) - return -1; - - git_buf_set(object_location, objects_dir, dir_len); - git_path_to_dir(object_location); - - /* save adjusted position at end of dir so it can be restored later */ - dir_len = git_buf_len(object_location); - - /* Convert raw oid to hex formatted oid */ - git_oid_fmt((char *)state.short_oid, short_oid); - - /* Explore OBJ_DIR/xx/ where xx is the beginning of hex formatted short oid */ - if (git_buf_put(object_location, (char *)state.short_oid, 3) < 0) - return -1; - object_location->ptr[object_location->size - 1] = '/'; - - /* Check that directory exists */ - if (git_path_isdir(object_location->ptr) == false) - return git_odb__error_notfound("no matching loose object for prefix", - short_oid, len); - - state.dir_len = git_buf_len(object_location); - state.short_oid_len = len; - state.found = 0; - - /* Explore directory to find a unique object matching short_oid */ - error = git_path_direach( - object_location, 0, fn_locate_object_short_oid, &state); - if (error < 0 && error != GIT_EAMBIGUOUS) - return error; - - if (!state.found) - return git_odb__error_notfound("no matching loose object for prefix", - short_oid, len); - - if (state.found > 1) - return git_odb__error_ambiguous("multiple matches in loose objects"); - - /* Convert obtained hex formatted oid to raw */ - error = git_oid_fromstr(res_oid, (char *)state.res_oid); - if (error) - return error; - - /* Update the location according to the oid obtained */ - GITERR_CHECK_ALLOC_ADD(&alloc_len, dir_len, GIT_OID_HEXSZ); - GITERR_CHECK_ALLOC_ADD(&alloc_len, alloc_len, 2); - - git_buf_truncate(object_location, dir_len); - if (git_buf_grow(object_location, alloc_len) < 0) - return -1; - - git_oid_pathfmt(object_location->ptr + dir_len, res_oid); - - object_location->size += GIT_OID_HEXSZ + 1; - object_location->ptr[object_location->size] = '\0'; - - return 0; -} - - - - - - - - - -/*********************************************************** - * - * LOOSE BACKEND PUBLIC API - * - * Implement the git_odb_backend API calls - * - ***********************************************************/ - -static int loose_backend__read_header(size_t *len_p, git_otype *type_p, git_odb_backend *backend, const git_oid *oid) -{ - git_buf object_path = GIT_BUF_INIT; - git_rawobj raw; - int error; - - assert(backend && oid); - - raw.len = 0; - raw.type = GIT_OBJ_BAD; - - if (locate_object(&object_path, (loose_backend *)backend, oid) < 0) { - error = git_odb__error_notfound("no matching loose object", - oid, GIT_OID_HEXSZ); - } else if ((error = read_header_loose(&raw, &object_path)) == 0) { - *len_p = raw.len; - *type_p = raw.type; - } - - git_buf_free(&object_path); - - return error; -} - -static int loose_backend__read(void **buffer_p, size_t *len_p, git_otype *type_p, git_odb_backend *backend, const git_oid *oid) -{ - git_buf object_path = GIT_BUF_INIT; - git_rawobj raw; - int error = 0; - - assert(backend && oid); - - if (locate_object(&object_path, (loose_backend *)backend, oid) < 0) { - error = git_odb__error_notfound("no matching loose object", - oid, GIT_OID_HEXSZ); - } else if ((error = read_loose(&raw, &object_path)) == 0) { - *buffer_p = raw.data; - *len_p = raw.len; - *type_p = raw.type; - } - - git_buf_free(&object_path); - - return error; -} - -static int loose_backend__read_prefix( - git_oid *out_oid, - void **buffer_p, - size_t *len_p, - git_otype *type_p, - git_odb_backend *backend, - const git_oid *short_oid, - size_t len) -{ - int error = 0; - - assert(len >= GIT_OID_MINPREFIXLEN && len <= GIT_OID_HEXSZ); - - if (len == GIT_OID_HEXSZ) { - /* We can fall back to regular read method */ - error = loose_backend__read(buffer_p, len_p, type_p, backend, short_oid); - if (!error) - git_oid_cpy(out_oid, short_oid); - } else { - git_buf object_path = GIT_BUF_INIT; - git_rawobj raw; - - assert(backend && short_oid); - - if ((error = locate_object_short_oid(&object_path, out_oid, - (loose_backend *)backend, short_oid, len)) == 0 && - (error = read_loose(&raw, &object_path)) == 0) - { - *buffer_p = raw.data; - *len_p = raw.len; - *type_p = raw.type; - } - - git_buf_free(&object_path); - } - - return error; -} - -static int loose_backend__exists(git_odb_backend *backend, const git_oid *oid) -{ - git_buf object_path = GIT_BUF_INIT; - int error; - - assert(backend && oid); - - error = locate_object(&object_path, (loose_backend *)backend, oid); - - git_buf_free(&object_path); - - return !error; -} - -static int loose_backend__exists_prefix( - git_oid *out, git_odb_backend *backend, const git_oid *short_id, size_t len) -{ - git_buf object_path = GIT_BUF_INIT; - int error; - - assert(backend && out && short_id && len >= GIT_OID_MINPREFIXLEN); - - error = locate_object_short_oid( - &object_path, out, (loose_backend *)backend, short_id, len); - - git_buf_free(&object_path); - - return error; -} - -struct foreach_state { - size_t dir_len; - git_odb_foreach_cb cb; - void *data; -}; - -GIT_INLINE(int) filename_to_oid(git_oid *oid, const char *ptr) -{ - int v, i = 0; - if (strlen(ptr) != GIT_OID_HEXSZ+1) - return -1; - - if (ptr[2] != '/') { - return -1; - } - - v = (git__fromhex(ptr[i]) << 4) | git__fromhex(ptr[i+1]); - if (v < 0) - return -1; - - oid->id[0] = (unsigned char) v; - - ptr += 3; - for (i = 0; i < 38; i += 2) { - v = (git__fromhex(ptr[i]) << 4) | git__fromhex(ptr[i + 1]); - if (v < 0) - return -1; - - oid->id[1 + i/2] = (unsigned char) v; - } - - return 0; -} - -static int foreach_object_dir_cb(void *_state, git_buf *path) -{ - git_oid oid; - struct foreach_state *state = (struct foreach_state *) _state; - - if (filename_to_oid(&oid, path->ptr + state->dir_len) < 0) - return 0; - - return giterr_set_after_callback_function( - state->cb(&oid, state->data), "git_odb_foreach"); -} - -static int foreach_cb(void *_state, git_buf *path) -{ - struct foreach_state *state = (struct foreach_state *) _state; - - /* non-dir is some stray file, ignore it */ - if (!git_path_isdir(git_buf_cstr(path))) - return 0; - - return git_path_direach(path, 0, foreach_object_dir_cb, state); -} - -static int loose_backend__foreach(git_odb_backend *_backend, git_odb_foreach_cb cb, void *data) -{ - char *objects_dir; - int error; - git_buf buf = GIT_BUF_INIT; - struct foreach_state state; - loose_backend *backend = (loose_backend *) _backend; - - assert(backend && cb); - - objects_dir = backend->objects_dir; - - git_buf_sets(&buf, objects_dir); - git_path_to_dir(&buf); - if (git_buf_oom(&buf)) - return -1; - - memset(&state, 0, sizeof(state)); - state.cb = cb; - state.data = data; - state.dir_len = git_buf_len(&buf); - - error = git_path_direach(&buf, 0, foreach_cb, &state); - - git_buf_free(&buf); - - return error; -} - -static int loose_backend__stream_fwrite(git_odb_stream *_stream, const git_oid *oid) -{ - loose_writestream *stream = (loose_writestream *)_stream; - loose_backend *backend = (loose_backend *)_stream->backend; - git_buf final_path = GIT_BUF_INIT; - int error = 0; - - if (object_file_name(&final_path, backend, oid) < 0 || - object_mkdir(&final_path, backend) < 0) - error = -1; - else - error = git_filebuf_commit_at( - &stream->fbuf, final_path.ptr); - - git_buf_free(&final_path); - - return error; -} - -static int loose_backend__stream_write(git_odb_stream *_stream, const char *data, size_t len) -{ - loose_writestream *stream = (loose_writestream *)_stream; - return git_filebuf_write(&stream->fbuf, data, len); -} - -static void loose_backend__stream_free(git_odb_stream *_stream) -{ - loose_writestream *stream = (loose_writestream *)_stream; - - git_filebuf_cleanup(&stream->fbuf); - git__free(stream); -} - -static int loose_backend__stream(git_odb_stream **stream_out, git_odb_backend *_backend, git_off_t length, git_otype type) -{ - loose_backend *backend; - loose_writestream *stream = NULL; - char hdr[64]; - git_buf tmp_path = GIT_BUF_INIT; - int hdrlen; - - assert(_backend && length >= 0); - - backend = (loose_backend *)_backend; - *stream_out = NULL; - - hdrlen = git_odb__format_object_header(hdr, sizeof(hdr), length, type); - - stream = git__calloc(1, sizeof(loose_writestream)); - GITERR_CHECK_ALLOC(stream); - - stream->stream.backend = _backend; - stream->stream.read = NULL; /* read only */ - stream->stream.write = &loose_backend__stream_write; - stream->stream.finalize_write = &loose_backend__stream_fwrite; - stream->stream.free = &loose_backend__stream_free; - stream->stream.mode = GIT_STREAM_WRONLY; - - if (git_buf_joinpath(&tmp_path, backend->objects_dir, "tmp_object") < 0 || - git_filebuf_open(&stream->fbuf, tmp_path.ptr, - GIT_FILEBUF_TEMPORARY | - (backend->object_zlib_level << GIT_FILEBUF_DEFLATE_SHIFT), - backend->object_file_mode) < 0 || - stream->stream.write((git_odb_stream *)stream, hdr, hdrlen) < 0) - { - git_filebuf_cleanup(&stream->fbuf); - git__free(stream); - stream = NULL; - } - git_buf_free(&tmp_path); - *stream_out = (git_odb_stream *)stream; - - return !stream ? -1 : 0; -} - -static int loose_backend__write(git_odb_backend *_backend, const git_oid *oid, const void *data, size_t len, git_otype type) -{ - int error = 0, header_len; - git_buf final_path = GIT_BUF_INIT; - char header[64]; - git_filebuf fbuf = GIT_FILEBUF_INIT; - loose_backend *backend; - - backend = (loose_backend *)_backend; - - /* prepare the header for the file */ - header_len = git_odb__format_object_header(header, sizeof(header), len, type); - - if (git_buf_joinpath(&final_path, backend->objects_dir, "tmp_object") < 0 || - git_filebuf_open(&fbuf, final_path.ptr, - GIT_FILEBUF_TEMPORARY | - (backend->object_zlib_level << GIT_FILEBUF_DEFLATE_SHIFT), - backend->object_file_mode) < 0) - { - error = -1; - goto cleanup; - } - - git_filebuf_write(&fbuf, header, header_len); - git_filebuf_write(&fbuf, data, len); - - if (object_file_name(&final_path, backend, oid) < 0 || - object_mkdir(&final_path, backend) < 0 || - git_filebuf_commit_at(&fbuf, final_path.ptr) < 0) - error = -1; - -cleanup: - if (error < 0) - git_filebuf_cleanup(&fbuf); - git_buf_free(&final_path); - return error; -} - -static void loose_backend__free(git_odb_backend *_backend) -{ - loose_backend *backend; - assert(_backend); - backend = (loose_backend *)_backend; - - git__free(backend); -} - -int git_odb_backend_loose( - git_odb_backend **backend_out, - const char *objects_dir, - int compression_level, - int do_fsync, - unsigned int dir_mode, - unsigned int file_mode) -{ - loose_backend *backend; - size_t objects_dirlen, alloclen; - - assert(backend_out && objects_dir); - - objects_dirlen = strlen(objects_dir); - - GITERR_CHECK_ALLOC_ADD(&alloclen, sizeof(loose_backend), objects_dirlen); - GITERR_CHECK_ALLOC_ADD(&alloclen, alloclen, 2); - backend = git__calloc(1, alloclen); - GITERR_CHECK_ALLOC(backend); - - backend->parent.version = GIT_ODB_BACKEND_VERSION; - backend->objects_dirlen = objects_dirlen; - memcpy(backend->objects_dir, objects_dir, objects_dirlen); - if (backend->objects_dir[backend->objects_dirlen - 1] != '/') - backend->objects_dir[backend->objects_dirlen++] = '/'; - - if (compression_level < 0) - compression_level = Z_BEST_SPEED; - - if (dir_mode == 0) - dir_mode = GIT_OBJECT_DIR_MODE; - - if (file_mode == 0) - file_mode = GIT_OBJECT_FILE_MODE; - - backend->object_zlib_level = compression_level; - backend->fsync_object_files = do_fsync; - backend->object_dir_mode = dir_mode; - backend->object_file_mode = file_mode; - - backend->parent.read = &loose_backend__read; - backend->parent.write = &loose_backend__write; - backend->parent.read_prefix = &loose_backend__read_prefix; - backend->parent.read_header = &loose_backend__read_header; - backend->parent.writestream = &loose_backend__stream; - backend->parent.exists = &loose_backend__exists; - backend->parent.exists_prefix = &loose_backend__exists_prefix; - backend->parent.foreach = &loose_backend__foreach; - backend->parent.free = &loose_backend__free; - - *backend_out = (git_odb_backend *)backend; - return 0; -} diff --git a/vendor/libgit2/src/odb_mempack.c b/vendor/libgit2/src/odb_mempack.c deleted file mode 100644 index 594a2784c..000000000 --- a/vendor/libgit2/src/odb_mempack.c +++ /dev/null @@ -1,188 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "common.h" -#include "git2/object.h" -#include "git2/sys/odb_backend.h" -#include "fileops.h" -#include "hash.h" -#include "odb.h" -#include "array.h" -#include "oidmap.h" - -#include "git2/odb_backend.h" -#include "git2/types.h" -#include "git2/pack.h" - -GIT__USE_OIDMAP - -struct memobject { - git_oid oid; - size_t len; - git_otype type; - char data[]; -}; - -struct memory_packer_db { - git_odb_backend parent; - git_oidmap *objects; - git_array_t(struct memobject *) commits; -}; - -static int impl__write(git_odb_backend *_backend, const git_oid *oid, const void *data, size_t len, git_otype type) -{ - struct memory_packer_db *db = (struct memory_packer_db *)_backend; - struct memobject *obj = NULL; - khiter_t pos; - size_t alloc_len; - int rval; - - pos = kh_put(oid, db->objects, oid, &rval); - if (rval < 0) - return -1; - - if (rval == 0) - return 0; - - GITERR_CHECK_ALLOC_ADD(&alloc_len, sizeof(struct memobject), len); - obj = git__malloc(alloc_len); - GITERR_CHECK_ALLOC(obj); - - memcpy(obj->data, data, len); - git_oid_cpy(&obj->oid, oid); - obj->len = len; - obj->type = type; - - kh_key(db->objects, pos) = &obj->oid; - kh_val(db->objects, pos) = obj; - - if (type == GIT_OBJ_COMMIT) { - struct memobject **store = git_array_alloc(db->commits); - GITERR_CHECK_ALLOC(store); - *store = obj; - } - - return 0; -} - -static int impl__exists(git_odb_backend *backend, const git_oid *oid) -{ - struct memory_packer_db *db = (struct memory_packer_db *)backend; - khiter_t pos; - - pos = kh_get(oid, db->objects, oid); - if (pos != kh_end(db->objects)) - return 1; - - return 0; -} - -static int impl__read(void **buffer_p, size_t *len_p, git_otype *type_p, git_odb_backend *backend, const git_oid *oid) -{ - struct memory_packer_db *db = (struct memory_packer_db *)backend; - struct memobject *obj = NULL; - khiter_t pos; - - pos = kh_get(oid, db->objects, oid); - if (pos == kh_end(db->objects)) - return GIT_ENOTFOUND; - - obj = kh_val(db->objects, pos); - - *len_p = obj->len; - *type_p = obj->type; - *buffer_p = git__malloc(obj->len); - GITERR_CHECK_ALLOC(*buffer_p); - - memcpy(*buffer_p, obj->data, obj->len); - return 0; -} - -static int impl__read_header(size_t *len_p, git_otype *type_p, git_odb_backend *backend, const git_oid *oid) -{ - struct memory_packer_db *db = (struct memory_packer_db *)backend; - struct memobject *obj = NULL; - khiter_t pos; - - pos = kh_get(oid, db->objects, oid); - if (pos == kh_end(db->objects)) - return GIT_ENOTFOUND; - - obj = kh_val(db->objects, pos); - - *len_p = obj->len; - *type_p = obj->type; - return 0; -} - -int git_mempack_dump(git_buf *pack, git_repository *repo, git_odb_backend *_backend) -{ - struct memory_packer_db *db = (struct memory_packer_db *)_backend; - git_packbuilder *packbuilder; - uint32_t i; - int err = -1; - - if (git_packbuilder_new(&packbuilder, repo) < 0) - return -1; - - for (i = 0; i < db->commits.size; ++i) { - struct memobject *commit = db->commits.ptr[i]; - - err = git_packbuilder_insert_commit(packbuilder, &commit->oid); - if (err < 0) - goto cleanup; - } - - err = git_packbuilder_write_buf(pack, packbuilder); - -cleanup: - git_packbuilder_free(packbuilder); - return err; -} - -void git_mempack_reset(git_odb_backend *_backend) -{ - struct memory_packer_db *db = (struct memory_packer_db *)_backend; - struct memobject *object = NULL; - - kh_foreach_value(db->objects, object, { - git__free(object); - }); - - git_array_clear(db->commits); - - git_oidmap_clear(db->objects); -} - -static void impl__free(git_odb_backend *_backend) -{ - struct memory_packer_db *db = (struct memory_packer_db *)_backend; - - git_oidmap_free(db->objects); - git__free(db); -} - -int git_mempack_new(git_odb_backend **out) -{ - struct memory_packer_db *db; - - assert(out); - - db = git__calloc(1, sizeof(struct memory_packer_db)); - GITERR_CHECK_ALLOC(db); - - db->objects = git_oidmap_alloc(); - - db->parent.read = &impl__read; - db->parent.write = &impl__write; - db->parent.read_header = &impl__read_header; - db->parent.exists = &impl__exists; - db->parent.free = &impl__free; - - *out = (git_odb_backend *)db; - return 0; -} diff --git a/vendor/libgit2/src/odb_pack.c b/vendor/libgit2/src/odb_pack.c deleted file mode 100644 index 5a57864ad..000000000 --- a/vendor/libgit2/src/odb_pack.c +++ /dev/null @@ -1,617 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "common.h" -#include -#include "git2/repository.h" -#include "git2/indexer.h" -#include "git2/sys/odb_backend.h" -#include "fileops.h" -#include "hash.h" -#include "odb.h" -#include "delta-apply.h" -#include "sha1_lookup.h" -#include "mwindow.h" -#include "pack.h" - -#include "git2/odb_backend.h" - -struct pack_backend { - git_odb_backend parent; - git_vector packs; - struct git_pack_file *last_found; - char *pack_folder; -}; - -struct pack_writepack { - struct git_odb_writepack parent; - git_indexer *indexer; -}; - -/** - * The wonderful tale of a Packed Object lookup query - * =================================================== - * A riveting and epic story of epicness and ASCII - * art, presented by yours truly, - * Sir Vicent of Marti - * - * - * Chapter 1: Once upon a time... - * Initialization of the Pack Backend - * -------------------------------------------------- - * - * # git_odb_backend_pack - * | Creates the pack backend structure, initializes the - * | callback pointers to our default read() and exist() methods, - * | and tries to preload all the known packfiles in the ODB. - * | - * |-# packfile_load_all - * | Tries to find the `pack` folder, if it exists. ODBs without - * | a pack folder are ignored altogether. If there's a `pack` folder - * | we run a `dirent` callback through every file in the pack folder - * | to find our packfiles. The packfiles are then sorted according - * | to a sorting callback. - * | - * |-# packfile_load__cb - * | | This callback is called from `dirent` with every single file - * | | inside the pack folder. We find the packs by actually locating - * | | their index (ends in ".idx"). From that index, we verify that - * | | the corresponding packfile exists and is valid, and if so, we - * | | add it to the pack list. - * | | - * | |-# packfile_check - * | Make sure that there's a packfile to back this index, and store - * | some very basic information regarding the packfile itself, - * | such as the full path, the size, and the modification time. - * | We don't actually open the packfile to check for internal consistency. - * | - * |-# packfile_sort__cb - * Sort all the preloaded packs according to some specific criteria: - * we prioritize the "newer" packs because it's more likely they - * contain the objects we are looking for, and we prioritize local - * packs over remote ones. - * - * - * - * Chapter 2: To be, or not to be... - * A standard packed `exist` query for an OID - * -------------------------------------------------- - * - * # pack_backend__exists - * | Check if the given SHA1 oid exists in any of the packs - * | that have been loaded for our ODB. - * | - * |-# pack_entry_find - * | Iterate through all the packs that have been preloaded - * | (starting by the pack where the latest object was found) - * | to try to find the OID in one of them. - * | - * |-# pack_entry_find1 - * | Check the index of an individual pack to see if the SHA1 - * | OID can be found. If we can find the offset to that SHA1 - * | inside of the index, that means the object is contained - * | inside of the packfile and we can stop searching. - * | Before returning, we verify that the packfile behing the - * | index we are searching still exists on disk. - * | - * |-# pack_entry_find_offset - * | | Mmap the actual index file to disk if it hasn't been opened - * | | yet, and run a binary search through it to find the OID. - * | | See for specifics - * | | on the Packfile Index format and how do we find entries in it. - * | | - * | |-# pack_index_open - * | | Guess the name of the index based on the full path to the - * | | packfile, open it and verify its contents. Only if the index - * | | has not been opened already. - * | | - * | |-# pack_index_check - * | Mmap the index file and do a quick run through the header - * | to guess the index version (right now we support v1 and v2), - * | and to verify that the size of the index makes sense. - * | - * |-# packfile_open - * See `packfile_open` in Chapter 3 - * - * - * - * Chapter 3: The neverending story... - * A standard packed `lookup` query for an OID - * -------------------------------------------------- - * TODO - * - */ - - -/*********************************************************** - * - * FORWARD DECLARATIONS - * - ***********************************************************/ - -static int packfile_sort__cb(const void *a_, const void *b_); - -static int packfile_load__cb(void *_data, git_buf *path); - -static int pack_entry_find(struct git_pack_entry *e, - struct pack_backend *backend, const git_oid *oid); - -/* Can find the offset of an object given - * a prefix of an identifier. - * Sets GIT_EAMBIGUOUS if short oid is ambiguous. - * This method assumes that len is between - * GIT_OID_MINPREFIXLEN and GIT_OID_HEXSZ. - */ -static int pack_entry_find_prefix( - struct git_pack_entry *e, - struct pack_backend *backend, - const git_oid *short_oid, - size_t len); - - - -/*********************************************************** - * - * PACK WINDOW MANAGEMENT - * - ***********************************************************/ - -static int packfile_sort__cb(const void *a_, const void *b_) -{ - const struct git_pack_file *a = a_; - const struct git_pack_file *b = b_; - int st; - - /* - * Local packs tend to contain objects specific to our - * variant of the project than remote ones. In addition, - * remote ones could be on a network mounted filesystem. - * Favor local ones for these reasons. - */ - st = a->pack_local - b->pack_local; - if (st) - return -st; - - /* - * Younger packs tend to contain more recent objects, - * and more recent objects tend to get accessed more - * often. - */ - if (a->mtime < b->mtime) - return 1; - else if (a->mtime == b->mtime) - return 0; - - return -1; -} - - -static int packfile_load__cb(void *data, git_buf *path) -{ - struct pack_backend *backend = data; - struct git_pack_file *pack; - const char *path_str = git_buf_cstr(path); - size_t i, cmp_len = git_buf_len(path); - int error; - - if (cmp_len <= strlen(".idx") || git__suffixcmp(path_str, ".idx") != 0) - return 0; /* not an index */ - - cmp_len -= strlen(".idx"); - - for (i = 0; i < backend->packs.length; ++i) { - struct git_pack_file *p = git_vector_get(&backend->packs, i); - - if (memcmp(p->pack_name, path_str, cmp_len) == 0) - return 0; - } - - error = git_mwindow_get_pack(&pack, path->ptr); - - /* ignore missing .pack file as git does */ - if (error == GIT_ENOTFOUND) { - giterr_clear(); - return 0; - } - - if (!error) - error = git_vector_insert(&backend->packs, pack); - - return error; - -} - -static int pack_entry_find_inner( - struct git_pack_entry *e, - struct pack_backend *backend, - const git_oid *oid, - struct git_pack_file *last_found) -{ - size_t i; - - if (last_found && - git_pack_entry_find(e, last_found, oid, GIT_OID_HEXSZ) == 0) - return 0; - - for (i = 0; i < backend->packs.length; ++i) { - struct git_pack_file *p; - - p = git_vector_get(&backend->packs, i); - if (p == last_found) - continue; - - if (git_pack_entry_find(e, p, oid, GIT_OID_HEXSZ) == 0) { - backend->last_found = p; - return 0; - } - } - - return -1; -} - -static int pack_entry_find(struct git_pack_entry *e, struct pack_backend *backend, const git_oid *oid) -{ - struct git_pack_file *last_found = backend->last_found; - - if (backend->last_found && - git_pack_entry_find(e, backend->last_found, oid, GIT_OID_HEXSZ) == 0) - return 0; - - if (!pack_entry_find_inner(e, backend, oid, last_found)) - return 0; - - return git_odb__error_notfound( - "failed to find pack entry", oid, GIT_OID_HEXSZ); -} - -static int pack_entry_find_prefix( - struct git_pack_entry *e, - struct pack_backend *backend, - const git_oid *short_oid, - size_t len) -{ - int error; - size_t i; - git_oid found_full_oid = {{0}}; - bool found = false; - struct git_pack_file *last_found = backend->last_found; - - if (last_found) { - error = git_pack_entry_find(e, last_found, short_oid, len); - if (error == GIT_EAMBIGUOUS) - return error; - if (!error) { - git_oid_cpy(&found_full_oid, &e->sha1); - found = true; - } - } - - for (i = 0; i < backend->packs.length; ++i) { - struct git_pack_file *p; - - p = git_vector_get(&backend->packs, i); - if (p == last_found) - continue; - - error = git_pack_entry_find(e, p, short_oid, len); - if (error == GIT_EAMBIGUOUS) - return error; - if (!error) { - if (found && git_oid_cmp(&e->sha1, &found_full_oid)) - return git_odb__error_ambiguous("found multiple pack entries"); - git_oid_cpy(&found_full_oid, &e->sha1); - found = true; - backend->last_found = p; - } - } - - if (!found) - return git_odb__error_notfound("no matching pack entry for prefix", - short_oid, len); - else - return 0; -} - - -/*********************************************************** - * - * PACKED BACKEND PUBLIC API - * - * Implement the git_odb_backend API calls - * - ***********************************************************/ -static int pack_backend__refresh(git_odb_backend *backend_) -{ - int error; - struct stat st; - git_buf path = GIT_BUF_INIT; - struct pack_backend *backend = (struct pack_backend *)backend_; - - if (backend->pack_folder == NULL) - return 0; - - if (p_stat(backend->pack_folder, &st) < 0 || !S_ISDIR(st.st_mode)) - return git_odb__error_notfound("failed to refresh packfiles", NULL, 0); - - git_buf_sets(&path, backend->pack_folder); - - /* reload all packs */ - error = git_path_direach(&path, 0, packfile_load__cb, backend); - - git_buf_free(&path); - git_vector_sort(&backend->packs); - - return error; -} - -static int pack_backend__read_header( - size_t *len_p, git_otype *type_p, - struct git_odb_backend *backend, const git_oid *oid) -{ - struct git_pack_entry e; - int error; - - assert(len_p && type_p && backend && oid); - - if ((error = pack_entry_find(&e, (struct pack_backend *)backend, oid)) < 0) - return error; - - return git_packfile_resolve_header(len_p, type_p, e.p, e.offset); -} - -static int pack_backend__read( - void **buffer_p, size_t *len_p, git_otype *type_p, - git_odb_backend *backend, const git_oid *oid) -{ - struct git_pack_entry e; - git_rawobj raw = {NULL}; - int error; - - if ((error = pack_entry_find(&e, (struct pack_backend *)backend, oid)) < 0 || - (error = git_packfile_unpack(&raw, e.p, &e.offset)) < 0) - return error; - - *buffer_p = raw.data; - *len_p = raw.len; - *type_p = raw.type; - - return 0; -} - -static int pack_backend__read_prefix( - git_oid *out_oid, - void **buffer_p, - size_t *len_p, - git_otype *type_p, - git_odb_backend *backend, - const git_oid *short_oid, - size_t len) -{ - int error = 0; - - if (len < GIT_OID_MINPREFIXLEN) - error = git_odb__error_ambiguous("prefix length too short"); - - else if (len >= GIT_OID_HEXSZ) { - /* We can fall back to regular read method */ - error = pack_backend__read(buffer_p, len_p, type_p, backend, short_oid); - if (!error) - git_oid_cpy(out_oid, short_oid); - } else { - struct git_pack_entry e; - git_rawobj raw; - - if ((error = pack_entry_find_prefix( - &e, (struct pack_backend *)backend, short_oid, len)) == 0 && - (error = git_packfile_unpack(&raw, e.p, &e.offset)) == 0) - { - *buffer_p = raw.data; - *len_p = raw.len; - *type_p = raw.type; - git_oid_cpy(out_oid, &e.sha1); - } - } - - return error; -} - -static int pack_backend__exists(git_odb_backend *backend, const git_oid *oid) -{ - struct git_pack_entry e; - return pack_entry_find(&e, (struct pack_backend *)backend, oid) == 0; -} - -static int pack_backend__exists_prefix( - git_oid *out, git_odb_backend *backend, const git_oid *short_id, size_t len) -{ - int error; - struct pack_backend *pb = (struct pack_backend *)backend; - struct git_pack_entry e = {0}; - - error = pack_entry_find_prefix(&e, pb, short_id, len); - git_oid_cpy(out, &e.sha1); - return error; -} - -static int pack_backend__foreach(git_odb_backend *_backend, git_odb_foreach_cb cb, void *data) -{ - int error; - struct git_pack_file *p; - struct pack_backend *backend; - unsigned int i; - - assert(_backend && cb); - backend = (struct pack_backend *)_backend; - - /* Make sure we know about the packfiles */ - if ((error = pack_backend__refresh(_backend)) < 0) - return error; - - git_vector_foreach(&backend->packs, i, p) { - if ((error = git_pack_foreach_entry(p, cb, data)) < 0) - return error; - } - - return 0; -} - -static int pack_backend__writepack_append(struct git_odb_writepack *_writepack, const void *data, size_t size, git_transfer_progress *stats) -{ - struct pack_writepack *writepack = (struct pack_writepack *)_writepack; - - assert(writepack); - - return git_indexer_append(writepack->indexer, data, size, stats); -} - -static int pack_backend__writepack_commit(struct git_odb_writepack *_writepack, git_transfer_progress *stats) -{ - struct pack_writepack *writepack = (struct pack_writepack *)_writepack; - - assert(writepack); - - return git_indexer_commit(writepack->indexer, stats); -} - -static void pack_backend__writepack_free(struct git_odb_writepack *_writepack) -{ - struct pack_writepack *writepack = (struct pack_writepack *)_writepack; - - assert(writepack); - - git_indexer_free(writepack->indexer); - git__free(writepack); -} - -static int pack_backend__writepack(struct git_odb_writepack **out, - git_odb_backend *_backend, - git_odb *odb, - git_transfer_progress_cb progress_cb, - void *progress_payload) -{ - struct pack_backend *backend; - struct pack_writepack *writepack; - - assert(out && _backend); - - *out = NULL; - - backend = (struct pack_backend *)_backend; - - writepack = git__calloc(1, sizeof(struct pack_writepack)); - GITERR_CHECK_ALLOC(writepack); - - if (git_indexer_new(&writepack->indexer, - backend->pack_folder, 0, odb, progress_cb, progress_payload) < 0) { - git__free(writepack); - return -1; - } - - writepack->parent.backend = _backend; - writepack->parent.append = pack_backend__writepack_append; - writepack->parent.commit = pack_backend__writepack_commit; - writepack->parent.free = pack_backend__writepack_free; - - *out = (git_odb_writepack *)writepack; - - return 0; -} - -static void pack_backend__free(git_odb_backend *_backend) -{ - struct pack_backend *backend; - size_t i; - - assert(_backend); - - backend = (struct pack_backend *)_backend; - - for (i = 0; i < backend->packs.length; ++i) { - struct git_pack_file *p = git_vector_get(&backend->packs, i); - git_mwindow_put_pack(p); - } - - git_vector_free(&backend->packs); - git__free(backend->pack_folder); - git__free(backend); -} - -static int pack_backend__alloc(struct pack_backend **out, size_t initial_size) -{ - struct pack_backend *backend = git__calloc(1, sizeof(struct pack_backend)); - GITERR_CHECK_ALLOC(backend); - - if (git_vector_init(&backend->packs, initial_size, packfile_sort__cb) < 0) { - git__free(backend); - return -1; - } - - backend->parent.version = GIT_ODB_BACKEND_VERSION; - - backend->parent.read = &pack_backend__read; - backend->parent.read_prefix = &pack_backend__read_prefix; - backend->parent.read_header = &pack_backend__read_header; - backend->parent.exists = &pack_backend__exists; - backend->parent.exists_prefix = &pack_backend__exists_prefix; - backend->parent.refresh = &pack_backend__refresh; - backend->parent.foreach = &pack_backend__foreach; - backend->parent.writepack = &pack_backend__writepack; - backend->parent.free = &pack_backend__free; - - *out = backend; - return 0; -} - -int git_odb_backend_one_pack(git_odb_backend **backend_out, const char *idx) -{ - struct pack_backend *backend = NULL; - struct git_pack_file *packfile = NULL; - - if (pack_backend__alloc(&backend, 1) < 0) - return -1; - - if (git_mwindow_get_pack(&packfile, idx) < 0 || - git_vector_insert(&backend->packs, packfile) < 0) - { - pack_backend__free((git_odb_backend *)backend); - return -1; - } - - *backend_out = (git_odb_backend *)backend; - return 0; -} - -int git_odb_backend_pack(git_odb_backend **backend_out, const char *objects_dir) -{ - int error = 0; - struct pack_backend *backend = NULL; - git_buf path = GIT_BUF_INIT; - - if (git_mwindow_files_init() < 0) - return -1; - - if (pack_backend__alloc(&backend, 8) < 0) - return -1; - - if (!(error = git_buf_joinpath(&path, objects_dir, "pack")) && - git_path_isdir(git_buf_cstr(&path))) - { - backend->pack_folder = git_buf_detach(&path); - error = pack_backend__refresh((git_odb_backend *)backend); - } - - if (error < 0) { - pack_backend__free((git_odb_backend *)backend); - backend = NULL; - } - - *backend_out = (git_odb_backend *)backend; - - git_buf_free(&path); - - return error; -} diff --git a/vendor/libgit2/src/offmap.h b/vendor/libgit2/src/offmap.h deleted file mode 100644 index 0d0e51272..000000000 --- a/vendor/libgit2/src/offmap.h +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (C) 2012 the libgit2 contributors - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_offmap_h__ -#define INCLUDE_offmap_h__ - -#include "common.h" -#include "git2/types.h" - -#define kmalloc git__malloc -#define kcalloc git__calloc -#define krealloc git__realloc -#define kreallocarray git__reallocarray -#define kfree git__free -#include "khash.h" - -__KHASH_TYPE(off, git_off_t, void *) -typedef khash_t(off) git_offmap; - -#define GIT__USE_OFFMAP \ - __KHASH_IMPL(off, static kh_inline, git_off_t, void *, 1, kh_int64_hash_func, kh_int64_hash_equal) - -#define git_offmap_alloc() kh_init(off) -#define git_offmap_free(h) kh_destroy(off, h), h = NULL -#define git_offmap_clear(h) kh_clear(off, h) - -#define git_offmap_num_entries(h) kh_size(h) - -#define git_offmap_lookup_index(h, k) kh_get(off, h, k) -#define git_offmap_valid_index(h, idx) (idx != kh_end(h)) - -#define git_offmap_exists(h, k) (kh_get(off, h, k) != kh_end(h)) - -#define git_offmap_value_at(h, idx) kh_val(h, idx) -#define git_offmap_set_value_at(h, idx, v) kh_val(h, idx) = v -#define git_offmap_delete_at(h, idx) kh_del(off, h, idx) - -#define git_offmap_insert(h, key, val, rval) do { \ - khiter_t __pos = kh_put(off, h, key, &rval); \ - if (rval >= 0) { \ - if (rval == 0) kh_key(h, __pos) = key; \ - kh_val(h, __pos) = val; \ - } } while (0) - -#define git_offmap_insert2(h, key, val, oldv, rval) do { \ - khiter_t __pos = kh_put(off, h, key, &rval); \ - if (rval >= 0) { \ - if (rval == 0) { \ - oldv = kh_val(h, __pos); \ - kh_key(h, __pos) = key; \ - } else { oldv = NULL; } \ - kh_val(h, __pos) = val; \ - } } while (0) - -#define git_offmap_delete(h, key) do { \ - khiter_t __pos = git_offmap_lookup_index(h, key); \ - if (git_offmap_valid_index(h, __pos)) \ - git_offmap_delete_at(h, __pos); } while (0) - -#define git_offmap_foreach kh_foreach -#define git_offmap_foreach_value kh_foreach_value - -#endif diff --git a/vendor/libgit2/src/oid.c b/vendor/libgit2/src/oid.c deleted file mode 100644 index 9fe2ebb65..000000000 --- a/vendor/libgit2/src/oid.c +++ /dev/null @@ -1,441 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "common.h" -#include "git2/oid.h" -#include "repository.h" -#include "global.h" -#include -#include - -static char to_hex[] = "0123456789abcdef"; - -static int oid_error_invalid(const char *msg) -{ - giterr_set(GITERR_INVALID, "Unable to parse OID - %s", msg); - return -1; -} - -int git_oid_fromstrn(git_oid *out, const char *str, size_t length) -{ - size_t p; - int v; - - assert(out && str); - - if (!length) - return oid_error_invalid("too short"); - - if (length > GIT_OID_HEXSZ) - return oid_error_invalid("too long"); - - memset(out->id, 0, GIT_OID_RAWSZ); - - for (p = 0; p < length; p++) { - v = git__fromhex(str[p]); - if (v < 0) - return oid_error_invalid("contains invalid characters"); - - out->id[p / 2] |= (unsigned char)(v << (p % 2 ? 0 : 4)); - } - - return 0; -} - -int git_oid_fromstrp(git_oid *out, const char *str) -{ - return git_oid_fromstrn(out, str, strlen(str)); -} - -int git_oid_fromstr(git_oid *out, const char *str) -{ - return git_oid_fromstrn(out, str, GIT_OID_HEXSZ); -} - -GIT_INLINE(char) *fmt_one(char *str, unsigned int val) -{ - *str++ = to_hex[val >> 4]; - *str++ = to_hex[val & 0xf]; - return str; -} - -void git_oid_nfmt(char *str, size_t n, const git_oid *oid) -{ - size_t i, max_i; - - if (!oid) { - memset(str, 0, n); - return; - } - if (n > GIT_OID_HEXSZ) { - memset(&str[GIT_OID_HEXSZ], 0, n - GIT_OID_HEXSZ); - n = GIT_OID_HEXSZ; - } - - max_i = n / 2; - - for (i = 0; i < max_i; i++) - str = fmt_one(str, oid->id[i]); - - if (n & 1) - *str++ = to_hex[oid->id[i] >> 4]; -} - -void git_oid_fmt(char *str, const git_oid *oid) -{ - git_oid_nfmt(str, GIT_OID_HEXSZ, oid); -} - -void git_oid_pathfmt(char *str, const git_oid *oid) -{ - size_t i; - - str = fmt_one(str, oid->id[0]); - *str++ = '/'; - for (i = 1; i < sizeof(oid->id); i++) - str = fmt_one(str, oid->id[i]); -} - -char *git_oid_tostr_s(const git_oid *oid) -{ - char *str = GIT_GLOBAL->oid_fmt; - git_oid_nfmt(str, GIT_OID_HEXSZ + 1, oid); - return str; -} - -char *git_oid_allocfmt(const git_oid *oid) -{ - char *str = git__malloc(GIT_OID_HEXSZ + 1); - if (!str) - return NULL; - git_oid_nfmt(str, GIT_OID_HEXSZ + 1, oid); - return str; -} - -char *git_oid_tostr(char *out, size_t n, const git_oid *oid) -{ - if (!out || n == 0) - return ""; - - if (n > GIT_OID_HEXSZ + 1) - n = GIT_OID_HEXSZ + 1; - - git_oid_nfmt(out, n - 1, oid); /* allow room for terminating NUL */ - out[n - 1] = '\0'; - - return out; -} - -int git_oid__parse( - git_oid *oid, const char **buffer_out, - const char *buffer_end, const char *header) -{ - const size_t sha_len = GIT_OID_HEXSZ; - const size_t header_len = strlen(header); - - const char *buffer = *buffer_out; - - if (buffer + (header_len + sha_len + 1) > buffer_end) - return -1; - - if (memcmp(buffer, header, header_len) != 0) - return -1; - - if (buffer[header_len + sha_len] != '\n') - return -1; - - if (git_oid_fromstr(oid, buffer + header_len) < 0) - return -1; - - *buffer_out = buffer + (header_len + sha_len + 1); - - return 0; -} - -void git_oid__writebuf(git_buf *buf, const char *header, const git_oid *oid) -{ - char hex_oid[GIT_OID_HEXSZ]; - - git_oid_fmt(hex_oid, oid); - git_buf_puts(buf, header); - git_buf_put(buf, hex_oid, GIT_OID_HEXSZ); - git_buf_putc(buf, '\n'); -} - -void git_oid_fromraw(git_oid *out, const unsigned char *raw) -{ - memcpy(out->id, raw, sizeof(out->id)); -} - -void git_oid_cpy(git_oid *out, const git_oid *src) -{ - memcpy(out->id, src->id, sizeof(out->id)); -} - -int git_oid_cmp(const git_oid *a, const git_oid *b) -{ - return git_oid__cmp(a, b); -} - -int git_oid_equal(const git_oid *a, const git_oid *b) -{ - return (git_oid__cmp(a, b) == 0); -} - -int git_oid_ncmp(const git_oid *oid_a, const git_oid *oid_b, size_t len) -{ - const unsigned char *a = oid_a->id; - const unsigned char *b = oid_b->id; - - if (len > GIT_OID_HEXSZ) - len = GIT_OID_HEXSZ; - - while (len > 1) { - if (*a != *b) - return 1; - a++; - b++; - len -= 2; - }; - - if (len) - if ((*a ^ *b) & 0xf0) - return 1; - - return 0; -} - -int git_oid_strcmp(const git_oid *oid_a, const char *str) -{ - const unsigned char *a; - unsigned char strval; - int hexval; - - for (a = oid_a->id; *str && (a - oid_a->id) < GIT_OID_RAWSZ; ++a) { - if ((hexval = git__fromhex(*str++)) < 0) - return -1; - strval = (unsigned char)(hexval << 4); - if (*str) { - if ((hexval = git__fromhex(*str++)) < 0) - return -1; - strval |= hexval; - } - if (*a != strval) - return (*a - strval); - } - - return 0; -} - -int git_oid_streq(const git_oid *oid_a, const char *str) -{ - return git_oid_strcmp(oid_a, str) == 0 ? 0 : -1; -} - -int git_oid_iszero(const git_oid *oid_a) -{ - const unsigned char *a = oid_a->id; - unsigned int i; - for (i = 0; i < GIT_OID_RAWSZ; ++i, ++a) - if (*a != 0) - return 0; - return 1; -} - -typedef short node_index; - -typedef union { - const char *tail; - node_index children[16]; -} trie_node; - -struct git_oid_shorten { - trie_node *nodes; - size_t node_count, size; - int min_length, full; -}; - -static int resize_trie(git_oid_shorten *self, size_t new_size) -{ - self->nodes = git__reallocarray(self->nodes, new_size, sizeof(trie_node)); - GITERR_CHECK_ALLOC(self->nodes); - - if (new_size > self->size) { - memset(&self->nodes[self->size], 0x0, (new_size - self->size) * sizeof(trie_node)); - } - - self->size = new_size; - return 0; -} - -static trie_node *push_leaf(git_oid_shorten *os, node_index idx, int push_at, const char *oid) -{ - trie_node *node, *leaf; - node_index idx_leaf; - - if (os->node_count >= os->size) { - if (resize_trie(os, os->size * 2) < 0) - return NULL; - } - - idx_leaf = (node_index)os->node_count++; - - if (os->node_count == SHRT_MAX) { - os->full = 1; - return NULL; - } - - node = &os->nodes[idx]; - node->children[push_at] = -idx_leaf; - - leaf = &os->nodes[idx_leaf]; - leaf->tail = oid; - - return node; -} - -git_oid_shorten *git_oid_shorten_new(size_t min_length) -{ - git_oid_shorten *os; - - assert((size_t)((int)min_length) == min_length); - - os = git__calloc(1, sizeof(git_oid_shorten)); - if (os == NULL) - return NULL; - - if (resize_trie(os, 16) < 0) { - git__free(os); - return NULL; - } - - os->node_count = 1; - os->min_length = (int)min_length; - - return os; -} - -void git_oid_shorten_free(git_oid_shorten *os) -{ - if (os == NULL) - return; - - git__free(os->nodes); - git__free(os); -} - - -/* - * What wizardry is this? - * - * This is just a memory-optimized trie: basically a very fancy - * 16-ary tree, which is used to store the prefixes of the OID - * strings. - * - * Read more: http://en.wikipedia.org/wiki/Trie - * - * Magic that happens in this method: - * - * - Each node in the trie is an union, so it can work both as - * a normal node, or as a leaf. - * - * - Each normal node points to 16 children (one for each possible - * character in the oid). This is *not* stored in an array of - * pointers, because in a 64-bit arch this would be sucking - * 16*sizeof(void*) = 128 bytes of memory per node, which is - * insane. What we do is store Node Indexes, and use these indexes - * to look up each node in the om->index array. These indexes are - * signed shorts, so this limits the amount of unique OIDs that - * fit in the structure to about 20000 (assuming a more or less uniform - * distribution). - * - * - All the nodes in om->index array are stored contiguously in - * memory, and each of them is 32 bytes, so we fit 2x nodes per - * cache line. Convenient for speed. - * - * - To differentiate the leafs from the normal nodes, we store all - * the indexes towards a leaf as a negative index (indexes to normal - * nodes are positives). When we find that one of the children for - * a node has a negative value, that means it's going to be a leaf. - * This reduces the amount of indexes we have by two, but also reduces - * the size of each node by 1-4 bytes (the amount we would need to - * add a `is_leaf` field): this is good because it allows the nodes - * to fit cleanly in cache lines. - * - * - Once we reach an empty children, instead of continuing to insert - * new nodes for each remaining character of the OID, we store a pointer - * to the tail in the leaf; if the leaf is reached again, we turn it - * into a normal node and use the tail to create a new leaf. - * - * This is a pretty good balance between performance and memory usage. - */ -int git_oid_shorten_add(git_oid_shorten *os, const char *text_oid) -{ - int i; - bool is_leaf; - node_index idx; - - if (os->full) { - giterr_set(GITERR_INVALID, "Unable to shorten OID - OID set full"); - return -1; - } - - if (text_oid == NULL) - return os->min_length; - - idx = 0; - is_leaf = false; - - for (i = 0; i < GIT_OID_HEXSZ; ++i) { - int c = git__fromhex(text_oid[i]); - trie_node *node; - - if (c == -1) { - giterr_set(GITERR_INVALID, "Unable to shorten OID - invalid hex value"); - return -1; - } - - node = &os->nodes[idx]; - - if (is_leaf) { - const char *tail; - - tail = node->tail; - node->tail = NULL; - - node = push_leaf(os, idx, git__fromhex(tail[0]), &tail[1]); - if (node == NULL) { - if (os->full) - giterr_set(GITERR_INVALID, "Unable to shorten OID - OID set full"); - return -1; - } - } - - if (node->children[c] == 0) { - if (push_leaf(os, idx, c, &text_oid[i + 1]) == NULL) { - if (os->full) - giterr_set(GITERR_INVALID, "Unable to shorten OID - OID set full"); - return -1; - } - break; - } - - idx = node->children[c]; - is_leaf = false; - - if (idx < 0) { - node->children[c] = idx = -idx; - is_leaf = true; - } - } - - if (++i > os->min_length) - os->min_length = i; - - return os->min_length; -} - diff --git a/vendor/libgit2/src/oid.h b/vendor/libgit2/src/oid.h deleted file mode 100644 index 922a2a347..000000000 --- a/vendor/libgit2/src/oid.h +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_oid_h__ -#define INCLUDE_oid_h__ - -#include "git2/oid.h" - -/** - * Format a git_oid into a newly allocated c-string. - * - * The c-string is owned by the caller and needs to be manually freed. - * - * @param id the oid structure to format - * @return the c-string; NULL if memory is exhausted. Caller must - * deallocate the string with git__free(). - */ -char *git_oid_allocfmt(const git_oid *id); - -GIT_INLINE(int) git_oid__hashcmp(const unsigned char *sha1, const unsigned char *sha2) -{ - int i; - - for (i = 0; i < GIT_OID_RAWSZ; i++, sha1++, sha2++) { - if (*sha1 != *sha2) - return *sha1 - *sha2; - } - - return 0; -} - -/* - * Compare two oid structures. - * - * @param a first oid structure. - * @param b second oid structure. - * @return <0, 0, >0 if a < b, a == b, a > b. - */ -GIT_INLINE(int) git_oid__cmp(const git_oid *a, const git_oid *b) -{ - return git_oid__hashcmp(a->id, b->id); -} - -GIT_INLINE(void) git_oid__cpy_prefix( - git_oid *out, const git_oid *id, size_t len) -{ - memcpy(&out->id, id->id, (len + 1) / 2); - - if (len & 1) - out->id[len / 2] &= 0xF0; -} - -#endif diff --git a/vendor/libgit2/src/oidarray.c b/vendor/libgit2/src/oidarray.c deleted file mode 100644 index 1d51a2958..000000000 --- a/vendor/libgit2/src/oidarray.c +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "git2/oidarray.h" -#include "oidarray.h" -#include "array.h" - -void git_oidarray_free(git_oidarray *arr) -{ - git__free(arr->ids); -} - -void git_oidarray__from_array(git_oidarray *arr, git_array_oid_t *array) -{ - arr->count = array->size; - arr->ids = array->ptr; -} diff --git a/vendor/libgit2/src/oidarray.h b/vendor/libgit2/src/oidarray.h deleted file mode 100644 index a7215ae6c..000000000 --- a/vendor/libgit2/src/oidarray.h +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_oidarray_h__ -#define INCLUDE_oidarray_h__ - -#include "common.h" -#include "git2/oidarray.h" -#include "array.h" - -typedef git_array_t(git_oid) git_array_oid_t; - -extern void git_oidarray__from_array(git_oidarray *arr, git_array_oid_t *array); - -#endif diff --git a/vendor/libgit2/src/oidmap.h b/vendor/libgit2/src/oidmap.h deleted file mode 100644 index 2cf208f53..000000000 --- a/vendor/libgit2/src/oidmap.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_oidmap_h__ -#define INCLUDE_oidmap_h__ - -#include "common.h" -#include "git2/oid.h" - -#define kmalloc git__malloc -#define kcalloc git__calloc -#define krealloc git__realloc -#define kreallocarray git__reallocarray -#define kfree git__free -#include "khash.h" - -__KHASH_TYPE(oid, const git_oid *, void *) -typedef khash_t(oid) git_oidmap; - -GIT_INLINE(khint_t) git_oidmap_hash(const git_oid *oid) -{ - khint_t h; - memcpy(&h, oid, sizeof(khint_t)); - return h; -} - -#define GIT__USE_OIDMAP \ - __KHASH_IMPL(oid, static kh_inline, const git_oid *, void *, 1, git_oidmap_hash, git_oid_equal) - -#define git_oidmap_alloc() kh_init(oid) -#define git_oidmap_free(h) kh_destroy(oid,h), h = NULL - -#define git_oidmap_lookup_index(h, k) kh_get(oid, h, k) -#define git_oidmap_valid_index(h, idx) (idx != kh_end(h)) - -#define git_oidmap_value_at(h, idx) kh_val(h, idx) - -#define git_oidmap_insert(h, key, val, rval) do { \ - khiter_t __pos = kh_put(oid, h, key, &rval); \ - if (rval >= 0) { \ - if (rval == 0) kh_key(h, __pos) = key; \ - kh_val(h, __pos) = val; \ - } } while (0) - -#define git_oidmap_foreach_value kh_foreach_value - -#define git_oidmap_size(h) kh_size(h) - -#define git_oidmap_clear(h) kh_clear(oid, h) - -#endif diff --git a/vendor/libgit2/src/openssl_stream.c b/vendor/libgit2/src/openssl_stream.c deleted file mode 100644 index a65f5586e..000000000 --- a/vendor/libgit2/src/openssl_stream.c +++ /dev/null @@ -1,630 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#ifdef GIT_OPENSSL - -#include - -#include "global.h" -#include "posix.h" -#include "stream.h" -#include "socket_stream.h" -#include "netops.h" -#include "git2/transport.h" -#include "git2/sys/openssl.h" - -#ifdef GIT_CURL -# include "curl_stream.h" -#endif - -#ifndef GIT_WIN32 -# include -# include -# include -#endif - -#include -#include -#include -#include - -SSL_CTX *git__ssl_ctx; - -#define GIT_SSL_DEFAULT_CIPHERS "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-DSS-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA:DHE-DSS-AES128-SHA256:DHE-DSS-AES256-SHA256:DHE-DSS-AES128-SHA:DHE-DSS-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA" - -#ifdef GIT_THREADS - -static git_mutex *openssl_locks; - -static void openssl_locking_function( - int mode, int n, const char *file, int line) -{ - int lock; - - GIT_UNUSED(file); - GIT_UNUSED(line); - - lock = mode & CRYPTO_LOCK; - - if (lock) { - git_mutex_lock(&openssl_locks[n]); - } else { - git_mutex_unlock(&openssl_locks[n]); - } -} - -static void shutdown_ssl_locking(void) -{ - int num_locks, i; - - num_locks = CRYPTO_num_locks(); - CRYPTO_set_locking_callback(NULL); - - for (i = 0; i < num_locks; ++i) - git_mutex_free(openssl_locks); - git__free(openssl_locks); -} - -#endif /* GIT_THREADS */ - -/** - * This function aims to clean-up the SSL context which - * we allocated. - */ -static void shutdown_ssl(void) -{ - if (git__ssl_ctx) { - SSL_CTX_free(git__ssl_ctx); - git__ssl_ctx = NULL; - } -} - -int git_openssl_stream_global_init(void) -{ -#ifdef GIT_OPENSSL - long ssl_opts = SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3; - const char *ciphers = git_libgit2__ssl_ciphers(); - - /* Older OpenSSL and MacOS OpenSSL doesn't have this */ -#ifdef SSL_OP_NO_COMPRESSION - ssl_opts |= SSL_OP_NO_COMPRESSION; -#endif - - SSL_load_error_strings(); - OpenSSL_add_ssl_algorithms(); - /* - * Load SSLv{2,3} and TLSv1 so that we can talk with servers - * which use the SSL hellos, which are often used for - * compatibility. We then disable SSL so we only allow OpenSSL - * to speak TLSv1 to perform the encryption itself. - */ - git__ssl_ctx = SSL_CTX_new(SSLv23_method()); - SSL_CTX_set_options(git__ssl_ctx, ssl_opts); - SSL_CTX_set_mode(git__ssl_ctx, SSL_MODE_AUTO_RETRY); - SSL_CTX_set_verify(git__ssl_ctx, SSL_VERIFY_NONE, NULL); - if (!SSL_CTX_set_default_verify_paths(git__ssl_ctx)) { - SSL_CTX_free(git__ssl_ctx); - git__ssl_ctx = NULL; - return -1; - } - - if (!ciphers) { - ciphers = GIT_SSL_DEFAULT_CIPHERS; - } - - if(!SSL_CTX_set_cipher_list(git__ssl_ctx, ciphers)) { - SSL_CTX_free(git__ssl_ctx); - git__ssl_ctx = NULL; - return -1; - } -#endif - - git__on_shutdown(shutdown_ssl); - - return 0; -} - -int git_openssl_set_locking(void) -{ -#ifdef GIT_THREADS - int num_locks, i; - - num_locks = CRYPTO_num_locks(); - openssl_locks = git__calloc(num_locks, sizeof(git_mutex)); - GITERR_CHECK_ALLOC(openssl_locks); - - for (i = 0; i < num_locks; i++) { - if (git_mutex_init(&openssl_locks[i]) != 0) { - giterr_set(GITERR_SSL, "failed to initialize openssl locks"); - return -1; - } - } - - CRYPTO_set_locking_callback(openssl_locking_function); - git__on_shutdown(shutdown_ssl_locking); - return 0; -#else - giterr_set(GITERR_THREAD, "libgit2 as not built with threads"); - return -1; -#endif -} - - -static int bio_create(BIO *b) -{ - b->init = 1; - b->num = 0; - b->ptr = NULL; - b->flags = 0; - - return 1; -} - -static int bio_destroy(BIO *b) -{ - if (!b) - return 0; - - b->init = 0; - b->num = 0; - b->ptr = NULL; - b->flags = 0; - - return 1; -} - -static int bio_read(BIO *b, char *buf, int len) -{ - git_stream *io = (git_stream *) b->ptr; - return (int) git_stream_read(io, buf, len); -} - -static int bio_write(BIO *b, const char *buf, int len) -{ - git_stream *io = (git_stream *) b->ptr; - return (int) git_stream_write(io, buf, len, 0); -} - -static long bio_ctrl(BIO *b, int cmd, long num, void *ptr) -{ - GIT_UNUSED(b); - GIT_UNUSED(num); - GIT_UNUSED(ptr); - - if (cmd == BIO_CTRL_FLUSH) - return 1; - - return 0; -} - -static int bio_gets(BIO *b, char *buf, int len) -{ - GIT_UNUSED(b); - GIT_UNUSED(buf); - GIT_UNUSED(len); - return -1; -} - -static int bio_puts(BIO *b, const char *str) -{ - return bio_write(b, str, strlen(str)); -} - -static BIO_METHOD git_stream_bio_method = { - BIO_TYPE_SOURCE_SINK, - "git_stream", - bio_write, - bio_read, - bio_puts, - bio_gets, - bio_ctrl, - bio_create, - bio_destroy -}; - -static int ssl_set_error(SSL *ssl, int error) -{ - int err; - unsigned long e; - - err = SSL_get_error(ssl, error); - - assert(err != SSL_ERROR_WANT_READ); - assert(err != SSL_ERROR_WANT_WRITE); - - switch (err) { - case SSL_ERROR_WANT_CONNECT: - case SSL_ERROR_WANT_ACCEPT: - giterr_set(GITERR_NET, "SSL error: connection failure\n"); - break; - case SSL_ERROR_WANT_X509_LOOKUP: - giterr_set(GITERR_NET, "SSL error: x509 error\n"); - break; - case SSL_ERROR_SYSCALL: - e = ERR_get_error(); - if (e > 0) { - giterr_set(GITERR_NET, "SSL error: %s", - ERR_error_string(e, NULL)); - break; - } else if (error < 0) { - giterr_set(GITERR_OS, "SSL error: syscall failure"); - break; - } - giterr_set(GITERR_NET, "SSL error: received early EOF"); - return GIT_EEOF; - break; - case SSL_ERROR_SSL: - e = ERR_get_error(); - giterr_set(GITERR_NET, "SSL error: %s", - ERR_error_string(e, NULL)); - break; - case SSL_ERROR_NONE: - case SSL_ERROR_ZERO_RETURN: - default: - giterr_set(GITERR_NET, "SSL error: unknown error"); - break; - } - return -1; -} - -static int ssl_teardown(SSL *ssl) -{ - int ret; - - ret = SSL_shutdown(ssl); - if (ret < 0) - ret = ssl_set_error(ssl, ret); - else - ret = 0; - - return ret; -} - -static int check_host_name(const char *name, const char *host) -{ - if (!strcasecmp(name, host)) - return 0; - - if (gitno__match_host(name, host) < 0) - return -1; - - return 0; -} - -static int verify_server_cert(SSL *ssl, const char *host) -{ - X509 *cert; - X509_NAME *peer_name; - ASN1_STRING *str; - unsigned char *peer_cn = NULL; - int matched = -1, type = GEN_DNS; - GENERAL_NAMES *alts; - struct in6_addr addr6; - struct in_addr addr4; - void *addr; - int i = -1,j; - - if (SSL_get_verify_result(ssl) != X509_V_OK) { - giterr_set(GITERR_SSL, "The SSL certificate is invalid"); - return GIT_ECERTIFICATE; - } - - /* Try to parse the host as an IP address to see if it is */ - if (p_inet_pton(AF_INET, host, &addr4)) { - type = GEN_IPADD; - addr = &addr4; - } else { - if(p_inet_pton(AF_INET6, host, &addr6)) { - type = GEN_IPADD; - addr = &addr6; - } - } - - - cert = SSL_get_peer_certificate(ssl); - if (!cert) { - giterr_set(GITERR_SSL, "the server did not provide a certificate"); - return -1; - } - - /* Check the alternative names */ - alts = X509_get_ext_d2i(cert, NID_subject_alt_name, NULL, NULL); - if (alts) { - int num; - - num = sk_GENERAL_NAME_num(alts); - for (i = 0; i < num && matched != 1; i++) { - const GENERAL_NAME *gn = sk_GENERAL_NAME_value(alts, i); - const char *name = (char *) ASN1_STRING_data(gn->d.ia5); - size_t namelen = (size_t) ASN1_STRING_length(gn->d.ia5); - - /* Skip any names of a type we're not looking for */ - if (gn->type != type) - continue; - - if (type == GEN_DNS) { - /* If it contains embedded NULs, don't even try */ - if (memchr(name, '\0', namelen)) - continue; - - if (check_host_name(name, host) < 0) - matched = 0; - else - matched = 1; - } else if (type == GEN_IPADD) { - /* Here name isn't so much a name but a binary representation of the IP */ - matched = !!memcmp(name, addr, namelen); - } - } - } - GENERAL_NAMES_free(alts); - - if (matched == 0) - goto cert_fail_name; - - if (matched == 1) - return 0; - - /* If no alternative names are available, check the common name */ - peer_name = X509_get_subject_name(cert); - if (peer_name == NULL) - goto on_error; - - if (peer_name) { - /* Get the index of the last CN entry */ - while ((j = X509_NAME_get_index_by_NID(peer_name, NID_commonName, i)) >= 0) - i = j; - } - - if (i < 0) - goto on_error; - - str = X509_NAME_ENTRY_get_data(X509_NAME_get_entry(peer_name, i)); - if (str == NULL) - goto on_error; - - /* Work around a bug in OpenSSL whereby ASN1_STRING_to_UTF8 fails if it's already in utf-8 */ - if (ASN1_STRING_type(str) == V_ASN1_UTF8STRING) { - int size = ASN1_STRING_length(str); - - if (size > 0) { - peer_cn = OPENSSL_malloc(size + 1); - GITERR_CHECK_ALLOC(peer_cn); - memcpy(peer_cn, ASN1_STRING_data(str), size); - peer_cn[size] = '\0'; - } else { - goto cert_fail_name; - } - } else { - int size = ASN1_STRING_to_UTF8(&peer_cn, str); - GITERR_CHECK_ALLOC(peer_cn); - if (memchr(peer_cn, '\0', size)) - goto cert_fail_name; - } - - if (check_host_name((char *)peer_cn, host) < 0) - goto cert_fail_name; - - OPENSSL_free(peer_cn); - - return 0; - -on_error: - OPENSSL_free(peer_cn); - return ssl_set_error(ssl, 0); - -cert_fail_name: - OPENSSL_free(peer_cn); - giterr_set(GITERR_SSL, "hostname does not match certificate"); - return GIT_ECERTIFICATE; -} - -typedef struct { - git_stream parent; - git_stream *io; - bool connected; - char *host; - SSL *ssl; - git_cert_x509 cert_info; -} openssl_stream; - -int openssl_close(git_stream *stream); - -int openssl_connect(git_stream *stream) -{ - int ret; - BIO *bio; - openssl_stream *st = (openssl_stream *) stream; - - if ((ret = git_stream_connect(st->io)) < 0) - return ret; - - st->connected = true; - - bio = BIO_new(&git_stream_bio_method); - GITERR_CHECK_ALLOC(bio); - bio->ptr = st->io; - - SSL_set_bio(st->ssl, bio, bio); - /* specify the host in case SNI is needed */ -#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME - SSL_set_tlsext_host_name(st->ssl, st->host); -#endif - - if ((ret = SSL_connect(st->ssl)) <= 0) - return ssl_set_error(st->ssl, ret); - - return verify_server_cert(st->ssl, st->host); -} - -int openssl_certificate(git_cert **out, git_stream *stream) -{ - openssl_stream *st = (openssl_stream *) stream; - int len; - X509 *cert = SSL_get_peer_certificate(st->ssl); - unsigned char *guard, *encoded_cert; - - /* Retrieve the length of the certificate first */ - len = i2d_X509(cert, NULL); - if (len < 0) { - giterr_set(GITERR_NET, "failed to retrieve certificate information"); - return -1; - } - - encoded_cert = git__malloc(len); - GITERR_CHECK_ALLOC(encoded_cert); - /* i2d_X509 makes 'guard' point to just after the data */ - guard = encoded_cert; - - len = i2d_X509(cert, &guard); - if (len < 0) { - git__free(encoded_cert); - giterr_set(GITERR_NET, "failed to retrieve certificate information"); - return -1; - } - - st->cert_info.parent.cert_type = GIT_CERT_X509; - st->cert_info.data = encoded_cert; - st->cert_info.len = len; - - *out = &st->cert_info.parent; - - return 0; -} - -static int openssl_set_proxy(git_stream *stream, const char *proxy_url) -{ - openssl_stream *st = (openssl_stream *) stream; - - return git_stream_set_proxy(st->io, proxy_url); -} - -ssize_t openssl_write(git_stream *stream, const char *data, size_t len, int flags) -{ - openssl_stream *st = (openssl_stream *) stream; - int ret; - - GIT_UNUSED(flags); - - if ((ret = SSL_write(st->ssl, data, len)) <= 0) { - return ssl_set_error(st->ssl, ret); - } - - return ret; -} - -ssize_t openssl_read(git_stream *stream, void *data, size_t len) -{ - openssl_stream *st = (openssl_stream *) stream; - int ret; - - if ((ret = SSL_read(st->ssl, data, len)) <= 0) - ssl_set_error(st->ssl, ret); - - return ret; -} - -int openssl_close(git_stream *stream) -{ - openssl_stream *st = (openssl_stream *) stream; - int ret; - - if (st->connected && (ret = ssl_teardown(st->ssl)) < 0) - return -1; - - st->connected = false; - - return git_stream_close(st->io); -} - -void openssl_free(git_stream *stream) -{ - openssl_stream *st = (openssl_stream *) stream; - - SSL_free(st->ssl); - git__free(st->host); - git__free(st->cert_info.data); - git_stream_free(st->io); - git__free(st); -} - -int git_openssl_stream_new(git_stream **out, const char *host, const char *port) -{ - int error; - openssl_stream *st; - - st = git__calloc(1, sizeof(openssl_stream)); - GITERR_CHECK_ALLOC(st); - - st->io = NULL; -#ifdef GIT_CURL - error = git_curl_stream_new(&st->io, host, port); -#else - error = git_socket_stream_new(&st->io, host, port); -#endif - - if (error < 0) - goto out_err; - - st->ssl = SSL_new(git__ssl_ctx); - if (st->ssl == NULL) { - giterr_set(GITERR_SSL, "failed to create ssl object"); - error = -1; - goto out_err; - } - - st->host = git__strdup(host); - GITERR_CHECK_ALLOC(st->host); - - st->parent.version = GIT_STREAM_VERSION; - st->parent.encrypted = 1; - st->parent.proxy_support = git_stream_supports_proxy(st->io); - st->parent.connect = openssl_connect; - st->parent.certificate = openssl_certificate; - st->parent.set_proxy = openssl_set_proxy; - st->parent.read = openssl_read; - st->parent.write = openssl_write; - st->parent.close = openssl_close; - st->parent.free = openssl_free; - - *out = (git_stream *) st; - return 0; - -out_err: - git_stream_free(st->io); - git__free(st); - - return error; -} - -#else - -#include "stream.h" -#include "git2/sys/openssl.h" - -int git_openssl_stream_global_init(void) -{ - return 0; -} - -int git_openssl_set_locking(void) -{ - giterr_set(GITERR_SSL, "libgit2 was not built with OpenSSL support"); - return -1; -} - -int git_openssl_stream_new(git_stream **out, const char *host, const char *port) -{ - GIT_UNUSED(out); - GIT_UNUSED(host); - GIT_UNUSED(port); - - giterr_set(GITERR_SSL, "openssl is not supported in this version"); - return -1; -} - -#endif diff --git a/vendor/libgit2/src/openssl_stream.h b/vendor/libgit2/src/openssl_stream.h deleted file mode 100644 index 82b5110c4..000000000 --- a/vendor/libgit2/src/openssl_stream.h +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_openssl_stream_h__ -#define INCLUDE_openssl_stream_h__ - -#include "git2/sys/stream.h" - -extern int git_openssl_stream_global_init(void); - -extern int git_openssl_stream_new(git_stream **out, const char *host, const char *port); - -#endif diff --git a/vendor/libgit2/src/pack-objects.c b/vendor/libgit2/src/pack-objects.c deleted file mode 100644 index 11e13f7d4..000000000 --- a/vendor/libgit2/src/pack-objects.c +++ /dev/null @@ -1,1755 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "pack-objects.h" - -#include "zstream.h" -#include "delta.h" -#include "iterator.h" -#include "netops.h" -#include "pack.h" -#include "thread-utils.h" -#include "tree.h" -#include "util.h" -#include "revwalk.h" -#include "commit_list.h" - -#include "git2/pack.h" -#include "git2/commit.h" -#include "git2/tag.h" -#include "git2/indexer.h" -#include "git2/config.h" - -struct unpacked { - git_pobject *object; - void *data; - struct git_delta_index *index; - int depth; -}; - -struct tree_walk_context { - git_packbuilder *pb; - git_buf buf; -}; - -struct pack_write_context { - git_indexer *indexer; - git_transfer_progress *stats; -}; - -GIT__USE_OIDMAP - -#ifdef GIT_THREADS - -#define GIT_PACKBUILDER__MUTEX_OP(pb, mtx, op) do { \ - int result = git_mutex_##op(&(pb)->mtx); \ - assert(!result); \ - GIT_UNUSED(result); \ - } while (0) - -#else - -#define GIT_PACKBUILDER__MUTEX_OP(pb,mtx,op) GIT_UNUSED(pb) - -#endif /* GIT_THREADS */ - -#define git_packbuilder__cache_lock(pb) GIT_PACKBUILDER__MUTEX_OP(pb, cache_mutex, lock) -#define git_packbuilder__cache_unlock(pb) GIT_PACKBUILDER__MUTEX_OP(pb, cache_mutex, unlock) -#define git_packbuilder__progress_lock(pb) GIT_PACKBUILDER__MUTEX_OP(pb, progress_mutex, lock) -#define git_packbuilder__progress_unlock(pb) GIT_PACKBUILDER__MUTEX_OP(pb, progress_mutex, unlock) - -/* The minimal interval between progress updates (in seconds). */ -#define MIN_PROGRESS_UPDATE_INTERVAL 0.5 - -/* Size of the buffer to feed to zlib */ -#define COMPRESS_BUFLEN (1024 * 1024) - -static unsigned name_hash(const char *name) -{ - unsigned c, hash = 0; - - if (!name) - return 0; - - /* - * This effectively just creates a sortable number from the - * last sixteen non-whitespace characters. Last characters - * count "most", so things that end in ".c" sort together. - */ - while ((c = *name++) != 0) { - if (git__isspace(c)) - continue; - hash = (hash >> 2) + (c << 24); - } - return hash; -} - -static int packbuilder_config(git_packbuilder *pb) -{ - git_config *config; - int ret = 0; - int64_t val; - - if ((ret = git_repository_config_snapshot(&config, pb->repo)) < 0) - return ret; - -#define config_get(KEY,DST,DFLT) do { \ - ret = git_config_get_int64(&val, config, KEY); \ - if (!ret) (DST) = val; \ - else if (ret == GIT_ENOTFOUND) { \ - (DST) = (DFLT); \ - ret = 0; \ - } else if (ret < 0) goto out; } while (0) - - config_get("pack.deltaCacheSize", pb->max_delta_cache_size, - GIT_PACK_DELTA_CACHE_SIZE); - config_get("pack.deltaCacheLimit", pb->cache_max_small_delta_size, - GIT_PACK_DELTA_CACHE_LIMIT); - config_get("pack.deltaCacheSize", pb->big_file_threshold, - GIT_PACK_BIG_FILE_THRESHOLD); - config_get("pack.windowMemory", pb->window_memory_limit, 0); - -#undef config_get - -out: - git_config_free(config); - - return ret; -} - -int git_packbuilder_new(git_packbuilder **out, git_repository *repo) -{ - git_packbuilder *pb; - - *out = NULL; - - pb = git__calloc(1, sizeof(*pb)); - GITERR_CHECK_ALLOC(pb); - - pb->object_ix = git_oidmap_alloc(); - if (!pb->object_ix) - goto on_error; - - pb->walk_objects = git_oidmap_alloc(); - if (!pb->walk_objects) - goto on_error; - - git_pool_init(&pb->object_pool, sizeof(git_walk_object)); - - pb->repo = repo; - pb->nr_threads = 1; /* do not spawn any thread by default */ - - if (git_hash_ctx_init(&pb->ctx) < 0 || - git_zstream_init(&pb->zstream) < 0 || - git_repository_odb(&pb->odb, repo) < 0 || - packbuilder_config(pb) < 0) - goto on_error; - -#ifdef GIT_THREADS - - if (git_mutex_init(&pb->cache_mutex) || - git_mutex_init(&pb->progress_mutex) || - git_cond_init(&pb->progress_cond)) - { - giterr_set(GITERR_OS, "Failed to initialize packbuilder mutex"); - goto on_error; - } - -#endif - - *out = pb; - return 0; - -on_error: - git_packbuilder_free(pb); - return -1; -} - -unsigned int git_packbuilder_set_threads(git_packbuilder *pb, unsigned int n) -{ - assert(pb); - -#ifdef GIT_THREADS - pb->nr_threads = n; -#else - GIT_UNUSED(n); - assert(1 == pb->nr_threads); -#endif - - return pb->nr_threads; -} - -static void rehash(git_packbuilder *pb) -{ - git_pobject *po; - khiter_t pos; - unsigned int i; - int ret; - - kh_clear(oid, pb->object_ix); - for (i = 0, po = pb->object_list; i < pb->nr_objects; i++, po++) { - pos = kh_put(oid, pb->object_ix, &po->id, &ret); - kh_value(pb->object_ix, pos) = po; - } -} - -int git_packbuilder_insert(git_packbuilder *pb, const git_oid *oid, - const char *name) -{ - git_pobject *po; - khiter_t pos; - size_t newsize; - int ret; - - assert(pb && oid); - - /* If the object already exists in the hash table, then we don't - * have any work to do */ - pos = kh_get(oid, pb->object_ix, oid); - if (pos != kh_end(pb->object_ix)) - return 0; - - if (pb->nr_objects >= pb->nr_alloc) { - GITERR_CHECK_ALLOC_ADD(&newsize, pb->nr_alloc, 1024); - GITERR_CHECK_ALLOC_MULTIPLY(&newsize, newsize, 3 / 2); - - if (!git__is_uint32(newsize)) { - giterr_set(GITERR_NOMEMORY, "Packfile too large to fit in memory."); - return -1; - } - - pb->nr_alloc = (uint32_t)newsize; - - pb->object_list = git__reallocarray(pb->object_list, - pb->nr_alloc, sizeof(*po)); - GITERR_CHECK_ALLOC(pb->object_list); - rehash(pb); - } - - po = pb->object_list + pb->nr_objects; - memset(po, 0x0, sizeof(*po)); - - if ((ret = git_odb_read_header(&po->size, &po->type, pb->odb, oid)) < 0) - return ret; - - pb->nr_objects++; - git_oid_cpy(&po->id, oid); - po->hash = name_hash(name); - - pos = kh_put(oid, pb->object_ix, &po->id, &ret); - if (ret < 0) { - giterr_set_oom(); - return ret; - } - assert(ret != 0); - kh_value(pb->object_ix, pos) = po; - - pb->done = false; - - if (pb->progress_cb) { - double current_time = git__timer(); - double elapsed = current_time - pb->last_progress_report_time; - - if (elapsed >= MIN_PROGRESS_UPDATE_INTERVAL) { - pb->last_progress_report_time = current_time; - - ret = pb->progress_cb( - GIT_PACKBUILDER_ADDING_OBJECTS, - pb->nr_objects, 0, pb->progress_cb_payload); - - if (ret) - return giterr_set_after_callback(ret); - } - } - - return 0; -} - -static int get_delta(void **out, git_odb *odb, git_pobject *po) -{ - git_odb_object *src = NULL, *trg = NULL; - unsigned long delta_size; - void *delta_buf; - - *out = NULL; - - if (git_odb_read(&src, odb, &po->delta->id) < 0 || - git_odb_read(&trg, odb, &po->id) < 0) - goto on_error; - - delta_buf = git_delta( - git_odb_object_data(src), (unsigned long)git_odb_object_size(src), - git_odb_object_data(trg), (unsigned long)git_odb_object_size(trg), - &delta_size, 0); - - if (!delta_buf || delta_size != po->delta_size) { - giterr_set(GITERR_INVALID, "Delta size changed"); - goto on_error; - } - - *out = delta_buf; - - git_odb_object_free(src); - git_odb_object_free(trg); - return 0; - -on_error: - git_odb_object_free(src); - git_odb_object_free(trg); - return -1; -} - -static int write_object( - git_packbuilder *pb, - git_pobject *po, - int (*write_cb)(void *buf, size_t size, void *cb_data), - void *cb_data) -{ - git_odb_object *obj = NULL; - git_otype type; - unsigned char hdr[10], *zbuf = NULL; - void *data = NULL; - size_t hdr_len, zbuf_len = COMPRESS_BUFLEN, data_len; - int error; - - /* - * If we have a delta base, let's use the delta to save space. - * Otherwise load the whole object. 'data' ends up pointing to - * whatever data we want to put into the packfile. - */ - if (po->delta) { - if (po->delta_data) - data = po->delta_data; - else if ((error = get_delta(&data, pb->odb, po)) < 0) - goto done; - - data_len = po->delta_size; - type = GIT_OBJ_REF_DELTA; - } else { - if ((error = git_odb_read(&obj, pb->odb, &po->id)) < 0) - goto done; - - data = (void *)git_odb_object_data(obj); - data_len = git_odb_object_size(obj); - type = git_odb_object_type(obj); - } - - /* Write header */ - hdr_len = git_packfile__object_header(hdr, data_len, type); - - if ((error = write_cb(hdr, hdr_len, cb_data)) < 0 || - (error = git_hash_update(&pb->ctx, hdr, hdr_len)) < 0) - goto done; - - if (type == GIT_OBJ_REF_DELTA) { - if ((error = write_cb(po->delta->id.id, GIT_OID_RAWSZ, cb_data)) < 0 || - (error = git_hash_update(&pb->ctx, po->delta->id.id, GIT_OID_RAWSZ)) < 0) - goto done; - } - - /* Write data */ - if (po->z_delta_size) { - data_len = po->z_delta_size; - - if ((error = write_cb(data, data_len, cb_data)) < 0 || - (error = git_hash_update(&pb->ctx, data, data_len)) < 0) - goto done; - } else { - zbuf = git__malloc(zbuf_len); - GITERR_CHECK_ALLOC(zbuf); - - git_zstream_reset(&pb->zstream); - git_zstream_set_input(&pb->zstream, data, data_len); - - while (!git_zstream_done(&pb->zstream)) { - if ((error = git_zstream_get_output(zbuf, &zbuf_len, &pb->zstream)) < 0 || - (error = write_cb(zbuf, zbuf_len, cb_data)) < 0 || - (error = git_hash_update(&pb->ctx, zbuf, zbuf_len)) < 0) - goto done; - - zbuf_len = COMPRESS_BUFLEN; /* reuse buffer */ - } - } - - /* - * If po->delta is true, data is a delta and it is our - * responsibility to free it (otherwise it's a git_object's - * data). We set po->delta_data to NULL in case we got the - * data from there instead of get_delta(). If we didn't, - * there's no harm. - */ - if (po->delta) { - git__free(data); - po->delta_data = NULL; - } - - pb->nr_written++; - -done: - git__free(zbuf); - git_odb_object_free(obj); - return error; -} - -enum write_one_status { - WRITE_ONE_SKIP = -1, /* already written */ - WRITE_ONE_BREAK = 0, /* writing this will bust the limit; not written */ - WRITE_ONE_WRITTEN = 1, /* normal */ - WRITE_ONE_RECURSIVE = 2 /* already scheduled to be written */ -}; - -static int write_one( - enum write_one_status *status, - git_packbuilder *pb, - git_pobject *po, - int (*write_cb)(void *buf, size_t size, void *cb_data), - void *cb_data) -{ - int error; - - if (po->recursing) { - *status = WRITE_ONE_RECURSIVE; - return 0; - } else if (po->written) { - *status = WRITE_ONE_SKIP; - return 0; - } - - if (po->delta) { - po->recursing = 1; - - if ((error = write_one(status, pb, po->delta, write_cb, cb_data)) < 0) - return error; - - /* we cannot depend on this one */ - if (*status == WRITE_ONE_RECURSIVE) - po->delta = NULL; - } - - *status = WRITE_ONE_WRITTEN; - po->written = 1; - po->recursing = 0; - - return write_object(pb, po, write_cb, cb_data); -} - -GIT_INLINE(void) add_to_write_order(git_pobject **wo, unsigned int *endp, - git_pobject *po) -{ - if (po->filled) - return; - wo[(*endp)++] = po; - po->filled = 1; -} - -static void add_descendants_to_write_order(git_pobject **wo, unsigned int *endp, - git_pobject *po) -{ - int add_to_order = 1; - while (po) { - if (add_to_order) { - git_pobject *s; - /* add this node... */ - add_to_write_order(wo, endp, po); - /* all its siblings... */ - for (s = po->delta_sibling; s; s = s->delta_sibling) { - add_to_write_order(wo, endp, s); - } - } - /* drop down a level to add left subtree nodes if possible */ - if (po->delta_child) { - add_to_order = 1; - po = po->delta_child; - } else { - add_to_order = 0; - /* our sibling might have some children, it is next */ - if (po->delta_sibling) { - po = po->delta_sibling; - continue; - } - /* go back to our parent node */ - po = po->delta; - while (po && !po->delta_sibling) { - /* we're on the right side of a subtree, keep - * going up until we can go right again */ - po = po->delta; - } - if (!po) { - /* done- we hit our original root node */ - return; - } - /* pass it off to sibling at this level */ - po = po->delta_sibling; - } - }; -} - -static void add_family_to_write_order(git_pobject **wo, unsigned int *endp, - git_pobject *po) -{ - git_pobject *root; - - for (root = po; root->delta; root = root->delta) - ; /* nothing */ - add_descendants_to_write_order(wo, endp, root); -} - -static int cb_tag_foreach(const char *name, git_oid *oid, void *data) -{ - git_packbuilder *pb = data; - git_pobject *po; - khiter_t pos; - - GIT_UNUSED(name); - - pos = kh_get(oid, pb->object_ix, oid); - if (pos == kh_end(pb->object_ix)) - return 0; - - po = kh_value(pb->object_ix, pos); - po->tagged = 1; - - /* TODO: peel objects */ - - return 0; -} - -static git_pobject **compute_write_order(git_packbuilder *pb) -{ - unsigned int i, wo_end, last_untagged; - git_pobject **wo; - - if ((wo = git__mallocarray(pb->nr_objects, sizeof(*wo))) == NULL) - return NULL; - - for (i = 0; i < pb->nr_objects; i++) { - git_pobject *po = pb->object_list + i; - po->tagged = 0; - po->filled = 0; - po->delta_child = NULL; - po->delta_sibling = NULL; - } - - /* - * Fully connect delta_child/delta_sibling network. - * Make sure delta_sibling is sorted in the original - * recency order. - */ - for (i = pb->nr_objects; i > 0;) { - git_pobject *po = &pb->object_list[--i]; - if (!po->delta) - continue; - /* Mark me as the first child */ - po->delta_sibling = po->delta->delta_child; - po->delta->delta_child = po; - } - - /* - * Mark objects that are at the tip of tags. - */ - if (git_tag_foreach(pb->repo, &cb_tag_foreach, pb) < 0) { - git__free(wo); - return NULL; - } - - /* - * Give the objects in the original recency order until - * we see a tagged tip. - */ - for (i = wo_end = 0; i < pb->nr_objects; i++) { - git_pobject *po = pb->object_list + i; - if (po->tagged) - break; - add_to_write_order(wo, &wo_end, po); - } - last_untagged = i; - - /* - * Then fill all the tagged tips. - */ - for (; i < pb->nr_objects; i++) { - git_pobject *po = pb->object_list + i; - if (po->tagged) - add_to_write_order(wo, &wo_end, po); - } - - /* - * And then all remaining commits and tags. - */ - for (i = last_untagged; i < pb->nr_objects; i++) { - git_pobject *po = pb->object_list + i; - if (po->type != GIT_OBJ_COMMIT && - po->type != GIT_OBJ_TAG) - continue; - add_to_write_order(wo, &wo_end, po); - } - - /* - * And then all the trees. - */ - for (i = last_untagged; i < pb->nr_objects; i++) { - git_pobject *po = pb->object_list + i; - if (po->type != GIT_OBJ_TREE) - continue; - add_to_write_order(wo, &wo_end, po); - } - - /* - * Finally all the rest in really tight order - */ - for (i = last_untagged; i < pb->nr_objects; i++) { - git_pobject *po = pb->object_list + i; - if (!po->filled) - add_family_to_write_order(wo, &wo_end, po); - } - - if (wo_end != pb->nr_objects) { - git__free(wo); - giterr_set(GITERR_INVALID, "invalid write order"); - return NULL; - } - - return wo; -} - -static int write_pack(git_packbuilder *pb, - int (*write_cb)(void *buf, size_t size, void *cb_data), - void *cb_data) -{ - git_pobject **write_order; - git_pobject *po; - enum write_one_status status; - struct git_pack_header ph; - git_oid entry_oid; - unsigned int i = 0; - int error = 0; - - write_order = compute_write_order(pb); - if (write_order == NULL) - return -1; - - /* Write pack header */ - ph.hdr_signature = htonl(PACK_SIGNATURE); - ph.hdr_version = htonl(PACK_VERSION); - ph.hdr_entries = htonl(pb->nr_objects); - - if ((error = write_cb(&ph, sizeof(ph), cb_data)) < 0 || - (error = git_hash_update(&pb->ctx, &ph, sizeof(ph))) < 0) - goto done; - - pb->nr_remaining = pb->nr_objects; - do { - pb->nr_written = 0; - for ( ; i < pb->nr_objects; ++i) { - po = write_order[i]; - - if ((error = write_one(&status, pb, po, write_cb, cb_data)) < 0) - goto done; - } - - pb->nr_remaining -= pb->nr_written; - } while (pb->nr_remaining && i < pb->nr_objects); - - if ((error = git_hash_final(&entry_oid, &pb->ctx)) < 0) - goto done; - - error = write_cb(entry_oid.id, GIT_OID_RAWSZ, cb_data); - -done: - /* if callback cancelled writing, we must still free delta_data */ - for ( ; i < pb->nr_objects; ++i) { - po = write_order[i]; - if (po->delta_data) { - git__free(po->delta_data); - po->delta_data = NULL; - } - } - - git__free(write_order); - return error; -} - -static int write_pack_buf(void *buf, size_t size, void *data) -{ - git_buf *b = (git_buf *)data; - return git_buf_put(b, buf, size); -} - -static int type_size_sort(const void *_a, const void *_b) -{ - const git_pobject *a = (git_pobject *)_a; - const git_pobject *b = (git_pobject *)_b; - - if (a->type > b->type) - return -1; - if (a->type < b->type) - return 1; - if (a->hash > b->hash) - return -1; - if (a->hash < b->hash) - return 1; - /* - * TODO - * - if (a->preferred_base > b->preferred_base) - return -1; - if (a->preferred_base < b->preferred_base) - return 1; - */ - if (a->size > b->size) - return -1; - if (a->size < b->size) - return 1; - return a < b ? -1 : (a > b); /* newest first */ -} - -static int delta_cacheable(git_packbuilder *pb, unsigned long src_size, - unsigned long trg_size, unsigned long delta_size) -{ - if (pb->max_delta_cache_size && - pb->delta_cache_size + delta_size > pb->max_delta_cache_size) - return 0; - - if (delta_size < pb->cache_max_small_delta_size) - return 1; - - /* cache delta, if objects are large enough compared to delta size */ - if ((src_size >> 20) + (trg_size >> 21) > (delta_size >> 10)) - return 1; - - return 0; -} - -static int try_delta(git_packbuilder *pb, struct unpacked *trg, - struct unpacked *src, int max_depth, - unsigned long *mem_usage, int *ret) -{ - git_pobject *trg_object = trg->object; - git_pobject *src_object = src->object; - git_odb_object *obj; - unsigned long trg_size, src_size, delta_size, - sizediff, max_size, sz; - unsigned int ref_depth; - void *delta_buf; - - /* Don't bother doing diffs between different types */ - if (trg_object->type != src_object->type) { - *ret = -1; - return 0; - } - - *ret = 0; - - /* TODO: support reuse-delta */ - - /* Let's not bust the allowed depth. */ - if (src->depth >= max_depth) - return 0; - - /* Now some size filtering heuristics. */ - trg_size = (unsigned long)trg_object->size; - if (!trg_object->delta) { - max_size = trg_size/2 - 20; - ref_depth = 1; - } else { - max_size = trg_object->delta_size; - ref_depth = trg->depth; - } - - max_size = (uint64_t)max_size * (max_depth - src->depth) / - (max_depth - ref_depth + 1); - if (max_size == 0) - return 0; - - src_size = (unsigned long)src_object->size; - sizediff = src_size < trg_size ? trg_size - src_size : 0; - if (sizediff >= max_size) - return 0; - if (trg_size < src_size / 32) - return 0; - - /* Load data if not already done */ - if (!trg->data) { - if (git_odb_read(&obj, pb->odb, &trg_object->id) < 0) - return -1; - - sz = (unsigned long)git_odb_object_size(obj); - trg->data = git__malloc(sz); - GITERR_CHECK_ALLOC(trg->data); - memcpy(trg->data, git_odb_object_data(obj), sz); - - git_odb_object_free(obj); - - if (sz != trg_size) { - giterr_set(GITERR_INVALID, - "Inconsistent target object length"); - return -1; - } - - *mem_usage += sz; - } - if (!src->data) { - size_t obj_sz; - - if (git_odb_read(&obj, pb->odb, &src_object->id) < 0 || - !git__is_ulong(obj_sz = git_odb_object_size(obj))) - return -1; - - sz = (unsigned long)obj_sz; - src->data = git__malloc(sz); - GITERR_CHECK_ALLOC(src->data); - memcpy(src->data, git_odb_object_data(obj), sz); - - git_odb_object_free(obj); - - if (sz != src_size) { - giterr_set(GITERR_INVALID, - "Inconsistent source object length"); - return -1; - } - - *mem_usage += sz; - } - if (!src->index) { - src->index = git_delta_create_index(src->data, src_size); - if (!src->index) - return 0; /* suboptimal pack - out of memory */ - - *mem_usage += git_delta_sizeof_index(src->index); - } - - delta_buf = git_delta_create(src->index, trg->data, trg_size, - &delta_size, max_size); - if (!delta_buf) - return 0; - - if (trg_object->delta) { - /* Prefer only shallower same-sized deltas. */ - if (delta_size == trg_object->delta_size && - src->depth + 1 >= trg->depth) { - git__free(delta_buf); - return 0; - } - } - - git_packbuilder__cache_lock(pb); - if (trg_object->delta_data) { - git__free(trg_object->delta_data); - pb->delta_cache_size -= trg_object->delta_size; - trg_object->delta_data = NULL; - } - if (delta_cacheable(pb, src_size, trg_size, delta_size)) { - bool overflow = git__add_uint64_overflow( - &pb->delta_cache_size, pb->delta_cache_size, delta_size); - - git_packbuilder__cache_unlock(pb); - - if (overflow) { - git__free(delta_buf); - return -1; - } - - trg_object->delta_data = git__realloc(delta_buf, delta_size); - GITERR_CHECK_ALLOC(trg_object->delta_data); - } else { - /* create delta when writing the pack */ - git_packbuilder__cache_unlock(pb); - git__free(delta_buf); - } - - trg_object->delta = src_object; - trg_object->delta_size = delta_size; - trg->depth = src->depth + 1; - - *ret = 1; - return 0; -} - -static unsigned int check_delta_limit(git_pobject *me, unsigned int n) -{ - git_pobject *child = me->delta_child; - unsigned int m = n; - - while (child) { - unsigned int c = check_delta_limit(child, n + 1); - if (m < c) - m = c; - child = child->delta_sibling; - } - return m; -} - -static unsigned long free_unpacked(struct unpacked *n) -{ - unsigned long freed_mem = git_delta_sizeof_index(n->index); - git_delta_free_index(n->index); - n->index = NULL; - if (n->data) { - freed_mem += (unsigned long)n->object->size; - git__free(n->data); - n->data = NULL; - } - n->object = NULL; - n->depth = 0; - return freed_mem; -} - -static int report_delta_progress(git_packbuilder *pb, uint32_t count, bool force) -{ - int ret; - - if (pb->progress_cb) { - double current_time = git__timer(); - double elapsed = current_time - pb->last_progress_report_time; - - if (force || elapsed >= MIN_PROGRESS_UPDATE_INTERVAL) { - pb->last_progress_report_time = current_time; - - ret = pb->progress_cb( - GIT_PACKBUILDER_DELTAFICATION, - count, pb->nr_objects, pb->progress_cb_payload); - - if (ret) - return giterr_set_after_callback(ret); - } - } - - return 0; -} - -static int find_deltas(git_packbuilder *pb, git_pobject **list, - unsigned int *list_size, unsigned int window, - int depth) -{ - git_pobject *po; - git_buf zbuf = GIT_BUF_INIT; - struct unpacked *array; - uint32_t idx = 0, count = 0; - unsigned long mem_usage = 0; - unsigned int i; - int error = -1; - - array = git__calloc(window, sizeof(struct unpacked)); - GITERR_CHECK_ALLOC(array); - - for (;;) { - struct unpacked *n = array + idx; - int max_depth, j, best_base = -1; - - git_packbuilder__progress_lock(pb); - if (!*list_size) { - git_packbuilder__progress_unlock(pb); - break; - } - - pb->nr_deltified += 1; - report_delta_progress(pb, pb->nr_deltified, false); - - po = *list++; - (*list_size)--; - git_packbuilder__progress_unlock(pb); - - mem_usage -= free_unpacked(n); - n->object = po; - - while (pb->window_memory_limit && - mem_usage > pb->window_memory_limit && - count > 1) { - uint32_t tail = (idx + window - count) % window; - mem_usage -= free_unpacked(array + tail); - count--; - } - - /* - * If the current object is at pack edge, take the depth the - * objects that depend on the current object into account - * otherwise they would become too deep. - */ - max_depth = depth; - if (po->delta_child) { - max_depth -= check_delta_limit(po, 0); - if (max_depth <= 0) - goto next; - } - - j = window; - while (--j > 0) { - int ret; - uint32_t other_idx = idx + j; - struct unpacked *m; - - if (other_idx >= window) - other_idx -= window; - - m = array + other_idx; - if (!m->object) - break; - - if (try_delta(pb, n, m, max_depth, &mem_usage, &ret) < 0) - goto on_error; - if (ret < 0) - break; - else if (ret > 0) - best_base = other_idx; - } - - /* - * If we decided to cache the delta data, then it is best - * to compress it right away. First because we have to do - * it anyway, and doing it here while we're threaded will - * save a lot of time in the non threaded write phase, - * as well as allow for caching more deltas within - * the same cache size limit. - * ... - * But only if not writing to stdout, since in that case - * the network is most likely throttling writes anyway, - * and therefore it is best to go to the write phase ASAP - * instead, as we can afford spending more time compressing - * between writes at that moment. - */ - if (po->delta_data) { - if (git_zstream_deflatebuf(&zbuf, po->delta_data, po->delta_size) < 0) - goto on_error; - - git__free(po->delta_data); - po->delta_data = git__malloc(zbuf.size); - GITERR_CHECK_ALLOC(po->delta_data); - - memcpy(po->delta_data, zbuf.ptr, zbuf.size); - po->z_delta_size = (unsigned long)zbuf.size; - git_buf_clear(&zbuf); - - git_packbuilder__cache_lock(pb); - pb->delta_cache_size -= po->delta_size; - pb->delta_cache_size += po->z_delta_size; - git_packbuilder__cache_unlock(pb); - } - - /* - * If we made n a delta, and if n is already at max - * depth, leaving it in the window is pointless. we - * should evict it first. - */ - if (po->delta && max_depth <= n->depth) - continue; - - /* - * Move the best delta base up in the window, after the - * currently deltified object, to keep it longer. It will - * be the first base object to be attempted next. - */ - if (po->delta) { - struct unpacked swap = array[best_base]; - int dist = (window + idx - best_base) % window; - int dst = best_base; - while (dist--) { - int src = (dst + 1) % window; - array[dst] = array[src]; - dst = src; - } - array[dst] = swap; - } - - next: - idx++; - if (count + 1 < window) - count++; - if (idx >= window) - idx = 0; - } - error = 0; - -on_error: - for (i = 0; i < window; ++i) { - git__free(array[i].index); - git__free(array[i].data); - } - git__free(array); - git_buf_free(&zbuf); - - return error; -} - -#ifdef GIT_THREADS - -struct thread_params { - git_thread thread; - git_packbuilder *pb; - - git_pobject **list; - - git_cond cond; - git_mutex mutex; - - unsigned int list_size; - unsigned int remaining; - - int window; - int depth; - int working; - int data_ready; -}; - -static void *threaded_find_deltas(void *arg) -{ - struct thread_params *me = arg; - - while (me->remaining) { - if (find_deltas(me->pb, me->list, &me->remaining, - me->window, me->depth) < 0) { - ; /* TODO */ - } - - git_packbuilder__progress_lock(me->pb); - me->working = 0; - git_cond_signal(&me->pb->progress_cond); - git_packbuilder__progress_unlock(me->pb); - - if (git_mutex_lock(&me->mutex)) { - giterr_set(GITERR_THREAD, "unable to lock packfile condition mutex"); - return NULL; - } - - while (!me->data_ready) - git_cond_wait(&me->cond, &me->mutex); - - /* - * We must not set ->data_ready before we wait on the - * condition because the main thread may have set it to 1 - * before we get here. In order to be sure that new - * work is available if we see 1 in ->data_ready, it - * was initialized to 0 before this thread was spawned - * and we reset it to 0 right away. - */ - me->data_ready = 0; - git_mutex_unlock(&me->mutex); - } - /* leave ->working 1 so that this doesn't get more work assigned */ - return NULL; -} - -static int ll_find_deltas(git_packbuilder *pb, git_pobject **list, - unsigned int list_size, unsigned int window, - int depth) -{ - struct thread_params *p; - int i, ret, active_threads = 0; - - if (!pb->nr_threads) - pb->nr_threads = git_online_cpus(); - - if (pb->nr_threads <= 1) { - find_deltas(pb, list, &list_size, window, depth); - return 0; - } - - p = git__mallocarray(pb->nr_threads, sizeof(*p)); - GITERR_CHECK_ALLOC(p); - - /* Partition the work among the threads */ - for (i = 0; i < pb->nr_threads; ++i) { - unsigned sub_size = list_size / (pb->nr_threads - i); - - /* don't use too small segments or no deltas will be found */ - if (sub_size < 2*window && i+1 < pb->nr_threads) - sub_size = 0; - - p[i].pb = pb; - p[i].window = window; - p[i].depth = depth; - p[i].working = 1; - p[i].data_ready = 0; - - /* try to split chunks on "path" boundaries */ - while (sub_size && sub_size < list_size && - list[sub_size]->hash && - list[sub_size]->hash == list[sub_size-1]->hash) - sub_size++; - - p[i].list = list; - p[i].list_size = sub_size; - p[i].remaining = sub_size; - - list += sub_size; - list_size -= sub_size; - } - - /* Start work threads */ - for (i = 0; i < pb->nr_threads; ++i) { - if (!p[i].list_size) - continue; - - git_mutex_init(&p[i].mutex); - git_cond_init(&p[i].cond); - - ret = git_thread_create(&p[i].thread, NULL, - threaded_find_deltas, &p[i]); - if (ret) { - giterr_set(GITERR_THREAD, "unable to create thread"); - return -1; - } - active_threads++; - } - - /* - * Now let's wait for work completion. Each time a thread is done - * with its work, we steal half of the remaining work from the - * thread with the largest number of unprocessed objects and give - * it to that newly idle thread. This ensure good load balancing - * until the remaining object list segments are simply too short - * to be worth splitting anymore. - */ - while (active_threads) { - struct thread_params *target = NULL; - struct thread_params *victim = NULL; - unsigned sub_size = 0; - - /* Start by locating a thread that has transitioned its - * 'working' flag from 1 -> 0. This indicates that it is - * ready to receive more work using our work-stealing - * algorithm. */ - git_packbuilder__progress_lock(pb); - for (;;) { - for (i = 0; !target && i < pb->nr_threads; i++) - if (!p[i].working) - target = &p[i]; - if (target) - break; - git_cond_wait(&pb->progress_cond, &pb->progress_mutex); - } - - /* At this point we hold the progress lock and have located - * a thread to receive more work. We still need to locate a - * thread from which to steal work (the victim). */ - for (i = 0; i < pb->nr_threads; i++) - if (p[i].remaining > 2*window && - (!victim || victim->remaining < p[i].remaining)) - victim = &p[i]; - - if (victim) { - sub_size = victim->remaining / 2; - list = victim->list + victim->list_size - sub_size; - while (sub_size && list[0]->hash && - list[0]->hash == list[-1]->hash) { - list++; - sub_size--; - } - if (!sub_size) { - /* - * It is possible for some "paths" to have - * so many objects that no hash boundary - * might be found. Let's just steal the - * exact half in that case. - */ - sub_size = victim->remaining / 2; - list -= sub_size; - } - target->list = list; - victim->list_size -= sub_size; - victim->remaining -= sub_size; - } - target->list_size = sub_size; - target->remaining = sub_size; - target->working = 1; - git_packbuilder__progress_unlock(pb); - - if (git_mutex_lock(&target->mutex)) { - giterr_set(GITERR_THREAD, "unable to lock packfile condition mutex"); - git__free(p); - return -1; - } - - target->data_ready = 1; - git_cond_signal(&target->cond); - git_mutex_unlock(&target->mutex); - - if (!sub_size) { - git_thread_join(&target->thread, NULL); - git_cond_free(&target->cond); - git_mutex_free(&target->mutex); - active_threads--; - } - } - - git__free(p); - return 0; -} - -#else -#define ll_find_deltas(pb, l, ls, w, d) find_deltas(pb, l, &ls, w, d) -#endif - -static int prepare_pack(git_packbuilder *pb) -{ - git_pobject **delta_list; - unsigned int i, n = 0; - - if (pb->nr_objects == 0 || pb->done) - return 0; /* nothing to do */ - - /* - * Although we do not report progress during deltafication, we - * at least report that we are in the deltafication stage - */ - if (pb->progress_cb) - pb->progress_cb(GIT_PACKBUILDER_DELTAFICATION, 0, pb->nr_objects, pb->progress_cb_payload); - - delta_list = git__mallocarray(pb->nr_objects, sizeof(*delta_list)); - GITERR_CHECK_ALLOC(delta_list); - - for (i = 0; i < pb->nr_objects; ++i) { - git_pobject *po = pb->object_list + i; - - /* Make sure the item is within our size limits */ - if (po->size < 50 || po->size > pb->big_file_threshold) - continue; - - delta_list[n++] = po; - } - - if (n > 1) { - git__tsort((void **)delta_list, n, type_size_sort); - if (ll_find_deltas(pb, delta_list, n, - GIT_PACK_WINDOW + 1, - GIT_PACK_DEPTH) < 0) { - git__free(delta_list); - return -1; - } - } - - report_delta_progress(pb, pb->nr_objects, true); - - pb->done = true; - git__free(delta_list); - return 0; -} - -#define PREPARE_PACK if (prepare_pack(pb) < 0) { return -1; } - -int git_packbuilder_foreach(git_packbuilder *pb, int (*cb)(void *buf, size_t size, void *payload), void *payload) -{ - PREPARE_PACK; - return write_pack(pb, cb, payload); -} - -int git_packbuilder_write_buf(git_buf *buf, git_packbuilder *pb) -{ - PREPARE_PACK; - git_buf_sanitize(buf); - return write_pack(pb, &write_pack_buf, buf); -} - -static int write_cb(void *buf, size_t len, void *payload) -{ - struct pack_write_context *ctx = payload; - return git_indexer_append(ctx->indexer, buf, len, ctx->stats); -} - -int git_packbuilder_write( - git_packbuilder *pb, - const char *path, - unsigned int mode, - git_transfer_progress_cb progress_cb, - void *progress_cb_payload) -{ - git_indexer *indexer; - git_transfer_progress stats; - struct pack_write_context ctx; - - PREPARE_PACK; - - if (git_indexer_new( - &indexer, path, mode, pb->odb, progress_cb, progress_cb_payload) < 0) - return -1; - - ctx.indexer = indexer; - ctx.stats = &stats; - - if (git_packbuilder_foreach(pb, write_cb, &ctx) < 0 || - git_indexer_commit(indexer, &stats) < 0) { - git_indexer_free(indexer); - return -1; - } - - git_oid_cpy(&pb->pack_oid, git_indexer_hash(indexer)); - - git_indexer_free(indexer); - return 0; -} - -#undef PREPARE_PACK - -const git_oid *git_packbuilder_hash(git_packbuilder *pb) -{ - return &pb->pack_oid; -} - - -static int cb_tree_walk( - const char *root, const git_tree_entry *entry, void *payload) -{ - int error; - struct tree_walk_context *ctx = payload; - - /* A commit inside a tree represents a submodule commit and should be skipped. */ - if (git_tree_entry_type(entry) == GIT_OBJ_COMMIT) - return 0; - - if (!(error = git_buf_sets(&ctx->buf, root)) && - !(error = git_buf_puts(&ctx->buf, git_tree_entry_name(entry)))) - error = git_packbuilder_insert( - ctx->pb, git_tree_entry_id(entry), git_buf_cstr(&ctx->buf)); - - return error; -} - -int git_packbuilder_insert_commit(git_packbuilder *pb, const git_oid *oid) -{ - git_commit *commit; - - if (git_commit_lookup(&commit, pb->repo, oid) < 0 || - git_packbuilder_insert(pb, oid, NULL) < 0) - return -1; - - if (git_packbuilder_insert_tree(pb, git_commit_tree_id(commit)) < 0) - return -1; - - git_commit_free(commit); - return 0; -} - -int git_packbuilder_insert_tree(git_packbuilder *pb, const git_oid *oid) -{ - int error; - git_tree *tree = NULL; - struct tree_walk_context context = { pb, GIT_BUF_INIT }; - - if (!(error = git_tree_lookup(&tree, pb->repo, oid)) && - !(error = git_packbuilder_insert(pb, oid, NULL))) - error = git_tree_walk(tree, GIT_TREEWALK_PRE, cb_tree_walk, &context); - - git_tree_free(tree); - git_buf_free(&context.buf); - return error; -} - -int git_packbuilder_insert_recur(git_packbuilder *pb, const git_oid *id, const char *name) -{ - git_object *obj; - int error; - - assert(pb && id); - - if ((error = git_object_lookup(&obj, pb->repo, id, GIT_OBJ_ANY)) < 0) - return error; - - switch (git_object_type(obj)) { - case GIT_OBJ_BLOB: - error = git_packbuilder_insert(pb, id, name); - break; - case GIT_OBJ_TREE: - error = git_packbuilder_insert_tree(pb, id); - break; - case GIT_OBJ_COMMIT: - error = git_packbuilder_insert_commit(pb, id); - break; - case GIT_OBJ_TAG: - if ((error = git_packbuilder_insert(pb, id, name)) < 0) - goto cleanup; - error = git_packbuilder_insert_recur(pb, git_tag_target_id((git_tag *) obj), NULL); - break; - - default: - giterr_set(GITERR_INVALID, "unknown object type"); - error = -1; - } - -cleanup: - git_object_free(obj); - return error; -} - -uint32_t git_packbuilder_object_count(git_packbuilder *pb) -{ - return pb->nr_objects; -} - -uint32_t git_packbuilder_written(git_packbuilder *pb) -{ - return pb->nr_written; -} - -int lookup_walk_object(git_walk_object **out, git_packbuilder *pb, const git_oid *id) -{ - git_walk_object *obj; - - obj = git_pool_mallocz(&pb->object_pool, 1); - if (!obj) { - giterr_set_oom(); - return -1; - } - - git_oid_cpy(&obj->id, id); - - *out = obj; - return 0; -} - -static int retrieve_object(git_walk_object **out, git_packbuilder *pb, const git_oid *id) -{ - int error; - khiter_t pos; - git_walk_object *obj; - - pos = git_oidmap_lookup_index(pb->walk_objects, id); - if (git_oidmap_valid_index(pb->walk_objects, pos)) { - obj = git_oidmap_value_at(pb->walk_objects, pos); - } else { - if ((error = lookup_walk_object(&obj, pb, id)) < 0) - return error; - - git_oidmap_insert(pb->walk_objects, &obj->id, obj, error); - } - - *out = obj; - return 0; -} - -static int mark_blob_uninteresting(git_packbuilder *pb, const git_oid *id) -{ - int error; - git_walk_object *obj; - - if ((error = retrieve_object(&obj, pb, id)) < 0) - return error; - - obj->uninteresting = 1; - - return 0; -} - -static int mark_tree_uninteresting(git_packbuilder *pb, const git_oid *id) -{ - git_walk_object *obj; - git_tree *tree; - int error; - size_t i; - - if ((error = retrieve_object(&obj, pb, id)) < 0) - return error; - - if (obj->uninteresting) - return 0; - - obj->uninteresting = 1; - - if ((error = git_tree_lookup(&tree, pb->repo, id)) < 0) - return error; - - for (i = 0; i < git_tree_entrycount(tree); i++) { - const git_tree_entry *entry = git_tree_entry_byindex(tree, i); - const git_oid *entry_id = git_tree_entry_id(entry); - switch (git_tree_entry_type(entry)) { - case GIT_OBJ_TREE: - if ((error = mark_tree_uninteresting(pb, entry_id)) < 0) - goto cleanup; - break; - case GIT_OBJ_BLOB: - if ((error = mark_blob_uninteresting(pb, entry_id)) < 0) - goto cleanup; - break; - default: - /* it's a submodule or something unknown, we don't want it */ - ; - } - } - -cleanup: - git_tree_free(tree); - return error; -} - -/* - * Mark the edges of the graph uninteresting. Since we start from a - * git_revwalk, the commits are already uninteresting, but we need to - * mark the trees and blobs. - */ -static int mark_edges_uninteresting(git_packbuilder *pb, git_commit_list *commits) -{ - int error; - git_commit_list *list; - git_commit *commit; - - for (list = commits; list; list = list->next) { - if (!list->item->uninteresting) - continue; - - if ((error = git_commit_lookup(&commit, pb->repo, &list->item->oid)) < 0) - return error; - - error = mark_tree_uninteresting(pb, git_commit_tree_id(commit)); - git_commit_free(commit); - - if (error < 0) - return error; - } - - return 0; -} - -int insert_tree(git_packbuilder *pb, git_tree *tree) -{ - size_t i; - int error; - git_tree *subtree; - git_walk_object *obj; - const char *name; - - if ((error = retrieve_object(&obj, pb, git_tree_id(tree))) < 0) - return error; - - if (obj->seen) - return 0; - - obj->seen = 1; - - if ((error = git_packbuilder_insert(pb, &obj->id, NULL))) - return error; - - for (i = 0; i < git_tree_entrycount(tree); i++) { - const git_tree_entry *entry = git_tree_entry_byindex(tree, i); - const git_oid *entry_id = git_tree_entry_id(entry); - switch (git_tree_entry_type(entry)) { - case GIT_OBJ_TREE: - if ((error = git_tree_lookup(&subtree, pb->repo, entry_id)) < 0) - return error; - - error = insert_tree(pb, subtree); - git_tree_free(subtree); - - if (error < 0) - return error; - - break; - case GIT_OBJ_BLOB: - name = git_tree_entry_name(entry); - if ((error = git_packbuilder_insert(pb, entry_id, name)) < 0) - return error; - break; - default: - /* it's a submodule or something unknown, we don't want it */ - ; - } - } - - - return error; -} - -int insert_commit(git_packbuilder *pb, git_walk_object *obj) -{ - int error; - git_commit *commit = NULL; - git_tree *tree = NULL; - - obj->seen = 1; - - if ((error = git_packbuilder_insert(pb, &obj->id, NULL)) < 0) - return error; - - if ((error = git_commit_lookup(&commit, pb->repo, &obj->id)) < 0) - return error; - - if ((error = git_tree_lookup(&tree, pb->repo, git_commit_tree_id(commit))) < 0) - goto cleanup; - - if ((error = insert_tree(pb, tree)) < 0) - goto cleanup; - -cleanup: - git_commit_free(commit); - git_tree_free(tree); - return error; -} - -int git_packbuilder_insert_walk(git_packbuilder *pb, git_revwalk *walk) -{ - int error; - git_oid id; - git_walk_object *obj; - - assert(pb && walk); - - if ((error = mark_edges_uninteresting(pb, walk->user_input)) < 0) - return error; - - /* - * TODO: git marks the parents of the edges - * uninteresting. This may provide a speed advantage, but does - * seem to assume the remote does not have a single-commit - * history on the other end. - */ - - /* walk down each tree up to the blobs and insert them, stopping when uninteresting */ - while ((error = git_revwalk_next(&id, walk)) == 0) { - if ((error = retrieve_object(&obj, pb, &id)) < 0) - return error; - - if (obj->seen || obj->uninteresting) - continue; - - if ((error = insert_commit(pb, obj)) < 0) - return error; - } - - if (error == GIT_ITEROVER) - error = 0; - - return 0; -} - -int git_packbuilder_set_callbacks(git_packbuilder *pb, git_packbuilder_progress progress_cb, void *progress_cb_payload) -{ - if (!pb) - return -1; - - pb->progress_cb = progress_cb; - pb->progress_cb_payload = progress_cb_payload; - - return 0; -} - -void git_packbuilder_free(git_packbuilder *pb) -{ - if (pb == NULL) - return; - -#ifdef GIT_THREADS - - git_mutex_free(&pb->cache_mutex); - git_mutex_free(&pb->progress_mutex); - git_cond_free(&pb->progress_cond); - -#endif - - if (pb->odb) - git_odb_free(pb->odb); - - if (pb->object_ix) - git_oidmap_free(pb->object_ix); - - if (pb->object_list) - git__free(pb->object_list); - - git_oidmap_free(pb->walk_objects); - git_pool_clear(&pb->object_pool); - - git_hash_ctx_cleanup(&pb->ctx); - git_zstream_free(&pb->zstream); - - git__free(pb); -} diff --git a/vendor/libgit2/src/pack-objects.h b/vendor/libgit2/src/pack-objects.h deleted file mode 100644 index 82dea81f5..000000000 --- a/vendor/libgit2/src/pack-objects.h +++ /dev/null @@ -1,105 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#ifndef INCLUDE_pack_objects_h__ -#define INCLUDE_pack_objects_h__ - -#include "common.h" - -#include "buffer.h" -#include "hash.h" -#include "oidmap.h" -#include "netops.h" -#include "zstream.h" -#include "pool.h" - -#include "git2/oid.h" -#include "git2/pack.h" - -#define GIT_PACK_WINDOW 10 /* number of objects to possibly delta against */ -#define GIT_PACK_DEPTH 50 /* max delta depth */ -#define GIT_PACK_DELTA_CACHE_SIZE (256 * 1024 * 1024) -#define GIT_PACK_DELTA_CACHE_LIMIT 1000 -#define GIT_PACK_BIG_FILE_THRESHOLD (512 * 1024 * 1024) - -typedef struct git_pobject { - git_oid id; - git_otype type; - git_off_t offset; - - size_t size; - - unsigned int hash; /* name hint hash */ - - struct git_pobject *delta; /* delta base object */ - struct git_pobject *delta_child; /* deltified objects who bases me */ - struct git_pobject *delta_sibling; /* other deltified objects - * who uses the same base as - * me */ - - void *delta_data; - unsigned long delta_size; - unsigned long z_delta_size; - - int written:1, - recursing:1, - tagged:1, - filled:1; -} git_pobject; - -typedef struct { - git_oid id; - unsigned int uninteresting:1, - seen:1; -} git_walk_object; - -struct git_packbuilder { - git_repository *repo; /* associated repository */ - git_odb *odb; /* associated object database */ - - git_hash_ctx ctx; - git_zstream zstream; - - uint32_t nr_objects, - nr_deltified, - nr_alloc, - nr_written, - nr_remaining; - - git_pobject *object_list; - - git_oidmap *object_ix; - - git_oidmap *walk_objects; - git_pool object_pool; - - git_oid pack_oid; /* hash of written pack */ - - /* synchronization objects */ - git_mutex cache_mutex; - git_mutex progress_mutex; - git_cond progress_cond; - - /* configs */ - uint64_t delta_cache_size; - uint64_t max_delta_cache_size; - uint64_t cache_max_small_delta_size; - uint64_t big_file_threshold; - uint64_t window_memory_limit; - - int nr_threads; /* nr of threads to use */ - - git_packbuilder_progress progress_cb; - void *progress_cb_payload; - double last_progress_report_time; /* the time progress was last reported */ - - bool done; -}; - -int git_packbuilder_write_buf(git_buf *buf, git_packbuilder *pb); - -#endif /* INCLUDE_pack_objects_h__ */ diff --git a/vendor/libgit2/src/pack.c b/vendor/libgit2/src/pack.c deleted file mode 100644 index e7003e66d..000000000 --- a/vendor/libgit2/src/pack.c +++ /dev/null @@ -1,1402 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "common.h" -#include "odb.h" -#include "pack.h" -#include "delta-apply.h" -#include "sha1_lookup.h" -#include "mwindow.h" -#include "fileops.h" -#include "oid.h" - -#include - -GIT__USE_OFFMAP -GIT__USE_OIDMAP - -static int packfile_open(struct git_pack_file *p); -static git_off_t nth_packed_object_offset(const struct git_pack_file *p, uint32_t n); -static int packfile_unpack_compressed( - git_rawobj *obj, - struct git_pack_file *p, - git_mwindow **w_curs, - git_off_t *curpos, - size_t size, - git_otype type); - -/* Can find the offset of an object given - * a prefix of an identifier. - * Throws GIT_EAMBIGUOUSOIDPREFIX if short oid - * is ambiguous within the pack. - * This method assumes that len is between - * GIT_OID_MINPREFIXLEN and GIT_OID_HEXSZ. - */ -static int pack_entry_find_offset( - git_off_t *offset_out, - git_oid *found_oid, - struct git_pack_file *p, - const git_oid *short_oid, - size_t len); - -static int packfile_error(const char *message) -{ - giterr_set(GITERR_ODB, "Invalid pack file - %s", message); - return -1; -} - -/******************** - * Delta base cache - ********************/ - -static git_pack_cache_entry *new_cache_object(git_rawobj *source) -{ - git_pack_cache_entry *e = git__calloc(1, sizeof(git_pack_cache_entry)); - if (!e) - return NULL; - - git_atomic_inc(&e->refcount); - memcpy(&e->raw, source, sizeof(git_rawobj)); - - return e; -} - -static void free_cache_object(void *o) -{ - git_pack_cache_entry *e = (git_pack_cache_entry *)o; - - if (e != NULL) { - assert(e->refcount.val == 0); - git__free(e->raw.data); - git__free(e); - } -} - -static void cache_free(git_pack_cache *cache) -{ - khiter_t k; - - if (cache->entries) { - for (k = kh_begin(cache->entries); k != kh_end(cache->entries); k++) { - if (kh_exist(cache->entries, k)) - free_cache_object(kh_value(cache->entries, k)); - } - - git_offmap_free(cache->entries); - cache->entries = NULL; - } -} - -static int cache_init(git_pack_cache *cache) -{ - cache->entries = git_offmap_alloc(); - GITERR_CHECK_ALLOC(cache->entries); - - cache->memory_limit = GIT_PACK_CACHE_MEMORY_LIMIT; - - if (git_mutex_init(&cache->lock)) { - giterr_set(GITERR_OS, "Failed to initialize pack cache mutex"); - - git__free(cache->entries); - cache->entries = NULL; - - return -1; - } - - return 0; -} - -static git_pack_cache_entry *cache_get(git_pack_cache *cache, git_off_t offset) -{ - khiter_t k; - git_pack_cache_entry *entry = NULL; - - if (git_mutex_lock(&cache->lock) < 0) - return NULL; - - k = kh_get(off, cache->entries, offset); - if (k != kh_end(cache->entries)) { /* found it */ - entry = kh_value(cache->entries, k); - git_atomic_inc(&entry->refcount); - entry->last_usage = cache->use_ctr++; - } - git_mutex_unlock(&cache->lock); - - return entry; -} - -/* Run with the cache lock held */ -static void free_lowest_entry(git_pack_cache *cache) -{ - git_pack_cache_entry *entry; - khiter_t k; - - for (k = kh_begin(cache->entries); k != kh_end(cache->entries); k++) { - if (!kh_exist(cache->entries, k)) - continue; - - entry = kh_value(cache->entries, k); - - if (entry && entry->refcount.val == 0) { - cache->memory_used -= entry->raw.len; - kh_del(off, cache->entries, k); - free_cache_object(entry); - } - } -} - -static int cache_add( - git_pack_cache_entry **cached_out, - git_pack_cache *cache, - git_rawobj *base, - git_off_t offset) -{ - git_pack_cache_entry *entry; - int error, exists = 0; - khiter_t k; - - if (base->len > GIT_PACK_CACHE_SIZE_LIMIT) - return -1; - - entry = new_cache_object(base); - if (entry) { - if (git_mutex_lock(&cache->lock) < 0) { - giterr_set(GITERR_OS, "failed to lock cache"); - git__free(entry); - return -1; - } - /* Add it to the cache if nobody else has */ - exists = kh_get(off, cache->entries, offset) != kh_end(cache->entries); - if (!exists) { - while (cache->memory_used + base->len > cache->memory_limit) - free_lowest_entry(cache); - - k = kh_put(off, cache->entries, offset, &error); - assert(error != 0); - kh_value(cache->entries, k) = entry; - cache->memory_used += entry->raw.len; - - *cached_out = entry; - } - git_mutex_unlock(&cache->lock); - /* Somebody beat us to adding it into the cache */ - if (exists) { - git__free(entry); - return -1; - } - } - - return 0; -} - -/*********************************************************** - * - * PACK INDEX METHODS - * - ***********************************************************/ - -static void pack_index_free(struct git_pack_file *p) -{ - if (p->oids) { - git__free(p->oids); - p->oids = NULL; - } - if (p->index_map.data) { - git_futils_mmap_free(&p->index_map); - p->index_map.data = NULL; - } -} - -static int pack_index_check(const char *path, struct git_pack_file *p) -{ - struct git_pack_idx_header *hdr; - uint32_t version, nr, i, *index; - void *idx_map; - size_t idx_size; - struct stat st; - int error; - /* TODO: properly open the file without access time using O_NOATIME */ - git_file fd = git_futils_open_ro(path); - if (fd < 0) - return fd; - - if (p_fstat(fd, &st) < 0) { - p_close(fd); - giterr_set(GITERR_OS, "Unable to stat pack index '%s'", path); - return -1; - } - - if (!S_ISREG(st.st_mode) || - !git__is_sizet(st.st_size) || - (idx_size = (size_t)st.st_size) < 4 * 256 + 20 + 20) - { - p_close(fd); - giterr_set(GITERR_ODB, "Invalid pack index '%s'", path); - return -1; - } - - error = git_futils_mmap_ro(&p->index_map, fd, 0, idx_size); - - p_close(fd); - - if (error < 0) - return error; - - hdr = idx_map = p->index_map.data; - - if (hdr->idx_signature == htonl(PACK_IDX_SIGNATURE)) { - version = ntohl(hdr->idx_version); - - if (version < 2 || version > 2) { - git_futils_mmap_free(&p->index_map); - return packfile_error("unsupported index version"); - } - - } else - version = 1; - - nr = 0; - index = idx_map; - - if (version > 1) - index += 2; /* skip index header */ - - for (i = 0; i < 256; i++) { - uint32_t n = ntohl(index[i]); - if (n < nr) { - git_futils_mmap_free(&p->index_map); - return packfile_error("index is non-monotonic"); - } - nr = n; - } - - if (version == 1) { - /* - * Total size: - * - 256 index entries 4 bytes each - * - 24-byte entries * nr (20-byte sha1 + 4-byte offset) - * - 20-byte SHA1 of the packfile - * - 20-byte SHA1 file checksum - */ - if (idx_size != 4*256 + nr * 24 + 20 + 20) { - git_futils_mmap_free(&p->index_map); - return packfile_error("index is corrupted"); - } - } else if (version == 2) { - /* - * Minimum size: - * - 8 bytes of header - * - 256 index entries 4 bytes each - * - 20-byte sha1 entry * nr - * - 4-byte crc entry * nr - * - 4-byte offset entry * nr - * - 20-byte SHA1 of the packfile - * - 20-byte SHA1 file checksum - * And after the 4-byte offset table might be a - * variable sized table containing 8-byte entries - * for offsets larger than 2^31. - */ - unsigned long min_size = 8 + 4*256 + nr*(20 + 4 + 4) + 20 + 20; - unsigned long max_size = min_size; - - if (nr) - max_size += (nr - 1)*8; - - if (idx_size < min_size || idx_size > max_size) { - git_futils_mmap_free(&p->index_map); - return packfile_error("wrong index size"); - } - } - - p->num_objects = nr; - p->index_version = version; - return 0; -} - -static int pack_index_open(struct git_pack_file *p) -{ - int error = 0; - size_t name_len; - git_buf idx_name = GIT_BUF_INIT; - - if (p->index_version > -1) - return 0; - - name_len = strlen(p->pack_name); - assert(name_len > strlen(".pack")); /* checked by git_pack_file alloc */ - - git_buf_grow(&idx_name, name_len); - git_buf_put(&idx_name, p->pack_name, name_len - strlen(".pack")); - git_buf_puts(&idx_name, ".idx"); - if (git_buf_oom(&idx_name)) { - giterr_set_oom(); - return -1; - } - - if ((error = git_mutex_lock(&p->lock)) < 0) { - git_buf_free(&idx_name); - return error; - } - - if (p->index_version == -1) - error = pack_index_check(idx_name.ptr, p); - - git_buf_free(&idx_name); - - git_mutex_unlock(&p->lock); - - return error; -} - -static unsigned char *pack_window_open( - struct git_pack_file *p, - git_mwindow **w_cursor, - git_off_t offset, - unsigned int *left) -{ - if (p->mwf.fd == -1 && packfile_open(p) < 0) - return NULL; - - /* Since packfiles end in a hash of their content and it's - * pointless to ask for an offset into the middle of that - * hash, and the pack_window_contains function above wouldn't match - * don't allow an offset too close to the end of the file. - * - * Don't allow a negative offset, as that means we've wrapped - * around. - */ - if (offset > (p->mwf.size - 20)) - return NULL; - if (offset < 0) - return NULL; - - return git_mwindow_open(&p->mwf, w_cursor, offset, 20, left); - } - -/* - * The per-object header is a pretty dense thing, which is - * - first byte: low four bits are "size", - * then three bits of "type", - * with the high bit being "size continues". - * - each byte afterwards: low seven bits are size continuation, - * with the high bit being "size continues" - */ -size_t git_packfile__object_header(unsigned char *hdr, size_t size, git_otype type) -{ - unsigned char *hdr_base; - unsigned char c; - - assert(type >= GIT_OBJ_COMMIT && type <= GIT_OBJ_REF_DELTA); - - /* TODO: add support for chunked objects; see git.git 6c0d19b1 */ - - c = (unsigned char)((type << 4) | (size & 15)); - size >>= 4; - hdr_base = hdr; - - while (size) { - *hdr++ = c | 0x80; - c = size & 0x7f; - size >>= 7; - } - *hdr++ = c; - - return (hdr - hdr_base); -} - - -static int packfile_unpack_header1( - unsigned long *usedp, - size_t *sizep, - git_otype *type, - const unsigned char *buf, - unsigned long len) -{ - unsigned shift; - unsigned long size, c; - unsigned long used = 0; - - c = buf[used++]; - *type = (c >> 4) & 7; - size = c & 15; - shift = 4; - while (c & 0x80) { - if (len <= used) { - giterr_set(GITERR_ODB, "buffer too small"); - return GIT_EBUFS; - } - - if (bitsizeof(long) <= shift) { - *usedp = 0; - giterr_set(GITERR_ODB, "packfile corrupted"); - return -1; - } - - c = buf[used++]; - size += (c & 0x7f) << shift; - shift += 7; - } - - *sizep = (size_t)size; - *usedp = used; - return 0; -} - -int git_packfile_unpack_header( - size_t *size_p, - git_otype *type_p, - git_mwindow_file *mwf, - git_mwindow **w_curs, - git_off_t *curpos) -{ - unsigned char *base; - unsigned int left; - unsigned long used; - int ret; - - /* pack_window_open() assures us we have [base, base + 20) available - * as a range that we can look at at. (Its actually the hash - * size that is assured.) With our object header encoding - * the maximum deflated object size is 2^137, which is just - * insane, so we know won't exceed what we have been given. - */ -/* base = pack_window_open(p, w_curs, *curpos, &left); */ - base = git_mwindow_open(mwf, w_curs, *curpos, 20, &left); - if (base == NULL) - return GIT_EBUFS; - - ret = packfile_unpack_header1(&used, size_p, type_p, base, left); - git_mwindow_close(w_curs); - if (ret == GIT_EBUFS) - return ret; - else if (ret < 0) - return packfile_error("header length is zero"); - - *curpos += used; - return 0; -} - -int git_packfile_resolve_header( - size_t *size_p, - git_otype *type_p, - struct git_pack_file *p, - git_off_t offset) -{ - git_mwindow *w_curs = NULL; - git_off_t curpos = offset; - size_t size; - git_otype type; - git_off_t base_offset; - int error; - - error = git_packfile_unpack_header(&size, &type, &p->mwf, &w_curs, &curpos); - if (error < 0) - return error; - - if (type == GIT_OBJ_OFS_DELTA || type == GIT_OBJ_REF_DELTA) { - size_t base_size; - git_rawobj delta; - base_offset = get_delta_base(p, &w_curs, &curpos, type, offset); - git_mwindow_close(&w_curs); - error = packfile_unpack_compressed(&delta, p, &w_curs, &curpos, size, type); - git_mwindow_close(&w_curs); - if (error < 0) - return error; - error = git__delta_read_header(delta.data, delta.len, &base_size, size_p); - git__free(delta.data); - if (error < 0) - return error; - } else - *size_p = size; - - while (type == GIT_OBJ_OFS_DELTA || type == GIT_OBJ_REF_DELTA) { - curpos = base_offset; - error = git_packfile_unpack_header(&size, &type, &p->mwf, &w_curs, &curpos); - if (error < 0) - return error; - if (type != GIT_OBJ_OFS_DELTA && type != GIT_OBJ_REF_DELTA) - break; - base_offset = get_delta_base(p, &w_curs, &curpos, type, base_offset); - git_mwindow_close(&w_curs); - } - *type_p = type; - - return error; -} - -#define SMALL_STACK_SIZE 64 - -/** - * Generate the chain of dependencies which we need to get to the - * object at `off`. `chain` is used a stack, popping gives the right - * order to apply deltas on. If an object is found in the pack's base - * cache, we stop calculating there. - */ -static int pack_dependency_chain(git_dependency_chain *chain_out, - git_pack_cache_entry **cached_out, git_off_t *cached_off, - struct pack_chain_elem *small_stack, size_t *stack_sz, - struct git_pack_file *p, git_off_t obj_offset) -{ - git_dependency_chain chain = GIT_ARRAY_INIT; - git_mwindow *w_curs = NULL; - git_off_t curpos = obj_offset, base_offset; - int error = 0, use_heap = 0; - size_t size, elem_pos; - git_otype type; - - elem_pos = 0; - while (true) { - struct pack_chain_elem *elem; - git_pack_cache_entry *cached = NULL; - - /* if we have a base cached, we can stop here instead */ - if ((cached = cache_get(&p->bases, obj_offset)) != NULL) { - *cached_out = cached; - *cached_off = obj_offset; - break; - } - - /* if we run out of space on the small stack, use the array */ - if (elem_pos == SMALL_STACK_SIZE) { - git_array_init_to_size(chain, elem_pos); - GITERR_CHECK_ARRAY(chain); - memcpy(chain.ptr, small_stack, elem_pos * sizeof(struct pack_chain_elem)); - chain.size = elem_pos; - use_heap = 1; - } - - curpos = obj_offset; - if (!use_heap) { - elem = &small_stack[elem_pos]; - } else { - elem = git_array_alloc(chain); - if (!elem) { - error = -1; - goto on_error; - } - } - - elem->base_key = obj_offset; - - error = git_packfile_unpack_header(&size, &type, &p->mwf, &w_curs, &curpos); - - if (error < 0) - goto on_error; - - elem->offset = curpos; - elem->size = size; - elem->type = type; - elem->base_key = obj_offset; - - if (type != GIT_OBJ_OFS_DELTA && type != GIT_OBJ_REF_DELTA) - break; - - base_offset = get_delta_base(p, &w_curs, &curpos, type, obj_offset); - git_mwindow_close(&w_curs); - - if (base_offset == 0) { - error = packfile_error("delta offset is zero"); - goto on_error; - } - if (base_offset < 0) { /* must actually be an error code */ - error = (int)base_offset; - goto on_error; - } - - /* we need to pass the pos *after* the delta-base bit */ - elem->offset = curpos; - - /* go through the loop again, but with the new object */ - obj_offset = base_offset; - elem_pos++; - } - - - *stack_sz = elem_pos + 1; - *chain_out = chain; - return error; - -on_error: - git_array_clear(chain); - return error; -} - -int git_packfile_unpack( - git_rawobj *obj, - struct git_pack_file *p, - git_off_t *obj_offset) -{ - git_mwindow *w_curs = NULL; - git_off_t curpos = *obj_offset; - int error, free_base = 0; - git_dependency_chain chain = GIT_ARRAY_INIT; - struct pack_chain_elem *elem = NULL, *stack; - git_pack_cache_entry *cached = NULL; - struct pack_chain_elem small_stack[SMALL_STACK_SIZE]; - size_t stack_size = 0, elem_pos, alloclen; - git_otype base_type; - - /* - * TODO: optionally check the CRC on the packfile - */ - - error = pack_dependency_chain(&chain, &cached, obj_offset, small_stack, &stack_size, p, *obj_offset); - if (error < 0) - return error; - - obj->data = NULL; - obj->len = 0; - obj->type = GIT_OBJ_BAD; - - /* let's point to the right stack */ - stack = chain.ptr ? chain.ptr : small_stack; - - elem_pos = stack_size; - if (cached) { - memcpy(obj, &cached->raw, sizeof(git_rawobj)); - base_type = obj->type; - elem_pos--; /* stack_size includes the base, which isn't actually there */ - } else { - elem = &stack[--elem_pos]; - base_type = elem->type; - } - - switch (base_type) { - case GIT_OBJ_COMMIT: - case GIT_OBJ_TREE: - case GIT_OBJ_BLOB: - case GIT_OBJ_TAG: - if (!cached) { - curpos = elem->offset; - error = packfile_unpack_compressed(obj, p, &w_curs, &curpos, elem->size, elem->type); - git_mwindow_close(&w_curs); - base_type = elem->type; - } - if (error < 0) - goto cleanup; - break; - case GIT_OBJ_OFS_DELTA: - case GIT_OBJ_REF_DELTA: - error = packfile_error("dependency chain ends in a delta"); - goto cleanup; - default: - error = packfile_error("invalid packfile type in header"); - goto cleanup; - } - - /* - * Finding the object we want a cached base element is - * problematic, as we need to make sure we don't accidentally - * give the caller the cached object, which it would then feel - * free to free, so we need to copy the data. - */ - if (cached && stack_size == 1) { - void *data = obj->data; - - GITERR_CHECK_ALLOC_ADD(&alloclen, obj->len, 1); - obj->data = git__malloc(alloclen); - GITERR_CHECK_ALLOC(obj->data); - - memcpy(obj->data, data, obj->len + 1); - git_atomic_dec(&cached->refcount); - goto cleanup; - } - - /* we now apply each consecutive delta until we run out */ - while (elem_pos > 0 && !error) { - git_rawobj base, delta; - - /* - * We can now try to add the base to the cache, as - * long as it's not already the cached one. - */ - if (!cached) - free_base = !!cache_add(&cached, &p->bases, obj, elem->base_key); - - elem = &stack[elem_pos - 1]; - curpos = elem->offset; - error = packfile_unpack_compressed(&delta, p, &w_curs, &curpos, elem->size, elem->type); - git_mwindow_close(&w_curs); - - if (error < 0) - break; - - /* the current object becomes the new base, on which we apply the delta */ - base = *obj; - obj->data = NULL; - obj->len = 0; - obj->type = GIT_OBJ_BAD; - - error = git__delta_apply(obj, base.data, base.len, delta.data, delta.len); - obj->type = base_type; - /* - * We usually don't want to free the base at this - * point, as we put it into the cache in the previous - * iteration. free_base lets us know that we got the - * base object directly from the packfile, so we can free it. - */ - git__free(delta.data); - if (free_base) { - free_base = 0; - git__free(base.data); - } - - if (cached) { - git_atomic_dec(&cached->refcount); - cached = NULL; - } - - if (error < 0) - break; - - elem_pos--; - } - -cleanup: - if (error < 0) - git__free(obj->data); - - if (elem) - *obj_offset = curpos; - - git_array_clear(chain); - return error; -} - -static void *use_git_alloc(void *opaq, unsigned int count, unsigned int size) -{ - GIT_UNUSED(opaq); - return git__calloc(count, size); -} - -static void use_git_free(void *opaq, void *ptr) -{ - GIT_UNUSED(opaq); - git__free(ptr); -} - -int git_packfile_stream_open(git_packfile_stream *obj, struct git_pack_file *p, git_off_t curpos) -{ - int st; - - memset(obj, 0, sizeof(git_packfile_stream)); - obj->curpos = curpos; - obj->p = p; - obj->zstream.zalloc = use_git_alloc; - obj->zstream.zfree = use_git_free; - obj->zstream.next_in = Z_NULL; - obj->zstream.next_out = Z_NULL; - st = inflateInit(&obj->zstream); - if (st != Z_OK) { - giterr_set(GITERR_ZLIB, "failed to init packfile stream"); - return -1; - } - - return 0; -} - -ssize_t git_packfile_stream_read(git_packfile_stream *obj, void *buffer, size_t len) -{ - unsigned char *in; - size_t written; - int st; - - if (obj->done) - return 0; - - in = pack_window_open(obj->p, &obj->mw, obj->curpos, &obj->zstream.avail_in); - if (in == NULL) - return GIT_EBUFS; - - obj->zstream.next_out = buffer; - obj->zstream.avail_out = (unsigned int)len; - obj->zstream.next_in = in; - - st = inflate(&obj->zstream, Z_SYNC_FLUSH); - git_mwindow_close(&obj->mw); - - obj->curpos += obj->zstream.next_in - in; - written = len - obj->zstream.avail_out; - - if (st != Z_OK && st != Z_STREAM_END) { - giterr_set(GITERR_ZLIB, "error reading from the zlib stream"); - return -1; - } - - if (st == Z_STREAM_END) - obj->done = 1; - - - /* If we didn't write anything out but we're not done, we need more data */ - if (!written && st != Z_STREAM_END) - return GIT_EBUFS; - - return written; - -} - -void git_packfile_stream_free(git_packfile_stream *obj) -{ - inflateEnd(&obj->zstream); -} - -static int packfile_unpack_compressed( - git_rawobj *obj, - struct git_pack_file *p, - git_mwindow **w_curs, - git_off_t *curpos, - size_t size, - git_otype type) -{ - size_t buf_size; - int st; - z_stream stream; - unsigned char *buffer, *in; - - GITERR_CHECK_ALLOC_ADD(&buf_size, size, 1); - buffer = git__calloc(1, buf_size); - GITERR_CHECK_ALLOC(buffer); - - memset(&stream, 0, sizeof(stream)); - stream.next_out = buffer; - stream.avail_out = (uInt)buf_size; - stream.zalloc = use_git_alloc; - stream.zfree = use_git_free; - - st = inflateInit(&stream); - if (st != Z_OK) { - git__free(buffer); - giterr_set(GITERR_ZLIB, "failed to init zlib stream on unpack"); - - return -1; - } - - do { - in = pack_window_open(p, w_curs, *curpos, &stream.avail_in); - stream.next_in = in; - st = inflate(&stream, Z_FINISH); - git_mwindow_close(w_curs); - - if (!stream.avail_out) - break; /* the payload is larger than it should be */ - - if (st == Z_BUF_ERROR && in == NULL) { - inflateEnd(&stream); - git__free(buffer); - return GIT_EBUFS; - } - - *curpos += stream.next_in - in; - } while (st == Z_OK || st == Z_BUF_ERROR); - - inflateEnd(&stream); - - if ((st != Z_STREAM_END) || stream.total_out != size) { - git__free(buffer); - giterr_set(GITERR_ZLIB, "error inflating zlib stream"); - return -1; - } - - obj->type = type; - obj->len = size; - obj->data = buffer; - return 0; -} - -/* - * curpos is where the data starts, delta_obj_offset is the where the - * header starts - */ -git_off_t get_delta_base( - struct git_pack_file *p, - git_mwindow **w_curs, - git_off_t *curpos, - git_otype type, - git_off_t delta_obj_offset) -{ - unsigned int left = 0; - unsigned char *base_info; - git_off_t base_offset; - git_oid unused; - - base_info = pack_window_open(p, w_curs, *curpos, &left); - /* Assumption: the only reason this would fail is because the file is too small */ - if (base_info == NULL) - return GIT_EBUFS; - /* pack_window_open() assured us we have [base_info, base_info + 20) - * as a range that we can look at without walking off the - * end of the mapped window. Its actually the hash size - * that is assured. An OFS_DELTA longer than the hash size - * is stupid, as then a REF_DELTA would be smaller to store. - */ - if (type == GIT_OBJ_OFS_DELTA) { - unsigned used = 0; - unsigned char c = base_info[used++]; - base_offset = c & 127; - while (c & 128) { - if (left <= used) - return GIT_EBUFS; - base_offset += 1; - if (!base_offset || MSB(base_offset, 7)) - return 0; /* overflow */ - c = base_info[used++]; - base_offset = (base_offset << 7) + (c & 127); - } - base_offset = delta_obj_offset - base_offset; - if (base_offset <= 0 || base_offset >= delta_obj_offset) - return 0; /* out of bound */ - *curpos += used; - } else if (type == GIT_OBJ_REF_DELTA) { - /* If we have the cooperative cache, search in it first */ - if (p->has_cache) { - khiter_t k; - git_oid oid; - - git_oid_fromraw(&oid, base_info); - k = kh_get(oid, p->idx_cache, &oid); - if (k != kh_end(p->idx_cache)) { - *curpos += 20; - return ((struct git_pack_entry *)kh_value(p->idx_cache, k))->offset; - } else { - /* If we're building an index, don't try to find the pack - * entry; we just haven't seen it yet. We'll make - * progress again in the next loop. - */ - return GIT_PASSTHROUGH; - } - } - - /* The base entry _must_ be in the same pack */ - if (pack_entry_find_offset(&base_offset, &unused, p, (git_oid *)base_info, GIT_OID_HEXSZ) < 0) - return packfile_error("base entry delta is not in the same pack"); - *curpos += 20; - } else - return 0; - - return base_offset; -} - -/*********************************************************** - * - * PACKFILE METHODS - * - ***********************************************************/ - -void git_packfile_free(struct git_pack_file *p) -{ - if (!p) - return; - - cache_free(&p->bases); - - if (p->mwf.fd >= 0) { - git_mwindow_free_all_locked(&p->mwf); - p_close(p->mwf.fd); - } - - pack_index_free(p); - - git__free(p->bad_object_sha1); - - git_mutex_free(&p->lock); - git_mutex_free(&p->bases.lock); - git__free(p); -} - -static int packfile_open(struct git_pack_file *p) -{ - struct stat st; - struct git_pack_header hdr; - git_oid sha1; - unsigned char *idx_sha1; - - if (p->index_version == -1 && pack_index_open(p) < 0) - return git_odb__error_notfound("failed to open packfile", NULL, 0); - - /* if mwf opened by another thread, return now */ - if (git_mutex_lock(&p->lock) < 0) - return packfile_error("failed to get lock for open"); - - if (p->mwf.fd >= 0) { - git_mutex_unlock(&p->lock); - return 0; - } - - /* TODO: open with noatime */ - p->mwf.fd = git_futils_open_ro(p->pack_name); - if (p->mwf.fd < 0) - goto cleanup; - - if (p_fstat(p->mwf.fd, &st) < 0 || - git_mwindow_file_register(&p->mwf) < 0) - goto cleanup; - - /* If we created the struct before we had the pack we lack size. */ - if (!p->mwf.size) { - if (!S_ISREG(st.st_mode)) - goto cleanup; - p->mwf.size = (git_off_t)st.st_size; - } else if (p->mwf.size != st.st_size) - goto cleanup; - -#if 0 - /* We leave these file descriptors open with sliding mmap; - * there is no point keeping them open across exec(), though. - */ - fd_flag = fcntl(p->mwf.fd, F_GETFD, 0); - if (fd_flag < 0) - goto cleanup; - - fd_flag |= FD_CLOEXEC; - if (fcntl(p->pack_fd, F_SETFD, fd_flag) == -1) - goto cleanup; -#endif - - /* Verify we recognize this pack file format. */ - if (p_read(p->mwf.fd, &hdr, sizeof(hdr)) < 0 || - hdr.hdr_signature != htonl(PACK_SIGNATURE) || - !pack_version_ok(hdr.hdr_version)) - goto cleanup; - - /* Verify the pack matches its index. */ - if (p->num_objects != ntohl(hdr.hdr_entries) || - p_lseek(p->mwf.fd, p->mwf.size - GIT_OID_RAWSZ, SEEK_SET) == -1 || - p_read(p->mwf.fd, sha1.id, GIT_OID_RAWSZ) < 0) - goto cleanup; - - idx_sha1 = ((unsigned char *)p->index_map.data) + p->index_map.len - 40; - - if (git_oid__cmp(&sha1, (git_oid *)idx_sha1) != 0) - goto cleanup; - - git_mutex_unlock(&p->lock); - return 0; - -cleanup: - giterr_set(GITERR_OS, "Invalid packfile '%s'", p->pack_name); - - if (p->mwf.fd >= 0) - p_close(p->mwf.fd); - p->mwf.fd = -1; - - git_mutex_unlock(&p->lock); - - return -1; -} - -int git_packfile__name(char **out, const char *path) -{ - size_t path_len; - git_buf buf = GIT_BUF_INIT; - - path_len = strlen(path); - - if (path_len < strlen(".idx")) - return git_odb__error_notfound("invalid packfile path", NULL, 0); - - if (git_buf_printf(&buf, "%.*s.pack", (int)(path_len - strlen(".idx")), path) < 0) - return -1; - - *out = git_buf_detach(&buf); - return 0; -} - -int git_packfile_alloc(struct git_pack_file **pack_out, const char *path) -{ - struct stat st; - struct git_pack_file *p; - size_t path_len = path ? strlen(path) : 0, alloc_len; - - *pack_out = NULL; - - if (path_len < strlen(".idx")) - return git_odb__error_notfound("invalid packfile path", NULL, 0); - - GITERR_CHECK_ALLOC_ADD(&alloc_len, sizeof(*p), path_len); - GITERR_CHECK_ALLOC_ADD(&alloc_len, alloc_len, 2); - - p = git__calloc(1, alloc_len); - GITERR_CHECK_ALLOC(p); - - memcpy(p->pack_name, path, path_len + 1); - - /* - * Make sure a corresponding .pack file exists and that - * the index looks sane. - */ - if (git__suffixcmp(path, ".idx") == 0) { - size_t root_len = path_len - strlen(".idx"); - - memcpy(p->pack_name + root_len, ".keep", sizeof(".keep")); - if (git_path_exists(p->pack_name) == true) - p->pack_keep = 1; - - memcpy(p->pack_name + root_len, ".pack", sizeof(".pack")); - } - - if (p_stat(p->pack_name, &st) < 0 || !S_ISREG(st.st_mode)) { - git__free(p); - return git_odb__error_notfound("packfile not found", NULL, 0); - } - - /* ok, it looks sane as far as we can check without - * actually mapping the pack file. - */ - p->mwf.fd = -1; - p->mwf.size = st.st_size; - p->pack_local = 1; - p->mtime = (git_time_t)st.st_mtime; - p->index_version = -1; - - if (git_mutex_init(&p->lock)) { - giterr_set(GITERR_OS, "Failed to initialize packfile mutex"); - git__free(p); - return -1; - } - - if (cache_init(&p->bases) < 0) { - git__free(p); - return -1; - } - - *pack_out = p; - - return 0; -} - -/*********************************************************** - * - * PACKFILE ENTRY SEARCH INTERNALS - * - ***********************************************************/ - -static git_off_t nth_packed_object_offset(const struct git_pack_file *p, uint32_t n) -{ - const unsigned char *index = p->index_map.data; - const unsigned char *end = index + p->index_map.len; - index += 4 * 256; - if (p->index_version == 1) { - return ntohl(*((uint32_t *)(index + 24 * n))); - } else { - uint32_t off; - index += 8 + p->num_objects * (20 + 4); - off = ntohl(*((uint32_t *)(index + 4 * n))); - if (!(off & 0x80000000)) - return off; - index += p->num_objects * 4 + (off & 0x7fffffff) * 8; - - /* Make sure we're not being sent out of bounds */ - if (index >= end - 8) - return -1; - - return (((uint64_t)ntohl(*((uint32_t *)(index + 0)))) << 32) | - ntohl(*((uint32_t *)(index + 4))); - } -} - -static int git__memcmp4(const void *a, const void *b) { - return memcmp(a, b, 4); -} - -int git_pack_foreach_entry( - struct git_pack_file *p, - git_odb_foreach_cb cb, - void *data) -{ - const unsigned char *index = p->index_map.data, *current; - uint32_t i; - int error = 0; - - if (index == NULL) { - if ((error = pack_index_open(p)) < 0) - return error; - - assert(p->index_map.data); - - index = p->index_map.data; - } - - if (p->index_version > 1) { - index += 8; - } - - index += 4 * 256; - - if (p->oids == NULL) { - git_vector offsets, oids; - - if ((error = git_vector_init(&oids, p->num_objects, NULL))) - return error; - - if ((error = git_vector_init(&offsets, p->num_objects, git__memcmp4))) - return error; - - if (p->index_version > 1) { - const unsigned char *off = index + 24 * p->num_objects; - for (i = 0; i < p->num_objects; i++) - git_vector_insert(&offsets, (void*)&off[4 * i]); - git_vector_sort(&offsets); - git_vector_foreach(&offsets, i, current) - git_vector_insert(&oids, (void*)&index[5 * (current - off)]); - } else { - for (i = 0; i < p->num_objects; i++) - git_vector_insert(&offsets, (void*)&index[24 * i]); - git_vector_sort(&offsets); - git_vector_foreach(&offsets, i, current) - git_vector_insert(&oids, (void*)¤t[4]); - } - - git_vector_free(&offsets); - p->oids = (git_oid **)git_vector_detach(NULL, NULL, &oids); - } - - for (i = 0; i < p->num_objects; i++) - if ((error = cb(p->oids[i], data)) != 0) - return giterr_set_after_callback(error); - - return error; -} - -static int pack_entry_find_offset( - git_off_t *offset_out, - git_oid *found_oid, - struct git_pack_file *p, - const git_oid *short_oid, - size_t len) -{ - const uint32_t *level1_ofs = p->index_map.data; - const unsigned char *index = p->index_map.data; - unsigned hi, lo, stride; - int pos, found = 0; - git_off_t offset; - const unsigned char *current = 0; - - *offset_out = 0; - - if (p->index_version == -1) { - int error; - - if ((error = pack_index_open(p)) < 0) - return error; - assert(p->index_map.data); - - index = p->index_map.data; - level1_ofs = p->index_map.data; - } - - if (p->index_version > 1) { - level1_ofs += 2; - index += 8; - } - - index += 4 * 256; - hi = ntohl(level1_ofs[(int)short_oid->id[0]]); - lo = ((short_oid->id[0] == 0x0) ? 0 : ntohl(level1_ofs[(int)short_oid->id[0] - 1])); - - if (p->index_version > 1) { - stride = 20; - } else { - stride = 24; - index += 4; - } - -#ifdef INDEX_DEBUG_LOOKUP - printf("%02x%02x%02x... lo %u hi %u nr %d\n", - short_oid->id[0], short_oid->id[1], short_oid->id[2], lo, hi, p->num_objects); -#endif - -#ifdef GIT_USE_LOOKUP - pos = sha1_entry_pos(index, stride, 0, lo, hi, p->num_objects, short_oid->id); -#else - pos = sha1_position(index, stride, lo, hi, short_oid->id); -#endif - - if (pos >= 0) { - /* An object matching exactly the oid was found */ - found = 1; - current = index + pos * stride; - } else { - /* No object was found */ - /* pos refers to the object with the "closest" oid to short_oid */ - pos = - 1 - pos; - if (pos < (int)p->num_objects) { - current = index + pos * stride; - - if (!git_oid_ncmp(short_oid, (const git_oid *)current, len)) - found = 1; - } - } - - if (found && len != GIT_OID_HEXSZ && pos + 1 < (int)p->num_objects) { - /* Check for ambiguousity */ - const unsigned char *next = current + stride; - - if (!git_oid_ncmp(short_oid, (const git_oid *)next, len)) { - found = 2; - } - } - - if (!found) - return git_odb__error_notfound("failed to find offset for pack entry", short_oid, len); - if (found > 1) - return git_odb__error_ambiguous("found multiple offsets for pack entry"); - - if ((offset = nth_packed_object_offset(p, pos)) < 0) { - giterr_set(GITERR_ODB, "packfile index is corrupt"); - return -1; - } - - *offset_out = offset; - git_oid_fromraw(found_oid, current); - -#ifdef INDEX_DEBUG_LOOKUP - { - unsigned char hex_sha1[GIT_OID_HEXSZ + 1]; - git_oid_fmt(hex_sha1, found_oid); - hex_sha1[GIT_OID_HEXSZ] = '\0'; - printf("found lo=%d %s\n", lo, hex_sha1); - } -#endif - - return 0; -} - -int git_pack_entry_find( - struct git_pack_entry *e, - struct git_pack_file *p, - const git_oid *short_oid, - size_t len) -{ - git_off_t offset; - git_oid found_oid; - int error; - - assert(p); - - if (len == GIT_OID_HEXSZ && p->num_bad_objects) { - unsigned i; - for (i = 0; i < p->num_bad_objects; i++) - if (git_oid__cmp(short_oid, &p->bad_object_sha1[i]) == 0) - return packfile_error("bad object found in packfile"); - } - - error = pack_entry_find_offset(&offset, &found_oid, p, short_oid, len); - if (error < 0) - return error; - - /* we found a unique entry in the index; - * make sure the packfile backing the index - * still exists on disk */ - if (p->mwf.fd == -1 && (error = packfile_open(p)) < 0) - return error; - - e->offset = offset; - e->p = p; - - git_oid_cpy(&e->sha1, &found_oid); - return 0; -} diff --git a/vendor/libgit2/src/pack.h b/vendor/libgit2/src/pack.h deleted file mode 100644 index d15247b74..000000000 --- a/vendor/libgit2/src/pack.h +++ /dev/null @@ -1,163 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#ifndef INCLUDE_pack_h__ -#define INCLUDE_pack_h__ - -#include - -#include "git2/oid.h" - -#include "common.h" -#include "map.h" -#include "mwindow.h" -#include "odb.h" -#include "oidmap.h" -#include "array.h" - -#define GIT_PACK_FILE_MODE 0444 - -#define PACK_SIGNATURE 0x5041434b /* "PACK" */ -#define PACK_VERSION 2 -#define pack_version_ok(v) ((v) == htonl(2) || (v) == htonl(3)) -struct git_pack_header { - uint32_t hdr_signature; - uint32_t hdr_version; - uint32_t hdr_entries; -}; - -/* - * The first four bytes of index formats later than version 1 should - * start with this signature, as all older git binaries would find this - * value illegal and abort reading the file. - * - * This is the case because the number of objects in a packfile - * cannot exceed 1,431,660,000 as every object would need at least - * 3 bytes of data and the overall packfile cannot exceed 4 GiB with - * version 1 of the index file due to the offsets limited to 32 bits. - * Clearly the signature exceeds this maximum. - * - * Very old git binaries will also compare the first 4 bytes to the - * next 4 bytes in the index and abort with a "non-monotonic index" - * error if the second 4 byte word is smaller than the first 4 - * byte word. This would be true in the proposed future index - * format as idx_signature would be greater than idx_version. - */ - -#define PACK_IDX_SIGNATURE 0xff744f63 /* "\377tOc" */ - -struct git_pack_idx_header { - uint32_t idx_signature; - uint32_t idx_version; -}; - -typedef struct git_pack_cache_entry { - size_t last_usage; /* enough? */ - git_atomic refcount; - git_rawobj raw; -} git_pack_cache_entry; - -struct pack_chain_elem { - git_off_t base_key; - git_off_t offset; - size_t size; - git_otype type; -}; - -typedef git_array_t(struct pack_chain_elem) git_dependency_chain; - -#include "offmap.h" -#include "oidmap.h" - -#define GIT_PACK_CACHE_MEMORY_LIMIT 16 * 1024 * 1024 -#define GIT_PACK_CACHE_SIZE_LIMIT 1024 * 1024 /* don't bother caching anything over 1MB */ - -typedef struct { - size_t memory_used; - size_t memory_limit; - size_t use_ctr; - git_mutex lock; - git_offmap *entries; -} git_pack_cache; - -struct git_pack_file { - git_mwindow_file mwf; - git_map index_map; - git_mutex lock; /* protect updates to mwf and index_map */ - git_atomic refcount; - - uint32_t num_objects; - uint32_t num_bad_objects; - git_oid *bad_object_sha1; /* array of git_oid */ - - int index_version; - git_time_t mtime; - unsigned pack_local:1, pack_keep:1, has_cache:1; - git_oidmap *idx_cache; - git_oid **oids; - - git_pack_cache bases; /* delta base cache */ - - /* something like ".git/objects/pack/xxxxx.pack" */ - char pack_name[GIT_FLEX_ARRAY]; /* more */ -}; - -struct git_pack_entry { - git_off_t offset; - git_oid sha1; - struct git_pack_file *p; -}; - -typedef struct git_packfile_stream { - git_off_t curpos; - int done; - z_stream zstream; - struct git_pack_file *p; - git_mwindow *mw; -} git_packfile_stream; - -size_t git_packfile__object_header(unsigned char *hdr, size_t size, git_otype type); - -int git_packfile__name(char **out, const char *path); - -int git_packfile_unpack_header( - size_t *size_p, - git_otype *type_p, - git_mwindow_file *mwf, - git_mwindow **w_curs, - git_off_t *curpos); - -int git_packfile_resolve_header( - size_t *size_p, - git_otype *type_p, - struct git_pack_file *p, - git_off_t offset); - -int git_packfile_unpack(git_rawobj *obj, struct git_pack_file *p, git_off_t *obj_offset); - -int git_packfile_stream_open(git_packfile_stream *obj, struct git_pack_file *p, git_off_t curpos); -ssize_t git_packfile_stream_read(git_packfile_stream *obj, void *buffer, size_t len); -void git_packfile_stream_free(git_packfile_stream *obj); - -git_off_t get_delta_base(struct git_pack_file *p, git_mwindow **w_curs, - git_off_t *curpos, git_otype type, - git_off_t delta_obj_offset); - -void git_packfile_free(struct git_pack_file *p); -int git_packfile_alloc(struct git_pack_file **pack_out, const char *path); - -int git_pack_entry_find( - struct git_pack_entry *e, - struct git_pack_file *p, - const git_oid *short_oid, - size_t len); -int git_pack_foreach_entry( - struct git_pack_file *p, - git_odb_foreach_cb cb, - void *data); - -#endif diff --git a/vendor/libgit2/src/path.c b/vendor/libgit2/src/path.c deleted file mode 100644 index 1fd14fcb9..000000000 --- a/vendor/libgit2/src/path.c +++ /dev/null @@ -1,1717 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#include "common.h" -#include "path.h" -#include "posix.h" -#include "repository.h" -#ifdef GIT_WIN32 -#include "win32/posix.h" -#include "win32/w32_buffer.h" -#include "win32/w32_util.h" -#include "win32/version.h" -#else -#include -#endif -#include -#include - -#define LOOKS_LIKE_DRIVE_PREFIX(S) (git__isalpha((S)[0]) && (S)[1] == ':') - -#ifdef GIT_WIN32 -static bool looks_like_network_computer_name(const char *path, int pos) -{ - if (pos < 3) - return false; - - if (path[0] != '/' || path[1] != '/') - return false; - - while (pos-- > 2) { - if (path[pos] == '/') - return false; - } - - return true; -} -#endif - -/* - * Based on the Android implementation, BSD licensed. - * http://android.git.kernel.org/ - * - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -int git_path_basename_r(git_buf *buffer, const char *path) -{ - const char *endp, *startp; - int len, result; - - /* Empty or NULL string gets treated as "." */ - if (path == NULL || *path == '\0') { - startp = "."; - len = 1; - goto Exit; - } - - /* Strip trailing slashes */ - endp = path + strlen(path) - 1; - while (endp > path && *endp == '/') - endp--; - - /* All slashes becomes "/" */ - if (endp == path && *endp == '/') { - startp = "/"; - len = 1; - goto Exit; - } - - /* Find the start of the base */ - startp = endp; - while (startp > path && *(startp - 1) != '/') - startp--; - - /* Cast is safe because max path < max int */ - len = (int)(endp - startp + 1); - -Exit: - result = len; - - if (buffer != NULL && git_buf_set(buffer, startp, len) < 0) - return -1; - - return result; -} - -/* - * Based on the Android implementation, BSD licensed. - * Check http://android.git.kernel.org/ - */ -int git_path_dirname_r(git_buf *buffer, const char *path) -{ - const char *endp; - int result, len; - - /* Empty or NULL string gets treated as "." */ - if (path == NULL || *path == '\0') { - path = "."; - len = 1; - goto Exit; - } - - /* Strip trailing slashes */ - endp = path + strlen(path) - 1; - while (endp > path && *endp == '/') - endp--; - - /* Find the start of the dir */ - while (endp > path && *endp != '/') - endp--; - - /* Either the dir is "/" or there are no slashes */ - if (endp == path) { - path = (*endp == '/') ? "/" : "."; - len = 1; - goto Exit; - } - - do { - endp--; - } while (endp > path && *endp == '/'); - - /* Cast is safe because max path < max int */ - len = (int)(endp - path + 1); - -#ifdef GIT_WIN32 - /* Mimic unix behavior where '/.git' returns '/': 'C:/.git' will return - 'C:/' here */ - - if (len == 2 && LOOKS_LIKE_DRIVE_PREFIX(path)) { - len = 3; - goto Exit; - } - - /* Similarly checks if we're dealing with a network computer name - '//computername/.git' will return '//computername/' */ - - if (looks_like_network_computer_name(path, len)) { - len++; - goto Exit; - } - -#endif - -Exit: - result = len; - - if (buffer != NULL && git_buf_set(buffer, path, len) < 0) - return -1; - - return result; -} - - -char *git_path_dirname(const char *path) -{ - git_buf buf = GIT_BUF_INIT; - char *dirname; - - git_path_dirname_r(&buf, path); - dirname = git_buf_detach(&buf); - git_buf_free(&buf); /* avoid memleak if error occurs */ - - return dirname; -} - -char *git_path_basename(const char *path) -{ - git_buf buf = GIT_BUF_INIT; - char *basename; - - git_path_basename_r(&buf, path); - basename = git_buf_detach(&buf); - git_buf_free(&buf); /* avoid memleak if error occurs */ - - return basename; -} - -size_t git_path_basename_offset(git_buf *buffer) -{ - ssize_t slash; - - if (!buffer || buffer->size <= 0) - return 0; - - slash = git_buf_rfind_next(buffer, '/'); - - if (slash >= 0 && buffer->ptr[slash] == '/') - return (size_t)(slash + 1); - - return 0; -} - -const char *git_path_topdir(const char *path) -{ - size_t len; - ssize_t i; - - assert(path); - len = strlen(path); - - if (!len || path[len - 1] != '/') - return NULL; - - for (i = (ssize_t)len - 2; i >= 0; --i) - if (path[i] == '/') - break; - - return &path[i + 1]; -} - -int git_path_root(const char *path) -{ - int offset = 0; - - /* Does the root of the path look like a windows drive ? */ - if (LOOKS_LIKE_DRIVE_PREFIX(path)) - offset += 2; - -#ifdef GIT_WIN32 - /* Are we dealing with a windows network path? */ - else if ((path[0] == '/' && path[1] == '/' && path[2] != '/') || - (path[0] == '\\' && path[1] == '\\' && path[2] != '\\')) - { - offset += 2; - - /* Skip the computer name segment */ - while (path[offset] && path[offset] != '/' && path[offset] != '\\') - offset++; - } -#endif - - if (path[offset] == '/' || path[offset] == '\\') - return offset; - - return -1; /* Not a real error - signals that path is not rooted */ -} - -void git_path_trim_slashes(git_buf *path) -{ - int ceiling = git_path_root(path->ptr) + 1; - assert(ceiling >= 0); - - while (path->size > (size_t)ceiling) { - if (path->ptr[path->size-1] != '/') - break; - - path->ptr[path->size-1] = '\0'; - path->size--; - } -} - -int git_path_join_unrooted( - git_buf *path_out, const char *path, const char *base, ssize_t *root_at) -{ - ssize_t root; - - assert(path && path_out); - - root = (ssize_t)git_path_root(path); - - if (base != NULL && root < 0) { - if (git_buf_joinpath(path_out, base, path) < 0) - return -1; - - root = (ssize_t)strlen(base); - } else { - if (git_buf_sets(path_out, path) < 0) - return -1; - - if (root < 0) - root = 0; - else if (base) - git_path_equal_or_prefixed(base, path, &root); - } - - if (root_at) - *root_at = root; - - return 0; -} - -int git_path_prettify(git_buf *path_out, const char *path, const char *base) -{ - char buf[GIT_PATH_MAX]; - - assert(path && path_out); - - /* construct path if needed */ - if (base != NULL && git_path_root(path) < 0) { - if (git_buf_joinpath(path_out, base, path) < 0) - return -1; - path = path_out->ptr; - } - - if (p_realpath(path, buf) == NULL) { - /* giterr_set resets the errno when dealing with a GITERR_OS kind of error */ - int error = (errno == ENOENT || errno == ENOTDIR) ? GIT_ENOTFOUND : -1; - giterr_set(GITERR_OS, "Failed to resolve path '%s'", path); - - git_buf_clear(path_out); - - return error; - } - - return git_buf_sets(path_out, buf); -} - -int git_path_prettify_dir(git_buf *path_out, const char *path, const char *base) -{ - int error = git_path_prettify(path_out, path, base); - return (error < 0) ? error : git_path_to_dir(path_out); -} - -int git_path_to_dir(git_buf *path) -{ - if (path->asize > 0 && - git_buf_len(path) > 0 && - path->ptr[git_buf_len(path) - 1] != '/') - git_buf_putc(path, '/'); - - return git_buf_oom(path) ? -1 : 0; -} - -void git_path_string_to_dir(char* path, size_t size) -{ - size_t end = strlen(path); - - if (end && path[end - 1] != '/' && end < size) { - path[end] = '/'; - path[end + 1] = '\0'; - } -} - -int git__percent_decode(git_buf *decoded_out, const char *input) -{ - int len, hi, lo, i; - assert(decoded_out && input); - - len = (int)strlen(input); - git_buf_clear(decoded_out); - - for(i = 0; i < len; i++) - { - char c = input[i]; - - if (c != '%') - goto append; - - if (i >= len - 2) - goto append; - - hi = git__fromhex(input[i + 1]); - lo = git__fromhex(input[i + 2]); - - if (hi < 0 || lo < 0) - goto append; - - c = (char)(hi << 4 | lo); - i += 2; - -append: - if (git_buf_putc(decoded_out, c) < 0) - return -1; - } - - return 0; -} - -static int error_invalid_local_file_uri(const char *uri) -{ - giterr_set(GITERR_CONFIG, "'%s' is not a valid local file URI", uri); - return -1; -} - -static int local_file_url_prefixlen(const char *file_url) -{ - int len = -1; - - if (git__prefixcmp(file_url, "file://") == 0) { - if (file_url[7] == '/') - len = 8; - else if (git__prefixcmp(file_url + 7, "localhost/") == 0) - len = 17; - } - - return len; -} - -bool git_path_is_local_file_url(const char *file_url) -{ - return (local_file_url_prefixlen(file_url) > 0); -} - -int git_path_fromurl(git_buf *local_path_out, const char *file_url) -{ - int offset; - - assert(local_path_out && file_url); - - if ((offset = local_file_url_prefixlen(file_url)) < 0 || - file_url[offset] == '\0' || file_url[offset] == '/') - return error_invalid_local_file_uri(file_url); - -#ifndef GIT_WIN32 - offset--; /* A *nix absolute path starts with a forward slash */ -#endif - - git_buf_clear(local_path_out); - return git__percent_decode(local_path_out, file_url + offset); -} - -int git_path_walk_up( - git_buf *path, - const char *ceiling, - int (*cb)(void *data, const char *), - void *data) -{ - int error = 0; - git_buf iter; - ssize_t stop = 0, scan; - char oldc = '\0'; - - assert(path && cb); - - if (ceiling != NULL) { - if (git__prefixcmp(path->ptr, ceiling) == 0) - stop = (ssize_t)strlen(ceiling); - else - stop = git_buf_len(path); - } - scan = git_buf_len(path); - - /* empty path: yield only once */ - if (!scan) { - error = cb(data, ""); - if (error) - giterr_set_after_callback(error); - return error; - } - - iter.ptr = path->ptr; - iter.size = git_buf_len(path); - iter.asize = path->asize; - - while (scan >= stop) { - error = cb(data, iter.ptr); - iter.ptr[scan] = oldc; - - if (error) { - giterr_set_after_callback(error); - break; - } - - scan = git_buf_rfind_next(&iter, '/'); - if (scan >= 0) { - scan++; - oldc = iter.ptr[scan]; - iter.size = scan; - iter.ptr[scan] = '\0'; - } - } - - if (scan >= 0) - iter.ptr[scan] = oldc; - - /* relative path: yield for the last component */ - if (!error && stop == 0 && iter.ptr[0] != '/') { - error = cb(data, ""); - if (error) - giterr_set_after_callback(error); - } - - return error; -} - -bool git_path_exists(const char *path) -{ - assert(path); - return p_access(path, F_OK) == 0; -} - -bool git_path_isdir(const char *path) -{ - struct stat st; - if (p_stat(path, &st) < 0) - return false; - - return S_ISDIR(st.st_mode) != 0; -} - -bool git_path_isfile(const char *path) -{ - struct stat st; - - assert(path); - if (p_stat(path, &st) < 0) - return false; - - return S_ISREG(st.st_mode) != 0; -} - -bool git_path_islink(const char *path) -{ - struct stat st; - - assert(path); - if (p_lstat(path, &st) < 0) - return false; - - return S_ISLNK(st.st_mode) != 0; -} - -#ifdef GIT_WIN32 - -bool git_path_is_empty_dir(const char *path) -{ - git_win32_path filter_w; - bool empty = false; - - if (git_win32__findfirstfile_filter(filter_w, path)) { - WIN32_FIND_DATAW findData; - HANDLE hFind = FindFirstFileW(filter_w, &findData); - - /* FindFirstFile will fail if there are no children to the given - * path, which can happen if the given path is a file (and obviously - * has no children) or if the given path is an empty mount point. - * (Most directories have at least directory entries '.' and '..', - * but ridiculously another volume mounted in another drive letter's - * path space do not, and thus have nothing to enumerate.) If - * FindFirstFile fails, check if this is a directory-like thing - * (a mount point). - */ - if (hFind == INVALID_HANDLE_VALUE) - return git_path_isdir(path); - - /* If the find handle was created successfully, then it's a directory */ - empty = true; - - do { - /* Allow the enumeration to return . and .. and still be considered - * empty. In the special case of drive roots (i.e. C:\) where . and - * .. do not occur, we can still consider the path to be an empty - * directory if there's nothing there. */ - if (!git_path_is_dot_or_dotdotW(findData.cFileName)) { - empty = false; - break; - } - } while (FindNextFileW(hFind, &findData)); - - FindClose(hFind); - } - - return empty; -} - -#else - -static int path_found_entry(void *payload, git_buf *path) -{ - GIT_UNUSED(payload); - return !git_path_is_dot_or_dotdot(path->ptr); -} - -bool git_path_is_empty_dir(const char *path) -{ - int error; - git_buf dir = GIT_BUF_INIT; - - if (!git_path_isdir(path)) - return false; - - if ((error = git_buf_sets(&dir, path)) != 0) - giterr_clear(); - else - error = git_path_direach(&dir, 0, path_found_entry, NULL); - - git_buf_free(&dir); - - return !error; -} - -#endif - -int git_path_set_error(int errno_value, const char *path, const char *action) -{ - switch (errno_value) { - case ENOENT: - case ENOTDIR: - giterr_set(GITERR_OS, "Could not find '%s' to %s", path, action); - return GIT_ENOTFOUND; - - case EINVAL: - case ENAMETOOLONG: - giterr_set(GITERR_OS, "Invalid path for filesystem '%s'", path); - return GIT_EINVALIDSPEC; - - case EEXIST: - giterr_set(GITERR_OS, "Failed %s - '%s' already exists", action, path); - return GIT_EEXISTS; - - default: - giterr_set(GITERR_OS, "Could not %s '%s'", action, path); - return -1; - } -} - -int git_path_lstat(const char *path, struct stat *st) -{ - if (p_lstat(path, st) == 0) - return 0; - - return git_path_set_error(errno, path, "stat"); -} - -static bool _check_dir_contents( - git_buf *dir, - const char *sub, - bool (*predicate)(const char *)) -{ - bool result; - size_t dir_size = git_buf_len(dir); - size_t sub_size = strlen(sub); - size_t alloc_size; - - /* leave base valid even if we could not make space for subdir */ - if (GIT_ADD_SIZET_OVERFLOW(&alloc_size, dir_size, sub_size) || - GIT_ADD_SIZET_OVERFLOW(&alloc_size, alloc_size, 2) || - git_buf_try_grow(dir, alloc_size, false) < 0) - return false; - - /* save excursion */ - git_buf_joinpath(dir, dir->ptr, sub); - - result = predicate(dir->ptr); - - /* restore path */ - git_buf_truncate(dir, dir_size); - return result; -} - -bool git_path_contains(git_buf *dir, const char *item) -{ - return _check_dir_contents(dir, item, &git_path_exists); -} - -bool git_path_contains_dir(git_buf *base, const char *subdir) -{ - return _check_dir_contents(base, subdir, &git_path_isdir); -} - -bool git_path_contains_file(git_buf *base, const char *file) -{ - return _check_dir_contents(base, file, &git_path_isfile); -} - -int git_path_find_dir(git_buf *dir, const char *path, const char *base) -{ - int error = git_path_join_unrooted(dir, path, base, NULL); - - if (!error) { - char buf[GIT_PATH_MAX]; - if (p_realpath(dir->ptr, buf) != NULL) - error = git_buf_sets(dir, buf); - } - - /* call dirname if this is not a directory */ - if (!error) /* && git_path_isdir(dir->ptr) == false) */ - error = (git_path_dirname_r(dir, dir->ptr) < 0) ? -1 : 0; - - if (!error) - error = git_path_to_dir(dir); - - return error; -} - -int git_path_resolve_relative(git_buf *path, size_t ceiling) -{ - char *base, *to, *from, *next; - size_t len; - - GITERR_CHECK_ALLOC_BUF(path); - - if (ceiling > path->size) - ceiling = path->size; - - /* recognize drive prefixes, etc. that should not be backed over */ - if (ceiling == 0) - ceiling = git_path_root(path->ptr) + 1; - - /* recognize URL prefixes that should not be backed over */ - if (ceiling == 0) { - for (next = path->ptr; *next && git__isalpha(*next); ++next); - if (next[0] == ':' && next[1] == '/' && next[2] == '/') - ceiling = (next + 3) - path->ptr; - } - - base = to = from = path->ptr + ceiling; - - while (*from) { - for (next = from; *next && *next != '/'; ++next); - - len = next - from; - - if (len == 1 && from[0] == '.') - /* do nothing with singleton dot */; - - else if (len == 2 && from[0] == '.' && from[1] == '.') { - /* error out if trying to up one from a hard base */ - if (to == base && ceiling != 0) { - giterr_set(GITERR_INVALID, - "Cannot strip root component off url"); - return -1; - } - - /* no more path segments to strip, - * use '../' as a new base path */ - if (to == base) { - if (*next == '/') - len++; - - if (to != from) - memmove(to, from, len); - - to += len; - /* this is now the base, can't back up from a - * relative prefix */ - base = to; - } else { - /* back up a path segment */ - while (to > base && to[-1] == '/') to--; - while (to > base && to[-1] != '/') to--; - } - } else { - if (*next == '/' && *from != '/') - len++; - - if (to != from) - memmove(to, from, len); - - to += len; - } - - from += len; - - while (*from == '/') from++; - } - - *to = '\0'; - - path->size = to - path->ptr; - - return 0; -} - -int git_path_apply_relative(git_buf *target, const char *relpath) -{ - git_buf_joinpath(target, git_buf_cstr(target), relpath); - return git_path_resolve_relative(target, 0); -} - -int git_path_cmp( - const char *name1, size_t len1, int isdir1, - const char *name2, size_t len2, int isdir2, - int (*compare)(const char *, const char *, size_t)) -{ - unsigned char c1, c2; - size_t len = len1 < len2 ? len1 : len2; - int cmp; - - cmp = compare(name1, name2, len); - if (cmp) - return cmp; - - c1 = name1[len]; - c2 = name2[len]; - - if (c1 == '\0' && isdir1) - c1 = '/'; - - if (c2 == '\0' && isdir2) - c2 = '/'; - - return (c1 < c2) ? -1 : (c1 > c2) ? 1 : 0; -} - -int git_path_make_relative(git_buf *path, const char *parent) -{ - const char *p, *q, *p_dirsep, *q_dirsep; - size_t plen = path->size, newlen, alloclen, depth = 1, i, offset; - - for (p_dirsep = p = path->ptr, q_dirsep = q = parent; *p && *q; p++, q++) { - if (*p == '/' && *q == '/') { - p_dirsep = p; - q_dirsep = q; - } - else if (*p != *q) - break; - } - - /* need at least 1 common path segment */ - if ((p_dirsep == path->ptr || q_dirsep == parent) && - (*p_dirsep != '/' || *q_dirsep != '/')) { - giterr_set(GITERR_INVALID, - "%s is not a parent of %s", parent, path->ptr); - return GIT_ENOTFOUND; - } - - if (*p == '/' && !*q) - p++; - else if (!*p && *q == '/') - q++; - else if (!*p && !*q) - return git_buf_clear(path), 0; - else { - p = p_dirsep + 1; - q = q_dirsep + 1; - } - - plen -= (p - path->ptr); - - if (!*q) - return git_buf_set(path, p, plen); - - for (; (q = strchr(q, '/')) && *(q + 1); q++) - depth++; - - GITERR_CHECK_ALLOC_MULTIPLY(&newlen, depth, 3); - GITERR_CHECK_ALLOC_ADD(&newlen, newlen, plen); - - GITERR_CHECK_ALLOC_ADD(&alloclen, newlen, 1); - - /* save the offset as we might realllocate the pointer */ - offset = p - path->ptr; - if (git_buf_try_grow(path, alloclen, 1) < 0) - return -1; - p = path->ptr + offset; - - memmove(path->ptr + (depth * 3), p, plen + 1); - - for (i = 0; i < depth; i++) - memcpy(path->ptr + (i * 3), "../", 3); - - path->size = newlen; - return 0; -} - -bool git_path_has_non_ascii(const char *path, size_t pathlen) -{ - const uint8_t *scan = (const uint8_t *)path, *end; - - for (end = scan + pathlen; scan < end; ++scan) - if (*scan & 0x80) - return true; - - return false; -} - -#ifdef GIT_USE_ICONV - -int git_path_iconv_init_precompose(git_path_iconv_t *ic) -{ - git_buf_init(&ic->buf, 0); - ic->map = iconv_open(GIT_PATH_REPO_ENCODING, GIT_PATH_NATIVE_ENCODING); - return 0; -} - -void git_path_iconv_clear(git_path_iconv_t *ic) -{ - if (ic) { - if (ic->map != (iconv_t)-1) - iconv_close(ic->map); - git_buf_free(&ic->buf); - } -} - -int git_path_iconv(git_path_iconv_t *ic, const char **in, size_t *inlen) -{ - char *nfd = (char*)*in, *nfc; - size_t nfdlen = *inlen, nfclen, wantlen = nfdlen, alloclen, rv; - int retry = 1; - - if (!ic || ic->map == (iconv_t)-1 || - !git_path_has_non_ascii(*in, *inlen)) - return 0; - - git_buf_clear(&ic->buf); - - while (1) { - GITERR_CHECK_ALLOC_ADD(&alloclen, wantlen, 1); - if (git_buf_grow(&ic->buf, alloclen) < 0) - return -1; - - nfc = ic->buf.ptr + ic->buf.size; - nfclen = ic->buf.asize - ic->buf.size; - - rv = iconv(ic->map, &nfd, &nfdlen, &nfc, &nfclen); - - ic->buf.size = (nfc - ic->buf.ptr); - - if (rv != (size_t)-1) - break; - - /* if we cannot convert the data (probably because iconv thinks - * it is not valid UTF-8 source data), then use original data - */ - if (errno != E2BIG) - return 0; - - /* make space for 2x the remaining data to be converted - * (with per retry overhead to avoid infinite loops) - */ - wantlen = ic->buf.size + max(nfclen, nfdlen) * 2 + (size_t)(retry * 4); - - if (retry++ > 4) - goto fail; - } - - ic->buf.ptr[ic->buf.size] = '\0'; - - *in = ic->buf.ptr; - *inlen = ic->buf.size; - - return 0; - -fail: - giterr_set(GITERR_OS, "Unable to convert unicode path data"); - return -1; -} - -static const char *nfc_file = "\xC3\x85\x73\x74\x72\xC3\xB6\x6D.XXXXXX"; -static const char *nfd_file = "\x41\xCC\x8A\x73\x74\x72\x6F\xCC\x88\x6D.XXXXXX"; - -/* Check if the platform is decomposing unicode data for us. We will - * emulate core Git and prefer to use precomposed unicode data internally - * on these platforms, composing the decomposed unicode on the fly. - * - * This mainly happens on the Mac where HDFS stores filenames as - * decomposed unicode. Even on VFAT and SAMBA file systems, the Mac will - * return decomposed unicode from readdir() even when the actual - * filesystem is storing precomposed unicode. - */ -bool git_path_does_fs_decompose_unicode(const char *root) -{ - git_buf path = GIT_BUF_INIT; - int fd; - bool found_decomposed = false; - char tmp[6]; - - /* Create a file using a precomposed path and then try to find it - * using the decomposed name. If the lookup fails, then we will mark - * that we should precompose unicode for this repository. - */ - if (git_buf_joinpath(&path, root, nfc_file) < 0 || - (fd = p_mkstemp(path.ptr)) < 0) - goto done; - p_close(fd); - - /* record trailing digits generated by mkstemp */ - memcpy(tmp, path.ptr + path.size - sizeof(tmp), sizeof(tmp)); - - /* try to look up as NFD path */ - if (git_buf_joinpath(&path, root, nfd_file) < 0) - goto done; - memcpy(path.ptr + path.size - sizeof(tmp), tmp, sizeof(tmp)); - - found_decomposed = git_path_exists(path.ptr); - - /* remove temporary file (using original precomposed path) */ - if (git_buf_joinpath(&path, root, nfc_file) < 0) - goto done; - memcpy(path.ptr + path.size - sizeof(tmp), tmp, sizeof(tmp)); - - (void)p_unlink(path.ptr); - -done: - git_buf_free(&path); - return found_decomposed; -} - -#else - -bool git_path_does_fs_decompose_unicode(const char *root) -{ - GIT_UNUSED(root); - return false; -} - -#endif - -#if defined(__sun) || defined(__GNU__) -typedef char path_dirent_data[sizeof(struct dirent) + FILENAME_MAX + 1]; -#else -typedef struct dirent path_dirent_data; -#endif - -int git_path_direach( - git_buf *path, - uint32_t flags, - int (*fn)(void *, git_buf *), - void *arg) -{ - int error = 0; - ssize_t wd_len; - DIR *dir; - struct dirent *de; - -#ifdef GIT_USE_ICONV - git_path_iconv_t ic = GIT_PATH_ICONV_INIT; -#endif - - GIT_UNUSED(flags); - - if (git_path_to_dir(path) < 0) - return -1; - - wd_len = git_buf_len(path); - - if ((dir = opendir(path->ptr)) == NULL) { - giterr_set(GITERR_OS, "Failed to open directory '%s'", path->ptr); - if (errno == ENOENT) - return GIT_ENOTFOUND; - - return -1; - } - -#ifdef GIT_USE_ICONV - if ((flags & GIT_PATH_DIR_PRECOMPOSE_UNICODE) != 0) - (void)git_path_iconv_init_precompose(&ic); -#endif - - while ((de = readdir(dir)) != NULL) { - const char *de_path = de->d_name; - size_t de_len = strlen(de_path); - - if (git_path_is_dot_or_dotdot(de_path)) - continue; - -#ifdef GIT_USE_ICONV - if ((error = git_path_iconv(&ic, &de_path, &de_len)) < 0) - break; -#endif - - if ((error = git_buf_put(path, de_path, de_len)) < 0) - break; - - giterr_clear(); - error = fn(arg, path); - - git_buf_truncate(path, wd_len); /* restore path */ - - /* Only set our own error if the callback did not set one already */ - if (error != 0) { - if (!giterr_last()) - giterr_set_after_callback(error); - - break; - } - } - - closedir(dir); - -#ifdef GIT_USE_ICONV - git_path_iconv_clear(&ic); -#endif - - return error; -} - -#if defined(GIT_WIN32) && !defined(__MINGW32__) - -/* Using _FIND_FIRST_EX_LARGE_FETCH may increase performance in Windows 7 - * and better. - */ -#ifndef FIND_FIRST_EX_LARGE_FETCH -# define FIND_FIRST_EX_LARGE_FETCH 2 -#endif - -int git_path_diriter_init( - git_path_diriter *diriter, - const char *path, - unsigned int flags) -{ - git_win32_path path_filter; - git_buf hack = {0}; - - static int is_win7_or_later = -1; - if (is_win7_or_later < 0) - is_win7_or_later = git_has_win32_version(6, 1, 0); - - assert(diriter && path); - - memset(diriter, 0, sizeof(git_path_diriter)); - diriter->handle = INVALID_HANDLE_VALUE; - - if (git_buf_puts(&diriter->path_utf8, path) < 0) - return -1; - - git_path_trim_slashes(&diriter->path_utf8); - - if (diriter->path_utf8.size == 0) { - giterr_set(GITERR_FILESYSTEM, "Could not open directory '%s'", path); - return -1; - } - - if ((diriter->parent_len = git_win32_path_from_utf8(diriter->path, diriter->path_utf8.ptr)) < 0 || - !git_win32__findfirstfile_filter(path_filter, diriter->path_utf8.ptr)) { - giterr_set(GITERR_OS, "Could not parse the directory path '%s'", path); - return -1; - } - - diriter->handle = FindFirstFileExW( - path_filter, - is_win7_or_later ? FindExInfoBasic : FindExInfoStandard, - &diriter->current, - FindExSearchNameMatch, - NULL, - is_win7_or_later ? FIND_FIRST_EX_LARGE_FETCH : 0); - - if (diriter->handle == INVALID_HANDLE_VALUE) { - giterr_set(GITERR_OS, "Could not open directory '%s'", path); - return -1; - } - - diriter->parent_utf8_len = diriter->path_utf8.size; - diriter->flags = flags; - return 0; -} - -static int diriter_update_paths(git_path_diriter *diriter) -{ - size_t filename_len, path_len; - - filename_len = wcslen(diriter->current.cFileName); - - if (GIT_ADD_SIZET_OVERFLOW(&path_len, diriter->parent_len, filename_len) || - GIT_ADD_SIZET_OVERFLOW(&path_len, path_len, 2)) - return -1; - - if (path_len > GIT_WIN_PATH_UTF16) { - giterr_set(GITERR_FILESYSTEM, - "invalid path '%.*ls\\%ls' (path too long)", - diriter->parent_len, diriter->path, diriter->current.cFileName); - return -1; - } - - diriter->path[diriter->parent_len] = L'\\'; - memcpy(&diriter->path[diriter->parent_len+1], - diriter->current.cFileName, filename_len * sizeof(wchar_t)); - diriter->path[path_len-1] = L'\0'; - - git_buf_truncate(&diriter->path_utf8, diriter->parent_utf8_len); - - if (diriter->parent_utf8_len > 0 && - diriter->path_utf8.ptr[diriter->parent_utf8_len-1] != '/') - git_buf_putc(&diriter->path_utf8, '/'); - - git_buf_put_w(&diriter->path_utf8, diriter->current.cFileName, filename_len); - - if (git_buf_oom(&diriter->path_utf8)) - return -1; - - return 0; -} - -int git_path_diriter_next(git_path_diriter *diriter) -{ - bool skip_dot = !(diriter->flags & GIT_PATH_DIR_INCLUDE_DOT_AND_DOTDOT); - - do { - /* Our first time through, we already have the data from - * FindFirstFileW. Use it, otherwise get the next file. - */ - if (!diriter->needs_next) - diriter->needs_next = 1; - else if (!FindNextFileW(diriter->handle, &diriter->current)) - return GIT_ITEROVER; - } while (skip_dot && git_path_is_dot_or_dotdotW(diriter->current.cFileName)); - - if (diriter_update_paths(diriter) < 0) - return -1; - - return 0; -} - -int git_path_diriter_filename( - const char **out, - size_t *out_len, - git_path_diriter *diriter) -{ - assert(out && out_len && diriter); - - assert(diriter->path_utf8.size > diriter->parent_utf8_len); - - *out = &diriter->path_utf8.ptr[diriter->parent_utf8_len+1]; - *out_len = diriter->path_utf8.size - diriter->parent_utf8_len - 1; - return 0; -} - -int git_path_diriter_fullpath( - const char **out, - size_t *out_len, - git_path_diriter *diriter) -{ - assert(out && out_len && diriter); - - *out = diriter->path_utf8.ptr; - *out_len = diriter->path_utf8.size; - return 0; -} - -int git_path_diriter_stat(struct stat *out, git_path_diriter *diriter) -{ - assert(out && diriter); - - return git_win32__file_attribute_to_stat(out, - (WIN32_FILE_ATTRIBUTE_DATA *)&diriter->current, - diriter->path); -} - -void git_path_diriter_free(git_path_diriter *diriter) -{ - if (diriter == NULL) - return; - - git_buf_free(&diriter->path_utf8); - - if (diriter->handle != INVALID_HANDLE_VALUE) { - FindClose(diriter->handle); - diriter->handle = INVALID_HANDLE_VALUE; - } -} - -#else - -int git_path_diriter_init( - git_path_diriter *diriter, - const char *path, - unsigned int flags) -{ - assert(diriter && path); - - memset(diriter, 0, sizeof(git_path_diriter)); - - if (git_buf_puts(&diriter->path, path) < 0) - return -1; - - git_path_trim_slashes(&diriter->path); - - if (diriter->path.size == 0) { - giterr_set(GITERR_FILESYSTEM, "Could not open directory '%s'", path); - return -1; - } - - if ((diriter->dir = opendir(diriter->path.ptr)) == NULL) { - git_buf_free(&diriter->path); - - giterr_set(GITERR_OS, "Failed to open directory '%s'", path); - return -1; - } - -#ifdef GIT_USE_ICONV - if ((flags & GIT_PATH_DIR_PRECOMPOSE_UNICODE) != 0) - (void)git_path_iconv_init_precompose(&diriter->ic); -#endif - - diriter->parent_len = diriter->path.size; - diriter->flags = flags; - - return 0; -} - -int git_path_diriter_next(git_path_diriter *diriter) -{ - struct dirent *de; - const char *filename; - size_t filename_len; - bool skip_dot = !(diriter->flags & GIT_PATH_DIR_INCLUDE_DOT_AND_DOTDOT); - int error = 0; - - assert(diriter); - - errno = 0; - - do { - if ((de = readdir(diriter->dir)) == NULL) { - if (!errno) - return GIT_ITEROVER; - - giterr_set(GITERR_OS, - "Could not read directory '%s'", diriter->path); - return -1; - } - } while (skip_dot && git_path_is_dot_or_dotdot(de->d_name)); - - filename = de->d_name; - filename_len = strlen(filename); - -#ifdef GIT_USE_ICONV - if ((diriter->flags & GIT_PATH_DIR_PRECOMPOSE_UNICODE) != 0 && - (error = git_path_iconv(&diriter->ic, &filename, &filename_len)) < 0) - return error; -#endif - - git_buf_truncate(&diriter->path, diriter->parent_len); - - if (diriter->parent_len > 0 && - diriter->path.ptr[diriter->parent_len-1] != '/') - git_buf_putc(&diriter->path, '/'); - - git_buf_put(&diriter->path, filename, filename_len); - - if (git_buf_oom(&diriter->path)) - return -1; - - return error; -} - -int git_path_diriter_filename( - const char **out, - size_t *out_len, - git_path_diriter *diriter) -{ - assert(out && out_len && diriter); - - assert(diriter->path.size > diriter->parent_len); - - *out = &diriter->path.ptr[diriter->parent_len+1]; - *out_len = diriter->path.size - diriter->parent_len - 1; - return 0; -} - -int git_path_diriter_fullpath( - const char **out, - size_t *out_len, - git_path_diriter *diriter) -{ - assert(out && out_len && diriter); - - *out = diriter->path.ptr; - *out_len = diriter->path.size; - return 0; -} - -int git_path_diriter_stat(struct stat *out, git_path_diriter *diriter) -{ - assert(out && diriter); - - return git_path_lstat(diriter->path.ptr, out); -} - -void git_path_diriter_free(git_path_diriter *diriter) -{ - if (diriter == NULL) - return; - - if (diriter->dir) { - closedir(diriter->dir); - diriter->dir = NULL; - } - -#ifdef GIT_USE_ICONV - git_path_iconv_clear(&diriter->ic); -#endif - - git_buf_free(&diriter->path); -} - -#endif - -int git_path_dirload( - git_vector *contents, - const char *path, - size_t prefix_len, - uint32_t flags) -{ - git_path_diriter iter = GIT_PATH_DIRITER_INIT; - const char *name; - size_t name_len; - char *dup; - int error; - - assert(contents && path); - - if ((error = git_path_diriter_init(&iter, path, flags)) < 0) - return error; - - while ((error = git_path_diriter_next(&iter)) == 0) { - if ((error = git_path_diriter_fullpath(&name, &name_len, &iter)) < 0) - break; - - assert(name_len > prefix_len); - - dup = git__strndup(name + prefix_len, name_len - prefix_len); - GITERR_CHECK_ALLOC(dup); - - if ((error = git_vector_insert(contents, dup)) < 0) - break; - } - - if (error == GIT_ITEROVER) - error = 0; - - git_path_diriter_free(&iter); - return error; -} - -int git_path_from_url_or_path(git_buf *local_path_out, const char *url_or_path) -{ - if (git_path_is_local_file_url(url_or_path)) - return git_path_fromurl(local_path_out, url_or_path); - else - return git_buf_sets(local_path_out, url_or_path); -} - -/* Reject paths like AUX or COM1, or those versions that end in a dot or - * colon. ("AUX." or "AUX:") - */ -GIT_INLINE(bool) verify_dospath( - const char *component, - size_t len, - const char dospath[3], - bool trailing_num) -{ - size_t last = trailing_num ? 4 : 3; - - if (len < last || git__strncasecmp(component, dospath, 3) != 0) - return true; - - if (trailing_num && (component[3] < '1' || component[3] > '9')) - return true; - - return (len > last && - component[last] != '.' && - component[last] != ':'); -} - -static int32_t next_hfs_char(const char **in, size_t *len) -{ - while (*len) { - int32_t codepoint; - int cp_len = git__utf8_iterate((const uint8_t *)(*in), (int)(*len), &codepoint); - if (cp_len < 0) - return -1; - - (*in) += cp_len; - (*len) -= cp_len; - - /* these code points are ignored completely */ - switch (codepoint) { - case 0x200c: /* ZERO WIDTH NON-JOINER */ - case 0x200d: /* ZERO WIDTH JOINER */ - case 0x200e: /* LEFT-TO-RIGHT MARK */ - case 0x200f: /* RIGHT-TO-LEFT MARK */ - case 0x202a: /* LEFT-TO-RIGHT EMBEDDING */ - case 0x202b: /* RIGHT-TO-LEFT EMBEDDING */ - case 0x202c: /* POP DIRECTIONAL FORMATTING */ - case 0x202d: /* LEFT-TO-RIGHT OVERRIDE */ - case 0x202e: /* RIGHT-TO-LEFT OVERRIDE */ - case 0x206a: /* INHIBIT SYMMETRIC SWAPPING */ - case 0x206b: /* ACTIVATE SYMMETRIC SWAPPING */ - case 0x206c: /* INHIBIT ARABIC FORM SHAPING */ - case 0x206d: /* ACTIVATE ARABIC FORM SHAPING */ - case 0x206e: /* NATIONAL DIGIT SHAPES */ - case 0x206f: /* NOMINAL DIGIT SHAPES */ - case 0xfeff: /* ZERO WIDTH NO-BREAK SPACE */ - continue; - } - - /* fold into lowercase -- this will only fold characters in - * the ASCII range, which is perfectly fine, because the - * git folder name can only be composed of ascii characters - */ - return git__tolower(codepoint); - } - return 0; /* NULL byte -- end of string */ -} - -static bool verify_dotgit_hfs(const char *path, size_t len) -{ - if (next_hfs_char(&path, &len) != '.' || - next_hfs_char(&path, &len) != 'g' || - next_hfs_char(&path, &len) != 'i' || - next_hfs_char(&path, &len) != 't' || - next_hfs_char(&path, &len) != 0) - return true; - - return false; -} - -GIT_INLINE(bool) verify_dotgit_ntfs(git_repository *repo, const char *path, size_t len) -{ - git_buf *reserved = git_repository__reserved_names_win32; - size_t reserved_len = git_repository__reserved_names_win32_len; - size_t start = 0, i; - - if (repo) - git_repository__reserved_names(&reserved, &reserved_len, repo, true); - - for (i = 0; i < reserved_len; i++) { - git_buf *r = &reserved[i]; - - if (len >= r->size && - strncasecmp(path, r->ptr, r->size) == 0) { - start = r->size; - break; - } - } - - if (!start) - return true; - - /* Reject paths like ".git\" */ - if (path[start] == '\\') - return false; - - /* Reject paths like '.git ' or '.git.' */ - for (i = start; i < len; i++) { - if (path[i] != ' ' && path[i] != '.') - return true; - } - - return false; -} - -GIT_INLINE(bool) verify_char(unsigned char c, unsigned int flags) -{ - if ((flags & GIT_PATH_REJECT_BACKSLASH) && c == '\\') - return false; - - if ((flags & GIT_PATH_REJECT_SLASH) && c == '/') - return false; - - if (flags & GIT_PATH_REJECT_NT_CHARS) { - if (c < 32) - return false; - - switch (c) { - case '<': - case '>': - case ':': - case '"': - case '|': - case '?': - case '*': - return false; - } - } - - return true; -} - -/* - * We fundamentally don't like some paths when dealing with user-inputted - * strings (in checkout or ref names): we don't want dot or dot-dot - * anywhere, we want to avoid writing weird paths on Windows that can't - * be handled by tools that use the non-\\?\ APIs, we don't want slashes - * or double slashes at the end of paths that can make them ambiguous. - * - * For checkout, we don't want to recurse into ".git" either. - */ -static bool verify_component( - git_repository *repo, - const char *component, - size_t len, - unsigned int flags) -{ - if (len == 0) - return false; - - if ((flags & GIT_PATH_REJECT_TRAVERSAL) && - len == 1 && component[0] == '.') - return false; - - if ((flags & GIT_PATH_REJECT_TRAVERSAL) && - len == 2 && component[0] == '.' && component[1] == '.') - return false; - - if ((flags & GIT_PATH_REJECT_TRAILING_DOT) && component[len-1] == '.') - return false; - - if ((flags & GIT_PATH_REJECT_TRAILING_SPACE) && component[len-1] == ' ') - return false; - - if ((flags & GIT_PATH_REJECT_TRAILING_COLON) && component[len-1] == ':') - return false; - - if (flags & GIT_PATH_REJECT_DOS_PATHS) { - if (!verify_dospath(component, len, "CON", false) || - !verify_dospath(component, len, "PRN", false) || - !verify_dospath(component, len, "AUX", false) || - !verify_dospath(component, len, "NUL", false) || - !verify_dospath(component, len, "COM", true) || - !verify_dospath(component, len, "LPT", true)) - return false; - } - - if (flags & GIT_PATH_REJECT_DOT_GIT_HFS && - !verify_dotgit_hfs(component, len)) - return false; - - if (flags & GIT_PATH_REJECT_DOT_GIT_NTFS && - !verify_dotgit_ntfs(repo, component, len)) - return false; - - /* don't bother rerunning the `.git` test if we ran the HFS or NTFS - * specific tests, they would have already rejected `.git`. - */ - if ((flags & GIT_PATH_REJECT_DOT_GIT_HFS) == 0 && - (flags & GIT_PATH_REJECT_DOT_GIT_NTFS) == 0 && - (flags & GIT_PATH_REJECT_DOT_GIT_LITERAL) && - len == 4 && - component[0] == '.' && - (component[1] == 'g' || component[1] == 'G') && - (component[2] == 'i' || component[2] == 'I') && - (component[3] == 't' || component[3] == 'T')) - return false; - - return true; -} - -GIT_INLINE(unsigned int) dotgit_flags( - git_repository *repo, - unsigned int flags) -{ - int protectHFS = 0, protectNTFS = 0; - - flags |= GIT_PATH_REJECT_DOT_GIT_LITERAL; - -#ifdef __APPLE__ - protectHFS = 1; -#endif - -#ifdef GIT_WIN32 - protectNTFS = 1; -#endif - - if (repo && !protectHFS) - git_repository__cvar(&protectHFS, repo, GIT_CVAR_PROTECTHFS); - if (protectHFS) - flags |= GIT_PATH_REJECT_DOT_GIT_HFS; - - if (repo && !protectNTFS) - git_repository__cvar(&protectNTFS, repo, GIT_CVAR_PROTECTNTFS); - if (protectNTFS) - flags |= GIT_PATH_REJECT_DOT_GIT_NTFS; - - return flags; -} - -bool git_path_isvalid( - git_repository *repo, - const char *path, - unsigned int flags) -{ - const char *start, *c; - - /* Upgrade the ".git" checks based on platform */ - if ((flags & GIT_PATH_REJECT_DOT_GIT)) - flags = dotgit_flags(repo, flags); - - for (start = c = path; *c; c++) { - if (!verify_char(*c, flags)) - return false; - - if (*c == '/') { - if (!verify_component(repo, start, (c - start), flags)) - return false; - - start = c+1; - } - } - - return verify_component(repo, start, (c - start), flags); -} - -int git_path_normalize_slashes(git_buf *out, const char *path) -{ - int error; - char *p; - - if ((error = git_buf_puts(out, path)) < 0) - return error; - - for (p = out->ptr; *p; p++) { - if (*p == '\\') - *p = '/'; - } - - return 0; -} diff --git a/vendor/libgit2/src/path.h b/vendor/libgit2/src/path.h deleted file mode 100644 index 875c8cb7e..000000000 --- a/vendor/libgit2/src/path.h +++ /dev/null @@ -1,615 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_path_h__ -#define INCLUDE_path_h__ - -#include "common.h" -#include "posix.h" -#include "buffer.h" -#include "vector.h" - -/** - * Path manipulation utils - * - * These are path utilities that munge paths without actually - * looking at the real filesystem. - */ - -/* - * The dirname() function shall take a pointer to a character string - * that contains a pathname, and return a pointer to a string that is a - * pathname of the parent directory of that file. Trailing '/' characters - * in the path are not counted as part of the path. - * - * If path does not contain a '/', then dirname() shall return a pointer to - * the string ".". If path is a null pointer or points to an empty string, - * dirname() shall return a pointer to the string "." . - * - * The `git_path_dirname` implementation is thread safe. The returned - * string must be manually free'd. - * - * The `git_path_dirname_r` implementation writes the dirname to a `git_buf` - * if the buffer pointer is not NULL. - * It returns an error code < 0 if there is an allocation error, otherwise - * the length of the dirname (which will be > 0). - */ -extern char *git_path_dirname(const char *path); -extern int git_path_dirname_r(git_buf *buffer, const char *path); - -/* - * This function returns the basename of the file, which is the last - * part of its full name given by fname, with the drive letter and - * leading directories stripped off. For example, the basename of - * c:/foo/bar/file.ext is file.ext, and the basename of a:foo is foo. - * - * Trailing slashes and backslashes are significant: the basename of - * c:/foo/bar/ is an empty string after the rightmost slash. - * - * The `git_path_basename` implementation is thread safe. The returned - * string must be manually free'd. - * - * The `git_path_basename_r` implementation writes the basename to a `git_buf`. - * It returns an error code < 0 if there is an allocation error, otherwise - * the length of the basename (which will be >= 0). - */ -extern char *git_path_basename(const char *path); -extern int git_path_basename_r(git_buf *buffer, const char *path); - -/* Return the offset of the start of the basename. Unlike the other - * basename functions, this returns 0 if the path is empty. - */ -extern size_t git_path_basename_offset(git_buf *buffer); - -extern const char *git_path_topdir(const char *path); - -/** - * Find offset to root of path if path has one. - * - * This will return a number >= 0 which is the offset to the start of the - * path, if the path is rooted (i.e. "/rooted/path" returns 0 and - * "c:/windows/rooted/path" returns 2). If the path is not rooted, this - * returns -1. - */ -extern int git_path_root(const char *path); - -/** - * Ensure path has a trailing '/'. - */ -extern int git_path_to_dir(git_buf *path); - -/** - * Ensure string has a trailing '/' if there is space for it. - */ -extern void git_path_string_to_dir(char* path, size_t size); - -/** - * Taken from git.git; returns nonzero if the given path is "." or "..". - */ -GIT_INLINE(int) git_path_is_dot_or_dotdot(const char *name) -{ - return (name[0] == '.' && - (name[1] == '\0' || - (name[1] == '.' && name[2] == '\0'))); -} - -#ifdef GIT_WIN32 -GIT_INLINE(int) git_path_is_dot_or_dotdotW(const wchar_t *name) -{ - return (name[0] == L'.' && - (name[1] == L'\0' || - (name[1] == L'.' && name[2] == L'\0'))); -} - -/** - * Convert backslashes in path to forward slashes. - */ -GIT_INLINE(void) git_path_mkposix(char *path) -{ - while (*path) { - if (*path == '\\') - *path = '/'; - - path++; - } -} -#else -# define git_path_mkposix(p) /* blank */ -#endif - -/** - * Check if string is a relative path (i.e. starts with "./" or "../") - */ -GIT_INLINE(int) git_path_is_relative(const char *p) -{ - return (p[0] == '.' && (p[1] == '/' || (p[1] == '.' && p[2] == '/'))); -} - -/** - * Check if string is at end of path segment (i.e. looking at '/' or '\0') - */ -GIT_INLINE(int) git_path_at_end_of_segment(const char *p) -{ - return !*p || *p == '/'; -} - -extern int git__percent_decode(git_buf *decoded_out, const char *input); - -/** - * Extract path from file:// URL. - */ -extern int git_path_fromurl(git_buf *local_path_out, const char *file_url); - - -/** - * Path filesystem utils - * - * These are path utilities that actually access the filesystem. - */ - -/** - * Check if a file exists and can be accessed. - * @return true or false - */ -extern bool git_path_exists(const char *path); - -/** - * Check if the given path points to a directory. - * @return true or false - */ -extern bool git_path_isdir(const char *path); - -/** - * Check if the given path points to a regular file. - * @return true or false - */ -extern bool git_path_isfile(const char *path); - -/** - * Check if the given path points to a symbolic link. - * @return true or false - */ -extern bool git_path_islink(const char *path); - -/** - * Check if the given path is a directory, and is empty. - */ -extern bool git_path_is_empty_dir(const char *path); - -/** - * Stat a file and/or link and set error if needed. - */ -extern int git_path_lstat(const char *path, struct stat *st); - -/** - * Check if the parent directory contains the item. - * - * @param dir Directory to check. - * @param item Item that might be in the directory. - * @return 0 if item exists in directory, <0 otherwise. - */ -extern bool git_path_contains(git_buf *dir, const char *item); - -/** - * Check if the given path contains the given subdirectory. - * - * @param parent Directory path that might contain subdir - * @param subdir Subdirectory name to look for in parent - * @return true if subdirectory exists, false otherwise. - */ -extern bool git_path_contains_dir(git_buf *parent, const char *subdir); - -/** - * Make the path relative to the given parent path. - * - * @param path The path to make relative - * @param parent The parent path to make path relative to - * @return 0 if path was made relative, GIT_ENOTFOUND - * if there was not common root between the paths, - * or <0. - */ -extern int git_path_make_relative(git_buf *path, const char *parent); - -/** - * Check if the given path contains the given file. - * - * @param dir Directory path that might contain file - * @param file File name to look for in parent - * @return true if file exists, false otherwise. - */ -extern bool git_path_contains_file(git_buf *dir, const char *file); - -/** - * Prepend base to unrooted path or just copy path over. - * - * This will optionally return the index into the path where the "root" - * is, either the end of the base directory prefix or the path root. - */ -extern int git_path_join_unrooted( - git_buf *path_out, const char *path, const char *base, ssize_t *root_at); - -/** - * Clean up path, prepending base if it is not already rooted. - */ -extern int git_path_prettify(git_buf *path_out, const char *path, const char *base); - -/** - * Clean up path, prepending base if it is not already rooted and - * appending a slash. - */ -extern int git_path_prettify_dir(git_buf *path_out, const char *path, const char *base); - -/** - * Get a directory from a path. - * - * If path is a directory, this acts like `git_path_prettify_dir` - * (cleaning up path and appending a '/'). If path is a normal file, - * this prettifies it, then removed the filename a la dirname and - * appends the trailing '/'. If the path does not exist, it is - * treated like a regular filename. - */ -extern int git_path_find_dir(git_buf *dir, const char *path, const char *base); - -/** - * Resolve relative references within a path. - * - * This eliminates "./" and "../" relative references inside a path, - * as well as condensing multiple slashes into single ones. It will - * not touch the path before the "ceiling" length. - * - * Additionally, this will recognize an "c:/" drive prefix or a "xyz://" URL - * prefix and not touch that part of the path. - */ -extern int git_path_resolve_relative(git_buf *path, size_t ceiling); - -/** - * Apply a relative path to base path. - * - * Note that the base path could be a filename or a URL and this - * should still work. The relative path is walked segment by segment - * with three rules: series of slashes will be condensed to a single - * slash, "." will be eaten with no change, and ".." will remove a - * segment from the base path. - */ -extern int git_path_apply_relative(git_buf *target, const char *relpath); - -enum { - GIT_PATH_DIR_IGNORE_CASE = (1u << 0), - GIT_PATH_DIR_PRECOMPOSE_UNICODE = (1u << 1), - GIT_PATH_DIR_INCLUDE_DOT_AND_DOTDOT = (1u << 2), -}; - -/** - * Walk each directory entry, except '.' and '..', calling fn(state). - * - * @param pathbuf Buffer the function reads the initial directory - * path from, and updates with each successive entry's name. - * @param flags Combination of GIT_PATH_DIR flags. - * @param callback Callback for each entry. Passed the `payload` and each - * successive path inside the directory as a full path. This may - * safely append text to the pathbuf if needed. Return non-zero to - * cancel iteration (and return value will be propagated back). - * @param payload Passed to callback as first argument. - * @return 0 on success or error code from OS error or from callback - */ -extern int git_path_direach( - git_buf *pathbuf, - uint32_t flags, - int (*callback)(void *payload, git_buf *path), - void *payload); - -/** - * Sort function to order two paths - */ -extern int git_path_cmp( - const char *name1, size_t len1, int isdir1, - const char *name2, size_t len2, int isdir2, - int (*compare)(const char *, const char *, size_t)); - -/** - * Invoke callback up path directory by directory until the ceiling is - * reached (inclusive of a final call at the root_path). - * - * Returning anything other than 0 from the callback function - * will stop the iteration and propagate the error to the caller. - * - * @param pathbuf Buffer the function reads the directory from and - * and updates with each successive name. - * @param ceiling Prefix of path at which to stop walking up. If NULL, - * this will walk all the way up to the root. If not a prefix of - * pathbuf, the callback will be invoked a single time on the - * original input path. - * @param callback Function to invoke on each path. Passed the `payload` - * and the buffer containing the current path. The path should not - * be modified in any way. Return non-zero to stop iteration. - * @param payload Passed to fn as the first ath. - */ -extern int git_path_walk_up( - git_buf *pathbuf, - const char *ceiling, - int (*callback)(void *payload, const char *path), - void *payload); - - -enum { GIT_PATH_NOTEQUAL = 0, GIT_PATH_EQUAL = 1, GIT_PATH_PREFIX = 2 }; - -/* - * Determines if a path is equal to or potentially a child of another. - * @param parent The possible parent - * @param child The possible child - */ -GIT_INLINE(int) git_path_equal_or_prefixed( - const char *parent, - const char *child, - ssize_t *prefixlen) -{ - const char *p = parent, *c = child; - int lastslash = 0; - - while (*p && *c) { - lastslash = (*p == '/'); - - if (*p++ != *c++) - return GIT_PATH_NOTEQUAL; - } - - if (*p != '\0') - return GIT_PATH_NOTEQUAL; - - if (*c == '\0') { - if (prefixlen) - *prefixlen = p - parent; - - return GIT_PATH_EQUAL; - } - - if (*c == '/' || lastslash) { - if (prefixlen) - *prefixlen = (p - parent) - lastslash; - - return GIT_PATH_PREFIX; - } - - return GIT_PATH_NOTEQUAL; -} - -/* translate errno to libgit2 error code and set error message */ -extern int git_path_set_error( - int errno_value, const char *path, const char *action); - -/* check if non-ascii characters are present in filename */ -extern bool git_path_has_non_ascii(const char *path, size_t pathlen); - -#define GIT_PATH_REPO_ENCODING "UTF-8" - -#ifdef __APPLE__ -#define GIT_PATH_NATIVE_ENCODING "UTF-8-MAC" -#else -#define GIT_PATH_NATIVE_ENCODING "UTF-8" -#endif - -#ifdef GIT_USE_ICONV - -#include - -typedef struct { - iconv_t map; - git_buf buf; -} git_path_iconv_t; - -#define GIT_PATH_ICONV_INIT { (iconv_t)-1, GIT_BUF_INIT } - -/* Init iconv data for converting decomposed UTF-8 to precomposed */ -extern int git_path_iconv_init_precompose(git_path_iconv_t *ic); - -/* Clear allocated iconv data */ -extern void git_path_iconv_clear(git_path_iconv_t *ic); - -/* - * Rewrite `in` buffer using iconv map if necessary, replacing `in` - * pointer internal iconv buffer if rewrite happened. The `in` pointer - * will be left unchanged if no rewrite was needed. - */ -extern int git_path_iconv(git_path_iconv_t *ic, const char **in, size_t *inlen); - -#endif /* GIT_USE_ICONV */ - -extern bool git_path_does_fs_decompose_unicode(const char *root); - - -typedef struct git_path_diriter git_path_diriter; - -#if defined(GIT_WIN32) && !defined(__MINGW32__) - -struct git_path_diriter -{ - git_win32_path path; - size_t parent_len; - - git_buf path_utf8; - size_t parent_utf8_len; - - HANDLE handle; - - unsigned int flags; - - WIN32_FIND_DATAW current; - unsigned int needs_next; -}; - -#define GIT_PATH_DIRITER_INIT { {0}, 0, GIT_BUF_INIT, 0, INVALID_HANDLE_VALUE } - -#else - -struct git_path_diriter -{ - git_buf path; - size_t parent_len; - - unsigned int flags; - - DIR *dir; - -#ifdef GIT_USE_ICONV - git_path_iconv_t ic; -#endif -}; - -#define GIT_PATH_DIRITER_INIT { GIT_BUF_INIT } - -#endif - -/** - * Initialize a directory iterator. - * - * @param diriter Pointer to a diriter structure that will be setup. - * @param path The path that will be iterated over - * @param flags Directory reader flags - * @return 0 or an error code - */ -extern int git_path_diriter_init( - git_path_diriter *diriter, - const char *path, - unsigned int flags); - -/** - * Advance the directory iterator. Will return GIT_ITEROVER when - * the iteration has completed successfully. - * - * @param diriter The directory iterator - * @return 0, GIT_ITEROVER, or an error code - */ -extern int git_path_diriter_next(git_path_diriter *diriter); - -/** - * Returns the file name of the current item in the iterator. - * - * @param out Pointer to store the path in - * @param out_len Pointer to store the length of the path in - * @param diriter The directory iterator - * @return 0 or an error code - */ -extern int git_path_diriter_filename( - const char **out, - size_t *out_len, - git_path_diriter *diriter); - -/** - * Returns the full path of the current item in the iterator; that - * is the current filename plus the path of the directory that the - * iterator was constructed with. - * - * @param out Pointer to store the path in - * @param out_len Pointer to store the length of the path in - * @param diriter The directory iterator - * @return 0 or an error code - */ -extern int git_path_diriter_fullpath( - const char **out, - size_t *out_len, - git_path_diriter *diriter); - -/** - * Performs an `lstat` on the current item in the iterator. - * - * @param out Pointer to store the stat data in - * @param diriter The directory iterator - * @return 0 or an error code - */ -extern int git_path_diriter_stat(struct stat *out, git_path_diriter *diriter); - -/** - * Closes the directory iterator. - * - * @param diriter The directory iterator - */ -extern void git_path_diriter_free(git_path_diriter *diriter); - -/** - * Load all directory entries (except '.' and '..') into a vector. - * - * For cases where `git_path_direach()` is not appropriate, this - * allows you to load the filenames in a directory into a vector - * of strings. That vector can then be sorted, iterated, or whatever. - * Remember to free alloc of the allocated strings when you are done. - * - * @param contents Vector to fill with directory entry names. - * @param path The directory to read from. - * @param prefix_len When inserting entries, the trailing part of path - * will be prefixed after this length. I.e. given path "/a/b" and - * prefix_len 3, the entries will look like "b/e1", "b/e2", etc. - * @param flags Combination of GIT_PATH_DIR flags. - */ -extern int git_path_dirload( - git_vector *contents, - const char *path, - size_t prefix_len, - uint32_t flags); - - -/* Used for paths to repositories on the filesystem */ -extern bool git_path_is_local_file_url(const char *file_url); -extern int git_path_from_url_or_path(git_buf *local_path_out, const char *url_or_path); - -/* Flags to determine path validity in `git_path_isvalid` */ -#define GIT_PATH_REJECT_TRAVERSAL (1 << 0) -#define GIT_PATH_REJECT_DOT_GIT (1 << 1) -#define GIT_PATH_REJECT_SLASH (1 << 2) -#define GIT_PATH_REJECT_BACKSLASH (1 << 3) -#define GIT_PATH_REJECT_TRAILING_DOT (1 << 4) -#define GIT_PATH_REJECT_TRAILING_SPACE (1 << 5) -#define GIT_PATH_REJECT_TRAILING_COLON (1 << 6) -#define GIT_PATH_REJECT_DOS_PATHS (1 << 7) -#define GIT_PATH_REJECT_NT_CHARS (1 << 8) -#define GIT_PATH_REJECT_DOT_GIT_LITERAL (1 << 9) -#define GIT_PATH_REJECT_DOT_GIT_HFS (1 << 10) -#define GIT_PATH_REJECT_DOT_GIT_NTFS (1 << 11) - -/* Default path safety for writing files to disk: since we use the - * Win32 "File Namespace" APIs ("\\?\") we need to protect from - * paths that the normal Win32 APIs would not write. - */ -#ifdef GIT_WIN32 -# define GIT_PATH_REJECT_FILESYSTEM_DEFAULTS \ - GIT_PATH_REJECT_TRAVERSAL | \ - GIT_PATH_REJECT_BACKSLASH | \ - GIT_PATH_REJECT_TRAILING_DOT | \ - GIT_PATH_REJECT_TRAILING_SPACE | \ - GIT_PATH_REJECT_TRAILING_COLON | \ - GIT_PATH_REJECT_DOS_PATHS | \ - GIT_PATH_REJECT_NT_CHARS -#else -# define GIT_PATH_REJECT_FILESYSTEM_DEFAULTS \ - GIT_PATH_REJECT_TRAVERSAL -#endif - - /* Paths that should never be written into the working directory. */ -#define GIT_PATH_REJECT_WORKDIR_DEFAULTS \ - GIT_PATH_REJECT_FILESYSTEM_DEFAULTS | GIT_PATH_REJECT_DOT_GIT - -/* Paths that should never be written to the index. */ -#define GIT_PATH_REJECT_INDEX_DEFAULTS \ - GIT_PATH_REJECT_TRAVERSAL | GIT_PATH_REJECT_DOT_GIT - -/* - * Determine whether a path is a valid git path or not - this must not contain - * a '.' or '..' component, or a component that is ".git" (in any case). - * - * `repo` is optional. If specified, it will be used to determine the short - * path name to reject (if `GIT_PATH_REJECT_DOS_SHORTNAME` is specified), - * in addition to the default of "git~1". - */ -extern bool git_path_isvalid( - git_repository *repo, - const char *path, - unsigned int flags); - -/** - * Convert any backslashes into slashes - */ -int git_path_normalize_slashes(git_buf *out, const char *path); - -#endif diff --git a/vendor/libgit2/src/pathspec.c b/vendor/libgit2/src/pathspec.c deleted file mode 100644 index 8a93cdd50..000000000 --- a/vendor/libgit2/src/pathspec.c +++ /dev/null @@ -1,720 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "git2/pathspec.h" -#include "git2/diff.h" -#include "pathspec.h" -#include "buf_text.h" -#include "attr_file.h" -#include "iterator.h" -#include "repository.h" -#include "index.h" -#include "bitvec.h" -#include "diff.h" - -/* what is the common non-wildcard prefix for all items in the pathspec */ -char *git_pathspec_prefix(const git_strarray *pathspec) -{ - git_buf prefix = GIT_BUF_INIT; - const char *scan; - - if (!pathspec || !pathspec->count || - git_buf_text_common_prefix(&prefix, pathspec) < 0) - return NULL; - - /* diff prefix will only be leading non-wildcards */ - for (scan = prefix.ptr; *scan; ++scan) { - if (git__iswildcard(*scan) && - (scan == prefix.ptr || (*(scan - 1) != '\\'))) - break; - } - git_buf_truncate(&prefix, scan - prefix.ptr); - - if (prefix.size <= 0) { - git_buf_free(&prefix); - return NULL; - } - - git_buf_text_unescape(&prefix); - - return git_buf_detach(&prefix); -} - -/* is there anything in the spec that needs to be filtered on */ -bool git_pathspec_is_empty(const git_strarray *pathspec) -{ - size_t i; - - if (pathspec == NULL) - return true; - - for (i = 0; i < pathspec->count; ++i) { - const char *str = pathspec->strings[i]; - - if (str && str[0]) - return false; - } - - return true; -} - -/* build a vector of fnmatch patterns to evaluate efficiently */ -int git_pathspec__vinit( - git_vector *vspec, const git_strarray *strspec, git_pool *strpool) -{ - size_t i; - - memset(vspec, 0, sizeof(*vspec)); - - if (git_pathspec_is_empty(strspec)) - return 0; - - if (git_vector_init(vspec, strspec->count, NULL) < 0) - return -1; - - for (i = 0; i < strspec->count; ++i) { - int ret; - const char *pattern = strspec->strings[i]; - git_attr_fnmatch *match = git__calloc(1, sizeof(git_attr_fnmatch)); - if (!match) - return -1; - - match->flags = GIT_ATTR_FNMATCH_ALLOWSPACE | - GIT_ATTR_FNMATCH_ALLOWNEG | GIT_ATTR_FNMATCH_NOLEADINGDIR; - - ret = git_attr_fnmatch__parse(match, strpool, NULL, &pattern); - if (ret == GIT_ENOTFOUND) { - git__free(match); - continue; - } else if (ret < 0) { - git__free(match); - return ret; - } - - if (git_vector_insert(vspec, match) < 0) - return -1; - } - - return 0; -} - -/* free data from the pathspec vector */ -void git_pathspec__vfree(git_vector *vspec) -{ - git_vector_free_deep(vspec); -} - -struct pathspec_match_context { - int fnmatch_flags; - int (*strcomp)(const char *, const char *); - int (*strncomp)(const char *, const char *, size_t); -}; - -static void pathspec_match_context_init( - struct pathspec_match_context *ctxt, - bool disable_fnmatch, - bool casefold) -{ - if (disable_fnmatch) - ctxt->fnmatch_flags = -1; - else if (casefold) - ctxt->fnmatch_flags = FNM_CASEFOLD; - else - ctxt->fnmatch_flags = 0; - - if (casefold) { - ctxt->strcomp = git__strcasecmp; - ctxt->strncomp = git__strncasecmp; - } else { - ctxt->strcomp = git__strcmp; - ctxt->strncomp = git__strncmp; - } -} - -static int pathspec_match_one( - const git_attr_fnmatch *match, - struct pathspec_match_context *ctxt, - const char *path) -{ - int result = (match->flags & GIT_ATTR_FNMATCH_MATCH_ALL) ? 0 : FNM_NOMATCH; - - if (result == FNM_NOMATCH) - result = ctxt->strcomp(match->pattern, path) ? FNM_NOMATCH : 0; - - if (ctxt->fnmatch_flags >= 0 && result == FNM_NOMATCH) - result = p_fnmatch(match->pattern, path, ctxt->fnmatch_flags); - - /* if we didn't match, look for exact dirname prefix match */ - if (result == FNM_NOMATCH && - (match->flags & GIT_ATTR_FNMATCH_HASWILD) == 0 && - ctxt->strncomp(path, match->pattern, match->length) == 0 && - path[match->length] == '/') - result = 0; - - /* if we didn't match and this is a negative match, check for exact - * match of filename with leading '!' - */ - if (result == FNM_NOMATCH && - (match->flags & GIT_ATTR_FNMATCH_NEGATIVE) != 0 && - *path == '!' && - ctxt->strncomp(path + 1, match->pattern, match->length) == 0 && - (!path[match->length + 1] || path[match->length + 1] == '/')) - return 1; - - if (result == 0) - return (match->flags & GIT_ATTR_FNMATCH_NEGATIVE) ? 0 : 1; - return -1; -} - -static int git_pathspec__match_at( - size_t *matched_at, - const git_vector *vspec, - struct pathspec_match_context *ctxt, - const char *path0, - const char *path1) -{ - int result = GIT_ENOTFOUND; - size_t i = 0; - const git_attr_fnmatch *match; - - git_vector_foreach(vspec, i, match) { - if (path0 && (result = pathspec_match_one(match, ctxt, path0)) >= 0) - break; - if (path1 && (result = pathspec_match_one(match, ctxt, path1)) >= 0) - break; - } - - *matched_at = i; - return result; -} - -/* match a path against the vectorized pathspec */ -bool git_pathspec__match( - const git_vector *vspec, - const char *path, - bool disable_fnmatch, - bool casefold, - const char **matched_pathspec, - size_t *matched_at) -{ - int result; - size_t pos; - struct pathspec_match_context ctxt; - - if (matched_pathspec) - *matched_pathspec = NULL; - if (matched_at) - *matched_at = GIT_PATHSPEC_NOMATCH; - - if (!vspec || !vspec->length) - return true; - - pathspec_match_context_init(&ctxt, disable_fnmatch, casefold); - - result = git_pathspec__match_at(&pos, vspec, &ctxt, path, NULL); - if (result >= 0) { - if (matched_pathspec) { - const git_attr_fnmatch *match = git_vector_get(vspec, pos); - *matched_pathspec = match->pattern; - } - - if (matched_at) - *matched_at = pos; - } - - return (result > 0); -} - - -int git_pathspec__init(git_pathspec *ps, const git_strarray *paths) -{ - int error = 0; - - memset(ps, 0, sizeof(*ps)); - - ps->prefix = git_pathspec_prefix(paths); - git_pool_init(&ps->pool, 1); - - if ((error = git_pathspec__vinit(&ps->pathspec, paths, &ps->pool)) < 0) - git_pathspec__clear(ps); - - return error; -} - -void git_pathspec__clear(git_pathspec *ps) -{ - git__free(ps->prefix); - git_pathspec__vfree(&ps->pathspec); - git_pool_clear(&ps->pool); - memset(ps, 0, sizeof(*ps)); -} - -int git_pathspec_new(git_pathspec **out, const git_strarray *pathspec) -{ - int error = 0; - git_pathspec *ps = git__malloc(sizeof(git_pathspec)); - GITERR_CHECK_ALLOC(ps); - - if ((error = git_pathspec__init(ps, pathspec)) < 0) { - git__free(ps); - return error; - } - - GIT_REFCOUNT_INC(ps); - *out = ps; - return 0; -} - -static void pathspec_free(git_pathspec *ps) -{ - git_pathspec__clear(ps); - git__free(ps); -} - -void git_pathspec_free(git_pathspec *ps) -{ - if (!ps) - return; - GIT_REFCOUNT_DEC(ps, pathspec_free); -} - -int git_pathspec_matches_path( - const git_pathspec *ps, uint32_t flags, const char *path) -{ - bool no_fnmatch = (flags & GIT_PATHSPEC_NO_GLOB) != 0; - bool casefold = (flags & GIT_PATHSPEC_IGNORE_CASE) != 0; - - assert(ps && path); - - return (0 != git_pathspec__match( - &ps->pathspec, path, no_fnmatch, casefold, NULL, NULL)); -} - -static void pathspec_match_free(git_pathspec_match_list *m) -{ - if (!m) - return; - - git_pathspec_free(m->pathspec); - m->pathspec = NULL; - - git_array_clear(m->matches); - git_array_clear(m->failures); - git_pool_clear(&m->pool); - git__free(m); -} - -static git_pathspec_match_list *pathspec_match_alloc( - git_pathspec *ps, int datatype) -{ - git_pathspec_match_list *m = git__calloc(1, sizeof(git_pathspec_match_list)); - if (!m) - return NULL; - - git_pool_init(&m->pool, 1); - - /* need to keep reference to pathspec and increment refcount because - * failures array stores pointers to the pattern strings of the - * pathspec that had no matches - */ - GIT_REFCOUNT_INC(ps); - m->pathspec = ps; - m->datatype = datatype; - - return m; -} - -GIT_INLINE(size_t) pathspec_mark_pattern(git_bitvec *used, size_t pos) -{ - if (!git_bitvec_get(used, pos)) { - git_bitvec_set(used, pos, true); - return 1; - } - - return 0; -} - -static size_t pathspec_mark_remaining( - git_bitvec *used, - git_vector *patterns, - struct pathspec_match_context *ctxt, - size_t start, - const char *path0, - const char *path1) -{ - size_t count = 0; - - if (path1 == path0) - path1 = NULL; - - for (; start < patterns->length; ++start) { - const git_attr_fnmatch *pat = git_vector_get(patterns, start); - - if (git_bitvec_get(used, start)) - continue; - - if (path0 && pathspec_match_one(pat, ctxt, path0) > 0) - count += pathspec_mark_pattern(used, start); - else if (path1 && pathspec_match_one(pat, ctxt, path1) > 0) - count += pathspec_mark_pattern(used, start); - } - - return count; -} - -static int pathspec_build_failure_array( - git_pathspec_string_array_t *failures, - git_vector *patterns, - git_bitvec *used, - git_pool *pool) -{ - size_t pos; - char **failed; - const git_attr_fnmatch *pat; - - for (pos = 0; pos < patterns->length; ++pos) { - if (git_bitvec_get(used, pos)) - continue; - - if ((failed = git_array_alloc(*failures)) == NULL) - return -1; - - pat = git_vector_get(patterns, pos); - - if ((*failed = git_pool_strdup(pool, pat->pattern)) == NULL) - return -1; - } - - return 0; -} - -static int pathspec_match_from_iterator( - git_pathspec_match_list **out, - git_iterator *iter, - uint32_t flags, - git_pathspec *ps) -{ - int error = 0; - git_pathspec_match_list *m = NULL; - const git_index_entry *entry = NULL; - struct pathspec_match_context ctxt; - git_vector *patterns = &ps->pathspec; - bool find_failures = out && (flags & GIT_PATHSPEC_FIND_FAILURES) != 0; - bool failures_only = !out || (flags & GIT_PATHSPEC_FAILURES_ONLY) != 0; - size_t pos, used_ct = 0, found_files = 0; - git_index *index = NULL; - git_bitvec used_patterns; - char **file; - - if (git_bitvec_init(&used_patterns, patterns->length) < 0) - return -1; - - if (out) { - *out = m = pathspec_match_alloc(ps, PATHSPEC_DATATYPE_STRINGS); - GITERR_CHECK_ALLOC(m); - } - - if ((error = git_iterator_reset(iter, ps->prefix, ps->prefix)) < 0) - goto done; - - if (git_iterator_type(iter) == GIT_ITERATOR_TYPE_WORKDIR && - (error = git_repository_index__weakptr( - &index, git_iterator_owner(iter))) < 0) - goto done; - - pathspec_match_context_init( - &ctxt, (flags & GIT_PATHSPEC_NO_GLOB) != 0, - git_iterator_ignore_case(iter)); - - while (!(error = git_iterator_advance(&entry, iter))) { - /* search for match with entry->path */ - int result = git_pathspec__match_at( - &pos, patterns, &ctxt, entry->path, NULL); - - /* no matches for this path */ - if (result < 0) - continue; - - /* if result was a negative pattern match, then don't list file */ - if (!result) { - used_ct += pathspec_mark_pattern(&used_patterns, pos); - continue; - } - - /* check if path is ignored and untracked */ - if (index != NULL && - git_iterator_current_is_ignored(iter) && - git_index__find_pos(NULL, index, entry->path, 0, GIT_INDEX_STAGE_ANY) < 0) - continue; - - /* mark the matched pattern as used */ - used_ct += pathspec_mark_pattern(&used_patterns, pos); - ++found_files; - - /* if find_failures is on, check if any later patterns also match */ - if (find_failures && used_ct < patterns->length) - used_ct += pathspec_mark_remaining( - &used_patterns, patterns, &ctxt, pos + 1, entry->path, NULL); - - /* if only looking at failures, exit early or just continue */ - if (failures_only || !out) { - if (used_ct == patterns->length) - break; - continue; - } - - /* insert matched path into matches array */ - if ((file = (char **)git_array_alloc(m->matches)) == NULL || - (*file = git_pool_strdup(&m->pool, entry->path)) == NULL) { - error = -1; - goto done; - } - } - - if (error < 0 && error != GIT_ITEROVER) - goto done; - error = 0; - - /* insert patterns that had no matches into failures array */ - if (find_failures && used_ct < patterns->length && - (error = pathspec_build_failure_array( - &m->failures, patterns, &used_patterns, &m->pool)) < 0) - goto done; - - /* if every pattern failed to match, then we have failed */ - if ((flags & GIT_PATHSPEC_NO_MATCH_ERROR) != 0 && !found_files) { - giterr_set(GITERR_INVALID, "No matching files were found"); - error = GIT_ENOTFOUND; - } - -done: - git_bitvec_free(&used_patterns); - - if (error < 0) { - pathspec_match_free(m); - if (out) *out = NULL; - } - - return error; -} - -static git_iterator_flag_t pathspec_match_iter_flags(uint32_t flags) -{ - git_iterator_flag_t f = 0; - - if ((flags & GIT_PATHSPEC_IGNORE_CASE) != 0) - f |= GIT_ITERATOR_IGNORE_CASE; - else if ((flags & GIT_PATHSPEC_USE_CASE) != 0) - f |= GIT_ITERATOR_DONT_IGNORE_CASE; - - return f; -} - -int git_pathspec_match_workdir( - git_pathspec_match_list **out, - git_repository *repo, - uint32_t flags, - git_pathspec *ps) -{ - git_iterator *iter; - git_iterator_options iter_opts = GIT_ITERATOR_OPTIONS_INIT; - int error = 0; - - assert(repo); - - iter_opts.flags = pathspec_match_iter_flags(flags); - - if (!(error = git_iterator_for_workdir(&iter, repo, NULL, NULL, &iter_opts))) { - error = pathspec_match_from_iterator(out, iter, flags, ps); - git_iterator_free(iter); - } - - return error; -} - -int git_pathspec_match_index( - git_pathspec_match_list **out, - git_index *index, - uint32_t flags, - git_pathspec *ps) -{ - git_iterator *iter; - git_iterator_options iter_opts = GIT_ITERATOR_OPTIONS_INIT; - int error = 0; - - assert(index); - - iter_opts.flags = pathspec_match_iter_flags(flags); - - if (!(error = git_iterator_for_index(&iter, git_index_owner(index), index, &iter_opts))) { - error = pathspec_match_from_iterator(out, iter, flags, ps); - git_iterator_free(iter); - } - - return error; -} - -int git_pathspec_match_tree( - git_pathspec_match_list **out, - git_tree *tree, - uint32_t flags, - git_pathspec *ps) -{ - git_iterator *iter; - git_iterator_options iter_opts = GIT_ITERATOR_OPTIONS_INIT; - int error = 0; - - assert(tree); - - iter_opts.flags = pathspec_match_iter_flags(flags); - - if (!(error = git_iterator_for_tree(&iter, tree, &iter_opts))) { - error = pathspec_match_from_iterator(out, iter, flags, ps); - git_iterator_free(iter); - } - - return error; -} - -int git_pathspec_match_diff( - git_pathspec_match_list **out, - git_diff *diff, - uint32_t flags, - git_pathspec *ps) -{ - int error = 0; - git_pathspec_match_list *m = NULL; - struct pathspec_match_context ctxt; - git_vector *patterns = &ps->pathspec; - bool find_failures = out && (flags & GIT_PATHSPEC_FIND_FAILURES) != 0; - bool failures_only = !out || (flags & GIT_PATHSPEC_FAILURES_ONLY) != 0; - size_t i, pos, used_ct = 0, found_deltas = 0; - const git_diff_delta *delta, **match; - git_bitvec used_patterns; - - assert(diff); - - if (git_bitvec_init(&used_patterns, patterns->length) < 0) - return -1; - - if (out) { - *out = m = pathspec_match_alloc(ps, PATHSPEC_DATATYPE_DIFF); - GITERR_CHECK_ALLOC(m); - } - - pathspec_match_context_init( - &ctxt, (flags & GIT_PATHSPEC_NO_GLOB) != 0, - git_diff_is_sorted_icase(diff)); - - git_vector_foreach(&diff->deltas, i, delta) { - /* search for match with delta */ - int result = git_pathspec__match_at( - &pos, patterns, &ctxt, delta->old_file.path, delta->new_file.path); - - /* no matches for this path */ - if (result < 0) - continue; - - /* mark the matched pattern as used */ - used_ct += pathspec_mark_pattern(&used_patterns, pos); - - /* if result was a negative pattern match, then don't list file */ - if (!result) - continue; - - ++found_deltas; - - /* if find_failures is on, check if any later patterns also match */ - if (find_failures && used_ct < patterns->length) - used_ct += pathspec_mark_remaining( - &used_patterns, patterns, &ctxt, pos + 1, - delta->old_file.path, delta->new_file.path); - - /* if only looking at failures, exit early or just continue */ - if (failures_only || !out) { - if (used_ct == patterns->length) - break; - continue; - } - - /* insert matched delta into matches array */ - if (!(match = (const git_diff_delta **)git_array_alloc(m->matches))) { - error = -1; - goto done; - } else { - *match = delta; - } - } - - /* insert patterns that had no matches into failures array */ - if (find_failures && used_ct < patterns->length && - (error = pathspec_build_failure_array( - &m->failures, patterns, &used_patterns, &m->pool)) < 0) - goto done; - - /* if every pattern failed to match, then we have failed */ - if ((flags & GIT_PATHSPEC_NO_MATCH_ERROR) != 0 && !found_deltas) { - giterr_set(GITERR_INVALID, "No matching deltas were found"); - error = GIT_ENOTFOUND; - } - -done: - git_bitvec_free(&used_patterns); - - if (error < 0) { - pathspec_match_free(m); - if (out) *out = NULL; - } - - return error; -} - -void git_pathspec_match_list_free(git_pathspec_match_list *m) -{ - if (m) - pathspec_match_free(m); -} - -size_t git_pathspec_match_list_entrycount( - const git_pathspec_match_list *m) -{ - return m ? git_array_size(m->matches) : 0; -} - -const char *git_pathspec_match_list_entry( - const git_pathspec_match_list *m, size_t pos) -{ - if (!m || m->datatype != PATHSPEC_DATATYPE_STRINGS || - !git_array_valid_index(m->matches, pos)) - return NULL; - - return *((const char **)git_array_get(m->matches, pos)); -} - -const git_diff_delta *git_pathspec_match_list_diff_entry( - const git_pathspec_match_list *m, size_t pos) -{ - if (!m || m->datatype != PATHSPEC_DATATYPE_DIFF || - !git_array_valid_index(m->matches, pos)) - return NULL; - - return *((const git_diff_delta **)git_array_get(m->matches, pos)); -} - -size_t git_pathspec_match_list_failed_entrycount( - const git_pathspec_match_list *m) -{ - return m ? git_array_size(m->failures) : 0; -} - -const char * git_pathspec_match_list_failed_entry( - const git_pathspec_match_list *m, size_t pos) -{ - char **entry = m ? git_array_get(m->failures, pos) : NULL; - - return entry ? *entry : NULL; -} diff --git a/vendor/libgit2/src/pathspec.h b/vendor/libgit2/src/pathspec.h deleted file mode 100644 index 40cd21c3f..000000000 --- a/vendor/libgit2/src/pathspec.h +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_pathspec_h__ -#define INCLUDE_pathspec_h__ - -#include "common.h" -#include -#include "buffer.h" -#include "vector.h" -#include "pool.h" -#include "array.h" - -/* public compiled pathspec */ -struct git_pathspec { - git_refcount rc; - char *prefix; - git_vector pathspec; - git_pool pool; -}; - -enum { - PATHSPEC_DATATYPE_STRINGS = 0, - PATHSPEC_DATATYPE_DIFF = 1, -}; - -typedef git_array_t(char *) git_pathspec_string_array_t; - -/* public interface to pathspec matching */ -struct git_pathspec_match_list { - git_pathspec *pathspec; - git_array_t(void *) matches; - git_pathspec_string_array_t failures; - git_pool pool; - int datatype; -}; - -/* what is the common non-wildcard prefix for all items in the pathspec */ -extern char *git_pathspec_prefix(const git_strarray *pathspec); - -/* is there anything in the spec that needs to be filtered on */ -extern bool git_pathspec_is_empty(const git_strarray *pathspec); - -/* build a vector of fnmatch patterns to evaluate efficiently */ -extern int git_pathspec__vinit( - git_vector *vspec, const git_strarray *strspec, git_pool *strpool); - -/* free data from the pathspec vector */ -extern void git_pathspec__vfree(git_vector *vspec); - -#define GIT_PATHSPEC_NOMATCH ((size_t)-1) - -/* - * Match a path against the vectorized pathspec. - * The matched pathspec is passed back into the `matched_pathspec` parameter, - * unless it is passed as NULL by the caller. - */ -extern bool git_pathspec__match( - const git_vector *vspec, - const char *path, - bool disable_fnmatch, - bool casefold, - const char **matched_pathspec, - size_t *matched_at); - -/* easy pathspec setup */ - -extern int git_pathspec__init(git_pathspec *ps, const git_strarray *paths); - -extern void git_pathspec__clear(git_pathspec *ps); - -#endif diff --git a/vendor/libgit2/src/pool.c b/vendor/libgit2/src/pool.c deleted file mode 100644 index b4fc50fca..000000000 --- a/vendor/libgit2/src/pool.c +++ /dev/null @@ -1,236 +0,0 @@ -#include "pool.h" -#include "posix.h" -#ifndef GIT_WIN32 -#include -#endif - -struct git_pool_page { - git_pool_page *next; - uint32_t size; - uint32_t avail; - GIT_ALIGN(char data[GIT_FLEX_ARRAY], 8); -}; - -static void *pool_alloc_page(git_pool *pool, uint32_t size); - -uint32_t git_pool__system_page_size(void) -{ - static uint32_t size = 0; - - if (!size) { - size_t page_size; - if (git__page_size(&page_size) < 0) - page_size = 4096; - /* allow space for malloc overhead */ - size = page_size - (2 * sizeof(void *)) - sizeof(git_pool_page); - } - - return size; -} - -#ifndef GIT_DEBUG_POOL -void git_pool_init(git_pool *pool, uint32_t item_size) -{ - assert(pool); - assert(item_size >= 1); - - memset(pool, 0, sizeof(git_pool)); - pool->item_size = item_size; - pool->page_size = git_pool__system_page_size(); -} - -void git_pool_clear(git_pool *pool) -{ - git_pool_page *scan, *next; - - for (scan = pool->pages; scan != NULL; scan = next) { - next = scan->next; - git__free(scan); - } - - pool->pages = NULL; -} - -static void *pool_alloc_page(git_pool *pool, uint32_t size) -{ - git_pool_page *page; - const uint32_t new_page_size = (size <= pool->page_size) ? pool->page_size : size; - size_t alloc_size; - - if (GIT_ADD_SIZET_OVERFLOW(&alloc_size, new_page_size, sizeof(git_pool_page)) || - !(page = git__malloc(alloc_size))) - return NULL; - - page->size = new_page_size; - page->avail = new_page_size - size; - page->next = pool->pages; - - pool->pages = page; - - return page->data; -} - -static void *pool_alloc(git_pool *pool, uint32_t size) -{ - git_pool_page *page = pool->pages; - void *ptr = NULL; - - if (!page || page->avail < size) - return pool_alloc_page(pool, size); - - ptr = &page->data[page->size - page->avail]; - page->avail -= size; - - return ptr; -} - -uint32_t git_pool__open_pages(git_pool *pool) -{ - uint32_t ct = 0; - git_pool_page *scan; - for (scan = pool->pages; scan != NULL; scan = scan->next) ct++; - return ct; -} - -bool git_pool__ptr_in_pool(git_pool *pool, void *ptr) -{ - git_pool_page *scan; - for (scan = pool->pages; scan != NULL; scan = scan->next) - if ((void *)scan->data <= ptr && - (void *)(((char *)scan->data) + scan->size) > ptr) - return true; - return false; -} - -#else - -static int git_pool__ptr_cmp(const void * a, const void * b) -{ - if(a > b) { - return 1; - } - if(a < b) { - return -1; - } - else { - return 0; - } -} - -void git_pool_init(git_pool *pool, uint32_t item_size) -{ - assert(pool); - assert(item_size >= 1); - - memset(pool, 0, sizeof(git_pool)); - pool->item_size = item_size; - pool->page_size = git_pool__system_page_size(); - git_vector_init(&pool->allocations, 100, git_pool__ptr_cmp); -} - -void git_pool_clear(git_pool *pool) -{ - git_vector_free_deep(&pool->allocations); -} - -static void *pool_alloc(git_pool *pool, uint32_t size) { - void *ptr = NULL; - if((ptr = git__malloc(size)) == NULL) { - return NULL; - } - git_vector_insert_sorted(&pool->allocations, ptr, NULL); - return ptr; -} - -bool git_pool__ptr_in_pool(git_pool *pool, void *ptr) -{ - size_t pos; - return git_vector_bsearch(&pos, &pool->allocations, ptr) != GIT_ENOTFOUND; -} -#endif - -void git_pool_swap(git_pool *a, git_pool *b) -{ - git_pool temp; - - if (a == b) - return; - - memcpy(&temp, a, sizeof(temp)); - memcpy(a, b, sizeof(temp)); - memcpy(b, &temp, sizeof(temp)); -} - -static uint32_t alloc_size(git_pool *pool, uint32_t count) -{ - const uint32_t align = sizeof(void *) - 1; - - if (pool->item_size > 1) { - const uint32_t item_size = (pool->item_size + align) & ~align; - return item_size * count; - } - - return (count + align) & ~align; -} - -void *git_pool_malloc(git_pool *pool, uint32_t items) -{ - return pool_alloc(pool, alloc_size(pool, items)); -} - -void *git_pool_mallocz(git_pool *pool, uint32_t items) -{ - const uint32_t size = alloc_size(pool, items); - void *ptr = pool_alloc(pool, size); - if (ptr) - memset(ptr, 0x0, size); - return ptr; -} - -char *git_pool_strndup(git_pool *pool, const char *str, size_t n) -{ - char *ptr = NULL; - - assert(pool && str && pool->item_size == sizeof(char)); - - if ((uint32_t)(n + 1) < n) - return NULL; - - if ((ptr = git_pool_malloc(pool, (uint32_t)(n + 1))) != NULL) { - memcpy(ptr, str, n); - ptr[n] = '\0'; - } - - return ptr; -} - -char *git_pool_strdup(git_pool *pool, const char *str) -{ - assert(pool && str && pool->item_size == sizeof(char)); - return git_pool_strndup(pool, str, strlen(str)); -} - -char *git_pool_strdup_safe(git_pool *pool, const char *str) -{ - return str ? git_pool_strdup(pool, str) : NULL; -} - -char *git_pool_strcat(git_pool *pool, const char *a, const char *b) -{ - void *ptr; - size_t len_a, len_b; - - assert(pool && pool->item_size == sizeof(char)); - - len_a = a ? strlen(a) : 0; - len_b = b ? strlen(b) : 0; - - if ((ptr = git_pool_malloc(pool, (uint32_t)(len_a + len_b + 1))) != NULL) { - if (len_a) - memcpy(ptr, a, len_a); - if (len_b) - memcpy(((char *)ptr) + len_a, b, len_b); - *(((char *)ptr) + len_a + len_b) = '\0'; - } - return ptr; -} diff --git a/vendor/libgit2/src/pool.h b/vendor/libgit2/src/pool.h deleted file mode 100644 index e0fafa997..000000000 --- a/vendor/libgit2/src/pool.h +++ /dev/null @@ -1,132 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_pool_h__ -#define INCLUDE_pool_h__ - -#include "common.h" -#include "vector.h" - -typedef struct git_pool_page git_pool_page; - -#ifndef GIT_DEBUG_POOL -/** - * Chunked allocator. - * - * A `git_pool` can be used when you want to cheaply allocate - * multiple items of the same type and are willing to free them - * all together with a single call. The two most common cases - * are a set of fixed size items (such as lots of OIDs) or a - * bunch of strings. - * - * Internally, a `git_pool` allocates pages of memory and then - * deals out blocks from the trailing unused portion of each page. - * The pages guarantee that the number of actual allocations done - * will be much smaller than the number of items needed. - * - * For examples of how to set up a `git_pool` see `git_pool_init`. - */ -typedef struct { - git_pool_page *pages; /* allocated pages */ - uint32_t item_size; /* size of single alloc unit in bytes */ - uint32_t page_size; /* size of page in bytes */ -} git_pool; - -#else - -/** - * Debug chunked allocator. - * - * Acts just like `git_pool` but instead of actually pooling allocations it - * passes them through to `git__malloc`. This makes it possible to easily debug - * systems that use `git_pool` using valgrind. - * - * In order to track allocations during the lifetime of the pool we use a - * `git_vector`. When the pool is deallocated everything in the vector is - * freed. - * - * `API is exactly the same as the standard `git_pool` with one exception. - * Since we aren't allocating pages to hand out in chunks we can't easily - * implement `git_pool__open_pages`. - */ -typedef struct { - git_vector allocations; - uint32_t item_size; - uint32_t page_size; -} git_pool; -#endif - -/** - * Initialize a pool. - * - * To allocation strings, use like this: - * - * git_pool_init(&string_pool, 1); - * my_string = git_pool_strdup(&string_pool, your_string); - * - * To allocate items of fixed size, use like this: - * - * git_pool_init(&pool, sizeof(item)); - * my_item = git_pool_malloc(&pool, 1); - * - * Of course, you can use this in other ways, but those are the - * two most common patterns. - */ -extern void git_pool_init(git_pool *pool, uint32_t item_size); - -/** - * Free all items in pool - */ -extern void git_pool_clear(git_pool *pool); - -/** - * Swap two pools with one another - */ -extern void git_pool_swap(git_pool *a, git_pool *b); - -/** - * Allocate space for one or more items from a pool. - */ -extern void *git_pool_malloc(git_pool *pool, uint32_t items); -extern void *git_pool_mallocz(git_pool *pool, uint32_t items); - -/** - * Allocate space and duplicate string data into it. - * - * This is allowed only for pools with item_size == sizeof(char) - */ -extern char *git_pool_strndup(git_pool *pool, const char *str, size_t n); - -/** - * Allocate space and duplicate a string into it. - * - * This is allowed only for pools with item_size == sizeof(char) - */ -extern char *git_pool_strdup(git_pool *pool, const char *str); - -/** - * Allocate space and duplicate a string into it, NULL is no error. - * - * This is allowed only for pools with item_size == sizeof(char) - */ -extern char *git_pool_strdup_safe(git_pool *pool, const char *str); - -/** - * Allocate space for the concatenation of two strings. - * - * This is allowed only for pools with item_size == sizeof(char) - */ -extern char *git_pool_strcat(git_pool *pool, const char *a, const char *b); - -/* - * Misc utilities - */ -#ifndef GIT_DEBUG_POOL -extern uint32_t git_pool__open_pages(git_pool *pool); -#endif -extern bool git_pool__ptr_in_pool(git_pool *pool, void *ptr); - -#endif diff --git a/vendor/libgit2/src/posix.c b/vendor/libgit2/src/posix.c deleted file mode 100644 index b3f1a1cd3..000000000 --- a/vendor/libgit2/src/posix.c +++ /dev/null @@ -1,269 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#include "common.h" -#include "posix.h" -#include "path.h" -#include -#include - -#ifndef GIT_WIN32 - -#ifdef NO_ADDRINFO - -int p_getaddrinfo( - const char *host, - const char *port, - struct addrinfo *hints, - struct addrinfo **info) -{ - struct addrinfo *ainfo, *ai; - int p = 0; - - GIT_UNUSED(hints); - - if ((ainfo = malloc(sizeof(struct addrinfo))) == NULL) - return -1; - - if ((ainfo->ai_hostent = gethostbyname(host)) == NULL) { - free(ainfo); - return -2; - } - - ainfo->ai_servent = getservbyname(port, 0); - - if (ainfo->ai_servent) - ainfo->ai_port = ainfo->ai_servent->s_port; - else - ainfo->ai_port = atol(port); - - memcpy(&ainfo->ai_addr_in.sin_addr, - ainfo->ai_hostent->h_addr_list[0], - ainfo->ai_hostent->h_length); - - ainfo->ai_protocol = 0; - ainfo->ai_socktype = hints->ai_socktype; - ainfo->ai_family = ainfo->ai_hostent->h_addrtype; - ainfo->ai_addr_in.sin_family = ainfo->ai_family; - ainfo->ai_addr_in.sin_port = ainfo->ai_port; - ainfo->ai_addr = (struct addrinfo *)&ainfo->ai_addr_in; - ainfo->ai_addrlen = sizeof(struct sockaddr_in); - - *info = ainfo; - - if (ainfo->ai_hostent->h_addr_list[1] == NULL) { - ainfo->ai_next = NULL; - return 0; - } - - ai = ainfo; - - for (p = 1; ainfo->ai_hostent->h_addr_list[p] != NULL; p++) { - if (!(ai->ai_next = malloc(sizeof(struct addrinfo)))) { - p_freeaddrinfo(ainfo); - return -1; - } - memcpy(ai->ai_next, ainfo, sizeof(struct addrinfo)); - memcpy(&ai->ai_next->ai_addr_in.sin_addr, - ainfo->ai_hostent->h_addr_list[p], - ainfo->ai_hostent->h_length); - ai->ai_next->ai_addr = (struct addrinfo *)&ai->ai_next->ai_addr_in; - ai = ai->ai_next; - } - - ai->ai_next = NULL; - return 0; -} - -void p_freeaddrinfo(struct addrinfo *info) -{ - struct addrinfo *p, *next; - - p = info; - - while(p != NULL) { - next = p->ai_next; - free(p); - p = next; - } -} - -const char *p_gai_strerror(int ret) -{ - switch(ret) { - case -1: return "Out of memory"; break; - case -2: return "Address lookup failed"; break; - default: return "Unknown error"; break; - } -} - -#endif /* NO_ADDRINFO */ - -int p_open(const char *path, volatile int flags, ...) -{ - mode_t mode = 0; - - if (flags & O_CREAT) { - va_list arg_list; - - va_start(arg_list, flags); - mode = (mode_t)va_arg(arg_list, int); - va_end(arg_list); - } - - return open(path, flags | O_BINARY | O_CLOEXEC, mode); -} - -int p_creat(const char *path, mode_t mode) -{ - return open(path, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY | O_CLOEXEC, mode); -} - -int p_getcwd(char *buffer_out, size_t size) -{ - char *cwd_buffer; - - assert(buffer_out && size > 0); - - cwd_buffer = getcwd(buffer_out, size); - - if (cwd_buffer == NULL) - return -1; - - git_path_mkposix(buffer_out); - git_path_string_to_dir(buffer_out, size); /* append trailing slash */ - - return 0; -} - -int p_rename(const char *from, const char *to) -{ - if (!link(from, to)) { - p_unlink(from); - return 0; - } - - if (!rename(from, to)) - return 0; - - return -1; -} - -#endif /* GIT_WIN32 */ - -ssize_t p_read(git_file fd, void *buf, size_t cnt) -{ - char *b = buf; - - if (!git__is_ssizet(cnt)) { -#ifdef GIT_WIN32 - SetLastError(ERROR_INVALID_PARAMETER); -#endif - errno = EINVAL; - return -1; - } - - while (cnt) { - ssize_t r; -#ifdef GIT_WIN32 - r = read(fd, b, cnt > INT_MAX ? INT_MAX : (unsigned int)cnt); -#else - r = read(fd, b, cnt); -#endif - if (r < 0) { - if (errno == EINTR || errno == EAGAIN) - continue; - return -1; - } - if (!r) - break; - cnt -= r; - b += r; - } - return (b - (char *)buf); -} - -int p_write(git_file fd, const void *buf, size_t cnt) -{ - const char *b = buf; - - while (cnt) { - ssize_t r; -#ifdef GIT_WIN32 - assert((size_t)((unsigned int)cnt) == cnt); - r = write(fd, b, (unsigned int)cnt); -#else - r = write(fd, b, cnt); -#endif - if (r < 0) { - if (errno == EINTR || GIT_ISBLOCKED(errno)) - continue; - return -1; - } - if (!r) { - errno = EPIPE; - return -1; - } - cnt -= r; - b += r; - } - return 0; -} - -#ifdef NO_MMAP - -#include "map.h" - -int git__page_size(size_t *page_size) -{ - /* dummy; here we don't need any alignment anyway */ - *page_size = 4096; - return 0; -} - -int git__mmap_alignment(size_t *alignment) -{ - /* dummy; here we don't need any alignment anyway */ - *alignment = 4096; - return 0; -} - - -int p_mmap(git_map *out, size_t len, int prot, int flags, int fd, git_off_t offset) -{ - GIT_MMAP_VALIDATE(out, len, prot, flags); - - out->data = NULL; - out->len = 0; - - if ((prot & GIT_PROT_WRITE) && ((flags & GIT_MAP_TYPE) == GIT_MAP_SHARED)) { - giterr_set(GITERR_OS, "Trying to map shared-writeable"); - return -1; - } - - out->data = malloc(len); - GITERR_CHECK_ALLOC(out->data); - - if (!git__is_ssizet(len) || - (p_lseek(fd, offset, SEEK_SET) < 0) || - (p_read(fd, out->data, len) != (ssize_t)len)) { - giterr_set(GITERR_OS, "mmap emulation failed"); - return -1; - } - - out->len = len; - return 0; -} - -int p_munmap(git_map *map) -{ - assert(map != NULL); - free(map->data); - - return 0; -} - -#endif diff --git a/vendor/libgit2/src/posix.h b/vendor/libgit2/src/posix.h deleted file mode 100644 index f204751cf..000000000 --- a/vendor/libgit2/src/posix.h +++ /dev/null @@ -1,161 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_posix_h__ -#define INCLUDE_posix_h__ - -#include "common.h" -#include -#include -#include "fnmatch.h" - -/* stat: file mode type testing macros */ -#ifndef S_IFGITLINK -#define S_IFGITLINK 0160000 -#define S_ISGITLINK(m) (((m) & S_IFMT) == S_IFGITLINK) -#endif - -#ifndef S_IFLNK -#define S_IFLNK 0120000 -#undef _S_IFLNK -#define _S_IFLNK S_IFLNK -#endif - -#ifndef S_IXUSR -#define S_IXUSR 00100 -#endif - -#ifndef S_ISLNK -#define S_ISLNK(m) (((m) & _S_IFMT) == _S_IFLNK) -#endif - -#ifndef S_ISDIR -#define S_ISDIR(m) (((m) & _S_IFMT) == _S_IFDIR) -#endif - -#ifndef S_ISREG -#define S_ISREG(m) (((m) & _S_IFMT) == _S_IFREG) -#endif - -#ifndef S_ISFIFO -#define S_ISFIFO(m) (((m) & _S_IFMT) == _S_IFIFO) -#endif - -/* if S_ISGID is not defined, then don't try to set it */ -#ifndef S_ISGID -#define S_ISGID 0 -#endif - -#ifndef O_BINARY -#define O_BINARY 0 -#endif -#ifndef O_CLOEXEC -#define O_CLOEXEC 0 -#endif - -/* access() mode parameter #defines */ -#ifndef F_OK -#define F_OK 0 /* existence check */ -#endif -#ifndef W_OK -#define W_OK 2 /* write mode check */ -#endif -#ifndef R_OK -#define R_OK 4 /* read mode check */ -#endif - -/* Determine whether an errno value indicates that a read or write failed - * because the descriptor is blocked. - */ -#if defined(EWOULDBLOCK) -#define GIT_ISBLOCKED(e) ((e) == EAGAIN || (e) == EWOULDBLOCK) -#else -#define GIT_ISBLOCKED(e) ((e) == EAGAIN) -#endif - -/* define some standard errnos that the runtime may be missing. for example, - * mingw lacks EAFNOSUPPORT. */ -#ifndef EAFNOSUPPORT -#define EAFNOSUPPORT (INT_MAX-1) -#endif - -typedef int git_file; - -/** - * Standard POSIX Methods - * - * All the methods starting with the `p_` prefix are - * direct ports of the standard POSIX methods. - * - * Some of the methods are slightly wrapped to provide - * saner defaults. Some of these methods are emulated - * in Windows platforms. - * - * Use your manpages to check the docs on these. - */ - -extern ssize_t p_read(git_file fd, void *buf, size_t cnt); -extern int p_write(git_file fd, const void *buf, size_t cnt); - -#define p_close(fd) close(fd) -#define p_umask(m) umask(m) - -extern int p_open(const char *path, int flags, ...); -extern int p_creat(const char *path, mode_t mode); -extern int p_getcwd(char *buffer_out, size_t size); -extern int p_rename(const char *from, const char *to); - -extern int git__page_size(size_t *page_size); -extern int git__mmap_alignment(size_t *page_size); - -/** - * Platform-dependent methods - */ -#ifdef GIT_WIN32 -# include "win32/posix.h" -#else -# include "unix/posix.h" -#endif - -#include "strnlen.h" - -#ifdef NO_READDIR_R -GIT_INLINE(int) p_readdir_r(DIR *dirp, struct dirent *entry, struct dirent **result) -{ - GIT_UNUSED(entry); - *result = readdir(dirp); - return 0; -} -#else /* NO_READDIR_R */ -# define p_readdir_r(d,e,r) readdir_r(d,e,r) -#endif - -#ifdef NO_ADDRINFO -# include -struct addrinfo { - struct hostent *ai_hostent; - struct servent *ai_servent; - struct sockaddr_in ai_addr_in; - struct sockaddr *ai_addr; - size_t ai_addrlen; - int ai_family; - int ai_socktype; - int ai_protocol; - long ai_port; - struct addrinfo *ai_next; -}; - -extern int p_getaddrinfo(const char *host, const char *port, - struct addrinfo *hints, struct addrinfo **info); -extern void p_freeaddrinfo(struct addrinfo *info); -extern const char *p_gai_strerror(int ret); -#else -# define p_getaddrinfo(a, b, c, d) getaddrinfo(a, b, c, d) -# define p_freeaddrinfo(a) freeaddrinfo(a) -# define p_gai_strerror(c) gai_strerror(c) -#endif /* NO_ADDRINFO */ - -#endif diff --git a/vendor/libgit2/src/pqueue.c b/vendor/libgit2/src/pqueue.c deleted file mode 100644 index 54a60ca04..000000000 --- a/vendor/libgit2/src/pqueue.c +++ /dev/null @@ -1,117 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "pqueue.h" -#include "util.h" - -#define PQUEUE_LCHILD_OF(I) (((I)<<1)+1) -#define PQUEUE_RCHILD_OF(I) (((I)<<1)+2) -#define PQUEUE_PARENT_OF(I) (((I)-1)>>1) - -int git_pqueue_init( - git_pqueue *pq, - uint32_t flags, - size_t init_size, - git_vector_cmp cmp) -{ - int error = git_vector_init(pq, init_size, cmp); - - if (!error) { - /* mix in our flags */ - pq->flags |= flags; - - /* if fixed size heap, pretend vector is exactly init_size elements */ - if ((flags & GIT_PQUEUE_FIXED_SIZE) && init_size > 0) - pq->_alloc_size = init_size; - } - - return error; -} - -static void pqueue_up(git_pqueue *pq, size_t el) -{ - size_t parent_el = PQUEUE_PARENT_OF(el); - void *kid = git_vector_get(pq, el); - - while (el > 0) { - void *parent = pq->contents[parent_el]; - - if (pq->_cmp(parent, kid) <= 0) - break; - - pq->contents[el] = parent; - - el = parent_el; - parent_el = PQUEUE_PARENT_OF(el); - } - - pq->contents[el] = kid; -} - -static void pqueue_down(git_pqueue *pq, size_t el) -{ - void *parent = git_vector_get(pq, el), *kid, *rkid; - - while (1) { - size_t kid_el = PQUEUE_LCHILD_OF(el); - - if ((kid = git_vector_get(pq, kid_el)) == NULL) - break; - - if ((rkid = git_vector_get(pq, kid_el + 1)) != NULL && - pq->_cmp(kid, rkid) > 0) { - kid = rkid; - kid_el += 1; - } - - if (pq->_cmp(parent, kid) <= 0) - break; - - pq->contents[el] = kid; - el = kid_el; - } - - pq->contents[el] = parent; -} - -int git_pqueue_insert(git_pqueue *pq, void *item) -{ - int error = 0; - - /* if heap is full, pop the top element if new one should replace it */ - if ((pq->flags & GIT_PQUEUE_FIXED_SIZE) != 0 && - pq->length >= pq->_alloc_size) - { - /* skip this item if below min item in heap */ - if (pq->_cmp(item, git_vector_get(pq, 0)) <= 0) - return 0; - /* otherwise remove the min item before inserting new */ - (void)git_pqueue_pop(pq); - } - - if (!(error = git_vector_insert(pq, item))) - pqueue_up(pq, pq->length - 1); - - return error; -} - -void *git_pqueue_pop(git_pqueue *pq) -{ - void *rval = git_pqueue_get(pq, 0); - - if (git_pqueue_size(pq) > 1) { - /* move last item to top of heap, shrink, and push item down */ - pq->contents[0] = git_vector_last(pq); - git_vector_pop(pq); - pqueue_down(pq, 0); - } else { - /* all we need to do is shrink the heap in this case */ - git_vector_pop(pq); - } - - return rval; -} diff --git a/vendor/libgit2/src/pqueue.h b/vendor/libgit2/src/pqueue.h deleted file mode 100644 index da7b74edf..000000000 --- a/vendor/libgit2/src/pqueue.h +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_pqueue_h__ -#define INCLUDE_pqueue_h__ - -#include "vector.h" - -typedef git_vector git_pqueue; - -enum { - /* flag meaning: don't grow heap, keep highest values only */ - GIT_PQUEUE_FIXED_SIZE = (GIT_VECTOR_FLAG_MAX << 1), -}; - -/** - * Initialize priority queue - * - * @param pq The priority queue struct to initialize - * @param flags Flags (see above) to control queue behavior - * @param init_size The initial queue size - * @param cmp The entry priority comparison function - * @return 0 on success, <0 on error - */ -extern int git_pqueue_init( - git_pqueue *pq, - uint32_t flags, - size_t init_size, - git_vector_cmp cmp); - -#define git_pqueue_free git_vector_free -#define git_pqueue_clear git_vector_clear -#define git_pqueue_size git_vector_length -#define git_pqueue_get git_vector_get - -/** - * Insert a new item into the queue - * - * @param pq The priority queue - * @param item Pointer to the item data - * @return 0 on success, <0 on failure - */ -extern int git_pqueue_insert(git_pqueue *pq, void *item); - -/** - * Remove the top item in the priority queue - * - * @param pq The priority queue - * @return item from heap on success, NULL if queue is empty - */ -extern void *git_pqueue_pop(git_pqueue *pq); - -#endif diff --git a/vendor/libgit2/src/push.c b/vendor/libgit2/src/push.c deleted file mode 100644 index 0747259c8..000000000 --- a/vendor/libgit2/src/push.c +++ /dev/null @@ -1,718 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "git2.h" - -#include "common.h" -#include "pack.h" -#include "pack-objects.h" -#include "remote.h" -#include "vector.h" -#include "push.h" -#include "tree.h" - -static int push_spec_rref_cmp(const void *a, const void *b) -{ - const push_spec *push_spec_a = a, *push_spec_b = b; - - return strcmp(push_spec_a->refspec.dst, push_spec_b->refspec.dst); -} - -static int push_status_ref_cmp(const void *a, const void *b) -{ - const push_status *push_status_a = a, *push_status_b = b; - - return strcmp(push_status_a->ref, push_status_b->ref); -} - -int git_push_new(git_push **out, git_remote *remote) -{ - git_push *p; - - *out = NULL; - - p = git__calloc(1, sizeof(*p)); - GITERR_CHECK_ALLOC(p); - - p->repo = remote->repo; - p->remote = remote; - p->report_status = 1; - p->pb_parallelism = 1; - - if (git_vector_init(&p->specs, 0, push_spec_rref_cmp) < 0) { - git__free(p); - return -1; - } - - if (git_vector_init(&p->status, 0, push_status_ref_cmp) < 0) { - git_vector_free(&p->specs); - git__free(p); - return -1; - } - - if (git_vector_init(&p->updates, 0, NULL) < 0) { - git_vector_free(&p->status); - git_vector_free(&p->specs); - git__free(p); - return -1; - } - - *out = p; - return 0; -} - -int git_push_set_options(git_push *push, const git_push_options *opts) -{ - if (!push || !opts) - return -1; - - GITERR_CHECK_VERSION(opts, GIT_PUSH_OPTIONS_VERSION, "git_push_options"); - - push->pb_parallelism = opts->pb_parallelism; - push->custom_headers = &opts->custom_headers; - - return 0; -} - -static void free_refspec(push_spec *spec) -{ - if (spec == NULL) - return; - - git_refspec__free(&spec->refspec); - git__free(spec); -} - -static int check_rref(char *ref) -{ - if (git__prefixcmp(ref, "refs/")) { - giterr_set(GITERR_INVALID, "Not a valid reference '%s'", ref); - return -1; - } - - return 0; -} - -static int check_lref(git_push *push, char *ref) -{ - /* lref must be resolvable to an existing object */ - git_object *obj; - int error = git_revparse_single(&obj, push->repo, ref); - git_object_free(obj); - - if (!error) - return 0; - - if (error == GIT_ENOTFOUND) - giterr_set(GITERR_REFERENCE, - "src refspec '%s' does not match any existing object", ref); - else - giterr_set(GITERR_INVALID, "Not a valid reference '%s'", ref); - return -1; -} - -static int parse_refspec(git_push *push, push_spec **spec, const char *str) -{ - push_spec *s; - - *spec = NULL; - - s = git__calloc(1, sizeof(*s)); - GITERR_CHECK_ALLOC(s); - - if (git_refspec__parse(&s->refspec, str, false) < 0) { - giterr_set(GITERR_INVALID, "invalid refspec %s", str); - goto on_error; - } - - if (s->refspec.src && s->refspec.src[0] != '\0' && - check_lref(push, s->refspec.src) < 0) { - goto on_error; - } - - if (check_rref(s->refspec.dst) < 0) - goto on_error; - - *spec = s; - return 0; - -on_error: - free_refspec(s); - return -1; -} - -int git_push_add_refspec(git_push *push, const char *refspec) -{ - push_spec *spec; - - if (parse_refspec(push, &spec, refspec) < 0 || - git_vector_insert(&push->specs, spec) < 0) - return -1; - - return 0; -} - -int git_push_update_tips(git_push *push, const git_remote_callbacks *callbacks) -{ - git_buf remote_ref_name = GIT_BUF_INIT; - size_t i, j; - git_refspec *fetch_spec; - push_spec *push_spec = NULL; - git_reference *remote_ref; - push_status *status; - int error = 0; - - git_vector_foreach(&push->status, i, status) { - int fire_callback = 1; - - /* Skip unsuccessful updates which have non-empty messages */ - if (status->msg) - continue; - - /* Find the corresponding remote ref */ - fetch_spec = git_remote__matching_refspec(push->remote, status->ref); - if (!fetch_spec) - continue; - - if ((error = git_refspec_transform(&remote_ref_name, fetch_spec, status->ref)) < 0) - goto on_error; - - /* Find matching push ref spec */ - git_vector_foreach(&push->specs, j, push_spec) { - if (!strcmp(push_spec->refspec.dst, status->ref)) - break; - } - - /* Could not find the corresponding push ref spec for this push update */ - if (j == push->specs.length) - continue; - - /* Update the remote ref */ - if (git_oid_iszero(&push_spec->loid)) { - error = git_reference_lookup(&remote_ref, push->remote->repo, git_buf_cstr(&remote_ref_name)); - - if (error >= 0) { - error = git_reference_delete(remote_ref); - git_reference_free(remote_ref); - } - } else { - error = git_reference_create(NULL, push->remote->repo, - git_buf_cstr(&remote_ref_name), &push_spec->loid, 1, - "update by push"); - } - - if (error < 0) { - if (error != GIT_ENOTFOUND) - goto on_error; - - giterr_clear(); - fire_callback = 0; - } - - if (fire_callback && callbacks && callbacks->update_tips) { - error = callbacks->update_tips(git_buf_cstr(&remote_ref_name), - &push_spec->roid, &push_spec->loid, callbacks->payload); - - if (error < 0) - goto on_error; - } - } - - error = 0; - -on_error: - git_buf_free(&remote_ref_name); - return error; -} - -/** - * Insert all tags until we find a non-tag object, which is returned - * in `out`. - */ -static int enqueue_tag(git_object **out, git_push *push, git_oid *id) -{ - git_object *obj = NULL, *target = NULL; - int error; - - if ((error = git_object_lookup(&obj, push->repo, id, GIT_OBJ_TAG)) < 0) - return error; - - while (git_object_type(obj) == GIT_OBJ_TAG) { - if ((error = git_packbuilder_insert(push->pb, git_object_id(obj), NULL)) < 0) - break; - - if ((error = git_tag_target(&target, (git_tag *) obj)) < 0) - break; - - git_object_free(obj); - obj = target; - } - - if (error < 0) - git_object_free(obj); - else - *out = obj; - - return error; -} - -static int revwalk(git_vector *commits, git_push *push) -{ - git_remote_head *head; - push_spec *spec; - git_revwalk *rw; - git_oid oid; - unsigned int i; - int error = -1; - - if (git_revwalk_new(&rw, push->repo) < 0) - return -1; - - git_revwalk_sorting(rw, GIT_SORT_TIME); - - git_vector_foreach(&push->specs, i, spec) { - git_otype type; - size_t size; - - if (git_oid_iszero(&spec->loid)) - /* - * Delete reference on remote side; - * nothing to do here. - */ - continue; - - if (git_oid_equal(&spec->loid, &spec->roid)) - continue; /* up-to-date */ - - if (git_odb_read_header(&size, &type, push->repo->_odb, &spec->loid) < 0) - goto on_error; - - if (type == GIT_OBJ_TAG) { - git_object *target; - - if ((error = enqueue_tag(&target, push, &spec->loid)) < 0) - goto on_error; - - if (git_object_type(target) == GIT_OBJ_COMMIT) { - if (git_revwalk_push(rw, git_object_id(target)) < 0) { - git_object_free(target); - goto on_error; - } - } else { - if (git_packbuilder_insert( - push->pb, git_object_id(target), NULL) < 0) { - git_object_free(target); - goto on_error; - } - } - git_object_free(target); - } else if (git_revwalk_push(rw, &spec->loid) < 0) - goto on_error; - - if (!spec->refspec.force) { - git_oid base; - - if (git_oid_iszero(&spec->roid)) - continue; - - if (!git_odb_exists(push->repo->_odb, &spec->roid)) { - giterr_set(GITERR_REFERENCE, - "Cannot push because a reference that you are trying to update on the remote contains commits that are not present locally."); - error = GIT_ENONFASTFORWARD; - goto on_error; - } - - error = git_merge_base(&base, push->repo, - &spec->loid, &spec->roid); - - if (error == GIT_ENOTFOUND || - (!error && !git_oid_equal(&base, &spec->roid))) { - giterr_set(GITERR_REFERENCE, - "Cannot push non-fastforwardable reference"); - error = GIT_ENONFASTFORWARD; - goto on_error; - } - - if (error < 0) - goto on_error; - } - } - - git_vector_foreach(&push->remote->refs, i, head) { - if (git_oid_iszero(&head->oid)) - continue; - - /* TODO */ - git_revwalk_hide(rw, &head->oid); - } - - while ((error = git_revwalk_next(&oid, rw)) == 0) { - git_oid *o = git__malloc(GIT_OID_RAWSZ); - if (!o) { - error = -1; - goto on_error; - } - git_oid_cpy(o, &oid); - if ((error = git_vector_insert(commits, o)) < 0) - goto on_error; - } - -on_error: - git_revwalk_free(rw); - return error == GIT_ITEROVER ? 0 : error; -} - -static int enqueue_object( - const git_tree_entry *entry, - git_packbuilder *pb) -{ - switch (git_tree_entry_type(entry)) { - case GIT_OBJ_COMMIT: - return 0; - case GIT_OBJ_TREE: - return git_packbuilder_insert_tree(pb, entry->oid); - default: - return git_packbuilder_insert(pb, entry->oid, entry->filename); - } -} - -static int queue_differences( - git_tree *base, - git_tree *delta, - git_packbuilder *pb) -{ - git_tree *b_child = NULL, *d_child = NULL; - size_t b_length = git_tree_entrycount(base); - size_t d_length = git_tree_entrycount(delta); - size_t i = 0, j = 0; - int error; - - while (i < b_length && j < d_length) { - const git_tree_entry *b_entry = git_tree_entry_byindex(base, i); - const git_tree_entry *d_entry = git_tree_entry_byindex(delta, j); - int cmp = 0; - - if (!git_oid__cmp(b_entry->oid, d_entry->oid)) - goto loop; - - cmp = strcmp(b_entry->filename, d_entry->filename); - - /* If the entries are both trees and they have the same name but are - * different, then we'll recurse after adding the right-hand entry */ - if (!cmp && - git_tree_entry__is_tree(b_entry) && - git_tree_entry__is_tree(d_entry)) { - /* Add the right-hand entry */ - if ((error = git_packbuilder_insert(pb, d_entry->oid, - d_entry->filename)) < 0) - goto on_error; - - /* Acquire the subtrees and recurse */ - if ((error = git_tree_lookup(&b_child, - git_tree_owner(base), b_entry->oid)) < 0 || - (error = git_tree_lookup(&d_child, - git_tree_owner(delta), d_entry->oid)) < 0 || - (error = queue_differences(b_child, d_child, pb)) < 0) - goto on_error; - - git_tree_free(b_child); b_child = NULL; - git_tree_free(d_child); d_child = NULL; - } - /* If the object is new or different in the right-hand tree, - * then enumerate it */ - else if (cmp >= 0 && - (error = enqueue_object(d_entry, pb)) < 0) - goto on_error; - - loop: - if (cmp <= 0) i++; - if (cmp >= 0) j++; - } - - /* Drain the right-hand tree of entries */ - for (; j < d_length; j++) - if ((error = enqueue_object(git_tree_entry_byindex(delta, j), pb)) < 0) - goto on_error; - - error = 0; - -on_error: - if (b_child) - git_tree_free(b_child); - - if (d_child) - git_tree_free(d_child); - - return error; -} - -static int queue_objects(git_push *push) -{ - git_vector commits = GIT_VECTOR_INIT; - git_oid *oid; - size_t i; - unsigned j; - int error; - - if ((error = revwalk(&commits, push)) < 0) - goto on_error; - - git_vector_foreach(&commits, i, oid) { - git_commit *parent = NULL, *commit; - git_tree *tree = NULL, *ptree = NULL; - size_t parentcount; - - if ((error = git_commit_lookup(&commit, push->repo, oid)) < 0) - goto on_error; - - /* Insert the commit */ - if ((error = git_packbuilder_insert(push->pb, oid, NULL)) < 0) - goto loop_error; - - parentcount = git_commit_parentcount(commit); - - if (!parentcount) { - if ((error = git_packbuilder_insert_tree(push->pb, - git_commit_tree_id(commit))) < 0) - goto loop_error; - } else { - if ((error = git_tree_lookup(&tree, push->repo, - git_commit_tree_id(commit))) < 0 || - (error = git_packbuilder_insert(push->pb, - git_commit_tree_id(commit), NULL)) < 0) - goto loop_error; - - /* For each parent, add the items which are different */ - for (j = 0; j < parentcount; j++) { - if ((error = git_commit_parent(&parent, commit, j)) < 0 || - (error = git_commit_tree(&ptree, parent)) < 0 || - (error = queue_differences(ptree, tree, push->pb)) < 0) - goto loop_error; - - git_tree_free(ptree); ptree = NULL; - git_commit_free(parent); parent = NULL; - } - } - - error = 0; - - loop_error: - if (tree) - git_tree_free(tree); - - if (ptree) - git_tree_free(ptree); - - if (parent) - git_commit_free(parent); - - git_commit_free(commit); - - if (error < 0) - goto on_error; - } - - error = 0; - -on_error: - git_vector_free_deep(&commits); - return error; -} - -static int add_update(git_push *push, push_spec *spec) -{ - git_push_update *u = git__calloc(1, sizeof(git_push_update)); - GITERR_CHECK_ALLOC(u); - - u->src_refname = git__strdup(spec->refspec.src); - GITERR_CHECK_ALLOC(u->src_refname); - - u->dst_refname = git__strdup(spec->refspec.dst); - GITERR_CHECK_ALLOC(u->dst_refname); - - git_oid_cpy(&u->src, &spec->roid); - git_oid_cpy(&u->dst, &spec->loid); - - return git_vector_insert(&push->updates, u); -} - -static int calculate_work(git_push *push) -{ - git_remote_head *head; - push_spec *spec; - unsigned int i, j; - - /* Update local and remote oids*/ - - git_vector_foreach(&push->specs, i, spec) { - if (spec->refspec.src && spec->refspec.src[0]!= '\0') { - /* This is a create or update. Local ref must exist. */ - if (git_reference_name_to_id( - &spec->loid, push->repo, spec->refspec.src) < 0) { - giterr_set(GITERR_REFERENCE, "No such reference '%s'", spec->refspec.src); - return -1; - } - } - - /* Remote ref may or may not (e.g. during create) already exist. */ - git_vector_foreach(&push->remote->refs, j, head) { - if (!strcmp(spec->refspec.dst, head->name)) { - git_oid_cpy(&spec->roid, &head->oid); - break; - } - } - - if (add_update(push, spec) < 0) - return -1; - } - - return 0; -} - -static int do_push(git_push *push, const git_remote_callbacks *callbacks) -{ - int error = 0; - git_transport *transport = push->remote->transport; - - if (!transport->push) { - giterr_set(GITERR_NET, "Remote transport doesn't support push"); - error = -1; - goto on_error; - } - - /* - * A pack-file MUST be sent if either create or update command - * is used, even if the server already has all the necessary - * objects. In this case the client MUST send an empty pack-file. - */ - - if ((error = git_packbuilder_new(&push->pb, push->repo)) < 0) - goto on_error; - - git_packbuilder_set_threads(push->pb, push->pb_parallelism); - - if (callbacks && callbacks->pack_progress) - if ((error = git_packbuilder_set_callbacks(push->pb, callbacks->pack_progress, callbacks->payload)) < 0) - goto on_error; - - if ((error = calculate_work(push)) < 0) - goto on_error; - - if (callbacks && callbacks->push_negotiation && - (error = callbacks->push_negotiation((const git_push_update **) push->updates.contents, - push->updates.length, callbacks->payload)) < 0) - goto on_error; - - if ((error = queue_objects(push)) < 0 || - (error = transport->push(transport, push, callbacks)) < 0) - goto on_error; - -on_error: - git_packbuilder_free(push->pb); - return error; -} - -static int filter_refs(git_remote *remote) -{ - const git_remote_head **heads; - size_t heads_len, i; - - git_vector_clear(&remote->refs); - - if (git_remote_ls(&heads, &heads_len, remote) < 0) - return -1; - - for (i = 0; i < heads_len; i++) { - if (git_vector_insert(&remote->refs, (void *)heads[i]) < 0) - return -1; - } - - return 0; -} - -int git_push_finish(git_push *push, const git_remote_callbacks *callbacks) -{ - int error; - - if (!git_remote_connected(push->remote) && - (error = git_remote_connect(push->remote, GIT_DIRECTION_PUSH, callbacks, push->custom_headers)) < 0) - return error; - - if ((error = filter_refs(push->remote)) < 0 || - (error = do_push(push, callbacks)) < 0) - return error; - - if (!push->unpack_ok) { - error = -1; - giterr_set(GITERR_NET, "unpacking the sent packfile failed on the remote"); - } - - return error; -} - -int git_push_status_foreach(git_push *push, - int (*cb)(const char *ref, const char *msg, void *data), - void *data) -{ - push_status *status; - unsigned int i; - - git_vector_foreach(&push->status, i, status) { - int error = cb(status->ref, status->msg, data); - if (error) - return giterr_set_after_callback(error); - } - - return 0; -} - -void git_push_status_free(push_status *status) -{ - if (status == NULL) - return; - - git__free(status->msg); - git__free(status->ref); - git__free(status); -} - -void git_push_free(git_push *push) -{ - push_spec *spec; - push_status *status; - git_push_update *update; - unsigned int i; - - if (push == NULL) - return; - - git_vector_foreach(&push->specs, i, spec) { - free_refspec(spec); - } - git_vector_free(&push->specs); - - git_vector_foreach(&push->status, i, status) { - git_push_status_free(status); - } - git_vector_free(&push->status); - - git_vector_foreach(&push->updates, i, update) { - git__free(update->src_refname); - git__free(update->dst_refname); - git__free(update); - } - git_vector_free(&push->updates); - - git__free(push); -} - -int git_push_init_options(git_push_options *opts, unsigned int version) -{ - GIT_INIT_STRUCTURE_FROM_TEMPLATE( - opts, version, git_push_options, GIT_PUSH_OPTIONS_INIT); - return 0; -} diff --git a/vendor/libgit2/src/push.h b/vendor/libgit2/src/push.h deleted file mode 100644 index e32ad2f4d..000000000 --- a/vendor/libgit2/src/push.h +++ /dev/null @@ -1,137 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_push_h__ -#define INCLUDE_push_h__ - -#include "git2.h" -#include "refspec.h" - -typedef struct push_spec { - struct git_refspec refspec; - - git_oid loid; - git_oid roid; -} push_spec; - -typedef struct push_status { - bool ok; - - char *ref; - char *msg; -} push_status; - -struct git_push { - git_repository *repo; - git_packbuilder *pb; - git_remote *remote; - git_vector specs; - git_vector updates; - bool report_status; - - /* report-status */ - bool unpack_ok; - git_vector status; - - /* options */ - unsigned pb_parallelism; - const git_strarray *custom_headers; -}; - -/** - * Free the given push status object - * - * @param status The push status object - */ -void git_push_status_free(push_status *status); - -/** - * Create a new push object - * - * @param out New push object - * @param remote Remote instance - * - * @return 0 or an error code - */ -int git_push_new(git_push **out, git_remote *remote); - -/** - * Set options on a push object - * - * @param push The push object - * @param opts The options to set on the push object - * - * @return 0 or an error code - */ -int git_push_set_options( - git_push *push, - const git_push_options *opts); - -/** - * Add a refspec to be pushed - * - * @param push The push object - * @param refspec Refspec string - * - * @return 0 or an error code - */ -int git_push_add_refspec(git_push *push, const char *refspec); - -/** - * Update remote tips after a push - * - * @param push The push object - * @param callbacks the callbacks to use for this connection - * - * @return 0 or an error code - */ -int git_push_update_tips(git_push *push, const git_remote_callbacks *callbacks); - -/** - * Perform the push - * - * This function will return an error in case of a protocol error or - * the server being unable to unpack the data we sent. - * - * The return value does not reflect whether the server accepted or - * refused any reference updates. Use `git_push_status_foreach()` in - * order to find out which updates were accepted or rejected. - * - * @param push The push object - * @param callbacks the callbacks to use for this connection - * - * @return 0 or an error code - */ -int git_push_finish(git_push *push, const git_remote_callbacks *callbacks); - -/** - * Invoke callback `cb' on each status entry - * - * For each of the updated references, we receive a status report in the - * form of `ok refs/heads/master` or `ng refs/heads/master `. - * `msg != NULL` means the reference has not been updated for the given - * reason. - * - * Return a non-zero value from the callback to stop the loop. - * - * @param push The push object - * @param cb The callback to call on each object - * @param data The payload passed to the callback - * - * @return 0 on success, non-zero callback return value, or error code - */ -int git_push_status_foreach(git_push *push, - int (*cb)(const char *ref, const char *msg, void *data), - void *data); - -/** - * Free the given push object - * - * @param push The push object - */ -void git_push_free(git_push *push); - -#endif diff --git a/vendor/libgit2/src/rebase.c b/vendor/libgit2/src/rebase.c deleted file mode 100644 index bcad9b7cd..000000000 --- a/vendor/libgit2/src/rebase.c +++ /dev/null @@ -1,1337 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "common.h" -#include "buffer.h" -#include "repository.h" -#include "posix.h" -#include "filebuf.h" -#include "merge.h" -#include "array.h" -#include "config.h" -#include "annotated_commit.h" -#include "index.h" - -#include -#include -#include -#include -#include -#include -#include - -#define REBASE_APPLY_DIR "rebase-apply" -#define REBASE_MERGE_DIR "rebase-merge" - -#define HEAD_NAME_FILE "head-name" -#define ORIG_HEAD_FILE "orig-head" -#define HEAD_FILE "head" -#define ONTO_FILE "onto" -#define ONTO_NAME_FILE "onto_name" -#define QUIET_FILE "quiet" - -#define MSGNUM_FILE "msgnum" -#define END_FILE "end" -#define CMT_FILE_FMT "cmt.%" PRIuZ -#define CURRENT_FILE "current" -#define REWRITTEN_FILE "rewritten" - -#define ORIG_DETACHED_HEAD "detached HEAD" - -#define NOTES_DEFAULT_REF NULL - -#define REBASE_DIR_MODE 0777 -#define REBASE_FILE_MODE 0666 - -typedef enum { - GIT_REBASE_TYPE_NONE = 0, - GIT_REBASE_TYPE_APPLY = 1, - GIT_REBASE_TYPE_MERGE = 2, - GIT_REBASE_TYPE_INTERACTIVE = 3, -} git_rebase_type_t; - -struct git_rebase { - git_repository *repo; - - git_rebase_options options; - - git_rebase_type_t type; - char *state_path; - - int head_detached : 1, - inmemory : 1, - quiet : 1, - started : 1; - - git_array_t(git_rebase_operation) operations; - size_t current; - - /* Used by in-memory rebase */ - git_index *index; - git_commit *last_commit; - - /* Used by regular (not in-memory) merge-style rebase */ - git_oid orig_head_id; - char *orig_head_name; - - git_oid onto_id; - char *onto_name; -}; - -#define GIT_REBASE_STATE_INIT {0} - -static int rebase_state_type( - git_rebase_type_t *type_out, - char **path_out, - git_repository *repo) -{ - git_buf path = GIT_BUF_INIT; - git_rebase_type_t type = GIT_REBASE_TYPE_NONE; - - if (git_buf_joinpath(&path, repo->path_repository, REBASE_APPLY_DIR) < 0) - return -1; - - if (git_path_isdir(git_buf_cstr(&path))) { - type = GIT_REBASE_TYPE_APPLY; - goto done; - } - - git_buf_clear(&path); - if (git_buf_joinpath(&path, repo->path_repository, REBASE_MERGE_DIR) < 0) - return -1; - - if (git_path_isdir(git_buf_cstr(&path))) { - type = GIT_REBASE_TYPE_MERGE; - goto done; - } - -done: - *type_out = type; - - if (type != GIT_REBASE_TYPE_NONE && path_out) - *path_out = git_buf_detach(&path); - - git_buf_free(&path); - - return 0; -} - -GIT_INLINE(int) rebase_readfile( - git_buf *out, - git_buf *state_path, - const char *filename) -{ - size_t state_path_len = state_path->size; - int error; - - git_buf_clear(out); - - if ((error = git_buf_joinpath(state_path, state_path->ptr, filename)) < 0 || - (error = git_futils_readbuffer(out, state_path->ptr)) < 0) - goto done; - - git_buf_rtrim(out); - -done: - git_buf_truncate(state_path, state_path_len); - return error; -} - -GIT_INLINE(int) rebase_readint( - size_t *out, git_buf *asc_out, git_buf *state_path, const char *filename) -{ - int32_t num; - const char *eol; - int error = 0; - - if ((error = rebase_readfile(asc_out, state_path, filename)) < 0) - return error; - - if (git__strtol32(&num, asc_out->ptr, &eol, 10) < 0 || num < 0 || *eol) { - giterr_set(GITERR_REBASE, "The file '%s' contains an invalid numeric value", filename); - return -1; - } - - *out = (size_t) num; - - return 0; -} - -GIT_INLINE(int) rebase_readoid( - git_oid *out, git_buf *str_out, git_buf *state_path, const char *filename) -{ - int error; - - if ((error = rebase_readfile(str_out, state_path, filename)) < 0) - return error; - - if (str_out->size != GIT_OID_HEXSZ || git_oid_fromstr(out, str_out->ptr) < 0) { - giterr_set(GITERR_REBASE, "The file '%s' contains an invalid object ID", filename); - return -1; - } - - return 0; -} - -static git_rebase_operation *rebase_operation_alloc( - git_rebase *rebase, - git_rebase_operation_t type, - git_oid *id, - const char *exec) -{ - git_rebase_operation *operation; - - assert((type == GIT_REBASE_OPERATION_EXEC) == !id); - assert((type == GIT_REBASE_OPERATION_EXEC) == !!exec); - - if ((operation = git_array_alloc(rebase->operations)) == NULL) - return NULL; - - operation->type = type; - git_oid_cpy((git_oid *)&operation->id, id); - operation->exec = exec; - - return operation; -} - -static int rebase_open_merge(git_rebase *rebase) -{ - git_buf state_path = GIT_BUF_INIT, buf = GIT_BUF_INIT, cmt = GIT_BUF_INIT; - git_oid id; - git_rebase_operation *operation; - size_t i, msgnum = 0, end; - int error; - - if ((error = git_buf_puts(&state_path, rebase->state_path)) < 0) - goto done; - - /* Read 'msgnum' if it exists (otherwise, let msgnum = 0) */ - if ((error = rebase_readint(&msgnum, &buf, &state_path, MSGNUM_FILE)) < 0 && - error != GIT_ENOTFOUND) - goto done; - - if (msgnum) { - rebase->started = 1; - rebase->current = msgnum - 1; - } - - /* Read 'end' */ - if ((error = rebase_readint(&end, &buf, &state_path, END_FILE)) < 0) - goto done; - - /* Read 'current' if it exists */ - if ((error = rebase_readoid(&id, &buf, &state_path, CURRENT_FILE)) < 0 && - error != GIT_ENOTFOUND) - goto done; - - /* Read cmt.* */ - git_array_init_to_size(rebase->operations, end); - GITERR_CHECK_ARRAY(rebase->operations); - - for (i = 0; i < end; i++) { - git_buf_clear(&cmt); - - if ((error = git_buf_printf(&cmt, "cmt.%" PRIuZ, (i+1))) < 0 || - (error = rebase_readoid(&id, &buf, &state_path, cmt.ptr)) < 0) - goto done; - - operation = rebase_operation_alloc(rebase, GIT_REBASE_OPERATION_PICK, &id, NULL); - GITERR_CHECK_ALLOC(operation); - } - - /* Read 'onto_name' */ - if ((error = rebase_readfile(&buf, &state_path, ONTO_NAME_FILE)) < 0) - goto done; - - rebase->onto_name = git_buf_detach(&buf); - -done: - git_buf_free(&cmt); - git_buf_free(&state_path); - git_buf_free(&buf); - - return error; -} - -static int rebase_alloc(git_rebase **out, const git_rebase_options *rebase_opts) -{ - git_rebase *rebase = git__calloc(1, sizeof(git_rebase)); - GITERR_CHECK_ALLOC(rebase); - - *out = NULL; - - if (rebase_opts) - memcpy(&rebase->options, rebase_opts, sizeof(git_rebase_options)); - else - git_rebase_init_options(&rebase->options, GIT_REBASE_OPTIONS_VERSION); - - if (rebase_opts && rebase_opts->rewrite_notes_ref) { - rebase->options.rewrite_notes_ref = git__strdup(rebase_opts->rewrite_notes_ref); - GITERR_CHECK_ALLOC(rebase->options.rewrite_notes_ref); - } - - if ((rebase->options.checkout_options.checkout_strategy & (GIT_CHECKOUT_SAFE | GIT_CHECKOUT_FORCE)) == 0) - rebase->options.checkout_options.checkout_strategy = GIT_CHECKOUT_SAFE; - - *out = rebase; - - return 0; -} - -static int rebase_check_versions(const git_rebase_options *given_opts) -{ - GITERR_CHECK_VERSION(given_opts, GIT_REBASE_OPTIONS_VERSION, "git_rebase_options"); - - if (given_opts) - GITERR_CHECK_VERSION(&given_opts->checkout_options, GIT_CHECKOUT_OPTIONS_VERSION, "git_checkout_options"); - - return 0; -} - -int git_rebase_open( - git_rebase **out, - git_repository *repo, - const git_rebase_options *given_opts) -{ - git_rebase *rebase; - git_buf path = GIT_BUF_INIT, orig_head_name = GIT_BUF_INIT, - orig_head_id = GIT_BUF_INIT, onto_id = GIT_BUF_INIT; - int state_path_len, error; - - assert(repo); - - if ((error = rebase_check_versions(given_opts)) < 0) - return error; - - if (rebase_alloc(&rebase, given_opts) < 0) - return -1; - - rebase->repo = repo; - - if ((error = rebase_state_type(&rebase->type, &rebase->state_path, repo)) < 0) - goto done; - - if (rebase->type == GIT_REBASE_TYPE_NONE) { - giterr_set(GITERR_REBASE, "There is no rebase in progress"); - error = GIT_ENOTFOUND; - goto done; - } - - if ((error = git_buf_puts(&path, rebase->state_path)) < 0) - goto done; - - state_path_len = git_buf_len(&path); - - if ((error = git_buf_joinpath(&path, path.ptr, HEAD_NAME_FILE)) < 0 || - (error = git_futils_readbuffer(&orig_head_name, path.ptr)) < 0) - goto done; - - git_buf_rtrim(&orig_head_name); - - if (strcmp(ORIG_DETACHED_HEAD, orig_head_name.ptr) == 0) - rebase->head_detached = 1; - - git_buf_truncate(&path, state_path_len); - - if ((error = git_buf_joinpath(&path, path.ptr, ORIG_HEAD_FILE)) < 0) - goto done; - - if (!git_path_isfile(path.ptr)) { - /* Previous versions of git.git used 'head' here; support that. */ - git_buf_truncate(&path, state_path_len); - - if ((error = git_buf_joinpath(&path, path.ptr, HEAD_FILE)) < 0) - goto done; - } - - if ((error = git_futils_readbuffer(&orig_head_id, path.ptr)) < 0) - goto done; - - git_buf_rtrim(&orig_head_id); - - if ((error = git_oid_fromstr(&rebase->orig_head_id, orig_head_id.ptr)) < 0) - goto done; - - git_buf_truncate(&path, state_path_len); - - if ((error = git_buf_joinpath(&path, path.ptr, ONTO_FILE)) < 0 || - (error = git_futils_readbuffer(&onto_id, path.ptr)) < 0) - goto done; - - git_buf_rtrim(&onto_id); - - if ((error = git_oid_fromstr(&rebase->onto_id, onto_id.ptr)) < 0) - goto done; - - if (!rebase->head_detached) - rebase->orig_head_name = git_buf_detach(&orig_head_name); - - switch (rebase->type) { - case GIT_REBASE_TYPE_INTERACTIVE: - giterr_set(GITERR_REBASE, "Interactive rebase is not supported"); - error = -1; - break; - case GIT_REBASE_TYPE_MERGE: - error = rebase_open_merge(rebase); - break; - case GIT_REBASE_TYPE_APPLY: - giterr_set(GITERR_REBASE, "Patch application rebase is not supported"); - error = -1; - break; - default: - abort(); - } - -done: - if (error == 0) - *out = rebase; - else - git_rebase_free(rebase); - - git_buf_free(&path); - git_buf_free(&orig_head_name); - git_buf_free(&orig_head_id); - git_buf_free(&onto_id); - return error; -} - -static int rebase_cleanup(git_rebase *rebase) -{ - if (!rebase || rebase->inmemory) - return 0; - - return git_path_isdir(rebase->state_path) ? - git_futils_rmdir_r(rebase->state_path, NULL, GIT_RMDIR_REMOVE_FILES) : - 0; -} - -static int rebase_setupfile(git_rebase *rebase, const char *filename, int flags, const char *fmt, ...) -{ - git_buf path = GIT_BUF_INIT, - contents = GIT_BUF_INIT; - va_list ap; - int error; - - va_start(ap, fmt); - git_buf_vprintf(&contents, fmt, ap); - va_end(ap); - - if ((error = git_buf_joinpath(&path, rebase->state_path, filename)) == 0) - error = git_futils_writebuffer(&contents, path.ptr, flags, REBASE_FILE_MODE); - - git_buf_free(&path); - git_buf_free(&contents); - - return error; -} - -static const char *rebase_onto_name(const git_annotated_commit *onto) -{ - if (onto->ref_name && git__strncmp(onto->ref_name, "refs/heads/", 11) == 0) - return onto->ref_name + 11; - else if (onto->ref_name) - return onto->ref_name; - else - return onto->id_str; -} - -static int rebase_setupfiles_merge(git_rebase *rebase) -{ - git_buf commit_filename = GIT_BUF_INIT; - char id_str[GIT_OID_HEXSZ]; - git_rebase_operation *operation; - size_t i; - int error = 0; - - if ((error = rebase_setupfile(rebase, END_FILE, -1, "%" PRIuZ "\n", git_array_size(rebase->operations))) < 0 || - (error = rebase_setupfile(rebase, ONTO_NAME_FILE, -1, "%s\n", rebase->onto_name)) < 0) - goto done; - - for (i = 0; i < git_array_size(rebase->operations); i++) { - operation = git_array_get(rebase->operations, i); - - git_buf_clear(&commit_filename); - git_buf_printf(&commit_filename, CMT_FILE_FMT, i+1); - - git_oid_fmt(id_str, &operation->id); - - if ((error = rebase_setupfile(rebase, commit_filename.ptr, -1, - "%.*s\n", GIT_OID_HEXSZ, id_str)) < 0) - goto done; - } - -done: - git_buf_free(&commit_filename); - return error; -} - -static int rebase_setupfiles(git_rebase *rebase) -{ - char onto[GIT_OID_HEXSZ], orig_head[GIT_OID_HEXSZ]; - - git_oid_fmt(onto, &rebase->onto_id); - git_oid_fmt(orig_head, &rebase->orig_head_id); - - if (p_mkdir(rebase->state_path, REBASE_DIR_MODE) < 0) { - giterr_set(GITERR_OS, "Failed to create rebase directory '%s'", rebase->state_path); - return -1; - } - - if (git_repository__set_orig_head(rebase->repo, &rebase->orig_head_id) < 0 || - rebase_setupfile(rebase, HEAD_NAME_FILE, -1, "%s\n", rebase->orig_head_name) < 0 || - rebase_setupfile(rebase, ONTO_FILE, -1, "%.*s\n", GIT_OID_HEXSZ, onto) < 0 || - rebase_setupfile(rebase, ORIG_HEAD_FILE, -1, "%.*s\n", GIT_OID_HEXSZ, orig_head) < 0 || - rebase_setupfile(rebase, QUIET_FILE, -1, rebase->quiet ? "t\n" : "\n") < 0) - return -1; - - return rebase_setupfiles_merge(rebase); -} - -int git_rebase_init_options(git_rebase_options *opts, unsigned int version) -{ - GIT_INIT_STRUCTURE_FROM_TEMPLATE( - opts, version, git_rebase_options, GIT_REBASE_OPTIONS_INIT); - return 0; -} - -static int rebase_ensure_not_in_progress(git_repository *repo) -{ - int error; - git_rebase_type_t type; - - if ((error = rebase_state_type(&type, NULL, repo)) < 0) - return error; - - if (type != GIT_REBASE_TYPE_NONE) { - giterr_set(GITERR_REBASE, "There is an existing rebase in progress"); - return -1; - } - - return 0; -} - -static int rebase_ensure_not_dirty( - git_repository *repo, - bool check_index, - bool check_workdir, - int fail_with) -{ - git_tree *head = NULL; - git_index *index = NULL; - git_diff *diff = NULL; - int error = 0; - - if (check_index) { - if ((error = git_repository_head_tree(&head, repo)) < 0 || - (error = git_repository_index(&index, repo)) < 0 || - (error = git_diff_tree_to_index(&diff, repo, head, index, NULL)) < 0) - goto done; - - if (git_diff_num_deltas(diff) > 0) { - giterr_set(GITERR_REBASE, "Uncommitted changes exist in index"); - error = fail_with; - goto done; - } - - git_diff_free(diff); - diff = NULL; - } - - if (check_workdir) { - if ((error = git_diff_index_to_workdir(&diff, repo, index, NULL)) < 0) - goto done; - - if (git_diff_num_deltas(diff) > 0) { - giterr_set(GITERR_REBASE, "Unstaged changes exist in workdir"); - error = fail_with; - goto done; - } - } - -done: - git_diff_free(diff); - git_index_free(index); - git_tree_free(head); - - return error; -} - -static int rebase_init_operations( - git_rebase *rebase, - git_repository *repo, - const git_annotated_commit *branch, - const git_annotated_commit *upstream, - const git_annotated_commit *onto) -{ - git_revwalk *revwalk = NULL; - git_commit *commit; - git_oid id; - bool merge; - git_rebase_operation *operation; - int error; - - if (!upstream) - upstream = onto; - - if ((error = git_revwalk_new(&revwalk, rebase->repo)) < 0 || - (error = git_revwalk_push(revwalk, git_annotated_commit_id(branch))) < 0 || - (error = git_revwalk_hide(revwalk, git_annotated_commit_id(upstream))) < 0) - goto done; - - git_revwalk_sorting(revwalk, GIT_SORT_REVERSE | GIT_SORT_TIME); - - while ((error = git_revwalk_next(&id, revwalk)) == 0) { - if ((error = git_commit_lookup(&commit, repo, &id)) < 0) - goto done; - - merge = (git_commit_parentcount(commit) > 1); - git_commit_free(commit); - - if (merge) - continue; - - operation = rebase_operation_alloc(rebase, GIT_REBASE_OPERATION_PICK, &id, NULL); - GITERR_CHECK_ALLOC(operation); - } - - error = 0; - -done: - git_revwalk_free(revwalk); - return error; -} - -static int rebase_init_merge( - git_rebase *rebase, - git_repository *repo, - const git_annotated_commit *branch, - const git_annotated_commit *upstream, - const git_annotated_commit *onto) -{ - git_reference *head_ref = NULL; - git_commit *onto_commit = NULL; - git_buf reflog = GIT_BUF_INIT; - git_buf state_path = GIT_BUF_INIT; - int error; - - GIT_UNUSED(upstream); - - if ((error = git_buf_joinpath(&state_path, repo->path_repository, REBASE_MERGE_DIR)) < 0) - goto done; - - rebase->state_path = git_buf_detach(&state_path); - GITERR_CHECK_ALLOC(rebase->state_path); - - rebase->orig_head_name = git__strdup(branch->ref_name ? branch->ref_name : ORIG_DETACHED_HEAD); - GITERR_CHECK_ALLOC(rebase->orig_head_name); - - rebase->onto_name = git__strdup(rebase_onto_name(onto)); - GITERR_CHECK_ALLOC(rebase->onto_name); - - rebase->quiet = rebase->options.quiet; - - git_oid_cpy(&rebase->orig_head_id, git_annotated_commit_id(branch)); - git_oid_cpy(&rebase->onto_id, git_annotated_commit_id(onto)); - - if ((error = rebase_setupfiles(rebase)) < 0 || - (error = git_buf_printf(&reflog, - "rebase: checkout %s", rebase_onto_name(onto))) < 0 || - (error = git_commit_lookup( - &onto_commit, repo, git_annotated_commit_id(onto))) < 0 || - (error = git_checkout_tree(repo, - (git_object *)onto_commit, &rebase->options.checkout_options)) < 0 || - (error = git_reference_create(&head_ref, repo, GIT_HEAD_FILE, - git_annotated_commit_id(onto), 1, reflog.ptr)) < 0) - goto done; - -done: - git_reference_free(head_ref); - git_commit_free(onto_commit); - git_buf_free(&reflog); - git_buf_free(&state_path); - - return error; -} - -static int rebase_init_inmemory( - git_rebase *rebase, - git_repository *repo, - const git_annotated_commit *branch, - const git_annotated_commit *upstream, - const git_annotated_commit *onto) -{ - GIT_UNUSED(branch); - GIT_UNUSED(upstream); - - return git_commit_lookup( - &rebase->last_commit, repo, git_annotated_commit_id(onto)); -} - -int git_rebase_init( - git_rebase **out, - git_repository *repo, - const git_annotated_commit *branch, - const git_annotated_commit *upstream, - const git_annotated_commit *onto, - const git_rebase_options *given_opts) -{ - git_rebase *rebase = NULL; - git_annotated_commit *head_branch = NULL; - git_reference *head_ref = NULL; - bool inmemory = (given_opts && given_opts->inmemory); - int error; - - assert(repo && (upstream || onto)); - - *out = NULL; - - if (!onto) - onto = upstream; - - if ((error = rebase_check_versions(given_opts)) < 0) - goto done; - - if (!inmemory) { - if ((error = git_repository__ensure_not_bare(repo, "rebase")) < 0 || - (error = rebase_ensure_not_in_progress(repo)) < 0 || - (error = rebase_ensure_not_dirty(repo, true, true, GIT_ERROR)) < 0) - goto done; - } - - if (!branch) { - if ((error = git_repository_head(&head_ref, repo)) < 0 || - (error = git_annotated_commit_from_ref(&head_branch, repo, head_ref)) < 0) - goto done; - - branch = head_branch; - } - - if (rebase_alloc(&rebase, given_opts) < 0) - return -1; - - rebase->repo = repo; - rebase->inmemory = inmemory; - rebase->type = GIT_REBASE_TYPE_MERGE; - - if ((error = rebase_init_operations(rebase, repo, branch, upstream, onto)) < 0) - goto done; - - if (inmemory) - error = rebase_init_inmemory(rebase, repo, branch, upstream, onto); - else - rebase_init_merge(rebase, repo, branch ,upstream, onto); - - if (error == 0) - *out = rebase; - -done: - git_reference_free(head_ref); - git_annotated_commit_free(head_branch); - - if (error < 0) { - rebase_cleanup(rebase); - git_rebase_free(rebase); - } - - return error; -} - -static void normalize_checkout_options_for_apply( - git_checkout_options *checkout_opts, - git_rebase *rebase, - git_commit *current_commit) -{ - memcpy(checkout_opts, &rebase->options.checkout_options, sizeof(git_checkout_options)); - - if (!checkout_opts->ancestor_label) - checkout_opts->ancestor_label = "ancestor"; - - if (rebase->type == GIT_REBASE_TYPE_MERGE) { - if (!checkout_opts->our_label) - checkout_opts->our_label = rebase->onto_name; - - if (!checkout_opts->their_label) - checkout_opts->their_label = git_commit_summary(current_commit); - } else { - abort(); - } -} - -GIT_INLINE(int) rebase_movenext(git_rebase *rebase) -{ - size_t next = rebase->started ? rebase->current + 1 : 0; - - if (next == git_array_size(rebase->operations)) - return GIT_ITEROVER; - - rebase->started = 1; - rebase->current = next; - - return 0; -} - -static int rebase_next_merge( - git_rebase_operation **out, - git_rebase *rebase) -{ - git_buf path = GIT_BUF_INIT; - git_commit *current_commit = NULL, *parent_commit = NULL; - git_tree *current_tree = NULL, *head_tree = NULL, *parent_tree = NULL; - git_index *index = NULL; - git_indexwriter indexwriter = GIT_INDEXWRITER_INIT; - git_rebase_operation *operation; - git_checkout_options checkout_opts; - char current_idstr[GIT_OID_HEXSZ]; - unsigned int parent_count; - int error; - - *out = NULL; - - operation = git_array_get(rebase->operations, rebase->current); - - if ((error = git_commit_lookup(¤t_commit, rebase->repo, &operation->id)) < 0 || - (error = git_commit_tree(¤t_tree, current_commit)) < 0 || - (error = git_repository_head_tree(&head_tree, rebase->repo)) < 0) - goto done; - - if ((parent_count = git_commit_parentcount(current_commit)) > 1) { - giterr_set(GITERR_REBASE, "Cannot rebase a merge commit"); - error = -1; - goto done; - } else if (parent_count) { - if ((error = git_commit_parent(&parent_commit, current_commit, 0)) < 0 || - (error = git_commit_tree(&parent_tree, parent_commit)) < 0) - goto done; - } - - git_oid_fmt(current_idstr, &operation->id); - - normalize_checkout_options_for_apply(&checkout_opts, rebase, current_commit); - - if ((error = git_indexwriter_init_for_operation(&indexwriter, rebase->repo, &checkout_opts.checkout_strategy)) < 0 || - (error = rebase_setupfile(rebase, MSGNUM_FILE, -1, "%" PRIuZ "\n", rebase->current+1)) < 0 || - (error = rebase_setupfile(rebase, CURRENT_FILE, -1, "%.*s\n", GIT_OID_HEXSZ, current_idstr)) < 0 || - (error = git_merge_trees(&index, rebase->repo, parent_tree, head_tree, current_tree, &rebase->options.merge_options)) < 0 || - (error = git_merge__check_result(rebase->repo, index)) < 0 || - (error = git_checkout_index(rebase->repo, index, &checkout_opts)) < 0 || - (error = git_indexwriter_commit(&indexwriter)) < 0) - goto done; - - *out = operation; - -done: - git_indexwriter_cleanup(&indexwriter); - git_index_free(index); - git_tree_free(current_tree); - git_tree_free(head_tree); - git_tree_free(parent_tree); - git_commit_free(parent_commit); - git_commit_free(current_commit); - git_buf_free(&path); - - return error; -} - -static int rebase_next_inmemory( - git_rebase_operation **out, - git_rebase *rebase) -{ - git_commit *current_commit = NULL, *parent_commit = NULL; - git_tree *current_tree = NULL, *head_tree = NULL, *parent_tree = NULL; - git_rebase_operation *operation; - git_index *index = NULL; - int error; - - *out = NULL; - - operation = git_array_get(rebase->operations, rebase->current); - - if ((error = git_commit_lookup(¤t_commit, rebase->repo, &operation->id)) < 0 || - (error = git_commit_tree(¤t_tree, current_commit)) < 0 || - (error = git_commit_parent(&parent_commit, current_commit, 0)) < 0 || - (error = git_commit_tree(&parent_tree, parent_commit)) < 0 || - (error = git_commit_tree(&head_tree, rebase->last_commit)) < 0 || - (error = git_merge_trees(&index, rebase->repo, parent_tree, head_tree, current_tree, &rebase->options.merge_options)) < 0) - goto done; - - if (!rebase->index) { - rebase->index = index; - index = NULL; - } else { - if ((error = git_index_read_index(rebase->index, index)) < 0) - goto done; - } - - *out = operation; - -done: - git_commit_free(current_commit); - git_commit_free(parent_commit); - git_tree_free(current_tree); - git_tree_free(head_tree); - git_tree_free(parent_tree); - git_index_free(index); - - return error; -} - -int git_rebase_next( - git_rebase_operation **out, - git_rebase *rebase) -{ - int error; - - assert(out && rebase); - - if ((error = rebase_movenext(rebase)) < 0) - return error; - - if (rebase->inmemory) - error = rebase_next_inmemory(out, rebase); - else if (rebase->type == GIT_REBASE_TYPE_MERGE) - error = rebase_next_merge(out, rebase); - else - abort(); - - return error; -} - -int git_rebase_inmemory_index( - git_index **out, - git_rebase *rebase) -{ - assert(out && rebase && rebase->index); - - GIT_REFCOUNT_INC(rebase->index); - *out = rebase->index; - - return 0; -} - -static int rebase_commit__create( - git_commit **out, - git_rebase *rebase, - git_index *index, - git_commit *parent_commit, - const git_signature *author, - const git_signature *committer, - const char *message_encoding, - const char *message) -{ - git_rebase_operation *operation; - git_commit *current_commit = NULL, *commit = NULL; - git_tree *parent_tree = NULL, *tree = NULL; - git_oid tree_id, commit_id; - int error; - - operation = git_array_get(rebase->operations, rebase->current); - - if (git_index_has_conflicts(index)) { - giterr_set(GITERR_REBASE, "conflicts have not been resolved"); - error = GIT_EUNMERGED; - goto done; - } - - if ((error = git_commit_lookup(¤t_commit, rebase->repo, &operation->id)) < 0 || - (error = git_commit_tree(&parent_tree, parent_commit)) < 0 || - (error = git_index_write_tree_to(&tree_id, index, rebase->repo)) < 0 || - (error = git_tree_lookup(&tree, rebase->repo, &tree_id)) < 0) - goto done; - - if (git_oid_equal(&tree_id, git_tree_id(parent_tree))) { - giterr_set(GITERR_REBASE, "this patch has already been applied"); - error = GIT_EAPPLIED; - goto done; - } - - if (!author) - author = git_commit_author(current_commit); - - if (!message) { - message_encoding = git_commit_message_encoding(current_commit); - message = git_commit_message(current_commit); - } - - if ((error = git_commit_create(&commit_id, rebase->repo, NULL, author, - committer, message_encoding, message, tree, 1, - (const git_commit **)&parent_commit)) < 0 || - (error = git_commit_lookup(&commit, rebase->repo, &commit_id)) < 0) - goto done; - - *out = commit; - -done: - if (error < 0) - git_commit_free(commit); - - git_commit_free(current_commit); - git_tree_free(parent_tree); - git_tree_free(tree); - - return error; -} - -static int rebase_commit_merge( - git_oid *commit_id, - git_rebase *rebase, - const git_signature *author, - const git_signature *committer, - const char *message_encoding, - const char *message) -{ - git_rebase_operation *operation; - git_reference *head = NULL; - git_commit *head_commit = NULL, *commit = NULL; - git_index *index = NULL; - char old_idstr[GIT_OID_HEXSZ], new_idstr[GIT_OID_HEXSZ]; - int error; - - operation = git_array_get(rebase->operations, rebase->current); - assert(operation); - - if ((error = rebase_ensure_not_dirty(rebase->repo, false, true, GIT_EUNMERGED)) < 0 || - (error = git_repository_head(&head, rebase->repo)) < 0 || - (error = git_reference_peel((git_object **)&head_commit, head, GIT_OBJ_COMMIT)) < 0 || - (error = git_repository_index(&index, rebase->repo)) < 0 || - (error = rebase_commit__create(&commit, rebase, index, head_commit, - author, committer, message_encoding, message)) < 0 || - (error = git_reference__update_for_commit( - rebase->repo, NULL, "HEAD", git_commit_id(commit), "rebase")) < 0) - goto done; - - git_oid_fmt(old_idstr, &operation->id); - git_oid_fmt(new_idstr, git_commit_id(commit)); - - if ((error = rebase_setupfile(rebase, REWRITTEN_FILE, O_CREAT|O_WRONLY|O_APPEND, - "%.*s %.*s\n", GIT_OID_HEXSZ, old_idstr, GIT_OID_HEXSZ, new_idstr)) < 0) - goto done; - - git_oid_cpy(commit_id, git_commit_id(commit)); - -done: - git_index_free(index); - git_reference_free(head); - git_commit_free(head_commit); - git_commit_free(commit); - return error; -} - -static int rebase_commit_inmemory( - git_oid *commit_id, - git_rebase *rebase, - const git_signature *author, - const git_signature *committer, - const char *message_encoding, - const char *message) -{ - git_rebase_operation *operation; - git_commit *commit = NULL; - int error = 0; - - operation = git_array_get(rebase->operations, rebase->current); - - assert(operation); - assert(rebase->index); - assert(rebase->last_commit); - - if ((error = rebase_commit__create(&commit, rebase, rebase->index, - rebase->last_commit, author, committer, message_encoding, message)) < 0) - goto done; - - git_commit_free(rebase->last_commit); - rebase->last_commit = commit; - - git_oid_cpy(commit_id, git_commit_id(commit)); - -done: - if (error < 0) - git_commit_free(commit); - - return error; -} - -int git_rebase_commit( - git_oid *id, - git_rebase *rebase, - const git_signature *author, - const git_signature *committer, - const char *message_encoding, - const char *message) -{ - int error; - - assert(rebase && committer); - - if (rebase->inmemory) - error = rebase_commit_inmemory( - id, rebase, author, committer, message_encoding, message); - else if (rebase->type == GIT_REBASE_TYPE_MERGE) - error = rebase_commit_merge( - id, rebase, author, committer, message_encoding, message); - else - abort(); - - return error; -} - -int git_rebase_abort(git_rebase *rebase) -{ - git_reference *orig_head_ref = NULL; - git_commit *orig_head_commit = NULL; - int error; - - assert(rebase); - - if (rebase->inmemory) - return 0; - - error = rebase->head_detached ? - git_reference_create(&orig_head_ref, rebase->repo, GIT_HEAD_FILE, - &rebase->orig_head_id, 1, "rebase: aborting") : - git_reference_symbolic_create( - &orig_head_ref, rebase->repo, GIT_HEAD_FILE, rebase->orig_head_name, 1, - "rebase: aborting"); - - if (error < 0) - goto done; - - if ((error = git_commit_lookup( - &orig_head_commit, rebase->repo, &rebase->orig_head_id)) < 0 || - (error = git_reset(rebase->repo, (git_object *)orig_head_commit, - GIT_RESET_HARD, &rebase->options.checkout_options)) < 0) - goto done; - - error = rebase_cleanup(rebase); - -done: - git_commit_free(orig_head_commit); - git_reference_free(orig_head_ref); - - return error; -} - -static int notes_ref_lookup(git_buf *out, git_rebase *rebase) -{ - git_config *config = NULL; - int do_rewrite, error; - - if (rebase->options.rewrite_notes_ref) { - git_buf_attach_notowned(out, - rebase->options.rewrite_notes_ref, - strlen(rebase->options.rewrite_notes_ref)); - return 0; - } - - if ((error = git_repository_config(&config, rebase->repo)) < 0 || - (error = git_config_get_bool(&do_rewrite, config, "notes.rewrite.rebase")) < 0) { - - if (error != GIT_ENOTFOUND) - goto done; - - giterr_clear(); - do_rewrite = 1; - } - - error = do_rewrite ? - git_config_get_string_buf(out, config, "notes.rewriteref") : - GIT_ENOTFOUND; - -done: - git_config_free(config); - return error; -} - -static int rebase_copy_note( - git_rebase *rebase, - const char *notes_ref, - git_oid *from, - git_oid *to, - const git_signature *committer) -{ - git_note *note = NULL; - git_oid note_id; - git_signature *who = NULL; - int error; - - if ((error = git_note_read(¬e, rebase->repo, notes_ref, from)) < 0) { - if (error == GIT_ENOTFOUND) { - giterr_clear(); - error = 0; - } - - goto done; - } - - if (!committer) { - if((error = git_signature_default(&who, rebase->repo)) < 0) { - if (error != GIT_ENOTFOUND || - (error = git_signature_now(&who, "unknown", "unknown")) < 0) - goto done; - - giterr_clear(); - } - - committer = who; - } - - error = git_note_create(¬e_id, rebase->repo, notes_ref, - git_note_author(note), committer, to, git_note_message(note), 0); - -done: - git_note_free(note); - git_signature_free(who); - - return error; -} - -static int rebase_copy_notes( - git_rebase *rebase, - const git_signature *committer) -{ - git_buf path = GIT_BUF_INIT, rewritten = GIT_BUF_INIT, notes_ref = GIT_BUF_INIT; - char *pair_list, *fromstr, *tostr, *end; - git_oid from, to; - unsigned int linenum = 1; - int error = 0; - - if ((error = notes_ref_lookup(¬es_ref, rebase)) < 0) { - if (error == GIT_ENOTFOUND) { - giterr_clear(); - error = 0; - } - - goto done; - } - - if ((error = git_buf_joinpath(&path, rebase->state_path, REWRITTEN_FILE)) < 0 || - (error = git_futils_readbuffer(&rewritten, path.ptr)) < 0) - goto done; - - pair_list = rewritten.ptr; - - while (*pair_list) { - fromstr = pair_list; - - if ((end = strchr(fromstr, '\n')) == NULL) - goto on_error; - - pair_list = end+1; - *end = '\0'; - - if ((end = strchr(fromstr, ' ')) == NULL) - goto on_error; - - tostr = end+1; - *end = '\0'; - - if (strlen(fromstr) != GIT_OID_HEXSZ || - strlen(tostr) != GIT_OID_HEXSZ || - git_oid_fromstr(&from, fromstr) < 0 || - git_oid_fromstr(&to, tostr) < 0) - goto on_error; - - if ((error = rebase_copy_note(rebase, notes_ref.ptr, &from, &to, committer)) < 0) - goto done; - - linenum++; - } - - goto done; - -on_error: - giterr_set(GITERR_REBASE, "Invalid rewritten file at line %d", linenum); - error = -1; - -done: - git_buf_free(&rewritten); - git_buf_free(&path); - git_buf_free(¬es_ref); - - return error; -} - -int git_rebase_finish( - git_rebase *rebase, - const git_signature *signature) -{ - git_reference *terminal_ref = NULL, *branch_ref = NULL, *head_ref = NULL; - git_commit *terminal_commit = NULL; - git_buf branch_msg = GIT_BUF_INIT, head_msg = GIT_BUF_INIT; - char onto[GIT_OID_HEXSZ]; - int error; - - assert(rebase); - - if (rebase->inmemory) - return 0; - - git_oid_fmt(onto, &rebase->onto_id); - - if ((error = git_buf_printf(&branch_msg, "rebase finished: %s onto %.*s", - rebase->orig_head_name, GIT_OID_HEXSZ, onto)) < 0 || - (error = git_buf_printf(&head_msg, "rebase finished: returning to %s", - rebase->orig_head_name)) < 0 || - (error = git_repository_head(&terminal_ref, rebase->repo)) < 0 || - (error = git_reference_peel((git_object **)&terminal_commit, - terminal_ref, GIT_OBJ_COMMIT)) < 0 || - (error = git_reference_create_matching(&branch_ref, - rebase->repo, rebase->orig_head_name, git_commit_id(terminal_commit), 1, - &rebase->orig_head_id, branch_msg.ptr)) < 0 || - (error = git_reference_symbolic_create(&head_ref, - rebase->repo, GIT_HEAD_FILE, rebase->orig_head_name, 1, - head_msg.ptr)) < 0 || - (error = rebase_copy_notes(rebase, signature)) < 0) - goto done; - - error = rebase_cleanup(rebase); - -done: - git_buf_free(&head_msg); - git_buf_free(&branch_msg); - git_commit_free(terminal_commit); - git_reference_free(head_ref); - git_reference_free(branch_ref); - git_reference_free(terminal_ref); - - return error; -} - -size_t git_rebase_operation_entrycount(git_rebase *rebase) -{ - assert(rebase); - - return git_array_size(rebase->operations); -} - -size_t git_rebase_operation_current(git_rebase *rebase) -{ - assert(rebase); - - return rebase->started ? rebase->current : GIT_REBASE_NO_OPERATION; -} - -git_rebase_operation *git_rebase_operation_byindex(git_rebase *rebase, size_t idx) -{ - assert(rebase); - - return git_array_get(rebase->operations, idx); -} - -void git_rebase_free(git_rebase *rebase) -{ - if (rebase == NULL) - return; - - git_index_free(rebase->index); - git_commit_free(rebase->last_commit); - git__free(rebase->onto_name); - git__free(rebase->orig_head_name); - git__free(rebase->state_path); - git_array_clear(rebase->operations); - git__free((char *)rebase->options.rewrite_notes_ref); - git__free(rebase); -} diff --git a/vendor/libgit2/src/refdb.c b/vendor/libgit2/src/refdb.c deleted file mode 100644 index debba1276..000000000 --- a/vendor/libgit2/src/refdb.c +++ /dev/null @@ -1,259 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "common.h" -#include "posix.h" - -#include "git2/object.h" -#include "git2/refs.h" -#include "git2/refdb.h" -#include "git2/sys/refdb_backend.h" - -#include "hash.h" -#include "refdb.h" -#include "refs.h" -#include "reflog.h" - -int git_refdb_new(git_refdb **out, git_repository *repo) -{ - git_refdb *db; - - assert(out && repo); - - db = git__calloc(1, sizeof(*db)); - GITERR_CHECK_ALLOC(db); - - db->repo = repo; - - *out = db; - GIT_REFCOUNT_INC(db); - return 0; -} - -int git_refdb_open(git_refdb **out, git_repository *repo) -{ - git_refdb *db; - git_refdb_backend *dir; - - assert(out && repo); - - *out = NULL; - - if (git_refdb_new(&db, repo) < 0) - return -1; - - /* Add the default (filesystem) backend */ - if (git_refdb_backend_fs(&dir, repo) < 0) { - git_refdb_free(db); - return -1; - } - - db->repo = repo; - db->backend = dir; - - *out = db; - return 0; -} - -static void refdb_free_backend(git_refdb *db) -{ - if (db->backend) - db->backend->free(db->backend); -} - -int git_refdb_set_backend(git_refdb *db, git_refdb_backend *backend) -{ - refdb_free_backend(db); - db->backend = backend; - - return 0; -} - -int git_refdb_compress(git_refdb *db) -{ - assert(db); - - if (db->backend->compress) - return db->backend->compress(db->backend); - - return 0; -} - -void git_refdb__free(git_refdb *db) -{ - refdb_free_backend(db); - git__memzero(db, sizeof(*db)); - git__free(db); -} - -void git_refdb_free(git_refdb *db) -{ - if (db == NULL) - return; - - GIT_REFCOUNT_DEC(db, git_refdb__free); -} - -int git_refdb_exists(int *exists, git_refdb *refdb, const char *ref_name) -{ - assert(exists && refdb && refdb->backend); - - return refdb->backend->exists(exists, refdb->backend, ref_name); -} - -int git_refdb_lookup(git_reference **out, git_refdb *db, const char *ref_name) -{ - git_reference *ref; - int error; - - assert(db && db->backend && out && ref_name); - - error = db->backend->lookup(&ref, db->backend, ref_name); - if (error < 0) - return error; - - GIT_REFCOUNT_INC(db); - ref->db = db; - - *out = ref; - return 0; -} - -int git_refdb_iterator(git_reference_iterator **out, git_refdb *db, const char *glob) -{ - if (!db->backend || !db->backend->iterator) { - giterr_set(GITERR_REFERENCE, "This backend doesn't support iterators"); - return -1; - } - - if (db->backend->iterator(out, db->backend, glob) < 0) - return -1; - - GIT_REFCOUNT_INC(db); - (*out)->db = db; - - return 0; -} - -int git_refdb_iterator_next(git_reference **out, git_reference_iterator *iter) -{ - int error; - - if ((error = iter->next(out, iter)) < 0) - return error; - - GIT_REFCOUNT_INC(iter->db); - (*out)->db = iter->db; - - return 0; -} - -int git_refdb_iterator_next_name(const char **out, git_reference_iterator *iter) -{ - return iter->next_name(out, iter); -} - -void git_refdb_iterator_free(git_reference_iterator *iter) -{ - GIT_REFCOUNT_DEC(iter->db, git_refdb__free); - iter->free(iter); -} - -int git_refdb_write(git_refdb *db, git_reference *ref, int force, const git_signature *who, const char *message, const git_oid *old_id, const char *old_target) -{ - assert(db && db->backend); - - GIT_REFCOUNT_INC(db); - ref->db = db; - - return db->backend->write(db->backend, ref, force, who, message, old_id, old_target); -} - -int git_refdb_rename( - git_reference **out, - git_refdb *db, - const char *old_name, - const char *new_name, - int force, - const git_signature *who, - const char *message) -{ - int error; - - assert(db && db->backend); - error = db->backend->rename(out, db->backend, old_name, new_name, force, who, message); - if (error < 0) - return error; - - if (out) { - GIT_REFCOUNT_INC(db); - (*out)->db = db; - } - - return 0; -} - -int git_refdb_delete(struct git_refdb *db, const char *ref_name, const git_oid *old_id, const char *old_target) -{ - assert(db && db->backend); - return db->backend->del(db->backend, ref_name, old_id, old_target); -} - -int git_refdb_reflog_read(git_reflog **out, git_refdb *db, const char *name) -{ - int error; - - assert(db && db->backend); - - if ((error = db->backend->reflog_read(out, db->backend, name)) < 0) - return error; - - GIT_REFCOUNT_INC(db); - (*out)->db = db; - - return 0; -} - -int git_refdb_has_log(git_refdb *db, const char *refname) -{ - assert(db && refname); - - return db->backend->has_log(db->backend, refname); -} - -int git_refdb_ensure_log(git_refdb *db, const char *refname) -{ - assert(db && refname); - - return db->backend->ensure_log(db->backend, refname); -} - -int git_refdb_init_backend(git_refdb_backend *backend, unsigned int version) -{ - GIT_INIT_STRUCTURE_FROM_TEMPLATE( - backend, version, git_refdb_backend, GIT_REFDB_BACKEND_INIT); - return 0; -} - -int git_refdb_lock(void **payload, git_refdb *db, const char *refname) -{ - assert(payload && db && refname); - - if (!db->backend->lock) { - giterr_set(GITERR_REFERENCE, "backend does not support locking"); - return -1; - } - - return db->backend->lock(payload, db->backend, refname); -} - -int git_refdb_unlock(git_refdb *db, void *payload, int success, int update_reflog, const git_reference *ref, const git_signature *sig, const char *message) -{ - assert(db); - - return db->backend->unlock(db->backend, payload, success, update_reflog, ref, sig, message); -} diff --git a/vendor/libgit2/src/refdb.h b/vendor/libgit2/src/refdb.h deleted file mode 100644 index 4ee3b8065..000000000 --- a/vendor/libgit2/src/refdb.h +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_refdb_h__ -#define INCLUDE_refdb_h__ - -#include "git2/refdb.h" -#include "repository.h" - -struct git_refdb { - git_refcount rc; - git_repository *repo; - git_refdb_backend *backend; -}; - -void git_refdb__free(git_refdb *db); - -int git_refdb_exists( - int *exists, - git_refdb *refdb, - const char *ref_name); - -int git_refdb_lookup( - git_reference **out, - git_refdb *refdb, - const char *ref_name); - -int git_refdb_rename( - git_reference **out, - git_refdb *db, - const char *old_name, - const char *new_name, - int force, - const git_signature *who, - const char *message); - -int git_refdb_iterator(git_reference_iterator **out, git_refdb *db, const char *glob); -int git_refdb_iterator_next(git_reference **out, git_reference_iterator *iter); -int git_refdb_iterator_next_name(const char **out, git_reference_iterator *iter); -void git_refdb_iterator_free(git_reference_iterator *iter); - -int git_refdb_write(git_refdb *refdb, git_reference *ref, int force, const git_signature *who, const char *message, const git_oid *old_id, const char *old_target); -int git_refdb_delete(git_refdb *refdb, const char *ref_name, const git_oid *old_id, const char *old_target); - -int git_refdb_reflog_read(git_reflog **out, git_refdb *db, const char *name); -int git_refdb_reflog_write(git_reflog *reflog); - -int git_refdb_has_log(git_refdb *db, const char *refname); -int git_refdb_ensure_log(git_refdb *refdb, const char *refname); - -int git_refdb_lock(void **payload, git_refdb *db, const char *refname); -int git_refdb_unlock(git_refdb *db, void *payload, int success, int update_reflog, const git_reference *ref, const git_signature *sig, const char *message); - -#endif diff --git a/vendor/libgit2/src/refdb_fs.c b/vendor/libgit2/src/refdb_fs.c deleted file mode 100644 index f978038e6..000000000 --- a/vendor/libgit2/src/refdb_fs.c +++ /dev/null @@ -1,1978 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "refs.h" -#include "hash.h" -#include "repository.h" -#include "fileops.h" -#include "filebuf.h" -#include "pack.h" -#include "reflog.h" -#include "refdb.h" -#include "refdb_fs.h" -#include "iterator.h" -#include "sortedcache.h" -#include "signature.h" - -#include -#include -#include -#include -#include -#include -#include - -GIT__USE_STRMAP - -#define DEFAULT_NESTING_LEVEL 5 -#define MAX_NESTING_LEVEL 10 - -enum { - PACKREF_HAS_PEEL = 1, - PACKREF_WAS_LOOSE = 2, - PACKREF_CANNOT_PEEL = 4, - PACKREF_SHADOWED = 8, -}; - -enum { - PEELING_NONE = 0, - PEELING_STANDARD, - PEELING_FULL -}; - -struct packref { - git_oid oid; - git_oid peel; - char flags; - char name[GIT_FLEX_ARRAY]; -}; - -typedef struct refdb_fs_backend { - git_refdb_backend parent; - - git_repository *repo; - char *path; - - git_sortedcache *refcache; - int peeling_mode; - git_iterator_flag_t iterator_flags; - uint32_t direach_flags; -} refdb_fs_backend; - -static int refdb_reflog_fs__delete(git_refdb_backend *_backend, const char *name); - -static int packref_cmp(const void *a_, const void *b_) -{ - const struct packref *a = a_, *b = b_; - return strcmp(a->name, b->name); -} - -static int packed_reload(refdb_fs_backend *backend) -{ - int error; - git_buf packedrefs = GIT_BUF_INIT; - char *scan, *eof, *eol; - - if (!backend->path) - return 0; - - error = git_sortedcache_lockandload(backend->refcache, &packedrefs); - - /* - * If we can't find the packed-refs, clear table and return. - * Any other error just gets passed through. - * If no error, and file wasn't changed, just return. - * Anything else means we need to refresh the packed refs. - */ - if (error <= 0) { - if (error == GIT_ENOTFOUND) { - git_sortedcache_clear(backend->refcache, true); - giterr_clear(); - error = 0; - } - return error; - } - - /* At this point, refresh the packed refs from the loaded buffer. */ - - git_sortedcache_clear(backend->refcache, false); - - scan = (char *)packedrefs.ptr; - eof = scan + packedrefs.size; - - backend->peeling_mode = PEELING_NONE; - - if (*scan == '#') { - static const char *traits_header = "# pack-refs with: "; - - if (git__prefixcmp(scan, traits_header) == 0) { - scan += strlen(traits_header); - eol = strchr(scan, '\n'); - - if (!eol) - goto parse_failed; - *eol = '\0'; - - if (strstr(scan, " fully-peeled ") != NULL) { - backend->peeling_mode = PEELING_FULL; - } else if (strstr(scan, " peeled ") != NULL) { - backend->peeling_mode = PEELING_STANDARD; - } - - scan = eol + 1; - } - } - - while (scan < eof && *scan == '#') { - if (!(eol = strchr(scan, '\n'))) - goto parse_failed; - scan = eol + 1; - } - - while (scan < eof) { - struct packref *ref; - git_oid oid; - - /* parse " \n" */ - - if (git_oid_fromstr(&oid, scan) < 0) - goto parse_failed; - scan += GIT_OID_HEXSZ; - - if (*scan++ != ' ') - goto parse_failed; - if (!(eol = strchr(scan, '\n'))) - goto parse_failed; - *eol = '\0'; - if (eol[-1] == '\r') - eol[-1] = '\0'; - - if (git_sortedcache_upsert((void **)&ref, backend->refcache, scan) < 0) - goto parse_failed; - scan = eol + 1; - - git_oid_cpy(&ref->oid, &oid); - - /* look for optional "^\n" */ - - if (*scan == '^') { - if (git_oid_fromstr(&oid, scan + 1) < 0) - goto parse_failed; - scan += GIT_OID_HEXSZ + 1; - - if (scan < eof) { - if (!(eol = strchr(scan, '\n'))) - goto parse_failed; - scan = eol + 1; - } - - git_oid_cpy(&ref->peel, &oid); - ref->flags |= PACKREF_HAS_PEEL; - } - else if (backend->peeling_mode == PEELING_FULL || - (backend->peeling_mode == PEELING_STANDARD && - git__prefixcmp(ref->name, GIT_REFS_TAGS_DIR) == 0)) - ref->flags |= PACKREF_CANNOT_PEEL; - } - - git_sortedcache_wunlock(backend->refcache); - git_buf_free(&packedrefs); - - return 0; - -parse_failed: - giterr_set(GITERR_REFERENCE, "Corrupted packed references file"); - - git_sortedcache_clear(backend->refcache, false); - git_sortedcache_wunlock(backend->refcache); - git_buf_free(&packedrefs); - - return -1; -} - -static int loose_parse_oid( - git_oid *oid, const char *filename, git_buf *file_content) -{ - const char *str = git_buf_cstr(file_content); - - if (git_buf_len(file_content) < GIT_OID_HEXSZ) - goto corrupted; - - /* we need to get 40 OID characters from the file */ - if (git_oid_fromstr(oid, str) < 0) - goto corrupted; - - /* If the file is longer than 40 chars, the 41st must be a space */ - str += GIT_OID_HEXSZ; - if (*str == '\0' || git__isspace(*str)) - return 0; - -corrupted: - giterr_set(GITERR_REFERENCE, "Corrupted loose reference file: %s", filename); - return -1; -} - -static int loose_readbuffer(git_buf *buf, const char *base, const char *path) -{ - int error; - - /* build full path to file */ - if ((error = git_buf_joinpath(buf, base, path)) < 0 || - (error = git_futils_readbuffer(buf, buf->ptr)) < 0) - git_buf_free(buf); - - return error; -} - -static int loose_lookup_to_packfile(refdb_fs_backend *backend, const char *name) -{ - int error = 0; - git_buf ref_file = GIT_BUF_INIT; - struct packref *ref = NULL; - git_oid oid; - - /* if we fail to load the loose reference, assume someone changed - * the filesystem under us and skip it... - */ - if (loose_readbuffer(&ref_file, backend->path, name) < 0) { - giterr_clear(); - goto done; - } - - /* skip symbolic refs */ - if (!git__prefixcmp(git_buf_cstr(&ref_file), GIT_SYMREF)) - goto done; - - /* parse OID from file */ - if ((error = loose_parse_oid(&oid, name, &ref_file)) < 0) - goto done; - - git_sortedcache_wlock(backend->refcache); - - if (!(error = git_sortedcache_upsert( - (void **)&ref, backend->refcache, name))) { - - git_oid_cpy(&ref->oid, &oid); - ref->flags = PACKREF_WAS_LOOSE; - } - - git_sortedcache_wunlock(backend->refcache); - -done: - git_buf_free(&ref_file); - return error; -} - -static int _dirent_loose_load(void *payload, git_buf *full_path) -{ - refdb_fs_backend *backend = payload; - const char *file_path; - - if (git__suffixcmp(full_path->ptr, ".lock") == 0) - return 0; - - if (git_path_isdir(full_path->ptr)) { - int error = git_path_direach( - full_path, backend->direach_flags, _dirent_loose_load, backend); - /* Race with the filesystem, ignore it */ - if (error == GIT_ENOTFOUND) { - giterr_clear(); - return 0; - } - - return error; - } - - file_path = full_path->ptr + strlen(backend->path); - - return loose_lookup_to_packfile(backend, file_path); -} - -/* - * Load all the loose references from the repository - * into the in-memory Packfile, and build a vector with - * all the references so it can be written back to - * disk. - */ -static int packed_loadloose(refdb_fs_backend *backend) -{ - int error; - git_buf refs_path = GIT_BUF_INIT; - - if (git_buf_joinpath(&refs_path, backend->path, GIT_REFS_DIR) < 0) - return -1; - - /* - * Load all the loose files from disk into the Packfile table. - * This will overwrite any old packed entries with their - * updated loose versions - */ - error = git_path_direach( - &refs_path, backend->direach_flags, _dirent_loose_load, backend); - - git_buf_free(&refs_path); - - return error; -} - -static int refdb_fs_backend__exists( - int *exists, - git_refdb_backend *_backend, - const char *ref_name) -{ - refdb_fs_backend *backend = (refdb_fs_backend *)_backend; - git_buf ref_path = GIT_BUF_INIT; - - assert(backend); - - if (packed_reload(backend) < 0 || - git_buf_joinpath(&ref_path, backend->path, ref_name) < 0) - return -1; - - *exists = git_path_isfile(ref_path.ptr) || - (git_sortedcache_lookup(backend->refcache, ref_name) != NULL); - - git_buf_free(&ref_path); - return 0; -} - -static const char *loose_parse_symbolic(git_buf *file_content) -{ - const unsigned int header_len = (unsigned int)strlen(GIT_SYMREF); - const char *refname_start; - - refname_start = (const char *)file_content->ptr; - - if (git_buf_len(file_content) < header_len + 1) { - giterr_set(GITERR_REFERENCE, "Corrupted loose reference file"); - return NULL; - } - - /* - * Assume we have already checked for the header - * before calling this function - */ - refname_start += header_len; - - return refname_start; -} - -static int loose_lookup( - git_reference **out, - refdb_fs_backend *backend, - const char *ref_name) -{ - git_buf ref_file = GIT_BUF_INIT; - int error = 0; - - if (out) - *out = NULL; - - if ((error = loose_readbuffer(&ref_file, backend->path, ref_name)) < 0) - /* cannot read loose ref file - gah */; - else if (git__prefixcmp(git_buf_cstr(&ref_file), GIT_SYMREF) == 0) { - const char *target; - - git_buf_rtrim(&ref_file); - - if (!(target = loose_parse_symbolic(&ref_file))) - error = -1; - else if (out != NULL) - *out = git_reference__alloc_symbolic(ref_name, target); - } else { - git_oid oid; - - if (!(error = loose_parse_oid(&oid, ref_name, &ref_file)) && - out != NULL) - *out = git_reference__alloc(ref_name, &oid, NULL); - } - - git_buf_free(&ref_file); - return error; -} - -static int ref_error_notfound(const char *name) -{ - giterr_set(GITERR_REFERENCE, "Reference '%s' not found", name); - return GIT_ENOTFOUND; -} - -static int packed_lookup( - git_reference **out, - refdb_fs_backend *backend, - const char *ref_name) -{ - int error = 0; - struct packref *entry; - - if (packed_reload(backend) < 0) - return -1; - - if (git_sortedcache_rlock(backend->refcache) < 0) - return -1; - - entry = git_sortedcache_lookup(backend->refcache, ref_name); - if (!entry) { - error = ref_error_notfound(ref_name); - } else { - *out = git_reference__alloc(ref_name, &entry->oid, &entry->peel); - if (!*out) - error = -1; - } - - git_sortedcache_runlock(backend->refcache); - - return error; -} - -static int refdb_fs_backend__lookup( - git_reference **out, - git_refdb_backend *_backend, - const char *ref_name) -{ - refdb_fs_backend *backend = (refdb_fs_backend *)_backend; - int error; - - assert(backend); - - if (!(error = loose_lookup(out, backend, ref_name))) - return 0; - - /* only try to lookup this reference on the packfile if it - * wasn't found on the loose refs; not if there was a critical error */ - if (error == GIT_ENOTFOUND) { - giterr_clear(); - error = packed_lookup(out, backend, ref_name); - } - - return error; -} - -typedef struct { - git_reference_iterator parent; - - char *glob; - - git_pool pool; - git_vector loose; - - git_sortedcache *cache; - size_t loose_pos; - size_t packed_pos; -} refdb_fs_iter; - -static void refdb_fs_backend__iterator_free(git_reference_iterator *_iter) -{ - refdb_fs_iter *iter = (refdb_fs_iter *) _iter; - - git_vector_free(&iter->loose); - git_pool_clear(&iter->pool); - git_sortedcache_free(iter->cache); - git__free(iter); -} - -static int iter_load_loose_paths(refdb_fs_backend *backend, refdb_fs_iter *iter) -{ - int error = 0; - git_buf path = GIT_BUF_INIT; - git_iterator *fsit = NULL; - git_iterator_options fsit_opts = GIT_ITERATOR_OPTIONS_INIT; - const git_index_entry *entry = NULL; - - if (!backend->path) /* do nothing if no path for loose refs */ - return 0; - - fsit_opts.flags = backend->iterator_flags; - - if ((error = git_buf_printf(&path, "%s/refs", backend->path)) < 0 || - (error = git_iterator_for_filesystem(&fsit, path.ptr, &fsit_opts)) < 0) { - git_buf_free(&path); - return error; - } - - error = git_buf_sets(&path, GIT_REFS_DIR); - - while (!error && !git_iterator_advance(&entry, fsit)) { - const char *ref_name; - struct packref *ref; - char *ref_dup; - - git_buf_truncate(&path, strlen(GIT_REFS_DIR)); - git_buf_puts(&path, entry->path); - ref_name = git_buf_cstr(&path); - - if (git__suffixcmp(ref_name, ".lock") == 0 || - (iter->glob && p_fnmatch(iter->glob, ref_name, 0) != 0)) - continue; - - git_sortedcache_rlock(backend->refcache); - ref = git_sortedcache_lookup(backend->refcache, ref_name); - if (ref) - ref->flags |= PACKREF_SHADOWED; - git_sortedcache_runlock(backend->refcache); - - ref_dup = git_pool_strdup(&iter->pool, ref_name); - if (!ref_dup) - error = -1; - else - error = git_vector_insert(&iter->loose, ref_dup); - } - - git_iterator_free(fsit); - git_buf_free(&path); - - return error; -} - -static int refdb_fs_backend__iterator_next( - git_reference **out, git_reference_iterator *_iter) -{ - int error = GIT_ITEROVER; - refdb_fs_iter *iter = (refdb_fs_iter *)_iter; - refdb_fs_backend *backend = (refdb_fs_backend *)iter->parent.db->backend; - struct packref *ref; - - while (iter->loose_pos < iter->loose.length) { - const char *path = git_vector_get(&iter->loose, iter->loose_pos++); - - if (loose_lookup(out, backend, path) == 0) - return 0; - - giterr_clear(); - } - - if (!iter->cache) { - if ((error = git_sortedcache_copy(&iter->cache, backend->refcache, 1, NULL, NULL)) < 0) - return error; - } - - error = GIT_ITEROVER; - while (iter->packed_pos < git_sortedcache_entrycount(iter->cache)) { - ref = git_sortedcache_entry(iter->cache, iter->packed_pos++); - if (!ref) /* stop now if another thread deleted refs and we past end */ - break; - - if (ref->flags & PACKREF_SHADOWED) - continue; - if (iter->glob && p_fnmatch(iter->glob, ref->name, 0) != 0) - continue; - - *out = git_reference__alloc(ref->name, &ref->oid, &ref->peel); - error = (*out != NULL) ? 0 : -1; - break; - } - - return error; -} - -static int refdb_fs_backend__iterator_next_name( - const char **out, git_reference_iterator *_iter) -{ - int error = GIT_ITEROVER; - refdb_fs_iter *iter = (refdb_fs_iter *)_iter; - refdb_fs_backend *backend = (refdb_fs_backend *)iter->parent.db->backend; - struct packref *ref; - - while (iter->loose_pos < iter->loose.length) { - const char *path = git_vector_get(&iter->loose, iter->loose_pos++); - - if (loose_lookup(NULL, backend, path) == 0) { - *out = path; - return 0; - } - - giterr_clear(); - } - - if (!iter->cache) { - if ((error = git_sortedcache_copy(&iter->cache, backend->refcache, 1, NULL, NULL)) < 0) - return error; - } - - error = GIT_ITEROVER; - while (iter->packed_pos < git_sortedcache_entrycount(iter->cache)) { - ref = git_sortedcache_entry(iter->cache, iter->packed_pos++); - if (!ref) /* stop now if another thread deleted refs and we past end */ - break; - - if (ref->flags & PACKREF_SHADOWED) - continue; - if (iter->glob && p_fnmatch(iter->glob, ref->name, 0) != 0) - continue; - - *out = ref->name; - error = 0; - break; - } - - return error; -} - -static int refdb_fs_backend__iterator( - git_reference_iterator **out, git_refdb_backend *_backend, const char *glob) -{ - refdb_fs_iter *iter; - refdb_fs_backend *backend = (refdb_fs_backend *)_backend; - - assert(backend); - - if (packed_reload(backend) < 0) - return -1; - - iter = git__calloc(1, sizeof(refdb_fs_iter)); - GITERR_CHECK_ALLOC(iter); - - git_pool_init(&iter->pool, 1); - - if (git_vector_init(&iter->loose, 8, NULL) < 0) - goto fail; - - if (glob != NULL && - (iter->glob = git_pool_strdup(&iter->pool, glob)) == NULL) - goto fail; - - iter->parent.next = refdb_fs_backend__iterator_next; - iter->parent.next_name = refdb_fs_backend__iterator_next_name; - iter->parent.free = refdb_fs_backend__iterator_free; - - if (iter_load_loose_paths(backend, iter) < 0) - goto fail; - - *out = (git_reference_iterator *)iter; - return 0; - -fail: - refdb_fs_backend__iterator_free((git_reference_iterator *)iter); - return -1; -} - -static bool ref_is_available( - const char *old_ref, const char *new_ref, const char *this_ref) -{ - if (old_ref == NULL || strcmp(old_ref, this_ref)) { - size_t reflen = strlen(this_ref); - size_t newlen = strlen(new_ref); - size_t cmplen = reflen < newlen ? reflen : newlen; - const char *lead = reflen < newlen ? new_ref : this_ref; - - if (!strncmp(new_ref, this_ref, cmplen) && lead[cmplen] == '/') { - return false; - } - } - - return true; -} - -static int reference_path_available( - refdb_fs_backend *backend, - const char *new_ref, - const char* old_ref, - int force) -{ - size_t i; - - if (packed_reload(backend) < 0) - return -1; - - if (!force) { - int exists; - - if (refdb_fs_backend__exists( - &exists, (git_refdb_backend *)backend, new_ref) < 0) - return -1; - - if (exists) { - giterr_set(GITERR_REFERENCE, - "Failed to write reference '%s': a reference with " - "that name already exists.", new_ref); - return GIT_EEXISTS; - } - } - - git_sortedcache_rlock(backend->refcache); - - for (i = 0; i < git_sortedcache_entrycount(backend->refcache); ++i) { - struct packref *ref = git_sortedcache_entry(backend->refcache, i); - - if (ref && !ref_is_available(old_ref, new_ref, ref->name)) { - git_sortedcache_runlock(backend->refcache); - giterr_set(GITERR_REFERENCE, - "Path to reference '%s' collides with existing one", new_ref); - return -1; - } - } - - git_sortedcache_runlock(backend->refcache); - return 0; -} - -static int loose_lock(git_filebuf *file, refdb_fs_backend *backend, const char *name) -{ - int error; - git_buf ref_path = GIT_BUF_INIT; - - assert(file && backend && name); - - if (!git_path_isvalid(backend->repo, name, GIT_PATH_REJECT_FILESYSTEM_DEFAULTS)) { - giterr_set(GITERR_INVALID, "Invalid reference name '%s'.", name); - return GIT_EINVALIDSPEC; - } - - /* Remove a possibly existing empty directory hierarchy - * which name would collide with the reference name - */ - if (git_futils_rmdir_r(name, backend->path, GIT_RMDIR_SKIP_NONEMPTY) < 0) - return -1; - - if (git_buf_joinpath(&ref_path, backend->path, name) < 0) - return -1; - - error = git_filebuf_open(file, ref_path.ptr, GIT_FILEBUF_FORCE, GIT_REFS_FILE_MODE); - - if (error == GIT_EDIRECTORY) - giterr_set(GITERR_REFERENCE, "cannot lock ref '%s', there are refs beneath that folder", name); - - git_buf_free(&ref_path); - return error; -} - -static int loose_commit(git_filebuf *file, const git_reference *ref) -{ - assert(file && ref); - - if (ref->type == GIT_REF_OID) { - char oid[GIT_OID_HEXSZ + 1]; - git_oid_nfmt(oid, sizeof(oid), &ref->target.oid); - - git_filebuf_printf(file, "%s\n", oid); - } else if (ref->type == GIT_REF_SYMBOLIC) { - git_filebuf_printf(file, GIT_SYMREF "%s\n", ref->target.symbolic); - } else { - assert(0); /* don't let this happen */ - } - - return git_filebuf_commit(file); -} - -static int refdb_fs_backend__lock(void **out, git_refdb_backend *_backend, const char *refname) -{ - int error; - git_filebuf *lock; - refdb_fs_backend *backend = (refdb_fs_backend *) _backend; - - lock = git__calloc(1, sizeof(git_filebuf)); - GITERR_CHECK_ALLOC(lock); - - if ((error = loose_lock(lock, backend, refname)) < 0) { - git__free(lock); - return error; - } - - *out = lock; - return 0; -} - -static int refdb_fs_backend__write_tail( - git_refdb_backend *_backend, - const git_reference *ref, - git_filebuf *file, - int update_reflog, - const git_signature *who, - const char *message, - const git_oid *old_id, - const char *old_target); - -static int refdb_fs_backend__delete_tail( - git_refdb_backend *_backend, - git_filebuf *file, - const char *ref_name, - const git_oid *old_id, const char *old_target); - -static int refdb_fs_backend__unlock(git_refdb_backend *backend, void *payload, int success, int update_reflog, - const git_reference *ref, const git_signature *sig, const char *message) -{ - git_filebuf *lock = (git_filebuf *) payload; - int error = 0; - - if (success == 2) - error = refdb_fs_backend__delete_tail(backend, lock, ref->name, NULL, NULL); - else if (success) - error = refdb_fs_backend__write_tail(backend, ref, lock, update_reflog, sig, message, NULL, NULL); - else - git_filebuf_cleanup(lock); - - git__free(lock); - return error; -} - -/* - * Find out what object this reference resolves to. - * - * For references that point to a 'big' tag (e.g. an - * actual tag object on the repository), we need to - * cache on the packfile the OID of the object to - * which that 'big tag' is pointing to. - */ -static int packed_find_peel(refdb_fs_backend *backend, struct packref *ref) -{ - git_object *object; - - if (ref->flags & PACKREF_HAS_PEEL || ref->flags & PACKREF_CANNOT_PEEL) - return 0; - - /* - * Find the tagged object in the repository - */ - if (git_object_lookup(&object, backend->repo, &ref->oid, GIT_OBJ_ANY) < 0) - return -1; - - /* - * If the tagged object is a Tag object, we need to resolve it; - * if the ref is actually a 'weak' ref, we don't need to resolve - * anything. - */ - if (git_object_type(object) == GIT_OBJ_TAG) { - git_tag *tag = (git_tag *)object; - - /* - * Find the object pointed at by this tag - */ - git_oid_cpy(&ref->peel, git_tag_target_id(tag)); - ref->flags |= PACKREF_HAS_PEEL; - - /* - * The reference has now cached the resolved OID, and is - * marked at such. When written to the packfile, it'll be - * accompanied by this resolved oid - */ - } - - git_object_free(object); - return 0; -} - -/* - * Write a single reference into a packfile - */ -static int packed_write_ref(struct packref *ref, git_filebuf *file) -{ - char oid[GIT_OID_HEXSZ + 1]; - git_oid_nfmt(oid, sizeof(oid), &ref->oid); - - /* - * For references that peel to an object in the repo, we must - * write the resulting peel on a separate line, e.g. - * - * 6fa8a902cc1d18527e1355773c86721945475d37 refs/tags/libgit2-0.4 - * ^2ec0cb7959b0bf965d54f95453f5b4b34e8d3100 - * - * This obviously only applies to tags. - * The required peels have already been loaded into `ref->peel_target`. - */ - if (ref->flags & PACKREF_HAS_PEEL) { - char peel[GIT_OID_HEXSZ + 1]; - git_oid_nfmt(peel, sizeof(peel), &ref->peel); - - if (git_filebuf_printf(file, "%s %s\n^%s\n", oid, ref->name, peel) < 0) - return -1; - } else { - if (git_filebuf_printf(file, "%s %s\n", oid, ref->name) < 0) - return -1; - } - - return 0; -} - -/* - * Remove all loose references - * - * Once we have successfully written a packfile, - * all the loose references that were packed must be - * removed from disk. - * - * This is a dangerous method; make sure the packfile - * is well-written, because we are destructing references - * here otherwise. - */ -static int packed_remove_loose(refdb_fs_backend *backend) -{ - size_t i; - git_buf full_path = GIT_BUF_INIT; - int failed = 0; - - /* backend->refcache is already locked when this is called */ - - for (i = 0; i < git_sortedcache_entrycount(backend->refcache); ++i) { - struct packref *ref = git_sortedcache_entry(backend->refcache, i); - - if (!ref || !(ref->flags & PACKREF_WAS_LOOSE)) - continue; - - if (git_buf_joinpath(&full_path, backend->path, ref->name) < 0) - return -1; /* critical; do not try to recover on oom */ - - if (git_path_exists(full_path.ptr) && p_unlink(full_path.ptr) < 0) { - if (failed) - continue; - - giterr_set(GITERR_REFERENCE, - "Failed to remove loose reference '%s' after packing: %s", - full_path.ptr, strerror(errno)); - failed = 1; - } - - /* - * if we fail to remove a single file, this is *not* good, - * but we should keep going and remove as many as possible. - * After we've removed as many files as possible, we return - * the error code anyway. - */ - } - - git_buf_free(&full_path); - return failed ? -1 : 0; -} - -/* - * Write all the contents in the in-memory packfile to disk. - */ -static int packed_write(refdb_fs_backend *backend) -{ - git_sortedcache *refcache = backend->refcache; - git_filebuf pack_file = GIT_FILEBUF_INIT; - size_t i; - - /* lock the cache to updates while we do this */ - if (git_sortedcache_wlock(refcache) < 0) - return -1; - - /* Open the file! */ - if (git_filebuf_open(&pack_file, git_sortedcache_path(refcache), 0, GIT_PACKEDREFS_FILE_MODE) < 0) - goto fail; - - /* Packfiles have a header... apparently - * This is in fact not required, but we might as well print it - * just for kicks */ - if (git_filebuf_printf(&pack_file, "%s\n", GIT_PACKEDREFS_HEADER) < 0) - goto fail; - - for (i = 0; i < git_sortedcache_entrycount(refcache); ++i) { - struct packref *ref = git_sortedcache_entry(refcache, i); - assert(ref); - - if (packed_find_peel(backend, ref) < 0) - goto fail; - - if (packed_write_ref(ref, &pack_file) < 0) - goto fail; - } - - /* if we've written all the references properly, we can commit - * the packfile to make the changes effective */ - if (git_filebuf_commit(&pack_file) < 0) - goto fail; - - /* when and only when the packfile has been properly written, - * we can go ahead and remove the loose refs */ - if (packed_remove_loose(backend) < 0) - goto fail; - - git_sortedcache_updated(refcache); - git_sortedcache_wunlock(refcache); - - /* we're good now */ - return 0; - -fail: - git_filebuf_cleanup(&pack_file); - git_sortedcache_wunlock(refcache); - - return -1; -} - -static int reflog_append(refdb_fs_backend *backend, const git_reference *ref, const git_oid *old, const git_oid *new, const git_signature *author, const char *message); -static int has_reflog(git_repository *repo, const char *name); - -/* We only write if it's under heads/, remotes/ or notes/ or if it already has a log */ -static int should_write_reflog(int *write, git_repository *repo, const char *name) -{ - int error, logall; - - error = git_repository__cvar(&logall, repo, GIT_CVAR_LOGALLREFUPDATES); - if (error < 0) - return error; - - /* Defaults to the opposite of the repo being bare */ - if (logall == GIT_LOGALLREFUPDATES_UNSET) - logall = !git_repository_is_bare(repo); - - if (!logall) { - *write = 0; - } else if (has_reflog(repo, name)) { - *write = 1; - } else if (!git__prefixcmp(name, GIT_REFS_HEADS_DIR) || - !git__strcmp(name, GIT_HEAD_FILE) || - !git__prefixcmp(name, GIT_REFS_REMOTES_DIR) || - !git__prefixcmp(name, GIT_REFS_NOTES_DIR)) { - *write = 1; - } else { - *write = 0; - } - - return 0; -} - -static int cmp_old_ref(int *cmp, git_refdb_backend *backend, const char *name, - const git_oid *old_id, const char *old_target) -{ - int error = 0; - git_reference *old_ref = NULL; - - *cmp = 0; - /* It "matches" if there is no old value to compare against */ - if (!old_id && !old_target) - return 0; - - if ((error = refdb_fs_backend__lookup(&old_ref, backend, name)) < 0) - goto out; - - /* If the types don't match, there's no way the values do */ - if (old_id && old_ref->type != GIT_REF_OID) { - *cmp = -1; - goto out; - } - if (old_target && old_ref->type != GIT_REF_SYMBOLIC) { - *cmp = 1; - goto out; - } - - if (old_id && old_ref->type == GIT_REF_OID) - *cmp = git_oid_cmp(old_id, &old_ref->target.oid); - - if (old_target && old_ref->type == GIT_REF_SYMBOLIC) - *cmp = git__strcmp(old_target, old_ref->target.symbolic); - -out: - git_reference_free(old_ref); - - return error; -} - -/* - * The git.git comment regarding this, for your viewing pleasure: - * - * Special hack: If a branch is updated directly and HEAD - * points to it (may happen on the remote side of a push - * for example) then logically the HEAD reflog should be - * updated too. - * A generic solution implies reverse symref information, - * but finding all symrefs pointing to the given branch - * would be rather costly for this rare event (the direct - * update of a branch) to be worth it. So let's cheat and - * check with HEAD only which should cover 99% of all usage - * scenarios (even 100% of the default ones). - */ -static int maybe_append_head(refdb_fs_backend *backend, const git_reference *ref, const git_signature *who, const char *message) -{ - int error; - git_oid old_id = {{0}}; - git_reference *tmp = NULL, *head = NULL, *peeled = NULL; - const char *name; - - if (ref->type == GIT_REF_SYMBOLIC) - return 0; - - /* if we can't resolve, we use {0}*40 as old id */ - git_reference_name_to_id(&old_id, backend->repo, ref->name); - - if ((error = git_reference_lookup(&head, backend->repo, GIT_HEAD_FILE)) < 0) - return error; - - if (git_reference_type(head) == GIT_REF_OID) - goto cleanup; - - if ((error = git_reference_lookup(&tmp, backend->repo, GIT_HEAD_FILE)) < 0) - goto cleanup; - - /* Go down the symref chain until we find the branch */ - while (git_reference_type(tmp) == GIT_REF_SYMBOLIC) { - error = git_reference_lookup(&peeled, backend->repo, git_reference_symbolic_target(tmp)); - if (error < 0) - break; - - git_reference_free(tmp); - tmp = peeled; - } - - if (error == GIT_ENOTFOUND) { - error = 0; - name = git_reference_symbolic_target(tmp); - } else if (error < 0) { - goto cleanup; - } else { - name = git_reference_name(tmp); - } - - if (strcmp(name, ref->name)) - goto cleanup; - - error = reflog_append(backend, head, &old_id, git_reference_target(ref), who, message); - -cleanup: - git_reference_free(tmp); - git_reference_free(head); - return error; -} - -static int refdb_fs_backend__write( - git_refdb_backend *_backend, - const git_reference *ref, - int force, - const git_signature *who, - const char *message, - const git_oid *old_id, - const char *old_target) -{ - refdb_fs_backend *backend = (refdb_fs_backend *)_backend; - git_filebuf file = GIT_FILEBUF_INIT; - int error = 0; - - assert(backend); - - error = reference_path_available(backend, ref->name, NULL, force); - if (error < 0) - return error; - - /* We need to perform the reflog append and old value check under the ref's lock */ - if ((error = loose_lock(&file, backend, ref->name)) < 0) - return error; - - return refdb_fs_backend__write_tail(_backend, ref, &file, true, who, message, old_id, old_target); -} - -static int refdb_fs_backend__write_tail( - git_refdb_backend *_backend, - const git_reference *ref, - git_filebuf *file, - int update_reflog, - const git_signature *who, - const char *message, - const git_oid *old_id, - const char *old_target) -{ - refdb_fs_backend *backend = (refdb_fs_backend *)_backend; - int error = 0, cmp = 0, should_write; - const char *new_target = NULL; - const git_oid *new_id = NULL; - - if ((error = cmp_old_ref(&cmp, _backend, ref->name, old_id, old_target)) < 0) - goto on_error; - - if (cmp) { - giterr_set(GITERR_REFERENCE, "old reference value does not match"); - error = GIT_EMODIFIED; - goto on_error; - } - - if (ref->type == GIT_REF_SYMBOLIC) - new_target = ref->target.symbolic; - else - new_id = &ref->target.oid; - - error = cmp_old_ref(&cmp, _backend, ref->name, new_id, new_target); - if (error < 0 && error != GIT_ENOTFOUND) - goto on_error; - - /* Don't update if we have the same value */ - if (!error && !cmp) { - error = 0; - goto on_error; /* not really error */ - } - - if (update_reflog) { - if ((error = should_write_reflog(&should_write, backend->repo, ref->name)) < 0) - goto on_error; - - if (should_write) { - if ((error = reflog_append(backend, ref, NULL, NULL, who, message)) < 0) - goto on_error; - if ((error = maybe_append_head(backend, ref, who, message)) < 0) - goto on_error; - } - } - - return loose_commit(file, ref); - -on_error: - git_filebuf_cleanup(file); - return error; -} - -static int refdb_fs_backend__delete( - git_refdb_backend *_backend, - const char *ref_name, - const git_oid *old_id, const char *old_target) -{ - refdb_fs_backend *backend = (refdb_fs_backend *)_backend; - git_filebuf file = GIT_FILEBUF_INIT; - int error = 0; - - assert(backend && ref_name); - - if ((error = loose_lock(&file, backend, ref_name)) < 0) - return error; - - if ((error = refdb_reflog_fs__delete(_backend, ref_name)) < 0) { - git_filebuf_cleanup(&file); - return error; - } - - return refdb_fs_backend__delete_tail(_backend, &file, ref_name, old_id, old_target); -} - -static int refdb_fs_backend__delete_tail( - git_refdb_backend *_backend, - git_filebuf *file, - const char *ref_name, - const git_oid *old_id, const char *old_target) -{ - refdb_fs_backend *backend = (refdb_fs_backend *)_backend; - git_buf loose_path = GIT_BUF_INIT; - size_t pack_pos; - int error = 0, cmp = 0; - bool loose_deleted = 0; - - error = cmp_old_ref(&cmp, _backend, ref_name, old_id, old_target); - if (error < 0) - goto cleanup; - - if (cmp) { - giterr_set(GITERR_REFERENCE, "old reference value does not match"); - error = GIT_EMODIFIED; - goto cleanup; - } - - /* If a loose reference exists, remove it from the filesystem */ - if (git_buf_joinpath(&loose_path, backend->path, ref_name) < 0) - return -1; - - if (git_path_isfile(loose_path.ptr)) { - error = p_unlink(loose_path.ptr); - loose_deleted = 1; - } - - git_buf_free(&loose_path); - - if (error != 0) - goto cleanup; - - if ((error = packed_reload(backend)) < 0) - goto cleanup; - - /* If a packed reference exists, remove it from the packfile and repack */ - if ((error = git_sortedcache_wlock(backend->refcache)) < 0) - goto cleanup; - - if (!(error = git_sortedcache_lookup_index( - &pack_pos, backend->refcache, ref_name))) - error = git_sortedcache_remove(backend->refcache, pack_pos); - - git_sortedcache_wunlock(backend->refcache); - - if (error == GIT_ENOTFOUND) { - error = loose_deleted ? 0 : ref_error_notfound(ref_name); - goto cleanup; - } - - error = packed_write(backend); - -cleanup: - git_filebuf_cleanup(file); - - return error; -} - -static int refdb_reflog_fs__rename(git_refdb_backend *_backend, const char *old_name, const char *new_name); - -static int refdb_fs_backend__rename( - git_reference **out, - git_refdb_backend *_backend, - const char *old_name, - const char *new_name, - int force, - const git_signature *who, - const char *message) -{ - refdb_fs_backend *backend = (refdb_fs_backend *)_backend; - git_reference *old, *new; - git_filebuf file = GIT_FILEBUF_INIT; - int error; - - assert(backend); - - if ((error = reference_path_available( - backend, new_name, old_name, force)) < 0 || - (error = refdb_fs_backend__lookup(&old, _backend, old_name)) < 0) - return error; - - if ((error = refdb_fs_backend__delete(_backend, old_name, NULL, NULL)) < 0) { - git_reference_free(old); - return error; - } - - new = git_reference__set_name(old, new_name); - if (!new) { - git_reference_free(old); - return -1; - } - - if ((error = loose_lock(&file, backend, new->name)) < 0) { - git_reference_free(new); - return error; - } - - /* Try to rename the refog; it's ok if the old doesn't exist */ - error = refdb_reflog_fs__rename(_backend, old_name, new_name); - if (((error == 0) || (error == GIT_ENOTFOUND)) && - ((error = reflog_append(backend, new, git_reference_target(new), NULL, who, message)) < 0)) { - git_reference_free(new); - git_filebuf_cleanup(&file); - return error; - } - - if (error < 0) { - git_reference_free(new); - git_filebuf_cleanup(&file); - return error; - } - - - if ((error = loose_commit(&file, new)) < 0 || out == NULL) { - git_reference_free(new); - return error; - } - - *out = new; - return 0; -} - -static int refdb_fs_backend__compress(git_refdb_backend *_backend) -{ - refdb_fs_backend *backend = (refdb_fs_backend *)_backend; - - assert(backend); - - if (packed_reload(backend) < 0 || /* load the existing packfile */ - packed_loadloose(backend) < 0 || /* add all the loose refs */ - packed_write(backend) < 0) /* write back to disk */ - return -1; - - return 0; -} - -static void refdb_fs_backend__free(git_refdb_backend *_backend) -{ - refdb_fs_backend *backend = (refdb_fs_backend *)_backend; - - assert(backend); - - git_sortedcache_free(backend->refcache); - git__free(backend->path); - git__free(backend); -} - -static int setup_namespace(git_buf *path, git_repository *repo) -{ - char *parts, *start, *end; - - /* Not all repositories have a path */ - if (repo->path_repository == NULL) - return 0; - - /* Load the path to the repo first */ - git_buf_puts(path, repo->path_repository); - - /* if the repo is not namespaced, nothing else to do */ - if (repo->namespace == NULL) - return 0; - - parts = end = git__strdup(repo->namespace); - if (parts == NULL) - return -1; - - /* - * From `man gitnamespaces`: - * namespaces which include a / will expand to a hierarchy - * of namespaces; for example, GIT_NAMESPACE=foo/bar will store - * refs under refs/namespaces/foo/refs/namespaces/bar/ - */ - while ((start = git__strsep(&end, "/")) != NULL) { - git_buf_printf(path, "refs/namespaces/%s/", start); - } - - git_buf_printf(path, "refs/namespaces/%s/refs", end); - git__free(parts); - - /* Make sure that the folder with the namespace exists */ - if (git_futils_mkdir_relative(git_buf_cstr(path), repo->path_repository, - 0777, GIT_MKDIR_PATH, NULL) < 0) - return -1; - - /* Return root of the namespaced path, i.e. without the trailing '/refs' */ - git_buf_rtruncate_at_char(path, '/'); - return 0; -} - -static int reflog_alloc(git_reflog **reflog, const char *name) -{ - git_reflog *log; - - *reflog = NULL; - - log = git__calloc(1, sizeof(git_reflog)); - GITERR_CHECK_ALLOC(log); - - log->ref_name = git__strdup(name); - GITERR_CHECK_ALLOC(log->ref_name); - - if (git_vector_init(&log->entries, 0, NULL) < 0) { - git__free(log->ref_name); - git__free(log); - return -1; - } - - *reflog = log; - - return 0; -} - -static int reflog_parse(git_reflog *log, const char *buf, size_t buf_size) -{ - const char *ptr; - git_reflog_entry *entry; - -#define seek_forward(_increase) do { \ - if (_increase >= buf_size) { \ - giterr_set(GITERR_INVALID, "Ran out of data while parsing reflog"); \ - goto fail; \ - } \ - buf += _increase; \ - buf_size -= _increase; \ - } while (0) - - while (buf_size > GIT_REFLOG_SIZE_MIN) { - entry = git__calloc(1, sizeof(git_reflog_entry)); - GITERR_CHECK_ALLOC(entry); - - entry->committer = git__calloc(1, sizeof(git_signature)); - GITERR_CHECK_ALLOC(entry->committer); - - if (git_oid_fromstrn(&entry->oid_old, buf, GIT_OID_HEXSZ) < 0) - goto fail; - seek_forward(GIT_OID_HEXSZ + 1); - - if (git_oid_fromstrn(&entry->oid_cur, buf, GIT_OID_HEXSZ) < 0) - goto fail; - seek_forward(GIT_OID_HEXSZ + 1); - - ptr = buf; - - /* Seek forward to the end of the signature. */ - while (*buf && *buf != '\t' && *buf != '\n') - seek_forward(1); - - if (git_signature__parse(entry->committer, &ptr, buf + 1, NULL, *buf) < 0) - goto fail; - - if (*buf == '\t') { - /* We got a message. Read everything till we reach LF. */ - seek_forward(1); - ptr = buf; - - while (*buf && *buf != '\n') - seek_forward(1); - - entry->msg = git__strndup(ptr, buf - ptr); - GITERR_CHECK_ALLOC(entry->msg); - } else - entry->msg = NULL; - - while (*buf && *buf == '\n' && buf_size > 1) - seek_forward(1); - - if (git_vector_insert(&log->entries, entry) < 0) - goto fail; - } - - return 0; - -#undef seek_forward - -fail: - git_reflog_entry__free(entry); - - return -1; -} - -static int create_new_reflog_file(const char *filepath) -{ - int fd, error; - - if ((error = git_futils_mkpath2file(filepath, GIT_REFLOG_DIR_MODE)) < 0) - return error; - - if ((fd = p_open(filepath, - O_WRONLY | O_CREAT, - GIT_REFLOG_FILE_MODE)) < 0) - return -1; - - return p_close(fd); -} - -GIT_INLINE(int) retrieve_reflog_path(git_buf *path, git_repository *repo, const char *name) -{ - return git_buf_join3(path, '/', repo->path_repository, GIT_REFLOG_DIR, name); -} - -static int refdb_reflog_fs__ensure_log(git_refdb_backend *_backend, const char *name) -{ - refdb_fs_backend *backend; - git_repository *repo; - git_buf path = GIT_BUF_INIT; - int error; - - assert(_backend && name); - - backend = (refdb_fs_backend *) _backend; - repo = backend->repo; - - if ((error = retrieve_reflog_path(&path, repo, name)) < 0) - return error; - - error = create_new_reflog_file(git_buf_cstr(&path)); - git_buf_free(&path); - - return error; -} - -static int has_reflog(git_repository *repo, const char *name) -{ - int ret = 0; - git_buf path = GIT_BUF_INIT; - - if (retrieve_reflog_path(&path, repo, name) < 0) - goto cleanup; - - ret = git_path_isfile(git_buf_cstr(&path)); - -cleanup: - git_buf_free(&path); - return ret; -} - -static int refdb_reflog_fs__has_log(git_refdb_backend *_backend, const char *name) -{ - refdb_fs_backend *backend; - - assert(_backend && name); - - backend = (refdb_fs_backend *) _backend; - - return has_reflog(backend->repo, name); -} - -static int refdb_reflog_fs__read(git_reflog **out, git_refdb_backend *_backend, const char *name) -{ - int error = -1; - git_buf log_path = GIT_BUF_INIT; - git_buf log_file = GIT_BUF_INIT; - git_reflog *log = NULL; - git_repository *repo; - refdb_fs_backend *backend; - - assert(out && _backend && name); - - backend = (refdb_fs_backend *) _backend; - repo = backend->repo; - - if (reflog_alloc(&log, name) < 0) - return -1; - - if (retrieve_reflog_path(&log_path, repo, name) < 0) - goto cleanup; - - error = git_futils_readbuffer(&log_file, git_buf_cstr(&log_path)); - if (error < 0 && error != GIT_ENOTFOUND) - goto cleanup; - - if ((error == GIT_ENOTFOUND) && - ((error = create_new_reflog_file(git_buf_cstr(&log_path))) < 0)) - goto cleanup; - - if ((error = reflog_parse(log, - git_buf_cstr(&log_file), git_buf_len(&log_file))) < 0) - goto cleanup; - - *out = log; - goto success; - -cleanup: - git_reflog_free(log); - -success: - git_buf_free(&log_file); - git_buf_free(&log_path); - - return error; -} - -static int serialize_reflog_entry( - git_buf *buf, - const git_oid *oid_old, - const git_oid *oid_new, - const git_signature *committer, - const char *msg) -{ - char raw_old[GIT_OID_HEXSZ+1]; - char raw_new[GIT_OID_HEXSZ+1]; - - git_oid_tostr(raw_old, GIT_OID_HEXSZ+1, oid_old); - git_oid_tostr(raw_new, GIT_OID_HEXSZ+1, oid_new); - - git_buf_clear(buf); - - git_buf_puts(buf, raw_old); - git_buf_putc(buf, ' '); - git_buf_puts(buf, raw_new); - - git_signature__writebuf(buf, " ", committer); - - /* drop trailing LF */ - git_buf_rtrim(buf); - - if (msg) { - git_buf_putc(buf, '\t'); - git_buf_puts(buf, msg); - } - - git_buf_putc(buf, '\n'); - - return git_buf_oom(buf); -} - -static int lock_reflog(git_filebuf *file, refdb_fs_backend *backend, const char *refname) -{ - git_repository *repo; - git_buf log_path = GIT_BUF_INIT; - int error; - - repo = backend->repo; - - if (!git_path_isvalid(backend->repo, refname, GIT_PATH_REJECT_FILESYSTEM_DEFAULTS)) { - giterr_set(GITERR_INVALID, "Invalid reference name '%s'.", refname); - return GIT_EINVALIDSPEC; - } - - if (retrieve_reflog_path(&log_path, repo, refname) < 0) - return -1; - - if (!git_path_isfile(git_buf_cstr(&log_path))) { - giterr_set(GITERR_INVALID, - "Log file for reference '%s' doesn't exist.", refname); - error = -1; - goto cleanup; - } - - error = git_filebuf_open(file, git_buf_cstr(&log_path), 0, GIT_REFLOG_FILE_MODE); - -cleanup: - git_buf_free(&log_path); - - return error; -} - -static int refdb_reflog_fs__write(git_refdb_backend *_backend, git_reflog *reflog) -{ - int error = -1; - unsigned int i; - git_reflog_entry *entry; - refdb_fs_backend *backend; - git_buf log = GIT_BUF_INIT; - git_filebuf fbuf = GIT_FILEBUF_INIT; - - assert(_backend && reflog); - - backend = (refdb_fs_backend *) _backend; - - if ((error = lock_reflog(&fbuf, backend, reflog->ref_name)) < 0) - return -1; - - git_vector_foreach(&reflog->entries, i, entry) { - if (serialize_reflog_entry(&log, &(entry->oid_old), &(entry->oid_cur), entry->committer, entry->msg) < 0) - goto cleanup; - - if ((error = git_filebuf_write(&fbuf, log.ptr, log.size)) < 0) - goto cleanup; - } - - error = git_filebuf_commit(&fbuf); - goto success; - -cleanup: - git_filebuf_cleanup(&fbuf); - -success: - git_buf_free(&log); - - return error; -} - -/* Append to the reflog, must be called under reference lock */ -static int reflog_append(refdb_fs_backend *backend, const git_reference *ref, const git_oid *old, const git_oid *new, const git_signature *who, const char *message) -{ - int error, is_symbolic; - git_oid old_id = {{0}}, new_id = {{0}}; - git_buf buf = GIT_BUF_INIT, path = GIT_BUF_INIT; - git_repository *repo = backend->repo; - - is_symbolic = ref->type == GIT_REF_SYMBOLIC; - - /* "normal" symbolic updates do not write */ - if (is_symbolic && - strcmp(ref->name, GIT_HEAD_FILE) && - !(old && new)) - return 0; - - /* From here on is_symoblic also means that it's HEAD */ - - if (old) { - git_oid_cpy(&old_id, old); - } else { - error = git_reference_name_to_id(&old_id, repo, ref->name); - if (error < 0 && error != GIT_ENOTFOUND) - return error; - } - - if (new) { - git_oid_cpy(&new_id, new); - } else { - if (!is_symbolic) { - git_oid_cpy(&new_id, git_reference_target(ref)); - } else { - error = git_reference_name_to_id(&new_id, repo, git_reference_symbolic_target(ref)); - if (error < 0 && error != GIT_ENOTFOUND) - return error; - /* detaching HEAD does not create an entry */ - if (error == GIT_ENOTFOUND) - return 0; - - giterr_clear(); - } - } - - if ((error = serialize_reflog_entry(&buf, &old_id, &new_id, who, message)) < 0) - goto cleanup; - - if ((error = retrieve_reflog_path(&path, repo, ref->name)) < 0) - goto cleanup; - - if (((error = git_futils_mkpath2file(git_buf_cstr(&path), 0777)) < 0) && - (error != GIT_EEXISTS)) { - goto cleanup; - } - - /* If the new branch matches part of the namespace of a previously deleted branch, - * there maybe an obsolete/unused directory (or directory hierarchy) in the way. - */ - if (git_path_isdir(git_buf_cstr(&path))) { - if ((git_futils_rmdir_r(git_buf_cstr(&path), NULL, GIT_RMDIR_SKIP_NONEMPTY) < 0)) - error = -1; - else if (git_path_isdir(git_buf_cstr(&path))) { - giterr_set(GITERR_REFERENCE, "cannot create reflog at '%s', there are reflogs beneath that folder", - ref->name); - error = GIT_EDIRECTORY; - } - - if (error != 0) - goto cleanup; - } - - error = git_futils_writebuffer(&buf, git_buf_cstr(&path), O_WRONLY|O_CREAT|O_APPEND, GIT_REFLOG_FILE_MODE); - -cleanup: - git_buf_free(&buf); - git_buf_free(&path); - - return error; -} - -static int refdb_reflog_fs__rename(git_refdb_backend *_backend, const char *old_name, const char *new_name) -{ - int error = 0, fd; - git_buf old_path = GIT_BUF_INIT; - git_buf new_path = GIT_BUF_INIT; - git_buf temp_path = GIT_BUF_INIT; - git_buf normalized = GIT_BUF_INIT; - git_repository *repo; - refdb_fs_backend *backend; - - assert(_backend && old_name && new_name); - - backend = (refdb_fs_backend *) _backend; - repo = backend->repo; - - if ((error = git_reference__normalize_name( - &normalized, new_name, GIT_REF_FORMAT_ALLOW_ONELEVEL)) < 0) - return error; - - if (git_buf_joinpath(&temp_path, repo->path_repository, GIT_REFLOG_DIR) < 0) - return -1; - - if (git_buf_joinpath(&old_path, git_buf_cstr(&temp_path), old_name) < 0) - return -1; - - if (git_buf_joinpath(&new_path, git_buf_cstr(&temp_path), git_buf_cstr(&normalized)) < 0) - return -1; - - if (!git_path_exists(git_buf_cstr(&old_path))) { - error = GIT_ENOTFOUND; - goto cleanup; - } - - /* - * Move the reflog to a temporary place. This two-phase renaming is required - * in order to cope with funny renaming use cases when one tries to move a reference - * to a partially colliding namespace: - * - a/b -> a/b/c - * - a/b/c/d -> a/b/c - */ - if (git_buf_joinpath(&temp_path, git_buf_cstr(&temp_path), "temp_reflog") < 0) - return -1; - - if ((fd = git_futils_mktmp(&temp_path, git_buf_cstr(&temp_path), GIT_REFLOG_FILE_MODE)) < 0) { - error = -1; - goto cleanup; - } - - p_close(fd); - - if (p_rename(git_buf_cstr(&old_path), git_buf_cstr(&temp_path)) < 0) { - giterr_set(GITERR_OS, "Failed to rename reflog for %s", new_name); - error = -1; - goto cleanup; - } - - if (git_path_isdir(git_buf_cstr(&new_path)) && - (git_futils_rmdir_r(git_buf_cstr(&new_path), NULL, GIT_RMDIR_SKIP_NONEMPTY) < 0)) { - error = -1; - goto cleanup; - } - - if (git_futils_mkpath2file(git_buf_cstr(&new_path), GIT_REFLOG_DIR_MODE) < 0) { - error = -1; - goto cleanup; - } - - if (p_rename(git_buf_cstr(&temp_path), git_buf_cstr(&new_path)) < 0) { - giterr_set(GITERR_OS, "Failed to rename reflog for %s", new_name); - error = -1; - } - -cleanup: - git_buf_free(&temp_path); - git_buf_free(&old_path); - git_buf_free(&new_path); - git_buf_free(&normalized); - - return error; -} - -static int refdb_reflog_fs__delete(git_refdb_backend *_backend, const char *name) -{ - int error; - git_buf path = GIT_BUF_INIT; - - git_repository *repo; - refdb_fs_backend *backend; - - assert(_backend && name); - - backend = (refdb_fs_backend *) _backend; - repo = backend->repo; - - error = retrieve_reflog_path(&path, repo, name); - - if (!error && git_path_exists(path.ptr)) - error = p_unlink(path.ptr); - - git_buf_free(&path); - - return error; - -} - -int git_refdb_backend_fs( - git_refdb_backend **backend_out, - git_repository *repository) -{ - int t = 0; - git_buf path = GIT_BUF_INIT; - refdb_fs_backend *backend; - - backend = git__calloc(1, sizeof(refdb_fs_backend)); - GITERR_CHECK_ALLOC(backend); - - backend->repo = repository; - - if (setup_namespace(&path, repository) < 0) - goto fail; - - backend->path = git_buf_detach(&path); - - if (git_buf_joinpath(&path, backend->path, GIT_PACKEDREFS_FILE) < 0 || - git_sortedcache_new( - &backend->refcache, offsetof(struct packref, name), - NULL, NULL, packref_cmp, git_buf_cstr(&path)) < 0) - goto fail; - - git_buf_free(&path); - - if (!git_repository__cvar(&t, backend->repo, GIT_CVAR_IGNORECASE) && t) { - backend->iterator_flags |= GIT_ITERATOR_IGNORE_CASE; - backend->direach_flags |= GIT_PATH_DIR_IGNORE_CASE; - } - if (!git_repository__cvar(&t, backend->repo, GIT_CVAR_PRECOMPOSE) && t) { - backend->iterator_flags |= GIT_ITERATOR_PRECOMPOSE_UNICODE; - backend->direach_flags |= GIT_PATH_DIR_PRECOMPOSE_UNICODE; - } - - backend->parent.exists = &refdb_fs_backend__exists; - backend->parent.lookup = &refdb_fs_backend__lookup; - backend->parent.iterator = &refdb_fs_backend__iterator; - backend->parent.write = &refdb_fs_backend__write; - backend->parent.del = &refdb_fs_backend__delete; - backend->parent.rename = &refdb_fs_backend__rename; - backend->parent.compress = &refdb_fs_backend__compress; - backend->parent.lock = &refdb_fs_backend__lock; - backend->parent.unlock = &refdb_fs_backend__unlock; - backend->parent.has_log = &refdb_reflog_fs__has_log; - backend->parent.ensure_log = &refdb_reflog_fs__ensure_log; - backend->parent.free = &refdb_fs_backend__free; - backend->parent.reflog_read = &refdb_reflog_fs__read; - backend->parent.reflog_write = &refdb_reflog_fs__write; - backend->parent.reflog_rename = &refdb_reflog_fs__rename; - backend->parent.reflog_delete = &refdb_reflog_fs__delete; - - *backend_out = (git_refdb_backend *)backend; - return 0; - -fail: - git_buf_free(&path); - git__free(backend->path); - git__free(backend); - return -1; -} diff --git a/vendor/libgit2/src/refdb_fs.h b/vendor/libgit2/src/refdb_fs.h deleted file mode 100644 index 79e296833..000000000 --- a/vendor/libgit2/src/refdb_fs.h +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_refdb_fs_h__ -#define INCLUDE_refdb_fs_h__ - -typedef struct { - git_strmap *packfile; - time_t packfile_time; -} git_refcache; - -#endif diff --git a/vendor/libgit2/src/reflog.c b/vendor/libgit2/src/reflog.c deleted file mode 100644 index 9ce9aee6f..000000000 --- a/vendor/libgit2/src/reflog.c +++ /dev/null @@ -1,232 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "reflog.h" -#include "repository.h" -#include "filebuf.h" -#include "signature.h" -#include "refdb.h" - -#include - -git_reflog_entry *git_reflog_entry__alloc(void) -{ - return git__calloc(1, sizeof(git_reflog_entry)); -} - -void git_reflog_entry__free(git_reflog_entry *entry) -{ - git_signature_free(entry->committer); - - git__free(entry->msg); - git__free(entry); -} - -void git_reflog_free(git_reflog *reflog) -{ - size_t i; - git_reflog_entry *entry; - - if (reflog == NULL) - return; - - if (reflog->db) - GIT_REFCOUNT_DEC(reflog->db, git_refdb__free); - - for (i=0; i < reflog->entries.length; i++) { - entry = git_vector_get(&reflog->entries, i); - - git_reflog_entry__free(entry); - } - - git_vector_free(&reflog->entries); - git__free(reflog->ref_name); - git__free(reflog); -} - -int git_reflog_read(git_reflog **reflog, git_repository *repo, const char *name) -{ - git_refdb *refdb; - int error; - - assert(reflog && repo && name); - - if ((error = git_repository_refdb__weakptr(&refdb, repo)) < 0) - return error; - - return git_refdb_reflog_read(reflog, refdb, name); -} - -int git_reflog_write(git_reflog *reflog) -{ - git_refdb *db; - - assert(reflog && reflog->db); - - db = reflog->db; - return db->backend->reflog_write(db->backend, reflog); -} - -int git_reflog_append(git_reflog *reflog, const git_oid *new_oid, const git_signature *committer, const char *msg) -{ - git_reflog_entry *entry; - const git_reflog_entry *previous; - const char *newline; - - assert(reflog && new_oid && committer); - - entry = git__calloc(1, sizeof(git_reflog_entry)); - GITERR_CHECK_ALLOC(entry); - - if ((git_signature_dup(&entry->committer, committer)) < 0) - goto cleanup; - - if (msg != NULL) { - if ((entry->msg = git__strdup(msg)) == NULL) - goto cleanup; - - newline = strchr(msg, '\n'); - - if (newline) { - if (newline[1] != '\0') { - giterr_set(GITERR_INVALID, "Reflog message cannot contain newline"); - goto cleanup; - } - - entry->msg[newline - msg] = '\0'; - } - } - - previous = git_reflog_entry_byindex(reflog, 0); - - if (previous == NULL) - git_oid_fromstr(&entry->oid_old, GIT_OID_HEX_ZERO); - else - git_oid_cpy(&entry->oid_old, &previous->oid_cur); - - git_oid_cpy(&entry->oid_cur, new_oid); - - if (git_vector_insert(&reflog->entries, entry) < 0) - goto cleanup; - - return 0; - -cleanup: - git_reflog_entry__free(entry); - return -1; -} - -int git_reflog_rename(git_repository *repo, const char *old_name, const char *new_name) -{ - git_refdb *refdb; - int error; - - if ((error = git_repository_refdb__weakptr(&refdb, repo)) < 0) - return -1; - - return refdb->backend->reflog_rename(refdb->backend, old_name, new_name); -} - -int git_reflog_delete(git_repository *repo, const char *name) -{ - git_refdb *refdb; - int error; - - if ((error = git_repository_refdb__weakptr(&refdb, repo)) < 0) - return -1; - - return refdb->backend->reflog_delete(refdb->backend, name); -} - -size_t git_reflog_entrycount(git_reflog *reflog) -{ - assert(reflog); - return reflog->entries.length; -} - -const git_reflog_entry * git_reflog_entry_byindex(const git_reflog *reflog, size_t idx) -{ - assert(reflog); - - if (idx >= reflog->entries.length) - return NULL; - - return git_vector_get( - &reflog->entries, reflog_inverse_index(idx, reflog->entries.length)); -} - -const git_oid * git_reflog_entry_id_old(const git_reflog_entry *entry) -{ - assert(entry); - return &entry->oid_old; -} - -const git_oid * git_reflog_entry_id_new(const git_reflog_entry *entry) -{ - assert(entry); - return &entry->oid_cur; -} - -const git_signature * git_reflog_entry_committer(const git_reflog_entry *entry) -{ - assert(entry); - return entry->committer; -} - -const char * git_reflog_entry_message(const git_reflog_entry *entry) -{ - assert(entry); - return entry->msg; -} - -int git_reflog_drop(git_reflog *reflog, size_t idx, int rewrite_previous_entry) -{ - size_t entrycount; - git_reflog_entry *entry, *previous; - - entrycount = git_reflog_entrycount(reflog); - - entry = (git_reflog_entry *)git_reflog_entry_byindex(reflog, idx); - - if (entry == NULL) { - giterr_set(GITERR_REFERENCE, "No reflog entry at index %"PRIuZ, idx); - return GIT_ENOTFOUND; - } - - git_reflog_entry__free(entry); - - if (git_vector_remove( - &reflog->entries, reflog_inverse_index(idx, entrycount)) < 0) - return -1; - - if (!rewrite_previous_entry) - return 0; - - /* No need to rewrite anything when removing the most recent entry */ - if (idx == 0) - return 0; - - /* Have the latest entry just been dropped? */ - if (entrycount == 1) - return 0; - - entry = (git_reflog_entry *)git_reflog_entry_byindex(reflog, idx - 1); - - /* If the oldest entry has just been removed... */ - if (idx == entrycount - 1) { - /* ...clear the oid_old member of the "new" oldest entry */ - if (git_oid_fromstr(&entry->oid_old, GIT_OID_HEX_ZERO) < 0) - return -1; - - return 0; - } - - previous = (git_reflog_entry *)git_reflog_entry_byindex(reflog, idx); - git_oid_cpy(&entry->oid_old, &previous->oid_cur); - - return 0; -} diff --git a/vendor/libgit2/src/reflog.h b/vendor/libgit2/src/reflog.h deleted file mode 100644 index 2d31ae47d..000000000 --- a/vendor/libgit2/src/reflog.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_reflog_h__ -#define INCLUDE_reflog_h__ - -#include "common.h" -#include "git2/reflog.h" -#include "vector.h" - -#define GIT_REFLOG_DIR "logs/" -#define GIT_REFLOG_DIR_MODE 0777 -#define GIT_REFLOG_FILE_MODE 0666 - -#define GIT_REFLOG_SIZE_MIN (2*GIT_OID_HEXSZ+2+17) - -struct git_reflog_entry { - git_oid oid_old; - git_oid oid_cur; - - git_signature *committer; - - char *msg; -}; - -struct git_reflog { - git_refdb *db; - char *ref_name; - git_vector entries; -}; - -GIT_INLINE(size_t) reflog_inverse_index(size_t idx, size_t total) -{ - return (total - 1) - idx; -} - -#endif /* INCLUDE_reflog_h__ */ diff --git a/vendor/libgit2/src/refs.c b/vendor/libgit2/src/refs.c deleted file mode 100644 index 26c80021f..000000000 --- a/vendor/libgit2/src/refs.c +++ /dev/null @@ -1,1302 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "refs.h" -#include "hash.h" -#include "repository.h" -#include "fileops.h" -#include "filebuf.h" -#include "pack.h" -#include "reflog.h" -#include "refdb.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -GIT__USE_STRMAP - -#define DEFAULT_NESTING_LEVEL 5 -#define MAX_NESTING_LEVEL 10 - -enum { - GIT_PACKREF_HAS_PEEL = 1, - GIT_PACKREF_WAS_LOOSE = 2 -}; - -static git_reference *alloc_ref(const char *name) -{ - git_reference *ref = NULL; - size_t namelen = strlen(name), reflen; - - if (!GIT_ADD_SIZET_OVERFLOW(&reflen, sizeof(git_reference), namelen) && - !GIT_ADD_SIZET_OVERFLOW(&reflen, reflen, 1) && - (ref = git__calloc(1, reflen)) != NULL) - memcpy(ref->name, name, namelen + 1); - - return ref; -} - -git_reference *git_reference__alloc_symbolic( - const char *name, const char *target) -{ - git_reference *ref; - - assert(name && target); - - ref = alloc_ref(name); - if (!ref) - return NULL; - - ref->type = GIT_REF_SYMBOLIC; - - if ((ref->target.symbolic = git__strdup(target)) == NULL) { - git__free(ref); - return NULL; - } - - return ref; -} - -git_reference *git_reference__alloc( - const char *name, - const git_oid *oid, - const git_oid *peel) -{ - git_reference *ref; - - assert(name && oid); - - ref = alloc_ref(name); - if (!ref) - return NULL; - - ref->type = GIT_REF_OID; - git_oid_cpy(&ref->target.oid, oid); - - if (peel != NULL) - git_oid_cpy(&ref->peel, peel); - - return ref; -} - -git_reference *git_reference__set_name( - git_reference *ref, const char *name) -{ - size_t namelen = strlen(name); - size_t reflen; - git_reference *rewrite = NULL; - - if (!GIT_ADD_SIZET_OVERFLOW(&reflen, sizeof(git_reference), namelen) && - !GIT_ADD_SIZET_OVERFLOW(&reflen, reflen, 1) && - (rewrite = git__realloc(ref, reflen)) != NULL) - memcpy(rewrite->name, name, namelen + 1); - - return rewrite; -} - -void git_reference_free(git_reference *reference) -{ - if (reference == NULL) - return; - - if (reference->type == GIT_REF_SYMBOLIC) - git__free(reference->target.symbolic); - - if (reference->db) - GIT_REFCOUNT_DEC(reference->db, git_refdb__free); - - git__free(reference); -} - -int git_reference_delete(git_reference *ref) -{ - const git_oid *old_id = NULL; - const char *old_target = NULL; - - if (ref->type == GIT_REF_OID) - old_id = &ref->target.oid; - else - old_target = ref->target.symbolic; - - return git_refdb_delete(ref->db, ref->name, old_id, old_target); -} - -int git_reference_remove(git_repository *repo, const char *name) -{ - git_refdb *db; - int error; - - if ((error = git_repository_refdb__weakptr(&db, repo)) < 0) - return error; - - return git_refdb_delete(db, name, NULL, NULL); -} - -int git_reference_lookup(git_reference **ref_out, - git_repository *repo, const char *name) -{ - return git_reference_lookup_resolved(ref_out, repo, name, 0); -} - -int git_reference_name_to_id( - git_oid *out, git_repository *repo, const char *name) -{ - int error; - git_reference *ref; - - if ((error = git_reference_lookup_resolved(&ref, repo, name, -1)) < 0) - return error; - - git_oid_cpy(out, git_reference_target(ref)); - git_reference_free(ref); - return 0; -} - -static int reference_normalize_for_repo( - git_refname_t out, - git_repository *repo, - const char *name) -{ - int precompose; - unsigned int flags = GIT_REF_FORMAT_ALLOW_ONELEVEL; - - if (!git_repository__cvar(&precompose, repo, GIT_CVAR_PRECOMPOSE) && - precompose) - flags |= GIT_REF_FORMAT__PRECOMPOSE_UNICODE; - - return git_reference_normalize_name(out, GIT_REFNAME_MAX, name, flags); -} - -int git_reference_lookup_resolved( - git_reference **ref_out, - git_repository *repo, - const char *name, - int max_nesting) -{ - git_refname_t scan_name; - git_ref_t scan_type; - int error = 0, nesting; - git_reference *ref = NULL; - git_refdb *refdb; - - assert(ref_out && repo && name); - - *ref_out = NULL; - - if (max_nesting > MAX_NESTING_LEVEL) - max_nesting = MAX_NESTING_LEVEL; - else if (max_nesting < 0) - max_nesting = DEFAULT_NESTING_LEVEL; - - scan_type = GIT_REF_SYMBOLIC; - - if ((error = reference_normalize_for_repo(scan_name, repo, name)) < 0) - return error; - - if ((error = git_repository_refdb__weakptr(&refdb, repo)) < 0) - return error; - - for (nesting = max_nesting; - nesting >= 0 && scan_type == GIT_REF_SYMBOLIC; - nesting--) - { - if (nesting != max_nesting) { - strncpy(scan_name, ref->target.symbolic, sizeof(scan_name)); - git_reference_free(ref); - } - - if ((error = git_refdb_lookup(&ref, refdb, scan_name)) < 0) - return error; - - scan_type = ref->type; - } - - if (scan_type != GIT_REF_OID && max_nesting != 0) { - giterr_set(GITERR_REFERENCE, - "Cannot resolve reference (>%u levels deep)", max_nesting); - git_reference_free(ref); - return -1; - } - - *ref_out = ref; - return 0; -} - -int git_reference_dwim(git_reference **out, git_repository *repo, const char *refname) -{ - int error = 0, i; - bool fallbackmode = true, foundvalid = false; - git_reference *ref; - git_buf refnamebuf = GIT_BUF_INIT, name = GIT_BUF_INIT; - - static const char* formatters[] = { - "%s", - GIT_REFS_DIR "%s", - GIT_REFS_TAGS_DIR "%s", - GIT_REFS_HEADS_DIR "%s", - GIT_REFS_REMOTES_DIR "%s", - GIT_REFS_REMOTES_DIR "%s/" GIT_HEAD_FILE, - NULL - }; - - if (*refname) - git_buf_puts(&name, refname); - else { - git_buf_puts(&name, GIT_HEAD_FILE); - fallbackmode = false; - } - - for (i = 0; formatters[i] && (fallbackmode || i == 0); i++) { - - git_buf_clear(&refnamebuf); - - if ((error = git_buf_printf(&refnamebuf, formatters[i], git_buf_cstr(&name))) < 0) - goto cleanup; - - if (!git_reference_is_valid_name(git_buf_cstr(&refnamebuf))) { - error = GIT_EINVALIDSPEC; - continue; - } - foundvalid = true; - - error = git_reference_lookup_resolved(&ref, repo, git_buf_cstr(&refnamebuf), -1); - - if (!error) { - *out = ref; - error = 0; - goto cleanup; - } - - if (error != GIT_ENOTFOUND) - goto cleanup; - } - -cleanup: - if (error && !foundvalid) { - /* never found a valid reference name */ - giterr_set(GITERR_REFERENCE, - "Could not use '%s' as valid reference name", git_buf_cstr(&name)); - } - - if (error == GIT_ENOTFOUND) - giterr_set(GITERR_REFERENCE, "no reference found for shorthand '%s'", refname); - - git_buf_free(&name); - git_buf_free(&refnamebuf); - return error; -} - -/** - * Getters - */ -git_ref_t git_reference_type(const git_reference *ref) -{ - assert(ref); - return ref->type; -} - -const char *git_reference_name(const git_reference *ref) -{ - assert(ref); - return ref->name; -} - -git_repository *git_reference_owner(const git_reference *ref) -{ - assert(ref); - return ref->db->repo; -} - -const git_oid *git_reference_target(const git_reference *ref) -{ - assert(ref); - - if (ref->type != GIT_REF_OID) - return NULL; - - return &ref->target.oid; -} - -const git_oid *git_reference_target_peel(const git_reference *ref) -{ - assert(ref); - - if (ref->type != GIT_REF_OID || git_oid_iszero(&ref->peel)) - return NULL; - - return &ref->peel; -} - -const char *git_reference_symbolic_target(const git_reference *ref) -{ - assert(ref); - - if (ref->type != GIT_REF_SYMBOLIC) - return NULL; - - return ref->target.symbolic; -} - -static int reference__create( - git_reference **ref_out, - git_repository *repo, - const char *name, - const git_oid *oid, - const char *symbolic, - int force, - const git_signature *signature, - const char *log_message, - const git_oid *old_id, - const char *old_target) -{ - git_refname_t normalized; - git_refdb *refdb; - git_reference *ref = NULL; - int error = 0; - - assert(repo && name); - assert(symbolic || signature); - - if (ref_out) - *ref_out = NULL; - - error = reference_normalize_for_repo(normalized, repo, name); - if (error < 0) - return error; - - error = git_repository_refdb__weakptr(&refdb, repo); - if (error < 0) - return error; - - if (oid != NULL) { - assert(symbolic == NULL); - - if (!git_object__is_valid(repo, oid, GIT_OBJ_ANY)) { - giterr_set(GITERR_REFERENCE, - "Target OID for the reference doesn't exist on the repository"); - return -1; - } - - ref = git_reference__alloc(normalized, oid, NULL); - } else { - git_refname_t normalized_target; - - if ((error = reference_normalize_for_repo(normalized_target, repo, symbolic)) < 0) - return error; - - ref = git_reference__alloc_symbolic(normalized, normalized_target); - } - - GITERR_CHECK_ALLOC(ref); - - if ((error = git_refdb_write(refdb, ref, force, signature, log_message, old_id, old_target)) < 0) { - git_reference_free(ref); - return error; - } - - if (ref_out == NULL) - git_reference_free(ref); - else - *ref_out = ref; - - return 0; -} - -int configured_ident(git_signature **out, const git_repository *repo) -{ - if (repo->ident_name && repo->ident_email) - return git_signature_now(out, repo->ident_name, repo->ident_email); - - /* if not configured let us fall-through to the next method */ - return -1; -} - -int git_reference__log_signature(git_signature **out, git_repository *repo) -{ - int error; - git_signature *who; - - if(((error = configured_ident(&who, repo)) < 0) && - ((error = git_signature_default(&who, repo)) < 0) && - ((error = git_signature_now(&who, "unknown", "unknown")) < 0)) - return error; - - *out = who; - return 0; -} - -int git_reference_create_matching( - git_reference **ref_out, - git_repository *repo, - const char *name, - const git_oid *id, - int force, - const git_oid *old_id, - const char *log_message) - -{ - int error; - git_signature *who = NULL; - - assert(id); - - if ((error = git_reference__log_signature(&who, repo)) < 0) - return error; - - error = reference__create( - ref_out, repo, name, id, NULL, force, who, log_message, old_id, NULL); - - git_signature_free(who); - return error; -} - -int git_reference_create( - git_reference **ref_out, - git_repository *repo, - const char *name, - const git_oid *id, - int force, - const char *log_message) -{ - return git_reference_create_matching(ref_out, repo, name, id, force, NULL, log_message); -} - -int git_reference_symbolic_create_matching( - git_reference **ref_out, - git_repository *repo, - const char *name, - const char *target, - int force, - const char *old_target, - const char *log_message) -{ - int error; - git_signature *who = NULL; - - assert(target); - - if ((error = git_reference__log_signature(&who, repo)) < 0) - return error; - - error = reference__create( - ref_out, repo, name, NULL, target, force, who, log_message, NULL, old_target); - - git_signature_free(who); - return error; -} - -int git_reference_symbolic_create( - git_reference **ref_out, - git_repository *repo, - const char *name, - const char *target, - int force, - const char *log_message) -{ - return git_reference_symbolic_create_matching(ref_out, repo, name, target, force, NULL, log_message); -} - -static int ensure_is_an_updatable_direct_reference(git_reference *ref) -{ - if (ref->type == GIT_REF_OID) - return 0; - - giterr_set(GITERR_REFERENCE, "Cannot set OID on symbolic reference"); - return -1; -} - -int git_reference_set_target( - git_reference **out, - git_reference *ref, - const git_oid *id, - const char *log_message) -{ - int error; - git_repository *repo; - - assert(out && ref && id); - - repo = ref->db->repo; - - if ((error = ensure_is_an_updatable_direct_reference(ref)) < 0) - return error; - - return git_reference_create_matching(out, repo, ref->name, id, 1, &ref->target.oid, log_message); -} - -static int ensure_is_an_updatable_symbolic_reference(git_reference *ref) -{ - if (ref->type == GIT_REF_SYMBOLIC) - return 0; - - giterr_set(GITERR_REFERENCE, "Cannot set symbolic target on a direct reference"); - return -1; -} - -int git_reference_symbolic_set_target( - git_reference **out, - git_reference *ref, - const char *target, - const char *log_message) -{ - int error; - - assert(out && ref && target); - - if ((error = ensure_is_an_updatable_symbolic_reference(ref)) < 0) - return error; - - return git_reference_symbolic_create_matching( - out, ref->db->repo, ref->name, target, 1, ref->target.symbolic, log_message); -} - -static int reference__rename(git_reference **out, git_reference *ref, const char *new_name, int force, - const git_signature *signature, const char *message) -{ - git_refname_t normalized; - bool should_head_be_updated = false; - int error = 0; - - assert(ref && new_name && signature); - - if ((error = reference_normalize_for_repo( - normalized, git_reference_owner(ref), new_name)) < 0) - return error; - - - /* Check if we have to update HEAD. */ - if ((error = git_branch_is_head(ref)) < 0) - return error; - - should_head_be_updated = (error > 0); - - if ((error = git_refdb_rename(out, ref->db, ref->name, normalized, force, signature, message)) < 0) - return error; - - /* Update HEAD it was pointing to the reference being renamed */ - if (should_head_be_updated && - (error = git_repository_set_head(ref->db->repo, normalized)) < 0) { - giterr_set(GITERR_REFERENCE, "Failed to update HEAD after renaming reference"); - return error; - } - - return 0; -} - - -int git_reference_rename( - git_reference **out, - git_reference *ref, - const char *new_name, - int force, - const char *log_message) -{ - git_signature *who; - int error; - - if ((error = git_reference__log_signature(&who, ref->db->repo)) < 0) - return error; - - error = reference__rename(out, ref, new_name, force, who, log_message); - git_signature_free(who); - - return error; -} - -int git_reference_resolve(git_reference **ref_out, const git_reference *ref) -{ - switch (git_reference_type(ref)) { - case GIT_REF_OID: - return git_reference_lookup(ref_out, ref->db->repo, ref->name); - - case GIT_REF_SYMBOLIC: - return git_reference_lookup_resolved(ref_out, ref->db->repo, ref->target.symbolic, -1); - - default: - giterr_set(GITERR_REFERENCE, "Invalid reference"); - return -1; - } -} - -int git_reference_foreach( - git_repository *repo, - git_reference_foreach_cb callback, - void *payload) -{ - git_reference_iterator *iter; - git_reference *ref; - int error; - - if ((error = git_reference_iterator_new(&iter, repo)) < 0) - return error; - - while (!(error = git_reference_next(&ref, iter))) { - if ((error = callback(ref, payload)) != 0) { - giterr_set_after_callback(error); - break; - } - } - - if (error == GIT_ITEROVER) - error = 0; - - git_reference_iterator_free(iter); - return error; -} - -int git_reference_foreach_name( - git_repository *repo, - git_reference_foreach_name_cb callback, - void *payload) -{ - git_reference_iterator *iter; - const char *refname; - int error; - - if ((error = git_reference_iterator_new(&iter, repo)) < 0) - return error; - - while (!(error = git_reference_next_name(&refname, iter))) { - if ((error = callback(refname, payload)) != 0) { - giterr_set_after_callback(error); - break; - } - } - - if (error == GIT_ITEROVER) - error = 0; - - git_reference_iterator_free(iter); - return error; -} - -int git_reference_foreach_glob( - git_repository *repo, - const char *glob, - git_reference_foreach_name_cb callback, - void *payload) -{ - git_reference_iterator *iter; - const char *refname; - int error; - - if ((error = git_reference_iterator_glob_new(&iter, repo, glob)) < 0) - return error; - - while (!(error = git_reference_next_name(&refname, iter))) { - if ((error = callback(refname, payload)) != 0) { - giterr_set_after_callback(error); - break; - } - } - - if (error == GIT_ITEROVER) - error = 0; - - git_reference_iterator_free(iter); - return error; -} - -int git_reference_iterator_new(git_reference_iterator **out, git_repository *repo) -{ - git_refdb *refdb; - - if (git_repository_refdb__weakptr(&refdb, repo) < 0) - return -1; - - return git_refdb_iterator(out, refdb, NULL); -} - -int git_reference_iterator_glob_new( - git_reference_iterator **out, git_repository *repo, const char *glob) -{ - git_refdb *refdb; - - if (git_repository_refdb__weakptr(&refdb, repo) < 0) - return -1; - - return git_refdb_iterator(out, refdb, glob); -} - -int git_reference_next(git_reference **out, git_reference_iterator *iter) -{ - return git_refdb_iterator_next(out, iter); -} - -int git_reference_next_name(const char **out, git_reference_iterator *iter) -{ - return git_refdb_iterator_next_name(out, iter); -} - -void git_reference_iterator_free(git_reference_iterator *iter) -{ - if (iter == NULL) - return; - - git_refdb_iterator_free(iter); -} - -static int cb__reflist_add(const char *ref, void *data) -{ - char *name = git__strdup(ref); - GITERR_CHECK_ALLOC(name); - return git_vector_insert((git_vector *)data, name); -} - -int git_reference_list( - git_strarray *array, - git_repository *repo) -{ - git_vector ref_list; - - assert(array && repo); - - array->strings = NULL; - array->count = 0; - - if (git_vector_init(&ref_list, 8, NULL) < 0) - return -1; - - if (git_reference_foreach_name( - repo, &cb__reflist_add, (void *)&ref_list) < 0) { - git_vector_free(&ref_list); - return -1; - } - - array->strings = (char **)git_vector_detach(&array->count, NULL, &ref_list); - - return 0; -} - -static int is_valid_ref_char(char ch) -{ - if ((unsigned) ch <= ' ') - return 0; - - switch (ch) { - case '~': - case '^': - case ':': - case '\\': - case '?': - case '[': - case '*': - return 0; - default: - return 1; - } -} - -static int ensure_segment_validity(const char *name) -{ - const char *current = name; - char prev = '\0'; - const int lock_len = (int)strlen(GIT_FILELOCK_EXTENSION); - int segment_len; - - if (*current == '.') - return -1; /* Refname starts with "." */ - - for (current = name; ; current++) { - if (*current == '\0' || *current == '/') - break; - - if (!is_valid_ref_char(*current)) - return -1; /* Illegal character in refname */ - - if (prev == '.' && *current == '.') - return -1; /* Refname contains ".." */ - - if (prev == '@' && *current == '{') - return -1; /* Refname contains "@{" */ - - prev = *current; - } - - segment_len = (int)(current - name); - - /* A refname component can not end with ".lock" */ - if (segment_len >= lock_len && - !memcmp(current - lock_len, GIT_FILELOCK_EXTENSION, lock_len)) - return -1; - - return segment_len; -} - -static bool is_all_caps_and_underscore(const char *name, size_t len) -{ - size_t i; - char c; - - assert(name && len > 0); - - for (i = 0; i < len; i++) - { - c = name[i]; - if ((c < 'A' || c > 'Z') && c != '_') - return false; - } - - if (*name == '_' || name[len - 1] == '_') - return false; - - return true; -} - -/* Inspired from https://github.com/git/git/blob/f06d47e7e0d9db709ee204ed13a8a7486149f494/refs.c#L36-100 */ -int git_reference__normalize_name( - git_buf *buf, - const char *name, - unsigned int flags) -{ - const char *current; - int segment_len, segments_count = 0, error = GIT_EINVALIDSPEC; - unsigned int process_flags; - bool normalize = (buf != NULL); - -#ifdef GIT_USE_ICONV - git_path_iconv_t ic = GIT_PATH_ICONV_INIT; -#endif - - assert(name); - - process_flags = flags; - current = (char *)name; - - if (*current == '/') - goto cleanup; - - if (normalize) - git_buf_clear(buf); - -#ifdef GIT_USE_ICONV - if ((flags & GIT_REF_FORMAT__PRECOMPOSE_UNICODE) != 0) { - size_t namelen = strlen(current); - if ((error = git_path_iconv_init_precompose(&ic)) < 0 || - (error = git_path_iconv(&ic, ¤t, &namelen)) < 0) - goto cleanup; - error = GIT_EINVALIDSPEC; - } -#endif - - while (true) { - segment_len = ensure_segment_validity(current); - if (segment_len < 0) { - if ((process_flags & GIT_REF_FORMAT_REFSPEC_PATTERN) && - current[0] == '*' && - (current[1] == '\0' || current[1] == '/')) { - /* Accept one wildcard as a full refname component. */ - process_flags &= ~GIT_REF_FORMAT_REFSPEC_PATTERN; - segment_len = 1; - } else - goto cleanup; - } - - if (segment_len > 0) { - if (normalize) { - size_t cur_len = git_buf_len(buf); - - git_buf_joinpath(buf, git_buf_cstr(buf), current); - git_buf_truncate(buf, - cur_len + segment_len + (segments_count ? 1 : 0)); - - if (git_buf_oom(buf)) { - error = -1; - goto cleanup; - } - } - - segments_count++; - } - - /* No empty segment is allowed when not normalizing */ - if (segment_len == 0 && !normalize) - goto cleanup; - - if (current[segment_len] == '\0') - break; - - current += segment_len + 1; - } - - /* A refname can not be empty */ - if (segment_len == 0 && segments_count == 0) - goto cleanup; - - /* A refname can not end with "." */ - if (current[segment_len - 1] == '.') - goto cleanup; - - /* A refname can not end with "/" */ - if (current[segment_len - 1] == '/') - goto cleanup; - - if ((segments_count == 1 ) && !(flags & GIT_REF_FORMAT_ALLOW_ONELEVEL)) - goto cleanup; - - if ((segments_count == 1 ) && - !(flags & GIT_REF_FORMAT_REFSPEC_SHORTHAND) && - !(is_all_caps_and_underscore(name, (size_t)segment_len) || - ((flags & GIT_REF_FORMAT_REFSPEC_PATTERN) && !strcmp("*", name)))) - goto cleanup; - - if ((segments_count > 1) - && (is_all_caps_and_underscore(name, strchr(name, '/') - name))) - goto cleanup; - - error = 0; - -cleanup: - if (error == GIT_EINVALIDSPEC) - giterr_set( - GITERR_REFERENCE, - "The given reference name '%s' is not valid", name); - - if (error && normalize) - git_buf_free(buf); - -#ifdef GIT_USE_ICONV - git_path_iconv_clear(&ic); -#endif - - return error; -} - -int git_reference_normalize_name( - char *buffer_out, - size_t buffer_size, - const char *name, - unsigned int flags) -{ - git_buf buf = GIT_BUF_INIT; - int error; - - if ((error = git_reference__normalize_name(&buf, name, flags)) < 0) - goto cleanup; - - if (git_buf_len(&buf) > buffer_size - 1) { - giterr_set( - GITERR_REFERENCE, - "The provided buffer is too short to hold the normalization of '%s'", name); - error = GIT_EBUFS; - goto cleanup; - } - - git_buf_copy_cstr(buffer_out, buffer_size, &buf); - - error = 0; - -cleanup: - git_buf_free(&buf); - return error; -} - -#define GIT_REF_TYPEMASK (GIT_REF_OID | GIT_REF_SYMBOLIC) - -int git_reference_cmp( - const git_reference *ref1, - const git_reference *ref2) -{ - git_ref_t type1, type2; - assert(ref1 && ref2); - - type1 = git_reference_type(ref1); - type2 = git_reference_type(ref2); - - /* let's put symbolic refs before OIDs */ - if (type1 != type2) - return (type1 == GIT_REF_SYMBOLIC) ? -1 : 1; - - if (type1 == GIT_REF_SYMBOLIC) - return strcmp(ref1->target.symbolic, ref2->target.symbolic); - - return git_oid__cmp(&ref1->target.oid, &ref2->target.oid); -} - -/** - * Get the end of a chain of references. If the final one is not - * found, we return the reference just before that. - */ -static int get_terminal(git_reference **out, git_repository *repo, const char *ref_name, int nesting) -{ - git_reference *ref; - int error = 0; - - if (nesting > MAX_NESTING_LEVEL) { - giterr_set(GITERR_REFERENCE, "Reference chain too deep (%d)", nesting); - return GIT_ENOTFOUND; - } - - /* set to NULL to let the caller know that they're at the end of the chain */ - if ((error = git_reference_lookup(&ref, repo, ref_name)) < 0) { - *out = NULL; - return error; - } - - if (git_reference_type(ref) == GIT_REF_OID) { - *out = ref; - error = 0; - } else { - error = get_terminal(out, repo, git_reference_symbolic_target(ref), nesting + 1); - if (error == GIT_ENOTFOUND && !*out) - *out = ref; - else - git_reference_free(ref); - } - - return error; -} - -/* - * Starting with the reference given by `ref_name`, follows symbolic - * references until a direct reference is found and updated the OID - * on that direct reference to `oid`. - */ -int git_reference__update_terminal( - git_repository *repo, - const char *ref_name, - const git_oid *oid, - const git_signature *sig, - const char *log_message) -{ - git_reference *ref = NULL, *ref2 = NULL; - git_signature *who = NULL; - const git_signature *to_use; - int error = 0; - - if (!sig && (error = git_reference__log_signature(&who, repo)) < 0) - return error; - - to_use = sig ? sig : who; - error = get_terminal(&ref, repo, ref_name, 0); - - /* found a dangling symref */ - if (error == GIT_ENOTFOUND && ref) { - assert(git_reference_type(ref) == GIT_REF_SYMBOLIC); - giterr_clear(); - error = reference__create(&ref2, repo, ref->target.symbolic, oid, NULL, 0, to_use, - log_message, NULL, NULL); - } else if (error == GIT_ENOTFOUND) { - giterr_clear(); - error = reference__create(&ref2, repo, ref_name, oid, NULL, 0, to_use, - log_message, NULL, NULL); - } else if (error == 0) { - assert(git_reference_type(ref) == GIT_REF_OID); - error = reference__create(&ref2, repo, ref->name, oid, NULL, 1, to_use, - log_message, &ref->target.oid, NULL); - } - - git_reference_free(ref2); - git_reference_free(ref); - git_signature_free(who); - return error; -} - -int git_reference__update_for_commit( - git_repository *repo, - git_reference *ref, - const char *ref_name, - const git_oid *id, - const char *operation) -{ - git_reference *ref_new = NULL; - git_commit *commit = NULL; - git_buf reflog_msg = GIT_BUF_INIT; - const git_signature *who; - int error; - - if ((error = git_commit_lookup(&commit, repo, id)) < 0 || - (error = git_buf_printf(&reflog_msg, "%s%s: %s", - operation ? operation : "commit", - git_commit_parentcount(commit) == 0 ? " (initial)" : "", - git_commit_summary(commit))) < 0) - goto done; - - who = git_commit_committer(commit); - - if (ref) { - if ((error = ensure_is_an_updatable_direct_reference(ref)) < 0) - return error; - - error = reference__create(&ref_new, repo, ref->name, id, NULL, 1, who, - git_buf_cstr(&reflog_msg), &ref->target.oid, NULL); - } - else - error = git_reference__update_terminal( - repo, ref_name, id, who, git_buf_cstr(&reflog_msg)); - -done: - git_reference_free(ref_new); - git_buf_free(&reflog_msg); - git_commit_free(commit); - return error; -} - -int git_reference_has_log(git_repository *repo, const char *refname) -{ - int error; - git_refdb *refdb; - - assert(repo && refname); - - if ((error = git_repository_refdb__weakptr(&refdb, repo)) < 0) - return error; - - return git_refdb_has_log(refdb, refname); -} - -int git_reference_ensure_log(git_repository *repo, const char *refname) -{ - int error; - git_refdb *refdb; - - assert(repo && refname); - - if ((error = git_repository_refdb__weakptr(&refdb, repo)) < 0) - return error; - - return git_refdb_ensure_log(refdb, refname); -} - -int git_reference__is_branch(const char *ref_name) -{ - return git__prefixcmp(ref_name, GIT_REFS_HEADS_DIR) == 0; -} - -int git_reference_is_branch(const git_reference *ref) -{ - assert(ref); - return git_reference__is_branch(ref->name); -} - -int git_reference__is_remote(const char *ref_name) -{ - return git__prefixcmp(ref_name, GIT_REFS_REMOTES_DIR) == 0; -} - -int git_reference_is_remote(const git_reference *ref) -{ - assert(ref); - return git_reference__is_remote(ref->name); -} - -int git_reference__is_tag(const char *ref_name) -{ - return git__prefixcmp(ref_name, GIT_REFS_TAGS_DIR) == 0; -} - -int git_reference_is_tag(const git_reference *ref) -{ - assert(ref); - return git_reference__is_tag(ref->name); -} - -int git_reference__is_note(const char *ref_name) -{ - return git__prefixcmp(ref_name, GIT_REFS_NOTES_DIR) == 0; -} - -int git_reference_is_note(const git_reference *ref) -{ - assert(ref); - return git_reference__is_note(ref->name); -} - -static int peel_error(int error, git_reference *ref, const char* msg) -{ - giterr_set( - GITERR_INVALID, - "The reference '%s' cannot be peeled - %s", git_reference_name(ref), msg); - return error; -} - -int git_reference_peel( - git_object **peeled, - git_reference *ref, - git_otype target_type) -{ - git_reference *resolved = NULL; - git_object *target = NULL; - int error; - - assert(ref); - - if (ref->type == GIT_REF_OID) { - resolved = ref; - } else { - if ((error = git_reference_resolve(&resolved, ref)) < 0) - return peel_error(error, ref, "Cannot resolve reference"); - } - - if (!git_oid_iszero(&resolved->peel)) { - error = git_object_lookup(&target, - git_reference_owner(ref), &resolved->peel, GIT_OBJ_ANY); - } else { - error = git_object_lookup(&target, - git_reference_owner(ref), &resolved->target.oid, GIT_OBJ_ANY); - } - - if (error < 0) { - peel_error(error, ref, "Cannot retrieve reference target"); - goto cleanup; - } - - if (target_type == GIT_OBJ_ANY && git_object_type(target) != GIT_OBJ_TAG) - error = git_object_dup(peeled, target); - else - error = git_object_peel(peeled, target, target_type); - -cleanup: - git_object_free(target); - - if (resolved != ref) - git_reference_free(resolved); - - return error; -} - -int git_reference__is_valid_name(const char *refname, unsigned int flags) -{ - if (git_reference__normalize_name(NULL, refname, flags) < 0) { - giterr_clear(); - return false; - } - - return true; -} - -int git_reference_is_valid_name(const char *refname) -{ - return git_reference__is_valid_name(refname, GIT_REF_FORMAT_ALLOW_ONELEVEL); -} - -const char *git_reference__shorthand(const char *name) -{ - if (!git__prefixcmp(name, GIT_REFS_HEADS_DIR)) - return name + strlen(GIT_REFS_HEADS_DIR); - else if (!git__prefixcmp(name, GIT_REFS_TAGS_DIR)) - return name + strlen(GIT_REFS_TAGS_DIR); - else if (!git__prefixcmp(name, GIT_REFS_REMOTES_DIR)) - return name + strlen(GIT_REFS_REMOTES_DIR); - else if (!git__prefixcmp(name, GIT_REFS_DIR)) - return name + strlen(GIT_REFS_DIR); - - /* No shorthands are avaiable, so just return the name */ - return name; -} - -const char *git_reference_shorthand(const git_reference *ref) -{ - return git_reference__shorthand(ref->name); -} diff --git a/vendor/libgit2/src/refs.h b/vendor/libgit2/src/refs.h deleted file mode 100644 index fda9532de..000000000 --- a/vendor/libgit2/src/refs.h +++ /dev/null @@ -1,117 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_refs_h__ -#define INCLUDE_refs_h__ - -#include "common.h" -#include "git2/oid.h" -#include "git2/refs.h" -#include "git2/refdb.h" -#include "strmap.h" -#include "buffer.h" -#include "oid.h" - -#define GIT_REFS_DIR "refs/" -#define GIT_REFS_HEADS_DIR GIT_REFS_DIR "heads/" -#define GIT_REFS_TAGS_DIR GIT_REFS_DIR "tags/" -#define GIT_REFS_REMOTES_DIR GIT_REFS_DIR "remotes/" -#define GIT_REFS_NOTES_DIR GIT_REFS_DIR "notes/" -#define GIT_REFS_DIR_MODE 0777 -#define GIT_REFS_FILE_MODE 0666 - -#define GIT_RENAMED_REF_FILE GIT_REFS_DIR "RENAMED-REF" - -#define GIT_SYMREF "ref: " -#define GIT_PACKEDREFS_FILE "packed-refs" -#define GIT_PACKEDREFS_HEADER "# pack-refs with: peeled fully-peeled " -#define GIT_PACKEDREFS_FILE_MODE 0666 - -#define GIT_HEAD_FILE "HEAD" -#define GIT_ORIG_HEAD_FILE "ORIG_HEAD" -#define GIT_FETCH_HEAD_FILE "FETCH_HEAD" -#define GIT_MERGE_HEAD_FILE "MERGE_HEAD" -#define GIT_REVERT_HEAD_FILE "REVERT_HEAD" -#define GIT_CHERRYPICK_HEAD_FILE "CHERRY_PICK_HEAD" -#define GIT_BISECT_LOG_FILE "BISECT_LOG" -#define GIT_REBASE_MERGE_DIR "rebase-merge/" -#define GIT_REBASE_MERGE_INTERACTIVE_FILE GIT_REBASE_MERGE_DIR "interactive" -#define GIT_REBASE_APPLY_DIR "rebase-apply/" -#define GIT_REBASE_APPLY_REBASING_FILE GIT_REBASE_APPLY_DIR "rebasing" -#define GIT_REBASE_APPLY_APPLYING_FILE GIT_REBASE_APPLY_DIR "applying" -#define GIT_REFS_HEADS_MASTER_FILE GIT_REFS_HEADS_DIR "master" - -#define GIT_SEQUENCER_DIR "sequencer/" -#define GIT_SEQUENCER_HEAD_FILE GIT_SEQUENCER_DIR "head" -#define GIT_SEQUENCER_OPTIONS_FILE GIT_SEQUENCER_DIR "options" -#define GIT_SEQUENCER_TODO_FILE GIT_SEQUENCER_DIR "todo" - -#define GIT_STASH_FILE "stash" -#define GIT_REFS_STASH_FILE GIT_REFS_DIR GIT_STASH_FILE - -#define GIT_REF_FORMAT__PRECOMPOSE_UNICODE (1u << 16) - -#define GIT_REFNAME_MAX 1024 - -typedef char git_refname_t[GIT_REFNAME_MAX]; - -struct git_reference { - git_refdb *db; - git_ref_t type; - - union { - git_oid oid; - char *symbolic; - } target; - - git_oid peel; - char name[GIT_FLEX_ARRAY]; -}; - -git_reference *git_reference__set_name(git_reference *ref, const char *name); - -int git_reference__normalize_name(git_buf *buf, const char *name, unsigned int flags); -int git_reference__update_terminal(git_repository *repo, const char *ref_name, const git_oid *oid, const git_signature *sig, const char *log_message); -int git_reference__is_valid_name(const char *refname, unsigned int flags); -int git_reference__is_branch(const char *ref_name); -int git_reference__is_remote(const char *ref_name); -int git_reference__is_tag(const char *ref_name); -const char *git_reference__shorthand(const char *name); - -/** - * Lookup a reference by name and try to resolve to an OID. - * - * You can control how many dereferences this will attempt to resolve the - * reference with the `max_deref` parameter, or pass -1 to use a sane - * default. If you pass 0 for `max_deref`, this will not attempt to resolve - * the reference. For any value of `max_deref` other than 0, not - * successfully resolving the reference will be reported as an error. - - * The generated reference must be freed by the user. - * - * @param reference_out Pointer to the looked-up reference - * @param repo The repository to look up the reference - * @param name The long name for the reference (e.g. HEAD, ref/heads/master, refs/tags/v0.1.0, ...) - * @param max_deref Maximum number of dereferences to make of symbolic refs, 0 means simple lookup, < 0 means use default reasonable value - * @return 0 on success or < 0 on error; not being able to resolve the reference is an error unless 0 was passed for max_deref - */ -int git_reference_lookup_resolved( - git_reference **reference_out, - git_repository *repo, - const char *name, - int max_deref); - -int git_reference__log_signature(git_signature **out, git_repository *repo); - -/** Update a reference after a commit. */ -int git_reference__update_for_commit( - git_repository *repo, - git_reference *ref, - const char *ref_name, - const git_oid *id, - const char *operation); - -#endif diff --git a/vendor/libgit2/src/refspec.c b/vendor/libgit2/src/refspec.c deleted file mode 100644 index debde8692..000000000 --- a/vendor/libgit2/src/refspec.c +++ /dev/null @@ -1,365 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "git2/errors.h" - -#include "common.h" -#include "refspec.h" -#include "util.h" -#include "posix.h" -#include "refs.h" -#include "vector.h" - -int git_refspec__parse(git_refspec *refspec, const char *input, bool is_fetch) -{ - // Ported from https://github.com/git/git/blob/f06d47e7e0d9db709ee204ed13a8a7486149f494/remote.c#L518-636 - - size_t llen; - int is_glob = 0; - const char *lhs, *rhs; - int flags; - - assert(refspec && input); - - memset(refspec, 0x0, sizeof(git_refspec)); - refspec->push = !is_fetch; - - lhs = input; - if (*lhs == '+') { - refspec->force = 1; - lhs++; - } - - rhs = strrchr(lhs, ':'); - - /* - * Before going on, special case ":" (or "+:") as a refspec - * for matching refs. - */ - if (!is_fetch && rhs == lhs && rhs[1] == '\0') { - refspec->matching = 1; - refspec->string = git__strdup(input); - GITERR_CHECK_ALLOC(refspec->string); - refspec->src = git__strdup(""); - GITERR_CHECK_ALLOC(refspec->src); - refspec->dst = git__strdup(""); - GITERR_CHECK_ALLOC(refspec->dst); - return 0; - } - - if (rhs) { - size_t rlen = strlen(++rhs); - is_glob = (1 <= rlen && strchr(rhs, '*')); - refspec->dst = git__strndup(rhs, rlen); - } - - llen = (rhs ? (size_t)(rhs - lhs - 1) : strlen(lhs)); - if (1 <= llen && memchr(lhs, '*', llen)) { - if ((rhs && !is_glob) || (!rhs && is_fetch)) - goto invalid; - is_glob = 1; - } else if (rhs && is_glob) - goto invalid; - - refspec->pattern = is_glob; - refspec->src = git__strndup(lhs, llen); - flags = GIT_REF_FORMAT_ALLOW_ONELEVEL | GIT_REF_FORMAT_REFSPEC_SHORTHAND - | (is_glob ? GIT_REF_FORMAT_REFSPEC_PATTERN : 0); - - if (is_fetch) { - /* - * LHS - * - empty is allowed; it means HEAD. - * - otherwise it must be a valid looking ref. - */ - if (!*refspec->src) - ; /* empty is ok */ - else if (!git_reference__is_valid_name(refspec->src, flags)) - goto invalid; - /* - * RHS - * - missing is ok, and is same as empty. - * - empty is ok; it means not to store. - * - otherwise it must be a valid looking ref. - */ - if (!refspec->dst) - ; /* ok */ - else if (!*refspec->dst) - ; /* ok */ - else if (!git_reference__is_valid_name(refspec->dst, flags)) - goto invalid; - } else { - /* - * LHS - * - empty is allowed; it means delete. - * - when wildcarded, it must be a valid looking ref. - * - otherwise, it must be an extended SHA-1, but - * there is no existing way to validate this. - */ - if (!*refspec->src) - ; /* empty is ok */ - else if (is_glob) { - if (!git_reference__is_valid_name(refspec->src, flags)) - goto invalid; - } - else { - ; /* anything goes, for now */ - } - /* - * RHS - * - missing is allowed, but LHS then must be a - * valid looking ref. - * - empty is not allowed. - * - otherwise it must be a valid looking ref. - */ - if (!refspec->dst) { - if (!git_reference__is_valid_name(refspec->src, flags)) - goto invalid; - } else if (!*refspec->dst) { - goto invalid; - } else { - if (!git_reference__is_valid_name(refspec->dst, flags)) - goto invalid; - } - - /* if the RHS is empty, then it's a copy of the LHS */ - if (!refspec->dst) { - refspec->dst = git__strdup(refspec->src); - GITERR_CHECK_ALLOC(refspec->dst); - } - } - - refspec->string = git__strdup(input); - GITERR_CHECK_ALLOC(refspec->string); - - return 0; - - invalid: - giterr_set( - GITERR_INVALID, - "'%s' is not a valid refspec.", input); - git_refspec__free(refspec); - return -1; -} - -void git_refspec__free(git_refspec *refspec) -{ - if (refspec == NULL) - return; - - git__free(refspec->src); - git__free(refspec->dst); - git__free(refspec->string); - - memset(refspec, 0x0, sizeof(git_refspec)); -} - -const char *git_refspec_src(const git_refspec *refspec) -{ - return refspec == NULL ? NULL : refspec->src; -} - -const char *git_refspec_dst(const git_refspec *refspec) -{ - return refspec == NULL ? NULL : refspec->dst; -} - -const char *git_refspec_string(const git_refspec *refspec) -{ - return refspec == NULL ? NULL : refspec->string; -} - -int git_refspec_force(const git_refspec *refspec) -{ - assert(refspec); - - return refspec->force; -} - -int git_refspec_src_matches(const git_refspec *refspec, const char *refname) -{ - if (refspec == NULL || refspec->src == NULL) - return false; - - return (p_fnmatch(refspec->src, refname, 0) == 0); -} - -int git_refspec_dst_matches(const git_refspec *refspec, const char *refname) -{ - if (refspec == NULL || refspec->dst == NULL) - return false; - - return (p_fnmatch(refspec->dst, refname, 0) == 0); -} - -static int refspec_transform( - git_buf *out, const char *from, const char *to, const char *name) -{ - const char *from_star, *to_star; - const char *name_slash, *from_slash; - size_t replacement_len, star_offset; - - git_buf_sanitize(out); - git_buf_clear(out); - - /* - * There are two parts to each side of a refspec, the bit - * before the star and the bit after it. The star can be in - * the middle of the pattern, so we need to look at each bit - * individually. - */ - from_star = strchr(from, '*'); - to_star = strchr(to, '*'); - - assert(from_star && to_star); - - /* star offset, both in 'from' and in 'name' */ - star_offset = from_star - from; - - /* the first half is copied over */ - git_buf_put(out, to, to_star - to); - - /* then we copy over the replacement, from the star's offset to the next slash in 'name' */ - name_slash = strchr(name + star_offset, '/'); - if (!name_slash) - name_slash = strrchr(name, '\0'); - - /* if there is no slash after the star in 'from', we want to copy everything over */ - from_slash = strchr(from + star_offset, '/'); - if (!from_slash) - name_slash = strrchr(name, '\0'); - - replacement_len = (name_slash - name) - star_offset; - git_buf_put(out, name + star_offset, replacement_len); - - return git_buf_puts(out, to_star + 1); -} - -int git_refspec_transform(git_buf *out, const git_refspec *spec, const char *name) -{ - assert(out && spec && name); - git_buf_sanitize(out); - - if (!git_refspec_src_matches(spec, name)) { - giterr_set(GITERR_INVALID, "ref '%s' doesn't match the source", name); - return -1; - } - - if (!spec->pattern) - return git_buf_puts(out, spec->dst); - - return refspec_transform(out, spec->src, spec->dst, name); -} - -int git_refspec_rtransform(git_buf *out, const git_refspec *spec, const char *name) -{ - assert(out && spec && name); - git_buf_sanitize(out); - - if (!git_refspec_dst_matches(spec, name)) { - giterr_set(GITERR_INVALID, "ref '%s' doesn't match the destination", name); - return -1; - } - - if (!spec->pattern) - return git_buf_puts(out, spec->src); - - return refspec_transform(out, spec->dst, spec->src, name); -} - -int git_refspec__serialize(git_buf *out, const git_refspec *refspec) -{ - if (refspec->force) - git_buf_putc(out, '+'); - - git_buf_printf(out, "%s:%s", - refspec->src != NULL ? refspec->src : "", - refspec->dst != NULL ? refspec->dst : ""); - - return git_buf_oom(out) == false; -} - -int git_refspec_is_wildcard(const git_refspec *spec) -{ - assert(spec && spec->src); - - return (spec->src[strlen(spec->src) - 1] == '*'); -} - -git_direction git_refspec_direction(const git_refspec *spec) -{ - assert(spec); - - return spec->push; -} - -int git_refspec__dwim_one(git_vector *out, git_refspec *spec, git_vector *refs) -{ - git_buf buf = GIT_BUF_INIT; - size_t j, pos; - git_remote_head key; - - const char* formatters[] = { - GIT_REFS_DIR "%s", - GIT_REFS_TAGS_DIR "%s", - GIT_REFS_HEADS_DIR "%s", - NULL - }; - - git_refspec *cur = git__calloc(1, sizeof(git_refspec)); - GITERR_CHECK_ALLOC(cur); - - cur->force = spec->force; - cur->push = spec->push; - cur->pattern = spec->pattern; - cur->matching = spec->matching; - cur->string = git__strdup(spec->string); - - /* shorthand on the lhs */ - if (git__prefixcmp(spec->src, GIT_REFS_DIR)) { - for (j = 0; formatters[j]; j++) { - git_buf_clear(&buf); - git_buf_printf(&buf, formatters[j], spec->src); - GITERR_CHECK_ALLOC_BUF(&buf); - - key.name = (char *) git_buf_cstr(&buf); - if (!git_vector_search(&pos, refs, &key)) { - /* we found something to match the shorthand, set src to that */ - cur->src = git_buf_detach(&buf); - } - } - } - - /* No shorthands found, copy over the name */ - if (cur->src == NULL && spec->src != NULL) { - cur->src = git__strdup(spec->src); - GITERR_CHECK_ALLOC(cur->src); - } - - if (spec->dst && git__prefixcmp(spec->dst, GIT_REFS_DIR)) { - /* if it starts with "remotes" then we just prepend "refs/" */ - if (!git__prefixcmp(spec->dst, "remotes/")) { - git_buf_puts(&buf, GIT_REFS_DIR); - } else { - git_buf_puts(&buf, GIT_REFS_HEADS_DIR); - } - - git_buf_puts(&buf, spec->dst); - GITERR_CHECK_ALLOC_BUF(&buf); - - cur->dst = git_buf_detach(&buf); - } - - git_buf_free(&buf); - - if (cur->dst == NULL && spec->dst != NULL) { - cur->dst = git__strdup(spec->dst); - GITERR_CHECK_ALLOC(cur->dst); - } - - return git_vector_insert(out, cur); -} diff --git a/vendor/libgit2/src/refspec.h b/vendor/libgit2/src/refspec.h deleted file mode 100644 index 9a87c97a5..000000000 --- a/vendor/libgit2/src/refspec.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_refspec_h__ -#define INCLUDE_refspec_h__ - -#include "git2/refspec.h" -#include "buffer.h" -#include "vector.h" - -struct git_refspec { - char *string; - char *src; - char *dst; - unsigned int force :1, - push : 1, - pattern :1, - matching :1; -}; - -#define GIT_REFSPEC_TAGS "refs/tags/*:refs/tags/*" - -int git_refspec__parse( - struct git_refspec *refspec, - const char *str, - bool is_fetch); - -void git_refspec__free(git_refspec *refspec); - -int git_refspec__serialize(git_buf *out, const git_refspec *refspec); - -/** - * Determines if a refspec is a wildcard refspec. - * - * @param spec the refspec - * @return 1 if the refspec is a wildcard, 0 otherwise - */ -int git_refspec_is_wildcard(const git_refspec *spec); - -/** - * DWIM `spec` with `refs` existing on the remote, append the dwim'ed - * result in `out`. - */ -int git_refspec__dwim_one(git_vector *out, git_refspec *spec, git_vector *refs); - -#endif diff --git a/vendor/libgit2/src/remote.c b/vendor/libgit2/src/remote.c deleted file mode 100644 index 8b7203ee2..000000000 --- a/vendor/libgit2/src/remote.c +++ /dev/null @@ -1,2539 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "git2/config.h" -#include "git2/types.h" -#include "git2/oid.h" -#include "git2/net.h" - -#include "common.h" -#include "config.h" -#include "repository.h" -#include "remote.h" -#include "fetch.h" -#include "refs.h" -#include "refspec.h" -#include "fetchhead.h" -#include "push.h" - -#define CONFIG_URL_FMT "remote.%s.url" -#define CONFIG_PUSHURL_FMT "remote.%s.pushurl" -#define CONFIG_FETCH_FMT "remote.%s.fetch" -#define CONFIG_PUSH_FMT "remote.%s.push" -#define CONFIG_TAGOPT_FMT "remote.%s.tagopt" - -static int dwim_refspecs(git_vector *out, git_vector *refspecs, git_vector *refs); -static int lookup_remote_prune_config(git_remote *remote, git_config *config, const char *name); -char *apply_insteadof(git_config *config, const char *url, int direction); - -static int add_refspec_to(git_vector *vector, const char *string, bool is_fetch) -{ - git_refspec *spec; - - spec = git__calloc(1, sizeof(git_refspec)); - GITERR_CHECK_ALLOC(spec); - - if (git_refspec__parse(spec, string, is_fetch) < 0) { - git__free(spec); - return -1; - } - - spec->push = !is_fetch; - if (git_vector_insert(vector, spec) < 0) { - git_refspec__free(spec); - git__free(spec); - return -1; - } - - return 0; -} - -static int add_refspec(git_remote *remote, const char *string, bool is_fetch) -{ - return add_refspec_to(&remote->refspecs, string, is_fetch); -} - -static int download_tags_value(git_remote *remote, git_config *cfg) -{ - git_config_entry *ce; - git_buf buf = GIT_BUF_INIT; - int error; - - if (git_buf_printf(&buf, "remote.%s.tagopt", remote->name) < 0) - return -1; - - error = git_config__lookup_entry(&ce, cfg, git_buf_cstr(&buf), false); - git_buf_free(&buf); - - if (!error && ce && ce->value) { - if (!strcmp(ce->value, "--no-tags")) - remote->download_tags = GIT_REMOTE_DOWNLOAD_TAGS_NONE; - else if (!strcmp(ce->value, "--tags")) - remote->download_tags = GIT_REMOTE_DOWNLOAD_TAGS_ALL; - } - - git_config_entry_free(ce); - return error; -} - -static int ensure_remote_name_is_valid(const char *name) -{ - int error = 0; - - if (!git_remote_is_valid_name(name)) { - giterr_set( - GITERR_CONFIG, - "'%s' is not a valid remote name.", name ? name : "(null)"); - error = GIT_EINVALIDSPEC; - } - - return error; -} - -static int write_add_refspec(git_repository *repo, const char *name, const char *refspec, bool fetch) -{ - git_config *cfg; - git_buf var = GIT_BUF_INIT; - git_refspec spec; - const char *fmt; - int error; - - if ((error = git_repository_config__weakptr(&cfg, repo)) < 0) - return error; - - fmt = fetch ? CONFIG_FETCH_FMT : CONFIG_PUSH_FMT; - - if ((error = ensure_remote_name_is_valid(name)) < 0) - return error; - - if ((error = git_refspec__parse(&spec, refspec, fetch)) < 0) { - if (giterr_last()->klass != GITERR_NOMEMORY) - error = GIT_EINVALIDSPEC; - - return error; - } - - git_refspec__free(&spec); - - if ((error = git_buf_printf(&var, fmt, name)) < 0) - return error; - - /* - * "$^" is a unmatcheable regexp: it will not match anything at all, so - * all values will be considered new and we will not replace any - * present value. - */ - if ((error = git_config_set_multivar(cfg, var.ptr, "$^", refspec)) < 0) { - goto cleanup; - } - -cleanup: - git_buf_free(&var); - return 0; -} - -#if 0 -/* We could export this as a helper */ -static int get_check_cert(int *out, git_repository *repo) -{ - git_config *cfg; - const char *val; - int error = 0; - - assert(out && repo); - - /* By default, we *DO* want to verify the certificate. */ - *out = 1; - - /* Go through the possible sources for SSL verification settings, from - * most specific to least specific. */ - - /* GIT_SSL_NO_VERIFY environment variable */ - if ((val = p_getenv("GIT_SSL_NO_VERIFY")) != NULL) - return git_config_parse_bool(out, val); - - /* http.sslVerify config setting */ - if ((error = git_repository_config__weakptr(&cfg, repo)) < 0) - return error; - - *out = git_config__get_bool_force(cfg, "http.sslverify", 1); - return 0; -} -#endif - -static int canonicalize_url(git_buf *out, const char *in) -{ - if (in == NULL || strlen(in) == 0) { - giterr_set(GITERR_INVALID, "cannot set empty URL"); - return GIT_EINVALIDSPEC; - } - -#ifdef GIT_WIN32 - /* Given a UNC path like \\server\path, we need to convert this - * to //server/path for compatibility with core git. - */ - if (in[0] == '\\' && in[1] == '\\' && - (git__isalpha(in[2]) || git__isdigit(in[2]))) { - const char *c; - for (c = in; *c; c++) - git_buf_putc(out, *c == '\\' ? '/' : *c); - - return git_buf_oom(out) ? -1 : 0; - } -#endif - - return git_buf_puts(out, in); -} - -static int create_internal(git_remote **out, git_repository *repo, const char *name, const char *url, const char *fetch) -{ - git_remote *remote; - git_config *config = NULL; - git_buf canonical_url = GIT_BUF_INIT; - git_buf var = GIT_BUF_INIT; - int error = -1; - - /* name is optional */ - assert(out && repo && url); - - if ((error = git_repository_config__weakptr(&config, repo)) < 0) - return error; - - remote = git__calloc(1, sizeof(git_remote)); - GITERR_CHECK_ALLOC(remote); - - remote->repo = repo; - - if ((error = git_vector_init(&remote->refs, 32, NULL)) < 0 || - (error = canonicalize_url(&canonical_url, url)) < 0) - goto on_error; - - remote->url = apply_insteadof(repo->_config, canonical_url.ptr, GIT_DIRECTION_FETCH); - - if (name != NULL) { - remote->name = git__strdup(name); - GITERR_CHECK_ALLOC(remote->name); - - if ((error = git_buf_printf(&var, CONFIG_URL_FMT, name)) < 0) - goto on_error; - - if ((error = git_config_set_string(config, var.ptr, canonical_url.ptr)) < 0) - goto on_error; - } - - if (fetch != NULL) { - if ((error = add_refspec(remote, fetch, true)) < 0) - goto on_error; - - /* only write for non-anonymous remotes */ - if (name && (error = write_add_refspec(repo, name, fetch, true)) < 0) - goto on_error; - - if ((error = git_repository_config_snapshot(&config, repo)) < 0) - goto on_error; - - if ((error = lookup_remote_prune_config(remote, config, name)) < 0) - goto on_error; - - /* Move the data over to where the matching functions can find them */ - if ((error = dwim_refspecs(&remote->active_refspecs, &remote->refspecs, &remote->refs)) < 0) - goto on_error; - } - - /* A remote without a name doesn't download tags */ - if (!name) - remote->download_tags = GIT_REMOTE_DOWNLOAD_TAGS_NONE; - else - remote->download_tags = GIT_REMOTE_DOWNLOAD_TAGS_AUTO; - - - git_buf_free(&var); - - *out = remote; - error = 0; - -on_error: - if (error) - git_remote_free(remote); - - git_config_free(config); - git_buf_free(&canonical_url); - git_buf_free(&var); - return error; -} - -static int ensure_remote_doesnot_exist(git_repository *repo, const char *name) -{ - int error; - git_remote *remote; - - error = git_remote_lookup(&remote, repo, name); - - if (error == GIT_ENOTFOUND) - return 0; - - if (error < 0) - return error; - - git_remote_free(remote); - - giterr_set( - GITERR_CONFIG, - "Remote '%s' already exists.", name); - - return GIT_EEXISTS; -} - - -int git_remote_create(git_remote **out, git_repository *repo, const char *name, const char *url) -{ - git_buf buf = GIT_BUF_INIT; - int error; - - if (git_buf_printf(&buf, "+refs/heads/*:refs/remotes/%s/*", name) < 0) - return -1; - - error = git_remote_create_with_fetchspec(out, repo, name, url, git_buf_cstr(&buf)); - git_buf_free(&buf); - - return error; -} - -int git_remote_create_with_fetchspec(git_remote **out, git_repository *repo, const char *name, const char *url, const char *fetch) -{ - git_remote *remote = NULL; - int error; - - if ((error = ensure_remote_name_is_valid(name)) < 0) - return error; - - if ((error = ensure_remote_doesnot_exist(repo, name)) < 0) - return error; - - if (create_internal(&remote, repo, name, url, fetch) < 0) - goto on_error; - - *out = remote; - - return 0; - -on_error: - git_remote_free(remote); - return -1; -} - -int git_remote_create_anonymous(git_remote **out, git_repository *repo, const char *url) -{ - return create_internal(out, repo, NULL, url, NULL); -} - -int git_remote_dup(git_remote **dest, git_remote *source) -{ - size_t i; - int error = 0; - git_refspec *spec; - git_remote *remote = git__calloc(1, sizeof(git_remote)); - GITERR_CHECK_ALLOC(remote); - - if (source->name != NULL) { - remote->name = git__strdup(source->name); - GITERR_CHECK_ALLOC(remote->name); - } - - if (source->url != NULL) { - remote->url = git__strdup(source->url); - GITERR_CHECK_ALLOC(remote->url); - } - - if (source->pushurl != NULL) { - remote->pushurl = git__strdup(source->pushurl); - GITERR_CHECK_ALLOC(remote->pushurl); - } - - remote->repo = source->repo; - remote->download_tags = source->download_tags; - remote->prune_refs = source->prune_refs; - - if (git_vector_init(&remote->refs, 32, NULL) < 0 || - git_vector_init(&remote->refspecs, 2, NULL) < 0 || - git_vector_init(&remote->active_refspecs, 2, NULL) < 0) { - error = -1; - goto cleanup; - } - - git_vector_foreach(&source->refspecs, i, spec) { - if ((error = add_refspec(remote, spec->string, !spec->push)) < 0) - goto cleanup; - } - - *dest = remote; - -cleanup: - - if (error < 0) - git__free(remote); - - return error; -} - -struct refspec_cb_data { - git_remote *remote; - int fetch; -}; - -static int refspec_cb(const git_config_entry *entry, void *payload) -{ - struct refspec_cb_data *data = (struct refspec_cb_data *)payload; - return add_refspec(data->remote, entry->value, data->fetch); -} - -static int get_optional_config( - bool *found, git_config *config, git_buf *buf, - git_config_foreach_cb cb, void *payload) -{ - int error = 0; - const char *key = git_buf_cstr(buf); - - if (git_buf_oom(buf)) - return -1; - - if (cb != NULL) - error = git_config_get_multivar_foreach(config, key, NULL, cb, payload); - else - error = git_config_get_string(payload, config, key); - - if (found) - *found = !error; - - if (error == GIT_ENOTFOUND) { - giterr_clear(); - error = 0; - } - - return error; -} - -int git_remote_lookup(git_remote **out, git_repository *repo, const char *name) -{ - git_remote *remote; - git_buf buf = GIT_BUF_INIT; - const char *val; - int error = 0; - git_config *config; - struct refspec_cb_data data = { NULL }; - bool optional_setting_found = false, found; - - assert(out && repo && name); - - if ((error = ensure_remote_name_is_valid(name)) < 0) - return error; - - if ((error = git_repository_config_snapshot(&config, repo)) < 0) - return error; - - remote = git__calloc(1, sizeof(git_remote)); - GITERR_CHECK_ALLOC(remote); - - remote->name = git__strdup(name); - GITERR_CHECK_ALLOC(remote->name); - - if (git_vector_init(&remote->refs, 32, NULL) < 0 || - git_vector_init(&remote->refspecs, 2, NULL) < 0 || - git_vector_init(&remote->passive_refspecs, 2, NULL) < 0 || - git_vector_init(&remote->active_refspecs, 2, NULL) < 0) { - error = -1; - goto cleanup; - } - - if ((error = git_buf_printf(&buf, "remote.%s.url", name)) < 0) - goto cleanup; - - if ((error = get_optional_config(&found, config, &buf, NULL, (void *)&val)) < 0) - goto cleanup; - - optional_setting_found |= found; - - remote->repo = repo; - remote->download_tags = GIT_REMOTE_DOWNLOAD_TAGS_AUTO; - - if (found && strlen(val) > 0) { - remote->url = apply_insteadof(config, val, GIT_DIRECTION_FETCH); - GITERR_CHECK_ALLOC(remote->url); - } - - val = NULL; - git_buf_clear(&buf); - git_buf_printf(&buf, "remote.%s.pushurl", name); - - if ((error = get_optional_config(&found, config, &buf, NULL, (void *)&val)) < 0) - goto cleanup; - - optional_setting_found |= found; - - if (!optional_setting_found) { - error = GIT_ENOTFOUND; - giterr_set(GITERR_CONFIG, "Remote '%s' does not exist.", name); - goto cleanup; - } - - if (found && strlen(val) > 0) { - remote->pushurl = apply_insteadof(config, val, GIT_DIRECTION_PUSH); - GITERR_CHECK_ALLOC(remote->pushurl); - } - - data.remote = remote; - data.fetch = true; - - git_buf_clear(&buf); - git_buf_printf(&buf, "remote.%s.fetch", name); - - if ((error = get_optional_config(NULL, config, &buf, refspec_cb, &data)) < 0) - goto cleanup; - - data.fetch = false; - git_buf_clear(&buf); - git_buf_printf(&buf, "remote.%s.push", name); - - if ((error = get_optional_config(NULL, config, &buf, refspec_cb, &data)) < 0) - goto cleanup; - - if (download_tags_value(remote, config) < 0) - goto cleanup; - - if ((error = lookup_remote_prune_config(remote, config, name)) < 0) - goto cleanup; - - /* Move the data over to where the matching functions can find them */ - if ((error = dwim_refspecs(&remote->active_refspecs, &remote->refspecs, &remote->refs)) < 0) - goto cleanup; - - *out = remote; - -cleanup: - git_config_free(config); - git_buf_free(&buf); - - if (error < 0) - git_remote_free(remote); - - return error; -} - -static int lookup_remote_prune_config(git_remote *remote, git_config *config, const char *name) -{ - git_buf buf = GIT_BUF_INIT; - int error = 0; - - git_buf_printf(&buf, "remote.%s.prune", name); - - if ((error = git_config_get_bool(&remote->prune_refs, config, git_buf_cstr(&buf))) < 0) { - if (error == GIT_ENOTFOUND) { - giterr_clear(); - - if ((error = git_config_get_bool(&remote->prune_refs, config, "fetch.prune")) < 0) { - if (error == GIT_ENOTFOUND) { - giterr_clear(); - error = 0; - } - } - } - } - - git_buf_free(&buf); - return error; -} - -static int update_config_refspec(const git_remote *remote, git_config *config, int direction) -{ - git_buf name = GIT_BUF_INIT; - unsigned int push; - const char *dir; - size_t i; - int error = 0; - const char *cname; - - push = direction == GIT_DIRECTION_PUSH; - dir = push ? "push" : "fetch"; - - if (git_buf_printf(&name, "remote.%s.%s", remote->name, dir) < 0) - return -1; - cname = git_buf_cstr(&name); - - /* Clear out the existing config */ - while (!error) - error = git_config_delete_multivar(config, cname, ".*"); - - if (error != GIT_ENOTFOUND) - return error; - - for (i = 0; i < remote->refspecs.length; i++) { - git_refspec *spec = git_vector_get(&remote->refspecs, i); - - if (spec->push != push) - continue; - - // "$^" is a unmatcheable regexp: it will not match anything at all, so - // all values will be considered new and we will not replace any - // present value. - if ((error = git_config_set_multivar( - config, cname, "$^", spec->string)) < 0) { - goto cleanup; - } - } - - giterr_clear(); - error = 0; - -cleanup: - git_buf_free(&name); - - return error; -} - -const char *git_remote_name(const git_remote *remote) -{ - assert(remote); - return remote->name; -} - -git_repository *git_remote_owner(const git_remote *remote) -{ - assert(remote); - return remote->repo; -} - -const char *git_remote_url(const git_remote *remote) -{ - assert(remote); - return remote->url; -} - -static int set_url(git_repository *repo, const char *remote, const char *pattern, const char *url) -{ - git_config *cfg; - git_buf buf = GIT_BUF_INIT, canonical_url = GIT_BUF_INIT; - int error; - - assert(repo && remote); - - if ((error = ensure_remote_name_is_valid(remote)) < 0) - return error; - - if ((error = git_repository_config__weakptr(&cfg, repo)) < 0) - return error; - - if ((error = git_buf_printf(&buf, pattern, remote)) < 0) - return error; - - if (url) { - if ((error = canonicalize_url(&canonical_url, url)) < 0) - goto cleanup; - - error = git_config_set_string(cfg, buf.ptr, url); - } else { - error = git_config_delete_entry(cfg, buf.ptr); - } - -cleanup: - git_buf_free(&canonical_url); - git_buf_free(&buf); - - return error; -} - -int git_remote_set_url(git_repository *repo, const char *remote, const char *url) -{ - return set_url(repo, remote, CONFIG_URL_FMT, url); -} - -const char *git_remote_pushurl(const git_remote *remote) -{ - assert(remote); - return remote->pushurl; -} - -int git_remote_set_pushurl(git_repository *repo, const char *remote, const char* url) -{ - return set_url(repo, remote, CONFIG_PUSHURL_FMT, url); -} - -const char* git_remote__urlfordirection(git_remote *remote, int direction) -{ - assert(remote); - - assert(direction == GIT_DIRECTION_FETCH || direction == GIT_DIRECTION_PUSH); - - if (direction == GIT_DIRECTION_FETCH) { - return remote->url; - } - - if (direction == GIT_DIRECTION_PUSH) { - return remote->pushurl ? remote->pushurl : remote->url; - } - - return NULL; -} - -int set_transport_callbacks(git_transport *t, const git_remote_callbacks *cbs) -{ - if (!t->set_callbacks || !cbs) - return 0; - - return t->set_callbacks(t, cbs->sideband_progress, NULL, - cbs->certificate_check, cbs->payload); -} - -static int set_transport_custom_headers(git_transport *t, const git_strarray *custom_headers) -{ - if (!t->set_custom_headers) - return 0; - - return t->set_custom_headers(t, custom_headers); -} - -int git_remote_connect(git_remote *remote, git_direction direction, const git_remote_callbacks *callbacks, const git_strarray *custom_headers) -{ - git_transport *t; - const char *url; - int flags = GIT_TRANSPORTFLAGS_NONE; - int error; - void *payload = NULL; - git_cred_acquire_cb credentials = NULL; - git_transport_cb transport = NULL; - - assert(remote); - - if (callbacks) { - GITERR_CHECK_VERSION(callbacks, GIT_REMOTE_CALLBACKS_VERSION, "git_remote_callbacks"); - credentials = callbacks->credentials; - transport = callbacks->transport; - payload = callbacks->payload; - } - - t = remote->transport; - - url = git_remote__urlfordirection(remote, direction); - if (url == NULL) { - giterr_set(GITERR_INVALID, - "Malformed remote '%s' - missing URL", remote->name); - return -1; - } - - /* If we don't have a transport object yet, and the caller specified a - * custom transport factory, use that */ - if (!t && transport && - (error = transport(&t, remote, payload)) < 0) - return error; - - /* If we still don't have a transport, then use the global - * transport registrations which map URI schemes to transport factories */ - if (!t && (error = git_transport_new(&t, remote, url)) < 0) - return error; - - if ((error = set_transport_custom_headers(t, custom_headers)) != 0) - goto on_error; - - if ((error = set_transport_callbacks(t, callbacks)) < 0 || - (error = t->connect(t, url, credentials, payload, direction, flags)) != 0) - goto on_error; - - remote->transport = t; - - return 0; - -on_error: - t->free(t); - - if (t == remote->transport) - remote->transport = NULL; - - return error; -} - -int git_remote_ls(const git_remote_head ***out, size_t *size, git_remote *remote) -{ - assert(remote); - - if (!remote->transport) { - giterr_set(GITERR_NET, "this remote has never connected"); - return -1; - } - - return remote->transport->ls(out, size, remote->transport); -} - -int git_remote__get_http_proxy(git_remote *remote, bool use_ssl, char **proxy_url) -{ - git_config *cfg; - git_config_entry *ce = NULL; - git_buf val = GIT_BUF_INIT; - int error; - - assert(remote); - - if (!proxy_url || !remote->repo) - return -1; - - *proxy_url = NULL; - - if ((error = git_repository_config__weakptr(&cfg, remote->repo)) < 0) - return error; - - /* Go through the possible sources for proxy configuration, from most specific - * to least specific. */ - - /* remote..proxy config setting */ - if (remote->name && remote->name[0]) { - git_buf buf = GIT_BUF_INIT; - - if ((error = git_buf_printf(&buf, "remote.%s.proxy", remote->name)) < 0) - return error; - - error = git_config__lookup_entry(&ce, cfg, git_buf_cstr(&buf), false); - git_buf_free(&buf); - - if (error < 0) - return error; - - if (ce && ce->value) { - *proxy_url = git__strdup(ce->value); - goto found; - } - } - - /* http.proxy config setting */ - if ((error = git_config__lookup_entry(&ce, cfg, "http.proxy", false)) < 0) - return error; - - if (ce && ce->value) { - *proxy_url = git__strdup(ce->value); - goto found; - } - - /* HTTP_PROXY / HTTPS_PROXY environment variables */ - error = git__getenv(&val, use_ssl ? "HTTPS_PROXY" : "HTTP_PROXY"); - - if (error < 0) { - if (error == GIT_ENOTFOUND) { - giterr_clear(); - error = 0; - } - - return error; - } - - *proxy_url = git_buf_detach(&val); - -found: - GITERR_CHECK_ALLOC(*proxy_url); - git_config_entry_free(ce); - - return 0; -} - -/* DWIM `refspecs` based on `refs` and append the output to `out` */ -static int dwim_refspecs(git_vector *out, git_vector *refspecs, git_vector *refs) -{ - size_t i; - git_refspec *spec; - - git_vector_foreach(refspecs, i, spec) { - if (git_refspec__dwim_one(out, spec, refs) < 0) - return -1; - } - - return 0; -} - -static void free_refspecs(git_vector *vec) -{ - size_t i; - git_refspec *spec; - - git_vector_foreach(vec, i, spec) { - git_refspec__free(spec); - git__free(spec); - } - - git_vector_clear(vec); -} - -static int remote_head_cmp(const void *_a, const void *_b) -{ - const git_remote_head *a = (git_remote_head *) _a; - const git_remote_head *b = (git_remote_head *) _b; - - return git__strcmp_cb(a->name, b->name); -} - -static int ls_to_vector(git_vector *out, git_remote *remote) -{ - git_remote_head **heads; - size_t heads_len, i; - - if (git_remote_ls((const git_remote_head ***)&heads, &heads_len, remote) < 0) - return -1; - - if (git_vector_init(out, heads_len, remote_head_cmp) < 0) - return -1; - - for (i = 0; i < heads_len; i++) { - if (git_vector_insert(out, heads[i]) < 0) - return -1; - } - - return 0; -} - -int git_remote_download(git_remote *remote, const git_strarray *refspecs, const git_fetch_options *opts) -{ - int error = -1; - size_t i; - git_vector *to_active, specs = GIT_VECTOR_INIT, refs = GIT_VECTOR_INIT; - const git_remote_callbacks *cbs = NULL; - const git_strarray *custom_headers = NULL; - - assert(remote); - - if (opts) { - GITERR_CHECK_VERSION(&opts->callbacks, GIT_REMOTE_CALLBACKS_VERSION, "git_remote_callbacks"); - cbs = &opts->callbacks; - custom_headers = &opts->custom_headers; - } - - if (!git_remote_connected(remote) && - (error = git_remote_connect(remote, GIT_DIRECTION_FETCH, cbs, custom_headers)) < 0) - goto on_error; - - if (ls_to_vector(&refs, remote) < 0) - return -1; - - if ((git_vector_init(&specs, 0, NULL)) < 0) - goto on_error; - - remote->passed_refspecs = 0; - if (!refspecs || !refspecs->count) { - to_active = &remote->refspecs; - } else { - for (i = 0; i < refspecs->count; i++) { - if ((error = add_refspec_to(&specs, refspecs->strings[i], true)) < 0) - goto on_error; - } - - to_active = &specs; - remote->passed_refspecs = 1; - } - - free_refspecs(&remote->passive_refspecs); - if ((error = dwim_refspecs(&remote->passive_refspecs, &remote->refspecs, &refs)) < 0) - goto on_error; - - free_refspecs(&remote->active_refspecs); - error = dwim_refspecs(&remote->active_refspecs, to_active, &refs); - - git_vector_free(&refs); - free_refspecs(&specs); - git_vector_free(&specs); - - if (error < 0) - return error; - - if (remote->push) { - git_push_free(remote->push); - remote->push = NULL; - } - - if ((error = git_fetch_negotiate(remote, opts)) < 0) - return error; - - return git_fetch_download_pack(remote, cbs); - -on_error: - git_vector_free(&refs); - free_refspecs(&specs); - git_vector_free(&specs); - return error; -} - -int git_remote_fetch( - git_remote *remote, - const git_strarray *refspecs, - const git_fetch_options *opts, - const char *reflog_message) -{ - int error, update_fetchhead = 1; - git_remote_autotag_option_t tagopt = remote->download_tags; - bool prune = false; - git_buf reflog_msg_buf = GIT_BUF_INIT; - const git_remote_callbacks *cbs = NULL; - const git_strarray *custom_headers = NULL; - - if (opts) { - GITERR_CHECK_VERSION(&opts->callbacks, GIT_REMOTE_CALLBACKS_VERSION, "git_remote_callbacks"); - cbs = &opts->callbacks; - custom_headers = &opts->custom_headers; - update_fetchhead = opts->update_fetchhead; - tagopt = opts->download_tags; - } - - /* Connect and download everything */ - if ((error = git_remote_connect(remote, GIT_DIRECTION_FETCH, cbs, custom_headers)) != 0) - return error; - - error = git_remote_download(remote, refspecs, opts); - - /* We don't need to be connected anymore */ - git_remote_disconnect(remote); - - /* If the download failed, return the error */ - if (error != 0) - return error; - - /* Default reflog message */ - if (reflog_message) - git_buf_sets(&reflog_msg_buf, reflog_message); - else { - git_buf_printf(&reflog_msg_buf, "fetch %s", - remote->name ? remote->name : remote->url); - } - - /* Create "remote/foo" branches for all remote branches */ - error = git_remote_update_tips(remote, cbs, update_fetchhead, tagopt, git_buf_cstr(&reflog_msg_buf)); - git_buf_free(&reflog_msg_buf); - if (error < 0) - return error; - - if (opts && opts->prune == GIT_FETCH_PRUNE) - prune = true; - else if (opts && opts->prune == GIT_FETCH_PRUNE_UNSPECIFIED && remote->prune_refs) - prune = true; - else if (opts && opts->prune == GIT_FETCH_NO_PRUNE) - prune = false; - else - prune = remote->prune_refs; - - if (prune) - error = git_remote_prune(remote, cbs); - - return error; -} - -static int remote_head_for_fetchspec_src(git_remote_head **out, git_vector *update_heads, const char *fetchspec_src) -{ - unsigned int i; - git_remote_head *remote_ref; - - assert(update_heads && fetchspec_src); - - *out = NULL; - - git_vector_foreach(update_heads, i, remote_ref) { - if (strcmp(remote_ref->name, fetchspec_src) == 0) { - *out = remote_ref; - break; - } - } - - return 0; -} - -static int ref_to_update(int *update, git_buf *remote_name, git_remote *remote, git_refspec *spec, const char *ref_name) -{ - int error = 0; - git_repository *repo; - git_buf upstream_remote = GIT_BUF_INIT; - git_buf upstream_name = GIT_BUF_INIT; - - repo = git_remote_owner(remote); - - if ((!git_reference__is_branch(ref_name)) || - !git_remote_name(remote) || - (error = git_branch_upstream_remote(&upstream_remote, repo, ref_name) < 0) || - git__strcmp(git_remote_name(remote), git_buf_cstr(&upstream_remote)) || - (error = git_branch_upstream_name(&upstream_name, repo, ref_name)) < 0 || - !git_refspec_dst_matches(spec, git_buf_cstr(&upstream_name)) || - (error = git_refspec_rtransform(remote_name, spec, upstream_name.ptr)) < 0) { - /* Not an error if there is no upstream */ - if (error == GIT_ENOTFOUND) { - giterr_clear(); - error = 0; - } - - *update = 0; - } else { - *update = 1; - } - - git_buf_free(&upstream_remote); - git_buf_free(&upstream_name); - return error; -} - -static int remote_head_for_ref(git_remote_head **out, git_remote *remote, git_refspec *spec, git_vector *update_heads, git_reference *ref) -{ - git_reference *resolved_ref = NULL; - git_buf remote_name = GIT_BUF_INIT; - git_config *config = NULL; - const char *ref_name; - int error = 0, update; - - assert(out && spec && ref); - - *out = NULL; - - error = git_reference_resolve(&resolved_ref, ref); - - /* If we're in an unborn branch, let's pretend nothing happened */ - if (error == GIT_ENOTFOUND && git_reference_type(ref) == GIT_REF_SYMBOLIC) { - ref_name = git_reference_symbolic_target(ref); - error = 0; - } else { - ref_name = git_reference_name(resolved_ref); - } - - if ((error = ref_to_update(&update, &remote_name, remote, spec, ref_name)) < 0) - goto cleanup; - - if (update) - error = remote_head_for_fetchspec_src(out, update_heads, git_buf_cstr(&remote_name)); - -cleanup: - git_buf_free(&remote_name); - git_reference_free(resolved_ref); - git_config_free(config); - return error; -} - -static int git_remote_write_fetchhead(git_remote *remote, git_refspec *spec, git_vector *update_heads) -{ - git_reference *head_ref = NULL; - git_fetchhead_ref *fetchhead_ref; - git_remote_head *remote_ref, *merge_remote_ref; - git_vector fetchhead_refs; - bool include_all_fetchheads; - unsigned int i = 0; - int error = 0; - - assert(remote); - - /* no heads, nothing to do */ - if (update_heads->length == 0) - return 0; - - if (git_vector_init(&fetchhead_refs, update_heads->length, git_fetchhead_ref_cmp) < 0) - return -1; - - /* Iff refspec is * (but not subdir slash star), include tags */ - include_all_fetchheads = (strcmp(GIT_REFS_HEADS_DIR "*", git_refspec_src(spec)) == 0); - - /* Determine what to merge: if refspec was a wildcard, just use HEAD */ - if (git_refspec_is_wildcard(spec)) { - if ((error = git_reference_lookup(&head_ref, remote->repo, GIT_HEAD_FILE)) < 0 || - (error = remote_head_for_ref(&merge_remote_ref, remote, spec, update_heads, head_ref)) < 0) - goto cleanup; - } else { - /* If we're fetching a single refspec, that's the only thing that should be in FETCH_HEAD. */ - if ((error = remote_head_for_fetchspec_src(&merge_remote_ref, update_heads, git_refspec_src(spec))) < 0) - goto cleanup; - } - - /* Create the FETCH_HEAD file */ - git_vector_foreach(update_heads, i, remote_ref) { - int merge_this_fetchhead = (merge_remote_ref == remote_ref); - - if (!include_all_fetchheads && - !git_refspec_src_matches(spec, remote_ref->name) && - !merge_this_fetchhead) - continue; - - if (git_fetchhead_ref_create(&fetchhead_ref, - &remote_ref->oid, - merge_this_fetchhead, - remote_ref->name, - git_remote_url(remote)) < 0) - goto cleanup; - - if (git_vector_insert(&fetchhead_refs, fetchhead_ref) < 0) - goto cleanup; - } - - git_fetchhead_write(remote->repo, &fetchhead_refs); - -cleanup: - for (i = 0; i < fetchhead_refs.length; ++i) - git_fetchhead_ref_free(fetchhead_refs.contents[i]); - - git_vector_free(&fetchhead_refs); - git_reference_free(head_ref); - - return error; -} - -/** - * Generate a list of candidates for pruning by getting a list of - * references which match the rhs of an active refspec. - */ -static int prune_candidates(git_vector *candidates, git_remote *remote) -{ - git_strarray arr = { 0 }; - size_t i; - int error; - - if ((error = git_reference_list(&arr, remote->repo)) < 0) - return error; - - for (i = 0; i < arr.count; i++) { - const char *refname = arr.strings[i]; - char *refname_dup; - - if (!git_remote__matching_dst_refspec(remote, refname)) - continue; - - refname_dup = git__strdup(refname); - GITERR_CHECK_ALLOC(refname_dup); - - if ((error = git_vector_insert(candidates, refname_dup)) < 0) - goto out; - } - -out: - git_strarray_free(&arr); - return error; -} - -static int find_head(const void *_a, const void *_b) -{ - git_remote_head *a = (git_remote_head *) _a; - git_remote_head *b = (git_remote_head *) _b; - - return strcmp(a->name, b->name); -} - -int git_remote_prune(git_remote *remote, const git_remote_callbacks *callbacks) -{ - size_t i, j; - git_vector remote_refs = GIT_VECTOR_INIT; - git_vector candidates = GIT_VECTOR_INIT; - const git_refspec *spec; - const char *refname; - int error; - git_oid zero_id = {{ 0 }}; - - if (callbacks) - GITERR_CHECK_VERSION(callbacks, GIT_REMOTE_CALLBACKS_VERSION, "git_remote_callbacks"); - - if ((error = ls_to_vector(&remote_refs, remote)) < 0) - goto cleanup; - - git_vector_set_cmp(&remote_refs, find_head); - - if ((error = prune_candidates(&candidates, remote)) < 0) - goto cleanup; - - /* - * Remove those entries from the candidate list for which we - * can find a remote reference in at least one refspec. - */ - git_vector_foreach(&candidates, i, refname) { - git_vector_foreach(&remote->active_refspecs, j, spec) { - git_buf buf = GIT_BUF_INIT; - size_t pos; - char *src_name; - git_remote_head key = {0}; - - if (!git_refspec_dst_matches(spec, refname)) - continue; - - if ((error = git_refspec_rtransform(&buf, spec, refname)) < 0) - goto cleanup; - - key.name = (char *) git_buf_cstr(&buf); - error = git_vector_search(&pos, &remote_refs, &key); - git_buf_free(&buf); - - if (error < 0 && error != GIT_ENOTFOUND) - goto cleanup; - - if (error == GIT_ENOTFOUND) - continue; - - /* if we did find a source, remove it from the candiates */ - if ((error = git_vector_set((void **) &src_name, &candidates, i, NULL)) < 0) - goto cleanup; - - git__free(src_name); - break; - } - } - - /* - * For those candidates still left in the list, we need to - * remove them. We do not remove symrefs, as those are for - * stuff like origin/HEAD which will never match, but we do - * not want to remove them. - */ - git_vector_foreach(&candidates, i, refname) { - git_reference *ref; - git_oid id; - - if (refname == NULL) - continue; - - error = git_reference_lookup(&ref, remote->repo, refname); - /* as we want it gone, let's not consider this an error */ - if (error == GIT_ENOTFOUND) - continue; - - if (error < 0) - goto cleanup; - - if (git_reference_type(ref) == GIT_REF_SYMBOLIC) { - git_reference_free(ref); - continue; - } - - git_oid_cpy(&id, git_reference_target(ref)); - error = git_reference_delete(ref); - git_reference_free(ref); - if (error < 0) - goto cleanup; - - if (callbacks && callbacks->update_tips) - error = callbacks->update_tips(refname, &id, &zero_id, callbacks->payload); - - if (error < 0) - goto cleanup; - } - -cleanup: - git_vector_free(&remote_refs); - git_vector_free_deep(&candidates); - return error; -} - -static int update_tips_for_spec( - git_remote *remote, - const git_remote_callbacks *callbacks, - int update_fetchhead, - git_remote_autotag_option_t tagopt, - git_refspec *spec, - git_vector *refs, - const char *log_message) -{ - int error = 0, autotag; - unsigned int i = 0; - git_buf refname = GIT_BUF_INIT; - git_oid old; - git_odb *odb; - git_remote_head *head; - git_reference *ref; - git_refspec tagspec; - git_vector update_heads; - - assert(remote); - - if (git_repository_odb__weakptr(&odb, remote->repo) < 0) - return -1; - - if (git_refspec__parse(&tagspec, GIT_REFSPEC_TAGS, true) < 0) - return -1; - - /* Make a copy of the transport's refs */ - if (git_vector_init(&update_heads, 16, NULL) < 0) - return -1; - - for (; i < refs->length; ++i) { - head = git_vector_get(refs, i); - autotag = 0; - git_buf_clear(&refname); - - /* Ignore malformed ref names (which also saves us from tag^{} */ - if (!git_reference_is_valid_name(head->name)) - continue; - - /* If we have a tag, see if the auto-follow rules say to update it */ - if (git_refspec_src_matches(&tagspec, head->name)) { - if (tagopt != GIT_REMOTE_DOWNLOAD_TAGS_NONE) { - - if (tagopt == GIT_REMOTE_DOWNLOAD_TAGS_AUTO) - autotag = 1; - - git_buf_clear(&refname); - if (git_buf_puts(&refname, head->name) < 0) - goto on_error; - } - } - - /* If we didn't want to auto-follow the tag, check if the refspec matches */ - if (!autotag && git_refspec_src_matches(spec, head->name)) { - if (spec->dst) { - if (git_refspec_transform(&refname, spec, head->name) < 0) - goto on_error; - } else { - /* - * no rhs mans store it in FETCH_HEAD, even if we don't - update anything else. - */ - if ((error = git_vector_insert(&update_heads, head)) < 0) - goto on_error; - - continue; - } - } - - /* If we still don't have a refname, we don't want it */ - if (git_buf_len(&refname) == 0) { - continue; - } - - /* In autotag mode, only create tags for objects already in db */ - if (autotag && !git_odb_exists(odb, &head->oid)) - continue; - - if (!autotag && git_vector_insert(&update_heads, head) < 0) - goto on_error; - - error = git_reference_name_to_id(&old, remote->repo, refname.ptr); - if (error < 0 && error != GIT_ENOTFOUND) - goto on_error; - - if (error == GIT_ENOTFOUND) { - memset(&old, 0, GIT_OID_RAWSZ); - - if (autotag && git_vector_insert(&update_heads, head) < 0) - goto on_error; - } - - if (!git_oid__cmp(&old, &head->oid)) - continue; - - /* In autotag mode, don't overwrite any locally-existing tags */ - error = git_reference_create(&ref, remote->repo, refname.ptr, &head->oid, !autotag, - log_message); - if (error < 0 && error != GIT_EEXISTS) - goto on_error; - - git_reference_free(ref); - - if (callbacks && callbacks->update_tips != NULL) { - if (callbacks->update_tips(refname.ptr, &old, &head->oid, callbacks->payload) < 0) - goto on_error; - } - } - - if (update_fetchhead && - (error = git_remote_write_fetchhead(remote, spec, &update_heads)) < 0) - goto on_error; - - git_vector_free(&update_heads); - git_refspec__free(&tagspec); - git_buf_free(&refname); - return 0; - -on_error: - git_vector_free(&update_heads); - git_refspec__free(&tagspec); - git_buf_free(&refname); - return -1; - -} - -/** - * Iteration over the three vectors, with a pause whenever we find a match - * - * On each stop, we store the iteration stat in the inout i,j,k - * parameters, and return the currently matching passive refspec as - * well as the head which we matched. - */ -static int next_head(const git_remote *remote, git_vector *refs, - git_refspec **out_spec, git_remote_head **out_head, - size_t *out_i, size_t *out_j, size_t *out_k) -{ - const git_vector *active, *passive; - git_remote_head *head; - git_refspec *spec, *passive_spec; - size_t i, j, k; - - active = &remote->active_refspecs; - passive = &remote->passive_refspecs; - - i = *out_i; - j = *out_j; - k = *out_k; - - for (; i < refs->length; i++) { - head = git_vector_get(refs, i); - - if (!git_reference_is_valid_name(head->name)) - continue; - - for (; j < active->length; j++) { - spec = git_vector_get(active, j); - - if (!git_refspec_src_matches(spec, head->name)) - continue; - - for (; k < passive->length; k++) { - passive_spec = git_vector_get(passive, k); - - if (!git_refspec_src_matches(passive_spec, head->name)) - continue; - - *out_spec = passive_spec; - *out_head = head; - *out_i = i; - *out_j = j; - *out_k = k + 1; - return 0; - - } - k = 0; - } - j = 0; - } - - return GIT_ITEROVER; -} - -static int opportunistic_updates(const git_remote *remote, const git_remote_callbacks *callbacks, - git_vector *refs, const char *msg) -{ - size_t i, j, k; - git_refspec *spec; - git_remote_head *head; - git_reference *ref; - git_buf refname = GIT_BUF_INIT; - int error = 0; - - i = j = k = 0; - - while ((error = next_head(remote, refs, &spec, &head, &i, &j, &k)) == 0) { - git_oid old = {{ 0 }}; - /* - * If we got here, there is a refspec which was used - * for fetching which matches the source of one of the - * passive refspecs, so we should update that - * remote-tracking branch, but not add it to - * FETCH_HEAD - */ - - git_buf_clear(&refname); - if ((error = git_refspec_transform(&refname, spec, head->name)) < 0) - goto cleanup; - - error = git_reference_name_to_id(&old, remote->repo, refname.ptr); - if (error < 0 && error != GIT_ENOTFOUND) - goto cleanup; - - if (!git_oid_cmp(&old, &head->oid)) - continue; - - /* If we did find a current reference, make sure we haven't lost a race */ - if (error) - error = git_reference_create(&ref, remote->repo, refname.ptr, &head->oid, true, msg); - else - error = git_reference_create_matching(&ref, remote->repo, refname.ptr, &head->oid, true, &old, msg); - git_reference_free(ref); - if (error < 0) - goto cleanup; - - if (callbacks && callbacks->update_tips != NULL) { - if (callbacks->update_tips(refname.ptr, &old, &head->oid, callbacks->payload) < 0) - goto cleanup; - } - } - - if (error == GIT_ITEROVER) - error = 0; - -cleanup: - git_buf_free(&refname); - return error; -} - -int git_remote_update_tips( - git_remote *remote, - const git_remote_callbacks *callbacks, - int update_fetchhead, - git_remote_autotag_option_t download_tags, - const char *reflog_message) -{ - git_refspec *spec, tagspec; - git_vector refs = GIT_VECTOR_INIT; - git_remote_autotag_option_t tagopt; - int error; - size_t i; - - /* push has its own logic hidden away in the push object */ - if (remote->push) { - return git_push_update_tips(remote->push, callbacks); - } - - if (git_refspec__parse(&tagspec, GIT_REFSPEC_TAGS, true) < 0) - return -1; - - - if ((error = ls_to_vector(&refs, remote)) < 0) - goto out; - - if (download_tags == GIT_REMOTE_DOWNLOAD_TAGS_UNSPECIFIED) - tagopt = remote->download_tags; - else - tagopt = download_tags; - - if (tagopt == GIT_REMOTE_DOWNLOAD_TAGS_ALL) { - if ((error = update_tips_for_spec(remote, callbacks, update_fetchhead, tagopt, &tagspec, &refs, reflog_message)) < 0) - goto out; - } - - git_vector_foreach(&remote->active_refspecs, i, spec) { - if (spec->push) - continue; - - if ((error = update_tips_for_spec(remote, callbacks, update_fetchhead, tagopt, spec, &refs, reflog_message)) < 0) - goto out; - } - - /* only try to do opportunisitic updates if the refpec lists differ */ - if (remote->passed_refspecs) - error = opportunistic_updates(remote, callbacks, &refs, reflog_message); - -out: - git_vector_free(&refs); - git_refspec__free(&tagspec); - return error; -} - -int git_remote_connected(const git_remote *remote) -{ - assert(remote); - - if (!remote->transport || !remote->transport->is_connected) - return 0; - - /* Ask the transport if it's connected. */ - return remote->transport->is_connected(remote->transport); -} - -void git_remote_stop(git_remote *remote) -{ - assert(remote); - - if (remote->transport && remote->transport->cancel) - remote->transport->cancel(remote->transport); -} - -void git_remote_disconnect(git_remote *remote) -{ - assert(remote); - - if (git_remote_connected(remote)) - remote->transport->close(remote->transport); -} - -void git_remote_free(git_remote *remote) -{ - if (remote == NULL) - return; - - if (remote->transport != NULL) { - git_remote_disconnect(remote); - - remote->transport->free(remote->transport); - remote->transport = NULL; - } - - git_vector_free(&remote->refs); - - free_refspecs(&remote->refspecs); - git_vector_free(&remote->refspecs); - - free_refspecs(&remote->active_refspecs); - git_vector_free(&remote->active_refspecs); - - free_refspecs(&remote->passive_refspecs); - git_vector_free(&remote->passive_refspecs); - - git_push_free(remote->push); - git__free(remote->url); - git__free(remote->pushurl); - git__free(remote->name); - git__free(remote); -} - -static int remote_list_cb(const git_config_entry *entry, void *payload) -{ - git_vector *list = payload; - const char *name = entry->name + strlen("remote."); - size_t namelen = strlen(name); - char *remote_name; - - /* we know name matches "remote..(push)?url" */ - - if (!strcmp(&name[namelen - 4], ".url")) - remote_name = git__strndup(name, namelen - 4); /* strip ".url" */ - else - remote_name = git__strndup(name, namelen - 8); /* strip ".pushurl" */ - GITERR_CHECK_ALLOC(remote_name); - - return git_vector_insert(list, remote_name); -} - -int git_remote_list(git_strarray *remotes_list, git_repository *repo) -{ - int error; - git_config *cfg; - git_vector list = GIT_VECTOR_INIT; - - if ((error = git_repository_config__weakptr(&cfg, repo)) < 0) - return error; - - if ((error = git_vector_init(&list, 4, git__strcmp_cb)) < 0) - return error; - - error = git_config_foreach_match( - cfg, "^remote\\..*\\.(push)?url$", remote_list_cb, &list); - - if (error < 0) { - git_vector_free_deep(&list); - return error; - } - - git_vector_uniq(&list, git__free); - - remotes_list->strings = - (char **)git_vector_detach(&remotes_list->count, NULL, &list); - - return 0; -} - -const git_transfer_progress* git_remote_stats(git_remote *remote) -{ - assert(remote); - return &remote->stats; -} - -git_remote_autotag_option_t git_remote_autotag(const git_remote *remote) -{ - return remote->download_tags; -} - -int git_remote_set_autotag(git_repository *repo, const char *remote, git_remote_autotag_option_t value) -{ - git_buf var = GIT_BUF_INIT; - git_config *config; - int error; - - assert(repo && remote); - - if ((error = ensure_remote_name_is_valid(remote)) < 0) - return error; - - if ((error = git_repository_config__weakptr(&config, repo)) < 0) - return error; - - if ((error = git_buf_printf(&var, CONFIG_TAGOPT_FMT, remote))) - return error; - - switch (value) { - case GIT_REMOTE_DOWNLOAD_TAGS_NONE: - error = git_config_set_string(config, var.ptr, "--no-tags"); - break; - case GIT_REMOTE_DOWNLOAD_TAGS_ALL: - error = git_config_set_string(config, var.ptr, "--tags"); - break; - case GIT_REMOTE_DOWNLOAD_TAGS_AUTO: - error = git_config_delete_entry(config, var.ptr); - if (error == GIT_ENOTFOUND) - error = 0; - break; - default: - giterr_set(GITERR_INVALID, "Invalid value for the tagopt setting"); - error = -1; - } - - git_buf_free(&var); - return error; -} - -int git_remote_prune_refs(const git_remote *remote) -{ - return remote->prune_refs; -} - -static int rename_remote_config_section( - git_repository *repo, - const char *old_name, - const char *new_name) -{ - git_buf old_section_name = GIT_BUF_INIT, - new_section_name = GIT_BUF_INIT; - int error = -1; - - if (git_buf_printf(&old_section_name, "remote.%s", old_name) < 0) - goto cleanup; - - if (new_name && - (git_buf_printf(&new_section_name, "remote.%s", new_name) < 0)) - goto cleanup; - - error = git_config_rename_section( - repo, - git_buf_cstr(&old_section_name), - new_name ? git_buf_cstr(&new_section_name) : NULL); - -cleanup: - git_buf_free(&old_section_name); - git_buf_free(&new_section_name); - - return error; -} - -struct update_data { - git_config *config; - const char *old_remote_name; - const char *new_remote_name; -}; - -static int update_config_entries_cb( - const git_config_entry *entry, - void *payload) -{ - struct update_data *data = (struct update_data *)payload; - - if (strcmp(entry->value, data->old_remote_name)) - return 0; - - return git_config_set_string( - data->config, entry->name, data->new_remote_name); -} - -static int update_branch_remote_config_entry( - git_repository *repo, - const char *old_name, - const char *new_name) -{ - int error; - struct update_data data = { NULL }; - - if ((error = git_repository_config__weakptr(&data.config, repo)) < 0) - return error; - - data.old_remote_name = old_name; - data.new_remote_name = new_name; - - return git_config_foreach_match( - data.config, "branch\\..+\\.remote", update_config_entries_cb, &data); -} - -static int rename_one_remote_reference( - git_reference *reference_in, - const char *old_remote_name, - const char *new_remote_name) -{ - int error; - git_reference *ref = NULL, *dummy = NULL; - git_buf namespace = GIT_BUF_INIT, old_namespace = GIT_BUF_INIT; - git_buf new_name = GIT_BUF_INIT; - git_buf log_message = GIT_BUF_INIT; - size_t pfx_len; - const char *target; - - if ((error = git_buf_printf(&namespace, GIT_REFS_REMOTES_DIR "%s/", new_remote_name)) < 0) - return error; - - pfx_len = strlen(GIT_REFS_REMOTES_DIR) + strlen(old_remote_name) + 1; - git_buf_puts(&new_name, namespace.ptr); - if ((error = git_buf_puts(&new_name, git_reference_name(reference_in) + pfx_len)) < 0) - goto cleanup; - - if ((error = git_buf_printf(&log_message, - "renamed remote %s to %s", - old_remote_name, new_remote_name)) < 0) - goto cleanup; - - if ((error = git_reference_rename(&ref, reference_in, git_buf_cstr(&new_name), 1, - git_buf_cstr(&log_message))) < 0) - goto cleanup; - - if (git_reference_type(ref) != GIT_REF_SYMBOLIC) - goto cleanup; - - /* Handle refs like origin/HEAD -> origin/master */ - target = git_reference_symbolic_target(ref); - if ((error = git_buf_printf(&old_namespace, GIT_REFS_REMOTES_DIR "%s/", old_remote_name)) < 0) - goto cleanup; - - if (git__prefixcmp(target, old_namespace.ptr)) - goto cleanup; - - git_buf_clear(&new_name); - git_buf_puts(&new_name, namespace.ptr); - if ((error = git_buf_puts(&new_name, target + pfx_len)) < 0) - goto cleanup; - - error = git_reference_symbolic_set_target(&dummy, ref, git_buf_cstr(&new_name), - git_buf_cstr(&log_message)); - - git_reference_free(dummy); - -cleanup: - git_reference_free(reference_in); - git_reference_free(ref); - git_buf_free(&namespace); - git_buf_free(&old_namespace); - git_buf_free(&new_name); - git_buf_free(&log_message); - return error; -} - -static int rename_remote_references( - git_repository *repo, - const char *old_name, - const char *new_name) -{ - int error; - git_buf buf = GIT_BUF_INIT; - git_reference *ref; - git_reference_iterator *iter; - - if ((error = git_buf_printf(&buf, GIT_REFS_REMOTES_DIR "%s/*", old_name)) < 0) - return error; - - error = git_reference_iterator_glob_new(&iter, repo, git_buf_cstr(&buf)); - git_buf_free(&buf); - - if (error < 0) - return error; - - while ((error = git_reference_next(&ref, iter)) == 0) { - if ((error = rename_one_remote_reference(ref, old_name, new_name)) < 0) - break; - } - - git_reference_iterator_free(iter); - - return (error == GIT_ITEROVER) ? 0 : error; -} - -static int rename_fetch_refspecs(git_vector *problems, git_remote *remote, const char *new_name) -{ - git_config *config; - git_buf base = GIT_BUF_INIT, var = GIT_BUF_INIT, val = GIT_BUF_INIT; - const git_refspec *spec; - size_t i; - int error = 0; - - if ((error = git_repository_config__weakptr(&config, remote->repo)) < 0) - return error; - - if ((error = git_vector_init(problems, 1, NULL)) < 0) - return error; - - if ((error = git_buf_printf( - &base, "+refs/heads/*:refs/remotes/%s/*", remote->name)) < 0) - return error; - - git_vector_foreach(&remote->refspecs, i, spec) { - if (spec->push) - continue; - - /* Does the dst part of the refspec follow the expected format? */ - if (strcmp(git_buf_cstr(&base), spec->string)) { - char *dup; - - dup = git__strdup(spec->string); - GITERR_CHECK_ALLOC(dup); - - if ((error = git_vector_insert(problems, dup)) < 0) - break; - - continue; - } - - /* If we do want to move it to the new section */ - - git_buf_clear(&val); - git_buf_clear(&var); - - if (git_buf_printf( - &val, "+refs/heads/*:refs/remotes/%s/*", new_name) < 0 || - git_buf_printf(&var, "remote.%s.fetch", new_name) < 0) - { - error = -1; - break; - } - - if ((error = git_config_set_string( - config, git_buf_cstr(&var), git_buf_cstr(&val))) < 0) - break; - } - - git_buf_free(&base); - git_buf_free(&var); - git_buf_free(&val); - - if (error < 0) { - char *str; - git_vector_foreach(problems, i, str) - git__free(str); - - git_vector_free(problems); - } - - return error; -} - -int git_remote_rename(git_strarray *out, git_repository *repo, const char *name, const char *new_name) -{ - int error; - git_vector problem_refspecs = GIT_VECTOR_INIT; - git_remote *remote = NULL; - - assert(out && repo && name && new_name); - - if ((error = git_remote_lookup(&remote, repo, name)) < 0) - return error; - - if ((error = ensure_remote_name_is_valid(new_name)) < 0) - goto cleanup; - - if ((error = ensure_remote_doesnot_exist(repo, new_name)) < 0) - goto cleanup; - - if ((error = rename_remote_config_section(repo, name, new_name)) < 0) - goto cleanup; - - if ((error = update_branch_remote_config_entry(repo, name, new_name)) < 0) - goto cleanup; - - if ((error = rename_remote_references(repo, name, new_name)) < 0) - goto cleanup; - - if ((error = rename_fetch_refspecs(&problem_refspecs, remote, new_name)) < 0) - goto cleanup; - - out->count = problem_refspecs.length; - out->strings = (char **) problem_refspecs.contents; - -cleanup: - if (error < 0) - git_vector_free(&problem_refspecs); - - git_remote_free(remote); - return error; -} - -int git_remote_is_valid_name( - const char *remote_name) -{ - git_buf buf = GIT_BUF_INIT; - git_refspec refspec; - int error = -1; - - if (!remote_name || *remote_name == '\0') - return 0; - - git_buf_printf(&buf, "refs/heads/test:refs/remotes/%s/test", remote_name); - error = git_refspec__parse(&refspec, git_buf_cstr(&buf), true); - - git_buf_free(&buf); - git_refspec__free(&refspec); - - giterr_clear(); - return error == 0; -} - -git_refspec *git_remote__matching_refspec(git_remote *remote, const char *refname) -{ - git_refspec *spec; - size_t i; - - git_vector_foreach(&remote->active_refspecs, i, spec) { - if (spec->push) - continue; - - if (git_refspec_src_matches(spec, refname)) - return spec; - } - - return NULL; -} - -git_refspec *git_remote__matching_dst_refspec(git_remote *remote, const char *refname) -{ - git_refspec *spec; - size_t i; - - git_vector_foreach(&remote->active_refspecs, i, spec) { - if (spec->push) - continue; - - if (git_refspec_dst_matches(spec, refname)) - return spec; - } - - return NULL; -} - -int git_remote_add_fetch(git_repository *repo, const char *remote, const char *refspec) -{ - return write_add_refspec(repo, remote, refspec, true); -} - -int git_remote_add_push(git_repository *repo, const char *remote, const char *refspec) -{ - return write_add_refspec(repo, remote, refspec, false); -} - -static int set_refspecs(git_remote *remote, git_strarray *array, int push) -{ - git_vector *vec = &remote->refspecs; - git_refspec *spec; - size_t i; - - /* Start by removing any refspecs of the same type */ - for (i = 0; i < vec->length; i++) { - spec = git_vector_get(vec, i); - if (spec->push != push) - continue; - - git_refspec__free(spec); - git__free(spec); - git_vector_remove(vec, i); - i--; - } - - /* And now we add the new ones */ - - for (i = 0; i < array->count; i++) { - if (add_refspec(remote, array->strings[i], !push) < 0) - return -1; - } - - return 0; -} - -static int copy_refspecs(git_strarray *array, const git_remote *remote, unsigned int push) -{ - size_t i; - git_vector refspecs; - git_refspec *spec; - char *dup; - - if (git_vector_init(&refspecs, remote->refspecs.length, NULL) < 0) - return -1; - - git_vector_foreach(&remote->refspecs, i, spec) { - if (spec->push != push) - continue; - - if ((dup = git__strdup(spec->string)) == NULL) - goto on_error; - - if (git_vector_insert(&refspecs, dup) < 0) { - git__free(dup); - goto on_error; - } - } - - array->strings = (char **)refspecs.contents; - array->count = refspecs.length; - - return 0; - -on_error: - git_vector_free_deep(&refspecs); - - return -1; -} - -int git_remote_get_fetch_refspecs(git_strarray *array, const git_remote *remote) -{ - return copy_refspecs(array, remote, false); -} - -int git_remote_get_push_refspecs(git_strarray *array, const git_remote *remote) -{ - return copy_refspecs(array, remote, true); -} - -size_t git_remote_refspec_count(const git_remote *remote) -{ - return remote->refspecs.length; -} - -const git_refspec *git_remote_get_refspec(const git_remote *remote, size_t n) -{ - return git_vector_get(&remote->refspecs, n); -} - -int git_remote_init_callbacks(git_remote_callbacks *opts, unsigned int version) -{ - GIT_INIT_STRUCTURE_FROM_TEMPLATE( - opts, version, git_remote_callbacks, GIT_REMOTE_CALLBACKS_INIT); - return 0; -} - -/* asserts a branch..remote format */ -static const char *name_offset(size_t *len_out, const char *name) -{ - size_t prefix_len; - const char *dot; - - prefix_len = strlen("remote."); - dot = strchr(name + prefix_len, '.'); - - assert(dot); - - *len_out = dot - name - prefix_len; - return name + prefix_len; -} - -static int remove_branch_config_related_entries( - git_repository *repo, - const char *remote_name) -{ - int error; - git_config *config; - git_config_entry *entry; - git_config_iterator *iter; - git_buf buf = GIT_BUF_INIT; - - if ((error = git_repository_config__weakptr(&config, repo)) < 0) - return error; - - if ((error = git_config_iterator_glob_new(&iter, config, "branch\\..+\\.remote")) < 0) - return error; - - /* find any branches with us as upstream and remove that config */ - while ((error = git_config_next(&entry, iter)) == 0) { - const char *branch; - size_t branch_len; - - if (strcmp(remote_name, entry->value)) - continue; - - branch = name_offset(&branch_len, entry->name); - - git_buf_clear(&buf); - if (git_buf_printf(&buf, "branch.%.*s.merge", (int)branch_len, branch) < 0) - break; - - if ((error = git_config_delete_entry(config, git_buf_cstr(&buf))) < 0) - break; - - git_buf_clear(&buf); - if (git_buf_printf(&buf, "branch.%.*s.remote", (int)branch_len, branch) < 0) - break; - - if ((error = git_config_delete_entry(config, git_buf_cstr(&buf))) < 0) - break; - } - - if (error == GIT_ITEROVER) - error = 0; - - git_buf_free(&buf); - git_config_iterator_free(iter); - return error; -} - -static int remove_refs(git_repository *repo, const git_refspec *spec) -{ - git_reference_iterator *iter = NULL; - git_vector refs; - const char *name; - char *dup; - int error; - size_t i; - - if ((error = git_vector_init(&refs, 8, NULL)) < 0) - return error; - - if ((error = git_reference_iterator_new(&iter, repo)) < 0) - goto cleanup; - - while ((error = git_reference_next_name(&name, iter)) == 0) { - if (!git_refspec_dst_matches(spec, name)) - continue; - - dup = git__strdup(name); - if (!dup) { - error = -1; - goto cleanup; - } - - if ((error = git_vector_insert(&refs, dup)) < 0) - goto cleanup; - } - if (error == GIT_ITEROVER) - error = 0; - if (error < 0) - goto cleanup; - - git_vector_foreach(&refs, i, name) { - if ((error = git_reference_remove(repo, name)) < 0) - break; - } - -cleanup: - git_reference_iterator_free(iter); - git_vector_foreach(&refs, i, dup) { - git__free(dup); - } - git_vector_free(&refs); - return error; -} - -static int remove_remote_tracking(git_repository *repo, const char *remote_name) -{ - git_remote *remote; - int error; - size_t i, count; - - /* we want to use what's on the config, regardless of changes to the instance in memory */ - if ((error = git_remote_lookup(&remote, repo, remote_name)) < 0) - return error; - - count = git_remote_refspec_count(remote); - for (i = 0; i < count; i++) { - const git_refspec *refspec = git_remote_get_refspec(remote, i); - - /* shouldn't ever actually happen */ - if (refspec == NULL) - continue; - - if ((error = remove_refs(repo, refspec)) < 0) - break; - } - - git_remote_free(remote); - return error; -} - -int git_remote_delete(git_repository *repo, const char *name) -{ - int error; - - assert(repo && name); - - if ((error = remove_branch_config_related_entries(repo, name)) < 0 || - (error = remove_remote_tracking(repo, name)) < 0 || - (error = rename_remote_config_section(repo, name, NULL)) < 0) - return error; - - return 0; -} - -int git_remote_default_branch(git_buf *out, git_remote *remote) -{ - const git_remote_head **heads; - const git_remote_head *guess = NULL; - const git_oid *head_id; - size_t heads_len, i; - int error; - - assert(out); - - if ((error = git_remote_ls(&heads, &heads_len, remote)) < 0) - return error; - - if (heads_len == 0) - return GIT_ENOTFOUND; - - if (strcmp(heads[0]->name, GIT_HEAD_FILE)) - return GIT_ENOTFOUND; - - git_buf_sanitize(out); - /* the first one must be HEAD so if that has the symref info, we're done */ - if (heads[0]->symref_target) - return git_buf_puts(out, heads[0]->symref_target); - - /* - * If there's no symref information, we have to look over them - * and guess. We return the first match unless the master - * branch is a candidate. Then we return the master branch. - */ - head_id = &heads[0]->oid; - - for (i = 1; i < heads_len; i++) { - if (git_oid_cmp(head_id, &heads[i]->oid)) - continue; - - if (git__prefixcmp(heads[i]->name, GIT_REFS_HEADS_DIR)) - continue; - - if (!guess) { - guess = heads[i]; - continue; - } - - if (!git__strcmp(GIT_REFS_HEADS_MASTER_FILE, heads[i]->name)) { - guess = heads[i]; - break; - } - } - - if (!guess) - return GIT_ENOTFOUND; - - return git_buf_puts(out, guess->name); -} - -int git_remote_upload(git_remote *remote, const git_strarray *refspecs, const git_push_options *opts) -{ - size_t i; - int error; - git_push *push; - git_refspec *spec; - const git_remote_callbacks *cbs = NULL; - const git_strarray *custom_headers = NULL; - - assert(remote); - - if (opts) { - cbs = &opts->callbacks; - custom_headers = &opts->custom_headers; - } - - if (!git_remote_connected(remote) && - (error = git_remote_connect(remote, GIT_DIRECTION_PUSH, cbs, custom_headers)) < 0) - goto cleanup; - - free_refspecs(&remote->active_refspecs); - if ((error = dwim_refspecs(&remote->active_refspecs, &remote->refspecs, &remote->refs)) < 0) - goto cleanup; - - if (remote->push) { - git_push_free(remote->push); - remote->push = NULL; - } - - if ((error = git_push_new(&remote->push, remote)) < 0) - return error; - - push = remote->push; - - if (opts && (error = git_push_set_options(push, opts)) < 0) - goto cleanup; - - if (refspecs && refspecs->count > 0) { - for (i = 0; i < refspecs->count; i++) { - if ((error = git_push_add_refspec(push, refspecs->strings[i])) < 0) - goto cleanup; - } - } else { - git_vector_foreach(&remote->refspecs, i, spec) { - if (!spec->push) - continue; - if ((error = git_push_add_refspec(push, spec->string)) < 0) - goto cleanup; - } - } - - if ((error = git_push_finish(push, cbs)) < 0) - goto cleanup; - - if (cbs && cbs->push_update_reference && - (error = git_push_status_foreach(push, cbs->push_update_reference, cbs->payload)) < 0) - goto cleanup; - -cleanup: - return error; -} - -int git_remote_push(git_remote *remote, const git_strarray *refspecs, const git_push_options *opts) -{ - int error; - const git_remote_callbacks *cbs = NULL; - const git_strarray *custom_headers = NULL; - - if (opts) { - GITERR_CHECK_VERSION(&opts->callbacks, GIT_REMOTE_CALLBACKS_VERSION, "git_remote_callbacks"); - cbs = &opts->callbacks; - custom_headers = &opts->custom_headers; - } - - assert(remote && refspecs); - - if ((error = git_remote_connect(remote, GIT_DIRECTION_PUSH, cbs, custom_headers)) < 0) - return error; - - if ((error = git_remote_upload(remote, refspecs, opts)) < 0) - return error; - - error = git_remote_update_tips(remote, cbs, 0, 0, NULL); - - git_remote_disconnect(remote); - return error; -} - -#define PREFIX "url" -#define SUFFIX_FETCH "insteadof" -#define SUFFIX_PUSH "pushinsteadof" - -char *apply_insteadof(git_config *config, const char *url, int direction) -{ - size_t match_length, prefix_length, suffix_length; - char *replacement = NULL; - const char *regexp; - - git_buf result = GIT_BUF_INIT; - git_config_entry *entry; - git_config_iterator *iter; - - assert(config); - assert(url); - assert(direction == GIT_DIRECTION_FETCH || direction == GIT_DIRECTION_PUSH); - - /* Add 1 to prefix/suffix length due to the additional escaped dot */ - prefix_length = strlen(PREFIX) + 1; - if (direction == GIT_DIRECTION_FETCH) { - regexp = PREFIX "\\..*\\." SUFFIX_FETCH; - suffix_length = strlen(SUFFIX_FETCH) + 1; - } else { - regexp = PREFIX "\\..*\\." SUFFIX_PUSH; - suffix_length = strlen(SUFFIX_PUSH) + 1; - } - - if (git_config_iterator_glob_new(&iter, config, regexp) < 0) - return NULL; - - match_length = 0; - while (git_config_next(&entry, iter) == 0) { - size_t n, replacement_length; - - /* Check if entry value is a prefix of URL */ - if (git__prefixcmp(url, entry->value)) - continue; - /* Check if entry value is longer than previous - * prefixes */ - if ((n = strlen(entry->value)) <= match_length) - continue; - - git__free(replacement); - match_length = n; - - /* Cut off prefix and suffix of the value */ - replacement_length = - strlen(entry->name) - (prefix_length + suffix_length); - replacement = git__strndup(entry->name + prefix_length, - replacement_length); - } - - git_config_iterator_free(iter); - - if (match_length == 0) - return git__strdup(url); - - git_buf_printf(&result, "%s%s", replacement, url + match_length); - - git__free(replacement); - - return result.ptr; -} diff --git a/vendor/libgit2/src/remote.h b/vendor/libgit2/src/remote.h deleted file mode 100644 index e696997f4..000000000 --- a/vendor/libgit2/src/remote.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_remote_h__ -#define INCLUDE_remote_h__ - -#include "git2/remote.h" -#include "git2/transport.h" -#include "git2/sys/transport.h" - -#include "refspec.h" -#include "vector.h" - -#define GIT_REMOTE_ORIGIN "origin" - -struct git_remote { - char *name; - char *url; - char *pushurl; - git_vector refs; - git_vector refspecs; - git_vector active_refspecs; - git_vector passive_refspecs; - git_transport *transport; - git_repository *repo; - git_push *push; - git_transfer_progress stats; - unsigned int need_pack; - git_remote_autotag_option_t download_tags; - int prune_refs; - int passed_refspecs; -}; - -const char* git_remote__urlfordirection(struct git_remote *remote, int direction); -int git_remote__get_http_proxy(git_remote *remote, bool use_ssl, char **proxy_url); - -git_refspec *git_remote__matching_refspec(git_remote *remote, const char *refname); -git_refspec *git_remote__matching_dst_refspec(git_remote *remote, const char *refname); - -#endif diff --git a/vendor/libgit2/src/repo_template.h b/vendor/libgit2/src/repo_template.h deleted file mode 100644 index 099279aa7..000000000 --- a/vendor/libgit2/src/repo_template.h +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_repo_template_h__ -#define INCLUDE_repo_template_h__ - -#define GIT_OBJECTS_INFO_DIR GIT_OBJECTS_DIR "info/" -#define GIT_OBJECTS_PACK_DIR GIT_OBJECTS_DIR "pack/" - -#define GIT_HOOKS_DIR "hooks/" -#define GIT_HOOKS_DIR_MODE 0777 - -#define GIT_HOOKS_README_FILE GIT_HOOKS_DIR "README.sample" -#define GIT_HOOKS_README_MODE 0777 -#define GIT_HOOKS_README_CONTENT \ -"#!/bin/sh\n"\ -"#\n"\ -"# Place appropriately named executable hook scripts into this directory\n"\ -"# to intercept various actions that git takes. See `git help hooks` for\n"\ -"# more information.\n" - -#define GIT_INFO_DIR "info/" -#define GIT_INFO_DIR_MODE 0777 - -#define GIT_INFO_EXCLUDE_FILE GIT_INFO_DIR "exclude" -#define GIT_INFO_EXCLUDE_MODE 0666 -#define GIT_INFO_EXCLUDE_CONTENT \ -"# File patterns to ignore; see `git help ignore` for more information.\n"\ -"# Lines that start with '#' are comments.\n" - -#define GIT_DESC_FILE "description" -#define GIT_DESC_MODE 0666 -#define GIT_DESC_CONTENT \ -"Unnamed repository; edit this file 'description' to name the repository.\n" - -typedef struct { - const char *path; - mode_t mode; - const char *content; -} repo_template_item; - -static repo_template_item repo_template[] = { - { GIT_OBJECTS_INFO_DIR, GIT_OBJECT_DIR_MODE, NULL }, /* '/objects/info/' */ - { GIT_OBJECTS_PACK_DIR, GIT_OBJECT_DIR_MODE, NULL }, /* '/objects/pack/' */ - { GIT_REFS_HEADS_DIR, GIT_REFS_DIR_MODE, NULL }, /* '/refs/heads/' */ - { GIT_REFS_TAGS_DIR, GIT_REFS_DIR_MODE, NULL }, /* '/refs/tags/' */ - { GIT_HOOKS_DIR, GIT_HOOKS_DIR_MODE, NULL }, /* '/hooks/' */ - { GIT_INFO_DIR, GIT_INFO_DIR_MODE, NULL }, /* '/info/' */ - { GIT_DESC_FILE, GIT_DESC_MODE, GIT_DESC_CONTENT }, - { GIT_HOOKS_README_FILE, GIT_HOOKS_README_MODE, GIT_HOOKS_README_CONTENT }, - { GIT_INFO_EXCLUDE_FILE, GIT_INFO_EXCLUDE_MODE, GIT_INFO_EXCLUDE_CONTENT }, - { NULL, 0, NULL } -}; - -#endif diff --git a/vendor/libgit2/src/repository.c b/vendor/libgit2/src/repository.c deleted file mode 100644 index 8a6fef0f6..000000000 --- a/vendor/libgit2/src/repository.c +++ /dev/null @@ -1,2352 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#include - -#include "git2/object.h" -#include "git2/refdb.h" -#include "git2/sys/repository.h" - -#include "common.h" -#include "repository.h" -#include "commit.h" -#include "tag.h" -#include "blob.h" -#include "fileops.h" -#include "sysdir.h" -#include "filebuf.h" -#include "index.h" -#include "config.h" -#include "refs.h" -#include "filter.h" -#include "odb.h" -#include "remote.h" -#include "merge.h" -#include "diff_driver.h" -#include "annotated_commit.h" - -#ifdef GIT_WIN32 -# include "win32/w32_util.h" -#endif - -static int check_repositoryformatversion(git_config *config); - -#define GIT_FILE_CONTENT_PREFIX "gitdir:" - -#define GIT_BRANCH_MASTER "master" - -#define GIT_REPO_VERSION 0 - -git_buf git_repository__reserved_names_win32[] = { - { DOT_GIT, 0, CONST_STRLEN(DOT_GIT) }, - { GIT_DIR_SHORTNAME, 0, CONST_STRLEN(GIT_DIR_SHORTNAME) } -}; -size_t git_repository__reserved_names_win32_len = 2; - -git_buf git_repository__reserved_names_posix[] = { - { DOT_GIT, 0, CONST_STRLEN(DOT_GIT) }, -}; -size_t git_repository__reserved_names_posix_len = 1; - -static void set_odb(git_repository *repo, git_odb *odb) -{ - if (odb) { - GIT_REFCOUNT_OWN(odb, repo); - GIT_REFCOUNT_INC(odb); - } - - if ((odb = git__swap(repo->_odb, odb)) != NULL) { - GIT_REFCOUNT_OWN(odb, NULL); - git_odb_free(odb); - } -} - -static void set_refdb(git_repository *repo, git_refdb *refdb) -{ - if (refdb) { - GIT_REFCOUNT_OWN(refdb, repo); - GIT_REFCOUNT_INC(refdb); - } - - if ((refdb = git__swap(repo->_refdb, refdb)) != NULL) { - GIT_REFCOUNT_OWN(refdb, NULL); - git_refdb_free(refdb); - } -} - -static void set_config(git_repository *repo, git_config *config) -{ - if (config) { - GIT_REFCOUNT_OWN(config, repo); - GIT_REFCOUNT_INC(config); - } - - if ((config = git__swap(repo->_config, config)) != NULL) { - GIT_REFCOUNT_OWN(config, NULL); - git_config_free(config); - } - - git_repository__cvar_cache_clear(repo); -} - -static void set_index(git_repository *repo, git_index *index) -{ - if (index) { - GIT_REFCOUNT_OWN(index, repo); - GIT_REFCOUNT_INC(index); - } - - if ((index = git__swap(repo->_index, index)) != NULL) { - GIT_REFCOUNT_OWN(index, NULL); - git_index_free(index); - } -} - -void git_repository__cleanup(git_repository *repo) -{ - assert(repo); - - git_cache_clear(&repo->objects); - git_attr_cache_flush(repo); - - set_config(repo, NULL); - set_index(repo, NULL); - set_odb(repo, NULL); - set_refdb(repo, NULL); -} - -void git_repository_free(git_repository *repo) -{ - size_t i; - - if (repo == NULL) - return; - - git_repository__cleanup(repo); - - git_cache_free(&repo->objects); - - git_diff_driver_registry_free(repo->diff_drivers); - repo->diff_drivers = NULL; - - for (i = 0; i < repo->reserved_names.size; i++) - git_buf_free(git_array_get(repo->reserved_names, i)); - git_array_clear(repo->reserved_names); - - git__free(repo->path_gitlink); - git__free(repo->path_repository); - git__free(repo->workdir); - git__free(repo->namespace); - git__free(repo->ident_name); - git__free(repo->ident_email); - - git__memzero(repo, sizeof(*repo)); - git__free(repo); -} - -/* - * Git repository open methods - * - * Open a repository object from its path - */ -static bool valid_repository_path(git_buf *repository_path) -{ - /* Check OBJECTS_DIR first, since it will generate the longest path name */ - if (git_path_contains_dir(repository_path, GIT_OBJECTS_DIR) == false) - return false; - - /* Ensure HEAD file exists */ - if (git_path_contains_file(repository_path, GIT_HEAD_FILE) == false) - return false; - - if (git_path_contains_dir(repository_path, GIT_REFS_DIR) == false) - return false; - - return true; -} - -static git_repository *repository_alloc(void) -{ - git_repository *repo = git__calloc(1, sizeof(git_repository)); - - if (repo == NULL || - git_cache_init(&repo->objects) < 0) - goto on_error; - - git_array_init_to_size(repo->reserved_names, 4); - if (!repo->reserved_names.ptr) - goto on_error; - - /* set all the entries in the cvar cache to `unset` */ - git_repository__cvar_cache_clear(repo); - - return repo; - -on_error: - if (repo) - git_cache_free(&repo->objects); - - git__free(repo); - return NULL; -} - -int git_repository_new(git_repository **out) -{ - git_repository *repo; - - *out = repo = repository_alloc(); - GITERR_CHECK_ALLOC(repo); - - repo->is_bare = 1; - - return 0; -} - -static int load_config_data(git_repository *repo, const git_config *config) -{ - int is_bare; - - /* Try to figure out if it's bare, default to non-bare if it's not set */ - if (git_config_get_bool(&is_bare, config, "core.bare") < 0) - repo->is_bare = 0; - else - repo->is_bare = is_bare; - - return 0; -} - -static int load_workdir(git_repository *repo, git_config *config, git_buf *parent_path) -{ - int error; - git_config_entry *ce; - git_buf worktree = GIT_BUF_INIT; - - if (repo->is_bare) - return 0; - - if ((error = git_config__lookup_entry( - &ce, config, "core.worktree", false)) < 0) - return error; - - if (ce && ce->value) { - if ((error = git_path_prettify_dir( - &worktree, ce->value, repo->path_repository)) < 0) - goto cleanup; - - repo->workdir = git_buf_detach(&worktree); - } - else if (parent_path && git_path_isdir(parent_path->ptr)) - repo->workdir = git_buf_detach(parent_path); - else { - if (git_path_dirname_r(&worktree, repo->path_repository) < 0 || - git_path_to_dir(&worktree) < 0) { - error = -1; - goto cleanup; - } - - repo->workdir = git_buf_detach(&worktree); - } - - GITERR_CHECK_ALLOC(repo->workdir); -cleanup: - git_config_entry_free(ce); - return error; -} - -/* - * This function returns furthest offset into path where a ceiling dir - * is found, so we can stop processing the path at that point. - * - * Note: converting this to use git_bufs instead of GIT_PATH_MAX buffers on - * the stack could remove directories name limits, but at the cost of doing - * repeated malloc/frees inside the loop below, so let's not do it now. - */ -static int find_ceiling_dir_offset( - const char *path, - const char *ceiling_directories) -{ - char buf[GIT_PATH_MAX + 1]; - char buf2[GIT_PATH_MAX + 1]; - const char *ceil, *sep; - size_t len, max_len = 0, min_len; - - assert(path); - - min_len = (size_t)(git_path_root(path) + 1); - - if (ceiling_directories == NULL || min_len == 0) - return (int)min_len; - - for (sep = ceil = ceiling_directories; *sep; ceil = sep + 1) { - for (sep = ceil; *sep && *sep != GIT_PATH_LIST_SEPARATOR; sep++); - len = sep - ceil; - - if (len == 0 || len >= sizeof(buf) || git_path_root(ceil) == -1) - continue; - - strncpy(buf, ceil, len); - buf[len] = '\0'; - - if (p_realpath(buf, buf2) == NULL) - continue; - - len = strlen(buf2); - if (len > 0 && buf2[len-1] == '/') - buf[--len] = '\0'; - - if (!strncmp(path, buf2, len) && - (path[len] == '/' || !path[len]) && - len > max_len) - { - max_len = len; - } - } - - return (int)(max_len <= min_len ? min_len : max_len); -} - -/* - * Read the contents of `file_path` and set `path_out` to the repo dir that - * it points to. Before calling, set `path_out` to the base directory that - * should be used if the contents of `file_path` are a relative path. - */ -static int read_gitfile(git_buf *path_out, const char *file_path) -{ - int error = 0; - git_buf file = GIT_BUF_INIT; - size_t prefix_len = strlen(GIT_FILE_CONTENT_PREFIX); - - assert(path_out && file_path); - - if (git_futils_readbuffer(&file, file_path) < 0) - return -1; - - git_buf_rtrim(&file); - /* apparently on Windows, some people use backslashes in paths */ - git_path_mkposix(file.ptr); - - if (git_buf_len(&file) <= prefix_len || - memcmp(git_buf_cstr(&file), GIT_FILE_CONTENT_PREFIX, prefix_len) != 0) - { - giterr_set(GITERR_REPOSITORY, - "The `.git` file at '%s' is malformed", file_path); - error = -1; - } - else if ((error = git_path_dirname_r(path_out, file_path)) >= 0) { - const char *gitlink = git_buf_cstr(&file) + prefix_len; - while (*gitlink && git__isspace(*gitlink)) gitlink++; - - error = git_path_prettify_dir( - path_out, gitlink, git_buf_cstr(path_out)); - } - - git_buf_free(&file); - return error; -} - -static int find_repo( - git_buf *repo_path, - git_buf *parent_path, - git_buf *link_path, - const char *start_path, - uint32_t flags, - const char *ceiling_dirs) -{ - int error; - git_buf path = GIT_BUF_INIT; - struct stat st; - dev_t initial_device = 0; - bool try_with_dot_git = ((flags & GIT_REPOSITORY_OPEN_BARE) != 0); - int ceiling_offset; - - git_buf_free(repo_path); - - if ((error = git_path_prettify(&path, start_path, NULL)) < 0) - return error; - - ceiling_offset = find_ceiling_dir_offset(path.ptr, ceiling_dirs); - - if (!try_with_dot_git && - (error = git_buf_joinpath(&path, path.ptr, DOT_GIT)) < 0) - return error; - - while (!error && !git_buf_len(repo_path)) { - if (p_stat(path.ptr, &st) == 0) { - /* check that we have not crossed device boundaries */ - if (initial_device == 0) - initial_device = st.st_dev; - else if (st.st_dev != initial_device && - (flags & GIT_REPOSITORY_OPEN_CROSS_FS) == 0) - break; - - if (S_ISDIR(st.st_mode)) { - if (valid_repository_path(&path)) { - git_path_to_dir(&path); - git_buf_set(repo_path, path.ptr, path.size); - break; - } - } - else if (S_ISREG(st.st_mode)) { - git_buf repo_link = GIT_BUF_INIT; - - if (!(error = read_gitfile(&repo_link, path.ptr))) { - if (valid_repository_path(&repo_link)) { - git_buf_swap(repo_path, &repo_link); - - if (link_path) - error = git_buf_put(link_path, - path.ptr, path.size); - } - - git_buf_free(&repo_link); - break; - } - git_buf_free(&repo_link); - } - } - - /* move up one directory level */ - if (git_path_dirname_r(&path, path.ptr) < 0) { - error = -1; - break; - } - - if (try_with_dot_git) { - /* if we tried original dir with and without .git AND either hit - * directory ceiling or NO_SEARCH was requested, then be done. - */ - if (path.ptr[ceiling_offset] == '\0' || - (flags & GIT_REPOSITORY_OPEN_NO_SEARCH) != 0) - break; - /* otherwise look first for .git item */ - error = git_buf_joinpath(&path, path.ptr, DOT_GIT); - } - try_with_dot_git = !try_with_dot_git; - } - - if (!error && parent_path && !(flags & GIT_REPOSITORY_OPEN_BARE)) { - if (!git_buf_len(repo_path)) - git_buf_clear(parent_path); - else { - git_path_dirname_r(parent_path, path.ptr); - git_path_to_dir(parent_path); - } - if (git_buf_oom(parent_path)) - return -1; - } - - git_buf_free(&path); - - if (!git_buf_len(repo_path) && !error) { - giterr_set(GITERR_REPOSITORY, - "Could not find repository from '%s'", start_path); - error = GIT_ENOTFOUND; - } - - return error; -} - -int git_repository_open_bare( - git_repository **repo_ptr, - const char *bare_path) -{ - int error; - git_buf path = GIT_BUF_INIT; - git_repository *repo = NULL; - - if ((error = git_path_prettify_dir(&path, bare_path, NULL)) < 0) - return error; - - if (!valid_repository_path(&path)) { - git_buf_free(&path); - giterr_set(GITERR_REPOSITORY, "Path is not a repository: %s", bare_path); - return GIT_ENOTFOUND; - } - - repo = repository_alloc(); - GITERR_CHECK_ALLOC(repo); - - repo->path_repository = git_buf_detach(&path); - GITERR_CHECK_ALLOC(repo->path_repository); - - /* of course we're bare! */ - repo->is_bare = 1; - repo->workdir = NULL; - - *repo_ptr = repo; - return 0; -} - -int git_repository_open_ext( - git_repository **repo_ptr, - const char *start_path, - unsigned int flags, - const char *ceiling_dirs) -{ - int error; - git_buf path = GIT_BUF_INIT, parent = GIT_BUF_INIT, - link_path = GIT_BUF_INIT; - git_repository *repo; - git_config *config = NULL; - - if (repo_ptr) - *repo_ptr = NULL; - - error = find_repo( - &path, &parent, &link_path, start_path, flags, ceiling_dirs); - - if (error < 0 || !repo_ptr) - return error; - - repo = repository_alloc(); - GITERR_CHECK_ALLOC(repo); - - repo->path_repository = git_buf_detach(&path); - GITERR_CHECK_ALLOC(repo->path_repository); - - if (link_path.size) { - repo->path_gitlink = git_buf_detach(&link_path); - GITERR_CHECK_ALLOC(repo->path_gitlink); - } - - /* - * We'd like to have the config, but git doesn't particularly - * care if it's not there, so we need to deal with that. - */ - - error = git_repository_config_snapshot(&config, repo); - if (error < 0 && error != GIT_ENOTFOUND) - goto cleanup; - - if (config && (error = check_repositoryformatversion(config)) < 0) - goto cleanup; - - if ((flags & GIT_REPOSITORY_OPEN_BARE) != 0) - repo->is_bare = 1; - else { - - if (config && - ((error = load_config_data(repo, config)) < 0 || - (error = load_workdir(repo, config, &parent)) < 0)) - goto cleanup; - } - -cleanup: - git_buf_free(&parent); - git_config_free(config); - - if (error < 0) - git_repository_free(repo); - else - *repo_ptr = repo; - - return error; -} - -int git_repository_open(git_repository **repo_out, const char *path) -{ - return git_repository_open_ext( - repo_out, path, GIT_REPOSITORY_OPEN_NO_SEARCH, NULL); -} - -int git_repository_wrap_odb(git_repository **repo_out, git_odb *odb) -{ - git_repository *repo; - - repo = repository_alloc(); - GITERR_CHECK_ALLOC(repo); - - git_repository_set_odb(repo, odb); - *repo_out = repo; - - return 0; -} - -int git_repository_discover( - git_buf *out, - const char *start_path, - int across_fs, - const char *ceiling_dirs) -{ - uint32_t flags = across_fs ? GIT_REPOSITORY_OPEN_CROSS_FS : 0; - - assert(start_path); - - git_buf_sanitize(out); - - return find_repo(out, NULL, NULL, start_path, flags, ceiling_dirs); -} - -static int load_config( - git_config **out, - git_repository *repo, - const char *global_config_path, - const char *xdg_config_path, - const char *system_config_path, - const char *programdata_path) -{ - int error; - git_buf config_path = GIT_BUF_INIT; - git_config *cfg = NULL; - - assert(repo && out); - - if ((error = git_config_new(&cfg)) < 0) - return error; - - error = git_buf_joinpath( - &config_path, repo->path_repository, GIT_CONFIG_FILENAME_INREPO); - if (error < 0) - goto on_error; - - if ((error = git_config_add_file_ondisk( - cfg, config_path.ptr, GIT_CONFIG_LEVEL_LOCAL, 0)) < 0 && - error != GIT_ENOTFOUND) - goto on_error; - - git_buf_free(&config_path); - - if (global_config_path != NULL && - (error = git_config_add_file_ondisk( - cfg, global_config_path, GIT_CONFIG_LEVEL_GLOBAL, 0)) < 0 && - error != GIT_ENOTFOUND) - goto on_error; - - if (xdg_config_path != NULL && - (error = git_config_add_file_ondisk( - cfg, xdg_config_path, GIT_CONFIG_LEVEL_XDG, 0)) < 0 && - error != GIT_ENOTFOUND) - goto on_error; - - if (system_config_path != NULL && - (error = git_config_add_file_ondisk( - cfg, system_config_path, GIT_CONFIG_LEVEL_SYSTEM, 0)) < 0 && - error != GIT_ENOTFOUND) - goto on_error; - - if (programdata_path != NULL && - (error = git_config_add_file_ondisk( - cfg, programdata_path, GIT_CONFIG_LEVEL_PROGRAMDATA, 0)) < 0 && - error != GIT_ENOTFOUND) - goto on_error; - - giterr_clear(); /* clear any lingering ENOTFOUND errors */ - - *out = cfg; - return 0; - -on_error: - git_buf_free(&config_path); - git_config_free(cfg); - *out = NULL; - return error; -} - -static const char *path_unless_empty(git_buf *buf) -{ - return git_buf_len(buf) > 0 ? git_buf_cstr(buf) : NULL; -} - -int git_repository_config__weakptr(git_config **out, git_repository *repo) -{ - int error = 0; - - if (repo->_config == NULL) { - git_buf global_buf = GIT_BUF_INIT; - git_buf xdg_buf = GIT_BUF_INIT; - git_buf system_buf = GIT_BUF_INIT; - git_buf programdata_buf = GIT_BUF_INIT; - git_config *config; - - git_config_find_global(&global_buf); - git_config_find_xdg(&xdg_buf); - git_config_find_system(&system_buf); - git_config_find_programdata(&programdata_buf); - - /* If there is no global file, open a backend for it anyway */ - if (git_buf_len(&global_buf) == 0) - git_config__global_location(&global_buf); - - error = load_config( - &config, repo, - path_unless_empty(&global_buf), - path_unless_empty(&xdg_buf), - path_unless_empty(&system_buf), - path_unless_empty(&programdata_buf)); - if (!error) { - GIT_REFCOUNT_OWN(config, repo); - - config = git__compare_and_swap(&repo->_config, NULL, config); - if (config != NULL) { - GIT_REFCOUNT_OWN(config, NULL); - git_config_free(config); - } - } - - git_buf_free(&global_buf); - git_buf_free(&xdg_buf); - git_buf_free(&system_buf); - git_buf_free(&programdata_buf); - } - - *out = repo->_config; - return error; -} - -int git_repository_config(git_config **out, git_repository *repo) -{ - if (git_repository_config__weakptr(out, repo) < 0) - return -1; - - GIT_REFCOUNT_INC(*out); - return 0; -} - -int git_repository_config_snapshot(git_config **out, git_repository *repo) -{ - int error; - git_config *weak; - - if ((error = git_repository_config__weakptr(&weak, repo)) < 0) - return error; - - return git_config_snapshot(out, weak); -} - -void git_repository_set_config(git_repository *repo, git_config *config) -{ - assert(repo && config); - set_config(repo, config); -} - -int git_repository_odb__weakptr(git_odb **out, git_repository *repo) -{ - int error = 0; - - assert(repo && out); - - if (repo->_odb == NULL) { - git_buf odb_path = GIT_BUF_INIT; - git_odb *odb; - - if ((error = git_buf_joinpath(&odb_path, repo->path_repository, GIT_OBJECTS_DIR)) < 0) - return error; - - error = git_odb_open(&odb, odb_path.ptr); - if (!error) { - GIT_REFCOUNT_OWN(odb, repo); - - odb = git__compare_and_swap(&repo->_odb, NULL, odb); - if (odb != NULL) { - GIT_REFCOUNT_OWN(odb, NULL); - git_odb_free(odb); - } - } - - git_buf_free(&odb_path); - } - - *out = repo->_odb; - return error; -} - -int git_repository_odb(git_odb **out, git_repository *repo) -{ - if (git_repository_odb__weakptr(out, repo) < 0) - return -1; - - GIT_REFCOUNT_INC(*out); - return 0; -} - -void git_repository_set_odb(git_repository *repo, git_odb *odb) -{ - assert(repo && odb); - set_odb(repo, odb); -} - -int git_repository_refdb__weakptr(git_refdb **out, git_repository *repo) -{ - int error = 0; - - assert(out && repo); - - if (repo->_refdb == NULL) { - git_refdb *refdb; - - error = git_refdb_open(&refdb, repo); - if (!error) { - GIT_REFCOUNT_OWN(refdb, repo); - - refdb = git__compare_and_swap(&repo->_refdb, NULL, refdb); - if (refdb != NULL) { - GIT_REFCOUNT_OWN(refdb, NULL); - git_refdb_free(refdb); - } - } - } - - *out = repo->_refdb; - return error; -} - -int git_repository_refdb(git_refdb **out, git_repository *repo) -{ - if (git_repository_refdb__weakptr(out, repo) < 0) - return -1; - - GIT_REFCOUNT_INC(*out); - return 0; -} - -void git_repository_set_refdb(git_repository *repo, git_refdb *refdb) -{ - assert(repo && refdb); - set_refdb(repo, refdb); -} - -int git_repository_index__weakptr(git_index **out, git_repository *repo) -{ - int error = 0; - - assert(out && repo); - - if (repo->_index == NULL) { - git_buf index_path = GIT_BUF_INIT; - git_index *index; - - if ((error = git_buf_joinpath(&index_path, repo->path_repository, GIT_INDEX_FILE)) < 0) - return error; - - error = git_index_open(&index, index_path.ptr); - if (!error) { - GIT_REFCOUNT_OWN(index, repo); - - index = git__compare_and_swap(&repo->_index, NULL, index); - if (index != NULL) { - GIT_REFCOUNT_OWN(index, NULL); - git_index_free(index); - } - - error = git_index_set_caps(repo->_index, GIT_INDEXCAP_FROM_OWNER); - } - - git_buf_free(&index_path); - } - - *out = repo->_index; - return error; -} - -int git_repository_index(git_index **out, git_repository *repo) -{ - if (git_repository_index__weakptr(out, repo) < 0) - return -1; - - GIT_REFCOUNT_INC(*out); - return 0; -} - -void git_repository_set_index(git_repository *repo, git_index *index) -{ - assert(repo); - set_index(repo, index); -} - -int git_repository_set_namespace(git_repository *repo, const char *namespace) -{ - git__free(repo->namespace); - - if (namespace == NULL) { - repo->namespace = NULL; - return 0; - } - - return (repo->namespace = git__strdup(namespace)) ? 0 : -1; -} - -const char *git_repository_get_namespace(git_repository *repo) -{ - return repo->namespace; -} - -#ifdef GIT_WIN32 -static int reserved_names_add8dot3(git_repository *repo, const char *path) -{ - char *name = git_win32_path_8dot3_name(path); - const char *def = GIT_DIR_SHORTNAME; - const char *def_dot_git = DOT_GIT; - size_t name_len, def_len = CONST_STRLEN(GIT_DIR_SHORTNAME); - size_t def_dot_git_len = CONST_STRLEN(DOT_GIT); - git_buf *buf; - - if (!name) - return 0; - - name_len = strlen(name); - - if ((name_len == def_len && memcmp(name, def, def_len) == 0) || - (name_len == def_dot_git_len && memcmp(name, def_dot_git, def_dot_git_len) == 0)) { - git__free(name); - return 0; - } - - if ((buf = git_array_alloc(repo->reserved_names)) == NULL) - return -1; - - git_buf_attach(buf, name, name_len); - return true; -} - -bool git_repository__reserved_names( - git_buf **out, size_t *outlen, git_repository *repo, bool include_ntfs) -{ - GIT_UNUSED(include_ntfs); - - if (repo->reserved_names.size == 0) { - git_buf *buf; - size_t i; - - /* Add the static defaults */ - for (i = 0; i < git_repository__reserved_names_win32_len; i++) { - if ((buf = git_array_alloc(repo->reserved_names)) == NULL) - goto on_error; - - buf->ptr = git_repository__reserved_names_win32[i].ptr; - buf->size = git_repository__reserved_names_win32[i].size; - } - - /* Try to add any repo-specific reserved names - the gitlink file - * within a submodule or the repository (if the repository directory - * is beneath the workdir). These are typically `.git`, but should - * be protected in case they are not. Note, repo and workdir paths - * are always prettified to end in `/`, so a prefixcmp is safe. - */ - if (!repo->is_bare) { - int (*prefixcmp)(const char *, const char *); - int error, ignorecase; - - error = git_repository__cvar( - &ignorecase, repo, GIT_CVAR_IGNORECASE); - prefixcmp = (error || ignorecase) ? git__prefixcmp_icase : - git__prefixcmp; - - if (repo->path_gitlink && - reserved_names_add8dot3(repo, repo->path_gitlink) < 0) - goto on_error; - - if (repo->path_repository && - prefixcmp(repo->path_repository, repo->workdir) == 0 && - reserved_names_add8dot3(repo, repo->path_repository) < 0) - goto on_error; - } - } - - *out = repo->reserved_names.ptr; - *outlen = repo->reserved_names.size; - - return true; - - /* Always give good defaults, even on OOM */ -on_error: - *out = git_repository__reserved_names_win32; - *outlen = git_repository__reserved_names_win32_len; - - return false; -} -#else -bool git_repository__reserved_names( - git_buf **out, size_t *outlen, git_repository *repo, bool include_ntfs) -{ - GIT_UNUSED(repo); - - if (include_ntfs) { - *out = git_repository__reserved_names_win32; - *outlen = git_repository__reserved_names_win32_len; - } else { - *out = git_repository__reserved_names_posix; - *outlen = git_repository__reserved_names_posix_len; - } - - return true; -} -#endif - -static int check_repositoryformatversion(git_config *config) -{ - int version, error; - - error = git_config_get_int32(&version, config, "core.repositoryformatversion"); - /* git ignores this if the config variable isn't there */ - if (error == GIT_ENOTFOUND) - return 0; - - if (error < 0) - return -1; - - if (GIT_REPO_VERSION < version) { - giterr_set(GITERR_REPOSITORY, - "Unsupported repository version %d. Only versions up to %d are supported.", - version, GIT_REPO_VERSION); - return -1; - } - - return 0; -} - -static int repo_init_create_head(const char *git_dir, const char *ref_name) -{ - git_buf ref_path = GIT_BUF_INIT; - git_filebuf ref = GIT_FILEBUF_INIT; - const char *fmt; - - if (git_buf_joinpath(&ref_path, git_dir, GIT_HEAD_FILE) < 0 || - git_filebuf_open(&ref, ref_path.ptr, 0, GIT_REFS_FILE_MODE) < 0) - goto fail; - - if (!ref_name) - ref_name = GIT_BRANCH_MASTER; - - if (git__prefixcmp(ref_name, GIT_REFS_DIR) == 0) - fmt = "ref: %s\n"; - else - fmt = "ref: " GIT_REFS_HEADS_DIR "%s\n"; - - if (git_filebuf_printf(&ref, fmt, ref_name) < 0 || - git_filebuf_commit(&ref) < 0) - goto fail; - - git_buf_free(&ref_path); - return 0; - -fail: - git_buf_free(&ref_path); - git_filebuf_cleanup(&ref); - return -1; -} - -static bool is_chmod_supported(const char *file_path) -{ - struct stat st1, st2; - - if (p_stat(file_path, &st1) < 0) - return false; - - if (p_chmod(file_path, st1.st_mode ^ S_IXUSR) < 0) - return false; - - if (p_stat(file_path, &st2) < 0) - return false; - - return (st1.st_mode != st2.st_mode); -} - -static bool is_filesystem_case_insensitive(const char *gitdir_path) -{ - git_buf path = GIT_BUF_INIT; - int is_insensitive = -1; - - if (!git_buf_joinpath(&path, gitdir_path, "CoNfIg")) - is_insensitive = git_path_exists(git_buf_cstr(&path)); - - git_buf_free(&path); - return is_insensitive; -} - -static bool are_symlinks_supported(const char *wd_path) -{ - git_buf path = GIT_BUF_INIT; - int fd; - struct stat st; - int symlinks_supported = -1; - - if ((fd = git_futils_mktmp(&path, wd_path, 0666)) < 0 || - p_close(fd) < 0 || - p_unlink(path.ptr) < 0 || - p_symlink("testing", path.ptr) < 0 || - p_lstat(path.ptr, &st) < 0) - symlinks_supported = false; - else - symlinks_supported = (S_ISLNK(st.st_mode) != 0); - - (void)p_unlink(path.ptr); - git_buf_free(&path); - - return symlinks_supported; -} - -static int create_empty_file(const char *path, mode_t mode) -{ - int fd; - - if ((fd = p_creat(path, mode)) < 0) { - giterr_set(GITERR_OS, "Error while creating '%s'", path); - return -1; - } - - if (p_close(fd) < 0) { - giterr_set(GITERR_OS, "Error while closing '%s'", path); - return -1; - } - - return 0; -} - -static int repo_local_config( - git_config **out, - git_buf *config_dir, - git_repository *repo, - const char *repo_dir) -{ - int error = 0; - git_config *parent; - const char *cfg_path; - - if (git_buf_joinpath(config_dir, repo_dir, GIT_CONFIG_FILENAME_INREPO) < 0) - return -1; - cfg_path = git_buf_cstr(config_dir); - - /* make LOCAL config if missing */ - if (!git_path_isfile(cfg_path) && - (error = create_empty_file(cfg_path, GIT_CONFIG_FILE_MODE)) < 0) - return error; - - /* if no repo, just open that file directly */ - if (!repo) - return git_config_open_ondisk(out, cfg_path); - - /* otherwise, open parent config and get that level */ - if ((error = git_repository_config__weakptr(&parent, repo)) < 0) - return error; - - if (git_config_open_level(out, parent, GIT_CONFIG_LEVEL_LOCAL) < 0) { - giterr_clear(); - - if (!(error = git_config_add_file_ondisk( - parent, cfg_path, GIT_CONFIG_LEVEL_LOCAL, false))) - error = git_config_open_level(out, parent, GIT_CONFIG_LEVEL_LOCAL); - } - - git_config_free(parent); - - return error; -} - -static int repo_init_fs_configs( - git_config *cfg, - const char *cfg_path, - const char *repo_dir, - const char *work_dir, - bool update_ignorecase) -{ - int error = 0; - - if (!work_dir) - work_dir = repo_dir; - - if ((error = git_config_set_bool( - cfg, "core.filemode", is_chmod_supported(cfg_path))) < 0) - return error; - - if (!are_symlinks_supported(work_dir)) { - if ((error = git_config_set_bool(cfg, "core.symlinks", false)) < 0) - return error; - } else if (git_config_delete_entry(cfg, "core.symlinks") < 0) - giterr_clear(); - - if (update_ignorecase) { - if (is_filesystem_case_insensitive(repo_dir)) { - if ((error = git_config_set_bool(cfg, "core.ignorecase", true)) < 0) - return error; - } else if (git_config_delete_entry(cfg, "core.ignorecase") < 0) - giterr_clear(); - } - -#ifdef GIT_USE_ICONV - if ((error = git_config_set_bool( - cfg, "core.precomposeunicode", - git_path_does_fs_decompose_unicode(work_dir))) < 0) - return error; - /* on non-iconv platforms, don't even set core.precomposeunicode */ -#endif - - return 0; -} - -static int repo_init_config( - const char *repo_dir, - const char *work_dir, - uint32_t flags, - uint32_t mode) -{ - int error = 0; - git_buf cfg_path = GIT_BUF_INIT, worktree_path = GIT_BUF_INIT; - git_config *config = NULL; - bool is_bare = ((flags & GIT_REPOSITORY_INIT_BARE) != 0); - bool is_reinit = ((flags & GIT_REPOSITORY_INIT__IS_REINIT) != 0); - - if ((error = repo_local_config(&config, &cfg_path, NULL, repo_dir)) < 0) - goto cleanup; - - if (is_reinit && (error = check_repositoryformatversion(config)) < 0) - goto cleanup; - -#define SET_REPO_CONFIG(TYPE, NAME, VAL) do { \ - if ((error = git_config_set_##TYPE(config, NAME, VAL)) < 0) \ - goto cleanup; } while (0) - - SET_REPO_CONFIG(bool, "core.bare", is_bare); - SET_REPO_CONFIG(int32, "core.repositoryformatversion", GIT_REPO_VERSION); - - if ((error = repo_init_fs_configs( - config, cfg_path.ptr, repo_dir, work_dir, !is_reinit)) < 0) - goto cleanup; - - if (!is_bare) { - SET_REPO_CONFIG(bool, "core.logallrefupdates", true); - - if (!(flags & GIT_REPOSITORY_INIT__NATURAL_WD)) { - if ((error = git_buf_sets(&worktree_path, work_dir)) < 0) - goto cleanup; - - if ((flags & GIT_REPOSITORY_INIT_RELATIVE_GITLINK)) - if ((error = git_path_make_relative(&worktree_path, repo_dir)) < 0) - goto cleanup; - - SET_REPO_CONFIG(string, "core.worktree", worktree_path.ptr); - } else if (is_reinit) { - if (git_config_delete_entry(config, "core.worktree") < 0) - giterr_clear(); - } - } - - if (mode == GIT_REPOSITORY_INIT_SHARED_GROUP) { - SET_REPO_CONFIG(int32, "core.sharedrepository", 1); - SET_REPO_CONFIG(bool, "receive.denyNonFastforwards", true); - } - else if (mode == GIT_REPOSITORY_INIT_SHARED_ALL) { - SET_REPO_CONFIG(int32, "core.sharedrepository", 2); - SET_REPO_CONFIG(bool, "receive.denyNonFastforwards", true); - } - -cleanup: - git_buf_free(&cfg_path); - git_buf_free(&worktree_path); - git_config_free(config); - - return error; -} - -static int repo_reinit_submodule_fs(git_submodule *sm, const char *n, void *p) -{ - git_repository *smrepo = NULL; - GIT_UNUSED(n); GIT_UNUSED(p); - - if (git_submodule_open(&smrepo, sm) < 0 || - git_repository_reinit_filesystem(smrepo, true) < 0) - giterr_clear(); - git_repository_free(smrepo); - - return 0; -} - -int git_repository_reinit_filesystem(git_repository *repo, int recurse) -{ - int error = 0; - git_buf path = GIT_BUF_INIT; - git_config *config = NULL; - const char *repo_dir = git_repository_path(repo); - - if (!(error = repo_local_config(&config, &path, repo, repo_dir))) - error = repo_init_fs_configs( - config, path.ptr, repo_dir, git_repository_workdir(repo), true); - - git_config_free(config); - git_buf_free(&path); - - git_repository__cvar_cache_clear(repo); - - if (!repo->is_bare && recurse) - (void)git_submodule_foreach(repo, repo_reinit_submodule_fs, NULL); - - return error; -} - -static int repo_write_template( - const char *git_dir, - bool allow_overwrite, - const char *file, - mode_t mode, - bool hidden, - const char *content) -{ - git_buf path = GIT_BUF_INIT; - int fd, error = 0, flags; - - if (git_buf_joinpath(&path, git_dir, file) < 0) - return -1; - - if (allow_overwrite) - flags = O_WRONLY | O_CREAT | O_TRUNC; - else - flags = O_WRONLY | O_CREAT | O_EXCL; - - fd = p_open(git_buf_cstr(&path), flags, mode); - - if (fd >= 0) { - error = p_write(fd, content, strlen(content)); - - p_close(fd); - } - else if (errno != EEXIST) - error = fd; - -#ifdef GIT_WIN32 - if (!error && hidden) { - if (git_win32__set_hidden(path.ptr, true) < 0) - error = -1; - } -#else - GIT_UNUSED(hidden); -#endif - - git_buf_free(&path); - - if (error) - giterr_set(GITERR_OS, - "Failed to initialize repository with template '%s'", file); - - return error; -} - -static int repo_write_gitlink( - const char *in_dir, const char *to_repo, bool use_relative_path) -{ - int error; - git_buf buf = GIT_BUF_INIT; - git_buf path_to_repo = GIT_BUF_INIT; - struct stat st; - - git_path_dirname_r(&buf, to_repo); - git_path_to_dir(&buf); - if (git_buf_oom(&buf)) - return -1; - - /* don't write gitlink to natural workdir */ - if (git__suffixcmp(to_repo, "/" DOT_GIT "/") == 0 && - strcmp(in_dir, buf.ptr) == 0) - { - error = GIT_PASSTHROUGH; - goto cleanup; - } - - if ((error = git_buf_joinpath(&buf, in_dir, DOT_GIT)) < 0) - goto cleanup; - - if (!p_stat(buf.ptr, &st) && !S_ISREG(st.st_mode)) { - giterr_set(GITERR_REPOSITORY, - "Cannot overwrite gitlink file into path '%s'", in_dir); - error = GIT_EEXISTS; - goto cleanup; - } - - git_buf_clear(&buf); - - error = git_buf_sets(&path_to_repo, to_repo); - - if (!error && use_relative_path) - error = git_path_make_relative(&path_to_repo, in_dir); - - if (!error) - error = git_buf_join(&buf, ' ', GIT_FILE_CONTENT_PREFIX, path_to_repo.ptr); - - if (!error) - error = repo_write_template(in_dir, true, DOT_GIT, 0666, true, buf.ptr); - -cleanup: - git_buf_free(&buf); - git_buf_free(&path_to_repo); - return error; -} - -static mode_t pick_dir_mode(git_repository_init_options *opts) -{ - if (opts->mode == GIT_REPOSITORY_INIT_SHARED_UMASK) - return 0777; - if (opts->mode == GIT_REPOSITORY_INIT_SHARED_GROUP) - return (0775 | S_ISGID); - if (opts->mode == GIT_REPOSITORY_INIT_SHARED_ALL) - return (0777 | S_ISGID); - return opts->mode; -} - -#include "repo_template.h" - -static int repo_init_structure( - const char *repo_dir, - const char *work_dir, - git_repository_init_options *opts) -{ - int error = 0; - repo_template_item *tpl; - bool external_tpl = - ((opts->flags & GIT_REPOSITORY_INIT_EXTERNAL_TEMPLATE) != 0); - mode_t dmode = pick_dir_mode(opts); - bool chmod = opts->mode != GIT_REPOSITORY_INIT_SHARED_UMASK; - - /* Hide the ".git" directory */ -#ifdef GIT_WIN32 - if ((opts->flags & GIT_REPOSITORY_INIT__HAS_DOTGIT) != 0) { - if (git_win32__set_hidden(repo_dir, true) < 0) { - giterr_set(GITERR_OS, - "Failed to mark Git repository folder as hidden"); - return -1; - } - } -#endif - - /* Create the .git gitlink if appropriate */ - if ((opts->flags & GIT_REPOSITORY_INIT_BARE) == 0 && - (opts->flags & GIT_REPOSITORY_INIT__NATURAL_WD) == 0) - { - if (repo_write_gitlink(work_dir, repo_dir, opts->flags & GIT_REPOSITORY_INIT_RELATIVE_GITLINK) < 0) - return -1; - } - - /* Copy external template if requested */ - if (external_tpl) { - git_config *cfg = NULL; - const char *tdir = NULL; - bool default_template = false; - git_buf template_buf = GIT_BUF_INIT; - - if (opts->template_path) - tdir = opts->template_path; - else if ((error = git_config_open_default(&cfg)) >= 0) { - if (!git_config_get_path(&template_buf, cfg, "init.templatedir")) - tdir = template_buf.ptr; - giterr_clear(); - } - - if (!tdir) { - if (!(error = git_sysdir_find_template_dir(&template_buf))) - tdir = template_buf.ptr; - default_template = true; - } - - if (tdir) { - uint32_t cpflags = GIT_CPDIR_COPY_SYMLINKS | - GIT_CPDIR_SIMPLE_TO_MODE | - GIT_CPDIR_COPY_DOTFILES; - if (opts->mode != GIT_REPOSITORY_INIT_SHARED_UMASK) - cpflags |= GIT_CPDIR_CHMOD_DIRS; - error = git_futils_cp_r(tdir, repo_dir, cpflags, dmode); - } - - git_buf_free(&template_buf); - git_config_free(cfg); - - if (error < 0) { - if (!default_template) - return error; - - /* if template was default, ignore error and use internal */ - giterr_clear(); - external_tpl = false; - error = 0; - } - } - - /* Copy internal template - * - always ensure existence of dirs - * - only create files if no external template was specified - */ - for (tpl = repo_template; !error && tpl->path; ++tpl) { - if (!tpl->content) { - uint32_t mkdir_flags = GIT_MKDIR_PATH; - if (chmod) - mkdir_flags |= GIT_MKDIR_CHMOD; - - error = git_futils_mkdir_relative( - tpl->path, repo_dir, dmode, mkdir_flags, NULL); - } - else if (!external_tpl) { - const char *content = tpl->content; - - if (opts->description && strcmp(tpl->path, GIT_DESC_FILE) == 0) - content = opts->description; - - error = repo_write_template( - repo_dir, false, tpl->path, tpl->mode, false, content); - } - } - - return error; -} - -static int mkdir_parent(git_buf *buf, uint32_t mode, bool skip2) -{ - /* When making parent directories during repository initialization - * don't try to set gid or grant world write access - */ - return git_futils_mkdir( - buf->ptr, mode & ~(S_ISGID | 0002), - GIT_MKDIR_PATH | GIT_MKDIR_VERIFY_DIR | - (skip2 ? GIT_MKDIR_SKIP_LAST2 : GIT_MKDIR_SKIP_LAST)); -} - -static int repo_init_directories( - git_buf *repo_path, - git_buf *wd_path, - const char *given_repo, - git_repository_init_options *opts) -{ - int error = 0; - bool is_bare, add_dotgit, has_dotgit, natural_wd; - mode_t dirmode; - - /* There are three possible rules for what we are allowed to create: - * - MKPATH means anything we need - * - MKDIR means just the .git directory and its parent and the workdir - * - Neither means only the .git directory can be created - * - * There are 5 "segments" of path that we might need to deal with: - * 1. The .git directory - * 2. The parent of the .git directory - * 3. Everything above the parent of the .git directory - * 4. The working directory (often the same as #2) - * 5. Everything above the working directory (often the same as #3) - * - * For all directories created, we start with the init_mode value for - * permissions and then strip off bits in some cases: - * - * For MKPATH, we create #3 (and #5) paths without S_ISGID or S_IWOTH - * For MKPATH and MKDIR, we create #2 (and #4) without S_ISGID - * For all rules, we create #1 using the untouched init_mode - */ - - /* set up repo path */ - - is_bare = ((opts->flags & GIT_REPOSITORY_INIT_BARE) != 0); - - add_dotgit = - (opts->flags & GIT_REPOSITORY_INIT_NO_DOTGIT_DIR) == 0 && - !is_bare && - git__suffixcmp(given_repo, "/" DOT_GIT) != 0 && - git__suffixcmp(given_repo, "/" GIT_DIR) != 0; - - if (git_buf_joinpath(repo_path, given_repo, add_dotgit ? GIT_DIR : "") < 0) - return -1; - - has_dotgit = (git__suffixcmp(repo_path->ptr, "/" GIT_DIR) == 0); - if (has_dotgit) - opts->flags |= GIT_REPOSITORY_INIT__HAS_DOTGIT; - - /* set up workdir path */ - - if (!is_bare) { - if (opts->workdir_path) { - if (git_path_join_unrooted( - wd_path, opts->workdir_path, repo_path->ptr, NULL) < 0) - return -1; - } else if (has_dotgit) { - if (git_path_dirname_r(wd_path, repo_path->ptr) < 0) - return -1; - } else { - giterr_set(GITERR_REPOSITORY, "Cannot pick working directory" - " for non-bare repository that isn't a '.git' directory"); - return -1; - } - - if (git_path_to_dir(wd_path) < 0) - return -1; - } else { - git_buf_clear(wd_path); - } - - natural_wd = - has_dotgit && - wd_path->size > 0 && - wd_path->size + strlen(GIT_DIR) == repo_path->size && - memcmp(repo_path->ptr, wd_path->ptr, wd_path->size) == 0; - if (natural_wd) - opts->flags |= GIT_REPOSITORY_INIT__NATURAL_WD; - - /* create directories as needed / requested */ - - dirmode = pick_dir_mode(opts); - - if ((opts->flags & GIT_REPOSITORY_INIT_MKPATH) != 0) { - /* create path #5 */ - if (wd_path->size > 0 && - (error = mkdir_parent(wd_path, dirmode, false)) < 0) - return error; - - /* create path #3 (if not the same as #5) */ - if (!natural_wd && - (error = mkdir_parent(repo_path, dirmode, has_dotgit)) < 0) - return error; - } - - if ((opts->flags & GIT_REPOSITORY_INIT_MKDIR) != 0 || - (opts->flags & GIT_REPOSITORY_INIT_MKPATH) != 0) - { - /* create path #4 */ - if (wd_path->size > 0 && - (error = git_futils_mkdir( - wd_path->ptr, dirmode & ~S_ISGID, - GIT_MKDIR_VERIFY_DIR)) < 0) - return error; - - /* create path #2 (if not the same as #4) */ - if (!natural_wd && - (error = git_futils_mkdir( - repo_path->ptr, dirmode & ~S_ISGID, - GIT_MKDIR_VERIFY_DIR | GIT_MKDIR_SKIP_LAST)) < 0) - return error; - } - - if ((opts->flags & GIT_REPOSITORY_INIT_MKDIR) != 0 || - (opts->flags & GIT_REPOSITORY_INIT_MKPATH) != 0 || - has_dotgit) - { - /* create path #1 */ - error = git_futils_mkdir(repo_path->ptr, dirmode, - GIT_MKDIR_VERIFY_DIR | ((dirmode & S_ISGID) ? GIT_MKDIR_CHMOD : 0)); - } - - /* prettify both directories now that they are created */ - - if (!error) { - error = git_path_prettify_dir(repo_path, repo_path->ptr, NULL); - - if (!error && wd_path->size > 0) - error = git_path_prettify_dir(wd_path, wd_path->ptr, NULL); - } - - return error; -} - -static int repo_init_create_origin(git_repository *repo, const char *url) -{ - int error; - git_remote *remote; - - if (!(error = git_remote_create(&remote, repo, GIT_REMOTE_ORIGIN, url))) { - git_remote_free(remote); - } - - return error; -} - -int git_repository_init( - git_repository **repo_out, const char *path, unsigned is_bare) -{ - git_repository_init_options opts = GIT_REPOSITORY_INIT_OPTIONS_INIT; - - opts.flags = GIT_REPOSITORY_INIT_MKPATH; /* don't love this default */ - if (is_bare) - opts.flags |= GIT_REPOSITORY_INIT_BARE; - - return git_repository_init_ext(repo_out, path, &opts); -} - -int git_repository_init_ext( - git_repository **out, - const char *given_repo, - git_repository_init_options *opts) -{ - int error; - git_buf repo_path = GIT_BUF_INIT, wd_path = GIT_BUF_INIT; - const char *wd; - - assert(out && given_repo && opts); - - GITERR_CHECK_VERSION(opts, GIT_REPOSITORY_INIT_OPTIONS_VERSION, "git_repository_init_options"); - - error = repo_init_directories(&repo_path, &wd_path, given_repo, opts); - if (error < 0) - goto cleanup; - - wd = (opts->flags & GIT_REPOSITORY_INIT_BARE) ? NULL : git_buf_cstr(&wd_path); - if (valid_repository_path(&repo_path)) { - - if ((opts->flags & GIT_REPOSITORY_INIT_NO_REINIT) != 0) { - giterr_set(GITERR_REPOSITORY, - "Attempt to reinitialize '%s'", given_repo); - error = GIT_EEXISTS; - goto cleanup; - } - - opts->flags |= GIT_REPOSITORY_INIT__IS_REINIT; - - error = repo_init_config( - repo_path.ptr, wd, opts->flags, opts->mode); - - /* TODO: reinitialize the templates */ - } - else { - if (!(error = repo_init_structure( - repo_path.ptr, wd, opts)) && - !(error = repo_init_config( - repo_path.ptr, wd, opts->flags, opts->mode))) - error = repo_init_create_head( - repo_path.ptr, opts->initial_head); - } - if (error < 0) - goto cleanup; - - error = git_repository_open(out, repo_path.ptr); - - if (!error && opts->origin_url) - error = repo_init_create_origin(*out, opts->origin_url); - -cleanup: - git_buf_free(&repo_path); - git_buf_free(&wd_path); - - return error; -} - -int git_repository_head_detached(git_repository *repo) -{ - git_reference *ref; - git_odb *odb = NULL; - int exists; - - if (git_repository_odb__weakptr(&odb, repo) < 0) - return -1; - - if (git_reference_lookup(&ref, repo, GIT_HEAD_FILE) < 0) - return -1; - - if (git_reference_type(ref) == GIT_REF_SYMBOLIC) { - git_reference_free(ref); - return 0; - } - - exists = git_odb_exists(odb, git_reference_target(ref)); - - git_reference_free(ref); - return exists; -} - -int git_repository_head(git_reference **head_out, git_repository *repo) -{ - git_reference *head; - int error; - - if ((error = git_reference_lookup(&head, repo, GIT_HEAD_FILE)) < 0) - return error; - - if (git_reference_type(head) == GIT_REF_OID) { - *head_out = head; - return 0; - } - - error = git_reference_lookup_resolved(head_out, repo, git_reference_symbolic_target(head), -1); - git_reference_free(head); - - return error == GIT_ENOTFOUND ? GIT_EUNBORNBRANCH : error; -} - -int git_repository_head_unborn(git_repository *repo) -{ - git_reference *ref = NULL; - int error; - - error = git_repository_head(&ref, repo); - git_reference_free(ref); - - if (error == GIT_EUNBORNBRANCH) { - giterr_clear(); - return 1; - } - - if (error < 0) - return -1; - - return 0; -} - -static int at_least_one_cb(const char *refname, void *payload) -{ - GIT_UNUSED(refname); - GIT_UNUSED(payload); - return GIT_PASSTHROUGH; -} - -static int repo_contains_no_reference(git_repository *repo) -{ - int error = git_reference_foreach_name(repo, &at_least_one_cb, NULL); - - if (error == GIT_PASSTHROUGH) - return 0; - - if (!error) - return 1; - - return error; -} - -int git_repository_is_empty(git_repository *repo) -{ - git_reference *head = NULL; - int is_empty = 0; - - if (git_reference_lookup(&head, repo, GIT_HEAD_FILE) < 0) - return -1; - - if (git_reference_type(head) == GIT_REF_SYMBOLIC) - is_empty = - (strcmp(git_reference_symbolic_target(head), - GIT_REFS_HEADS_DIR "master") == 0) && - repo_contains_no_reference(repo); - - git_reference_free(head); - - return is_empty; -} - -const char *git_repository_path(git_repository *repo) -{ - assert(repo); - return repo->path_repository; -} - -const char *git_repository_workdir(git_repository *repo) -{ - assert(repo); - - if (repo->is_bare) - return NULL; - - return repo->workdir; -} - -int git_repository_set_workdir( - git_repository *repo, const char *workdir, int update_gitlink) -{ - int error = 0; - git_buf path = GIT_BUF_INIT; - - assert(repo && workdir); - - if (git_path_prettify_dir(&path, workdir, NULL) < 0) - return -1; - - if (repo->workdir && strcmp(repo->workdir, path.ptr) == 0) - return 0; - - if (update_gitlink) { - git_config *config; - - if (git_repository_config__weakptr(&config, repo) < 0) - return -1; - - error = repo_write_gitlink(path.ptr, git_repository_path(repo), false); - - /* passthrough error means gitlink is unnecessary */ - if (error == GIT_PASSTHROUGH) - error = git_config_delete_entry(config, "core.worktree"); - else if (!error) - error = git_config_set_string(config, "core.worktree", path.ptr); - - if (!error) - error = git_config_set_bool(config, "core.bare", false); - } - - if (!error) { - char *old_workdir = repo->workdir; - - repo->workdir = git_buf_detach(&path); - repo->is_bare = 0; - - git__free(old_workdir); - } - - return error; -} - -int git_repository_is_bare(git_repository *repo) -{ - assert(repo); - return repo->is_bare; -} - -int git_repository_set_bare(git_repository *repo) -{ - int error; - git_config *config; - - assert(repo); - - if (repo->is_bare) - return 0; - - if ((error = git_repository_config__weakptr(&config, repo)) < 0) - return error; - - if ((error = git_config_set_bool(config, "core.bare", true)) < 0) - return error; - - if ((error = git_config__update_entry(config, "core.worktree", NULL, true, true)) < 0) - return error; - - git__free(repo->workdir); - repo->workdir = NULL; - repo->is_bare = 1; - - return 0; -} - -int git_repository_head_tree(git_tree **tree, git_repository *repo) -{ - git_reference *head; - git_object *obj; - int error; - - if ((error = git_repository_head(&head, repo)) < 0) - return error; - - if ((error = git_reference_peel(&obj, head, GIT_OBJ_TREE)) < 0) - goto cleanup; - - *tree = (git_tree *)obj; - -cleanup: - git_reference_free(head); - return error; -} - -int git_repository__set_orig_head(git_repository *repo, const git_oid *orig_head) -{ - git_filebuf file = GIT_FILEBUF_INIT; - git_buf file_path = GIT_BUF_INIT; - char orig_head_str[GIT_OID_HEXSZ]; - int error = 0; - - git_oid_fmt(orig_head_str, orig_head); - - if ((error = git_buf_joinpath(&file_path, repo->path_repository, GIT_ORIG_HEAD_FILE)) == 0 && - (error = git_filebuf_open(&file, file_path.ptr, GIT_FILEBUF_FORCE, GIT_MERGE_FILE_MODE)) == 0 && - (error = git_filebuf_printf(&file, "%.*s\n", GIT_OID_HEXSZ, orig_head_str)) == 0) - error = git_filebuf_commit(&file); - - if (error < 0) - git_filebuf_cleanup(&file); - - git_buf_free(&file_path); - - return error; -} - -int git_repository_message(git_buf *out, git_repository *repo) -{ - git_buf path = GIT_BUF_INIT; - struct stat st; - int error; - - git_buf_sanitize(out); - - if (git_buf_joinpath(&path, repo->path_repository, GIT_MERGE_MSG_FILE) < 0) - return -1; - - if ((error = p_stat(git_buf_cstr(&path), &st)) < 0) { - if (errno == ENOENT) - error = GIT_ENOTFOUND; - giterr_set(GITERR_OS, "Could not access message file"); - } else { - error = git_futils_readbuffer(out, git_buf_cstr(&path)); - } - - git_buf_free(&path); - - return error; -} - -int git_repository_message_remove(git_repository *repo) -{ - git_buf path = GIT_BUF_INIT; - int error; - - if (git_buf_joinpath(&path, repo->path_repository, GIT_MERGE_MSG_FILE) < 0) - return -1; - - error = p_unlink(git_buf_cstr(&path)); - git_buf_free(&path); - - return error; -} - -int git_repository_hashfile( - git_oid *out, - git_repository *repo, - const char *path, - git_otype type, - const char *as_path) -{ - int error; - git_filter_list *fl = NULL; - git_file fd = -1; - git_off_t len; - git_buf full_path = GIT_BUF_INIT; - - assert(out && path && repo); /* as_path can be NULL */ - - /* At some point, it would be nice if repo could be NULL to just - * apply filter rules defined in system and global files, but for - * now that is not possible because git_filters_load() needs it. - */ - - error = git_path_join_unrooted( - &full_path, path, git_repository_workdir(repo), NULL); - if (error < 0) - return error; - - if (!as_path) - as_path = path; - - /* passing empty string for "as_path" indicated --no-filters */ - if (strlen(as_path) > 0) { - error = git_filter_list_load( - &fl, repo, NULL, as_path, - GIT_FILTER_TO_ODB, GIT_FILTER_DEFAULT); - if (error < 0) - return error; - } else { - error = 0; - } - - /* at this point, error is a count of the number of loaded filters */ - - fd = git_futils_open_ro(full_path.ptr); - if (fd < 0) { - error = fd; - goto cleanup; - } - - len = git_futils_filesize(fd); - if (len < 0) { - error = (int)len; - goto cleanup; - } - - if (!git__is_sizet(len)) { - giterr_set(GITERR_OS, "File size overflow for 32-bit systems"); - error = -1; - goto cleanup; - } - - error = git_odb__hashfd_filtered(out, fd, (size_t)len, type, fl); - -cleanup: - if (fd >= 0) - p_close(fd); - git_filter_list_free(fl); - git_buf_free(&full_path); - - return error; -} - -static int checkout_message(git_buf *out, git_reference *old, const char *new) -{ - git_buf_puts(out, "checkout: moving from "); - - if (git_reference_type(old) == GIT_REF_SYMBOLIC) - git_buf_puts(out, git_reference__shorthand(git_reference_symbolic_target(old))); - else - git_buf_puts(out, git_oid_tostr_s(git_reference_target(old))); - - git_buf_puts(out, " to "); - - if (git_reference__is_branch(new)) - git_buf_puts(out, git_reference__shorthand(new)); - else - git_buf_puts(out, new); - - if (git_buf_oom(out)) - return -1; - - return 0; -} - -int git_repository_set_head( - git_repository* repo, - const char* refname) -{ - git_reference *ref = NULL, *current = NULL, *new_head = NULL; - git_buf log_message = GIT_BUF_INIT; - int error; - - assert(repo && refname); - - if ((error = git_reference_lookup(¤t, repo, GIT_HEAD_FILE)) < 0) - return error; - - if ((error = checkout_message(&log_message, current, refname)) < 0) - goto cleanup; - - error = git_reference_lookup(&ref, repo, refname); - if (error < 0 && error != GIT_ENOTFOUND) - goto cleanup; - - if (!error) { - if (git_reference_is_branch(ref)) { - error = git_reference_symbolic_create(&new_head, repo, GIT_HEAD_FILE, - git_reference_name(ref), true, git_buf_cstr(&log_message)); - } else { - error = git_repository_set_head_detached(repo, git_reference_target(ref)); - } - } else if (git_reference__is_branch(refname)) { - error = git_reference_symbolic_create(&new_head, repo, GIT_HEAD_FILE, refname, - true, git_buf_cstr(&log_message)); - } - -cleanup: - git_buf_free(&log_message); - git_reference_free(current); - git_reference_free(ref); - git_reference_free(new_head); - return error; -} - -static int detach(git_repository *repo, const git_oid *id, const char *from) -{ - int error; - git_buf log_message = GIT_BUF_INIT; - git_object *object = NULL, *peeled = NULL; - git_reference *new_head = NULL, *current = NULL; - - assert(repo && id); - - if ((error = git_reference_lookup(¤t, repo, GIT_HEAD_FILE)) < 0) - return error; - - if ((error = git_object_lookup(&object, repo, id, GIT_OBJ_ANY)) < 0) - goto cleanup; - - if ((error = git_object_peel(&peeled, object, GIT_OBJ_COMMIT)) < 0) - goto cleanup; - - if (from == NULL) - from = git_oid_tostr_s(git_object_id(peeled)); - - if ((error = checkout_message(&log_message, current, from)) < 0) - goto cleanup; - - error = git_reference_create(&new_head, repo, GIT_HEAD_FILE, git_object_id(peeled), true, git_buf_cstr(&log_message)); - -cleanup: - git_buf_free(&log_message); - git_object_free(object); - git_object_free(peeled); - git_reference_free(current); - git_reference_free(new_head); - return error; -} - -int git_repository_set_head_detached( - git_repository* repo, - const git_oid* commitish) -{ - return detach(repo, commitish, NULL); -} - -int git_repository_set_head_detached_from_annotated( - git_repository *repo, - const git_annotated_commit *commitish) -{ - assert(repo && commitish); - - return detach(repo, git_annotated_commit_id(commitish), commitish->ref_name); -} - -int git_repository_detach_head(git_repository* repo) -{ - git_reference *old_head = NULL, *new_head = NULL, *current = NULL; - git_object *object = NULL; - git_buf log_message = GIT_BUF_INIT; - int error; - - assert(repo); - - if ((error = git_reference_lookup(¤t, repo, GIT_HEAD_FILE)) < 0) - return error; - - if ((error = git_repository_head(&old_head, repo)) < 0) - goto cleanup; - - if ((error = git_object_lookup(&object, repo, git_reference_target(old_head), GIT_OBJ_COMMIT)) < 0) - goto cleanup; - - if ((error = checkout_message(&log_message, current, git_oid_tostr_s(git_object_id(object)))) < 0) - goto cleanup; - - error = git_reference_create(&new_head, repo, GIT_HEAD_FILE, git_reference_target(old_head), - 1, git_buf_cstr(&log_message)); - -cleanup: - git_buf_free(&log_message); - git_object_free(object); - git_reference_free(old_head); - git_reference_free(new_head); - git_reference_free(current); - return error; -} - -/** - * Loosely ported from git.git - * https://github.com/git/git/blob/master/contrib/completion/git-prompt.sh#L198-289 - */ -int git_repository_state(git_repository *repo) -{ - git_buf repo_path = GIT_BUF_INIT; - int state = GIT_REPOSITORY_STATE_NONE; - - assert(repo); - - if (git_buf_puts(&repo_path, repo->path_repository) < 0) - return -1; - - if (git_path_contains_file(&repo_path, GIT_REBASE_MERGE_INTERACTIVE_FILE)) - state = GIT_REPOSITORY_STATE_REBASE_INTERACTIVE; - else if (git_path_contains_dir(&repo_path, GIT_REBASE_MERGE_DIR)) - state = GIT_REPOSITORY_STATE_REBASE_MERGE; - else if (git_path_contains_file(&repo_path, GIT_REBASE_APPLY_REBASING_FILE)) - state = GIT_REPOSITORY_STATE_REBASE; - else if (git_path_contains_file(&repo_path, GIT_REBASE_APPLY_APPLYING_FILE)) - state = GIT_REPOSITORY_STATE_APPLY_MAILBOX; - else if (git_path_contains_dir(&repo_path, GIT_REBASE_APPLY_DIR)) - state = GIT_REPOSITORY_STATE_APPLY_MAILBOX_OR_REBASE; - else if (git_path_contains_file(&repo_path, GIT_MERGE_HEAD_FILE)) - state = GIT_REPOSITORY_STATE_MERGE; - else if (git_path_contains_file(&repo_path, GIT_REVERT_HEAD_FILE)) { - state = GIT_REPOSITORY_STATE_REVERT; - if (git_path_contains_file(&repo_path, GIT_SEQUENCER_TODO_FILE)) { - state = GIT_REPOSITORY_STATE_REVERT_SEQUENCE; - } - } else if (git_path_contains_file(&repo_path, GIT_CHERRYPICK_HEAD_FILE)) { - state = GIT_REPOSITORY_STATE_CHERRYPICK; - if (git_path_contains_file(&repo_path, GIT_SEQUENCER_TODO_FILE)) { - state = GIT_REPOSITORY_STATE_CHERRYPICK_SEQUENCE; - } - } else if (git_path_contains_file(&repo_path, GIT_BISECT_LOG_FILE)) - state = GIT_REPOSITORY_STATE_BISECT; - - git_buf_free(&repo_path); - return state; -} - -int git_repository__cleanup_files( - git_repository *repo, const char *files[], size_t files_len) -{ - git_buf buf = GIT_BUF_INIT; - size_t i; - int error; - - for (error = 0, i = 0; !error && i < files_len; ++i) { - const char *path; - - if (git_buf_joinpath(&buf, repo->path_repository, files[i]) < 0) - return -1; - - path = git_buf_cstr(&buf); - - if (git_path_isfile(path)) { - error = p_unlink(path); - } else if (git_path_isdir(path)) { - error = git_futils_rmdir_r(path, NULL, - GIT_RMDIR_REMOVE_FILES | GIT_RMDIR_REMOVE_BLOCKERS); - } - - git_buf_clear(&buf); - } - - git_buf_free(&buf); - return error; -} - -static const char *state_files[] = { - GIT_MERGE_HEAD_FILE, - GIT_MERGE_MODE_FILE, - GIT_MERGE_MSG_FILE, - GIT_REVERT_HEAD_FILE, - GIT_CHERRYPICK_HEAD_FILE, - GIT_BISECT_LOG_FILE, - GIT_REBASE_MERGE_DIR, - GIT_REBASE_APPLY_DIR, - GIT_SEQUENCER_DIR, -}; - -int git_repository_state_cleanup(git_repository *repo) -{ - assert(repo); - - return git_repository__cleanup_files(repo, state_files, ARRAY_SIZE(state_files)); -} - -int git_repository_is_shallow(git_repository *repo) -{ - git_buf path = GIT_BUF_INIT; - struct stat st; - int error; - - if ((error = git_buf_joinpath(&path, repo->path_repository, "shallow")) < 0) - return error; - - error = git_path_lstat(path.ptr, &st); - git_buf_free(&path); - - if (error == GIT_ENOTFOUND) { - giterr_clear(); - return 0; - } - - if (error < 0) - return error; - return st.st_size == 0 ? 0 : 1; -} - -int git_repository_init_init_options( - git_repository_init_options *opts, unsigned int version) -{ - GIT_INIT_STRUCTURE_FROM_TEMPLATE( - opts, version, git_repository_init_options, - GIT_REPOSITORY_INIT_OPTIONS_INIT); - return 0; -} - -int git_repository_ident(const char **name, const char **email, const git_repository *repo) -{ - *name = repo->ident_name; - *email = repo->ident_email; - - return 0; -} - -int git_repository_set_ident(git_repository *repo, const char *name, const char *email) -{ - char *tmp_name = NULL, *tmp_email = NULL; - - if (name) { - tmp_name = git__strdup(name); - GITERR_CHECK_ALLOC(tmp_name); - } - - if (email) { - tmp_email = git__strdup(email); - GITERR_CHECK_ALLOC(tmp_email); - } - - tmp_name = git__swap(repo->ident_name, tmp_name); - tmp_email = git__swap(repo->ident_email, tmp_email); - - git__free(tmp_name); - git__free(tmp_email); - - return 0; -} diff --git a/vendor/libgit2/src/repository.h b/vendor/libgit2/src/repository.h deleted file mode 100644 index fd679b483..000000000 --- a/vendor/libgit2/src/repository.h +++ /dev/null @@ -1,215 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_repository_h__ -#define INCLUDE_repository_h__ - -#include "git2/common.h" -#include "git2/oid.h" -#include "git2/odb.h" -#include "git2/repository.h" -#include "git2/object.h" -#include "git2/config.h" - -#include "array.h" -#include "cache.h" -#include "refs.h" -#include "buffer.h" -#include "object.h" -#include "attrcache.h" -#include "submodule.h" -#include "diff_driver.h" - -#define DOT_GIT ".git" -#define GIT_DIR DOT_GIT "/" -#define GIT_DIR_MODE 0755 -#define GIT_BARE_DIR_MODE 0777 - -/* Default DOS-compatible 8.3 "short name" for a git repository, "GIT~1" */ -#define GIT_DIR_SHORTNAME "GIT~1" - -/** Cvar cache identifiers */ -typedef enum { - GIT_CVAR_AUTO_CRLF = 0, /* core.autocrlf */ - GIT_CVAR_EOL, /* core.eol */ - GIT_CVAR_SYMLINKS, /* core.symlinks */ - GIT_CVAR_IGNORECASE, /* core.ignorecase */ - GIT_CVAR_FILEMODE, /* core.filemode */ - GIT_CVAR_IGNORESTAT, /* core.ignorestat */ - GIT_CVAR_TRUSTCTIME, /* core.trustctime */ - GIT_CVAR_ABBREV, /* core.abbrev */ - GIT_CVAR_PRECOMPOSE, /* core.precomposeunicode */ - GIT_CVAR_SAFE_CRLF, /* core.safecrlf */ - GIT_CVAR_LOGALLREFUPDATES, /* core.logallrefupdates */ - GIT_CVAR_PROTECTHFS, /* core.protectHFS */ - GIT_CVAR_PROTECTNTFS, /* core.protectNTFS */ - GIT_CVAR_CACHE_MAX -} git_cvar_cached; - -/** - * CVAR value enumerations - * - * These are the values that are actually stored in the cvar cache, instead - * of their string equivalents. These values are internal and symbolic; - * make sure that none of them is set to `-1`, since that is the unique - * identifier for "not cached" - */ -typedef enum { - /* The value hasn't been loaded from the cache yet */ - GIT_CVAR_NOT_CACHED = -1, - - /* core.safecrlf: false, 'fail', 'warn' */ - GIT_SAFE_CRLF_FALSE = 0, - GIT_SAFE_CRLF_FAIL = 1, - GIT_SAFE_CRLF_WARN = 2, - - /* core.autocrlf: false, true, 'input; */ - GIT_AUTO_CRLF_FALSE = 0, - GIT_AUTO_CRLF_TRUE = 1, - GIT_AUTO_CRLF_INPUT = 2, - GIT_AUTO_CRLF_DEFAULT = GIT_AUTO_CRLF_FALSE, - - /* core.eol: unset, 'crlf', 'lf', 'native' */ - GIT_EOL_UNSET = 0, - GIT_EOL_CRLF = 1, - GIT_EOL_LF = 2, -#ifdef GIT_WIN32 - GIT_EOL_NATIVE = GIT_EOL_CRLF, -#else - GIT_EOL_NATIVE = GIT_EOL_LF, -#endif - GIT_EOL_DEFAULT = GIT_EOL_NATIVE, - - /* core.symlinks: bool */ - GIT_SYMLINKS_DEFAULT = GIT_CVAR_TRUE, - /* core.ignorecase */ - GIT_IGNORECASE_DEFAULT = GIT_CVAR_FALSE, - /* core.filemode */ - GIT_FILEMODE_DEFAULT = GIT_CVAR_TRUE, - /* core.ignorestat */ - GIT_IGNORESTAT_DEFAULT = GIT_CVAR_FALSE, - /* core.trustctime */ - GIT_TRUSTCTIME_DEFAULT = GIT_CVAR_TRUE, - /* core.abbrev */ - GIT_ABBREV_DEFAULT = 7, - /* core.precomposeunicode */ - GIT_PRECOMPOSE_DEFAULT = GIT_CVAR_FALSE, - /* core.safecrlf */ - GIT_SAFE_CRLF_DEFAULT = GIT_CVAR_FALSE, - /* core.logallrefupdates */ - GIT_LOGALLREFUPDATES_UNSET = 2, - GIT_LOGALLREFUPDATES_DEFAULT = GIT_LOGALLREFUPDATES_UNSET, - /* core.protectHFS */ - GIT_PROTECTHFS_DEFAULT = GIT_CVAR_FALSE, - /* core.protectNTFS */ - GIT_PROTECTNTFS_DEFAULT = GIT_CVAR_FALSE, -} git_cvar_value; - -/* internal repository init flags */ -enum { - GIT_REPOSITORY_INIT__HAS_DOTGIT = (1u << 16), - GIT_REPOSITORY_INIT__NATURAL_WD = (1u << 17), - GIT_REPOSITORY_INIT__IS_REINIT = (1u << 18), -}; - -/** Internal structure for repository object */ -struct git_repository { - git_odb *_odb; - git_refdb *_refdb; - git_config *_config; - git_index *_index; - - git_cache objects; - git_attr_cache *attrcache; - git_diff_driver_registry *diff_drivers; - - char *path_repository; - char *path_gitlink; - char *workdir; - char *namespace; - - char *ident_name; - char *ident_email; - - git_array_t(git_buf) reserved_names; - - unsigned is_bare:1; - - unsigned int lru_counter; - - git_atomic attr_session_key; - - git_cvar_value cvar_cache[GIT_CVAR_CACHE_MAX]; -}; - -GIT_INLINE(git_attr_cache *) git_repository_attr_cache(git_repository *repo) -{ - return repo->attrcache; -} - -int git_repository_head_tree(git_tree **tree, git_repository *repo); - -/* - * Weak pointers to repository internals. - * - * The returned pointers do not need to be freed. Do not keep - * permanent references to these (i.e. between API calls), since they may - * become invalidated if the user replaces a repository internal. - */ -int git_repository_config__weakptr(git_config **out, git_repository *repo); -int git_repository_odb__weakptr(git_odb **out, git_repository *repo); -int git_repository_refdb__weakptr(git_refdb **out, git_repository *repo); -int git_repository_index__weakptr(git_index **out, git_repository *repo); - -/* - * CVAR cache - * - * Efficient access to the most used config variables of a repository. - * The cache is cleared every time the config backend is replaced. - */ -int git_repository__cvar(int *out, git_repository *repo, git_cvar_cached cvar); -void git_repository__cvar_cache_clear(git_repository *repo); - -GIT_INLINE(int) git_repository__ensure_not_bare( - git_repository *repo, - const char *operation_name) -{ - if (!git_repository_is_bare(repo)) - return 0; - - giterr_set( - GITERR_REPOSITORY, - "Cannot %s. This operation is not allowed against bare repositories.", - operation_name); - - return GIT_EBAREREPO; -} - -int git_repository__set_orig_head(git_repository *repo, const git_oid *orig_head); - -int git_repository__cleanup_files(git_repository *repo, const char *files[], size_t files_len); - -/* The default "reserved names" for a repository */ -extern git_buf git_repository__reserved_names_win32[]; -extern size_t git_repository__reserved_names_win32_len; - -extern git_buf git_repository__reserved_names_posix[]; -extern size_t git_repository__reserved_names_posix_len; - -/* - * Gets any "reserved names" in the repository. This will return paths - * that should not be allowed in the repository (like ".git") to avoid - * conflicting with the repository path, or with alternate mechanisms to - * the repository path (eg, "GIT~1"). Every attempt will be made to look - * up all possible reserved names - if there was a conflict for the shortname - * GIT~1, for example, this function will try to look up the alternate - * shortname. If that fails, this function returns false, but out and outlen - * will still be populated with good defaults. - */ -bool git_repository__reserved_names( - git_buf **out, size_t *outlen, git_repository *repo, bool include_ntfs); - -#endif diff --git a/vendor/libgit2/src/reset.c b/vendor/libgit2/src/reset.c deleted file mode 100644 index f8a1a1dc8..000000000 --- a/vendor/libgit2/src/reset.c +++ /dev/null @@ -1,199 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "common.h" -#include "commit.h" -#include "tag.h" -#include "merge.h" -#include "diff.h" -#include "annotated_commit.h" -#include "git2/reset.h" -#include "git2/checkout.h" -#include "git2/merge.h" -#include "git2/refs.h" - -#define ERROR_MSG "Cannot perform reset" - -int git_reset_default( - git_repository *repo, - git_object *target, - git_strarray* pathspecs) -{ - git_object *commit = NULL; - git_tree *tree = NULL; - git_diff *diff = NULL; - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - size_t i, max_i; - git_index_entry entry; - int error; - git_index *index = NULL; - - assert(pathspecs != NULL && pathspecs->count > 0); - - memset(&entry, 0, sizeof(git_index_entry)); - - if ((error = git_repository_index(&index, repo)) < 0) - goto cleanup; - - if (target) { - if (git_object_owner(target) != repo) { - giterr_set(GITERR_OBJECT, - "%s_default - The given target does not belong to this repository.", ERROR_MSG); - return -1; - } - - if ((error = git_object_peel(&commit, target, GIT_OBJ_COMMIT)) < 0 || - (error = git_commit_tree(&tree, (git_commit *)commit)) < 0) - goto cleanup; - } - - opts.pathspec = *pathspecs; - opts.flags = GIT_DIFF_REVERSE; - - if ((error = git_diff_tree_to_index( - &diff, repo, tree, index, &opts)) < 0) - goto cleanup; - - for (i = 0, max_i = git_diff_num_deltas(diff); i < max_i; ++i) { - const git_diff_delta *delta = git_diff_get_delta(diff, i); - - assert(delta->status == GIT_DELTA_ADDED || - delta->status == GIT_DELTA_MODIFIED || - delta->status == GIT_DELTA_CONFLICTED || - delta->status == GIT_DELTA_DELETED); - - error = git_index_conflict_remove(index, delta->old_file.path); - if (error < 0) { - if (delta->status == GIT_DELTA_ADDED && error == GIT_ENOTFOUND) - giterr_clear(); - else - goto cleanup; - } - - if (delta->status == GIT_DELTA_DELETED) { - if ((error = git_index_remove(index, delta->old_file.path, 0)) < 0) - goto cleanup; - } else { - entry.mode = delta->new_file.mode; - git_oid_cpy(&entry.id, &delta->new_file.id); - entry.path = (char *)delta->new_file.path; - - if ((error = git_index_add(index, &entry)) < 0) - goto cleanup; - } - } - - error = git_index_write(index); - -cleanup: - git_object_free(commit); - git_tree_free(tree); - git_index_free(index); - git_diff_free(diff); - - return error; -} - -static int reset( - git_repository *repo, - git_object *target, - const char *to, - git_reset_t reset_type, - const git_checkout_options *checkout_opts) -{ - git_object *commit = NULL; - git_index *index = NULL; - git_tree *tree = NULL; - int error = 0; - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - git_buf log_message = GIT_BUF_INIT; - - assert(repo && target); - - if (checkout_opts) - opts = *checkout_opts; - - if (git_object_owner(target) != repo) { - giterr_set(GITERR_OBJECT, - "%s - The given target does not belong to this repository.", ERROR_MSG); - return -1; - } - - if (reset_type != GIT_RESET_SOFT && - (error = git_repository__ensure_not_bare(repo, - reset_type == GIT_RESET_MIXED ? "reset mixed" : "reset hard")) < 0) - return error; - - if ((error = git_object_peel(&commit, target, GIT_OBJ_COMMIT)) < 0 || - (error = git_repository_index(&index, repo)) < 0 || - (error = git_commit_tree(&tree, (git_commit *)commit)) < 0) - goto cleanup; - - if (reset_type == GIT_RESET_SOFT && - (git_repository_state(repo) == GIT_REPOSITORY_STATE_MERGE || - git_index_has_conflicts(index))) - { - giterr_set(GITERR_OBJECT, "%s (soft) in the middle of a merge.", ERROR_MSG); - error = GIT_EUNMERGED; - goto cleanup; - } - - if ((error = git_buf_printf(&log_message, "reset: moving to %s", to)) < 0) - return error; - - if (reset_type == GIT_RESET_HARD) { - /* overwrite working directory with the new tree */ - opts.checkout_strategy = GIT_CHECKOUT_FORCE; - - if ((error = git_checkout_tree(repo, (git_object *)tree, &opts)) < 0) - goto cleanup; - } - - /* move HEAD to the new target */ - if ((error = git_reference__update_terminal(repo, GIT_HEAD_FILE, - git_object_id(commit), NULL, git_buf_cstr(&log_message))) < 0) - goto cleanup; - - if (reset_type > GIT_RESET_SOFT) { - /* reset index to the target content */ - - if ((error = git_index_read_tree(index, tree)) < 0 || - (error = git_index_write(index)) < 0) - goto cleanup; - - if ((error = git_repository_state_cleanup(repo)) < 0) { - giterr_set(GITERR_INDEX, "%s - failed to clean up merge data", ERROR_MSG); - goto cleanup; - } - } - -cleanup: - git_object_free(commit); - git_index_free(index); - git_tree_free(tree); - git_buf_free(&log_message); - - return error; -} - -int git_reset( - git_repository *repo, - git_object *target, - git_reset_t reset_type, - const git_checkout_options *checkout_opts) -{ - return reset(repo, target, git_oid_tostr_s(git_object_id(target)), reset_type, checkout_opts); -} - -int git_reset_from_annotated( - git_repository *repo, - git_annotated_commit *commit, - git_reset_t reset_type, - const git_checkout_options *checkout_opts) -{ - return reset(repo, (git_object *) commit->commit, commit->ref_name, reset_type, checkout_opts); -} diff --git a/vendor/libgit2/src/revert.c b/vendor/libgit2/src/revert.c deleted file mode 100644 index c481e7dea..000000000 --- a/vendor/libgit2/src/revert.c +++ /dev/null @@ -1,231 +0,0 @@ -/* -* Copyright (C) the libgit2 contributors. All rights reserved. -* -* This file is part of libgit2, distributed under the GNU GPL v2 with -* a Linking Exception. For full terms see the included COPYING file. -*/ - -#include "common.h" -#include "repository.h" -#include "filebuf.h" -#include "merge.h" -#include "index.h" - -#include "git2/types.h" -#include "git2/merge.h" -#include "git2/revert.h" -#include "git2/commit.h" -#include "git2/sys/commit.h" - -#define GIT_REVERT_FILE_MODE 0666 - -static int write_revert_head( - git_repository *repo, - const char *commit_oidstr) -{ - git_filebuf file = GIT_FILEBUF_INIT; - git_buf file_path = GIT_BUF_INIT; - int error = 0; - - if ((error = git_buf_joinpath(&file_path, repo->path_repository, GIT_REVERT_HEAD_FILE)) >= 0 && - (error = git_filebuf_open(&file, file_path.ptr, GIT_FILEBUF_FORCE, GIT_REVERT_FILE_MODE)) >= 0 && - (error = git_filebuf_printf(&file, "%s\n", commit_oidstr)) >= 0) - error = git_filebuf_commit(&file); - - if (error < 0) - git_filebuf_cleanup(&file); - - git_buf_free(&file_path); - - return error; -} - -static int write_merge_msg( - git_repository *repo, - const char *commit_oidstr, - const char *commit_msgline) -{ - git_filebuf file = GIT_FILEBUF_INIT; - git_buf file_path = GIT_BUF_INIT; - int error = 0; - - if ((error = git_buf_joinpath(&file_path, repo->path_repository, GIT_MERGE_MSG_FILE)) < 0 || - (error = git_filebuf_open(&file, file_path.ptr, GIT_FILEBUF_FORCE, GIT_REVERT_FILE_MODE)) < 0 || - (error = git_filebuf_printf(&file, "Revert \"%s\"\n\nThis reverts commit %s.\n", - commit_msgline, commit_oidstr)) < 0) - goto cleanup; - - error = git_filebuf_commit(&file); - -cleanup: - if (error < 0) - git_filebuf_cleanup(&file); - - git_buf_free(&file_path); - - return error; -} - -static int revert_normalize_opts( - git_repository *repo, - git_revert_options *opts, - const git_revert_options *given, - const char *their_label) -{ - int error = 0; - unsigned int default_checkout_strategy = GIT_CHECKOUT_SAFE | - GIT_CHECKOUT_ALLOW_CONFLICTS; - - GIT_UNUSED(repo); - - if (given != NULL) - memcpy(opts, given, sizeof(git_revert_options)); - else { - git_revert_options default_opts = GIT_REVERT_OPTIONS_INIT; - memcpy(opts, &default_opts, sizeof(git_revert_options)); - } - - if (!opts->checkout_opts.checkout_strategy) - opts->checkout_opts.checkout_strategy = default_checkout_strategy; - - if (!opts->checkout_opts.our_label) - opts->checkout_opts.our_label = "HEAD"; - - if (!opts->checkout_opts.their_label) - opts->checkout_opts.their_label = their_label; - - return error; -} - -static int revert_state_cleanup(git_repository *repo) -{ - const char *state_files[] = { GIT_REVERT_HEAD_FILE, GIT_MERGE_MSG_FILE }; - - return git_repository__cleanup_files(repo, state_files, ARRAY_SIZE(state_files)); -} - -static int revert_seterr(git_commit *commit, const char *fmt) -{ - char commit_oidstr[GIT_OID_HEXSZ + 1]; - - git_oid_fmt(commit_oidstr, git_commit_id(commit)); - commit_oidstr[GIT_OID_HEXSZ] = '\0'; - - giterr_set(GITERR_REVERT, fmt, commit_oidstr); - - return -1; -} - -int git_revert_commit( - git_index **out, - git_repository *repo, - git_commit *revert_commit, - git_commit *our_commit, - unsigned int mainline, - const git_merge_options *merge_opts) -{ - git_commit *parent_commit = NULL; - git_tree *parent_tree = NULL, *our_tree = NULL, *revert_tree = NULL; - int parent = 0, error = 0; - - assert(out && repo && revert_commit && our_commit); - - if (git_commit_parentcount(revert_commit) > 1) { - if (!mainline) - return revert_seterr(revert_commit, - "Mainline branch is not specified but %s is a merge commit"); - - parent = mainline; - } else { - if (mainline) - return revert_seterr(revert_commit, - "Mainline branch specified but %s is not a merge commit"); - - parent = git_commit_parentcount(revert_commit); - } - - if (parent && - ((error = git_commit_parent(&parent_commit, revert_commit, (parent - 1))) < 0 || - (error = git_commit_tree(&parent_tree, parent_commit)) < 0)) - goto done; - - if ((error = git_commit_tree(&revert_tree, revert_commit)) < 0 || - (error = git_commit_tree(&our_tree, our_commit)) < 0) - goto done; - - error = git_merge_trees(out, repo, revert_tree, our_tree, parent_tree, merge_opts); - -done: - git_tree_free(parent_tree); - git_tree_free(our_tree); - git_tree_free(revert_tree); - git_commit_free(parent_commit); - - return error; -} - -int git_revert( - git_repository *repo, - git_commit *commit, - const git_revert_options *given_opts) -{ - git_revert_options opts; - git_reference *our_ref = NULL; - git_commit *our_commit = NULL; - char commit_oidstr[GIT_OID_HEXSZ + 1]; - const char *commit_msg; - git_buf their_label = GIT_BUF_INIT; - git_index *index = NULL; - git_indexwriter indexwriter = GIT_INDEXWRITER_INIT; - int error; - - assert(repo && commit); - - GITERR_CHECK_VERSION(given_opts, GIT_REVERT_OPTIONS_VERSION, "git_revert_options"); - - if ((error = git_repository__ensure_not_bare(repo, "revert")) < 0) - return error; - - git_oid_fmt(commit_oidstr, git_commit_id(commit)); - commit_oidstr[GIT_OID_HEXSZ] = '\0'; - - if ((commit_msg = git_commit_summary(commit)) == NULL) { - error = -1; - goto on_error; - } - - if ((error = git_buf_printf(&their_label, "parent of %.7s... %s", commit_oidstr, commit_msg)) < 0 || - (error = revert_normalize_opts(repo, &opts, given_opts, git_buf_cstr(&their_label))) < 0 || - (error = git_indexwriter_init_for_operation(&indexwriter, repo, &opts.checkout_opts.checkout_strategy)) < 0 || - (error = write_revert_head(repo, commit_oidstr)) < 0 || - (error = write_merge_msg(repo, commit_oidstr, commit_msg)) < 0 || - (error = git_repository_head(&our_ref, repo)) < 0 || - (error = git_reference_peel((git_object **)&our_commit, our_ref, GIT_OBJ_COMMIT)) < 0 || - (error = git_revert_commit(&index, repo, commit, our_commit, opts.mainline, &opts.merge_opts)) < 0 || - (error = git_merge__check_result(repo, index)) < 0 || - (error = git_merge__append_conflicts_to_merge_msg(repo, index)) < 0 || - (error = git_checkout_index(repo, index, &opts.checkout_opts)) < 0 || - (error = git_indexwriter_commit(&indexwriter)) < 0) - goto on_error; - - goto done; - -on_error: - revert_state_cleanup(repo); - -done: - git_indexwriter_cleanup(&indexwriter); - git_index_free(index); - git_commit_free(our_commit); - git_reference_free(our_ref); - git_buf_free(&their_label); - - return error; -} - -int git_revert_init_options(git_revert_options *opts, unsigned int version) -{ - GIT_INIT_STRUCTURE_FROM_TEMPLATE( - opts, version, git_revert_options, GIT_REVERT_OPTIONS_INIT); - return 0; -} diff --git a/vendor/libgit2/src/revparse.c b/vendor/libgit2/src/revparse.c deleted file mode 100644 index e0ec3941d..000000000 --- a/vendor/libgit2/src/revparse.c +++ /dev/null @@ -1,913 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include - -#include "common.h" -#include "buffer.h" -#include "tree.h" -#include "refdb.h" - -#include "git2.h" - -static int maybe_sha_or_abbrev(git_object** out, git_repository *repo, const char *spec, size_t speclen) -{ - git_oid oid; - - if (git_oid_fromstrn(&oid, spec, speclen) < 0) - return GIT_ENOTFOUND; - - return git_object_lookup_prefix(out, repo, &oid, speclen, GIT_OBJ_ANY); -} - -static int maybe_sha(git_object** out, git_repository *repo, const char *spec) -{ - size_t speclen = strlen(spec); - - if (speclen != GIT_OID_HEXSZ) - return GIT_ENOTFOUND; - - return maybe_sha_or_abbrev(out, repo, spec, speclen); -} - -static int maybe_abbrev(git_object** out, git_repository *repo, const char *spec) -{ - size_t speclen = strlen(spec); - - return maybe_sha_or_abbrev(out, repo, spec, speclen); -} - -static int build_regex(regex_t *regex, const char *pattern) -{ - int error; - - if (*pattern == '\0') { - giterr_set(GITERR_REGEX, "Empty pattern"); - return GIT_EINVALIDSPEC; - } - - error = regcomp(regex, pattern, REG_EXTENDED); - if (!error) - return 0; - - error = giterr_set_regex(regex, error); - - regfree(regex); - - return error; -} - -static int maybe_describe(git_object**out, git_repository *repo, const char *spec) -{ - const char *substr; - int error; - regex_t regex; - - substr = strstr(spec, "-g"); - - if (substr == NULL) - return GIT_ENOTFOUND; - - if (build_regex(®ex, ".+-[0-9]+-g[0-9a-fA-F]+") < 0) - return -1; - - error = regexec(®ex, spec, 0, NULL, 0); - regfree(®ex); - - if (error) - return GIT_ENOTFOUND; - - return maybe_abbrev(out, repo, substr+2); -} - -static int revparse_lookup_object( - git_object **object_out, - git_reference **reference_out, - git_repository *repo, - const char *spec) -{ - int error; - git_reference *ref; - - if ((error = maybe_sha(object_out, repo, spec)) != GIT_ENOTFOUND) - return error; - - error = git_reference_dwim(&ref, repo, spec); - if (!error) { - - error = git_object_lookup( - object_out, repo, git_reference_target(ref), GIT_OBJ_ANY); - - if (!error) - *reference_out = ref; - - return error; - } - - if (error != GIT_ENOTFOUND) - return error; - - if ((strlen(spec) < GIT_OID_HEXSZ) && - ((error = maybe_abbrev(object_out, repo, spec)) != GIT_ENOTFOUND)) - return error; - - if ((error = maybe_describe(object_out, repo, spec)) != GIT_ENOTFOUND) - return error; - - giterr_set(GITERR_REFERENCE, "Revspec '%s' not found.", spec); - return GIT_ENOTFOUND; -} - -static int try_parse_numeric(int *n, const char *curly_braces_content) -{ - int32_t content; - const char *end_ptr; - - if (git__strtol32(&content, curly_braces_content, &end_ptr, 10) < 0) - return -1; - - if (*end_ptr != '\0') - return -1; - - *n = (int)content; - return 0; -} - -static int retrieve_previously_checked_out_branch_or_revision(git_object **out, git_reference **base_ref, git_repository *repo, const char *identifier, size_t position) -{ - git_reference *ref = NULL; - git_reflog *reflog = NULL; - regex_t preg; - int error = -1; - size_t i, numentries, cur; - const git_reflog_entry *entry; - const char *msg; - regmatch_t regexmatches[2]; - git_buf buf = GIT_BUF_INIT; - - cur = position; - - if (*identifier != '\0' || *base_ref != NULL) - return GIT_EINVALIDSPEC; - - if (build_regex(&preg, "checkout: moving from (.*) to .*") < 0) - return -1; - - if (git_reference_lookup(&ref, repo, GIT_HEAD_FILE) < 0) - goto cleanup; - - if (git_reflog_read(&reflog, repo, GIT_HEAD_FILE) < 0) - goto cleanup; - - numentries = git_reflog_entrycount(reflog); - - for (i = 0; i < numentries; i++) { - entry = git_reflog_entry_byindex(reflog, i); - msg = git_reflog_entry_message(entry); - if (!msg) - continue; - - if (regexec(&preg, msg, 2, regexmatches, 0)) - continue; - - cur--; - - if (cur > 0) - continue; - - git_buf_put(&buf, msg+regexmatches[1].rm_so, regexmatches[1].rm_eo - regexmatches[1].rm_so); - - if ((error = git_reference_dwim(base_ref, repo, git_buf_cstr(&buf))) == 0) - goto cleanup; - - if (error < 0 && error != GIT_ENOTFOUND) - goto cleanup; - - error = maybe_abbrev(out, repo, git_buf_cstr(&buf)); - - goto cleanup; - } - - error = GIT_ENOTFOUND; - -cleanup: - git_reference_free(ref); - git_buf_free(&buf); - regfree(&preg); - git_reflog_free(reflog); - return error; -} - -static int retrieve_oid_from_reflog(git_oid *oid, git_reference *ref, size_t identifier) -{ - git_reflog *reflog; - size_t numentries; - const git_reflog_entry *entry; - bool search_by_pos = (identifier <= 100000000); - - if (git_reflog_read(&reflog, git_reference_owner(ref), git_reference_name(ref)) < 0) - return -1; - - numentries = git_reflog_entrycount(reflog); - - if (search_by_pos) { - if (numentries < identifier + 1) - goto notfound; - - entry = git_reflog_entry_byindex(reflog, identifier); - git_oid_cpy(oid, git_reflog_entry_id_new(entry)); - } else { - size_t i; - git_time commit_time; - - for (i = 0; i < numentries; i++) { - entry = git_reflog_entry_byindex(reflog, i); - commit_time = git_reflog_entry_committer(entry)->when; - - if (commit_time.time > (git_time_t)identifier) - continue; - - git_oid_cpy(oid, git_reflog_entry_id_new(entry)); - break; - } - - if (i == numentries) - goto notfound; - } - - git_reflog_free(reflog); - return 0; - -notfound: - giterr_set( - GITERR_REFERENCE, - "Reflog for '%s' has only %"PRIuZ" entries, asked for %"PRIuZ, - git_reference_name(ref), numentries, identifier); - - git_reflog_free(reflog); - return GIT_ENOTFOUND; -} - -static int retrieve_revobject_from_reflog(git_object **out, git_reference **base_ref, git_repository *repo, const char *identifier, size_t position) -{ - git_reference *ref; - git_oid oid; - int error = -1; - - if (*base_ref == NULL) { - if ((error = git_reference_dwim(&ref, repo, identifier)) < 0) - return error; - } else { - ref = *base_ref; - *base_ref = NULL; - } - - if (position == 0) { - error = git_object_lookup(out, repo, git_reference_target(ref), GIT_OBJ_ANY); - goto cleanup; - } - - if ((error = retrieve_oid_from_reflog(&oid, ref, position)) < 0) - goto cleanup; - - error = git_object_lookup(out, repo, &oid, GIT_OBJ_ANY); - -cleanup: - git_reference_free(ref); - return error; -} - -static int retrieve_remote_tracking_reference(git_reference **base_ref, const char *identifier, git_repository *repo) -{ - git_reference *tracking, *ref; - int error = -1; - - if (*base_ref == NULL) { - if ((error = git_reference_dwim(&ref, repo, identifier)) < 0) - return error; - } else { - ref = *base_ref; - *base_ref = NULL; - } - - if (!git_reference_is_branch(ref)) { - error = GIT_EINVALIDSPEC; - goto cleanup; - } - - if ((error = git_branch_upstream(&tracking, ref)) < 0) - goto cleanup; - - *base_ref = tracking; - -cleanup: - git_reference_free(ref); - return error; -} - -static int handle_at_syntax(git_object **out, git_reference **ref, const char *spec, size_t identifier_len, git_repository* repo, const char *curly_braces_content) -{ - bool is_numeric; - int parsed = 0, error = -1; - git_buf identifier = GIT_BUF_INIT; - git_time_t timestamp; - - assert(*out == NULL); - - if (git_buf_put(&identifier, spec, identifier_len) < 0) - return -1; - - is_numeric = !try_parse_numeric(&parsed, curly_braces_content); - - if (*curly_braces_content == '-' && (!is_numeric || parsed == 0)) { - error = GIT_EINVALIDSPEC; - goto cleanup; - } - - if (is_numeric) { - if (parsed < 0) - error = retrieve_previously_checked_out_branch_or_revision(out, ref, repo, git_buf_cstr(&identifier), -parsed); - else - error = retrieve_revobject_from_reflog(out, ref, repo, git_buf_cstr(&identifier), parsed); - - goto cleanup; - } - - if (!strcmp(curly_braces_content, "u") || !strcmp(curly_braces_content, "upstream")) { - error = retrieve_remote_tracking_reference(ref, git_buf_cstr(&identifier), repo); - - goto cleanup; - } - - if (git__date_parse(×tamp, curly_braces_content) < 0) - goto cleanup; - - error = retrieve_revobject_from_reflog(out, ref, repo, git_buf_cstr(&identifier), (size_t)timestamp); - -cleanup: - git_buf_free(&identifier); - return error; -} - -static git_otype parse_obj_type(const char *str) -{ - if (!strcmp(str, "commit")) - return GIT_OBJ_COMMIT; - - if (!strcmp(str, "tree")) - return GIT_OBJ_TREE; - - if (!strcmp(str, "blob")) - return GIT_OBJ_BLOB; - - if (!strcmp(str, "tag")) - return GIT_OBJ_TAG; - - return GIT_OBJ_BAD; -} - -static int dereference_to_non_tag(git_object **out, git_object *obj) -{ - if (git_object_type(obj) == GIT_OBJ_TAG) - return git_tag_peel(out, (git_tag *)obj); - - return git_object_dup(out, obj); -} - -static int handle_caret_parent_syntax(git_object **out, git_object *obj, int n) -{ - git_object *temp_commit = NULL; - int error; - - if ((error = git_object_peel(&temp_commit, obj, GIT_OBJ_COMMIT)) < 0) - return (error == GIT_EAMBIGUOUS || error == GIT_ENOTFOUND) ? - GIT_EINVALIDSPEC : error; - - if (n == 0) { - *out = temp_commit; - return 0; - } - - error = git_commit_parent((git_commit **)out, (git_commit*)temp_commit, n - 1); - - git_object_free(temp_commit); - return error; -} - -static int handle_linear_syntax(git_object **out, git_object *obj, int n) -{ - git_object *temp_commit = NULL; - int error; - - if ((error = git_object_peel(&temp_commit, obj, GIT_OBJ_COMMIT)) < 0) - return (error == GIT_EAMBIGUOUS || error == GIT_ENOTFOUND) ? - GIT_EINVALIDSPEC : error; - - error = git_commit_nth_gen_ancestor((git_commit **)out, (git_commit*)temp_commit, n); - - git_object_free(temp_commit); - return error; -} - -static int handle_colon_syntax( - git_object **out, - git_object *obj, - const char *path) -{ - git_object *tree; - int error = -1; - git_tree_entry *entry = NULL; - - if ((error = git_object_peel(&tree, obj, GIT_OBJ_TREE)) < 0) - return error == GIT_ENOTFOUND ? GIT_EINVALIDSPEC : error; - - if (*path == '\0') { - *out = tree; - return 0; - } - - /* - * TODO: Handle the relative path syntax - * (:./relative/path and :../relative/path) - */ - if ((error = git_tree_entry_bypath(&entry, (git_tree *)tree, path)) < 0) - goto cleanup; - - error = git_tree_entry_to_object(out, git_object_owner(tree), entry); - -cleanup: - git_tree_entry_free(entry); - git_object_free(tree); - - return error; -} - -static int walk_and_search(git_object **out, git_revwalk *walk, regex_t *regex) -{ - int error; - git_oid oid; - git_object *obj; - - while (!(error = git_revwalk_next(&oid, walk))) { - - error = git_object_lookup(&obj, git_revwalk_repository(walk), &oid, GIT_OBJ_COMMIT); - if ((error < 0) && (error != GIT_ENOTFOUND)) - return -1; - - if (!regexec(regex, git_commit_message((git_commit*)obj), 0, NULL, 0)) { - *out = obj; - return 0; - } - - git_object_free(obj); - } - - if (error < 0 && error == GIT_ITEROVER) - error = GIT_ENOTFOUND; - - return error; -} - -static int handle_grep_syntax(git_object **out, git_repository *repo, const git_oid *spec_oid, const char *pattern) -{ - regex_t preg; - git_revwalk *walk = NULL; - int error; - - if ((error = build_regex(&preg, pattern)) < 0) - return error; - - if ((error = git_revwalk_new(&walk, repo)) < 0) - goto cleanup; - - git_revwalk_sorting(walk, GIT_SORT_TIME); - - if (spec_oid == NULL) { - if ((error = git_revwalk_push_glob(walk, "refs/*")) < 0) - goto cleanup; - } else if ((error = git_revwalk_push(walk, spec_oid)) < 0) - goto cleanup; - - error = walk_and_search(out, walk, &preg); - -cleanup: - regfree(&preg); - git_revwalk_free(walk); - - return error; -} - -static int handle_caret_curly_syntax(git_object **out, git_object *obj, const char *curly_braces_content) -{ - git_otype expected_type; - - if (*curly_braces_content == '\0') - return dereference_to_non_tag(out, obj); - - if (*curly_braces_content == '/') - return handle_grep_syntax(out, git_object_owner(obj), git_object_id(obj), curly_braces_content + 1); - - expected_type = parse_obj_type(curly_braces_content); - - if (expected_type == GIT_OBJ_BAD) - return GIT_EINVALIDSPEC; - - return git_object_peel(out, obj, expected_type); -} - -static int extract_curly_braces_content(git_buf *buf, const char *spec, size_t *pos) -{ - git_buf_clear(buf); - - assert(spec[*pos] == '^' || spec[*pos] == '@'); - - (*pos)++; - - if (spec[*pos] == '\0' || spec[*pos] != '{') - return GIT_EINVALIDSPEC; - - (*pos)++; - - while (spec[*pos] != '}') { - if (spec[*pos] == '\0') - return GIT_EINVALIDSPEC; - - git_buf_putc(buf, spec[(*pos)++]); - } - - (*pos)++; - - return 0; -} - -static int extract_path(git_buf *buf, const char *spec, size_t *pos) -{ - git_buf_clear(buf); - - assert(spec[*pos] == ':'); - - (*pos)++; - - if (git_buf_puts(buf, spec + *pos) < 0) - return -1; - - *pos += git_buf_len(buf); - - return 0; -} - -static int extract_how_many(int *n, const char *spec, size_t *pos) -{ - const char *end_ptr; - int parsed, accumulated; - char kind = spec[*pos]; - - assert(spec[*pos] == '^' || spec[*pos] == '~'); - - accumulated = 0; - - do { - do { - (*pos)++; - accumulated++; - } while (spec[(*pos)] == kind && kind == '~'); - - if (git__isdigit(spec[*pos])) { - if (git__strtol32(&parsed, spec + *pos, &end_ptr, 10) < 0) - return GIT_EINVALIDSPEC; - - accumulated += (parsed - 1); - *pos = end_ptr - spec; - } - - } while (spec[(*pos)] == kind && kind == '~'); - - *n = accumulated; - - return 0; -} - -static int object_from_reference(git_object **object, git_reference *reference) -{ - git_reference *resolved = NULL; - int error; - - if (git_reference_resolve(&resolved, reference) < 0) - return -1; - - error = git_object_lookup(object, reference->db->repo, git_reference_target(resolved), GIT_OBJ_ANY); - git_reference_free(resolved); - - return error; -} - -static int ensure_base_rev_loaded(git_object **object, git_reference **reference, const char *spec, size_t identifier_len, git_repository *repo, bool allow_empty_identifier) -{ - int error; - git_buf identifier = GIT_BUF_INIT; - - if (*object != NULL) - return 0; - - if (*reference != NULL) - return object_from_reference(object, *reference); - - if (!allow_empty_identifier && identifier_len == 0) - return GIT_EINVALIDSPEC; - - if (git_buf_put(&identifier, spec, identifier_len) < 0) - return -1; - - error = revparse_lookup_object(object, reference, repo, git_buf_cstr(&identifier)); - git_buf_free(&identifier); - - return error; -} - -static int ensure_base_rev_is_not_known_yet(git_object *object) -{ - if (object == NULL) - return 0; - - return GIT_EINVALIDSPEC; -} - -static bool any_left_hand_identifier(git_object *object, git_reference *reference, size_t identifier_len) -{ - if (object != NULL) - return true; - - if (reference != NULL) - return true; - - if (identifier_len > 0) - return true; - - return false; -} - -static int ensure_left_hand_identifier_is_not_known_yet(git_object *object, git_reference *reference) -{ - if (!ensure_base_rev_is_not_known_yet(object) && reference == NULL) - return 0; - - return GIT_EINVALIDSPEC; -} - -int revparse__ext( - git_object **object_out, - git_reference **reference_out, - size_t *identifier_len_out, - git_repository *repo, - const char *spec) -{ - size_t pos = 0, identifier_len = 0; - int error = -1, n; - git_buf buf = GIT_BUF_INIT; - - git_reference *reference = NULL; - git_object *base_rev = NULL; - - bool should_return_reference = true; - - assert(object_out && reference_out && repo && spec); - - *object_out = NULL; - *reference_out = NULL; - - while (spec[pos]) { - switch (spec[pos]) { - case '^': - should_return_reference = false; - - if ((error = ensure_base_rev_loaded(&base_rev, &reference, spec, identifier_len, repo, false)) < 0) - goto cleanup; - - if (spec[pos+1] == '{') { - git_object *temp_object = NULL; - - if ((error = extract_curly_braces_content(&buf, spec, &pos)) < 0) - goto cleanup; - - if ((error = handle_caret_curly_syntax(&temp_object, base_rev, git_buf_cstr(&buf))) < 0) - goto cleanup; - - git_object_free(base_rev); - base_rev = temp_object; - } else { - git_object *temp_object = NULL; - - if ((error = extract_how_many(&n, spec, &pos)) < 0) - goto cleanup; - - if ((error = handle_caret_parent_syntax(&temp_object, base_rev, n)) < 0) - goto cleanup; - - git_object_free(base_rev); - base_rev = temp_object; - } - break; - - case '~': - { - git_object *temp_object = NULL; - - should_return_reference = false; - - if ((error = extract_how_many(&n, spec, &pos)) < 0) - goto cleanup; - - if ((error = ensure_base_rev_loaded(&base_rev, &reference, spec, identifier_len, repo, false)) < 0) - goto cleanup; - - if ((error = handle_linear_syntax(&temp_object, base_rev, n)) < 0) - goto cleanup; - - git_object_free(base_rev); - base_rev = temp_object; - break; - } - - case ':': - { - git_object *temp_object = NULL; - - should_return_reference = false; - - if ((error = extract_path(&buf, spec, &pos)) < 0) - goto cleanup; - - if (any_left_hand_identifier(base_rev, reference, identifier_len)) { - if ((error = ensure_base_rev_loaded(&base_rev, &reference, spec, identifier_len, repo, true)) < 0) - goto cleanup; - - if ((error = handle_colon_syntax(&temp_object, base_rev, git_buf_cstr(&buf))) < 0) - goto cleanup; - } else { - if (*git_buf_cstr(&buf) == '/') { - if ((error = handle_grep_syntax(&temp_object, repo, NULL, git_buf_cstr(&buf) + 1)) < 0) - goto cleanup; - } else { - - /* - * TODO: support merge-stage path lookup (":2:Makefile") - * and plain index blob lookup (:i-am/a/blob) - */ - giterr_set(GITERR_INVALID, "Unimplemented"); - error = GIT_ERROR; - goto cleanup; - } - } - - git_object_free(base_rev); - base_rev = temp_object; - break; - } - - case '@': - { - if (spec[pos+1] == '{') { - git_object *temp_object = NULL; - - if ((error = extract_curly_braces_content(&buf, spec, &pos)) < 0) - goto cleanup; - - if ((error = ensure_base_rev_is_not_known_yet(base_rev)) < 0) - goto cleanup; - - if ((error = handle_at_syntax(&temp_object, &reference, spec, identifier_len, repo, git_buf_cstr(&buf))) < 0) - goto cleanup; - - if (temp_object != NULL) - base_rev = temp_object; - break; - } else { - /* Fall through */ - } - } - - default: - if ((error = ensure_left_hand_identifier_is_not_known_yet(base_rev, reference)) < 0) - goto cleanup; - - pos++; - identifier_len++; - } - } - - if ((error = ensure_base_rev_loaded(&base_rev, &reference, spec, identifier_len, repo, false)) < 0) - goto cleanup; - - if (!should_return_reference) { - git_reference_free(reference); - reference = NULL; - } - - *object_out = base_rev; - *reference_out = reference; - *identifier_len_out = identifier_len; - error = 0; - -cleanup: - if (error) { - if (error == GIT_EINVALIDSPEC) - giterr_set(GITERR_INVALID, - "Failed to parse revision specifier - Invalid pattern '%s'", spec); - - git_object_free(base_rev); - git_reference_free(reference); - } - - git_buf_free(&buf); - return error; -} - -int git_revparse_ext( - git_object **object_out, - git_reference **reference_out, - git_repository *repo, - const char *spec) -{ - int error; - size_t identifier_len; - git_object *obj = NULL; - git_reference *ref = NULL; - - if ((error = revparse__ext(&obj, &ref, &identifier_len, repo, spec)) < 0) - goto cleanup; - - *object_out = obj; - *reference_out = ref; - GIT_UNUSED(identifier_len); - - return 0; - -cleanup: - git_object_free(obj); - git_reference_free(ref); - return error; -} - -int git_revparse_single(git_object **out, git_repository *repo, const char *spec) -{ - int error; - git_object *obj = NULL; - git_reference *ref = NULL; - - *out = NULL; - - if ((error = git_revparse_ext(&obj, &ref, repo, spec)) < 0) - goto cleanup; - - git_reference_free(ref); - - *out = obj; - - return 0; - -cleanup: - git_object_free(obj); - git_reference_free(ref); - return error; -} - -int git_revparse( - git_revspec *revspec, - git_repository *repo, - const char *spec) -{ - const char *dotdot; - int error = 0; - - assert(revspec && repo && spec); - - memset(revspec, 0x0, sizeof(*revspec)); - - if ((dotdot = strstr(spec, "..")) != NULL) { - char *lstr; - const char *rstr; - revspec->flags = GIT_REVPARSE_RANGE; - - lstr = git__substrdup(spec, dotdot - spec); - rstr = dotdot + 2; - if (dotdot[2] == '.') { - revspec->flags |= GIT_REVPARSE_MERGE_BASE; - rstr++; - } - - error = git_revparse_single(&revspec->from, repo, lstr); - if (!error) - error = git_revparse_single(&revspec->to, repo, rstr); - - git__free((void*)lstr); - } else { - revspec->flags = GIT_REVPARSE_SINGLE; - error = git_revparse_single(&revspec->from, repo, spec); - } - - return error; -} diff --git a/vendor/libgit2/src/revwalk.c b/vendor/libgit2/src/revwalk.c deleted file mode 100644 index 4815a1089..000000000 --- a/vendor/libgit2/src/revwalk.c +++ /dev/null @@ -1,669 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "common.h" -#include "commit.h" -#include "odb.h" -#include "pool.h" - -#include "revwalk.h" -#include "git2/revparse.h" -#include "merge.h" - -GIT__USE_OIDMAP - -git_commit_list_node *git_revwalk__commit_lookup( - git_revwalk *walk, const git_oid *oid) -{ - git_commit_list_node *commit; - khiter_t pos; - int ret; - - /* lookup and reserve space if not already present */ - pos = kh_get(oid, walk->commits, oid); - if (pos != kh_end(walk->commits)) - return kh_value(walk->commits, pos); - - commit = git_commit_list_alloc_node(walk); - if (commit == NULL) - return NULL; - - git_oid_cpy(&commit->oid, oid); - - pos = kh_put(oid, walk->commits, &commit->oid, &ret); - assert(ret != 0); - kh_value(walk->commits, pos) = commit; - - return commit; -} - -typedef git_array_t(git_commit_list_node*) commit_list_node_array; - -static bool interesting_arr(commit_list_node_array arr) -{ - git_commit_list_node **n; - size_t i = 0, size; - - size = git_array_size(arr); - for (i = 0; i < size; i++) { - n = git_array_get(arr, i); - if (!*n) - break; - - if (!(*n)->uninteresting) - return true; - } - - return false; -} - -static int mark_uninteresting(git_revwalk *walk, git_commit_list_node *commit) -{ - int error; - unsigned short i; - commit_list_node_array pending = GIT_ARRAY_INIT; - git_commit_list_node **tmp; - - assert(commit); - - do { - commit->uninteresting = 1; - - if ((error = git_commit_list_parse(walk, commit)) < 0) - return error; - - for (i = 0; i < commit->out_degree; ++i) - if (!commit->parents[i]->uninteresting) { - git_commit_list_node **node = git_array_alloc(pending); - GITERR_CHECK_ALLOC(node); - *node = commit->parents[i]; - } - - tmp = git_array_pop(pending); - commit = tmp ? *tmp : NULL; - - } while (commit != NULL && !interesting_arr(pending)); - - git_array_clear(pending); - - return 0; -} - -static int process_commit(git_revwalk *walk, git_commit_list_node *commit, int hide) -{ - int error; - - if (!hide && walk->hide_cb) - hide = walk->hide_cb(&commit->oid, walk->hide_cb_payload); - - if (hide && mark_uninteresting(walk, commit) < 0) - return -1; - - if (commit->seen) - return 0; - - commit->seen = 1; - - if ((error = git_commit_list_parse(walk, commit)) < 0) - return error; - - if (!hide) - return walk->enqueue(walk, commit); - - return 0; -} - -static int process_commit_parents(git_revwalk *walk, git_commit_list_node *commit) -{ - unsigned short i, max; - int error = 0; - - max = commit->out_degree; - if (walk->first_parent && commit->out_degree) - max = 1; - - for (i = 0; i < max && !error; ++i) - error = process_commit(walk, commit->parents[i], commit->uninteresting); - - return error; -} - -static int push_commit(git_revwalk *walk, const git_oid *oid, int uninteresting, int from_glob) -{ - git_oid commit_id; - int error; - git_object *obj, *oobj; - git_commit_list_node *commit; - git_commit_list *list; - - if ((error = git_object_lookup(&oobj, walk->repo, oid, GIT_OBJ_ANY)) < 0) - return error; - - error = git_object_peel(&obj, oobj, GIT_OBJ_COMMIT); - git_object_free(oobj); - - if (error == GIT_ENOTFOUND || error == GIT_EINVALIDSPEC || error == GIT_EPEEL) { - /* If this comes from e.g. push_glob("tags"), ignore this */ - if (from_glob) - return 0; - - giterr_set(GITERR_INVALID, "Object is not a committish"); - return -1; - } - if (error < 0) - return error; - - git_oid_cpy(&commit_id, git_object_id(obj)); - git_object_free(obj); - - commit = git_revwalk__commit_lookup(walk, &commit_id); - if (commit == NULL) - return -1; /* error already reported by failed lookup */ - - /* A previous hide already told us we don't want this commit */ - if (commit->uninteresting) - return 0; - - if (uninteresting) - walk->did_hide = 1; - else - walk->did_push = 1; - - commit->uninteresting = uninteresting; - list = walk->user_input; - if (git_commit_list_insert(commit, &list) == NULL) { - giterr_set_oom(); - return -1; - } - - walk->user_input = list; - - return 0; -} - -int git_revwalk_push(git_revwalk *walk, const git_oid *oid) -{ - assert(walk && oid); - return push_commit(walk, oid, 0, false); -} - - -int git_revwalk_hide(git_revwalk *walk, const git_oid *oid) -{ - assert(walk && oid); - return push_commit(walk, oid, 1, false); -} - -static int push_ref(git_revwalk *walk, const char *refname, int hide, int from_glob) -{ - git_oid oid; - - if (git_reference_name_to_id(&oid, walk->repo, refname) < 0) - return -1; - - return push_commit(walk, &oid, hide, from_glob); -} - -static int push_glob(git_revwalk *walk, const char *glob, int hide) -{ - int error = 0; - git_buf buf = GIT_BUF_INIT; - git_reference *ref; - git_reference_iterator *iter; - size_t wildcard; - - assert(walk && glob); - - /* refs/ is implied if not given in the glob */ - if (git__prefixcmp(glob, GIT_REFS_DIR) != 0) - git_buf_joinpath(&buf, GIT_REFS_DIR, glob); - else - git_buf_puts(&buf, glob); - GITERR_CHECK_ALLOC_BUF(&buf); - - /* If no '?', '*' or '[' exist, we append '/ *' to the glob */ - wildcard = strcspn(glob, "?*["); - if (!glob[wildcard]) - git_buf_put(&buf, "/*", 2); - - if ((error = git_reference_iterator_glob_new(&iter, walk->repo, buf.ptr)) < 0) - goto out; - - while ((error = git_reference_next(&ref, iter)) == 0) { - error = push_ref(walk, git_reference_name(ref), hide, true); - git_reference_free(ref); - if (error < 0) - break; - } - git_reference_iterator_free(iter); - - if (error == GIT_ITEROVER) - error = 0; -out: - git_buf_free(&buf); - return error; -} - -int git_revwalk_push_glob(git_revwalk *walk, const char *glob) -{ - assert(walk && glob); - return push_glob(walk, glob, 0); -} - -int git_revwalk_hide_glob(git_revwalk *walk, const char *glob) -{ - assert(walk && glob); - return push_glob(walk, glob, 1); -} - -int git_revwalk_push_head(git_revwalk *walk) -{ - assert(walk); - return push_ref(walk, GIT_HEAD_FILE, 0, false); -} - -int git_revwalk_hide_head(git_revwalk *walk) -{ - assert(walk); - return push_ref(walk, GIT_HEAD_FILE, 1, false); -} - -int git_revwalk_push_ref(git_revwalk *walk, const char *refname) -{ - assert(walk && refname); - return push_ref(walk, refname, 0, false); -} - -int git_revwalk_push_range(git_revwalk *walk, const char *range) -{ - git_revspec revspec; - int error = 0; - - if ((error = git_revparse(&revspec, walk->repo, range))) - return error; - - if (revspec.flags & GIT_REVPARSE_MERGE_BASE) { - /* TODO: support "..." */ - giterr_set(GITERR_INVALID, "Symmetric differences not implemented in revwalk"); - return GIT_EINVALIDSPEC; - } - - if ((error = push_commit(walk, git_object_id(revspec.from), 1, false))) - goto out; - - error = push_commit(walk, git_object_id(revspec.to), 0, false); - -out: - git_object_free(revspec.from); - git_object_free(revspec.to); - return error; -} - -int git_revwalk_hide_ref(git_revwalk *walk, const char *refname) -{ - assert(walk && refname); - return push_ref(walk, refname, 1, false); -} - -static int revwalk_enqueue_timesort(git_revwalk *walk, git_commit_list_node *commit) -{ - return git_pqueue_insert(&walk->iterator_time, commit); -} - -static int revwalk_enqueue_unsorted(git_revwalk *walk, git_commit_list_node *commit) -{ - return git_commit_list_insert(commit, &walk->iterator_rand) ? 0 : -1; -} - -static int revwalk_next_timesort(git_commit_list_node **object_out, git_revwalk *walk) -{ - int error; - git_commit_list_node *next; - - while ((next = git_pqueue_pop(&walk->iterator_time)) != NULL) - if (!next->uninteresting) { - if ((error = process_commit_parents(walk, next)) < 0) - return error; - - *object_out = next; - return 0; - } - - giterr_clear(); - return GIT_ITEROVER; -} - -static int revwalk_next_unsorted(git_commit_list_node **object_out, git_revwalk *walk) -{ - int error; - git_commit_list_node *next; - - while ((next = git_commit_list_pop(&walk->iterator_rand)) != NULL) - if (!next->uninteresting) { - if ((error = process_commit_parents(walk, next)) < 0) - return error; - - *object_out = next; - return 0; - } - - giterr_clear(); - return GIT_ITEROVER; -} - -static int revwalk_next_toposort(git_commit_list_node **object_out, git_revwalk *walk) -{ - git_commit_list_node *next; - unsigned short i, max; - - for (;;) { - next = git_commit_list_pop(&walk->iterator_topo); - if (next == NULL) { - giterr_clear(); - return GIT_ITEROVER; - } - - if (next->in_degree > 0) { - next->topo_delay = 1; - continue; - } - - - max = next->out_degree; - if (walk->first_parent && next->out_degree) - max = 1; - - for (i = 0; i < max; ++i) { - git_commit_list_node *parent = next->parents[i]; - - if (--parent->in_degree == 0 && parent->topo_delay) { - parent->topo_delay = 0; - if (git_commit_list_insert(parent, &walk->iterator_topo) == NULL) - return -1; - } - } - - *object_out = next; - return 0; - } -} - -static int revwalk_next_reverse(git_commit_list_node **object_out, git_revwalk *walk) -{ - *object_out = git_commit_list_pop(&walk->iterator_reverse); - return *object_out ? 0 : GIT_ITEROVER; -} - - -static int interesting(git_pqueue *list) -{ - size_t i; - - for (i = 0; i < git_pqueue_size(list); i++) { - git_commit_list_node *commit = git_pqueue_get(list, i); - if (!commit->uninteresting) - return 1; - } - - return 0; -} - -static int contains(git_pqueue *list, git_commit_list_node *node) -{ - size_t i; - - for (i = 0; i < git_pqueue_size(list); i++) { - git_commit_list_node *commit = git_pqueue_get(list, i); - if (commit == node) - return 1; - } - - return 0; -} - -static int premark_uninteresting(git_revwalk *walk) -{ - int error = 0; - unsigned short i; - git_pqueue q; - git_commit_list *list; - git_commit_list_node *commit, *parent; - - if ((error = git_pqueue_init(&q, 0, 8, git_commit_list_time_cmp)) < 0) - return error; - - for (list = walk->user_input; list; list = list->next) { - if ((error = git_commit_list_parse(walk, list->item)) < 0) - goto cleanup; - - if ((error = git_pqueue_insert(&q, list->item)) < 0) - goto cleanup; - } - - while (interesting(&q)) { - commit = git_pqueue_pop(&q); - - for (i = 0; i < commit->out_degree; i++) { - parent = commit->parents[i]; - - if ((error = git_commit_list_parse(walk, parent)) < 0) - goto cleanup; - - if (commit->uninteresting) - parent->uninteresting = 1; - - if (contains(&q, parent)) - continue; - - if ((error = git_pqueue_insert(&q, parent)) < 0) - goto cleanup; - } - } - -cleanup: - git_pqueue_free(&q); - return error; -} - -static int prepare_walk(git_revwalk *walk) -{ - int error; - git_commit_list *list; - git_commit_list_node *next; - - /* If there were no pushes, we know that the walk is already over */ - if (!walk->did_push) { - giterr_clear(); - return GIT_ITEROVER; - } - - if (walk->did_hide && (error = premark_uninteresting(walk)) < 0) - return error; - - for (list = walk->user_input; list; list = list->next) { - if (process_commit(walk, list->item, list->item->uninteresting) < 0) - return -1; - } - - - if (walk->sorting & GIT_SORT_TOPOLOGICAL) { - unsigned short i; - - while ((error = walk->get_next(&next, walk)) == 0) { - for (i = 0; i < next->out_degree; ++i) { - git_commit_list_node *parent = next->parents[i]; - parent->in_degree++; - } - - if (git_commit_list_insert(next, &walk->iterator_topo) == NULL) - return -1; - } - - if (error != GIT_ITEROVER) - return error; - - walk->get_next = &revwalk_next_toposort; - } - - if (walk->sorting & GIT_SORT_REVERSE) { - - while ((error = walk->get_next(&next, walk)) == 0) - if (git_commit_list_insert(next, &walk->iterator_reverse) == NULL) - return -1; - - if (error != GIT_ITEROVER) - return error; - - walk->get_next = &revwalk_next_reverse; - } - - walk->walking = 1; - return 0; -} - - -int git_revwalk_new(git_revwalk **revwalk_out, git_repository *repo) -{ - git_revwalk *walk = git__calloc(1, sizeof(git_revwalk)); - GITERR_CHECK_ALLOC(walk); - - walk->commits = git_oidmap_alloc(); - GITERR_CHECK_ALLOC(walk->commits); - - if (git_pqueue_init(&walk->iterator_time, 0, 8, git_commit_list_time_cmp) < 0) - return -1; - - git_pool_init(&walk->commit_pool, COMMIT_ALLOC); - walk->get_next = &revwalk_next_unsorted; - walk->enqueue = &revwalk_enqueue_unsorted; - - walk->repo = repo; - - if (git_repository_odb(&walk->odb, repo) < 0) { - git_revwalk_free(walk); - return -1; - } - - *revwalk_out = walk; - return 0; -} - -void git_revwalk_free(git_revwalk *walk) -{ - if (walk == NULL) - return; - - git_revwalk_reset(walk); - git_odb_free(walk->odb); - - git_oidmap_free(walk->commits); - git_pool_clear(&walk->commit_pool); - git_pqueue_free(&walk->iterator_time); - git__free(walk); -} - -git_repository *git_revwalk_repository(git_revwalk *walk) -{ - assert(walk); - return walk->repo; -} - -void git_revwalk_sorting(git_revwalk *walk, unsigned int sort_mode) -{ - assert(walk); - - if (walk->walking) - git_revwalk_reset(walk); - - walk->sorting = sort_mode; - - if (walk->sorting & GIT_SORT_TIME) { - walk->get_next = &revwalk_next_timesort; - walk->enqueue = &revwalk_enqueue_timesort; - } else { - walk->get_next = &revwalk_next_unsorted; - walk->enqueue = &revwalk_enqueue_unsorted; - } -} - -void git_revwalk_simplify_first_parent(git_revwalk *walk) -{ - walk->first_parent = 1; -} - -int git_revwalk_next(git_oid *oid, git_revwalk *walk) -{ - int error; - git_commit_list_node *next; - - assert(walk && oid); - - if (!walk->walking) { - if ((error = prepare_walk(walk)) < 0) - return error; - } - - error = walk->get_next(&next, walk); - - if (error == GIT_ITEROVER) { - git_revwalk_reset(walk); - giterr_clear(); - return GIT_ITEROVER; - } - - if (!error) - git_oid_cpy(oid, &next->oid); - - return error; -} - -void git_revwalk_reset(git_revwalk *walk) -{ - git_commit_list_node *commit; - - assert(walk); - - kh_foreach_value(walk->commits, commit, { - commit->seen = 0; - commit->in_degree = 0; - commit->topo_delay = 0; - commit->uninteresting = 0; - commit->flags = 0; - }); - - git_pqueue_clear(&walk->iterator_time); - git_commit_list_free(&walk->iterator_topo); - git_commit_list_free(&walk->iterator_rand); - git_commit_list_free(&walk->iterator_reverse); - git_commit_list_free(&walk->user_input); - walk->first_parent = 0; - walk->walking = 0; - walk->did_push = walk->did_hide = 0; -} - -int git_revwalk_add_hide_cb( - git_revwalk *walk, - git_revwalk_hide_cb hide_cb, - void *payload) -{ - assert(walk); - - if (walk->walking) - git_revwalk_reset(walk); - - if (walk->hide_cb) { - /* There is already a callback added */ - giterr_set(GITERR_INVALID, "There is already a callback added to hide commits in revision walker."); - return -1; - } - - walk->hide_cb = hide_cb; - walk->hide_cb_payload = payload; - - return 0; -} - diff --git a/vendor/libgit2/src/revwalk.h b/vendor/libgit2/src/revwalk.h deleted file mode 100644 index 6b363d40f..000000000 --- a/vendor/libgit2/src/revwalk.h +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_revwalk_h__ -#define INCLUDE_revwalk_h__ - -#include "git2/revwalk.h" -#include "oidmap.h" -#include "commit_list.h" -#include "pqueue.h" -#include "pool.h" -#include "vector.h" - -#include "oidmap.h" - -struct git_revwalk { - git_repository *repo; - git_odb *odb; - - git_oidmap *commits; - git_pool commit_pool; - - git_commit_list *iterator_topo; - git_commit_list *iterator_rand; - git_commit_list *iterator_reverse; - git_pqueue iterator_time; - - int (*get_next)(git_commit_list_node **, git_revwalk *); - int (*enqueue)(git_revwalk *, git_commit_list_node *); - - unsigned walking:1, - first_parent: 1, - did_hide: 1, - did_push: 1; - unsigned int sorting; - - /* the pushes and hides */ - git_commit_list *user_input; - - /* hide callback */ - git_revwalk_hide_cb hide_cb; - void *hide_cb_payload; -}; - -git_commit_list_node *git_revwalk__commit_lookup(git_revwalk *walk, const git_oid *oid); - -#endif diff --git a/vendor/libgit2/src/settings.c b/vendor/libgit2/src/settings.c deleted file mode 100644 index 0da19ea03..000000000 --- a/vendor/libgit2/src/settings.c +++ /dev/null @@ -1,221 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#ifdef GIT_OPENSSL -# include -#endif - -#include -#include "common.h" -#include "sysdir.h" -#include "cache.h" -#include "global.h" -#include "object.h" - -void git_libgit2_version(int *major, int *minor, int *rev) -{ - *major = LIBGIT2_VER_MAJOR; - *minor = LIBGIT2_VER_MINOR; - *rev = LIBGIT2_VER_REVISION; -} - -int git_libgit2_features() -{ - return 0 -#ifdef GIT_THREADS - | GIT_FEATURE_THREADS -#endif -#if defined(GIT_OPENSSL) || defined(GIT_WINHTTP) || defined(GIT_SECURE_TRANSPORT) - | GIT_FEATURE_HTTPS -#endif -#if defined(GIT_SSH) - | GIT_FEATURE_SSH -#endif -#if defined(GIT_USE_NSEC) - | GIT_FEATURE_NSEC -#endif - ; -} - -/* Declarations for tuneable settings */ -extern size_t git_mwindow__window_size; -extern size_t git_mwindow__mapped_limit; - -static int config_level_to_sysdir(int config_level) -{ - int val = -1; - - switch (config_level) { - case GIT_CONFIG_LEVEL_SYSTEM: - val = GIT_SYSDIR_SYSTEM; - break; - case GIT_CONFIG_LEVEL_XDG: - val = GIT_SYSDIR_XDG; - break; - case GIT_CONFIG_LEVEL_GLOBAL: - val = GIT_SYSDIR_GLOBAL; - break; - case GIT_CONFIG_LEVEL_PROGRAMDATA: - val = GIT_SYSDIR_PROGRAMDATA; - break; - default: - giterr_set( - GITERR_INVALID, "Invalid config path selector %d", config_level); - } - - return val; -} - -extern char *git__user_agent; -extern char *git__ssl_ciphers; - -const char *git_libgit2__user_agent() -{ - return git__user_agent; -} - -const char *git_libgit2__ssl_ciphers() -{ - return git__ssl_ciphers; -} - -int git_libgit2_opts(int key, ...) -{ - int error = 0; - va_list ap; - - va_start(ap, key); - - switch (key) { - case GIT_OPT_SET_MWINDOW_SIZE: - git_mwindow__window_size = va_arg(ap, size_t); - break; - - case GIT_OPT_GET_MWINDOW_SIZE: - *(va_arg(ap, size_t *)) = git_mwindow__window_size; - break; - - case GIT_OPT_SET_MWINDOW_MAPPED_LIMIT: - git_mwindow__mapped_limit = va_arg(ap, size_t); - break; - - case GIT_OPT_GET_MWINDOW_MAPPED_LIMIT: - *(va_arg(ap, size_t *)) = git_mwindow__mapped_limit; - break; - - case GIT_OPT_GET_SEARCH_PATH: - if ((error = config_level_to_sysdir(va_arg(ap, int))) >= 0) { - git_buf *out = va_arg(ap, git_buf *); - const git_buf *tmp; - - git_buf_sanitize(out); - if ((error = git_sysdir_get(&tmp, error)) < 0) - break; - - error = git_buf_sets(out, tmp->ptr); - } - break; - - case GIT_OPT_SET_SEARCH_PATH: - if ((error = config_level_to_sysdir(va_arg(ap, int))) >= 0) - error = git_sysdir_set(error, va_arg(ap, const char *)); - break; - - case GIT_OPT_SET_CACHE_OBJECT_LIMIT: - { - git_otype type = (git_otype)va_arg(ap, int); - size_t size = va_arg(ap, size_t); - error = git_cache_set_max_object_size(type, size); - break; - } - - case GIT_OPT_SET_CACHE_MAX_SIZE: - git_cache__max_storage = va_arg(ap, ssize_t); - break; - - case GIT_OPT_ENABLE_CACHING: - git_cache__enabled = (va_arg(ap, int) != 0); - break; - - case GIT_OPT_GET_CACHED_MEMORY: - *(va_arg(ap, ssize_t *)) = git_cache__current_storage.val; - *(va_arg(ap, ssize_t *)) = git_cache__max_storage; - break; - - case GIT_OPT_GET_TEMPLATE_PATH: - { - git_buf *out = va_arg(ap, git_buf *); - const git_buf *tmp; - - git_buf_sanitize(out); - if ((error = git_sysdir_get(&tmp, GIT_SYSDIR_TEMPLATE)) < 0) - break; - - error = git_buf_sets(out, tmp->ptr); - } - break; - - case GIT_OPT_SET_TEMPLATE_PATH: - error = git_sysdir_set(GIT_SYSDIR_TEMPLATE, va_arg(ap, const char *)); - break; - - case GIT_OPT_SET_SSL_CERT_LOCATIONS: -#ifdef GIT_OPENSSL - { - const char *file = va_arg(ap, const char *); - const char *path = va_arg(ap, const char *); - if (!SSL_CTX_load_verify_locations(git__ssl_ctx, file, path)) { - giterr_set(GITERR_NET, "SSL error: %s", - ERR_error_string(ERR_get_error(), NULL)); - error = -1; - } - } -#else - giterr_set(GITERR_NET, "cannot set certificate locations: OpenSSL is not enabled"); - error = -1; -#endif - break; - case GIT_OPT_SET_USER_AGENT: - git__free(git__user_agent); - git__user_agent = git__strdup(va_arg(ap, const char *)); - if (!git__user_agent) { - giterr_set_oom(); - error = -1; - } - - break; - - case GIT_OPT_ENABLE_STRICT_OBJECT_CREATION: - git_object__strict_input_validation = (va_arg(ap, int) != 0); - break; - - case GIT_OPT_SET_SSL_CIPHERS: -#ifdef GIT_OPENSSL - { - git__free(git__ssl_ciphers); - git__ssl_ciphers = git__strdup(va_arg(ap, const char *)); - if (!git__ssl_ciphers) { - giterr_set_oom(); - error = -1; - } - } -#else - giterr_set(GITERR_NET, "cannot set custom ciphers: OpenSSL is not enabled"); - error = -1; -#endif - break; - - default: - giterr_set(GITERR_INVALID, "invalid option key"); - error = -1; - } - - va_end(ap); - - return error; -} - diff --git a/vendor/libgit2/src/sha1_lookup.c b/vendor/libgit2/src/sha1_lookup.c deleted file mode 100644 index c6b561340..000000000 --- a/vendor/libgit2/src/sha1_lookup.c +++ /dev/null @@ -1,249 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include - -#include "sha1_lookup.h" -#include "common.h" -#include "oid.h" - -/* - * Conventional binary search loop looks like this: - * - * unsigned lo, hi; - * do { - * unsigned mi = (lo + hi) / 2; - * int cmp = "entry pointed at by mi" minus "target"; - * if (!cmp) - * return (mi is the wanted one) - * if (cmp > 0) - * hi = mi; "mi is larger than target" - * else - * lo = mi+1; "mi is smaller than target" - * } while (lo < hi); - * - * The invariants are: - * - * - When entering the loop, lo points at a slot that is never - * above the target (it could be at the target), hi points at a - * slot that is guaranteed to be above the target (it can never - * be at the target). - * - * - We find a point 'mi' between lo and hi (mi could be the same - * as lo, but never can be as same as hi), and check if it hits - * the target. There are three cases: - * - * - if it is a hit, we are happy. - * - * - if it is strictly higher than the target, we set it to hi, - * and repeat the search. - * - * - if it is strictly lower than the target, we update lo to - * one slot after it, because we allow lo to be at the target. - * - * If the loop exits, there is no matching entry. - * - * When choosing 'mi', we do not have to take the "middle" but - * anywhere in between lo and hi, as long as lo <= mi < hi is - * satisfied. When we somehow know that the distance between the - * target and lo is much shorter than the target and hi, we could - * pick mi that is much closer to lo than the midway. - * - * Now, we can take advantage of the fact that SHA-1 is a good hash - * function, and as long as there are enough entries in the table, we - * can expect uniform distribution. An entry that begins with for - * example "deadbeef..." is much likely to appear much later than in - * the midway of the table. It can reasonably be expected to be near - * 87% (222/256) from the top of the table. - * - * However, we do not want to pick "mi" too precisely. If the entry at - * the 87% in the above example turns out to be higher than the target - * we are looking for, we would end up narrowing the search space down - * only by 13%, instead of 50% we would get if we did a simple binary - * search. So we would want to hedge our bets by being less aggressive. - * - * The table at "table" holds at least "nr" entries of "elem_size" - * bytes each. Each entry has the SHA-1 key at "key_offset". The - * table is sorted by the SHA-1 key of the entries. The caller wants - * to find the entry with "key", and knows that the entry at "lo" is - * not higher than the entry it is looking for, and that the entry at - * "hi" is higher than the entry it is looking for. - */ -int sha1_entry_pos(const void *table, - size_t elem_size, - size_t key_offset, - unsigned lo, unsigned hi, unsigned nr, - const unsigned char *key) -{ - const unsigned char *base = (const unsigned char*)table; - const unsigned char *hi_key, *lo_key; - unsigned ofs_0; - - if (!nr || lo >= hi) - return -1; - - if (nr == hi) - hi_key = NULL; - else - hi_key = base + elem_size * hi + key_offset; - lo_key = base + elem_size * lo + key_offset; - - ofs_0 = 0; - do { - int cmp; - unsigned ofs, mi, range; - unsigned lov, hiv, kyv; - const unsigned char *mi_key; - - range = hi - lo; - if (hi_key) { - for (ofs = ofs_0; ofs < 20; ofs++) - if (lo_key[ofs] != hi_key[ofs]) - break; - ofs_0 = ofs; - /* - * byte 0 thru (ofs-1) are the same between - * lo and hi; ofs is the first byte that is - * different. - * - * If ofs==20, then no bytes are different, - * meaning we have entries with duplicate - * keys. We know that we are in a solid run - * of this entry (because the entries are - * sorted, and our lo and hi are the same, - * there can be nothing but this single key - * in between). So we can stop the search. - * Either one of these entries is it (and - * we do not care which), or we do not have - * it. - * - * Furthermore, we know that one of our - * endpoints must be the edge of the run of - * duplicates. For example, given this - * sequence: - * - * idx 0 1 2 3 4 5 - * key A C C C C D - * - * If we are searching for "B", we might - * hit the duplicate run at lo=1, hi=3 - * (e.g., by first mi=3, then mi=0). But we - * can never have lo > 1, because B < C. - * That is, if our key is less than the - * run, we know that "lo" is the edge, but - * we can say nothing of "hi". Similarly, - * if our key is greater than the run, we - * know that "hi" is the edge, but we can - * say nothing of "lo". - * - * Therefore if we do not find it, we also - * know where it would go if it did exist: - * just on the far side of the edge that we - * know about. - */ - if (ofs == 20) { - mi = lo; - mi_key = base + elem_size * mi + key_offset; - cmp = memcmp(mi_key, key, 20); - if (!cmp) - return mi; - if (cmp < 0) - return -1 - hi; - else - return -1 - lo; - } - - hiv = hi_key[ofs_0]; - if (ofs_0 < 19) - hiv = (hiv << 8) | hi_key[ofs_0+1]; - } else { - hiv = 256; - if (ofs_0 < 19) - hiv <<= 8; - } - lov = lo_key[ofs_0]; - kyv = key[ofs_0]; - if (ofs_0 < 19) { - lov = (lov << 8) | lo_key[ofs_0+1]; - kyv = (kyv << 8) | key[ofs_0+1]; - } - assert(lov < hiv); - - if (kyv < lov) - return -1 - lo; - if (hiv < kyv) - return -1 - hi; - - /* - * Even if we know the target is much closer to 'hi' - * than 'lo', if we pick too precisely and overshoot - * (e.g. when we know 'mi' is closer to 'hi' than to - * 'lo', pick 'mi' that is higher than the target), we - * end up narrowing the search space by a smaller - * amount (i.e. the distance between 'mi' and 'hi') - * than what we would have (i.e. about half of 'lo' - * and 'hi'). Hedge our bets to pick 'mi' less - * aggressively, i.e. make 'mi' a bit closer to the - * middle than we would otherwise pick. - */ - kyv = (kyv * 6 + lov + hiv) / 8; - if (lov < hiv - 1) { - if (kyv == lov) - kyv++; - else if (kyv == hiv) - kyv--; - } - mi = (range - 1) * (kyv - lov) / (hiv - lov) + lo; - -#ifdef INDEX_DEBUG_LOOKUP - printf("lo %u hi %u rg %u mi %u ", lo, hi, range, mi); - printf("ofs %u lov %x, hiv %x, kyv %x\n", - ofs_0, lov, hiv, kyv); -#endif - - if (!(lo <= mi && mi < hi)) { - giterr_set(GITERR_INVALID, "Assertion failure. Binary search invariant is false"); - return -1; - } - - mi_key = base + elem_size * mi + key_offset; - cmp = memcmp(mi_key + ofs_0, key + ofs_0, 20 - ofs_0); - if (!cmp) - return mi; - if (cmp > 0) { - hi = mi; - hi_key = mi_key; - } else { - lo = mi + 1; - lo_key = mi_key + elem_size; - } - } while (lo < hi); - return -((int)lo)-1; -} - -int sha1_position(const void *table, - size_t stride, - unsigned lo, unsigned hi, - const unsigned char *key) -{ - const unsigned char *base = table; - - do { - unsigned mi = (lo + hi) / 2; - int cmp = git_oid__hashcmp(base + mi * stride, key); - - if (!cmp) - return mi; - - if (cmp > 0) - hi = mi; - else - lo = mi+1; - } while (lo < hi); - - return -((int)lo)-1; -} diff --git a/vendor/libgit2/src/sha1_lookup.h b/vendor/libgit2/src/sha1_lookup.h deleted file mode 100644 index 3799620c7..000000000 --- a/vendor/libgit2/src/sha1_lookup.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_sha1_lookup_h__ -#define INCLUDE_sha1_lookup_h__ - -#include - -int sha1_entry_pos(const void *table, - size_t elem_size, - size_t key_offset, - unsigned lo, unsigned hi, unsigned nr, - const unsigned char *key); - -int sha1_position(const void *table, - size_t stride, - unsigned lo, unsigned hi, - const unsigned char *key); - -#endif diff --git a/vendor/libgit2/src/signature.c b/vendor/libgit2/src/signature.c deleted file mode 100644 index d07c93323..000000000 --- a/vendor/libgit2/src/signature.c +++ /dev/null @@ -1,296 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "common.h" -#include "signature.h" -#include "repository.h" -#include "git2/common.h" -#include "posix.h" - -void git_signature_free(git_signature *sig) -{ - if (sig == NULL) - return; - - git__free(sig->name); - sig->name = NULL; - git__free(sig->email); - sig->email = NULL; - git__free(sig); -} - -static int signature_error(const char *msg) -{ - giterr_set(GITERR_INVALID, "Failed to parse signature - %s", msg); - return -1; -} - -static bool contains_angle_brackets(const char *input) -{ - return strchr(input, '<') != NULL || strchr(input, '>') != NULL; -} - -static bool is_crud(unsigned char c) -{ - return c <= 32 || - c == '.' || - c == ',' || - c == ':' || - c == ';' || - c == '<' || - c == '>' || - c == '"' || - c == '\\' || - c == '\''; -} - -static char *extract_trimmed(const char *ptr, size_t len) -{ - while (len && is_crud((unsigned char)ptr[0])) { - ptr++; len--; - } - - while (len && is_crud((unsigned char)ptr[len - 1])) { - len--; - } - - return git__substrdup(ptr, len); -} - -int git_signature_new(git_signature **sig_out, const char *name, const char *email, git_time_t time, int offset) -{ - git_signature *p = NULL; - - assert(name && email); - - *sig_out = NULL; - - if (contains_angle_brackets(name) || - contains_angle_brackets(email)) { - return signature_error( - "Neither `name` nor `email` should contain angle brackets chars."); - } - - p = git__calloc(1, sizeof(git_signature)); - GITERR_CHECK_ALLOC(p); - - p->name = extract_trimmed(name, strlen(name)); - GITERR_CHECK_ALLOC(p->name); - p->email = extract_trimmed(email, strlen(email)); - GITERR_CHECK_ALLOC(p->email); - - if (p->name[0] == '\0' || p->email[0] == '\0') { - git_signature_free(p); - return signature_error("Signature cannot have an empty name or email"); - } - - p->when.time = time; - p->when.offset = offset; - - *sig_out = p; - return 0; -} - -int git_signature_dup(git_signature **dest, const git_signature *source) -{ - git_signature *signature; - - if (source == NULL) - return 0; - - signature = git__calloc(1, sizeof(git_signature)); - GITERR_CHECK_ALLOC(signature); - - signature->name = git__strdup(source->name); - GITERR_CHECK_ALLOC(signature->name); - - signature->email = git__strdup(source->email); - GITERR_CHECK_ALLOC(signature->email); - - signature->when.time = source->when.time; - signature->when.offset = source->when.offset; - - *dest = signature; - - return 0; -} - -int git_signature__pdup(git_signature **dest, const git_signature *source, git_pool *pool) -{ - git_signature *signature; - - if (source == NULL) - return 0; - - signature = git_pool_mallocz(pool, sizeof(git_signature)); - GITERR_CHECK_ALLOC(signature); - - signature->name = git_pool_strdup(pool, source->name); - GITERR_CHECK_ALLOC(signature->name); - - signature->email = git_pool_strdup(pool, source->email); - GITERR_CHECK_ALLOC(signature->email); - - signature->when.time = source->when.time; - signature->when.offset = source->when.offset; - - *dest = signature; - - return 0; -} - -int git_signature_now(git_signature **sig_out, const char *name, const char *email) -{ - time_t now; - time_t offset; - struct tm *utc_tm; - git_signature *sig; - struct tm _utc; - - *sig_out = NULL; - - /* - * Get the current time as seconds since the epoch and - * transform that into a tm struct containing the time at - * UTC. Give that to mktime which considers it a local time - * (tm_isdst = -1 asks it to take DST into account) and gives - * us that time as seconds since the epoch. The difference - * between its return value and 'now' is our offset to UTC. - */ - time(&now); - utc_tm = p_gmtime_r(&now, &_utc); - utc_tm->tm_isdst = -1; - offset = (time_t)difftime(now, mktime(utc_tm)); - offset /= 60; - - if (git_signature_new(&sig, name, email, now, (int)offset) < 0) - return -1; - - *sig_out = sig; - - return 0; -} - -int git_signature_default(git_signature **out, git_repository *repo) -{ - int error; - git_config *cfg; - const char *user_name, *user_email; - - if ((error = git_repository_config_snapshot(&cfg, repo)) < 0) - return error; - - if (!(error = git_config_get_string(&user_name, cfg, "user.name")) && - !(error = git_config_get_string(&user_email, cfg, "user.email"))) - error = git_signature_now(out, user_name, user_email); - - git_config_free(cfg); - return error; -} - -int git_signature__parse(git_signature *sig, const char **buffer_out, - const char *buffer_end, const char *header, char ender) -{ - const char *buffer = *buffer_out; - const char *email_start, *email_end; - - memset(sig, 0, sizeof(git_signature)); - - if ((buffer_end = memchr(buffer, ender, buffer_end - buffer)) == NULL) - return signature_error("no newline given"); - - if (header) { - const size_t header_len = strlen(header); - - if (buffer + header_len >= buffer_end || memcmp(buffer, header, header_len) != 0) - return signature_error("expected prefix doesn't match actual"); - - buffer += header_len; - } - - email_start = git__memrchr(buffer, '<', buffer_end - buffer); - email_end = git__memrchr(buffer, '>', buffer_end - buffer); - - if (!email_start || !email_end || email_end <= email_start) - return signature_error("malformed e-mail"); - - email_start += 1; - sig->name = extract_trimmed(buffer, email_start - buffer - 1); - sig->email = extract_trimmed(email_start, email_end - email_start); - - /* Do we even have a time at the end of the signature? */ - if (email_end + 2 < buffer_end) { - const char *time_start = email_end + 2; - const char *time_end; - - if (git__strtol64(&sig->when.time, time_start, &time_end, 10) < 0) - return signature_error("invalid Unix timestamp"); - - /* do we have a timezone? */ - if (time_end + 1 < buffer_end) { - int offset, hours, mins; - const char *tz_start, *tz_end; - - tz_start = time_end + 1; - - if ((tz_start[0] != '-' && tz_start[0] != '+') || - git__strtol32(&offset, tz_start + 1, &tz_end, 10) < 0) { - //malformed timezone, just assume it's zero - offset = 0; - } - - hours = offset / 100; - mins = offset % 100; - - /* - * only store timezone if it's not overflowing; - * see http://www.worldtimezone.com/faq.html - */ - if (hours < 14 && mins < 59) { - sig->when.offset = (hours * 60) + mins; - if (tz_start[0] == '-') - sig->when.offset = -sig->when.offset; - } - } - } - - *buffer_out = buffer_end + 1; - return 0; -} - -void git_signature__writebuf(git_buf *buf, const char *header, const git_signature *sig) -{ - int offset, hours, mins; - char sign; - - assert(buf && sig); - - offset = sig->when.offset; - sign = (sig->when.offset < 0) ? '-' : '+'; - - if (offset < 0) - offset = -offset; - - hours = offset / 60; - mins = offset % 60; - - git_buf_printf(buf, "%s%s <%s> %u %c%02d%02d\n", - header ? header : "", sig->name, sig->email, - (unsigned)sig->when.time, sign, hours, mins); -} - -bool git_signature__equal(const git_signature *one, const git_signature *two) -{ - assert(one && two); - - return - git__strcmp(one->name, two->name) == 0 && - git__strcmp(one->email, two->email) == 0 && - one->when.time == two->when.time && - one->when.offset == two->when.offset; -} - diff --git a/vendor/libgit2/src/signature.h b/vendor/libgit2/src/signature.h deleted file mode 100644 index 75265df52..000000000 --- a/vendor/libgit2/src/signature.h +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_signature_h__ -#define INCLUDE_signature_h__ - -#include "git2/common.h" -#include "git2/signature.h" -#include "repository.h" -#include - -int git_signature__parse(git_signature *sig, const char **buffer_out, const char *buffer_end, const char *header, char ender); -void git_signature__writebuf(git_buf *buf, const char *header, const git_signature *sig); -bool git_signature__equal(const git_signature *one, const git_signature *two); - -int git_signature__pdup(git_signature **dest, const git_signature *source, git_pool *pool); - -#endif diff --git a/vendor/libgit2/src/socket_stream.c b/vendor/libgit2/src/socket_stream.c deleted file mode 100644 index 71f49118e..000000000 --- a/vendor/libgit2/src/socket_stream.c +++ /dev/null @@ -1,212 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "common.h" -#include "posix.h" -#include "netops.h" -#include "stream.h" -#include "socket_stream.h" - -#ifndef _WIN32 -# include -# include -# include -# include -# include -# include -# include -#else -# include -# include -# ifdef _MSC_VER -# pragma comment(lib, "ws2_32") -# endif -#endif - -#ifdef GIT_WIN32 -static void net_set_error(const char *str) -{ - int error = WSAGetLastError(); - char * win32_error = git_win32_get_error_message(error); - - if (win32_error) { - giterr_set(GITERR_NET, "%s: %s", str, win32_error); - git__free(win32_error); - } else { - giterr_set(GITERR_NET, str); - } -} -#else -static void net_set_error(const char *str) -{ - giterr_set(GITERR_NET, "%s: %s", str, strerror(errno)); -} -#endif - -static int close_socket(GIT_SOCKET s) -{ - if (s == INVALID_SOCKET) - return 0; - -#ifdef GIT_WIN32 - if (SOCKET_ERROR == closesocket(s)) - return -1; - - if (0 != WSACleanup()) { - giterr_set(GITERR_OS, "Winsock cleanup failed"); - return -1; - } - - return 0; -#else - return close(s); -#endif - -} - -int socket_connect(git_stream *stream) -{ - struct addrinfo *info = NULL, *p; - struct addrinfo hints; - git_socket_stream *st = (git_socket_stream *) stream; - GIT_SOCKET s = INVALID_SOCKET; - int ret; - -#ifdef GIT_WIN32 - /* on win32, the WSA context needs to be initialized - * before any socket calls can be performed */ - WSADATA wsd; - - if (WSAStartup(MAKEWORD(2,2), &wsd) != 0) { - giterr_set(GITERR_OS, "Winsock init failed"); - return -1; - } - - if (LOBYTE(wsd.wVersion) != 2 || HIBYTE(wsd.wVersion) != 2) { - WSACleanup(); - giterr_set(GITERR_OS, "Winsock init failed"); - return -1; - } -#endif - - memset(&hints, 0x0, sizeof(struct addrinfo)); - hints.ai_socktype = SOCK_STREAM; - hints.ai_family = AF_UNSPEC; - - if ((ret = p_getaddrinfo(st->host, st->port, &hints, &info)) != 0) { - giterr_set(GITERR_NET, - "Failed to resolve address for %s: %s", st->host, p_gai_strerror(ret)); - return -1; - } - - for (p = info; p != NULL; p = p->ai_next) { - s = socket(p->ai_family, p->ai_socktype, p->ai_protocol); - - if (s == INVALID_SOCKET) { - net_set_error("error creating socket"); - break; - } - - if (connect(s, p->ai_addr, (socklen_t)p->ai_addrlen) == 0) - break; - - /* If we can't connect, try the next one */ - close_socket(s); - s = INVALID_SOCKET; - } - - /* Oops, we couldn't connect to any address */ - if (s == INVALID_SOCKET && p == NULL) { - giterr_set(GITERR_OS, "Failed to connect to %s", st->host); - p_freeaddrinfo(info); - return -1; - } - - st->s = s; - p_freeaddrinfo(info); - return 0; -} - -ssize_t socket_write(git_stream *stream, const char *data, size_t len, int flags) -{ - ssize_t ret; - size_t off = 0; - git_socket_stream *st = (git_socket_stream *) stream; - - while (off < len) { - errno = 0; - ret = p_send(st->s, data + off, len - off, flags); - if (ret < 0) { - net_set_error("Error sending data"); - return -1; - } - - off += ret; - } - - return off; -} - -ssize_t socket_read(git_stream *stream, void *data, size_t len) -{ - ssize_t ret; - git_socket_stream *st = (git_socket_stream *) stream; - - if ((ret = p_recv(st->s, data, len, 0)) < 0) - net_set_error("Error receiving socket data"); - - return ret; -} - -int socket_close(git_stream *stream) -{ - git_socket_stream *st = (git_socket_stream *) stream; - int error; - - error = close_socket(st->s); - st->s = INVALID_SOCKET; - - return error; -} - -void socket_free(git_stream *stream) -{ - git_socket_stream *st = (git_socket_stream *) stream; - - git__free(st->host); - git__free(st->port); - git__free(st); -} - -int git_socket_stream_new(git_stream **out, const char *host, const char *port) -{ - git_socket_stream *st; - - assert(out && host); - - st = git__calloc(1, sizeof(git_socket_stream)); - GITERR_CHECK_ALLOC(st); - - st->host = git__strdup(host); - GITERR_CHECK_ALLOC(st->host); - - if (port) { - st->port = git__strdup(port); - GITERR_CHECK_ALLOC(st->port); - } - - st->parent.version = GIT_STREAM_VERSION; - st->parent.connect = socket_connect; - st->parent.write = socket_write; - st->parent.read = socket_read; - st->parent.close = socket_close; - st->parent.free = socket_free; - st->s = INVALID_SOCKET; - - *out = (git_stream *) st; - return 0; -} diff --git a/vendor/libgit2/src/socket_stream.h b/vendor/libgit2/src/socket_stream.h deleted file mode 100644 index 8e9949fcd..000000000 --- a/vendor/libgit2/src/socket_stream.h +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_socket_stream_h__ -#define INCLUDE_socket_stream_h__ - -#include "netops.h" - -typedef struct { - git_stream parent; - char *host; - char *port; - GIT_SOCKET s; -} git_socket_stream; - -extern int git_socket_stream_new(git_stream **out, const char *host, const char *port); - -#endif diff --git a/vendor/libgit2/src/sortedcache.c b/vendor/libgit2/src/sortedcache.c deleted file mode 100644 index 5c2a167a7..000000000 --- a/vendor/libgit2/src/sortedcache.c +++ /dev/null @@ -1,381 +0,0 @@ -#include "sortedcache.h" - -GIT__USE_STRMAP - -int git_sortedcache_new( - git_sortedcache **out, - size_t item_path_offset, - git_sortedcache_free_item_fn free_item, - void *free_item_payload, - git_vector_cmp item_cmp, - const char *path) -{ - git_sortedcache *sc; - size_t pathlen, alloclen; - - pathlen = path ? strlen(path) : 0; - - GITERR_CHECK_ALLOC_ADD(&alloclen, sizeof(git_sortedcache), pathlen); - GITERR_CHECK_ALLOC_ADD(&alloclen, alloclen, 1); - sc = git__calloc(1, alloclen); - GITERR_CHECK_ALLOC(sc); - - git_pool_init(&sc->pool, 1); - - if (git_vector_init(&sc->items, 4, item_cmp) < 0 || - git_strmap_alloc(&sc->map) < 0) - goto fail; - - if (git_rwlock_init(&sc->lock)) { - giterr_set(GITERR_OS, "Failed to initialize lock"); - goto fail; - } - - sc->item_path_offset = item_path_offset; - sc->free_item = free_item; - sc->free_item_payload = free_item_payload; - GIT_REFCOUNT_INC(sc); - if (pathlen) - memcpy(sc->path, path, pathlen); - - *out = sc; - return 0; - -fail: - git_strmap_free(sc->map); - git_vector_free(&sc->items); - git_pool_clear(&sc->pool); - git__free(sc); - return -1; -} - -void git_sortedcache_incref(git_sortedcache *sc) -{ - GIT_REFCOUNT_INC(sc); -} - -const char *git_sortedcache_path(git_sortedcache *sc) -{ - return sc->path; -} - -static void sortedcache_clear(git_sortedcache *sc) -{ - git_strmap_clear(sc->map); - - if (sc->free_item) { - size_t i; - void *item; - - git_vector_foreach(&sc->items, i, item) { - sc->free_item(sc->free_item_payload, item); - } - } - - git_vector_clear(&sc->items); - - git_pool_clear(&sc->pool); -} - -static void sortedcache_free(git_sortedcache *sc) -{ - /* acquire write lock to make sure everyone else is done */ - if (git_sortedcache_wlock(sc) < 0) - return; - - sortedcache_clear(sc); - git_vector_free(&sc->items); - git_strmap_free(sc->map); - - git_sortedcache_wunlock(sc); - - git_rwlock_free(&sc->lock); - git__free(sc); -} - -void git_sortedcache_free(git_sortedcache *sc) -{ - if (!sc) - return; - GIT_REFCOUNT_DEC(sc, sortedcache_free); -} - -static int sortedcache_copy_item(void *payload, void *tgt_item, void *src_item) -{ - git_sortedcache *sc = payload; - /* path will already have been copied by upsert */ - memcpy(tgt_item, src_item, sc->item_path_offset); - return 0; -} - -/* copy a sorted cache */ -int git_sortedcache_copy( - git_sortedcache **out, - git_sortedcache *src, - bool lock, - int (*copy_item)(void *payload, void *tgt_item, void *src_item), - void *payload) -{ - int error = 0; - git_sortedcache *tgt; - size_t i; - void *src_item, *tgt_item; - - /* just use memcpy if no special copy fn is passed in */ - if (!copy_item) { - copy_item = sortedcache_copy_item; - payload = src; - } - - if ((error = git_sortedcache_new( - &tgt, src->item_path_offset, - src->free_item, src->free_item_payload, - src->items._cmp, src->path)) < 0) - return error; - - if (lock && git_sortedcache_rlock(src) < 0) { - git_sortedcache_free(tgt); - return -1; - } - - git_vector_foreach(&src->items, i, src_item) { - char *path = ((char *)src_item) + src->item_path_offset; - - if ((error = git_sortedcache_upsert(&tgt_item, tgt, path)) < 0 || - (error = copy_item(payload, tgt_item, src_item)) < 0) - break; - } - - if (lock) - git_sortedcache_runlock(src); - if (error) - git_sortedcache_free(tgt); - - *out = !error ? tgt : NULL; - - return error; -} - -/* lock sortedcache while making modifications */ -int git_sortedcache_wlock(git_sortedcache *sc) -{ - GIT_UNUSED(sc); /* prevent warning when compiled w/o threads */ - - if (git_rwlock_wrlock(&sc->lock) < 0) { - giterr_set(GITERR_OS, "Unable to acquire write lock on cache"); - return -1; - } - return 0; -} - -/* unlock sorted cache when done with modifications */ -void git_sortedcache_wunlock(git_sortedcache *sc) -{ - git_vector_sort(&sc->items); - git_rwlock_wrunlock(&sc->lock); -} - -/* lock sortedcache for read */ -int git_sortedcache_rlock(git_sortedcache *sc) -{ - GIT_UNUSED(sc); /* prevent warning when compiled w/o threads */ - - if (git_rwlock_rdlock(&sc->lock) < 0) { - giterr_set(GITERR_OS, "Unable to acquire read lock on cache"); - return -1; - } - return 0; -} - -/* unlock sorted cache when done reading */ -void git_sortedcache_runlock(git_sortedcache *sc) -{ - GIT_UNUSED(sc); /* prevent warning when compiled w/o threads */ - git_rwlock_rdunlock(&sc->lock); -} - -/* if the file has changed, lock cache and load file contents into buf; - * returns <0 on error, >0 if file has not changed - */ -int git_sortedcache_lockandload(git_sortedcache *sc, git_buf *buf) -{ - int error, fd; - - if ((error = git_sortedcache_wlock(sc)) < 0) - return error; - - if ((error = git_futils_filestamp_check(&sc->stamp, sc->path)) <= 0) - goto unlock; - - if (!git__is_sizet(sc->stamp.size)) { - giterr_set(GITERR_INVALID, "Unable to load file larger than size_t"); - error = -1; - goto unlock; - } - - if ((fd = git_futils_open_ro(sc->path)) < 0) { - error = fd; - goto unlock; - } - - if (buf) - error = git_futils_readbuffer_fd(buf, fd, (size_t)sc->stamp.size); - - (void)p_close(fd); - - if (error < 0) - goto unlock; - - return 1; /* return 1 -> file needs reload and was successfully loaded */ - -unlock: - git_sortedcache_wunlock(sc); - return error; -} - -void git_sortedcache_updated(git_sortedcache *sc) -{ - /* update filestamp to latest value */ - git_futils_filestamp_check(&sc->stamp, sc->path); -} - -/* release all items in sorted cache */ -int git_sortedcache_clear(git_sortedcache *sc, bool wlock) -{ - if (wlock && git_sortedcache_wlock(sc) < 0) - return -1; - - sortedcache_clear(sc); - - if (wlock) - git_sortedcache_wunlock(sc); - - return 0; -} - -/* find and/or insert item, returning pointer to item data */ -int git_sortedcache_upsert(void **out, git_sortedcache *sc, const char *key) -{ - int error = 0; - khiter_t pos; - void *item; - size_t keylen, itemlen; - char *item_key; - - pos = git_strmap_lookup_index(sc->map, key); - if (git_strmap_valid_index(sc->map, pos)) { - item = git_strmap_value_at(sc->map, pos); - goto done; - } - - keylen = strlen(key); - itemlen = sc->item_path_offset + keylen + 1; - itemlen = (itemlen + 7) & ~7; - - if ((item = git_pool_mallocz(&sc->pool, (uint32_t)itemlen)) == NULL) { - /* don't use GITERR_CHECK_ALLOC b/c of lock */ - error = -1; - goto done; - } - - /* one strange thing is that even if the vector or hash table insert - * fail, there is no way to free the pool item so we just abandon it - */ - - item_key = ((char *)item) + sc->item_path_offset; - memcpy(item_key, key, keylen); - - pos = kh_put(str, sc->map, item_key, &error); - if (error < 0) - goto done; - - if (!error) - kh_key(sc->map, pos) = item_key; - kh_val(sc->map, pos) = item; - - error = git_vector_insert(&sc->items, item); - if (error < 0) - git_strmap_delete_at(sc->map, pos); - -done: - if (out) - *out = !error ? item : NULL; - return error; -} - -/* lookup item by key */ -void *git_sortedcache_lookup(const git_sortedcache *sc, const char *key) -{ - khiter_t pos = git_strmap_lookup_index(sc->map, key); - if (git_strmap_valid_index(sc->map, pos)) - return git_strmap_value_at(sc->map, pos); - return NULL; -} - -/* find out how many items are in the cache */ -size_t git_sortedcache_entrycount(const git_sortedcache *sc) -{ - return git_vector_length(&sc->items); -} - -/* lookup item by index */ -void *git_sortedcache_entry(git_sortedcache *sc, size_t pos) -{ - /* make sure the items are sorted so this gets the correct item */ - if (!git_vector_is_sorted(&sc->items)) - git_vector_sort(&sc->items); - - return git_vector_get(&sc->items, pos); -} - -/* helper struct so bsearch callback can know offset + key value for cmp */ -struct sortedcache_magic_key { - size_t offset; - const char *key; -}; - -static int sortedcache_magic_cmp(const void *key, const void *value) -{ - const struct sortedcache_magic_key *magic = key; - const char *value_key = ((const char *)value) + magic->offset; - return strcmp(magic->key, value_key); -} - -/* lookup index of item by key */ -int git_sortedcache_lookup_index( - size_t *out, git_sortedcache *sc, const char *key) -{ - struct sortedcache_magic_key magic; - - magic.offset = sc->item_path_offset; - magic.key = key; - - return git_vector_bsearch2(out, &sc->items, sortedcache_magic_cmp, &magic); -} - -/* remove entry from cache */ -int git_sortedcache_remove(git_sortedcache *sc, size_t pos) -{ - char *item; - khiter_t mappos; - - /* because of pool allocation, this can't actually remove the item, - * but we can remove it from the items vector and the hash table. - */ - - if ((item = git_vector_get(&sc->items, pos)) == NULL) { - giterr_set(GITERR_INVALID, "Removing item out of range"); - return GIT_ENOTFOUND; - } - - (void)git_vector_remove(&sc->items, pos); - - mappos = git_strmap_lookup_index(sc->map, item + sc->item_path_offset); - git_strmap_delete_at(sc->map, mappos); - - if (sc->free_item) - sc->free_item(sc->free_item_payload, item); - - return 0; -} - diff --git a/vendor/libgit2/src/sortedcache.h b/vendor/libgit2/src/sortedcache.h deleted file mode 100644 index 4cacad62b..000000000 --- a/vendor/libgit2/src/sortedcache.h +++ /dev/null @@ -1,178 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_sorted_cache_h__ -#define INCLUDE_sorted_cache_h__ - -#include "util.h" -#include "fileops.h" -#include "vector.h" -#include "thread-utils.h" -#include "pool.h" -#include "strmap.h" - -#include - -/* - * The purpose of this data structure is to cache the parsed contents of a - * file (a.k.a. the backing file) where each item in the file can be - * identified by a key string and you want to both look them up by name - * and traverse them in sorted order. Each item is assumed to itself end - * in a GIT_FLEX_ARRAY. - */ - -typedef void (*git_sortedcache_free_item_fn)(void *payload, void *item); - -typedef struct { - git_refcount rc; - git_rwlock lock; - size_t item_path_offset; - git_sortedcache_free_item_fn free_item; - void *free_item_payload; - git_pool pool; - git_vector items; - git_strmap *map; - git_futils_filestamp stamp; - char path[GIT_FLEX_ARRAY]; -} git_sortedcache; - -/* Create a new sortedcache - * - * Even though every sortedcache stores items with a GIT_FLEX_ARRAY at - * the end containing their key string, you have to provide the item_cmp - * sorting function because the sorting function doesn't get a payload - * and therefore can't know the offset to the item key string. :-( - * - * @param out The allocated git_sortedcache - * @param item_path_offset Offset to the GIT_FLEX_ARRAY item key in the - * struct - use offsetof(struct mine, key-field) to get this - * @param free_item Optional callback to free each item - * @param free_item_payload Optional payload passed to free_item callback - * @param item_cmp Compare the keys of two items - * @param path The path to the backing store file for this cache; this - * may be NULL. The cache makes it easy to load this and check - * if it has been modified since the last load and/or write. - */ -int git_sortedcache_new( - git_sortedcache **out, - size_t item_path_offset, /* use offsetof(struct, path-field) macro */ - git_sortedcache_free_item_fn free_item, - void *free_item_payload, - git_vector_cmp item_cmp, - const char *path); - -/* Copy a sorted cache - * - * - `copy_item` can be NULL to just use memcpy - * - if `lock`, grabs read lock on `src` during copy and releases after - */ -int git_sortedcache_copy( - git_sortedcache **out, - git_sortedcache *src, - bool lock, - int (*copy_item)(void *payload, void *tgt_item, void *src_item), - void *payload); - -/* Free sorted cache (first calling `free_item` callbacks) - * - * Don't call on a locked collection - it may acquire a write lock - */ -void git_sortedcache_free(git_sortedcache *sc); - -/* Increment reference count - balance with call to free */ -void git_sortedcache_incref(git_sortedcache *sc); - -/* Get the pathname associated with this cache at creation time */ -const char *git_sortedcache_path(git_sortedcache *sc); - -/* - * CACHE WRITE FUNCTIONS - * - * The following functions require you to have a writer lock to make the - * modification. Some of the functions take a `wlock` parameter and - * will optionally lock and unlock for you if that is passed as true. - * - */ - -/* Lock sortedcache for write */ -int git_sortedcache_wlock(git_sortedcache *sc); - -/* Unlock sorted cache when done with write */ -void git_sortedcache_wunlock(git_sortedcache *sc); - -/* Lock cache and load backing file into a buffer. - * - * This grabs a write lock on the cache then looks at the modification - * time and size of the file on disk. - * - * If the file appears to have changed, this loads the file contents into - * the buffer and returns a positive value leaving the cache locked - the - * caller should parse the file content, update the cache as needed, then - * release the lock. NOTE: In this case, the caller MUST unlock the cache. - * - * If the file appears to be unchanged, then this automatically releases - * the lock on the cache, clears the buffer, and returns 0. - * - * @return 0 if up-to-date, 1 if out-of-date, <0 on error - */ -int git_sortedcache_lockandload(git_sortedcache *sc, git_buf *buf); - -/* Refresh file timestamp after write completes - * You should already be holding the write lock when you call this. - */ -void git_sortedcache_updated(git_sortedcache *sc); - -/* Release all items in sorted cache - * - * If `wlock` is true, grabs write lock and releases when done, otherwise - * you should already be holding a write lock when you call this. - */ -int git_sortedcache_clear(git_sortedcache *sc, bool wlock); - -/* Find and/or insert item, returning pointer to item data. - * You should already be holding the write lock when you call this. - */ -int git_sortedcache_upsert( - void **out, git_sortedcache *sc, const char *key); - -/* Removes entry at pos from cache - * You should already be holding the write lock when you call this. - */ -int git_sortedcache_remove(git_sortedcache *sc, size_t pos); - -/* - * CACHE READ FUNCTIONS - * - * The following functions access items in the cache. To prevent the - * results from being invalidated before they can be used, you should be - * holding either a read lock or a write lock when using these functions. - * - */ - -/* Lock sortedcache for read */ -int git_sortedcache_rlock(git_sortedcache *sc); - -/* Unlock sorted cache when done with read */ -void git_sortedcache_runlock(git_sortedcache *sc); - -/* Lookup item by key - returns NULL if not found */ -void *git_sortedcache_lookup(const git_sortedcache *sc, const char *key); - -/* Get how many items are in the cache - * - * You can call this function without holding a lock, but be aware - * that it may change before you use it. - */ -size_t git_sortedcache_entrycount(const git_sortedcache *sc); - -/* Lookup item by index - returns NULL if out of range */ -void *git_sortedcache_entry(git_sortedcache *sc, size_t pos); - -/* Lookup index of item by key - returns GIT_ENOTFOUND if not found */ -int git_sortedcache_lookup_index( - size_t *out, git_sortedcache *sc, const char *key); - -#endif diff --git a/vendor/libgit2/src/stash.c b/vendor/libgit2/src/stash.c deleted file mode 100644 index 43a464e64..000000000 --- a/vendor/libgit2/src/stash.c +++ /dev/null @@ -1,1079 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "common.h" -#include "repository.h" -#include "commit.h" -#include "message.h" -#include "tree.h" -#include "reflog.h" -#include "git2/diff.h" -#include "git2/stash.h" -#include "git2/status.h" -#include "git2/checkout.h" -#include "git2/index.h" -#include "git2/transaction.h" -#include "git2/merge.h" -#include "index.h" -#include "signature.h" -#include "iterator.h" -#include "merge.h" -#include "diff.h" - -static int create_error(int error, const char *msg) -{ - giterr_set(GITERR_STASH, "Cannot stash changes - %s", msg); - return error; -} - -static int retrieve_head(git_reference **out, git_repository *repo) -{ - int error = git_repository_head(out, repo); - - if (error == GIT_EUNBORNBRANCH) - return create_error(error, "You do not have the initial commit yet."); - - return error; -} - -static int append_abbreviated_oid(git_buf *out, const git_oid *b_commit) -{ - char *formatted_oid; - - formatted_oid = git_oid_allocfmt(b_commit); - GITERR_CHECK_ALLOC(formatted_oid); - - git_buf_put(out, formatted_oid, 7); - git__free(formatted_oid); - - return git_buf_oom(out) ? -1 : 0; -} - -static int append_commit_description(git_buf *out, git_commit* commit) -{ - const char *summary = git_commit_summary(commit); - GITERR_CHECK_ALLOC(summary); - - if (append_abbreviated_oid(out, git_commit_id(commit)) < 0) - return -1; - - git_buf_putc(out, ' '); - git_buf_puts(out, summary); - git_buf_putc(out, '\n'); - - return git_buf_oom(out) ? -1 : 0; -} - -static int retrieve_base_commit_and_message( - git_commit **b_commit, - git_buf *stash_message, - git_repository *repo) -{ - git_reference *head = NULL; - int error; - - if ((error = retrieve_head(&head, repo)) < 0) - return error; - - if (strcmp("HEAD", git_reference_name(head)) == 0) - error = git_buf_puts(stash_message, "(no branch): "); - else - error = git_buf_printf( - stash_message, - "%s: ", - git_reference_name(head) + strlen(GIT_REFS_HEADS_DIR)); - if (error < 0) - goto cleanup; - - if ((error = git_commit_lookup( - b_commit, repo, git_reference_target(head))) < 0) - goto cleanup; - - if ((error = append_commit_description(stash_message, *b_commit)) < 0) - goto cleanup; - -cleanup: - git_reference_free(head); - return error; -} - -static int build_tree_from_index(git_tree **out, git_index *index) -{ - int error; - git_oid i_tree_oid; - - if ((error = git_index_write_tree(&i_tree_oid, index)) < 0) - return error; - - return git_tree_lookup(out, git_index_owner(index), &i_tree_oid); -} - -static int commit_index( - git_commit **i_commit, - git_index *index, - const git_signature *stasher, - const char *message, - const git_commit *parent) -{ - git_tree *i_tree = NULL; - git_oid i_commit_oid; - git_buf msg = GIT_BUF_INIT; - int error; - - if ((error = build_tree_from_index(&i_tree, index)) < 0) - goto cleanup; - - if ((error = git_buf_printf(&msg, "index on %s\n", message)) < 0) - goto cleanup; - - if ((error = git_commit_create( - &i_commit_oid, - git_index_owner(index), - NULL, - stasher, - stasher, - NULL, - git_buf_cstr(&msg), - i_tree, - 1, - &parent)) < 0) - goto cleanup; - - error = git_commit_lookup(i_commit, git_index_owner(index), &i_commit_oid); - -cleanup: - git_tree_free(i_tree); - git_buf_free(&msg); - return error; -} - -struct stash_update_rules { - bool include_changed; - bool include_untracked; - bool include_ignored; -}; - -static int stash_update_index_from_diff( - git_index *index, - const git_diff *diff, - struct stash_update_rules *data) -{ - int error = 0; - size_t d, max_d = git_diff_num_deltas(diff); - - for (d = 0; !error && d < max_d; ++d) { - const char *add_path = NULL; - const git_diff_delta *delta = git_diff_get_delta(diff, d); - - switch (delta->status) { - case GIT_DELTA_IGNORED: - if (data->include_ignored) - add_path = delta->new_file.path; - break; - - case GIT_DELTA_UNTRACKED: - if (data->include_untracked && - delta->new_file.mode != GIT_FILEMODE_TREE) - add_path = delta->new_file.path; - break; - - case GIT_DELTA_ADDED: - case GIT_DELTA_MODIFIED: - if (data->include_changed) - add_path = delta->new_file.path; - break; - - case GIT_DELTA_DELETED: - if (data->include_changed && - !git_index_find(NULL, index, delta->old_file.path)) - error = git_index_remove(index, delta->old_file.path, 0); - break; - - default: - /* Unimplemented */ - giterr_set( - GITERR_INVALID, - "Cannot update index. Unimplemented status (%d)", - delta->status); - return -1; - } - - if (add_path != NULL) - error = git_index_add_bypath(index, add_path); - } - - return error; -} - -static int build_untracked_tree( - git_tree **tree_out, - git_index *index, - git_commit *i_commit, - uint32_t flags) -{ - git_tree *i_tree = NULL; - git_diff *diff = NULL; - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - struct stash_update_rules data = {0}; - int error; - - git_index_clear(index); - - if (flags & GIT_STASH_INCLUDE_UNTRACKED) { - opts.flags |= GIT_DIFF_INCLUDE_UNTRACKED | - GIT_DIFF_RECURSE_UNTRACKED_DIRS; - data.include_untracked = true; - } - - if (flags & GIT_STASH_INCLUDE_IGNORED) { - opts.flags |= GIT_DIFF_INCLUDE_IGNORED | - GIT_DIFF_RECURSE_IGNORED_DIRS; - data.include_ignored = true; - } - - if ((error = git_commit_tree(&i_tree, i_commit)) < 0) - goto cleanup; - - if ((error = git_diff_tree_to_workdir( - &diff, git_index_owner(index), i_tree, &opts)) < 0) - goto cleanup; - - if ((error = stash_update_index_from_diff(index, diff, &data)) < 0) - goto cleanup; - - error = build_tree_from_index(tree_out, index); - -cleanup: - git_diff_free(diff); - git_tree_free(i_tree); - return error; -} - -static int commit_untracked( - git_commit **u_commit, - git_index *index, - const git_signature *stasher, - const char *message, - git_commit *i_commit, - uint32_t flags) -{ - git_tree *u_tree = NULL; - git_oid u_commit_oid; - git_buf msg = GIT_BUF_INIT; - int error; - - if ((error = build_untracked_tree(&u_tree, index, i_commit, flags)) < 0) - goto cleanup; - - if ((error = git_buf_printf(&msg, "untracked files on %s\n", message)) < 0) - goto cleanup; - - if ((error = git_commit_create( - &u_commit_oid, - git_index_owner(index), - NULL, - stasher, - stasher, - NULL, - git_buf_cstr(&msg), - u_tree, - 0, - NULL)) < 0) - goto cleanup; - - error = git_commit_lookup(u_commit, git_index_owner(index), &u_commit_oid); - -cleanup: - git_tree_free(u_tree); - git_buf_free(&msg); - return error; -} - -static git_diff_delta *stash_delta_merge( - const git_diff_delta *a, - const git_diff_delta *b, - git_pool *pool) -{ - /* Special case for stash: if a file is deleted in the index, but exists - * in the working tree, we need to stash the workdir copy for the workdir. - */ - if (a->status == GIT_DELTA_DELETED && b->status == GIT_DELTA_UNTRACKED) { - git_diff_delta *dup = git_diff__delta_dup(b, pool); - - if (dup) - dup->status = GIT_DELTA_MODIFIED; - return dup; - } - - return git_diff__merge_like_cgit(a, b, pool); -} - -static int build_workdir_tree( - git_tree **tree_out, - git_index *index, - git_commit *b_commit) -{ - git_repository *repo = git_index_owner(index); - git_tree *b_tree = NULL; - git_diff *diff = NULL, *idx_to_wd = NULL; - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - struct stash_update_rules data = {0}; - int error; - - opts.flags = GIT_DIFF_IGNORE_SUBMODULES | GIT_DIFF_INCLUDE_UNTRACKED; - - if ((error = git_commit_tree(&b_tree, b_commit)) < 0) - goto cleanup; - - if ((error = git_diff_tree_to_index(&diff, repo, b_tree, index, &opts)) < 0 || - (error = git_diff_index_to_workdir(&idx_to_wd, repo, index, &opts)) < 0 || - (error = git_diff__merge(diff, idx_to_wd, stash_delta_merge)) < 0) - goto cleanup; - - data.include_changed = true; - - if ((error = stash_update_index_from_diff(index, diff, &data)) < 0) - goto cleanup; - - error = build_tree_from_index(tree_out, index); - -cleanup: - git_diff_free(idx_to_wd); - git_diff_free(diff); - git_tree_free(b_tree); - - return error; -} - -static int commit_worktree( - git_oid *w_commit_oid, - git_index *index, - const git_signature *stasher, - const char *message, - git_commit *i_commit, - git_commit *b_commit, - git_commit *u_commit) -{ - int error = 0; - git_tree *w_tree = NULL, *i_tree = NULL; - const git_commit *parents[] = { NULL, NULL, NULL }; - - parents[0] = b_commit; - parents[1] = i_commit; - parents[2] = u_commit; - - if ((error = git_commit_tree(&i_tree, i_commit)) < 0) - goto cleanup; - - if ((error = git_index_read_tree(index, i_tree)) < 0) - goto cleanup; - - if ((error = build_workdir_tree(&w_tree, index, b_commit)) < 0) - goto cleanup; - - error = git_commit_create( - w_commit_oid, - git_index_owner(index), - NULL, - stasher, - stasher, - NULL, - message, - w_tree, - u_commit ? 3 : 2, - parents); - -cleanup: - git_tree_free(i_tree); - git_tree_free(w_tree); - return error; -} - -static int prepare_worktree_commit_message( - git_buf* msg, - const char *user_message) -{ - git_buf buf = GIT_BUF_INIT; - int error; - - if ((error = git_buf_set(&buf, git_buf_cstr(msg), git_buf_len(msg))) < 0) - return error; - - git_buf_clear(msg); - - if (!user_message) - git_buf_printf(msg, "WIP on %s", git_buf_cstr(&buf)); - else { - const char *colon; - - if ((colon = strchr(git_buf_cstr(&buf), ':')) == NULL) - goto cleanup; - - git_buf_puts(msg, "On "); - git_buf_put(msg, git_buf_cstr(&buf), colon - buf.ptr); - git_buf_printf(msg, ": %s\n", user_message); - } - - error = (git_buf_oom(msg) || git_buf_oom(&buf)) ? -1 : 0; - -cleanup: - git_buf_free(&buf); - - return error; -} - -static int update_reflog( - git_oid *w_commit_oid, - git_repository *repo, - const char *message) -{ - git_reference *stash; - int error; - - if ((error = git_reference_ensure_log(repo, GIT_REFS_STASH_FILE)) < 0) - return error; - - error = git_reference_create(&stash, repo, GIT_REFS_STASH_FILE, w_commit_oid, 1, message); - - git_reference_free(stash); - - return error; -} - -static int is_dirty_cb(const char *path, unsigned int status, void *payload) -{ - GIT_UNUSED(path); - GIT_UNUSED(status); - GIT_UNUSED(payload); - - return GIT_PASSTHROUGH; -} - -static int ensure_there_are_changes_to_stash( - git_repository *repo, - bool include_untracked_files, - bool include_ignored_files) -{ - int error; - git_status_options opts = GIT_STATUS_OPTIONS_INIT; - - opts.show = GIT_STATUS_SHOW_INDEX_AND_WORKDIR; - opts.flags = GIT_STATUS_OPT_EXCLUDE_SUBMODULES; - - if (include_untracked_files) - opts.flags |= GIT_STATUS_OPT_INCLUDE_UNTRACKED | - GIT_STATUS_OPT_RECURSE_UNTRACKED_DIRS; - - if (include_ignored_files) - opts.flags |= GIT_STATUS_OPT_INCLUDE_IGNORED | - GIT_STATUS_OPT_RECURSE_IGNORED_DIRS; - - error = git_status_foreach_ext(repo, &opts, is_dirty_cb, NULL); - - if (error == GIT_PASSTHROUGH) - return 0; - - if (!error) - return create_error(GIT_ENOTFOUND, "There is nothing to stash."); - - return error; -} - -static int reset_index_and_workdir( - git_repository *repo, - git_commit *commit, - bool remove_untracked, - bool remove_ignored) -{ - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - - opts.checkout_strategy = GIT_CHECKOUT_FORCE; - - if (remove_untracked) - opts.checkout_strategy |= GIT_CHECKOUT_REMOVE_UNTRACKED; - - if (remove_ignored) - opts.checkout_strategy |= GIT_CHECKOUT_REMOVE_IGNORED; - - return git_checkout_tree(repo, (git_object *)commit, &opts); -} - -int git_stash_save( - git_oid *out, - git_repository *repo, - const git_signature *stasher, - const char *message, - uint32_t flags) -{ - git_index *index = NULL; - git_commit *b_commit = NULL, *i_commit = NULL, *u_commit = NULL; - git_buf msg = GIT_BUF_INIT; - int error; - - assert(out && repo && stasher); - - if ((error = git_repository__ensure_not_bare(repo, "stash save")) < 0) - return error; - - if ((error = retrieve_base_commit_and_message(&b_commit, &msg, repo)) < 0) - goto cleanup; - - if ((error = ensure_there_are_changes_to_stash( - repo, - (flags & GIT_STASH_INCLUDE_UNTRACKED) != 0, - (flags & GIT_STASH_INCLUDE_IGNORED) != 0)) < 0) - goto cleanup; - - if ((error = git_repository_index(&index, repo)) < 0) - goto cleanup; - - if ((error = commit_index( - &i_commit, index, stasher, git_buf_cstr(&msg), b_commit)) < 0) - goto cleanup; - - if ((flags & (GIT_STASH_INCLUDE_UNTRACKED | GIT_STASH_INCLUDE_IGNORED)) && - (error = commit_untracked( - &u_commit, index, stasher, git_buf_cstr(&msg), - i_commit, flags)) < 0) - goto cleanup; - - if ((error = prepare_worktree_commit_message(&msg, message)) < 0) - goto cleanup; - - if ((error = commit_worktree( - out, index, stasher, git_buf_cstr(&msg), - i_commit, b_commit, u_commit)) < 0) - goto cleanup; - - git_buf_rtrim(&msg); - - if ((error = update_reflog(out, repo, git_buf_cstr(&msg))) < 0) - goto cleanup; - - if ((error = reset_index_and_workdir( - repo, - ((flags & GIT_STASH_KEEP_INDEX) != 0) ? i_commit : b_commit, - (flags & GIT_STASH_INCLUDE_UNTRACKED) != 0, - (flags & GIT_STASH_INCLUDE_IGNORED) != 0)) < 0) - goto cleanup; - -cleanup: - - git_buf_free(&msg); - git_commit_free(i_commit); - git_commit_free(b_commit); - git_commit_free(u_commit); - git_index_free(index); - - return error; -} - -static int retrieve_stash_commit( - git_commit **commit, - git_repository *repo, - size_t index) -{ - git_reference *stash = NULL; - git_reflog *reflog = NULL; - int error; - size_t max; - const git_reflog_entry *entry; - - if ((error = git_reference_lookup(&stash, repo, GIT_REFS_STASH_FILE)) < 0) - goto cleanup; - - if ((error = git_reflog_read(&reflog, repo, GIT_REFS_STASH_FILE)) < 0) - goto cleanup; - - max = git_reflog_entrycount(reflog); - if (!max || index > max - 1) { - error = GIT_ENOTFOUND; - giterr_set(GITERR_STASH, "No stashed state at position %" PRIuZ, index); - goto cleanup; - } - - entry = git_reflog_entry_byindex(reflog, index); - if ((error = git_commit_lookup(commit, repo, git_reflog_entry_id_new(entry))) < 0) - goto cleanup; - -cleanup: - git_reference_free(stash); - git_reflog_free(reflog); - return error; -} - -static int retrieve_stash_trees( - git_tree **out_stash_tree, - git_tree **out_base_tree, - git_tree **out_index_tree, - git_tree **out_index_parent_tree, - git_tree **out_untracked_tree, - git_commit *stash_commit) -{ - git_tree *stash_tree = NULL; - git_commit *base_commit = NULL; - git_tree *base_tree = NULL; - git_commit *index_commit = NULL; - git_tree *index_tree = NULL; - git_commit *index_parent_commit = NULL; - git_tree *index_parent_tree = NULL; - git_commit *untracked_commit = NULL; - git_tree *untracked_tree = NULL; - int error; - - if ((error = git_commit_tree(&stash_tree, stash_commit)) < 0) - goto cleanup; - - if ((error = git_commit_parent(&base_commit, stash_commit, 0)) < 0) - goto cleanup; - if ((error = git_commit_tree(&base_tree, base_commit)) < 0) - goto cleanup; - - if ((error = git_commit_parent(&index_commit, stash_commit, 1)) < 0) - goto cleanup; - if ((error = git_commit_tree(&index_tree, index_commit)) < 0) - goto cleanup; - - if ((error = git_commit_parent(&index_parent_commit, index_commit, 0)) < 0) - goto cleanup; - if ((error = git_commit_tree(&index_parent_tree, index_parent_commit)) < 0) - goto cleanup; - - if (git_commit_parentcount(stash_commit) == 3) { - if ((error = git_commit_parent(&untracked_commit, stash_commit, 2)) < 0) - goto cleanup; - if ((error = git_commit_tree(&untracked_tree, untracked_commit)) < 0) - goto cleanup; - } - - *out_stash_tree = stash_tree; - *out_base_tree = base_tree; - *out_index_tree = index_tree; - *out_index_parent_tree = index_parent_tree; - *out_untracked_tree = untracked_tree; - -cleanup: - git_commit_free(untracked_commit); - git_commit_free(index_parent_commit); - git_commit_free(index_commit); - git_commit_free(base_commit); - if (error < 0) { - git_tree_free(stash_tree); - git_tree_free(base_tree); - git_tree_free(index_tree); - git_tree_free(index_parent_tree); - git_tree_free(untracked_tree); - } - return error; -} - -static int merge_indexes( - git_index **out, - git_repository *repo, - git_tree *ancestor_tree, - git_index *ours_index, - git_index *theirs_index) -{ - git_iterator *ancestor = NULL, *ours = NULL, *theirs = NULL; - git_iterator_options iter_opts = GIT_ITERATOR_OPTIONS_INIT; - int error; - - iter_opts.flags = GIT_ITERATOR_DONT_IGNORE_CASE; - - if ((error = git_iterator_for_tree(&ancestor, ancestor_tree, &iter_opts)) < 0 || - (error = git_iterator_for_index(&ours, repo, ours_index, &iter_opts)) < 0 || - (error = git_iterator_for_index(&theirs, repo, theirs_index, &iter_opts)) < 0) - goto done; - - error = git_merge__iterators(out, repo, ancestor, ours, theirs, NULL); - -done: - git_iterator_free(ancestor); - git_iterator_free(ours); - git_iterator_free(theirs); - return error; -} - -static int merge_index_and_tree( - git_index **out, - git_repository *repo, - git_tree *ancestor_tree, - git_index *ours_index, - git_tree *theirs_tree) -{ - git_iterator *ancestor = NULL, *ours = NULL, *theirs = NULL; - git_iterator_options iter_opts = GIT_ITERATOR_OPTIONS_INIT; - int error; - - iter_opts.flags = GIT_ITERATOR_DONT_IGNORE_CASE; - - if ((error = git_iterator_for_tree(&ancestor, ancestor_tree, &iter_opts)) < 0 || - (error = git_iterator_for_index(&ours, repo, ours_index, &iter_opts)) < 0 || - (error = git_iterator_for_tree(&theirs, theirs_tree, &iter_opts)) < 0) - goto done; - - error = git_merge__iterators(out, repo, ancestor, ours, theirs, NULL); - -done: - git_iterator_free(ancestor); - git_iterator_free(ours); - git_iterator_free(theirs); - return error; -} - -static void normalize_apply_options( - git_stash_apply_options *opts, - const git_stash_apply_options *given_apply_opts) -{ - if (given_apply_opts != NULL) { - memcpy(opts, given_apply_opts, sizeof(git_stash_apply_options)); - } else { - git_stash_apply_options default_apply_opts = GIT_STASH_APPLY_OPTIONS_INIT; - memcpy(opts, &default_apply_opts, sizeof(git_stash_apply_options)); - } - - if ((opts->checkout_options.checkout_strategy & (GIT_CHECKOUT_SAFE | GIT_CHECKOUT_FORCE)) == 0) - opts->checkout_options.checkout_strategy = GIT_CHECKOUT_SAFE; - - if (!opts->checkout_options.our_label) - opts->checkout_options.our_label = "Updated upstream"; - - if (!opts->checkout_options.their_label) - opts->checkout_options.their_label = "Stashed changes"; -} - -int git_stash_apply_init_options(git_stash_apply_options *opts, unsigned int version) -{ - GIT_INIT_STRUCTURE_FROM_TEMPLATE( - opts, version, git_stash_apply_options, GIT_STASH_APPLY_OPTIONS_INIT); - return 0; -} - -#define NOTIFY_PROGRESS(opts, progress_type) \ - do { \ - if ((opts).progress_cb && \ - (error = (opts).progress_cb((progress_type), (opts).progress_payload))) { \ - error = (error < 0) ? error : -1; \ - goto cleanup; \ - } \ - } while(false); - -static int ensure_clean_index(git_repository *repo, git_index *index) -{ - git_tree *head_tree = NULL; - git_diff *index_diff = NULL; - int error = 0; - - if ((error = git_repository_head_tree(&head_tree, repo)) < 0 || - (error = git_diff_tree_to_index( - &index_diff, repo, head_tree, index, NULL)) < 0) - goto done; - - if (git_diff_num_deltas(index_diff) > 0) { - giterr_set(GITERR_STASH, "%" PRIuZ " uncommitted changes exist in the index", - git_diff_num_deltas(index_diff)); - error = GIT_EUNCOMMITTED; - } - -done: - git_diff_free(index_diff); - git_tree_free(head_tree); - return error; -} - -static int stage_new_file(const git_index_entry **entries, void *data) -{ - git_index *index = data; - - if(entries[0] == NULL) - return git_index_add(index, entries[1]); - else - return git_index_add(index, entries[0]); -} - -static int stage_new_files( - git_index **out, - git_tree *parent_tree, - git_tree *tree) -{ - git_iterator *iterators[2] = { NULL, NULL }; - git_iterator_options iterator_options = GIT_ITERATOR_OPTIONS_INIT; - git_index *index = NULL; - int error; - - if ((error = git_index_new(&index)) < 0 || - (error = git_iterator_for_tree( - &iterators[0], parent_tree, &iterator_options)) < 0 || - (error = git_iterator_for_tree( - &iterators[1], tree, &iterator_options)) < 0) - goto done; - - error = git_iterator_walk(iterators, 2, stage_new_file, index); - -done: - if (error < 0) - git_index_free(index); - else - *out = index; - - git_iterator_free(iterators[0]); - git_iterator_free(iterators[1]); - - return error; -} - -int git_stash_apply( - git_repository *repo, - size_t index, - const git_stash_apply_options *given_opts) -{ - git_stash_apply_options opts; - unsigned int checkout_strategy; - git_commit *stash_commit = NULL; - git_tree *stash_tree = NULL; - git_tree *stash_parent_tree = NULL; - git_tree *index_tree = NULL; - git_tree *index_parent_tree = NULL; - git_tree *untracked_tree = NULL; - git_index *stash_adds = NULL; - git_index *repo_index = NULL; - git_index *unstashed_index = NULL; - git_index *modified_index = NULL; - git_index *untracked_index = NULL; - int error; - - GITERR_CHECK_VERSION(given_opts, GIT_STASH_APPLY_OPTIONS_VERSION, "git_stash_apply_options"); - - normalize_apply_options(&opts, given_opts); - checkout_strategy = opts.checkout_options.checkout_strategy; - - NOTIFY_PROGRESS(opts, GIT_STASH_APPLY_PROGRESS_LOADING_STASH); - - /* Retrieve commit corresponding to the given stash */ - if ((error = retrieve_stash_commit(&stash_commit, repo, index)) < 0) - goto cleanup; - - /* Retrieve all trees in the stash */ - if ((error = retrieve_stash_trees( - &stash_tree, &stash_parent_tree, &index_tree, - &index_parent_tree, &untracked_tree, stash_commit)) < 0) - goto cleanup; - - /* Load repo index */ - if ((error = git_repository_index(&repo_index, repo)) < 0) - goto cleanup; - - NOTIFY_PROGRESS(opts, GIT_STASH_APPLY_PROGRESS_ANALYZE_INDEX); - - if ((error = ensure_clean_index(repo, repo_index)) < 0) - goto cleanup; - - /* Restore index if required */ - if ((opts.flags & GIT_STASH_APPLY_REINSTATE_INDEX) && - git_oid_cmp(git_tree_id(stash_parent_tree), git_tree_id(index_tree))) { - - if ((error = merge_index_and_tree( - &unstashed_index, repo, index_parent_tree, repo_index, index_tree)) < 0) - goto cleanup; - - if (git_index_has_conflicts(unstashed_index)) { - error = GIT_ECONFLICT; - goto cleanup; - } - - /* Otherwise, stage any new files in the stash tree. (Note: their - * previously unstaged contents are staged, not the previously staged.) - */ - } else if ((opts.flags & GIT_STASH_APPLY_REINSTATE_INDEX) == 0) { - if ((error = stage_new_files( - &stash_adds, stash_parent_tree, stash_tree)) < 0 || - (error = merge_indexes( - &unstashed_index, repo, stash_parent_tree, repo_index, stash_adds)) < 0) - goto cleanup; - } - - NOTIFY_PROGRESS(opts, GIT_STASH_APPLY_PROGRESS_ANALYZE_MODIFIED); - - /* Restore modified files in workdir */ - if ((error = merge_index_and_tree( - &modified_index, repo, stash_parent_tree, repo_index, stash_tree)) < 0) - goto cleanup; - - /* If applicable, restore untracked / ignored files in workdir */ - if (untracked_tree) { - NOTIFY_PROGRESS(opts, GIT_STASH_APPLY_PROGRESS_ANALYZE_UNTRACKED); - - if ((error = merge_index_and_tree(&untracked_index, repo, NULL, repo_index, untracked_tree)) < 0) - goto cleanup; - } - - if (untracked_index) { - opts.checkout_options.checkout_strategy |= GIT_CHECKOUT_DONT_UPDATE_INDEX; - - NOTIFY_PROGRESS(opts, GIT_STASH_APPLY_PROGRESS_CHECKOUT_UNTRACKED); - - if ((error = git_checkout_index(repo, untracked_index, &opts.checkout_options)) < 0) - goto cleanup; - - opts.checkout_options.checkout_strategy = checkout_strategy; - } - - - /* If there are conflicts in the modified index, then we need to actually - * check that out as the repo's index. Otherwise, we don't update the - * index. - */ - - if (!git_index_has_conflicts(modified_index)) - opts.checkout_options.checkout_strategy |= GIT_CHECKOUT_DONT_UPDATE_INDEX; - - /* Check out the modified index using the existing repo index as baseline, - * so that existing modifications in the index can be rewritten even when - * checking out safely. - */ - opts.checkout_options.baseline_index = repo_index; - - NOTIFY_PROGRESS(opts, GIT_STASH_APPLY_PROGRESS_CHECKOUT_MODIFIED); - - if ((error = git_checkout_index(repo, modified_index, &opts.checkout_options)) < 0) - goto cleanup; - - if (unstashed_index && !git_index_has_conflicts(modified_index)) { - if ((error = git_index_read_index(repo_index, unstashed_index)) < 0) - goto cleanup; - } - - NOTIFY_PROGRESS(opts, GIT_STASH_APPLY_PROGRESS_DONE); - - error = git_index_write(repo_index); - -cleanup: - git_index_free(untracked_index); - git_index_free(modified_index); - git_index_free(unstashed_index); - git_index_free(stash_adds); - git_index_free(repo_index); - git_tree_free(untracked_tree); - git_tree_free(index_parent_tree); - git_tree_free(index_tree); - git_tree_free(stash_parent_tree); - git_tree_free(stash_tree); - git_commit_free(stash_commit); - return error; -} - -int git_stash_foreach( - git_repository *repo, - git_stash_cb callback, - void *payload) -{ - git_reference *stash; - git_reflog *reflog = NULL; - int error; - size_t i, max; - const git_reflog_entry *entry; - - error = git_reference_lookup(&stash, repo, GIT_REFS_STASH_FILE); - if (error == GIT_ENOTFOUND) { - giterr_clear(); - return 0; - } - if (error < 0) - goto cleanup; - - if ((error = git_reflog_read(&reflog, repo, GIT_REFS_STASH_FILE)) < 0) - goto cleanup; - - max = git_reflog_entrycount(reflog); - for (i = 0; i < max; i++) { - entry = git_reflog_entry_byindex(reflog, i); - - error = callback(i, - git_reflog_entry_message(entry), - git_reflog_entry_id_new(entry), - payload); - - if (error) { - giterr_set_after_callback(error); - break; - } - } - -cleanup: - git_reference_free(stash); - git_reflog_free(reflog); - return error; -} - -int git_stash_drop( - git_repository *repo, - size_t index) -{ - git_transaction *tx; - git_reference *stash = NULL; - git_reflog *reflog = NULL; - size_t max; - int error; - - if ((error = git_transaction_new(&tx, repo)) < 0) - return error; - - if ((error = git_transaction_lock_ref(tx, GIT_REFS_STASH_FILE)) < 0) - goto cleanup; - - if ((error = git_reference_lookup(&stash, repo, GIT_REFS_STASH_FILE)) < 0) - goto cleanup; - - if ((error = git_reflog_read(&reflog, repo, GIT_REFS_STASH_FILE)) < 0) - goto cleanup; - - max = git_reflog_entrycount(reflog); - - if (!max || index > max - 1) { - error = GIT_ENOTFOUND; - giterr_set(GITERR_STASH, "No stashed state at position %" PRIuZ, index); - goto cleanup; - } - - if ((error = git_reflog_drop(reflog, index, true)) < 0) - goto cleanup; - - if ((error = git_transaction_set_reflog(tx, GIT_REFS_STASH_FILE, reflog)) < 0) - goto cleanup; - - if (max == 1) { - if ((error = git_transaction_remove(tx, GIT_REFS_STASH_FILE)) < 0) - goto cleanup; - } else if (index == 0) { - const git_reflog_entry *entry; - - entry = git_reflog_entry_byindex(reflog, 0); - if ((error = git_transaction_set_target(tx, GIT_REFS_STASH_FILE, &entry->oid_cur, NULL, NULL)) < 0) - goto cleanup; - } - - error = git_transaction_commit(tx); - -cleanup: - git_reference_free(stash); - git_transaction_free(tx); - git_reflog_free(reflog); - return error; -} - -int git_stash_pop( - git_repository *repo, - size_t index, - const git_stash_apply_options *options) -{ - int error; - - if ((error = git_stash_apply(repo, index, options)) < 0) - return error; - - return git_stash_drop(repo, index); -} diff --git a/vendor/libgit2/src/status.c b/vendor/libgit2/src/status.c deleted file mode 100644 index b206b0e2f..000000000 --- a/vendor/libgit2/src/status.c +++ /dev/null @@ -1,564 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "common.h" -#include "git2.h" -#include "fileops.h" -#include "hash.h" -#include "vector.h" -#include "tree.h" -#include "status.h" -#include "git2/status.h" -#include "repository.h" -#include "ignore.h" -#include "index.h" - -#include "git2/diff.h" -#include "diff.h" - -static unsigned int index_delta2status(const git_diff_delta *head2idx) -{ - git_status_t st = GIT_STATUS_CURRENT; - - switch (head2idx->status) { - case GIT_DELTA_ADDED: - case GIT_DELTA_COPIED: - st = GIT_STATUS_INDEX_NEW; - break; - case GIT_DELTA_DELETED: - st = GIT_STATUS_INDEX_DELETED; - break; - case GIT_DELTA_MODIFIED: - st = GIT_STATUS_INDEX_MODIFIED; - break; - case GIT_DELTA_RENAMED: - st = GIT_STATUS_INDEX_RENAMED; - - if (!git_oid_equal(&head2idx->old_file.id, &head2idx->new_file.id)) - st |= GIT_STATUS_INDEX_MODIFIED; - break; - case GIT_DELTA_TYPECHANGE: - st = GIT_STATUS_INDEX_TYPECHANGE; - break; - case GIT_DELTA_CONFLICTED: - st = GIT_STATUS_CONFLICTED; - break; - default: - break; - } - - return st; -} - -static unsigned int workdir_delta2status( - git_diff *diff, git_diff_delta *idx2wd) -{ - git_status_t st = GIT_STATUS_CURRENT; - - switch (idx2wd->status) { - case GIT_DELTA_ADDED: - case GIT_DELTA_COPIED: - case GIT_DELTA_UNTRACKED: - st = GIT_STATUS_WT_NEW; - break; - case GIT_DELTA_UNREADABLE: - st = GIT_STATUS_WT_UNREADABLE; - break; - case GIT_DELTA_DELETED: - st = GIT_STATUS_WT_DELETED; - break; - case GIT_DELTA_MODIFIED: - st = GIT_STATUS_WT_MODIFIED; - break; - case GIT_DELTA_IGNORED: - st = GIT_STATUS_IGNORED; - break; - case GIT_DELTA_RENAMED: - st = GIT_STATUS_WT_RENAMED; - - if (!git_oid_equal(&idx2wd->old_file.id, &idx2wd->new_file.id)) { - /* if OIDs don't match, we might need to calculate them now to - * discern between RENAMED vs RENAMED+MODIFED - */ - if (git_oid_iszero(&idx2wd->old_file.id) && - diff->old_src == GIT_ITERATOR_TYPE_WORKDIR && - !git_diff__oid_for_file( - &idx2wd->old_file.id, diff, idx2wd->old_file.path, - idx2wd->old_file.mode, idx2wd->old_file.size)) - idx2wd->old_file.flags |= GIT_DIFF_FLAG_VALID_ID; - - if (git_oid_iszero(&idx2wd->new_file.id) && - diff->new_src == GIT_ITERATOR_TYPE_WORKDIR && - !git_diff__oid_for_file( - &idx2wd->new_file.id, diff, idx2wd->new_file.path, - idx2wd->new_file.mode, idx2wd->new_file.size)) - idx2wd->new_file.flags |= GIT_DIFF_FLAG_VALID_ID; - - if (!git_oid_equal(&idx2wd->old_file.id, &idx2wd->new_file.id)) - st |= GIT_STATUS_WT_MODIFIED; - } - break; - case GIT_DELTA_TYPECHANGE: - st = GIT_STATUS_WT_TYPECHANGE; - break; - case GIT_DELTA_CONFLICTED: - st = GIT_STATUS_CONFLICTED; - break; - default: - break; - } - - return st; -} - -static bool status_is_included( - git_status_list *status, - git_diff_delta *head2idx, - git_diff_delta *idx2wd) -{ - if (!(status->opts.flags & GIT_STATUS_OPT_EXCLUDE_SUBMODULES)) - return 1; - - /* if excluding submodules and this is a submodule everywhere */ - if (head2idx) { - if (head2idx->status != GIT_DELTA_ADDED && - head2idx->old_file.mode != GIT_FILEMODE_COMMIT) - return 1; - if (head2idx->status != GIT_DELTA_DELETED && - head2idx->new_file.mode != GIT_FILEMODE_COMMIT) - return 1; - } - if (idx2wd) { - if (idx2wd->status != GIT_DELTA_ADDED && - idx2wd->old_file.mode != GIT_FILEMODE_COMMIT) - return 1; - if (idx2wd->status != GIT_DELTA_DELETED && - idx2wd->new_file.mode != GIT_FILEMODE_COMMIT) - return 1; - } - - /* only get here if every valid mode is GIT_FILEMODE_COMMIT */ - return 0; -} - -static git_status_t status_compute( - git_status_list *status, - git_diff_delta *head2idx, - git_diff_delta *idx2wd) -{ - git_status_t st = GIT_STATUS_CURRENT; - - if (head2idx) - st |= index_delta2status(head2idx); - - if (idx2wd) - st |= workdir_delta2status(status->idx2wd, idx2wd); - - return st; -} - -static int status_collect( - git_diff_delta *head2idx, - git_diff_delta *idx2wd, - void *payload) -{ - git_status_list *status = payload; - git_status_entry *status_entry; - - if (!status_is_included(status, head2idx, idx2wd)) - return 0; - - status_entry = git__malloc(sizeof(git_status_entry)); - GITERR_CHECK_ALLOC(status_entry); - - status_entry->status = status_compute(status, head2idx, idx2wd); - status_entry->head_to_index = head2idx; - status_entry->index_to_workdir = idx2wd; - - return git_vector_insert(&status->paired, status_entry); -} - -GIT_INLINE(int) status_entry_cmp_base( - const void *a, - const void *b, - int (*strcomp)(const char *a, const char *b)) -{ - const git_status_entry *entry_a = a; - const git_status_entry *entry_b = b; - const git_diff_delta *delta_a, *delta_b; - - delta_a = entry_a->index_to_workdir ? entry_a->index_to_workdir : - entry_a->head_to_index; - delta_b = entry_b->index_to_workdir ? entry_b->index_to_workdir : - entry_b->head_to_index; - - if (!delta_a && delta_b) - return -1; - if (delta_a && !delta_b) - return 1; - if (!delta_a && !delta_b) - return 0; - - return strcomp(delta_a->new_file.path, delta_b->new_file.path); -} - -static int status_entry_icmp(const void *a, const void *b) -{ - return status_entry_cmp_base(a, b, git__strcasecmp); -} - -static int status_entry_cmp(const void *a, const void *b) -{ - return status_entry_cmp_base(a, b, git__strcmp); -} - -static git_status_list *git_status_list_alloc(git_index *index) -{ - git_status_list *status = NULL; - int (*entrycmp)(const void *a, const void *b); - - if (!(status = git__calloc(1, sizeof(git_status_list)))) - return NULL; - - entrycmp = index->ignore_case ? status_entry_icmp : status_entry_cmp; - - if (git_vector_init(&status->paired, 0, entrycmp) < 0) { - git__free(status); - return NULL; - } - - return status; -} - -static int status_validate_options(const git_status_options *opts) -{ - if (!opts) - return 0; - - GITERR_CHECK_VERSION(opts, GIT_STATUS_OPTIONS_VERSION, "git_status_options"); - - if (opts->show > GIT_STATUS_SHOW_WORKDIR_ONLY) { - giterr_set(GITERR_INVALID, "Unknown status 'show' option"); - return -1; - } - - if ((opts->flags & GIT_STATUS_OPT_NO_REFRESH) != 0 && - (opts->flags & GIT_STATUS_OPT_UPDATE_INDEX) != 0) { - giterr_set(GITERR_INVALID, "Updating index from status " - "is not allowed when index refresh is disabled"); - return -1; - } - - return 0; -} - -int git_status_list_new( - git_status_list **out, - git_repository *repo, - const git_status_options *opts) -{ - git_index *index = NULL; - git_status_list *status = NULL; - git_diff_options diffopt = GIT_DIFF_OPTIONS_INIT; - git_diff_find_options findopt = GIT_DIFF_FIND_OPTIONS_INIT; - git_tree *head = NULL; - git_status_show_t show = - opts ? opts->show : GIT_STATUS_SHOW_INDEX_AND_WORKDIR; - int error = 0; - unsigned int flags = opts ? opts->flags : GIT_STATUS_OPT_DEFAULTS; - - *out = NULL; - - if (status_validate_options(opts) < 0) - return -1; - - if ((error = git_repository__ensure_not_bare(repo, "status")) < 0 || - (error = git_repository_index(&index, repo)) < 0) - return error; - - /* if there is no HEAD, that's okay - we'll make an empty iterator */ - if ((error = git_repository_head_tree(&head, repo)) < 0) { - if (error != GIT_ENOTFOUND && error != GIT_EUNBORNBRANCH) - goto done; - giterr_clear(); - } - - /* refresh index from disk unless prevented */ - if ((flags & GIT_STATUS_OPT_NO_REFRESH) == 0 && - git_index_read(index, false) < 0) - giterr_clear(); - - status = git_status_list_alloc(index); - GITERR_CHECK_ALLOC(status); - - if (opts) { - memcpy(&status->opts, opts, sizeof(git_status_options)); - memcpy(&diffopt.pathspec, &opts->pathspec, sizeof(diffopt.pathspec)); - } - - diffopt.flags = GIT_DIFF_INCLUDE_TYPECHANGE; - findopt.flags = GIT_DIFF_FIND_FOR_UNTRACKED; - - if ((flags & GIT_STATUS_OPT_INCLUDE_UNTRACKED) != 0) - diffopt.flags = diffopt.flags | GIT_DIFF_INCLUDE_UNTRACKED; - if ((flags & GIT_STATUS_OPT_INCLUDE_IGNORED) != 0) - diffopt.flags = diffopt.flags | GIT_DIFF_INCLUDE_IGNORED; - if ((flags & GIT_STATUS_OPT_INCLUDE_UNMODIFIED) != 0) - diffopt.flags = diffopt.flags | GIT_DIFF_INCLUDE_UNMODIFIED; - if ((flags & GIT_STATUS_OPT_RECURSE_UNTRACKED_DIRS) != 0) - diffopt.flags = diffopt.flags | GIT_DIFF_RECURSE_UNTRACKED_DIRS; - if ((flags & GIT_STATUS_OPT_DISABLE_PATHSPEC_MATCH) != 0) - diffopt.flags = diffopt.flags | GIT_DIFF_DISABLE_PATHSPEC_MATCH; - if ((flags & GIT_STATUS_OPT_RECURSE_IGNORED_DIRS) != 0) - diffopt.flags = diffopt.flags | GIT_DIFF_RECURSE_IGNORED_DIRS; - if ((flags & GIT_STATUS_OPT_EXCLUDE_SUBMODULES) != 0) - diffopt.flags = diffopt.flags | GIT_DIFF_IGNORE_SUBMODULES; - if ((flags & GIT_STATUS_OPT_UPDATE_INDEX) != 0) - diffopt.flags = diffopt.flags | GIT_DIFF_UPDATE_INDEX; - if ((flags & GIT_STATUS_OPT_INCLUDE_UNREADABLE) != 0) - diffopt.flags = diffopt.flags | GIT_DIFF_INCLUDE_UNREADABLE; - if ((flags & GIT_STATUS_OPT_INCLUDE_UNREADABLE_AS_UNTRACKED) != 0) - diffopt.flags = diffopt.flags | GIT_DIFF_INCLUDE_UNREADABLE_AS_UNTRACKED; - - if ((flags & GIT_STATUS_OPT_RENAMES_FROM_REWRITES) != 0) - findopt.flags = findopt.flags | - GIT_DIFF_FIND_AND_BREAK_REWRITES | - GIT_DIFF_FIND_RENAMES_FROM_REWRITES | - GIT_DIFF_BREAK_REWRITES_FOR_RENAMES_ONLY; - - if (show != GIT_STATUS_SHOW_WORKDIR_ONLY) { - if ((error = git_diff_tree_to_index( - &status->head2idx, repo, head, index, &diffopt)) < 0) - goto done; - - if ((flags & GIT_STATUS_OPT_RENAMES_HEAD_TO_INDEX) != 0 && - (error = git_diff_find_similar(status->head2idx, &findopt)) < 0) - goto done; - } - - if (show != GIT_STATUS_SHOW_INDEX_ONLY) { - if ((error = git_diff_index_to_workdir( - &status->idx2wd, repo, index, &diffopt)) < 0) { - goto done; - } - - if ((flags & GIT_STATUS_OPT_RENAMES_INDEX_TO_WORKDIR) != 0 && - (error = git_diff_find_similar(status->idx2wd, &findopt)) < 0) - goto done; - } - - error = git_diff__paired_foreach( - status->head2idx, status->idx2wd, status_collect, status); - if (error < 0) - goto done; - - if (flags & GIT_STATUS_OPT_SORT_CASE_SENSITIVELY) - git_vector_set_cmp(&status->paired, status_entry_cmp); - if (flags & GIT_STATUS_OPT_SORT_CASE_INSENSITIVELY) - git_vector_set_cmp(&status->paired, status_entry_icmp); - - if ((flags & - (GIT_STATUS_OPT_RENAMES_HEAD_TO_INDEX | - GIT_STATUS_OPT_RENAMES_INDEX_TO_WORKDIR | - GIT_STATUS_OPT_SORT_CASE_SENSITIVELY | - GIT_STATUS_OPT_SORT_CASE_INSENSITIVELY)) != 0) - git_vector_sort(&status->paired); - -done: - if (error < 0) { - git_status_list_free(status); - status = NULL; - } - - *out = status; - - git_tree_free(head); - git_index_free(index); - - return error; -} - -size_t git_status_list_entrycount(git_status_list *status) -{ - assert(status); - - return status->paired.length; -} - -const git_status_entry *git_status_byindex(git_status_list *status, size_t i) -{ - assert(status); - - return git_vector_get(&status->paired, i); -} - -void git_status_list_free(git_status_list *status) -{ - if (status == NULL) - return; - - git_diff_free(status->head2idx); - git_diff_free(status->idx2wd); - - git_vector_free_deep(&status->paired); - - git__memzero(status, sizeof(*status)); - git__free(status); -} - -int git_status_foreach_ext( - git_repository *repo, - const git_status_options *opts, - git_status_cb cb, - void *payload) -{ - git_status_list *status; - const git_status_entry *status_entry; - size_t i; - int error = 0; - - if ((error = git_status_list_new(&status, repo, opts)) < 0) { - return error; - } - - git_vector_foreach(&status->paired, i, status_entry) { - const char *path = status_entry->head_to_index ? - status_entry->head_to_index->old_file.path : - status_entry->index_to_workdir->old_file.path; - - if ((error = cb(path, status_entry->status, payload)) != 0) { - giterr_set_after_callback(error); - break; - } - } - - git_status_list_free(status); - - return error; -} - -int git_status_foreach(git_repository *repo, git_status_cb cb, void *payload) -{ - return git_status_foreach_ext(repo, NULL, cb, payload); -} - -struct status_file_info { - char *expected; - unsigned int count; - unsigned int status; - int fnm_flags; - int ambiguous; -}; - -static int get_one_status(const char *path, unsigned int status, void *data) -{ - struct status_file_info *sfi = data; - int (*strcomp)(const char *a, const char *b); - - sfi->count++; - sfi->status = status; - - strcomp = (sfi->fnm_flags & FNM_CASEFOLD) ? git__strcasecmp : git__strcmp; - - if (sfi->count > 1 || - (strcomp(sfi->expected, path) != 0 && - p_fnmatch(sfi->expected, path, sfi->fnm_flags) != 0)) - { - sfi->ambiguous = true; - return GIT_EAMBIGUOUS; /* giterr_set will be done by caller */ - } - - return 0; -} - -int git_status_file( - unsigned int *status_flags, - git_repository *repo, - const char *path) -{ - int error; - git_status_options opts = GIT_STATUS_OPTIONS_INIT; - struct status_file_info sfi = {0}; - git_index *index; - - assert(status_flags && repo && path); - - if ((error = git_repository_index__weakptr(&index, repo)) < 0) - return error; - - if ((sfi.expected = git__strdup(path)) == NULL) - return -1; - if (index->ignore_case) - sfi.fnm_flags = FNM_CASEFOLD; - - opts.show = GIT_STATUS_SHOW_INDEX_AND_WORKDIR; - opts.flags = GIT_STATUS_OPT_INCLUDE_IGNORED | - GIT_STATUS_OPT_RECURSE_IGNORED_DIRS | - GIT_STATUS_OPT_INCLUDE_UNTRACKED | - GIT_STATUS_OPT_RECURSE_UNTRACKED_DIRS | - GIT_STATUS_OPT_INCLUDE_UNMODIFIED | - GIT_STATUS_OPT_DISABLE_PATHSPEC_MATCH; - opts.pathspec.count = 1; - opts.pathspec.strings = &sfi.expected; - - error = git_status_foreach_ext(repo, &opts, get_one_status, &sfi); - - if (error < 0 && sfi.ambiguous) { - giterr_set(GITERR_INVALID, - "Ambiguous path '%s' given to git_status_file", sfi.expected); - error = GIT_EAMBIGUOUS; - } - - if (!error && !sfi.count) { - giterr_set(GITERR_INVALID, - "Attempt to get status of nonexistent file '%s'", path); - error = GIT_ENOTFOUND; - } - - *status_flags = sfi.status; - - git__free(sfi.expected); - - return error; -} - -int git_status_should_ignore( - int *ignored, - git_repository *repo, - const char *path) -{ - return git_ignore_path_is_ignored(ignored, repo, path); -} - -int git_status_init_options(git_status_options *opts, unsigned int version) -{ - GIT_INIT_STRUCTURE_FROM_TEMPLATE( - opts, version, git_status_options, GIT_STATUS_OPTIONS_INIT); - return 0; -} - -int git_status_list_get_perfdata( - git_diff_perfdata *out, const git_status_list *status) -{ - assert(out); - GITERR_CHECK_VERSION(out, GIT_DIFF_PERFDATA_VERSION, "git_diff_perfdata"); - - out->stat_calls = 0; - out->oid_calculations = 0; - - if (status->head2idx) { - out->stat_calls += status->head2idx->perf.stat_calls; - out->oid_calculations += status->head2idx->perf.oid_calculations; - } - if (status->idx2wd) { - out->stat_calls += status->idx2wd->perf.stat_calls; - out->oid_calculations += status->idx2wd->perf.oid_calculations; - } - - return 0; -} - diff --git a/vendor/libgit2/src/status.h b/vendor/libgit2/src/status.h deleted file mode 100644 index 33008b89c..000000000 --- a/vendor/libgit2/src/status.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_status_h__ -#define INCLUDE_status_h__ - -#include "diff.h" -#include "git2/status.h" -#include "git2/diff.h" - -struct git_status_list { - git_status_options opts; - - git_diff *head2idx; - git_diff *idx2wd; - - git_vector paired; -}; - -#endif diff --git a/vendor/libgit2/src/stransport_stream.c b/vendor/libgit2/src/stransport_stream.c deleted file mode 100644 index 33b6c5c38..000000000 --- a/vendor/libgit2/src/stransport_stream.c +++ /dev/null @@ -1,286 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#ifdef GIT_SECURE_TRANSPORT - -#include -#include -#include - -#include "git2/transport.h" - -#include "socket_stream.h" -#include "curl_stream.h" - -int stransport_error(OSStatus ret) -{ - CFStringRef message; - - if (ret == noErr || ret == errSSLClosedGraceful) { - giterr_clear(); - return 0; - } - -#if !TARGET_OS_IPHONE - message = SecCopyErrorMessageString(ret, NULL); - GITERR_CHECK_ALLOC(message); - - giterr_set(GITERR_NET, "SecureTransport error: %s", CFStringGetCStringPtr(message, kCFStringEncodingUTF8)); - CFRelease(message); -#else - giterr_set(GITERR_NET, "SecureTransport error: OSStatus %d", (unsigned int)ret); -#endif - - return -1; -} - -typedef struct { - git_stream parent; - git_stream *io; - SSLContextRef ctx; - CFDataRef der_data; - git_cert_x509 cert_info; -} stransport_stream; - -int stransport_connect(git_stream *stream) -{ - stransport_stream *st = (stransport_stream *) stream; - int error; - SecTrustRef trust = NULL; - SecTrustResultType sec_res; - OSStatus ret; - - if ((error = git_stream_connect(st->io)) < 0) - return error; - - ret = SSLHandshake(st->ctx); - if (ret != errSSLServerAuthCompleted) { - giterr_set(GITERR_SSL, "unexpected return value from ssl handshake %d", ret); - return -1; - } - - if ((ret = SSLCopyPeerTrust(st->ctx, &trust)) != noErr) - goto on_error; - - if ((ret = SecTrustEvaluate(trust, &sec_res)) != noErr) - goto on_error; - - CFRelease(trust); - - if (sec_res == kSecTrustResultInvalid || sec_res == kSecTrustResultOtherError) { - giterr_set(GITERR_SSL, "internal security trust error"); - return -1; - } - - if (sec_res == kSecTrustResultDeny || sec_res == kSecTrustResultRecoverableTrustFailure || - sec_res == kSecTrustResultFatalTrustFailure) - return GIT_ECERTIFICATE; - - return 0; - -on_error: - if (trust) - CFRelease(trust); - - return stransport_error(ret); -} - -int stransport_certificate(git_cert **out, git_stream *stream) -{ - stransport_stream *st = (stransport_stream *) stream; - SecTrustRef trust = NULL; - SecCertificateRef sec_cert; - OSStatus ret; - - if ((ret = SSLCopyPeerTrust(st->ctx, &trust)) != noErr) - return stransport_error(ret); - - sec_cert = SecTrustGetCertificateAtIndex(trust, 0); - st->der_data = SecCertificateCopyData(sec_cert); - CFRelease(trust); - - if (st->der_data == NULL) { - giterr_set(GITERR_SSL, "retrieved invalid certificate data"); - return -1; - } - - st->cert_info.parent.cert_type = GIT_CERT_X509; - st->cert_info.data = (void *) CFDataGetBytePtr(st->der_data); - st->cert_info.len = CFDataGetLength(st->der_data); - - *out = (git_cert *)&st->cert_info; - return 0; -} - -int stransport_set_proxy(git_stream *stream, const char *proxy) -{ - stransport_stream *st = (stransport_stream *) stream; - - return git_stream_set_proxy(st->io, proxy); -} - -/* - * Contrary to typical network IO callbacks, Secure Transport write callback is - * expected to write *all* passed data, not just as much as it can, and any - * other case would be considered a failure. - * - * This behavior is actually not specified in the Apple documentation, but is - * required for things to work correctly (and incidentally, that's also how - * Apple implements it in its projects at opensource.apple.com). - * - * Libgit2 streams happen to already have this very behavior so this is just - * passthrough. - */ -static OSStatus write_cb(SSLConnectionRef conn, const void *data, size_t *len) -{ - git_stream *io = (git_stream *) conn; - - if (git_stream_write(io, data, *len, 0) < 0) { - return -36; /* "ioErr" from MacErrors.h which is not available on iOS */ - } - - return noErr; -} - -ssize_t stransport_write(git_stream *stream, const char *data, size_t len, int flags) -{ - stransport_stream *st = (stransport_stream *) stream; - size_t data_len, processed; - OSStatus ret; - - GIT_UNUSED(flags); - - data_len = len; - if ((ret = SSLWrite(st->ctx, data, data_len, &processed)) != noErr) - return stransport_error(ret); - - return processed; -} - -/* - * Contrary to typical network IO callbacks, Secure Transport read callback is - * expected to read *exactly* the requested number of bytes, not just as much - * as it can, and any other case would be considered a failure. - * - * This behavior is actually not specified in the Apple documentation, but is - * required for things to work correctly (and incidentally, that's also how - * Apple implements it in its projects at opensource.apple.com). - */ -static OSStatus read_cb(SSLConnectionRef conn, void *data, size_t *len) -{ - git_stream *io = (git_stream *) conn; - OSStatus error = noErr; - size_t off = 0; - ssize_t ret; - - do { - ret = git_stream_read(io, data + off, *len - off); - if (ret < 0) { - error = -36; /* "ioErr" from MacErrors.h which is not available on iOS */ - break; - } - if (ret == 0) { - error = errSSLClosedGraceful; - break; - } - - off += ret; - } while (off < *len); - - *len = off; - return error; -} - -ssize_t stransport_read(git_stream *stream, void *data, size_t len) -{ - stransport_stream *st = (stransport_stream *) stream; - size_t processed; - OSStatus ret; - - if ((ret = SSLRead(st->ctx, data, len, &processed)) != noErr) - return stransport_error(ret); - - return processed; -} - -int stransport_close(git_stream *stream) -{ - stransport_stream *st = (stransport_stream *) stream; - OSStatus ret; - - ret = SSLClose(st->ctx); - if (ret != noErr && ret != errSSLClosedGraceful) - return stransport_error(ret); - - return git_stream_close(st->io); -} - -void stransport_free(git_stream *stream) -{ - stransport_stream *st = (stransport_stream *) stream; - - git_stream_free(st->io); - CFRelease(st->ctx); - if (st->der_data) - CFRelease(st->der_data); - git__free(st); -} - -int git_stransport_stream_new(git_stream **out, const char *host, const char *port) -{ - stransport_stream *st; - int error; - OSStatus ret; - - assert(out && host); - - st = git__calloc(1, sizeof(stransport_stream)); - GITERR_CHECK_ALLOC(st); - -#ifdef GIT_CURL - error = git_curl_stream_new(&st->io, host, port); -#else - error = git_socket_stream_new(&st->io, host, port); -#endif - - if (error < 0){ - git__free(st); - return error; - } - - st->ctx = SSLCreateContext(NULL, kSSLClientSide, kSSLStreamType); - if (!st->ctx) { - giterr_set(GITERR_NET, "failed to create SSL context"); - return -1; - } - - if ((ret = SSLSetIOFuncs(st->ctx, read_cb, write_cb)) != noErr || - (ret = SSLSetConnection(st->ctx, st->io)) != noErr || - (ret = SSLSetSessionOption(st->ctx, kSSLSessionOptionBreakOnServerAuth, true)) != noErr || - (ret = SSLSetProtocolVersionMin(st->ctx, kTLSProtocol1)) != noErr || - (ret = SSLSetProtocolVersionMax(st->ctx, kTLSProtocol12)) != noErr || - (ret = SSLSetPeerDomainName(st->ctx, host, strlen(host))) != noErr) { - git_stream_free((git_stream *)st); - return stransport_error(ret); - } - - st->parent.version = GIT_STREAM_VERSION; - st->parent.encrypted = 1; - st->parent.proxy_support = git_stream_supports_proxy(st->io); - st->parent.connect = stransport_connect; - st->parent.certificate = stransport_certificate; - st->parent.set_proxy = stransport_set_proxy; - st->parent.read = stransport_read; - st->parent.write = stransport_write; - st->parent.close = stransport_close; - st->parent.free = stransport_free; - - *out = (git_stream *) st; - return 0; -} - -#endif diff --git a/vendor/libgit2/src/stransport_stream.h b/vendor/libgit2/src/stransport_stream.h deleted file mode 100644 index 714f90273..000000000 --- a/vendor/libgit2/src/stransport_stream.h +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_stransport_stream_h__ -#define INCLUDE_stransport_stream_h__ - -#include "git2/sys/stream.h" - -extern int git_stransport_stream_new(git_stream **out, const char *host, const char *port); - -#endif diff --git a/vendor/libgit2/src/stream.h b/vendor/libgit2/src/stream.h deleted file mode 100644 index 4692c7115..000000000 --- a/vendor/libgit2/src/stream.h +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_stream_h__ -#define INCLUDE_stream_h__ - -#include "common.h" -#include "git2/sys/stream.h" - -GIT_INLINE(int) git_stream_connect(git_stream *st) -{ - return st->connect(st); -} - -GIT_INLINE(int) git_stream_is_encrypted(git_stream *st) -{ - return st->encrypted; -} - -GIT_INLINE(int) git_stream_certificate(git_cert **out, git_stream *st) -{ - if (!st->encrypted) { - giterr_set(GITERR_INVALID, "an unencrypted stream does not have a certificate"); - return -1; - } - - return st->certificate(out, st); -} - -GIT_INLINE(int) git_stream_supports_proxy(git_stream *st) -{ - return st->proxy_support; -} - -GIT_INLINE(int) git_stream_set_proxy(git_stream *st, const char *proxy_url) -{ - if (!st->proxy_support) { - giterr_set(GITERR_INVALID, "proxy not supported on this stream"); - return -1; - } - - return st->set_proxy(st, proxy_url); -} - -GIT_INLINE(ssize_t) git_stream_read(git_stream *st, void *data, size_t len) -{ - return st->read(st, data, len); -} - -GIT_INLINE(ssize_t) git_stream_write(git_stream *st, const char *data, size_t len, int flags) -{ - return st->write(st, data, len, flags); -} - -GIT_INLINE(int) git_stream_close(git_stream *st) -{ - return st->close(st); -} - -GIT_INLINE(void) git_stream_free(git_stream *st) -{ - if (!st) - return; - - st->free(st); -} - -#endif diff --git a/vendor/libgit2/src/strmap.c b/vendor/libgit2/src/strmap.c deleted file mode 100644 index b26a13d1f..000000000 --- a/vendor/libgit2/src/strmap.c +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "strmap.h" - -int git_strmap_next( - void **data, - git_strmap_iter* iter, - git_strmap *map) -{ - if (!map) - return GIT_ERROR; - - while (*iter != git_strmap_end(map)) { - if (!(git_strmap_has_data(map, *iter))) { - ++(*iter); - continue; - } - - *data = git_strmap_value_at(map, *iter); - - ++(*iter); - - return GIT_OK; - } - - return GIT_ITEROVER; -} diff --git a/vendor/libgit2/src/strmap.h b/vendor/libgit2/src/strmap.h deleted file mode 100644 index 520984744..000000000 --- a/vendor/libgit2/src/strmap.h +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_strmap_h__ -#define INCLUDE_strmap_h__ - -#include "common.h" - -#define kmalloc git__malloc -#define kcalloc git__calloc -#define krealloc git__realloc -#define kreallocarray git__reallocarray -#define kfree git__free -#include "khash.h" - -__KHASH_TYPE(str, const char *, void *) -typedef khash_t(str) git_strmap; -typedef khiter_t git_strmap_iter; - -#define GIT__USE_STRMAP \ - __KHASH_IMPL(str, static kh_inline, const char *, void *, 1, kh_str_hash_func, kh_str_hash_equal) - -#define git_strmap_alloc(hp) \ - ((*(hp) = kh_init(str)) == NULL) ? giterr_set_oom(), -1 : 0 - -#define git_strmap_free(h) kh_destroy(str, h), h = NULL -#define git_strmap_clear(h) kh_clear(str, h) - -#define git_strmap_num_entries(h) kh_size(h) - -#define git_strmap_lookup_index(h, k) kh_get(str, h, k) -#define git_strmap_valid_index(h, idx) (idx != kh_end(h)) - -#define git_strmap_exists(h, k) (kh_get(str, h, k) != kh_end(h)) -#define git_strmap_has_data(h, idx) kh_exist(h, idx) - -#define git_strmap_key(h, idx) kh_key(h, idx) -#define git_strmap_value_at(h, idx) kh_val(h, idx) -#define git_strmap_set_value_at(h, idx, v) kh_val(h, idx) = v -#define git_strmap_delete_at(h, idx) kh_del(str, h, idx) - -#define git_strmap_insert(h, key, val, rval) do { \ - khiter_t __pos = kh_put(str, h, key, &rval); \ - if (rval >= 0) { \ - if (rval == 0) kh_key(h, __pos) = key; \ - kh_val(h, __pos) = val; \ - } } while (0) - -#define git_strmap_insert2(h, key, val, oldv, rval) do { \ - khiter_t __pos = kh_put(str, h, key, &rval); \ - if (rval >= 0) { \ - if (rval == 0) { \ - oldv = kh_val(h, __pos); \ - kh_key(h, __pos) = key; \ - } else { oldv = NULL; } \ - kh_val(h, __pos) = val; \ - } } while (0) - -#define git_strmap_delete(h, key) do { \ - khiter_t __pos = git_strmap_lookup_index(h, key); \ - if (git_strmap_valid_index(h, __pos)) \ - git_strmap_delete_at(h, __pos); } while (0) - -#define git_strmap_foreach kh_foreach -#define git_strmap_foreach_value kh_foreach_value - -#define git_strmap_begin kh_begin -#define git_strmap_end kh_end - -int git_strmap_next( - void **data, - git_strmap_iter* iter, - git_strmap *map); - -#endif diff --git a/vendor/libgit2/src/strnlen.h b/vendor/libgit2/src/strnlen.h deleted file mode 100644 index eecfe3c02..000000000 --- a/vendor/libgit2/src/strnlen.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_strlen_h__ -#define INCLUDE_strlen_h__ - -#if defined(__MINGW32__) || defined(__sun) || defined(__APPLE__) || defined(__MidnightBSD__) ||\ - (defined(_MSC_VER) && _MSC_VER < 1500) -# define NO_STRNLEN -#endif - -#ifdef NO_STRNLEN -GIT_INLINE(size_t) p_strnlen(const char *s, size_t maxlen) { - const char *end = memchr(s, 0, maxlen); - return end ? (size_t)(end - s) : maxlen; -} -#else -# define p_strnlen strnlen -#endif - -#endif diff --git a/vendor/libgit2/src/submodule.c b/vendor/libgit2/src/submodule.c deleted file mode 100644 index c903cf939..000000000 --- a/vendor/libgit2/src/submodule.c +++ /dev/null @@ -1,2078 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "common.h" -#include "git2/config.h" -#include "git2/sys/config.h" -#include "git2/types.h" -#include "git2/index.h" -#include "buffer.h" -#include "buf_text.h" -#include "vector.h" -#include "posix.h" -#include "config_file.h" -#include "config.h" -#include "repository.h" -#include "submodule.h" -#include "tree.h" -#include "iterator.h" -#include "path.h" -#include "index.h" - -#define GIT_MODULES_FILE ".gitmodules" - -static git_cvar_map _sm_update_map[] = { - {GIT_CVAR_STRING, "checkout", GIT_SUBMODULE_UPDATE_CHECKOUT}, - {GIT_CVAR_STRING, "rebase", GIT_SUBMODULE_UPDATE_REBASE}, - {GIT_CVAR_STRING, "merge", GIT_SUBMODULE_UPDATE_MERGE}, - {GIT_CVAR_STRING, "none", GIT_SUBMODULE_UPDATE_NONE}, - {GIT_CVAR_FALSE, NULL, GIT_SUBMODULE_UPDATE_NONE}, - {GIT_CVAR_TRUE, NULL, GIT_SUBMODULE_UPDATE_CHECKOUT}, -}; - -static git_cvar_map _sm_ignore_map[] = { - {GIT_CVAR_STRING, "none", GIT_SUBMODULE_IGNORE_NONE}, - {GIT_CVAR_STRING, "untracked", GIT_SUBMODULE_IGNORE_UNTRACKED}, - {GIT_CVAR_STRING, "dirty", GIT_SUBMODULE_IGNORE_DIRTY}, - {GIT_CVAR_STRING, "all", GIT_SUBMODULE_IGNORE_ALL}, - {GIT_CVAR_FALSE, NULL, GIT_SUBMODULE_IGNORE_NONE}, - {GIT_CVAR_TRUE, NULL, GIT_SUBMODULE_IGNORE_ALL}, -}; - -static git_cvar_map _sm_recurse_map[] = { - {GIT_CVAR_STRING, "on-demand", GIT_SUBMODULE_RECURSE_ONDEMAND}, - {GIT_CVAR_FALSE, NULL, GIT_SUBMODULE_RECURSE_NO}, - {GIT_CVAR_TRUE, NULL, GIT_SUBMODULE_RECURSE_YES}, -}; - -enum { - CACHE_OK = 0, - CACHE_REFRESH = 1, - CACHE_FLUSH = 2 -}; -enum { - GITMODULES_EXISTING = 0, - GITMODULES_CREATE = 1, -}; - -static kh_inline khint_t str_hash_no_trailing_slash(const char *s) -{ - khint_t h; - - for (h = 0; *s; ++s) - if (s[1] != '\0' || *s != '/') - h = (h << 5) - h + *s; - - return h; -} - -static kh_inline int str_equal_no_trailing_slash(const char *a, const char *b) -{ - size_t alen = a ? strlen(a) : 0; - size_t blen = b ? strlen(b) : 0; - - if (alen > 0 && a[alen - 1] == '/') - alen--; - if (blen > 0 && b[blen - 1] == '/') - blen--; - - return (alen == 0 && blen == 0) || - (alen == blen && strncmp(a, b, alen) == 0); -} - -__KHASH_IMPL( - str, static kh_inline, const char *, void *, 1, - str_hash_no_trailing_slash, str_equal_no_trailing_slash) - -static int submodule_alloc(git_submodule **out, git_repository *repo, const char *name); -static git_config_backend *open_gitmodules(git_repository *repo, int gitmod); -static git_config *gitmodules_snapshot(git_repository *repo); -static int get_url_base(git_buf *url, git_repository *repo); -static int lookup_head_remote_key(git_buf *remote_key, git_repository *repo); -static int submodule_load_each(const git_config_entry *entry, void *payload); -static int submodule_read_config(git_submodule *sm, git_config *cfg); -static int submodule_load_from_wd_lite(git_submodule *); -static void submodule_get_index_status(unsigned int *, git_submodule *); -static void submodule_get_wd_status(unsigned int *, git_submodule *, git_repository *, git_submodule_ignore_t); -static void submodule_update_from_index_entry(git_submodule *sm, const git_index_entry *ie); -static void submodule_update_from_head_data(git_submodule *sm, mode_t mode, const git_oid *id); - -static int submodule_cmp(const void *a, const void *b) -{ - return strcmp(((git_submodule *)a)->name, ((git_submodule *)b)->name); -} - -static int submodule_config_key_trunc_puts(git_buf *key, const char *suffix) -{ - ssize_t idx = git_buf_rfind(key, '.'); - git_buf_truncate(key, (size_t)(idx + 1)); - return git_buf_puts(key, suffix); -} - -/* - * PUBLIC APIS - */ - -static void submodule_set_lookup_error(int error, const char *name) -{ - if (!error) - return; - - giterr_set(GITERR_SUBMODULE, (error == GIT_ENOTFOUND) ? - "No submodule named '%s'" : - "Submodule '%s' has not been added yet", name); -} - -typedef struct { - const char *path; - char *name; -} fbp_data; - -static int find_by_path(const git_config_entry *entry, void *payload) -{ - fbp_data *data = payload; - - if (!strcmp(entry->value, data->path)) { - const char *fdot, *ldot; - fdot = strchr(entry->name, '.'); - ldot = strrchr(entry->name, '.'); - data->name = git__strndup(fdot + 1, ldot - fdot - 1); - GITERR_CHECK_ALLOC(data->name); - } - - return 0; -} - -/** - * Find out the name of a submodule from its path - */ -static int name_from_path(git_buf *out, git_config *cfg, const char *path) -{ - const char *key = "submodule\\..*\\.path"; - git_config_iterator *iter; - git_config_entry *entry; - int error; - - if ((error = git_config_iterator_glob_new(&iter, cfg, key)) < 0) - return error; - - while ((error = git_config_next(&entry, iter)) == 0) { - const char *fdot, *ldot; - /* TODO: this should maybe be strcasecmp on a case-insensitive fs */ - if (strcmp(path, entry->value) != 0) - continue; - - fdot = strchr(entry->name, '.'); - ldot = strrchr(entry->name, '.'); - - git_buf_clear(out); - git_buf_put(out, fdot + 1, ldot - fdot - 1); - goto cleanup; - } - - if (error == GIT_ITEROVER) { - giterr_set(GITERR_SUBMODULE, "could not find a submodule name for '%s'", path); - error = GIT_ENOTFOUND; - } - -cleanup: - git_config_iterator_free(iter); - return error; -} - -int git_submodule_lookup( - git_submodule **out, /* NULL if user only wants to test existence */ - git_repository *repo, - const char *name) /* trailing slash is allowed */ -{ - int error; - unsigned int location; - git_submodule *sm; - - assert(repo && name); - - if ((error = submodule_alloc(&sm, repo, name)) < 0) - return error; - - if ((error = git_submodule_reload(sm, false)) < 0) { - git_submodule_free(sm); - return error; - } - - if ((error = git_submodule_location(&location, sm)) < 0) { - git_submodule_free(sm); - return error; - } - - /* If it's not configured or we're looking by path */ - if (location == 0 || location == GIT_SUBMODULE_STATUS_IN_WD) { - git_config_backend *mods; - const char *pattern = "submodule\\..*\\.path"; - git_buf path = GIT_BUF_INIT; - fbp_data data = { NULL, NULL }; - - git_buf_puts(&path, name); - while (path.ptr[path.size-1] == '/') { - path.ptr[--path.size] = '\0'; - } - data.path = path.ptr; - - mods = open_gitmodules(repo, GITMODULES_EXISTING); - - if (mods) - error = git_config_file_foreach_match(mods, pattern, find_by_path, &data); - - git_config_file_free(mods); - - if (error < 0) { - git_submodule_free(sm); - git_buf_free(&path); - return error; - } - - if (data.name) { - git__free(sm->name); - sm->name = data.name; - sm->path = git_buf_detach(&path); - - /* Try to load again with the right name */ - if ((error = git_submodule_reload(sm, false)) < 0) { - git_submodule_free(sm); - return error; - } - } - - git_buf_free(&path); - } - - if ((error = git_submodule_location(&location, sm)) < 0) { - git_submodule_free(sm); - return error; - } - - /* If we still haven't found it, do the WD check */ - if (location == 0 || location == GIT_SUBMODULE_STATUS_IN_WD) { - git_submodule_free(sm); - error = GIT_ENOTFOUND; - - /* If it's not configured, we still check if there's a repo at the path */ - if (git_repository_workdir(repo)) { - git_buf path = GIT_BUF_INIT; - if (git_buf_join3(&path, - '/', git_repository_workdir(repo), name, DOT_GIT) < 0) - return -1; - - if (git_path_exists(path.ptr)) - error = GIT_EEXISTS; - - git_buf_free(&path); - } - - submodule_set_lookup_error(error, name); - return error; - } - - if (out) - *out = sm; - else - git_submodule_free(sm); - - return 0; -} - -static void submodule_free_dup(void *sm) -{ - git_submodule_free(sm); -} - -static int submodule_get_or_create(git_submodule **out, git_repository *repo, git_strmap *map, const char *name) -{ - int error = 0; - khiter_t pos; - git_submodule *sm = NULL; - - pos = git_strmap_lookup_index(map, name); - if (git_strmap_valid_index(map, pos)) { - sm = git_strmap_value_at(map, pos); - goto done; - } - - /* if the submodule doesn't exist yet in the map, create it */ - if ((error = submodule_alloc(&sm, repo, name)) < 0) - return error; - - pos = kh_put(str, map, sm->name, &error); - /* nobody can beat us to adding it */ - assert(error != 0); - if (error < 0) { - git_submodule_free(sm); - return error; - } - - git_strmap_set_value_at(map, pos, sm); - -done: - GIT_REFCOUNT_INC(sm); - *out = sm; - return 0; -} - -static int submodules_from_index(git_strmap *map, git_index *idx, git_config *cfg) -{ - int error; - git_iterator *i; - const git_index_entry *entry; - git_buf name = GIT_BUF_INIT; - - if ((error = git_iterator_for_index(&i, git_index_owner(idx), idx, NULL)) < 0) - return error; - - while (!(error = git_iterator_advance(&entry, i))) { - khiter_t pos = git_strmap_lookup_index(map, entry->path); - git_submodule *sm; - - git_buf_clear(&name); - if (!name_from_path(&name, cfg, entry->path)) { - git_strmap_lookup_index(map, name.ptr); - } - - if (git_strmap_valid_index(map, pos)) { - sm = git_strmap_value_at(map, pos); - - if (S_ISGITLINK(entry->mode)) - submodule_update_from_index_entry(sm, entry); - else - sm->flags |= GIT_SUBMODULE_STATUS__INDEX_NOT_SUBMODULE; - } else if (S_ISGITLINK(entry->mode)) { - if (!submodule_get_or_create(&sm, git_index_owner(idx), map, name.ptr ? name.ptr : entry->path)) { - submodule_update_from_index_entry(sm, entry); - git_submodule_free(sm); - } - } - } - - if (error == GIT_ITEROVER) - error = 0; - - git_buf_free(&name); - git_iterator_free(i); - - return error; -} - -static int submodules_from_head(git_strmap *map, git_tree *head, git_config *cfg) -{ - int error; - git_iterator *i; - const git_index_entry *entry; - git_buf name = GIT_BUF_INIT; - - if ((error = git_iterator_for_tree(&i, head, NULL)) < 0) - return error; - - while (!(error = git_iterator_advance(&entry, i))) { - khiter_t pos = git_strmap_lookup_index(map, entry->path); - git_submodule *sm; - - git_buf_clear(&name); - if (!name_from_path(&name, cfg, entry->path)) { - git_strmap_lookup_index(map, name.ptr); - } - - if (git_strmap_valid_index(map, pos)) { - sm = git_strmap_value_at(map, pos); - - if (S_ISGITLINK(entry->mode)) - submodule_update_from_head_data(sm, entry->mode, &entry->id); - else - sm->flags |= GIT_SUBMODULE_STATUS__HEAD_NOT_SUBMODULE; - } else if (S_ISGITLINK(entry->mode)) { - if (!submodule_get_or_create(&sm, git_tree_owner(head), map, name.ptr ? name.ptr : entry->path)) { - submodule_update_from_head_data( - sm, entry->mode, &entry->id); - git_submodule_free(sm); - } - } - } - - if (error == GIT_ITEROVER) - error = 0; - - git_buf_free(&name); - git_iterator_free(i); - - return error; -} - -/* If have_sm is true, sm is populated, otherwise map an repo are. */ -typedef struct { - git_config *mods; - git_strmap *map; - git_repository *repo; -} lfc_data; - -static int all_submodules(git_repository *repo, git_strmap *map) -{ - int error = 0; - git_index *idx = NULL; - git_tree *head = NULL; - const char *wd = NULL; - git_buf path = GIT_BUF_INIT; - git_submodule *sm; - git_config *mods = NULL; - uint32_t mask; - - assert(repo && map); - - /* get sources that we will need to check */ - if (git_repository_index(&idx, repo) < 0) - giterr_clear(); - if (git_repository_head_tree(&head, repo) < 0) - giterr_clear(); - - wd = git_repository_workdir(repo); - if (wd && (error = git_buf_joinpath(&path, wd, GIT_MODULES_FILE)) < 0) - goto cleanup; - - /* clear submodule flags that are to be refreshed */ - mask = 0; - mask |= GIT_SUBMODULE_STATUS_IN_INDEX | - GIT_SUBMODULE_STATUS__INDEX_FLAGS | - GIT_SUBMODULE_STATUS__INDEX_OID_VALID | - GIT_SUBMODULE_STATUS__INDEX_MULTIPLE_ENTRIES; - - mask |= GIT_SUBMODULE_STATUS_IN_HEAD | - GIT_SUBMODULE_STATUS__HEAD_OID_VALID; - mask |= GIT_SUBMODULE_STATUS_IN_CONFIG; - if (mask != 0) - mask |= GIT_SUBMODULE_STATUS_IN_WD | - GIT_SUBMODULE_STATUS__WD_SCANNED | - GIT_SUBMODULE_STATUS__WD_FLAGS | - GIT_SUBMODULE_STATUS__WD_OID_VALID; - - /* add submodule information from .gitmodules */ - if (wd) { - lfc_data data = { 0 }; - data.map = map; - data.repo = repo; - - if ((mods = gitmodules_snapshot(repo)) == NULL) - goto cleanup; - - data.mods = mods; - if ((error = git_config_foreach( - mods, submodule_load_each, &data)) < 0) - goto cleanup; - } - /* add back submodule information from index */ - if (idx) { - if ((error = submodules_from_index(map, idx, mods)) < 0) - goto cleanup; - } - /* add submodule information from HEAD */ - if (head) { - if ((error = submodules_from_head(map, head, mods)) < 0) - goto cleanup; - } - /* shallow scan submodules in work tree as needed */ - if (wd && mask != 0) { - git_strmap_foreach_value(map, sm, { - submodule_load_from_wd_lite(sm); - }); - } - -cleanup: - git_config_free(mods); - /* TODO: if we got an error, mark submodule config as invalid? */ - git_index_free(idx); - git_tree_free(head); - git_buf_free(&path); - return error; -} - -int git_submodule_foreach( - git_repository *repo, - git_submodule_cb callback, - void *payload) -{ - git_vector snapshot = GIT_VECTOR_INIT; - git_strmap *submodules; - git_submodule *sm; - int error; - size_t i; - - if ((error = git_strmap_alloc(&submodules)) < 0) - return error; - - if ((error = all_submodules(repo, submodules)) < 0) - goto done; - - if (!(error = git_vector_init( - &snapshot, kh_size(submodules), submodule_cmp))) { - - git_strmap_foreach_value(submodules, sm, { - if ((error = git_vector_insert(&snapshot, sm)) < 0) - break; - GIT_REFCOUNT_INC(sm); - }); - } - - if (error < 0) - goto done; - - git_vector_uniq(&snapshot, submodule_free_dup); - - git_vector_foreach(&snapshot, i, sm) { - if ((error = callback(sm, sm->name, payload)) != 0) { - giterr_set_after_callback(error); - break; - } - } - -done: - git_vector_foreach(&snapshot, i, sm) - git_submodule_free(sm); - git_vector_free(&snapshot); - - git_strmap_foreach_value(submodules, sm, { - git_submodule_free(sm); - }); - git_strmap_free(submodules); - - return error; -} - -static int submodule_repo_init( - git_repository **out, - git_repository *parent_repo, - const char *path, - const char *url, - bool use_gitlink) -{ - int error = 0; - git_buf workdir = GIT_BUF_INIT, repodir = GIT_BUF_INIT; - git_repository_init_options initopt = GIT_REPOSITORY_INIT_OPTIONS_INIT; - git_repository *subrepo = NULL; - - error = git_buf_joinpath(&workdir, git_repository_workdir(parent_repo), path); - if (error < 0) - goto cleanup; - - initopt.flags = GIT_REPOSITORY_INIT_MKPATH | GIT_REPOSITORY_INIT_NO_REINIT; - initopt.origin_url = url; - - /* init submodule repository and add origin remote as needed */ - - /* New style: sub-repo goes in /modules// with a - * gitlink in the sub-repo workdir directory to that repository - * - * Old style: sub-repo goes directly into repo//.git/ - */ - if (use_gitlink) { - error = git_buf_join3( - &repodir, '/', git_repository_path(parent_repo), "modules", path); - if (error < 0) - goto cleanup; - - initopt.workdir_path = workdir.ptr; - initopt.flags |= - GIT_REPOSITORY_INIT_NO_DOTGIT_DIR | - GIT_REPOSITORY_INIT_RELATIVE_GITLINK; - - error = git_repository_init_ext(&subrepo, repodir.ptr, &initopt); - } else - error = git_repository_init_ext(&subrepo, workdir.ptr, &initopt); - -cleanup: - git_buf_free(&workdir); - git_buf_free(&repodir); - - *out = subrepo; - - return error; -} - -int git_submodule_add_setup( - git_submodule **out, - git_repository *repo, - const char *url, - const char *path, - int use_gitlink) -{ - int error = 0; - git_config_backend *mods = NULL; - git_submodule *sm = NULL; - git_buf name = GIT_BUF_INIT, real_url = GIT_BUF_INIT; - git_repository *subrepo = NULL; - - assert(repo && url && path); - - /* see if there is already an entry for this submodule */ - - if (git_submodule_lookup(NULL, repo, path) < 0) - giterr_clear(); - else { - giterr_set(GITERR_SUBMODULE, - "Attempt to add submodule '%s' that already exists", path); - return GIT_EEXISTS; - } - - /* validate and normalize path */ - - if (git__prefixcmp(path, git_repository_workdir(repo)) == 0) - path += strlen(git_repository_workdir(repo)); - - if (git_path_root(path) >= 0) { - giterr_set(GITERR_SUBMODULE, "Submodule path must be a relative path"); - error = -1; - goto cleanup; - } - - /* update .gitmodules */ - - if (!(mods = open_gitmodules(repo, GITMODULES_CREATE))) { - giterr_set(GITERR_SUBMODULE, - "Adding submodules to a bare repository is not supported"); - return -1; - } - - if ((error = git_buf_printf(&name, "submodule.%s.path", path)) < 0 || - (error = git_config_file_set_string(mods, name.ptr, path)) < 0) - goto cleanup; - - if ((error = submodule_config_key_trunc_puts(&name, "url")) < 0 || - (error = git_config_file_set_string(mods, name.ptr, url)) < 0) - goto cleanup; - - git_buf_clear(&name); - - /* init submodule repository and add origin remote as needed */ - - error = git_buf_joinpath(&name, git_repository_workdir(repo), path); - if (error < 0) - goto cleanup; - - /* if the repo does not already exist, then init a new repo and add it. - * Otherwise, just add the existing repo. - */ - if (!(git_path_exists(name.ptr) && - git_path_contains(&name, DOT_GIT))) { - - /* resolve the actual URL to use */ - if ((error = git_submodule_resolve_url(&real_url, repo, url)) < 0) - goto cleanup; - - if ((error = submodule_repo_init(&subrepo, repo, path, real_url.ptr, use_gitlink)) < 0) - goto cleanup; - } - - if ((error = git_submodule_lookup(&sm, repo, path)) < 0) - goto cleanup; - - error = git_submodule_init(sm, false); - -cleanup: - if (error && sm) { - git_submodule_free(sm); - sm = NULL; - } - if (out != NULL) - *out = sm; - - git_config_file_free(mods); - git_repository_free(subrepo); - git_buf_free(&real_url); - git_buf_free(&name); - - return error; -} - -int git_submodule_repo_init( - git_repository **out, - const git_submodule *sm, - int use_gitlink) -{ - int error; - git_repository *sub_repo = NULL; - const char *configured_url; - git_config *cfg = NULL; - git_buf buf = GIT_BUF_INIT; - - assert(out && sm); - - /* get the configured remote url of the submodule */ - if ((error = git_buf_printf(&buf, "submodule.%s.url", sm->name)) < 0 || - (error = git_repository_config_snapshot(&cfg, sm->repo)) < 0 || - (error = git_config_get_string(&configured_url, cfg, buf.ptr)) < 0 || - (error = submodule_repo_init(&sub_repo, sm->repo, sm->path, configured_url, use_gitlink)) < 0) - goto done; - - *out = sub_repo; - -done: - git_config_free(cfg); - git_buf_free(&buf); - return error; -} - -int git_submodule_add_finalize(git_submodule *sm) -{ - int error; - git_index *index; - - assert(sm); - - if ((error = git_repository_index__weakptr(&index, sm->repo)) < 0 || - (error = git_index_add_bypath(index, GIT_MODULES_FILE)) < 0) - return error; - - return git_submodule_add_to_index(sm, true); -} - -int git_submodule_add_to_index(git_submodule *sm, int write_index) -{ - int error; - git_repository *sm_repo = NULL; - git_index *index; - git_buf path = GIT_BUF_INIT; - git_commit *head; - git_index_entry entry; - struct stat st; - - assert(sm); - - /* force reload of wd OID by git_submodule_open */ - sm->flags = sm->flags & ~GIT_SUBMODULE_STATUS__WD_OID_VALID; - - if ((error = git_repository_index__weakptr(&index, sm->repo)) < 0 || - (error = git_buf_joinpath( - &path, git_repository_workdir(sm->repo), sm->path)) < 0 || - (error = git_submodule_open(&sm_repo, sm)) < 0) - goto cleanup; - - /* read stat information for submodule working directory */ - if (p_stat(path.ptr, &st) < 0) { - giterr_set(GITERR_SUBMODULE, - "Cannot add submodule without working directory"); - error = -1; - goto cleanup; - } - - memset(&entry, 0, sizeof(entry)); - entry.path = sm->path; - git_index_entry__init_from_stat( - &entry, &st, !(git_index_caps(index) & GIT_INDEXCAP_NO_FILEMODE)); - - /* calling git_submodule_open will have set sm->wd_oid if possible */ - if ((sm->flags & GIT_SUBMODULE_STATUS__WD_OID_VALID) == 0) { - giterr_set(GITERR_SUBMODULE, - "Cannot add submodule without HEAD to index"); - error = -1; - goto cleanup; - } - git_oid_cpy(&entry.id, &sm->wd_oid); - - if ((error = git_commit_lookup(&head, sm_repo, &sm->wd_oid)) < 0) - goto cleanup; - - entry.ctime.seconds = (int32_t)git_commit_time(head); - entry.ctime.nanoseconds = 0; - entry.mtime.seconds = (int32_t)git_commit_time(head); - entry.mtime.nanoseconds = 0; - - git_commit_free(head); - - /* add it */ - error = git_index_add(index, &entry); - - /* write it, if requested */ - if (!error && write_index) { - error = git_index_write(index); - - if (!error) - git_oid_cpy(&sm->index_oid, &sm->wd_oid); - } - -cleanup: - git_repository_free(sm_repo); - git_buf_free(&path); - return error; -} - -const char *git_submodule_update_to_str(git_submodule_update_t update) -{ - int i; - for (i = 0; i < (int)ARRAY_SIZE(_sm_update_map); ++i) - if (_sm_update_map[i].map_value == (int)update) - return _sm_update_map[i].str_match; - return NULL; -} - -git_repository *git_submodule_owner(git_submodule *submodule) -{ - assert(submodule); - return submodule->repo; -} - -const char *git_submodule_name(git_submodule *submodule) -{ - assert(submodule); - return submodule->name; -} - -const char *git_submodule_path(git_submodule *submodule) -{ - assert(submodule); - return submodule->path; -} - -const char *git_submodule_url(git_submodule *submodule) -{ - assert(submodule); - return submodule->url; -} - -int git_submodule_resolve_url(git_buf *out, git_repository *repo, const char *url) -{ - int error = 0; - git_buf normalized = GIT_BUF_INIT; - - assert(out && repo && url); - - git_buf_sanitize(out); - - /* We do this in all platforms in case someone on Windows created the .gitmodules */ - if (strchr(url, '\\')) { - if ((error = git_path_normalize_slashes(&normalized, url)) < 0) - return error; - - url = normalized.ptr; - } - - - if (git_path_is_relative(url)) { - if (!(error = get_url_base(out, repo))) - error = git_path_apply_relative(out, url); - } else if (strchr(url, ':') != NULL || url[0] == '/') { - error = git_buf_sets(out, url); - } else { - giterr_set(GITERR_SUBMODULE, "Invalid format for submodule URL"); - error = -1; - } - - git_buf_free(&normalized); - return error; -} - -static int write_var(git_repository *repo, const char *name, const char *var, const char *val) -{ - git_buf key = GIT_BUF_INIT; - git_config_backend *mods; - int error; - - mods = open_gitmodules(repo, GITMODULES_CREATE); - if (!mods) - return -1; - - if ((error = git_buf_printf(&key, "submodule.%s.%s", name, var)) < 0) - goto cleanup; - - if (val) - error = git_config_file_set_string(mods, key.ptr, val); - else - error = git_config_file_delete(mods, key.ptr); - - git_buf_free(&key); - -cleanup: - git_config_file_free(mods); - return error; -} - -static int write_mapped_var(git_repository *repo, const char *name, git_cvar_map *maps, size_t nmaps, const char *var, int ival) -{ - git_cvar_t type; - const char *val; - - if (git_config_lookup_map_enum(&type, &val, maps, nmaps, ival) < 0) { - giterr_set(GITERR_SUBMODULE, "invalid value for %s", var); - return -1; - } - - if (type == GIT_CVAR_TRUE) - val = "true"; - - return write_var(repo, name, var, val); -} - -const char *git_submodule_branch(git_submodule *submodule) -{ - assert(submodule); - return submodule->branch; -} - -int git_submodule_set_branch(git_repository *repo, const char *name, const char *branch) -{ - - assert(repo && name); - - return write_var(repo, name, "branch", branch); -} - -int git_submodule_set_url(git_repository *repo, const char *name, const char *url) -{ - assert(repo && name && url); - - return write_var(repo, name, "url", url); -} - -const git_oid *git_submodule_index_id(git_submodule *submodule) -{ - assert(submodule); - - if (submodule->flags & GIT_SUBMODULE_STATUS__INDEX_OID_VALID) - return &submodule->index_oid; - else - return NULL; -} - -const git_oid *git_submodule_head_id(git_submodule *submodule) -{ - assert(submodule); - - if (submodule->flags & GIT_SUBMODULE_STATUS__HEAD_OID_VALID) - return &submodule->head_oid; - else - return NULL; -} - -const git_oid *git_submodule_wd_id(git_submodule *submodule) -{ - assert(submodule); - - /* load unless we think we have a valid oid */ - if (!(submodule->flags & GIT_SUBMODULE_STATUS__WD_OID_VALID)) { - git_repository *subrepo; - - /* calling submodule open grabs the HEAD OID if possible */ - if (!git_submodule_open_bare(&subrepo, submodule)) - git_repository_free(subrepo); - else - giterr_clear(); - } - - if (submodule->flags & GIT_SUBMODULE_STATUS__WD_OID_VALID) - return &submodule->wd_oid; - else - return NULL; -} - -git_submodule_ignore_t git_submodule_ignore(git_submodule *submodule) -{ - assert(submodule); - return (submodule->ignore < GIT_SUBMODULE_IGNORE_NONE) ? - GIT_SUBMODULE_IGNORE_NONE : submodule->ignore; -} - -int git_submodule_set_ignore(git_repository *repo, const char *name, git_submodule_ignore_t ignore) -{ - assert(repo && name); - - return write_mapped_var(repo, name, _sm_ignore_map, ARRAY_SIZE(_sm_ignore_map), "ignore", ignore); -} - -git_submodule_update_t git_submodule_update_strategy(git_submodule *submodule) -{ - assert(submodule); - return (submodule->update < GIT_SUBMODULE_UPDATE_CHECKOUT) ? - GIT_SUBMODULE_UPDATE_CHECKOUT : submodule->update; -} - -int git_submodule_set_update(git_repository *repo, const char *name, git_submodule_update_t update) -{ - assert(repo && name); - - return write_mapped_var(repo, name, _sm_update_map, ARRAY_SIZE(_sm_update_map), "update", update); -} - -git_submodule_recurse_t git_submodule_fetch_recurse_submodules( - git_submodule *submodule) -{ - assert(submodule); - return submodule->fetch_recurse; -} - -int git_submodule_set_fetch_recurse_submodules(git_repository *repo, const char *name, git_submodule_recurse_t recurse) -{ - assert(repo && name); - - return write_mapped_var(repo, name, _sm_recurse_map, ARRAY_SIZE(_sm_recurse_map), "fetchRecurseSubmodules", recurse); -} - -static int submodule_repo_create( - git_repository **out, - git_repository *parent_repo, - const char *path) -{ - int error = 0; - git_buf workdir = GIT_BUF_INIT, repodir = GIT_BUF_INIT; - git_repository_init_options initopt = GIT_REPOSITORY_INIT_OPTIONS_INIT; - git_repository *subrepo = NULL; - - initopt.flags = - GIT_REPOSITORY_INIT_MKPATH | - GIT_REPOSITORY_INIT_NO_REINIT | - GIT_REPOSITORY_INIT_NO_DOTGIT_DIR | - GIT_REPOSITORY_INIT_RELATIVE_GITLINK; - - /* Workdir: path to sub-repo working directory */ - error = git_buf_joinpath(&workdir, git_repository_workdir(parent_repo), path); - if (error < 0) - goto cleanup; - - initopt.workdir_path = workdir.ptr; - - /** - * Repodir: path to the sub-repo. sub-repo goes in: - * /modules// with a gitlink in the - * sub-repo workdir directory to that repository. - */ - error = git_buf_join3( - &repodir, '/', git_repository_path(parent_repo), "modules", path); - if (error < 0) - goto cleanup; - - error = git_repository_init_ext(&subrepo, repodir.ptr, &initopt); - -cleanup: - git_buf_free(&workdir); - git_buf_free(&repodir); - - *out = subrepo; - - return error; -} - -/** - * Callback to override sub-repository creation when - * cloning a sub-repository. - */ -static int git_submodule_update_repo_init_cb( - git_repository **out, - const char *path, - int bare, - void *payload) -{ - git_submodule *sm; - - GIT_UNUSED(bare); - - sm = payload; - - return submodule_repo_create(out, sm->repo, path); -} - -int git_submodule_update_init_options(git_submodule_update_options *opts, unsigned int version) -{ - GIT_INIT_STRUCTURE_FROM_TEMPLATE( - opts, version, git_submodule_update_options, GIT_SUBMODULE_UPDATE_OPTIONS_INIT); - return 0; -} - -int git_submodule_update(git_submodule *sm, int init, git_submodule_update_options *_update_options) -{ - int error; - unsigned int submodule_status; - git_config *config = NULL; - const char *submodule_url; - git_repository *sub_repo = NULL; - git_remote *remote = NULL; - git_object *target_commit = NULL; - git_buf buf = GIT_BUF_INIT; - git_submodule_update_options update_options = GIT_SUBMODULE_UPDATE_OPTIONS_INIT; - git_clone_options clone_options = GIT_CLONE_OPTIONS_INIT; - - assert(sm); - - if (_update_options) - memcpy(&update_options, _update_options, sizeof(git_submodule_update_options)); - - GITERR_CHECK_VERSION(&update_options, GIT_SUBMODULE_UPDATE_OPTIONS_VERSION, "git_submodule_update_options"); - - /* Copy over the remote callbacks */ - memcpy(&clone_options.fetch_opts, &update_options.fetch_opts, sizeof(git_fetch_options)); - - /* Get the status of the submodule to determine if it is already initialized */ - if ((error = git_submodule_status(&submodule_status, sm->repo, sm->name, GIT_SUBMODULE_IGNORE_UNSPECIFIED)) < 0) - goto done; - - /* - * If submodule work dir is not already initialized, check to see - * what we need to do (initialize, clone, return error...) - */ - if (submodule_status & GIT_SUBMODULE_STATUS_WD_UNINITIALIZED) { - /* - * Work dir is not initialized, check to see if the submodule - * info has been copied into .git/config - */ - if ((error = git_repository_config_snapshot(&config, sm->repo)) < 0 || - (error = git_buf_printf(&buf, "submodule.%s.url", git_submodule_name(sm))) < 0) - goto done; - - if ((error = git_config_get_string(&submodule_url, config, git_buf_cstr(&buf))) < 0) { - /* - * If the error is not "not found" or if it is "not found" and we are not - * initializing the submodule, then return error. - */ - if (error != GIT_ENOTFOUND) - goto done; - - if (error == GIT_ENOTFOUND && !init) { - giterr_set(GITERR_SUBMODULE, "Submodule is not initialized."); - error = GIT_ERROR; - goto done; - } - - /* The submodule has not been initialized yet - initialize it now.*/ - if ((error = git_submodule_init(sm, 0)) < 0) - goto done; - - git_config_free(config); - config = NULL; - - if ((error = git_repository_config_snapshot(&config, sm->repo)) < 0 || - (error = git_config_get_string(&submodule_url, config, git_buf_cstr(&buf))) < 0) - goto done; - } - - /** submodule is initialized - now clone it **/ - /* override repo creation */ - clone_options.repository_cb = git_submodule_update_repo_init_cb; - clone_options.repository_cb_payload = sm; - - /* - * Do not perform checkout as part of clone, instead we - * will checkout the specific commit manually. - */ - clone_options.checkout_opts.checkout_strategy = GIT_CHECKOUT_NONE; - update_options.checkout_opts.checkout_strategy = update_options.clone_checkout_strategy; - - if ((error = git_clone(&sub_repo, submodule_url, sm->path, &clone_options)) < 0 || - (error = git_repository_set_head_detached(sub_repo, git_submodule_index_id(sm))) < 0 || - (error = git_checkout_head(sub_repo, &update_options.checkout_opts)) != 0) - goto done; - } else { - /** - * Work dir is initialized - look up the commit in the parent repository's index, - * update the workdir contents of the subrepository, and set the subrepository's - * head to the new commit. - */ - if ((error = git_submodule_open(&sub_repo, sm)) < 0 || - (error = git_object_lookup(&target_commit, sub_repo, git_submodule_index_id(sm), GIT_OBJ_COMMIT)) < 0 || - (error = git_checkout_tree(sub_repo, target_commit, &update_options.checkout_opts)) != 0 || - (error = git_repository_set_head_detached(sub_repo, git_submodule_index_id(sm))) < 0) - goto done; - - /* Invalidate the wd flags as the workdir has been updated. */ - sm->flags = sm->flags & - ~(GIT_SUBMODULE_STATUS_IN_WD | - GIT_SUBMODULE_STATUS__WD_OID_VALID | - GIT_SUBMODULE_STATUS__WD_SCANNED); - } - -done: - git_buf_free(&buf); - git_config_free(config); - git_object_free(target_commit); - git_remote_free(remote); - git_repository_free(sub_repo); - - return error; -} - -int git_submodule_init(git_submodule *sm, int overwrite) -{ - int error; - const char *val; - git_buf key = GIT_BUF_INIT, effective_submodule_url = GIT_BUF_INIT; - git_config *cfg = NULL; - - if (!sm->url) { - giterr_set(GITERR_SUBMODULE, - "No URL configured for submodule '%s'", sm->name); - return -1; - } - - if ((error = git_repository_config(&cfg, sm->repo)) < 0) - return error; - - /* write "submodule.NAME.url" */ - - if ((error = git_submodule_resolve_url(&effective_submodule_url, sm->repo, sm->url)) < 0 || - (error = git_buf_printf(&key, "submodule.%s.url", sm->name)) < 0 || - (error = git_config__update_entry( - cfg, key.ptr, effective_submodule_url.ptr, overwrite != 0, false)) < 0) - goto cleanup; - - /* write "submodule.NAME.update" if not default */ - - val = (sm->update == GIT_SUBMODULE_UPDATE_CHECKOUT) ? - NULL : git_submodule_update_to_str(sm->update); - - if ((error = git_buf_printf(&key, "submodule.%s.update", sm->name)) < 0 || - (error = git_config__update_entry( - cfg, key.ptr, val, overwrite != 0, false)) < 0) - goto cleanup; - - /* success */ - -cleanup: - git_config_free(cfg); - git_buf_free(&key); - git_buf_free(&effective_submodule_url); - - return error; -} - -int git_submodule_sync(git_submodule *sm) -{ - int error = 0; - git_config *cfg = NULL; - git_buf key = GIT_BUF_INIT; - git_repository *smrepo = NULL; - - if (!sm->url) { - giterr_set(GITERR_SUBMODULE, - "No URL configured for submodule '%s'", sm->name); - return -1; - } - - /* copy URL over to config only if it already exists */ - - if (!(error = git_repository_config__weakptr(&cfg, sm->repo)) && - !(error = git_buf_printf(&key, "submodule.%s.url", sm->name))) - error = git_config__update_entry(cfg, key.ptr, sm->url, true, true); - - /* if submodule exists in the working directory, update remote url */ - - if (!error && - (sm->flags & GIT_SUBMODULE_STATUS_IN_WD) != 0 && - !(error = git_submodule_open(&smrepo, sm))) - { - git_buf remote_name = GIT_BUF_INIT; - - if ((error = git_repository_config__weakptr(&cfg, smrepo)) < 0) - /* return error from reading submodule config */; - else if ((error = lookup_head_remote_key(&remote_name, smrepo)) < 0) { - giterr_clear(); - error = git_buf_sets(&key, "remote.origin.url"); - } else { - error = git_buf_join3( - &key, '.', "remote", remote_name.ptr, "url"); - git_buf_free(&remote_name); - } - - if (!error) - error = git_config__update_entry(cfg, key.ptr, sm->url, true, false); - - git_repository_free(smrepo); - } - - git_buf_free(&key); - - return error; -} - -static int git_submodule__open( - git_repository **subrepo, git_submodule *sm, bool bare) -{ - int error; - git_buf path = GIT_BUF_INIT; - unsigned int flags = GIT_REPOSITORY_OPEN_NO_SEARCH; - const char *wd; - - assert(sm && subrepo); - - if (git_repository__ensure_not_bare( - sm->repo, "open submodule repository") < 0) - return GIT_EBAREREPO; - - wd = git_repository_workdir(sm->repo); - - if (git_buf_joinpath(&path, wd, sm->path) < 0 || - git_buf_joinpath(&path, path.ptr, DOT_GIT) < 0) - return -1; - - sm->flags = sm->flags & - ~(GIT_SUBMODULE_STATUS_IN_WD | - GIT_SUBMODULE_STATUS__WD_OID_VALID | - GIT_SUBMODULE_STATUS__WD_SCANNED); - - if (bare) - flags |= GIT_REPOSITORY_OPEN_BARE; - - error = git_repository_open_ext(subrepo, path.ptr, flags, wd); - - /* if we opened the submodule successfully, grab HEAD OID, etc. */ - if (!error) { - sm->flags |= GIT_SUBMODULE_STATUS_IN_WD | - GIT_SUBMODULE_STATUS__WD_SCANNED; - - if (!git_reference_name_to_id(&sm->wd_oid, *subrepo, GIT_HEAD_FILE)) - sm->flags |= GIT_SUBMODULE_STATUS__WD_OID_VALID; - else - giterr_clear(); - } else if (git_path_exists(path.ptr)) { - sm->flags |= GIT_SUBMODULE_STATUS__WD_SCANNED | - GIT_SUBMODULE_STATUS_IN_WD; - } else { - git_buf_rtruncate_at_char(&path, '/'); /* remove "/.git" */ - - if (git_path_isdir(path.ptr)) - sm->flags |= GIT_SUBMODULE_STATUS__WD_SCANNED; - } - - git_buf_free(&path); - - return error; -} - -int git_submodule_open_bare(git_repository **subrepo, git_submodule *sm) -{ - return git_submodule__open(subrepo, sm, true); -} - -int git_submodule_open(git_repository **subrepo, git_submodule *sm) -{ - return git_submodule__open(subrepo, sm, false); -} - -static void submodule_update_from_index_entry( - git_submodule *sm, const git_index_entry *ie) -{ - bool already_found = (sm->flags & GIT_SUBMODULE_STATUS_IN_INDEX) != 0; - - if (!S_ISGITLINK(ie->mode)) { - if (!already_found) - sm->flags |= GIT_SUBMODULE_STATUS__INDEX_NOT_SUBMODULE; - } else { - if (already_found) - sm->flags |= GIT_SUBMODULE_STATUS__INDEX_MULTIPLE_ENTRIES; - else - git_oid_cpy(&sm->index_oid, &ie->id); - - sm->flags |= GIT_SUBMODULE_STATUS_IN_INDEX | - GIT_SUBMODULE_STATUS__INDEX_OID_VALID; - } -} - -static int submodule_update_index(git_submodule *sm) -{ - git_index *index; - const git_index_entry *ie; - - if (git_repository_index__weakptr(&index, sm->repo) < 0) - return -1; - - sm->flags = sm->flags & - ~(GIT_SUBMODULE_STATUS_IN_INDEX | - GIT_SUBMODULE_STATUS__INDEX_OID_VALID); - - if (!(ie = git_index_get_bypath(index, sm->path, 0))) - return 0; - - submodule_update_from_index_entry(sm, ie); - - return 0; -} - -static void submodule_update_from_head_data( - git_submodule *sm, mode_t mode, const git_oid *id) -{ - if (!S_ISGITLINK(mode)) - sm->flags |= GIT_SUBMODULE_STATUS__HEAD_NOT_SUBMODULE; - else { - git_oid_cpy(&sm->head_oid, id); - - sm->flags |= GIT_SUBMODULE_STATUS_IN_HEAD | - GIT_SUBMODULE_STATUS__HEAD_OID_VALID; - } -} - -static int submodule_update_head(git_submodule *submodule) -{ - git_tree *head = NULL; - git_tree_entry *te = NULL; - - submodule->flags = submodule->flags & - ~(GIT_SUBMODULE_STATUS_IN_HEAD | - GIT_SUBMODULE_STATUS__HEAD_OID_VALID); - - /* if we can't look up file in current head, then done */ - if (git_repository_head_tree(&head, submodule->repo) < 0 || - git_tree_entry_bypath(&te, head, submodule->path) < 0) - giterr_clear(); - else - submodule_update_from_head_data(submodule, te->attr, git_tree_entry_id(te)); - - git_tree_entry_free(te); - git_tree_free(head); - return 0; -} - -int git_submodule_reload(git_submodule *sm, int force) -{ - int error = 0; - git_config *mods; - - GIT_UNUSED(force); - - assert(sm); - - if (!git_repository_is_bare(sm->repo)) { - /* refresh config data */ - mods = gitmodules_snapshot(sm->repo); - if (mods != NULL) { - error = submodule_read_config(sm, mods); - git_config_free(mods); - - if (error < 0) - return error; - } - - /* refresh wd data */ - sm->flags &= - ~(GIT_SUBMODULE_STATUS_IN_WD | - GIT_SUBMODULE_STATUS__WD_OID_VALID | - GIT_SUBMODULE_STATUS__WD_FLAGS); - - error = submodule_load_from_wd_lite(sm); - } - - if (error == 0 && (error = submodule_update_index(sm)) == 0) - error = submodule_update_head(sm); - - return error; -} - -static void submodule_copy_oid_maybe( - git_oid *tgt, const git_oid *src, bool valid) -{ - if (tgt) { - if (valid) - memcpy(tgt, src, sizeof(*tgt)); - else - memset(tgt, 0, sizeof(*tgt)); - } -} - -int git_submodule__status( - unsigned int *out_status, - git_oid *out_head_id, - git_oid *out_index_id, - git_oid *out_wd_id, - git_submodule *sm, - git_submodule_ignore_t ign) -{ - unsigned int status; - git_repository *smrepo = NULL; - - if (ign == GIT_SUBMODULE_IGNORE_UNSPECIFIED) - ign = sm->ignore; - - /* only return location info if ignore == all */ - if (ign == GIT_SUBMODULE_IGNORE_ALL) { - *out_status = (sm->flags & GIT_SUBMODULE_STATUS__IN_FLAGS); - return 0; - } - - /* refresh the index OID */ - if (submodule_update_index(sm) < 0) - return -1; - - /* refresh the HEAD OID */ - if (submodule_update_head(sm) < 0) - return -1; - - /* for ignore == dirty, don't scan the working directory */ - if (ign == GIT_SUBMODULE_IGNORE_DIRTY) { - /* git_submodule_open_bare will load WD OID data */ - if (git_submodule_open_bare(&smrepo, sm) < 0) - giterr_clear(); - else - git_repository_free(smrepo); - smrepo = NULL; - } else if (git_submodule_open(&smrepo, sm) < 0) { - giterr_clear(); - smrepo = NULL; - } - - status = GIT_SUBMODULE_STATUS__CLEAR_INTERNAL(sm->flags); - - submodule_get_index_status(&status, sm); - submodule_get_wd_status(&status, sm, smrepo, ign); - - git_repository_free(smrepo); - - *out_status = status; - - submodule_copy_oid_maybe(out_head_id, &sm->head_oid, - (sm->flags & GIT_SUBMODULE_STATUS__HEAD_OID_VALID) != 0); - submodule_copy_oid_maybe(out_index_id, &sm->index_oid, - (sm->flags & GIT_SUBMODULE_STATUS__INDEX_OID_VALID) != 0); - submodule_copy_oid_maybe(out_wd_id, &sm->wd_oid, - (sm->flags & GIT_SUBMODULE_STATUS__WD_OID_VALID) != 0); - - return 0; -} - -int git_submodule_status(unsigned int *status, git_repository *repo, const char *name, git_submodule_ignore_t ignore) -{ - git_submodule *sm; - int error; - - assert(status && repo && name); - - if ((error = git_submodule_lookup(&sm, repo, name)) < 0) - return error; - - error = git_submodule__status(status, NULL, NULL, NULL, sm, ignore); - git_submodule_free(sm); - - return error; -} - -int git_submodule_location(unsigned int *location, git_submodule *sm) -{ - assert(location && sm); - - return git_submodule__status( - location, NULL, NULL, NULL, sm, GIT_SUBMODULE_IGNORE_ALL); -} - - -/* - * INTERNAL FUNCTIONS - */ - -static int submodule_alloc( - git_submodule **out, git_repository *repo, const char *name) -{ - size_t namelen; - git_submodule *sm; - - if (!name || !(namelen = strlen(name))) { - giterr_set(GITERR_SUBMODULE, "Invalid submodule name"); - return -1; - } - - sm = git__calloc(1, sizeof(git_submodule)); - GITERR_CHECK_ALLOC(sm); - - sm->name = sm->path = git__strdup(name); - if (!sm->name) { - git__free(sm); - return -1; - } - - GIT_REFCOUNT_INC(sm); - sm->ignore = sm->ignore_default = GIT_SUBMODULE_IGNORE_NONE; - sm->update = sm->update_default = GIT_SUBMODULE_UPDATE_CHECKOUT; - sm->fetch_recurse = sm->fetch_recurse_default = GIT_SUBMODULE_RECURSE_NO; - sm->repo = repo; - sm->branch = NULL; - - *out = sm; - return 0; -} - -static void submodule_release(git_submodule *sm) -{ - if (!sm) - return; - - if (sm->repo) { - sm->repo = NULL; - } - - if (sm->path != sm->name) - git__free(sm->path); - git__free(sm->name); - git__free(sm->url); - git__free(sm->branch); - git__memzero(sm, sizeof(*sm)); - git__free(sm); -} - -void git_submodule_free(git_submodule *sm) -{ - if (!sm) - return; - GIT_REFCOUNT_DEC(sm, submodule_release); -} - -static int submodule_config_error(const char *property, const char *value) -{ - giterr_set(GITERR_INVALID, - "Invalid value for submodule '%s' property: '%s'", property, value); - return -1; -} - -int git_submodule_parse_ignore(git_submodule_ignore_t *out, const char *value) -{ - int val; - - if (git_config_lookup_map_value( - &val, _sm_ignore_map, ARRAY_SIZE(_sm_ignore_map), value) < 0) { - *out = GIT_SUBMODULE_IGNORE_NONE; - return submodule_config_error("ignore", value); - } - - *out = (git_submodule_ignore_t)val; - return 0; -} - -int git_submodule_parse_update(git_submodule_update_t *out, const char *value) -{ - int val; - - if (git_config_lookup_map_value( - &val, _sm_update_map, ARRAY_SIZE(_sm_update_map), value) < 0) { - *out = GIT_SUBMODULE_UPDATE_CHECKOUT; - return submodule_config_error("update", value); - } - - *out = (git_submodule_update_t)val; - return 0; -} - -int git_submodule_parse_recurse(git_submodule_recurse_t *out, const char *value) -{ - int val; - - if (git_config_lookup_map_value( - &val, _sm_recurse_map, ARRAY_SIZE(_sm_recurse_map), value) < 0) { - *out = GIT_SUBMODULE_RECURSE_YES; - return submodule_config_error("recurse", value); - } - - *out = (git_submodule_recurse_t)val; - return 0; -} - -static int get_value(const char **out, git_config *cfg, git_buf *buf, const char *name, const char *field) -{ - int error; - - git_buf_clear(buf); - - if ((error = git_buf_printf(buf, "submodule.%s.%s", name, field)) < 0 || - (error = git_config_get_string(out, cfg, buf->ptr)) < 0) - return error; - - return error; -} - -static int submodule_read_config(git_submodule *sm, git_config *cfg) -{ - git_buf key = GIT_BUF_INIT; - const char *value; - int error, in_config = 0; - - /* - * TODO: Look up path in index and if it is present but not a GITLINK - * then this should be deleted (at least to match git's behavior) - */ - - if ((error = get_value(&value, cfg, &key, sm->name, "path")) == 0) { - in_config = 1; - /* - * TODO: if case insensitive filesystem, then the following strcmp - * should be strcasecmp - */ - if (strcmp(sm->name, value) != 0) { - if (sm->path != sm->name) - git__free(sm->path); - sm->path = git__strdup(value); - GITERR_CHECK_ALLOC(sm->path); - } - } else if (error != GIT_ENOTFOUND) { - goto cleanup; - } - - if ((error = get_value(&value, cfg, &key, sm->name, "url")) == 0) { - in_config = 1; - sm->url = git__strdup(value); - GITERR_CHECK_ALLOC(sm->url); - } else if (error != GIT_ENOTFOUND) { - goto cleanup; - } - - if ((error = get_value(&value, cfg, &key, sm->name, "branch")) == 0) { - in_config = 1; - sm->branch = git__strdup(value); - GITERR_CHECK_ALLOC(sm->branch); - } else if (error != GIT_ENOTFOUND) { - goto cleanup; - } - - if ((error = get_value(&value, cfg, &key, sm->name, "update")) == 0) { - in_config = 1; - if ((error = git_submodule_parse_update(&sm->update, value)) < 0) - goto cleanup; - sm->update_default = sm->update; - } else if (error != GIT_ENOTFOUND) { - goto cleanup; - } - - if ((error = get_value(&value, cfg, &key, sm->name, "fetchRecurseSubmodules")) == 0) { - in_config = 1; - if ((error = git_submodule_parse_recurse(&sm->fetch_recurse, value)) < 0) - goto cleanup; - sm->fetch_recurse_default = sm->fetch_recurse; - } else if (error != GIT_ENOTFOUND) { - goto cleanup; - } - - if ((error = get_value(&value, cfg, &key, sm->name, "ignore")) == 0) { - in_config = 1; - if ((error = git_submodule_parse_ignore(&sm->ignore, value)) < 0) - goto cleanup; - sm->ignore_default = sm->ignore; - } else if (error != GIT_ENOTFOUND) { - goto cleanup; - } - - if (in_config) - sm->flags |= GIT_SUBMODULE_STATUS_IN_CONFIG; - - error = 0; - -cleanup: - git_buf_free(&key); - return error; -} - -static int submodule_load_each(const git_config_entry *entry, void *payload) -{ - lfc_data *data = payload; - const char *namestart, *property; - git_strmap_iter pos; - git_strmap *map = data->map; - git_buf name = GIT_BUF_INIT; - git_submodule *sm; - int error; - - if (git__prefixcmp(entry->name, "submodule.") != 0) - return 0; - - namestart = entry->name + strlen("submodule."); - property = strrchr(namestart, '.'); - - if (!property || (property == namestart)) - return 0; - - property++; - - if ((error = git_buf_set(&name, namestart, property - namestart -1)) < 0) - return error; - - /* - * Now that we have the submodule's name, we can use that to - * figure out whether it's in the map. If it's not, we create - * a new submodule, load the config and insert it. If it's - * already inserted, we've already loaded it, so we skip. - */ - pos = git_strmap_lookup_index(map, name.ptr); - if (git_strmap_valid_index(map, pos)) { - error = 0; - goto done; - } - - if ((error = submodule_alloc(&sm, data->repo, name.ptr)) < 0) - goto done; - - if ((error = submodule_read_config(sm, data->mods)) < 0) { - git_submodule_free(sm); - goto done; - } - - git_strmap_insert(map, sm->name, sm, error); - assert(error != 0); - if (error < 0) - goto done; - - error = 0; - -done: - git_buf_free(&name); - return error; -} - -static int submodule_load_from_wd_lite(git_submodule *sm) -{ - git_buf path = GIT_BUF_INIT; - - if (git_buf_joinpath(&path, git_repository_workdir(sm->repo), sm->path) < 0) - return -1; - - if (git_path_isdir(path.ptr)) - sm->flags |= GIT_SUBMODULE_STATUS__WD_SCANNED; - - if (git_path_contains(&path, DOT_GIT)) - sm->flags |= GIT_SUBMODULE_STATUS_IN_WD; - - git_buf_free(&path); - return 0; -} - -/** - * Returns a snapshot of $WORK_TREE/.gitmodules. - * - * We ignore any errors and just pretend the file isn't there. - */ -static git_config *gitmodules_snapshot(git_repository *repo) -{ - const char *workdir = git_repository_workdir(repo); - git_config *mods = NULL, *snap = NULL; - git_buf path = GIT_BUF_INIT; - - if (workdir != NULL) { - if (git_buf_joinpath(&path, workdir, GIT_MODULES_FILE) != 0) - return NULL; - - if (git_config_open_ondisk(&mods, path.ptr) < 0) - mods = NULL; - } - - git_buf_free(&path); - - if (mods) { - git_config_snapshot(&snap, mods); - git_config_free(mods); - } - - return snap; -} - -static git_config_backend *open_gitmodules( - git_repository *repo, - int okay_to_create) -{ - const char *workdir = git_repository_workdir(repo); - git_buf path = GIT_BUF_INIT; - git_config_backend *mods = NULL; - - if (workdir != NULL) { - if (git_buf_joinpath(&path, workdir, GIT_MODULES_FILE) != 0) - return NULL; - - if (okay_to_create || git_path_isfile(path.ptr)) { - /* git_config_file__ondisk should only fail if OOM */ - if (git_config_file__ondisk(&mods, path.ptr) < 0) - mods = NULL; - /* open should only fail here if the file is malformed */ - else if (git_config_file_open(mods, GIT_CONFIG_LEVEL_LOCAL) < 0) { - git_config_file_free(mods); - mods = NULL; - } - } - } - - git_buf_free(&path); - - return mods; -} - -/* Lookup name of remote of the local tracking branch HEAD points to */ -static int lookup_head_remote_key(git_buf *remote_name, git_repository *repo) -{ - int error; - git_reference *head = NULL; - git_buf upstream_name = GIT_BUF_INIT; - - /* lookup and dereference HEAD */ - if ((error = git_repository_head(&head, repo)) < 0) - return error; - - /** - * If head does not refer to a branch, then return - * GIT_ENOTFOUND to indicate that we could not find - * a remote key for the local tracking branch HEAD points to. - **/ - if (!git_reference_is_branch(head)) { - giterr_set(GITERR_INVALID, - "HEAD does not refer to a branch."); - error = GIT_ENOTFOUND; - goto done; - } - - /* lookup remote tracking branch of HEAD */ - if ((error = git_branch_upstream_name( - &upstream_name, - repo, - git_reference_name(head))) < 0) - goto done; - - /* lookup remote of remote tracking branch */ - if ((error = git_branch_remote_name(remote_name, repo, upstream_name.ptr)) < 0) - goto done; - -done: - git_buf_free(&upstream_name); - git_reference_free(head); - - return error; -} - -/* Lookup the remote of the local tracking branch HEAD points to */ -static int lookup_head_remote(git_remote **remote, git_repository *repo) -{ - int error; - git_buf remote_name = GIT_BUF_INIT; - - /* lookup remote of remote tracking branch name */ - if (!(error = lookup_head_remote_key(&remote_name, repo))) - error = git_remote_lookup(remote, repo, remote_name.ptr); - - git_buf_free(&remote_name); - - return error; -} - -/* Lookup remote, either from HEAD or fall back on origin */ -static int lookup_default_remote(git_remote **remote, git_repository *repo) -{ - int error = lookup_head_remote(remote, repo); - - /* if that failed, use 'origin' instead */ - if (error == GIT_ENOTFOUND) - error = git_remote_lookup(remote, repo, "origin"); - - if (error == GIT_ENOTFOUND) - giterr_set( - GITERR_SUBMODULE, - "Cannot get default remote for submodule - no local tracking " - "branch for HEAD and origin does not exist"); - - return error; -} - -static int get_url_base(git_buf *url, git_repository *repo) -{ - int error; - git_remote *remote = NULL; - - if (!(error = lookup_default_remote(&remote, repo))) { - error = git_buf_sets(url, git_remote_url(remote)); - git_remote_free(remote); - } - else if (error == GIT_ENOTFOUND) { - /* if repository does not have a default remote, use workdir instead */ - giterr_clear(); - error = git_buf_sets(url, git_repository_workdir(repo)); - } - - return error; -} - -static void submodule_get_index_status(unsigned int *status, git_submodule *sm) -{ - const git_oid *head_oid = git_submodule_head_id(sm); - const git_oid *index_oid = git_submodule_index_id(sm); - - *status = *status & ~GIT_SUBMODULE_STATUS__INDEX_FLAGS; - - if (!head_oid) { - if (index_oid) - *status |= GIT_SUBMODULE_STATUS_INDEX_ADDED; - } - else if (!index_oid) - *status |= GIT_SUBMODULE_STATUS_INDEX_DELETED; - else if (!git_oid_equal(head_oid, index_oid)) - *status |= GIT_SUBMODULE_STATUS_INDEX_MODIFIED; -} - - -static void submodule_get_wd_status( - unsigned int *status, - git_submodule *sm, - git_repository *sm_repo, - git_submodule_ignore_t ign) -{ - const git_oid *index_oid = git_submodule_index_id(sm); - const git_oid *wd_oid = - (sm->flags & GIT_SUBMODULE_STATUS__WD_OID_VALID) ? &sm->wd_oid : NULL; - git_tree *sm_head = NULL; - git_index *index = NULL; - git_diff_options opt = GIT_DIFF_OPTIONS_INIT; - git_diff *diff; - - *status = *status & ~GIT_SUBMODULE_STATUS__WD_FLAGS; - - if (!index_oid) { - if (wd_oid) - *status |= GIT_SUBMODULE_STATUS_WD_ADDED; - } - else if (!wd_oid) { - if ((sm->flags & GIT_SUBMODULE_STATUS__WD_SCANNED) != 0 && - (sm->flags & GIT_SUBMODULE_STATUS_IN_WD) == 0) - *status |= GIT_SUBMODULE_STATUS_WD_UNINITIALIZED; - else - *status |= GIT_SUBMODULE_STATUS_WD_DELETED; - } - else if (!git_oid_equal(index_oid, wd_oid)) - *status |= GIT_SUBMODULE_STATUS_WD_MODIFIED; - - /* if we have no repo, then we're done */ - if (!sm_repo) - return; - - /* the diffs below could be optimized with an early termination - * option to the git_diff functions, but for now this is sufficient - * (and certainly no worse that what core git does). - */ - - if (ign == GIT_SUBMODULE_IGNORE_NONE) - opt.flags |= GIT_DIFF_INCLUDE_UNTRACKED; - - (void)git_repository_index__weakptr(&index, sm_repo); - - /* if we don't have an unborn head, check diff with index */ - if (git_repository_head_tree(&sm_head, sm_repo) < 0) - giterr_clear(); - else { - /* perform head to index diff on submodule */ - if (git_diff_tree_to_index(&diff, sm_repo, sm_head, index, &opt) < 0) - giterr_clear(); - else { - if (git_diff_num_deltas(diff) > 0) - *status |= GIT_SUBMODULE_STATUS_WD_INDEX_MODIFIED; - git_diff_free(diff); - diff = NULL; - } - - git_tree_free(sm_head); - } - - /* perform index-to-workdir diff on submodule */ - if (git_diff_index_to_workdir(&diff, sm_repo, index, &opt) < 0) - giterr_clear(); - else { - size_t untracked = - git_diff_num_deltas_of_type(diff, GIT_DELTA_UNTRACKED); - - if (untracked > 0) - *status |= GIT_SUBMODULE_STATUS_WD_UNTRACKED; - - if (git_diff_num_deltas(diff) != untracked) - *status |= GIT_SUBMODULE_STATUS_WD_WD_MODIFIED; - - git_diff_free(diff); - diff = NULL; - } -} diff --git a/vendor/libgit2/src/submodule.h b/vendor/libgit2/src/submodule.h deleted file mode 100644 index 2ef2031b3..000000000 --- a/vendor/libgit2/src/submodule.h +++ /dev/null @@ -1,146 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_submodule_h__ -#define INCLUDE_submodule_h__ - -#include "git2/submodule.h" -#include "git2/repository.h" -#include "fileops.h" - -/* Notes: - * - * Submodule information can be in four places: the index, the config files - * (both .git/config and .gitmodules), the HEAD tree, and the working - * directory. - * - * In the index: - * - submodule is found by path - * - may be missing, present, or of the wrong type - * - will have an oid if present - * - * In the HEAD tree: - * - submodule is found by path - * - may be missing, present, or of the wrong type - * - will have an oid if present - * - * In the config files: - * - submodule is found by submodule "name" which is usually the path - * - may be missing or present - * - will have a name, path, url, and other properties - * - * In the working directory: - * - submodule is found by path - * - may be missing, an empty directory, a checked out directory, - * or of the wrong type - * - if checked out, will have a HEAD oid - * - if checked out, will have git history that can be used to compare oids - * - if checked out, may have modified files and/or untracked files - */ - -/** - * Description of submodule - * - * This record describes a submodule found in a repository. There should be - * an entry for every submodule found in the HEAD and index, and for every - * submodule described in .gitmodules. The fields are as follows: - * - * - `rc` tracks the refcount of how many hash table entries in the - * git_submodule_cache there are for this submodule. It only comes into - * play if the name and path of the submodule differ. - * - * - `name` is the name of the submodule from .gitmodules. - * - `path` is the path to the submodule from the repo root. It is almost - * always the same as `name`. - * - `url` is the url for the submodule. - * - `update` is a git_submodule_update_t value - see gitmodules(5) update. - * - `update_default` is the update value from the config - * - `ignore` is a git_submodule_ignore_t value - see gitmodules(5) ignore. - * - `ignore_default` is the ignore value from the config - * - `fetch_recurse` is a git_submodule_recurse_t value - see gitmodules(5) - * fetchRecurseSubmodules. - * - `fetch_recurse_default` is the recurse value from the config - * - * - `repo` is the parent repository that contains this submodule. - * - `flags` after for internal use, tracking where this submodule has been - * found (head, index, config, workdir) and known status info, etc. - * - `head_oid` is the SHA1 for the submodule path in the repo HEAD. - * - `index_oid` is the SHA1 for the submodule recorded in the index. - * - `wd_oid` is the SHA1 for the HEAD of the checked out submodule. - * - * If the submodule has been added to .gitmodules but not yet git added, - * then the `index_oid` will be zero but still marked valid. If the - * submodule has been deleted, but the delete has not been committed yet, - * then the `index_oid` will be set, but the `url` will be NULL. - */ -struct git_submodule { - git_refcount rc; - - /* information from config */ - char *name; - char *path; /* important: may just point to "name" string */ - char *url; - char *branch; - git_submodule_update_t update; - git_submodule_update_t update_default; - git_submodule_ignore_t ignore; - git_submodule_ignore_t ignore_default; - git_submodule_recurse_t fetch_recurse; - git_submodule_recurse_t fetch_recurse_default; - - /* internal information */ - git_repository *repo; - uint32_t flags; - git_oid head_oid; - git_oid index_oid; - git_oid wd_oid; -}; - -/* Force revalidation of submodule data cache (alloc as needed) */ -extern int git_submodule_cache_refresh(git_repository *repo); - -/* Release all submodules */ -extern void git_submodule_cache_free(git_repository *repo); - -/* Additional flags on top of public GIT_SUBMODULE_STATUS values */ -enum { - GIT_SUBMODULE_STATUS__WD_SCANNED = (1u << 20), - GIT_SUBMODULE_STATUS__HEAD_OID_VALID = (1u << 21), - GIT_SUBMODULE_STATUS__INDEX_OID_VALID = (1u << 22), - GIT_SUBMODULE_STATUS__WD_OID_VALID = (1u << 23), - GIT_SUBMODULE_STATUS__HEAD_NOT_SUBMODULE = (1u << 24), - GIT_SUBMODULE_STATUS__INDEX_NOT_SUBMODULE = (1u << 25), - GIT_SUBMODULE_STATUS__WD_NOT_SUBMODULE = (1u << 26), - GIT_SUBMODULE_STATUS__INDEX_MULTIPLE_ENTRIES = (1u << 27), -}; - -#define GIT_SUBMODULE_STATUS__CLEAR_INTERNAL(S) \ - ((S) & ~(0xFFFFFFFFu << 20)) - -/* Internal lookup does not attempt to refresh cached data */ -extern int git_submodule__lookup( - git_submodule **out, git_repository *repo, const char *path); - -/* Internal status fn returns status and optionally the various OIDs */ -extern int git_submodule__status( - unsigned int *out_status, - git_oid *out_head_id, - git_oid *out_index_id, - git_oid *out_wd_id, - git_submodule *sm, - git_submodule_ignore_t ign); - -/* Open submodule repository as bare repo for quick HEAD check, etc. */ -extern int git_submodule_open_bare( - git_repository **repo, - git_submodule *submodule); - -extern int git_submodule_parse_ignore( - git_submodule_ignore_t *out, const char *value); -extern int git_submodule_parse_update( - git_submodule_update_t *out, const char *value); - -#endif diff --git a/vendor/libgit2/src/sysdir.c b/vendor/libgit2/src/sysdir.c deleted file mode 100644 index bf53d830f..000000000 --- a/vendor/libgit2/src/sysdir.c +++ /dev/null @@ -1,283 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "common.h" -#include "sysdir.h" -#include "global.h" -#include "buffer.h" -#include "path.h" -#include -#if GIT_WIN32 -#include "win32/findfile.h" -#endif - -static int git_sysdir_guess_programdata_dirs(git_buf *out) -{ -#ifdef GIT_WIN32 - return git_win32__find_programdata_dirs(out); -#else - git_buf_clear(out); - return 0; -#endif -} - -static int git_sysdir_guess_system_dirs(git_buf *out) -{ -#ifdef GIT_WIN32 - return git_win32__find_system_dirs(out, L"etc\\"); -#else - return git_buf_sets(out, "/etc"); -#endif -} - -static int git_sysdir_guess_global_dirs(git_buf *out) -{ -#ifdef GIT_WIN32 - return git_win32__find_global_dirs(out); -#else - int error = git__getenv(out, "HOME"); - - if (error == GIT_ENOTFOUND) { - giterr_clear(); - error = 0; - } - - return error; -#endif -} - -static int git_sysdir_guess_xdg_dirs(git_buf *out) -{ -#ifdef GIT_WIN32 - return git_win32__find_xdg_dirs(out); -#else - git_buf env = GIT_BUF_INIT; - int error; - - if ((error = git__getenv(&env, "XDG_CONFIG_HOME")) == 0) - error = git_buf_joinpath(out, env.ptr, "git"); - - if (error == GIT_ENOTFOUND && (error = git__getenv(&env, "HOME")) == 0) - error = git_buf_joinpath(out, env.ptr, ".config/git"); - - if (error == GIT_ENOTFOUND) { - giterr_clear(); - error = 0; - } - - git_buf_free(&env); - return error; -#endif -} - -static int git_sysdir_guess_template_dirs(git_buf *out) -{ -#ifdef GIT_WIN32 - return git_win32__find_system_dirs(out, L"share\\git-core\\templates"); -#else - return git_buf_sets(out, "/usr/share/git-core/templates"); -#endif -} - -typedef int (*git_sysdir_guess_cb)(git_buf *out); - -static git_buf git_sysdir__dirs[GIT_SYSDIR__MAX] = - { GIT_BUF_INIT, GIT_BUF_INIT, GIT_BUF_INIT, GIT_BUF_INIT, GIT_BUF_INIT }; - -static git_sysdir_guess_cb git_sysdir__dir_guess[GIT_SYSDIR__MAX] = { - git_sysdir_guess_system_dirs, - git_sysdir_guess_global_dirs, - git_sysdir_guess_xdg_dirs, - git_sysdir_guess_programdata_dirs, - git_sysdir_guess_template_dirs, -}; - -static int git_sysdir__dirs_shutdown_set = 0; - -int git_sysdir_global_init(void) -{ - git_sysdir_t i; - const git_buf *path; - int error = 0; - - for (i = 0; !error && i < GIT_SYSDIR__MAX; i++) - error = git_sysdir_get(&path, i); - - return error; -} - -void git_sysdir_global_shutdown(void) -{ - int i; - for (i = 0; i < GIT_SYSDIR__MAX; ++i) - git_buf_free(&git_sysdir__dirs[i]); - - git_sysdir__dirs_shutdown_set = 0; -} - -static int git_sysdir_check_selector(git_sysdir_t which) -{ - if (which < GIT_SYSDIR__MAX) - return 0; - - giterr_set(GITERR_INVALID, "config directory selector out of range"); - return -1; -} - - -int git_sysdir_get(const git_buf **out, git_sysdir_t which) -{ - assert(out); - - *out = NULL; - - GITERR_CHECK_ERROR(git_sysdir_check_selector(which)); - - if (!git_buf_len(&git_sysdir__dirs[which])) { - /* prepare shutdown if we're going to need it */ - if (!git_sysdir__dirs_shutdown_set) { - git__on_shutdown(git_sysdir_global_shutdown); - git_sysdir__dirs_shutdown_set = 1; - } - - GITERR_CHECK_ERROR( - git_sysdir__dir_guess[which](&git_sysdir__dirs[which])); - } - - *out = &git_sysdir__dirs[which]; - return 0; -} - -int git_sysdir_get_str( - char *out, - size_t outlen, - git_sysdir_t which) -{ - const git_buf *path = NULL; - - GITERR_CHECK_ERROR(git_sysdir_check_selector(which)); - GITERR_CHECK_ERROR(git_sysdir_get(&path, which)); - - if (!out || path->size >= outlen) { - giterr_set(GITERR_NOMEMORY, "Buffer is too short for the path"); - return GIT_EBUFS; - } - - git_buf_copy_cstr(out, outlen, path); - return 0; -} - -#define PATH_MAGIC "$PATH" - -int git_sysdir_set(git_sysdir_t which, const char *search_path) -{ - const char *expand_path = NULL; - git_buf merge = GIT_BUF_INIT; - - GITERR_CHECK_ERROR(git_sysdir_check_selector(which)); - - if (search_path != NULL) - expand_path = strstr(search_path, PATH_MAGIC); - - /* init with default if not yet done and needed (ignoring error) */ - if ((!search_path || expand_path) && - !git_buf_len(&git_sysdir__dirs[which])) - git_sysdir__dir_guess[which](&git_sysdir__dirs[which]); - - /* if $PATH is not referenced, then just set the path */ - if (!expand_path) - return git_buf_sets(&git_sysdir__dirs[which], search_path); - - /* otherwise set to join(before $PATH, old value, after $PATH) */ - if (expand_path > search_path) - git_buf_set(&merge, search_path, expand_path - search_path); - - if (git_buf_len(&git_sysdir__dirs[which])) - git_buf_join(&merge, GIT_PATH_LIST_SEPARATOR, - merge.ptr, git_sysdir__dirs[which].ptr); - - expand_path += strlen(PATH_MAGIC); - if (*expand_path) - git_buf_join(&merge, GIT_PATH_LIST_SEPARATOR, merge.ptr, expand_path); - - git_buf_swap(&git_sysdir__dirs[which], &merge); - git_buf_free(&merge); - - return git_buf_oom(&git_sysdir__dirs[which]) ? -1 : 0; -} - -static int git_sysdir_find_in_dirlist( - git_buf *path, - const char *name, - git_sysdir_t which, - const char *label) -{ - size_t len; - const char *scan, *next = NULL; - const git_buf *syspath; - - GITERR_CHECK_ERROR(git_sysdir_get(&syspath, which)); - if (!syspath || !git_buf_len(syspath)) - goto done; - - for (scan = git_buf_cstr(syspath); scan; scan = next) { - /* find unescaped separator or end of string */ - for (next = scan; *next; ++next) { - if (*next == GIT_PATH_LIST_SEPARATOR && - (next <= scan || next[-1] != '\\')) - break; - } - - len = (size_t)(next - scan); - next = (*next ? next + 1 : NULL); - if (!len) - continue; - - GITERR_CHECK_ERROR(git_buf_set(path, scan, len)); - if (name) - GITERR_CHECK_ERROR(git_buf_joinpath(path, path->ptr, name)); - - if (git_path_exists(path->ptr)) - return 0; - } - -done: - git_buf_free(path); - giterr_set(GITERR_OS, "The %s file '%s' doesn't exist", label, name); - return GIT_ENOTFOUND; -} - -int git_sysdir_find_system_file(git_buf *path, const char *filename) -{ - return git_sysdir_find_in_dirlist( - path, filename, GIT_SYSDIR_SYSTEM, "system"); -} - -int git_sysdir_find_global_file(git_buf *path, const char *filename) -{ - return git_sysdir_find_in_dirlist( - path, filename, GIT_SYSDIR_GLOBAL, "global"); -} - -int git_sysdir_find_xdg_file(git_buf *path, const char *filename) -{ - return git_sysdir_find_in_dirlist( - path, filename, GIT_SYSDIR_XDG, "global/xdg"); -} - -int git_sysdir_find_programdata_file(git_buf *path, const char *filename) -{ - return git_sysdir_find_in_dirlist( - path, filename, GIT_SYSDIR_PROGRAMDATA, "ProgramData"); -} - -int git_sysdir_find_template_dir(git_buf *path) -{ - return git_sysdir_find_in_dirlist( - path, NULL, GIT_SYSDIR_TEMPLATE, "template"); -} - diff --git a/vendor/libgit2/src/sysdir.h b/vendor/libgit2/src/sysdir.h deleted file mode 100644 index 12874fc85..000000000 --- a/vendor/libgit2/src/sysdir.h +++ /dev/null @@ -1,111 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_sysdir_h__ -#define INCLUDE_sysdir_h__ - -#include "common.h" -#include "posix.h" -#include "buffer.h" - -/** - * Find a "global" file (i.e. one in a user's home directory). - * - * @param path buffer to write the full path into - * @param filename name of file to find in the home directory - * @return 0 if found, GIT_ENOTFOUND if not found, or -1 on other OS error - */ -extern int git_sysdir_find_global_file(git_buf *path, const char *filename); - -/** - * Find an "XDG" file (i.e. one in user's XDG config path). - * - * @param path buffer to write the full path into - * @param filename name of file to find in the home directory - * @return 0 if found, GIT_ENOTFOUND if not found, or -1 on other OS error - */ -extern int git_sysdir_find_xdg_file(git_buf *path, const char *filename); - -/** - * Find a "system" file (i.e. one shared for all users of the system). - * - * @param path buffer to write the full path into - * @param filename name of file to find in the home directory - * @return 0 if found, GIT_ENOTFOUND if not found, or -1 on other OS error - */ -extern int git_sysdir_find_system_file(git_buf *path, const char *filename); - -/** - * Find a "ProgramData" file (i.e. one in %PROGRAMDATA%) - * - * @param path buffer to write the full path into - * @param filename name of file to find in the ProgramData directory - * @return 0 if found, GIT_ENOTFOUND if not found, or -1 on other OS error - */ -extern int git_sysdir_find_programdata_file(git_buf *path, const char *filename); - -/** - * Find template directory. - * - * @param path buffer to write the full path into - * @return 0 if found, GIT_ENOTFOUND if not found, or -1 on other OS error - */ -extern int git_sysdir_find_template_dir(git_buf *path); - -typedef enum { - GIT_SYSDIR_SYSTEM = 0, - GIT_SYSDIR_GLOBAL = 1, - GIT_SYSDIR_XDG = 2, - GIT_SYSDIR_PROGRAMDATA = 3, - GIT_SYSDIR_TEMPLATE = 4, - GIT_SYSDIR__MAX = 5, -} git_sysdir_t; - -/** - * Configures global data for configuration file search paths. - * - * @return 0 on success, <0 on failure - */ -extern int git_sysdir_global_init(void); - -/** - * Get the search path for global/system/xdg files - * - * @param out pointer to git_buf containing search path - * @param which which list of paths to return - * @return 0 on success, <0 on failure - */ -extern int git_sysdir_get(const git_buf **out, git_sysdir_t which); - -/** - * Get search path into a preallocated buffer - * - * @param out String buffer to write into - * @param outlen Size of string buffer - * @param which Which search path to return - * @return 0 on success, GIT_EBUFS if out is too small, <0 on other failure - */ - -extern int git_sysdir_get_str(char *out, size_t outlen, git_sysdir_t which); - -/** - * Set search paths for global/system/xdg files - * - * The first occurrence of the magic string "$PATH" in the new value will - * be replaced with the old value of the search path. - * - * @param which Which search path to modify - * @param paths New search path (separated by GIT_PATH_LIST_SEPARATOR) - * @return 0 on success, <0 on failure (allocation error) - */ -extern int git_sysdir_set(git_sysdir_t which, const char *paths); - -/** - * Free the configuration file search paths. - */ -extern void git_sysdir_global_shutdown(void); - -#endif /* INCLUDE_sysdir_h__ */ diff --git a/vendor/libgit2/src/tag.c b/vendor/libgit2/src/tag.c deleted file mode 100644 index c4bce1f22..000000000 --- a/vendor/libgit2/src/tag.c +++ /dev/null @@ -1,511 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "common.h" -#include "commit.h" -#include "tag.h" -#include "signature.h" -#include "message.h" -#include "git2/object.h" -#include "git2/repository.h" -#include "git2/signature.h" -#include "git2/odb_backend.h" - -void git_tag__free(void *_tag) -{ - git_tag *tag = _tag; - git_signature_free(tag->tagger); - git__free(tag->message); - git__free(tag->tag_name); - git__free(tag); -} - -int git_tag_target(git_object **target, const git_tag *t) -{ - assert(t); - return git_object_lookup(target, t->object.repo, &t->target, t->type); -} - -const git_oid *git_tag_target_id(const git_tag *t) -{ - assert(t); - return &t->target; -} - -git_otype git_tag_target_type(const git_tag *t) -{ - assert(t); - return t->type; -} - -const char *git_tag_name(const git_tag *t) -{ - assert(t); - return t->tag_name; -} - -const git_signature *git_tag_tagger(const git_tag *t) -{ - return t->tagger; -} - -const char *git_tag_message(const git_tag *t) -{ - assert(t); - return t->message; -} - -static int tag_error(const char *str) -{ - giterr_set(GITERR_TAG, "Failed to parse tag. %s", str); - return -1; -} - -static int tag_parse(git_tag *tag, const char *buffer, const char *buffer_end) -{ - static const char *tag_types[] = { - NULL, "commit\n", "tree\n", "blob\n", "tag\n" - }; - - unsigned int i; - size_t text_len, alloc_len; - char *search; - - if (git_oid__parse(&tag->target, &buffer, buffer_end, "object ") < 0) - return tag_error("Object field invalid"); - - if (buffer + 5 >= buffer_end) - return tag_error("Object too short"); - - if (memcmp(buffer, "type ", 5) != 0) - return tag_error("Type field not found"); - buffer += 5; - - tag->type = GIT_OBJ_BAD; - - for (i = 1; i < ARRAY_SIZE(tag_types); ++i) { - size_t type_length = strlen(tag_types[i]); - - if (buffer + type_length >= buffer_end) - return tag_error("Object too short"); - - if (memcmp(buffer, tag_types[i], type_length) == 0) { - tag->type = i; - buffer += type_length; - break; - } - } - - if (tag->type == GIT_OBJ_BAD) - return tag_error("Invalid object type"); - - if (buffer + 4 >= buffer_end) - return tag_error("Object too short"); - - if (memcmp(buffer, "tag ", 4) != 0) - return tag_error("Tag field not found"); - - buffer += 4; - - search = memchr(buffer, '\n', buffer_end - buffer); - if (search == NULL) - return tag_error("Object too short"); - - text_len = search - buffer; - - GITERR_CHECK_ALLOC_ADD(&alloc_len, text_len, 1); - tag->tag_name = git__malloc(alloc_len); - GITERR_CHECK_ALLOC(tag->tag_name); - - memcpy(tag->tag_name, buffer, text_len); - tag->tag_name[text_len] = '\0'; - - buffer = search + 1; - - tag->tagger = NULL; - if (buffer < buffer_end && *buffer != '\n') { - tag->tagger = git__malloc(sizeof(git_signature)); - GITERR_CHECK_ALLOC(tag->tagger); - - if (git_signature__parse(tag->tagger, &buffer, buffer_end, "tagger ", '\n') < 0) - return -1; - } - - tag->message = NULL; - if (buffer < buffer_end) { - if( *buffer != '\n' ) - return tag_error("No new line before message"); - - text_len = buffer_end - ++buffer; - - GITERR_CHECK_ALLOC_ADD(&alloc_len, text_len, 1); - tag->message = git__malloc(alloc_len); - GITERR_CHECK_ALLOC(tag->message); - - memcpy(tag->message, buffer, text_len); - tag->message[text_len] = '\0'; - } - - return 0; -} - -int git_tag__parse(void *_tag, git_odb_object *odb_obj) -{ - git_tag *tag = _tag; - const char *buffer = git_odb_object_data(odb_obj); - const char *buffer_end = buffer + git_odb_object_size(odb_obj); - - return tag_parse(tag, buffer, buffer_end); -} - -static int retrieve_tag_reference( - git_reference **tag_reference_out, - git_buf *ref_name_out, - git_repository *repo, - const char *tag_name) -{ - git_reference *tag_ref; - int error; - - *tag_reference_out = NULL; - - if (git_buf_joinpath(ref_name_out, GIT_REFS_TAGS_DIR, tag_name) < 0) - return -1; - - error = git_reference_lookup(&tag_ref, repo, ref_name_out->ptr); - if (error < 0) - return error; /* Be it not foundo or corrupted */ - - *tag_reference_out = tag_ref; - - return 0; -} - -static int retrieve_tag_reference_oid( - git_oid *oid, - git_buf *ref_name_out, - git_repository *repo, - const char *tag_name) -{ - if (git_buf_joinpath(ref_name_out, GIT_REFS_TAGS_DIR, tag_name) < 0) - return -1; - - return git_reference_name_to_id(oid, repo, ref_name_out->ptr); -} - -static int write_tag_annotation( - git_oid *oid, - git_repository *repo, - const char *tag_name, - const git_object *target, - const git_signature *tagger, - const char *message) -{ - git_buf tag = GIT_BUF_INIT; - git_odb *odb; - - git_oid__writebuf(&tag, "object ", git_object_id(target)); - git_buf_printf(&tag, "type %s\n", git_object_type2string(git_object_type(target))); - git_buf_printf(&tag, "tag %s\n", tag_name); - git_signature__writebuf(&tag, "tagger ", tagger); - git_buf_putc(&tag, '\n'); - - if (git_buf_puts(&tag, message) < 0) - goto on_error; - - if (git_repository_odb__weakptr(&odb, repo) < 0) - goto on_error; - - if (git_odb_write(oid, odb, tag.ptr, tag.size, GIT_OBJ_TAG) < 0) - goto on_error; - - git_buf_free(&tag); - return 0; - -on_error: - git_buf_free(&tag); - giterr_set(GITERR_OBJECT, "Failed to create tag annotation."); - return -1; -} - -static int git_tag_create__internal( - git_oid *oid, - git_repository *repo, - const char *tag_name, - const git_object *target, - const git_signature *tagger, - const char *message, - int allow_ref_overwrite, - int create_tag_annotation) -{ - git_reference *new_ref = NULL; - git_buf ref_name = GIT_BUF_INIT; - - int error; - - assert(repo && tag_name && target); - assert(!create_tag_annotation || (tagger && message)); - - if (git_object_owner(target) != repo) { - giterr_set(GITERR_INVALID, "The given target does not belong to this repository"); - return -1; - } - - error = retrieve_tag_reference_oid(oid, &ref_name, repo, tag_name); - if (error < 0 && error != GIT_ENOTFOUND) - goto cleanup; - - /** Ensure the tag name doesn't conflict with an already existing - * reference unless overwriting has explicitly been requested **/ - if (error == 0 && !allow_ref_overwrite) { - git_buf_free(&ref_name); - giterr_set(GITERR_TAG, "Tag already exists"); - return GIT_EEXISTS; - } - - if (create_tag_annotation) { - if (write_tag_annotation(oid, repo, tag_name, target, tagger, message) < 0) - return -1; - } else - git_oid_cpy(oid, git_object_id(target)); - - error = git_reference_create(&new_ref, repo, ref_name.ptr, oid, allow_ref_overwrite, NULL); - -cleanup: - git_reference_free(new_ref); - git_buf_free(&ref_name); - return error; -} - -int git_tag_create( - git_oid *oid, - git_repository *repo, - const char *tag_name, - const git_object *target, - const git_signature *tagger, - const char *message, - int allow_ref_overwrite) -{ - return git_tag_create__internal(oid, repo, tag_name, target, tagger, message, allow_ref_overwrite, 1); -} - -int git_tag_annotation_create( - git_oid *oid, - git_repository *repo, - const char *tag_name, - const git_object *target, - const git_signature *tagger, - const char *message) -{ - assert(oid && repo && tag_name && target && tagger && message); - - return write_tag_annotation(oid, repo, tag_name, target, tagger, message); -} - -int git_tag_create_lightweight( - git_oid *oid, - git_repository *repo, - const char *tag_name, - const git_object *target, - int allow_ref_overwrite) -{ - return git_tag_create__internal(oid, repo, tag_name, target, NULL, NULL, allow_ref_overwrite, 0); -} - -int git_tag_create_frombuffer(git_oid *oid, git_repository *repo, const char *buffer, int allow_ref_overwrite) -{ - git_tag tag; - int error; - git_odb *odb; - git_odb_stream *stream; - git_odb_object *target_obj; - - git_reference *new_ref = NULL; - git_buf ref_name = GIT_BUF_INIT; - - assert(oid && buffer); - - memset(&tag, 0, sizeof(tag)); - - if (git_repository_odb__weakptr(&odb, repo) < 0) - return -1; - - /* validate the buffer */ - if (tag_parse(&tag, buffer, buffer + strlen(buffer)) < 0) - return -1; - - /* validate the target */ - if (git_odb_read(&target_obj, odb, &tag.target) < 0) - goto on_error; - - if (tag.type != target_obj->cached.type) { - giterr_set(GITERR_TAG, "The type for the given target is invalid"); - goto on_error; - } - - error = retrieve_tag_reference_oid(oid, &ref_name, repo, tag.tag_name); - if (error < 0 && error != GIT_ENOTFOUND) - goto on_error; - - /* We don't need these objects after this */ - git_signature_free(tag.tagger); - git__free(tag.tag_name); - git__free(tag.message); - git_odb_object_free(target_obj); - - /** Ensure the tag name doesn't conflict with an already existing - * reference unless overwriting has explicitly been requested **/ - if (error == 0 && !allow_ref_overwrite) { - giterr_set(GITERR_TAG, "Tag already exists"); - return GIT_EEXISTS; - } - - /* write the buffer */ - if ((error = git_odb_open_wstream( - &stream, odb, strlen(buffer), GIT_OBJ_TAG)) < 0) - return error; - - if (!(error = git_odb_stream_write(stream, buffer, strlen(buffer)))) - error = git_odb_stream_finalize_write(oid, stream); - - git_odb_stream_free(stream); - - if (error < 0) { - git_buf_free(&ref_name); - return error; - } - - error = git_reference_create( - &new_ref, repo, ref_name.ptr, oid, allow_ref_overwrite, NULL); - - git_reference_free(new_ref); - git_buf_free(&ref_name); - - return error; - -on_error: - git_signature_free(tag.tagger); - git__free(tag.tag_name); - git__free(tag.message); - git_odb_object_free(target_obj); - return -1; -} - -int git_tag_delete(git_repository *repo, const char *tag_name) -{ - git_reference *tag_ref; - git_buf ref_name = GIT_BUF_INIT; - int error; - - error = retrieve_tag_reference(&tag_ref, &ref_name, repo, tag_name); - - git_buf_free(&ref_name); - - if (error < 0) - return error; - - error = git_reference_delete(tag_ref); - - git_reference_free(tag_ref); - - return error; -} - -typedef struct { - git_repository *repo; - git_tag_foreach_cb cb; - void *cb_data; -} tag_cb_data; - -static int tags_cb(const char *ref, void *data) -{ - int error; - git_oid oid; - tag_cb_data *d = (tag_cb_data *)data; - - if (git__prefixcmp(ref, GIT_REFS_TAGS_DIR) != 0) - return 0; /* no tag */ - - if (!(error = git_reference_name_to_id(&oid, d->repo, ref))) { - if ((error = d->cb(ref, &oid, d->cb_data)) != 0) - giterr_set_after_callback_function(error, "git_tag_foreach"); - } - - return error; -} - -int git_tag_foreach(git_repository *repo, git_tag_foreach_cb cb, void *cb_data) -{ - tag_cb_data data; - - assert(repo && cb); - - data.cb = cb; - data.cb_data = cb_data; - data.repo = repo; - - return git_reference_foreach_name(repo, &tags_cb, &data); -} - -typedef struct { - git_vector *taglist; - const char *pattern; -} tag_filter_data; - -#define GIT_REFS_TAGS_DIR_LEN strlen(GIT_REFS_TAGS_DIR) - -static int tag_list_cb(const char *tag_name, git_oid *oid, void *data) -{ - tag_filter_data *filter = (tag_filter_data *)data; - GIT_UNUSED(oid); - - if (!*filter->pattern || - p_fnmatch(filter->pattern, tag_name + GIT_REFS_TAGS_DIR_LEN, 0) == 0) - { - char *matched = git__strdup(tag_name + GIT_REFS_TAGS_DIR_LEN); - GITERR_CHECK_ALLOC(matched); - - return git_vector_insert(filter->taglist, matched); - } - - return 0; -} - -int git_tag_list_match(git_strarray *tag_names, const char *pattern, git_repository *repo) -{ - int error; - tag_filter_data filter; - git_vector taglist; - - assert(tag_names && repo && pattern); - - if ((error = git_vector_init(&taglist, 8, NULL)) < 0) - return error; - - filter.taglist = &taglist; - filter.pattern = pattern; - - error = git_tag_foreach(repo, &tag_list_cb, (void *)&filter); - - if (error < 0) - git_vector_free(&taglist); - - tag_names->strings = - (char **)git_vector_detach(&tag_names->count, NULL, &taglist); - - return 0; -} - -int git_tag_list(git_strarray *tag_names, git_repository *repo) -{ - return git_tag_list_match(tag_names, "", repo); -} - -int git_tag_peel(git_object **tag_target, const git_tag *tag) -{ - return git_object_peel(tag_target, (const git_object *)tag, GIT_OBJ_ANY); -} diff --git a/vendor/libgit2/src/tag.h b/vendor/libgit2/src/tag.h deleted file mode 100644 index d0cd393c7..000000000 --- a/vendor/libgit2/src/tag.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_tag_h__ -#define INCLUDE_tag_h__ - -#include "git2/tag.h" -#include "repository.h" -#include "odb.h" - -struct git_tag { - git_object object; - - git_oid target; - git_otype type; - - char *tag_name; - git_signature *tagger; - char *message; -}; - -void git_tag__free(void *tag); -int git_tag__parse(void *tag, git_odb_object *obj); - -#endif diff --git a/vendor/libgit2/src/thread-utils.c b/vendor/libgit2/src/thread-utils.c deleted file mode 100644 index dc9b2f09e..000000000 --- a/vendor/libgit2/src/thread-utils.c +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#include "common.h" -#include "thread-utils.h" - -#ifdef _WIN32 -#ifndef WIN32_LEAN_AND_MEAN -# define WIN32_LEAN_AND_MEAN -#endif -# include -#elif defined(hpux) || defined(__hpux) || defined(_hpux) -# include -#endif - -/* - * By doing this in two steps we can at least get - * the function to be somewhat coherent, even - * with this disgusting nest of #ifdefs. - */ -#ifndef _SC_NPROCESSORS_ONLN -# ifdef _SC_NPROC_ONLN -# define _SC_NPROCESSORS_ONLN _SC_NPROC_ONLN -# elif defined _SC_CRAY_NCPU -# define _SC_NPROCESSORS_ONLN _SC_CRAY_NCPU -# endif -#endif - -int git_online_cpus(void) -{ -#ifdef _SC_NPROCESSORS_ONLN - long ncpus; -#endif - -#ifdef _WIN32 - SYSTEM_INFO info; - GetSystemInfo(&info); - - if ((int)info.dwNumberOfProcessors > 0) - return (int)info.dwNumberOfProcessors; -#elif defined(hpux) || defined(__hpux) || defined(_hpux) - struct pst_dynamic psd; - - if (!pstat_getdynamic(&psd, sizeof(psd), (size_t)1, 0)) - return (int)psd.psd_proc_cnt; -#endif - -#ifdef _SC_NPROCESSORS_ONLN - if ((ncpus = (long)sysconf(_SC_NPROCESSORS_ONLN)) > 0) - return (int)ncpus; -#endif - - return 1; -} diff --git a/vendor/libgit2/src/thread-utils.h b/vendor/libgit2/src/thread-utils.h deleted file mode 100644 index 14c8a41ff..000000000 --- a/vendor/libgit2/src/thread-utils.h +++ /dev/null @@ -1,286 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_thread_utils_h__ -#define INCLUDE_thread_utils_h__ - -/* Common operations even if threading has been disabled */ -typedef struct { -#if defined(GIT_WIN32) - volatile long val; -#else - volatile int val; -#endif -} git_atomic; - -#ifdef GIT_ARCH_64 - -typedef struct { -#if defined(GIT_WIN32) - __int64 val; -#else - int64_t val; -#endif -} git_atomic64; - -typedef git_atomic64 git_atomic_ssize; - -#define git_atomic_ssize_add git_atomic64_add - -#else - -typedef git_atomic git_atomic_ssize; - -#define git_atomic_ssize_add git_atomic_add - -#endif - -#ifdef GIT_THREADS - -#if !defined(GIT_WIN32) - -typedef struct { - pthread_t thread; -} git_thread; - -#define git_thread_create(git_thread_ptr, attr, start_routine, arg) \ - pthread_create(&(git_thread_ptr)->thread, attr, start_routine, arg) -#define git_thread_join(git_thread_ptr, status) \ - pthread_join((git_thread_ptr)->thread, status) - -#endif - -/* Pthreads Mutex */ -#define git_mutex pthread_mutex_t -#define git_mutex_init(a) pthread_mutex_init(a, NULL) -#define git_mutex_lock(a) pthread_mutex_lock(a) -#define git_mutex_unlock(a) pthread_mutex_unlock(a) -#define git_mutex_free(a) pthread_mutex_destroy(a) - -/* Pthreads condition vars */ -#define git_cond pthread_cond_t -#define git_cond_init(c) pthread_cond_init(c, NULL) -#define git_cond_free(c) pthread_cond_destroy(c) -#define git_cond_wait(c, l) pthread_cond_wait(c, l) -#define git_cond_signal(c) pthread_cond_signal(c) -#define git_cond_broadcast(c) pthread_cond_broadcast(c) - -/* Pthread (-ish) rwlock - * - * This differs from normal pthreads rwlocks in two ways: - * 1. Separate APIs for releasing read locks and write locks (as - * opposed to the pure POSIX API which only has one unlock fn) - * 2. You should not use recursive read locks (i.e. grabbing a read - * lock in a thread that already holds a read lock) because the - * Windows implementation doesn't support it - */ -#define git_rwlock pthread_rwlock_t -#define git_rwlock_init(a) pthread_rwlock_init(a, NULL) -#define git_rwlock_rdlock(a) pthread_rwlock_rdlock(a) -#define git_rwlock_rdunlock(a) pthread_rwlock_rdunlock(a) -#define git_rwlock_wrlock(a) pthread_rwlock_wrlock(a) -#define git_rwlock_wrunlock(a) pthread_rwlock_wrunlock(a) -#define git_rwlock_free(a) pthread_rwlock_destroy(a) -#define GIT_RWLOCK_STATIC_INIT PTHREAD_RWLOCK_INITIALIZER - -#ifndef GIT_WIN32 -#define pthread_rwlock_rdunlock pthread_rwlock_unlock -#define pthread_rwlock_wrunlock pthread_rwlock_unlock -#endif - - -GIT_INLINE(void) git_atomic_set(git_atomic *a, int val) -{ -#if defined(GIT_WIN32) - InterlockedExchange(&a->val, (LONG)val); -#elif defined(__GNUC__) - __sync_lock_test_and_set(&a->val, val); -#else -# error "Unsupported architecture for atomic operations" -#endif -} - -GIT_INLINE(int) git_atomic_inc(git_atomic *a) -{ -#if defined(GIT_WIN32) - return InterlockedIncrement(&a->val); -#elif defined(__GNUC__) - return __sync_add_and_fetch(&a->val, 1); -#else -# error "Unsupported architecture for atomic operations" -#endif -} - -GIT_INLINE(int) git_atomic_add(git_atomic *a, int32_t addend) -{ -#if defined(GIT_WIN32) - return InterlockedExchangeAdd(&a->val, addend); -#elif defined(__GNUC__) - return __sync_add_and_fetch(&a->val, addend); -#else -# error "Unsupported architecture for atomic operations" -#endif -} - -GIT_INLINE(int) git_atomic_dec(git_atomic *a) -{ -#if defined(GIT_WIN32) - return InterlockedDecrement(&a->val); -#elif defined(__GNUC__) - return __sync_sub_and_fetch(&a->val, 1); -#else -# error "Unsupported architecture for atomic operations" -#endif -} - -GIT_INLINE(void *) git___compare_and_swap( - void * volatile *ptr, void *oldval, void *newval) -{ - volatile void *foundval; -#if defined(GIT_WIN32) - foundval = InterlockedCompareExchangePointer((volatile PVOID *)ptr, newval, oldval); -#elif defined(__GNUC__) - foundval = __sync_val_compare_and_swap(ptr, oldval, newval); -#else -# error "Unsupported architecture for atomic operations" -#endif - return (foundval == oldval) ? oldval : newval; -} - -GIT_INLINE(volatile void *) git___swap( - void * volatile *ptr, void *newval) -{ -#if defined(GIT_WIN32) - return InterlockedExchangePointer(ptr, newval); -#else - return __sync_lock_test_and_set(ptr, newval); -#endif -} - -#ifdef GIT_ARCH_64 - -GIT_INLINE(int64_t) git_atomic64_add(git_atomic64 *a, int64_t addend) -{ -#if defined(GIT_WIN32) - return InterlockedExchangeAdd64(&a->val, addend); -#elif defined(__GNUC__) - return __sync_add_and_fetch(&a->val, addend); -#else -# error "Unsupported architecture for atomic operations" -#endif -} - -#endif - -#else - -#define git_thread unsigned int -#define git_thread_create(thread, attr, start_routine, arg) 0 -#define git_thread_join(id, status) (void)0 - -/* Pthreads Mutex */ -#define git_mutex unsigned int -GIT_INLINE(int) git_mutex_init(git_mutex *mutex) \ - { GIT_UNUSED(mutex); return 0; } -GIT_INLINE(int) git_mutex_lock(git_mutex *mutex) \ - { GIT_UNUSED(mutex); return 0; } -#define git_mutex_unlock(a) (void)0 -#define git_mutex_free(a) (void)0 - -/* Pthreads condition vars */ -#define git_cond unsigned int -#define git_cond_init(c, a) (void)0 -#define git_cond_free(c) (void)0 -#define git_cond_wait(c, l) (void)0 -#define git_cond_signal(c) (void)0 -#define git_cond_broadcast(c) (void)0 - -/* Pthreads rwlock */ -#define git_rwlock unsigned int -#define git_rwlock_init(a) 0 -#define git_rwlock_rdlock(a) 0 -#define git_rwlock_rdunlock(a) (void)0 -#define git_rwlock_wrlock(a) 0 -#define git_rwlock_wrunlock(a) (void)0 -#define git_rwlock_free(a) (void)0 -#define GIT_RWLOCK_STATIC_INIT 0 - - -GIT_INLINE(void) git_atomic_set(git_atomic *a, int val) -{ - a->val = val; -} - -GIT_INLINE(int) git_atomic_inc(git_atomic *a) -{ - return ++a->val; -} - -GIT_INLINE(int) git_atomic_add(git_atomic *a, int32_t addend) -{ - a->val += addend; - return a->val; -} - -GIT_INLINE(int) git_atomic_dec(git_atomic *a) -{ - return --a->val; -} - -GIT_INLINE(void *) git___compare_and_swap( - void * volatile *ptr, void *oldval, void *newval) -{ - if (*ptr == oldval) - *ptr = newval; - else - oldval = newval; - return oldval; -} - -GIT_INLINE(volatile void *) git___swap( - void * volatile *ptr, void *newval) -{ - volatile void *old = *ptr; - *ptr = newval; - return old; -} - -#ifdef GIT_ARCH_64 - -GIT_INLINE(int64_t) git_atomic64_add(git_atomic64 *a, int64_t addend) -{ - a->val += addend; - return a->val; -} - -#endif - -#endif - -GIT_INLINE(int) git_atomic_get(git_atomic *a) -{ - return (int)a->val; -} - -/* Atomically replace oldval with newval - * @return oldval if it was replaced or newval if it was not - */ -#define git__compare_and_swap(P,O,N) \ - git___compare_and_swap((void * volatile *)P, O, N) - -#define git__swap(ptr, val) (void *)git___swap((void * volatile *)&ptr, val) - -extern int git_online_cpus(void); - -#if defined(GIT_THREADS) && defined(_MSC_VER) -# define GIT_MEMORY_BARRIER MemoryBarrier() -#elif defined(GIT_THREADS) -# define GIT_MEMORY_BARRIER __sync_synchronize() -#else -# define GIT_MEMORY_BARRIER /* noop */ -#endif - -#endif /* INCLUDE_thread_utils_h__ */ diff --git a/vendor/libgit2/src/tls_stream.c b/vendor/libgit2/src/tls_stream.c deleted file mode 100644 index 83e2d064a..000000000 --- a/vendor/libgit2/src/tls_stream.c +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "git2/errors.h" -#include "common.h" - -#include "openssl_stream.h" -#include "stransport_stream.h" - -static git_stream_cb tls_ctor; - -int git_stream_register_tls(git_stream_cb ctor) -{ - tls_ctor = ctor; - - return 0; -} - -int git_tls_stream_new(git_stream **out, const char *host, const char *port) -{ - - if (tls_ctor) - return tls_ctor(out, host, port); - -#ifdef GIT_SECURE_TRANSPORT - return git_stransport_stream_new(out, host, port); -#elif defined(GIT_OPENSSL) - return git_openssl_stream_new(out, host, port); -#else - GIT_UNUSED(out); - GIT_UNUSED(host); - GIT_UNUSED(port); - - giterr_set(GITERR_SSL, "there is no TLS stream available"); - return -1; -#endif -} diff --git a/vendor/libgit2/src/tls_stream.h b/vendor/libgit2/src/tls_stream.h deleted file mode 100644 index 98a704174..000000000 --- a/vendor/libgit2/src/tls_stream.h +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_tls_stream_h__ -#define INCLUDE_tls_stream_h__ - -#include "git2/sys/stream.h" - -/** - * Create a TLS stream with the most appropriate backend available for - * the current platform. - * - * This allows us to ask for a SecureTransport or OpenSSL stream - * according to being on general Unix vs OS X. - */ -extern int git_tls_stream_new(git_stream **out, const char *host, const char *port); - -#endif diff --git a/vendor/libgit2/src/trace.c b/vendor/libgit2/src/trace.c deleted file mode 100644 index ee5039f56..000000000 --- a/vendor/libgit2/src/trace.c +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "buffer.h" -#include "common.h" -#include "global.h" -#include "trace.h" -#include "git2/trace.h" - -#ifdef GIT_TRACE - -struct git_trace_data git_trace__data = {0}; - -#endif - -int git_trace_set(git_trace_level_t level, git_trace_callback callback) -{ -#ifdef GIT_TRACE - assert(level == 0 || callback != NULL); - - git_trace__data.level = level; - git_trace__data.callback = callback; - GIT_MEMORY_BARRIER; - - return 0; -#else - GIT_UNUSED(level); - GIT_UNUSED(callback); - - giterr_set(GITERR_INVALID, - "This version of libgit2 was not built with tracing."); - return -1; -#endif -} diff --git a/vendor/libgit2/src/trace.h b/vendor/libgit2/src/trace.h deleted file mode 100644 index 486084d01..000000000 --- a/vendor/libgit2/src/trace.h +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_trace_h__ -#define INCLUDE_trace_h__ - -#include -#include "buffer.h" - -#ifdef GIT_TRACE - -struct git_trace_data { - git_trace_level_t level; - git_trace_callback callback; -}; - -extern struct git_trace_data git_trace__data; - -GIT_INLINE(void) git_trace__write_fmt( - git_trace_level_t level, - const char *fmt, ...) -{ - git_trace_callback callback = git_trace__data.callback; - git_buf message = GIT_BUF_INIT; - va_list ap; - - va_start(ap, fmt); - git_buf_vprintf(&message, fmt, ap); - va_end(ap); - - callback(level, git_buf_cstr(&message)); - - git_buf_free(&message); -} - -#define git_trace_level() (git_trace__data.level) -#define git_trace(l, ...) { \ - if (git_trace__data.level >= l && \ - git_trace__data.callback != NULL) { \ - git_trace__write_fmt(l, __VA_ARGS__); \ - } \ - } - -#else - -GIT_INLINE(void) git_trace__null( - git_trace_level_t level, - const char *fmt, ...) -{ - GIT_UNUSED(level); - GIT_UNUSED(fmt); -} - -#define git_trace_level() ((void)0) -#define git_trace git_trace__null - -#endif - -#endif diff --git a/vendor/libgit2/src/transaction.c b/vendor/libgit2/src/transaction.c deleted file mode 100644 index 2c8a1e8bd..000000000 --- a/vendor/libgit2/src/transaction.c +++ /dev/null @@ -1,393 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "common.h" -#include "repository.h" -#include "strmap.h" -#include "refdb.h" -#include "pool.h" -#include "reflog.h" -#include "signature.h" -#include "config.h" - -#include "git2/transaction.h" -#include "git2/signature.h" -#include "git2/sys/refs.h" -#include "git2/sys/refdb_backend.h" - -GIT__USE_STRMAP - -typedef enum { - TRANSACTION_NONE, - TRANSACTION_REFS, - TRANSACTION_CONFIG, -} transaction_t; - -typedef struct { - const char *name; - void *payload; - - git_ref_t ref_type; - union { - git_oid id; - char *symbolic; - } target; - git_reflog *reflog; - - const char *message; - git_signature *sig; - - unsigned int committed :1, - remove :1; -} transaction_node; - -struct git_transaction { - transaction_t type; - git_repository *repo; - git_refdb *db; - git_config *cfg; - - git_strmap *locks; - git_pool pool; -}; - -int git_transaction_config_new(git_transaction **out, git_config *cfg) -{ - git_transaction *tx; - assert(out && cfg); - - tx = git__calloc(1, sizeof(git_transaction)); - GITERR_CHECK_ALLOC(tx); - - tx->type = TRANSACTION_CONFIG; - tx->cfg = cfg; - *out = tx; - return 0; -} - -int git_transaction_new(git_transaction **out, git_repository *repo) -{ - int error; - git_pool pool; - git_transaction *tx = NULL; - - assert(out && repo); - - git_pool_init(&pool, 1); - - tx = git_pool_mallocz(&pool, sizeof(git_transaction)); - if (!tx) { - error = -1; - goto on_error; - } - - if ((error = git_strmap_alloc(&tx->locks)) < 0) { - error = -1; - goto on_error; - } - - if ((error = git_repository_refdb(&tx->db, repo)) < 0) - goto on_error; - - tx->type = TRANSACTION_REFS; - memcpy(&tx->pool, &pool, sizeof(git_pool)); - tx->repo = repo; - *out = tx; - return 0; - -on_error: - git_pool_clear(&pool); - return error; -} - -int git_transaction_lock_ref(git_transaction *tx, const char *refname) -{ - int error; - transaction_node *node; - - assert(tx && refname); - - node = git_pool_mallocz(&tx->pool, sizeof(transaction_node)); - GITERR_CHECK_ALLOC(node); - - node->name = git_pool_strdup(&tx->pool, refname); - GITERR_CHECK_ALLOC(node->name); - - if ((error = git_refdb_lock(&node->payload, tx->db, refname)) < 0) - return error; - - git_strmap_insert(tx->locks, node->name, node, error); - if (error < 0) - goto cleanup; - - return 0; - -cleanup: - git_refdb_unlock(tx->db, node->payload, false, false, NULL, NULL, NULL); - - return error; -} - -static int find_locked(transaction_node **out, git_transaction *tx, const char *refname) -{ - git_strmap_iter pos; - transaction_node *node; - - pos = git_strmap_lookup_index(tx->locks, refname); - if (!git_strmap_valid_index(tx->locks, pos)) { - giterr_set(GITERR_REFERENCE, "the specified reference is not locked"); - return GIT_ENOTFOUND; - } - - node = git_strmap_value_at(tx->locks, pos); - - *out = node; - return 0; -} - -static int copy_common(transaction_node *node, git_transaction *tx, const git_signature *sig, const char *msg) -{ - if (sig && git_signature__pdup(&node->sig, sig, &tx->pool) < 0) - return -1; - - if (!node->sig) { - git_signature *tmp; - int error; - - if (git_reference__log_signature(&tmp, tx->repo) < 0) - return -1; - - /* make sure the sig we use is in our pool */ - error = git_signature__pdup(&node->sig, tmp, &tx->pool); - git_signature_free(tmp); - if (error < 0) - return error; - } - - if (msg) { - node->message = git_pool_strdup(&tx->pool, msg); - GITERR_CHECK_ALLOC(node->message); - } - - return 0; -} - -int git_transaction_set_target(git_transaction *tx, const char *refname, const git_oid *target, const git_signature *sig, const char *msg) -{ - int error; - transaction_node *node; - - assert(tx && refname && target); - - if ((error = find_locked(&node, tx, refname)) < 0) - return error; - - if ((error = copy_common(node, tx, sig, msg)) < 0) - return error; - - git_oid_cpy(&node->target.id, target); - node->ref_type = GIT_REF_OID; - - return 0; -} - -int git_transaction_set_symbolic_target(git_transaction *tx, const char *refname, const char *target, const git_signature *sig, const char *msg) -{ - int error; - transaction_node *node; - - assert(tx && refname && target); - - if ((error = find_locked(&node, tx, refname)) < 0) - return error; - - if ((error = copy_common(node, tx, sig, msg)) < 0) - return error; - - node->target.symbolic = git_pool_strdup(&tx->pool, target); - GITERR_CHECK_ALLOC(node->target.symbolic); - node->ref_type = GIT_REF_SYMBOLIC; - - return 0; -} - -int git_transaction_remove(git_transaction *tx, const char *refname) -{ - int error; - transaction_node *node; - - if ((error = find_locked(&node, tx, refname)) < 0) - return error; - - node->remove = true; - node->ref_type = GIT_REF_OID; /* the id will be ignored */ - - return 0; -} - -static int dup_reflog(git_reflog **out, const git_reflog *in, git_pool *pool) -{ - git_reflog *reflog; - git_reflog_entry *entries; - size_t len, i; - - reflog = git_pool_mallocz(pool, sizeof(git_reflog)); - GITERR_CHECK_ALLOC(reflog); - - reflog->ref_name = git_pool_strdup(pool, in->ref_name); - GITERR_CHECK_ALLOC(reflog->ref_name); - - len = in->entries.length; - reflog->entries.length = len; - reflog->entries.contents = git_pool_mallocz(pool, len * sizeof(void *)); - GITERR_CHECK_ALLOC(reflog->entries.contents); - - entries = git_pool_mallocz(pool, len * sizeof(git_reflog_entry)); - GITERR_CHECK_ALLOC(entries); - - for (i = 0; i < len; i++) { - const git_reflog_entry *src; - git_reflog_entry *tgt; - - tgt = &entries[i]; - reflog->entries.contents[i] = tgt; - - src = git_vector_get(&in->entries, i); - git_oid_cpy(&tgt->oid_old, &src->oid_old); - git_oid_cpy(&tgt->oid_cur, &src->oid_cur); - - tgt->msg = git_pool_strdup(pool, src->msg); - GITERR_CHECK_ALLOC(tgt->msg); - - if (git_signature__pdup(&tgt->committer, src->committer, pool) < 0) - return -1; - } - - - *out = reflog; - return 0; -} - -int git_transaction_set_reflog(git_transaction *tx, const char *refname, const git_reflog *reflog) -{ - int error; - transaction_node *node; - - assert(tx && refname && reflog); - - if ((error = find_locked(&node, tx, refname)) < 0) - return error; - - if ((error = dup_reflog(&node->reflog, reflog, &tx->pool)) < 0) - return error; - - return 0; -} - -static int update_target(git_refdb *db, transaction_node *node) -{ - git_reference *ref; - int error, update_reflog; - - if (node->ref_type == GIT_REF_OID) { - ref = git_reference__alloc(node->name, &node->target.id, NULL); - } else if (node->ref_type == GIT_REF_SYMBOLIC) { - ref = git_reference__alloc_symbolic(node->name, node->target.symbolic); - } else { - abort(); - } - - GITERR_CHECK_ALLOC(ref); - update_reflog = node->reflog == NULL; - - if (node->remove) { - error = git_refdb_unlock(db, node->payload, 2, false, ref, NULL, NULL); - } else if (node->ref_type == GIT_REF_OID) { - error = git_refdb_unlock(db, node->payload, true, update_reflog, ref, node->sig, node->message); - } else if (node->ref_type == GIT_REF_SYMBOLIC) { - error = git_refdb_unlock(db, node->payload, true, update_reflog, ref, node->sig, node->message); - } else { - abort(); - } - - git_reference_free(ref); - node->committed = true; - - return error; -} - -int git_transaction_commit(git_transaction *tx) -{ - transaction_node *node; - git_strmap_iter pos; - int error = 0; - - assert(tx); - - if (tx->type == TRANSACTION_CONFIG) { - error = git_config_unlock(tx->cfg, true); - tx->cfg = NULL; - - return error; - } - - for (pos = kh_begin(tx->locks); pos < kh_end(tx->locks); pos++) { - if (!git_strmap_has_data(tx->locks, pos)) - continue; - - node = git_strmap_value_at(tx->locks, pos); - if (node->reflog) { - if ((error = tx->db->backend->reflog_write(tx->db->backend, node->reflog)) < 0) - return error; - } - - if (node->ref_type != GIT_REF_INVALID) { - if ((error = update_target(tx->db, node)) < 0) - return error; - } - } - - return 0; -} - -void git_transaction_free(git_transaction *tx) -{ - transaction_node *node; - git_pool pool; - git_strmap_iter pos; - - assert(tx); - - if (tx->type == TRANSACTION_CONFIG) { - if (tx->cfg) { - git_config_unlock(tx->cfg, false); - git_config_free(tx->cfg); - } - - git__free(tx); - return; - } - - /* start by unlocking the ones we've left hanging, if any */ - for (pos = kh_begin(tx->locks); pos < kh_end(tx->locks); pos++) { - if (!git_strmap_has_data(tx->locks, pos)) - continue; - - node = git_strmap_value_at(tx->locks, pos); - if (node->committed) - continue; - - git_refdb_unlock(tx->db, node->payload, false, false, NULL, NULL, NULL); - } - - git_refdb_free(tx->db); - git_strmap_free(tx->locks); - - /* tx is inside the pool, so we need to extract the data */ - memcpy(&pool, &tx->pool, sizeof(git_pool)); - git_pool_clear(&pool); -} diff --git a/vendor/libgit2/src/transaction.h b/vendor/libgit2/src/transaction.h deleted file mode 100644 index 780c06830..000000000 --- a/vendor/libgit2/src/transaction.h +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_transaction_h__ -#define INCLUDE_transaction_h__ - -#include "common.h" - -int git_transaction_config_new(git_transaction **out, git_config *cfg); - -#endif diff --git a/vendor/libgit2/src/transport.c b/vendor/libgit2/src/transport.c deleted file mode 100644 index 327052fa3..000000000 --- a/vendor/libgit2/src/transport.c +++ /dev/null @@ -1,222 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#include "common.h" -#include "git2/types.h" -#include "git2/remote.h" -#include "git2/net.h" -#include "git2/transport.h" -#include "git2/sys/transport.h" -#include "path.h" - -typedef struct transport_definition { - char *prefix; - git_transport_cb fn; - void *param; -} transport_definition; - -static git_smart_subtransport_definition http_subtransport_definition = { git_smart_subtransport_http, 1, NULL }; -static git_smart_subtransport_definition git_subtransport_definition = { git_smart_subtransport_git, 0, NULL }; -#ifdef GIT_SSH -static git_smart_subtransport_definition ssh_subtransport_definition = { git_smart_subtransport_ssh, 0, NULL }; -#endif - -static transport_definition local_transport_definition = { "file://", git_transport_local, NULL }; - -static transport_definition transports[] = { - { "git://", git_transport_smart, &git_subtransport_definition }, - { "http://", git_transport_smart, &http_subtransport_definition }, -#if defined(GIT_OPENSSL) || defined(GIT_WINHTTP) || defined(GIT_SECURE_TRANSPORT) - { "https://", git_transport_smart, &http_subtransport_definition }, -#endif - { "file://", git_transport_local, NULL }, -#ifdef GIT_SSH - { "ssh://", git_transport_smart, &ssh_subtransport_definition }, - { "ssh+git://", git_transport_smart, &ssh_subtransport_definition }, - { "git+ssh://", git_transport_smart, &ssh_subtransport_definition }, -#endif - { NULL, 0, 0 } -}; - -static git_vector custom_transports = GIT_VECTOR_INIT; - -#define GIT_TRANSPORT_COUNT (sizeof(transports)/sizeof(transports[0])) - 1 - -static transport_definition * transport_find_by_url(const char *url) -{ - size_t i = 0; - transport_definition *d; - - /* Find a user transport who wants to deal with this URI */ - git_vector_foreach(&custom_transports, i, d) { - if (strncasecmp(url, d->prefix, strlen(d->prefix)) == 0) { - return d; - } - } - - /* Find a system transport for this URI */ - for (i = 0; i < GIT_TRANSPORT_COUNT; ++i) { - d = &transports[i]; - - if (strncasecmp(url, d->prefix, strlen(d->prefix)) == 0) { - return d; - } - } - - return NULL; -} - -static int transport_find_fn( - git_transport_cb *out, - const char *url, - void **param) -{ - transport_definition *definition = transport_find_by_url(url); - -#ifdef GIT_WIN32 - /* On Windows, it might not be possible to discern between absolute local - * and ssh paths - first check if this is a valid local path that points - * to a directory and if so assume local path, else assume SSH */ - - /* Check to see if the path points to a file on the local file system */ - if (!definition && git_path_exists(url) && git_path_isdir(url)) - definition = &local_transport_definition; -#endif - - /* For other systems, perform the SSH check first, to avoid going to the - * filesystem if it is not necessary */ - - /* It could be a SSH remote path. Check to see if there's a : - * SSH is an unsupported transport mechanism in this version of libgit2 */ - if (!definition && strrchr(url, ':')) { - // re-search transports again with ssh:// as url so that we can find a third party ssh transport - definition = transport_find_by_url("ssh://"); - } - -#ifndef GIT_WIN32 - /* Check to see if the path points to a file on the local file system */ - if (!definition && git_path_exists(url) && git_path_isdir(url)) - definition = &local_transport_definition; -#endif - - if (!definition) - return GIT_ENOTFOUND; - - *out = definition->fn; - *param = definition->param; - - return 0; -} - -/************** - * Public API * - **************/ - -int git_transport_new(git_transport **out, git_remote *owner, const char *url) -{ - git_transport_cb fn; - git_transport *transport; - void *param; - int error; - - if ((error = transport_find_fn(&fn, url, ¶m)) == GIT_ENOTFOUND) { - giterr_set(GITERR_NET, "Unsupported URL protocol"); - return -1; - } else if (error < 0) - return error; - - if ((error = fn(&transport, owner, param)) < 0) - return error; - - GITERR_CHECK_VERSION(transport, GIT_TRANSPORT_VERSION, "git_transport"); - - *out = transport; - - return 0; -} - -int git_transport_register( - const char *scheme, - git_transport_cb cb, - void *param) -{ - git_buf prefix = GIT_BUF_INIT; - transport_definition *d, *definition = NULL; - size_t i; - int error = 0; - - assert(scheme); - assert(cb); - - if ((error = git_buf_printf(&prefix, "%s://", scheme)) < 0) - goto on_error; - - git_vector_foreach(&custom_transports, i, d) { - if (strcasecmp(d->prefix, prefix.ptr) == 0) { - error = GIT_EEXISTS; - goto on_error; - } - } - - definition = git__calloc(1, sizeof(transport_definition)); - GITERR_CHECK_ALLOC(definition); - - definition->prefix = git_buf_detach(&prefix); - definition->fn = cb; - definition->param = param; - - if (git_vector_insert(&custom_transports, definition) < 0) - goto on_error; - - return 0; - -on_error: - git_buf_free(&prefix); - git__free(definition); - return error; -} - -int git_transport_unregister(const char *scheme) -{ - git_buf prefix = GIT_BUF_INIT; - transport_definition *d; - size_t i; - int error = 0; - - assert(scheme); - - if ((error = git_buf_printf(&prefix, "%s://", scheme)) < 0) - goto done; - - git_vector_foreach(&custom_transports, i, d) { - if (strcasecmp(d->prefix, prefix.ptr) == 0) { - if ((error = git_vector_remove(&custom_transports, i)) < 0) - goto done; - - git__free(d->prefix); - git__free(d); - - if (!custom_transports.length) - git_vector_free(&custom_transports); - - error = 0; - goto done; - } - } - - error = GIT_ENOTFOUND; - -done: - git_buf_free(&prefix); - return error; -} - -int git_transport_init(git_transport *opts, unsigned int version) -{ - GIT_INIT_STRUCTURE_FROM_TEMPLATE( - opts, version, git_transport, GIT_TRANSPORT_INIT); - return 0; -} diff --git a/vendor/libgit2/src/transports/auth.c b/vendor/libgit2/src/transports/auth.c deleted file mode 100644 index c1154db34..000000000 --- a/vendor/libgit2/src/transports/auth.c +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "git2.h" -#include "buffer.h" -#include "auth.h" - -static int basic_next_token( - git_buf *out, git_http_auth_context *ctx, git_cred *c) -{ - git_cred_userpass_plaintext *cred; - git_buf raw = GIT_BUF_INIT; - int error = -1; - - GIT_UNUSED(ctx); - - if (c->credtype != GIT_CREDTYPE_USERPASS_PLAINTEXT) { - giterr_set(GITERR_INVALID, "invalid credential type for basic auth"); - goto on_error; - } - - cred = (git_cred_userpass_plaintext *)c; - - git_buf_printf(&raw, "%s:%s", cred->username, cred->password); - - if (git_buf_oom(&raw) || - git_buf_puts(out, "Authorization: Basic ") < 0 || - git_buf_encode_base64(out, git_buf_cstr(&raw), raw.size) < 0 || - git_buf_puts(out, "\r\n") < 0) - goto on_error; - - error = 0; - -on_error: - if (raw.size) - git__memzero(raw.ptr, raw.size); - - git_buf_free(&raw); - return error; -} - -static git_http_auth_context basic_context = { - GIT_AUTHTYPE_BASIC, - GIT_CREDTYPE_USERPASS_PLAINTEXT, - NULL, - basic_next_token, - NULL -}; - -int git_http_auth_basic( - git_http_auth_context **out, const gitno_connection_data *connection_data) -{ - GIT_UNUSED(connection_data); - - *out = &basic_context; - return 0; -} - -int git_http_auth_dummy( - git_http_auth_context **out, const gitno_connection_data *connection_data) -{ - GIT_UNUSED(connection_data); - - *out = NULL; - return 0; -} - diff --git a/vendor/libgit2/src/transports/auth.h b/vendor/libgit2/src/transports/auth.h deleted file mode 100644 index 52138cf8f..000000000 --- a/vendor/libgit2/src/transports/auth.h +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#ifndef INCLUDE_http_auth_h__ -#define INCLUDE_http_auth_h__ - -#include "git2.h" -#include "netops.h" - -typedef enum { - GIT_AUTHTYPE_BASIC = 1, - GIT_AUTHTYPE_NEGOTIATE = 2, -} git_http_authtype_t; - -typedef struct git_http_auth_context git_http_auth_context; - -struct git_http_auth_context { - /** Type of scheme */ - git_http_authtype_t type; - - /** Supported credentials */ - git_credtype_t credtypes; - - /** Sets the challenge on the authentication context */ - int (*set_challenge)(git_http_auth_context *ctx, const char *challenge); - - /** Gets the next authentication token from the context */ - int (*next_token)(git_buf *out, git_http_auth_context *ctx, git_cred *cred); - - /** Frees the authentication context */ - void (*free)(git_http_auth_context *ctx); -}; - -typedef struct { - /** Type of scheme */ - git_http_authtype_t type; - - /** Name of the scheme (as used in the Authorization header) */ - const char *name; - - /** Credential types this scheme supports */ - git_credtype_t credtypes; - - /** Function to initialize an authentication context */ - int (*init_context)( - git_http_auth_context **out, - const gitno_connection_data *connection_data); -} git_http_auth_scheme; - -int git_http_auth_dummy( - git_http_auth_context **out, - const gitno_connection_data *connection_data); - -int git_http_auth_basic( - git_http_auth_context **out, - const gitno_connection_data *connection_data); - -#endif - diff --git a/vendor/libgit2/src/transports/auth_negotiate.c b/vendor/libgit2/src/transports/auth_negotiate.c deleted file mode 100644 index 8b99fc735..000000000 --- a/vendor/libgit2/src/transports/auth_negotiate.c +++ /dev/null @@ -1,275 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#ifdef GIT_GSSAPI - -#include "git2.h" -#include "common.h" -#include "buffer.h" -#include "auth.h" - -#include -#include - -static gss_OID_desc negotiate_oid_spnego = - { 6, (void *) "\x2b\x06\x01\x05\x05\x02" }; -static gss_OID_desc negotiate_oid_krb5 = - { 9, (void *) "\x2a\x86\x48\x86\xf7\x12\x01\x02\x02" }; - -static gss_OID negotiate_oids[] = - { &negotiate_oid_spnego, &negotiate_oid_krb5, NULL }; - -typedef struct { - git_http_auth_context parent; - unsigned configured : 1, - complete : 1; - git_buf target; - char *challenge; - gss_ctx_id_t gss_context; - gss_OID oid; -} http_auth_negotiate_context; - -static void negotiate_err_set( - OM_uint32 status_major, - OM_uint32 status_minor, - const char *message) -{ - gss_buffer_desc buffer = GSS_C_EMPTY_BUFFER; - OM_uint32 status_display, context = 0; - - if (gss_display_status(&status_display, status_major, GSS_C_GSS_CODE, - GSS_C_NO_OID, &context, &buffer) == GSS_S_COMPLETE) { - giterr_set(GITERR_NET, "%s: %.*s (%d.%d)", - message, (int)buffer.length, (const char *)buffer.value, - status_major, status_minor); - gss_release_buffer(&status_minor, &buffer); - } else { - giterr_set(GITERR_NET, "%s: unknown negotiate error (%d.%d)", - message, status_major, status_minor); - } -} - -static int negotiate_set_challenge( - git_http_auth_context *c, - const char *challenge) -{ - http_auth_negotiate_context *ctx = (http_auth_negotiate_context *)c; - - assert(ctx && ctx->configured && challenge); - - git__free(ctx->challenge); - - ctx->challenge = git__strdup(challenge); - GITERR_CHECK_ALLOC(ctx->challenge); - - return 0; -} - -static int negotiate_next_token( - git_buf *buf, - git_http_auth_context *c, - git_cred *cred) -{ - http_auth_negotiate_context *ctx = (http_auth_negotiate_context *)c; - OM_uint32 status_major, status_minor; - gss_buffer_desc target_buffer = GSS_C_EMPTY_BUFFER, - input_token = GSS_C_EMPTY_BUFFER, - output_token = GSS_C_EMPTY_BUFFER; - gss_buffer_t input_token_ptr = GSS_C_NO_BUFFER; - git_buf input_buf = GIT_BUF_INIT; - gss_name_t server = NULL; - gss_OID mech; - size_t challenge_len; - int error = 0; - - assert(buf && ctx && ctx->configured && cred && cred->credtype == GIT_CREDTYPE_DEFAULT); - - if (ctx->complete) - return 0; - - target_buffer.value = (void *)ctx->target.ptr; - target_buffer.length = ctx->target.size; - - status_major = gss_import_name(&status_minor, &target_buffer, - GSS_C_NT_HOSTBASED_SERVICE, &server); - - if (GSS_ERROR(status_major)) { - negotiate_err_set(status_major, status_minor, - "Could not parse principal"); - error = -1; - goto done; - } - - challenge_len = ctx->challenge ? strlen(ctx->challenge) : 0; - - if (challenge_len < 9) { - giterr_set(GITERR_NET, "No negotiate challenge sent from server"); - error = -1; - goto done; - } else if (challenge_len > 9) { - if (git_buf_decode_base64(&input_buf, - ctx->challenge + 10, challenge_len - 10) < 0) { - giterr_set(GITERR_NET, "Invalid negotiate challenge from server"); - error = -1; - goto done; - } - - input_token.value = input_buf.ptr; - input_token.length = input_buf.size; - input_token_ptr = &input_token; - } else if (ctx->gss_context != GSS_C_NO_CONTEXT) { - giterr_set(GITERR_NET, "Could not restart authentication"); - error = -1; - goto done; - } - - mech = &negotiate_oid_spnego; - - if (GSS_ERROR(status_major = gss_init_sec_context( - &status_minor, - GSS_C_NO_CREDENTIAL, - &ctx->gss_context, - server, - mech, - GSS_C_DELEG_FLAG | GSS_C_MUTUAL_FLAG, - GSS_C_INDEFINITE, - GSS_C_NO_CHANNEL_BINDINGS, - input_token_ptr, - NULL, - &output_token, - NULL, - NULL))) { - negotiate_err_set(status_major, status_minor, "Negotiate failure"); - error = -1; - goto done; - } - - /* This message merely told us auth was complete; we do not respond. */ - if (status_major == GSS_S_COMPLETE) { - ctx->complete = 1; - goto done; - } - - git_buf_puts(buf, "Authorization: Negotiate "); - git_buf_encode_base64(buf, output_token.value, output_token.length); - git_buf_puts(buf, "\r\n"); - - if (git_buf_oom(buf)) - error = -1; - -done: - gss_release_name(&status_minor, &server); - gss_release_buffer(&status_minor, (gss_buffer_t) &output_token); - git_buf_free(&input_buf); - return error; -} - -static void negotiate_context_free(git_http_auth_context *c) -{ - http_auth_negotiate_context *ctx = (http_auth_negotiate_context *)c; - OM_uint32 status_minor; - - if (ctx->gss_context != GSS_C_NO_CONTEXT) { - gss_delete_sec_context( - &status_minor, &ctx->gss_context, GSS_C_NO_BUFFER); - ctx->gss_context = GSS_C_NO_CONTEXT; - } - - git_buf_free(&ctx->target); - - git__free(ctx->challenge); - - ctx->configured = 0; - ctx->complete = 0; - ctx->oid = NULL; - - git__free(ctx); -} - -static int negotiate_init_context( - http_auth_negotiate_context *ctx, - const gitno_connection_data *connection_data) -{ - OM_uint32 status_major, status_minor; - gss_OID item, *oid; - gss_OID_set mechanism_list; - size_t i; - - /* Query supported mechanisms looking for SPNEGO) */ - if (GSS_ERROR(status_major = - gss_indicate_mechs(&status_minor, &mechanism_list))) { - negotiate_err_set(status_major, status_minor, - "could not query mechanisms"); - return -1; - } - - if (mechanism_list) { - for (oid = negotiate_oids; *oid; oid++) { - for (i = 0; i < mechanism_list->count; i++) { - item = &mechanism_list->elements[i]; - - if (item->length == (*oid)->length && - memcmp(item->elements, (*oid)->elements, item->length) == 0) { - ctx->oid = *oid; - break; - } - - } - - if (ctx->oid) - break; - } - } - - gss_release_oid_set(&status_minor, &mechanism_list); - - if (!ctx->oid) { - giterr_set(GITERR_NET, "Negotiate authentication is not supported"); - return -1; - } - - git_buf_puts(&ctx->target, "HTTP@"); - git_buf_puts(&ctx->target, connection_data->host); - - if (git_buf_oom(&ctx->target)) - return -1; - - ctx->gss_context = GSS_C_NO_CONTEXT; - ctx->configured = 1; - - return 0; -} - -int git_http_auth_negotiate( - git_http_auth_context **out, - const gitno_connection_data *connection_data) -{ - http_auth_negotiate_context *ctx; - - *out = NULL; - - ctx = git__calloc(1, sizeof(http_auth_negotiate_context)); - GITERR_CHECK_ALLOC(ctx); - - if (negotiate_init_context(ctx, connection_data) < 0) { - git__free(ctx); - return -1; - } - - ctx->parent.type = GIT_AUTHTYPE_NEGOTIATE; - ctx->parent.credtypes = GIT_CREDTYPE_DEFAULT; - ctx->parent.set_challenge = negotiate_set_challenge; - ctx->parent.next_token = negotiate_next_token; - ctx->parent.free = negotiate_context_free; - - *out = (git_http_auth_context *)ctx; - - return 0; -} - -#endif /* GIT_GSSAPI */ - diff --git a/vendor/libgit2/src/transports/auth_negotiate.h b/vendor/libgit2/src/transports/auth_negotiate.h deleted file mode 100644 index d7270b7ab..000000000 --- a/vendor/libgit2/src/transports/auth_negotiate.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#ifndef INCLUDE_auth_negotiate_h__ -#define INCLUDE_auth_negotiate_h__ - -#include "git2.h" -#include "auth.h" - -#ifdef GIT_GSSAPI - -extern int git_http_auth_negotiate( - git_http_auth_context **out, - const gitno_connection_data *connection_data); - -#else - -#define git_http_auth_negotiate git_http_auth_dummy - -#endif /* GIT_GSSAPI */ - -#endif - diff --git a/vendor/libgit2/src/transports/cred.c b/vendor/libgit2/src/transports/cred.c deleted file mode 100644 index 49ede48bf..000000000 --- a/vendor/libgit2/src/transports/cred.c +++ /dev/null @@ -1,388 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "git2.h" -#include "smart.h" -#include "git2/cred_helpers.h" - -static int git_cred_ssh_key_type_new( - git_cred **cred, - const char *username, - const char *publickey, - const char *privatekey, - const char *passphrase, - git_credtype_t credtype); - -int git_cred_has_username(git_cred *cred) -{ - if (cred->credtype == GIT_CREDTYPE_DEFAULT) - return 0; - - return 1; -} - -const char *git_cred__username(git_cred *cred) -{ - switch (cred->credtype) { - case GIT_CREDTYPE_USERNAME: - { - git_cred_username *c = (git_cred_username *) cred; - return c->username; - } - case GIT_CREDTYPE_USERPASS_PLAINTEXT: - { - git_cred_userpass_plaintext *c = (git_cred_userpass_plaintext *) cred; - return c->username; - } - case GIT_CREDTYPE_SSH_KEY: - case GIT_CREDTYPE_SSH_MEMORY: - { - git_cred_ssh_key *c = (git_cred_ssh_key *) cred; - return c->username; - } - case GIT_CREDTYPE_SSH_CUSTOM: - { - git_cred_ssh_custom *c = (git_cred_ssh_custom *) cred; - return c->username; - } - case GIT_CREDTYPE_SSH_INTERACTIVE: - { - git_cred_ssh_interactive *c = (git_cred_ssh_interactive *) cred; - return c->username; - } - - default: - return NULL; - } -} - -static void plaintext_free(struct git_cred *cred) -{ - git_cred_userpass_plaintext *c = (git_cred_userpass_plaintext *)cred; - - git__free(c->username); - - /* Zero the memory which previously held the password */ - if (c->password) { - size_t pass_len = strlen(c->password); - git__memzero(c->password, pass_len); - git__free(c->password); - } - - git__free(c); -} - -int git_cred_userpass_plaintext_new( - git_cred **cred, - const char *username, - const char *password) -{ - git_cred_userpass_plaintext *c; - - assert(cred && username && password); - - c = git__malloc(sizeof(git_cred_userpass_plaintext)); - GITERR_CHECK_ALLOC(c); - - c->parent.credtype = GIT_CREDTYPE_USERPASS_PLAINTEXT; - c->parent.free = plaintext_free; - c->username = git__strdup(username); - - if (!c->username) { - git__free(c); - return -1; - } - - c->password = git__strdup(password); - - if (!c->password) { - git__free(c->username); - git__free(c); - return -1; - } - - *cred = &c->parent; - return 0; -} - -static void ssh_key_free(struct git_cred *cred) -{ - git_cred_ssh_key *c = - (git_cred_ssh_key *)cred; - - git__free(c->username); - - if (c->privatekey) { - /* Zero the memory which previously held the private key */ - size_t key_len = strlen(c->privatekey); - git__memzero(c->privatekey, key_len); - git__free(c->privatekey); - } - - if (c->passphrase) { - /* Zero the memory which previously held the passphrase */ - size_t pass_len = strlen(c->passphrase); - git__memzero(c->passphrase, pass_len); - git__free(c->passphrase); - } - - if (c->publickey) { - /* Zero the memory which previously held the public key */ - size_t key_len = strlen(c->publickey); - git__memzero(c->publickey, key_len); - git__free(c->publickey); - } - - git__free(c); -} - -static void ssh_interactive_free(struct git_cred *cred) -{ - git_cred_ssh_interactive *c = (git_cred_ssh_interactive *)cred; - - git__free(c->username); - - git__free(c); -} - -static void ssh_custom_free(struct git_cred *cred) -{ - git_cred_ssh_custom *c = (git_cred_ssh_custom *)cred; - - git__free(c->username); - - if (c->publickey) { - /* Zero the memory which previously held the publickey */ - size_t key_len = strlen(c->publickey); - git__memzero(c->publickey, key_len); - git__free(c->publickey); - } - - git__free(c); -} - -static void default_free(struct git_cred *cred) -{ - git_cred_default *c = (git_cred_default *)cred; - - git__free(c); -} - -static void username_free(struct git_cred *cred) -{ - git__free(cred); -} - -int git_cred_ssh_key_new( - git_cred **cred, - const char *username, - const char *publickey, - const char *privatekey, - const char *passphrase) -{ - return git_cred_ssh_key_type_new( - cred, - username, - publickey, - privatekey, - passphrase, - GIT_CREDTYPE_SSH_KEY); -} - -int git_cred_ssh_key_memory_new( - git_cred **cred, - const char *username, - const char *publickey, - const char *privatekey, - const char *passphrase) -{ -#ifdef GIT_SSH_MEMORY_CREDENTIALS - return git_cred_ssh_key_type_new( - cred, - username, - publickey, - privatekey, - passphrase, - GIT_CREDTYPE_SSH_MEMORY); -#else - GIT_UNUSED(cred); - GIT_UNUSED(username); - GIT_UNUSED(publickey); - GIT_UNUSED(privatekey); - GIT_UNUSED(passphrase); - - giterr_set(GITERR_INVALID, - "This version of libgit2 was not built with ssh memory credentials."); - return -1; -#endif -} - -static int git_cred_ssh_key_type_new( - git_cred **cred, - const char *username, - const char *publickey, - const char *privatekey, - const char *passphrase, - git_credtype_t credtype) -{ - git_cred_ssh_key *c; - - assert(username && cred && privatekey); - - c = git__calloc(1, sizeof(git_cred_ssh_key)); - GITERR_CHECK_ALLOC(c); - - c->parent.credtype = credtype; - c->parent.free = ssh_key_free; - - c->username = git__strdup(username); - GITERR_CHECK_ALLOC(c->username); - - c->privatekey = git__strdup(privatekey); - GITERR_CHECK_ALLOC(c->privatekey); - - if (publickey) { - c->publickey = git__strdup(publickey); - GITERR_CHECK_ALLOC(c->publickey); - } - - if (passphrase) { - c->passphrase = git__strdup(passphrase); - GITERR_CHECK_ALLOC(c->passphrase); - } - - *cred = &c->parent; - return 0; -} - -int git_cred_ssh_interactive_new( - git_cred **out, - const char *username, - git_cred_ssh_interactive_callback prompt_callback, - void *payload) -{ - git_cred_ssh_interactive *c; - - assert(out && username && prompt_callback); - - c = git__calloc(1, sizeof(git_cred_ssh_interactive)); - GITERR_CHECK_ALLOC(c); - - c->parent.credtype = GIT_CREDTYPE_SSH_INTERACTIVE; - c->parent.free = ssh_interactive_free; - - c->username = git__strdup(username); - GITERR_CHECK_ALLOC(c->username); - - c->prompt_callback = prompt_callback; - c->payload = payload; - - *out = &c->parent; - return 0; -} - -int git_cred_ssh_key_from_agent(git_cred **cred, const char *username) { - git_cred_ssh_key *c; - - assert(username && cred); - - c = git__calloc(1, sizeof(git_cred_ssh_key)); - GITERR_CHECK_ALLOC(c); - - c->parent.credtype = GIT_CREDTYPE_SSH_KEY; - c->parent.free = ssh_key_free; - - c->username = git__strdup(username); - GITERR_CHECK_ALLOC(c->username); - - c->privatekey = NULL; - - *cred = &c->parent; - return 0; -} - -int git_cred_ssh_custom_new( - git_cred **cred, - const char *username, - const char *publickey, - size_t publickey_len, - git_cred_sign_callback sign_callback, - void *payload) -{ - git_cred_ssh_custom *c; - - assert(username && cred); - - c = git__calloc(1, sizeof(git_cred_ssh_custom)); - GITERR_CHECK_ALLOC(c); - - c->parent.credtype = GIT_CREDTYPE_SSH_CUSTOM; - c->parent.free = ssh_custom_free; - - c->username = git__strdup(username); - GITERR_CHECK_ALLOC(c->username); - - if (publickey_len > 0) { - c->publickey = git__malloc(publickey_len); - GITERR_CHECK_ALLOC(c->publickey); - - memcpy(c->publickey, publickey, publickey_len); - } - - c->publickey_len = publickey_len; - c->sign_callback = sign_callback; - c->payload = payload; - - *cred = &c->parent; - return 0; -} - -int git_cred_default_new(git_cred **cred) -{ - git_cred_default *c; - - assert(cred); - - c = git__calloc(1, sizeof(git_cred_default)); - GITERR_CHECK_ALLOC(c); - - c->credtype = GIT_CREDTYPE_DEFAULT; - c->free = default_free; - - *cred = c; - return 0; -} - -int git_cred_username_new(git_cred **cred, const char *username) -{ - git_cred_username *c; - size_t len, allocsize; - - assert(cred); - - len = strlen(username); - - GITERR_CHECK_ALLOC_ADD(&allocsize, sizeof(git_cred_username), len); - GITERR_CHECK_ALLOC_ADD(&allocsize, allocsize, 1); - c = git__malloc(allocsize); - GITERR_CHECK_ALLOC(c); - - c->parent.credtype = GIT_CREDTYPE_USERNAME; - c->parent.free = username_free; - memcpy(c->username, username, len + 1); - - *cred = (git_cred *) c; - return 0; -} - -void git_cred_free(git_cred *cred) -{ - if (!cred) - return; - - cred->free(cred); -} diff --git a/vendor/libgit2/src/transports/cred.h b/vendor/libgit2/src/transports/cred.h deleted file mode 100644 index 2de8deee8..000000000 --- a/vendor/libgit2/src/transports/cred.h +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_git_cred_h__ -#define INCLUDE_git_cred_h__ - -#include "git2/transport.h" - -const char *git_cred__username(git_cred *cred); - -#endif diff --git a/vendor/libgit2/src/transports/cred_helpers.c b/vendor/libgit2/src/transports/cred_helpers.c deleted file mode 100644 index 5cc9b0869..000000000 --- a/vendor/libgit2/src/transports/cred_helpers.c +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "common.h" -#include "git2/cred_helpers.h" - -int git_cred_userpass( - git_cred **cred, - const char *url, - const char *user_from_url, - unsigned int allowed_types, - void *payload) -{ - git_cred_userpass_payload *userpass = (git_cred_userpass_payload*)payload; - const char *effective_username = NULL; - - GIT_UNUSED(url); - - if (!userpass || !userpass->password) return -1; - - /* Username resolution: a username can be passed with the URL, the - * credentials payload, or both. Here's what we do. Note that if we get - * this far, we know that any password the url may contain has already - * failed at least once, so we ignore it. - * - * | Payload | URL | Used | - * +-------------+----------+-----------+ - * | yes | no | payload | - * | yes | yes | payload | - * | no | yes | url | - * | no | no | FAIL | - */ - if (userpass->username) - effective_username = userpass->username; - else if (user_from_url) - effective_username = user_from_url; - else - return -1; - - if (GIT_CREDTYPE_USERNAME & allowed_types) - return git_cred_username_new(cred, effective_username); - - if ((GIT_CREDTYPE_USERPASS_PLAINTEXT & allowed_types) == 0 || - git_cred_userpass_plaintext_new(cred, effective_username, userpass->password) < 0) - return -1; - - return 0; -} diff --git a/vendor/libgit2/src/transports/git.c b/vendor/libgit2/src/transports/git.c deleted file mode 100644 index 6c6acf9c5..000000000 --- a/vendor/libgit2/src/transports/git.c +++ /dev/null @@ -1,368 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "git2.h" -#include "buffer.h" -#include "netops.h" -#include "git2/sys/transport.h" -#include "stream.h" -#include "socket_stream.h" - -#define OWNING_SUBTRANSPORT(s) ((git_subtransport *)(s)->parent.subtransport) - -static const char prefix_git[] = "git://"; -static const char cmd_uploadpack[] = "git-upload-pack"; -static const char cmd_receivepack[] = "git-receive-pack"; - -typedef struct { - git_smart_subtransport_stream parent; - git_stream *io; - const char *cmd; - char *url; - unsigned sent_command : 1; -} git_proto_stream; - -typedef struct { - git_smart_subtransport parent; - git_transport *owner; - git_proto_stream *current_stream; -} git_subtransport; - -/* - * Create a git protocol request. - * - * For example: 0035git-upload-pack /libgit2/libgit2\0host=github.com\0 - */ -static int gen_proto(git_buf *request, const char *cmd, const char *url) -{ - char *delim, *repo; - char host[] = "host="; - size_t len; - - delim = strchr(url, '/'); - if (delim == NULL) { - giterr_set(GITERR_NET, "Malformed URL"); - return -1; - } - - repo = delim; - if (repo[1] == '~') - ++repo; - - delim = strchr(url, ':'); - if (delim == NULL) - delim = strchr(url, '/'); - - len = 4 + strlen(cmd) + 1 + strlen(repo) + 1 + strlen(host) + (delim - url) + 1; - - git_buf_grow(request, len); - git_buf_printf(request, "%04x%s %s%c%s", - (unsigned int)(len & 0x0FFFF), cmd, repo, 0, host); - git_buf_put(request, url, delim - url); - git_buf_putc(request, '\0'); - - if (git_buf_oom(request)) - return -1; - - return 0; -} - -static int send_command(git_proto_stream *s) -{ - int error; - git_buf request = GIT_BUF_INIT; - - error = gen_proto(&request, s->cmd, s->url); - if (error < 0) - goto cleanup; - - error = git_stream_write(s->io, request.ptr, request.size, 0); - if (error >= 0) - s->sent_command = 1; - -cleanup: - git_buf_free(&request); - return error; -} - -static int git_proto_stream_read( - git_smart_subtransport_stream *stream, - char *buffer, - size_t buf_size, - size_t *bytes_read) -{ - int error; - git_proto_stream *s = (git_proto_stream *)stream; - gitno_buffer buf; - - *bytes_read = 0; - - if (!s->sent_command && (error = send_command(s)) < 0) - return error; - - gitno_buffer_setup_fromstream(s->io, &buf, buffer, buf_size); - - if ((error = gitno_recv(&buf)) < 0) - return error; - - *bytes_read = buf.offset; - - return 0; -} - -static int git_proto_stream_write( - git_smart_subtransport_stream *stream, - const char *buffer, - size_t len) -{ - int error; - git_proto_stream *s = (git_proto_stream *)stream; - - if (!s->sent_command && (error = send_command(s)) < 0) - return error; - - return git_stream_write(s->io, buffer, len, 0); -} - -static void git_proto_stream_free(git_smart_subtransport_stream *stream) -{ - git_proto_stream *s; - git_subtransport *t; - - if (!stream) - return; - - s = (git_proto_stream *)stream; - t = OWNING_SUBTRANSPORT(s); - - t->current_stream = NULL; - - git_stream_close(s->io); - git_stream_free(s->io); - git__free(s->url); - git__free(s); -} - -static int git_proto_stream_alloc( - git_subtransport *t, - const char *url, - const char *cmd, - const char *host, - const char *port, - git_smart_subtransport_stream **stream) -{ - git_proto_stream *s; - - if (!stream) - return -1; - - s = git__calloc(1, sizeof(git_proto_stream)); - GITERR_CHECK_ALLOC(s); - - s->parent.subtransport = &t->parent; - s->parent.read = git_proto_stream_read; - s->parent.write = git_proto_stream_write; - s->parent.free = git_proto_stream_free; - - s->cmd = cmd; - s->url = git__strdup(url); - - if (!s->url) { - git__free(s); - return -1; - } - - if ((git_socket_stream_new(&s->io, host, port)) < 0) - return -1; - - GITERR_CHECK_VERSION(s->io, GIT_STREAM_VERSION, "git_stream"); - - *stream = &s->parent; - return 0; -} - -static int _git_uploadpack_ls( - git_subtransport *t, - const char *url, - git_smart_subtransport_stream **stream) -{ - char *host=NULL, *port=NULL, *path=NULL, *user=NULL, *pass=NULL; - const char *stream_url = url; - git_proto_stream *s; - int error; - - *stream = NULL; - - if (!git__prefixcmp(url, prefix_git)) - stream_url += strlen(prefix_git); - - if ((error = gitno_extract_url_parts(&host, &port, &path, &user, &pass, url, GIT_DEFAULT_PORT)) < 0) - return error; - - error = git_proto_stream_alloc(t, stream_url, cmd_uploadpack, host, port, stream); - - git__free(host); - git__free(port); - git__free(path); - git__free(user); - git__free(pass); - - - if (error < 0) { - git_proto_stream_free(*stream); - return error; - } - - s = (git_proto_stream *) *stream; - if ((error = git_stream_connect(s->io)) < 0) { - git_proto_stream_free(*stream); - return error; - } - - t->current_stream = s; - - return 0; -} - -static int _git_uploadpack( - git_subtransport *t, - const char *url, - git_smart_subtransport_stream **stream) -{ - GIT_UNUSED(url); - - if (t->current_stream) { - *stream = &t->current_stream->parent; - return 0; - } - - giterr_set(GITERR_NET, "Must call UPLOADPACK_LS before UPLOADPACK"); - return -1; -} - -static int _git_receivepack_ls( - git_subtransport *t, - const char *url, - git_smart_subtransport_stream **stream) -{ - char *host=NULL, *port=NULL, *path=NULL, *user=NULL, *pass=NULL; - const char *stream_url = url; - git_proto_stream *s; - int error; - - *stream = NULL; - if (!git__prefixcmp(url, prefix_git)) - stream_url += strlen(prefix_git); - - if ((error = gitno_extract_url_parts(&host, &port, &path, &user, &pass, url, GIT_DEFAULT_PORT)) < 0) - return error; - - error = git_proto_stream_alloc(t, stream_url, cmd_receivepack, host, port, stream); - - git__free(host); - git__free(port); - git__free(path); - git__free(user); - git__free(pass); - - if (error < 0) { - git_proto_stream_free(*stream); - return error; - } - - s = (git_proto_stream *) *stream; - - if ((error = git_stream_connect(s->io)) < 0) - return error; - - t->current_stream = s; - - return 0; -} - -static int _git_receivepack( - git_subtransport *t, - const char *url, - git_smart_subtransport_stream **stream) -{ - GIT_UNUSED(url); - - if (t->current_stream) { - *stream = &t->current_stream->parent; - return 0; - } - - giterr_set(GITERR_NET, "Must call RECEIVEPACK_LS before RECEIVEPACK"); - return -1; -} - -static int _git_action( - git_smart_subtransport_stream **stream, - git_smart_subtransport *subtransport, - const char *url, - git_smart_service_t action) -{ - git_subtransport *t = (git_subtransport *) subtransport; - - switch (action) { - case GIT_SERVICE_UPLOADPACK_LS: - return _git_uploadpack_ls(t, url, stream); - - case GIT_SERVICE_UPLOADPACK: - return _git_uploadpack(t, url, stream); - - case GIT_SERVICE_RECEIVEPACK_LS: - return _git_receivepack_ls(t, url, stream); - - case GIT_SERVICE_RECEIVEPACK: - return _git_receivepack(t, url, stream); - } - - *stream = NULL; - return -1; -} - -static int _git_close(git_smart_subtransport *subtransport) -{ - git_subtransport *t = (git_subtransport *) subtransport; - - assert(!t->current_stream); - - GIT_UNUSED(t); - - return 0; -} - -static void _git_free(git_smart_subtransport *subtransport) -{ - git_subtransport *t = (git_subtransport *) subtransport; - - assert(!t->current_stream); - - git__free(t); -} - -int git_smart_subtransport_git(git_smart_subtransport **out, git_transport *owner, void *param) -{ - git_subtransport *t; - - GIT_UNUSED(param); - - if (!out) - return -1; - - t = git__calloc(1, sizeof(git_subtransport)); - GITERR_CHECK_ALLOC(t); - - t->owner = owner; - t->parent.action = _git_action; - t->parent.close = _git_close; - t->parent.free = _git_free; - - *out = (git_smart_subtransport *) t; - return 0; -} diff --git a/vendor/libgit2/src/transports/http.c b/vendor/libgit2/src/transports/http.c deleted file mode 100644 index 88b124bf7..000000000 --- a/vendor/libgit2/src/transports/http.c +++ /dev/null @@ -1,1082 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef GIT_WINHTTP - -#include "git2.h" -#include "http_parser.h" -#include "buffer.h" -#include "netops.h" -#include "global.h" -#include "remote.h" -#include "smart.h" -#include "auth.h" -#include "auth_negotiate.h" -#include "tls_stream.h" -#include "socket_stream.h" -#include "curl_stream.h" - -git_http_auth_scheme auth_schemes[] = { - { GIT_AUTHTYPE_NEGOTIATE, "Negotiate", GIT_CREDTYPE_DEFAULT, git_http_auth_negotiate }, - { GIT_AUTHTYPE_BASIC, "Basic", GIT_CREDTYPE_USERPASS_PLAINTEXT, git_http_auth_basic }, -}; - -static const char *upload_pack_service = "upload-pack"; -static const char *upload_pack_ls_service_url = "/info/refs?service=git-upload-pack"; -static const char *upload_pack_service_url = "/git-upload-pack"; -static const char *receive_pack_service = "receive-pack"; -static const char *receive_pack_ls_service_url = "/info/refs?service=git-receive-pack"; -static const char *receive_pack_service_url = "/git-receive-pack"; -static const char *get_verb = "GET"; -static const char *post_verb = "POST"; - -#define OWNING_SUBTRANSPORT(s) ((http_subtransport *)(s)->parent.subtransport) - -#define PARSE_ERROR_GENERIC -1 -#define PARSE_ERROR_REPLAY -2 -/** Look at the user field */ -#define PARSE_ERROR_EXT -3 - -#define CHUNK_SIZE 4096 - -enum last_cb { - NONE, - FIELD, - VALUE -}; - -typedef struct { - git_smart_subtransport_stream parent; - const char *service; - const char *service_url; - char *redirect_url; - const char *verb; - char *chunk_buffer; - unsigned chunk_buffer_len; - unsigned sent_request : 1, - received_response : 1, - chunked : 1, - redirect_count : 3; -} http_stream; - -typedef struct { - git_smart_subtransport parent; - transport_smart *owner; - git_stream *io; - gitno_connection_data connection_data; - bool connected; - - /* Parser structures */ - http_parser parser; - http_parser_settings settings; - gitno_buffer parse_buffer; - git_buf parse_header_name; - git_buf parse_header_value; - char parse_buffer_data[NETIO_BUFSIZE]; - char *content_type; - char *location; - git_vector www_authenticate; - enum last_cb last_cb; - int parse_error; - int error; - unsigned parse_finished : 1; - - /* Authentication */ - git_cred *cred; - git_cred *url_cred; - git_vector auth_contexts; -} http_subtransport; - -typedef struct { - http_stream *s; - http_subtransport *t; - - /* Target buffer details from read() */ - char *buffer; - size_t buf_size; - size_t *bytes_read; -} parser_context; - -static bool credtype_match(git_http_auth_scheme *scheme, void *data) -{ - unsigned int credtype = *(unsigned int *)data; - - return !!(scheme->credtypes & credtype); -} - -static bool challenge_match(git_http_auth_scheme *scheme, void *data) -{ - const char *scheme_name = scheme->name; - const char *challenge = (const char *)data; - size_t scheme_len; - - scheme_len = strlen(scheme_name); - return (strncmp(challenge, scheme_name, scheme_len) == 0 && - (challenge[scheme_len] == '\0' || challenge[scheme_len] == ' ')); -} - -static int auth_context_match( - git_http_auth_context **out, - http_subtransport *t, - bool (*scheme_match)(git_http_auth_scheme *scheme, void *data), - void *data) -{ - git_http_auth_scheme *scheme = NULL; - git_http_auth_context *context = NULL, *c; - size_t i; - - *out = NULL; - - for (i = 0; i < ARRAY_SIZE(auth_schemes); i++) { - if (scheme_match(&auth_schemes[i], data)) { - scheme = &auth_schemes[i]; - break; - } - } - - if (!scheme) - return 0; - - /* See if authentication has already started for this scheme */ - git_vector_foreach(&t->auth_contexts, i, c) { - if (c->type == scheme->type) { - context = c; - break; - } - } - - if (!context) { - if (scheme->init_context(&context, &t->connection_data) < 0) - return -1; - else if (!context) - return 0; - else if (git_vector_insert(&t->auth_contexts, context) < 0) - return -1; - } - - *out = context; - - return 0; -} - -static int apply_credentials(git_buf *buf, http_subtransport *t) -{ - git_cred *cred = t->cred; - git_http_auth_context *context; - - /* Apply the credentials given to us in the URL */ - if (!cred && t->connection_data.user && t->connection_data.pass) { - if (!t->url_cred && - git_cred_userpass_plaintext_new(&t->url_cred, - t->connection_data.user, t->connection_data.pass) < 0) - return -1; - - cred = t->url_cred; - } - - if (!cred) - return 0; - - /* Get or create a context for the best scheme for this cred type */ - if (auth_context_match(&context, t, credtype_match, &cred->credtype) < 0) - return -1; - - return context->next_token(buf, context, cred); -} - -static const char *user_agent(void) -{ - const char *custom = git_libgit2__user_agent(); - - if (custom) - return custom; - - return "libgit2 " LIBGIT2_VERSION; -} - -static int gen_request( - git_buf *buf, - http_stream *s, - size_t content_length) -{ - http_subtransport *t = OWNING_SUBTRANSPORT(s); - const char *path = t->connection_data.path ? t->connection_data.path : "/"; - size_t i; - - git_buf_printf(buf, "%s %s%s HTTP/1.1\r\n", s->verb, path, s->service_url); - - git_buf_printf(buf, "User-Agent: git/1.0 (%s)\r\n", user_agent()); - git_buf_printf(buf, "Host: %s\r\n", t->connection_data.host); - - if (s->chunked || content_length > 0) { - git_buf_printf(buf, "Accept: application/x-git-%s-result\r\n", s->service); - git_buf_printf(buf, "Content-Type: application/x-git-%s-request\r\n", s->service); - - if (s->chunked) - git_buf_puts(buf, "Transfer-Encoding: chunked\r\n"); - else - git_buf_printf(buf, "Content-Length: %"PRIuZ "\r\n", content_length); - } else - git_buf_puts(buf, "Accept: */*\r\n"); - - for (i = 0; i < t->owner->custom_headers.count; i++) { - if (t->owner->custom_headers.strings[i]) - git_buf_printf(buf, "%s\r\n", t->owner->custom_headers.strings[i]); - } - - /* Apply credentials to the request */ - if (apply_credentials(buf, t) < 0) - return -1; - - git_buf_puts(buf, "\r\n"); - - if (git_buf_oom(buf)) - return -1; - - return 0; -} - -static int parse_authenticate_response( - git_vector *www_authenticate, - http_subtransport *t, - int *allowed_types) -{ - git_http_auth_context *context; - char *challenge; - size_t i; - - git_vector_foreach(www_authenticate, i, challenge) { - if (auth_context_match(&context, t, challenge_match, challenge) < 0) - return -1; - else if (!context) - continue; - - if (context->set_challenge && - context->set_challenge(context, challenge) < 0) - return -1; - - *allowed_types |= context->credtypes; - } - - return 0; -} - -static int on_header_ready(http_subtransport *t) -{ - git_buf *name = &t->parse_header_name; - git_buf *value = &t->parse_header_value; - - if (!strcasecmp("Content-Type", git_buf_cstr(name))) { - if (!t->content_type) { - t->content_type = git__strdup(git_buf_cstr(value)); - GITERR_CHECK_ALLOC(t->content_type); - } - } - else if (!strcasecmp("WWW-Authenticate", git_buf_cstr(name))) { - char *dup = git__strdup(git_buf_cstr(value)); - GITERR_CHECK_ALLOC(dup); - - git_vector_insert(&t->www_authenticate, dup); - } - else if (!strcasecmp("Location", git_buf_cstr(name))) { - if (!t->location) { - t->location = git__strdup(git_buf_cstr(value)); - GITERR_CHECK_ALLOC(t->location); - } - } - - return 0; -} - -static int on_header_field(http_parser *parser, const char *str, size_t len) -{ - parser_context *ctx = (parser_context *) parser->data; - http_subtransport *t = ctx->t; - - /* Both parse_header_name and parse_header_value are populated - * and ready for consumption */ - if (VALUE == t->last_cb) - if (on_header_ready(t) < 0) - return t->parse_error = PARSE_ERROR_GENERIC; - - if (NONE == t->last_cb || VALUE == t->last_cb) - git_buf_clear(&t->parse_header_name); - - if (git_buf_put(&t->parse_header_name, str, len) < 0) - return t->parse_error = PARSE_ERROR_GENERIC; - - t->last_cb = FIELD; - return 0; -} - -static int on_header_value(http_parser *parser, const char *str, size_t len) -{ - parser_context *ctx = (parser_context *) parser->data; - http_subtransport *t = ctx->t; - - assert(NONE != t->last_cb); - - if (FIELD == t->last_cb) - git_buf_clear(&t->parse_header_value); - - if (git_buf_put(&t->parse_header_value, str, len) < 0) - return t->parse_error = PARSE_ERROR_GENERIC; - - t->last_cb = VALUE; - return 0; -} - -static int on_headers_complete(http_parser *parser) -{ - parser_context *ctx = (parser_context *) parser->data; - http_subtransport *t = ctx->t; - http_stream *s = ctx->s; - git_buf buf = GIT_BUF_INIT; - int error = 0, no_callback = 0, allowed_auth_types = 0; - - /* Both parse_header_name and parse_header_value are populated - * and ready for consumption. */ - if (VALUE == t->last_cb) - if (on_header_ready(t) < 0) - return t->parse_error = PARSE_ERROR_GENERIC; - - /* Capture authentication headers which may be a 401 (authentication - * is not complete) or a 200 (simply informing us that auth *is* - * complete.) - */ - if (parse_authenticate_response(&t->www_authenticate, t, - &allowed_auth_types) < 0) - return t->parse_error = PARSE_ERROR_GENERIC; - - /* Check for an authentication failure. */ - if (parser->status_code == 401 && get_verb == s->verb) { - if (!t->owner->cred_acquire_cb) { - no_callback = 1; - } else { - if (allowed_auth_types) { - if (t->cred) { - t->cred->free(t->cred); - t->cred = NULL; - } - - error = t->owner->cred_acquire_cb(&t->cred, - t->owner->url, - t->connection_data.user, - allowed_auth_types, - t->owner->cred_acquire_payload); - - if (error == GIT_PASSTHROUGH) { - no_callback = 1; - } else if (error < 0) { - t->error = error; - return t->parse_error = PARSE_ERROR_EXT; - } else { - assert(t->cred); - - if (!(t->cred->credtype & allowed_auth_types)) { - giterr_set(GITERR_NET, "credentials callback returned an invalid cred type"); - return t->parse_error = PARSE_ERROR_GENERIC; - } - - /* Successfully acquired a credential. */ - t->parse_error = PARSE_ERROR_REPLAY; - return 0; - } - } - } - - if (no_callback) { - giterr_set(GITERR_NET, "authentication required but no callback set"); - return t->parse_error = PARSE_ERROR_GENERIC; - } - } - - /* Check for a redirect. - * Right now we only permit a redirect to the same hostname. */ - if ((parser->status_code == 301 || - parser->status_code == 302 || - (parser->status_code == 303 && get_verb == s->verb) || - parser->status_code == 307) && - t->location) { - - if (s->redirect_count >= 7) { - giterr_set(GITERR_NET, "Too many redirects"); - return t->parse_error = PARSE_ERROR_GENERIC; - } - - if (gitno_connection_data_from_url(&t->connection_data, t->location, s->service_url) < 0) - return t->parse_error = PARSE_ERROR_GENERIC; - - /* Set the redirect URL on the stream. This is a transfer of - * ownership of the memory. */ - if (s->redirect_url) - git__free(s->redirect_url); - - s->redirect_url = t->location; - t->location = NULL; - - t->connected = 0; - s->redirect_count++; - - t->parse_error = PARSE_ERROR_REPLAY; - return 0; - } - - /* Check for a 200 HTTP status code. */ - if (parser->status_code != 200) { - giterr_set(GITERR_NET, - "Unexpected HTTP status code: %d", - parser->status_code); - return t->parse_error = PARSE_ERROR_GENERIC; - } - - /* The response must contain a Content-Type header. */ - if (!t->content_type) { - giterr_set(GITERR_NET, "No Content-Type header in response"); - return t->parse_error = PARSE_ERROR_GENERIC; - } - - /* The Content-Type header must match our expectation. */ - if (get_verb == s->verb) - git_buf_printf(&buf, - "application/x-git-%s-advertisement", - ctx->s->service); - else - git_buf_printf(&buf, - "application/x-git-%s-result", - ctx->s->service); - - if (git_buf_oom(&buf)) - return t->parse_error = PARSE_ERROR_GENERIC; - - if (strcmp(t->content_type, git_buf_cstr(&buf))) { - git_buf_free(&buf); - giterr_set(GITERR_NET, - "Invalid Content-Type: %s", - t->content_type); - return t->parse_error = PARSE_ERROR_GENERIC; - } - - git_buf_free(&buf); - - return 0; -} - -static int on_message_complete(http_parser *parser) -{ - parser_context *ctx = (parser_context *) parser->data; - http_subtransport *t = ctx->t; - - t->parse_finished = 1; - - return 0; -} - -static int on_body_fill_buffer(http_parser *parser, const char *str, size_t len) -{ - parser_context *ctx = (parser_context *) parser->data; - http_subtransport *t = ctx->t; - - /* If our goal is to replay the request (either an auth failure or - * a redirect) then don't bother buffering since we're ignoring the - * content anyway. - */ - if (t->parse_error == PARSE_ERROR_REPLAY) - return 0; - - if (ctx->buf_size < len) { - giterr_set(GITERR_NET, "Can't fit data in the buffer"); - return t->parse_error = PARSE_ERROR_GENERIC; - } - - memcpy(ctx->buffer, str, len); - *(ctx->bytes_read) += len; - ctx->buffer += len; - ctx->buf_size -= len; - - return 0; -} - -static void clear_parser_state(http_subtransport *t) -{ - http_parser_init(&t->parser, HTTP_RESPONSE); - gitno_buffer_setup_fromstream(t->io, - &t->parse_buffer, - t->parse_buffer_data, - sizeof(t->parse_buffer_data)); - - t->last_cb = NONE; - t->parse_error = 0; - t->parse_finished = 0; - - git_buf_free(&t->parse_header_name); - git_buf_init(&t->parse_header_name, 0); - - git_buf_free(&t->parse_header_value); - git_buf_init(&t->parse_header_value, 0); - - git__free(t->content_type); - t->content_type = NULL; - - git__free(t->location); - t->location = NULL; - - git_vector_free_deep(&t->www_authenticate); -} - -static int write_chunk(git_stream *io, const char *buffer, size_t len) -{ - git_buf buf = GIT_BUF_INIT; - - /* Chunk header */ - git_buf_printf(&buf, "%" PRIxZ "\r\n", len); - - if (git_buf_oom(&buf)) - return -1; - - if (git_stream_write(io, buf.ptr, buf.size, 0) < 0) { - git_buf_free(&buf); - return -1; - } - - git_buf_free(&buf); - - /* Chunk body */ - if (len > 0 && git_stream_write(io, buffer, len, 0) < 0) - return -1; - - /* Chunk footer */ - if (git_stream_write(io, "\r\n", 2, 0) < 0) - return -1; - - return 0; -} - -static int http_connect(http_subtransport *t) -{ - int error; - char *proxy_url; - - if (t->connected && - http_should_keep_alive(&t->parser) && - t->parse_finished) - return 0; - - if (t->io) { - git_stream_close(t->io); - git_stream_free(t->io); - t->io = NULL; - } - - if (t->connection_data.use_ssl) { - error = git_tls_stream_new(&t->io, t->connection_data.host, t->connection_data.port); - } else { -#ifdef GIT_CURL - error = git_curl_stream_new(&t->io, t->connection_data.host, t->connection_data.port); -#else - error = git_socket_stream_new(&t->io, t->connection_data.host, t->connection_data.port); -#endif - } - - if (error < 0) - return error; - - GITERR_CHECK_VERSION(t->io, GIT_STREAM_VERSION, "git_stream"); - - if (git_stream_supports_proxy(t->io) && - !git_remote__get_http_proxy(t->owner->owner, !!t->connection_data.use_ssl, &proxy_url)) { - error = git_stream_set_proxy(t->io, proxy_url); - git__free(proxy_url); - - if (error < 0) - return error; - } - - error = git_stream_connect(t->io); - -#if defined(GIT_OPENSSL) || defined(GIT_SECURE_TRANSPORT) || defined(GIT_CURL) - if ((!error || error == GIT_ECERTIFICATE) && t->owner->certificate_check_cb != NULL && - git_stream_is_encrypted(t->io)) { - git_cert *cert; - int is_valid; - - if ((error = git_stream_certificate(&cert, t->io)) < 0) - return error; - - giterr_clear(); - is_valid = error != GIT_ECERTIFICATE; - error = t->owner->certificate_check_cb(cert, is_valid, t->connection_data.host, t->owner->message_cb_payload); - - if (error < 0) { - if (!giterr_last()) - giterr_set(GITERR_NET, "user cancelled certificate check"); - - return error; - } - } -#endif - if (error < 0) - return error; - - t->connected = 1; - return 0; -} - -static int http_stream_read( - git_smart_subtransport_stream *stream, - char *buffer, - size_t buf_size, - size_t *bytes_read) -{ - http_stream *s = (http_stream *)stream; - http_subtransport *t = OWNING_SUBTRANSPORT(s); - parser_context ctx; - size_t bytes_parsed; - -replay: - *bytes_read = 0; - - assert(t->connected); - - if (!s->sent_request) { - git_buf request = GIT_BUF_INIT; - - clear_parser_state(t); - - if (gen_request(&request, s, 0) < 0) - return -1; - - if (git_stream_write(t->io, request.ptr, request.size, 0) < 0) { - git_buf_free(&request); - return -1; - } - - git_buf_free(&request); - - s->sent_request = 1; - } - - if (!s->received_response) { - if (s->chunked) { - assert(s->verb == post_verb); - - /* Flush, if necessary */ - if (s->chunk_buffer_len > 0 && - write_chunk(t->io, s->chunk_buffer, s->chunk_buffer_len) < 0) - return -1; - - s->chunk_buffer_len = 0; - - /* Write the final chunk. */ - if (git_stream_write(t->io, "0\r\n\r\n", 5, 0) < 0) - return -1; - } - - s->received_response = 1; - } - - while (!*bytes_read && !t->parse_finished) { - size_t data_offset; - int error; - - /* - * Make the parse_buffer think it's as full of data as - * the buffer, so it won't try to recv more data than - * we can put into it. - * - * data_offset is the actual data offset from which we - * should tell the parser to start reading. - */ - if (buf_size >= t->parse_buffer.len) { - t->parse_buffer.offset = 0; - } else { - t->parse_buffer.offset = t->parse_buffer.len - buf_size; - } - - data_offset = t->parse_buffer.offset; - - if (gitno_recv(&t->parse_buffer) < 0) - return -1; - - /* This call to http_parser_execute will result in invocations of the - * on_* family of callbacks. The most interesting of these is - * on_body_fill_buffer, which is called when data is ready to be copied - * into the target buffer. We need to marshal the buffer, buf_size, and - * bytes_read parameters to this callback. */ - ctx.t = t; - ctx.s = s; - ctx.buffer = buffer; - ctx.buf_size = buf_size; - ctx.bytes_read = bytes_read; - - /* Set the context, call the parser, then unset the context. */ - t->parser.data = &ctx; - - bytes_parsed = http_parser_execute(&t->parser, - &t->settings, - t->parse_buffer.data + data_offset, - t->parse_buffer.offset - data_offset); - - t->parser.data = NULL; - - /* If there was a handled authentication failure, then parse_error - * will have signaled us that we should replay the request. */ - if (PARSE_ERROR_REPLAY == t->parse_error) { - s->sent_request = 0; - - if ((error = http_connect(t)) < 0) - return error; - - goto replay; - } - - if (t->parse_error == PARSE_ERROR_EXT) { - return t->error; - } - - if (t->parse_error < 0) - return -1; - - if (bytes_parsed != t->parse_buffer.offset - data_offset) { - giterr_set(GITERR_NET, - "HTTP parser error: %s", - http_errno_description((enum http_errno)t->parser.http_errno)); - return -1; - } - } - - return 0; -} - -static int http_stream_write_chunked( - git_smart_subtransport_stream *stream, - const char *buffer, - size_t len) -{ - http_stream *s = (http_stream *)stream; - http_subtransport *t = OWNING_SUBTRANSPORT(s); - - assert(t->connected); - - /* Send the request, if necessary */ - if (!s->sent_request) { - git_buf request = GIT_BUF_INIT; - - clear_parser_state(t); - - if (gen_request(&request, s, 0) < 0) - return -1; - - if (git_stream_write(t->io, request.ptr, request.size, 0) < 0) { - git_buf_free(&request); - return -1; - } - - git_buf_free(&request); - - s->sent_request = 1; - } - - if (len > CHUNK_SIZE) { - /* Flush, if necessary */ - if (s->chunk_buffer_len > 0) { - if (write_chunk(t->io, s->chunk_buffer, s->chunk_buffer_len) < 0) - return -1; - - s->chunk_buffer_len = 0; - } - - /* Write chunk directly */ - if (write_chunk(t->io, buffer, len) < 0) - return -1; - } - else { - /* Append as much to the buffer as we can */ - int count = min(CHUNK_SIZE - s->chunk_buffer_len, len); - - if (!s->chunk_buffer) - s->chunk_buffer = git__malloc(CHUNK_SIZE); - - memcpy(s->chunk_buffer + s->chunk_buffer_len, buffer, count); - s->chunk_buffer_len += count; - buffer += count; - len -= count; - - /* Is the buffer full? If so, then flush */ - if (CHUNK_SIZE == s->chunk_buffer_len) { - if (write_chunk(t->io, s->chunk_buffer, s->chunk_buffer_len) < 0) - return -1; - - s->chunk_buffer_len = 0; - - if (len > 0) { - memcpy(s->chunk_buffer, buffer, len); - s->chunk_buffer_len = len; - } - } - } - - return 0; -} - -static int http_stream_write_single( - git_smart_subtransport_stream *stream, - const char *buffer, - size_t len) -{ - http_stream *s = (http_stream *)stream; - http_subtransport *t = OWNING_SUBTRANSPORT(s); - git_buf request = GIT_BUF_INIT; - - assert(t->connected); - - if (s->sent_request) { - giterr_set(GITERR_NET, "Subtransport configured for only one write"); - return -1; - } - - clear_parser_state(t); - - if (gen_request(&request, s, len) < 0) - return -1; - - if (git_stream_write(t->io, request.ptr, request.size, 0) < 0) - goto on_error; - - if (len && git_stream_write(t->io, buffer, len, 0) < 0) - goto on_error; - - git_buf_free(&request); - s->sent_request = 1; - - return 0; - -on_error: - git_buf_free(&request); - return -1; -} - -static void http_stream_free(git_smart_subtransport_stream *stream) -{ - http_stream *s = (http_stream *)stream; - - if (s->chunk_buffer) - git__free(s->chunk_buffer); - - if (s->redirect_url) - git__free(s->redirect_url); - - git__free(s); -} - -static int http_stream_alloc(http_subtransport *t, - git_smart_subtransport_stream **stream) -{ - http_stream *s; - - if (!stream) - return -1; - - s = git__calloc(sizeof(http_stream), 1); - GITERR_CHECK_ALLOC(s); - - s->parent.subtransport = &t->parent; - s->parent.read = http_stream_read; - s->parent.write = http_stream_write_single; - s->parent.free = http_stream_free; - - *stream = (git_smart_subtransport_stream *)s; - return 0; -} - -static int http_uploadpack_ls( - http_subtransport *t, - git_smart_subtransport_stream **stream) -{ - http_stream *s; - - if (http_stream_alloc(t, stream) < 0) - return -1; - - s = (http_stream *)*stream; - - s->service = upload_pack_service; - s->service_url = upload_pack_ls_service_url; - s->verb = get_verb; - - return 0; -} - -static int http_uploadpack( - http_subtransport *t, - git_smart_subtransport_stream **stream) -{ - http_stream *s; - - if (http_stream_alloc(t, stream) < 0) - return -1; - - s = (http_stream *)*stream; - - s->service = upload_pack_service; - s->service_url = upload_pack_service_url; - s->verb = post_verb; - - return 0; -} - -static int http_receivepack_ls( - http_subtransport *t, - git_smart_subtransport_stream **stream) -{ - http_stream *s; - - if (http_stream_alloc(t, stream) < 0) - return -1; - - s = (http_stream *)*stream; - - s->service = receive_pack_service; - s->service_url = receive_pack_ls_service_url; - s->verb = get_verb; - - return 0; -} - -static int http_receivepack( - http_subtransport *t, - git_smart_subtransport_stream **stream) -{ - http_stream *s; - - if (http_stream_alloc(t, stream) < 0) - return -1; - - s = (http_stream *)*stream; - - /* Use Transfer-Encoding: chunked for this request */ - s->chunked = 1; - s->parent.write = http_stream_write_chunked; - - s->service = receive_pack_service; - s->service_url = receive_pack_service_url; - s->verb = post_verb; - - return 0; -} - -static int http_action( - git_smart_subtransport_stream **stream, - git_smart_subtransport *subtransport, - const char *url, - git_smart_service_t action) -{ - http_subtransport *t = (http_subtransport *)subtransport; - int ret; - - if (!stream) - return -1; - - if ((!t->connection_data.host || !t->connection_data.port || !t->connection_data.path) && - (ret = gitno_connection_data_from_url(&t->connection_data, url, NULL)) < 0) - return ret; - - if ((ret = http_connect(t)) < 0) - return ret; - - switch (action) { - case GIT_SERVICE_UPLOADPACK_LS: - return http_uploadpack_ls(t, stream); - - case GIT_SERVICE_UPLOADPACK: - return http_uploadpack(t, stream); - - case GIT_SERVICE_RECEIVEPACK_LS: - return http_receivepack_ls(t, stream); - - case GIT_SERVICE_RECEIVEPACK: - return http_receivepack(t, stream); - } - - *stream = NULL; - return -1; -} - -static int http_close(git_smart_subtransport *subtransport) -{ - http_subtransport *t = (http_subtransport *) subtransport; - git_http_auth_context *context; - size_t i; - - clear_parser_state(t); - - if (t->io) { - git_stream_close(t->io); - git_stream_free(t->io); - t->io = NULL; - } - - if (t->cred) { - t->cred->free(t->cred); - t->cred = NULL; - } - - if (t->url_cred) { - t->url_cred->free(t->url_cred); - t->url_cred = NULL; - } - - git_vector_foreach(&t->auth_contexts, i, context) { - if (context->free) - context->free(context); - } - - git_vector_clear(&t->auth_contexts); - - gitno_connection_data_free_ptrs(&t->connection_data); - memset(&t->connection_data, 0x0, sizeof(gitno_connection_data)); - - return 0; -} - -static void http_free(git_smart_subtransport *subtransport) -{ - http_subtransport *t = (http_subtransport *) subtransport; - - http_close(subtransport); - - git_vector_free(&t->auth_contexts); - git__free(t); -} - -int git_smart_subtransport_http(git_smart_subtransport **out, git_transport *owner, void *param) -{ - http_subtransport *t; - - GIT_UNUSED(param); - - if (!out) - return -1; - - t = git__calloc(sizeof(http_subtransport), 1); - GITERR_CHECK_ALLOC(t); - - t->owner = (transport_smart *)owner; - t->parent.action = http_action; - t->parent.close = http_close; - t->parent.free = http_free; - - t->settings.on_header_field = on_header_field; - t->settings.on_header_value = on_header_value; - t->settings.on_headers_complete = on_headers_complete; - t->settings.on_body = on_body_fill_buffer; - t->settings.on_message_complete = on_message_complete; - - *out = (git_smart_subtransport *) t; - return 0; -} - -#endif /* !GIT_WINHTTP */ diff --git a/vendor/libgit2/src/transports/local.c b/vendor/libgit2/src/transports/local.c deleted file mode 100644 index 1c6e5f01e..000000000 --- a/vendor/libgit2/src/transports/local.c +++ /dev/null @@ -1,718 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#include "common.h" -#include "git2/types.h" -#include "git2/net.h" -#include "git2/repository.h" -#include "git2/object.h" -#include "git2/tag.h" -#include "git2/transport.h" -#include "git2/revwalk.h" -#include "git2/odb_backend.h" -#include "git2/pack.h" -#include "git2/commit.h" -#include "git2/revparse.h" -#include "pack-objects.h" -#include "refs.h" -#include "posix.h" -#include "path.h" -#include "buffer.h" -#include "repository.h" -#include "odb.h" -#include "push.h" -#include "remote.h" - -typedef struct { - git_transport parent; - git_remote *owner; - char *url; - int direction; - int flags; - git_atomic cancelled; - git_repository *repo; - git_transport_message_cb progress_cb; - git_transport_message_cb error_cb; - void *message_cb_payload; - git_vector refs; - unsigned connected : 1, - have_refs : 1; -} transport_local; - -static void free_head(git_remote_head *head) -{ - git__free(head->name); - git__free(head->symref_target); - git__free(head); -} - -static void free_heads(git_vector *heads) -{ - git_remote_head *head; - size_t i; - - git_vector_foreach(heads, i, head) - free_head(head); - - git_vector_free(heads); -} - -static int add_ref(transport_local *t, const char *name) -{ - const char peeled[] = "^{}"; - git_reference *ref, *resolved; - git_remote_head *head; - git_oid obj_id; - git_object *obj = NULL, *target = NULL; - git_buf buf = GIT_BUF_INIT; - int error; - - if ((error = git_reference_lookup(&ref, t->repo, name)) < 0) - return error; - - error = git_reference_resolve(&resolved, ref); - if (error < 0) { - git_reference_free(ref); - if (!strcmp(name, GIT_HEAD_FILE) && error == GIT_ENOTFOUND) { - /* This is actually okay. Empty repos often have a HEAD that - * points to a nonexistent "refs/heads/master". */ - giterr_clear(); - return 0; - } - return error; - } - - git_oid_cpy(&obj_id, git_reference_target(resolved)); - git_reference_free(resolved); - - head = git__calloc(1, sizeof(git_remote_head)); - GITERR_CHECK_ALLOC(head); - - head->name = git__strdup(name); - GITERR_CHECK_ALLOC(head->name); - - git_oid_cpy(&head->oid, &obj_id); - - if (git_reference_type(ref) == GIT_REF_SYMBOLIC) { - head->symref_target = git__strdup(git_reference_symbolic_target(ref)); - GITERR_CHECK_ALLOC(head->symref_target); - } - git_reference_free(ref); - - if ((error = git_vector_insert(&t->refs, head)) < 0) { - free_head(head); - return error; - } - - /* If it's not a tag, we don't need to try to peel it */ - if (git__prefixcmp(name, GIT_REFS_TAGS_DIR)) - return 0; - - if ((error = git_object_lookup(&obj, t->repo, &head->oid, GIT_OBJ_ANY)) < 0) - return error; - - head = NULL; - - /* If it's not an annotated tag, or if we're mocking - * git-receive-pack, just get out */ - if (git_object_type(obj) != GIT_OBJ_TAG || - t->direction != GIT_DIRECTION_FETCH) { - git_object_free(obj); - return 0; - } - - /* And if it's a tag, peel it, and add it to the list */ - head = git__calloc(1, sizeof(git_remote_head)); - GITERR_CHECK_ALLOC(head); - - if (git_buf_join(&buf, 0, name, peeled) < 0) { - free_head(head); - return -1; - } - head->name = git_buf_detach(&buf); - - if (!(error = git_tag_peel(&target, (git_tag *)obj))) { - git_oid_cpy(&head->oid, git_object_id(target)); - - if ((error = git_vector_insert(&t->refs, head)) < 0) { - free_head(head); - } - } - - git_object_free(obj); - git_object_free(target); - - return error; -} - -static int store_refs(transport_local *t) -{ - size_t i; - git_remote_head *head; - git_strarray ref_names = {0}; - - assert(t); - - if (git_reference_list(&ref_names, t->repo) < 0) - goto on_error; - - /* Clear all heads we might have fetched in a previous connect */ - git_vector_foreach(&t->refs, i, head) { - git__free(head->name); - git__free(head); - } - - /* Clear the vector so we can reuse it */ - git_vector_clear(&t->refs); - - /* Sort the references first */ - git__tsort((void **)ref_names.strings, ref_names.count, &git__strcmp_cb); - - /* Add HEAD iff direction is fetch */ - if (t->direction == GIT_DIRECTION_FETCH && add_ref(t, GIT_HEAD_FILE) < 0) - goto on_error; - - for (i = 0; i < ref_names.count; ++i) { - if (add_ref(t, ref_names.strings[i]) < 0) - goto on_error; - } - - t->have_refs = 1; - git_strarray_free(&ref_names); - return 0; - -on_error: - git_vector_free(&t->refs); - git_strarray_free(&ref_names); - return -1; -} - -/* - * Try to open the url as a git directory. The direction doesn't - * matter in this case because we're calculating the heads ourselves. - */ -static int local_connect( - git_transport *transport, - const char *url, - git_cred_acquire_cb cred_acquire_cb, - void *cred_acquire_payload, - int direction, int flags) -{ - git_repository *repo; - int error; - transport_local *t = (transport_local *) transport; - const char *path; - git_buf buf = GIT_BUF_INIT; - - GIT_UNUSED(cred_acquire_cb); - GIT_UNUSED(cred_acquire_payload); - - if (t->connected) - return 0; - - free_heads(&t->refs); - - t->url = git__strdup(url); - GITERR_CHECK_ALLOC(t->url); - t->direction = direction; - t->flags = flags; - - /* 'url' may be a url or path; convert to a path */ - if ((error = git_path_from_url_or_path(&buf, url)) < 0) { - git_buf_free(&buf); - return error; - } - path = git_buf_cstr(&buf); - - error = git_repository_open(&repo, path); - - git_buf_free(&buf); - - if (error < 0) - return -1; - - t->repo = repo; - - if (store_refs(t) < 0) - return -1; - - t->connected = 1; - - return 0; -} - -static int local_ls(const git_remote_head ***out, size_t *size, git_transport *transport) -{ - transport_local *t = (transport_local *)transport; - - if (!t->have_refs) { - giterr_set(GITERR_NET, "The transport has not yet loaded the refs"); - return -1; - } - - *out = (const git_remote_head **)t->refs.contents; - *size = t->refs.length; - - return 0; -} - -static int local_negotiate_fetch( - git_transport *transport, - git_repository *repo, - const git_remote_head * const *refs, - size_t count) -{ - transport_local *t = (transport_local*)transport; - git_remote_head *rhead; - unsigned int i; - - GIT_UNUSED(refs); - GIT_UNUSED(count); - - /* Fill in the loids */ - git_vector_foreach(&t->refs, i, rhead) { - git_object *obj; - - int error = git_revparse_single(&obj, repo, rhead->name); - if (!error) - git_oid_cpy(&rhead->loid, git_object_id(obj)); - else if (error != GIT_ENOTFOUND) - return error; - else - giterr_clear(); - git_object_free(obj); - } - - return 0; -} - -static int local_push_update_remote_ref( - git_repository *remote_repo, - const char *lref, - const char *rref, - git_oid *loid, - git_oid *roid) -{ - int error; - git_reference *remote_ref = NULL; - - /* check for lhs, if it's empty it means to delete */ - if (lref[0] != '\0') { - /* Create or update a ref */ - error = git_reference_create(NULL, remote_repo, rref, loid, - !git_oid_iszero(roid), NULL); - } else { - /* Delete a ref */ - if ((error = git_reference_lookup(&remote_ref, remote_repo, rref)) < 0) { - if (error == GIT_ENOTFOUND) - error = 0; - return error; - } - - error = git_reference_delete(remote_ref); - git_reference_free(remote_ref); - } - - return error; -} - -static int transfer_to_push_transfer(const git_transfer_progress *stats, void *payload) -{ - const git_remote_callbacks *cbs = payload; - - if (!cbs || !cbs->push_transfer_progress) - return 0; - - return cbs->push_transfer_progress(stats->received_objects, stats->total_objects, stats->received_bytes, - cbs->payload); -} - -static int local_push( - git_transport *transport, - git_push *push, - const git_remote_callbacks *cbs) -{ - transport_local *t = (transport_local *)transport; - git_repository *remote_repo = NULL; - push_spec *spec; - char *url = NULL; - const char *path; - git_buf buf = GIT_BUF_INIT, odb_path = GIT_BUF_INIT; - int error; - size_t j; - - GIT_UNUSED(cbs); - - /* 'push->remote->url' may be a url or path; convert to a path */ - if ((error = git_path_from_url_or_path(&buf, push->remote->url)) < 0) { - git_buf_free(&buf); - return error; - } - path = git_buf_cstr(&buf); - - error = git_repository_open(&remote_repo, path); - - git_buf_free(&buf); - - if (error < 0) - return error; - - /* We don't currently support pushing locally to non-bare repos. Proper - non-bare repo push support would require checking configs to see if - we should override the default 'don't let this happen' behavior. - - Note that this is only an issue when pushing to the current branch, - but we forbid all pushes just in case */ - if (!remote_repo->is_bare) { - error = GIT_EBAREREPO; - giterr_set(GITERR_INVALID, "Local push doesn't (yet) support pushing to non-bare repos."); - goto on_error; - } - - if ((error = git_buf_joinpath(&odb_path, git_repository_path(remote_repo), "objects/pack")) < 0) - goto on_error; - - error = git_packbuilder_write(push->pb, odb_path.ptr, 0, transfer_to_push_transfer, (void *) cbs); - git_buf_free(&odb_path); - - if (error < 0) - goto on_error; - - push->unpack_ok = 1; - - git_vector_foreach(&push->specs, j, spec) { - push_status *status; - const git_error *last; - char *ref = spec->refspec.dst; - - status = git__calloc(1, sizeof(push_status)); - if (!status) - goto on_error; - - status->ref = git__strdup(ref); - if (!status->ref) { - git_push_status_free(status); - goto on_error; - } - - error = local_push_update_remote_ref(remote_repo, spec->refspec.src, spec->refspec.dst, - &spec->loid, &spec->roid); - - switch (error) { - case GIT_OK: - break; - case GIT_EINVALIDSPEC: - status->msg = git__strdup("funny refname"); - break; - case GIT_ENOTFOUND: - status->msg = git__strdup("Remote branch not found to delete"); - break; - default: - last = giterr_last(); - - if (last && last->message) - status->msg = git__strdup(last->message); - else - status->msg = git__strdup("Unspecified error encountered"); - break; - } - - /* failed to allocate memory for a status message */ - if (error < 0 && !status->msg) { - git_push_status_free(status); - goto on_error; - } - - /* failed to insert the ref update status */ - if ((error = git_vector_insert(&push->status, status)) < 0) { - git_push_status_free(status); - goto on_error; - } - } - - if (push->specs.length) { - int flags = t->flags; - url = git__strdup(t->url); - - if (!url || t->parent.close(&t->parent) < 0 || - t->parent.connect(&t->parent, url, - NULL, NULL, GIT_DIRECTION_PUSH, flags)) - goto on_error; - } - - error = 0; - -on_error: - git_repository_free(remote_repo); - git__free(url); - - return error; -} - -typedef struct foreach_data { - git_transfer_progress *stats; - git_transfer_progress_cb progress_cb; - void *progress_payload; - git_odb_writepack *writepack; -} foreach_data; - -static int foreach_cb(void *buf, size_t len, void *payload) -{ - foreach_data *data = (foreach_data*)payload; - - data->stats->received_bytes += len; - return data->writepack->append(data->writepack, buf, len, data->stats); -} - -static const char *counting_objects_fmt = "Counting objects %d\r"; -static const char *compressing_objects_fmt = "Compressing objects: %.0f%% (%d/%d)"; - -static int local_counting(int stage, unsigned int current, unsigned int total, void *payload) -{ - git_buf progress_info = GIT_BUF_INIT; - transport_local *t = payload; - int error; - - if (!t->progress_cb) - return 0; - - if (stage == GIT_PACKBUILDER_ADDING_OBJECTS) { - git_buf_printf(&progress_info, counting_objects_fmt, current); - } else if (stage == GIT_PACKBUILDER_DELTAFICATION) { - float perc = (((float) current) / total) * 100; - git_buf_printf(&progress_info, compressing_objects_fmt, perc, current, total); - if (current == total) - git_buf_printf(&progress_info, ", done\n"); - else - git_buf_putc(&progress_info, '\r'); - - } - - if (git_buf_oom(&progress_info)) - return -1; - - error = t->progress_cb(git_buf_cstr(&progress_info), git_buf_len(&progress_info), t->message_cb_payload); - git_buf_free(&progress_info); - - return error; -} - -static int local_download_pack( - git_transport *transport, - git_repository *repo, - git_transfer_progress *stats, - git_transfer_progress_cb progress_cb, - void *progress_payload) -{ - transport_local *t = (transport_local*)transport; - git_revwalk *walk = NULL; - git_remote_head *rhead; - unsigned int i; - int error = -1; - git_packbuilder *pack = NULL; - git_odb_writepack *writepack = NULL; - git_odb *odb = NULL; - git_buf progress_info = GIT_BUF_INIT; - - if ((error = git_revwalk_new(&walk, t->repo)) < 0) - goto cleanup; - git_revwalk_sorting(walk, GIT_SORT_TIME); - - if ((error = git_packbuilder_new(&pack, t->repo)) < 0) - goto cleanup; - - git_packbuilder_set_callbacks(pack, local_counting, t); - - stats->total_objects = 0; - stats->indexed_objects = 0; - stats->received_objects = 0; - stats->received_bytes = 0; - - git_vector_foreach(&t->refs, i, rhead) { - git_object *obj; - if ((error = git_object_lookup(&obj, t->repo, &rhead->oid, GIT_OBJ_ANY)) < 0) - goto cleanup; - - if (git_object_type(obj) == GIT_OBJ_COMMIT) { - /* Revwalker includes only wanted commits */ - error = git_revwalk_push(walk, &rhead->oid); - if (!error && !git_oid_iszero(&rhead->loid)) { - error = git_revwalk_hide(walk, &rhead->loid); - if (error == GIT_ENOTFOUND) - error = 0; - } - } else { - /* Tag or some other wanted object. Add it on its own */ - error = git_packbuilder_insert_recur(pack, &rhead->oid, rhead->name); - } - git_object_free(obj); - if (error < 0) - goto cleanup; - } - - if ((error = git_packbuilder_insert_walk(pack, walk))) - goto cleanup; - - if ((error = git_buf_printf(&progress_info, counting_objects_fmt, git_packbuilder_object_count(pack))) < 0) - goto cleanup; - - if (t->progress_cb && - (error = t->progress_cb(git_buf_cstr(&progress_info), git_buf_len(&progress_info), t->message_cb_payload)) < 0) - goto cleanup; - - /* Walk the objects, building a packfile */ - if ((error = git_repository_odb__weakptr(&odb, repo)) < 0) - goto cleanup; - - /* One last one with the newline */ - git_buf_clear(&progress_info); - git_buf_printf(&progress_info, counting_objects_fmt, git_packbuilder_object_count(pack)); - if ((error = git_buf_putc(&progress_info, '\n')) < 0) - goto cleanup; - - if (t->progress_cb && - (error = t->progress_cb(git_buf_cstr(&progress_info), git_buf_len(&progress_info), t->message_cb_payload)) < 0) - goto cleanup; - - if ((error = git_odb_write_pack(&writepack, odb, progress_cb, progress_payload)) != 0) - goto cleanup; - - /* Write the data to the ODB */ - { - foreach_data data = {0}; - data.stats = stats; - data.progress_cb = progress_cb; - data.progress_payload = progress_payload; - data.writepack = writepack; - - /* autodetect */ - git_packbuilder_set_threads(pack, 0); - - if ((error = git_packbuilder_foreach(pack, foreach_cb, &data)) != 0) - goto cleanup; - } - - error = writepack->commit(writepack, stats); - -cleanup: - if (writepack) writepack->free(writepack); - git_buf_free(&progress_info); - git_packbuilder_free(pack); - git_revwalk_free(walk); - return error; -} - -static int local_set_callbacks( - git_transport *transport, - git_transport_message_cb progress_cb, - git_transport_message_cb error_cb, - git_transport_certificate_check_cb certificate_check_cb, - void *message_cb_payload) -{ - transport_local *t = (transport_local *)transport; - - GIT_UNUSED(certificate_check_cb); - - t->progress_cb = progress_cb; - t->error_cb = error_cb; - t->message_cb_payload = message_cb_payload; - - return 0; -} - -static int local_is_connected(git_transport *transport) -{ - transport_local *t = (transport_local *)transport; - - return t->connected; -} - -static int local_read_flags(git_transport *transport, int *flags) -{ - transport_local *t = (transport_local *)transport; - - *flags = t->flags; - - return 0; -} - -static void local_cancel(git_transport *transport) -{ - transport_local *t = (transport_local *)transport; - - git_atomic_set(&t->cancelled, 1); -} - -static int local_close(git_transport *transport) -{ - transport_local *t = (transport_local *)transport; - - t->connected = 0; - - if (t->repo) { - git_repository_free(t->repo); - t->repo = NULL; - } - - if (t->url) { - git__free(t->url); - t->url = NULL; - } - - return 0; -} - -static void local_free(git_transport *transport) -{ - transport_local *t = (transport_local *)transport; - - free_heads(&t->refs); - - /* Close the transport, if it's still open. */ - local_close(transport); - - /* Free the transport */ - git__free(t); -} - -/************** - * Public API * - **************/ - -int git_transport_local(git_transport **out, git_remote *owner, void *param) -{ - int error; - transport_local *t; - - GIT_UNUSED(param); - - t = git__calloc(1, sizeof(transport_local)); - GITERR_CHECK_ALLOC(t); - - t->parent.version = GIT_TRANSPORT_VERSION; - t->parent.set_callbacks = local_set_callbacks; - t->parent.connect = local_connect; - t->parent.negotiate_fetch = local_negotiate_fetch; - t->parent.download_pack = local_download_pack; - t->parent.push = local_push; - t->parent.close = local_close; - t->parent.free = local_free; - t->parent.ls = local_ls; - t->parent.is_connected = local_is_connected; - t->parent.read_flags = local_read_flags; - t->parent.cancel = local_cancel; - - if ((error = git_vector_init(&t->refs, 0, NULL)) < 0) { - git__free(t); - return error; - } - - t->owner = owner; - - *out = (git_transport *) t; - - return 0; -} diff --git a/vendor/libgit2/src/transports/smart.c b/vendor/libgit2/src/transports/smart.c deleted file mode 100644 index b0611c35e..000000000 --- a/vendor/libgit2/src/transports/smart.c +++ /dev/null @@ -1,514 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#include "git2.h" -#include "smart.h" -#include "refs.h" -#include "refspec.h" - -static int git_smart__recv_cb(gitno_buffer *buf) -{ - transport_smart *t = (transport_smart *) buf->cb_data; - size_t old_len, bytes_read; - int error; - - assert(t->current_stream); - - old_len = buf->offset; - - if ((error = t->current_stream->read(t->current_stream, buf->data + buf->offset, buf->len - buf->offset, &bytes_read)) < 0) - return error; - - buf->offset += bytes_read; - - if (t->packetsize_cb && !t->cancelled.val) { - error = t->packetsize_cb(bytes_read, t->packetsize_payload); - if (error) { - git_atomic_set(&t->cancelled, 1); - return GIT_EUSER; - } - } - - return (int)(buf->offset - old_len); -} - -GIT_INLINE(int) git_smart__reset_stream(transport_smart *t, bool close_subtransport) -{ - if (t->current_stream) { - t->current_stream->free(t->current_stream); - t->current_stream = NULL; - } - - if (close_subtransport && - t->wrapped->close(t->wrapped) < 0) - return -1; - - return 0; -} - -static int git_smart__set_callbacks( - git_transport *transport, - git_transport_message_cb progress_cb, - git_transport_message_cb error_cb, - git_transport_certificate_check_cb certificate_check_cb, - void *message_cb_payload) -{ - transport_smart *t = (transport_smart *)transport; - - t->progress_cb = progress_cb; - t->error_cb = error_cb; - t->certificate_check_cb = certificate_check_cb; - t->message_cb_payload = message_cb_payload; - - return 0; -} - -static int http_header_name_length(const char *http_header) -{ - const char *colon = strchr(http_header, ':'); - if (!colon) - return 0; - return colon - http_header; -} - -static bool is_malformed_http_header(const char *http_header) -{ - const char *c; - int name_len; - - // Disallow \r and \n - c = strchr(http_header, '\r'); - if (c) - return true; - c = strchr(http_header, '\n'); - if (c) - return true; - - // Require a header name followed by : - name_len = http_header_name_length(http_header); - if (name_len < 1) - return true; - - return false; -} - -static char *forbidden_custom_headers[] = { - "User-Agent", - "Host", - "Accept", - "Content-Type", - "Transfer-Encoding", - "Content-Length", -}; - -static bool is_forbidden_custom_header(const char *custom_header) -{ - unsigned long i; - int name_len = http_header_name_length(custom_header); - - // Disallow headers that we set - for (i = 0; i < ARRAY_SIZE(forbidden_custom_headers); i++) - if (strncmp(forbidden_custom_headers[i], custom_header, name_len) == 0) - return true; - - return false; -} - -static int git_smart__set_custom_headers( - git_transport *transport, - const git_strarray *custom_headers) -{ - transport_smart *t = (transport_smart *)transport; - size_t i; - - if (t->custom_headers.count) - git_strarray_free(&t->custom_headers); - - if (!custom_headers) - return 0; - - for (i = 0; i < custom_headers->count; i++) { - if (is_malformed_http_header(custom_headers->strings[i])) { - giterr_set(GITERR_INVALID, "custom HTTP header '%s' is malformed", custom_headers->strings[i]); - return -1; - } - if (is_forbidden_custom_header(custom_headers->strings[i])) { - giterr_set(GITERR_INVALID, "custom HTTP header '%s' is already set by libgit2", custom_headers->strings[i]); - return -1; - } - } - - return git_strarray_copy(&t->custom_headers, custom_headers); -} - -int git_smart__update_heads(transport_smart *t, git_vector *symrefs) -{ - size_t i; - git_pkt *pkt; - - git_vector_clear(&t->heads); - git_vector_foreach(&t->refs, i, pkt) { - git_pkt_ref *ref = (git_pkt_ref *) pkt; - if (pkt->type != GIT_PKT_REF) - continue; - - if (symrefs) { - git_refspec *spec; - git_buf buf = GIT_BUF_INIT; - size_t j; - int error = 0; - - git_vector_foreach(symrefs, j, spec) { - git_buf_clear(&buf); - if (git_refspec_src_matches(spec, ref->head.name) && - !(error = git_refspec_transform(&buf, spec, ref->head.name))) - ref->head.symref_target = git_buf_detach(&buf); - } - - git_buf_free(&buf); - - if (error < 0) - return error; - } - - if (git_vector_insert(&t->heads, &ref->head) < 0) - return -1; - } - - return 0; -} - -static void free_symrefs(git_vector *symrefs) -{ - git_refspec *spec; - size_t i; - - git_vector_foreach(symrefs, i, spec) { - git_refspec__free(spec); - git__free(spec); - } - - git_vector_free(symrefs); -} - -static int git_smart__connect( - git_transport *transport, - const char *url, - git_cred_acquire_cb cred_acquire_cb, - void *cred_acquire_payload, - int direction, - int flags) -{ - transport_smart *t = (transport_smart *)transport; - git_smart_subtransport_stream *stream; - int error; - git_pkt *pkt; - git_pkt_ref *first; - git_vector symrefs; - git_smart_service_t service; - - if (git_smart__reset_stream(t, true) < 0) - return -1; - - t->url = git__strdup(url); - GITERR_CHECK_ALLOC(t->url); - - t->direction = direction; - t->flags = flags; - t->cred_acquire_cb = cred_acquire_cb; - t->cred_acquire_payload = cred_acquire_payload; - - if (GIT_DIRECTION_FETCH == t->direction) - service = GIT_SERVICE_UPLOADPACK_LS; - else if (GIT_DIRECTION_PUSH == t->direction) - service = GIT_SERVICE_RECEIVEPACK_LS; - else { - giterr_set(GITERR_NET, "Invalid direction"); - return -1; - } - - if ((error = t->wrapped->action(&stream, t->wrapped, t->url, service)) < 0) - return error; - - /* Save off the current stream (i.e. socket) that we are working with */ - t->current_stream = stream; - - gitno_buffer_setup_callback(&t->buffer, t->buffer_data, sizeof(t->buffer_data), git_smart__recv_cb, t); - - /* 2 flushes for RPC; 1 for stateful */ - if ((error = git_smart__store_refs(t, t->rpc ? 2 : 1)) < 0) - return error; - - /* Strip the comment packet for RPC */ - if (t->rpc) { - pkt = (git_pkt *)git_vector_get(&t->refs, 0); - - if (!pkt || GIT_PKT_COMMENT != pkt->type) { - giterr_set(GITERR_NET, "Invalid response"); - return -1; - } else { - /* Remove the comment pkt from the list */ - git_vector_remove(&t->refs, 0); - git__free(pkt); - } - } - - /* We now have loaded the refs. */ - t->have_refs = 1; - - first = (git_pkt_ref *)git_vector_get(&t->refs, 0); - - if ((error = git_vector_init(&symrefs, 1, NULL)) < 0) - return error; - - /* Detect capabilities */ - if (git_smart__detect_caps(first, &t->caps, &symrefs) < 0) - return -1; - - /* If the only ref in the list is capabilities^{} with OID_ZERO, remove it */ - if (1 == t->refs.length && !strcmp(first->head.name, "capabilities^{}") && - git_oid_iszero(&first->head.oid)) { - git_vector_clear(&t->refs); - git_pkt_free((git_pkt *)first); - } - - /* Keep a list of heads for _ls */ - git_smart__update_heads(t, &symrefs); - - free_symrefs(&symrefs); - - if (t->rpc && git_smart__reset_stream(t, false) < 0) - return -1; - - /* We're now logically connected. */ - t->connected = 1; - - return 0; -} - -static int git_smart__ls(const git_remote_head ***out, size_t *size, git_transport *transport) -{ - transport_smart *t = (transport_smart *)transport; - - if (!t->have_refs) { - giterr_set(GITERR_NET, "The transport has not yet loaded the refs"); - return -1; - } - - *out = (const git_remote_head **) t->heads.contents; - *size = t->heads.length; - - return 0; -} - -int git_smart__negotiation_step(git_transport *transport, void *data, size_t len) -{ - transport_smart *t = (transport_smart *)transport; - git_smart_subtransport_stream *stream; - int error; - - if (t->rpc && git_smart__reset_stream(t, false) < 0) - return -1; - - if (GIT_DIRECTION_FETCH != t->direction) { - giterr_set(GITERR_NET, "This operation is only valid for fetch"); - return -1; - } - - if ((error = t->wrapped->action(&stream, t->wrapped, t->url, GIT_SERVICE_UPLOADPACK)) < 0) - return error; - - /* If this is a stateful implementation, the stream we get back should be the same */ - assert(t->rpc || t->current_stream == stream); - - /* Save off the current stream (i.e. socket) that we are working with */ - t->current_stream = stream; - - if ((error = stream->write(stream, (const char *)data, len)) < 0) - return error; - - gitno_buffer_setup_callback(&t->buffer, t->buffer_data, sizeof(t->buffer_data), git_smart__recv_cb, t); - - return 0; -} - -int git_smart__get_push_stream(transport_smart *t, git_smart_subtransport_stream **stream) -{ - int error; - - if (t->rpc && git_smart__reset_stream(t, false) < 0) - return -1; - - if (GIT_DIRECTION_PUSH != t->direction) { - giterr_set(GITERR_NET, "This operation is only valid for push"); - return -1; - } - - if ((error = t->wrapped->action(stream, t->wrapped, t->url, GIT_SERVICE_RECEIVEPACK)) < 0) - return error; - - /* If this is a stateful implementation, the stream we get back should be the same */ - assert(t->rpc || t->current_stream == *stream); - - /* Save off the current stream (i.e. socket) that we are working with */ - t->current_stream = *stream; - - gitno_buffer_setup_callback(&t->buffer, t->buffer_data, sizeof(t->buffer_data), git_smart__recv_cb, t); - - return 0; -} - -static void git_smart__cancel(git_transport *transport) -{ - transport_smart *t = (transport_smart *)transport; - - git_atomic_set(&t->cancelled, 1); -} - -static int git_smart__is_connected(git_transport *transport) -{ - transport_smart *t = (transport_smart *)transport; - - return t->connected; -} - -static int git_smart__read_flags(git_transport *transport, int *flags) -{ - transport_smart *t = (transport_smart *)transport; - - *flags = t->flags; - - return 0; -} - -static int git_smart__close(git_transport *transport) -{ - transport_smart *t = (transport_smart *)transport; - git_vector *common = &t->common; - unsigned int i; - git_pkt *p; - int ret; - git_smart_subtransport_stream *stream; - const char flush[] = "0000"; - - /* - * If we're still connected at this point and not using RPC, - * we should say goodbye by sending a flush, or git-daemon - * will complain that we disconnected unexpectedly. - */ - if (t->connected && !t->rpc && - !t->wrapped->action(&stream, t->wrapped, t->url, GIT_SERVICE_UPLOADPACK)) { - t->current_stream->write(t->current_stream, flush, 4); - } - - ret = git_smart__reset_stream(t, true); - - git_vector_foreach(common, i, p) - git_pkt_free(p); - - git_vector_free(common); - - if (t->url) { - git__free(t->url); - t->url = NULL; - } - - t->connected = 0; - - return ret; -} - -static void git_smart__free(git_transport *transport) -{ - transport_smart *t = (transport_smart *)transport; - git_vector *refs = &t->refs; - unsigned int i; - git_pkt *p; - - /* Make sure that the current stream is closed, if we have one. */ - git_smart__close(transport); - - /* Free the subtransport */ - t->wrapped->free(t->wrapped); - - git_vector_free(&t->heads); - git_vector_foreach(refs, i, p) - git_pkt_free(p); - - git_vector_free(refs); - - git_strarray_free(&t->custom_headers); - - git__free(t); -} - -static int ref_name_cmp(const void *a, const void *b) -{ - const git_pkt_ref *ref_a = a, *ref_b = b; - - return strcmp(ref_a->head.name, ref_b->head.name); -} - -int git_transport_smart_certificate_check(git_transport *transport, git_cert *cert, int valid, const char *hostname) -{ - transport_smart *t = (transport_smart *)transport; - - return t->certificate_check_cb(cert, valid, hostname, t->message_cb_payload); -} - -int git_transport_smart_credentials(git_cred **out, git_transport *transport, const char *user, int methods) -{ - transport_smart *t = (transport_smart *)transport; - - return t->cred_acquire_cb(out, t->url, user, methods, t->cred_acquire_payload); -} - -int git_transport_smart(git_transport **out, git_remote *owner, void *param) -{ - transport_smart *t; - git_smart_subtransport_definition *definition = (git_smart_subtransport_definition *)param; - - if (!param) - return -1; - - t = git__calloc(1, sizeof(transport_smart)); - GITERR_CHECK_ALLOC(t); - - t->parent.version = GIT_TRANSPORT_VERSION; - t->parent.set_callbacks = git_smart__set_callbacks; - t->parent.set_custom_headers = git_smart__set_custom_headers; - t->parent.connect = git_smart__connect; - t->parent.close = git_smart__close; - t->parent.free = git_smart__free; - t->parent.negotiate_fetch = git_smart__negotiate_fetch; - t->parent.download_pack = git_smart__download_pack; - t->parent.push = git_smart__push; - t->parent.ls = git_smart__ls; - t->parent.is_connected = git_smart__is_connected; - t->parent.read_flags = git_smart__read_flags; - t->parent.cancel = git_smart__cancel; - - t->owner = owner; - t->rpc = definition->rpc; - - if (git_vector_init(&t->refs, 16, ref_name_cmp) < 0) { - git__free(t); - return -1; - } - - if (git_vector_init(&t->heads, 16, ref_name_cmp) < 0) { - git__free(t); - return -1; - } - - if (definition->callback(&t->wrapped, &t->parent, definition->param) < 0) { - git__free(t); - return -1; - } - - *out = (git_transport *) t; - return 0; -} diff --git a/vendor/libgit2/src/transports/smart.h b/vendor/libgit2/src/transports/smart.h deleted file mode 100644 index 800466adf..000000000 --- a/vendor/libgit2/src/transports/smart.h +++ /dev/null @@ -1,190 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#include "git2.h" -#include "vector.h" -#include "netops.h" -#include "buffer.h" -#include "push.h" -#include "git2/sys/transport.h" - -#define GIT_SIDE_BAND_DATA 1 -#define GIT_SIDE_BAND_PROGRESS 2 -#define GIT_SIDE_BAND_ERROR 3 - -#define GIT_CAP_OFS_DELTA "ofs-delta" -#define GIT_CAP_MULTI_ACK "multi_ack" -#define GIT_CAP_MULTI_ACK_DETAILED "multi_ack_detailed" -#define GIT_CAP_SIDE_BAND "side-band" -#define GIT_CAP_SIDE_BAND_64K "side-band-64k" -#define GIT_CAP_INCLUDE_TAG "include-tag" -#define GIT_CAP_DELETE_REFS "delete-refs" -#define GIT_CAP_REPORT_STATUS "report-status" -#define GIT_CAP_THIN_PACK "thin-pack" -#define GIT_CAP_SYMREF "symref" - -enum git_pkt_type { - GIT_PKT_CMD, - GIT_PKT_FLUSH, - GIT_PKT_REF, - GIT_PKT_HAVE, - GIT_PKT_ACK, - GIT_PKT_NAK, - GIT_PKT_PACK, - GIT_PKT_COMMENT, - GIT_PKT_ERR, - GIT_PKT_DATA, - GIT_PKT_PROGRESS, - GIT_PKT_OK, - GIT_PKT_NG, - GIT_PKT_UNPACK, -}; - -/* Used for multi_ack and mutli_ack_detailed */ -enum git_ack_status { - GIT_ACK_NONE, - GIT_ACK_CONTINUE, - GIT_ACK_COMMON, - GIT_ACK_READY -}; - -/* This would be a flush pkt */ -typedef struct { - enum git_pkt_type type; -} git_pkt; - -struct git_pkt_cmd { - enum git_pkt_type type; - char *cmd; - char *path; - char *host; -}; - -/* This is a pkt-line with some info in it */ -typedef struct { - enum git_pkt_type type; - git_remote_head head; - char *capabilities; -} git_pkt_ref; - -/* Useful later */ -typedef struct { - enum git_pkt_type type; - git_oid oid; - enum git_ack_status status; -} git_pkt_ack; - -typedef struct { - enum git_pkt_type type; - char comment[GIT_FLEX_ARRAY]; -} git_pkt_comment; - -typedef struct { - enum git_pkt_type type; - int len; - char data[GIT_FLEX_ARRAY]; -} git_pkt_data; - -typedef git_pkt_data git_pkt_progress; - -typedef struct { - enum git_pkt_type type; - int len; - char error[GIT_FLEX_ARRAY]; -} git_pkt_err; - -typedef struct { - enum git_pkt_type type; - char *ref; -} git_pkt_ok; - -typedef struct { - enum git_pkt_type type; - char *ref; - char *msg; -} git_pkt_ng; - -typedef struct { - enum git_pkt_type type; - int unpack_ok; -} git_pkt_unpack; - -typedef struct transport_smart_caps { - int common:1, - ofs_delta:1, - multi_ack: 1, - multi_ack_detailed: 1, - side_band:1, - side_band_64k:1, - include_tag:1, - delete_refs:1, - report_status:1, - thin_pack:1; -} transport_smart_caps; - -typedef int (*packetsize_cb)(size_t received, void *payload); - -typedef struct { - git_transport parent; - git_remote *owner; - char *url; - git_cred_acquire_cb cred_acquire_cb; - void *cred_acquire_payload; - int direction; - int flags; - git_transport_message_cb progress_cb; - git_transport_message_cb error_cb; - git_transport_certificate_check_cb certificate_check_cb; - void *message_cb_payload; - git_strarray custom_headers; - git_smart_subtransport *wrapped; - git_smart_subtransport_stream *current_stream; - transport_smart_caps caps; - git_vector refs; - git_vector heads; - git_vector common; - git_atomic cancelled; - packetsize_cb packetsize_cb; - void *packetsize_payload; - unsigned rpc : 1, - have_refs : 1, - connected : 1; - gitno_buffer buffer; - char buffer_data[65536]; -} transport_smart; - -/* smart_protocol.c */ -int git_smart__store_refs(transport_smart *t, int flushes); -int git_smart__detect_caps(git_pkt_ref *pkt, transport_smart_caps *caps, git_vector *symrefs); -int git_smart__push(git_transport *transport, git_push *push, const git_remote_callbacks *cbs); - -int git_smart__negotiate_fetch( - git_transport *transport, - git_repository *repo, - const git_remote_head * const *refs, - size_t count); - -int git_smart__download_pack( - git_transport *transport, - git_repository *repo, - git_transfer_progress *stats, - git_transfer_progress_cb progress_cb, - void *progress_payload); - -/* smart.c */ -int git_smart__negotiation_step(git_transport *transport, void *data, size_t len); -int git_smart__get_push_stream(transport_smart *t, git_smart_subtransport_stream **out); - -int git_smart__update_heads(transport_smart *t, git_vector *symrefs); - -/* smart_pkt.c */ -int git_pkt_parse_line(git_pkt **head, const char *line, const char **out, size_t len); -int git_pkt_buffer_flush(git_buf *buf); -int git_pkt_send_flush(GIT_SOCKET s); -int git_pkt_buffer_done(git_buf *buf); -int git_pkt_buffer_wants(const git_remote_head * const *refs, size_t count, transport_smart_caps *caps, git_buf *buf); -int git_pkt_buffer_have(git_oid *oid, git_buf *buf); -void git_pkt_free(git_pkt *pkt); diff --git a/vendor/libgit2/src/transports/smart_pkt.c b/vendor/libgit2/src/transports/smart_pkt.c deleted file mode 100644 index 2ea57bb64..000000000 --- a/vendor/libgit2/src/transports/smart_pkt.c +++ /dev/null @@ -1,609 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "common.h" - -#include "git2/types.h" -#include "git2/errors.h" -#include "git2/refs.h" -#include "git2/revwalk.h" - -#include "smart.h" -#include "util.h" -#include "netops.h" -#include "posix.h" -#include "buffer.h" - -#include - -#define PKT_LEN_SIZE 4 -static const char pkt_done_str[] = "0009done\n"; -static const char pkt_flush_str[] = "0000"; -static const char pkt_have_prefix[] = "0032have "; -static const char pkt_want_prefix[] = "0032want "; - -static int flush_pkt(git_pkt **out) -{ - git_pkt *pkt; - - pkt = git__malloc(sizeof(git_pkt)); - GITERR_CHECK_ALLOC(pkt); - - pkt->type = GIT_PKT_FLUSH; - *out = pkt; - - return 0; -} - -/* the rest of the line will be useful for multi_ack and multi_ack_detailed */ -static int ack_pkt(git_pkt **out, const char *line, size_t len) -{ - git_pkt_ack *pkt; - GIT_UNUSED(line); - GIT_UNUSED(len); - - pkt = git__calloc(1, sizeof(git_pkt_ack)); - GITERR_CHECK_ALLOC(pkt); - - pkt->type = GIT_PKT_ACK; - line += 3; - len -= 3; - - if (len >= GIT_OID_HEXSZ) { - git_oid_fromstr(&pkt->oid, line + 1); - line += GIT_OID_HEXSZ + 1; - len -= GIT_OID_HEXSZ + 1; - } - - if (len >= 7) { - if (!git__prefixcmp(line + 1, "continue")) - pkt->status = GIT_ACK_CONTINUE; - if (!git__prefixcmp(line + 1, "common")) - pkt->status = GIT_ACK_COMMON; - if (!git__prefixcmp(line + 1, "ready")) - pkt->status = GIT_ACK_READY; - } - - *out = (git_pkt *) pkt; - - return 0; -} - -static int nak_pkt(git_pkt **out) -{ - git_pkt *pkt; - - pkt = git__malloc(sizeof(git_pkt)); - GITERR_CHECK_ALLOC(pkt); - - pkt->type = GIT_PKT_NAK; - *out = pkt; - - return 0; -} - -static int pack_pkt(git_pkt **out) -{ - git_pkt *pkt; - - pkt = git__malloc(sizeof(git_pkt)); - GITERR_CHECK_ALLOC(pkt); - - pkt->type = GIT_PKT_PACK; - *out = pkt; - - return 0; -} - -static int comment_pkt(git_pkt **out, const char *line, size_t len) -{ - git_pkt_comment *pkt; - size_t alloclen; - - GITERR_CHECK_ALLOC_ADD(&alloclen, sizeof(git_pkt_comment), len); - GITERR_CHECK_ALLOC_ADD(&alloclen, alloclen, 1); - pkt = git__malloc(alloclen); - GITERR_CHECK_ALLOC(pkt); - - pkt->type = GIT_PKT_COMMENT; - memcpy(pkt->comment, line, len); - pkt->comment[len] = '\0'; - - *out = (git_pkt *) pkt; - - return 0; -} - -static int err_pkt(git_pkt **out, const char *line, size_t len) -{ - git_pkt_err *pkt; - size_t alloclen; - - /* Remove "ERR " from the line */ - line += 4; - len -= 4; - - GITERR_CHECK_ALLOC_ADD(&alloclen, sizeof(git_pkt_progress), len); - GITERR_CHECK_ALLOC_ADD(&alloclen, alloclen, 1); - pkt = git__malloc(alloclen); - GITERR_CHECK_ALLOC(pkt); - - pkt->type = GIT_PKT_ERR; - pkt->len = (int)len; - memcpy(pkt->error, line, len); - pkt->error[len] = '\0'; - - *out = (git_pkt *) pkt; - - return 0; -} - -static int data_pkt(git_pkt **out, const char *line, size_t len) -{ - git_pkt_data *pkt; - size_t alloclen; - - line++; - len--; - - GITERR_CHECK_ALLOC_ADD(&alloclen, sizeof(git_pkt_progress), len); - pkt = git__malloc(alloclen); - GITERR_CHECK_ALLOC(pkt); - - pkt->type = GIT_PKT_DATA; - pkt->len = (int) len; - memcpy(pkt->data, line, len); - - *out = (git_pkt *) pkt; - - return 0; -} - -static int sideband_progress_pkt(git_pkt **out, const char *line, size_t len) -{ - git_pkt_progress *pkt; - size_t alloclen; - - line++; - len--; - - GITERR_CHECK_ALLOC_ADD(&alloclen, sizeof(git_pkt_progress), len); - pkt = git__malloc(alloclen); - GITERR_CHECK_ALLOC(pkt); - - pkt->type = GIT_PKT_PROGRESS; - pkt->len = (int) len; - memcpy(pkt->data, line, len); - - *out = (git_pkt *) pkt; - - return 0; -} - -static int sideband_error_pkt(git_pkt **out, const char *line, size_t len) -{ - git_pkt_err *pkt; - size_t alloc_len; - - line++; - len--; - - GITERR_CHECK_ALLOC_ADD(&alloc_len, sizeof(git_pkt_err), len); - GITERR_CHECK_ALLOC_ADD(&alloc_len, alloc_len, 1); - pkt = git__malloc(alloc_len); - GITERR_CHECK_ALLOC(pkt); - - pkt->type = GIT_PKT_ERR; - pkt->len = (int)len; - memcpy(pkt->error, line, len); - pkt->error[len] = '\0'; - - *out = (git_pkt *)pkt; - - return 0; -} - -/* - * Parse an other-ref line. - */ -static int ref_pkt(git_pkt **out, const char *line, size_t len) -{ - int error; - git_pkt_ref *pkt; - size_t alloclen; - - pkt = git__malloc(sizeof(git_pkt_ref)); - GITERR_CHECK_ALLOC(pkt); - - memset(pkt, 0x0, sizeof(git_pkt_ref)); - pkt->type = GIT_PKT_REF; - if ((error = git_oid_fromstr(&pkt->head.oid, line)) < 0) - goto error_out; - - /* Check for a bit of consistency */ - if (line[GIT_OID_HEXSZ] != ' ') { - giterr_set(GITERR_NET, "Error parsing pkt-line"); - error = -1; - goto error_out; - } - - /* Jump from the name */ - line += GIT_OID_HEXSZ + 1; - len -= (GIT_OID_HEXSZ + 1); - - if (line[len - 1] == '\n') - --len; - - GITERR_CHECK_ALLOC_ADD(&alloclen, len, 1); - pkt->head.name = git__malloc(alloclen); - GITERR_CHECK_ALLOC(pkt->head.name); - - memcpy(pkt->head.name, line, len); - pkt->head.name[len] = '\0'; - - if (strlen(pkt->head.name) < len) { - pkt->capabilities = strchr(pkt->head.name, '\0') + 1; - } - - *out = (git_pkt *)pkt; - return 0; - -error_out: - git__free(pkt); - return error; -} - -static int ok_pkt(git_pkt **out, const char *line, size_t len) -{ - git_pkt_ok *pkt; - const char *ptr; - size_t alloc_len; - - pkt = git__malloc(sizeof(*pkt)); - GITERR_CHECK_ALLOC(pkt); - - pkt->type = GIT_PKT_OK; - - line += 3; /* skip "ok " */ - if (!(ptr = strchr(line, '\n'))) { - giterr_set(GITERR_NET, "Invalid packet line"); - git__free(pkt); - return -1; - } - len = ptr - line; - - GITERR_CHECK_ALLOC_ADD(&alloc_len, len, 1); - pkt->ref = git__malloc(alloc_len); - GITERR_CHECK_ALLOC(pkt->ref); - - memcpy(pkt->ref, line, len); - pkt->ref[len] = '\0'; - - *out = (git_pkt *)pkt; - return 0; -} - -static int ng_pkt(git_pkt **out, const char *line, size_t len) -{ - git_pkt_ng *pkt; - const char *ptr; - size_t alloclen; - - pkt = git__malloc(sizeof(*pkt)); - GITERR_CHECK_ALLOC(pkt); - - pkt->ref = NULL; - pkt->type = GIT_PKT_NG; - - line += 3; /* skip "ng " */ - if (!(ptr = strchr(line, ' '))) - goto out_err; - len = ptr - line; - - GITERR_CHECK_ALLOC_ADD(&alloclen, len, 1); - pkt->ref = git__malloc(alloclen); - GITERR_CHECK_ALLOC(pkt->ref); - - memcpy(pkt->ref, line, len); - pkt->ref[len] = '\0'; - - line = ptr + 1; - if (!(ptr = strchr(line, '\n'))) - goto out_err; - len = ptr - line; - - GITERR_CHECK_ALLOC_ADD(&alloclen, len, 1); - pkt->msg = git__malloc(alloclen); - GITERR_CHECK_ALLOC(pkt->msg); - - memcpy(pkt->msg, line, len); - pkt->msg[len] = '\0'; - - *out = (git_pkt *)pkt; - return 0; - -out_err: - giterr_set(GITERR_NET, "Invalid packet line"); - git__free(pkt->ref); - git__free(pkt); - return -1; -} - -static int unpack_pkt(git_pkt **out, const char *line, size_t len) -{ - git_pkt_unpack *pkt; - - GIT_UNUSED(len); - - pkt = git__malloc(sizeof(*pkt)); - GITERR_CHECK_ALLOC(pkt); - - pkt->type = GIT_PKT_UNPACK; - if (!git__prefixcmp(line, "unpack ok")) - pkt->unpack_ok = 1; - else - pkt->unpack_ok = 0; - - *out = (git_pkt *)pkt; - return 0; -} - -static int32_t parse_len(const char *line) -{ - char num[PKT_LEN_SIZE + 1]; - int i, k, error; - int32_t len; - const char *num_end; - - memcpy(num, line, PKT_LEN_SIZE); - num[PKT_LEN_SIZE] = '\0'; - - for (i = 0; i < PKT_LEN_SIZE; ++i) { - if (!isxdigit(num[i])) { - /* Make sure there are no special characters before passing to error message */ - for (k = 0; k < PKT_LEN_SIZE; ++k) { - if(!isprint(num[k])) { - num[k] = '.'; - } - } - - giterr_set(GITERR_NET, "invalid hex digit in length: '%s'", num); - return -1; - } - } - - if ((error = git__strtol32(&len, num, &num_end, 16)) < 0) - return error; - - return len; -} - -/* - * As per the documentation, the syntax is: - * - * pkt-line = data-pkt / flush-pkt - * data-pkt = pkt-len pkt-payload - * pkt-len = 4*(HEXDIG) - * pkt-payload = (pkt-len -4)*(OCTET) - * flush-pkt = "0000" - * - * Which means that the first four bytes are the length of the line, - * in ASCII hexadecimal (including itself) - */ - -int git_pkt_parse_line( - git_pkt **head, const char *line, const char **out, size_t bufflen) -{ - int ret; - int32_t len; - - /* Not even enough for the length */ - if (bufflen > 0 && bufflen < PKT_LEN_SIZE) - return GIT_EBUFS; - - len = parse_len(line); - if (len < 0) { - /* - * If we fail to parse the length, it might be because the - * server is trying to send us the packfile already. - */ - if (bufflen >= 4 && !git__prefixcmp(line, "PACK")) { - giterr_clear(); - *out = line; - return pack_pkt(head); - } - - return (int)len; - } - - /* - * If we were given a buffer length, then make sure there is - * enough in the buffer to satisfy this line - */ - if (bufflen > 0 && bufflen < (size_t)len) - return GIT_EBUFS; - - line += PKT_LEN_SIZE; - /* - * TODO: How do we deal with empty lines? Try again? with the next - * line? - */ - if (len == PKT_LEN_SIZE) { - *out = line; - return 0; - } - - if (len == 0) { /* Flush pkt */ - *out = line; - return flush_pkt(head); - } - - len -= PKT_LEN_SIZE; /* the encoded length includes its own size */ - - if (*line == GIT_SIDE_BAND_DATA) - ret = data_pkt(head, line, len); - else if (*line == GIT_SIDE_BAND_PROGRESS) - ret = sideband_progress_pkt(head, line, len); - else if (*line == GIT_SIDE_BAND_ERROR) - ret = sideband_error_pkt(head, line, len); - else if (!git__prefixcmp(line, "ACK")) - ret = ack_pkt(head, line, len); - else if (!git__prefixcmp(line, "NAK")) - ret = nak_pkt(head); - else if (!git__prefixcmp(line, "ERR ")) - ret = err_pkt(head, line, len); - else if (*line == '#') - ret = comment_pkt(head, line, len); - else if (!git__prefixcmp(line, "ok")) - ret = ok_pkt(head, line, len); - else if (!git__prefixcmp(line, "ng")) - ret = ng_pkt(head, line, len); - else if (!git__prefixcmp(line, "unpack")) - ret = unpack_pkt(head, line, len); - else - ret = ref_pkt(head, line, len); - - *out = line + len; - - return ret; -} - -void git_pkt_free(git_pkt *pkt) -{ - if (pkt->type == GIT_PKT_REF) { - git_pkt_ref *p = (git_pkt_ref *) pkt; - git__free(p->head.name); - git__free(p->head.symref_target); - } - - if (pkt->type == GIT_PKT_OK) { - git_pkt_ok *p = (git_pkt_ok *) pkt; - git__free(p->ref); - } - - if (pkt->type == GIT_PKT_NG) { - git_pkt_ng *p = (git_pkt_ng *) pkt; - git__free(p->ref); - git__free(p->msg); - } - - git__free(pkt); -} - -int git_pkt_buffer_flush(git_buf *buf) -{ - return git_buf_put(buf, pkt_flush_str, strlen(pkt_flush_str)); -} - -static int buffer_want_with_caps(const git_remote_head *head, transport_smart_caps *caps, git_buf *buf) -{ - git_buf str = GIT_BUF_INIT; - char oid[GIT_OID_HEXSZ +1] = {0}; - size_t len; - - /* Prefer multi_ack_detailed */ - if (caps->multi_ack_detailed) - git_buf_puts(&str, GIT_CAP_MULTI_ACK_DETAILED " "); - else if (caps->multi_ack) - git_buf_puts(&str, GIT_CAP_MULTI_ACK " "); - - /* Prefer side-band-64k if the server supports both */ - if (caps->side_band_64k) - git_buf_printf(&str, "%s ", GIT_CAP_SIDE_BAND_64K); - else if (caps->side_band) - git_buf_printf(&str, "%s ", GIT_CAP_SIDE_BAND); - - if (caps->include_tag) - git_buf_puts(&str, GIT_CAP_INCLUDE_TAG " "); - - if (caps->thin_pack) - git_buf_puts(&str, GIT_CAP_THIN_PACK " "); - - if (caps->ofs_delta) - git_buf_puts(&str, GIT_CAP_OFS_DELTA " "); - - if (git_buf_oom(&str)) - return -1; - - len = strlen("XXXXwant ") + GIT_OID_HEXSZ + 1 /* NUL */ + - git_buf_len(&str) + 1 /* LF */; - - if (len > 0xffff) { - giterr_set(GITERR_NET, - "Tried to produce packet with invalid length %" PRIuZ, len); - return -1; - } - - git_buf_grow_by(buf, len); - git_oid_fmt(oid, &head->oid); - git_buf_printf(buf, - "%04xwant %s %s\n", (unsigned int)len, oid, git_buf_cstr(&str)); - git_buf_free(&str); - - GITERR_CHECK_ALLOC_BUF(buf); - - return 0; -} - -/* - * All "want" packets have the same length and format, so what we do - * is overwrite the OID each time. - */ - -int git_pkt_buffer_wants( - const git_remote_head * const *refs, - size_t count, - transport_smart_caps *caps, - git_buf *buf) -{ - size_t i = 0; - const git_remote_head *head; - - if (caps->common) { - for (; i < count; ++i) { - head = refs[i]; - if (!head->local) - break; - } - - if (buffer_want_with_caps(refs[i], caps, buf) < 0) - return -1; - - i++; - } - - for (; i < count; ++i) { - char oid[GIT_OID_HEXSZ]; - - head = refs[i]; - if (head->local) - continue; - - git_oid_fmt(oid, &head->oid); - git_buf_put(buf, pkt_want_prefix, strlen(pkt_want_prefix)); - git_buf_put(buf, oid, GIT_OID_HEXSZ); - git_buf_putc(buf, '\n'); - if (git_buf_oom(buf)) - return -1; - } - - return git_pkt_buffer_flush(buf); -} - -int git_pkt_buffer_have(git_oid *oid, git_buf *buf) -{ - char oidhex[GIT_OID_HEXSZ + 1]; - - memset(oidhex, 0x0, sizeof(oidhex)); - git_oid_fmt(oidhex, oid); - return git_buf_printf(buf, "%s%s\n", pkt_have_prefix, oidhex); -} - -int git_pkt_buffer_done(git_buf *buf) -{ - return git_buf_puts(buf, pkt_done_str); -} diff --git a/vendor/libgit2/src/transports/smart_protocol.c b/vendor/libgit2/src/transports/smart_protocol.c deleted file mode 100644 index 02e1ecf74..000000000 --- a/vendor/libgit2/src/transports/smart_protocol.c +++ /dev/null @@ -1,1081 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#include "git2.h" -#include "git2/odb_backend.h" - -#include "smart.h" -#include "refs.h" -#include "repository.h" -#include "push.h" -#include "pack-objects.h" -#include "remote.h" -#include "util.h" - -#define NETWORK_XFER_THRESHOLD (100*1024) -/* The minimal interval between progress updates (in seconds). */ -#define MIN_PROGRESS_UPDATE_INTERVAL 0.5 - -int git_smart__store_refs(transport_smart *t, int flushes) -{ - gitno_buffer *buf = &t->buffer; - git_vector *refs = &t->refs; - int error, flush = 0, recvd; - const char *line_end = NULL; - git_pkt *pkt = NULL; - size_t i; - - /* Clear existing refs in case git_remote_connect() is called again - * after git_remote_disconnect(). - */ - git_vector_foreach(refs, i, pkt) { - git_pkt_free(pkt); - } - git_vector_clear(refs); - pkt = NULL; - - do { - if (buf->offset > 0) - error = git_pkt_parse_line(&pkt, buf->data, &line_end, buf->offset); - else - error = GIT_EBUFS; - - if (error < 0 && error != GIT_EBUFS) - return error; - - if (error == GIT_EBUFS) { - if ((recvd = gitno_recv(buf)) < 0) - return recvd; - - if (recvd == 0 && !flush) { - giterr_set(GITERR_NET, "early EOF"); - return GIT_EEOF; - } - - continue; - } - - gitno_consume(buf, line_end); - if (pkt->type == GIT_PKT_ERR) { - giterr_set(GITERR_NET, "Remote error: %s", ((git_pkt_err *)pkt)->error); - git__free(pkt); - return -1; - } - - if (pkt->type != GIT_PKT_FLUSH && git_vector_insert(refs, pkt) < 0) - return -1; - - if (pkt->type == GIT_PKT_FLUSH) { - flush++; - git_pkt_free(pkt); - } - } while (flush < flushes); - - return flush; -} - -static int append_symref(const char **out, git_vector *symrefs, const char *ptr) -{ - int error; - const char *end; - git_buf buf = GIT_BUF_INIT; - git_refspec *mapping = NULL; - - ptr += strlen(GIT_CAP_SYMREF); - if (*ptr != '=') - goto on_invalid; - - ptr++; - if (!(end = strchr(ptr, ' ')) && - !(end = strchr(ptr, '\0'))) - goto on_invalid; - - if ((error = git_buf_put(&buf, ptr, end - ptr)) < 0) - return error; - - /* symref mapping has refspec format */ - mapping = git__calloc(1, sizeof(git_refspec)); - GITERR_CHECK_ALLOC(mapping); - - error = git_refspec__parse(mapping, git_buf_cstr(&buf), true); - git_buf_free(&buf); - - /* if the error isn't OOM, then it's a parse error; let's use a nicer message */ - if (error < 0) { - if (giterr_last()->klass != GITERR_NOMEMORY) - goto on_invalid; - - git__free(mapping); - return error; - } - - if ((error = git_vector_insert(symrefs, mapping)) < 0) - return error; - - *out = end; - return 0; - -on_invalid: - giterr_set(GITERR_NET, "remote sent invalid symref"); - git_refspec__free(mapping); - git__free(mapping); - return -1; -} - -int git_smart__detect_caps(git_pkt_ref *pkt, transport_smart_caps *caps, git_vector *symrefs) -{ - const char *ptr; - - /* No refs or capabilites, odd but not a problem */ - if (pkt == NULL || pkt->capabilities == NULL) - return 0; - - ptr = pkt->capabilities; - while (ptr != NULL && *ptr != '\0') { - if (*ptr == ' ') - ptr++; - - if (!git__prefixcmp(ptr, GIT_CAP_OFS_DELTA)) { - caps->common = caps->ofs_delta = 1; - ptr += strlen(GIT_CAP_OFS_DELTA); - continue; - } - - /* Keep multi_ack_detailed before multi_ack */ - if (!git__prefixcmp(ptr, GIT_CAP_MULTI_ACK_DETAILED)) { - caps->common = caps->multi_ack_detailed = 1; - ptr += strlen(GIT_CAP_MULTI_ACK_DETAILED); - continue; - } - - if (!git__prefixcmp(ptr, GIT_CAP_MULTI_ACK)) { - caps->common = caps->multi_ack = 1; - ptr += strlen(GIT_CAP_MULTI_ACK); - continue; - } - - if (!git__prefixcmp(ptr, GIT_CAP_INCLUDE_TAG)) { - caps->common = caps->include_tag = 1; - ptr += strlen(GIT_CAP_INCLUDE_TAG); - continue; - } - - /* Keep side-band check after side-band-64k */ - if (!git__prefixcmp(ptr, GIT_CAP_SIDE_BAND_64K)) { - caps->common = caps->side_band_64k = 1; - ptr += strlen(GIT_CAP_SIDE_BAND_64K); - continue; - } - - if (!git__prefixcmp(ptr, GIT_CAP_SIDE_BAND)) { - caps->common = caps->side_band = 1; - ptr += strlen(GIT_CAP_SIDE_BAND); - continue; - } - - if (!git__prefixcmp(ptr, GIT_CAP_DELETE_REFS)) { - caps->common = caps->delete_refs = 1; - ptr += strlen(GIT_CAP_DELETE_REFS); - continue; - } - - if (!git__prefixcmp(ptr, GIT_CAP_THIN_PACK)) { - caps->common = caps->thin_pack = 1; - ptr += strlen(GIT_CAP_THIN_PACK); - continue; - } - - if (!git__prefixcmp(ptr, GIT_CAP_SYMREF)) { - int error; - - if ((error = append_symref(&ptr, symrefs, ptr)) < 0) - return error; - - continue; - } - - /* We don't know this capability, so skip it */ - ptr = strchr(ptr, ' '); - } - - return 0; -} - -static int recv_pkt(git_pkt **out, gitno_buffer *buf) -{ - const char *ptr = buf->data, *line_end = ptr; - git_pkt *pkt = NULL; - int pkt_type, error = 0, ret; - - do { - if (buf->offset > 0) - error = git_pkt_parse_line(&pkt, ptr, &line_end, buf->offset); - else - error = GIT_EBUFS; - - if (error == 0) - break; /* return the pkt */ - - if (error < 0 && error != GIT_EBUFS) - return error; - - if ((ret = gitno_recv(buf)) < 0) - return ret; - } while (error); - - gitno_consume(buf, line_end); - pkt_type = pkt->type; - if (out != NULL) - *out = pkt; - else - git__free(pkt); - - return pkt_type; -} - -static int store_common(transport_smart *t) -{ - git_pkt *pkt = NULL; - gitno_buffer *buf = &t->buffer; - int error; - - do { - if ((error = recv_pkt(&pkt, buf)) < 0) - return error; - - if (pkt->type == GIT_PKT_ACK) { - if (git_vector_insert(&t->common, pkt) < 0) - return -1; - } else { - git__free(pkt); - return 0; - } - - } while (1); - - return 0; -} - -static int fetch_setup_walk(git_revwalk **out, git_repository *repo) -{ - git_revwalk *walk = NULL; - git_strarray refs; - unsigned int i; - git_reference *ref; - int error; - - if ((error = git_reference_list(&refs, repo)) < 0) - return error; - - if ((error = git_revwalk_new(&walk, repo)) < 0) - return error; - - git_revwalk_sorting(walk, GIT_SORT_TIME); - - for (i = 0; i < refs.count; ++i) { - /* No tags */ - if (!git__prefixcmp(refs.strings[i], GIT_REFS_TAGS_DIR)) - continue; - - if ((error = git_reference_lookup(&ref, repo, refs.strings[i])) < 0) - goto on_error; - - if (git_reference_type(ref) == GIT_REF_SYMBOLIC) - continue; - - if ((error = git_revwalk_push(walk, git_reference_target(ref))) < 0) - goto on_error; - - git_reference_free(ref); - } - - git_strarray_free(&refs); - *out = walk; - return 0; - -on_error: - git_revwalk_free(walk); - git_reference_free(ref); - git_strarray_free(&refs); - return error; -} - -static int wait_while_ack(gitno_buffer *buf) -{ - int error; - git_pkt_ack *pkt = NULL; - - while (1) { - git__free(pkt); - - if ((error = recv_pkt((git_pkt **)&pkt, buf)) < 0) - return error; - - if (pkt->type == GIT_PKT_NAK) - break; - - if (pkt->type == GIT_PKT_ACK && - (pkt->status != GIT_ACK_CONTINUE && - pkt->status != GIT_ACK_COMMON)) { - git__free(pkt); - return 0; - } - } - - git__free(pkt); - return 0; -} - -int git_smart__negotiate_fetch(git_transport *transport, git_repository *repo, const git_remote_head * const *wants, size_t count) -{ - transport_smart *t = (transport_smart *)transport; - gitno_buffer *buf = &t->buffer; - git_buf data = GIT_BUF_INIT; - git_revwalk *walk = NULL; - int error = -1, pkt_type; - unsigned int i; - git_oid oid; - - if ((error = git_pkt_buffer_wants(wants, count, &t->caps, &data)) < 0) - return error; - - if ((error = fetch_setup_walk(&walk, repo)) < 0) - goto on_error; - - /* - * Our support for ACK extensions is simply to parse them. On - * the first ACK we will accept that as enough common - * objects. We give up if we haven't found an answer in the - * first 256 we send. - */ - i = 0; - while (i < 256) { - error = git_revwalk_next(&oid, walk); - - if (error < 0) { - if (GIT_ITEROVER == error) - break; - - goto on_error; - } - - git_pkt_buffer_have(&oid, &data); - i++; - if (i % 20 == 0) { - if (t->cancelled.val) { - giterr_set(GITERR_NET, "The fetch was cancelled by the user"); - error = GIT_EUSER; - goto on_error; - } - - git_pkt_buffer_flush(&data); - if (git_buf_oom(&data)) { - error = -1; - goto on_error; - } - - if ((error = git_smart__negotiation_step(&t->parent, data.ptr, data.size)) < 0) - goto on_error; - - git_buf_clear(&data); - if (t->caps.multi_ack || t->caps.multi_ack_detailed) { - if ((error = store_common(t)) < 0) - goto on_error; - } else { - pkt_type = recv_pkt(NULL, buf); - - if (pkt_type == GIT_PKT_ACK) { - break; - } else if (pkt_type == GIT_PKT_NAK) { - continue; - } else if (pkt_type < 0) { - /* recv_pkt returned an error */ - error = pkt_type; - goto on_error; - } else { - giterr_set(GITERR_NET, "Unexpected pkt type"); - error = -1; - goto on_error; - } - } - } - - if (t->common.length > 0) - break; - - if (i % 20 == 0 && t->rpc) { - git_pkt_ack *pkt; - unsigned int i; - - if ((error = git_pkt_buffer_wants(wants, count, &t->caps, &data)) < 0) - goto on_error; - - git_vector_foreach(&t->common, i, pkt) { - if ((error = git_pkt_buffer_have(&pkt->oid, &data)) < 0) - goto on_error; - } - - if (git_buf_oom(&data)) { - error = -1; - goto on_error; - } - } - } - - /* Tell the other end that we're done negotiating */ - if (t->rpc && t->common.length > 0) { - git_pkt_ack *pkt; - unsigned int i; - - if ((error = git_pkt_buffer_wants(wants, count, &t->caps, &data)) < 0) - goto on_error; - - git_vector_foreach(&t->common, i, pkt) { - if ((error = git_pkt_buffer_have(&pkt->oid, &data)) < 0) - goto on_error; - } - - if (git_buf_oom(&data)) { - error = -1; - goto on_error; - } - } - - if ((error = git_pkt_buffer_done(&data)) < 0) - goto on_error; - - if (t->cancelled.val) { - giterr_set(GITERR_NET, "The fetch was cancelled by the user"); - error = GIT_EUSER; - goto on_error; - } - if ((error = git_smart__negotiation_step(&t->parent, data.ptr, data.size)) < 0) - goto on_error; - - git_buf_free(&data); - git_revwalk_free(walk); - - /* Now let's eat up whatever the server gives us */ - if (!t->caps.multi_ack && !t->caps.multi_ack_detailed) { - pkt_type = recv_pkt(NULL, buf); - - if (pkt_type < 0) { - return pkt_type; - } else if (pkt_type != GIT_PKT_ACK && pkt_type != GIT_PKT_NAK) { - giterr_set(GITERR_NET, "Unexpected pkt type"); - return -1; - } - } else { - error = wait_while_ack(buf); - } - - return error; - -on_error: - git_revwalk_free(walk); - git_buf_free(&data); - return error; -} - -static int no_sideband(transport_smart *t, struct git_odb_writepack *writepack, gitno_buffer *buf, git_transfer_progress *stats) -{ - int recvd; - - do { - if (t->cancelled.val) { - giterr_set(GITERR_NET, "The fetch was cancelled by the user"); - return GIT_EUSER; - } - - if (writepack->append(writepack, buf->data, buf->offset, stats) < 0) - return -1; - - gitno_consume_n(buf, buf->offset); - - if ((recvd = gitno_recv(buf)) < 0) - return recvd; - } while(recvd > 0); - - if (writepack->commit(writepack, stats) < 0) - return -1; - - return 0; -} - -struct network_packetsize_payload -{ - git_transfer_progress_cb callback; - void *payload; - git_transfer_progress *stats; - size_t last_fired_bytes; -}; - -static int network_packetsize(size_t received, void *payload) -{ - struct network_packetsize_payload *npp = (struct network_packetsize_payload*)payload; - - /* Accumulate bytes */ - npp->stats->received_bytes += received; - - /* Fire notification if the threshold is reached */ - if ((npp->stats->received_bytes - npp->last_fired_bytes) > NETWORK_XFER_THRESHOLD) { - npp->last_fired_bytes = npp->stats->received_bytes; - - if (npp->callback(npp->stats, npp->payload)) - return GIT_EUSER; - } - - return 0; -} - -int git_smart__download_pack( - git_transport *transport, - git_repository *repo, - git_transfer_progress *stats, - git_transfer_progress_cb transfer_progress_cb, - void *progress_payload) -{ - transport_smart *t = (transport_smart *)transport; - gitno_buffer *buf = &t->buffer; - git_odb *odb; - struct git_odb_writepack *writepack = NULL; - int error = 0; - struct network_packetsize_payload npp = {0}; - - memset(stats, 0, sizeof(git_transfer_progress)); - - if (transfer_progress_cb) { - npp.callback = transfer_progress_cb; - npp.payload = progress_payload; - npp.stats = stats; - t->packetsize_cb = &network_packetsize; - t->packetsize_payload = &npp; - - /* We might have something in the buffer already from negotiate_fetch */ - if (t->buffer.offset > 0 && !t->cancelled.val) - if (t->packetsize_cb(t->buffer.offset, t->packetsize_payload)) - git_atomic_set(&t->cancelled, 1); - } - - if ((error = git_repository_odb__weakptr(&odb, repo)) < 0 || - ((error = git_odb_write_pack(&writepack, odb, transfer_progress_cb, progress_payload)) != 0)) - goto done; - - /* - * If the remote doesn't support the side-band, we can feed - * the data directly to the pack writer. Otherwise, we need to - * check which one belongs there. - */ - if (!t->caps.side_band && !t->caps.side_band_64k) { - error = no_sideband(t, writepack, buf, stats); - goto done; - } - - do { - git_pkt *pkt = NULL; - - /* Check cancellation before network call */ - if (t->cancelled.val) { - giterr_clear(); - error = GIT_EUSER; - goto done; - } - - if ((error = recv_pkt(&pkt, buf)) >= 0) { - /* Check cancellation after network call */ - if (t->cancelled.val) { - giterr_clear(); - error = GIT_EUSER; - } else if (pkt->type == GIT_PKT_PROGRESS) { - if (t->progress_cb) { - git_pkt_progress *p = (git_pkt_progress *) pkt; - error = t->progress_cb(p->data, p->len, t->message_cb_payload); - } - } else if (pkt->type == GIT_PKT_DATA) { - git_pkt_data *p = (git_pkt_data *) pkt; - - if (p->len) - error = writepack->append(writepack, p->data, p->len, stats); - } else if (pkt->type == GIT_PKT_FLUSH) { - /* A flush indicates the end of the packfile */ - git__free(pkt); - break; - } - } - - git__free(pkt); - if (error < 0) - goto done; - - } while (1); - - /* - * Trailing execution of transfer_progress_cb, if necessary... - * Only the callback through the npp datastructure currently - * updates the last_fired_bytes value. It is possible that - * progress has already been reported with the correct - * "received_bytes" value, but until (if?) this is unified - * then we will report progress again to be sure that the - * correct last received_bytes value is reported. - */ - if (npp.callback && npp.stats->received_bytes > npp.last_fired_bytes) { - error = npp.callback(npp.stats, npp.payload); - if (error != 0) - goto done; - } - - error = writepack->commit(writepack, stats); - -done: - if (writepack) - writepack->free(writepack); - if (transfer_progress_cb) { - t->packetsize_cb = NULL; - t->packetsize_payload = NULL; - } - - return error; -} - -static int gen_pktline(git_buf *buf, git_push *push) -{ - push_spec *spec; - size_t i, len; - char old_id[GIT_OID_HEXSZ+1], new_id[GIT_OID_HEXSZ+1]; - - old_id[GIT_OID_HEXSZ] = '\0'; new_id[GIT_OID_HEXSZ] = '\0'; - - git_vector_foreach(&push->specs, i, spec) { - len = 2*GIT_OID_HEXSZ + 7 + strlen(spec->refspec.dst); - - if (i == 0) { - ++len; /* '\0' */ - if (push->report_status) - len += strlen(GIT_CAP_REPORT_STATUS) + 1; - len += strlen(GIT_CAP_SIDE_BAND_64K) + 1; - } - - git_oid_fmt(old_id, &spec->roid); - git_oid_fmt(new_id, &spec->loid); - - git_buf_printf(buf, "%04"PRIxZ"%s %s %s", len, old_id, new_id, spec->refspec.dst); - - if (i == 0) { - git_buf_putc(buf, '\0'); - /* Core git always starts their capabilities string with a space */ - if (push->report_status) { - git_buf_putc(buf, ' '); - git_buf_printf(buf, GIT_CAP_REPORT_STATUS); - } - git_buf_putc(buf, ' '); - git_buf_printf(buf, GIT_CAP_SIDE_BAND_64K); - } - - git_buf_putc(buf, '\n'); - } - - git_buf_puts(buf, "0000"); - return git_buf_oom(buf) ? -1 : 0; -} - -static int add_push_report_pkt(git_push *push, git_pkt *pkt) -{ - push_status *status; - - switch (pkt->type) { - case GIT_PKT_OK: - status = git__calloc(1, sizeof(push_status)); - GITERR_CHECK_ALLOC(status); - status->msg = NULL; - status->ref = git__strdup(((git_pkt_ok *)pkt)->ref); - if (!status->ref || - git_vector_insert(&push->status, status) < 0) { - git_push_status_free(status); - return -1; - } - break; - case GIT_PKT_NG: - status = git__calloc(1, sizeof(push_status)); - GITERR_CHECK_ALLOC(status); - status->ref = git__strdup(((git_pkt_ng *)pkt)->ref); - status->msg = git__strdup(((git_pkt_ng *)pkt)->msg); - if (!status->ref || !status->msg || - git_vector_insert(&push->status, status) < 0) { - git_push_status_free(status); - return -1; - } - break; - case GIT_PKT_UNPACK: - push->unpack_ok = ((git_pkt_unpack *)pkt)->unpack_ok; - break; - case GIT_PKT_FLUSH: - return GIT_ITEROVER; - default: - giterr_set(GITERR_NET, "report-status: protocol error"); - return -1; - } - - return 0; -} - -static int add_push_report_sideband_pkt(git_push *push, git_pkt_data *data_pkt, git_buf *data_pkt_buf) -{ - git_pkt *pkt; - const char *line, *line_end; - size_t line_len; - int error; - int reading_from_buf = data_pkt_buf->size > 0; - - if (reading_from_buf) { - /* We had an existing partial packet, so add the new - * packet to the buffer and parse the whole thing */ - git_buf_put(data_pkt_buf, data_pkt->data, data_pkt->len); - line = data_pkt_buf->ptr; - line_len = data_pkt_buf->size; - } - else { - line = data_pkt->data; - line_len = data_pkt->len; - } - - while (line_len > 0) { - error = git_pkt_parse_line(&pkt, line, &line_end, line_len); - - if (error == GIT_EBUFS) { - /* Buffer the data when the inner packet is split - * across multiple sideband packets */ - if (!reading_from_buf) - git_buf_put(data_pkt_buf, line, line_len); - error = 0; - goto done; - } - else if (error < 0) - goto done; - - /* Advance in the buffer */ - line_len -= (line_end - line); - line = line_end; - - error = add_push_report_pkt(push, pkt); - - git_pkt_free(pkt); - - if (error < 0 && error != GIT_ITEROVER) - goto done; - } - - error = 0; - -done: - if (reading_from_buf) - git_buf_consume(data_pkt_buf, line_end); - return error; -} - -static int parse_report(transport_smart *transport, git_push *push) -{ - git_pkt *pkt = NULL; - const char *line_end = NULL; - gitno_buffer *buf = &transport->buffer; - int error, recvd; - git_buf data_pkt_buf = GIT_BUF_INIT; - - for (;;) { - if (buf->offset > 0) - error = git_pkt_parse_line(&pkt, buf->data, - &line_end, buf->offset); - else - error = GIT_EBUFS; - - if (error < 0 && error != GIT_EBUFS) { - error = -1; - goto done; - } - - if (error == GIT_EBUFS) { - if ((recvd = gitno_recv(buf)) < 0) { - error = recvd; - goto done; - } - - if (recvd == 0) { - giterr_set(GITERR_NET, "early EOF"); - error = GIT_EEOF; - goto done; - } - continue; - } - - gitno_consume(buf, line_end); - - error = 0; - - switch (pkt->type) { - case GIT_PKT_DATA: - /* This is a sideband packet which contains other packets */ - error = add_push_report_sideband_pkt(push, (git_pkt_data *)pkt, &data_pkt_buf); - break; - case GIT_PKT_ERR: - giterr_set(GITERR_NET, "report-status: Error reported: %s", - ((git_pkt_err *)pkt)->error); - error = -1; - break; - case GIT_PKT_PROGRESS: - if (transport->progress_cb) { - git_pkt_progress *p = (git_pkt_progress *) pkt; - error = transport->progress_cb(p->data, p->len, transport->message_cb_payload); - } - break; - default: - error = add_push_report_pkt(push, pkt); - break; - } - - git_pkt_free(pkt); - - /* add_push_report_pkt returns GIT_ITEROVER when it receives a flush */ - if (error == GIT_ITEROVER) { - error = 0; - if (data_pkt_buf.size > 0) { - /* If there was data remaining in the pack data buffer, - * then the server sent a partial pkt-line */ - giterr_set(GITERR_NET, "Incomplete pack data pkt-line"); - error = GIT_ERROR; - } - goto done; - } - - if (error < 0) { - goto done; - } - } -done: - git_buf_free(&data_pkt_buf); - return error; -} - -static int add_ref_from_push_spec(git_vector *refs, push_spec *push_spec) -{ - git_pkt_ref *added = git__calloc(1, sizeof(git_pkt_ref)); - GITERR_CHECK_ALLOC(added); - - added->type = GIT_PKT_REF; - git_oid_cpy(&added->head.oid, &push_spec->loid); - added->head.name = git__strdup(push_spec->refspec.dst); - - if (!added->head.name || - git_vector_insert(refs, added) < 0) { - git_pkt_free((git_pkt *)added); - return -1; - } - - return 0; -} - -static int update_refs_from_report( - git_vector *refs, - git_vector *push_specs, - git_vector *push_report) -{ - git_pkt_ref *ref; - push_spec *push_spec; - push_status *push_status; - size_t i, j, refs_len; - int cmp; - - /* For each push spec we sent to the server, we should have - * gotten back a status packet in the push report */ - if (push_specs->length != push_report->length) { - giterr_set(GITERR_NET, "report-status: protocol error"); - return -1; - } - - /* We require that push_specs be sorted with push_spec_rref_cmp, - * and that push_report be sorted with push_status_ref_cmp */ - git_vector_sort(push_specs); - git_vector_sort(push_report); - - git_vector_foreach(push_specs, i, push_spec) { - push_status = git_vector_get(push_report, i); - - /* For each push spec we sent to the server, we should have - * gotten back a status packet in the push report which matches */ - if (strcmp(push_spec->refspec.dst, push_status->ref)) { - giterr_set(GITERR_NET, "report-status: protocol error"); - return -1; - } - } - - /* We require that refs be sorted with ref_name_cmp */ - git_vector_sort(refs); - i = j = 0; - refs_len = refs->length; - - /* Merge join push_specs with refs */ - while (i < push_specs->length && j < refs_len) { - push_spec = git_vector_get(push_specs, i); - push_status = git_vector_get(push_report, i); - ref = git_vector_get(refs, j); - - cmp = strcmp(push_spec->refspec.dst, ref->head.name); - - /* Iterate appropriately */ - if (cmp <= 0) i++; - if (cmp >= 0) j++; - - /* Add case */ - if (cmp < 0 && - !push_status->msg && - add_ref_from_push_spec(refs, push_spec) < 0) - return -1; - - /* Update case, delete case */ - if (cmp == 0 && - !push_status->msg) - git_oid_cpy(&ref->head.oid, &push_spec->loid); - } - - for (; i < push_specs->length; i++) { - push_spec = git_vector_get(push_specs, i); - push_status = git_vector_get(push_report, i); - - /* Add case */ - if (!push_status->msg && - add_ref_from_push_spec(refs, push_spec) < 0) - return -1; - } - - /* Remove any refs which we updated to have a zero OID. */ - git_vector_rforeach(refs, i, ref) { - if (git_oid_iszero(&ref->head.oid)) { - git_vector_remove(refs, i); - git_pkt_free((git_pkt *)ref); - } - } - - git_vector_sort(refs); - - return 0; -} - -struct push_packbuilder_payload -{ - git_smart_subtransport_stream *stream; - git_packbuilder *pb; - git_push_transfer_progress cb; - void *cb_payload; - size_t last_bytes; - double last_progress_report_time; -}; - -static int stream_thunk(void *buf, size_t size, void *data) -{ - int error = 0; - struct push_packbuilder_payload *payload = data; - - if ((error = payload->stream->write(payload->stream, (const char *)buf, size)) < 0) - return error; - - if (payload->cb) { - double current_time = git__timer(); - payload->last_bytes += size; - - if ((current_time - payload->last_progress_report_time) >= MIN_PROGRESS_UPDATE_INTERVAL) { - payload->last_progress_report_time = current_time; - error = payload->cb(payload->pb->nr_written, payload->pb->nr_objects, payload->last_bytes, payload->cb_payload); - } - } - - return error; -} - -int git_smart__push(git_transport *transport, git_push *push, const git_remote_callbacks *cbs) -{ - transport_smart *t = (transport_smart *)transport; - struct push_packbuilder_payload packbuilder_payload = {0}; - git_buf pktline = GIT_BUF_INIT; - int error = 0, need_pack = 0; - push_spec *spec; - unsigned int i; - - packbuilder_payload.pb = push->pb; - - if (cbs && cbs->push_transfer_progress) { - packbuilder_payload.cb = cbs->push_transfer_progress; - packbuilder_payload.cb_payload = cbs->payload; - } - -#ifdef PUSH_DEBUG -{ - git_remote_head *head; - char hex[GIT_OID_HEXSZ+1]; hex[GIT_OID_HEXSZ] = '\0'; - - git_vector_foreach(&push->remote->refs, i, head) { - git_oid_fmt(hex, &head->oid); - fprintf(stderr, "%s (%s)\n", hex, head->name); - } - - git_vector_foreach(&push->specs, i, spec) { - git_oid_fmt(hex, &spec->roid); - fprintf(stderr, "%s (%s) -> ", hex, spec->lref); - git_oid_fmt(hex, &spec->loid); - fprintf(stderr, "%s (%s)\n", hex, spec->rref ? - spec->rref : spec->lref); - } -} -#endif - - /* - * Figure out if we need to send a packfile; which is in all - * cases except when we only send delete commands - */ - git_vector_foreach(&push->specs, i, spec) { - if (spec->refspec.src && spec->refspec.src[0] != '\0') { - need_pack = 1; - break; - } - } - - if ((error = git_smart__get_push_stream(t, &packbuilder_payload.stream)) < 0 || - (error = gen_pktline(&pktline, push)) < 0 || - (error = packbuilder_payload.stream->write(packbuilder_payload.stream, git_buf_cstr(&pktline), git_buf_len(&pktline))) < 0) - goto done; - - if (need_pack && - (error = git_packbuilder_foreach(push->pb, &stream_thunk, &packbuilder_payload)) < 0) - goto done; - - /* If we sent nothing or the server doesn't support report-status, then - * we consider the pack to have been unpacked successfully */ - if (!push->specs.length || !push->report_status) - push->unpack_ok = 1; - else if ((error = parse_report(t, push)) < 0) - goto done; - - /* If progress is being reported write the final report */ - if (cbs && cbs->push_transfer_progress) { - error = cbs->push_transfer_progress( - push->pb->nr_written, - push->pb->nr_objects, - packbuilder_payload.last_bytes, - cbs->payload); - - if (error < 0) - goto done; - } - - if (push->status.length) { - error = update_refs_from_report(&t->refs, &push->specs, &push->status); - if (error < 0) - goto done; - - error = git_smart__update_heads(t, NULL); - } - -done: - git_buf_free(&pktline); - return error; -} diff --git a/vendor/libgit2/src/transports/ssh.c b/vendor/libgit2/src/transports/ssh.c deleted file mode 100644 index cfd573665..000000000 --- a/vendor/libgit2/src/transports/ssh.c +++ /dev/null @@ -1,909 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#ifdef GIT_SSH -#include -#endif - -#include "git2.h" -#include "buffer.h" -#include "netops.h" -#include "smart.h" -#include "cred.h" -#include "socket_stream.h" -#include "ssh.h" - -#ifdef GIT_SSH - -#define OWNING_SUBTRANSPORT(s) ((ssh_subtransport *)(s)->parent.subtransport) - -static const char *ssh_prefixes[] = { "ssh://", "ssh+git://", "git+ssh://" }; - -static const char cmd_uploadpack[] = "git-upload-pack"; -static const char cmd_receivepack[] = "git-receive-pack"; - -typedef struct { - git_smart_subtransport_stream parent; - git_stream *io; - LIBSSH2_SESSION *session; - LIBSSH2_CHANNEL *channel; - const char *cmd; - char *url; - unsigned sent_command : 1; -} ssh_stream; - -typedef struct { - git_smart_subtransport parent; - transport_smart *owner; - ssh_stream *current_stream; - git_cred *cred; - char *cmd_uploadpack; - char *cmd_receivepack; -} ssh_subtransport; - -static int list_auth_methods(int *out, LIBSSH2_SESSION *session, const char *username); - -static void ssh_error(LIBSSH2_SESSION *session, const char *errmsg) -{ - char *ssherr; - libssh2_session_last_error(session, &ssherr, NULL, 0); - - giterr_set(GITERR_SSH, "%s: %s", errmsg, ssherr); -} - -/* - * Create a git protocol request. - * - * For example: git-upload-pack '/libgit2/libgit2' - */ -static int gen_proto(git_buf *request, const char *cmd, const char *url) -{ - char *repo; - int len; - size_t i; - - for (i = 0; i < ARRAY_SIZE(ssh_prefixes); ++i) { - const char *p = ssh_prefixes[i]; - - if (!git__prefixcmp(url, p)) { - url = url + strlen(p); - repo = strchr(url, '/'); - if (repo && repo[1] == '~') - ++repo; - - goto done; - } - } - repo = strchr(url, ':'); - if (repo) repo++; - -done: - if (!repo) { - giterr_set(GITERR_NET, "Malformed git protocol URL"); - return -1; - } - - len = strlen(cmd) + 1 /* Space */ + 1 /* Quote */ + strlen(repo) + 1 /* Quote */ + 1; - - git_buf_grow(request, len); - git_buf_printf(request, "%s '%s'", cmd, repo); - git_buf_putc(request, '\0'); - - if (git_buf_oom(request)) - return -1; - - return 0; -} - -static int send_command(ssh_stream *s) -{ - int error; - git_buf request = GIT_BUF_INIT; - - error = gen_proto(&request, s->cmd, s->url); - if (error < 0) - goto cleanup; - - error = libssh2_channel_exec(s->channel, request.ptr); - if (error < LIBSSH2_ERROR_NONE) { - ssh_error(s->session, "SSH could not execute request"); - goto cleanup; - } - - s->sent_command = 1; - -cleanup: - git_buf_free(&request); - return error; -} - -static int ssh_stream_read( - git_smart_subtransport_stream *stream, - char *buffer, - size_t buf_size, - size_t *bytes_read) -{ - int rc; - ssh_stream *s = (ssh_stream *)stream; - - *bytes_read = 0; - - if (!s->sent_command && send_command(s) < 0) - return -1; - - if ((rc = libssh2_channel_read(s->channel, buffer, buf_size)) < LIBSSH2_ERROR_NONE) { - ssh_error(s->session, "SSH could not read data"); - return -1; - } - - /* - * If we can't get anything out of stdout, it's typically a - * not-found error, so read from stderr and signal EOF on - * stderr. - */ - if (rc == 0) { - if ((rc = libssh2_channel_read_stderr(s->channel, buffer, buf_size)) > 0) { - giterr_set(GITERR_SSH, "%*s", rc, buffer); - return GIT_EEOF; - } else if (rc < LIBSSH2_ERROR_NONE) { - ssh_error(s->session, "SSH could not read stderr"); - return -1; - } - } - - - *bytes_read = rc; - - return 0; -} - -static int ssh_stream_write( - git_smart_subtransport_stream *stream, - const char *buffer, - size_t len) -{ - ssh_stream *s = (ssh_stream *)stream; - size_t off = 0; - ssize_t ret = 0; - - if (!s->sent_command && send_command(s) < 0) - return -1; - - do { - ret = libssh2_channel_write(s->channel, buffer + off, len - off); - if (ret < 0) - break; - - off += ret; - - } while (off < len); - - if (ret < 0) { - ssh_error(s->session, "SSH could not write data"); - return -1; - } - - return 0; -} - -static void ssh_stream_free(git_smart_subtransport_stream *stream) -{ - ssh_stream *s = (ssh_stream *)stream; - ssh_subtransport *t; - - if (!stream) - return; - - t = OWNING_SUBTRANSPORT(s); - t->current_stream = NULL; - - if (s->channel) { - libssh2_channel_close(s->channel); - libssh2_channel_free(s->channel); - s->channel = NULL; - } - - if (s->session) { - libssh2_session_free(s->session); - s->session = NULL; - } - - if (s->io) { - git_stream_close(s->io); - git_stream_free(s->io); - s->io = NULL; - } - - git__free(s->url); - git__free(s); -} - -static int ssh_stream_alloc( - ssh_subtransport *t, - const char *url, - const char *cmd, - git_smart_subtransport_stream **stream) -{ - ssh_stream *s; - - assert(stream); - - s = git__calloc(sizeof(ssh_stream), 1); - GITERR_CHECK_ALLOC(s); - - s->parent.subtransport = &t->parent; - s->parent.read = ssh_stream_read; - s->parent.write = ssh_stream_write; - s->parent.free = ssh_stream_free; - - s->cmd = cmd; - - s->url = git__strdup(url); - if (!s->url) { - git__free(s); - return -1; - } - - *stream = &s->parent; - return 0; -} - -static int git_ssh_extract_url_parts( - char **host, - char **username, - const char *url) -{ - char *colon, *at; - const char *start; - - colon = strchr(url, ':'); - - - at = strchr(url, '@'); - if (at) { - start = at + 1; - *username = git__substrdup(url, at - url); - GITERR_CHECK_ALLOC(*username); - } else { - start = url; - *username = NULL; - } - - if (colon == NULL || (colon < start)) { - giterr_set(GITERR_NET, "Malformed URL"); - return -1; - } - - *host = git__substrdup(start, colon - start); - GITERR_CHECK_ALLOC(*host); - - return 0; -} - -static int ssh_agent_auth(LIBSSH2_SESSION *session, git_cred_ssh_key *c) { - int rc = LIBSSH2_ERROR_NONE; - - struct libssh2_agent_publickey *curr, *prev = NULL; - - LIBSSH2_AGENT *agent = libssh2_agent_init(session); - - if (agent == NULL) - return -1; - - rc = libssh2_agent_connect(agent); - - if (rc != LIBSSH2_ERROR_NONE) - goto shutdown; - - rc = libssh2_agent_list_identities(agent); - - if (rc != LIBSSH2_ERROR_NONE) - goto shutdown; - - while (1) { - rc = libssh2_agent_get_identity(agent, &curr, prev); - - if (rc < 0) - goto shutdown; - - /* rc is set to 1 whenever the ssh agent ran out of keys to check. - * Set the error code to authentication failure rather than erroring - * out with an untranslatable error code. - */ - if (rc == 1) { - rc = LIBSSH2_ERROR_AUTHENTICATION_FAILED; - goto shutdown; - } - - rc = libssh2_agent_userauth(agent, c->username, curr); - - if (rc == 0) - break; - - prev = curr; - } - -shutdown: - - if (rc != LIBSSH2_ERROR_NONE) - ssh_error(session, "error authenticating"); - - libssh2_agent_disconnect(agent); - libssh2_agent_free(agent); - - return rc; -} - -static int _git_ssh_authenticate_session( - LIBSSH2_SESSION* session, - git_cred* cred) -{ - int rc; - - do { - giterr_clear(); - switch (cred->credtype) { - case GIT_CREDTYPE_USERPASS_PLAINTEXT: { - git_cred_userpass_plaintext *c = (git_cred_userpass_plaintext *)cred; - rc = libssh2_userauth_password(session, c->username, c->password); - break; - } - case GIT_CREDTYPE_SSH_KEY: { - git_cred_ssh_key *c = (git_cred_ssh_key *)cred; - - if (c->privatekey) - rc = libssh2_userauth_publickey_fromfile( - session, c->username, c->publickey, - c->privatekey, c->passphrase); - else - rc = ssh_agent_auth(session, c); - - break; - } - case GIT_CREDTYPE_SSH_CUSTOM: { - git_cred_ssh_custom *c = (git_cred_ssh_custom *)cred; - - rc = libssh2_userauth_publickey( - session, c->username, (const unsigned char *)c->publickey, - c->publickey_len, c->sign_callback, &c->payload); - break; - } - case GIT_CREDTYPE_SSH_INTERACTIVE: { - void **abstract = libssh2_session_abstract(session); - git_cred_ssh_interactive *c = (git_cred_ssh_interactive *)cred; - - /* ideally, we should be able to set this by calling - * libssh2_session_init_ex() instead of libssh2_session_init(). - * libssh2's API is inconsistent here i.e. libssh2_userauth_publickey() - * allows you to pass the `abstract` as part of the call, whereas - * libssh2_userauth_keyboard_interactive() does not! - * - * The only way to set the `abstract` pointer is by calling - * libssh2_session_abstract(), which will replace the existing - * pointer as is done below. This is safe for now (at time of writing), - * but may not be valid in future. - */ - *abstract = c->payload; - - rc = libssh2_userauth_keyboard_interactive( - session, c->username, c->prompt_callback); - break; - } -#ifdef GIT_SSH_MEMORY_CREDENTIALS - case GIT_CREDTYPE_SSH_MEMORY: { - git_cred_ssh_key *c = (git_cred_ssh_key *)cred; - - assert(c->username); - assert(c->privatekey); - - rc = libssh2_userauth_publickey_frommemory( - session, - c->username, - strlen(c->username), - c->publickey, - c->publickey ? strlen(c->publickey) : 0, - c->privatekey, - strlen(c->privatekey), - c->passphrase); - break; - } -#endif - default: - rc = LIBSSH2_ERROR_AUTHENTICATION_FAILED; - } - } while (LIBSSH2_ERROR_EAGAIN == rc || LIBSSH2_ERROR_TIMEOUT == rc); - - if (rc == LIBSSH2_ERROR_PASSWORD_EXPIRED || rc == LIBSSH2_ERROR_AUTHENTICATION_FAILED) - return GIT_EAUTH; - - if (rc != LIBSSH2_ERROR_NONE) { - if (!giterr_last()) - ssh_error(session, "Failed to authenticate SSH session"); - return -1; - } - - return 0; -} - -static int request_creds(git_cred **out, ssh_subtransport *t, const char *user, int auth_methods) -{ - int error, no_callback = 0; - git_cred *cred = NULL; - - if (!t->owner->cred_acquire_cb) { - no_callback = 1; - } else { - error = t->owner->cred_acquire_cb(&cred, t->owner->url, user, auth_methods, - t->owner->cred_acquire_payload); - - if (error == GIT_PASSTHROUGH) - no_callback = 1; - else if (error < 0) - return error; - else if (!cred) { - giterr_set(GITERR_SSH, "Callback failed to initialize SSH credentials"); - return -1; - } - } - - if (no_callback) { - giterr_set(GITERR_SSH, "authentication required but no callback set"); - return -1; - } - - if (!(cred->credtype & auth_methods)) { - cred->free(cred); - giterr_set(GITERR_SSH, "callback returned unsupported credentials type"); - return -1; - } - - *out = cred; - - return 0; -} - -static int _git_ssh_session_create( - LIBSSH2_SESSION** session, - git_stream *io) -{ - int rc = 0; - LIBSSH2_SESSION* s; - git_socket_stream *socket = (git_socket_stream *) io; - - assert(session); - - s = libssh2_session_init(); - if (!s) { - giterr_set(GITERR_NET, "Failed to initialize SSH session"); - return -1; - } - - do { - rc = libssh2_session_startup(s, socket->s); - } while (LIBSSH2_ERROR_EAGAIN == rc || LIBSSH2_ERROR_TIMEOUT == rc); - - if (rc != LIBSSH2_ERROR_NONE) { - ssh_error(s, "Failed to start SSH session"); - libssh2_session_free(s); - return -1; - } - - libssh2_session_set_blocking(s, 1); - - *session = s; - - return 0; -} - -static int _git_ssh_setup_conn( - ssh_subtransport *t, - const char *url, - const char *cmd, - git_smart_subtransport_stream **stream) -{ - char *host=NULL, *port=NULL, *path=NULL, *user=NULL, *pass=NULL; - const char *default_port="22"; - int auth_methods, error = 0; - size_t i; - ssh_stream *s; - git_cred *cred = NULL; - LIBSSH2_SESSION* session=NULL; - LIBSSH2_CHANNEL* channel=NULL; - - t->current_stream = NULL; - - *stream = NULL; - if (ssh_stream_alloc(t, url, cmd, stream) < 0) - return -1; - - s = (ssh_stream *)*stream; - s->session = NULL; - s->channel = NULL; - - for (i = 0; i < ARRAY_SIZE(ssh_prefixes); ++i) { - const char *p = ssh_prefixes[i]; - - if (!git__prefixcmp(url, p)) { - if ((error = gitno_extract_url_parts(&host, &port, &path, &user, &pass, url, default_port)) < 0) - goto done; - - goto post_extract; - } - } - if ((error = git_ssh_extract_url_parts(&host, &user, url)) < 0) - goto done; - port = git__strdup(default_port); - GITERR_CHECK_ALLOC(port); - -post_extract: - if ((error = git_socket_stream_new(&s->io, host, port)) < 0 || - (error = git_stream_connect(s->io)) < 0) - goto done; - - if ((error = _git_ssh_session_create(&session, s->io)) < 0) - goto done; - - if (t->owner->certificate_check_cb != NULL) { - git_cert_hostkey cert = {{ 0 }}, *cert_ptr; - const char *key; - - cert.parent.cert_type = GIT_CERT_HOSTKEY_LIBSSH2; - - key = libssh2_hostkey_hash(session, LIBSSH2_HOSTKEY_HASH_SHA1); - if (key != NULL) { - cert.type |= GIT_CERT_SSH_SHA1; - memcpy(&cert.hash_sha1, key, 20); - } - - key = libssh2_hostkey_hash(session, LIBSSH2_HOSTKEY_HASH_MD5); - if (key != NULL) { - cert.type |= GIT_CERT_SSH_MD5; - memcpy(&cert.hash_md5, key, 16); - } - - if (cert.type == 0) { - giterr_set(GITERR_SSH, "unable to get the host key"); - error = -1; - goto done; - } - - /* We don't currently trust any hostkeys */ - giterr_clear(); - - cert_ptr = &cert; - - error = t->owner->certificate_check_cb((git_cert *) cert_ptr, 0, host, t->owner->message_cb_payload); - if (error < 0) { - if (!giterr_last()) - giterr_set(GITERR_NET, "user cancelled hostkey check"); - - goto done; - } - } - - /* we need the username to ask for auth methods */ - if (!user) { - if ((error = request_creds(&cred, t, NULL, GIT_CREDTYPE_USERNAME)) < 0) - goto done; - - user = git__strdup(((git_cred_username *) cred)->username); - cred->free(cred); - cred = NULL; - if (!user) - goto done; - } else if (user && pass) { - if ((error = git_cred_userpass_plaintext_new(&cred, user, pass)) < 0) - goto done; - } - - if ((error = list_auth_methods(&auth_methods, session, user)) < 0) - goto done; - - error = GIT_EAUTH; - /* if we already have something to try */ - if (cred && auth_methods & cred->credtype) - error = _git_ssh_authenticate_session(session, cred); - - while (error == GIT_EAUTH) { - if (cred) { - cred->free(cred); - cred = NULL; - } - - if ((error = request_creds(&cred, t, user, auth_methods)) < 0) - goto done; - - if (strcmp(user, git_cred__username(cred))) { - giterr_set(GITERR_SSH, "username does not match previous request"); - error = -1; - goto done; - } - - error = _git_ssh_authenticate_session(session, cred); - } - - if (error < 0) - goto done; - - channel = libssh2_channel_open_session(session); - if (!channel) { - error = -1; - ssh_error(session, "Failed to open SSH channel"); - goto done; - } - - libssh2_channel_set_blocking(channel, 1); - - s->session = session; - s->channel = channel; - - t->current_stream = s; - -done: - if (error < 0) { - ssh_stream_free(*stream); - - if (session) - libssh2_session_free(session); - } - - if (cred) - cred->free(cred); - - git__free(host); - git__free(port); - git__free(path); - git__free(user); - git__free(pass); - - return error; -} - -static int ssh_uploadpack_ls( - ssh_subtransport *t, - const char *url, - git_smart_subtransport_stream **stream) -{ - const char *cmd = t->cmd_uploadpack ? t->cmd_uploadpack : cmd_uploadpack; - - return _git_ssh_setup_conn(t, url, cmd, stream); -} - -static int ssh_uploadpack( - ssh_subtransport *t, - const char *url, - git_smart_subtransport_stream **stream) -{ - GIT_UNUSED(url); - - if (t->current_stream) { - *stream = &t->current_stream->parent; - return 0; - } - - giterr_set(GITERR_NET, "Must call UPLOADPACK_LS before UPLOADPACK"); - return -1; -} - -static int ssh_receivepack_ls( - ssh_subtransport *t, - const char *url, - git_smart_subtransport_stream **stream) -{ - const char *cmd = t->cmd_receivepack ? t->cmd_receivepack : cmd_receivepack; - - - return _git_ssh_setup_conn(t, url, cmd, stream); -} - -static int ssh_receivepack( - ssh_subtransport *t, - const char *url, - git_smart_subtransport_stream **stream) -{ - GIT_UNUSED(url); - - if (t->current_stream) { - *stream = &t->current_stream->parent; - return 0; - } - - giterr_set(GITERR_NET, "Must call RECEIVEPACK_LS before RECEIVEPACK"); - return -1; -} - -static int _ssh_action( - git_smart_subtransport_stream **stream, - git_smart_subtransport *subtransport, - const char *url, - git_smart_service_t action) -{ - ssh_subtransport *t = (ssh_subtransport *) subtransport; - - switch (action) { - case GIT_SERVICE_UPLOADPACK_LS: - return ssh_uploadpack_ls(t, url, stream); - - case GIT_SERVICE_UPLOADPACK: - return ssh_uploadpack(t, url, stream); - - case GIT_SERVICE_RECEIVEPACK_LS: - return ssh_receivepack_ls(t, url, stream); - - case GIT_SERVICE_RECEIVEPACK: - return ssh_receivepack(t, url, stream); - } - - *stream = NULL; - return -1; -} - -static int _ssh_close(git_smart_subtransport *subtransport) -{ - ssh_subtransport *t = (ssh_subtransport *) subtransport; - - assert(!t->current_stream); - - GIT_UNUSED(t); - - return 0; -} - -static void _ssh_free(git_smart_subtransport *subtransport) -{ - ssh_subtransport *t = (ssh_subtransport *) subtransport; - - assert(!t->current_stream); - - git__free(t->cmd_uploadpack); - git__free(t->cmd_receivepack); - git__free(t); -} - -#define SSH_AUTH_PUBLICKEY "publickey" -#define SSH_AUTH_PASSWORD "password" -#define SSH_AUTH_KEYBOARD_INTERACTIVE "keyboard-interactive" - -static int list_auth_methods(int *out, LIBSSH2_SESSION *session, const char *username) -{ - const char *list, *ptr; - - *out = 0; - - list = libssh2_userauth_list(session, username, strlen(username)); - - /* either error, or the remote accepts NONE auth, which is bizarre, let's punt */ - if (list == NULL && !libssh2_userauth_authenticated(session)) { - ssh_error(session, "Failed to retrieve list of SSH authentication methods"); - return -1; - } - - ptr = list; - while (ptr) { - if (*ptr == ',') - ptr++; - - if (!git__prefixcmp(ptr, SSH_AUTH_PUBLICKEY)) { - *out |= GIT_CREDTYPE_SSH_KEY; - *out |= GIT_CREDTYPE_SSH_CUSTOM; -#ifdef GIT_SSH_MEMORY_CREDENTIALS - *out |= GIT_CREDTYPE_SSH_MEMORY; -#endif - ptr += strlen(SSH_AUTH_PUBLICKEY); - continue; - } - - if (!git__prefixcmp(ptr, SSH_AUTH_PASSWORD)) { - *out |= GIT_CREDTYPE_USERPASS_PLAINTEXT; - ptr += strlen(SSH_AUTH_PASSWORD); - continue; - } - - if (!git__prefixcmp(ptr, SSH_AUTH_KEYBOARD_INTERACTIVE)) { - *out |= GIT_CREDTYPE_SSH_INTERACTIVE; - ptr += strlen(SSH_AUTH_KEYBOARD_INTERACTIVE); - continue; - } - - /* Skipt it if we don't know it */ - ptr = strchr(ptr, ','); - } - - return 0; -} -#endif - -int git_smart_subtransport_ssh( - git_smart_subtransport **out, git_transport *owner, void *param) -{ -#ifdef GIT_SSH - ssh_subtransport *t; - - assert(out); - - GIT_UNUSED(param); - - t = git__calloc(sizeof(ssh_subtransport), 1); - GITERR_CHECK_ALLOC(t); - - t->owner = (transport_smart *)owner; - t->parent.action = _ssh_action; - t->parent.close = _ssh_close; - t->parent.free = _ssh_free; - - *out = (git_smart_subtransport *) t; - return 0; -#else - GIT_UNUSED(owner); - GIT_UNUSED(param); - - assert(out); - *out = NULL; - - giterr_set(GITERR_INVALID, "Cannot create SSH transport. Library was built without SSH support"); - return -1; -#endif -} - -int git_transport_ssh_with_paths(git_transport **out, git_remote *owner, void *payload) -{ -#ifdef GIT_SSH - git_strarray *paths = (git_strarray *) payload; - git_transport *transport; - transport_smart *smart; - ssh_subtransport *t; - int error; - git_smart_subtransport_definition ssh_definition = { - git_smart_subtransport_ssh, - 0, /* no RPC */ - NULL, - }; - - if (paths->count != 2) { - giterr_set(GITERR_SSH, "invalid ssh paths, must be two strings"); - return GIT_EINVALIDSPEC; - } - - if ((error = git_transport_smart(&transport, owner, &ssh_definition)) < 0) - return error; - - smart = (transport_smart *) transport; - t = (ssh_subtransport *) smart->wrapped; - - t->cmd_uploadpack = git__strdup(paths->strings[0]); - GITERR_CHECK_ALLOC(t->cmd_uploadpack); - t->cmd_receivepack = git__strdup(paths->strings[1]); - GITERR_CHECK_ALLOC(t->cmd_receivepack); - - *out = transport; - return 0; -#else - GIT_UNUSED(owner); - GIT_UNUSED(payload); - - assert(out); - *out = NULL; - - giterr_set(GITERR_INVALID, "Cannot create SSH transport. Library was built without SSH support"); - return -1; -#endif -} - -int git_transport_ssh_global_init(void) -{ -#ifdef GIT_SSH - - libssh2_init(0); - return 0; - -#else - - /* Nothing to initialize */ - return 0; - -#endif -} diff --git a/vendor/libgit2/src/transports/ssh.h b/vendor/libgit2/src/transports/ssh.h deleted file mode 100644 index 2db2cc5df..000000000 --- a/vendor/libgit2/src/transports/ssh.h +++ /dev/null @@ -1,12 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_ssh_h__ -#define INCLUDE_ssh_h__ - -int git_transport_ssh_global_init(void); - -#endif diff --git a/vendor/libgit2/src/transports/winhttp.c b/vendor/libgit2/src/transports/winhttp.c deleted file mode 100644 index 32b838084..000000000 --- a/vendor/libgit2/src/transports/winhttp.c +++ /dev/null @@ -1,1409 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#ifdef GIT_WINHTTP - -#include "git2.h" -#include "git2/transport.h" -#include "buffer.h" -#include "posix.h" -#include "netops.h" -#include "smart.h" -#include "remote.h" -#include "repository.h" -#include "global.h" - -#include -#include - -/* For IInternetSecurityManager zone check */ -#include -#include - -#define WIDEN2(s) L ## s -#define WIDEN(s) WIDEN2(s) - -#define MAX_CONTENT_TYPE_LEN 100 -#define WINHTTP_OPTION_PEERDIST_EXTENSION_STATE 109 -#define CACHED_POST_BODY_BUF_SIZE 4096 -#define UUID_LENGTH_CCH 32 -#define TIMEOUT_INFINITE -1 -#define DEFAULT_CONNECT_TIMEOUT 60000 -#ifndef WINHTTP_IGNORE_REQUEST_TOTAL_LENGTH -#define WINHTTP_IGNORE_REQUEST_TOTAL_LENGTH 0 -#endif - -static const char *prefix_https = "https://"; -static const char *upload_pack_service = "upload-pack"; -static const char *upload_pack_ls_service_url = "/info/refs?service=git-upload-pack"; -static const char *upload_pack_service_url = "/git-upload-pack"; -static const char *receive_pack_service = "receive-pack"; -static const char *receive_pack_ls_service_url = "/info/refs?service=git-receive-pack"; -static const char *receive_pack_service_url = "/git-receive-pack"; -static const wchar_t *get_verb = L"GET"; -static const wchar_t *post_verb = L"POST"; -static const wchar_t *pragma_nocache = L"Pragma: no-cache"; -static const wchar_t *transfer_encoding = L"Transfer-Encoding: chunked"; -static const int no_check_cert_flags = SECURITY_FLAG_IGNORE_CERT_CN_INVALID | - SECURITY_FLAG_IGNORE_CERT_DATE_INVALID | - SECURITY_FLAG_IGNORE_UNKNOWN_CA; - -#if defined(__MINGW32__) -static const CLSID CLSID_InternetSecurityManager_mingw = - { 0x7B8A2D94, 0x0AC9, 0x11D1, - { 0x89, 0x6C, 0x00, 0xC0, 0x4F, 0xB6, 0xBF, 0xC4 } }; -static const IID IID_IInternetSecurityManager_mingw = - { 0x79EAC9EE, 0xBAF9, 0x11CE, - { 0x8C, 0x82, 0x00, 0xAA, 0x00, 0x4B, 0xA9, 0x0B } }; - -# define CLSID_InternetSecurityManager CLSID_InternetSecurityManager_mingw -# define IID_IInternetSecurityManager IID_IInternetSecurityManager_mingw -#endif - -#define OWNING_SUBTRANSPORT(s) ((winhttp_subtransport *)(s)->parent.subtransport) - -typedef enum { - GIT_WINHTTP_AUTH_BASIC = 1, - GIT_WINHTTP_AUTH_NEGOTIATE = 2, -} winhttp_authmechanism_t; - -typedef struct { - git_smart_subtransport_stream parent; - const char *service; - const char *service_url; - const wchar_t *verb; - HINTERNET request; - wchar_t *request_uri; - char *chunk_buffer; - unsigned chunk_buffer_len; - HANDLE post_body; - DWORD post_body_len; - unsigned sent_request : 1, - received_response : 1, - chunked : 1; -} winhttp_stream; - -typedef struct { - git_smart_subtransport parent; - transport_smart *owner; - gitno_connection_data connection_data; - git_cred *cred; - git_cred *url_cred; - int auth_mechanism; - HINTERNET session; - HINTERNET connection; -} winhttp_subtransport; - -static int apply_basic_credential(HINTERNET request, git_cred *cred) -{ - git_cred_userpass_plaintext *c = (git_cred_userpass_plaintext *)cred; - git_buf buf = GIT_BUF_INIT, raw = GIT_BUF_INIT; - wchar_t *wide = NULL; - int error = -1, wide_len; - - git_buf_printf(&raw, "%s:%s", c->username, c->password); - - if (git_buf_oom(&raw) || - git_buf_puts(&buf, "Authorization: Basic ") < 0 || - git_buf_encode_base64(&buf, git_buf_cstr(&raw), raw.size) < 0) - goto on_error; - - if ((wide_len = git__utf8_to_16_alloc(&wide, git_buf_cstr(&buf))) < 0) { - giterr_set(GITERR_OS, "Failed to convert string to wide form"); - goto on_error; - } - - if (!WinHttpAddRequestHeaders(request, wide, (ULONG) -1L, WINHTTP_ADDREQ_FLAG_ADD)) { - giterr_set(GITERR_OS, "Failed to add a header to the request"); - goto on_error; - } - - error = 0; - -on_error: - /* We were dealing with plaintext passwords, so clean up after ourselves a bit. */ - if (wide) - memset(wide, 0x0, wide_len * sizeof(wchar_t)); - - if (buf.size) - memset(buf.ptr, 0x0, buf.size); - - if (raw.size) - memset(raw.ptr, 0x0, raw.size); - - git__free(wide); - git_buf_free(&buf); - git_buf_free(&raw); - return error; -} - -static int apply_default_credentials(HINTERNET request) -{ - /* Either the caller explicitly requested that default credentials be passed, - * or our fallback credential callback was invoked and checked that the target - * URI was in the appropriate Internet Explorer security zone. By setting this - * flag, we guarantee that the credentials are delivered by WinHTTP. The default - * is "medium" which applies to the intranet and sounds like it would correspond - * to Internet Explorer security zones, but in fact does not. */ - DWORD data = WINHTTP_AUTOLOGON_SECURITY_LEVEL_LOW; - - if (!WinHttpSetOption(request, WINHTTP_OPTION_AUTOLOGON_POLICY, &data, sizeof(DWORD))) - return -1; - - return 0; -} - -static int fallback_cred_acquire_cb( - git_cred **cred, - const char *url, - const char *username_from_url, - unsigned int allowed_types, - void *payload) -{ - int error = 1; - - GIT_UNUSED(username_from_url); - GIT_UNUSED(payload); - - /* If the target URI supports integrated Windows authentication - * as an authentication mechanism */ - if (GIT_CREDTYPE_DEFAULT & allowed_types) { - wchar_t *wide_url; - - /* Convert URL to wide characters */ - if (git__utf8_to_16_alloc(&wide_url, url) < 0) { - giterr_set(GITERR_OS, "Failed to convert string to wide form"); - return -1; - } - - if (SUCCEEDED(CoInitializeEx(NULL, COINIT_MULTITHREADED))) { - IInternetSecurityManager* pISM; - - /* And if the target URI is in the My Computer, Intranet, or Trusted zones */ - if (SUCCEEDED(CoCreateInstance(&CLSID_InternetSecurityManager, NULL, - CLSCTX_ALL, &IID_IInternetSecurityManager, (void **)&pISM))) { - DWORD dwZone; - - if (SUCCEEDED(pISM->lpVtbl->MapUrlToZone(pISM, wide_url, &dwZone, 0)) && - (URLZONE_LOCAL_MACHINE == dwZone || - URLZONE_INTRANET == dwZone || - URLZONE_TRUSTED == dwZone)) { - git_cred *existing = *cred; - - if (existing) - existing->free(existing); - - /* Then use default Windows credentials to authenticate this request */ - error = git_cred_default_new(cred); - } - - pISM->lpVtbl->Release(pISM); - } - - CoUninitialize(); - } - - git__free(wide_url); - } - - return error; -} - -static int certificate_check(winhttp_stream *s, int valid) -{ - int error; - winhttp_subtransport *t = OWNING_SUBTRANSPORT(s); - PCERT_CONTEXT cert_ctx; - DWORD cert_ctx_size = sizeof(cert_ctx); - git_cert_x509 cert; - - /* If there is no override, we should fail if WinHTTP doesn't think it's fine */ - if (t->owner->certificate_check_cb == NULL && !valid) - return GIT_ECERTIFICATE; - - if (t->owner->certificate_check_cb == NULL || !t->connection_data.use_ssl) - return 0; - - if (!WinHttpQueryOption(s->request, WINHTTP_OPTION_SERVER_CERT_CONTEXT, &cert_ctx, &cert_ctx_size)) { - giterr_set(GITERR_OS, "failed to get server certificate"); - return -1; - } - - giterr_clear(); - cert.parent.cert_type = GIT_CERT_X509; - cert.data = cert_ctx->pbCertEncoded; - cert.len = cert_ctx->cbCertEncoded; - error = t->owner->certificate_check_cb((git_cert *) &cert, valid, t->connection_data.host, t->owner->cred_acquire_payload); - CertFreeCertificateContext(cert_ctx); - - if (error < 0 && !giterr_last()) - giterr_set(GITERR_NET, "user cancelled certificate check"); - - return error; -} - -static void winhttp_stream_close(winhttp_stream *s) -{ - if (s->chunk_buffer) { - git__free(s->chunk_buffer); - s->chunk_buffer = NULL; - } - - if (s->post_body) { - CloseHandle(s->post_body); - s->post_body = NULL; - } - - if (s->request_uri) { - git__free(s->request_uri); - s->request_uri = NULL; - } - - if (s->request) { - WinHttpCloseHandle(s->request); - s->request = NULL; - } - - s->sent_request = 0; -} - -static int winhttp_stream_connect(winhttp_stream *s) -{ - winhttp_subtransport *t = OWNING_SUBTRANSPORT(s); - git_buf buf = GIT_BUF_INIT; - char *proxy_url = NULL; - wchar_t ct[MAX_CONTENT_TYPE_LEN]; - LPCWSTR types[] = { L"*/*", NULL }; - BOOL peerdist = FALSE; - int error = -1; - unsigned long disable_redirects = WINHTTP_DISABLE_REDIRECTS; - int default_timeout = TIMEOUT_INFINITE; - int default_connect_timeout = DEFAULT_CONNECT_TIMEOUT; - size_t i; - - /* Prepare URL */ - git_buf_printf(&buf, "%s%s", t->connection_data.path, s->service_url); - - if (git_buf_oom(&buf)) - return -1; - - /* Convert URL to wide characters */ - if (git__utf8_to_16_alloc(&s->request_uri, git_buf_cstr(&buf)) < 0) { - giterr_set(GITERR_OS, "Failed to convert string to wide form"); - goto on_error; - } - - /* Establish request */ - s->request = WinHttpOpenRequest( - t->connection, - s->verb, - s->request_uri, - NULL, - WINHTTP_NO_REFERER, - types, - t->connection_data.use_ssl ? WINHTTP_FLAG_SECURE : 0); - - if (!s->request) { - giterr_set(GITERR_OS, "Failed to open request"); - goto on_error; - } - - if (!WinHttpSetTimeouts(s->request, default_timeout, default_connect_timeout, default_timeout, default_timeout)) { - giterr_set(GITERR_OS, "Failed to set timeouts for WinHTTP"); - goto on_error; - } - - /* Set proxy if necessary */ - if (git_remote__get_http_proxy(t->owner->owner, !!t->connection_data.use_ssl, &proxy_url) < 0) - goto on_error; - - if (proxy_url) { - WINHTTP_PROXY_INFO proxy_info; - wchar_t *proxy_wide; - - /* Convert URL to wide characters */ - int proxy_wide_len = git__utf8_to_16_alloc(&proxy_wide, proxy_url); - - if (proxy_wide_len < 0) { - giterr_set(GITERR_OS, "Failed to convert string to wide form"); - goto on_error; - } - - /* Strip any trailing forward slash on the proxy URL; - * WinHTTP doesn't like it if one is present */ - if (proxy_wide_len > 1 && L'/' == proxy_wide[proxy_wide_len - 2]) - proxy_wide[proxy_wide_len - 2] = L'\0'; - - proxy_info.dwAccessType = WINHTTP_ACCESS_TYPE_NAMED_PROXY; - proxy_info.lpszProxy = proxy_wide; - proxy_info.lpszProxyBypass = NULL; - - if (!WinHttpSetOption(s->request, - WINHTTP_OPTION_PROXY, - &proxy_info, - sizeof(WINHTTP_PROXY_INFO))) { - giterr_set(GITERR_OS, "Failed to set proxy"); - git__free(proxy_wide); - goto on_error; - } - - git__free(proxy_wide); - } - - /* Disable WinHTTP redirects so we can handle them manually. Why, you ask? - * http://social.msdn.microsoft.com/Forums/windowsdesktop/en-US/b2ff8879-ab9f-4218-8f09-16d25dff87ae - */ - if (!WinHttpSetOption(s->request, - WINHTTP_OPTION_DISABLE_FEATURE, - &disable_redirects, - sizeof(disable_redirects))) { - giterr_set(GITERR_OS, "Failed to disable redirects"); - goto on_error; - } - - /* Strip unwanted headers (X-P2P-PeerDist, X-P2P-PeerDistEx) that WinHTTP - * adds itself. This option may not be supported by the underlying - * platform, so we do not error-check it */ - WinHttpSetOption(s->request, - WINHTTP_OPTION_PEERDIST_EXTENSION_STATE, - &peerdist, - sizeof(peerdist)); - - /* Send Pragma: no-cache header */ - if (!WinHttpAddRequestHeaders(s->request, pragma_nocache, (ULONG) -1L, WINHTTP_ADDREQ_FLAG_ADD)) { - giterr_set(GITERR_OS, "Failed to add a header to the request"); - goto on_error; - } - - if (post_verb == s->verb) { - /* Send Content-Type and Accept headers -- only necessary on a POST */ - git_buf_clear(&buf); - if (git_buf_printf(&buf, - "Content-Type: application/x-git-%s-request", - s->service) < 0) - goto on_error; - - if (git__utf8_to_16(ct, MAX_CONTENT_TYPE_LEN, git_buf_cstr(&buf)) < 0) { - giterr_set(GITERR_OS, "Failed to convert content-type to wide characters"); - goto on_error; - } - - if (!WinHttpAddRequestHeaders(s->request, ct, (ULONG)-1L, - WINHTTP_ADDREQ_FLAG_ADD | WINHTTP_ADDREQ_FLAG_REPLACE)) { - giterr_set(GITERR_OS, "Failed to add a header to the request"); - goto on_error; - } - - git_buf_clear(&buf); - if (git_buf_printf(&buf, - "Accept: application/x-git-%s-result", - s->service) < 0) - goto on_error; - - if (git__utf8_to_16(ct, MAX_CONTENT_TYPE_LEN, git_buf_cstr(&buf)) < 0) { - giterr_set(GITERR_OS, "Failed to convert accept header to wide characters"); - goto on_error; - } - - if (!WinHttpAddRequestHeaders(s->request, ct, (ULONG)-1L, - WINHTTP_ADDREQ_FLAG_ADD | WINHTTP_ADDREQ_FLAG_REPLACE)) { - giterr_set(GITERR_OS, "Failed to add a header to the request"); - goto on_error; - } - } - - for (i = 0; i < t->owner->custom_headers.count; i++) { - if (t->owner->custom_headers.strings[i]) { - git_buf_clear(&buf); - git_buf_puts(&buf, t->owner->custom_headers.strings[i]); - if (git__utf8_to_16(ct, MAX_CONTENT_TYPE_LEN, git_buf_cstr(&buf)) < 0) { - giterr_set(GITERR_OS, "Failed to convert custom header to wide characters"); - goto on_error; - } - - if (!WinHttpAddRequestHeaders(s->request, ct, (ULONG)-1L, - WINHTTP_ADDREQ_FLAG_ADD | WINHTTP_ADDREQ_FLAG_REPLACE)) { - giterr_set(GITERR_OS, "Failed to add a header to the request"); - goto on_error; - } - } - } - - /* If requested, disable certificate validation */ - if (t->connection_data.use_ssl) { - int flags; - - if (t->owner->parent.read_flags(&t->owner->parent, &flags) < 0) - goto on_error; - } - - /* If we have a credential on the subtransport, apply it to the request */ - if (t->cred && - t->cred->credtype == GIT_CREDTYPE_USERPASS_PLAINTEXT && - t->auth_mechanism == GIT_WINHTTP_AUTH_BASIC && - apply_basic_credential(s->request, t->cred) < 0) - goto on_error; - else if (t->cred && - t->cred->credtype == GIT_CREDTYPE_DEFAULT && - t->auth_mechanism == GIT_WINHTTP_AUTH_NEGOTIATE && - apply_default_credentials(s->request) < 0) - goto on_error; - - /* If no other credentials have been applied and the URL has username and - * password, use those */ - if (!t->cred && t->connection_data.user && t->connection_data.pass) { - if (!t->url_cred && - git_cred_userpass_plaintext_new(&t->url_cred, t->connection_data.user, t->connection_data.pass) < 0) - goto on_error; - if (apply_basic_credential(s->request, t->url_cred) < 0) - goto on_error; - } - - /* We've done everything up to calling WinHttpSendRequest. */ - - error = 0; - -on_error: - if (error < 0) - winhttp_stream_close(s); - - git__free(proxy_url); - git_buf_free(&buf); - return error; -} - -static int parse_unauthorized_response( - HINTERNET request, - int *allowed_types, - int *auth_mechanism) -{ - DWORD supported, first, target; - - *allowed_types = 0; - *auth_mechanism = 0; - - /* WinHttpQueryHeaders() must be called before WinHttpQueryAuthSchemes(). - * We can assume this was already done, since we know we are unauthorized. - */ - if (!WinHttpQueryAuthSchemes(request, &supported, &first, &target)) { - giterr_set(GITERR_OS, "Failed to parse supported auth schemes"); - return -1; - } - - if (WINHTTP_AUTH_SCHEME_BASIC & supported) { - *allowed_types |= GIT_CREDTYPE_USERPASS_PLAINTEXT; - *auth_mechanism = GIT_WINHTTP_AUTH_BASIC; - } - - if ((WINHTTP_AUTH_SCHEME_NTLM & supported) || - (WINHTTP_AUTH_SCHEME_NEGOTIATE & supported)) { - *allowed_types |= GIT_CREDTYPE_DEFAULT; - *auth_mechanism = GIT_WINHTTP_AUTH_NEGOTIATE; - } - - return 0; -} - -static int write_chunk(HINTERNET request, const char *buffer, size_t len) -{ - DWORD bytes_written; - git_buf buf = GIT_BUF_INIT; - - /* Chunk header */ - git_buf_printf(&buf, "%X\r\n", len); - - if (git_buf_oom(&buf)) - return -1; - - if (!WinHttpWriteData(request, - git_buf_cstr(&buf), (DWORD)git_buf_len(&buf), - &bytes_written)) { - git_buf_free(&buf); - giterr_set(GITERR_OS, "Failed to write chunk header"); - return -1; - } - - git_buf_free(&buf); - - /* Chunk body */ - if (!WinHttpWriteData(request, - buffer, (DWORD)len, - &bytes_written)) { - giterr_set(GITERR_OS, "Failed to write chunk"); - return -1; - } - - /* Chunk footer */ - if (!WinHttpWriteData(request, - "\r\n", 2, - &bytes_written)) { - giterr_set(GITERR_OS, "Failed to write chunk footer"); - return -1; - } - - return 0; -} - -static int winhttp_close_connection(winhttp_subtransport *t) -{ - int ret = 0; - - if (t->connection) { - if (!WinHttpCloseHandle(t->connection)) { - giterr_set(GITERR_OS, "Unable to close connection"); - ret = -1; - } - - t->connection = NULL; - } - - if (t->session) { - if (!WinHttpCloseHandle(t->session)) { - giterr_set(GITERR_OS, "Unable to close session"); - ret = -1; - } - - t->session = NULL; - } - - return ret; -} - -static int user_agent(git_buf *ua) -{ - const char *custom = git_libgit2__user_agent(); - - git_buf_clear(ua); - git_buf_PUTS(ua, "git/1.0 ("); - - if (custom) - git_buf_puts(ua, custom); - else - git_buf_PUTS(ua, "libgit2 " LIBGIT2_VERSION); - - return git_buf_putc(ua, ')'); -} - -static int winhttp_connect( - winhttp_subtransport *t) -{ - wchar_t *wide_host; - int32_t port; - wchar_t *wide_ua; - git_buf ua = GIT_BUF_INIT; - int error = -1; - int default_timeout = TIMEOUT_INFINITE; - int default_connect_timeout = DEFAULT_CONNECT_TIMEOUT; - - t->session = NULL; - t->connection = NULL; - - /* Prepare port */ - if (git__strtol32(&port, t->connection_data.port, NULL, 10) < 0) - return -1; - - /* Prepare host */ - if (git__utf8_to_16_alloc(&wide_host, t->connection_data.host) < 0) { - giterr_set(GITERR_OS, "Unable to convert host to wide characters"); - return -1; - } - - if ((error = user_agent(&ua)) < 0) { - git__free(wide_host); - return error; - } - - if (git__utf8_to_16_alloc(&wide_ua, git_buf_cstr(&ua)) < 0) { - giterr_set(GITERR_OS, "Unable to convert host to wide characters"); - git__free(wide_host); - git_buf_free(&ua); - return -1; - } - - git_buf_free(&ua); - - /* Establish session */ - t->session = WinHttpOpen( - wide_ua, - WINHTTP_ACCESS_TYPE_DEFAULT_PROXY, - WINHTTP_NO_PROXY_NAME, - WINHTTP_NO_PROXY_BYPASS, - 0); - - if (!t->session) { - giterr_set(GITERR_OS, "Failed to init WinHTTP"); - goto on_error; - } - - if (!WinHttpSetTimeouts(t->session, default_timeout, default_connect_timeout, default_timeout, default_timeout)) { - giterr_set(GITERR_OS, "Failed to set timeouts for WinHTTP"); - goto on_error; - } - - - /* Establish connection */ - t->connection = WinHttpConnect( - t->session, - wide_host, - (INTERNET_PORT) port, - 0); - - if (!t->connection) { - giterr_set(GITERR_OS, "Failed to connect to host"); - goto on_error; - } - - error = 0; - -on_error: - if (error < 0) - winhttp_close_connection(t); - - git__free(wide_host); - git__free(wide_ua); - - return error; -} - -static int do_send_request(winhttp_stream *s, size_t len, int ignore_length) -{ - if (ignore_length) { - if (!WinHttpSendRequest(s->request, - WINHTTP_NO_ADDITIONAL_HEADERS, 0, - WINHTTP_NO_REQUEST_DATA, 0, - WINHTTP_IGNORE_REQUEST_TOTAL_LENGTH, 0)) { - return -1; - } - } else { - if (!WinHttpSendRequest(s->request, - WINHTTP_NO_ADDITIONAL_HEADERS, 0, - WINHTTP_NO_REQUEST_DATA, 0, - len, 0)) { - return -1; - } - } - - return 0; -} - -static int send_request(winhttp_stream *s, size_t len, int ignore_length) -{ - int request_failed = 0, cert_valid = 1, error = 0; - DWORD ignore_flags; - - if ((error = do_send_request(s, len, ignore_length)) < 0) - request_failed = 1; - - if (request_failed) { - if (GetLastError() != ERROR_WINHTTP_SECURE_FAILURE) { - giterr_set(GITERR_OS, "failed to send request"); - return -1; - } else { - cert_valid = 0; - } - } - - giterr_clear(); - if ((error = certificate_check(s, cert_valid)) < 0) { - if (!giterr_last()) - giterr_set(GITERR_OS, "user cancelled certificate check"); - - return error; - } - - /* if neither the request nor the certificate check returned errors, we're done */ - if (!request_failed) - return 0; - - ignore_flags = no_check_cert_flags; - - if (!WinHttpSetOption(s->request, WINHTTP_OPTION_SECURITY_FLAGS, &ignore_flags, sizeof(ignore_flags))) { - giterr_set(GITERR_OS, "failed to set security options"); - return -1; - } - - if ((error = do_send_request(s, len, ignore_length)) < 0) - giterr_set(GITERR_OS, "failed to send request"); - - return error; -} - -static int winhttp_stream_read( - git_smart_subtransport_stream *stream, - char *buffer, - size_t buf_size, - size_t *bytes_read) -{ - winhttp_stream *s = (winhttp_stream *)stream; - winhttp_subtransport *t = OWNING_SUBTRANSPORT(s); - DWORD dw_bytes_read; - char replay_count = 0; - int error; - -replay: - /* Enforce a reasonable cap on the number of replays */ - if (++replay_count >= 7) { - giterr_set(GITERR_NET, "Too many redirects or authentication replays"); - return -1; - } - - /* Connect if necessary */ - if (!s->request && winhttp_stream_connect(s) < 0) - return -1; - - if (!s->received_response) { - DWORD status_code, status_code_length, content_type_length, bytes_written; - char expected_content_type_8[MAX_CONTENT_TYPE_LEN]; - wchar_t expected_content_type[MAX_CONTENT_TYPE_LEN], content_type[MAX_CONTENT_TYPE_LEN]; - - if (!s->sent_request) { - - if ((error = send_request(s, s->post_body_len, 0)) < 0) - return error; - - s->sent_request = 1; - } - - if (s->chunked) { - assert(s->verb == post_verb); - - /* Flush, if necessary */ - if (s->chunk_buffer_len > 0 && - write_chunk(s->request, s->chunk_buffer, s->chunk_buffer_len) < 0) - return -1; - - s->chunk_buffer_len = 0; - - /* Write the final chunk. */ - if (!WinHttpWriteData(s->request, - "0\r\n\r\n", 5, - &bytes_written)) { - giterr_set(GITERR_OS, "Failed to write final chunk"); - return -1; - } - } - else if (s->post_body) { - char *buffer; - DWORD len = s->post_body_len, bytes_read; - - if (INVALID_SET_FILE_POINTER == SetFilePointer(s->post_body, - 0, 0, FILE_BEGIN) && - NO_ERROR != GetLastError()) { - giterr_set(GITERR_OS, "Failed to reset file pointer"); - return -1; - } - - buffer = git__malloc(CACHED_POST_BODY_BUF_SIZE); - - while (len > 0) { - DWORD bytes_written; - - if (!ReadFile(s->post_body, buffer, - min(CACHED_POST_BODY_BUF_SIZE, len), - &bytes_read, NULL) || - !bytes_read) { - git__free(buffer); - giterr_set(GITERR_OS, "Failed to read from temp file"); - return -1; - } - - if (!WinHttpWriteData(s->request, buffer, - bytes_read, &bytes_written)) { - git__free(buffer); - giterr_set(GITERR_OS, "Failed to write data"); - return -1; - } - - len -= bytes_read; - assert(bytes_read == bytes_written); - } - - git__free(buffer); - - /* Eagerly close the temp file */ - CloseHandle(s->post_body); - s->post_body = NULL; - } - - if (!WinHttpReceiveResponse(s->request, 0)) { - giterr_set(GITERR_OS, "Failed to receive response"); - return -1; - } - - /* Verify that we got a 200 back */ - status_code_length = sizeof(status_code); - - if (!WinHttpQueryHeaders(s->request, - WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, - WINHTTP_HEADER_NAME_BY_INDEX, - &status_code, &status_code_length, - WINHTTP_NO_HEADER_INDEX)) { - giterr_set(GITERR_OS, "Failed to retrieve status code"); - return -1; - } - - /* The implementation of WinHTTP prior to Windows 7 will not - * redirect to an identical URI. Some Git hosters use self-redirects - * as part of their DoS mitigation strategy. Check first to see if we - * have a redirect status code, and that we haven't already streamed - * a post body. (We can't replay a streamed POST.) */ - if (!s->chunked && - (HTTP_STATUS_MOVED == status_code || - HTTP_STATUS_REDIRECT == status_code || - (HTTP_STATUS_REDIRECT_METHOD == status_code && - get_verb == s->verb) || - HTTP_STATUS_REDIRECT_KEEP_VERB == status_code)) { - - /* Check for Windows 7. This workaround is only necessary on - * Windows Vista and earlier. Windows 7 is version 6.1. */ - wchar_t *location; - DWORD location_length; - char *location8; - - /* OK, fetch the Location header from the redirect. */ - if (WinHttpQueryHeaders(s->request, - WINHTTP_QUERY_LOCATION, - WINHTTP_HEADER_NAME_BY_INDEX, - WINHTTP_NO_OUTPUT_BUFFER, - &location_length, - WINHTTP_NO_HEADER_INDEX) || - GetLastError() != ERROR_INSUFFICIENT_BUFFER) { - giterr_set(GITERR_OS, "Failed to read Location header"); - return -1; - } - - location = git__malloc(location_length); - GITERR_CHECK_ALLOC(location); - - if (!WinHttpQueryHeaders(s->request, - WINHTTP_QUERY_LOCATION, - WINHTTP_HEADER_NAME_BY_INDEX, - location, - &location_length, - WINHTTP_NO_HEADER_INDEX)) { - giterr_set(GITERR_OS, "Failed to read Location header"); - git__free(location); - return -1; - } - - /* Convert the Location header to UTF-8 */ - if (git__utf16_to_8_alloc(&location8, location) < 0) { - giterr_set(GITERR_OS, "Failed to convert Location header to UTF-8"); - git__free(location); - return -1; - } - - git__free(location); - - /* Replay the request */ - winhttp_stream_close(s); - - if (!git__prefixcmp_icase(location8, prefix_https)) { - /* Upgrade to secure connection; disconnect and start over */ - if (gitno_connection_data_from_url(&t->connection_data, location8, s->service_url) < 0) { - git__free(location8); - return -1; - } - - winhttp_close_connection(t); - - if (winhttp_connect(t) < 0) - return -1; - } - - git__free(location8); - goto replay; - } - - /* Handle authentication failures */ - if (HTTP_STATUS_DENIED == status_code && get_verb == s->verb) { - int allowed_types; - - if (parse_unauthorized_response(s->request, &allowed_types, &t->auth_mechanism) < 0) - return -1; - - if (allowed_types) { - int cred_error = 1; - - git_cred_free(t->cred); - t->cred = NULL; - /* Start with the user-supplied credential callback, if present */ - if (t->owner->cred_acquire_cb) { - cred_error = t->owner->cred_acquire_cb(&t->cred, t->owner->url, - t->connection_data.user, allowed_types, t->owner->cred_acquire_payload); - - /* Treat GIT_PASSTHROUGH as though git_cred_acquire_cb isn't set */ - if (cred_error == GIT_PASSTHROUGH) - cred_error = 1; - else if (cred_error < 0) - return cred_error; - } - - /* Invoke the fallback credentials acquisition callback if necessary */ - if (cred_error > 0) { - cred_error = fallback_cred_acquire_cb(&t->cred, t->owner->url, - t->connection_data.user, allowed_types, NULL); - - if (cred_error < 0) - return cred_error; - } - - if (!cred_error) { - assert(t->cred); - - winhttp_stream_close(s); - - /* Successfully acquired a credential */ - goto replay; - } - } - } - - if (HTTP_STATUS_OK != status_code) { - giterr_set(GITERR_NET, "Request failed with status code: %d", status_code); - return -1; - } - - /* Verify that we got the correct content-type back */ - if (post_verb == s->verb) - p_snprintf(expected_content_type_8, MAX_CONTENT_TYPE_LEN, "application/x-git-%s-result", s->service); - else - p_snprintf(expected_content_type_8, MAX_CONTENT_TYPE_LEN, "application/x-git-%s-advertisement", s->service); - - if (git__utf8_to_16(expected_content_type, MAX_CONTENT_TYPE_LEN, expected_content_type_8) < 0) { - giterr_set(GITERR_OS, "Failed to convert expected content-type to wide characters"); - return -1; - } - - content_type_length = sizeof(content_type); - - if (!WinHttpQueryHeaders(s->request, - WINHTTP_QUERY_CONTENT_TYPE, - WINHTTP_HEADER_NAME_BY_INDEX, - &content_type, &content_type_length, - WINHTTP_NO_HEADER_INDEX)) { - giterr_set(GITERR_OS, "Failed to retrieve response content-type"); - return -1; - } - - if (wcscmp(expected_content_type, content_type)) { - giterr_set(GITERR_NET, "Received unexpected content-type"); - return -1; - } - - s->received_response = 1; - } - - if (!WinHttpReadData(s->request, - (LPVOID)buffer, - (DWORD)buf_size, - &dw_bytes_read)) - { - giterr_set(GITERR_OS, "Failed to read data"); - return -1; - } - - *bytes_read = dw_bytes_read; - - return 0; -} - -static int winhttp_stream_write_single( - git_smart_subtransport_stream *stream, - const char *buffer, - size_t len) -{ - winhttp_stream *s = (winhttp_stream *)stream; - DWORD bytes_written; - int error; - - if (!s->request && winhttp_stream_connect(s) < 0) - return -1; - - /* This implementation of write permits only a single call. */ - if (s->sent_request) { - giterr_set(GITERR_NET, "Subtransport configured for only one write"); - return -1; - } - - if ((error = send_request(s, len, 0)) < 0) - return error; - - s->sent_request = 1; - - if (!WinHttpWriteData(s->request, - (LPCVOID)buffer, - (DWORD)len, - &bytes_written)) { - giterr_set(GITERR_OS, "Failed to write data"); - return -1; - } - - assert((DWORD)len == bytes_written); - - return 0; -} - -static int put_uuid_string(LPWSTR buffer, size_t buffer_len_cch) -{ - UUID uuid; - RPC_STATUS status = UuidCreate(&uuid); - int result; - - if (RPC_S_OK != status && - RPC_S_UUID_LOCAL_ONLY != status && - RPC_S_UUID_NO_ADDRESS != status) { - giterr_set(GITERR_NET, "Unable to generate name for temp file"); - return -1; - } - - if (buffer_len_cch < UUID_LENGTH_CCH + 1) { - giterr_set(GITERR_NET, "Buffer too small for name of temp file"); - return -1; - } - -#if !defined(__MINGW32__) || defined(MINGW_HAS_SECURE_API) - result = swprintf_s(buffer, buffer_len_cch, -#else - result = wsprintfW(buffer, -#endif - L"%08x%04x%04x%02x%02x%02x%02x%02x%02x%02x%02x", - uuid.Data1, uuid.Data2, uuid.Data3, - uuid.Data4[0], uuid.Data4[1], uuid.Data4[2], uuid.Data4[3], - uuid.Data4[4], uuid.Data4[5], uuid.Data4[6], uuid.Data4[7]); - - if (result < UUID_LENGTH_CCH) { - giterr_set(GITERR_OS, "Unable to generate name for temp file"); - return -1; - } - - return 0; -} - -static int get_temp_file(LPWSTR buffer, DWORD buffer_len_cch) -{ - size_t len; - - if (!GetTempPathW(buffer_len_cch, buffer)) { - giterr_set(GITERR_OS, "Failed to get temp path"); - return -1; - } - - len = wcslen(buffer); - - if (buffer[len - 1] != '\\' && len < buffer_len_cch) - buffer[len++] = '\\'; - - if (put_uuid_string(&buffer[len], (size_t)buffer_len_cch - len) < 0) - return -1; - - return 0; -} - -static int winhttp_stream_write_buffered( - git_smart_subtransport_stream *stream, - const char *buffer, - size_t len) -{ - winhttp_stream *s = (winhttp_stream *)stream; - DWORD bytes_written; - - if (!s->request && winhttp_stream_connect(s) < 0) - return -1; - - /* Buffer the payload, using a temporary file so we delegate - * memory management of the data to the operating system. */ - if (!s->post_body) { - wchar_t temp_path[MAX_PATH + 1]; - - if (get_temp_file(temp_path, MAX_PATH + 1) < 0) - return -1; - - s->post_body = CreateFileW(temp_path, - GENERIC_READ | GENERIC_WRITE, - FILE_SHARE_DELETE, NULL, - CREATE_NEW, - FILE_ATTRIBUTE_TEMPORARY | FILE_FLAG_DELETE_ON_CLOSE | FILE_FLAG_SEQUENTIAL_SCAN, - NULL); - - if (INVALID_HANDLE_VALUE == s->post_body) { - s->post_body = NULL; - giterr_set(GITERR_OS, "Failed to create temporary file"); - return -1; - } - } - - if (!WriteFile(s->post_body, buffer, (DWORD)len, &bytes_written, NULL)) { - giterr_set(GITERR_OS, "Failed to write to temporary file"); - return -1; - } - - assert((DWORD)len == bytes_written); - - s->post_body_len += bytes_written; - - return 0; -} - -static int winhttp_stream_write_chunked( - git_smart_subtransport_stream *stream, - const char *buffer, - size_t len) -{ - winhttp_stream *s = (winhttp_stream *)stream; - int error; - - if (!s->request && winhttp_stream_connect(s) < 0) - return -1; - - if (!s->sent_request) { - /* Send Transfer-Encoding: chunked header */ - if (!WinHttpAddRequestHeaders(s->request, - transfer_encoding, (ULONG) -1L, - WINHTTP_ADDREQ_FLAG_ADD)) { - giterr_set(GITERR_OS, "Failed to add a header to the request"); - return -1; - } - - if ((error = send_request(s, 0, 1)) < 0) - return error; - - s->sent_request = 1; - } - - if (len > CACHED_POST_BODY_BUF_SIZE) { - /* Flush, if necessary */ - if (s->chunk_buffer_len > 0) { - if (write_chunk(s->request, s->chunk_buffer, s->chunk_buffer_len) < 0) - return -1; - - s->chunk_buffer_len = 0; - } - - /* Write chunk directly */ - if (write_chunk(s->request, buffer, len) < 0) - return -1; - } - else { - /* Append as much to the buffer as we can */ - int count = (int)min(CACHED_POST_BODY_BUF_SIZE - s->chunk_buffer_len, len); - - if (!s->chunk_buffer) - s->chunk_buffer = git__malloc(CACHED_POST_BODY_BUF_SIZE); - - memcpy(s->chunk_buffer + s->chunk_buffer_len, buffer, count); - s->chunk_buffer_len += count; - buffer += count; - len -= count; - - /* Is the buffer full? If so, then flush */ - if (CACHED_POST_BODY_BUF_SIZE == s->chunk_buffer_len) { - if (write_chunk(s->request, s->chunk_buffer, s->chunk_buffer_len) < 0) - return -1; - - s->chunk_buffer_len = 0; - - /* Is there any remaining data from the source? */ - if (len > 0) { - memcpy(s->chunk_buffer, buffer, len); - s->chunk_buffer_len = (unsigned int)len; - } - } - } - - return 0; -} - -static void winhttp_stream_free(git_smart_subtransport_stream *stream) -{ - winhttp_stream *s = (winhttp_stream *)stream; - - winhttp_stream_close(s); - git__free(s); -} - -static int winhttp_stream_alloc(winhttp_subtransport *t, winhttp_stream **stream) -{ - winhttp_stream *s; - - if (!stream) - return -1; - - s = git__calloc(1, sizeof(winhttp_stream)); - GITERR_CHECK_ALLOC(s); - - s->parent.subtransport = &t->parent; - s->parent.read = winhttp_stream_read; - s->parent.write = winhttp_stream_write_single; - s->parent.free = winhttp_stream_free; - - *stream = s; - - return 0; -} - -static int winhttp_uploadpack_ls( - winhttp_subtransport *t, - winhttp_stream *s) -{ - GIT_UNUSED(t); - - s->service = upload_pack_service; - s->service_url = upload_pack_ls_service_url; - s->verb = get_verb; - - return 0; -} - -static int winhttp_uploadpack( - winhttp_subtransport *t, - winhttp_stream *s) -{ - GIT_UNUSED(t); - - s->service = upload_pack_service; - s->service_url = upload_pack_service_url; - s->verb = post_verb; - - return 0; -} - -static int winhttp_receivepack_ls( - winhttp_subtransport *t, - winhttp_stream *s) -{ - GIT_UNUSED(t); - - s->service = receive_pack_service; - s->service_url = receive_pack_ls_service_url; - s->verb = get_verb; - - return 0; -} - -static int winhttp_receivepack( - winhttp_subtransport *t, - winhttp_stream *s) -{ - GIT_UNUSED(t); - - /* WinHTTP only supports Transfer-Encoding: chunked - * on Windows Vista (NT 6.0) and higher. */ - s->chunked = git_has_win32_version(6, 0, 0); - - if (s->chunked) - s->parent.write = winhttp_stream_write_chunked; - else - s->parent.write = winhttp_stream_write_buffered; - - s->service = receive_pack_service; - s->service_url = receive_pack_service_url; - s->verb = post_verb; - - return 0; -} - -static int winhttp_action( - git_smart_subtransport_stream **stream, - git_smart_subtransport *subtransport, - const char *url, - git_smart_service_t action) -{ - winhttp_subtransport *t = (winhttp_subtransport *)subtransport; - winhttp_stream *s; - int ret = -1; - - if (!t->connection) - if ((ret = gitno_connection_data_from_url(&t->connection_data, url, NULL)) < 0 || - (ret = winhttp_connect(t)) < 0) - return ret; - - if (winhttp_stream_alloc(t, &s) < 0) - return -1; - - if (!stream) - return -1; - - switch (action) - { - case GIT_SERVICE_UPLOADPACK_LS: - ret = winhttp_uploadpack_ls(t, s); - break; - - case GIT_SERVICE_UPLOADPACK: - ret = winhttp_uploadpack(t, s); - break; - - case GIT_SERVICE_RECEIVEPACK_LS: - ret = winhttp_receivepack_ls(t, s); - break; - - case GIT_SERVICE_RECEIVEPACK: - ret = winhttp_receivepack(t, s); - break; - - default: - assert(0); - } - - if (!ret) - *stream = &s->parent; - - return ret; -} - -static int winhttp_close(git_smart_subtransport *subtransport) -{ - winhttp_subtransport *t = (winhttp_subtransport *)subtransport; - - gitno_connection_data_free_ptrs(&t->connection_data); - memset(&t->connection_data, 0x0, sizeof(gitno_connection_data)); - - if (t->cred) { - t->cred->free(t->cred); - t->cred = NULL; - } - - if (t->url_cred) { - t->url_cred->free(t->url_cred); - t->url_cred = NULL; - } - - return winhttp_close_connection(t); -} - -static void winhttp_free(git_smart_subtransport *subtransport) -{ - winhttp_subtransport *t = (winhttp_subtransport *)subtransport; - - winhttp_close(subtransport); - - git__free(t); -} - -int git_smart_subtransport_http(git_smart_subtransport **out, git_transport *owner, void *param) -{ - winhttp_subtransport *t; - - GIT_UNUSED(param); - - if (!out) - return -1; - - t = git__calloc(1, sizeof(winhttp_subtransport)); - GITERR_CHECK_ALLOC(t); - - t->owner = (transport_smart *)owner; - t->parent.action = winhttp_action; - t->parent.close = winhttp_close; - t->parent.free = winhttp_free; - - *out = (git_smart_subtransport *) t; - return 0; -} - -#endif /* GIT_WINHTTP */ diff --git a/vendor/libgit2/src/tree-cache.c b/vendor/libgit2/src/tree-cache.c deleted file mode 100644 index b37be0f0d..000000000 --- a/vendor/libgit2/src/tree-cache.c +++ /dev/null @@ -1,269 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "tree-cache.h" -#include "pool.h" -#include "tree.h" - -static git_tree_cache *find_child( - const git_tree_cache *tree, const char *path, const char *end) -{ - size_t i, dirlen = end ? (size_t)(end - path) : strlen(path); - - for (i = 0; i < tree->children_count; ++i) { - git_tree_cache *child = tree->children[i]; - - if (child->namelen == dirlen && !memcmp(path, child->name, dirlen)) - return child; - } - - return NULL; -} - -void git_tree_cache_invalidate_path(git_tree_cache *tree, const char *path) -{ - const char *ptr = path, *end; - - if (tree == NULL) - return; - - tree->entry_count = -1; - - while (ptr != NULL) { - end = strchr(ptr, '/'); - - if (end == NULL) /* End of path */ - break; - - tree = find_child(tree, ptr, end); - if (tree == NULL) /* We don't have that tree */ - return; - - tree->entry_count = -1; - ptr = end + 1; - } -} - -const git_tree_cache *git_tree_cache_get(const git_tree_cache *tree, const char *path) -{ - const char *ptr = path, *end; - - if (tree == NULL) { - return NULL; - } - - while (1) { - end = strchr(ptr, '/'); - - tree = find_child(tree, ptr, end); - if (tree == NULL) /* Can't find it */ - return NULL; - - if (end == NULL || *end + 1 == '\0') - return tree; - - ptr = end + 1; - } -} - -static int read_tree_internal(git_tree_cache **out, - const char **buffer_in, const char *buffer_end, - git_pool *pool) -{ - git_tree_cache *tree = NULL; - const char *name_start, *buffer; - int count; - - buffer = name_start = *buffer_in; - - if ((buffer = memchr(buffer, '\0', buffer_end - buffer)) == NULL) - goto corrupted; - - if (++buffer >= buffer_end) - goto corrupted; - - if (git_tree_cache_new(&tree, name_start, pool) < 0) - return -1; - - /* Blank-terminated ASCII decimal number of entries in this tree */ - if (git__strtol32(&count, buffer, &buffer, 10) < 0) - goto corrupted; - - tree->entry_count = count; - - if (*buffer != ' ' || ++buffer >= buffer_end) - goto corrupted; - - /* Number of children of the tree, newline-terminated */ - if (git__strtol32(&count, buffer, &buffer, 10) < 0 || count < 0) - goto corrupted; - - tree->children_count = count; - - if (*buffer != '\n' || ++buffer > buffer_end) - goto corrupted; - - /* The SHA1 is only there if it's not invalidated */ - if (tree->entry_count >= 0) { - /* 160-bit SHA-1 for this tree and it's children */ - if (buffer + GIT_OID_RAWSZ > buffer_end) - goto corrupted; - - git_oid_fromraw(&tree->oid, (const unsigned char *)buffer); - buffer += GIT_OID_RAWSZ; - } - - /* Parse children: */ - if (tree->children_count > 0) { - unsigned int i; - - tree->children = git_pool_malloc(pool, tree->children_count * sizeof(git_tree_cache *)); - GITERR_CHECK_ALLOC(tree->children); - - memset(tree->children, 0x0, tree->children_count * sizeof(git_tree_cache *)); - - for (i = 0; i < tree->children_count; ++i) { - if (read_tree_internal(&tree->children[i], &buffer, buffer_end, pool) < 0) - goto corrupted; - } - } - - *buffer_in = buffer; - *out = tree; - return 0; - - corrupted: - giterr_set(GITERR_INDEX, "Corrupted TREE extension in index"); - return -1; -} - -int git_tree_cache_read(git_tree_cache **tree, const char *buffer, size_t buffer_size, git_pool *pool) -{ - const char *buffer_end = buffer + buffer_size; - - if (read_tree_internal(tree, &buffer, buffer_end, pool) < 0) - return -1; - - if (buffer < buffer_end) { - giterr_set(GITERR_INDEX, "Corrupted TREE extension in index (unexpected trailing data)"); - return -1; - } - - return 0; -} - -static int read_tree_recursive(git_tree_cache *cache, const git_tree *tree, git_pool *pool) -{ - git_repository *repo; - size_t i, j, nentries, ntrees; - int error; - - repo = git_tree_owner(tree); - - git_oid_cpy(&cache->oid, git_tree_id(tree)); - nentries = git_tree_entrycount(tree); - - /* - * We make sure we know how many trees we need to allocate for - * so we don't have to realloc and change the pointers for the - * parents. - */ - ntrees = 0; - for (i = 0; i < nentries; i++) { - const git_tree_entry *entry; - - entry = git_tree_entry_byindex(tree, i); - if (git_tree_entry_filemode(entry) == GIT_FILEMODE_TREE) - ntrees++; - } - - cache->children_count = ntrees; - cache->children = git_pool_mallocz(pool, ntrees * sizeof(git_tree_cache *)); - GITERR_CHECK_ALLOC(cache->children); - - j = 0; - for (i = 0; i < nentries; i++) { - const git_tree_entry *entry; - git_tree *subtree; - - entry = git_tree_entry_byindex(tree, i); - if (git_tree_entry_filemode(entry) != GIT_FILEMODE_TREE) { - cache->entry_count++; - continue; - } - - if ((error = git_tree_cache_new(&cache->children[j], git_tree_entry_name(entry), pool)) < 0) - return error; - - if ((error = git_tree_lookup(&subtree, repo, git_tree_entry_id(entry))) < 0) - return error; - - error = read_tree_recursive(cache->children[j], subtree, pool); - git_tree_free(subtree); - cache->entry_count += cache->children[j]->entry_count; - j++; - - if (error < 0) - return error; - } - - return 0; -} - -int git_tree_cache_read_tree(git_tree_cache **out, const git_tree *tree, git_pool *pool) -{ - int error; - git_tree_cache *cache; - - if ((error = git_tree_cache_new(&cache, "", pool)) < 0) - return error; - - if ((error = read_tree_recursive(cache, tree, pool)) < 0) - return error; - - *out = cache; - return 0; -} - -int git_tree_cache_new(git_tree_cache **out, const char *name, git_pool *pool) -{ - size_t name_len; - git_tree_cache *tree; - - name_len = strlen(name); - tree = git_pool_malloc(pool, sizeof(git_tree_cache) + name_len + 1); - GITERR_CHECK_ALLOC(tree); - - memset(tree, 0x0, sizeof(git_tree_cache)); - /* NUL-terminated tree name */ - tree->namelen = name_len; - memcpy(tree->name, name, name_len); - tree->name[name_len] = '\0'; - - *out = tree; - return 0; -} - -static void write_tree(git_buf *out, git_tree_cache *tree) -{ - size_t i; - - git_buf_printf(out, "%s%c%"PRIdZ" %"PRIuZ"\n", tree->name, 0, tree->entry_count, tree->children_count); - - if (tree->entry_count != -1) - git_buf_put(out, (const char *) &tree->oid, GIT_OID_RAWSZ); - - for (i = 0; i < tree->children_count; i++) - write_tree(out, tree->children[i]); -} - -int git_tree_cache_write(git_buf *out, git_tree_cache *tree) -{ - write_tree(out, tree); - - return git_buf_oom(out) ? -1 : 0; -} diff --git a/vendor/libgit2/src/tree-cache.h b/vendor/libgit2/src/tree-cache.h deleted file mode 100644 index c44ca7cf5..000000000 --- a/vendor/libgit2/src/tree-cache.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#ifndef INCLUDE_tree_cache_h__ -#define INCLUDE_tree_cache_h__ - -#include "common.h" -#include "pool.h" -#include "buffer.h" -#include "git2/oid.h" - -typedef struct git_tree_cache { - struct git_tree_cache **children; - size_t children_count; - - ssize_t entry_count; - git_oid oid; - size_t namelen; - char name[GIT_FLEX_ARRAY]; -} git_tree_cache; - -int git_tree_cache_write(git_buf *out, git_tree_cache *tree); -int git_tree_cache_read(git_tree_cache **tree, const char *buffer, size_t buffer_size, git_pool *pool); -void git_tree_cache_invalidate_path(git_tree_cache *tree, const char *path); -const git_tree_cache *git_tree_cache_get(const git_tree_cache *tree, const char *path); -int git_tree_cache_new(git_tree_cache **out, const char *name, git_pool *pool); -/** - * Read a tree as the root of the tree cache (like for `git read-tree`) - */ -int git_tree_cache_read_tree(git_tree_cache **out, const git_tree *tree, git_pool *pool); -void git_tree_cache_free(git_tree_cache *tree); - -#endif diff --git a/vendor/libgit2/src/tree.c b/vendor/libgit2/src/tree.c deleted file mode 100644 index 6ce460c6d..000000000 --- a/vendor/libgit2/src/tree.c +++ /dev/null @@ -1,1036 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "common.h" -#include "commit.h" -#include "tree.h" -#include "git2/repository.h" -#include "git2/object.h" -#include "fileops.h" -#include "tree-cache.h" -#include "index.h" - -#define DEFAULT_TREE_SIZE 16 -#define MAX_FILEMODE_BYTES 6 - -#define TREE_ENTRY_CHECK_NAMELEN(n) \ - if (n > UINT16_MAX) { giterr_set(GITERR_INVALID, "tree entry path too long"); } - -GIT__USE_STRMAP - -static bool valid_filemode(const int filemode) -{ - return (filemode == GIT_FILEMODE_TREE - || filemode == GIT_FILEMODE_BLOB - || filemode == GIT_FILEMODE_BLOB_EXECUTABLE - || filemode == GIT_FILEMODE_LINK - || filemode == GIT_FILEMODE_COMMIT); -} - -GIT_INLINE(git_filemode_t) normalize_filemode(git_filemode_t filemode) -{ - /* Tree bits set, but it's not a commit */ - if (GIT_MODE_TYPE(filemode) == GIT_FILEMODE_TREE) - return GIT_FILEMODE_TREE; - - /* If any of the x bits are set */ - if (GIT_PERMS_IS_EXEC(filemode)) - return GIT_FILEMODE_BLOB_EXECUTABLE; - - /* 16XXXX means commit */ - if (GIT_MODE_TYPE(filemode) == GIT_FILEMODE_COMMIT) - return GIT_FILEMODE_COMMIT; - - /* 12XXXX means commit */ - if (GIT_MODE_TYPE(filemode) == GIT_FILEMODE_LINK) - return GIT_FILEMODE_LINK; - - /* Otherwise, return a blob */ - return GIT_FILEMODE_BLOB; -} - -static int valid_entry_name(git_repository *repo, const char *filename) -{ - return *filename != '\0' && - git_path_isvalid(repo, filename, - GIT_PATH_REJECT_TRAVERSAL | GIT_PATH_REJECT_DOT_GIT | GIT_PATH_REJECT_SLASH); -} - -static int entry_sort_cmp(const void *a, const void *b) -{ - const git_tree_entry *e1 = (const git_tree_entry *)a; - const git_tree_entry *e2 = (const git_tree_entry *)b; - - return git_path_cmp( - e1->filename, e1->filename_len, git_tree_entry__is_tree(e1), - e2->filename, e2->filename_len, git_tree_entry__is_tree(e2), - git__strncmp); -} - -int git_tree_entry_cmp(const git_tree_entry *e1, const git_tree_entry *e2) -{ - return entry_sort_cmp(e1, e2); -} - -int git_tree_entry_icmp(const git_tree_entry *e1, const git_tree_entry *e2) -{ - return git_path_cmp( - e1->filename, e1->filename_len, git_tree_entry__is_tree(e1), - e2->filename, e2->filename_len, git_tree_entry__is_tree(e2), - git__strncasecmp); -} - -/** - * Allocate a new self-contained entry, with enough space after it to - * store the filename and the id. - */ -static git_tree_entry *alloc_entry(const char *filename, size_t filename_len, const git_oid *id) -{ - git_tree_entry *entry = NULL; - size_t tree_len; - - TREE_ENTRY_CHECK_NAMELEN(filename_len); - - if (GIT_ADD_SIZET_OVERFLOW(&tree_len, sizeof(git_tree_entry), filename_len) || - GIT_ADD_SIZET_OVERFLOW(&tree_len, tree_len, 1) || - GIT_ADD_SIZET_OVERFLOW(&tree_len, tree_len, GIT_OID_RAWSZ)) - return NULL; - - entry = git__calloc(1, tree_len); - if (!entry) - return NULL; - - { - char *filename_ptr; - void *id_ptr; - - filename_ptr = ((char *) entry) + sizeof(git_tree_entry); - memcpy(filename_ptr, filename, filename_len); - entry->filename = filename_ptr; - - id_ptr = filename_ptr + filename_len + 1; - git_oid_cpy(id_ptr, id); - entry->oid = id_ptr; - } - - entry->filename_len = (uint16_t)filename_len; - - return entry; -} - -struct tree_key_search { - const char *filename; - uint16_t filename_len; -}; - -static int homing_search_cmp(const void *key, const void *array_member) -{ - const struct tree_key_search *ksearch = key; - const git_tree_entry *entry = array_member; - - const uint16_t len1 = ksearch->filename_len; - const uint16_t len2 = entry->filename_len; - - return memcmp( - ksearch->filename, - entry->filename, - len1 < len2 ? len1 : len2 - ); -} - -/* - * Search for an entry in a given tree. - * - * Note that this search is performed in two steps because - * of the way tree entries are sorted internally in git: - * - * Entries in a tree are not sorted alphabetically; two entries - * with the same root prefix will have different positions - * depending on whether they are folders (subtrees) or normal files. - * - * Consequently, it is not possible to find an entry on the tree - * with a binary search if you don't know whether the filename - * you're looking for is a folder or a normal file. - * - * To work around this, we first perform a homing binary search - * on the tree, using the minimal length root prefix of our filename. - * Once the comparisons for this homing search start becoming - * ambiguous because of folder vs file sorting, we look linearly - * around the area for our target file. - */ -static int tree_key_search( - size_t *at_pos, - const git_tree *tree, - const char *filename, - size_t filename_len) -{ - struct tree_key_search ksearch; - const git_tree_entry *entry; - size_t homing, i; - - TREE_ENTRY_CHECK_NAMELEN(filename_len); - - ksearch.filename = filename; - ksearch.filename_len = (uint16_t)filename_len; - - /* Initial homing search; find an entry on the tree with - * the same prefix as the filename we're looking for */ - - if (git_array_search(&homing, - tree->entries, &homing_search_cmp, &ksearch) < 0) - return GIT_ENOTFOUND; /* just a signal error; not passed back to user */ - - /* We found a common prefix. Look forward as long as - * there are entries that share the common prefix */ - for (i = homing; i < tree->entries.size; ++i) { - entry = git_array_get(tree->entries, i); - - if (homing_search_cmp(&ksearch, entry) < 0) - break; - - if (entry->filename_len == filename_len && - memcmp(filename, entry->filename, filename_len) == 0) { - if (at_pos) - *at_pos = i; - - return 0; - } - } - - /* If we haven't found our filename yet, look backwards - * too as long as we have entries with the same prefix */ - if (homing > 0) { - i = homing - 1; - - do { - entry = git_array_get(tree->entries, i); - - if (homing_search_cmp(&ksearch, entry) > 0) - break; - - if (entry->filename_len == filename_len && - memcmp(filename, entry->filename, filename_len) == 0) { - if (at_pos) - *at_pos = i; - - return 0; - } - } while (i-- > 0); - } - - /* The filename doesn't exist at all */ - return GIT_ENOTFOUND; -} - -void git_tree_entry_free(git_tree_entry *entry) -{ - if (entry == NULL) - return; - - git__free(entry); -} - -int git_tree_entry_dup(git_tree_entry **dest, const git_tree_entry *source) -{ - git_tree_entry *cpy; - - assert(source); - - cpy = alloc_entry(source->filename, source->filename_len, source->oid); - if (cpy == NULL) - return -1; - - cpy->attr = source->attr; - - *dest = cpy; - return 0; -} - -void git_tree__free(void *_tree) -{ - git_tree *tree = _tree; - - git_odb_object_free(tree->odb_obj); - git_array_clear(tree->entries); - git__free(tree); -} - -git_filemode_t git_tree_entry_filemode(const git_tree_entry *entry) -{ - return normalize_filemode(entry->attr); -} - -git_filemode_t git_tree_entry_filemode_raw(const git_tree_entry *entry) -{ - return entry->attr; -} - -const char *git_tree_entry_name(const git_tree_entry *entry) -{ - assert(entry); - return entry->filename; -} - -const git_oid *git_tree_entry_id(const git_tree_entry *entry) -{ - assert(entry); - return entry->oid; -} - -git_otype git_tree_entry_type(const git_tree_entry *entry) -{ - assert(entry); - - if (S_ISGITLINK(entry->attr)) - return GIT_OBJ_COMMIT; - else if (S_ISDIR(entry->attr)) - return GIT_OBJ_TREE; - else - return GIT_OBJ_BLOB; -} - -int git_tree_entry_to_object( - git_object **object_out, - git_repository *repo, - const git_tree_entry *entry) -{ - assert(entry && object_out); - return git_object_lookup(object_out, repo, entry->oid, GIT_OBJ_ANY); -} - -static const git_tree_entry *entry_fromname( - const git_tree *tree, const char *name, size_t name_len) -{ - size_t idx; - - if (tree_key_search(&idx, tree, name, name_len) < 0) - return NULL; - - return git_array_get(tree->entries, idx); -} - -const git_tree_entry *git_tree_entry_byname( - const git_tree *tree, const char *filename) -{ - assert(tree && filename); - - return entry_fromname(tree, filename, strlen(filename)); -} - -const git_tree_entry *git_tree_entry_byindex( - const git_tree *tree, size_t idx) -{ - assert(tree); - return git_array_get(tree->entries, idx); -} - -const git_tree_entry *git_tree_entry_byid( - const git_tree *tree, const git_oid *id) -{ - size_t i; - const git_tree_entry *e; - - assert(tree); - - git_array_foreach(tree->entries, i, e) { - if (memcmp(&e->oid->id, &id->id, sizeof(id->id)) == 0) - return e; - } - - return NULL; -} - -int git_tree__prefix_position(const git_tree *tree, const char *path) -{ - struct tree_key_search ksearch; - size_t at_pos, path_len; - - if (!path) - return 0; - - path_len = strlen(path); - TREE_ENTRY_CHECK_NAMELEN(path_len); - - ksearch.filename = path; - ksearch.filename_len = (uint16_t)path_len; - - /* Find tree entry with appropriate prefix */ - git_array_search( - &at_pos, tree->entries, &homing_search_cmp, &ksearch); - - for (; at_pos < tree->entries.size; ++at_pos) { - const git_tree_entry *entry = git_array_get(tree->entries, at_pos); - if (homing_search_cmp(&ksearch, entry) < 0) - break; - } - - for (; at_pos > 0; --at_pos) { - const git_tree_entry *entry = - git_array_get(tree->entries, at_pos - 1); - - if (homing_search_cmp(&ksearch, entry) > 0) - break; - } - - return (int)at_pos; -} - -size_t git_tree_entrycount(const git_tree *tree) -{ - assert(tree); - return tree->entries.size; -} - -unsigned int git_treebuilder_entrycount(git_treebuilder *bld) -{ - assert(bld); - - return git_strmap_num_entries(bld->map); -} - -static int tree_error(const char *str, const char *path) -{ - if (path) - giterr_set(GITERR_TREE, "%s - %s", str, path); - else - giterr_set(GITERR_TREE, "%s", str); - return -1; -} - -static int parse_mode(unsigned int *modep, const char *buffer, const char **buffer_out) -{ - unsigned char c; - unsigned int mode = 0; - - if (*buffer == ' ') - return -1; - - while ((c = *buffer++) != ' ') { - if (c < '0' || c > '7') - return -1; - mode = (mode << 3) + (c - '0'); - } - *modep = mode; - *buffer_out = buffer; - - return 0; -} - -int git_tree__parse(void *_tree, git_odb_object *odb_obj) -{ - git_tree *tree = _tree; - const char *buffer; - const char *buffer_end; - - if (git_odb_object_dup(&tree->odb_obj, odb_obj) < 0) - return -1; - - buffer = git_odb_object_data(tree->odb_obj); - buffer_end = buffer + git_odb_object_size(tree->odb_obj); - - git_array_init_to_size(tree->entries, DEFAULT_TREE_SIZE); - GITERR_CHECK_ARRAY(tree->entries); - - while (buffer < buffer_end) { - git_tree_entry *entry; - size_t filename_len; - const char *nul; - unsigned int attr; - - if (parse_mode(&attr, buffer, &buffer) < 0 || !buffer) - return tree_error("Failed to parse tree. Can't parse filemode", NULL); - - if ((nul = memchr(buffer, 0, buffer_end - buffer)) == NULL) - return tree_error("Failed to parse tree. Object is corrupted", NULL); - - filename_len = nul - buffer; - /* Allocate the entry */ - { - entry = git_array_alloc(tree->entries); - GITERR_CHECK_ALLOC(entry); - - entry->attr = attr; - entry->filename_len = filename_len; - entry->filename = buffer; - entry->oid = (git_oid *) ((char *) buffer + filename_len + 1); - } - - buffer += filename_len + 1; - buffer += GIT_OID_RAWSZ; - } - - return 0; -} - -static size_t find_next_dir(const char *dirname, git_index *index, size_t start) -{ - size_t dirlen, i, entries = git_index_entrycount(index); - - dirlen = strlen(dirname); - for (i = start; i < entries; ++i) { - const git_index_entry *entry = git_index_get_byindex(index, i); - if (strlen(entry->path) < dirlen || - memcmp(entry->path, dirname, dirlen) || - (dirlen > 0 && entry->path[dirlen] != '/')) { - break; - } - } - - return i; -} - -static int append_entry( - git_treebuilder *bld, - const char *filename, - const git_oid *id, - git_filemode_t filemode) -{ - git_tree_entry *entry; - int error = 0; - - if (!valid_entry_name(bld->repo, filename)) - return tree_error("Failed to insert entry. Invalid name for a tree entry", filename); - - entry = alloc_entry(filename, strlen(filename), id); - GITERR_CHECK_ALLOC(entry); - - entry->attr = (uint16_t)filemode; - - git_strmap_insert(bld->map, entry->filename, entry, error); - if (error < 0) { - git_tree_entry_free(entry); - giterr_set(GITERR_TREE, "failed to append entry %s to the tree builder", filename); - return -1; - } - - return 0; -} - -static int write_tree( - git_oid *oid, - git_repository *repo, - git_index *index, - const char *dirname, - size_t start) -{ - git_treebuilder *bld = NULL; - size_t i, entries = git_index_entrycount(index); - int error; - size_t dirname_len = strlen(dirname); - const git_tree_cache *cache; - - cache = git_tree_cache_get(index->tree, dirname); - if (cache != NULL && cache->entry_count >= 0){ - git_oid_cpy(oid, &cache->oid); - return (int)find_next_dir(dirname, index, start); - } - - if ((error = git_treebuilder_new(&bld, repo, NULL)) < 0 || bld == NULL) - return -1; - - /* - * This loop is unfortunate, but necessary. The index doesn't have - * any directores, so we need to handle that manually, and we - * need to keep track of the current position. - */ - for (i = start; i < entries; ++i) { - const git_index_entry *entry = git_index_get_byindex(index, i); - const char *filename, *next_slash; - - /* - * If we've left our (sub)tree, exit the loop and return. The - * first check is an early out (and security for the - * third). The second check is a simple prefix comparison. The - * third check catches situations where there is a directory - * win32/sys and a file win32mmap.c. Without it, the following - * code believes there is a file win32/mmap.c - */ - if (strlen(entry->path) < dirname_len || - memcmp(entry->path, dirname, dirname_len) || - (dirname_len > 0 && entry->path[dirname_len] != '/')) { - break; - } - - filename = entry->path + dirname_len; - if (*filename == '/') - filename++; - next_slash = strchr(filename, '/'); - if (next_slash) { - git_oid sub_oid; - int written; - char *subdir, *last_comp; - - subdir = git__strndup(entry->path, next_slash - entry->path); - GITERR_CHECK_ALLOC(subdir); - - /* Write out the subtree */ - written = write_tree(&sub_oid, repo, index, subdir, i); - if (written < 0) { - git__free(subdir); - goto on_error; - } else { - i = written - 1; /* -1 because of the loop increment */ - } - - /* - * We need to figure out what we want toinsert - * into this tree. If we're traversing - * deps/zlib/, then we only want to write - * 'zlib' into the tree. - */ - last_comp = strrchr(subdir, '/'); - if (last_comp) { - last_comp++; /* Get rid of the '/' */ - } else { - last_comp = subdir; - } - - error = append_entry(bld, last_comp, &sub_oid, S_IFDIR); - git__free(subdir); - if (error < 0) - goto on_error; - } else { - error = append_entry(bld, filename, &entry->id, entry->mode); - if (error < 0) - goto on_error; - } - } - - if (git_treebuilder_write(oid, bld) < 0) - goto on_error; - - git_treebuilder_free(bld); - return (int)i; - -on_error: - git_treebuilder_free(bld); - return -1; -} - -int git_tree__write_index( - git_oid *oid, git_index *index, git_repository *repo) -{ - int ret; - git_tree *tree; - bool old_ignore_case = false; - - assert(oid && index && repo); - - if (git_index_has_conflicts(index)) { - giterr_set(GITERR_INDEX, - "Cannot create a tree from a not fully merged index."); - return GIT_EUNMERGED; - } - - if (index->tree != NULL && index->tree->entry_count >= 0) { - git_oid_cpy(oid, &index->tree->oid); - return 0; - } - - /* The tree cache didn't help us; we'll have to write - * out a tree. If the index is ignore_case, we must - * make it case-sensitive for the duration of the tree-write - * operation. */ - - if (index->ignore_case) { - old_ignore_case = true; - git_index__set_ignore_case(index, false); - } - - ret = write_tree(oid, repo, index, "", 0); - - if (old_ignore_case) - git_index__set_ignore_case(index, true); - - index->tree = NULL; - - if (ret < 0) - return ret; - - git_pool_clear(&index->tree_pool); - - if ((ret = git_tree_lookup(&tree, repo, oid)) < 0) - return ret; - - /* Read the tree cache into the index */ - ret = git_tree_cache_read_tree(&index->tree, tree, &index->tree_pool); - git_tree_free(tree); - - return ret; -} - -int git_treebuilder_new( - git_treebuilder **builder_p, - git_repository *repo, - const git_tree *source) -{ - git_treebuilder *bld; - size_t i; - - assert(builder_p && repo); - - bld = git__calloc(1, sizeof(git_treebuilder)); - GITERR_CHECK_ALLOC(bld); - - bld->repo = repo; - - if (git_strmap_alloc(&bld->map) < 0) { - git__free(bld); - return -1; - } - - if (source != NULL) { - git_tree_entry *entry_src; - - git_array_foreach(source->entries, i, entry_src) { - if (append_entry( - bld, entry_src->filename, - entry_src->oid, - entry_src->attr) < 0) - goto on_error; - } - } - - *builder_p = bld; - return 0; - -on_error: - git_treebuilder_free(bld); - return -1; -} - -static git_otype otype_from_mode(git_filemode_t filemode) -{ - switch (filemode) { - case GIT_FILEMODE_TREE: - return GIT_OBJ_TREE; - case GIT_FILEMODE_COMMIT: - return GIT_OBJ_COMMIT; - default: - return GIT_OBJ_BLOB; - } -} - -int git_treebuilder_insert( - const git_tree_entry **entry_out, - git_treebuilder *bld, - const char *filename, - const git_oid *id, - git_filemode_t filemode) -{ - git_tree_entry *entry; - int error; - git_strmap_iter pos; - - assert(bld && id && filename); - - if (!valid_filemode(filemode)) - return tree_error("Failed to insert entry. Invalid filemode for file", filename); - - if (!valid_entry_name(bld->repo, filename)) - return tree_error("Failed to insert entry. Invalid name for a tree entry", filename); - - if (filemode != GIT_FILEMODE_COMMIT && - !git_object__is_valid(bld->repo, id, otype_from_mode(filemode))) - return tree_error("Failed to insert entry; invalid object specified", filename); - - pos = git_strmap_lookup_index(bld->map, filename); - if (git_strmap_valid_index(bld->map, pos)) { - entry = git_strmap_value_at(bld->map, pos); - git_oid_cpy((git_oid *) entry->oid, id); - } else { - entry = alloc_entry(filename, strlen(filename), id); - GITERR_CHECK_ALLOC(entry); - - git_strmap_insert(bld->map, entry->filename, entry, error); - - if (error < 0) { - git_tree_entry_free(entry); - giterr_set(GITERR_TREE, "failed to insert %s", filename); - return -1; - } - } - - entry->attr = filemode; - - if (entry_out) - *entry_out = entry; - - return 0; -} - -static git_tree_entry *treebuilder_get(git_treebuilder *bld, const char *filename) -{ - git_tree_entry *entry = NULL; - git_strmap_iter pos; - - assert(bld && filename); - - pos = git_strmap_lookup_index(bld->map, filename); - if (git_strmap_valid_index(bld->map, pos)) - entry = git_strmap_value_at(bld->map, pos); - - return entry; -} - -const git_tree_entry *git_treebuilder_get(git_treebuilder *bld, const char *filename) -{ - return treebuilder_get(bld, filename); -} - -int git_treebuilder_remove(git_treebuilder *bld, const char *filename) -{ - git_tree_entry *entry = treebuilder_get(bld, filename); - - if (entry == NULL) - return tree_error("Failed to remove entry. File isn't in the tree", filename); - - git_strmap_delete(bld->map, filename); - git_tree_entry_free(entry); - - return 0; -} - -int git_treebuilder_write(git_oid *oid, git_treebuilder *bld) -{ - int error = 0; - size_t i, entrycount; - git_buf tree = GIT_BUF_INIT; - git_odb *odb; - git_tree_entry *entry; - git_vector entries; - - assert(bld); - - entrycount = git_strmap_num_entries(bld->map); - if (git_vector_init(&entries, entrycount, entry_sort_cmp) < 0) - return -1; - - git_strmap_foreach_value(bld->map, entry, { - if (git_vector_insert(&entries, entry) < 0) - return -1; - }); - - git_vector_sort(&entries); - - /* Grow the buffer beforehand to an estimated size */ - error = git_buf_grow(&tree, entrycount * 72); - - for (i = 0; i < entries.length && !error; ++i) { - git_tree_entry *entry = git_vector_get(&entries, i); - - git_buf_printf(&tree, "%o ", entry->attr); - git_buf_put(&tree, entry->filename, entry->filename_len + 1); - git_buf_put(&tree, (char *)entry->oid->id, GIT_OID_RAWSZ); - - if (git_buf_oom(&tree)) - error = -1; - } - - - if (!error && - !(error = git_repository_odb__weakptr(&odb, bld->repo))) - error = git_odb_write(oid, odb, tree.ptr, tree.size, GIT_OBJ_TREE); - - git_buf_free(&tree); - git_vector_free(&entries); - - return error; -} - -void git_treebuilder_filter( - git_treebuilder *bld, - git_treebuilder_filter_cb filter, - void *payload) -{ - const char *filename; - git_tree_entry *entry; - - assert(bld && filter); - - git_strmap_foreach(bld->map, filename, entry, { - if (filter(entry, payload)) { - git_strmap_delete(bld->map, filename); - git_tree_entry_free(entry); - } - }); -} - -void git_treebuilder_clear(git_treebuilder *bld) -{ - git_tree_entry *e; - - assert(bld); - - git_strmap_foreach_value(bld->map, e, git_tree_entry_free(e)); - git_strmap_clear(bld->map); -} - -void git_treebuilder_free(git_treebuilder *bld) -{ - if (bld == NULL) - return; - - git_treebuilder_clear(bld); - git_strmap_free(bld->map); - git__free(bld); -} - -static size_t subpath_len(const char *path) -{ - const char *slash_pos = strchr(path, '/'); - if (slash_pos == NULL) - return strlen(path); - - return slash_pos - path; -} - -int git_tree_entry_bypath( - git_tree_entry **entry_out, - const git_tree *root, - const char *path) -{ - int error = 0; - git_tree *subtree; - const git_tree_entry *entry; - size_t filename_len; - - /* Find how long is the current path component (i.e. - * the filename between two slashes */ - filename_len = subpath_len(path); - - if (filename_len == 0) { - giterr_set(GITERR_TREE, "Invalid tree path given"); - return GIT_ENOTFOUND; - } - - entry = entry_fromname(root, path, filename_len); - - if (entry == NULL) { - giterr_set(GITERR_TREE, - "the path '%.*s' does not exist in the given tree", filename_len, path); - return GIT_ENOTFOUND; - } - - switch (path[filename_len]) { - case '/': - /* If there are more components in the path... - * then this entry *must* be a tree */ - if (!git_tree_entry__is_tree(entry)) { - giterr_set(GITERR_TREE, - "the path '%.*s' exists but is not a tree", filename_len, path); - return GIT_ENOTFOUND; - } - - /* If there's only a slash left in the path, we - * return the current entry; otherwise, we keep - * walking down the path */ - if (path[filename_len + 1] != '\0') - break; - - case '\0': - /* If there are no more components in the path, return - * this entry */ - return git_tree_entry_dup(entry_out, entry); - } - - if (git_tree_lookup(&subtree, root->object.repo, entry->oid) < 0) - return -1; - - error = git_tree_entry_bypath( - entry_out, - subtree, - path + filename_len + 1 - ); - - git_tree_free(subtree); - return error; -} - -static int tree_walk( - const git_tree *tree, - git_treewalk_cb callback, - git_buf *path, - void *payload, - bool preorder) -{ - int error = 0; - size_t i; - const git_tree_entry *entry; - - git_array_foreach(tree->entries, i, entry) { - if (preorder) { - error = callback(path->ptr, entry, payload); - if (error < 0) { /* negative value stops iteration */ - giterr_set_after_callback_function(error, "git_tree_walk"); - break; - } - if (error > 0) { /* positive value skips this entry */ - error = 0; - continue; - } - } - - if (git_tree_entry__is_tree(entry)) { - git_tree *subtree; - size_t path_len = git_buf_len(path); - - error = git_tree_lookup(&subtree, tree->object.repo, entry->oid); - if (error < 0) - break; - - /* append the next entry to the path */ - git_buf_puts(path, entry->filename); - git_buf_putc(path, '/'); - - if (git_buf_oom(path)) - error = -1; - else - error = tree_walk(subtree, callback, path, payload, preorder); - - git_tree_free(subtree); - if (error != 0) - break; - - git_buf_truncate(path, path_len); - } - - if (!preorder) { - error = callback(path->ptr, entry, payload); - if (error < 0) { /* negative value stops iteration */ - giterr_set_after_callback_function(error, "git_tree_walk"); - break; - } - error = 0; - } - } - - return error; -} - -int git_tree_walk( - const git_tree *tree, - git_treewalk_mode mode, - git_treewalk_cb callback, - void *payload) -{ - int error = 0; - git_buf root_path = GIT_BUF_INIT; - - if (mode != GIT_TREEWALK_POST && mode != GIT_TREEWALK_PRE) { - giterr_set(GITERR_INVALID, "Invalid walking mode for tree walk"); - return -1; - } - - error = tree_walk( - tree, callback, &root_path, payload, (mode == GIT_TREEWALK_PRE)); - - git_buf_free(&root_path); - - return error; -} - diff --git a/vendor/libgit2/src/tree.h b/vendor/libgit2/src/tree.h deleted file mode 100644 index 5e7a66e04..000000000 --- a/vendor/libgit2/src/tree.h +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_tree_h__ -#define INCLUDE_tree_h__ - -#include "git2/tree.h" -#include "repository.h" -#include "odb.h" -#include "vector.h" -#include "strmap.h" -#include "pool.h" - -struct git_tree_entry { - uint16_t attr; - uint16_t filename_len; - const git_oid *oid; - const char *filename; -}; - -struct git_tree { - git_object object; - git_odb_object *odb_obj; - git_array_t(git_tree_entry) entries; -}; - -struct git_treebuilder { - git_repository *repo; - git_strmap *map; -}; - -GIT_INLINE(bool) git_tree_entry__is_tree(const struct git_tree_entry *e) -{ - return (S_ISDIR(e->attr) && !S_ISGITLINK(e->attr)); -} - -extern int git_tree_entry_icmp(const git_tree_entry *e1, const git_tree_entry *e2); - -void git_tree__free(void *tree); -int git_tree__parse(void *tree, git_odb_object *obj); - -/** - * Lookup the first position in the tree with a given prefix. - * - * @param tree a previously loaded tree. - * @param prefix the beginning of a path to find in the tree. - * @return index of the first item at or after the given prefix. - */ -int git_tree__prefix_position(const git_tree *tree, const char *prefix); - - -/** - * Write a tree to the given repository - */ -int git_tree__write_index( - git_oid *oid, git_index *index, git_repository *repo); - -/** - * Obsolete mode kept for compatibility reasons - */ -#define GIT_FILEMODE_BLOB_GROUP_WRITABLE 0100664 - -#endif diff --git a/vendor/libgit2/src/tsort.c b/vendor/libgit2/src/tsort.c deleted file mode 100644 index e59819204..000000000 --- a/vendor/libgit2/src/tsort.c +++ /dev/null @@ -1,385 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "common.h" - -/** - * An array-of-pointers implementation of Python's Timsort - * Based on code by Christopher Swenson under the MIT license - * - * Copyright (c) 2010 Christopher Swenson - * Copyright (c) 2011 Vicent Marti - */ - -#ifndef MAX -# define MAX(x,y) (((x) > (y) ? (x) : (y))) -#endif - -#ifndef MIN -# define MIN(x,y) (((x) < (y) ? (x) : (y))) -#endif - -static int binsearch( - void **dst, const void *x, size_t size, git__sort_r_cmp cmp, void *payload) -{ - int l, c, r; - void *lx, *cx; - - assert(size > 0); - - l = 0; - r = (int)size - 1; - c = r >> 1; - lx = dst[l]; - - /* check for beginning conditions */ - if (cmp(x, lx, payload) < 0) - return 0; - - else if (cmp(x, lx, payload) == 0) { - int i = 1; - while (cmp(x, dst[i], payload) == 0) - i++; - return i; - } - - /* guaranteed not to be >= rx */ - cx = dst[c]; - while (1) { - const int val = cmp(x, cx, payload); - if (val < 0) { - if (c - l <= 1) return c; - r = c; - } else if (val > 0) { - if (r - c <= 1) return c + 1; - l = c; - lx = cx; - } else { - do { - cx = dst[++c]; - } while (cmp(x, cx, payload) == 0); - return c; - } - c = l + ((r - l) >> 1); - cx = dst[c]; - } -} - -/* Binary insertion sort, but knowing that the first "start" entries are sorted. Used in timsort. */ -static void bisort( - void **dst, size_t start, size_t size, git__sort_r_cmp cmp, void *payload) -{ - size_t i; - void *x; - int location; - - for (i = start; i < size; i++) { - int j; - /* If this entry is already correct, just move along */ - if (cmp(dst[i - 1], dst[i], payload) <= 0) - continue; - - /* Else we need to find the right place, shift everything over, and squeeze in */ - x = dst[i]; - location = binsearch(dst, x, i, cmp, payload); - for (j = (int)i - 1; j >= location; j--) { - dst[j + 1] = dst[j]; - } - dst[location] = x; - } -} - - -/* timsort implementation, based on timsort.txt */ -struct tsort_run { - ssize_t start; - ssize_t length; -}; - -struct tsort_store { - size_t alloc; - git__sort_r_cmp cmp; - void *payload; - void **storage; -}; - -static void reverse_elements(void **dst, ssize_t start, ssize_t end) -{ - while (start < end) { - void *tmp = dst[start]; - dst[start] = dst[end]; - dst[end] = tmp; - - start++; - end--; - } -} - -static ssize_t count_run( - void **dst, ssize_t start, ssize_t size, struct tsort_store *store) -{ - ssize_t curr = start + 2; - - if (size - start == 1) - return 1; - - if (start >= size - 2) { - if (store->cmp(dst[size - 2], dst[size - 1], store->payload) > 0) { - void *tmp = dst[size - 1]; - dst[size - 1] = dst[size - 2]; - dst[size - 2] = tmp; - } - - return 2; - } - - if (store->cmp(dst[start], dst[start + 1], store->payload) <= 0) { - while (curr < size - 1 && - store->cmp(dst[curr - 1], dst[curr], store->payload) <= 0) - curr++; - - return curr - start; - } else { - while (curr < size - 1 && - store->cmp(dst[curr - 1], dst[curr], store->payload) > 0) - curr++; - - /* reverse in-place */ - reverse_elements(dst, start, curr - 1); - return curr - start; - } -} - -static size_t compute_minrun(size_t n) -{ - int r = 0; - while (n >= 64) { - r |= n & 1; - n >>= 1; - } - return n + r; -} - -static int check_invariant(struct tsort_run *stack, ssize_t stack_curr) -{ - if (stack_curr < 2) - return 1; - - else if (stack_curr == 2) { - const ssize_t A = stack[stack_curr - 2].length; - const ssize_t B = stack[stack_curr - 1].length; - return (A > B); - } else { - const ssize_t A = stack[stack_curr - 3].length; - const ssize_t B = stack[stack_curr - 2].length; - const ssize_t C = stack[stack_curr - 1].length; - return !((A <= B + C) || (B <= C)); - } -} - -static int resize(struct tsort_store *store, size_t new_size) -{ - if (store->alloc < new_size) { - void **tempstore; - - tempstore = git__reallocarray(store->storage, new_size, sizeof(void *)); - - /** - * Do not propagate on OOM; this will abort the sort and - * leave the array unsorted, but no error code will be - * raised - */ - if (tempstore == NULL) - return -1; - - store->storage = tempstore; - store->alloc = new_size; - } - - return 0; -} - -static void merge(void **dst, const struct tsort_run *stack, ssize_t stack_curr, struct tsort_store *store) -{ - const ssize_t A = stack[stack_curr - 2].length; - const ssize_t B = stack[stack_curr - 1].length; - const ssize_t curr = stack[stack_curr - 2].start; - - void **storage; - ssize_t i, j, k; - - if (resize(store, MIN(A, B)) < 0) - return; - - storage = store->storage; - - /* left merge */ - if (A < B) { - memcpy(storage, &dst[curr], A * sizeof(void *)); - i = 0; - j = curr + A; - - for (k = curr; k < curr + A + B; k++) { - if ((i < A) && (j < curr + A + B)) { - if (store->cmp(storage[i], dst[j], store->payload) <= 0) - dst[k] = storage[i++]; - else - dst[k] = dst[j++]; - } else if (i < A) { - dst[k] = storage[i++]; - } else - dst[k] = dst[j++]; - } - } else { - memcpy(storage, &dst[curr + A], B * sizeof(void *)); - i = B - 1; - j = curr + A - 1; - - for (k = curr + A + B - 1; k >= curr; k--) { - if ((i >= 0) && (j >= curr)) { - if (store->cmp(dst[j], storage[i], store->payload) > 0) - dst[k] = dst[j--]; - else - dst[k] = storage[i--]; - } else if (i >= 0) - dst[k] = storage[i--]; - else - dst[k] = dst[j--]; - } - } -} - -static ssize_t collapse(void **dst, struct tsort_run *stack, ssize_t stack_curr, struct tsort_store *store, ssize_t size) -{ - ssize_t A, B, C; - - while (1) { - /* if the stack only has one thing on it, we are done with the collapse */ - if (stack_curr <= 1) - break; - - /* if this is the last merge, just do it */ - if ((stack_curr == 2) && (stack[0].length + stack[1].length == size)) { - merge(dst, stack, stack_curr, store); - stack[0].length += stack[1].length; - stack_curr--; - break; - } - - /* check if the invariant is off for a stack of 2 elements */ - else if ((stack_curr == 2) && (stack[0].length <= stack[1].length)) { - merge(dst, stack, stack_curr, store); - stack[0].length += stack[1].length; - stack_curr--; - break; - } - else if (stack_curr == 2) - break; - - A = stack[stack_curr - 3].length; - B = stack[stack_curr - 2].length; - C = stack[stack_curr - 1].length; - - /* check first invariant */ - if (A <= B + C) { - if (A < C) { - merge(dst, stack, stack_curr - 1, store); - stack[stack_curr - 3].length += stack[stack_curr - 2].length; - stack[stack_curr - 2] = stack[stack_curr - 1]; - stack_curr--; - } else { - merge(dst, stack, stack_curr, store); - stack[stack_curr - 2].length += stack[stack_curr - 1].length; - stack_curr--; - } - } else if (B <= C) { - merge(dst, stack, stack_curr, store); - stack[stack_curr - 2].length += stack[stack_curr - 1].length; - stack_curr--; - } else - break; - } - - return stack_curr; -} - -#define PUSH_NEXT() do {\ - len = count_run(dst, curr, size, store);\ - run = minrun;\ - if (run < minrun) run = minrun;\ - if (run > (ssize_t)size - curr) run = size - curr;\ - if (run > len) {\ - bisort(&dst[curr], len, run, cmp, payload);\ - len = run;\ - }\ - run_stack[stack_curr].start = curr;\ - run_stack[stack_curr++].length = len;\ - curr += len;\ - if (curr == (ssize_t)size) {\ - /* finish up */ \ - while (stack_curr > 1) { \ - merge(dst, run_stack, stack_curr, store); \ - run_stack[stack_curr - 2].length += run_stack[stack_curr - 1].length; \ - stack_curr--; \ - } \ - if (store->storage != NULL) {\ - git__free(store->storage);\ - store->storage = NULL;\ - }\ - return;\ - }\ -}\ -while (0) - -void git__tsort_r( - void **dst, size_t size, git__sort_r_cmp cmp, void *payload) -{ - struct tsort_store _store, *store = &_store; - struct tsort_run run_stack[128]; - - ssize_t stack_curr = 0; - ssize_t len, run; - ssize_t curr = 0; - ssize_t minrun; - - if (size < 64) { - bisort(dst, 1, size, cmp, payload); - return; - } - - /* compute the minimum run length */ - minrun = (ssize_t)compute_minrun(size); - - /* temporary storage for merges */ - store->alloc = 0; - store->storage = NULL; - store->cmp = cmp; - store->payload = payload; - - PUSH_NEXT(); - PUSH_NEXT(); - PUSH_NEXT(); - - while (1) { - if (!check_invariant(run_stack, stack_curr)) { - stack_curr = collapse(dst, run_stack, stack_curr, store, size); - continue; - } - - PUSH_NEXT(); - } -} - -static int tsort_r_cmp(const void *a, const void *b, void *payload) -{ - return ((git__tsort_cmp)payload)(a, b); -} - -void git__tsort(void **dst, size_t size, git__tsort_cmp cmp) -{ - git__tsort_r(dst, size, tsort_r_cmp, cmp); -} diff --git a/vendor/libgit2/src/unix/map.c b/vendor/libgit2/src/unix/map.c deleted file mode 100644 index c55ad1aa7..000000000 --- a/vendor/libgit2/src/unix/map.c +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#include - -#if !defined(GIT_WIN32) && !defined(NO_MMAP) - -#include "map.h" -#include -#include -#include - -int git__page_size(size_t *page_size) -{ - long sc_page_size = sysconf(_SC_PAGE_SIZE); - if (sc_page_size < 0) { - giterr_set(GITERR_OS, "can't determine system page size"); - return -1; - } - *page_size = (size_t) sc_page_size; - return 0; -} - -int git__mmap_alignment(size_t *alignment) -{ - return git__page_size(alignment); -} - -int p_mmap(git_map *out, size_t len, int prot, int flags, int fd, git_off_t offset) -{ - int mprot = PROT_READ; - int mflag = 0; - - GIT_MMAP_VALIDATE(out, len, prot, flags); - - out->data = NULL; - out->len = 0; - - if (prot & GIT_PROT_WRITE) - mprot |= PROT_WRITE; - - if ((flags & GIT_MAP_TYPE) == GIT_MAP_SHARED) - mflag = MAP_SHARED; - else if ((flags & GIT_MAP_TYPE) == GIT_MAP_PRIVATE) - mflag = MAP_PRIVATE; - else - mflag = MAP_SHARED; - - out->data = mmap(NULL, len, mprot, mflag, fd, offset); - - if (!out->data || out->data == MAP_FAILED) { - giterr_set(GITERR_OS, "Failed to mmap. Could not write data"); - return -1; - } - - out->len = len; - - return 0; -} - -int p_munmap(git_map *map) -{ - assert(map != NULL); - munmap(map->data, map->len); - - return 0; -} - -#endif - diff --git a/vendor/libgit2/src/unix/posix.h b/vendor/libgit2/src/unix/posix.h deleted file mode 100644 index 482d2c803..000000000 --- a/vendor/libgit2/src/unix/posix.h +++ /dev/null @@ -1,83 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_posix__unix_h__ -#define INCLUDE_posix__unix_h__ - -#include -#include -#include -#include -#include - -typedef int GIT_SOCKET; -#define INVALID_SOCKET -1 - -#define p_lseek(f,n,w) lseek(f, n, w) -#define p_fstat(f,b) fstat(f, b) -#define p_lstat(p,b) lstat(p,b) -#define p_stat(p,b) stat(p, b) - -#if defined(GIT_USE_STAT_MTIMESPEC) -# define st_atime_nsec st_atimespec.tv_nsec -# define st_mtime_nsec st_mtimespec.tv_nsec -# define st_ctime_nsec st_ctimespec.tv_nsec -#elif defined(GIT_USE_STAT_MTIM) -# define st_atime_nsec st_atim.tv_nsec -# define st_mtime_nsec st_mtim.tv_nsec -# define st_ctime_nsec st_ctim.tv_nsec -#elif !defined(GIT_USE_STAT_MTIME_NSEC) && defined(GIT_USE_NEC) -# error GIT_USE_NSEC defined but unknown struct stat nanosecond type -#endif - -#define p_utimes(f, t) utimes(f, t) - -#define p_readlink(a, b, c) readlink(a, b, c) -#define p_symlink(o,n) symlink(o, n) -#define p_link(o,n) link(o, n) -#define p_unlink(p) unlink(p) -#define p_mkdir(p,m) mkdir(p, m) -#define p_fsync(fd) fsync(fd) -extern char *p_realpath(const char *, char *); - -#define p_recv(s,b,l,f) recv(s,b,l,f) -#define p_send(s,b,l,f) send(s,b,l,f) -#define p_inet_pton(a, b, c) inet_pton(a, b, c) - -#define p_strcasecmp(s1, s2) strcasecmp(s1, s2) -#define p_strncasecmp(s1, s2, c) strncasecmp(s1, s2, c) -#define p_vsnprintf(b, c, f, a) vsnprintf(b, c, f, a) -#define p_snprintf(b, c, f, ...) snprintf(b, c, f, __VA_ARGS__) -#define p_mkstemp(p) mkstemp(p) -#define p_chdir(p) chdir(p) -#define p_chmod(p,m) chmod(p, m) -#define p_rmdir(p) rmdir(p) -#define p_access(p,m) access(p,m) -#define p_ftruncate(fd, sz) ftruncate(fd, sz) - -/* see win32/posix.h for explanation about why this exists */ -#define p_lstat_posixly(p,b) lstat(p,b) - -#define p_localtime_r(c, r) localtime_r(c, r) -#define p_gmtime_r(c, r) gmtime_r(c, r) - -#define p_timeval timeval - -#ifdef HAVE_FUTIMENS -GIT_INLINE(int) p_futimes(int f, const struct p_timeval t[2]) -{ - struct timespec s[2]; - s[0].tv_sec = t[0].tv_sec; - s[0].tv_nsec = t[0].tv_usec * 1000; - s[1].tv_sec = t[1].tv_sec; - s[1].tv_nsec = t[1].tv_usec * 1000; - return futimens(f, s); -} -#else -# define p_futimes futimes -#endif - -#endif diff --git a/vendor/libgit2/src/unix/realpath.c b/vendor/libgit2/src/unix/realpath.c deleted file mode 100644 index 2e49150c2..000000000 --- a/vendor/libgit2/src/unix/realpath.c +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#include - -#ifndef GIT_WIN32 - -#include -#include -#include -#include - -char *p_realpath(const char *pathname, char *resolved) -{ - char *ret; - if ((ret = realpath(pathname, resolved)) == NULL) - return NULL; - -#ifdef __OpenBSD__ - /* The OpenBSD realpath function behaves differently, - * figure out if the file exists */ - if (access(ret, F_OK) < 0) - ret = NULL; -#endif - return ret; -} - -#endif diff --git a/vendor/libgit2/src/userdiff.h b/vendor/libgit2/src/userdiff.h deleted file mode 100644 index 91c1f42dc..000000000 --- a/vendor/libgit2/src/userdiff.h +++ /dev/null @@ -1,208 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_userdiff_h__ -#define INCLUDE_userdiff_h__ - -/* - * This file isolates the built in diff driver function name patterns. - * Most of these patterns are taken from Git (with permission from the - * original authors for relicensing to libgit2). - */ - -typedef struct { - const char *name; - const char *fns; - const char *words; - int flags; -} git_diff_driver_definition; - -#define WORD_DEFAULT "|[^[:space:]]|[\xc0-\xff][\x80-\xbf]+" - -/* - * These builtin driver definition macros have same signature as in core - * git userdiff.c so that the data can be extracted verbatim - */ -#define PATTERNS(NAME, FN_PATS, WORD_PAT) \ - { NAME, FN_PATS, WORD_PAT WORD_DEFAULT, 0 } -#define IPATTERN(NAME, FN_PATS, WORD_PAT) \ - { NAME, FN_PATS, WORD_PAT WORD_DEFAULT, REG_ICASE } - -/* - * The table of diff driver patterns - * - * Function name patterns are a list of newline separated patterns that - * match a function declaration (i.e. the line you want in the hunk header), - * or a negative pattern prefixed with a '!' to reject a pattern (such as - * rejecting goto labels in C code). - * - * Word boundary patterns are just a simple pattern that will be OR'ed with - * the default value above (i.e. whitespace or non-ASCII characters). - */ -static git_diff_driver_definition builtin_defs[] = { - -IPATTERN("ada", - "!^(.*[ \t])?(is[ \t]+new|renames|is[ \t]+separate)([ \t].*)?$\n" - "!^[ \t]*with[ \t].*$\n" - "^[ \t]*((procedure|function)[ \t]+.*)$\n" - "^[ \t]*((package|protected|task)[ \t]+.*)$", - /* -- */ - "[a-zA-Z][a-zA-Z0-9_]*" - "|[-+]?[0-9][0-9#_.aAbBcCdDeEfF]*([eE][+-]?[0-9_]+)?" - "|=>|\\.\\.|\\*\\*|:=|/=|>=|<=|<<|>>|<>"), - -IPATTERN("fortran", - "!^([C*]|[ \t]*!)\n" - "!^[ \t]*MODULE[ \t]+PROCEDURE[ \t]\n" - "^[ \t]*((END[ \t]+)?(PROGRAM|MODULE|BLOCK[ \t]+DATA" - "|([^'\" \t]+[ \t]+)*(SUBROUTINE|FUNCTION))[ \t]+[A-Z].*)$", - /* -- */ - "[a-zA-Z][a-zA-Z0-9_]*" - "|\\.([Ee][Qq]|[Nn][Ee]|[Gg][TtEe]|[Ll][TtEe]|[Tt][Rr][Uu][Ee]|[Ff][Aa][Ll][Ss][Ee]|[Aa][Nn][Dd]|[Oo][Rr]|[Nn]?[Ee][Qq][Vv]|[Nn][Oo][Tt])\\." - /* numbers and format statements like 2E14.4, or ES12.6, 9X. - * Don't worry about format statements without leading digits since - * they would have been matched above as a variable anyway. */ - "|[-+]?[0-9.]+([AaIiDdEeFfLlTtXx][Ss]?[-+]?[0-9.]*)?(_[a-zA-Z0-9][a-zA-Z0-9_]*)?" - "|//|\\*\\*|::|[/<>=]="), - -PATTERNS("html", "^[ \t]*(<[Hh][1-6][ \t].*>.*)$", - "[^<>= \t]+"), - -PATTERNS("java", - "!^[ \t]*(catch|do|for|if|instanceof|new|return|switch|throw|while)\n" - "^[ \t]*(([A-Za-z_][A-Za-z_0-9]*[ \t]+)+[A-Za-z_][A-Za-z_0-9]*[ \t]*\\([^;]*)$", - /* -- */ - "[a-zA-Z_][a-zA-Z0-9_]*" - "|[-+0-9.e]+[fFlL]?|0[xXbB]?[0-9a-fA-F]+[lL]?" - "|[-+*/<>%&^|=!]=" - "|--|\\+\\+|<<=?|>>>?=?|&&|\\|\\|"), - -PATTERNS("matlab", - "^[[:space:]]*((classdef|function)[[:space:]].*)$|^%%[[:space:]].*$", - "[a-zA-Z_][a-zA-Z0-9_]*|[-+0-9.e]+|[=~<>]=|\\.[*/\\^']|\\|\\||&&"), - -PATTERNS("objc", - /* Negate C statements that can look like functions */ - "!^[ \t]*(do|for|if|else|return|switch|while)\n" - /* Objective-C methods */ - "^[ \t]*([-+][ \t]*\\([ \t]*[A-Za-z_][A-Za-z_0-9* \t]*\\)[ \t]*[A-Za-z_].*)$\n" - /* C functions */ - "^[ \t]*(([A-Za-z_][A-Za-z_0-9]*[ \t]+)+[A-Za-z_][A-Za-z_0-9]*[ \t]*\\([^;]*)$\n" - /* Objective-C class/protocol definitions */ - "^(@(implementation|interface|protocol)[ \t].*)$", - /* -- */ - "[a-zA-Z_][a-zA-Z0-9_]*" - "|[-+0-9.e]+[fFlL]?|0[xXbB]?[0-9a-fA-F]+[lL]?" - "|[-+*/<>%&^|=!]=|--|\\+\\+|<<=?|>>=?|&&|\\|\\||::|->"), - -PATTERNS("pascal", - "^(((class[ \t]+)?(procedure|function)|constructor|destructor|interface|" - "implementation|initialization|finalization)[ \t]*.*)$" - "\n" - "^(.*=[ \t]*(class|record).*)$", - /* -- */ - "[a-zA-Z_][a-zA-Z0-9_]*" - "|[-+0-9.e]+|0[xXbB]?[0-9a-fA-F]+" - "|<>|<=|>=|:=|\\.\\."), - -PATTERNS("perl", - "^package .*\n" - "^sub [[:alnum:]_':]+[ \t]*" - "(\\([^)]*\\)[ \t]*)?" /* prototype */ - /* - * Attributes. A regex can't count nested parentheses, - * so just slurp up whatever we see, taking care not - * to accept lines like "sub foo; # defined elsewhere". - * - * An attribute could contain a semicolon, but at that - * point it seems reasonable enough to give up. - */ - "(:[^;#]*)?" - "(\\{[ \t]*)?" /* brace can come here or on the next line */ - "(#.*)?$\n" /* comment */ - "^(BEGIN|END|INIT|CHECK|UNITCHECK|AUTOLOAD|DESTROY)[ \t]*" - "(\\{[ \t]*)?" /* brace can come here or on the next line */ - "(#.*)?$\n" - "^=head[0-9] .*", /* POD */ - /* -- */ - "[[:alpha:]_'][[:alnum:]_']*" - "|0[xb]?[0-9a-fA-F_]*" - /* taking care not to interpret 3..5 as (3.)(.5) */ - "|[0-9a-fA-F_]+(\\.[0-9a-fA-F_]+)?([eE][-+]?[0-9_]+)?" - "|=>|-[rwxoRWXOezsfdlpSugkbctTBMAC>]|~~|::" - "|&&=|\\|\\|=|//=|\\*\\*=" - "|&&|\\|\\||//|\\+\\+|--|\\*\\*|\\.\\.\\.?" - "|[-+*/%.^&<>=!|]=" - "|=~|!~" - "|<<|<>|<=>|>>"), - -PATTERNS("python", "^[ \t]*((class|def)[ \t].*)$", - /* -- */ - "[a-zA-Z_][a-zA-Z0-9_]*" - "|[-+0-9.e]+[jJlL]?|0[xX]?[0-9a-fA-F]+[lL]?" - "|[-+*/<>%&^|=!]=|//=?|<<=?|>>=?|\\*\\*=?"), - -PATTERNS("ruby", "^[ \t]*((class|module|def)[ \t].*)$", - /* -- */ - "(@|@@|\\$)?[a-zA-Z_][a-zA-Z0-9_]*" - "|[-+0-9.e]+|0[xXbB]?[0-9a-fA-F]+|\\?(\\\\C-)?(\\\\M-)?." - "|//=?|[-+*/<>%&^|=!]=|<<=?|>>=?|===|\\.{1,3}|::|[!=]~"), - -PATTERNS("bibtex", "(@[a-zA-Z]{1,}[ \t]*\\{{0,1}[ \t]*[^ \t\"@',\\#}{~%]*).*$", - "[={}\"]|[^={}\" \t]+"), - -PATTERNS("tex", "^(\\\\((sub)*section|chapter|part)\\*{0,1}\\{.*)$", - "\\\\[a-zA-Z@]+|\\\\.|[a-zA-Z0-9\x80-\xff]+"), - -PATTERNS("cpp", - /* Jump targets or access declarations */ - "!^[ \t]*[A-Za-z_][A-Za-z_0-9]*:[[:space:]]*($|/[/*])\n" - /* functions/methods, variables, and compounds at top level */ - "^((::[[:space:]]*)?[A-Za-z_].*)$", - /* -- */ - "[a-zA-Z_][a-zA-Z0-9_]*" - "|[-+0-9.e]+[fFlL]?|0[xXbB]?[0-9a-fA-F]+[lLuU]*" - "|[-+*/<>%&^|=!]=|--|\\+\\+|<<=?|>>=?|&&|\\|\\||::|->\\*?|\\.\\*"), - -PATTERNS("csharp", - /* Keywords */ - "!^[ \t]*(do|while|for|if|else|instanceof|new|return|switch|case|throw|catch|using)\n" - /* Methods and constructors */ - "^[ \t]*(((static|public|internal|private|protected|new|virtual|sealed|override|unsafe)[ \t]+)*[][<>@.~_[:alnum:]]+[ \t]+[<>@._[:alnum:]]+[ \t]*\\(.*\\))[ \t]*$\n" - /* Properties */ - "^[ \t]*(((static|public|internal|private|protected|new|virtual|sealed|override|unsafe)[ \t]+)*[][<>@.~_[:alnum:]]+[ \t]+[@._[:alnum:]]+)[ \t]*$\n" - /* Type definitions */ - "^[ \t]*(((static|public|internal|private|protected|new|unsafe|sealed|abstract|partial)[ \t]+)*(class|enum|interface|struct)[ \t]+.*)$\n" - /* Namespace */ - "^[ \t]*(namespace[ \t]+.*)$", - /* -- */ - "[a-zA-Z_][a-zA-Z0-9_]*" - "|[-+0-9.e]+[fFlL]?|0[xXbB]?[0-9a-fA-F]+[lL]?" - "|[-+*/<>%&^|=!]=|--|\\+\\+|<<=?|>>=?|&&|\\|\\||::|->"), - -PATTERNS("php", - "^[ \t]*(((public|private|protected|static|final)[ \t]+)*((class|function)[ \t].*))$", - /* -- */ - "[a-zA-Z_][a-zA-Z0-9_]*" - "|[-+0-9.e]+[fFlL]?|0[xX]?[0-9a-fA-F]+[lL]?" - "|[-+*/<>%&^|=!]=|--|\\+\\+|<<=?|>>=?|&&|\\|\\||::|->"), - -PATTERNS("javascript", - "([a-zA-Z_$][a-zA-Z0-9_$]*(\\.[a-zA-Z0-9_$]+)*[ \t]*=[ \t]*function([ \t][a-zA-Z_$][a-zA-Z0-9_$]*)?[^\\{]*)\n" - "([a-zA-Z_$][a-zA-Z0-9_$]*[ \t]*:[ \t]*function([ \t][a-zA-Z_$][a-zA-Z0-9_$]*)?[^\\{]*)\n" - "[^a-zA-Z0-9_\\$](function([ \t][a-zA-Z_$][a-zA-Z0-9_$]*)?[^\\{]*)", - /* -- */ - "[a-zA-Z_][a-zA-Z0-9_]*" - "|[-+0-9.e]+[fFlL]?|0[xX]?[0-9a-fA-F]+[lL]?" - "|[-+*/<>%&^|=!]=|--|\\+\\+|<<=?|>>=?|&&|\\|\\||::|->"), -}; - -#undef IPATTERN -#undef PATTERNS -#undef WORD_DEFAULT - -#endif - diff --git a/vendor/libgit2/src/util.c b/vendor/libgit2/src/util.c deleted file mode 100644 index 9e67f4347..000000000 --- a/vendor/libgit2/src/util.c +++ /dev/null @@ -1,810 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#include -#include "common.h" -#include -#include -#include "posix.h" - -#ifdef GIT_WIN32 -# include "win32/w32_buffer.h" -#endif - -#ifdef _MSC_VER -# include -#endif - -void git_strarray_free(git_strarray *array) -{ - size_t i; - - if (array == NULL) - return; - - for (i = 0; i < array->count; ++i) - git__free(array->strings[i]); - - git__free(array->strings); - - memset(array, 0, sizeof(*array)); -} - -int git_strarray_copy(git_strarray *tgt, const git_strarray *src) -{ - size_t i; - - assert(tgt && src); - - memset(tgt, 0, sizeof(*tgt)); - - if (!src->count) - return 0; - - tgt->strings = git__calloc(src->count, sizeof(char *)); - GITERR_CHECK_ALLOC(tgt->strings); - - for (i = 0; i < src->count; ++i) { - if (!src->strings[i]) - continue; - - tgt->strings[tgt->count] = git__strdup(src->strings[i]); - if (!tgt->strings[tgt->count]) { - git_strarray_free(tgt); - memset(tgt, 0, sizeof(*tgt)); - return -1; - } - - tgt->count++; - } - - return 0; -} - -int git__strtol64(int64_t *result, const char *nptr, const char **endptr, int base) -{ - const char *p; - int64_t n, nn; - int c, ovfl, v, neg, ndig; - - p = nptr; - neg = 0; - n = 0; - ndig = 0; - ovfl = 0; - - /* - * White space - */ - while (git__isspace(*p)) - p++; - - /* - * Sign - */ - if (*p == '-' || *p == '+') - if (*p++ == '-') - neg = 1; - - /* - * Base - */ - if (base == 0) { - if (*p != '0') - base = 10; - else { - base = 8; - if (p[1] == 'x' || p[1] == 'X') { - p += 2; - base = 16; - } - } - } else if (base == 16 && *p == '0') { - if (p[1] == 'x' || p[1] == 'X') - p += 2; - } else if (base < 0 || 36 < base) - goto Return; - - /* - * Non-empty sequence of digits - */ - for (;; p++,ndig++) { - c = *p; - v = base; - if ('0'<=c && c<='9') - v = c - '0'; - else if ('a'<=c && c<='z') - v = c - 'a' + 10; - else if ('A'<=c && c<='Z') - v = c - 'A' + 10; - if (v >= base) - break; - nn = n*base + v; - if (nn < n) - ovfl = 1; - n = nn; - } - -Return: - if (ndig == 0) { - giterr_set(GITERR_INVALID, "Failed to convert string to long. Not a number"); - return -1; - } - - if (endptr) - *endptr = p; - - if (ovfl) { - giterr_set(GITERR_INVALID, "Failed to convert string to long. Overflow error"); - return -1; - } - - *result = neg ? -n : n; - return 0; -} - -int git__strtol32(int32_t *result, const char *nptr, const char **endptr, int base) -{ - int error; - int32_t tmp_int; - int64_t tmp_long; - - if ((error = git__strtol64(&tmp_long, nptr, endptr, base)) < 0) - return error; - - tmp_int = tmp_long & 0xFFFFFFFF; - if (tmp_int != tmp_long) { - giterr_set(GITERR_INVALID, "Failed to convert. '%s' is too large", nptr); - return -1; - } - - *result = tmp_int; - - return error; -} - -int git__strcmp(const char *a, const char *b) -{ - while (*a && *b && *a == *b) - ++a, ++b; - return (int)(*(const unsigned char *)a) - (int)(*(const unsigned char *)b); -} - -int git__strcasecmp(const char *a, const char *b) -{ - while (*a && *b && git__tolower(*a) == git__tolower(*b)) - ++a, ++b; - return ((unsigned char)git__tolower(*a) - (unsigned char)git__tolower(*b)); -} - -int git__strcasesort_cmp(const char *a, const char *b) -{ - int cmp = 0; - - while (*a && *b) { - if (*a != *b) { - if (git__tolower(*a) != git__tolower(*b)) - break; - /* use case in sort order even if not in equivalence */ - if (!cmp) - cmp = (int)(*(const uint8_t *)a) - (int)(*(const uint8_t *)b); - } - - ++a, ++b; - } - - if (*a || *b) - return (unsigned char)git__tolower(*a) - (unsigned char)git__tolower(*b); - - return cmp; -} - -int git__strncmp(const char *a, const char *b, size_t sz) -{ - while (sz && *a && *b && *a == *b) - --sz, ++a, ++b; - if (!sz) - return 0; - return (int)(*(const unsigned char *)a) - (int)(*(const unsigned char *)b); -} - -int git__strncasecmp(const char *a, const char *b, size_t sz) -{ - int al, bl; - - do { - al = (unsigned char)git__tolower(*a); - bl = (unsigned char)git__tolower(*b); - ++a, ++b; - } while (--sz && al && al == bl); - - return al - bl; -} - -void git__strntolower(char *str, size_t len) -{ - size_t i; - - for (i = 0; i < len; ++i) { - str[i] = (char)git__tolower(str[i]); - } -} - -void git__strtolower(char *str) -{ - git__strntolower(str, strlen(str)); -} - -int git__prefixcmp(const char *str, const char *prefix) -{ - for (;;) { - unsigned char p = *(prefix++), s; - if (!p) - return 0; - if ((s = *(str++)) != p) - return s - p; - } -} - -int git__prefixcmp_icase(const char *str, const char *prefix) -{ - return strncasecmp(str, prefix, strlen(prefix)); -} - -int git__prefixncmp_icase(const char *str, size_t str_n, const char *prefix) -{ - int s, p; - - while(str_n--) { - s = (unsigned char)git__tolower(*str++); - p = (unsigned char)git__tolower(*prefix++); - - if (s != p) - return s - p; - } - - return (0 - *prefix); -} - -int git__suffixcmp(const char *str, const char *suffix) -{ - size_t a = strlen(str); - size_t b = strlen(suffix); - if (a < b) - return -1; - return strcmp(str + (a - b), suffix); -} - -char *git__strtok(char **end, const char *sep) -{ - char *ptr = *end; - - while (*ptr && strchr(sep, *ptr)) - ++ptr; - - if (*ptr) { - char *start = ptr; - *end = start + 1; - - while (**end && !strchr(sep, **end)) - ++*end; - - if (**end) { - **end = '\0'; - ++*end; - } - - return start; - } - - return NULL; -} - -/* Similar to strtok, but does not collapse repeated tokens. */ -char *git__strsep(char **end, const char *sep) -{ - char *start = *end, *ptr = *end; - - while (*ptr && !strchr(sep, *ptr)) - ++ptr; - - if (*ptr) { - *end = ptr + 1; - *ptr = '\0'; - - return start; - } - - return NULL; -} - -void git__hexdump(const char *buffer, size_t len) -{ - static const size_t LINE_WIDTH = 16; - - size_t line_count, last_line, i, j; - const char *line; - - line_count = (len / LINE_WIDTH); - last_line = (len % LINE_WIDTH); - - for (i = 0; i < line_count; ++i) { - line = buffer + (i * LINE_WIDTH); - for (j = 0; j < LINE_WIDTH; ++j, ++line) - printf("%02X ", (unsigned char)*line & 0xFF); - - printf("| "); - - line = buffer + (i * LINE_WIDTH); - for (j = 0; j < LINE_WIDTH; ++j, ++line) - printf("%c", (*line >= 32 && *line <= 126) ? *line : '.'); - - printf("\n"); - } - - if (last_line > 0) { - - line = buffer + (line_count * LINE_WIDTH); - for (j = 0; j < last_line; ++j, ++line) - printf("%02X ", (unsigned char)*line & 0xFF); - - for (j = 0; j < (LINE_WIDTH - last_line); ++j) - printf(" "); - - printf("| "); - - line = buffer + (line_count * LINE_WIDTH); - for (j = 0; j < last_line; ++j, ++line) - printf("%c", (*line >= 32 && *line <= 126) ? *line : '.'); - - printf("\n"); - } - - printf("\n"); -} - -#ifdef GIT_LEGACY_HASH -uint32_t git__hash(const void *key, int len, unsigned int seed) -{ - const uint32_t m = 0x5bd1e995; - const int r = 24; - uint32_t h = seed ^ len; - - const unsigned char *data = (const unsigned char *)key; - - while(len >= 4) { - uint32_t k = *(uint32_t *)data; - - k *= m; - k ^= k >> r; - k *= m; - - h *= m; - h ^= k; - - data += 4; - len -= 4; - } - - switch(len) { - case 3: h ^= data[2] << 16; - case 2: h ^= data[1] << 8; - case 1: h ^= data[0]; - h *= m; - }; - - h ^= h >> 13; - h *= m; - h ^= h >> 15; - - return h; -} -#else -/* - Cross-platform version of Murmurhash3 - http://code.google.com/p/smhasher/wiki/MurmurHash3 - by Austin Appleby (aappleby@gmail.com) - - This code is on the public domain. -*/ -uint32_t git__hash(const void *key, int len, uint32_t seed) -{ - -#define MURMUR_BLOCK() {\ - k1 *= c1; \ - k1 = git__rotl(k1,11);\ - k1 *= c2;\ - h1 ^= k1;\ - h1 = h1*3 + 0x52dce729;\ - c1 = c1*5 + 0x7b7d159c;\ - c2 = c2*5 + 0x6bce6396;\ -} - - const uint8_t *data = (const uint8_t*)key; - const int nblocks = len / 4; - - const uint32_t *blocks = (const uint32_t *)(data + nblocks * 4); - const uint8_t *tail = (const uint8_t *)(data + nblocks * 4); - - uint32_t h1 = 0x971e137b ^ seed; - uint32_t k1; - - uint32_t c1 = 0x95543787; - uint32_t c2 = 0x2ad7eb25; - - int i; - - for (i = -nblocks; i; i++) { - k1 = blocks[i]; - MURMUR_BLOCK(); - } - - k1 = 0; - - switch(len & 3) { - case 3: k1 ^= tail[2] << 16; - case 2: k1 ^= tail[1] << 8; - case 1: k1 ^= tail[0]; - MURMUR_BLOCK(); - } - - h1 ^= len; - h1 ^= h1 >> 16; - h1 *= 0x85ebca6b; - h1 ^= h1 >> 13; - h1 *= 0xc2b2ae35; - h1 ^= h1 >> 16; - - return h1; -} -#endif - -/** - * A modified `bsearch` from the BSD glibc. - * - * Copyright (c) 1990 Regents of the University of California. - * All rights reserved. - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. [rescinded 22 July 1999] - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -int git__bsearch( - void **array, - size_t array_len, - const void *key, - int (*compare)(const void *, const void *), - size_t *position) -{ - size_t lim; - int cmp = -1; - void **part, **base = array; - - for (lim = array_len; lim != 0; lim >>= 1) { - part = base + (lim >> 1); - cmp = (*compare)(key, *part); - if (cmp == 0) { - base = part; - break; - } - if (cmp > 0) { /* key > p; take right partition */ - base = part + 1; - lim--; - } /* else take left partition */ - } - - if (position) - *position = (base - array); - - return (cmp == 0) ? 0 : GIT_ENOTFOUND; -} - -int git__bsearch_r( - void **array, - size_t array_len, - const void *key, - int (*compare_r)(const void *, const void *, void *), - void *payload, - size_t *position) -{ - size_t lim; - int cmp = -1; - void **part, **base = array; - - for (lim = array_len; lim != 0; lim >>= 1) { - part = base + (lim >> 1); - cmp = (*compare_r)(key, *part, payload); - if (cmp == 0) { - base = part; - break; - } - if (cmp > 0) { /* key > p; take right partition */ - base = part + 1; - lim--; - } /* else take left partition */ - } - - if (position) - *position = (base - array); - - return (cmp == 0) ? 0 : GIT_ENOTFOUND; -} - -/** - * A strcmp wrapper - * - * We don't want direct pointers to the CRT on Windows, we may - * get stdcall conflicts. - */ -int git__strcmp_cb(const void *a, const void *b) -{ - return strcmp((const char *)a, (const char *)b); -} - -int git__strcasecmp_cb(const void *a, const void *b) -{ - return strcasecmp((const char *)a, (const char *)b); -} - -int git__parse_bool(int *out, const char *value) -{ - /* A missing value means true */ - if (value == NULL || - !strcasecmp(value, "true") || - !strcasecmp(value, "yes") || - !strcasecmp(value, "on")) { - *out = 1; - return 0; - } - if (!strcasecmp(value, "false") || - !strcasecmp(value, "no") || - !strcasecmp(value, "off") || - value[0] == '\0') { - *out = 0; - return 0; - } - - return -1; -} - -size_t git__unescape(char *str) -{ - char *scan, *pos = str; - - if (!str) - return 0; - - for (scan = str; *scan; pos++, scan++) { - if (*scan == '\\' && *(scan + 1) != '\0') - scan++; /* skip '\' but include next char */ - if (pos != scan) - *pos = *scan; - } - - if (pos != scan) { - *pos = '\0'; - } - - return (pos - str); -} - -#if defined(HAVE_QSORT_S) || (defined(HAVE_QSORT_R) && defined(BSD)) -typedef struct { - git__sort_r_cmp cmp; - void *payload; -} git__qsort_r_glue; - -static int GIT_STDLIB_CALL git__qsort_r_glue_cmp( - void *payload, const void *a, const void *b) -{ - git__qsort_r_glue *glue = payload; - return glue->cmp(a, b, glue->payload); -} -#endif - -void git__qsort_r( - void *els, size_t nel, size_t elsize, git__sort_r_cmp cmp, void *payload) -{ -#if defined(HAVE_QSORT_R) && defined(BSD) - git__qsort_r_glue glue = { cmp, payload }; - qsort_r(els, nel, elsize, &glue, git__qsort_r_glue_cmp); -#elif defined(HAVE_QSORT_R) && defined(__GLIBC__) - qsort_r(els, nel, elsize, cmp, payload); -#elif defined(HAVE_QSORT_S) - git__qsort_r_glue glue = { cmp, payload }; - qsort_s(els, nel, elsize, git__qsort_r_glue_cmp, &glue); -#else - git__insertsort_r(els, nel, elsize, NULL, cmp, payload); -#endif -} - -void git__insertsort_r( - void *els, size_t nel, size_t elsize, void *swapel, - git__sort_r_cmp cmp, void *payload) -{ - uint8_t *base = els; - uint8_t *end = base + nel * elsize; - uint8_t *i, *j; - bool freeswap = !swapel; - - if (freeswap) - swapel = git__malloc(elsize); - - for (i = base + elsize; i < end; i += elsize) - for (j = i; j > base && cmp(j, j - elsize, payload) < 0; j -= elsize) { - memcpy(swapel, j, elsize); - memcpy(j, j - elsize, elsize); - memcpy(j - elsize, swapel, elsize); - } - - if (freeswap) - git__free(swapel); -} - -/* - * git__utf8_iterate is taken from the utf8proc project, - * http://www.public-software-group.org/utf8proc - * - * Copyright (c) 2009 Public Software Group e. V., Berlin, Germany - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the ""Software""), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ - -static const int8_t utf8proc_utf8class[256] = { - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 4, 4, 4, 4, 4, 4, 4, 4, 0, 0, 0, 0, 0, 0, 0, 0 -}; - -int git__utf8_charlen(const uint8_t *str, int str_len) -{ - int length, i; - - length = utf8proc_utf8class[str[0]]; - if (!length) - return -1; - - if (str_len >= 0 && length > str_len) - return -str_len; - - for (i = 1; i < length; i++) { - if ((str[i] & 0xC0) != 0x80) - return -i; - } - - return length; -} - -int git__utf8_iterate(const uint8_t *str, int str_len, int32_t *dst) -{ - int length; - int32_t uc = -1; - - *dst = -1; - length = git__utf8_charlen(str, str_len); - if (length < 0) - return -1; - - switch (length) { - case 1: - uc = str[0]; - break; - case 2: - uc = ((str[0] & 0x1F) << 6) + (str[1] & 0x3F); - if (uc < 0x80) uc = -1; - break; - case 3: - uc = ((str[0] & 0x0F) << 12) + ((str[1] & 0x3F) << 6) - + (str[2] & 0x3F); - if (uc < 0x800 || (uc >= 0xD800 && uc < 0xE000) || - (uc >= 0xFDD0 && uc < 0xFDF0)) uc = -1; - break; - case 4: - uc = ((str[0] & 0x07) << 18) + ((str[1] & 0x3F) << 12) - + ((str[2] & 0x3F) << 6) + (str[3] & 0x3F); - if (uc < 0x10000 || uc >= 0x110000) uc = -1; - break; - } - - if (uc < 0 || ((uc & 0xFFFF) >= 0xFFFE)) - return -1; - - *dst = uc; - return length; -} - -#ifdef GIT_WIN32 -int git__getenv(git_buf *out, const char *name) -{ - wchar_t *wide_name = NULL, *wide_value = NULL; - DWORD value_len; - int error = -1; - - git_buf_clear(out); - - if (git__utf8_to_16_alloc(&wide_name, name) < 0) - return -1; - - if ((value_len = GetEnvironmentVariableW(wide_name, NULL, 0)) > 0) { - wide_value = git__malloc(value_len * sizeof(wchar_t)); - GITERR_CHECK_ALLOC(wide_value); - - value_len = GetEnvironmentVariableW(wide_name, wide_value, value_len); - } - - if (value_len) - error = git_buf_put_w(out, wide_value, value_len); - else if (GetLastError() == ERROR_ENVVAR_NOT_FOUND) - error = GIT_ENOTFOUND; - else - giterr_set(GITERR_OS, "could not read environment variable '%s'", name); - - git__free(wide_name); - git__free(wide_value); - return error; -} -#else -int git__getenv(git_buf *out, const char *name) -{ - const char *val = getenv(name); - - git_buf_clear(out); - - if (!val) - return GIT_ENOTFOUND; - - return git_buf_puts(out, val); -} -#endif diff --git a/vendor/libgit2/src/util.h b/vendor/libgit2/src/util.h deleted file mode 100644 index d0c3cd04a..000000000 --- a/vendor/libgit2/src/util.h +++ /dev/null @@ -1,607 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_util_h__ -#define INCLUDE_util_h__ - -#include "git2/buffer.h" -#include "buffer.h" - -#if defined(GIT_MSVC_CRTDBG) -/* Enable MSVC CRTDBG memory leak reporting. - * - * We DO NOT use the "_CRTDBG_MAP_ALLOC" macro described in the MSVC - * documentation because all allocs/frees in libgit2 already go through - * the "git__" routines defined in this file. Simply using the normal - * reporting mechanism causes all leaks to be attributed to a routine - * here in util.h (ie, the actual call to calloc()) rather than the - * caller of git__calloc(). - * - * Therefore, we declare a set of "git__crtdbg__" routines to replace - * the corresponding "git__" routines and re-define the "git__" symbols - * as macros. This allows us to get and report the file:line info of - * the real caller. - * - * We DO NOT replace the "git__free" routine because it needs to remain - * a function pointer because it is used as a function argument when - * setting up various structure "destructors". - * - * We also DO NOT use the "_CRTDBG_MAP_ALLOC" macro because it causes - * "free" to be remapped to "_free_dbg" and this causes problems for - * structures which define a field named "free". - * - * Finally, CRTDBG must be explicitly enabled and configured at program - * startup. See tests/main.c for an example. - */ -#include -#include -#include "win32/w32_crtdbg_stacktrace.h" -#endif - -#include "common.h" -#include "strnlen.h" - -#define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0])) -#define bitsizeof(x) (CHAR_BIT * sizeof(x)) -#define MSB(x, bits) ((x) & (~0ULL << (bitsizeof(x) - (bits)))) -#ifndef min -# define min(a,b) ((a) < (b) ? (a) : (b)) -#endif -#ifndef max -# define max(a,b) ((a) > (b) ? (a) : (b)) -#endif - -#define GIT_DATE_RFC2822_SZ 32 - -/** - * Return the length of a constant string. - * We are aware that `strlen` performs the same task and is usually - * optimized away by the compiler, whilst being safer because it returns - * valid values when passed a pointer instead of a constant string; however - * this macro will transparently work with wide-char and single-char strings. - */ -#define CONST_STRLEN(x) ((sizeof(x)/sizeof(x[0])) - 1) - -#if defined(GIT_MSVC_CRTDBG) - -GIT_INLINE(void *) git__crtdbg__malloc(size_t len, const char *file, int line) -{ - void *ptr = _malloc_dbg(len, _NORMAL_BLOCK, git_win32__crtdbg_stacktrace(1,file), line); - if (!ptr) giterr_set_oom(); - return ptr; -} - -GIT_INLINE(void *) git__crtdbg__calloc(size_t nelem, size_t elsize, const char *file, int line) -{ - void *ptr = _calloc_dbg(nelem, elsize, _NORMAL_BLOCK, git_win32__crtdbg_stacktrace(1,file), line); - if (!ptr) giterr_set_oom(); - return ptr; -} - -GIT_INLINE(char *) git__crtdbg__strdup(const char *str, const char *file, int line) -{ - char *ptr = _strdup_dbg(str, _NORMAL_BLOCK, git_win32__crtdbg_stacktrace(1,file), line); - if (!ptr) giterr_set_oom(); - return ptr; -} - -GIT_INLINE(char *) git__crtdbg__strndup(const char *str, size_t n, const char *file, int line) -{ - size_t length = 0, alloclength; - char *ptr; - - length = p_strnlen(str, n); - - if (GIT_ADD_SIZET_OVERFLOW(&alloclength, length, 1) || - !(ptr = git__crtdbg__malloc(alloclength, file, line))) - return NULL; - - if (length) - memcpy(ptr, str, length); - - ptr[length] = '\0'; - - return ptr; -} - -GIT_INLINE(char *) git__crtdbg__substrdup(const char *start, size_t n, const char *file, int line) -{ - char *ptr; - size_t alloclen; - - if (GIT_ADD_SIZET_OVERFLOW(&alloclen, n, 1) || - !(ptr = git__crtdbg__malloc(alloclen, file, line))) - return NULL; - - memcpy(ptr, start, n); - ptr[n] = '\0'; - return ptr; -} - -GIT_INLINE(void *) git__crtdbg__realloc(void *ptr, size_t size, const char *file, int line) -{ - void *new_ptr = _realloc_dbg(ptr, size, _NORMAL_BLOCK, git_win32__crtdbg_stacktrace(1,file), line); - if (!new_ptr) giterr_set_oom(); - return new_ptr; -} - -GIT_INLINE(void *) git__crtdbg__reallocarray(void *ptr, size_t nelem, size_t elsize, const char *file, int line) -{ - size_t newsize; - - return GIT_MULTIPLY_SIZET_OVERFLOW(&newsize, nelem, elsize) ? - NULL : _realloc_dbg(ptr, newsize, _NORMAL_BLOCK, git_win32__crtdbg_stacktrace(1,file), line); -} - -GIT_INLINE(void *) git__crtdbg__mallocarray(size_t nelem, size_t elsize, const char *file, int line) -{ - return git__crtdbg__reallocarray(NULL, nelem, elsize, file, line); -} - -#define git__malloc(len) git__crtdbg__malloc(len, __FILE__, __LINE__) -#define git__calloc(nelem, elsize) git__crtdbg__calloc(nelem, elsize, __FILE__, __LINE__) -#define git__strdup(str) git__crtdbg__strdup(str, __FILE__, __LINE__) -#define git__strndup(str, n) git__crtdbg__strndup(str, n, __FILE__, __LINE__) -#define git__substrdup(str, n) git__crtdbg__substrdup(str, n, __FILE__, __LINE__) -#define git__realloc(ptr, size) git__crtdbg__realloc(ptr, size, __FILE__, __LINE__) -#define git__reallocarray(ptr, nelem, elsize) git__crtdbg__reallocarray(ptr, nelem, elsize, __FILE__, __LINE__) -#define git__mallocarray(nelem, elsize) git__crtdbg__mallocarray(nelem, elsize, __FILE__, __LINE__) - -#else - -/* - * Custom memory allocation wrappers - * that set error code and error message - * on allocation failure - */ -GIT_INLINE(void *) git__malloc(size_t len) -{ - void *ptr = malloc(len); - if (!ptr) giterr_set_oom(); - return ptr; -} - -GIT_INLINE(void *) git__calloc(size_t nelem, size_t elsize) -{ - void *ptr = calloc(nelem, elsize); - if (!ptr) giterr_set_oom(); - return ptr; -} - -GIT_INLINE(char *) git__strdup(const char *str) -{ - char *ptr = strdup(str); - if (!ptr) giterr_set_oom(); - return ptr; -} - -GIT_INLINE(char *) git__strndup(const char *str, size_t n) -{ - size_t length = 0, alloclength; - char *ptr; - - length = p_strnlen(str, n); - - if (GIT_ADD_SIZET_OVERFLOW(&alloclength, length, 1) || - !(ptr = git__malloc(alloclength))) - return NULL; - - if (length) - memcpy(ptr, str, length); - - ptr[length] = '\0'; - - return ptr; -} - -/* NOTE: This doesn't do null or '\0' checking. Watch those boundaries! */ -GIT_INLINE(char *) git__substrdup(const char *start, size_t n) -{ - char *ptr; - size_t alloclen; - - if (GIT_ADD_SIZET_OVERFLOW(&alloclen, n, 1) || - !(ptr = git__malloc(alloclen))) - return NULL; - - memcpy(ptr, start, n); - ptr[n] = '\0'; - return ptr; -} - -GIT_INLINE(void *) git__realloc(void *ptr, size_t size) -{ - void *new_ptr = realloc(ptr, size); - if (!new_ptr) giterr_set_oom(); - return new_ptr; -} - -/** - * Similar to `git__realloc`, except that it is suitable for reallocing an - * array to a new number of elements of `nelem`, each of size `elsize`. - * The total size calculation is checked for overflow. - */ -GIT_INLINE(void *) git__reallocarray(void *ptr, size_t nelem, size_t elsize) -{ - size_t newsize; - return GIT_MULTIPLY_SIZET_OVERFLOW(&newsize, nelem, elsize) ? - NULL : realloc(ptr, newsize); -} - -/** - * Similar to `git__calloc`, except that it does not zero memory. - */ -GIT_INLINE(void *) git__mallocarray(size_t nelem, size_t elsize) -{ - return git__reallocarray(NULL, nelem, elsize); -} - -#endif /* !MSVC_CTRDBG */ - -GIT_INLINE(void) git__free(void *ptr) -{ - free(ptr); -} - -#define STRCMP_CASESELECT(IGNORE_CASE, STR1, STR2) \ - ((IGNORE_CASE) ? strcasecmp((STR1), (STR2)) : strcmp((STR1), (STR2))) - -#define CASESELECT(IGNORE_CASE, ICASE, CASE) \ - ((IGNORE_CASE) ? (ICASE) : (CASE)) - -extern int git__prefixcmp(const char *str, const char *prefix); -extern int git__prefixcmp_icase(const char *str, const char *prefix); -extern int git__prefixncmp_icase(const char *str, size_t str_n, const char *prefix); -extern int git__suffixcmp(const char *str, const char *suffix); - -GIT_INLINE(int) git__signum(int val) -{ - return ((val > 0) - (val < 0)); -} - -extern int git__strtol32(int32_t *n, const char *buff, const char **end_buf, int base); -extern int git__strtol64(int64_t *n, const char *buff, const char **end_buf, int base); - -extern void git__hexdump(const char *buffer, size_t n); -extern uint32_t git__hash(const void *key, int len, uint32_t seed); - -/* 32-bit cross-platform rotl */ -#ifdef _MSC_VER /* use built-in method in MSVC */ -# define git__rotl(v, s) (uint32_t)_rotl(v, s) -#else /* use bitops in GCC; with o2 this gets optimized to a rotl instruction */ -# define git__rotl(v, s) (uint32_t)(((uint32_t)(v) << (s)) | ((uint32_t)(v) >> (32 - (s)))) -#endif - -extern char *git__strtok(char **end, const char *sep); -extern char *git__strsep(char **end, const char *sep); - -extern void git__strntolower(char *str, size_t len); -extern void git__strtolower(char *str); - -#ifdef GIT_WIN32 -GIT_INLINE(int) git__tolower(int c) -{ - return (c >= 'A' && c <= 'Z') ? (c + 32) : c; -} -#else -# define git__tolower(a) tolower(a) -#endif - -GIT_INLINE(const char *) git__next_line(const char *s) -{ - while (*s && *s != '\n') s++; - while (*s == '\n' || *s == '\r') s++; - return s; -} - -GIT_INLINE(const void *) git__memrchr(const void *s, int c, size_t n) -{ - const unsigned char *cp; - - if (n != 0) { - cp = (unsigned char *)s + n; - do { - if (*(--cp) == (unsigned char)c) - return cp; - } while (--n != 0); - } - - return NULL; -} - -typedef int (*git__tsort_cmp)(const void *a, const void *b); - -extern void git__tsort(void **dst, size_t size, git__tsort_cmp cmp); - -typedef int (*git__sort_r_cmp)(const void *a, const void *b, void *payload); - -extern void git__tsort_r( - void **dst, size_t size, git__sort_r_cmp cmp, void *payload); - -extern void git__qsort_r( - void *els, size_t nel, size_t elsize, git__sort_r_cmp cmp, void *payload); - -extern void git__insertsort_r( - void *els, size_t nel, size_t elsize, void *swapel, - git__sort_r_cmp cmp, void *payload); - -/** - * @param position If non-NULL, this will be set to the position where the - * element is or would be inserted if not found. - * @return 0 if found; GIT_ENOTFOUND if not found - */ -extern int git__bsearch( - void **array, - size_t array_len, - const void *key, - int (*compare)(const void *key, const void *element), - size_t *position); - -extern int git__bsearch_r( - void **array, - size_t array_len, - const void *key, - int (*compare_r)(const void *key, const void *element, void *payload), - void *payload, - size_t *position); - -extern int git__strcmp_cb(const void *a, const void *b); -extern int git__strcasecmp_cb(const void *a, const void *b); - -extern int git__strcmp(const char *a, const char *b); -extern int git__strcasecmp(const char *a, const char *b); -extern int git__strncmp(const char *a, const char *b, size_t sz); -extern int git__strncasecmp(const char *a, const char *b, size_t sz); - -extern int git__strcasesort_cmp(const char *a, const char *b); - -#include "thread-utils.h" - -typedef struct { - git_atomic refcount; - void *owner; -} git_refcount; - -typedef void (*git_refcount_freeptr)(void *r); - -#define GIT_REFCOUNT_INC(r) { \ - git_atomic_inc(&((git_refcount *)(r))->refcount); \ -} - -#define GIT_REFCOUNT_DEC(_r, do_free) { \ - git_refcount *r = (git_refcount *)(_r); \ - int val = git_atomic_dec(&r->refcount); \ - if (val <= 0 && r->owner == NULL) { do_free(_r); } \ -} - -#define GIT_REFCOUNT_OWN(r, o) { \ - ((git_refcount *)(r))->owner = o; \ -} - -#define GIT_REFCOUNT_OWNER(r) (((git_refcount *)(r))->owner) - -#define GIT_REFCOUNT_VAL(r) git_atomic_get(&((git_refcount *)(r))->refcount) - - -static signed char from_hex[] = { --1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 00 */ --1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 10 */ --1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 20 */ - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, -1, -1, -1, -1, -1, -1, /* 30 */ --1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 40 */ --1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 50 */ --1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 60 */ --1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 70 */ --1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 80 */ --1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 90 */ --1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* a0 */ --1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* b0 */ --1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* c0 */ --1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* d0 */ --1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* e0 */ --1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* f0 */ -}; - -GIT_INLINE(int) git__fromhex(char h) -{ - return from_hex[(unsigned char) h]; -} - -GIT_INLINE(int) git__ishex(const char *str) -{ - unsigned i; - for (i=0; str[i] != '\0'; i++) - if (git__fromhex(str[i]) < 0) - return 0; - return 1; -} - -GIT_INLINE(size_t) git__size_t_bitmask(size_t v) -{ - v--; - v |= v >> 1; - v |= v >> 2; - v |= v >> 4; - v |= v >> 8; - v |= v >> 16; - - return v; -} - -GIT_INLINE(size_t) git__size_t_powerof2(size_t v) -{ - return git__size_t_bitmask(v) + 1; -} - -GIT_INLINE(bool) git__isupper(int c) -{ - return (c >= 'A' && c <= 'Z'); -} - -GIT_INLINE(bool) git__isalpha(int c) -{ - return ((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z')); -} - -GIT_INLINE(bool) git__isdigit(int c) -{ - return (c >= '0' && c <= '9'); -} - -GIT_INLINE(bool) git__isspace(int c) -{ - return (c == ' ' || c == '\t' || c == '\n' || c == '\f' || c == '\r' || c == '\v'); -} - -GIT_INLINE(bool) git__isspace_nonlf(int c) -{ - return (c == ' ' || c == '\t' || c == '\f' || c == '\r' || c == '\v'); -} - -GIT_INLINE(bool) git__iswildcard(int c) -{ - return (c == '*' || c == '?' || c == '['); -} - -/* - * Parse a string value as a boolean, just like Core Git does. - * - * Valid values for true are: 'true', 'yes', 'on' - * Valid values for false are: 'false', 'no', 'off' - */ -extern int git__parse_bool(int *out, const char *value); - -/* - * Parse a string into a value as a git_time_t. - * - * Sample valid input: - * - "yesterday" - * - "July 17, 2003" - * - "2003-7-17 08:23" - */ -extern int git__date_parse(git_time_t *out, const char *date); - -/* - * Format a git_time as a RFC2822 string - * - * @param out buffer to store formatted date; a '\\0' terminator will automatically be added. - * @param len size of the buffer; should be atleast `GIT_DATE_RFC2822_SZ` in size; - * @param date the date to be formatted - * @return 0 if successful; -1 on error - */ -extern int git__date_rfc2822_fmt(char *out, size_t len, const git_time *date); - -/* - * Unescapes a string in-place. - * - * Edge cases behavior: - * - "jackie\" -> "jacky\" - * - "chan\\" -> "chan\" - */ -extern size_t git__unescape(char *str); - -/* - * Iterate through an UTF-8 string, yielding one - * codepoint at a time. - * - * @param str current position in the string - * @param str_len size left in the string; -1 if the string is NULL-terminated - * @param dst pointer where to store the current codepoint - * @return length in bytes of the read codepoint; -1 if the codepoint was invalid - */ -extern int git__utf8_iterate(const uint8_t *str, int str_len, int32_t *dst); - -/* - * Safely zero-out memory, making sure that the compiler - * doesn't optimize away the operation. - */ -GIT_INLINE(void) git__memzero(void *data, size_t size) -{ -#ifdef _MSC_VER - SecureZeroMemory((PVOID)data, size); -#else - volatile uint8_t *scan = (volatile uint8_t *)data; - - while (size--) - *scan++ = 0x0; -#endif -} - -#ifdef GIT_WIN32 - -GIT_INLINE(double) git__timer(void) -{ - /* We need the initial tick count to detect if the tick - * count has rolled over. */ - static DWORD initial_tick_count = 0; - - /* GetTickCount returns the number of milliseconds that have - * elapsed since the system was started. */ - DWORD count = GetTickCount(); - - if(initial_tick_count == 0) { - initial_tick_count = count; - } else if (count < initial_tick_count) { - /* The tick count has rolled over - adjust for it. */ - count = (0xFFFFFFFF - initial_tick_count) + count; - } - - return (double) count / (double) 1000; -} - -#elif __APPLE__ - -#include - -GIT_INLINE(double) git__timer(void) -{ - uint64_t time = mach_absolute_time(); - static double scaling_factor = 0; - - if (scaling_factor == 0) { - mach_timebase_info_data_t info; - (void)mach_timebase_info(&info); - scaling_factor = (double)info.numer / (double)info.denom; - } - - return (double)time * scaling_factor / 1.0E9; -} - -#elif defined(AMIGA) - -#include - -GIT_INLINE(double) git__timer(void) -{ - struct TimeVal tv; - ITimer->GetUpTime(&tv); - return (double)tv.Seconds + (double)tv.Microseconds / 1.0E6; -} - -#else - -#include - -GIT_INLINE(double) git__timer(void) -{ - struct timespec tp; - - if (clock_gettime(CLOCK_MONOTONIC, &tp) == 0) { - return (double) tp.tv_sec + (double) tp.tv_nsec / 1.0E9; - } else { - /* Fall back to using gettimeofday */ - struct timeval tv; - struct timezone tz; - gettimeofday(&tv, &tz); - return (double)tv.tv_sec + (double)tv.tv_usec / 1.0E6; - } -} - -#endif - -extern int git__getenv(git_buf *out, const char *name); - -#endif /* INCLUDE_util_h__ */ diff --git a/vendor/libgit2/src/vector.c b/vendor/libgit2/src/vector.c deleted file mode 100644 index a81d463ef..000000000 --- a/vendor/libgit2/src/vector.c +++ /dev/null @@ -1,361 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "common.h" -#include "vector.h" - -/* In elements, not bytes */ -#define MIN_ALLOCSIZE 8 - -GIT_INLINE(size_t) compute_new_size(git_vector *v) -{ - size_t new_size = v->_alloc_size; - - /* Use a resize factor of 1.5, which is quick to compute using integer - * instructions and less than the golden ratio (1.618...) */ - if (new_size < MIN_ALLOCSIZE) - new_size = MIN_ALLOCSIZE; - else if (new_size <= (SIZE_MAX / 3) * 2) - new_size += new_size / 2; - else - new_size = SIZE_MAX; - - return new_size; -} - -GIT_INLINE(int) resize_vector(git_vector *v, size_t new_size) -{ - void *new_contents; - - new_contents = git__reallocarray(v->contents, new_size, sizeof(void *)); - GITERR_CHECK_ALLOC(new_contents); - - v->_alloc_size = new_size; - v->contents = new_contents; - - return 0; -} - -int git_vector_size_hint(git_vector *v, size_t size_hint) -{ - if (v->_alloc_size >= size_hint) - return 0; - return resize_vector(v, size_hint); -} - -int git_vector_dup(git_vector *v, const git_vector *src, git_vector_cmp cmp) -{ - size_t bytes; - - assert(v && src); - - GITERR_CHECK_ALLOC_MULTIPLY(&bytes, src->length, sizeof(void *)); - - v->_alloc_size = src->length; - v->_cmp = cmp ? cmp : src->_cmp; - v->length = src->length; - v->flags = src->flags; - if (cmp != src->_cmp) - git_vector_set_sorted(v, 0); - v->contents = git__malloc(bytes); - GITERR_CHECK_ALLOC(v->contents); - - memcpy(v->contents, src->contents, bytes); - - return 0; -} - -void git_vector_free(git_vector *v) -{ - assert(v); - - git__free(v->contents); - v->contents = NULL; - - v->length = 0; - v->_alloc_size = 0; -} - -void git_vector_free_deep(git_vector *v) -{ - size_t i; - - assert(v); - - for (i = 0; i < v->length; ++i) { - git__free(v->contents[i]); - v->contents[i] = NULL; - } - - git_vector_free(v); -} - -int git_vector_init(git_vector *v, size_t initial_size, git_vector_cmp cmp) -{ - assert(v); - - v->_alloc_size = 0; - v->_cmp = cmp; - v->length = 0; - v->flags = GIT_VECTOR_SORTED; - v->contents = NULL; - - return resize_vector(v, max(initial_size, MIN_ALLOCSIZE)); -} - -void **git_vector_detach(size_t *size, size_t *asize, git_vector *v) -{ - void **data = v->contents; - - if (size) - *size = v->length; - if (asize) - *asize = v->_alloc_size; - - v->_alloc_size = 0; - v->length = 0; - v->contents = NULL; - - return data; -} - -int git_vector_insert(git_vector *v, void *element) -{ - assert(v); - - if (v->length >= v->_alloc_size && - resize_vector(v, compute_new_size(v)) < 0) - return -1; - - v->contents[v->length++] = element; - - git_vector_set_sorted(v, v->length <= 1); - - return 0; -} - -int git_vector_insert_sorted( - git_vector *v, void *element, int (*on_dup)(void **old, void *new)) -{ - int result; - size_t pos; - - assert(v && v->_cmp); - - if (!git_vector_is_sorted(v)) - git_vector_sort(v); - - if (v->length >= v->_alloc_size && - resize_vector(v, compute_new_size(v)) < 0) - return -1; - - /* If we find the element and have a duplicate handler callback, - * invoke it. If it returns non-zero, then cancel insert, otherwise - * proceed with normal insert. - */ - if (!git__bsearch(v->contents, v->length, element, v->_cmp, &pos) && - on_dup && (result = on_dup(&v->contents[pos], element)) < 0) - return result; - - /* shift elements to the right */ - if (pos < v->length) - memmove(v->contents + pos + 1, v->contents + pos, - (v->length - pos) * sizeof(void *)); - - v->contents[pos] = element; - v->length++; - - return 0; -} - -void git_vector_sort(git_vector *v) -{ - assert(v); - - if (git_vector_is_sorted(v) || !v->_cmp) - return; - - if (v->length > 1) - git__tsort(v->contents, v->length, v->_cmp); - git_vector_set_sorted(v, 1); -} - -int git_vector_bsearch2( - size_t *at_pos, - git_vector *v, - git_vector_cmp key_lookup, - const void *key) -{ - assert(v && key && key_lookup); - - /* need comparison function to sort the vector */ - if (!v->_cmp) - return -1; - - git_vector_sort(v); - - return git__bsearch(v->contents, v->length, key, key_lookup, at_pos); -} - -int git_vector_search2( - size_t *at_pos, const git_vector *v, git_vector_cmp key_lookup, const void *key) -{ - size_t i; - - assert(v && key && key_lookup); - - for (i = 0; i < v->length; ++i) { - if (key_lookup(key, v->contents[i]) == 0) { - if (at_pos) - *at_pos = i; - - return 0; - } - } - - return GIT_ENOTFOUND; -} - -static int strict_comparison(const void *a, const void *b) -{ - return (a == b) ? 0 : -1; -} - -int git_vector_search(size_t *at_pos, const git_vector *v, const void *entry) -{ - return git_vector_search2(at_pos, v, v->_cmp ? v->_cmp : strict_comparison, entry); -} - -int git_vector_remove(git_vector *v, size_t idx) -{ - size_t shift_count; - - assert(v); - - if (idx >= v->length) - return GIT_ENOTFOUND; - - shift_count = v->length - idx - 1; - - if (shift_count) - memmove(&v->contents[idx], &v->contents[idx + 1], - shift_count * sizeof(void *)); - - v->length--; - return 0; -} - -void git_vector_pop(git_vector *v) -{ - if (v->length > 0) - v->length--; -} - -void git_vector_uniq(git_vector *v, void (*git_free_cb)(void *)) -{ - git_vector_cmp cmp; - size_t i, j; - - if (v->length <= 1) - return; - - git_vector_sort(v); - cmp = v->_cmp ? v->_cmp : strict_comparison; - - for (i = 0, j = 1 ; j < v->length; ++j) - if (!cmp(v->contents[i], v->contents[j])) { - if (git_free_cb) - git_free_cb(v->contents[i]); - - v->contents[i] = v->contents[j]; - } else - v->contents[++i] = v->contents[j]; - - v->length -= j - i - 1; -} - -void git_vector_remove_matching( - git_vector *v, - int (*match)(const git_vector *v, size_t idx, void *payload), - void *payload) -{ - size_t i, j; - - for (i = 0, j = 0; j < v->length; ++j) { - v->contents[i] = v->contents[j]; - - if (!match(v, i, payload)) - i++; - } - - v->length = i; -} - -void git_vector_clear(git_vector *v) -{ - assert(v); - v->length = 0; - git_vector_set_sorted(v, 1); -} - -void git_vector_swap(git_vector *a, git_vector *b) -{ - git_vector t; - - assert(a && b); - - if (a != b) { - memcpy(&t, a, sizeof(t)); - memcpy(a, b, sizeof(t)); - memcpy(b, &t, sizeof(t)); - } -} - -int git_vector_resize_to(git_vector *v, size_t new_length) -{ - if (new_length > v->_alloc_size && - resize_vector(v, new_length) < 0) - return -1; - - if (new_length > v->length) - memset(&v->contents[v->length], 0, - sizeof(void *) * (new_length - v->length)); - - v->length = new_length; - - return 0; -} - -int git_vector_set(void **old, git_vector *v, size_t position, void *value) -{ - if (position + 1 > v->length) { - if (git_vector_resize_to(v, position + 1) < 0) - return -1; - } - - if (old != NULL) - *old = v->contents[position]; - - v->contents[position] = value; - - return 0; -} - -int git_vector_verify_sorted(const git_vector *v) -{ - size_t i; - - if (!git_vector_is_sorted(v)) - return -1; - - for (i = 1; i < v->length; ++i) { - if (v->_cmp(v->contents[i - 1], v->contents[i]) > 0) - return -1; - } - - return 0; -} diff --git a/vendor/libgit2/src/vector.h b/vendor/libgit2/src/vector.h deleted file mode 100644 index b7500ded3..000000000 --- a/vendor/libgit2/src/vector.h +++ /dev/null @@ -1,118 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_vector_h__ -#define INCLUDE_vector_h__ - -#include "common.h" - -typedef int (*git_vector_cmp)(const void *, const void *); - -enum { - GIT_VECTOR_SORTED = (1u << 0), - GIT_VECTOR_FLAG_MAX = (1u << 1), -}; - -typedef struct git_vector { - size_t _alloc_size; - git_vector_cmp _cmp; - void **contents; - size_t length; - uint32_t flags; -} git_vector; - -#define GIT_VECTOR_INIT {0} - -int git_vector_init(git_vector *v, size_t initial_size, git_vector_cmp cmp); -void git_vector_free(git_vector *v); -void git_vector_free_deep(git_vector *v); /* free each entry and self */ -void git_vector_clear(git_vector *v); -int git_vector_dup(git_vector *v, const git_vector *src, git_vector_cmp cmp); -void git_vector_swap(git_vector *a, git_vector *b); -int git_vector_size_hint(git_vector *v, size_t size_hint); - -void **git_vector_detach(size_t *size, size_t *asize, git_vector *v); - -void git_vector_sort(git_vector *v); - -/** Linear search for matching entry using internal comparison function */ -int git_vector_search(size_t *at_pos, const git_vector *v, const void *entry); - -/** Linear search for matching entry using explicit comparison function */ -int git_vector_search2(size_t *at_pos, const git_vector *v, git_vector_cmp cmp, const void *key); - -/** - * Binary search for matching entry using explicit comparison function that - * returns position where item would go if not found. - */ -int git_vector_bsearch2( - size_t *at_pos, git_vector *v, git_vector_cmp cmp, const void *key); - -/** Binary search for matching entry using internal comparison function */ -GIT_INLINE(int) git_vector_bsearch(size_t *at_pos, git_vector *v, const void *key) -{ - return git_vector_bsearch2(at_pos, v, v->_cmp, key); -} - -GIT_INLINE(void *) git_vector_get(const git_vector *v, size_t position) -{ - return (position < v->length) ? v->contents[position] : NULL; -} - -#define GIT_VECTOR_GET(V,I) ((I) < (V)->length ? (V)->contents[(I)] : NULL) - -GIT_INLINE(size_t) git_vector_length(const git_vector *v) -{ - return v->length; -} - -GIT_INLINE(void *) git_vector_last(const git_vector *v) -{ - return (v->length > 0) ? git_vector_get(v, v->length - 1) : NULL; -} - -#define git_vector_foreach(v, iter, elem) \ - for ((iter) = 0; (iter) < (v)->length && ((elem) = (v)->contents[(iter)], 1); (iter)++ ) - -#define git_vector_rforeach(v, iter, elem) \ - for ((iter) = (v)->length - 1; (iter) < SIZE_MAX && ((elem) = (v)->contents[(iter)], 1); (iter)-- ) - -int git_vector_insert(git_vector *v, void *element); -int git_vector_insert_sorted(git_vector *v, void *element, - int (*on_dup)(void **old, void *new)); -int git_vector_remove(git_vector *v, size_t idx); -void git_vector_pop(git_vector *v); -void git_vector_uniq(git_vector *v, void (*git_free_cb)(void *)); - -void git_vector_remove_matching( - git_vector *v, - int (*match)(const git_vector *v, size_t idx, void *payload), - void *payload); - -int git_vector_resize_to(git_vector *v, size_t new_length); -int git_vector_set(void **old, git_vector *v, size_t position, void *value); - -/** Check if vector is sorted */ -#define git_vector_is_sorted(V) (((V)->flags & GIT_VECTOR_SORTED) != 0) - -/** Directly set sorted state of vector */ -#define git_vector_set_sorted(V,S) do { \ - (V)->flags = (S) ? ((V)->flags | GIT_VECTOR_SORTED) : \ - ((V)->flags & ~GIT_VECTOR_SORTED); } while (0) - -/** Set the comparison function used for sorting the vector */ -GIT_INLINE(void) git_vector_set_cmp(git_vector *v, git_vector_cmp cmp) -{ - if (cmp != v->_cmp) { - v->_cmp = cmp; - git_vector_set_sorted(v, 0); - } -} - -/* Just use this in tests, not for realz. returns -1 if not sorted */ -int git_vector_verify_sorted(const git_vector *v); - -#endif diff --git a/vendor/libgit2/src/win32/dir.c b/vendor/libgit2/src/win32/dir.c deleted file mode 100644 index c15757085..000000000 --- a/vendor/libgit2/src/win32/dir.c +++ /dev/null @@ -1,119 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#define GIT__WIN32_NO_WRAP_DIR -#include "posix.h" - -git__DIR *git__opendir(const char *dir) -{ - git_win32_path filter_w; - git__DIR *new = NULL; - size_t dirlen, alloclen; - - if (!dir || !git_win32__findfirstfile_filter(filter_w, dir)) - return NULL; - - dirlen = strlen(dir); - - if (GIT_ADD_SIZET_OVERFLOW(&alloclen, sizeof(*new), dirlen) || - GIT_ADD_SIZET_OVERFLOW(&alloclen, alloclen, 1) || - !(new = git__calloc(1, alloclen))) - return NULL; - - memcpy(new->dir, dir, dirlen); - - new->h = FindFirstFileW(filter_w, &new->f); - - if (new->h == INVALID_HANDLE_VALUE) { - giterr_set(GITERR_OS, "Could not open directory '%s'", dir); - git__free(new); - return NULL; - } - - new->first = 1; - return new; -} - -int git__readdir_ext( - git__DIR *d, - struct git__dirent *entry, - struct git__dirent **result, - int *is_dir) -{ - if (!d || !entry || !result || d->h == INVALID_HANDLE_VALUE) - return -1; - - *result = NULL; - - if (d->first) - d->first = 0; - else if (!FindNextFileW(d->h, &d->f)) { - if (GetLastError() == ERROR_NO_MORE_FILES) - return 0; - giterr_set(GITERR_OS, "Could not read from directory '%s'", d->dir); - return -1; - } - - /* Convert the path to UTF-8 */ - if (git_win32_path_to_utf8(entry->d_name, d->f.cFileName) < 0) - return -1; - - entry->d_ino = 0; - - *result = entry; - - if (is_dir != NULL) - *is_dir = ((d->f.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0); - - return 0; -} - -struct git__dirent *git__readdir(git__DIR *d) -{ - struct git__dirent *result; - if (git__readdir_ext(d, &d->entry, &result, NULL) < 0) - return NULL; - return result; -} - -void git__rewinddir(git__DIR *d) -{ - git_win32_path filter_w; - - if (!d) - return; - - if (d->h != INVALID_HANDLE_VALUE) { - FindClose(d->h); - d->h = INVALID_HANDLE_VALUE; - d->first = 0; - } - - if (!git_win32__findfirstfile_filter(filter_w, d->dir)) - return; - - d->h = FindFirstFileW(filter_w, &d->f); - - if (d->h == INVALID_HANDLE_VALUE) - giterr_set(GITERR_OS, "Could not open directory '%s'", d->dir); - else - d->first = 1; -} - -int git__closedir(git__DIR *d) -{ - if (!d) - return 0; - - if (d->h != INVALID_HANDLE_VALUE) { - FindClose(d->h); - d->h = INVALID_HANDLE_VALUE; - } - - git__free(d); - return 0; -} - diff --git a/vendor/libgit2/src/win32/dir.h b/vendor/libgit2/src/win32/dir.h deleted file mode 100644 index bef39d774..000000000 --- a/vendor/libgit2/src/win32/dir.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_dir_h__ -#define INCLUDE_dir_h__ - -#include "common.h" -#include "w32_util.h" - -struct git__dirent { - int d_ino; - git_win32_utf8_path d_name; -}; - -typedef struct { - HANDLE h; - WIN32_FIND_DATAW f; - struct git__dirent entry; - int first; - char dir[GIT_FLEX_ARRAY]; -} git__DIR; - -extern git__DIR *git__opendir(const char *); -extern struct git__dirent *git__readdir(git__DIR *); -extern int git__readdir_ext( - git__DIR *, struct git__dirent *, struct git__dirent **, int *); -extern void git__rewinddir(git__DIR *); -extern int git__closedir(git__DIR *); - -# ifndef GIT__WIN32_NO_WRAP_DIR -# define dirent git__dirent -# define DIR git__DIR -# define opendir git__opendir -# define readdir git__readdir -# define readdir_r(d,e,r) git__readdir_ext((d),(e),(r),NULL) -# define rewinddir git__rewinddir -# define closedir git__closedir -# endif - -#endif /* INCLUDE_dir_h__ */ diff --git a/vendor/libgit2/src/win32/error.c b/vendor/libgit2/src/win32/error.c deleted file mode 100644 index 6b450093f..000000000 --- a/vendor/libgit2/src/win32/error.c +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "common.h" -#include "error.h" -#include "utf-conv.h" - -#ifdef GIT_WINHTTP -# include -#endif - -char *git_win32_get_error_message(DWORD error_code) -{ - LPWSTR lpMsgBuf = NULL; - HMODULE hModule = NULL; - char *utf8_msg = NULL; - DWORD dwFlags = - FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_IGNORE_INSERTS; - - if (!error_code) - return NULL; - -#ifdef GIT_WINHTTP - /* Errors raised by WinHTTP are not in the system resource table */ - if (error_code >= WINHTTP_ERROR_BASE && - error_code <= WINHTTP_ERROR_LAST) - hModule = GetModuleHandleW(L"winhttp"); -#endif - - GIT_UNUSED(hModule); - - if (hModule) - dwFlags |= FORMAT_MESSAGE_FROM_HMODULE; - else - dwFlags |= FORMAT_MESSAGE_FROM_SYSTEM; - - if (FormatMessageW(dwFlags, hModule, error_code, - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - (LPWSTR)&lpMsgBuf, 0, NULL)) { - /* Convert the message to UTF-8. If this fails, we will - * return NULL, which is a condition expected by the caller */ - if (git__utf16_to_8_alloc(&utf8_msg, lpMsgBuf) < 0) - utf8_msg = NULL; - - LocalFree(lpMsgBuf); - } - - return utf8_msg; -} diff --git a/vendor/libgit2/src/win32/error.h b/vendor/libgit2/src/win32/error.h deleted file mode 100644 index 12947a2e6..000000000 --- a/vendor/libgit2/src/win32/error.h +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#ifndef INCLUDE_git_win32_error_h__ -#define INCLUDE_git_win32_error_h__ - -extern char *git_win32_get_error_message(DWORD error_code); - -#endif diff --git a/vendor/libgit2/src/win32/findfile.c b/vendor/libgit2/src/win32/findfile.c deleted file mode 100644 index 58c22279e..000000000 --- a/vendor/libgit2/src/win32/findfile.c +++ /dev/null @@ -1,227 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "path_w32.h" -#include "utf-conv.h" -#include "path.h" -#include "findfile.h" - -#define REG_MSYSGIT_INSTALL_LOCAL L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Git_is1" - -#ifndef _WIN64 -#define REG_MSYSGIT_INSTALL REG_MSYSGIT_INSTALL_LOCAL -#else -#define REG_MSYSGIT_INSTALL L"SOFTWARE\\Wow6432Node\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Git_is1" -#endif - -typedef struct { - git_win32_path path; - DWORD len; -} _findfile_path; - -static int git_win32__expand_path(_findfile_path *dest, const wchar_t *src) -{ - dest->len = ExpandEnvironmentStringsW(src, dest->path, ARRAY_SIZE(dest->path)); - - if (!dest->len || dest->len > ARRAY_SIZE(dest->path)) - return -1; - - return 0; -} - -static int win32_path_to_8(git_buf *dest, const wchar_t *src) -{ - git_win32_utf8_path utf8_path; - - if (git_win32_path_to_utf8(utf8_path, src) < 0) { - giterr_set(GITERR_OS, "Unable to convert path to UTF-8"); - return -1; - } - - /* Convert backslashes to forward slashes */ - git_path_mkposix(utf8_path); - - return git_buf_sets(dest, utf8_path); -} - -static wchar_t* win32_walkpath(wchar_t *path, wchar_t *buf, size_t buflen) -{ - wchar_t term, *base = path; - - assert(path && buf && buflen); - - term = (*path == L'"') ? *path++ : L';'; - - for (buflen--; *path && *path != term && buflen; buflen--) - *buf++ = *path++; - - *buf = L'\0'; /* reserved a byte via initial subtract */ - - while (*path == term || *path == L';') - path++; - - return (path != base) ? path : NULL; -} - -static int win32_find_git_in_path(git_buf *buf, const wchar_t *gitexe, const wchar_t *subdir) -{ - wchar_t *env = _wgetenv(L"PATH"), lastch; - _findfile_path root; - size_t gitexe_len = wcslen(gitexe); - - if (!env) - return -1; - - while ((env = win32_walkpath(env, root.path, MAX_PATH-1)) && *root.path) { - root.len = (DWORD)wcslen(root.path); - lastch = root.path[root.len - 1]; - - /* ensure trailing slash (MAX_PATH-1 to walkpath guarantees space) */ - if (lastch != L'/' && lastch != L'\\') { - root.path[root.len++] = L'\\'; - root.path[root.len] = L'\0'; - } - - if (root.len + gitexe_len >= MAX_PATH) - continue; - wcscpy(&root.path[root.len], gitexe); - - if (_waccess(root.path, F_OK) == 0 && root.len > 5) { - /* replace "bin\\" or "cmd\\" with subdir */ - wcscpy(&root.path[root.len - 4], subdir); - - win32_path_to_8(buf, root.path); - return 0; - } - } - - return GIT_ENOTFOUND; -} - -static int win32_find_git_in_registry( - git_buf *buf, const HKEY hive, const wchar_t *key, const wchar_t *subdir) -{ - HKEY hKey; - int error = GIT_ENOTFOUND; - - assert(buf); - - if (!RegOpenKeyExW(hive, key, 0, KEY_READ, &hKey)) { - DWORD dwType, cbData; - git_win32_path path; - - /* Ensure that the buffer is big enough to have the suffix attached - * after we receive the result. */ - cbData = (DWORD)(sizeof(path) - wcslen(subdir) * sizeof(wchar_t)); - - /* InstallLocation points to the root of the git directory */ - if (!RegQueryValueExW(hKey, L"InstallLocation", NULL, &dwType, (LPBYTE)path, &cbData) && - dwType == REG_SZ) { - - /* Append the suffix */ - wcscat(path, subdir); - - /* Convert to UTF-8, with forward slashes, and output the path - * to the provided buffer */ - if (!win32_path_to_8(buf, path)) - error = 0; - } - - RegCloseKey(hKey); - } - - return error; -} - -static int win32_find_existing_dirs( - git_buf *out, const wchar_t *tmpl[]) -{ - _findfile_path path16; - git_buf buf = GIT_BUF_INIT; - - git_buf_clear(out); - - for (; *tmpl != NULL; tmpl++) { - if (!git_win32__expand_path(&path16, *tmpl) && - path16.path[0] != L'%' && - !_waccess(path16.path, F_OK)) - { - win32_path_to_8(&buf, path16.path); - - if (buf.size) - git_buf_join(out, GIT_PATH_LIST_SEPARATOR, out->ptr, buf.ptr); - } - } - - git_buf_free(&buf); - - return (git_buf_oom(out) ? -1 : 0); -} - -int git_win32__find_system_dirs(git_buf *out, const wchar_t *subdir) -{ - git_buf buf = GIT_BUF_INIT; - - /* directories where git.exe & git.cmd are found */ - if (!win32_find_git_in_path(&buf, L"git.exe", subdir) && buf.size) - git_buf_set(out, buf.ptr, buf.size); - else - git_buf_clear(out); - - if (!win32_find_git_in_path(&buf, L"git.cmd", subdir) && buf.size) - git_buf_join(out, GIT_PATH_LIST_SEPARATOR, out->ptr, buf.ptr); - - /* directories where git is installed according to registry */ - if (!win32_find_git_in_registry( - &buf, HKEY_CURRENT_USER, REG_MSYSGIT_INSTALL_LOCAL, subdir) && buf.size) - git_buf_join(out, GIT_PATH_LIST_SEPARATOR, out->ptr, buf.ptr); - - if (!win32_find_git_in_registry( - &buf, HKEY_LOCAL_MACHINE, REG_MSYSGIT_INSTALL, subdir) && buf.size) - git_buf_join(out, GIT_PATH_LIST_SEPARATOR, out->ptr, buf.ptr); - - git_buf_free(&buf); - - return (git_buf_oom(out) ? -1 : 0); -} - -int git_win32__find_global_dirs(git_buf *out) -{ - static const wchar_t *global_tmpls[4] = { - L"%HOME%\\", - L"%HOMEDRIVE%%HOMEPATH%\\", - L"%USERPROFILE%\\", - NULL, - }; - - return win32_find_existing_dirs(out, global_tmpls); -} - -int git_win32__find_xdg_dirs(git_buf *out) -{ - static const wchar_t *global_tmpls[7] = { - L"%XDG_CONFIG_HOME%\\git", - L"%APPDATA%\\git", - L"%LOCALAPPDATA%\\git", - L"%HOME%\\.config\\git", - L"%HOMEDRIVE%%HOMEPATH%\\.config\\git", - L"%USERPROFILE%\\.config\\git", - NULL, - }; - - return win32_find_existing_dirs(out, global_tmpls); -} - -int git_win32__find_programdata_dirs(git_buf *out) -{ - static const wchar_t *programdata_tmpls[2] = { - L"%PROGRAMDATA%\\Git", - NULL, - }; - - return win32_find_existing_dirs(out, programdata_tmpls); -} diff --git a/vendor/libgit2/src/win32/findfile.h b/vendor/libgit2/src/win32/findfile.h deleted file mode 100644 index 3d5fff439..000000000 --- a/vendor/libgit2/src/win32/findfile.h +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#ifndef INCLUDE_git_findfile_h__ -#define INCLUDE_git_findfile_h__ - -extern int git_win32__find_system_dirs(git_buf *out, const wchar_t *subpath); -extern int git_win32__find_global_dirs(git_buf *out); -extern int git_win32__find_xdg_dirs(git_buf *out); -extern int git_win32__find_programdata_dirs(git_buf *out); - -#endif - diff --git a/vendor/libgit2/src/win32/git2.rc b/vendor/libgit2/src/win32/git2.rc deleted file mode 100644 index 3571bc683..000000000 --- a/vendor/libgit2/src/win32/git2.rc +++ /dev/null @@ -1,44 +0,0 @@ -#include -#include "../../include/git2/version.h" - -#ifndef LIBGIT2_FILENAME -# define LIBGIT2_FILENAME "git2" -#endif - -#ifndef LIBGIT2_COMMENTS -# define LIBGIT2_COMMENTS "For more information visit http://libgit2.github.com/" -#endif - -VS_VERSION_INFO VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE - FILEVERSION LIBGIT2_VER_MAJOR,LIBGIT2_VER_MINOR,LIBGIT2_VER_REVISION,LIBGIT2_VER_PATCH - PRODUCTVERSION LIBGIT2_VER_MAJOR,LIBGIT2_VER_MINOR,LIBGIT2_VER_REVISION,LIBGIT2_VER_PATCH - FILEFLAGSMASK VS_FFI_FILEFLAGSMASK -#ifdef _DEBUG - FILEFLAGS VS_FF_DEBUG -#else - FILEFLAGS 0 -#endif - FILEOS VOS_NT_WINDOWS32 - FILETYPE VFT_DLL - FILESUBTYPE VFT2_UNKNOWN -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904E4" - //language ID = U.S. English, char set = Windows, Multilingual - BEGIN - VALUE "FileDescription", "libgit2 - the Git linkable library\0" - VALUE "FileVersion", LIBGIT2_VERSION "\0" - VALUE "InternalName", LIBGIT2_FILENAME ".dll\0" - VALUE "LegalCopyright", "Copyright (C) the libgit2 contributors. All rights reserved.\0" - VALUE "OriginalFilename", LIBGIT2_FILENAME ".dll\0" - VALUE "ProductName", "libgit2\0" - VALUE "ProductVersion", LIBGIT2_VERSION "\0" - VALUE "Comments", LIBGIT2_COMMENTS "\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x0409, 1252 - END -END diff --git a/vendor/libgit2/src/win32/map.c b/vendor/libgit2/src/win32/map.c deleted file mode 100644 index 03a3646a6..000000000 --- a/vendor/libgit2/src/win32/map.c +++ /dev/null @@ -1,141 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "map.h" -#include - -#ifndef NO_MMAP - -static DWORD get_page_size(void) -{ - static DWORD page_size; - SYSTEM_INFO sys; - - if (!page_size) { - GetSystemInfo(&sys); - page_size = sys.dwPageSize; - } - - return page_size; -} - -static DWORD get_allocation_granularity(void) -{ - static DWORD granularity; - SYSTEM_INFO sys; - - if (!granularity) { - GetSystemInfo(&sys); - granularity = sys.dwAllocationGranularity; - } - - return granularity; -} - -int git__page_size(size_t *page_size) -{ - *page_size = get_page_size(); - return 0; -} - -int git__mmap_alignment(size_t *page_size) -{ - *page_size = get_allocation_granularity(); - return 0; -} - -int p_mmap(git_map *out, size_t len, int prot, int flags, int fd, git_off_t offset) -{ - HANDLE fh = (HANDLE)_get_osfhandle(fd); - DWORD alignment = get_allocation_granularity(); - DWORD fmap_prot = 0; - DWORD view_prot = 0; - DWORD off_low = 0; - DWORD off_hi = 0; - git_off_t page_start; - git_off_t page_offset; - - GIT_MMAP_VALIDATE(out, len, prot, flags); - - out->data = NULL; - out->len = 0; - out->fmh = NULL; - - if (fh == INVALID_HANDLE_VALUE) { - errno = EBADF; - giterr_set(GITERR_OS, "Failed to mmap. Invalid handle value"); - return -1; - } - - if (prot & GIT_PROT_WRITE) - fmap_prot |= PAGE_READWRITE; - else if (prot & GIT_PROT_READ) - fmap_prot |= PAGE_READONLY; - - if (prot & GIT_PROT_WRITE) - view_prot |= FILE_MAP_WRITE; - if (prot & GIT_PROT_READ) - view_prot |= FILE_MAP_READ; - - page_start = (offset / alignment) * alignment; - page_offset = offset - page_start; - - if (page_offset != 0) { /* offset must be multiple of the allocation granularity */ - errno = EINVAL; - giterr_set(GITERR_OS, "Failed to mmap. Offset must be multiple of allocation granularity"); - return -1; - } - - out->fmh = CreateFileMapping(fh, NULL, fmap_prot, 0, 0, NULL); - if (!out->fmh || out->fmh == INVALID_HANDLE_VALUE) { - giterr_set(GITERR_OS, "Failed to mmap. Invalid handle value"); - out->fmh = NULL; - return -1; - } - - assert(sizeof(git_off_t) == 8); - - off_low = (DWORD)(page_start); - off_hi = (DWORD)(page_start >> 32); - out->data = MapViewOfFile(out->fmh, view_prot, off_hi, off_low, len); - if (!out->data) { - giterr_set(GITERR_OS, "Failed to mmap. No data written"); - CloseHandle(out->fmh); - out->fmh = NULL; - return -1; - } - out->len = len; - - return 0; -} - -int p_munmap(git_map *map) -{ - int error = 0; - - assert(map != NULL); - - if (map->data) { - if (!UnmapViewOfFile(map->data)) { - giterr_set(GITERR_OS, "Failed to munmap. Could not unmap view of file"); - error = -1; - } - map->data = NULL; - } - - if (map->fmh) { - if (!CloseHandle(map->fmh)) { - giterr_set(GITERR_OS, "Failed to munmap. Could not close handle"); - error = -1; - } - map->fmh = NULL; - } - - return error; -} - -#endif diff --git a/vendor/libgit2/src/win32/mingw-compat.h b/vendor/libgit2/src/win32/mingw-compat.h deleted file mode 100644 index 698ebed1a..000000000 --- a/vendor/libgit2/src/win32/mingw-compat.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_mingw_compat__ -#define INCLUDE_mingw_compat__ - -#if defined(__MINGW32__) - -#undef stat - -#if _WIN32_WINNT < 0x0600 && !defined(__MINGW64_VERSION_MAJOR) -#undef MemoryBarrier -void __mingworg_MemoryBarrier(void); -#define MemoryBarrier __mingworg_MemoryBarrier -#define VOLUME_NAME_DOS 0x0 -#endif - -#endif - -#endif /* INCLUDE_mingw_compat__ */ diff --git a/vendor/libgit2/src/win32/msvc-compat.h b/vendor/libgit2/src/win32/msvc-compat.h deleted file mode 100644 index 12b50d981..000000000 --- a/vendor/libgit2/src/win32/msvc-compat.h +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_msvc_compat__ -#define INCLUDE_msvc_compat__ - -#if defined(_MSC_VER) - -typedef unsigned short mode_t; -typedef SSIZE_T ssize_t; - -#define strcasecmp(s1, s2) _stricmp(s1, s2) -#define strncasecmp(s1, s2, c) _strnicmp(s1, s2, c) - -#endif - -#define GIT_STDLIB_CALL __cdecl - -#endif /* INCLUDE_msvc_compat__ */ diff --git a/vendor/libgit2/src/win32/path_w32.c b/vendor/libgit2/src/win32/path_w32.c deleted file mode 100644 index 40b95c33b..000000000 --- a/vendor/libgit2/src/win32/path_w32.c +++ /dev/null @@ -1,387 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "common.h" -#include "path.h" -#include "path_w32.h" -#include "utf-conv.h" -#include "posix.h" -#include "reparse.h" -#include "dir.h" - -#define PATH__NT_NAMESPACE L"\\\\?\\" -#define PATH__NT_NAMESPACE_LEN 4 - -#define PATH__ABSOLUTE_LEN 3 - -#define path__is_dirsep(p) ((p) == '/' || (p) == '\\') - -#define path__is_absolute(p) \ - (git__isalpha((p)[0]) && (p)[1] == ':' && ((p)[2] == '\\' || (p)[2] == '/')) - -#define path__is_nt_namespace(p) \ - (((p)[0] == '\\' && (p)[1] == '\\' && (p)[2] == '?' && (p)[3] == '\\') || \ - ((p)[0] == '/' && (p)[1] == '/' && (p)[2] == '?' && (p)[3] == '/')) - -#define path__is_unc(p) \ - (((p)[0] == '\\' && (p)[1] == '\\') || ((p)[0] == '/' && (p)[1] == '/')) - -GIT_INLINE(int) path__cwd(wchar_t *path, int size) -{ - int len; - - if ((len = GetCurrentDirectoryW(size, path)) == 0) { - errno = GetLastError() == ERROR_ACCESS_DENIED ? EACCES : ENOENT; - return -1; - } else if (len > size) { - errno = ENAMETOOLONG; - return -1; - } - - /* The Win32 APIs may return "\\?\" once you've used it first. - * But it may not. What a gloriously predictible API! - */ - if (wcsncmp(path, PATH__NT_NAMESPACE, PATH__NT_NAMESPACE_LEN)) - return len; - - len -= PATH__NT_NAMESPACE_LEN; - - memmove(path, path + PATH__NT_NAMESPACE_LEN, sizeof(wchar_t) * len); - return len; -} - -static wchar_t *path__skip_server(wchar_t *path) -{ - wchar_t *c; - - for (c = path; *c; c++) { - if (path__is_dirsep(*c)) - return c + 1; - } - - return c; -} - -static wchar_t *path__skip_prefix(wchar_t *path) -{ - if (path__is_nt_namespace(path)) { - path += PATH__NT_NAMESPACE_LEN; - - if (wcsncmp(path, L"UNC\\", 4) == 0) - path = path__skip_server(path + 4); - else if (path__is_absolute(path)) - path += PATH__ABSOLUTE_LEN; - } else if (path__is_absolute(path)) { - path += PATH__ABSOLUTE_LEN; - } else if (path__is_unc(path)) { - path = path__skip_server(path + 2); - } - - return path; -} - -int git_win32_path_canonicalize(git_win32_path path) -{ - wchar_t *base, *from, *to, *next; - size_t len; - - base = to = path__skip_prefix(path); - - /* Unposixify if the prefix */ - for (from = path; from < to; from++) { - if (*from == L'/') - *from = L'\\'; - } - - while (*from) { - for (next = from; *next; ++next) { - if (*next == L'/') { - *next = L'\\'; - break; - } - - if (*next == L'\\') - break; - } - - len = next - from; - - if (len == 1 && from[0] == L'.') - /* do nothing with singleton dot */; - - else if (len == 2 && from[0] == L'.' && from[1] == L'.') { - if (to == base) { - /* no more path segments to strip, eat the "../" */ - if (*next == L'\\') - len++; - - base = to; - } else { - /* back up a path segment */ - while (to > base && to[-1] == L'\\') to--; - while (to > base && to[-1] != L'\\') to--; - } - } else { - if (*next == L'\\' && *from != L'\\') - len++; - - if (to != from) - memmove(to, from, sizeof(wchar_t) * len); - - to += len; - } - - from += len; - - while (*from == L'\\') from++; - } - - /* Strip trailing backslashes */ - while (to > base && to[-1] == L'\\') to--; - - *to = L'\0'; - - return (to - path); -} - -int git_win32_path__cwd(wchar_t *out, size_t len) -{ - int cwd_len; - - if ((cwd_len = path__cwd(out, len)) < 0) - return -1; - - /* UNC paths */ - if (wcsncmp(L"\\\\", out, 2) == 0) { - /* Our buffer must be at least 5 characters larger than the - * current working directory: we swallow one of the leading - * '\'s, but we we add a 'UNC' specifier to the path, plus - * a trailing directory separator, plus a NUL. - */ - if (cwd_len > MAX_PATH - 4) { - errno = ENAMETOOLONG; - return -1; - } - - memmove(out+2, out, sizeof(wchar_t) * cwd_len); - out[0] = L'U'; - out[1] = L'N'; - out[2] = L'C'; - - cwd_len += 2; - } - - /* Our buffer must be at least 2 characters larger than the current - * working directory. (One character for the directory separator, - * one for the null. - */ - else if (cwd_len > MAX_PATH - 2) { - errno = ENAMETOOLONG; - return -1; - } - - return cwd_len; -} - -int git_win32_path_from_utf8(git_win32_path out, const char *src) -{ - wchar_t *dest = out; - - /* All win32 paths are in NT-prefixed format, beginning with "\\?\". */ - memcpy(dest, PATH__NT_NAMESPACE, sizeof(wchar_t) * PATH__NT_NAMESPACE_LEN); - dest += PATH__NT_NAMESPACE_LEN; - - /* See if this is an absolute path (beginning with a drive letter) */ - if (path__is_absolute(src)) { - if (git__utf8_to_16(dest, MAX_PATH, src) < 0) - goto on_error; - } - /* File-prefixed NT-style paths beginning with \\?\ */ - else if (path__is_nt_namespace(src)) { - /* Skip the NT prefix, the destination already contains it */ - if (git__utf8_to_16(dest, MAX_PATH, src + PATH__NT_NAMESPACE_LEN) < 0) - goto on_error; - } - /* UNC paths */ - else if (path__is_unc(src)) { - memcpy(dest, L"UNC\\", sizeof(wchar_t) * 4); - dest += 4; - - /* Skip the leading "\\" */ - if (git__utf8_to_16(dest, MAX_PATH - 2, src + 2) < 0) - goto on_error; - } - /* Absolute paths omitting the drive letter */ - else if (src[0] == '\\' || src[0] == '/') { - if (path__cwd(dest, MAX_PATH) < 0) - goto on_error; - - if (!path__is_absolute(dest)) { - errno = ENOENT; - goto on_error; - } - - /* Skip the drive letter specification ("C:") */ - if (git__utf8_to_16(dest + 2, MAX_PATH - 2, src) < 0) - goto on_error; - } - /* Relative paths */ - else { - int cwd_len; - - if ((cwd_len = git_win32_path__cwd(dest, MAX_PATH)) < 0) - goto on_error; - - dest[cwd_len++] = L'\\'; - - if (git__utf8_to_16(dest + cwd_len, MAX_PATH - cwd_len, src) < 0) - goto on_error; - } - - return git_win32_path_canonicalize(out); - -on_error: - /* set windows error code so we can use its error message */ - if (errno == ENAMETOOLONG) - SetLastError(ERROR_FILENAME_EXCED_RANGE); - - return -1; -} - -int git_win32_path_to_utf8(git_win32_utf8_path dest, const wchar_t *src) -{ - char *out = dest; - int len; - - /* Strip NT namespacing "\\?\" */ - if (path__is_nt_namespace(src)) { - src += 4; - - /* "\\?\UNC\server\share" -> "\\server\share" */ - if (wcsncmp(src, L"UNC\\", 4) == 0) { - src += 4; - - memcpy(dest, "\\\\", 2); - out = dest + 2; - } - } - - if ((len = git__utf16_to_8(out, GIT_WIN_PATH_UTF8, src)) < 0) - return len; - - git_path_mkposix(dest); - - return len; -} - -char *git_win32_path_8dot3_name(const char *path) -{ - git_win32_path longpath, shortpath; - wchar_t *start; - char *shortname; - int len, namelen = 1; - - if (git_win32_path_from_utf8(longpath, path) < 0) - return NULL; - - len = GetShortPathNameW(longpath, shortpath, GIT_WIN_PATH_UTF16); - - while (len && shortpath[len-1] == L'\\') - shortpath[--len] = L'\0'; - - if (len == 0 || len >= GIT_WIN_PATH_UTF16) - return NULL; - - for (start = shortpath + (len - 1); - start > shortpath && *(start-1) != '/' && *(start-1) != '\\'; - start--) - namelen++; - - /* We may not have actually been given a short name. But if we have, - * it will be in the ASCII byte range, so we don't need to worry about - * multi-byte sequences and can allocate naively. - */ - if (namelen > 12 || (shortname = git__malloc(namelen + 1)) == NULL) - return NULL; - - if ((len = git__utf16_to_8(shortname, namelen + 1, start)) < 0) - return NULL; - - return shortname; -} - -static bool path_is_volume(wchar_t *target, size_t target_len) -{ - return (target_len && wcsncmp(target, L"\\??\\Volume{", 11) == 0); -} - -/* On success, returns the length, in characters, of the path stored in dest. -* On failure, returns a negative value. */ -int git_win32_path_readlink_w(git_win32_path dest, const git_win32_path path) -{ - BYTE buf[MAXIMUM_REPARSE_DATA_BUFFER_SIZE]; - GIT_REPARSE_DATA_BUFFER *reparse_buf = (GIT_REPARSE_DATA_BUFFER *)buf; - HANDLE handle = NULL; - DWORD ioctl_ret; - wchar_t *target; - size_t target_len; - - int error = -1; - - handle = CreateFileW(path, GENERIC_READ, - FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, - FILE_FLAG_OPEN_REPARSE_POINT | FILE_FLAG_BACKUP_SEMANTICS, NULL); - - if (handle == INVALID_HANDLE_VALUE) { - errno = ENOENT; - return -1; - } - - if (!DeviceIoControl(handle, FSCTL_GET_REPARSE_POINT, NULL, 0, - reparse_buf, sizeof(buf), &ioctl_ret, NULL)) { - errno = EINVAL; - goto on_error; - } - - switch (reparse_buf->ReparseTag) { - case IO_REPARSE_TAG_SYMLINK: - target = reparse_buf->SymbolicLinkReparseBuffer.PathBuffer + - (reparse_buf->SymbolicLinkReparseBuffer.SubstituteNameOffset / sizeof(WCHAR)); - target_len = reparse_buf->SymbolicLinkReparseBuffer.SubstituteNameLength / sizeof(WCHAR); - break; - case IO_REPARSE_TAG_MOUNT_POINT: - target = reparse_buf->MountPointReparseBuffer.PathBuffer + - (reparse_buf->MountPointReparseBuffer.SubstituteNameOffset / sizeof(WCHAR)); - target_len = reparse_buf->MountPointReparseBuffer.SubstituteNameLength / sizeof(WCHAR); - break; - default: - errno = EINVAL; - goto on_error; - } - - if (path_is_volume(target, target_len)) { - /* This path is a reparse point that represents another volume mounted - * at this location, it is not a symbolic link our input was canonical. - */ - errno = EINVAL; - error = -1; - } else if (target_len) { - /* The path may need to have a prefix removed. */ - target_len = git_win32__canonicalize_path(target, target_len); - - /* Need one additional character in the target buffer - * for the terminating NULL. */ - if (GIT_WIN_PATH_UTF16 > target_len) { - wcscpy(dest, target); - error = (int)target_len; - } - } - -on_error: - CloseHandle(handle); - return error; -} diff --git a/vendor/libgit2/src/win32/path_w32.h b/vendor/libgit2/src/win32/path_w32.h deleted file mode 100644 index 3d9f82860..000000000 --- a/vendor/libgit2/src/win32/path_w32.h +++ /dev/null @@ -1,85 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_git_path_w32_h__ -#define INCLUDE_git_path_w32_h__ - -#include "common.h" -#include "vector.h" - -/* - * Provides a large enough buffer to support Windows paths: MAX_PATH is - * 260, corresponding to a maximum path length of 259 characters plus a - * NULL terminator. Prefixing with "\\?\" adds 4 characters, but if the - * original was a UNC path, then we turn "\\server\share" into - * "\\?\UNC\server\share". So we replace the first two characters with - * 8 characters, a net gain of 6, so the maximum length is MAX_PATH+6. - */ -#define GIT_WIN_PATH_UTF16 MAX_PATH+6 - -/* Maximum size of a UTF-8 Win32 path. We remove the "\\?\" or "\\?\UNC\" - * prefixes for presentation, bringing us back to 259 (non-NULL) - * characters. UTF-8 does have 4-byte sequences, but they are encoded in - * UTF-16 using surrogate pairs, which takes up the space of two characters. - * Two characters in the range U+0800 -> U+FFFF take up more space in UTF-8 - * (6 bytes) than one surrogate pair (4 bytes). - */ -#define GIT_WIN_PATH_UTF8 (259 * 3 + 1) - -/* - * The length of a Windows "shortname", for 8.3 compatibility. - */ -#define GIT_WIN_PATH_SHORTNAME 13 - -/* Win32 path types */ -typedef wchar_t git_win32_path[GIT_WIN_PATH_UTF16]; -typedef char git_win32_utf8_path[GIT_WIN_PATH_UTF8]; - -/** - * Create a Win32 path (in UCS-2 format) from a UTF-8 string. - * - * @param dest The buffer to receive the wide string. - * @param src The UTF-8 string to convert. - * @return The length of the wide string, in characters (not counting the NULL terminator), or < 0 for failure - */ -extern int git_win32_path_from_utf8(git_win32_path dest, const char *src); - -/** - * Canonicalize a Win32 UCS-2 path so that it is suitable for delivery to the - * Win32 APIs: remove multiple directory separators, squashing to a single one, - * strip trailing directory separators, ensure directory separators are all - * canonical (always backslashes, never forward slashes) and process any - * directory entries of '.' or '..'. - * - * This processes the buffer in place. - * - * @param path The buffer to process - * @return The new length of the buffer, in wchar_t's (not counting the NULL terminator) - */ -extern int git_win32_path_canonicalize(git_win32_path path); - -/** - * Create an internal format (posix-style) UTF-8 path from a Win32 UCS-2 path. - * - * @param dest The buffer to receive the UTF-8 string. - * @param src The wide string to convert. - * @return The length of the UTF-8 string, in bytes (not counting the NULL terminator), or < 0 for failure - */ -extern int git_win32_path_to_utf8(git_win32_utf8_path dest, const wchar_t *src); - -/** - * Get the short name for the terminal path component in the given path. - * For example, given "C:\Foo\Bar\Asdf.txt", this will return the short name - * for the file "Asdf.txt". - * - * @param path The given path in UTF-8 - * @return The name of the shortname for the given path - */ -extern char *git_win32_path_8dot3_name(const char *path); - -extern int git_win32_path_readlink_w(git_win32_path dest, const git_win32_path path); - -#endif diff --git a/vendor/libgit2/src/win32/posix.h b/vendor/libgit2/src/win32/posix.h deleted file mode 100644 index 5fab267c2..000000000 --- a/vendor/libgit2/src/win32/posix.h +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_posix__w32_h__ -#define INCLUDE_posix__w32_h__ - -#include "common.h" -#include "../posix.h" -#include "win32-compat.h" -#include "path_w32.h" -#include "utf-conv.h" -#include "dir.h" - -typedef SOCKET GIT_SOCKET; - -#define p_lseek(f,n,w) _lseeki64(f, n, w) - -extern int p_fstat(int fd, struct stat *buf); -extern int p_lstat(const char *file_name, struct stat *buf); -extern int p_stat(const char* path, struct stat *buf); - -extern int p_utimes(const char *filename, const struct p_timeval times[2]); -extern int p_futimes(int fd, const struct p_timeval times[2]); - -extern int p_readlink(const char *path, char *buf, size_t bufsiz); -extern int p_symlink(const char *old, const char *new); -extern int p_link(const char *old, const char *new); -extern int p_unlink(const char *path); -extern int p_mkdir(const char *path, mode_t mode); -extern int p_fsync(int fd); -extern char *p_realpath(const char *orig_path, char *buffer); - -extern int p_recv(GIT_SOCKET socket, void *buffer, size_t length, int flags); -extern int p_send(GIT_SOCKET socket, const void *buffer, size_t length, int flags); -extern int p_inet_pton(int af, const char* src, void* dst); - -extern int p_vsnprintf(char *buffer, size_t count, const char *format, va_list argptr); -extern int p_snprintf(char *buffer, size_t count, const char *format, ...) GIT_FORMAT_PRINTF(3, 4); -extern int p_mkstemp(char *tmp_path); -extern int p_chdir(const char* path); -extern int p_chmod(const char* path, mode_t mode); -extern int p_rmdir(const char* path); -extern int p_access(const char* path, mode_t mode); -extern int p_ftruncate(int fd, git_off_t size); - -/* p_lstat is almost but not quite POSIX correct. Specifically, the use of - * ENOTDIR is wrong, in that it does not mean precisely that a non-directory - * entry was encountered. Making it correct is potentially expensive, - * however, so this is a separate version of p_lstat to use when correct - * POSIX ENOTDIR semantics is required. - */ -extern int p_lstat_posixly(const char *filename, struct stat *buf); - -extern struct tm * p_localtime_r(const time_t *timer, struct tm *result); -extern struct tm * p_gmtime_r(const time_t *timer, struct tm *result); - -#endif diff --git a/vendor/libgit2/src/win32/posix_w32.c b/vendor/libgit2/src/win32/posix_w32.c deleted file mode 100644 index fea634b00..000000000 --- a/vendor/libgit2/src/win32/posix_w32.c +++ /dev/null @@ -1,723 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#include "../posix.h" -#include "../fileops.h" -#include "path.h" -#include "path_w32.h" -#include "utf-conv.h" -#include "repository.h" -#include "reparse.h" -#include "global.h" -#include "buffer.h" -#include -#include -#include -#include - -#ifndef FILE_NAME_NORMALIZED -# define FILE_NAME_NORMALIZED 0 -#endif - -#ifndef IO_REPARSE_TAG_SYMLINK -#define IO_REPARSE_TAG_SYMLINK (0xA000000CL) -#endif - -/* Options which we always provide to _wopen. - * - * _O_BINARY - Raw access; no translation of CR or LF characters - * _O_NOINHERIT - Do not mark the created handle as inheritable by child processes. - * The Windows default is 'not inheritable', but the CRT's default (following - * POSIX convention) is 'inheritable'. We have no desire for our handles to be - * inheritable on Windows, so specify the flag to get default behavior back. */ -#define STANDARD_OPEN_FLAGS (_O_BINARY | _O_NOINHERIT) - -/* Allowable mode bits on Win32. Using mode bits that are not supported on - * Win32 (eg S_IRWXU) is generally ignored, but Wine warns loudly about it - * so we simply remove them. - */ -#define WIN32_MODE_MASK (_S_IREAD | _S_IWRITE) - -/* GetFinalPathNameByHandleW signature */ -typedef DWORD(WINAPI *PFGetFinalPathNameByHandleW)(HANDLE, LPWSTR, DWORD, DWORD); - -/** - * Truncate or extend file. - * - * We now take a "git_off_t" rather than "long" because - * files may be longer than 2Gb. - */ -int p_ftruncate(int fd, git_off_t size) -{ - if (size < 0) { - errno = EINVAL; - return -1; - } - -#if !defined(__MINGW32__) || defined(MINGW_HAS_SECURE_API) - return ((_chsize_s(fd, size) == 0) ? 0 : -1); -#else - /* TODO MINGW32 Find a replacement for _chsize() that handles big files. */ - if (size > INT32_MAX) { - errno = EFBIG; - return -1; - } - return _chsize(fd, (long)size); -#endif -} - -int p_mkdir(const char *path, mode_t mode) -{ - git_win32_path buf; - - GIT_UNUSED(mode); - - if (git_win32_path_from_utf8(buf, path) < 0) - return -1; - - return _wmkdir(buf); -} - -int p_link(const char *old, const char *new) -{ - GIT_UNUSED(old); - GIT_UNUSED(new); - errno = ENOSYS; - return -1; -} - -int p_unlink(const char *path) -{ - git_win32_path buf; - int error; - - if (git_win32_path_from_utf8(buf, path) < 0) - return -1; - - error = _wunlink(buf); - - /* If the file could not be deleted because it was - * read-only, clear the bit and try again */ - if (error == -1 && errno == EACCES) { - _wchmod(buf, 0666); - error = _wunlink(buf); - } - - return error; -} - -int p_fsync(int fd) -{ - HANDLE fh = (HANDLE)_get_osfhandle(fd); - - if (fh == INVALID_HANDLE_VALUE) { - errno = EBADF; - return -1; - } - - if (!FlushFileBuffers(fh)) { - DWORD code = GetLastError(); - - if (code == ERROR_INVALID_HANDLE) - errno = EINVAL; - else - errno = EIO; - - return -1; - } - - return 0; -} - -#define WIN32_IS_WSEP(CH) ((CH) == L'/' || (CH) == L'\\') - -static int lstat_w( - wchar_t *path, - struct stat *buf, - bool posix_enotdir) -{ - WIN32_FILE_ATTRIBUTE_DATA fdata; - - if (GetFileAttributesExW(path, GetFileExInfoStandard, &fdata)) { - if (!buf) - return 0; - - return git_win32__file_attribute_to_stat(buf, &fdata, path); - } - - switch (GetLastError()) { - case ERROR_ACCESS_DENIED: - errno = EACCES; - break; - default: - errno = ENOENT; - break; - } - - /* To match POSIX behavior, set ENOTDIR when any of the folders in the - * file path is a regular file, otherwise set ENOENT. - */ - if (errno == ENOENT && posix_enotdir) { - size_t path_len = wcslen(path); - - /* scan up path until we find an existing item */ - while (1) { - DWORD attrs; - - /* remove last directory component */ - for (path_len--; path_len > 0 && !WIN32_IS_WSEP(path[path_len]); path_len--); - - if (path_len <= 0) - break; - - path[path_len] = L'\0'; - attrs = GetFileAttributesW(path); - - if (attrs != INVALID_FILE_ATTRIBUTES) { - if (!(attrs & FILE_ATTRIBUTE_DIRECTORY)) - errno = ENOTDIR; - break; - } - } - } - - return -1; -} - -static int do_lstat(const char *path, struct stat *buf, bool posixly_correct) -{ - git_win32_path path_w; - int len; - - if ((len = git_win32_path_from_utf8(path_w, path)) < 0) - return -1; - - git_win32__path_trim_end(path_w, len); - - return lstat_w(path_w, buf, posixly_correct); -} - -int p_lstat(const char *filename, struct stat *buf) -{ - return do_lstat(filename, buf, false); -} - -int p_lstat_posixly(const char *filename, struct stat *buf) -{ - return do_lstat(filename, buf, true); -} - -int p_utimes(const char *filename, const struct p_timeval times[2]) -{ - int fd, error; - - if ((fd = p_open(filename, O_RDWR)) < 0) - return fd; - - error = p_futimes(fd, times); - - close(fd); - return error; -} - -int p_futimes(int fd, const struct p_timeval times[2]) -{ - HANDLE handle; - FILETIME atime = {0}, mtime = {0}; - - if (times == NULL) { - SYSTEMTIME st; - - GetSystemTime(&st); - SystemTimeToFileTime(&st, &atime); - SystemTimeToFileTime(&st, &mtime); - } else { - git_win32__timeval_to_filetime(&atime, times[0]); - git_win32__timeval_to_filetime(&mtime, times[1]); - } - - if ((handle = (HANDLE)_get_osfhandle(fd)) == INVALID_HANDLE_VALUE) - return -1; - - if (SetFileTime(handle, NULL, &atime, &mtime) == 0) - return -1; - - return 0; -} - -int p_readlink(const char *path, char *buf, size_t bufsiz) -{ - git_win32_path path_w, target_w; - git_win32_utf8_path target; - int len; - - /* readlink(2) does not NULL-terminate the string written - * to the target buffer. Furthermore, the target buffer need - * not be large enough to hold the entire result. A truncated - * result should be written in this case. Since this truncation - * could occur in the middle of the encoding of a code point, - * we need to buffer the result on the stack. */ - - if (git_win32_path_from_utf8(path_w, path) < 0 || - git_win32_path_readlink_w(target_w, path_w) < 0 || - (len = git_win32_path_to_utf8(target, target_w)) < 0) - return -1; - - bufsiz = min((size_t)len, bufsiz); - memcpy(buf, target, bufsiz); - - return (int)bufsiz; -} - -int p_symlink(const char *old, const char *new) -{ - /* Real symlinks on NTFS require admin privileges. Until this changes, - * libgit2 just creates a text file with the link target in the contents. - */ - return git_futils_fake_symlink(old, new); -} - -int p_open(const char *path, int flags, ...) -{ - git_win32_path buf; - mode_t mode = 0; - - if (git_win32_path_from_utf8(buf, path) < 0) - return -1; - - if (flags & O_CREAT) { - va_list arg_list; - - va_start(arg_list, flags); - mode = (mode_t)va_arg(arg_list, int); - va_end(arg_list); - } - - return _wopen(buf, flags | STANDARD_OPEN_FLAGS, mode & WIN32_MODE_MASK); -} - -int p_creat(const char *path, mode_t mode) -{ - git_win32_path buf; - - if (git_win32_path_from_utf8(buf, path) < 0) - return -1; - - return _wopen(buf, - _O_WRONLY | _O_CREAT | _O_TRUNC | STANDARD_OPEN_FLAGS, - mode & WIN32_MODE_MASK); -} - -int p_getcwd(char *buffer_out, size_t size) -{ - git_win32_path buf; - wchar_t *cwd = _wgetcwd(buf, GIT_WIN_PATH_UTF16); - - if (!cwd) - return -1; - - /* Convert the working directory back to UTF-8 */ - if (git__utf16_to_8(buffer_out, size, cwd) < 0) { - DWORD code = GetLastError(); - - if (code == ERROR_INSUFFICIENT_BUFFER) - errno = ERANGE; - else - errno = EINVAL; - - return -1; - } - - return 0; -} - -/* - * Returns the address of the GetFinalPathNameByHandleW function. - * This function is available on Windows Vista and higher. - */ -static PFGetFinalPathNameByHandleW get_fpnbyhandle(void) -{ - static PFGetFinalPathNameByHandleW pFunc = NULL; - PFGetFinalPathNameByHandleW toReturn = pFunc; - - if (!toReturn) { - HMODULE hModule = GetModuleHandleW(L"kernel32"); - - if (hModule) - toReturn = (PFGetFinalPathNameByHandleW)GetProcAddress(hModule, "GetFinalPathNameByHandleW"); - - pFunc = toReturn; - } - - assert(toReturn); - - return toReturn; -} - -static int getfinalpath_w( - git_win32_path dest, - const wchar_t *path) -{ - PFGetFinalPathNameByHandleW pgfp = get_fpnbyhandle(); - HANDLE hFile; - DWORD dwChars; - - if (!pgfp) - return -1; - - /* Use FILE_FLAG_BACKUP_SEMANTICS so we can open a directory. Do not - * specify FILE_FLAG_OPEN_REPARSE_POINT; we want to open a handle to the - * target of the link. */ - hFile = CreateFileW(path, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_DELETE, - NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL); - - if (INVALID_HANDLE_VALUE == hFile) - return -1; - - /* Call GetFinalPathNameByHandle */ - dwChars = pgfp(hFile, dest, GIT_WIN_PATH_UTF16, FILE_NAME_NORMALIZED); - CloseHandle(hFile); - - if (!dwChars || dwChars >= GIT_WIN_PATH_UTF16) - return -1; - - /* The path may be delivered to us with a prefix; canonicalize */ - return (int)git_win32__canonicalize_path(dest, dwChars); -} - -static int follow_and_lstat_link(git_win32_path path, struct stat* buf) -{ - git_win32_path target_w; - - if (getfinalpath_w(target_w, path) < 0) - return -1; - - return lstat_w(target_w, buf, false); -} - -int p_fstat(int fd, struct stat *buf) -{ - BY_HANDLE_FILE_INFORMATION fhInfo; - - HANDLE fh = (HANDLE)_get_osfhandle(fd); - - if (fh == INVALID_HANDLE_VALUE || - !GetFileInformationByHandle(fh, &fhInfo)) { - errno = EBADF; - return -1; - } - - git_win32__file_information_to_stat(buf, &fhInfo); - return 0; -} - -int p_stat(const char* path, struct stat* buf) -{ - git_win32_path path_w; - int len; - - if ((len = git_win32_path_from_utf8(path_w, path)) < 0 || - lstat_w(path_w, buf, false) < 0) - return -1; - - /* The item is a symbolic link or mount point. No need to iterate - * to follow multiple links; use GetFinalPathNameFromHandle. */ - if (S_ISLNK(buf->st_mode)) - return follow_and_lstat_link(path_w, buf); - - return 0; -} - -int p_chdir(const char* path) -{ - git_win32_path buf; - - if (git_win32_path_from_utf8(buf, path) < 0) - return -1; - - return _wchdir(buf); -} - -int p_chmod(const char* path, mode_t mode) -{ - git_win32_path buf; - - if (git_win32_path_from_utf8(buf, path) < 0) - return -1; - - return _wchmod(buf, mode); -} - -int p_rmdir(const char* path) -{ - git_win32_path buf; - int error; - - if (git_win32_path_from_utf8(buf, path) < 0) - return -1; - - error = _wrmdir(buf); - - if (error == -1) { - switch (GetLastError()) { - /* _wrmdir() is documented to return EACCES if "A program has an open - * handle to the directory." This sounds like what everybody else calls - * EBUSY. Let's convert appropriate error codes. - */ - case ERROR_SHARING_VIOLATION: - errno = EBUSY; - break; - - /* This error can be returned when trying to rmdir an extant file. */ - case ERROR_DIRECTORY: - errno = ENOTDIR; - break; - } - } - - return error; -} - -char *p_realpath(const char *orig_path, char *buffer) -{ - git_win32_path orig_path_w, buffer_w; - - if (git_win32_path_from_utf8(orig_path_w, orig_path) < 0) - return NULL; - - /* Note that if the path provided is a relative path, then the current directory - * is used to resolve the path -- which is a concurrency issue because the current - * directory is a process-wide variable. */ - if (!GetFullPathNameW(orig_path_w, GIT_WIN_PATH_UTF16, buffer_w, NULL)) { - if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) - errno = ENAMETOOLONG; - else - errno = EINVAL; - - return NULL; - } - - /* The path must exist. */ - if (GetFileAttributesW(buffer_w) == INVALID_FILE_ATTRIBUTES) { - errno = ENOENT; - return NULL; - } - - if (!buffer && !(buffer = git__malloc(GIT_WIN_PATH_UTF8))) { - errno = ENOMEM; - return NULL; - } - - /* Convert the path to UTF-8. If the caller provided a buffer, then it - * is assumed to be GIT_WIN_PATH_UTF8 characters in size. If it isn't, - * then we may overflow. */ - if (git_win32_path_to_utf8(buffer, buffer_w) < 0) - return NULL; - - git_path_mkposix(buffer); - - return buffer; -} - -int p_vsnprintf(char *buffer, size_t count, const char *format, va_list argptr) -{ -#if defined(_MSC_VER) - int len; - - if (count == 0) - return _vscprintf(format, argptr); - - #if _MSC_VER >= 1500 - len = _vsnprintf_s(buffer, count, _TRUNCATE, format, argptr); - #else - len = _vsnprintf(buffer, count, format, argptr); - #endif - - if (len < 0) - return _vscprintf(format, argptr); - - return len; -#else /* MinGW */ - return vsnprintf(buffer, count, format, argptr); -#endif -} - -int p_snprintf(char *buffer, size_t count, const char *format, ...) -{ - va_list va; - int r; - - va_start(va, format); - r = p_vsnprintf(buffer, count, format, va); - va_end(va); - - return r; -} - -/* TODO: wut? */ -int p_mkstemp(char *tmp_path) -{ -#if defined(_MSC_VER) && _MSC_VER >= 1500 - if (_mktemp_s(tmp_path, strlen(tmp_path) + 1) != 0) - return -1; -#else - if (_mktemp(tmp_path) == NULL) - return -1; -#endif - - return p_open(tmp_path, O_RDWR | O_CREAT | O_EXCL, 0744); //-V536 -} - -int p_access(const char* path, mode_t mode) -{ - git_win32_path buf; - - if (git_win32_path_from_utf8(buf, path) < 0) - return -1; - - return _waccess(buf, mode & WIN32_MODE_MASK); -} - -static int ensure_writable(wchar_t *fpath) -{ - DWORD attrs; - - attrs = GetFileAttributesW(fpath); - if (attrs == INVALID_FILE_ATTRIBUTES) { - if (GetLastError() == ERROR_FILE_NOT_FOUND) - return 0; - - giterr_set(GITERR_OS, "failed to get attributes"); - return -1; - } - - if (!(attrs & FILE_ATTRIBUTE_READONLY)) - return 0; - - attrs &= ~FILE_ATTRIBUTE_READONLY; - if (!SetFileAttributesW(fpath, attrs)) { - giterr_set(GITERR_OS, "failed to set attributes"); - return -1; - } - - return 0; -} - -int p_rename(const char *from, const char *to) -{ - git_win32_path wfrom; - git_win32_path wto; - int rename_tries; - int rename_succeeded; - int error; - - if (git_win32_path_from_utf8(wfrom, from) < 0 || - git_win32_path_from_utf8(wto, to) < 0) - return -1; - - /* wait up to 50ms if file is locked by another thread or process */ - rename_tries = 0; - rename_succeeded = 0; - while (rename_tries < 10) { - if (ensure_writable(wto) == 0 && - MoveFileExW(wfrom, wto, MOVEFILE_REPLACE_EXISTING | MOVEFILE_COPY_ALLOWED) != 0) { - rename_succeeded = 1; - break; - } - - error = GetLastError(); - if (error == ERROR_SHARING_VIOLATION || error == ERROR_ACCESS_DENIED) { - Sleep(5); - rename_tries++; - } else - break; - } - - return rename_succeeded ? 0 : -1; -} - -int p_recv(GIT_SOCKET socket, void *buffer, size_t length, int flags) -{ - if ((size_t)((int)length) != length) - return -1; /* giterr_set will be done by caller */ - - return recv(socket, buffer, (int)length, flags); -} - -int p_send(GIT_SOCKET socket, const void *buffer, size_t length, int flags) -{ - if ((size_t)((int)length) != length) - return -1; /* giterr_set will be done by caller */ - - return send(socket, buffer, (int)length, flags); -} - -/** - * Borrowed from http://old.nabble.com/Porting-localtime_r-and-gmtime_r-td15282276.html - * On Win32, `gmtime_r` doesn't exist but `gmtime` is threadsafe, so we can use that - */ -struct tm * -p_localtime_r (const time_t *timer, struct tm *result) -{ - struct tm *local_result; - local_result = localtime (timer); - - if (local_result == NULL || result == NULL) - return NULL; - - memcpy (result, local_result, sizeof (struct tm)); - return result; -} -struct tm * -p_gmtime_r (const time_t *timer, struct tm *result) -{ - struct tm *local_result; - local_result = gmtime (timer); - - if (local_result == NULL || result == NULL) - return NULL; - - memcpy (result, local_result, sizeof (struct tm)); - return result; -} - -int p_inet_pton(int af, const char *src, void *dst) -{ - struct sockaddr_storage sin; - void *addr; - int sin_len = sizeof(struct sockaddr_storage), addr_len; - int error = 0; - - if (af == AF_INET) { - addr = &((struct sockaddr_in *)&sin)->sin_addr; - addr_len = sizeof(struct in_addr); - } else if (af == AF_INET6) { - addr = &((struct sockaddr_in6 *)&sin)->sin6_addr; - addr_len = sizeof(struct in6_addr); - } else { - errno = EAFNOSUPPORT; - return -1; - } - - if ((error = WSAStringToAddressA((LPSTR)src, af, NULL, (LPSOCKADDR)&sin, &sin_len)) == 0) { - memcpy(dst, addr, addr_len); - return 1; - } - - switch(WSAGetLastError()) { - case WSAEINVAL: - return 0; - case WSAEFAULT: - errno = ENOSPC; - return -1; - case WSA_NOT_ENOUGH_MEMORY: - errno = ENOMEM; - return -1; - } - - errno = EINVAL; - return -1; -} diff --git a/vendor/libgit2/src/win32/precompiled.c b/vendor/libgit2/src/win32/precompiled.c deleted file mode 100644 index 5f656a45d..000000000 --- a/vendor/libgit2/src/win32/precompiled.c +++ /dev/null @@ -1 +0,0 @@ -#include "precompiled.h" diff --git a/vendor/libgit2/src/win32/precompiled.h b/vendor/libgit2/src/win32/precompiled.h deleted file mode 100644 index 33ce106d3..000000000 --- a/vendor/libgit2/src/win32/precompiled.h +++ /dev/null @@ -1,23 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#include - -#include -#include -#ifdef GIT_THREADS - #include "win32/pthread.h" -#endif - -#include "git2.h" -#include "common.h" diff --git a/vendor/libgit2/src/win32/pthread.c b/vendor/libgit2/src/win32/pthread.c deleted file mode 100644 index a1cc18932..000000000 --- a/vendor/libgit2/src/win32/pthread.c +++ /dev/null @@ -1,269 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "pthread.h" -#include "../global.h" - -#define CLEAN_THREAD_EXIT 0x6F012842 - -/* The thread procedure stub used to invoke the caller's procedure - * and capture the return value for later collection. Windows will - * only hold a DWORD, but we need to be able to store an entire - * void pointer. This requires the indirection. */ -static DWORD WINAPI git_win32__threadproc(LPVOID lpParameter) -{ - git_win32_thread *thread = lpParameter; - - thread->result = thread->proc(thread->param); - - git__free_tls_data(); - - return CLEAN_THREAD_EXIT; -} - -int git_win32__thread_create( - git_win32_thread *GIT_RESTRICT thread, - const pthread_attr_t *GIT_RESTRICT attr, - void *(*start_routine)(void*), - void *GIT_RESTRICT arg) -{ - GIT_UNUSED(attr); - - thread->result = NULL; - thread->param = arg; - thread->proc = start_routine; - thread->thread = CreateThread( - NULL, 0, git_win32__threadproc, thread, 0, NULL); - - return thread->thread ? 0 : -1; -} - -int git_win32__thread_join( - git_win32_thread *thread, - void **value_ptr) -{ - DWORD exit; - - if (WaitForSingleObject(thread->thread, INFINITE) != WAIT_OBJECT_0) - return -1; - - if (!GetExitCodeThread(thread->thread, &exit)) { - CloseHandle(thread->thread); - return -1; - } - - /* Check for the thread having exited uncleanly. If exit was unclean, - * then we don't have a return value to give back to the caller. */ - if (exit != CLEAN_THREAD_EXIT) { - assert(false); - thread->result = NULL; - } - - if (value_ptr) - *value_ptr = thread->result; - - CloseHandle(thread->thread); - return 0; -} - -int pthread_mutex_init( - pthread_mutex_t *GIT_RESTRICT mutex, - const pthread_mutexattr_t *GIT_RESTRICT mutexattr) -{ - GIT_UNUSED(mutexattr); - InitializeCriticalSection(mutex); - return 0; -} - -int pthread_mutex_destroy(pthread_mutex_t *mutex) -{ - DeleteCriticalSection(mutex); - return 0; -} - -int pthread_mutex_lock(pthread_mutex_t *mutex) -{ - EnterCriticalSection(mutex); - return 0; -} - -int pthread_mutex_unlock(pthread_mutex_t *mutex) -{ - LeaveCriticalSection(mutex); - return 0; -} - -int pthread_cond_init(pthread_cond_t *cond, const pthread_condattr_t *attr) -{ - /* We don't support non-default attributes. */ - if (attr) - return EINVAL; - - /* This is an auto-reset event. */ - *cond = CreateEventW(NULL, FALSE, FALSE, NULL); - assert(*cond); - - /* If we can't create the event, claim that the reason was out-of-memory. - * The actual reason can be fetched with GetLastError(). */ - return *cond ? 0 : ENOMEM; -} - -int pthread_cond_destroy(pthread_cond_t *cond) -{ - BOOL closed; - - if (!cond) - return EINVAL; - - closed = CloseHandle(*cond); - assert(closed); - GIT_UNUSED(closed); - - *cond = NULL; - return 0; -} - -int pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex) -{ - int error; - DWORD wait_result; - - if (!cond || !mutex) - return EINVAL; - - /* The caller must be holding the mutex. */ - error = pthread_mutex_unlock(mutex); - - if (error) - return error; - - wait_result = WaitForSingleObject(*cond, INFINITE); - assert(WAIT_OBJECT_0 == wait_result); - GIT_UNUSED(wait_result); - - return pthread_mutex_lock(mutex); -} - -int pthread_cond_signal(pthread_cond_t *cond) -{ - BOOL signaled; - - if (!cond) - return EINVAL; - - signaled = SetEvent(*cond); - assert(signaled); - GIT_UNUSED(signaled); - - return 0; -} - -/* pthread_cond_broadcast is not implemented because doing so with just - * Win32 events is quite complicated, and no caller in libgit2 uses it - * yet. - */ -int pthread_num_processors_np(void) -{ - DWORD_PTR p, s; - int n = 0; - - if (GetProcessAffinityMask(GetCurrentProcess(), &p, &s)) - for (; p; p >>= 1) - n += p&1; - - return n ? n : 1; -} - -typedef void (WINAPI *win32_srwlock_fn)(GIT_SRWLOCK *); - -static win32_srwlock_fn win32_srwlock_initialize; -static win32_srwlock_fn win32_srwlock_acquire_shared; -static win32_srwlock_fn win32_srwlock_release_shared; -static win32_srwlock_fn win32_srwlock_acquire_exclusive; -static win32_srwlock_fn win32_srwlock_release_exclusive; - -int pthread_rwlock_init( - pthread_rwlock_t *GIT_RESTRICT lock, - const pthread_rwlockattr_t *GIT_RESTRICT attr) -{ - GIT_UNUSED(attr); - - if (win32_srwlock_initialize) - win32_srwlock_initialize(&lock->native.srwl); - else - InitializeCriticalSection(&lock->native.csec); - - return 0; -} - -int pthread_rwlock_rdlock(pthread_rwlock_t *lock) -{ - if (win32_srwlock_acquire_shared) - win32_srwlock_acquire_shared(&lock->native.srwl); - else - EnterCriticalSection(&lock->native.csec); - - return 0; -} - -int pthread_rwlock_rdunlock(pthread_rwlock_t *lock) -{ - if (win32_srwlock_release_shared) - win32_srwlock_release_shared(&lock->native.srwl); - else - LeaveCriticalSection(&lock->native.csec); - - return 0; -} - -int pthread_rwlock_wrlock(pthread_rwlock_t *lock) -{ - if (win32_srwlock_acquire_exclusive) - win32_srwlock_acquire_exclusive(&lock->native.srwl); - else - EnterCriticalSection(&lock->native.csec); - - return 0; -} - -int pthread_rwlock_wrunlock(pthread_rwlock_t *lock) -{ - if (win32_srwlock_release_exclusive) - win32_srwlock_release_exclusive(&lock->native.srwl); - else - LeaveCriticalSection(&lock->native.csec); - - return 0; -} - -int pthread_rwlock_destroy(pthread_rwlock_t *lock) -{ - if (!win32_srwlock_initialize) - DeleteCriticalSection(&lock->native.csec); - git__memzero(lock, sizeof(*lock)); - return 0; -} - -int win32_pthread_initialize(void) -{ - HMODULE hModule = GetModuleHandleW(L"kernel32"); - - if (hModule) { - win32_srwlock_initialize = (win32_srwlock_fn) - GetProcAddress(hModule, "InitializeSRWLock"); - win32_srwlock_acquire_shared = (win32_srwlock_fn) - GetProcAddress(hModule, "AcquireSRWLockShared"); - win32_srwlock_release_shared = (win32_srwlock_fn) - GetProcAddress(hModule, "ReleaseSRWLockShared"); - win32_srwlock_acquire_exclusive = (win32_srwlock_fn) - GetProcAddress(hModule, "AcquireSRWLockExclusive"); - win32_srwlock_release_exclusive = (win32_srwlock_fn) - GetProcAddress(hModule, "ReleaseSRWLockExclusive"); - } - - return 0; -} diff --git a/vendor/libgit2/src/win32/pthread.h b/vendor/libgit2/src/win32/pthread.h deleted file mode 100644 index e4826ca7f..000000000 --- a/vendor/libgit2/src/win32/pthread.h +++ /dev/null @@ -1,92 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#ifndef GIT_PTHREAD_H -#define GIT_PTHREAD_H - -#include "../common.h" - -#if defined (_MSC_VER) -# define GIT_RESTRICT __restrict -#else -# define GIT_RESTRICT __restrict__ -#endif - -typedef struct { - HANDLE thread; - void *(*proc)(void *); - void *param; - void *result; -} git_win32_thread; - -typedef int pthread_mutexattr_t; -typedef int pthread_condattr_t; -typedef int pthread_attr_t; -typedef int pthread_rwlockattr_t; - -typedef CRITICAL_SECTION pthread_mutex_t; -typedef HANDLE pthread_cond_t; - -typedef struct { void *Ptr; } GIT_SRWLOCK; - -typedef struct { - union { - GIT_SRWLOCK srwl; - CRITICAL_SECTION csec; - } native; -} pthread_rwlock_t; - -#define PTHREAD_MUTEX_INITIALIZER {(void*)-1} - -int git_win32__thread_create( - git_win32_thread *GIT_RESTRICT, - const pthread_attr_t *GIT_RESTRICT, - void *(*) (void *), - void *GIT_RESTRICT); - -int git_win32__thread_join( - git_win32_thread *, - void **); - -#ifdef GIT_THREADS - -typedef git_win32_thread git_thread; - -#define git_thread_create(git_thread_ptr, attr, start_routine, arg) \ - git_win32__thread_create(git_thread_ptr, attr, start_routine, arg) -#define git_thread_join(git_thread_ptr, status) \ - git_win32__thread_join(git_thread_ptr, status) - -#endif - -int pthread_mutex_init( - pthread_mutex_t *GIT_RESTRICT mutex, - const pthread_mutexattr_t *GIT_RESTRICT mutexattr); -int pthread_mutex_destroy(pthread_mutex_t *); -int pthread_mutex_lock(pthread_mutex_t *); -int pthread_mutex_unlock(pthread_mutex_t *); - -int pthread_cond_init(pthread_cond_t *, const pthread_condattr_t *); -int pthread_cond_destroy(pthread_cond_t *); -int pthread_cond_wait(pthread_cond_t *, pthread_mutex_t *); -int pthread_cond_signal(pthread_cond_t *); -/* pthread_cond_broadcast is not supported on Win32 yet. */ - -int pthread_num_processors_np(void); - -int pthread_rwlock_init( - pthread_rwlock_t *GIT_RESTRICT lock, - const pthread_rwlockattr_t *GIT_RESTRICT attr); -int pthread_rwlock_rdlock(pthread_rwlock_t *); -int pthread_rwlock_rdunlock(pthread_rwlock_t *); -int pthread_rwlock_wrlock(pthread_rwlock_t *); -int pthread_rwlock_wrunlock(pthread_rwlock_t *); -int pthread_rwlock_destroy(pthread_rwlock_t *); - -extern int win32_pthread_initialize(void); - -#endif diff --git a/vendor/libgit2/src/win32/reparse.h b/vendor/libgit2/src/win32/reparse.h deleted file mode 100644 index 70f9fd652..000000000 --- a/vendor/libgit2/src/win32/reparse.h +++ /dev/null @@ -1,57 +0,0 @@ -/* -* Copyright (C) the libgit2 contributors. All rights reserved. -* -* This file is part of libgit2, distributed under the GNU GPL v2 with -* a Linking Exception. For full terms see the included COPYING file. -*/ - -#ifndef INCLUDE_git_win32_reparse_h__ -#define INCLUDE_git_win32_reparse_h__ - -/* This structure is defined on MSDN at -* http://msdn.microsoft.com/en-us/library/windows/hardware/ff552012(v=vs.85).aspx -* -* It was formerly included in the Windows 2000 SDK and remains defined in -* MinGW, so we must define it with a silly name to avoid conflicting. -*/ -typedef struct _GIT_REPARSE_DATA_BUFFER { - ULONG ReparseTag; - USHORT ReparseDataLength; - USHORT Reserved; - union { - struct { - USHORT SubstituteNameOffset; - USHORT SubstituteNameLength; - USHORT PrintNameOffset; - USHORT PrintNameLength; - ULONG Flags; - WCHAR PathBuffer[1]; - } SymbolicLinkReparseBuffer; - struct { - USHORT SubstituteNameOffset; - USHORT SubstituteNameLength; - USHORT PrintNameOffset; - USHORT PrintNameLength; - WCHAR PathBuffer[1]; - } MountPointReparseBuffer; - struct { - UCHAR DataBuffer[1]; - } GenericReparseBuffer; - }; -} GIT_REPARSE_DATA_BUFFER; - -#define REPARSE_DATA_HEADER_SIZE 8 -#define REPARSE_DATA_MOUNTPOINT_HEADER_SIZE 8 -#define REPARSE_DATA_UNION_SIZE 12 - -/* Missing in MinGW */ -#ifndef FSCTL_GET_REPARSE_POINT -# define FSCTL_GET_REPARSE_POINT 0x000900a8 -#endif - -/* Missing in MinGW */ -#ifndef FSCTL_SET_REPARSE_POINT -# define FSCTL_SET_REPARSE_POINT 0x000900a4 -#endif - -#endif diff --git a/vendor/libgit2/src/win32/utf-conv.c b/vendor/libgit2/src/win32/utf-conv.c deleted file mode 100644 index 96fd4606e..000000000 --- a/vendor/libgit2/src/win32/utf-conv.c +++ /dev/null @@ -1,147 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "common.h" -#include "utf-conv.h" - -GIT_INLINE(void) git__set_errno(void) -{ - if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) - errno = ENAMETOOLONG; - else - errno = EINVAL; -} - -/** - * Converts a UTF-8 string to wide characters. - * - * @param dest The buffer to receive the wide string. - * @param dest_size The size of the buffer, in characters. - * @param src The UTF-8 string to convert. - * @return The length of the wide string, in characters (not counting the NULL terminator), or < 0 for failure - */ -int git__utf8_to_16(wchar_t *dest, size_t dest_size, const char *src) -{ - int len; - - /* Length of -1 indicates NULL termination of the input string. Subtract 1 from the result to - * turn 0 into -1 (an error code) and to not count the NULL terminator as part of the string's - * length. MultiByteToWideChar never returns int's minvalue, so underflow is not possible */ - if ((len = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, src, -1, dest, (int)dest_size) - 1) < 0) - git__set_errno(); - - return len; -} - -/** - * Converts a wide string to UTF-8. - * - * @param dest The buffer to receive the UTF-8 string. - * @param dest_size The size of the buffer, in bytes. - * @param src The wide string to convert. - * @return The length of the UTF-8 string, in bytes (not counting the NULL terminator), or < 0 for failure - */ -int git__utf16_to_8(char *dest, size_t dest_size, const wchar_t *src) -{ - int len; - - /* Length of -1 indicates NULL termination of the input string. Subtract 1 from the result to - * turn 0 into -1 (an error code) and to not count the NULL terminator as part of the string's - * length. WideCharToMultiByte never returns int's minvalue, so underflow is not possible */ - if ((len = WideCharToMultiByte(CP_UTF8, WC_ERR_INVALID_CHARS, src, -1, dest, (int)dest_size, NULL, NULL) - 1) < 0) - git__set_errno(); - - return len; -} - -/** - * Converts a UTF-8 string to wide characters. - * Memory is allocated to hold the converted string. - * The caller is responsible for freeing the string with git__free. - * - * @param dest Receives a pointer to the wide string. - * @param src The UTF-8 string to convert. - * @return The length of the wide string, in characters (not counting the NULL terminator), or < 0 for failure - */ -int git__utf8_to_16_alloc(wchar_t **dest, const char *src) -{ - int utf16_size; - - *dest = NULL; - - /* Length of -1 indicates NULL termination of the input string */ - utf16_size = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, src, -1, NULL, 0); - - if (!utf16_size) { - git__set_errno(); - return -1; - } - - if (!(*dest = git__mallocarray(utf16_size, sizeof(wchar_t)))) { - errno = ENOMEM; - return -1; - } - - utf16_size = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, src, -1, *dest, utf16_size); - - if (!utf16_size) { - git__set_errno(); - - git__free(*dest); - *dest = NULL; - } - - /* Subtract 1 from the result to turn 0 into -1 (an error code) and to not count the NULL - * terminator as part of the string's length. MultiByteToWideChar never returns int's minvalue, - * so underflow is not possible */ - return utf16_size - 1; -} - -/** - * Converts a wide string to UTF-8. - * Memory is allocated to hold the converted string. - * The caller is responsible for freeing the string with git__free. - * - * @param dest Receives a pointer to the UTF-8 string. - * @param src The wide string to convert. - * @return The length of the UTF-8 string, in bytes (not counting the NULL terminator), or < 0 for failure - */ -int git__utf16_to_8_alloc(char **dest, const wchar_t *src) -{ - int utf8_size; - - *dest = NULL; - - /* Length of -1 indicates NULL termination of the input string */ - utf8_size = WideCharToMultiByte(CP_UTF8, WC_ERR_INVALID_CHARS, src, -1, NULL, 0, NULL, NULL); - - if (!utf8_size) { - git__set_errno(); - return -1; - } - - *dest = git__malloc(utf8_size); - - if (!*dest) { - errno = ENOMEM; - return -1; - } - - utf8_size = WideCharToMultiByte(CP_UTF8, WC_ERR_INVALID_CHARS, src, -1, *dest, utf8_size, NULL, NULL); - - if (!utf8_size) { - git__set_errno(); - - git__free(*dest); - *dest = NULL; - } - - /* Subtract 1 from the result to turn 0 into -1 (an error code) and to not count the NULL - * terminator as part of the string's length. MultiByteToWideChar never returns int's minvalue, - * so underflow is not possible */ - return utf8_size - 1; -} diff --git a/vendor/libgit2/src/win32/utf-conv.h b/vendor/libgit2/src/win32/utf-conv.h deleted file mode 100644 index 33b95f59f..000000000 --- a/vendor/libgit2/src/win32/utf-conv.h +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_git_utfconv_h__ -#define INCLUDE_git_utfconv_h__ - -#include -#include "common.h" - -#ifndef WC_ERR_INVALID_CHARS -# define WC_ERR_INVALID_CHARS 0x80 -#endif - -/** - * Converts a UTF-8 string to wide characters. - * - * @param dest The buffer to receive the wide string. - * @param dest_size The size of the buffer, in characters. - * @param src The UTF-8 string to convert. - * @return The length of the wide string, in characters (not counting the NULL terminator), or < 0 for failure - */ -int git__utf8_to_16(wchar_t *dest, size_t dest_size, const char *src); - -/** - * Converts a wide string to UTF-8. - * - * @param dest The buffer to receive the UTF-8 string. - * @param dest_size The size of the buffer, in bytes. - * @param src The wide string to convert. - * @return The length of the UTF-8 string, in bytes (not counting the NULL terminator), or < 0 for failure - */ -int git__utf16_to_8(char *dest, size_t dest_size, const wchar_t *src); - -/** - * Converts a UTF-8 string to wide characters. - * Memory is allocated to hold the converted string. - * The caller is responsible for freeing the string with git__free. - * - * @param dest Receives a pointer to the wide string. - * @param src The UTF-8 string to convert. - * @return The length of the wide string, in characters (not counting the NULL terminator), or < 0 for failure - */ -int git__utf8_to_16_alloc(wchar_t **dest, const char *src); - -/** - * Converts a wide string to UTF-8. - * Memory is allocated to hold the converted string. - * The caller is responsible for freeing the string with git__free. - * - * @param dest Receives a pointer to the UTF-8 string. - * @param src The wide string to convert. - * @return The length of the UTF-8 string, in bytes (not counting the NULL terminator), or < 0 for failure - */ -int git__utf16_to_8_alloc(char **dest, const wchar_t *src); - -#endif diff --git a/vendor/libgit2/src/win32/version.h b/vendor/libgit2/src/win32/version.h deleted file mode 100644 index 79667697f..000000000 --- a/vendor/libgit2/src/win32/version.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_win32_version_h__ -#define INCLUDE_win32_version_h__ - -#include - -GIT_INLINE(int) git_has_win32_version(int major, int minor, int service_pack) -{ - OSVERSIONINFOEX version_test = {0}; - DWORD version_test_mask; - DWORDLONG version_condition_mask = 0; - - version_test.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX); - version_test.dwMajorVersion = major; - version_test.dwMinorVersion = minor; - version_test.wServicePackMajor = (WORD)service_pack; - version_test.wServicePackMinor = 0; - - version_test_mask = (VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR); - - VER_SET_CONDITION(version_condition_mask, VER_MAJORVERSION, VER_GREATER_EQUAL); - VER_SET_CONDITION(version_condition_mask, VER_MINORVERSION, VER_GREATER_EQUAL); - VER_SET_CONDITION(version_condition_mask, VER_SERVICEPACKMAJOR, VER_GREATER_EQUAL); - VER_SET_CONDITION(version_condition_mask, VER_SERVICEPACKMINOR, VER_GREATER_EQUAL); - - if (!VerifyVersionInfo(&version_test, version_test_mask, version_condition_mask)) - return 0; - - return 1; -} - -#endif diff --git a/vendor/libgit2/src/win32/w32_buffer.c b/vendor/libgit2/src/win32/w32_buffer.c deleted file mode 100644 index 9122baaa6..000000000 --- a/vendor/libgit2/src/win32/w32_buffer.c +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "common.h" -#include "w32_buffer.h" -#include "../buffer.h" -#include "utf-conv.h" - -GIT_INLINE(int) handle_wc_error(void) -{ - if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) - errno = ENAMETOOLONG; - else - errno = EINVAL; - - return -1; -} - -int git_buf_put_w(git_buf *buf, const wchar_t *string_w, size_t len_w) -{ - int utf8_len, utf8_write_len; - size_t new_size; - - if (!len_w) - return 0; - - assert(string_w); - - /* Measure the string necessary for conversion */ - if ((utf8_len = WideCharToMultiByte(CP_UTF8, WC_ERR_INVALID_CHARS, string_w, len_w, NULL, 0, NULL, NULL)) == 0) - return 0; - - assert(utf8_len > 0); - - GITERR_CHECK_ALLOC_ADD(&new_size, buf->size, (size_t)utf8_len); - GITERR_CHECK_ALLOC_ADD(&new_size, new_size, 1); - - if (git_buf_grow(buf, new_size) < 0) - return -1; - - if ((utf8_write_len = WideCharToMultiByte( - CP_UTF8, WC_ERR_INVALID_CHARS, string_w, len_w, &buf->ptr[buf->size], utf8_len, NULL, NULL)) == 0) - return handle_wc_error(); - - assert(utf8_write_len == utf8_len); - - buf->size += utf8_write_len; - buf->ptr[buf->size] = '\0'; - return 0; -} diff --git a/vendor/libgit2/src/win32/w32_buffer.h b/vendor/libgit2/src/win32/w32_buffer.h deleted file mode 100644 index 62243986f..000000000 --- a/vendor/libgit2/src/win32/w32_buffer.h +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_git_win32_buffer_h__ -#define INCLUDE_git_win32_buffer_h__ - -#include "../buffer.h" - -/** - * Convert a wide character string to UTF-8 and append the results to the - * buffer. - */ -int git_buf_put_w(git_buf *buf, const wchar_t *string_w, size_t len_w); - -#endif diff --git a/vendor/libgit2/src/win32/w32_crtdbg_stacktrace.c b/vendor/libgit2/src/win32/w32_crtdbg_stacktrace.c deleted file mode 100644 index a778f4164..000000000 --- a/vendor/libgit2/src/win32/w32_crtdbg_stacktrace.c +++ /dev/null @@ -1,343 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#if defined(GIT_MSVC_CRTDBG) -#include "w32_stack.h" -#include "w32_crtdbg_stacktrace.h" - -#define CRTDBG_STACKTRACE__UID_LEN (15) - -/** - * The stacktrace of an allocation can be distilled - * to a unique id based upon the stackframe pointers - * and ignoring any size arguments. We will use these - * UIDs as the (char const*) __FILE__ argument we - * give to the CRT malloc routines. - */ -typedef struct { - char uid[CRTDBG_STACKTRACE__UID_LEN + 1]; -} git_win32__crtdbg_stacktrace__uid; - -/** - * All mallocs with the same stacktrace will be de-duped - * and aggregated into this row. - */ -typedef struct { - git_win32__crtdbg_stacktrace__uid uid; /* must be first */ - git_win32__stack__raw_data raw_data; - unsigned int count_allocs; /* times this alloc signature seen since init */ - unsigned int count_allocs_at_last_checkpoint; /* times since last mark */ - unsigned int transient_count_leaks; /* sum of leaks */ -} git_win32__crtdbg_stacktrace__row; - -static CRITICAL_SECTION g_crtdbg_stacktrace_cs; - -/** - * CRTDBG memory leak tracking takes a "char const * const file_name" - * and stores the pointer in the heap data (instead of allocing a copy - * for itself). Normally, this is not a problem, since we usually pass - * in __FILE__. But I'm going to lie to it and pass in the address of - * the UID in place of the file_name. Also, I do not want to alloc the - * stacktrace data (because we are called from inside our alloc routines). - * Therefore, I'm creating a very large static pool array to store row - * data. This also eliminates the temptation to realloc it (and move the - * UID pointers). - * - * And to efficiently look for duplicates we need an index on the rows - * so we can bsearch it. Again, without mallocing. - * - * If we observe more than MY_ROW_LIMIT unique malloc signatures, we - * fall through and use the traditional __FILE__ processing and don't - * try to de-dup them. If your testing hits this limit, just increase - * it and try again. - */ - -#define MY_ROW_LIMIT (1024 * 1024) -static git_win32__crtdbg_stacktrace__row g_cs_rows[MY_ROW_LIMIT]; -static git_win32__crtdbg_stacktrace__row *g_cs_index[MY_ROW_LIMIT]; - -static unsigned int g_cs_end = MY_ROW_LIMIT; -static unsigned int g_cs_ins = 0; /* insertion point == unique allocs seen */ -static unsigned int g_count_total_allocs = 0; /* number of allocs seen */ -static unsigned int g_transient_count_total_leaks = 0; /* number of total leaks */ -static unsigned int g_transient_count_dedup_leaks = 0; /* number of unique leaks */ -static bool g_limit_reached = false; /* had allocs after we filled row table */ - -static unsigned int g_checkpoint_id = 0; /* to better label leak checkpoints */ -static bool g_transient_leaks_since_mark = false; /* payload for hook */ - -/** - * Compare function for bsearch on g_cs_index table. - */ -static int row_cmp(const void *v1, const void *v2) -{ - git_win32__stack__raw_data *d1 = (git_win32__stack__raw_data*)v1; - git_win32__crtdbg_stacktrace__row *r2 = (git_win32__crtdbg_stacktrace__row *)v2; - - return (git_win32__stack_compare(d1, &r2->raw_data)); -} - -/** - * Unique insert the new data into the row and index tables. - * We have to sort by the stackframe data itself, not the uid. - */ -static git_win32__crtdbg_stacktrace__row * insert_unique( - const git_win32__stack__raw_data *pdata) -{ - size_t pos; - if (git__bsearch(g_cs_index, g_cs_ins, pdata, row_cmp, &pos) < 0) { - /* Append new unique item to row table. */ - memcpy(&g_cs_rows[g_cs_ins].raw_data, pdata, sizeof(*pdata)); - sprintf(g_cs_rows[g_cs_ins].uid.uid, "##%08lx", g_cs_ins); - - /* Insert pointer to it into the proper place in the index table. */ - if (pos < g_cs_ins) - memmove(&g_cs_index[pos+1], &g_cs_index[pos], (g_cs_ins - pos)*sizeof(g_cs_index[0])); - g_cs_index[pos] = &g_cs_rows[g_cs_ins]; - - g_cs_ins++; - } - - g_cs_index[pos]->count_allocs++; - - return g_cs_index[pos]; -} - -/** - * Hook function to receive leak data from the CRT. (This includes - * both ":()" data, but also each of the - * various headers and fields. - * - * Scan this for the special "##" UID forms that we substituted - * for the "". Map back to the row data and - * increment its leak count. - * - * See https://msdn.microsoft.com/en-us/library/74kabxyx.aspx - * - * We suppress the actual crtdbg output. - */ -static int __cdecl report_hook(int nRptType, char *szMsg, int *retVal) -{ - static int hook_result = TRUE; /* FALSE to get stock dump; TRUE to suppress. */ - unsigned int pos; - - *retVal = 0; /* do not invoke debugger */ - - if ((szMsg[0] != '#') || (szMsg[1] != '#')) - return hook_result; - - if (sscanf(&szMsg[2], "%08lx", &pos) < 1) - return hook_result; - if (pos >= g_cs_ins) - return hook_result; - - if (g_transient_leaks_since_mark) { - if (g_cs_rows[pos].count_allocs == g_cs_rows[pos].count_allocs_at_last_checkpoint) - return hook_result; - } - - g_cs_rows[pos].transient_count_leaks++; - - if (g_cs_rows[pos].transient_count_leaks == 1) - g_transient_count_dedup_leaks++; - - g_transient_count_total_leaks++; - - return hook_result; -} - -/** - * Write leak data to all of the various places we need. - * We force the caller to sprintf() the message first - * because we want to avoid fprintf() because it allocs. - */ -static void my_output(const char *buf) -{ - fwrite(buf, strlen(buf), 1, stderr); - OutputDebugString(buf); -} - -/** - * For each row with leaks, dump a stacktrace for it. - */ -static void dump_summary(const char *label) -{ - unsigned int k; - char buf[10 * 1024]; - - if (g_transient_count_total_leaks == 0) - return; - - fflush(stdout); - fflush(stderr); - my_output("\n"); - - if (g_limit_reached) { - sprintf(buf, - "LEAK SUMMARY: de-dup row table[%d] filled. Increase MY_ROW_LIMIT.\n", - MY_ROW_LIMIT); - my_output(buf); - } - - if (!label) - label = ""; - - if (g_transient_leaks_since_mark) { - sprintf(buf, "LEAK CHECKPOINT %d: leaks %d unique %d: %s\n", - g_checkpoint_id, g_transient_count_total_leaks, g_transient_count_dedup_leaks, label); - my_output(buf); - } else { - sprintf(buf, "LEAK SUMMARY: TOTAL leaks %d de-duped %d: %s\n", - g_transient_count_total_leaks, g_transient_count_dedup_leaks, label); - my_output(buf); - } - my_output("\n"); - - for (k = 0; k < g_cs_ins; k++) { - if (g_cs_rows[k].transient_count_leaks > 0) { - sprintf(buf, "LEAK: %s leaked %d of %d times:\n", - g_cs_rows[k].uid.uid, - g_cs_rows[k].transient_count_leaks, - g_cs_rows[k].count_allocs); - my_output(buf); - - if (git_win32__stack_format( - buf, sizeof(buf), &g_cs_rows[k].raw_data, - NULL, NULL) >= 0) { - my_output(buf); - } - - my_output("\n"); - } - } - - fflush(stderr); -} - -void git_win32__crtdbg_stacktrace_init(void) -{ - InitializeCriticalSection(&g_crtdbg_stacktrace_cs); - - EnterCriticalSection(&g_crtdbg_stacktrace_cs); - - _CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF); - - _CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_DEBUG | _CRTDBG_MODE_FILE); - _CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_DEBUG | _CRTDBG_MODE_FILE); - _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_DEBUG | _CRTDBG_MODE_FILE); - - _CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR); - _CrtSetReportFile(_CRT_ERROR, _CRTDBG_FILE_STDERR); - _CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR); - - LeaveCriticalSection(&g_crtdbg_stacktrace_cs); -} - -int git_win32__crtdbg_stacktrace__dump( - git_win32__crtdbg_stacktrace_options opt, - const char *label) -{ - _CRT_REPORT_HOOK old; - unsigned int k; - int r = 0; - -#define IS_BIT_SET(o,b) (((o) & (b)) != 0) - - bool b_set_mark = IS_BIT_SET(opt, GIT_WIN32__CRTDBG_STACKTRACE__SET_MARK); - bool b_leaks_since_mark = IS_BIT_SET(opt, GIT_WIN32__CRTDBG_STACKTRACE__LEAKS_SINCE_MARK); - bool b_leaks_total = IS_BIT_SET(opt, GIT_WIN32__CRTDBG_STACKTRACE__LEAKS_TOTAL); - bool b_quiet = IS_BIT_SET(opt, GIT_WIN32__CRTDBG_STACKTRACE__QUIET); - - if (b_leaks_since_mark && b_leaks_total) { - giterr_set(GITERR_INVALID, "Cannot combine LEAKS_SINCE_MARK and LEAKS_TOTAL."); - return GIT_ERROR; - } - if (!b_set_mark && !b_leaks_since_mark && !b_leaks_total) { - giterr_set(GITERR_INVALID, "Nothing to do."); - return GIT_ERROR; - } - - EnterCriticalSection(&g_crtdbg_stacktrace_cs); - - if (b_leaks_since_mark || b_leaks_total) { - /* All variables with "transient" in the name are per-dump counters - * and reset before each dump. This lets us handle checkpoints. - */ - g_transient_count_total_leaks = 0; - g_transient_count_dedup_leaks = 0; - for (k = 0; k < g_cs_ins; k++) { - g_cs_rows[k].transient_count_leaks = 0; - } - } - - g_transient_leaks_since_mark = b_leaks_since_mark; - - old = _CrtSetReportHook(report_hook); - _CrtDumpMemoryLeaks(); - _CrtSetReportHook(old); - - if (b_leaks_since_mark || b_leaks_total) { - r = g_transient_count_dedup_leaks; - - if (!b_quiet) - dump_summary(label); - } - - if (b_set_mark) { - for (k = 0; k < g_cs_ins; k++) { - g_cs_rows[k].count_allocs_at_last_checkpoint = g_cs_rows[k].count_allocs; - } - - g_checkpoint_id++; - } - - LeaveCriticalSection(&g_crtdbg_stacktrace_cs); - - return r; -} - -void git_win32__crtdbg_stacktrace_cleanup(void) -{ - /* At shutdown/cleanup, dump cummulative leak info - * with everything since startup. This might generate - * extra noise if the caller has been doing checkpoint - * dumps, but it might also eliminate some false - * positives for resources previously reported during - * checkpoints. - */ - git_win32__crtdbg_stacktrace__dump( - GIT_WIN32__CRTDBG_STACKTRACE__LEAKS_TOTAL, - "CLEANUP"); - - DeleteCriticalSection(&g_crtdbg_stacktrace_cs); -} - -const char *git_win32__crtdbg_stacktrace(int skip, const char *file) -{ - git_win32__stack__raw_data new_data; - git_win32__crtdbg_stacktrace__row *row; - const char * result = file; - - if (git_win32__stack_capture(&new_data, skip+1) < 0) - return result; - - EnterCriticalSection(&g_crtdbg_stacktrace_cs); - - if (g_cs_ins < g_cs_end) { - row = insert_unique(&new_data); - result = row->uid.uid; - } else { - g_limit_reached = true; - } - - g_count_total_allocs++; - - LeaveCriticalSection(&g_crtdbg_stacktrace_cs); - - return result; -} -#endif diff --git a/vendor/libgit2/src/win32/w32_crtdbg_stacktrace.h b/vendor/libgit2/src/win32/w32_crtdbg_stacktrace.h deleted file mode 100644 index 40ca60d53..000000000 --- a/vendor/libgit2/src/win32/w32_crtdbg_stacktrace.h +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_w32_crtdbg_stacktrace_h__ -#define INCLUDE_w32_crtdbg_stacktrace_h__ - -#if defined(GIT_MSVC_CRTDBG) - -/** - * Initialize our memory leak tracking and de-dup data structures. - * This should ONLY be called by git_libgit2_init(). - */ -void git_win32__crtdbg_stacktrace_init(void); - -/** - * Shutdown our memory leak tracking and dump summary data. - * This should ONLY be called by git_libgit2_shutdown(). - * - * We explicitly call _CrtDumpMemoryLeaks() during here so - * that we can compute summary data for the leaks. We print - * the stacktrace of each unique leak. - * - * This cleanup does not happen if the app calls exit() - * without calling the libgit2 shutdown code. - * - * This info we print here is independent of any automatic - * reporting during exit() caused by _CRTDBG_LEAK_CHECK_DF. - * Set it in your app if you also want traditional reporting. - */ -void git_win32__crtdbg_stacktrace_cleanup(void); - -/** - * Checkpoint options. - */ -typedef enum git_win32__crtdbg_stacktrace_options { - /** - * Set checkpoint marker. - */ - GIT_WIN32__CRTDBG_STACKTRACE__SET_MARK = (1 << 0), - - /** - * Dump leaks since last checkpoint marker. - * May not be combined with __LEAKS_TOTAL. - * - * Note that this may generate false positives for global TLS - * error state and other global caches that aren't cleaned up - * until the thread/process terminates. So when using this - * around a region of interest, also check the final (at exit) - * dump before digging into leaks reported here. - */ - GIT_WIN32__CRTDBG_STACKTRACE__LEAKS_SINCE_MARK = (1 << 1), - - /** - * Dump leaks since init. May not be combined - * with __LEAKS_SINCE_MARK. - */ - GIT_WIN32__CRTDBG_STACKTRACE__LEAKS_TOTAL = (1 << 2), - - /** - * Suppress printing during dumps. - * Just return leak count. - */ - GIT_WIN32__CRTDBG_STACKTRACE__QUIET = (1 << 3), - -} git_win32__crtdbg_stacktrace_options; - -/** - * Checkpoint memory state and/or dump unique stack traces of - * current memory leaks. - * - * @return number of unique leaks (relative to requested starting - * point) or error. - */ -GIT_EXTERN(int) git_win32__crtdbg_stacktrace__dump( - git_win32__crtdbg_stacktrace_options opt, - const char *label); - -/** - * Construct stacktrace and append it to the global buffer. - * Return pointer to start of this string. On any error or - * lack of buffer space, just return the given file buffer - * so it will behave as usual. - * - * This should ONLY be called by our internal memory allocations - * routines. - */ -const char *git_win32__crtdbg_stacktrace(int skip, const char *file); - -#endif -#endif diff --git a/vendor/libgit2/src/win32/w32_stack.c b/vendor/libgit2/src/win32/w32_stack.c deleted file mode 100644 index 15af3dcb7..000000000 --- a/vendor/libgit2/src/win32/w32_stack.c +++ /dev/null @@ -1,192 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#if defined(GIT_MSVC_CRTDBG) -#include "Windows.h" -#include "Dbghelp.h" -#include "win32/posix.h" -#include "w32_stack.h" -#include "hash.h" - -/** - * This is supposedly defined in WinBase.h (from Windows.h) but there were linker issues. - */ -USHORT WINAPI RtlCaptureStackBackTrace(ULONG, ULONG, PVOID*, PULONG); - -static bool g_win32_stack_initialized = false; -static HANDLE g_win32_stack_process = INVALID_HANDLE_VALUE; -static git_win32__stack__aux_cb_alloc g_aux_cb_alloc = NULL; -static git_win32__stack__aux_cb_lookup g_aux_cb_lookup = NULL; - -int git_win32__stack__set_aux_cb( - git_win32__stack__aux_cb_alloc cb_alloc, - git_win32__stack__aux_cb_lookup cb_lookup) -{ - g_aux_cb_alloc = cb_alloc; - g_aux_cb_lookup = cb_lookup; - - return 0; -} - -void git_win32__stack_init(void) -{ - if (!g_win32_stack_initialized) { - g_win32_stack_process = GetCurrentProcess(); - SymSetOptions(SYMOPT_LOAD_LINES); - SymInitialize(g_win32_stack_process, NULL, TRUE); - g_win32_stack_initialized = true; - } -} - -void git_win32__stack_cleanup(void) -{ - if (g_win32_stack_initialized) { - SymCleanup(g_win32_stack_process); - g_win32_stack_process = INVALID_HANDLE_VALUE; - g_win32_stack_initialized = false; - } -} - -int git_win32__stack_capture(git_win32__stack__raw_data *pdata, int skip) -{ - if (!g_win32_stack_initialized) { - giterr_set(GITERR_INVALID, "git_win32_stack not initialized."); - return GIT_ERROR; - } - - memset(pdata, 0, sizeof(*pdata)); - pdata->nr_frames = RtlCaptureStackBackTrace( - skip+1, GIT_WIN32__STACK__MAX_FRAMES, pdata->frames, NULL); - - /* If an "aux" data provider was registered, ask it to capture - * whatever data it needs and give us an "aux_id" to it so that - * we can refer to it later when reporting. - */ - if (g_aux_cb_alloc) - (g_aux_cb_alloc)(&pdata->aux_id); - - return 0; -} - -int git_win32__stack_compare( - git_win32__stack__raw_data *d1, - git_win32__stack__raw_data *d2) -{ - return memcmp(d1, d2, sizeof(*d1)); -} - -int git_win32__stack_format( - char *pbuf, int buf_len, - const git_win32__stack__raw_data *pdata, - const char *prefix, const char *suffix) -{ -#define MY_MAX_FILENAME 255 - - /* SYMBOL_INFO has char FileName[1] at the end. The docs say to - * to malloc it with extra space for your desired max filename. - */ - struct { - SYMBOL_INFO symbol; - char extra[MY_MAX_FILENAME + 1]; - } s; - - IMAGEHLP_LINE64 line; - int buf_used = 0; - unsigned int k; - char detail[MY_MAX_FILENAME * 2]; /* filename plus space for function name and formatting */ - int detail_len; - - if (!g_win32_stack_initialized) { - giterr_set(GITERR_INVALID, "git_win32_stack not initialized."); - return GIT_ERROR; - } - - if (!prefix) - prefix = "\t"; - if (!suffix) - suffix = "\n"; - - memset(pbuf, 0, buf_len); - - memset(&s, 0, sizeof(s)); - s.symbol.MaxNameLen = MY_MAX_FILENAME; - s.symbol.SizeOfStruct = sizeof(SYMBOL_INFO); - - memset(&line, 0, sizeof(line)); - line.SizeOfStruct = sizeof(IMAGEHLP_LINE64); - - for (k=0; k < pdata->nr_frames; k++) { - DWORD64 frame_k = (DWORD64)pdata->frames[k]; - DWORD dwUnused; - - if (SymFromAddr(g_win32_stack_process, frame_k, 0, &s.symbol) && - SymGetLineFromAddr64(g_win32_stack_process, frame_k, &dwUnused, &line)) { - const char *pslash; - const char *pfile; - - pslash = strrchr(line.FileName, '\\'); - pfile = ((pslash) ? (pslash+1) : line.FileName); - p_snprintf(detail, sizeof(detail), "%s%s:%d> %s%s", - prefix, pfile, line.LineNumber, s.symbol.Name, suffix); - } else { - /* This happens when we cross into another module. - * For example, in CLAR tests, this is typically - * the CRT startup code. Just print an unknown - * frame and continue. - */ - p_snprintf(detail, sizeof(detail), "%s??%s", prefix, suffix); - } - detail_len = strlen(detail); - - if (buf_len < (buf_used + detail_len + 1)) { - /* we don't have room for this frame in the buffer, so just stop. */ - break; - } - - memcpy(&pbuf[buf_used], detail, detail_len); - buf_used += detail_len; - } - - /* "aux_id" 0 is reserved to mean no aux data. This is needed to handle - * allocs that occur before the aux callbacks were registered. - */ - if (pdata->aux_id > 0) { - p_snprintf(detail, sizeof(detail), "%saux_id: %d%s", - prefix, pdata->aux_id, suffix); - detail_len = strlen(detail); - if ((buf_used + detail_len + 1) < buf_len) { - memcpy(&pbuf[buf_used], detail, detail_len); - buf_used += detail_len; - } - - /* If an "aux" data provider is still registered, ask it to append its detailed - * data to the end of ours using the "aux_id" it gave us when this de-duped - * item was created. - */ - if (g_aux_cb_lookup) - (g_aux_cb_lookup)(pdata->aux_id, &pbuf[buf_used], (buf_len - buf_used - 1)); - } - - return GIT_OK; -} - -int git_win32__stack( - char * pbuf, int buf_len, - int skip, - const char *prefix, const char *suffix) -{ - git_win32__stack__raw_data data; - int error; - - if ((error = git_win32__stack_capture(&data, skip)) < 0) - return error; - if ((error = git_win32__stack_format(pbuf, buf_len, &data, prefix, suffix)) < 0) - return error; - return 0; -} - -#endif diff --git a/vendor/libgit2/src/win32/w32_stack.h b/vendor/libgit2/src/win32/w32_stack.h deleted file mode 100644 index 21170bd2f..000000000 --- a/vendor/libgit2/src/win32/w32_stack.h +++ /dev/null @@ -1,138 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#ifndef INCLUDE_w32_stack_h__ -#define INCLUDE_w32_stack_h__ - -#if defined(GIT_MSVC_CRTDBG) - -/** - * This type defines a callback to be used to augment a C stacktrace - * with "aux" data. This can be used, for example, to allow LibGit2Sharp - * (or other interpreted consumer libraries) to give us C# stacktrace - * data for the PInvoke. - * - * This callback will be called during crtdbg-instrumented allocs. - * - * @param aux_id [out] A returned "aux_id" representing a unique - * (de-duped at the C# layer) stacktrace. "aux_id" 0 is reserved - * to mean no aux stacktrace data. - */ -typedef void (*git_win32__stack__aux_cb_alloc)(unsigned int *aux_id); - -/** - * This type defines a callback to be used to augment the output of - * a stacktrace. This will be used to request the C# layer format - * the C# stacktrace associated with "aux_id" into the provided - * buffer. - * - * This callback will be called during leak reporting. - * - * @param aux_id The "aux_id" key associated with a stacktrace. - * @param aux_msg A buffer where a formatted message should be written. - * @param aux_msg_len The size of the buffer. - */ -typedef void (*git_win32__stack__aux_cb_lookup)(unsigned int aux_id, char *aux_msg, unsigned int aux_msg_len); - -/** - * Register an "aux" data provider to augment our C stacktrace data. - * - * This can be used, for example, to allow LibGit2Sharp (or other - * interpreted consumer libraries) to give us the C# stacktrace of - * the PInvoke. - * - * If you choose to use this feature, it should be registered during - * initialization and not changed for the duration of the process. - */ -GIT_EXTERN(int) git_win32__stack__set_aux_cb( - git_win32__stack__aux_cb_alloc cb_alloc, - git_win32__stack__aux_cb_lookup cb_lookup); - -/** - * Maximum number of stackframes to record for a - * single stacktrace. - */ -#define GIT_WIN32__STACK__MAX_FRAMES 30 - -/** - * Wrapper containing the raw unprocessed stackframe - * data for a single stacktrace and any "aux_id". - * - * I put the aux_id first so leaks will be sorted by it. - * So, for example, if a specific callstack in C# leaks - * a repo handle, all of the pointers within the associated - * repo pointer will be grouped together. - */ -typedef struct { - unsigned int aux_id; - unsigned int nr_frames; - void *frames[GIT_WIN32__STACK__MAX_FRAMES]; -} git_win32__stack__raw_data; - - -/** - * Load symbol table data. This should be done in the primary - * thread at startup (under a lock if there are other threads - * active). - */ -void git_win32__stack_init(void); - -/** - * Cleanup symbol table data. This should be done in the - * primary thead at shutdown (under a lock if there are other - * threads active). - */ -void git_win32__stack_cleanup(void); - - -/** - * Capture raw stack trace data for the current process/thread. - * - * @param skip Number of initial frames to skip. Pass 0 to - * begin with the caller of this routine. Pass 1 to begin - * with its caller. And so on. - */ -int git_win32__stack_capture(git_win32__stack__raw_data *pdata, int skip); - -/** - * Compare 2 raw stacktraces with the usual -1,0,+1 result. - * This includes any "aux_id" values in the comparison, so that - * our de-dup is also "aux" context relative. - */ -int git_win32__stack_compare( - git_win32__stack__raw_data *d1, - git_win32__stack__raw_data *d2); - -/** - * Format raw stacktrace data into buffer WITHOUT using any mallocs. - * - * @param prefix String written before each frame; defaults to "\t". - * @param suffix String written after each frame; defaults to "\n". - */ -int git_win32__stack_format( - char *pbuf, int buf_len, - const git_win32__stack__raw_data *pdata, - const char *prefix, const char *suffix); - -/** - * Convenience routine to capture and format stacktrace into - * a buffer WITHOUT using any mallocs. This is primarily a - * wrapper for testing. - * - * @param skip Number of initial frames to skip. Pass 0 to - * begin with the caller of this routine. Pass 1 to begin - * with its caller. And so on. - * @param prefix String written before each frame; defaults to "\t". - * @param suffix String written after each frame; defaults to "\n". - */ -int git_win32__stack( - char * pbuf, int buf_len, - int skip, - const char *prefix, const char *suffix); - -#endif /* GIT_MSVC_CRTDBG */ -#endif /* INCLUDE_w32_stack_h__ */ diff --git a/vendor/libgit2/src/win32/w32_util.c b/vendor/libgit2/src/win32/w32_util.c deleted file mode 100644 index 60311bb50..000000000 --- a/vendor/libgit2/src/win32/w32_util.c +++ /dev/null @@ -1,163 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include "w32_util.h" - -/** - * Creates a FindFirstFile(Ex) filter string from a UTF-8 path. - * The filter string enumerates all items in the directory. - * - * @param dest The buffer to receive the filter string. - * @param src The UTF-8 path of the directory to enumerate. - * @return True if the filter string was created successfully; false otherwise - */ -bool git_win32__findfirstfile_filter(git_win32_path dest, const char *src) -{ - static const wchar_t suffix[] = L"\\*"; - int len = git_win32_path_from_utf8(dest, src); - - /* Ensure the path was converted */ - if (len < 0) - return false; - - /* Ensure that the path does not end with a trailing slash, - * because we're about to add one. Don't rely our trim_end - * helper, because we want to remove the backslash even for - * drive letter paths, in this case. */ - if (len > 0 && - (dest[len - 1] == L'/' || dest[len - 1] == L'\\')) { - dest[len - 1] = L'\0'; - len--; - } - - /* Ensure we have enough room to add the suffix */ - if ((size_t)len >= GIT_WIN_PATH_UTF16 - CONST_STRLEN(suffix)) - return false; - - wcscat(dest, suffix); - return true; -} - -/** - * Ensures the given path (file or folder) has the +H (hidden) attribute set. - * - * @param path The path which should receive the +H bit. - * @return 0 on success; -1 on failure - */ -int git_win32__set_hidden(const char *path, bool hidden) -{ - git_win32_path buf; - DWORD attrs, newattrs; - - if (git_win32_path_from_utf8(buf, path) < 0) - return -1; - - attrs = GetFileAttributesW(buf); - - /* Ensure the path exists */ - if (attrs == INVALID_FILE_ATTRIBUTES) - return -1; - - if (hidden) - newattrs = attrs | FILE_ATTRIBUTE_HIDDEN; - else - newattrs = attrs & ~FILE_ATTRIBUTE_HIDDEN; - - if (attrs != newattrs && !SetFileAttributesW(buf, newattrs)) { - giterr_set(GITERR_OS, "Failed to %s hidden bit for '%s'", - hidden ? "set" : "unset", path); - return -1; - } - - return 0; -} - -int git_win32__hidden(bool *out, const char *path) -{ - git_win32_path buf; - DWORD attrs; - - if (git_win32_path_from_utf8(buf, path) < 0) - return -1; - - attrs = GetFileAttributesW(buf); - - /* Ensure the path exists */ - if (attrs == INVALID_FILE_ATTRIBUTES) - return -1; - - *out = (attrs & FILE_ATTRIBUTE_HIDDEN) ? true : false; - return 0; -} - -/** - * Removes any trailing backslashes from a path, except in the case of a drive - * letter path (C:\, D:\, etc.). This function cannot fail. - * - * @param path The path which should be trimmed. - * @return The length of the modified string (<= the input length) - */ -size_t git_win32__path_trim_end(wchar_t *str, size_t len) -{ - while (1) { - if (!len || str[len - 1] != L'\\') - break; - - /* Don't trim backslashes from drive letter paths, which - * are 3 characters long and of the form C:\, D:\, etc. */ - if (len == 3 && git_win32__isalpha(str[0]) && str[1] == ':') - break; - - len--; - } - - str[len] = L'\0'; - - return len; -} - -/** - * Removes any of the following namespace prefixes from a path, - * if found: "\??\", "\\?\", "\\?\UNC\". This function cannot fail. - * - * @param path The path which should be converted. - * @return The length of the modified string (<= the input length) - */ -size_t git_win32__canonicalize_path(wchar_t *str, size_t len) -{ - static const wchar_t dosdevices_prefix[] = L"\\\?\?\\"; - static const wchar_t nt_prefix[] = L"\\\\?\\"; - static const wchar_t unc_prefix[] = L"UNC\\"; - size_t to_advance = 0; - - /* "\??\" -- DOS Devices prefix */ - if (len >= CONST_STRLEN(dosdevices_prefix) && - !wcsncmp(str, dosdevices_prefix, CONST_STRLEN(dosdevices_prefix))) { - to_advance += CONST_STRLEN(dosdevices_prefix); - len -= CONST_STRLEN(dosdevices_prefix); - } - /* "\\?\" -- NT namespace prefix */ - else if (len >= CONST_STRLEN(nt_prefix) && - !wcsncmp(str, nt_prefix, CONST_STRLEN(nt_prefix))) { - to_advance += CONST_STRLEN(nt_prefix); - len -= CONST_STRLEN(nt_prefix); - } - - /* "\??\UNC\", "\\?\UNC\" -- UNC prefix */ - if (to_advance && len >= CONST_STRLEN(unc_prefix) && - !wcsncmp(str + to_advance, unc_prefix, CONST_STRLEN(unc_prefix))) { - to_advance += CONST_STRLEN(unc_prefix); - len -= CONST_STRLEN(unc_prefix); - } - - if (to_advance) { - memmove(str, str + to_advance, len * sizeof(wchar_t)); - str[len] = L'\0'; - } - - return git_win32__path_trim_end(str, len); -} diff --git a/vendor/libgit2/src/win32/w32_util.h b/vendor/libgit2/src/win32/w32_util.h deleted file mode 100644 index 2e475e5e9..000000000 --- a/vendor/libgit2/src/win32/w32_util.h +++ /dev/null @@ -1,186 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#ifndef INCLUDE_w32_util_h__ -#define INCLUDE_w32_util_h__ - -#include "utf-conv.h" -#include "posix.h" -#include "path_w32.h" - -/* - -#include "common.h" -#include "path.h" -#include "path_w32.h" -#include "utf-conv.h" -#include "posix.h" -#include "reparse.h" -#include "dir.h" -*/ - - -GIT_INLINE(bool) git_win32__isalpha(wchar_t c) -{ - return ((c >= L'A' && c <= L'Z') || (c >= L'a' && c <= L'z')); -} - -/** - * Creates a FindFirstFile(Ex) filter string from a UTF-8 path. - * The filter string enumerates all items in the directory. - * - * @param dest The buffer to receive the filter string. - * @param src The UTF-8 path of the directory to enumerate. - * @return True if the filter string was created successfully; false otherwise - */ -bool git_win32__findfirstfile_filter(git_win32_path dest, const char *src); - -/** - * Ensures the given path (file or folder) has the +H (hidden) attribute set - * or unset. - * - * @param path The path that should receive the +H bit. - * @param hidden true to set +H, false to unset it - * @return 0 on success; -1 on failure - */ -extern int git_win32__set_hidden(const char *path, bool hidden); - -/** - * Determines if the given file or folder has the hidden attribute set. - * @param hidden pointer to store hidden value - * @param path The path that should be queried for hiddenness. - * @return 0 on success or an error code. - */ -extern int git_win32__hidden(bool *hidden, const char *path); - -/** - * Removes any trailing backslashes from a path, except in the case of a drive - * letter path (C:\, D:\, etc.). This function cannot fail. - * - * @param path The path which should be trimmed. - * @return The length of the modified string (<= the input length) - */ -size_t git_win32__path_trim_end(wchar_t *str, size_t len); - -/** - * Removes any of the following namespace prefixes from a path, - * if found: "\??\", "\\?\", "\\?\UNC\". This function cannot fail. - * - * @param path The path which should be converted. - * @return The length of the modified string (<= the input length) - */ -size_t git_win32__canonicalize_path(wchar_t *str, size_t len); - -/** - * Converts a FILETIME structure to a struct timespec. - * - * @param FILETIME A pointer to a FILETIME - * @param ts A pointer to the timespec structure to fill in - */ -GIT_INLINE(void) git_win32__filetime_to_timespec( - const FILETIME *ft, - struct timespec *ts) -{ - long long winTime = ((long long)ft->dwHighDateTime << 32) + ft->dwLowDateTime; - winTime -= 116444736000000000LL; /* Windows to Unix Epoch conversion */ - ts->tv_sec = (time_t)(winTime / 10000000); -#ifdef GIT_USE_NSEC - ts->tv_nsec = (winTime % 10000000) * 100; -#else - ts->tv_nsec = 0; -#endif -} - -GIT_INLINE(void) git_win32__timeval_to_filetime( - FILETIME *ft, const struct p_timeval tv) -{ - long long ticks = (tv.tv_sec * 10000000LL) + - (tv.tv_usec * 10LL) + 116444736000000000LL; - - ft->dwHighDateTime = ((ticks >> 32) & 0xffffffffLL); - ft->dwLowDateTime = (ticks & 0xffffffffLL); -} - -GIT_INLINE(void) git_win32__stat_init( - struct stat *st, - DWORD dwFileAttributes, - DWORD nFileSizeHigh, - DWORD nFileSizeLow, - FILETIME ftCreationTime, - FILETIME ftLastAccessTime, - FILETIME ftLastWriteTime) -{ - mode_t mode = S_IREAD; - - memset(st, 0, sizeof(struct stat)); - - if (dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) - mode |= S_IFDIR; - else - mode |= S_IFREG; - - if ((dwFileAttributes & FILE_ATTRIBUTE_READONLY) == 0) - mode |= S_IWRITE; - - st->st_ino = 0; - st->st_gid = 0; - st->st_uid = 0; - st->st_nlink = 1; - st->st_mode = mode; - st->st_size = ((git_off_t)nFileSizeHigh << 32) + nFileSizeLow; - st->st_dev = _getdrive() - 1; - st->st_rdev = st->st_dev; - git_win32__filetime_to_timespec(&ftLastAccessTime, &(st->st_atim)); - git_win32__filetime_to_timespec(&ftLastWriteTime, &(st->st_mtim)); - git_win32__filetime_to_timespec(&ftCreationTime, &(st->st_ctim)); -} - -GIT_INLINE(void) git_win32__file_information_to_stat( - struct stat *st, - const BY_HANDLE_FILE_INFORMATION *fileinfo) -{ - git_win32__stat_init(st, - fileinfo->dwFileAttributes, - fileinfo->nFileSizeHigh, - fileinfo->nFileSizeLow, - fileinfo->ftCreationTime, - fileinfo->ftLastAccessTime, - fileinfo->ftLastWriteTime); -} - -GIT_INLINE(int) git_win32__file_attribute_to_stat( - struct stat *st, - const WIN32_FILE_ATTRIBUTE_DATA *attrdata, - const wchar_t *path) -{ - git_win32__stat_init(st, - attrdata->dwFileAttributes, - attrdata->nFileSizeHigh, - attrdata->nFileSizeLow, - attrdata->ftCreationTime, - attrdata->ftLastAccessTime, - attrdata->ftLastWriteTime); - - if (attrdata->dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT && path) { - git_win32_path target; - - if (git_win32_path_readlink_w(target, path) >= 0) { - st->st_mode = (st->st_mode & ~S_IFMT) | S_IFLNK; - - /* st_size gets the UTF-8 length of the target name, in bytes, - * not counting the NULL terminator */ - if ((st->st_size = git__utf16_to_8(NULL, 0, target)) < 0) { - giterr_set(GITERR_OS, "Could not convert reparse point name for '%s'", path); - return -1; - } - } - } - - return 0; -} - -#endif diff --git a/vendor/libgit2/src/win32/win32-compat.h b/vendor/libgit2/src/win32/win32-compat.h deleted file mode 100644 index f888fd69e..000000000 --- a/vendor/libgit2/src/win32/win32-compat.h +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_win32_compat__ -#define INCLUDE_win32_compat__ - -#include -#include -#include -#include -#include - -typedef long suseconds_t; - -struct p_timeval { - time_t tv_sec; - suseconds_t tv_usec; -}; - -struct p_timespec { - time_t tv_sec; - long tv_nsec; -}; - -#define timespec p_timespec - -struct p_stat { - _dev_t st_dev; - _ino_t st_ino; - mode_t st_mode; - short st_nlink; - short st_uid; - short st_gid; - _dev_t st_rdev; - __int64 st_size; - struct timespec st_atim; - struct timespec st_mtim; - struct timespec st_ctim; -#define st_atime st_atim.tv_sec -#define st_mtime st_mtim.tv_sec -#define st_ctime st_ctim.tv_sec -#define st_atime_nsec st_atim.tv_nsec -#define st_mtime_nsec st_mtim.tv_nsec -#define st_ctime_nsec st_ctim.tv_nsec -}; - -#define stat p_stat - -#endif /* INCLUDE_win32_compat__ */ diff --git a/vendor/libgit2/src/xdiff/xdiff.h b/vendor/libgit2/src/xdiff/xdiff.h deleted file mode 100644 index f08f72e16..000000000 --- a/vendor/libgit2/src/xdiff/xdiff.h +++ /dev/null @@ -1,141 +0,0 @@ -/* - * LibXDiff by Davide Libenzi ( File Differential Library ) - * Copyright (C) 2003 Davide Libenzi - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * Davide Libenzi - * - */ - -#include "../util.h" - -#if !defined(XDIFF_H) -#define XDIFF_H - -#ifdef __cplusplus -extern "C" { -#endif /* #ifdef __cplusplus */ - - -#define XDF_NEED_MINIMAL (1 << 1) -#define XDF_IGNORE_WHITESPACE (1 << 2) -#define XDF_IGNORE_WHITESPACE_CHANGE (1 << 3) -#define XDF_IGNORE_WHITESPACE_AT_EOL (1 << 4) -#define XDF_WHITESPACE_FLAGS (XDF_IGNORE_WHITESPACE | XDF_IGNORE_WHITESPACE_CHANGE | XDF_IGNORE_WHITESPACE_AT_EOL) - -#define XDF_PATIENCE_DIFF (1 << 5) -#define XDF_HISTOGRAM_DIFF (1 << 6) -#define XDF_DIFF_ALGORITHM_MASK (XDF_PATIENCE_DIFF | XDF_HISTOGRAM_DIFF) -#define XDF_DIFF_ALG(x) ((x) & XDF_DIFF_ALGORITHM_MASK) - -#define XDF_IGNORE_BLANK_LINES (1 << 7) - -#define XDL_EMIT_FUNCNAMES (1 << 0) -#define XDL_EMIT_COMMON (1 << 1) -#define XDL_EMIT_FUNCCONTEXT (1 << 2) - -#define XDL_MMB_READONLY (1 << 0) - -#define XDL_MMF_ATOMIC (1 << 0) - -#define XDL_BDOP_INS 1 -#define XDL_BDOP_CPY 2 -#define XDL_BDOP_INSB 3 - -/* merge simplification levels */ -#define XDL_MERGE_MINIMAL 0 -#define XDL_MERGE_EAGER 1 -#define XDL_MERGE_ZEALOUS 2 -#define XDL_MERGE_ZEALOUS_ALNUM 3 - -/* merge favor modes */ -#define XDL_MERGE_FAVOR_OURS 1 -#define XDL_MERGE_FAVOR_THEIRS 2 -#define XDL_MERGE_FAVOR_UNION 3 - -/* merge output styles */ -#define XDL_MERGE_DIFF3 1 - -typedef struct s_mmfile { - char *ptr; - size_t size; -} mmfile_t; - -typedef struct s_mmbuffer { - char *ptr; - size_t size; -} mmbuffer_t; - -typedef struct s_xpparam { - unsigned long flags; -} xpparam_t; - -typedef struct s_xdemitcb { - void *priv; - int (*outf)(void *, mmbuffer_t *, int); -} xdemitcb_t; - -typedef long (*find_func_t)(const char *line, long line_len, char *buffer, long buffer_size, void *priv); - -typedef int (*xdl_emit_hunk_consume_func_t)(long start_a, long count_a, - long start_b, long count_b, - void *cb_data); - -typedef struct s_xdemitconf { - long ctxlen; - long interhunkctxlen; - unsigned long flags; - find_func_t find_func; - void *find_func_priv; - xdl_emit_hunk_consume_func_t hunk_func; -} xdemitconf_t; - -typedef struct s_bdiffparam { - long bsize; -} bdiffparam_t; - - -#define xdl_malloc(x) git__malloc(x) -#define xdl_free(ptr) git__free(ptr) -#define xdl_realloc(ptr,x) git__realloc(ptr,x) - -void *xdl_mmfile_first(mmfile_t *mmf, long *size); -long xdl_mmfile_size(mmfile_t *mmf); - -int xdl_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, - xdemitconf_t const *xecfg, xdemitcb_t *ecb); - -typedef struct s_xmparam { - xpparam_t xpp; - int marker_size; - int level; - int favor; - int style; - const char *ancestor; /* label for orig */ - const char *file1; /* label for mf1 */ - const char *file2; /* label for mf2 */ -} xmparam_t; - -#define DEFAULT_CONFLICT_MARKER_SIZE 7 - -int xdl_merge(mmfile_t *orig, mmfile_t *mf1, mmfile_t *mf2, - xmparam_t const *xmp, mmbuffer_t *result); - -#ifdef __cplusplus -} -#endif /* #ifdef __cplusplus */ - -#endif /* #if !defined(XDIFF_H) */ diff --git a/vendor/libgit2/src/xdiff/xdiffi.c b/vendor/libgit2/src/xdiff/xdiffi.c deleted file mode 100644 index f4d01b48c..000000000 --- a/vendor/libgit2/src/xdiff/xdiffi.c +++ /dev/null @@ -1,618 +0,0 @@ -/* - * LibXDiff by Davide Libenzi ( File Differential Library ) - * Copyright (C) 2003 Davide Libenzi - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * Davide Libenzi - * - */ - -#include "xinclude.h" -#include "common.h" -#include "integer.h" - - -#define XDL_MAX_COST_MIN 256 -#define XDL_HEUR_MIN_COST 256 -#define XDL_LINE_MAX (long)((1UL << (CHAR_BIT * sizeof(long) - 1)) - 1) -#define XDL_SNAKE_CNT 20 -#define XDL_K_HEUR 4 - - - -typedef struct s_xdpsplit { - long i1, i2; - int min_lo, min_hi; -} xdpsplit_t; - - - - -static long xdl_split(unsigned long const *ha1, long off1, long lim1, - unsigned long const *ha2, long off2, long lim2, - long *kvdf, long *kvdb, int need_min, xdpsplit_t *spl, - xdalgoenv_t *xenv); -static xdchange_t *xdl_add_change(xdchange_t *xscr, long i1, long i2, long chg1, long chg2); - - - - - -/* - * See "An O(ND) Difference Algorithm and its Variations", by Eugene Myers. - * Basically considers a "box" (off1, off2, lim1, lim2) and scan from both - * the forward diagonal starting from (off1, off2) and the backward diagonal - * starting from (lim1, lim2). If the K values on the same diagonal crosses - * returns the furthest point of reach. We might end up having to expensive - * cases using this algorithm is full, so a little bit of heuristic is needed - * to cut the search and to return a suboptimal point. - */ -static long xdl_split(unsigned long const *ha1, long off1, long lim1, - unsigned long const *ha2, long off2, long lim2, - long *kvdf, long *kvdb, int need_min, xdpsplit_t *spl, - xdalgoenv_t *xenv) { - long dmin = off1 - lim2, dmax = lim1 - off2; - long fmid = off1 - off2, bmid = lim1 - lim2; - long odd = (fmid - bmid) & 1; - long fmin = fmid, fmax = fmid; - long bmin = bmid, bmax = bmid; - long ec, d, i1, i2, prev1, best, dd, v, k; - - /* - * Set initial diagonal values for both forward and backward path. - */ - kvdf[fmid] = off1; - kvdb[bmid] = lim1; - - for (ec = 1;; ec++) { - int got_snake = 0; - - /* - * We need to extent the diagonal "domain" by one. If the next - * values exits the box boundaries we need to change it in the - * opposite direction because (max - min) must be a power of two. - * Also we initialize the external K value to -1 so that we can - * avoid extra conditions check inside the core loop. - */ - if (fmin > dmin) - kvdf[--fmin - 1] = -1; - else - ++fmin; - if (fmax < dmax) - kvdf[++fmax + 1] = -1; - else - --fmax; - - for (d = fmax; d >= fmin; d -= 2) { - if (kvdf[d - 1] >= kvdf[d + 1]) - i1 = kvdf[d - 1] + 1; - else - i1 = kvdf[d + 1]; - prev1 = i1; - i2 = i1 - d; - for (; i1 < lim1 && i2 < lim2 && ha1[i1] == ha2[i2]; i1++, i2++); - if (i1 - prev1 > xenv->snake_cnt) - got_snake = 1; - kvdf[d] = i1; - if (odd && bmin <= d && d <= bmax && kvdb[d] <= i1) { - spl->i1 = i1; - spl->i2 = i2; - spl->min_lo = spl->min_hi = 1; - return ec; - } - } - - /* - * We need to extent the diagonal "domain" by one. If the next - * values exits the box boundaries we need to change it in the - * opposite direction because (max - min) must be a power of two. - * Also we initialize the external K value to -1 so that we can - * avoid extra conditions check inside the core loop. - */ - if (bmin > dmin) - kvdb[--bmin - 1] = XDL_LINE_MAX; - else - ++bmin; - if (bmax < dmax) - kvdb[++bmax + 1] = XDL_LINE_MAX; - else - --bmax; - - for (d = bmax; d >= bmin; d -= 2) { - if (kvdb[d - 1] < kvdb[d + 1]) - i1 = kvdb[d - 1]; - else - i1 = kvdb[d + 1] - 1; - prev1 = i1; - i2 = i1 - d; - for (; i1 > off1 && i2 > off2 && ha1[i1 - 1] == ha2[i2 - 1]; i1--, i2--); - if (prev1 - i1 > xenv->snake_cnt) - got_snake = 1; - kvdb[d] = i1; - if (!odd && fmin <= d && d <= fmax && i1 <= kvdf[d]) { - spl->i1 = i1; - spl->i2 = i2; - spl->min_lo = spl->min_hi = 1; - return ec; - } - } - - if (need_min) - continue; - - /* - * If the edit cost is above the heuristic trigger and if - * we got a good snake, we sample current diagonals to see - * if some of the, have reached an "interesting" path. Our - * measure is a function of the distance from the diagonal - * corner (i1 + i2) penalized with the distance from the - * mid diagonal itself. If this value is above the current - * edit cost times a magic factor (XDL_K_HEUR) we consider - * it interesting. - */ - if (got_snake && ec > xenv->heur_min) { - for (best = 0, d = fmax; d >= fmin; d -= 2) { - dd = d > fmid ? d - fmid: fmid - d; - i1 = kvdf[d]; - i2 = i1 - d; - v = (i1 - off1) + (i2 - off2) - dd; - - if (v > XDL_K_HEUR * ec && v > best && - off1 + xenv->snake_cnt <= i1 && i1 < lim1 && - off2 + xenv->snake_cnt <= i2 && i2 < lim2) { - for (k = 1; ha1[i1 - k] == ha2[i2 - k]; k++) - if (k == xenv->snake_cnt) { - best = v; - spl->i1 = i1; - spl->i2 = i2; - break; - } - } - } - if (best > 0) { - spl->min_lo = 1; - spl->min_hi = 0; - return ec; - } - - for (best = 0, d = bmax; d >= bmin; d -= 2) { - dd = d > bmid ? d - bmid: bmid - d; - i1 = kvdb[d]; - i2 = i1 - d; - v = (lim1 - i1) + (lim2 - i2) - dd; - - if (v > XDL_K_HEUR * ec && v > best && - off1 < i1 && i1 <= lim1 - xenv->snake_cnt && - off2 < i2 && i2 <= lim2 - xenv->snake_cnt) { - for (k = 0; ha1[i1 + k] == ha2[i2 + k]; k++) - if (k == xenv->snake_cnt - 1) { - best = v; - spl->i1 = i1; - spl->i2 = i2; - break; - } - } - } - if (best > 0) { - spl->min_lo = 0; - spl->min_hi = 1; - return ec; - } - } - - /* - * Enough is enough. We spent too much time here and now we collect - * the furthest reaching path using the (i1 + i2) measure. - */ - if (ec >= xenv->mxcost) { - long fbest, fbest1, bbest, bbest1; - - fbest = fbest1 = -1; - for (d = fmax; d >= fmin; d -= 2) { - i1 = XDL_MIN(kvdf[d], lim1); - i2 = i1 - d; - if (lim2 < i2) - i1 = lim2 + d, i2 = lim2; - if (fbest < i1 + i2) { - fbest = i1 + i2; - fbest1 = i1; - } - } - - bbest = bbest1 = XDL_LINE_MAX; - for (d = bmax; d >= bmin; d -= 2) { - i1 = XDL_MAX(off1, kvdb[d]); - i2 = i1 - d; - if (i2 < off2) - i1 = off2 + d, i2 = off2; - if (i1 + i2 < bbest) { - bbest = i1 + i2; - bbest1 = i1; - } - } - - if ((lim1 + lim2) - bbest < fbest - (off1 + off2)) { - spl->i1 = fbest1; - spl->i2 = fbest - fbest1; - spl->min_lo = 1; - spl->min_hi = 0; - } else { - spl->i1 = bbest1; - spl->i2 = bbest - bbest1; - spl->min_lo = 0; - spl->min_hi = 1; - } - return ec; - } - } -} - - -/* - * Rule: "Divide et Impera". Recursively split the box in sub-boxes by calling - * the box splitting function. Note that the real job (marking changed lines) - * is done in the two boundary reaching checks. - */ -int xdl_recs_cmp(diffdata_t *dd1, long off1, long lim1, - diffdata_t *dd2, long off2, long lim2, - long *kvdf, long *kvdb, int need_min, xdalgoenv_t *xenv) { - unsigned long const *ha1 = dd1->ha, *ha2 = dd2->ha; - - /* - * Shrink the box by walking through each diagonal snake (SW and NE). - */ - for (; off1 < lim1 && off2 < lim2 && ha1[off1] == ha2[off2]; off1++, off2++); - for (; off1 < lim1 && off2 < lim2 && ha1[lim1 - 1] == ha2[lim2 - 1]; lim1--, lim2--); - - /* - * If one dimension is empty, then all records on the other one must - * be obviously changed. - */ - if (off1 == lim1) { - char *rchg2 = dd2->rchg; - long *rindex2 = dd2->rindex; - - for (; off2 < lim2; off2++) - rchg2[rindex2[off2]] = 1; - } else if (off2 == lim2) { - char *rchg1 = dd1->rchg; - long *rindex1 = dd1->rindex; - - for (; off1 < lim1; off1++) - rchg1[rindex1[off1]] = 1; - } else { - xdpsplit_t spl; - spl.i1 = spl.i2 = 0; - - /* - * Divide ... - */ - if (xdl_split(ha1, off1, lim1, ha2, off2, lim2, kvdf, kvdb, - need_min, &spl, xenv) < 0) { - - return -1; - } - - /* - * ... et Impera. - */ - if (xdl_recs_cmp(dd1, off1, spl.i1, dd2, off2, spl.i2, - kvdf, kvdb, spl.min_lo, xenv) < 0 || - xdl_recs_cmp(dd1, spl.i1, lim1, dd2, spl.i2, lim2, - kvdf, kvdb, spl.min_hi, xenv) < 0) { - - return -1; - } - } - - return 0; -} - - -int xdl_do_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, - xdfenv_t *xe) { - size_t ndiags, allocsize; - long *kvd, *kvdf, *kvdb; - xdalgoenv_t xenv; - diffdata_t dd1, dd2; - - if (XDF_DIFF_ALG(xpp->flags) == XDF_PATIENCE_DIFF) - return xdl_do_patience_diff(mf1, mf2, xpp, xe); - - if (XDF_DIFF_ALG(xpp->flags) == XDF_HISTOGRAM_DIFF) - return xdl_do_histogram_diff(mf1, mf2, xpp, xe); - - if (xdl_prepare_env(mf1, mf2, xpp, xe) < 0) { - - return -1; - } - - /* - * Allocate and setup K vectors to be used by the differential algorithm. - * One is to store the forward path and one to store the backward path. - */ - GITERR_CHECK_ALLOC_ADD3(&ndiags, xe->xdf1.nreff, xe->xdf2.nreff, 3); - GITERR_CHECK_ALLOC_MULTIPLY(&allocsize, ndiags, 2); - GITERR_CHECK_ALLOC_ADD(&allocsize, allocsize, 2); - GITERR_CHECK_ALLOC_MULTIPLY(&allocsize, allocsize, sizeof(long)); - - if (!(kvd = (long *) xdl_malloc(allocsize))) { - xdl_free_env(xe); - return -1; - } - kvdf = kvd; - kvdb = kvdf + ndiags; - kvdf += xe->xdf2.nreff + 1; - kvdb += xe->xdf2.nreff + 1; - - xenv.mxcost = xdl_bogosqrt(ndiags); - if (xenv.mxcost < XDL_MAX_COST_MIN) - xenv.mxcost = XDL_MAX_COST_MIN; - xenv.snake_cnt = XDL_SNAKE_CNT; - xenv.heur_min = XDL_HEUR_MIN_COST; - - dd1.nrec = xe->xdf1.nreff; - dd1.ha = xe->xdf1.ha; - dd1.rchg = xe->xdf1.rchg; - dd1.rindex = xe->xdf1.rindex; - dd2.nrec = xe->xdf2.nreff; - dd2.ha = xe->xdf2.ha; - dd2.rchg = xe->xdf2.rchg; - dd2.rindex = xe->xdf2.rindex; - - if (xdl_recs_cmp(&dd1, 0, dd1.nrec, &dd2, 0, dd2.nrec, - kvdf, kvdb, (xpp->flags & XDF_NEED_MINIMAL) != 0, &xenv) < 0) { - - xdl_free(kvd); - xdl_free_env(xe); - return -1; - } - - xdl_free(kvd); - - return 0; -} - - -static xdchange_t *xdl_add_change(xdchange_t *xscr, long i1, long i2, long chg1, long chg2) { - xdchange_t *xch; - - if (!(xch = (xdchange_t *) xdl_malloc(sizeof(xdchange_t)))) - return NULL; - - xch->next = xscr; - xch->i1 = i1; - xch->i2 = i2; - xch->chg1 = chg1; - xch->chg2 = chg2; - xch->ignore = 0; - - return xch; -} - - -int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) { - long ix, ixo, ixs, ixref, grpsiz, nrec = xdf->nrec; - char *rchg = xdf->rchg, *rchgo = xdfo->rchg; - xrecord_t **recs = xdf->recs; - - /* - * This is the same of what GNU diff does. Move back and forward - * change groups for a consistent and pretty diff output. This also - * helps in finding joinable change groups and reduce the diff size. - */ - for (ix = ixo = 0;;) { - /* - * Find the first changed line in the to-be-compacted file. - * We need to keep track of both indexes, so if we find a - * changed lines group on the other file, while scanning the - * to-be-compacted file, we need to skip it properly. Note - * that loops that are testing for changed lines on rchg* do - * not need index bounding since the array is prepared with - * a zero at position -1 and N. - */ - for (; ix < nrec && !rchg[ix]; ix++) - while (rchgo[ixo++]); - if (ix == nrec) - break; - - /* - * Record the start of a changed-group in the to-be-compacted file - * and find the end of it, on both to-be-compacted and other file - * indexes (ix and ixo). - */ - ixs = ix; - for (ix++; rchg[ix]; ix++); - for (; rchgo[ixo]; ixo++); - - do { - grpsiz = ix - ixs; - - /* - * If the line before the current change group, is equal to - * the last line of the current change group, shift backward - * the group. - */ - while (ixs > 0 && recs[ixs - 1]->ha == recs[ix - 1]->ha && - xdl_recmatch(recs[ixs - 1]->ptr, recs[ixs - 1]->size, recs[ix - 1]->ptr, recs[ix - 1]->size, flags)) { - rchg[--ixs] = 1; - rchg[--ix] = 0; - - /* - * This change might have joined two change groups, - * so we try to take this scenario in account by moving - * the start index accordingly (and so the other-file - * end-of-group index). - */ - for (; rchg[ixs - 1]; ixs--); - while (rchgo[--ixo]); - } - - /* - * Record the end-of-group position in case we are matched - * with a group of changes in the other file (that is, the - * change record before the end-of-group index in the other - * file is set). - */ - ixref = rchgo[ixo - 1] ? ix: nrec; - - /* - * If the first line of the current change group, is equal to - * the line next of the current change group, shift forward - * the group. - */ - while (ix < nrec && recs[ixs]->ha == recs[ix]->ha && - xdl_recmatch(recs[ixs]->ptr, recs[ixs]->size, recs[ix]->ptr, recs[ix]->size, flags)) { - rchg[ixs++] = 0; - rchg[ix++] = 1; - - /* - * This change might have joined two change groups, - * so we try to take this scenario in account by moving - * the start index accordingly (and so the other-file - * end-of-group index). Keep tracking the reference - * index in case we are shifting together with a - * corresponding group of changes in the other file. - */ - for (; rchg[ix]; ix++); - while (rchgo[++ixo]) - ixref = ix; - } - } while (grpsiz != ix - ixs); - - /* - * Try to move back the possibly merged group of changes, to match - * the recorded position in the other file. - */ - while (ixref < ix) { - rchg[--ixs] = 1; - rchg[--ix] = 0; - while (rchgo[--ixo]); - } - } - - return 0; -} - - -int xdl_build_script(xdfenv_t *xe, xdchange_t **xscr) { - xdchange_t *cscr = NULL, *xch; - char *rchg1 = xe->xdf1.rchg, *rchg2 = xe->xdf2.rchg; - long i1, i2, l1, l2; - - /* - * Trivial. Collects "groups" of changes and creates an edit script. - */ - for (i1 = xe->xdf1.nrec, i2 = xe->xdf2.nrec; i1 >= 0 || i2 >= 0; i1--, i2--) - if (rchg1[i1 - 1] || rchg2[i2 - 1]) { - for (l1 = i1; rchg1[i1 - 1]; i1--); - for (l2 = i2; rchg2[i2 - 1]; i2--); - - if (!(xch = xdl_add_change(cscr, i1, i2, l1 - i1, l2 - i2))) { - xdl_free_script(cscr); - return -1; - } - cscr = xch; - } - - *xscr = cscr; - - return 0; -} - - -void xdl_free_script(xdchange_t *xscr) { - xdchange_t *xch; - - while ((xch = xscr) != NULL) { - xscr = xscr->next; - xdl_free(xch); - } -} - -static int xdl_call_hunk_func(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb, - xdemitconf_t const *xecfg) -{ - xdchange_t *xch, *xche; - - (void)xe; - - for (xch = xscr; xch; xch = xche->next) { - xche = xdl_get_hunk(&xch, xecfg); - if (!xch) - break; - if (xecfg->hunk_func(xch->i1, xche->i1 + xche->chg1 - xch->i1, - xch->i2, xche->i2 + xche->chg2 - xch->i2, - ecb->priv) < 0) - return -1; - } - return 0; -} - -static void xdl_mark_ignorable(xdchange_t *xscr, xdfenv_t *xe, long flags) -{ - xdchange_t *xch; - - for (xch = xscr; xch; xch = xch->next) { - int ignore = 1; - xrecord_t **rec; - long i; - - rec = &xe->xdf1.recs[xch->i1]; - for (i = 0; i < xch->chg1 && ignore; i++) - ignore = xdl_blankline(rec[i]->ptr, rec[i]->size, flags); - - rec = &xe->xdf2.recs[xch->i2]; - for (i = 0; i < xch->chg2 && ignore; i++) - ignore = xdl_blankline(rec[i]->ptr, rec[i]->size, flags); - - xch->ignore = ignore; - } -} - -int xdl_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, - xdemitconf_t const *xecfg, xdemitcb_t *ecb) { - xdchange_t *xscr; - xdfenv_t xe; - emit_func_t ef = xecfg->hunk_func ? xdl_call_hunk_func : xdl_emit_diff; - - if (xdl_do_diff(mf1, mf2, xpp, &xe) < 0) { - - return -1; - } - if (xdl_change_compact(&xe.xdf1, &xe.xdf2, xpp->flags) < 0 || - xdl_change_compact(&xe.xdf2, &xe.xdf1, xpp->flags) < 0 || - xdl_build_script(&xe, &xscr) < 0) { - - xdl_free_env(&xe); - return -1; - } - if (xscr) { - if (xpp->flags & XDF_IGNORE_BLANK_LINES) - xdl_mark_ignorable(xscr, &xe, xpp->flags); - - if (ef(&xe, xscr, ecb, xecfg) < 0) { - - xdl_free_script(xscr); - xdl_free_env(&xe); - return -1; - } - xdl_free_script(xscr); - } - xdl_free_env(&xe); - - return 0; -} diff --git a/vendor/libgit2/src/xdiff/xdiffi.h b/vendor/libgit2/src/xdiff/xdiffi.h deleted file mode 100644 index 8b81206c9..000000000 --- a/vendor/libgit2/src/xdiff/xdiffi.h +++ /dev/null @@ -1,64 +0,0 @@ -/* - * LibXDiff by Davide Libenzi ( File Differential Library ) - * Copyright (C) 2003 Davide Libenzi - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * Davide Libenzi - * - */ - -#if !defined(XDIFFI_H) -#define XDIFFI_H - - -typedef struct s_diffdata { - long nrec; - unsigned long const *ha; - long *rindex; - char *rchg; -} diffdata_t; - -typedef struct s_xdalgoenv { - long mxcost; - long snake_cnt; - long heur_min; -} xdalgoenv_t; - -typedef struct s_xdchange { - struct s_xdchange *next; - long i1, i2; - long chg1, chg2; - int ignore; -} xdchange_t; - - - -int xdl_recs_cmp(diffdata_t *dd1, long off1, long lim1, - diffdata_t *dd2, long off2, long lim2, - long *kvdf, long *kvdb, int need_min, xdalgoenv_t *xenv); -int xdl_do_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, - xdfenv_t *xe); -int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags); -int xdl_build_script(xdfenv_t *xe, xdchange_t **xscr); -void xdl_free_script(xdchange_t *xscr); -int xdl_emit_diff(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb, - xdemitconf_t const *xecfg); -int xdl_do_patience_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, - xdfenv_t *env); -int xdl_do_histogram_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, - xdfenv_t *env); - -#endif /* #if !defined(XDIFFI_H) */ diff --git a/vendor/libgit2/src/xdiff/xemit.c b/vendor/libgit2/src/xdiff/xemit.c deleted file mode 100644 index 600fd1fdd..000000000 --- a/vendor/libgit2/src/xdiff/xemit.c +++ /dev/null @@ -1,290 +0,0 @@ -/* - * LibXDiff by Davide Libenzi ( File Differential Library ) - * Copyright (C) 2003 Davide Libenzi - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * Davide Libenzi - * - */ - -#include "xinclude.h" - - - - -static long xdl_get_rec(xdfile_t *xdf, long ri, char const **rec); -static int xdl_emit_record(xdfile_t *xdf, long ri, char const *pre, xdemitcb_t *ecb); - - - - -static long xdl_get_rec(xdfile_t *xdf, long ri, char const **rec) { - - *rec = xdf->recs[ri]->ptr; - - return xdf->recs[ri]->size; -} - - -static int xdl_emit_record(xdfile_t *xdf, long ri, char const *pre, xdemitcb_t *ecb) { - long size, psize = (long)strlen(pre); - char const *rec; - - size = xdl_get_rec(xdf, ri, &rec); - if (xdl_emit_diffrec(rec, size, pre, psize, ecb) < 0) { - - return -1; - } - - return 0; -} - - -/* - * Starting at the passed change atom, find the latest change atom to be included - * inside the differential hunk according to the specified configuration. - * Also advance xscr if the first changes must be discarded. - */ -xdchange_t *xdl_get_hunk(xdchange_t **xscr, xdemitconf_t const *xecfg) -{ - xdchange_t *xch, *xchp, *lxch; - long max_common = 2 * xecfg->ctxlen + xecfg->interhunkctxlen; - long max_ignorable = xecfg->ctxlen; - unsigned long ignored = 0; /* number of ignored blank lines */ - - /* remove ignorable changes that are too far before other changes */ - for (xchp = *xscr; xchp && xchp->ignore; xchp = xchp->next) { - xch = xchp->next; - - if (xch == NULL || - xch->i1 - (xchp->i1 + xchp->chg1) >= max_ignorable) - *xscr = xch; - } - - if (*xscr == NULL) - return NULL; - - lxch = *xscr; - - for (xchp = *xscr, xch = xchp->next; xch; xchp = xch, xch = xch->next) { - long distance = xch->i1 - (xchp->i1 + xchp->chg1); - if (distance > max_common) - break; - - if (distance < max_ignorable && (!xch->ignore || lxch == xchp)) { - lxch = xch; - ignored = 0; - } else if (distance < max_ignorable && xch->ignore) { - ignored += xch->chg2; - } else if (lxch != xchp && - xch->i1 + ignored - (lxch->i1 + lxch->chg1) > (unsigned long)max_common) { - break; - } else if (!xch->ignore) { - lxch = xch; - ignored = 0; - } else { - ignored += xch->chg2; - } - } - - return lxch; -} - - -static long def_ff(const char *rec, long len, char *buf, long sz, void *priv) -{ - (void)priv; - - if (len > 0 && - (isalpha((unsigned char)*rec) || /* identifier? */ - *rec == '_' || /* also identifier? */ - *rec == '$')) { /* identifiers from VMS and other esoterico */ - if (len > sz) - len = sz; - while (0 < len && isspace((unsigned char)rec[len - 1])) - len--; - memcpy(buf, rec, len); - return len; - } - return -1; -} - -static int xdl_emit_common(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb, - xdemitconf_t const *xecfg) { - xdfile_t *xdf = &xe->xdf2; - const char *rchg = xdf->rchg; - long ix; - - (void)xscr; - (void)xecfg; - - for (ix = 0; ix < xdf->nrec; ix++) { - if (rchg[ix]) - continue; - if (xdl_emit_record(xdf, ix, "", ecb)) - return -1; - } - return 0; -} - -struct func_line { - long len; - char buf[80]; -}; - -static long get_func_line(xdfenv_t *xe, xdemitconf_t const *xecfg, - struct func_line *func_line, long start, long limit) -{ - find_func_t ff = xecfg->find_func ? xecfg->find_func : def_ff; - long l, size, step = (start > limit) ? -1 : 1; - char *buf, dummy[1]; - - buf = func_line ? func_line->buf : dummy; - size = func_line ? sizeof(func_line->buf) : sizeof(dummy); - - for (l = start; l != limit && 0 <= l && l < xe->xdf1.nrec; l += step) { - const char *rec; - long reclen = xdl_get_rec(&xe->xdf1, l, &rec); - long len = ff(rec, reclen, buf, size, xecfg->find_func_priv); - if (len >= 0) { - if (func_line) - func_line->len = len; - return l; - } - } - return -1; -} - -int xdl_emit_diff(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb, - xdemitconf_t const *xecfg) { - long s1, s2, e1, e2, lctx; - xdchange_t *xch, *xche; - long funclineprev = -1; - struct func_line func_line = { 0 }; - - if (xecfg->flags & XDL_EMIT_COMMON) - return xdl_emit_common(xe, xscr, ecb, xecfg); - - for (xch = xscr; xch; xch = xche->next) { - xche = xdl_get_hunk(&xch, xecfg); - if (!xch) - break; - - s1 = XDL_MAX(xch->i1 - xecfg->ctxlen, 0); - s2 = XDL_MAX(xch->i2 - xecfg->ctxlen, 0); - - if (xecfg->flags & XDL_EMIT_FUNCCONTEXT) { - long fs1 = get_func_line(xe, xecfg, NULL, xch->i1, -1); - if (fs1 < 0) - fs1 = 0; - if (fs1 < s1) { - s2 -= s1 - fs1; - s1 = fs1; - } - } - - again: - lctx = xecfg->ctxlen; - lctx = XDL_MIN(lctx, xe->xdf1.nrec - (xche->i1 + xche->chg1)); - lctx = XDL_MIN(lctx, xe->xdf2.nrec - (xche->i2 + xche->chg2)); - - e1 = xche->i1 + xche->chg1 + lctx; - e2 = xche->i2 + xche->chg2 + lctx; - - if (xecfg->flags & XDL_EMIT_FUNCCONTEXT) { - long fe1 = get_func_line(xe, xecfg, NULL, - xche->i1 + xche->chg1, - xe->xdf1.nrec); - if (fe1 < 0) - fe1 = xe->xdf1.nrec; - if (fe1 > e1) { - e2 += fe1 - e1; - e1 = fe1; - } - - /* - * Overlap with next change? Then include it - * in the current hunk and start over to find - * its new end. - */ - if (xche->next) { - long l = xche->next->i1; - if (l <= e1 || - get_func_line(xe, xecfg, NULL, l, e1) < 0) { - xche = xche->next; - goto again; - } - } - } - - /* - * Emit current hunk header. - */ - - if (xecfg->flags & XDL_EMIT_FUNCNAMES) { - get_func_line(xe, xecfg, &func_line, - s1 - 1, funclineprev); - funclineprev = s1 - 1; - } - if (xdl_emit_hunk_hdr(s1 + 1, e1 - s1, s2 + 1, e2 - s2, - func_line.buf, func_line.len, ecb) < 0) - return -1; - - /* - * Emit pre-context. - */ - for (; s2 < xch->i2; s2++) - if (xdl_emit_record(&xe->xdf2, s2, " ", ecb) < 0) - return -1; - - for (s1 = xch->i1, s2 = xch->i2;; xch = xch->next) { - /* - * Merge previous with current change atom. - */ - for (; s1 < xch->i1 && s2 < xch->i2; s1++, s2++) - if (xdl_emit_record(&xe->xdf2, s2, " ", ecb) < 0) - return -1; - - /* - * Removes lines from the first file. - */ - for (s1 = xch->i1; s1 < xch->i1 + xch->chg1; s1++) - if (xdl_emit_record(&xe->xdf1, s1, "-", ecb) < 0) - return -1; - - /* - * Adds lines from the second file. - */ - for (s2 = xch->i2; s2 < xch->i2 + xch->chg2; s2++) - if (xdl_emit_record(&xe->xdf2, s2, "+", ecb) < 0) - return -1; - - if (xch == xche) - break; - s1 = xch->i1 + xch->chg1; - s2 = xch->i2 + xch->chg2; - } - - /* - * Emit post-context. - */ - for (s2 = xche->i2 + xche->chg2; s2 < e2; s2++) - if (xdl_emit_record(&xe->xdf2, s2, " ", ecb) < 0) - return -1; - } - - return 0; -} diff --git a/vendor/libgit2/src/xdiff/xemit.h b/vendor/libgit2/src/xdiff/xemit.h deleted file mode 100644 index d29710770..000000000 --- a/vendor/libgit2/src/xdiff/xemit.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - * LibXDiff by Davide Libenzi ( File Differential Library ) - * Copyright (C) 2003 Davide Libenzi - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * Davide Libenzi - * - */ - -#if !defined(XEMIT_H) -#define XEMIT_H - - -typedef int (*emit_func_t)(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb, - xdemitconf_t const *xecfg); - -xdchange_t *xdl_get_hunk(xdchange_t **xscr, xdemitconf_t const *xecfg); -int xdl_emit_diff(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb, - xdemitconf_t const *xecfg); - - - -#endif /* #if !defined(XEMIT_H) */ diff --git a/vendor/libgit2/src/xdiff/xhistogram.c b/vendor/libgit2/src/xdiff/xhistogram.c deleted file mode 100644 index 0c2edb89c..000000000 --- a/vendor/libgit2/src/xdiff/xhistogram.c +++ /dev/null @@ -1,373 +0,0 @@ -/* - * Copyright (C) 2010, Google Inc. - * and other copyright owners as documented in JGit's IP log. - * - * This program and the accompanying materials are made available - * under the terms of the Eclipse Distribution License v1.0 which - * accompanies this distribution, is reproduced below, and is - * available at http://www.eclipse.org/org/documents/edl-v10.php - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or - * without modification, are permitted provided that the following - * conditions are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * - Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials provided - * with the distribution. - * - * - Neither the name of the Eclipse Foundation, Inc. nor the - * names of its contributors may be used to endorse or promote - * products derived from this software without specific prior - * written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND - * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include "xinclude.h" -#include "xtypes.h" -#include "xdiff.h" -#include "common.h" - -#define MAX_PTR UINT_MAX -#define MAX_CNT UINT_MAX - -#define LINE_END(n) (line##n + count##n - 1) -#define LINE_END_PTR(n) (*line##n + *count##n - 1) - -struct histindex { - struct record { - unsigned int ptr, cnt; - struct record *next; - } **records, /* an occurrence */ - **line_map; /* map of line to record chain */ - chastore_t rcha; - unsigned int *next_ptrs; - unsigned int table_bits, - records_size, - line_map_size; - - unsigned int max_chain_length, - key_shift, - ptr_shift; - - unsigned int cnt, - has_common; - - xdfenv_t *env; - xpparam_t const *xpp; -}; - -struct region { - unsigned int begin1, end1; - unsigned int begin2, end2; -}; - -#define LINE_MAP(i, a) (i->line_map[(a) - i->ptr_shift]) - -#define NEXT_PTR(index, ptr) \ - (index->next_ptrs[(ptr) - index->ptr_shift]) - -#define CNT(index, ptr) \ - ((LINE_MAP(index, ptr))->cnt) - -#define REC(env, s, l) \ - (env->xdf##s.recs[l - 1]) - -static int cmp_recs(xpparam_t const *xpp, - xrecord_t *r1, xrecord_t *r2) -{ - return r1->ha == r2->ha && - xdl_recmatch(r1->ptr, r1->size, r2->ptr, r2->size, - xpp->flags); -} - -#define CMP_ENV(xpp, env, s1, l1, s2, l2) \ - (cmp_recs(xpp, REC(env, s1, l1), REC(env, s2, l2))) - -#define CMP(i, s1, l1, s2, l2) \ - (cmp_recs(i->xpp, REC(i->env, s1, l1), REC(i->env, s2, l2))) - -#define TABLE_HASH(index, side, line) \ - XDL_HASHLONG((REC(index->env, side, line))->ha, index->table_bits) - -static int scanA(struct histindex *index, unsigned int line1, unsigned int count1) -{ - unsigned int ptr; - unsigned int tbl_idx; - unsigned int chain_len; - struct record **rec_chain, *rec; - - for (ptr = LINE_END(1); line1 <= ptr; ptr--) { - tbl_idx = TABLE_HASH(index, 1, ptr); - rec_chain = index->records + tbl_idx; - rec = *rec_chain; - - chain_len = 0; - while (rec) { - if (CMP(index, 1, rec->ptr, 1, ptr)) { - /* - * ptr is identical to another element. Insert - * it onto the front of the existing element - * chain. - */ - NEXT_PTR(index, ptr) = rec->ptr; - rec->ptr = ptr; - /* cap rec->cnt at MAX_CNT */ - rec->cnt = XDL_MIN(MAX_CNT, rec->cnt + 1); - LINE_MAP(index, ptr) = rec; - goto continue_scan; - } - - rec = rec->next; - chain_len++; - } - - if (chain_len == index->max_chain_length) - return -1; - - /* - * This is the first time we have ever seen this particular - * element in the sequence. Construct a new chain for it. - */ - if (!(rec = xdl_cha_alloc(&index->rcha))) - return -1; - rec->ptr = ptr; - rec->cnt = 1; - rec->next = *rec_chain; - *rec_chain = rec; - LINE_MAP(index, ptr) = rec; - -continue_scan: - ; /* no op */ - } - - return 0; -} - -static int try_lcs( - struct histindex *index, struct region *lcs, unsigned int b_ptr, - unsigned int line1, unsigned int count1, - unsigned int line2, unsigned int count2) -{ - unsigned int b_next = b_ptr + 1; - struct record *rec = index->records[TABLE_HASH(index, 2, b_ptr)]; - unsigned int as, ae, bs, be, np, rc; - int should_break; - - for (; rec; rec = rec->next) { - if (rec->cnt > index->cnt) { - if (!index->has_common) - index->has_common = CMP(index, 1, rec->ptr, 2, b_ptr); - continue; - } - - as = rec->ptr; - if (!CMP(index, 1, as, 2, b_ptr)) - continue; - - index->has_common = 1; - for (;;) { - should_break = 0; - np = NEXT_PTR(index, as); - bs = b_ptr; - ae = as; - be = bs; - rc = rec->cnt; - - while (line1 < as && line2 < bs - && CMP(index, 1, as - 1, 2, bs - 1)) { - as--; - bs--; - if (1 < rc) - rc = XDL_MIN(rc, CNT(index, as)); - } - while (ae < LINE_END(1) && be < LINE_END(2) - && CMP(index, 1, ae + 1, 2, be + 1)) { - ae++; - be++; - if (1 < rc) - rc = XDL_MIN(rc, CNT(index, ae)); - } - - if (b_next <= be) - b_next = be + 1; - if (lcs->end1 - lcs->begin1 < ae - as || rc < index->cnt) { - lcs->begin1 = as; - lcs->begin2 = bs; - lcs->end1 = ae; - lcs->end2 = be; - index->cnt = rc; - } - - if (np == 0) - break; - - while (np <= ae) { - np = NEXT_PTR(index, np); - if (np == 0) { - should_break = 1; - break; - } - } - - if (should_break) - break; - - as = np; - } - } - return b_next; -} - -static int find_lcs( - struct histindex *index, struct region *lcs, - unsigned int line1, unsigned int count1, - unsigned int line2, unsigned int count2) -{ - unsigned int b_ptr; - - if (scanA(index, line1, count1)) - return -1; - - index->cnt = index->max_chain_length + 1; - - for (b_ptr = line2; b_ptr <= LINE_END(2); ) - b_ptr = try_lcs(index, lcs, b_ptr, line1, count1, line2, count2); - - return index->has_common && index->max_chain_length < index->cnt; -} - -static int fall_back_to_classic_diff(struct histindex *index, - int line1, int count1, int line2, int count2) -{ - xpparam_t xpp; - xpp.flags = index->xpp->flags & ~XDF_DIFF_ALGORITHM_MASK; - - return xdl_fall_back_diff(index->env, &xpp, - line1, count1, line2, count2); -} - -static int histogram_diff( - xpparam_t const *xpp, xdfenv_t *env, - unsigned int line1, unsigned int count1, - unsigned int line2, unsigned int count2) -{ - struct histindex index; - struct region lcs; - size_t sz; - int result = -1; - - if (count1 <= 0 && count2 <= 0) - return 0; - - if (LINE_END(1) >= MAX_PTR) - return -1; - - if (!count1) { - while(count2--) - env->xdf2.rchg[line2++ - 1] = 1; - return 0; - } else if (!count2) { - while(count1--) - env->xdf1.rchg[line1++ - 1] = 1; - return 0; - } - - memset(&index, 0, sizeof(index)); - - index.env = env; - index.xpp = xpp; - - index.records = NULL; - index.line_map = NULL; - /* in case of early xdl_cha_free() */ - index.rcha.head = NULL; - - index.table_bits = xdl_hashbits(count1); - sz = index.records_size = 1 << index.table_bits; - GITERR_CHECK_ALLOC_MULTIPLY(&sz, sz, sizeof(struct record *)); - - if (!(index.records = (struct record **) xdl_malloc(sz))) - goto cleanup; - memset(index.records, 0, sz); - - sz = index.line_map_size = count1; - sz *= sizeof(struct record *); - if (!(index.line_map = (struct record **) xdl_malloc(sz))) - goto cleanup; - memset(index.line_map, 0, sz); - - sz = index.line_map_size; - sz *= sizeof(unsigned int); - if (!(index.next_ptrs = (unsigned int *) xdl_malloc(sz))) - goto cleanup; - memset(index.next_ptrs, 0, sz); - - /* lines / 4 + 1 comes from xprepare.c:xdl_prepare_ctx() */ - if (xdl_cha_init(&index.rcha, sizeof(struct record), count1 / 4 + 1) < 0) - goto cleanup; - - index.ptr_shift = line1; - index.max_chain_length = 64; - - memset(&lcs, 0, sizeof(lcs)); - if (find_lcs(&index, &lcs, line1, count1, line2, count2)) - result = fall_back_to_classic_diff(&index, line1, count1, line2, count2); - else { - if (lcs.begin1 == 0 && lcs.begin2 == 0) { - while (count1--) - env->xdf1.rchg[line1++ - 1] = 1; - while (count2--) - env->xdf2.rchg[line2++ - 1] = 1; - result = 0; - } else { - result = histogram_diff(xpp, env, - line1, lcs.begin1 - line1, - line2, lcs.begin2 - line2); - if (result) - goto cleanup; - result = histogram_diff(xpp, env, - lcs.end1 + 1, LINE_END(1) - lcs.end1, - lcs.end2 + 1, LINE_END(2) - lcs.end2); - if (result) - goto cleanup; - } - } - -cleanup: - xdl_free(index.records); - xdl_free(index.line_map); - xdl_free(index.next_ptrs); - xdl_cha_free(&index.rcha); - - return result; -} - -int xdl_do_histogram_diff(mmfile_t *file1, mmfile_t *file2, - xpparam_t const *xpp, xdfenv_t *env) -{ - if (xdl_prepare_env(file1, file2, xpp, env) < 0) - return -1; - - return histogram_diff(xpp, env, - env->xdf1.dstart + 1, env->xdf1.dend - env->xdf1.dstart + 1, - env->xdf2.dstart + 1, env->xdf2.dend - env->xdf2.dstart + 1); -} diff --git a/vendor/libgit2/src/xdiff/xinclude.h b/vendor/libgit2/src/xdiff/xinclude.h deleted file mode 100644 index 4a1cde909..000000000 --- a/vendor/libgit2/src/xdiff/xinclude.h +++ /dev/null @@ -1,46 +0,0 @@ -/* - * LibXDiff by Davide Libenzi ( File Differential Library ) - * Copyright (C) 2003 Davide Libenzi - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * Davide Libenzi - * - */ - -#if !defined(XINCLUDE_H) -#define XINCLUDE_H - -#include -#include -#include -#include -#include - -#ifdef _WIN32 -#else -#include -#endif - -#include "xmacros.h" -#include "xdiff.h" -#include "xtypes.h" -#include "xutils.h" -#include "xprepare.h" -#include "xdiffi.h" -#include "xemit.h" - - -#endif /* #if !defined(XINCLUDE_H) */ diff --git a/vendor/libgit2/src/xdiff/xmacros.h b/vendor/libgit2/src/xdiff/xmacros.h deleted file mode 100644 index 165a895a9..000000000 --- a/vendor/libgit2/src/xdiff/xmacros.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - * LibXDiff by Davide Libenzi ( File Differential Library ) - * Copyright (C) 2003 Davide Libenzi - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * Davide Libenzi - * - */ - -#if !defined(XMACROS_H) -#define XMACROS_H - - - - -#define XDL_MIN(a, b) ((a) < (b) ? (a): (b)) -#define XDL_MAX(a, b) ((a) > (b) ? (a): (b)) -#define XDL_ABS(v) ((v) >= 0 ? (v): -(v)) -#define XDL_ISDIGIT(c) ((c) >= '0' && (c) <= '9') -#define XDL_ISSPACE(c) (isspace((unsigned char)(c))) -#define XDL_ADDBITS(v,b) ((v) + ((v) >> (b))) -#define XDL_MASKBITS(b) ((1UL << (b)) - 1) -#define XDL_HASHLONG(v,b) (XDL_ADDBITS((unsigned long)(v), b) & XDL_MASKBITS(b)) -#define XDL_PTRFREE(p) do { if (p) { xdl_free(p); (p) = NULL; } } while (0) -#define XDL_LE32_PUT(p, v) \ -do { \ - unsigned char *__p = (unsigned char *) (p); \ - *__p++ = (unsigned char) (v); \ - *__p++ = (unsigned char) ((v) >> 8); \ - *__p++ = (unsigned char) ((v) >> 16); \ - *__p = (unsigned char) ((v) >> 24); \ -} while (0) -#define XDL_LE32_GET(p, v) \ -do { \ - unsigned char const *__p = (unsigned char const *) (p); \ - (v) = (unsigned long) __p[0] | ((unsigned long) __p[1]) << 8 | \ - ((unsigned long) __p[2]) << 16 | ((unsigned long) __p[3]) << 24; \ -} while (0) - - -#endif /* #if !defined(XMACROS_H) */ diff --git a/vendor/libgit2/src/xdiff/xmerge.c b/vendor/libgit2/src/xdiff/xmerge.c deleted file mode 100644 index 6448b5542..000000000 --- a/vendor/libgit2/src/xdiff/xmerge.c +++ /dev/null @@ -1,678 +0,0 @@ -/* - * LibXDiff by Davide Libenzi ( File Differential Library ) - * Copyright (C) 2003-2006 Davide Libenzi, Johannes E. Schindelin - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * Davide Libenzi - * - */ - -#include "xinclude.h" -#include "common.h" - -typedef struct s_xdmerge { - struct s_xdmerge *next; - /* - * 0 = conflict, - * 1 = no conflict, take first, - * 2 = no conflict, take second. - * 3 = no conflict, take both. - */ - int mode; - /* - * These point at the respective postimages. E.g. is - * how side #1 wants to change the common ancestor; if there is no - * overlap, lines before i1 in the postimage of side #1 appear - * in the merge result as a region touched by neither side. - */ - long i1, i2; - long chg1, chg2; - /* - * These point at the preimage; of course there is just one - * preimage, that is from the shared common ancestor. - */ - long i0; - long chg0; -} xdmerge_t; - -static int xdl_append_merge(xdmerge_t **merge, int mode, - long i0, long chg0, - long i1, long chg1, - long i2, long chg2) -{ - xdmerge_t *m = *merge; - if (m && (i1 <= m->i1 + m->chg1 || i2 <= m->i2 + m->chg2)) { - if (mode != m->mode) - m->mode = 0; - m->chg0 = i0 + chg0 - m->i0; - m->chg1 = i1 + chg1 - m->i1; - m->chg2 = i2 + chg2 - m->i2; - } else { - m = xdl_malloc(sizeof(xdmerge_t)); - if (!m) - return -1; - m->next = NULL; - m->mode = mode; - m->i0 = i0; - m->chg0 = chg0; - m->i1 = i1; - m->chg1 = chg1; - m->i2 = i2; - m->chg2 = chg2; - if (*merge) - (*merge)->next = m; - *merge = m; - } - return 0; -} - -static int xdl_cleanup_merge(xdmerge_t *c) -{ - int count = 0; - xdmerge_t *next_c; - - /* were there conflicts? */ - for (; c; c = next_c) { - if (c->mode == 0) - count++; - next_c = c->next; - free(c); - } - return count; -} - -static int xdl_merge_cmp_lines(xdfenv_t *xe1, int i1, xdfenv_t *xe2, int i2, - int line_count, long flags) -{ - int i; - xrecord_t **rec1 = xe1->xdf2.recs + i1; - xrecord_t **rec2 = xe2->xdf2.recs + i2; - - for (i = 0; i < line_count; i++) { - int result = xdl_recmatch(rec1[i]->ptr, rec1[i]->size, - rec2[i]->ptr, rec2[i]->size, flags); - if (!result) - return -1; - } - return 0; -} - -static int xdl_recs_copy_0(size_t *out, int use_orig, xdfenv_t *xe, int i, int count, int add_nl, char *dest) -{ - xrecord_t **recs; - size_t size = 0; - - *out = 0; - - recs = (use_orig ? xe->xdf1.recs : xe->xdf2.recs) + i; - - if (count < 1) - return 0; - - for (i = 0; i < count; ) { - if (dest) - memcpy(dest + size, recs[i]->ptr, recs[i]->size); - - GITERR_CHECK_ALLOC_ADD(&size, size, recs[i++]->size); - } - - if (add_nl) { - i = recs[count - 1]->size; - if (i == 0 || recs[count - 1]->ptr[i - 1] != '\n') { - if (dest) - dest[size] = '\n'; - - GITERR_CHECK_ALLOC_ADD(&size, size, 1); - } - } - - *out = size; - return 0; -} - -static int xdl_recs_copy(size_t *out, xdfenv_t *xe, int i, int count, int add_nl, char *dest) -{ - return xdl_recs_copy_0(out, 0, xe, i, count, add_nl, dest); -} - -static int xdl_orig_copy(size_t *out, xdfenv_t *xe, int i, int count, int add_nl, char *dest) -{ - return xdl_recs_copy_0(out, 1, xe, i, count, add_nl, dest); -} - -static int fill_conflict_hunk(size_t *out, xdfenv_t *xe1, const char *name1, - xdfenv_t *xe2, const char *name2, - const char *name3, - size_t size, int i, int style, - xdmerge_t *m, char *dest, int marker_size) -{ - int marker1_size = (name1 ? (int)strlen(name1) + 1 : 0); - int marker2_size = (name2 ? (int)strlen(name2) + 1 : 0); - int marker3_size = (name3 ? (int)strlen(name3) + 1 : 0); - size_t copied; - - *out = 0; - - if (marker_size <= 0) - marker_size = DEFAULT_CONFLICT_MARKER_SIZE; - - /* Before conflicting part */ - if (xdl_recs_copy(&copied, xe1, i, m->i1 - i, 0, - dest ? dest + size : NULL) < 0) - return -1; - - GITERR_CHECK_ALLOC_ADD(&size, size, copied); - - if (!dest) { - GITERR_CHECK_ALLOC_ADD4(&size, size, marker_size, 1, marker1_size); - } else { - memset(dest + size, '<', marker_size); - size += marker_size; - if (marker1_size) { - dest[size] = ' '; - memcpy(dest + size + 1, name1, marker1_size - 1); - size += marker1_size; - } - dest[size++] = '\n'; - } - - /* Postimage from side #1 */ - if (xdl_recs_copy(&copied, xe1, m->i1, m->chg1, 1, - dest ? dest + size : NULL) < 0) - return -1; - - GITERR_CHECK_ALLOC_ADD(&size, size, copied); - - if (style == XDL_MERGE_DIFF3) { - /* Shared preimage */ - if (!dest) { - GITERR_CHECK_ALLOC_ADD4(&size, size, marker_size, 1, marker3_size); - } else { - memset(dest + size, '|', marker_size); - size += marker_size; - if (marker3_size) { - dest[size] = ' '; - memcpy(dest + size + 1, name3, marker3_size - 1); - size += marker3_size; - } - dest[size++] = '\n'; - } - - if (xdl_orig_copy(&copied, xe1, m->i0, m->chg0, 1, - dest ? dest + size : NULL) < 0) - return -1; - GITERR_CHECK_ALLOC_ADD(&size, size, copied); - } - - if (!dest) { - GITERR_CHECK_ALLOC_ADD3(&size, size, marker_size, 1); - } else { - memset(dest + size, '=', marker_size); - size += marker_size; - dest[size++] = '\n'; - } - - /* Postimage from side #2 */ - - if (xdl_recs_copy(&copied, xe2, m->i2, m->chg2, 1, - dest ? dest + size : NULL) < 0) - return -1; - GITERR_CHECK_ALLOC_ADD(&size, size, copied); - - if (!dest) { - GITERR_CHECK_ALLOC_ADD4(&size, size, marker_size, 1, marker2_size); - } else { - memset(dest + size, '>', marker_size); - size += marker_size; - if (marker2_size) { - dest[size] = ' '; - memcpy(dest + size + 1, name2, marker2_size - 1); - size += marker2_size; - } - dest[size++] = '\n'; - } - - *out = size; - return 0; -} - -static int xdl_fill_merge_buffer(size_t *out, - xdfenv_t *xe1, const char *name1, - xdfenv_t *xe2, const char *name2, - const char *ancestor_name, - int favor, - xdmerge_t *m, char *dest, int style, - int marker_size) -{ - size_t size, copied; - int i; - - *out = 0; - - for (size = i = 0; m; m = m->next) { - if (favor && !m->mode) - m->mode = favor; - - if (m->mode == 0) { - if (fill_conflict_hunk(&size, xe1, name1, xe2, name2, - ancestor_name, - size, i, style, m, dest, - marker_size) < 0) - return -1; - } - else if (m->mode & 3) { - /* Before conflicting part */ - if (xdl_recs_copy(&copied, xe1, i, m->i1 - i, 0, - dest ? dest + size : NULL) < 0) - return -1; - GITERR_CHECK_ALLOC_ADD(&size, size, copied); - - /* Postimage from side #1 */ - if (m->mode & 1) { - if (xdl_recs_copy(&copied, xe1, m->i1, m->chg1, (m->mode & 2), - dest ? dest + size : NULL) < 0) - return -1; - GITERR_CHECK_ALLOC_ADD(&size, size, copied); - } - - /* Postimage from side #2 */ - if (m->mode & 2) { - if (xdl_recs_copy(&copied, xe2, m->i2, m->chg2, 0, - dest ? dest + size : NULL) < 0) - return -1; - GITERR_CHECK_ALLOC_ADD(&size, size, copied); - } - } else - continue; - i = m->i1 + m->chg1; - } - - if (xdl_recs_copy(&copied, xe1, i, xe1->xdf2.nrec - i, 0, - dest ? dest + size : NULL) < 0) - return -1; - GITERR_CHECK_ALLOC_ADD(&size, size, copied); - - *out = size; - return 0; -} - -/* - * Sometimes, changes are not quite identical, but differ in only a few - * lines. Try hard to show only these few lines as conflicting. - */ -static int xdl_refine_conflicts(xdfenv_t *xe1, xdfenv_t *xe2, xdmerge_t *m, - xpparam_t const *xpp) -{ - for (; m; m = m->next) { - mmfile_t t1, t2; - xdfenv_t xe; - xdchange_t *xscr, *x; - int i1 = m->i1, i2 = m->i2; - - /* let's handle just the conflicts */ - if (m->mode) - continue; - - /* no sense refining a conflict when one side is empty */ - if (m->chg1 == 0 || m->chg2 == 0) - continue; - - /* - * This probably does not work outside git, since - * we have a very simple mmfile structure. - */ - t1.ptr = (char *)xe1->xdf2.recs[m->i1]->ptr; - t1.size = xe1->xdf2.recs[m->i1 + m->chg1 - 1]->ptr - + xe1->xdf2.recs[m->i1 + m->chg1 - 1]->size - t1.ptr; - t2.ptr = (char *)xe2->xdf2.recs[m->i2]->ptr; - t2.size = xe2->xdf2.recs[m->i2 + m->chg2 - 1]->ptr - + xe2->xdf2.recs[m->i2 + m->chg2 - 1]->size - t2.ptr; - if (xdl_do_diff(&t1, &t2, xpp, &xe) < 0) - return -1; - if (xdl_change_compact(&xe.xdf1, &xe.xdf2, xpp->flags) < 0 || - xdl_change_compact(&xe.xdf2, &xe.xdf1, xpp->flags) < 0 || - xdl_build_script(&xe, &xscr) < 0) { - xdl_free_env(&xe); - return -1; - } - if (!xscr) { - /* If this happens, the changes are identical. */ - xdl_free_env(&xe); - m->mode = 4; - continue; - } - x = xscr; - m->i1 = xscr->i1 + i1; - m->chg1 = xscr->chg1; - m->i2 = xscr->i2 + i2; - m->chg2 = xscr->chg2; - while (xscr->next) { - xdmerge_t *m2 = xdl_malloc(sizeof(xdmerge_t)); - if (!m2) { - xdl_free_env(&xe); - xdl_free_script(x); - return -1; - } - xscr = xscr->next; - m2->next = m->next; - m->next = m2; - m = m2; - m->mode = 0; - m->i1 = xscr->i1 + i1; - m->chg1 = xscr->chg1; - m->i2 = xscr->i2 + i2; - m->chg2 = xscr->chg2; - } - xdl_free_env(&xe); - xdl_free_script(x); - } - return 0; -} - -static int line_contains_alnum(const char *ptr, long size) -{ - while (size--) - if (isalnum((unsigned char)*(ptr++))) - return 1; - return 0; -} - -static int lines_contain_alnum(xdfenv_t *xe, int i, int chg) -{ - for (; chg; chg--, i++) - if (line_contains_alnum(xe->xdf2.recs[i]->ptr, - xe->xdf2.recs[i]->size)) - return 1; - return 0; -} - -/* - * This function merges m and m->next, marking everything between those hunks - * as conflicting, too. - */ -static void xdl_merge_two_conflicts(xdmerge_t *m) -{ - xdmerge_t *next_m = m->next; - m->chg1 = next_m->i1 + next_m->chg1 - m->i1; - m->chg2 = next_m->i2 + next_m->chg2 - m->i2; - m->next = next_m->next; - free(next_m); -} - -/* - * If there are less than 3 non-conflicting lines between conflicts, - * it appears simpler -- because it takes up less (or as many) lines -- - * if the lines are moved into the conflicts. - */ -static int xdl_simplify_non_conflicts(xdfenv_t *xe1, xdmerge_t *m, - int simplify_if_no_alnum) -{ - int result = 0; - - if (!m) - return result; - for (;;) { - xdmerge_t *next_m = m->next; - int begin, end; - - if (!next_m) - return result; - - begin = m->i1 + m->chg1; - end = next_m->i1; - - if (m->mode != 0 || next_m->mode != 0 || - (end - begin > 3 && - (!simplify_if_no_alnum || - lines_contain_alnum(xe1, begin, end - begin)))) { - m = next_m; - } else { - result++; - xdl_merge_two_conflicts(m); - } - } -} - -/* - * level == 0: mark all overlapping changes as conflict - * level == 1: mark overlapping changes as conflict only if not identical - * level == 2: analyze non-identical changes for minimal conflict set - * level == 3: analyze non-identical changes for minimal conflict set, but - * treat hunks not containing any letter or number as conflicting - * - * returns < 0 on error, == 0 for no conflicts, else number of conflicts - */ -static int xdl_do_merge(xdfenv_t *xe1, xdchange_t *xscr1, - xdfenv_t *xe2, xdchange_t *xscr2, - xmparam_t const *xmp, mmbuffer_t *result) -{ - xdmerge_t *changes, *c; - xpparam_t const *xpp = &xmp->xpp; - const char *const ancestor_name = xmp->ancestor; - const char *const name1 = xmp->file1; - const char *const name2 = xmp->file2; - int i0, i1, i2, chg0, chg1, chg2; - int level = xmp->level; - int style = xmp->style; - int favor = xmp->favor; - - if (style == XDL_MERGE_DIFF3) { - /* - * "diff3 -m" output does not make sense for anything - * more aggressive than XDL_MERGE_EAGER. - */ - if (XDL_MERGE_EAGER < level) - level = XDL_MERGE_EAGER; - } - - c = changes = NULL; - - while (xscr1 && xscr2) { - if (!changes) - changes = c; - if (xscr1->i1 + xscr1->chg1 < xscr2->i1) { - i0 = xscr1->i1; - i1 = xscr1->i2; - i2 = xscr2->i2 - xscr2->i1 + xscr1->i1; - chg0 = xscr1->chg1; - chg1 = xscr1->chg2; - chg2 = xscr1->chg1; - if (xdl_append_merge(&c, 1, - i0, chg0, i1, chg1, i2, chg2)) { - xdl_cleanup_merge(changes); - return -1; - } - xscr1 = xscr1->next; - continue; - } - if (xscr2->i1 + xscr2->chg1 < xscr1->i1) { - i0 = xscr2->i1; - i1 = xscr1->i2 - xscr1->i1 + xscr2->i1; - i2 = xscr2->i2; - chg0 = xscr2->chg1; - chg1 = xscr2->chg1; - chg2 = xscr2->chg2; - if (xdl_append_merge(&c, 2, - i0, chg0, i1, chg1, i2, chg2)) { - xdl_cleanup_merge(changes); - return -1; - } - xscr2 = xscr2->next; - continue; - } - if (level == XDL_MERGE_MINIMAL || xscr1->i1 != xscr2->i1 || - xscr1->chg1 != xscr2->chg1 || - xscr1->chg2 != xscr2->chg2 || - xdl_merge_cmp_lines(xe1, xscr1->i2, - xe2, xscr2->i2, - xscr1->chg2, xpp->flags)) { - /* conflict */ - int off = xscr1->i1 - xscr2->i1; - int ffo = off + xscr1->chg1 - xscr2->chg1; - - i0 = xscr1->i1; - i1 = xscr1->i2; - i2 = xscr2->i2; - if (off > 0) { - i0 -= off; - i1 -= off; - } - else - i2 += off; - chg0 = xscr1->i1 + xscr1->chg1 - i0; - chg1 = xscr1->i2 + xscr1->chg2 - i1; - chg2 = xscr2->i2 + xscr2->chg2 - i2; - if (ffo < 0) { - chg0 -= ffo; - chg1 -= ffo; - } else - chg2 += ffo; - if (xdl_append_merge(&c, 0, - i0, chg0, i1, chg1, i2, chg2)) { - xdl_cleanup_merge(changes); - return -1; - } - } - - i1 = xscr1->i1 + xscr1->chg1; - i2 = xscr2->i1 + xscr2->chg1; - - if (i1 >= i2) - xscr2 = xscr2->next; - if (i2 >= i1) - xscr1 = xscr1->next; - } - while (xscr1) { - if (!changes) - changes = c; - i0 = xscr1->i1; - i1 = xscr1->i2; - i2 = xscr1->i1 + xe2->xdf2.nrec - xe2->xdf1.nrec; - chg0 = xscr1->chg1; - chg1 = xscr1->chg2; - chg2 = xscr1->chg1; - if (xdl_append_merge(&c, 1, - i0, chg0, i1, chg1, i2, chg2)) { - xdl_cleanup_merge(changes); - return -1; - } - xscr1 = xscr1->next; - } - while (xscr2) { - if (!changes) - changes = c; - i0 = xscr2->i1; - i1 = xscr2->i1 + xe1->xdf2.nrec - xe1->xdf1.nrec; - i2 = xscr2->i2; - chg0 = xscr2->chg1; - chg1 = xscr2->chg1; - chg2 = xscr2->chg2; - if (xdl_append_merge(&c, 2, - i0, chg0, i1, chg1, i2, chg2)) { - xdl_cleanup_merge(changes); - return -1; - } - xscr2 = xscr2->next; - } - if (!changes) - changes = c; - /* refine conflicts */ - if (XDL_MERGE_ZEALOUS <= level && - (xdl_refine_conflicts(xe1, xe2, changes, xpp) < 0 || - xdl_simplify_non_conflicts(xe1, changes, - XDL_MERGE_ZEALOUS < level) < 0)) { - xdl_cleanup_merge(changes); - return -1; - } - /* output */ - if (result) { - int marker_size = xmp->marker_size; - size_t size; - - if (xdl_fill_merge_buffer(&size, xe1, name1, xe2, name2, - ancestor_name, - favor, changes, NULL, style, - marker_size) < 0) - return -1; - - result->ptr = xdl_malloc(size); - if (!result->ptr) { - xdl_cleanup_merge(changes); - return -1; - } - result->size = size; - if (xdl_fill_merge_buffer(&size, xe1, name1, xe2, name2, - ancestor_name, favor, changes, - result->ptr, style, marker_size) < 0) - return -1; - } - return xdl_cleanup_merge(changes); -} - -int xdl_merge(mmfile_t *orig, mmfile_t *mf1, mmfile_t *mf2, - xmparam_t const *xmp, mmbuffer_t *result) -{ - xdchange_t *xscr1, *xscr2; - xdfenv_t xe1, xe2; - int status; - xpparam_t const *xpp = &xmp->xpp; - - result->ptr = NULL; - result->size = 0; - - if (xdl_do_diff(orig, mf1, xpp, &xe1) < 0) { - return -1; - } - if (xdl_do_diff(orig, mf2, xpp, &xe2) < 0) { - xdl_free_env(&xe1); - return -1; - } - if (xdl_change_compact(&xe1.xdf1, &xe1.xdf2, xpp->flags) < 0 || - xdl_change_compact(&xe1.xdf2, &xe1.xdf1, xpp->flags) < 0 || - xdl_build_script(&xe1, &xscr1) < 0) { - xdl_free_env(&xe1); - return -1; - } - if (xdl_change_compact(&xe2.xdf1, &xe2.xdf2, xpp->flags) < 0 || - xdl_change_compact(&xe2.xdf2, &xe2.xdf1, xpp->flags) < 0 || - xdl_build_script(&xe2, &xscr2) < 0) { - xdl_free_script(xscr1); - xdl_free_env(&xe1); - xdl_free_env(&xe2); - return -1; - } - status = 0; - if (!xscr1) { - result->ptr = xdl_malloc(mf2->size); - memcpy(result->ptr, mf2->ptr, mf2->size); - result->size = mf2->size; - } else if (!xscr2) { - result->ptr = xdl_malloc(mf1->size); - memcpy(result->ptr, mf1->ptr, mf1->size); - result->size = mf1->size; - } else { - status = xdl_do_merge(&xe1, xscr1, - &xe2, xscr2, - xmp, result); - } - xdl_free_script(xscr1); - xdl_free_script(xscr2); - - xdl_free_env(&xe1); - xdl_free_env(&xe2); - - return status; -} diff --git a/vendor/libgit2/src/xdiff/xpatience.c b/vendor/libgit2/src/xdiff/xpatience.c deleted file mode 100644 index 04e1a1ab2..000000000 --- a/vendor/libgit2/src/xdiff/xpatience.c +++ /dev/null @@ -1,358 +0,0 @@ -/* - * LibXDiff by Davide Libenzi ( File Differential Library ) - * Copyright (C) 2003-2009 Davide Libenzi, Johannes E. Schindelin - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * Davide Libenzi - * - */ -#include "xinclude.h" -#include "xtypes.h" -#include "xdiff.h" - -/* - * The basic idea of patience diff is to find lines that are unique in - * both files. These are intuitively the ones that we want to see as - * common lines. - * - * The maximal ordered sequence of such line pairs (where ordered means - * that the order in the sequence agrees with the order of the lines in - * both files) naturally defines an initial set of common lines. - * - * Now, the algorithm tries to extend the set of common lines by growing - * the line ranges where the files have identical lines. - * - * Between those common lines, the patience diff algorithm is applied - * recursively, until no unique line pairs can be found; these line ranges - * are handled by the well-known Myers algorithm. - */ - -#define NON_UNIQUE ULONG_MAX - -/* - * This is a hash mapping from line hash to line numbers in the first and - * second file. - */ -struct hashmap { - int nr, alloc; - struct entry { - unsigned long hash; - /* - * 0 = unused entry, 1 = first line, 2 = second, etc. - * line2 is NON_UNIQUE if the line is not unique - * in either the first or the second file. - */ - unsigned long line1, line2; - /* - * "next" & "previous" are used for the longest common - * sequence; - * initially, "next" reflects only the order in file1. - */ - struct entry *next, *previous; - } *entries, *first, *last; - /* were common records found? */ - unsigned long has_matches; - mmfile_t *file1, *file2; - xdfenv_t *env; - xpparam_t const *xpp; -}; - -/* The argument "pass" is 1 for the first file, 2 for the second. */ -static void insert_record(int line, struct hashmap *map, int pass) -{ - xrecord_t **records = pass == 1 ? - map->env->xdf1.recs : map->env->xdf2.recs; - xrecord_t *record = records[line - 1], *other; - /* - * After xdl_prepare_env() (or more precisely, due to - * xdl_classify_record()), the "ha" member of the records (AKA lines) - * is _not_ the hash anymore, but a linearized version of it. In - * other words, the "ha" member is guaranteed to start with 0 and - * the second record's ha can only be 0 or 1, etc. - * - * So we multiply ha by 2 in the hope that the hashing was - * "unique enough". - */ - int index = (int)((record->ha << 1) % map->alloc); - - while (map->entries[index].line1) { - other = map->env->xdf1.recs[map->entries[index].line1 - 1]; - if (map->entries[index].hash != record->ha || - !xdl_recmatch(record->ptr, record->size, - other->ptr, other->size, - map->xpp->flags)) { - if (++index >= map->alloc) - index = 0; - continue; - } - if (pass == 2) - map->has_matches = 1; - if (pass == 1 || map->entries[index].line2) - map->entries[index].line2 = NON_UNIQUE; - else - map->entries[index].line2 = line; - return; - } - if (pass == 2) - return; - map->entries[index].line1 = line; - map->entries[index].hash = record->ha; - if (!map->first) - map->first = map->entries + index; - if (map->last) { - map->last->next = map->entries + index; - map->entries[index].previous = map->last; - } - map->last = map->entries + index; - map->nr++; -} - -/* - * This function has to be called for each recursion into the inter-hunk - * parts, as previously non-unique lines can become unique when being - * restricted to a smaller part of the files. - * - * It is assumed that env has been prepared using xdl_prepare(). - */ -static int fill_hashmap(mmfile_t *file1, mmfile_t *file2, - xpparam_t const *xpp, xdfenv_t *env, - struct hashmap *result, - int line1, int count1, int line2, int count2) -{ - result->file1 = file1; - result->file2 = file2; - result->xpp = xpp; - result->env = env; - - /* We know exactly how large we want the hash map */ - result->alloc = count1 * 2; - result->entries = (struct entry *) - xdl_malloc(result->alloc * sizeof(struct entry)); - if (!result->entries) - return -1; - memset(result->entries, 0, result->alloc * sizeof(struct entry)); - - /* First, fill with entries from the first file */ - while (count1--) - insert_record(line1++, result, 1); - - /* Then search for matches in the second file */ - while (count2--) - insert_record(line2++, result, 2); - - return 0; -} - -/* - * Find the longest sequence with a smaller last element (meaning a smaller - * line2, as we construct the sequence with entries ordered by line1). - */ -static int binary_search(struct entry **sequence, int longest, - struct entry *entry) -{ - int left = -1, right = longest; - - while (left + 1 < right) { - int middle = (left + right) / 2; - /* by construction, no two entries can be equal */ - if (sequence[middle]->line2 > entry->line2) - right = middle; - else - left = middle; - } - /* return the index in "sequence", _not_ the sequence length */ - return left; -} - -/* - * The idea is to start with the list of common unique lines sorted by - * the order in file1. For each of these pairs, the longest (partial) - * sequence whose last element's line2 is smaller is determined. - * - * For efficiency, the sequences are kept in a list containing exactly one - * item per sequence length: the sequence with the smallest last - * element (in terms of line2). - */ -static struct entry *find_longest_common_sequence(struct hashmap *map) -{ - struct entry **sequence = xdl_malloc(map->nr * sizeof(struct entry *)); - int longest = 0, i; - struct entry *entry; - - for (entry = map->first; entry; entry = entry->next) { - if (!entry->line2 || entry->line2 == NON_UNIQUE) - continue; - i = binary_search(sequence, longest, entry); - entry->previous = i < 0 ? NULL : sequence[i]; - sequence[++i] = entry; - if (i == longest) - longest++; - } - - /* No common unique lines were found */ - if (!longest) { - xdl_free(sequence); - return NULL; - } - - /* Iterate starting at the last element, adjusting the "next" members */ - entry = sequence[longest - 1]; - entry->next = NULL; - while (entry->previous) { - entry->previous->next = entry; - entry = entry->previous; - } - xdl_free(sequence); - return entry; -} - -static int match(struct hashmap *map, int line1, int line2) -{ - xrecord_t *record1 = map->env->xdf1.recs[line1 - 1]; - xrecord_t *record2 = map->env->xdf2.recs[line2 - 1]; - return xdl_recmatch(record1->ptr, record1->size, - record2->ptr, record2->size, map->xpp->flags); -} - -static int patience_diff(mmfile_t *file1, mmfile_t *file2, - xpparam_t const *xpp, xdfenv_t *env, - int line1, int count1, int line2, int count2); - -static int walk_common_sequence(struct hashmap *map, struct entry *first, - int line1, int count1, int line2, int count2) -{ - int end1 = line1 + count1, end2 = line2 + count2; - int next1, next2; - - for (;;) { - /* Try to grow the line ranges of common lines */ - if (first) { - next1 = first->line1; - next2 = first->line2; - while (next1 > line1 && next2 > line2 && - match(map, next1 - 1, next2 - 1)) { - next1--; - next2--; - } - } else { - next1 = end1; - next2 = end2; - } - while (line1 < next1 && line2 < next2 && - match(map, line1, line2)) { - line1++; - line2++; - } - - /* Recurse */ - if (next1 > line1 || next2 > line2) { - struct hashmap submap; - - memset(&submap, 0, sizeof(submap)); - if (patience_diff(map->file1, map->file2, - map->xpp, map->env, - line1, next1 - line1, - line2, next2 - line2)) - return -1; - } - - if (!first) - return 0; - - while (first->next && - first->next->line1 == first->line1 + 1 && - first->next->line2 == first->line2 + 1) - first = first->next; - - line1 = first->line1 + 1; - line2 = first->line2 + 1; - - first = first->next; - } -} - -static int fall_back_to_classic_diff(struct hashmap *map, - int line1, int count1, int line2, int count2) -{ - xpparam_t xpp; - xpp.flags = map->xpp->flags & ~XDF_DIFF_ALGORITHM_MASK; - - return xdl_fall_back_diff(map->env, &xpp, - line1, count1, line2, count2); -} - -/* - * Recursively find the longest common sequence of unique lines, - * and if none was found, ask xdl_do_diff() to do the job. - * - * This function assumes that env was prepared with xdl_prepare_env(). - */ -static int patience_diff(mmfile_t *file1, mmfile_t *file2, - xpparam_t const *xpp, xdfenv_t *env, - int line1, int count1, int line2, int count2) -{ - struct hashmap map; - struct entry *first; - int result = 0; - - /* trivial case: one side is empty */ - if (!count1) { - while(count2--) - env->xdf2.rchg[line2++ - 1] = 1; - return 0; - } else if (!count2) { - while(count1--) - env->xdf1.rchg[line1++ - 1] = 1; - return 0; - } - - memset(&map, 0, sizeof(map)); - if (fill_hashmap(file1, file2, xpp, env, &map, - line1, count1, line2, count2)) - return -1; - - /* are there any matching lines at all? */ - if (!map.has_matches) { - while(count1--) - env->xdf1.rchg[line1++ - 1] = 1; - while(count2--) - env->xdf2.rchg[line2++ - 1] = 1; - xdl_free(map.entries); - return 0; - } - - first = find_longest_common_sequence(&map); - if (first) - result = walk_common_sequence(&map, first, - line1, count1, line2, count2); - else - result = fall_back_to_classic_diff(&map, - line1, count1, line2, count2); - - xdl_free(map.entries); - return result; -} - -int xdl_do_patience_diff(mmfile_t *file1, mmfile_t *file2, - xpparam_t const *xpp, xdfenv_t *env) -{ - if (xdl_prepare_env(file1, file2, xpp, env) < 0) - return -1; - - /* environment is cleaned up in xdl_diff() */ - return patience_diff(file1, file2, xpp, env, - 1, env->xdf1.nrec, 1, env->xdf2.nrec); -} diff --git a/vendor/libgit2/src/xdiff/xprepare.c b/vendor/libgit2/src/xdiff/xprepare.c deleted file mode 100644 index 13b55aba7..000000000 --- a/vendor/libgit2/src/xdiff/xprepare.c +++ /dev/null @@ -1,483 +0,0 @@ -/* - * LibXDiff by Davide Libenzi ( File Differential Library ) - * Copyright (C) 2003 Davide Libenzi - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * Davide Libenzi - * - */ - -#include "xinclude.h" - - -#define XDL_KPDIS_RUN 4 -#define XDL_MAX_EQLIMIT 1024 -#define XDL_SIMSCAN_WINDOW 100 -#define XDL_GUESS_NLINES1 256 -#define XDL_GUESS_NLINES2 20 - - -typedef struct s_xdlclass { - struct s_xdlclass *next; - unsigned long ha; - char const *line; - long size; - long idx; - long len1, len2; -} xdlclass_t; - -typedef struct s_xdlclassifier { - unsigned int hbits; - long hsize; - xdlclass_t **rchash; - chastore_t ncha; - xdlclass_t **rcrecs; - long alloc; - long count; - long flags; -} xdlclassifier_t; - - - - -static int xdl_init_classifier(xdlclassifier_t *cf, long size, long flags); -static void xdl_free_classifier(xdlclassifier_t *cf); -static int xdl_classify_record(unsigned int pass, xdlclassifier_t *cf, xrecord_t **rhash, - unsigned int hbits, xrecord_t *rec); -static int xdl_prepare_ctx(unsigned int pass, mmfile_t *mf, long narec, xpparam_t const *xpp, - xdlclassifier_t *cf, xdfile_t *xdf); -static void xdl_free_ctx(xdfile_t *xdf); -static int xdl_clean_mmatch(char const *dis, long i, long s, long e); -static int xdl_cleanup_records(xdlclassifier_t *cf, xdfile_t *xdf1, xdfile_t *xdf2); -static int xdl_trim_ends(xdfile_t *xdf1, xdfile_t *xdf2); -static int xdl_optimize_ctxs(xdlclassifier_t *cf, xdfile_t *xdf1, xdfile_t *xdf2); - - - - -static int xdl_init_classifier(xdlclassifier_t *cf, long size, long flags) { - cf->flags = flags; - - cf->hbits = xdl_hashbits((unsigned int) size); - cf->hsize = 1 << cf->hbits; - - if (xdl_cha_init(&cf->ncha, sizeof(xdlclass_t), size / 4 + 1) < 0) { - - return -1; - } - if (!(cf->rchash = (xdlclass_t **) xdl_malloc(cf->hsize * sizeof(xdlclass_t *)))) { - - xdl_cha_free(&cf->ncha); - return -1; - } - memset(cf->rchash, 0, cf->hsize * sizeof(xdlclass_t *)); - - cf->alloc = size; - if (!(cf->rcrecs = (xdlclass_t **) xdl_malloc(cf->alloc * sizeof(xdlclass_t *)))) { - - xdl_free(cf->rchash); - xdl_cha_free(&cf->ncha); - return -1; - } - - cf->count = 0; - - return 0; -} - - -static void xdl_free_classifier(xdlclassifier_t *cf) { - - xdl_free(cf->rcrecs); - xdl_free(cf->rchash); - xdl_cha_free(&cf->ncha); -} - - -static int xdl_classify_record(unsigned int pass, xdlclassifier_t *cf, xrecord_t **rhash, - unsigned int hbits, xrecord_t *rec) { - long hi; - char const *line; - xdlclass_t *rcrec; - xdlclass_t **rcrecs; - - line = rec->ptr; - hi = (long) XDL_HASHLONG(rec->ha, cf->hbits); - for (rcrec = cf->rchash[hi]; rcrec; rcrec = rcrec->next) - if (rcrec->ha == rec->ha && - xdl_recmatch(rcrec->line, rcrec->size, - rec->ptr, rec->size, cf->flags)) - break; - - if (!rcrec) { - if (!(rcrec = xdl_cha_alloc(&cf->ncha))) { - - return -1; - } - rcrec->idx = cf->count++; - if (cf->count > cf->alloc) { - cf->alloc *= 2; - if (!(rcrecs = (xdlclass_t **) xdl_realloc(cf->rcrecs, cf->alloc * sizeof(xdlclass_t *)))) { - - return -1; - } - cf->rcrecs = rcrecs; - } - cf->rcrecs[rcrec->idx] = rcrec; - rcrec->line = line; - rcrec->size = rec->size; - rcrec->ha = rec->ha; - rcrec->len1 = rcrec->len2 = 0; - rcrec->next = cf->rchash[hi]; - cf->rchash[hi] = rcrec; - } - - (pass == 1) ? rcrec->len1++ : rcrec->len2++; - - rec->ha = (unsigned long) rcrec->idx; - - hi = (long) XDL_HASHLONG(rec->ha, hbits); - rec->next = rhash[hi]; - rhash[hi] = rec; - - return 0; -} - - -static int xdl_prepare_ctx(unsigned int pass, mmfile_t *mf, long narec, xpparam_t const *xpp, - xdlclassifier_t *cf, xdfile_t *xdf) { - unsigned int hbits; - long nrec, hsize, bsize; - unsigned long hav; - char const *blk, *cur, *top, *prev; - xrecord_t *crec; - xrecord_t **recs, **rrecs; - xrecord_t **rhash; - unsigned long *ha; - char *rchg; - long *rindex; - - ha = NULL; - rindex = NULL; - rchg = NULL; - rhash = NULL; - recs = NULL; - - if (xdl_cha_init(&xdf->rcha, sizeof(xrecord_t), narec / 4 + 1) < 0) - goto abort; - if (!(recs = (xrecord_t **) xdl_malloc(narec * sizeof(xrecord_t *)))) - goto abort; - - if (XDF_DIFF_ALG(xpp->flags) == XDF_HISTOGRAM_DIFF) - hbits = hsize = 0; - else { - hbits = xdl_hashbits((unsigned int) narec); - hsize = 1 << hbits; - if (!(rhash = (xrecord_t **) xdl_malloc(hsize * sizeof(xrecord_t *)))) - goto abort; - memset(rhash, 0, hsize * sizeof(xrecord_t *)); - } - - nrec = 0; - if ((cur = blk = xdl_mmfile_first(mf, &bsize)) != NULL) { - for (top = blk + bsize; cur < top; ) { - prev = cur; - hav = xdl_hash_record(&cur, top, xpp->flags); - if (nrec >= narec) { - narec *= 2; - if (!(rrecs = (xrecord_t **) xdl_realloc(recs, narec * sizeof(xrecord_t *)))) - goto abort; - recs = rrecs; - } - if (!(crec = xdl_cha_alloc(&xdf->rcha))) - goto abort; - crec->ptr = prev; - crec->size = (long) (cur - prev); - crec->ha = hav; - recs[nrec++] = crec; - - if ((XDF_DIFF_ALG(xpp->flags) != XDF_HISTOGRAM_DIFF) && - xdl_classify_record(pass, cf, rhash, hbits, crec) < 0) - goto abort; - } - } - - if (!(rchg = (char *) xdl_malloc((nrec + 2) * sizeof(char)))) - goto abort; - memset(rchg, 0, (nrec + 2) * sizeof(char)); - - if (!(rindex = (long *) xdl_malloc((nrec + 1) * sizeof(long)))) - goto abort; - if (!(ha = (unsigned long *) xdl_malloc((nrec + 1) * sizeof(unsigned long)))) - goto abort; - - xdf->nrec = nrec; - xdf->recs = recs; - xdf->hbits = hbits; - xdf->rhash = rhash; - xdf->rchg = rchg + 1; - xdf->rindex = rindex; - xdf->nreff = 0; - xdf->ha = ha; - xdf->dstart = 0; - xdf->dend = nrec - 1; - - return 0; - -abort: - xdl_free(ha); - xdl_free(rindex); - xdl_free(rchg); - xdl_free(rhash); - xdl_free(recs); - xdl_cha_free(&xdf->rcha); - return -1; -} - - -static void xdl_free_ctx(xdfile_t *xdf) { - - xdl_free(xdf->rhash); - xdl_free(xdf->rindex); - xdl_free(xdf->rchg - 1); - xdl_free(xdf->ha); - xdl_free(xdf->recs); - xdl_cha_free(&xdf->rcha); -} - - -int xdl_prepare_env(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, - xdfenv_t *xe) { - long enl1, enl2, sample; - xdlclassifier_t cf; - - memset(&cf, 0, sizeof(cf)); - - /* - * For histogram diff, we can afford a smaller sample size and - * thus a poorer estimate of the number of lines, as the hash - * table (rhash) won't be filled up/grown. The number of lines - * (nrecs) will be updated correctly anyway by - * xdl_prepare_ctx(). - */ - sample = (XDF_DIFF_ALG(xpp->flags) == XDF_HISTOGRAM_DIFF - ? XDL_GUESS_NLINES2 : XDL_GUESS_NLINES1); - - enl1 = xdl_guess_lines(mf1, sample) + 1; - enl2 = xdl_guess_lines(mf2, sample) + 1; - - if (XDF_DIFF_ALG(xpp->flags) != XDF_HISTOGRAM_DIFF && - xdl_init_classifier(&cf, enl1 + enl2 + 1, xpp->flags) < 0) - return -1; - - if (xdl_prepare_ctx(1, mf1, enl1, xpp, &cf, &xe->xdf1) < 0) { - - xdl_free_classifier(&cf); - return -1; - } - if (xdl_prepare_ctx(2, mf2, enl2, xpp, &cf, &xe->xdf2) < 0) { - - xdl_free_ctx(&xe->xdf1); - xdl_free_classifier(&cf); - return -1; - } - - if ((XDF_DIFF_ALG(xpp->flags) != XDF_PATIENCE_DIFF) && - (XDF_DIFF_ALG(xpp->flags) != XDF_HISTOGRAM_DIFF) && - xdl_optimize_ctxs(&cf, &xe->xdf1, &xe->xdf2) < 0) { - - xdl_free_ctx(&xe->xdf2); - xdl_free_ctx(&xe->xdf1); - xdl_free_classifier(&cf); - return -1; - } - - if (XDF_DIFF_ALG(xpp->flags) != XDF_HISTOGRAM_DIFF) - xdl_free_classifier(&cf); - - return 0; -} - - -void xdl_free_env(xdfenv_t *xe) { - - xdl_free_ctx(&xe->xdf2); - xdl_free_ctx(&xe->xdf1); -} - - -static int xdl_clean_mmatch(char const *dis, long i, long s, long e) { - long r, rdis0, rpdis0, rdis1, rpdis1; - - /* - * Limits the window the is examined during the similar-lines - * scan. The loops below stops when dis[i - r] == 1 (line that - * has no match), but there are corner cases where the loop - * proceed all the way to the extremities by causing huge - * performance penalties in case of big files. - */ - if (i - s > XDL_SIMSCAN_WINDOW) - s = i - XDL_SIMSCAN_WINDOW; - if (e - i > XDL_SIMSCAN_WINDOW) - e = i + XDL_SIMSCAN_WINDOW; - - /* - * Scans the lines before 'i' to find a run of lines that either - * have no match (dis[j] == 0) or have multiple matches (dis[j] > 1). - * Note that we always call this function with dis[i] > 1, so the - * current line (i) is already a multimatch line. - */ - for (r = 1, rdis0 = 0, rpdis0 = 1; (i - r) >= s; r++) { - if (!dis[i - r]) - rdis0++; - else if (dis[i - r] == 2) - rpdis0++; - else - break; - } - /* - * If the run before the line 'i' found only multimatch lines, we - * return 0 and hence we don't make the current line (i) discarded. - * We want to discard multimatch lines only when they appear in the - * middle of runs with nomatch lines (dis[j] == 0). - */ - if (rdis0 == 0) - return 0; - for (r = 1, rdis1 = 0, rpdis1 = 1; (i + r) <= e; r++) { - if (!dis[i + r]) - rdis1++; - else if (dis[i + r] == 2) - rpdis1++; - else - break; - } - /* - * If the run after the line 'i' found only multimatch lines, we - * return 0 and hence we don't make the current line (i) discarded. - */ - if (rdis1 == 0) - return 0; - rdis1 += rdis0; - rpdis1 += rpdis0; - - return rpdis1 * XDL_KPDIS_RUN < (rpdis1 + rdis1); -} - - -/* - * Try to reduce the problem complexity, discard records that have no - * matches on the other file. Also, lines that have multiple matches - * might be potentially discarded if they happear in a run of discardable. - */ -static int xdl_cleanup_records(xdlclassifier_t *cf, xdfile_t *xdf1, xdfile_t *xdf2) { - long i, nm, nreff, mlim; - xrecord_t **recs; - xdlclass_t *rcrec; - char *dis, *dis1, *dis2; - - if (!(dis = (char *) xdl_malloc(xdf1->nrec + xdf2->nrec + 2))) { - - return -1; - } - memset(dis, 0, xdf1->nrec + xdf2->nrec + 2); - dis1 = dis; - dis2 = dis1 + xdf1->nrec + 1; - - if ((mlim = xdl_bogosqrt(xdf1->nrec)) > XDL_MAX_EQLIMIT) - mlim = XDL_MAX_EQLIMIT; - for (i = xdf1->dstart, recs = &xdf1->recs[xdf1->dstart]; i <= xdf1->dend; i++, recs++) { - rcrec = cf->rcrecs[(*recs)->ha]; - nm = rcrec ? rcrec->len2 : 0; - dis1[i] = (nm == 0) ? 0: (nm >= mlim) ? 2: 1; - } - - if ((mlim = xdl_bogosqrt(xdf2->nrec)) > XDL_MAX_EQLIMIT) - mlim = XDL_MAX_EQLIMIT; - for (i = xdf2->dstart, recs = &xdf2->recs[xdf2->dstart]; i <= xdf2->dend; i++, recs++) { - rcrec = cf->rcrecs[(*recs)->ha]; - nm = rcrec ? rcrec->len1 : 0; - dis2[i] = (nm == 0) ? 0: (nm >= mlim) ? 2: 1; - } - - for (nreff = 0, i = xdf1->dstart, recs = &xdf1->recs[xdf1->dstart]; - i <= xdf1->dend; i++, recs++) { - if (dis1[i] == 1 || - (dis1[i] == 2 && !xdl_clean_mmatch(dis1, i, xdf1->dstart, xdf1->dend))) { - xdf1->rindex[nreff] = i; - xdf1->ha[nreff] = (*recs)->ha; - nreff++; - } else - xdf1->rchg[i] = 1; - } - xdf1->nreff = nreff; - - for (nreff = 0, i = xdf2->dstart, recs = &xdf2->recs[xdf2->dstart]; - i <= xdf2->dend; i++, recs++) { - if (dis2[i] == 1 || - (dis2[i] == 2 && !xdl_clean_mmatch(dis2, i, xdf2->dstart, xdf2->dend))) { - xdf2->rindex[nreff] = i; - xdf2->ha[nreff] = (*recs)->ha; - nreff++; - } else - xdf2->rchg[i] = 1; - } - xdf2->nreff = nreff; - - xdl_free(dis); - - return 0; -} - - -/* - * Early trim initial and terminal matching records. - */ -static int xdl_trim_ends(xdfile_t *xdf1, xdfile_t *xdf2) { - long i, lim; - xrecord_t **recs1, **recs2; - - recs1 = xdf1->recs; - recs2 = xdf2->recs; - for (i = 0, lim = XDL_MIN(xdf1->nrec, xdf2->nrec); i < lim; - i++, recs1++, recs2++) - if ((*recs1)->ha != (*recs2)->ha) - break; - - xdf1->dstart = xdf2->dstart = i; - - recs1 = xdf1->recs + xdf1->nrec - 1; - recs2 = xdf2->recs + xdf2->nrec - 1; - for (lim -= i, i = 0; i < lim; i++, recs1--, recs2--) - if ((*recs1)->ha != (*recs2)->ha) - break; - - xdf1->dend = xdf1->nrec - i - 1; - xdf2->dend = xdf2->nrec - i - 1; - - return 0; -} - - -static int xdl_optimize_ctxs(xdlclassifier_t *cf, xdfile_t *xdf1, xdfile_t *xdf2) { - - if (xdl_trim_ends(xdf1, xdf2) < 0 || - xdl_cleanup_records(cf, xdf1, xdf2) < 0) { - - return -1; - } - - return 0; -} diff --git a/vendor/libgit2/src/xdiff/xprepare.h b/vendor/libgit2/src/xdiff/xprepare.h deleted file mode 100644 index 8fb06a537..000000000 --- a/vendor/libgit2/src/xdiff/xprepare.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - * LibXDiff by Davide Libenzi ( File Differential Library ) - * Copyright (C) 2003 Davide Libenzi - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * Davide Libenzi - * - */ - -#if !defined(XPREPARE_H) -#define XPREPARE_H - - - -int xdl_prepare_env(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, - xdfenv_t *xe); -void xdl_free_env(xdfenv_t *xe); - - - -#endif /* #if !defined(XPREPARE_H) */ diff --git a/vendor/libgit2/src/xdiff/xtypes.h b/vendor/libgit2/src/xdiff/xtypes.h deleted file mode 100644 index 2511aef8d..000000000 --- a/vendor/libgit2/src/xdiff/xtypes.h +++ /dev/null @@ -1,67 +0,0 @@ -/* - * LibXDiff by Davide Libenzi ( File Differential Library ) - * Copyright (C) 2003 Davide Libenzi - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * Davide Libenzi - * - */ - -#if !defined(XTYPES_H) -#define XTYPES_H - - - -typedef struct s_chanode { - struct s_chanode *next; - long icurr; -} chanode_t; - -typedef struct s_chastore { - chanode_t *head, *tail; - long isize, nsize; - chanode_t *ancur; - chanode_t *sncur; - long scurr; -} chastore_t; - -typedef struct s_xrecord { - struct s_xrecord *next; - char const *ptr; - long size; - unsigned long ha; -} xrecord_t; - -typedef struct s_xdfile { - chastore_t rcha; - long nrec; - unsigned int hbits; - xrecord_t **rhash; - long dstart, dend; - xrecord_t **recs; - char *rchg; - long *rindex; - long nreff; - unsigned long *ha; -} xdfile_t; - -typedef struct s_xdfenv { - xdfile_t xdf1, xdf2; -} xdfenv_t; - - - -#endif /* #if !defined(XTYPES_H) */ diff --git a/vendor/libgit2/src/xdiff/xutils.c b/vendor/libgit2/src/xdiff/xutils.c deleted file mode 100644 index 30f2a30ac..000000000 --- a/vendor/libgit2/src/xdiff/xutils.c +++ /dev/null @@ -1,403 +0,0 @@ -/* - * LibXDiff by Davide Libenzi ( File Differential Library ) - * Copyright (C) 2003 Davide Libenzi - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * Davide Libenzi - * - */ - -#include "xinclude.h" - - - - -long xdl_bogosqrt(long n) { - long i; - - /* - * Classical integer square root approximation using shifts. - */ - for (i = 1; n > 0; n >>= 2) - i <<= 1; - - return i; -} - - -int xdl_emit_diffrec(char const *rec, long size, char const *pre, long psize, - xdemitcb_t *ecb) { - int i = 2; - mmbuffer_t mb[3]; - - mb[0].ptr = (char *) pre; - mb[0].size = psize; - mb[1].ptr = (char *) rec; - mb[1].size = size; - if (size > 0 && rec[size - 1] != '\n') { - mb[2].ptr = (char *) "\n\\ No newline at end of file\n"; - mb[2].size = strlen(mb[2].ptr); - i++; - } - if (ecb->outf(ecb->priv, mb, i) < 0) { - - return -1; - } - - return 0; -} - -void *xdl_mmfile_first(mmfile_t *mmf, long *size) -{ - *size = (long)mmf->size; - return mmf->ptr; -} - - -long xdl_mmfile_size(mmfile_t *mmf) -{ - return (long)mmf->size; -} - - -int xdl_cha_init(chastore_t *cha, long isize, long icount) { - - cha->head = cha->tail = NULL; - cha->isize = isize; - cha->nsize = icount * isize; - cha->ancur = cha->sncur = NULL; - cha->scurr = 0; - - return 0; -} - - -void xdl_cha_free(chastore_t *cha) { - chanode_t *cur, *tmp; - - for (cur = cha->head; (tmp = cur) != NULL;) { - cur = cur->next; - xdl_free(tmp); - } -} - - -void *xdl_cha_alloc(chastore_t *cha) { - chanode_t *ancur; - void *data; - - if (!(ancur = cha->ancur) || ancur->icurr == cha->nsize) { - if (!(ancur = (chanode_t *) xdl_malloc(sizeof(chanode_t) + cha->nsize))) { - - return NULL; - } - ancur->icurr = 0; - ancur->next = NULL; - if (cha->tail) - cha->tail->next = ancur; - if (!cha->head) - cha->head = ancur; - cha->tail = ancur; - cha->ancur = ancur; - } - - data = (char *) ancur + sizeof(chanode_t) + ancur->icurr; - ancur->icurr += cha->isize; - - return data; -} - -long xdl_guess_lines(mmfile_t *mf, long sample) { - long nl = 0, size, tsize = 0; - char const *data, *cur, *top; - - if ((cur = data = xdl_mmfile_first(mf, &size)) != NULL) { - for (top = data + size; nl < sample && cur < top; ) { - nl++; - if (!(cur = memchr(cur, '\n', top - cur))) - cur = top; - else - cur++; - } - tsize += (long) (cur - data); - } - - if (nl && tsize) - nl = xdl_mmfile_size(mf) / (tsize / nl); - - return nl + 1; -} - -int xdl_blankline(const char *line, long size, long flags) -{ - long i; - - if (!(flags & XDF_WHITESPACE_FLAGS)) - return (size <= 1); - - for (i = 0; i < size && XDL_ISSPACE(line[i]); i++) - ; - - return (i == size); -} - -int xdl_recmatch(const char *l1, long s1, const char *l2, long s2, long flags) -{ - int i1, i2; - - if (s1 == s2 && !memcmp(l1, l2, s1)) - return 1; - if (!(flags & XDF_WHITESPACE_FLAGS)) - return 0; - - i1 = 0; - i2 = 0; - - /* - * -w matches everything that matches with -b, and -b in turn - * matches everything that matches with --ignore-space-at-eol. - * - * Each flavor of ignoring needs different logic to skip whitespaces - * while we have both sides to compare. - */ - if (flags & XDF_IGNORE_WHITESPACE) { - goto skip_ws; - while (i1 < s1 && i2 < s2) { - if (l1[i1++] != l2[i2++]) - return 0; - skip_ws: - while (i1 < s1 && XDL_ISSPACE(l1[i1])) - i1++; - while (i2 < s2 && XDL_ISSPACE(l2[i2])) - i2++; - } - } else if (flags & XDF_IGNORE_WHITESPACE_CHANGE) { - while (i1 < s1 && i2 < s2) { - if (XDL_ISSPACE(l1[i1]) && XDL_ISSPACE(l2[i2])) { - /* Skip matching spaces and try again */ - while (i1 < s1 && XDL_ISSPACE(l1[i1])) - i1++; - while (i2 < s2 && XDL_ISSPACE(l2[i2])) - i2++; - continue; - } - if (l1[i1++] != l2[i2++]) - return 0; - } - } else if (flags & XDF_IGNORE_WHITESPACE_AT_EOL) { - while (i1 < s1 && i2 < s2 && l1[i1++] == l2[i2++]) - ; /* keep going */ - } - - /* - * After running out of one side, the remaining side must have - * nothing but whitespace for the lines to match. Note that - * ignore-whitespace-at-eol case may break out of the loop - * while there still are characters remaining on both lines. - */ - if (i1 < s1) { - while (i1 < s1 && XDL_ISSPACE(l1[i1])) - i1++; - if (s1 != i1) - return 0; - } - if (i2 < s2) { - while (i2 < s2 && XDL_ISSPACE(l2[i2])) - i2++; - return (s2 == i2); - } - return 1; -} - -static unsigned long xdl_hash_record_with_whitespace(char const **data, - char const *top, long flags) { - unsigned long ha = 5381; - char const *ptr = *data; - - for (; ptr < top && *ptr != '\n'; ptr++) { - if (XDL_ISSPACE(*ptr)) { - const char *ptr2 = ptr; - int at_eol; - while (ptr + 1 < top && XDL_ISSPACE(ptr[1]) - && ptr[1] != '\n') - ptr++; - at_eol = (top <= ptr + 1 || ptr[1] == '\n'); - if (flags & XDF_IGNORE_WHITESPACE) - ; /* already handled */ - else if (flags & XDF_IGNORE_WHITESPACE_CHANGE - && !at_eol) { - ha += (ha << 5); - ha ^= (unsigned long) ' '; - } - else if (flags & XDF_IGNORE_WHITESPACE_AT_EOL - && !at_eol) { - while (ptr2 != ptr + 1) { - ha += (ha << 5); - ha ^= (unsigned long) *ptr2; - ptr2++; - } - } - continue; - } - ha += (ha << 5); - ha ^= (unsigned long) *ptr; - } - *data = ptr < top ? ptr + 1: ptr; - - return ha; -} - - -unsigned long xdl_hash_record(char const **data, char const *top, long flags) { - unsigned long ha = 5381; - char const *ptr = *data; - - if (flags & XDF_WHITESPACE_FLAGS) - return xdl_hash_record_with_whitespace(data, top, flags); - - for (; ptr < top && *ptr != '\n'; ptr++) { - ha += (ha << 5); - ha ^= (unsigned long) *ptr; - } - *data = ptr < top ? ptr + 1: ptr; - - return ha; -} - - -unsigned int xdl_hashbits(unsigned int size) { - unsigned int val = 1, bits = 0; - - for (; val < size && bits < CHAR_BIT * sizeof(unsigned int); val <<= 1, bits++); - return bits ? bits: 1; -} - - -int xdl_num_out(char *out, long val) { - char *ptr, *str = out; - char buf[32]; - - ptr = buf + sizeof(buf) - 1; - *ptr = '\0'; - if (val < 0) { - *--ptr = '-'; - val = -val; - } - for (; val && ptr > buf; val /= 10) - *--ptr = "0123456789"[val % 10]; - if (*ptr) - for (; *ptr; ptr++, str++) - *str = *ptr; - else - *str++ = '0'; - *str = '\0'; - - return (int)(str - out); -} - - -long xdl_atol(char const *str, char const **next) { - long val, base; - char const *top; - - for (top = str; XDL_ISDIGIT(*top); top++); - if (next) - *next = top; - for (val = 0, base = 1, top--; top >= str; top--, base *= 10) - val += base * (long)(*top - '0'); - return val; -} - - -int xdl_emit_hunk_hdr(long s1, long c1, long s2, long c2, - const char *func, long funclen, xdemitcb_t *ecb) { - int nb = 0; - mmbuffer_t mb; - char buf[128]; - - memcpy(buf, "@@ -", 4); - nb += 4; - - nb += xdl_num_out(buf + nb, c1 ? s1: s1 - 1); - - if (c1 != 1) { - memcpy(buf + nb, ",", 1); - nb += 1; - - nb += xdl_num_out(buf + nb, c1); - } - - memcpy(buf + nb, " +", 2); - nb += 2; - - nb += xdl_num_out(buf + nb, c2 ? s2: s2 - 1); - - if (c2 != 1) { - memcpy(buf + nb, ",", 1); - nb += 1; - - nb += xdl_num_out(buf + nb, c2); - } - - memcpy(buf + nb, " @@", 3); - nb += 3; - if (func && funclen) { - buf[nb++] = ' '; - if (funclen > (long)sizeof(buf) - nb - 1) - funclen = (long)sizeof(buf) - nb - 1; - memcpy(buf + nb, func, funclen); - nb += funclen; - } - buf[nb++] = '\n'; - - mb.ptr = buf; - mb.size = nb; - if (ecb->outf(ecb->priv, &mb, 1) < 0) - return -1; - - return 0; -} - -int xdl_fall_back_diff(xdfenv_t *diff_env, xpparam_t const *xpp, - int line1, int count1, int line2, int count2) -{ - /* - * This probably does not work outside Git, since - * we have a very simple mmfile structure. - * - * Note: ideally, we would reuse the prepared environment, but - * the libxdiff interface does not (yet) allow for diffing only - * ranges of lines instead of the whole files. - */ - mmfile_t subfile1, subfile2; - xdfenv_t env; - - subfile1.ptr = (char *)diff_env->xdf1.recs[line1 - 1]->ptr; - subfile1.size = diff_env->xdf1.recs[line1 + count1 - 2]->ptr + - diff_env->xdf1.recs[line1 + count1 - 2]->size - subfile1.ptr; - subfile2.ptr = (char *)diff_env->xdf2.recs[line2 - 1]->ptr; - subfile2.size = diff_env->xdf2.recs[line2 + count2 - 2]->ptr + - diff_env->xdf2.recs[line2 + count2 - 2]->size - subfile2.ptr; - if (xdl_do_diff(&subfile1, &subfile2, xpp, &env) < 0) - return -1; - - memcpy(diff_env->xdf1.rchg + line1 - 1, env.xdf1.rchg, count1); - memcpy(diff_env->xdf2.rchg + line2 - 1, env.xdf2.rchg, count2); - - xdl_free_env(&env); - - return 0; -} diff --git a/vendor/libgit2/src/xdiff/xutils.h b/vendor/libgit2/src/xdiff/xutils.h deleted file mode 100644 index 8f952a8e6..000000000 --- a/vendor/libgit2/src/xdiff/xutils.h +++ /dev/null @@ -1,50 +0,0 @@ -/* - * LibXDiff by Davide Libenzi ( File Differential Library ) - * Copyright (C) 2003 Davide Libenzi - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * Davide Libenzi - * - */ - -#if !defined(XUTILS_H) -#define XUTILS_H - - - -long xdl_bogosqrt(long n); -int xdl_emit_diffrec(char const *rec, long size, char const *pre, long psize, - xdemitcb_t *ecb); -int xdl_cha_init(chastore_t *cha, long isize, long icount); -void xdl_cha_free(chastore_t *cha); -void *xdl_cha_alloc(chastore_t *cha); -void *xdl_cha_first(chastore_t *cha); -void *xdl_cha_next(chastore_t *cha); -long xdl_guess_lines(mmfile_t *mf, long sample); -int xdl_blankline(const char *line, long size, long flags); -int xdl_recmatch(const char *l1, long s1, const char *l2, long s2, long flags); -unsigned long xdl_hash_record(char const **data, char const *top, long flags); -unsigned int xdl_hashbits(unsigned int size); -int xdl_num_out(char *out, long val); -long xdl_atol(char const *str, char const **next); -int xdl_emit_hunk_hdr(long s1, long c1, long s2, long c2, - const char *func, long funclen, xdemitcb_t *ecb); -int xdl_fall_back_diff(xdfenv_t *diff_env, xpparam_t const *xpp, - int line1, int count1, int line2, int count2); - - - -#endif /* #if !defined(XUTILS_H) */ diff --git a/vendor/libgit2/src/zstream.c b/vendor/libgit2/src/zstream.c deleted file mode 100644 index 2130bc3ca..000000000 --- a/vendor/libgit2/src/zstream.c +++ /dev/null @@ -1,156 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ - -#include - -#include "zstream.h" -#include "buffer.h" - -#define ZSTREAM_BUFFER_SIZE (1024 * 1024) -#define ZSTREAM_BUFFER_MIN_EXTRA 8 - -static int zstream_seterr(git_zstream *zs) -{ - if (zs->zerr == Z_OK || zs->zerr == Z_STREAM_END) - return 0; - - if (zs->zerr == Z_MEM_ERROR) - giterr_set_oom(); - else if (zs->z.msg) - giterr_set(GITERR_ZLIB, zs->z.msg); - else - giterr_set(GITERR_ZLIB, "Unknown compression error"); - - return -1; -} - -int git_zstream_init(git_zstream *zstream) -{ - zstream->zerr = deflateInit(&zstream->z, Z_DEFAULT_COMPRESSION); - return zstream_seterr(zstream); -} - -void git_zstream_free(git_zstream *zstream) -{ - deflateEnd(&zstream->z); -} - -void git_zstream_reset(git_zstream *zstream) -{ - deflateReset(&zstream->z); - zstream->in = NULL; - zstream->in_len = 0; - zstream->zerr = Z_STREAM_END; -} - -int git_zstream_set_input(git_zstream *zstream, const void *in, size_t in_len) -{ - zstream->in = in; - zstream->in_len = in_len; - zstream->zerr = Z_OK; - return 0; -} - -bool git_zstream_done(git_zstream *zstream) -{ - return (!zstream->in_len && zstream->zerr == Z_STREAM_END); -} - -size_t git_zstream_suggest_output_len(git_zstream *zstream) -{ - if (zstream->in_len > ZSTREAM_BUFFER_SIZE) - return ZSTREAM_BUFFER_SIZE; - else if (zstream->in_len > ZSTREAM_BUFFER_MIN_EXTRA) - return zstream->in_len; - else - return ZSTREAM_BUFFER_MIN_EXTRA; -} - -int git_zstream_get_output(void *out, size_t *out_len, git_zstream *zstream) -{ - int zflush = Z_FINISH; - size_t out_remain = *out_len; - - while (out_remain > 0 && zstream->zerr != Z_STREAM_END) { - size_t out_queued, in_queued, out_used, in_used; - - /* set up in data */ - zstream->z.next_in = (Bytef *)zstream->in; - zstream->z.avail_in = (uInt)zstream->in_len; - if ((size_t)zstream->z.avail_in != zstream->in_len) { - zstream->z.avail_in = INT_MAX; - zflush = Z_NO_FLUSH; - } else { - zflush = Z_FINISH; - } - in_queued = (size_t)zstream->z.avail_in; - - /* set up out data */ - zstream->z.next_out = out; - zstream->z.avail_out = (uInt)out_remain; - if ((size_t)zstream->z.avail_out != out_remain) - zstream->z.avail_out = INT_MAX; - out_queued = (size_t)zstream->z.avail_out; - - /* compress next chunk */ - zstream->zerr = deflate(&zstream->z, zflush); - - if (zstream->zerr == Z_STREAM_ERROR) - return zstream_seterr(zstream); - - out_used = (out_queued - zstream->z.avail_out); - out_remain -= out_used; - out = ((char *)out) + out_used; - - in_used = (in_queued - zstream->z.avail_in); - zstream->in_len -= in_used; - zstream->in += in_used; - } - - /* either we finished the input or we did not flush the data */ - assert(zstream->in_len > 0 || zflush == Z_FINISH); - - /* set out_size to number of bytes actually written to output */ - *out_len = *out_len - out_remain; - - return 0; -} - -int git_zstream_deflatebuf(git_buf *out, const void *in, size_t in_len) -{ - git_zstream zs = GIT_ZSTREAM_INIT; - int error = 0; - - if ((error = git_zstream_init(&zs)) < 0) - return error; - - if ((error = git_zstream_set_input(&zs, in, in_len)) < 0) - goto done; - - while (!git_zstream_done(&zs)) { - size_t step = git_zstream_suggest_output_len(&zs), written; - - if ((error = git_buf_grow_by(out, step)) < 0) - goto done; - - written = out->asize - out->size; - - if ((error = git_zstream_get_output( - out->ptr + out->size, &written, &zs)) < 0) - goto done; - - out->size += written; - } - - /* NULL terminate for consistency if possible */ - if (out->size < out->asize) - out->ptr[out->size] = '\0'; - -done: - git_zstream_free(&zs); - return error; -} diff --git a/vendor/libgit2/src/zstream.h b/vendor/libgit2/src/zstream.h deleted file mode 100644 index 9b5bf6ace..000000000 --- a/vendor/libgit2/src/zstream.h +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (C) the libgit2 contributors. All rights reserved. - * - * This file is part of libgit2, distributed under the GNU GPL v2 with - * a Linking Exception. For full terms see the included COPYING file. - */ -#ifndef INCLUDE_zstream_h__ -#define INCLUDE_zstream_h__ - -#include - -#include "common.h" -#include "buffer.h" - -typedef struct { - z_stream z; - const char *in; - size_t in_len; - int zerr; -} git_zstream; - -#define GIT_ZSTREAM_INIT {{0}} - -int git_zstream_init(git_zstream *zstream); -void git_zstream_free(git_zstream *zstream); - -int git_zstream_set_input(git_zstream *zstream, const void *in, size_t in_len); - -size_t git_zstream_suggest_output_len(git_zstream *zstream); - -int git_zstream_get_output(void *out, size_t *out_len, git_zstream *zstream); - -bool git_zstream_done(git_zstream *zstream); - -void git_zstream_reset(git_zstream *zstream); - -int git_zstream_deflatebuf(git_buf *out, const void *in, size_t in_len); - -#endif /* INCLUDE_zstream_h__ */ diff --git a/vendor/libgit2/tests/README.md b/vendor/libgit2/tests/README.md deleted file mode 100644 index 3aeaaf464..000000000 --- a/vendor/libgit2/tests/README.md +++ /dev/null @@ -1,22 +0,0 @@ -Writing Clar tests for libgit2 -============================== - -For information on the Clar testing framework and a detailed introduction -please visit: - -https://github.com/vmg/clar - - -* Write your modules and tests. Use good, meaningful names. - -* Make sure you actually build the tests by setting: - - cmake -DBUILD_CLAR=ON build/ - -* Test: - - ./build/libgit2_clar - -* Make sure everything is fine. - -* Send your pull request. That's it. diff --git a/vendor/libgit2/tests/attr/attr_expect.h b/vendor/libgit2/tests/attr/attr_expect.h deleted file mode 100644 index 70f1ab4f5..000000000 --- a/vendor/libgit2/tests/attr/attr_expect.h +++ /dev/null @@ -1,43 +0,0 @@ -#ifndef __CLAR_TEST_ATTR_EXPECT__ -#define __CLAR_TEST_ATTR_EXPECT__ - -enum attr_expect_t { - EXPECT_FALSE, - EXPECT_TRUE, - EXPECT_UNDEFINED, - EXPECT_STRING -}; - -struct attr_expected { - const char *path; - const char *attr; - enum attr_expect_t expected; - const char *expected_str; -}; - -GIT_INLINE(void) attr_check_expected( - enum attr_expect_t expected, - const char *expected_str, - const char *name, - const char *value) -{ - switch (expected) { - case EXPECT_TRUE: - cl_assert_(GIT_ATTR_TRUE(value), name); - break; - - case EXPECT_FALSE: - cl_assert_(GIT_ATTR_FALSE(value), name); - break; - - case EXPECT_UNDEFINED: - cl_assert_(GIT_ATTR_UNSPECIFIED(value), name); - break; - - case EXPECT_STRING: - cl_assert_equal_s(expected_str, value); - break; - } -} - -#endif diff --git a/vendor/libgit2/tests/attr/file.c b/vendor/libgit2/tests/attr/file.c deleted file mode 100644 index 1f4108c3c..000000000 --- a/vendor/libgit2/tests/attr/file.c +++ /dev/null @@ -1,224 +0,0 @@ -#include "clar_libgit2.h" -#include "attr_file.h" -#include "attr_expect.h" - -#define get_rule(X) ((git_attr_rule *)git_vector_get(&file->rules,(X))) -#define get_assign(R,Y) ((git_attr_assignment *)git_vector_get(&(R)->assigns,(Y))) - -void test_attr_file__simple_read(void) -{ - git_attr_file *file; - git_attr_assignment *assign; - git_attr_rule *rule; - - cl_git_pass(git_attr_file__load_standalone(&file, cl_fixture("attr/attr0"))); - - cl_assert_equal_s(cl_fixture("attr/attr0"), file->entry->path); - cl_assert(file->rules.length == 1); - - rule = get_rule(0); - cl_assert(rule != NULL); - cl_assert_equal_s("*", rule->match.pattern); - cl_assert(rule->match.length == 1); - cl_assert((rule->match.flags & GIT_ATTR_FNMATCH_HASWILD) != 0); - - cl_assert(rule->assigns.length == 1); - assign = get_assign(rule, 0); - cl_assert(assign != NULL); - cl_assert_equal_s("binary", assign->name); - cl_assert(GIT_ATTR_TRUE(assign->value)); - - git_attr_file__free(file); -} - -void test_attr_file__match_variants(void) -{ - git_attr_file *file; - git_attr_rule *rule; - git_attr_assignment *assign; - - cl_git_pass(git_attr_file__load_standalone(&file, cl_fixture("attr/attr1"))); - - cl_assert_equal_s(cl_fixture("attr/attr1"), file->entry->path); - cl_assert(file->rules.length == 10); - - /* let's do a thorough check of this rule, then just verify - * the things that are unique for the later rules - */ - rule = get_rule(0); - cl_assert(rule); - cl_assert_equal_s("pat0", rule->match.pattern); - cl_assert(rule->match.length == strlen("pat0")); - cl_assert(rule->assigns.length == 1); - assign = get_assign(rule,0); - cl_assert_equal_s("attr0", assign->name); - cl_assert(assign->name_hash == git_attr_file__name_hash(assign->name)); - cl_assert(GIT_ATTR_TRUE(assign->value)); - - rule = get_rule(1); - cl_assert_equal_s("pat1", rule->match.pattern); - cl_assert(rule->match.length == strlen("pat1")); - cl_assert((rule->match.flags & GIT_ATTR_FNMATCH_NEGATIVE) != 0); - - rule = get_rule(2); - cl_assert_equal_s("pat2", rule->match.pattern); - cl_assert(rule->match.length == strlen("pat2")); - cl_assert((rule->match.flags & GIT_ATTR_FNMATCH_DIRECTORY) != 0); - - rule = get_rule(3); - cl_assert_equal_s("pat3dir/pat3file", rule->match.pattern); - cl_assert((rule->match.flags & GIT_ATTR_FNMATCH_FULLPATH) != 0); - - rule = get_rule(4); - cl_assert_equal_s("pat4.*", rule->match.pattern); - cl_assert((rule->match.flags & GIT_ATTR_FNMATCH_HASWILD) != 0); - - rule = get_rule(5); - cl_assert_equal_s("*.pat5", rule->match.pattern); - cl_assert((rule->match.flags & GIT_ATTR_FNMATCH_HASWILD) != 0); - - rule = get_rule(7); - cl_assert_equal_s("pat7[a-e]??[xyz]", rule->match.pattern); - cl_assert(rule->assigns.length == 1); - cl_assert((rule->match.flags & GIT_ATTR_FNMATCH_HASWILD) != 0); - assign = get_assign(rule,0); - cl_assert_equal_s("attr7", assign->name); - cl_assert(GIT_ATTR_TRUE(assign->value)); - - rule = get_rule(8); - cl_assert_equal_s("pat8 with spaces", rule->match.pattern); - cl_assert(rule->match.length == strlen("pat8 with spaces")); - - rule = get_rule(9); - cl_assert_equal_s("pat9", rule->match.pattern); - - git_attr_file__free(file); -} - -static void check_one_assign( - git_attr_file *file, - int rule_idx, - int assign_idx, - const char *pattern, - const char *name, - enum attr_expect_t expected, - const char *expected_str) -{ - git_attr_rule *rule = get_rule(rule_idx); - git_attr_assignment *assign = get_assign(rule, assign_idx); - - cl_assert_equal_s(pattern, rule->match.pattern); - cl_assert(rule->assigns.length == 1); - cl_assert_equal_s(name, assign->name); - cl_assert(assign->name_hash == git_attr_file__name_hash(assign->name)); - - attr_check_expected(expected, expected_str, assign->name, assign->value); -} - -void test_attr_file__assign_variants(void) -{ - git_attr_file *file; - git_attr_rule *rule; - git_attr_assignment *assign; - - cl_git_pass(git_attr_file__load_standalone(&file, cl_fixture("attr/attr2"))); - - cl_assert_equal_s(cl_fixture("attr/attr2"), file->entry->path); - cl_assert(file->rules.length == 11); - - check_one_assign(file, 0, 0, "pat0", "simple", EXPECT_TRUE, NULL); - check_one_assign(file, 1, 0, "pat1", "neg", EXPECT_FALSE, NULL); - check_one_assign(file, 2, 0, "*", "notundef", EXPECT_TRUE, NULL); - check_one_assign(file, 3, 0, "pat2", "notundef", EXPECT_UNDEFINED, NULL); - check_one_assign(file, 4, 0, "pat3", "assigned", EXPECT_STRING, "test-value"); - check_one_assign(file, 5, 0, "pat4", "rule-with-more-chars", EXPECT_STRING, "value-with-more-chars"); - check_one_assign(file, 6, 0, "pat5", "empty", EXPECT_TRUE, NULL); - check_one_assign(file, 7, 0, "pat6", "negempty", EXPECT_FALSE, NULL); - - rule = get_rule(8); - cl_assert_equal_s("pat7", rule->match.pattern); - cl_assert(rule->assigns.length == 5); - /* assignments will be sorted by hash value, so we have to do - * lookups by search instead of by position - */ - assign = git_attr_rule__lookup_assignment(rule, "multiple"); - cl_assert(assign); - cl_assert_equal_s("multiple", assign->name); - cl_assert(GIT_ATTR_TRUE(assign->value)); - assign = git_attr_rule__lookup_assignment(rule, "single"); - cl_assert(assign); - cl_assert_equal_s("single", assign->name); - cl_assert(GIT_ATTR_FALSE(assign->value)); - assign = git_attr_rule__lookup_assignment(rule, "values"); - cl_assert(assign); - cl_assert_equal_s("values", assign->name); - cl_assert_equal_s("1", assign->value); - assign = git_attr_rule__lookup_assignment(rule, "also"); - cl_assert(assign); - cl_assert_equal_s("also", assign->name); - cl_assert_equal_s("a-really-long-value/*", assign->value); - assign = git_attr_rule__lookup_assignment(rule, "happy"); - cl_assert(assign); - cl_assert_equal_s("happy", assign->name); - cl_assert_equal_s("yes!", assign->value); - assign = git_attr_rule__lookup_assignment(rule, "other"); - cl_assert(!assign); - - rule = get_rule(9); - cl_assert_equal_s("pat8", rule->match.pattern); - cl_assert(rule->assigns.length == 2); - assign = git_attr_rule__lookup_assignment(rule, "again"); - cl_assert(assign); - cl_assert_equal_s("again", assign->name); - cl_assert(GIT_ATTR_TRUE(assign->value)); - assign = git_attr_rule__lookup_assignment(rule, "another"); - cl_assert(assign); - cl_assert_equal_s("another", assign->name); - cl_assert_equal_s("12321", assign->value); - - check_one_assign(file, 10, 0, "pat9", "at-eof", EXPECT_FALSE, NULL); - - git_attr_file__free(file); -} - -void test_attr_file__check_attr_examples(void) -{ - git_attr_file *file; - git_attr_rule *rule; - git_attr_assignment *assign; - - cl_git_pass(git_attr_file__load_standalone(&file, cl_fixture("attr/attr3"))); - cl_assert_equal_s(cl_fixture("attr/attr3"), file->entry->path); - cl_assert(file->rules.length == 3); - - rule = get_rule(0); - cl_assert_equal_s("*.java", rule->match.pattern); - cl_assert(rule->assigns.length == 3); - assign = git_attr_rule__lookup_assignment(rule, "diff"); - cl_assert_equal_s("diff", assign->name); - cl_assert_equal_s("java", assign->value); - assign = git_attr_rule__lookup_assignment(rule, "crlf"); - cl_assert_equal_s("crlf", assign->name); - cl_assert(GIT_ATTR_FALSE(assign->value)); - assign = git_attr_rule__lookup_assignment(rule, "myAttr"); - cl_assert_equal_s("myAttr", assign->name); - cl_assert(GIT_ATTR_TRUE(assign->value)); - assign = git_attr_rule__lookup_assignment(rule, "missing"); - cl_assert(assign == NULL); - - rule = get_rule(1); - cl_assert_equal_s("NoMyAttr.java", rule->match.pattern); - cl_assert(rule->assigns.length == 1); - assign = get_assign(rule, 0); - cl_assert_equal_s("myAttr", assign->name); - cl_assert(GIT_ATTR_UNSPECIFIED(assign->value)); - - rule = get_rule(2); - cl_assert_equal_s("README", rule->match.pattern); - cl_assert(rule->assigns.length == 1); - assign = get_assign(rule, 0); - cl_assert_equal_s("caveat", assign->name); - cl_assert_equal_s("unspecified", assign->value); - - git_attr_file__free(file); -} diff --git a/vendor/libgit2/tests/attr/flags.c b/vendor/libgit2/tests/attr/flags.c deleted file mode 100644 index 80c6e1171..000000000 --- a/vendor/libgit2/tests/attr/flags.c +++ /dev/null @@ -1,108 +0,0 @@ -#include "clar_libgit2.h" -#include "git2/attr.h" - -void test_attr_flags__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -void test_attr_flags__bare(void) -{ - git_repository *repo = cl_git_sandbox_init("testrepo.git"); - const char *value; - - cl_assert(git_repository_is_bare(repo)); - - cl_git_pass(git_attr_get( - &value, repo, GIT_ATTR_CHECK_NO_SYSTEM, "README.md", "diff")); - cl_assert(GIT_ATTR_UNSPECIFIED(value)); -} - -void test_attr_flags__index_vs_workdir(void) -{ - git_repository *repo = cl_git_sandbox_init("attr_index"); - const char *value; - - cl_assert(!git_repository_is_bare(repo)); - - /* wd then index */ - cl_git_pass(git_attr_get( - &value, repo, GIT_ATTR_CHECK_NO_SYSTEM | GIT_ATTR_CHECK_FILE_THEN_INDEX, - "README.md", "bar")); - cl_assert(GIT_ATTR_FALSE(value)); - - cl_git_pass(git_attr_get( - &value, repo, GIT_ATTR_CHECK_NO_SYSTEM | GIT_ATTR_CHECK_FILE_THEN_INDEX, - "README.md", "blargh")); - cl_assert_equal_s(value, "goop"); - - cl_git_pass(git_attr_get( - &value, repo, GIT_ATTR_CHECK_NO_SYSTEM | GIT_ATTR_CHECK_FILE_THEN_INDEX, - "README.txt", "foo")); - cl_assert(GIT_ATTR_FALSE(value)); - - /* index then wd */ - cl_git_pass(git_attr_get( - &value, repo, GIT_ATTR_CHECK_NO_SYSTEM | GIT_ATTR_CHECK_INDEX_THEN_FILE, - "README.md", "bar")); - cl_assert(GIT_ATTR_TRUE(value)); - - cl_git_pass(git_attr_get( - &value, repo, GIT_ATTR_CHECK_NO_SYSTEM | GIT_ATTR_CHECK_INDEX_THEN_FILE, - "README.md", "blargh")); - cl_assert_equal_s(value, "garble"); - - cl_git_pass(git_attr_get( - &value, repo, GIT_ATTR_CHECK_NO_SYSTEM | GIT_ATTR_CHECK_INDEX_THEN_FILE, - "README.txt", "foo")); - cl_assert(GIT_ATTR_TRUE(value)); -} - -void test_attr_flags__subdir(void) -{ - git_repository *repo = cl_git_sandbox_init("attr_index"); - const char *value; - - /* wd then index */ - cl_git_pass(git_attr_get( - &value, repo, GIT_ATTR_CHECK_NO_SYSTEM | GIT_ATTR_CHECK_FILE_THEN_INDEX, - "sub/sub/README.md", "bar")); - cl_assert_equal_s(value, "1234"); - - cl_git_pass(git_attr_get( - &value, repo, GIT_ATTR_CHECK_NO_SYSTEM | GIT_ATTR_CHECK_FILE_THEN_INDEX, - "sub/sub/README.txt", "another")); - cl_assert_equal_s(value, "one"); - - cl_git_pass(git_attr_get( - &value, repo, GIT_ATTR_CHECK_NO_SYSTEM | GIT_ATTR_CHECK_FILE_THEN_INDEX, - "sub/sub/README.txt", "again")); - cl_assert(GIT_ATTR_TRUE(value)); - - cl_git_pass(git_attr_get( - &value, repo, GIT_ATTR_CHECK_NO_SYSTEM | GIT_ATTR_CHECK_FILE_THEN_INDEX, - "sub/sub/README.txt", "beep")); - cl_assert_equal_s(value, "10"); - - /* index then wd */ - cl_git_pass(git_attr_get( - &value, repo, GIT_ATTR_CHECK_NO_SYSTEM | GIT_ATTR_CHECK_INDEX_THEN_FILE, - "sub/sub/README.md", "bar")); - cl_assert_equal_s(value, "1337"); - - cl_git_pass(git_attr_get( - &value, repo, GIT_ATTR_CHECK_NO_SYSTEM | GIT_ATTR_CHECK_INDEX_THEN_FILE, - "sub/sub/README.txt", "another")); - cl_assert_equal_s(value, "one"); - - cl_git_pass(git_attr_get( - &value, repo, GIT_ATTR_CHECK_NO_SYSTEM | GIT_ATTR_CHECK_INDEX_THEN_FILE, - "sub/sub/README.txt", "again")); - cl_assert(GIT_ATTR_TRUE(value)); - - cl_git_pass(git_attr_get( - &value, repo, GIT_ATTR_CHECK_NO_SYSTEM | GIT_ATTR_CHECK_INDEX_THEN_FILE, - "sub/sub/README.txt", "beep")); - cl_assert_equal_s(value, "5"); -} - diff --git a/vendor/libgit2/tests/attr/ignore.c b/vendor/libgit2/tests/attr/ignore.c deleted file mode 100644 index 91bf984a1..000000000 --- a/vendor/libgit2/tests/attr/ignore.c +++ /dev/null @@ -1,267 +0,0 @@ -#include "clar_libgit2.h" -#include "posix.h" -#include "path.h" -#include "fileops.h" - -static git_repository *g_repo = NULL; - -void test_attr_ignore__initialize(void) -{ - g_repo = cl_git_sandbox_init("attr"); -} - -void test_attr_ignore__cleanup(void) -{ - cl_git_sandbox_cleanup(); - g_repo = NULL; -} - -static void assert_is_ignored_( - bool expected, const char *filepath, const char *file, int line) -{ - int is_ignored = 0; - - cl_git_pass_( - git_ignore_path_is_ignored(&is_ignored, g_repo, filepath), file, line); - - clar__assert_equal( - file, line, "expected != is_ignored", 1, "%d", - (int)(expected != 0), (int)(is_ignored != 0)); -} -#define assert_is_ignored(expected, filepath) \ - assert_is_ignored_(expected, filepath, __FILE__, __LINE__) - -void test_attr_ignore__honor_temporary_rules(void) -{ - cl_git_rewritefile("attr/.gitignore", "/NewFolder\n/NewFolder/NewFolder"); - - assert_is_ignored(false, "File.txt"); - assert_is_ignored(true, "NewFolder"); - assert_is_ignored(true, "NewFolder/NewFolder"); - assert_is_ignored(true, "NewFolder/NewFolder/File.txt"); -} - -void test_attr_ignore__allow_root(void) -{ - cl_git_rewritefile("attr/.gitignore", "/"); - - assert_is_ignored(false, "File.txt"); - assert_is_ignored(false, "NewFolder"); - assert_is_ignored(false, "NewFolder/NewFolder"); - assert_is_ignored(false, "NewFolder/NewFolder/File.txt"); -} - -void test_attr_ignore__ignore_root(void) -{ - cl_git_rewritefile("attr/.gitignore", "/\n\n/NewFolder\n/NewFolder/NewFolder"); - - assert_is_ignored(false, "File.txt"); - assert_is_ignored(true, "NewFolder"); - assert_is_ignored(true, "NewFolder/NewFolder"); - assert_is_ignored(true, "NewFolder/NewFolder/File.txt"); -} - -void test_attr_ignore__full_paths(void) -{ - cl_git_rewritefile("attr/.gitignore", "Folder/*/Contained"); - - assert_is_ignored(true, "Folder/Middle/Contained"); - assert_is_ignored(false, "Folder/Middle/More/More/Contained"); - - cl_git_rewritefile("attr/.gitignore", "Folder/**/Contained"); - - assert_is_ignored(true, "Folder/Middle/Contained"); - assert_is_ignored(true, "Folder/Middle/More/More/Contained"); - - cl_git_rewritefile("attr/.gitignore", "Folder/**/Contained/*/Child"); - - assert_is_ignored(true, "Folder/Middle/Contained/Happy/Child"); - assert_is_ignored(false, "Folder/Middle/Contained/Not/Happy/Child"); - assert_is_ignored(true, "Folder/Middle/More/More/Contained/Happy/Child"); - assert_is_ignored(false, "Folder/Middle/More/More/Contained/Not/Happy/Child"); -} - -void test_attr_ignore__more_starstar_cases(void) -{ - cl_must_pass(p_unlink("attr/.gitignore")); - cl_git_mkfile( - "attr/dir/.gitignore", - "sub/**/*.html\n"); - - assert_is_ignored(false, "aaa.html"); - assert_is_ignored(false, "dir"); - assert_is_ignored(false, "dir/sub"); - assert_is_ignored(true, "dir/sub/sub2/aaa.html"); - assert_is_ignored(true, "dir/sub/aaa.html"); - assert_is_ignored(false, "dir/aaa.html"); - assert_is_ignored(false, "sub"); - assert_is_ignored(false, "sub/aaa.html"); - assert_is_ignored(false, "sub/sub2/aaa.html"); -} - -void test_attr_ignore__leading_stars(void) -{ - cl_git_rewritefile( - "attr/.gitignore", - "*/onestar\n" - "**/twostars\n" - "*/parent1/kid1/*\n" - "**/parent2/kid2/*\n"); - - assert_is_ignored(true, "dir1/onestar"); - assert_is_ignored(true, "dir1/onestar/child"); /* in ignored dir */ - assert_is_ignored(false, "dir1/dir2/onestar"); - - assert_is_ignored(true, "dir1/twostars"); - assert_is_ignored(true, "dir1/twostars/child"); /* in ignored dir */ - assert_is_ignored(true, "dir1/dir2/twostars"); - assert_is_ignored(true, "dir1/dir2/twostars/child"); /* in ignored dir */ - assert_is_ignored(true, "dir1/dir2/dir3/twostars"); - - assert_is_ignored(true, "dir1/parent1/kid1/file"); - assert_is_ignored(true, "dir1/parent1/kid1/file/inside/parent"); - assert_is_ignored(false, "dir1/dir2/parent1/kid1/file"); - assert_is_ignored(false, "dir1/parent1/file"); - assert_is_ignored(false, "dir1/kid1/file"); - - assert_is_ignored(true, "dir1/parent2/kid2/file"); - assert_is_ignored(true, "dir1/parent2/kid2/file/inside/parent"); - assert_is_ignored(true, "dir1/dir2/parent2/kid2/file"); - assert_is_ignored(true, "dir1/dir2/dir3/parent2/kid2/file"); - assert_is_ignored(false, "dir1/parent2/file"); - assert_is_ignored(false, "dir1/kid2/file"); -} - -void test_attr_ignore__skip_gitignore_directory(void) -{ - cl_git_rewritefile("attr/.git/info/exclude", "/NewFolder\n/NewFolder/NewFolder"); - p_unlink("attr/.gitignore"); - cl_assert(!git_path_exists("attr/.gitignore")); - p_mkdir("attr/.gitignore", 0777); - cl_git_mkfile("attr/.gitignore/garbage.txt", "new_file\n"); - - assert_is_ignored(false, "File.txt"); - assert_is_ignored(true, "NewFolder"); - assert_is_ignored(true, "NewFolder/NewFolder"); - assert_is_ignored(true, "NewFolder/NewFolder/File.txt"); -} - -void test_attr_ignore__subdirectory_gitignore(void) -{ - p_unlink("attr/.gitignore"); - cl_assert(!git_path_exists("attr/.gitignore")); - cl_git_mkfile( - "attr/.gitignore", - "file1\n"); - p_mkdir("attr/dir", 0777); - cl_git_mkfile( - "attr/dir/.gitignore", - "file2/\n"); - - assert_is_ignored(true, "file1"); - assert_is_ignored(true, "dir/file1"); - assert_is_ignored(true, "dir/file2/actual_file"); /* in ignored dir */ - assert_is_ignored(false, "dir/file3"); -} - -void test_attr_ignore__expand_tilde_to_homedir(void) -{ - git_config *cfg; - - assert_is_ignored(false, "example.global_with_tilde"); - - cl_fake_home(); - - /* construct fake home with fake global excludes */ - cl_git_mkfile("home/globalexclude", "# found me\n*.global_with_tilde\n"); - - cl_git_pass(git_repository_config(&cfg, g_repo)); - cl_git_pass(git_config_set_string(cfg, "core.excludesfile", "~/globalexclude")); - git_config_free(cfg); - - git_attr_cache_flush(g_repo); /* must reset to pick up change */ - - assert_is_ignored(true, "example.global_with_tilde"); - - cl_git_pass(git_futils_rmdir_r("home", NULL, GIT_RMDIR_REMOVE_FILES)); - - cl_fake_home_cleanup(NULL); - - git_attr_cache_flush(g_repo); /* must reset to pick up change */ - - assert_is_ignored(false, "example.global_with_tilde"); -} - -/* Ensure that the .gitignore in the subdirectory only affects - * items in the subdirectory. */ -void test_attr_ignore__gitignore_in_subdir(void) -{ - cl_git_rmfile("attr/.gitignore"); - - cl_must_pass(p_mkdir("attr/dir1", 0777)); - cl_must_pass(p_mkdir("attr/dir1/dir2", 0777)); - cl_must_pass(p_mkdir("attr/dir1/dir2/dir3", 0777)); - - cl_git_mkfile("attr/dir1/dir2/dir3/.gitignore", "dir1/\ndir1/subdir/"); - - assert_is_ignored(false, "dir1/file"); - assert_is_ignored(false, "dir1/dir2/file"); - assert_is_ignored(false, "dir1/dir2/dir3/file"); - assert_is_ignored(true, "dir1/dir2/dir3/dir1/file"); - assert_is_ignored(true, "dir1/dir2/dir3/dir1/subdir/foo"); - - if (cl_repo_get_bool(g_repo, "core.ignorecase")) { - cl_git_mkfile("attr/dir1/dir2/dir3/.gitignore", "DiR1/\nDiR1/subdir/\n"); - - assert_is_ignored(false, "dir1/file"); - assert_is_ignored(false, "dir1/dir2/file"); - assert_is_ignored(false, "dir1/dir2/dir3/file"); - assert_is_ignored(true, "dir1/dir2/dir3/dir1/file"); - assert_is_ignored(true, "dir1/dir2/dir3/dir1/subdir/foo"); - } -} - -/* Ensure that files do not match folder cases */ -void test_attr_ignore__dont_ignore_files_for_folder(void) -{ - cl_git_rmfile("attr/.gitignore"); - - cl_git_mkfile("attr/dir/.gitignore", "test/\n"); - - /* Create "test" as a file; ensure it is not ignored. */ - cl_git_mkfile("attr/dir/test", "This is a file."); - - assert_is_ignored(false, "dir/test"); - if (cl_repo_get_bool(g_repo, "core.ignorecase")) - assert_is_ignored(false, "dir/TeSt"); - - /* Create "test" as a directory; ensure it is ignored. */ - cl_git_rmfile("attr/dir/test"); - cl_must_pass(p_mkdir("attr/dir/test", 0777)); - - assert_is_ignored(true, "dir/test"); - if (cl_repo_get_bool(g_repo, "core.ignorecase")) - assert_is_ignored(true, "dir/TeSt"); - - /* Remove "test" entirely; ensure it is not ignored. - * (As it doesn't exist, it is not a directory.) - */ - cl_must_pass(p_rmdir("attr/dir/test")); - - assert_is_ignored(false, "dir/test"); - if (cl_repo_get_bool(g_repo, "core.ignorecase")) - assert_is_ignored(false, "dir/TeSt"); -} - -void test_attr_ignore__symlink_to_outside(void) -{ -#ifdef GIT_WIN32 - cl_skip(); -#endif - - cl_git_rewritefile("attr/.gitignore", "symlink\n"); - cl_git_mkfile("target", "target"); - cl_git_pass(p_symlink("../target", "attr/symlink")); - assert_is_ignored(true, "symlink"); - assert_is_ignored(true, "lala/../symlink"); -} diff --git a/vendor/libgit2/tests/attr/lookup.c b/vendor/libgit2/tests/attr/lookup.c deleted file mode 100644 index 71e87cbae..000000000 --- a/vendor/libgit2/tests/attr/lookup.c +++ /dev/null @@ -1,262 +0,0 @@ -#include "clar_libgit2.h" -#include "attr_file.h" - -#include "attr_expect.h" - -void test_attr_lookup__simple(void) -{ - git_attr_file *file; - git_attr_path path; - const char *value = NULL; - - cl_git_pass(git_attr_file__load_standalone(&file, cl_fixture("attr/attr0"))); - cl_assert_equal_s(cl_fixture("attr/attr0"), file->entry->path); - cl_assert(file->rules.length == 1); - - cl_git_pass(git_attr_path__init(&path, "test", NULL, GIT_DIR_FLAG_UNKNOWN)); - cl_assert_equal_s("test", path.path); - cl_assert_equal_s("test", path.basename); - cl_assert(!path.is_dir); - - cl_git_pass(git_attr_file__lookup_one(file,&path,"binary",&value)); - cl_assert(GIT_ATTR_TRUE(value)); - - cl_git_pass(git_attr_file__lookup_one(file,&path,"missing",&value)); - cl_assert(!value); - - git_attr_path__free(&path); - git_attr_file__free(file); -} - -static void run_test_cases(git_attr_file *file, struct attr_expected *cases, int force_dir) -{ - git_attr_path path; - const char *value = NULL; - struct attr_expected *c; - int error; - - for (c = cases; c->path != NULL; c++) { - cl_git_pass(git_attr_path__init(&path, c->path, NULL, GIT_DIR_FLAG_UNKNOWN)); - - if (force_dir) - path.is_dir = 1; - - error = git_attr_file__lookup_one(file,&path,c->attr,&value); - cl_git_pass(error); - - attr_check_expected(c->expected, c->expected_str, c->attr, value); - - git_attr_path__free(&path); - } -} - -void test_attr_lookup__match_variants(void) -{ - git_attr_file *file; - git_attr_path path; - - struct attr_expected dir_cases[] = { - { "pat2", "attr2", EXPECT_TRUE, NULL }, - { "/testing/for/pat2", "attr2", EXPECT_TRUE, NULL }, - { "/not/pat2/yousee", "attr2", EXPECT_UNDEFINED, NULL }, - { "/fun/fun/fun/pat4.dir", "attr4", EXPECT_TRUE, NULL }, - { "foo.pat5", "attr5", EXPECT_TRUE, NULL }, - { NULL, NULL, 0, NULL } - }; - - struct attr_expected cases[] = { - /* pat0 -> simple match */ - { "pat0", "attr0", EXPECT_TRUE, NULL }, - { "/testing/for/pat0", "attr0", EXPECT_TRUE, NULL }, - { "relative/to/pat0", "attr0", EXPECT_TRUE, NULL }, - { "this-contains-pat0-inside", "attr0", EXPECT_UNDEFINED, NULL }, - { "this-aint-right", "attr0", EXPECT_UNDEFINED, NULL }, - { "/this/pat0/dont/match", "attr0", EXPECT_UNDEFINED, NULL }, - /* negative match */ - { "pat0", "attr1", EXPECT_TRUE, NULL }, - { "pat1", "attr1", EXPECT_UNDEFINED, NULL }, - { "/testing/for/pat1", "attr1", EXPECT_UNDEFINED, NULL }, - { "/testing/for/pat0", "attr1", EXPECT_TRUE, NULL }, - { "/testing/for/pat1/inside", "attr1", EXPECT_TRUE, NULL }, - { "misc", "attr1", EXPECT_TRUE, NULL }, - /* dir match */ - { "pat2", "attr2", EXPECT_UNDEFINED, NULL }, - { "/testing/for/pat2", "attr2", EXPECT_UNDEFINED, NULL }, - { "/not/pat2/yousee", "attr2", EXPECT_UNDEFINED, NULL }, - /* path match */ - { "pat3file", "attr3", EXPECT_UNDEFINED, NULL }, - { "/pat3dir/pat3file", "attr3", EXPECT_TRUE, NULL }, - { "pat3dir/pat3file", "attr3", EXPECT_TRUE, NULL }, - /* pattern* match */ - { "pat4.txt", "attr4", EXPECT_TRUE, NULL }, - { "/fun/fun/fun/pat4.c", "attr4", EXPECT_TRUE, NULL }, - { "pat4.", "attr4", EXPECT_TRUE, NULL }, - { "pat4", "attr4", EXPECT_UNDEFINED, NULL }, - /* *pattern match */ - { "foo.pat5", "attr5", EXPECT_TRUE, NULL }, - { "/this/is/ok.pat5", "attr5", EXPECT_TRUE, NULL }, - { "/this/is/bad.pat5/yousee.txt", "attr5", EXPECT_UNDEFINED, NULL }, - { "foo.pat5", "attr100", EXPECT_UNDEFINED, NULL }, - /* glob match with slashes */ - { "foo.pat6", "attr6", EXPECT_UNDEFINED, NULL }, - { "pat6/pat6/foobar.pat6", "attr6", EXPECT_TRUE, NULL }, - { "pat6/pat6/.pat6", "attr6", EXPECT_TRUE, NULL }, - { "pat6/pat6/extra/foobar.pat6", "attr6", EXPECT_UNDEFINED, NULL }, - { "/prefix/pat6/pat6/foobar.pat6", "attr6", EXPECT_UNDEFINED, NULL }, - { "/pat6/pat6/foobar.pat6", "attr6", EXPECT_TRUE, NULL }, - /* complex pattern */ - { "pat7a12z", "attr7", EXPECT_TRUE, NULL }, - { "pat7e__x", "attr7", EXPECT_TRUE, NULL }, - { "pat7b/1y", "attr7", EXPECT_UNDEFINED, NULL }, /* ? does not match / */ - { "pat7e_x", "attr7", EXPECT_UNDEFINED, NULL }, - { "pat7aaaa", "attr7", EXPECT_UNDEFINED, NULL }, - { "pat7zzzz", "attr7", EXPECT_UNDEFINED, NULL }, - { "/this/can/be/anything/pat7a12z", "attr7", EXPECT_TRUE, NULL }, - { "but/it/still/must/match/pat7aaaa", "attr7", EXPECT_UNDEFINED, NULL }, - { "pat7aaay.fail", "attr7", EXPECT_UNDEFINED, NULL }, - /* pattern with spaces */ - { "pat8 with spaces", "attr8", EXPECT_TRUE, NULL }, - { "/gotta love/pat8 with spaces", "attr8", EXPECT_TRUE, NULL }, - { "failing pat8 with spaces", "attr8", EXPECT_UNDEFINED, NULL }, - { "spaces", "attr8", EXPECT_UNDEFINED, NULL }, - /* pattern at eof */ - { "pat9", "attr9", EXPECT_TRUE, NULL }, - { "/eof/pat9", "attr9", EXPECT_TRUE, NULL }, - { "pat", "attr9", EXPECT_UNDEFINED, NULL }, - { "at9", "attr9", EXPECT_UNDEFINED, NULL }, - { "pat9.fail", "attr9", EXPECT_UNDEFINED, NULL }, - /* sentinel at end */ - { NULL, NULL, 0, NULL } - }; - - cl_git_pass(git_attr_file__load_standalone(&file, cl_fixture("attr/attr1"))); - cl_assert_equal_s(cl_fixture("attr/attr1"), file->entry->path); - cl_assert(file->rules.length == 10); - - cl_git_pass(git_attr_path__init(&path, "/testing/for/pat0", NULL, GIT_DIR_FLAG_UNKNOWN)); - cl_assert_equal_s("pat0", path.basename); - - run_test_cases(file, cases, 0); - run_test_cases(file, dir_cases, 1); - - git_attr_file__free(file); - git_attr_path__free(&path); -} - -void test_attr_lookup__assign_variants(void) -{ - git_attr_file *file; - - struct attr_expected cases[] = { - /* pat0 -> simple assign */ - { "pat0", "simple", EXPECT_TRUE, NULL }, - { "/testing/pat0", "simple", EXPECT_TRUE, NULL }, - { "pat0", "fail", EXPECT_UNDEFINED, NULL }, - { "/testing/pat0", "fail", EXPECT_UNDEFINED, NULL }, - /* negative assign */ - { "pat1", "neg", EXPECT_FALSE, NULL }, - { "/testing/pat1", "neg", EXPECT_FALSE, NULL }, - { "pat1", "fail", EXPECT_UNDEFINED, NULL }, - { "/testing/pat1", "fail", EXPECT_UNDEFINED, NULL }, - /* forced undef */ - { "pat1", "notundef", EXPECT_TRUE, NULL }, - { "pat2", "notundef", EXPECT_UNDEFINED, NULL }, - { "/lead/in/pat1", "notundef", EXPECT_TRUE, NULL }, - { "/lead/in/pat2", "notundef", EXPECT_UNDEFINED, NULL }, - /* assign value */ - { "pat3", "assigned", EXPECT_STRING, "test-value" }, - { "pat3", "notassigned", EXPECT_UNDEFINED, NULL }, - /* assign value */ - { "pat4", "rule-with-more-chars", EXPECT_STRING, "value-with-more-chars" }, - { "pat4", "notassigned-rule-with-more-chars", EXPECT_UNDEFINED, NULL }, - /* empty assignments */ - { "pat5", "empty", EXPECT_TRUE, NULL }, - { "pat6", "negempty", EXPECT_FALSE, NULL }, - /* multiple assignment */ - { "pat7", "multiple", EXPECT_TRUE, NULL }, - { "pat7", "single", EXPECT_FALSE, NULL }, - { "pat7", "values", EXPECT_STRING, "1" }, - { "pat7", "also", EXPECT_STRING, "a-really-long-value/*" }, - { "pat7", "happy", EXPECT_STRING, "yes!" }, - { "pat8", "again", EXPECT_TRUE, NULL }, - { "pat8", "another", EXPECT_STRING, "12321" }, - /* bad assignment */ - { "patbad0", "simple", EXPECT_UNDEFINED, NULL }, - { "patbad0", "notundef", EXPECT_TRUE, NULL }, - { "patbad1", "simple", EXPECT_UNDEFINED, NULL }, - /* eof assignment */ - { "pat9", "at-eof", EXPECT_FALSE, NULL }, - /* sentinel at end */ - { NULL, NULL, 0, NULL } - }; - - cl_git_pass(git_attr_file__load_standalone(&file, cl_fixture("attr/attr2"))); - cl_assert(file->rules.length == 11); - - run_test_cases(file, cases, 0); - - git_attr_file__free(file); -} - -void test_attr_lookup__check_attr_examples(void) -{ - git_attr_file *file; - - struct attr_expected cases[] = { - { "foo.java", "diff", EXPECT_STRING, "java" }, - { "foo.java", "crlf", EXPECT_FALSE, NULL }, - { "foo.java", "myAttr", EXPECT_TRUE, NULL }, - { "foo.java", "other", EXPECT_UNDEFINED, NULL }, - { "/prefix/dir/foo.java", "diff", EXPECT_STRING, "java" }, - { "/prefix/dir/foo.java", "crlf", EXPECT_FALSE, NULL }, - { "/prefix/dir/foo.java", "myAttr", EXPECT_TRUE, NULL }, - { "/prefix/dir/foo.java", "other", EXPECT_UNDEFINED, NULL }, - { "NoMyAttr.java", "crlf", EXPECT_FALSE, NULL }, - { "NoMyAttr.java", "myAttr", EXPECT_UNDEFINED, NULL }, - { "NoMyAttr.java", "other", EXPECT_UNDEFINED, NULL }, - { "/prefix/dir/NoMyAttr.java", "crlf", EXPECT_FALSE, NULL }, - { "/prefix/dir/NoMyAttr.java", "myAttr", EXPECT_UNDEFINED, NULL }, - { "/prefix/dir/NoMyAttr.java", "other", EXPECT_UNDEFINED, NULL }, - { "README", "caveat", EXPECT_STRING, "unspecified" }, - { "/specific/path/README", "caveat", EXPECT_STRING, "unspecified" }, - { "README", "missing", EXPECT_UNDEFINED, NULL }, - { "/specific/path/README", "missing", EXPECT_UNDEFINED, NULL }, - /* sentinel at end */ - { NULL, NULL, 0, NULL } - }; - - cl_git_pass(git_attr_file__load_standalone(&file, cl_fixture("attr/attr3"))); - cl_assert(file->rules.length == 3); - - run_test_cases(file, cases, 0); - - git_attr_file__free(file); -} - -void test_attr_lookup__from_buffer(void) -{ - git_attr_file *file; - - struct attr_expected cases[] = { - { "abc", "foo", EXPECT_TRUE, NULL }, - { "abc", "bar", EXPECT_TRUE, NULL }, - { "abc", "baz", EXPECT_TRUE, NULL }, - { "aaa", "foo", EXPECT_TRUE, NULL }, - { "aaa", "bar", EXPECT_UNDEFINED, NULL }, - { "aaa", "baz", EXPECT_TRUE, NULL }, - { "qqq", "foo", EXPECT_UNDEFINED, NULL }, - { "qqq", "bar", EXPECT_UNDEFINED, NULL }, - { "qqq", "baz", EXPECT_TRUE, NULL }, - { NULL, NULL, 0, NULL } - }; - - cl_git_pass(git_attr_file__new(&file, NULL, 0)); - - cl_git_pass(git_attr_file__parse_buffer(NULL, file, "a* foo\nabc bar\n* baz")); - - cl_assert(file->rules.length == 3); - - run_test_cases(file, cases, 0); - - git_attr_file__free(file); -} diff --git a/vendor/libgit2/tests/attr/repo.c b/vendor/libgit2/tests/attr/repo.c deleted file mode 100644 index 8baf50622..000000000 --- a/vendor/libgit2/tests/attr/repo.c +++ /dev/null @@ -1,378 +0,0 @@ -#include "clar_libgit2.h" -#include "fileops.h" -#include "git2/attr.h" -#include "attr.h" - -#include "attr_expect.h" -#include "git2/sys/repository.h" - -static git_repository *g_repo = NULL; - -void test_attr_repo__initialize(void) -{ - g_repo = cl_git_sandbox_init("attr"); -} - -void test_attr_repo__cleanup(void) -{ - cl_git_sandbox_cleanup(); - g_repo = NULL; -} - -static struct attr_expected get_one_test_cases[] = { - { "root_test1", "repoattr", EXPECT_TRUE, NULL }, - { "root_test1", "rootattr", EXPECT_TRUE, NULL }, - { "root_test1", "missingattr", EXPECT_UNDEFINED, NULL }, - { "root_test1", "subattr", EXPECT_UNDEFINED, NULL }, - { "root_test1", "negattr", EXPECT_UNDEFINED, NULL }, - { "root_test2", "repoattr", EXPECT_TRUE, NULL }, - { "root_test2", "rootattr", EXPECT_FALSE, NULL }, - { "root_test2", "missingattr", EXPECT_UNDEFINED, NULL }, - { "root_test2", "multiattr", EXPECT_FALSE, NULL }, - { "root_test3", "repoattr", EXPECT_TRUE, NULL }, - { "root_test3", "rootattr", EXPECT_UNDEFINED, NULL }, - { "root_test3", "multiattr", EXPECT_STRING, "3" }, - { "root_test3", "multi2", EXPECT_UNDEFINED, NULL }, - { "sub/subdir_test1", "repoattr", EXPECT_TRUE, NULL }, - { "sub/subdir_test1", "rootattr", EXPECT_TRUE, NULL }, - { "sub/subdir_test1", "missingattr", EXPECT_UNDEFINED, NULL }, - { "sub/subdir_test1", "subattr", EXPECT_STRING, "yes" }, - { "sub/subdir_test1", "negattr", EXPECT_FALSE, NULL }, - { "sub/subdir_test1", "another", EXPECT_UNDEFINED, NULL }, - { "sub/subdir_test2.txt", "repoattr", EXPECT_TRUE, NULL }, - { "sub/subdir_test2.txt", "rootattr", EXPECT_TRUE, NULL }, - { "sub/subdir_test2.txt", "missingattr", EXPECT_UNDEFINED, NULL }, - { "sub/subdir_test2.txt", "subattr", EXPECT_STRING, "yes" }, - { "sub/subdir_test2.txt", "negattr", EXPECT_FALSE, NULL }, - { "sub/subdir_test2.txt", "another", EXPECT_STRING, "zero" }, - { "sub/subdir_test2.txt", "reposub", EXPECT_TRUE, NULL }, - { "sub/sub/subdir.txt", "another", EXPECT_STRING, "one" }, - { "sub/sub/subdir.txt", "reposubsub", EXPECT_TRUE, NULL }, - { "sub/sub/subdir.txt", "reposub", EXPECT_UNDEFINED, NULL }, - { "does-not-exist", "foo", EXPECT_STRING, "yes" }, - { "sub/deep/file", "deepdeep", EXPECT_TRUE, NULL }, - { "sub/sub/d/no", "test", EXPECT_STRING, "a/b/d/*" }, - { "sub/sub/d/yes", "test", EXPECT_UNDEFINED, NULL }, -}; - -void test_attr_repo__get_one(void) -{ - int i; - - for (i = 0; i < (int)ARRAY_SIZE(get_one_test_cases); ++i) { - struct attr_expected *scan = &get_one_test_cases[i]; - const char *value; - - cl_git_pass(git_attr_get(&value, g_repo, 0, scan->path, scan->attr)); - attr_check_expected( - scan->expected, scan->expected_str, scan->attr, value); - } - - cl_assert(git_attr_cache__is_cached( - g_repo, GIT_ATTR_FILE__FROM_FILE, ".git/info/attributes")); - cl_assert(git_attr_cache__is_cached( - g_repo, GIT_ATTR_FILE__FROM_FILE, ".gitattributes")); - cl_assert(git_attr_cache__is_cached( - g_repo, GIT_ATTR_FILE__FROM_FILE, "sub/.gitattributes")); -} - -void test_attr_repo__get_one_start_deep(void) -{ - int i; - - for (i = (int)ARRAY_SIZE(get_one_test_cases) - 1; i >= 0; --i) { - struct attr_expected *scan = &get_one_test_cases[i]; - const char *value; - - cl_git_pass(git_attr_get(&value, g_repo, 0, scan->path, scan->attr)); - attr_check_expected( - scan->expected, scan->expected_str, scan->attr, value); - } - - cl_assert(git_attr_cache__is_cached( - g_repo, GIT_ATTR_FILE__FROM_FILE, ".git/info/attributes")); - cl_assert(git_attr_cache__is_cached( - g_repo, GIT_ATTR_FILE__FROM_FILE, ".gitattributes")); - cl_assert(git_attr_cache__is_cached( - g_repo, GIT_ATTR_FILE__FROM_FILE, "sub/.gitattributes")); -} - -void test_attr_repo__get_many(void) -{ - const char *names[4] = { "repoattr", "rootattr", "missingattr", "subattr" }; - const char *values[4]; - - cl_git_pass(git_attr_get_many(values, g_repo, 0, "root_test1", 4, names)); - - cl_assert(GIT_ATTR_TRUE(values[0])); - cl_assert(GIT_ATTR_TRUE(values[1])); - cl_assert(GIT_ATTR_UNSPECIFIED(values[2])); - cl_assert(GIT_ATTR_UNSPECIFIED(values[3])); - - cl_git_pass(git_attr_get_many(values, g_repo, 0, "root_test2", 4, names)); - - cl_assert(GIT_ATTR_TRUE(values[0])); - cl_assert(GIT_ATTR_FALSE(values[1])); - cl_assert(GIT_ATTR_UNSPECIFIED(values[2])); - cl_assert(GIT_ATTR_UNSPECIFIED(values[3])); - - cl_git_pass(git_attr_get_many(values, g_repo, 0, "sub/subdir_test1", 4, names)); - - cl_assert(GIT_ATTR_TRUE(values[0])); - cl_assert(GIT_ATTR_TRUE(values[1])); - cl_assert(GIT_ATTR_UNSPECIFIED(values[2])); - cl_assert_equal_s("yes", values[3]); -} - -void test_attr_repo__get_many_in_place(void) -{ - const char *vals[4] = { "repoattr", "rootattr", "missingattr", "subattr" }; - - /* it should be legal to look up values into the same array that has - * the attribute names, overwriting each name as the value is found. - */ - - cl_git_pass(git_attr_get_many(vals, g_repo, 0, "sub/subdir_test1", 4, vals)); - - cl_assert(GIT_ATTR_TRUE(vals[0])); - cl_assert(GIT_ATTR_TRUE(vals[1])); - cl_assert(GIT_ATTR_UNSPECIFIED(vals[2])); - cl_assert_equal_s("yes", vals[3]); -} - -static int count_attrs( - const char *name, - const char *value, - void *payload) -{ - GIT_UNUSED(name); - GIT_UNUSED(value); - - *((int *)payload) += 1; - - return 0; -} - -#define CANCEL_VALUE 12345 - -static int cancel_iteration( - const char *name, - const char *value, - void *payload) -{ - GIT_UNUSED(name); - GIT_UNUSED(value); - - *((int *)payload) -= 1; - - if (*((int *)payload) < 0) - return CANCEL_VALUE; - - return 0; -} - -void test_attr_repo__foreach(void) -{ - int count; - - count = 0; - cl_git_pass(git_attr_foreach( - g_repo, 0, "root_test1", &count_attrs, &count)); - cl_assert(count == 2); - - count = 0; - cl_git_pass(git_attr_foreach(g_repo, 0, "sub/subdir_test1", - &count_attrs, &count)); - cl_assert(count == 4); /* repoattr, rootattr, subattr, negattr */ - - count = 0; - cl_git_pass(git_attr_foreach(g_repo, 0, "sub/subdir_test2.txt", - &count_attrs, &count)); - cl_assert(count == 6); /* repoattr, rootattr, subattr, reposub, negattr, another */ - - count = 2; - cl_assert_equal_i( - CANCEL_VALUE, git_attr_foreach( - g_repo, 0, "sub/subdir_test1", &cancel_iteration, &count) - ); -} - -void test_attr_repo__manpage_example(void) -{ - const char *value; - - cl_git_pass(git_attr_get(&value, g_repo, 0, "sub/abc", "foo")); - cl_assert(GIT_ATTR_TRUE(value)); - - cl_git_pass(git_attr_get(&value, g_repo, 0, "sub/abc", "bar")); - cl_assert(GIT_ATTR_UNSPECIFIED(value)); - - cl_git_pass(git_attr_get(&value, g_repo, 0, "sub/abc", "baz")); - cl_assert(GIT_ATTR_FALSE(value)); - - cl_git_pass(git_attr_get(&value, g_repo, 0, "sub/abc", "merge")); - cl_assert_equal_s("filfre", value); - - cl_git_pass(git_attr_get(&value, g_repo, 0, "sub/abc", "frotz")); - cl_assert(GIT_ATTR_UNSPECIFIED(value)); -} - -void test_attr_repo__macros(void) -{ - const char *names[5] = { "rootattr", "binary", "diff", "crlf", "frotz" }; - const char *names2[5] = { "mymacro", "positive", "negative", "rootattr", "another" }; - const char *names3[3] = { "macro2", "multi2", "multi3" }; - const char *values[5]; - - cl_git_pass(git_attr_get_many(values, g_repo, 0, "binfile", 5, names)); - - cl_assert(GIT_ATTR_TRUE(values[0])); - cl_assert(GIT_ATTR_TRUE(values[1])); - cl_assert(GIT_ATTR_FALSE(values[2])); - cl_assert(GIT_ATTR_FALSE(values[3])); - cl_assert(GIT_ATTR_UNSPECIFIED(values[4])); - - cl_git_pass(git_attr_get_many(values, g_repo, 0, "macro_test", 5, names2)); - - cl_assert(GIT_ATTR_TRUE(values[0])); - cl_assert(GIT_ATTR_TRUE(values[1])); - cl_assert(GIT_ATTR_FALSE(values[2])); - cl_assert(GIT_ATTR_UNSPECIFIED(values[3])); - cl_assert_equal_s("77", values[4]); - - cl_git_pass(git_attr_get_many(values, g_repo, 0, "macro_test", 3, names3)); - - cl_assert(GIT_ATTR_TRUE(values[0])); - cl_assert(GIT_ATTR_FALSE(values[1])); - cl_assert_equal_s("answer", values[2]); -} - -void test_attr_repo__bad_macros(void) -{ - const char *names[6] = { "rootattr", "positive", "negative", - "firstmacro", "secondmacro", "thirdmacro" }; - const char *values[6]; - - cl_git_pass(git_attr_get_many(values, g_repo, 0, "macro_bad", 6, names)); - - /* these three just confirm that the "mymacro" rule ran */ - cl_assert(GIT_ATTR_UNSPECIFIED(values[0])); - cl_assert(GIT_ATTR_TRUE(values[1])); - cl_assert(GIT_ATTR_FALSE(values[2])); - - /* file contains: - * # let's try some malicious macro defs - * [attr]firstmacro -thirdmacro -secondmacro - * [attr]secondmacro firstmacro -firstmacro - * [attr]thirdmacro secondmacro=hahaha -firstmacro - * macro_bad firstmacro secondmacro thirdmacro - * - * firstmacro assignment list ends up with: - * -thirdmacro -secondmacro - * secondmacro assignment list expands "firstmacro" and ends up with: - * -thirdmacro -secondmacro -firstmacro - * thirdmacro assignment don't expand so list ends up with: - * secondmacro="hahaha" - * - * macro_bad assignment list ends up with: - * -thirdmacro -secondmacro firstmacro && - * -thirdmacro -secondmacro -firstmacro secondmacro && - * secondmacro="hahaha" thirdmacro - * - * so summary results should be: - * -firstmacro secondmacro="hahaha" thirdmacro - */ - cl_assert(GIT_ATTR_FALSE(values[3])); - cl_assert_equal_s("hahaha", values[4]); - cl_assert(GIT_ATTR_TRUE(values[5])); -} - -#define CONTENT "I'm going to be dynamically processed\r\n" \ - "And my line endings...\r\n" \ - "...are going to be\n" \ - "normalized!\r\n" - -#define GITATTR "* text=auto\n" \ - "*.txt text\n" \ - "*.data binary\n" - -static void add_to_workdir(const char *filename, const char *content) -{ - git_buf buf = GIT_BUF_INIT; - - cl_git_pass(git_buf_joinpath(&buf, "attr", filename)); - cl_git_rewritefile(git_buf_cstr(&buf), content); - - git_buf_free(&buf); -} - -static void assert_proper_normalization(git_index *index, const char *filename, const char *expected_sha) -{ - size_t index_pos; - const git_index_entry *entry; - - add_to_workdir(filename, CONTENT); - cl_git_pass(git_index_add_bypath(index, filename)); - - cl_assert(!git_index_find(&index_pos, index, filename)); - - entry = git_index_get_byindex(index, index_pos); - cl_assert_equal_i(0, git_oid_streq(&entry->id, expected_sha)); -} - -void test_attr_repo__staging_properly_normalizes_line_endings_according_to_gitattributes_directives(void) -{ - git_index* index; - - cl_git_pass(git_repository_index(&index, g_repo)); - - add_to_workdir(".gitattributes", GITATTR); - - assert_proper_normalization(index, "text.txt", "22c74203bace3c2e950278c7ab08da0fca9f4e9b"); - assert_proper_normalization(index, "huh.dunno", "22c74203bace3c2e950278c7ab08da0fca9f4e9b"); - assert_proper_normalization(index, "binary.data", "66eeff1fcbacf589e6d70aa70edd3fce5be2b37c"); - - git_index_free(index); -} - -void test_attr_repo__bare_repo_with_index(void) -{ - const char *names[4] = { "test1", "test2", "test3", "test4" }; - const char *values[4]; - git_index *index; - - cl_git_pass(git_repository_index(&index, g_repo)); - - cl_git_mkfile( - "attr/.gitattributes", - "*.txt test1 test2=foobar -test3\n" - "trial.txt -test1 test2=barfoo !test3 test4\n"); - cl_git_pass(git_index_add_bypath(index, ".gitattributes")); - git_index_free(index); - - cl_must_pass(p_unlink("attr/.gitattributes")); - cl_assert(!git_path_exists("attr/.gitattributes")); - - cl_git_pass(git_repository_set_bare(g_repo)); - - cl_git_pass(git_attr_get_many(values, g_repo, 0, "file.txt", 4, names)); - - cl_assert(GIT_ATTR_TRUE(values[0])); - cl_assert_equal_s("foobar", values[1]); - cl_assert(GIT_ATTR_FALSE(values[2])); - cl_assert(GIT_ATTR_UNSPECIFIED(values[3])); - - cl_git_pass(git_attr_get_many(values, g_repo, 0, "trial.txt", 4, names)); - - cl_assert(GIT_ATTR_FALSE(values[0])); - cl_assert_equal_s("barfoo", values[1]); - cl_assert(GIT_ATTR_UNSPECIFIED(values[2])); - cl_assert(GIT_ATTR_TRUE(values[3])); - - cl_git_pass(git_attr_get_many(values, g_repo, 0, "sub/sub/subdir.txt", 4, names)); - - cl_assert(GIT_ATTR_TRUE(values[0])); - cl_assert_equal_s("foobar", values[1]); - cl_assert(GIT_ATTR_FALSE(values[2])); - cl_assert(GIT_ATTR_UNSPECIFIED(values[3])); -} diff --git a/vendor/libgit2/tests/blame/blame_helpers.c b/vendor/libgit2/tests/blame/blame_helpers.c deleted file mode 100644 index 61e87350c..000000000 --- a/vendor/libgit2/tests/blame/blame_helpers.c +++ /dev/null @@ -1,67 +0,0 @@ -#include "blame_helpers.h" - -void hunk_message(size_t idx, const git_blame_hunk *hunk, const char *fmt, ...) -{ - va_list arglist; - - printf("Hunk %"PRIuZ" (line %"PRIuZ" +%"PRIuZ"): ", idx, - hunk->final_start_line_number, hunk->lines_in_hunk-1); - - va_start(arglist, fmt); - vprintf(fmt, arglist); - va_end(arglist); - - printf("\n"); -} - -void check_blame_hunk_index(git_repository *repo, git_blame *blame, int idx, - size_t start_line, size_t len, char boundary, const char *commit_id, const char *orig_path) -{ - char expected[GIT_OID_HEXSZ+1] = {0}, actual[GIT_OID_HEXSZ+1] = {0}; - const git_blame_hunk *hunk = git_blame_get_hunk_byindex(blame, idx); - cl_assert(hunk); - - if (!strncmp(commit_id, "0000", 4)) { - strcpy(expected, "0000000000000000000000000000000000000000"); - } else { - git_object *obj; - cl_git_pass(git_revparse_single(&obj, repo, commit_id)); - git_oid_fmt(expected, git_object_id(obj)); - git_object_free(obj); - } - - if (hunk->final_start_line_number != start_line) { - hunk_message(idx, hunk, "mismatched start line number: expected %d, got %d", - start_line, hunk->final_start_line_number); - } - cl_assert_equal_i(hunk->final_start_line_number, start_line); - - if (hunk->lines_in_hunk != len) { - hunk_message(idx, hunk, "mismatched line count: expected %d, got %d", - len, hunk->lines_in_hunk); - } - cl_assert_equal_i(hunk->lines_in_hunk, len); - - git_oid_fmt(actual, &hunk->final_commit_id); - if (strcmp(expected, actual)) { - hunk_message(idx, hunk, "has mismatched original id (got %s, expected %s)\n", - actual, expected); - } - cl_assert_equal_s(actual, expected); - cl_assert_equal_oid(&hunk->final_commit_id, &hunk->orig_commit_id); - - - if (strcmp(hunk->orig_path, orig_path)) { - hunk_message(idx, hunk, "has mismatched original path (got '%s', expected '%s')\n", - hunk->orig_path, orig_path); - } - cl_assert_equal_s(hunk->orig_path, orig_path); - - if (hunk->boundary != boundary) { - hunk_message(idx, hunk, "doesn't match boundary flag (got %d, expected %d)\n", - hunk->boundary, boundary); - } - cl_assert_equal_i(boundary, hunk->boundary); -} - - diff --git a/vendor/libgit2/tests/blame/blame_helpers.h b/vendor/libgit2/tests/blame/blame_helpers.h deleted file mode 100644 index fd5a35d2c..000000000 --- a/vendor/libgit2/tests/blame/blame_helpers.h +++ /dev/null @@ -1,14 +0,0 @@ -#include "clar_libgit2.h" -#include "blame.h" - -void hunk_message(size_t idx, const git_blame_hunk *hunk, const char *fmt, ...); - -void check_blame_hunk_index( - git_repository *repo, - git_blame *blame, - int idx, - size_t start_line, - size_t len, - char boundary, - const char *commit_id, - const char *orig_path); diff --git a/vendor/libgit2/tests/blame/buffer.c b/vendor/libgit2/tests/blame/buffer.c deleted file mode 100644 index 340b1dced..000000000 --- a/vendor/libgit2/tests/blame/buffer.c +++ /dev/null @@ -1,166 +0,0 @@ -#include "blame_helpers.h" - -static git_repository *g_repo; -static git_blame *g_fileblame, *g_bufferblame; - -void test_blame_buffer__initialize(void) -{ - cl_git_pass(git_repository_open(&g_repo, cl_fixture("blametest.git"))); - cl_git_pass(git_blame_file(&g_fileblame, g_repo, "b.txt", NULL)); - g_bufferblame = NULL; -} - -void test_blame_buffer__cleanup(void) -{ - git_blame_free(g_fileblame); - git_blame_free(g_bufferblame); - git_repository_free(g_repo); -} - -void test_blame_buffer__added_line(void) -{ - const git_blame_hunk *hunk; - - const char *buffer = "\ -EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE\n\ -EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE\n\ -EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE\n\ -EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE\n\ -\n\ -abcdefg\n\ -BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB\n\ -BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB\n\ -BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB\n\ -BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB\n\ -\n\ -CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC\n\ -CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC\n\ -CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC\n\ -CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC\n\n"; - - cl_git_pass(git_blame_buffer(&g_bufferblame, g_fileblame, buffer, strlen(buffer))); - cl_assert_equal_i(5, git_blame_get_hunk_count(g_bufferblame)); - check_blame_hunk_index(g_repo, g_bufferblame, 2, 6, 1, 0, "000000", "b.txt"); - - hunk = git_blame_get_hunk_byline(g_bufferblame, 16); - cl_assert(hunk); - cl_assert_equal_s("Ben Straub", hunk->final_signature->name); -} - -void test_blame_buffer__deleted_line(void) -{ - const char *buffer = "\ -EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE\n\ -EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE\n\ -EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE\n\ -EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE\n\ -\n\ -BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB\n\ -BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB\n\ -BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB\n\ -\n\ -CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC\n\ -CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC\n\ -CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC\n\ -CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC\n\n"; - - cl_git_pass(git_blame_buffer(&g_bufferblame, g_fileblame, buffer, strlen(buffer))); - check_blame_hunk_index(g_repo, g_bufferblame, 2, 6, 3, 0, "63d671eb", "b.txt"); - check_blame_hunk_index(g_repo, g_bufferblame, 3, 9, 1, 0, "63d671eb", "b.txt"); - check_blame_hunk_index(g_repo, g_bufferblame, 4, 10, 5, 0, "aa06ecca", "b.txt"); -} - -void test_blame_buffer__add_splits_hunk(void) -{ - const char *buffer = "\ -EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE\n\ -EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE\n\ -EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE\n\ -EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE\n\ -\n\ -BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB\n\ -BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB\n\ -abc\n\ -BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB\n\ -BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB\n\ -\n\ -CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC\n\ -CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC\n\ -CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC\n\ -CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC\n\n"; - - cl_git_pass(git_blame_buffer(&g_bufferblame, g_fileblame, buffer, strlen(buffer))); - check_blame_hunk_index(g_repo, g_bufferblame, 2, 6, 2, 0, "63d671eb", "b.txt"); - check_blame_hunk_index(g_repo, g_bufferblame, 3, 8, 1, 0, "00000000", "b.txt"); - check_blame_hunk_index(g_repo, g_bufferblame, 4, 9, 3, 0, "63d671eb", "b.txt"); -} - -void test_blame_buffer__delete_crosses_hunk_boundary(void) -{ - const char *buffer = "\ -EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE\n\ -EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE\n\ -EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE\n\ -EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE\n\ -\n\ -BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB\n\ -CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC\n\n"; - - cl_git_pass(git_blame_buffer(&g_bufferblame, g_fileblame, buffer, strlen(buffer))); - check_blame_hunk_index(g_repo, g_bufferblame, 2, 6, 1, 0, "63d671eb", "b.txt"); - check_blame_hunk_index(g_repo, g_bufferblame, 3, 7, 2, 0, "aa06ecca", "b.txt"); -} - -void test_blame_buffer__replace_line(void) -{ - const char *buffer = "\ -EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE\n\ -EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE\n\ -EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE\n\ -EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE\n\ -\n\ -BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB\n\ -abc\n\ -BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB\n\ -BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB\n\ -\n\ -CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC\n\ -CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC\n\ -CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC\n\ -CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC\n\n"; - - cl_git_pass(git_blame_buffer(&g_bufferblame, g_fileblame, buffer, strlen(buffer))); - check_blame_hunk_index(g_repo, g_bufferblame, 2, 6, 1, 0, "63d671eb", "b.txt"); - check_blame_hunk_index(g_repo, g_bufferblame, 3, 7, 1, 0, "00000000", "b.txt"); - check_blame_hunk_index(g_repo, g_bufferblame, 4, 8, 3, 0, "63d671eb", "b.txt"); -} - -void test_blame_buffer__add_lines_at_end(void) -{ - const char *buffer = "\ -EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE\n\ -EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE\n\ -EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE\n\ -EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE\n\ -\n\ -BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB\n\ -BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB\n\ -BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB\n\ -BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB\n\ -\n\ -CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC\n\ -CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC\n\ -CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC\n\ -CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC\n\ -\n\ -abc\n\ -def\n"; - cl_git_pass(git_blame_buffer(&g_bufferblame, g_fileblame, buffer, strlen(buffer))); - - cl_assert_equal_i(5, git_blame_get_hunk_count(g_bufferblame)); - check_blame_hunk_index(g_repo, g_bufferblame, 0, 1, 4, 0, "da237394", "b.txt"); - check_blame_hunk_index(g_repo, g_bufferblame, 1, 5, 1, 1, "b99f7ac0", "b.txt"); - check_blame_hunk_index(g_repo, g_bufferblame, 2, 6, 5, 0, "63d671eb", "b.txt"); - check_blame_hunk_index(g_repo, g_bufferblame, 3, 11, 5, 0, "aa06ecca", "b.txt"); - check_blame_hunk_index(g_repo, g_bufferblame, 4, 16, 2, 0, "00000000", "b.txt"); -} diff --git a/vendor/libgit2/tests/blame/getters.c b/vendor/libgit2/tests/blame/getters.c deleted file mode 100644 index 66eaeecf9..000000000 --- a/vendor/libgit2/tests/blame/getters.c +++ /dev/null @@ -1,56 +0,0 @@ -#include "clar_libgit2.h" - -#include "blame.h" - -git_blame *g_blame; - -void test_blame_getters__initialize(void) -{ - size_t i; - git_blame_options opts = GIT_BLAME_OPTIONS_INIT; - - git_blame_hunk hunks[] = { - { 3, {{0}}, 1, NULL, {{0}}, "a", 0}, - { 3, {{0}}, 4, NULL, {{0}}, "b", 0}, - { 3, {{0}}, 7, NULL, {{0}}, "c", 0}, - { 3, {{0}}, 10, NULL, {{0}}, "d", 0}, - { 3, {{0}}, 13, NULL, {{0}}, "e", 0}, - }; - - g_blame = git_blame__alloc(NULL, opts, ""); - - for (i=0; i<5; i++) { - git_blame_hunk *h = git__calloc(1, sizeof(git_blame_hunk)); - h->final_start_line_number = hunks[i].final_start_line_number; - h->orig_path = git__strdup(hunks[i].orig_path); - h->lines_in_hunk = hunks[i].lines_in_hunk; - - git_vector_insert(&g_blame->hunks, h); - } -} - -void test_blame_getters__cleanup(void) -{ - git_blame_free(g_blame); -} - - -void test_blame_getters__byindex(void) -{ - const git_blame_hunk *h = git_blame_get_hunk_byindex(g_blame, 2); - cl_assert(h); - cl_assert_equal_s(h->orig_path, "c"); - - h = git_blame_get_hunk_byindex(g_blame, 95); - cl_assert_equal_p(h, NULL); -} - -void test_blame_getters__byline(void) -{ - const git_blame_hunk *h = git_blame_get_hunk_byline(g_blame, 5); - cl_assert(h); - cl_assert_equal_s(h->orig_path, "b"); - - h = git_blame_get_hunk_byline(g_blame, 95); - cl_assert_equal_p(h, NULL); -} diff --git a/vendor/libgit2/tests/blame/harder.c b/vendor/libgit2/tests/blame/harder.c deleted file mode 100644 index e77741720..000000000 --- a/vendor/libgit2/tests/blame/harder.c +++ /dev/null @@ -1,79 +0,0 @@ -#include "clar_libgit2.h" - -#include "blame.h" - - -/** - * The test repo has a history that looks like this: - * - * * (A) bc7c5ac - * |\ - * | * (B) aa06ecc - * * | (C) 63d671e - * |/ - * * (D) da23739 - * * (E) b99f7ac - * - */ - -static git_repository *g_repo = NULL; - -void test_blame_harder__initialize(void) -{ - cl_git_pass(git_repository_open(&g_repo, cl_fixture("blametest.git"))); -} - -void test_blame_harder__cleanup(void) -{ - git_repository_free(g_repo); - g_repo = NULL; -} - - - -void test_blame_harder__m(void) -{ - /* TODO */ - git_blame_options opts = GIT_BLAME_OPTIONS_INIT; - - GIT_UNUSED(opts); - - opts.flags = GIT_BLAME_TRACK_COPIES_SAME_FILE; -} - - -void test_blame_harder__c(void) -{ - git_blame_options opts = GIT_BLAME_OPTIONS_INIT; - - GIT_UNUSED(opts); - - /* Attribute the first hunk in b.txt to (E), since it was cut/pasted from - * a.txt in (D). - */ - opts.flags = GIT_BLAME_TRACK_COPIES_SAME_COMMIT_MOVES; -} - -void test_blame_harder__cc(void) -{ - git_blame_options opts = GIT_BLAME_OPTIONS_INIT; - - GIT_UNUSED(opts); - - /* Attribute the second hunk in b.txt to (E), since it was copy/pasted from - * a.txt in (C). - */ - opts.flags = GIT_BLAME_TRACK_COPIES_SAME_COMMIT_COPIES; -} - -void test_blame_harder__ccc(void) -{ - git_blame_options opts = GIT_BLAME_OPTIONS_INIT; - - GIT_UNUSED(opts); - - /* Attribute the third hunk in b.txt to (E). This hunk was deleted from - * a.txt in (D), but reintroduced in (B). - */ - opts.flags = GIT_BLAME_TRACK_COPIES_ANY_COMMIT_COPIES; -} diff --git a/vendor/libgit2/tests/blame/simple.c b/vendor/libgit2/tests/blame/simple.c deleted file mode 100644 index 30b78168f..000000000 --- a/vendor/libgit2/tests/blame/simple.c +++ /dev/null @@ -1,336 +0,0 @@ -#include "blame_helpers.h" - -static git_repository *g_repo; -static git_blame *g_blame; - -void test_blame_simple__initialize(void) -{ - g_repo = NULL; - g_blame = NULL; -} - -void test_blame_simple__cleanup(void) -{ - git_blame_free(g_blame); - git_repository_free(g_repo); -} - -/* - * $ git blame -s branch_file.txt - * orig line no final line no - * commit V author timestamp V - * c47800c7 1 (Scott Chacon 2010-05-25 11:58:14 -0700 1 - * a65fedf3 2 (Scott Chacon 2011-08-09 19:33:46 -0700 2 - */ -void test_blame_simple__trivial_testrepo(void) -{ - cl_git_pass(git_repository_open(&g_repo, cl_fixture("testrepo/.gitted"))); - cl_git_pass(git_blame_file(&g_blame, g_repo, "branch_file.txt", NULL)); - - cl_assert_equal_i(2, git_blame_get_hunk_count(g_blame)); - check_blame_hunk_index(g_repo, g_blame, 0, 1, 1, 0, "c47800c7", "branch_file.txt"); - check_blame_hunk_index(g_repo, g_blame, 1, 2, 1, 0, "a65fedf3", "branch_file.txt"); -} - -/* - * $ git blame -n b.txt - * orig line no final line no - * commit V author timestamp V - * da237394 1 (Ben Straub 2013-02-12 15:11:30 -0800 1 - * da237394 2 (Ben Straub 2013-02-12 15:11:30 -0800 2 - * da237394 3 (Ben Straub 2013-02-12 15:11:30 -0800 3 - * da237394 4 (Ben Straub 2013-02-12 15:11:30 -0800 4 - * ^b99f7ac 1 (Ben Straub 2013-02-12 15:10:12 -0800 5 - * 63d671eb 6 (Ben Straub 2013-02-12 15:13:04 -0800 6 - * 63d671eb 7 (Ben Straub 2013-02-12 15:13:04 -0800 7 - * 63d671eb 8 (Ben Straub 2013-02-12 15:13:04 -0800 8 - * 63d671eb 9 (Ben Straub 2013-02-12 15:13:04 -0800 9 - * 63d671eb 10 (Ben Straub 2013-02-12 15:13:04 -0800 10 - * aa06ecca 6 (Ben Straub 2013-02-12 15:14:46 -0800 11 - * aa06ecca 7 (Ben Straub 2013-02-12 15:14:46 -0800 12 - * aa06ecca 8 (Ben Straub 2013-02-12 15:14:46 -0800 13 - * aa06ecca 9 (Ben Straub 2013-02-12 15:14:46 -0800 14 - * aa06ecca 10 (Ben Straub 2013-02-12 15:14:46 -0800 15 - */ -void test_blame_simple__trivial_blamerepo(void) -{ - cl_git_pass(git_repository_open(&g_repo, cl_fixture("blametest.git"))); - cl_git_pass(git_blame_file(&g_blame, g_repo, "b.txt", NULL)); - - cl_assert_equal_i(4, git_blame_get_hunk_count(g_blame)); - check_blame_hunk_index(g_repo, g_blame, 0, 1, 4, 0, "da237394", "b.txt"); - check_blame_hunk_index(g_repo, g_blame, 1, 5, 1, 1, "b99f7ac0", "b.txt"); - check_blame_hunk_index(g_repo, g_blame, 2, 6, 5, 0, "63d671eb", "b.txt"); - check_blame_hunk_index(g_repo, g_blame, 3, 11, 5, 0, "aa06ecca", "b.txt"); -} - - -/* - * $ git blame -n 359fc2d -- include/git2.h - * orig line no final line no - * commit orig path V author timestamp V - * d12299fe src/git.h 1 (Vicent Martí 2010-12-03 22:22:10 +0200 1 - * 359fc2d2 include/git2.h 2 (Edward Thomson 2013-01-08 17:07:25 -0600 2 - * d12299fe src/git.h 5 (Vicent Martí 2010-12-03 22:22:10 +0200 3 - * bb742ede include/git2.h 4 (Vicent Martí 2011-09-19 01:54:32 +0300 4 - * bb742ede include/git2.h 5 (Vicent Martí 2011-09-19 01:54:32 +0300 5 - * d12299fe src/git.h 24 (Vicent Martí 2010-12-03 22:22:10 +0200 6 - * d12299fe src/git.h 25 (Vicent Martí 2010-12-03 22:22:10 +0200 7 - * d12299fe src/git.h 26 (Vicent Martí 2010-12-03 22:22:10 +0200 8 - * d12299fe src/git.h 27 (Vicent Martí 2010-12-03 22:22:10 +0200 9 - * d12299fe src/git.h 28 (Vicent Martí 2010-12-03 22:22:10 +0200 10 - * 96fab093 include/git2.h 11 (Sven Strickroth 2011-10-09 18:37:41 +0200 11 - * 9d1dcca2 src/git2.h 33 (Vicent Martí 2011-02-07 10:35:58 +0200 12 - * 44908fe7 src/git2.h 29 (Vicent Martí 2010-12-06 23:03:16 +0200 13 - * a15c550d include/git2.h 14 (Vicent Martí 2011-11-16 14:09:44 +0100 14 - * 44908fe7 src/git2.h 30 (Vicent Martí 2010-12-06 23:03:16 +0200 15 - * d12299fe src/git.h 32 (Vicent Martí 2010-12-03 22:22:10 +0200 16 - * 44908fe7 src/git2.h 33 (Vicent Martí 2010-12-06 23:03:16 +0200 17 - * d12299fe src/git.h 34 (Vicent Martí 2010-12-03 22:22:10 +0200 18 - * 44908fe7 src/git2.h 35 (Vicent Martí 2010-12-06 23:03:16 +0200 19 - * 638c2ca4 src/git2.h 36 (Vicent Martí 2010-12-18 02:10:25 +0200 20 - * 44908fe7 src/git2.h 36 (Vicent Martí 2010-12-06 23:03:16 +0200 21 - * d12299fe src/git.h 37 (Vicent Martí 2010-12-03 22:22:10 +0200 22 - * 44908fe7 src/git2.h 38 (Vicent Martí 2010-12-06 23:03:16 +0200 23 - * 44908fe7 src/git2.h 39 (Vicent Martí 2010-12-06 23:03:16 +0200 24 - * bf787bd8 include/git2.h 25 (Carlos Martín Nieto 2012-04-08 18:56:50 +0200 25 - * 0984c876 include/git2.h 26 (Scott J. Goldman 2012-11-28 18:27:43 -0800 26 - * 2f8a8ab2 src/git2.h 41 (Vicent Martí 2011-01-29 01:56:25 +0200 27 - * 27df4275 include/git2.h 47 (Michael Schubert 2011-06-28 14:13:12 +0200 28 - * a346992f include/git2.h 28 (Ben Straub 2012-05-10 09:47:14 -0700 29 - * d12299fe src/git.h 40 (Vicent Martí 2010-12-03 22:22:10 +0200 30 - * 44908fe7 src/git2.h 41 (Vicent Martí 2010-12-06 23:03:16 +0200 31 - * 44908fe7 src/git2.h 42 (Vicent Martí 2010-12-06 23:03:16 +0200 32 - * 44908fe7 src/git2.h 43 (Vicent Martí 2010-12-06 23:03:16 +0200 33 - * 44908fe7 src/git2.h 44 (Vicent Martí 2010-12-06 23:03:16 +0200 34 - * 44908fe7 src/git2.h 45 (Vicent Martí 2010-12-06 23:03:16 +0200 35 - * 65b09b1d include/git2.h 33 (Russell Belfer 2012-02-02 18:03:43 -0800 36 - * d12299fe src/git.h 46 (Vicent Martí 2010-12-03 22:22:10 +0200 37 - * 44908fe7 src/git2.h 47 (Vicent Martí 2010-12-06 23:03:16 +0200 38 - * 5d4cd003 include/git2.h 55 (Carlos Martín Nieto 2011-03-28 17:02:45 +0200 39 - * 41fb1ca0 include/git2.h 39 (Philip Kelley 2012-10-29 13:41:14 -0400 40 - * 2dc31040 include/git2.h 56 (Carlos Martín Nieto 2011-06-20 18:58:57 +0200 41 - * 764df57e include/git2.h 40 (Ben Straub 2012-06-15 13:14:43 -0700 42 - * 5280f4e6 include/git2.h 41 (Ben Straub 2012-07-31 19:39:06 -0700 43 - * 613d5eb9 include/git2.h 43 (Philip Kelley 2012-11-28 11:42:37 -0500 44 - * d12299fe src/git.h 48 (Vicent Martí 2010-12-03 22:22:10 +0200 45 - * 111ee3fe include/git2.h 41 (Vicent Martí 2012-07-11 14:37:26 +0200 46 - * f004c4a8 include/git2.h 44 (Russell Belfer 2012-08-21 17:26:39 -0700 47 - * 111ee3fe include/git2.h 42 (Vicent Martí 2012-07-11 14:37:26 +0200 48 - * 9c82357b include/git2.h 58 (Carlos Martín Nieto 2011-06-17 18:13:14 +0200 49 - * d6258deb include/git2.h 61 (Carlos Martín Nieto 2011-06-25 15:10:09 +0200 50 - * b311e313 include/git2.h 63 (Julien Miotte 2011-07-27 18:31:13 +0200 51 - * 3412391d include/git2.h 63 (Carlos Martín Nieto 2011-07-07 11:47:31 +0200 52 - * bfc9ca59 include/git2.h 43 (Russell Belfer 2012-03-28 16:45:36 -0700 53 - * bf477ed4 include/git2.h 44 (Michael Schubert 2012-02-15 00:33:38 +0100 54 - * edebceff include/git2.h 46 (nulltoken 2012-05-01 13:57:45 +0200 55 - * 743a4b3b include/git2.h 48 (nulltoken 2012-06-15 22:24:59 +0200 56 - * 0a32dca5 include/git2.h 54 (Michael Schubert 2012-08-19 22:26:32 +0200 57 - * 590fb68b include/git2.h 55 (nulltoken 2012-10-04 13:47:45 +0200 58 - * bf477ed4 include/git2.h 45 (Michael Schubert 2012-02-15 00:33:38 +0100 59 - * d12299fe src/git.h 49 (Vicent Martí 2010-12-03 22:22:10 +0200 60 - */ -void test_blame_simple__trivial_libgit2(void) -{ - git_blame_options opts = GIT_BLAME_OPTIONS_INIT; - git_object *obj; - - /* If we can't open the libgit2 repo or if it isn't a full repo - * with proper history, just skip this test */ - if (git_repository_open(&g_repo, cl_fixture("../..")) < 0) - cl_skip(); - - if (git_repository_is_shallow(g_repo)) - cl_skip(); - - if (git_revparse_single(&obj, g_repo, "359fc2d") < 0) - cl_skip(); - - git_oid_cpy(&opts.newest_commit, git_object_id(obj)); - git_object_free(obj); - - cl_git_pass(git_blame_file(&g_blame, g_repo, "include/git2.h", &opts)); - - check_blame_hunk_index(g_repo, g_blame, 0, 1, 1, 0, "d12299fe", "src/git.h"); - check_blame_hunk_index(g_repo, g_blame, 1, 2, 1, 0, "359fc2d2", "include/git2.h"); - check_blame_hunk_index(g_repo, g_blame, 2, 3, 1, 0, "d12299fe", "src/git.h"); - check_blame_hunk_index(g_repo, g_blame, 3, 4, 2, 0, "bb742ede", "include/git2.h"); - check_blame_hunk_index(g_repo, g_blame, 4, 6, 5, 0, "d12299fe", "src/git.h"); - check_blame_hunk_index(g_repo, g_blame, 5, 11, 1, 0, "96fab093", "include/git2.h"); - check_blame_hunk_index(g_repo, g_blame, 6, 12, 1, 0, "9d1dcca2", "src/git2.h"); - check_blame_hunk_index(g_repo, g_blame, 7, 13, 1, 0, "44908fe7", "src/git2.h"); - check_blame_hunk_index(g_repo, g_blame, 8, 14, 1, 0, "a15c550d", "include/git2.h"); - check_blame_hunk_index(g_repo, g_blame, 9, 15, 1, 0, "44908fe7", "src/git2.h"); - check_blame_hunk_index(g_repo, g_blame, 10, 16, 1, 0, "d12299fe", "src/git.h"); - check_blame_hunk_index(g_repo, g_blame, 11, 17, 1, 0, "44908fe7", "src/git2.h"); - check_blame_hunk_index(g_repo, g_blame, 12, 18, 1, 0, "d12299fe", "src/git.h"); - check_blame_hunk_index(g_repo, g_blame, 13, 19, 1, 0, "44908fe7", "src/git2.h"); - check_blame_hunk_index(g_repo, g_blame, 14, 20, 1, 0, "638c2ca4", "src/git2.h"); - check_blame_hunk_index(g_repo, g_blame, 15, 21, 1, 0, "44908fe7", "src/git2.h"); - check_blame_hunk_index(g_repo, g_blame, 16, 22, 1, 0, "d12299fe", "src/git.h"); - check_blame_hunk_index(g_repo, g_blame, 17, 23, 2, 0, "44908fe7", "src/git2.h"); - check_blame_hunk_index(g_repo, g_blame, 18, 25, 1, 0, "bf787bd8", "include/git2.h"); - check_blame_hunk_index(g_repo, g_blame, 19, 26, 1, 0, "0984c876", "include/git2.h"); - check_blame_hunk_index(g_repo, g_blame, 20, 27, 1, 0, "2f8a8ab2", "src/git2.h"); - check_blame_hunk_index(g_repo, g_blame, 21, 28, 1, 0, "27df4275", "include/git2.h"); - check_blame_hunk_index(g_repo, g_blame, 22, 29, 1, 0, "a346992f", "include/git2.h"); - check_blame_hunk_index(g_repo, g_blame, 23, 30, 1, 0, "d12299fe", "src/git.h"); - check_blame_hunk_index(g_repo, g_blame, 24, 31, 5, 0, "44908fe7", "src/git2.h"); - check_blame_hunk_index(g_repo, g_blame, 25, 36, 1, 0, "65b09b1d", "include/git2.h"); - check_blame_hunk_index(g_repo, g_blame, 26, 37, 1, 0, "d12299fe", "src/git.h"); - check_blame_hunk_index(g_repo, g_blame, 27, 38, 1, 0, "44908fe7", "src/git2.h"); - check_blame_hunk_index(g_repo, g_blame, 28, 39, 1, 0, "5d4cd003", "include/git2.h"); - check_blame_hunk_index(g_repo, g_blame, 29, 40, 1, 0, "41fb1ca0", "include/git2.h"); - check_blame_hunk_index(g_repo, g_blame, 30, 41, 1, 0, "2dc31040", "include/git2.h"); - check_blame_hunk_index(g_repo, g_blame, 31, 42, 1, 0, "764df57e", "include/git2.h"); - check_blame_hunk_index(g_repo, g_blame, 32, 43, 1, 0, "5280f4e6", "include/git2.h"); - check_blame_hunk_index(g_repo, g_blame, 33, 44, 1, 0, "613d5eb9", "include/git2.h"); - check_blame_hunk_index(g_repo, g_blame, 34, 45, 1, 0, "d12299fe", "src/git.h"); - check_blame_hunk_index(g_repo, g_blame, 35, 46, 1, 0, "111ee3fe", "include/git2.h"); - check_blame_hunk_index(g_repo, g_blame, 36, 47, 1, 0, "f004c4a8", "include/git2.h"); - check_blame_hunk_index(g_repo, g_blame, 37, 48, 1, 0, "111ee3fe", "include/git2.h"); - check_blame_hunk_index(g_repo, g_blame, 38, 49, 1, 0, "9c82357b", "include/git2.h"); - check_blame_hunk_index(g_repo, g_blame, 39, 50, 1, 0, "d6258deb", "include/git2.h"); - check_blame_hunk_index(g_repo, g_blame, 40, 51, 1, 0, "b311e313", "include/git2.h"); - check_blame_hunk_index(g_repo, g_blame, 41, 52, 1, 0, "3412391d", "include/git2.h"); - check_blame_hunk_index(g_repo, g_blame, 42, 53, 1, 0, "bfc9ca59", "include/git2.h"); - check_blame_hunk_index(g_repo, g_blame, 43, 54, 1, 0, "bf477ed4", "include/git2.h"); - check_blame_hunk_index(g_repo, g_blame, 44, 55, 1, 0, "edebceff", "include/git2.h"); - check_blame_hunk_index(g_repo, g_blame, 45, 56, 1, 0, "743a4b3b", "include/git2.h"); - check_blame_hunk_index(g_repo, g_blame, 46, 57, 1, 0, "0a32dca5", "include/git2.h"); - check_blame_hunk_index(g_repo, g_blame, 47, 58, 1, 0, "590fb68b", "include/git2.h"); - check_blame_hunk_index(g_repo, g_blame, 48, 59, 1, 0, "bf477ed4", "include/git2.h"); - check_blame_hunk_index(g_repo, g_blame, 49, 60, 1, 0, "d12299fe", "src/git.h"); -} - - -/* - * $ git blame -n b.txt -L 8 - * orig line no final line no - * commit V author timestamp V - * 63d671eb 8 (Ben Straub 2013-02-12 15:13:04 -0800 8 - * 63d671eb 9 (Ben Straub 2013-02-12 15:13:04 -0800 9 - * 63d671eb 10 (Ben Straub 2013-02-12 15:13:04 -0800 10 - * aa06ecca 6 (Ben Straub 2013-02-12 15:14:46 -0800 11 - * aa06ecca 7 (Ben Straub 2013-02-12 15:14:46 -0800 12 - * aa06ecca 8 (Ben Straub 2013-02-12 15:14:46 -0800 13 - * aa06ecca 9 (Ben Straub 2013-02-12 15:14:46 -0800 14 - * aa06ecca 10 (Ben Straub 2013-02-12 15:14:46 -0800 15 - */ -void test_blame_simple__can_restrict_lines_min(void) -{ - git_blame_options opts = GIT_BLAME_OPTIONS_INIT; - - cl_git_pass(git_repository_open(&g_repo, cl_fixture("blametest.git"))); - - opts.min_line = 8; - cl_git_pass(git_blame_file(&g_blame, g_repo, "b.txt", &opts)); - cl_assert_equal_i(2, git_blame_get_hunk_count(g_blame)); - check_blame_hunk_index(g_repo, g_blame, 0, 8, 3, 0, "63d671eb", "b.txt"); - check_blame_hunk_index(g_repo, g_blame, 1, 11, 5, 0, "aa06ecca", "b.txt"); -} - -/* - * $ git blame -n b.txt -L ,6 - * orig line no final line no - * commit V author timestamp V - * da237394 1 (Ben Straub 2013-02-12 15:11:30 -0800 1 - * da237394 2 (Ben Straub 2013-02-12 15:11:30 -0800 2 - * da237394 3 (Ben Straub 2013-02-12 15:11:30 -0800 3 - * da237394 4 (Ben Straub 2013-02-12 15:11:30 -0800 4 - * ^b99f7ac 1 (Ben Straub 2013-02-12 15:10:12 -0800 5 - * 63d671eb 6 (Ben Straub 2013-02-12 15:13:04 -0800 6 - */ -void test_blame_simple__can_restrict_lines_max(void) -{ - git_blame_options opts = GIT_BLAME_OPTIONS_INIT; - - cl_git_pass(git_repository_open(&g_repo, cl_fixture("blametest.git"))); - - opts.max_line = 6; - cl_git_pass(git_blame_file(&g_blame, g_repo, "b.txt", &opts)); - cl_assert_equal_i(3, git_blame_get_hunk_count(g_blame)); - check_blame_hunk_index(g_repo, g_blame, 0, 1, 4, 0, "da237394", "b.txt"); - check_blame_hunk_index(g_repo, g_blame, 1, 5, 1, 1, "b99f7ac0", "b.txt"); - check_blame_hunk_index(g_repo, g_blame, 2, 6, 1, 0, "63d671eb", "b.txt"); -} - -/* - * $ git blame -n b.txt -L 2,7 - * orig line no final line no - * commit V author timestamp V - * da237394 2 (Ben Straub 2013-02-12 15:11:30 -0800 2 - * da237394 3 (Ben Straub 2013-02-12 15:11:30 -0800 3 - * da237394 4 (Ben Straub 2013-02-12 15:11:30 -0800 4 - * ^b99f7ac 1 (Ben Straub 2013-02-12 15:10:12 -0800 5 - * 63d671eb 6 (Ben Straub 2013-02-12 15:13:04 -0800 6 - * 63d671eb 7 (Ben Straub 2013-02-12 15:13:04 -0800 7 - */ -void test_blame_simple__can_restrict_lines_both(void) -{ - git_blame_options opts = GIT_BLAME_OPTIONS_INIT; - - cl_git_pass(git_repository_open(&g_repo, cl_fixture("blametest.git"))); - - opts.min_line = 2; - opts.max_line = 7; - cl_git_pass(git_blame_file(&g_blame, g_repo, "b.txt", &opts)); - cl_assert_equal_i(3, git_blame_get_hunk_count(g_blame)); - check_blame_hunk_index(g_repo, g_blame, 0, 2, 3, 0, "da237394", "b.txt"); - check_blame_hunk_index(g_repo, g_blame, 1, 5, 1, 1, "b99f7ac0", "b.txt"); - check_blame_hunk_index(g_repo, g_blame, 2, 6, 2, 0, "63d671eb", "b.txt"); -} - -void test_blame_simple__can_blame_huge_file(void) -{ - git_blame_options opts = GIT_BLAME_OPTIONS_INIT; - - cl_git_pass(git_repository_open(&g_repo, cl_fixture("blametest.git"))); - - cl_git_pass(git_blame_file(&g_blame, g_repo, "huge.txt", &opts)); - cl_assert_equal_i(2, git_blame_get_hunk_count(g_blame)); - check_blame_hunk_index(g_repo, g_blame, 0, 1, 65536, 0, "4eecfea", "huge.txt"); - check_blame_hunk_index(g_repo, g_blame, 1, 65537, 1, 0, "6653ff4", "huge.txt"); -} - -/* - * $ git blame -n branch_file.txt be3563a..HEAD - * orig line no final line no - * commit V author timestamp V - * ^be3563a 1 (Scott Chacon 2010-05-25 11:58:27 -0700 1) hi - * a65fedf3 2 (Scott Chacon 2011-08-09 19:33:46 -0700 2) bye! - */ -void test_blame_simple__can_restrict_to_newish_commits(void) -{ - git_blame_options opts = GIT_BLAME_OPTIONS_INIT; - - cl_git_pass(git_repository_open(&g_repo, cl_fixture("testrepo.git"))); - - { - git_object *obj; - cl_git_pass(git_revparse_single(&obj, g_repo, "be3563a")); - git_oid_cpy(&opts.oldest_commit, git_object_id(obj)); - git_object_free(obj); - } - - cl_git_pass(git_blame_file(&g_blame, g_repo, "branch_file.txt", &opts)); - - cl_assert_equal_i(2, git_blame_get_hunk_count(g_blame)); - check_blame_hunk_index(g_repo, g_blame, 0, 1, 1, 1, "be3563a", "branch_file.txt"); - check_blame_hunk_index(g_repo, g_blame, 1, 2, 1, 0, "a65fedf", "branch_file.txt"); -} - -void test_blame_simple__can_restrict_to_first_parent_commits(void) -{ - git_blame_options opts = GIT_BLAME_OPTIONS_INIT; - opts.flags |= GIT_BLAME_FIRST_PARENT; - - cl_git_pass(git_repository_open(&g_repo, cl_fixture("blametest.git"))); - - cl_git_pass(git_blame_file(&g_blame, g_repo, "b.txt", &opts)); - cl_assert_equal_i(4, git_blame_get_hunk_count(g_blame)); - check_blame_hunk_index(g_repo, g_blame, 0, 1, 4, 0, "da237394", "b.txt"); - check_blame_hunk_index(g_repo, g_blame, 1, 5, 1, 1, "b99f7ac0", "b.txt"); - check_blame_hunk_index(g_repo, g_blame, 2, 6, 5, 0, "63d671eb", "b.txt"); - check_blame_hunk_index(g_repo, g_blame, 3, 11, 5, 0, "bc7c5ac2", "b.txt"); -} diff --git a/vendor/libgit2/tests/buf/basic.c b/vendor/libgit2/tests/buf/basic.c deleted file mode 100644 index 14ea3e7ce..000000000 --- a/vendor/libgit2/tests/buf/basic.c +++ /dev/null @@ -1,51 +0,0 @@ -#include "clar_libgit2.h" -#include "buffer.h" - -static const char *test_string = "Have you seen that? Have you seeeen that??"; - -void test_buf_basic__resize(void) -{ - git_buf buf1 = GIT_BUF_INIT; - git_buf_puts(&buf1, test_string); - cl_assert(git_buf_oom(&buf1) == 0); - cl_assert_equal_s(git_buf_cstr(&buf1), test_string); - - git_buf_puts(&buf1, test_string); - cl_assert(strlen(git_buf_cstr(&buf1)) == strlen(test_string) * 2); - git_buf_free(&buf1); -} - -void test_buf_basic__resize_incremental(void) -{ - git_buf buf1 = GIT_BUF_INIT; - - /* Presently, asking for 6 bytes will round up to 8. */ - cl_git_pass(git_buf_puts(&buf1, "Hello")); - cl_assert_equal_i(5, buf1.size); - cl_assert_equal_i(8, buf1.asize); - - /* Ensure an additional byte does not realloc. */ - cl_git_pass(git_buf_grow_by(&buf1, 1)); - cl_assert_equal_i(5, buf1.size); - cl_assert_equal_i(8, buf1.asize); - - /* But requesting many does. */ - cl_git_pass(git_buf_grow_by(&buf1, 16)); - cl_assert_equal_i(5, buf1.size); - cl_assert(buf1.asize > 8); - - git_buf_free(&buf1); -} - -void test_buf_basic__printf(void) -{ - git_buf buf2 = GIT_BUF_INIT; - git_buf_printf(&buf2, "%s %s %d ", "shoop", "da", 23); - cl_assert(git_buf_oom(&buf2) == 0); - cl_assert_equal_s(git_buf_cstr(&buf2), "shoop da 23 "); - - git_buf_printf(&buf2, "%s %d", "woop", 42); - cl_assert(git_buf_oom(&buf2) == 0); - cl_assert_equal_s(git_buf_cstr(&buf2), "shoop da 23 woop 42"); - git_buf_free(&buf2); -} diff --git a/vendor/libgit2/tests/buf/oom.c b/vendor/libgit2/tests/buf/oom.c deleted file mode 100644 index b9fd29cbb..000000000 --- a/vendor/libgit2/tests/buf/oom.c +++ /dev/null @@ -1,41 +0,0 @@ -#include "clar_libgit2.h" -#include "buffer.h" - -#if defined(GIT_ARCH_64) -#define TOOBIG 0xffffffffffffff00 -#else -#define TOOBIG 0xffffff00 -#endif - -/** - * If we make a ridiculously large request the first time we - * actually allocate some space in the git_buf, the realloc() - * will fail. And because the git_buf_grow() wrapper always - * sets mark_oom, the code in git_buf_try_grow() will free - * the internal buffer and set it to git_buf__oom. - * - * We initialized the internal buffer to (the static variable) - * git_buf__initbuf. The purpose of this test is to make sure - * that we don't try to free the static buffer. - */ -void test_buf_oom__grow(void) -{ - git_buf buf = GIT_BUF_INIT; - - git_buf_clear(&buf); - - cl_assert(git_buf_grow(&buf, TOOBIG) == -1); - cl_assert(git_buf_oom(&buf)); - - git_buf_free(&buf); -} - -void test_buf_oom__grow_by(void) -{ - git_buf buf = GIT_BUF_INIT; - - buf.size = SIZE_MAX-10; - - cl_assert(git_buf_grow_by(&buf, 50) == -1); - cl_assert(git_buf_oom(&buf)); -} diff --git a/vendor/libgit2/tests/buf/splice.c b/vendor/libgit2/tests/buf/splice.c deleted file mode 100644 index e80c93105..000000000 --- a/vendor/libgit2/tests/buf/splice.c +++ /dev/null @@ -1,93 +0,0 @@ -#include "clar_libgit2.h" -#include "buffer.h" - -static git_buf _buf; - -void test_buf_splice__initialize(void) { - git_buf_init(&_buf, 16); -} - -void test_buf_splice__cleanup(void) { - git_buf_free(&_buf); -} - -void test_buf_splice__preprend(void) -{ - git_buf_sets(&_buf, "world!"); - - cl_git_pass(git_buf_splice(&_buf, 0, 0, "Hello Dolly", strlen("Hello "))); - - cl_assert_equal_s("Hello world!", git_buf_cstr(&_buf)); -} - -void test_buf_splice__append(void) -{ - git_buf_sets(&_buf, "Hello"); - - cl_git_pass(git_buf_splice(&_buf, git_buf_len(&_buf), 0, " world!", strlen(" world!"))); - - cl_assert_equal_s("Hello world!", git_buf_cstr(&_buf)); -} - -void test_buf_splice__insert_at(void) -{ - git_buf_sets(&_buf, "Hell world!"); - - cl_git_pass(git_buf_splice(&_buf, strlen("Hell"), 0, "o", strlen("o"))); - - cl_assert_equal_s("Hello world!", git_buf_cstr(&_buf)); -} - -void test_buf_splice__remove_at(void) -{ - git_buf_sets(&_buf, "Hello world of warcraft!"); - - cl_git_pass(git_buf_splice(&_buf, strlen("Hello world"), strlen(" of warcraft"), "", 0)); - - cl_assert_equal_s("Hello world!", git_buf_cstr(&_buf)); -} - -void test_buf_splice__replace(void) -{ - git_buf_sets(&_buf, "Hell0 w0rld!"); - - cl_git_pass(git_buf_splice(&_buf, strlen("Hell"), strlen("0 w0"), "o wo", strlen("o wo"))); - - cl_assert_equal_s("Hello world!", git_buf_cstr(&_buf)); -} - -void test_buf_splice__replace_with_longer(void) -{ - git_buf_sets(&_buf, "Hello you!"); - - cl_git_pass(git_buf_splice(&_buf, strlen("Hello "), strlen("you"), "world", strlen("world"))); - - cl_assert_equal_s("Hello world!", git_buf_cstr(&_buf)); -} - -void test_buf_splice__replace_with_shorter(void) -{ - git_buf_sets(&_buf, "Brave new world!"); - - cl_git_pass(git_buf_splice(&_buf, 0, strlen("Brave new"), "Hello", strlen("Hello"))); - - cl_assert_equal_s("Hello world!", git_buf_cstr(&_buf)); -} - -void test_buf_splice__truncate(void) -{ - git_buf_sets(&_buf, "Hello world!!"); - - cl_git_pass(git_buf_splice(&_buf, strlen("Hello world!"), strlen("!"), "", 0)); - - cl_assert_equal_s("Hello world!", git_buf_cstr(&_buf)); -} - -void test_buf_splice__dont_do_anything(void) -{ - git_buf_sets(&_buf, "Hello world!"); - - cl_git_pass(git_buf_splice(&_buf, 3, 0, "Hello", 0)); - - cl_assert_equal_s("Hello world!", git_buf_cstr(&_buf)); -} diff --git a/vendor/libgit2/tests/checkout/binaryunicode.c b/vendor/libgit2/tests/checkout/binaryunicode.c deleted file mode 100644 index 27e70d3f1..000000000 --- a/vendor/libgit2/tests/checkout/binaryunicode.c +++ /dev/null @@ -1,58 +0,0 @@ -#include "clar_libgit2.h" -#include "refs.h" -#include "repo/repo_helpers.h" -#include "path.h" -#include "fileops.h" - -static git_repository *g_repo; - -void test_checkout_binaryunicode__initialize(void) -{ - g_repo = cl_git_sandbox_init("binaryunicode"); -} - -void test_checkout_binaryunicode__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -static void execute_test(void) -{ - git_oid oid, check; - git_commit *commit; - git_tree *tree; - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - - cl_git_pass(git_reference_name_to_id(&oid, g_repo, "refs/heads/branch1")); - cl_git_pass(git_commit_lookup(&commit, g_repo, &oid)); - cl_git_pass(git_commit_tree(&tree, commit)); - - opts.checkout_strategy = GIT_CHECKOUT_SAFE; - - cl_git_pass(git_checkout_tree(g_repo, (git_object *)tree, &opts)); - - git_tree_free(tree); - git_commit_free(commit); - - /* Verify that the lenna.jpg file was checked out correctly */ - cl_git_pass(git_oid_fromstr(&check, "8ab005d890fe53f65eda14b23672f60d9f4ec5a1")); - cl_git_pass(git_odb_hashfile(&oid, "binaryunicode/lenna.jpg", GIT_OBJ_BLOB)); - cl_assert_equal_oid(&oid, &check); - - /* Verify that the text file was checked out correctly */ - cl_git_pass(git_oid_fromstr(&check, "965b223880dd4249e2c66a0cc0b4cffe1dc40f5a")); - cl_git_pass(git_odb_hashfile(&oid, "binaryunicode/utf16_withbom_noeol_crlf.txt", GIT_OBJ_BLOB)); - cl_assert_equal_oid(&oid, &check); -} - -void test_checkout_binaryunicode__noautocrlf(void) -{ - cl_repo_set_bool(g_repo, "core.autocrlf", false); - execute_test(); -} - -void test_checkout_binaryunicode__autocrlf(void) -{ - cl_repo_set_bool(g_repo, "core.autocrlf", true); - execute_test(); -} diff --git a/vendor/libgit2/tests/checkout/checkout_helpers.c b/vendor/libgit2/tests/checkout/checkout_helpers.c deleted file mode 100644 index d7d24f33f..000000000 --- a/vendor/libgit2/tests/checkout/checkout_helpers.c +++ /dev/null @@ -1,151 +0,0 @@ -#include "clar_libgit2.h" -#include "checkout_helpers.h" -#include "refs.h" -#include "fileops.h" -#include "index.h" - -void assert_on_branch(git_repository *repo, const char *branch) -{ - git_reference *head; - git_buf bname = GIT_BUF_INIT; - - cl_git_pass(git_reference_lookup(&head, repo, GIT_HEAD_FILE)); - cl_assert_(git_reference_type(head) == GIT_REF_SYMBOLIC, branch); - - cl_git_pass(git_buf_joinpath(&bname, "refs/heads", branch)); - cl_assert_equal_s(bname.ptr, git_reference_symbolic_target(head)); - - git_reference_free(head); - git_buf_free(&bname); -} - -void reset_index_to_treeish(git_object *treeish) -{ - git_object *tree; - git_index *index; - git_repository *repo = git_object_owner(treeish); - - cl_git_pass(git_object_peel(&tree, treeish, GIT_OBJ_TREE)); - - cl_git_pass(git_repository_index(&index, repo)); - cl_git_pass(git_index_read_tree(index, (git_tree *)tree)); - cl_git_pass(git_index_write(index)); - - git_object_free(tree); - git_index_free(index); -} - -int checkout_count_callback( - git_checkout_notify_t why, - const char *path, - const git_diff_file *baseline, - const git_diff_file *target, - const git_diff_file *workdir, - void *payload) -{ - checkout_counts *ct = payload; - - GIT_UNUSED(baseline); GIT_UNUSED(target); GIT_UNUSED(workdir); - - if (why & GIT_CHECKOUT_NOTIFY_CONFLICT) { - ct->n_conflicts++; - - if (ct->debug) { - if (workdir) { - if (baseline) { - if (target) - fprintf(stderr, "M %s (conflicts with M %s)\n", - workdir->path, target->path); - else - fprintf(stderr, "M %s (conflicts with D %s)\n", - workdir->path, baseline->path); - } else { - if (target) - fprintf(stderr, "Existing %s (conflicts with A %s)\n", - workdir->path, target->path); - else - fprintf(stderr, "How can an untracked file be a conflict (%s)\n", workdir->path); - } - } else { - if (baseline) { - if (target) - fprintf(stderr, "D %s (conflicts with M %s)\n", - target->path, baseline->path); - else - fprintf(stderr, "D %s (conflicts with D %s)\n", - baseline->path, baseline->path); - } else { - if (target) - fprintf(stderr, "How can an added file with no workdir be a conflict (%s)\n", target->path); - else - fprintf(stderr, "How can a nonexistent file be a conflict (%s)\n", path); - } - } - } - } - - if (why & GIT_CHECKOUT_NOTIFY_DIRTY) { - ct->n_dirty++; - - if (ct->debug) { - if (workdir) - fprintf(stderr, "M %s\n", workdir->path); - else - fprintf(stderr, "D %s\n", baseline->path); - } - } - - if (why & GIT_CHECKOUT_NOTIFY_UPDATED) { - ct->n_updates++; - - if (ct->debug) { - if (baseline) { - if (target) - fprintf(stderr, "update: M %s\n", path); - else - fprintf(stderr, "update: D %s\n", path); - } else { - if (target) - fprintf(stderr, "update: A %s\n", path); - else - fprintf(stderr, "update: this makes no sense %s\n", path); - } - } - } - - if (why & GIT_CHECKOUT_NOTIFY_UNTRACKED) { - ct->n_untracked++; - - if (ct->debug) - fprintf(stderr, "? %s\n", path); - } - - if (why & GIT_CHECKOUT_NOTIFY_IGNORED) { - ct->n_ignored++; - - if (ct->debug) - fprintf(stderr, "I %s\n", path); - } - - return 0; -} - -void tick_index(git_index *index) -{ - struct timespec ts; - struct p_timeval times[2]; - - cl_assert(index->on_disk); - cl_assert(git_index_path(index)); - - cl_git_pass(git_index_read(index, true)); - ts = index->stamp.mtime; - - times[0].tv_sec = ts.tv_sec; - times[0].tv_usec = ts.tv_nsec / 1000; - times[1].tv_sec = ts.tv_sec + 5; - times[1].tv_usec = ts.tv_nsec / 1000; - - cl_git_pass(p_utimes(git_index_path(index), times)); - cl_git_pass(git_index_read(index, true)); -} diff --git a/vendor/libgit2/tests/checkout/checkout_helpers.h b/vendor/libgit2/tests/checkout/checkout_helpers.h deleted file mode 100644 index 6058a196c..000000000 --- a/vendor/libgit2/tests/checkout/checkout_helpers.h +++ /dev/null @@ -1,31 +0,0 @@ -#include "buffer.h" -#include "git2/object.h" -#include "git2/repository.h" - -extern void assert_on_branch(git_repository *repo, const char *branch); -extern void reset_index_to_treeish(git_object *treeish); - -#define check_file_contents(PATH,EXP) \ - cl_assert_equal_file(EXP,0,PATH) - -#define check_file_contents_nocr(PATH,EXP) \ - cl_assert_equal_file_ignore_cr(EXP,0,PATH) - -typedef struct { - int n_conflicts; - int n_dirty; - int n_updates; - int n_untracked; - int n_ignored; - int debug; -} checkout_counts; - -extern int checkout_count_callback( - git_checkout_notify_t why, - const char *path, - const git_diff_file *baseline, - const git_diff_file *target, - const git_diff_file *workdir, - void *payload); - -extern void tick_index(git_index *index); diff --git a/vendor/libgit2/tests/checkout/conflict.c b/vendor/libgit2/tests/checkout/conflict.c deleted file mode 100644 index dd2dd3131..000000000 --- a/vendor/libgit2/tests/checkout/conflict.c +++ /dev/null @@ -1,1137 +0,0 @@ -#include "clar_libgit2.h" -#include "git2/repository.h" -#include "git2/sys/index.h" -#include "fileops.h" - -static git_repository *g_repo; -static git_index *g_index; - -#define TEST_REPO_PATH "merge-resolve" - -#define CONFLICTING_ANCESTOR_OID "d427e0b2e138501a3d15cc376077a3631e15bd46" -#define CONFLICTING_OURS_OID "4e886e602529caa9ab11d71f86634bd1b6e0de10" -#define CONFLICTING_THEIRS_OID "2bd0a343aeef7a2cf0d158478966a6e587ff3863" - -#define AUTOMERGEABLE_ANCESTOR_OID "6212c31dab5e482247d7977e4f0dd3601decf13b" -#define AUTOMERGEABLE_OURS_OID "ee3fa1b8c00aff7fe02065fdb50864bb0d932ccf" -#define AUTOMERGEABLE_THEIRS_OID "058541fc37114bfc1dddf6bd6bffc7fae5c2e6fe" - -#define LINK_ANCESTOR_OID "1a010b1c0f081b2e8901d55307a15c29ff30af0e" -#define LINK_OURS_OID "72ea499e108df5ff0a4a913e7655bbeeb1fb69f2" -#define LINK_THEIRS_OID "8bfb012a6d809e499bd8d3e194a3929bc8995b93" - -#define LINK_ANCESTOR_TARGET "file" -#define LINK_OURS_TARGET "other-file" -#define LINK_THEIRS_TARGET "still-another-file" - -#define CONFLICTING_OURS_FILE \ - "this file is changed in master and branch\n" -#define CONFLICTING_THEIRS_FILE \ - "this file is changed in branch and master\n" -#define CONFLICTING_DIFF3_FILE \ - "<<<<<<< ours\n" \ - "this file is changed in master and branch\n" \ - "=======\n" \ - "this file is changed in branch and master\n" \ - ">>>>>>> theirs\n" - -#define AUTOMERGEABLE_MERGED_FILE \ - "this file is changed in master\n" \ - "this file is automergeable\n" \ - "this file is automergeable\n" \ - "this file is automergeable\n" \ - "this file is automergeable\n" \ - "this file is automergeable\n" \ - "this file is automergeable\n" \ - "this file is automergeable\n" \ - "this file is changed in branch\n" - -struct checkout_index_entry { - uint16_t mode; - char oid_str[GIT_OID_HEXSZ+1]; - int stage; - char path[128]; -}; - -struct checkout_name_entry { - char ancestor[64]; - char ours[64]; - char theirs[64]; -}; - -void test_checkout_conflict__initialize(void) -{ - git_config *cfg; - - g_repo = cl_git_sandbox_init(TEST_REPO_PATH); - git_repository_index(&g_index, g_repo); - - cl_git_rewritefile( - TEST_REPO_PATH "/.gitattributes", - "* text eol=lf\n"); - - /* Ensure that the user's merge.conflictstyle doesn't interfere */ - cl_git_pass(git_repository_config(&cfg, g_repo)); - cl_git_pass(git_config_set_string(cfg, "merge.conflictstyle", "merge")); - git_config_free(cfg); -} - -void test_checkout_conflict__cleanup(void) -{ - git_index_free(g_index); - cl_git_sandbox_cleanup(); -} - -static void create_index(struct checkout_index_entry *entries, size_t entries_len) -{ - git_buf path = GIT_BUF_INIT; - size_t i; - - for (i = 0; i < entries_len; i++) { - git_buf_joinpath(&path, TEST_REPO_PATH, entries[i].path); - - if (entries[i].stage == 3 && (i == 0 || strcmp(entries[i-1].path, entries[i].path) != 0 || entries[i-1].stage != 2)) - p_unlink(git_buf_cstr(&path)); - - git_index_remove_bypath(g_index, entries[i].path); - } - - for (i = 0; i < entries_len; i++) { - git_index_entry entry; - - memset(&entry, 0x0, sizeof(git_index_entry)); - - entry.mode = entries[i].mode; - GIT_IDXENTRY_STAGE_SET(&entry, entries[i].stage); - git_oid_fromstr(&entry.id, entries[i].oid_str); - entry.path = entries[i].path; - - cl_git_pass(git_index_add(g_index, &entry)); - } - - git_buf_free(&path); -} - -static void create_index_names(struct checkout_name_entry *entries, size_t entries_len) -{ - size_t i; - - for (i = 0; i < entries_len; i++) { - cl_git_pass(git_index_name_add(g_index, - strlen(entries[i].ancestor) == 0 ? NULL : entries[i].ancestor, - strlen(entries[i].ours) == 0 ? NULL : entries[i].ours, - strlen(entries[i].theirs) == 0 ? NULL : entries[i].theirs)); - } -} - -static void create_conflicting_index(void) -{ - struct checkout_index_entry checkout_index_entries[] = { - { 0100644, CONFLICTING_ANCESTOR_OID, 1, "conflicting.txt" }, - { 0100644, CONFLICTING_OURS_OID, 2, "conflicting.txt" }, - { 0100644, CONFLICTING_THEIRS_OID, 3, "conflicting.txt" }, - }; - - create_index(checkout_index_entries, 3); - git_index_write(g_index); -} - -static void ensure_workdir_contents(const char *path, const char *contents) -{ - git_buf fullpath = GIT_BUF_INIT, data_buf = GIT_BUF_INIT; - - cl_git_pass( - git_buf_joinpath(&fullpath, git_repository_workdir(g_repo), path)); - - cl_git_pass(git_futils_readbuffer(&data_buf, git_buf_cstr(&fullpath))); - cl_assert(strcmp(git_buf_cstr(&data_buf), contents) == 0); - - git_buf_free(&fullpath); - git_buf_free(&data_buf); -} - -static void ensure_workdir_oid(const char *path, const char *oid_str) -{ - git_oid expected, actual; - - cl_git_pass(git_oid_fromstr(&expected, oid_str)); - cl_git_pass(git_repository_hashfile(&actual, g_repo, path, GIT_OBJ_BLOB, NULL)); - cl_assert_equal_oid(&expected, &actual); -} - -static void ensure_workdir_mode(const char *path, int mode) -{ -#ifdef GIT_WIN32 - GIT_UNUSED(path); - GIT_UNUSED(mode); -#else - git_buf fullpath = GIT_BUF_INIT; - struct stat st; - - cl_git_pass( - git_buf_joinpath(&fullpath, git_repository_workdir(g_repo), path)); - - cl_git_pass(p_stat(git_buf_cstr(&fullpath), &st)); - cl_assert_equal_i((mode & S_IRWXU), (st.st_mode & S_IRWXU)); - - git_buf_free(&fullpath); -#endif -} - -static void ensure_workdir(const char *path, int mode, const char *oid_str) -{ - ensure_workdir_mode(path, mode); - ensure_workdir_oid(path, oid_str); -} - -static void ensure_workdir_link(const char *path, const char *target) -{ -#ifdef GIT_WIN32 - ensure_workdir_contents(path, target); -#else - git_buf fullpath = GIT_BUF_INIT; - char actual[1024]; - struct stat st; - int len; - - cl_git_pass( - git_buf_joinpath(&fullpath, git_repository_workdir(g_repo), path)); - - cl_git_pass(p_lstat(git_buf_cstr(&fullpath), &st)); - cl_assert(S_ISLNK(st.st_mode)); - - cl_assert((len = p_readlink(git_buf_cstr(&fullpath), actual, 1024)) > 0); - actual[len] = '\0'; - cl_assert(strcmp(actual, target) == 0); - - git_buf_free(&fullpath); -#endif -} - -void test_checkout_conflict__ignored(void) -{ - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - - opts.checkout_strategy |= GIT_CHECKOUT_SKIP_UNMERGED; - - create_conflicting_index(); - cl_git_pass(p_unlink(TEST_REPO_PATH "/conflicting.txt")); - - cl_git_pass(git_checkout_index(g_repo, g_index, &opts)); - - cl_assert(!git_path_exists(TEST_REPO_PATH "/conflicting.txt")); -} - -void test_checkout_conflict__ours(void) -{ - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - - opts.checkout_strategy |= GIT_CHECKOUT_USE_OURS; - - create_conflicting_index(); - - cl_git_pass(git_checkout_index(g_repo, g_index, &opts)); - - ensure_workdir_contents("conflicting.txt", CONFLICTING_OURS_FILE); -} - -void test_checkout_conflict__theirs(void) -{ - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - - opts.checkout_strategy |= GIT_CHECKOUT_USE_THEIRS; - - create_conflicting_index(); - - cl_git_pass(git_checkout_index(g_repo, g_index, &opts)); - - ensure_workdir_contents("conflicting.txt", CONFLICTING_THEIRS_FILE); - -} - -void test_checkout_conflict__diff3(void) -{ - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - - create_conflicting_index(); - - cl_git_pass(git_checkout_index(g_repo, g_index, &opts)); - - ensure_workdir_contents("conflicting.txt", CONFLICTING_DIFF3_FILE); -} - -void test_checkout_conflict__automerge(void) -{ - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - - struct checkout_index_entry checkout_index_entries[] = { - { 0100644, AUTOMERGEABLE_ANCESTOR_OID, 1, "automergeable.txt" }, - { 0100644, AUTOMERGEABLE_OURS_OID, 2, "automergeable.txt" }, - { 0100644, AUTOMERGEABLE_THEIRS_OID, 3, "automergeable.txt" }, - }; - - create_index(checkout_index_entries, 3); - git_index_write(g_index); - - cl_git_pass(git_checkout_index(g_repo, g_index, &opts)); - - ensure_workdir_contents("automergeable.txt", AUTOMERGEABLE_MERGED_FILE); -} - -void test_checkout_conflict__directory_file(void) -{ - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - - struct checkout_index_entry checkout_index_entries[] = { - { 0100644, CONFLICTING_ANCESTOR_OID, 1, "df-1" }, - { 0100644, CONFLICTING_OURS_OID, 2, "df-1" }, - { 0100644, CONFLICTING_THEIRS_OID, 0, "df-1/file" }, - - { 0100644, CONFLICTING_ANCESTOR_OID, 1, "df-2" }, - { 0100644, CONFLICTING_THEIRS_OID, 3, "df-2" }, - { 0100644, CONFLICTING_OURS_OID, 0, "df-2/file" }, - - { 0100644, CONFLICTING_THEIRS_OID, 3, "df-3" }, - { 0100644, CONFLICTING_ANCESTOR_OID, 1, "df-3/file" }, - { 0100644, CONFLICTING_OURS_OID, 2, "df-3/file" }, - - { 0100644, CONFLICTING_OURS_OID, 2, "df-4" }, - { 0100644, CONFLICTING_ANCESTOR_OID, 1, "df-4/file" }, - { 0100644, CONFLICTING_THEIRS_OID, 3, "df-4/file" }, - }; - - opts.checkout_strategy |= GIT_CHECKOUT_SAFE; - - create_index(checkout_index_entries, 12); - git_index_write(g_index); - - cl_git_pass(git_checkout_index(g_repo, g_index, &opts)); - - ensure_workdir_oid("df-1/file", CONFLICTING_THEIRS_OID); - ensure_workdir_oid("df-1~ours", CONFLICTING_OURS_OID); - ensure_workdir_oid("df-2/file", CONFLICTING_OURS_OID); - ensure_workdir_oid("df-2~theirs", CONFLICTING_THEIRS_OID); - ensure_workdir_oid("df-3/file", CONFLICTING_OURS_OID); - ensure_workdir_oid("df-3~theirs", CONFLICTING_THEIRS_OID); - ensure_workdir_oid("df-4~ours", CONFLICTING_OURS_OID); - ensure_workdir_oid("df-4/file", CONFLICTING_THEIRS_OID); -} - -void test_checkout_conflict__directory_file_with_custom_labels(void) -{ - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - - struct checkout_index_entry checkout_index_entries[] = { - { 0100644, CONFLICTING_ANCESTOR_OID, 1, "df-1" }, - { 0100644, CONFLICTING_OURS_OID, 2, "df-1" }, - { 0100644, CONFLICTING_THEIRS_OID, 0, "df-1/file" }, - - { 0100644, CONFLICTING_ANCESTOR_OID, 1, "df-2" }, - { 0100644, CONFLICTING_THEIRS_OID, 3, "df-2" }, - { 0100644, CONFLICTING_OURS_OID, 0, "df-2/file" }, - - { 0100644, CONFLICTING_THEIRS_OID, 3, "df-3" }, - { 0100644, CONFLICTING_ANCESTOR_OID, 1, "df-3/file" }, - { 0100644, CONFLICTING_OURS_OID, 2, "df-3/file" }, - - { 0100644, CONFLICTING_OURS_OID, 2, "df-4" }, - { 0100644, CONFLICTING_ANCESTOR_OID, 1, "df-4/file" }, - { 0100644, CONFLICTING_THEIRS_OID, 3, "df-4/file" }, - }; - - opts.checkout_strategy |= GIT_CHECKOUT_SAFE; - opts.our_label = "HEAD"; - opts.their_label = "branch"; - - create_index(checkout_index_entries, 12); - git_index_write(g_index); - - cl_git_pass(git_checkout_index(g_repo, g_index, &opts)); - - ensure_workdir_oid("df-1/file", CONFLICTING_THEIRS_OID); - ensure_workdir_oid("df-1~HEAD", CONFLICTING_OURS_OID); - ensure_workdir_oid("df-2/file", CONFLICTING_OURS_OID); - ensure_workdir_oid("df-2~branch", CONFLICTING_THEIRS_OID); - ensure_workdir_oid("df-3/file", CONFLICTING_OURS_OID); - ensure_workdir_oid("df-3~branch", CONFLICTING_THEIRS_OID); - ensure_workdir_oid("df-4~HEAD", CONFLICTING_OURS_OID); - ensure_workdir_oid("df-4/file", CONFLICTING_THEIRS_OID); -} - -void test_checkout_conflict__link_file(void) -{ - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - - struct checkout_index_entry checkout_index_entries[] = { - { 0100644, CONFLICTING_ANCESTOR_OID, 1, "link-1" }, - { 0100644, CONFLICTING_OURS_OID, 2, "link-1" }, - { 0120000, LINK_THEIRS_OID, 3, "link-1" }, - - { 0100644, CONFLICTING_ANCESTOR_OID, 1, "link-2" }, - { 0120000, LINK_OURS_OID, 2, "link-2" }, - { 0100644, CONFLICTING_THEIRS_OID, 3, "link-2" }, - - { 0120000, LINK_ANCESTOR_OID, 1, "link-3" }, - { 0100644, CONFLICTING_OURS_OID, 2, "link-3" }, - { 0120000, LINK_THEIRS_OID, 3, "link-3" }, - - { 0120000, LINK_ANCESTOR_OID, 1, "link-4" }, - { 0120000, LINK_OURS_OID, 2, "link-4" }, - { 0100644, CONFLICTING_THEIRS_OID, 3, "link-4" }, - }; - - opts.checkout_strategy |= GIT_CHECKOUT_SAFE; - - create_index(checkout_index_entries, 12); - git_index_write(g_index); - - cl_git_pass(git_checkout_index(g_repo, g_index, &opts)); - - /* Typechange conflicts always keep the file in the workdir */ - ensure_workdir_oid("link-1", CONFLICTING_OURS_OID); - ensure_workdir_oid("link-2", CONFLICTING_THEIRS_OID); - ensure_workdir_oid("link-3", CONFLICTING_OURS_OID); - ensure_workdir_oid("link-4", CONFLICTING_THEIRS_OID); -} - -void test_checkout_conflict__links(void) -{ - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - - struct checkout_index_entry checkout_index_entries[] = { - { 0120000, LINK_ANCESTOR_OID, 1, "link-1" }, - { 0120000, LINK_OURS_OID, 2, "link-1" }, - { 0120000, LINK_THEIRS_OID, 3, "link-1" }, - - { 0120000, LINK_OURS_OID, 2, "link-2" }, - { 0120000, LINK_THEIRS_OID, 3, "link-2" }, - }; - - opts.checkout_strategy |= GIT_CHECKOUT_SAFE; - - create_index(checkout_index_entries, 5); - git_index_write(g_index); - - cl_git_pass(git_checkout_index(g_repo, g_index, &opts)); - - /* Conflicts with links always keep the ours side (even with -Xtheirs) */ - ensure_workdir_link("link-1", LINK_OURS_TARGET); - ensure_workdir_link("link-2", LINK_OURS_TARGET); -} - -void test_checkout_conflict__add_add(void) -{ - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - - struct checkout_index_entry checkout_index_entries[] = { - { 0100644, CONFLICTING_OURS_OID, 2, "conflicting.txt" }, - { 0100644, CONFLICTING_THEIRS_OID, 3, "conflicting.txt" }, - }; - - opts.checkout_strategy |= GIT_CHECKOUT_SAFE; - - create_index(checkout_index_entries, 2); - git_index_write(g_index); - - cl_git_pass(git_checkout_index(g_repo, g_index, &opts)); - - /* Add/add writes diff3 files */ - ensure_workdir_contents("conflicting.txt", CONFLICTING_DIFF3_FILE); -} - -void test_checkout_conflict__mode_change(void) -{ - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - - struct checkout_index_entry checkout_index_entries[] = { - { 0100644, CONFLICTING_ANCESTOR_OID, 1, "executable-1" }, - { 0100755, CONFLICTING_ANCESTOR_OID, 2, "executable-1" }, - { 0100644, CONFLICTING_THEIRS_OID, 3, "executable-1" }, - - { 0100644, CONFLICTING_ANCESTOR_OID, 1, "executable-2" }, - { 0100644, CONFLICTING_OURS_OID, 2, "executable-2" }, - { 0100755, CONFLICTING_ANCESTOR_OID, 3, "executable-2" }, - - { 0100755, CONFLICTING_ANCESTOR_OID, 1, "executable-3" }, - { 0100644, CONFLICTING_ANCESTOR_OID, 2, "executable-3" }, - { 0100755, CONFLICTING_THEIRS_OID, 3, "executable-3" }, - - { 0100755, CONFLICTING_ANCESTOR_OID, 1, "executable-4" }, - { 0100755, CONFLICTING_OURS_OID, 2, "executable-4" }, - { 0100644, CONFLICTING_ANCESTOR_OID, 3, "executable-4" }, - - { 0100644, CONFLICTING_ANCESTOR_OID, 1, "executable-5" }, - { 0100755, CONFLICTING_OURS_OID, 2, "executable-5" }, - { 0100644, CONFLICTING_THEIRS_OID, 3, "executable-5" }, - - { 0100755, CONFLICTING_ANCESTOR_OID, 1, "executable-6" }, - { 0100644, CONFLICTING_OURS_OID, 2, "executable-6" }, - { 0100755, CONFLICTING_THEIRS_OID, 3, "executable-6" }, - }; - - opts.checkout_strategy |= GIT_CHECKOUT_SAFE; - - create_index(checkout_index_entries, 18); - git_index_write(g_index); - - cl_git_pass(git_checkout_index(g_repo, g_index, &opts)); - - /* Keep the modified mode */ - ensure_workdir_oid("executable-1", CONFLICTING_THEIRS_OID); - ensure_workdir_mode("executable-1", 0100755); - - ensure_workdir_oid("executable-2", CONFLICTING_OURS_OID); - ensure_workdir_mode("executable-2", 0100755); - - ensure_workdir_oid("executable-3", CONFLICTING_THEIRS_OID); - ensure_workdir_mode("executable-3", 0100644); - - ensure_workdir_oid("executable-4", CONFLICTING_OURS_OID); - ensure_workdir_mode("executable-4", 0100644); - - ensure_workdir_contents("executable-5", CONFLICTING_DIFF3_FILE); - ensure_workdir_mode("executable-5", 0100755); - - ensure_workdir_contents("executable-6", CONFLICTING_DIFF3_FILE); - ensure_workdir_mode("executable-6", 0100644); -} - -void test_checkout_conflict__renames(void) -{ - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - - struct checkout_index_entry checkout_index_entries[] = { - { 0100644, "68c6c84b091926c7d90aa6a79b2bc3bb6adccd8e", 0, "0a-no-change.txt" }, - { 0100644, "f0ce2b8e4986084d9b308fb72709e414c23eb5e6", 0, "0b-duplicated-in-ours.txt" }, - { 0100644, "f0ce2b8e4986084d9b308fb72709e414c23eb5e6", 1, "0b-rewritten-in-ours.txt" }, - { 0100644, "e376fbdd06ebf021c92724da9f26f44212734e3e", 2, "0b-rewritten-in-ours.txt" }, - { 0100644, "b2d399ae15224e1d58066e3c8df70ce37de7a656", 3, "0b-rewritten-in-ours.txt" }, - { 0100644, "2f56120107d680129a5d9791b521cb1e73a2ed31", 0, "0c-duplicated-in-theirs.txt" }, - { 0100644, "2f56120107d680129a5d9791b521cb1e73a2ed31", 1, "0c-rewritten-in-theirs.txt" }, - { 0100644, "efc9121fdedaf08ba180b53ebfbcf71bd488ed09", 2, "0c-rewritten-in-theirs.txt" }, - { 0100644, "712ebba6669ea847d9829e4f1059d6c830c8b531", 3, "0c-rewritten-in-theirs.txt" }, - { 0100644, "0d872f8e871a30208305978ecbf9e66d864f1638", 0, "1a-newname-in-ours-edited-in-theirs.txt" }, - { 0100644, "d0d4594e16f2e19107e3fa7ea63e7aaaff305ffb", 0, "1a-newname-in-ours.txt" }, - { 0100644, "ed9523e62e453e50dd9be1606af19399b96e397a", 0, "1b-newname-in-theirs-edited-in-ours.txt" }, - { 0100644, "2b5f1f181ee3b58ea751f5dd5d8f9b445520a136", 0, "1b-newname-in-theirs.txt" }, - { 0100644, "178940b450f238a56c0d75b7955cb57b38191982", 0, "2-newname-in-both.txt" }, - { 0100644, "18cb316b1cefa0f8a6946f0e201a8e1a6f845ab9", 2, "3a-newname-in-ours-deleted-in-theirs.txt" }, - { 0100644, "18cb316b1cefa0f8a6946f0e201a8e1a6f845ab9", 1, "3a-renamed-in-ours-deleted-in-theirs.txt" }, - { 0100644, "36219b49367146cb2e6a1555b5a9ebd4d0328495", 3, "3b-newname-in-theirs-deleted-in-ours.txt" }, - { 0100644, "36219b49367146cb2e6a1555b5a9ebd4d0328495", 1, "3b-renamed-in-theirs-deleted-in-ours.txt" }, - { 0100644, "227792b52aaa0b238bea00ec7e509b02623f168c", 2, "4a-newname-in-ours-added-in-theirs.txt" }, - { 0100644, "8b5b53cb2aa9ceb1139f5312fcfa3cc3c5a47c9a", 3, "4a-newname-in-ours-added-in-theirs.txt" }, - { 0100644, "227792b52aaa0b238bea00ec7e509b02623f168c", 1, "4a-renamed-in-ours-added-in-theirs.txt" }, - { 0100644, "de872ee3618b894992e9d1e18ba2ebe256a112f9", 2, "4b-newname-in-theirs-added-in-ours.txt" }, - { 0100644, "98d52d07c0b0bbf2b46548f6aa521295c2cb55db", 3, "4b-newname-in-theirs-added-in-ours.txt" }, - { 0100644, "98d52d07c0b0bbf2b46548f6aa521295c2cb55db", 1, "4b-renamed-in-theirs-added-in-ours.txt" }, - { 0100644, "d3719a5ae8e4d92276b5313ce976f6ee5af2b436", 2, "5a-newname-in-ours-added-in-theirs.txt" }, - { 0100644, "98ba4205fcf31f5dd93c916d35fe3f3b3d0e6714", 3, "5a-newname-in-ours-added-in-theirs.txt" }, - { 0100644, "d3719a5ae8e4d92276b5313ce976f6ee5af2b436", 1, "5a-renamed-in-ours-added-in-theirs.txt" }, - { 0100644, "d3719a5ae8e4d92276b5313ce976f6ee5af2b436", 3, "5a-renamed-in-ours-added-in-theirs.txt" }, - { 0100644, "385c8a0f26ddf79e9041e15e17dc352ed2c4cced", 2, "5b-newname-in-theirs-added-in-ours.txt" }, - { 0100644, "63247125386de9ec90a27ad36169307bf8a11a38", 3, "5b-newname-in-theirs-added-in-ours.txt" }, - { 0100644, "63247125386de9ec90a27ad36169307bf8a11a38", 1, "5b-renamed-in-theirs-added-in-ours.txt" }, - { 0100644, "63247125386de9ec90a27ad36169307bf8a11a38", 2, "5b-renamed-in-theirs-added-in-ours.txt" }, - { 0100644, "d8fa77b6833082c1ea36b7828a582d4c43882450", 2, "6-both-renamed-1-to-2-ours.txt" }, - { 0100644, "d8fa77b6833082c1ea36b7828a582d4c43882450", 3, "6-both-renamed-1-to-2-theirs.txt" }, - { 0100644, "d8fa77b6833082c1ea36b7828a582d4c43882450", 1, "6-both-renamed-1-to-2.txt" }, - { 0100644, "b42712cfe99a1a500b2a51fe984e0b8a7702ba11", 1, "7-both-renamed-side-1.txt" }, - { 0100644, "b42712cfe99a1a500b2a51fe984e0b8a7702ba11", 3, "7-both-renamed-side-1.txt" }, - { 0100644, "b69fe837e4cecfd4c9a40cdca7c138468687df07", 1, "7-both-renamed-side-2.txt" }, - { 0100644, "b69fe837e4cecfd4c9a40cdca7c138468687df07", 2, "7-both-renamed-side-2.txt" }, - { 0100644, "b42712cfe99a1a500b2a51fe984e0b8a7702ba11", 2, "7-both-renamed.txt" }, - { 0100644, "b69fe837e4cecfd4c9a40cdca7c138468687df07", 3, "7-both-renamed.txt" } - }; - - struct checkout_name_entry checkout_name_entries[] = { - { - "3a-renamed-in-ours-deleted-in-theirs.txt", - "3a-newname-in-ours-deleted-in-theirs.txt", - "" - }, - - { - "3b-renamed-in-theirs-deleted-in-ours.txt", - "", - "3b-newname-in-theirs-deleted-in-ours.txt" - }, - - { - "4a-renamed-in-ours-added-in-theirs.txt", - "4a-newname-in-ours-added-in-theirs.txt", - "" - }, - - { - "4b-renamed-in-theirs-added-in-ours.txt", - "", - "4b-newname-in-theirs-added-in-ours.txt" - }, - - { - "5a-renamed-in-ours-added-in-theirs.txt", - "5a-newname-in-ours-added-in-theirs.txt", - "5a-renamed-in-ours-added-in-theirs.txt" - }, - - { - "5b-renamed-in-theirs-added-in-ours.txt", - "5b-renamed-in-theirs-added-in-ours.txt", - "5b-newname-in-theirs-added-in-ours.txt" - }, - - { - "6-both-renamed-1-to-2.txt", - "6-both-renamed-1-to-2-ours.txt", - "6-both-renamed-1-to-2-theirs.txt" - }, - - { - "7-both-renamed-side-1.txt", - "7-both-renamed.txt", - "7-both-renamed-side-1.txt" - }, - - { - "7-both-renamed-side-2.txt", - "7-both-renamed-side-2.txt", - "7-both-renamed.txt" - } - }; - - opts.checkout_strategy |= GIT_CHECKOUT_SAFE; - - create_index(checkout_index_entries, 41); - create_index_names(checkout_name_entries, 9); - git_index_write(g_index); - - cl_git_pass(git_checkout_index(g_repo, g_index, &opts)); - - ensure_workdir("0a-no-change.txt", - 0100644, "68c6c84b091926c7d90aa6a79b2bc3bb6adccd8e"); - - ensure_workdir("0b-duplicated-in-ours.txt", - 0100644, "f0ce2b8e4986084d9b308fb72709e414c23eb5e6"); - - ensure_workdir("0b-rewritten-in-ours.txt", - 0100644, "4c7e515d6d52d820496858f2f059ece69e99e2e3"); - - ensure_workdir("0c-duplicated-in-theirs.txt", - 0100644, "2f56120107d680129a5d9791b521cb1e73a2ed31"); - - ensure_workdir("0c-rewritten-in-theirs.txt", - 0100644, "4648d658682d1155c2a3db5b0c53305e26884ea5"); - - ensure_workdir("1a-newname-in-ours-edited-in-theirs.txt", - 0100644, "0d872f8e871a30208305978ecbf9e66d864f1638"); - - ensure_workdir("1a-newname-in-ours.txt", - 0100644, "d0d4594e16f2e19107e3fa7ea63e7aaaff305ffb"); - - ensure_workdir("1b-newname-in-theirs-edited-in-ours.txt", - 0100644, "ed9523e62e453e50dd9be1606af19399b96e397a"); - - ensure_workdir("1b-newname-in-theirs.txt", - 0100644, "2b5f1f181ee3b58ea751f5dd5d8f9b445520a136"); - - ensure_workdir("2-newname-in-both.txt", - 0100644, "178940b450f238a56c0d75b7955cb57b38191982"); - - ensure_workdir("3a-newname-in-ours-deleted-in-theirs.txt", - 0100644, "18cb316b1cefa0f8a6946f0e201a8e1a6f845ab9"); - - ensure_workdir("3b-newname-in-theirs-deleted-in-ours.txt", - 0100644, "36219b49367146cb2e6a1555b5a9ebd4d0328495"); - - ensure_workdir("4a-newname-in-ours-added-in-theirs.txt~ours", - 0100644, "227792b52aaa0b238bea00ec7e509b02623f168c"); - - ensure_workdir("4a-newname-in-ours-added-in-theirs.txt~theirs", - 0100644, "8b5b53cb2aa9ceb1139f5312fcfa3cc3c5a47c9a"); - - ensure_workdir("4b-newname-in-theirs-added-in-ours.txt~ours", - 0100644, "de872ee3618b894992e9d1e18ba2ebe256a112f9"); - - ensure_workdir("4b-newname-in-theirs-added-in-ours.txt~theirs", - 0100644, "98d52d07c0b0bbf2b46548f6aa521295c2cb55db"); - - ensure_workdir("5a-newname-in-ours-added-in-theirs.txt~ours", - 0100644, "d3719a5ae8e4d92276b5313ce976f6ee5af2b436"); - - ensure_workdir("5a-newname-in-ours-added-in-theirs.txt~theirs", - 0100644, "98ba4205fcf31f5dd93c916d35fe3f3b3d0e6714"); - - ensure_workdir("5b-newname-in-theirs-added-in-ours.txt~ours", - 0100644, "385c8a0f26ddf79e9041e15e17dc352ed2c4cced"); - - ensure_workdir("5b-newname-in-theirs-added-in-ours.txt~theirs", - 0100644, "63247125386de9ec90a27ad36169307bf8a11a38"); - - ensure_workdir("6-both-renamed-1-to-2-ours.txt", - 0100644, "d8fa77b6833082c1ea36b7828a582d4c43882450"); - - ensure_workdir("6-both-renamed-1-to-2-theirs.txt", - 0100644, "d8fa77b6833082c1ea36b7828a582d4c43882450"); - - ensure_workdir("7-both-renamed.txt~ours", - 0100644, "b42712cfe99a1a500b2a51fe984e0b8a7702ba11"); - - ensure_workdir("7-both-renamed.txt~theirs", - 0100644, "b69fe837e4cecfd4c9a40cdca7c138468687df07"); -} - -void test_checkout_conflict__rename_keep_ours(void) -{ - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - - struct checkout_index_entry checkout_index_entries[] = { - { 0100644, "68c6c84b091926c7d90aa6a79b2bc3bb6adccd8e", 0, "0a-no-change.txt" }, - { 0100644, "f0ce2b8e4986084d9b308fb72709e414c23eb5e6", 0, "0b-duplicated-in-ours.txt" }, - { 0100644, "f0ce2b8e4986084d9b308fb72709e414c23eb5e6", 1, "0b-rewritten-in-ours.txt" }, - { 0100644, "e376fbdd06ebf021c92724da9f26f44212734e3e", 2, "0b-rewritten-in-ours.txt" }, - { 0100644, "b2d399ae15224e1d58066e3c8df70ce37de7a656", 3, "0b-rewritten-in-ours.txt" }, - { 0100644, "2f56120107d680129a5d9791b521cb1e73a2ed31", 0, "0c-duplicated-in-theirs.txt" }, - { 0100644, "2f56120107d680129a5d9791b521cb1e73a2ed31", 1, "0c-rewritten-in-theirs.txt" }, - { 0100644, "efc9121fdedaf08ba180b53ebfbcf71bd488ed09", 2, "0c-rewritten-in-theirs.txt" }, - { 0100644, "712ebba6669ea847d9829e4f1059d6c830c8b531", 3, "0c-rewritten-in-theirs.txt" }, - { 0100644, "0d872f8e871a30208305978ecbf9e66d864f1638", 0, "1a-newname-in-ours-edited-in-theirs.txt" }, - { 0100644, "d0d4594e16f2e19107e3fa7ea63e7aaaff305ffb", 0, "1a-newname-in-ours.txt" }, - { 0100644, "ed9523e62e453e50dd9be1606af19399b96e397a", 0, "1b-newname-in-theirs-edited-in-ours.txt" }, - { 0100644, "2b5f1f181ee3b58ea751f5dd5d8f9b445520a136", 0, "1b-newname-in-theirs.txt" }, - { 0100644, "178940b450f238a56c0d75b7955cb57b38191982", 0, "2-newname-in-both.txt" }, - { 0100644, "18cb316b1cefa0f8a6946f0e201a8e1a6f845ab9", 2, "3a-newname-in-ours-deleted-in-theirs.txt" }, - { 0100644, "18cb316b1cefa0f8a6946f0e201a8e1a6f845ab9", 1, "3a-renamed-in-ours-deleted-in-theirs.txt" }, - { 0100644, "36219b49367146cb2e6a1555b5a9ebd4d0328495", 3, "3b-newname-in-theirs-deleted-in-ours.txt" }, - { 0100644, "36219b49367146cb2e6a1555b5a9ebd4d0328495", 1, "3b-renamed-in-theirs-deleted-in-ours.txt" }, - { 0100644, "227792b52aaa0b238bea00ec7e509b02623f168c", 2, "4a-newname-in-ours-added-in-theirs.txt" }, - { 0100644, "8b5b53cb2aa9ceb1139f5312fcfa3cc3c5a47c9a", 3, "4a-newname-in-ours-added-in-theirs.txt" }, - { 0100644, "227792b52aaa0b238bea00ec7e509b02623f168c", 1, "4a-renamed-in-ours-added-in-theirs.txt" }, - { 0100644, "de872ee3618b894992e9d1e18ba2ebe256a112f9", 2, "4b-newname-in-theirs-added-in-ours.txt" }, - { 0100644, "98d52d07c0b0bbf2b46548f6aa521295c2cb55db", 3, "4b-newname-in-theirs-added-in-ours.txt" }, - { 0100644, "98d52d07c0b0bbf2b46548f6aa521295c2cb55db", 1, "4b-renamed-in-theirs-added-in-ours.txt" }, - { 0100644, "d3719a5ae8e4d92276b5313ce976f6ee5af2b436", 2, "5a-newname-in-ours-added-in-theirs.txt" }, - { 0100644, "98ba4205fcf31f5dd93c916d35fe3f3b3d0e6714", 3, "5a-newname-in-ours-added-in-theirs.txt" }, - { 0100644, "d3719a5ae8e4d92276b5313ce976f6ee5af2b436", 1, "5a-renamed-in-ours-added-in-theirs.txt" }, - { 0100644, "d3719a5ae8e4d92276b5313ce976f6ee5af2b436", 3, "5a-renamed-in-ours-added-in-theirs.txt" }, - { 0100644, "385c8a0f26ddf79e9041e15e17dc352ed2c4cced", 2, "5b-newname-in-theirs-added-in-ours.txt" }, - { 0100644, "63247125386de9ec90a27ad36169307bf8a11a38", 3, "5b-newname-in-theirs-added-in-ours.txt" }, - { 0100644, "63247125386de9ec90a27ad36169307bf8a11a38", 1, "5b-renamed-in-theirs-added-in-ours.txt" }, - { 0100644, "63247125386de9ec90a27ad36169307bf8a11a38", 2, "5b-renamed-in-theirs-added-in-ours.txt" }, - { 0100644, "d8fa77b6833082c1ea36b7828a582d4c43882450", 2, "6-both-renamed-1-to-2-ours.txt" }, - { 0100644, "d8fa77b6833082c1ea36b7828a582d4c43882450", 3, "6-both-renamed-1-to-2-theirs.txt" }, - { 0100644, "d8fa77b6833082c1ea36b7828a582d4c43882450", 1, "6-both-renamed-1-to-2.txt" }, - { 0100644, "b42712cfe99a1a500b2a51fe984e0b8a7702ba11", 1, "7-both-renamed-side-1.txt" }, - { 0100644, "b42712cfe99a1a500b2a51fe984e0b8a7702ba11", 3, "7-both-renamed-side-1.txt" }, - { 0100644, "b69fe837e4cecfd4c9a40cdca7c138468687df07", 1, "7-both-renamed-side-2.txt" }, - { 0100644, "b69fe837e4cecfd4c9a40cdca7c138468687df07", 2, "7-both-renamed-side-2.txt" }, - { 0100644, "b42712cfe99a1a500b2a51fe984e0b8a7702ba11", 2, "7-both-renamed.txt" }, - { 0100644, "b69fe837e4cecfd4c9a40cdca7c138468687df07", 3, "7-both-renamed.txt" } - }; - - struct checkout_name_entry checkout_name_entries[] = { - { - "3a-renamed-in-ours-deleted-in-theirs.txt", - "3a-newname-in-ours-deleted-in-theirs.txt", - "" - }, - - { - "3b-renamed-in-theirs-deleted-in-ours.txt", - "", - "3b-newname-in-theirs-deleted-in-ours.txt" - }, - - { - "4a-renamed-in-ours-added-in-theirs.txt", - "4a-newname-in-ours-added-in-theirs.txt", - "" - }, - - { - "4b-renamed-in-theirs-added-in-ours.txt", - "", - "4b-newname-in-theirs-added-in-ours.txt" - }, - - { - "5a-renamed-in-ours-added-in-theirs.txt", - "5a-newname-in-ours-added-in-theirs.txt", - "5a-renamed-in-ours-added-in-theirs.txt" - }, - - { - "5b-renamed-in-theirs-added-in-ours.txt", - "5b-renamed-in-theirs-added-in-ours.txt", - "5b-newname-in-theirs-added-in-ours.txt" - }, - - { - "6-both-renamed-1-to-2.txt", - "6-both-renamed-1-to-2-ours.txt", - "6-both-renamed-1-to-2-theirs.txt" - }, - - { - "7-both-renamed-side-1.txt", - "7-both-renamed.txt", - "7-both-renamed-side-1.txt" - }, - - { - "7-both-renamed-side-2.txt", - "7-both-renamed-side-2.txt", - "7-both-renamed.txt" - } - }; - - opts.checkout_strategy |= GIT_CHECKOUT_SAFE | GIT_CHECKOUT_USE_OURS; - - create_index(checkout_index_entries, 41); - create_index_names(checkout_name_entries, 9); - git_index_write(g_index); - - cl_git_pass(git_checkout_index(g_repo, g_index, &opts)); - - ensure_workdir("0a-no-change.txt", - 0100644, "68c6c84b091926c7d90aa6a79b2bc3bb6adccd8e"); - - ensure_workdir("0b-duplicated-in-ours.txt", - 0100644, "f0ce2b8e4986084d9b308fb72709e414c23eb5e6"); - - ensure_workdir("0b-rewritten-in-ours.txt", - 0100644, "e376fbdd06ebf021c92724da9f26f44212734e3e"); - - ensure_workdir("0c-duplicated-in-theirs.txt", - 0100644, "2f56120107d680129a5d9791b521cb1e73a2ed31"); - - ensure_workdir("0c-rewritten-in-theirs.txt", - 0100644, "efc9121fdedaf08ba180b53ebfbcf71bd488ed09"); - - ensure_workdir("1a-newname-in-ours-edited-in-theirs.txt", - 0100644, "0d872f8e871a30208305978ecbf9e66d864f1638"); - - ensure_workdir("1a-newname-in-ours.txt", - 0100644, "d0d4594e16f2e19107e3fa7ea63e7aaaff305ffb"); - - ensure_workdir("1b-newname-in-theirs-edited-in-ours.txt", - 0100644, "ed9523e62e453e50dd9be1606af19399b96e397a"); - - ensure_workdir("1b-newname-in-theirs.txt", - 0100644, "2b5f1f181ee3b58ea751f5dd5d8f9b445520a136"); - - ensure_workdir("2-newname-in-both.txt", - 0100644, "178940b450f238a56c0d75b7955cb57b38191982"); - - ensure_workdir("3a-newname-in-ours-deleted-in-theirs.txt", - 0100644, "18cb316b1cefa0f8a6946f0e201a8e1a6f845ab9"); - - ensure_workdir("3b-newname-in-theirs-deleted-in-ours.txt", - 0100644, "36219b49367146cb2e6a1555b5a9ebd4d0328495"); - - ensure_workdir("4a-newname-in-ours-added-in-theirs.txt", - 0100644, "227792b52aaa0b238bea00ec7e509b02623f168c"); - - ensure_workdir("4b-newname-in-theirs-added-in-ours.txt", - 0100644, "de872ee3618b894992e9d1e18ba2ebe256a112f9"); - - ensure_workdir("5a-newname-in-ours-added-in-theirs.txt", - 0100644, "d3719a5ae8e4d92276b5313ce976f6ee5af2b436"); - - ensure_workdir("5b-newname-in-theirs-added-in-ours.txt", - 0100644, "385c8a0f26ddf79e9041e15e17dc352ed2c4cced"); - - ensure_workdir("6-both-renamed-1-to-2-ours.txt", - 0100644, "d8fa77b6833082c1ea36b7828a582d4c43882450"); - - ensure_workdir("7-both-renamed.txt", - 0100644, "b42712cfe99a1a500b2a51fe984e0b8a7702ba11"); -} - -void test_checkout_conflict__name_mangled_file_exists_in_workdir(void) -{ - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - - struct checkout_index_entry checkout_index_entries[] = { - { 0100644, "b42712cfe99a1a500b2a51fe984e0b8a7702ba11", 1, "test-one-side-one.txt" }, - { 0100644, "b42712cfe99a1a500b2a51fe984e0b8a7702ba11", 3, "test-one-side-one.txt" }, - { 0100644, "b69fe837e4cecfd4c9a40cdca7c138468687df07", 1, "test-one-side-two.txt" }, - { 0100644, "b69fe837e4cecfd4c9a40cdca7c138468687df07", 2, "test-one-side-two.txt" }, - { 0100644, "b42712cfe99a1a500b2a51fe984e0b8a7702ba11", 2, "test-one.txt" }, - { 0100644, "b69fe837e4cecfd4c9a40cdca7c138468687df07", 3, "test-one.txt" }, - - { 0100644, "b42712cfe99a1a500b2a51fe984e0b8a7702ba11", 1, "test-two-side-one.txt" }, - { 0100644, "b42712cfe99a1a500b2a51fe984e0b8a7702ba11", 3, "test-two-side-one.txt" }, - { 0100644, "b69fe837e4cecfd4c9a40cdca7c138468687df07", 1, "test-two-side-two.txt" }, - { 0100644, "b69fe837e4cecfd4c9a40cdca7c138468687df07", 2, "test-two-side-two.txt" }, - { 0100644, "b42712cfe99a1a500b2a51fe984e0b8a7702ba11", 2, "test-two.txt" }, - { 0100644, "b69fe837e4cecfd4c9a40cdca7c138468687df07", 3, "test-two.txt" }, - - { 0100644, "b42712cfe99a1a500b2a51fe984e0b8a7702ba11", 1, "test-three-side-one.txt" }, - { 0100644, "b42712cfe99a1a500b2a51fe984e0b8a7702ba11", 3, "test-three-side-one.txt" }, - { 0100644, "b69fe837e4cecfd4c9a40cdca7c138468687df07", 1, "test-three-side-two.txt" }, - { 0100644, "b69fe837e4cecfd4c9a40cdca7c138468687df07", 2, "test-three-side-two.txt" }, - { 0100644, "b42712cfe99a1a500b2a51fe984e0b8a7702ba11", 2, "test-three.txt" }, - { 0100644, "b69fe837e4cecfd4c9a40cdca7c138468687df07", 3, "test-three.txt" }, - - { 0100644, CONFLICTING_ANCESTOR_OID, 1, "directory_file-one" }, - { 0100644, CONFLICTING_OURS_OID, 2, "directory_file-one" }, - { 0100644, CONFLICTING_THEIRS_OID, 0, "directory_file-one/file" }, - - { 0100644, CONFLICTING_ANCESTOR_OID, 1, "directory_file-two" }, - { 0100644, CONFLICTING_OURS_OID, 0, "directory_file-two/file" }, - { 0100644, CONFLICTING_THEIRS_OID, 3, "directory_file-two" }, - }; - - struct checkout_name_entry checkout_name_entries[] = { - { - "test-one-side-one.txt", - "test-one.txt", - "test-one-side-one.txt" - }, - { - "test-one-side-two.txt", - "test-one-side-two.txt", - "test-one.txt" - }, - - { - "test-two-side-one.txt", - "test-two.txt", - "test-two-side-one.txt" - }, - { - "test-two-side-two.txt", - "test-two-side-two.txt", - "test-two.txt" - }, - - { - "test-three-side-one.txt", - "test-three.txt", - "test-three-side-one.txt" - }, - { - "test-three-side-two.txt", - "test-three-side-two.txt", - "test-three.txt" - } - }; - - opts.checkout_strategy |= GIT_CHECKOUT_SAFE; - - create_index(checkout_index_entries, 24); - create_index_names(checkout_name_entries, 6); - git_index_write(g_index); - - /* Add some files on disk that conflict with the names that would be chosen - * for the files written for each side. */ - - cl_git_rewritefile("merge-resolve/test-one.txt~ours", - "Expect index contents to be written to ~ours_0"); - cl_git_rewritefile("merge-resolve/test-one.txt~theirs", - "Expect index contents to be written to ~theirs_0"); - - cl_git_rewritefile("merge-resolve/test-two.txt~ours", - "Expect index contents to be written to ~ours_3"); - cl_git_rewritefile("merge-resolve/test-two.txt~theirs", - "Expect index contents to be written to ~theirs_3"); - cl_git_rewritefile("merge-resolve/test-two.txt~ours_0", - "Expect index contents to be written to ~ours_3"); - cl_git_rewritefile("merge-resolve/test-two.txt~theirs_0", - "Expect index contents to be written to ~theirs_3"); - cl_git_rewritefile("merge-resolve/test-two.txt~ours_1", - "Expect index contents to be written to ~ours_3"); - cl_git_rewritefile("merge-resolve/test-two.txt~theirs_1", - "Expect index contents to be written to ~theirs_3"); - cl_git_rewritefile("merge-resolve/test-two.txt~ours_2", - "Expect index contents to be written to ~ours_3"); - cl_git_rewritefile("merge-resolve/test-two.txt~theirs_2", - "Expect index contents to be written to ~theirs_3"); - - cl_git_rewritefile("merge-resolve/test-three.txt~Ours", - "Expect case insensitive filesystems to create ~ours_0"); - cl_git_rewritefile("merge-resolve/test-three.txt~THEIRS", - "Expect case insensitive filesystems to create ~theirs_0"); - - cl_git_rewritefile("merge-resolve/directory_file-one~ours", - "Index contents written to ~ours_0 in this D/F conflict"); - cl_git_rewritefile("merge-resolve/directory_file-two~theirs", - "Index contents written to ~theirs_0 in this D/F conflict"); - - cl_git_pass(git_checkout_index(g_repo, g_index, &opts)); - - ensure_workdir("test-one.txt~ours_0", - 0100644, "b42712cfe99a1a500b2a51fe984e0b8a7702ba11"); - ensure_workdir("test-one.txt~theirs_0", - 0100644, "b69fe837e4cecfd4c9a40cdca7c138468687df07"); - - ensure_workdir("test-two.txt~ours_3", - 0100644, "b42712cfe99a1a500b2a51fe984e0b8a7702ba11"); - ensure_workdir("test-two.txt~theirs_3", - 0100644, "b69fe837e4cecfd4c9a40cdca7c138468687df07"); - - /* Name is mangled on case insensitive only */ -#if defined(GIT_WIN32) || defined(__APPLE__) - ensure_workdir("test-three.txt~ours_0", - 0100644, "b42712cfe99a1a500b2a51fe984e0b8a7702ba11"); - ensure_workdir("test-three.txt~theirs_0", - 0100644, "b69fe837e4cecfd4c9a40cdca7c138468687df07"); -#else - ensure_workdir("test-three.txt~ours", - 0100644, "b42712cfe99a1a500b2a51fe984e0b8a7702ba11"); - ensure_workdir("test-three.txt~theirs", - 0100644, "b69fe837e4cecfd4c9a40cdca7c138468687df07"); -#endif - - ensure_workdir("directory_file-one~ours_0", 0100644, CONFLICTING_OURS_OID); - ensure_workdir("directory_file-two~theirs_0", 0100644, CONFLICTING_THEIRS_OID); -} - -void test_checkout_conflict__update_only(void) -{ - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - - struct checkout_index_entry checkout_index_entries[] = { - { 0100644, AUTOMERGEABLE_ANCESTOR_OID, 1, "automergeable.txt" }, - { 0100644, AUTOMERGEABLE_OURS_OID, 2, "automergeable.txt" }, - { 0100644, AUTOMERGEABLE_THEIRS_OID, 3, "automergeable.txt" }, - - { 0100644, CONFLICTING_ANCESTOR_OID, 1, "modify-delete" }, - { 0100644, CONFLICTING_THEIRS_OID, 3, "modify-delete" }, - - { 0100644, CONFLICTING_ANCESTOR_OID, 1, "directory_file-one" }, - { 0100644, CONFLICTING_OURS_OID, 2, "directory_file-one" }, - { 0100644, CONFLICTING_THEIRS_OID, 0, "directory_file-one/file" }, - - { 0100644, CONFLICTING_ANCESTOR_OID, 1, "directory_file-two" }, - { 0100644, CONFLICTING_OURS_OID, 0, "directory_file-two/file" }, - { 0100644, CONFLICTING_THEIRS_OID, 3, "directory_file-two" }, - }; - - opts.checkout_strategy |= GIT_CHECKOUT_UPDATE_ONLY; - - create_index(checkout_index_entries, 3); - git_index_write(g_index); - - cl_git_pass(p_mkdir("merge-resolve/directory_file-two", 0777)); - cl_git_rewritefile("merge-resolve/directory_file-two/file", CONFLICTING_OURS_FILE); - - cl_git_pass(git_checkout_index(g_repo, g_index, &opts)); - - ensure_workdir_contents("automergeable.txt", AUTOMERGEABLE_MERGED_FILE); - ensure_workdir("directory_file-two/file", 0100644, CONFLICTING_OURS_OID); - - cl_assert(!git_path_exists("merge-resolve/modify-delete")); - cl_assert(!git_path_exists("merge-resolve/test-one.txt")); - cl_assert(!git_path_exists("merge-resolve/test-one-side-one.txt")); - cl_assert(!git_path_exists("merge-resolve/test-one-side-two.txt")); - cl_assert(!git_path_exists("merge-resolve/test-one.txt~ours")); - cl_assert(!git_path_exists("merge-resolve/test-one.txt~theirs")); - cl_assert(!git_path_exists("merge-resolve/directory_file-one/file")); - cl_assert(!git_path_exists("merge-resolve/directory_file-one~ours")); - cl_assert(!git_path_exists("merge-resolve/directory_file-two~theirs")); -} - -void test_checkout_conflict__path_filters(void) -{ - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - char *paths[] = { "conflicting-1.txt", "conflicting-3.txt" }; - git_strarray patharray = {0}; - - struct checkout_index_entry checkout_index_entries[] = { - { 0100644, CONFLICTING_ANCESTOR_OID, 1, "conflicting-1.txt" }, - { 0100644, CONFLICTING_OURS_OID, 2, "conflicting-1.txt" }, - { 0100644, CONFLICTING_THEIRS_OID, 3, "conflicting-1.txt" }, - - { 0100644, CONFLICTING_ANCESTOR_OID, 1, "conflicting-2.txt" }, - { 0100644, CONFLICTING_OURS_OID, 2, "conflicting-2.txt" }, - { 0100644, CONFLICTING_THEIRS_OID, 3, "conflicting-2.txt" }, - - { 0100644, AUTOMERGEABLE_ANCESTOR_OID, 1, "conflicting-3.txt" }, - { 0100644, AUTOMERGEABLE_OURS_OID, 2, "conflicting-3.txt" }, - { 0100644, AUTOMERGEABLE_THEIRS_OID, 3, "conflicting-3.txt" }, - - { 0100644, AUTOMERGEABLE_ANCESTOR_OID, 1, "conflicting-4.txt" }, - { 0100644, AUTOMERGEABLE_OURS_OID, 2, "conflicting-4.txt" }, - { 0100644, AUTOMERGEABLE_THEIRS_OID, 3, "conflicting-4.txt" }, - }; - - patharray.count = 2; - patharray.strings = paths; - - opts.paths = patharray; - - create_index(checkout_index_entries, 12); - git_index_write(g_index); - - cl_git_pass(git_checkout_index(g_repo, g_index, &opts)); - - ensure_workdir_contents("conflicting-1.txt", CONFLICTING_DIFF3_FILE); - cl_assert(!git_path_exists("merge-resolve/conflicting-2.txt")); - ensure_workdir_contents("conflicting-3.txt", AUTOMERGEABLE_MERGED_FILE); - cl_assert(!git_path_exists("merge-resolve/conflicting-4.txt")); -} - -static void collect_progress( - const char *path, - size_t completed_steps, - size_t total_steps, - void *payload) -{ - git_vector *paths = payload; - - GIT_UNUSED(completed_steps); - GIT_UNUSED(total_steps); - - if (path == NULL) - return; - - git_vector_insert(paths, strdup(path)); -} - -void test_checkout_conflict__report_progress(void) -{ - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - git_vector paths = GIT_VECTOR_INIT; - char *path; - size_t i; - - struct checkout_index_entry checkout_index_entries[] = { - { 0100644, CONFLICTING_ANCESTOR_OID, 1, "conflicting-1.txt" }, - { 0100644, CONFLICTING_OURS_OID, 2, "conflicting-1.txt" }, - { 0100644, CONFLICTING_THEIRS_OID, 3, "conflicting-1.txt" }, - - { 0100644, CONFLICTING_ANCESTOR_OID, 1, "conflicting-2.txt" }, - { 0100644, CONFLICTING_OURS_OID, 2, "conflicting-2.txt" }, - { 0100644, CONFLICTING_THEIRS_OID, 3, "conflicting-2.txt" }, - - { 0100644, AUTOMERGEABLE_ANCESTOR_OID, 1, "conflicting-3.txt" }, - { 0100644, AUTOMERGEABLE_OURS_OID, 2, "conflicting-3.txt" }, - { 0100644, AUTOMERGEABLE_THEIRS_OID, 3, "conflicting-3.txt" }, - - { 0100644, AUTOMERGEABLE_ANCESTOR_OID, 1, "conflicting-4.txt" }, - { 0100644, AUTOMERGEABLE_OURS_OID, 2, "conflicting-4.txt" }, - { 0100644, AUTOMERGEABLE_THEIRS_OID, 3, "conflicting-4.txt" }, - }; - - opts.progress_cb = collect_progress; - opts.progress_payload = &paths; - - - create_index(checkout_index_entries, 12); - git_index_write(g_index); - - cl_git_pass(git_checkout_index(g_repo, g_index, &opts)); - - cl_assert_equal_i(4, git_vector_length(&paths)); - cl_assert_equal_s("conflicting-1.txt", git_vector_get(&paths, 0)); - cl_assert_equal_s("conflicting-2.txt", git_vector_get(&paths, 1)); - cl_assert_equal_s("conflicting-3.txt", git_vector_get(&paths, 2)); - cl_assert_equal_s("conflicting-4.txt", git_vector_get(&paths, 3)); - - git_vector_foreach(&paths, i, path) - git__free(path); - - git_vector_free(&paths); -} diff --git a/vendor/libgit2/tests/checkout/crlf.c b/vendor/libgit2/tests/checkout/crlf.c deleted file mode 100644 index d467eaadd..000000000 --- a/vendor/libgit2/tests/checkout/crlf.c +++ /dev/null @@ -1,464 +0,0 @@ -#include "clar_libgit2.h" -#include "checkout_helpers.h" -#include "../filter/crlf.h" -#include "fileops.h" - -#include "git2/checkout.h" -#include "repository.h" -#include "index.h" -#include "posix.h" - -static git_repository *g_repo; - -static const char *systype; -static git_buf expected_fixture = GIT_BUF_INIT; - -void test_checkout_crlf__initialize(void) -{ - g_repo = cl_git_sandbox_init("crlf"); - - if (GIT_EOL_NATIVE == GIT_EOL_CRLF) - systype = "windows"; - else - systype = "posix"; -} - -void test_checkout_crlf__cleanup(void) -{ - cl_git_sandbox_cleanup(); - - if (expected_fixture.size) { - cl_fixture_cleanup(expected_fixture.ptr); - git_buf_free(&expected_fixture); - } -} - -struct compare_data -{ - const char *dirname; - const char *autocrlf; - const char *attrs; -}; - -static int compare_file(void *payload, git_buf *actual_path) -{ - git_buf expected_path = GIT_BUF_INIT; - git_buf actual_contents = GIT_BUF_INIT; - git_buf expected_contents = GIT_BUF_INIT; - struct compare_data *cd = payload; - bool failed = true; - int cmp_git, cmp_gitattributes; - char *basename; - - basename = git_path_basename(actual_path->ptr); - cmp_git = strcmp(basename, ".git"); - cmp_gitattributes = strcmp(basename, ".gitattributes"); - - if (cmp_git == 0 || cmp_gitattributes == 0) { - failed = false; - goto done; - } - - cl_git_pass(git_buf_joinpath(&expected_path, cd->dirname, basename)); - - if (!git_path_isfile(expected_path.ptr) || - !git_path_isfile(actual_path->ptr)) - goto done; - - if (git_futils_readbuffer(&actual_contents, actual_path->ptr) < 0 || - git_futils_readbuffer(&expected_contents, expected_path.ptr) < 0) - goto done; - - if (actual_contents.size != expected_contents.size) - goto done; - - if (memcmp(actual_contents.ptr, expected_contents.ptr, expected_contents.size) != 0) - goto done; - - failed = false; - -done: - if (failed) { - git_buf details = GIT_BUF_INIT; - git_buf_printf(&details, "filename=%s, system=%s, autocrlf=%s, attrs={%s}", - git_path_basename(actual_path->ptr), systype, cd->autocrlf, cd->attrs); - clar__fail(__FILE__, __LINE__, - "checked out contents did not match expected", details.ptr, 0); - git_buf_free(&details); - } - - git__free(basename); - git_buf_free(&expected_contents); - git_buf_free(&actual_contents); - git_buf_free(&expected_path); - - return 0; -} - -static void test_checkout(const char *autocrlf, const char *attrs) -{ - git_buf attrbuf = GIT_BUF_INIT; - git_buf expected_dirname = GIT_BUF_INIT; - git_buf sandboxname = GIT_BUF_INIT; - git_buf reponame = GIT_BUF_INIT; - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - struct compare_data compare_data = { NULL, autocrlf, attrs }; - const char *c; - - git_buf_puts(&reponame, "crlf"); - - git_buf_puts(&sandboxname, "autocrlf_"); - git_buf_puts(&sandboxname, autocrlf); - - if (*attrs) { - git_buf_puts(&sandboxname, ","); - - for (c = attrs; *c; c++) { - if (*c == ' ') - git_buf_putc(&sandboxname, ','); - else if (*c == '=') - git_buf_putc(&sandboxname, '_'); - else - git_buf_putc(&sandboxname, *c); - } - - git_buf_printf(&attrbuf, "* %s\n", attrs); - cl_git_mkfile("crlf/.gitattributes", attrbuf.ptr); - } - - cl_repo_set_string(g_repo, "core.autocrlf", autocrlf); - - git_buf_joinpath(&expected_dirname, systype, sandboxname.ptr); - git_buf_joinpath(&expected_fixture, "crlf_data", expected_dirname.ptr); - cl_fixture_sandbox(expected_fixture.ptr); - - opts.checkout_strategy = GIT_CHECKOUT_FORCE; - git_checkout_head(g_repo, &opts); - - compare_data.dirname = sandboxname.ptr; - cl_git_pass(git_path_direach(&reponame, 0, compare_file, &compare_data)); - - cl_fixture_cleanup(expected_fixture.ptr); - git_buf_free(&expected_fixture); - - git_buf_free(&attrbuf); - git_buf_free(&expected_fixture); - git_buf_free(&expected_dirname); - git_buf_free(&sandboxname); - git_buf_free(&reponame); -} - -static void empty_workdir(const char *name) -{ - git_vector contents = GIT_VECTOR_INIT; - size_t i; - const char *fn; - - git_path_dirload(&contents, name, 0, 0); - git_vector_foreach(&contents, i, fn) { - char *basename = git_path_basename(fn); - int cmp = strncasecmp(basename, ".git", 4); - - git__free(basename); - - if (cmp == 0) - continue; - p_unlink(fn); - } - git_vector_free_deep(&contents); -} - -void test_checkout_crlf__matches_core_git(void) -{ - const char *autocrlf[] = { "true", "false", "input", NULL }; - const char *attrs[] = { "", "-crlf", "-text", "eol=crlf", "eol=lf", - "text", "text eol=crlf", "text eol=lf", - "text=auto", "text=auto eol=crlf", "text=auto eol=lf", - NULL }; - const char **a, **b; - - for (a = autocrlf; *a; a++) { - for (b = attrs; *b; b++) { - empty_workdir("crlf"); - test_checkout(*a, *b); - } - } -} - -void test_checkout_crlf__detect_crlf_autocrlf_false(void) -{ - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - opts.checkout_strategy = GIT_CHECKOUT_FORCE; - - cl_repo_set_bool(g_repo, "core.autocrlf", false); - - git_checkout_head(g_repo, &opts); - - check_file_contents("./crlf/all-lf", ALL_LF_TEXT_RAW); - check_file_contents("./crlf/all-crlf", ALL_CRLF_TEXT_RAW); -} - -void test_checkout_crlf__autocrlf_false_index_size_is_unfiltered_size(void) -{ - git_index *index; - const git_index_entry *entry; - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - opts.checkout_strategy = GIT_CHECKOUT_FORCE; - - cl_repo_set_bool(g_repo, "core.autocrlf", false); - - git_repository_index(&index, g_repo); - tick_index(index); - - git_checkout_head(g_repo, &opts); - - cl_assert((entry = git_index_get_bypath(index, "all-lf", 0)) != NULL); - cl_assert(entry->file_size == strlen(ALL_LF_TEXT_RAW)); - - cl_assert((entry = git_index_get_bypath(index, "all-crlf", 0)) != NULL); - cl_assert(entry->file_size == strlen(ALL_CRLF_TEXT_RAW)); - - git_index_free(index); -} - -void test_checkout_crlf__detect_crlf_autocrlf_true(void) -{ - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - opts.checkout_strategy = GIT_CHECKOUT_FORCE; - - cl_repo_set_bool(g_repo, "core.autocrlf", true); - - git_checkout_head(g_repo, &opts); - - check_file_contents("./crlf/all-lf", ALL_LF_TEXT_AS_CRLF); - check_file_contents("./crlf/all-crlf", ALL_CRLF_TEXT_RAW); -} - -void test_checkout_crlf__detect_crlf_autocrlf_true_utf8(void) -{ - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - opts.checkout_strategy = GIT_CHECKOUT_FORCE; - - cl_repo_set_bool(g_repo, "core.autocrlf", true); - - git_repository_set_head(g_repo, "refs/heads/master"); - git_checkout_head(g_repo, &opts); - - check_file_contents("./crlf/few-utf8-chars-lf", FEW_UTF8_CRLF_RAW); - check_file_contents("./crlf/many-utf8-chars-lf", MANY_UTF8_CRLF_RAW); - - check_file_contents("./crlf/few-utf8-chars-crlf", FEW_UTF8_CRLF_RAW); - check_file_contents("./crlf/many-utf8-chars-crlf", MANY_UTF8_CRLF_RAW); -} - -void test_checkout_crlf__autocrlf_true_index_size_is_filtered_size(void) -{ - git_index *index; - const git_index_entry *entry; - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - opts.checkout_strategy = GIT_CHECKOUT_FORCE; - - cl_repo_set_bool(g_repo, "core.autocrlf", true); - - git_repository_index(&index, g_repo); - tick_index(index); - - git_checkout_head(g_repo, &opts); - - cl_assert((entry = git_index_get_bypath(index, "all-lf", 0)) != NULL); - - cl_assert_equal_sz(strlen(ALL_LF_TEXT_AS_CRLF), entry->file_size); - - cl_assert((entry = git_index_get_bypath(index, "all-crlf", 0)) != NULL); - cl_assert_equal_sz(strlen(ALL_CRLF_TEXT_RAW), entry->file_size); - - git_index_free(index); -} - -void test_checkout_crlf__with_ident(void) -{ - git_index *index; - const git_index_entry *entry; - git_blob *blob; - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - opts.checkout_strategy = GIT_CHECKOUT_FORCE; - - cl_git_mkfile("crlf/.gitattributes", - "*.txt text\n*.bin binary\n" - "*.crlf text eol=crlf\n" - "*.lf text eol=lf\n" - "*.ident text ident\n" - "*.identcrlf ident text eol=crlf\n" - "*.identlf ident text eol=lf\n"); - - cl_repo_set_bool(g_repo, "core.autocrlf", true); - - /* add files with $Id$ */ - - cl_git_mkfile("crlf/lf.ident", ALL_LF_TEXT_RAW "\n$Id: initial content$\n"); - cl_git_mkfile("crlf/crlf.ident", ALL_CRLF_TEXT_RAW "\r\n$Id$\r\n\r\n"); - cl_git_mkfile("crlf/more1.identlf", "$Id$\n" MORE_LF_TEXT_RAW); - cl_git_mkfile("crlf/more2.identcrlf", "\r\n$Id: $\r\n" MORE_CRLF_TEXT_RAW); - - cl_git_pass(git_repository_index(&index, g_repo)); - cl_git_pass(git_index_add_bypath(index, "lf.ident")); - cl_git_pass(git_index_add_bypath(index, "crlf.ident")); - cl_git_pass(git_index_add_bypath(index, "more1.identlf")); - cl_git_pass(git_index_add_bypath(index, "more2.identcrlf")); - cl_repo_commit_from_index(NULL, g_repo, NULL, 0, "Some ident files\n"); - - git_checkout_head(g_repo, &opts); - - /* check that blobs have $Id$ */ - - cl_assert((entry = git_index_get_bypath(index, "lf.ident", 0))); - cl_git_pass(git_blob_lookup(&blob, g_repo, &entry->id)); - cl_assert_equal_s( - ALL_LF_TEXT_RAW "\n$Id$\n", git_blob_rawcontent(blob)); - git_blob_free(blob); - - cl_assert((entry = git_index_get_bypath(index, "more2.identcrlf", 0))); - cl_git_pass(git_blob_lookup(&blob, g_repo, &entry->id)); - cl_assert_equal_s( - "\n$Id$\n" MORE_CRLF_TEXT_AS_LF, git_blob_rawcontent(blob)); - git_blob_free(blob); - - /* check that filesystem is initially untouched - matching core Git */ - - cl_assert_equal_file( - ALL_LF_TEXT_RAW "\n$Id: initial content$\n", 0, "crlf/lf.ident"); - - /* check that forced checkout rewrites correctly */ - - p_unlink("crlf/lf.ident"); - p_unlink("crlf/crlf.ident"); - p_unlink("crlf/more1.identlf"); - p_unlink("crlf/more2.identcrlf"); - - git_checkout_head(g_repo, &opts); - - cl_assert_equal_file( - ALL_LF_TEXT_AS_CRLF - "\r\n$Id: fcf6d4d9c212dc66563b1171b1cd99953c756467 $\r\n", - 0, "crlf/lf.ident"); - cl_assert_equal_file( - ALL_CRLF_TEXT_RAW - "\r\n$Id: f2c66ad9b2b5a734d9bf00d5000cc10a62b8a857 $\r\n\r\n", - 0, "crlf/crlf.ident"); - - cl_assert_equal_file( - "$Id: f7830382dac1f1583422be5530fdfbd26289431b $\n" - MORE_LF_TEXT_AS_LF, 0, "crlf/more1.identlf"); - - cl_assert_equal_file( - "\r\n$Id: 74677a68413012ce8d7e7cfc3f12603df3a3eac4 $\r\n" - MORE_CRLF_TEXT_AS_CRLF, 0, "crlf/more2.identcrlf"); - - git_index_free(index); -} - -void test_checkout_crlf__autocrlf_false_no_attrs(void) -{ - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - opts.checkout_strategy = GIT_CHECKOUT_FORCE; - - cl_repo_set_bool(g_repo, "core.autocrlf", false); - - git_checkout_head(g_repo, &opts); - - check_file_contents("./crlf/all-lf", ALL_LF_TEXT_RAW); - check_file_contents("./crlf/all-crlf", ALL_CRLF_TEXT_RAW); -} - -void test_checkout_crlf__autocrlf_true_no_attrs(void) -{ - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - opts.checkout_strategy = GIT_CHECKOUT_FORCE; - - cl_repo_set_bool(g_repo, "core.autocrlf", true); - - git_checkout_head(g_repo, &opts); - - check_file_contents("./crlf/all-lf", ALL_LF_TEXT_AS_CRLF); - check_file_contents("./crlf/all-crlf", ALL_CRLF_TEXT_AS_CRLF); -} - -void test_checkout_crlf__autocrlf_input_no_attrs(void) -{ - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - opts.checkout_strategy = GIT_CHECKOUT_FORCE; - - cl_repo_set_string(g_repo, "core.autocrlf", "input"); - - git_checkout_head(g_repo, &opts); - - check_file_contents("./crlf/all-lf", ALL_LF_TEXT_RAW); - check_file_contents("./crlf/all-crlf", ALL_CRLF_TEXT_RAW); -} - -void test_checkout_crlf__autocrlf_false_text_auto_attr(void) -{ - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - opts.checkout_strategy = GIT_CHECKOUT_FORCE; - - cl_git_mkfile("./crlf/.gitattributes", "* text=auto\n"); - - cl_repo_set_bool(g_repo, "core.autocrlf", false); - - git_checkout_head(g_repo, &opts); - - if (GIT_EOL_NATIVE == GIT_EOL_CRLF) { - check_file_contents("./crlf/all-lf", ALL_LF_TEXT_AS_CRLF); - check_file_contents("./crlf/all-crlf", ALL_CRLF_TEXT_AS_CRLF); - } else { - check_file_contents("./crlf/all-lf", ALL_LF_TEXT_RAW); - check_file_contents("./crlf/all-crlf", ALL_CRLF_TEXT_RAW); - } -} - -void test_checkout_crlf__autocrlf_true_text_auto_attr(void) -{ - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - opts.checkout_strategy = GIT_CHECKOUT_FORCE; - - cl_git_mkfile("./crlf/.gitattributes", "* text=auto\n"); - - cl_repo_set_bool(g_repo, "core.autocrlf", true); - - git_checkout_head(g_repo, &opts); - - check_file_contents("./crlf/all-lf", ALL_LF_TEXT_AS_CRLF); - check_file_contents("./crlf/all-crlf", ALL_CRLF_TEXT_AS_CRLF); -} - -void test_checkout_crlf__autocrlf_input_text_auto_attr(void) -{ - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - opts.checkout_strategy = GIT_CHECKOUT_FORCE; - - cl_git_mkfile("./crlf/.gitattributes", "* text=auto\n"); - - cl_repo_set_string(g_repo, "core.autocrlf", "input"); - - git_checkout_head(g_repo, &opts); - - check_file_contents("./crlf/all-lf", ALL_LF_TEXT_RAW); - check_file_contents("./crlf/all-crlf", ALL_CRLF_TEXT_RAW); -} - -void test_checkout_crlf__can_write_empty_file(void) -{ - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - opts.checkout_strategy = GIT_CHECKOUT_FORCE; - - cl_repo_set_bool(g_repo, "core.autocrlf", true); - - git_repository_set_head(g_repo, "refs/heads/empty-files"); - git_checkout_head(g_repo, &opts); - - check_file_contents("./crlf/test1.txt", ""); - - check_file_contents("./crlf/test2.txt", "test2.txt's content\r\n"); - - check_file_contents("./crlf/test3.txt", ""); -} diff --git a/vendor/libgit2/tests/checkout/head.c b/vendor/libgit2/tests/checkout/head.c deleted file mode 100644 index 07cc1d209..000000000 --- a/vendor/libgit2/tests/checkout/head.c +++ /dev/null @@ -1,62 +0,0 @@ -#include "clar_libgit2.h" -#include "refs.h" -#include "repo/repo_helpers.h" -#include "path.h" -#include "fileops.h" - -static git_repository *g_repo; - -void test_checkout_head__initialize(void) -{ - g_repo = cl_git_sandbox_init("testrepo"); -} - -void test_checkout_head__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -void test_checkout_head__unborn_head_returns_GIT_EUNBORNBRANCH(void) -{ - make_head_unborn(g_repo, NON_EXISTING_HEAD); - - cl_assert_equal_i(GIT_EUNBORNBRANCH, git_checkout_head(g_repo, NULL)); -} - -void test_checkout_head__with_index_only_tree(void) -{ - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - git_index *index; - - /* let's start by getting things into a known state */ - - opts.checkout_strategy = GIT_CHECKOUT_FORCE; - cl_git_pass(git_checkout_head(g_repo, &opts)); - - /* now let's stage some new stuff including a new directory */ - - cl_git_pass(git_repository_index(&index, g_repo)); - - p_mkdir("testrepo/newdir", 0777); - cl_git_mkfile("testrepo/newdir/newfile.txt", "new file\n"); - - cl_git_pass(git_index_add_bypath(index, "newdir/newfile.txt")); - cl_git_pass(git_index_write(index)); - - cl_assert(git_path_isfile("testrepo/newdir/newfile.txt")); - cl_assert(git_index_get_bypath(index, "newdir/newfile.txt", 0) != NULL); - - git_index_free(index); - - /* okay, so now we have staged this new file; let's see if we can remove */ - - opts.checkout_strategy = GIT_CHECKOUT_FORCE | GIT_CHECKOUT_REMOVE_UNTRACKED; - cl_git_pass(git_checkout_head(g_repo, &opts)); - - cl_git_pass(git_repository_index(&index, g_repo)); - - cl_assert(!git_path_isfile("testrepo/newdir/newfile.txt")); - cl_assert(git_index_get_bypath(index, "newdir/newfile.txt", 0) == NULL); - - git_index_free(index); -} diff --git a/vendor/libgit2/tests/checkout/icase.c b/vendor/libgit2/tests/checkout/icase.c deleted file mode 100644 index 55ab3ab24..000000000 --- a/vendor/libgit2/tests/checkout/icase.c +++ /dev/null @@ -1,303 +0,0 @@ -#include "clar_libgit2.h" - -#include "git2/checkout.h" -#include "refs.h" -#include "path.h" - -#ifdef GIT_WIN32 -# include -#else -# include -#endif - -static git_repository *repo; -static git_object *obj; -static git_checkout_options checkout_opts; - -void test_checkout_icase__initialize(void) -{ - git_oid id; - git_config *cfg; - int icase = 0; - - repo = cl_git_sandbox_init("testrepo"); - - cl_git_pass(git_repository_config_snapshot(&cfg, repo)); - git_config_get_bool(&icase, cfg, "core.ignorecase"); - git_config_free(cfg); - - if (!icase) - cl_skip(); - - cl_git_pass(git_reference_name_to_id(&id, repo, "refs/heads/dir")); - cl_git_pass(git_object_lookup(&obj, repo, &id, GIT_OBJ_ANY)); - - git_checkout_init_options(&checkout_opts, GIT_CHECKOUT_OPTIONS_VERSION); - checkout_opts.checkout_strategy = GIT_CHECKOUT_NONE; -} - -void test_checkout_icase__cleanup(void) -{ - git_object_free(obj); - cl_git_sandbox_cleanup(); -} - -static char *get_filename(const char *in) -{ -#ifdef GIT_WIN32 - HANDLE fh; - HMODULE kerneldll; - char *filename; - - typedef DWORD (__stdcall *getfinalpathname)(HANDLE, LPSTR, DWORD, DWORD); - getfinalpathname getfinalpathfn; - - cl_assert(filename = malloc(MAX_PATH)); - cl_assert(kerneldll = LoadLibrary("kernel32.dll")); - cl_assert(getfinalpathfn = (getfinalpathname)GetProcAddress(kerneldll, "GetFinalPathNameByHandleA")); - - cl_assert(fh = CreateFileA(in, FILE_READ_ATTRIBUTES | STANDARD_RIGHTS_READ, FILE_SHARE_READ, - NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL)); - - cl_win32_pass(getfinalpathfn(fh, filename, MAX_PATH, VOLUME_NAME_DOS)); - - CloseHandle(fh); - - git_path_mkposix(filename); - - return filename; -#else - char *search_dirname, *search_filename, *filename = NULL; - git_buf out = GIT_BUF_INIT; - DIR *dir; - struct dirent *de; - - cl_assert(search_dirname = git_path_dirname(in)); - cl_assert(search_filename = git_path_basename(in)); - - cl_assert(dir = opendir(search_dirname)); - - while ((de = readdir(dir))) { - if (strcasecmp(de->d_name, search_filename) == 0) { - git_buf_join(&out, '/', search_dirname, de->d_name); - filename = git_buf_detach(&out); - break; - } - } - - closedir(dir); - - git__free(search_dirname); - git__free(search_filename); - git_buf_free(&out); - - return filename; -#endif -} - -static void assert_name_is(const char *expected) -{ - char *actual; - size_t actual_len, expected_len, start; - - cl_assert(actual = get_filename(expected)); - - expected_len = strlen(expected); - actual_len = strlen(actual); - cl_assert(actual_len >= expected_len); - - start = actual_len - expected_len; - cl_assert_equal_s(expected, actual + start); - - if (start) - cl_assert_equal_strn("/", actual + (start - 1), 1); - - free(actual); -} - -void test_checkout_icase__refuses_to_overwrite_files_for_files(void) -{ - checkout_opts.checkout_strategy = GIT_CHECKOUT_SAFE|GIT_CHECKOUT_RECREATE_MISSING; - - cl_git_write2file("testrepo/BRANCH_FILE.txt", "neue file\n", 10, \ - O_WRONLY | O_CREAT | O_TRUNC, 0644); - - cl_git_fail(git_checkout_tree(repo, obj, &checkout_opts)); - assert_name_is("testrepo/BRANCH_FILE.txt"); -} - -void test_checkout_icase__overwrites_files_for_files_when_forced(void) -{ - checkout_opts.checkout_strategy = GIT_CHECKOUT_FORCE; - - cl_git_write2file("testrepo/NEW.txt", "neue file\n", 10, \ - O_WRONLY | O_CREAT | O_TRUNC, 0644); - - cl_git_pass(git_checkout_tree(repo, obj, &checkout_opts)); - assert_name_is("testrepo/new.txt"); -} - -void test_checkout_icase__refuses_to_overwrite_links_for_files(void) -{ - checkout_opts.checkout_strategy = GIT_CHECKOUT_SAFE|GIT_CHECKOUT_RECREATE_MISSING; - - cl_must_pass(p_symlink("../tmp", "testrepo/BRANCH_FILE.txt")); - - cl_git_fail(git_checkout_tree(repo, obj, &checkout_opts)); - - cl_assert(!git_path_exists("tmp")); - assert_name_is("testrepo/BRANCH_FILE.txt"); -} - -void test_checkout_icase__overwrites_links_for_files_when_forced(void) -{ - checkout_opts.checkout_strategy = GIT_CHECKOUT_FORCE; - - cl_must_pass(p_symlink("../tmp", "testrepo/NEW.txt")); - - cl_git_pass(git_checkout_tree(repo, obj, &checkout_opts)); - - cl_assert(!git_path_exists("tmp")); - assert_name_is("testrepo/new.txt"); -} - -void test_checkout_icase__overwrites_empty_folders_for_files(void) -{ - checkout_opts.checkout_strategy = GIT_CHECKOUT_SAFE|GIT_CHECKOUT_RECREATE_MISSING; - - cl_must_pass(p_mkdir("testrepo/NEW.txt", 0777)); - - cl_git_pass(git_checkout_tree(repo, obj, &checkout_opts)); - - assert_name_is("testrepo/new.txt"); - cl_assert(!git_path_isdir("testrepo/new.txt")); -} - -void test_checkout_icase__refuses_to_overwrite_populated_folders_for_files(void) -{ - checkout_opts.checkout_strategy = GIT_CHECKOUT_SAFE|GIT_CHECKOUT_RECREATE_MISSING; - - cl_must_pass(p_mkdir("testrepo/BRANCH_FILE.txt", 0777)); - cl_git_write2file("testrepo/BRANCH_FILE.txt/foobar", "neue file\n", 10, \ - O_WRONLY | O_CREAT | O_TRUNC, 0644); - - cl_git_fail(git_checkout_tree(repo, obj, &checkout_opts)); - - assert_name_is("testrepo/BRANCH_FILE.txt"); - cl_assert(git_path_isdir("testrepo/BRANCH_FILE.txt")); -} - -void test_checkout_icase__overwrites_folders_for_files_when_forced(void) -{ - checkout_opts.checkout_strategy = GIT_CHECKOUT_FORCE; - - cl_must_pass(p_mkdir("testrepo/NEW.txt", 0777)); - cl_git_write2file("testrepo/NEW.txt/foobar", "neue file\n", 10, \ - O_WRONLY | O_CREAT | O_TRUNC, 0644); - - cl_git_pass(git_checkout_tree(repo, obj, &checkout_opts)); - - assert_name_is("testrepo/new.txt"); - cl_assert(!git_path_isdir("testrepo/new.txt")); -} - -void test_checkout_icase__refuses_to_overwrite_files_for_folders(void) -{ - checkout_opts.checkout_strategy = GIT_CHECKOUT_SAFE|GIT_CHECKOUT_RECREATE_MISSING; - - cl_git_write2file("testrepo/A", "neue file\n", 10, \ - O_WRONLY | O_CREAT | O_TRUNC, 0644); - - cl_git_fail(git_checkout_tree(repo, obj, &checkout_opts)); - assert_name_is("testrepo/A"); - cl_assert(!git_path_isdir("testrepo/A")); -} - -void test_checkout_icase__overwrites_files_for_folders_when_forced(void) -{ - checkout_opts.checkout_strategy = GIT_CHECKOUT_FORCE; - - cl_git_write2file("testrepo/A", "neue file\n", 10, \ - O_WRONLY | O_CREAT | O_TRUNC, 0644); - - cl_git_pass(git_checkout_tree(repo, obj, &checkout_opts)); - assert_name_is("testrepo/a"); - cl_assert(git_path_isdir("testrepo/a")); -} - -void test_checkout_icase__refuses_to_overwrite_links_for_folders(void) -{ - checkout_opts.checkout_strategy = GIT_CHECKOUT_SAFE|GIT_CHECKOUT_RECREATE_MISSING; - - cl_must_pass(p_symlink("..", "testrepo/A")); - - cl_git_fail(git_checkout_tree(repo, obj, &checkout_opts)); - - cl_assert(!git_path_exists("b.txt")); - assert_name_is("testrepo/A"); -} - -void test_checkout_icase__overwrites_links_for_folders_when_forced(void) -{ - checkout_opts.checkout_strategy = GIT_CHECKOUT_FORCE; - - cl_must_pass(p_symlink("..", "testrepo/A")); - - cl_git_pass(git_checkout_tree(repo, obj, &checkout_opts)); - - cl_assert(!git_path_exists("b.txt")); - assert_name_is("testrepo/a"); -} - -void test_checkout_icase__ignores_unstaged_casechange(void) -{ - git_reference *orig_ref, *br2_ref; - git_commit *orig, *br2; - git_checkout_options checkout_opts = GIT_CHECKOUT_OPTIONS_INIT; - - checkout_opts.checkout_strategy = GIT_CHECKOUT_SAFE; - - cl_git_pass(git_reference_lookup_resolved(&orig_ref, repo, "HEAD", 100)); - cl_git_pass(git_commit_lookup(&orig, repo, git_reference_target(orig_ref))); - cl_git_pass(git_reset(repo, (git_object *)orig, GIT_RESET_HARD, NULL)); - - cl_rename("testrepo/branch_file.txt", "testrepo/Branch_File.txt"); - - cl_git_pass(git_reference_lookup_resolved(&br2_ref, repo, "refs/heads/br2", 100)); - cl_git_pass(git_commit_lookup(&br2, repo, git_reference_target(br2_ref))); - - cl_git_pass(git_checkout_tree(repo, (const git_object *)br2, &checkout_opts)); - - git_commit_free(orig); - git_commit_free(br2); - git_reference_free(orig_ref); - git_reference_free(br2_ref); -} - -void test_checkout_icase__conflicts_with_casechanged_subtrees(void) -{ - git_reference *orig_ref; - git_object *orig, *subtrees; - git_oid oid; - git_checkout_options checkout_opts = GIT_CHECKOUT_OPTIONS_INIT; - - checkout_opts.checkout_strategy = GIT_CHECKOUT_SAFE; - - cl_git_pass(git_reference_lookup_resolved(&orig_ref, repo, "HEAD", 100)); - cl_git_pass(git_object_lookup(&orig, repo, git_reference_target(orig_ref), GIT_OBJ_COMMIT)); - cl_git_pass(git_reset(repo, (git_object *)orig, GIT_RESET_HARD, NULL)); - - cl_must_pass(p_mkdir("testrepo/AB", 0777)); - cl_must_pass(p_mkdir("testrepo/AB/C", 0777)); - cl_git_write2file("testrepo/AB/C/3.txt", "Foobar!\n", 8, O_RDWR|O_CREAT, 0666); - - cl_git_pass(git_reference_name_to_id(&oid, repo, "refs/heads/subtrees")); - cl_git_pass(git_object_lookup(&subtrees, repo, &oid, GIT_OBJ_ANY)); - - cl_git_fail(git_checkout_tree(repo, subtrees, &checkout_opts)); - - git_object_free(orig); - git_object_free(subtrees); - git_reference_free(orig_ref); -} - diff --git a/vendor/libgit2/tests/checkout/index.c b/vendor/libgit2/tests/checkout/index.c deleted file mode 100644 index 8af3e5684..000000000 --- a/vendor/libgit2/tests/checkout/index.c +++ /dev/null @@ -1,774 +0,0 @@ -#include "clar_libgit2.h" -#include "checkout_helpers.h" - -#include "git2/checkout.h" -#include "fileops.h" -#include "repository.h" -#include "remote.h" - -static git_repository *g_repo; - -void test_checkout_index__initialize(void) -{ - git_tree *tree; - - g_repo = cl_git_sandbox_init("testrepo"); - - cl_git_pass(git_repository_head_tree(&tree, g_repo)); - - reset_index_to_treeish((git_object *)tree); - git_tree_free(tree); - - cl_git_rewritefile( - "./testrepo/.gitattributes", - "* text eol=lf\n"); -} - -void test_checkout_index__cleanup(void) -{ - cl_git_sandbox_cleanup(); - - /* try to remove alternative dir */ - if (git_path_isdir("alternative")) - git_futils_rmdir_r("alternative", NULL, GIT_RMDIR_REMOVE_FILES); -} - -void test_checkout_index__cannot_checkout_a_bare_repository(void) -{ - test_checkout_index__cleanup(); - - g_repo = cl_git_sandbox_init("testrepo.git"); - - cl_git_fail(git_checkout_index(g_repo, NULL, NULL)); -} - -void test_checkout_index__can_create_missing_files(void) -{ - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - - cl_assert_equal_i(false, git_path_isfile("./testrepo/README")); - cl_assert_equal_i(false, git_path_isfile("./testrepo/branch_file.txt")); - cl_assert_equal_i(false, git_path_isfile("./testrepo/new.txt")); - - opts.checkout_strategy = GIT_CHECKOUT_SAFE | GIT_CHECKOUT_RECREATE_MISSING; - - cl_git_pass(git_checkout_index(g_repo, NULL, &opts)); - - check_file_contents("./testrepo/README", "hey there\n"); - check_file_contents("./testrepo/branch_file.txt", "hi\nbye!\n"); - check_file_contents("./testrepo/new.txt", "my new file\n"); -} - -void test_checkout_index__can_remove_untracked_files(void) -{ - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - - git_futils_mkdir("./testrepo/dir/subdir/subsubdir", 0755, GIT_MKDIR_PATH); - cl_git_mkfile("./testrepo/dir/one", "one\n"); - cl_git_mkfile("./testrepo/dir/subdir/two", "two\n"); - - cl_assert_equal_i(true, git_path_isdir("./testrepo/dir/subdir/subsubdir")); - - opts.checkout_strategy = - GIT_CHECKOUT_SAFE | - GIT_CHECKOUT_RECREATE_MISSING | - GIT_CHECKOUT_REMOVE_UNTRACKED; - - cl_git_pass(git_checkout_index(g_repo, NULL, &opts)); - - cl_assert_equal_i(false, git_path_isdir("./testrepo/dir")); -} - -void test_checkout_index__honor_the_specified_pathspecs(void) -{ - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - char *entries[] = { "*.txt" }; - - opts.paths.strings = entries; - opts.paths.count = 1; - - cl_assert_equal_i(false, git_path_isfile("./testrepo/README")); - cl_assert_equal_i(false, git_path_isfile("./testrepo/branch_file.txt")); - cl_assert_equal_i(false, git_path_isfile("./testrepo/new.txt")); - - opts.checkout_strategy = GIT_CHECKOUT_SAFE | GIT_CHECKOUT_RECREATE_MISSING; - - cl_git_pass(git_checkout_index(g_repo, NULL, &opts)); - - cl_assert_equal_i(false, git_path_isfile("./testrepo/README")); - check_file_contents("./testrepo/branch_file.txt", "hi\nbye!\n"); - check_file_contents("./testrepo/new.txt", "my new file\n"); -} - -void test_checkout_index__honor_the_gitattributes_directives(void) -{ - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - const char *attributes = - "branch_file.txt text eol=crlf\n" - "new.txt text eol=lf\n"; - - cl_git_mkfile("./testrepo/.gitattributes", attributes); - cl_repo_set_bool(g_repo, "core.autocrlf", false); - - opts.checkout_strategy = GIT_CHECKOUT_SAFE | GIT_CHECKOUT_RECREATE_MISSING; - - cl_git_pass(git_checkout_index(g_repo, NULL, &opts)); - - check_file_contents("./testrepo/README", "hey there\n"); - check_file_contents("./testrepo/new.txt", "my new file\n"); - check_file_contents("./testrepo/branch_file.txt", "hi\r\nbye!\r\n"); -} - -void test_checkout_index__honor_coreautocrlf_setting_set_to_true(void) -{ -#ifdef GIT_WIN32 - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - const char *expected_readme_text = "hey there\r\n"; - - cl_git_pass(p_unlink("./testrepo/.gitattributes")); - cl_repo_set_bool(g_repo, "core.autocrlf", true); - - opts.checkout_strategy = GIT_CHECKOUT_SAFE | GIT_CHECKOUT_RECREATE_MISSING; - - cl_git_pass(git_checkout_index(g_repo, NULL, &opts)); - - check_file_contents("./testrepo/README", expected_readme_text); -#endif -} - -void test_checkout_index__honor_coresymlinks_default(void) -{ - git_repository *repo; - git_remote *origin; - git_object *target; - char cwd[GIT_PATH_MAX]; - - const char *url = git_repository_path(g_repo); - - cl_assert(getcwd(cwd, sizeof(cwd)) != NULL); - cl_assert_equal_i(0, p_mkdir("readonly", 0555)); // Read-only directory - cl_assert_equal_i(0, chdir("readonly")); - cl_git_pass(git_repository_init(&repo, "../symlink.git", true)); - cl_assert_equal_i(0, chdir(cwd)); - cl_assert_equal_i(0, p_mkdir("symlink", 0777)); - cl_git_pass(git_repository_set_workdir(repo, "symlink", 1)); - - cl_git_pass(git_remote_create(&origin, repo, GIT_REMOTE_ORIGIN, url)); - cl_git_pass(git_remote_fetch(origin, NULL, NULL, NULL)); - git_remote_free(origin); - - cl_git_pass(git_revparse_single(&target, repo, "remotes/origin/master")); - cl_git_pass(git_reset(repo, target, GIT_RESET_HARD, NULL)); - git_object_free(target); - git_repository_free(repo); - -#ifdef GIT_WIN32 - check_file_contents("./symlink/link_to_new.txt", "new.txt"); -#else - { - char link_data[1024]; - size_t link_size = 1024; - - link_size = p_readlink("./symlink/link_to_new.txt", link_data, link_size); - link_data[link_size] = '\0'; - cl_assert_equal_i(link_size, strlen("new.txt")); - cl_assert_equal_s(link_data, "new.txt"); - check_file_contents("./symlink/link_to_new.txt", "my new file\n"); - } -#endif - - cl_fixture_cleanup("symlink"); -} - -void test_checkout_index__honor_coresymlinks_setting_set_to_true(void) -{ - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - - cl_repo_set_bool(g_repo, "core.symlinks", true); - - opts.checkout_strategy = GIT_CHECKOUT_SAFE | GIT_CHECKOUT_RECREATE_MISSING; - - cl_git_pass(git_checkout_index(g_repo, NULL, &opts)); - -#ifdef GIT_WIN32 - check_file_contents("./testrepo/link_to_new.txt", "new.txt"); -#else - { - char link_data[1024]; - size_t link_size = 1024; - - link_size = p_readlink("./testrepo/link_to_new.txt", link_data, link_size); - link_data[link_size] = '\0'; - cl_assert_equal_i(link_size, strlen("new.txt")); - cl_assert_equal_s(link_data, "new.txt"); - check_file_contents("./testrepo/link_to_new.txt", "my new file\n"); - } -#endif -} - -void test_checkout_index__honor_coresymlinks_setting_set_to_false(void) -{ - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - - cl_repo_set_bool(g_repo, "core.symlinks", false); - - opts.checkout_strategy = GIT_CHECKOUT_SAFE | GIT_CHECKOUT_RECREATE_MISSING; - - cl_git_pass(git_checkout_index(g_repo, NULL, &opts)); - - check_file_contents("./testrepo/link_to_new.txt", "new.txt"); -} - -void test_checkout_index__donot_overwrite_modified_file_by_default(void) -{ - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - - cl_git_mkfile("./testrepo/new.txt", "This isn't what's stored!"); - - /* set this up to not return an error code on conflicts, but it - * still will not have permission to overwrite anything... - */ - opts.checkout_strategy = GIT_CHECKOUT_SAFE | GIT_CHECKOUT_ALLOW_CONFLICTS; - - cl_git_pass(git_checkout_index(g_repo, NULL, &opts)); - - check_file_contents("./testrepo/new.txt", "This isn't what's stored!"); -} - -void test_checkout_index__can_overwrite_modified_file(void) -{ - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - - cl_git_mkfile("./testrepo/new.txt", "This isn't what's stored!"); - - opts.checkout_strategy = GIT_CHECKOUT_FORCE; - - cl_git_pass(git_checkout_index(g_repo, NULL, &opts)); - - check_file_contents("./testrepo/new.txt", "my new file\n"); -} - -void test_checkout_index__options_disable_filters(void) -{ - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - - cl_git_mkfile("./testrepo/.gitattributes", "*.txt text eol=crlf\n"); - - opts.checkout_strategy = GIT_CHECKOUT_SAFE | GIT_CHECKOUT_RECREATE_MISSING; - opts.disable_filters = false; - - cl_git_pass(git_checkout_index(g_repo, NULL, &opts)); - - check_file_contents("./testrepo/new.txt", "my new file\r\n"); - - p_unlink("./testrepo/new.txt"); - - opts.disable_filters = true; - cl_git_pass(git_checkout_index(g_repo, NULL, &opts)); - - check_file_contents("./testrepo/new.txt", "my new file\n"); -} - -void test_checkout_index__options_dir_modes(void) -{ - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - struct stat st; - git_oid oid; - git_commit *commit; - mode_t um; - - if (!cl_is_chmod_supported()) - return; - - cl_git_pass(git_reference_name_to_id(&oid, g_repo, "refs/heads/dir")); - cl_git_pass(git_commit_lookup(&commit, g_repo, &oid)); - - reset_index_to_treeish((git_object *)commit); - - opts.checkout_strategy = GIT_CHECKOUT_SAFE | GIT_CHECKOUT_RECREATE_MISSING; - opts.dir_mode = 0701; - - cl_git_pass(git_checkout_index(g_repo, NULL, &opts)); - - /* umask will influence actual directory creation mode */ - (void)p_umask(um = p_umask(022)); - - cl_git_pass(p_stat("./testrepo/a", &st)); - cl_assert_equal_i_fmt(st.st_mode, (GIT_FILEMODE_TREE | 0701) & ~um, "%07o"); - - /* File-mode test, since we're on the 'dir' branch */ - cl_git_pass(p_stat("./testrepo/a/b.txt", &st)); - cl_assert_equal_i_fmt(st.st_mode, GIT_FILEMODE_BLOB_EXECUTABLE & ~um, "%07o"); - - git_commit_free(commit); -} - -void test_checkout_index__options_override_file_modes(void) -{ - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - struct stat st; - - if (!cl_is_chmod_supported()) - return; - - opts.checkout_strategy = GIT_CHECKOUT_SAFE | GIT_CHECKOUT_RECREATE_MISSING; - opts.file_mode = 0700; - - cl_git_pass(git_checkout_index(g_repo, NULL, &opts)); - - cl_git_pass(p_stat("./testrepo/new.txt", &st)); - cl_assert_equal_i_fmt(st.st_mode & GIT_MODE_PERMS_MASK, 0700, "%07o"); -} - -void test_checkout_index__options_open_flags(void) -{ - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - - cl_git_mkfile("./testrepo/new.txt", "hi\n"); - - opts.checkout_strategy = - GIT_CHECKOUT_FORCE | GIT_CHECKOUT_DONT_REMOVE_EXISTING; - opts.file_open_flags = O_CREAT | O_RDWR | O_APPEND; - - cl_git_pass(git_checkout_index(g_repo, NULL, &opts)); - - check_file_contents("./testrepo/new.txt", "hi\nmy new file\n"); -} - -struct notify_data { - const char *file; - const char *sha; -}; - -static int test_checkout_notify_cb( - git_checkout_notify_t why, - const char *path, - const git_diff_file *baseline, - const git_diff_file *target, - const git_diff_file *workdir, - void *payload) -{ - struct notify_data *expectations = (struct notify_data *)payload; - - GIT_UNUSED(workdir); - - cl_assert_equal_i(GIT_CHECKOUT_NOTIFY_CONFLICT, why); - cl_assert_equal_s(expectations->file, path); - cl_assert_equal_i(0, git_oid_streq(&baseline->id, expectations->sha)); - cl_assert_equal_i(0, git_oid_streq(&target->id, expectations->sha)); - - return 0; -} - -void test_checkout_index__can_notify_of_skipped_files(void) -{ - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - struct notify_data data; - - cl_git_mkfile("./testrepo/new.txt", "This isn't what's stored!"); - - /* - * $ git ls-tree HEAD - * 100644 blob a8233120f6ad708f843d861ce2b7228ec4e3dec6 README - * 100644 blob 3697d64be941a53d4ae8f6a271e4e3fa56b022cc branch_file.txt - * 100644 blob a71586c1dfe8a71c6cbf6c129f404c5642ff31bd new.txt - */ - data.file = "new.txt"; - data.sha = "a71586c1dfe8a71c6cbf6c129f404c5642ff31bd"; - - opts.checkout_strategy = GIT_CHECKOUT_SAFE | - GIT_CHECKOUT_RECREATE_MISSING | - GIT_CHECKOUT_ALLOW_CONFLICTS; - opts.notify_flags = GIT_CHECKOUT_NOTIFY_CONFLICT; - opts.notify_cb = test_checkout_notify_cb; - opts.notify_payload = &data; - - cl_git_pass(git_checkout_index(g_repo, NULL, &opts)); -} - -static int dont_notify_cb( - git_checkout_notify_t why, - const char *path, - const git_diff_file *baseline, - const git_diff_file *target, - const git_diff_file *workdir, - void *payload) -{ - GIT_UNUSED(why); - GIT_UNUSED(path); - GIT_UNUSED(baseline); - GIT_UNUSED(target); - GIT_UNUSED(workdir); - GIT_UNUSED(payload); - - cl_assert(false); - - return 0; -} - -void test_checkout_index__wont_notify_of_expected_line_ending_changes(void) -{ - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - - cl_git_pass(p_unlink("./testrepo/.gitattributes")); - cl_repo_set_bool(g_repo, "core.autocrlf", true); - - cl_git_mkfile("./testrepo/new.txt", "my new file\r\n"); - - opts.checkout_strategy = - GIT_CHECKOUT_SAFE | - GIT_CHECKOUT_RECREATE_MISSING | - GIT_CHECKOUT_ALLOW_CONFLICTS; - opts.notify_flags = GIT_CHECKOUT_NOTIFY_CONFLICT; - opts.notify_cb = dont_notify_cb; - opts.notify_payload = NULL; - - cl_git_pass(git_checkout_index(g_repo, NULL, &opts)); -} - -static void checkout_progress_counter( - const char *path, size_t cur, size_t tot, void *payload) -{ - GIT_UNUSED(path); GIT_UNUSED(cur); GIT_UNUSED(tot); - (*(int *)payload)++; -} - -void test_checkout_index__calls_progress_callback(void) -{ - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - int calls = 0; - - opts.checkout_strategy = GIT_CHECKOUT_SAFE | GIT_CHECKOUT_RECREATE_MISSING; - opts.progress_cb = checkout_progress_counter; - opts.progress_payload = &calls; - - cl_git_pass(git_checkout_index(g_repo, NULL, &opts)); - cl_assert(calls > 0); -} - -void test_checkout_index__can_overcome_name_clashes(void) -{ - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - git_index *index; - - cl_git_pass(git_repository_index(&index, g_repo)); - git_index_clear(index); - - cl_git_mkfile("./testrepo/path0", "content\r\n"); - cl_git_pass(p_mkdir("./testrepo/path1", 0777)); - cl_git_mkfile("./testrepo/path1/file1", "content\r\n"); - - cl_git_pass(git_index_add_bypath(index, "path0")); - cl_git_pass(git_index_add_bypath(index, "path1/file1")); - - cl_git_pass(p_unlink("./testrepo/path0")); - cl_git_pass(git_futils_rmdir_r( - "./testrepo/path1", NULL, GIT_RMDIR_REMOVE_FILES)); - - cl_git_mkfile("./testrepo/path1", "content\r\n"); - cl_git_pass(p_mkdir("./testrepo/path0", 0777)); - cl_git_mkfile("./testrepo/path0/file0", "content\r\n"); - - cl_assert(git_path_isfile("./testrepo/path1")); - cl_assert(git_path_isfile("./testrepo/path0/file0")); - - opts.checkout_strategy = - GIT_CHECKOUT_SAFE | - GIT_CHECKOUT_RECREATE_MISSING | - GIT_CHECKOUT_ALLOW_CONFLICTS; - cl_git_pass(git_checkout_index(g_repo, index, &opts)); - - cl_assert(git_path_isfile("./testrepo/path1")); - cl_assert(git_path_isfile("./testrepo/path0/file0")); - - opts.checkout_strategy = GIT_CHECKOUT_FORCE; - cl_git_pass(git_checkout_index(g_repo, index, &opts)); - - cl_assert(git_path_isfile("./testrepo/path0")); - cl_assert(git_path_isfile("./testrepo/path1/file1")); - - git_index_free(index); -} - -void test_checkout_index__validates_struct_version(void) -{ - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - const git_error *err; - - opts.version = 1024; - cl_git_fail(git_checkout_index(g_repo, NULL, &opts)); - - err = giterr_last(); - cl_assert_equal_i(err->klass, GITERR_INVALID); - - opts.version = 0; - giterr_clear(); - cl_git_fail(git_checkout_index(g_repo, NULL, &opts)); - - err = giterr_last(); - cl_assert_equal_i(err->klass, GITERR_INVALID); -} - -void test_checkout_index__can_update_prefixed_files(void) -{ - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - - cl_assert_equal_i(false, git_path_isfile("./testrepo/README")); - cl_assert_equal_i(false, git_path_isfile("./testrepo/branch_file.txt")); - cl_assert_equal_i(false, git_path_isfile("./testrepo/new.txt")); - - cl_git_mkfile("./testrepo/READ", "content\n"); - cl_git_mkfile("./testrepo/README.after", "content\n"); - cl_git_pass(p_mkdir("./testrepo/branch_file", 0777)); - cl_git_pass(p_mkdir("./testrepo/branch_file/contained_dir", 0777)); - cl_git_mkfile("./testrepo/branch_file/contained_file", "content\n"); - cl_git_pass(p_mkdir("./testrepo/branch_file.txt.after", 0777)); - - opts.checkout_strategy = - GIT_CHECKOUT_SAFE | - GIT_CHECKOUT_RECREATE_MISSING | - GIT_CHECKOUT_REMOVE_UNTRACKED; - - cl_git_pass(git_checkout_index(g_repo, NULL, &opts)); - - /* remove untracked will remove the .gitattributes file before the blobs - * were created, so they will have had crlf filtering applied on Windows - */ - check_file_contents_nocr("./testrepo/README", "hey there\n"); - check_file_contents_nocr("./testrepo/branch_file.txt", "hi\nbye!\n"); - check_file_contents_nocr("./testrepo/new.txt", "my new file\n"); - - cl_assert(!git_path_exists("testrepo/READ")); - cl_assert(!git_path_exists("testrepo/README.after")); - cl_assert(!git_path_exists("testrepo/branch_file")); - cl_assert(!git_path_exists("testrepo/branch_file.txt.after")); -} - -void test_checkout_index__can_checkout_a_newly_initialized_repository(void) -{ - test_checkout_index__cleanup(); - - g_repo = cl_git_sandbox_init("empty_standard_repo"); - cl_git_remove_placeholders(git_repository_path(g_repo), "dummy-marker.txt"); - - cl_git_pass(git_checkout_index(g_repo, NULL, NULL)); -} - -void test_checkout_index__issue_1397(void) -{ - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - - test_checkout_index__cleanup(); - - g_repo = cl_git_sandbox_init("issue_1397"); - - cl_repo_set_bool(g_repo, "core.autocrlf", true); - - opts.checkout_strategy = GIT_CHECKOUT_FORCE; - - cl_git_pass(git_checkout_index(g_repo, NULL, &opts)); - - check_file_contents("./issue_1397/crlf_file.txt", "first line\r\nsecond line\r\nboth with crlf"); -} - -void test_checkout_index__target_directory(void) -{ - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - checkout_counts cts; - memset(&cts, 0, sizeof(cts)); - - opts.checkout_strategy = GIT_CHECKOUT_SAFE | - GIT_CHECKOUT_RECREATE_MISSING; - opts.target_directory = "alternative"; - cl_assert(!git_path_isdir("alternative")); - - opts.notify_flags = GIT_CHECKOUT_NOTIFY_ALL; - opts.notify_cb = checkout_count_callback; - opts.notify_payload = &cts; - - /* create some files that *would* conflict if we were using the wd */ - cl_git_mkfile("testrepo/README", "I'm in the way!\n"); - cl_git_mkfile("testrepo/new.txt", "my new file\n"); - - cl_git_pass(git_checkout_index(g_repo, NULL, &opts)); - - cl_assert_equal_i(0, cts.n_untracked); - cl_assert_equal_i(0, cts.n_ignored); - cl_assert_equal_i(4, cts.n_updates); - - check_file_contents("./alternative/README", "hey there\n"); - check_file_contents("./alternative/branch_file.txt", "hi\nbye!\n"); - check_file_contents("./alternative/new.txt", "my new file\n"); - - cl_git_pass(git_futils_rmdir_r( - "alternative", NULL, GIT_RMDIR_REMOVE_FILES)); -} - -void test_checkout_index__target_directory_from_bare(void) -{ - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - git_index *index; - git_object *head = NULL; - checkout_counts cts; - memset(&cts, 0, sizeof(cts)); - - test_checkout_index__cleanup(); - - g_repo = cl_git_sandbox_init("testrepo.git"); - cl_assert(git_repository_is_bare(g_repo)); - - cl_git_pass(git_repository_index(&index, g_repo)); - cl_git_pass(git_revparse_single(&head, g_repo, "HEAD^{tree}")); - cl_git_pass(git_index_read_tree(index, (const git_tree *)head)); - cl_git_pass(git_index_write(index)); - git_index_free(index); - - opts.checkout_strategy = GIT_CHECKOUT_SAFE | - GIT_CHECKOUT_RECREATE_MISSING; - - opts.notify_flags = GIT_CHECKOUT_NOTIFY_ALL; - opts.notify_cb = checkout_count_callback; - opts.notify_payload = &cts; - - /* fail to checkout a bare repo */ - cl_git_fail(git_checkout_index(g_repo, NULL, &opts)); - - opts.target_directory = "alternative"; - cl_assert(!git_path_isdir("alternative")); - - cl_git_pass(git_checkout_index(g_repo, NULL, &opts)); - - cl_assert_equal_i(0, cts.n_untracked); - cl_assert_equal_i(0, cts.n_ignored); - cl_assert_equal_i(3, cts.n_updates); - - /* files will have been filtered if needed, so strip CR */ - check_file_contents_nocr("./alternative/README", "hey there\n"); - check_file_contents_nocr("./alternative/branch_file.txt", "hi\nbye!\n"); - check_file_contents_nocr("./alternative/new.txt", "my new file\n"); - - cl_git_pass(git_futils_rmdir_r( - "alternative", NULL, GIT_RMDIR_REMOVE_FILES)); - - git_object_free(head); -} - -void test_checkout_index__can_get_repo_from_index(void) -{ - git_index *index; - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - - cl_assert_equal_i(false, git_path_isfile("./testrepo/README")); - cl_assert_equal_i(false, git_path_isfile("./testrepo/branch_file.txt")); - cl_assert_equal_i(false, git_path_isfile("./testrepo/new.txt")); - - opts.checkout_strategy = GIT_CHECKOUT_SAFE | GIT_CHECKOUT_RECREATE_MISSING; - - cl_git_pass(git_repository_index(&index, g_repo)); - - cl_git_pass(git_checkout_index(NULL, index, &opts)); - - check_file_contents("./testrepo/README", "hey there\n"); - check_file_contents("./testrepo/branch_file.txt", "hi\nbye!\n"); - check_file_contents("./testrepo/new.txt", "my new file\n"); - - git_index_free(index); -} - -static void add_conflict(git_index *index, const char *path) -{ - git_index_entry entry; - - memset(&entry, 0, sizeof(git_index_entry)); - - entry.mode = 0100644; - entry.path = path; - - git_oid_fromstr(&entry.id, "d427e0b2e138501a3d15cc376077a3631e15bd46"); - GIT_IDXENTRY_STAGE_SET(&entry, 1); - cl_git_pass(git_index_add(index, &entry)); - - git_oid_fromstr(&entry.id, "4e886e602529caa9ab11d71f86634bd1b6e0de10"); - GIT_IDXENTRY_STAGE_SET(&entry, 2); - cl_git_pass(git_index_add(index, &entry)); - - git_oid_fromstr(&entry.id, "2bd0a343aeef7a2cf0d158478966a6e587ff3863"); - GIT_IDXENTRY_STAGE_SET(&entry, 3); - cl_git_pass(git_index_add(index, &entry)); -} - -void test_checkout_index__writes_conflict_file(void) -{ - git_index *index; - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - git_buf conflicting_buf = GIT_BUF_INIT; - - cl_git_pass(git_repository_index(&index, g_repo)); - - add_conflict(index, "conflicting.txt"); - cl_git_pass(git_index_write(index)); - - cl_git_pass(git_checkout_index(g_repo, NULL, &opts)); - - cl_git_pass(git_futils_readbuffer(&conflicting_buf, "testrepo/conflicting.txt")); - cl_assert(strcmp(conflicting_buf.ptr, - "<<<<<<< ours\n" - "this file is changed in master and branch\n" - "=======\n" - "this file is changed in branch and master\n" - ">>>>>>> theirs\n") == 0); - git_buf_free(&conflicting_buf); - - git_index_free(index); -} - -void test_checkout_index__adding_conflict_removes_stage_0(void) -{ - git_index *new_index, *index; - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - - cl_git_pass(git_index_new(&new_index)); - - add_conflict(new_index, "new.txt"); - cl_git_pass(git_checkout_index(g_repo, new_index, &opts)); - - cl_git_pass(git_repository_index(&index, g_repo)); - - cl_assert(git_index_get_bypath(index, "new.txt", 0) == NULL); - cl_assert(git_index_get_bypath(index, "new.txt", 1) != NULL); - cl_assert(git_index_get_bypath(index, "new.txt", 2) != NULL); - cl_assert(git_index_get_bypath(index, "new.txt", 3) != NULL); - - git_index_free(index); - git_index_free(new_index); -} - -void test_checkout_index__conflicts_honor_coreautocrlf(void) -{ -#ifdef GIT_WIN32 - git_index *index; - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - git_buf conflicting_buf = GIT_BUF_INIT; - - cl_git_pass(p_unlink("./testrepo/.gitattributes")); - cl_repo_set_bool(g_repo, "core.autocrlf", true); - - cl_git_pass(git_repository_index(&index, g_repo)); - - add_conflict(index, "conflicting.txt"); - cl_git_pass(git_index_write(index)); - - cl_git_pass(git_checkout_index(g_repo, NULL, &opts)); - - cl_git_pass(git_futils_readbuffer(&conflicting_buf, "testrepo/conflicting.txt")); - cl_assert(strcmp(conflicting_buf.ptr, - "<<<<<<< ours\r\n" - "this file is changed in master and branch\r\n" - "=======\r\n" - "this file is changed in branch and master\r\n" - ">>>>>>> theirs\r\n") == 0); - git_buf_free(&conflicting_buf); - - git_index_free(index); -#endif -} diff --git a/vendor/libgit2/tests/checkout/nasty.c b/vendor/libgit2/tests/checkout/nasty.c deleted file mode 100644 index 952a6a112..000000000 --- a/vendor/libgit2/tests/checkout/nasty.c +++ /dev/null @@ -1,366 +0,0 @@ -#include "clar_libgit2.h" -#include "checkout_helpers.h" - -#include "git2/checkout.h" -#include "repository.h" -#include "buffer.h" -#include "fileops.h" - -static const char *repo_name = "nasty"; -static git_repository *repo; -static git_checkout_options checkout_opts; - -void test_checkout_nasty__initialize(void) -{ - repo = cl_git_sandbox_init(repo_name); - - GIT_INIT_STRUCTURE(&checkout_opts, GIT_CHECKOUT_OPTIONS_VERSION); - checkout_opts.checkout_strategy = GIT_CHECKOUT_FORCE; -} - -void test_checkout_nasty__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -static void test_checkout_passes(const char *refname, const char *filename) -{ - git_oid commit_id; - git_commit *commit; - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - git_buf path = GIT_BUF_INIT; - - cl_git_pass(git_buf_joinpath(&path, repo_name, filename)); - - cl_git_pass(git_reference_name_to_id(&commit_id, repo, refname)); - cl_git_pass(git_commit_lookup(&commit, repo, &commit_id)); - - opts.checkout_strategy = GIT_CHECKOUT_FORCE | - GIT_CHECKOUT_DONT_UPDATE_INDEX; - - cl_git_pass(git_checkout_tree(repo, (const git_object *)commit, &opts)); - cl_assert(!git_path_exists(path.ptr)); - - git_commit_free(commit); - git_buf_free(&path); -} - -static void test_checkout_fails(const char *refname, const char *filename) -{ - git_oid commit_id; - git_commit *commit; - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - git_buf path = GIT_BUF_INIT; - - cl_git_pass(git_buf_joinpath(&path, repo_name, filename)); - - cl_git_pass(git_reference_name_to_id(&commit_id, repo, refname)); - cl_git_pass(git_commit_lookup(&commit, repo, &commit_id)); - - opts.checkout_strategy = GIT_CHECKOUT_FORCE; - - cl_git_fail(git_checkout_tree(repo, (const git_object *)commit, &opts)); - cl_assert(!git_path_exists(path.ptr)); - - git_commit_free(commit); - git_buf_free(&path); -} - -/* A tree that contains ".git" as a tree, with a blob inside - * (".git/foobar"). - */ -void test_checkout_nasty__dotgit_tree(void) -{ - test_checkout_fails("refs/heads/dotgit_tree", ".git/foobar"); -} - -/* A tree that contains ".GIT" as a tree, with a blob inside - * (".GIT/foobar"). - */ -void test_checkout_nasty__dotcapitalgit_tree(void) -{ - test_checkout_fails("refs/heads/dotcapitalgit_tree", ".GIT/foobar"); -} - -/* A tree that contains a tree ".", with a blob inside ("./foobar"). - */ -void test_checkout_nasty__dot_tree(void) -{ - test_checkout_fails("refs/heads/dot_tree", "foobar"); -} - -/* A tree that contains a tree ".", with a tree ".git", with a blob - * inside ("./.git/foobar"). - */ -void test_checkout_nasty__dot_dotgit_tree(void) -{ - test_checkout_fails("refs/heads/dot_dotgit_tree", ".git/foobar"); -} - -/* A tree that contains a tree, with a tree "..", with a tree ".git", with a - * blob inside ("foo/../.git/foobar"). - */ -void test_checkout_nasty__dotdot_dotgit_tree(void) -{ - test_checkout_fails("refs/heads/dotdot_dotgit_tree", ".git/foobar"); -} - -/* A tree that contains a tree, with a tree "..", with a blob inside - * ("foo/../foobar"). - */ -void test_checkout_nasty__dotdot_tree(void) -{ - test_checkout_fails("refs/heads/dotdot_tree", "foobar"); -} - -/* A tree that contains a blob with the rogue name ".git/foobar" */ -void test_checkout_nasty__dotgit_path(void) -{ - test_checkout_fails("refs/heads/dotgit_path", ".git/foobar"); -} - -/* A tree that contains a blob with the rogue name ".GIT/foobar" */ -void test_checkout_nasty__dotcapitalgit_path(void) -{ - test_checkout_fails("refs/heads/dotcapitalgit_path", ".GIT/foobar"); -} - -/* A tree that contains a blob with the rogue name "./.git/foobar" */ -void test_checkout_nasty__dot_dotgit_path(void) -{ - test_checkout_fails("refs/heads/dot_dotgit_path", ".git/foobar"); -} - -/* A tree that contains a blob with the rogue name "./.GIT/foobar" */ -void test_checkout_nasty__dot_dotcapitalgit_path(void) -{ - test_checkout_fails("refs/heads/dot_dotcapitalgit_path", ".GIT/foobar"); -} - -/* A tree that contains a blob with the rogue name "foo/../.git/foobar" */ -void test_checkout_nasty__dotdot_dotgit_path(void) -{ - test_checkout_fails("refs/heads/dotdot_dotgit_path", ".git/foobar"); -} - -/* A tree that contains a blob with the rogue name "foo/../.GIT/foobar" */ -void test_checkout_nasty__dotdot_dotcapitalgit_path(void) -{ - test_checkout_fails("refs/heads/dotdot_dotcapitalgit_path", ".GIT/foobar"); -} - -/* A tree that contains a blob with the rogue name "foo/." */ -void test_checkout_nasty__dot_path(void) -{ - test_checkout_fails("refs/heads/dot_path", "./foobar"); -} - -/* A tree that contains a blob with the rogue name "foo/." */ -void test_checkout_nasty__dot_path_two(void) -{ - test_checkout_fails("refs/heads/dot_path_two", "foo/."); -} - -/* A tree that contains a blob with the rogue name "foo/../foobar" */ -void test_checkout_nasty__dotdot_path(void) -{ - test_checkout_fails("refs/heads/dotdot_path", "foobar"); -} - -/* A tree that contains an entry with a backslash ".git\foobar" */ -void test_checkout_nasty__dotgit_backslash_path(void) -{ -#ifdef GIT_WIN32 - test_checkout_fails("refs/heads/dotgit_backslash_path", ".git/foobar"); -#endif -} - -/* A tree that contains an entry with a backslash ".GIT\foobar" */ -void test_checkout_nasty__dotcapitalgit_backslash_path(void) -{ -#ifdef GIT_WIN32 - test_checkout_fails("refs/heads/dotcapitalgit_backslash_path", ".GIT/foobar"); -#endif -} - -/* A tree that contains an entry with a backslash ".\.GIT\foobar" */ -void test_checkout_nasty__dot_backslash_dotcapitalgit_path(void) -{ -#ifdef GIT_WIN32 - test_checkout_fails("refs/heads/dot_backslash_dotcapitalgit_path", ".GIT/foobar"); -#endif -} - -/* A tree that contains an entry ".git.", because Win32 APIs will drop the - * trailing slash. - */ -void test_checkout_nasty__dot_git_dot(void) -{ -#ifdef GIT_WIN32 - test_checkout_fails("refs/heads/dot_git_dot", ".git/foobar"); -#endif -} - -/* A tree that contains an entry "git~1", because that is typically the - * short name for ".git". - */ -void test_checkout_nasty__git_tilde1(void) -{ -#ifdef GIT_WIN32 - test_checkout_fails("refs/heads/git_tilde1", ".git/foobar"); -#endif -} - -/* A tree that contains an entry "git~2", when we have forced the short - * name for ".git" into "GIT~2". - */ -void test_checkout_nasty__git_custom_shortname(void) -{ -#ifdef GIT_WIN32 - if (!cl_sandbox_supports_8dot3()) - clar__skip(); - - cl_must_pass(p_rename("nasty/.git", "nasty/_temp")); - cl_git_write2file("nasty/git~1", "", 0, O_RDWR|O_CREAT, 0666); - cl_must_pass(p_rename("nasty/_temp", "nasty/.git")); - test_checkout_fails("refs/heads/git_tilde2", ".git/foobar"); -#endif -} - -/* A tree that contains an entry "git~3", which should be allowed, since - * it is not the typical short name ("GIT~1") or the actual short name - * ("GIT~2") for ".git". - */ -void test_checkout_nasty__only_looks_like_a_git_shortname(void) -{ -#ifdef GIT_WIN32 - git_oid commit_id; - git_commit *commit; - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - - cl_must_pass(p_rename("nasty/.git", "nasty/_temp")); - cl_git_write2file("nasty/git~1", "", 0, O_RDWR|O_CREAT, 0666); - cl_must_pass(p_rename("nasty/_temp", "nasty/.git")); - - cl_git_pass(git_reference_name_to_id(&commit_id, repo, "refs/heads/git_tilde3")); - cl_git_pass(git_commit_lookup(&commit, repo, &commit_id)); - - opts.checkout_strategy = GIT_CHECKOUT_FORCE; - - cl_git_pass(git_checkout_tree(repo, (const git_object *)commit, &opts)); - cl_assert(git_path_exists("nasty/git~3/foobar")); - - git_commit_free(commit); -#endif -} - -/* A tree that contains an entry "git:", because Win32 APIs will reject - * that as looking too similar to a drive letter. - */ -void test_checkout_nasty__dot_git_colon(void) -{ -#ifdef GIT_WIN32 - test_checkout_fails("refs/heads/dot_git_colon", ".git/foobar"); -#endif -} - -/* A tree that contains an entry "git:foo", because Win32 APIs will turn - * that into ".git". - */ -void test_checkout_nasty__dot_git_colon_stuff(void) -{ -#ifdef GIT_WIN32 - test_checkout_fails("refs/heads/dot_git_colon_stuff", ".git/foobar"); -#endif -} - -/* Trees that contains entries with a tree ".git" that contain - * byte sequences: - * { 0xe2, 0x80, 0x8c } - * { 0xe2, 0x80, 0x8d } - * { 0xe2, 0x80, 0x8e } - * { 0xe2, 0x80, 0x8f } - * { 0xe2, 0x80, 0xaa } - * { 0xe2, 0x80, 0xab } - * { 0xe2, 0x80, 0xac } - * { 0xe2, 0x80, 0xad } - * { 0xe2, 0x81, 0xae } - * { 0xe2, 0x81, 0xaa } - * { 0xe2, 0x81, 0xab } - * { 0xe2, 0x81, 0xac } - * { 0xe2, 0x81, 0xad } - * { 0xe2, 0x81, 0xae } - * { 0xe2, 0x81, 0xaf } - * { 0xef, 0xbb, 0xbf } - * Because these map to characters that HFS filesystems "ignore". Thus - * ".git" will map to ".git". - */ -void test_checkout_nasty__dot_git_hfs_ignorable(void) -{ -#ifdef __APPLE__ - test_checkout_fails("refs/heads/dotgit_hfs_ignorable_1", ".git/foobar"); - test_checkout_fails("refs/heads/dotgit_hfs_ignorable_2", ".git/foobar"); - test_checkout_fails("refs/heads/dotgit_hfs_ignorable_3", ".git/foobar"); - test_checkout_fails("refs/heads/dotgit_hfs_ignorable_4", ".git/foobar"); - test_checkout_fails("refs/heads/dotgit_hfs_ignorable_5", ".git/foobar"); - test_checkout_fails("refs/heads/dotgit_hfs_ignorable_6", ".git/foobar"); - test_checkout_fails("refs/heads/dotgit_hfs_ignorable_7", ".git/foobar"); - test_checkout_fails("refs/heads/dotgit_hfs_ignorable_8", ".git/foobar"); - test_checkout_fails("refs/heads/dotgit_hfs_ignorable_9", ".git/foobar"); - test_checkout_fails("refs/heads/dotgit_hfs_ignorable_10", ".git/foobar"); - test_checkout_fails("refs/heads/dotgit_hfs_ignorable_11", ".git/foobar"); - test_checkout_fails("refs/heads/dotgit_hfs_ignorable_12", ".git/foobar"); - test_checkout_fails("refs/heads/dotgit_hfs_ignorable_13", ".git/foobar"); - test_checkout_fails("refs/heads/dotgit_hfs_ignorable_14", ".git/foobar"); - test_checkout_fails("refs/heads/dotgit_hfs_ignorable_15", ".git/foobar"); - test_checkout_fails("refs/heads/dotgit_hfs_ignorable_16", ".git/foobar"); -#endif -} - -void test_checkout_nasty__honors_core_protecthfs(void) -{ - cl_repo_set_bool(repo, "core.protectHFS", true); - - test_checkout_fails("refs/heads/dotgit_hfs_ignorable_1", ".git/foobar"); - test_checkout_fails("refs/heads/dotgit_hfs_ignorable_2", ".git/foobar"); - test_checkout_fails("refs/heads/dotgit_hfs_ignorable_3", ".git/foobar"); - test_checkout_fails("refs/heads/dotgit_hfs_ignorable_4", ".git/foobar"); - test_checkout_fails("refs/heads/dotgit_hfs_ignorable_5", ".git/foobar"); - test_checkout_fails("refs/heads/dotgit_hfs_ignorable_6", ".git/foobar"); - test_checkout_fails("refs/heads/dotgit_hfs_ignorable_7", ".git/foobar"); - test_checkout_fails("refs/heads/dotgit_hfs_ignorable_8", ".git/foobar"); - test_checkout_fails("refs/heads/dotgit_hfs_ignorable_9", ".git/foobar"); - test_checkout_fails("refs/heads/dotgit_hfs_ignorable_10", ".git/foobar"); - test_checkout_fails("refs/heads/dotgit_hfs_ignorable_11", ".git/foobar"); - test_checkout_fails("refs/heads/dotgit_hfs_ignorable_12", ".git/foobar"); - test_checkout_fails("refs/heads/dotgit_hfs_ignorable_13", ".git/foobar"); - test_checkout_fails("refs/heads/dotgit_hfs_ignorable_14", ".git/foobar"); - test_checkout_fails("refs/heads/dotgit_hfs_ignorable_15", ".git/foobar"); - test_checkout_fails("refs/heads/dotgit_hfs_ignorable_16", ".git/foobar"); -} - -void test_checkout_nasty__honors_core_protectntfs(void) -{ - cl_repo_set_bool(repo, "core.protectNTFS", true); - - test_checkout_fails("refs/heads/dotgit_backslash_path", ".git/foobar"); - test_checkout_fails("refs/heads/dotcapitalgit_backslash_path", ".GIT/foobar"); - test_checkout_fails("refs/heads/dot_git_dot", ".git/foobar"); - test_checkout_fails("refs/heads/git_tilde1", ".git/foobar"); -} - -void test_checkout_nasty__symlink1(void) -{ - test_checkout_passes("refs/heads/symlink1", ".git/foobar"); -} - -void test_checkout_nasty__symlink2(void) -{ - test_checkout_passes("refs/heads/symlink2", ".git/foobar"); -} - -void test_checkout_nasty__symlink3(void) -{ - test_checkout_passes("refs/heads/symlink3", ".git/foobar"); -} - diff --git a/vendor/libgit2/tests/checkout/tree.c b/vendor/libgit2/tests/checkout/tree.c deleted file mode 100644 index 5680b86df..000000000 --- a/vendor/libgit2/tests/checkout/tree.c +++ /dev/null @@ -1,1418 +0,0 @@ -#include "clar_libgit2.h" -#include "checkout_helpers.h" - -#include "git2/checkout.h" -#include "repository.h" -#include "buffer.h" -#include "fileops.h" - -static git_repository *g_repo; -static git_checkout_options g_opts; -static git_object *g_object; - -void test_checkout_tree__initialize(void) -{ - g_repo = cl_git_sandbox_init("testrepo"); - - GIT_INIT_STRUCTURE(&g_opts, GIT_CHECKOUT_OPTIONS_VERSION); - g_opts.checkout_strategy = GIT_CHECKOUT_FORCE; -} - -void test_checkout_tree__cleanup(void) -{ - git_object_free(g_object); - g_object = NULL; - - cl_git_sandbox_cleanup(); - - if (git_path_isdir("alternative")) - git_futils_rmdir_r("alternative", NULL, GIT_RMDIR_REMOVE_FILES); -} - -void test_checkout_tree__cannot_checkout_a_non_treeish(void) -{ - /* blob */ - cl_git_pass(git_revparse_single(&g_object, g_repo, "a71586c1dfe8a71c6cbf6c129f404c5642ff31bd")); - cl_git_fail(git_checkout_tree(g_repo, g_object, NULL)); -} - -void test_checkout_tree__can_checkout_a_subdirectory_from_a_commit(void) -{ - char *entries[] = { "ab/de/" }; - - g_opts.paths.strings = entries; - g_opts.paths.count = 1; - - cl_git_pass(git_revparse_single(&g_object, g_repo, "subtrees")); - - cl_assert_equal_i(false, git_path_isdir("./testrepo/ab/")); - - cl_git_pass(git_checkout_tree(g_repo, g_object, &g_opts)); - - cl_assert_equal_i(true, git_path_isfile("./testrepo/ab/de/2.txt")); - cl_assert_equal_i(true, git_path_isfile("./testrepo/ab/de/fgh/1.txt")); -} - -void test_checkout_tree__can_checkout_and_remove_directory(void) -{ - cl_assert_equal_i(false, git_path_isdir("./testrepo/ab/")); - - /* Checkout brach "subtrees" and update HEAD, so that HEAD matches the - * current working tree - */ - cl_git_pass(git_revparse_single(&g_object, g_repo, "subtrees")); - cl_git_pass(git_checkout_tree(g_repo, g_object, &g_opts)); - - cl_git_pass(git_repository_set_head(g_repo, "refs/heads/subtrees")); - - cl_assert_equal_i(true, git_path_isdir("./testrepo/ab/")); - cl_assert_equal_i(true, git_path_isfile("./testrepo/ab/de/2.txt")); - cl_assert_equal_i(true, git_path_isfile("./testrepo/ab/de/fgh/1.txt")); - - git_object_free(g_object); - g_object = NULL; - - /* Checkout brach "master" and update HEAD, so that HEAD matches the - * current working tree - */ - cl_git_pass(git_revparse_single(&g_object, g_repo, "master")); - cl_git_pass(git_checkout_tree(g_repo, g_object, &g_opts)); - - cl_git_pass(git_repository_set_head(g_repo, "refs/heads/master")); - - /* This directory should no longer exist */ - cl_assert_equal_i(false, git_path_isdir("./testrepo/ab/")); -} - -void test_checkout_tree__can_checkout_a_subdirectory_from_a_subtree(void) -{ - char *entries[] = { "de/" }; - - g_opts.paths.strings = entries; - g_opts.paths.count = 1; - - cl_git_pass(git_revparse_single(&g_object, g_repo, "subtrees:ab")); - - cl_assert_equal_i(false, git_path_isdir("./testrepo/de/")); - - cl_git_pass(git_checkout_tree(g_repo, g_object, &g_opts)); - - cl_assert_equal_i(true, git_path_isfile("./testrepo/de/2.txt")); - cl_assert_equal_i(true, git_path_isfile("./testrepo/de/fgh/1.txt")); -} - -static void progress(const char *path, size_t cur, size_t tot, void *payload) -{ - bool *was_called = (bool*)payload; - GIT_UNUSED(path); GIT_UNUSED(cur); GIT_UNUSED(tot); - *was_called = true; -} - -void test_checkout_tree__calls_progress_callback(void) -{ - bool was_called = 0; - - g_opts.progress_cb = progress; - g_opts.progress_payload = &was_called; - - cl_git_pass(git_revparse_single(&g_object, g_repo, "master")); - - cl_git_pass(git_checkout_tree(g_repo, g_object, &g_opts)); - - cl_assert_equal_i(was_called, true); -} - -void test_checkout_tree__doesnt_write_unrequested_files_to_worktree(void) -{ - git_oid master_oid; - git_oid chomped_oid; - git_commit* p_master_commit; - git_commit* p_chomped_commit; - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - - git_oid_fromstr(&master_oid, "a65fedf39aefe402d3bb6e24df4d4f5fe4547750"); - git_oid_fromstr(&chomped_oid, "e90810b8df3e80c413d903f631643c716887138d"); - cl_git_pass(git_commit_lookup(&p_master_commit, g_repo, &master_oid)); - cl_git_pass(git_commit_lookup(&p_chomped_commit, g_repo, &chomped_oid)); - - /* GIT_CHECKOUT_NONE should not add any file to the working tree from the - * index as it is supposed to be a dry run. - */ - opts.checkout_strategy = GIT_CHECKOUT_NONE; - git_checkout_tree(g_repo, (git_object*)p_chomped_commit, &opts); - cl_assert_equal_i(false, git_path_isfile("testrepo/readme.txt")); - - git_commit_free(p_master_commit); - git_commit_free(p_chomped_commit); -} - -void test_checkout_tree__can_switch_branches(void) -{ - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - git_oid oid; - git_object *obj = NULL; - - assert_on_branch(g_repo, "master"); - - /* do first checkout with FORCE because we don't know if testrepo - * base data is clean for a checkout or not - */ - opts.checkout_strategy = GIT_CHECKOUT_FORCE; - - cl_git_pass(git_reference_name_to_id(&oid, g_repo, "refs/heads/dir")); - cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJ_ANY)); - - cl_git_pass(git_checkout_tree(g_repo, obj, &opts)); - cl_git_pass(git_repository_set_head(g_repo, "refs/heads/dir")); - - cl_assert(git_path_isfile("testrepo/README")); - cl_assert(git_path_isfile("testrepo/branch_file.txt")); - cl_assert(git_path_isfile("testrepo/new.txt")); - cl_assert(git_path_isfile("testrepo/a/b.txt")); - - cl_assert(!git_path_isdir("testrepo/ab")); - - assert_on_branch(g_repo, "dir"); - - git_object_free(obj); - - /* do second checkout safe because we should be clean after first */ - opts.checkout_strategy = GIT_CHECKOUT_SAFE; - - cl_git_pass(git_reference_name_to_id(&oid, g_repo, "refs/heads/subtrees")); - cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJ_ANY)); - - cl_git_pass(git_checkout_tree(g_repo, obj, &opts)); - cl_git_pass(git_repository_set_head(g_repo, "refs/heads/subtrees")); - - cl_assert(git_path_isfile("testrepo/README")); - cl_assert(git_path_isfile("testrepo/branch_file.txt")); - cl_assert(git_path_isfile("testrepo/new.txt")); - cl_assert(git_path_isfile("testrepo/ab/4.txt")); - cl_assert(git_path_isfile("testrepo/ab/c/3.txt")); - cl_assert(git_path_isfile("testrepo/ab/de/2.txt")); - cl_assert(git_path_isfile("testrepo/ab/de/fgh/1.txt")); - - cl_assert(!git_path_isdir("testrepo/a")); - - assert_on_branch(g_repo, "subtrees"); - - git_object_free(obj); -} - -void test_checkout_tree__can_remove_untracked(void) -{ - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - - opts.checkout_strategy = GIT_CHECKOUT_SAFE | GIT_CHECKOUT_REMOVE_UNTRACKED; - - cl_git_mkfile("testrepo/untracked_file", "as you wish"); - cl_assert(git_path_isfile("testrepo/untracked_file")); - - cl_git_pass(git_checkout_head(g_repo, &opts)); - - cl_assert(!git_path_isfile("testrepo/untracked_file")); -} - -void test_checkout_tree__can_remove_ignored(void) -{ - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - int ignored = 0; - - opts.checkout_strategy = GIT_CHECKOUT_SAFE | GIT_CHECKOUT_REMOVE_IGNORED; - - cl_git_mkfile("testrepo/ignored_file", "as you wish"); - - cl_git_pass(git_ignore_add_rule(g_repo, "ignored_file\n")); - - cl_git_pass(git_ignore_path_is_ignored(&ignored, g_repo, "ignored_file")); - cl_assert_equal_i(1, ignored); - - cl_assert(git_path_isfile("testrepo/ignored_file")); - - cl_git_pass(git_checkout_head(g_repo, &opts)); - - cl_assert(!git_path_isfile("testrepo/ignored_file")); -} - -static int checkout_tree_with_blob_ignored_in_workdir(int strategy, bool isdir) -{ - git_oid oid; - git_object *obj = NULL; - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - int ignored = 0, error; - - assert_on_branch(g_repo, "master"); - - /* do first checkout with FORCE because we don't know if testrepo - * base data is clean for a checkout or not - */ - opts.checkout_strategy = GIT_CHECKOUT_FORCE; - - cl_git_pass(git_reference_name_to_id(&oid, g_repo, "refs/heads/dir")); - cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJ_ANY)); - - cl_git_pass(git_checkout_tree(g_repo, obj, &opts)); - cl_git_pass(git_repository_set_head(g_repo, "refs/heads/dir")); - - cl_assert(git_path_isfile("testrepo/README")); - cl_assert(git_path_isfile("testrepo/branch_file.txt")); - cl_assert(git_path_isfile("testrepo/new.txt")); - cl_assert(git_path_isfile("testrepo/a/b.txt")); - - cl_assert(!git_path_isdir("testrepo/ab")); - - assert_on_branch(g_repo, "dir"); - - git_object_free(obj); - - opts.checkout_strategy = strategy; - - if (isdir) { - cl_must_pass(p_mkdir("testrepo/ab", 0777)); - cl_must_pass(p_mkdir("testrepo/ab/4.txt", 0777)); - - cl_git_mkfile("testrepo/ab/4.txt/file1.txt", "as you wish"); - cl_git_mkfile("testrepo/ab/4.txt/file2.txt", "foo bar foo"); - cl_git_mkfile("testrepo/ab/4.txt/file3.txt", "inky blinky pinky clyde"); - - cl_assert(git_path_isdir("testrepo/ab/4.txt")); - } else { - cl_must_pass(p_mkdir("testrepo/ab", 0777)); - cl_git_mkfile("testrepo/ab/4.txt", "as you wish"); - - cl_assert(git_path_isfile("testrepo/ab/4.txt")); - } - - cl_git_pass(git_ignore_add_rule(g_repo, "ab/4.txt\n")); - - cl_git_pass(git_ignore_path_is_ignored(&ignored, g_repo, "ab/4.txt")); - cl_assert_equal_i(1, ignored); - - cl_git_pass(git_reference_name_to_id(&oid, g_repo, "refs/heads/subtrees")); - cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJ_ANY)); - - error = git_checkout_tree(g_repo, obj, &opts); - - git_object_free(obj); - - return error; -} - -void test_checkout_tree__conflict_on_ignored_when_not_overwriting(void) -{ - int error; - - cl_git_fail(error = checkout_tree_with_blob_ignored_in_workdir( - GIT_CHECKOUT_SAFE | GIT_CHECKOUT_DONT_OVERWRITE_IGNORED, false)); - - cl_assert_equal_i(GIT_ECONFLICT, error); -} - -void test_checkout_tree__can_overwrite_ignored_by_default(void) -{ - cl_git_pass(checkout_tree_with_blob_ignored_in_workdir(GIT_CHECKOUT_SAFE, false)); - - cl_git_pass(git_repository_set_head(g_repo, "refs/heads/subtrees")); - - cl_assert(git_path_isfile("testrepo/ab/4.txt")); - - assert_on_branch(g_repo, "subtrees"); -} - -void test_checkout_tree__conflict_on_ignored_folder_when_not_overwriting(void) -{ - int error; - - cl_git_fail(error = checkout_tree_with_blob_ignored_in_workdir( - GIT_CHECKOUT_SAFE | GIT_CHECKOUT_DONT_OVERWRITE_IGNORED, true)); - - cl_assert_equal_i(GIT_ECONFLICT, error); -} - -void test_checkout_tree__can_overwrite_ignored_folder_by_default(void) -{ - cl_git_pass(checkout_tree_with_blob_ignored_in_workdir(GIT_CHECKOUT_SAFE, true)); - - cl_git_pass(git_repository_set_head(g_repo, "refs/heads/subtrees")); - - cl_assert(git_path_isfile("testrepo/ab/4.txt")); - - assert_on_branch(g_repo, "subtrees"); - -} - -void test_checkout_tree__can_update_only(void) -{ - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - git_oid oid; - git_object *obj = NULL; - - /* first let's get things into a known state - by checkout out the HEAD */ - - assert_on_branch(g_repo, "master"); - - opts.checkout_strategy = GIT_CHECKOUT_FORCE; - cl_git_pass(git_checkout_head(g_repo, &opts)); - - cl_assert(!git_path_isdir("testrepo/a")); - - check_file_contents_nocr("testrepo/branch_file.txt", "hi\nbye!\n"); - - /* now checkout branch but with update only */ - - opts.checkout_strategy = GIT_CHECKOUT_SAFE | GIT_CHECKOUT_UPDATE_ONLY; - - cl_git_pass(git_reference_name_to_id(&oid, g_repo, "refs/heads/dir")); - cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJ_ANY)); - - cl_git_pass(git_checkout_tree(g_repo, obj, &opts)); - cl_git_pass(git_repository_set_head(g_repo, "refs/heads/dir")); - - assert_on_branch(g_repo, "dir"); - - /* this normally would have been created (which was tested separately in - * the test_checkout_tree__can_switch_branches test), but with - * UPDATE_ONLY it will not have been created. - */ - cl_assert(!git_path_isdir("testrepo/a")); - - /* but this file still should have been updated */ - check_file_contents_nocr("testrepo/branch_file.txt", "hi\n"); - - git_object_free(obj); -} - -void test_checkout_tree__can_checkout_with_pattern(void) -{ - char *entries[] = { "[l-z]*.txt" }; - - /* reset to beginning of history (i.e. just a README file) */ - - g_opts.checkout_strategy = - GIT_CHECKOUT_FORCE | GIT_CHECKOUT_REMOVE_UNTRACKED; - - cl_git_pass(git_revparse_single(&g_object, g_repo, "8496071c1b46c854b31185ea97743be6a8774479")); - - cl_git_pass(git_checkout_tree(g_repo, g_object, &g_opts)); - cl_git_pass( - git_repository_set_head_detached(g_repo, git_object_id(g_object))); - - git_object_free(g_object); - g_object = NULL; - - cl_assert(git_path_exists("testrepo/README")); - cl_assert(!git_path_exists("testrepo/branch_file.txt")); - cl_assert(!git_path_exists("testrepo/link_to_new.txt")); - cl_assert(!git_path_exists("testrepo/new.txt")); - - /* now to a narrow patterned checkout */ - - g_opts.checkout_strategy = GIT_CHECKOUT_SAFE; - g_opts.paths.strings = entries; - g_opts.paths.count = 1; - - cl_git_pass(git_revparse_single(&g_object, g_repo, "refs/heads/master")); - - cl_git_pass(git_checkout_tree(g_repo, g_object, &g_opts)); - - cl_assert(git_path_exists("testrepo/README")); - cl_assert(!git_path_exists("testrepo/branch_file.txt")); - cl_assert(git_path_exists("testrepo/link_to_new.txt")); - cl_assert(git_path_exists("testrepo/new.txt")); -} - -void test_checkout_tree__can_disable_pattern_match(void) -{ - char *entries[] = { "b*.txt" }; - - /* reset to beginning of history (i.e. just a README file) */ - - g_opts.checkout_strategy = - GIT_CHECKOUT_FORCE | GIT_CHECKOUT_REMOVE_UNTRACKED; - - cl_git_pass(git_revparse_single(&g_object, g_repo, "8496071c1b46c854b31185ea97743be6a8774479")); - - cl_git_pass(git_checkout_tree(g_repo, g_object, &g_opts)); - cl_git_pass( - git_repository_set_head_detached(g_repo, git_object_id(g_object))); - - git_object_free(g_object); - g_object = NULL; - - cl_assert(!git_path_isfile("testrepo/branch_file.txt")); - - /* now to a narrow patterned checkout, but disable pattern */ - - g_opts.checkout_strategy = - GIT_CHECKOUT_SAFE | - GIT_CHECKOUT_DISABLE_PATHSPEC_MATCH; - g_opts.paths.strings = entries; - g_opts.paths.count = 1; - - cl_git_pass(git_revparse_single(&g_object, g_repo, "refs/heads/master")); - - cl_git_pass(git_checkout_tree(g_repo, g_object, &g_opts)); - - cl_assert(!git_path_isfile("testrepo/branch_file.txt")); - - /* let's try that again, but allow the pattern match */ - - g_opts.checkout_strategy = GIT_CHECKOUT_SAFE; - - cl_git_pass(git_checkout_tree(g_repo, g_object, &g_opts)); - - cl_assert(git_path_isfile("testrepo/branch_file.txt")); -} - -void assert_conflict( - const char *entry_path, - const char *new_content, - const char *parent_sha, - const char *commit_sha) -{ - git_index *index; - git_object *hack_tree; - git_reference *branch, *head; - git_buf file_path = GIT_BUF_INIT; - - cl_git_pass(git_repository_index(&index, g_repo)); - - /* Create a branch pointing at the parent */ - cl_git_pass(git_revparse_single(&g_object, g_repo, parent_sha)); - cl_git_pass(git_branch_create(&branch, g_repo, - "potential_conflict", (git_commit *)g_object, 0)); - - /* Make HEAD point to this branch */ - cl_git_pass(git_reference_symbolic_create( - &head, g_repo, "HEAD", git_reference_name(branch), 1, NULL)); - git_reference_free(head); - git_reference_free(branch); - - /* Checkout the parent */ - g_opts.checkout_strategy = GIT_CHECKOUT_FORCE; - cl_git_pass(git_checkout_tree(g_repo, g_object, &g_opts)); - - /* Hack-ishy workaound to ensure *all* the index entries - * match the content of the tree - */ - cl_git_pass(git_object_peel(&hack_tree, g_object, GIT_OBJ_TREE)); - cl_git_pass(git_index_read_tree(index, (git_tree *)hack_tree)); - git_object_free(hack_tree); - git_object_free(g_object); - g_object = NULL; - - /* Create a conflicting file */ - cl_git_pass(git_buf_joinpath(&file_path, "./testrepo", entry_path)); - cl_git_mkfile(git_buf_cstr(&file_path), new_content); - git_buf_free(&file_path); - - /* Trying to checkout the original commit */ - cl_git_pass(git_revparse_single(&g_object, g_repo, commit_sha)); - - g_opts.checkout_strategy = GIT_CHECKOUT_SAFE; - cl_assert_equal_i( - GIT_ECONFLICT, git_checkout_tree(g_repo, g_object, &g_opts)); - - /* Stage the conflicting change */ - cl_git_pass(git_index_add_bypath(index, entry_path)); - cl_git_pass(git_index_write(index)); - git_index_free(index); - - cl_assert_equal_i( - GIT_ECONFLICT, git_checkout_tree(g_repo, g_object, &g_opts)); -} - -void test_checkout_tree__checking_out_a_conflicting_type_change_returns_ECONFLICT(void) -{ - /* - * 099faba adds a symlink named 'link_to_new.txt' - * a65fedf is the parent of 099faba - */ - - assert_conflict("link_to_new.txt", "old.txt", "a65fedf", "099faba"); -} - -void test_checkout_tree__checking_out_a_conflicting_type_change_returns_ECONFLICT_2(void) -{ - /* - * cf80f8d adds a directory named 'a/' - * a4a7dce is the parent of cf80f8d - */ - - assert_conflict("a", "hello\n", "a4a7dce", "cf80f8d"); -} - -void test_checkout_tree__checking_out_a_conflicting_content_change_returns_ECONFLICT(void) -{ - /* - * c47800c adds a symlink named 'branch_file.txt' - * 5b5b025 is the parent of 763d71a - */ - - assert_conflict("branch_file.txt", "hello\n", "5b5b025", "c47800c"); -} - -void test_checkout_tree__donot_update_deleted_file_by_default(void) -{ - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - git_oid old_id, new_id; - git_commit *old_commit = NULL, *new_commit = NULL; - git_index *index = NULL; - checkout_counts ct; - - opts.checkout_strategy = GIT_CHECKOUT_SAFE; - - memset(&ct, 0, sizeof(ct)); - opts.notify_flags = GIT_CHECKOUT_NOTIFY_ALL; - opts.notify_cb = checkout_count_callback; - opts.notify_payload = &ct; - - cl_git_pass(git_repository_index(&index, g_repo)); - - cl_git_pass(git_oid_fromstr(&old_id, "be3563ae3f795b2b4353bcce3a527ad0a4f7f644")); - cl_git_pass(git_commit_lookup(&old_commit, g_repo, &old_id)); - cl_git_pass(git_reset(g_repo, (git_object *)old_commit, GIT_RESET_HARD, NULL)); - - cl_git_pass(p_unlink("testrepo/branch_file.txt")); - cl_git_pass(git_index_remove_bypath(index ,"branch_file.txt")); - cl_git_pass(git_index_write(index)); - - cl_assert(!git_path_exists("testrepo/branch_file.txt")); - - cl_git_pass(git_oid_fromstr(&new_id, "099fabac3a9ea935598528c27f866e34089c2eff")); - cl_git_pass(git_commit_lookup(&new_commit, g_repo, &new_id)); - - - cl_git_fail(git_checkout_tree(g_repo, (git_object *)new_commit, &opts)); - - cl_assert_equal_i(1, ct.n_conflicts); - cl_assert_equal_i(1, ct.n_updates); - - git_commit_free(old_commit); - git_commit_free(new_commit); - git_index_free(index); -} - -struct checkout_cancel_at { - const char *filename; - int error; - int count; -}; - -static int checkout_cancel_cb( - git_checkout_notify_t why, - const char *path, - const git_diff_file *b, - const git_diff_file *t, - const git_diff_file *w, - void *payload) -{ - struct checkout_cancel_at *ca = payload; - - GIT_UNUSED(why); GIT_UNUSED(b); GIT_UNUSED(t); GIT_UNUSED(w); - - ca->count++; - - if (!strcmp(path, ca->filename)) - return ca->error; - - return 0; -} - -void test_checkout_tree__can_cancel_checkout_from_notify(void) -{ - struct checkout_cancel_at ca; - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - git_oid oid; - git_object *obj = NULL; - - assert_on_branch(g_repo, "master"); - - cl_git_pass(git_reference_name_to_id(&oid, g_repo, "refs/heads/dir")); - cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJ_ANY)); - - ca.filename = "new.txt"; - ca.error = -5555; - ca.count = 0; - - opts.notify_flags = GIT_CHECKOUT_NOTIFY_UPDATED; - opts.notify_cb = checkout_cancel_cb; - opts.notify_payload = &ca; - opts.checkout_strategy = GIT_CHECKOUT_FORCE; - - cl_assert(!git_path_exists("testrepo/new.txt")); - - cl_git_fail_with(git_checkout_tree(g_repo, obj, &opts), -5555); - - cl_assert(!git_path_exists("testrepo/new.txt")); - - /* on case-insensitive FS = a/b.txt, branch_file.txt, new.txt */ - /* on case-sensitive FS = README, then above */ - - if (git_path_exists("testrepo/.git/CoNfIg")) /* case insensitive */ - cl_assert_equal_i(3, ca.count); - else - cl_assert_equal_i(4, ca.count); - - /* and again with a different stopping point and return code */ - ca.filename = "README"; - ca.error = 123; - ca.count = 0; - - cl_git_fail_with(git_checkout_tree(g_repo, obj, &opts), 123); - - cl_assert(!git_path_exists("testrepo/new.txt")); - - if (git_path_exists("testrepo/.git/CoNfIg")) /* case insensitive */ - cl_assert_equal_i(4, ca.count); - else - cl_assert_equal_i(1, ca.count); - - git_object_free(obj); -} - -void test_checkout_tree__can_checkout_with_last_workdir_item_missing(void) -{ - git_index *index = NULL; - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - git_oid tree_id, commit_id; - git_tree *tree = NULL; - git_commit *commit = NULL; - - git_repository_index(&index, g_repo); - - opts.checkout_strategy = GIT_CHECKOUT_FORCE; - - cl_git_pass(git_reference_name_to_id(&commit_id, g_repo, "refs/heads/master")); - cl_git_pass(git_commit_lookup(&commit, g_repo, &commit_id)); - - cl_git_pass(git_checkout_tree(g_repo, (git_object *)commit, &opts)); - cl_git_pass(git_repository_set_head(g_repo, "refs/heads/master")); - - cl_git_pass(p_mkdir("./testrepo/this-is-dir", 0777)); - cl_git_mkfile("./testrepo/this-is-dir/contained_file", "content\n"); - - cl_git_pass(git_index_add_bypath(index, "this-is-dir/contained_file")); - git_index_write_tree(&tree_id, index); - cl_git_pass(git_tree_lookup(&tree, g_repo, &tree_id)); - - cl_git_pass(p_unlink("./testrepo/this-is-dir/contained_file")); - - opts.checkout_strategy = GIT_CHECKOUT_SAFE; - - opts.checkout_strategy = 1; - git_checkout_tree(g_repo, (git_object *)tree, &opts); - - git_tree_free(tree); - git_commit_free(commit); - git_index_free(index); -} - -void test_checkout_tree__issue_1397(void) -{ - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - const char *partial_oid = "8a7ef04"; - git_object *tree = NULL; - - test_checkout_tree__cleanup(); /* cleanup default checkout */ - - g_repo = cl_git_sandbox_init("issue_1397"); - - cl_repo_set_bool(g_repo, "core.autocrlf", true); - - cl_git_pass(git_revparse_single(&tree, g_repo, partial_oid)); - - opts.checkout_strategy = GIT_CHECKOUT_FORCE; - - cl_git_pass(git_checkout_tree(g_repo, tree, &opts)); - - check_file_contents("./issue_1397/crlf_file.txt", "first line\r\nsecond line\r\nboth with crlf"); - - git_object_free(tree); -} - -void test_checkout_tree__can_write_to_empty_dirs(void) -{ - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - git_oid oid; - git_object *obj = NULL; - - assert_on_branch(g_repo, "master"); - - cl_git_pass(p_mkdir("testrepo/a", 0777)); - - /* do first checkout with FORCE because we don't know if testrepo - * base data is clean for a checkout or not - */ - opts.checkout_strategy = GIT_CHECKOUT_FORCE; - - cl_git_pass(git_reference_name_to_id(&oid, g_repo, "refs/heads/dir")); - cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJ_ANY)); - - cl_git_pass(git_checkout_tree(g_repo, obj, &opts)); - - cl_assert(git_path_isfile("testrepo/a/b.txt")); - - git_object_free(obj); -} - -void test_checkout_tree__fails_when_dir_in_use(void) -{ -#ifdef GIT_WIN32 - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - git_oid oid; - git_object *obj = NULL; - - opts.checkout_strategy = GIT_CHECKOUT_FORCE; - - cl_git_pass(git_reference_name_to_id(&oid, g_repo, "refs/heads/dir")); - cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJ_ANY)); - - cl_git_pass(git_checkout_tree(g_repo, obj, &opts)); - - cl_assert(git_path_isfile("testrepo/a/b.txt")); - - git_object_free(obj); - - cl_git_pass(p_chdir("testrepo/a")); - - cl_git_pass(git_reference_name_to_id(&oid, g_repo, "refs/heads/master")); - cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJ_ANY)); - - cl_git_fail(git_checkout_tree(g_repo, obj, &opts)); - - cl_git_pass(p_chdir("../..")); - - cl_assert(git_path_is_empty_dir("testrepo/a")); - - git_object_free(obj); -#endif -} - -void test_checkout_tree__can_continue_when_dir_in_use(void) -{ -#ifdef GIT_WIN32 - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - git_oid oid; - git_object *obj = NULL; - - opts.checkout_strategy = GIT_CHECKOUT_FORCE | - GIT_CHECKOUT_SKIP_LOCKED_DIRECTORIES; - - cl_git_pass(git_reference_name_to_id(&oid, g_repo, "refs/heads/dir")); - cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJ_ANY)); - - cl_git_pass(git_checkout_tree(g_repo, obj, &opts)); - - cl_assert(git_path_isfile("testrepo/a/b.txt")); - - git_object_free(obj); - - cl_git_pass(p_chdir("testrepo/a")); - - cl_git_pass(git_reference_name_to_id(&oid, g_repo, "refs/heads/master")); - cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJ_ANY)); - - cl_git_pass(git_checkout_tree(g_repo, obj, &opts)); - - cl_git_pass(p_chdir("../..")); - - cl_assert(git_path_is_empty_dir("testrepo/a")); - - git_object_free(obj); -#endif -} - -void test_checkout_tree__target_directory_from_bare(void) -{ - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - git_oid oid; - checkout_counts cts; - memset(&cts, 0, sizeof(cts)); - - test_checkout_tree__cleanup(); /* cleanup default checkout */ - - g_repo = cl_git_sandbox_init("testrepo.git"); - cl_assert(git_repository_is_bare(g_repo)); - - opts.checkout_strategy = GIT_CHECKOUT_SAFE | - GIT_CHECKOUT_RECREATE_MISSING; - - opts.notify_flags = GIT_CHECKOUT_NOTIFY_ALL; - opts.notify_cb = checkout_count_callback; - opts.notify_payload = &cts; - - cl_git_pass(git_reference_name_to_id(&oid, g_repo, "HEAD")); - cl_git_pass(git_object_lookup(&g_object, g_repo, &oid, GIT_OBJ_ANY)); - - cl_git_fail(git_checkout_tree(g_repo, g_object, &opts)); - - opts.target_directory = "alternative"; - cl_assert(!git_path_isdir("alternative")); - - cl_git_pass(git_checkout_tree(g_repo, g_object, &opts)); - - cl_assert_equal_i(0, cts.n_untracked); - cl_assert_equal_i(0, cts.n_ignored); - cl_assert_equal_i(3, cts.n_updates); - - check_file_contents_nocr("./alternative/README", "hey there\n"); - check_file_contents_nocr("./alternative/branch_file.txt", "hi\nbye!\n"); - check_file_contents_nocr("./alternative/new.txt", "my new file\n"); - - cl_git_pass(git_futils_rmdir_r( - "alternative", NULL, GIT_RMDIR_REMOVE_FILES)); -} - -void test_checkout_tree__extremely_long_file_name(void) -{ - // A utf-8 string with 83 characters, but 249 bytes. - const char *longname = "\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97"; - char path[1024]; - - g_opts.checkout_strategy = GIT_CHECKOUT_FORCE; - cl_git_pass(git_revparse_single(&g_object, g_repo, "long-file-name")); - cl_git_pass(git_checkout_tree(g_repo, g_object, &g_opts)); - - sprintf(path, "testrepo/%s.txt", longname); - cl_assert(git_path_exists(path)); - - git_object_free(g_object); - cl_git_pass(git_revparse_single(&g_object, g_repo, "master")); - cl_git_pass(git_checkout_tree(g_repo, g_object, &g_opts)); - cl_assert(!git_path_exists(path)); -} - -static void create_conflict(const char *path) -{ - git_index *index; - git_index_entry entry; - - cl_git_pass(git_repository_index(&index, g_repo)); - - memset(&entry, 0x0, sizeof(git_index_entry)); - entry.mode = 0100644; - GIT_IDXENTRY_STAGE_SET(&entry, 1); - git_oid_fromstr(&entry.id, "d427e0b2e138501a3d15cc376077a3631e15bd46"); - entry.path = path; - cl_git_pass(git_index_add(index, &entry)); - - GIT_IDXENTRY_STAGE_SET(&entry, 2); - git_oid_fromstr(&entry.id, "ee3fa1b8c00aff7fe02065fdb50864bb0d932ccf"); - cl_git_pass(git_index_add(index, &entry)); - - GIT_IDXENTRY_STAGE_SET(&entry, 3); - git_oid_fromstr(&entry.id, "2bd0a343aeef7a2cf0d158478966a6e587ff3863"); - cl_git_pass(git_index_add(index, &entry)); - - git_index_write(index); - git_index_free(index); -} - -void test_checkout_tree__fails_when_conflicts_exist_in_index(void) -{ - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - git_oid oid; - git_object *obj = NULL; - - opts.checkout_strategy = GIT_CHECKOUT_SAFE; - - cl_git_pass(git_reference_name_to_id(&oid, g_repo, "HEAD")); - cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJ_ANY)); - - create_conflict("conflicts.txt"); - - cl_git_fail(git_checkout_tree(g_repo, obj, &opts)); - - git_object_free(obj); -} - -void test_checkout_tree__filemode_preserved_in_index(void) -{ - git_oid executable_oid; - git_commit *commit; - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - git_index *index; - const git_index_entry *entry; - - opts.checkout_strategy = GIT_CHECKOUT_FORCE; - - cl_git_pass(git_repository_index(&index, g_repo)); - - /* test a freshly added executable */ - cl_git_pass(git_oid_fromstr(&executable_oid, "afe4393b2b2a965f06acf2ca9658eaa01e0cd6b6")); - cl_git_pass(git_commit_lookup(&commit, g_repo, &executable_oid)); - - cl_git_pass(git_checkout_tree(g_repo, (const git_object *)commit, &opts)); - cl_assert(entry = git_index_get_bypath(index, "executable.txt", 0)); - cl_assert(GIT_PERMS_IS_EXEC(entry->mode)); - - git_commit_free(commit); - - - /* Now start with a commit which has a text file */ - cl_git_pass(git_oid_fromstr(&executable_oid, "cf80f8de9f1185bf3a05f993f6121880dd0cfbc9")); - cl_git_pass(git_commit_lookup(&commit, g_repo, &executable_oid)); - - cl_git_pass(git_checkout_tree(g_repo, (const git_object *)commit, &opts)); - cl_assert(entry = git_index_get_bypath(index, "a/b.txt", 0)); - cl_assert(!GIT_PERMS_IS_EXEC(entry->mode)); - - git_commit_free(commit); - - - /* And then check out to a commit which converts the text file to an executable */ - cl_git_pass(git_oid_fromstr(&executable_oid, "144344043ba4d4a405da03de3844aa829ae8be0e")); - cl_git_pass(git_commit_lookup(&commit, g_repo, &executable_oid)); - - cl_git_pass(git_checkout_tree(g_repo, (const git_object *)commit, &opts)); - cl_assert(entry = git_index_get_bypath(index, "a/b.txt", 0)); - cl_assert(GIT_PERMS_IS_EXEC(entry->mode)); - - git_commit_free(commit); - - - /* Finally, check out the text file again and check that the exec bit is cleared */ - cl_git_pass(git_oid_fromstr(&executable_oid, "cf80f8de9f1185bf3a05f993f6121880dd0cfbc9")); - cl_git_pass(git_commit_lookup(&commit, g_repo, &executable_oid)); - - cl_git_pass(git_checkout_tree(g_repo, (const git_object *)commit, &opts)); - cl_assert(entry = git_index_get_bypath(index, "a/b.txt", 0)); - cl_assert(!GIT_PERMS_IS_EXEC(entry->mode)); - - git_commit_free(commit); - - - git_index_free(index); -} - -mode_t read_filemode(const char *path) -{ - git_buf fullpath = GIT_BUF_INIT; - struct stat st; - mode_t result; - - git_buf_joinpath(&fullpath, "testrepo", path); - cl_must_pass(p_stat(fullpath.ptr, &st)); - - result = GIT_PERMS_IS_EXEC(st.st_mode) ? - GIT_FILEMODE_BLOB_EXECUTABLE : GIT_FILEMODE_BLOB; - - git_buf_free(&fullpath); - - return result; -} - -void test_checkout_tree__filemode_preserved_in_workdir(void) -{ -#ifndef GIT_WIN32 - git_oid executable_oid; - git_commit *commit; - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - - opts.checkout_strategy = GIT_CHECKOUT_FORCE; - - /* test a freshly added executable */ - cl_git_pass(git_oid_fromstr(&executable_oid, "afe4393b2b2a965f06acf2ca9658eaa01e0cd6b6")); - cl_git_pass(git_commit_lookup(&commit, g_repo, &executable_oid)); - - cl_git_pass(git_checkout_tree(g_repo, (const git_object *)commit, &opts)); - cl_assert(GIT_PERMS_IS_EXEC(read_filemode("executable.txt"))); - - git_commit_free(commit); - - - /* Now start with a commit which has a text file */ - cl_git_pass(git_oid_fromstr(&executable_oid, "cf80f8de9f1185bf3a05f993f6121880dd0cfbc9")); - cl_git_pass(git_commit_lookup(&commit, g_repo, &executable_oid)); - - cl_git_pass(git_checkout_tree(g_repo, (const git_object *)commit, &opts)); - cl_assert(!GIT_PERMS_IS_EXEC(read_filemode("a/b.txt"))); - - git_commit_free(commit); - - - /* And then check out to a commit which converts the text file to an executable */ - cl_git_pass(git_oid_fromstr(&executable_oid, "144344043ba4d4a405da03de3844aa829ae8be0e")); - cl_git_pass(git_commit_lookup(&commit, g_repo, &executable_oid)); - - cl_git_pass(git_checkout_tree(g_repo, (const git_object *)commit, &opts)); - cl_assert(GIT_PERMS_IS_EXEC(read_filemode("a/b.txt"))); - - git_commit_free(commit); - - - /* Finally, check out the text file again and check that the exec bit is cleared */ - cl_git_pass(git_oid_fromstr(&executable_oid, "cf80f8de9f1185bf3a05f993f6121880dd0cfbc9")); - cl_git_pass(git_commit_lookup(&commit, g_repo, &executable_oid)); - - cl_git_pass(git_checkout_tree(g_repo, (const git_object *)commit, &opts)); - cl_assert(!GIT_PERMS_IS_EXEC(read_filemode("a/b.txt"))); - - git_commit_free(commit); -#endif -} - -void test_checkout_tree__removes_conflicts(void) -{ - git_oid commit_id; - git_commit *commit; - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - git_index *index; - - cl_git_pass(git_oid_fromstr(&commit_id, "afe4393b2b2a965f06acf2ca9658eaa01e0cd6b6")); - cl_git_pass(git_commit_lookup(&commit, g_repo, &commit_id)); - - opts.checkout_strategy = GIT_CHECKOUT_FORCE; - - cl_git_pass(git_checkout_tree(g_repo, (const git_object *)commit, &opts)); - - cl_git_pass(git_repository_index(&index, g_repo)); - cl_git_pass(git_index_remove(index, "executable.txt", 0)); - - create_conflict("executable.txt"); - cl_git_mkfile("testrepo/executable.txt", "This is the conflict file.\n"); - - create_conflict("other.txt"); - cl_git_mkfile("testrepo/other.txt", "This is another conflict file.\n"); - - git_index_write(index); - - cl_git_pass(git_checkout_tree(g_repo, (const git_object *)commit, &opts)); - - cl_assert_equal_p(NULL, git_index_get_bypath(index, "executable.txt", 1)); - cl_assert_equal_p(NULL, git_index_get_bypath(index, "executable.txt", 2)); - cl_assert_equal_p(NULL, git_index_get_bypath(index, "executable.txt", 3)); - - cl_assert_equal_p(NULL, git_index_get_bypath(index, "other.txt", 1)); - cl_assert_equal_p(NULL, git_index_get_bypath(index, "other.txt", 2)); - cl_assert_equal_p(NULL, git_index_get_bypath(index, "other.txt", 3)); - - cl_assert(!git_path_exists("testrepo/other.txt")); - - git_commit_free(commit); - git_index_free(index); -} - - -void test_checkout_tree__removes_conflicts_only_by_pathscope(void) -{ - git_oid commit_id; - git_commit *commit; - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - git_index *index; - const char *path = "executable.txt"; - - cl_git_pass(git_oid_fromstr(&commit_id, "afe4393b2b2a965f06acf2ca9658eaa01e0cd6b6")); - cl_git_pass(git_commit_lookup(&commit, g_repo, &commit_id)); - - opts.checkout_strategy = GIT_CHECKOUT_FORCE; - opts.paths.count = 1; - opts.paths.strings = (char **)&path; - - cl_git_pass(git_checkout_tree(g_repo, (const git_object *)commit, &opts)); - - cl_git_pass(git_repository_index(&index, g_repo)); - cl_git_pass(git_index_remove(index, "executable.txt", 0)); - - create_conflict("executable.txt"); - cl_git_mkfile("testrepo/executable.txt", "This is the conflict file.\n"); - - create_conflict("other.txt"); - cl_git_mkfile("testrepo/other.txt", "This is another conflict file.\n"); - - git_index_write(index); - - cl_git_pass(git_checkout_tree(g_repo, (const git_object *)commit, &opts)); - - cl_assert_equal_p(NULL, git_index_get_bypath(index, "executable.txt", 1)); - cl_assert_equal_p(NULL, git_index_get_bypath(index, "executable.txt", 2)); - cl_assert_equal_p(NULL, git_index_get_bypath(index, "executable.txt", 3)); - - cl_assert(git_index_get_bypath(index, "other.txt", 1) != NULL); - cl_assert(git_index_get_bypath(index, "other.txt", 2) != NULL); - cl_assert(git_index_get_bypath(index, "other.txt", 3) != NULL); - - cl_assert(git_path_exists("testrepo/other.txt")); - - git_commit_free(commit); - git_index_free(index); -} - -void test_checkout_tree__case_changing_rename(void) -{ - git_index *index; - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - git_oid master_id, dir_commit_id, tree_id, commit_id; - git_commit *master_commit, *dir_commit; - git_tree *tree; - git_signature *signature; - const git_index_entry *index_entry; - bool case_sensitive; - - assert_on_branch(g_repo, "master"); - - cl_git_pass(git_repository_index(&index, g_repo)); - - /* Switch branches and perform a case-changing rename */ - - opts.checkout_strategy = GIT_CHECKOUT_FORCE; - - cl_git_pass(git_reference_name_to_id(&dir_commit_id, g_repo, "refs/heads/dir")); - cl_git_pass(git_commit_lookup(&dir_commit, g_repo, &dir_commit_id)); - - cl_git_pass(git_checkout_tree(g_repo, (git_object *)dir_commit, &opts)); - cl_git_pass(git_repository_set_head(g_repo, "refs/heads/dir")); - - cl_assert(git_path_isfile("testrepo/README")); - case_sensitive = !git_path_isfile("testrepo/readme"); - - cl_assert(index_entry = git_index_get_bypath(index, "README", 0)); - cl_assert_equal_s("README", index_entry->path); - - cl_git_pass(git_index_remove_bypath(index, "README")); - cl_git_pass(p_rename("testrepo/README", "testrepo/__readme__")); - cl_git_pass(p_rename("testrepo/__readme__", "testrepo/readme")); - cl_git_append2file("testrepo/readme", "An addendum..."); - cl_git_pass(git_index_add_bypath(index, "readme")); - - cl_git_pass(git_index_write(index)); - - cl_git_pass(git_index_write_tree(&tree_id, index)); - cl_git_pass(git_tree_lookup(&tree, g_repo, &tree_id)); - - cl_git_pass(git_signature_new(&signature, "Renamer", "rename@contoso.com", time(NULL), 0)); - - cl_git_pass(git_commit_create(&commit_id, g_repo, "refs/heads/dir", signature, signature, NULL, "case-changing rename", tree, 1, (const git_commit **)&dir_commit)); - - cl_assert(git_path_isfile("testrepo/readme")); - if (case_sensitive) - cl_assert(!git_path_isfile("testrepo/README")); - - cl_assert(index_entry = git_index_get_bypath(index, "readme", 0)); - cl_assert_equal_s("readme", index_entry->path); - - /* Switching back to master should rename readme -> README */ - opts.checkout_strategy = GIT_CHECKOUT_SAFE; - - cl_git_pass(git_reference_name_to_id(&master_id, g_repo, "refs/heads/master")); - cl_git_pass(git_commit_lookup(&master_commit, g_repo, &master_id)); - - cl_git_pass(git_checkout_tree(g_repo, (git_object *)master_commit, &opts)); - cl_git_pass(git_repository_set_head(g_repo, "refs/heads/master")); - - assert_on_branch(g_repo, "master"); - - cl_assert(git_path_isfile("testrepo/README")); - if (case_sensitive) - cl_assert(!git_path_isfile("testrepo/readme")); - - cl_assert(index_entry = git_index_get_bypath(index, "README", 0)); - cl_assert_equal_s("README", index_entry->path); - - git_index_free(index); - git_signature_free(signature); - git_tree_free(tree); - git_commit_free(dir_commit); - git_commit_free(master_commit); -} - -void perfdata_cb(const git_checkout_perfdata *in, void *payload) -{ - memcpy(payload, in, sizeof(git_checkout_perfdata)); -} - -void test_checkout_tree__can_collect_perfdata(void) -{ - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - git_oid oid; - git_object *obj = NULL; - git_checkout_perfdata perfdata = {0}; - - opts.perfdata_cb = perfdata_cb; - opts.perfdata_payload = &perfdata; - - assert_on_branch(g_repo, "master"); - opts.checkout_strategy = GIT_CHECKOUT_FORCE; - - cl_git_pass(git_reference_name_to_id(&oid, g_repo, "refs/heads/dir")); - cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJ_ANY)); - - cl_git_pass(git_checkout_tree(g_repo, obj, &opts)); - - cl_assert(perfdata.mkdir_calls > 0); - cl_assert(perfdata.stat_calls > 0); - - git_object_free(obj); -} - -void update_attr_callback( - const char *path, - size_t completed_steps, - size_t total_steps, - void *payload) -{ - GIT_UNUSED(completed_steps); - GIT_UNUSED(total_steps); - GIT_UNUSED(payload); - - if (path && strcmp(path, "ident1.txt") == 0) - cl_git_write2file("testrepo/.gitattributes", - "*.txt ident\n", 12, O_RDWR|O_CREAT, 0666); -} - -void test_checkout_tree__caches_attributes_during_checkout(void) -{ - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - git_oid oid; - git_object *obj = NULL; - git_buf ident1 = GIT_BUF_INIT, ident2 = GIT_BUF_INIT; - char *ident_paths[] = { "ident1.txt", "ident2.txt" }; - - opts.progress_cb = update_attr_callback; - - assert_on_branch(g_repo, "master"); - opts.checkout_strategy = GIT_CHECKOUT_FORCE; - opts.paths.strings = ident_paths; - opts.paths.count = 2; - - cl_git_pass(git_reference_name_to_id(&oid, g_repo, "refs/heads/ident")); - cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJ_ANY)); - - cl_git_pass(git_checkout_tree(g_repo, obj, &opts)); - - cl_git_pass(git_futils_readbuffer(&ident1, "testrepo/ident1.txt")); - cl_git_pass(git_futils_readbuffer(&ident2, "testrepo/ident2.txt")); - - cl_assert_equal_strn(ident1.ptr, "# $Id$", 6); - cl_assert_equal_strn(ident2.ptr, "# $Id$", 6); - - cl_git_pass(git_checkout_tree(g_repo, obj, &opts)); - - cl_git_pass(git_futils_readbuffer(&ident1, "testrepo/ident1.txt")); - cl_git_pass(git_futils_readbuffer(&ident2, "testrepo/ident2.txt")); - - cl_assert_equal_strn(ident1.ptr, "# $Id: ", 7); - cl_assert_equal_strn(ident2.ptr, "# $Id: ", 7); - - git_buf_free(&ident1); - git_buf_free(&ident2); - git_object_free(obj); -} - -void test_checkout_tree__can_not_update_index(void) -{ - git_oid oid; - git_object *head; - unsigned int status; - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - git_index *index; - - opts.checkout_strategy |= - GIT_CHECKOUT_FORCE | GIT_CHECKOUT_DONT_UPDATE_INDEX; - - cl_git_pass(git_reference_name_to_id(&oid, g_repo, "HEAD")); - cl_git_pass(git_object_lookup(&head, g_repo, &oid, GIT_OBJ_ANY)); - - cl_git_pass(git_reset(g_repo, head, GIT_RESET_HARD, &g_opts)); - - cl_assert_equal_i(false, git_path_isdir("./testrepo/ab/")); - - cl_git_pass(git_revparse_single(&g_object, g_repo, "subtrees")); - - cl_git_pass(git_checkout_tree(g_repo, g_object, &opts)); - - cl_assert_equal_i(true, git_path_isfile("./testrepo/ab/de/2.txt")); - cl_git_pass(git_status_file(&status, g_repo, "ab/de/2.txt")); - cl_assert_equal_i(GIT_STATUS_WT_NEW, status); - - cl_git_pass(git_repository_index(&index, g_repo)); - cl_git_pass(git_index_write(index)); - - cl_git_pass(git_status_file(&status, g_repo, "ab/de/2.txt")); - cl_assert_equal_i(GIT_STATUS_WT_NEW, status); - - git_object_free(head); - git_index_free(index); -} - -void test_checkout_tree__can_update_but_not_write_index(void) -{ - git_oid oid; - git_object *head; - unsigned int status; - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - git_index *index; - git_repository *other; - - opts.checkout_strategy |= - GIT_CHECKOUT_FORCE | GIT_CHECKOUT_DONT_WRITE_INDEX; - - cl_git_pass(git_reference_name_to_id(&oid, g_repo, "HEAD")); - cl_git_pass(git_object_lookup(&head, g_repo, &oid, GIT_OBJ_ANY)); - - cl_git_pass(git_reset(g_repo, head, GIT_RESET_HARD, &g_opts)); - - cl_assert_equal_i(false, git_path_isdir("./testrepo/ab/")); - - cl_git_pass(git_revparse_single(&g_object, g_repo, "subtrees")); - - cl_git_pass(git_checkout_tree(g_repo, g_object, &opts)); - - cl_assert_equal_i(true, git_path_isfile("./testrepo/ab/de/2.txt")); - cl_git_pass(git_status_file(&status, g_repo, "ab/de/2.txt")); - cl_assert_equal_i(GIT_STATUS_INDEX_NEW, status); - - cl_git_pass(git_repository_open(&other, "testrepo")); - cl_git_pass(git_status_file(&status, other, "ab/de/2.txt")); - cl_assert_equal_i(GIT_STATUS_WT_NEW, status); - git_repository_free(other); - - cl_git_pass(git_repository_index(&index, g_repo)); - cl_git_pass(git_index_write(index)); - - cl_git_pass(git_repository_open(&other, "testrepo")); - cl_git_pass(git_status_file(&status, other, "ab/de/2.txt")); - cl_assert_equal_i(GIT_STATUS_INDEX_NEW, status); - git_repository_free(other); - - git_object_free(head); - git_index_free(index); -} - -/* Emulate checking out in a repo created by clone --no-checkout, - * which would not have written an index. */ -void test_checkout_tree__safe_proceeds_if_no_index(void) -{ - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - git_oid oid; - git_object *obj = NULL; - - assert_on_branch(g_repo, "master"); - cl_must_pass(p_unlink("testrepo/.git/index")); - - /* do second checkout safe because we should be clean after first */ - opts.checkout_strategy = GIT_CHECKOUT_SAFE; - - cl_git_pass(git_reference_name_to_id(&oid, g_repo, "refs/heads/subtrees")); - cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJ_ANY)); - - cl_git_pass(git_checkout_tree(g_repo, obj, &opts)); - cl_git_pass(git_repository_set_head(g_repo, "refs/heads/subtrees")); - - cl_assert(git_path_isfile("testrepo/README")); - cl_assert(git_path_isfile("testrepo/branch_file.txt")); - cl_assert(git_path_isfile("testrepo/new.txt")); - cl_assert(git_path_isfile("testrepo/ab/4.txt")); - cl_assert(git_path_isfile("testrepo/ab/c/3.txt")); - cl_assert(git_path_isfile("testrepo/ab/de/2.txt")); - cl_assert(git_path_isfile("testrepo/ab/de/fgh/1.txt")); - - cl_assert(!git_path_isdir("testrepo/a")); - - assert_on_branch(g_repo, "subtrees"); - - git_object_free(obj); -} - diff --git a/vendor/libgit2/tests/checkout/typechange.c b/vendor/libgit2/tests/checkout/typechange.c deleted file mode 100644 index b4959a351..000000000 --- a/vendor/libgit2/tests/checkout/typechange.c +++ /dev/null @@ -1,240 +0,0 @@ -#include "clar_libgit2.h" -#include "git2/checkout.h" -#include "path.h" -#include "posix.h" -#include "fileops.h" - -static git_repository *g_repo = NULL; - -static const char *g_typechange_oids[] = { - "79b9f23e85f55ea36a472a902e875bc1121a94cb", - "9bdb75b73836a99e3dbeea640a81de81031fdc29", - "0e7ed140b514b8cae23254cb8656fe1674403aff", - "9d0235c7a7edc0889a18f97a42ee6db9fe688447", - "9b19edf33a03a0c59cdfc113bfa5c06179bf9b1a", - "1b63caae4a5ca96f78e8dfefc376c6a39a142475", - "6eae26c90e8ccc4d16208972119c40635489c6f0", - NULL -}; - -static bool g_typechange_empty[] = { - true, false, false, false, false, false, true, true -}; - -void test_checkout_typechange__initialize(void) -{ - g_repo = cl_git_sandbox_init("typechanges"); - - cl_fixture_sandbox("submod2_target"); - p_rename("submod2_target/.gitted", "submod2_target/.git"); -} - -void test_checkout_typechange__cleanup(void) -{ - cl_git_sandbox_cleanup(); - cl_fixture_cleanup("submod2_target"); -} - -static void assert_file_exists(const char *path) -{ - cl_assert_(git_path_isfile(path), path); -} - -static void assert_dir_exists(const char *path) -{ - cl_assert_(git_path_isdir(path), path); -} - -static void assert_workdir_matches_tree( - git_repository *repo, const git_oid *id, const char *root, bool recurse) -{ - git_object *obj; - git_tree *tree; - size_t i, max_i; - git_buf path = GIT_BUF_INIT; - - if (!root) - root = git_repository_workdir(repo); - cl_assert(root); - - cl_git_pass(git_object_lookup(&obj, repo, id, GIT_OBJ_ANY)); - cl_git_pass(git_object_peel((git_object **)&tree, obj, GIT_OBJ_TREE)); - git_object_free(obj); - - max_i = git_tree_entrycount(tree); - - for (i = 0; i < max_i; ++i) { - const git_tree_entry *te = git_tree_entry_byindex(tree, i); - cl_assert(te); - - cl_git_pass(git_buf_joinpath(&path, root, git_tree_entry_name(te))); - - switch (git_tree_entry_type(te)) { - case GIT_OBJ_COMMIT: - assert_dir_exists(path.ptr); - break; - case GIT_OBJ_TREE: - assert_dir_exists(path.ptr); - if (recurse) - assert_workdir_matches_tree( - repo, git_tree_entry_id(te), path.ptr, true); - break; - case GIT_OBJ_BLOB: - switch (git_tree_entry_filemode(te)) { - case GIT_FILEMODE_BLOB: - case GIT_FILEMODE_BLOB_EXECUTABLE: - assert_file_exists(path.ptr); - /* because of cross-platform, don't confirm exec bit yet */ - break; - case GIT_FILEMODE_LINK: - cl_assert_(git_path_exists(path.ptr), path.ptr); - /* because of cross-platform, don't confirm link yet */ - break; - default: - cl_assert(false); /* really?! */ - } - break; - default: - cl_assert(false); /* really?!! */ - } - } - - git_tree_free(tree); - git_buf_free(&path); -} - -void test_checkout_typechange__checkout_typechanges_safe(void) -{ - int i; - git_object *obj; - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - - for (i = 0; g_typechange_oids[i] != NULL; ++i) { - cl_git_pass(git_revparse_single(&obj, g_repo, g_typechange_oids[i])); - - opts.checkout_strategy = GIT_CHECKOUT_FORCE; - - /* There are bugs in some submodule->tree changes that prevent - * SAFE from passing here, even though the following should work: - */ - /* !i ? GIT_CHECKOUT_FORCE : GIT_CHECKOUT_SAFE; */ - - cl_git_pass(git_checkout_tree(g_repo, obj, &opts)); - - cl_git_pass( - git_repository_set_head_detached(g_repo, git_object_id(obj))); - - assert_workdir_matches_tree(g_repo, git_object_id(obj), NULL, true); - - git_object_free(obj); - - if (!g_typechange_empty[i]) { - cl_assert(git_path_isdir("typechanges")); - cl_assert(git_path_exists("typechanges/a")); - cl_assert(git_path_exists("typechanges/b")); - cl_assert(git_path_exists("typechanges/c")); - cl_assert(git_path_exists("typechanges/d")); - cl_assert(git_path_exists("typechanges/e")); - } else { - cl_assert(git_path_isdir("typechanges")); - cl_assert(!git_path_exists("typechanges/a")); - cl_assert(!git_path_exists("typechanges/b")); - cl_assert(!git_path_exists("typechanges/c")); - cl_assert(!git_path_exists("typechanges/d")); - cl_assert(!git_path_exists("typechanges/e")); - } - } -} - -typedef struct { - int conflicts; - int dirty; - int updates; - int untracked; - int ignored; -} notify_counts; - -static int notify_counter( - git_checkout_notify_t why, - const char *path, - const git_diff_file *baseline, - const git_diff_file *target, - const git_diff_file *workdir, - void *payload) -{ - notify_counts *cts = payload; - - GIT_UNUSED(path); - GIT_UNUSED(baseline); - GIT_UNUSED(target); - GIT_UNUSED(workdir); - - switch (why) { - case GIT_CHECKOUT_NOTIFY_CONFLICT: cts->conflicts++; break; - case GIT_CHECKOUT_NOTIFY_DIRTY: cts->dirty++; break; - case GIT_CHECKOUT_NOTIFY_UPDATED: cts->updates++; break; - case GIT_CHECKOUT_NOTIFY_UNTRACKED: cts->untracked++; break; - case GIT_CHECKOUT_NOTIFY_IGNORED: cts->ignored++; break; - default: break; - } - - return 0; -} - -static void force_create_file(const char *file) -{ - int error = git_futils_rmdir_r(file, NULL, - GIT_RMDIR_REMOVE_FILES | GIT_RMDIR_REMOVE_BLOCKERS); - cl_assert(!error || error == GIT_ENOTFOUND); - cl_git_pass(git_futils_mkpath2file(file, 0777)); - cl_git_rewritefile(file, "yowza!!"); -} - -void test_checkout_typechange__checkout_with_conflicts(void) -{ - int i; - git_object *obj; - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - notify_counts cts = {0}; - - opts.notify_flags = - GIT_CHECKOUT_NOTIFY_CONFLICT | GIT_CHECKOUT_NOTIFY_UNTRACKED; - opts.notify_cb = notify_counter; - opts.notify_payload = &cts; - - for (i = 0; g_typechange_oids[i] != NULL; ++i) { - cl_git_pass(git_revparse_single(&obj, g_repo, g_typechange_oids[i])); - - force_create_file("typechanges/a/blocker"); - force_create_file("typechanges/b"); - force_create_file("typechanges/c/sub/sub/file"); - git_futils_rmdir_r("typechanges/d", NULL, GIT_RMDIR_REMOVE_FILES); - p_mkdir("typechanges/d", 0777); /* intentionally empty dir */ - force_create_file("typechanges/untracked"); - - opts.checkout_strategy = GIT_CHECKOUT_SAFE; - memset(&cts, 0, sizeof(cts)); - - cl_git_fail(git_checkout_tree(g_repo, obj, &opts)); - cl_assert(cts.conflicts > 0); - cl_assert(cts.untracked > 0); - - opts.checkout_strategy = - GIT_CHECKOUT_FORCE | GIT_CHECKOUT_REMOVE_UNTRACKED; - memset(&cts, 0, sizeof(cts)); - - cl_assert(git_path_exists("typechanges/untracked")); - - cl_git_pass(git_checkout_tree(g_repo, obj, &opts)); - cl_assert_equal_i(0, cts.conflicts); - - cl_assert(!git_path_exists("typechanges/untracked")); - - cl_git_pass( - git_repository_set_head_detached(g_repo, git_object_id(obj))); - - assert_workdir_matches_tree(g_repo, git_object_id(obj), NULL, true); - - git_object_free(obj); - } -} diff --git a/vendor/libgit2/tests/cherrypick/bare.c b/vendor/libgit2/tests/cherrypick/bare.c deleted file mode 100644 index 135336507..000000000 --- a/vendor/libgit2/tests/cherrypick/bare.c +++ /dev/null @@ -1,106 +0,0 @@ -#include "clar.h" -#include "clar_libgit2.h" - -#include "buffer.h" -#include "fileops.h" -#include "git2/cherrypick.h" - -#include "../merge/merge_helpers.h" - -#define TEST_REPO_PATH "cherrypick" - -static git_repository *repo; - -void test_cherrypick_bare__initialize(void) -{ - repo = cl_git_sandbox_init(TEST_REPO_PATH); -} - -void test_cherrypick_bare__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -void test_cherrypick_bare__automerge(void) -{ - git_commit *head = NULL, *commit = NULL; - git_index *index = NULL; - git_oid head_oid, cherry_oid; - - struct merge_index_entry merge_index_entries[] = { - { 0100644, "38c05a857e831a7e759d83778bfc85d003e21c45", 0, "file1.txt" }, - { 0100644, "a661b5dec1004e2c62654ded3762370c27cf266b", 0, "file2.txt" }, - { 0100644, "df6b290e0bd6a89b01d69f66687e8abf385283ca", 0, "file3.txt" }, - }; - - git_oid_fromstr(&head_oid, "d3d77487660ee3c0194ee01dc5eaf478782b1c7e"); - cl_git_pass(git_commit_lookup(&head, repo, &head_oid)); - - git_oid_fromstr(&cherry_oid, "cfc4f0999a8367568e049af4f72e452d40828a15"); - cl_git_pass(git_commit_lookup(&commit, repo, &cherry_oid)); - - cl_git_pass(git_cherrypick_commit(&index, repo, commit, head, 0, NULL)); - cl_assert(merge_test_index(index, merge_index_entries, 3)); - - git_index_free(index); - git_commit_free(head); - git_commit_free(commit); -} - -void test_cherrypick_bare__conflicts(void) -{ - git_commit *head = NULL, *commit = NULL; - git_index *index = NULL; - git_oid head_oid, cherry_oid; - - struct merge_index_entry merge_index_entries[] = { - { 0100644, "242e7977ba73637822ffb265b46004b9b0e5153b", 0, "file1.txt" }, - { 0100644, "a58ca3fee5eb68b11adc2703e5843f968c9dad1e", 1, "file2.txt" }, - { 0100644, "bd6ffc8c6c41f0f85ff9e3d61c9479516bac0024", 2, "file2.txt" }, - { 0100644, "563f6473a3858f99b80e5f93c660512ed38e1e6f", 3, "file2.txt" }, - { 0100644, "28d9eb4208074ad1cc84e71ccc908b34573f05d2", 1, "file3.txt" }, - { 0100644, "1124c2c1ae07b26fded662d6c3f3631d9dc16f88", 2, "file3.txt" }, - { 0100644, "e233b9ed408a95e9d4b65fec7fc34943a556deb2", 3, "file3.txt" }, - }; - - git_oid_fromstr(&head_oid, "bafbf6912c09505ac60575cd43d3f2aba3bd84d8"); - cl_git_pass(git_commit_lookup(&head, repo, &head_oid)); - - git_oid_fromstr(&cherry_oid, "e9b63f3655b2ad80c0ff587389b5a9589a3a7110"); - cl_git_pass(git_commit_lookup(&commit, repo, &cherry_oid)); - - cl_git_pass(git_cherrypick_commit(&index, repo, commit, head, 0, NULL)); - cl_assert(merge_test_index(index, merge_index_entries, 7)); - - git_index_free(index); - git_commit_free(head); - git_commit_free(commit); -} - -void test_cherrypick_bare__orphan(void) -{ - git_commit *head = NULL, *commit = NULL; - git_index *index = NULL; - git_oid head_oid, cherry_oid; - - struct merge_index_entry merge_index_entries[] = { - { 0100644, "38c05a857e831a7e759d83778bfc85d003e21c45", 0, "file1.txt" }, - { 0100644, "a661b5dec1004e2c62654ded3762370c27cf266b", 0, "file2.txt" }, - { 0100644, "85a4a1d791973644f24c72f5e89420d3064cc452", 0, "file3.txt" }, - { 0100644, "9ccb9bf50c011fd58dcbaa65df917bf79539717f", 0, "orphan.txt" }, - }; - - git_oid_fromstr(&head_oid, "d3d77487660ee3c0194ee01dc5eaf478782b1c7e"); - cl_git_pass(git_commit_lookup(&head, repo, &head_oid)); - - git_oid_fromstr(&cherry_oid, "74f06b5bfec6d33d7264f73606b57a7c0b963819"); - cl_git_pass(git_commit_lookup(&commit, repo, &cherry_oid)); - - cl_git_pass(git_cherrypick_commit(&index, repo, commit, head, 0, NULL)); - cl_assert(merge_test_index(index, merge_index_entries, 4)); - - git_index_free(index); - git_commit_free(head); - git_commit_free(commit); -} - diff --git a/vendor/libgit2/tests/cherrypick/workdir.c b/vendor/libgit2/tests/cherrypick/workdir.c deleted file mode 100644 index 2b45f5a33..000000000 --- a/vendor/libgit2/tests/cherrypick/workdir.c +++ /dev/null @@ -1,470 +0,0 @@ -#include "clar.h" -#include "clar_libgit2.h" - -#include "buffer.h" -#include "fileops.h" -#include "git2/cherrypick.h" - -#include "../merge/merge_helpers.h" - -#define TEST_REPO_PATH "cherrypick" - -static git_repository *repo; -static git_index *repo_index; - -// Fixture setup and teardown -void test_cherrypick_workdir__initialize(void) -{ - repo = cl_git_sandbox_init(TEST_REPO_PATH); - git_repository_index(&repo_index, repo); -} - -void test_cherrypick_workdir__cleanup(void) -{ - git_index_free(repo_index); - cl_git_sandbox_cleanup(); -} - -/* git reset --hard d3d77487660ee3c0194ee01dc5eaf478782b1c7e - * git cherry-pick cfc4f0999a8367568e049af4f72e452d40828a15 - * git cherry-pick 964ea3da044d9083181a88ba6701de9e35778bf4 - * git cherry-pick a43a050c588d4e92f11a6b139680923e9728477d - */ -void test_cherrypick_workdir__automerge(void) -{ - git_oid head_oid; - git_signature *signature = NULL; - size_t i; - - const char *cherrypick_oids[] = { - "cfc4f0999a8367568e049af4f72e452d40828a15", - "964ea3da044d9083181a88ba6701de9e35778bf4", - "a43a050c588d4e92f11a6b139680923e9728477d", - }; - - struct merge_index_entry merge_index_entries[] = { - { 0100644, "38c05a857e831a7e759d83778bfc85d003e21c45", 0, "file1.txt" }, - { 0100644, "a661b5dec1004e2c62654ded3762370c27cf266b", 0, "file2.txt" }, - { 0100644, "df6b290e0bd6a89b01d69f66687e8abf385283ca", 0, "file3.txt" }, - - { 0100644, "38c05a857e831a7e759d83778bfc85d003e21c45", 0, "file1.txt" }, - { 0100644, "bd8fc3c59fb52d3c8b5907ace7defa5803f82419", 0, "file2.txt" }, - { 0100644, "df6b290e0bd6a89b01d69f66687e8abf385283ca", 0, "file3.txt" }, - - { 0100644, "f06427bee380364bc7e0cb26a9245158e4726ce0", 0, "file1.txt" }, - { 0100644, "bd8fc3c59fb52d3c8b5907ace7defa5803f82419", 0, "file2.txt" }, - { 0100644, "df6b290e0bd6a89b01d69f66687e8abf385283ca", 0, "file3.txt" }, - }; - - cl_git_pass(git_signature_new(&signature, "Picker", "picker@example.org", time(NULL), 0)); - - git_oid_fromstr(&head_oid, "d3d77487660ee3c0194ee01dc5eaf478782b1c7e"); - - for (i = 0; i < 3; ++i) { - git_commit *head = NULL, *commit = NULL; - git_oid cherry_oid, cherrypicked_oid, cherrypicked_tree_oid; - git_tree *cherrypicked_tree = NULL; - - cl_git_pass(git_commit_lookup(&head, repo, &head_oid)); - cl_git_pass(git_reset(repo, (git_object *)head, GIT_RESET_HARD, NULL)); - - git_oid_fromstr(&cherry_oid, cherrypick_oids[i]); - cl_git_pass(git_commit_lookup(&commit, repo, &cherry_oid)); - cl_git_pass(git_cherrypick(repo, commit, NULL)); - - cl_assert(git_path_exists(TEST_REPO_PATH "/.git/CHERRY_PICK_HEAD")); - cl_assert(git_path_exists(TEST_REPO_PATH "/.git/MERGE_MSG")); - - cl_git_pass(git_index_write_tree(&cherrypicked_tree_oid, repo_index)); - cl_git_pass(git_tree_lookup(&cherrypicked_tree, repo, &cherrypicked_tree_oid)); - cl_git_pass(git_commit_create(&cherrypicked_oid, repo, "HEAD", signature, signature, NULL, - "Cherry picked!", cherrypicked_tree, 1, (const git_commit **)&head)); - - cl_assert(merge_test_index(repo_index, merge_index_entries + i * 3, 3)); - - git_oid_cpy(&head_oid, &cherrypicked_oid); - - git_tree_free(cherrypicked_tree); - git_commit_free(head); - git_commit_free(commit); - } - - git_signature_free(signature); -} - -/* git reset --hard cfc4f0999a8367568e049af4f72e452d40828a15 - * git cherry-pick a43a050c588d4e92f11a6b139680923e9728477d*/ -void test_cherrypick_workdir__empty_result(void) -{ - git_oid head_oid; - git_signature *signature = NULL; - git_commit *head = NULL, *commit = NULL; - git_oid cherry_oid; - - const char *cherrypick_oid = "a43a050c588d4e92f11a6b139680923e9728477d"; - - struct merge_index_entry merge_index_entries[] = { - { 0100644, "19c5c7207054604b69c84d08a7571ef9672bb5c2", 0, "file1.txt" }, - { 0100644, "a58ca3fee5eb68b11adc2703e5843f968c9dad1e", 0, "file2.txt" }, - { 0100644, "28d9eb4208074ad1cc84e71ccc908b34573f05d2", 0, "file3.txt" }, - }; - - cl_git_pass(git_signature_new(&signature, "Picker", "picker@example.org", time(NULL), 0)); - - git_oid_fromstr(&head_oid, "cfc4f0999a8367568e049af4f72e452d40828a15"); - - /* Create an untracked file that should not conflict */ - cl_git_mkfile(TEST_REPO_PATH "/file4.txt", ""); - cl_assert(git_path_exists(TEST_REPO_PATH "/file4.txt")); - - cl_git_pass(git_commit_lookup(&head, repo, &head_oid)); - cl_git_pass(git_reset(repo, (git_object *)head, GIT_RESET_HARD, NULL)); - - git_oid_fromstr(&cherry_oid, cherrypick_oid); - cl_git_pass(git_commit_lookup(&commit, repo, &cherry_oid)); - cl_git_pass(git_cherrypick(repo, commit, NULL)); - - /* The resulting tree should not have changed, the change was already on HEAD */ - cl_assert(merge_test_index(repo_index, merge_index_entries, 3)); - - git_commit_free(head); - git_commit_free(commit); - - git_signature_free(signature); -} - -/* git reset --hard bafbf6912c09505ac60575cd43d3f2aba3bd84d8 - * git cherry-pick e9b63f3655b2ad80c0ff587389b5a9589a3a7110 - */ -void test_cherrypick_workdir__conflicts(void) -{ - git_commit *head = NULL, *commit = NULL; - git_oid head_oid, cherry_oid; - git_buf conflicting_buf = GIT_BUF_INIT, mergemsg_buf = GIT_BUF_INIT; - - struct merge_index_entry merge_index_entries[] = { - { 0100644, "242e7977ba73637822ffb265b46004b9b0e5153b", 0, "file1.txt" }, - { 0100644, "a58ca3fee5eb68b11adc2703e5843f968c9dad1e", 1, "file2.txt" }, - { 0100644, "bd6ffc8c6c41f0f85ff9e3d61c9479516bac0024", 2, "file2.txt" }, - { 0100644, "563f6473a3858f99b80e5f93c660512ed38e1e6f", 3, "file2.txt" }, - { 0100644, "28d9eb4208074ad1cc84e71ccc908b34573f05d2", 1, "file3.txt" }, - { 0100644, "1124c2c1ae07b26fded662d6c3f3631d9dc16f88", 2, "file3.txt" }, - { 0100644, "e233b9ed408a95e9d4b65fec7fc34943a556deb2", 3, "file3.txt" }, - }; - - git_oid_fromstr(&head_oid, "bafbf6912c09505ac60575cd43d3f2aba3bd84d8"); - - cl_git_pass(git_commit_lookup(&head, repo, &head_oid)); - cl_git_pass(git_reset(repo, (git_object *)head, GIT_RESET_HARD, NULL)); - - git_oid_fromstr(&cherry_oid, "e9b63f3655b2ad80c0ff587389b5a9589a3a7110"); - cl_git_pass(git_commit_lookup(&commit, repo, &cherry_oid)); - cl_git_pass(git_cherrypick(repo, commit, NULL)); - - cl_assert(git_path_exists(TEST_REPO_PATH "/.git/CHERRY_PICK_HEAD")); - cl_assert(git_path_exists(TEST_REPO_PATH "/.git/MERGE_MSG")); - - cl_assert(merge_test_index(repo_index, merge_index_entries, 7)); - - cl_git_pass(git_futils_readbuffer(&mergemsg_buf, - TEST_REPO_PATH "/.git/MERGE_MSG")); - cl_assert(strcmp(git_buf_cstr(&mergemsg_buf), - "Change all files\n" \ - "\n" \ - "Conflicts:\n" \ - "\tfile2.txt\n" \ - "\tfile3.txt\n") == 0); - - cl_git_pass(git_futils_readbuffer(&conflicting_buf, - TEST_REPO_PATH "/file2.txt")); - - cl_assert(strcmp(git_buf_cstr(&conflicting_buf), - "!File 2\n" \ - "File 2\n" \ - "File 2\n" \ - "File 2\n" \ - "File 2\n" \ - "File 2\n" \ - "File 2\n" \ - "File 2\n" \ - "File 2\n" \ - "File 2\n" \ - "File 2!!\n" \ - "File 2\n" \ - "File 2\n" \ - "File 2\n" \ - "<<<<<<< HEAD\n" \ - "File 2\n" \ - "=======\n" \ - "File 2!\n" \ - "File 2\n" \ - "File 2!\n" \ - ">>>>>>> e9b63f3... Change all files\n") == 0); - - cl_git_pass(git_futils_readbuffer(&conflicting_buf, - TEST_REPO_PATH "/file3.txt")); - - cl_assert(strcmp(git_buf_cstr(&conflicting_buf), - "!File 3\n" \ - "File 3\n" \ - "File 3\n" \ - "File 3\n" \ - "File 3\n" \ - "File 3\n" \ - "File 3\n" \ - "File 3\n" \ - "File 3\n" \ - "File 3\n" \ - "File 3\n" \ - "File 3!!\n" \ - "File 3\n" \ - "File 3\n" \ - "File 3\n" \ - "<<<<<<< HEAD\n" \ - "=======\n" \ - "File 3!\n" \ - "File 3!\n" \ - ">>>>>>> e9b63f3... Change all files\n") == 0); - - git_commit_free(commit); - git_commit_free(head); - git_buf_free(&mergemsg_buf); - git_buf_free(&conflicting_buf); -} - -/* git reset --hard bafbf6912c09505ac60575cd43d3f2aba3bd84d8 - * git cherry-pick -X ours e9b63f3655b2ad80c0ff587389b5a9589a3a7110 - */ -void test_cherrypick_workdir__conflict_use_ours(void) -{ - git_commit *head = NULL, *commit = NULL; - git_oid head_oid, cherry_oid; - git_cherrypick_options opts = GIT_CHERRYPICK_OPTIONS_INIT; - - struct merge_index_entry merge_index_entries[] = { - { 0100644, "242e7977ba73637822ffb265b46004b9b0e5153b", 0, "file1.txt" }, - { 0100644, "a58ca3fee5eb68b11adc2703e5843f968c9dad1e", 1, "file2.txt" }, - { 0100644, "bd6ffc8c6c41f0f85ff9e3d61c9479516bac0024", 2, "file2.txt" }, - { 0100644, "563f6473a3858f99b80e5f93c660512ed38e1e6f", 3, "file2.txt" }, - { 0100644, "28d9eb4208074ad1cc84e71ccc908b34573f05d2", 1, "file3.txt" }, - { 0100644, "1124c2c1ae07b26fded662d6c3f3631d9dc16f88", 2, "file3.txt" }, - { 0100644, "e233b9ed408a95e9d4b65fec7fc34943a556deb2", 3, "file3.txt" }, - }; - - struct merge_index_entry merge_filesystem_entries[] = { - { 0100644, "242e7977ba73637822ffb265b46004b9b0e5153b", 0, "file1.txt" }, - { 0100644, "bd6ffc8c6c41f0f85ff9e3d61c9479516bac0024", 0, "file2.txt" }, - { 0100644, "1124c2c1ae07b26fded662d6c3f3631d9dc16f88", 0, "file3.txt" }, - }; - - /* leave the index in a conflicted state, but checkout "ours" to the workdir */ - opts.checkout_opts.checkout_strategy = GIT_CHECKOUT_SAFE | GIT_CHECKOUT_USE_OURS; - - git_oid_fromstr(&head_oid, "bafbf6912c09505ac60575cd43d3f2aba3bd84d8"); - - cl_git_pass(git_commit_lookup(&head, repo, &head_oid)); - cl_git_pass(git_reset(repo, (git_object *)head, GIT_RESET_HARD, NULL)); - - git_oid_fromstr(&cherry_oid, "e9b63f3655b2ad80c0ff587389b5a9589a3a7110"); - cl_git_pass(git_commit_lookup(&commit, repo, &cherry_oid)); - cl_git_pass(git_cherrypick(repo, commit, &opts)); - - cl_assert(merge_test_index(repo_index, merge_index_entries, 7)); - cl_assert(merge_test_workdir(repo, merge_filesystem_entries, 3)); - - /* resolve conflicts in the index by taking "ours" */ - opts.merge_opts.file_favor = GIT_MERGE_FILE_FAVOR_OURS; - - cl_git_pass(git_reset(repo, (git_object *)head, GIT_RESET_HARD, NULL)); - cl_git_pass(git_cherrypick(repo, commit, &opts)); - - cl_assert(merge_test_index(repo_index, merge_filesystem_entries, 3)); - cl_assert(merge_test_workdir(repo, merge_filesystem_entries, 3)); - - git_commit_free(commit); - git_commit_free(head); -} - -/* git reset --hard cfc4f0999a8367568e049af4f72e452d40828a15 - * git cherry-pick 2a26c7e88b285613b302ba76712bc998863f3cbc - */ -void test_cherrypick_workdir__rename(void) -{ - git_commit *head, *commit; - git_oid head_oid, cherry_oid; - git_cherrypick_options opts = GIT_CHERRYPICK_OPTIONS_INIT; - - struct merge_index_entry merge_index_entries[] = { - { 0100644, "19c5c7207054604b69c84d08a7571ef9672bb5c2", 0, "file1.txt" }, - { 0100644, "a58ca3fee5eb68b11adc2703e5843f968c9dad1e", 0, "file2.txt" }, - { 0100644, "28d9eb4208074ad1cc84e71ccc908b34573f05d2", 0, "file3.txt.renamed" }, - }; - - opts.merge_opts.flags |= GIT_MERGE_FIND_RENAMES; - opts.merge_opts.rename_threshold = 50; - - git_oid_fromstr(&head_oid, "cfc4f0999a8367568e049af4f72e452d40828a15"); - cl_git_pass(git_commit_lookup(&head, repo, &head_oid)); - cl_git_pass(git_reset(repo, (git_object *)head, GIT_RESET_HARD, NULL)); - - git_oid_fromstr(&cherry_oid, "2a26c7e88b285613b302ba76712bc998863f3cbc"); - cl_git_pass(git_commit_lookup(&commit, repo, &cherry_oid)); - cl_git_pass(git_cherrypick(repo, commit, &opts)); - - cl_assert(merge_test_index(repo_index, merge_index_entries, 3)); - - git_commit_free(commit); - git_commit_free(head); -} - -/* git reset --hard 44cd2ed2052c9c68f9a439d208e9614dc2a55c70 - * git cherry-pick 2a26c7e88b285613b302ba76712bc998863f3cbc - */ -void test_cherrypick_workdir__both_renamed(void) -{ - git_commit *head, *commit; - git_oid head_oid, cherry_oid; - git_buf mergemsg_buf = GIT_BUF_INIT; - git_cherrypick_options opts = GIT_CHERRYPICK_OPTIONS_INIT; - - struct merge_index_entry merge_index_entries[] = { - { 0100644, "19c5c7207054604b69c84d08a7571ef9672bb5c2", 0, "file1.txt" }, - { 0100644, "a58ca3fee5eb68b11adc2703e5843f968c9dad1e", 0, "file2.txt" }, - { 0100644, "e233b9ed408a95e9d4b65fec7fc34943a556deb2", 1, "file3.txt" }, - { 0100644, "e233b9ed408a95e9d4b65fec7fc34943a556deb2", 3, "file3.txt.renamed" }, - { 0100644, "28d9eb4208074ad1cc84e71ccc908b34573f05d2", 2, "file3.txt.renamed_on_branch" }, - }; - - opts.merge_opts.flags |= GIT_MERGE_FIND_RENAMES; - opts.merge_opts.rename_threshold = 50; - - git_oid_fromstr(&head_oid, "44cd2ed2052c9c68f9a439d208e9614dc2a55c70"); - cl_git_pass(git_commit_lookup(&head, repo, &head_oid)); - cl_git_pass(git_reset(repo, (git_object *)head, GIT_RESET_HARD, NULL)); - - git_oid_fromstr(&cherry_oid, "2a26c7e88b285613b302ba76712bc998863f3cbc"); - cl_git_pass(git_commit_lookup(&commit, repo, &cherry_oid)); - cl_git_pass(git_cherrypick(repo, commit, &opts)); - - cl_assert(merge_test_index(repo_index, merge_index_entries, 5)); - - cl_git_pass(git_futils_readbuffer(&mergemsg_buf, - TEST_REPO_PATH "/.git/MERGE_MSG")); - cl_assert(strcmp(git_buf_cstr(&mergemsg_buf), - "Renamed file3.txt -> file3.txt.renamed\n" \ - "\n" \ - "Conflicts:\n" \ - "\tfile3.txt\n" \ - "\tfile3.txt.renamed\n" \ - "\tfile3.txt.renamed_on_branch\n") == 0); - - git_buf_free(&mergemsg_buf); - git_commit_free(commit); - git_commit_free(head); -} - -void test_cherrypick_workdir__nonmerge_fails_mainline_specified(void) -{ - git_reference *head; - git_commit *commit; - git_cherrypick_options opts = GIT_CHERRYPICK_OPTIONS_INIT; - - cl_git_pass(git_repository_head(&head, repo)); - cl_git_pass(git_reference_peel((git_object **)&commit, head, GIT_OBJ_COMMIT)); - - opts.mainline = 1; - cl_must_fail(git_cherrypick(repo, commit, &opts)); - cl_assert(!git_path_exists(TEST_REPO_PATH "/.git/CHERRY_PICK_HEAD")); - cl_assert(!git_path_exists(TEST_REPO_PATH "/.git/MERGE_MSG")); - - git_reference_free(head); - git_commit_free(commit); -} - -/* git reset --hard cfc4f0999a8367568e049af4f72e452d40828a15 - * git cherry-pick abe4603bc7cd5b8167a267e0e2418fd2348f8cff - */ -void test_cherrypick_workdir__merge_fails_without_mainline_specified(void) -{ - git_commit *head, *commit; - git_oid head_oid, cherry_oid; - - git_oid_fromstr(&head_oid, "cfc4f0999a8367568e049af4f72e452d40828a15"); - cl_git_pass(git_commit_lookup(&head, repo, &head_oid)); - cl_git_pass(git_reset(repo, (git_object *)head, GIT_RESET_HARD, NULL)); - - git_oid_fromstr(&cherry_oid, "abe4603bc7cd5b8167a267e0e2418fd2348f8cff"); - cl_git_pass(git_commit_lookup(&commit, repo, &cherry_oid)); - - cl_must_fail(git_cherrypick(repo, commit, NULL)); - cl_assert(!git_path_exists(TEST_REPO_PATH "/.git/CHERRY_PICK_HEAD")); - cl_assert(!git_path_exists(TEST_REPO_PATH "/.git/MERGE_MSG")); - - git_commit_free(commit); - git_commit_free(head); -} - -/* git reset --hard cfc4f0999a8367568e049af4f72e452d40828a15 - * git cherry-pick -m1 abe4603bc7cd5b8167a267e0e2418fd2348f8cff - */ -void test_cherrypick_workdir__merge_first_parent(void) -{ - git_commit *head, *commit; - git_oid head_oid, cherry_oid; - git_cherrypick_options opts = GIT_CHERRYPICK_OPTIONS_INIT; - - struct merge_index_entry merge_index_entries[] = { - { 0100644, "f90f9dcbdac2cce5cc166346160e19cb693ef4e8", 0, "file1.txt" }, - { 0100644, "563f6473a3858f99b80e5f93c660512ed38e1e6f", 0, "file2.txt" }, - { 0100644, "e233b9ed408a95e9d4b65fec7fc34943a556deb2", 0, "file3.txt" }, - }; - - opts.mainline = 1; - - git_oid_fromstr(&head_oid, "cfc4f0999a8367568e049af4f72e452d40828a15"); - cl_git_pass(git_commit_lookup(&head, repo, &head_oid)); - cl_git_pass(git_reset(repo, (git_object *)head, GIT_RESET_HARD, NULL)); - - git_oid_fromstr(&cherry_oid, "abe4603bc7cd5b8167a267e0e2418fd2348f8cff"); - cl_git_pass(git_commit_lookup(&commit, repo, &cherry_oid)); - - cl_git_pass(git_cherrypick(repo, commit, &opts)); - - cl_assert(merge_test_index(repo_index, merge_index_entries, 3)); - - git_commit_free(commit); - git_commit_free(head); -} - -/* git reset --hard cfc4f0999a8367568e049af4f72e452d40828a15 - * git cherry-pick -m2 abe4603bc7cd5b8167a267e0e2418fd2348f8cff - */ -void test_cherrypick_workdir__merge_second_parent(void) -{ - git_commit *head, *commit; - git_oid head_oid, cherry_oid; - git_cherrypick_options opts = GIT_CHERRYPICK_OPTIONS_INIT; - - struct merge_index_entry merge_index_entries[] = { - { 0100644, "487434cace79238a7091e2220611d4f20a765690", 0, "file1.txt" }, - { 0100644, "e5183bfd18e3a0a691fadde2f0d5610b73282d31", 0, "file2.txt" }, - { 0100644, "409a1bec58bf35348e8b62b72bb9c1f45cf5a587", 0, "file3.txt" }, - }; - - opts.mainline = 2; - - git_oid_fromstr(&head_oid, "cfc4f0999a8367568e049af4f72e452d40828a15"); - cl_git_pass(git_commit_lookup(&head, repo, &head_oid)); - cl_git_pass(git_reset(repo, (git_object *)head, GIT_RESET_HARD, NULL)); - - git_oid_fromstr(&cherry_oid, "abe4603bc7cd5b8167a267e0e2418fd2348f8cff"); - cl_git_pass(git_commit_lookup(&commit, repo, &cherry_oid)); - - cl_git_pass(git_cherrypick(repo, commit, &opts)); - - cl_assert(merge_test_index(repo_index, merge_index_entries, 3)); - - git_commit_free(commit); - git_commit_free(head); -} - diff --git a/vendor/libgit2/tests/clar.c b/vendor/libgit2/tests/clar.c deleted file mode 100644 index 2caa871d2..000000000 --- a/vendor/libgit2/tests/clar.c +++ /dev/null @@ -1,642 +0,0 @@ -/* - * Copyright (c) Vicent Marti. All rights reserved. - * - * This file is part of clar, distributed under the ISC license. - * For full terms see the included COPYING file. - */ -#include -#include -#include -#include -#include -#include -#include -#include - -/* required for sandboxing */ -#include -#include - -#ifdef _WIN32 -# include -# include -# include -# include - -# define _MAIN_CC __cdecl - -# ifndef stat -# define stat(path, st) _stat(path, st) -# endif -# ifndef mkdir -# define mkdir(path, mode) _mkdir(path) -# endif -# ifndef chdir -# define chdir(path) _chdir(path) -# endif -# ifndef access -# define access(path, mode) _access(path, mode) -# endif -# ifndef strdup -# define strdup(str) _strdup(str) -# endif -# ifndef strcasecmp -# define strcasecmp(a,b) _stricmp(a,b) -# endif - -# ifndef __MINGW32__ -# pragma comment(lib, "shell32") -# ifndef strncpy -# define strncpy(to, from, to_size) strncpy_s(to, to_size, from, _TRUNCATE) -# endif -# ifndef W_OK -# define W_OK 02 -# endif -# ifndef S_ISDIR -# define S_ISDIR(x) ((x & _S_IFDIR) != 0) -# endif -# define p_snprintf(buf,sz,fmt,...) _snprintf_s(buf,sz,_TRUNCATE,fmt,__VA_ARGS__) -# else -# define p_snprintf snprintf -# endif - -# ifndef PRIuZ -# define PRIuZ "Iu" -# endif -# ifndef PRIxZ -# define PRIxZ "Ix" -# endif - -# ifdef _MSC_VER - typedef struct stat STAT_T; -# else - typedef struct _stat STAT_T; -# endif -#else -# include /* waitpid(2) */ -# include -# define _MAIN_CC -# define p_snprintf snprintf -# ifndef PRIuZ -# define PRIuZ "zu" -# endif -# ifndef PRIxZ -# define PRIxZ "zx" -# endif - typedef struct stat STAT_T; -#endif - -#include "clar.h" - -static void fs_rm(const char *_source); -static void fs_copy(const char *_source, const char *dest); - -static const char * -fixture_path(const char *base, const char *fixture_name); - -struct clar_error { - const char *test; - int test_number; - const char *suite; - const char *file; - int line_number; - const char *error_msg; - char *description; - - struct clar_error *next; -}; - -static struct { - int argc; - char **argv; - - enum cl_test_status test_status; - const char *active_test; - const char *active_suite; - - int total_skipped; - int total_errors; - - int tests_ran; - int suites_ran; - - int report_errors_only; - int exit_on_error; - int report_suite_names; - - struct clar_error *errors; - struct clar_error *last_error; - - void (*local_cleanup)(void *); - void *local_cleanup_payload; - - jmp_buf trampoline; - int trampoline_enabled; - - cl_trace_cb *pfn_trace_cb; - void *trace_payload; - -} _clar; - -struct clar_func { - const char *name; - void (*ptr)(void); -}; - -struct clar_suite { - const char *name; - struct clar_func initialize; - struct clar_func cleanup; - const struct clar_func *tests; - size_t test_count; - int enabled; -}; - -/* From clar_print_*.c */ -static void clar_print_init(int test_count, int suite_count, const char *suite_names); -static void clar_print_shutdown(int test_count, int suite_count, int error_count); -static void clar_print_error(int num, const struct clar_error *error); -static void clar_print_ontest(const char *test_name, int test_number, enum cl_test_status failed); -static void clar_print_onsuite(const char *suite_name, int suite_index); -static void clar_print_onabort(const char *msg, ...); - -/* From clar_sandbox.c */ -static void clar_unsandbox(void); -static int clar_sandbox(void); - -/* Load the declarations for the test suite */ -#include "clar.suite" - - -#define CL_TRACE(ev) \ - do { \ - if (_clar.pfn_trace_cb) \ - _clar.pfn_trace_cb(ev, \ - _clar.active_suite, \ - _clar.active_test, \ - _clar.trace_payload); \ - } while (0) - -void cl_trace_register(cl_trace_cb *cb, void *payload) -{ - _clar.pfn_trace_cb = cb; - _clar.trace_payload = payload; -} - - -/* Core test functions */ -static void -clar_report_errors(void) -{ - int i = 1; - struct clar_error *error, *next; - - error = _clar.errors; - while (error != NULL) { - next = error->next; - clar_print_error(i++, error); - free(error->description); - free(error); - error = next; - } - - _clar.errors = _clar.last_error = NULL; -} - -static void -clar_run_test( - const struct clar_func *test, - const struct clar_func *initialize, - const struct clar_func *cleanup) -{ - _clar.test_status = CL_TEST_OK; - _clar.trampoline_enabled = 1; - - CL_TRACE(CL_TRACE__TEST__BEGIN); - - if (setjmp(_clar.trampoline) == 0) { - if (initialize->ptr != NULL) - initialize->ptr(); - - CL_TRACE(CL_TRACE__TEST__RUN_BEGIN); - test->ptr(); - CL_TRACE(CL_TRACE__TEST__RUN_END); - } - - _clar.trampoline_enabled = 0; - - if (_clar.local_cleanup != NULL) - _clar.local_cleanup(_clar.local_cleanup_payload); - - if (cleanup->ptr != NULL) - cleanup->ptr(); - - CL_TRACE(CL_TRACE__TEST__END); - - _clar.tests_ran++; - - /* remove any local-set cleanup methods */ - _clar.local_cleanup = NULL; - _clar.local_cleanup_payload = NULL; - - if (_clar.report_errors_only) { - clar_report_errors(); - } else { - clar_print_ontest(test->name, _clar.tests_ran, _clar.test_status); - } -} - -static void -clar_run_suite(const struct clar_suite *suite, const char *filter) -{ - const struct clar_func *test = suite->tests; - size_t i, matchlen; - - if (!suite->enabled) - return; - - if (_clar.exit_on_error && _clar.total_errors) - return; - - if (!_clar.report_errors_only) - clar_print_onsuite(suite->name, ++_clar.suites_ran); - - _clar.active_suite = suite->name; - _clar.active_test = NULL; - CL_TRACE(CL_TRACE__SUITE_BEGIN); - - if (filter) { - size_t suitelen = strlen(suite->name); - matchlen = strlen(filter); - if (matchlen <= suitelen) { - filter = NULL; - } else { - filter += suitelen; - while (*filter == ':') - ++filter; - matchlen = strlen(filter); - } - } - - for (i = 0; i < suite->test_count; ++i) { - if (filter && strncmp(test[i].name, filter, matchlen)) - continue; - - _clar.active_test = test[i].name; - clar_run_test(&test[i], &suite->initialize, &suite->cleanup); - - if (_clar.exit_on_error && _clar.total_errors) - return; - } - - _clar.active_test = NULL; - CL_TRACE(CL_TRACE__SUITE_END); -} - -static void -clar_usage(const char *arg) -{ - printf("Usage: %s [options]\n\n", arg); - printf("Options:\n"); - printf(" -sname\tRun only the suite with `name` (can go to individual test name)\n"); - printf(" -iname\tInclude the suite with `name`\n"); - printf(" -xname\tExclude the suite with `name`\n"); - printf(" -v \tIncrease verbosity (show suite names)\n"); - printf(" -q \tOnly report tests that had an error\n"); - printf(" -Q \tQuit as soon as a test fails\n"); - printf(" -l \tPrint suite names\n"); - exit(-1); -} - -static void -clar_parse_args(int argc, char **argv) -{ - int i; - - for (i = 1; i < argc; ++i) { - char *argument = argv[i]; - - if (argument[0] != '-') - clar_usage(argv[0]); - - switch (argument[1]) { - case 's': - case 'i': - case 'x': { /* given suite name */ - int offset = (argument[2] == '=') ? 3 : 2, found = 0; - char action = argument[1]; - size_t j, arglen, suitelen, cmplen; - - argument += offset; - arglen = strlen(argument); - - if (arglen == 0) - clar_usage(argv[0]); - - for (j = 0; j < _clar_suite_count; ++j) { - suitelen = strlen(_clar_suites[j].name); - cmplen = (arglen < suitelen) ? arglen : suitelen; - - if (strncmp(argument, _clar_suites[j].name, cmplen) == 0) { - int exact = (arglen >= suitelen); - - ++found; - - if (!exact) - _clar.report_suite_names = 1; - - switch (action) { - case 's': _clar_suites[j].enabled = 1; clar_run_suite(&_clar_suites[j], argument); break; - case 'i': _clar_suites[j].enabled = 1; break; - case 'x': _clar_suites[j].enabled = 0; break; - } - - if (exact) - break; - } - } - - if (!found) { - clar_print_onabort("No suite matching '%s' found.\n", argument); - exit(-1); - } - break; - } - - case 'q': - _clar.report_errors_only = 1; - break; - - case 'Q': - _clar.exit_on_error = 1; - break; - - case 'l': { - size_t j; - printf("Test suites (use -s to run just one):\n"); - for (j = 0; j < _clar_suite_count; ++j) - printf(" %3d: %s\n", (int)j, _clar_suites[j].name); - - exit(0); - } - - case 'v': - _clar.report_suite_names = 1; - break; - - default: - clar_usage(argv[0]); - } - } -} - -void -clar_test_init(int argc, char **argv) -{ - clar_print_init( - (int)_clar_callback_count, - (int)_clar_suite_count, - "" - ); - - if (clar_sandbox() < 0) { - clar_print_onabort("Failed to sandbox the test runner.\n"); - exit(-1); - } - - _clar.argc = argc; - _clar.argv = argv; -} - -int -clar_test_run() -{ - if (_clar.argc > 1) - clar_parse_args(_clar.argc, _clar.argv); - - if (!_clar.suites_ran) { - size_t i; - for (i = 0; i < _clar_suite_count; ++i) - clar_run_suite(&_clar_suites[i], NULL); - } - - return _clar.total_errors; -} - -void -clar_test_shutdown() -{ - clar_print_shutdown( - _clar.tests_ran, - (int)_clar_suite_count, - _clar.total_errors - ); - - clar_unsandbox(); -} - -int -clar_test(int argc, char **argv) -{ - int errors; - - clar_test_init(argc, argv); - errors = clar_test_run(); - clar_test_shutdown(); - - return errors; -} - -static void abort_test(void) -{ - if (!_clar.trampoline_enabled) { - clar_print_onabort( - "Fatal error: a cleanup method raised an exception."); - clar_report_errors(); - exit(-1); - } - - CL_TRACE(CL_TRACE__TEST__LONGJMP); - longjmp(_clar.trampoline, -1); -} - -void clar__skip(void) -{ - _clar.test_status = CL_TEST_SKIP; - _clar.total_skipped++; - abort_test(); -} - -void clar__fail( - const char *file, - int line, - const char *error_msg, - const char *description, - int should_abort) -{ - struct clar_error *error = calloc(1, sizeof(struct clar_error)); - - if (_clar.errors == NULL) - _clar.errors = error; - - if (_clar.last_error != NULL) - _clar.last_error->next = error; - - _clar.last_error = error; - - error->test = _clar.active_test; - error->test_number = _clar.tests_ran; - error->suite = _clar.active_suite; - error->file = file; - error->line_number = line; - error->error_msg = error_msg; - - if (description != NULL) - error->description = strdup(description); - - _clar.total_errors++; - _clar.test_status = CL_TEST_FAILURE; - - if (should_abort) - abort_test(); -} - -void clar__assert( - int condition, - const char *file, - int line, - const char *error_msg, - const char *description, - int should_abort) -{ - if (condition) - return; - - clar__fail(file, line, error_msg, description, should_abort); -} - -void clar__assert_equal( - const char *file, - int line, - const char *err, - int should_abort, - const char *fmt, - ...) -{ - va_list args; - char buf[4096]; - int is_equal = 1; - - va_start(args, fmt); - - if (!strcmp("%s", fmt)) { - const char *s1 = va_arg(args, const char *); - const char *s2 = va_arg(args, const char *); - is_equal = (!s1 || !s2) ? (s1 == s2) : !strcmp(s1, s2); - - if (!is_equal) { - if (s1 && s2) { - int pos; - for (pos = 0; s1[pos] == s2[pos] && s1[pos] && s2[pos]; ++pos) - /* find differing byte offset */; - p_snprintf(buf, sizeof(buf), "'%s' != '%s' (at byte %d)", - s1, s2, pos); - } else { - p_snprintf(buf, sizeof(buf), "'%s' != '%s'", s1, s2); - } - } - } - else if(!strcmp("%.*s", fmt)) { - const char *s1 = va_arg(args, const char *); - const char *s2 = va_arg(args, const char *); - int len = va_arg(args, int); - is_equal = (!s1 || !s2) ? (s1 == s2) : !strncmp(s1, s2, len); - - if (!is_equal) { - if (s1 && s2) { - int pos; - for (pos = 0; s1[pos] == s2[pos] && pos < len; ++pos) - /* find differing byte offset */; - p_snprintf(buf, sizeof(buf), "'%.*s' != '%.*s' (at byte %d)", - len, s1, len, s2, pos); - } else { - p_snprintf(buf, sizeof(buf), "'%.*s' != '%.*s'", len, s1, len, s2); - } - } - } - else if (!strcmp("%ls", fmt)) { - const wchar_t *wcs1 = va_arg(args, const wchar_t *); - const wchar_t *wcs2 = va_arg(args, const wchar_t *); - is_equal = (!wcs1 || !wcs2) ? (wcs1 == wcs2) : !wcscmp(wcs1, wcs2); - - if (!is_equal) { - if (wcs1 && wcs2) { - int pos; - for (pos = 0; wcs1[pos] == wcs2[pos] && wcs1[pos] && wcs2[pos]; ++pos) - /* find differing byte offset */; - p_snprintf(buf, sizeof(buf), "'%ls' != '%ls' (at byte %d)", - wcs1, wcs2, pos); - } else { - p_snprintf(buf, sizeof(buf), "'%ls' != '%ls'", wcs1, wcs2); - } - } - } - else if(!strcmp("%.*ls", fmt)) { - const wchar_t *wcs1 = va_arg(args, const wchar_t *); - const wchar_t *wcs2 = va_arg(args, const wchar_t *); - int len = va_arg(args, int); - is_equal = (!wcs1 || !wcs2) ? (wcs1 == wcs2) : !wcsncmp(wcs1, wcs2, len); - - if (!is_equal) { - if (wcs1 && wcs2) { - int pos; - for (pos = 0; wcs1[pos] == wcs2[pos] && pos < len; ++pos) - /* find differing byte offset */; - p_snprintf(buf, sizeof(buf), "'%.*ls' != '%.*ls' (at byte %d)", - len, wcs1, len, wcs2, pos); - } else { - p_snprintf(buf, sizeof(buf), "'%.*ls' != '%.*ls'", len, wcs1, len, wcs2); - } - } - } - else if (!strcmp("%"PRIuZ, fmt) || !strcmp("%"PRIxZ, fmt)) { - size_t sz1 = va_arg(args, size_t), sz2 = va_arg(args, size_t); - is_equal = (sz1 == sz2); - if (!is_equal) { - int offset = p_snprintf(buf, sizeof(buf), fmt, sz1); - strncat(buf, " != ", sizeof(buf) - offset); - p_snprintf(buf + offset + 4, sizeof(buf) - offset - 4, fmt, sz2); - } - } - else if (!strcmp("%p", fmt)) { - void *p1 = va_arg(args, void *), *p2 = va_arg(args, void *); - is_equal = (p1 == p2); - if (!is_equal) - p_snprintf(buf, sizeof(buf), "%p != %p", p1, p2); - } - else { - int i1 = va_arg(args, int), i2 = va_arg(args, int); - is_equal = (i1 == i2); - if (!is_equal) { - int offset = p_snprintf(buf, sizeof(buf), fmt, i1); - strncat(buf, " != ", sizeof(buf) - offset); - p_snprintf(buf + offset + 4, sizeof(buf) - offset - 4, fmt, i2); - } - } - - va_end(args); - - if (!is_equal) - clar__fail(file, line, err, buf, should_abort); -} - -void cl_set_cleanup(void (*cleanup)(void *), void *opaque) -{ - _clar.local_cleanup = cleanup; - _clar.local_cleanup_payload = opaque; -} - -#include "clar/sandbox.h" -#include "clar/fixtures.h" -#include "clar/fs.h" -#include "clar/print.h" diff --git a/vendor/libgit2/tests/clar.h b/vendor/libgit2/tests/clar.h deleted file mode 100644 index 5c674d70f..000000000 --- a/vendor/libgit2/tests/clar.h +++ /dev/null @@ -1,161 +0,0 @@ -/* - * Copyright (c) Vicent Marti. All rights reserved. - * - * This file is part of clar, distributed under the ISC license. - * For full terms see the included COPYING file. - */ -#ifndef __CLAR_TEST_H__ -#define __CLAR_TEST_H__ - -#include - -enum cl_test_status { - CL_TEST_OK, - CL_TEST_FAILURE, - CL_TEST_SKIP -}; - -void clar_test_init(int argc, char *argv[]); -int clar_test_run(void); -void clar_test_shutdown(void); - -int clar_test(int argc, char *argv[]); - -const char *clar_sandbox_path(void); - -void cl_set_cleanup(void (*cleanup)(void *), void *opaque); -void cl_fs_cleanup(void); - -/** - * cl_trace_* is a hook to provide a simple global tracing - * mechanism. - * - * The goal here is to let main() provide clar-proper - * with a callback to optionally write log info for - * test operations into the same stream used by their - * actual tests. This would let them print test names - * and maybe performance data as they choose. - * - * The goal is NOT to alter the flow of control or to - * override test selection/skipping. (So the callback - * does not return a value.) - * - * The goal is NOT to duplicate the existing - * pass/fail/skip reporting. (So the callback - * does not accept a status/errorcode argument.) - * - */ -typedef enum cl_trace_event { - CL_TRACE__SUITE_BEGIN, - CL_TRACE__SUITE_END, - CL_TRACE__TEST__BEGIN, - CL_TRACE__TEST__END, - CL_TRACE__TEST__RUN_BEGIN, - CL_TRACE__TEST__RUN_END, - CL_TRACE__TEST__LONGJMP, -} cl_trace_event; - -typedef void (cl_trace_cb)( - cl_trace_event ev, - const char *suite_name, - const char *test_name, - void *payload); - -/** - * Register a callback into CLAR to send global trace events. - * Pass NULL to disable. - */ -void cl_trace_register(cl_trace_cb *cb, void *payload); - - -#ifdef CLAR_FIXTURE_PATH -const char *cl_fixture(const char *fixture_name); -void cl_fixture_sandbox(const char *fixture_name); -void cl_fixture_cleanup(const char *fixture_name); -#endif - -/** - * Assertion macros with explicit error message - */ -#define cl_must_pass_(expr, desc) clar__assert((expr) >= 0, __FILE__, __LINE__, "Function call failed: " #expr, desc, 1) -#define cl_must_fail_(expr, desc) clar__assert((expr) < 0, __FILE__, __LINE__, "Expected function call to fail: " #expr, desc, 1) -#define cl_assert_(expr, desc) clar__assert((expr) != 0, __FILE__, __LINE__, "Expression is not true: " #expr, desc, 1) - -/** - * Check macros with explicit error message - */ -#define cl_check_pass_(expr, desc) clar__assert((expr) >= 0, __FILE__, __LINE__, "Function call failed: " #expr, desc, 0) -#define cl_check_fail_(expr, desc) clar__assert((expr) < 0, __FILE__, __LINE__, "Expected function call to fail: " #expr, desc, 0) -#define cl_check_(expr, desc) clar__assert((expr) != 0, __FILE__, __LINE__, "Expression is not true: " #expr, desc, 0) - -/** - * Assertion macros with no error message - */ -#define cl_must_pass(expr) cl_must_pass_(expr, NULL) -#define cl_must_fail(expr) cl_must_fail_(expr, NULL) -#define cl_assert(expr) cl_assert_(expr, NULL) - -/** - * Check macros with no error message - */ -#define cl_check_pass(expr) cl_check_pass_(expr, NULL) -#define cl_check_fail(expr) cl_check_fail_(expr, NULL) -#define cl_check(expr) cl_check_(expr, NULL) - -/** - * Forced failure/warning - */ -#define cl_fail(desc) clar__fail(__FILE__, __LINE__, "Test failed.", desc, 1) -#define cl_warning(desc) clar__fail(__FILE__, __LINE__, "Warning during test execution:", desc, 0) - -#define cl_skip() clar__skip() - -/** - * Typed assertion macros - */ -#define cl_assert_equal_s(s1,s2) clar__assert_equal(__FILE__,__LINE__,"String mismatch: " #s1 " != " #s2, 1, "%s", (s1), (s2)) -#define cl_assert_equal_s_(s1,s2,note) clar__assert_equal(__FILE__,__LINE__,"String mismatch: " #s1 " != " #s2 " (" #note ")", 1, "%s", (s1), (s2)) - -#define cl_assert_equal_wcs(wcs1,wcs2) clar__assert_equal(__FILE__,__LINE__,"String mismatch: " #wcs1 " != " #wcs2, 1, "%ls", (wcs1), (wcs2)) -#define cl_assert_equal_wcs_(wcs1,wcs2,note) clar__assert_equal(__FILE__,__LINE__,"String mismatch: " #wcs1 " != " #wcs2 " (" #note ")", 1, "%ls", (wcs1), (wcs2)) - -#define cl_assert_equal_strn(s1,s2,len) clar__assert_equal(__FILE__,__LINE__,"String mismatch: " #s1 " != " #s2, 1, "%.*s", (s1), (s2), (int)(len)) -#define cl_assert_equal_strn_(s1,s2,len,note) clar__assert_equal(__FILE__,__LINE__,"String mismatch: " #s1 " != " #s2 " (" #note ")", 1, "%.*s", (s1), (s2), (int)(len)) - -#define cl_assert_equal_wcsn(wcs1,wcs2,len) clar__assert_equal(__FILE__,__LINE__,"String mismatch: " #wcs1 " != " #wcs2, 1, "%.*ls", (wcs1), (wcs2), (int)(len)) -#define cl_assert_equal_wcsn_(wcs1,wcs2,len,note) clar__assert_equal(__FILE__,__LINE__,"String mismatch: " #wcs1 " != " #wcs2 " (" #note ")", 1, "%.*ls", (wcs1), (wcs2), (int)(len)) - -#define cl_assert_equal_i(i1,i2) clar__assert_equal(__FILE__,__LINE__,#i1 " != " #i2, 1, "%d", (int)(i1), (int)(i2)) -#define cl_assert_equal_i_(i1,i2,note) clar__assert_equal(__FILE__,__LINE__,#i1 " != " #i2 " (" #note ")", 1, "%d", (i1), (i2)) -#define cl_assert_equal_i_fmt(i1,i2,fmt) clar__assert_equal(__FILE__,__LINE__,#i1 " != " #i2, 1, (fmt), (int)(i1), (int)(i2)) - -#define cl_assert_equal_b(b1,b2) clar__assert_equal(__FILE__,__LINE__,#b1 " != " #b2, 1, "%d", (int)((b1) != 0),(int)((b2) != 0)) - -#define cl_assert_equal_p(p1,p2) clar__assert_equal(__FILE__,__LINE__,"Pointer mismatch: " #p1 " != " #p2, 1, "%p", (p1), (p2)) - -void clar__skip(void); - -void clar__fail( - const char *file, - int line, - const char *error, - const char *description, - int should_abort); - -void clar__assert( - int condition, - const char *file, - int line, - const char *error, - const char *description, - int should_abort); - -void clar__assert_equal( - const char *file, - int line, - const char *err, - int should_abort, - const char *fmt, - ...); - -#endif diff --git a/vendor/libgit2/tests/clar/fixtures.h b/vendor/libgit2/tests/clar/fixtures.h deleted file mode 100644 index f7b8d96af..000000000 --- a/vendor/libgit2/tests/clar/fixtures.h +++ /dev/null @@ -1,51 +0,0 @@ -static const char * -fixture_path(const char *base, const char *fixture_name) -{ - static char _path[4096]; - size_t root_len; - - root_len = strlen(base); - strncpy(_path, base, sizeof(_path)); - - if (_path[root_len - 1] != '/') - _path[root_len++] = '/'; - - if (fixture_name[0] == '/') - fixture_name++; - - strncpy(_path + root_len, - fixture_name, - sizeof(_path) - root_len); - - return _path; -} - -static const char * -fixture_basename(const char *fixture_name) -{ - const char *p; - - for (p = fixture_name; *p; p++) { - if (p[0] == '/' && p[1] && p[1] != '/') - fixture_name = p+1; - } - - return fixture_name; -} - -#ifdef CLAR_FIXTURE_PATH -const char *cl_fixture(const char *fixture_name) -{ - return fixture_path(CLAR_FIXTURE_PATH, fixture_name); -} - -void cl_fixture_sandbox(const char *fixture_name) -{ - fs_copy(cl_fixture(fixture_name), _clar_path); -} - -void cl_fixture_cleanup(const char *fixture_name) -{ - fs_rm(fixture_path(_clar_path, fixture_basename(fixture_name))); -} -#endif diff --git a/vendor/libgit2/tests/clar/fs.h b/vendor/libgit2/tests/clar/fs.h deleted file mode 100644 index 7c7dde6fc..000000000 --- a/vendor/libgit2/tests/clar/fs.h +++ /dev/null @@ -1,333 +0,0 @@ -#ifdef _WIN32 - -#define RM_RETRY_COUNT 5 -#define RM_RETRY_DELAY 10 - -#ifdef __MINGW32__ - -/* These security-enhanced functions are not available - * in MinGW, so just use the vanilla ones */ -#define wcscpy_s(a, b, c) wcscpy((a), (c)) -#define wcscat_s(a, b, c) wcscat((a), (c)) - -#endif /* __MINGW32__ */ - -static int -fs__dotordotdot(WCHAR *_tocheck) -{ - return _tocheck[0] == '.' && - (_tocheck[1] == '\0' || - (_tocheck[1] == '.' && _tocheck[2] == '\0')); -} - -static int -fs_rmdir_rmdir(WCHAR *_wpath) -{ - unsigned retries = 1; - - while (!RemoveDirectoryW(_wpath)) { - /* Only retry when we have retries remaining, and the - * error was ERROR_DIR_NOT_EMPTY. */ - if (retries++ > RM_RETRY_COUNT || - ERROR_DIR_NOT_EMPTY != GetLastError()) - return -1; - - /* Give whatever has a handle to a child item some time - * to release it before trying again */ - Sleep(RM_RETRY_DELAY * retries * retries); - } - - return 0; -} - -static void -fs_rmdir_helper(WCHAR *_wsource) -{ - WCHAR buffer[MAX_PATH]; - HANDLE find_handle; - WIN32_FIND_DATAW find_data; - size_t buffer_prefix_len; - - /* Set up the buffer and capture the length */ - wcscpy_s(buffer, MAX_PATH, _wsource); - wcscat_s(buffer, MAX_PATH, L"\\"); - buffer_prefix_len = wcslen(buffer); - - /* FindFirstFile needs a wildcard to match multiple items */ - wcscat_s(buffer, MAX_PATH, L"*"); - find_handle = FindFirstFileW(buffer, &find_data); - cl_assert(INVALID_HANDLE_VALUE != find_handle); - - do { - /* FindFirstFile/FindNextFile gives back . and .. - * entries at the beginning */ - if (fs__dotordotdot(find_data.cFileName)) - continue; - - wcscpy_s(buffer + buffer_prefix_len, MAX_PATH - buffer_prefix_len, find_data.cFileName); - - if (FILE_ATTRIBUTE_DIRECTORY & find_data.dwFileAttributes) - fs_rmdir_helper(buffer); - else { - /* If set, the +R bit must be cleared before deleting */ - if (FILE_ATTRIBUTE_READONLY & find_data.dwFileAttributes) - cl_assert(SetFileAttributesW(buffer, find_data.dwFileAttributes & ~FILE_ATTRIBUTE_READONLY)); - - cl_assert(DeleteFileW(buffer)); - } - } - while (FindNextFileW(find_handle, &find_data)); - - /* Ensure that we successfully completed the enumeration */ - cl_assert(ERROR_NO_MORE_FILES == GetLastError()); - - /* Close the find handle */ - FindClose(find_handle); - - /* Now that the directory is empty, remove it */ - cl_assert(0 == fs_rmdir_rmdir(_wsource)); -} - -static int -fs_rm_wait(WCHAR *_wpath) -{ - unsigned retries = 1; - DWORD last_error; - - do { - if (INVALID_FILE_ATTRIBUTES == GetFileAttributesW(_wpath)) - last_error = GetLastError(); - else - last_error = ERROR_SUCCESS; - - /* Is the item gone? */ - if (ERROR_FILE_NOT_FOUND == last_error || - ERROR_PATH_NOT_FOUND == last_error) - return 0; - - Sleep(RM_RETRY_DELAY * retries * retries); - } - while (retries++ <= RM_RETRY_COUNT); - - return -1; -} - -static void -fs_rm(const char *_source) -{ - WCHAR wsource[MAX_PATH]; - DWORD attrs; - - /* The input path is UTF-8. Convert it to wide characters - * for use with the Windows API */ - cl_assert(MultiByteToWideChar(CP_UTF8, - MB_ERR_INVALID_CHARS, - _source, - -1, /* Indicates NULL termination */ - wsource, - MAX_PATH)); - - /* Does the item exist? If not, we have no work to do */ - attrs = GetFileAttributesW(wsource); - - if (INVALID_FILE_ATTRIBUTES == attrs) - return; - - if (FILE_ATTRIBUTE_DIRECTORY & attrs) - fs_rmdir_helper(wsource); - else { - /* The item is a file. Strip the +R bit */ - if (FILE_ATTRIBUTE_READONLY & attrs) - cl_assert(SetFileAttributesW(wsource, attrs & ~FILE_ATTRIBUTE_READONLY)); - - cl_assert(DeleteFileW(wsource)); - } - - /* Wait for the DeleteFile or RemoveDirectory call to complete */ - cl_assert(0 == fs_rm_wait(wsource)); -} - -static void -fs_copydir_helper(WCHAR *_wsource, WCHAR *_wdest) -{ - WCHAR buf_source[MAX_PATH], buf_dest[MAX_PATH]; - HANDLE find_handle; - WIN32_FIND_DATAW find_data; - size_t buf_source_prefix_len, buf_dest_prefix_len; - - wcscpy_s(buf_source, MAX_PATH, _wsource); - wcscat_s(buf_source, MAX_PATH, L"\\"); - buf_source_prefix_len = wcslen(buf_source); - - wcscpy_s(buf_dest, MAX_PATH, _wdest); - wcscat_s(buf_dest, MAX_PATH, L"\\"); - buf_dest_prefix_len = wcslen(buf_dest); - - /* Get an enumerator for the items in the source. */ - wcscat_s(buf_source, MAX_PATH, L"*"); - find_handle = FindFirstFileW(buf_source, &find_data); - cl_assert(INVALID_HANDLE_VALUE != find_handle); - - /* Create the target directory. */ - cl_assert(CreateDirectoryW(_wdest, NULL)); - - do { - /* FindFirstFile/FindNextFile gives back . and .. - * entries at the beginning */ - if (fs__dotordotdot(find_data.cFileName)) - continue; - - wcscpy_s(buf_source + buf_source_prefix_len, MAX_PATH - buf_source_prefix_len, find_data.cFileName); - wcscpy_s(buf_dest + buf_dest_prefix_len, MAX_PATH - buf_dest_prefix_len, find_data.cFileName); - - if (FILE_ATTRIBUTE_DIRECTORY & find_data.dwFileAttributes) - fs_copydir_helper(buf_source, buf_dest); - else - cl_assert(CopyFileW(buf_source, buf_dest, TRUE)); - } - while (FindNextFileW(find_handle, &find_data)); - - /* Ensure that we successfully completed the enumeration */ - cl_assert(ERROR_NO_MORE_FILES == GetLastError()); - - /* Close the find handle */ - FindClose(find_handle); -} - -static void -fs_copy(const char *_source, const char *_dest) -{ - WCHAR wsource[MAX_PATH], wdest[MAX_PATH]; - DWORD source_attrs, dest_attrs; - HANDLE find_handle; - WIN32_FIND_DATAW find_data; - - /* The input paths are UTF-8. Convert them to wide characters - * for use with the Windows API. */ - cl_assert(MultiByteToWideChar(CP_UTF8, - MB_ERR_INVALID_CHARS, - _source, - -1, - wsource, - MAX_PATH)); - - cl_assert(MultiByteToWideChar(CP_UTF8, - MB_ERR_INVALID_CHARS, - _dest, - -1, - wdest, - MAX_PATH)); - - /* Check the source for existence */ - source_attrs = GetFileAttributesW(wsource); - cl_assert(INVALID_FILE_ATTRIBUTES != source_attrs); - - /* Check the target for existence */ - dest_attrs = GetFileAttributesW(wdest); - - if (INVALID_FILE_ATTRIBUTES != dest_attrs) { - /* Target exists; append last path part of source to target. - * Use FindFirstFile to parse the path */ - find_handle = FindFirstFileW(wsource, &find_data); - cl_assert(INVALID_HANDLE_VALUE != find_handle); - wcscat_s(wdest, MAX_PATH, L"\\"); - wcscat_s(wdest, MAX_PATH, find_data.cFileName); - FindClose(find_handle); - - /* Check the new target for existence */ - cl_assert(INVALID_FILE_ATTRIBUTES == GetFileAttributesW(wdest)); - } - - if (FILE_ATTRIBUTE_DIRECTORY & source_attrs) - fs_copydir_helper(wsource, wdest); - else - cl_assert(CopyFileW(wsource, wdest, TRUE)); -} - -void -cl_fs_cleanup(void) -{ - fs_rm(fixture_path(_clar_path, "*")); -} - -#else - -#include -#include - -static int -shell_out(char * const argv[]) -{ - int status, piderr; - pid_t pid; - - pid = fork(); - - if (pid < 0) { - fprintf(stderr, - "System error: `fork()` call failed (%d) - %s\n", - errno, strerror(errno)); - exit(-1); - } - - if (pid == 0) { - execv(argv[0], argv); - } - - do { - piderr = waitpid(pid, &status, WUNTRACED); - } while (piderr < 0 && (errno == EAGAIN || errno == EINTR)); - - return WEXITSTATUS(status); -} - -static void -fs_copy(const char *_source, const char *dest) -{ - char *argv[5]; - char *source; - size_t source_len; - - source = strdup(_source); - source_len = strlen(source); - - if (source[source_len - 1] == '/') - source[source_len - 1] = 0; - - argv[0] = "/bin/cp"; - argv[1] = "-R"; - argv[2] = source; - argv[3] = (char *)dest; - argv[4] = NULL; - - cl_must_pass_( - shell_out(argv), - "Failed to copy test fixtures to sandbox" - ); - - free(source); -} - -static void -fs_rm(const char *source) -{ - char *argv[4]; - - argv[0] = "/bin/rm"; - argv[1] = "-Rf"; - argv[2] = (char *)source; - argv[3] = NULL; - - cl_must_pass_( - shell_out(argv), - "Failed to cleanup the sandbox" - ); -} - -void -cl_fs_cleanup(void) -{ - clar_unsandbox(); - clar_sandbox(); -} -#endif diff --git a/vendor/libgit2/tests/clar/print.h b/vendor/libgit2/tests/clar/print.h deleted file mode 100644 index 6529b6b4c..000000000 --- a/vendor/libgit2/tests/clar/print.h +++ /dev/null @@ -1,66 +0,0 @@ - -static void clar_print_init(int test_count, int suite_count, const char *suite_names) -{ - (void)test_count; - printf("Loaded %d suites: %s\n", (int)suite_count, suite_names); - printf("Started\n"); -} - -static void clar_print_shutdown(int test_count, int suite_count, int error_count) -{ - (void)test_count; - (void)suite_count; - (void)error_count; - - printf("\n\n"); - clar_report_errors(); -} - -static void clar_print_error(int num, const struct clar_error *error) -{ - printf(" %d) Failure:\n", num); - - printf("%s::%s [%s:%d]\n", - error->suite, - error->test, - error->file, - error->line_number); - - printf(" %s\n", error->error_msg); - - if (error->description != NULL) - printf(" %s\n", error->description); - - printf("\n"); - fflush(stdout); -} - -static void clar_print_ontest(const char *test_name, int test_number, enum cl_test_status status) -{ - (void)test_name; - (void)test_number; - - switch(status) { - case CL_TEST_OK: printf("."); break; - case CL_TEST_FAILURE: printf("F"); break; - case CL_TEST_SKIP: printf("S"); break; - } - - fflush(stdout); -} - -static void clar_print_onsuite(const char *suite_name, int suite_index) -{ - if (_clar.report_suite_names) - printf("\n%s", suite_name); - - (void)suite_index; -} - -static void clar_print_onabort(const char *msg, ...) -{ - va_list argp; - va_start(argp, msg); - vfprintf(stderr, msg, argp); - va_end(argp); -} diff --git a/vendor/libgit2/tests/clar/sandbox.h b/vendor/libgit2/tests/clar/sandbox.h deleted file mode 100644 index 4b83bf31d..000000000 --- a/vendor/libgit2/tests/clar/sandbox.h +++ /dev/null @@ -1,139 +0,0 @@ -static char _clar_path[4096]; - -static int -is_valid_tmp_path(const char *path) -{ - STAT_T st; - - if (stat(path, &st) != 0) - return 0; - - if (!S_ISDIR(st.st_mode)) - return 0; - - return (access(path, W_OK) == 0); -} - -static int -find_tmp_path(char *buffer, size_t length) -{ -#ifndef _WIN32 - static const size_t var_count = 5; - static const char *env_vars[] = { - "CLAR_TMP", "TMPDIR", "TMP", "TEMP", "USERPROFILE" - }; - - size_t i; - - for (i = 0; i < var_count; ++i) { - const char *env = getenv(env_vars[i]); - if (!env) - continue; - - if (is_valid_tmp_path(env)) { - strncpy(buffer, env, length); - return 0; - } - } - - /* If the environment doesn't say anything, try to use /tmp */ - if (is_valid_tmp_path("/tmp")) { - strncpy(buffer, "/tmp", length); - return 0; - } - -#else - DWORD env_len = GetEnvironmentVariable("CLAR_TMP", buffer, (DWORD)length); - if (env_len > 0 && env_len < (DWORD)length) - return 0; - - if (GetTempPath((DWORD)length, buffer)) - return 0; -#endif - - /* This system doesn't like us, try to use the current directory */ - if (is_valid_tmp_path(".")) { - strncpy(buffer, ".", length); - return 0; - } - - return -1; -} - -static void clar_unsandbox(void) -{ - if (_clar_path[0] == '\0') - return; - - cl_must_pass(chdir("..")); - - fs_rm(_clar_path); -} - -static int build_sandbox_path(void) -{ -#ifdef CLAR_TMPDIR - const char path_tail[] = CLAR_TMPDIR "_XXXXXX"; -#else - const char path_tail[] = "clar_tmp_XXXXXX"; -#endif - - size_t len; - - if (find_tmp_path(_clar_path, sizeof(_clar_path)) < 0) - return -1; - - len = strlen(_clar_path); - -#ifdef _WIN32 - { /* normalize path to POSIX forward slashes */ - size_t i; - for (i = 0; i < len; ++i) { - if (_clar_path[i] == '\\') - _clar_path[i] = '/'; - } - } -#endif - - if (_clar_path[len - 1] != '/') { - _clar_path[len++] = '/'; - } - - strncpy(_clar_path + len, path_tail, sizeof(_clar_path) - len); - -#if defined(__MINGW32__) - if (_mktemp(_clar_path) == NULL) - return -1; - - if (mkdir(_clar_path, 0700) != 0) - return -1; -#elif defined(_WIN32) - if (_mktemp_s(_clar_path, sizeof(_clar_path)) != 0) - return -1; - - if (mkdir(_clar_path, 0700) != 0) - return -1; -#else - if (mkdtemp(_clar_path) == NULL) - return -1; -#endif - - return 0; -} - -static int clar_sandbox(void) -{ - if (_clar_path[0] == '\0' && build_sandbox_path() < 0) - return -1; - - if (chdir(_clar_path) != 0) - return -1; - - return 0; -} - -const char *clar_sandbox_path(void) -{ - return _clar_path; -} - diff --git a/vendor/libgit2/tests/clar_libgit2.c b/vendor/libgit2/tests/clar_libgit2.c deleted file mode 100644 index 314d3441e..000000000 --- a/vendor/libgit2/tests/clar_libgit2.c +++ /dev/null @@ -1,584 +0,0 @@ -#include "clar_libgit2.h" -#include "posix.h" -#include "path.h" -#include "git2/sys/repository.h" - -void cl_git_report_failure( - int error, const char *file, int line, const char *fncall) -{ - char msg[4096]; - const git_error *last = giterr_last(); - p_snprintf(msg, 4096, "error %d - %s", - error, last ? last->message : ""); - clar__assert(0, file, line, fncall, msg, 1); -} - -void cl_git_mkfile(const char *filename, const char *content) -{ - int fd; - - fd = p_creat(filename, 0666); - cl_assert(fd != -1); - - if (content) { - cl_must_pass(p_write(fd, content, strlen(content))); - } else { - cl_must_pass(p_write(fd, filename, strlen(filename))); - cl_must_pass(p_write(fd, "\n", 1)); - } - - cl_must_pass(p_close(fd)); -} - -void cl_git_write2file( - const char *path, const char *content, size_t content_len, - int flags, unsigned int mode) -{ - int fd; - cl_assert(path && content); - cl_assert((fd = p_open(path, flags, mode)) >= 0); - if (!content_len) - content_len = strlen(content); - cl_must_pass(p_write(fd, content, content_len)); - cl_must_pass(p_close(fd)); -} - -void cl_git_append2file(const char *path, const char *content) -{ - cl_git_write2file(path, content, 0, O_WRONLY | O_CREAT | O_APPEND, 0644); -} - -void cl_git_rewritefile(const char *path, const char *content) -{ - cl_git_write2file(path, content, 0, O_WRONLY | O_CREAT | O_TRUNC, 0644); -} - -void cl_git_rmfile(const char *filename) -{ - cl_must_pass(p_unlink(filename)); -} - -char *cl_getenv(const char *name) -{ - git_buf out = GIT_BUF_INIT; - int error = git__getenv(&out, name); - - cl_assert(error >= 0 || error == GIT_ENOTFOUND); - - if (error == GIT_ENOTFOUND) - return NULL; - - if (out.size == 0) { - char *dup = git__strdup(""); - cl_assert(dup); - - return dup; - } - - return git_buf_detach(&out); -} - -bool cl_is_env_set(const char *name) -{ - char *env = cl_getenv(name); - bool result = (env != NULL); - git__free(env); - return result; -} - -#ifdef GIT_WIN32 - -#include "win32/utf-conv.h" - -int cl_setenv(const char *name, const char *value) -{ - wchar_t *wide_name, *wide_value = NULL; - - cl_assert(git__utf8_to_16_alloc(&wide_name, name) >= 0); - - if (value) { - cl_assert(git__utf8_to_16_alloc(&wide_value, value) >= 0); - cl_assert(SetEnvironmentVariableW(wide_name, wide_value)); - } else { - /* Windows XP returns 0 (failed) when passing NULL for lpValue when - * lpName does not exist in the environment block. This behavior - * seems to have changed in later versions. Don't check the return value - * of SetEnvironmentVariable when passing NULL for lpValue. */ - SetEnvironmentVariableW(wide_name, NULL); - } - - git__free(wide_name); - git__free(wide_value); - return 0; -} - -/* This function performs retries on calls to MoveFile in order - * to provide enhanced reliability in the face of antivirus - * agents that may be scanning the source (or in the case that - * the source is a directory, a child of the source). */ -int cl_rename(const char *source, const char *dest) -{ - git_win32_path source_utf16; - git_win32_path dest_utf16; - unsigned retries = 1; - - cl_assert(git_win32_path_from_utf8(source_utf16, source) >= 0); - cl_assert(git_win32_path_from_utf8(dest_utf16, dest) >= 0); - - while (!MoveFileW(source_utf16, dest_utf16)) { - /* Only retry if the error is ERROR_ACCESS_DENIED; - * this may indicate that an antivirus agent is - * preventing the rename from source to target */ - if (retries > 5 || - ERROR_ACCESS_DENIED != GetLastError()) - return -1; - - /* With 5 retries and a coefficient of 10ms, the maximum - * delay here is 550 ms */ - Sleep(10 * retries * retries); - retries++; - } - - return 0; -} - -#else - -#include - -int cl_setenv(const char *name, const char *value) -{ - return (value == NULL) ? unsetenv(name) : setenv(name, value, 1); -} - -int cl_rename(const char *source, const char *dest) -{ - return p_rename(source, dest); -} - -#endif - -static const char *_cl_sandbox = NULL; -static git_repository *_cl_repo = NULL; - -git_repository *cl_git_sandbox_init(const char *sandbox) -{ - /* Copy the whole sandbox folder from our fixtures to our test sandbox - * area. After this it can be accessed with `./sandbox` - */ - cl_fixture_sandbox(sandbox); - _cl_sandbox = sandbox; - - cl_git_pass(p_chdir(sandbox)); - - /* If this is not a bare repo, then rename `sandbox/.gitted` to - * `sandbox/.git` which must be done since we cannot store a folder - * named `.git` inside the fixtures folder of our libgit2 repo. - */ - if (p_access(".gitted", F_OK) == 0) - cl_git_pass(cl_rename(".gitted", ".git")); - - /* If we have `gitattributes`, rename to `.gitattributes`. This may - * be necessary if we don't want the attributes to be applied in the - * libgit2 repo, but just during testing. - */ - if (p_access("gitattributes", F_OK) == 0) - cl_git_pass(cl_rename("gitattributes", ".gitattributes")); - - /* As with `gitattributes`, we may need `gitignore` just for testing. */ - if (p_access("gitignore", F_OK) == 0) - cl_git_pass(cl_rename("gitignore", ".gitignore")); - - cl_git_pass(p_chdir("..")); - - /* Now open the sandbox repository and make it available for tests */ - cl_git_pass(git_repository_open(&_cl_repo, sandbox)); - - /* Adjust configs after copying to new filesystem */ - cl_git_pass(git_repository_reinit_filesystem(_cl_repo, 0)); - - return _cl_repo; -} - -git_repository *cl_git_sandbox_init_new(const char *sandbox) -{ - cl_git_pass(git_repository_init(&_cl_repo, sandbox, false)); - _cl_sandbox = sandbox; - - return _cl_repo; -} - -git_repository *cl_git_sandbox_reopen(void) -{ - if (_cl_repo) { - git_repository_free(_cl_repo); - _cl_repo = NULL; - - cl_git_pass(git_repository_open(&_cl_repo, _cl_sandbox)); - } - - return _cl_repo; -} - -void cl_git_sandbox_cleanup(void) -{ - if (_cl_repo) { - git_repository_free(_cl_repo); - _cl_repo = NULL; - } - if (_cl_sandbox) { - cl_fixture_cleanup(_cl_sandbox); - _cl_sandbox = NULL; - } -} - -bool cl_toggle_filemode(const char *filename) -{ - struct stat st1, st2; - - cl_must_pass(p_stat(filename, &st1)); - cl_must_pass(p_chmod(filename, st1.st_mode ^ 0100)); - cl_must_pass(p_stat(filename, &st2)); - - return (st1.st_mode != st2.st_mode); -} - -bool cl_is_chmod_supported(void) -{ - static int _is_supported = -1; - - if (_is_supported < 0) { - cl_git_mkfile("filemode.t", "Test if filemode can be modified"); - _is_supported = cl_toggle_filemode("filemode.t"); - cl_must_pass(p_unlink("filemode.t")); - } - - return _is_supported; -} - -const char* cl_git_fixture_url(const char *fixturename) -{ - return cl_git_path_url(cl_fixture(fixturename)); -} - -const char* cl_git_path_url(const char *path) -{ - static char url[4096]; - - const char *in_buf; - git_buf path_buf = GIT_BUF_INIT; - git_buf url_buf = GIT_BUF_INIT; - - cl_git_pass(git_path_prettify_dir(&path_buf, path, NULL)); - cl_git_pass(git_buf_puts(&url_buf, "file://")); - -#ifdef GIT_WIN32 - /* - * A FILE uri matches the following format: file://[host]/path - * where "host" can be empty and "path" is an absolute path to the resource. - * - * In this test, no hostname is used, but we have to ensure the leading triple slashes: - * - * *nix: file:///usr/home/... - * Windows: file:///C:/Users/... - */ - cl_git_pass(git_buf_putc(&url_buf, '/')); -#endif - - in_buf = git_buf_cstr(&path_buf); - - /* - * A very hacky Url encoding that only takes care of escaping the spaces - */ - while (*in_buf) { - if (*in_buf == ' ') - cl_git_pass(git_buf_puts(&url_buf, "%20")); - else - cl_git_pass(git_buf_putc(&url_buf, *in_buf)); - - in_buf++; - } - - cl_assert(url_buf.size < 4096); - - strncpy(url, git_buf_cstr(&url_buf), 4096); - git_buf_free(&url_buf); - git_buf_free(&path_buf); - return url; -} - -typedef struct { - const char *filename; - size_t filename_len; -} remove_data; - -static int remove_placeholders_recurs(void *_data, git_buf *path) -{ - remove_data *data = (remove_data *)_data; - size_t pathlen; - - if (git_path_isdir(path->ptr) == true) - return git_path_direach(path, 0, remove_placeholders_recurs, data); - - pathlen = path->size; - - if (pathlen < data->filename_len) - return 0; - - /* if path ends in '/'+filename (or equals filename) */ - if (!strcmp(data->filename, path->ptr + pathlen - data->filename_len) && - (pathlen == data->filename_len || - path->ptr[pathlen - data->filename_len - 1] == '/')) - return p_unlink(path->ptr); - - return 0; -} - -int cl_git_remove_placeholders(const char *directory_path, const char *filename) -{ - int error; - remove_data data; - git_buf buffer = GIT_BUF_INIT; - - if (git_path_isdir(directory_path) == false) - return -1; - - if (git_buf_sets(&buffer, directory_path) < 0) - return -1; - - data.filename = filename; - data.filename_len = strlen(filename); - - error = remove_placeholders_recurs(&data, &buffer); - - git_buf_free(&buffer); - - return error; -} - -#define CL_COMMIT_NAME "Libgit2 Tester" -#define CL_COMMIT_EMAIL "libgit2-test@github.com" -#define CL_COMMIT_MSG "Test commit of tree " - -void cl_repo_commit_from_index( - git_oid *out, - git_repository *repo, - git_signature *sig, - git_time_t time, - const char *msg) -{ - git_index *index; - git_oid commit_id, tree_id; - git_object *parent = NULL; - git_reference *ref = NULL; - git_tree *tree = NULL; - char buf[128]; - int free_sig = (sig == NULL); - - /* it is fine if looking up HEAD fails - we make this the first commit */ - git_revparse_ext(&parent, &ref, repo, "HEAD"); - - /* write the index content as a tree */ - cl_git_pass(git_repository_index(&index, repo)); - cl_git_pass(git_index_write_tree(&tree_id, index)); - cl_git_pass(git_index_write(index)); - git_index_free(index); - - cl_git_pass(git_tree_lookup(&tree, repo, &tree_id)); - - if (sig) - cl_assert(sig->name && sig->email); - else if (!time) - cl_git_pass(git_signature_now(&sig, CL_COMMIT_NAME, CL_COMMIT_EMAIL)); - else - cl_git_pass(git_signature_new( - &sig, CL_COMMIT_NAME, CL_COMMIT_EMAIL, time, 0)); - - if (!msg) { - strcpy(buf, CL_COMMIT_MSG); - git_oid_tostr(buf + strlen(CL_COMMIT_MSG), - sizeof(buf) - strlen(CL_COMMIT_MSG), &tree_id); - msg = buf; - } - - cl_git_pass(git_commit_create_v( - &commit_id, repo, ref ? git_reference_name(ref) : "HEAD", - sig, sig, NULL, msg, tree, parent ? 1 : 0, parent)); - - if (out) - git_oid_cpy(out, &commit_id); - - git_object_free(parent); - git_reference_free(ref); - if (free_sig) - git_signature_free(sig); - git_tree_free(tree); -} - -void cl_repo_set_bool(git_repository *repo, const char *cfg, int value) -{ - git_config *config; - cl_git_pass(git_repository_config(&config, repo)); - cl_git_pass(git_config_set_bool(config, cfg, value != 0)); - git_config_free(config); -} - -int cl_repo_get_bool(git_repository *repo, const char *cfg) -{ - int val = 0; - git_config *config; - cl_git_pass(git_repository_config(&config, repo)); - if (git_config_get_bool(&val, config, cfg) < 0) - giterr_clear(); - git_config_free(config); - return val; -} - -void cl_repo_set_string(git_repository *repo, const char *cfg, const char *value) -{ - git_config *config; - cl_git_pass(git_repository_config(&config, repo)); - cl_git_pass(git_config_set_string(config, cfg, value)); - git_config_free(config); -} - -/* this is essentially the code from git__unescape modified slightly */ -static size_t strip_cr_from_buf(char *start, size_t len) -{ - char *scan, *trail, *end = start + len; - - for (scan = trail = start; scan < end; trail++, scan++) { - while (*scan == '\r') - scan++; /* skip '\r' */ - - if (trail != scan) - *trail = *scan; - } - - *trail = '\0'; - - return (trail - start); -} - -void clar__assert_equal_file( - const char *expected_data, - size_t expected_bytes, - int ignore_cr, - const char *path, - const char *file, - int line) -{ - char buf[4000]; - ssize_t bytes, total_bytes = 0; - int fd = p_open(path, O_RDONLY | O_BINARY); - cl_assert(fd >= 0); - - if (expected_data && !expected_bytes) - expected_bytes = strlen(expected_data); - - while ((bytes = p_read(fd, buf, sizeof(buf))) != 0) { - clar__assert( - bytes > 0, file, line, "error reading from file", path, 1); - - if (ignore_cr) - bytes = strip_cr_from_buf(buf, bytes); - - if (memcmp(expected_data, buf, bytes) != 0) { - int pos; - for (pos = 0; pos < bytes && expected_data[pos] == buf[pos]; ++pos) - /* find differing byte offset */; - p_snprintf( - buf, sizeof(buf), "file content mismatch at byte %"PRIdZ, - (ssize_t)(total_bytes + pos)); - p_close(fd); - clar__fail(file, line, path, buf, 1); - } - - expected_data += bytes; - total_bytes += bytes; - } - - p_close(fd); - - clar__assert(!bytes, file, line, "error reading from file", path, 1); - clar__assert_equal(file, line, "mismatched file length", 1, "%"PRIuZ, - (size_t)expected_bytes, (size_t)total_bytes); -} - -static char *_cl_restore_home = NULL; - -void cl_fake_home_cleanup(void *payload) -{ - char *restore = _cl_restore_home; - _cl_restore_home = NULL; - - GIT_UNUSED(payload); - - if (restore) { - cl_git_pass(git_libgit2_opts( - GIT_OPT_SET_SEARCH_PATH, GIT_CONFIG_LEVEL_GLOBAL, restore)); - git__free(restore); - } -} - -void cl_fake_home(void) -{ - git_buf path = GIT_BUF_INIT; - - cl_git_pass(git_libgit2_opts( - GIT_OPT_GET_SEARCH_PATH, GIT_CONFIG_LEVEL_GLOBAL, &path)); - - _cl_restore_home = git_buf_detach(&path); - cl_set_cleanup(cl_fake_home_cleanup, NULL); - - if (!git_path_exists("home")) - cl_must_pass(p_mkdir("home", 0777)); - cl_git_pass(git_path_prettify(&path, "home", NULL)); - cl_git_pass(git_libgit2_opts( - GIT_OPT_SET_SEARCH_PATH, GIT_CONFIG_LEVEL_GLOBAL, path.ptr)); - git_buf_free(&path); -} - -void cl_sandbox_set_search_path_defaults(void) -{ - git_buf path = GIT_BUF_INIT; - - git_buf_joinpath(&path, clar_sandbox_path(), "__config"); - - if (!git_path_exists(path.ptr)) - cl_must_pass(p_mkdir(path.ptr, 0777)); - - git_libgit2_opts( - GIT_OPT_SET_SEARCH_PATH, GIT_CONFIG_LEVEL_GLOBAL, path.ptr); - git_libgit2_opts( - GIT_OPT_SET_SEARCH_PATH, GIT_CONFIG_LEVEL_XDG, path.ptr); - git_libgit2_opts( - GIT_OPT_SET_SEARCH_PATH, GIT_CONFIG_LEVEL_SYSTEM, path.ptr); - git_libgit2_opts( - GIT_OPT_SET_SEARCH_PATH, GIT_CONFIG_LEVEL_PROGRAMDATA, path.ptr); - - git_buf_free(&path); -} - -#ifdef GIT_WIN32 -bool cl_sandbox_supports_8dot3(void) -{ - git_buf longpath = GIT_BUF_INIT; - char *shortname; - bool supported; - - cl_git_pass( - git_buf_joinpath(&longpath, clar_sandbox_path(), "longer_than_8dot3")); - - cl_git_write2file(longpath.ptr, "", 0, O_RDWR|O_CREAT, 0666); - shortname = git_win32_path_8dot3_name(longpath.ptr); - - supported = (shortname != NULL); - - git__free(shortname); - git_buf_free(&longpath); - - return supported; -} -#endif - diff --git a/vendor/libgit2/tests/clar_libgit2.h b/vendor/libgit2/tests/clar_libgit2.h deleted file mode 100644 index d7e635302..000000000 --- a/vendor/libgit2/tests/clar_libgit2.h +++ /dev/null @@ -1,170 +0,0 @@ -#ifndef __CLAR_LIBGIT2__ -#define __CLAR_LIBGIT2__ - -#include "clar.h" -#include -#include -#include "common.h" - -/** - * Replace for `clar_must_pass` that passes the last library error as the - * test failure message. - * - * Use this wrapper around all `git_` library calls that return error codes! - */ -#define cl_git_pass(expr) cl_git_pass_((expr), __FILE__, __LINE__) - -#define cl_git_pass_(expr, file, line) do { \ - int _lg2_error; \ - giterr_clear(); \ - if ((_lg2_error = (expr)) != 0) \ - cl_git_report_failure(_lg2_error, file, line, "Function call failed: " #expr); \ - } while (0) - -/** - * Wrapper for `clar_must_fail` -- this one is - * just for consistency. Use with `git_` library - * calls that are supposed to fail! - */ -#define cl_git_fail(expr) cl_must_fail(expr) - -#define cl_git_fail_with(expr, error) cl_assert_equal_i(error,expr) - -/** - * Like cl_git_pass, only for Win32 error code conventions - */ -#define cl_win32_pass(expr) do { \ - int _win32_res; \ - if ((_win32_res = (expr)) == 0) { \ - giterr_set(GITERR_OS, "Returned: %d, system error code: %d", _win32_res, GetLastError()); \ - cl_git_report_failure(_win32_res, __FILE__, __LINE__, "System call failed: " #expr); \ - } \ - } while(0) - -void cl_git_report_failure(int, const char *, int, const char *); - -#define cl_assert_at_line(expr,file,line) \ - clar__assert((expr) != 0, file, line, "Expression is not true: " #expr, NULL, 1) - -GIT_INLINE(void) clar__assert_in_range( - int lo, int val, int hi, - const char *file, int line, const char *err, int should_abort) -{ - if (lo > val || hi < val) { - char buf[128]; - p_snprintf(buf, sizeof(buf), "%d not in [%d,%d]", val, lo, hi); - clar__fail(file, line, err, buf, should_abort); - } -} - -#define cl_assert_equal_sz(sz1,sz2) do { \ - size_t __sz1 = (size_t)(sz1), __sz2 = (size_t)(sz2); \ - clar__assert_equal(__FILE__,__LINE__,#sz1 " != " #sz2, 1, "%"PRIuZ, __sz1, __sz2); \ -} while (0) - -#define cl_assert_in_range(L,V,H) \ - clar__assert_in_range((L),(V),(H),__FILE__,__LINE__,"Range check: " #V " in [" #L "," #H "]", 1) - -#define cl_assert_equal_file(DATA,SIZE,PATH) \ - clar__assert_equal_file(DATA,SIZE,0,PATH,__FILE__,(int)__LINE__) - -#define cl_assert_equal_file_ignore_cr(DATA,SIZE,PATH) \ - clar__assert_equal_file(DATA,SIZE,1,PATH,__FILE__,(int)__LINE__) - -void clar__assert_equal_file( - const char *expected_data, - size_t expected_size, - int ignore_cr, - const char *path, - const char *file, - int line); - -GIT_INLINE(void) clar__assert_equal_oid( - const char *file, int line, const char *desc, - const git_oid *one, const git_oid *two) -{ - if (git_oid_cmp(one, two)) { - char err[] = "\"........................................\" != \"........................................\""; - - git_oid_fmt(&err[1], one); - git_oid_fmt(&err[47], two); - - clar__fail(file, line, desc, err, 1); - } -} - -#define cl_assert_equal_oid(one, two) \ - clar__assert_equal_oid(__FILE__, __LINE__, \ - "OID mismatch: " #one " != " #two, (one), (two)) - -/* - * Some utility macros for building long strings - */ -#define REP4(STR) STR STR STR STR -#define REP15(STR) REP4(STR) REP4(STR) REP4(STR) STR STR STR -#define REP16(STR) REP4(REP4(STR)) -#define REP256(STR) REP16(REP16(STR)) -#define REP1024(STR) REP4(REP256(STR)) - -/* Write the contents of a buffer to disk */ -void cl_git_mkfile(const char *filename, const char *content); -void cl_git_append2file(const char *filename, const char *new_content); -void cl_git_rewritefile(const char *filename, const char *new_content); -void cl_git_write2file(const char *path, const char *data, - size_t datalen, int flags, unsigned int mode); -void cl_git_rmfile(const char *filename); - -bool cl_toggle_filemode(const char *filename); -bool cl_is_chmod_supported(void); - -/* Environment wrappers */ -char *cl_getenv(const char *name); -bool cl_is_env_set(const char *name); -int cl_setenv(const char *name, const char *value); - -/* Reliable rename */ -int cl_rename(const char *source, const char *dest); - -/* Git sandbox setup helpers */ - -git_repository *cl_git_sandbox_init(const char *sandbox); -git_repository *cl_git_sandbox_init_new(const char *name); -void cl_git_sandbox_cleanup(void); -git_repository *cl_git_sandbox_reopen(void); - -/* Local-repo url helpers */ -const char* cl_git_fixture_url(const char *fixturename); -const char* cl_git_path_url(const char *path); - -/* Test repository cleaner */ -int cl_git_remove_placeholders(const char *directory_path, const char *filename); - -/* commit creation helpers */ -void cl_repo_commit_from_index( - git_oid *out, - git_repository *repo, - git_signature *sig, - git_time_t time, - const char *msg); - -/* config setting helpers */ -void cl_repo_set_bool(git_repository *repo, const char *cfg, int value); -int cl_repo_get_bool(git_repository *repo, const char *cfg); - -void cl_repo_set_string(git_repository *repo, const char *cfg, const char *value); - -/* set up a fake "home" directory and set libgit2 GLOBAL search path. - * - * automatically configures cleanup function to restore the regular search - * path, although you can call it explicitly if you wish (with NULL). - */ -void cl_fake_home(void); -void cl_fake_home_cleanup(void *); - -void cl_sandbox_set_search_path_defaults(void); - -#ifdef GIT_WIN32 -bool cl_sandbox_supports_8dot3(void); -#endif - -#endif diff --git a/vendor/libgit2/tests/clar_libgit2_timer.c b/vendor/libgit2/tests/clar_libgit2_timer.c deleted file mode 100644 index 737506da2..000000000 --- a/vendor/libgit2/tests/clar_libgit2_timer.c +++ /dev/null @@ -1,31 +0,0 @@ -#include "clar_libgit2.h" -#include "clar_libgit2_timer.h" -#include "buffer.h" - -void cl_perf_timer__init(cl_perf_timer *t) -{ - memset(t, 0, sizeof(cl_perf_timer)); -} - -void cl_perf_timer__start(cl_perf_timer *t) -{ - t->time_started = git__timer(); -} - -void cl_perf_timer__stop(cl_perf_timer *t) -{ - double time_now = git__timer(); - - t->last = time_now - t->time_started; - t->sum += t->last; -} - -double cl_perf_timer__last(const cl_perf_timer *t) -{ - return t->last; -} - -double cl_perf_timer__sum(const cl_perf_timer *t) -{ - return t->sum; -} diff --git a/vendor/libgit2/tests/clar_libgit2_timer.h b/vendor/libgit2/tests/clar_libgit2_timer.h deleted file mode 100644 index 0d150e018..000000000 --- a/vendor/libgit2/tests/clar_libgit2_timer.h +++ /dev/null @@ -1,35 +0,0 @@ -#ifndef __CLAR_LIBGIT2_TIMER__ -#define __CLAR_LIBGIT2_TIMER__ - -struct cl_perf_timer -{ - /* cummulative running time across all start..stop intervals */ - double sum; - - /* value of last start..stop interval */ - double last; - - /* clock value at start */ - double time_started; -}; - -#define CL_PERF_TIMER_INIT {0} - -typedef struct cl_perf_timer cl_perf_timer; - -void cl_perf_timer__init(cl_perf_timer *t); -void cl_perf_timer__start(cl_perf_timer *t); -void cl_perf_timer__stop(cl_perf_timer *t); - -/** - * return value of last start..stop interval in seconds. - */ -double cl_perf_timer__last(const cl_perf_timer *t); - -/** - * return cummulative running time across all start..stop - * intervals in seconds. - */ -double cl_perf_timer__sum(const cl_perf_timer *t); - -#endif /* __CLAR_LIBGIT2_TIMER__ */ diff --git a/vendor/libgit2/tests/clar_libgit2_trace.c b/vendor/libgit2/tests/clar_libgit2_trace.c deleted file mode 100644 index aaeeb7810..000000000 --- a/vendor/libgit2/tests/clar_libgit2_trace.c +++ /dev/null @@ -1,248 +0,0 @@ -#include "clar_libgit2.h" -#include "clar_libgit2_trace.h" -#include "clar_libgit2_timer.h" -#include "trace.h" - - -struct method { - const char *name; - void (*git_trace_cb)(git_trace_level_t level, const char *msg); - void (*close)(void); -}; - - -#if defined(GIT_TRACE) -static void _git_trace_cb__printf(git_trace_level_t level, const char *msg) -{ - /* TODO Use level to print a per-message prefix. */ - GIT_UNUSED(level); - - printf("%s\n", msg); -} - -#if defined(GIT_WIN32) -static void _git_trace_cb__debug(git_trace_level_t level, const char *msg) -{ - /* TODO Use level to print a per-message prefix. */ - GIT_UNUSED(level); - - OutputDebugString(msg); - OutputDebugString("\n"); - - printf("%s\n", msg); -} -#else -#define _git_trace_cb__debug _git_trace_cb__printf -#endif - - -static void _trace_printf_close(void) -{ - fflush(stdout); -} - -#define _trace_debug_close _trace_printf_close - - -static struct method s_methods[] = { - { "printf", _git_trace_cb__printf, _trace_printf_close }, - { "debug", _git_trace_cb__debug, _trace_debug_close }, - /* TODO add file method */ - {0}, -}; - - -static int s_trace_loaded = 0; -static int s_trace_level = GIT_TRACE_NONE; -static struct method *s_trace_method = NULL; - - -static int set_method(const char *name) -{ - int k; - - if (!name || !*name) - name = "printf"; - - for (k=0; (s_methods[k].name); k++) { - if (strcmp(name, s_methods[k].name) == 0) { - s_trace_method = &s_methods[k]; - return 0; - } - } - fprintf(stderr, "Unknown CLAR_TRACE_METHOD: '%s'\n", name); - return -1; -} - - -/** - * Lookup CLAR_TRACE_LEVEL and CLAR_TRACE_METHOD from - * the environment and set the above s_trace_* fields. - * - * If CLAR_TRACE_LEVEL is not set, we disable tracing. - * - * TODO If set, we assume GIT_TRACE_TRACE level, which - * logs everything. Later, we may want to parse the - * value of the environment variable and set a specific - * level. - * - * We assume the "printf" method. This can be changed - * with the CLAR_TRACE_METHOD environment variable. - * Currently, this is only needed on Windows for a "debug" - * version which also writes to the debug output window - * in Visual Studio. - * - * TODO add a "file" method that would open and write - * to a well-known file. This would help keep trace - * output and clar output separate. - * - */ -static void _load_trace_params(void) -{ - char *sz_level; - char *sz_method; - - s_trace_loaded = 1; - - sz_level = cl_getenv("CLAR_TRACE_LEVEL"); - if (!sz_level || !*sz_level) { - s_trace_level = GIT_TRACE_NONE; - s_trace_method = NULL; - return; - } - - /* TODO Parse sz_level and set s_trace_level. */ - s_trace_level = GIT_TRACE_TRACE; - - sz_method = cl_getenv("CLAR_TRACE_METHOD"); - if (set_method(sz_method) < 0) - set_method(NULL); -} - -#define HR "================================================================" - -/** - * Timer to report the take spend in a test's run() method. - */ -static cl_perf_timer s_timer_run = CL_PERF_TIMER_INIT; - -/** - * Timer to report total time in a test (init, run, cleanup). - */ -static cl_perf_timer s_timer_test = CL_PERF_TIMER_INIT; - -void _cl_trace_cb__event_handler( - cl_trace_event ev, - const char *suite_name, - const char *test_name, - void *payload) -{ - GIT_UNUSED(payload); - - switch (ev) { - case CL_TRACE__SUITE_BEGIN: - git_trace(GIT_TRACE_TRACE, "\n\n%s\n%s: Begin Suite", HR, suite_name); -#if 0 && defined(GIT_MSVC_CRTDBG) - git_win32__crtdbg_stacktrace__dump( - GIT_WIN32__CRTDBG_STACKTRACE__SET_MARK, - suite_name); -#endif - break; - - case CL_TRACE__SUITE_END: -#if 0 && defined(GIT_MSVC_CRTDBG) - /* As an example of checkpointing, dump leaks within this suite. - * This may generate false positives for things like the global - * TLS error state and maybe the odb cache since they aren't - * freed until the global shutdown and outside the scope of this - * set of tests. - * - * This may under-report if the test itself uses a checkpoint. - * See tests/trace/windows/stacktrace.c - */ - git_win32__crtdbg_stacktrace__dump( - GIT_WIN32__CRTDBG_STACKTRACE__LEAKS_SINCE_MARK, - suite_name); -#endif - git_trace(GIT_TRACE_TRACE, "\n\n%s: End Suite\n%s", suite_name, HR); - break; - - case CL_TRACE__TEST__BEGIN: - git_trace(GIT_TRACE_TRACE, "\n%s::%s: Begin Test", suite_name, test_name); - cl_perf_timer__init(&s_timer_test); - cl_perf_timer__start(&s_timer_test); - break; - - case CL_TRACE__TEST__END: - cl_perf_timer__stop(&s_timer_test); - git_trace(GIT_TRACE_TRACE, "%s::%s: End Test (%.3f %.3f)", suite_name, test_name, - cl_perf_timer__last(&s_timer_run), - cl_perf_timer__last(&s_timer_test)); - break; - - case CL_TRACE__TEST__RUN_BEGIN: - git_trace(GIT_TRACE_TRACE, "%s::%s: Begin Run", suite_name, test_name); - cl_perf_timer__init(&s_timer_run); - cl_perf_timer__start(&s_timer_run); - break; - - case CL_TRACE__TEST__RUN_END: - cl_perf_timer__stop(&s_timer_run); - git_trace(GIT_TRACE_TRACE, "%s::%s: End Run", suite_name, test_name); - break; - - case CL_TRACE__TEST__LONGJMP: - cl_perf_timer__stop(&s_timer_run); - git_trace(GIT_TRACE_TRACE, "%s::%s: Aborted", suite_name, test_name); - break; - - default: - break; - } -} - -#endif /*GIT_TRACE*/ - -/** - * Setup/Enable git_trace() based upon settings user's environment. - * - */ -void cl_global_trace_register(void) -{ -#if defined(GIT_TRACE) - if (!s_trace_loaded) - _load_trace_params(); - - if (s_trace_level == GIT_TRACE_NONE) - return; - if (s_trace_method == NULL) - return; - if (s_trace_method->git_trace_cb == NULL) - return; - - git_trace_set(s_trace_level, s_trace_method->git_trace_cb); - cl_trace_register(_cl_trace_cb__event_handler, NULL); -#endif -} - -/** - * If we turned on git_trace() earlier, turn it off. - * - * This is intended to let us close/flush any buffered - * IO if necessary. - * - */ -void cl_global_trace_disable(void) -{ -#if defined(GIT_TRACE) - cl_trace_register(NULL, NULL); - git_trace_set(GIT_TRACE_NONE, NULL); - if (s_trace_method && s_trace_method->close) - s_trace_method->close(); - - /* Leave s_trace_ vars set so they can restart tracing - * since we only want to hit the environment variables - * once. - */ -#endif -} diff --git a/vendor/libgit2/tests/clar_libgit2_trace.h b/vendor/libgit2/tests/clar_libgit2_trace.h deleted file mode 100644 index 09d1e050f..000000000 --- a/vendor/libgit2/tests/clar_libgit2_trace.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef __CLAR_LIBGIT2_TRACE__ -#define __CLAR_LIBGIT2_TRACE__ - -void cl_global_trace_register(void); -void cl_global_trace_disable(void); - -#endif diff --git a/vendor/libgit2/tests/clone/empty.c b/vendor/libgit2/tests/clone/empty.c deleted file mode 100644 index 2a6217580..000000000 --- a/vendor/libgit2/tests/clone/empty.c +++ /dev/null @@ -1,85 +0,0 @@ -#include "clar_libgit2.h" - -#include "git2/clone.h" -#include "repository.h" - -static git_clone_options g_options; -static git_repository *g_repo; -static git_repository *g_repo_cloned; - -void test_clone_empty__initialize(void) -{ - git_repository *sandbox = cl_git_sandbox_init("empty_bare.git"); - git_fetch_options dummy_options = GIT_FETCH_OPTIONS_INIT; - cl_git_remove_placeholders(git_repository_path(sandbox), "dummy-marker.txt"); - - g_repo = NULL; - - memset(&g_options, 0, sizeof(git_clone_options)); - g_options.version = GIT_CLONE_OPTIONS_VERSION; - g_options.fetch_opts = dummy_options; -} - -void test_clone_empty__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -static void cleanup_repository(void *path) -{ - cl_fixture_cleanup((const char *)path); - - git_repository_free(g_repo_cloned); - g_repo_cloned = NULL; -} - -void test_clone_empty__can_clone_an_empty_local_repo_barely(void) -{ - char *local_name = "refs/heads/master"; - const char *expected_tracked_branch_name = "refs/remotes/origin/master"; - const char *expected_remote_name = "origin"; - git_buf buf = GIT_BUF_INIT; - git_reference *ref; - - cl_set_cleanup(&cleanup_repository, "./empty"); - - g_options.bare = true; - cl_git_pass(git_clone(&g_repo_cloned, "./empty_bare.git", "./empty", &g_options)); - - /* Although the HEAD is unborn... */ - cl_assert_equal_i(GIT_ENOTFOUND, git_reference_lookup(&ref, g_repo_cloned, local_name)); - - /* ...one can still retrieve the name of the remote tracking reference */ - cl_git_pass(git_branch_upstream_name(&buf, g_repo_cloned, local_name)); - - cl_assert_equal_s(expected_tracked_branch_name, buf.ptr); - git_buf_free(&buf); - - /* ...and the name of the remote... */ - cl_git_pass(git_branch_remote_name(&buf, g_repo_cloned, expected_tracked_branch_name)); - - cl_assert_equal_s(expected_remote_name, buf.ptr); - git_buf_free(&buf); - - /* ...even when the remote HEAD is unborn as well */ - cl_assert_equal_i(GIT_ENOTFOUND, git_reference_lookup(&ref, g_repo_cloned, - expected_tracked_branch_name)); -} - -void test_clone_empty__can_clone_an_empty_local_repo(void) -{ - cl_set_cleanup(&cleanup_repository, "./empty"); - - cl_git_pass(git_clone(&g_repo_cloned, "./empty_bare.git", "./empty", &g_options)); -} - -void test_clone_empty__can_clone_an_empty_standard_repo(void) -{ - cl_git_sandbox_cleanup(); - g_repo = cl_git_sandbox_init("empty_standard_repo"); - cl_git_remove_placeholders(git_repository_path(g_repo), "dummy-marker.txt"); - - cl_set_cleanup(&cleanup_repository, "./empty"); - - cl_git_pass(git_clone(&g_repo_cloned, "./empty_standard_repo", "./empty", &g_options)); -} diff --git a/vendor/libgit2/tests/clone/local.c b/vendor/libgit2/tests/clone/local.c deleted file mode 100644 index 91a0a1c2a..000000000 --- a/vendor/libgit2/tests/clone/local.c +++ /dev/null @@ -1,211 +0,0 @@ -#include "clar_libgit2.h" - -#include "git2/clone.h" -#include "clone.h" -#include "buffer.h" -#include "path.h" -#include "posix.h" -#include "fileops.h" - -static int file_url(git_buf *buf, const char *host, const char *path) -{ - if (path[0] == '/') - path++; - - git_buf_clear(buf); - return git_buf_printf(buf, "file://%s/%s", host, path); -} - -static int git_style_unc_path(git_buf *buf, const char *host, const char *path) -{ - git_buf_clear(buf); - - if (host) - git_buf_printf(buf, "//%s/", host); - - if (path[0] == '/') - path++; - - if (git__isalpha(path[0]) && path[1] == ':' && path[2] == '/') { - git_buf_printf(buf, "%c$/", path[0]); - path += 3; - } - - git_buf_puts(buf, path); - - return git_buf_oom(buf) ? -1 : 0; -} - -static int unc_path(git_buf *buf, const char *host, const char *path) -{ - char *c; - - if (git_style_unc_path(buf, host, path) < 0) - return -1; - - for (c = buf->ptr; *c; c++) - if (*c == '/') - *c = '\\'; - - return 0; -} - -void test_clone_local__should_clone_local(void) -{ - git_buf buf = GIT_BUF_INIT; - - /* we use a fixture path because it needs to exist for us to want to clone */ - const char *path = cl_fixture("testrepo.git"); - - cl_git_pass(file_url(&buf, "", path)); - cl_assert_equal_i(0, git_clone__should_clone_local(buf.ptr, GIT_CLONE_LOCAL_AUTO)); - cl_assert_equal_i(1, git_clone__should_clone_local(buf.ptr, GIT_CLONE_LOCAL)); - cl_assert_equal_i(1, git_clone__should_clone_local(buf.ptr, GIT_CLONE_LOCAL_NO_LINKS)); - cl_assert_equal_i(0, git_clone__should_clone_local(buf.ptr, GIT_CLONE_NO_LOCAL)); - - cl_git_pass(file_url(&buf, "localhost", path)); - cl_assert_equal_i(0, git_clone__should_clone_local(buf.ptr, GIT_CLONE_LOCAL_AUTO)); - cl_assert_equal_i(1, git_clone__should_clone_local(buf.ptr, GIT_CLONE_LOCAL)); - cl_assert_equal_i(1, git_clone__should_clone_local(buf.ptr, GIT_CLONE_LOCAL_NO_LINKS)); - cl_assert_equal_i(0, git_clone__should_clone_local(buf.ptr, GIT_CLONE_NO_LOCAL)); - - cl_git_pass(file_url(&buf, "other-host.mycompany.com", path)); - cl_assert_equal_i(0, git_clone__should_clone_local(buf.ptr, GIT_CLONE_LOCAL_AUTO)); - cl_assert_equal_i(0, git_clone__should_clone_local(buf.ptr, GIT_CLONE_LOCAL)); - cl_assert_equal_i(0, git_clone__should_clone_local(buf.ptr, GIT_CLONE_LOCAL_NO_LINKS)); - cl_assert_equal_i(0, git_clone__should_clone_local(buf.ptr, GIT_CLONE_NO_LOCAL)); - - /* Ensure that file:/// urls are percent decoded: .git == %2e%67%69%74 */ - cl_git_pass(file_url(&buf, "", path)); - git_buf_shorten(&buf, 4); - cl_git_pass(git_buf_puts(&buf, "%2e%67%69%74")); - cl_assert_equal_i(0, git_clone__should_clone_local(buf.ptr, GIT_CLONE_LOCAL_AUTO)); - cl_assert_equal_i(1, git_clone__should_clone_local(buf.ptr, GIT_CLONE_LOCAL)); - cl_assert_equal_i(1, git_clone__should_clone_local(buf.ptr, GIT_CLONE_LOCAL_NO_LINKS)); - cl_assert_equal_i(0, git_clone__should_clone_local(buf.ptr, GIT_CLONE_NO_LOCAL)); - - cl_assert_equal_i(1, git_clone__should_clone_local(path, GIT_CLONE_LOCAL_AUTO)); - cl_assert_equal_i(1, git_clone__should_clone_local(path, GIT_CLONE_LOCAL)); - cl_assert_equal_i(1, git_clone__should_clone_local(path, GIT_CLONE_LOCAL_NO_LINKS)); - cl_assert_equal_i(0, git_clone__should_clone_local(path, GIT_CLONE_NO_LOCAL)); - - git_buf_free(&buf); -} - -void test_clone_local__hardlinks(void) -{ - git_repository *repo; - git_clone_options opts = GIT_CLONE_OPTIONS_INIT; - git_buf buf = GIT_BUF_INIT; - struct stat st; - - /* - * In this first clone, we just copy over, since the temp dir - * will often be in a different filesystem, so we cannot - * link. It also allows us to control the number of links - */ - opts.bare = true; - opts.local = GIT_CLONE_LOCAL_NO_LINKS; - cl_git_pass(git_clone(&repo, cl_fixture("testrepo.git"), "./clone.git", &opts)); - git_repository_free(repo); - - /* This second clone is in the same filesystem, so we can hardlink */ - - opts.local = GIT_CLONE_LOCAL; - cl_git_pass(git_clone(&repo, cl_git_path_url("clone.git"), "./clone2.git", &opts)); - -#ifndef GIT_WIN32 - git_buf_clear(&buf); - cl_git_pass(git_buf_join_n(&buf, '/', 4, git_repository_path(repo), "objects", "08", "b041783f40edfe12bb406c9c9a8a040177c125")); - - cl_git_pass(p_stat(buf.ptr, &st)); - cl_assert_equal_i(2, st.st_nlink); -#endif - - git_repository_free(repo); - git_buf_clear(&buf); - - opts.local = GIT_CLONE_LOCAL_NO_LINKS; - cl_git_pass(git_clone(&repo, cl_git_path_url("clone.git"), "./clone3.git", &opts)); - - git_buf_clear(&buf); - cl_git_pass(git_buf_join_n(&buf, '/', 4, git_repository_path(repo), "objects", "08", "b041783f40edfe12bb406c9c9a8a040177c125")); - - cl_git_pass(p_stat(buf.ptr, &st)); - cl_assert_equal_i(1, st.st_nlink); - - git_repository_free(repo); - - /* this one should automatically use links */ - cl_git_pass(git_clone(&repo, "./clone.git", "./clone4.git", NULL)); - -#ifndef GIT_WIN32 - git_buf_clear(&buf); - cl_git_pass(git_buf_join_n(&buf, '/', 4, git_repository_path(repo), "objects", "08", "b041783f40edfe12bb406c9c9a8a040177c125")); - - cl_git_pass(p_stat(buf.ptr, &st)); - cl_assert_equal_i(3, st.st_nlink); -#endif - - git_buf_free(&buf); - git_repository_free(repo); - - cl_git_pass(git_futils_rmdir_r("./clone.git", NULL, GIT_RMDIR_REMOVE_FILES)); - cl_git_pass(git_futils_rmdir_r("./clone2.git", NULL, GIT_RMDIR_REMOVE_FILES)); - cl_git_pass(git_futils_rmdir_r("./clone3.git", NULL, GIT_RMDIR_REMOVE_FILES)); - cl_git_pass(git_futils_rmdir_r("./clone4.git", NULL, GIT_RMDIR_REMOVE_FILES)); -} - -void test_clone_local__standard_unc_paths_are_written_git_style(void) -{ -#ifdef GIT_WIN32 - git_repository *repo; - git_remote *remote; - git_clone_options opts = GIT_CLONE_OPTIONS_INIT; - git_buf unc = GIT_BUF_INIT, git_unc = GIT_BUF_INIT; - - /* we use a fixture path because it needs to exist for us to want to clone */ - const char *path = cl_fixture("testrepo.git"); - - cl_git_pass(unc_path(&unc, "localhost", path)); - cl_git_pass(git_style_unc_path(&git_unc, "localhost", path)); - - cl_git_pass(git_clone(&repo, unc.ptr, "./clone.git", &opts)); - cl_git_pass(git_remote_lookup(&remote, repo, "origin")); - - cl_assert_equal_s(git_unc.ptr, git_remote_url(remote)); - - git_remote_free(remote); - git_repository_free(repo); - git_buf_free(&unc); - git_buf_free(&git_unc); - - cl_git_pass(git_futils_rmdir_r("./clone.git", NULL, GIT_RMDIR_REMOVE_FILES)); -#endif -} - -void test_clone_local__git_style_unc_paths(void) -{ -#ifdef GIT_WIN32 - git_repository *repo; - git_remote *remote; - git_clone_options opts = GIT_CLONE_OPTIONS_INIT; - git_buf git_unc = GIT_BUF_INIT; - - /* we use a fixture path because it needs to exist for us to want to clone */ - const char *path = cl_fixture("testrepo.git"); - - cl_git_pass(git_style_unc_path(&git_unc, "localhost", path)); - - cl_git_pass(git_clone(&repo, git_unc.ptr, "./clone.git", &opts)); - cl_git_pass(git_remote_lookup(&remote, repo, "origin")); - - cl_assert_equal_s(git_unc.ptr, git_remote_url(remote)); - - git_remote_free(remote); - git_repository_free(repo); - git_buf_free(&git_unc); - - cl_git_pass(git_futils_rmdir_r("./clone.git", NULL, GIT_RMDIR_REMOVE_FILES)); -#endif -} diff --git a/vendor/libgit2/tests/clone/nonetwork.c b/vendor/libgit2/tests/clone/nonetwork.c deleted file mode 100644 index 7ebf19f46..000000000 --- a/vendor/libgit2/tests/clone/nonetwork.c +++ /dev/null @@ -1,407 +0,0 @@ -#include "clar_libgit2.h" - -#include "git2/clone.h" -#include "git2/sys/commit.h" -#include "../submodule/submodule_helpers.h" -#include "remote.h" -#include "fileops.h" -#include "repository.h" - -#define LIVE_REPO_URL "git://github.com/libgit2/TestGitRepository" - -static git_clone_options g_options; -static git_repository *g_repo; -static git_reference* g_ref; -static git_remote* g_remote; - -void test_clone_nonetwork__initialize(void) -{ - git_checkout_options dummy_opts = GIT_CHECKOUT_OPTIONS_INIT; - git_fetch_options dummy_fetch = GIT_FETCH_OPTIONS_INIT; - - g_repo = NULL; - - memset(&g_options, 0, sizeof(git_clone_options)); - g_options.version = GIT_CLONE_OPTIONS_VERSION; - g_options.checkout_opts = dummy_opts; - g_options.checkout_opts.checkout_strategy = GIT_CHECKOUT_SAFE; - g_options.fetch_opts = dummy_fetch; -} - -void test_clone_nonetwork__cleanup(void) -{ - if (g_repo) { - git_repository_free(g_repo); - g_repo = NULL; - } - - if (g_ref) { - git_reference_free(g_ref); - g_ref = NULL; - } - - if (g_remote) { - git_remote_free(g_remote); - g_remote = NULL; - } - - cl_fixture_cleanup("./foo"); -} - -void test_clone_nonetwork__bad_urls(void) -{ - /* Clone should clean up the mess if the URL isn't a git repository */ - cl_git_fail(git_clone(&g_repo, "not_a_repo", "./foo", &g_options)); - cl_assert(!git_path_exists("./foo")); - g_options.bare = true; - cl_git_fail(git_clone(&g_repo, "not_a_repo", "./foo", &g_options)); - cl_assert(!git_path_exists("./foo")); - - cl_git_fail(git_clone(&g_repo, "git://example.com:asdf", "./foo", &g_options)); - cl_git_fail(git_clone(&g_repo, "https://example.com:asdf/foo", "./foo", &g_options)); - cl_git_fail(git_clone(&g_repo, "git://github.com/git://github.com/foo/bar.git.git", - "./foo", &g_options)); - cl_git_fail(git_clone(&g_repo, "arrbee:my/bad:password@github.com:1111/strange:words.git", - "./foo", &g_options)); -} - -void test_clone_nonetwork__do_not_clean_existing_directory(void) -{ - /* Clone should not remove the directory if it already exists, but - * Should clean up entries it creates. */ - p_mkdir("./foo", GIT_DIR_MODE); - cl_git_fail(git_clone(&g_repo, "not_a_repo", "./foo", &g_options)); - cl_assert(git_path_is_empty_dir("./foo")); - - /* Try again with a bare repository. */ - g_options.bare = true; - cl_git_fail(git_clone(&g_repo, "not_a_repo", "./foo", &g_options)); - cl_assert(git_path_is_empty_dir("./foo")); -} - -void test_clone_nonetwork__local(void) -{ - cl_git_pass(git_clone(&g_repo, cl_git_fixture_url("testrepo.git"), "./foo", &g_options)); -} - -void test_clone_nonetwork__local_absolute_path(void) -{ - const char *local_src; - local_src = cl_fixture("testrepo.git"); - cl_git_pass(git_clone(&g_repo, local_src, "./foo", &g_options)); -} - -void test_clone_nonetwork__local_bare(void) -{ - g_options.bare = true; - cl_git_pass(git_clone(&g_repo, cl_git_fixture_url("testrepo.git"), "./foo", &g_options)); -} - -void test_clone_nonetwork__fail_when_the_target_is_a_file(void) -{ - cl_git_mkfile("./foo", "Bar!"); - cl_git_fail(git_clone(&g_repo, cl_git_fixture_url("testrepo.git"), "./foo", &g_options)); -} - -void test_clone_nonetwork__fail_with_already_existing_but_non_empty_directory(void) -{ - p_mkdir("./foo", GIT_DIR_MODE); - cl_git_mkfile("./foo/bar", "Baz!"); - cl_git_fail(git_clone(&g_repo, cl_git_fixture_url("testrepo.git"), "./foo", &g_options)); -} - -int custom_origin_name_remote_create( - git_remote **out, - git_repository *repo, - const char *name, - const char *url, - void *payload) -{ - GIT_UNUSED(name); - GIT_UNUSED(payload); - - return git_remote_create(out, repo, "my_origin", url); -} - -void test_clone_nonetwork__custom_origin_name(void) -{ - g_options.remote_cb = custom_origin_name_remote_create; - cl_git_pass(git_clone(&g_repo, cl_git_fixture_url("testrepo.git"), "./foo", &g_options)); - - cl_git_pass(git_remote_lookup(&g_remote, g_repo, "my_origin")); -} - -void test_clone_nonetwork__defaults(void) -{ - cl_git_pass(git_clone(&g_repo, cl_git_fixture_url("testrepo.git"), "./foo", NULL)); - cl_assert(g_repo); - cl_git_pass(git_remote_lookup(&g_remote, g_repo, "origin")); -} - -void test_clone_nonetwork__cope_with_already_existing_directory(void) -{ - p_mkdir("./foo", GIT_DIR_MODE); - cl_git_pass(git_clone(&g_repo, cl_git_fixture_url("testrepo.git"), "./foo", &g_options)); -} - -void test_clone_nonetwork__can_prevent_the_checkout_of_a_standard_repo(void) -{ - git_buf path = GIT_BUF_INIT; - - g_options.checkout_opts.checkout_strategy = 0; - cl_git_pass(git_clone(&g_repo, cl_git_fixture_url("testrepo.git"), "./foo", &g_options)); - - cl_git_pass(git_buf_joinpath(&path, git_repository_workdir(g_repo), "master.txt")); - cl_assert_equal_i(false, git_path_isfile(git_buf_cstr(&path))); - - git_buf_free(&path); -} - -void test_clone_nonetwork__can_checkout_given_branch(void) -{ - g_options.checkout_branch = "test"; - cl_git_pass(git_clone(&g_repo, cl_git_fixture_url("testrepo.git"), "./foo", &g_options)); - - cl_assert_equal_i(0, git_repository_head_unborn(g_repo)); - - cl_git_pass(git_repository_head(&g_ref, g_repo)); - cl_assert_equal_s(git_reference_name(g_ref), "refs/heads/test"); - - cl_assert(git_path_exists("foo/readme.txt")); -} - -static int clone_cancel_fetch_transfer_progress_cb( - const git_transfer_progress *stats, void *data) -{ - GIT_UNUSED(stats); GIT_UNUSED(data); - return -54321; -} - -void test_clone_nonetwork__can_cancel_clone_in_fetch(void) -{ - g_options.checkout_branch = "test"; - - g_options.fetch_opts.callbacks.transfer_progress = - clone_cancel_fetch_transfer_progress_cb; - - cl_git_fail_with(git_clone( - &g_repo, cl_git_fixture_url("testrepo.git"), "./foo", &g_options), - -54321); - - cl_assert(!g_repo); - cl_assert(!git_path_exists("foo/readme.txt")); -} - -static int clone_cancel_checkout_cb( - git_checkout_notify_t why, - const char *path, - const git_diff_file *b, - const git_diff_file *t, - const git_diff_file *w, - void *payload) -{ - const char *at_file = payload; - GIT_UNUSED(why); GIT_UNUSED(b); GIT_UNUSED(t); GIT_UNUSED(w); - if (!strcmp(path, at_file)) - return -12345; - return 0; -} - -void test_clone_nonetwork__can_cancel_clone_in_checkout(void) -{ - g_options.checkout_branch = "test"; - - g_options.checkout_opts.notify_flags = GIT_CHECKOUT_NOTIFY_UPDATED; - g_options.checkout_opts.notify_cb = clone_cancel_checkout_cb; - g_options.checkout_opts.notify_payload = "readme.txt"; - - cl_git_fail_with(git_clone( - &g_repo, cl_git_fixture_url("testrepo.git"), "./foo", &g_options), - -12345); - - cl_assert(!g_repo); - cl_assert(!git_path_exists("foo/readme.txt")); -} - -void test_clone_nonetwork__can_detached_head(void) -{ - git_object *obj; - git_repository *cloned; - git_reference *cloned_head; - - cl_git_pass(git_clone(&g_repo, cl_git_fixture_url("testrepo.git"), "./foo", &g_options)); - - cl_git_pass(git_revparse_single(&obj, g_repo, "master~1")); - cl_git_pass(git_repository_set_head_detached(g_repo, git_object_id(obj))); - - cl_git_pass(git_clone(&cloned, "./foo", "./foo1", &g_options)); - - cl_assert(git_repository_head_detached(cloned)); - - cl_git_pass(git_repository_head(&cloned_head, cloned)); - cl_assert_equal_oid(git_object_id(obj), git_reference_target(cloned_head)); - - git_object_free(obj); - git_reference_free(cloned_head); - git_repository_free(cloned); - - cl_fixture_cleanup("./foo1"); -} - -void test_clone_nonetwork__clone_tag_to_tree(void) -{ - git_repository *stage; - git_index_entry entry; - git_index *index; - git_odb *odb; - git_oid tree_id; - git_tree *tree; - git_reference *tag; - git_tree_entry *tentry; - const char *file_path = "some/deep/path.txt"; - const char *file_content = "some content\n"; - const char *tag_name = "refs/tags/tree-tag"; - - stage = cl_git_sandbox_init("testrepo.git"); - cl_git_pass(git_repository_odb(&odb, stage)); - cl_git_pass(git_index_new(&index)); - - memset(&entry, 0, sizeof(git_index_entry)); - entry.path = file_path; - entry.mode = GIT_FILEMODE_BLOB; - cl_git_pass(git_odb_write(&entry.id, odb, file_content, strlen(file_content), GIT_OBJ_BLOB)); - - cl_git_pass(git_index_add(index, &entry)); - cl_git_pass(git_index_write_tree_to(&tree_id, index, stage)); - cl_git_pass(git_reference_create(&tag, stage, tag_name, &tree_id, 0, NULL)); - git_reference_free(tag); - git_odb_free(odb); - git_index_free(index); - - g_options.local = GIT_CLONE_NO_LOCAL; - cl_git_pass(git_clone(&g_repo, cl_git_path_url(git_repository_path(stage)), "./foo", &g_options)); - git_repository_free(stage); - - cl_git_pass(git_reference_lookup(&tag, g_repo, tag_name)); - cl_git_pass(git_tree_lookup(&tree, g_repo, git_reference_target(tag))); - git_reference_free(tag); - - cl_git_pass(git_tree_entry_bypath(&tentry, tree, file_path)); - git_tree_entry_free(tentry); - git_tree_free(tree); - - cl_fixture_cleanup("testrepo.git"); -} - -static void assert_correct_reflog(const char *name) -{ - git_reflog *log; - const git_reflog_entry *entry; - git_buf expected_message = GIT_BUF_INIT; - - git_buf_printf(&expected_message, - "clone: from %s", cl_git_fixture_url("testrepo.git")); - - cl_git_pass(git_reflog_read(&log, g_repo, name)); - cl_assert_equal_i(1, git_reflog_entrycount(log)); - entry = git_reflog_entry_byindex(log, 0); - cl_assert_equal_s(expected_message.ptr, git_reflog_entry_message(entry)); - - git_reflog_free(log); - - git_buf_free(&expected_message); -} - -void test_clone_nonetwork__clone_updates_reflog_properly(void) -{ - cl_git_pass(git_clone(&g_repo, cl_git_fixture_url("testrepo.git"), "./foo", &g_options)); - assert_correct_reflog("HEAD"); - assert_correct_reflog("refs/heads/master"); -} - -static void cleanup_repository(void *path) -{ - if (g_repo) { - git_repository_free(g_repo); - g_repo = NULL; - } - - cl_fixture_cleanup((const char *)path); -} - -void test_clone_nonetwork__clone_from_empty_sets_upstream(void) -{ - git_config *config; - git_repository *repo; - const char *str; - - /* Create an empty repo to clone from */ - cl_set_cleanup(&cleanup_repository, "./test1"); - cl_git_pass(git_repository_init(&g_repo, "./test1", 0)); - cl_set_cleanup(&cleanup_repository, "./repowithunborn"); - cl_git_pass(git_clone(&repo, "./test1", "./repowithunborn", NULL)); - - cl_git_pass(git_repository_config_snapshot(&config, repo)); - - cl_git_pass(git_config_get_string(&str, config, "branch.master.remote")); - cl_assert_equal_s("origin", str); - cl_git_pass(git_config_get_string(&str, config, "branch.master.merge")); - cl_assert_equal_s("refs/heads/master", str); - - git_config_free(config); - git_repository_free(repo); - cl_fixture_cleanup("./repowithunborn"); -} - -static int just_return_origin(git_remote **out, git_repository *repo, const char *name, const char *url, void *payload) -{ - GIT_UNUSED(url); GIT_UNUSED(payload); - - return git_remote_lookup(out, repo, name); -} - -static int just_return_repo(git_repository **out, const char *path, int bare, void *payload) -{ - git_submodule *sm = payload; - - GIT_UNUSED(path); GIT_UNUSED(bare); - - return git_submodule_open(out, sm); -} - -void test_clone_nonetwork__clone_submodule(void) -{ - git_clone_options clone_opts = GIT_CLONE_OPTIONS_INIT; - git_index *index; - git_oid tree_id, commit_id; - git_submodule *sm; - git_signature *sig; - git_repository *sm_repo; - - cl_git_pass(git_repository_init(&g_repo, "willaddsubmodule", false)); - - - /* Create the submodule structure, clone into it and finalize */ - cl_git_pass(git_submodule_add_setup(&sm, g_repo, cl_fixture("testrepo.git"), "testrepo", true)); - - clone_opts.repository_cb = just_return_repo; - clone_opts.repository_cb_payload = sm; - clone_opts.remote_cb = just_return_origin; - clone_opts.remote_cb_payload = sm; - cl_git_pass(git_clone(&sm_repo, cl_fixture("testrepo.git"), "testrepo", &clone_opts)); - cl_git_pass(git_submodule_add_finalize(sm)); - git_repository_free(sm_repo); - git_submodule_free(sm); - - cl_git_pass(git_repository_index(&index, g_repo)); - cl_git_pass(git_index_write_tree(&tree_id, index)); - git_index_free(index); - - cl_git_pass(git_signature_now(&sig, "Submoduler", "submoduler@local")); - cl_git_pass(git_commit_create_from_ids(&commit_id, g_repo, "HEAD", sig, sig, NULL, "A submodule\n", - &tree_id, 0, NULL)); - - git_signature_free(sig); - - assert_submodule_exists(g_repo, "testrepo"); -} diff --git a/vendor/libgit2/tests/clone/transport.c b/vendor/libgit2/tests/clone/transport.c deleted file mode 100644 index cccaae219..000000000 --- a/vendor/libgit2/tests/clone/transport.c +++ /dev/null @@ -1,51 +0,0 @@ -#include "clar_libgit2.h" - -#include "git2/clone.h" -#include "git2/transport.h" -#include "git2/sys/transport.h" -#include "fileops.h" - -static int custom_transport( - git_transport **out, - git_remote *owner, - void *payload) -{ - *((int*)payload) = 1; - - return git_transport_local(out, owner, payload); -} - -static int custom_transport_remote_create( - git_remote **out, - git_repository *repo, - const char *name, - const char *url, - void *payload) -{ - int error; - - GIT_UNUSED(payload); - - if ((error = git_remote_create(out, repo, name, url)) < 0) - return error; - - return 0; -} - -void test_clone_transport__custom_transport(void) -{ - git_repository *repo; - git_clone_options clone_opts = GIT_CLONE_OPTIONS_INIT; - int custom_transport_used = 0; - - clone_opts.remote_cb = custom_transport_remote_create; - clone_opts.fetch_opts.callbacks.transport = custom_transport; - clone_opts.fetch_opts.callbacks.payload = &custom_transport_used; - - cl_git_pass(git_clone(&repo, cl_fixture("testrepo.git"), "./custom_transport.git", &clone_opts)); - git_repository_free(repo); - - cl_git_pass(git_futils_rmdir_r("./custom_transport.git", NULL, GIT_RMDIR_REMOVE_FILES)); - - cl_assert(custom_transport_used == 1); -} diff --git a/vendor/libgit2/tests/commit/commit.c b/vendor/libgit2/tests/commit/commit.c deleted file mode 100644 index c052cd568..000000000 --- a/vendor/libgit2/tests/commit/commit.c +++ /dev/null @@ -1,126 +0,0 @@ -#include "clar_libgit2.h" -#include "commit.h" -#include "git2/commit.h" - -static git_repository *_repo; - -void test_commit_commit__initialize(void) -{ - cl_fixture_sandbox("testrepo.git"); - cl_git_pass(git_repository_open(&_repo, "testrepo.git")); -} - -void test_commit_commit__cleanup(void) -{ - git_repository_free(_repo); - _repo = NULL; - - cl_fixture_cleanup("testrepo.git"); -} - -void test_commit_commit__create_unexisting_update_ref(void) -{ - git_oid oid; - git_tree *tree; - git_commit *commit; - git_signature *s; - git_reference *ref; - - git_oid_fromstr(&oid, "a65fedf39aefe402d3bb6e24df4d4f5fe4547750"); - cl_git_pass(git_commit_lookup(&commit, _repo, &oid)); - - git_oid_fromstr(&oid, "944c0f6e4dfa41595e6eb3ceecdb14f50fe18162"); - cl_git_pass(git_tree_lookup(&tree, _repo, &oid)); - - cl_git_pass(git_signature_now(&s, "alice", "alice@example.com")); - - cl_git_fail(git_reference_lookup(&ref, _repo, "refs/heads/foo/bar")); - cl_git_pass(git_commit_create(&oid, _repo, "refs/heads/foo/bar", s, s, - NULL, "some msg", tree, 1, (const git_commit **) &commit)); - - /* fail because the parent isn't the tip of the branch anymore */ - cl_git_fail(git_commit_create(&oid, _repo, "refs/heads/foo/bar", s, s, - NULL, "some msg", tree, 1, (const git_commit **) &commit)); - - cl_git_pass(git_reference_lookup(&ref, _repo, "refs/heads/foo/bar")); - cl_assert_equal_oid(&oid, git_reference_target(ref)); - - git_tree_free(tree); - git_commit_free(commit); - git_signature_free(s); - git_reference_free(ref); -} - -void assert_commit_summary(const char *expected, const char *given) -{ - git_commit *dummy; - - cl_assert(dummy = git__calloc(1, sizeof(struct git_commit))); - - dummy->raw_message = git__strdup(given); - cl_assert_equal_s(expected, git_commit_summary(dummy)); - - git_commit__free(dummy); -} - -void assert_commit_body(const char *expected, const char *given) -{ - git_commit *dummy; - - cl_assert(dummy = git__calloc(1, sizeof(struct git_commit))); - - dummy->raw_message = git__strdup(given); - cl_assert_equal_s(expected, git_commit_body(dummy)); - - git_commit__free(dummy); -} - -void test_commit_commit__summary(void) -{ - assert_commit_summary("One-liner with no trailing newline", "One-liner with no trailing newline"); - assert_commit_summary("One-liner with trailing newline", "One-liner with trailing newline\n"); - assert_commit_summary("Trimmed leading&trailing newlines", "\n\nTrimmed leading&trailing newlines\n\n"); - assert_commit_summary("First paragraph only", "\nFirst paragraph only\n\n(There are more!)"); - assert_commit_summary("First paragraph with unwrapped trailing\tlines", "\nFirst paragraph\nwith unwrapped\ntrailing\tlines\n\n(Yes, unwrapped!)"); - assert_commit_summary("\tLeading tabs", "\tLeading\n\ttabs\n\nare preserved"); /* tabs around newlines are collapsed down to a single space */ - assert_commit_summary(" Leading Spaces", " Leading\n Spaces\n\nare preserved"); /* spaces around newlines are collapsed down to a single space */ - assert_commit_summary("Trailing tabs\tare removed", "Trailing tabs\tare removed\t\t"); - assert_commit_summary("Trailing spaces are removed", "Trailing spaces are removed "); - assert_commit_summary("Trailing tabs", "Trailing tabs\t\n\nare removed"); - assert_commit_summary("Trailing spaces", "Trailing spaces \n\nare removed"); - assert_commit_summary("Newlines are replaced by spaces", "Newlines\nare\nreplaced by spaces\n"); - assert_commit_summary(" Spaces after newlines are collapsed", "\n Spaces after newlines\n are\n collapsed\n "); /* newlines at the very beginning are ignored and not collapsed */ - assert_commit_summary(" Spaces before newlines are collapsed", " \nSpaces before newlines \nare \ncollapsed \n"); - assert_commit_summary(" Spaces around newlines are collapsed", " \n Spaces around newlines \n are \n collapsed \n "); - assert_commit_summary(" Trailing newlines are" , " \n Trailing newlines \n are \n\n collapsed \n "); - assert_commit_summary(" Trailing spaces are stripped", " \n Trailing spaces \n are stripped \n\n \n \t "); - assert_commit_summary("", ""); - assert_commit_summary("", " "); - assert_commit_summary("", "\n"); - assert_commit_summary("", "\n \n"); -} - -void test_commit_commit__body(void) -{ - assert_commit_body(NULL, "One-liner with no trailing newline"); - assert_commit_body(NULL, "One-liner with trailing newline\n"); - assert_commit_body(NULL, "\n\nTrimmed leading&trailing newlines\n\n"); - assert_commit_body("(There are more!)", "\nFirst paragraph only\n\n(There are more!)"); - assert_commit_body("(Yes, unwrapped!)", "\nFirst paragraph\nwith unwrapped\ntrailing\tlines\n\n(Yes, unwrapped!)"); - assert_commit_body("are preserved", "\tLeading\n\ttabs\n\nare preserved"); /* tabs around newlines are collapsed down to a single space */ - assert_commit_body("are preserved", " Leading\n Spaces\n\nare preserved"); /* spaces around newlines are collapsed down to a single space */ - assert_commit_body(NULL, "Trailing tabs\tare removed\t\t"); - assert_commit_body(NULL, "Trailing spaces are removed "); - assert_commit_body("are removed", "Trailing tabs\t\n\nare removed"); - assert_commit_body("are removed", "Trailing spaces \n\nare removed"); - assert_commit_body(NULL,"Newlines\nare\nreplaced by spaces\n"); - assert_commit_body(NULL , "\n Spaces after newlines\n are\n collapsed\n "); /* newlines at the very beginning are ignored and not collapsed */ - assert_commit_body(NULL , " \nSpaces before newlines \nare \ncollapsed \n"); - assert_commit_body(NULL , " \n Spaces around newlines \n are \n collapsed \n "); - assert_commit_body("collapsed" , " \n Trailing newlines \n are \n\n collapsed \n "); - assert_commit_body(NULL, " \n Trailing spaces \n are stripped \n\n \n \t "); - assert_commit_body(NULL , ""); - assert_commit_body(NULL , " "); - assert_commit_body(NULL , "\n"); - assert_commit_body(NULL , "\n \n"); -} diff --git a/vendor/libgit2/tests/commit/parent.c b/vendor/libgit2/tests/commit/parent.c deleted file mode 100644 index 18ce0bba6..000000000 --- a/vendor/libgit2/tests/commit/parent.c +++ /dev/null @@ -1,60 +0,0 @@ -#include "clar_libgit2.h" - -static git_repository *_repo; -static git_commit *commit; - -void test_commit_parent__initialize(void) -{ - git_oid oid; - - cl_git_pass(git_repository_open(&_repo, cl_fixture("testrepo.git"))); - - git_oid_fromstr(&oid, "be3563ae3f795b2b4353bcce3a527ad0a4f7f644"); - cl_git_pass(git_commit_lookup(&commit, _repo, &oid)); -} - -void test_commit_parent__cleanup(void) -{ - git_commit_free(commit); - commit = NULL; - - git_repository_free(_repo); - _repo = NULL; -} - -static void assert_nth_gen_parent(unsigned int gen, const char *expected_oid) -{ - git_commit *parent = NULL; - int error; - - error = git_commit_nth_gen_ancestor(&parent, commit, gen); - - if (expected_oid != NULL) { - cl_assert_equal_i(0, error); - cl_assert_equal_i(0, git_oid_streq(git_commit_id(parent), expected_oid)); - } else - cl_assert_equal_i(GIT_ENOTFOUND, error); - - git_commit_free(parent); -} - -/* - * $ git show be35~0 - * commit be3563ae3f795b2b4353bcce3a527ad0a4f7f644 - * - * $ git show be35~1 - * commit 9fd738e8f7967c078dceed8190330fc8648ee56a - * - * $ git show be35~3 - * commit 5b5b025afb0b4c913b4c338a42934a3863bf3644 - * - * $ git show be35~42 - * fatal: ambiguous argument 'be35~42': unknown revision or path not in the working tree. - */ -void test_commit_parent__can_retrieve_nth_generation_parent(void) -{ - assert_nth_gen_parent(0, "be3563ae3f795b2b4353bcce3a527ad0a4f7f644"); - assert_nth_gen_parent(1, "9fd738e8f7967c078dceed8190330fc8648ee56a"); - assert_nth_gen_parent(3, "5b5b025afb0b4c913b4c338a42934a3863bf3644"); - assert_nth_gen_parent(42, NULL); -} diff --git a/vendor/libgit2/tests/commit/parse.c b/vendor/libgit2/tests/commit/parse.c deleted file mode 100644 index 297fccc6b..000000000 --- a/vendor/libgit2/tests/commit/parse.c +++ /dev/null @@ -1,553 +0,0 @@ -#include "clar_libgit2.h" -#include -#include "commit.h" -#include "signature.h" - -// Fixture setup -static git_repository *g_repo; -void test_commit_parse__initialize(void) -{ - g_repo = cl_git_sandbox_init("testrepo"); -} -void test_commit_parse__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - - -// Header parsing -typedef struct { - const char *line; - const char *header; -} parse_test_case; - -static parse_test_case passing_header_cases[] = { - { "parent 05452d6349abcd67aa396dfb28660d765d8b2a36\n", "parent " }, - { "tree 05452d6349abcd67aa396dfb28660d765d8b2a36\n", "tree " }, - { "random_heading 05452d6349abcd67aa396dfb28660d765d8b2a36\n", "random_heading " }, - { "stuck_heading05452d6349abcd67aa396dfb28660d765d8b2a36\n", "stuck_heading" }, - { "tree 5F4BEFFC0759261D015AA63A3A85613FF2F235DE\n", "tree " }, - { "tree 1A669B8AB81B5EB7D9DB69562D34952A38A9B504\n", "tree " }, - { "tree 5B20DCC6110FCC75D31C6CEDEBD7F43ECA65B503\n", "tree " }, - { "tree 173E7BF00EA5C33447E99E6C1255954A13026BE4\n", "tree " }, - { NULL, NULL } -}; - -static parse_test_case failing_header_cases[] = { - { "parent 05452d6349abcd67aa396dfb28660d765d8b2a36", "parent " }, - { "05452d6349abcd67aa396dfb28660d765d8b2a36\n", "tree " }, - { "parent05452d6349abcd67aa396dfb28660d765d8b2a6a\n", "parent " }, - { "parent 05452d6349abcd67aa396dfb280d765d8b2a6\n", "parent " }, - { "tree 05452d6349abcd67aa396dfb28660d765d8b2a36\n", "tree " }, - { "parent 0545xd6349abcd67aa396dfb28660d765d8b2a36\n", "parent " }, - { "parent 0545xd6349abcd67aa396dfb28660d765d8b2a36FF\n", "parent " }, - { "", "tree " }, - { "", "" }, - { NULL, NULL } -}; - -void test_commit_parse__header(void) -{ - git_oid oid; - - parse_test_case *testcase; - for (testcase = passing_header_cases; testcase->line != NULL; testcase++) - { - const char *line = testcase->line; - const char *line_end = line + strlen(line); - - cl_git_pass(git_oid__parse(&oid, &line, line_end, testcase->header)); - cl_assert(line == line_end); - } - - for (testcase = failing_header_cases; testcase->line != NULL; testcase++) - { - const char *line = testcase->line; - const char *line_end = line + strlen(line); - - cl_git_fail(git_oid__parse(&oid, &line, line_end, testcase->header)); - } -} - - -// Signature parsing -typedef struct { - const char *string; - const char *header; - const char *name; - const char *email; - git_time_t time; - int offset; -} passing_signature_test_case; - -passing_signature_test_case passing_signature_cases[] = { - {"author Vicent Marti 12345 \n", "author ", "Vicent Marti", "tanoku@gmail.com", 12345, 0}, - {"author Vicent Marti <> 12345 \n", "author ", "Vicent Marti", "", 12345, 0}, - {"author Vicent Marti 231301 +1020\n", "author ", "Vicent Marti", "tanoku@gmail.com", 231301, 620}, - {"author Vicent Marti with an outrageously long name which will probably overflow the buffer 12345 \n", "author ", "Vicent Marti with an outrageously long name which will probably overflow the buffer", "tanoku@gmail.com", 12345, 0}, - {"author Vicent Marti 12345 \n", "author ", "Vicent Marti", "tanokuwithaveryveryverylongemailwhichwillprobablyvoverflowtheemailbuffer@gmail.com", 12345, 0}, - {"committer Vicent Marti 123456 +0000 \n", "committer ", "Vicent Marti", "tanoku@gmail.com", 123456, 0}, - {"committer Vicent Marti 123456 +0100 \n", "committer ", "Vicent Marti", "tanoku@gmail.com", 123456, 60}, - {"committer Vicent Marti 123456 -0100 \n", "committer ", "Vicent Marti", "tanoku@gmail.com", 123456, -60}, - // Parse a signature without an author field - {"committer 123456 -0100 \n", "committer ", "", "tanoku@gmail.com", 123456, -60}, - // Parse a signature without an author field - {"committer 123456 -0100 \n", "committer ", "", "tanoku@gmail.com", 123456, -60}, - // Parse a signature with an empty author field - {"committer 123456 -0100 \n", "committer ", "", "tanoku@gmail.com", 123456, -60}, - // Parse a signature with an empty email field - {"committer Vicent Marti <> 123456 -0100 \n", "committer ", "Vicent Marti", "", 123456, -60}, - // Parse a signature with an empty email field - {"committer Vicent Marti < > 123456 -0100 \n", "committer ", "Vicent Marti", "", 123456, -60}, - // Parse a signature with empty name and email - {"committer <> 123456 -0100 \n", "committer ", "", "", 123456, -60}, - // Parse a signature with empty name and email - {"committer <> 123456 -0100 \n", "committer ", "", "", 123456, -60}, - // Parse a signature with empty name and email - {"committer < > 123456 -0100 \n", "committer ", "", "", 123456, -60}, - // Parse an obviously invalid signature - {"committer foo<@bar> 123456 -0100 \n", "committer ", "foo", "@bar", 123456, -60}, - // Parse an obviously invalid signature - {"committer foo<@bar> 123456 -0100 \n", "committer ", "foo", "@bar", 123456, -60}, - // Parse an obviously invalid signature - {"committer <>\n", "committer ", "", "", 0, 0}, - {"committer Vicent Marti 123456 -1500 \n", "committer ", "Vicent Marti", "tanoku@gmail.com", 123456, 0}, - {"committer Vicent Marti 123456 +0163 \n", "committer ", "Vicent Marti", "tanoku@gmail.com", 123456, 0}, - {"author Vicent Marti \n", "author ", "Vicent Marti", "tanoku@gmail.com", 0, 0}, - /* a variety of dates */ - {"author Vicent Marti 0 \n", "author ", "Vicent Marti", "tanoku@gmail.com", 0, 0}, - {"author Vicent Marti 1234567890 \n", "author ", "Vicent Marti", "tanoku@gmail.com", 1234567890, 0}, - {"author Vicent Marti 2147483647 \n", "author ", "Vicent Marti", "tanoku@gmail.com", 0x7fffffff, 0}, - {"author Vicent Marti 4294967295 \n", "author ", "Vicent Marti", "tanoku@gmail.com", 0xffffffff, 0}, - {"author Vicent Marti 4294967296 \n", "author ", "Vicent Marti", "tanoku@gmail.com", 4294967296, 0}, - {"author Vicent Marti 8589934592 \n", "author ", "Vicent Marti", "tanoku@gmail.com", 8589934592, 0}, - - {NULL,NULL,NULL,NULL,0,0} -}; - -typedef struct { - const char *string; - const char *header; -} failing_signature_test_case; - -failing_signature_test_case failing_signature_cases[] = { - {"committer Vicent Marti tanoku@gmail.com> 123456 -0100 \n", "committer "}, - {"author Vicent Marti 12345 \n", "author "}, - {"author Vicent Marti 12345 \n", "committer "}, - {"author Vicent Marti 12345 \n", "author "}, - {"author Vicent Marti <\n", "committer "}, - {"author ", "author "}, - {NULL, NULL,} -}; - -void test_commit_parse__signature(void) -{ - passing_signature_test_case *passcase; - failing_signature_test_case *failcase; - - for (passcase = passing_signature_cases; passcase->string != NULL; passcase++) - { - const char *str = passcase->string; - size_t len = strlen(passcase->string); - struct git_signature person = {0}; - - cl_git_pass(git_signature__parse(&person, &str, str + len, passcase->header, '\n')); - cl_assert_equal_s(passcase->name, person.name); - cl_assert_equal_s(passcase->email, person.email); - cl_assert_equal_i((int)passcase->time, (int)person.when.time); - cl_assert_equal_i(passcase->offset, person.when.offset); - git__free(person.name); git__free(person.email); - } - - for (failcase = failing_signature_cases; failcase->string != NULL; failcase++) - { - const char *str = failcase->string; - size_t len = strlen(failcase->string); - git_signature person = {0}; - cl_git_fail(git_signature__parse(&person, &str, str + len, failcase->header, '\n')); - git__free(person.name); git__free(person.email); - } -} - - - -static char *failing_commit_cases[] = { -// empty commit -"", -// random garbage -"asd97sa9du902e9a0jdsuusad09as9du098709aweu8987sd\n", -// broken endlines 1 -"tree f6c0dad3c7b3481caa9d73db21f91964894a945b\r\n\ -parent 05452d6349abcd67aa396dfb28660d765d8b2a36\r\n\ -author Vicent Marti 1273848544 +0200\r\n\ -committer Vicent Marti 1273848544 +0200\r\n\ -\r\n\ -a test commit with broken endlines\r\n", -// broken endlines 2 -"tree f6c0dad3c7b3481caa9d73db21f91964894a945b\ -parent 05452d6349abcd67aa396dfb28660d765d8b2a36\ -author Vicent Marti 1273848544 +0200\ -committer Vicent Marti 1273848544 +0200\ -\ -another test commit with broken endlines", -// starting endlines -"\ntree f6c0dad3c7b3481caa9d73db21f91964894a945b\n\ -parent 05452d6349abcd67aa396dfb28660d765d8b2a36\n\ -author Vicent Marti 1273848544 +0200\n\ -committer Vicent Marti 1273848544 +0200\n\ -\n\ -a test commit with a starting endline\n", -// corrupted commit 1 -"tree f6c0dad3c7b3481caa9d73db21f91964894a945b\n\ -parent 05452d6349abcd67aa396df", -// corrupted commit 2 -"tree f6c0dad3c7b3481caa9d73db21f91964894a945b\n\ -parent ", -// corrupted commit 3 -"tree f6c0dad3c7b3481caa9d73db21f91964894a945b\n\ -parent ", -// corrupted commit 4 -"tree f6c0dad3c7b3481caa9d73db21f91964894a945b\n\ -par", -}; - - -static char *passing_commit_cases[] = { -// simple commit with no message -"tree 1810dff58d8a660512d4832e740f692884338ccd\n\ -author Vicent Marti 1273848544 +0200\n\ -committer Vicent Marti 1273848544 +0200\n\ -\n", -// simple commit, no parent -"tree 1810dff58d8a660512d4832e740f692884338ccd\n\ -author Vicent Marti 1273848544 +0200\n\ -committer Vicent Marti 1273848544 +0200\n\ -\n\ -a simple commit which works\n", -// simple commit, no parent, no newline in message -"tree 1810dff58d8a660512d4832e740f692884338ccd\n\ -author Vicent Marti 1273848544 +0200\n\ -committer Vicent Marti 1273848544 +0200\n\ -\n\ -a simple commit which works", -// simple commit, 1 parent -"tree 1810dff58d8a660512d4832e740f692884338ccd\n\ -parent e90810b8df3e80c413d903f631643c716887138d\n\ -author Vicent Marti 1273848544 +0200\n\ -committer Vicent Marti 1273848544 +0200\n\ -\n\ -a simple commit which works\n", -/* simple commit with GPG signature */ -"tree 6b79e22d69bf46e289df0345a14ca059dfc9bdf6\n\ -parent 34734e478d6cf50c27c9d69026d93974d052c454\n\ -author Ben Burkert 1358451456 -0800\n\ -committer Ben Burkert 1358451456 -0800\n\ -gpgsig -----BEGIN PGP SIGNATURE-----\n\ - Version: GnuPG v1.4.12 (Darwin)\n\ - \n\ - iQIcBAABAgAGBQJQ+FMIAAoJEH+LfPdZDSs1e3EQAJMjhqjWF+WkGLHju7pTw2al\n\ - o6IoMAhv0Z/LHlWhzBd9e7JeCnanRt12bAU7yvYp9+Z+z+dbwqLwDoFp8LVuigl8\n\ - JGLcnwiUW3rSvhjdCp9irdb4+bhKUnKUzSdsR2CK4/hC0N2i/HOvMYX+BRsvqweq\n\ - AsAkA6dAWh+gAfedrBUkCTGhlNYoetjdakWqlGL1TiKAefEZrtA1TpPkGn92vbLq\n\ - SphFRUY9hVn1ZBWrT3hEpvAIcZag3rTOiRVT1X1flj8B2vGCEr3RrcwOIZikpdaW\n\ - who/X3xh/DGbI2RbuxmmJpxxP/8dsVchRJJzBwG+yhwU/iN3MlV2c5D69tls/Dok\n\ - 6VbyU4lm/ae0y3yR83D9dUlkycOnmmlBAHKIZ9qUts9X7mWJf0+yy2QxJVpjaTGG\n\ - cmnQKKPeNIhGJk2ENnnnzjEve7L7YJQF6itbx5VCOcsGh3Ocb3YR7DMdWjt7f8pu\n\ - c6j+q1rP7EpE2afUN/geSlp5i3x8aXZPDj67jImbVCE/Q1X9voCtyzGJH7MXR0N9\n\ - ZpRF8yzveRfMH8bwAJjSOGAFF5XkcR/RNY95o+J+QcgBLdX48h+ZdNmUf6jqlu3J\n\ - 7KmTXXQcOVpN6dD3CmRFsbjq+x6RHwa8u1iGn+oIkX908r97ckfB/kHKH7ZdXIJc\n\ - cpxtDQQMGYFpXK/71stq\n\ - =ozeK\n\ - -----END PGP SIGNATURE-----\n\ -\n\ -a simple commit which works\n", -/* some tools create two author entries */ -"tree 1810dff58d8a660512d4832e740f692884338ccd\n\ -author Vicent Marti 1273848544 +0200\n\ -author Helpful Coworker 1273848544 +0200\n\ -committer Vicent Marti 1273848544 +0200\n\ -\n\ -a simple commit which works", -}; - -static int parse_commit(git_commit **out, const char *buffer) -{ - git_commit *commit; - git_odb_object fake_odb_object; - int error; - - commit = (git_commit*)git__malloc(sizeof(git_commit)); - memset(commit, 0x0, sizeof(git_commit)); - commit->object.repo = g_repo; - - memset(&fake_odb_object, 0x0, sizeof(git_odb_object)); - fake_odb_object.buffer = (char *)buffer; - fake_odb_object.cached.size = strlen(fake_odb_object.buffer); - - error = git_commit__parse(commit, &fake_odb_object); - - *out = commit; - return error; -} - -void test_commit_parse__entire_commit(void) -{ - const int failing_commit_count = ARRAY_SIZE(failing_commit_cases); - const int passing_commit_count = ARRAY_SIZE(passing_commit_cases); - int i; - git_commit *commit; - - for (i = 0; i < failing_commit_count; ++i) { - cl_git_fail(parse_commit(&commit, failing_commit_cases[i])); - git_commit__free(commit); - } - - for (i = 0; i < passing_commit_count; ++i) { - cl_git_pass(parse_commit(&commit, passing_commit_cases[i])); - - if (!i) - cl_assert_equal_s("", git_commit_message(commit)); - else - cl_assert(git__prefixcmp( - git_commit_message(commit), "a simple commit which works") == 0); - - git_commit__free(commit); - } -} - - -// query the details on a parsed commit -void test_commit_parse__details0(void) { - static const char *commit_ids[] = { - "a4a7dce85cf63874e984719f4fdd239f5145052f", /* 0 */ - "9fd738e8f7967c078dceed8190330fc8648ee56a", /* 1 */ - "4a202b346bb0fb0db7eff3cffeb3c70babbd2045", /* 2 */ - "c47800c7266a2be04c571c04d5a6614691ea99bd", /* 3 */ - "8496071c1b46c854b31185ea97743be6a8774479", /* 4 */ - "5b5b025afb0b4c913b4c338a42934a3863bf3644", /* 5 */ - "a65fedf39aefe402d3bb6e24df4d4f5fe4547750", /* 6 */ - }; - const size_t commit_count = sizeof(commit_ids) / sizeof(const char *); - unsigned int i; - - for (i = 0; i < commit_count; ++i) { - git_oid id; - git_commit *commit; - - const git_signature *author, *committer; - const char *message; - git_time_t commit_time; - unsigned int parents, p; - git_commit *parent = NULL, *old_parent = NULL; - - git_oid_fromstr(&id, commit_ids[i]); - - cl_git_pass(git_commit_lookup(&commit, g_repo, &id)); - - message = git_commit_message(commit); - author = git_commit_author(commit); - committer = git_commit_committer(commit); - commit_time = git_commit_time(commit); - parents = git_commit_parentcount(commit); - - cl_assert_equal_s("Scott Chacon", author->name); - cl_assert_equal_s("schacon@gmail.com", author->email); - cl_assert_equal_s("Scott Chacon", committer->name); - cl_assert_equal_s("schacon@gmail.com", committer->email); - cl_assert(message != NULL); - cl_assert(commit_time > 0); - cl_assert(parents <= 2); - for (p = 0;p < parents;p++) { - if (old_parent != NULL) - git_commit_free(old_parent); - - old_parent = parent; - cl_git_pass(git_commit_parent(&parent, commit, p)); - cl_assert(parent != NULL); - cl_assert(git_commit_author(parent) != NULL); // is it really a commit? - } - git_commit_free(old_parent); - git_commit_free(parent); - - cl_git_fail(git_commit_parent(&parent, commit, parents)); - git_commit_free(commit); - } -} - -void test_commit_parse__leading_lf(void) -{ - git_commit *commit; - const char *buffer = -"tree 1810dff58d8a660512d4832e740f692884338ccd\n\ -parent e90810b8df3e80c413d903f631643c716887138d\n\ -author Vicent Marti 1273848544 +0200\n\ -committer Vicent Marti 1273848544 +0200\n\ -\n\ -\n\ -\n\ -This commit has a few LF at the start of the commit message"; - const char *message = -"This commit has a few LF at the start of the commit message"; - const char *raw_message = -"\n\ -\n\ -This commit has a few LF at the start of the commit message"; - cl_git_pass(parse_commit(&commit, buffer)); - cl_assert_equal_s(message, git_commit_message(commit)); - cl_assert_equal_s(raw_message, git_commit_message_raw(commit)); - git_commit__free(commit); -} - -void test_commit_parse__only_lf(void) -{ - git_commit *commit; - const char *buffer = -"tree 1810dff58d8a660512d4832e740f692884338ccd\n\ -parent e90810b8df3e80c413d903f631643c716887138d\n\ -author Vicent Marti 1273848544 +0200\n\ -committer Vicent Marti 1273848544 +0200\n\ -\n\ -\n\ -\n"; - const char *message = ""; - const char *raw_message = "\n\n"; - - cl_git_pass(parse_commit(&commit, buffer)); - cl_assert_equal_s(message, git_commit_message(commit)); - cl_assert_equal_s(raw_message, git_commit_message_raw(commit)); - git_commit__free(commit); -} - -void test_commit_parse__arbitrary_field(void) -{ - git_commit *commit; - git_buf buf = GIT_BUF_INIT; - const char *gpgsig = "-----BEGIN PGP SIGNATURE-----\n\ -Version: GnuPG v1.4.12 (Darwin)\n\ -\n\ -iQIcBAABAgAGBQJQ+FMIAAoJEH+LfPdZDSs1e3EQAJMjhqjWF+WkGLHju7pTw2al\n\ -o6IoMAhv0Z/LHlWhzBd9e7JeCnanRt12bAU7yvYp9+Z+z+dbwqLwDoFp8LVuigl8\n\ -JGLcnwiUW3rSvhjdCp9irdb4+bhKUnKUzSdsR2CK4/hC0N2i/HOvMYX+BRsvqweq\n\ -AsAkA6dAWh+gAfedrBUkCTGhlNYoetjdakWqlGL1TiKAefEZrtA1TpPkGn92vbLq\n\ -SphFRUY9hVn1ZBWrT3hEpvAIcZag3rTOiRVT1X1flj8B2vGCEr3RrcwOIZikpdaW\n\ -who/X3xh/DGbI2RbuxmmJpxxP/8dsVchRJJzBwG+yhwU/iN3MlV2c5D69tls/Dok\n\ -6VbyU4lm/ae0y3yR83D9dUlkycOnmmlBAHKIZ9qUts9X7mWJf0+yy2QxJVpjaTGG\n\ -cmnQKKPeNIhGJk2ENnnnzjEve7L7YJQF6itbx5VCOcsGh3Ocb3YR7DMdWjt7f8pu\n\ -c6j+q1rP7EpE2afUN/geSlp5i3x8aXZPDj67jImbVCE/Q1X9voCtyzGJH7MXR0N9\n\ -ZpRF8yzveRfMH8bwAJjSOGAFF5XkcR/RNY95o+J+QcgBLdX48h+ZdNmUf6jqlu3J\n\ -7KmTXXQcOVpN6dD3CmRFsbjq+x6RHwa8u1iGn+oIkX908r97ckfB/kHKH7ZdXIJc\n\ -cpxtDQQMGYFpXK/71stq\n\ -=ozeK\n\ ------END PGP SIGNATURE-----"; - - cl_git_pass(parse_commit(&commit, passing_commit_cases[4])); - - cl_git_pass(git_commit_header_field(&buf, commit, "tree")); - cl_assert_equal_s("6b79e22d69bf46e289df0345a14ca059dfc9bdf6", buf.ptr); - git_buf_clear(&buf); - - cl_git_pass(git_commit_header_field(&buf, commit, "parent")); - cl_assert_equal_s("34734e478d6cf50c27c9d69026d93974d052c454", buf.ptr); - git_buf_clear(&buf); - - cl_git_pass(git_commit_header_field(&buf, commit, "gpgsig")); - cl_assert_equal_s(gpgsig, buf.ptr); - git_buf_clear(&buf); - - cl_git_fail_with(GIT_ENOTFOUND, git_commit_header_field(&buf, commit, "awesomeness")); - cl_git_fail_with(GIT_ENOTFOUND, git_commit_header_field(&buf, commit, "par")); - - git_commit__free(commit); - cl_git_pass(parse_commit(&commit, passing_commit_cases[0])); - - cl_git_pass(git_commit_header_field(&buf, commit, "committer")); - cl_assert_equal_s("Vicent Marti 1273848544 +0200", buf.ptr); - - git_buf_free(&buf); - git_commit__free(commit); -} - -void test_commit_parse__extract_signature(void) -{ - git_odb *odb; - git_oid commit_id; - git_buf signature = GIT_BUF_INIT, signed_data = GIT_BUF_INIT; - const char *gpgsig = "-----BEGIN PGP SIGNATURE-----\n\ -Version: GnuPG v1.4.12 (Darwin)\n\ -\n\ -iQIcBAABAgAGBQJQ+FMIAAoJEH+LfPdZDSs1e3EQAJMjhqjWF+WkGLHju7pTw2al\n\ -o6IoMAhv0Z/LHlWhzBd9e7JeCnanRt12bAU7yvYp9+Z+z+dbwqLwDoFp8LVuigl8\n\ -JGLcnwiUW3rSvhjdCp9irdb4+bhKUnKUzSdsR2CK4/hC0N2i/HOvMYX+BRsvqweq\n\ -AsAkA6dAWh+gAfedrBUkCTGhlNYoetjdakWqlGL1TiKAefEZrtA1TpPkGn92vbLq\n\ -SphFRUY9hVn1ZBWrT3hEpvAIcZag3rTOiRVT1X1flj8B2vGCEr3RrcwOIZikpdaW\n\ -who/X3xh/DGbI2RbuxmmJpxxP/8dsVchRJJzBwG+yhwU/iN3MlV2c5D69tls/Dok\n\ -6VbyU4lm/ae0y3yR83D9dUlkycOnmmlBAHKIZ9qUts9X7mWJf0+yy2QxJVpjaTGG\n\ -cmnQKKPeNIhGJk2ENnnnzjEve7L7YJQF6itbx5VCOcsGh3Ocb3YR7DMdWjt7f8pu\n\ -c6j+q1rP7EpE2afUN/geSlp5i3x8aXZPDj67jImbVCE/Q1X9voCtyzGJH7MXR0N9\n\ -ZpRF8yzveRfMH8bwAJjSOGAFF5XkcR/RNY95o+J+QcgBLdX48h+ZdNmUf6jqlu3J\n\ -7KmTXXQcOVpN6dD3CmRFsbjq+x6RHwa8u1iGn+oIkX908r97ckfB/kHKH7ZdXIJc\n\ -cpxtDQQMGYFpXK/71stq\n\ -=ozeK\n\ ------END PGP SIGNATURE-----"; - - const char *data = "tree 6b79e22d69bf46e289df0345a14ca059dfc9bdf6\n\ -parent 34734e478d6cf50c27c9d69026d93974d052c454\n\ -author Ben Burkert 1358451456 -0800\n\ -committer Ben Burkert 1358451456 -0800\n\ -\n\ -a simple commit which works\n"; - - const char *oneline_signature = "tree 51832e6397b30309c8bcad9c55fa6ae67778f378\n\ -parent a1b6decaaac768b5e01e1b5dbf5b2cc081bed1eb\n\ -author Some User 1454537944 -0700\n\ -committer Some User 1454537944 -0700\n\ -gpgsig bad\n\ -\n\ -corrupt signature\n"; - - const char *oneline_data = "tree 51832e6397b30309c8bcad9c55fa6ae67778f378\n\ -parent a1b6decaaac768b5e01e1b5dbf5b2cc081bed1eb\n\ -author Some User 1454537944 -0700\n\ -committer Some User 1454537944 -0700\n\ -\n\ -corrupt signature\n"; - - - cl_git_pass(git_repository_odb__weakptr(&odb, g_repo)); - cl_git_pass(git_odb_write(&commit_id, odb, passing_commit_cases[4], strlen(passing_commit_cases[4]), GIT_OBJ_COMMIT)); - - cl_git_pass(git_commit_extract_signature(&signature, &signed_data, g_repo, &commit_id, NULL)); - cl_assert_equal_s(gpgsig, signature.ptr); - cl_assert_equal_s(data, signed_data.ptr); - - git_buf_clear(&signature); - git_buf_clear(&signed_data); - - cl_git_pass(git_commit_extract_signature(&signature, &signed_data, g_repo, &commit_id, "gpgsig")); - cl_assert_equal_s(gpgsig, signature.ptr); - cl_assert_equal_s(data, signed_data.ptr); - - /* Try to parse a tree */ - cl_git_pass(git_oid_fromstr(&commit_id, "45dd856fdd4d89b884c340ba0e047752d9b085d6")); - cl_git_fail_with(GIT_ENOTFOUND, git_commit_extract_signature(&signature, &signed_data, g_repo, &commit_id, NULL)); - cl_assert_equal_i(GITERR_INVALID, giterr_last()->klass); - - /* Try to parse an unsigned commit */ - cl_git_pass(git_odb_write(&commit_id, odb, passing_commit_cases[1], strlen(passing_commit_cases[1]), GIT_OBJ_COMMIT)); - cl_git_fail_with(GIT_ENOTFOUND, git_commit_extract_signature(&signature, &signed_data, g_repo, &commit_id, NULL)); - cl_assert_equal_i(GITERR_OBJECT, giterr_last()->klass); - - /* Parse the commit with a single-line signature */ - git_buf_clear(&signature); - git_buf_clear(&signed_data); - cl_git_pass(git_odb_write(&commit_id, odb, oneline_signature, strlen(oneline_signature), GIT_OBJ_COMMIT)); - cl_git_pass(git_commit_extract_signature(&signature, &signed_data, g_repo, &commit_id, NULL)); - cl_assert_equal_s("bad", signature.ptr); - cl_assert_equal_s(oneline_data, signed_data.ptr); - - - git_buf_free(&signature); - git_buf_free(&signed_data); - -} diff --git a/vendor/libgit2/tests/commit/signature.c b/vendor/libgit2/tests/commit/signature.c deleted file mode 100644 index 0070320ae..000000000 --- a/vendor/libgit2/tests/commit/signature.c +++ /dev/null @@ -1,88 +0,0 @@ -#include "clar_libgit2.h" - -static int try_build_signature(const char *name, const char *email, git_time_t time, int offset) -{ - git_signature *sign; - int error = 0; - - if ((error = git_signature_new(&sign, name, email, time, offset)) < 0) - return error; - - git_signature_free((git_signature *)sign); - - return error; -} - -static void assert_name_and_email( - const char *expected_name, - const char *expected_email, - const char *name, - const char *email) -{ - git_signature *sign; - - cl_git_pass(git_signature_new(&sign, name, email, 1234567890, 60)); - cl_assert_equal_s(expected_name, sign->name); - cl_assert_equal_s(expected_email, sign->email); - - git_signature_free(sign); -} - -void test_commit_signature__leading_and_trailing_spaces_are_trimmed(void) -{ - assert_name_and_email("nulltoken", "emeric.fermas@gmail.com", " nulltoken ", " emeric.fermas@gmail.com "); - assert_name_and_email("nulltoken", "emeric.fermas@gmail.com", " nulltoken ", " emeric.fermas@gmail.com \n"); - assert_name_and_email("nulltoken", "emeric.fermas@gmail.com", " \t nulltoken \n", " \n emeric.fermas@gmail.com \n"); -} - -void test_commit_signature__leading_and_trailing_crud_is_trimmed(void) -{ - assert_name_and_email("nulltoken", "emeric.fermas@gmail.com", "\"nulltoken\"", "\"emeric.fermas@gmail.com\""); - assert_name_and_email("nulltoken w", "emeric.fermas@gmail.com", "nulltoken w.", "emeric.fermas@gmail.com"); - assert_name_and_email("nulltoken \xe2\x98\xba", "emeric.fermas@gmail.com", "nulltoken \xe2\x98\xba", "emeric.fermas@gmail.com"); -} - -void test_commit_signature__angle_brackets_in_names_are_not_supported(void) -{ - cl_git_fail(try_build_signature("Haack", "phil@haack", 1234567890, 60)); - cl_git_fail(try_build_signature("", "phil@haack", 1234567890, 60)); -} - -void test_commit_signature__angle_brackets_in_email_are_not_supported(void) -{ - cl_git_fail(try_build_signature("Phil Haack", ">phil@haack", 1234567890, 60)); - cl_git_fail(try_build_signature("Phil Haack", "phil@>haack", 1234567890, 60)); - cl_git_fail(try_build_signature("Phil Haack", "", 1234567890, 60)); -} - -void test_commit_signature__create_empties(void) -{ - // can not create a signature with empty name or email - cl_git_pass(try_build_signature("nulltoken", "emeric.fermas@gmail.com", 1234567890, 60)); - - cl_git_fail(try_build_signature("", "emeric.fermas@gmail.com", 1234567890, 60)); - cl_git_fail(try_build_signature(" ", "emeric.fermas@gmail.com", 1234567890, 60)); - cl_git_fail(try_build_signature("nulltoken", "", 1234567890, 60)); - cl_git_fail(try_build_signature("nulltoken", " ", 1234567890, 60)); -} - -void test_commit_signature__create_one_char(void) -{ - // creating a one character signature - assert_name_and_email("x", "foo@bar.baz", "x", "foo@bar.baz"); -} - -void test_commit_signature__create_two_char(void) -{ - // creating a two character signature - assert_name_and_email("xx", "foo@bar.baz", "xx", "foo@bar.baz"); -} - -void test_commit_signature__create_zero_char(void) -{ - // creating a zero character signature - git_signature *sign; - cl_git_fail(git_signature_new(&sign, "", "x@y.z", 1234567890, 60)); - cl_assert(sign == NULL); -} diff --git a/vendor/libgit2/tests/commit/write.c b/vendor/libgit2/tests/commit/write.c deleted file mode 100644 index 96b7cc321..000000000 --- a/vendor/libgit2/tests/commit/write.c +++ /dev/null @@ -1,261 +0,0 @@ -#include "clar_libgit2.h" -#include "git2/sys/commit.h" - -static const char *committer_name = "Vicent Marti"; -static const char *committer_email = "vicent@github.com"; -static const char *commit_message = "This commit has been created in memory\n\ - This is a commit created in memory and it will be written back to disk\n"; -static const char *tree_id_str = "1810dff58d8a660512d4832e740f692884338ccd"; -static const char *parent_id_str = "8496071c1b46c854b31185ea97743be6a8774479"; -static const char *root_commit_message = "This is a root commit\n\ - This is a root commit and should be the only one in this branch\n"; -static const char *root_reflog_message = "commit (initial): This is a root commit \ -This is a root commit and should be the only one in this branch"; -static char *head_old; -static git_reference *head, *branch; -static git_commit *commit; - -// Fixture setup -static git_repository *g_repo; -void test_commit_write__initialize(void) -{ - g_repo = cl_git_sandbox_init("testrepo"); -} - -void test_commit_write__cleanup(void) -{ - git_reference_free(head); - head = NULL; - - git_reference_free(branch); - branch = NULL; - - git_commit_free(commit); - commit = NULL; - - git__free(head_old); - head_old = NULL; - - cl_git_sandbox_cleanup(); - - cl_git_pass(git_libgit2_opts(GIT_OPT_ENABLE_STRICT_OBJECT_CREATION, 1)); -} - - -// write a new commit object from memory to disk -void test_commit_write__from_memory(void) -{ - git_oid tree_id, parent_id, commit_id; - git_signature *author, *committer; - const git_signature *author1, *committer1; - git_commit *parent; - git_tree *tree; - - git_oid_fromstr(&tree_id, tree_id_str); - cl_git_pass(git_tree_lookup(&tree, g_repo, &tree_id)); - - git_oid_fromstr(&parent_id, parent_id_str); - cl_git_pass(git_commit_lookup(&parent, g_repo, &parent_id)); - - /* create signatures */ - cl_git_pass(git_signature_new(&committer, committer_name, committer_email, 123456789, 60)); - cl_git_pass(git_signature_new(&author, committer_name, committer_email, 987654321, 90)); - - cl_git_pass(git_commit_create_v( - &commit_id, /* out id */ - g_repo, - NULL, /* do not update the HEAD */ - author, - committer, - NULL, - commit_message, - tree, - 1, parent)); - - git_object_free((git_object *)parent); - git_object_free((git_object *)tree); - - git_signature_free(committer); - git_signature_free(author); - - cl_git_pass(git_commit_lookup(&commit, g_repo, &commit_id)); - - /* Check attributes were set correctly */ - author1 = git_commit_author(commit); - cl_assert(author1 != NULL); - cl_assert_equal_s(committer_name, author1->name); - cl_assert_equal_s(committer_email, author1->email); - cl_assert(author1->when.time == 987654321); - cl_assert(author1->when.offset == 90); - - committer1 = git_commit_committer(commit); - cl_assert(committer1 != NULL); - cl_assert_equal_s(committer_name, committer1->name); - cl_assert_equal_s(committer_email, committer1->email); - cl_assert(committer1->when.time == 123456789); - cl_assert(committer1->when.offset == 60); - - cl_assert_equal_s(commit_message, git_commit_message(commit)); -} - -// create a root commit -void test_commit_write__root(void) -{ - git_oid tree_id, commit_id; - const git_oid *branch_oid; - git_signature *author, *committer; - const char *branch_name = "refs/heads/root-commit-branch"; - git_tree *tree; - git_reflog *log; - const git_reflog_entry *entry; - - git_oid_fromstr(&tree_id, tree_id_str); - cl_git_pass(git_tree_lookup(&tree, g_repo, &tree_id)); - - /* create signatures */ - cl_git_pass(git_signature_new(&committer, committer_name, committer_email, 123456789, 60)); - cl_git_pass(git_signature_new(&author, committer_name, committer_email, 987654321, 90)); - - /* First we need to update HEAD so it points to our non-existant branch */ - cl_git_pass(git_reference_lookup(&head, g_repo, "HEAD")); - cl_assert(git_reference_type(head) == GIT_REF_SYMBOLIC); - head_old = git__strdup(git_reference_symbolic_target(head)); - cl_assert(head_old != NULL); - git_reference_free(head); - - cl_git_pass(git_reference_symbolic_create(&head, g_repo, "HEAD", branch_name, 1, NULL)); - - cl_git_pass(git_commit_create_v( - &commit_id, /* out id */ - g_repo, - "HEAD", - author, - committer, - NULL, - root_commit_message, - tree, - 0)); - - git_object_free((git_object *)tree); - git_signature_free(author); - - /* - * The fact that creating a commit works has already been - * tested. Here we just make sure it's our commit and that it was - * written as a root commit. - */ - cl_git_pass(git_commit_lookup(&commit, g_repo, &commit_id)); - cl_assert(git_commit_parentcount(commit) == 0); - cl_git_pass(git_reference_lookup(&branch, g_repo, branch_name)); - branch_oid = git_reference_target(branch); - cl_assert_equal_oid(branch_oid, &commit_id); - cl_assert_equal_s(root_commit_message, git_commit_message(commit)); - - cl_git_pass(git_reflog_read(&log, g_repo, branch_name)); - cl_assert_equal_i(1, git_reflog_entrycount(log)); - entry = git_reflog_entry_byindex(log, 0); - cl_assert_equal_s(committer->email, git_reflog_entry_committer(entry)->email); - cl_assert_equal_s(committer->name, git_reflog_entry_committer(entry)->name); - cl_assert_equal_s(root_reflog_message, git_reflog_entry_message(entry)); - - git_signature_free(committer); - git_reflog_free(log); -} - -static int create_commit_from_ids( - git_oid *result, - const git_oid *tree_id, - const git_oid *parent_id) -{ - git_signature *author, *committer; - const git_oid *parent_ids[1]; - int ret; - - cl_git_pass(git_signature_new( - &committer, committer_name, committer_email, 123456789, 60)); - cl_git_pass(git_signature_new( - &author, committer_name, committer_email, 987654321, 90)); - - parent_ids[0] = parent_id; - - ret = git_commit_create_from_ids( - result, - g_repo, - NULL, - author, - committer, - NULL, - root_commit_message, - tree_id, - 1, - parent_ids); - - git_signature_free(committer); - git_signature_free(author); - - return ret; -} - -void test_commit_write__can_write_invalid_objects(void) -{ - git_oid expected_id, tree_id, parent_id, commit_id; - - cl_git_pass(git_libgit2_opts(GIT_OPT_ENABLE_STRICT_OBJECT_CREATION, 0)); - - /* this is a valid tree and parent */ - git_oid_fromstr(&tree_id, tree_id_str); - git_oid_fromstr(&parent_id, parent_id_str); - - git_oid_fromstr(&expected_id, "c8571bbec3a72c4bcad31648902e5a453f1adece"); - cl_git_pass(create_commit_from_ids(&commit_id, &tree_id, &parent_id)); - cl_assert_equal_oid(&expected_id, &commit_id); - - /* this is a wholly invented tree id */ - git_oid_fromstr(&tree_id, "1234567890123456789012345678901234567890"); - git_oid_fromstr(&parent_id, parent_id_str); - - git_oid_fromstr(&expected_id, "996008340b8e68d69bf3c28d7c57fb7ec3c8e202"); - cl_git_pass(create_commit_from_ids(&commit_id, &tree_id, &parent_id)); - cl_assert_equal_oid(&expected_id, &commit_id); - - /* this is a wholly invented parent id */ - git_oid_fromstr(&tree_id, tree_id_str); - git_oid_fromstr(&parent_id, "1234567890123456789012345678901234567890"); - - git_oid_fromstr(&expected_id, "d78f660cab89d9791ca6714b57978bf2a7e709fd"); - cl_git_pass(create_commit_from_ids(&commit_id, &tree_id, &parent_id)); - cl_assert_equal_oid(&expected_id, &commit_id); - - /* these are legitimate objects, but of the wrong type */ - git_oid_fromstr(&tree_id, parent_id_str); - git_oid_fromstr(&parent_id, tree_id_str); - - git_oid_fromstr(&expected_id, "5d80c07414e3f18792949699dfcacadf7748f361"); - cl_git_pass(create_commit_from_ids(&commit_id, &tree_id, &parent_id)); - cl_assert_equal_oid(&expected_id, &commit_id); -} - -void test_commit_write__can_validate_objects(void) -{ - git_oid tree_id, parent_id, commit_id; - - /* this is a valid tree and parent */ - git_oid_fromstr(&tree_id, tree_id_str); - git_oid_fromstr(&parent_id, parent_id_str); - cl_git_pass(create_commit_from_ids(&commit_id, &tree_id, &parent_id)); - - /* this is a wholly invented tree id */ - git_oid_fromstr(&tree_id, "1234567890123456789012345678901234567890"); - git_oid_fromstr(&parent_id, parent_id_str); - cl_git_fail(create_commit_from_ids(&commit_id, &tree_id, &parent_id)); - - /* this is a wholly invented parent id */ - git_oid_fromstr(&tree_id, tree_id_str); - git_oid_fromstr(&parent_id, "1234567890123456789012345678901234567890"); - cl_git_fail(create_commit_from_ids(&commit_id, &tree_id, &parent_id)); - - /* these are legitimate objects, but of the wrong type */ - git_oid_fromstr(&tree_id, parent_id_str); - git_oid_fromstr(&parent_id, tree_id_str); - cl_git_fail(create_commit_from_ids(&commit_id, &tree_id, &parent_id)); -} diff --git a/vendor/libgit2/tests/config/add.c b/vendor/libgit2/tests/config/add.c deleted file mode 100644 index 405f1e2c9..000000000 --- a/vendor/libgit2/tests/config/add.c +++ /dev/null @@ -1,37 +0,0 @@ -#include "clar_libgit2.h" - -void test_config_add__initialize(void) -{ - cl_fixture_sandbox("config/config10"); -} - -void test_config_add__cleanup(void) -{ - cl_fixture_cleanup("config10"); -} - -void test_config_add__to_existing_section(void) -{ - git_config *cfg; - int32_t i; - - cl_git_pass(git_config_open_ondisk(&cfg, "config10")); - cl_git_pass(git_config_set_int32(cfg, "empty.tmp", 5)); - cl_git_pass(git_config_get_int32(&i, cfg, "empty.tmp")); - cl_assert(i == 5); - cl_git_pass(git_config_delete_entry(cfg, "empty.tmp")); - git_config_free(cfg); -} - -void test_config_add__to_new_section(void) -{ - git_config *cfg; - int32_t i; - - cl_git_pass(git_config_open_ondisk(&cfg, "config10")); - cl_git_pass(git_config_set_int32(cfg, "section.tmp", 5)); - cl_git_pass(git_config_get_int32(&i, cfg, "section.tmp")); - cl_assert(i == 5); - cl_git_pass(git_config_delete_entry(cfg, "section.tmp")); - git_config_free(cfg); -} diff --git a/vendor/libgit2/tests/config/backend.c b/vendor/libgit2/tests/config/backend.c deleted file mode 100644 index 3fd6eb114..000000000 --- a/vendor/libgit2/tests/config/backend.c +++ /dev/null @@ -1,24 +0,0 @@ -#include "clar_libgit2.h" -#include "git2/sys/config.h" - -void test_config_backend__checks_version(void) -{ - git_config *cfg; - git_config_backend backend = GIT_CONFIG_BACKEND_INIT; - const git_error *err; - - backend.version = 1024; - - cl_git_pass(git_config_new(&cfg)); - cl_git_fail(git_config_add_backend(cfg, &backend, 0, false)); - err = giterr_last(); - cl_assert_equal_i(GITERR_INVALID, err->klass); - - giterr_clear(); - backend.version = 1024; - cl_git_fail(git_config_add_backend(cfg, &backend, 0, false)); - err = giterr_last(); - cl_assert_equal_i(GITERR_INVALID, err->klass); - - git_config_free(cfg); -} diff --git a/vendor/libgit2/tests/config/config_helpers.c b/vendor/libgit2/tests/config/config_helpers.c deleted file mode 100644 index 025838ad7..000000000 --- a/vendor/libgit2/tests/config/config_helpers.c +++ /dev/null @@ -1,68 +0,0 @@ -#include "clar_libgit2.h" -#include "config_helpers.h" -#include "repository.h" -#include "buffer.h" - -void assert_config_entry_existence( - git_repository *repo, - const char *name, - bool is_supposed_to_exist) -{ - git_config *config; - git_config_entry *entry = NULL; - int result; - - cl_git_pass(git_repository_config__weakptr(&config, repo)); - - result = git_config_get_entry(&entry, config, name); - git_config_entry_free(entry); - - if (is_supposed_to_exist) - cl_git_pass(result); - else - cl_assert_equal_i(GIT_ENOTFOUND, result); -} - -void assert_config_entry_value( - git_repository *repo, - const char *name, - const char *expected_value) -{ - git_config *config; - git_buf buf = GIT_BUF_INIT; - - cl_git_pass(git_repository_config__weakptr(&config, repo)); - - cl_git_pass(git_config_get_string_buf(&buf, config, name)); - - cl_assert_equal_s(expected_value, git_buf_cstr(&buf)); - git_buf_free(&buf); -} - -static int count_config_entries_cb( - const git_config_entry *entry, - void *payload) -{ - int *how_many = (int *)payload; - - GIT_UNUSED(entry); - - (*how_many)++; - - return 0; -} - -int count_config_entries_match(git_repository *repo, const char *pattern) -{ - git_config *config; - int how_many = 0; - - cl_git_pass(git_repository_config(&config, repo)); - - cl_assert_equal_i(0, git_config_foreach_match( - config, pattern, count_config_entries_cb, &how_many)); - - git_config_free(config); - - return how_many; -} diff --git a/vendor/libgit2/tests/config/config_helpers.h b/vendor/libgit2/tests/config/config_helpers.h deleted file mode 100644 index 440645730..000000000 --- a/vendor/libgit2/tests/config/config_helpers.h +++ /dev/null @@ -1,13 +0,0 @@ -extern void assert_config_entry_existence( - git_repository *repo, - const char *name, - bool is_supposed_to_exist); - -extern void assert_config_entry_value( - git_repository *repo, - const char *name, - const char *expected_value); - -extern int count_config_entries_match( - git_repository *repo, - const char *pattern); diff --git a/vendor/libgit2/tests/config/configlevel.c b/vendor/libgit2/tests/config/configlevel.c deleted file mode 100644 index ca478b1a5..000000000 --- a/vendor/libgit2/tests/config/configlevel.c +++ /dev/null @@ -1,73 +0,0 @@ -#include "clar_libgit2.h" - -void test_config_configlevel__adding_the_same_level_twice_returns_EEXISTS(void) -{ - int error; - git_config *cfg; - - cl_git_pass(git_config_new(&cfg)); - cl_git_pass(git_config_add_file_ondisk(cfg, cl_fixture("config/config9"), - GIT_CONFIG_LEVEL_LOCAL, 0)); - cl_git_pass(git_config_add_file_ondisk(cfg, cl_fixture("config/config15"), - GIT_CONFIG_LEVEL_GLOBAL, 0)); - error = git_config_add_file_ondisk(cfg, cl_fixture("config/config16"), - GIT_CONFIG_LEVEL_GLOBAL, 0); - - cl_git_fail(error); - cl_assert_equal_i(GIT_EEXISTS, error); - - git_config_free(cfg); -} - -void test_config_configlevel__can_replace_a_config_file_at_an_existing_level(void) -{ - git_config *cfg; - git_buf buf = {0}; - - cl_git_pass(git_config_new(&cfg)); - cl_git_pass(git_config_add_file_ondisk(cfg, cl_fixture("config/config18"), - GIT_CONFIG_LEVEL_LOCAL, 1)); - cl_git_pass(git_config_add_file_ondisk(cfg, cl_fixture("config/config19"), - GIT_CONFIG_LEVEL_LOCAL, 1)); - - cl_git_pass(git_config_get_string_buf(&buf, cfg, "core.stringglobal")); - cl_assert_equal_s("don't find me!", buf.ptr); - - git_buf_free(&buf); - git_config_free(cfg); -} - -void test_config_configlevel__can_read_from_a_single_level_focused_file_after_parent_config_has_been_freed(void) -{ - git_config *cfg; - git_config *single_level_cfg; - git_buf buf = {0}; - - cl_git_pass(git_config_new(&cfg)); - cl_git_pass(git_config_add_file_ondisk(cfg, cl_fixture("config/config18"), - GIT_CONFIG_LEVEL_GLOBAL, 0)); - cl_git_pass(git_config_add_file_ondisk(cfg, cl_fixture("config/config19"), - GIT_CONFIG_LEVEL_LOCAL, 0)); - - cl_git_pass(git_config_open_level(&single_level_cfg, cfg, GIT_CONFIG_LEVEL_LOCAL)); - - git_config_free(cfg); - - cl_git_pass(git_config_get_string_buf(&buf, single_level_cfg, "core.stringglobal")); - cl_assert_equal_s("don't find me!", buf.ptr); - - git_buf_free(&buf); - git_config_free(single_level_cfg); -} - -void test_config_configlevel__fetching_a_level_from_an_empty_compound_config_returns_ENOTFOUND(void) -{ - git_config *cfg; - git_config *local_cfg; - - cl_git_pass(git_config_new(&cfg)); - - cl_assert_equal_i(GIT_ENOTFOUND, git_config_open_level(&local_cfg, cfg, GIT_CONFIG_LEVEL_LOCAL)); - - git_config_free(cfg); -} diff --git a/vendor/libgit2/tests/config/global.c b/vendor/libgit2/tests/config/global.c deleted file mode 100644 index a149dc0be..000000000 --- a/vendor/libgit2/tests/config/global.c +++ /dev/null @@ -1,109 +0,0 @@ -#include "clar_libgit2.h" -#include "buffer.h" -#include "fileops.h" - -void test_config_global__initialize(void) -{ - git_buf path = GIT_BUF_INIT; - - cl_git_pass(git_futils_mkdir_r("home", 0777)); - cl_git_pass(git_path_prettify(&path, "home", NULL)); - cl_git_pass(git_libgit2_opts( - GIT_OPT_SET_SEARCH_PATH, GIT_CONFIG_LEVEL_GLOBAL, path.ptr)); - - cl_git_pass(git_futils_mkdir_r("xdg/git", 0777)); - cl_git_pass(git_path_prettify(&path, "xdg/git", NULL)); - cl_git_pass(git_libgit2_opts( - GIT_OPT_SET_SEARCH_PATH, GIT_CONFIG_LEVEL_XDG, path.ptr)); - - cl_git_pass(git_futils_mkdir_r("etc", 0777)); - cl_git_pass(git_path_prettify(&path, "etc", NULL)); - cl_git_pass(git_libgit2_opts( - GIT_OPT_SET_SEARCH_PATH, GIT_CONFIG_LEVEL_SYSTEM, path.ptr)); - - git_buf_free(&path); -} - -void test_config_global__cleanup(void) -{ - cl_sandbox_set_search_path_defaults(); -} - -void test_config_global__open_global(void) -{ - git_config *cfg, *global, *selected, *dummy; - - cl_git_pass(git_config_open_default(&cfg)); - cl_git_pass(git_config_open_level(&global, cfg, GIT_CONFIG_LEVEL_GLOBAL)); - cl_git_fail(git_config_open_level(&dummy, cfg, GIT_CONFIG_LEVEL_XDG)); - cl_git_pass(git_config_open_global(&selected, cfg)); - - git_config_free(selected); - git_config_free(global); - git_config_free(cfg); -} - -void test_config_global__open_xdg(void) -{ - git_config *cfg, *xdg, *selected; - const char *str = "teststring"; - const char *key = "this.variable"; - git_buf buf = {0}; - - cl_git_mkfile("xdg/git/config", "# XDG config\n[core]\n test = 1\n"); - - cl_git_pass(git_config_open_default(&cfg)); - cl_git_pass(git_config_open_level(&xdg, cfg, GIT_CONFIG_LEVEL_XDG)); - cl_git_pass(git_config_open_global(&selected, cfg)); - - cl_git_pass(git_config_set_string(xdg, key, str)); - cl_git_pass(git_config_get_string_buf(&buf, selected, key)); - cl_assert_equal_s(str, buf.ptr); - - git_buf_free(&buf); - git_config_free(selected); - git_config_free(xdg); - git_config_free(cfg); -} - -void test_config_global__open_programdata(void) -{ - git_config *cfg; - git_repository *repo; - git_buf config_path = GIT_BUF_INIT; - git_buf var_contents = GIT_BUF_INIT; - - if (cl_is_env_set("GITTEST_INVASIVE_FS_STRUCTURE")) - cl_skip(); - - cl_git_pass(git_libgit2_opts(GIT_OPT_GET_SEARCH_PATH, - GIT_CONFIG_LEVEL_PROGRAMDATA, &config_path)); - - if (!git_path_isdir(config_path.ptr)) - cl_git_pass(p_mkdir(config_path.ptr, 0777)); - - cl_git_pass(git_buf_puts(&config_path, "/config")); - - cl_git_pass(git_config_open_ondisk(&cfg, config_path.ptr)); - cl_git_pass(git_config_set_string(cfg, "programdata.var", "even higher level")); - - git_buf_free(&config_path); - git_config_free(cfg); - - git_config_open_default(&cfg); - cl_git_pass(git_config_get_string_buf(&var_contents, cfg, "programdata.var")); - cl_assert_equal_s("even higher level", var_contents.ptr); - - git_config_free(cfg); - git_buf_free(&var_contents); - - cl_git_pass(git_repository_init(&repo, "./foo.git", true)); - cl_git_pass(git_repository_config(&cfg, repo)); - cl_git_pass(git_config_get_string_buf(&var_contents, cfg, "programdata.var")); - cl_assert_equal_s("even higher level", var_contents.ptr); - - git_config_free(cfg); - git_buf_free(&var_contents); - git_repository_free(repo); - cl_fixture_cleanup("./foo.git"); -} diff --git a/vendor/libgit2/tests/config/include.c b/vendor/libgit2/tests/config/include.c deleted file mode 100644 index 882b89b16..000000000 --- a/vendor/libgit2/tests/config/include.c +++ /dev/null @@ -1,133 +0,0 @@ -#include "clar_libgit2.h" -#include "buffer.h" -#include "fileops.h" - -void test_config_include__relative(void) -{ - git_config *cfg; - git_buf buf = GIT_BUF_INIT; - - cl_git_pass(git_config_open_ondisk(&cfg, cl_fixture("config/config-include"))); - - cl_git_pass(git_config_get_string_buf(&buf, cfg, "foo.bar.baz")); - cl_assert_equal_s("huzzah", git_buf_cstr(&buf)); - - git_buf_free(&buf); - git_config_free(cfg); -} - -void test_config_include__absolute(void) -{ - git_config *cfg; - git_buf buf = GIT_BUF_INIT; - - cl_git_pass(git_buf_printf(&buf, "[include]\npath = %s/config-included", cl_fixture("config"))); - - cl_git_mkfile("config-include-absolute", git_buf_cstr(&buf)); - git_buf_free(&buf); - cl_git_pass(git_config_open_ondisk(&cfg, "config-include-absolute")); - - cl_git_pass(git_config_get_string_buf(&buf, cfg, "foo.bar.baz")); - cl_assert_equal_s("huzzah", git_buf_cstr(&buf)); - - git_buf_free(&buf); - git_config_free(cfg); -} - -void test_config_include__homedir(void) -{ - git_config *cfg; - git_buf buf = GIT_BUF_INIT; - - cl_git_pass(git_libgit2_opts(GIT_OPT_SET_SEARCH_PATH, GIT_CONFIG_LEVEL_GLOBAL, cl_fixture("config"))); - cl_git_mkfile("config-include-homedir", "[include]\npath = ~/config-included"); - - cl_git_pass(git_config_open_ondisk(&cfg, "config-include-homedir")); - - cl_git_pass(git_config_get_string_buf(&buf, cfg, "foo.bar.baz")); - cl_assert_equal_s("huzzah", git_buf_cstr(&buf)); - - git_buf_free(&buf); - git_config_free(cfg); - - cl_sandbox_set_search_path_defaults(); -} - -/* We need to pretend that the variables were defined where the file was included */ -void test_config_include__ordering(void) -{ - git_config *cfg; - git_buf buf = GIT_BUF_INIT; - - cl_git_mkfile("included", "[foo \"bar\"]\nbaz = hurrah\nfrotz = hiya"); - cl_git_mkfile("including", - "[foo \"bar\"]\nfrotz = hello\n" - "[include]\npath = included\n" - "[foo \"bar\"]\nbaz = huzzah\n"); - - cl_git_pass(git_config_open_ondisk(&cfg, "including")); - - cl_git_pass(git_config_get_string_buf(&buf, cfg, "foo.bar.frotz")); - cl_assert_equal_s("hiya", git_buf_cstr(&buf)); - git_buf_clear(&buf); - cl_git_pass(git_config_get_string_buf(&buf, cfg, "foo.bar.baz")); - cl_assert_equal_s("huzzah", git_buf_cstr(&buf)); - - git_buf_free(&buf); - git_config_free(cfg); -} - -/* We need to pretend that the variables were defined where the file was included */ -void test_config_include__depth(void) -{ - git_config *cfg; - - cl_git_mkfile("a", "[include]\npath = b"); - cl_git_mkfile("b", "[include]\npath = a"); - - cl_git_fail(git_config_open_ondisk(&cfg, "a")); - - p_unlink("a"); - p_unlink("b"); -} - -void test_config_include__missing(void) -{ - git_config *cfg; - git_buf buf = GIT_BUF_INIT; - - cl_git_mkfile("including", "[include]\npath = nonexistentfile\n[foo]\nbar = baz"); - - giterr_clear(); - cl_git_pass(git_config_open_ondisk(&cfg, "including")); - cl_assert(giterr_last() == NULL); - cl_git_pass(git_config_get_string_buf(&buf, cfg, "foo.bar")); - cl_assert_equal_s("baz", git_buf_cstr(&buf)); - - git_buf_free(&buf); - git_config_free(cfg); -} - -#define replicate10(s) s s s s s s s s s s -void test_config_include__depth2(void) -{ - git_config *cfg; - git_buf buf = GIT_BUF_INIT; - const char *content = "[include]\n" replicate10(replicate10("path=bottom\n")); - - cl_git_mkfile("top-level", "[include]\npath = middle\n[foo]\nbar = baz"); - cl_git_mkfile("middle", content); - cl_git_mkfile("bottom", "[foo]\nbar2 = baz2"); - - cl_git_pass(git_config_open_ondisk(&cfg, "top-level")); - - cl_git_pass(git_config_get_string_buf(&buf, cfg, "foo.bar")); - cl_assert_equal_s("baz", git_buf_cstr(&buf)); - - git_buf_clear(&buf); - cl_git_pass(git_config_get_string_buf(&buf, cfg, "foo.bar2")); - cl_assert_equal_s("baz2", git_buf_cstr(&buf)); - - git_buf_free(&buf); - git_config_free(cfg); -} diff --git a/vendor/libgit2/tests/config/multivar.c b/vendor/libgit2/tests/config/multivar.c deleted file mode 100644 index d1b8c4cda..000000000 --- a/vendor/libgit2/tests/config/multivar.c +++ /dev/null @@ -1,288 +0,0 @@ -#include "clar_libgit2.h" - -static const char *_name = "remote.ab.url"; - -void test_config_multivar__initialize(void) -{ - cl_fixture_sandbox("config"); -} - -void test_config_multivar__cleanup(void) -{ - cl_fixture_cleanup("config"); -} - -static int mv_read_cb(const git_config_entry *entry, void *data) -{ - int *n = (int *) data; - - if (!strcmp(entry->name, _name)) - (*n)++; - - return 0; -} - -void test_config_multivar__foreach(void) -{ - git_config *cfg; - int n = 0; - - cl_git_pass(git_config_open_ondisk(&cfg, cl_fixture("config/config11"))); - - cl_git_pass(git_config_foreach(cfg, mv_read_cb, &n)); - cl_assert(n == 2); - - git_config_free(cfg); -} - -static int cb(const git_config_entry *entry, void *data) -{ - int *n = (int *) data; - - GIT_UNUSED(entry); - - (*n)++; - - return 0; -} - -static void check_get_multivar_foreach( - git_config *cfg, int expected, int expected_patterned) -{ - int n = 0; - - if (expected > 0) { - cl_git_pass(git_config_get_multivar_foreach(cfg, _name, NULL, cb, &n)); - cl_assert_equal_i(expected, n); - } else { - cl_assert_equal_i(GIT_ENOTFOUND, - git_config_get_multivar_foreach(cfg, _name, NULL, cb, &n)); - } - - n = 0; - - if (expected_patterned > 0) { - cl_git_pass(git_config_get_multivar_foreach(cfg, _name, "example", cb, &n)); - cl_assert_equal_i(expected_patterned, n); - } else { - cl_assert_equal_i(GIT_ENOTFOUND, - git_config_get_multivar_foreach(cfg, _name, "example", cb, &n)); - } -} - -static void check_get_multivar(git_config *cfg, int expected) -{ - git_config_iterator *iter; - git_config_entry *entry; - int n = 0; - - cl_git_pass(git_config_multivar_iterator_new(&iter, cfg, _name, NULL)); - - while (git_config_next(&entry, iter) == 0) - n++; - - cl_assert_equal_i(expected, n); - git_config_iterator_free(iter); - -} - -void test_config_multivar__get(void) -{ - git_config *cfg; - - cl_git_pass(git_config_open_ondisk(&cfg, "config/config11")); - check_get_multivar_foreach(cfg, 2, 1); - - /* add another that has the _name entry */ - cl_git_pass(git_config_add_file_ondisk(cfg, "config/config9", GIT_CONFIG_LEVEL_SYSTEM, 1)); - check_get_multivar_foreach(cfg, 3, 2); - - /* add another that does not have the _name entry */ - cl_git_pass(git_config_add_file_ondisk(cfg, "config/config0", GIT_CONFIG_LEVEL_GLOBAL, 1)); - check_get_multivar_foreach(cfg, 3, 2); - - /* add another that does not have the _name entry at the end */ - cl_git_pass(git_config_add_file_ondisk(cfg, "config/config1", GIT_CONFIG_LEVEL_APP, 1)); - check_get_multivar_foreach(cfg, 3, 2); - - /* drop original file */ - cl_git_pass(git_config_add_file_ondisk(cfg, "config/config2", GIT_CONFIG_LEVEL_LOCAL, 1)); - check_get_multivar_foreach(cfg, 1, 1); - - /* drop other file with match */ - cl_git_pass(git_config_add_file_ondisk(cfg, "config/config3", GIT_CONFIG_LEVEL_SYSTEM, 1)); - check_get_multivar_foreach(cfg, 0, 0); - - /* reload original file (add different place in order) */ - cl_git_pass(git_config_add_file_ondisk(cfg, "config/config11", GIT_CONFIG_LEVEL_SYSTEM, 1)); - check_get_multivar_foreach(cfg, 2, 1); - - check_get_multivar(cfg, 2); - - git_config_free(cfg); -} - -void test_config_multivar__add(void) -{ - git_config *cfg; - int n; - - cl_git_pass(git_config_open_ondisk(&cfg, "config/config11")); - cl_git_pass(git_config_set_multivar(cfg, _name, "nonexistant", "git://git.otherplace.org/libgit2")); - - n = 0; - cl_git_pass(git_config_get_multivar_foreach(cfg, _name, NULL, cb, &n)); - cl_assert_equal_i(n, 3); - - n = 0; - cl_git_pass(git_config_get_multivar_foreach(cfg, _name, "otherplace", cb, &n)); - cl_assert_equal_i(n, 1); - - git_config_free(cfg); - - /* We know it works in memory, let's see if the file is written correctly */ - - cl_git_pass(git_config_open_ondisk(&cfg, "config/config11")); - - n = 0; - cl_git_pass(git_config_get_multivar_foreach(cfg, _name, NULL, cb, &n)); - cl_assert_equal_i(n, 3); - - n = 0; - cl_git_pass(git_config_get_multivar_foreach(cfg, _name, "otherplace", cb, &n)); - cl_assert_equal_i(n, 1); - - git_config_free(cfg); -} - -void test_config_multivar__add_new(void) -{ - const char *var = "a.brand.new"; - git_config *cfg; - int n; - - cl_git_pass(git_config_open_ondisk(&cfg, "config/config11")); - - cl_git_pass(git_config_set_multivar(cfg, var, "$^", "variable")); - n = 0; - cl_git_pass(git_config_get_multivar_foreach(cfg, var, NULL, cb, &n)); - cl_assert_equal_i(n, 1); - - git_config_free(cfg); -} - -void test_config_multivar__replace(void) -{ - git_config *cfg; - int n; - - cl_git_pass(git_config_open_ondisk(&cfg, "config/config11")); - - n = 0; - cl_git_pass(git_config_get_multivar_foreach(cfg, _name, NULL, cb, &n)); - cl_assert(n == 2); - - cl_git_pass(git_config_set_multivar(cfg, _name, "github", "git://git.otherplace.org/libgit2")); - - n = 0; - cl_git_pass(git_config_get_multivar_foreach(cfg, _name, NULL, cb, &n)); - cl_assert(n == 2); - - git_config_free(cfg); - - cl_git_pass(git_config_open_ondisk(&cfg, "config/config11")); - - n = 0; - cl_git_pass(git_config_get_multivar_foreach(cfg, _name, NULL, cb, &n)); - cl_assert(n == 2); - - git_config_free(cfg); -} - -void test_config_multivar__replace_multiple(void) -{ - git_config *cfg; - int n; - - cl_git_pass(git_config_open_ondisk(&cfg, "config/config11")); - cl_git_pass(git_config_set_multivar(cfg, _name, "git://", "git://git.otherplace.org/libgit2")); - - n = 0; - cl_git_pass(git_config_get_multivar_foreach(cfg, _name, "otherplace", cb, &n)); - cl_assert_equal_i(n, 2); - - git_config_free(cfg); - - cl_git_pass(git_config_open_ondisk(&cfg, "config/config11")); - - n = 0; - cl_git_pass(git_config_get_multivar_foreach(cfg, _name, "otherplace", cb, &n)); - cl_assert_equal_i(n, 2); - - git_config_free(cfg); -} - -void test_config_multivar__delete(void) -{ - git_config *cfg; - int n; - - cl_git_pass(git_config_open_ondisk(&cfg, "config/config11")); - - n = 0; - cl_git_pass(git_config_get_multivar_foreach(cfg, _name, NULL, cb, &n)); - cl_assert_equal_i(2, n); - - cl_git_pass(git_config_delete_multivar(cfg, _name, "github")); - - n = 0; - cl_git_pass(git_config_get_multivar_foreach(cfg, _name, NULL, cb, &n)); - cl_assert_equal_i(1, n); - - git_config_free(cfg); - - cl_git_pass(git_config_open_ondisk(&cfg, "config/config11")); - - n = 0; - cl_git_pass(git_config_get_multivar_foreach(cfg, _name, NULL, cb, &n)); - cl_assert_equal_i(1, n); - - git_config_free(cfg); -} - -void test_config_multivar__delete_multiple(void) -{ - git_config *cfg; - int n; - - cl_git_pass(git_config_open_ondisk(&cfg, "config/config11")); - - n = 0; - cl_git_pass(git_config_get_multivar_foreach(cfg, _name, NULL, cb, &n)); - cl_assert(n == 2); - - cl_git_pass(git_config_delete_multivar(cfg, _name, "git")); - - n = 0; - cl_git_fail_with(git_config_get_multivar_foreach(cfg, _name, NULL, cb, &n), GIT_ENOTFOUND); - - git_config_free(cfg); - - cl_git_pass(git_config_open_ondisk(&cfg, "config/config11")); - - n = 0; - cl_git_fail_with(git_config_get_multivar_foreach(cfg, _name, NULL, cb, &n), GIT_ENOTFOUND); - - git_config_free(cfg); -} - -void test_config_multivar__delete_notfound(void) -{ - git_config *cfg; - - cl_git_pass(git_config_open_ondisk(&cfg, "config/config11")); - - cl_git_fail_with(git_config_delete_multivar(cfg, "remote.ab.noturl", "git"), GIT_ENOTFOUND); - - git_config_free(cfg); -} diff --git a/vendor/libgit2/tests/config/new.c b/vendor/libgit2/tests/config/new.c deleted file mode 100644 index b39baa0a5..000000000 --- a/vendor/libgit2/tests/config/new.c +++ /dev/null @@ -1,34 +0,0 @@ -#include "clar_libgit2.h" - -#include "filebuf.h" -#include "fileops.h" -#include "posix.h" - -#define TEST_CONFIG "git-new-config" - -void test_config_new__write_new_config(void) -{ - git_config *config; - git_buf buf = GIT_BUF_INIT; - - cl_git_mkfile(TEST_CONFIG, ""); - cl_git_pass(git_config_open_ondisk(&config, TEST_CONFIG)); - - cl_git_pass(git_config_set_string(config, "color.ui", "auto")); - cl_git_pass(git_config_set_string(config, "core.editor", "ed")); - - git_config_free(config); - - cl_git_pass(git_config_open_ondisk(&config, TEST_CONFIG)); - - cl_git_pass(git_config_get_string_buf(&buf, config, "color.ui")); - cl_assert_equal_s("auto", git_buf_cstr(&buf)); - git_buf_clear(&buf); - cl_git_pass(git_config_get_string_buf(&buf, config, "core.editor")); - cl_assert_equal_s("ed", git_buf_cstr(&buf)); - - git_buf_free(&buf); - git_config_free(config); - - p_unlink(TEST_CONFIG); -} diff --git a/vendor/libgit2/tests/config/read.c b/vendor/libgit2/tests/config/read.c deleted file mode 100644 index f86b2d79e..000000000 --- a/vendor/libgit2/tests/config/read.c +++ /dev/null @@ -1,705 +0,0 @@ -#include "clar_libgit2.h" -#include "buffer.h" -#include "path.h" - -static git_buf buf = GIT_BUF_INIT; - -void test_config_read__cleanup(void) -{ - git_buf_free(&buf); -} - -void test_config_read__simple_read(void) -{ - git_config *cfg; - int32_t i; - - cl_git_pass(git_config_open_ondisk(&cfg, cl_fixture("config/config0"))); - - cl_git_pass(git_config_get_int32(&i, cfg, "core.repositoryformatversion")); - cl_assert(i == 0); - cl_git_pass(git_config_get_bool(&i, cfg, "core.filemode")); - cl_assert(i == 1); - cl_git_pass(git_config_get_bool(&i, cfg, "core.bare")); - cl_assert(i == 0); - cl_git_pass(git_config_get_bool(&i, cfg, "core.logallrefupdates")); - cl_assert(i == 1); - - git_config_free(cfg); -} - -void test_config_read__case_sensitive(void) -{ - git_config *cfg; - int i; - - cl_git_pass(git_config_open_ondisk(&cfg, cl_fixture("config/config1"))); - - cl_git_pass(git_config_get_string_buf(&buf, cfg, "this.that.other")); - cl_assert_equal_s("true", git_buf_cstr(&buf)); - git_buf_clear(&buf); - - cl_git_pass(git_config_get_string_buf(&buf, cfg, "this.That.other")); - cl_assert_equal_s("yes", git_buf_cstr(&buf)); - - cl_git_pass(git_config_get_bool(&i, cfg, "this.that.other")); - cl_assert(i == 1); - cl_git_pass(git_config_get_bool(&i, cfg, "this.That.other")); - cl_assert(i == 1); - - /* This one doesn't exist */ - cl_must_fail(git_config_get_bool(&i, cfg, "this.thaT.other")); - - git_config_free(cfg); -} - -/* - * If \ is the last non-space character on the line, we read the next - * one, separating each line with SP. - */ -void test_config_read__multiline_value(void) -{ - git_config *cfg; - - cl_git_pass(git_config_open_ondisk(&cfg, cl_fixture("config/config2"))); - - cl_git_pass(git_config_get_string_buf(&buf, cfg, "this.That.and")); - cl_assert_equal_s("one one one two two three three", git_buf_cstr(&buf)); - - git_config_free(cfg); -} - -static void clean_test_config(void *unused) -{ - GIT_UNUSED(unused); - cl_fixture_cleanup("./testconfig"); -} - -void test_config_read__multiline_value_and_eof(void) -{ - git_config *cfg; - - cl_set_cleanup(&clean_test_config, NULL); - cl_git_mkfile("./testconfig", "[header]\n key1 = foo\\\n"); - cl_git_pass(git_config_open_ondisk(&cfg, "./testconfig")); - - cl_git_pass(git_config_get_string_buf(&buf, cfg, "header.key1")); - cl_assert_equal_s("foo", git_buf_cstr(&buf)); - - git_config_free(cfg); -} - -void test_config_read__multiline_eof(void) -{ - git_config *cfg; - - cl_set_cleanup(&clean_test_config, NULL); - cl_git_mkfile("./testconfig", "[header]\n key1 = \\\n"); - cl_git_pass(git_config_open_ondisk(&cfg, "./testconfig")); - - cl_git_pass(git_config_get_string_buf(&buf, cfg, "header.key1")); - cl_assert_equal_s("", git_buf_cstr(&buf)); - - git_config_free(cfg); -} - -/* - * This kind of subsection declaration is case-insensitive - */ -void test_config_read__subsection_header(void) -{ - git_config *cfg; - - cl_git_pass(git_config_open_ondisk(&cfg, cl_fixture("config/config3"))); - - cl_git_pass(git_config_get_string_buf(&buf, cfg, "section.subsection.var")); - cl_assert_equal_s("hello", git_buf_cstr(&buf)); - - /* The subsection is transformed to lower-case */ - cl_must_fail(git_config_get_string_buf(&buf, cfg, "section.subSectIon.var")); - - git_config_free(cfg); -} - -void test_config_read__lone_variable(void) -{ - git_config *cfg; - int i; - - cl_git_pass(git_config_open_ondisk(&cfg, cl_fixture("config/config4"))); - - cl_git_fail(git_config_get_int32(&i, cfg, "some.section.variable")); - - cl_git_pass(git_config_get_string_buf(&buf, cfg, "some.section.variable")); - cl_assert_equal_s("", git_buf_cstr(&buf)); - git_buf_clear(&buf); - - cl_git_pass(git_config_get_bool(&i, cfg, "some.section.variable")); - cl_assert(i == 1); - - cl_git_pass(git_config_get_string_buf(&buf, cfg, "some.section.variableeq")); - cl_assert_equal_s("", git_buf_cstr(&buf)); - - cl_git_pass(git_config_get_bool(&i, cfg, "some.section.variableeq")); - cl_assert(i == 0); - - git_config_free(cfg); -} - -void test_config_read__number_suffixes(void) -{ - git_config *cfg; - int64_t i; - - cl_git_pass(git_config_open_ondisk(&cfg, cl_fixture("config/config5"))); - - cl_git_pass(git_config_get_int64(&i, cfg, "number.simple")); - cl_assert(i == 1); - - cl_git_pass(git_config_get_int64(&i, cfg, "number.k")); - cl_assert(i == 1 * 1024); - - cl_git_pass(git_config_get_int64(&i, cfg, "number.kk")); - cl_assert(i == 1 * 1024); - - cl_git_pass(git_config_get_int64(&i, cfg, "number.m")); - cl_assert(i == 1 * 1024 * 1024); - - cl_git_pass(git_config_get_int64(&i, cfg, "number.mm")); - cl_assert(i == 1 * 1024 * 1024); - - cl_git_pass(git_config_get_int64(&i, cfg, "number.g")); - cl_assert(i == 1 * 1024 * 1024 * 1024); - - cl_git_pass(git_config_get_int64(&i, cfg, "number.gg")); - cl_assert(i == 1 * 1024 * 1024 * 1024); - - git_config_free(cfg); -} - -void test_config_read__blank_lines(void) -{ - git_config *cfg; - int i; - - cl_git_pass(git_config_open_ondisk(&cfg, cl_fixture("config/config6"))); - - cl_git_pass(git_config_get_bool(&i, cfg, "valid.subsection.something")); - cl_assert(i == 1); - - cl_git_pass(git_config_get_bool(&i, cfg, "something.else.something")); - cl_assert(i == 0); - - git_config_free(cfg); -} - -void test_config_read__invalid_ext_headers(void) -{ - git_config *cfg; - cl_must_fail(git_config_open_ondisk(&cfg, cl_fixture("config/config7"))); -} - -void test_config_read__empty_files(void) -{ - git_config *cfg; - cl_git_pass(git_config_open_ondisk(&cfg, cl_fixture("config/config8"))); - git_config_free(cfg); -} - -void test_config_read__symbol_headers(void) -{ - git_config *cfg; - cl_git_pass(git_config_open_ondisk(&cfg, cl_fixture("config/config20"))); - git_config_free(cfg); -} - -void test_config_read__header_in_last_line(void) -{ - git_config *cfg; - - cl_git_pass(git_config_open_ondisk(&cfg, cl_fixture("config/config10"))); - git_config_free(cfg); -} - -void test_config_read__prefixes(void) -{ - git_config *cfg; - - cl_git_pass(git_config_open_ondisk(&cfg, cl_fixture("config/config9"))); - cl_git_pass(git_config_get_string_buf(&buf, cfg, "remote.ab.url")); - cl_assert_equal_s("http://example.com/git/ab", git_buf_cstr(&buf)); - git_buf_clear(&buf); - - cl_git_pass(git_config_get_string_buf(&buf, cfg, "remote.abba.url")); - cl_assert_equal_s("http://example.com/git/abba", git_buf_cstr(&buf)); - - git_config_free(cfg); -} - -void test_config_read__escaping_quotes(void) -{ - git_config *cfg; - - cl_git_pass(git_config_open_ondisk(&cfg, cl_fixture("config/config13"))); - cl_git_pass(git_config_get_string_buf(&buf, cfg, "core.editor")); - cl_assert_equal_s("\"C:/Program Files/Nonsense/bah.exe\" \"--some option\"", git_buf_cstr(&buf)); - - git_config_free(cfg); -} - -void test_config_read__invalid_escape_sequence(void) -{ - git_config *cfg; - - cl_set_cleanup(&clean_test_config, NULL); - cl_git_mkfile("./testconfig", "[header]\n key1 = \\\\\\;\n key2 = value2\n"); - cl_git_fail(git_config_open_ondisk(&cfg, "./testconfig")); - - git_config_free(cfg); -} - -static int count_cfg_entries_and_compare_levels( - const git_config_entry *entry, void *payload) -{ - int *count = payload; - - if (!strcmp(entry->value, "7") || !strcmp(entry->value, "17")) - cl_assert(entry->level == GIT_CONFIG_LEVEL_GLOBAL); - else - cl_assert(entry->level == GIT_CONFIG_LEVEL_SYSTEM); - - (*count)++; - return 0; -} - -static int cfg_callback_countdown(const git_config_entry *entry, void *payload) -{ - int *count = payload; - GIT_UNUSED(entry); - (*count)--; - if (*count == 0) - return -100; - return 0; -} - -void test_config_read__foreach(void) -{ - git_config *cfg; - int count, ret; - - cl_git_pass(git_config_new(&cfg)); - cl_git_pass(git_config_add_file_ondisk(cfg, cl_fixture("config/config9"), - GIT_CONFIG_LEVEL_SYSTEM, 0)); - cl_git_pass(git_config_add_file_ondisk(cfg, cl_fixture("config/config15"), - GIT_CONFIG_LEVEL_GLOBAL, 0)); - - count = 0; - cl_git_pass(git_config_foreach(cfg, count_cfg_entries_and_compare_levels, &count)); - cl_assert_equal_i(7, count); - - count = 3; - cl_git_fail(ret = git_config_foreach(cfg, cfg_callback_countdown, &count)); - cl_assert_equal_i(-100, ret); - - git_config_free(cfg); -} - -void test_config_read__iterator(void) -{ - git_config *cfg; - git_config_iterator *iter; - git_config_entry *entry; - int count, ret; - - cl_git_pass(git_config_new(&cfg)); - cl_git_pass(git_config_add_file_ondisk(cfg, cl_fixture("config/config9"), - GIT_CONFIG_LEVEL_SYSTEM, 0)); - cl_git_pass(git_config_add_file_ondisk(cfg, cl_fixture("config/config15"), - GIT_CONFIG_LEVEL_GLOBAL, 0)); - - count = 0; - cl_git_pass(git_config_iterator_new(&iter, cfg)); - - while ((ret = git_config_next(&entry, iter)) == 0) { - count++; - } - - git_config_iterator_free(iter); - cl_assert_equal_i(GIT_ITEROVER, ret); - cl_assert_equal_i(7, count); - - count = 3; - cl_git_pass(git_config_iterator_new(&iter, cfg)); - - git_config_iterator_free(iter); - git_config_free(cfg); -} - -static int count_cfg_entries(const git_config_entry *entry, void *payload) -{ - int *count = payload; - GIT_UNUSED(entry); - (*count)++; - return 0; -} - -void test_config_read__foreach_match(void) -{ - git_config *cfg; - int count; - - cl_git_pass(git_config_open_ondisk(&cfg, cl_fixture("config/config9"))); - - count = 0; - cl_git_pass( - git_config_foreach_match(cfg, "core.*", count_cfg_entries, &count)); - cl_assert_equal_i(3, count); - - count = 0; - cl_git_pass( - git_config_foreach_match(cfg, "remote\\.ab.*", count_cfg_entries, &count)); - cl_assert_equal_i(2, count); - - count = 0; - cl_git_pass( - git_config_foreach_match(cfg, ".*url$", count_cfg_entries, &count)); - cl_assert_equal_i(2, count); - - count = 0; - cl_git_pass( - git_config_foreach_match(cfg, ".*dummy.*", count_cfg_entries, &count)); - cl_assert_equal_i(2, count); - - count = 0; - cl_git_pass( - git_config_foreach_match(cfg, ".*nomatch.*", count_cfg_entries, &count)); - cl_assert_equal_i(0, count); - - git_config_free(cfg); -} - -static void check_glob_iter(git_config *cfg, const char *regexp, int expected) -{ - git_config_iterator *iter; - git_config_entry *entry; - int count, error; - - cl_git_pass(git_config_iterator_glob_new(&iter, cfg, regexp)); - - count = 0; - while ((error = git_config_next(&entry, iter)) == 0) - count++; - - cl_assert_equal_i(GIT_ITEROVER, error); - cl_assert_equal_i(expected, count); - git_config_iterator_free(iter); -} - -void test_config_read__iterator_invalid_glob(void) -{ - git_config *cfg; - git_config_iterator *iter; - - cl_git_pass(git_config_open_ondisk(&cfg, cl_fixture("config/config9"))); - - cl_git_fail(git_config_iterator_glob_new(&iter, cfg, "*")); - - git_config_free(cfg); -} - -void test_config_read__iterator_glob(void) -{ - git_config *cfg; - - cl_git_pass(git_config_open_ondisk(&cfg, cl_fixture("config/config9"))); - - check_glob_iter(cfg, "core.*", 3); - check_glob_iter(cfg, "remote\\.ab.*", 2); - check_glob_iter(cfg, ".*url$", 2); - check_glob_iter(cfg, ".*dummy.*", 2); - check_glob_iter(cfg, ".*nomatch.*", 0); - - git_config_free(cfg); -} - -void test_config_read__whitespace_not_required_around_assignment(void) -{ - git_config *cfg; - - cl_git_pass(git_config_open_ondisk(&cfg, cl_fixture("config/config14"))); - - cl_git_pass(git_config_get_string_buf(&buf, cfg, "a.b")); - cl_assert_equal_s("c", git_buf_cstr(&buf)); - git_buf_clear(&buf); - - cl_git_pass(git_config_get_string_buf(&buf, cfg, "d.e")); - cl_assert_equal_s("f", git_buf_cstr(&buf)); - - git_config_free(cfg); -} - -void test_config_read__read_git_config_entry(void) -{ - git_config *cfg; - git_config_entry *entry; - - cl_git_pass(git_config_new(&cfg)); - cl_git_pass(git_config_add_file_ondisk(cfg, cl_fixture("config/config9"), - GIT_CONFIG_LEVEL_SYSTEM, 0)); - - cl_git_pass(git_config_get_entry(&entry, cfg, "core.dummy2")); - cl_assert_equal_s("core.dummy2", entry->name); - cl_assert_equal_s("42", entry->value); - cl_assert_equal_i(GIT_CONFIG_LEVEL_SYSTEM, entry->level); - - git_config_entry_free(entry); - git_config_free(cfg); -} - -/* - * At the beginning of the test: - * - config9 has: core.dummy2=42 - * - config15 has: core.dummy2=7 - * - config16 has: core.dummy2=28 - */ -void test_config_read__local_config_overrides_global_config_overrides_system_config(void) -{ - git_config *cfg; - int32_t i; - - cl_git_pass(git_config_new(&cfg)); - cl_git_pass(git_config_add_file_ondisk(cfg, cl_fixture("config/config9"), - GIT_CONFIG_LEVEL_SYSTEM, 0)); - cl_git_pass(git_config_add_file_ondisk(cfg, cl_fixture("config/config15"), - GIT_CONFIG_LEVEL_GLOBAL, 0)); - cl_git_pass(git_config_add_file_ondisk(cfg, cl_fixture("config/config16"), - GIT_CONFIG_LEVEL_LOCAL, 0)); - - cl_git_pass(git_config_get_int32(&i, cfg, "core.dummy2")); - cl_assert_equal_i(28, i); - - git_config_free(cfg); - - cl_git_pass(git_config_new(&cfg)); - cl_git_pass(git_config_add_file_ondisk(cfg, cl_fixture("config/config9"), - GIT_CONFIG_LEVEL_SYSTEM, 0)); - cl_git_pass(git_config_add_file_ondisk(cfg, cl_fixture("config/config15"), - GIT_CONFIG_LEVEL_GLOBAL, 0)); - - cl_git_pass(git_config_get_int32(&i, cfg, "core.dummy2")); - cl_assert_equal_i(7, i); - - git_config_free(cfg); -} - -/* - * At the beginning of the test: - * - config9 has: core.global does not exist - * - config15 has: core.global=17 - * - config16 has: core.global=29 - * - * And also: - * - config9 has: core.system does not exist - * - config15 has: core.system does not exist - * - config16 has: core.system=11 - */ -void test_config_read__fallback_from_local_to_global_and_from_global_to_system(void) -{ - git_config *cfg; - int32_t i; - - cl_git_pass(git_config_new(&cfg)); - cl_git_pass(git_config_add_file_ondisk(cfg, cl_fixture("config/config9"), - GIT_CONFIG_LEVEL_SYSTEM, 0)); - cl_git_pass(git_config_add_file_ondisk(cfg, cl_fixture("config/config15"), - GIT_CONFIG_LEVEL_GLOBAL, 0)); - cl_git_pass(git_config_add_file_ondisk(cfg, cl_fixture("config/config16"), - GIT_CONFIG_LEVEL_LOCAL, 0)); - - cl_git_pass(git_config_get_int32(&i, cfg, "core.global")); - cl_assert_equal_i(17, i); - cl_git_pass(git_config_get_int32(&i, cfg, "core.system")); - cl_assert_equal_i(11, i); - - git_config_free(cfg); -} - -/* - * At the beginning of the test, config18 has: - * int32global = 28 - * int64global = 9223372036854775803 - * boolglobal = true - * stringglobal = I'm a global config value! - * - * And config19 has: - * int32global = -1 - * int64global = -2 - * boolglobal = false - * stringglobal = don't find me! - * - */ -void test_config_read__simple_read_from_specific_level(void) -{ - git_config *cfg, *cfg_specific; - int i; - int64_t l, expected = +9223372036854775803; - - cl_git_pass(git_config_new(&cfg)); - cl_git_pass(git_config_add_file_ondisk(cfg, cl_fixture("config/config18"), - GIT_CONFIG_LEVEL_GLOBAL, 0)); - cl_git_pass(git_config_add_file_ondisk(cfg, cl_fixture("config/config19"), - GIT_CONFIG_LEVEL_SYSTEM, 0)); - - cl_git_pass(git_config_open_level(&cfg_specific, cfg, GIT_CONFIG_LEVEL_GLOBAL)); - - cl_git_pass(git_config_get_int32(&i, cfg_specific, "core.int32global")); - cl_assert_equal_i(28, i); - cl_git_pass(git_config_get_int64(&l, cfg_specific, "core.int64global")); - cl_assert(l == expected); - cl_git_pass(git_config_get_bool(&i, cfg_specific, "core.boolglobal")); - cl_assert_equal_b(true, i); - cl_git_pass(git_config_get_string_buf(&buf, cfg_specific, "core.stringglobal")); - cl_assert_equal_s("I'm a global config value!", git_buf_cstr(&buf)); - - git_config_free(cfg_specific); - git_config_free(cfg); -} - -void test_config_read__can_load_and_parse_an_empty_config_file(void) -{ - git_config *cfg; - int i; - - cl_set_cleanup(&clean_test_config, NULL); - cl_git_mkfile("./testconfig", ""); - cl_git_pass(git_config_open_ondisk(&cfg, "./testconfig")); - cl_assert_equal_i(GIT_ENOTFOUND, git_config_get_int32(&i, cfg, "nope.neither")); - - git_config_free(cfg); -} - -void test_config_read__corrupt_header(void) -{ - git_config *cfg; - - cl_set_cleanup(&clean_test_config, NULL); - cl_git_mkfile("./testconfig", "[sneaky ] \"quoted closing quote mark\\\""); - cl_git_fail(git_config_open_ondisk(&cfg, "./testconfig")); - - git_config_free(cfg); -} - -void test_config_read__corrupt_header2(void) -{ - git_config *cfg; - - cl_set_cleanup(&clean_test_config, NULL); - cl_git_mkfile("./testconfig", "[unclosed \"bracket\"\n lib = git2\n"); - cl_git_fail(git_config_open_ondisk(&cfg, "./testconfig")); - - git_config_free(cfg); -} - -void test_config_read__corrupt_header3(void) -{ - git_config *cfg; - - cl_set_cleanup(&clean_test_config, NULL); - cl_git_mkfile("./testconfig", "[unclosed \"slash\\\"]\n lib = git2\n"); - cl_git_fail(git_config_open_ondisk(&cfg, "./testconfig")); - - git_config_free(cfg); -} - -void test_config_read__invalid_key_chars(void) -{ - git_config *cfg; - - cl_set_cleanup(&clean_test_config, NULL); - cl_git_mkfile("./testconfig", "[foo]\n has_underscore = git2\n"); - cl_git_fail(git_config_open_ondisk(&cfg, "./testconfig")); - - cl_git_rewritefile("./testconfig", "[foo]\n has/slash = git2\n"); - cl_git_fail(git_config_open_ondisk(&cfg, "./testconfig")); - - cl_git_rewritefile("./testconfig", "[foo]\n has+plus = git2\n"); - cl_git_fail(git_config_open_ondisk(&cfg, "./testconfig")); - - cl_git_rewritefile("./testconfig", "[no_key]\n = git2\n"); - cl_git_fail(git_config_open_ondisk(&cfg, "./testconfig")); - - git_config_free(cfg); -} - -void test_config_read__lone_variable_with_trailing_whitespace(void) -{ - git_config *cfg; - int b; - - cl_set_cleanup(&clean_test_config, NULL); - cl_git_mkfile("./testconfig", "[foo]\n lonevariable \n"); - cl_git_pass(git_config_open_ondisk(&cfg, "./testconfig")); - - cl_git_pass(git_config_get_bool(&b, cfg, "foo.lonevariable")); - cl_assert_equal_b(true, b); - - git_config_free(cfg); -} - -void test_config_read__override_variable(void) -{ - git_config *cfg; - - cl_set_cleanup(&clean_test_config, NULL); - cl_git_mkfile("./testconfig", "[some] var = one\nvar = two"); - cl_git_pass(git_config_open_ondisk(&cfg, "./testconfig")); - - cl_git_pass(git_config_get_string_buf(&buf, cfg, "some.var")); - cl_assert_equal_s("two", git_buf_cstr(&buf)); - - git_config_free(cfg); -} - -void test_config_read__path(void) -{ - git_config *cfg; - git_buf path = GIT_BUF_INIT; - git_buf old_path = GIT_BUF_INIT; - git_buf home_path = GIT_BUF_INIT; - git_buf expected_path = GIT_BUF_INIT; - - cl_git_pass(p_mkdir("fakehome", 0777)); - cl_git_pass(git_path_prettify(&home_path, "fakehome", NULL)); - cl_git_pass(git_libgit2_opts(GIT_OPT_GET_SEARCH_PATH, GIT_CONFIG_LEVEL_GLOBAL, &old_path)); - cl_git_pass(git_libgit2_opts(GIT_OPT_SET_SEARCH_PATH, GIT_CONFIG_LEVEL_GLOBAL, home_path.ptr)); - cl_git_mkfile("./testconfig", "[some]\n path = ~/somefile"); - cl_git_pass(git_path_join_unrooted(&expected_path, "somefile", home_path.ptr, NULL)); - - cl_git_pass(git_config_open_ondisk(&cfg, "./testconfig")); - cl_git_pass(git_config_get_path(&path, cfg, "some.path")); - cl_assert_equal_s(expected_path.ptr, path.ptr); - git_buf_free(&path); - - cl_git_mkfile("./testconfig", "[some]\n path = ~/"); - cl_git_pass(git_path_join_unrooted(&expected_path, "", home_path.ptr, NULL)); - - cl_git_pass(git_config_get_path(&path, cfg, "some.path")); - cl_assert_equal_s(expected_path.ptr, path.ptr); - git_buf_free(&path); - - cl_git_mkfile("./testconfig", "[some]\n path = ~"); - cl_git_pass(git_buf_sets(&expected_path, home_path.ptr)); - - cl_git_pass(git_config_get_path(&path, cfg, "some.path")); - cl_assert_equal_s(expected_path.ptr, path.ptr); - git_buf_free(&path); - - cl_git_mkfile("./testconfig", "[some]\n path = ~user/foo"); - cl_git_fail(git_config_get_path(&path, cfg, "some.path")); - - cl_git_pass(git_libgit2_opts(GIT_OPT_SET_SEARCH_PATH, GIT_CONFIG_LEVEL_GLOBAL, old_path.ptr)); - git_buf_free(&old_path); - git_buf_free(&home_path); - git_buf_free(&expected_path); - git_config_free(cfg); -} diff --git a/vendor/libgit2/tests/config/rename.c b/vendor/libgit2/tests/config/rename.c deleted file mode 100644 index a4614158a..000000000 --- a/vendor/libgit2/tests/config/rename.c +++ /dev/null @@ -1,89 +0,0 @@ -#include "clar_libgit2.h" -#include "config.h" - -static git_repository *g_repo = NULL; -static git_config *g_config = NULL; - -void test_config_rename__initialize(void) -{ - g_repo = cl_git_sandbox_init("testrepo.git"); - cl_git_pass(git_repository_config(&g_config, g_repo)); -} - -void test_config_rename__cleanup(void) -{ - git_config_free(g_config); - g_config = NULL; - - cl_git_sandbox_cleanup(); - g_repo = NULL; -} - -void test_config_rename__can_rename(void) -{ - git_config_entry *ce; - - cl_git_pass(git_config_get_entry( - &ce, g_config, "branch.track-local.remote")); - cl_assert_equal_s(".", ce->value); - git_config_entry_free(ce); - - cl_git_fail(git_config_get_entry( - &ce, g_config, "branch.local-track.remote")); - - cl_git_pass(git_config_rename_section( - g_repo, "branch.track-local", "branch.local-track")); - - cl_git_pass(git_config_get_entry( - &ce, g_config, "branch.local-track.remote")); - cl_assert_equal_s(".", ce->value); - git_config_entry_free(ce); - - cl_git_fail(git_config_get_entry( - &ce, g_config, "branch.track-local.remote")); -} - -void test_config_rename__prevent_overwrite(void) -{ - git_config_entry *ce; - - cl_git_pass(git_config_set_string( - g_config, "branch.local-track.remote", "yellow")); - - cl_git_pass(git_config_get_entry( - &ce, g_config, "branch.local-track.remote")); - cl_assert_equal_s("yellow", ce->value); - git_config_entry_free(ce); - - cl_git_pass(git_config_rename_section( - g_repo, "branch.track-local", "branch.local-track")); - - cl_git_pass(git_config_get_entry( - &ce, g_config, "branch.local-track.remote")); - cl_assert_equal_s(".", ce->value); - git_config_entry_free(ce); - - /* so, we don't currently prevent overwrite... */ - /* { - const git_error *err; - cl_assert((err = giterr_last()) != NULL); - cl_assert(err->message != NULL); - } */ -} - -static void assert_invalid_config_section_name( - git_repository *repo, const char *name) -{ - cl_git_fail_with( - git_config_rename_section(repo, "branch.remoteless", name), - GIT_EINVALIDSPEC); -} - -void test_config_rename__require_a_valid_new_name(void) -{ - assert_invalid_config_section_name(g_repo, ""); - assert_invalid_config_section_name(g_repo, "bra\nch"); - assert_invalid_config_section_name(g_repo, "branc#"); - assert_invalid_config_section_name(g_repo, "bra\nch.duh"); - assert_invalid_config_section_name(g_repo, "branc#.duh"); -} diff --git a/vendor/libgit2/tests/config/snapshot.c b/vendor/libgit2/tests/config/snapshot.c deleted file mode 100644 index 3ea07c118..000000000 --- a/vendor/libgit2/tests/config/snapshot.c +++ /dev/null @@ -1,78 +0,0 @@ -#include "clar_libgit2.h" - -void test_config_snapshot__create_snapshot(void) -{ - int32_t tmp; - git_config *cfg, *snapshot, *new_snapshot; - const char *filename = "config-ext-change"; - - cl_git_mkfile(filename, "[old]\nvalue = 5\n"); - - cl_git_pass(git_config_open_ondisk(&cfg, filename)); - - cl_git_pass(git_config_get_int32(&tmp, cfg, "old.value")); - cl_assert_equal_i(5, tmp); - - cl_git_pass(git_config_snapshot(&snapshot, cfg)); - - /* Change the value on the file itself (simulate external process) */ - cl_git_mkfile(filename, "[old]\nvalue = 56\n"); - - cl_git_pass(git_config_get_int32(&tmp, cfg, "old.value")); - cl_assert_equal_i(56, tmp); - - cl_git_pass(git_config_get_int32(&tmp, snapshot, "old.value")); - cl_assert_equal_i(5, tmp); - - /* Change the value on the file itself (simulate external process) */ - cl_git_mkfile(filename, "[old]\nvalue = 999\n"); - - cl_git_pass(git_config_snapshot(&new_snapshot, cfg)); - - /* New snapshot should see new value */ - cl_git_pass(git_config_get_int32(&tmp, new_snapshot, "old.value")); - cl_assert_equal_i(999, tmp); - - /* Old snapshot should still have the old value */ - cl_git_pass(git_config_get_int32(&tmp, snapshot, "old.value")); - cl_assert_equal_i(5, tmp); - - git_config_free(new_snapshot); - git_config_free(snapshot); - git_config_free(cfg); -} - -static int count_me(const git_config_entry *entry, void *payload) -{ - int *n = (int *) payload; - - GIT_UNUSED(entry); - - (*n)++; - - return 0; -} - -void test_config_snapshot__multivar(void) -{ - int count = 0; - git_config *cfg, *snapshot; - const char *filename = "config-file"; - - cl_git_mkfile(filename, "[old]\nvalue = 5\nvalue = 6\n"); - - cl_git_pass(git_config_open_ondisk(&cfg, filename)); - cl_git_pass(git_config_get_multivar_foreach(cfg, "old.value", NULL, count_me, &count)); - - cl_assert_equal_i(2, count); - - cl_git_pass(git_config_snapshot(&snapshot, cfg)); - git_config_free(cfg); - - count = 0; - cl_git_pass(git_config_get_multivar_foreach(snapshot, "old.value", NULL, count_me, &count)); - - cl_assert_equal_i(2, count); - - git_config_free(snapshot); -} diff --git a/vendor/libgit2/tests/config/stress.c b/vendor/libgit2/tests/config/stress.c deleted file mode 100644 index a6b665590..000000000 --- a/vendor/libgit2/tests/config/stress.c +++ /dev/null @@ -1,132 +0,0 @@ -#include "clar_libgit2.h" - -#include "filebuf.h" -#include "fileops.h" -#include "posix.h" - -#define TEST_CONFIG "git-test-config" - -static git_buf buf = GIT_BUF_INIT; - -void test_config_stress__initialize(void) -{ - git_filebuf file = GIT_FILEBUF_INIT; - - cl_git_pass(git_filebuf_open(&file, TEST_CONFIG, 0, 0666)); - - git_filebuf_printf(&file, "[color]\n\tui = auto\n"); - git_filebuf_printf(&file, "[core]\n\teditor = \n"); - - cl_git_pass(git_filebuf_commit(&file)); -} - -void test_config_stress__cleanup(void) -{ - git_buf_free(&buf); - p_unlink(TEST_CONFIG); -} - -void test_config_stress__dont_break_on_invalid_input(void) -{ - git_config *config; - - cl_assert(git_path_exists(TEST_CONFIG)); - cl_git_pass(git_config_open_ondisk(&config, TEST_CONFIG)); - - cl_git_pass(git_config_get_string_buf(&buf, config, "color.ui")); - cl_git_pass(git_config_get_string_buf(&buf, config, "core.editor")); - - git_config_free(config); -} - -void assert_config_value(git_config *config, const char *key, const char *value) -{ - git_buf_clear(&buf); - cl_git_pass(git_config_get_string_buf(&buf, config, key)); - cl_assert_equal_s(value, git_buf_cstr(&buf)); -} - -void test_config_stress__comments(void) -{ - git_config *config; - - cl_git_pass(git_config_open_ondisk(&config, cl_fixture("config/config12"))); - - assert_config_value(config, "some.section.test2", "hello"); - assert_config_value(config, "some.section.test3", "welcome"); - assert_config_value(config, "some.section.other", "hello! \" ; ; ; "); - assert_config_value(config, "some.section.other2", "cool! \" # # # "); - assert_config_value(config, "some.section.multi", "hi, this is a ; multiline comment # with ;\n special chars and other stuff !@#"); - assert_config_value(config, "some.section.multi2", "good, this is a ; multiline comment # with ;\n special chars and other stuff !@#"); - assert_config_value(config, "some.section.back", "this is \ba phrase"); - - git_config_free(config); -} - -void test_config_stress__escape_subsection_names(void) -{ - git_config *config; - - cl_assert(git_path_exists("git-test-config")); - cl_git_pass(git_config_open_ondisk(&config, TEST_CONFIG)); - - cl_git_pass(git_config_set_string(config, "some.sec\\tion.other", "foo")); - git_config_free(config); - - cl_git_pass(git_config_open_ondisk(&config, TEST_CONFIG)); - - assert_config_value(config, "some.sec\\tion.other", "foo"); - - git_config_free(config); -} - -void test_config_stress__trailing_backslash(void) -{ - git_config *config; - const char *path = "C:\\iam\\some\\windows\\path\\"; - - cl_assert(git_path_exists("git-test-config")); - cl_git_pass(git_config_open_ondisk(&config, TEST_CONFIG)); - cl_git_pass(git_config_set_string(config, "windows.path", path)); - git_config_free(config); - - cl_git_pass(git_config_open_ondisk(&config, TEST_CONFIG)); - assert_config_value(config, "windows.path", path); - - git_config_free(config); -} - -void test_config_stress__complex(void) -{ - git_config *config; - const char *path = "./config-immediate-multiline"; - - cl_git_mkfile(path, "[imm]\n multi = \"\\\nfoo\""); - cl_git_pass(git_config_open_ondisk(&config, path)); - assert_config_value(config, "imm.multi", "foo"); - - git_config_free(config); -} - -void test_config_stress__quick_write(void) -{ - git_config *config_w, *config_r; - const char *path = "./config-quick-write"; - const char *key = "quick.write"; - int32_t i; - - /* Create an external writer for one instance with the other one */ - cl_git_pass(git_config_open_ondisk(&config_w, path)); - cl_git_pass(git_config_open_ondisk(&config_r, path)); - - /* Write and read in the same second (repeat to increase the chance of it happening) */ - for (i = 0; i < 10; i++) { - int32_t val; - cl_git_pass(git_config_set_int32(config_w, key, i)); - cl_git_pass(git_config_get_int32(&val, config_r, key)); - cl_assert_equal_i(i, val); - } - - git_config_free(config_r); - git_config_free(config_w); -} diff --git a/vendor/libgit2/tests/config/validkeyname.c b/vendor/libgit2/tests/config/validkeyname.c deleted file mode 100644 index 4b36509af..000000000 --- a/vendor/libgit2/tests/config/validkeyname.c +++ /dev/null @@ -1,49 +0,0 @@ -#include "clar_libgit2.h" - -#include "config.h" - -static git_config *cfg; - -void test_config_validkeyname__initialize(void) -{ - cl_fixture_sandbox("config/config10"); - - cl_git_pass(git_config_open_ondisk(&cfg, "config10")); -} - -void test_config_validkeyname__cleanup(void) -{ - git_config_free(cfg); - cfg = NULL; - - cl_fixture_cleanup("config10"); -} - -static void assert_invalid_config_key_name(const char *name) -{ - git_buf buf = GIT_BUF_INIT; - - cl_git_fail_with(git_config_get_string_buf(&buf, cfg, name), - GIT_EINVALIDSPEC); - cl_git_fail_with(git_config_set_string(cfg, name, "42"), - GIT_EINVALIDSPEC); - cl_git_fail_with(git_config_delete_entry(cfg, name), - GIT_EINVALIDSPEC); - cl_git_fail_with(git_config_get_multivar_foreach(cfg, name, "*", NULL, NULL), - GIT_EINVALIDSPEC); - cl_git_fail_with(git_config_set_multivar(cfg, name, "*", "42"), - GIT_EINVALIDSPEC); -} - -void test_config_validkeyname__accessing_requires_a_valid_name(void) -{ - assert_invalid_config_key_name(""); - assert_invalid_config_key_name("."); - assert_invalid_config_key_name(".."); - assert_invalid_config_key_name("core."); - assert_invalid_config_key_name("d#ff.dirstat.lines"); - assert_invalid_config_key_name("diff.dirstat.lines#"); - assert_invalid_config_key_name("dif\nf.dirstat.lines"); - assert_invalid_config_key_name("dif.dir\nstat.lines"); - assert_invalid_config_key_name("dif.dirstat.li\nes"); -} diff --git a/vendor/libgit2/tests/config/write.c b/vendor/libgit2/tests/config/write.c deleted file mode 100644 index 56ef2e9fb..000000000 --- a/vendor/libgit2/tests/config/write.c +++ /dev/null @@ -1,724 +0,0 @@ -#include "clar_libgit2.h" -#include "buffer.h" -#include "fileops.h" -#include "git2/sys/config.h" -#include "config_file.h" -#include "config.h" - -void test_config_write__initialize(void) -{ - cl_fixture_sandbox("config/config9"); - cl_fixture_sandbox("config/config15"); - cl_fixture_sandbox("config/config17"); -} - -void test_config_write__cleanup(void) -{ - cl_fixture_cleanup("config9"); - cl_fixture_cleanup("config15"); - cl_fixture_cleanup("config17"); -} - -void test_config_write__replace_value(void) -{ - git_config *cfg; - int i; - int64_t l, expected = +9223372036854775803; - - /* By freeing the config, we make sure we flush the values */ - cl_git_pass(git_config_open_ondisk(&cfg, "config9")); - cl_git_pass(git_config_set_int32(cfg, "core.dummy", 5)); - git_config_free(cfg); - - cl_git_pass(git_config_open_ondisk(&cfg, "config9")); - cl_git_pass(git_config_get_int32(&i, cfg, "core.dummy")); - cl_assert(i == 5); - git_config_free(cfg); - - cl_git_pass(git_config_open_ondisk(&cfg, "config9")); - cl_git_pass(git_config_set_int32(cfg, "core.dummy", 1)); - git_config_free(cfg); - - cl_git_pass(git_config_open_ondisk(&cfg, "config9")); - cl_git_pass(git_config_set_int64(cfg, "core.verylong", expected)); - git_config_free(cfg); - - cl_git_pass(git_config_open_ondisk(&cfg, "config9")); - cl_git_pass(git_config_get_int64(&l, cfg, "core.verylong")); - cl_assert(l == expected); - git_config_free(cfg); - - cl_git_pass(git_config_open_ondisk(&cfg, "config9")); - cl_must_fail(git_config_get_int32(&i, cfg, "core.verylong")); - git_config_free(cfg); - - cl_git_pass(git_config_open_ondisk(&cfg, "config9")); - cl_git_pass(git_config_set_int64(cfg, "core.verylong", 1)); - git_config_free(cfg); -} - -void test_config_write__delete_value(void) -{ - git_config *cfg; - int32_t i; - - cl_git_pass(git_config_open_ondisk(&cfg, "config9")); - cl_git_pass(git_config_set_int32(cfg, "core.dummy", 5)); - git_config_free(cfg); - - cl_git_pass(git_config_open_ondisk(&cfg, "config9")); - cl_git_pass(git_config_delete_entry(cfg, "core.dummy")); - git_config_free(cfg); - - cl_git_pass(git_config_open_ondisk(&cfg, "config9")); - cl_assert(git_config_get_int32(&i, cfg, "core.dummy") == GIT_ENOTFOUND); - cl_git_pass(git_config_set_int32(cfg, "core.dummy", 1)); - git_config_free(cfg); -} - -/* - * At the beginning of the test: - * - config9 has: core.dummy2=42 - * - config15 has: core.dummy2=7 - */ -void test_config_write__delete_value_at_specific_level(void) -{ - git_config *cfg, *cfg_specific; - int32_t i; - - cl_git_pass(git_config_open_ondisk(&cfg, "config15")); - cl_git_pass(git_config_get_int32(&i, cfg, "core.dummy2")); - cl_assert(i == 7); - git_config_free(cfg); - - cl_git_pass(git_config_new(&cfg)); - cl_git_pass(git_config_add_file_ondisk(cfg, "config9", - GIT_CONFIG_LEVEL_LOCAL, 0)); - cl_git_pass(git_config_add_file_ondisk(cfg, "config15", - GIT_CONFIG_LEVEL_GLOBAL, 0)); - - cl_git_pass(git_config_open_level(&cfg_specific, cfg, GIT_CONFIG_LEVEL_GLOBAL)); - - cl_git_pass(git_config_delete_entry(cfg_specific, "core.dummy2")); - git_config_free(cfg); - - cl_git_pass(git_config_open_ondisk(&cfg, "config15")); - cl_assert(git_config_get_int32(&i, cfg, "core.dummy2") == GIT_ENOTFOUND); - cl_git_pass(git_config_set_int32(cfg, "core.dummy2", 7)); - - git_config_free(cfg_specific); - git_config_free(cfg); -} - -/* - * This test exposes a bug where duplicate empty section headers could prevent - * deletion of config entries. - */ -void test_config_write__delete_value_with_duplicate_header(void) -{ - const char *file_name = "config-duplicate-header"; - const char *entry_name = "remote.origin.url"; - git_config *cfg; - git_config_entry *entry; - - /* This config can occur after removing and re-adding the origin remote */ - const char *file_content = - "[remote \"origin\"]\n" \ - "[branch \"master\"]\n" \ - " remote = \"origin\"\n" \ - "[remote \"origin\"]\n" \ - " url = \"foo\"\n"; - - /* Write the test config and make sure the expected entry exists */ - cl_git_mkfile(file_name, file_content); - cl_git_pass(git_config_open_ondisk(&cfg, file_name)); - cl_git_pass(git_config_get_entry(&entry, cfg, entry_name)); - - /* Delete that entry */ - cl_git_pass(git_config_delete_entry(cfg, entry_name)); - - /* Reopen the file and make sure the entry no longer exists */ - git_config_entry_free(entry); - git_config_free(cfg); - cl_git_pass(git_config_open_ondisk(&cfg, file_name)); - cl_git_fail(git_config_get_entry(&entry, cfg, entry_name)); - - /* Cleanup */ - git_config_entry_free(entry); - git_config_free(cfg); -} - -/* - * This test exposes a bug where duplicate section headers could cause - * config_write to add a new entry when one already exists. - */ -void test_config_write__add_value_with_duplicate_header(void) -{ - const char *file_name = "config-duplicate-insert"; - const char *entry_name = "foo.c"; - const char *old_val = "old"; - const char *new_val = "new"; - const char *str; - git_config *cfg, *snapshot; - - /* c = old should be replaced by c = new. - * The bug causes c = new to be inserted under the first 'foo' header. - */ - const char *file_content = - "[foo]\n" \ - " a = b\n" \ - "[other]\n" \ - " a = b\n" \ - "[foo]\n" \ - " c = old\n"; - - /* Write the test config */ - cl_git_mkfile(file_name, file_content); - cl_git_pass(git_config_open_ondisk(&cfg, file_name)); - - /* make sure the expected entry (foo.c) exists */ - cl_git_pass(git_config_snapshot(&snapshot, cfg)); - cl_git_pass(git_config_get_string(&str, snapshot, entry_name)); - cl_assert_equal_s(old_val, str); - git_config_free(snapshot); - - /* Try setting foo.c to something else */ - cl_git_pass(git_config_set_string(cfg, entry_name, new_val)); - git_config_free(cfg); - - /* Reopen the file and make sure the new value was set */ - cl_git_pass(git_config_open_ondisk(&cfg, file_name)); - cl_git_pass(git_config_snapshot(&snapshot, cfg)); - cl_git_pass(git_config_get_string(&str, snapshot, entry_name)); - cl_assert_equal_s(new_val, str); - - /* Cleanup */ - git_config_free(snapshot); - git_config_free(cfg); -} - -void test_config_write__overwrite_value_with_duplicate_header(void) -{ - const char *file_name = "config-duplicate-header"; - const char *entry_name = "remote.origin.url"; - git_config *cfg; - git_config_entry *entry; - - /* This config can occur after removing and re-adding the origin remote */ - const char *file_content = - "[remote \"origin\"]\n" \ - "[branch \"master\"]\n" \ - " remote = \"origin\"\n" \ - "[remote \"origin\"]\n" \ - " url = \"foo\"\n"; - - /* Write the test config and make sure the expected entry exists */ - cl_git_mkfile(file_name, file_content); - cl_git_pass(git_config_open_ondisk(&cfg, file_name)); - cl_git_pass(git_config_get_entry(&entry, cfg, entry_name)); - - /* Update that entry */ - cl_git_pass(git_config_set_string(cfg, entry_name, "newurl")); - - /* Reopen the file and make sure the entry was updated */ - git_config_entry_free(entry); - git_config_free(cfg); - cl_git_pass(git_config_open_ondisk(&cfg, file_name)); - cl_git_pass(git_config_get_entry(&entry, cfg, entry_name)); - - cl_assert_equal_s("newurl", entry->value); - - /* Cleanup */ - git_config_entry_free(entry); - git_config_free(cfg); -} - -static int multivar_cb(const git_config_entry *entry, void *data) -{ - int *n = (int *)data; - - cl_assert_equal_s(entry->value, "newurl"); - - (*n)++; - - return 0; -} - -void test_config_write__overwrite_multivar_within_duplicate_header(void) -{ - const char *file_name = "config-duplicate-header"; - const char *entry_name = "remote.origin.url"; - git_config *cfg; - git_config_entry *entry; - int n = 0; - - /* This config can occur after removing and re-adding the origin remote */ - const char *file_content = - "[remote \"origin\"]\n" \ - " url = \"bar\"\n" \ - "[branch \"master\"]\n" \ - " remote = \"origin\"\n" \ - "[remote \"origin\"]\n" \ - " url = \"foo\"\n"; - - /* Write the test config and make sure the expected entry exists */ - cl_git_mkfile(file_name, file_content); - cl_git_pass(git_config_open_ondisk(&cfg, file_name)); - cl_git_pass(git_config_get_entry(&entry, cfg, entry_name)); - - /* Update that entry */ - cl_git_pass(git_config_set_multivar(cfg, entry_name, ".*", "newurl")); - git_config_entry_free(entry); - git_config_free(cfg); - - /* Reopen the file and make sure the entry was updated */ - cl_git_pass(git_config_open_ondisk(&cfg, file_name)); - cl_git_pass(git_config_get_multivar_foreach(cfg, entry_name, NULL, multivar_cb, &n)); - cl_assert_equal_i(2, n); - - /* Cleanup */ - git_config_free(cfg); -} - -void test_config_write__write_subsection(void) -{ - git_config *cfg; - git_buf buf = GIT_BUF_INIT; - - cl_git_pass(git_config_open_ondisk(&cfg, "config9")); - cl_git_pass(git_config_set_string(cfg, "my.own.var", "works")); - git_config_free(cfg); - - cl_git_pass(git_config_open_ondisk(&cfg, "config9")); - cl_git_pass(git_config_get_string_buf(&buf, cfg, "my.own.var")); - cl_assert_equal_s("works", git_buf_cstr(&buf)); - - git_buf_free(&buf); - git_config_free(cfg); -} - -void test_config_write__delete_inexistent(void) -{ - git_config *cfg; - - cl_git_pass(git_config_open_ondisk(&cfg, "config9")); - cl_assert(git_config_delete_entry(cfg, "core.imaginary") == GIT_ENOTFOUND); - git_config_free(cfg); -} - -void test_config_write__value_containing_quotes(void) -{ - git_config *cfg; - git_buf buf = GIT_BUF_INIT; - - cl_git_pass(git_config_open_ondisk(&cfg, "config9")); - cl_git_pass(git_config_set_string(cfg, "core.somevar", "this \"has\" quotes")); - cl_git_pass(git_config_get_string_buf(&buf, cfg, "core.somevar")); - cl_assert_equal_s("this \"has\" quotes", git_buf_cstr(&buf)); - git_buf_clear(&buf); - git_config_free(cfg); - - cl_git_pass(git_config_open_ondisk(&cfg, "config9")); - cl_git_pass(git_config_get_string_buf(&buf, cfg, "core.somevar")); - cl_assert_equal_s("this \"has\" quotes", git_buf_cstr(&buf)); - git_buf_clear(&buf); - git_config_free(cfg); - - /* The code path for values that already exist is different, check that one as well */ - cl_git_pass(git_config_open_ondisk(&cfg, "config9")); - cl_git_pass(git_config_set_string(cfg, "core.somevar", "this also \"has\" quotes")); - cl_git_pass(git_config_get_string_buf(&buf, cfg, "core.somevar")); - cl_assert_equal_s("this also \"has\" quotes", git_buf_cstr(&buf)); - git_buf_clear(&buf); - git_config_free(cfg); - - cl_git_pass(git_config_open_ondisk(&cfg, "config9")); - cl_git_pass(git_config_get_string_buf(&buf, cfg, "core.somevar")); - cl_assert_equal_s("this also \"has\" quotes", git_buf_cstr(&buf)); - git_buf_free(&buf); - git_config_free(cfg); -} - -void test_config_write__escape_value(void) -{ - git_config *cfg; - git_buf buf = GIT_BUF_INIT; - - cl_git_pass(git_config_open_ondisk(&cfg, "config9")); - cl_git_pass(git_config_set_string(cfg, "core.somevar", "this \"has\" quotes and \t")); - cl_git_pass(git_config_get_string_buf(&buf, cfg, "core.somevar")); - cl_assert_equal_s("this \"has\" quotes and \t", git_buf_cstr(&buf)); - git_buf_clear(&buf); - git_config_free(cfg); - - cl_git_pass(git_config_open_ondisk(&cfg, "config9")); - cl_git_pass(git_config_get_string_buf(&buf, cfg, "core.somevar")); - cl_assert_equal_s("this \"has\" quotes and \t", git_buf_cstr(&buf)); - git_buf_free(&buf); - git_config_free(cfg); -} - -void test_config_write__add_value_at_specific_level(void) -{ - git_config *cfg, *cfg_specific; - int i; - int64_t l, expected = +9223372036854775803; - git_buf buf = GIT_BUF_INIT; - - // open config15 as global level config file - cl_git_pass(git_config_new(&cfg)); - cl_git_pass(git_config_add_file_ondisk(cfg, "config9", - GIT_CONFIG_LEVEL_LOCAL, 0)); - cl_git_pass(git_config_add_file_ondisk(cfg, "config15", - GIT_CONFIG_LEVEL_GLOBAL, 0)); - - cl_git_pass(git_config_open_level(&cfg_specific, cfg, GIT_CONFIG_LEVEL_GLOBAL)); - - cl_git_pass(git_config_set_int32(cfg_specific, "core.int32global", 28)); - cl_git_pass(git_config_set_int64(cfg_specific, "core.int64global", expected)); - cl_git_pass(git_config_set_bool(cfg_specific, "core.boolglobal", true)); - cl_git_pass(git_config_set_string(cfg_specific, "core.stringglobal", "I'm a global config value!")); - git_config_free(cfg_specific); - git_config_free(cfg); - - // open config15 as local level config file - cl_git_pass(git_config_open_ondisk(&cfg, "config15")); - - cl_git_pass(git_config_get_int32(&i, cfg, "core.int32global")); - cl_assert_equal_i(28, i); - cl_git_pass(git_config_get_int64(&l, cfg, "core.int64global")); - cl_assert(l == expected); - cl_git_pass(git_config_get_bool(&i, cfg, "core.boolglobal")); - cl_assert_equal_b(true, i); - cl_git_pass(git_config_get_string_buf(&buf, cfg, "core.stringglobal")); - cl_assert_equal_s("I'm a global config value!", git_buf_cstr(&buf)); - - git_buf_free(&buf); - git_config_free(cfg); -} - -void test_config_write__add_value_at_file_with_no_clrf_at_the_end(void) -{ - git_config *cfg; - int i; - - cl_git_pass(git_config_open_ondisk(&cfg, "config17")); - cl_git_pass(git_config_set_int32(cfg, "core.newline", 7)); - git_config_free(cfg); - - cl_git_pass(git_config_open_ondisk(&cfg, "config17")); - cl_git_pass(git_config_get_int32(&i, cfg, "core.newline")); - cl_assert_equal_i(7, i); - - git_config_free(cfg); -} - -void test_config_write__add_section_at_file_with_no_clrf_at_the_end(void) -{ - git_config *cfg; - int i; - - cl_git_pass(git_config_open_ondisk(&cfg, "config17")); - cl_git_pass(git_config_set_int32(cfg, "diff.context", 10)); - git_config_free(cfg); - - cl_git_pass(git_config_open_ondisk(&cfg, "config17")); - cl_git_pass(git_config_get_int32(&i, cfg, "diff.context")); - cl_assert_equal_i(10, i); - - git_config_free(cfg); -} - -void test_config_write__add_value_which_needs_quotes(void) -{ - git_config *cfg, *base; - const char* str1; - const char* str2; - const char* str3; - const char* str4; - const char* str5; - - cl_git_pass(git_config_open_ondisk(&cfg, "config17")); - cl_git_pass(git_config_set_string(cfg, "core.startwithspace", " Something")); - cl_git_pass(git_config_set_string(cfg, "core.endwithspace", "Something ")); - cl_git_pass(git_config_set_string(cfg, "core.containscommentchar1", "some#thing")); - cl_git_pass(git_config_set_string(cfg, "core.containscommentchar2", "some;thing")); - cl_git_pass(git_config_set_string(cfg, "core.startwhithsapceandcontainsdoublequote", " some\"thing")); - git_config_free(cfg); - - cl_git_pass(git_config_open_ondisk(&base, "config17")); - cl_git_pass(git_config_snapshot(&cfg, base)); - cl_git_pass(git_config_get_string(&str1, cfg, "core.startwithspace")); - cl_assert_equal_s(" Something", str1); - cl_git_pass(git_config_get_string(&str2, cfg, "core.endwithspace")); - cl_assert_equal_s("Something ", str2); - cl_git_pass(git_config_get_string(&str3, cfg, "core.containscommentchar1")); - cl_assert_equal_s("some#thing", str3); - cl_git_pass(git_config_get_string(&str4, cfg, "core.containscommentchar2")); - cl_assert_equal_s("some;thing", str4); - cl_git_pass(git_config_get_string(&str5, cfg, "core.startwhithsapceandcontainsdoublequote")); - cl_assert_equal_s(" some\"thing", str5); - git_config_free(cfg); - git_config_free(base); -} - -void test_config_write__can_set_a_value_to_NULL(void) -{ - git_repository *repository; - git_config *config; - - repository = cl_git_sandbox_init("testrepo.git"); - - cl_git_pass(git_repository_config(&config, repository)); - cl_git_fail(git_config_set_string(config, "a.b.c", NULL)); - git_config_free(config); - - cl_git_sandbox_cleanup(); -} - -void test_config_write__can_set_an_empty_value(void) -{ - git_repository *repository; - git_config *config; - git_buf buf = {0}; - - repository = cl_git_sandbox_init("testrepo.git"); - cl_git_pass(git_repository_config(&config, repository)); - - cl_git_pass(git_config_set_string(config, "core.somevar", "")); - cl_git_pass(git_config_get_string_buf(&buf, config, "core.somevar")); - cl_assert_equal_s("", buf.ptr); - - git_buf_free(&buf); - git_config_free(config); - cl_git_sandbox_cleanup(); -} - -void test_config_write__updating_a_locked_config_file_returns_ELOCKED(void) -{ - git_config *cfg; - - cl_git_pass(git_config_open_ondisk(&cfg, "config9")); - - cl_git_mkfile("config9.lock", "[core]\n"); - - cl_git_fail_with(git_config_set_string(cfg, "core.dump", "boom"), GIT_ELOCKED); - - git_config_free(cfg); -} - -void test_config_write__outside_change(void) -{ - int32_t tmp; - git_config *cfg; - const char *filename = "config-ext-change"; - - cl_git_mkfile(filename, "[old]\nvalue = 5\n"); - - cl_git_pass(git_config_open_ondisk(&cfg, filename)); - - cl_git_pass(git_config_get_int32(&tmp, cfg, "old.value")); - - /* Change the value on the file itself (simulate external process) */ - cl_git_mkfile(filename, "[old]\nvalue = 6\n"); - - cl_git_pass(git_config_set_int32(cfg, "new.value", 7)); - - cl_git_pass(git_config_get_int32(&tmp, cfg, "old.value")); - cl_assert_equal_i(6, tmp); - - git_config_free(cfg); -} - -#define FOO_COMMENT \ - "; another comment!\n" - -#define SECTION_FOO \ - "\n" \ - " \n" \ - " [section \"foo\"] \n" \ - " # here's a comment\n" \ - "\tname = \"value\"\n" \ - " name2 = \"value2\"\n" \ - -#define SECTION_FOO_WITH_COMMENT SECTION_FOO FOO_COMMENT - -#define SECTION_BAR \ - "[section \"bar\"]\t\n" \ - "\t \n" \ - " barname=\"value\"\n" - - -void test_config_write__preserves_whitespace_and_comments(void) -{ - const char *file_name = "config-duplicate-header"; - const char *n; - git_config *cfg; - git_buf newfile = GIT_BUF_INIT; - - /* This config can occur after removing and re-adding the origin remote */ - const char *file_content = SECTION_FOO_WITH_COMMENT SECTION_BAR; - - /* Write the test config and make sure the expected entry exists */ - cl_git_mkfile(file_name, file_content); - cl_git_pass(git_config_open_ondisk(&cfg, file_name)); - cl_git_pass(git_config_set_string(cfg, "section.foo.other", "otherval")); - cl_git_pass(git_config_set_string(cfg, "newsection.newname", "new_value")); - - /* Ensure that we didn't needlessly mangle the config file */ - cl_git_pass(git_futils_readbuffer(&newfile, file_name)); - n = newfile.ptr; - - cl_assert_equal_strn(SECTION_FOO, n, strlen(SECTION_FOO)); - n += strlen(SECTION_FOO); - cl_assert_equal_strn("\tother = otherval\n", n, strlen("\tother = otherval\n")); - n += strlen("\tother = otherval\n"); - cl_assert_equal_strn(FOO_COMMENT, n, strlen(FOO_COMMENT)); - n += strlen(FOO_COMMENT); - - cl_assert_equal_strn(SECTION_BAR, n, strlen(SECTION_BAR)); - n += strlen(SECTION_BAR); - - cl_assert_equal_s("[newsection]\n\tnewname = new_value\n", n); - - git_buf_free(&newfile); - git_config_free(cfg); -} - -void test_config_write__preserves_entry_with_name_only(void) -{ - const char *file_name = "config-empty-value"; - git_config *cfg; - git_buf newfile = GIT_BUF_INIT; - - /* Write the test config and make sure the expected entry exists */ - cl_git_mkfile(file_name, "[section \"foo\"]\n\tname\n"); - cl_git_pass(git_config_open_ondisk(&cfg, file_name)); - cl_git_pass(git_config_set_string(cfg, "newsection.newname", "new_value")); - cl_git_pass(git_config_set_string(cfg, "section.foo.other", "otherval")); - - cl_git_pass(git_futils_readbuffer(&newfile, file_name)); - cl_assert_equal_s("[section \"foo\"]\n\tname\n\tother = otherval\n[newsection]\n\tnewname = new_value\n", newfile.ptr); - - git_buf_free(&newfile); - git_config_free(cfg); -} - -void test_config_write__to_empty_file(void) -{ - git_config *cfg; - const char *filename = "config-file"; - git_buf result = GIT_BUF_INIT; - - cl_git_mkfile(filename, ""); - cl_git_pass(git_config_open_ondisk(&cfg, filename)); - cl_git_pass(git_config_set_string(cfg, "section.name", "value")); - git_config_free(cfg); - - cl_git_pass(git_futils_readbuffer(&result, "config-file")); - cl_assert_equal_s("[section]\n\tname = value\n", result.ptr); - - git_buf_free(&result); -} - -void test_config_write__to_file_with_only_comment(void) -{ - git_config *cfg; - const char *filename = "config-file"; - git_buf result = GIT_BUF_INIT; - - cl_git_mkfile(filename, "\n\n"); - cl_git_pass(git_config_open_ondisk(&cfg, filename)); - cl_git_pass(git_config_set_string(cfg, "section.name", "value")); - git_config_free(cfg); - - cl_git_pass(git_futils_readbuffer(&result, "config-file")); - cl_assert_equal_s("\n\n[section]\n\tname = value\n", result.ptr); - - git_buf_free(&result); -} - -void test_config_write__locking(void) -{ - git_config *cfg, *cfg2; - git_config_entry *entry; - git_transaction *tx; - const char *filename = "locked-file"; - - /* Open the config and lock it */ - cl_git_mkfile(filename, "[section]\n\tname = value\n"); - cl_git_pass(git_config_open_ondisk(&cfg, filename)); - cl_git_pass(git_config_get_entry(&entry, cfg, "section.name")); - cl_assert_equal_s("value", entry->value); - git_config_entry_free(entry); - cl_git_pass(git_config_lock(&tx, cfg)); - - /* Change entries in the locked backend */ - cl_git_pass(git_config_set_string(cfg, "section.name", "other value")); - cl_git_pass(git_config_set_string(cfg, "section2.name3", "more value")); - - /* We can see that the file we read from hasn't changed */ - cl_git_pass(git_config_open_ondisk(&cfg2, filename)); - cl_git_pass(git_config_get_entry(&entry, cfg2, "section.name")); - cl_assert_equal_s("value", entry->value); - git_config_entry_free(entry); - cl_git_fail_with(GIT_ENOTFOUND, git_config_get_entry(&entry, cfg2, "section2.name3")); - git_config_free(cfg2); - - /* And we also get the old view when we read from the locked config */ - cl_git_pass(git_config_get_entry(&entry, cfg, "section.name")); - cl_assert_equal_s("value", entry->value); - git_config_entry_free(entry); - cl_git_fail_with(GIT_ENOTFOUND, git_config_get_entry(&entry, cfg, "section2.name3")); - - cl_git_pass(git_transaction_commit(tx)); - git_transaction_free(tx); - - /* Now that we've unlocked it, we should see both updates */ - cl_git_pass(git_config_get_entry(&entry, cfg, "section.name")); - cl_assert_equal_s("other value", entry->value); - git_config_entry_free(entry); - cl_git_pass(git_config_get_entry(&entry, cfg, "section2.name3")); - cl_assert_equal_s("more value", entry->value); - git_config_entry_free(entry); - - git_config_free(cfg); - - /* We should also see the changes after reopening the config */ - cl_git_pass(git_config_open_ondisk(&cfg, filename)); - cl_git_pass(git_config_get_entry(&entry, cfg, "section.name")); - cl_assert_equal_s("other value", entry->value); - git_config_entry_free(entry); - cl_git_pass(git_config_get_entry(&entry, cfg, "section2.name3")); - cl_assert_equal_s("more value", entry->value); - git_config_entry_free(entry); - - git_config_free(cfg); -} - -void test_config_write__repeated(void) -{ - const char *filename = "config-repeated"; - git_config *cfg; - git_buf result = GIT_BUF_INIT; - const char *expected = "[sample \"prefix\"]\n\ -\tsetting1 = someValue1\n\ -\tsetting2 = someValue2\n\ -\tsetting3 = someValue3\n\ -\tsetting4 = someValue4\n\ -"; - cl_git_pass(git_config_open_ondisk(&cfg, filename)); - cl_git_pass(git_config_set_string(cfg, "sample.prefix.setting1", "someValue1")); - cl_git_pass(git_config_set_string(cfg, "sample.prefix.setting2", "someValue2")); - cl_git_pass(git_config_set_string(cfg, "sample.prefix.setting3", "someValue3")); - cl_git_pass(git_config_set_string(cfg, "sample.prefix.setting4", "someValue4")); - git_config_free(cfg); - - cl_git_pass(git_config_open_ondisk(&cfg, filename)); - - cl_git_pass(git_futils_readbuffer(&result, filename)); - cl_assert_equal_s(expected, result.ptr); - git_buf_free(&result); - - git_config_free(cfg); -} diff --git a/vendor/libgit2/tests/core/array.c b/vendor/libgit2/tests/core/array.c deleted file mode 100644 index 8e626a506..000000000 --- a/vendor/libgit2/tests/core/array.c +++ /dev/null @@ -1,57 +0,0 @@ -#include "clar_libgit2.h" -#include "array.h" - -static int int_lookup(const void *k, const void *a) -{ - const int *one = (const int *)k; - int *two = (int *)a; - - return *one - *two; -} - -#define expect_pos(k, n, ret) \ - key = (k); \ - cl_assert_equal_i((ret), \ - git_array_search(&p, integers, int_lookup, &key)); \ - cl_assert_equal_i((n), p); - -void test_core_array__bsearch2(void) -{ - git_array_t(int) integers = GIT_ARRAY_INIT; - int *i, key; - size_t p; - - i = git_array_alloc(integers); *i = 2; - i = git_array_alloc(integers); *i = 3; - i = git_array_alloc(integers); *i = 5; - i = git_array_alloc(integers); *i = 7; - i = git_array_alloc(integers); *i = 7; - i = git_array_alloc(integers); *i = 8; - i = git_array_alloc(integers); *i = 13; - i = git_array_alloc(integers); *i = 21; - i = git_array_alloc(integers); *i = 25; - i = git_array_alloc(integers); *i = 42; - i = git_array_alloc(integers); *i = 69; - i = git_array_alloc(integers); *i = 121; - i = git_array_alloc(integers); *i = 256; - i = git_array_alloc(integers); *i = 512; - i = git_array_alloc(integers); *i = 513; - i = git_array_alloc(integers); *i = 514; - i = git_array_alloc(integers); *i = 516; - i = git_array_alloc(integers); *i = 516; - i = git_array_alloc(integers); *i = 517; - - /* value to search for, expected position, return code */ - expect_pos(3, 1, GIT_OK); - expect_pos(2, 0, GIT_OK); - expect_pos(1, 0, GIT_ENOTFOUND); - expect_pos(25, 8, GIT_OK); - expect_pos(26, 9, GIT_ENOTFOUND); - expect_pos(42, 9, GIT_OK); - expect_pos(50, 10, GIT_ENOTFOUND); - expect_pos(68, 10, GIT_ENOTFOUND); - expect_pos(256, 12, GIT_OK); - - git_array_clear(integers); -} - diff --git a/vendor/libgit2/tests/core/bitvec.c b/vendor/libgit2/tests/core/bitvec.c deleted file mode 100644 index 48d7b99f0..000000000 --- a/vendor/libgit2/tests/core/bitvec.c +++ /dev/null @@ -1,64 +0,0 @@ -#include "clar_libgit2.h" -#include "bitvec.h" - -#if 0 -static void print_bitvec(git_bitvec *bv) -{ - int b; - - if (!bv->length) { - for (b = 63; b >= 0; --b) - fprintf(stderr, "%d", (bv->u.bits & (1ul << b)) ? 1 : 0); - } else { - for (b = bv->length * 8; b >= 0; --b) - fprintf(stderr, "%d", (bv->u.ptr[b >> 3] & (b & 0x0ff)) ? 1 : 0); - } - fprintf(stderr, "\n"); -} -#endif - -static void set_some_bits(git_bitvec *bv, size_t length) -{ - size_t i; - - for (i = 0; i < length; ++i) { - if (i % 3 == 0 || i % 7 == 0) - git_bitvec_set(bv, i, true); - } -} - -static void check_some_bits(git_bitvec *bv, size_t length) -{ - size_t i; - - for (i = 0; i < length; ++i) - cl_assert_equal_b(i % 3 == 0 || i % 7 == 0, git_bitvec_get(bv, i)); -} - -void test_core_bitvec__0(void) -{ - git_bitvec bv; - - cl_git_pass(git_bitvec_init(&bv, 32)); - set_some_bits(&bv, 16); - check_some_bits(&bv, 16); - git_bitvec_clear(&bv); - set_some_bits(&bv, 32); - check_some_bits(&bv, 32); - git_bitvec_clear(&bv); - set_some_bits(&bv, 64); - check_some_bits(&bv, 64); - git_bitvec_free(&bv); - - cl_git_pass(git_bitvec_init(&bv, 128)); - set_some_bits(&bv, 32); - check_some_bits(&bv, 32); - set_some_bits(&bv, 128); - check_some_bits(&bv, 128); - git_bitvec_free(&bv); - - cl_git_pass(git_bitvec_init(&bv, 4000)); - set_some_bits(&bv, 4000); - check_some_bits(&bv, 4000); - git_bitvec_free(&bv); -} diff --git a/vendor/libgit2/tests/core/buffer.c b/vendor/libgit2/tests/core/buffer.c deleted file mode 100644 index 9872af7f4..000000000 --- a/vendor/libgit2/tests/core/buffer.c +++ /dev/null @@ -1,1168 +0,0 @@ -#include "clar_libgit2.h" -#include "buffer.h" -#include "buf_text.h" -#include "git2/sys/hashsig.h" -#include "fileops.h" - -#define TESTSTR "Have you seen that? Have you seeeen that??" -const char *test_string = TESTSTR; -const char *test_string_x2 = TESTSTR TESTSTR; - -#define TESTSTR_4096 REP1024("1234") -#define TESTSTR_8192 REP1024("12341234") -const char *test_4096 = TESTSTR_4096; -const char *test_8192 = TESTSTR_8192; - -/* test basic data concatenation */ -void test_core_buffer__0(void) -{ - git_buf buf = GIT_BUF_INIT; - - cl_assert(buf.size == 0); - - git_buf_puts(&buf, test_string); - cl_assert(git_buf_oom(&buf) == 0); - cl_assert_equal_s(test_string, git_buf_cstr(&buf)); - - git_buf_puts(&buf, test_string); - cl_assert(git_buf_oom(&buf) == 0); - cl_assert_equal_s(test_string_x2, git_buf_cstr(&buf)); - - git_buf_free(&buf); -} - -/* test git_buf_printf */ -void test_core_buffer__1(void) -{ - git_buf buf = GIT_BUF_INIT; - - git_buf_printf(&buf, "%s %s %d ", "shoop", "da", 23); - cl_assert(git_buf_oom(&buf) == 0); - cl_assert_equal_s("shoop da 23 ", git_buf_cstr(&buf)); - - git_buf_printf(&buf, "%s %d", "woop", 42); - cl_assert(git_buf_oom(&buf) == 0); - cl_assert_equal_s("shoop da 23 woop 42", git_buf_cstr(&buf)); - - git_buf_free(&buf); -} - -/* more thorough test of concatenation options */ -void test_core_buffer__2(void) -{ - git_buf buf = GIT_BUF_INIT; - int i; - char data[128]; - - cl_assert(buf.size == 0); - - /* this must be safe to do */ - git_buf_free(&buf); - cl_assert(buf.size == 0); - cl_assert(buf.asize == 0); - - /* empty buffer should be empty string */ - cl_assert_equal_s("", git_buf_cstr(&buf)); - cl_assert(buf.size == 0); - /* cl_assert(buf.asize == 0); -- should not assume what git_buf does */ - - /* free should set us back to the beginning */ - git_buf_free(&buf); - cl_assert(buf.size == 0); - cl_assert(buf.asize == 0); - - /* add letter */ - git_buf_putc(&buf, '+'); - cl_assert(git_buf_oom(&buf) == 0); - cl_assert_equal_s("+", git_buf_cstr(&buf)); - - /* add letter again */ - git_buf_putc(&buf, '+'); - cl_assert(git_buf_oom(&buf) == 0); - cl_assert_equal_s("++", git_buf_cstr(&buf)); - - /* let's try that a few times */ - for (i = 0; i < 16; ++i) { - git_buf_putc(&buf, '+'); - cl_assert(git_buf_oom(&buf) == 0); - } - cl_assert_equal_s("++++++++++++++++++", git_buf_cstr(&buf)); - - git_buf_free(&buf); - - /* add data */ - git_buf_put(&buf, "xo", 2); - cl_assert(git_buf_oom(&buf) == 0); - cl_assert_equal_s("xo", git_buf_cstr(&buf)); - - /* add letter again */ - git_buf_put(&buf, "xo", 2); - cl_assert(git_buf_oom(&buf) == 0); - cl_assert_equal_s("xoxo", git_buf_cstr(&buf)); - - /* let's try that a few times */ - for (i = 0; i < 16; ++i) { - git_buf_put(&buf, "xo", 2); - cl_assert(git_buf_oom(&buf) == 0); - } - cl_assert_equal_s("xoxoxoxoxoxoxoxoxoxoxoxoxoxoxoxoxoxo", - git_buf_cstr(&buf)); - - git_buf_free(&buf); - - /* set to string */ - git_buf_sets(&buf, test_string); - cl_assert(git_buf_oom(&buf) == 0); - cl_assert_equal_s(test_string, git_buf_cstr(&buf)); - - /* append string */ - git_buf_puts(&buf, test_string); - cl_assert(git_buf_oom(&buf) == 0); - cl_assert_equal_s(test_string_x2, git_buf_cstr(&buf)); - - /* set to string again (should overwrite - not append) */ - git_buf_sets(&buf, test_string); - cl_assert(git_buf_oom(&buf) == 0); - cl_assert_equal_s(test_string, git_buf_cstr(&buf)); - - /* test clear */ - git_buf_clear(&buf); - cl_assert_equal_s("", git_buf_cstr(&buf)); - - git_buf_free(&buf); - - /* test extracting data into buffer */ - git_buf_puts(&buf, REP4("0123456789")); - cl_assert(git_buf_oom(&buf) == 0); - - git_buf_copy_cstr(data, sizeof(data), &buf); - cl_assert_equal_s(REP4("0123456789"), data); - git_buf_copy_cstr(data, 11, &buf); - cl_assert_equal_s("0123456789", data); - git_buf_copy_cstr(data, 3, &buf); - cl_assert_equal_s("01", data); - git_buf_copy_cstr(data, 1, &buf); - cl_assert_equal_s("", data); - - git_buf_copy_cstr(data, sizeof(data), &buf); - cl_assert_equal_s(REP4("0123456789"), data); - - git_buf_sets(&buf, REP256("x")); - git_buf_copy_cstr(data, sizeof(data), &buf); - /* since sizeof(data) == 128, only 127 bytes should be copied */ - cl_assert_equal_s(REP4(REP16("x")) REP16("x") REP16("x") - REP16("x") "xxxxxxxxxxxxxxx", data); - - git_buf_free(&buf); - - git_buf_copy_cstr(data, sizeof(data), &buf); - cl_assert_equal_s("", data); -} - -/* let's do some tests with larger buffers to push our limits */ -void test_core_buffer__3(void) -{ - git_buf buf = GIT_BUF_INIT; - - /* set to string */ - git_buf_set(&buf, test_4096, 4096); - cl_assert(git_buf_oom(&buf) == 0); - cl_assert_equal_s(test_4096, git_buf_cstr(&buf)); - - /* append string */ - git_buf_puts(&buf, test_4096); - cl_assert(git_buf_oom(&buf) == 0); - cl_assert_equal_s(test_8192, git_buf_cstr(&buf)); - - /* set to string again (should overwrite - not append) */ - git_buf_set(&buf, test_4096, 4096); - cl_assert(git_buf_oom(&buf) == 0); - cl_assert_equal_s(test_4096, git_buf_cstr(&buf)); - - git_buf_free(&buf); -} - -/* let's try some producer/consumer tests */ -void test_core_buffer__4(void) -{ - git_buf buf = GIT_BUF_INIT; - int i; - - for (i = 0; i < 10; ++i) { - git_buf_puts(&buf, "1234"); /* add 4 */ - cl_assert(git_buf_oom(&buf) == 0); - git_buf_consume(&buf, buf.ptr + 2); /* eat the first two */ - cl_assert(strlen(git_buf_cstr(&buf)) == (size_t)((i + 1) * 2)); - } - /* we have appended 1234 10x and removed the first 20 letters */ - cl_assert_equal_s("12341234123412341234", git_buf_cstr(&buf)); - - git_buf_consume(&buf, NULL); - cl_assert_equal_s("12341234123412341234", git_buf_cstr(&buf)); - - git_buf_consume(&buf, "invalid pointer"); - cl_assert_equal_s("12341234123412341234", git_buf_cstr(&buf)); - - git_buf_consume(&buf, buf.ptr); - cl_assert_equal_s("12341234123412341234", git_buf_cstr(&buf)); - - git_buf_consume(&buf, buf.ptr + 1); - cl_assert_equal_s("2341234123412341234", git_buf_cstr(&buf)); - - git_buf_consume(&buf, buf.ptr + buf.size); - cl_assert_equal_s("", git_buf_cstr(&buf)); - - git_buf_free(&buf); -} - - -static void -check_buf_append( - const char* data_a, - const char* data_b, - const char* expected_data, - size_t expected_size, - size_t expected_asize) -{ - git_buf tgt = GIT_BUF_INIT; - - git_buf_sets(&tgt, data_a); - cl_assert(git_buf_oom(&tgt) == 0); - git_buf_puts(&tgt, data_b); - cl_assert(git_buf_oom(&tgt) == 0); - cl_assert_equal_s(expected_data, git_buf_cstr(&tgt)); - cl_assert(tgt.size == expected_size); - if (expected_asize > 0) - cl_assert(tgt.asize == expected_asize); - - git_buf_free(&tgt); -} - -static void -check_buf_append_abc( - const char* buf_a, - const char* buf_b, - const char* buf_c, - const char* expected_ab, - const char* expected_abc, - const char* expected_abca, - const char* expected_abcab, - const char* expected_abcabc) -{ - git_buf buf = GIT_BUF_INIT; - - git_buf_sets(&buf, buf_a); - cl_assert(git_buf_oom(&buf) == 0); - cl_assert_equal_s(buf_a, git_buf_cstr(&buf)); - - git_buf_puts(&buf, buf_b); - cl_assert(git_buf_oom(&buf) == 0); - cl_assert_equal_s(expected_ab, git_buf_cstr(&buf)); - - git_buf_puts(&buf, buf_c); - cl_assert(git_buf_oom(&buf) == 0); - cl_assert_equal_s(expected_abc, git_buf_cstr(&buf)); - - git_buf_puts(&buf, buf_a); - cl_assert(git_buf_oom(&buf) == 0); - cl_assert_equal_s(expected_abca, git_buf_cstr(&buf)); - - git_buf_puts(&buf, buf_b); - cl_assert(git_buf_oom(&buf) == 0); - cl_assert_equal_s(expected_abcab, git_buf_cstr(&buf)); - - git_buf_puts(&buf, buf_c); - cl_assert(git_buf_oom(&buf) == 0); - cl_assert_equal_s(expected_abcabc, git_buf_cstr(&buf)); - - git_buf_free(&buf); -} - -/* more variations on append tests */ -void test_core_buffer__5(void) -{ - check_buf_append("", "", "", 0, 0); - check_buf_append("a", "", "a", 1, 0); - check_buf_append("", "a", "a", 1, 8); - check_buf_append("", "a", "a", 1, 8); - check_buf_append("a", "b", "ab", 2, 8); - check_buf_append("", "abcdefgh", "abcdefgh", 8, 16); - check_buf_append("abcdefgh", "", "abcdefgh", 8, 16); - - /* buffer with starting asize will grow to: - * 1 -> 2, 2 -> 3, 3 -> 5, 4 -> 6, 5 -> 8, 6 -> 9, - * 7 -> 11, 8 -> 12, 9 -> 14, 10 -> 15, 11 -> 17, 12 -> 18, - * 13 -> 20, 14 -> 21, 15 -> 23, 16 -> 24, 17 -> 26, 18 -> 27, - * 19 -> 29, 20 -> 30, 21 -> 32, 22 -> 33, 23 -> 35, 24 -> 36, - * ... - * follow sequence until value > target size, - * then round up to nearest multiple of 8. - */ - - check_buf_append("abcdefgh", "/", "abcdefgh/", 9, 16); - check_buf_append("abcdefgh", "ijklmno", "abcdefghijklmno", 15, 16); - check_buf_append("abcdefgh", "ijklmnop", "abcdefghijklmnop", 16, 24); - check_buf_append("0123456789", "0123456789", - "01234567890123456789", 20, 24); - check_buf_append(REP16("x"), REP16("o"), - REP16("x") REP16("o"), 32, 40); - - check_buf_append(test_4096, "", test_4096, 4096, 4104); - check_buf_append(test_4096, test_4096, test_8192, 8192, 9240); - - /* check sequences of appends */ - check_buf_append_abc("a", "b", "c", - "ab", "abc", "abca", "abcab", "abcabc"); - check_buf_append_abc("a1", "b2", "c3", - "a1b2", "a1b2c3", "a1b2c3a1", - "a1b2c3a1b2", "a1b2c3a1b2c3"); - check_buf_append_abc("a1/", "b2/", "c3/", - "a1/b2/", "a1/b2/c3/", "a1/b2/c3/a1/", - "a1/b2/c3/a1/b2/", "a1/b2/c3/a1/b2/c3/"); -} - -/* test swap */ -void test_core_buffer__6(void) -{ - git_buf a = GIT_BUF_INIT; - git_buf b = GIT_BUF_INIT; - - git_buf_sets(&a, "foo"); - cl_assert(git_buf_oom(&a) == 0); - git_buf_sets(&b, "bar"); - cl_assert(git_buf_oom(&b) == 0); - - cl_assert_equal_s("foo", git_buf_cstr(&a)); - cl_assert_equal_s("bar", git_buf_cstr(&b)); - - git_buf_swap(&a, &b); - - cl_assert_equal_s("bar", git_buf_cstr(&a)); - cl_assert_equal_s("foo", git_buf_cstr(&b)); - - git_buf_free(&a); - git_buf_free(&b); -} - - -/* test detach/attach data */ -void test_core_buffer__7(void) -{ - const char *fun = "This is fun"; - git_buf a = GIT_BUF_INIT; - char *b = NULL; - - git_buf_sets(&a, "foo"); - cl_assert(git_buf_oom(&a) == 0); - cl_assert_equal_s("foo", git_buf_cstr(&a)); - - b = git_buf_detach(&a); - - cl_assert_equal_s("foo", b); - cl_assert_equal_s("", a.ptr); - git__free(b); - - b = git_buf_detach(&a); - - cl_assert_equal_s(NULL, b); - cl_assert_equal_s("", a.ptr); - - git_buf_free(&a); - - b = git__strdup(fun); - git_buf_attach(&a, b, 0); - - cl_assert_equal_s(fun, a.ptr); - cl_assert(a.size == strlen(fun)); - cl_assert(a.asize == strlen(fun) + 1); - - git_buf_free(&a); - - b = git__strdup(fun); - git_buf_attach(&a, b, strlen(fun) + 1); - - cl_assert_equal_s(fun, a.ptr); - cl_assert(a.size == strlen(fun)); - cl_assert(a.asize == strlen(fun) + 1); - - git_buf_free(&a); -} - - -static void -check_joinbuf_2( - const char *a, - const char *b, - const char *expected) -{ - char sep = '/'; - git_buf buf = GIT_BUF_INIT; - - git_buf_join(&buf, sep, a, b); - cl_assert(git_buf_oom(&buf) == 0); - cl_assert_equal_s(expected, git_buf_cstr(&buf)); - git_buf_free(&buf); -} - -static void -check_joinbuf_overlapped( - const char *oldval, - int ofs_a, - const char *b, - const char *expected) -{ - char sep = '/'; - git_buf buf = GIT_BUF_INIT; - - git_buf_sets(&buf, oldval); - git_buf_join(&buf, sep, buf.ptr + ofs_a, b); - cl_assert(git_buf_oom(&buf) == 0); - cl_assert_equal_s(expected, git_buf_cstr(&buf)); - git_buf_free(&buf); -} - -static void -check_joinbuf_n_2( - const char *a, - const char *b, - const char *expected) -{ - char sep = '/'; - git_buf buf = GIT_BUF_INIT; - - git_buf_sets(&buf, a); - cl_assert(git_buf_oom(&buf) == 0); - - git_buf_join_n(&buf, sep, 1, b); - cl_assert(git_buf_oom(&buf) == 0); - cl_assert_equal_s(expected, git_buf_cstr(&buf)); - - git_buf_free(&buf); -} - -static void -check_joinbuf_n_4( - const char *a, - const char *b, - const char *c, - const char *d, - const char *expected) -{ - char sep = ';'; - git_buf buf = GIT_BUF_INIT; - git_buf_join_n(&buf, sep, 4, a, b, c, d); - cl_assert(git_buf_oom(&buf) == 0); - cl_assert_equal_s(expected, git_buf_cstr(&buf)); - git_buf_free(&buf); -} - -/* test join */ -void test_core_buffer__8(void) -{ - git_buf a = GIT_BUF_INIT; - - git_buf_join_n(&a, '/', 1, "foo"); - cl_assert(git_buf_oom(&a) == 0); - cl_assert_equal_s("foo", git_buf_cstr(&a)); - - git_buf_join_n(&a, '/', 1, "bar"); - cl_assert(git_buf_oom(&a) == 0); - cl_assert_equal_s("foo/bar", git_buf_cstr(&a)); - - git_buf_join_n(&a, '/', 1, "baz"); - cl_assert(git_buf_oom(&a) == 0); - cl_assert_equal_s("foo/bar/baz", git_buf_cstr(&a)); - - git_buf_free(&a); - - check_joinbuf_2(NULL, "", ""); - check_joinbuf_2(NULL, "a", "a"); - check_joinbuf_2(NULL, "/a", "/a"); - check_joinbuf_2("", "", ""); - check_joinbuf_2("", "a", "a"); - check_joinbuf_2("", "/a", "/a"); - check_joinbuf_2("a", "", "a/"); - check_joinbuf_2("a", "/", "a/"); - check_joinbuf_2("a", "b", "a/b"); - check_joinbuf_2("/", "a", "/a"); - check_joinbuf_2("/", "", "/"); - check_joinbuf_2("/a", "/b", "/a/b"); - check_joinbuf_2("/a", "/b/", "/a/b/"); - check_joinbuf_2("/a/", "b/", "/a/b/"); - check_joinbuf_2("/a/", "/b/", "/a/b/"); - check_joinbuf_2("/a/", "//b/", "/a/b/"); - check_joinbuf_2("/abcd", "/defg", "/abcd/defg"); - check_joinbuf_2("/abcd", "/defg/", "/abcd/defg/"); - check_joinbuf_2("/abcd/", "defg/", "/abcd/defg/"); - check_joinbuf_2("/abcd/", "/defg/", "/abcd/defg/"); - - check_joinbuf_overlapped("abcd", 0, "efg", "abcd/efg"); - check_joinbuf_overlapped("abcd", 1, "efg", "bcd/efg"); - check_joinbuf_overlapped("abcd", 2, "efg", "cd/efg"); - check_joinbuf_overlapped("abcd", 3, "efg", "d/efg"); - check_joinbuf_overlapped("abcd", 4, "efg", "efg"); - check_joinbuf_overlapped("abc/", 2, "efg", "c/efg"); - check_joinbuf_overlapped("abc/", 3, "efg", "/efg"); - check_joinbuf_overlapped("abc/", 4, "efg", "efg"); - check_joinbuf_overlapped("abcd", 3, "", "d/"); - check_joinbuf_overlapped("abcd", 4, "", ""); - check_joinbuf_overlapped("abc/", 2, "", "c/"); - check_joinbuf_overlapped("abc/", 3, "", "/"); - check_joinbuf_overlapped("abc/", 4, "", ""); - - check_joinbuf_n_2("", "", ""); - check_joinbuf_n_2("", "a", "a"); - check_joinbuf_n_2("", "/a", "/a"); - check_joinbuf_n_2("a", "", "a/"); - check_joinbuf_n_2("a", "/", "a/"); - check_joinbuf_n_2("a", "b", "a/b"); - check_joinbuf_n_2("/", "a", "/a"); - check_joinbuf_n_2("/", "", "/"); - check_joinbuf_n_2("/a", "/b", "/a/b"); - check_joinbuf_n_2("/a", "/b/", "/a/b/"); - check_joinbuf_n_2("/a/", "b/", "/a/b/"); - check_joinbuf_n_2("/a/", "/b/", "/a/b/"); - check_joinbuf_n_2("/abcd", "/defg", "/abcd/defg"); - check_joinbuf_n_2("/abcd", "/defg/", "/abcd/defg/"); - check_joinbuf_n_2("/abcd/", "defg/", "/abcd/defg/"); - check_joinbuf_n_2("/abcd/", "/defg/", "/abcd/defg/"); - - check_joinbuf_n_4("", "", "", "", ""); - check_joinbuf_n_4("", "a", "", "", "a;"); - check_joinbuf_n_4("a", "", "", "", "a;"); - check_joinbuf_n_4("", "", "", "a", "a"); - check_joinbuf_n_4("a", "b", "", ";c;d;", "a;b;c;d;"); - check_joinbuf_n_4("a", "b", "", ";c;d", "a;b;c;d"); - check_joinbuf_n_4("abcd", "efgh", "ijkl", "mnop", "abcd;efgh;ijkl;mnop"); - check_joinbuf_n_4("abcd;", "efgh;", "ijkl;", "mnop;", "abcd;efgh;ijkl;mnop;"); - check_joinbuf_n_4(";abcd;", ";efgh;", ";ijkl;", ";mnop;", ";abcd;efgh;ijkl;mnop;"); -} - -void test_core_buffer__9(void) -{ - git_buf buf = GIT_BUF_INIT; - - /* just some exhaustive tests of various separator placement */ - char *a[] = { "", "-", "a-", "-a", "-a-" }; - char *b[] = { "", "-", "b-", "-b", "-b-" }; - char sep[] = { 0, '-', '/' }; - char *expect_null[] = { "", "-", "a-", "-a", "-a-", - "-", "--", "a--", "-a-", "-a--", - "b-", "-b-", "a-b-", "-ab-", "-a-b-", - "-b", "--b", "a--b", "-a-b", "-a--b", - "-b-", "--b-", "a--b-", "-a-b-", "-a--b-" }; - char *expect_dash[] = { "", "-", "a-", "-a-", "-a-", - "-", "-", "a-", "-a-", "-a-", - "b-", "-b-", "a-b-", "-a-b-", "-a-b-", - "-b", "-b", "a-b", "-a-b", "-a-b", - "-b-", "-b-", "a-b-", "-a-b-", "-a-b-" }; - char *expect_slas[] = { "", "-/", "a-/", "-a/", "-a-/", - "-", "-/-", "a-/-", "-a/-", "-a-/-", - "b-", "-/b-", "a-/b-", "-a/b-", "-a-/b-", - "-b", "-/-b", "a-/-b", "-a/-b", "-a-/-b", - "-b-", "-/-b-", "a-/-b-", "-a/-b-", "-a-/-b-" }; - char **expect_values[] = { expect_null, expect_dash, expect_slas }; - char separator, **expect; - unsigned int s, i, j; - - for (s = 0; s < sizeof(sep) / sizeof(char); ++s) { - separator = sep[s]; - expect = expect_values[s]; - - for (j = 0; j < sizeof(b) / sizeof(char*); ++j) { - for (i = 0; i < sizeof(a) / sizeof(char*); ++i) { - git_buf_join(&buf, separator, a[i], b[j]); - cl_assert_equal_s(*expect, buf.ptr); - expect++; - } - } - } - - git_buf_free(&buf); -} - -void test_core_buffer__10(void) -{ - git_buf a = GIT_BUF_INIT; - - cl_git_pass(git_buf_join_n(&a, '/', 1, "test")); - cl_assert_equal_s(a.ptr, "test"); - cl_git_pass(git_buf_join_n(&a, '/', 1, "string")); - cl_assert_equal_s(a.ptr, "test/string"); - git_buf_clear(&a); - cl_git_pass(git_buf_join_n(&a, '/', 3, "test", "string", "join")); - cl_assert_equal_s(a.ptr, "test/string/join"); - cl_git_pass(git_buf_join_n(&a, '/', 2, a.ptr, "more")); - cl_assert_equal_s(a.ptr, "test/string/join/test/string/join/more"); - - git_buf_free(&a); -} - -void test_core_buffer__join3(void) -{ - git_buf a = GIT_BUF_INIT; - - cl_git_pass(git_buf_join3(&a, '/', "test", "string", "join")); - cl_assert_equal_s("test/string/join", a.ptr); - cl_git_pass(git_buf_join3(&a, '/', "test/", "string", "join")); - cl_assert_equal_s("test/string/join", a.ptr); - cl_git_pass(git_buf_join3(&a, '/', "test/", "/string", "join")); - cl_assert_equal_s("test/string/join", a.ptr); - cl_git_pass(git_buf_join3(&a, '/', "test/", "/string/", "join")); - cl_assert_equal_s("test/string/join", a.ptr); - cl_git_pass(git_buf_join3(&a, '/', "test/", "/string/", "/join")); - cl_assert_equal_s("test/string/join", a.ptr); - - cl_git_pass(git_buf_join3(&a, '/', "", "string", "join")); - cl_assert_equal_s("string/join", a.ptr); - cl_git_pass(git_buf_join3(&a, '/', "", "string/", "join")); - cl_assert_equal_s("string/join", a.ptr); - cl_git_pass(git_buf_join3(&a, '/', "", "string/", "/join")); - cl_assert_equal_s("string/join", a.ptr); - - cl_git_pass(git_buf_join3(&a, '/', "string", "", "join")); - cl_assert_equal_s("string/join", a.ptr); - cl_git_pass(git_buf_join3(&a, '/', "string/", "", "join")); - cl_assert_equal_s("string/join", a.ptr); - cl_git_pass(git_buf_join3(&a, '/', "string/", "", "/join")); - cl_assert_equal_s("string/join", a.ptr); - - git_buf_free(&a); -} - -void test_core_buffer__11(void) -{ - git_buf a = GIT_BUF_INIT; - git_strarray t; - char *t1[] = { "nothing", "in", "common" }; - char *t2[] = { "something", "something else", "some other" }; - char *t3[] = { "something", "some fun", "no fun" }; - char *t4[] = { "happy", "happier", "happiest" }; - char *t5[] = { "happiest", "happier", "happy" }; - char *t6[] = { "no", "nope", "" }; - char *t7[] = { "", "doesn't matter" }; - - t.strings = t1; - t.count = 3; - cl_git_pass(git_buf_text_common_prefix(&a, &t)); - cl_assert_equal_s(a.ptr, ""); - - t.strings = t2; - t.count = 3; - cl_git_pass(git_buf_text_common_prefix(&a, &t)); - cl_assert_equal_s(a.ptr, "some"); - - t.strings = t3; - t.count = 3; - cl_git_pass(git_buf_text_common_prefix(&a, &t)); - cl_assert_equal_s(a.ptr, ""); - - t.strings = t4; - t.count = 3; - cl_git_pass(git_buf_text_common_prefix(&a, &t)); - cl_assert_equal_s(a.ptr, "happ"); - - t.strings = t5; - t.count = 3; - cl_git_pass(git_buf_text_common_prefix(&a, &t)); - cl_assert_equal_s(a.ptr, "happ"); - - t.strings = t6; - t.count = 3; - cl_git_pass(git_buf_text_common_prefix(&a, &t)); - cl_assert_equal_s(a.ptr, ""); - - t.strings = t7; - t.count = 3; - cl_git_pass(git_buf_text_common_prefix(&a, &t)); - cl_assert_equal_s(a.ptr, ""); - - git_buf_free(&a); -} - -void test_core_buffer__rfind_variants(void) -{ - git_buf a = GIT_BUF_INIT; - ssize_t len; - - cl_git_pass(git_buf_sets(&a, "/this/is/it/")); - - len = (ssize_t)git_buf_len(&a); - - cl_assert(git_buf_rfind(&a, '/') == len - 1); - cl_assert(git_buf_rfind_next(&a, '/') == len - 4); - - cl_assert(git_buf_rfind(&a, 'i') == len - 3); - cl_assert(git_buf_rfind_next(&a, 'i') == len - 3); - - cl_assert(git_buf_rfind(&a, 'h') == 2); - cl_assert(git_buf_rfind_next(&a, 'h') == 2); - - cl_assert(git_buf_rfind(&a, 'q') == -1); - cl_assert(git_buf_rfind_next(&a, 'q') == -1); - - git_buf_free(&a); -} - -void test_core_buffer__puts_escaped(void) -{ - git_buf a = GIT_BUF_INIT; - - git_buf_clear(&a); - cl_git_pass(git_buf_text_puts_escaped(&a, "this is a test", "", "")); - cl_assert_equal_s("this is a test", a.ptr); - - git_buf_clear(&a); - cl_git_pass(git_buf_text_puts_escaped(&a, "this is a test", "t", "\\")); - cl_assert_equal_s("\\this is a \\tes\\t", a.ptr); - - git_buf_clear(&a); - cl_git_pass(git_buf_text_puts_escaped(&a, "this is a test", "i ", "__")); - cl_assert_equal_s("th__is__ __is__ a__ test", a.ptr); - - git_buf_clear(&a); - cl_git_pass(git_buf_text_puts_escape_regex(&a, "^match\\s*[A-Z]+.*")); - cl_assert_equal_s("\\^match\\\\s\\*\\[A-Z\\]\\+\\.\\*", a.ptr); - - git_buf_free(&a); -} - -static void assert_unescape(char *expected, char *to_unescape) { - git_buf buf = GIT_BUF_INIT; - - cl_git_pass(git_buf_sets(&buf, to_unescape)); - git_buf_text_unescape(&buf); - cl_assert_equal_s(expected, buf.ptr); - cl_assert_equal_sz(strlen(expected), buf.size); - - git_buf_free(&buf); -} - -void test_core_buffer__unescape(void) -{ - assert_unescape("Escaped\\", "Es\\ca\\ped\\"); - assert_unescape("Es\\caped\\", "Es\\\\ca\\ped\\\\"); - assert_unescape("\\", "\\"); - assert_unescape("\\", "\\\\"); - assert_unescape("", ""); -} - -void test_core_buffer__encode_base64(void) -{ - git_buf buf = GIT_BUF_INIT; - - /* t h i s - * 0x 74 68 69 73 - * 0b 01110100 01101000 01101001 01110011 - * 0b 011101 000110 100001 101001 011100 110000 - * 0x 1d 06 21 29 1c 30 - * d G h p c w - */ - cl_git_pass(git_buf_encode_base64(&buf, "this", 4)); - cl_assert_equal_s("dGhpcw==", buf.ptr); - - git_buf_clear(&buf); - cl_git_pass(git_buf_encode_base64(&buf, "this!", 5)); - cl_assert_equal_s("dGhpcyE=", buf.ptr); - - git_buf_clear(&buf); - cl_git_pass(git_buf_encode_base64(&buf, "this!\n", 6)); - cl_assert_equal_s("dGhpcyEK", buf.ptr); - - git_buf_free(&buf); -} - -void test_core_buffer__decode_base64(void) -{ - git_buf buf = GIT_BUF_INIT; - - cl_git_pass(git_buf_decode_base64(&buf, "dGhpcw==", 8)); - cl_assert_equal_s("this", buf.ptr); - - git_buf_clear(&buf); - cl_git_pass(git_buf_decode_base64(&buf, "dGhpcyE=", 8)); - cl_assert_equal_s("this!", buf.ptr); - - git_buf_clear(&buf); - cl_git_pass(git_buf_decode_base64(&buf, "dGhpcyEK", 8)); - cl_assert_equal_s("this!\n", buf.ptr); - - cl_git_fail(git_buf_decode_base64(&buf, "This is not a valid base64 string!!!", 36)); - cl_assert_equal_s("this!\n", buf.ptr); - - git_buf_free(&buf); -} - -void test_core_buffer__encode_base85(void) -{ - git_buf buf = GIT_BUF_INIT; - - cl_git_pass(git_buf_encode_base85(&buf, "this", 4)); - cl_assert_equal_s("bZBXF", buf.ptr); - git_buf_clear(&buf); - - cl_git_pass(git_buf_encode_base85(&buf, "two rnds", 8)); - cl_assert_equal_s("ba!tca&BaE", buf.ptr); - git_buf_clear(&buf); - - cl_git_pass(git_buf_encode_base85(&buf, "this is base 85 encoded", - strlen("this is base 85 encoded"))); - cl_assert_equal_s("bZBXFAZc?TVqtS-AUHK3Wo~0{WMyOk", buf.ptr); - git_buf_clear(&buf); - - git_buf_free(&buf); -} - -void test_core_buffer__classify_with_utf8(void) -{ - char *data0 = "Simple text\n"; - size_t data0len = 12; - char *data1 = "Is that UTF-8 data I see…\nYep!\n"; - size_t data1len = 31; - char *data2 = "Internal NUL!!!\000\n\nI see you!\n"; - size_t data2len = 29; - char *data3 = "\xef\xbb\xbfThis is UTF-8 with a BOM.\n"; - size_t data3len = 20; - git_buf b; - - b.ptr = data0; b.size = b.asize = data0len; - cl_assert(!git_buf_text_is_binary(&b)); - cl_assert(!git_buf_text_contains_nul(&b)); - - b.ptr = data1; b.size = b.asize = data1len; - cl_assert(!git_buf_text_is_binary(&b)); - cl_assert(!git_buf_text_contains_nul(&b)); - - b.ptr = data2; b.size = b.asize = data2len; - cl_assert(git_buf_text_is_binary(&b)); - cl_assert(git_buf_text_contains_nul(&b)); - - b.ptr = data3; b.size = b.asize = data3len; - cl_assert(!git_buf_text_is_binary(&b)); - cl_assert(!git_buf_text_contains_nul(&b)); -} - -#define SIMILARITY_TEST_DATA_1 \ - "000\n001\n002\n003\n004\n005\n006\n007\n008\n009\n" \ - "010\n011\n012\n013\n014\n015\n016\n017\n018\n019\n" \ - "020\n021\n022\n023\n024\n025\n026\n027\n028\n029\n" \ - "030\n031\n032\n033\n034\n035\n036\n037\n038\n039\n" \ - "040\n041\n042\n043\n044\n045\n046\n047\n048\n049\n" - -void test_core_buffer__similarity_metric(void) -{ - git_hashsig *a, *b; - git_buf buf = GIT_BUF_INIT; - int sim; - - /* in the first case, we compare data to itself and expect 100% match */ - - cl_git_pass(git_buf_sets(&buf, SIMILARITY_TEST_DATA_1)); - cl_git_pass(git_hashsig_create(&a, buf.ptr, buf.size, GIT_HASHSIG_NORMAL)); - cl_git_pass(git_hashsig_create(&b, buf.ptr, buf.size, GIT_HASHSIG_NORMAL)); - - cl_assert_equal_i(100, git_hashsig_compare(a, b)); - - git_hashsig_free(a); - git_hashsig_free(b); - - /* if we change just a single byte, how much does that change magnify? */ - - cl_git_pass(git_buf_sets(&buf, SIMILARITY_TEST_DATA_1)); - cl_git_pass(git_hashsig_create(&a, buf.ptr, buf.size, GIT_HASHSIG_NORMAL)); - cl_git_pass(git_buf_sets(&buf, - "000\n001\n002\n003\n004\n005\n006\n007\n008\n009\n" \ - "010\n011\n012\n013\n014\n015\n016\n017\n018\n019\n" \ - "x020x\n021\n022\n023\n024\n025\n026\n027\n028\n029\n" \ - "030\n031\n032\n033\n034\n035\n036\n037\n038\n039\n" \ - "040\n041\n042\n043\n044\n045\n046\n047\n048\n049\n" - )); - cl_git_pass(git_hashsig_create(&b, buf.ptr, buf.size, GIT_HASHSIG_NORMAL)); - - sim = git_hashsig_compare(a, b); - - cl_assert_in_range(95, sim, 100); /* expect >95% similarity */ - - git_hashsig_free(a); - git_hashsig_free(b); - - /* let's try comparing data to a superset of itself */ - - cl_git_pass(git_buf_sets(&buf, SIMILARITY_TEST_DATA_1)); - cl_git_pass(git_hashsig_create(&a, buf.ptr, buf.size, GIT_HASHSIG_NORMAL)); - cl_git_pass(git_buf_sets(&buf, SIMILARITY_TEST_DATA_1 - "050\n051\n052\n053\n054\n055\n056\n057\n058\n059\n")); - cl_git_pass(git_hashsig_create(&b, buf.ptr, buf.size, GIT_HASHSIG_NORMAL)); - - sim = git_hashsig_compare(a, b); - /* 20% lines added ~= 10% lines changed */ - - cl_assert_in_range(85, sim, 95); /* expect similarity around 90% */ - - git_hashsig_free(a); - git_hashsig_free(b); - - /* what if we keep about half the original data and add half new */ - - cl_git_pass(git_buf_sets(&buf, SIMILARITY_TEST_DATA_1)); - cl_git_pass(git_hashsig_create(&a, buf.ptr, buf.size, GIT_HASHSIG_NORMAL)); - cl_git_pass(git_buf_sets(&buf, - "000\n001\n002\n003\n004\n005\n006\n007\n008\n009\n" \ - "010\n011\n012\n013\n014\n015\n016\n017\n018\n019\n" \ - "020x\n021\n022\n023\n024\n" \ - "x25\nx26\nx27\nx28\nx29\n" \ - "x30\nx31\nx32\nx33\nx34\nx35\nx36\nx37\nx38\nx39\n" \ - "x40\nx41\nx42\nx43\nx44\nx45\nx46\nx47\nx48\nx49\n" - )); - cl_git_pass(git_hashsig_create(&b, buf.ptr, buf.size, GIT_HASHSIG_NORMAL)); - - sim = git_hashsig_compare(a, b); - /* 50% lines changed */ - - cl_assert_in_range(40, sim, 60); /* expect in the 40-60% similarity range */ - - git_hashsig_free(a); - git_hashsig_free(b); - - /* lastly, let's check that we can hash file content as well */ - - cl_git_pass(git_buf_sets(&buf, SIMILARITY_TEST_DATA_1)); - cl_git_pass(git_hashsig_create(&a, buf.ptr, buf.size, GIT_HASHSIG_NORMAL)); - - cl_git_pass(git_futils_mkdir("scratch", 0755, GIT_MKDIR_PATH)); - cl_git_mkfile("scratch/testdata", SIMILARITY_TEST_DATA_1); - cl_git_pass(git_hashsig_create_fromfile( - &b, "scratch/testdata", GIT_HASHSIG_NORMAL)); - - cl_assert_equal_i(100, git_hashsig_compare(a, b)); - - git_hashsig_free(a); - git_hashsig_free(b); - - git_buf_free(&buf); - git_futils_rmdir_r("scratch", NULL, GIT_RMDIR_REMOVE_FILES); -} - - -void test_core_buffer__similarity_metric_whitespace(void) -{ - git_hashsig *a, *b; - git_buf buf = GIT_BUF_INIT; - int sim, i, j; - git_hashsig_option_t opt; - const char *tabbed = - " for (s = 0; s < sizeof(sep) / sizeof(char); ++s) {\n" - " separator = sep[s];\n" - " expect = expect_values[s];\n" - "\n" - " for (j = 0; j < sizeof(b) / sizeof(char*); ++j) {\n" - " for (i = 0; i < sizeof(a) / sizeof(char*); ++i) {\n" - " git_buf_join(&buf, separator, a[i], b[j]);\n" - " cl_assert_equal_s(*expect, buf.ptr);\n" - " expect++;\n" - " }\n" - " }\n" - " }\n"; - const char *spaced = - " for (s = 0; s < sizeof(sep) / sizeof(char); ++s) {\n" - " separator = sep[s];\n" - " expect = expect_values[s];\n" - "\n" - " for (j = 0; j < sizeof(b) / sizeof(char*); ++j) {\n" - " for (i = 0; i < sizeof(a) / sizeof(char*); ++i) {\n" - " git_buf_join(&buf, separator, a[i], b[j]);\n" - " cl_assert_equal_s(*expect, buf.ptr);\n" - " expect++;\n" - " }\n" - " }\n" - " }\n"; - const char *crlf_spaced2 = - " for (s = 0; s < sizeof(sep) / sizeof(char); ++s) {\r\n" - " separator = sep[s];\r\n" - " expect = expect_values[s];\r\n" - "\r\n" - " for (j = 0; j < sizeof(b) / sizeof(char*); ++j) {\r\n" - " for (i = 0; i < sizeof(a) / sizeof(char*); ++i) {\r\n" - " git_buf_join(&buf, separator, a[i], b[j]);\r\n" - " cl_assert_equal_s(*expect, buf.ptr);\r\n" - " expect++;\r\n" - " }\r\n" - " }\r\n" - " }\r\n"; - const char *text[3] = { tabbed, spaced, crlf_spaced2 }; - - /* let's try variations of our own code with whitespace changes */ - - for (opt = GIT_HASHSIG_NORMAL; opt <= GIT_HASHSIG_SMART_WHITESPACE; ++opt) { - for (i = 0; i < 3; ++i) { - for (j = 0; j < 3; ++j) { - cl_git_pass(git_buf_sets(&buf, text[i])); - cl_git_pass(git_hashsig_create(&a, buf.ptr, buf.size, opt)); - - cl_git_pass(git_buf_sets(&buf, text[j])); - cl_git_pass(git_hashsig_create(&b, buf.ptr, buf.size, opt)); - - sim = git_hashsig_compare(a, b); - - if (opt == GIT_HASHSIG_NORMAL) { - if (i == j) - cl_assert_equal_i(100, sim); - else - cl_assert_in_range(0, sim, 30); /* pretty different */ - } else { - cl_assert_equal_i(100, sim); - } - - git_hashsig_free(a); - git_hashsig_free(b); - } - } - } - - git_buf_free(&buf); -} - -#include "../filter/crlf.h" - -#define check_buf(expected,buf) do { \ - cl_assert_equal_s(expected, buf.ptr); \ - cl_assert_equal_sz(strlen(expected), buf.size); } while (0) - -void test_core_buffer__lf_and_crlf_conversions(void) -{ - git_buf src = GIT_BUF_INIT, tgt = GIT_BUF_INIT; - - /* LF source */ - - git_buf_sets(&src, "lf\nlf\nlf\nlf\n"); - - cl_git_pass(git_buf_text_lf_to_crlf(&tgt, &src)); - check_buf("lf\r\nlf\r\nlf\r\nlf\r\n", tgt); - - cl_git_pass(git_buf_text_crlf_to_lf(&tgt, &src)); - check_buf(src.ptr, tgt); - - git_buf_sets(&src, "\nlf\nlf\nlf\nlf\nlf"); - - cl_git_pass(git_buf_text_lf_to_crlf(&tgt, &src)); - check_buf("\r\nlf\r\nlf\r\nlf\r\nlf\r\nlf", tgt); - - cl_git_pass(git_buf_text_crlf_to_lf(&tgt, &src)); - check_buf(src.ptr, tgt); - - /* CRLF source */ - - git_buf_sets(&src, "crlf\r\ncrlf\r\ncrlf\r\ncrlf\r\n"); - - cl_git_pass(git_buf_text_lf_to_crlf(&tgt, &src)); - check_buf("crlf\r\ncrlf\r\ncrlf\r\ncrlf\r\n", tgt); - - git_buf_sets(&src, "crlf\r\ncrlf\r\ncrlf\r\ncrlf\r\n"); - - cl_git_pass(git_buf_text_crlf_to_lf(&tgt, &src)); - check_buf("crlf\ncrlf\ncrlf\ncrlf\n", tgt); - - git_buf_sets(&src, "\r\ncrlf\r\ncrlf\r\ncrlf\r\ncrlf\r\ncrlf"); - - cl_git_pass(git_buf_text_lf_to_crlf(&tgt, &src)); - check_buf("\r\ncrlf\r\ncrlf\r\ncrlf\r\ncrlf\r\ncrlf", tgt); - - git_buf_sets(&src, "\r\ncrlf\r\ncrlf\r\ncrlf\r\ncrlf\r\ncrlf"); - - cl_git_pass(git_buf_text_crlf_to_lf(&tgt, &src)); - check_buf("\ncrlf\ncrlf\ncrlf\ncrlf\ncrlf", tgt); - - /* CRLF in LF text */ - - git_buf_sets(&src, "\nlf\nlf\ncrlf\r\nlf\nlf\ncrlf\r\n"); - - cl_git_pass(git_buf_text_lf_to_crlf(&tgt, &src)); - check_buf("\r\nlf\r\nlf\r\ncrlf\r\nlf\r\nlf\r\ncrlf\r\n", tgt); - - git_buf_sets(&src, "\nlf\nlf\ncrlf\r\nlf\nlf\ncrlf\r\n"); - - cl_git_pass(git_buf_text_crlf_to_lf(&tgt, &src)); - check_buf("\nlf\nlf\ncrlf\nlf\nlf\ncrlf\n", tgt); - - /* LF in CRLF text */ - - git_buf_sets(&src, "\ncrlf\r\ncrlf\r\nlf\ncrlf\r\ncrlf"); - - cl_git_pass(git_buf_text_lf_to_crlf(&tgt, &src)); - check_buf("\r\ncrlf\r\ncrlf\r\nlf\r\ncrlf\r\ncrlf", tgt); - - cl_git_pass(git_buf_text_crlf_to_lf(&tgt, &src)); - check_buf("\ncrlf\ncrlf\nlf\ncrlf\ncrlf", tgt); - - /* bare CR test */ - - git_buf_sets(&src, "\rcrlf\r\nlf\nlf\ncr\rcrlf\r\nlf\ncr\r"); - - cl_git_pass(git_buf_text_lf_to_crlf(&tgt, &src)); - check_buf("\rcrlf\r\nlf\r\nlf\r\ncr\rcrlf\r\nlf\r\ncr\r", tgt); - - git_buf_sets(&src, "\rcrlf\r\nlf\nlf\ncr\rcrlf\r\nlf\ncr\r"); - - cl_git_pass(git_buf_text_crlf_to_lf(&tgt, &src)); - check_buf("\rcrlf\nlf\nlf\ncr\rcrlf\nlf\ncr\r", tgt); - - git_buf_sets(&src, "\rcr\r"); - cl_git_pass(git_buf_text_lf_to_crlf(&tgt, &src)); - check_buf(src.ptr, tgt); - cl_git_pass(git_buf_text_crlf_to_lf(&tgt, &src)); - check_buf("\rcr\r", tgt); - - git_buf_free(&src); - git_buf_free(&tgt); - - /* blob correspondence tests */ - - git_buf_sets(&src, ALL_CRLF_TEXT_RAW); - cl_git_pass(git_buf_text_lf_to_crlf(&tgt, &src)); - check_buf(ALL_CRLF_TEXT_AS_CRLF, tgt); - git_buf_sets(&src, ALL_CRLF_TEXT_RAW); - cl_git_pass(git_buf_text_crlf_to_lf(&tgt, &src)); - check_buf(ALL_CRLF_TEXT_AS_LF, tgt); - git_buf_free(&src); - git_buf_free(&tgt); - - git_buf_sets(&src, ALL_LF_TEXT_RAW); - cl_git_pass(git_buf_text_lf_to_crlf(&tgt, &src)); - check_buf(ALL_LF_TEXT_AS_CRLF, tgt); - git_buf_sets(&src, ALL_LF_TEXT_RAW); - cl_git_pass(git_buf_text_crlf_to_lf(&tgt, &src)); - check_buf(ALL_LF_TEXT_AS_LF, tgt); - git_buf_free(&src); - git_buf_free(&tgt); - - git_buf_sets(&src, MORE_CRLF_TEXT_RAW); - cl_git_pass(git_buf_text_lf_to_crlf(&tgt, &src)); - check_buf(MORE_CRLF_TEXT_AS_CRLF, tgt); - git_buf_sets(&src, MORE_CRLF_TEXT_RAW); - cl_git_pass(git_buf_text_crlf_to_lf(&tgt, &src)); - check_buf(MORE_CRLF_TEXT_AS_LF, tgt); - git_buf_free(&src); - git_buf_free(&tgt); - - git_buf_sets(&src, MORE_LF_TEXT_RAW); - cl_git_pass(git_buf_text_lf_to_crlf(&tgt, &src)); - check_buf(MORE_LF_TEXT_AS_CRLF, tgt); - git_buf_sets(&src, MORE_LF_TEXT_RAW); - cl_git_pass(git_buf_text_crlf_to_lf(&tgt, &src)); - check_buf(MORE_LF_TEXT_AS_LF, tgt); - git_buf_free(&src); - git_buf_free(&tgt); -} - -void test_core_buffer__dont_grow_borrowed(void) -{ - const char *somestring = "blah blah"; - git_buf buf = GIT_BUF_INIT; - - git_buf_attach_notowned(&buf, somestring, strlen(somestring) + 1); - cl_assert_equal_p(somestring, buf.ptr); - cl_assert_equal_i(0, buf.asize); - cl_assert_equal_i(strlen(somestring) + 1, buf.size); - - cl_git_fail_with(GIT_EINVALID, git_buf_grow(&buf, 1024)); -} diff --git a/vendor/libgit2/tests/core/copy.c b/vendor/libgit2/tests/core/copy.c deleted file mode 100644 index 967748cc5..000000000 --- a/vendor/libgit2/tests/core/copy.c +++ /dev/null @@ -1,152 +0,0 @@ -#include "clar_libgit2.h" -#include "fileops.h" -#include "path.h" -#include "posix.h" - -void test_core_copy__file(void) -{ - struct stat st; - const char *content = "This is some stuff to copy\n"; - - cl_git_mkfile("copy_me", content); - - cl_git_pass(git_futils_cp("copy_me", "copy_me_two", 0664)); - - cl_git_pass(git_path_lstat("copy_me_two", &st)); - cl_assert(S_ISREG(st.st_mode)); - cl_assert(strlen(content) == (size_t)st.st_size); - - cl_git_pass(p_unlink("copy_me_two")); - cl_git_pass(p_unlink("copy_me")); -} - -void test_core_copy__file_in_dir(void) -{ - struct stat st; - const char *content = "This is some other stuff to copy\n"; - - cl_git_pass(git_futils_mkdir("an_dir/in_a_dir", 0775, GIT_MKDIR_PATH)); - cl_git_mkfile("an_dir/in_a_dir/copy_me", content); - cl_assert(git_path_isdir("an_dir")); - - cl_git_pass(git_futils_mkpath2file - ("an_dir/second_dir/and_more/copy_me_two", 0775)); - - cl_git_pass(git_futils_cp - ("an_dir/in_a_dir/copy_me", - "an_dir/second_dir/and_more/copy_me_two", - 0664)); - - cl_git_pass(git_path_lstat("an_dir/second_dir/and_more/copy_me_two", &st)); - cl_assert(S_ISREG(st.st_mode)); - cl_assert(strlen(content) == (size_t)st.st_size); - - cl_git_pass(git_futils_rmdir_r("an_dir", NULL, GIT_RMDIR_REMOVE_FILES)); - cl_assert(!git_path_isdir("an_dir")); -} - -void assert_hard_link(const char *path) -{ - /* we assert this by checking that there's more than one link to the file */ - struct stat st; - - cl_assert(git_path_isfile(path)); - cl_git_pass(p_stat(path, &st)); - cl_assert(st.st_nlink > 1); -} - -void test_core_copy__tree(void) -{ - struct stat st; - const char *content = "File content\n"; - - cl_git_pass(git_futils_mkdir("src/b", 0775, GIT_MKDIR_PATH)); - cl_git_pass(git_futils_mkdir("src/c/d", 0775, GIT_MKDIR_PATH)); - cl_git_pass(git_futils_mkdir("src/c/e", 0775, GIT_MKDIR_PATH)); - - cl_git_mkfile("src/f1", content); - cl_git_mkfile("src/b/f2", content); - cl_git_mkfile("src/c/f3", content); - cl_git_mkfile("src/c/d/f4", content); - cl_git_mkfile("src/c/d/.f5", content); - -#ifndef GIT_WIN32 - cl_assert(p_symlink("../../b/f2", "src/c/d/l1") == 0); -#endif - - cl_assert(git_path_isdir("src")); - cl_assert(git_path_isdir("src/b")); - cl_assert(git_path_isdir("src/c/d")); - cl_assert(git_path_isfile("src/c/d/f4")); - - /* copy with no empty dirs, yes links, no dotfiles, no overwrite */ - - cl_git_pass( - git_futils_cp_r("src", "t1", GIT_CPDIR_COPY_SYMLINKS, 0) ); - - cl_assert(git_path_isdir("t1")); - cl_assert(git_path_isdir("t1/b")); - cl_assert(git_path_isdir("t1/c")); - cl_assert(git_path_isdir("t1/c/d")); - cl_assert(!git_path_isdir("t1/c/e")); - - cl_assert(git_path_isfile("t1/f1")); - cl_assert(git_path_isfile("t1/b/f2")); - cl_assert(git_path_isfile("t1/c/f3")); - cl_assert(git_path_isfile("t1/c/d/f4")); - cl_assert(!git_path_isfile("t1/c/d/.f5")); - - cl_git_pass(git_path_lstat("t1/c/f3", &st)); - cl_assert(S_ISREG(st.st_mode)); - cl_assert(strlen(content) == (size_t)st.st_size); - -#ifndef GIT_WIN32 - cl_git_pass(git_path_lstat("t1/c/d/l1", &st)); - cl_assert(S_ISLNK(st.st_mode)); -#endif - - cl_git_pass(git_futils_rmdir_r("t1", NULL, GIT_RMDIR_REMOVE_FILES)); - cl_assert(!git_path_isdir("t1")); - - /* copy with empty dirs, no links, yes dotfiles, no overwrite */ - - cl_git_pass( - git_futils_cp_r("src", "t2", GIT_CPDIR_CREATE_EMPTY_DIRS | GIT_CPDIR_COPY_DOTFILES, 0) ); - - cl_assert(git_path_isdir("t2")); - cl_assert(git_path_isdir("t2/b")); - cl_assert(git_path_isdir("t2/c")); - cl_assert(git_path_isdir("t2/c/d")); - cl_assert(git_path_isdir("t2/c/e")); - - cl_assert(git_path_isfile("t2/f1")); - cl_assert(git_path_isfile("t2/b/f2")); - cl_assert(git_path_isfile("t2/c/f3")); - cl_assert(git_path_isfile("t2/c/d/f4")); - cl_assert(git_path_isfile("t2/c/d/.f5")); - -#ifndef GIT_WIN32 - cl_git_fail(git_path_lstat("t2/c/d/l1", &st)); -#endif - - cl_git_pass(git_futils_rmdir_r("t2", NULL, GIT_RMDIR_REMOVE_FILES)); - cl_assert(!git_path_isdir("t2")); - -#ifndef GIT_WIN32 - cl_git_pass(git_futils_cp_r("src", "t3", GIT_CPDIR_CREATE_EMPTY_DIRS | GIT_CPDIR_LINK_FILES, 0)); - cl_assert(git_path_isdir("t3")); - - cl_assert(git_path_isdir("t3")); - cl_assert(git_path_isdir("t3/b")); - cl_assert(git_path_isdir("t3/c")); - cl_assert(git_path_isdir("t3/c/d")); - cl_assert(git_path_isdir("t3/c/e")); - - assert_hard_link("t3/f1"); - assert_hard_link("t3/b/f2"); - assert_hard_link("t3/c/f3"); - assert_hard_link("t3/c/d/f4"); -#endif - - cl_git_pass(git_futils_rmdir_r("src", NULL, GIT_RMDIR_REMOVE_FILES)); -} diff --git a/vendor/libgit2/tests/core/dirent.c b/vendor/libgit2/tests/core/dirent.c deleted file mode 100644 index 2bd60269d..000000000 --- a/vendor/libgit2/tests/core/dirent.c +++ /dev/null @@ -1,306 +0,0 @@ -#include "clar_libgit2.h" -#include "fileops.h" - -typedef struct name_data { - int count; /* return count */ - char *name; /* filename */ -} name_data; - -typedef struct walk_data { - char *sub; /* sub-directory name */ - name_data *names; /* name state data */ - git_buf path; -} walk_data; - - -static char *top_dir = "dir-walk"; -static walk_data *state_loc; - -static void setup(walk_data *d) -{ - name_data *n; - - cl_must_pass(p_mkdir(top_dir, 0777)); - - cl_must_pass(p_chdir(top_dir)); - - if (strcmp(d->sub, ".") != 0) - cl_must_pass(p_mkdir(d->sub, 0777)); - - cl_git_pass(git_buf_sets(&d->path, d->sub)); - - state_loc = d; - - for (n = d->names; n->name; n++) { - git_file fd = p_creat(n->name, 0666); - cl_assert(fd >= 0); - p_close(fd); - n->count = 0; - } -} - -static void dirent_cleanup__cb(void *_d) -{ - walk_data *d = _d; - name_data *n; - - for (n = d->names; n->name; n++) { - cl_must_pass(p_unlink(n->name)); - } - - if (strcmp(d->sub, ".") != 0) - cl_must_pass(p_rmdir(d->sub)); - - cl_must_pass(p_chdir("..")); - - cl_must_pass(p_rmdir(top_dir)); - - git_buf_free(&d->path); -} - -static void check_counts(walk_data *d) -{ - name_data *n; - - for (n = d->names; n->name; n++) { - cl_assert(n->count == 1); - } -} - -static int update_count(name_data *data, const char *name) -{ - name_data *n; - - for (n = data; n->name; n++) { - if (!strcmp(n->name, name)) { - n->count++; - return 0; - } - } - - return GIT_ERROR; -} - -static int one_entry(void *state, git_buf *path) -{ - walk_data *d = (walk_data *) state; - - if (state != state_loc) - return GIT_ERROR; - - if (path != &d->path) - return GIT_ERROR; - - return update_count(d->names, path->ptr); -} - - -static name_data dot_names[] = { - { 0, "./a" }, - { 0, "./asdf" }, - { 0, "./pack-foo.pack" }, - { 0, NULL } -}; -static walk_data dot = { - ".", - dot_names, - GIT_BUF_INIT -}; - -/* make sure that the '.' folder is not traversed */ -void test_core_dirent__dont_traverse_dot(void) -{ - cl_set_cleanup(&dirent_cleanup__cb, &dot); - setup(&dot); - - cl_git_pass(git_path_direach(&dot.path, 0, one_entry, &dot)); - - check_counts(&dot); -} - - -static name_data sub_names[] = { - { 0, "sub/a" }, - { 0, "sub/asdf" }, - { 0, "sub/pack-foo.pack" }, - { 0, NULL } -}; -static walk_data sub = { - "sub", - sub_names, - GIT_BUF_INIT -}; - -/* traverse a subfolder */ -void test_core_dirent__traverse_subfolder(void) -{ - cl_set_cleanup(&dirent_cleanup__cb, &sub); - setup(&sub); - - cl_git_pass(git_path_direach(&sub.path, 0, one_entry, &sub)); - - check_counts(&sub); -} - - -static walk_data sub_slash = { - "sub/", - sub_names, - GIT_BUF_INIT -}; - -/* traverse a slash-terminated subfolder */ -void test_core_dirent__traverse_slash_terminated_folder(void) -{ - cl_set_cleanup(&dirent_cleanup__cb, &sub_slash); - setup(&sub_slash); - - cl_git_pass(git_path_direach(&sub_slash.path, 0, one_entry, &sub_slash)); - - check_counts(&sub_slash); -} - - -static name_data empty_names[] = { - { 0, NULL } -}; -static walk_data empty = { - "empty", - empty_names, - GIT_BUF_INIT -}; - -/* make sure that empty folders are not traversed */ -void test_core_dirent__dont_traverse_empty_folders(void) -{ - cl_set_cleanup(&dirent_cleanup__cb, &empty); - setup(&empty); - - cl_git_pass(git_path_direach(&empty.path, 0, one_entry, &empty)); - - check_counts(&empty); - - /* make sure callback not called */ - cl_assert(git_path_is_empty_dir(empty.path.ptr)); -} - -static name_data odd_names[] = { - { 0, "odd/.a" }, - { 0, "odd/..c" }, - /* the following don't work on cygwin/win32 */ - /* { 0, "odd/.b." }, */ - /* { 0, "odd/..d.." }, */ - { 0, NULL } -}; -static walk_data odd = { - "odd", - odd_names, - GIT_BUF_INIT -}; - -/* make sure that strange looking filenames ('..c') are traversed */ -void test_core_dirent__traverse_weird_filenames(void) -{ - cl_set_cleanup(&dirent_cleanup__cb, &odd); - setup(&odd); - - cl_git_pass(git_path_direach(&odd.path, 0, one_entry, &odd)); - - check_counts(&odd); -} - -/* test filename length limits */ -void test_core_dirent__length_limits(void) -{ - char *big_filename = (char *)git__malloc(FILENAME_MAX + 1); - memset(big_filename, 'a', FILENAME_MAX + 1); - big_filename[FILENAME_MAX] = 0; - - cl_must_fail(p_creat(big_filename, 0666)); - - git__free(big_filename); -} - -void test_core_dirent__empty_dir(void) -{ - cl_must_pass(p_mkdir("empty_dir", 0777)); - cl_assert(git_path_is_empty_dir("empty_dir")); - - cl_git_mkfile("empty_dir/content", "whatever\n"); - cl_assert(!git_path_is_empty_dir("empty_dir")); - cl_assert(!git_path_is_empty_dir("empty_dir/content")); - - cl_must_pass(p_unlink("empty_dir/content")); - - cl_must_pass(p_mkdir("empty_dir/content", 0777)); - cl_assert(!git_path_is_empty_dir("empty_dir")); - cl_assert(git_path_is_empty_dir("empty_dir/content")); - - cl_must_pass(p_rmdir("empty_dir/content")); - - cl_must_pass(p_rmdir("empty_dir")); -} - -static void handle_next(git_path_diriter *diriter, walk_data *walk) -{ - const char *fullpath, *filename; - size_t fullpath_len, filename_len; - - cl_git_pass(git_path_diriter_fullpath(&fullpath, &fullpath_len, diriter)); - cl_git_pass(git_path_diriter_filename(&filename, &filename_len, diriter)); - - cl_assert_equal_strn(fullpath, "sub/", 4); - cl_assert_equal_s(fullpath+4, filename); - - update_count(walk->names, fullpath); -} - -/* test directory iterator */ -void test_core_dirent__diriter_with_fullname(void) -{ - git_path_diriter diriter = GIT_PATH_DIRITER_INIT; - int error; - - cl_set_cleanup(&dirent_cleanup__cb, &sub); - setup(&sub); - - cl_git_pass(git_path_diriter_init(&diriter, sub.path.ptr, 0)); - - while ((error = git_path_diriter_next(&diriter)) == 0) - handle_next(&diriter, &sub); - - cl_assert_equal_i(error, GIT_ITEROVER); - - git_path_diriter_free(&diriter); - - check_counts(&sub); -} - -void test_core_dirent__diriter_at_directory_root(void) -{ - git_path_diriter diriter = GIT_PATH_DIRITER_INIT; - const char *sandbox_path, *path; - char *root_path; - size_t path_len; - int root_offset, error; - - sandbox_path = clar_sandbox_path(); - cl_assert((root_offset = git_path_root(sandbox_path)) >= 0); - - cl_assert(root_path = git__calloc(1, root_offset + 2)); - strncpy(root_path, sandbox_path, root_offset + 1); - - cl_git_pass(git_path_diriter_init(&diriter, root_path, 0)); - - while ((error = git_path_diriter_next(&diriter)) == 0) { - cl_git_pass(git_path_diriter_fullpath(&path, &path_len, &diriter)); - - cl_assert(path_len > (size_t)(root_offset + 1)); - cl_assert(path[root_offset+1] != '/'); - } - - cl_assert_equal_i(error, GIT_ITEROVER); - - git_path_diriter_free(&diriter); - git__free(root_path); -} diff --git a/vendor/libgit2/tests/core/env.c b/vendor/libgit2/tests/core/env.c deleted file mode 100644 index ee08258a6..000000000 --- a/vendor/libgit2/tests/core/env.c +++ /dev/null @@ -1,300 +0,0 @@ -#include "clar_libgit2.h" -#include "fileops.h" -#include "sysdir.h" -#include "path.h" - -#ifdef GIT_WIN32 -#define NUM_VARS 5 -static const char *env_vars[NUM_VARS] = { - "HOME", "HOMEDRIVE", "HOMEPATH", "USERPROFILE", "PROGRAMFILES" -}; -#else -#define NUM_VARS 1 -static const char *env_vars[NUM_VARS] = { "HOME" }; -#endif - -static char *env_save[NUM_VARS]; - -static char *home_values[] = { - "fake_home", - "f\xc3\xa1ke_h\xc3\xb5me", /* all in latin-1 supplement */ - "f\xc4\x80ke_\xc4\xa4ome", /* latin extended */ - "f\xce\xb1\xce\xba\xce\xb5_h\xce\xbfm\xce\xad", /* having fun with greek */ - "fa\xe0" "\xb8" "\x87" "e_\xe0" "\xb8" "\x99" "ome", /* thai characters */ - "f\xe1\x9c\x80ke_\xe1\x9c\x91ome", /* tagalog characters */ - "\xe1\xb8\x9f\xe1\xba\xa2" "ke_ho" "\xe1" "\xb9" "\x81" "e", /* latin extended additional */ - "\xf0\x9f\x98\x98\xf0\x9f\x98\x82", /* emoticons */ - NULL -}; - -void test_core_env__initialize(void) -{ - int i; - for (i = 0; i < NUM_VARS; ++i) - env_save[i] = cl_getenv(env_vars[i]); -} - -static void set_global_search_path_from_env(void) -{ - cl_git_pass(git_sysdir_set(GIT_SYSDIR_GLOBAL, NULL)); -} - -static void set_system_search_path_from_env(void) -{ - cl_git_pass(git_sysdir_set(GIT_SYSDIR_SYSTEM, NULL)); -} - -void test_core_env__cleanup(void) -{ - int i; - char **val; - - for (i = 0; i < NUM_VARS; ++i) { - cl_setenv(env_vars[i], env_save[i]); - git__free(env_save[i]); - env_save[i] = NULL; - } - - /* these will probably have already been cleaned up, but if a test - * fails, then it's probably good to try and clear out these dirs - */ - for (val = home_values; *val != NULL; val++) { - if (**val != '\0') - (void)p_rmdir(*val); - } - - cl_sandbox_set_search_path_defaults(); -} - -static void setenv_and_check(const char *name, const char *value) -{ - char *check; - - cl_git_pass(cl_setenv(name, value)); - check = cl_getenv(name); - - if (value) - cl_assert_equal_s(value, check); - else - cl_assert(check == NULL); - - git__free(check); -} - -void test_core_env__0(void) -{ - git_buf path = GIT_BUF_INIT, found = GIT_BUF_INIT; - char testfile[16], tidx = '0'; - char **val; - const char *testname = "testfile"; - size_t testlen = strlen(testname); - - strncpy(testfile, testname, sizeof(testfile)); - cl_assert_equal_s(testname, testfile); - - for (val = home_values; *val != NULL; val++) { - - /* if we can't make the directory, let's just assume - * we are on a filesystem that doesn't support the - * characters in question and skip this test... - */ - if (p_mkdir(*val, 0777) != 0) { - *val = ""; /* mark as not created */ - continue; - } - - cl_git_pass(git_path_prettify(&path, *val, NULL)); - - /* vary testfile name in each directory so accidentally leaving - * an environment variable set from a previous iteration won't - * accidentally make this test pass... - */ - testfile[testlen] = tidx++; - cl_git_pass(git_buf_joinpath(&path, path.ptr, testfile)); - cl_git_mkfile(path.ptr, "find me"); - git_buf_rtruncate_at_char(&path, '/'); - - cl_assert_equal_i( - GIT_ENOTFOUND, git_sysdir_find_global_file(&found, testfile)); - - setenv_and_check("HOME", path.ptr); - set_global_search_path_from_env(); - - cl_git_pass(git_sysdir_find_global_file(&found, testfile)); - - cl_setenv("HOME", env_save[0]); - set_global_search_path_from_env(); - - cl_assert_equal_i( - GIT_ENOTFOUND, git_sysdir_find_global_file(&found, testfile)); - -#ifdef GIT_WIN32 - setenv_and_check("HOMEDRIVE", NULL); - setenv_and_check("HOMEPATH", NULL); - setenv_and_check("USERPROFILE", path.ptr); - set_global_search_path_from_env(); - - cl_git_pass(git_sysdir_find_global_file(&found, testfile)); - - { - int root = git_path_root(path.ptr); - char old; - - if (root >= 0) { - setenv_and_check("USERPROFILE", NULL); - set_global_search_path_from_env(); - - cl_assert_equal_i( - GIT_ENOTFOUND, git_sysdir_find_global_file(&found, testfile)); - - old = path.ptr[root]; - path.ptr[root] = '\0'; - setenv_and_check("HOMEDRIVE", path.ptr); - path.ptr[root] = old; - setenv_and_check("HOMEPATH", &path.ptr[root]); - set_global_search_path_from_env(); - - cl_git_pass(git_sysdir_find_global_file(&found, testfile)); - } - } -#endif - - (void)p_rmdir(*val); - } - - git_buf_free(&path); - git_buf_free(&found); -} - - -void test_core_env__1(void) -{ - git_buf path = GIT_BUF_INIT; - - cl_assert_equal_i( - GIT_ENOTFOUND, git_sysdir_find_global_file(&path, "nonexistentfile")); - - cl_git_pass(cl_setenv("HOME", "doesnotexist")); -#ifdef GIT_WIN32 - cl_git_pass(cl_setenv("HOMEPATH", "doesnotexist")); - cl_git_pass(cl_setenv("USERPROFILE", "doesnotexist")); -#endif - set_global_search_path_from_env(); - - cl_assert_equal_i( - GIT_ENOTFOUND, git_sysdir_find_global_file(&path, "nonexistentfile")); - - cl_git_pass(cl_setenv("HOME", NULL)); -#ifdef GIT_WIN32 - cl_git_pass(cl_setenv("HOMEPATH", NULL)); - cl_git_pass(cl_setenv("USERPROFILE", NULL)); -#endif - set_global_search_path_from_env(); - set_system_search_path_from_env(); - - cl_assert_equal_i( - GIT_ENOTFOUND, git_sysdir_find_global_file(&path, "nonexistentfile")); - - cl_assert_equal_i( - GIT_ENOTFOUND, git_sysdir_find_system_file(&path, "nonexistentfile")); - -#ifdef GIT_WIN32 - cl_git_pass(cl_setenv("PROGRAMFILES", NULL)); - set_system_search_path_from_env(); - - cl_assert_equal_i( - GIT_ENOTFOUND, git_sysdir_find_system_file(&path, "nonexistentfile")); -#endif - - git_buf_free(&path); -} - -static void check_global_searchpath( - const char *path, int position, const char *file, git_buf *temp) -{ - git_buf out = GIT_BUF_INIT; - - /* build and set new path */ - if (position < 0) - cl_git_pass(git_buf_join(temp, GIT_PATH_LIST_SEPARATOR, path, "$PATH")); - else if (position > 0) - cl_git_pass(git_buf_join(temp, GIT_PATH_LIST_SEPARATOR, "$PATH", path)); - else - cl_git_pass(git_buf_sets(temp, path)); - - cl_git_pass(git_libgit2_opts( - GIT_OPT_SET_SEARCH_PATH, GIT_CONFIG_LEVEL_GLOBAL, temp->ptr)); - - /* get path and make sure $PATH expansion worked */ - cl_git_pass(git_libgit2_opts( - GIT_OPT_GET_SEARCH_PATH, GIT_CONFIG_LEVEL_GLOBAL, &out)); - - if (position < 0) - cl_assert(git__prefixcmp(out.ptr, path) == 0); - else if (position > 0) - cl_assert(git__suffixcmp(out.ptr, path) == 0); - else - cl_assert_equal_s(out.ptr, path); - - /* find file using new path */ - cl_git_pass(git_sysdir_find_global_file(temp, file)); - - /* reset path and confirm file not found */ - cl_git_pass(git_libgit2_opts( - GIT_OPT_SET_SEARCH_PATH, GIT_CONFIG_LEVEL_GLOBAL, NULL)); - cl_assert_equal_i( - GIT_ENOTFOUND, git_sysdir_find_global_file(temp, file)); - - git_buf_free(&out); -} - -void test_core_env__2(void) -{ - git_buf path = GIT_BUF_INIT, found = GIT_BUF_INIT; - char testfile[16], tidx = '0'; - char **val; - const char *testname = "alternate"; - size_t testlen = strlen(testname); - - strncpy(testfile, testname, sizeof(testfile)); - cl_assert_equal_s(testname, testfile); - - for (val = home_values; *val != NULL; val++) { - - /* if we can't make the directory, let's just assume - * we are on a filesystem that doesn't support the - * characters in question and skip this test... - */ - if (p_mkdir(*val, 0777) != 0 && errno != EEXIST) { - *val = ""; /* mark as not created */ - continue; - } - - cl_git_pass(git_path_prettify(&path, *val, NULL)); - - /* vary testfile name so any sloppiness is resetting variables or - * deleting files won't accidentally make a test pass. - */ - testfile[testlen] = tidx++; - cl_git_pass(git_buf_joinpath(&path, path.ptr, testfile)); - cl_git_mkfile(path.ptr, "find me"); - git_buf_rtruncate_at_char(&path, '/'); - - /* default should be NOTFOUND */ - cl_assert_equal_i( - GIT_ENOTFOUND, git_sysdir_find_global_file(&found, testfile)); - - /* try plain, append $PATH, and prepend $PATH */ - check_global_searchpath(path.ptr, 0, testfile, &found); - check_global_searchpath(path.ptr, -1, testfile, &found); - check_global_searchpath(path.ptr, 1, testfile, &found); - - /* cleanup */ - cl_git_pass(git_buf_joinpath(&path, path.ptr, testfile)); - (void)p_unlink(path.ptr); - (void)p_rmdir(*val); - } - - git_buf_free(&path); - git_buf_free(&found); -} diff --git a/vendor/libgit2/tests/core/errors.c b/vendor/libgit2/tests/core/errors.c deleted file mode 100644 index ab18951a6..000000000 --- a/vendor/libgit2/tests/core/errors.c +++ /dev/null @@ -1,222 +0,0 @@ -#include "clar_libgit2.h" - -void test_core_errors__public_api(void) -{ - char *str_in_error; - - giterr_clear(); - cl_assert(giterr_last() == NULL); - - giterr_set_oom(); - - cl_assert(giterr_last() != NULL); - cl_assert(giterr_last()->klass == GITERR_NOMEMORY); - str_in_error = strstr(giterr_last()->message, "memory"); - cl_assert(str_in_error != NULL); - - giterr_clear(); - - giterr_set_str(GITERR_REPOSITORY, "This is a test"); - - cl_assert(giterr_last() != NULL); - str_in_error = strstr(giterr_last()->message, "This is a test"); - cl_assert(str_in_error != NULL); - - giterr_clear(); - cl_assert(giterr_last() == NULL); -} - -#include "common.h" -#include "util.h" -#include "posix.h" - -void test_core_errors__new_school(void) -{ - char *str_in_error; - - giterr_clear(); - cl_assert(giterr_last() == NULL); - - giterr_set_oom(); /* internal fn */ - - cl_assert(giterr_last() != NULL); - cl_assert(giterr_last()->klass == GITERR_NOMEMORY); - str_in_error = strstr(giterr_last()->message, "memory"); - cl_assert(str_in_error != NULL); - - giterr_clear(); - - giterr_set(GITERR_REPOSITORY, "This is a test"); /* internal fn */ - - cl_assert(giterr_last() != NULL); - str_in_error = strstr(giterr_last()->message, "This is a test"); - cl_assert(str_in_error != NULL); - - giterr_clear(); - cl_assert(giterr_last() == NULL); - - do { - struct stat st; - memset(&st, 0, sizeof(st)); - cl_assert(p_lstat("this_file_does_not_exist", &st) < 0); - GIT_UNUSED(st); - } while (false); - giterr_set(GITERR_OS, "stat failed"); /* internal fn */ - - cl_assert(giterr_last() != NULL); - str_in_error = strstr(giterr_last()->message, "stat failed"); - cl_assert(str_in_error != NULL); - cl_assert(git__prefixcmp(str_in_error, "stat failed: ") == 0); - cl_assert(strlen(str_in_error) > strlen("stat failed: ")); - -#ifdef GIT_WIN32 - giterr_clear(); - - /* The MSDN docs use this to generate a sample error */ - cl_assert(GetProcessId(NULL) == 0); - giterr_set(GITERR_OS, "GetProcessId failed"); /* internal fn */ - - cl_assert(giterr_last() != NULL); - str_in_error = strstr(giterr_last()->message, "GetProcessId failed"); - cl_assert(str_in_error != NULL); - cl_assert(git__prefixcmp(str_in_error, "GetProcessId failed: ") == 0); - cl_assert(strlen(str_in_error) > strlen("GetProcessId failed: ")); -#endif - - giterr_clear(); -} - -void test_core_errors__restore(void) -{ - git_error_state err_state = {0}; - - giterr_clear(); - cl_assert(giterr_last() == NULL); - - cl_assert_equal_i(0, giterr_state_capture(&err_state, 0)); - - memset(&err_state, 0x0, sizeof(git_error_state)); - - giterr_set(42, "Foo: %s", "bar"); - cl_assert_equal_i(-1, giterr_state_capture(&err_state, -1)); - - cl_assert(giterr_last() == NULL); - - giterr_set(99, "Bar: %s", "foo"); - - giterr_state_restore(&err_state); - - cl_assert_equal_i(42, giterr_last()->klass); - cl_assert_equal_s("Foo: bar", giterr_last()->message); -} - -void test_core_errors__free_state(void) -{ - git_error_state err_state = {0}; - - giterr_clear(); - - giterr_set(42, "Foo: %s", "bar"); - cl_assert_equal_i(-1, giterr_state_capture(&err_state, -1)); - - giterr_set(99, "Bar: %s", "foo"); - - giterr_state_free(&err_state); - - cl_assert_equal_i(99, giterr_last()->klass); - cl_assert_equal_s("Bar: foo", giterr_last()->message); - - giterr_state_restore(&err_state); - - cl_assert(giterr_last() == NULL); -} - -void test_core_errors__restore_oom(void) -{ - git_error_state err_state = {0}; - const git_error *oom_error = NULL; - - giterr_clear(); - - giterr_set_oom(); /* internal fn */ - oom_error = giterr_last(); - cl_assert(oom_error); - - cl_assert_equal_i(-1, giterr_state_capture(&err_state, -1)); - - cl_assert(giterr_last() == NULL); - cl_assert_equal_i(GITERR_NOMEMORY, err_state.error_msg.klass); - cl_assert_equal_s("Out of memory", err_state.error_msg.message); - - giterr_state_restore(&err_state); - - cl_assert(giterr_last()->klass == GITERR_NOMEMORY); - cl_assert_(giterr_last() == oom_error, "static oom error not restored"); - - giterr_clear(); -} - -static int test_arraysize_multiply(size_t nelem, size_t size) -{ - size_t out; - GITERR_CHECK_ALLOC_MULTIPLY(&out, nelem, size); - return 0; -} - -void test_core_errors__integer_overflow_alloc_multiply(void) -{ - cl_git_pass(test_arraysize_multiply(10, 10)); - cl_git_pass(test_arraysize_multiply(1000, 1000)); - cl_git_pass(test_arraysize_multiply(SIZE_MAX/sizeof(void *), sizeof(void *))); - cl_git_pass(test_arraysize_multiply(0, 10)); - cl_git_pass(test_arraysize_multiply(10, 0)); - - cl_git_fail(test_arraysize_multiply(SIZE_MAX-1, sizeof(void *))); - cl_git_fail(test_arraysize_multiply((SIZE_MAX/sizeof(void *))+1, sizeof(void *))); - - cl_assert_equal_i(GITERR_NOMEMORY, giterr_last()->klass); - cl_assert_equal_s("Out of memory", giterr_last()->message); -} - -static int test_arraysize_add(size_t one, size_t two) -{ - size_t out; - GITERR_CHECK_ALLOC_ADD(&out, one, two); - return 0; -} - -void test_core_errors__integer_overflow_alloc_add(void) -{ - cl_git_pass(test_arraysize_add(10, 10)); - cl_git_pass(test_arraysize_add(1000, 1000)); - cl_git_pass(test_arraysize_add(SIZE_MAX-10, 10)); - - cl_git_fail(test_arraysize_multiply(SIZE_MAX-1, 2)); - cl_git_fail(test_arraysize_multiply(SIZE_MAX, SIZE_MAX)); - - cl_assert_equal_i(GITERR_NOMEMORY, giterr_last()->klass); - cl_assert_equal_s("Out of memory", giterr_last()->message); -} - -void test_core_errors__integer_overflow_sets_oom(void) -{ - size_t out; - - giterr_clear(); - cl_assert(!GIT_ADD_SIZET_OVERFLOW(&out, SIZE_MAX-1, 1)); - cl_assert_equal_p(NULL, giterr_last()); - - giterr_clear(); - cl_assert(!GIT_ADD_SIZET_OVERFLOW(&out, 42, 69)); - cl_assert_equal_p(NULL, giterr_last()); - - giterr_clear(); - cl_assert(GIT_ADD_SIZET_OVERFLOW(&out, SIZE_MAX, SIZE_MAX)); - cl_assert_equal_i(GITERR_NOMEMORY, giterr_last()->klass); - cl_assert_equal_s("Out of memory", giterr_last()->message); - - giterr_clear(); - cl_assert(GIT_ADD_SIZET_OVERFLOW(&out, SIZE_MAX, SIZE_MAX)); - cl_assert_equal_i(GITERR_NOMEMORY, giterr_last()->klass); - cl_assert_equal_s("Out of memory", giterr_last()->message); -} diff --git a/vendor/libgit2/tests/core/features.c b/vendor/libgit2/tests/core/features.c deleted file mode 100644 index 85cddfeff..000000000 --- a/vendor/libgit2/tests/core/features.c +++ /dev/null @@ -1,37 +0,0 @@ -#include "clar_libgit2.h" - -void test_core_features__0(void) -{ - int major, minor, rev, caps; - - git_libgit2_version(&major, &minor, &rev); - cl_assert_equal_i(LIBGIT2_VER_MAJOR, major); - cl_assert_equal_i(LIBGIT2_VER_MINOR, minor); - cl_assert_equal_i(LIBGIT2_VER_REVISION, rev); - - caps = git_libgit2_features(); - -#ifdef GIT_THREADS - cl_assert((caps & GIT_FEATURE_THREADS) != 0); -#else - cl_assert((caps & GIT_FEATURE_THREADS) == 0); -#endif - -#if defined(GIT_OPENSSL) || defined(GIT_WINHTTP) || defined(GIT_SECURE_TRANSPORT) - cl_assert((caps & GIT_FEATURE_HTTPS) != 0); -#else - cl_assert((caps & GIT_FEATURE_HTTPS) == 0); -#endif - -#if defined(GIT_SSH) - cl_assert((caps & GIT_FEATURE_SSH) != 0); -#else - cl_assert((caps & GIT_FEATURE_SSH) == 0); -#endif - -#if defined(GIT_USE_NSEC) - cl_assert((caps & GIT_FEATURE_NSEC) != 0); -#else - cl_assert((caps & GIT_FEATURE_NSEC) == 0); -#endif -} diff --git a/vendor/libgit2/tests/core/filebuf.c b/vendor/libgit2/tests/core/filebuf.c deleted file mode 100644 index 04a380b20..000000000 --- a/vendor/libgit2/tests/core/filebuf.c +++ /dev/null @@ -1,241 +0,0 @@ -#include "clar_libgit2.h" -#include "filebuf.h" - -/* make sure git_filebuf_open doesn't delete an existing lock */ -void test_core_filebuf__0(void) -{ - git_filebuf file = GIT_FILEBUF_INIT; - int fd; - char test[] = "test", testlock[] = "test.lock"; - - fd = p_creat(testlock, 0744); //-V536 - - cl_must_pass(fd); - cl_must_pass(p_close(fd)); - - cl_git_fail(git_filebuf_open(&file, test, 0, 0666)); - cl_assert(git_path_exists(testlock)); - - cl_must_pass(p_unlink(testlock)); -} - - -/* make sure GIT_FILEBUF_APPEND works as expected */ -void test_core_filebuf__1(void) -{ - git_filebuf file = GIT_FILEBUF_INIT; - char test[] = "test"; - - cl_git_mkfile(test, "libgit2 rocks\n"); - - cl_git_pass(git_filebuf_open(&file, test, GIT_FILEBUF_APPEND, 0666)); - cl_git_pass(git_filebuf_printf(&file, "%s\n", "libgit2 rocks")); - cl_git_pass(git_filebuf_commit(&file)); - - cl_assert_equal_file("libgit2 rocks\nlibgit2 rocks\n", 0, test); - - cl_must_pass(p_unlink(test)); -} - - -/* make sure git_filebuf_write writes large buffer correctly */ -void test_core_filebuf__2(void) -{ - git_filebuf file = GIT_FILEBUF_INIT; - char test[] = "test"; - unsigned char buf[4096 * 4]; /* 2 * WRITE_BUFFER_SIZE */ - - memset(buf, 0xfe, sizeof(buf)); - - cl_git_pass(git_filebuf_open(&file, test, 0, 0666)); - cl_git_pass(git_filebuf_write(&file, buf, sizeof(buf))); - cl_git_pass(git_filebuf_commit(&file)); - - cl_assert_equal_file((char *)buf, sizeof(buf), test); - - cl_must_pass(p_unlink(test)); -} - -/* make sure git_filebuf_cleanup clears the buffer */ -void test_core_filebuf__4(void) -{ - git_filebuf file = GIT_FILEBUF_INIT; - char test[] = "test"; - - cl_assert(file.buffer == NULL); - - cl_git_pass(git_filebuf_open(&file, test, 0, 0666)); - cl_assert(file.buffer != NULL); - - git_filebuf_cleanup(&file); - cl_assert(file.buffer == NULL); -} - - -/* make sure git_filebuf_commit clears the buffer */ -void test_core_filebuf__5(void) -{ - git_filebuf file = GIT_FILEBUF_INIT; - char test[] = "test"; - - cl_assert(file.buffer == NULL); - - cl_git_pass(git_filebuf_open(&file, test, 0, 0666)); - cl_assert(file.buffer != NULL); - cl_git_pass(git_filebuf_printf(&file, "%s\n", "libgit2 rocks")); - cl_assert(file.buffer != NULL); - - cl_git_pass(git_filebuf_commit(&file)); - cl_assert(file.buffer == NULL); - - cl_must_pass(p_unlink(test)); -} - - -/* make sure git_filebuf_commit takes umask into account */ -void test_core_filebuf__umask(void) -{ - git_filebuf file = GIT_FILEBUF_INIT; - char test[] = "test"; - struct stat statbuf; - mode_t mask, os_mask; - -#ifdef GIT_WIN32 - os_mask = 0600; -#else - os_mask = 0777; -#endif - - p_umask(mask = p_umask(0)); - - cl_assert(file.buffer == NULL); - - cl_git_pass(git_filebuf_open(&file, test, 0, 0666)); - cl_assert(file.buffer != NULL); - cl_git_pass(git_filebuf_printf(&file, "%s\n", "libgit2 rocks")); - cl_assert(file.buffer != NULL); - - cl_git_pass(git_filebuf_commit(&file)); - cl_assert(file.buffer == NULL); - - cl_must_pass(p_stat("test", &statbuf)); - cl_assert_equal_i(statbuf.st_mode & os_mask, (0666 & ~mask) & os_mask); - - cl_must_pass(p_unlink(test)); -} - -void test_core_filebuf__rename_error(void) -{ - git_filebuf file = GIT_FILEBUF_INIT; - char *dir = "subdir", *test = "subdir/test", *test_lock = "subdir/test.lock"; - int fd; - -#ifndef GIT_WIN32 - cl_skip(); -#endif - - cl_git_pass(p_mkdir(dir, 0666)); - cl_git_mkfile(test, "dummy content"); - fd = p_open(test, O_RDONLY); - cl_assert(fd > 0); - cl_git_pass(git_filebuf_open(&file, test, 0, 0666)); - - cl_git_pass(git_filebuf_printf(&file, "%s\n", "libgit2 rocks")); - - cl_assert_equal_i(true, git_path_exists(test_lock)); - - cl_git_fail(git_filebuf_commit(&file)); - p_close(fd); - - git_filebuf_cleanup(&file); - - cl_assert_equal_i(false, git_path_exists(test_lock)); -} - -void test_core_filebuf__symlink_follow(void) -{ - git_filebuf file = GIT_FILEBUF_INIT; - const char *dir = "linkdir", *source = "linkdir/link"; - -#ifdef GIT_WIN32 - cl_skip(); -#endif - - cl_git_pass(p_mkdir(dir, 0777)); - cl_git_pass(p_symlink("target", source)); - - cl_git_pass(git_filebuf_open(&file, source, 0, 0666)); - cl_git_pass(git_filebuf_printf(&file, "%s\n", "libgit2 rocks")); - - cl_assert_equal_i(true, git_path_exists("linkdir/target.lock")); - - cl_git_pass(git_filebuf_commit(&file)); - cl_assert_equal_i(true, git_path_exists("linkdir/target")); - - git_filebuf_cleanup(&file); - - /* The second time around, the target file does exist */ - cl_git_pass(git_filebuf_open(&file, source, 0, 0666)); - cl_git_pass(git_filebuf_printf(&file, "%s\n", "libgit2 rocks")); - - cl_assert_equal_i(true, git_path_exists("linkdir/target.lock")); - - cl_git_pass(git_filebuf_commit(&file)); - cl_assert_equal_i(true, git_path_exists("linkdir/target")); - - git_filebuf_cleanup(&file); - cl_git_pass(git_futils_rmdir_r(dir, NULL, GIT_RMDIR_REMOVE_FILES)); -} - -void test_core_filebuf__symlink_depth(void) -{ - git_filebuf file = GIT_FILEBUF_INIT; - const char *dir = "linkdir", *source = "linkdir/link"; - -#ifdef GIT_WIN32 - cl_skip(); -#endif - - cl_git_pass(p_mkdir(dir, 0777)); - /* Endless loop */ - cl_git_pass(p_symlink("link", source)); - - cl_git_fail(git_filebuf_open(&file, source, 0, 0666)); - - cl_git_pass(git_futils_rmdir_r(dir, NULL, GIT_RMDIR_REMOVE_FILES)); -} - -void test_core_filebuf__hidden_file(void) -{ -#ifndef GIT_WIN32 - cl_skip(); -#else - git_filebuf file = GIT_FILEBUF_INIT; - char *dir = "hidden", *test = "hidden/test"; - bool hidden; - - cl_git_pass(p_mkdir(dir, 0666)); - cl_git_mkfile(test, "dummy content"); - - cl_git_pass(git_win32__set_hidden(test, true)); - cl_git_pass(git_win32__hidden(&hidden, test)); - cl_assert(hidden); - - cl_git_pass(git_filebuf_open(&file, test, 0, 0666)); - - cl_git_pass(git_filebuf_printf(&file, "%s\n", "libgit2 rocks")); - - cl_git_pass(git_filebuf_commit(&file)); - - git_filebuf_cleanup(&file); -#endif -} - -void test_core_filebuf__detects_directory(void) -{ - git_filebuf file = GIT_FILEBUF_INIT; - - cl_must_pass(p_mkdir("foo", 0777)); - cl_git_fail_with(GIT_EDIRECTORY, git_filebuf_open(&file, "foo", 0, 0666)); - cl_must_pass(p_rmdir("foo")); -} diff --git a/vendor/libgit2/tests/core/ftruncate.c b/vendor/libgit2/tests/core/ftruncate.c deleted file mode 100644 index 2f4729fc2..000000000 --- a/vendor/libgit2/tests/core/ftruncate.c +++ /dev/null @@ -1,48 +0,0 @@ -/** - * Some tests for p_ftruncate() to ensure that - * properly handles large (2Gb+) files. - */ - -#include "clar_libgit2.h" - -static const char *filename = "core_ftruncate.txt"; -static int fd = -1; - -void test_core_ftruncate__initialize(void) -{ - if (!cl_is_env_set("GITTEST_INVASIVE_FS_SIZE")) - cl_skip(); - - cl_must_pass((fd = p_open(filename, O_CREAT | O_RDWR, 0644))); -} - -void test_core_ftruncate__cleanup(void) -{ - if (fd < 0) - return; - - p_close(fd); - fd = 0; - - p_unlink(filename); -} - -static void _extend(git_off_t i64len) -{ - struct stat st; - int error; - - cl_assert((error = p_ftruncate(fd, i64len)) == 0); - cl_assert((error = p_fstat(fd, &st)) == 0); - cl_assert(st.st_size == i64len); -} - -void test_core_ftruncate__2gb(void) -{ - _extend(0x80000001); -} - -void test_core_ftruncate__4gb(void) -{ - _extend(0x100000001); -} diff --git a/vendor/libgit2/tests/core/futils.c b/vendor/libgit2/tests/core/futils.c deleted file mode 100644 index e7f7154ed..000000000 --- a/vendor/libgit2/tests/core/futils.c +++ /dev/null @@ -1,68 +0,0 @@ -#include "clar_libgit2.h" -#include "fileops.h" - -// Fixture setup and teardown -void test_core_futils__initialize(void) -{ - cl_must_pass(p_mkdir("futils", 0777)); -} - -void test_core_futils__cleanup(void) -{ - cl_fixture_cleanup("futils"); -} - -void test_core_futils__writebuffer(void) -{ - git_buf out = GIT_BUF_INIT, - append = GIT_BUF_INIT; - - /* create a new file */ - git_buf_puts(&out, "hello!\n"); - git_buf_printf(&out, "this is a %s\n", "test"); - - cl_git_pass(git_futils_writebuffer(&out, "futils/test-file", O_RDWR|O_CREAT, 0666)); - - cl_assert_equal_file(out.ptr, out.size, "futils/test-file"); - - /* append some more data */ - git_buf_puts(&append, "And some more!\n"); - git_buf_put(&out, append.ptr, append.size); - - cl_git_pass(git_futils_writebuffer(&append, "futils/test-file", O_RDWR|O_APPEND, 0666)); - - cl_assert_equal_file(out.ptr, out.size, "futils/test-file"); - - git_buf_free(&out); - git_buf_free(&append); -} - -void test_core_futils__write_hidden_file(void) -{ -#ifndef GIT_WIN32 - cl_skip(); -#else - git_buf out = GIT_BUF_INIT, append = GIT_BUF_INIT; - bool hidden; - - git_buf_puts(&out, "hidden file.\n"); - git_futils_writebuffer(&out, "futils/test-file", O_RDWR | O_CREAT, 0666); - - cl_git_pass(git_win32__set_hidden("futils/test-file", true)); - - /* append some more data */ - git_buf_puts(&append, "And some more!\n"); - git_buf_put(&out, append.ptr, append.size); - - cl_git_pass(git_futils_writebuffer(&append, "futils/test-file", O_RDWR | O_APPEND, 0666)); - - cl_assert_equal_file(out.ptr, out.size, "futils/test-file"); - - cl_git_pass(git_win32__hidden(&hidden, "futils/test-file")); - cl_assert(hidden); - - git_buf_free(&out); - git_buf_free(&append); -#endif -} - diff --git a/vendor/libgit2/tests/core/hex.c b/vendor/libgit2/tests/core/hex.c deleted file mode 100644 index 930af1670..000000000 --- a/vendor/libgit2/tests/core/hex.c +++ /dev/null @@ -1,22 +0,0 @@ -#include "clar_libgit2.h" -#include "util.h" - -void test_core_hex__fromhex(void) -{ - /* Passing cases */ - cl_assert(git__fromhex('0') == 0x0); - cl_assert(git__fromhex('1') == 0x1); - cl_assert(git__fromhex('3') == 0x3); - cl_assert(git__fromhex('9') == 0x9); - cl_assert(git__fromhex('A') == 0xa); - cl_assert(git__fromhex('C') == 0xc); - cl_assert(git__fromhex('F') == 0xf); - cl_assert(git__fromhex('a') == 0xa); - cl_assert(git__fromhex('c') == 0xc); - cl_assert(git__fromhex('f') == 0xf); - - /* Failing cases */ - cl_assert(git__fromhex('g') == -1); - cl_assert(git__fromhex('z') == -1); - cl_assert(git__fromhex('X') == -1); -} diff --git a/vendor/libgit2/tests/core/iconv.c b/vendor/libgit2/tests/core/iconv.c deleted file mode 100644 index 498094bdb..000000000 --- a/vendor/libgit2/tests/core/iconv.c +++ /dev/null @@ -1,78 +0,0 @@ -#include "clar_libgit2.h" -#include "path.h" - -#ifdef GIT_USE_ICONV -static git_path_iconv_t ic; -static char *nfc = "\xC3\x85\x73\x74\x72\xC3\xB6\x6D"; -static char *nfd = "\x41\xCC\x8A\x73\x74\x72\x6F\xCC\x88\x6D"; -#endif - -void test_core_iconv__initialize(void) -{ -#ifdef GIT_USE_ICONV - cl_git_pass(git_path_iconv_init_precompose(&ic)); -#endif -} - -void test_core_iconv__cleanup(void) -{ -#ifdef GIT_USE_ICONV - git_path_iconv_clear(&ic); -#endif -} - -void test_core_iconv__unchanged(void) -{ -#ifdef GIT_USE_ICONV - const char *data = "Ascii data", *original = data; - size_t datalen = strlen(data); - - cl_git_pass(git_path_iconv(&ic, &data, &datalen)); - GIT_UNUSED(datalen); - - /* There are no high bits set, so this should leave data untouched */ - cl_assert(data == original); -#endif -} - -void test_core_iconv__decomposed_to_precomposed(void) -{ -#ifdef GIT_USE_ICONV - const char *data = nfd; - size_t datalen, nfdlen = strlen(nfd); - - datalen = nfdlen; - cl_git_pass(git_path_iconv(&ic, &data, &datalen)); - GIT_UNUSED(datalen); - - /* The decomposed nfd string should be transformed to the nfc form - * (on platforms where iconv is enabled, of course). - */ - cl_assert_equal_s(nfc, data); - - /* should be able to do it multiple times with the same git_path_iconv_t */ - data = nfd; datalen = nfdlen; - cl_git_pass(git_path_iconv(&ic, &data, &datalen)); - cl_assert_equal_s(nfc, data); - - data = nfd; datalen = nfdlen; - cl_git_pass(git_path_iconv(&ic, &data, &datalen)); - cl_assert_equal_s(nfc, data); -#endif -} - -void test_core_iconv__precomposed_is_unmodified(void) -{ -#ifdef GIT_USE_ICONV - const char *data = nfc; - size_t datalen = strlen(nfc); - - cl_git_pass(git_path_iconv(&ic, &data, &datalen)); - GIT_UNUSED(datalen); - - /* data is already in precomposed form, so even though some bytes have - * the high-bit set, the iconv transform should result in no change. - */ - cl_assert_equal_s(nfc, data); -#endif -} diff --git a/vendor/libgit2/tests/core/init.c b/vendor/libgit2/tests/core/init.c deleted file mode 100644 index e17b7845f..000000000 --- a/vendor/libgit2/tests/core/init.c +++ /dev/null @@ -1,14 +0,0 @@ -#include "clar_libgit2.h" - -void test_core_init__returns_count(void) -{ - /* libgit2_clar initializes us first, so we have an existing - * initialization. - */ - cl_assert_equal_i(2, git_libgit2_init()); - cl_assert_equal_i(3, git_libgit2_init()); - - cl_assert_equal_i(2, git_libgit2_shutdown()); - cl_assert_equal_i(1, git_libgit2_shutdown()); -} - diff --git a/vendor/libgit2/tests/core/link.c b/vendor/libgit2/tests/core/link.c deleted file mode 100644 index ec85ec4e0..000000000 --- a/vendor/libgit2/tests/core/link.c +++ /dev/null @@ -1,632 +0,0 @@ -#include "clar_libgit2.h" -#include "posix.h" -#include "buffer.h" -#include "path.h" - -#ifdef GIT_WIN32 -# include "win32/reparse.h" -#endif - -void test_core_link__cleanup(void) -{ -#ifdef GIT_WIN32 - RemoveDirectory("lstat_junction"); - RemoveDirectory("lstat_dangling"); - RemoveDirectory("lstat_dangling_dir"); - RemoveDirectory("lstat_dangling_junction"); - - RemoveDirectory("stat_junction"); - RemoveDirectory("stat_dangling"); - RemoveDirectory("stat_dangling_dir"); - RemoveDirectory("stat_dangling_junction"); -#endif -} - -#ifdef GIT_WIN32 -static bool should_run(void) -{ - static SID_IDENTIFIER_AUTHORITY authority = { SECURITY_NT_AUTHORITY }; - PSID admin_sid; - BOOL is_admin; - - cl_win32_pass(AllocateAndInitializeSid(&authority, 2, SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0, &admin_sid)); - cl_win32_pass(CheckTokenMembership(NULL, admin_sid, &is_admin)); - FreeSid(admin_sid); - - return is_admin ? true : false; -} -#else -static bool should_run(void) -{ - return true; -} -#endif - -static void do_symlink(const char *old, const char *new, int is_dir) -{ -#ifndef GIT_WIN32 - GIT_UNUSED(is_dir); - - cl_must_pass(symlink(old, new)); -#else - typedef DWORD (WINAPI *create_symlink_func)(LPCTSTR, LPCTSTR, DWORD); - HMODULE module; - create_symlink_func pCreateSymbolicLink; - - cl_assert(module = GetModuleHandle("kernel32")); - cl_assert(pCreateSymbolicLink = (create_symlink_func)GetProcAddress(module, "CreateSymbolicLinkA")); - - cl_win32_pass(pCreateSymbolicLink(new, old, is_dir)); -#endif -} - -static void do_hardlink(const char *old, const char *new) -{ -#ifndef GIT_WIN32 - cl_must_pass(link(old, new)); -#else - typedef DWORD (WINAPI *create_hardlink_func)(LPCTSTR, LPCTSTR, LPSECURITY_ATTRIBUTES); - HMODULE module; - create_hardlink_func pCreateHardLink; - - cl_assert(module = GetModuleHandle("kernel32")); - cl_assert(pCreateHardLink = (create_hardlink_func)GetProcAddress(module, "CreateHardLinkA")); - - cl_win32_pass(pCreateHardLink(new, old, 0)); -#endif -} - -#ifdef GIT_WIN32 - -static void do_junction(const char *old, const char *new) -{ - GIT_REPARSE_DATA_BUFFER *reparse_buf; - HANDLE handle; - git_buf unparsed_buf = GIT_BUF_INIT; - wchar_t *subst_utf16, *print_utf16; - DWORD ioctl_ret; - int subst_utf16_len, subst_byte_len, print_utf16_len, print_byte_len, ret; - USHORT reparse_buflen; - size_t i; - - /* Junction targets must be the unparsed name, starting with \??\, using - * backslashes instead of forward, and end in a trailing backslash. - * eg: \??\C:\Foo\ - */ - git_buf_puts(&unparsed_buf, "\\??\\"); - - for (i = 0; i < strlen(old); i++) - git_buf_putc(&unparsed_buf, old[i] == '/' ? '\\' : old[i]); - - git_buf_putc(&unparsed_buf, '\\'); - - subst_utf16_len = git__utf8_to_16(NULL, 0, git_buf_cstr(&unparsed_buf)); - subst_byte_len = subst_utf16_len * sizeof(WCHAR); - - print_utf16_len = subst_utf16_len - 4; - print_byte_len = subst_byte_len - (4 * sizeof(WCHAR)); - - /* The junction must be an empty directory before the junction attribute - * can be added. - */ - cl_win32_pass(CreateDirectoryA(new, NULL)); - - handle = CreateFileA(new, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, - FILE_FLAG_OPEN_REPARSE_POINT | FILE_FLAG_BACKUP_SEMANTICS, NULL); - cl_win32_pass(handle != INVALID_HANDLE_VALUE); - - reparse_buflen = (USHORT)(REPARSE_DATA_HEADER_SIZE + - REPARSE_DATA_MOUNTPOINT_HEADER_SIZE + - subst_byte_len + sizeof(WCHAR) + - print_byte_len + sizeof(WCHAR)); - - reparse_buf = LocalAlloc(LMEM_FIXED|LMEM_ZEROINIT, reparse_buflen); - cl_assert(reparse_buf); - - subst_utf16 = reparse_buf->MountPointReparseBuffer.PathBuffer; - print_utf16 = subst_utf16 + subst_utf16_len + 1; - - ret = git__utf8_to_16(subst_utf16, subst_utf16_len + 1, - git_buf_cstr(&unparsed_buf)); - cl_assert_equal_i(subst_utf16_len, ret); - - ret = git__utf8_to_16(print_utf16, - print_utf16_len + 1, git_buf_cstr(&unparsed_buf) + 4); - cl_assert_equal_i(print_utf16_len, ret); - - reparse_buf->ReparseTag = IO_REPARSE_TAG_MOUNT_POINT; - reparse_buf->MountPointReparseBuffer.SubstituteNameOffset = 0; - reparse_buf->MountPointReparseBuffer.SubstituteNameLength = subst_byte_len; - reparse_buf->MountPointReparseBuffer.PrintNameOffset = (USHORT)(subst_byte_len + sizeof(WCHAR)); - reparse_buf->MountPointReparseBuffer.PrintNameLength = print_byte_len; - reparse_buf->ReparseDataLength = reparse_buflen - REPARSE_DATA_HEADER_SIZE; - - cl_win32_pass(DeviceIoControl(handle, FSCTL_SET_REPARSE_POINT, - reparse_buf, reparse_buflen, NULL, 0, &ioctl_ret, NULL)); - - CloseHandle(handle); - LocalFree(reparse_buf); - - git_buf_free(&unparsed_buf); -} - -static void do_custom_reparse(const char *path) -{ - REPARSE_GUID_DATA_BUFFER *reparse_buf; - HANDLE handle; - DWORD ioctl_ret; - - const char *reparse_data = "Reparse points are silly."; - size_t reparse_buflen = REPARSE_GUID_DATA_BUFFER_HEADER_SIZE + - strlen(reparse_data) + 1; - - reparse_buf = LocalAlloc(LMEM_FIXED|LMEM_ZEROINIT, reparse_buflen); - cl_assert(reparse_buf); - - reparse_buf->ReparseTag = 42; - reparse_buf->ReparseDataLength = (WORD)(strlen(reparse_data) + 1); - - reparse_buf->ReparseGuid.Data1 = 0xdeadbeef; - reparse_buf->ReparseGuid.Data2 = 0xdead; - reparse_buf->ReparseGuid.Data3 = 0xbeef; - reparse_buf->ReparseGuid.Data4[0] = 42; - reparse_buf->ReparseGuid.Data4[1] = 42; - reparse_buf->ReparseGuid.Data4[2] = 42; - reparse_buf->ReparseGuid.Data4[3] = 42; - reparse_buf->ReparseGuid.Data4[4] = 42; - reparse_buf->ReparseGuid.Data4[5] = 42; - reparse_buf->ReparseGuid.Data4[6] = 42; - reparse_buf->ReparseGuid.Data4[7] = 42; - reparse_buf->ReparseGuid.Data4[8] = 42; - - memcpy(reparse_buf->GenericReparseBuffer.DataBuffer, - reparse_data, strlen(reparse_data) + 1); - - handle = CreateFileA(path, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, - FILE_FLAG_OPEN_REPARSE_POINT | FILE_FLAG_BACKUP_SEMANTICS, NULL); - cl_win32_pass(handle != INVALID_HANDLE_VALUE); - - cl_win32_pass(DeviceIoControl(handle, FSCTL_SET_REPARSE_POINT, - reparse_buf, - reparse_buf->ReparseDataLength + REPARSE_GUID_DATA_BUFFER_HEADER_SIZE, - NULL, 0, &ioctl_ret, NULL)); - - CloseHandle(handle); - LocalFree(reparse_buf); -} - -#endif - -void test_core_link__stat_regular_file(void) -{ - struct stat st; - - cl_git_rewritefile("stat_regfile", "This is a regular file!\n"); - - cl_must_pass(p_stat("stat_regfile", &st)); - cl_assert(S_ISREG(st.st_mode)); - cl_assert_equal_i(24, st.st_size); -} - -void test_core_link__lstat_regular_file(void) -{ - struct stat st; - - cl_git_rewritefile("lstat_regfile", "This is a regular file!\n"); - - cl_must_pass(p_stat("lstat_regfile", &st)); - cl_assert(S_ISREG(st.st_mode)); - cl_assert_equal_i(24, st.st_size); -} - -void test_core_link__stat_symlink(void) -{ - struct stat st; - - if (!should_run()) - clar__skip(); - - cl_git_rewritefile("stat_target", "This is the target of a symbolic link.\n"); - do_symlink("stat_target", "stat_symlink", 0); - - cl_must_pass(p_stat("stat_target", &st)); - cl_assert(S_ISREG(st.st_mode)); - cl_assert_equal_i(39, st.st_size); - - cl_must_pass(p_stat("stat_symlink", &st)); - cl_assert(S_ISREG(st.st_mode)); - cl_assert_equal_i(39, st.st_size); -} - -void test_core_link__stat_symlink_directory(void) -{ - struct stat st; - - if (!should_run()) - clar__skip(); - - p_mkdir("stat_dirtarget", 0777); - do_symlink("stat_dirtarget", "stat_dirlink", 1); - - cl_must_pass(p_stat("stat_dirtarget", &st)); - cl_assert(S_ISDIR(st.st_mode)); - - cl_must_pass(p_stat("stat_dirlink", &st)); - cl_assert(S_ISDIR(st.st_mode)); -} - -void test_core_link__stat_symlink_chain(void) -{ - struct stat st; - - if (!should_run()) - clar__skip(); - - cl_git_rewritefile("stat_final_target", "Final target of some symbolic links...\n"); - do_symlink("stat_final_target", "stat_chain_3", 0); - do_symlink("stat_chain_3", "stat_chain_2", 0); - do_symlink("stat_chain_2", "stat_chain_1", 0); - - cl_must_pass(p_stat("stat_chain_1", &st)); - cl_assert(S_ISREG(st.st_mode)); - cl_assert_equal_i(39, st.st_size); -} - -void test_core_link__stat_dangling_symlink(void) -{ - struct stat st; - - if (!should_run()) - clar__skip(); - - do_symlink("stat_nonexistent", "stat_dangling", 0); - - cl_must_fail(p_stat("stat_nonexistent", &st)); - cl_must_fail(p_stat("stat_dangling", &st)); -} - -void test_core_link__stat_dangling_symlink_directory(void) -{ - struct stat st; - - if (!should_run()) - clar__skip(); - - do_symlink("stat_nonexistent", "stat_dangling_dir", 1); - - cl_must_fail(p_stat("stat_nonexistent_dir", &st)); - cl_must_fail(p_stat("stat_dangling", &st)); -} - -void test_core_link__lstat_symlink(void) -{ - git_buf target_path = GIT_BUF_INIT; - struct stat st; - - if (!should_run()) - clar__skip(); - - /* Windows always writes the canonical path as the link target, so - * write the full path on all platforms. - */ - git_buf_join(&target_path, '/', clar_sandbox_path(), "lstat_target"); - - cl_git_rewritefile("lstat_target", "This is the target of a symbolic link.\n"); - do_symlink(git_buf_cstr(&target_path), "lstat_symlink", 0); - - cl_must_pass(p_lstat("lstat_target", &st)); - cl_assert(S_ISREG(st.st_mode)); - cl_assert_equal_i(39, st.st_size); - - cl_must_pass(p_lstat("lstat_symlink", &st)); - cl_assert(S_ISLNK(st.st_mode)); - cl_assert_equal_i(git_buf_len(&target_path), st.st_size); - - git_buf_free(&target_path); -} - -void test_core_link__lstat_symlink_directory(void) -{ - git_buf target_path = GIT_BUF_INIT; - struct stat st; - - if (!should_run()) - clar__skip(); - - git_buf_join(&target_path, '/', clar_sandbox_path(), "lstat_dirtarget"); - - p_mkdir("lstat_dirtarget", 0777); - do_symlink(git_buf_cstr(&target_path), "lstat_dirlink", 1); - - cl_must_pass(p_lstat("lstat_dirtarget", &st)); - cl_assert(S_ISDIR(st.st_mode)); - - cl_must_pass(p_lstat("lstat_dirlink", &st)); - cl_assert(S_ISLNK(st.st_mode)); - cl_assert_equal_i(git_buf_len(&target_path), st.st_size); - - git_buf_free(&target_path); -} - -void test_core_link__lstat_dangling_symlink(void) -{ - struct stat st; - - if (!should_run()) - clar__skip(); - - do_symlink("lstat_nonexistent", "lstat_dangling", 0); - - cl_must_fail(p_lstat("lstat_nonexistent", &st)); - - cl_must_pass(p_lstat("lstat_dangling", &st)); - cl_assert(S_ISLNK(st.st_mode)); - cl_assert_equal_i(strlen("lstat_nonexistent"), st.st_size); -} - -void test_core_link__lstat_dangling_symlink_directory(void) -{ - struct stat st; - - if (!should_run()) - clar__skip(); - - do_symlink("lstat_nonexistent", "lstat_dangling_dir", 1); - - cl_must_fail(p_lstat("lstat_nonexistent", &st)); - - cl_must_pass(p_lstat("lstat_dangling_dir", &st)); - cl_assert(S_ISLNK(st.st_mode)); - cl_assert_equal_i(strlen("lstat_nonexistent"), st.st_size); -} - -void test_core_link__stat_junction(void) -{ -#ifdef GIT_WIN32 - git_buf target_path = GIT_BUF_INIT; - struct stat st; - - git_buf_join(&target_path, '/', clar_sandbox_path(), "stat_junctarget"); - - p_mkdir("stat_junctarget", 0777); - do_junction(git_buf_cstr(&target_path), "stat_junction"); - - cl_must_pass(p_stat("stat_junctarget", &st)); - cl_assert(S_ISDIR(st.st_mode)); - - cl_must_pass(p_stat("stat_junction", &st)); - cl_assert(S_ISDIR(st.st_mode)); - - git_buf_free(&target_path); -#endif -} - -void test_core_link__stat_dangling_junction(void) -{ -#ifdef GIT_WIN32 - git_buf target_path = GIT_BUF_INIT; - struct stat st; - - git_buf_join(&target_path, '/', clar_sandbox_path(), "stat_nonexistent_junctarget"); - - p_mkdir("stat_nonexistent_junctarget", 0777); - do_junction(git_buf_cstr(&target_path), "stat_dangling_junction"); - - RemoveDirectory("stat_nonexistent_junctarget"); - - cl_must_fail(p_stat("stat_nonexistent_junctarget", &st)); - cl_must_fail(p_stat("stat_dangling_junction", &st)); - - git_buf_free(&target_path); -#endif -} - -void test_core_link__lstat_junction(void) -{ -#ifdef GIT_WIN32 - git_buf target_path = GIT_BUF_INIT; - struct stat st; - - git_buf_join(&target_path, '/', clar_sandbox_path(), "lstat_junctarget"); - - p_mkdir("lstat_junctarget", 0777); - do_junction(git_buf_cstr(&target_path), "lstat_junction"); - - cl_must_pass(p_lstat("lstat_junctarget", &st)); - cl_assert(S_ISDIR(st.st_mode)); - - cl_must_pass(p_lstat("lstat_junction", &st)); - cl_assert(S_ISLNK(st.st_mode)); - - git_buf_free(&target_path); -#endif -} - -void test_core_link__lstat_dangling_junction(void) -{ -#ifdef GIT_WIN32 - git_buf target_path = GIT_BUF_INIT; - struct stat st; - - git_buf_join(&target_path, '/', clar_sandbox_path(), "lstat_nonexistent_junctarget"); - - p_mkdir("lstat_nonexistent_junctarget", 0777); - do_junction(git_buf_cstr(&target_path), "lstat_dangling_junction"); - - RemoveDirectory("lstat_nonexistent_junctarget"); - - cl_must_fail(p_lstat("lstat_nonexistent_junctarget", &st)); - - cl_must_pass(p_lstat("lstat_dangling_junction", &st)); - cl_assert(S_ISLNK(st.st_mode)); - cl_assert_equal_i(git_buf_len(&target_path), st.st_size); - - git_buf_free(&target_path); -#endif -} - -void test_core_link__stat_hardlink(void) -{ - struct stat st; - - if (!should_run()) - clar__skip(); - - cl_git_rewritefile("stat_hardlink1", "This file has many names!\n"); - do_hardlink("stat_hardlink1", "stat_hardlink2"); - - cl_must_pass(p_stat("stat_hardlink1", &st)); - cl_assert(S_ISREG(st.st_mode)); - cl_assert_equal_i(26, st.st_size); - - cl_must_pass(p_stat("stat_hardlink2", &st)); - cl_assert(S_ISREG(st.st_mode)); - cl_assert_equal_i(26, st.st_size); -} - -void test_core_link__lstat_hardlink(void) -{ - struct stat st; - - if (!should_run()) - clar__skip(); - - cl_git_rewritefile("lstat_hardlink1", "This file has many names!\n"); - do_hardlink("lstat_hardlink1", "lstat_hardlink2"); - - cl_must_pass(p_lstat("lstat_hardlink1", &st)); - cl_assert(S_ISREG(st.st_mode)); - cl_assert_equal_i(26, st.st_size); - - cl_must_pass(p_lstat("lstat_hardlink2", &st)); - cl_assert(S_ISREG(st.st_mode)); - cl_assert_equal_i(26, st.st_size); -} - -void test_core_link__stat_reparse_point(void) -{ -#ifdef GIT_WIN32 - struct stat st; - - /* Generic reparse points should be treated as regular files, only - * symlinks and junctions should be treated as links. - */ - - cl_git_rewritefile("stat_reparse", "This is a reparse point!\n"); - do_custom_reparse("stat_reparse"); - - cl_must_pass(p_lstat("stat_reparse", &st)); - cl_assert(S_ISREG(st.st_mode)); - cl_assert_equal_i(25, st.st_size); -#endif -} - -void test_core_link__lstat_reparse_point(void) -{ -#ifdef GIT_WIN32 - struct stat st; - - cl_git_rewritefile("lstat_reparse", "This is a reparse point!\n"); - do_custom_reparse("lstat_reparse"); - - cl_must_pass(p_lstat("lstat_reparse", &st)); - cl_assert(S_ISREG(st.st_mode)); - cl_assert_equal_i(25, st.st_size); -#endif -} - -void test_core_link__readlink_nonexistent_file(void) -{ - char buf[2048]; - - cl_must_fail(p_readlink("readlink_nonexistent", buf, 2048)); - cl_assert_equal_i(ENOENT, errno); -} - -void test_core_link__readlink_normal_file(void) -{ - char buf[2048]; - - cl_git_rewritefile("readlink_regfile", "This is a regular file!\n"); - cl_must_fail(p_readlink("readlink_regfile", buf, 2048)); - cl_assert_equal_i(EINVAL, errno); -} - -void test_core_link__readlink_symlink(void) -{ - git_buf target_path = GIT_BUF_INIT; - int len; - char buf[2048]; - - if (!should_run()) - clar__skip(); - - git_buf_join(&target_path, '/', clar_sandbox_path(), "readlink_target"); - - cl_git_rewritefile("readlink_target", "This is the target of a symlink\n"); - do_symlink(git_buf_cstr(&target_path), "readlink_link", 0); - - len = p_readlink("readlink_link", buf, 2048); - cl_must_pass(len); - - buf[len] = 0; - - cl_assert_equal_s(git_buf_cstr(&target_path), buf); - - git_buf_free(&target_path); -} - -void test_core_link__readlink_dangling(void) -{ - git_buf target_path = GIT_BUF_INIT; - int len; - char buf[2048]; - - if (!should_run()) - clar__skip(); - - git_buf_join(&target_path, '/', clar_sandbox_path(), "readlink_nonexistent"); - - do_symlink(git_buf_cstr(&target_path), "readlink_dangling", 0); - - len = p_readlink("readlink_dangling", buf, 2048); - cl_must_pass(len); - - buf[len] = 0; - - cl_assert_equal_s(git_buf_cstr(&target_path), buf); - - git_buf_free(&target_path); -} - -void test_core_link__readlink_multiple(void) -{ - git_buf target_path = GIT_BUF_INIT, - path3 = GIT_BUF_INIT, path2 = GIT_BUF_INIT, path1 = GIT_BUF_INIT; - int len; - char buf[2048]; - - if (!should_run()) - clar__skip(); - - git_buf_join(&target_path, '/', clar_sandbox_path(), "readlink_final"); - git_buf_join(&path3, '/', clar_sandbox_path(), "readlink_3"); - git_buf_join(&path2, '/', clar_sandbox_path(), "readlink_2"); - git_buf_join(&path1, '/', clar_sandbox_path(), "readlink_1"); - - do_symlink(git_buf_cstr(&target_path), git_buf_cstr(&path3), 0); - do_symlink(git_buf_cstr(&path3), git_buf_cstr(&path2), 0); - do_symlink(git_buf_cstr(&path2), git_buf_cstr(&path1), 0); - - len = p_readlink("readlink_1", buf, 2048); - cl_must_pass(len); - - buf[len] = 0; - - cl_assert_equal_s(git_buf_cstr(&path2), buf); - - git_buf_free(&path1); - git_buf_free(&path2); - git_buf_free(&path3); - git_buf_free(&target_path); -} diff --git a/vendor/libgit2/tests/core/mkdir.c b/vendor/libgit2/tests/core/mkdir.c deleted file mode 100644 index 96c972396..000000000 --- a/vendor/libgit2/tests/core/mkdir.c +++ /dev/null @@ -1,291 +0,0 @@ -#include "clar_libgit2.h" -#include "fileops.h" -#include "path.h" -#include "posix.h" - -static void cleanup_basic_dirs(void *ref) -{ - GIT_UNUSED(ref); - git_futils_rmdir_r("d0", NULL, GIT_RMDIR_EMPTY_HIERARCHY); - git_futils_rmdir_r("d1", NULL, GIT_RMDIR_EMPTY_HIERARCHY); - git_futils_rmdir_r("d2", NULL, GIT_RMDIR_EMPTY_HIERARCHY); - git_futils_rmdir_r("d3", NULL, GIT_RMDIR_EMPTY_HIERARCHY); - git_futils_rmdir_r("d4", NULL, GIT_RMDIR_EMPTY_HIERARCHY); -} - -void test_core_mkdir__absolute(void) -{ - git_buf path = GIT_BUF_INIT; - - cl_set_cleanup(cleanup_basic_dirs, NULL); - - git_buf_joinpath(&path, clar_sandbox_path(), "d0"); - - /* make a directory */ - cl_assert(!git_path_isdir(path.ptr)); - cl_git_pass(git_futils_mkdir(path.ptr, 0755, 0)); - cl_assert(git_path_isdir(path.ptr)); - - git_buf_joinpath(&path, path.ptr, "subdir"); - cl_assert(!git_path_isdir(path.ptr)); - cl_git_pass(git_futils_mkdir(path.ptr, 0755, 0)); - cl_assert(git_path_isdir(path.ptr)); - - /* ensure mkdir_r works for a single subdir */ - git_buf_joinpath(&path, path.ptr, "another"); - cl_assert(!git_path_isdir(path.ptr)); - cl_git_pass(git_futils_mkdir_r(path.ptr, 0755)); - cl_assert(git_path_isdir(path.ptr)); - - /* ensure mkdir_r works */ - git_buf_joinpath(&path, clar_sandbox_path(), "d1/foo/bar/asdf"); - cl_assert(!git_path_isdir(path.ptr)); - cl_git_pass(git_futils_mkdir_r(path.ptr, 0755)); - cl_assert(git_path_isdir(path.ptr)); - - /* ensure we don't imply recursive */ - git_buf_joinpath(&path, clar_sandbox_path(), "d2/foo/bar/asdf"); - cl_assert(!git_path_isdir(path.ptr)); - cl_git_fail(git_futils_mkdir(path.ptr, 0755, 0)); - cl_assert(!git_path_isdir(path.ptr)); - - git_buf_free(&path); -} - -void test_core_mkdir__basic(void) -{ - cl_set_cleanup(cleanup_basic_dirs, NULL); - - /* make a directory */ - cl_assert(!git_path_isdir("d0")); - cl_git_pass(git_futils_mkdir("d0", 0755, 0)); - cl_assert(git_path_isdir("d0")); - - /* make a path */ - cl_assert(!git_path_isdir("d1")); - cl_git_pass(git_futils_mkdir("d1/d1.1/d1.2", 0755, GIT_MKDIR_PATH)); - cl_assert(git_path_isdir("d1")); - cl_assert(git_path_isdir("d1/d1.1")); - cl_assert(git_path_isdir("d1/d1.1/d1.2")); - - /* make a dir exclusively */ - cl_assert(!git_path_isdir("d2")); - cl_git_pass(git_futils_mkdir("d2", 0755, GIT_MKDIR_EXCL)); - cl_assert(git_path_isdir("d2")); - - /* make exclusive failure */ - cl_git_fail(git_futils_mkdir("d2", 0755, GIT_MKDIR_EXCL)); - - /* make a path exclusively */ - cl_assert(!git_path_isdir("d3")); - cl_git_pass(git_futils_mkdir("d3/d3.1/d3.2", 0755, GIT_MKDIR_PATH | GIT_MKDIR_EXCL)); - cl_assert(git_path_isdir("d3")); - cl_assert(git_path_isdir("d3/d3.1/d3.2")); - - /* make exclusive path failure */ - cl_git_fail(git_futils_mkdir("d3/d3.1/d3.2", 0755, GIT_MKDIR_PATH | GIT_MKDIR_EXCL)); - /* ??? Should EXCL only apply to the last item in the path? */ - - /* path with trailing slash? */ - cl_assert(!git_path_isdir("d4")); - cl_git_pass(git_futils_mkdir("d4/d4.1/", 0755, GIT_MKDIR_PATH)); - cl_assert(git_path_isdir("d4/d4.1")); -} - -static void cleanup_basedir(void *ref) -{ - GIT_UNUSED(ref); - git_futils_rmdir_r("base", NULL, GIT_RMDIR_EMPTY_HIERARCHY); -} - -void test_core_mkdir__with_base(void) -{ -#define BASEDIR "base/dir/here" - - cl_set_cleanup(cleanup_basedir, NULL); - - cl_git_pass(git_futils_mkdir(BASEDIR, 0755, GIT_MKDIR_PATH)); - - cl_git_pass(git_futils_mkdir_relative("a", BASEDIR, 0755, 0, NULL)); - cl_assert(git_path_isdir(BASEDIR "/a")); - - cl_git_pass(git_futils_mkdir_relative("b/b1/b2", BASEDIR, 0755, GIT_MKDIR_PATH, NULL)); - cl_assert(git_path_isdir(BASEDIR "/b/b1/b2")); - - /* exclusive with existing base */ - cl_git_pass(git_futils_mkdir_relative("c/c1/c2", BASEDIR, 0755, GIT_MKDIR_PATH | GIT_MKDIR_EXCL, NULL)); - - /* fail: exclusive with duplicated suffix */ - cl_git_fail(git_futils_mkdir_relative("c/c1/c3", BASEDIR, 0755, GIT_MKDIR_PATH | GIT_MKDIR_EXCL, NULL)); - - /* fail: exclusive with any duplicated component */ - cl_git_fail(git_futils_mkdir_relative("c/cz/cz", BASEDIR, 0755, GIT_MKDIR_PATH | GIT_MKDIR_EXCL, NULL)); - - /* success: exclusive without path */ - cl_git_pass(git_futils_mkdir_relative("c/c1/c3", BASEDIR, 0755, GIT_MKDIR_EXCL, NULL)); - - /* path with shorter base and existing dirs */ - cl_git_pass(git_futils_mkdir_relative("dir/here/d/", "base", 0755, GIT_MKDIR_PATH, NULL)); - cl_assert(git_path_isdir("base/dir/here/d")); - - /* fail: path with shorter base and existing dirs */ - cl_git_fail(git_futils_mkdir_relative("dir/here/e/", "base", 0755, GIT_MKDIR_PATH | GIT_MKDIR_EXCL, NULL)); - - /* fail: base with missing components */ - cl_git_fail(git_futils_mkdir_relative("f/", "base/missing", 0755, GIT_MKDIR_PATH, NULL)); - - /* success: shift missing component to path */ - cl_git_pass(git_futils_mkdir_relative("missing/f/", "base/", 0755, GIT_MKDIR_PATH, NULL)); -} - -static void cleanup_chmod_root(void *ref) -{ - mode_t *mode = ref; - - if (mode != NULL) { - (void)p_umask(*mode); - git__free(mode); - } - - git_futils_rmdir_r("r", NULL, GIT_RMDIR_EMPTY_HIERARCHY); -} - -#define check_mode(X,A) check_mode_at_line((X), (A), __FILE__, __LINE__) - -static void check_mode_at_line( - mode_t expected, mode_t actual, const char *file, int line) -{ - /* FAT filesystems don't support exec bit, nor group/world bits */ - if (!cl_is_chmod_supported()) { - expected &= 0600; - actual &= 0600; - } - - clar__assert_equal( - file, line, "expected_mode != actual_mode", 1, - "%07o", (int)expected, (int)(actual & 0777)); -} - -void test_core_mkdir__chmods(void) -{ - struct stat st; - mode_t *old = git__malloc(sizeof(mode_t)); - *old = p_umask(022); - - cl_set_cleanup(cleanup_chmod_root, old); - - cl_git_pass(git_futils_mkdir("r", 0777, 0)); - - cl_git_pass(git_futils_mkdir_relative("mode/is/important", "r", 0777, GIT_MKDIR_PATH, NULL)); - - cl_git_pass(git_path_lstat("r/mode", &st)); - check_mode(0755, st.st_mode); - cl_git_pass(git_path_lstat("r/mode/is", &st)); - check_mode(0755, st.st_mode); - cl_git_pass(git_path_lstat("r/mode/is/important", &st)); - check_mode(0755, st.st_mode); - - cl_git_pass(git_futils_mkdir_relative("mode2/is2/important2", "r", 0777, GIT_MKDIR_PATH | GIT_MKDIR_CHMOD, NULL)); - - cl_git_pass(git_path_lstat("r/mode2", &st)); - check_mode(0755, st.st_mode); - cl_git_pass(git_path_lstat("r/mode2/is2", &st)); - check_mode(0755, st.st_mode); - cl_git_pass(git_path_lstat("r/mode2/is2/important2", &st)); - check_mode(0777, st.st_mode); - - cl_git_pass(git_futils_mkdir_relative("mode3/is3/important3", "r", 0777, GIT_MKDIR_PATH | GIT_MKDIR_CHMOD_PATH, NULL)); - - cl_git_pass(git_path_lstat("r/mode3", &st)); - check_mode(0777, st.st_mode); - cl_git_pass(git_path_lstat("r/mode3/is3", &st)); - check_mode(0777, st.st_mode); - cl_git_pass(git_path_lstat("r/mode3/is3/important3", &st)); - check_mode(0777, st.st_mode); - - /* test that we chmod existing dir */ - - cl_git_pass(git_futils_mkdir_relative("mode/is/important", "r", 0777, GIT_MKDIR_PATH | GIT_MKDIR_CHMOD, NULL)); - - cl_git_pass(git_path_lstat("r/mode", &st)); - check_mode(0755, st.st_mode); - cl_git_pass(git_path_lstat("r/mode/is", &st)); - check_mode(0755, st.st_mode); - cl_git_pass(git_path_lstat("r/mode/is/important", &st)); - check_mode(0777, st.st_mode); - - /* test that we chmod even existing dirs if CHMOD_PATH is set */ - - cl_git_pass(git_futils_mkdir_relative("mode2/is2/important2.1", "r", 0777, GIT_MKDIR_PATH | GIT_MKDIR_CHMOD_PATH, NULL)); - - cl_git_pass(git_path_lstat("r/mode2", &st)); - check_mode(0777, st.st_mode); - cl_git_pass(git_path_lstat("r/mode2/is2", &st)); - check_mode(0777, st.st_mode); - cl_git_pass(git_path_lstat("r/mode2/is2/important2.1", &st)); - check_mode(0777, st.st_mode); -} - -void test_core_mkdir__keeps_parent_symlinks(void) -{ -#ifndef GIT_WIN32 - git_buf path = GIT_BUF_INIT; - - cl_set_cleanup(cleanup_basic_dirs, NULL); - - /* make a directory */ - cl_assert(!git_path_isdir("d0")); - cl_git_pass(git_futils_mkdir("d0", 0755, 0)); - cl_assert(git_path_isdir("d0")); - - cl_must_pass(symlink("d0", "d1")); - cl_assert(git_path_islink("d1")); - - cl_git_pass(git_futils_mkdir("d1/foo/bar", 0755, GIT_MKDIR_PATH|GIT_MKDIR_REMOVE_SYMLINKS)); - cl_assert(git_path_islink("d1")); - cl_assert(git_path_isdir("d1/foo/bar")); - cl_assert(git_path_isdir("d0/foo/bar")); - - cl_must_pass(symlink("d0", "d2")); - cl_assert(git_path_islink("d2")); - - git_buf_joinpath(&path, clar_sandbox_path(), "d2/other/dir"); - - cl_git_pass(git_futils_mkdir(path.ptr, 0755, GIT_MKDIR_PATH|GIT_MKDIR_REMOVE_SYMLINKS)); - cl_assert(git_path_islink("d2")); - cl_assert(git_path_isdir("d2/other/dir")); - cl_assert(git_path_isdir("d0/other/dir")); - - git_buf_free(&path); -#endif -} - -void test_core_mkdir__mkdir_path_inside_unwriteable_parent(void) -{ - struct stat st; - mode_t *old; - - /* FAT filesystems don't support exec bit, nor group/world bits */ - if (!cl_is_chmod_supported()) - return; - - cl_assert((old = git__malloc(sizeof(mode_t))) != NULL); - *old = p_umask(022); - cl_set_cleanup(cleanup_chmod_root, old); - - cl_git_pass(git_futils_mkdir("r", 0777, 0)); - cl_git_pass(git_futils_mkdir_relative("mode/is/important", "r", 0777, GIT_MKDIR_PATH, NULL)); - cl_git_pass(git_path_lstat("r/mode", &st)); - check_mode(0755, st.st_mode); - - cl_must_pass(p_chmod("r/mode", 0111)); - cl_git_pass(git_path_lstat("r/mode", &st)); - check_mode(0111, st.st_mode); - - cl_git_pass( - git_futils_mkdir_relative("mode/is/okay/inside", "r", 0777, GIT_MKDIR_PATH, NULL)); - cl_git_pass(git_path_lstat("r/mode/is/okay/inside", &st)); - check_mode(0755, st.st_mode); - - cl_must_pass(p_chmod("r/mode", 0777)); -} diff --git a/vendor/libgit2/tests/core/oid.c b/vendor/libgit2/tests/core/oid.c deleted file mode 100644 index 7ee6fb67d..000000000 --- a/vendor/libgit2/tests/core/oid.c +++ /dev/null @@ -1,70 +0,0 @@ -#include "clar_libgit2.h" - -static git_oid id; -static git_oid idp; -static git_oid idm; -const char *str_oid = "ae90f12eea699729ed24555e40b9fd669da12a12"; -const char *str_oid_p = "ae90f12eea699729ed"; -const char *str_oid_m = "ae90f12eea699729ed24555e40b9fd669da12a12THIS IS EXTRA TEXT THAT SHOULD GET IGNORED"; - -void test_core_oid__initialize(void) -{ - cl_git_pass(git_oid_fromstr(&id, str_oid)); - cl_git_pass(git_oid_fromstrp(&idp, str_oid_p)); - cl_git_fail(git_oid_fromstrp(&idm, str_oid_m)); -} - -void test_core_oid__streq(void) -{ - cl_assert_equal_i(0, git_oid_streq(&id, str_oid)); - cl_assert_equal_i(-1, git_oid_streq(&id, "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef")); - - cl_assert_equal_i(-1, git_oid_streq(&id, "deadbeef")); - cl_assert_equal_i(-1, git_oid_streq(&id, "I'm not an oid.... :)")); - - cl_assert_equal_i(0, git_oid_streq(&idp, "ae90f12eea699729ed0000000000000000000000")); - cl_assert_equal_i(0, git_oid_streq(&idp, "ae90f12eea699729ed")); - cl_assert_equal_i(-1, git_oid_streq(&idp, "ae90f12eea699729ed1")); - cl_assert_equal_i(-1, git_oid_streq(&idp, "ae90f12eea699729ec")); - cl_assert_equal_i(-1, git_oid_streq(&idp, "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef")); - - cl_assert_equal_i(-1, git_oid_streq(&idp, "deadbeef")); - cl_assert_equal_i(-1, git_oid_streq(&idp, "I'm not an oid.... :)")); -} - -void test_core_oid__strcmp(void) -{ - cl_assert_equal_i(0, git_oid_strcmp(&id, str_oid)); - cl_assert(git_oid_strcmp(&id, "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef") < 0); - - cl_assert(git_oid_strcmp(&id, "deadbeef") < 0); - cl_assert_equal_i(-1, git_oid_strcmp(&id, "I'm not an oid.... :)")); - - cl_assert_equal_i(0, git_oid_strcmp(&idp, "ae90f12eea699729ed0000000000000000000000")); - cl_assert_equal_i(0, git_oid_strcmp(&idp, "ae90f12eea699729ed")); - cl_assert(git_oid_strcmp(&idp, "ae90f12eea699729ed1") < 0); - cl_assert(git_oid_strcmp(&idp, "ae90f12eea699729ec") > 0); - cl_assert(git_oid_strcmp(&idp, "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef") < 0); - - cl_assert(git_oid_strcmp(&idp, "deadbeef") < 0); - cl_assert_equal_i(-1, git_oid_strcmp(&idp, "I'm not an oid.... :)")); -} - -void test_core_oid__ncmp(void) -{ - cl_assert(!git_oid_ncmp(&id, &idp, 0)); - cl_assert(!git_oid_ncmp(&id, &idp, 1)); - cl_assert(!git_oid_ncmp(&id, &idp, 2)); - cl_assert(!git_oid_ncmp(&id, &idp, 17)); - cl_assert(!git_oid_ncmp(&id, &idp, 18)); - cl_assert(git_oid_ncmp(&id, &idp, 19)); - cl_assert(git_oid_ncmp(&id, &idp, 40)); - cl_assert(git_oid_ncmp(&id, &idp, 41)); - cl_assert(git_oid_ncmp(&id, &idp, 42)); - - cl_assert(!git_oid_ncmp(&id, &id, 0)); - cl_assert(!git_oid_ncmp(&id, &id, 1)); - cl_assert(!git_oid_ncmp(&id, &id, 39)); - cl_assert(!git_oid_ncmp(&id, &id, 40)); - cl_assert(!git_oid_ncmp(&id, &id, 41)); -} diff --git a/vendor/libgit2/tests/core/oidmap.c b/vendor/libgit2/tests/core/oidmap.c deleted file mode 100644 index 556a6ca4a..000000000 --- a/vendor/libgit2/tests/core/oidmap.c +++ /dev/null @@ -1,110 +0,0 @@ -#include "clar_libgit2.h" -#include "oidmap.h" - -GIT__USE_OIDMAP - -typedef struct { - git_oid oid; - size_t extra; -} oidmap_item; - -#define NITEMS 0x0fff - -void test_core_oidmap__basic(void) -{ - git_oidmap *map; - oidmap_item items[NITEMS]; - uint32_t i, j; - - for (i = 0; i < NITEMS; ++i) { - items[i].extra = i; - for (j = 0; j < GIT_OID_RAWSZ / 4; ++j) { - items[i].oid.id[j * 4 ] = (unsigned char)i; - items[i].oid.id[j * 4 + 1] = (unsigned char)(i >> 8); - items[i].oid.id[j * 4 + 2] = (unsigned char)(i >> 16); - items[i].oid.id[j * 4 + 3] = (unsigned char)(i >> 24); - } - } - - map = git_oidmap_alloc(); - cl_assert(map != NULL); - - for (i = 0; i < NITEMS; ++i) { - khiter_t pos; - int ret; - - pos = kh_get(oid, map, &items[i].oid); - cl_assert(pos == kh_end(map)); - - pos = kh_put(oid, map, &items[i].oid, &ret); - cl_assert(ret != 0); - - kh_val(map, pos) = &items[i]; - } - - - for (i = 0; i < NITEMS; ++i) { - khiter_t pos; - - pos = kh_get(oid, map, &items[i].oid); - cl_assert(pos != kh_end(map)); - - cl_assert_equal_p(kh_val(map, pos), &items[i]); - } - - git_oidmap_free(map); -} - -void test_core_oidmap__hash_collision(void) -{ - git_oidmap *map; - oidmap_item items[NITEMS]; - uint32_t i, j; - - for (i = 0; i < NITEMS; ++i) { - uint32_t segment = i / 8; - int modi = i - (segment * 8); - - items[i].extra = i; - - for (j = 0; j < GIT_OID_RAWSZ / 4; ++j) { - items[i].oid.id[j * 4 ] = (unsigned char)modi; - items[i].oid.id[j * 4 + 1] = (unsigned char)(modi >> 8); - items[i].oid.id[j * 4 + 2] = (unsigned char)(modi >> 16); - items[i].oid.id[j * 4 + 3] = (unsigned char)(modi >> 24); - } - - items[i].oid.id[ 8] = (unsigned char)i; - items[i].oid.id[ 9] = (unsigned char)(i >> 8); - items[i].oid.id[10] = (unsigned char)(i >> 16); - items[i].oid.id[11] = (unsigned char)(i >> 24); - } - - map = git_oidmap_alloc(); - cl_assert(map != NULL); - - for (i = 0; i < NITEMS; ++i) { - khiter_t pos; - int ret; - - pos = kh_get(oid, map, &items[i].oid); - cl_assert(pos == kh_end(map)); - - pos = kh_put(oid, map, &items[i].oid, &ret); - cl_assert(ret != 0); - - kh_val(map, pos) = &items[i]; - } - - - for (i = 0; i < NITEMS; ++i) { - khiter_t pos; - - pos = kh_get(oid, map, &items[i].oid); - cl_assert(pos != kh_end(map)); - - cl_assert_equal_p(kh_val(map, pos), &items[i]); - } - - git_oidmap_free(map); -} diff --git a/vendor/libgit2/tests/core/opts.c b/vendor/libgit2/tests/core/opts.c deleted file mode 100644 index 72408cbe8..000000000 --- a/vendor/libgit2/tests/core/opts.c +++ /dev/null @@ -1,25 +0,0 @@ -#include "clar_libgit2.h" -#include "cache.h" - -void test_core_opts__readwrite(void) -{ - size_t old_val = 0; - size_t new_val = 0; - - git_libgit2_opts(GIT_OPT_GET_MWINDOW_SIZE, &old_val); - git_libgit2_opts(GIT_OPT_SET_MWINDOW_SIZE, (size_t)1234); - git_libgit2_opts(GIT_OPT_GET_MWINDOW_SIZE, &new_val); - - cl_assert(new_val == 1234); - - git_libgit2_opts(GIT_OPT_SET_MWINDOW_SIZE, old_val); - git_libgit2_opts(GIT_OPT_GET_MWINDOW_SIZE, &new_val); - - cl_assert(new_val == old_val); -} - -void test_core_opts__invalid_option(void) -{ - cl_git_fail(git_libgit2_opts(-1, "foobar")); -} - diff --git a/vendor/libgit2/tests/core/path.c b/vendor/libgit2/tests/core/path.c deleted file mode 100644 index c3e622f02..000000000 --- a/vendor/libgit2/tests/core/path.c +++ /dev/null @@ -1,654 +0,0 @@ -#include "clar_libgit2.h" -#include "fileops.h" - -static void -check_dirname(const char *A, const char *B) -{ - git_buf dir = GIT_BUF_INIT; - char *dir2; - - cl_assert(git_path_dirname_r(&dir, A) >= 0); - cl_assert_equal_s(B, dir.ptr); - git_buf_free(&dir); - - cl_assert((dir2 = git_path_dirname(A)) != NULL); - cl_assert_equal_s(B, dir2); - git__free(dir2); -} - -static void -check_basename(const char *A, const char *B) -{ - git_buf base = GIT_BUF_INIT; - char *base2; - - cl_assert(git_path_basename_r(&base, A) >= 0); - cl_assert_equal_s(B, base.ptr); - git_buf_free(&base); - - cl_assert((base2 = git_path_basename(A)) != NULL); - cl_assert_equal_s(B, base2); - git__free(base2); -} - -static void -check_topdir(const char *A, const char *B) -{ - const char *dir; - - cl_assert((dir = git_path_topdir(A)) != NULL); - cl_assert_equal_s(B, dir); -} - -static void -check_joinpath(const char *path_a, const char *path_b, const char *expected_path) -{ - git_buf joined_path = GIT_BUF_INIT; - - cl_git_pass(git_buf_joinpath(&joined_path, path_a, path_b)); - cl_assert_equal_s(expected_path, joined_path.ptr); - - git_buf_free(&joined_path); -} - -static void -check_joinpath_n( - const char *path_a, - const char *path_b, - const char *path_c, - const char *path_d, - const char *expected_path) -{ - git_buf joined_path = GIT_BUF_INIT; - - cl_git_pass(git_buf_join_n(&joined_path, '/', 4, - path_a, path_b, path_c, path_d)); - cl_assert_equal_s(expected_path, joined_path.ptr); - - git_buf_free(&joined_path); -} - - -/* get the dirname of a path */ -void test_core_path__00_dirname(void) -{ - check_dirname(NULL, "."); - check_dirname("", "."); - check_dirname("a", "."); - check_dirname("/", "/"); - check_dirname("/usr", "/"); - check_dirname("/usr/", "/"); - check_dirname("/usr/lib", "/usr"); - check_dirname("/usr/lib/", "/usr"); - check_dirname("/usr/lib//", "/usr"); - check_dirname("usr/lib", "usr"); - check_dirname("usr/lib/", "usr"); - check_dirname("usr/lib//", "usr"); - check_dirname(".git/", "."); - - check_dirname(REP16("/abc"), REP15("/abc")); - -#ifdef GIT_WIN32 - check_dirname("C:/path/", "C:/"); - check_dirname("C:/path", "C:/"); - check_dirname("//computername/path/", "//computername/"); - check_dirname("//computername/path", "//computername/"); - check_dirname("//computername/sub/path/", "//computername/sub"); - check_dirname("//computername/sub/path", "//computername/sub"); -#endif -} - -/* get the base name of a path */ -void test_core_path__01_basename(void) -{ - check_basename(NULL, "."); - check_basename("", "."); - check_basename("a", "a"); - check_basename("/", "/"); - check_basename("/usr", "usr"); - check_basename("/usr/", "usr"); - check_basename("/usr/lib", "lib"); - check_basename("/usr/lib//", "lib"); - check_basename("usr/lib", "lib"); - - check_basename(REP16("/abc"), "abc"); - check_basename(REP1024("/abc"), "abc"); -} - -/* get the latest component in a path */ -void test_core_path__02_topdir(void) -{ - check_topdir(".git/", ".git/"); - check_topdir("/.git/", ".git/"); - check_topdir("usr/local/.git/", ".git/"); - check_topdir("./.git/", ".git/"); - check_topdir("/usr/.git/", ".git/"); - check_topdir("/", "/"); - check_topdir("a/", "a/"); - - cl_assert(git_path_topdir("/usr/.git") == NULL); - cl_assert(git_path_topdir(".") == NULL); - cl_assert(git_path_topdir("") == NULL); - cl_assert(git_path_topdir("a") == NULL); -} - -/* properly join path components */ -void test_core_path__05_joins(void) -{ - check_joinpath("", "", ""); - check_joinpath("", "a", "a"); - check_joinpath("", "/a", "/a"); - check_joinpath("a", "", "a/"); - check_joinpath("a", "/", "a/"); - check_joinpath("a", "b", "a/b"); - check_joinpath("/", "a", "/a"); - check_joinpath("/", "", "/"); - check_joinpath("/a", "/b", "/a/b"); - check_joinpath("/a", "/b/", "/a/b/"); - check_joinpath("/a/", "b/", "/a/b/"); - check_joinpath("/a/", "/b/", "/a/b/"); - - check_joinpath("/abcd", "/defg", "/abcd/defg"); - check_joinpath("/abcd", "/defg/", "/abcd/defg/"); - check_joinpath("/abcd/", "defg/", "/abcd/defg/"); - check_joinpath("/abcd/", "/defg/", "/abcd/defg/"); - - check_joinpath("/abcdefgh", "/12345678", "/abcdefgh/12345678"); - check_joinpath("/abcdefgh", "/12345678/", "/abcdefgh/12345678/"); - check_joinpath("/abcdefgh/", "12345678/", "/abcdefgh/12345678/"); - - check_joinpath(REP1024("aaaa"), "", REP1024("aaaa") "/"); - check_joinpath(REP1024("aaaa/"), "", REP1024("aaaa/")); - check_joinpath(REP1024("/aaaa"), "", REP1024("/aaaa") "/"); - - check_joinpath(REP1024("aaaa"), REP1024("bbbb"), - REP1024("aaaa") "/" REP1024("bbbb")); - check_joinpath(REP1024("/aaaa"), REP1024("/bbbb"), - REP1024("/aaaa") REP1024("/bbbb")); -} - -/* properly join path components for more than one path */ -void test_core_path__06_long_joins(void) -{ - check_joinpath_n("", "", "", "", ""); - check_joinpath_n("", "a", "", "", "a/"); - check_joinpath_n("a", "", "", "", "a/"); - check_joinpath_n("", "", "", "a", "a"); - check_joinpath_n("a", "b", "", "/c/d/", "a/b/c/d/"); - check_joinpath_n("a", "b", "", "/c/d", "a/b/c/d"); - check_joinpath_n("abcd", "efgh", "ijkl", "mnop", "abcd/efgh/ijkl/mnop"); - check_joinpath_n("abcd/", "efgh/", "ijkl/", "mnop/", "abcd/efgh/ijkl/mnop/"); - check_joinpath_n("/abcd/", "/efgh/", "/ijkl/", "/mnop/", "/abcd/efgh/ijkl/mnop/"); - - check_joinpath_n(REP1024("a"), REP1024("b"), REP1024("c"), REP1024("d"), - REP1024("a") "/" REP1024("b") "/" - REP1024("c") "/" REP1024("d")); - check_joinpath_n(REP1024("/a"), REP1024("/b"), REP1024("/c"), REP1024("/d"), - REP1024("/a") REP1024("/b") - REP1024("/c") REP1024("/d")); -} - - -static void -check_path_to_dir( - const char* path, - const char* expected) -{ - git_buf tgt = GIT_BUF_INIT; - - git_buf_sets(&tgt, path); - cl_git_pass(git_path_to_dir(&tgt)); - cl_assert_equal_s(expected, tgt.ptr); - - git_buf_free(&tgt); -} - -static void -check_string_to_dir( - const char* path, - size_t maxlen, - const char* expected) -{ - size_t len = strlen(path); - char *buf = git__malloc(len + 2); - cl_assert(buf); - - strncpy(buf, path, len + 2); - - git_path_string_to_dir(buf, maxlen); - - cl_assert_equal_s(expected, buf); - - git__free(buf); -} - -/* convert paths to dirs */ -void test_core_path__07_path_to_dir(void) -{ - check_path_to_dir("", ""); - check_path_to_dir(".", "./"); - check_path_to_dir("./", "./"); - check_path_to_dir("a/", "a/"); - check_path_to_dir("ab", "ab/"); - /* make sure we try just under and just over an expansion that will - * require a realloc - */ - check_path_to_dir("abcdef", "abcdef/"); - check_path_to_dir("abcdefg", "abcdefg/"); - check_path_to_dir("abcdefgh", "abcdefgh/"); - check_path_to_dir("abcdefghi", "abcdefghi/"); - check_path_to_dir(REP1024("abcd") "/", REP1024("abcd") "/"); - check_path_to_dir(REP1024("abcd"), REP1024("abcd") "/"); - - check_string_to_dir("", 1, ""); - check_string_to_dir(".", 1, "."); - check_string_to_dir(".", 2, "./"); - check_string_to_dir(".", 3, "./"); - check_string_to_dir("abcd", 3, "abcd"); - check_string_to_dir("abcd", 4, "abcd"); - check_string_to_dir("abcd", 5, "abcd/"); - check_string_to_dir("abcd", 6, "abcd/"); -} - -/* join path to itself */ -void test_core_path__08_self_join(void) -{ - git_buf path = GIT_BUF_INIT; - size_t asize = 0; - - asize = path.asize; - cl_git_pass(git_buf_sets(&path, "/foo")); - cl_assert_equal_s(path.ptr, "/foo"); - cl_assert(asize < path.asize); - - asize = path.asize; - cl_git_pass(git_buf_joinpath(&path, path.ptr, "this is a new string")); - cl_assert_equal_s(path.ptr, "/foo/this is a new string"); - cl_assert(asize < path.asize); - - asize = path.asize; - cl_git_pass(git_buf_joinpath(&path, path.ptr, "/grow the buffer, grow the buffer, grow the buffer")); - cl_assert_equal_s(path.ptr, "/foo/this is a new string/grow the buffer, grow the buffer, grow the buffer"); - cl_assert(asize < path.asize); - - git_buf_free(&path); - cl_git_pass(git_buf_sets(&path, "/foo/bar")); - - cl_git_pass(git_buf_joinpath(&path, path.ptr + 4, "baz")); - cl_assert_equal_s(path.ptr, "/bar/baz"); - - asize = path.asize; - cl_git_pass(git_buf_joinpath(&path, path.ptr + 4, "somethinglongenoughtorealloc")); - cl_assert_equal_s(path.ptr, "/baz/somethinglongenoughtorealloc"); - cl_assert(asize < path.asize); - - git_buf_free(&path); -} - -static void check_percent_decoding(const char *expected_result, const char *input) -{ - git_buf buf = GIT_BUF_INIT; - - cl_git_pass(git__percent_decode(&buf, input)); - cl_assert_equal_s(expected_result, git_buf_cstr(&buf)); - - git_buf_free(&buf); -} - -void test_core_path__09_percent_decode(void) -{ - check_percent_decoding("abcd", "abcd"); - check_percent_decoding("a2%", "a2%"); - check_percent_decoding("a2%3", "a2%3"); - check_percent_decoding("a2%%3", "a2%%3"); - check_percent_decoding("a2%3z", "a2%3z"); - check_percent_decoding("a,", "a%2c"); - check_percent_decoding("a21", "a2%31"); - check_percent_decoding("a2%1", "a2%%31"); - check_percent_decoding("a bc ", "a%20bc%20"); - check_percent_decoding("Vicent Mart" "\355", "Vicent%20Mart%ED"); -} - -static void check_fromurl(const char *expected_result, const char *input, int should_fail) -{ - git_buf buf = GIT_BUF_INIT; - - assert(should_fail || expected_result); - - if (!should_fail) { - cl_git_pass(git_path_fromurl(&buf, input)); - cl_assert_equal_s(expected_result, git_buf_cstr(&buf)); - } else - cl_git_fail(git_path_fromurl(&buf, input)); - - git_buf_free(&buf); -} - -#ifdef GIT_WIN32 -#define ABS_PATH_MARKER "" -#else -#define ABS_PATH_MARKER "/" -#endif - -void test_core_path__10_fromurl(void) -{ - /* Failing cases */ - check_fromurl(NULL, "a", 1); - check_fromurl(NULL, "http:///c:/Temp%20folder/note.txt", 1); - check_fromurl(NULL, "file://c:/Temp%20folder/note.txt", 1); - check_fromurl(NULL, "file:////c:/Temp%20folder/note.txt", 1); - check_fromurl(NULL, "file:///", 1); - check_fromurl(NULL, "file:////", 1); - check_fromurl(NULL, "file://servername/c:/Temp%20folder/note.txt", 1); - - /* Passing cases */ - check_fromurl(ABS_PATH_MARKER "c:/Temp folder/note.txt", "file:///c:/Temp%20folder/note.txt", 0); - check_fromurl(ABS_PATH_MARKER "c:/Temp folder/note.txt", "file://localhost/c:/Temp%20folder/note.txt", 0); - check_fromurl(ABS_PATH_MARKER "c:/Temp+folder/note.txt", "file:///c:/Temp+folder/note.txt", 0); - check_fromurl(ABS_PATH_MARKER "a", "file:///a", 0); -} - -typedef struct { - int expect_idx; - int cancel_after; - char **expect; -} check_walkup_info; - -#define CANCEL_VALUE 1234 - -static int check_one_walkup_step(void *ref, const char *path) -{ - check_walkup_info *info = (check_walkup_info *)ref; - - if (!info->cancel_after) { - cl_assert_equal_s(info->expect[info->expect_idx], "[CANCEL]"); - return CANCEL_VALUE; - } - info->cancel_after--; - - cl_assert(info->expect[info->expect_idx] != NULL); - cl_assert_equal_s(info->expect[info->expect_idx], path); - info->expect_idx++; - - return 0; -} - -void test_core_path__11_walkup(void) -{ - git_buf p = GIT_BUF_INIT; - - char *expect[] = { - /* 1 */ "/a/b/c/d/e/", "/a/b/c/d/", "/a/b/c/", "/a/b/", "/a/", "/", NULL, - /* 2 */ "/a/b/c/d/e", "/a/b/c/d/", "/a/b/c/", "/a/b/", "/a/", "/", NULL, - /* 3 */ "/a/b/c/d/e", "/a/b/c/d/", "/a/b/c/", "/a/b/", "/a/", "/", NULL, - /* 4 */ "/a/b/c/d/e", "/a/b/c/d/", "/a/b/c/", "/a/b/", "/a/", "/", NULL, - /* 5 */ "/a/b/c/d/e", "/a/b/c/d/", "/a/b/c/", "/a/b/", NULL, - /* 6 */ "/a/b/c/d/e", "/a/b/c/d/", "/a/b/c/", "/a/b/", NULL, - /* 7 */ "this_is_a_path", "", NULL, - /* 8 */ "this_is_a_path/", "", NULL, - /* 9 */ "///a///b///c///d///e///", "///a///b///c///d///", "///a///b///c///", "///a///b///", "///a///", "///", NULL, - /* 10 */ "a/b/c/", "a/b/", "a/", "", NULL, - /* 11 */ "a/b/c", "a/b/", "a/", "", NULL, - /* 12 */ "a/b/c/", "a/b/", "a/", NULL, - /* 13 */ "", NULL, - /* 14 */ "/", NULL, - /* 15 */ NULL - }; - - char *root[] = { - /* 1 */ NULL, - /* 2 */ NULL, - /* 3 */ "/", - /* 4 */ "", - /* 5 */ "/a/b", - /* 6 */ "/a/b/", - /* 7 */ NULL, - /* 8 */ NULL, - /* 9 */ NULL, - /* 10 */ NULL, - /* 11 */ NULL, - /* 12 */ "a/", - /* 13 */ NULL, - /* 14 */ NULL, - }; - - int i, j; - check_walkup_info info; - - info.expect = expect; - info.cancel_after = -1; - - for (i = 0, j = 0; expect[i] != NULL; i++, j++) { - - git_buf_sets(&p, expect[i]); - - info.expect_idx = i; - cl_git_pass( - git_path_walk_up(&p, root[j], check_one_walkup_step, &info) - ); - - cl_assert_equal_s(p.ptr, expect[i]); - cl_assert(expect[info.expect_idx] == NULL); - i = info.expect_idx; - } - - git_buf_free(&p); -} - -void test_core_path__11a_walkup_cancel(void) -{ - git_buf p = GIT_BUF_INIT; - int cancel[] = { 3, 2, 1, 0 }; - char *expect[] = { - "/a/b/c/d/e/", "/a/b/c/d/", "/a/b/c/", "[CANCEL]", NULL, - "/a/b/c/d/e", "/a/b/c/d/", "[CANCEL]", NULL, - "/a/b/c/d/e", "[CANCEL]", NULL, - "[CANCEL]", NULL, - NULL - }; - char *root[] = { NULL, NULL, "/", "", NULL }; - int i, j; - check_walkup_info info; - - info.expect = expect; - - for (i = 0, j = 0; expect[i] != NULL; i++, j++) { - - git_buf_sets(&p, expect[i]); - - info.cancel_after = cancel[j]; - info.expect_idx = i; - - cl_assert_equal_i( - CANCEL_VALUE, - git_path_walk_up(&p, root[j], check_one_walkup_step, &info) - ); - - /* skip to next run of expectations */ - while (expect[i] != NULL) i++; - } - - git_buf_free(&p); -} - -void test_core_path__12_offset_to_path_root(void) -{ - cl_assert(git_path_root("non/rooted/path") == -1); - cl_assert(git_path_root("/rooted/path") == 0); - -#ifdef GIT_WIN32 - /* Windows specific tests */ - cl_assert(git_path_root("C:non/rooted/path") == -1); - cl_assert(git_path_root("C:/rooted/path") == 2); - cl_assert(git_path_root("//computername/sharefolder/resource") == 14); - cl_assert(git_path_root("//computername/sharefolder") == 14); - cl_assert(git_path_root("//computername") == -1); -#endif -} - -#define NON_EXISTING_FILEPATH "i_hope_i_do_not_exist" - -void test_core_path__13_cannot_prettify_a_non_existing_file(void) -{ - git_buf p = GIT_BUF_INIT; - - cl_assert_equal_b(git_path_exists(NON_EXISTING_FILEPATH), false); - cl_assert_equal_i(GIT_ENOTFOUND, git_path_prettify(&p, NON_EXISTING_FILEPATH, NULL)); - cl_assert_equal_i(GIT_ENOTFOUND, git_path_prettify(&p, NON_EXISTING_FILEPATH "/so-do-i", NULL)); - - git_buf_free(&p); -} - -void test_core_path__14_apply_relative(void) -{ - git_buf p = GIT_BUF_INIT; - - cl_git_pass(git_buf_sets(&p, "/this/is/a/base")); - - cl_git_pass(git_path_apply_relative(&p, "../test")); - cl_assert_equal_s("/this/is/a/test", p.ptr); - - cl_git_pass(git_path_apply_relative(&p, "../../the/./end")); - cl_assert_equal_s("/this/is/the/end", p.ptr); - - cl_git_pass(git_path_apply_relative(&p, "./of/this/../the/string")); - cl_assert_equal_s("/this/is/the/end/of/the/string", p.ptr); - - cl_git_pass(git_path_apply_relative(&p, "../../../../../..")); - cl_assert_equal_s("/this/", p.ptr); - - cl_git_pass(git_path_apply_relative(&p, "../")); - cl_assert_equal_s("/", p.ptr); - - cl_git_fail(git_path_apply_relative(&p, "../../..")); - - - cl_git_pass(git_buf_sets(&p, "d:/another/test")); - - cl_git_pass(git_path_apply_relative(&p, "../..")); - cl_assert_equal_s("d:/", p.ptr); - - cl_git_pass(git_path_apply_relative(&p, "from/here/to/../and/./back/.")); - cl_assert_equal_s("d:/from/here/and/back/", p.ptr); - - - cl_git_pass(git_buf_sets(&p, "https://my.url.com/test.git")); - - cl_git_pass(git_path_apply_relative(&p, "../another.git")); - cl_assert_equal_s("https://my.url.com/another.git", p.ptr); - - cl_git_pass(git_path_apply_relative(&p, "../full/path/url.patch")); - cl_assert_equal_s("https://my.url.com/full/path/url.patch", p.ptr); - - cl_git_pass(git_path_apply_relative(&p, "..")); - cl_assert_equal_s("https://my.url.com/full/path/", p.ptr); - - cl_git_pass(git_path_apply_relative(&p, "../../../")); - cl_assert_equal_s("https://", p.ptr); - - - cl_git_pass(git_buf_sets(&p, "../../this/is/relative")); - - cl_git_pass(git_path_apply_relative(&p, "../../preserves/the/prefix")); - cl_assert_equal_s("../../this/preserves/the/prefix", p.ptr); - - cl_git_pass(git_path_apply_relative(&p, "../../../../that")); - cl_assert_equal_s("../../that", p.ptr); - - cl_git_pass(git_path_apply_relative(&p, "../there")); - cl_assert_equal_s("../../there", p.ptr); - git_buf_free(&p); -} - -static void assert_resolve_relative( - git_buf *buf, const char *expected, const char *path) -{ - cl_git_pass(git_buf_sets(buf, path)); - cl_git_pass(git_path_resolve_relative(buf, 0)); - cl_assert_equal_s(expected, buf->ptr); -} - -void test_core_path__15_resolve_relative(void) -{ - git_buf buf = GIT_BUF_INIT; - - assert_resolve_relative(&buf, "", ""); - assert_resolve_relative(&buf, "", "."); - assert_resolve_relative(&buf, "", "./"); - assert_resolve_relative(&buf, "..", ".."); - assert_resolve_relative(&buf, "../", "../"); - assert_resolve_relative(&buf, "..", "./.."); - assert_resolve_relative(&buf, "../", "./../"); - assert_resolve_relative(&buf, "../", "../."); - assert_resolve_relative(&buf, "../", ".././"); - assert_resolve_relative(&buf, "../..", "../.."); - assert_resolve_relative(&buf, "../../", "../../"); - - assert_resolve_relative(&buf, "/", "/"); - assert_resolve_relative(&buf, "/", "/."); - - assert_resolve_relative(&buf, "", "a/.."); - assert_resolve_relative(&buf, "", "a/../"); - assert_resolve_relative(&buf, "", "a/../."); - - assert_resolve_relative(&buf, "/a", "/a"); - assert_resolve_relative(&buf, "/a/", "/a/."); - assert_resolve_relative(&buf, "/", "/a/../"); - assert_resolve_relative(&buf, "/", "/a/../."); - assert_resolve_relative(&buf, "/", "/a/.././"); - - assert_resolve_relative(&buf, "a", "a"); - assert_resolve_relative(&buf, "a/", "a/"); - assert_resolve_relative(&buf, "a/", "a/."); - assert_resolve_relative(&buf, "a/", "a/./"); - - assert_resolve_relative(&buf, "a/b", "a//b"); - assert_resolve_relative(&buf, "a/b/c", "a/b/c"); - assert_resolve_relative(&buf, "b/c", "./b/c"); - assert_resolve_relative(&buf, "a/c", "a/./c"); - assert_resolve_relative(&buf, "a/b/", "a/b/."); - - assert_resolve_relative(&buf, "/a/b/c", "///a/b/c"); - assert_resolve_relative(&buf, "/", "////"); - assert_resolve_relative(&buf, "/a", "///a"); - assert_resolve_relative(&buf, "/", "///."); - assert_resolve_relative(&buf, "/", "///a/.."); - - assert_resolve_relative(&buf, "../../path", "../../test//../././path"); - assert_resolve_relative(&buf, "../d", "a/b/../../../c/../d"); - - cl_git_pass(git_buf_sets(&buf, "/..")); - cl_git_fail(git_path_resolve_relative(&buf, 0)); - - cl_git_pass(git_buf_sets(&buf, "/./..")); - cl_git_fail(git_path_resolve_relative(&buf, 0)); - - cl_git_pass(git_buf_sets(&buf, "/.//..")); - cl_git_fail(git_path_resolve_relative(&buf, 0)); - - cl_git_pass(git_buf_sets(&buf, "/../.")); - cl_git_fail(git_path_resolve_relative(&buf, 0)); - - cl_git_pass(git_buf_sets(&buf, "/../.././../a")); - cl_git_fail(git_path_resolve_relative(&buf, 0)); - - cl_git_pass(git_buf_sets(&buf, "////..")); - cl_git_fail(git_path_resolve_relative(&buf, 0)); - - /* things that start with Windows network paths */ -#ifdef GIT_WIN32 - assert_resolve_relative(&buf, "//a/b/c", "//a/b/c"); - assert_resolve_relative(&buf, "//a/", "//a/b/.."); - assert_resolve_relative(&buf, "//a/b/c", "//a/Q/../b/x/y/../../c"); - - cl_git_pass(git_buf_sets(&buf, "//a/b/../..")); - cl_git_fail(git_path_resolve_relative(&buf, 0)); -#else - assert_resolve_relative(&buf, "/a/b/c", "//a/b/c"); - assert_resolve_relative(&buf, "/a/", "//a/b/.."); - assert_resolve_relative(&buf, "/a/b/c", "//a/Q/../b/x/y/../../c"); - assert_resolve_relative(&buf, "/", "//a/b/../.."); -#endif - - git_buf_free(&buf); -} diff --git a/vendor/libgit2/tests/core/pool.c b/vendor/libgit2/tests/core/pool.c deleted file mode 100644 index b07da0abd..000000000 --- a/vendor/libgit2/tests/core/pool.c +++ /dev/null @@ -1,92 +0,0 @@ -#include "clar_libgit2.h" -#include "pool.h" -#include "git2/oid.h" - -void test_core_pool__0(void) -{ - int i; - git_pool p; - void *ptr; - - git_pool_init(&p, 1); - - for (i = 1; i < 10000; i *= 2) { - ptr = git_pool_malloc(&p, i); - cl_assert(ptr != NULL); - cl_assert(git_pool__ptr_in_pool(&p, ptr)); - cl_assert(!git_pool__ptr_in_pool(&p, &i)); - } - - git_pool_clear(&p); -} - -void test_core_pool__1(void) -{ - int i; - git_pool p; - - git_pool_init(&p, 1); - p.page_size = 4000; - - for (i = 2010; i > 0; i--) - cl_assert(git_pool_malloc(&p, i) != NULL); - -#ifndef GIT_DEBUG_POOL - /* with fixed page size, allocation must end up with these values */ - cl_assert_equal_i(591, git_pool__open_pages(&p)); -#endif - git_pool_clear(&p); - - git_pool_init(&p, 1); - p.page_size = 4120; - - for (i = 2010; i > 0; i--) - cl_assert(git_pool_malloc(&p, i) != NULL); - -#ifndef GIT_DEBUG_POOL - /* with fixed page size, allocation must end up with these values */ - cl_assert_equal_i(sizeof(void *) == 8 ? 575 : 573, git_pool__open_pages(&p)); -#endif - git_pool_clear(&p); -} - -static char to_hex[] = "0123456789abcdef"; - -void test_core_pool__2(void) -{ - git_pool p; - char oid_hex[GIT_OID_HEXSZ]; - git_oid *oid; - int i, j; - - memset(oid_hex, '0', sizeof(oid_hex)); - - git_pool_init(&p, sizeof(git_oid)); - p.page_size = 4000; - - for (i = 1000; i < 10000; i++) { - oid = git_pool_malloc(&p, 1); - cl_assert(oid != NULL); - - for (j = 0; j < 8; j++) - oid_hex[j] = to_hex[(i >> (4 * j)) & 0x0f]; - cl_git_pass(git_oid_fromstr(oid, oid_hex)); - } - -#ifndef GIT_DEBUG_POOL - /* with fixed page size, allocation must end up with these values */ - cl_assert_equal_i(sizeof(void *) == 8 ? 55 : 45, git_pool__open_pages(&p)); -#endif - git_pool_clear(&p); -} - -void test_core_pool__strndup_limit(void) -{ - git_pool p; - - git_pool_init(&p, 1); - /* ensure 64 bit doesn't overflow */ - cl_assert(git_pool_strndup(&p, "foo", (size_t)-1) == NULL); - git_pool_clear(&p); -} - diff --git a/vendor/libgit2/tests/core/posix.c b/vendor/libgit2/tests/core/posix.c deleted file mode 100644 index 34a67bf47..000000000 --- a/vendor/libgit2/tests/core/posix.c +++ /dev/null @@ -1,148 +0,0 @@ -#ifndef _WIN32 -# include -# include -# include -#else -# include -# ifdef _MSC_VER -# pragma comment(lib, "ws2_32") -# endif -#endif - -#include "clar_libgit2.h" -#include "posix.h" - -void test_core_posix__initialize(void) -{ -#ifdef GIT_WIN32 - /* on win32, the WSA context needs to be initialized - * before any socket calls can be performed */ - WSADATA wsd; - - cl_git_pass(WSAStartup(MAKEWORD(2,2), &wsd)); - cl_assert(LOBYTE(wsd.wVersion) == 2 && HIBYTE(wsd.wVersion) == 2); -#endif -} - -static bool supports_ipv6(void) -{ -#ifdef GIT_WIN32 - /* IPv6 is supported on Vista and newer */ - return git_has_win32_version(6, 0, 0); -#else - return 1; -#endif -} - -void test_core_posix__inet_pton(void) -{ - struct in_addr addr; - struct in6_addr addr6; - size_t i; - - struct in_addr_data { - const char *p; - const uint8_t n[4]; - }; - - struct in6_addr_data { - const char *p; - const uint8_t n[16]; - }; - - static struct in_addr_data in_addr_data[] = { - { "0.0.0.0", { 0, 0, 0, 0 } }, - { "10.42.101.8", { 10, 42, 101, 8 } }, - { "127.0.0.1", { 127, 0, 0, 1 } }, - { "140.177.10.12", { 140, 177, 10, 12 } }, - { "204.232.175.90", { 204, 232, 175, 90 } }, - { "255.255.255.255", { 255, 255, 255, 255 } }, - }; - - static struct in6_addr_data in6_addr_data[] = { - { "::", { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } }, - { "::1", { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 } }, - { "0:0:0:0:0:0:0:1", { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 } }, - { "2001:db8:8714:3a90::12", { 0x20, 0x01, 0x0d, 0xb8, 0x87, 0x14, 0x3a, 0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12 } }, - { "fe80::f8ba:c2d6:86be:3645", { 0xfe, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xba, 0xc2, 0xd6, 0x86, 0xbe, 0x36, 0x45 } }, - { "::ffff:204.152.189.116", { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xcc, 0x98, 0xbd, 0x74 } }, - }; - - /* Test some ipv4 addresses */ - for (i = 0; i < 6; i++) { - cl_assert(p_inet_pton(AF_INET, in_addr_data[i].p, &addr) == 1); - cl_assert(memcmp(&addr, in_addr_data[i].n, sizeof(struct in_addr)) == 0); - } - - /* Test some ipv6 addresses */ - if (supports_ipv6()) - { - for (i = 0; i < 6; i++) { - cl_assert(p_inet_pton(AF_INET6, in6_addr_data[i].p, &addr6) == 1); - cl_assert(memcmp(&addr6, in6_addr_data[i].n, sizeof(struct in6_addr)) == 0); - } - } - - /* Test some invalid strings */ - cl_assert(p_inet_pton(AF_INET, "", &addr) == 0); - cl_assert(p_inet_pton(AF_INET, "foo", &addr) == 0); - cl_assert(p_inet_pton(AF_INET, " 127.0.0.1", &addr) == 0); - cl_assert(p_inet_pton(AF_INET, "bar", &addr) == 0); - cl_assert(p_inet_pton(AF_INET, "10.foo.bar.1", &addr) == 0); - - /* Test unsupported address families */ - cl_git_fail(p_inet_pton(12, "52.472", NULL)); /* AF_DECnet */ - cl_assert_equal_i(EAFNOSUPPORT, errno); - - cl_git_fail(p_inet_pton(5, "315.124", NULL)); /* AF_CHAOS */ - cl_assert_equal_i(EAFNOSUPPORT, errno); -} - -void test_core_posix__utimes(void) -{ - struct p_timeval times[2]; - struct stat st; - time_t curtime; - int fd; - - /* test p_utimes */ - times[0].tv_sec = 1234567890; - times[0].tv_usec = 0; - times[1].tv_sec = 1234567890; - times[1].tv_usec = 0; - - cl_git_mkfile("foo", "Dummy file."); - cl_must_pass(p_utimes("foo", times)); - - p_stat("foo", &st); - cl_assert_equal_i(1234567890, st.st_atime); - cl_assert_equal_i(1234567890, st.st_mtime); - - - /* test p_futimes */ - times[0].tv_sec = 1414141414; - times[0].tv_usec = 0; - times[1].tv_sec = 1414141414; - times[1].tv_usec = 0; - - cl_must_pass(fd = p_open("foo", O_RDWR)); - cl_must_pass(p_futimes(fd, times)); - p_close(fd); - - p_stat("foo", &st); - cl_assert_equal_i(1414141414, st.st_atime); - cl_assert_equal_i(1414141414, st.st_mtime); - - - /* test p_utimes with current time, assume that - * it takes < 5 seconds to get the time...! - */ - cl_must_pass(p_utimes("foo", NULL)); - - curtime = time(NULL); - p_stat("foo", &st); - cl_assert((st.st_atime - curtime) < 5); - cl_assert((st.st_mtime - curtime) < 5); - - p_unlink("foo"); -} diff --git a/vendor/libgit2/tests/core/pqueue.c b/vendor/libgit2/tests/core/pqueue.c deleted file mode 100644 index bcd4eea9f..000000000 --- a/vendor/libgit2/tests/core/pqueue.c +++ /dev/null @@ -1,128 +0,0 @@ -#include "clar_libgit2.h" -#include "pqueue.h" - -static int cmp_ints(const void *v1, const void *v2) -{ - int i1 = *(int *)v1, i2 = *(int *)v2; - return (i1 < i2) ? -1 : (i1 > i2) ? 1 : 0; -} - -void test_core_pqueue__items_are_put_in_order(void) -{ - git_pqueue pq; - int i, vals[20]; - - cl_git_pass(git_pqueue_init(&pq, 0, 20, cmp_ints)); - - for (i = 0; i < 20; ++i) { - if (i < 10) - vals[i] = 10 - i; /* 10 down to 1 */ - else - vals[i] = i + 1; /* 11 up to 20 */ - - cl_git_pass(git_pqueue_insert(&pq, &vals[i])); - } - - cl_assert_equal_i(20, git_pqueue_size(&pq)); - - for (i = 1; i <= 20; ++i) { - void *p = git_pqueue_pop(&pq); - cl_assert(p); - cl_assert_equal_i(i, *(int *)p); - } - - cl_assert_equal_i(0, git_pqueue_size(&pq)); - - git_pqueue_free(&pq); -} - -void test_core_pqueue__interleave_inserts_and_pops(void) -{ - git_pqueue pq; - int chunk, v, i, vals[200]; - - cl_git_pass(git_pqueue_init(&pq, 0, 20, cmp_ints)); - - for (v = 0, chunk = 20; chunk <= 200; chunk += 20) { - /* push the next 20 */ - for (; v < chunk; ++v) { - vals[v] = (v & 1) ? 200 - v : v; - cl_git_pass(git_pqueue_insert(&pq, &vals[v])); - } - - /* pop the lowest 10 */ - for (i = 0; i < 10; ++i) - (void)git_pqueue_pop(&pq); - } - - cl_assert_equal_i(100, git_pqueue_size(&pq)); - - /* at this point, we've popped 0-99 */ - - for (v = 100; v < 200; ++v) { - void *p = git_pqueue_pop(&pq); - cl_assert(p); - cl_assert_equal_i(v, *(int *)p); - } - - cl_assert_equal_i(0, git_pqueue_size(&pq)); - - git_pqueue_free(&pq); -} - -void test_core_pqueue__max_heap_size(void) -{ - git_pqueue pq; - int i, vals[100]; - - cl_git_pass(git_pqueue_init(&pq, GIT_PQUEUE_FIXED_SIZE, 50, cmp_ints)); - - for (i = 0; i < 100; ++i) { - vals[i] = (i & 1) ? 100 - i : i; - cl_git_pass(git_pqueue_insert(&pq, &vals[i])); - } - - cl_assert_equal_i(50, git_pqueue_size(&pq)); - - for (i = 50; i < 100; ++i) { - void *p = git_pqueue_pop(&pq); - cl_assert(p); - cl_assert_equal_i(i, *(int *)p); - } - - cl_assert_equal_i(0, git_pqueue_size(&pq)); - - git_pqueue_free(&pq); - -} - -static int cmp_ints_like_commit_time(const void *a, const void *b) -{ - return *((const int *)a) < *((const int *)b); -} - -void test_core_pqueue__interleaved_pushes_and_pops(void) -{ - git_pqueue pq; - int i, j, *val; - static int commands[] = - { 6, 9, 8, 0, 5, 0, 7, 0, 4, 3, 0, 0, 0, 4, 0, 2, 0, 1, 0, 0, -1 }; - static int expected[] = - { 9, 8, 7, 6, 5, 4, 4, 3, 2, 1, -1 }; - - cl_git_pass(git_pqueue_init(&pq, 0, 10, cmp_ints_like_commit_time)); - - for (i = 0, j = 0; commands[i] >= 0; ++i) { - if (!commands[i]) { - cl_assert((val = git_pqueue_pop(&pq)) != NULL); - cl_assert_equal_i(expected[j], *val); - ++j; - } else { - cl_git_pass(git_pqueue_insert(&pq, &commands[i])); - } - } - - cl_assert_equal_i(0, git_pqueue_size(&pq)); - git_pqueue_free(&pq); -} - diff --git a/vendor/libgit2/tests/core/rmdir.c b/vendor/libgit2/tests/core/rmdir.c deleted file mode 100644 index f0b0bfa42..000000000 --- a/vendor/libgit2/tests/core/rmdir.c +++ /dev/null @@ -1,98 +0,0 @@ -#include "clar_libgit2.h" -#include "fileops.h" - -static const char *empty_tmp_dir = "test_gitfo_rmdir_recurs_test"; - -void test_core_rmdir__initialize(void) -{ - git_buf path = GIT_BUF_INIT; - - cl_must_pass(p_mkdir(empty_tmp_dir, 0777)); - - cl_git_pass(git_buf_joinpath(&path, empty_tmp_dir, "/one")); - cl_must_pass(p_mkdir(path.ptr, 0777)); - - cl_git_pass(git_buf_joinpath(&path, empty_tmp_dir, "/one/two_one")); - cl_must_pass(p_mkdir(path.ptr, 0777)); - - cl_git_pass(git_buf_joinpath(&path, empty_tmp_dir, "/one/two_two")); - cl_must_pass(p_mkdir(path.ptr, 0777)); - - cl_git_pass(git_buf_joinpath(&path, empty_tmp_dir, "/one/two_two/three")); - cl_must_pass(p_mkdir(path.ptr, 0777)); - - cl_git_pass(git_buf_joinpath(&path, empty_tmp_dir, "/two")); - cl_must_pass(p_mkdir(path.ptr, 0777)); - - git_buf_free(&path); -} - -/* make sure empty dir can be deleted recusively */ -void test_core_rmdir__delete_recursive(void) -{ - cl_git_pass(git_futils_rmdir_r(empty_tmp_dir, NULL, GIT_RMDIR_EMPTY_HIERARCHY)); -} - -/* make sure non-empty dir cannot be deleted recusively */ -void test_core_rmdir__fail_to_delete_non_empty_dir(void) -{ - git_buf file = GIT_BUF_INIT; - - cl_git_pass(git_buf_joinpath(&file, empty_tmp_dir, "/two/file.txt")); - - cl_git_mkfile(git_buf_cstr(&file), "dummy"); - - cl_git_fail(git_futils_rmdir_r(empty_tmp_dir, NULL, GIT_RMDIR_EMPTY_HIERARCHY)); - - cl_must_pass(p_unlink(file.ptr)); - cl_git_pass(git_futils_rmdir_r(empty_tmp_dir, NULL, GIT_RMDIR_EMPTY_HIERARCHY)); - - git_buf_free(&file); -} - -void test_core_rmdir__can_skip_non_empty_dir(void) -{ - git_buf file = GIT_BUF_INIT; - - cl_git_pass(git_buf_joinpath(&file, empty_tmp_dir, "/two/file.txt")); - - cl_git_mkfile(git_buf_cstr(&file), "dummy"); - - cl_git_pass(git_futils_rmdir_r(empty_tmp_dir, NULL, GIT_RMDIR_SKIP_NONEMPTY)); - cl_assert(git_path_exists(git_buf_cstr(&file)) == true); - - cl_git_pass(git_futils_rmdir_r(empty_tmp_dir, NULL, GIT_RMDIR_REMOVE_FILES)); - cl_assert(git_path_exists(empty_tmp_dir) == false); - - git_buf_free(&file); -} - -void test_core_rmdir__can_remove_empty_parents(void) -{ - git_buf file = GIT_BUF_INIT; - - cl_git_pass( - git_buf_joinpath(&file, empty_tmp_dir, "/one/two_two/three/file.txt")); - cl_git_mkfile(git_buf_cstr(&file), "dummy"); - cl_assert(git_path_isfile(git_buf_cstr(&file))); - - cl_git_pass(git_futils_rmdir_r("one/two_two/three/file.txt", empty_tmp_dir, - GIT_RMDIR_REMOVE_FILES | GIT_RMDIR_EMPTY_PARENTS)); - - cl_assert(!git_path_exists(git_buf_cstr(&file))); - - git_buf_rtruncate_at_char(&file, '/'); /* three (only contained file.txt) */ - cl_assert(!git_path_exists(git_buf_cstr(&file))); - - git_buf_rtruncate_at_char(&file, '/'); /* two_two (only contained three) */ - cl_assert(!git_path_exists(git_buf_cstr(&file))); - - git_buf_rtruncate_at_char(&file, '/'); /* one (contained two_one also) */ - cl_assert(git_path_exists(git_buf_cstr(&file))); - - cl_assert(git_path_exists(empty_tmp_dir) == true); - - git_buf_free(&file); - - cl_git_pass(git_futils_rmdir_r(empty_tmp_dir, NULL, GIT_RMDIR_EMPTY_HIERARCHY)); -} diff --git a/vendor/libgit2/tests/core/sortedcache.c b/vendor/libgit2/tests/core/sortedcache.c deleted file mode 100644 index c1869bee0..000000000 --- a/vendor/libgit2/tests/core/sortedcache.c +++ /dev/null @@ -1,363 +0,0 @@ -#include "clar_libgit2.h" -#include "sortedcache.h" - -static int name_only_cmp(const void *a, const void *b) -{ - return strcmp(a, b); -} - -void test_core_sortedcache__name_only(void) -{ - git_sortedcache *sc; - void *item; - size_t pos; - - cl_git_pass(git_sortedcache_new( - &sc, 0, NULL, NULL, name_only_cmp, NULL)); - - cl_git_pass(git_sortedcache_wlock(sc)); - cl_git_pass(git_sortedcache_upsert(&item, sc, "aaa")); - cl_git_pass(git_sortedcache_upsert(&item, sc, "bbb")); - cl_git_pass(git_sortedcache_upsert(&item, sc, "zzz")); - cl_git_pass(git_sortedcache_upsert(&item, sc, "mmm")); - cl_git_pass(git_sortedcache_upsert(&item, sc, "iii")); - git_sortedcache_wunlock(sc); - - cl_assert_equal_sz(5, git_sortedcache_entrycount(sc)); - - cl_assert((item = git_sortedcache_lookup(sc, "aaa")) != NULL); - cl_assert_equal_s("aaa", item); - cl_assert((item = git_sortedcache_lookup(sc, "mmm")) != NULL); - cl_assert_equal_s("mmm", item); - cl_assert((item = git_sortedcache_lookup(sc, "zzz")) != NULL); - cl_assert_equal_s("zzz", item); - cl_assert(git_sortedcache_lookup(sc, "qqq") == NULL); - - cl_assert((item = git_sortedcache_entry(sc, 0)) != NULL); - cl_assert_equal_s("aaa", item); - cl_assert((item = git_sortedcache_entry(sc, 1)) != NULL); - cl_assert_equal_s("bbb", item); - cl_assert((item = git_sortedcache_entry(sc, 2)) != NULL); - cl_assert_equal_s("iii", item); - cl_assert((item = git_sortedcache_entry(sc, 3)) != NULL); - cl_assert_equal_s("mmm", item); - cl_assert((item = git_sortedcache_entry(sc, 4)) != NULL); - cl_assert_equal_s("zzz", item); - cl_assert(git_sortedcache_entry(sc, 5) == NULL); - - cl_git_pass(git_sortedcache_lookup_index(&pos, sc, "aaa")); - cl_assert_equal_sz(0, pos); - cl_git_pass(git_sortedcache_lookup_index(&pos, sc, "iii")); - cl_assert_equal_sz(2, pos); - cl_git_pass(git_sortedcache_lookup_index(&pos, sc, "zzz")); - cl_assert_equal_sz(4, pos); - cl_assert_equal_i( - GIT_ENOTFOUND, git_sortedcache_lookup_index(&pos, sc, "abc")); - - git_sortedcache_clear(sc, true); - - cl_assert_equal_sz(0, git_sortedcache_entrycount(sc)); - cl_assert(git_sortedcache_entry(sc, 0) == NULL); - cl_assert(git_sortedcache_lookup(sc, "aaa") == NULL); - cl_assert(git_sortedcache_entry(sc, 0) == NULL); - - git_sortedcache_free(sc); -} - -typedef struct { - int value; - char smaller_value; - char path[GIT_FLEX_ARRAY]; -} sortedcache_test_struct; - -static int sortedcache_test_struct_cmp(const void *a_, const void *b_) -{ - const sortedcache_test_struct *a = a_, *b = b_; - return strcmp(a->path, b->path); -} - -static void sortedcache_test_struct_free(void *payload, void *item_) -{ - sortedcache_test_struct *item = item_; - int *count = payload; - (*count)++; - item->smaller_value = 0; -} - -void test_core_sortedcache__in_memory(void) -{ - git_sortedcache *sc; - sortedcache_test_struct *item; - int free_count = 0; - - cl_git_pass(git_sortedcache_new( - &sc, offsetof(sortedcache_test_struct, path), - sortedcache_test_struct_free, &free_count, - sortedcache_test_struct_cmp, NULL)); - - cl_git_pass(git_sortedcache_wlock(sc)); - cl_git_pass(git_sortedcache_upsert((void **)&item, sc, "aaa")); - item->value = 10; - item->smaller_value = 1; - cl_git_pass(git_sortedcache_upsert((void **)&item, sc, "bbb")); - item->value = 20; - item->smaller_value = 2; - cl_git_pass(git_sortedcache_upsert((void **)&item, sc, "zzz")); - item->value = 30; - item->smaller_value = 26; - cl_git_pass(git_sortedcache_upsert((void **)&item, sc, "mmm")); - item->value = 40; - item->smaller_value = 14; - cl_git_pass(git_sortedcache_upsert((void **)&item, sc, "iii")); - item->value = 50; - item->smaller_value = 9; - git_sortedcache_wunlock(sc); - - cl_assert_equal_sz(5, git_sortedcache_entrycount(sc)); - - cl_git_pass(git_sortedcache_rlock(sc)); - - cl_assert((item = git_sortedcache_lookup(sc, "aaa")) != NULL); - cl_assert_equal_s("aaa", item->path); - cl_assert_equal_i(10, item->value); - cl_assert((item = git_sortedcache_lookup(sc, "mmm")) != NULL); - cl_assert_equal_s("mmm", item->path); - cl_assert_equal_i(40, item->value); - cl_assert((item = git_sortedcache_lookup(sc, "zzz")) != NULL); - cl_assert_equal_s("zzz", item->path); - cl_assert_equal_i(30, item->value); - cl_assert(git_sortedcache_lookup(sc, "abc") == NULL); - - /* not on Windows: - * cl_git_pass(git_sortedcache_rlock(sc)); -- grab more than one - */ - - cl_assert((item = git_sortedcache_entry(sc, 0)) != NULL); - cl_assert_equal_s("aaa", item->path); - cl_assert_equal_i(10, item->value); - cl_assert((item = git_sortedcache_entry(sc, 1)) != NULL); - cl_assert_equal_s("bbb", item->path); - cl_assert_equal_i(20, item->value); - cl_assert((item = git_sortedcache_entry(sc, 2)) != NULL); - cl_assert_equal_s("iii", item->path); - cl_assert_equal_i(50, item->value); - cl_assert((item = git_sortedcache_entry(sc, 3)) != NULL); - cl_assert_equal_s("mmm", item->path); - cl_assert_equal_i(40, item->value); - cl_assert((item = git_sortedcache_entry(sc, 4)) != NULL); - cl_assert_equal_s("zzz", item->path); - cl_assert_equal_i(30, item->value); - cl_assert(git_sortedcache_entry(sc, 5) == NULL); - - git_sortedcache_runlock(sc); - /* git_sortedcache_runlock(sc); */ - - cl_assert_equal_i(0, free_count); - - git_sortedcache_clear(sc, true); - - cl_assert_equal_i(5, free_count); - - cl_assert_equal_sz(0, git_sortedcache_entrycount(sc)); - cl_assert(git_sortedcache_entry(sc, 0) == NULL); - cl_assert(git_sortedcache_lookup(sc, "aaa") == NULL); - cl_assert(git_sortedcache_entry(sc, 0) == NULL); - - free_count = 0; - - cl_git_pass(git_sortedcache_wlock(sc)); - cl_git_pass(git_sortedcache_upsert((void **)&item, sc, "testing")); - item->value = 10; - item->smaller_value = 3; - cl_git_pass(git_sortedcache_upsert((void **)&item, sc, "again")); - item->value = 20; - item->smaller_value = 1; - cl_git_pass(git_sortedcache_upsert((void **)&item, sc, "final")); - item->value = 30; - item->smaller_value = 2; - git_sortedcache_wunlock(sc); - - cl_assert_equal_sz(3, git_sortedcache_entrycount(sc)); - - cl_assert((item = git_sortedcache_lookup(sc, "testing")) != NULL); - cl_assert_equal_s("testing", item->path); - cl_assert_equal_i(10, item->value); - cl_assert((item = git_sortedcache_lookup(sc, "again")) != NULL); - cl_assert_equal_s("again", item->path); - cl_assert_equal_i(20, item->value); - cl_assert((item = git_sortedcache_lookup(sc, "final")) != NULL); - cl_assert_equal_s("final", item->path); - cl_assert_equal_i(30, item->value); - cl_assert(git_sortedcache_lookup(sc, "zzz") == NULL); - - cl_assert((item = git_sortedcache_entry(sc, 0)) != NULL); - cl_assert_equal_s("again", item->path); - cl_assert_equal_i(20, item->value); - cl_assert((item = git_sortedcache_entry(sc, 1)) != NULL); - cl_assert_equal_s("final", item->path); - cl_assert_equal_i(30, item->value); - cl_assert((item = git_sortedcache_entry(sc, 2)) != NULL); - cl_assert_equal_s("testing", item->path); - cl_assert_equal_i(10, item->value); - cl_assert(git_sortedcache_entry(sc, 3) == NULL); - - { - size_t pos; - - cl_git_pass(git_sortedcache_wlock(sc)); - - cl_git_pass(git_sortedcache_lookup_index(&pos, sc, "again")); - cl_assert_equal_sz(0, pos); - cl_git_pass(git_sortedcache_remove(sc, pos)); - cl_assert_equal_i( - GIT_ENOTFOUND, git_sortedcache_lookup_index(&pos, sc, "again")); - - cl_assert_equal_sz(2, git_sortedcache_entrycount(sc)); - - cl_git_pass(git_sortedcache_lookup_index(&pos, sc, "testing")); - cl_assert_equal_sz(1, pos); - cl_git_pass(git_sortedcache_remove(sc, pos)); - cl_assert_equal_i( - GIT_ENOTFOUND, git_sortedcache_lookup_index(&pos, sc, "testing")); - - cl_assert_equal_sz(1, git_sortedcache_entrycount(sc)); - - cl_git_pass(git_sortedcache_lookup_index(&pos, sc, "final")); - cl_assert_equal_sz(0, pos); - cl_git_pass(git_sortedcache_remove(sc, pos)); - cl_assert_equal_i( - GIT_ENOTFOUND, git_sortedcache_lookup_index(&pos, sc, "final")); - - cl_assert_equal_sz(0, git_sortedcache_entrycount(sc)); - - git_sortedcache_wunlock(sc); - } - - git_sortedcache_free(sc); - - cl_assert_equal_i(3, free_count); -} - -static void sortedcache_test_reload(git_sortedcache *sc) -{ - int count = 0; - git_buf buf = GIT_BUF_INIT; - char *scan, *after; - sortedcache_test_struct *item; - - cl_assert(git_sortedcache_lockandload(sc, &buf) > 0); - - git_sortedcache_clear(sc, false); /* clear once we already have lock */ - - for (scan = buf.ptr; *scan; scan = after + 1) { - int val = strtol(scan, &after, 0); - cl_assert(after > scan); - scan = after; - - for (scan = after; git__isspace(*scan); ++scan) /* find start */; - for (after = scan; *after && *after != '\n'; ++after) /* find eol */; - *after = '\0'; - - cl_git_pass(git_sortedcache_upsert((void **)&item, sc, scan)); - - item->value = val; - item->smaller_value = (char)(count++); - } - - git_sortedcache_wunlock(sc); - - git_buf_free(&buf); -} - -void test_core_sortedcache__on_disk(void) -{ - git_sortedcache *sc; - sortedcache_test_struct *item; - int free_count = 0; - size_t pos; - - cl_git_mkfile("cacheitems.txt", "10 abc\n20 bcd\n30 cde\n"); - - cl_git_pass(git_sortedcache_new( - &sc, offsetof(sortedcache_test_struct, path), - sortedcache_test_struct_free, &free_count, - sortedcache_test_struct_cmp, "cacheitems.txt")); - - /* should need to reload the first time */ - - sortedcache_test_reload(sc); - - /* test what we loaded */ - - cl_assert_equal_sz(3, git_sortedcache_entrycount(sc)); - - cl_assert((item = git_sortedcache_lookup(sc, "abc")) != NULL); - cl_assert_equal_s("abc", item->path); - cl_assert_equal_i(10, item->value); - cl_assert((item = git_sortedcache_lookup(sc, "cde")) != NULL); - cl_assert_equal_s("cde", item->path); - cl_assert_equal_i(30, item->value); - cl_assert(git_sortedcache_lookup(sc, "aaa") == NULL); - - cl_assert((item = git_sortedcache_entry(sc, 0)) != NULL); - cl_assert_equal_s("abc", item->path); - cl_assert_equal_i(10, item->value); - cl_assert((item = git_sortedcache_entry(sc, 1)) != NULL); - cl_assert_equal_s("bcd", item->path); - cl_assert_equal_i(20, item->value); - cl_assert(git_sortedcache_entry(sc, 3) == NULL); - - /* should not need to reload this time */ - - cl_assert_equal_i(0, git_sortedcache_lockandload(sc, NULL)); - - /* rewrite ondisk file and reload */ - - cl_assert_equal_i(0, free_count); - - cl_git_rewritefile( - "cacheitems.txt", "100 abc\n200 zzz\n500 aaa\n10 final\n"); - sortedcache_test_reload(sc); - - cl_assert_equal_i(3, free_count); - - /* test what we loaded */ - - cl_assert_equal_sz(4, git_sortedcache_entrycount(sc)); - - cl_assert((item = git_sortedcache_lookup(sc, "abc")) != NULL); - cl_assert_equal_s("abc", item->path); - cl_assert_equal_i(100, item->value); - cl_assert((item = git_sortedcache_lookup(sc, "final")) != NULL); - cl_assert_equal_s("final", item->path); - cl_assert_equal_i(10, item->value); - cl_assert(git_sortedcache_lookup(sc, "cde") == NULL); - - cl_assert((item = git_sortedcache_entry(sc, 0)) != NULL); - cl_assert_equal_s("aaa", item->path); - cl_assert_equal_i(500, item->value); - cl_assert((item = git_sortedcache_entry(sc, 2)) != NULL); - cl_assert_equal_s("final", item->path); - cl_assert_equal_i(10, item->value); - cl_assert((item = git_sortedcache_entry(sc, 3)) != NULL); - cl_assert_equal_s("zzz", item->path); - cl_assert_equal_i(200, item->value); - - cl_git_pass(git_sortedcache_lookup_index(&pos, sc, "aaa")); - cl_assert_equal_sz(0, pos); - cl_git_pass(git_sortedcache_lookup_index(&pos, sc, "abc")); - cl_assert_equal_sz(1, pos); - cl_git_pass(git_sortedcache_lookup_index(&pos, sc, "final")); - cl_assert_equal_sz(2, pos); - cl_git_pass(git_sortedcache_lookup_index(&pos, sc, "zzz")); - cl_assert_equal_sz(3, pos); - cl_assert_equal_i( - GIT_ENOTFOUND, git_sortedcache_lookup_index(&pos, sc, "missing")); - cl_assert_equal_i( - GIT_ENOTFOUND, git_sortedcache_lookup_index(&pos, sc, "cde")); - - git_sortedcache_free(sc); - - cl_assert_equal_i(7, free_count); -} - diff --git a/vendor/libgit2/tests/core/stat.c b/vendor/libgit2/tests/core/stat.c deleted file mode 100644 index ef2e45a15..000000000 --- a/vendor/libgit2/tests/core/stat.c +++ /dev/null @@ -1,114 +0,0 @@ -#include "clar_libgit2.h" -#include "fileops.h" -#include "path.h" -#include "posix.h" - -void test_core_stat__initialize(void) -{ - cl_git_pass(git_futils_mkdir("root/d1/d2", 0755, GIT_MKDIR_PATH)); - cl_git_mkfile("root/file", "whatever\n"); - cl_git_mkfile("root/d1/file", "whatever\n"); -} - -void test_core_stat__cleanup(void) -{ - git_futils_rmdir_r("root", NULL, GIT_RMDIR_REMOVE_FILES); -} - -#define cl_assert_error(val) \ - do { err = errno; cl_assert_equal_i((val), err); } while (0) - -void test_core_stat__0(void) -{ - struct stat st; - int err; - - cl_assert_equal_i(0, p_lstat("root", &st)); - cl_assert(S_ISDIR(st.st_mode)); - cl_assert_error(0); - - cl_assert_equal_i(0, p_lstat("root/", &st)); - cl_assert(S_ISDIR(st.st_mode)); - cl_assert_error(0); - - cl_assert_equal_i(0, p_lstat("root/file", &st)); - cl_assert(S_ISREG(st.st_mode)); - cl_assert_error(0); - - cl_assert_equal_i(0, p_lstat("root/d1", &st)); - cl_assert(S_ISDIR(st.st_mode)); - cl_assert_error(0); - - cl_assert_equal_i(0, p_lstat("root/d1/", &st)); - cl_assert(S_ISDIR(st.st_mode)); - cl_assert_error(0); - - cl_assert_equal_i(0, p_lstat("root/d1/file", &st)); - cl_assert(S_ISREG(st.st_mode)); - cl_assert_error(0); - - cl_assert(p_lstat("root/missing", &st) < 0); - cl_assert_error(ENOENT); - - cl_assert(p_lstat("root/missing/but/could/be/created", &st) < 0); - cl_assert_error(ENOENT); - - cl_assert(p_lstat_posixly("root/missing/but/could/be/created", &st) < 0); - cl_assert_error(ENOENT); - - cl_assert(p_lstat("root/d1/missing", &st) < 0); - cl_assert_error(ENOENT); - - cl_assert(p_lstat("root/d1/missing/deeper/path", &st) < 0); - cl_assert_error(ENOENT); - - cl_assert(p_lstat_posixly("root/d1/missing/deeper/path", &st) < 0); - cl_assert_error(ENOENT); - - cl_assert(p_lstat_posixly("root/d1/file/deeper/path", &st) < 0); - cl_assert_error(ENOTDIR); - - cl_assert(p_lstat("root/file/invalid", &st) < 0); -#ifdef GIT_WIN32 - cl_assert_error(ENOENT); -#else - cl_assert_error(ENOTDIR); -#endif - - cl_assert(p_lstat_posixly("root/file/invalid", &st) < 0); - cl_assert_error(ENOTDIR); - - cl_assert(p_lstat("root/file/invalid/deeper_path", &st) < 0); -#ifdef GIT_WIN32 - cl_assert_error(ENOENT); -#else - cl_assert_error(ENOTDIR); -#endif - - cl_assert(p_lstat_posixly("root/file/invalid/deeper_path", &st) < 0); - cl_assert_error(ENOTDIR); - - cl_assert(p_lstat_posixly("root/d1/file/extra", &st) < 0); - cl_assert_error(ENOTDIR); - - cl_assert(p_lstat_posixly("root/d1/file/further/invalid/items", &st) < 0); - cl_assert_error(ENOTDIR); -} - -void test_core_stat__root(void) -{ - const char *sandbox = clar_sandbox_path(); - git_buf root = GIT_BUF_INIT; - int root_len; - struct stat st; - - root_len = git_path_root(sandbox); - cl_assert(root_len >= 0); - - git_buf_set(&root, sandbox, root_len+1); - - cl_must_pass(p_stat(root.ptr, &st)); - cl_assert(S_ISDIR(st.st_mode)); - - git_buf_free(&root); -} diff --git a/vendor/libgit2/tests/core/stream.c b/vendor/libgit2/tests/core/stream.c deleted file mode 100644 index 0cbf44230..000000000 --- a/vendor/libgit2/tests/core/stream.c +++ /dev/null @@ -1,51 +0,0 @@ -#include "clar_libgit2.h" -#include "git2/sys/stream.h" -#include "tls_stream.h" -#include "stream.h" - -static git_stream test_stream; -static int ctor_called; - -static int test_ctor(git_stream **out, const char *host, const char *port) -{ - GIT_UNUSED(host); - GIT_UNUSED(port); - - ctor_called = 1; - *out = &test_stream; - - return 0; -} - -void test_core_stream__register_tls(void) -{ - git_stream *stream; - int error; - - ctor_called = 0; - cl_git_pass(git_stream_register_tls(test_ctor)); - cl_git_pass(git_tls_stream_new(&stream, "localhost", "443")); - cl_assert_equal_i(1, ctor_called); - cl_assert_equal_p(&test_stream, stream); - - ctor_called = 0; - stream = NULL; - cl_git_pass(git_stream_register_tls(NULL)); - error = git_tls_stream_new(&stream, "localhost", "443"); - - /* We don't have arbitrary TLS stream support on Windows - * or when openssl support is disabled (except on OSX - * with Security framework). - */ -#if defined(GIT_WIN32) || \ - (!defined(GIT_SECURE_TRANSPORT) && !defined(GIT_OPENSSL)) - cl_git_fail_with(-1, error); -#else - cl_git_pass(error); -#endif - - cl_assert_equal_i(0, ctor_called); - cl_assert(&test_stream != stream); - - git_stream_free(stream); -} diff --git a/vendor/libgit2/tests/core/string.c b/vendor/libgit2/tests/core/string.c deleted file mode 100644 index 90e8fa027..000000000 --- a/vendor/libgit2/tests/core/string.c +++ /dev/null @@ -1,83 +0,0 @@ -#include "clar_libgit2.h" - -/* compare prefixes */ -void test_core_string__0(void) -{ - cl_assert(git__prefixcmp("", "") == 0); - cl_assert(git__prefixcmp("a", "") == 0); - cl_assert(git__prefixcmp("", "a") < 0); - cl_assert(git__prefixcmp("a", "b") < 0); - cl_assert(git__prefixcmp("b", "a") > 0); - cl_assert(git__prefixcmp("ab", "a") == 0); - cl_assert(git__prefixcmp("ab", "ac") < 0); - cl_assert(git__prefixcmp("ab", "aa") > 0); -} - -/* compare suffixes */ -void test_core_string__1(void) -{ - cl_assert(git__suffixcmp("", "") == 0); - cl_assert(git__suffixcmp("a", "") == 0); - cl_assert(git__suffixcmp("", "a") < 0); - cl_assert(git__suffixcmp("a", "b") < 0); - cl_assert(git__suffixcmp("b", "a") > 0); - cl_assert(git__suffixcmp("ba", "a") == 0); - cl_assert(git__suffixcmp("zaa", "ac") < 0); - cl_assert(git__suffixcmp("zaz", "ac") > 0); -} - -/* compare icase sorting with case equality */ -void test_core_string__2(void) -{ - cl_assert(git__strcasesort_cmp("", "") == 0); - cl_assert(git__strcasesort_cmp("foo", "foo") == 0); - cl_assert(git__strcasesort_cmp("foo", "bar") > 0); - cl_assert(git__strcasesort_cmp("bar", "foo") < 0); - cl_assert(git__strcasesort_cmp("foo", "FOO") > 0); - cl_assert(git__strcasesort_cmp("FOO", "foo") < 0); - cl_assert(git__strcasesort_cmp("foo", "BAR") > 0); - cl_assert(git__strcasesort_cmp("BAR", "foo") < 0); - cl_assert(git__strcasesort_cmp("fooBar", "foobar") < 0); -} - -void test_core_string__strcmp(void) -{ - cl_assert(git__strcmp("", "") == 0); - cl_assert(git__strcmp("foo", "foo") == 0); - cl_assert(git__strcmp("Foo", "foo") < 0); - cl_assert(git__strcmp("foo", "FOO") > 0); - cl_assert(git__strcmp("foo", "fOO") > 0); - - cl_assert(strcmp("rt\303\202of", "rt dev\302\266h") > 0); - cl_assert(strcmp("e\342\202\254ghi=", "et") > 0); - cl_assert(strcmp("rt dev\302\266h", "rt\303\202of") < 0); - cl_assert(strcmp("et", "e\342\202\254ghi=") < 0); - cl_assert(strcmp("\303\215", "\303\255") < 0); - - cl_assert(git__strcmp("rt\303\202of", "rt dev\302\266h") > 0); - cl_assert(git__strcmp("e\342\202\254ghi=", "et") > 0); - cl_assert(git__strcmp("rt dev\302\266h", "rt\303\202of") < 0); - cl_assert(git__strcmp("et", "e\342\202\254ghi=") < 0); - cl_assert(git__strcmp("\303\215", "\303\255") < 0); -} - -void test_core_string__strcasecmp(void) -{ - cl_assert(git__strcasecmp("", "") == 0); - cl_assert(git__strcasecmp("foo", "foo") == 0); - cl_assert(git__strcasecmp("foo", "Foo") == 0); - cl_assert(git__strcasecmp("foo", "FOO") == 0); - cl_assert(git__strcasecmp("foo", "fOO") == 0); - - cl_assert(strcasecmp("rt\303\202of", "rt dev\302\266h") > 0); - cl_assert(strcasecmp("e\342\202\254ghi=", "et") > 0); - cl_assert(strcasecmp("rt dev\302\266h", "rt\303\202of") < 0); - cl_assert(strcasecmp("et", "e\342\202\254ghi=") < 0); - cl_assert(strcasecmp("\303\215", "\303\255") < 0); - - cl_assert(git__strcasecmp("rt\303\202of", "rt dev\302\266h") > 0); - cl_assert(git__strcasecmp("e\342\202\254ghi=", "et") > 0); - cl_assert(git__strcasecmp("rt dev\302\266h", "rt\303\202of") < 0); - cl_assert(git__strcasecmp("et", "e\342\202\254ghi=") < 0); - cl_assert(git__strcasecmp("\303\215", "\303\255") < 0); -} diff --git a/vendor/libgit2/tests/core/strmap.c b/vendor/libgit2/tests/core/strmap.c deleted file mode 100644 index 3b4276aea..000000000 --- a/vendor/libgit2/tests/core/strmap.c +++ /dev/null @@ -1,100 +0,0 @@ -#include "clar_libgit2.h" -#include "strmap.h" - -GIT__USE_STRMAP - -git_strmap *g_table; - -void test_core_strmap__initialize(void) -{ - cl_git_pass(git_strmap_alloc(&g_table)); - cl_assert(g_table != NULL); -} - -void test_core_strmap__cleanup(void) -{ - git_strmap_free(g_table); -} - -void test_core_strmap__0(void) -{ - cl_assert(git_strmap_num_entries(g_table) == 0); -} - -static void insert_strings(git_strmap *table, int count) -{ - int i, j, over, err; - char *str; - - for (i = 0; i < count; ++i) { - str = malloc(10); - for (j = 0; j < 10; ++j) - str[j] = 'a' + (i % 26); - str[9] = '\0'; - - /* if > 26, then encode larger value in first letters */ - for (j = 0, over = i / 26; over > 0; j++, over = over / 26) - str[j] = 'A' + (over % 26); - - git_strmap_insert(table, str, str, err); - cl_assert(err >= 0); - } - - cl_assert((int)git_strmap_num_entries(table) == count); -} - -void test_core_strmap__1(void) -{ - int i; - char *str; - - insert_strings(g_table, 20); - - cl_assert(git_strmap_exists(g_table, "aaaaaaaaa")); - cl_assert(git_strmap_exists(g_table, "ggggggggg")); - cl_assert(!git_strmap_exists(g_table, "aaaaaaaab")); - cl_assert(!git_strmap_exists(g_table, "abcdefghi")); - - i = 0; - git_strmap_foreach_value(g_table, str, { i++; free(str); }); - cl_assert(i == 20); -} - -void test_core_strmap__2(void) -{ - khiter_t pos; - int i; - char *str; - - insert_strings(g_table, 20); - - cl_assert(git_strmap_exists(g_table, "aaaaaaaaa")); - cl_assert(git_strmap_exists(g_table, "ggggggggg")); - cl_assert(!git_strmap_exists(g_table, "aaaaaaaab")); - cl_assert(!git_strmap_exists(g_table, "abcdefghi")); - - cl_assert(git_strmap_exists(g_table, "bbbbbbbbb")); - pos = git_strmap_lookup_index(g_table, "bbbbbbbbb"); - cl_assert(git_strmap_valid_index(g_table, pos)); - cl_assert_equal_s(git_strmap_value_at(g_table, pos), "bbbbbbbbb"); - free(git_strmap_value_at(g_table, pos)); - git_strmap_delete_at(g_table, pos); - - cl_assert(!git_strmap_exists(g_table, "bbbbbbbbb")); - - i = 0; - git_strmap_foreach_value(g_table, str, { i++; free(str); }); - cl_assert(i == 19); -} - -void test_core_strmap__3(void) -{ - int i; - char *str; - - insert_strings(g_table, 10000); - - i = 0; - git_strmap_foreach_value(g_table, str, { i++; free(str); }); - cl_assert(i == 10000); -} diff --git a/vendor/libgit2/tests/core/strtol.c b/vendor/libgit2/tests/core/strtol.c deleted file mode 100644 index 8765e042b..000000000 --- a/vendor/libgit2/tests/core/strtol.c +++ /dev/null @@ -1,37 +0,0 @@ -#include "clar_libgit2.h" - -void test_core_strtol__int32(void) -{ - int32_t i; - - cl_git_pass(git__strtol32(&i, "123", NULL, 10)); - cl_assert(i == 123); - cl_git_pass(git__strtol32(&i, " +123 ", NULL, 10)); - cl_assert(i == 123); - cl_git_pass(git__strtol32(&i, " +2147483647 ", NULL, 10)); - cl_assert(i == 2147483647); - cl_git_pass(git__strtol32(&i, " -2147483648 ", NULL, 10)); - cl_assert(i == -2147483648LL); - - cl_git_fail(git__strtol32(&i, " 2147483657 ", NULL, 10)); - cl_git_fail(git__strtol32(&i, " -2147483657 ", NULL, 10)); -} - -void test_core_strtol__int64(void) -{ - int64_t i; - - cl_git_pass(git__strtol64(&i, "123", NULL, 10)); - cl_assert(i == 123); - cl_git_pass(git__strtol64(&i, " +123 ", NULL, 10)); - cl_assert(i == 123); - cl_git_pass(git__strtol64(&i, " +2147483647 ", NULL, 10)); - cl_assert(i == 2147483647); - cl_git_pass(git__strtol64(&i, " -2147483648 ", NULL, 10)); - cl_assert(i == -2147483648LL); - cl_git_pass(git__strtol64(&i, " 2147483657 ", NULL, 10)); - cl_assert(i == 2147483657LL); - cl_git_pass(git__strtol64(&i, " -2147483657 ", NULL, 10)); - cl_assert(i == -2147483657LL); -} - diff --git a/vendor/libgit2/tests/core/structinit.c b/vendor/libgit2/tests/core/structinit.c deleted file mode 100644 index e9f7b4a74..000000000 --- a/vendor/libgit2/tests/core/structinit.c +++ /dev/null @@ -1,168 +0,0 @@ -#include "clar_libgit2.h" -#include -#include -#include -#include - -#define STRINGIFY(s) #s - -/* Checks two conditions for the specified structure: - * 1. That the initializers for the latest version produces the same - * in-memory representation. - * 2. That the function-based initializer supports all versions from 1...n, - * where n is the latest version (often represented by GIT_*_VERSION). - * - * Parameters: - * structname: The name of the structure to test, e.g. git_blame_options. - * structver: The latest version of the specified structure. - * macroinit: The macro that initializes the latest version of the structure. - * funcinitname: The function that initializes the structure. Must have the - * signature "int (structname* instance, int version)". - */ -#define CHECK_MACRO_FUNC_INIT_EQUAL(structname, structver, macroinit, funcinitname) \ -do { \ - structname structname##_macro_latest = macroinit; \ - structname structname##_func_latest; \ - int structname##_curr_ver = structver - 1; \ - memset(&structname##_func_latest, 0, sizeof(structname##_func_latest)); \ - cl_git_pass(funcinitname(&structname##_func_latest, structver)); \ - options_cmp(&structname##_macro_latest, &structname##_func_latest, \ - sizeof(structname), STRINGIFY(structname)); \ - \ - while (structname##_curr_ver > 0) \ - { \ - structname macro; \ - cl_git_pass(funcinitname(¯o, structname##_curr_ver)); \ - structname##_curr_ver--; \ - }\ -} while(0) - -static void options_cmp(void *one, void *two, size_t size, const char *name) -{ - size_t i; - - for (i = 0; i < size; i++) { - if (((char *)one)[i] != ((char *)two)[i]) { - char desc[1024]; - - p_snprintf(desc, 1024, "Difference in %s at byte %" PRIuZ ": macro=%u / func=%u", - name, i, ((char *)one)[i], ((char *)two)[i]); - clar__fail(__FILE__, __LINE__, - "Difference between macro and function options initializer", - desc, 0); - return; - } - } -} - -void test_core_structinit__compare(void) -{ - /* These tests assume that they can memcmp() two structures that were - * initialized with the same static initializer. Eg, - * git_blame_options = GIT_BLAME_OPTIONS_INIT; - * - * This assumption fails when there is padding between structure members, - * which is not guaranteed to be initialized to anything sane at all. - * - * Assume most compilers, in a debug build, will clear that memory for - * us or set it to sentinal markers. Etc. - */ -#if !defined(DEBUG) && !defined(_DEBUG) - clar__skip(); -#endif - - /* blame */ - CHECK_MACRO_FUNC_INIT_EQUAL( \ - git_blame_options, GIT_BLAME_OPTIONS_VERSION, \ - GIT_BLAME_OPTIONS_INIT, git_blame_init_options); - - /* checkout */ - CHECK_MACRO_FUNC_INIT_EQUAL( \ - git_checkout_options, GIT_CHECKOUT_OPTIONS_VERSION, \ - GIT_CHECKOUT_OPTIONS_INIT, git_checkout_init_options); - - /* clone */ - CHECK_MACRO_FUNC_INIT_EQUAL( \ - git_clone_options, GIT_CLONE_OPTIONS_VERSION, \ - GIT_CLONE_OPTIONS_INIT, git_clone_init_options); - - /* diff */ - CHECK_MACRO_FUNC_INIT_EQUAL( \ - git_diff_options, GIT_DIFF_OPTIONS_VERSION, \ - GIT_DIFF_OPTIONS_INIT, git_diff_init_options); - - /* diff_find */ - CHECK_MACRO_FUNC_INIT_EQUAL( \ - git_diff_find_options, GIT_DIFF_FIND_OPTIONS_VERSION, \ - GIT_DIFF_FIND_OPTIONS_INIT, git_diff_find_init_options); - - /* merge_file_input */ - CHECK_MACRO_FUNC_INIT_EQUAL( \ - git_merge_file_input, GIT_MERGE_FILE_INPUT_VERSION, \ - GIT_MERGE_FILE_INPUT_INIT, git_merge_file_init_input); - - /* merge_file */ - CHECK_MACRO_FUNC_INIT_EQUAL( \ - git_merge_file_options, GIT_MERGE_FILE_OPTIONS_VERSION, \ - GIT_MERGE_FILE_OPTIONS_INIT, git_merge_file_init_options); - - /* merge_tree */ - CHECK_MACRO_FUNC_INIT_EQUAL( \ - git_merge_options, GIT_MERGE_OPTIONS_VERSION, \ - GIT_MERGE_OPTIONS_INIT, git_merge_init_options); - - /* push */ - CHECK_MACRO_FUNC_INIT_EQUAL( \ - git_push_options, GIT_PUSH_OPTIONS_VERSION, \ - GIT_PUSH_OPTIONS_INIT, git_push_init_options); - - /* remote */ - CHECK_MACRO_FUNC_INIT_EQUAL( \ - git_remote_callbacks, GIT_REMOTE_CALLBACKS_VERSION, \ - GIT_REMOTE_CALLBACKS_INIT, git_remote_init_callbacks); - - /* repository_init */ - CHECK_MACRO_FUNC_INIT_EQUAL( \ - git_repository_init_options, GIT_REPOSITORY_INIT_OPTIONS_VERSION, \ - GIT_REPOSITORY_INIT_OPTIONS_INIT, git_repository_init_init_options); - - /* revert */ - CHECK_MACRO_FUNC_INIT_EQUAL( \ - git_revert_options, GIT_REVERT_OPTIONS_VERSION, \ - GIT_REVERT_OPTIONS_INIT, git_revert_init_options); - - /* stash apply */ - CHECK_MACRO_FUNC_INIT_EQUAL( \ - git_stash_apply_options, GIT_STASH_APPLY_OPTIONS_VERSION, \ - GIT_STASH_APPLY_OPTIONS_INIT, git_stash_apply_init_options); - - /* status */ - CHECK_MACRO_FUNC_INIT_EQUAL( \ - git_status_options, GIT_STATUS_OPTIONS_VERSION, \ - GIT_STATUS_OPTIONS_INIT, git_status_init_options); - - /* transport */ - CHECK_MACRO_FUNC_INIT_EQUAL( \ - git_transport, GIT_TRANSPORT_VERSION, \ - GIT_TRANSPORT_INIT, git_transport_init); - - /* config_backend */ - CHECK_MACRO_FUNC_INIT_EQUAL( \ - git_config_backend, GIT_CONFIG_BACKEND_VERSION, \ - GIT_CONFIG_BACKEND_INIT, git_config_init_backend); - - /* odb_backend */ - CHECK_MACRO_FUNC_INIT_EQUAL( \ - git_odb_backend, GIT_ODB_BACKEND_VERSION, \ - GIT_ODB_BACKEND_INIT, git_odb_init_backend); - - /* refdb_backend */ - CHECK_MACRO_FUNC_INIT_EQUAL( \ - git_refdb_backend, GIT_REFDB_BACKEND_VERSION, \ - GIT_REFDB_BACKEND_INIT, git_refdb_init_backend); - - /* submodule update */ - CHECK_MACRO_FUNC_INIT_EQUAL( \ - git_submodule_update_options, GIT_SUBMODULE_UPDATE_OPTIONS_VERSION, \ - GIT_SUBMODULE_UPDATE_OPTIONS_INIT, git_submodule_update_init_options); -} diff --git a/vendor/libgit2/tests/core/useragent.c b/vendor/libgit2/tests/core/useragent.c deleted file mode 100644 index 6d06693a8..000000000 --- a/vendor/libgit2/tests/core/useragent.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "clar_libgit2.h" -#include "global.h" - -void test_core_useragent__get(void) -{ - const char *custom_name = "super duper git"; - - cl_assert_equal_p(NULL, git_libgit2__user_agent()); - cl_git_pass(git_libgit2_opts(GIT_OPT_SET_USER_AGENT, custom_name)); - cl_assert_equal_s(custom_name, git_libgit2__user_agent()); -} diff --git a/vendor/libgit2/tests/core/vector.c b/vendor/libgit2/tests/core/vector.c deleted file mode 100644 index 66f90b82b..000000000 --- a/vendor/libgit2/tests/core/vector.c +++ /dev/null @@ -1,276 +0,0 @@ -#include "clar_libgit2.h" -#include "vector.h" - -/* initial size of 1 would cause writing past array bounds */ -void test_core_vector__0(void) -{ - git_vector x; - int i; - git_vector_init(&x, 1, NULL); - for (i = 0; i < 10; ++i) { - git_vector_insert(&x, (void*) 0xabc); - } - git_vector_free(&x); -} - - -/* don't read past array bounds on remove() */ -void test_core_vector__1(void) -{ - git_vector x; - // make initial capacity exact for our insertions. - git_vector_init(&x, 3, NULL); - git_vector_insert(&x, (void*) 0xabc); - git_vector_insert(&x, (void*) 0xdef); - git_vector_insert(&x, (void*) 0x123); - - git_vector_remove(&x, 0); // used to read past array bounds. - git_vector_free(&x); -} - - -static int test_cmp(const void *a, const void *b) -{ - return *(const int *)a - *(const int *)b; -} - -/* remove duplicates */ -void test_core_vector__2(void) -{ - git_vector x; - int *ptrs[2]; - - ptrs[0] = git__malloc(sizeof(int)); - ptrs[1] = git__malloc(sizeof(int)); - - *ptrs[0] = 2; - *ptrs[1] = 1; - - cl_git_pass(git_vector_init(&x, 5, test_cmp)); - cl_git_pass(git_vector_insert(&x, ptrs[0])); - cl_git_pass(git_vector_insert(&x, ptrs[1])); - cl_git_pass(git_vector_insert(&x, ptrs[1])); - cl_git_pass(git_vector_insert(&x, ptrs[0])); - cl_git_pass(git_vector_insert(&x, ptrs[1])); - cl_assert(x.length == 5); - - git_vector_uniq(&x, NULL); - cl_assert(x.length == 2); - - git_vector_free(&x); - - git__free(ptrs[0]); - git__free(ptrs[1]); -} - - -static int compare_them(const void *a, const void *b) -{ - return (int)((long)a - (long)b); -} - -/* insert_sorted */ -void test_core_vector__3(void) -{ - git_vector x; - long i; - git_vector_init(&x, 1, &compare_them); - - for (i = 0; i < 10; i += 2) { - git_vector_insert_sorted(&x, (void*)(i + 1), NULL); - } - - for (i = 9; i > 0; i -= 2) { - git_vector_insert_sorted(&x, (void*)(i + 1), NULL); - } - - cl_assert(x.length == 10); - for (i = 0; i < 10; ++i) { - cl_assert(git_vector_get(&x, i) == (void*)(i + 1)); - } - - git_vector_free(&x); -} - -/* insert_sorted with duplicates */ -void test_core_vector__4(void) -{ - git_vector x; - long i; - git_vector_init(&x, 1, &compare_them); - - for (i = 0; i < 10; i += 2) { - git_vector_insert_sorted(&x, (void*)(i + 1), NULL); - } - - for (i = 9; i > 0; i -= 2) { - git_vector_insert_sorted(&x, (void*)(i + 1), NULL); - } - - for (i = 0; i < 10; i += 2) { - git_vector_insert_sorted(&x, (void*)(i + 1), NULL); - } - - for (i = 9; i > 0; i -= 2) { - git_vector_insert_sorted(&x, (void*)(i + 1), NULL); - } - - cl_assert(x.length == 20); - for (i = 0; i < 20; ++i) { - cl_assert(git_vector_get(&x, i) == (void*)(i / 2 + 1)); - } - - git_vector_free(&x); -} - -typedef struct { - int content; - int count; -} my_struct; - -static int _struct_count = 0; - -static int compare_structs(const void *a, const void *b) -{ - return ((const my_struct *)a)->content - - ((const my_struct *)b)->content; -} - -static int merge_structs(void **old_raw, void *new) -{ - my_struct *old = *(my_struct **)old_raw; - cl_assert(((my_struct *)old)->content == ((my_struct *)new)->content); - ((my_struct *)old)->count += 1; - git__free(new); - _struct_count--; - return GIT_EEXISTS; -} - -static my_struct *alloc_struct(int value) -{ - my_struct *st = git__malloc(sizeof(my_struct)); - st->content = value; - st->count = 0; - _struct_count++; - return st; -} - -/* insert_sorted with duplicates and special handling */ -void test_core_vector__5(void) -{ - git_vector x; - int i; - - git_vector_init(&x, 1, &compare_structs); - - for (i = 0; i < 10; i += 2) - git_vector_insert_sorted(&x, alloc_struct(i), &merge_structs); - - for (i = 9; i > 0; i -= 2) - git_vector_insert_sorted(&x, alloc_struct(i), &merge_structs); - - cl_assert(x.length == 10); - cl_assert(_struct_count == 10); - - for (i = 0; i < 10; i += 2) - git_vector_insert_sorted(&x, alloc_struct(i), &merge_structs); - - for (i = 9; i > 0; i -= 2) - git_vector_insert_sorted(&x, alloc_struct(i), &merge_structs); - - cl_assert(x.length == 10); - cl_assert(_struct_count == 10); - - for (i = 0; i < 10; ++i) { - cl_assert(((my_struct *)git_vector_get(&x, i))->content == i); - git__free(git_vector_get(&x, i)); - _struct_count--; - } - - git_vector_free(&x); -} - -static int remove_ones(const git_vector *v, size_t idx, void *p) -{ - GIT_UNUSED(p); - return (git_vector_get(v, idx) == (void *)0x001); -} - -/* Test removal based on callback */ -void test_core_vector__remove_matching(void) -{ - git_vector x; - size_t i; - void *compare; - - git_vector_init(&x, 1, NULL); - git_vector_insert(&x, (void*) 0x001); - - cl_assert(x.length == 1); - git_vector_remove_matching(&x, remove_ones, NULL); - cl_assert(x.length == 0); - - git_vector_insert(&x, (void*) 0x001); - git_vector_insert(&x, (void*) 0x001); - git_vector_insert(&x, (void*) 0x001); - - cl_assert(x.length == 3); - git_vector_remove_matching(&x, remove_ones, NULL); - cl_assert(x.length == 0); - - git_vector_insert(&x, (void*) 0x002); - git_vector_insert(&x, (void*) 0x001); - git_vector_insert(&x, (void*) 0x002); - git_vector_insert(&x, (void*) 0x001); - - cl_assert(x.length == 4); - git_vector_remove_matching(&x, remove_ones, NULL); - cl_assert(x.length == 2); - - git_vector_foreach(&x, i, compare) { - cl_assert(compare != (void *)0x001); - } - - git_vector_clear(&x); - - git_vector_insert(&x, (void*) 0x001); - git_vector_insert(&x, (void*) 0x002); - git_vector_insert(&x, (void*) 0x002); - git_vector_insert(&x, (void*) 0x001); - - cl_assert(x.length == 4); - git_vector_remove_matching(&x, remove_ones, NULL); - cl_assert(x.length == 2); - - git_vector_foreach(&x, i, compare) { - cl_assert(compare != (void *)0x001); - } - - git_vector_clear(&x); - - git_vector_insert(&x, (void*) 0x002); - git_vector_insert(&x, (void*) 0x001); - git_vector_insert(&x, (void*) 0x002); - git_vector_insert(&x, (void*) 0x001); - - cl_assert(x.length == 4); - git_vector_remove_matching(&x, remove_ones, NULL); - cl_assert(x.length == 2); - - git_vector_foreach(&x, i, compare) { - cl_assert(compare != (void *)0x001); - } - - git_vector_clear(&x); - - git_vector_insert(&x, (void*) 0x002); - git_vector_insert(&x, (void*) 0x003); - git_vector_insert(&x, (void*) 0x002); - git_vector_insert(&x, (void*) 0x003); - - cl_assert(x.length == 4); - git_vector_remove_matching(&x, remove_ones, NULL); - cl_assert(x.length == 4); - - git_vector_free(&x); -} diff --git a/vendor/libgit2/tests/core/zstream.c b/vendor/libgit2/tests/core/zstream.c deleted file mode 100644 index 7ba9424ba..000000000 --- a/vendor/libgit2/tests/core/zstream.c +++ /dev/null @@ -1,143 +0,0 @@ -#include "clar_libgit2.h" -#include "buffer.h" -#include "zstream.h" - -static const char *data = "This is a test test test of This is a test"; - -#define INFLATE_EXTRA 2 - -static void assert_zlib_equal_( - const void *expected, size_t e_len, - const void *compressed, size_t c_len, - const char *msg, const char *file, int line) -{ - z_stream stream; - char *expanded = git__calloc(1, e_len + INFLATE_EXTRA); - cl_assert(expanded); - - memset(&stream, 0, sizeof(stream)); - stream.next_out = (Bytef *)expanded; - stream.avail_out = (uInt)(e_len + INFLATE_EXTRA); - stream.next_in = (Bytef *)compressed; - stream.avail_in = (uInt)c_len; - - cl_assert(inflateInit(&stream) == Z_OK); - cl_assert(inflate(&stream, Z_FINISH)); - inflateEnd(&stream); - - clar__assert_equal( - file, line, msg, 1, - "%d", (int)stream.total_out, (int)e_len); - clar__assert_equal( - file, line, "Buffer len was not exact match", 1, - "%d", (int)stream.avail_out, (int)INFLATE_EXTRA); - - clar__assert( - memcmp(expanded, expected, e_len) == 0, - file, line, "uncompressed data did not match", NULL, 1); - - git__free(expanded); -} - -#define assert_zlib_equal(E,EL,C,CL) \ - assert_zlib_equal_(E, EL, C, CL, #EL " != " #CL, __FILE__, (int)__LINE__) - -void test_core_zstream__basic(void) -{ - git_zstream z = GIT_ZSTREAM_INIT; - char out[128]; - size_t outlen = sizeof(out); - - cl_git_pass(git_zstream_init(&z)); - cl_git_pass(git_zstream_set_input(&z, data, strlen(data) + 1)); - cl_git_pass(git_zstream_get_output(out, &outlen, &z)); - cl_assert(git_zstream_done(&z)); - cl_assert(outlen > 0); - git_zstream_free(&z); - - assert_zlib_equal(data, strlen(data) + 1, out, outlen); -} - -void test_core_zstream__buffer(void) -{ - git_buf out = GIT_BUF_INIT; - cl_git_pass(git_zstream_deflatebuf(&out, data, strlen(data) + 1)); - assert_zlib_equal(data, strlen(data) + 1, out.ptr, out.size); - git_buf_free(&out); -} - -#define BIG_STRING_PART "Big Data IS Big - Long Data IS Long - We need a buffer larger than 1024 x 1024 to make sure we trigger chunked compression - Big Big Data IS Bigger than Big - Long Long Data IS Longer than Long" - -static void compress_input_various_ways(git_buf *input) -{ - git_buf out1 = GIT_BUF_INIT, out2 = GIT_BUF_INIT; - size_t i, fixed_size = max(input->size / 2, 256); - char *fixed = git__malloc(fixed_size); - cl_assert(fixed); - - /* compress with deflatebuf */ - - cl_git_pass(git_zstream_deflatebuf(&out1, input->ptr, input->size)); - assert_zlib_equal(input->ptr, input->size, out1.ptr, out1.size); - - /* compress with various fixed size buffer (accumulating the output) */ - - for (i = 0; i < 3; ++i) { - git_zstream zs = GIT_ZSTREAM_INIT; - size_t use_fixed_size; - - switch (i) { - case 0: use_fixed_size = 256; break; - case 1: use_fixed_size = fixed_size / 2; break; - case 2: use_fixed_size = fixed_size; break; - } - cl_assert(use_fixed_size <= fixed_size); - - cl_git_pass(git_zstream_init(&zs)); - cl_git_pass(git_zstream_set_input(&zs, input->ptr, input->size)); - - while (!git_zstream_done(&zs)) { - size_t written = use_fixed_size; - cl_git_pass(git_zstream_get_output(fixed, &written, &zs)); - cl_git_pass(git_buf_put(&out2, fixed, written)); - } - - git_zstream_free(&zs); - assert_zlib_equal(input->ptr, input->size, out2.ptr, out2.size); - - /* did both approaches give the same data? */ - cl_assert_equal_sz(out1.size, out2.size); - cl_assert(!memcmp(out1.ptr, out2.ptr, out1.size)); - - git_buf_free(&out2); - } - - git_buf_free(&out1); - git__free(fixed); -} - -void test_core_zstream__big_data(void) -{ - git_buf in = GIT_BUF_INIT; - size_t scan, target; - - for (target = 1024; target <= 1024 * 1024 * 4; target *= 8) { - - /* make a big string that's easy to compress */ - git_buf_clear(&in); - while (in.size < target) - cl_git_pass( - git_buf_put(&in, BIG_STRING_PART, strlen(BIG_STRING_PART))); - - compress_input_various_ways(&in); - - /* make a big string that's hard to compress */ - srand(0xabad1dea); - for (scan = 0; scan < in.size; ++scan) - in.ptr[scan] = (char)rand(); - - compress_input_various_ways(&in); - } - - git_buf_free(&in); -} diff --git a/vendor/libgit2/tests/date/date.c b/vendor/libgit2/tests/date/date.c deleted file mode 100644 index 88881d1e1..000000000 --- a/vendor/libgit2/tests/date/date.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "clar_libgit2.h" - -#include "util.h" - -void test_date_date__overflow(void) -{ -#ifdef __LP64__ - git_time_t d2038, d2039; - - /* This is expected to fail on a 32-bit machine. */ - cl_git_pass(git__date_parse(&d2038, "2038-1-1")); - cl_git_pass(git__date_parse(&d2039, "2039-1-1")); - cl_assert(d2038 < d2039); -#endif -} diff --git a/vendor/libgit2/tests/date/rfc2822.c b/vendor/libgit2/tests/date/rfc2822.c deleted file mode 100644 index eda475ac9..000000000 --- a/vendor/libgit2/tests/date/rfc2822.c +++ /dev/null @@ -1,40 +0,0 @@ -#include "clar_libgit2.h" - -#include "util.h" - -void test_date_rfc2822__format_rfc2822_no_offset(void) -{ - git_time t = {1397031663, 0}; - char buf[GIT_DATE_RFC2822_SZ]; - - cl_git_pass(git__date_rfc2822_fmt(buf, sizeof(buf), &t)); - cl_assert(strcmp(buf, "Wed, 9 Apr 2014 08:21:03 +0000") == 0); -} - -void test_date_rfc2822__format_rfc2822_positive_offset(void) -{ - git_time t = {1397031663, 120}; - char buf[GIT_DATE_RFC2822_SZ]; - - cl_git_pass(git__date_rfc2822_fmt(buf, sizeof(buf), &t)); - cl_assert(strcmp(buf, "Wed, 9 Apr 2014 10:21:03 +0200") == 0); -} - -void test_date_rfc2822__format_rfc2822_negative_offset(void) -{ - git_time t = {1397031663, -120}; - char buf[GIT_DATE_RFC2822_SZ]; - - cl_git_pass(git__date_rfc2822_fmt(buf, sizeof(buf), &t)); - cl_assert(strcmp(buf, "Wed, 9 Apr 2014 06:21:03 -0200") == 0); -} - -void test_date_rfc2822__format_rfc2822_buffer_too_small(void) -{ - // "Wed, 10 Apr 2014 08:21:03 +0000" - git_time t = {1397031663 + 86400, 0}; - char buf[GIT_DATE_RFC2822_SZ-1]; - - cl_git_fail(git__date_rfc2822_fmt(buf, sizeof(buf), &t)); -} - diff --git a/vendor/libgit2/tests/describe/describe.c b/vendor/libgit2/tests/describe/describe.c deleted file mode 100644 index a8c57d874..000000000 --- a/vendor/libgit2/tests/describe/describe.c +++ /dev/null @@ -1,55 +0,0 @@ -#include "clar_libgit2.h" -#include "describe_helpers.h" - -void test_describe_describe__can_describe_against_a_bare_repo(void) -{ - git_repository *repo; - git_describe_options opts = GIT_DESCRIBE_OPTIONS_INIT; - git_describe_format_options fmt_opts = GIT_DESCRIBE_FORMAT_OPTIONS_INIT; - - cl_git_pass(git_repository_open(&repo, cl_fixture("testrepo.git"))); - - assert_describe("hard_tag", "HEAD", repo, &opts, &fmt_opts); - - opts.show_commit_oid_as_fallback = 1; - - assert_describe("be3563a*", "HEAD^", repo, &opts, &fmt_opts); - - git_repository_free(repo); -} - -static int delete_cb(git_reference *ref, void *payload) -{ - GIT_UNUSED(payload); - - cl_git_pass(git_reference_delete(ref)); - git_reference_free(ref); - - return 0; -} - -void test_describe_describe__describe_a_repo_with_no_refs(void) -{ - git_repository *repo; - git_describe_options opts = GIT_DESCRIBE_OPTIONS_INIT; - git_buf buf = GIT_BUF_INIT; - git_object *object; - git_describe_result *result = NULL; - - repo = cl_git_sandbox_init("testrepo.git"); - cl_git_pass(git_revparse_single(&object, repo, "HEAD")); - - cl_git_pass(git_reference_foreach(repo, delete_cb, NULL)); - - /* Impossible to describe without falling back to OIDs */ - cl_git_fail(git_describe_commit(&result, object, &opts)); - - /* Try again with OID fallbacks */ - opts.show_commit_oid_as_fallback = 1; - cl_git_pass(git_describe_commit(&result, object, &opts)); - - git_describe_result_free(result); - git_object_free(object); - git_buf_free(&buf); - cl_git_sandbox_cleanup(); -} diff --git a/vendor/libgit2/tests/describe/describe_helpers.c b/vendor/libgit2/tests/describe/describe_helpers.c deleted file mode 100644 index ad9c945c7..000000000 --- a/vendor/libgit2/tests/describe/describe_helpers.c +++ /dev/null @@ -1,42 +0,0 @@ -#include "describe_helpers.h" - -void assert_describe( - const char *expected_output, - const char *revparse_spec, - git_repository *repo, - git_describe_options *opts, - git_describe_format_options *fmt_opts) -{ - git_object *object; - git_buf label = GIT_BUF_INIT; - git_describe_result *result; - - cl_git_pass(git_revparse_single(&object, repo, revparse_spec)); - - cl_git_pass(git_describe_commit(&result, object, opts)); - cl_git_pass(git_describe_format(&label, result, fmt_opts)); - - cl_must_pass(p_fnmatch(expected_output, git_buf_cstr(&label), 0)); - - git_describe_result_free(result); - git_object_free(object); - git_buf_free(&label); -} - -void assert_describe_workdir( - const char *expected_output, - git_repository *repo, - git_describe_options *opts, - git_describe_format_options *fmt_opts) -{ - git_buf label = GIT_BUF_INIT; - git_describe_result *result; - - cl_git_pass(git_describe_workdir(&result, repo, opts)); - cl_git_pass(git_describe_format(&label, result, fmt_opts)); - - cl_must_pass(p_fnmatch(expected_output, git_buf_cstr(&label), 0)); - - git_describe_result_free(result); - git_buf_free(&label); -} diff --git a/vendor/libgit2/tests/describe/describe_helpers.h b/vendor/libgit2/tests/describe/describe_helpers.h deleted file mode 100644 index 16a0638e3..000000000 --- a/vendor/libgit2/tests/describe/describe_helpers.h +++ /dev/null @@ -1,15 +0,0 @@ -#include "clar_libgit2.h" -#include "buffer.h" - -extern void assert_describe( - const char *expected_output, - const char *revparse_spec, - git_repository *repo, - git_describe_options *opts, - git_describe_format_options *fmt_opts); - -extern void assert_describe_workdir( - const char *expected_output, - git_repository *repo, - git_describe_options *opts, - git_describe_format_options *fmt_opts); diff --git a/vendor/libgit2/tests/describe/t6120.c b/vendor/libgit2/tests/describe/t6120.c deleted file mode 100644 index 6df397ec6..000000000 --- a/vendor/libgit2/tests/describe/t6120.c +++ /dev/null @@ -1,156 +0,0 @@ -#include "clar_libgit2.h" -#include "describe_helpers.h" -#include "repository.h" - -// Ported from https://github.com/git/git/blob/adfc1857bdb090786fd9d22c1acec39371c76048/t/t6120-describe.sh - -static git_repository *repo; - -void test_describe_t6120__initialize(void) -{ - repo = cl_git_sandbox_init("describe"); -} - -void test_describe_t6120__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -void test_describe_t6120__default(void) -{ - git_describe_options opts = GIT_DESCRIBE_OPTIONS_INIT; - git_describe_format_options fmt_opts = GIT_DESCRIBE_FORMAT_OPTIONS_INIT; - - assert_describe("A-*", "HEAD", repo, &opts, &fmt_opts); - assert_describe("A-*", "HEAD^", repo, &opts, &fmt_opts); - assert_describe("R-*", "HEAD^^", repo, &opts, &fmt_opts); - assert_describe("A-*", "HEAD^^2", repo, &opts, &fmt_opts); - assert_describe("B", "HEAD^^2^", repo, &opts, &fmt_opts); - assert_describe("R-*", "HEAD^^^", repo, &opts, &fmt_opts); -} - -void test_describe_t6120__tags(void) -{ - git_describe_options opts = GIT_DESCRIBE_OPTIONS_INIT; - git_describe_format_options fmt_opts = GIT_DESCRIBE_FORMAT_OPTIONS_INIT; - opts.describe_strategy = GIT_DESCRIBE_TAGS; - - assert_describe("c-*", "HEAD", repo, &opts, &fmt_opts); - assert_describe("c-*", "HEAD^", repo, &opts, &fmt_opts); - assert_describe("e-*", "HEAD^^", repo, &opts, &fmt_opts); - assert_describe("c-*", "HEAD^^2", repo, &opts, &fmt_opts); - assert_describe("B", "HEAD^^2^", repo, &opts, &fmt_opts); - assert_describe("e", "HEAD^^^", repo, &opts, &fmt_opts); -} - -void test_describe_t6120__all(void) -{ - git_describe_options opts = GIT_DESCRIBE_OPTIONS_INIT; - git_describe_format_options fmt_opts = GIT_DESCRIBE_FORMAT_OPTIONS_INIT; - opts.describe_strategy = GIT_DESCRIBE_ALL; - - assert_describe("heads/master", "HEAD", repo, &opts, &fmt_opts); - assert_describe("tags/c-*", "HEAD^", repo, &opts, &fmt_opts); - assert_describe("tags/e", "HEAD^^^", repo, &opts, &fmt_opts); -} - -void test_describe_t6120__longformat(void) -{ - git_describe_options opts = GIT_DESCRIBE_OPTIONS_INIT; - git_describe_format_options fmt_opts = GIT_DESCRIBE_FORMAT_OPTIONS_INIT; - - fmt_opts.always_use_long_format = 1; - - assert_describe("B-0-*", "HEAD^^2^", repo, &opts, &fmt_opts); - assert_describe("A-3-*", "HEAD^^2", repo, &opts, &fmt_opts); -} - -void test_describe_t6120__firstparent(void) -{ - git_describe_options opts = GIT_DESCRIBE_OPTIONS_INIT; - git_describe_format_options fmt_opts = GIT_DESCRIBE_FORMAT_OPTIONS_INIT; - opts.describe_strategy = GIT_DESCRIBE_TAGS; - - assert_describe("c-7-*", "HEAD", repo, &opts, &fmt_opts); - - opts.only_follow_first_parent = 1; - assert_describe("e-3-*", "HEAD", repo, &opts, &fmt_opts); -} - -void test_describe_t6120__workdir(void) -{ - git_describe_options opts = GIT_DESCRIBE_OPTIONS_INIT; - git_describe_format_options fmt_opts = GIT_DESCRIBE_FORMAT_OPTIONS_INIT; - - assert_describe_workdir("A-*[0-9a-f]", repo, &opts, &fmt_opts); - cl_git_mkfile("describe/file", "something different"); - - fmt_opts.dirty_suffix = "-dirty"; - assert_describe_workdir("A-*[0-9a-f]-dirty", repo, &opts, &fmt_opts); - fmt_opts.dirty_suffix = ".mod"; - assert_describe_workdir("A-*[0-9a-f].mod", repo, &opts, &fmt_opts); -} - -static void commit_and_tag( - git_time_t *time, - const char *commit_msg, - const char *tag_name) -{ - git_index *index; - git_oid commit_id; - git_reference *ref; - - cl_git_pass(git_repository_index__weakptr(&index, repo)); - - cl_git_append2file("describe/file", "\n"); - - git_index_add_bypath(index, "describe/file"); - git_index_write(index); - - *time += 10; - cl_repo_commit_from_index(&commit_id, repo, NULL, *time, commit_msg); - - if (tag_name == NULL) - return; - - cl_git_pass(git_reference_create(&ref, repo, tag_name, &commit_id, 0, NULL)); - git_reference_free(ref); -} - -void test_describe_t6120__pattern(void) -{ - git_describe_options opts = GIT_DESCRIBE_OPTIONS_INIT; - git_describe_format_options fmt_opts = GIT_DESCRIBE_FORMAT_OPTIONS_INIT; - git_oid tag_id; - git_object *head; - git_signature *tagger; - git_time_t time; - - /* set-up matching pattern tests */ - cl_git_pass(git_revparse_single(&head, repo, "HEAD")); - - time = 1380553019; - cl_git_pass(git_signature_new(&tagger, "tagger", "tagger@libgit2.org", time, 0)); - cl_git_pass(git_tag_create(&tag_id, repo, "test-annotated", head, tagger, "test-annotated", 0)); - git_signature_free(tagger); - git_object_free(head); - - commit_and_tag(&time, "one more", "refs/tags/test1-lightweight"); - commit_and_tag(&time, "yet another", "refs/tags/test2-lightweight"); - commit_and_tag(&time, "even more", NULL); - - - /* Exercize */ - opts.pattern = "test-*"; - assert_describe("test-annotated-*", "HEAD", repo, &opts, &fmt_opts); - - opts.describe_strategy = GIT_DESCRIBE_TAGS; - opts.pattern = "test1-*"; - assert_describe("test1-lightweight-*", "HEAD", repo, &opts, &fmt_opts); - - opts.pattern = "test2-*"; - assert_describe("test2-lightweight-*", "HEAD", repo, &opts, &fmt_opts); - - fmt_opts.always_use_long_format = 1; - assert_describe("test2-lightweight-*", "HEAD^", repo, &opts, &fmt_opts); -} diff --git a/vendor/libgit2/tests/diff/binary.c b/vendor/libgit2/tests/diff/binary.c deleted file mode 100644 index 173a5994e..000000000 --- a/vendor/libgit2/tests/diff/binary.c +++ /dev/null @@ -1,545 +0,0 @@ -#include "clar_libgit2.h" - -#include "git2/sys/diff.h" - -#include "buffer.h" -#include "filebuf.h" -#include "repository.h" - -static git_repository *repo; - -void test_diff_binary__initialize(void) -{ -} - -void test_diff_binary__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -void test_patch( - const char *one, - const char *two, - const git_diff_options *opts, - const char *expected) -{ - git_oid id_one, id_two; - git_index *index = NULL; - git_commit *commit_one, *commit_two = NULL; - git_tree *tree_one, *tree_two; - git_diff *diff; - git_patch *patch; - git_buf actual = GIT_BUF_INIT; - - cl_git_pass(git_oid_fromstr(&id_one, one)); - cl_git_pass(git_commit_lookup(&commit_one, repo, &id_one)); - cl_git_pass(git_commit_tree(&tree_one, commit_one)); - - if (two) { - cl_git_pass(git_oid_fromstr(&id_two, two)); - cl_git_pass(git_commit_lookup(&commit_two, repo, &id_two)); - cl_git_pass(git_commit_tree(&tree_two, commit_two)); - } else { - cl_git_pass(git_repository_index(&index, repo)); - cl_git_pass(git_index_write_tree(&id_two, index)); - cl_git_pass(git_tree_lookup(&tree_two, repo, &id_two)); - } - - cl_git_pass(git_diff_tree_to_tree(&diff, repo, tree_one, tree_two, opts)); - - cl_git_pass(git_patch_from_diff(&patch, diff, 0)); - cl_git_pass(git_patch_to_buf(&actual, patch)); - - cl_assert_equal_s(expected, actual.ptr); - - git_buf_clear(&actual); - cl_git_pass(git_diff_print(diff, GIT_DIFF_FORMAT_PATCH, git_diff_print_callback__to_buf, &actual)); - - cl_assert_equal_s(expected, actual.ptr); - - git_buf_free(&actual); - git_patch_free(patch); - git_diff_free(diff); - git_tree_free(tree_one); - git_tree_free(tree_two); - git_commit_free(commit_one); - git_commit_free(commit_two); - git_index_free(index); -} - -void test_diff_binary__add_normal(void) -{ - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - const char *expected = - "diff --git a/binary.bin b/binary.bin\n" \ - "new file mode 100644\n" \ - "index 0000000..bd474b2\n" \ - "Binary files /dev/null and b/binary.bin differ\n"; - - repo = cl_git_sandbox_init("diff_format_email"); - test_patch( - "873806f6f27e631eb0b23e4b56bea2bfac14a373", - "897d3af16ca9e420cd071b1c4541bd2b91d04c8c", - &opts, - expected); -} - -void test_diff_binary__add(void) -{ - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - const char *expected = - "diff --git a/binary.bin b/binary.bin\n" \ - "new file mode 100644\n" \ - "index 0000000000000000000000000000000000000000..bd474b2519cc15eab801ff851cc7d50f0dee49a1\n" \ - "GIT binary patch\n" \ - "literal 3\n" \ - "Kc${Nk-~s>u4FC%O\n" - "\n" \ - "literal 0\n" \ - "Hc$@u4FC%O\n" \ - "\n"; - - opts.flags = GIT_DIFF_SHOW_BINARY; - - repo = cl_git_sandbox_init("diff_format_email"); - test_patch( - "897d3af16ca9e420cd071b1c4541bd2b91d04c8c", - "8d7523f6fcb2404257889abe0d96f093d9f524f9", - &opts, - expected); -} - -void test_diff_binary__delete_normal(void) -{ - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - const char *expected = - "diff --git a/binary.bin b/binary.bin\n" \ - "deleted file mode 100644\n" \ - "index bd474b2..0000000\n" \ - "Binary files a/binary.bin and /dev/null differ\n"; - - repo = cl_git_sandbox_init("diff_format_email"); - test_patch( - "897d3af16ca9e420cd071b1c4541bd2b91d04c8c", - "873806f6f27e631eb0b23e4b56bea2bfac14a373", - &opts, - expected); -} - -void test_diff_binary__delete(void) -{ - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - const char *expected = - "diff --git a/binary.bin b/binary.bin\n" \ - "deleted file mode 100644\n" \ - "index bd474b2519cc15eab801ff851cc7d50f0dee49a1..0000000000000000000000000000000000000000\n" \ - "GIT binary patch\n" \ - "literal 0\n" \ - "Hc$@u4FC%O\n" \ - "\n"; - - opts.flags = GIT_DIFF_SHOW_BINARY; - opts.id_abbrev = GIT_OID_HEXSZ; - - repo = cl_git_sandbox_init("diff_format_email"); - test_patch( - "897d3af16ca9e420cd071b1c4541bd2b91d04c8c", - "873806f6f27e631eb0b23e4b56bea2bfac14a373", - &opts, - expected); -} - -void test_diff_binary__delta(void) -{ - git_index *index; - git_buf contents = GIT_BUF_INIT; - size_t i; - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - const char *expected = - "diff --git a/songof7cities.txt b/songof7cities.txt\n" \ - "index 4210ffd5c390b21dd5483375e75288dea9ede512..cc84ec183351c9944ed90a619ca08911924055b5 100644\n" \ - "GIT binary patch\n" \ - "delta 198\n" \ - "zc$}LmI8{(0BqLQJI6p64AwNwaIJGP_Pa)Ye#M3o+qJ$PQ;Y(X&QMK*C5^Br3bjG4d=XI^5@\n" \ - "JfH567LIG)KJdFSV\n" \ - "\n" \ - "delta 198\n" \ - "zc$}LmI8{(0BqLQJI6p64AwNwaIJGP_Pr*5}Br~;mqJ$PQ;Y(X&QMK*C5^Br3bjG4d=XI^5@\n" \ - "JfH567LIF3FM2!Fd\n" \ - "\n"; - - opts.flags = GIT_DIFF_SHOW_BINARY | GIT_DIFF_FORCE_BINARY; - opts.id_abbrev = GIT_OID_HEXSZ; - - repo = cl_git_sandbox_init("renames"); - cl_git_pass(git_repository_index(&index, repo)); - - cl_git_pass(git_futils_readbuffer(&contents, "renames/songof7cities.txt")); - - for (i = 0; i < contents.size - 6; i++) { - if (strncmp(&contents.ptr[i], "Cities", 6) == 0) - memcpy(&contents.ptr[i], "cITIES", 6); - } - - cl_git_rewritefile("renames/songof7cities.txt", contents.ptr); - cl_git_pass(git_index_add_bypath(index, "songof7cities.txt")); - cl_git_pass(git_index_write(index)); - - test_patch( - "19dd32dfb1520a64e5bbaae8dce6ef423dfa2f13", - NULL, - &opts, - expected); - - git_index_free(index); - git_buf_free(&contents); -} - -void test_diff_binary__delta_append(void) -{ - git_index *index; - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - const char *expected = - "diff --git a/untimely.txt b/untimely.txt\n" \ - "index 9a69d960ae94b060f56c2a8702545e2bb1abb935..1111d4f11f4b35bf6759e0fb714fe09731ef0840 100644\n" \ - "GIT binary patch\n" \ - "delta 32\n" \ - "nc%1vf+QYWt3zLL@hC)e3Vu?a>QDRl4f_G*?PG(-ZA}<#J$+QbW\n" \ - "\n" \ - "delta 7\n" \ - "Oc%18D`@*{63ljhg(E~C7\n" \ - "\n"; - - opts.flags = GIT_DIFF_SHOW_BINARY | GIT_DIFF_FORCE_BINARY; - opts.id_abbrev = GIT_OID_HEXSZ; - - repo = cl_git_sandbox_init("renames"); - cl_git_pass(git_repository_index(&index, repo)); - - cl_git_append2file("renames/untimely.txt", "Oh that crazy Kipling!\r\n"); - cl_git_pass(git_index_add_bypath(index, "untimely.txt")); - cl_git_pass(git_index_write(index)); - - test_patch( - "19dd32dfb1520a64e5bbaae8dce6ef423dfa2f13", - NULL, - &opts, - expected); - - git_index_free(index); -} - -void test_diff_binary__empty_for_no_diff(void) -{ - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - git_oid id; - git_commit *commit; - git_tree *tree; - git_diff *diff; - git_buf actual = GIT_BUF_INIT; - - opts.flags = GIT_DIFF_SHOW_BINARY | GIT_DIFF_FORCE_BINARY; - opts.id_abbrev = GIT_OID_HEXSZ; - - repo = cl_git_sandbox_init("renames"); - - cl_git_pass(git_oid_fromstr(&id, "19dd32dfb1520a64e5bbaae8dce6ef423dfa2f13")); - cl_git_pass(git_commit_lookup(&commit, repo, &id)); - cl_git_pass(git_commit_tree(&tree, commit)); - - cl_git_pass(git_diff_tree_to_tree(&diff, repo, tree, tree, &opts)); - cl_git_pass(git_diff_print(diff, GIT_DIFF_FORMAT_PATCH, git_diff_print_callback__to_buf, &actual)); - - cl_assert_equal_s("", actual.ptr); - - git_buf_free(&actual); - git_diff_free(diff); - git_commit_free(commit); - git_tree_free(tree); -} - -void test_diff_binary__index_to_workdir(void) -{ - git_index *index; - git_diff *diff; - git_patch *patch; - git_buf actual = GIT_BUF_INIT; - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - const char *expected = - "diff --git a/untimely.txt b/untimely.txt\n" \ - "index 9a69d960ae94b060f56c2a8702545e2bb1abb935..1111d4f11f4b35bf6759e0fb714fe09731ef0840 100644\n" \ - "GIT binary patch\n" \ - "delta 32\n" \ - "nc%1vf+QYWt3zLL@hC)e3Vu?a>QDRl4f_G*?PG(-ZA}<#J$+QbW\n" \ - "\n" \ - "delta 7\n" \ - "Oc%18D`@*{63ljhg(E~C7\n" \ - "\n"; - - opts.flags = GIT_DIFF_SHOW_BINARY | GIT_DIFF_FORCE_BINARY; - opts.id_abbrev = GIT_OID_HEXSZ; - - repo = cl_git_sandbox_init("renames"); - cl_git_pass(git_repository_index(&index, repo)); - - cl_git_append2file("renames/untimely.txt", "Oh that crazy Kipling!\r\n"); - - cl_git_pass(git_diff_index_to_workdir(&diff, repo, index, &opts)); - - cl_git_pass(git_patch_from_diff(&patch, diff, 0)); - cl_git_pass(git_patch_to_buf(&actual, patch)); - - cl_assert_equal_s(expected, actual.ptr); - - cl_git_pass(git_index_add_bypath(index, "untimely.txt")); - cl_git_pass(git_index_write(index)); - - test_patch( - "19dd32dfb1520a64e5bbaae8dce6ef423dfa2f13", - NULL, - &opts, - expected); - - git_buf_free(&actual); - git_patch_free(patch); - git_diff_free(diff); - git_index_free(index); -} - -static int print_cb( - const git_diff_delta *delta, - const git_diff_hunk *hunk, - const git_diff_line *line, - void *payload) -{ - git_buf *buf = (git_buf *)payload; - - GIT_UNUSED(delta); - - if (hunk) - git_buf_put(buf, hunk->header, hunk->header_len); - - if (line) - git_buf_put(buf, line->content, line->content_len); - - return git_buf_oom(buf) ? -1 : 0; -} - -void test_diff_binary__print_patch_from_diff(void) -{ - git_index *index; - git_diff *diff; - git_buf actual = GIT_BUF_INIT; - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - const char *expected = - "diff --git a/untimely.txt b/untimely.txt\n" \ - "index 9a69d960ae94b060f56c2a8702545e2bb1abb935..1111d4f11f4b35bf6759e0fb714fe09731ef0840 100644\n" \ - "GIT binary patch\n" \ - "delta 32\n" \ - "nc%1vf+QYWt3zLL@hC)e3Vu?a>QDRl4f_G*?PG(-ZA}<#J$+QbW\n" \ - "\n" \ - "delta 7\n" \ - "Oc%18D`@*{63ljhg(E~C7\n" \ - "\n"; - - opts.flags = GIT_DIFF_SHOW_BINARY | GIT_DIFF_FORCE_BINARY; - opts.id_abbrev = GIT_OID_HEXSZ; - - repo = cl_git_sandbox_init("renames"); - cl_git_pass(git_repository_index(&index, repo)); - - cl_git_append2file("renames/untimely.txt", "Oh that crazy Kipling!\r\n"); - - cl_git_pass(git_diff_index_to_workdir(&diff, repo, index, &opts)); - - cl_git_pass(git_diff_print(diff, GIT_DIFF_FORMAT_PATCH, print_cb, &actual)); - - cl_assert_equal_s(expected, actual.ptr); - - git_buf_free(&actual); - git_diff_free(diff); - git_index_free(index); -} - -struct diff_data { - char *old_path; - git_oid old_id; - git_buf old_binary_base85; - size_t old_binary_inflatedlen; - git_diff_binary_t old_binary_type; - - char *new_path; - git_oid new_id; - git_buf new_binary_base85; - size_t new_binary_inflatedlen; - git_diff_binary_t new_binary_type; -}; - -static int file_cb( - const git_diff_delta *delta, - float progress, - void *payload) -{ - struct diff_data *diff_data = payload; - - GIT_UNUSED(progress); - - if (delta->old_file.path) - diff_data->old_path = git__strdup(delta->old_file.path); - - if (delta->new_file.path) - diff_data->new_path = git__strdup(delta->new_file.path); - - git_oid_cpy(&diff_data->old_id, &delta->old_file.id); - git_oid_cpy(&diff_data->new_id, &delta->new_file.id); - - return 0; -} - -static int binary_cb( - const git_diff_delta *delta, - const git_diff_binary *binary, - void *payload) -{ - struct diff_data *diff_data = payload; - - GIT_UNUSED(delta); - - git_buf_encode_base85(&diff_data->old_binary_base85, - binary->old_file.data, binary->old_file.datalen); - diff_data->old_binary_inflatedlen = binary->old_file.inflatedlen; - diff_data->old_binary_type = binary->old_file.type; - - git_buf_encode_base85(&diff_data->new_binary_base85, - binary->new_file.data, binary->new_file.datalen); - diff_data->new_binary_inflatedlen = binary->new_file.inflatedlen; - diff_data->new_binary_type = binary->new_file.type; - - return 0; -} - -static int hunk_cb( - const git_diff_delta *delta, - const git_diff_hunk *hunk, - void *payload) -{ - GIT_UNUSED(delta); - GIT_UNUSED(hunk); - GIT_UNUSED(payload); - - cl_fail("did not expect hunk callback"); - return 0; -} - -static int line_cb( - const git_diff_delta *delta, - const git_diff_hunk *hunk, - const git_diff_line *line, - void *payload) -{ - GIT_UNUSED(delta); - GIT_UNUSED(hunk); - GIT_UNUSED(line); - GIT_UNUSED(payload); - - cl_fail("did not expect line callback"); - return 0; -} - -void test_diff_binary__blob_to_blob(void) -{ - git_index *index; - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - git_blob *old_blob, *new_blob; - git_oid old_id, new_id; - struct diff_data diff_data = {0}; - - opts.flags = GIT_DIFF_SHOW_BINARY | GIT_DIFF_FORCE_BINARY; - opts.id_abbrev = GIT_OID_HEXSZ; - - repo = cl_git_sandbox_init("renames"); - cl_git_pass(git_repository_index__weakptr(&index, repo)); - - cl_git_append2file("renames/untimely.txt", "Oh that crazy Kipling!\r\n"); - cl_git_pass(git_index_add_bypath(index, "untimely.txt")); - cl_git_pass(git_index_write(index)); - - git_oid_fromstr(&old_id, "9a69d960ae94b060f56c2a8702545e2bb1abb935"); - git_oid_fromstr(&new_id, "1111d4f11f4b35bf6759e0fb714fe09731ef0840"); - - cl_git_pass(git_blob_lookup(&old_blob, repo, &old_id)); - cl_git_pass(git_blob_lookup(&new_blob, repo, &new_id)); - - cl_git_pass(git_diff_blobs(old_blob, - "untimely.txt", new_blob, "untimely.txt", &opts, - file_cb, binary_cb, hunk_cb, line_cb, &diff_data)); - - cl_assert_equal_s("untimely.txt", diff_data.old_path); - cl_assert_equal_oid(&old_id, &diff_data.old_id); - cl_assert_equal_i(GIT_DIFF_BINARY_DELTA, diff_data.old_binary_type); - cl_assert_equal_i(7, diff_data.old_binary_inflatedlen); - cl_assert_equal_s("c%18D`@*{63ljhg(E~C7", - diff_data.old_binary_base85.ptr); - - cl_assert_equal_s("untimely.txt", diff_data.new_path); - cl_assert_equal_oid(&new_id, &diff_data.new_id); - cl_assert_equal_i(GIT_DIFF_BINARY_DELTA, diff_data.new_binary_type); - cl_assert_equal_i(32, diff_data.new_binary_inflatedlen); - cl_assert_equal_s("c%1vf+QYWt3zLL@hC)e3Vu?a>QDRl4f_G*?PG(-ZA}<#J$+QbW", - diff_data.new_binary_base85.ptr); - - git_blob_free(old_blob); - git_blob_free(new_blob); - - git__free(diff_data.old_path); - git__free(diff_data.new_path); - - git_buf_free(&diff_data.old_binary_base85); - git_buf_free(&diff_data.new_binary_base85); -} diff --git a/vendor/libgit2/tests/diff/blob.c b/vendor/libgit2/tests/diff/blob.c deleted file mode 100644 index c3933c313..000000000 --- a/vendor/libgit2/tests/diff/blob.c +++ /dev/null @@ -1,1008 +0,0 @@ -#include "clar_libgit2.h" -#include "diff_helpers.h" - -static git_repository *g_repo = NULL; -static diff_expects expected; -static git_diff_options opts; -static git_blob *d, *alien; - -static void quick_diff_blob_to_str( - const git_blob *blob, const char *blob_path, - const char *str, size_t len, const char *str_path) -{ - memset(&expected, 0, sizeof(expected)); - - if (str && !len) - len = strlen(str); - - cl_git_pass(git_diff_blob_to_buffer( - blob, blob_path, str, len, str_path, - &opts, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &expected)); -} - -void test_diff_blob__initialize(void) -{ - git_oid oid; - - g_repo = cl_git_sandbox_init("attr"); - - cl_git_pass(git_diff_init_options(&opts, GIT_DIFF_OPTIONS_VERSION)); - opts.context_lines = 1; - - memset(&expected, 0, sizeof(expected)); - - /* tests/resources/attr/root_test4.txt */ - cl_git_pass(git_oid_fromstrn(&oid, "a0f7217a", 8)); - cl_git_pass(git_blob_lookup_prefix(&d, g_repo, &oid, 8)); - - /* alien.png */ - cl_git_pass(git_oid_fromstrn(&oid, "edf3dcee", 8)); - cl_git_pass(git_blob_lookup_prefix(&alien, g_repo, &oid, 8)); -} - -void test_diff_blob__cleanup(void) -{ - git_blob_free(d); - d = NULL; - - git_blob_free(alien); - alien = NULL; - - cl_git_sandbox_cleanup(); -} - -static void assert_one_modified( - int hunks, int lines, int ctxt, int adds, int dels, diff_expects *exp) -{ - cl_assert_equal_i(1, exp->files); - cl_assert_equal_i(1, exp->file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(0, exp->files_binary); - - cl_assert_equal_i(hunks, exp->hunks); - cl_assert_equal_i(lines, exp->lines); - cl_assert_equal_i(ctxt, exp->line_ctxt); - cl_assert_equal_i(adds, exp->line_adds); - cl_assert_equal_i(dels, exp->line_dels); -} - -void test_diff_blob__can_compare_text_blobs(void) -{ - git_blob *a, *b, *c; - git_oid a_oid, b_oid, c_oid; - - /* tests/resources/attr/root_test1 */ - cl_git_pass(git_oid_fromstrn(&a_oid, "45141a79", 8)); - cl_git_pass(git_blob_lookup_prefix(&a, g_repo, &a_oid, 4)); - - /* tests/resources/attr/root_test2 */ - cl_git_pass(git_oid_fromstrn(&b_oid, "4d713dc4", 8)); - cl_git_pass(git_blob_lookup_prefix(&b, g_repo, &b_oid, 4)); - - /* tests/resources/attr/root_test3 */ - cl_git_pass(git_oid_fromstrn(&c_oid, "c96bbb2c2557a832", 16)); - cl_git_pass(git_blob_lookup_prefix(&c, g_repo, &c_oid, 16)); - - /* Doing the equivalent of a `git diff -U1` on these files */ - - /* diff on tests/resources/attr/root_test1 */ - memset(&expected, 0, sizeof(expected)); - cl_git_pass(git_diff_blobs( - a, NULL, b, NULL, &opts, - diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &expected)); - assert_one_modified(1, 6, 1, 5, 0, &expected); - - /* same diff but use direct buffers */ - memset(&expected, 0, sizeof(expected)); - cl_git_pass(git_diff_buffers( - git_blob_rawcontent(a), (size_t)git_blob_rawsize(a), NULL, - git_blob_rawcontent(b), (size_t)git_blob_rawsize(b), NULL, &opts, - diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &expected)); - assert_one_modified(1, 6, 1, 5, 0, &expected); - - /* diff on tests/resources/attr/root_test2 */ - memset(&expected, 0, sizeof(expected)); - cl_git_pass(git_diff_blobs( - b, NULL, c, NULL, &opts, - diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &expected)); - assert_one_modified(1, 15, 3, 9, 3, &expected); - - /* diff on tests/resources/attr/root_test3 */ - memset(&expected, 0, sizeof(expected)); - cl_git_pass(git_diff_blobs( - a, NULL, c, NULL, &opts, - diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &expected)); - assert_one_modified(1, 13, 0, 12, 1, &expected); - - memset(&expected, 0, sizeof(expected)); - cl_git_pass(git_diff_blobs( - c, NULL, d, NULL, &opts, - diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &expected)); - assert_one_modified(2, 14, 4, 6, 4, &expected); - - git_blob_free(a); - git_blob_free(b); - git_blob_free(c); -} - -static void assert_patch_matches_blobs( - git_patch *p, git_blob *a, git_blob *b, - int hunks, int l0, int l1, int ctxt, int adds, int dels) -{ - const git_diff_delta *delta; - size_t tc, ta, td; - - cl_assert(p != NULL); - - delta = git_patch_get_delta(p); - cl_assert(delta != NULL); - - cl_assert_equal_i(GIT_DELTA_MODIFIED, delta->status); - cl_assert_equal_oid(git_blob_id(a), &delta->old_file.id); - cl_assert_equal_sz(git_blob_rawsize(a), delta->old_file.size); - cl_assert_equal_oid(git_blob_id(b), &delta->new_file.id); - cl_assert_equal_sz(git_blob_rawsize(b), delta->new_file.size); - - cl_assert_equal_i(hunks, (int)git_patch_num_hunks(p)); - - if (hunks > 0) - cl_assert_equal_i(l0, git_patch_num_lines_in_hunk(p, 0)); - if (hunks > 1) - cl_assert_equal_i(l1, git_patch_num_lines_in_hunk(p, 1)); - - cl_git_pass(git_patch_line_stats(&tc, &ta, &td, p)); - cl_assert_equal_i(ctxt, (int)tc); - cl_assert_equal_i(adds, (int)ta); - cl_assert_equal_i(dels, (int)td); -} - -void test_diff_blob__can_compare_text_blobs_with_patch(void) -{ - git_blob *a, *b, *c; - git_oid a_oid, b_oid, c_oid; - git_patch *p; - - /* tests/resources/attr/root_test1 */ - cl_git_pass(git_oid_fromstrn(&a_oid, "45141a79", 8)); - cl_git_pass(git_blob_lookup_prefix(&a, g_repo, &a_oid, 8)); - - /* tests/resources/attr/root_test2 */ - cl_git_pass(git_oid_fromstrn(&b_oid, "4d713dc4", 8)); - cl_git_pass(git_blob_lookup_prefix(&b, g_repo, &b_oid, 8)); - - /* tests/resources/attr/root_test3 */ - cl_git_pass(git_oid_fromstrn(&c_oid, "c96bbb2c2557a832", 16)); - cl_git_pass(git_blob_lookup_prefix(&c, g_repo, &c_oid, 16)); - - /* Doing the equivalent of a `git diff -U1` on these files */ - - /* diff on tests/resources/attr/root_test1 */ - cl_git_pass(git_patch_from_blobs(&p, a, NULL, b, NULL, &opts)); - assert_patch_matches_blobs(p, a, b, 1, 6, 0, 1, 5, 0); - git_patch_free(p); - - /* diff on tests/resources/attr/root_test2 */ - cl_git_pass(git_patch_from_blobs(&p, b, NULL, c, NULL, &opts)); - assert_patch_matches_blobs(p, b, c, 1, 15, 0, 3, 9, 3); - git_patch_free(p); - - /* diff on tests/resources/attr/root_test3 */ - cl_git_pass(git_patch_from_blobs(&p, a, NULL, c, NULL, &opts)); - assert_patch_matches_blobs(p, a, c, 1, 13, 0, 0, 12, 1); - git_patch_free(p); - - /* one more */ - cl_git_pass(git_patch_from_blobs(&p, c, NULL, d, NULL, &opts)); - assert_patch_matches_blobs(p, c, d, 2, 5, 9, 4, 6, 4); - git_patch_free(p); - - git_blob_free(a); - git_blob_free(b); - git_blob_free(c); -} - -void test_diff_blob__can_compare_against_null_blobs(void) -{ - git_blob *e = NULL; - - cl_git_pass(git_diff_blobs( - d, NULL, e, NULL, &opts, - diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &expected)); - - cl_assert_equal_i(1, expected.files); - cl_assert_equal_i(1, expected.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(0, expected.files_binary); - - cl_assert_equal_i(1, expected.hunks); - cl_assert_equal_i(14, expected.hunk_old_lines); - cl_assert_equal_i(14, expected.lines); - cl_assert_equal_i(14, expected.line_dels); - - opts.flags |= GIT_DIFF_REVERSE; - memset(&expected, 0, sizeof(expected)); - - cl_git_pass(git_diff_blobs( - d, NULL, e, NULL, &opts, - diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &expected)); - - cl_assert_equal_i(1, expected.files); - cl_assert_equal_i(1, expected.file_status[GIT_DELTA_ADDED]); - cl_assert_equal_i(0, expected.files_binary); - - cl_assert_equal_i(1, expected.hunks); - cl_assert_equal_i(14, expected.hunk_new_lines); - cl_assert_equal_i(14, expected.lines); - cl_assert_equal_i(14, expected.line_adds); - - opts.flags ^= GIT_DIFF_REVERSE; - memset(&expected, 0, sizeof(expected)); - - cl_git_pass(git_diff_blobs( - alien, NULL, NULL, NULL, &opts, - diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &expected)); - - cl_assert_equal_i(1, expected.files); - cl_assert_equal_i(1, expected.files_binary); - cl_assert_equal_i(1, expected.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(0, expected.hunks); - cl_assert_equal_i(0, expected.lines); - - memset(&expected, 0, sizeof(expected)); - - cl_git_pass(git_diff_blobs( - NULL, NULL, alien, NULL, &opts, - diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &expected)); - - cl_assert_equal_i(1, expected.files); - cl_assert_equal_i(1, expected.files_binary); - cl_assert_equal_i(1, expected.file_status[GIT_DELTA_ADDED]); - cl_assert_equal_i(0, expected.hunks); - cl_assert_equal_i(0, expected.lines); -} - -void test_diff_blob__can_compare_against_null_blobs_with_patch(void) -{ - git_blob *e = NULL; - git_patch *p; - const git_diff_delta *delta; - const git_diff_line *line; - int l, max_l; - - cl_git_pass(git_patch_from_blobs(&p, d, NULL, e, NULL, &opts)); - - cl_assert(p != NULL); - - delta = git_patch_get_delta(p); - cl_assert(delta != NULL); - cl_assert_equal_i(GIT_DELTA_DELETED, delta->status); - cl_assert_equal_oid(git_blob_id(d), &delta->old_file.id); - cl_assert_equal_sz(git_blob_rawsize(d), delta->old_file.size); - cl_assert(git_oid_iszero(&delta->new_file.id)); - cl_assert_equal_sz(0, delta->new_file.size); - - cl_assert_equal_i(1, (int)git_patch_num_hunks(p)); - cl_assert_equal_i(14, git_patch_num_lines_in_hunk(p, 0)); - - max_l = git_patch_num_lines_in_hunk(p, 0); - for (l = 0; l < max_l; ++l) { - cl_git_pass(git_patch_get_line_in_hunk(&line, p, 0, l)); - cl_assert_equal_i(GIT_DIFF_LINE_DELETION, (int)line->origin); - } - - git_patch_free(p); - - opts.flags |= GIT_DIFF_REVERSE; - - cl_git_pass(git_patch_from_blobs(&p, d, NULL, e, NULL, &opts)); - - cl_assert(p != NULL); - - delta = git_patch_get_delta(p); - cl_assert(delta != NULL); - cl_assert_equal_i(GIT_DELTA_ADDED, delta->status); - cl_assert(git_oid_iszero(&delta->old_file.id)); - cl_assert_equal_sz(0, delta->old_file.size); - cl_assert_equal_oid(git_blob_id(d), &delta->new_file.id); - cl_assert_equal_sz(git_blob_rawsize(d), delta->new_file.size); - - cl_assert_equal_i(1, (int)git_patch_num_hunks(p)); - cl_assert_equal_i(14, git_patch_num_lines_in_hunk(p, 0)); - - max_l = git_patch_num_lines_in_hunk(p, 0); - for (l = 0; l < max_l; ++l) { - cl_git_pass(git_patch_get_line_in_hunk(&line, p, 0, l)); - cl_assert_equal_i(GIT_DIFF_LINE_ADDITION, (int)line->origin); - } - - git_patch_free(p); - - opts.flags ^= GIT_DIFF_REVERSE; - - cl_git_pass(git_patch_from_blobs(&p, alien, NULL, NULL, NULL, &opts)); - - cl_assert(p != NULL); - - delta = git_patch_get_delta(p); - cl_assert(delta != NULL); - cl_assert_equal_i(GIT_DELTA_DELETED, delta->status); - cl_assert((delta->flags & GIT_DIFF_FLAG_BINARY) != 0); - - cl_assert_equal_i(0, (int)git_patch_num_hunks(p)); - - git_patch_free(p); - - cl_git_pass(git_patch_from_blobs(&p, NULL, NULL, alien, NULL, &opts)); - - cl_assert(p != NULL); - - delta = git_patch_get_delta(p); - cl_assert(delta != NULL); - cl_assert_equal_i(GIT_DELTA_ADDED, delta->status); - cl_assert((delta->flags & GIT_DIFF_FLAG_BINARY) != 0); - - cl_assert_equal_i(0, (int)git_patch_num_hunks(p)); - - git_patch_free(p); -} - -static void assert_identical_blobs_comparison(diff_expects *expected) -{ - cl_assert_equal_i(1, expected->files); - cl_assert_equal_i(1, expected->file_status[GIT_DELTA_UNMODIFIED]); - cl_assert_equal_i(0, expected->hunks); - cl_assert_equal_i(0, expected->lines); -} - -void test_diff_blob__can_compare_identical_blobs(void) -{ - opts.flags |= GIT_DIFF_INCLUDE_UNMODIFIED; - - cl_git_pass(git_diff_blobs( - d, NULL, d, NULL, &opts, - diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &expected)); - - assert_identical_blobs_comparison(&expected); - cl_assert_equal_i(0, expected.files_binary); - - memset(&expected, 0, sizeof(expected)); - cl_git_pass(git_diff_blobs( - NULL, NULL, NULL, NULL, &opts, - diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &expected)); - - assert_identical_blobs_comparison(&expected); - cl_assert_equal_i(0, expected.files_binary); - - memset(&expected, 0, sizeof(expected)); - cl_git_pass(git_diff_blobs( - alien, NULL, alien, NULL, &opts, - diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &expected)); - - assert_identical_blobs_comparison(&expected); - cl_assert(expected.files_binary > 0); -} - -void test_diff_blob__can_compare_identical_blobs_with_patch(void) -{ - git_patch *p; - const git_diff_delta *delta; - - cl_git_pass(git_patch_from_blobs(&p, d, NULL, d, NULL, &opts)); - cl_assert(p != NULL); - - delta = git_patch_get_delta(p); - cl_assert(delta != NULL); - cl_assert_equal_i(GIT_DELTA_UNMODIFIED, delta->status); - cl_assert_equal_sz(delta->old_file.size, git_blob_rawsize(d)); - cl_assert_equal_oid(git_blob_id(d), &delta->old_file.id); - cl_assert_equal_sz(delta->new_file.size, git_blob_rawsize(d)); - cl_assert_equal_oid(git_blob_id(d), &delta->new_file.id); - - cl_assert_equal_i(0, (int)git_patch_num_hunks(p)); - git_patch_free(p); - - cl_git_pass(git_patch_from_blobs(&p, NULL, NULL, NULL, NULL, &opts)); - cl_assert(p != NULL); - - delta = git_patch_get_delta(p); - cl_assert(delta != NULL); - cl_assert_equal_i(GIT_DELTA_UNMODIFIED, delta->status); - cl_assert_equal_sz(0, delta->old_file.size); - cl_assert(git_oid_iszero(&delta->old_file.id)); - cl_assert_equal_sz(0, delta->new_file.size); - cl_assert(git_oid_iszero(&delta->new_file.id)); - - cl_assert_equal_i(0, (int)git_patch_num_hunks(p)); - git_patch_free(p); - - cl_git_pass(git_patch_from_blobs(&p, alien, NULL, alien, NULL, &opts)); - cl_assert(p != NULL); - cl_assert_equal_i(GIT_DELTA_UNMODIFIED, git_patch_get_delta(p)->status); - cl_assert_equal_i(0, (int)git_patch_num_hunks(p)); - git_patch_free(p); -} - -static void assert_binary_blobs_comparison(diff_expects *expected) -{ - cl_assert(expected->files_binary > 0); - - cl_assert_equal_i(1, expected->files); - cl_assert_equal_i(1, expected->file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(0, expected->hunks); - cl_assert_equal_i(0, expected->lines); -} - -void test_diff_blob__can_compare_two_binary_blobs(void) -{ - git_blob *heart; - git_oid h_oid; - - /* heart.png */ - cl_git_pass(git_oid_fromstrn(&h_oid, "de863bff", 8)); - cl_git_pass(git_blob_lookup_prefix(&heart, g_repo, &h_oid, 8)); - - cl_git_pass(git_diff_blobs( - alien, NULL, heart, NULL, &opts, - diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &expected)); - - assert_binary_blobs_comparison(&expected); - - memset(&expected, 0, sizeof(expected)); - - cl_git_pass(git_diff_blobs( - heart, NULL, alien, NULL, &opts, - diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &expected)); - - assert_binary_blobs_comparison(&expected); - - git_blob_free(heart); -} - -void test_diff_blob__can_compare_a_binary_blob_and_a_text_blob(void) -{ - cl_git_pass(git_diff_blobs( - alien, NULL, d, NULL, &opts, - diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &expected)); - - assert_binary_blobs_comparison(&expected); - - memset(&expected, 0, sizeof(expected)); - - cl_git_pass(git_diff_blobs( - d, NULL, alien, NULL, &opts, - diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &expected)); - - assert_binary_blobs_comparison(&expected); -} - -/* - * $ git diff fe773770 a0f7217 - * diff --git a/fe773770 b/a0f7217 - * index fe77377..a0f7217 100644 - * --- a/fe773770 - * +++ b/a0f7217 - * @@ -1,6 +1,6 @@ - * Here is some stuff at the start - * - * -This should go in one hunk - * +This should go in one hunk (first) - * - * Some additional lines - * - * @@ -8,7 +8,7 @@ Down here below the other lines - * - * With even more at the end - * - * -Followed by a second hunk of stuff - * +Followed by a second hunk of stuff (second) - * - * That happens down here - */ -void test_diff_blob__comparing_two_text_blobs_honors_interhunkcontext(void) -{ - git_blob *old_d; - git_oid old_d_oid; - - opts.context_lines = 3; - - /* tests/resources/attr/root_test1 from commit f5b0af1 */ - cl_git_pass(git_oid_fromstrn(&old_d_oid, "fe773770", 8)); - cl_git_pass(git_blob_lookup_prefix(&old_d, g_repo, &old_d_oid, 8)); - - /* Test with default inter-hunk-context (not set) => default is 0 */ - cl_git_pass(git_diff_blobs( - old_d, NULL, d, NULL, &opts, - diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &expected)); - - cl_assert_equal_i(2, expected.hunks); - - /* Test with inter-hunk-context explicitly set to 0 */ - opts.interhunk_lines = 0; - memset(&expected, 0, sizeof(expected)); - cl_git_pass(git_diff_blobs( - old_d, NULL, d, NULL, &opts, - diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &expected)); - - cl_assert_equal_i(2, expected.hunks); - - /* Test with inter-hunk-context explicitly set to 1 */ - opts.interhunk_lines = 1; - memset(&expected, 0, sizeof(expected)); - cl_git_pass(git_diff_blobs( - old_d, NULL, d, NULL, &opts, - diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &expected)); - - cl_assert_equal_i(1, expected.hunks); - - git_blob_free(old_d); -} - -void test_diff_blob__checks_options_version_too_low(void) -{ - const git_error *err; - - opts.version = 0; - cl_git_fail(git_diff_blobs( - d, NULL, alien, NULL, &opts, - diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &expected)); - err = giterr_last(); - cl_assert_equal_i(GITERR_INVALID, err->klass); -} - -void test_diff_blob__checks_options_version_too_high(void) -{ - const git_error *err; - - opts.version = 1024; - cl_git_fail(git_diff_blobs( - d, NULL, alien, NULL, &opts, - diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &expected)); - err = giterr_last(); - cl_assert_equal_i(GITERR_INVALID, err->klass); -} - -void test_diff_blob__can_correctly_detect_a_binary_blob_as_binary(void) -{ - /* alien.png */ - cl_assert_equal_i(true, git_blob_is_binary(alien)); -} - -void test_diff_blob__can_correctly_detect_a_textual_blob_as_non_binary(void) -{ - /* tests/resources/attr/root_test4.txt */ - cl_assert_equal_i(false, git_blob_is_binary(d)); -} - -/* - * git_diff_blob_to_buffer tests - */ - -static void assert_changed_single_one_line_file( - diff_expects *expected, git_delta_t mod) -{ - cl_assert_equal_i(1, expected->files); - cl_assert_equal_i(1, expected->file_status[mod]); - cl_assert_equal_i(1, expected->hunks); - cl_assert_equal_i(1, expected->lines); - - if (mod == GIT_DELTA_ADDED) - cl_assert_equal_i(1, expected->line_adds); - else if (mod == GIT_DELTA_DELETED) - cl_assert_equal_i(1, expected->line_dels); -} - -void test_diff_blob__can_compare_blob_to_buffer(void) -{ - git_blob *a; - git_oid a_oid; - const char *a_content = "Hello from the root\n"; - const char *b_content = "Hello from the root\n\nSome additional lines\n\nDown here below\n\n"; - - /* tests/resources/attr/root_test1 */ - cl_git_pass(git_oid_fromstrn(&a_oid, "45141a79", 8)); - cl_git_pass(git_blob_lookup_prefix(&a, g_repo, &a_oid, 8)); - - /* diff from blob a to content of b */ - quick_diff_blob_to_str(a, NULL, b_content, 0, NULL); - assert_one_modified(1, 6, 1, 5, 0, &expected); - - /* diff from blob a to content of a */ - opts.flags |= GIT_DIFF_INCLUDE_UNMODIFIED; - quick_diff_blob_to_str(a, NULL, a_content, 0, NULL); - assert_identical_blobs_comparison(&expected); - - /* diff from NULL blob to content of a */ - memset(&expected, 0, sizeof(expected)); - quick_diff_blob_to_str(NULL, NULL, a_content, 0, NULL); - assert_changed_single_one_line_file(&expected, GIT_DELTA_ADDED); - - /* diff from blob a to NULL buffer */ - memset(&expected, 0, sizeof(expected)); - quick_diff_blob_to_str(a, NULL, NULL, 0, NULL); - assert_changed_single_one_line_file(&expected, GIT_DELTA_DELETED); - - /* diff with reverse */ - opts.flags ^= GIT_DIFF_REVERSE; - - memset(&expected, 0, sizeof(expected)); - quick_diff_blob_to_str(a, NULL, NULL, 0, NULL); - assert_changed_single_one_line_file(&expected, GIT_DELTA_ADDED); - - git_blob_free(a); -} - -void test_diff_blob__can_compare_blob_to_buffer_with_patch(void) -{ - git_patch *p; - git_blob *a; - git_oid a_oid; - const char *a_content = "Hello from the root\n"; - const char *b_content = "Hello from the root\n\nSome additional lines\n\nDown here below\n\n"; - size_t tc, ta, td; - - /* tests/resources/attr/root_test1 */ - cl_git_pass(git_oid_fromstrn(&a_oid, "45141a79", 8)); - cl_git_pass(git_blob_lookup_prefix(&a, g_repo, &a_oid, 8)); - - /* diff from blob a to content of b */ - cl_git_pass(git_patch_from_blob_and_buffer( - &p, a, NULL, b_content, strlen(b_content), NULL, &opts)); - - cl_assert(p != NULL); - cl_assert_equal_i(GIT_DELTA_MODIFIED, git_patch_get_delta(p)->status); - cl_assert_equal_i(1, (int)git_patch_num_hunks(p)); - cl_assert_equal_i(6, git_patch_num_lines_in_hunk(p, 0)); - - cl_git_pass(git_patch_line_stats(&tc, &ta, &td, p)); - cl_assert_equal_i(1, (int)tc); - cl_assert_equal_i(5, (int)ta); - cl_assert_equal_i(0, (int)td); - - git_patch_free(p); - - /* diff from blob a to content of a */ - opts.flags |= GIT_DIFF_INCLUDE_UNMODIFIED; - cl_git_pass(git_patch_from_blob_and_buffer( - &p, a, NULL, a_content, strlen(a_content), NULL, &opts)); - cl_assert(p != NULL); - cl_assert_equal_i(GIT_DELTA_UNMODIFIED, git_patch_get_delta(p)->status); - cl_assert_equal_i(0, (int)git_patch_num_hunks(p)); - git_patch_free(p); - - /* diff from NULL blob to content of a */ - cl_git_pass(git_patch_from_blob_and_buffer( - &p, NULL, NULL, a_content, strlen(a_content), NULL, &opts)); - cl_assert(p != NULL); - cl_assert_equal_i(GIT_DELTA_ADDED, git_patch_get_delta(p)->status); - cl_assert_equal_i(1, (int)git_patch_num_hunks(p)); - cl_assert_equal_i(1, git_patch_num_lines_in_hunk(p, 0)); - git_patch_free(p); - - /* diff from blob a to NULL buffer */ - cl_git_pass(git_patch_from_blob_and_buffer( - &p, a, NULL, NULL, 0, NULL, &opts)); - cl_assert(p != NULL); - cl_assert_equal_i(GIT_DELTA_DELETED, git_patch_get_delta(p)->status); - cl_assert_equal_i(1, (int)git_patch_num_hunks(p)); - cl_assert_equal_i(1, git_patch_num_lines_in_hunk(p, 0)); - git_patch_free(p); - - /* diff with reverse */ - opts.flags ^= GIT_DIFF_REVERSE; - - cl_git_pass(git_patch_from_blob_and_buffer( - &p, a, NULL, NULL, 0, NULL, &opts)); - cl_assert(p != NULL); - cl_assert_equal_i(GIT_DELTA_ADDED, git_patch_get_delta(p)->status); - cl_assert_equal_i(1, (int)git_patch_num_hunks(p)); - cl_assert_equal_i(1, git_patch_num_lines_in_hunk(p, 0)); - git_patch_free(p); - - git_blob_free(a); -} - -static void assert_one_modified_with_lines(diff_expects *expected, int lines) -{ - cl_assert_equal_i(1, expected->files); - cl_assert_equal_i(1, expected->file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(0, expected->files_binary); - cl_assert_equal_i(lines, expected->lines); -} - -void test_diff_blob__binary_data_comparisons(void) -{ - git_blob *bin, *nonbin; - git_oid oid; - const char *nonbin_content = "Hello from the root\n"; - size_t nonbin_len = 20; - const char *bin_content = "0123456789\n\x01\x02\x03\x04\x05\x06\x07\x08\x09\x00\n0123456789\n"; - size_t bin_len = 33; - - opts.flags |= GIT_DIFF_INCLUDE_UNMODIFIED; - - cl_git_pass(git_oid_fromstrn(&oid, "45141a79", 8)); - cl_git_pass(git_blob_lookup_prefix(&nonbin, g_repo, &oid, 8)); - - cl_git_pass(git_oid_fromstrn(&oid, "b435cd56", 8)); - cl_git_pass(git_blob_lookup_prefix(&bin, g_repo, &oid, 8)); - - /* non-binary to reference content */ - - quick_diff_blob_to_str(nonbin, NULL, nonbin_content, nonbin_len, NULL); - assert_identical_blobs_comparison(&expected); - cl_assert_equal_i(0, expected.files_binary); - - /* binary to reference content */ - - quick_diff_blob_to_str(bin, NULL, bin_content, bin_len, NULL); - assert_identical_blobs_comparison(&expected); - - cl_assert_equal_i(1, expected.files_binary); - - /* non-binary to binary content */ - - quick_diff_blob_to_str(nonbin, NULL, bin_content, bin_len, NULL); - assert_binary_blobs_comparison(&expected); - - /* binary to non-binary content */ - - quick_diff_blob_to_str(bin, NULL, nonbin_content, nonbin_len, NULL); - assert_binary_blobs_comparison(&expected); - - /* non-binary to binary blob */ - - memset(&expected, 0, sizeof(expected)); - cl_git_pass(git_diff_blobs( - bin, NULL, nonbin, NULL, &opts, - diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &expected)); - assert_binary_blobs_comparison(&expected); - - /* - * repeat with FORCE_TEXT - */ - - opts.flags |= GIT_DIFF_FORCE_TEXT; - - quick_diff_blob_to_str(bin, NULL, bin_content, bin_len, NULL); - assert_identical_blobs_comparison(&expected); - - quick_diff_blob_to_str(nonbin, NULL, bin_content, bin_len, NULL); - assert_one_modified_with_lines(&expected, 4); - - quick_diff_blob_to_str(bin, NULL, nonbin_content, nonbin_len, NULL); - assert_one_modified_with_lines(&expected, 4); - - memset(&expected, 0, sizeof(expected)); - cl_git_pass(git_diff_blobs( - bin, NULL, nonbin, NULL, &opts, - diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &expected)); - assert_one_modified_with_lines(&expected, 4); - - /* cleanup */ - git_blob_free(bin); - git_blob_free(nonbin); -} - -void test_diff_blob__using_path_and_attributes(void) -{ - git_config *cfg; - git_blob *bin, *nonbin; - git_oid oid; - const char *nonbin_content = "Hello from the root\n"; - const char *bin_content = - "0123456789\n\x01\x02\x03\x04\x05\x06\x07\x08\x09\x00\n0123456789\n"; - size_t bin_len = 33; - const char *changed; - git_patch *p; - git_buf buf = GIT_BUF_INIT; - - /* set up custom diff drivers and 'diff' attribute mappings for them */ - - cl_git_pass(git_repository_config(&cfg, g_repo)); - cl_git_pass(git_config_set_bool(cfg, "diff.iam_binary.binary", 1)); - cl_git_pass(git_config_set_bool(cfg, "diff.iam_text.binary", 0)); - cl_git_pass(git_config_set_string( - cfg, "diff.iam_alphactx.xfuncname", "^[A-Za-z].*$")); - cl_git_pass(git_config_set_bool(cfg, "diff.iam_textalpha.binary", 0)); - cl_git_pass(git_config_set_string( - cfg, "diff.iam_textalpha.xfuncname", "^[A-Za-z].*$")); - cl_git_pass(git_config_set_string( - cfg, "diff.iam_numctx.funcname", "^[0-9][0-9]*")); - cl_git_pass(git_config_set_bool(cfg, "diff.iam_textnum.binary", 0)); - cl_git_pass(git_config_set_string( - cfg, "diff.iam_textnum.funcname", "^[0-9][0-9]*")); - git_config_free(cfg); - - cl_git_append2file( - "attr/.gitattributes", - "\n\n# test_diff_blob__using_path_and_attributes extra\n\n" - "*.binary diff=iam_binary\n" - "*.textary diff=iam_text\n" - "*.alphary diff=iam_alphactx\n" - "*.textalphary diff=iam_textalpha\n" - "*.textnumary diff=iam_textnum\n" - "*.numary diff=iam_numctx\n\n"); - - opts.context_lines = 0; - opts.flags |= GIT_DIFF_INCLUDE_UNMODIFIED; - - cl_git_pass(git_oid_fromstrn(&oid, "45141a79", 8)); - cl_git_pass(git_blob_lookup_prefix(&nonbin, g_repo, &oid, 8)); - /* 20b: "Hello from the root\n" */ - - cl_git_pass(git_oid_fromstrn(&oid, "b435cd56", 8)); - cl_git_pass(git_blob_lookup_prefix(&bin, g_repo, &oid, 8)); - /* 33b: "0123456789\n\x01\x02\x03\x04\x05\x06\x07\x08\x09\n0123456789\n" */ - - /* non-binary to reference content */ - - quick_diff_blob_to_str(nonbin, NULL, nonbin_content, 0, NULL); - assert_identical_blobs_comparison(&expected); - cl_assert_equal_i(0, expected.files_binary); - - /* binary to reference content */ - - quick_diff_blob_to_str(bin, NULL, bin_content, bin_len, NULL); - assert_identical_blobs_comparison(&expected); - cl_assert_equal_i(1, expected.files_binary); - - /* add some text */ - - changed = "Hello from the root\nMore lines\nAnd more\nGo here\n"; - - quick_diff_blob_to_str(nonbin, NULL, changed, 0, NULL); - assert_one_modified(1, 3, 0, 3, 0, &expected); - - quick_diff_blob_to_str(nonbin, "foo/bar.binary", changed, 0, NULL); - cl_assert_equal_i(1, expected.files); - cl_assert_equal_i(1, expected.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(1, expected.files_binary); - cl_assert_equal_i(0, expected.hunks); - cl_assert_equal_i(0, expected.lines); - - quick_diff_blob_to_str(nonbin, "foo/bar.textary", changed, 0, NULL); - assert_one_modified(1, 3, 0, 3, 0, &expected); - - quick_diff_blob_to_str(nonbin, "foo/bar.alphary", changed, 0, NULL); - assert_one_modified(1, 3, 0, 3, 0, &expected); - - cl_git_pass(git_patch_from_blob_and_buffer( - &p, nonbin, "zzz.normal", changed, strlen(changed), NULL, &opts)); - cl_git_pass(git_patch_to_buf(&buf, p)); - cl_assert_equal_s( - "diff --git a/zzz.normal b/zzz.normal\n" - "index 45141a7..75b0dbb 100644\n" - "--- a/zzz.normal\n" - "+++ b/zzz.normal\n" - "@@ -1,0 +2,3 @@ Hello from the root\n" - "+More lines\n" - "+And more\n" - "+Go here\n", buf.ptr); - git_buf_clear(&buf); - git_patch_free(p); - - cl_git_pass(git_patch_from_blob_and_buffer( - &p, nonbin, "zzz.binary", changed, strlen(changed), NULL, &opts)); - cl_git_pass(git_patch_to_buf(&buf, p)); - cl_assert_equal_s( - "diff --git a/zzz.binary b/zzz.binary\n" - "index 45141a7..75b0dbb 100644\n" - "Binary files a/zzz.binary and b/zzz.binary differ\n", buf.ptr); - git_buf_clear(&buf); - git_patch_free(p); - - cl_git_pass(git_patch_from_blob_and_buffer( - &p, nonbin, "zzz.alphary", changed, strlen(changed), NULL, &opts)); - cl_git_pass(git_patch_to_buf(&buf, p)); - cl_assert_equal_s( - "diff --git a/zzz.alphary b/zzz.alphary\n" - "index 45141a7..75b0dbb 100644\n" - "--- a/zzz.alphary\n" - "+++ b/zzz.alphary\n" - "@@ -1,0 +2,3 @@ Hello from the root\n" - "+More lines\n" - "+And more\n" - "+Go here\n", buf.ptr); - git_buf_clear(&buf); - git_patch_free(p); - - cl_git_pass(git_patch_from_blob_and_buffer( - &p, nonbin, "zzz.numary", changed, strlen(changed), NULL, &opts)); - cl_git_pass(git_patch_to_buf(&buf, p)); - cl_assert_equal_s( - "diff --git a/zzz.numary b/zzz.numary\n" - "index 45141a7..75b0dbb 100644\n" - "--- a/zzz.numary\n" - "+++ b/zzz.numary\n" - "@@ -1,0 +2,3 @@\n" - "+More lines\n" - "+And more\n" - "+Go here\n", buf.ptr); - git_buf_clear(&buf); - git_patch_free(p); - - /* "0123456789\n\x01\x02\x03\x04\x05\x06\x07\x08\x09\x00\n0123456789\n" - * 33 bytes - */ - - changed = "0123456789\n\x01\x02\x03\x04\x05\x06\x07\x08\x09\x00\nreplace a line\n"; - - cl_git_pass(git_patch_from_blob_and_buffer( - &p, bin, "zzz.normal", changed, 37, NULL, &opts)); - cl_git_pass(git_patch_to_buf(&buf, p)); - cl_assert_equal_s( - "diff --git a/zzz.normal b/zzz.normal\n" - "index b435cd5..1604519 100644\n" - "Binary files a/zzz.normal and b/zzz.normal differ\n", buf.ptr); - git_buf_clear(&buf); - git_patch_free(p); - - cl_git_pass(git_patch_from_blob_and_buffer( - &p, bin, "zzz.textary", changed, 37, NULL, &opts)); - cl_git_pass(git_patch_to_buf(&buf, p)); - cl_assert_equal_s( - "diff --git a/zzz.textary b/zzz.textary\n" - "index b435cd5..1604519 100644\n" - "--- a/zzz.textary\n" - "+++ b/zzz.textary\n" - "@@ -3 +3 @@\n" - "-0123456789\n" - "+replace a line\n", buf.ptr); - git_buf_clear(&buf); - git_patch_free(p); - - cl_git_pass(git_patch_from_blob_and_buffer( - &p, bin, "zzz.textalphary", changed, 37, NULL, &opts)); - cl_git_pass(git_patch_to_buf(&buf, p)); - cl_assert_equal_s( - "diff --git a/zzz.textalphary b/zzz.textalphary\n" - "index b435cd5..1604519 100644\n" - "--- a/zzz.textalphary\n" - "+++ b/zzz.textalphary\n" - "@@ -3 +3 @@\n" - "-0123456789\n" - "+replace a line\n", buf.ptr); - git_buf_clear(&buf); - git_patch_free(p); - - cl_git_pass(git_patch_from_blob_and_buffer( - &p, bin, "zzz.textnumary", changed, 37, NULL, &opts)); - cl_git_pass(git_patch_to_buf(&buf, p)); - cl_assert_equal_s( - "diff --git a/zzz.textnumary b/zzz.textnumary\n" - "index b435cd5..1604519 100644\n" - "--- a/zzz.textnumary\n" - "+++ b/zzz.textnumary\n" - "@@ -3 +3 @@ 0123456789\n" - "-0123456789\n" - "+replace a line\n", buf.ptr); - git_buf_clear(&buf); - git_patch_free(p); - - git_buf_free(&buf); - git_blob_free(nonbin); - git_blob_free(bin); -} - -void test_diff_blob__can_compare_buffer_to_buffer(void) -{ - const char *a = "a\nb\nc\nd\ne\nf\ng\nh\ni\nj\n"; - const char *b = "a\nB\nc\nd\nE\nF\nh\nj\nk\n"; - - opts.interhunk_lines = 0; - opts.context_lines = 0; - - memset(&expected, 0, sizeof(expected)); - - cl_git_pass(git_diff_buffers( - a, strlen(a), NULL, b, strlen(b), NULL, &opts, - diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &expected)); - assert_one_modified(4, 9, 0, 4, 5, &expected); - - opts.flags ^= GIT_DIFF_REVERSE; - - memset(&expected, 0, sizeof(expected)); - - cl_git_pass(git_diff_buffers( - a, strlen(a), NULL, b, strlen(b), NULL, &opts, - diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &expected)); - assert_one_modified(4, 9, 0, 5, 4, &expected); -} diff --git a/vendor/libgit2/tests/diff/diff_helpers.c b/vendor/libgit2/tests/diff/diff_helpers.c deleted file mode 100644 index c6cdf803f..000000000 --- a/vendor/libgit2/tests/diff/diff_helpers.c +++ /dev/null @@ -1,243 +0,0 @@ -#include "clar_libgit2.h" -#include "diff_helpers.h" -#include "git2/sys/diff.h" - -git_tree *resolve_commit_oid_to_tree( - git_repository *repo, - const char *partial_oid) -{ - size_t len = strlen(partial_oid); - git_oid oid; - git_object *obj = NULL; - git_tree *tree = NULL; - - if (git_oid_fromstrn(&oid, partial_oid, len) == 0) - cl_git_pass(git_object_lookup_prefix(&obj, repo, &oid, len, GIT_OBJ_ANY)); - - cl_git_pass(git_object_peel((git_object **) &tree, obj, GIT_OBJ_TREE)); - git_object_free(obj); - return tree; -} - -static char diff_pick_suffix(int mode) -{ - if (S_ISDIR(mode)) - return '/'; - else if (GIT_PERMS_IS_EXEC(mode)) - return '*'; - else - return ' '; -} - -static void fprintf_delta(FILE *fp, const git_diff_delta *delta, float progress) -{ - char code = git_diff_status_char(delta->status); - char old_suffix = diff_pick_suffix(delta->old_file.mode); - char new_suffix = diff_pick_suffix(delta->new_file.mode); - - fprintf(fp, "%c\t%s", code, delta->old_file.path); - - if ((delta->old_file.path != delta->new_file.path && - strcmp(delta->old_file.path, delta->new_file.path) != 0) || - (delta->old_file.mode != delta->new_file.mode && - delta->old_file.mode != 0 && delta->new_file.mode != 0)) - fprintf(fp, "%c %s%c", old_suffix, delta->new_file.path, new_suffix); - else if (old_suffix != ' ') - fprintf(fp, "%c", old_suffix); - - fprintf(fp, "\t[%.2f]\n", progress); -} - -int diff_file_cb( - const git_diff_delta *delta, - float progress, - void *payload) -{ - diff_expects *e = payload; - - if (e->debug) - fprintf_delta(stderr, delta, progress); - - if (e->names) - cl_assert_equal_s(e->names[e->files], delta->old_file.path); - if (e->statuses) - cl_assert_equal_i(e->statuses[e->files], (int)delta->status); - - e->files++; - - if ((delta->flags & GIT_DIFF_FLAG_BINARY) != 0) - e->files_binary++; - - cl_assert(delta->status <= GIT_DELTA_CONFLICTED); - - e->file_status[delta->status] += 1; - - return 0; -} - -int diff_print_file_cb( - const git_diff_delta *delta, - float progress, - void *payload) -{ - if (!payload) { - fprintf_delta(stderr, delta, progress); - return 0; - } - - if (!((diff_expects *)payload)->debug) - fprintf_delta(stderr, delta, progress); - - return diff_file_cb(delta, progress, payload); -} - -int diff_binary_cb( - const git_diff_delta *delta, - const git_diff_binary *binary, - void *payload) -{ - GIT_UNUSED(delta); - GIT_UNUSED(binary); - GIT_UNUSED(payload); - - return 0; -} - -int diff_hunk_cb( - const git_diff_delta *delta, - const git_diff_hunk *hunk, - void *payload) -{ - diff_expects *e = payload; - const char *scan = hunk->header, *scan_end = scan + hunk->header_len; - - GIT_UNUSED(delta); - - /* confirm no NUL bytes in header text */ - while (scan < scan_end) - cl_assert('\0' != *scan++); - - e->hunks++; - e->hunk_old_lines += hunk->old_lines; - e->hunk_new_lines += hunk->new_lines; - return 0; -} - -int diff_line_cb( - const git_diff_delta *delta, - const git_diff_hunk *hunk, - const git_diff_line *line, - void *payload) -{ - diff_expects *e = payload; - - GIT_UNUSED(delta); - GIT_UNUSED(hunk); - - e->lines++; - switch (line->origin) { - case GIT_DIFF_LINE_CONTEXT: - case GIT_DIFF_LINE_CONTEXT_EOFNL: /* techically not a line */ - e->line_ctxt++; - break; - case GIT_DIFF_LINE_ADDITION: - case GIT_DIFF_LINE_ADD_EOFNL: /* technically not a line add */ - e->line_adds++; - break; - case GIT_DIFF_LINE_DELETION: - case GIT_DIFF_LINE_DEL_EOFNL: /* technically not a line delete */ - e->line_dels++; - break; - default: - break; - } - return 0; -} - -int diff_foreach_via_iterator( - git_diff *diff, - git_diff_file_cb file_cb, - git_diff_binary_cb binary_cb, - git_diff_hunk_cb hunk_cb, - git_diff_line_cb line_cb, - void *data) -{ - size_t d, num_d = git_diff_num_deltas(diff); - - GIT_UNUSED(binary_cb); - - for (d = 0; d < num_d; ++d) { - git_patch *patch; - const git_diff_delta *delta; - size_t h, num_h; - - cl_git_pass(git_patch_from_diff(&patch, diff, d)); - cl_assert((delta = git_patch_get_delta(patch)) != NULL); - - /* call file_cb for this file */ - if (file_cb != NULL && file_cb(delta, (float)d / num_d, data) != 0) { - git_patch_free(patch); - goto abort; - } - - /* if there are no changes, then the patch will be NULL */ - if (!patch) { - cl_assert(delta->status == GIT_DELTA_UNMODIFIED || - (delta->flags & GIT_DIFF_FLAG_BINARY) != 0); - continue; - } - - if (!hunk_cb && !line_cb) { - git_patch_free(patch); - continue; - } - - num_h = git_patch_num_hunks(patch); - - for (h = 0; h < num_h; h++) { - const git_diff_hunk *hunk; - size_t l, num_l; - - cl_git_pass(git_patch_get_hunk(&hunk, &num_l, patch, h)); - - if (hunk_cb && hunk_cb(delta, hunk, data) != 0) { - git_patch_free(patch); - goto abort; - } - - for (l = 0; l < num_l; ++l) { - const git_diff_line *line; - - cl_git_pass(git_patch_get_line_in_hunk(&line, patch, h, l)); - - if (line_cb && - line_cb(delta, hunk, line, data) != 0) { - git_patch_free(patch); - goto abort; - } - } - } - - git_patch_free(patch); - } - - return 0; - -abort: - giterr_clear(); - return GIT_EUSER; -} - -void diff_print(FILE *fp, git_diff *diff) -{ - cl_git_pass( - git_diff_print(diff, GIT_DIFF_FORMAT_PATCH, - git_diff_print_callback__to_file_handle, fp ? fp : stderr)); -} - -void diff_print_raw(FILE *fp, git_diff *diff) -{ - cl_git_pass( - git_diff_print(diff, GIT_DIFF_FORMAT_RAW, - git_diff_print_callback__to_file_handle, fp ? fp : stderr)); -} diff --git a/vendor/libgit2/tests/diff/diff_helpers.h b/vendor/libgit2/tests/diff/diff_helpers.h deleted file mode 100644 index 4d3cd3474..000000000 --- a/vendor/libgit2/tests/diff/diff_helpers.h +++ /dev/null @@ -1,70 +0,0 @@ -#include "fileops.h" -#include "git2/diff.h" - -extern git_tree *resolve_commit_oid_to_tree( - git_repository *repo, const char *partial_oid); - -typedef struct { - int files; - int files_binary; - - int file_status[11]; /* indexed by git_delta_t value */ - - int hunks; - int hunk_new_lines; - int hunk_old_lines; - - int lines; - int line_ctxt; - int line_adds; - int line_dels; - - /* optional arrays of expected specific values */ - const char **names; - int *statuses; - - int debug; - -} diff_expects; - -typedef struct { - const char *path; - const char *matched_pathspec; -} notify_expected; - -extern int diff_file_cb( - const git_diff_delta *delta, - float progress, - void *cb_data); - -extern int diff_print_file_cb( - const git_diff_delta *delta, - float progress, - void *cb_data); - -extern int diff_binary_cb( - const git_diff_delta *delta, - const git_diff_binary *binary, - void *cb_data); - -extern int diff_hunk_cb( - const git_diff_delta *delta, - const git_diff_hunk *hunk, - void *cb_data); - -extern int diff_line_cb( - const git_diff_delta *delta, - const git_diff_hunk *hunk, - const git_diff_line *line, - void *cb_data); - -extern int diff_foreach_via_iterator( - git_diff *diff, - git_diff_file_cb file_cb, - git_diff_binary_cb binary_cb, - git_diff_hunk_cb hunk_cb, - git_diff_line_cb line_cb, - void *data); - -extern void diff_print(FILE *fp, git_diff *diff); -extern void diff_print_raw(FILE *fp, git_diff *diff); diff --git a/vendor/libgit2/tests/diff/diffiter.c b/vendor/libgit2/tests/diff/diffiter.c deleted file mode 100644 index c976e30e2..000000000 --- a/vendor/libgit2/tests/diff/diffiter.c +++ /dev/null @@ -1,453 +0,0 @@ -#include "clar_libgit2.h" -#include "diff_helpers.h" - -void test_diff_diffiter__initialize(void) -{ -} - -void test_diff_diffiter__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -void test_diff_diffiter__create(void) -{ - git_repository *repo = cl_git_sandbox_init("attr"); - git_diff *diff; - size_t d, num_d; - - cl_git_pass(git_diff_index_to_workdir(&diff, repo, NULL, NULL)); - - num_d = git_diff_num_deltas(diff); - for (d = 0; d < num_d; ++d) { - const git_diff_delta *delta = git_diff_get_delta(diff, d); - cl_assert(delta != NULL); - } - - cl_assert(!git_diff_get_delta(diff, num_d)); - - git_diff_free(diff); -} - -void test_diff_diffiter__iterate_files_1(void) -{ - git_repository *repo = cl_git_sandbox_init("attr"); - git_diff *diff; - size_t d, num_d; - diff_expects exp = { 0 }; - - cl_git_pass(git_diff_index_to_workdir(&diff, repo, NULL, NULL)); - - num_d = git_diff_num_deltas(diff); - - for (d = 0; d < num_d; ++d) { - const git_diff_delta *delta = git_diff_get_delta(diff, d); - cl_assert(delta != NULL); - - diff_file_cb(delta, (float)d / (float)num_d, &exp); - } - cl_assert_equal_sz(6, exp.files); - - git_diff_free(diff); -} - -void test_diff_diffiter__iterate_files_2(void) -{ - git_repository *repo = cl_git_sandbox_init("status"); - git_diff *diff; - size_t d, num_d; - int count = 0; - - cl_git_pass(git_diff_index_to_workdir(&diff, repo, NULL, NULL)); - - num_d = git_diff_num_deltas(diff); - cl_assert_equal_i(8, (int)num_d); - - for (d = 0; d < num_d; ++d) { - const git_diff_delta *delta = git_diff_get_delta(diff, d); - cl_assert(delta != NULL); - count++; - } - cl_assert_equal_i(8, count); - - git_diff_free(diff); -} - -void test_diff_diffiter__iterate_files_and_hunks(void) -{ - git_repository *repo = cl_git_sandbox_init("status"); - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - git_diff *diff = NULL; - size_t d, num_d; - int file_count = 0, hunk_count = 0; - - opts.context_lines = 3; - opts.interhunk_lines = 1; - opts.flags |= GIT_DIFF_INCLUDE_IGNORED | GIT_DIFF_INCLUDE_UNTRACKED; - - cl_git_pass(git_diff_index_to_workdir(&diff, repo, NULL, &opts)); - - num_d = git_diff_num_deltas(diff); - - for (d = 0; d < num_d; ++d) { - git_patch *patch; - size_t h, num_h; - - cl_git_pass(git_patch_from_diff(&patch, diff, d)); - cl_assert(patch); - - file_count++; - - num_h = git_patch_num_hunks(patch); - - for (h = 0; h < num_h; h++) { - const git_diff_hunk *hunk; - - cl_git_pass(git_patch_get_hunk(&hunk, NULL, patch, h)); - cl_assert(hunk); - - hunk_count++; - } - - git_patch_free(patch); - } - - cl_assert_equal_i(13, file_count); - cl_assert_equal_i(8, hunk_count); - - git_diff_free(diff); -} - -void test_diff_diffiter__max_size_threshold(void) -{ - git_repository *repo = cl_git_sandbox_init("status"); - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - git_diff *diff = NULL; - int file_count = 0, binary_count = 0, hunk_count = 0; - size_t d, num_d; - - opts.context_lines = 3; - opts.interhunk_lines = 1; - opts.flags |= GIT_DIFF_INCLUDE_IGNORED | GIT_DIFF_INCLUDE_UNTRACKED; - - cl_git_pass(git_diff_index_to_workdir(&diff, repo, NULL, &opts)); - num_d = git_diff_num_deltas(diff); - - for (d = 0; d < num_d; ++d) { - git_patch *patch; - const git_diff_delta *delta; - - cl_git_pass(git_patch_from_diff(&patch, diff, d)); - cl_assert(patch); - delta = git_patch_get_delta(patch); - cl_assert(delta); - - file_count++; - hunk_count += (int)git_patch_num_hunks(patch); - - assert((delta->flags & (GIT_DIFF_FLAG_BINARY|GIT_DIFF_FLAG_NOT_BINARY)) != 0); - binary_count += ((delta->flags & GIT_DIFF_FLAG_BINARY) != 0); - - git_patch_free(patch); - } - - cl_assert_equal_i(13, file_count); - cl_assert_equal_i(0, binary_count); - cl_assert_equal_i(8, hunk_count); - - git_diff_free(diff); - - /* try again with low file size threshold */ - - file_count = binary_count = hunk_count = 0; - - opts.context_lines = 3; - opts.interhunk_lines = 1; - opts.flags |= GIT_DIFF_INCLUDE_IGNORED | GIT_DIFF_INCLUDE_UNTRACKED; - opts.max_size = 50; /* treat anything over 50 bytes as binary! */ - - cl_git_pass(git_diff_index_to_workdir(&diff, repo, NULL, &opts)); - num_d = git_diff_num_deltas(diff); - - for (d = 0; d < num_d; ++d) { - git_patch *patch; - const git_diff_delta *delta; - - cl_git_pass(git_patch_from_diff(&patch, diff, d)); - delta = git_patch_get_delta(patch); - - file_count++; - hunk_count += (int)git_patch_num_hunks(patch); - - assert((delta->flags & (GIT_DIFF_FLAG_BINARY|GIT_DIFF_FLAG_NOT_BINARY)) != 0); - binary_count += ((delta->flags & GIT_DIFF_FLAG_BINARY) != 0); - - git_patch_free(patch); - } - - cl_assert_equal_i(13, file_count); - /* Three files are over the 50 byte threshold: - * - staged_changes_file_deleted - * - staged_changes_modified_file - * - staged_new_file_modified_file - */ - cl_assert_equal_i(3, binary_count); - cl_assert_equal_i(5, hunk_count); - - git_diff_free(diff); -} - - -void test_diff_diffiter__iterate_all(void) -{ - git_repository *repo = cl_git_sandbox_init("status"); - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - git_diff *diff = NULL; - diff_expects exp = {0}; - size_t d, num_d; - - opts.context_lines = 3; - opts.interhunk_lines = 1; - opts.flags |= GIT_DIFF_INCLUDE_IGNORED | GIT_DIFF_INCLUDE_UNTRACKED; - - cl_git_pass(git_diff_index_to_workdir(&diff, repo, NULL, &opts)); - - num_d = git_diff_num_deltas(diff); - for (d = 0; d < num_d; ++d) { - git_patch *patch; - size_t h, num_h; - - cl_git_pass(git_patch_from_diff(&patch, diff, d)); - cl_assert(patch); - exp.files++; - - num_h = git_patch_num_hunks(patch); - for (h = 0; h < num_h; h++) { - const git_diff_hunk *range; - size_t l, num_l; - - cl_git_pass(git_patch_get_hunk(&range, &num_l, patch, h)); - cl_assert(range); - exp.hunks++; - - for (l = 0; l < num_l; ++l) { - const git_diff_line *line; - - cl_git_pass(git_patch_get_line_in_hunk(&line, patch, h, l)); - cl_assert(line && line->content); - exp.lines++; - } - } - - git_patch_free(patch); - } - - cl_assert_equal_i(13, exp.files); - cl_assert_equal_i(8, exp.hunks); - cl_assert_equal_i(14, exp.lines); - - git_diff_free(diff); -} - -static void iterate_over_patch(git_patch *patch, diff_expects *exp) -{ - size_t h, num_h = git_patch_num_hunks(patch), num_l; - - exp->files++; - exp->hunks += (int)num_h; - - /* let's iterate in reverse, just because we can! */ - for (h = 1, num_l = 0; h <= num_h; ++h) - num_l += git_patch_num_lines_in_hunk(patch, num_h - h); - - exp->lines += (int)num_l; -} - -#define PATCH_CACHE 5 - -void test_diff_diffiter__iterate_randomly_while_saving_state(void) -{ - git_repository *repo = cl_git_sandbox_init("status"); - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - git_diff *diff = NULL; - diff_expects exp = {0}; - git_patch *patches[PATCH_CACHE]; - size_t p, d, num_d; - - memset(patches, 0, sizeof(patches)); - - opts.context_lines = 3; - opts.interhunk_lines = 1; - opts.flags |= GIT_DIFF_INCLUDE_IGNORED | GIT_DIFF_INCLUDE_UNTRACKED; - - cl_git_pass(git_diff_index_to_workdir(&diff, repo, NULL, &opts)); - - num_d = git_diff_num_deltas(diff); - - /* To make sure that references counts work for diff and patch objects, - * this generates patches and randomly caches them. Only when the patch - * is removed from the cache are hunks and lines counted. At the end, - * there are still patches in the cache, so free the diff and try to - * process remaining patches after the diff is freed. - */ - - srand(121212); - p = rand() % PATCH_CACHE; - - for (d = 0; d < num_d; ++d) { - /* take old patch */ - git_patch *patch = patches[p]; - patches[p] = NULL; - - /* cache new patch */ - cl_git_pass(git_patch_from_diff(&patches[p], diff, d)); - cl_assert(patches[p] != NULL); - - /* process old patch if non-NULL */ - if (patch != NULL) { - iterate_over_patch(patch, &exp); - git_patch_free(patch); - } - - p = rand() % PATCH_CACHE; - } - - /* free diff list now - refcounts should keep things safe */ - git_diff_free(diff); - - /* process remaining unprocessed patches */ - for (p = 0; p < PATCH_CACHE; p++) { - git_patch *patch = patches[p]; - - if (patch != NULL) { - iterate_over_patch(patch, &exp); - git_patch_free(patch); - } - } - - /* hopefully it all still added up right */ - cl_assert_equal_i(13, exp.files); - cl_assert_equal_i(8, exp.hunks); - cl_assert_equal_i(14, exp.lines); -} - -/* This output is taken directly from `git diff` on the status test data */ -static const char *expected_patch_text[8] = { - /* 0 */ - "diff --git a/file_deleted b/file_deleted\n" - "deleted file mode 100644\n" - "index 5452d32..0000000\n" - "--- a/file_deleted\n" - "+++ /dev/null\n" - "@@ -1 +0,0 @@\n" - "-file_deleted\n", - /* 1 */ - "diff --git a/modified_file b/modified_file\n" - "index 452e424..0a53963 100644\n" - "--- a/modified_file\n" - "+++ b/modified_file\n" - "@@ -1 +1,2 @@\n" - " modified_file\n" - "+modified_file\n", - /* 2 */ - "diff --git a/staged_changes_file_deleted b/staged_changes_file_deleted\n" - "deleted file mode 100644\n" - "index a6be623..0000000\n" - "--- a/staged_changes_file_deleted\n" - "+++ /dev/null\n" - "@@ -1,2 +0,0 @@\n" - "-staged_changes_file_deleted\n" - "-staged_changes_file_deleted\n", - /* 3 */ - "diff --git a/staged_changes_modified_file b/staged_changes_modified_file\n" - "index 906ee77..011c344 100644\n" - "--- a/staged_changes_modified_file\n" - "+++ b/staged_changes_modified_file\n" - "@@ -1,2 +1,3 @@\n" - " staged_changes_modified_file\n" - " staged_changes_modified_file\n" - "+staged_changes_modified_file\n", - /* 4 */ - "diff --git a/staged_new_file_deleted_file b/staged_new_file_deleted_file\n" - "deleted file mode 100644\n" - "index 90b8c29..0000000\n" - "--- a/staged_new_file_deleted_file\n" - "+++ /dev/null\n" - "@@ -1 +0,0 @@\n" - "-staged_new_file_deleted_file\n", - /* 5 */ - "diff --git a/staged_new_file_modified_file b/staged_new_file_modified_file\n" - "index ed06290..8b090c0 100644\n" - "--- a/staged_new_file_modified_file\n" - "+++ b/staged_new_file_modified_file\n" - "@@ -1 +1,2 @@\n" - " staged_new_file_modified_file\n" - "+staged_new_file_modified_file\n", - /* 6 */ - "diff --git a/subdir/deleted_file b/subdir/deleted_file\n" - "deleted file mode 100644\n" - "index 1888c80..0000000\n" - "--- a/subdir/deleted_file\n" - "+++ /dev/null\n" - "@@ -1 +0,0 @@\n" - "-subdir/deleted_file\n", - /* 7 */ - "diff --git a/subdir/modified_file b/subdir/modified_file\n" - "index a619198..57274b7 100644\n" - "--- a/subdir/modified_file\n" - "+++ b/subdir/modified_file\n" - "@@ -1 +1,2 @@\n" - " subdir/modified_file\n" - "+subdir/modified_file\n" -}; - -void test_diff_diffiter__iterate_and_generate_patch_text(void) -{ - git_repository *repo = cl_git_sandbox_init("status"); - git_diff *diff; - size_t d, num_d; - - cl_git_pass(git_diff_index_to_workdir(&diff, repo, NULL, NULL)); - - num_d = git_diff_num_deltas(diff); - cl_assert_equal_i(8, (int)num_d); - - for (d = 0; d < num_d; ++d) { - git_patch *patch; - git_buf buf = GIT_BUF_INIT; - - cl_git_pass(git_patch_from_diff(&patch, diff, d)); - cl_assert(patch != NULL); - - cl_git_pass(git_patch_to_buf(&buf, patch)); - - cl_assert_equal_s(expected_patch_text[d], buf.ptr); - - git_buf_free(&buf); - git_patch_free(patch); - } - - git_diff_free(diff); -} - -void test_diff_diffiter__checks_options_version(void) -{ - git_repository *repo = cl_git_sandbox_init("status"); - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - git_diff *diff = NULL; - const git_error *err; - - opts.version = 0; - opts.flags |= GIT_DIFF_INCLUDE_IGNORED | GIT_DIFF_INCLUDE_UNTRACKED; - - cl_git_fail(git_diff_index_to_workdir(&diff, repo, NULL, &opts)); - err = giterr_last(); - cl_assert_equal_i(GITERR_INVALID, err->klass); - - giterr_clear(); - opts.version = 1024; - cl_git_fail(git_diff_index_to_workdir(&diff, repo, NULL, &opts)); - err = giterr_last(); - cl_assert_equal_i(GITERR_INVALID, err->klass); -} - diff --git a/vendor/libgit2/tests/diff/drivers.c b/vendor/libgit2/tests/diff/drivers.c deleted file mode 100644 index 42af38a9a..000000000 --- a/vendor/libgit2/tests/diff/drivers.c +++ /dev/null @@ -1,278 +0,0 @@ -#include "clar_libgit2.h" -#include "diff_helpers.h" -#include "repository.h" -#include "diff_driver.h" - -static git_repository *g_repo = NULL; - -void test_diff_drivers__initialize(void) -{ -} - -void test_diff_drivers__cleanup(void) -{ - cl_git_sandbox_cleanup(); - g_repo = NULL; -} - -static void overwrite_filemode(const char *expected, git_buf *actual) -{ - size_t offset; - char *found; - - found = strstr(expected, "100644"); - if (!found) - return; - - offset = ((const char *)found) - expected; - if (actual->size < offset + 6) - return; - - if (memcmp(&actual->ptr[offset], "100644", 6) != 0) - memcpy(&actual->ptr[offset], "100644", 6); -} - -void test_diff_drivers__patterns(void) -{ - git_config *cfg; - const char *one_sha = "19dd32dfb1520a64e5bbaae8dce6ef423dfa2f13"; - git_tree *one; - git_diff *diff; - git_patch *patch; - git_buf actual = GIT_BUF_INIT; - const char *expected0 = "diff --git a/untimely.txt b/untimely.txt\nindex 9a69d96..57fd0cf 100644\n--- a/untimely.txt\n+++ b/untimely.txt\n@@ -22,3 +22,5 @@ Comes through the blood of the vanguards who\n dreamed--too soon--it had sounded.\r\n \r\n -- Rudyard Kipling\r\n+\r\n+Some new stuff\r\n"; - const char *expected1 = "diff --git a/untimely.txt b/untimely.txt\nindex 9a69d96..57fd0cf 100644\nBinary files a/untimely.txt and b/untimely.txt differ\n"; - const char *expected2 = "diff --git a/untimely.txt b/untimely.txt\nindex 9a69d96..57fd0cf 100644\n--- a/untimely.txt\n+++ b/untimely.txt\n@@ -22,3 +22,5 @@ Heaven delivers on earth the Hour that cannot be\n dreamed--too soon--it had sounded.\r\n \r\n -- Rudyard Kipling\r\n+\r\n+Some new stuff\r\n"; - - g_repo = cl_git_sandbox_init("renames"); - - one = resolve_commit_oid_to_tree(g_repo, one_sha); - - /* no diff */ - - cl_git_pass(git_diff_tree_to_workdir(&diff, g_repo, one, NULL)); - cl_assert_equal_i(0, (int)git_diff_num_deltas(diff)); - git_diff_free(diff); - - /* default diff */ - - cl_git_append2file("renames/untimely.txt", "\r\nSome new stuff\r\n"); - - cl_git_pass(git_diff_tree_to_workdir(&diff, g_repo, one, NULL)); - cl_assert_equal_i(1, (int)git_diff_num_deltas(diff)); - - cl_git_pass(git_patch_from_diff(&patch, diff, 0)); - cl_git_pass(git_patch_to_buf(&actual, patch)); - cl_assert_equal_s(expected0, actual.ptr); - - git_buf_free(&actual); - git_patch_free(patch); - git_diff_free(diff); - - /* attribute diff set to false */ - - cl_git_rewritefile("renames/.gitattributes", "untimely.txt -diff\n"); - - cl_git_pass(git_diff_tree_to_workdir(&diff, g_repo, one, NULL)); - cl_assert_equal_i(1, (int)git_diff_num_deltas(diff)); - - cl_git_pass(git_patch_from_diff(&patch, diff, 0)); - cl_git_pass(git_patch_to_buf(&actual, patch)); - cl_assert_equal_s(expected1, actual.ptr); - - git_buf_free(&actual); - git_patch_free(patch); - git_diff_free(diff); - - /* attribute diff set to unconfigured value (should use default) */ - - cl_git_rewritefile("renames/.gitattributes", "untimely.txt diff=kipling0\n"); - - cl_git_pass(git_diff_tree_to_workdir(&diff, g_repo, one, NULL)); - cl_assert_equal_i(1, (int)git_diff_num_deltas(diff)); - - cl_git_pass(git_patch_from_diff(&patch, diff, 0)); - cl_git_pass(git_patch_to_buf(&actual, patch)); - cl_assert_equal_s(expected0, actual.ptr); - - git_buf_free(&actual); - git_patch_free(patch); - git_diff_free(diff); - - /* let's define that driver */ - - cl_git_pass(git_repository_config(&cfg, g_repo)); - cl_git_pass(git_config_set_bool(cfg, "diff.kipling0.binary", 1)); - git_config_free(cfg); - - cl_git_pass(git_diff_tree_to_workdir(&diff, g_repo, one, NULL)); - cl_assert_equal_i(1, (int)git_diff_num_deltas(diff)); - - cl_git_pass(git_patch_from_diff(&patch, diff, 0)); - cl_git_pass(git_patch_to_buf(&actual, patch)); - cl_assert_equal_s(expected1, actual.ptr); - - git_buf_free(&actual); - git_patch_free(patch); - git_diff_free(diff); - - /* let's use a real driver with some regular expressions */ - - git_diff_driver_registry_free(g_repo->diff_drivers); - g_repo->diff_drivers = NULL; - - cl_git_pass(git_repository_config(&cfg, g_repo)); - cl_git_pass(git_config_set_bool(cfg, "diff.kipling0.binary", 0)); - cl_git_pass(git_config_set_string(cfg, "diff.kipling0.xfuncname", "^H.*$")); - git_config_free(cfg); - - cl_git_pass(git_diff_tree_to_workdir(&diff, g_repo, one, NULL)); - cl_assert_equal_i(1, (int)git_diff_num_deltas(diff)); - - cl_git_pass(git_patch_from_diff(&patch, diff, 0)); - cl_git_pass(git_patch_to_buf(&actual, patch)); - cl_assert_equal_s(expected2, actual.ptr); - - git_buf_free(&actual); - git_patch_free(patch); - git_diff_free(diff); - - git_tree_free(one); -} - -void test_diff_drivers__long_lines(void) -{ - const char *base = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed non nisi ligula. Ut viverra enim sed lobortis suscipit.\nPhasellus eget erat odio. Praesent at est iaculis, ultricies augue vel, dignissim risus. Suspendisse at nisi quis turpis fringilla rutrum id sit amet nulla.\nNam eget dolor fermentum, aliquet nisl at, convallis tellus. Pellentesque rhoncus erat enim, id porttitor elit euismod quis.\nMauris sollicitudin magna odio, non egestas libero vehicula ut. Etiam et quam velit. Fusce eget libero rhoncus, ultricies felis sit amet, egestas purus.\nAliquam in semper tellus. Pellentesque adipiscing rutrum velit, quis malesuada lacus consequat eget.\n"; - git_index *idx; - git_diff *diff; - git_patch *patch; - git_buf actual = GIT_BUF_INIT; - const char *expected = "diff --git a/longlines.txt b/longlines.txt\nindex c1ce6ef..0134431 100644\n--- a/longlines.txt\n+++ b/longlines.txt\n@@ -3,3 +3,5 @@ Phasellus eget erat odio. Praesent at est iaculis, ultricies augue vel, dignissi\n Nam eget dolor fermentum, aliquet nisl at, convallis tellus. Pellentesque rhoncus erat enim, id porttitor elit euismod quis.\n Mauris sollicitudin magna odio, non egestas libero vehicula ut. Etiam et quam velit. Fusce eget libero rhoncus, ultricies felis sit amet, egestas purus.\n Aliquam in semper tellus. Pellentesque adipiscing rutrum velit, quis malesuada lacus consequat eget.\n+newline\n+newline\n"; - - g_repo = cl_git_sandbox_init("empty_standard_repo"); - - cl_git_mkfile("empty_standard_repo/longlines.txt", base); - cl_git_pass(git_repository_index(&idx, g_repo)); - cl_git_pass(git_index_add_bypath(idx, "longlines.txt")); - cl_git_pass(git_index_write(idx)); - git_index_free(idx); - - cl_git_append2file("empty_standard_repo/longlines.txt", "newline\nnewline\n"); - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, NULL)); - cl_assert_equal_sz(1, git_diff_num_deltas(diff)); - cl_git_pass(git_patch_from_diff(&patch, diff, 0)); - cl_git_pass(git_patch_to_buf(&actual, patch)); - - /* if chmod not supported, overwrite mode bits since anything is possible */ - overwrite_filemode(expected, &actual); - - cl_assert_equal_s(expected, actual.ptr); - - git_buf_free(&actual); - git_patch_free(patch); - git_diff_free(diff); -} - -void test_diff_drivers__builtins(void) -{ - git_diff *diff; - git_patch *patch; - git_buf file = GIT_BUF_INIT, actual = GIT_BUF_INIT, expected = GIT_BUF_INIT; - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - git_vector files = GIT_VECTOR_INIT; - size_t i; - char *path, *extension; - - g_repo = cl_git_sandbox_init("userdiff"); - - cl_git_pass(git_path_dirload(&files, "userdiff/files", 9, 0)); - - opts.interhunk_lines = 1; - opts.context_lines = 1; - opts.pathspec.count = 1; - - git_vector_foreach(&files, i, path) { - if (git__prefixcmp(path, "files/file.")) - continue; - extension = path + strlen("files/file."); - opts.pathspec.strings = &path; - - /* do diff with no special driver */ - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - cl_assert_equal_sz(1, git_diff_num_deltas(diff)); - cl_git_pass(git_patch_from_diff(&patch, diff, 0)); - cl_git_pass(git_patch_to_buf(&actual, patch)); - - git_buf_sets(&expected, "userdiff/expected/nodriver/diff."); - git_buf_puts(&expected, extension); - cl_git_pass(git_futils_readbuffer(&expected, expected.ptr)); - - overwrite_filemode(expected.ptr, &actual); - - cl_assert_equal_s(expected.ptr, actual.ptr); - - git_buf_clear(&actual); - git_patch_free(patch); - git_diff_free(diff); - - /* do diff with driver */ - - { - FILE *fp = fopen("userdiff/.gitattributes", "w"); - fprintf(fp, "*.%s diff=%s\n", extension, extension); - fclose(fp); - } - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - cl_assert_equal_sz(1, git_diff_num_deltas(diff)); - cl_git_pass(git_patch_from_diff(&patch, diff, 0)); - cl_git_pass(git_patch_to_buf(&actual, patch)); - - git_buf_sets(&expected, "userdiff/expected/driver/diff."); - git_buf_puts(&expected, extension); - cl_git_pass(git_futils_readbuffer(&expected, expected.ptr)); - - overwrite_filemode(expected.ptr, &actual); - - cl_assert_equal_s(expected.ptr, actual.ptr); - - git_buf_clear(&actual); - git_patch_free(patch); - git_diff_free(diff); - - git__free(path); - } - - git_buf_free(&file); - git_buf_free(&actual); - git_buf_free(&expected); - git_vector_free(&files); -} - -void test_diff_drivers__invalid_pattern(void) -{ - git_config *cfg; - git_index *idx; - git_diff *diff; - git_patch *patch; - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - - g_repo = cl_git_sandbox_init("userdiff"); - cl_git_mkfile("userdiff/.gitattributes", "*.storyboard diff=storyboard\n"); - - cl_git_pass(git_repository_config__weakptr(&cfg, g_repo)); - cl_git_pass(git_config_set_string(cfg, "diff.storyboard.xfuncname", "")); - - cl_git_mkfile("userdiff/dummy.storyboard", ""); - cl_git_pass(git_repository_index__weakptr(&idx, g_repo)); - cl_git_pass(git_index_add_bypath(idx, "dummy.storyboard")); - cl_git_mkfile("userdiff/dummy.storyboard", "some content\n"); - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - cl_git_pass(git_patch_from_diff(&patch, diff, 0)); - - git_patch_free(patch); - git_diff_free(diff); -} diff --git a/vendor/libgit2/tests/diff/format_email.c b/vendor/libgit2/tests/diff/format_email.c deleted file mode 100644 index e55afe958..000000000 --- a/vendor/libgit2/tests/diff/format_email.c +++ /dev/null @@ -1,508 +0,0 @@ -#include "clar.h" -#include "clar_libgit2.h" - -#include "buffer.h" -#include "commit.h" -#include "diff.h" - -static git_repository *repo; - -void test_diff_format_email__initialize(void) -{ - repo = cl_git_sandbox_init("diff_format_email"); -} - -void test_diff_format_email__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -static void assert_email_match( - const char *expected, - const char *oidstr, - git_diff_format_email_options *opts) -{ - git_oid oid; - git_commit *commit = NULL; - git_diff *diff = NULL; - git_buf buf = GIT_BUF_INIT; - - git_oid_fromstr(&oid, oidstr); - - cl_git_pass(git_commit_lookup(&commit, repo, &oid)); - - opts->id = git_commit_id(commit); - opts->author = git_commit_author(commit); - if (!opts->summary) - opts->summary = git_commit_summary(commit); - - cl_git_pass(git_diff__commit(&diff, repo, commit, NULL)); - cl_git_pass(git_diff_format_email(&buf, diff, opts)); - - cl_assert_equal_s(expected, git_buf_cstr(&buf)); - git_buf_clear(&buf); - - cl_git_pass(git_diff_commit_as_email( - &buf, repo, commit, 1, 1, opts->flags, NULL)); - cl_assert_equal_s(expected, git_buf_cstr(&buf)); - - git_diff_free(diff); - git_commit_free(commit); - git_buf_free(&buf); -} - -void test_diff_format_email__simple(void) -{ - git_diff_format_email_options opts = GIT_DIFF_FORMAT_EMAIL_OPTIONS_INIT; - const char *email = - "From 9264b96c6d104d0e07ae33d3007b6a48246c6f92 Mon Sep 17 00:00:00 2001\n" \ - "From: Jacques Germishuys \n" \ - "Date: Wed, 9 Apr 2014 20:57:01 +0200\n" \ - "Subject: [PATCH] Modify some content\n" \ - "\n" \ - "---\n" \ - " file1.txt | 8 +++++---\n" \ - " 1 file changed, 5 insertions(+), 3 deletions(-)\n" \ - "\n" \ - "diff --git a/file1.txt b/file1.txt\n" \ - "index 94aaae8..af8f41d 100644\n" \ - "--- a/file1.txt\n" \ - "+++ b/file1.txt\n" \ - "@@ -1,15 +1,17 @@\n" \ - " file1.txt\n" \ - " file1.txt\n" \ - "+_file1.txt_\n" \ - " file1.txt\n" \ - " file1.txt\n" \ - " file1.txt\n" \ - " file1.txt\n" \ - "+\n" \ - "+\n" \ - " file1.txt\n" \ - " file1.txt\n" \ - " file1.txt\n" \ - " file1.txt\n" \ - " file1.txt\n" \ - "-file1.txt\n" \ - "-file1.txt\n" \ - "-file1.txt\n" \ - "+_file1.txt_\n" \ - "+_file1.txt_\n" \ - " file1.txt\n" \ - "--\n" \ - "libgit2 " LIBGIT2_VERSION "\n" \ - "\n"; - - assert_email_match( - email, "9264b96c6d104d0e07ae33d3007b6a48246c6f92", &opts); -} - -void test_diff_format_email__with_message(void) -{ - git_diff_format_email_options opts = GIT_DIFF_FORMAT_EMAIL_OPTIONS_INIT; - const char *email = "From 627e7e12d87e07a83fad5b6bfa25e86ead4a5270 Mon Sep 17 00:00:00 2001\n" \ - "From: Patrick Steinhardt \n" \ - "Date: Tue, 24 Nov 2015 13:34:39 +0100\n" \ - "Subject: [PATCH] Modify content with message\n" \ - "\n" \ - "Modify content of file3.txt by appending a new line. Make this\n" \ - "commit message somewhat longer to test behavior with newlines\n" \ - "embedded in the message body.\n" \ - "\n" \ - "Also test if new paragraphs are included correctly.\n" \ - "---\n" \ - " file3.txt | 1 +\n" \ - " 1 file changed, 1 insertion(+), 0 deletions(-)\n" \ - "\n" \ - "diff --git a/file3.txt b/file3.txt\n" \ - "index 9a2d780..7309653 100644\n" \ - "--- a/file3.txt\n" \ - "+++ b/file3.txt\n" \ - "@@ -3,3 +3,4 @@ file3!\n" \ - " file3\n" \ - " file3\n" \ - " file3\n" \ - "+file3\n" \ - "--\n" \ - "libgit2 " LIBGIT2_VERSION "\n" \ - "\n"; - - opts.body = "Modify content of file3.txt by appending a new line. Make this\n" \ - "commit message somewhat longer to test behavior with newlines\n" \ - "embedded in the message body.\n" \ - "\n" \ - "Also test if new paragraphs are included correctly."; - - assert_email_match( - email, "627e7e12d87e07a83fad5b6bfa25e86ead4a5270", &opts); -} - - -void test_diff_format_email__multiple(void) -{ - git_oid oid; - git_commit *commit = NULL; - git_diff *diff = NULL; - git_diff_format_email_options opts = GIT_DIFF_FORMAT_EMAIL_OPTIONS_INIT; - git_buf buf = GIT_BUF_INIT; - - const char *email = - "From 10808fe9c9be5a190c0ba68d1a002233fb363508 Mon Sep 17 00:00:00 2001\n" \ - "From: Jacques Germishuys \n" \ - "Date: Thu, 10 Apr 2014 19:37:05 +0200\n" \ - "Subject: [PATCH 1/2] Added file2.txt file3.txt\n" \ - "\n" \ - "---\n" \ - " file2.txt | 5 +++++\n" \ - " file3.txt | 5 +++++\n" \ - " 2 files changed, 10 insertions(+), 0 deletions(-)\n" \ - " create mode 100644 file2.txt\n" \ - " create mode 100644 file3.txt\n" \ - "\n" \ - "diff --git a/file2.txt b/file2.txt\n" \ - "new file mode 100644\n" \ - "index 0000000..e909123\n" \ - "--- /dev/null\n" \ - "+++ b/file2.txt\n" \ - "@@ -0,0 +1,5 @@\n" \ - "+file2\n" \ - "+file2\n" \ - "+file2\n" \ - "+file2\n" \ - "+file2\n" \ - "diff --git a/file3.txt b/file3.txt\n" \ - "new file mode 100644\n" \ - "index 0000000..9435022\n" \ - "--- /dev/null\n" \ - "+++ b/file3.txt\n" \ - "@@ -0,0 +1,5 @@\n" \ - "+file3\n" \ - "+file3\n" \ - "+file3\n" \ - "+file3\n" \ - "+file3\n" \ - "--\n" \ - "libgit2 " LIBGIT2_VERSION "\n" \ - "\n" \ - "From 873806f6f27e631eb0b23e4b56bea2bfac14a373 Mon Sep 17 00:00:00 2001\n" \ - "From: Jacques Germishuys \n" \ - "Date: Thu, 10 Apr 2014 19:37:36 +0200\n" \ - "Subject: [PATCH 2/2] Modified file2.txt, file3.txt\n" \ - "\n" \ - "---\n" \ - " file2.txt | 2 +-\n" \ - " file3.txt | 2 +-\n" \ - " 2 files changed, 2 insertions(+), 2 deletions(-)\n" \ - "\n" \ - "diff --git a/file2.txt b/file2.txt\n" \ - "index e909123..7aff11d 100644\n" \ - "--- a/file2.txt\n" \ - "+++ b/file2.txt\n" \ - "@@ -1,5 +1,5 @@\n" \ - " file2\n" \ - " file2\n" \ - " file2\n" \ - "-file2\n" \ - "+file2!\n" \ - " file2\n" \ - "diff --git a/file3.txt b/file3.txt\n" \ - "index 9435022..9a2d780 100644\n" \ - "--- a/file3.txt\n" \ - "+++ b/file3.txt\n" \ - "@@ -1,5 +1,5 @@\n" \ - " file3\n" \ - "-file3\n" \ - "+file3!\n" \ - " file3\n" \ - " file3\n" \ - " file3\n" \ - "--\n" \ - "libgit2 " LIBGIT2_VERSION "\n" \ - "\n"; - - - git_oid_fromstr(&oid, "10808fe9c9be5a190c0ba68d1a002233fb363508"); - cl_git_pass(git_commit_lookup(&commit, repo, &oid)); - - opts.id = git_commit_id(commit); - opts.author = git_commit_author(commit); - opts.summary = git_commit_summary(commit); - opts.patch_no = 1; - opts.total_patches = 2; - - cl_git_pass(git_diff__commit(&diff, repo, commit, NULL)); - cl_git_pass(git_diff_format_email(&buf, diff, &opts)); - - git_diff_free(diff); - git_commit_free(commit); - diff = NULL; - commit = NULL; - - git_oid_fromstr(&oid, "873806f6f27e631eb0b23e4b56bea2bfac14a373"); - cl_git_pass(git_commit_lookup(&commit, repo, &oid)); - - opts.id = git_commit_id(commit); - opts.author = git_commit_author(commit); - opts.summary = git_commit_summary(commit); - opts.patch_no = 2; - opts.total_patches = 2; - - cl_git_pass(git_diff__commit(&diff, repo, commit, NULL)); - cl_git_pass(git_diff_format_email(&buf, diff, &opts)); - - cl_assert_equal_s(email, git_buf_cstr(&buf)); - - git_diff_free(diff); - git_commit_free(commit); - git_buf_free(&buf); -} - -void test_diff_format_email__exclude_marker(void) -{ - git_diff_format_email_options opts = GIT_DIFF_FORMAT_EMAIL_OPTIONS_INIT; - const char *email = - "From 9264b96c6d104d0e07ae33d3007b6a48246c6f92 Mon Sep 17 00:00:00 2001\n" \ - "From: Jacques Germishuys \n" \ - "Date: Wed, 9 Apr 2014 20:57:01 +0200\n" \ - "Subject: Modify some content\n" \ - "\n" \ - "---\n" \ - " file1.txt | 8 +++++---\n" \ - " 1 file changed, 5 insertions(+), 3 deletions(-)\n" \ - "\n" \ - "diff --git a/file1.txt b/file1.txt\n" \ - "index 94aaae8..af8f41d 100644\n" \ - "--- a/file1.txt\n" \ - "+++ b/file1.txt\n" \ - "@@ -1,15 +1,17 @@\n" \ - " file1.txt\n" \ - " file1.txt\n" \ - "+_file1.txt_\n" \ - " file1.txt\n" \ - " file1.txt\n" \ - " file1.txt\n" \ - " file1.txt\n" \ - "+\n" \ - "+\n" \ - " file1.txt\n" \ - " file1.txt\n" \ - " file1.txt\n" \ - " file1.txt\n" \ - " file1.txt\n" \ - "-file1.txt\n" \ - "-file1.txt\n" \ - "-file1.txt\n" \ - "+_file1.txt_\n" \ - "+_file1.txt_\n" \ - " file1.txt\n" \ - "--\n" \ - "libgit2 " LIBGIT2_VERSION "\n" \ - "\n"; - - opts.flags |= GIT_DIFF_FORMAT_EMAIL_EXCLUDE_SUBJECT_PATCH_MARKER; - - assert_email_match( - email, "9264b96c6d104d0e07ae33d3007b6a48246c6f92", &opts); -} - -void test_diff_format_email__invalid_no(void) -{ - git_oid oid; - git_commit *commit = NULL; - git_diff *diff = NULL; - git_diff_format_email_options opts = GIT_DIFF_FORMAT_EMAIL_OPTIONS_INIT; - git_buf buf = GIT_BUF_INIT; - - git_oid_fromstr(&oid, "9264b96c6d104d0e07ae33d3007b6a48246c6f92"); - - cl_git_pass(git_commit_lookup(&commit, repo, &oid)); - - opts.id = git_commit_id(commit); - opts.author = git_commit_author(commit); - opts.summary = git_commit_summary(commit); - opts.patch_no = 2; - opts.total_patches = 1; - - cl_git_pass(git_diff__commit(&diff, repo, commit, NULL)); - cl_git_fail(git_diff_format_email(&buf, diff, &opts)); - cl_git_fail(git_diff_commit_as_email(&buf, repo, commit, 2, 1, 0, NULL)); - cl_git_fail(git_diff_commit_as_email(&buf, repo, commit, 0, 0, 0, NULL)); - - git_diff_free(diff); - git_commit_free(commit); - git_buf_free(&buf); -} - -void test_diff_format_email__mode_change(void) -{ - git_diff_format_email_options opts = GIT_DIFF_FORMAT_EMAIL_OPTIONS_INIT; - const char *email = - "From 7ade76dd34bba4733cf9878079f9fd4a456a9189 Mon Sep 17 00:00:00 2001\n" \ - "From: Jacques Germishuys \n" \ - "Date: Thu, 10 Apr 2014 10:05:03 +0200\n" \ - "Subject: [PATCH] Update permissions\n" \ - "\n" \ - "---\n" \ - " file1.txt.renamed | 0\n" \ - " 1 file changed, 0 insertions(+), 0 deletions(-)\n" \ - " mode change 100644 => 100755 file1.txt.renamed\n" \ - "\n" \ - "diff --git a/file1.txt.renamed b/file1.txt.renamed\n" \ - "old mode 100644\n" \ - "new mode 100755\n" \ - "index a97157a..a97157a\n" \ - "--- a/file1.txt.renamed\n" \ - "+++ b/file1.txt.renamed\n" \ - "--\n" \ - "libgit2 " LIBGIT2_VERSION "\n" \ - "\n"; - - assert_email_match( - email, "7ade76dd34bba4733cf9878079f9fd4a456a9189", &opts); -} - -void test_diff_format_email__rename_add_remove(void) -{ - git_diff_format_email_options opts = GIT_DIFF_FORMAT_EMAIL_OPTIONS_INIT; - const char *email = - "From 6e05acc5a5dab507d91a0a0cc0fb05a3dd98892d Mon Sep 17 00:00:00 2001\n" \ - "From: Jacques Germishuys \n" \ - "Date: Wed, 9 Apr 2014 21:15:56 +0200\n" \ - "Subject: [PATCH] Renamed file1.txt -> file1.txt.renamed\n" \ - "\n" \ - "---\n" \ - " file1.txt | 17 -----------------\n" \ - " file1.txt.renamed | 17 +++++++++++++++++\n" \ - " 2 files changed, 17 insertions(+), 17 deletions(-)\n" \ - " delete mode 100644 file1.txt\n" \ - " create mode 100644 file1.txt.renamed\n" \ - "\n" \ - "diff --git a/file1.txt b/file1.txt\n" \ - "deleted file mode 100644\n" \ - "index af8f41d..0000000\n" \ - "--- a/file1.txt\n" \ - "+++ /dev/null\n" \ - "@@ -1,17 +0,0 @@\n" \ - "-file1.txt\n" \ - "-file1.txt\n" \ - "-_file1.txt_\n" \ - "-file1.txt\n" \ - "-file1.txt\n" \ - "-file1.txt\n" \ - "-file1.txt\n" \ - "-\n" \ - "-\n" \ - "-file1.txt\n" \ - "-file1.txt\n" \ - "-file1.txt\n" \ - "-file1.txt\n" \ - "-file1.txt\n" \ - "-_file1.txt_\n" \ - "-_file1.txt_\n" \ - "-file1.txt\n" \ - "diff --git a/file1.txt.renamed b/file1.txt.renamed\n" \ - "new file mode 100644\n" \ - "index 0000000..a97157a\n" \ - "--- /dev/null\n" \ - "+++ b/file1.txt.renamed\n" \ - "@@ -0,0 +1,17 @@\n" \ - "+file1.txt\n" \ - "+file1.txt\n" \ - "+_file1.txt_\n" \ - "+file1.txt\n" \ - "+file1.txt\n" \ - "+file1.txt_renamed\n" \ - "+file1.txt\n" \ - "+\n" \ - "+\n" \ - "+file1.txt\n" \ - "+file1.txt\n" \ - "+file1.txt_renamed\n" \ - "+file1.txt\n" \ - "+file1.txt\n" \ - "+_file1.txt_\n" \ - "+_file1.txt_\n" \ - "+file1.txt\n" \ - "--\n" \ - "libgit2 " LIBGIT2_VERSION "\n" \ - "\n"; - - assert_email_match( - email, "6e05acc5a5dab507d91a0a0cc0fb05a3dd98892d", &opts); -} - -void test_diff_format_email__multiline_summary(void) -{ - git_diff_format_email_options opts = GIT_DIFF_FORMAT_EMAIL_OPTIONS_INIT; - const char *email = - "From 9264b96c6d104d0e07ae33d3007b6a48246c6f92 Mon Sep 17 00:00:00 2001\n" \ - "From: Jacques Germishuys \n" \ - "Date: Wed, 9 Apr 2014 20:57:01 +0200\n" \ - "Subject: [PATCH] Modify some content\n" \ - "\n" \ - "---\n" \ - " file1.txt | 8 +++++---\n" \ - " 1 file changed, 5 insertions(+), 3 deletions(-)\n" \ - "\n" \ - "diff --git a/file1.txt b/file1.txt\n" \ - "index 94aaae8..af8f41d 100644\n" \ - "--- a/file1.txt\n" \ - "+++ b/file1.txt\n" \ - "@@ -1,15 +1,17 @@\n" \ - " file1.txt\n" \ - " file1.txt\n" \ - "+_file1.txt_\n" \ - " file1.txt\n" \ - " file1.txt\n" \ - " file1.txt\n" \ - " file1.txt\n" \ - "+\n" \ - "+\n" \ - " file1.txt\n" \ - " file1.txt\n" \ - " file1.txt\n" \ - " file1.txt\n" \ - " file1.txt\n" \ - "-file1.txt\n" \ - "-file1.txt\n" \ - "-file1.txt\n" \ - "+_file1.txt_\n" \ - "+_file1.txt_\n" \ - " file1.txt\n" \ - "--\n" \ - "libgit2 " LIBGIT2_VERSION "\n" \ - "\n"; - - opts.summary = "Modify some content\nSome extra stuff here"; - - assert_email_match( - email, "9264b96c6d104d0e07ae33d3007b6a48246c6f92", &opts); -} - -void test_diff_format_email__binary(void) -{ - git_diff_format_email_options opts = GIT_DIFF_FORMAT_EMAIL_OPTIONS_INIT; - const char *email = - "From 8d7523f6fcb2404257889abe0d96f093d9f524f9 Mon Sep 17 00:00:00 2001\n" \ - "From: Jacques Germishuys \n" \ - "Date: Sun, 13 Apr 2014 18:10:18 +0200\n" \ - "Subject: [PATCH] Modified binary file\n" \ - "\n" \ - "---\n" \ - " binary.bin | Bin 3 -> 0 bytes\n" \ - " 1 file changed, 0 insertions(+), 0 deletions(-)\n" \ - "\n" \ - "diff --git a/binary.bin b/binary.bin\n" \ - "index bd474b2..9ac35ff 100644\n" \ - "Binary files a/binary.bin and b/binary.bin differ\n" \ - "--\n" \ - "libgit2 " LIBGIT2_VERSION "\n" \ - "\n"; - /* TODO: Actually 0 bytes here should be 5!. Seems like we don't load the new content for binary files? */ - - opts.summary = "Modified binary file"; - - assert_email_match( - email, "8d7523f6fcb2404257889abe0d96f093d9f524f9", &opts); -} - diff --git a/vendor/libgit2/tests/diff/index.c b/vendor/libgit2/tests/diff/index.c deleted file mode 100644 index 0293b7821..000000000 --- a/vendor/libgit2/tests/diff/index.c +++ /dev/null @@ -1,302 +0,0 @@ -#include "clar_libgit2.h" -#include "diff_helpers.h" - -static git_repository *g_repo = NULL; - -void test_diff_index__initialize(void) -{ - g_repo = cl_git_sandbox_init("status"); -} - -void test_diff_index__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -void test_diff_index__0(void) -{ - /* grabbed a couple of commit oids from the history of the attr repo */ - const char *a_commit = "26a125ee1bf"; /* the current HEAD */ - const char *b_commit = "0017bd4ab1ec3"; /* the start */ - git_tree *a = resolve_commit_oid_to_tree(g_repo, a_commit); - git_tree *b = resolve_commit_oid_to_tree(g_repo, b_commit); - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - git_diff *diff = NULL; - diff_expects exp; - - cl_assert(a); - cl_assert(b); - - opts.context_lines = 1; - opts.interhunk_lines = 1; - - memset(&exp, 0, sizeof(exp)); - - cl_git_pass(git_diff_tree_to_index(&diff, g_repo, a, NULL, &opts)); - - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - - /* to generate these values: - * - cd to tests/resources/status, - * - mv .gitted .git - * - git diff --name-status --cached 26a125ee1bf - * - git diff -U1 --cached 26a125ee1bf - * - mv .git .gitted - */ - cl_assert_equal_i(8, exp.files); - cl_assert_equal_i(3, exp.file_status[GIT_DELTA_ADDED]); - cl_assert_equal_i(2, exp.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(3, exp.file_status[GIT_DELTA_MODIFIED]); - - cl_assert_equal_i(8, exp.hunks); - - cl_assert_equal_i(11, exp.lines); - cl_assert_equal_i(3, exp.line_ctxt); - cl_assert_equal_i(6, exp.line_adds); - cl_assert_equal_i(2, exp.line_dels); - - git_diff_free(diff); - diff = NULL; - memset(&exp, 0, sizeof(exp)); - - cl_git_pass(git_diff_tree_to_index(&diff, g_repo, b, NULL, &opts)); - - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - - /* to generate these values: - * - cd to tests/resources/status, - * - mv .gitted .git - * - git diff --name-status --cached 0017bd4ab1ec3 - * - git diff -U1 --cached 0017bd4ab1ec3 - * - mv .git .gitted - */ - cl_assert_equal_i(12, exp.files); - cl_assert_equal_i(7, exp.file_status[GIT_DELTA_ADDED]); - cl_assert_equal_i(2, exp.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(3, exp.file_status[GIT_DELTA_MODIFIED]); - - cl_assert_equal_i(12, exp.hunks); - - cl_assert_equal_i(16, exp.lines); - cl_assert_equal_i(3, exp.line_ctxt); - cl_assert_equal_i(11, exp.line_adds); - cl_assert_equal_i(2, exp.line_dels); - - git_diff_free(diff); - diff = NULL; - - git_tree_free(a); - git_tree_free(b); -} - -static int diff_stop_after_2_files( - const git_diff_delta *delta, - float progress, - void *payload) -{ - diff_expects *e = payload; - - GIT_UNUSED(progress); - GIT_UNUSED(delta); - - e->files++; - - return (e->files == 2); -} - -void test_diff_index__1(void) -{ - /* grabbed a couple of commit oids from the history of the attr repo */ - const char *a_commit = "26a125ee1bf"; /* the current HEAD */ - const char *b_commit = "0017bd4ab1ec3"; /* the start */ - git_tree *a = resolve_commit_oid_to_tree(g_repo, a_commit); - git_tree *b = resolve_commit_oid_to_tree(g_repo, b_commit); - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - git_diff *diff = NULL; - diff_expects exp; - - cl_assert(a); - cl_assert(b); - - opts.context_lines = 1; - opts.interhunk_lines = 1; - - memset(&exp, 0, sizeof(exp)); - - cl_git_pass(git_diff_tree_to_index(&diff, g_repo, a, NULL, &opts)); - - cl_assert_equal_i(1, git_diff_foreach( - diff, diff_stop_after_2_files, NULL, NULL, NULL, &exp) ); - - cl_assert_equal_i(2, exp.files); - - git_diff_free(diff); - diff = NULL; - - git_tree_free(a); - git_tree_free(b); -} - -void test_diff_index__checks_options_version(void) -{ - const char *a_commit = "26a125ee1bf"; - git_tree *a = resolve_commit_oid_to_tree(g_repo, a_commit); - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - git_diff *diff = NULL; - const git_error *err; - - opts.version = 0; - cl_git_fail(git_diff_tree_to_index(&diff, g_repo, a, NULL, &opts)); - err = giterr_last(); - cl_assert_equal_i(GITERR_INVALID, err->klass); - cl_assert_equal_p(diff, NULL); - - giterr_clear(); - opts.version = 1024; - cl_git_fail(git_diff_tree_to_index(&diff, g_repo, a, NULL, &opts)); - err = giterr_last(); - cl_assert_equal_i(GITERR_INVALID, err->klass); - cl_assert_equal_p(diff, NULL); - - git_tree_free(a); -} - -static void do_conflicted_diff(diff_expects *exp, unsigned long flags) -{ - const char *a_commit = "26a125ee1bf"; /* the current HEAD */ - git_tree *a = resolve_commit_oid_to_tree(g_repo, a_commit); - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - git_index_entry ancestor = {{0}}, ours = {{0}}, theirs = {{0}}; - git_diff *diff = NULL; - git_index *index; - - cl_assert(a); - - opts.context_lines = 1; - opts.interhunk_lines = 1; - opts.flags |= flags; - - memset(exp, 0, sizeof(diff_expects)); - - cl_git_pass(git_repository_index(&index, g_repo)); - - ancestor.path = ours.path = theirs.path = "staged_changes"; - ancestor.mode = ours.mode = theirs.mode = GIT_FILEMODE_BLOB; - - git_oid_fromstr(&ancestor.id, "d427e0b2e138501a3d15cc376077a3631e15bd46"); - git_oid_fromstr(&ours.id, "ee3fa1b8c00aff7fe02065fdb50864bb0d932ccf"); - git_oid_fromstr(&theirs.id, "2bd0a343aeef7a2cf0d158478966a6e587ff3863"); - - cl_git_pass(git_index_conflict_add(index, &ancestor, &ours, &theirs)); - cl_git_pass(git_diff_tree_to_index(&diff, g_repo, a, index, &opts)); - - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, exp)); - - git_diff_free(diff); - git_tree_free(a); - git_index_free(index); -} - -void test_diff_index__reports_conflicts(void) -{ - diff_expects exp; - - do_conflicted_diff(&exp, 0); - - cl_assert_equal_i(8, exp.files); - cl_assert_equal_i(3, exp.file_status[GIT_DELTA_ADDED]); - cl_assert_equal_i(2, exp.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(2, exp.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_CONFLICTED]); - - cl_assert_equal_i(7, exp.hunks); - - cl_assert_equal_i(9, exp.lines); - cl_assert_equal_i(2, exp.line_ctxt); - cl_assert_equal_i(5, exp.line_adds); - cl_assert_equal_i(2, exp.line_dels); -} - -void test_diff_index__reports_conflicts_when_reversed(void) -{ - diff_expects exp; - - do_conflicted_diff(&exp, GIT_DIFF_REVERSE); - - cl_assert_equal_i(8, exp.files); - cl_assert_equal_i(2, exp.file_status[GIT_DELTA_ADDED]); - cl_assert_equal_i(3, exp.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(2, exp.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_CONFLICTED]); - - cl_assert_equal_i(7, exp.hunks); - - cl_assert_equal_i(9, exp.lines); - cl_assert_equal_i(2, exp.line_ctxt); - cl_assert_equal_i(2, exp.line_adds); - cl_assert_equal_i(5, exp.line_dels); -} - -void test_diff_index__not_in_head_conflicted(void) -{ - const char *a_commit = "26a125ee1bf"; /* the current HEAD */ - git_index_entry theirs = {{0}}; - git_index *index; - git_diff *diff; - const git_diff_delta *delta; - - git_tree *a = resolve_commit_oid_to_tree(g_repo, a_commit); - - cl_git_pass(git_repository_index(&index, g_repo)); - cl_git_pass(git_index_read_tree(index, a)); - - theirs.path = "file_not_in_head"; - theirs.mode = GIT_FILEMODE_BLOB; - git_oid_fromstr(&theirs.id, "2bd0a343aeef7a2cf0d158478966a6e587ff3863"); - cl_git_pass(git_index_conflict_add(index, NULL, NULL, &theirs)); - - cl_git_pass(git_diff_tree_to_index(&diff, g_repo, a, index, NULL)); - - cl_assert_equal_i(git_diff_num_deltas(diff), 1); - delta = git_diff_get_delta(diff, 0); - cl_assert_equal_i(delta->status, GIT_DELTA_CONFLICTED); - - git_diff_free(diff); - git_index_free(index); - git_tree_free(a); -} - -void test_diff_index__to_index(void) -{ - const char *a_commit = "26a125ee1bf"; /* the current HEAD */ - git_tree *old_tree; - git_index *old_index; - git_index *new_index; - git_diff *diff; - diff_expects exp; - - cl_git_pass(git_index_new(&old_index)); - old_tree = resolve_commit_oid_to_tree(g_repo, a_commit); - cl_git_pass(git_index_read_tree(old_index, old_tree)); - - cl_git_pass(git_repository_index(&new_index, g_repo)); - - cl_git_pass(git_diff_index_to_index(&diff, g_repo, old_index, new_index, NULL)); - - memset(&exp, 0, sizeof(diff_expects)); - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - cl_assert_equal_i(8, exp.files); - cl_assert_equal_i(3, exp.file_status[GIT_DELTA_ADDED]); - cl_assert_equal_i(2, exp.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(3, exp.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_CONFLICTED]); - - git_diff_free(diff); - git_index_free(new_index); - git_index_free(old_index); - git_tree_free(old_tree); -} diff --git a/vendor/libgit2/tests/diff/iterator.c b/vendor/libgit2/tests/diff/iterator.c deleted file mode 100644 index 25a23eda7..000000000 --- a/vendor/libgit2/tests/diff/iterator.c +++ /dev/null @@ -1,1012 +0,0 @@ -#include "clar_libgit2.h" -#include "diff_helpers.h" -#include "iterator.h" -#include "tree.h" - -void test_diff_iterator__initialize(void) -{ - /* since we are doing tests with different sandboxes, defer setup - * to the actual tests. cleanup will still be done in the global - * cleanup function so that assertion failures don't result in a - * missed cleanup. - */ -} - -void test_diff_iterator__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - - -/* -- TREE ITERATOR TESTS -- */ - -static void tree_iterator_test( - const char *sandbox, - const char *treeish, - const char *start, - const char *end, - int expected_count, - const char **expected_values) -{ - git_tree *t; - git_iterator *i; - git_iterator_options i_opts = GIT_ITERATOR_OPTIONS_INIT; - const git_index_entry *entry; - int error, count = 0, count_post_reset = 0; - git_repository *repo = cl_git_sandbox_init(sandbox); - - i_opts.flags = GIT_ITERATOR_DONT_IGNORE_CASE; - i_opts.start = start; - i_opts.end = end; - - cl_assert(t = resolve_commit_oid_to_tree(repo, treeish)); - cl_git_pass(git_iterator_for_tree(&i, t, &i_opts)); - - /* test loop */ - while (!(error = git_iterator_advance(&entry, i))) { - cl_assert(entry); - if (expected_values != NULL) - cl_assert_equal_s(expected_values[count], entry->path); - count++; - } - cl_assert_equal_i(GIT_ITEROVER, error); - cl_assert(!entry); - cl_assert_equal_i(expected_count, count); - - /* test reset */ - cl_git_pass(git_iterator_reset(i, NULL, NULL)); - - while (!(error = git_iterator_advance(&entry, i))) { - cl_assert(entry); - if (expected_values != NULL) - cl_assert_equal_s(expected_values[count_post_reset], entry->path); - count_post_reset++; - } - cl_assert_equal_i(GIT_ITEROVER, error); - cl_assert(!entry); - cl_assert_equal_i(count, count_post_reset); - - git_iterator_free(i); - git_tree_free(t); -} - -/* results of: git ls-tree -r --name-only 605812a */ -const char *expected_tree_0[] = { - ".gitattributes", - "attr0", - "attr1", - "attr2", - "attr3", - "binfile", - "macro_test", - "root_test1", - "root_test2", - "root_test3", - "root_test4.txt", - "subdir/.gitattributes", - "subdir/abc", - "subdir/subdir_test1", - "subdir/subdir_test2.txt", - "subdir2/subdir2_test1", - NULL -}; - -void test_diff_iterator__tree_0(void) -{ - tree_iterator_test("attr", "605812a", NULL, NULL, 16, expected_tree_0); -} - -/* results of: git ls-tree -r --name-only 6bab5c79 */ -const char *expected_tree_1[] = { - ".gitattributes", - "attr0", - "attr1", - "attr2", - "attr3", - "root_test1", - "root_test2", - "root_test3", - "root_test4.txt", - "subdir/.gitattributes", - "subdir/subdir_test1", - "subdir/subdir_test2.txt", - "subdir2/subdir2_test1", - NULL -}; - -void test_diff_iterator__tree_1(void) -{ - tree_iterator_test("attr", "6bab5c79cd5", NULL, NULL, 13, expected_tree_1); -} - -/* results of: git ls-tree -r --name-only 26a125ee1 */ -const char *expected_tree_2[] = { - "current_file", - "file_deleted", - "modified_file", - "staged_changes", - "staged_changes_file_deleted", - "staged_changes_modified_file", - "staged_delete_file_deleted", - "staged_delete_modified_file", - "subdir.txt", - "subdir/current_file", - "subdir/deleted_file", - "subdir/modified_file", - NULL -}; - -void test_diff_iterator__tree_2(void) -{ - tree_iterator_test("status", "26a125ee1", NULL, NULL, 12, expected_tree_2); -} - -/* $ git ls-tree -r --name-only 0017bd4ab1e */ -const char *expected_tree_3[] = { - "current_file", - "file_deleted", - "modified_file", - "staged_changes", - "staged_changes_file_deleted", - "staged_changes_modified_file", - "staged_delete_file_deleted", - "staged_delete_modified_file" -}; - -void test_diff_iterator__tree_3(void) -{ - tree_iterator_test("status", "0017bd4ab1e", NULL, NULL, 8, expected_tree_3); -} - -/* $ git ls-tree -r --name-only 24fa9a9fc4e202313e24b648087495441dab432b */ -const char *expected_tree_4[] = { - "attr0", - "attr1", - "attr2", - "attr3", - "binfile", - "gitattributes", - "macro_bad", - "macro_test", - "root_test1", - "root_test2", - "root_test3", - "root_test4.txt", - "sub/abc", - "sub/file", - "sub/sub/file", - "sub/sub/subsub.txt", - "sub/subdir_test1", - "sub/subdir_test2.txt", - "subdir/.gitattributes", - "subdir/abc", - "subdir/subdir_test1", - "subdir/subdir_test2.txt", - "subdir2/subdir2_test1", - NULL -}; - -void test_diff_iterator__tree_4(void) -{ - tree_iterator_test( - "attr", "24fa9a9fc4e202313e24b648087495441dab432b", NULL, NULL, - 23, expected_tree_4); -} - -void test_diff_iterator__tree_4_ranged(void) -{ - tree_iterator_test( - "attr", "24fa9a9fc4e202313e24b648087495441dab432b", - "sub", "sub", - 11, &expected_tree_4[12]); -} - -const char *expected_tree_ranged_0[] = { - "gitattributes", - "macro_bad", - "macro_test", - "root_test1", - "root_test2", - "root_test3", - "root_test4.txt", - NULL -}; - -void test_diff_iterator__tree_ranged_0(void) -{ - tree_iterator_test( - "attr", "24fa9a9fc4e202313e24b648087495441dab432b", - "git", "root", - 7, expected_tree_ranged_0); -} - -const char *expected_tree_ranged_1[] = { - "sub/subdir_test2.txt", - NULL -}; - -void test_diff_iterator__tree_ranged_1(void) -{ - tree_iterator_test( - "attr", "24fa9a9fc4e202313e24b648087495441dab432b", - "sub/subdir_test2.txt", "sub/subdir_test2.txt", - 1, expected_tree_ranged_1); -} - -void test_diff_iterator__tree_range_empty_0(void) -{ - tree_iterator_test( - "attr", "24fa9a9fc4e202313e24b648087495441dab432b", - "empty", "empty", 0, NULL); -} - -void test_diff_iterator__tree_range_empty_1(void) -{ - tree_iterator_test( - "attr", "24fa9a9fc4e202313e24b648087495441dab432b", - "z_empty_after", NULL, 0, NULL); -} - -void test_diff_iterator__tree_range_empty_2(void) -{ - tree_iterator_test( - "attr", "24fa9a9fc4e202313e24b648087495441dab432b", - NULL, ".aaa_empty_before", 0, NULL); -} - -static void check_tree_entry( - git_iterator *i, - const char *oid, - const char *oid_p, - const char *oid_pp, - const char *oid_ppp) -{ - const git_index_entry *ie; - const git_tree_entry *te; - const git_tree *tree; - git_buf path = GIT_BUF_INIT; - - cl_git_pass(git_iterator_current_tree_entry(&te, i)); - cl_assert(te); - cl_assert(git_oid_streq(te->oid, oid) == 0); - - cl_git_pass(git_iterator_current(&ie, i)); - cl_git_pass(git_buf_sets(&path, ie->path)); - - if (oid_p) { - git_buf_rtruncate_at_char(&path, '/'); - cl_git_pass(git_iterator_current_parent_tree(&tree, i, path.ptr)); - cl_assert(tree); - cl_assert(git_oid_streq(git_tree_id(tree), oid_p) == 0); - } - - if (oid_pp) { - git_buf_rtruncate_at_char(&path, '/'); - cl_git_pass(git_iterator_current_parent_tree(&tree, i, path.ptr)); - cl_assert(tree); - cl_assert(git_oid_streq(git_tree_id(tree), oid_pp) == 0); - } - - if (oid_ppp) { - git_buf_rtruncate_at_char(&path, '/'); - cl_git_pass(git_iterator_current_parent_tree(&tree, i, path.ptr)); - cl_assert(tree); - cl_assert(git_oid_streq(git_tree_id(tree), oid_ppp) == 0); - } - - git_buf_free(&path); -} - -void test_diff_iterator__tree_special_functions(void) -{ - git_tree *t; - git_iterator *i; - git_iterator_options i_opts = GIT_ITERATOR_OPTIONS_INIT; - const git_index_entry *entry; - git_repository *repo = cl_git_sandbox_init("attr"); - int error, cases = 0; - const char *rootoid = "ce39a97a7fb1fa90bcf5e711249c1e507476ae0e"; - - t = resolve_commit_oid_to_tree( - repo, "24fa9a9fc4e202313e24b648087495441dab432b"); - cl_assert(t != NULL); - - i_opts.flags = GIT_ITERATOR_DONT_IGNORE_CASE; - - cl_git_pass(git_iterator_for_tree(&i, t, &i_opts)); - - while (!(error = git_iterator_advance(&entry, i))) { - cl_assert(entry); - - if (strcmp(entry->path, "sub/file") == 0) { - cases++; - check_tree_entry( - i, "45b983be36b73c0788dc9cbcb76cbb80fc7bb057", - "ecb97df2a174987475ac816e3847fc8e9f6c596b", - rootoid, NULL); - } - else if (strcmp(entry->path, "sub/sub/subsub.txt") == 0) { - cases++; - check_tree_entry( - i, "9e5bdc47d6a80f2be0ea3049ad74231b94609242", - "4e49ba8c5b6c32ff28cd9dcb60be34df50fcc485", - "ecb97df2a174987475ac816e3847fc8e9f6c596b", rootoid); - } - else if (strcmp(entry->path, "subdir/.gitattributes") == 0) { - cases++; - check_tree_entry( - i, "99eae476896f4907224978b88e5ecaa6c5bb67a9", - "9fb40b6675dde60b5697afceae91b66d908c02d9", - rootoid, NULL); - } - else if (strcmp(entry->path, "subdir2/subdir2_test1") == 0) { - cases++; - check_tree_entry( - i, "dccada462d3df8ac6de596fb8c896aba9344f941", - "2929de282ce999e95183aedac6451d3384559c4b", - rootoid, NULL); - } - } - cl_assert_equal_i(GIT_ITEROVER, error); - cl_assert(!entry); - cl_assert_equal_i(4, cases); - - git_iterator_free(i); - git_tree_free(t); -} - -/* -- INDEX ITERATOR TESTS -- */ - -static void index_iterator_test( - const char *sandbox, - const char *start, - const char *end, - git_iterator_flag_t flags, - int expected_count, - const char **expected_names, - const char **expected_oids) -{ - git_index *index; - git_iterator *i; - const git_index_entry *entry; - int error, count = 0, caps; - git_repository *repo = cl_git_sandbox_init(sandbox); - git_iterator_options iter_opts = GIT_ITERATOR_OPTIONS_INIT; - - cl_git_pass(git_repository_index(&index, repo)); - caps = git_index_caps(index); - - iter_opts.flags = flags; - iter_opts.start = start; - iter_opts.end = end; - - cl_git_pass(git_iterator_for_index(&i, repo, index, &iter_opts)); - - while (!(error = git_iterator_advance(&entry, i))) { - cl_assert(entry); - - if (expected_names != NULL) - cl_assert_equal_s(expected_names[count], entry->path); - - if (expected_oids != NULL) { - git_oid oid; - cl_git_pass(git_oid_fromstr(&oid, expected_oids[count])); - cl_assert_equal_oid(&oid, &entry->id); - } - - count++; - } - - cl_assert_equal_i(GIT_ITEROVER, error); - cl_assert(!entry); - cl_assert_equal_i(expected_count, count); - - git_iterator_free(i); - - cl_assert(caps == git_index_caps(index)); - git_index_free(index); -} - -static const char *expected_index_0[] = { - "attr0", - "attr1", - "attr2", - "attr3", - "binfile", - "gitattributes", - "macro_bad", - "macro_test", - "root_test1", - "root_test2", - "root_test3", - "root_test4.txt", - "sub/abc", - "sub/file", - "sub/sub/file", - "sub/sub/subsub.txt", - "sub/subdir_test1", - "sub/subdir_test2.txt", - "subdir/.gitattributes", - "subdir/abc", - "subdir/subdir_test1", - "subdir/subdir_test2.txt", - "subdir2/subdir2_test1", -}; - -static const char *expected_index_oids_0[] = { - "556f8c827b8e4a02ad5cab77dca2bcb3e226b0b3", - "3b74db7ab381105dc0d28f8295a77f6a82989292", - "2c66e14f77196ea763fb1e41612c1aa2bc2d8ed2", - "c485abe35abd4aa6fd83b076a78bbea9e2e7e06c", - "d800886d9c86731ae5c4a62b0b77c437015e00d2", - "2b40c5aca159b04ea8d20ffe36cdf8b09369b14a", - "5819a185d77b03325aaf87cafc771db36f6ddca7", - "ff69f8639ce2e6010b3f33a74160aad98b48da2b", - "45141a79a77842c59a63229403220a4e4be74e3d", - "4d713dc48e6b1bd75b0d61ad078ba9ca3a56745d", - "108bb4e7fd7b16490dc33ff7d972151e73d7166e", - "a0f7217ae99f5ac3e88534f5cea267febc5fa85b", - "3e42ffc54a663f9401cc25843d6c0e71a33e4249", - "45b983be36b73c0788dc9cbcb76cbb80fc7bb057", - "45b983be36b73c0788dc9cbcb76cbb80fc7bb057", - "9e5bdc47d6a80f2be0ea3049ad74231b94609242", - "e563cf4758f0d646f1b14b76016aa17fa9e549a4", - "fb5067b1aef3ac1ada4b379dbcb7d17255df7d78", - "99eae476896f4907224978b88e5ecaa6c5bb67a9", - "3e42ffc54a663f9401cc25843d6c0e71a33e4249", - "e563cf4758f0d646f1b14b76016aa17fa9e549a4", - "fb5067b1aef3ac1ada4b379dbcb7d17255df7d78", - "dccada462d3df8ac6de596fb8c896aba9344f941" -}; - -void test_diff_iterator__index_0(void) -{ - index_iterator_test( - "attr", NULL, NULL, 0, ARRAY_SIZE(expected_index_0), - expected_index_0, expected_index_oids_0); -} - -static const char *expected_index_range[] = { - "root_test1", - "root_test2", - "root_test3", - "root_test4.txt", -}; - -static const char *expected_index_oids_range[] = { - "45141a79a77842c59a63229403220a4e4be74e3d", - "4d713dc48e6b1bd75b0d61ad078ba9ca3a56745d", - "108bb4e7fd7b16490dc33ff7d972151e73d7166e", - "a0f7217ae99f5ac3e88534f5cea267febc5fa85b", -}; - -void test_diff_iterator__index_range(void) -{ - index_iterator_test( - "attr", "root", "root", 0, ARRAY_SIZE(expected_index_range), - expected_index_range, expected_index_oids_range); -} - -void test_diff_iterator__index_range_empty_0(void) -{ - index_iterator_test( - "attr", "empty", "empty", 0, 0, NULL, NULL); -} - -void test_diff_iterator__index_range_empty_1(void) -{ - index_iterator_test( - "attr", "z_empty_after", NULL, 0, 0, NULL, NULL); -} - -void test_diff_iterator__index_range_empty_2(void) -{ - index_iterator_test( - "attr", NULL, ".aaa_empty_before", 0, 0, NULL, NULL); -} - -static const char *expected_index_1[] = { - "current_file", - "file_deleted", - "modified_file", - "staged_changes", - "staged_changes_file_deleted", - "staged_changes_modified_file", - "staged_new_file", - "staged_new_file_deleted_file", - "staged_new_file_modified_file", - "subdir.txt", - "subdir/current_file", - "subdir/deleted_file", - "subdir/modified_file", -}; - -static const char* expected_index_oids_1[] = { - "a0de7e0ac200c489c41c59dfa910154a70264e6e", - "5452d32f1dd538eb0405e8a83cc185f79e25e80f", - "452e4244b5d083ddf0460acf1ecc74db9dcfa11a", - "55d316c9ba708999f1918e9677d01dfcae69c6b9", - "a6be623522ce87a1d862128ac42672604f7b468b", - "906ee7711f4f4928ddcb2a5f8fbc500deba0d2a8", - "529a16e8e762d4acb7b9636ff540a00831f9155a", - "90b8c29d8ba39434d1c63e1b093daaa26e5bd972", - "ed062903b8f6f3dccb2fa81117ba6590944ef9bd", - "e8ee89e15bbe9b20137715232387b3de5b28972e", - "53ace0d1cc1145a5f4fe4f78a186a60263190733", - "1888c805345ba265b0ee9449b8877b6064592058", - "a6191982709b746d5650e93c2acf34ef74e11504" -}; - -void test_diff_iterator__index_1(void) -{ - index_iterator_test( - "status", NULL, NULL, 0, ARRAY_SIZE(expected_index_1), - expected_index_1, expected_index_oids_1); -} - -static const char *expected_index_cs[] = { - "B", "D", "F", "H", "J", "L/1", "L/B", "L/D", "L/a", "L/c", - "a", "c", "e", "g", "i", "k/1", "k/B", "k/D", "k/a", "k/c", -}; - -static const char *expected_index_ci[] = { - "a", "B", "c", "D", "e", "F", "g", "H", "i", "J", - "k/1", "k/a", "k/B", "k/c", "k/D", "L/1", "L/a", "L/B", "L/c", "L/D", -}; - -void test_diff_iterator__index_case_folding(void) -{ - git_buf path = GIT_BUF_INIT; - int fs_is_ci = 0; - - cl_git_pass(git_buf_joinpath(&path, cl_fixture("icase"), ".gitted/CoNfIg")); - fs_is_ci = git_path_exists(path.ptr); - git_buf_free(&path); - - index_iterator_test( - "icase", NULL, NULL, 0, ARRAY_SIZE(expected_index_cs), - fs_is_ci ? expected_index_ci : expected_index_cs, NULL); - - cl_git_sandbox_cleanup(); - - index_iterator_test( - "icase", NULL, NULL, GIT_ITERATOR_IGNORE_CASE, - ARRAY_SIZE(expected_index_ci), expected_index_ci, NULL); - - cl_git_sandbox_cleanup(); - - index_iterator_test( - "icase", NULL, NULL, GIT_ITERATOR_DONT_IGNORE_CASE, - ARRAY_SIZE(expected_index_cs), expected_index_cs, NULL); -} - -/* -- WORKDIR ITERATOR TESTS -- */ - -static void workdir_iterator_test( - const char *sandbox, - const char *start, - const char *end, - int expected_count, - int expected_ignores, - const char **expected_names, - const char *an_ignored_name) -{ - git_iterator *i; - git_iterator_options i_opts = GIT_ITERATOR_OPTIONS_INIT; - const git_index_entry *entry; - int error, count = 0, count_all = 0, count_all_post_reset = 0; - git_repository *repo = cl_git_sandbox_init(sandbox); - - i_opts.flags = GIT_ITERATOR_DONT_AUTOEXPAND; - i_opts.start = start; - i_opts.end = end; - - cl_git_pass(git_iterator_for_workdir(&i, repo, NULL, NULL, &i_opts)); - - error = git_iterator_current(&entry, i); - cl_assert((error == 0 && entry != NULL) || - (error == GIT_ITEROVER && entry == NULL)); - - while (entry != NULL) { - int ignored = git_iterator_current_is_ignored(i); - - if (S_ISDIR(entry->mode)) { - cl_git_pass(git_iterator_advance_into(&entry, i)); - continue; - } - - if (expected_names != NULL) - cl_assert_equal_s(expected_names[count_all], entry->path); - - if (an_ignored_name && strcmp(an_ignored_name,entry->path)==0) - cl_assert(ignored); - - if (!ignored) - count++; - count_all++; - - error = git_iterator_advance(&entry, i); - - cl_assert((error == 0 && entry != NULL) || - (error == GIT_ITEROVER && entry == NULL)); - } - - cl_assert_equal_i(expected_count, count); - cl_assert_equal_i(expected_count + expected_ignores, count_all); - - cl_git_pass(git_iterator_reset(i, NULL, NULL)); - - error = git_iterator_current(&entry, i); - cl_assert((error == 0 && entry != NULL) || - (error == GIT_ITEROVER && entry == NULL)); - - while (entry != NULL) { - if (S_ISDIR(entry->mode)) { - cl_git_pass(git_iterator_advance_into(&entry, i)); - continue; - } - - if (expected_names != NULL) - cl_assert_equal_s( - expected_names[count_all_post_reset], entry->path); - count_all_post_reset++; - - error = git_iterator_advance(&entry, i); - cl_assert(error == 0 || error == GIT_ITEROVER); - } - - cl_assert_equal_i(count_all, count_all_post_reset); - - git_iterator_free(i); -} - -void test_diff_iterator__workdir_0(void) -{ - workdir_iterator_test("attr", NULL, NULL, 23, 5, NULL, "ign"); -} - -static const char *status_paths[] = { - "current_file", - "ignored_file", - "modified_file", - "new_file", - "staged_changes", - "staged_changes_modified_file", - "staged_delete_modified_file", - "staged_new_file", - "staged_new_file_modified_file", - "subdir.txt", - "subdir/current_file", - "subdir/modified_file", - "subdir/new_file", - "\xe8\xbf\x99", - NULL -}; - -void test_diff_iterator__workdir_1(void) -{ - workdir_iterator_test( - "status", NULL, NULL, 13, 1, status_paths, "ignored_file"); -} - -static const char *status_paths_range_0[] = { - "staged_changes", - "staged_changes_modified_file", - "staged_delete_modified_file", - "staged_new_file", - "staged_new_file_modified_file", - NULL -}; - -void test_diff_iterator__workdir_1_ranged_0(void) -{ - workdir_iterator_test( - "status", "staged", "staged", 5, 0, status_paths_range_0, NULL); -} - -static const char *status_paths_range_1[] = { - "modified_file", NULL -}; - -void test_diff_iterator__workdir_1_ranged_1(void) -{ - workdir_iterator_test( - "status", "modified_file", "modified_file", - 1, 0, status_paths_range_1, NULL); -} - -static const char *status_paths_range_3[] = { - "subdir.txt", - "subdir/current_file", - "subdir/modified_file", - NULL -}; - -void test_diff_iterator__workdir_1_ranged_3(void) -{ - workdir_iterator_test( - "status", "subdir", "subdir/modified_file", - 3, 0, status_paths_range_3, NULL); -} - -static const char *status_paths_range_4[] = { - "subdir/current_file", - "subdir/modified_file", - "subdir/new_file", - "\xe8\xbf\x99", - NULL -}; - -void test_diff_iterator__workdir_1_ranged_4(void) -{ - workdir_iterator_test( - "status", "subdir/", NULL, 4, 0, status_paths_range_4, NULL); -} - -static const char *status_paths_range_5[] = { - "subdir/modified_file", - NULL -}; - -void test_diff_iterator__workdir_1_ranged_5(void) -{ - workdir_iterator_test( - "status", "subdir/modified_file", "subdir/modified_file", - 1, 0, status_paths_range_5, NULL); -} - -void test_diff_iterator__workdir_1_ranged_empty_0(void) -{ - workdir_iterator_test( - "status", "\xff_does_not_exist", NULL, - 0, 0, NULL, NULL); -} - -void test_diff_iterator__workdir_1_ranged_empty_1(void) -{ - workdir_iterator_test( - "status", "empty", "empty", - 0, 0, NULL, NULL); -} - -void test_diff_iterator__workdir_1_ranged_empty_2(void) -{ - workdir_iterator_test( - "status", NULL, "aaaa_empty_before", - 0, 0, NULL, NULL); -} - -void test_diff_iterator__workdir_builtin_ignores(void) -{ - git_repository *repo = cl_git_sandbox_init("attr"); - git_iterator *i; - git_iterator_options i_opts = GIT_ITERATOR_OPTIONS_INIT; - const git_index_entry *entry; - int idx; - static struct { - const char *path; - bool ignored; - } expected[] = { - { "dir/", true }, - { "file", false }, - { "ign", true }, - { "macro_bad", false }, - { "macro_test", false }, - { "root_test1", false }, - { "root_test2", false }, - { "root_test3", false }, - { "root_test4.txt", false }, - { "sub/", false }, - { "sub/.gitattributes", false }, - { "sub/abc", false }, - { "sub/dir/", true }, - { "sub/file", false }, - { "sub/ign/", true }, - { "sub/sub/", false }, - { "sub/sub/.gitattributes", false }, - { "sub/sub/dir", false }, /* file is not actually a dir */ - { "sub/sub/file", false }, - { NULL, false } - }; - - cl_git_pass(p_mkdir("attr/sub/sub/.git", 0777)); - cl_git_mkfile("attr/sub/.git", "whatever"); - - i_opts.flags = GIT_ITERATOR_DONT_AUTOEXPAND; - i_opts.start = "dir"; - i_opts.end = "sub/sub/file"; - - cl_git_pass(git_iterator_for_workdir( - &i, repo, NULL, NULL, &i_opts)); - cl_git_pass(git_iterator_current(&entry, i)); - - for (idx = 0; entry != NULL; ++idx) { - int ignored = git_iterator_current_is_ignored(i); - - cl_assert_equal_s(expected[idx].path, entry->path); - cl_assert_(ignored == expected[idx].ignored, expected[idx].path); - - if (!ignored && - (entry->mode == GIT_FILEMODE_TREE || - entry->mode == GIT_FILEMODE_COMMIT)) - { - /* it is possible to advance "into" a submodule */ - cl_git_pass(git_iterator_advance_into(&entry, i)); - } else { - int error = git_iterator_advance(&entry, i); - cl_assert(!error || error == GIT_ITEROVER); - } - } - - cl_assert(expected[idx].path == NULL); - - git_iterator_free(i); -} - -static void check_wd_first_through_third_range( - git_repository *repo, const char *start, const char *end) -{ - git_iterator *i; - git_iterator_options i_opts = GIT_ITERATOR_OPTIONS_INIT; - const git_index_entry *entry; - int error, idx; - static const char *expected[] = { "FIRST", "second", "THIRD", NULL }; - - i_opts.flags = GIT_ITERATOR_IGNORE_CASE; - i_opts.start = start; - i_opts.end = end; - - cl_git_pass(git_iterator_for_workdir( - &i, repo, NULL, NULL, &i_opts)); - cl_git_pass(git_iterator_current(&entry, i)); - - for (idx = 0; entry != NULL; ++idx) { - cl_assert_equal_s(expected[idx], entry->path); - - error = git_iterator_advance(&entry, i); - cl_assert(!error || error == GIT_ITEROVER); - } - - cl_assert(expected[idx] == NULL); - - git_iterator_free(i); -} - -void test_diff_iterator__workdir_handles_icase_range(void) -{ - git_repository *repo; - - repo = cl_git_sandbox_init("empty_standard_repo"); - cl_git_remove_placeholders(git_repository_path(repo), "dummy-marker.txt"); - - cl_git_mkfile("empty_standard_repo/before", "whatever\n"); - cl_git_mkfile("empty_standard_repo/FIRST", "whatever\n"); - cl_git_mkfile("empty_standard_repo/second", "whatever\n"); - cl_git_mkfile("empty_standard_repo/THIRD", "whatever\n"); - cl_git_mkfile("empty_standard_repo/zafter", "whatever\n"); - cl_git_mkfile("empty_standard_repo/Zlast", "whatever\n"); - - check_wd_first_through_third_range(repo, "first", "third"); - check_wd_first_through_third_range(repo, "FIRST", "THIRD"); - check_wd_first_through_third_range(repo, "first", "THIRD"); - check_wd_first_through_third_range(repo, "FIRST", "third"); - check_wd_first_through_third_range(repo, "FirSt", "tHiRd"); -} - -static void check_tree_range( - git_repository *repo, - const char *start, - const char *end, - bool ignore_case, - int expected_count) -{ - git_tree *head; - git_iterator *i; - git_iterator_options i_opts = GIT_ITERATOR_OPTIONS_INIT; - int error, count; - - i_opts.flags = ignore_case ? GIT_ITERATOR_IGNORE_CASE : GIT_ITERATOR_DONT_IGNORE_CASE; - i_opts.start = start; - i_opts.end = end; - - cl_git_pass(git_repository_head_tree(&head, repo)); - - cl_git_pass(git_iterator_for_tree(&i, head, &i_opts)); - - for (count = 0; !(error = git_iterator_advance(NULL, i)); ++count) - /* count em up */; - - cl_assert_equal_i(GIT_ITEROVER, error); - cl_assert_equal_i(expected_count, count); - - git_iterator_free(i); - git_tree_free(head); -} - -void test_diff_iterator__tree_handles_icase_range(void) -{ - git_repository *repo; - - repo = cl_git_sandbox_init("testrepo"); - - check_tree_range(repo, "B", "C", false, 0); - check_tree_range(repo, "B", "C", true, 1); - check_tree_range(repo, "b", "c", false, 1); - check_tree_range(repo, "b", "c", true, 1); - - check_tree_range(repo, "a", "z", false, 3); - check_tree_range(repo, "a", "z", true, 4); - check_tree_range(repo, "A", "Z", false, 1); - check_tree_range(repo, "A", "Z", true, 4); - check_tree_range(repo, "a", "Z", false, 0); - check_tree_range(repo, "a", "Z", true, 4); - check_tree_range(repo, "A", "z", false, 4); - check_tree_range(repo, "A", "z", true, 4); - - check_tree_range(repo, "new.txt", "new.txt", true, 1); - check_tree_range(repo, "new.txt", "new.txt", false, 1); - check_tree_range(repo, "README", "README", true, 1); - check_tree_range(repo, "README", "README", false, 1); -} - -static void check_index_range( - git_repository *repo, - const char *start, - const char *end, - bool ignore_case, - int expected_count) -{ - git_index *index; - git_iterator *i; - git_iterator_options i_opts = GIT_ITERATOR_OPTIONS_INIT; - int error, count, caps; - bool is_ignoring_case; - - cl_git_pass(git_repository_index(&index, repo)); - - caps = git_index_caps(index); - is_ignoring_case = ((caps & GIT_INDEXCAP_IGNORE_CASE) != 0); - - if (ignore_case != is_ignoring_case) - cl_git_pass(git_index_set_caps(index, caps ^ GIT_INDEXCAP_IGNORE_CASE)); - - i_opts.flags = 0; - i_opts.start = start; - i_opts.end = end; - - cl_git_pass(git_iterator_for_index(&i, repo, index, &i_opts)); - - cl_assert(git_iterator_ignore_case(i) == ignore_case); - - for (count = 0; !(error = git_iterator_advance(NULL, i)); ++count) - /* count em up */; - - cl_assert_equal_i(GIT_ITEROVER, error); - cl_assert_equal_i(expected_count, count); - - git_iterator_free(i); - git_index_free(index); -} - -void test_diff_iterator__index_handles_icase_range(void) -{ - git_repository *repo; - git_index *index; - git_tree *head; - - repo = cl_git_sandbox_init("testrepo"); - - /* reset index to match HEAD */ - cl_git_pass(git_repository_head_tree(&head, repo)); - cl_git_pass(git_repository_index(&index, repo)); - cl_git_pass(git_index_read_tree(index, head)); - cl_git_pass(git_index_write(index)); - git_tree_free(head); - git_index_free(index); - - /* do some ranged iterator checks toggling case sensitivity */ - check_index_range(repo, "B", "C", false, 0); - check_index_range(repo, "B", "C", true, 1); - check_index_range(repo, "a", "z", false, 3); - check_index_range(repo, "a", "z", true, 4); -} diff --git a/vendor/libgit2/tests/diff/notify.c b/vendor/libgit2/tests/diff/notify.c deleted file mode 100644 index 653512795..000000000 --- a/vendor/libgit2/tests/diff/notify.c +++ /dev/null @@ -1,258 +0,0 @@ -#include "clar_libgit2.h" -#include "diff_helpers.h" - -static git_repository *g_repo = NULL; - -void test_diff_notify__initialize(void) -{ -} - -void test_diff_notify__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -static int assert_called_notifications( - const git_diff *diff_so_far, - const git_diff_delta *delta_to_add, - const char *matched_pathspec, - void *payload) -{ - bool found = false; - notify_expected *exp = (notify_expected*)payload; - notify_expected *e; - - GIT_UNUSED(diff_so_far); - - for (e = exp; e->path != NULL; e++) { - if (strcmp(e->path, delta_to_add->new_file.path)) - continue; - - cl_assert_equal_s(e->matched_pathspec, matched_pathspec); - - found = true; - break; - } - - cl_assert(found); - return 0; -} - -static void test_notify( - char **searched_pathspecs, - int pathspecs_count, - notify_expected *expected_matched_pathspecs, - int expected_diffed_files_count) -{ - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - git_diff *diff = NULL; - diff_expects exp; - - g_repo = cl_git_sandbox_init("status"); - - opts.flags |= GIT_DIFF_INCLUDE_IGNORED | GIT_DIFF_INCLUDE_UNTRACKED; - opts.notify_cb = assert_called_notifications; - opts.pathspec.strings = searched_pathspecs; - opts.pathspec.count = pathspecs_count; - - opts.payload = expected_matched_pathspecs; - memset(&exp, 0, sizeof(exp)); - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - cl_git_pass(git_diff_foreach(diff, diff_file_cb, NULL, NULL, NULL, &exp)); - - cl_assert_equal_i(expected_diffed_files_count, exp.files); - - git_diff_free(diff); -} - -void test_diff_notify__notify_single_pathspec(void) -{ - char *searched_pathspecs[] = { - "*_deleted", - }; - notify_expected expected_matched_pathspecs[] = { - { "file_deleted", "*_deleted" }, - { "staged_changes_file_deleted", "*_deleted" }, - { NULL, NULL } - }; - - test_notify(searched_pathspecs, 1, expected_matched_pathspecs, 2); -} - -void test_diff_notify__notify_multiple_pathspec(void) -{ - char *searched_pathspecs[] = { - "staged_changes_cant_find_me", - "subdir/modified_cant_find_me", - "subdir/*", - "staged*" - }; - notify_expected expected_matched_pathspecs[] = { - { "staged_changes_file_deleted", "staged*" }, - { "staged_changes_modified_file", "staged*" }, - { "staged_delete_modified_file", "staged*" }, - { "staged_new_file_deleted_file", "staged*" }, - { "staged_new_file_modified_file", "staged*" }, - { "subdir/deleted_file", "subdir/*" }, - { "subdir/modified_file", "subdir/*" }, - { "subdir/new_file", "subdir/*" }, - { NULL, NULL } - }; - - test_notify(searched_pathspecs, 4, expected_matched_pathspecs, 8); -} - -void test_diff_notify__notify_catchall_with_empty_pathspecs(void) -{ - char *searched_pathspecs[] = { - "", - "" - }; - notify_expected expected_matched_pathspecs[] = { - { "file_deleted", NULL }, - { "ignored_file", NULL }, - { "modified_file", NULL }, - { "new_file", NULL }, - { "\xe8\xbf\x99", NULL }, - { "staged_changes_file_deleted", NULL }, - { "staged_changes_modified_file", NULL }, - { "staged_delete_modified_file", NULL }, - { "staged_new_file_deleted_file", NULL }, - { "staged_new_file_modified_file", NULL }, - { "subdir/deleted_file", NULL }, - { "subdir/modified_file", NULL }, - { "subdir/new_file", NULL }, - { NULL, NULL } - }; - - test_notify(searched_pathspecs, 1, expected_matched_pathspecs, 13); -} - -void test_diff_notify__notify_catchall(void) -{ - char *searched_pathspecs[] = { - "*", - }; - notify_expected expected_matched_pathspecs[] = { - { "file_deleted", "*" }, - { "ignored_file", "*" }, - { "modified_file", "*" }, - { "new_file", "*" }, - { "\xe8\xbf\x99", "*" }, - { "staged_changes_file_deleted", "*" }, - { "staged_changes_modified_file", "*" }, - { "staged_delete_modified_file", "*" }, - { "staged_new_file_deleted_file", "*" }, - { "staged_new_file_modified_file", "*" }, - { "subdir/deleted_file", "*" }, - { "subdir/modified_file", "*" }, - { "subdir/new_file", "*" }, - { NULL, NULL } - }; - - test_notify(searched_pathspecs, 1, expected_matched_pathspecs, 13); -} - -static int abort_diff( - const git_diff *diff_so_far, - const git_diff_delta *delta_to_add, - const char *matched_pathspec, - void *payload) -{ - GIT_UNUSED(diff_so_far); - GIT_UNUSED(delta_to_add); - GIT_UNUSED(matched_pathspec); - GIT_UNUSED(payload); - - return -42; -} - -void test_diff_notify__notify_cb_can_abort_diff(void) -{ - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - git_diff *diff = NULL; - char *pathspec = NULL; - - g_repo = cl_git_sandbox_init("status"); - - opts.flags |= GIT_DIFF_INCLUDE_IGNORED | GIT_DIFF_INCLUDE_UNTRACKED; - opts.notify_cb = abort_diff; - opts.pathspec.strings = &pathspec; - opts.pathspec.count = 1; - - pathspec = "file_deleted"; - cl_git_fail_with( - git_diff_index_to_workdir(&diff, g_repo, NULL, &opts), -42); - - pathspec = "staged_changes_modified_file"; - cl_git_fail_with( - git_diff_index_to_workdir(&diff, g_repo, NULL, &opts), -42); -} - -static int filter_all( - const git_diff *diff_so_far, - const git_diff_delta *delta_to_add, - const char *matched_pathspec, - void *payload) -{ - GIT_UNUSED(diff_so_far); - GIT_UNUSED(delta_to_add); - GIT_UNUSED(matched_pathspec); - GIT_UNUSED(payload); - - return 42; -} - -void test_diff_notify__notify_cb_can_be_used_as_filtering_function(void) -{ - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - git_diff *diff = NULL; - char *pathspec = NULL; - diff_expects exp; - - g_repo = cl_git_sandbox_init("status"); - - opts.flags |= GIT_DIFF_INCLUDE_IGNORED | GIT_DIFF_INCLUDE_UNTRACKED; - opts.notify_cb = filter_all; - opts.pathspec.strings = &pathspec; - opts.pathspec.count = 1; - - pathspec = "*_deleted"; - memset(&exp, 0, sizeof(exp)); - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - cl_git_pass(git_diff_foreach(diff, diff_file_cb, NULL, NULL, NULL, &exp)); - - cl_assert_equal_i(0, exp.files); - - git_diff_free(diff); -} - -static int progress_abort_diff( - const git_diff *diff_so_far, - const char *old_path, - const char *new_path, - void *payload) -{ - GIT_UNUSED(diff_so_far); - GIT_UNUSED(old_path); - GIT_UNUSED(new_path); - GIT_UNUSED(payload); - - return -42; -} - -void test_diff_notify__progress_cb_can_abort_diff(void) -{ - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - git_diff *diff = NULL; - - g_repo = cl_git_sandbox_init("status"); - - opts.flags |= GIT_DIFF_INCLUDE_IGNORED | GIT_DIFF_INCLUDE_UNTRACKED; - opts.progress_cb = progress_abort_diff; - - cl_git_fail_with( - git_diff_index_to_workdir(&diff, g_repo, NULL, &opts), -42); -} diff --git a/vendor/libgit2/tests/diff/patch.c b/vendor/libgit2/tests/diff/patch.c deleted file mode 100644 index 1184d1968..000000000 --- a/vendor/libgit2/tests/diff/patch.c +++ /dev/null @@ -1,612 +0,0 @@ -#include "clar_libgit2.h" -#include "git2/sys/repository.h" - -#include "diff_helpers.h" -#include "diff.h" -#include "repository.h" -#include "buf_text.h" - -static git_repository *g_repo = NULL; - -void test_diff_patch__initialize(void) -{ -} - -void test_diff_patch__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -#define EXPECTED_HEADER "diff --git a/subdir.txt b/subdir.txt\n" \ - "deleted file mode 100644\n" \ - "index e8ee89e..0000000\n" \ - "--- a/subdir.txt\n" \ - "+++ /dev/null\n" - -#define EXPECTED_HUNK "@@ -1,2 +0,0 @@\n" - -static int check_removal_cb( - const git_diff_delta *delta, - const git_diff_hunk *hunk, - const git_diff_line *line, - void *payload) -{ - switch (line->origin) { - case GIT_DIFF_LINE_FILE_HDR: - cl_assert_equal_s(EXPECTED_HEADER, line->content); - cl_assert(hunk == NULL); - goto check_delta; - - case GIT_DIFF_LINE_HUNK_HDR: - cl_assert_equal_s(EXPECTED_HUNK, line->content); - goto check_hunk; - - case GIT_DIFF_LINE_CONTEXT: - case GIT_DIFF_LINE_DELETION: - if (payload != NULL) - return *(int *)payload; - goto check_hunk; - - default: - /* unexpected code path */ - return -1; - } - -check_hunk: - cl_assert(hunk != NULL); - cl_assert_equal_i(1, hunk->old_start); - cl_assert_equal_i(2, hunk->old_lines); - cl_assert_equal_i(0, hunk->new_start); - cl_assert_equal_i(0, hunk->new_lines); - -check_delta: - cl_assert_equal_s("subdir.txt", delta->old_file.path); - cl_assert_equal_s("subdir.txt", delta->new_file.path); - cl_assert_equal_i(GIT_DELTA_DELETED, delta->status); - - return 0; -} - -void test_diff_patch__can_properly_display_the_removal_of_a_file(void) -{ - /* - * $ git diff 26a125e..735b6a2 - * diff --git a/subdir.txt b/subdir.txt - * deleted file mode 100644 - * index e8ee89e..0000000 - * --- a/subdir.txt - * +++ /dev/null - * @@ -1,2 +0,0 @@ - * -Is it a bird? - * -Is it a plane? - */ - - const char *one_sha = "26a125e"; - const char *another_sha = "735b6a2"; - git_tree *one, *another; - git_diff *diff; - - g_repo = cl_git_sandbox_init("status"); - - one = resolve_commit_oid_to_tree(g_repo, one_sha); - another = resolve_commit_oid_to_tree(g_repo, another_sha); - - cl_git_pass(git_diff_tree_to_tree(&diff, g_repo, one, another, NULL)); - - cl_git_pass(git_diff_print( - diff, GIT_DIFF_FORMAT_PATCH, check_removal_cb, NULL)); - - git_diff_free(diff); - - git_tree_free(another); - git_tree_free(one); -} - -void test_diff_patch__can_cancel_diff_print(void) -{ - const char *one_sha = "26a125e"; - const char *another_sha = "735b6a2"; - git_tree *one, *another; - git_diff *diff; - int fail_with; - - g_repo = cl_git_sandbox_init("status"); - - one = resolve_commit_oid_to_tree(g_repo, one_sha); - another = resolve_commit_oid_to_tree(g_repo, another_sha); - - cl_git_pass(git_diff_tree_to_tree(&diff, g_repo, one, another, NULL)); - - fail_with = -2323; - - cl_git_fail_with(git_diff_print( - diff, GIT_DIFF_FORMAT_PATCH, check_removal_cb, &fail_with), - fail_with); - - fail_with = 45; - - cl_git_fail_with(git_diff_print( - diff, GIT_DIFF_FORMAT_PATCH, check_removal_cb, &fail_with), - fail_with); - - git_diff_free(diff); - - git_tree_free(another); - git_tree_free(one); -} - -void test_diff_patch__to_string(void) -{ - const char *one_sha = "26a125e"; - const char *another_sha = "735b6a2"; - git_tree *one, *another; - git_diff *diff; - git_patch *patch; - git_buf buf = GIT_BUF_INIT; - const char *expected = "diff --git a/subdir.txt b/subdir.txt\ndeleted file mode 100644\nindex e8ee89e..0000000\n--- a/subdir.txt\n+++ /dev/null\n@@ -1,2 +0,0 @@\n-Is it a bird?\n-Is it a plane?\n"; - - g_repo = cl_git_sandbox_init("status"); - - one = resolve_commit_oid_to_tree(g_repo, one_sha); - another = resolve_commit_oid_to_tree(g_repo, another_sha); - - cl_git_pass(git_diff_tree_to_tree(&diff, g_repo, one, another, NULL)); - - cl_assert_equal_i(1, (int)git_diff_num_deltas(diff)); - - cl_git_pass(git_patch_from_diff(&patch, diff, 0)); - - cl_git_pass(git_patch_to_buf(&buf, patch)); - - cl_assert_equal_s(expected, buf.ptr); - - cl_assert_equal_sz(31, git_patch_size(patch, 0, 0, 0)); - cl_assert_equal_sz(31, git_patch_size(patch, 1, 0, 0)); - cl_assert_equal_sz(31 + 16, git_patch_size(patch, 1, 1, 0)); - cl_assert_equal_sz(strlen(expected), git_patch_size(patch, 1, 1, 1)); - - git_buf_free(&buf); - git_patch_free(patch); - git_diff_free(diff); - git_tree_free(another); - git_tree_free(one); -} - -void test_diff_patch__config_options(void) -{ - const char *one_sha = "26a125e"; /* current HEAD */ - git_tree *one; - git_config *cfg; - git_diff *diff; - git_patch *patch; - git_buf buf = GIT_BUF_INIT; - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - char *onefile = "staged_changes_modified_file"; - const char *expected1 = "diff --git c/staged_changes_modified_file i/staged_changes_modified_file\nindex 70bd944..906ee77 100644\n--- c/staged_changes_modified_file\n+++ i/staged_changes_modified_file\n@@ -1 +1,2 @@\n staged_changes_modified_file\n+staged_changes_modified_file\n"; - const char *expected2 = "diff --git i/staged_changes_modified_file w/staged_changes_modified_file\nindex 906ee77..011c344 100644\n--- i/staged_changes_modified_file\n+++ w/staged_changes_modified_file\n@@ -1,2 +1,3 @@\n staged_changes_modified_file\n staged_changes_modified_file\n+staged_changes_modified_file\n"; - const char *expected3 = "diff --git staged_changes_modified_file staged_changes_modified_file\nindex 906ee77..011c344 100644\n--- staged_changes_modified_file\n+++ staged_changes_modified_file\n@@ -1,2 +1,3 @@\n staged_changes_modified_file\n staged_changes_modified_file\n+staged_changes_modified_file\n"; - const char *expected4 = "diff --git staged_changes_modified_file staged_changes_modified_file\nindex 70bd9443ada0..906ee7711f4f 100644\n--- staged_changes_modified_file\n+++ staged_changes_modified_file\n@@ -1 +1,2 @@\n staged_changes_modified_file\n+staged_changes_modified_file\n"; - - g_repo = cl_git_sandbox_init("status"); - cl_git_pass(git_repository_config(&cfg, g_repo)); - one = resolve_commit_oid_to_tree(g_repo, one_sha); - opts.pathspec.count = 1; - opts.pathspec.strings = &onefile; - - - cl_git_pass(git_config_set_string(cfg, "diff.mnemonicprefix", "true")); - - cl_git_pass(git_diff_tree_to_index(&diff, g_repo, one, NULL, &opts)); - - cl_assert_equal_i(1, (int)git_diff_num_deltas(diff)); - cl_git_pass(git_patch_from_diff(&patch, diff, 0)); - cl_git_pass(git_patch_to_buf(&buf, patch)); - cl_assert_equal_s(expected1, buf.ptr); - - git_buf_clear(&buf); - git_patch_free(patch); - git_diff_free(diff); - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - - cl_assert_equal_i(1, (int)git_diff_num_deltas(diff)); - cl_git_pass(git_patch_from_diff(&patch, diff, 0)); - cl_git_pass(git_patch_to_buf(&buf, patch)); - cl_assert_equal_s(expected2, buf.ptr); - - git_buf_clear(&buf); - git_patch_free(patch); - git_diff_free(diff); - - - cl_git_pass(git_config_set_string(cfg, "diff.noprefix", "true")); - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - - cl_assert_equal_i(1, (int)git_diff_num_deltas(diff)); - cl_git_pass(git_patch_from_diff(&patch, diff, 0)); - cl_git_pass(git_patch_to_buf(&buf, patch)); - cl_assert_equal_s(expected3, buf.ptr); - - git_buf_clear(&buf); - git_patch_free(patch); - git_diff_free(diff); - - - cl_git_pass(git_config_set_int32(cfg, "core.abbrev", 12)); - - cl_git_pass(git_diff_tree_to_index(&diff, g_repo, one, NULL, &opts)); - - cl_assert_equal_i(1, (int)git_diff_num_deltas(diff)); - cl_git_pass(git_patch_from_diff(&patch, diff, 0)); - cl_git_pass(git_patch_to_buf(&buf, patch)); - cl_assert_equal_s(expected4, buf.ptr); - - git_buf_clear(&buf); - git_patch_free(patch); - git_diff_free(diff); - - git_buf_free(&buf); - git_tree_free(one); - git_config_free(cfg); -} - -void test_diff_patch__hunks_have_correct_line_numbers(void) -{ - git_config *cfg; - git_tree *head; - git_diff_options opt = GIT_DIFF_OPTIONS_INIT; - git_diff *diff; - git_patch *patch; - const git_diff_delta *delta; - const git_diff_hunk *hunk; - const git_diff_line *line; - size_t hunklen; - git_buf old_content = GIT_BUF_INIT, actual = GIT_BUF_INIT; - const char *new_content = "The Song of Seven Cities\n------------------------\n\nI WAS Lord of Cities very sumptuously builded.\nSeven roaring Cities paid me tribute from afar.\nIvory their outposts were--the guardrooms of them gilded,\nAnd garrisoned with Amazons invincible in war.\n\nThis is some new text;\nNot as good as the old text;\nBut here it is.\n\nSo they warred and trafficked only yesterday, my Cities.\nTo-day there is no mark or mound of where my Cities stood.\nFor the River rose at midnight and it washed away my Cities.\nThey are evened with Atlantis and the towns before the Flood.\n\nRain on rain-gorged channels raised the water-levels round them,\nFreshet backed on freshet swelled and swept their world from sight,\nTill the emboldened floods linked arms and, flashing forward, drowned them--\nDrowned my Seven Cities and their peoples in one night!\n\nLow among the alders lie their derelict foundations,\nThe beams wherein they trusted and the plinths whereon they built--\nMy rulers and their treasure and their unborn populations,\nDead, destroyed, aborted, and defiled with mud and silt!\n\nAnother replacement;\nBreaking up the poem;\nGenerating some hunks.\n\nTo the sound of trumpets shall their seed restore my Cities\nWealthy and well-weaponed, that once more may I behold\nAll the world go softly when it walks before my Cities,\nAnd the horses and the chariots fleeing from them as of old!\n\n -- Rudyard Kipling\n"; - - g_repo = cl_git_sandbox_init("renames"); - - cl_git_pass(git_config_new(&cfg)); - git_repository_set_config(g_repo, cfg); - git_config_free(cfg); - - git_repository_reinit_filesystem(g_repo, false); - - cl_git_pass( - git_futils_readbuffer(&old_content, "renames/songof7cities.txt")); - - cl_git_rewritefile("renames/songof7cities.txt", new_content); - - cl_git_pass(git_repository_head_tree(&head, g_repo)); - - cl_git_pass(git_diff_tree_to_workdir(&diff, g_repo, head, &opt)); - - cl_assert_equal_i(1, (int)git_diff_num_deltas(diff)); - - cl_git_pass(git_patch_from_diff(&patch, diff, 0)); - cl_assert((delta = git_patch_get_delta(patch)) != NULL); - - cl_assert_equal_i(GIT_DELTA_MODIFIED, (int)delta->status); - cl_assert_equal_i(2, (int)git_patch_num_hunks(patch)); - - /* check hunk 0 */ - - cl_git_pass( - git_patch_get_hunk(&hunk, &hunklen, patch, 0)); - - cl_assert_equal_i(18, (int)hunklen); - - cl_assert_equal_i(6, (int)hunk->old_start); - cl_assert_equal_i(15, (int)hunk->old_lines); - cl_assert_equal_i(6, (int)hunk->new_start); - cl_assert_equal_i(9, (int)hunk->new_lines); - - cl_assert_equal_i(18, (int)git_patch_num_lines_in_hunk(patch, 0)); - - cl_git_pass(git_patch_get_line_in_hunk(&line, patch, 0, 0)); - cl_assert_equal_i(GIT_DIFF_LINE_CONTEXT, (int)line->origin); - cl_git_pass(git_buf_set(&actual, line->content, line->content_len)); - cl_assert_equal_s("Ivory their outposts were--the guardrooms of them gilded,\n", actual.ptr); - cl_assert_equal_i(6, line->old_lineno); - cl_assert_equal_i(6, line->new_lineno); - cl_assert_equal_i(-1, line->content_offset); - - cl_git_pass(git_patch_get_line_in_hunk(&line, patch, 0, 3)); - cl_assert_equal_i(GIT_DIFF_LINE_DELETION, (int)line->origin); - cl_git_pass(git_buf_set(&actual, line->content, line->content_len)); - cl_assert_equal_s("All the world went softly when it walked before my Cities--\n", actual.ptr); - cl_assert_equal_i(9, line->old_lineno); - cl_assert_equal_i(-1, line->new_lineno); - cl_assert_equal_i(252, line->content_offset); - - cl_git_pass(git_patch_get_line_in_hunk(&line, patch, 0, 12)); - cl_assert_equal_i(GIT_DIFF_LINE_ADDITION, (int)line->origin); - cl_git_pass(git_buf_set(&actual, line->content, line->content_len)); - cl_assert_equal_s("This is some new text;\n", actual.ptr); - cl_assert_equal_i(-1, line->old_lineno); - cl_assert_equal_i(9, line->new_lineno); - cl_assert_equal_i(252, line->content_offset); - - /* check hunk 1 */ - - cl_git_pass(git_patch_get_hunk(&hunk, &hunklen, patch, 1)); - - cl_assert_equal_i(18, (int)hunklen); - - cl_assert_equal_i(31, (int)hunk->old_start); - cl_assert_equal_i(15, (int)hunk->old_lines); - cl_assert_equal_i(25, (int)hunk->new_start); - cl_assert_equal_i(9, (int)hunk->new_lines); - - cl_assert_equal_i(18, (int)git_patch_num_lines_in_hunk(patch, 1)); - - cl_git_pass(git_patch_get_line_in_hunk(&line, patch, 1, 0)); - cl_assert_equal_i(GIT_DIFF_LINE_CONTEXT, (int)line->origin); - cl_git_pass(git_buf_set(&actual, line->content, line->content_len)); - cl_assert_equal_s("My rulers and their treasure and their unborn populations,\n", actual.ptr); - cl_assert_equal_i(31, line->old_lineno); - cl_assert_equal_i(25, line->new_lineno); - cl_assert_equal_i(-1, line->content_offset); - - cl_git_pass(git_patch_get_line_in_hunk(&line, patch, 1, 3)); - cl_assert_equal_i(GIT_DIFF_LINE_DELETION, (int)line->origin); - cl_git_pass(git_buf_set(&actual, line->content, line->content_len)); - cl_assert_equal_s("The Daughters of the Palace whom they cherished in my Cities,\n", actual.ptr); - cl_assert_equal_i(34, line->old_lineno); - cl_assert_equal_i(-1, line->new_lineno); - cl_assert_equal_i(1468, line->content_offset); - - cl_git_pass(git_patch_get_line_in_hunk(&line, patch, 1, 12)); - cl_assert_equal_i(GIT_DIFF_LINE_ADDITION, (int)line->origin); - cl_git_pass(git_buf_set(&actual, line->content, line->content_len)); - cl_assert_equal_s("Another replacement;\n", actual.ptr); - cl_assert_equal_i(-1, line->old_lineno); - cl_assert_equal_i(28, line->new_lineno); - cl_assert_equal_i(1066, line->content_offset); - - git_patch_free(patch); - git_diff_free(diff); - - /* Let's check line numbers when there is no newline */ - - git_buf_rtrim(&old_content); - cl_git_rewritefile("renames/songof7cities.txt", old_content.ptr); - - cl_git_pass(git_diff_tree_to_workdir(&diff, g_repo, head, &opt)); - - cl_assert_equal_i(1, (int)git_diff_num_deltas(diff)); - - cl_git_pass(git_patch_from_diff(&patch, diff, 0)); - cl_assert((delta = git_patch_get_delta(patch)) != NULL); - - cl_assert_equal_i(GIT_DELTA_MODIFIED, (int)delta->status); - cl_assert_equal_i(1, (int)git_patch_num_hunks(patch)); - - /* check hunk 0 */ - - cl_git_pass(git_patch_get_hunk(&hunk, &hunklen, patch, 0)); - - cl_assert_equal_i(6, (int)hunklen); - - cl_assert_equal_i(46, (int)hunk->old_start); - cl_assert_equal_i(4, (int)hunk->old_lines); - cl_assert_equal_i(46, (int)hunk->new_start); - cl_assert_equal_i(4, (int)hunk->new_lines); - - cl_assert_equal_i(6, (int)git_patch_num_lines_in_hunk(patch, 0)); - - cl_git_pass(git_patch_get_line_in_hunk(&line, patch, 0, 1)); - cl_assert_equal_i(GIT_DIFF_LINE_CONTEXT, (int)line->origin); - cl_git_pass(git_buf_set(&actual, line->content, line->content_len)); - cl_assert_equal_s("And the horses and the chariots fleeing from them as of old!\n", actual.ptr); - cl_assert_equal_i(47, line->old_lineno); - cl_assert_equal_i(47, line->new_lineno); - - cl_git_pass(git_patch_get_line_in_hunk(&line, patch, 0, 2)); - cl_assert_equal_i(GIT_DIFF_LINE_CONTEXT, (int)line->origin); - cl_git_pass(git_buf_set(&actual, line->content, line->content_len)); - cl_assert_equal_s("\n", actual.ptr); - cl_assert_equal_i(48, line->old_lineno); - cl_assert_equal_i(48, line->new_lineno); - - cl_git_pass(git_patch_get_line_in_hunk(&line, patch, 0, 3)); - cl_assert_equal_i(GIT_DIFF_LINE_DELETION, (int)line->origin); - cl_git_pass(git_buf_set(&actual, line->content, line->content_len)); - cl_assert_equal_s(" -- Rudyard Kipling\n", actual.ptr); - cl_assert_equal_i(49, line->old_lineno); - cl_assert_equal_i(-1, line->new_lineno); - - cl_git_pass(git_patch_get_line_in_hunk(&line, patch, 0, 4)); - cl_assert_equal_i(GIT_DIFF_LINE_ADDITION, (int)line->origin); - cl_git_pass(git_buf_set(&actual, line->content, line->content_len)); - cl_assert_equal_s(" -- Rudyard Kipling", actual.ptr); - cl_assert_equal_i(-1, line->old_lineno); - cl_assert_equal_i(49, line->new_lineno); - - cl_git_pass(git_patch_get_line_in_hunk(&line, patch, 0, 5)); - cl_assert_equal_i(GIT_DIFF_LINE_DEL_EOFNL, (int)line->origin); - cl_git_pass(git_buf_set(&actual, line->content, line->content_len)); - cl_assert_equal_s("\n\\ No newline at end of file\n", actual.ptr); - cl_assert_equal_i(-1, line->old_lineno); - cl_assert_equal_i(49, line->new_lineno); - - git_patch_free(patch); - git_diff_free(diff); - - git_buf_free(&actual); - git_buf_free(&old_content); - git_tree_free(head); -} - -static void check_single_patch_stats( - git_repository *repo, size_t hunks, - size_t adds, size_t dels, size_t ctxt, size_t *sizes, - const char *expected) -{ - git_diff *diff; - git_patch *patch; - const git_diff_delta *delta; - size_t actual_ctxt, actual_adds, actual_dels; - - cl_git_pass(git_diff_index_to_workdir(&diff, repo, NULL, NULL)); - - cl_assert_equal_i(1, (int)git_diff_num_deltas(diff)); - - cl_git_pass(git_patch_from_diff(&patch, diff, 0)); - cl_assert((delta = git_patch_get_delta(patch)) != NULL); - cl_assert_equal_i(GIT_DELTA_MODIFIED, (int)delta->status); - - cl_assert_equal_i((int)hunks, (int)git_patch_num_hunks(patch)); - - cl_git_pass( git_patch_line_stats( - &actual_ctxt, &actual_adds, &actual_dels, patch) ); - - cl_assert_equal_sz(ctxt, actual_ctxt); - cl_assert_equal_sz(adds, actual_adds); - cl_assert_equal_sz(dels, actual_dels); - - if (expected != NULL) { - git_buf buf = GIT_BUF_INIT; - cl_git_pass(git_patch_to_buf(&buf, patch)); - cl_assert_equal_s(expected, buf.ptr); - git_buf_free(&buf); - - cl_assert_equal_sz( - strlen(expected), git_patch_size(patch, 1, 1, 1)); - } - - if (sizes) { - if (sizes[0]) - cl_assert_equal_sz(sizes[0], git_patch_size(patch, 0, 0, 0)); - if (sizes[1]) - cl_assert_equal_sz(sizes[1], git_patch_size(patch, 1, 0, 0)); - if (sizes[2]) - cl_assert_equal_sz(sizes[2], git_patch_size(patch, 1, 1, 0)); - } - - /* walk lines in hunk with basic sanity checks */ - for (; hunks > 0; --hunks) { - size_t i, max_i; - const git_diff_line *line; - int last_new_lineno = -1, last_old_lineno = -1; - - max_i = git_patch_num_lines_in_hunk(patch, hunks - 1); - - for (i = 0; i < max_i; ++i) { - int expected = 1; - - cl_git_pass( - git_patch_get_line_in_hunk(&line, patch, hunks - 1, i)); - - if (line->origin == GIT_DIFF_LINE_ADD_EOFNL || - line->origin == GIT_DIFF_LINE_DEL_EOFNL || - line->origin == GIT_DIFF_LINE_CONTEXT_EOFNL) - expected = 0; - - if (line->old_lineno >= 0) { - if (last_old_lineno >= 0) - cl_assert_equal_i( - expected, line->old_lineno - last_old_lineno); - last_old_lineno = line->old_lineno; - } - - if (line->new_lineno >= 0) { - if (last_new_lineno >= 0) - cl_assert_equal_i( - expected, line->new_lineno - last_new_lineno); - last_new_lineno = line->new_lineno; - } - } - } - - git_patch_free(patch); - git_diff_free(diff); -} - -void test_diff_patch__line_counts_with_eofnl(void) -{ - git_config *cfg; - git_buf content = GIT_BUF_INIT; - const char *end; - git_index *index; - const char *expected = - /* below is pasted output of 'git diff' with fn context removed */ - "diff --git a/songof7cities.txt b/songof7cities.txt\n" - "index 378a7d9..3d0154e 100644\n" - "--- a/songof7cities.txt\n" - "+++ b/songof7cities.txt\n" - "@@ -42,7 +42,7 @@ With peoples undefeated of the dark, enduring blood.\n" - " \n" - " To the sound of trumpets shall their seed restore my Cities\n" - " Wealthy and well-weaponed, that once more may I behold\n" - "-All the world go softly when it walks before my Cities,\n" - "+#All the world go softly when it walks before my Cities,\n" - " And the horses and the chariots fleeing from them as of old!\n" - " \n" - " -- Rudyard Kipling\n" - "\\ No newline at end of file\n"; - size_t expected_sizes[3] = { 115, 119 + 115 + 114, 119 + 115 + 114 + 71 }; - - g_repo = cl_git_sandbox_init("renames"); - - cl_git_pass(git_config_new(&cfg)); - git_repository_set_config(g_repo, cfg); - git_config_free(cfg); - - git_repository_reinit_filesystem(g_repo, false); - - cl_git_pass(git_futils_readbuffer(&content, "renames/songof7cities.txt")); - - /* remove first line */ - - end = git_buf_cstr(&content) + git_buf_find(&content, '\n') + 1; - git_buf_consume(&content, end); - cl_git_rewritefile("renames/songof7cities.txt", content.ptr); - - check_single_patch_stats(g_repo, 1, 0, 1, 3, NULL, NULL); - - /* remove trailing whitespace */ - - git_buf_rtrim(&content); - cl_git_rewritefile("renames/songof7cities.txt", content.ptr); - - check_single_patch_stats(g_repo, 2, 1, 2, 6, NULL, NULL); - - /* add trailing whitespace */ - - cl_git_pass(git_repository_index(&index, g_repo)); - cl_git_pass(git_index_add_bypath(index, "songof7cities.txt")); - cl_git_pass(git_index_write(index)); - git_index_free(index); - - cl_git_pass(git_buf_putc(&content, '\n')); - cl_git_rewritefile("renames/songof7cities.txt", content.ptr); - - check_single_patch_stats(g_repo, 1, 1, 1, 3, NULL, NULL); - - /* no trailing whitespace as context line */ - - { - /* walk back a couple lines, make space and insert char */ - char *scan = content.ptr + content.size; - int i; - - for (i = 0; i < 5; ++i) { - for (--scan; scan > content.ptr && *scan != '\n'; --scan) - /* seek to prev \n */; - } - cl_assert(scan > content.ptr); - - /* overwrite trailing \n with right-shifted content */ - memmove(scan + 1, scan, content.size - (scan - content.ptr) - 1); - /* insert '#' char into space we created */ - scan[1] = '#'; - } - cl_git_rewritefile("renames/songof7cities.txt", content.ptr); - - check_single_patch_stats( - g_repo, 1, 1, 1, 6, expected_sizes, expected); - - git_buf_free(&content); -} diff --git a/vendor/libgit2/tests/diff/pathspec.c b/vendor/libgit2/tests/diff/pathspec.c deleted file mode 100644 index 5761d2d2b..000000000 --- a/vendor/libgit2/tests/diff/pathspec.c +++ /dev/null @@ -1,93 +0,0 @@ -#include "clar_libgit2.h" -#include "diff_helpers.h" - -static git_repository *g_repo = NULL; - -void test_diff_pathspec__initialize(void) -{ - g_repo = cl_git_sandbox_init("status"); -} - -void test_diff_pathspec__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -void test_diff_pathspec__0(void) -{ - const char *a_commit = "26a125ee"; /* the current HEAD */ - const char *b_commit = "0017bd4a"; /* the start */ - git_tree *a = resolve_commit_oid_to_tree(g_repo, a_commit); - git_tree *b = resolve_commit_oid_to_tree(g_repo, b_commit); - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - git_diff *diff = NULL; - git_strarray paths = { NULL, 1 }; - char *path; - git_pathspec *ps; - git_pathspec_match_list *matches; - - cl_assert(a); - cl_assert(b); - - path = "*_file"; - paths.strings = &path; - cl_git_pass(git_pathspec_new(&ps, &paths)); - - cl_git_pass(git_pathspec_match_tree(&matches, a, GIT_PATHSPEC_DEFAULT, ps)); - cl_assert_equal_i(7, (int)git_pathspec_match_list_entrycount(matches)); - cl_assert_equal_s("current_file", git_pathspec_match_list_entry(matches,0)); - cl_assert(git_pathspec_match_list_diff_entry(matches,0) == NULL); - git_pathspec_match_list_free(matches); - - cl_git_pass(git_diff_tree_to_tree(&diff, g_repo, NULL, a, &opts)); - - cl_git_pass(git_pathspec_match_diff( - &matches, diff, GIT_PATHSPEC_DEFAULT, ps)); - cl_assert_equal_i(7, (int)git_pathspec_match_list_entrycount(matches)); - cl_assert(git_pathspec_match_list_diff_entry(matches, 0) != NULL); - cl_assert(git_pathspec_match_list_entry(matches, 0) == NULL); - cl_assert_equal_s("current_file", - git_pathspec_match_list_diff_entry(matches,0)->new_file.path); - cl_assert_equal_i(GIT_DELTA_ADDED, - (int)git_pathspec_match_list_diff_entry(matches,0)->status); - git_pathspec_match_list_free(matches); - - git_diff_free(diff); - diff = NULL; - - cl_git_pass(git_diff_tree_to_tree(&diff, g_repo, a, b, &opts)); - - cl_git_pass(git_pathspec_match_diff( - &matches, diff, GIT_PATHSPEC_DEFAULT, ps)); - cl_assert_equal_i(3, (int)git_pathspec_match_list_entrycount(matches)); - cl_assert(git_pathspec_match_list_diff_entry(matches, 0) != NULL); - cl_assert(git_pathspec_match_list_entry(matches, 0) == NULL); - cl_assert_equal_s("subdir/current_file", - git_pathspec_match_list_diff_entry(matches,0)->new_file.path); - cl_assert_equal_i(GIT_DELTA_DELETED, - (int)git_pathspec_match_list_diff_entry(matches,0)->status); - git_pathspec_match_list_free(matches); - - git_diff_free(diff); - diff = NULL; - - cl_git_pass(git_diff_tree_to_workdir(&diff, g_repo, a, &opts)); - - cl_git_pass(git_pathspec_match_diff( - &matches, diff, GIT_PATHSPEC_DEFAULT, ps)); - cl_assert_equal_i(4, (int)git_pathspec_match_list_entrycount(matches)); - cl_assert(git_pathspec_match_list_diff_entry(matches, 0) != NULL); - cl_assert(git_pathspec_match_list_entry(matches, 0) == NULL); - cl_assert_equal_s("modified_file", - git_pathspec_match_list_diff_entry(matches,0)->new_file.path); - cl_assert_equal_i(GIT_DELTA_MODIFIED, - (int)git_pathspec_match_list_diff_entry(matches,0)->status); - git_pathspec_match_list_free(matches); - - git_diff_free(diff); - diff = NULL; - - git_tree_free(a); - git_tree_free(b); - git_pathspec_free(ps); -} diff --git a/vendor/libgit2/tests/diff/rename.c b/vendor/libgit2/tests/diff/rename.c deleted file mode 100644 index 5cfd8e235..000000000 --- a/vendor/libgit2/tests/diff/rename.c +++ /dev/null @@ -1,1704 +0,0 @@ -#include "clar_libgit2.h" -#include "diff_helpers.h" -#include "buf_text.h" - -static git_repository *g_repo = NULL; - -void test_diff_rename__initialize(void) -{ - g_repo = cl_git_sandbox_init("renames"); - - cl_repo_set_bool(g_repo, "core.autocrlf", false); -} - -void test_diff_rename__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -/* - * Renames repo has: - * - * commit 31e47d8c1fa36d7f8d537b96158e3f024de0a9f2 - - * serving.txt (25 lines) - * sevencities.txt (50 lines) - * commit 2bc7f351d20b53f1c72c16c4b036e491c478c49a - - * serving.txt -> sixserving.txt (rename, no change, 100% match) - * sevencities.txt -> sevencities.txt (no change) - * sevencities.txt -> songofseven.txt (copy, no change, 100% match) - * commit 1c068dee5790ef1580cfc4cd670915b48d790084 - * songofseven.txt -> songofseven.txt (major rewrite, <20% match - split) - * sixserving.txt -> sixserving.txt (indentation change) - * sixserving.txt -> ikeepsix.txt (copy, add title, >80% match) - * sevencities.txt (no change) - * commit 19dd32dfb1520a64e5bbaae8dce6ef423dfa2f13 - * songofseven.txt -> untimely.txt (rename, convert to crlf) - * ikeepsix.txt -> ikeepsix.txt (reorder sections in file) - * sixserving.txt -> sixserving.txt (whitespace change - not just indent) - * sevencities.txt -> songof7cities.txt (rename, small text changes) - */ - -void test_diff_rename__match_oid(void) -{ - const char *old_sha = "31e47d8c1fa36d7f8d537b96158e3f024de0a9f2"; - const char *new_sha = "2bc7f351d20b53f1c72c16c4b036e491c478c49a"; - git_tree *old_tree, *new_tree; - git_diff *diff; - git_diff_options diffopts = GIT_DIFF_OPTIONS_INIT; - git_diff_find_options opts = GIT_DIFF_FIND_OPTIONS_INIT; - diff_expects exp; - - old_tree = resolve_commit_oid_to_tree(g_repo, old_sha); - new_tree = resolve_commit_oid_to_tree(g_repo, new_sha); - - /* Must pass GIT_DIFF_INCLUDE_UNMODIFIED if you expect to emulate - * --find-copies-harder during rename transformion... - */ - diffopts.flags |= GIT_DIFF_INCLUDE_UNMODIFIED; - - cl_git_pass(git_diff_tree_to_tree( - &diff, g_repo, old_tree, new_tree, &diffopts)); - - /* git diff --no-renames \ - * 31e47d8c1fa36d7f8d537b96158e3f024de0a9f2 \ - * 2bc7f351d20b53f1c72c16c4b036e491c478c49a - */ - memset(&exp, 0, sizeof(exp)); - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - - cl_assert_equal_i(4, exp.files); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_UNMODIFIED]); - cl_assert_equal_i(2, exp.file_status[GIT_DELTA_ADDED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_DELETED]); - - /* git diff 31e47d8c1fa36d7f8d537b96158e3f024de0a9f2 \ - * 2bc7f351d20b53f1c72c16c4b036e491c478c49a - * don't use NULL opts to avoid config `diff.renames` contamination - */ - opts.flags = GIT_DIFF_FIND_RENAMES; - cl_git_pass(git_diff_find_similar(diff, &opts)); - - memset(&exp, 0, sizeof(exp)); - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - - cl_assert_equal_i(3, exp.files); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_UNMODIFIED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_ADDED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_RENAMED]); - - git_diff_free(diff); - - cl_git_pass(git_diff_tree_to_tree( - &diff, g_repo, old_tree, new_tree, &diffopts)); - - /* git diff --find-copies-harder \ - * 31e47d8c1fa36d7f8d537b96158e3f024de0a9f2 \ - * 2bc7f351d20b53f1c72c16c4b036e491c478c49a - */ - opts.flags = GIT_DIFF_FIND_COPIES_FROM_UNMODIFIED; - cl_git_pass(git_diff_find_similar(diff, &opts)); - - memset(&exp, 0, sizeof(exp)); - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - - cl_assert_equal_i(3, exp.files); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_UNMODIFIED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_COPIED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_RENAMED]); - - git_diff_free(diff); - - cl_git_pass(git_diff_tree_to_tree( - &diff, g_repo, old_tree, new_tree, &diffopts)); - - /* git diff --find-copies-harder -M100 -B100 \ - * 31e47d8c1fa36d7f8d537b96158e3f024de0a9f2 \ - * 2bc7f351d20b53f1c72c16c4b036e491c478c49a - */ - opts.flags = GIT_DIFF_FIND_COPIES_FROM_UNMODIFIED | - GIT_DIFF_FIND_EXACT_MATCH_ONLY; - cl_git_pass(git_diff_find_similar(diff, &opts)); - - memset(&exp, 0, sizeof(exp)); - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - - cl_assert_equal_i(3, exp.files); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_UNMODIFIED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_COPIED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_RENAMED]); - - git_diff_free(diff); - - git_tree_free(old_tree); - git_tree_free(new_tree); -} - -void test_diff_rename__checks_options_version(void) -{ - const char *old_sha = "31e47d8c1fa36d7f8d537b96158e3f024de0a9f2"; - const char *new_sha = "2bc7f351d20b53f1c72c16c4b036e491c478c49a"; - git_tree *old_tree, *new_tree; - git_diff *diff; - git_diff_options diffopts = GIT_DIFF_OPTIONS_INIT; - git_diff_find_options opts = GIT_DIFF_FIND_OPTIONS_INIT; - const git_error *err; - - old_tree = resolve_commit_oid_to_tree(g_repo, old_sha); - new_tree = resolve_commit_oid_to_tree(g_repo, new_sha); - diffopts.flags |= GIT_DIFF_INCLUDE_UNMODIFIED; - cl_git_pass(git_diff_tree_to_tree( - &diff, g_repo, old_tree, new_tree, &diffopts)); - - opts.version = 0; - cl_git_fail(git_diff_find_similar(diff, &opts)); - err = giterr_last(); - cl_assert_equal_i(GITERR_INVALID, err->klass); - - giterr_clear(); - opts.version = 1024; - cl_git_fail(git_diff_find_similar(diff, &opts)); - err = giterr_last(); - cl_assert_equal_i(GITERR_INVALID, err->klass); - - git_diff_free(diff); - git_tree_free(old_tree); - git_tree_free(new_tree); -} - -void test_diff_rename__not_exact_match(void) -{ - const char *sha0 = "2bc7f351d20b53f1c72c16c4b036e491c478c49a"; - const char *sha1 = "1c068dee5790ef1580cfc4cd670915b48d790084"; - const char *sha2 = "19dd32dfb1520a64e5bbaae8dce6ef423dfa2f13"; - git_tree *old_tree, *new_tree; - git_diff *diff; - git_diff_options diffopts = GIT_DIFF_OPTIONS_INIT; - git_diff_find_options opts = GIT_DIFF_FIND_OPTIONS_INIT; - diff_expects exp; - - /* == Changes ===================================================== - * songofseven.txt -> songofseven.txt (major rewrite, <20% match - split) - * sixserving.txt -> sixserving.txt (indentation change) - * sixserving.txt -> ikeepsix.txt (copy, add title, >80% match) - * sevencities.txt (no change) - */ - - old_tree = resolve_commit_oid_to_tree(g_repo, sha0); - new_tree = resolve_commit_oid_to_tree(g_repo, sha1); - - /* Must pass GIT_DIFF_INCLUDE_UNMODIFIED if you expect to emulate - * --find-copies-harder during rename transformion... - */ - diffopts.flags |= GIT_DIFF_INCLUDE_UNMODIFIED; - - cl_git_pass(git_diff_tree_to_tree( - &diff, g_repo, old_tree, new_tree, &diffopts)); - - /* git diff --no-renames \ - * 2bc7f351d20b53f1c72c16c4b036e491c478c49a \ - * 1c068dee5790ef1580cfc4cd670915b48d790084 - */ - memset(&exp, 0, sizeof(exp)); - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - - cl_assert_equal_i(4, exp.files); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_UNMODIFIED]); - cl_assert_equal_i(2, exp.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_ADDED]); - - /* git diff -M 2bc7f351d20b53f1c72c16c4b036e491c478c49a \ - * 1c068dee5790ef1580cfc4cd670915b48d790084 - * - * must not pass NULL for opts because it will pick up environment - * values for "diff.renames" and test won't be consistent. - */ - opts.flags = GIT_DIFF_FIND_RENAMES; - cl_git_pass(git_diff_find_similar(diff, &opts)); - - memset(&exp, 0, sizeof(exp)); - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - - cl_assert_equal_i(4, exp.files); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_UNMODIFIED]); - cl_assert_equal_i(2, exp.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_ADDED]); - - git_diff_free(diff); - - /* git diff -M -C \ - * 2bc7f351d20b53f1c72c16c4b036e491c478c49a \ - * 1c068dee5790ef1580cfc4cd670915b48d790084 - */ - cl_git_pass(git_diff_tree_to_tree( - &diff, g_repo, old_tree, new_tree, &diffopts)); - - opts.flags = GIT_DIFF_FIND_RENAMES | GIT_DIFF_FIND_COPIES; - cl_git_pass(git_diff_find_similar(diff, &opts)); - - memset(&exp, 0, sizeof(exp)); - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - - cl_assert_equal_i(4, exp.files); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_UNMODIFIED]); - cl_assert_equal_i(2, exp.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_COPIED]); - - git_diff_free(diff); - - /* git diff -M -C --find-copies-harder --break-rewrites \ - * 2bc7f351d20b53f1c72c16c4b036e491c478c49a \ - * 1c068dee5790ef1580cfc4cd670915b48d790084 - */ - cl_git_pass(git_diff_tree_to_tree( - &diff, g_repo, old_tree, new_tree, &diffopts)); - - opts.flags = GIT_DIFF_FIND_ALL; - opts.break_rewrite_threshold = 70; - - cl_git_pass(git_diff_find_similar(diff, &opts)); - - memset(&exp, 0, sizeof(exp)); - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - - cl_assert_equal_i(5, exp.files); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_UNMODIFIED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_ADDED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_COPIED]); - - git_diff_free(diff); - - /* == Changes ===================================================== - * songofseven.txt -> untimely.txt (rename, convert to crlf) - * ikeepsix.txt -> ikeepsix.txt (reorder sections in file) - * sixserving.txt -> sixserving.txt (whitespace - not just indent) - * sevencities.txt -> songof7cities.txt (rename, small text changes) - */ - - git_tree_free(old_tree); - old_tree = new_tree; - new_tree = resolve_commit_oid_to_tree(g_repo, sha2); - - cl_git_pass(git_diff_tree_to_tree( - &diff, g_repo, old_tree, new_tree, &diffopts)); - - /* git diff --no-renames \ - * 1c068dee5790ef1580cfc4cd670915b48d790084 \ - * 19dd32dfb1520a64e5bbaae8dce6ef423dfa2f13 - */ - memset(&exp, 0, sizeof(exp)); - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - - cl_assert_equal_i(6, exp.files); - cl_assert_equal_i(2, exp.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(2, exp.file_status[GIT_DELTA_ADDED]); - cl_assert_equal_i(2, exp.file_status[GIT_DELTA_DELETED]); - git_diff_free(diff); - - /* git diff -M -C \ - * 1c068dee5790ef1580cfc4cd670915b48d790084 \ - * 19dd32dfb1520a64e5bbaae8dce6ef423dfa2f13 - */ - cl_git_pass(git_diff_tree_to_tree( - &diff, g_repo, old_tree, new_tree, &diffopts)); - - opts.flags = GIT_DIFF_FIND_RENAMES | GIT_DIFF_FIND_COPIES; - cl_git_pass(git_diff_find_similar(diff, &opts)); - - memset(&exp, 0, sizeof(exp)); - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - - cl_assert_equal_i(4, exp.files); - cl_assert_equal_i(2, exp.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(2, exp.file_status[GIT_DELTA_RENAMED]); - - git_diff_free(diff); - - /* git diff -M -C --find-copies-harder --break-rewrites \ - * 1c068dee5790ef1580cfc4cd670915b48d790084 \ - * 19dd32dfb1520a64e5bbaae8dce6ef423dfa2f13 - * with libgit2 default similarity comparison... - */ - cl_git_pass(git_diff_tree_to_tree( - &diff, g_repo, old_tree, new_tree, &diffopts)); - - opts.flags = GIT_DIFF_FIND_ALL; - cl_git_pass(git_diff_find_similar(diff, &opts)); - - /* the default match algorithm is going to find the internal - * whitespace differences in the lines of sixserving.txt to be - * significant enough that this will decide to split it into an ADD - * and a DELETE - */ - - memset(&exp, 0, sizeof(exp)); - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - - cl_assert_equal_i(5, exp.files); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_ADDED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(2, exp.file_status[GIT_DELTA_RENAMED]); - - git_diff_free(diff); - - /* git diff -M -C --find-copies-harder --break-rewrites \ - * 1c068dee5790ef1580cfc4cd670915b48d790084 \ - * 19dd32dfb1520a64e5bbaae8dce6ef423dfa2f13 - * with ignore_space whitespace comparision - */ - cl_git_pass(git_diff_tree_to_tree( - &diff, g_repo, old_tree, new_tree, &diffopts)); - - opts.flags = GIT_DIFF_FIND_ALL | GIT_DIFF_FIND_IGNORE_WHITESPACE; - cl_git_pass(git_diff_find_similar(diff, &opts)); - - /* Ignoring whitespace, this should no longer split sixserver.txt */ - - memset(&exp, 0, sizeof(exp)); - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - - cl_assert_equal_i(4, exp.files); - cl_assert_equal_i(2, exp.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(2, exp.file_status[GIT_DELTA_RENAMED]); - - git_diff_free(diff); - - git_tree_free(old_tree); - git_tree_free(new_tree); -} - -void test_diff_rename__test_small_files(void) -{ - git_index *index; - git_reference *head_reference; - git_commit *head_commit; - git_tree *head_tree; - git_tree *commit_tree; - git_signature *signature; - git_diff *diff; - git_oid oid; - const git_diff_delta *delta; - git_diff_options diff_options = GIT_DIFF_OPTIONS_INIT; - git_diff_find_options find_options = GIT_DIFF_FIND_OPTIONS_INIT; - - cl_git_pass(git_repository_index(&index, g_repo)); - - cl_git_mkfile("renames/small.txt", "Hello World!\n"); - cl_git_pass(git_index_add_bypath(index, "small.txt")); - - cl_git_pass(git_repository_head(&head_reference, g_repo)); - cl_git_pass(git_reference_peel((git_object**)&head_commit, head_reference, GIT_OBJ_COMMIT)); - cl_git_pass(git_commit_tree(&head_tree, head_commit)); - cl_git_pass(git_index_write_tree(&oid, index)); - cl_git_pass(git_tree_lookup(&commit_tree, g_repo, &oid)); - cl_git_pass(git_signature_new(&signature, "Rename", "rename@example.com", 1404157834, 0)); - cl_git_pass(git_commit_create(&oid, g_repo, "HEAD", signature, signature, NULL, "Test commit", commit_tree, 1, (const git_commit**)&head_commit)); - - cl_git_mkfile("renames/copy.txt", "Hello World!\n"); - cl_git_rmfile("renames/small.txt"); - - diff_options.flags = GIT_DIFF_INCLUDE_UNTRACKED; - cl_git_pass(git_diff_tree_to_workdir(&diff, g_repo, commit_tree, &diff_options)); - find_options.flags = GIT_DIFF_FIND_RENAMES | GIT_DIFF_FIND_FOR_UNTRACKED; - cl_git_pass(git_diff_find_similar(diff, &find_options)); - - cl_assert_equal_i(git_diff_num_deltas(diff), 1); - delta = git_diff_get_delta(diff, 0); - cl_assert_equal_i(delta->status, GIT_DELTA_RENAMED); - cl_assert_equal_s(delta->old_file.path, "small.txt"); - cl_assert_equal_s(delta->new_file.path, "copy.txt"); - - git_diff_free(diff); - git_signature_free(signature); - git_tree_free(commit_tree); - git_tree_free(head_tree); - git_commit_free(head_commit); - git_reference_free(head_reference); - git_index_free(index); -} - -void test_diff_rename__working_directory_changes(void) -{ - const char *sha0 = "2bc7f351d20b53f1c72c16c4b036e491c478c49a"; - const char *blobsha = "66311f5cfbe7836c27510a3ba2f43e282e2c8bba"; - git_oid id; - git_tree *tree; - git_blob *blob; - git_diff *diff; - git_diff_options diffopts = GIT_DIFF_OPTIONS_INIT; - git_diff_find_options opts = GIT_DIFF_FIND_OPTIONS_INIT; - diff_expects exp; - git_buf old_content = GIT_BUF_INIT, content = GIT_BUF_INIT;; - - tree = resolve_commit_oid_to_tree(g_repo, sha0); - diffopts.flags |= GIT_DIFF_INCLUDE_UNMODIFIED | GIT_DIFF_INCLUDE_UNTRACKED; - - /* - $ git cat-file -p 2bc7f351d20b53f1c72c16c4b036e491c478c49a^{tree} - - 100644 blob 66311f5cfbe7836c27510a3ba2f43e282e2c8bba sevencities.txt - 100644 blob ad0a8e55a104ac54a8a29ed4b84b49e76837a113 sixserving.txt - 100644 blob 66311f5cfbe7836c27510a3ba2f43e282e2c8bba songofseven.txt - - $ for f in *.txt; do - echo `git hash-object -t blob $f` $f - done - - eaf4a3e3bfe68585e90cada20736ace491cd100b ikeepsix.txt - f90d4fc20ecddf21eebe6a37e9225d244339d2b5 sixserving.txt - 4210ffd5c390b21dd5483375e75288dea9ede512 songof7cities.txt - 9a69d960ae94b060f56c2a8702545e2bb1abb935 untimely.txt - */ - - cl_git_pass(git_diff_tree_to_workdir(&diff, g_repo, tree, &diffopts)); - - /* git diff --no-renames 2bc7f351d20b53f1c72c16c4b036e491c478c49a */ - memset(&exp, 0, sizeof(exp)); - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - - cl_assert_equal_i(6, exp.files); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(2, exp.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(3, exp.file_status[GIT_DELTA_UNTRACKED]); - - /* git diff -M 2bc7f351d20b53f1c72c16c4b036e491c478c49a */ - opts.flags = GIT_DIFF_FIND_ALL; - cl_git_pass(git_diff_find_similar(diff, &opts)); - - memset(&exp, 0, sizeof(exp)); - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - - cl_assert_equal_i(5, exp.files); - cl_assert_equal_i(2, exp.file_status[GIT_DELTA_RENAMED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(2, exp.file_status[GIT_DELTA_UNTRACKED]); - - git_diff_free(diff); - - /* rewrite files in the working directory with / without CRLF changes */ - - cl_git_pass( - git_futils_readbuffer(&old_content, "renames/songof7cities.txt")); - cl_git_pass( - git_buf_text_lf_to_crlf(&content, &old_content)); - cl_git_pass( - git_futils_writebuffer(&content, "renames/songof7cities.txt", 0, 0)); - - cl_git_pass(git_diff_tree_to_workdir(&diff, g_repo, tree, &diffopts)); - - /* git diff -M 2bc7f351d20b53f1c72c16c4b036e491c478c49a */ - opts.flags = GIT_DIFF_FIND_ALL; - cl_git_pass(git_diff_find_similar(diff, &opts)); - - memset(&exp, 0, sizeof(exp)); - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - - cl_assert_equal_i(5, exp.files); - cl_assert_equal_i(2, exp.file_status[GIT_DELTA_RENAMED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(2, exp.file_status[GIT_DELTA_UNTRACKED]); - - git_diff_free(diff); - - /* try a different whitespace option */ - - cl_git_pass(git_diff_tree_to_workdir(&diff, g_repo, tree, &diffopts)); - - opts.flags = GIT_DIFF_FIND_ALL | GIT_DIFF_FIND_DONT_IGNORE_WHITESPACE; - opts.rename_threshold = 70; - cl_git_pass(git_diff_find_similar(diff, &opts)); - - memset(&exp, 0, sizeof(exp)); - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - - cl_assert_equal_i(6, exp.files); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_RENAMED]); - cl_assert_equal_i(2, exp.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(3, exp.file_status[GIT_DELTA_UNTRACKED]); - - git_diff_free(diff); - - /* try a different matching option */ - - cl_git_pass(git_diff_tree_to_workdir(&diff, g_repo, tree, &diffopts)); - - opts.flags = GIT_DIFF_FIND_ALL | GIT_DIFF_FIND_EXACT_MATCH_ONLY; - cl_git_pass(git_diff_find_similar(diff, &opts)); - - memset(&exp, 0, sizeof(exp)); - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - - cl_assert_equal_i(6, exp.files); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(3, exp.file_status[GIT_DELTA_UNTRACKED]); - cl_assert_equal_i(2, exp.file_status[GIT_DELTA_DELETED]); - - git_diff_free(diff); - - /* again with exact match blob */ - - cl_git_pass(git_oid_fromstr(&id, blobsha)); - cl_git_pass(git_blob_lookup(&blob, g_repo, &id)); - cl_git_pass(git_buf_set( - &content, git_blob_rawcontent(blob), (size_t)git_blob_rawsize(blob))); - cl_git_rewritefile("renames/songof7cities.txt", content.ptr); - git_blob_free(blob); - - cl_git_pass(git_diff_tree_to_workdir(&diff, g_repo, tree, &diffopts)); - - opts.flags = GIT_DIFF_FIND_ALL | GIT_DIFF_FIND_EXACT_MATCH_ONLY; - cl_git_pass(git_diff_find_similar(diff, &opts)); - - /* - fprintf(stderr, "\n\n"); - diff_print_raw(stderr, diff); - */ - - memset(&exp, 0, sizeof(exp)); - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - - cl_assert_equal_i(5, exp.files); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_RENAMED]); - cl_assert_equal_i(2, exp.file_status[GIT_DELTA_UNTRACKED]); - - git_diff_free(diff); - - git_tree_free(tree); - git_buf_free(&content); - git_buf_free(&old_content); -} - -void test_diff_rename__patch(void) -{ - const char *sha0 = "2bc7f351d20b53f1c72c16c4b036e491c478c49a"; - const char *sha1 = "1c068dee5790ef1580cfc4cd670915b48d790084"; - git_tree *old_tree, *new_tree; - git_diff *diff; - git_diff_options diffopts = GIT_DIFF_OPTIONS_INIT; - git_diff_find_options opts = GIT_DIFF_FIND_OPTIONS_INIT; - git_patch *patch; - const git_diff_delta *delta; - git_buf buf = GIT_BUF_INIT; - const char *expected = "diff --git a/sixserving.txt b/ikeepsix.txt\nindex ad0a8e5..36020db 100644\n--- a/sixserving.txt\n+++ b/ikeepsix.txt\n@@ -1,3 +1,6 @@\n+I Keep Six Honest Serving-Men\n+=============================\n+\n I KEEP six honest serving-men\n (They taught me all I knew);\n Their names are What and Why and When\n@@ -21,4 +24,4 @@ She sends'em abroad on her own affairs,\n One million Hows, two million Wheres,\n And seven million Whys!\n \n- -- Rudyard Kipling\n+ -- Rudyard Kipling\n"; - - old_tree = resolve_commit_oid_to_tree(g_repo, sha0); - new_tree = resolve_commit_oid_to_tree(g_repo, sha1); - - diffopts.flags |= GIT_DIFF_INCLUDE_UNMODIFIED; - cl_git_pass(git_diff_tree_to_tree( - &diff, g_repo, old_tree, new_tree, &diffopts)); - - opts.flags = GIT_DIFF_FIND_RENAMES | GIT_DIFF_FIND_COPIES; - cl_git_pass(git_diff_find_similar(diff, &opts)); - - /* == Changes ===================================================== - * sixserving.txt -> ikeepsix.txt (copy, add title, >80% match) - * sevencities.txt (no change) - * sixserving.txt -> sixserving.txt (indentation change) - * songofseven.txt -> songofseven.txt (major rewrite, <20% match - split) - */ - - cl_assert_equal_i(4, (int)git_diff_num_deltas(diff)); - - cl_git_pass(git_patch_from_diff(&patch, diff, 0)); - cl_assert((delta = git_patch_get_delta(patch)) != NULL); - cl_assert_equal_i(GIT_DELTA_COPIED, (int)delta->status); - - cl_git_pass(git_patch_to_buf(&buf, patch)); - cl_assert_equal_s(expected, buf.ptr); - git_buf_free(&buf); - - git_patch_free(patch); - - cl_assert((delta = git_diff_get_delta(diff, 1)) != NULL); - cl_assert_equal_i(GIT_DELTA_UNMODIFIED, (int)delta->status); - - cl_assert((delta = git_diff_get_delta(diff, 2)) != NULL); - cl_assert_equal_i(GIT_DELTA_MODIFIED, (int)delta->status); - - cl_assert((delta = git_diff_get_delta(diff, 3)) != NULL); - cl_assert_equal_i(GIT_DELTA_MODIFIED, (int)delta->status); - - git_diff_free(diff); - git_tree_free(old_tree); - git_tree_free(new_tree); -} - -void test_diff_rename__file_exchange(void) -{ - git_buf c1 = GIT_BUF_INIT, c2 = GIT_BUF_INIT; - git_index *index; - git_tree *tree; - git_diff *diff; - git_diff_options diffopts = GIT_DIFF_OPTIONS_INIT; - git_diff_find_options opts = GIT_DIFF_FIND_OPTIONS_INIT; - diff_expects exp; - - cl_git_pass(git_futils_readbuffer(&c1, "renames/untimely.txt")); - cl_git_pass(git_futils_readbuffer(&c2, "renames/songof7cities.txt")); - cl_git_pass(git_futils_writebuffer(&c1, "renames/songof7cities.txt", 0, 0)); - cl_git_pass(git_futils_writebuffer(&c2, "renames/untimely.txt", 0, 0)); - - cl_git_pass( - git_revparse_single((git_object **)&tree, g_repo, "HEAD^{tree}")); - - cl_git_pass(git_repository_index(&index, g_repo)); - cl_git_pass(git_index_read_tree(index, tree)); - cl_git_pass(git_index_add_bypath(index, "songof7cities.txt")); - cl_git_pass(git_index_add_bypath(index, "untimely.txt")); - - cl_git_pass(git_diff_tree_to_index(&diff, g_repo, tree, index, &diffopts)); - - memset(&exp, 0, sizeof(exp)); - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - cl_assert_equal_i(2, exp.files); - cl_assert_equal_i(2, exp.file_status[GIT_DELTA_MODIFIED]); - - opts.flags = GIT_DIFF_FIND_ALL; - cl_git_pass(git_diff_find_similar(diff, &opts)); - - memset(&exp, 0, sizeof(exp)); - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - cl_assert_equal_i(2, exp.files); - cl_assert_equal_i(2, exp.file_status[GIT_DELTA_RENAMED]); - - git_diff_free(diff); - git_tree_free(tree); - git_index_free(index); - - git_buf_free(&c1); - git_buf_free(&c2); -} - -void test_diff_rename__file_exchange_three(void) -{ - git_buf c1 = GIT_BUF_INIT, c2 = GIT_BUF_INIT, c3 = GIT_BUF_INIT; - git_index *index; - git_tree *tree; - git_diff *diff; - git_diff_options diffopts = GIT_DIFF_OPTIONS_INIT; - git_diff_find_options opts = GIT_DIFF_FIND_OPTIONS_INIT; - diff_expects exp; - - cl_git_pass(git_futils_readbuffer(&c1, "renames/untimely.txt")); - cl_git_pass(git_futils_readbuffer(&c2, "renames/songof7cities.txt")); - cl_git_pass(git_futils_readbuffer(&c3, "renames/ikeepsix.txt")); - - cl_git_pass(git_futils_writebuffer(&c1, "renames/ikeepsix.txt", 0, 0)); - cl_git_pass(git_futils_writebuffer(&c2, "renames/untimely.txt", 0, 0)); - cl_git_pass(git_futils_writebuffer(&c3, "renames/songof7cities.txt", 0, 0)); - - cl_git_pass( - git_revparse_single((git_object **)&tree, g_repo, "HEAD^{tree}")); - - cl_git_pass(git_repository_index(&index, g_repo)); - cl_git_pass(git_index_read_tree(index, tree)); - cl_git_pass(git_index_add_bypath(index, "songof7cities.txt")); - cl_git_pass(git_index_add_bypath(index, "untimely.txt")); - cl_git_pass(git_index_add_bypath(index, "ikeepsix.txt")); - - cl_git_pass(git_diff_tree_to_index(&diff, g_repo, tree, index, &diffopts)); - - memset(&exp, 0, sizeof(exp)); - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - cl_assert_equal_i(3, exp.files); - cl_assert_equal_i(3, exp.file_status[GIT_DELTA_MODIFIED]); - - opts.flags = GIT_DIFF_FIND_ALL; - cl_git_pass(git_diff_find_similar(diff, &opts)); - - memset(&exp, 0, sizeof(exp)); - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - cl_assert_equal_i(3, exp.files); - cl_assert_equal_i(3, exp.file_status[GIT_DELTA_RENAMED]); - - git_diff_free(diff); - git_tree_free(tree); - git_index_free(index); - - git_buf_free(&c1); - git_buf_free(&c2); - git_buf_free(&c3); -} - -void test_diff_rename__file_partial_exchange(void) -{ - git_buf c1 = GIT_BUF_INIT, c2 = GIT_BUF_INIT; - git_index *index; - git_tree *tree; - git_diff *diff; - git_diff_options diffopts = GIT_DIFF_OPTIONS_INIT; - git_diff_find_options opts = GIT_DIFF_FIND_OPTIONS_INIT; - diff_expects exp; - int i; - - cl_git_pass(git_futils_readbuffer(&c1, "renames/untimely.txt")); - cl_git_pass(git_futils_writebuffer(&c1, "renames/songof7cities.txt", 0, 0)); - for (i = 0; i < 100; ++i) - cl_git_pass(git_buf_puts(&c2, "this is not the content you are looking for\n")); - cl_git_pass(git_futils_writebuffer(&c2, "renames/untimely.txt", 0, 0)); - - cl_git_pass( - git_revparse_single((git_object **)&tree, g_repo, "HEAD^{tree}")); - - cl_git_pass(git_repository_index(&index, g_repo)); - cl_git_pass(git_index_read_tree(index, tree)); - cl_git_pass(git_index_add_bypath(index, "songof7cities.txt")); - cl_git_pass(git_index_add_bypath(index, "untimely.txt")); - - cl_git_pass(git_diff_tree_to_index(&diff, g_repo, tree, index, &diffopts)); - - memset(&exp, 0, sizeof(exp)); - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - cl_assert_equal_i(2, exp.files); - cl_assert_equal_i(2, exp.file_status[GIT_DELTA_MODIFIED]); - - opts.flags = GIT_DIFF_FIND_ALL; - cl_git_pass(git_diff_find_similar(diff, &opts)); - - memset(&exp, 0, sizeof(exp)); - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - cl_assert_equal_i(3, exp.files); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_RENAMED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_ADDED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_DELETED]); - - git_diff_free(diff); - git_tree_free(tree); - git_index_free(index); - - git_buf_free(&c1); - git_buf_free(&c2); -} - -void test_diff_rename__rename_and_copy_from_same_source(void) -{ - git_buf c1 = GIT_BUF_INIT, c2 = GIT_BUF_INIT; - git_index *index; - git_tree *tree; - git_diff *diff; - git_diff_options diffopts = GIT_DIFF_OPTIONS_INIT; - git_diff_find_options opts = GIT_DIFF_FIND_OPTIONS_INIT; - diff_expects exp; - - /* put the first 2/3 of file into one new place - * and the second 2/3 of file into another new place - */ - cl_git_pass(git_futils_readbuffer(&c1, "renames/songof7cities.txt")); - cl_git_pass(git_buf_set(&c2, c1.ptr, c1.size)); - git_buf_truncate(&c1, c1.size * 2 / 3); - git_buf_consume(&c2, ((char *)c2.ptr) + (c2.size / 3)); - cl_git_pass(git_futils_writebuffer(&c1, "renames/song_a.txt", 0, 0)); - cl_git_pass(git_futils_writebuffer(&c2, "renames/song_b.txt", 0, 0)); - - cl_git_pass( - git_revparse_single((git_object **)&tree, g_repo, "HEAD^{tree}")); - - cl_git_pass(git_repository_index(&index, g_repo)); - cl_git_pass(git_index_read_tree(index, tree)); - cl_git_pass(git_index_add_bypath(index, "song_a.txt")); - cl_git_pass(git_index_add_bypath(index, "song_b.txt")); - - diffopts.flags = GIT_DIFF_INCLUDE_UNMODIFIED; - - cl_git_pass(git_diff_tree_to_index(&diff, g_repo, tree, index, &diffopts)); - - memset(&exp, 0, sizeof(exp)); - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - cl_assert_equal_i(6, exp.files); - cl_assert_equal_i(2, exp.file_status[GIT_DELTA_ADDED]); - cl_assert_equal_i(4, exp.file_status[GIT_DELTA_UNMODIFIED]); - - opts.flags = GIT_DIFF_FIND_ALL; - cl_git_pass(git_diff_find_similar(diff, &opts)); - - memset(&exp, 0, sizeof(exp)); - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - cl_assert_equal_i(6, exp.files); - cl_assert_equal_i(2, exp.file_status[GIT_DELTA_COPIED]); - cl_assert_equal_i(4, exp.file_status[GIT_DELTA_UNMODIFIED]); - - git_diff_free(diff); - git_tree_free(tree); - git_index_free(index); - - git_buf_free(&c1); - git_buf_free(&c2); -} - -void test_diff_rename__from_deleted_to_split(void) -{ - git_buf c1 = GIT_BUF_INIT; - git_index *index; - git_tree *tree; - git_diff *diff; - git_diff_options diffopts = GIT_DIFF_OPTIONS_INIT; - git_diff_find_options opts = GIT_DIFF_FIND_OPTIONS_INIT; - diff_expects exp; - - /* old file is missing, new file is actually old file renamed */ - - cl_git_pass(git_futils_readbuffer(&c1, "renames/songof7cities.txt")); - cl_git_pass(git_futils_writebuffer(&c1, "renames/untimely.txt", 0, 0)); - - cl_git_pass( - git_revparse_single((git_object **)&tree, g_repo, "HEAD^{tree}")); - - cl_git_pass(git_repository_index(&index, g_repo)); - cl_git_pass(git_index_read_tree(index, tree)); - cl_git_pass(git_index_remove_bypath(index, "songof7cities.txt")); - cl_git_pass(git_index_add_bypath(index, "untimely.txt")); - - diffopts.flags = GIT_DIFF_INCLUDE_UNMODIFIED; - - cl_git_pass(git_diff_tree_to_index(&diff, g_repo, tree, index, &diffopts)); - - memset(&exp, 0, sizeof(exp)); - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - cl_assert_equal_i(4, exp.files); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(2, exp.file_status[GIT_DELTA_UNMODIFIED]); - - opts.flags = GIT_DIFF_FIND_ALL; - cl_git_pass(git_diff_find_similar(diff, &opts)); - - memset(&exp, 0, sizeof(exp)); - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - cl_assert_equal_i(4, exp.files); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_RENAMED]); - cl_assert_equal_i(2, exp.file_status[GIT_DELTA_UNMODIFIED]); - - git_diff_free(diff); - git_tree_free(tree); - git_index_free(index); - - git_buf_free(&c1); -} - -struct rename_expected -{ - size_t len; - - unsigned int *status; - const char **sources; - const char **targets; - - size_t idx; -}; - -int test_names_expected(const git_diff_delta *delta, float progress, void *p) -{ - struct rename_expected *expected = p; - - GIT_UNUSED(progress); - - cl_assert(expected->idx < expected->len); - - cl_assert_equal_i(delta->status, expected->status[expected->idx]); - - cl_assert(git__strcmp(expected->sources[expected->idx], - delta->old_file.path) == 0); - cl_assert(git__strcmp(expected->targets[expected->idx], - delta->new_file.path) == 0); - - expected->idx++; - - return 0; -} - -void test_diff_rename__rejected_match_can_match_others(void) -{ - git_reference *head, *selfsimilar; - git_index *index; - git_tree *tree; - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - git_diff *diff; - git_diff_options diffopts = GIT_DIFF_OPTIONS_INIT; - git_diff_find_options findopts = GIT_DIFF_FIND_OPTIONS_INIT; - git_buf one = GIT_BUF_INIT, two = GIT_BUF_INIT; - unsigned int status[] = { GIT_DELTA_RENAMED, GIT_DELTA_RENAMED }; - const char *sources[] = { "Class1.cs", "Class2.cs" }; - const char *targets[] = { "ClassA.cs", "ClassB.cs" }; - struct rename_expected expect = { 2, status, sources, targets }; - char *ptr; - - opts.checkout_strategy = GIT_CHECKOUT_FORCE; - findopts.flags = GIT_DIFF_FIND_RENAMES; - - cl_git_pass(git_reference_lookup(&head, g_repo, "HEAD")); - cl_git_pass(git_reference_symbolic_set_target( - &selfsimilar, head, "refs/heads/renames_similar", NULL)); - cl_git_pass(git_checkout_head(g_repo, &opts)); - cl_git_pass(git_repository_index(&index, g_repo)); - - cl_git_pass(git_futils_readbuffer(&one, "renames/Class1.cs")); - cl_git_pass(git_futils_readbuffer(&two, "renames/Class2.cs")); - - cl_git_pass(p_unlink("renames/Class1.cs")); - cl_git_pass(p_unlink("renames/Class2.cs")); - - cl_git_pass(git_index_remove_bypath(index, "Class1.cs")); - cl_git_pass(git_index_remove_bypath(index, "Class2.cs")); - - cl_assert(ptr = strstr(one.ptr, "Class1")); - ptr[5] = 'A'; - - cl_assert(ptr = strstr(two.ptr, "Class2")); - ptr[5] = 'B'; - - cl_git_pass( - git_futils_writebuffer(&one, "renames/ClassA.cs", O_RDWR|O_CREAT, 0777)); - cl_git_pass( - git_futils_writebuffer(&two, "renames/ClassB.cs", O_RDWR|O_CREAT, 0777)); - - cl_git_pass(git_index_add_bypath(index, "ClassA.cs")); - cl_git_pass(git_index_add_bypath(index, "ClassB.cs")); - - cl_git_pass(git_index_write(index)); - - cl_git_pass( - git_revparse_single((git_object **)&tree, g_repo, "HEAD^{tree}")); - - cl_git_pass( - git_diff_tree_to_index(&diff, g_repo, tree, index, &diffopts)); - - cl_git_pass(git_diff_find_similar(diff, &findopts)); - - cl_git_pass(git_diff_foreach( - diff, test_names_expected, NULL, NULL, NULL, &expect)); - - git_diff_free(diff); - git_tree_free(tree); - git_index_free(index); - git_reference_free(head); - git_reference_free(selfsimilar); - git_buf_free(&one); - git_buf_free(&two); -} - -static void write_similarity_file_two(const char *filename, size_t b_lines) -{ - git_buf contents = GIT_BUF_INIT; - size_t i; - - for (i = 0; i < b_lines; i++) - git_buf_printf(&contents, "%02d - bbbbb\r\n", (int)(i+1)); - - for (i = b_lines; i < 50; i++) - git_buf_printf(&contents, "%02d - aaaaa%s", (int)(i+1), (i == 49 ? "" : "\r\n")); - - cl_git_pass( - git_futils_writebuffer(&contents, filename, O_RDWR|O_CREAT, 0777)); - - git_buf_free(&contents); -} - -void test_diff_rename__rejected_match_can_match_others_two(void) -{ - git_reference *head, *selfsimilar; - git_index *index; - git_tree *tree; - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - git_diff *diff; - git_diff_options diffopts = GIT_DIFF_OPTIONS_INIT; - git_diff_find_options findopts = GIT_DIFF_FIND_OPTIONS_INIT; - unsigned int status[] = { GIT_DELTA_RENAMED, GIT_DELTA_RENAMED }; - const char *sources[] = { "a.txt", "b.txt" }; - const char *targets[] = { "c.txt", "d.txt" }; - struct rename_expected expect = { 2, status, sources, targets }; - - opts.checkout_strategy = GIT_CHECKOUT_FORCE; - findopts.flags = GIT_DIFF_FIND_RENAMES; - - cl_git_pass(git_reference_lookup(&head, g_repo, "HEAD")); - cl_git_pass(git_reference_symbolic_set_target( - &selfsimilar, head, "refs/heads/renames_similar_two", NULL)); - cl_git_pass(git_checkout_head(g_repo, &opts)); - cl_git_pass(git_repository_index(&index, g_repo)); - - cl_git_pass(p_unlink("renames/a.txt")); - cl_git_pass(p_unlink("renames/b.txt")); - - cl_git_pass(git_index_remove_bypath(index, "a.txt")); - cl_git_pass(git_index_remove_bypath(index, "b.txt")); - - write_similarity_file_two("renames/c.txt", 7); - write_similarity_file_two("renames/d.txt", 8); - - cl_git_pass(git_index_add_bypath(index, "c.txt")); - cl_git_pass(git_index_add_bypath(index, "d.txt")); - - cl_git_pass(git_index_write(index)); - - cl_git_pass( - git_revparse_single((git_object **)&tree, g_repo, "HEAD^{tree}")); - - cl_git_pass( - git_diff_tree_to_index(&diff, g_repo, tree, index, &diffopts)); - - cl_git_pass(git_diff_find_similar(diff, &findopts)); - - cl_git_pass(git_diff_foreach( - diff, test_names_expected, NULL, NULL, NULL, &expect)); - cl_assert(expect.idx > 0); - - git_diff_free(diff); - git_tree_free(tree); - git_index_free(index); - git_reference_free(head); - git_reference_free(selfsimilar); -} - -void test_diff_rename__rejected_match_can_match_others_three(void) -{ - git_reference *head, *selfsimilar; - git_index *index; - git_tree *tree; - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - git_diff *diff; - git_diff_options diffopts = GIT_DIFF_OPTIONS_INIT; - git_diff_find_options findopts = GIT_DIFF_FIND_OPTIONS_INIT; - - /* Both cannot be renames from a.txt */ - unsigned int status[] = { GIT_DELTA_ADDED, GIT_DELTA_RENAMED }; - const char *sources[] = { "0001.txt", "a.txt" }; - const char *targets[] = { "0001.txt", "0002.txt" }; - struct rename_expected expect = { 2, status, sources, targets }; - - opts.checkout_strategy = GIT_CHECKOUT_FORCE; - findopts.flags = GIT_DIFF_FIND_RENAMES; - - cl_git_pass(git_reference_lookup(&head, g_repo, "HEAD")); - cl_git_pass(git_reference_symbolic_set_target( - &selfsimilar, head, "refs/heads/renames_similar_two", NULL)); - cl_git_pass(git_checkout_head(g_repo, &opts)); - cl_git_pass(git_repository_index(&index, g_repo)); - - cl_git_pass(p_unlink("renames/a.txt")); - - cl_git_pass(git_index_remove_bypath(index, "a.txt")); - - write_similarity_file_two("renames/0001.txt", 7); - write_similarity_file_two("renames/0002.txt", 0); - - cl_git_pass(git_index_add_bypath(index, "0001.txt")); - cl_git_pass(git_index_add_bypath(index, "0002.txt")); - - cl_git_pass(git_index_write(index)); - - cl_git_pass( - git_revparse_single((git_object **)&tree, g_repo, "HEAD^{tree}")); - - cl_git_pass( - git_diff_tree_to_index(&diff, g_repo, tree, index, &diffopts)); - - cl_git_pass(git_diff_find_similar(diff, &findopts)); - - cl_git_pass(git_diff_foreach( - diff, test_names_expected, NULL, NULL, NULL, &expect)); - - cl_assert(expect.idx == expect.len); - - git_diff_free(diff); - git_tree_free(tree); - git_index_free(index); - git_reference_free(head); - git_reference_free(selfsimilar); -} - -void test_diff_rename__can_rename_from_rewrite(void) -{ - git_index *index; - git_tree *tree; - git_diff *diff; - git_diff_options diffopts = GIT_DIFF_OPTIONS_INIT; - git_diff_find_options findopts = GIT_DIFF_FIND_OPTIONS_INIT; - - unsigned int status[] = { GIT_DELTA_RENAMED, GIT_DELTA_RENAMED }; - const char *sources[] = { "ikeepsix.txt", "songof7cities.txt" }; - const char *targets[] = { "songof7cities.txt", "this-is-a-rename.txt" }; - struct rename_expected expect = { 2, status, sources, targets }; - - cl_git_pass(git_repository_index(&index, g_repo)); - - cl_git_pass(p_rename("renames/songof7cities.txt", "renames/this-is-a-rename.txt")); - cl_git_pass(p_rename("renames/ikeepsix.txt", "renames/songof7cities.txt")); - - cl_git_pass(git_index_remove_bypath(index, "ikeepsix.txt")); - - cl_git_pass(git_index_add_bypath(index, "songof7cities.txt")); - cl_git_pass(git_index_add_bypath(index, "this-is-a-rename.txt")); - - cl_git_pass(git_index_write(index)); - - cl_git_pass( - git_revparse_single((git_object **)&tree, g_repo, "HEAD^{tree}")); - - cl_git_pass( - git_diff_tree_to_index(&diff, g_repo, tree, index, &diffopts)); - - findopts.flags |= GIT_DIFF_FIND_AND_BREAK_REWRITES | - GIT_DIFF_FIND_REWRITES | - GIT_DIFF_FIND_RENAMES_FROM_REWRITES; - - cl_git_pass(git_diff_find_similar(diff, &findopts)); - - cl_git_pass(git_diff_foreach( - diff, test_names_expected, NULL, NULL, NULL, &expect)); - - cl_assert(expect.idx == expect.len); - - git_diff_free(diff); - git_tree_free(tree); - git_index_free(index); -} - -void test_diff_rename__case_changes_are_split(void) -{ - git_index *index; - git_tree *tree; - git_diff *diff = NULL; - diff_expects exp; - git_diff_find_options opts = GIT_DIFF_FIND_OPTIONS_INIT; - - cl_git_pass(git_repository_index(&index, g_repo)); - - cl_git_pass( - git_revparse_single((git_object **)&tree, g_repo, "HEAD^{tree}")); - - cl_git_pass(p_rename("renames/ikeepsix.txt", "renames/IKEEPSIX.txt")); - - cl_git_pass(git_index_remove_bypath(index, "ikeepsix.txt")); - cl_git_pass(git_index_add_bypath(index, "IKEEPSIX.txt")); - cl_git_pass(git_index_write(index)); - - cl_git_pass(git_diff_tree_to_index(&diff, g_repo, tree, index, NULL)); - - memset(&exp, 0, sizeof(exp)); - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - cl_assert_equal_i(2, exp.files); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_ADDED]); - - opts.flags = GIT_DIFF_FIND_ALL; - cl_git_pass(git_diff_find_similar(diff, &opts)); - - memset(&exp, 0, sizeof(exp)); - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - cl_assert_equal_i(1, exp.files); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_RENAMED]); - - git_diff_free(diff); - git_index_free(index); - git_tree_free(tree); -} - -void test_diff_rename__unmodified_can_be_renamed(void) -{ - git_index *index; - git_tree *tree; - git_diff *diff = NULL; - diff_expects exp; - git_diff_options diffopts = GIT_DIFF_OPTIONS_INIT; - git_diff_find_options opts = GIT_DIFF_FIND_OPTIONS_INIT; - - cl_git_pass(git_repository_index(&index, g_repo)); - cl_git_pass( - git_revparse_single((git_object **)&tree, g_repo, "HEAD^{tree}")); - - cl_git_pass(p_rename("renames/ikeepsix.txt", "renames/ikeepsix2.txt")); - - cl_git_pass(git_index_remove_bypath(index, "ikeepsix.txt")); - cl_git_pass(git_index_add_bypath(index, "ikeepsix2.txt")); - cl_git_pass(git_index_write(index)); - - cl_git_pass(git_diff_tree_to_index(&diff, g_repo, tree, index, &diffopts)); - - memset(&exp, 0, sizeof(exp)); - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - cl_assert_equal_i(2, exp.files); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_ADDED]); - - opts.flags = GIT_DIFF_FIND_ALL; - cl_git_pass(git_diff_find_similar(diff, &opts)); - - memset(&exp, 0, sizeof(exp)); - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - cl_assert_equal_i(1, exp.files); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_RENAMED]); - - memset(&exp, 0, sizeof(exp)); - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - cl_assert_equal_i(1, exp.files); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_RENAMED]); - - git_diff_free(diff); - git_index_free(index); - git_tree_free(tree); -} - -void test_diff_rename__rewrite_on_single_file(void) -{ - git_index *index; - git_diff *diff = NULL; - diff_expects exp; - git_diff_options diffopts = GIT_DIFF_OPTIONS_INIT; - git_diff_find_options findopts = GIT_DIFF_FIND_OPTIONS_INIT; - - diffopts.flags = GIT_DIFF_INCLUDE_UNTRACKED; - - findopts.flags = GIT_DIFF_FIND_FOR_UNTRACKED | - GIT_DIFF_FIND_AND_BREAK_REWRITES | - GIT_DIFF_FIND_RENAMES_FROM_REWRITES; - - cl_git_pass(git_repository_index(&index, g_repo)); - - cl_git_rewritefile("renames/ikeepsix.txt", - "This is enough content for the file to be rewritten.\n" \ - "This is enough content for the file to be rewritten.\n" \ - "This is enough content for the file to be rewritten.\n" \ - "This is enough content for the file to be rewritten.\n" \ - "This is enough content for the file to be rewritten.\n" \ - "This is enough content for the file to be rewritten.\n" \ - "This is enough content for the file to be rewritten.\n" \ - "This is enough content for the file to be rewritten.\n" \ - "This is enough content for the file to be rewritten.\n" \ - "This is enough content for the file to be rewritten.\n" \ - "This is enough content for the file to be rewritten.\n" \ - "This is enough content for the file to be rewritten.\n" \ - "This is enough content for the file to be rewritten.\n" \ - "This is enough content for the file to be rewritten.\n" \ - "This is enough content for the file to be rewritten.\n" \ - "This is enough content for the file to be rewritten.\n"); - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, index, &diffopts)); - cl_git_pass(git_diff_find_similar(diff, &findopts)); - - memset(&exp, 0, sizeof(exp)); - - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - cl_assert_equal_i(2, exp.files); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_UNTRACKED]); - - git_diff_free(diff); - git_index_free(index); -} - -void test_diff_rename__can_find_copy_to_split(void) -{ - git_buf c1 = GIT_BUF_INIT; - git_index *index; - git_tree *tree; - git_diff *diff; - git_diff_options diffopts = GIT_DIFF_OPTIONS_INIT; - git_diff_find_options opts = GIT_DIFF_FIND_OPTIONS_INIT; - diff_expects exp; - - cl_git_pass(git_futils_readbuffer(&c1, "renames/songof7cities.txt")); - cl_git_pass(git_futils_writebuffer(&c1, "renames/untimely.txt", 0, 0)); - - cl_git_pass( - git_revparse_single((git_object **)&tree, g_repo, "HEAD^{tree}")); - - cl_git_pass(git_repository_index(&index, g_repo)); - cl_git_pass(git_index_read_tree(index, tree)); - cl_git_pass(git_index_add_bypath(index, "untimely.txt")); - - diffopts.flags = GIT_DIFF_INCLUDE_UNMODIFIED; - - cl_git_pass(git_diff_tree_to_index(&diff, g_repo, tree, index, &diffopts)); - - memset(&exp, 0, sizeof(exp)); - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - cl_assert_equal_i(4, exp.files); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(3, exp.file_status[GIT_DELTA_UNMODIFIED]); - - opts.flags = GIT_DIFF_FIND_ALL; - cl_git_pass(git_diff_find_similar(diff, &opts)); - - memset(&exp, 0, sizeof(exp)); - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - cl_assert_equal_i(5, exp.files); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_COPIED]); - cl_assert_equal_i(3, exp.file_status[GIT_DELTA_UNMODIFIED]); - - git_diff_free(diff); - git_tree_free(tree); - git_index_free(index); - - git_buf_free(&c1); -} - -void test_diff_rename__can_delete_unmodified_deltas(void) -{ - git_buf c1 = GIT_BUF_INIT; - git_index *index; - git_tree *tree; - git_diff *diff; - git_diff_options diffopts = GIT_DIFF_OPTIONS_INIT; - git_diff_find_options opts = GIT_DIFF_FIND_OPTIONS_INIT; - diff_expects exp; - - cl_git_pass(git_futils_readbuffer(&c1, "renames/songof7cities.txt")); - cl_git_pass(git_futils_writebuffer(&c1, "renames/untimely.txt", 0, 0)); - - cl_git_pass( - git_revparse_single((git_object **)&tree, g_repo, "HEAD^{tree}")); - - cl_git_pass(git_repository_index(&index, g_repo)); - cl_git_pass(git_index_read_tree(index, tree)); - cl_git_pass(git_index_add_bypath(index, "untimely.txt")); - - diffopts.flags = GIT_DIFF_INCLUDE_UNMODIFIED; - - cl_git_pass(git_diff_tree_to_index(&diff, g_repo, tree, index, &diffopts)); - - memset(&exp, 0, sizeof(exp)); - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - cl_assert_equal_i(4, exp.files); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(3, exp.file_status[GIT_DELTA_UNMODIFIED]); - - opts.flags = GIT_DIFF_FIND_ALL | GIT_DIFF_FIND_REMOVE_UNMODIFIED; - cl_git_pass(git_diff_find_similar(diff, &opts)); - - memset(&exp, 0, sizeof(exp)); - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - cl_assert_equal_i(2, exp.files); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_COPIED]); - - git_diff_free(diff); - git_tree_free(tree); - git_index_free(index); - - git_buf_free(&c1); -} - -void test_diff_rename__matches_config_behavior(void) -{ - const char *sha0 = "31e47d8c1fa36d7f8d537b96158e3f024de0a9f2"; - const char *sha1 = "2bc7f351d20b53f1c72c16c4b036e491c478c49a"; - const char *sha2 = "1c068dee5790ef1580cfc4cd670915b48d790084"; - - git_tree *tree0, *tree1, *tree2; - git_config *cfg; - git_diff *diff; - git_diff_options diffopts = GIT_DIFF_OPTIONS_INIT; - git_diff_find_options opts = GIT_DIFF_FIND_OPTIONS_INIT; - diff_expects exp; - - opts.flags = GIT_DIFF_FIND_BY_CONFIG; - tree0 = resolve_commit_oid_to_tree(g_repo, sha0); - tree1 = resolve_commit_oid_to_tree(g_repo, sha1); - tree2 = resolve_commit_oid_to_tree(g_repo, sha2); - - diffopts.flags |= GIT_DIFF_INCLUDE_UNMODIFIED; - cl_git_pass(git_repository_config(&cfg, g_repo)); - - /* diff.renames = false; no rename detection should happen */ - cl_git_pass(git_config_set_bool(cfg, "diff.renames", false)); - cl_git_pass(git_diff_tree_to_tree( - &diff, g_repo, tree0, tree1, &diffopts)); - memset(&exp, 0, sizeof(exp)); - cl_git_pass(git_diff_find_similar(diff, &opts)); - cl_git_pass(git_diff_foreach(diff, - diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - cl_assert_equal_i(4, exp.files); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_UNMODIFIED]); - cl_assert_equal_i(2, exp.file_status[GIT_DELTA_ADDED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_DELETED]); - git_diff_free(diff); - - /* diff.renames = true; should act like -M */ - cl_git_pass(git_config_set_bool(cfg, "diff.renames", true)); - cl_git_pass(git_diff_tree_to_tree( - &diff, g_repo, tree0, tree1, &diffopts)); - memset(&exp, 0, sizeof(exp)); - cl_git_pass(git_diff_find_similar(diff, &opts)); - cl_git_pass(git_diff_foreach(diff, - diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - cl_assert_equal_i(3, exp.files); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_UNMODIFIED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_ADDED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_RENAMED]); - git_diff_free(diff); - - /* diff.renames = copies; should act like -M -C */ - cl_git_pass(git_config_set_string(cfg, "diff.renames", "copies")); - cl_git_pass(git_diff_tree_to_tree( - &diff, g_repo, tree1, tree2, &diffopts)); - memset(&exp, 0, sizeof(exp)); - cl_git_pass(git_diff_find_similar(diff, &opts)); - cl_git_pass(git_diff_foreach(diff, - diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - cl_assert_equal_i(4, exp.files); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_UNMODIFIED]); - cl_assert_equal_i(2, exp.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_COPIED]); - git_diff_free(diff); - - /* NULL find options is the same as GIT_DIFF_FIND_BY_CONFIG */ - cl_git_pass(git_diff_tree_to_tree( - &diff, g_repo, tree1, tree2, &diffopts)); - memset(&exp, 0, sizeof(exp)); - cl_git_pass(git_diff_find_similar(diff, NULL)); - cl_git_pass(git_diff_foreach(diff, - diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - cl_assert_equal_i(4, exp.files); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_UNMODIFIED]); - cl_assert_equal_i(2, exp.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_COPIED]); - git_diff_free(diff); - - /* Cleanup */ - git_tree_free(tree0); - git_tree_free(tree1); - git_tree_free(tree2); - git_config_free(cfg); -} - -void test_diff_rename__can_override_thresholds_when_obeying_config(void) -{ - const char *sha1 = "2bc7f351d20b53f1c72c16c4b036e491c478c49a"; - const char *sha2 = "1c068dee5790ef1580cfc4cd670915b48d790084"; - - git_tree *tree1, *tree2; - git_config *cfg; - git_diff *diff; - git_diff_options diffopts = GIT_DIFF_OPTIONS_INIT; - git_diff_find_options opts = GIT_DIFF_FIND_OPTIONS_INIT; - diff_expects exp; - - tree1 = resolve_commit_oid_to_tree(g_repo, sha1); - tree2 = resolve_commit_oid_to_tree(g_repo, sha2); - - diffopts.flags |= GIT_DIFF_INCLUDE_UNMODIFIED; - opts.flags = GIT_DIFF_FIND_BY_CONFIG; - - cl_git_pass(git_repository_config(&cfg, g_repo)); - cl_git_pass(git_config_set_string(cfg, "diff.renames", "copies")); - git_config_free(cfg); - - /* copy threshold = 96%, should see creation of ikeepsix.txt */ - opts.copy_threshold = 96; - cl_git_pass(git_diff_tree_to_tree( - &diff, g_repo, tree1, tree2, &diffopts)); - memset(&exp, 0, sizeof(exp)); - cl_git_pass(git_diff_find_similar(diff, &opts)); - cl_git_pass(git_diff_foreach(diff, - diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - cl_assert_equal_i(4, exp.files); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_UNMODIFIED]); - cl_assert_equal_i(2, exp.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_ADDED]); - git_diff_free(diff); - - /* copy threshold = 20%, should see sixserving.txt => ikeepsix.txt */ - opts.copy_threshold = 20; - cl_git_pass(git_diff_tree_to_tree( - &diff, g_repo, tree1, tree2, &diffopts)); - memset(&exp, 0, sizeof(exp)); - cl_git_pass(git_diff_find_similar(diff, &opts)); - cl_git_pass(git_diff_foreach(diff, - diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - cl_assert_equal_i(4, exp.files); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_UNMODIFIED]); - cl_assert_equal_i(2, exp.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_COPIED]); - git_diff_free(diff); - - /* Cleanup */ - git_tree_free(tree1); - git_tree_free(tree2); -} - -void test_diff_rename__by_config_doesnt_mess_with_whitespace_settings(void) -{ - const char *sha1 = "1c068dee5790ef1580cfc4cd670915b48d790084"; - const char *sha2 = "19dd32dfb1520a64e5bbaae8dce6ef423dfa2f13"; - - git_tree *tree1, *tree2; - git_config *cfg; - git_diff *diff; - git_diff_options diffopts = GIT_DIFF_OPTIONS_INIT; - git_diff_find_options opts = GIT_DIFF_FIND_OPTIONS_INIT; - diff_expects exp; - - tree1 = resolve_commit_oid_to_tree(g_repo, sha1); - tree2 = resolve_commit_oid_to_tree(g_repo, sha2); - - diffopts.flags |= GIT_DIFF_INCLUDE_UNMODIFIED; - opts.flags = GIT_DIFF_FIND_BY_CONFIG; - - cl_git_pass(git_repository_config(&cfg, g_repo)); - cl_git_pass(git_config_set_string(cfg, "diff.renames", "copies")); - git_config_free(cfg); - - /* Don't ignore whitespace; this should find a change in sixserving.txt */ - opts.flags |= 0 | GIT_DIFF_FIND_DONT_IGNORE_WHITESPACE; - cl_git_pass(git_diff_tree_to_tree( - &diff, g_repo, tree1, tree2, &diffopts)); - memset(&exp, 0, sizeof(exp)); - cl_git_pass(git_diff_find_similar(diff, &opts)); - cl_git_pass(git_diff_foreach(diff, - diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - cl_assert_equal_i(5, exp.files); - cl_assert_equal_i(2, exp.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_RENAMED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_ADDED]); - git_diff_free(diff); - - /* Cleanup */ - git_tree_free(tree1); - git_tree_free(tree2); -} - -static void expect_files_renamed(const char *one, const char *two, uint32_t whitespace_flags) -{ - git_index *index; - git_diff *diff = NULL; - diff_expects exp; - git_diff_options diffopts = GIT_DIFF_OPTIONS_INIT; - git_diff_find_options findopts = GIT_DIFF_FIND_OPTIONS_INIT; - - diffopts.flags = GIT_DIFF_INCLUDE_UNTRACKED; - findopts.flags = GIT_DIFF_FIND_FOR_UNTRACKED | - GIT_DIFF_FIND_AND_BREAK_REWRITES | - GIT_DIFF_FIND_RENAMES_FROM_REWRITES | - whitespace_flags; - - cl_git_pass(git_repository_index(&index, g_repo)); - - cl_git_rewritefile("renames/ikeepsix.txt", one); - cl_git_pass(git_index_add_bypath(index, "ikeepsix.txt")); - - cl_git_rmfile("renames/ikeepsix.txt"); - cl_git_rewritefile("renames/ikeepsix2.txt", two); - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, index, &diffopts)); - cl_git_pass(git_diff_find_similar(diff, &findopts)); - - memset(&exp, 0, sizeof(exp)); - - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - cl_assert_equal_i(1, exp.files); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_RENAMED]); - - git_diff_free(diff); - git_index_free(index); -} - -/* test some variations on empty and blank files */ -void test_diff_rename__empty_files_renamed(void) -{ - /* empty files are identical when ignoring whitespace or not */ - expect_files_renamed("", "", GIT_DIFF_FIND_DONT_IGNORE_WHITESPACE); - expect_files_renamed("", "", GIT_DIFF_FIND_IGNORE_WHITESPACE); -} - -/* test that blank files are similar when ignoring whitespace */ -void test_diff_rename__blank_files_renamed_when_ignoring_whitespace(void) -{ - expect_files_renamed("", "\n\n", GIT_DIFF_FIND_IGNORE_WHITESPACE); - expect_files_renamed("", "\r\n\r\n", GIT_DIFF_FIND_IGNORE_WHITESPACE); - expect_files_renamed("\r\n\r\n", "\n\n\n", GIT_DIFF_FIND_IGNORE_WHITESPACE); - - expect_files_renamed(" ", "\n\n", GIT_DIFF_FIND_IGNORE_WHITESPACE); - expect_files_renamed(" \n \n", "\n\n", GIT_DIFF_FIND_IGNORE_WHITESPACE); -} - -/* blank files are not similar when whitespace is not ignored */ -static void expect_files_not_renamed(const char *one, const char *two, uint32_t whitespace_flags) -{ - git_index *index; - git_diff *diff = NULL; - diff_expects exp; - git_diff_options diffopts = GIT_DIFF_OPTIONS_INIT; - git_diff_find_options findopts = GIT_DIFF_FIND_OPTIONS_INIT; - - diffopts.flags = GIT_DIFF_INCLUDE_UNTRACKED; - - findopts.flags = GIT_DIFF_FIND_FOR_UNTRACKED | - whitespace_flags; - - cl_git_pass(git_repository_index(&index, g_repo)); - - cl_git_rewritefile("renames/ikeepsix.txt", one); - cl_git_pass(git_index_add_bypath(index, "ikeepsix.txt")); - - cl_git_rmfile("renames/ikeepsix.txt"); - cl_git_rewritefile("renames/ikeepsix2.txt", two); - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, index, &diffopts)); - cl_git_pass(git_diff_find_similar(diff, &findopts)); - - memset(&exp, 0, sizeof(exp)); - - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - cl_assert_equal_i(2, exp.files); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_UNTRACKED]); - - git_diff_free(diff); - git_index_free(index); -} - -/* test that blank files are similar when ignoring renames */ -void test_diff_rename__blank_files_not_renamed_when_not_ignoring_whitespace(void) -{ - expect_files_not_renamed("", "\r\n\r\n\r\n", GIT_DIFF_FIND_DONT_IGNORE_WHITESPACE); - expect_files_not_renamed("", "\n\n\n\n", GIT_DIFF_FIND_DONT_IGNORE_WHITESPACE); - expect_files_not_renamed("\n\n\n\n", "\r\n\r\n\r\n", GIT_DIFF_FIND_DONT_IGNORE_WHITESPACE); -} diff --git a/vendor/libgit2/tests/diff/stats.c b/vendor/libgit2/tests/diff/stats.c deleted file mode 100644 index f731997da..000000000 --- a/vendor/libgit2/tests/diff/stats.c +++ /dev/null @@ -1,289 +0,0 @@ -#include "clar.h" -#include "clar_libgit2.h" - -#include "buffer.h" -#include "commit.h" -#include "diff.h" - -static git_repository *_repo; -static git_diff_stats *_stats; - -void test_diff_stats__initialize(void) -{ - _repo = cl_git_sandbox_init("diff_format_email"); -} - -void test_diff_stats__cleanup(void) -{ - git_diff_stats_free(_stats); _stats = NULL; - cl_git_sandbox_cleanup(); -} - -static void diff_stats_from_commit_oid( - git_diff_stats **stats, const char *oidstr, bool rename) -{ - git_oid oid; - git_commit *commit; - git_diff *diff; - - git_oid_fromstr(&oid, oidstr); - cl_git_pass(git_commit_lookup(&commit, _repo, &oid)); - cl_git_pass(git_diff__commit(&diff, _repo, commit, NULL)); - if (rename) - cl_git_pass(git_diff_find_similar(diff, NULL)); - cl_git_pass(git_diff_get_stats(stats, diff)); - - git_diff_free(diff); - git_commit_free(commit); -} - -void test_diff_stats__stat(void) -{ - git_buf buf = GIT_BUF_INIT; - const char *stat = - " file1.txt | 8 +++++---\n" \ - " 1 file changed, 5 insertions(+), 3 deletions(-)\n"; - - diff_stats_from_commit_oid( - &_stats, "9264b96c6d104d0e07ae33d3007b6a48246c6f92", false); - - cl_assert_equal_sz(1, git_diff_stats_files_changed(_stats)); - cl_assert_equal_sz(5, git_diff_stats_insertions(_stats)); - cl_assert_equal_sz(3, git_diff_stats_deletions(_stats)); - - cl_git_pass(git_diff_stats_to_buf(&buf, _stats, GIT_DIFF_STATS_FULL, 0)); - cl_assert(strcmp(git_buf_cstr(&buf), stat) == 0); - git_buf_free(&buf); - - cl_git_pass(git_diff_stats_to_buf(&buf, _stats, GIT_DIFF_STATS_FULL, 80)); - cl_assert(strcmp(git_buf_cstr(&buf), stat) == 0); - git_buf_free(&buf); -} - -void test_diff_stats__multiple_hunks(void) -{ - git_buf buf = GIT_BUF_INIT; - const char *stat = - " file2.txt | 5 +++--\n" \ - " file3.txt | 6 ++++--\n" \ - " 2 files changed, 7 insertions(+), 4 deletions(-)\n"; - - diff_stats_from_commit_oid( - &_stats, "cd471f0d8770371e1bc78bcbb38db4c7e4106bd2", false); - - cl_assert_equal_sz(2, git_diff_stats_files_changed(_stats)); - cl_assert_equal_sz(7, git_diff_stats_insertions(_stats)); - cl_assert_equal_sz(4, git_diff_stats_deletions(_stats)); - - cl_git_pass(git_diff_stats_to_buf(&buf, _stats, GIT_DIFF_STATS_FULL, 0)); - cl_assert_equal_s(stat, git_buf_cstr(&buf)); - git_buf_free(&buf); -} - -void test_diff_stats__numstat(void) -{ - git_buf buf = GIT_BUF_INIT; - const char *stat = - "3 2 file2.txt\n" - "4 2 file3.txt\n"; - - diff_stats_from_commit_oid( - &_stats, "cd471f0d8770371e1bc78bcbb38db4c7e4106bd2", false); - - cl_git_pass(git_diff_stats_to_buf(&buf, _stats, GIT_DIFF_STATS_NUMBER, 0)); - cl_assert_equal_s(stat, git_buf_cstr(&buf)); - git_buf_free(&buf); -} - -void test_diff_stats__shortstat(void) -{ - git_buf buf = GIT_BUF_INIT; - const char *stat = - " 1 file changed, 5 insertions(+), 3 deletions(-)\n"; - - diff_stats_from_commit_oid( - &_stats, "9264b96c6d104d0e07ae33d3007b6a48246c6f92", false); - - cl_assert_equal_sz(1, git_diff_stats_files_changed(_stats)); - cl_assert_equal_sz(5, git_diff_stats_insertions(_stats)); - cl_assert_equal_sz(3, git_diff_stats_deletions(_stats)); - - cl_git_pass(git_diff_stats_to_buf(&buf, _stats, GIT_DIFF_STATS_SHORT, 0)); - cl_assert_equal_s(stat, git_buf_cstr(&buf)); - git_buf_free(&buf); -} - -void test_diff_stats__rename(void) -{ - git_buf buf = GIT_BUF_INIT; - const char *stat = - " file2.txt => file2.txt.renamed | 1 +\n" - " file3.txt => file3.txt.renamed | 4 +++-\n" - " 2 files changed, 4 insertions(+), 1 deletion(-)\n"; - - diff_stats_from_commit_oid( - &_stats, "8947a46e2097638ca6040ad4877246f4186ec3bd", true); - - cl_assert_equal_sz(2, git_diff_stats_files_changed(_stats)); - cl_assert_equal_sz(4, git_diff_stats_insertions(_stats)); - cl_assert_equal_sz(1, git_diff_stats_deletions(_stats)); - - cl_git_pass(git_diff_stats_to_buf(&buf, _stats, GIT_DIFF_STATS_FULL, 0)); - cl_assert_equal_s(stat, git_buf_cstr(&buf)); - git_buf_free(&buf); -} - -void test_diff_stats__rename_nochanges(void) -{ - git_buf buf = GIT_BUF_INIT; - const char *stat = - " file2.txt.renamed => file2.txt.renamed2 | 0\n" - " file3.txt.renamed => file3.txt.renamed2 | 0\n" - " 2 files changed, 0 insertions(+), 0 deletions(-)\n"; - - diff_stats_from_commit_oid( - &_stats, "3991dce9e71a0641ca49a6a4eea6c9e7ff402ed4", true); - - cl_assert_equal_sz(2, git_diff_stats_files_changed(_stats)); - cl_assert_equal_sz(0, git_diff_stats_insertions(_stats)); - cl_assert_equal_sz(0, git_diff_stats_deletions(_stats)); - - cl_git_pass(git_diff_stats_to_buf(&buf, _stats, GIT_DIFF_STATS_FULL, 0)); - cl_assert_equal_s(stat, git_buf_cstr(&buf)); - git_buf_free(&buf); -} - -void test_diff_stats__rename_and_modifiy(void) -{ - git_buf buf = GIT_BUF_INIT; - const char *stat = - " file2.txt.renamed2 | 2 +-\n" - " file3.txt.renamed2 => file3.txt.renamed | 0\n" - " 2 files changed, 1 insertion(+), 1 deletion(-)\n"; - - diff_stats_from_commit_oid( - &_stats, "4ca10087e696d2ba78d07b146a118e9a7096ed4f", true); - - cl_assert_equal_sz(2, git_diff_stats_files_changed(_stats)); - cl_assert_equal_sz(1, git_diff_stats_insertions(_stats)); - cl_assert_equal_sz(1, git_diff_stats_deletions(_stats)); - - cl_git_pass(git_diff_stats_to_buf(&buf, _stats, GIT_DIFF_STATS_FULL, 0)); - cl_assert_equal_s(stat, git_buf_cstr(&buf)); - git_buf_free(&buf); -} - -void test_diff_stats__rename_no_find(void) -{ - git_buf buf = GIT_BUF_INIT; - const char *stat = - " file2.txt | 5 -----\n" - " file2.txt.renamed | 6 ++++++\n" - " file3.txt | 5 -----\n" - " file3.txt.renamed | 7 +++++++\n" - " 4 files changed, 13 insertions(+), 10 deletions(-)\n"; - - diff_stats_from_commit_oid( - &_stats, "8947a46e2097638ca6040ad4877246f4186ec3bd", false); - - cl_assert_equal_sz(4, git_diff_stats_files_changed(_stats)); - cl_assert_equal_sz(13, git_diff_stats_insertions(_stats)); - cl_assert_equal_sz(10, git_diff_stats_deletions(_stats)); - - cl_git_pass(git_diff_stats_to_buf(&buf, _stats, GIT_DIFF_STATS_FULL, 0)); - cl_assert_equal_s(stat, git_buf_cstr(&buf)); - git_buf_free(&buf); -} - -void test_diff_stats__rename_nochanges_no_find(void) -{ - git_buf buf = GIT_BUF_INIT; - const char *stat = - " file2.txt.renamed | 6 ------\n" - " file2.txt.renamed2 | 6 ++++++\n" - " file3.txt.renamed | 7 -------\n" - " file3.txt.renamed2 | 7 +++++++\n" - " 4 files changed, 13 insertions(+), 13 deletions(-)\n"; - - diff_stats_from_commit_oid( - &_stats, "3991dce9e71a0641ca49a6a4eea6c9e7ff402ed4", false); - - cl_assert_equal_sz(4, git_diff_stats_files_changed(_stats)); - cl_assert_equal_sz(13, git_diff_stats_insertions(_stats)); - cl_assert_equal_sz(13, git_diff_stats_deletions(_stats)); - - cl_git_pass(git_diff_stats_to_buf(&buf, _stats, GIT_DIFF_STATS_FULL, 0)); - cl_assert_equal_s(stat, git_buf_cstr(&buf)); - git_buf_free(&buf); -} - -void test_diff_stats__rename_and_modifiy_no_find(void) -{ - git_buf buf = GIT_BUF_INIT; - const char *stat = - " file2.txt.renamed2 | 2 +-\n" - " file3.txt.renamed | 7 +++++++\n" - " file3.txt.renamed2 | 7 -------\n" - " 3 files changed, 8 insertions(+), 8 deletions(-)\n"; - - diff_stats_from_commit_oid( - &_stats, "4ca10087e696d2ba78d07b146a118e9a7096ed4f", false); - - cl_assert_equal_sz(3, git_diff_stats_files_changed(_stats)); - cl_assert_equal_sz(8, git_diff_stats_insertions(_stats)); - cl_assert_equal_sz(8, git_diff_stats_deletions(_stats)); - - cl_git_pass(git_diff_stats_to_buf(&buf, _stats, GIT_DIFF_STATS_FULL, 0)); - cl_assert_equal_s(stat, git_buf_cstr(&buf)); - git_buf_free(&buf); -} - -void test_diff_stats__binary(void) -{ - git_buf buf = GIT_BUF_INIT; - const char *stat = - " binary.bin | Bin 3 -> 0 bytes\n" - " 1 file changed, 0 insertions(+), 0 deletions(-)\n"; - /* TODO: Actually 0 bytes here should be 5!. Seems like we don't load the new content for binary files? */ - - diff_stats_from_commit_oid( - &_stats, "8d7523f6fcb2404257889abe0d96f093d9f524f9", false); - - cl_assert_equal_sz(1, git_diff_stats_files_changed(_stats)); - cl_assert_equal_sz(0, git_diff_stats_insertions(_stats)); - cl_assert_equal_sz(0, git_diff_stats_deletions(_stats)); - - cl_git_pass(git_diff_stats_to_buf(&buf, _stats, GIT_DIFF_STATS_FULL, 0)); - cl_assert_equal_s(stat, git_buf_cstr(&buf)); - git_buf_free(&buf); -} - -void test_diff_stats__binary_numstat(void) -{ - git_buf buf = GIT_BUF_INIT; - const char *stat = - "- - binary.bin\n"; - - diff_stats_from_commit_oid( - &_stats, "8d7523f6fcb2404257889abe0d96f093d9f524f9", false); - - cl_git_pass(git_diff_stats_to_buf(&buf, _stats, GIT_DIFF_STATS_NUMBER, 0)); - cl_assert_equal_s(stat, git_buf_cstr(&buf)); - git_buf_free(&buf); -} - -void test_diff_stats__mode_change(void) -{ - git_buf buf = GIT_BUF_INIT; - const char *stat = - " file1.txt.renamed | 0\n" \ - " 1 file changed, 0 insertions(+), 0 deletions(-)\n" \ - " mode change 100644 => 100755 file1.txt.renamed\n"; - - diff_stats_from_commit_oid( - &_stats, "7ade76dd34bba4733cf9878079f9fd4a456a9189", false); - - cl_git_pass(git_diff_stats_to_buf(&buf, _stats, GIT_DIFF_STATS_FULL | GIT_DIFF_STATS_INCLUDE_SUMMARY, 0)); - cl_assert_equal_s(stat, git_buf_cstr(&buf)); - git_buf_free(&buf); -} diff --git a/vendor/libgit2/tests/diff/submodules.c b/vendor/libgit2/tests/diff/submodules.c deleted file mode 100644 index 08682cd4b..000000000 --- a/vendor/libgit2/tests/diff/submodules.c +++ /dev/null @@ -1,495 +0,0 @@ -#include "clar_libgit2.h" -#include "repository.h" -#include "posix.h" -#include "diff_helpers.h" -#include "../submodule/submodule_helpers.h" - -static git_repository *g_repo = NULL; - -void test_diff_submodules__initialize(void) -{ -} - -void test_diff_submodules__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -#define get_buf_ptr(buf) ((buf)->asize ? (buf)->ptr : NULL) - -static void check_diff_patches_at_line( - git_diff *diff, const char **expected, const char *file, int line) -{ - const git_diff_delta *delta; - git_patch *patch = NULL; - size_t d, num_d = git_diff_num_deltas(diff); - git_buf buf = GIT_BUF_INIT; - - for (d = 0; d < num_d; ++d, git_patch_free(patch)) { - cl_git_pass(git_patch_from_diff(&patch, diff, d)); - cl_assert((delta = git_patch_get_delta(patch)) != NULL); - - if (delta->status == GIT_DELTA_UNMODIFIED) { - cl_assert_at_line(expected[d] == NULL, file, line); - continue; - } - - if (expected[d] && !strcmp(expected[d], "")) - continue; - if (expected[d] && !strcmp(expected[d], "")) { - cl_assert_at_line(delta->status == GIT_DELTA_UNTRACKED, file, line); - continue; - } - if (expected[d] && !strcmp(expected[d], "")) { - cl_git_pass(git_patch_to_buf(&buf, patch)); - cl_assert_at_line(!strcmp(expected[d], ""), file, line); - } - - cl_git_pass(git_patch_to_buf(&buf, patch)); - - clar__assert_equal( - file, line, "expected diff did not match actual diff", 1, - "%s", expected[d], get_buf_ptr(&buf)); - git_buf_free(&buf); - } - - cl_assert_at_line(expected[d] && !strcmp(expected[d], ""), file, line); -} - -#define check_diff_patches(diff, exp) \ - check_diff_patches_at_line(diff, exp, __FILE__, __LINE__) - -void test_diff_submodules__unmodified_submodule(void) -{ - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - git_diff *diff = NULL; - static const char *expected[] = { - "", /* .gitmodules */ - NULL, /* added */ - NULL, /* ignored */ - "diff --git a/modified b/modified\nindex 092bfb9..452216e 100644\n--- a/modified\n+++ b/modified\n@@ -1 +1,2 @@\n-yo\n+changed\n+\n", /* modified */ - NULL, /* testrepo.git */ - NULL, /* unmodified */ - NULL, /* untracked */ - "" - }; - - g_repo = setup_fixture_submodules(); - - opts.flags = GIT_DIFF_INCLUDE_IGNORED | - GIT_DIFF_INCLUDE_UNTRACKED | - GIT_DIFF_INCLUDE_UNMODIFIED; - opts.old_prefix = "a"; opts.new_prefix = "b"; - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - check_diff_patches(diff, expected); - git_diff_free(diff); -} - -void test_diff_submodules__dirty_submodule(void) -{ - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - git_diff *diff = NULL; - static const char *expected[] = { - "", /* .gitmodules */ - NULL, /* added */ - NULL, /* ignored */ - "diff --git a/modified b/modified\nindex 092bfb9..452216e 100644\n--- a/modified\n+++ b/modified\n@@ -1 +1,2 @@\n-yo\n+changed\n+\n", /* modified */ - "diff --git a/testrepo b/testrepo\nindex a65fedf..a65fedf 160000\n--- a/testrepo\n+++ b/testrepo\n@@ -1 +1 @@\n-Subproject commit a65fedf39aefe402d3bb6e24df4d4f5fe4547750\n+Subproject commit a65fedf39aefe402d3bb6e24df4d4f5fe4547750-dirty\n", /* testrepo.git */ - NULL, /* unmodified */ - NULL, /* untracked */ - "" - }; - - g_repo = setup_fixture_submodules(); - - cl_git_rewritefile("submodules/testrepo/README", "heyheyhey"); - cl_git_mkfile("submodules/testrepo/all_new.txt", "never seen before"); - - opts.flags = GIT_DIFF_INCLUDE_IGNORED | - GIT_DIFF_INCLUDE_UNTRACKED | - GIT_DIFF_INCLUDE_UNMODIFIED; - opts.old_prefix = "a"; opts.new_prefix = "b"; - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - check_diff_patches(diff, expected); - git_diff_free(diff); -} - -void test_diff_submodules__dirty_submodule_2(void) -{ - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - git_diff *diff = NULL, *diff2 = NULL; - char *smpath = "testrepo"; - static const char *expected_none[] = { - "" - }; - static const char *expected_dirty[] = { - "diff --git a/testrepo b/testrepo\nindex a65fedf..a65fedf 160000\n--- a/testrepo\n+++ b/testrepo\n@@ -1 +1 @@\n-Subproject commit a65fedf39aefe402d3bb6e24df4d4f5fe4547750\n+Subproject commit a65fedf39aefe402d3bb6e24df4d4f5fe4547750-dirty\n", /* testrepo.git */ - "" - }; - - g_repo = setup_fixture_submodules(); - - opts.flags = GIT_DIFF_INCLUDE_UNTRACKED | - GIT_DIFF_SHOW_UNTRACKED_CONTENT | - GIT_DIFF_RECURSE_UNTRACKED_DIRS | - GIT_DIFF_DISABLE_PATHSPEC_MATCH; - opts.old_prefix = "a"; opts.new_prefix = "b"; - opts.pathspec.count = 1; - opts.pathspec.strings = &smpath; - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - check_diff_patches(diff, expected_none); - git_diff_free(diff); - - cl_git_rewritefile("submodules/testrepo/README", "heyheyhey"); - cl_git_mkfile("submodules/testrepo/all_new.txt", "never seen before"); - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - check_diff_patches(diff, expected_dirty); - - { - git_tree *head; - - cl_git_pass(git_repository_head_tree(&head, g_repo)); - cl_git_pass(git_diff_tree_to_index(&diff2, g_repo, head, NULL, &opts)); - cl_git_pass(git_diff_merge(diff, diff2)); - git_diff_free(diff2); - git_tree_free(head); - - check_diff_patches(diff, expected_dirty); - } - - git_diff_free(diff); - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - check_diff_patches(diff, expected_dirty); - git_diff_free(diff); -} - -void test_diff_submodules__submod2_index_to_wd(void) -{ - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - git_diff *diff = NULL; - static const char *expected[] = { - "", /* .gitmodules */ - "", /* not-submodule */ - "", /* not */ - "diff --git a/sm_changed_file b/sm_changed_file\nindex 4800958..4800958 160000\n--- a/sm_changed_file\n+++ b/sm_changed_file\n@@ -1 +1 @@\n-Subproject commit 480095882d281ed676fe5b863569520e54a7d5c0\n+Subproject commit 480095882d281ed676fe5b863569520e54a7d5c0-dirty\n", /* sm_changed_file */ - "diff --git a/sm_changed_head b/sm_changed_head\nindex 4800958..3d9386c 160000\n--- a/sm_changed_head\n+++ b/sm_changed_head\n@@ -1 +1 @@\n-Subproject commit 480095882d281ed676fe5b863569520e54a7d5c0\n+Subproject commit 3d9386c507f6b093471a3e324085657a3c2b4247\n", /* sm_changed_head */ - "", /* sm_changed_head- */ - "", /* sm_changed_head_ */ - "diff --git a/sm_changed_index b/sm_changed_index\nindex 4800958..4800958 160000\n--- a/sm_changed_index\n+++ b/sm_changed_index\n@@ -1 +1 @@\n-Subproject commit 480095882d281ed676fe5b863569520e54a7d5c0\n+Subproject commit 480095882d281ed676fe5b863569520e54a7d5c0-dirty\n", /* sm_changed_index */ - "diff --git a/sm_changed_untracked_file b/sm_changed_untracked_file\nindex 4800958..4800958 160000\n--- a/sm_changed_untracked_file\n+++ b/sm_changed_untracked_file\n@@ -1 +1 @@\n-Subproject commit 480095882d281ed676fe5b863569520e54a7d5c0\n+Subproject commit 480095882d281ed676fe5b863569520e54a7d5c0-dirty\n", /* sm_changed_untracked_file */ - "diff --git a/sm_missing_commits b/sm_missing_commits\nindex 4800958..5e49635 160000\n--- a/sm_missing_commits\n+++ b/sm_missing_commits\n@@ -1 +1 @@\n-Subproject commit 480095882d281ed676fe5b863569520e54a7d5c0\n+Subproject commit 5e4963595a9774b90524d35a807169049de8ccad\n", /* sm_missing_commits */ - "" - }; - - g_repo = setup_fixture_submod2(); - - /* bracket existing submodule with similarly named items */ - cl_git_mkfile("submod2/sm_changed_head-", "hello"); - cl_git_mkfile("submod2/sm_changed_head_", "hello"); - - opts.flags = GIT_DIFF_INCLUDE_UNTRACKED; - opts.old_prefix = "a"; opts.new_prefix = "b"; - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - check_diff_patches(diff, expected); - git_diff_free(diff); -} - -void test_diff_submodules__submod2_head_to_index(void) -{ - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - git_tree *head; - git_diff *diff = NULL; - static const char *expected[] = { - "", /* .gitmodules */ - "diff --git a/sm_added_and_uncommited b/sm_added_and_uncommited\nnew file mode 160000\nindex 0000000..4800958\n--- /dev/null\n+++ b/sm_added_and_uncommited\n@@ -0,0 +1 @@\n+Subproject commit 480095882d281ed676fe5b863569520e54a7d5c0\n", /* sm_added_and_uncommited */ - "" - }; - - g_repo = setup_fixture_submod2(); - - cl_git_pass(git_repository_head_tree(&head, g_repo)); - - opts.flags = GIT_DIFF_INCLUDE_UNTRACKED; - opts.old_prefix = "a"; opts.new_prefix = "b"; - - cl_git_pass(git_diff_tree_to_index(&diff, g_repo, head, NULL, &opts)); - check_diff_patches(diff, expected); - git_diff_free(diff); - - git_tree_free(head); -} - -void test_diff_submodules__invalid_cache(void) -{ - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - git_diff *diff = NULL; - git_submodule *sm; - char *smpath = "sm_changed_head"; - git_repository *smrepo; - git_index *smindex; - static const char *expected_baseline[] = { - "diff --git a/sm_changed_head b/sm_changed_head\nindex 4800958..3d9386c 160000\n--- a/sm_changed_head\n+++ b/sm_changed_head\n@@ -1 +1 @@\n-Subproject commit 480095882d281ed676fe5b863569520e54a7d5c0\n+Subproject commit 3d9386c507f6b093471a3e324085657a3c2b4247\n", /* sm_changed_head */ - "" - }; - static const char *expected_unchanged[] = { "" }; - static const char *expected_dirty[] = { - "diff --git a/sm_changed_head b/sm_changed_head\nindex 3d9386c..3d9386c 160000\n--- a/sm_changed_head\n+++ b/sm_changed_head\n@@ -1 +1 @@\n-Subproject commit 3d9386c507f6b093471a3e324085657a3c2b4247\n+Subproject commit 3d9386c507f6b093471a3e324085657a3c2b4247-dirty\n", - "" - }; - static const char *expected_moved[] = { - "diff --git a/sm_changed_head b/sm_changed_head\nindex 3d9386c..7002348 160000\n--- a/sm_changed_head\n+++ b/sm_changed_head\n@@ -1 +1 @@\n-Subproject commit 3d9386c507f6b093471a3e324085657a3c2b4247\n+Subproject commit 700234833f6ccc20d744b238612646be071acaae\n", - "" - }; - static const char *expected_moved_dirty[] = { - "diff --git a/sm_changed_head b/sm_changed_head\nindex 3d9386c..7002348 160000\n--- a/sm_changed_head\n+++ b/sm_changed_head\n@@ -1 +1 @@\n-Subproject commit 3d9386c507f6b093471a3e324085657a3c2b4247\n+Subproject commit 700234833f6ccc20d744b238612646be071acaae-dirty\n", - "" - }; - - g_repo = setup_fixture_submod2(); - - opts.flags = GIT_DIFF_INCLUDE_UNTRACKED; - opts.old_prefix = "a"; opts.new_prefix = "b"; - opts.pathspec.count = 1; - opts.pathspec.strings = &smpath; - - /* baseline */ - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - check_diff_patches(diff, expected_baseline); - git_diff_free(diff); - - /* update index with new HEAD */ - cl_git_pass(git_submodule_lookup(&sm, g_repo, smpath)); - cl_git_pass(git_submodule_add_to_index(sm, 1)); - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - check_diff_patches(diff, expected_unchanged); - git_diff_free(diff); - - /* create untracked file in submodule working directory */ - cl_git_mkfile("submod2/sm_changed_head/new_around_here", "hello"); - git_submodule_set_ignore(g_repo, git_submodule_name(sm), GIT_SUBMODULE_IGNORE_NONE); - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - check_diff_patches(diff, expected_dirty); - git_diff_free(diff); - - git_submodule_set_ignore(g_repo, git_submodule_name(sm), GIT_SUBMODULE_IGNORE_UNTRACKED); - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - check_diff_patches(diff, expected_unchanged); - git_diff_free(diff); - - /* modify tracked file in submodule working directory */ - cl_git_append2file( - "submod2/sm_changed_head/file_to_modify", "\nmore stuff\n"); - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - check_diff_patches(diff, expected_dirty); - git_diff_free(diff); - - git_submodule_free(sm); - - cl_git_pass(git_submodule_lookup(&sm, g_repo, smpath)); - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - check_diff_patches(diff, expected_dirty); - git_diff_free(diff); - - git_submodule_set_ignore(g_repo, git_submodule_name(sm), GIT_SUBMODULE_IGNORE_DIRTY); - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - check_diff_patches(diff, expected_unchanged); - git_diff_free(diff); - - /* add file to index in submodule */ - cl_git_pass(git_submodule_open(&smrepo, sm)); - cl_git_pass(git_repository_index(&smindex, smrepo)); - cl_git_pass(git_index_add_bypath(smindex, "file_to_modify")); - - git_submodule_set_ignore(g_repo, git_submodule_name(sm), GIT_SUBMODULE_IGNORE_UNTRACKED); - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - check_diff_patches(diff, expected_dirty); - git_diff_free(diff); - - git_submodule_set_ignore(g_repo, git_submodule_name(sm), GIT_SUBMODULE_IGNORE_DIRTY); - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - check_diff_patches(diff, expected_unchanged); - git_diff_free(diff); - - /* commit changed index of submodule */ - cl_repo_commit_from_index(NULL, smrepo, NULL, 1372350000, "Move it"); - - git_submodule_set_ignore(g_repo, git_submodule_name(sm), GIT_SUBMODULE_IGNORE_DIRTY); - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - check_diff_patches(diff, expected_moved); - git_diff_free(diff); - - git_submodule_set_ignore(g_repo, git_submodule_name(sm), GIT_SUBMODULE_IGNORE_ALL); - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - check_diff_patches(diff, expected_unchanged); - git_diff_free(diff); - - git_submodule_set_ignore(g_repo, git_submodule_name(sm), GIT_SUBMODULE_IGNORE_NONE); - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - check_diff_patches(diff, expected_moved_dirty); - git_diff_free(diff); - - p_unlink("submod2/sm_changed_head/new_around_here"); - - git_submodule_free(sm); - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - check_diff_patches(diff, expected_moved); - git_diff_free(diff); - - git_index_free(smindex); - git_repository_free(smrepo); -} - -void test_diff_submodules__diff_ignore_options(void) -{ - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - git_diff *diff = NULL; - git_config *cfg; - static const char *expected_normal[] = { - "", /* .gitmodules */ - "", /* not-submodule */ - "", /* not */ - "diff --git a/sm_changed_file b/sm_changed_file\nindex 4800958..4800958 160000\n--- a/sm_changed_file\n+++ b/sm_changed_file\n@@ -1 +1 @@\n-Subproject commit 480095882d281ed676fe5b863569520e54a7d5c0\n+Subproject commit 480095882d281ed676fe5b863569520e54a7d5c0-dirty\n", /* sm_changed_file */ - "diff --git a/sm_changed_head b/sm_changed_head\nindex 4800958..3d9386c 160000\n--- a/sm_changed_head\n+++ b/sm_changed_head\n@@ -1 +1 @@\n-Subproject commit 480095882d281ed676fe5b863569520e54a7d5c0\n+Subproject commit 3d9386c507f6b093471a3e324085657a3c2b4247\n", /* sm_changed_head */ - "diff --git a/sm_changed_index b/sm_changed_index\nindex 4800958..4800958 160000\n--- a/sm_changed_index\n+++ b/sm_changed_index\n@@ -1 +1 @@\n-Subproject commit 480095882d281ed676fe5b863569520e54a7d5c0\n+Subproject commit 480095882d281ed676fe5b863569520e54a7d5c0-dirty\n", /* sm_changed_index */ - "diff --git a/sm_changed_untracked_file b/sm_changed_untracked_file\nindex 4800958..4800958 160000\n--- a/sm_changed_untracked_file\n+++ b/sm_changed_untracked_file\n@@ -1 +1 @@\n-Subproject commit 480095882d281ed676fe5b863569520e54a7d5c0\n+Subproject commit 480095882d281ed676fe5b863569520e54a7d5c0-dirty\n", /* sm_changed_untracked_file */ - "diff --git a/sm_missing_commits b/sm_missing_commits\nindex 4800958..5e49635 160000\n--- a/sm_missing_commits\n+++ b/sm_missing_commits\n@@ -1 +1 @@\n-Subproject commit 480095882d281ed676fe5b863569520e54a7d5c0\n+Subproject commit 5e4963595a9774b90524d35a807169049de8ccad\n", /* sm_missing_commits */ - "" - }; - static const char *expected_ignore_all[] = { - "", /* .gitmodules */ - "", /* not-submodule */ - "", /* not */ - "" - }; - static const char *expected_ignore_dirty[] = { - "", /* .gitmodules */ - "", /* not-submodule */ - "", /* not */ - "diff --git a/sm_changed_head b/sm_changed_head\nindex 4800958..3d9386c 160000\n--- a/sm_changed_head\n+++ b/sm_changed_head\n@@ -1 +1 @@\n-Subproject commit 480095882d281ed676fe5b863569520e54a7d5c0\n+Subproject commit 3d9386c507f6b093471a3e324085657a3c2b4247\n", /* sm_changed_head */ - "diff --git a/sm_missing_commits b/sm_missing_commits\nindex 4800958..5e49635 160000\n--- a/sm_missing_commits\n+++ b/sm_missing_commits\n@@ -1 +1 @@\n-Subproject commit 480095882d281ed676fe5b863569520e54a7d5c0\n+Subproject commit 5e4963595a9774b90524d35a807169049de8ccad\n", /* sm_missing_commits */ - "" - }; - - g_repo = setup_fixture_submod2(); - - opts.flags = GIT_DIFF_INCLUDE_UNTRACKED; - opts.old_prefix = "a"; opts.new_prefix = "b"; - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - check_diff_patches(diff, expected_normal); - git_diff_free(diff); - - opts.flags |= GIT_DIFF_IGNORE_SUBMODULES; - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - check_diff_patches(diff, expected_ignore_all); - git_diff_free(diff); - - opts.flags &= ~GIT_DIFF_IGNORE_SUBMODULES; - opts.ignore_submodules = GIT_SUBMODULE_IGNORE_ALL; - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - check_diff_patches(diff, expected_ignore_all); - git_diff_free(diff); - - opts.ignore_submodules = GIT_SUBMODULE_IGNORE_DIRTY; - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - check_diff_patches(diff, expected_ignore_dirty); - git_diff_free(diff); - - opts.ignore_submodules = 0; - cl_git_pass(git_repository_config(&cfg, g_repo)); - cl_git_pass(git_config_set_bool(cfg, "diff.ignoreSubmodules", false)); - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - check_diff_patches(diff, expected_normal); - git_diff_free(diff); - - cl_git_pass(git_config_set_bool(cfg, "diff.ignoreSubmodules", true)); - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - check_diff_patches(diff, expected_ignore_all); - git_diff_free(diff); - - cl_git_pass(git_config_set_string(cfg, "diff.ignoreSubmodules", "none")); - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - check_diff_patches(diff, expected_normal); - git_diff_free(diff); - - cl_git_pass(git_config_set_string(cfg, "diff.ignoreSubmodules", "dirty")); - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - check_diff_patches(diff, expected_ignore_dirty); - git_diff_free(diff); - - git_config_free(cfg); -} - -void test_diff_submodules__skips_empty_includes_used(void) -{ - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - git_diff *diff = NULL; - diff_expects exp; - - /* A side effect of of Git's handling of untracked directories and - * auto-ignoring of ".git" entries is that a newly initialized Git - * repo inside another repo will be skipped by diff, but one that - * actually has a commit it in will show as an untracked directory. - * Let's make sure that works. - */ - - g_repo = cl_git_sandbox_init("empty_standard_repo"); - - opts.flags |= GIT_DIFF_INCLUDE_IGNORED | GIT_DIFF_INCLUDE_UNTRACKED; - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - memset(&exp, 0, sizeof(exp)); - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - cl_assert_equal_i(0, exp.files); - git_diff_free(diff); - - { - git_repository *r2; - cl_git_pass(git_repository_init(&r2, "empty_standard_repo/subrepo", 0)); - git_repository_free(r2); - } - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - memset(&exp, 0, sizeof(exp)); - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - cl_assert_equal_i(1, exp.files); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_IGNORED]); - git_diff_free(diff); - - cl_git_mkfile("empty_standard_repo/subrepo/README.txt", "hello\n"); - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - memset(&exp, 0, sizeof(exp)); - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - cl_assert_equal_i(1, exp.files); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_UNTRACKED]); - git_diff_free(diff); -} diff --git a/vendor/libgit2/tests/diff/tree.c b/vendor/libgit2/tests/diff/tree.c deleted file mode 100644 index e4b2a8bbe..000000000 --- a/vendor/libgit2/tests/diff/tree.c +++ /dev/null @@ -1,526 +0,0 @@ -#include "clar_libgit2.h" -#include "diff_helpers.h" - -static git_repository *g_repo = NULL; -static git_diff_options opts; -static git_diff *diff; -static git_tree *a, *b; -static diff_expects expect; - -void test_diff_tree__initialize(void) -{ - cl_git_pass(git_diff_init_options(&opts, GIT_DIFF_OPTIONS_VERSION)); - - memset(&expect, 0, sizeof(expect)); - - diff = NULL; - a = NULL; - b = NULL; -} - -void test_diff_tree__cleanup(void) -{ - git_diff_free(diff); - git_tree_free(a); - git_tree_free(b); - - cl_git_sandbox_cleanup(); - -} - -void test_diff_tree__0(void) -{ - /* grabbed a couple of commit oids from the history of the attr repo */ - const char *a_commit = "605812a"; - const char *b_commit = "370fe9ec22"; - const char *c_commit = "f5b0af1fb4f5c"; - git_tree *c; - - g_repo = cl_git_sandbox_init("attr"); - - cl_assert((a = resolve_commit_oid_to_tree(g_repo, a_commit)) != NULL); - cl_assert((b = resolve_commit_oid_to_tree(g_repo, b_commit)) != NULL); - cl_assert((c = resolve_commit_oid_to_tree(g_repo, c_commit)) != NULL); - - opts.context_lines = 1; - opts.interhunk_lines = 1; - - - cl_git_pass(git_diff_tree_to_tree(&diff, g_repo, a, b, &opts)); - - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &expect)); - - cl_assert_equal_i(5, expect.files); - cl_assert_equal_i(2, expect.file_status[GIT_DELTA_ADDED]); - cl_assert_equal_i(1, expect.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(2, expect.file_status[GIT_DELTA_MODIFIED]); - - cl_assert_equal_i(5, expect.hunks); - - cl_assert_equal_i(7 + 24 + 1 + 6 + 6, expect.lines); - cl_assert_equal_i(1, expect.line_ctxt); - cl_assert_equal_i(24 + 1 + 5 + 5, expect.line_adds); - cl_assert_equal_i(7 + 1, expect.line_dels); - - git_diff_free(diff); - diff = NULL; - - memset(&expect, 0, sizeof(expect)); - - cl_git_pass(git_diff_tree_to_tree(&diff, g_repo, c, b, &opts)); - - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &expect)); - - cl_assert_equal_i(2, expect.files); - cl_assert_equal_i(0, expect.file_status[GIT_DELTA_ADDED]); - cl_assert_equal_i(0, expect.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(2, expect.file_status[GIT_DELTA_MODIFIED]); - - cl_assert_equal_i(2, expect.hunks); - - cl_assert_equal_i(8 + 15, expect.lines); - cl_assert_equal_i(1, expect.line_ctxt); - cl_assert_equal_i(1, expect.line_adds); - cl_assert_equal_i(7 + 14, expect.line_dels); - - git_tree_free(c); -} - -#define DIFF_OPTS(FLAGS, CTXT) \ - {GIT_DIFF_OPTIONS_VERSION, (FLAGS), GIT_SUBMODULE_IGNORE_UNSPECIFIED, \ - {NULL,0}, NULL, NULL, NULL, (CTXT), 1} - -void test_diff_tree__options(void) -{ - /* grabbed a couple of commit oids from the history of the attr repo */ - const char *a_commit = "6bab5c79cd5140d0"; - const char *b_commit = "605812ab7fe421fdd"; - const char *c_commit = "f5b0af1fb4f5"; - const char *d_commit = "a97cc019851"; - git_tree *c, *d; - diff_expects actual; - int test_ab_or_cd[] = { 0, 0, 0, 0, 1, 1, 1, 1, 1 }; - git_diff_options test_options[] = { - /* a vs b tests */ - DIFF_OPTS(GIT_DIFF_NORMAL, 1), - DIFF_OPTS(GIT_DIFF_NORMAL, 3), - DIFF_OPTS(GIT_DIFF_REVERSE, 2), - DIFF_OPTS(GIT_DIFF_FORCE_TEXT, 2), - /* c vs d tests */ - DIFF_OPTS(GIT_DIFF_NORMAL, 3), - DIFF_OPTS(GIT_DIFF_IGNORE_WHITESPACE, 3), - DIFF_OPTS(GIT_DIFF_IGNORE_WHITESPACE_CHANGE, 3), - DIFF_OPTS(GIT_DIFF_IGNORE_WHITESPACE_EOL, 3), - DIFF_OPTS(GIT_DIFF_IGNORE_WHITESPACE | GIT_DIFF_REVERSE, 1), - }; - - /* to generate these values: - * - cd to tests/resources/attr, - * - mv .gitted .git - * - git diff [options] 6bab5c79cd5140d0 605812ab7fe421fdd - * - mv .git .gitted - */ -#define EXPECT_STATUS_ADM(ADDS,DELS,MODS) { 0, ADDS, DELS, MODS, 0, 0, 0, 0, 0 } - - diff_expects test_expects[] = { - /* a vs b tests */ - { 5, 0, EXPECT_STATUS_ADM(3, 0, 2), 4, 0, 0, 51, 2, 46, 3 }, - { 5, 0, EXPECT_STATUS_ADM(3, 0, 2), 4, 0, 0, 53, 4, 46, 3 }, - { 5, 0, EXPECT_STATUS_ADM(0, 3, 2), 4, 0, 0, 52, 3, 3, 46 }, - { 5, 0, EXPECT_STATUS_ADM(3, 0, 2), 5, 0, 0, 54, 3, 47, 4 }, - /* c vs d tests */ - { 1, 0, EXPECT_STATUS_ADM(0, 0, 1), 1, 0, 0, 22, 9, 10, 3 }, - { 1, 0, EXPECT_STATUS_ADM(0, 0, 1), 1, 0, 0, 19, 12, 7, 0 }, - { 1, 0, EXPECT_STATUS_ADM(0, 0, 1), 1, 0, 0, 20, 11, 8, 1 }, - { 1, 0, EXPECT_STATUS_ADM(0, 0, 1), 1, 0, 0, 20, 11, 8, 1 }, - { 1, 0, EXPECT_STATUS_ADM(0, 0, 1), 1, 0, 0, 18, 11, 0, 7 }, - { 0 }, - }; - diff_expects *expected; - int i, j; - - g_repo = cl_git_sandbox_init("attr"); - - cl_assert((a = resolve_commit_oid_to_tree(g_repo, a_commit)) != NULL); - cl_assert((b = resolve_commit_oid_to_tree(g_repo, b_commit)) != NULL); - cl_assert((c = resolve_commit_oid_to_tree(g_repo, c_commit)) != NULL); - cl_assert((d = resolve_commit_oid_to_tree(g_repo, d_commit)) != NULL); - - for (i = 0; test_expects[i].files > 0; i++) { - memset(&actual, 0, sizeof(actual)); /* clear accumulator */ - opts = test_options[i]; - - if (test_ab_or_cd[i] == 0) - cl_git_pass(git_diff_tree_to_tree(&diff, g_repo, a, b, &opts)); - else - cl_git_pass(git_diff_tree_to_tree(&diff, g_repo, c, d, &opts)); - - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &actual)); - - expected = &test_expects[i]; - cl_assert_equal_i(actual.files, expected->files); - for (j = GIT_DELTA_UNMODIFIED; j <= GIT_DELTA_TYPECHANGE; ++j) - cl_assert_equal_i(expected->file_status[j], actual.file_status[j]); - cl_assert_equal_i(actual.hunks, expected->hunks); - cl_assert_equal_i(actual.lines, expected->lines); - cl_assert_equal_i(actual.line_ctxt, expected->line_ctxt); - cl_assert_equal_i(actual.line_adds, expected->line_adds); - cl_assert_equal_i(actual.line_dels, expected->line_dels); - - git_diff_free(diff); - diff = NULL; - } - - git_tree_free(c); - git_tree_free(d); -} - -void test_diff_tree__bare(void) -{ - const char *a_commit = "8496071c1b46c85"; - const char *b_commit = "be3563ae3f79"; - - g_repo = cl_git_sandbox_init("testrepo.git"); - - cl_assert((a = resolve_commit_oid_to_tree(g_repo, a_commit)) != NULL); - cl_assert((b = resolve_commit_oid_to_tree(g_repo, b_commit)) != NULL); - - opts.context_lines = 1; - opts.interhunk_lines = 1; - - cl_git_pass(git_diff_tree_to_tree(&diff, g_repo, a, b, &opts)); - - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &expect)); - - cl_assert_equal_i(3, expect.files); - cl_assert_equal_i(2, expect.file_status[GIT_DELTA_ADDED]); - cl_assert_equal_i(0, expect.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(1, expect.file_status[GIT_DELTA_MODIFIED]); - - cl_assert_equal_i(3, expect.hunks); - - cl_assert_equal_i(4, expect.lines); - cl_assert_equal_i(0, expect.line_ctxt); - cl_assert_equal_i(3, expect.line_adds); - cl_assert_equal_i(1, expect.line_dels); -} - -void test_diff_tree__merge(void) -{ - /* grabbed a couple of commit oids from the history of the attr repo */ - const char *a_commit = "605812a"; - const char *b_commit = "370fe9ec22"; - const char *c_commit = "f5b0af1fb4f5c"; - git_tree *c; - git_diff *diff1 = NULL, *diff2 = NULL; - - g_repo = cl_git_sandbox_init("attr"); - - cl_assert((a = resolve_commit_oid_to_tree(g_repo, a_commit)) != NULL); - cl_assert((b = resolve_commit_oid_to_tree(g_repo, b_commit)) != NULL); - cl_assert((c = resolve_commit_oid_to_tree(g_repo, c_commit)) != NULL); - - cl_git_pass(git_diff_tree_to_tree(&diff1, g_repo, a, b, NULL)); - - cl_git_pass(git_diff_tree_to_tree(&diff2, g_repo, c, b, NULL)); - - git_tree_free(c); - - cl_git_pass(git_diff_merge(diff1, diff2)); - - git_diff_free(diff2); - - cl_git_pass(git_diff_foreach( - diff1, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &expect)); - - cl_assert_equal_i(6, expect.files); - cl_assert_equal_i(2, expect.file_status[GIT_DELTA_ADDED]); - cl_assert_equal_i(1, expect.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(3, expect.file_status[GIT_DELTA_MODIFIED]); - - cl_assert_equal_i(6, expect.hunks); - - cl_assert_equal_i(59, expect.lines); - cl_assert_equal_i(1, expect.line_ctxt); - cl_assert_equal_i(36, expect.line_adds); - cl_assert_equal_i(22, expect.line_dels); - - git_diff_free(diff1); -} - -void test_diff_tree__larger_hunks(void) -{ - const char *a_commit = "d70d245ed97ed2aa596dd1af6536e4bfdb047b69"; - const char *b_commit = "7a9e0b02e63179929fed24f0a3e0f19168114d10"; - size_t d, num_d, h, num_h, l, num_l; - git_patch *patch; - const git_diff_hunk *hunk; - const git_diff_line *line; - - g_repo = cl_git_sandbox_init("diff"); - - cl_assert((a = resolve_commit_oid_to_tree(g_repo, a_commit)) != NULL); - cl_assert((b = resolve_commit_oid_to_tree(g_repo, b_commit)) != NULL); - - opts.context_lines = 1; - opts.interhunk_lines = 0; - - cl_git_pass(git_diff_tree_to_tree(&diff, g_repo, a, b, &opts)); - - num_d = git_diff_num_deltas(diff); - for (d = 0; d < num_d; ++d) { - cl_git_pass(git_patch_from_diff(&patch, diff, d)); - cl_assert(patch); - - num_h = git_patch_num_hunks(patch); - for (h = 0; h < num_h; h++) { - cl_git_pass(git_patch_get_hunk(&hunk, &num_l, patch, h)); - - for (l = 0; l < num_l; ++l) { - cl_git_pass(git_patch_get_line_in_hunk(&line, patch, h, l)); - cl_assert(line); - } - - cl_git_fail(git_patch_get_line_in_hunk(&line, patch, h, num_l)); - } - - cl_git_fail(git_patch_get_hunk(&hunk, &num_l, patch, num_h)); - - git_patch_free(patch); - } - - cl_git_fail(git_patch_from_diff(&patch, diff, num_d)); - - cl_assert_equal_i(2, (int)num_d); -} - -void test_diff_tree__checks_options_version(void) -{ - const char *a_commit = "8496071c1b46c85"; - const char *b_commit = "be3563ae3f79"; - const git_error *err; - - g_repo = cl_git_sandbox_init("testrepo.git"); - - cl_assert((a = resolve_commit_oid_to_tree(g_repo, a_commit)) != NULL); - cl_assert((b = resolve_commit_oid_to_tree(g_repo, b_commit)) != NULL); - - opts.version = 0; - cl_git_fail(git_diff_tree_to_tree(&diff, g_repo, a, b, &opts)); - err = giterr_last(); - cl_assert_equal_i(GITERR_INVALID, err->klass); - - giterr_clear(); - opts.version = 1024; - cl_git_fail(git_diff_tree_to_tree(&diff, g_repo, a, b, &opts)); - err = giterr_last(); -} - -void process_tree_to_tree_diffing( - const char *old_commit, - const char *new_commit) -{ - g_repo = cl_git_sandbox_init("unsymlinked.git"); - - cl_assert((a = resolve_commit_oid_to_tree(g_repo, old_commit)) != NULL); - cl_assert((b = resolve_commit_oid_to_tree(g_repo, new_commit)) != NULL); - - cl_git_pass(git_diff_tree_to_tree(&diff, g_repo, a, b, &opts)); - - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, NULL, NULL, NULL, &expect)); -} - -void test_diff_tree__symlink_blob_mode_changed_to_regular_file(void) -{ - /* - * $ git diff 7fccd7..806999 - * diff --git a/include/Nu/Nu.h b/include/Nu/Nu.h - * deleted file mode 120000 - * index 19bf568..0000000 - * --- a/include/Nu/Nu.h - * +++ /dev/null - * @@ -1 +0,0 @@ - * -../../objc/Nu.h - * \ No newline at end of file - * diff --git a/include/Nu/Nu.h b/include/Nu/Nu.h - * new file mode 100644 - * index 0000000..f9e6561 - * --- /dev/null - * +++ b/include/Nu/Nu.h - * @@ -0,0 +1 @@ - * +awesome content - * diff --git a/objc/Nu.h b/objc/Nu.h - * deleted file mode 100644 - * index f9e6561..0000000 - * --- a/objc/Nu.h - * +++ /dev/null - * @@ -1 +0,0 @@ - * -awesome content - */ - - process_tree_to_tree_diffing("7fccd7", "806999"); - - cl_assert_equal_i(3, expect.files); - cl_assert_equal_i(2, expect.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(0, expect.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(1, expect.file_status[GIT_DELTA_ADDED]); - cl_assert_equal_i(0, expect.file_status[GIT_DELTA_TYPECHANGE]); -} - -void test_diff_tree__symlink_blob_mode_changed_to_regular_file_as_typechange(void) -{ - /* - * $ git diff 7fccd7..a8595c - * diff --git a/include/Nu/Nu.h b/include/Nu/Nu.h - * deleted file mode 120000 - * index 19bf568..0000000 - * --- a/include/Nu/Nu.h - * +++ /dev/null - * @@ -1 +0,0 @@ - * -../../objc/Nu.h - * \ No newline at end of file - * diff --git a/include/Nu/Nu.h b/include/Nu/Nu.h - * new file mode 100755 - * index 0000000..f9e6561 - * --- /dev/null - * +++ b/include/Nu/Nu.h - * @@ -0,0 +1 @@ - * +awesome content - * diff --git a/objc/Nu.h b/objc/Nu.h - * deleted file mode 100644 - * index f9e6561..0000000 - * --- a/objc/Nu.h - * +++ /dev/null - * @@ -1 +0,0 @@ - * -awesome content - */ - - opts.flags = GIT_DIFF_INCLUDE_TYPECHANGE; - process_tree_to_tree_diffing("7fccd7", "a8595c"); - - cl_assert_equal_i(2, expect.files); - cl_assert_equal_i(1, expect.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(0, expect.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(0, expect.file_status[GIT_DELTA_ADDED]); - cl_assert_equal_i(1, expect.file_status[GIT_DELTA_TYPECHANGE]); -} - -void test_diff_tree__regular_blob_mode_changed_to_executable_file(void) -{ - /* - * $ git diff 806999..a8595c - * diff --git a/include/Nu/Nu.h b/include/Nu/Nu.h - * old mode 100644 - * new mode 100755 - */ - - process_tree_to_tree_diffing("806999", "a8595c"); - - cl_assert_equal_i(1, expect.files); - cl_assert_equal_i(0, expect.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(1, expect.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(0, expect.file_status[GIT_DELTA_ADDED]); - cl_assert_equal_i(0, expect.file_status[GIT_DELTA_TYPECHANGE]); -} - -void test_diff_tree__issue_1397(void) -{ - /* this test shows that it is not needed */ - - g_repo = cl_git_sandbox_init("issue_1397"); - - cl_repo_set_bool(g_repo, "core.autocrlf", true); - - cl_assert((a = resolve_commit_oid_to_tree(g_repo, "8a7ef04")) != NULL); - cl_assert((b = resolve_commit_oid_to_tree(g_repo, "7f483a7")) != NULL); - - cl_git_pass(git_diff_tree_to_tree(&diff, g_repo, a, b, &opts)); - - cl_git_pass(git_diff_foreach(diff, - diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &expect)); - - cl_assert_equal_i(1, expect.files); - cl_assert_equal_i(0, expect.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(1, expect.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(0, expect.file_status[GIT_DELTA_ADDED]); - cl_assert_equal_i(0, expect.file_status[GIT_DELTA_TYPECHANGE]); -} - -static void set_config_int(git_repository *repo, const char *name, int value) -{ - git_config *cfg; - - cl_git_pass(git_repository_config(&cfg, repo)); - cl_git_pass(git_config_set_int32(cfg, name, value)); - git_config_free(cfg); -} - -void test_diff_tree__diff_configs(void) -{ - const char *a_commit = "d70d245e"; - const char *b_commit = "7a9e0b02"; - - g_repo = cl_git_sandbox_init("diff"); - - cl_assert((a = resolve_commit_oid_to_tree(g_repo, a_commit)) != NULL); - cl_assert((b = resolve_commit_oid_to_tree(g_repo, b_commit)) != NULL); - - cl_git_pass(git_diff_tree_to_tree(&diff, g_repo, a, b, NULL)); - - cl_git_pass(git_diff_foreach(diff, - diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &expect)); - - cl_assert_equal_i(2, expect.files); - cl_assert_equal_i(2, expect.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(6, expect.hunks); - cl_assert_equal_i(55, expect.lines); - cl_assert_equal_i(33, expect.line_ctxt); - cl_assert_equal_i(7, expect.line_adds); - cl_assert_equal_i(15, expect.line_dels); - - git_diff_free(diff); - diff = NULL; - - set_config_int(g_repo, "diff.context", 1); - - memset(&expect, 0, sizeof(expect)); - - cl_git_pass(git_diff_tree_to_tree(&diff, g_repo, a, b, NULL)); - - cl_git_pass(git_diff_foreach(diff, - diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &expect)); - - cl_assert_equal_i(2, expect.files); - cl_assert_equal_i(2, expect.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(7, expect.hunks); - cl_assert_equal_i(34, expect.lines); - cl_assert_equal_i(12, expect.line_ctxt); - cl_assert_equal_i(7, expect.line_adds); - cl_assert_equal_i(15, expect.line_dels); - - git_diff_free(diff); - diff = NULL; - - set_config_int(g_repo, "diff.context", 0); - set_config_int(g_repo, "diff.noprefix", 1); - - memset(&expect, 0, sizeof(expect)); - - cl_git_pass(git_diff_tree_to_tree(&diff, g_repo, a, b, NULL)); - - cl_git_pass(git_diff_foreach(diff, - diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &expect)); - - cl_assert_equal_i(2, expect.files); - cl_assert_equal_i(2, expect.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(7, expect.hunks); - cl_assert_equal_i(22, expect.lines); - cl_assert_equal_i(0, expect.line_ctxt); - cl_assert_equal_i(7, expect.line_adds); - cl_assert_equal_i(15, expect.line_dels); -} diff --git a/vendor/libgit2/tests/diff/workdir.c b/vendor/libgit2/tests/diff/workdir.c deleted file mode 100644 index e1bbce8fb..000000000 --- a/vendor/libgit2/tests/diff/workdir.c +++ /dev/null @@ -1,2162 +0,0 @@ -#include "clar_libgit2.h" -#include "diff_helpers.h" -#include "repository.h" -#include "git2/sys/diff.h" -#include "../checkout/checkout_helpers.h" - -static git_repository *g_repo = NULL; - -void test_diff_workdir__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -void test_diff_workdir__to_index(void) -{ - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - git_diff *diff = NULL; - diff_expects exp; - int use_iterator; - - g_repo = cl_git_sandbox_init("status"); - - opts.context_lines = 3; - opts.interhunk_lines = 1; - opts.flags |= GIT_DIFF_INCLUDE_IGNORED | GIT_DIFF_INCLUDE_UNTRACKED; - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - - for (use_iterator = 0; use_iterator <= 1; use_iterator++) { - memset(&exp, 0, sizeof(exp)); - - if (use_iterator) - cl_git_pass(diff_foreach_via_iterator( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - else - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - - /* to generate these values: - * - cd to tests/resources/status, - * - mv .gitted .git - * - git diff --name-status - * - git diff - * - mv .git .gitted - */ - cl_assert_equal_i(13, exp.files); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); - cl_assert_equal_i(4, exp.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(4, exp.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_IGNORED]); - cl_assert_equal_i(4, exp.file_status[GIT_DELTA_UNTRACKED]); - - cl_assert_equal_i(8, exp.hunks); - - cl_assert_equal_i(14, exp.lines); - cl_assert_equal_i(5, exp.line_ctxt); - cl_assert_equal_i(4, exp.line_adds); - cl_assert_equal_i(5, exp.line_dels); - } - - { - git_diff_perfdata perf = GIT_DIFF_PERFDATA_INIT; - cl_git_pass(git_diff_get_perfdata(&perf, diff)); - cl_assert_equal_sz( - 13 /* in root */ + 3 /* in subdir */, perf.stat_calls); - cl_assert_equal_sz(5, perf.oid_calculations); - } - - git_diff_free(diff); -} - -void test_diff_workdir__to_index_with_conflicts(void) -{ - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - git_diff *diff = NULL; - git_index *index; - git_index_entry our_entry = {{0}}, their_entry = {{0}}; - diff_expects exp = {0}; - - g_repo = cl_git_sandbox_init("status"); - - opts.context_lines = 3; - opts.interhunk_lines = 1; - - /* Adding an entry that represents a rename gets two files in conflict */ - our_entry.path = "subdir/modified_file"; - our_entry.mode = 0100644; - git_oid_fromstr(&our_entry.id, "ee3fa1b8c00aff7fe02065fdb50864bb0d932ccf"); - - their_entry.path = "subdir/rename_conflict"; - their_entry.mode = 0100644; - git_oid_fromstr(&their_entry.id, "2bd0a343aeef7a2cf0d158478966a6e587ff3863"); - - cl_git_pass(git_repository_index(&index, g_repo)); - cl_git_pass(git_index_conflict_add(index, NULL, &our_entry, &their_entry)); - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, index, &opts)); - - cl_git_pass(diff_foreach_via_iterator( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - - cl_assert_equal_i(9, exp.files); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); - cl_assert_equal_i(4, exp.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(3, exp.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(2, exp.file_status[GIT_DELTA_CONFLICTED]); - - cl_assert_equal_i(7, exp.hunks); - - cl_assert_equal_i(12, exp.lines); - cl_assert_equal_i(4, exp.line_ctxt); - cl_assert_equal_i(3, exp.line_adds); - cl_assert_equal_i(5, exp.line_dels); - - git_diff_free(diff); - git_index_free(index); -} - -void test_diff_workdir__to_index_with_assume_unchanged(void) -{ - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - git_diff *diff = NULL; - git_index *idx = NULL; - diff_expects exp; - const git_index_entry *iep; - git_index_entry ie; - - g_repo = cl_git_sandbox_init("status"); - - /* do initial diff */ - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - memset(&exp, 0, sizeof(exp)); - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - cl_assert_equal_i(8, exp.files); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); - cl_assert_equal_i(4, exp.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(4, exp.file_status[GIT_DELTA_MODIFIED]); - git_diff_free(diff); - - /* mark a couple of entries with ASSUME_UNCHANGED */ - - cl_git_pass(git_repository_index(&idx, g_repo)); - - cl_assert((iep = git_index_get_bypath(idx, "modified_file", 0)) != NULL); - memcpy(&ie, iep, sizeof(ie)); - ie.flags |= GIT_IDXENTRY_VALID; - cl_git_pass(git_index_add(idx, &ie)); - - cl_assert((iep = git_index_get_bypath(idx, "file_deleted", 0)) != NULL); - memcpy(&ie, iep, sizeof(ie)); - ie.flags |= GIT_IDXENTRY_VALID; - cl_git_pass(git_index_add(idx, &ie)); - - cl_git_pass(git_index_write(idx)); - git_index_free(idx); - - /* redo diff and see that entries are skipped */ - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - memset(&exp, 0, sizeof(exp)); - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - cl_assert_equal_i(6, exp.files); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); - cl_assert_equal_i(3, exp.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(3, exp.file_status[GIT_DELTA_MODIFIED]); - git_diff_free(diff); - -} - -void test_diff_workdir__to_tree(void) -{ - /* grabbed a couple of commit oids from the history of the attr repo */ - const char *a_commit = "26a125ee1bf"; /* the current HEAD */ - const char *b_commit = "0017bd4ab1ec3"; /* the start */ - git_tree *a, *b; - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - git_diff *diff = NULL; - git_diff *diff2 = NULL; - diff_expects exp; - int use_iterator; - - g_repo = cl_git_sandbox_init("status"); - - a = resolve_commit_oid_to_tree(g_repo, a_commit); - b = resolve_commit_oid_to_tree(g_repo, b_commit); - - opts.context_lines = 3; - opts.interhunk_lines = 1; - opts.flags |= GIT_DIFF_INCLUDE_IGNORED | GIT_DIFF_INCLUDE_UNTRACKED; - - /* You can't really generate the equivalent of git_diff_tree_to_workdir() - * using C git. It really wants to interpose the index into the diff. - * - * To validate the following results with command line git, I ran the - * following: - * - git ls-tree 26a125 - * - find . ! -path ./.git/\* -a -type f | git hash-object --stdin-paths - * The results are documented at the bottom of this file in the - * long comment entitled "PREPARATION OF TEST DATA". - */ - cl_git_pass(git_diff_tree_to_workdir(&diff, g_repo, a, &opts)); - - for (use_iterator = 0; use_iterator <= 1; use_iterator++) { - memset(&exp, 0, sizeof(exp)); - - if (use_iterator) - cl_git_pass(diff_foreach_via_iterator( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - else - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - - cl_assert_equal_i(14, exp.files); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); - cl_assert_equal_i(4, exp.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(4, exp.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_IGNORED]); - cl_assert_equal_i(5, exp.file_status[GIT_DELTA_UNTRACKED]); - } - - /* Since there is no git diff equivalent, let's just assume that the - * text diffs produced by git_diff_foreach are accurate here. We will - * do more apples-to-apples test comparison below. - */ - - git_diff_free(diff); - diff = NULL; - memset(&exp, 0, sizeof(exp)); - - /* This is a compatible emulation of "git diff " which looks like - * a workdir to tree diff (even though it is not really). This is what - * you would get from "git diff --name-status 26a125ee1bf" - */ - cl_git_pass(git_diff_tree_to_index(&diff, g_repo, a, NULL, &opts)); - cl_git_pass(git_diff_index_to_workdir(&diff2, g_repo, NULL, &opts)); - cl_git_pass(git_diff_merge(diff, diff2)); - git_diff_free(diff2); - - for (use_iterator = 0; use_iterator <= 1; use_iterator++) { - memset(&exp, 0, sizeof(exp)); - - if (use_iterator) - cl_git_pass(diff_foreach_via_iterator( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - else - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - - cl_assert_equal_i(15, exp.files); - cl_assert_equal_i(2, exp.file_status[GIT_DELTA_ADDED]); - cl_assert_equal_i(5, exp.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(4, exp.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_IGNORED]); - cl_assert_equal_i(3, exp.file_status[GIT_DELTA_UNTRACKED]); - - cl_assert_equal_i(11, exp.hunks); - - cl_assert_equal_i(17, exp.lines); - cl_assert_equal_i(4, exp.line_ctxt); - cl_assert_equal_i(8, exp.line_adds); - cl_assert_equal_i(5, exp.line_dels); - } - - git_diff_free(diff); - diff = NULL; - memset(&exp, 0, sizeof(exp)); - - /* Again, emulating "git diff " for testing purposes using - * "git diff --name-status 0017bd4ab1ec3" instead. - */ - cl_git_pass(git_diff_tree_to_index(&diff, g_repo, b, NULL, &opts)); - cl_git_pass(git_diff_index_to_workdir(&diff2, g_repo, NULL, &opts)); - cl_git_pass(git_diff_merge(diff, diff2)); - git_diff_free(diff2); - - for (use_iterator = 0; use_iterator <= 1; use_iterator++) { - memset(&exp, 0, sizeof(exp)); - - if (use_iterator) - cl_git_pass(diff_foreach_via_iterator( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - else - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - - cl_assert_equal_i(16, exp.files); - cl_assert_equal_i(5, exp.file_status[GIT_DELTA_ADDED]); - cl_assert_equal_i(4, exp.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(3, exp.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_IGNORED]); - cl_assert_equal_i(3, exp.file_status[GIT_DELTA_UNTRACKED]); - - cl_assert_equal_i(12, exp.hunks); - - cl_assert_equal_i(19, exp.lines); - cl_assert_equal_i(3, exp.line_ctxt); - cl_assert_equal_i(12, exp.line_adds); - cl_assert_equal_i(4, exp.line_dels); - } - - git_diff_free(diff); - - /* Let's try that once more with a reversed diff */ - - opts.flags |= GIT_DIFF_REVERSE; - - cl_git_pass(git_diff_tree_to_index(&diff, g_repo, b, NULL, &opts)); - cl_git_pass(git_diff_index_to_workdir(&diff2, g_repo, NULL, &opts)); - cl_git_pass(git_diff_merge(diff, diff2)); - git_diff_free(diff2); - - memset(&exp, 0, sizeof(exp)); - - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - - cl_assert_equal_i(16, exp.files); - cl_assert_equal_i(5, exp.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(4, exp.file_status[GIT_DELTA_ADDED]); - cl_assert_equal_i(3, exp.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_IGNORED]); - cl_assert_equal_i(3, exp.file_status[GIT_DELTA_UNTRACKED]); - - cl_assert_equal_i(12, exp.hunks); - - cl_assert_equal_i(19, exp.lines); - cl_assert_equal_i(3, exp.line_ctxt); - cl_assert_equal_i(12, exp.line_dels); - cl_assert_equal_i(4, exp.line_adds); - - git_diff_free(diff); - - /* all done now */ - - git_tree_free(a); - git_tree_free(b); -} - -void test_diff_workdir__to_index_with_pathspec(void) -{ - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - git_diff *diff = NULL; - diff_expects exp; - char *pathspec = NULL; - int use_iterator; - - g_repo = cl_git_sandbox_init("status"); - - opts.context_lines = 3; - opts.interhunk_lines = 1; - opts.flags |= GIT_DIFF_INCLUDE_IGNORED | GIT_DIFF_INCLUDE_UNTRACKED; - opts.pathspec.strings = &pathspec; - opts.pathspec.count = 1; - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - - for (use_iterator = 0; use_iterator <= 1; use_iterator++) { - memset(&exp, 0, sizeof(exp)); - - if (use_iterator) - cl_git_pass(diff_foreach_via_iterator( - diff, diff_file_cb, NULL, NULL, NULL, &exp)); - else - cl_git_pass(git_diff_foreach(diff, diff_file_cb, NULL, NULL, NULL, &exp)); - - cl_assert_equal_i(13, exp.files); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); - cl_assert_equal_i(4, exp.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(4, exp.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_IGNORED]); - cl_assert_equal_i(4, exp.file_status[GIT_DELTA_UNTRACKED]); - } - - git_diff_free(diff); - - pathspec = "modified_file"; - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - - for (use_iterator = 0; use_iterator <= 1; use_iterator++) { - memset(&exp, 0, sizeof(exp)); - - if (use_iterator) - cl_git_pass(diff_foreach_via_iterator( - diff, diff_file_cb, NULL, NULL, NULL, &exp)); - else - cl_git_pass(git_diff_foreach(diff, diff_file_cb, NULL, NULL, NULL, &exp)); - - cl_assert_equal_i(1, exp.files); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_IGNORED]); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_UNTRACKED]); - } - - git_diff_free(diff); - - pathspec = "subdir"; - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - - for (use_iterator = 0; use_iterator <= 1; use_iterator++) { - memset(&exp, 0, sizeof(exp)); - - if (use_iterator) - cl_git_pass(diff_foreach_via_iterator( - diff, diff_file_cb, NULL, NULL, NULL, &exp)); - else - cl_git_pass(git_diff_foreach(diff, diff_file_cb, NULL, NULL, NULL, &exp)); - - cl_assert_equal_i(3, exp.files); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_IGNORED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_UNTRACKED]); - } - - git_diff_free(diff); - - pathspec = "*_deleted"; - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - - for (use_iterator = 0; use_iterator <= 1; use_iterator++) { - memset(&exp, 0, sizeof(exp)); - - if (use_iterator) - cl_git_pass(diff_foreach_via_iterator( - diff, diff_file_cb, NULL, NULL, NULL, &exp)); - else - cl_git_pass(git_diff_foreach(diff, diff_file_cb, NULL, NULL, NULL, &exp)); - - cl_assert_equal_i(2, exp.files); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); - cl_assert_equal_i(2, exp.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_IGNORED]); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_UNTRACKED]); - } - - git_diff_free(diff); -} - -void test_diff_workdir__to_index_with_pathlist_disabling_fnmatch(void) -{ - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - git_diff *diff = NULL; - diff_expects exp; - char *pathspec = NULL; - int use_iterator; - - g_repo = cl_git_sandbox_init("status"); - - opts.context_lines = 3; - opts.interhunk_lines = 1; - opts.flags |= GIT_DIFF_INCLUDE_IGNORED | GIT_DIFF_INCLUDE_UNTRACKED | - GIT_DIFF_DISABLE_PATHSPEC_MATCH; - opts.pathspec.strings = &pathspec; - opts.pathspec.count = 0; - - /* ensure that an empty pathspec list is ignored */ - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - - for (use_iterator = 0; use_iterator <= 1; use_iterator++) { - memset(&exp, 0, sizeof(exp)); - - if (use_iterator) - cl_git_pass(diff_foreach_via_iterator( - diff, diff_file_cb, NULL, NULL, NULL, &exp)); - else - cl_git_pass(git_diff_foreach(diff, diff_file_cb, NULL, NULL, NULL, &exp)); - - cl_assert_equal_i(13, exp.files); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); - cl_assert_equal_i(4, exp.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(4, exp.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_IGNORED]); - cl_assert_equal_i(4, exp.file_status[GIT_DELTA_UNTRACKED]); - } - - git_diff_free(diff); - - /* ensure that a single NULL pathspec is filtered out (like when using - * fnmatch filtering) - */ - - opts.pathspec.count = 1; - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - - for (use_iterator = 0; use_iterator <= 1; use_iterator++) { - memset(&exp, 0, sizeof(exp)); - - if (use_iterator) - cl_git_pass(diff_foreach_via_iterator( - diff, diff_file_cb, NULL, NULL, NULL, &exp)); - else - cl_git_pass(git_diff_foreach(diff, diff_file_cb, NULL, NULL, NULL, &exp)); - - cl_assert_equal_i(13, exp.files); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); - cl_assert_equal_i(4, exp.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(4, exp.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_IGNORED]); - cl_assert_equal_i(4, exp.file_status[GIT_DELTA_UNTRACKED]); - } - - git_diff_free(diff); - - pathspec = "modified_file"; - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - - for (use_iterator = 0; use_iterator <= 1; use_iterator++) { - memset(&exp, 0, sizeof(exp)); - - if (use_iterator) - cl_git_pass(diff_foreach_via_iterator( - diff, diff_file_cb, NULL, NULL, NULL, &exp)); - else - cl_git_pass(git_diff_foreach(diff, diff_file_cb, NULL, NULL, NULL, &exp)); - - cl_assert_equal_i(1, exp.files); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_IGNORED]); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_UNTRACKED]); - } - - git_diff_free(diff); - - /* ensure that subdirs can be specified */ - pathspec = "subdir"; - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - - for (use_iterator = 0; use_iterator <= 1; use_iterator++) { - memset(&exp, 0, sizeof(exp)); - - if (use_iterator) - cl_git_pass(diff_foreach_via_iterator( - diff, diff_file_cb, NULL, NULL, NULL, &exp)); - else - cl_git_pass(git_diff_foreach(diff, diff_file_cb, NULL, NULL, NULL, &exp)); - - cl_assert_equal_i(3, exp.files); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_IGNORED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_UNTRACKED]); - } - - git_diff_free(diff); - - /* ensure that subdirs can be specified with a trailing slash */ - pathspec = "subdir/"; - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - - for (use_iterator = 0; use_iterator <= 1; use_iterator++) { - memset(&exp, 0, sizeof(exp)); - - if (use_iterator) - cl_git_pass(diff_foreach_via_iterator( - diff, diff_file_cb, NULL, NULL, NULL, &exp)); - else - cl_git_pass(git_diff_foreach(diff, diff_file_cb, NULL, NULL, NULL, &exp)); - - cl_assert_equal_i(3, exp.files); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_IGNORED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_UNTRACKED]); - } - - git_diff_free(diff); - - /* ensure that fnmatching is completely disabled */ - pathspec = "subdir/*"; - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - - for (use_iterator = 0; use_iterator <= 1; use_iterator++) { - memset(&exp, 0, sizeof(exp)); - - if (use_iterator) - cl_git_pass(diff_foreach_via_iterator( - diff, diff_file_cb, NULL, NULL, NULL, &exp)); - else - cl_git_pass(git_diff_foreach(diff, diff_file_cb, NULL, NULL, NULL, &exp)); - - cl_assert_equal_i(0, exp.files); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_IGNORED]); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_UNTRACKED]); - } - - git_diff_free(diff); - - /* ensure that the prefix matching isn't completely braindead */ - pathspec = "subdi"; - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - - for (use_iterator = 0; use_iterator <= 1; use_iterator++) { - memset(&exp, 0, sizeof(exp)); - - if (use_iterator) - cl_git_pass(diff_foreach_via_iterator( - diff, diff_file_cb, NULL, NULL, NULL, &exp)); - else - cl_git_pass(git_diff_foreach(diff, diff_file_cb, NULL, NULL, NULL, &exp)); - - cl_assert_equal_i(0, exp.files); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_IGNORED]); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_UNTRACKED]); - } - - git_diff_free(diff); - - /* ensure that fnmatching isn't working at all */ - pathspec = "*_deleted"; - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - - for (use_iterator = 0; use_iterator <= 1; use_iterator++) { - memset(&exp, 0, sizeof(exp)); - - if (use_iterator) - cl_git_pass(diff_foreach_via_iterator( - diff, diff_file_cb, NULL, NULL, NULL, &exp)); - else - cl_git_pass(git_diff_foreach(diff, diff_file_cb, NULL, NULL, NULL, &exp)); - - cl_assert_equal_i(0, exp.files); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_IGNORED]); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_UNTRACKED]); - } - - git_diff_free(diff); -} - -void test_diff_workdir__filemode_changes(void) -{ - git_diff *diff = NULL; - diff_expects exp; - int use_iterator; - - if (!cl_is_chmod_supported()) - return; - - g_repo = cl_git_sandbox_init("issue_592"); - - cl_repo_set_bool(g_repo, "core.filemode", true); - - /* test once with no mods */ - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, NULL)); - - for (use_iterator = 0; use_iterator <= 1; use_iterator++) { - memset(&exp, 0, sizeof(exp)); - - if (use_iterator) - cl_git_pass(diff_foreach_via_iterator( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - else - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - - cl_assert_equal_i(0, exp.files); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(0, exp.hunks); - } - - git_diff_free(diff); - - /* chmod file and test again */ - - cl_assert(cl_toggle_filemode("issue_592/a.txt")); - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, NULL)); - - for (use_iterator = 0; use_iterator <= 1; use_iterator++) { - memset(&exp, 0, sizeof(exp)); - - if (use_iterator) - cl_git_pass(diff_foreach_via_iterator( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - else - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - - cl_assert_equal_i(1, exp.files); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(0, exp.hunks); - } - - git_diff_free(diff); - - cl_assert(cl_toggle_filemode("issue_592/a.txt")); -} - -void test_diff_workdir__filemode_changes_with_filemode_false(void) -{ - git_diff *diff = NULL; - diff_expects exp; - - if (!cl_is_chmod_supported()) - return; - - g_repo = cl_git_sandbox_init("issue_592"); - - cl_repo_set_bool(g_repo, "core.filemode", false); - - /* test once with no mods */ - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, NULL)); - - memset(&exp, 0, sizeof(exp)); - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - - cl_assert_equal_i(0, exp.files); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(0, exp.hunks); - - git_diff_free(diff); - - /* chmod file and test again */ - - cl_assert(cl_toggle_filemode("issue_592/a.txt")); - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, NULL)); - - memset(&exp, 0, sizeof(exp)); - cl_git_pass(git_diff_foreach(diff, - diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - - cl_assert_equal_i(0, exp.files); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(0, exp.hunks); - - git_diff_free(diff); - - cl_assert(cl_toggle_filemode("issue_592/a.txt")); -} - -void test_diff_workdir__head_index_and_workdir_all_differ(void) -{ - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - git_diff *diff_i2t = NULL, *diff_w2i = NULL; - diff_expects exp; - char *pathspec = "staged_changes_modified_file"; - git_tree *tree; - int use_iterator; - - /* For this file, - * - head->index diff has 1 line of context, 1 line of diff - * - index->workdir diff has 2 lines of context, 1 line of diff - * but - * - head->workdir diff has 1 line of context, 2 lines of diff - * Let's make sure the right one is returned from each fn. - */ - - g_repo = cl_git_sandbox_init("status"); - - tree = resolve_commit_oid_to_tree(g_repo, "26a125ee1bfc5df1e1b2e9441bbe63c8a7ae989f"); - - opts.pathspec.strings = &pathspec; - opts.pathspec.count = 1; - - cl_git_pass(git_diff_tree_to_index(&diff_i2t, g_repo, tree, NULL, &opts)); - cl_git_pass(git_diff_index_to_workdir(&diff_w2i, g_repo, NULL, &opts)); - - for (use_iterator = 0; use_iterator <= 1; use_iterator++) { - memset(&exp, 0, sizeof(exp)); - - if (use_iterator) - cl_git_pass(diff_foreach_via_iterator( - diff_i2t, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - else - cl_git_pass(git_diff_foreach( - diff_i2t, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - - cl_assert_equal_i(1, exp.files); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(1, exp.hunks); - cl_assert_equal_i(2, exp.lines); - cl_assert_equal_i(1, exp.line_ctxt); - cl_assert_equal_i(1, exp.line_adds); - cl_assert_equal_i(0, exp.line_dels); - } - - for (use_iterator = 0; use_iterator <= 1; use_iterator++) { - memset(&exp, 0, sizeof(exp)); - - if (use_iterator) - cl_git_pass(diff_foreach_via_iterator( - diff_w2i, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - else - cl_git_pass(git_diff_foreach( - diff_w2i, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - - cl_assert_equal_i(1, exp.files); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(1, exp.hunks); - cl_assert_equal_i(3, exp.lines); - cl_assert_equal_i(2, exp.line_ctxt); - cl_assert_equal_i(1, exp.line_adds); - cl_assert_equal_i(0, exp.line_dels); - } - - cl_git_pass(git_diff_merge(diff_i2t, diff_w2i)); - - for (use_iterator = 0; use_iterator <= 1; use_iterator++) { - memset(&exp, 0, sizeof(exp)); - - if (use_iterator) - cl_git_pass(diff_foreach_via_iterator( - diff_i2t, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - else - cl_git_pass(git_diff_foreach( - diff_i2t, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - - cl_assert_equal_i(1, exp.files); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(1, exp.hunks); - cl_assert_equal_i(3, exp.lines); - cl_assert_equal_i(1, exp.line_ctxt); - cl_assert_equal_i(2, exp.line_adds); - cl_assert_equal_i(0, exp.line_dels); - } - - git_diff_free(diff_i2t); - git_diff_free(diff_w2i); - - git_tree_free(tree); -} - -void test_diff_workdir__eof_newline_changes(void) -{ - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - git_diff *diff = NULL; - diff_expects exp; - char *pathspec = "current_file"; - int use_iterator; - - g_repo = cl_git_sandbox_init("status"); - - opts.pathspec.strings = &pathspec; - opts.pathspec.count = 1; - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - - for (use_iterator = 0; use_iterator <= 1; use_iterator++) { - memset(&exp, 0, sizeof(exp)); - - if (use_iterator) - cl_git_pass(diff_foreach_via_iterator( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - else - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - - cl_assert_equal_i(0, exp.files); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(0, exp.hunks); - cl_assert_equal_i(0, exp.lines); - cl_assert_equal_i(0, exp.line_ctxt); - cl_assert_equal_i(0, exp.line_adds); - cl_assert_equal_i(0, exp.line_dels); - } - - git_diff_free(diff); - - cl_git_append2file("status/current_file", "\n"); - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - - for (use_iterator = 0; use_iterator <= 1; use_iterator++) { - memset(&exp, 0, sizeof(exp)); - - if (use_iterator) - cl_git_pass(diff_foreach_via_iterator( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - else - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - - cl_assert_equal_i(1, exp.files); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(1, exp.hunks); - cl_assert_equal_i(2, exp.lines); - cl_assert_equal_i(1, exp.line_ctxt); - cl_assert_equal_i(1, exp.line_adds); - cl_assert_equal_i(0, exp.line_dels); - } - - git_diff_free(diff); - - cl_git_rewritefile("status/current_file", "current_file"); - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - - for (use_iterator = 0; use_iterator <= 1; use_iterator++) { - memset(&exp, 0, sizeof(exp)); - - if (use_iterator) - cl_git_pass(diff_foreach_via_iterator( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - else - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - - cl_assert_equal_i(1, exp.files); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(1, exp.hunks); - cl_assert_equal_i(3, exp.lines); - cl_assert_equal_i(0, exp.line_ctxt); - cl_assert_equal_i(1, exp.line_adds); - cl_assert_equal_i(2, exp.line_dels); - } - - git_diff_free(diff); -} - -/* PREPARATION OF TEST DATA - * - * Since there is no command line equivalent of git_diff_tree_to_workdir, - * it was a bit of a pain to confirm that I was getting the expected - * results in the first part of this tests. Here is what I ended up - * doing to set my expectation for the file counts and results: - * - * Running "git ls-tree 26a125" and "git ls-tree aa27a6" shows: - * - * A a0de7e0ac200c489c41c59dfa910154a70264e6e current_file - * B 5452d32f1dd538eb0405e8a83cc185f79e25e80f file_deleted - * C 452e4244b5d083ddf0460acf1ecc74db9dcfa11a modified_file - * D 32504b727382542f9f089e24fddac5e78533e96c staged_changes - * E 061d42a44cacde5726057b67558821d95db96f19 staged_changes_file_deleted - * F 70bd9443ada07063e7fbf0b3ff5c13f7494d89c2 staged_changes_modified_file - * G e9b9107f290627c04d097733a10055af941f6bca staged_delete_file_deleted - * H dabc8af9bd6e9f5bbe96a176f1a24baf3d1f8916 staged_delete_modified_file - * I 53ace0d1cc1145a5f4fe4f78a186a60263190733 subdir/current_file - * J 1888c805345ba265b0ee9449b8877b6064592058 subdir/deleted_file - * K a6191982709b746d5650e93c2acf34ef74e11504 subdir/modified_file - * L e8ee89e15bbe9b20137715232387b3de5b28972e subdir.txt - * - * -------- - * - * find . ! -path ./.git/\* -a -type f | git hash-object --stdin-paths - * - * A a0de7e0ac200c489c41c59dfa910154a70264e6e current_file - * M 6a79f808a9c6bc9531ac726c184bbcd9351ccf11 ignored_file - * C 0a539630525aca2e7bc84975958f92f10a64c9b6 modified_file - * N d4fa8600b4f37d7516bef4816ae2c64dbf029e3a new_file - * D 55d316c9ba708999f1918e9677d01dfcae69c6b9 staged_changes - * F 011c3440d5c596e21d836aa6d7b10eb581f68c49 staged_changes_modified_file - * H dabc8af9bd6e9f5bbe96a176f1a24baf3d1f8916 staged_delete_modified_file - * O 529a16e8e762d4acb7b9636ff540a00831f9155a staged_new_file - * P 8b090c06d14ffa09c4e880088ebad33893f921d1 staged_new_file_modified_file - * I 53ace0d1cc1145a5f4fe4f78a186a60263190733 subdir/current_file - * K 57274b75eeb5f36fd55527806d567b2240a20c57 subdir/modified_file - * Q 80a86a6931b91bc01c2dbf5ca55bdd24ad1ef466 subdir/new_file - * L e8ee89e15bbe9b20137715232387b3de5b28972e subdir.txt - * - * -------- - * - * A - current_file (UNMODIFIED) -> not in results - * B D file_deleted - * M I ignored_file (IGNORED) - * C M modified_file - * N U new_file (UNTRACKED) - * D M staged_changes - * E D staged_changes_file_deleted - * F M staged_changes_modified_file - * G D staged_delete_file_deleted - * H - staged_delete_modified_file (UNMODIFIED) -> not in results - * O U staged_new_file - * P U staged_new_file_modified_file - * I - subdir/current_file (UNMODIFIED) -> not in results - * J D subdir/deleted_file - * K M subdir/modified_file - * Q U subdir/new_file - * L - subdir.txt (UNMODIFIED) -> not in results - * - * Expect 13 files, 0 ADD, 4 DEL, 4 MOD, 1 IGN, 4 UNTR - */ - - -void test_diff_workdir__larger_hunks(void) -{ - const char *a_commit = "d70d245ed97ed2aa596dd1af6536e4bfdb047b69"; - const char *b_commit = "7a9e0b02e63179929fed24f0a3e0f19168114d10"; - git_tree *a, *b; - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - size_t i, d, num_d, h, num_h, l, num_l; - - g_repo = cl_git_sandbox_init("diff"); - - cl_assert((a = resolve_commit_oid_to_tree(g_repo, a_commit)) != NULL); - cl_assert((b = resolve_commit_oid_to_tree(g_repo, b_commit)) != NULL); - - opts.context_lines = 1; - opts.interhunk_lines = 0; - - for (i = 0; i <= 2; ++i) { - git_diff *diff = NULL; - git_patch *patch; - const git_diff_hunk *hunk; - const git_diff_line *line; - - /* okay, this is a bit silly, but oh well */ - switch (i) { - case 0: - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - break; - case 1: - cl_git_pass(git_diff_tree_to_workdir(&diff, g_repo, a, &opts)); - break; - case 2: - cl_git_pass(git_diff_tree_to_workdir(&diff, g_repo, b, &opts)); - break; - } - - num_d = git_diff_num_deltas(diff); - cl_assert_equal_i(2, (int)num_d); - - for (d = 0; d < num_d; ++d) { - cl_git_pass(git_patch_from_diff(&patch, diff, d)); - cl_assert(patch); - - num_h = git_patch_num_hunks(patch); - for (h = 0; h < num_h; h++) { - cl_git_pass(git_patch_get_hunk(&hunk, &num_l, patch, h)); - - for (l = 0; l < num_l; ++l) { - cl_git_pass( - git_patch_get_line_in_hunk(&line, patch, h, l)); - cl_assert(line); - } - - /* confirm fail after the last item */ - cl_git_fail( - git_patch_get_line_in_hunk(&line, patch, h, num_l)); - } - - /* confirm fail after the last item */ - cl_git_fail(git_patch_get_hunk(&hunk, &num_l, patch, num_h)); - - git_patch_free(patch); - } - - git_diff_free(diff); - } - - git_tree_free(a); - git_tree_free(b); -} - -/* Set up a test that exercises this code. The easiest test using existing - * test data is probably to create a sandbox of submod2 and then run a - * git_diff_tree_to_workdir against tree - * 873585b94bdeabccea991ea5e3ec1a277895b698. As for what you should actually - * test, you can start by just checking that the number of lines of diff - * content matches the actual output of git diff. That will at least - * demonstrate that the submodule content is being used to generate somewhat - * comparable outputs. It is a test that would fail without this code and - * will succeed with it. - */ - -#include "../submodule/submodule_helpers.h" - -void test_diff_workdir__submodules(void) -{ - const char *a_commit = "873585b94bdeabccea991ea5e3ec1a277895b698"; - git_tree *a; - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - git_diff *diff = NULL; - diff_expects exp; - - g_repo = setup_fixture_submod2(); - - a = resolve_commit_oid_to_tree(g_repo, a_commit); - - opts.flags = - GIT_DIFF_INCLUDE_UNTRACKED | - GIT_DIFF_INCLUDE_IGNORED | - GIT_DIFF_RECURSE_UNTRACKED_DIRS | - GIT_DIFF_SHOW_UNTRACKED_CONTENT; - - cl_git_pass(git_diff_tree_to_workdir(&diff, g_repo, a, &opts)); - - /* diff_print(stderr, diff); */ - - /* essentially doing: git diff 873585b94bdeabccea991ea5e3ec1a277895b698 */ - - memset(&exp, 0, sizeof(exp)); - - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - - /* so "git diff 873585" returns: - * M .gitmodules - * A just_a_dir/contents - * A just_a_file - * A sm_added_and_uncommited - * A sm_changed_file - * A sm_changed_head - * A sm_changed_index - * A sm_changed_untracked_file - * M sm_missing_commits - * A sm_unchanged - * which is a little deceptive because of the difference between the - * "git diff " results from "git_diff_tree_to_workdir". The - * only significant difference is that those Added items will show up - * as Untracked items in the pure libgit2 diff. - * - * Then add in the two extra untracked items "not" and "not-submodule" - * to get the 12 files reported here. - */ - - cl_assert_equal_i(12, exp.files); - - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(2, exp.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_IGNORED]); - cl_assert_equal_i(10, exp.file_status[GIT_DELTA_UNTRACKED]); - - /* the following numbers match "git diff 873585" exactly */ - - cl_assert_equal_i(9, exp.hunks); - - cl_assert_equal_i(33, exp.lines); - cl_assert_equal_i(2, exp.line_ctxt); - cl_assert_equal_i(30, exp.line_adds); - cl_assert_equal_i(1, exp.line_dels); - - git_diff_free(diff); - git_tree_free(a); -} - -void test_diff_workdir__cannot_diff_against_a_bare_repository(void) -{ - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - git_diff *diff = NULL; - git_tree *tree; - - g_repo = cl_git_sandbox_init("testrepo.git"); - - cl_assert_equal_i( - GIT_EBAREREPO, git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - - cl_git_pass(git_repository_head_tree(&tree, g_repo)); - - cl_assert_equal_i( - GIT_EBAREREPO, git_diff_tree_to_workdir(&diff, g_repo, tree, &opts)); - - git_tree_free(tree); -} - -void test_diff_workdir__to_null_tree(void) -{ - git_diff *diff; - diff_expects exp; - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - - opts.flags = GIT_DIFF_INCLUDE_UNTRACKED | - GIT_DIFF_RECURSE_UNTRACKED_DIRS; - - g_repo = cl_git_sandbox_init("status"); - - cl_git_pass(git_diff_tree_to_workdir(&diff, g_repo, NULL, &opts)); - - memset(&exp, 0, sizeof(exp)); - - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - - cl_assert_equal_i(exp.files, exp.file_status[GIT_DELTA_UNTRACKED]); - - git_diff_free(diff); -} - -void test_diff_workdir__checks_options_version(void) -{ - git_diff *diff; - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - const git_error *err; - - g_repo = cl_git_sandbox_init("status"); - - opts.version = 0; - cl_git_fail(git_diff_tree_to_workdir(&diff, g_repo, NULL, &opts)); - err = giterr_last(); - cl_assert_equal_i(GITERR_INVALID, err->klass); - - giterr_clear(); - opts.version = 1024; - cl_git_fail(git_diff_tree_to_workdir(&diff, g_repo, NULL, &opts)); - err = giterr_last(); - cl_assert_equal_i(GITERR_INVALID, err->klass); -} - -void test_diff_workdir__can_diff_empty_file(void) -{ - git_diff *diff; - git_tree *tree; - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - struct stat st; - git_patch *patch; - - g_repo = cl_git_sandbox_init("attr_index"); - - tree = resolve_commit_oid_to_tree(g_repo, "3812cfef3661"); /* HEAD */ - - /* baseline - make sure there are no outstanding diffs */ - - cl_git_pass(git_diff_tree_to_workdir(&diff, g_repo, tree, &opts)); - cl_assert_equal_i(2, (int)git_diff_num_deltas(diff)); - git_diff_free(diff); - - /* empty contents of file */ - - cl_git_rewritefile("attr_index/README.txt", ""); - cl_git_pass(git_path_lstat("attr_index/README.txt", &st)); - cl_assert_equal_i(0, (int)st.st_size); - - cl_git_pass(git_diff_tree_to_workdir(&diff, g_repo, tree, &opts)); - cl_assert_equal_i(3, (int)git_diff_num_deltas(diff)); - /* diffs are: .gitattributes, README.txt, sub/sub/.gitattributes */ - cl_git_pass(git_patch_from_diff(&patch, diff, 1)); - git_patch_free(patch); - git_diff_free(diff); - - /* remove a file altogether */ - - cl_git_pass(p_unlink("attr_index/README.txt")); - cl_assert(!git_path_exists("attr_index/README.txt")); - - cl_git_pass(git_diff_tree_to_workdir(&diff, g_repo, tree, &opts)); - cl_assert_equal_i(3, (int)git_diff_num_deltas(diff)); - cl_git_pass(git_patch_from_diff(&patch, diff, 1)); - git_patch_free(patch); - git_diff_free(diff); - - git_tree_free(tree); -} - -void test_diff_workdir__to_index_issue_1397(void) -{ - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - git_diff *diff = NULL; - diff_expects exp; - - g_repo = cl_git_sandbox_init("issue_1397"); - - cl_repo_set_bool(g_repo, "core.autocrlf", true); - - opts.context_lines = 3; - opts.interhunk_lines = 1; - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - - memset(&exp, 0, sizeof(exp)); - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - - cl_assert_equal_i(0, exp.files); - cl_assert_equal_i(0, exp.hunks); - cl_assert_equal_i(0, exp.lines); - - git_diff_free(diff); - diff = NULL; - - cl_git_rewritefile("issue_1397/crlf_file.txt", - "first line\r\nsecond line modified\r\nboth with crlf"); - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - - memset(&exp, 0, sizeof(exp)); - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - - cl_assert_equal_i(1, exp.files); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_MODIFIED]); - - cl_assert_equal_i(1, exp.hunks); - - cl_assert_equal_i(5, exp.lines); - cl_assert_equal_i(3, exp.line_ctxt); - cl_assert_equal_i(1, exp.line_adds); - cl_assert_equal_i(1, exp.line_dels); - - git_diff_free(diff); -} - -void test_diff_workdir__to_tree_issue_1397(void) -{ - const char *a_commit = "7f483a738"; /* the current HEAD */ - git_tree *a; - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - git_diff *diff = NULL; - git_diff *diff2 = NULL; - diff_expects exp; - - g_repo = cl_git_sandbox_init("issue_1397"); - - cl_repo_set_bool(g_repo, "core.autocrlf", true); - - a = resolve_commit_oid_to_tree(g_repo, a_commit); - - opts.context_lines = 3; - opts.interhunk_lines = 1; - - cl_git_pass(git_diff_tree_to_workdir(&diff, g_repo, a, &opts)); - - memset(&exp, 0, sizeof(exp)); - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - - cl_assert_equal_i(0, exp.files); - cl_assert_equal_i(0, exp.hunks); - cl_assert_equal_i(0, exp.lines); - - git_diff_free(diff); - diff = NULL; - - cl_git_pass(git_diff_tree_to_index(&diff, g_repo, a, NULL, &opts)); - cl_git_pass(git_diff_index_to_workdir(&diff2, g_repo, NULL, &opts)); - cl_git_pass(git_diff_merge(diff, diff2)); - git_diff_free(diff2); - - memset(&exp, 0, sizeof(exp)); - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - - cl_assert_equal_i(0, exp.files); - cl_assert_equal_i(0, exp.hunks); - cl_assert_equal_i(0, exp.lines); - - git_diff_free(diff); - git_tree_free(a); -} - -void test_diff_workdir__untracked_directory_scenarios(void) -{ - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - git_diff *diff = NULL; - diff_expects exp; - char *pathspec = NULL; - static const char *files0[] = { - "subdir/deleted_file", - "subdir/modified_file", - "subdir/new_file", - NULL - }; - static const char *files1[] = { - "subdir/deleted_file", - "subdir/directory/", - "subdir/modified_file", - "subdir/new_file", - NULL - }; - static const char *files2[] = { - "subdir/deleted_file", - "subdir/directory/more/notignored", - "subdir/modified_file", - "subdir/new_file", - NULL - }; - - g_repo = cl_git_sandbox_init("status"); - cl_git_mkfile("status/.gitignore", "ignored\n"); - - opts.context_lines = 3; - opts.interhunk_lines = 1; - opts.flags |= GIT_DIFF_INCLUDE_IGNORED | GIT_DIFF_INCLUDE_UNTRACKED; - opts.pathspec.strings = &pathspec; - opts.pathspec.count = 1; - pathspec = "subdir"; - - /* baseline for "subdir" pathspec */ - - memset(&exp, 0, sizeof(exp)); - exp.names = files0; - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - - cl_git_pass(git_diff_foreach(diff, diff_file_cb, NULL, NULL, NULL, &exp)); - - cl_assert_equal_i(3, exp.files); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_IGNORED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_UNTRACKED]); - - git_diff_free(diff); - - /* empty directory */ - - cl_git_pass(p_mkdir("status/subdir/directory", 0777)); - - memset(&exp, 0, sizeof(exp)); - exp.names = files1; - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - - cl_git_pass(git_diff_foreach(diff, diff_file_cb, NULL, NULL, NULL, &exp)); - - cl_assert_equal_i(4, exp.files); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_IGNORED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_UNTRACKED]); - - git_diff_free(diff); - - /* empty directory in empty directory */ - - cl_git_pass(p_mkdir("status/subdir/directory/empty", 0777)); - - memset(&exp, 0, sizeof(exp)); - exp.names = files1; - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - - cl_git_pass(git_diff_foreach(diff, diff_file_cb, NULL, NULL, NULL, &exp)); - - cl_assert_equal_i(4, exp.files); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_IGNORED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_UNTRACKED]); - - git_diff_free(diff); - - /* directory with only ignored files */ - - cl_git_pass(p_mkdir("status/subdir/directory/deeper", 0777)); - cl_git_mkfile("status/subdir/directory/deeper/ignored", "ignore me\n"); - - cl_git_pass(p_mkdir("status/subdir/directory/another", 0777)); - cl_git_mkfile("status/subdir/directory/another/ignored", "ignore me\n"); - - memset(&exp, 0, sizeof(exp)); - exp.names = files1; - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - - cl_git_pass(git_diff_foreach(diff, diff_file_cb, NULL, NULL, NULL, &exp)); - - cl_assert_equal_i(4, exp.files); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_IGNORED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_UNTRACKED]); - - git_diff_free(diff); - - /* directory with ignored directory (contents irrelevant) */ - - cl_git_pass(p_mkdir("status/subdir/directory/more", 0777)); - cl_git_pass(p_mkdir("status/subdir/directory/more/ignored", 0777)); - cl_git_mkfile("status/subdir/directory/more/ignored/notignored", - "inside ignored dir\n"); - - memset(&exp, 0, sizeof(exp)); - exp.names = files1; - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - - cl_git_pass(git_diff_foreach(diff, diff_file_cb, NULL, NULL, NULL, &exp)); - - cl_assert_equal_i(4, exp.files); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_IGNORED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_UNTRACKED]); - - git_diff_free(diff); - - /* quick version avoids directory scan */ - - opts.flags = opts.flags | GIT_DIFF_ENABLE_FAST_UNTRACKED_DIRS; - - memset(&exp, 0, sizeof(exp)); - exp.names = files1; - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - - cl_git_pass(git_diff_foreach(diff, diff_file_cb, NULL, NULL, NULL, &exp)); - - cl_assert_equal_i(4, exp.files); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_IGNORED]); - cl_assert_equal_i(2, exp.file_status[GIT_DELTA_UNTRACKED]); - - git_diff_free(diff); - - /* directory with nested non-ignored content */ - - opts.flags = opts.flags & ~GIT_DIFF_ENABLE_FAST_UNTRACKED_DIRS; - - cl_git_mkfile("status/subdir/directory/more/notignored", - "not ignored deep under untracked\n"); - - memset(&exp, 0, sizeof(exp)); - exp.names = files1; - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - - cl_git_pass(git_diff_foreach(diff, diff_file_cb, NULL, NULL, NULL, &exp)); - - cl_assert_equal_i(4, exp.files); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_IGNORED]); - cl_assert_equal_i(2, exp.file_status[GIT_DELTA_UNTRACKED]); - - git_diff_free(diff); - - /* use RECURSE_UNTRACKED_DIRS to get actual untracked files (no ignores) */ - - opts.flags = opts.flags & ~GIT_DIFF_INCLUDE_IGNORED; - opts.flags = opts.flags | GIT_DIFF_RECURSE_UNTRACKED_DIRS; - - memset(&exp, 0, sizeof(exp)); - exp.names = files2; - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - - cl_git_pass(git_diff_foreach(diff, diff_file_cb, NULL, NULL, NULL, &exp)); - - cl_assert_equal_i(4, exp.files); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_IGNORED]); - cl_assert_equal_i(2, exp.file_status[GIT_DELTA_UNTRACKED]); - - git_diff_free(diff); -} - - -void test_diff_workdir__untracked_directory_comes_last(void) -{ - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - git_diff *diff = NULL; - - g_repo = cl_git_sandbox_init("renames"); - - cl_git_mkfile("renames/.gitignore", "*.ign\n"); - cl_git_pass(p_mkdir("renames/zzz_untracked", 0777)); - cl_git_mkfile("renames/zzz_untracked/an.ign", "ignore me please"); - cl_git_mkfile("renames/zzz_untracked/skip.ign", "ignore me really"); - cl_git_mkfile("renames/zzz_untracked/test.ign", "ignore me now"); - - opts.context_lines = 3; - opts.interhunk_lines = 1; - opts.flags |= GIT_DIFF_INCLUDE_IGNORED | GIT_DIFF_INCLUDE_UNTRACKED; - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - - cl_assert(diff != NULL); - - git_diff_free(diff); -} - -void test_diff_workdir__untracked_with_bom(void) -{ - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - git_diff *diff = NULL; - const git_diff_delta *delta; - - g_repo = cl_git_sandbox_init("empty_standard_repo"); - cl_repo_set_bool(g_repo, "core.autocrlf", true); - - cl_git_write2file("empty_standard_repo/bom.txt", - "\xFF\xFE\x31\x00\x32\x00\x33\x00\x34\x00", 10, O_WRONLY|O_CREAT, 0664); - - opts.flags = - GIT_DIFF_INCLUDE_UNTRACKED | GIT_DIFF_SHOW_UNTRACKED_CONTENT; - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - - cl_assert_equal_i(1, git_diff_num_deltas(diff)); - cl_assert((delta = git_diff_get_delta(diff, 0)) != NULL); - cl_assert_equal_i(GIT_DELTA_UNTRACKED, delta->status); - - /* not known at this point - * cl_assert((delta->flags & GIT_DIFF_FLAG_BINARY) != 0); - */ - - git_diff_free(diff); -} - -void test_diff_workdir__patience_diff(void) -{ - git_index *index; - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - git_diff *diff = NULL; - git_patch *patch = NULL; - git_buf buf = GIT_BUF_INIT; - const char *expected_normal = "diff --git a/test.txt b/test.txt\nindex 34a5acc..d52725f 100644\n--- a/test.txt\n+++ b/test.txt\n@@ -1,10 +1,7 @@\n When I wrote this\n I did not know\n-how to create\n-a patience diff\n I did not know\n how to create\n+a patience diff\n another problem\n-I did not know\n-how to create\n a minimal diff\n"; - const char *expected_patience = "diff --git a/test.txt b/test.txt\nindex 34a5acc..d52725f 100644\n--- a/test.txt\n+++ b/test.txt\n@@ -1,10 +1,7 @@\n When I wrote this\n I did not know\n+I did not know\n how to create\n a patience diff\n-I did not know\n-how to create\n another problem\n-I did not know\n-how to create\n a minimal diff\n"; - - g_repo = cl_git_sandbox_init("empty_standard_repo"); - cl_repo_set_bool(g_repo, "core.autocrlf", true); - cl_git_pass(git_repository_index(&index, g_repo)); - - cl_git_mkfile( - "empty_standard_repo/test.txt", - "When I wrote this\nI did not know\nhow to create\na patience diff\nI did not know\nhow to create\nanother problem\nI did not know\nhow to create\na minimal diff\n"); - cl_git_pass(git_index_add_bypath(index, "test.txt")); - cl_repo_commit_from_index(NULL, g_repo, NULL, 1372350000, "Base"); - git_index_free(index); - - cl_git_rewritefile( - "empty_standard_repo/test.txt", - "When I wrote this\nI did not know\nI did not know\nhow to create\na patience diff\nanother problem\na minimal diff\n"); - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - cl_assert_equal_i(1, git_diff_num_deltas(diff)); - cl_git_pass(git_patch_from_diff(&patch, diff, 0)); - cl_git_pass(git_patch_to_buf(&buf, patch)); - - cl_assert_equal_s(expected_normal, buf.ptr); - git_buf_clear(&buf); - git_patch_free(patch); - git_diff_free(diff); - - opts.flags |= GIT_DIFF_PATIENCE; - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - cl_assert_equal_i(1, git_diff_num_deltas(diff)); - cl_git_pass(git_patch_from_diff(&patch, diff, 0)); - cl_git_pass(git_patch_to_buf(&buf, patch)); - - cl_assert_equal_s(expected_patience, buf.ptr); - git_buf_clear(&buf); - - git_buf_free(&buf); - git_patch_free(patch); - git_diff_free(diff); -} - -void test_diff_workdir__with_stale_index(void) -{ - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - git_diff *diff = NULL; - git_index *idx = NULL; - diff_expects exp; - - g_repo = cl_git_sandbox_init("status"); - cl_git_pass(git_repository_index(&idx, g_repo)); - - /* make the in-memory index invalid */ - { - git_repository *r2; - git_index *idx2; - cl_git_pass(git_repository_open(&r2, "status")); - cl_git_pass(git_repository_index(&idx2, r2)); - cl_git_pass(git_index_add_bypath(idx2, "new_file")); - cl_git_pass(git_index_add_bypath(idx2, "subdir/new_file")); - cl_git_pass(git_index_remove_bypath(idx2, "staged_new_file")); - cl_git_pass(git_index_remove_bypath(idx2, "staged_changes_file_deleted")); - cl_git_pass(git_index_write(idx2)); - git_index_free(idx2); - git_repository_free(r2); - } - - opts.context_lines = 3; - opts.interhunk_lines = 1; - opts.flags |= GIT_DIFF_INCLUDE_UNTRACKED | GIT_DIFF_INCLUDE_UNMODIFIED; - - /* first try with index pointer which should prevent reload */ - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, idx, &opts)); - - memset(&exp, 0, sizeof(exp)); - - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - - cl_assert_equal_i(17, exp.files); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); - cl_assert_equal_i(4, exp.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(4, exp.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(4, exp.file_status[GIT_DELTA_UNTRACKED]); - cl_assert_equal_i(5, exp.file_status[GIT_DELTA_UNMODIFIED]); - - git_diff_free(diff); - - /* now let's try without the index pointer which should trigger reload */ - - /* two files that were UNTRACKED should have become UNMODIFIED */ - /* one file that was UNMODIFIED should now have become UNTRACKED */ - /* one file that was DELETED should now be gone completely */ - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - - memset(&exp, 0, sizeof(exp)); - - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - - git_diff_free(diff); - - cl_assert_equal_i(16, exp.files); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); - cl_assert_equal_i(3, exp.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(4, exp.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(3, exp.file_status[GIT_DELTA_UNTRACKED]); - cl_assert_equal_i(6, exp.file_status[GIT_DELTA_UNMODIFIED]); - - git_index_free(idx); -} - -static int touch_file(void *payload, git_buf *path) -{ - struct stat st; - struct p_timeval times[2]; - - GIT_UNUSED(payload); - if (git_path_isdir(path->ptr)) - return 0; - - cl_must_pass(p_stat(path->ptr, &st)); - - times[0].tv_sec = st.st_mtime + 3; - times[0].tv_usec = 0; - times[1].tv_sec = st.st_mtime + 3; - times[1].tv_usec = 0; - - cl_must_pass(p_utimes(path->ptr, times)); - return 0; -} - -static void basic_diff_status(git_diff **out, const git_diff_options *opts) -{ - diff_expects exp; - - cl_git_pass(git_diff_index_to_workdir(out, g_repo, NULL, opts)); - - memset(&exp, 0, sizeof(exp)); - - cl_git_pass(git_diff_foreach( - *out, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - - cl_assert_equal_i(13, exp.files); - cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); - cl_assert_equal_i(4, exp.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(4, exp.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_IGNORED]); - cl_assert_equal_i(4, exp.file_status[GIT_DELTA_UNTRACKED]); -} - -void test_diff_workdir__can_update_index(void) -{ - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - git_diff *diff = NULL; - git_diff_perfdata perf = GIT_DIFF_PERFDATA_INIT; - git_index *index; - - g_repo = cl_git_sandbox_init("status"); - - /* touch all the files so stat times are different */ - { - git_buf path = GIT_BUF_INIT; - cl_git_pass(git_buf_sets(&path, "status")); - cl_git_pass(git_path_direach(&path, 0, touch_file, NULL)); - git_buf_free(&path); - } - - opts.flags |= GIT_DIFF_INCLUDE_IGNORED | GIT_DIFF_INCLUDE_UNTRACKED; - - basic_diff_status(&diff, &opts); - - cl_git_pass(git_diff_get_perfdata(&perf, diff)); - cl_assert_equal_sz(13 + 3, perf.stat_calls); - cl_assert_equal_sz(5, perf.oid_calculations); - - git_diff_free(diff); - - /* now allow diff to update stat cache */ - opts.flags |= GIT_DIFF_UPDATE_INDEX; - - /* advance a tick for the index so we don't re-calculate racily-clean entries */ - cl_git_pass(git_repository_index__weakptr(&index, g_repo)); - tick_index(index); - - basic_diff_status(&diff, &opts); - - cl_git_pass(git_diff_get_perfdata(&perf, diff)); - cl_assert_equal_sz(13 + 3, perf.stat_calls); - cl_assert_equal_sz(5, perf.oid_calculations); - - git_diff_free(diff); - - /* now if we do it again, we should see fewer OID calculations */ - - /* tick again as the index updating from the previous diff might have reset the timestamp */ - tick_index(index); - basic_diff_status(&diff, &opts); - - cl_git_pass(git_diff_get_perfdata(&perf, diff)); - cl_assert_equal_sz(13 + 3, perf.stat_calls); - cl_assert_equal_sz(0, perf.oid_calculations); - - git_diff_free(diff); -} - -#define STR7 "0123456" -#define STR8 "01234567" -#define STR40 STR8 STR8 STR8 STR8 STR8 -#define STR200 STR40 STR40 STR40 STR40 STR40 -#define STR999Z STR200 STR200 STR200 STR200 STR40 STR40 STR40 STR40 \ - STR8 STR8 STR8 STR8 STR7 "\0" -#define STR1000 STR200 STR200 STR200 STR200 STR200 -#define STR3999Z STR1000 STR1000 STR1000 STR999Z -#define STR4000 STR1000 STR1000 STR1000 STR1000 - -static void assert_delta_binary(git_diff *diff, size_t idx, int is_binary) -{ - git_patch *patch; - const git_diff_delta *delta; - - cl_git_pass(git_patch_from_diff(&patch, diff, idx)); - delta = git_patch_get_delta(patch); - cl_assert_equal_b((delta->flags & GIT_DIFF_FLAG_BINARY), is_binary); - git_patch_free(patch); -} - -void test_diff_workdir__binary_detection(void) -{ - git_index *idx; - git_diff *diff = NULL; - git_buf b = GIT_BUF_INIT; - int i; - git_buf data[10] = { - { "1234567890", 0, 0 }, /* 0 - all ascii text control */ - { "\xC3\x85\xC3\xBC\xE2\x80\xA0\x48\xC3\xB8\xCF\x80\xCE\xA9", 0, 0 }, /* 1 - UTF-8 multibyte text */ - { "\xEF\xBB\xBF\xC3\x9C\xE2\xA4\x92\xC6\x92\x38\xC2\xA3\xE2\x82\xAC", 0, 0 }, /* 2 - UTF-8 with BOM */ - { STR999Z, 0, 1000 }, /* 3 - ASCII with NUL at 1000 */ - { STR3999Z, 0, 4000 }, /* 4 - ASCII with NUL at 4000 */ - { STR4000 STR3999Z "x", 0, 8001 }, /* 5 - ASCII with NUL at 8000 */ - { STR4000 STR4000 "\0", 0, 8001 }, /* 6 - ASCII with NUL at 8001 */ - { "\x00\xDC\x00\x6E\x21\x39\xFE\x0E\x00\x63\x00\xF8" - "\x00\x64\x00\x65\x20\x48", 0, 18 }, /* 7 - UTF-16 text */ - { "\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d" - "\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d", - 0, 26 }, /* 8 - All non-printable characters (no NUL) */ - { "Hello \x01\x02\x03\x04\x05\x06 World!\x01\x02\x03\x04" - "\x05\x06\x07", 0, 26 }, /* 9 - 50-50 non-printable (no NUL) */ - }; - - g_repo = cl_git_sandbox_init("empty_standard_repo"); - cl_git_pass(git_repository_index(&idx, g_repo)); - - /* We start with ASCII in index and test data in workdir, - * then we will try with test data in index and ASCII in workdir. - */ - - cl_git_pass(git_buf_sets(&b, "empty_standard_repo/0")); - for (i = 0; i < 10; ++i) { - b.ptr[b.size - 1] = '0' + i; - cl_git_mkfile(b.ptr, "baseline"); - cl_git_pass(git_index_add_bypath(idx, &b.ptr[b.size - 1])); - - if (data[i].size == 0) - data[i].size = strlen(data[i].ptr); - cl_git_write2file( - b.ptr, data[i].ptr, data[i].size, O_WRONLY|O_TRUNC, 0664); - } - git_index_write(idx); - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, NULL)); - - cl_assert_equal_i(10, git_diff_num_deltas(diff)); - - /* using diff binary detection (i.e. looking for NUL byte) */ - assert_delta_binary(diff, 0, false); - assert_delta_binary(diff, 1, false); - assert_delta_binary(diff, 2, false); - assert_delta_binary(diff, 3, true); - assert_delta_binary(diff, 4, true); - assert_delta_binary(diff, 5, true); - assert_delta_binary(diff, 6, false); - assert_delta_binary(diff, 7, true); - assert_delta_binary(diff, 8, false); - assert_delta_binary(diff, 9, false); - /* The above have been checked to match command-line Git */ - - git_diff_free(diff); - - cl_git_pass(git_buf_sets(&b, "empty_standard_repo/0")); - for (i = 0; i < 10; ++i) { - b.ptr[b.size - 1] = '0' + i; - cl_git_pass(git_index_add_bypath(idx, &b.ptr[b.size - 1])); - - cl_git_write2file(b.ptr, "baseline\n", 9, O_WRONLY|O_TRUNC, 0664); - } - git_index_write(idx); - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, NULL)); - - cl_assert_equal_i(10, git_diff_num_deltas(diff)); - - /* using diff binary detection (i.e. looking for NUL byte) */ - assert_delta_binary(diff, 0, false); - assert_delta_binary(diff, 1, false); - assert_delta_binary(diff, 2, false); - assert_delta_binary(diff, 3, true); - assert_delta_binary(diff, 4, true); - assert_delta_binary(diff, 5, true); - assert_delta_binary(diff, 6, false); - assert_delta_binary(diff, 7, true); - assert_delta_binary(diff, 8, false); - assert_delta_binary(diff, 9, false); - - git_diff_free(diff); - - git_index_free(idx); - git_buf_free(&b); -} - -void test_diff_workdir__to_index_conflicted(void) { - const char *a_commit = "26a125ee1bf"; /* the current HEAD */ - git_index_entry ancestor = {{0}}, ours = {{0}}, theirs = {{0}}; - git_tree *a; - git_index *index; - git_diff *diff1, *diff2; - const git_diff_delta *delta; - - g_repo = cl_git_sandbox_init("status"); - a = resolve_commit_oid_to_tree(g_repo, a_commit); - - cl_git_pass(git_repository_index(&index, g_repo)); - - ancestor.path = ours.path = theirs.path = "_file"; - ancestor.mode = ours.mode = theirs.mode = 0100644; - git_oid_fromstr(&ancestor.id, "d427e0b2e138501a3d15cc376077a3631e15bd46"); - git_oid_fromstr(&ours.id, "ee3fa1b8c00aff7fe02065fdb50864bb0d932ccf"); - git_oid_fromstr(&theirs.id, "2bd0a343aeef7a2cf0d158478966a6e587ff3863"); - cl_git_pass(git_index_conflict_add(index, &ancestor, &ours, &theirs)); - - cl_git_pass(git_diff_tree_to_index(&diff1, g_repo, a, index, NULL)); - cl_git_pass(git_diff_index_to_workdir(&diff2, g_repo, index, NULL)); - cl_git_pass(git_diff_merge(diff1, diff2)); - - cl_assert_equal_i(git_diff_num_deltas(diff1), 12); - delta = git_diff_get_delta(diff1, 0); - cl_assert_equal_s(delta->old_file.path, "_file"); - cl_assert_equal_i(delta->nfiles, 1); - cl_assert_equal_i(delta->status, GIT_DELTA_CONFLICTED); - - git_diff_free(diff2); - git_diff_free(diff1); - git_index_free(index); - git_tree_free(a); -} - -void test_diff_workdir__only_writes_index_when_necessary(void) -{ - git_index *index; - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - git_diff *diff = NULL; - git_reference *head; - git_object *head_object; - git_oid initial, first, second; - git_buf path = GIT_BUF_INIT; - struct stat st; - struct p_timeval times[2]; - - opts.flags |= GIT_DIFF_INCLUDE_UNTRACKED | GIT_DIFF_UPDATE_INDEX; - - g_repo = cl_git_sandbox_init("status"); - - cl_git_pass(git_repository_index(&index, g_repo)); - cl_git_pass(git_repository_head(&head, g_repo)); - cl_git_pass(git_reference_peel(&head_object, head, GIT_OBJ_COMMIT)); - - cl_git_pass(git_reset(g_repo, head_object, GIT_RESET_HARD, NULL)); - - git_oid_cpy(&initial, git_index_checksum(index)); - - /* update the index timestamp to avoid raciness */ - cl_must_pass(p_stat("status/.git/index", &st)); - - times[0].tv_sec = st.st_mtime + 5; - times[0].tv_usec = 0; - times[1].tv_sec = st.st_mtime + 5; - times[1].tv_usec = 0; - - cl_must_pass(p_utimes("status/.git/index", times)); - - /* ensure diff doesn't touch the index */ - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - git_diff_free(diff); - - git_oid_cpy(&first, git_index_checksum(index)); - cl_assert(!git_oid_equal(&initial, &first)); - - /* touch all the files so stat times are different */ - cl_git_pass(git_buf_sets(&path, "status")); - cl_git_pass(git_path_direach(&path, 0, touch_file, NULL)); - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); - git_diff_free(diff); - - /* ensure the second diff did update the index */ - git_oid_cpy(&second, git_index_checksum(index)); - cl_assert(!git_oid_equal(&first, &second)); - - git_buf_free(&path); - git_object_free(head_object); - git_reference_free(head); - git_index_free(index); -} - -void test_diff_workdir__to_index_pathlist(void) -{ - git_index *index; - git_diff *diff; - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - git_vector pathlist = GIT_VECTOR_INIT; - - git_vector_insert(&pathlist, "foobar/asdf"); - git_vector_insert(&pathlist, "subdir/asdf"); - git_vector_insert(&pathlist, "ignored/asdf"); - - g_repo = cl_git_sandbox_init("status"); - - cl_git_mkfile("status/.gitignore", ".gitignore\n" "ignored/\n"); - - cl_must_pass(p_mkdir("status/foobar", 0777)); - cl_git_mkfile("status/foobar/one", "one\n"); - - cl_must_pass(p_mkdir("status/ignored", 0777)); - cl_git_mkfile("status/ignored/one", "one\n"); - cl_git_mkfile("status/ignored/two", "two\n"); - cl_git_mkfile("status/ignored/three", "three\n"); - - cl_git_pass(git_repository_index(&index, g_repo)); - - opts.flags = GIT_DIFF_INCLUDE_IGNORED; - opts.pathspec.strings = (char **)pathlist.contents; - opts.pathspec.count = pathlist.length; - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, index, &opts)); - cl_assert_equal_i(0, git_diff_num_deltas(diff)); - git_diff_free(diff); - - opts.flags |= GIT_DIFF_DISABLE_PATHSPEC_MATCH; - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, index, &opts)); - cl_assert_equal_i(0, git_diff_num_deltas(diff)); - git_diff_free(diff); - - git_index_free(index); - git_vector_free(&pathlist); -} - -void test_diff_workdir__symlink_changed_on_non_symlink_platform(void) -{ - git_tree *tree; - git_diff *diff; - diff_expects exp = {0}; - const git_diff_delta *delta; - const char *commit = "7fccd7"; - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - git_vector pathlist = GIT_VECTOR_INIT; - int symlinks; - - g_repo = cl_git_sandbox_init("unsymlinked.git"); - - cl_git_pass(git_repository__cvar(&symlinks, g_repo, GIT_CVAR_SYMLINKS)); - - if (symlinks) - cl_skip(); - - cl_git_pass(git_vector_insert(&pathlist, "include/Nu/Nu.h")); - - opts.pathspec.strings = (char **)pathlist.contents; - opts.pathspec.count = pathlist.length; - - cl_must_pass(p_mkdir("symlink", 0777)); - cl_git_pass(git_repository_set_workdir(g_repo, "symlink", false)); - - cl_assert((tree = resolve_commit_oid_to_tree(g_repo, commit)) != NULL); - - /* first, do the diff with the original contents */ - - cl_git_pass(git_futils_mkpath2file("symlink/include/Nu/Nu.h", 0755)); - cl_git_mkfile("symlink/include/Nu/Nu.h", "../../objc/Nu.h"); - - cl_git_pass(git_diff_tree_to_workdir(&diff, g_repo, tree, &opts)); - cl_assert_equal_i(0, git_diff_num_deltas(diff)); - git_diff_free(diff); - - /* now update the contents and expect a difference, but that the file - * mode has persisted as a symbolic link. - */ - - cl_git_rewritefile("symlink/include/Nu/Nu.h", "awesome content\n"); - - cl_git_pass(git_diff_tree_to_workdir(&diff, g_repo, tree, &opts)); - - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp)); - cl_assert_equal_i(1, exp.files); - - cl_assert_equal_i(1, git_diff_num_deltas(diff)); - delta = git_diff_get_delta(diff, 0); - cl_assert_equal_i(GIT_FILEMODE_LINK, delta->old_file.mode); - cl_assert_equal_i(GIT_FILEMODE_LINK, delta->new_file.mode); - - git_diff_free(diff); - - cl_git_pass(git_futils_rmdir_r("symlink", NULL, GIT_RMDIR_REMOVE_FILES)); - - git_tree_free(tree); - git_vector_free(&pathlist); -} diff --git a/vendor/libgit2/tests/fetchhead/fetchhead_data.h b/vendor/libgit2/tests/fetchhead/fetchhead_data.h deleted file mode 100644 index c75b65b90..000000000 --- a/vendor/libgit2/tests/fetchhead/fetchhead_data.h +++ /dev/null @@ -1,48 +0,0 @@ - -#define FETCH_HEAD_WILDCARD_DATA_LOCAL \ - "49322bb17d3acc9146f98c97d078513228bbf3c0\t\tbranch 'master' of git://github.com/libgit2/TestGitRepository\n" \ - "0966a434eb1a025db6b71485ab63a3bfbea520b6\tnot-for-merge\tbranch 'first-merge' of git://github.com/libgit2/TestGitRepository\n" \ - "42e4e7c5e507e113ebbb7801b16b52cf867b7ce1\tnot-for-merge\tbranch 'no-parent' of git://github.com/libgit2/TestGitRepository\n" \ - "d96c4e80345534eccee5ac7b07fc7603b56124cb\tnot-for-merge\ttag 'annotated_tag' of git://github.com/libgit2/TestGitRepository\n" \ - "55a1a760df4b86a02094a904dfa511deb5655905\tnot-for-merge\ttag 'blob' of git://github.com/libgit2/TestGitRepository\n" \ - "8f50ba15d49353813cc6e20298002c0d17b0a9ee\tnot-for-merge\ttag 'commit_tree' of git://github.com/libgit2/TestGitRepository\n" - -#define FETCH_HEAD_WILDCARD_DATA \ - "49322bb17d3acc9146f98c97d078513228bbf3c0\t\tbranch 'master' of git://github.com/libgit2/TestGitRepository\n" \ - "0966a434eb1a025db6b71485ab63a3bfbea520b6\tnot-for-merge\tbranch 'first-merge' of git://github.com/libgit2/TestGitRepository\n" \ - "42e4e7c5e507e113ebbb7801b16b52cf867b7ce1\tnot-for-merge\tbranch 'no-parent' of git://github.com/libgit2/TestGitRepository\n" \ - "d96c4e80345534eccee5ac7b07fc7603b56124cb\tnot-for-merge\ttag 'annotated_tag' of git://github.com/libgit2/TestGitRepository\n" \ - "55a1a760df4b86a02094a904dfa511deb5655905\tnot-for-merge\ttag 'blob' of git://github.com/libgit2/TestGitRepository\n" \ - "8f50ba15d49353813cc6e20298002c0d17b0a9ee\tnot-for-merge\ttag 'commit_tree' of git://github.com/libgit2/TestGitRepository\n" \ - "6e0c7bdb9b4ed93212491ee778ca1c65047cab4e\tnot-for-merge\ttag 'nearly-dangling' of git://github.com/libgit2/TestGitRepository\n" - -#define FETCH_HEAD_WILDCARD_DATA2 \ - "49322bb17d3acc9146f98c97d078513228bbf3c0\t\tbranch 'master' of git://github.com/libgit2/TestGitRepository\n" \ - "0966a434eb1a025db6b71485ab63a3bfbea520b6\tnot-for-merge\tbranch 'first-merge' of git://github.com/libgit2/TestGitRepository\n" \ - "42e4e7c5e507e113ebbb7801b16b52cf867b7ce1\tnot-for-merge\tbranch 'no-parent' of git://github.com/libgit2/TestGitRepository\n" \ - -#define FETCH_HEAD_NO_MERGE_DATA \ - "0966a434eb1a025db6b71485ab63a3bfbea520b6\tnot-for-merge\tbranch 'first-merge' of git://github.com/libgit2/TestGitRepository\n" \ - "49322bb17d3acc9146f98c97d078513228bbf3c0\tnot-for-merge\tbranch 'master' of git://github.com/libgit2/TestGitRepository\n" \ - "42e4e7c5e507e113ebbb7801b16b52cf867b7ce1\tnot-for-merge\tbranch 'no-parent' of git://github.com/libgit2/TestGitRepository\n" \ - "d96c4e80345534eccee5ac7b07fc7603b56124cb\tnot-for-merge\ttag 'annotated_tag' of git://github.com/libgit2/TestGitRepository\n" \ - "55a1a760df4b86a02094a904dfa511deb5655905\tnot-for-merge\ttag 'blob' of git://github.com/libgit2/TestGitRepository\n" \ - "8f50ba15d49353813cc6e20298002c0d17b0a9ee\tnot-for-merge\ttag 'commit_tree' of git://github.com/libgit2/TestGitRepository\n" \ - "6e0c7bdb9b4ed93212491ee778ca1c65047cab4e\tnot-for-merge\ttag 'nearly-dangling' of git://github.com/libgit2/TestGitRepository\n" - -#define FETCH_HEAD_NO_MERGE_DATA2 \ - "0966a434eb1a025db6b71485ab63a3bfbea520b6\tnot-for-merge\tbranch 'first-merge' of git://github.com/libgit2/TestGitRepository\n" \ - "49322bb17d3acc9146f98c97d078513228bbf3c0\tnot-for-merge\tbranch 'master' of git://github.com/libgit2/TestGitRepository\n" \ - "42e4e7c5e507e113ebbb7801b16b52cf867b7ce1\tnot-for-merge\tbranch 'no-parent' of git://github.com/libgit2/TestGitRepository\n" \ - -#define FETCH_HEAD_NO_MERGE_DATA3 \ - "0966a434eb1a025db6b71485ab63a3bfbea520b6\tnot-for-merge\tbranch 'first-merge' of git://github.com/libgit2/TestGitRepository\n" \ - "49322bb17d3acc9146f98c97d078513228bbf3c0\tnot-for-merge\tbranch 'master' of git://github.com/libgit2/TestGitRepository\n" \ - "42e4e7c5e507e113ebbb7801b16b52cf867b7ce1\tnot-for-merge\tbranch 'no-parent' of git://github.com/libgit2/TestGitRepository\n" \ - "8f50ba15d49353813cc6e20298002c0d17b0a9ee\tnot-for-merge\ttag 'commit_tree' of git://github.com/libgit2/TestGitRepository\n" \ - -#define FETCH_HEAD_EXPLICIT_DATA \ - "0966a434eb1a025db6b71485ab63a3bfbea520b6\t\tbranch 'first-merge' of git://github.com/libgit2/TestGitRepository\n" - -#define FETCH_HEAD_QUOTE_DATA \ - "0966a434eb1a025db6b71485ab63a3bfbea520b6\t\tbranch 'first's-merge' of git://github.com/libgit2/TestGitRepository\n" diff --git a/vendor/libgit2/tests/fetchhead/nonetwork.c b/vendor/libgit2/tests/fetchhead/nonetwork.c deleted file mode 100644 index 3b750af5e..000000000 --- a/vendor/libgit2/tests/fetchhead/nonetwork.c +++ /dev/null @@ -1,400 +0,0 @@ -#include "clar_libgit2.h" - -#include "fileops.h" -#include "fetchhead.h" - -#include "fetchhead_data.h" - -#define DO_LOCAL_TEST 0 - -static git_repository *g_repo; - -void test_fetchhead_nonetwork__initialize(void) -{ - g_repo = NULL; -} - -static void cleanup_repository(void *path) -{ - if (g_repo) { - git_repository_free(g_repo); - g_repo = NULL; - } - - cl_fixture_cleanup((const char *)path); -} - -static void populate_fetchhead(git_vector *out, git_repository *repo) -{ - git_fetchhead_ref *fetchhead_ref; - git_oid oid; - - cl_git_pass(git_oid_fromstr(&oid, - "49322bb17d3acc9146f98c97d078513228bbf3c0")); - cl_git_pass(git_fetchhead_ref_create(&fetchhead_ref, &oid, 1, - "refs/heads/master", - "git://github.com/libgit2/TestGitRepository")); - cl_git_pass(git_vector_insert(out, fetchhead_ref)); - - cl_git_pass(git_oid_fromstr(&oid, - "0966a434eb1a025db6b71485ab63a3bfbea520b6")); - cl_git_pass(git_fetchhead_ref_create(&fetchhead_ref, &oid, 0, - "refs/heads/first-merge", - "git://github.com/libgit2/TestGitRepository")); - cl_git_pass(git_vector_insert(out, fetchhead_ref)); - - cl_git_pass(git_oid_fromstr(&oid, - "42e4e7c5e507e113ebbb7801b16b52cf867b7ce1")); - cl_git_pass(git_fetchhead_ref_create(&fetchhead_ref, &oid, 0, - "refs/heads/no-parent", - "git://github.com/libgit2/TestGitRepository")); - cl_git_pass(git_vector_insert(out, fetchhead_ref)); - - cl_git_pass(git_oid_fromstr(&oid, - "d96c4e80345534eccee5ac7b07fc7603b56124cb")); - cl_git_pass(git_fetchhead_ref_create(&fetchhead_ref, &oid, 0, - "refs/tags/annotated_tag", - "git://github.com/libgit2/TestGitRepository")); - cl_git_pass(git_vector_insert(out, fetchhead_ref)); - - cl_git_pass(git_oid_fromstr(&oid, - "55a1a760df4b86a02094a904dfa511deb5655905")); - cl_git_pass(git_fetchhead_ref_create(&fetchhead_ref, &oid, 0, - "refs/tags/blob", - "git://github.com/libgit2/TestGitRepository")); - cl_git_pass(git_vector_insert(out, fetchhead_ref)); - - cl_git_pass(git_oid_fromstr(&oid, - "8f50ba15d49353813cc6e20298002c0d17b0a9ee")); - cl_git_pass(git_fetchhead_ref_create(&fetchhead_ref, &oid, 0, - "refs/tags/commit_tree", - "git://github.com/libgit2/TestGitRepository")); - cl_git_pass(git_vector_insert(out, fetchhead_ref)); - - cl_git_pass(git_fetchhead_write(repo, out)); -} - -void test_fetchhead_nonetwork__write(void) -{ - git_vector fetchhead_vector = GIT_VECTOR_INIT; - git_fetchhead_ref *fetchhead_ref; - git_buf fetchhead_buf = GIT_BUF_INIT; - int equals = 0; - size_t i; - - git_vector_init(&fetchhead_vector, 6, NULL); - - cl_set_cleanup(&cleanup_repository, "./test1"); - cl_git_pass(git_repository_init(&g_repo, "./test1", 0)); - - populate_fetchhead(&fetchhead_vector, g_repo); - - cl_git_pass(git_futils_readbuffer(&fetchhead_buf, - "./test1/.git/FETCH_HEAD")); - - equals = (strcmp(fetchhead_buf.ptr, FETCH_HEAD_WILDCARD_DATA_LOCAL) == 0); - - git_buf_free(&fetchhead_buf); - - git_vector_foreach(&fetchhead_vector, i, fetchhead_ref) { - git_fetchhead_ref_free(fetchhead_ref); - } - - git_vector_free(&fetchhead_vector); - - cl_assert(equals); -} - -typedef struct { - git_vector *fetchhead_vector; - size_t idx; -} fetchhead_ref_cb_data; - -static int fetchhead_ref_cb(const char *name, const char *url, - const git_oid *oid, unsigned int is_merge, void *payload) -{ - fetchhead_ref_cb_data *cb_data = payload; - git_fetchhead_ref *expected; - - cl_assert(payload); - - expected = git_vector_get(cb_data->fetchhead_vector, cb_data->idx); - - cl_assert_equal_oid(&expected->oid, oid); - cl_assert(expected->is_merge == is_merge); - - if (expected->ref_name) - cl_assert_equal_s(expected->ref_name, name); - else - cl_assert(name == NULL); - - if (expected->remote_url) - cl_assert_equal_s(expected->remote_url, url); - else - cl_assert(url == NULL); - - cb_data->idx++; - - return 0; -} - -void test_fetchhead_nonetwork__read(void) -{ - git_vector fetchhead_vector = GIT_VECTOR_INIT; - git_fetchhead_ref *fetchhead_ref; - fetchhead_ref_cb_data cb_data; - size_t i; - - memset(&cb_data, 0x0, sizeof(fetchhead_ref_cb_data)); - - cl_set_cleanup(&cleanup_repository, "./test1"); - cl_git_pass(git_repository_init(&g_repo, "./test1", 0)); - - populate_fetchhead(&fetchhead_vector, g_repo); - - cb_data.fetchhead_vector = &fetchhead_vector; - - cl_git_pass(git_repository_fetchhead_foreach(g_repo, fetchhead_ref_cb, &cb_data)); - - git_vector_foreach(&fetchhead_vector, i, fetchhead_ref) { - git_fetchhead_ref_free(fetchhead_ref); - } - - git_vector_free(&fetchhead_vector); -} - -static int read_old_style_cb(const char *name, const char *url, - const git_oid *oid, unsigned int is_merge, void *payload) -{ - git_oid expected; - - GIT_UNUSED(payload); - - git_oid_fromstr(&expected, "49322bb17d3acc9146f98c97d078513228bbf3c0"); - - cl_assert(name == NULL); - cl_assert(url == NULL); - cl_assert_equal_oid(&expected, oid); - cl_assert(is_merge == 1); - - return 0; -} - -void test_fetchhead_nonetwork__read_old_style(void) -{ - cl_set_cleanup(&cleanup_repository, "./test1"); - cl_git_pass(git_repository_init(&g_repo, "./test1", 0)); - - cl_git_rewritefile("./test1/.git/FETCH_HEAD", "49322bb17d3acc9146f98c97d078513228bbf3c0\n"); - - cl_git_pass(git_repository_fetchhead_foreach(g_repo, read_old_style_cb, NULL)); -} - -static int read_type_missing(const char *ref_name, const char *remote_url, - const git_oid *oid, unsigned int is_merge, void *payload) -{ - git_oid expected; - - GIT_UNUSED(payload); - - git_oid_fromstr(&expected, "49322bb17d3acc9146f98c97d078513228bbf3c0"); - - cl_assert_equal_s("name", ref_name); - cl_assert_equal_s("remote_url", remote_url); - cl_assert_equal_oid(&expected, oid); - cl_assert(is_merge == 0); - - return 0; -} - -void test_fetchhead_nonetwork__type_missing(void) -{ - cl_set_cleanup(&cleanup_repository, "./test1"); - cl_git_pass(git_repository_init(&g_repo, "./test1", 0)); - - cl_git_rewritefile("./test1/.git/FETCH_HEAD", "49322bb17d3acc9146f98c97d078513228bbf3c0\tnot-for-merge\t'name' of remote_url\n"); - - cl_git_pass(git_repository_fetchhead_foreach(g_repo, read_type_missing, NULL)); -} - -static int read_name_missing(const char *ref_name, const char *remote_url, - const git_oid *oid, unsigned int is_merge, void *payload) -{ - git_oid expected; - - GIT_UNUSED(payload); - - git_oid_fromstr(&expected, "49322bb17d3acc9146f98c97d078513228bbf3c0"); - - cl_assert(ref_name == NULL); - cl_assert_equal_s("remote_url", remote_url); - cl_assert_equal_oid(&expected, oid); - cl_assert(is_merge == 0); - - return 0; -} - -void test_fetchhead_nonetwork__name_missing(void) -{ - cl_set_cleanup(&cleanup_repository, "./test1"); - cl_git_pass(git_repository_init(&g_repo, "./test1", 0)); - - cl_git_rewritefile("./test1/.git/FETCH_HEAD", "49322bb17d3acc9146f98c97d078513228bbf3c0\tnot-for-merge\tremote_url\n"); - - cl_git_pass(git_repository_fetchhead_foreach(g_repo, read_name_missing, NULL)); -} - -static int read_noop(const char *ref_name, const char *remote_url, - const git_oid *oid, unsigned int is_merge, void *payload) -{ - GIT_UNUSED(ref_name); - GIT_UNUSED(remote_url); - GIT_UNUSED(oid); - GIT_UNUSED(is_merge); - GIT_UNUSED(payload); - - return 0; -} - -void test_fetchhead_nonetwork__nonexistent(void) -{ - int error; - - cl_set_cleanup(&cleanup_repository, "./test1"); - cl_git_pass(git_repository_init(&g_repo, "./test1", 0)); - - cl_git_fail((error = git_repository_fetchhead_foreach(g_repo, read_noop, NULL))); - cl_assert(error == GIT_ENOTFOUND); -} - -void test_fetchhead_nonetwork__invalid_unterminated_last_line(void) -{ - cl_set_cleanup(&cleanup_repository, "./test1"); - cl_git_pass(git_repository_init(&g_repo, "./test1", 0)); - - cl_git_rewritefile("./test1/.git/FETCH_HEAD", "unterminated"); - cl_git_fail(git_repository_fetchhead_foreach(g_repo, read_noop, NULL)); -} - -void test_fetchhead_nonetwork__invalid_oid(void) -{ - cl_set_cleanup(&cleanup_repository, "./test1"); - cl_git_pass(git_repository_init(&g_repo, "./test1", 0)); - - cl_git_rewritefile("./test1/.git/FETCH_HEAD", "shortoid\n"); - cl_git_fail(git_repository_fetchhead_foreach(g_repo, read_noop, NULL)); -} - -void test_fetchhead_nonetwork__invalid_for_merge(void) -{ - cl_set_cleanup(&cleanup_repository, "./test1"); - cl_git_pass(git_repository_init(&g_repo, "./test1", 0)); - - cl_git_rewritefile("./test1/.git/FETCH_HEAD", "49322bb17d3acc9146f98c97d078513228bbf3c0\tinvalid-merge\t\n"); - cl_git_fail(git_repository_fetchhead_foreach(g_repo, read_noop, NULL)); - - cl_assert(git__prefixcmp(giterr_last()->message, "Invalid for-merge") == 0); -} - -void test_fetchhead_nonetwork__invalid_description(void) -{ - cl_set_cleanup(&cleanup_repository, "./test1"); - cl_git_pass(git_repository_init(&g_repo, "./test1", 0)); - - cl_git_rewritefile("./test1/.git/FETCH_HEAD", "49322bb17d3acc9146f98c97d078513228bbf3c0\tnot-for-merge\n"); - cl_git_fail(git_repository_fetchhead_foreach(g_repo, read_noop, NULL)); - - cl_assert(git__prefixcmp(giterr_last()->message, "Invalid description") == 0); -} - -static int assert_master_for_merge(const char *ref, const char *url, const git_oid *id, unsigned int is_merge, void *data) -{ - GIT_UNUSED(url); - GIT_UNUSED(id); - GIT_UNUSED(data); - - if (!strcmp("refs/heads/master", ref) && !is_merge) - return -1; - - return 0; -} - -void test_fetchhead_nonetwork__unborn_with_upstream(void) -{ - git_repository *repo; - git_remote *remote; - - /* Create an empty repo to clone from */ - cl_set_cleanup(&cleanup_repository, "./test1"); - cl_git_pass(git_repository_init(&g_repo, "./test1", 0)); - cl_set_cleanup(&cleanup_repository, "./repowithunborn"); - cl_git_pass(git_clone(&repo, "./test1", "./repowithunborn", NULL)); - - /* Simulate someone pushing to it by changing to one that has stuff */ - cl_git_pass(git_remote_set_url(repo, "origin", cl_fixture("testrepo.git"))); - cl_git_pass(git_remote_lookup(&remote, repo, "origin")); - - cl_git_pass(git_remote_fetch(remote, NULL, NULL, NULL)); - git_remote_free(remote); - - cl_git_pass(git_repository_fetchhead_foreach(repo, assert_master_for_merge, NULL)); - - git_repository_free(repo); - cl_fixture_cleanup("./repowithunborn"); -} - -void test_fetchhead_nonetwork__quote_in_branch_name(void) -{ - cl_set_cleanup(&cleanup_repository, "./test1"); - cl_git_pass(git_repository_init(&g_repo, "./test1", 0)); - - cl_git_rewritefile("./test1/.git/FETCH_HEAD", FETCH_HEAD_QUOTE_DATA); - cl_git_pass(git_repository_fetchhead_foreach(g_repo, read_noop, NULL)); -} - -static bool found_master; -static bool find_master_called; - -int find_master(const char *ref_name, const char *remote_url, const git_oid *oid, unsigned int is_merge, void *payload) -{ - GIT_UNUSED(remote_url); - GIT_UNUSED(oid); - GIT_UNUSED(payload); - - find_master_called = true; - - if (!strcmp("refs/heads/master", ref_name)) { - cl_assert(is_merge); - found_master = true; - } - - return 0; -} - -void test_fetchhead_nonetwork__create_when_refpecs_given(void) -{ - git_remote *remote; - git_buf path = GIT_BUF_INIT; - char *refspec = "refs/heads/master"; - git_strarray specs = { - &refspec, - 1, - }; - - cl_set_cleanup(&cleanup_repository, "./test1"); - cl_git_pass(git_repository_init(&g_repo, "./test1", 0)); - - cl_git_pass(git_buf_joinpath(&path, git_repository_path(g_repo), "FETCH_HEAD")); - cl_git_pass(git_remote_create(&remote, g_repo, "origin", cl_fixture("testrepo.git"))); - - cl_assert(!git_path_exists(path.ptr)); - cl_git_pass(git_remote_fetch(remote, &specs, NULL, NULL)); - cl_assert(git_path_exists(path.ptr)); - - cl_git_pass(git_repository_fetchhead_foreach(g_repo, find_master, NULL)); - cl_assert(find_master_called); - cl_assert(found_master); - - git_remote_free(remote); - git_buf_free(&path); -} diff --git a/vendor/libgit2/tests/filter/blob.c b/vendor/libgit2/tests/filter/blob.c deleted file mode 100644 index bb2528d39..000000000 --- a/vendor/libgit2/tests/filter/blob.c +++ /dev/null @@ -1,117 +0,0 @@ -#include "clar_libgit2.h" -#include "crlf.h" - -static git_repository *g_repo = NULL; - -void test_filter_blob__initialize(void) -{ - g_repo = cl_git_sandbox_init("crlf"); - cl_git_mkfile("crlf/.gitattributes", - "*.txt text\n*.bin binary\n" - "*.crlf text eol=crlf\n" - "*.lf text eol=lf\n" - "*.ident text ident\n" - "*.identcrlf ident text eol=crlf\n" - "*.identlf ident text eol=lf\n"); -} - -void test_filter_blob__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -void test_filter_blob__all_crlf(void) -{ - git_blob *blob; - git_buf buf = { 0 }; - - cl_git_pass(git_revparse_single( - (git_object **)&blob, g_repo, "a9a2e891")); /* all-crlf */ - - cl_assert_equal_s(ALL_CRLF_TEXT_RAW, git_blob_rawcontent(blob)); - - cl_git_pass(git_blob_filtered_content(&buf, blob, "file.bin", 1)); - - cl_assert_equal_s(ALL_CRLF_TEXT_RAW, buf.ptr); - - cl_git_pass(git_blob_filtered_content(&buf, blob, "file.crlf", 1)); - - /* in this case, raw content has crlf in it already */ - cl_assert_equal_s(ALL_CRLF_TEXT_AS_CRLF, buf.ptr); - - cl_git_pass(git_blob_filtered_content(&buf, blob, "file.lf", 1)); - - /* we never convert CRLF -> LF on platforms that have LF */ - cl_assert_equal_s(ALL_CRLF_TEXT_AS_CRLF, buf.ptr); - - git_buf_free(&buf); - git_blob_free(blob); -} - -void test_filter_blob__sanitizes(void) -{ - git_blob *blob; - git_buf buf; - - cl_git_pass(git_revparse_single( - (git_object **)&blob, g_repo, "e69de29")); /* zero-byte */ - - cl_assert_equal_i(0, git_blob_rawsize(blob)); - cl_assert_equal_s("", git_blob_rawcontent(blob)); - - memset(&buf, 0, sizeof(git_buf)); - cl_git_pass(git_blob_filtered_content(&buf, blob, "file.bin", 1)); - cl_assert_equal_sz(0, buf.size); - cl_assert_equal_s("", buf.ptr); - git_buf_free(&buf); - - memset(&buf, 0, sizeof(git_buf)); - cl_git_pass(git_blob_filtered_content(&buf, blob, "file.crlf", 1)); - cl_assert_equal_sz(0, buf.size); - cl_assert_equal_s("", buf.ptr); - git_buf_free(&buf); - - memset(&buf, 0, sizeof(git_buf)); - cl_git_pass(git_blob_filtered_content(&buf, blob, "file.lf", 1)); - cl_assert_equal_sz(0, buf.size); - cl_assert_equal_s("", buf.ptr); - git_buf_free(&buf); - - git_blob_free(blob); -} - -void test_filter_blob__ident(void) -{ - git_oid id; - git_blob *blob; - git_buf buf = { 0 }; - - cl_git_mkfile("crlf/test.ident", "Some text\n$Id$\nGoes there\n"); - cl_git_pass(git_blob_create_fromworkdir(&id, g_repo, "test.ident")); - cl_git_pass(git_blob_lookup(&blob, g_repo, &id)); - cl_assert_equal_s( - "Some text\n$Id$\nGoes there\n", git_blob_rawcontent(blob)); - git_blob_free(blob); - - cl_git_mkfile("crlf/test.ident", "Some text\n$Id: Any old just you want$\nGoes there\n"); - cl_git_pass(git_blob_create_fromworkdir(&id, g_repo, "test.ident")); - cl_git_pass(git_blob_lookup(&blob, g_repo, &id)); - cl_assert_equal_s( - "Some text\n$Id$\nGoes there\n", git_blob_rawcontent(blob)); - - cl_git_pass(git_blob_filtered_content(&buf, blob, "filter.bin", 1)); - cl_assert_equal_s( - "Some text\n$Id$\nGoes there\n", buf.ptr); - - cl_git_pass(git_blob_filtered_content(&buf, blob, "filter.identcrlf", 1)); - cl_assert_equal_s( - "Some text\r\n$Id: 3164f585d548ac68027d22b104f2d8100b2b6845 $\r\nGoes there\r\n", buf.ptr); - - cl_git_pass(git_blob_filtered_content(&buf, blob, "filter.identlf", 1)); - cl_assert_equal_s( - "Some text\n$Id: 3164f585d548ac68027d22b104f2d8100b2b6845 $\nGoes there\n", buf.ptr); - - git_buf_free(&buf); - git_blob_free(blob); - -} diff --git a/vendor/libgit2/tests/filter/crlf.c b/vendor/libgit2/tests/filter/crlf.c deleted file mode 100644 index a8ebd949f..000000000 --- a/vendor/libgit2/tests/filter/crlf.c +++ /dev/null @@ -1,235 +0,0 @@ -#include "clar_libgit2.h" -#include "git2/sys/filter.h" -#include "buffer.h" - -static git_repository *g_repo = NULL; - -void test_filter_crlf__initialize(void) -{ - g_repo = cl_git_sandbox_init("crlf"); - - cl_git_mkfile("crlf/.gitattributes", - "*.txt text\n*.bin binary\n*.crlf text eol=crlf\n*.lf text eol=lf\n"); - - cl_repo_set_bool(g_repo, "core.autocrlf", true); -} - -void test_filter_crlf__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -void test_filter_crlf__to_worktree(void) -{ - git_filter_list *fl; - git_filter *crlf; - git_buf in = { 0 }, out = { 0 }; - - cl_git_pass(git_filter_list_new( - &fl, g_repo, GIT_FILTER_TO_WORKTREE, 0)); - - crlf = git_filter_lookup(GIT_FILTER_CRLF); - cl_assert(crlf != NULL); - - cl_git_pass(git_filter_list_push(fl, crlf, NULL)); - - in.ptr = "Some text\nRight here\n"; - in.size = strlen(in.ptr); - - cl_git_pass(git_filter_list_apply_to_data(&out, fl, &in)); - - cl_assert_equal_s("Some text\r\nRight here\r\n", out.ptr); - - git_filter_list_free(fl); - git_buf_free(&out); -} - -void test_filter_crlf__to_odb(void) -{ - git_filter_list *fl; - git_filter *crlf; - git_buf in = { 0 }, out = { 0 }; - - cl_git_pass(git_filter_list_new( - &fl, g_repo, GIT_FILTER_TO_ODB, 0)); - - crlf = git_filter_lookup(GIT_FILTER_CRLF); - cl_assert(crlf != NULL); - - cl_git_pass(git_filter_list_push(fl, crlf, NULL)); - - in.ptr = "Some text\r\nRight here\r\n"; - in.size = strlen(in.ptr); - - cl_git_pass(git_filter_list_apply_to_data(&out, fl, &in)); - - cl_assert_equal_s("Some text\nRight here\n", out.ptr); - - git_filter_list_free(fl); - git_buf_free(&out); -} - -void test_filter_crlf__with_safecrlf(void) -{ - git_filter_list *fl; - git_filter *crlf; - git_buf in = {0}, out = GIT_BUF_INIT; - - cl_repo_set_bool(g_repo, "core.safecrlf", true); - - cl_git_pass(git_filter_list_new( - &fl, g_repo, GIT_FILTER_TO_ODB, 0)); - - crlf = git_filter_lookup(GIT_FILTER_CRLF); - cl_assert(crlf != NULL); - - cl_git_pass(git_filter_list_push(fl, crlf, NULL)); - - /* Normalized \r\n succeeds with safecrlf */ - in.ptr = "Normal\r\nCRLF\r\nline-endings.\r\n"; - in.size = strlen(in.ptr); - - cl_git_pass(git_filter_list_apply_to_data(&out, fl, &in)); - cl_assert_equal_s("Normal\nCRLF\nline-endings.\n", out.ptr); - - /* Mix of line endings fails with safecrlf */ - in.ptr = "Mixed\nup\r\nLF\nand\r\nCRLF\nline-endings.\r\n"; - in.size = strlen(in.ptr); - - cl_git_fail(git_filter_list_apply_to_data(&out, fl, &in)); - cl_assert_equal_i(giterr_last()->klass, GITERR_FILTER); - - /* Normalized \n is reversible, so does not fail with safecrlf */ - in.ptr = "Normal\nLF\nonly\nline-endings.\n"; - in.size = strlen(in.ptr); - - cl_git_pass(git_filter_list_apply_to_data(&out, fl, &in)); - cl_assert_equal_s(in.ptr, out.ptr); - - git_filter_list_free(fl); - git_buf_free(&out); -} - -void test_filter_crlf__with_safecrlf_and_unsafe_allowed(void) -{ - git_filter_list *fl; - git_filter *crlf; - git_buf in = {0}, out = GIT_BUF_INIT; - - cl_repo_set_bool(g_repo, "core.safecrlf", true); - - cl_git_pass(git_filter_list_new( - &fl, g_repo, GIT_FILTER_TO_ODB, GIT_FILTER_ALLOW_UNSAFE)); - - crlf = git_filter_lookup(GIT_FILTER_CRLF); - cl_assert(crlf != NULL); - - cl_git_pass(git_filter_list_push(fl, crlf, NULL)); - - /* Normalized \r\n succeeds with safecrlf */ - in.ptr = "Normal\r\nCRLF\r\nline-endings.\r\n"; - in.size = strlen(in.ptr); - - cl_git_pass(git_filter_list_apply_to_data(&out, fl, &in)); - cl_assert_equal_s("Normal\nCRLF\nline-endings.\n", out.ptr); - - /* Mix of line endings fails with safecrlf, but allowed to pass */ - in.ptr = "Mixed\nup\r\nLF\nand\r\nCRLF\nline-endings.\r\n"; - in.size = strlen(in.ptr); - - cl_git_pass(git_filter_list_apply_to_data(&out, fl, &in)); - /* TODO: check for warning */ - cl_assert_equal_s("Mixed\nup\nLF\nand\nCRLF\nline-endings.\n", out.ptr); - - /* Normalized \n fails with safecrlf, but allowed to pass */ - in.ptr = "Normal\nLF\nonly\nline-endings.\n"; - in.size = strlen(in.ptr); - - cl_git_pass(git_filter_list_apply_to_data(&out, fl, &in)); - /* TODO: check for warning */ - cl_assert_equal_s("Normal\nLF\nonly\nline-endings.\n", out.ptr); - - git_filter_list_free(fl); - git_buf_free(&out); -} - -void test_filter_crlf__no_safecrlf(void) -{ - git_filter_list *fl; - git_filter *crlf; - git_buf in = {0}, out = GIT_BUF_INIT; - - cl_git_pass(git_filter_list_new( - &fl, g_repo, GIT_FILTER_TO_ODB, 0)); - - crlf = git_filter_lookup(GIT_FILTER_CRLF); - cl_assert(crlf != NULL); - - cl_git_pass(git_filter_list_push(fl, crlf, NULL)); - - /* Normalized \r\n succeeds with safecrlf */ - in.ptr = "Normal\r\nCRLF\r\nline-endings.\r\n"; - in.size = strlen(in.ptr); - - cl_git_pass(git_filter_list_apply_to_data(&out, fl, &in)); - cl_assert_equal_s("Normal\nCRLF\nline-endings.\n", out.ptr); - - /* Mix of line endings fails with safecrlf */ - in.ptr = "Mixed\nup\r\nLF\nand\r\nCRLF\nline-endings.\r\n"; - in.size = strlen(in.ptr); - - cl_git_pass(git_filter_list_apply_to_data(&out, fl, &in)); - cl_assert_equal_s("Mixed\nup\nLF\nand\nCRLF\nline-endings.\n", out.ptr); - - /* Normalized \n fails with safecrlf */ - in.ptr = "Normal\nLF\nonly\nline-endings.\n"; - in.size = strlen(in.ptr); - - cl_git_pass(git_filter_list_apply_to_data(&out, fl, &in)); - cl_assert_equal_s("Normal\nLF\nonly\nline-endings.\n", out.ptr); - - git_filter_list_free(fl); - git_buf_free(&out); -} - -void test_filter_crlf__safecrlf_warn(void) -{ - git_filter_list *fl; - git_filter *crlf; - git_buf in = {0}, out = GIT_BUF_INIT; - - cl_repo_set_string(g_repo, "core.safecrlf", "warn"); - - cl_git_pass(git_filter_list_new( - &fl, g_repo, GIT_FILTER_TO_ODB, 0)); - - crlf = git_filter_lookup(GIT_FILTER_CRLF); - cl_assert(crlf != NULL); - - cl_git_pass(git_filter_list_push(fl, crlf, NULL)); - - /* Normalized \r\n succeeds with safecrlf=warn */ - in.ptr = "Normal\r\nCRLF\r\nline-endings.\r\n"; - in.size = strlen(in.ptr); - - cl_git_pass(git_filter_list_apply_to_data(&out, fl, &in)); - cl_assert_equal_s("Normal\nCRLF\nline-endings.\n", out.ptr); - - /* Mix of line endings succeeds with safecrlf=warn */ - in.ptr = "Mixed\nup\r\nLF\nand\r\nCRLF\nline-endings.\r\n"; - in.size = strlen(in.ptr); - - cl_git_pass(git_filter_list_apply_to_data(&out, fl, &in)); - /* TODO: check for warning */ - cl_assert_equal_s("Mixed\nup\nLF\nand\nCRLF\nline-endings.\n", out.ptr); - - /* Normalized \n is reversible, so does not fail with safecrlf=warn */ - in.ptr = "Normal\nLF\nonly\nline-endings.\n"; - in.size = strlen(in.ptr); - - cl_git_pass(git_filter_list_apply_to_data(&out, fl, &in)); - cl_assert_equal_s(in.ptr, out.ptr); - - git_filter_list_free(fl); - git_buf_free(&out); -} diff --git a/vendor/libgit2/tests/filter/crlf.h b/vendor/libgit2/tests/filter/crlf.h deleted file mode 100644 index 786edfc96..000000000 --- a/vendor/libgit2/tests/filter/crlf.h +++ /dev/null @@ -1,30 +0,0 @@ -#ifndef INCLUDE_filter_crlf_h__ -#define INCLUDE_filter_crlf_h__ - -/* - * file content for files in the resources/crlf repository - */ - -#define UTF8_BOM "\xEF\xBB\xBF" - -#define ALL_CRLF_TEXT_RAW "crlf\r\ncrlf\r\ncrlf\r\ncrlf\r\n" -#define ALL_LF_TEXT_RAW "lf\nlf\nlf\nlf\nlf\n" -#define MORE_CRLF_TEXT_RAW "crlf\r\ncrlf\r\nlf\ncrlf\r\ncrlf\r\n" -#define MORE_LF_TEXT_RAW "lf\nlf\ncrlf\r\nlf\nlf\n" - -#define ALL_CRLF_TEXT_AS_CRLF ALL_CRLF_TEXT_RAW -#define ALL_LF_TEXT_AS_CRLF "lf\r\nlf\r\nlf\r\nlf\r\nlf\r\n" -#define MORE_CRLF_TEXT_AS_CRLF "crlf\r\ncrlf\r\nlf\r\ncrlf\r\ncrlf\r\n" -#define MORE_LF_TEXT_AS_CRLF "lf\r\nlf\r\ncrlf\r\nlf\r\nlf\r\n" - -#define ALL_CRLF_TEXT_AS_LF "crlf\ncrlf\ncrlf\ncrlf\n" -#define ALL_LF_TEXT_AS_LF ALL_LF_TEXT_RAW -#define MORE_CRLF_TEXT_AS_LF "crlf\ncrlf\nlf\ncrlf\ncrlf\n" -#define MORE_LF_TEXT_AS_LF "lf\nlf\ncrlf\nlf\nlf\n" - -#define FEW_UTF8_CRLF_RAW "\xe2\x9a\xbdThe rest is ASCII01.\r\nThe rest is ASCII02.\r\nThe rest is ASCII03.\r\nThe rest is ASCII04.\r\nThe rest is ASCII05.\r\nThe rest is ASCII06.\r\nThe rest is ASCII07.\r\nThe rest is ASCII08.\r\nThe rest is ASCII09.\r\nThe rest is ASCII10.\r\nThe rest is ASCII11.\r\nThe rest is ASCII12.\r\nThe rest is ASCII13.\r\nThe rest is ASCII14.\r\nThe rest is ASCII15.\r\nThe rest is ASCII16.\r\nThe rest is ASCII17.\r\nThe rest is ASCII18.\r\nThe rest is ASCII19.\r\nThe rest is ASCII20.\r\nThe rest is ASCII21.\r\nThe rest is ASCII22.\r\n" -#define FEW_UTF8_LF_RAW "\xe2\x9a\xbdThe rest is ASCII01.\nThe rest is ASCII02.\nThe rest is ASCII03.\nThe rest is ASCII04.\nThe rest is ASCII05.\nThe rest is ASCII06.\nThe rest is ASCII07.\nThe rest is ASCII08.\nThe rest is ASCII09.\nThe rest is ASCII10.\nThe rest is ASCII11.\nThe rest is ASCII12.\nThe rest is ASCII13.\nThe rest is ASCII14.\nThe rest is ASCII15.\nThe rest is ASCII16.\nThe rest is ASCII17.\nThe rest is ASCII18.\nThe rest is ASCII19.\nThe rest is ASCII20.\nThe rest is ASCII21.\nThe rest is ASCII22.\n" -#define MANY_UTF8_CRLF_RAW "Lets sing!\r\n\xe2\x99\xab\xe2\x99\xaa\xe2\x99\xac\xe2\x99\xa9\r\nEat food\r\n\xf0\x9f\x8d\x85\xf0\x9f\x8d\x95\r\n" -#define MANY_UTF8_LF_RAW "Lets sing!\n\xe2\x99\xab\xe2\x99\xaa\xe2\x99\xac\xe2\x99\xa9\nEat food\n\xf0\x9f\x8d\x85\xf0\x9f\x8d\x95\n" - -#endif diff --git a/vendor/libgit2/tests/filter/custom.c b/vendor/libgit2/tests/filter/custom.c deleted file mode 100644 index fd1cd271c..000000000 --- a/vendor/libgit2/tests/filter/custom.c +++ /dev/null @@ -1,237 +0,0 @@ -#include "clar_libgit2.h" -#include "posix.h" -#include "blob.h" -#include "filter.h" -#include "buf_text.h" -#include "git2/sys/filter.h" -#include "git2/sys/repository.h" -#include "custom_helpers.h" - -/* going TO_WORKDIR, filters are executed low to high - * going TO_ODB, filters are executed high to low - */ -#define BITFLIP_FILTER_PRIORITY -1 -#define REVERSE_FILTER_PRIORITY -2 - -#ifdef GIT_WIN32 -# define NEWLINE "\r\n" -#else -# define NEWLINE "\n" -#endif - -static char workdir_data[] = - "some simple" NEWLINE - "data" NEWLINE - "that will be" NEWLINE - "trivially" NEWLINE - "scrambled." NEWLINE; - -#define REVERSED_DATA_LEN 51 - -/* Represents the data above scrambled (bits flipped) after \r\n -> \n - * conversion, then bytewise reversed - */ -static unsigned char bitflipped_and_reversed_data[] = - { 0xf5, 0xd1, 0x9b, 0x9a, 0x93, 0x9d, 0x92, 0x9e, 0x8d, 0x9c, 0x8c, - 0xf5, 0x86, 0x93, 0x93, 0x9e, 0x96, 0x89, 0x96, 0x8d, 0x8b, 0xf5, - 0x9a, 0x9d, 0xdf, 0x93, 0x93, 0x96, 0x88, 0xdf, 0x8b, 0x9e, 0x97, - 0x8b, 0xf5, 0x9e, 0x8b, 0x9e, 0x9b, 0xf5, 0x9a, 0x93, 0x8f, 0x92, - 0x96, 0x8c, 0xdf, 0x9a, 0x92, 0x90, 0x8c }; - -#define BITFLIPPED_AND_REVERSED_DATA_LEN 51 - -static git_repository *g_repo = NULL; - -static void register_custom_filters(void); - -void test_filter_custom__initialize(void) -{ - register_custom_filters(); - - g_repo = cl_git_sandbox_init("empty_standard_repo"); - - cl_git_mkfile( - "empty_standard_repo/.gitattributes", - "hero* bitflip reverse\n" - "herofile text\n" - "heroflip -reverse binary\n" - "*.bin binary\n"); -} - -void test_filter_custom__cleanup(void) -{ - cl_git_sandbox_cleanup(); - g_repo = NULL; -} - -static void register_custom_filters(void) -{ - static int filters_registered = 0; - - if (!filters_registered) { - cl_git_pass(git_filter_register( - "bitflip", create_bitflip_filter(), BITFLIP_FILTER_PRIORITY)); - - cl_git_pass(git_filter_register( - "reverse", create_reverse_filter("+reverse"), - REVERSE_FILTER_PRIORITY)); - - /* re-register reverse filter with standard filter=xyz priority */ - cl_git_pass(git_filter_register( - "pre-reverse", - create_reverse_filter("+prereverse"), - GIT_FILTER_DRIVER_PRIORITY)); - - filters_registered = 1; - } -} - -void test_filter_custom__to_odb(void) -{ - git_filter_list *fl; - git_buf out = { 0 }; - git_buf in = GIT_BUF_INIT_CONST(workdir_data, strlen(workdir_data)); - - cl_git_pass(git_filter_list_load( - &fl, g_repo, NULL, "herofile", GIT_FILTER_TO_ODB, 0)); - - cl_git_pass(git_filter_list_apply_to_data(&out, fl, &in)); - - cl_assert_equal_i(BITFLIPPED_AND_REVERSED_DATA_LEN, out.size); - - cl_assert_equal_i( - 0, memcmp(bitflipped_and_reversed_data, out.ptr, out.size)); - - git_filter_list_free(fl); - git_buf_free(&out); -} - -void test_filter_custom__to_workdir(void) -{ - git_filter_list *fl; - git_buf out = { 0 }; - git_buf in = GIT_BUF_INIT_CONST( - bitflipped_and_reversed_data, BITFLIPPED_AND_REVERSED_DATA_LEN); - - cl_git_pass(git_filter_list_load( - &fl, g_repo, NULL, "herofile", GIT_FILTER_TO_WORKTREE, 0)); - - cl_git_pass(git_filter_list_apply_to_data(&out, fl, &in)); - - cl_assert_equal_i(strlen(workdir_data), out.size); - - cl_assert_equal_i( - 0, memcmp(workdir_data, out.ptr, out.size)); - - git_filter_list_free(fl); - git_buf_free(&out); -} - -void test_filter_custom__can_register_a_custom_filter_in_the_repository(void) -{ - git_filter_list *fl; - - cl_git_pass(git_filter_list_load( - &fl, g_repo, NULL, "herofile", GIT_FILTER_TO_WORKTREE, 0)); - /* expect: bitflip, reverse, crlf */ - cl_assert_equal_sz(3, git_filter_list_length(fl)); - git_filter_list_free(fl); - - cl_git_pass(git_filter_list_load( - &fl, g_repo, NULL, "herocorp", GIT_FILTER_TO_WORKTREE, 0)); - /* expect: bitflip, reverse - possibly crlf depending on global config */ - { - size_t flen = git_filter_list_length(fl); - cl_assert(flen == 2 || flen == 3); - } - git_filter_list_free(fl); - - cl_git_pass(git_filter_list_load( - &fl, g_repo, NULL, "hero.bin", GIT_FILTER_TO_WORKTREE, 0)); - /* expect: bitflip, reverse */ - cl_assert_equal_sz(2, git_filter_list_length(fl)); - git_filter_list_free(fl); - - cl_git_pass(git_filter_list_load( - &fl, g_repo, NULL, "heroflip", GIT_FILTER_TO_WORKTREE, 0)); - /* expect: bitflip (because of -reverse) */ - cl_assert_equal_sz(1, git_filter_list_length(fl)); - git_filter_list_free(fl); - - cl_git_pass(git_filter_list_load( - &fl, g_repo, NULL, "doesntapplytome.bin", - GIT_FILTER_TO_WORKTREE, 0)); - /* expect: none */ - cl_assert_equal_sz(0, git_filter_list_length(fl)); - git_filter_list_free(fl); -} - -void test_filter_custom__order_dependency(void) -{ - git_index *index; - git_blob *blob; - git_buf buf = { 0 }; - - /* so if ident and reverse are used together, an interesting thing - * happens - a reversed "$Id$" string is no longer going to trigger - * ident correctly. When checking out, the filters should be applied - * in order CLRF, then ident, then reverse, so ident expansion should - * work correctly. On check in, the content should be reversed, then - * ident, then CRLF filtered. Let's make sure that works... - */ - - cl_git_mkfile( - "empty_standard_repo/.gitattributes", - "hero.*.rev-ident text ident prereverse eol=lf\n"); - - cl_git_mkfile( - "empty_standard_repo/hero.1.rev-ident", - "This is a test\n$Id$\nHave fun!\n"); - - cl_git_mkfile( - "empty_standard_repo/hero.2.rev-ident", - "Another test\n$dI$\nCrazy!\n"); - - cl_git_pass(git_repository_index(&index, g_repo)); - cl_git_pass(git_index_add_bypath(index, "hero.1.rev-ident")); - cl_git_pass(git_index_add_bypath(index, "hero.2.rev-ident")); - cl_repo_commit_from_index(NULL, g_repo, NULL, 0, "Filter chains\n"); - git_index_free(index); - - cl_git_pass(git_blob_lookup(&blob, g_repo, - & git_index_get_bypath(index, "hero.1.rev-ident", 0)->id)); - cl_assert_equal_s( - "\n!nuf evaH\n$dI$\ntset a si sihT", git_blob_rawcontent(blob)); - cl_git_pass(git_blob_filtered_content(&buf, blob, "hero.1.rev-ident", 0)); - /* no expansion because id was reversed at checkin and now at ident - * time, reverse is not applied yet */ - cl_assert_equal_s( - "This is a test\n$Id$\nHave fun!\n", buf.ptr); - git_blob_free(blob); - - cl_git_pass(git_blob_lookup(&blob, g_repo, - & git_index_get_bypath(index, "hero.2.rev-ident", 0)->id)); - cl_assert_equal_s( - "\n!yzarC\n$Id$\ntset rehtonA", git_blob_rawcontent(blob)); - cl_git_pass(git_blob_filtered_content(&buf, blob, "hero.2.rev-ident", 0)); - /* expansion because reverse was applied at checkin and at ident time, - * reverse is not applied yet */ - cl_assert_equal_s( - "Another test\n$ 59001fe193103b1016b27027c0c827d036fd0ac8 :dI$\nCrazy!\n", buf.ptr); - cl_assert_equal_i(0, git_oid_strcmp( - git_blob_id(blob), "8ca0df630d728c0c72072b6101b301391ef10095")); - git_blob_free(blob); - - git_buf_free(&buf); -} - -void test_filter_custom__filter_registry_failure_cases(void) -{ - git_filter fake = { GIT_FILTER_VERSION, 0 }; - - cl_assert_equal_i(GIT_EEXISTS, git_filter_register("bitflip", &fake, 0)); - - cl_git_fail(git_filter_unregister(GIT_FILTER_CRLF)); - cl_git_fail(git_filter_unregister(GIT_FILTER_IDENT)); - cl_assert_equal_i(GIT_ENOTFOUND, git_filter_unregister("not-a-filter")); -} diff --git a/vendor/libgit2/tests/filter/custom_helpers.c b/vendor/libgit2/tests/filter/custom_helpers.c deleted file mode 100644 index 2c80212be..000000000 --- a/vendor/libgit2/tests/filter/custom_helpers.c +++ /dev/null @@ -1,108 +0,0 @@ -#include "clar_libgit2.h" -#include "posix.h" -#include "filter.h" -#include "buf_text.h" -#include "git2/sys/filter.h" - -#define VERY_SECURE_ENCRYPTION(b) ((b) ^ 0xff) - -int bitflip_filter_apply( - git_filter *self, - void **payload, - git_buf *to, - const git_buf *from, - const git_filter_source *source) -{ - const unsigned char *src = (const unsigned char *)from->ptr; - unsigned char *dst; - size_t i; - - GIT_UNUSED(self); GIT_UNUSED(payload); - - /* verify that attribute path match worked as expected */ - cl_assert_equal_i( - 0, git__strncmp("hero", git_filter_source_path(source), 4)); - - if (!from->size) - return 0; - - cl_git_pass(git_buf_grow(to, from->size)); - - dst = (unsigned char *)to->ptr; - - for (i = 0; i < from->size; i++) - dst[i] = VERY_SECURE_ENCRYPTION(src[i]); - - to->size = from->size; - - return 0; -} - -static void bitflip_filter_free(git_filter *f) -{ - git__free(f); -} - -git_filter *create_bitflip_filter(void) -{ - git_filter *filter = git__calloc(1, sizeof(git_filter)); - cl_assert(filter); - - filter->version = GIT_FILTER_VERSION; - filter->attributes = "+bitflip"; - filter->shutdown = bitflip_filter_free; - filter->apply = bitflip_filter_apply; - - return filter; -} - - -int reverse_filter_apply( - git_filter *self, - void **payload, - git_buf *to, - const git_buf *from, - const git_filter_source *source) -{ - const unsigned char *src = (const unsigned char *)from->ptr; - const unsigned char *end = src + from->size; - unsigned char *dst; - - GIT_UNUSED(self); GIT_UNUSED(payload); GIT_UNUSED(source); - - /* verify that attribute path match worked as expected */ - cl_assert_equal_i( - 0, git__strncmp("hero", git_filter_source_path(source), 4)); - - if (!from->size) - return 0; - - cl_git_pass(git_buf_grow(to, from->size)); - - dst = (unsigned char *)to->ptr + from->size - 1; - - while (src < end) - *dst-- = *src++; - - to->size = from->size; - - return 0; -} - -static void reverse_filter_free(git_filter *f) -{ - git__free(f); -} - -git_filter *create_reverse_filter(const char *attrs) -{ - git_filter *filter = git__calloc(1, sizeof(git_filter)); - cl_assert(filter); - - filter->version = GIT_FILTER_VERSION; - filter->attributes = attrs; - filter->shutdown = reverse_filter_free; - filter->apply = reverse_filter_apply; - - return filter; -} diff --git a/vendor/libgit2/tests/filter/custom_helpers.h b/vendor/libgit2/tests/filter/custom_helpers.h deleted file mode 100644 index 13cfb23ae..000000000 --- a/vendor/libgit2/tests/filter/custom_helpers.h +++ /dev/null @@ -1,18 +0,0 @@ -#include "git2/sys/filter.h" - -extern git_filter *create_bitflip_filter(void); -extern git_filter *create_reverse_filter(const char *attr); - -extern int bitflip_filter_apply( - git_filter *self, - void **payload, - git_buf *to, - const git_buf *from, - const git_filter_source *source); - -extern int reverse_filter_apply( - git_filter *self, - void **payload, - git_buf *to, - const git_buf *from, - const git_filter_source *source); diff --git a/vendor/libgit2/tests/filter/file.c b/vendor/libgit2/tests/filter/file.c deleted file mode 100644 index 599f4e54b..000000000 --- a/vendor/libgit2/tests/filter/file.c +++ /dev/null @@ -1,99 +0,0 @@ -#include "clar_libgit2.h" -#include "git2/sys/filter.h" -#include "crlf.h" -#include "buffer.h" - -static git_repository *g_repo = NULL; - -void test_filter_file__initialize(void) -{ - git_reference *head_ref; - git_commit *head; - - g_repo = cl_git_sandbox_init("crlf"); - - cl_git_mkfile("crlf/.gitattributes", - "*.txt text\n*.bin binary\n*.crlf text eol=crlf\n*.lf text eol=lf\n"); - - cl_repo_set_bool(g_repo, "core.autocrlf", true); - - cl_git_pass(git_repository_head(&head_ref, g_repo)); - cl_git_pass(git_reference_peel((git_object **)&head, head_ref, GIT_OBJ_COMMIT)); - cl_git_pass(git_reset(g_repo, (git_object *)head, GIT_RESET_HARD, NULL)); - - git_commit_free(head); - git_reference_free(head_ref); -} - -void test_filter_file__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -void test_filter_file__apply(void) -{ - git_filter_list *fl; - git_filter *crlf; - git_buf buf = GIT_BUF_INIT; - - cl_git_pass(git_filter_list_new( - &fl, g_repo, GIT_FILTER_TO_ODB, 0)); - - crlf = git_filter_lookup(GIT_FILTER_CRLF); - cl_assert(crlf != NULL); - - cl_git_pass(git_filter_list_push(fl, crlf, NULL)); - - cl_git_pass(git_filter_list_apply_to_file(&buf, fl, g_repo, "all-crlf")); - cl_assert_equal_s("crlf\ncrlf\ncrlf\ncrlf\n", buf.ptr); - - git_buf_free(&buf); - git_filter_list_free(fl); -} - -struct buf_writestream { - git_writestream base; - git_buf buf; -}; - -int buf_writestream_write(git_writestream *s, const char *buf, size_t len) -{ - struct buf_writestream *stream = (struct buf_writestream *)s; - return git_buf_put(&stream->buf, buf, len); -} - -int buf_writestream_close(git_writestream *s) -{ - GIT_UNUSED(s); - return 0; -} - -void buf_writestream_free(git_writestream *s) -{ - struct buf_writestream *stream = (struct buf_writestream *)s; - git_buf_free(&stream->buf); -} - -void test_filter_file__apply_stream(void) -{ - git_filter_list *fl; - git_filter *crlf; - struct buf_writestream write_target = { { - buf_writestream_write, - buf_writestream_close, - buf_writestream_free } }; - - cl_git_pass(git_filter_list_new( - &fl, g_repo, GIT_FILTER_TO_ODB, 0)); - - crlf = git_filter_lookup(GIT_FILTER_CRLF); - cl_assert(crlf != NULL); - - cl_git_pass(git_filter_list_push(fl, crlf, NULL)); - - cl_git_pass(git_filter_list_stream_file(fl, g_repo, "all-crlf", &write_target.base)); - cl_assert_equal_s("crlf\ncrlf\ncrlf\ncrlf\n", write_target.buf.ptr); - - git_filter_list_free(fl); - write_target.base.free(&write_target.base); -} diff --git a/vendor/libgit2/tests/filter/ident.c b/vendor/libgit2/tests/filter/ident.c deleted file mode 100644 index c54b6214c..000000000 --- a/vendor/libgit2/tests/filter/ident.c +++ /dev/null @@ -1,133 +0,0 @@ -#include "clar_libgit2.h" -#include "git2/sys/filter.h" - -static git_repository *g_repo = NULL; - -void test_filter_ident__initialize(void) -{ - g_repo = cl_git_sandbox_init("crlf"); -} - -void test_filter_ident__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -static void add_blob_and_filter( - const char *data, - git_filter_list *fl, - const char *expected) -{ - git_oid id; - git_blob *blob; - git_buf out = { 0 }; - - cl_git_mkfile("crlf/identtest", data); - cl_git_pass(git_blob_create_fromworkdir(&id, g_repo, "identtest")); - cl_git_pass(git_blob_lookup(&blob, g_repo, &id)); - - cl_git_pass(git_filter_list_apply_to_blob(&out, fl, blob)); - - cl_assert_equal_s(expected, out.ptr); - - git_blob_free(blob); - git_buf_free(&out); -} - -void test_filter_ident__to_worktree(void) -{ - git_filter_list *fl; - git_filter *ident; - - cl_git_pass(git_filter_list_new( - &fl, g_repo, GIT_FILTER_TO_WORKTREE, 0)); - - ident = git_filter_lookup(GIT_FILTER_IDENT); - cl_assert(ident != NULL); - - cl_git_pass(git_filter_list_push(fl, ident, NULL)); - - add_blob_and_filter( - "Hello\n$Id$\nFun stuff\n", fl, - "Hello\n$Id: b69e2387aafcaf73c4de5b9ab59abe27fdadee30 $\nFun stuff\n"); - add_blob_and_filter( - "Hello\n$Id: Junky$\nFun stuff\n", fl, - "Hello\n$Id: 45cd107a7102911cb2a7df08404674327fa050b9 $\nFun stuff\n"); - add_blob_and_filter( - "$Id$\nAt the start\n", fl, - "$Id: b13415c767abc196fb95bd17070e8c1113e32160 $\nAt the start\n"); - add_blob_and_filter( - "At the end\n$Id$", fl, - "At the end\n$Id: 1344925c6bc65b34c5a7b50f86bf688e48e9a272 $"); - add_blob_and_filter( - "$Id$", fl, - "$Id: b3f5ebfb5843bc43ceecff6d4f26bb37c615beb1 $"); - add_blob_and_filter( - "$Id: Some sort of junk goes here$", fl, - "$Id: ab2dd3853c7c9a4bff55aca2bea077a73c32ac06 $"); - - add_blob_and_filter("$Id: ", fl, "$Id: "); - add_blob_and_filter("$Id", fl, "$Id"); - add_blob_and_filter("$I", fl, "$I"); - add_blob_and_filter("Id$", fl, "Id$"); - - git_filter_list_free(fl); -} - -void test_filter_ident__to_odb(void) -{ - git_filter_list *fl; - git_filter *ident; - - cl_git_pass(git_filter_list_new( - &fl, g_repo, GIT_FILTER_TO_ODB, 0)); - - ident = git_filter_lookup(GIT_FILTER_IDENT); - cl_assert(ident != NULL); - - cl_git_pass(git_filter_list_push(fl, ident, NULL)); - - add_blob_and_filter( - "Hello\n$Id$\nFun stuff\n", - fl, "Hello\n$Id$\nFun stuff\n"); - add_blob_and_filter( - "Hello\n$Id: b69e2387aafcaf73c4de5b9ab59abe27fdadee30$\nFun stuff\n", - fl, "Hello\n$Id$\nFun stuff\n"); - add_blob_and_filter( - "Hello\n$Id: Any junk you may have left here$\nFun stuff\n", - fl, "Hello\n$Id$\nFun stuff\n"); - add_blob_and_filter( - "Hello\n$Id:$\nFun stuff\n", - fl, "Hello\n$Id$\nFun stuff\n"); - add_blob_and_filter( - "Hello\n$Id:x$\nFun stuff\n", - fl, "Hello\n$Id$\nFun stuff\n"); - - add_blob_and_filter( - "$Id$\nAt the start\n", fl, "$Id$\nAt the start\n"); - add_blob_and_filter( - "$Id: lots of random text that should be removed from here$\nAt the start\n", fl, "$Id$\nAt the start\n"); - add_blob_and_filter( - "$Id: lots of random text that should not be removed without a terminator\nAt the start\n", fl, "$Id: lots of random text that should not be removed without a terminator\nAt the start\n"); - - add_blob_and_filter( - "At the end\n$Id$", fl, "At the end\n$Id$"); - add_blob_and_filter( - "At the end\n$Id:$", fl, "At the end\n$Id$"); - add_blob_and_filter( - "At the end\n$Id:asdfasdf$", fl, "At the end\n$Id$"); - add_blob_and_filter( - "At the end\n$Id", fl, "At the end\n$Id"); - add_blob_and_filter( - "At the end\n$IddI", fl, "At the end\n$IddI"); - - add_blob_and_filter("$Id$", fl, "$Id$"); - add_blob_and_filter("$Id: any$", fl, "$Id$"); - add_blob_and_filter("$Id: any long stuff goes here you see$", fl, "$Id$"); - add_blob_and_filter("$Id: ", fl, "$Id: "); - add_blob_and_filter("$Id", fl, "$Id"); - add_blob_and_filter("$I", fl, "$I"); - add_blob_and_filter("Id$", fl, "Id$"); - - git_filter_list_free(fl); -} diff --git a/vendor/libgit2/tests/filter/query.c b/vendor/libgit2/tests/filter/query.c deleted file mode 100644 index 6889d715b..000000000 --- a/vendor/libgit2/tests/filter/query.c +++ /dev/null @@ -1,91 +0,0 @@ -#include "clar_libgit2.h" -#include "git2/sys/filter.h" -#include "crlf.h" -#include "buffer.h" - -static git_repository *g_repo = NULL; - -void test_filter_query__initialize(void) -{ - g_repo = cl_git_sandbox_init("crlf"); - - cl_git_mkfile("crlf/.gitattributes", - "*.txt text\n" - "*.bin binary\n" - "*.crlf text eol=crlf\n" - "*.lf text eol=lf\n" - "*.binident binary ident\n" - "*.ident text ident\n" - "*.identcrlf ident text eol=crlf\n" - "*.identlf ident text eol=lf\n" - "*.custom custom ident text\n"); -} - -void test_filter_query__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -static int filter_for(const char *filename, const char *filter) -{ - git_filter_list *fl; - int filtered; - - cl_git_pass(git_filter_list_load( - &fl, g_repo, NULL, filename, GIT_FILTER_TO_WORKTREE, 0)); - filtered = git_filter_list_contains(fl, filter); - git_filter_list_free(fl); - - return filtered; -} - -void test_filter_query__filters(void) -{ - cl_assert_equal_i(1, filter_for("text.txt", "crlf")); - cl_assert_equal_i(0, filter_for("binary.bin", "crlf")); - - cl_assert_equal_i(1, filter_for("foo.lf", "crlf")); - cl_assert_equal_i(0, filter_for("foo.lf", "ident")); - - cl_assert_equal_i(1, filter_for("id.ident", "crlf")); - cl_assert_equal_i(1, filter_for("id.ident", "ident")); - - cl_assert_equal_i(0, filter_for("id.binident", "crlf")); - cl_assert_equal_i(1, filter_for("id.binident", "ident")); -} - -void test_filter_query__autocrlf_true_implies_crlf(void) -{ - cl_repo_set_bool(g_repo, "core.autocrlf", true); - cl_assert_equal_i(1, filter_for("not_in_gitattributes", "crlf")); - cl_assert_equal_i(1, filter_for("foo.txt", "crlf")); - cl_assert_equal_i(0, filter_for("foo.bin", "crlf")); - cl_assert_equal_i(1, filter_for("foo.lf", "crlf")); - - cl_repo_set_bool(g_repo, "core.autocrlf", false); - cl_assert_equal_i(0, filter_for("not_in_gitattributes", "crlf")); - cl_assert_equal_i(1, filter_for("foo.txt", "crlf")); - cl_assert_equal_i(0, filter_for("foo.bin", "crlf")); - cl_assert_equal_i(1, filter_for("foo.lf", "crlf")); -} - -void test_filter_query__unknown(void) -{ - cl_assert_equal_i(1, filter_for("foo.custom", "crlf")); - cl_assert_equal_i(1, filter_for("foo.custom", "ident")); - cl_assert_equal_i(0, filter_for("foo.custom", "custom")); -} - -void test_filter_query__custom(void) -{ - git_filter custom = { GIT_FILTER_VERSION }; - - cl_git_pass(git_filter_register( - "custom", &custom, 42)); - - cl_assert_equal_i(1, filter_for("foo.custom", "crlf")); - cl_assert_equal_i(1, filter_for("foo.custom", "ident")); - cl_assert_equal_i(1, filter_for("foo.custom", "custom")); - - git_filter_unregister("custom"); -} diff --git a/vendor/libgit2/tests/filter/stream.c b/vendor/libgit2/tests/filter/stream.c deleted file mode 100644 index 30f5e5027..000000000 --- a/vendor/libgit2/tests/filter/stream.c +++ /dev/null @@ -1,216 +0,0 @@ -#include "clar_libgit2.h" -#include "posix.h" -#include "blob.h" -#include "filter.h" -#include "buf_text.h" -#include "git2/sys/filter.h" -#include "git2/sys/repository.h" - -static git_repository *g_repo = NULL; - -static git_filter *create_compress_filter(void); -static git_filter *compress_filter; - -void test_filter_stream__initialize(void) -{ - compress_filter = create_compress_filter(); - - cl_git_pass(git_filter_register("compress", compress_filter, 50)); - g_repo = cl_git_sandbox_init("empty_standard_repo"); -} - -void test_filter_stream__cleanup(void) -{ - cl_git_sandbox_cleanup(); - g_repo = NULL; - - git_filter_unregister("compress"); - git__free(compress_filter); -} - -#define CHUNKSIZE 10240 - -struct compress_stream { - git_writestream parent; - git_writestream *next; - git_filter_mode_t mode; - char current; - size_t current_chunk; -}; - -static int compress_stream_write__deflated(struct compress_stream *stream, const char *buffer, size_t len) -{ - size_t idx = 0; - - while (len > 0) { - size_t chunkremain, chunksize; - - if (stream->current_chunk == 0) - stream->current = buffer[idx]; - - chunkremain = CHUNKSIZE - stream->current_chunk; - chunksize = min(chunkremain, len); - - stream->current_chunk += chunksize; - len -= chunksize; - idx += chunksize; - - if (stream->current_chunk == CHUNKSIZE) { - cl_git_pass(stream->next->write(stream->next, &stream->current, 1)); - stream->current_chunk = 0; - } - } - - return 0; -} - -static int compress_stream_write__inflated(struct compress_stream *stream, const char *buffer, size_t len) -{ - char inflated[CHUNKSIZE]; - size_t i, j; - - for (i = 0; i < len; i++) { - for (j = 0; j < CHUNKSIZE; j++) - inflated[j] = buffer[i]; - - cl_git_pass(stream->next->write(stream->next, inflated, CHUNKSIZE)); - } - - return 0; -} - -static int compress_stream_write(git_writestream *s, const char *buffer, size_t len) -{ - struct compress_stream *stream = (struct compress_stream *)s; - - return (stream->mode == GIT_FILTER_TO_ODB) ? - compress_stream_write__deflated(stream, buffer, len) : - compress_stream_write__inflated(stream, buffer, len); -} - -static int compress_stream_close(git_writestream *s) -{ - struct compress_stream *stream = (struct compress_stream *)s; - cl_assert_equal_i(0, stream->current_chunk); - stream->next->close(stream->next); - return 0; -} - -static void compress_stream_free(git_writestream *stream) -{ - git__free(stream); -} - -static int compress_filter_stream_init( - git_writestream **out, - git_filter *self, - void **payload, - const git_filter_source *src, - git_writestream *next) -{ - struct compress_stream *stream = git__calloc(1, sizeof(struct compress_stream)); - cl_assert(stream); - - GIT_UNUSED(self); - GIT_UNUSED(payload); - - stream->parent.write = compress_stream_write; - stream->parent.close = compress_stream_close; - stream->parent.free = compress_stream_free; - stream->next = next; - stream->mode = git_filter_source_mode(src); - - *out = (git_writestream *)stream; - return 0; -} - -git_filter *create_compress_filter(void) -{ - git_filter *filter = git__calloc(1, sizeof(git_filter)); - cl_assert(filter); - - filter->version = GIT_FILTER_VERSION; - filter->attributes = "+compress"; - filter->stream = compress_filter_stream_init; - - return filter; -} - -static void writefile(const char *filename, size_t numchunks) -{ - git_buf path = GIT_BUF_INIT; - char buf[CHUNKSIZE]; - size_t i = 0, j = 0; - int fd; - - cl_git_pass(git_buf_joinpath(&path, "empty_standard_repo", filename)); - - fd = p_open(path.ptr, O_RDWR|O_CREAT, 0666); - cl_assert(fd >= 0); - - for (i = 0; i < numchunks; i++) { - for (j = 0; j < CHUNKSIZE; j++) { - buf[j] = i % 256; - } - - cl_git_pass(p_write(fd, buf, CHUNKSIZE)); - } - p_close(fd); - - git_buf_free(&path); -} - -static void test_stream(size_t numchunks) -{ - git_index *index; - const git_index_entry *entry; - git_blob *blob; - struct stat st; - git_checkout_options checkout_opts = GIT_CHECKOUT_OPTIONS_INIT; - - checkout_opts.checkout_strategy = GIT_CHECKOUT_FORCE; - - cl_git_mkfile( - "empty_standard_repo/.gitattributes", - "* compress\n"); - - /* write a file to disk */ - writefile("streamed_file", numchunks); - - /* place it in the index */ - cl_git_pass(git_repository_index(&index, g_repo)); - cl_git_pass(git_index_add_bypath(index, "streamed_file")); - cl_git_pass(git_index_write(index)); - - /* ensure it was appropriately compressed */ - cl_assert(entry = git_index_get_bypath(index, "streamed_file", 0)); - - cl_git_pass(git_blob_lookup(&blob, g_repo, &entry->id)); - cl_assert_equal_i(numchunks, git_blob_rawsize(blob)); - - /* check the file back out */ - cl_must_pass(p_unlink("empty_standard_repo/streamed_file")); - cl_git_pass(git_checkout_index(g_repo, index, &checkout_opts)); - - /* ensure it was decompressed */ - cl_must_pass(p_stat("empty_standard_repo/streamed_file", &st)); - cl_assert_equal_sz((numchunks * CHUNKSIZE), st.st_size); - - git_index_free(index); - git_blob_free(blob); -} - -/* write a 50KB file through the "compression" stream */ -void test_filter_stream__smallfile(void) -{ - test_stream(5); -} - -/* optionally write a 500 MB file through the compression stream */ -void test_filter_stream__bigfile(void) -{ - if (!cl_is_env_set("GITTEST_INVASIVE_FS_SIZE")) - cl_skip(); - - test_stream(51200); -} diff --git a/vendor/libgit2/tests/filter/wildcard.c b/vendor/libgit2/tests/filter/wildcard.c deleted file mode 100644 index 999b33653..000000000 --- a/vendor/libgit2/tests/filter/wildcard.c +++ /dev/null @@ -1,184 +0,0 @@ -#include "clar_libgit2.h" -#include "posix.h" -#include "blob.h" -#include "filter.h" -#include "buf_text.h" -#include "git2/sys/filter.h" -#include "git2/sys/repository.h" -#include "custom_helpers.h" - -static git_repository *g_repo = NULL; - -static git_filter *create_wildcard_filter(void); - -#define DATA_LEN 32 - -static unsigned char input[] = { - 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, - 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, - 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, - 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, -}; - -static unsigned char reversed[] = { - 0x1f, 0x1e, 0x1d, 0x1c, 0x1b, 0x1a, 0x19, 0x18, - 0x17, 0x16, 0x15, 0x14, 0x13, 0x12, 0x11, 0x10, - 0x0f, 0x0e, 0x0d, 0x0c, 0x0b, 0x0a, 0x09, 0x08, - 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00, -}; - -static unsigned char flipped[] = { - 0xff, 0xfe, 0xfd, 0xfc, 0xfb, 0xfa, 0xf9, 0xf8, - 0xf7, 0xf6, 0xf5, 0xf4, 0xf3, 0xf2, 0xf1, 0xf0, - 0xef, 0xee, 0xed, 0xec, 0xeb, 0xea, 0xe9, 0xe8, - 0xe7, 0xe6, 0xe5, 0xe4, 0xe3, 0xe2, 0xe1, 0xe0, -}; - -void test_filter_wildcard__initialize(void) -{ - cl_git_pass(git_filter_register( - "wildcard", create_wildcard_filter(), GIT_FILTER_DRIVER_PRIORITY)); - - g_repo = cl_git_sandbox_init("empty_standard_repo"); - - cl_git_rewritefile( - "empty_standard_repo/.gitattributes", - "* binary\n" - "hero-flip-* filter=wcflip\n" - "hero-reverse-* filter=wcreverse\n" - "none-* filter=unregistered\n"); -} - -void test_filter_wildcard__cleanup(void) -{ - cl_git_pass(git_filter_unregister("wildcard")); - - cl_git_sandbox_cleanup(); - g_repo = NULL; -} - -static int wildcard_filter_check( - git_filter *self, - void **payload, - const git_filter_source *src, - const char **attr_values) -{ - GIT_UNUSED(self); - GIT_UNUSED(src); - - if (strcmp(attr_values[0], "wcflip") == 0 || - strcmp(attr_values[0], "wcreverse") == 0) { - *payload = git__strdup(attr_values[0]); - GITERR_CHECK_ALLOC(*payload); - return 0; - } - - return GIT_PASSTHROUGH; -} - -static int wildcard_filter_apply( - git_filter *self, - void **payload, - git_buf *to, - const git_buf *from, - const git_filter_source *source) -{ - const char *filtername = *payload; - - if (filtername && strcmp(filtername, "wcflip") == 0) - return bitflip_filter_apply(self, payload, to, from, source); - else if (filtername && strcmp(filtername, "wcreverse") == 0) - return reverse_filter_apply(self, payload, to, from, source); - - cl_fail("Unexpected attribute"); - return GIT_PASSTHROUGH; -} - -static void wildcard_filter_cleanup(git_filter *self, void *payload) -{ - GIT_UNUSED(self); - git__free(payload); -} - -static void wildcard_filter_free(git_filter *f) -{ - git__free(f); -} - -static git_filter *create_wildcard_filter(void) -{ - git_filter *filter = git__calloc(1, sizeof(git_filter)); - cl_assert(filter); - - filter->version = GIT_FILTER_VERSION; - filter->attributes = "filter=*"; - filter->check = wildcard_filter_check; - filter->apply = wildcard_filter_apply; - filter->cleanup = wildcard_filter_cleanup; - filter->shutdown = wildcard_filter_free; - - return filter; -} - -void test_filter_wildcard__reverse(void) -{ - git_filter_list *fl; - git_buf in = GIT_BUF_INIT, out = GIT_BUF_INIT; - - cl_git_pass(git_filter_list_load( - &fl, g_repo, NULL, "hero-reverse-foo", GIT_FILTER_TO_ODB, 0)); - - cl_git_pass(git_buf_put(&in, (char *)input, DATA_LEN)); - cl_git_pass(git_filter_list_apply_to_data(&out, fl, &in)); - - cl_assert_equal_i(DATA_LEN, out.size); - - cl_assert_equal_i( - 0, memcmp(reversed, out.ptr, out.size)); - - git_filter_list_free(fl); - git_buf_free(&out); - git_buf_free(&in); -} - -void test_filter_wildcard__flip(void) -{ - git_filter_list *fl; - git_buf in = GIT_BUF_INIT, out = GIT_BUF_INIT; - - cl_git_pass(git_filter_list_load( - &fl, g_repo, NULL, "hero-flip-foo", GIT_FILTER_TO_ODB, 0)); - - cl_git_pass(git_buf_put(&in, (char *)input, DATA_LEN)); - cl_git_pass(git_filter_list_apply_to_data(&out, fl, &in)); - - cl_assert_equal_i(DATA_LEN, out.size); - - cl_assert_equal_i( - 0, memcmp(flipped, out.ptr, out.size)); - - git_filter_list_free(fl); - git_buf_free(&out); - git_buf_free(&in); -} - -void test_filter_wildcard__none(void) -{ - git_filter_list *fl; - git_buf in = GIT_BUF_INIT, out = GIT_BUF_INIT; - - cl_git_pass(git_filter_list_load( - &fl, g_repo, NULL, "none-foo", GIT_FILTER_TO_ODB, 0)); - - cl_git_pass(git_buf_put(&in, (char *)input, DATA_LEN)); - cl_git_pass(git_filter_list_apply_to_data(&out, fl, &in)); - - cl_assert_equal_i(DATA_LEN, out.size); - - cl_assert_equal_i( - 0, memcmp(input, out.ptr, out.size)); - - git_filter_list_free(fl); - git_buf_free(&out); - git_buf_free(&in); -} diff --git a/vendor/libgit2/tests/generate.py b/vendor/libgit2/tests/generate.py deleted file mode 100644 index 587efb519..000000000 --- a/vendor/libgit2/tests/generate.py +++ /dev/null @@ -1,244 +0,0 @@ -#!/usr/bin/env python -# -# Copyright (c) Vicent Marti. All rights reserved. -# -# This file is part of clar, distributed under the ISC license. -# For full terms see the included COPYING file. -# - -from __future__ import with_statement -from string import Template -import re, fnmatch, os, codecs, pickle - -class Module(object): - class Template(object): - def __init__(self, module): - self.module = module - - def _render_callback(self, cb): - if not cb: - return ' { NULL, NULL }' - return ' { "%s", &%s }' % (cb['short_name'], cb['symbol']) - - class DeclarationTemplate(Template): - def render(self): - out = "\n".join("extern %s;" % cb['declaration'] for cb in self.module.callbacks) + "\n" - - if self.module.initialize: - out += "extern %s;\n" % self.module.initialize['declaration'] - - if self.module.cleanup: - out += "extern %s;\n" % self.module.cleanup['declaration'] - - return out - - class CallbacksTemplate(Template): - def render(self): - out = "static const struct clar_func _clar_cb_%s[] = {\n" % self.module.name - out += ",\n".join(self._render_callback(cb) for cb in self.module.callbacks) - out += "\n};\n" - return out - - class InfoTemplate(Template): - def render(self): - return Template( - r""" - { - "${clean_name}", - ${initialize}, - ${cleanup}, - ${cb_ptr}, ${cb_count}, ${enabled} - }""" - ).substitute( - clean_name = self.module.clean_name(), - initialize = self._render_callback(self.module.initialize), - cleanup = self._render_callback(self.module.cleanup), - cb_ptr = "_clar_cb_%s" % self.module.name, - cb_count = len(self.module.callbacks), - enabled = int(self.module.enabled) - ) - - def __init__(self, name): - self.name = name - - self.mtime = 0 - self.enabled = True - self.modified = False - - def clean_name(self): - return self.name.replace("_", "::") - - def _skip_comments(self, text): - SKIP_COMMENTS_REGEX = re.compile( - r'//.*?$|/\*.*?\*/|\'(?:\\.|[^\\\'])*\'|"(?:\\.|[^\\"])*"', - re.DOTALL | re.MULTILINE) - - def _replacer(match): - s = match.group(0) - return "" if s.startswith('/') else s - - return re.sub(SKIP_COMMENTS_REGEX, _replacer, text) - - def parse(self, contents): - TEST_FUNC_REGEX = r"^(void\s+(test_%s__(\w+))\s*\(\s*void\s*\))\s*\{" - - contents = self._skip_comments(contents) - regex = re.compile(TEST_FUNC_REGEX % self.name, re.MULTILINE) - - self.callbacks = [] - self.initialize = None - self.cleanup = None - - for (declaration, symbol, short_name) in regex.findall(contents): - data = { - "short_name" : short_name, - "declaration" : declaration, - "symbol" : symbol - } - - if short_name == 'initialize': - self.initialize = data - elif short_name == 'cleanup': - self.cleanup = data - else: - self.callbacks.append(data) - - return self.callbacks != [] - - def refresh(self, path): - self.modified = False - - try: - st = os.stat(path) - - # Not modified - if st.st_mtime == self.mtime: - return True - - self.modified = True - self.mtime = st.st_mtime - - with codecs.open(path, encoding='utf-8') as fp: - raw_content = fp.read() - - except IOError: - return False - - return self.parse(raw_content) - -class TestSuite(object): - - def __init__(self, path): - self.path = path - - def should_generate(self, path): - if not os.path.isfile(path): - return True - - if any(module.modified for module in self.modules.values()): - return True - - return False - - def find_modules(self): - modules = [] - for root, _, files in os.walk(self.path): - module_root = root[len(self.path):] - module_root = [c for c in module_root.split(os.sep) if c] - - tests_in_module = fnmatch.filter(files, "*.c") - - for test_file in tests_in_module: - full_path = os.path.join(root, test_file) - module_name = "_".join(module_root + [test_file[:-2]]).replace("-", "_") - - modules.append((full_path, module_name)) - - return modules - - def load_cache(self): - path = os.path.join(self.path, '.clarcache') - cache = {} - - try: - fp = open(path, 'rb') - cache = pickle.load(fp) - fp.close() - except (IOError, ValueError): - pass - - return cache - - def save_cache(self): - path = os.path.join(self.path, '.clarcache') - with open(path, 'wb') as cache: - pickle.dump(self.modules, cache) - - def load(self, force = False): - module_data = self.find_modules() - self.modules = {} if force else self.load_cache() - - for path, name in module_data: - if name not in self.modules: - self.modules[name] = Module(name) - - if not self.modules[name].refresh(path): - del self.modules[name] - - def disable(self, excluded): - for exclude in excluded: - for module in self.modules.values(): - name = module.clean_name() - if name.startswith(exclude): - module.enabled = False - module.modified = True - - def suite_count(self): - return len(self.modules) - - def callback_count(self): - return sum(len(module.callbacks) for module in self.modules.values()) - - def write(self): - output = os.path.join(self.path, 'clar.suite') - - if not self.should_generate(output): - return False - - with open(output, 'w') as data: - for module in self.modules.values(): - t = Module.DeclarationTemplate(module) - data.write(t.render()) - - for module in self.modules.values(): - t = Module.CallbacksTemplate(module) - data.write(t.render()) - - suites = "static struct clar_suite _clar_suites[] = {" + ','.join( - Module.InfoTemplate(module).render() for module in sorted(self.modules.values(), key=lambda module: module.name) - ) + "\n};\n" - - data.write(suites) - - data.write("static const size_t _clar_suite_count = %d;\n" % self.suite_count()) - data.write("static const size_t _clar_callback_count = %d;\n" % self.callback_count()) - - self.save_cache() - return True - -if __name__ == '__main__': - from optparse import OptionParser - - parser = OptionParser() - parser.add_option('-f', '--force', action="store_true", dest='force', default=False) - parser.add_option('-x', '--exclude', dest='excluded', action='append', default=[]) - - options, args = parser.parse_args() - - for path in args or ['.']: - suite = TestSuite(path) - suite.load(options.force) - suite.disable(options.excluded) - if suite.write(): - print("Written `clar.suite` (%d tests in %d suites)" % (suite.callback_count(), suite.suite_count())) - diff --git a/vendor/libgit2/tests/generate_crlf.sh b/vendor/libgit2/tests/generate_crlf.sh deleted file mode 100644 index d3fd1bb9a..000000000 --- a/vendor/libgit2/tests/generate_crlf.sh +++ /dev/null @@ -1,73 +0,0 @@ -#!/usr/bin/env bash - -set -e - -if [ "$1" == "" -o "$2" == "" ]; then - echo "usage: $0 crlfrepo directory [tempdir]" - exit 1 -fi - -input=$1 -output=$2 -tempdir=$3 - -set -u - -create_repo() { - local input=$1 - local output=$2 - local tempdir=$3 - local systype=$4 - local autocrlf=$5 - local attr=$6 - - local worktree="${output}/${systype}/autocrlf_${autocrlf}" - - if [ "$attr" != "" ]; then - local attrdir=`echo $attr | sed -e "s/ /,/g" | sed -e "s/=/_/g"` - worktree="${worktree},${attrdir}" - fi - - if [ "$tempdir" = "" ]; then - local gitdir="${worktree}/.git" - else - local gitdir="${tempdir}/generate_crlf_${RANDOM}" - fi - - echo "Creating ${worktree}" - mkdir -p "${worktree}" - - git clone --no-checkout --quiet --bare "${input}/.gitted" "${gitdir}" - git --work-tree="${worktree}" --git-dir="${gitdir}" config core.autocrlf ${autocrlf} - - if [ "$attr" != "" ]; then - echo "* ${attr}" >> "${worktree}/.gitattributes" - fi - - git --work-tree="${worktree}" --git-dir="${gitdir}" checkout HEAD - - if [ "$attr" != "" ]; then - rm "${worktree}/.gitattributes" - fi - - if [ "$tempdir" != "" ]; then - rm -rf "${gitdir}" - fi -} - -if [[ `uname -s` == MINGW* ]]; then - systype="windows" -else - systype="posix" -fi - -for autocrlf in true false input; do - for attr in "" text text=auto -text crlf -crlf eol=lf eol=crlf \ - "text eol=lf" "text eol=crlf" \ - "text=auto eol=lf" "text=auto eol=crlf"; do - - create_repo "${input}" "${output}" "${tempdir}" \ - "${systype}" "${autocrlf}" "${attr}" - done -done - diff --git a/vendor/libgit2/tests/graph/descendant_of.c b/vendor/libgit2/tests/graph/descendant_of.c deleted file mode 100644 index 8e9952a09..000000000 --- a/vendor/libgit2/tests/graph/descendant_of.c +++ /dev/null @@ -1,55 +0,0 @@ -#include "clar_libgit2.h" - -static git_repository *_repo; -static git_commit *commit; - -void test_graph_descendant_of__initialize(void) -{ - git_oid oid; - - cl_git_pass(git_repository_open(&_repo, cl_fixture("testrepo.git"))); - - git_oid_fromstr(&oid, "be3563ae3f795b2b4353bcce3a527ad0a4f7f644"); - cl_git_pass(git_commit_lookup(&commit, _repo, &oid)); -} - -void test_graph_descendant_of__cleanup(void) -{ - git_commit_free(commit); - commit = NULL; - - git_repository_free(_repo); - _repo = NULL; -} - -void test_graph_descendant_of__returns_correct_result(void) -{ - git_commit *other; - - cl_assert_equal_i(0, git_graph_descendant_of(_repo, git_commit_id(commit), git_commit_id(commit))); - - - cl_git_pass(git_commit_nth_gen_ancestor(&other, commit, 1)); - - cl_assert_equal_i(1, git_graph_descendant_of(_repo, git_commit_id(commit), git_commit_id(other))); - cl_assert_equal_i(0, git_graph_descendant_of(_repo, git_commit_id(other), git_commit_id(commit))); - - git_commit_free(other); - - - cl_git_pass(git_commit_nth_gen_ancestor(&other, commit, 3)); - - cl_assert_equal_i(1, git_graph_descendant_of(_repo, git_commit_id(commit), git_commit_id(other))); - cl_assert_equal_i(0, git_graph_descendant_of(_repo, git_commit_id(other), git_commit_id(commit))); - - git_commit_free(other); - -} - -void test_graph_descendant_of__nopath(void) -{ - git_oid oid; - - git_oid_fromstr(&oid, "e90810b8df3e80c413d903f631643c716887138d"); - cl_assert_equal_i(0, git_graph_descendant_of(_repo, git_commit_id(commit), &oid)); -} diff --git a/vendor/libgit2/tests/index/add.c b/vendor/libgit2/tests/index/add.c deleted file mode 100644 index f101ea266..000000000 --- a/vendor/libgit2/tests/index/add.c +++ /dev/null @@ -1,84 +0,0 @@ -#include "clar_libgit2.h" - -static git_repository *g_repo = NULL; -static git_index *g_index = NULL; - -static const char *valid_blob_id = "fa49b077972391ad58037050f2a75f74e3671e92"; -static const char *valid_tree_id = "181037049a54a1eb5fab404658a3a250b44335d7"; -static const char *valid_commit_id = "763d71aadf09a7951596c9746c024e7eece7c7af"; -static const char *invalid_id = "1234567890123456789012345678901234567890"; - -void test_index_add__initialize(void) -{ - g_repo = cl_git_sandbox_init("testrepo"); - cl_git_pass(git_repository_index(&g_index, g_repo)); -} - -void test_index_add__cleanup(void) -{ - git_index_free(g_index); - cl_git_sandbox_cleanup(); - g_repo = NULL; - - cl_git_pass(git_libgit2_opts(GIT_OPT_ENABLE_STRICT_OBJECT_CREATION, 1)); -} - -static void test_add_entry( - bool should_succeed, const char *idstr, git_filemode_t mode) -{ - git_index_entry entry = {{0}}; - - cl_git_pass(git_oid_fromstr(&entry.id, idstr)); - - entry.path = mode == GIT_FILEMODE_TREE ? "test_folder" : "test_file"; - entry.mode = mode; - - if (should_succeed) - cl_git_pass(git_index_add(g_index, &entry)); - else - cl_git_fail(git_index_add(g_index, &entry)); -} - -void test_index_add__invalid_entries_succeeds_by_default(void) -{ - /* - * Ensure that there is validation on object ids by default - */ - - /* ensure that we can add some actually good entries */ - test_add_entry(true, valid_blob_id, GIT_FILEMODE_BLOB); - test_add_entry(true, valid_blob_id, GIT_FILEMODE_BLOB_EXECUTABLE); - test_add_entry(true, valid_blob_id, GIT_FILEMODE_LINK); - - /* test that we fail to add some invalid (missing) blobs and trees */ - test_add_entry(false, invalid_id, GIT_FILEMODE_BLOB); - test_add_entry(false, invalid_id, GIT_FILEMODE_BLOB_EXECUTABLE); - test_add_entry(false, invalid_id, GIT_FILEMODE_LINK); - - /* test that we validate the types of objects */ - test_add_entry(false, valid_commit_id, GIT_FILEMODE_BLOB); - test_add_entry(false, valid_tree_id, GIT_FILEMODE_BLOB_EXECUTABLE); - test_add_entry(false, valid_commit_id, GIT_FILEMODE_LINK); - - /* - * Ensure that there we can disable validation - */ - - cl_git_pass(git_libgit2_opts(GIT_OPT_ENABLE_STRICT_OBJECT_CREATION, 0)); - - /* ensure that we can add some actually good entries */ - test_add_entry(true, valid_blob_id, GIT_FILEMODE_BLOB); - test_add_entry(true, valid_blob_id, GIT_FILEMODE_BLOB_EXECUTABLE); - test_add_entry(true, valid_blob_id, GIT_FILEMODE_LINK); - - /* test that we can now add some invalid (missing) blobs and trees */ - test_add_entry(true, invalid_id, GIT_FILEMODE_BLOB); - test_add_entry(true, invalid_id, GIT_FILEMODE_BLOB_EXECUTABLE); - test_add_entry(true, invalid_id, GIT_FILEMODE_LINK); - - /* test that we do not validate the types of objects */ - test_add_entry(true, valid_commit_id, GIT_FILEMODE_BLOB); - test_add_entry(true, valid_tree_id, GIT_FILEMODE_BLOB_EXECUTABLE); - test_add_entry(true, valid_commit_id, GIT_FILEMODE_LINK); -} - diff --git a/vendor/libgit2/tests/index/addall.c b/vendor/libgit2/tests/index/addall.c deleted file mode 100644 index 7b7a178d1..000000000 --- a/vendor/libgit2/tests/index/addall.c +++ /dev/null @@ -1,481 +0,0 @@ -#include "clar_libgit2.h" -#include "../status/status_helpers.h" -#include "posix.h" -#include "fileops.h" - -static git_repository *g_repo = NULL; -#define TEST_DIR "addall" - -void test_index_addall__initialize(void) -{ -} - -void test_index_addall__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -#define STATUS_INDEX_FLAGS \ - (GIT_STATUS_INDEX_NEW | GIT_STATUS_INDEX_MODIFIED | \ - GIT_STATUS_INDEX_DELETED | GIT_STATUS_INDEX_RENAMED | \ - GIT_STATUS_INDEX_TYPECHANGE) - -#define STATUS_WT_FLAGS \ - (GIT_STATUS_WT_NEW | GIT_STATUS_WT_MODIFIED | \ - GIT_STATUS_WT_DELETED | GIT_STATUS_WT_TYPECHANGE | \ - GIT_STATUS_WT_RENAMED) - -typedef struct { - size_t index_adds; - size_t index_dels; - size_t index_mods; - size_t wt_adds; - size_t wt_dels; - size_t wt_mods; - size_t ignores; - size_t conflicts; -} index_status_counts; - -static int index_status_cb( - const char *path, unsigned int status_flags, void *payload) -{ - index_status_counts *vals = payload; - - /* cb_status__print(path, status_flags, NULL); */ - - GIT_UNUSED(path); - - if (status_flags & GIT_STATUS_INDEX_NEW) - vals->index_adds++; - if (status_flags & GIT_STATUS_INDEX_MODIFIED) - vals->index_mods++; - if (status_flags & GIT_STATUS_INDEX_DELETED) - vals->index_dels++; - if (status_flags & GIT_STATUS_INDEX_TYPECHANGE) - vals->index_mods++; - - if (status_flags & GIT_STATUS_WT_NEW) - vals->wt_adds++; - if (status_flags & GIT_STATUS_WT_MODIFIED) - vals->wt_mods++; - if (status_flags & GIT_STATUS_WT_DELETED) - vals->wt_dels++; - if (status_flags & GIT_STATUS_WT_TYPECHANGE) - vals->wt_mods++; - - if (status_flags & GIT_STATUS_IGNORED) - vals->ignores++; - if (status_flags & GIT_STATUS_CONFLICTED) - vals->conflicts++; - - return 0; -} - -static void check_status_at_line( - git_repository *repo, - size_t index_adds, size_t index_dels, size_t index_mods, - size_t wt_adds, size_t wt_dels, size_t wt_mods, size_t ignores, - size_t conflicts, const char *file, int line) -{ - index_status_counts vals; - - memset(&vals, 0, sizeof(vals)); - - cl_git_pass(git_status_foreach(repo, index_status_cb, &vals)); - - clar__assert_equal( - file,line,"wrong index adds", 1, "%"PRIuZ, index_adds, vals.index_adds); - clar__assert_equal( - file,line,"wrong index dels", 1, "%"PRIuZ, index_dels, vals.index_dels); - clar__assert_equal( - file,line,"wrong index mods", 1, "%"PRIuZ, index_mods, vals.index_mods); - clar__assert_equal( - file,line,"wrong workdir adds", 1, "%"PRIuZ, wt_adds, vals.wt_adds); - clar__assert_equal( - file,line,"wrong workdir dels", 1, "%"PRIuZ, wt_dels, vals.wt_dels); - clar__assert_equal( - file,line,"wrong workdir mods", 1, "%"PRIuZ, wt_mods, vals.wt_mods); - clar__assert_equal( - file,line,"wrong ignores", 1, "%"PRIuZ, ignores, vals.ignores); - clar__assert_equal( - file,line,"wrong conflicts", 1, "%"PRIuZ, conflicts, vals.conflicts); -} - -#define check_status(R,IA,ID,IM,WA,WD,WM,IG,C) \ - check_status_at_line(R,IA,ID,IM,WA,WD,WM,IG,C,__FILE__,__LINE__) - -static void check_stat_data(git_index *index, const char *path, bool match) -{ - const git_index_entry *entry; - struct stat st; - - cl_must_pass(p_lstat(path, &st)); - - /* skip repo base dir name */ - while (*path != '/') - ++path; - ++path; - - entry = git_index_get_bypath(index, path, 0); - cl_assert(entry); - - if (match) { - cl_assert(st.st_ctime == entry->ctime.seconds); - cl_assert(st.st_mtime == entry->mtime.seconds); - cl_assert(st.st_size == entry->file_size); - cl_assert(st.st_uid == entry->uid); - cl_assert(st.st_gid == entry->gid); - cl_assert_equal_i_fmt( - GIT_MODE_TYPE(st.st_mode), GIT_MODE_TYPE(entry->mode), "%07o"); - if (cl_is_chmod_supported()) - cl_assert_equal_b( - GIT_PERMS_IS_EXEC(st.st_mode), GIT_PERMS_IS_EXEC(entry->mode)); - } else { - /* most things will still match */ - cl_assert(st.st_size != entry->file_size); - /* would check mtime, but with second resolution it won't work :( */ - } -} - -static void addall_create_test_repo(bool check_every_step) -{ - g_repo = cl_git_sandbox_init_new(TEST_DIR); - - if (check_every_step) - check_status(g_repo, 0, 0, 0, 0, 0, 0, 0, 0); - - cl_git_mkfile(TEST_DIR "/file.foo", "a file"); - if (check_every_step) - check_status(g_repo, 0, 0, 0, 1, 0, 0, 0, 0); - - cl_git_mkfile(TEST_DIR "/.gitignore", "*.foo\n"); - if (check_every_step) - check_status(g_repo, 0, 0, 0, 1, 0, 0, 1, 0); - - cl_git_mkfile(TEST_DIR "/file.bar", "another file"); - if (check_every_step) - check_status(g_repo, 0, 0, 0, 2, 0, 0, 1, 0); -} - -void test_index_addall__repo_lifecycle(void) -{ - int error; - git_index *index; - git_strarray paths = { NULL, 0 }; - char *strs[1]; - - addall_create_test_repo(true); - - cl_git_pass(git_repository_index(&index, g_repo)); - - strs[0] = "file.*"; - paths.strings = strs; - paths.count = 1; - - cl_git_pass(git_index_add_all(index, &paths, 0, NULL, NULL)); - check_stat_data(index, TEST_DIR "/file.bar", true); - check_status(g_repo, 1, 0, 0, 1, 0, 0, 1, 0); - - cl_git_rewritefile(TEST_DIR "/file.bar", "new content for file"); - check_stat_data(index, TEST_DIR "/file.bar", false); - check_status(g_repo, 1, 0, 0, 1, 0, 1, 1, 0); - - cl_git_mkfile(TEST_DIR "/file.zzz", "yet another one"); - cl_git_mkfile(TEST_DIR "/other.zzz", "yet another one"); - cl_git_mkfile(TEST_DIR "/more.zzz", "yet another one"); - check_status(g_repo, 1, 0, 0, 4, 0, 1, 1, 0); - - cl_git_pass(git_index_update_all(index, NULL, NULL, NULL)); - check_stat_data(index, TEST_DIR "/file.bar", true); - check_status(g_repo, 1, 0, 0, 4, 0, 0, 1, 0); - - cl_git_pass(git_index_add_all(index, &paths, 0, NULL, NULL)); - check_stat_data(index, TEST_DIR "/file.zzz", true); - check_status(g_repo, 2, 0, 0, 3, 0, 0, 1, 0); - - cl_repo_commit_from_index(NULL, g_repo, NULL, 0, "first commit"); - check_status(g_repo, 0, 0, 0, 3, 0, 0, 1, 0); - - if (cl_repo_get_bool(g_repo, "core.filemode")) { - cl_git_pass(git_index_update_all(index, NULL, NULL, NULL)); - cl_must_pass(p_chmod(TEST_DIR "/file.zzz", 0777)); - cl_git_pass(git_index_update_all(index, NULL, NULL, NULL)); - check_status(g_repo, 0, 0, 1, 3, 0, 0, 1, 0); - - /* go back to what we had before */ - cl_must_pass(p_chmod(TEST_DIR "/file.zzz", 0666)); - cl_git_pass(git_index_update_all(index, NULL, NULL, NULL)); - check_status(g_repo, 0, 0, 0, 3, 0, 0, 1, 0); - } - - - /* attempt to add an ignored file - does nothing */ - strs[0] = "file.foo"; - cl_git_pass(git_index_add_all(index, &paths, 0, NULL, NULL)); - check_status(g_repo, 0, 0, 0, 3, 0, 0, 1, 0); - - /* add with check - should generate error */ - error = git_index_add_all( - index, &paths, GIT_INDEX_ADD_CHECK_PATHSPEC, NULL, NULL); - cl_assert_equal_i(GIT_EINVALIDSPEC, error); - check_status(g_repo, 0, 0, 0, 3, 0, 0, 1, 0); - - /* add with force - should allow */ - cl_git_pass(git_index_add_all( - index, &paths, GIT_INDEX_ADD_FORCE, NULL, NULL)); - check_stat_data(index, TEST_DIR "/file.foo", true); - check_status(g_repo, 1, 0, 0, 3, 0, 0, 0, 0); - - /* now it's in the index, so regular add should work */ - cl_git_rewritefile(TEST_DIR "/file.foo", "new content for file"); - check_stat_data(index, TEST_DIR "/file.foo", false); - check_status(g_repo, 1, 0, 0, 3, 0, 1, 0, 0); - - cl_git_pass(git_index_add_all(index, &paths, 0, NULL, NULL)); - check_stat_data(index, TEST_DIR "/file.foo", true); - check_status(g_repo, 1, 0, 0, 3, 0, 0, 0, 0); - - cl_git_pass(git_index_add_bypath(index, "more.zzz")); - check_stat_data(index, TEST_DIR "/more.zzz", true); - check_status(g_repo, 2, 0, 0, 2, 0, 0, 0, 0); - - cl_git_rewritefile(TEST_DIR "/file.zzz", "new content for file"); - check_status(g_repo, 2, 0, 0, 2, 0, 1, 0, 0); - - cl_git_pass(git_index_add_bypath(index, "file.zzz")); - check_stat_data(index, TEST_DIR "/file.zzz", true); - check_status(g_repo, 2, 0, 1, 2, 0, 0, 0, 0); - - strs[0] = "*.zzz"; - cl_git_pass(git_index_remove_all(index, &paths, NULL, NULL)); - check_status(g_repo, 1, 1, 0, 4, 0, 0, 0, 0); - - cl_git_pass(git_index_add_bypath(index, "file.zzz")); - check_status(g_repo, 1, 0, 1, 3, 0, 0, 0, 0); - - cl_repo_commit_from_index(NULL, g_repo, NULL, 0, "second commit"); - check_status(g_repo, 0, 0, 0, 3, 0, 0, 0, 0); - - cl_must_pass(p_unlink(TEST_DIR "/file.zzz")); - check_status(g_repo, 0, 0, 0, 3, 1, 0, 0, 0); - - /* update_all should be able to remove entries */ - cl_git_pass(git_index_update_all(index, NULL, NULL, NULL)); - check_status(g_repo, 0, 1, 0, 3, 0, 0, 0, 0); - - strs[0] = "*"; - cl_git_pass(git_index_add_all(index, &paths, 0, NULL, NULL)); - check_status(g_repo, 3, 1, 0, 0, 0, 0, 0, 0); - - /* must be able to remove at any position while still updating other files */ - cl_must_pass(p_unlink(TEST_DIR "/.gitignore")); - cl_git_rewritefile(TEST_DIR "/file.zzz", "reconstructed file"); - cl_git_rewritefile(TEST_DIR "/more.zzz", "altered file reality"); - check_status(g_repo, 3, 1, 0, 1, 1, 1, 0, 0); - - cl_git_pass(git_index_update_all(index, NULL, NULL, NULL)); - check_status(g_repo, 2, 1, 0, 1, 0, 0, 0, 0); - /* this behavior actually matches 'git add -u' where "file.zzz" has - * been removed from the index, so when you go to update, even though - * it exists in the HEAD, it is not re-added to the index, leaving it - * as a DELETE when comparing HEAD to index and as an ADD comparing - * index to worktree - */ - - git_index_free(index); -} - -void test_index_addall__files_in_folders(void) -{ - git_index *index; - - addall_create_test_repo(true); - - cl_git_pass(git_repository_index(&index, g_repo)); - - cl_git_pass(git_index_add_all(index, NULL, 0, NULL, NULL)); - check_stat_data(index, TEST_DIR "/file.bar", true); - check_status(g_repo, 2, 0, 0, 0, 0, 0, 1, 0); - - cl_must_pass(p_mkdir(TEST_DIR "/subdir", 0777)); - cl_git_mkfile(TEST_DIR "/subdir/file", "hello!\n"); - check_status(g_repo, 2, 0, 0, 1, 0, 0, 1, 0); - - cl_git_pass(git_index_add_all(index, NULL, 0, NULL, NULL)); - check_status(g_repo, 3, 0, 0, 0, 0, 0, 1, 0); - - git_index_free(index); -} - -void test_index_addall__hidden_files(void) -{ - git_index *index; - - GIT_UNUSED(index); - -#ifdef GIT_WIN32 - addall_create_test_repo(true); - - cl_git_pass(git_repository_index(&index, g_repo)); - - cl_git_pass(git_index_add_all(index, NULL, 0, NULL, NULL)); - check_stat_data(index, TEST_DIR "/file.bar", true); - check_status(g_repo, 2, 0, 0, 0, 0, 0, 1, 0); - - cl_git_mkfile(TEST_DIR "/file.zzz", "yet another one"); - cl_git_mkfile(TEST_DIR "/more.zzz", "yet another one"); - cl_git_mkfile(TEST_DIR "/other.zzz", "yet another one"); - - check_status(g_repo, 2, 0, 0, 3, 0, 0, 1, 0); - - cl_git_pass(git_win32__set_hidden(TEST_DIR "/file.zzz", true)); - cl_git_pass(git_win32__set_hidden(TEST_DIR "/more.zzz", true)); - cl_git_pass(git_win32__set_hidden(TEST_DIR "/other.zzz", true)); - - check_status(g_repo, 2, 0, 0, 3, 0, 0, 1, 0); - - cl_git_pass(git_index_add_all(index, NULL, 0, NULL, NULL)); - check_stat_data(index, TEST_DIR "/file.bar", true); - check_status(g_repo, 5, 0, 0, 0, 0, 0, 1, 0); - - git_index_free(index); -#endif -} - -static int addall_match_prefix( - const char *path, const char *matched_pathspec, void *payload) -{ - GIT_UNUSED(matched_pathspec); - return !git__prefixcmp(path, payload) ? 0 : 1; -} - -static int addall_match_suffix( - const char *path, const char *matched_pathspec, void *payload) -{ - GIT_UNUSED(matched_pathspec); - return !git__suffixcmp(path, payload) ? 0 : 1; -} - -static int addall_cancel_at( - const char *path, const char *matched_pathspec, void *payload) -{ - GIT_UNUSED(matched_pathspec); - return !strcmp(path, payload) ? -123 : 0; -} - -void test_index_addall__callback_filtering(void) -{ - git_index *index; - - addall_create_test_repo(false); - - cl_git_pass(git_repository_index(&index, g_repo)); - - cl_git_pass( - git_index_add_all(index, NULL, 0, addall_match_prefix, "file.")); - check_stat_data(index, TEST_DIR "/file.bar", true); - check_status(g_repo, 1, 0, 0, 1, 0, 0, 1, 0); - - cl_git_mkfile(TEST_DIR "/file.zzz", "yet another one"); - cl_git_mkfile(TEST_DIR "/more.zzz", "yet another one"); - cl_git_mkfile(TEST_DIR "/other.zzz", "yet another one"); - - cl_git_pass(git_index_update_all(index, NULL, NULL, NULL)); - check_stat_data(index, TEST_DIR "/file.bar", true); - check_status(g_repo, 1, 0, 0, 4, 0, 0, 1, 0); - - cl_git_pass( - git_index_add_all(index, NULL, 0, addall_match_prefix, "other")); - check_stat_data(index, TEST_DIR "/other.zzz", true); - check_status(g_repo, 2, 0, 0, 3, 0, 0, 1, 0); - - cl_git_pass( - git_index_add_all(index, NULL, 0, addall_match_suffix, ".zzz")); - check_status(g_repo, 4, 0, 0, 1, 0, 0, 1, 0); - - cl_git_pass( - git_index_remove_all(index, NULL, addall_match_suffix, ".zzz")); - check_status(g_repo, 1, 0, 0, 4, 0, 0, 1, 0); - - cl_git_fail_with( - git_index_add_all(index, NULL, 0, addall_cancel_at, "more.zzz"), -123); - check_status(g_repo, 3, 0, 0, 2, 0, 0, 1, 0); - - cl_git_fail_with( - git_index_add_all(index, NULL, 0, addall_cancel_at, "other.zzz"), -123); - check_status(g_repo, 4, 0, 0, 1, 0, 0, 1, 0); - - cl_git_pass( - git_index_add_all(index, NULL, 0, addall_match_suffix, ".zzz")); - check_status(g_repo, 5, 0, 0, 0, 0, 0, 1, 0); - - cl_must_pass(p_unlink(TEST_DIR "/file.zzz")); - cl_must_pass(p_unlink(TEST_DIR "/more.zzz")); - cl_must_pass(p_unlink(TEST_DIR "/other.zzz")); - - cl_git_fail_with( - git_index_update_all(index, NULL, addall_cancel_at, "more.zzz"), -123); - /* file.zzz removed from index (so Index Adds 5 -> 4) and - * more.zzz + other.zzz removed (so Worktree Dels 0 -> 2) */ - check_status(g_repo, 4, 0, 0, 0, 2, 0, 1, 0); - - cl_git_fail_with( - git_index_update_all(index, NULL, addall_cancel_at, "other.zzz"), -123); - /* more.zzz removed from index (so Index Adds 4 -> 3) and - * Just other.zzz removed (so Worktree Dels 2 -> 1) */ - check_status(g_repo, 3, 0, 0, 0, 1, 0, 1, 0); - - git_index_free(index); -} - -void test_index_addall__adds_conflicts(void) -{ - git_index *index; - git_reference *ref; - git_annotated_commit *annotated; - - g_repo = cl_git_sandbox_init("merge-resolve"); - cl_git_pass(git_repository_index(&index, g_repo)); - - check_status(g_repo, 0, 0, 0, 0, 0, 0, 0, 0); - - cl_git_pass(git_reference_lookup(&ref, g_repo, "refs/heads/branch")); - cl_git_pass(git_annotated_commit_from_ref(&annotated, g_repo, ref)); - - cl_git_pass(git_merge(g_repo, (const git_annotated_commit**)&annotated, 1, NULL, NULL)); - check_status(g_repo, 0, 1, 2, 0, 0, 0, 0, 1); - - cl_git_pass(git_index_add_all(index, NULL, 0, NULL, NULL)); - check_status(g_repo, 0, 1, 3, 0, 0, 0, 0, 0); - - git_annotated_commit_free(annotated); - git_reference_free(ref); - git_index_free(index); -} - -void test_index_addall__removes_deleted_conflicted_files(void) -{ - git_index *index; - git_reference *ref; - git_annotated_commit *annotated; - - g_repo = cl_git_sandbox_init("merge-resolve"); - cl_git_pass(git_repository_index(&index, g_repo)); - - check_status(g_repo, 0, 0, 0, 0, 0, 0, 0, 0); - - cl_git_pass(git_reference_lookup(&ref, g_repo, "refs/heads/branch")); - cl_git_pass(git_annotated_commit_from_ref(&annotated, g_repo, ref)); - - cl_git_pass(git_merge(g_repo, (const git_annotated_commit**)&annotated, 1, NULL, NULL)); - check_status(g_repo, 0, 1, 2, 0, 0, 0, 0, 1); - - cl_git_rmfile("merge-resolve/conflicting.txt"); - - cl_git_pass(git_index_add_all(index, NULL, 0, NULL, NULL)); - check_status(g_repo, 0, 2, 2, 0, 0, 0, 0, 0); - - git_annotated_commit_free(annotated); - git_reference_free(ref); - git_index_free(index); -} diff --git a/vendor/libgit2/tests/index/bypath.c b/vendor/libgit2/tests/index/bypath.c deleted file mode 100644 index 34a7412a8..000000000 --- a/vendor/libgit2/tests/index/bypath.c +++ /dev/null @@ -1,362 +0,0 @@ -#include "clar_libgit2.h" -#include "repository.h" -#include "../submodule/submodule_helpers.h" - -static git_repository *g_repo; -static git_index *g_idx; - -void test_index_bypath__initialize(void) -{ - g_repo = setup_fixture_submod2(); - cl_git_pass(git_repository_index__weakptr(&g_idx, g_repo)); -} - -void test_index_bypath__cleanup(void) -{ - g_repo = NULL; - g_idx = NULL; -} - -void test_index_bypath__add_directory(void) -{ - cl_git_fail_with(GIT_EDIRECTORY, git_index_add_bypath(g_idx, "just_a_dir")); -} - -void test_index_bypath__add_submodule(void) -{ - unsigned int status; - const char *sm_name = "sm_changed_head"; - - cl_git_pass(git_submodule_status(&status, g_repo, sm_name, 0)); - cl_assert_equal_i(GIT_SUBMODULE_STATUS_WD_MODIFIED, status & GIT_SUBMODULE_STATUS_WD_MODIFIED); - cl_git_pass(git_index_add_bypath(g_idx, sm_name)); - cl_git_pass(git_submodule_status(&status, g_repo, sm_name, 0)); - cl_assert_equal_i(0, status & GIT_SUBMODULE_STATUS_WD_MODIFIED); -} - -void test_index_bypath__add_submodule_unregistered(void) -{ - const char *sm_name = "not-submodule"; - const char *sm_head = "68e92c611b80ee1ed8f38314ff9577f0d15b2444"; - const git_index_entry *entry; - - cl_git_pass(git_index_add_bypath(g_idx, sm_name)); - - cl_assert(entry = git_index_get_bypath(g_idx, sm_name, 0)); - cl_assert_equal_s(sm_head, git_oid_tostr_s(&entry->id)); - cl_assert_equal_s(sm_name, entry->path); -} - -void test_index_bypath__add_hidden(void) -{ - const git_index_entry *entry; - bool hidden; - - GIT_UNUSED(entry); - GIT_UNUSED(hidden); - -#ifdef GIT_WIN32 - cl_git_mkfile("submod2/hidden_file", "you can't see me"); - - cl_git_pass(git_win32__hidden(&hidden, "submod2/hidden_file")); - cl_assert(!hidden); - - cl_git_pass(git_win32__set_hidden("submod2/hidden_file", true)); - - cl_git_pass(git_win32__hidden(&hidden, "submod2/hidden_file")); - cl_assert(hidden); - - cl_git_pass(git_index_add_bypath(g_idx, "hidden_file")); - - cl_assert(entry = git_index_get_bypath(g_idx, "hidden_file", 0)); - cl_assert_equal_i(GIT_FILEMODE_BLOB, entry->mode); -#endif -} - -void test_index_bypath__add_keeps_existing_case(void) -{ - const git_index_entry *entry; - - if (!cl_repo_get_bool(g_repo, "core.ignorecase")) - clar__skip(); - - cl_git_mkfile("submod2/just_a_dir/file1.txt", "This is a file"); - cl_git_pass(git_index_add_bypath(g_idx, "just_a_dir/file1.txt")); - - cl_assert(entry = git_index_get_bypath(g_idx, "just_a_dir/file1.txt", 0)); - cl_assert_equal_s("just_a_dir/file1.txt", entry->path); - - cl_git_rewritefile("submod2/just_a_dir/file1.txt", "Updated!"); - cl_git_pass(git_index_add_bypath(g_idx, "just_a_dir/FILE1.txt")); - - cl_assert(entry = git_index_get_bypath(g_idx, "just_a_dir/FILE1.txt", 0)); - cl_assert_equal_s("just_a_dir/file1.txt", entry->path); -} - -void test_index_bypath__add_honors_existing_case(void) -{ - const git_index_entry *entry; - - if (!cl_repo_get_bool(g_repo, "core.ignorecase")) - clar__skip(); - - cl_git_mkfile("submod2/just_a_dir/file1.txt", "This is a file"); - cl_git_mkfile("submod2/just_a_dir/file2.txt", "This is another file"); - cl_git_mkfile("submod2/just_a_dir/file3.txt", "This is another file"); - cl_git_mkfile("submod2/just_a_dir/file4.txt", "And another file"); - - cl_git_pass(git_index_add_bypath(g_idx, "just_a_dir/File1.txt")); - cl_git_pass(git_index_add_bypath(g_idx, "JUST_A_DIR/file2.txt")); - cl_git_pass(git_index_add_bypath(g_idx, "Just_A_Dir/FILE3.txt")); - - cl_assert(entry = git_index_get_bypath(g_idx, "just_a_dir/File1.txt", 0)); - cl_assert_equal_s("just_a_dir/File1.txt", entry->path); - - cl_assert(entry = git_index_get_bypath(g_idx, "JUST_A_DIR/file2.txt", 0)); - cl_assert_equal_s("just_a_dir/file2.txt", entry->path); - - cl_assert(entry = git_index_get_bypath(g_idx, "Just_A_Dir/FILE3.txt", 0)); - cl_assert_equal_s("just_a_dir/FILE3.txt", entry->path); - - cl_git_rewritefile("submod2/just_a_dir/file3.txt", "Rewritten"); - cl_git_pass(git_index_add_bypath(g_idx, "Just_A_Dir/file3.txt")); - - cl_assert(entry = git_index_get_bypath(g_idx, "Just_A_Dir/file3.txt", 0)); - cl_assert_equal_s("just_a_dir/FILE3.txt", entry->path); -} - -void test_index_bypath__add_honors_existing_case_2(void) -{ - git_index_entry dummy = { { 0 } }; - const git_index_entry *entry; - - if (!cl_repo_get_bool(g_repo, "core.ignorecase")) - clar__skip(); - - dummy.mode = GIT_FILEMODE_BLOB; - cl_git_pass(git_oid_fromstr(&dummy.id, "f990a25a74d1a8281ce2ab018ea8df66795cd60b")); - - /* note that `git_index_add` does no checking to canonical directories */ - dummy.path = "Just_a_dir/file0.txt"; - cl_git_pass(git_index_add(g_idx, &dummy)); - - dummy.path = "just_a_dir/fileA.txt"; - cl_git_pass(git_index_add(g_idx, &dummy)); - - dummy.path = "Just_A_Dir/fileB.txt"; - cl_git_pass(git_index_add(g_idx, &dummy)); - - dummy.path = "JUST_A_DIR/fileC.txt"; - cl_git_pass(git_index_add(g_idx, &dummy)); - - dummy.path = "just_A_dir/fileD.txt"; - cl_git_pass(git_index_add(g_idx, &dummy)); - - dummy.path = "JUST_a_DIR/fileE.txt"; - cl_git_pass(git_index_add(g_idx, &dummy)); - - cl_git_mkfile("submod2/just_a_dir/file1.txt", "This is a file"); - cl_git_mkfile("submod2/just_a_dir/file2.txt", "This is another file"); - cl_git_mkfile("submod2/just_a_dir/file3.txt", "This is another file"); - cl_git_mkfile("submod2/just_a_dir/file4.txt", "And another file"); - - cl_git_pass(git_index_add_bypath(g_idx, "just_a_dir/File1.txt")); - cl_git_pass(git_index_add_bypath(g_idx, "JUST_A_DIR/file2.txt")); - cl_git_pass(git_index_add_bypath(g_idx, "Just_A_Dir/FILE3.txt")); - cl_git_pass(git_index_add_bypath(g_idx, "JusT_A_DIR/FILE4.txt")); - - cl_assert(entry = git_index_get_bypath(g_idx, "just_a_dir/File1.txt", 0)); - cl_assert_equal_s("just_a_dir/File1.txt", entry->path); - - cl_assert(entry = git_index_get_bypath(g_idx, "JUST_A_DIR/file2.txt", 0)); - cl_assert_equal_s("JUST_A_DIR/file2.txt", entry->path); - - cl_assert(entry = git_index_get_bypath(g_idx, "Just_A_Dir/FILE3.txt", 0)); - cl_assert_equal_s("Just_A_Dir/FILE3.txt", entry->path); - - cl_git_rewritefile("submod2/just_a_dir/file3.txt", "Rewritten"); - cl_git_pass(git_index_add_bypath(g_idx, "Just_A_Dir/file3.txt")); - - cl_assert(entry = git_index_get_bypath(g_idx, "Just_A_Dir/file3.txt", 0)); - cl_assert_equal_s("Just_A_Dir/FILE3.txt", entry->path); -} - -void test_index_bypath__add_honors_existing_case_3(void) -{ - git_index_entry dummy = { { 0 } }; - const git_index_entry *entry; - - if (!cl_repo_get_bool(g_repo, "core.ignorecase")) - clar__skip(); - - dummy.mode = GIT_FILEMODE_BLOB; - cl_git_pass(git_oid_fromstr(&dummy.id, "f990a25a74d1a8281ce2ab018ea8df66795cd60b")); - - dummy.path = "just_a_dir/filea.txt"; - cl_git_pass(git_index_add(g_idx, &dummy)); - - dummy.path = "Just_A_Dir/fileB.txt"; - cl_git_pass(git_index_add(g_idx, &dummy)); - - dummy.path = "just_A_DIR/FILEC.txt"; - cl_git_pass(git_index_add(g_idx, &dummy)); - - dummy.path = "Just_a_DIR/FileD.txt"; - cl_git_pass(git_index_add(g_idx, &dummy)); - - cl_git_mkfile("submod2/JuSt_A_DiR/fILEE.txt", "This is a file"); - - cl_git_pass(git_index_add_bypath(g_idx, "just_a_dir/fILEE.txt")); - - cl_assert(entry = git_index_get_bypath(g_idx, "JUST_A_DIR/fILEE.txt", 0)); - cl_assert_equal_s("just_a_dir/fILEE.txt", entry->path); -} - -void test_index_bypath__add_honors_existing_case_4(void) -{ - git_index_entry dummy = { { 0 } }; - const git_index_entry *entry; - - if (!cl_repo_get_bool(g_repo, "core.ignorecase")) - clar__skip(); - - dummy.mode = GIT_FILEMODE_BLOB; - cl_git_pass(git_oid_fromstr(&dummy.id, "f990a25a74d1a8281ce2ab018ea8df66795cd60b")); - - dummy.path = "just_a_dir/a/b/c/d/e/file1.txt"; - cl_git_pass(git_index_add(g_idx, &dummy)); - - dummy.path = "just_a_dir/a/B/C/D/E/file2.txt"; - cl_git_pass(git_index_add(g_idx, &dummy)); - - cl_must_pass(p_mkdir("submod2/just_a_dir/a", 0777)); - cl_must_pass(p_mkdir("submod2/just_a_dir/a/b", 0777)); - cl_must_pass(p_mkdir("submod2/just_a_dir/a/b/z", 0777)); - cl_must_pass(p_mkdir("submod2/just_a_dir/a/b/z/y", 0777)); - cl_must_pass(p_mkdir("submod2/just_a_dir/a/b/z/y/x", 0777)); - - cl_git_mkfile("submod2/just_a_dir/a/b/z/y/x/FOO.txt", "This is a file"); - - cl_git_pass(git_index_add_bypath(g_idx, "just_a_dir/A/b/Z/y/X/foo.txt")); - - cl_assert(entry = git_index_get_bypath(g_idx, "just_a_dir/A/b/Z/y/X/foo.txt", 0)); - cl_assert_equal_s("just_a_dir/a/b/Z/y/X/foo.txt", entry->path); -} - -void test_index_bypath__add_honors_mode(void) -{ - const git_index_entry *entry; - git_index_entry new_entry; - - cl_assert((entry = git_index_get_bypath(g_idx, "README.txt", 0)) != NULL); - - memcpy(&new_entry, entry, sizeof(git_index_entry)); - new_entry.path = "README.txt"; - new_entry.mode = GIT_FILEMODE_BLOB_EXECUTABLE; - - cl_must_pass(p_chmod("submod2/README.txt", GIT_FILEMODE_BLOB_EXECUTABLE)); - - cl_git_pass(git_index_add(g_idx, &new_entry)); - cl_git_pass(git_index_write(g_idx)); - - cl_git_rewritefile("submod2/README.txt", "Modified but still executable"); - - cl_git_pass(git_index_add_bypath(g_idx, "README.txt")); - cl_git_pass(git_index_write(g_idx)); - - cl_assert((entry = git_index_get_bypath(g_idx, "README.txt", 0)) != NULL); - cl_assert_equal_i(GIT_FILEMODE_BLOB_EXECUTABLE, entry->mode); -} - -void test_index_bypath__add_honors_conflict_mode(void) -{ - const git_index_entry *entry; - git_index_entry new_entry; - int stage = 0; - - cl_assert((entry = git_index_get_bypath(g_idx, "README.txt", 0)) != NULL); - - memcpy(&new_entry, entry, sizeof(git_index_entry)); - new_entry.path = "README.txt"; - new_entry.mode = GIT_FILEMODE_BLOB_EXECUTABLE; - - cl_must_pass(p_chmod("submod2/README.txt", GIT_FILEMODE_BLOB_EXECUTABLE)); - - cl_git_pass(git_index_remove_bypath(g_idx, "README.txt")); - - for (stage = 1; stage <= 3; stage++) { - new_entry.flags = stage << GIT_IDXENTRY_STAGESHIFT; - cl_git_pass(git_index_add(g_idx, &new_entry)); - } - - cl_git_pass(git_index_write(g_idx)); - - cl_git_rewritefile("submod2/README.txt", "Modified but still executable"); - - cl_git_pass(git_index_add_bypath(g_idx, "README.txt")); - cl_git_pass(git_index_write(g_idx)); - - cl_assert((entry = git_index_get_bypath(g_idx, "README.txt", 0)) != NULL); - cl_assert_equal_i(GIT_FILEMODE_BLOB_EXECUTABLE, entry->mode); -} - -void test_index_bypath__add_honors_conflict_case(void) -{ - const git_index_entry *entry; - git_index_entry new_entry; - int stage = 0; - - cl_assert((entry = git_index_get_bypath(g_idx, "README.txt", 0)) != NULL); - - memcpy(&new_entry, entry, sizeof(git_index_entry)); - new_entry.path = "README.txt"; - new_entry.mode = GIT_FILEMODE_BLOB_EXECUTABLE; - - cl_must_pass(p_chmod("submod2/README.txt", GIT_FILEMODE_BLOB_EXECUTABLE)); - - cl_git_pass(git_index_remove_bypath(g_idx, "README.txt")); - - for (stage = 1; stage <= 3; stage++) { - new_entry.flags = stage << GIT_IDXENTRY_STAGESHIFT; - cl_git_pass(git_index_add(g_idx, &new_entry)); - } - - cl_git_pass(git_index_write(g_idx)); - - cl_git_rewritefile("submod2/README.txt", "Modified but still executable"); - - cl_git_pass(git_index_add_bypath(g_idx, "README.txt")); - cl_git_pass(git_index_write(g_idx)); - - cl_assert((entry = git_index_get_bypath(g_idx, "README.txt", 0)) != NULL); - cl_assert_equal_i(GIT_FILEMODE_BLOB_EXECUTABLE, entry->mode); -} - -void test_index_bypath__add_honors_symlink(void) -{ - const git_index_entry *entry; - git_index_entry new_entry; - int symlinks; - - cl_git_pass(git_repository__cvar(&symlinks, g_repo, GIT_CVAR_SYMLINKS)); - - if (symlinks) - cl_skip(); - - cl_assert((entry = git_index_get_bypath(g_idx, "README.txt", 0)) != NULL); - - memcpy(&new_entry, entry, sizeof(git_index_entry)); - new_entry.path = "README.txt"; - new_entry.mode = GIT_FILEMODE_LINK; - - cl_git_pass(git_index_add(g_idx, &new_entry)); - cl_git_pass(git_index_write(g_idx)); - - cl_git_rewritefile("submod2/README.txt", "Modified but still a (fake) symlink"); - - cl_git_pass(git_index_add_bypath(g_idx, "README.txt")); - cl_git_pass(git_index_write(g_idx)); - - cl_assert((entry = git_index_get_bypath(g_idx, "README.txt", 0)) != NULL); - cl_assert_equal_i(GIT_FILEMODE_LINK, entry->mode); -} diff --git a/vendor/libgit2/tests/index/cache.c b/vendor/libgit2/tests/index/cache.c deleted file mode 100644 index 56885aff7..000000000 --- a/vendor/libgit2/tests/index/cache.c +++ /dev/null @@ -1,238 +0,0 @@ -#include "clar_libgit2.h" -#include "git2.h" -#include "index.h" -#include "tree-cache.h" - -static git_repository *g_repo; - -void test_index_cache__initialize(void) -{ - g_repo = cl_git_sandbox_init("testrepo"); -} - -void test_index_cache__cleanup(void) -{ - cl_git_sandbox_cleanup(); - g_repo = NULL; -} - -void test_index_cache__write_extension_at_root(void) -{ - git_index *index; - git_tree *tree; - git_oid id; - const char *tree_id_str = "45dd856fdd4d89b884c340ba0e047752d9b085d6"; - const char *index_file = "index-tree"; - - cl_git_pass(git_index_open(&index, index_file)); - cl_assert(index->tree == NULL); - cl_git_pass(git_oid_fromstr(&id, tree_id_str)); - cl_git_pass(git_tree_lookup(&tree, g_repo, &id)); - cl_git_pass(git_index_read_tree(index, tree)); - git_tree_free(tree); - - cl_assert(index->tree); - cl_git_pass(git_index_write(index)); - git_index_free(index); - - cl_git_pass(git_index_open(&index, index_file)); - cl_assert(index->tree); - - cl_assert_equal_i(git_index_entrycount(index), index->tree->entry_count); - cl_assert_equal_i(0, index->tree->children_count); - - cl_assert(git_oid_equal(&id, &index->tree->oid)); - - cl_git_pass(p_unlink(index_file)); - git_index_free(index); -} - -void test_index_cache__write_extension_invalidated_root(void) -{ - git_index *index; - git_tree *tree; - git_oid id; - const char *tree_id_str = "45dd856fdd4d89b884c340ba0e047752d9b085d6"; - const char *index_file = "index-tree-invalidated"; - git_index_entry entry; - - cl_git_pass(git_index_open(&index, index_file)); - cl_assert(index->tree == NULL); - cl_git_pass(git_oid_fromstr(&id, tree_id_str)); - cl_git_pass(git_tree_lookup(&tree, g_repo, &id)); - cl_git_pass(git_index_read_tree(index, tree)); - git_tree_free(tree); - - cl_assert(index->tree); - - memset(&entry, 0x0, sizeof(git_index_entry)); - git_oid_cpy(&entry.id, &git_index_get_byindex(index, 0)->id); - entry.mode = GIT_FILEMODE_BLOB; - entry.path = "some-new-file.txt"; - - cl_git_pass(git_index_add(index, &entry)); - - cl_assert_equal_i(-1, index->tree->entry_count); - - cl_git_pass(git_index_write(index)); - git_index_free(index); - - cl_git_pass(git_index_open(&index, index_file)); - cl_assert(index->tree); - - cl_assert_equal_i(-1, index->tree->entry_count); - cl_assert_equal_i(0, index->tree->children_count); - - cl_assert(git_oid_cmp(&id, &index->tree->oid)); - - cl_git_pass(p_unlink(index_file)); - git_index_free(index); -} - -void test_index_cache__read_tree_no_children(void) -{ - git_index *index; - git_index_entry entry; - git_tree *tree; - git_oid id; - - cl_git_pass(git_index_new(&index)); - cl_assert(index->tree == NULL); - cl_git_pass(git_oid_fromstr(&id, "45dd856fdd4d89b884c340ba0e047752d9b085d6")); - cl_git_pass(git_tree_lookup(&tree, g_repo, &id)); - cl_git_pass(git_index_read_tree(index, tree)); - git_tree_free(tree); - - cl_assert(index->tree); - cl_assert(git_oid_equal(&id, &index->tree->oid)); - cl_assert_equal_i(0, index->tree->children_count); - cl_assert_equal_i(git_index_entrycount(index), index->tree->entry_count); - - memset(&entry, 0x0, sizeof(git_index_entry)); - entry.path = "new.txt"; - entry.mode = GIT_FILEMODE_BLOB; - git_oid_fromstr(&entry.id, "d4bcc68acd4410bf836a39f20afb2c2ece09584e"); - - cl_git_pass(git_index_add(index, &entry)); - cl_assert_equal_i(-1, index->tree->entry_count); - - git_index_free(index); -} - -void test_index_cache__two_levels(void) -{ - git_tree *tree; - git_oid tree_id; - git_index *index; - git_index_entry entry; - const git_tree_cache *tree_cache; - - cl_git_pass(git_repository_index(&index, g_repo)); - cl_git_pass(git_index_clear(index)); - - memset(&entry, 0x0, sizeof(entry)); - entry.mode = GIT_FILEMODE_BLOB; - cl_git_pass(git_oid_fromstr(&entry.id, "a8233120f6ad708f843d861ce2b7228ec4e3dec6")); - entry.path = "top-level.txt"; - cl_git_pass(git_index_add(index, &entry)); - - entry.path = "subdir/file.txt"; - cl_git_pass(git_index_add(index, &entry)); - - /* the read-tree fills the tree cache */ - cl_git_pass(git_index_write_tree(&tree_id, index)); - cl_git_pass(git_tree_lookup(&tree, g_repo, &tree_id)); - cl_git_pass(git_index_read_tree(index, tree)); - git_tree_free(tree); - cl_git_pass(git_index_write(index)); - - /* we now must have cache entries for "" and "subdir" */ - cl_assert(index->tree); - cl_assert(git_tree_cache_get(index->tree, "subdir")); - - cl_git_pass(git_index_read(index, true)); - /* we must still have cache entries for "" and "subdir", since we wrote it out */ - cl_assert(index->tree); - cl_assert(git_tree_cache_get(index->tree, "subdir")); - - entry.path = "top-level.txt"; - cl_git_pass(git_oid_fromstr(&entry.id, "3697d64be941a53d4ae8f6a271e4e3fa56b022cc")); - cl_git_pass(git_index_add(index, &entry)); - - /* writ out the index after we invalidate the root */ - cl_git_pass(git_index_write(index)); - cl_git_pass(git_index_read(index, true)); - - /* the cache for the subtree must still be valid, even if the root isn't */ - cl_assert(index->tree); - cl_assert_equal_i(-1, index->tree->entry_count); - cl_assert_equal_i(1, index->tree->children_count); - tree_cache = git_tree_cache_get(index->tree, "subdir"); - cl_assert(tree_cache); - cl_assert_equal_i(1, tree_cache->entry_count); - - git_index_free(index); -} - -void test_index_cache__read_tree_children(void) -{ - git_index *index; - git_index_entry entry; - git_tree *tree; - const git_tree_cache *cache; - git_oid tree_id; - - cl_git_pass(git_repository_index(&index, g_repo)); - cl_git_pass(git_index_clear(index)); - cl_assert(index->tree == NULL); - - - /* add a bunch of entries at different levels */ - memset(&entry, 0x0, sizeof(git_index_entry)); - entry.path = "top-level"; - entry.mode = GIT_FILEMODE_BLOB; - git_oid_fromstr(&entry.id, "ee3fa1b8c00aff7fe02065fdb50864bb0d932ccf"); - cl_git_pass(git_index_add(index, &entry)); - - - entry.path = "subdir/some-file"; - cl_git_pass(git_index_add(index, &entry)); - - entry.path = "subdir/even-deeper/some-file"; - cl_git_pass(git_index_add(index, &entry)); - - entry.path = "subdir2/some-file"; - cl_git_pass(git_index_add(index, &entry)); - - cl_git_pass(git_index_write_tree(&tree_id, index)); - cl_git_pass(git_index_clear(index)); - cl_assert(index->tree == NULL); - - cl_git_pass(git_tree_lookup(&tree, g_repo, &tree_id)); - cl_git_pass(git_index_read_tree(index, tree)); - git_tree_free(tree); - - cl_assert(index->tree); - cl_assert_equal_i(2, index->tree->children_count); - - /* override with a slightly different id, also dummy */ - entry.path = "subdir/some-file"; - git_oid_fromstr(&entry.id, "ee3fa1b8c00aff7fe02065fdb50864bb0d932ccf"); - cl_git_pass(git_index_add(index, &entry)); - - cl_assert_equal_i(-1, index->tree->entry_count); - - cache = git_tree_cache_get(index->tree, "subdir"); - cl_assert(cache); - cl_assert_equal_i(-1, cache->entry_count); - - cache = git_tree_cache_get(index->tree, "subdir/even-deeper"); - cl_assert(cache); - cl_assert_equal_i(1, cache->entry_count); - - cache = git_tree_cache_get(index->tree, "subdir2"); - cl_assert(cache); - cl_assert_equal_i(1, cache->entry_count); - - git_index_free(index); -} diff --git a/vendor/libgit2/tests/index/collision.c b/vendor/libgit2/tests/index/collision.c deleted file mode 100644 index 19c1548e9..000000000 --- a/vendor/libgit2/tests/index/collision.c +++ /dev/null @@ -1,106 +0,0 @@ -#include "clar_libgit2.h" -#include "git2/repository.h" -#include "git2/index.h" - -git_repository *repo = NULL; - -void test_index_collision__cleanup(void) -{ - cl_git_sandbox_cleanup(); - repo = NULL; -} - -void test_index_collision__add(void) -{ - git_index *index; - git_index_entry entry; - git_oid tree_id; - git_tree *tree; - - repo = cl_git_sandbox_init("empty_standard_repo"); - cl_git_pass(git_repository_index(&index, repo)); - - memset(&entry, 0, sizeof(entry)); - entry.ctime.seconds = 12346789; - entry.mtime.seconds = 12346789; - entry.mode = 0100644; - entry.file_size = 0; - git_oid_fromstr(&entry.id, "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391"); - - entry.path = "a/b"; - cl_git_pass(git_index_add(index, &entry)); - - /* create a tree/blob collision */ - entry.path = "a/b/c"; - cl_git_fail(git_index_add(index, &entry)); - - cl_git_pass(git_index_write_tree(&tree_id, index)); - cl_git_pass(git_tree_lookup(&tree, repo, &tree_id)); - - git_tree_free(tree); - git_index_free(index); -} - -void test_index_collision__add_with_highstage_1(void) -{ - git_index *index; - git_index_entry entry; - - repo = cl_git_sandbox_init("empty_standard_repo"); - cl_git_pass(git_repository_index(&index, repo)); - - memset(&entry, 0, sizeof(entry)); - entry.ctime.seconds = 12346789; - entry.mtime.seconds = 12346789; - entry.mode = 0100644; - entry.file_size = 0; - git_oid_fromstr(&entry.id, "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391"); - - entry.path = "a/b"; - GIT_IDXENTRY_STAGE_SET(&entry, 2); - cl_git_pass(git_index_add(index, &entry)); - - /* create a blob beneath the previous tree entry */ - entry.path = "a/b/c"; - entry.flags = 0; - cl_git_pass(git_index_add(index, &entry)); - - /* create another tree entry above the blob */ - entry.path = "a/b"; - GIT_IDXENTRY_STAGE_SET(&entry, 1); - cl_git_pass(git_index_add(index, &entry)); - - git_index_free(index); -} - -void test_index_collision__add_with_highstage_2(void) -{ - git_index *index; - git_index_entry entry; - - repo = cl_git_sandbox_init("empty_standard_repo"); - cl_git_pass(git_repository_index(&index, repo)); - - memset(&entry, 0, sizeof(entry)); - entry.ctime.seconds = 12346789; - entry.mtime.seconds = 12346789; - entry.mode = 0100644; - entry.file_size = 0; - git_oid_fromstr(&entry.id, "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391"); - - entry.path = "a/b/c"; - GIT_IDXENTRY_STAGE_SET(&entry, 1); - cl_git_pass(git_index_add(index, &entry)); - - /* create a blob beneath the previous tree entry */ - entry.path = "a/b/c"; - GIT_IDXENTRY_STAGE_SET(&entry, 2); - cl_git_pass(git_index_add(index, &entry)); - - /* create another tree entry above the blob */ - entry.path = "a/b"; - GIT_IDXENTRY_STAGE_SET(&entry, 3); - cl_git_pass(git_index_add(index, &entry)); - - git_index_free(index); -} diff --git a/vendor/libgit2/tests/index/conflicts.c b/vendor/libgit2/tests/index/conflicts.c deleted file mode 100644 index d4004686f..000000000 --- a/vendor/libgit2/tests/index/conflicts.c +++ /dev/null @@ -1,427 +0,0 @@ -#include "clar_libgit2.h" -#include "index.h" -#include "git2/repository.h" - -static git_repository *repo; -static git_index *repo_index; - -#define TEST_REPO_PATH "mergedrepo" -#define TEST_INDEX_PATH TEST_REPO_PATH "/.git/index" - -#define CONFLICTS_ONE_ANCESTOR_OID "1f85ca51b8e0aac893a621b61a9c2661d6aa6d81" -#define CONFLICTS_ONE_OUR_OID "6aea5f295304c36144ad6e9247a291b7f8112399" -#define CONFLICTS_ONE_THEIR_OID "516bd85f78061e09ccc714561d7b504672cb52da" - -#define CONFLICTS_TWO_ANCESTOR_OID "84af62840be1b1c47b778a8a249f3ff45155038c" -#define CONFLICTS_TWO_OUR_OID "8b3f43d2402825c200f835ca1762413e386fd0b2" -#define CONFLICTS_TWO_THEIR_OID "220bd62631c8cf7a83ef39c6b94595f00517211e" - -// Fixture setup and teardown -void test_index_conflicts__initialize(void) -{ - repo = cl_git_sandbox_init("mergedrepo"); - git_repository_index(&repo_index, repo); -} - -void test_index_conflicts__cleanup(void) -{ - git_index_free(repo_index); - repo_index = NULL; - - cl_git_sandbox_cleanup(); -} - -void test_index_conflicts__add(void) -{ - git_index_entry ancestor_entry, our_entry, their_entry; - - cl_assert(git_index_entrycount(repo_index) == 8); - - memset(&ancestor_entry, 0x0, sizeof(git_index_entry)); - memset(&our_entry, 0x0, sizeof(git_index_entry)); - memset(&their_entry, 0x0, sizeof(git_index_entry)); - - ancestor_entry.path = "test-one.txt"; - ancestor_entry.mode = 0100644; - GIT_IDXENTRY_STAGE_SET(&ancestor_entry, 1); - git_oid_fromstr(&ancestor_entry.id, CONFLICTS_ONE_ANCESTOR_OID); - - our_entry.path = "test-one.txt"; - our_entry.mode = 0100644; - GIT_IDXENTRY_STAGE_SET(&our_entry, 2); - git_oid_fromstr(&our_entry.id, CONFLICTS_ONE_OUR_OID); - - their_entry.path = "test-one.txt"; - their_entry.mode = 0100644; - GIT_IDXENTRY_STAGE_SET(&ancestor_entry, 2); - git_oid_fromstr(&their_entry.id, CONFLICTS_ONE_THEIR_OID); - - cl_git_pass(git_index_conflict_add(repo_index, &ancestor_entry, &our_entry, &their_entry)); - - cl_assert(git_index_entrycount(repo_index) == 11); -} - -void test_index_conflicts__add_fixes_incorrect_stage(void) -{ - git_index_entry ancestor_entry, our_entry, their_entry; - const git_index_entry *conflict_entry[3]; - - cl_assert(git_index_entrycount(repo_index) == 8); - - memset(&ancestor_entry, 0x0, sizeof(git_index_entry)); - memset(&our_entry, 0x0, sizeof(git_index_entry)); - memset(&their_entry, 0x0, sizeof(git_index_entry)); - - ancestor_entry.path = "test-one.txt"; - ancestor_entry.mode = 0100644; - GIT_IDXENTRY_STAGE_SET(&ancestor_entry, 3); - git_oid_fromstr(&ancestor_entry.id, CONFLICTS_ONE_ANCESTOR_OID); - - our_entry.path = "test-one.txt"; - our_entry.mode = 0100644; - GIT_IDXENTRY_STAGE_SET(&our_entry, 1); - git_oid_fromstr(&our_entry.id, CONFLICTS_ONE_OUR_OID); - - their_entry.path = "test-one.txt"; - their_entry.mode = 0100644; - GIT_IDXENTRY_STAGE_SET(&their_entry, 2); - git_oid_fromstr(&their_entry.id, CONFLICTS_ONE_THEIR_OID); - - cl_git_pass(git_index_conflict_add(repo_index, &ancestor_entry, &our_entry, &their_entry)); - - cl_assert(git_index_entrycount(repo_index) == 11); - - cl_git_pass(git_index_conflict_get(&conflict_entry[0], &conflict_entry[1], &conflict_entry[2], repo_index, "test-one.txt")); - - cl_assert(git_index_entry_stage(conflict_entry[0]) == 1); - cl_assert(git_index_entry_stage(conflict_entry[1]) == 2); - cl_assert(git_index_entry_stage(conflict_entry[2]) == 3); -} - -void test_index_conflicts__add_removes_stage_zero(void) -{ - git_index_entry ancestor_entry, our_entry, their_entry; - const git_index_entry *conflict_entry[3]; - - cl_assert(git_index_entrycount(repo_index) == 8); - - memset(&ancestor_entry, 0x0, sizeof(git_index_entry)); - memset(&our_entry, 0x0, sizeof(git_index_entry)); - memset(&their_entry, 0x0, sizeof(git_index_entry)); - - cl_git_mkfile("./mergedrepo/test-one.txt", "new-file\n"); - cl_git_pass(git_index_add_bypath(repo_index, "test-one.txt")); - cl_assert(git_index_entrycount(repo_index) == 9); - - ancestor_entry.path = "test-one.txt"; - ancestor_entry.mode = 0100644; - GIT_IDXENTRY_STAGE_SET(&ancestor_entry, 3); - git_oid_fromstr(&ancestor_entry.id, CONFLICTS_ONE_ANCESTOR_OID); - - our_entry.path = "test-one.txt"; - our_entry.mode = 0100644; - GIT_IDXENTRY_STAGE_SET(&our_entry, 1); - git_oid_fromstr(&our_entry.id, CONFLICTS_ONE_OUR_OID); - - their_entry.path = "test-one.txt"; - their_entry.mode = 0100644; - GIT_IDXENTRY_STAGE_SET(&their_entry, 2); - git_oid_fromstr(&their_entry.id, CONFLICTS_ONE_THEIR_OID); - - cl_git_pass(git_index_conflict_add(repo_index, &ancestor_entry, &our_entry, &their_entry)); - - cl_assert(git_index_entrycount(repo_index) == 11); - - cl_assert_equal_p(NULL, git_index_get_bypath(repo_index, "test-one.txt", 0)); - - cl_git_pass(git_index_conflict_get(&conflict_entry[0], &conflict_entry[1], &conflict_entry[2], repo_index, "test-one.txt")); - - cl_assert_equal_oid(&ancestor_entry.id, &conflict_entry[0]->id); - cl_assert_equal_i(1, git_index_entry_stage(conflict_entry[0])); - cl_assert_equal_oid(&our_entry.id, &conflict_entry[1]->id); - cl_assert_equal_i(2, git_index_entry_stage(conflict_entry[1])); - cl_assert_equal_oid(&their_entry.id, &conflict_entry[2]->id); - cl_assert_equal_i(3, git_index_entry_stage(conflict_entry[2])); -} - -void test_index_conflicts__get(void) -{ - const git_index_entry *conflict_entry[3]; - git_oid oid; - - cl_git_pass(git_index_conflict_get(&conflict_entry[0], &conflict_entry[1], - &conflict_entry[2], repo_index, "conflicts-one.txt")); - - cl_assert_equal_s("conflicts-one.txt", conflict_entry[0]->path); - - git_oid_fromstr(&oid, CONFLICTS_ONE_ANCESTOR_OID); - cl_assert_equal_oid(&oid, &conflict_entry[0]->id); - - git_oid_fromstr(&oid, CONFLICTS_ONE_OUR_OID); - cl_assert_equal_oid(&oid, &conflict_entry[1]->id); - - git_oid_fromstr(&oid, CONFLICTS_ONE_THEIR_OID); - cl_assert_equal_oid(&oid, &conflict_entry[2]->id); - - cl_git_pass(git_index_conflict_get(&conflict_entry[0], &conflict_entry[1], - &conflict_entry[2], repo_index, "conflicts-two.txt")); - - cl_assert_equal_s("conflicts-two.txt", conflict_entry[0]->path); - - git_oid_fromstr(&oid, CONFLICTS_TWO_ANCESTOR_OID); - cl_assert_equal_oid(&oid, &conflict_entry[0]->id); - - git_oid_fromstr(&oid, CONFLICTS_TWO_OUR_OID); - cl_assert_equal_oid(&oid, &conflict_entry[1]->id); - - git_oid_fromstr(&oid, CONFLICTS_TWO_THEIR_OID); - cl_assert_equal_oid(&oid, &conflict_entry[2]->id); -} - -void test_index_conflicts__iterate(void) -{ - git_index_conflict_iterator *iterator; - const git_index_entry *conflict_entry[3]; - git_oid oid; - - cl_git_pass(git_index_conflict_iterator_new(&iterator, repo_index)); - - cl_git_pass(git_index_conflict_next(&conflict_entry[0], &conflict_entry[1], &conflict_entry[2], iterator)); - - git_oid_fromstr(&oid, CONFLICTS_ONE_ANCESTOR_OID); - cl_assert_equal_oid(&oid, &conflict_entry[0]->id); - cl_assert(git__strcmp(conflict_entry[0]->path, "conflicts-one.txt") == 0); - - git_oid_fromstr(&oid, CONFLICTS_ONE_OUR_OID); - cl_assert_equal_oid(&oid, &conflict_entry[1]->id); - cl_assert(git__strcmp(conflict_entry[0]->path, "conflicts-one.txt") == 0); - - git_oid_fromstr(&oid, CONFLICTS_ONE_THEIR_OID); - cl_assert_equal_oid(&oid, &conflict_entry[2]->id); - cl_assert(git__strcmp(conflict_entry[0]->path, "conflicts-one.txt") == 0); - - cl_git_pass(git_index_conflict_next(&conflict_entry[0], &conflict_entry[1], &conflict_entry[2], iterator)); - - git_oid_fromstr(&oid, CONFLICTS_TWO_ANCESTOR_OID); - cl_assert_equal_oid(&oid, &conflict_entry[0]->id); - cl_assert(git__strcmp(conflict_entry[0]->path, "conflicts-two.txt") == 0); - - git_oid_fromstr(&oid, CONFLICTS_TWO_OUR_OID); - cl_assert_equal_oid(&oid, &conflict_entry[1]->id); - cl_assert(git__strcmp(conflict_entry[0]->path, "conflicts-two.txt") == 0); - - git_oid_fromstr(&oid, CONFLICTS_TWO_THEIR_OID); - cl_assert_equal_oid(&oid, &conflict_entry[2]->id); - cl_assert(git__strcmp(conflict_entry[0]->path, "conflicts-two.txt") == 0); - - cl_assert(git_index_conflict_next(&conflict_entry[0], &conflict_entry[1], &conflict_entry[2], iterator) == GIT_ITEROVER); - - cl_assert(conflict_entry[0] == NULL); - cl_assert(conflict_entry[2] == NULL); - cl_assert(conflict_entry[2] == NULL); - - git_index_conflict_iterator_free(iterator); -} - -void test_index_conflicts__remove(void) -{ - const git_index_entry *entry; - size_t i; - - cl_assert(git_index_entrycount(repo_index) == 8); - - cl_git_pass(git_index_conflict_remove(repo_index, "conflicts-one.txt")); - cl_assert(git_index_entrycount(repo_index) == 5); - - for (i = 0; i < git_index_entrycount(repo_index); i++) { - cl_assert(entry = git_index_get_byindex(repo_index, i)); - cl_assert(strcmp(entry->path, "conflicts-one.txt") != 0); - } - - cl_git_pass(git_index_conflict_remove(repo_index, "conflicts-two.txt")); - cl_assert(git_index_entrycount(repo_index) == 2); - - for (i = 0; i < git_index_entrycount(repo_index); i++) { - cl_assert(entry = git_index_get_byindex(repo_index, i)); - cl_assert(strcmp(entry->path, "conflicts-two.txt") != 0); - } -} - -void test_index_conflicts__moved_to_reuc_on_add(void) -{ - const git_index_entry *entry; - size_t i; - - cl_assert(git_index_entrycount(repo_index) == 8); - - cl_git_mkfile("./mergedrepo/conflicts-one.txt", "new-file\n"); - - cl_git_pass(git_index_add_bypath(repo_index, "conflicts-one.txt")); - - cl_assert(git_index_entrycount(repo_index) == 6); - - for (i = 0; i < git_index_entrycount(repo_index); i++) { - cl_assert(entry = git_index_get_byindex(repo_index, i)); - - if (strcmp(entry->path, "conflicts-one.txt") == 0) - cl_assert(!git_index_entry_is_conflict(entry)); - } -} - -void test_index_conflicts__moved_to_reuc_on_remove(void) -{ - const git_index_entry *entry; - size_t i; - - cl_assert(git_index_entrycount(repo_index) == 8); - - cl_git_pass(p_unlink("./mergedrepo/conflicts-one.txt")); - - cl_git_pass(git_index_remove_bypath(repo_index, "conflicts-one.txt")); - - cl_assert(git_index_entrycount(repo_index) == 5); - - for (i = 0; i < git_index_entrycount(repo_index); i++) { - cl_assert(entry = git_index_get_byindex(repo_index, i)); - cl_assert(strcmp(entry->path, "conflicts-one.txt") != 0); - } -} - -void test_index_conflicts__remove_all_conflicts(void) -{ - size_t i; - const git_index_entry *entry; - - cl_assert(git_index_entrycount(repo_index) == 8); - - cl_assert_equal_i(true, git_index_has_conflicts(repo_index)); - - git_index_conflict_cleanup(repo_index); - - cl_assert_equal_i(false, git_index_has_conflicts(repo_index)); - - cl_assert(git_index_entrycount(repo_index) == 2); - - for (i = 0; i < git_index_entrycount(repo_index); i++) { - cl_assert(entry = git_index_get_byindex(repo_index, i)); - cl_assert(!git_index_entry_is_conflict(entry)); - } -} - -void test_index_conflicts__partial(void) -{ - git_index_entry ancestor_entry, our_entry, their_entry; - const git_index_entry *conflict_entry[3]; - - cl_assert(git_index_entrycount(repo_index) == 8); - - memset(&ancestor_entry, 0x0, sizeof(git_index_entry)); - memset(&our_entry, 0x0, sizeof(git_index_entry)); - memset(&their_entry, 0x0, sizeof(git_index_entry)); - - ancestor_entry.path = "test-one.txt"; - ancestor_entry.mode = 0100644; - GIT_IDXENTRY_STAGE_SET(&ancestor_entry, 1); - git_oid_fromstr(&ancestor_entry.id, CONFLICTS_ONE_ANCESTOR_OID); - - cl_git_pass(git_index_conflict_add(repo_index, &ancestor_entry, NULL, NULL)); - cl_assert(git_index_entrycount(repo_index) == 9); - - cl_git_pass(git_index_conflict_get(&conflict_entry[0], &conflict_entry[1], - &conflict_entry[2], repo_index, "test-one.txt")); - - cl_assert_equal_oid(&ancestor_entry.id, &conflict_entry[0]->id); - cl_assert(conflict_entry[1] == NULL); - cl_assert(conflict_entry[2] == NULL); -} - -void test_index_conflicts__case_matters(void) -{ - const git_index_entry *conflict_entry[3]; - git_oid oid; - const char *upper_case = "DIFFERS-IN-CASE.TXT"; - const char *mixed_case = "Differs-In-Case.txt"; - const char *correct_case; - bool ignorecase = cl_repo_get_bool(repo, "core.ignorecase"); - - git_index_entry ancestor_entry, our_entry, their_entry; - - memset(&ancestor_entry, 0x0, sizeof(git_index_entry)); - memset(&our_entry, 0x0, sizeof(git_index_entry)); - memset(&their_entry, 0x0, sizeof(git_index_entry)); - - ancestor_entry.path = upper_case; - GIT_IDXENTRY_STAGE_SET(&ancestor_entry, GIT_INDEX_STAGE_ANCESTOR); - git_oid_fromstr(&ancestor_entry.id, CONFLICTS_ONE_ANCESTOR_OID); - ancestor_entry.mode = GIT_FILEMODE_BLOB; - - our_entry.path = upper_case; - GIT_IDXENTRY_STAGE_SET(&our_entry, GIT_INDEX_STAGE_OURS); - git_oid_fromstr(&our_entry.id, CONFLICTS_ONE_OUR_OID); - our_entry.mode = GIT_FILEMODE_BLOB; - - their_entry.path = upper_case; - GIT_IDXENTRY_STAGE_SET(&their_entry, GIT_INDEX_STAGE_THEIRS); - git_oid_fromstr(&their_entry.id, CONFLICTS_ONE_THEIR_OID); - their_entry.mode = GIT_FILEMODE_BLOB; - - cl_git_pass(git_index_conflict_add(repo_index, - &ancestor_entry, &our_entry, &their_entry)); - - ancestor_entry.path = mixed_case; - GIT_IDXENTRY_STAGE_SET(&ancestor_entry, GIT_INDEX_STAGE_ANCESTOR); - git_oid_fromstr(&ancestor_entry.id, CONFLICTS_TWO_ANCESTOR_OID); - ancestor_entry.mode = GIT_FILEMODE_BLOB; - - our_entry.path = mixed_case; - GIT_IDXENTRY_STAGE_SET(&ancestor_entry, GIT_INDEX_STAGE_ANCESTOR); - git_oid_fromstr(&our_entry.id, CONFLICTS_TWO_OUR_OID); - ancestor_entry.mode = GIT_FILEMODE_BLOB; - - their_entry.path = mixed_case; - GIT_IDXENTRY_STAGE_SET(&their_entry, GIT_INDEX_STAGE_THEIRS); - git_oid_fromstr(&their_entry.id, CONFLICTS_TWO_THEIR_OID); - their_entry.mode = GIT_FILEMODE_BLOB; - - cl_git_pass(git_index_conflict_add(repo_index, - &ancestor_entry, &our_entry, &their_entry)); - - cl_git_pass(git_index_conflict_get(&conflict_entry[0], &conflict_entry[1], - &conflict_entry[2], repo_index, upper_case)); - - /* - * We inserted with mixed case last, so on a case-insensitive - * fs we should get the mixed case. - */ - if (ignorecase) - correct_case = mixed_case; - else - correct_case = upper_case; - - cl_assert_equal_s(correct_case, conflict_entry[0]->path); - git_oid_fromstr(&oid, ignorecase ? CONFLICTS_TWO_ANCESTOR_OID : CONFLICTS_ONE_ANCESTOR_OID); - cl_assert_equal_oid(&oid, &conflict_entry[0]->id); - - cl_assert_equal_s(correct_case, conflict_entry[1]->path); - git_oid_fromstr(&oid, ignorecase ? CONFLICTS_TWO_OUR_OID : CONFLICTS_ONE_OUR_OID); - cl_assert_equal_oid(&oid, &conflict_entry[1]->id); - - cl_assert_equal_s(correct_case, conflict_entry[2]->path); - git_oid_fromstr(&oid, ignorecase ? CONFLICTS_TWO_THEIR_OID : CONFLICTS_ONE_THEIR_OID); - cl_assert_equal_oid(&oid, &conflict_entry[2]->id); - - cl_git_pass(git_index_conflict_get(&conflict_entry[0], &conflict_entry[1], - &conflict_entry[2], repo_index, mixed_case)); - - cl_assert_equal_s(mixed_case, conflict_entry[0]->path); - git_oid_fromstr(&oid, CONFLICTS_TWO_ANCESTOR_OID); - cl_assert_equal_oid(&oid, &conflict_entry[0]->id); - - cl_assert_equal_s(mixed_case, conflict_entry[1]->path); - git_oid_fromstr(&oid, CONFLICTS_TWO_OUR_OID); - cl_assert_equal_oid(&oid, &conflict_entry[1]->id); - - cl_assert_equal_s(mixed_case, conflict_entry[2]->path); - git_oid_fromstr(&oid, CONFLICTS_TWO_THEIR_OID); - cl_assert_equal_oid(&oid, &conflict_entry[2]->id); -} diff --git a/vendor/libgit2/tests/index/crlf.c b/vendor/libgit2/tests/index/crlf.c deleted file mode 100644 index 23f47932f..000000000 --- a/vendor/libgit2/tests/index/crlf.c +++ /dev/null @@ -1,154 +0,0 @@ -#include "clar_libgit2.h" -#include "../filter/crlf.h" - -#include "git2/checkout.h" -#include "repository.h" -#include "posix.h" - -#define FILE_CONTENTS_LF "one\ntwo\nthree\nfour\n" -#define FILE_CONTENTS_CRLF "one\r\ntwo\r\nthree\r\nfour\r\n" - -#define FILE_OID_LF "f384549cbeb481e437091320de6d1f2e15e11b4a" -#define FILE_OID_CRLF "7fbf4d847b191141d80f30c8ab03d2ad4cd543a9" - -static git_repository *g_repo; -static git_index *g_index; - -void test_index_crlf__initialize(void) -{ - g_repo = cl_git_sandbox_init("crlf"); - cl_git_pass(git_repository_index(&g_index, g_repo)); -} - -void test_index_crlf__cleanup(void) -{ - git_index_free(g_index); - cl_git_sandbox_cleanup(); -} - -void test_index_crlf__autocrlf_false_no_attrs(void) -{ - const git_index_entry *entry; - git_oid oid; - - cl_repo_set_bool(g_repo, "core.autocrlf", false); - - cl_git_mkfile("./crlf/newfile.txt", - (GIT_EOL_NATIVE == GIT_EOL_CRLF) ? FILE_CONTENTS_CRLF : FILE_CONTENTS_LF); - - cl_git_pass(git_index_add_bypath(g_index, "newfile.txt")); - entry = git_index_get_bypath(g_index, "newfile.txt", 0); - - cl_git_pass(git_oid_fromstr(&oid, - (GIT_EOL_NATIVE == GIT_EOL_CRLF) ? FILE_OID_CRLF : FILE_OID_LF)); - cl_assert_equal_oid(&oid, &entry->id); -} - -void test_index_crlf__autocrlf_true_no_attrs(void) -{ - const git_index_entry *entry; - git_oid oid; - - cl_repo_set_bool(g_repo, "core.autocrlf", true); - - cl_git_mkfile("./crlf/newfile.txt", - (GIT_EOL_NATIVE == GIT_EOL_CRLF) ? FILE_CONTENTS_CRLF : FILE_CONTENTS_LF); - - cl_git_pass(git_index_add_bypath(g_index, "newfile.txt")); - entry = git_index_get_bypath(g_index, "newfile.txt", 0); - - cl_git_pass(git_oid_fromstr(&oid, FILE_OID_LF)); - cl_assert_equal_oid(&oid, &entry->id); -} - -void test_index_crlf__autocrlf_input_no_attrs(void) -{ - const git_index_entry *entry; - git_oid oid; - - cl_repo_set_string(g_repo, "core.autocrlf", "input"); - - cl_git_mkfile("./crlf/newfile.txt", - (GIT_EOL_NATIVE == GIT_EOL_CRLF) ? FILE_CONTENTS_CRLF : FILE_CONTENTS_LF); - - cl_git_pass(git_index_add_bypath(g_index, "newfile.txt")); - entry = git_index_get_bypath(g_index, "newfile.txt", 0); - - cl_git_pass(git_oid_fromstr(&oid, FILE_OID_LF)); - cl_assert_equal_oid(&oid, &entry->id); -} - -void test_index_crlf__autocrlf_false_text_auto_attr(void) -{ - const git_index_entry *entry; - git_oid oid; - - cl_git_mkfile("./crlf/.gitattributes", "* text=auto\n"); - - cl_repo_set_bool(g_repo, "core.autocrlf", false); - - cl_git_mkfile("./crlf/newfile.txt", - (GIT_EOL_NATIVE == GIT_EOL_CRLF) ? FILE_CONTENTS_CRLF : FILE_CONTENTS_LF); - - cl_git_pass(git_index_add_bypath(g_index, "newfile.txt")); - entry = git_index_get_bypath(g_index, "newfile.txt", 0); - - cl_git_pass(git_oid_fromstr(&oid, FILE_OID_LF)); - cl_assert_equal_oid(&oid, &entry->id); -} - -void test_index_crlf__autocrlf_true_text_auto_attr(void) -{ - const git_index_entry *entry; - git_oid oid; - - cl_git_mkfile("./crlf/.gitattributes", "* text=auto\n"); - - cl_repo_set_bool(g_repo, "core.autocrlf", false); - - cl_git_mkfile("./crlf/newfile.txt", - (GIT_EOL_NATIVE == GIT_EOL_CRLF) ? FILE_CONTENTS_CRLF : FILE_CONTENTS_LF); - - cl_git_pass(git_index_add_bypath(g_index, "newfile.txt")); - entry = git_index_get_bypath(g_index, "newfile.txt", 0); - - cl_git_pass(git_oid_fromstr(&oid, FILE_OID_LF)); - cl_assert_equal_oid(&oid, &entry->id); -} - -void test_index_crlf__autocrlf_input_text_auto_attr(void) -{ - const git_index_entry *entry; - git_oid oid; - - cl_git_mkfile("./crlf/.gitattributes", "* text=auto\n"); - - cl_repo_set_string(g_repo, "core.autocrlf", "input"); - - cl_git_mkfile("./crlf/newfile.txt", - (GIT_EOL_NATIVE == GIT_EOL_CRLF) ? FILE_CONTENTS_CRLF : FILE_CONTENTS_LF); - - cl_git_pass(git_index_add_bypath(g_index, "newfile.txt")); - entry = git_index_get_bypath(g_index, "newfile.txt", 0); - - cl_git_pass(git_oid_fromstr(&oid, FILE_OID_LF)); - cl_assert_equal_oid(&oid, &entry->id); -} - -void test_index_crlf__safecrlf_true_no_attrs(void) -{ - cl_repo_set_bool(g_repo, "core.autocrlf", true); - cl_repo_set_bool(g_repo, "core.safecrlf", true); - - cl_git_mkfile("crlf/newfile.txt", ALL_LF_TEXT_RAW); - cl_git_pass(git_index_add_bypath(g_index, "newfile.txt")); - - cl_git_mkfile("crlf/newfile.txt", ALL_CRLF_TEXT_RAW); - cl_git_pass(git_index_add_bypath(g_index, "newfile.txt")); - - cl_git_mkfile("crlf/newfile.txt", MORE_CRLF_TEXT_RAW); - cl_git_fail(git_index_add_bypath(g_index, "newfile.txt")); - - cl_git_mkfile("crlf/newfile.txt", MORE_LF_TEXT_RAW); - cl_git_fail(git_index_add_bypath(g_index, "newfile.txt")); -} diff --git a/vendor/libgit2/tests/index/filemodes.c b/vendor/libgit2/tests/index/filemodes.c deleted file mode 100644 index 2efad5b33..000000000 --- a/vendor/libgit2/tests/index/filemodes.c +++ /dev/null @@ -1,258 +0,0 @@ -#include "clar_libgit2.h" -#include "buffer.h" -#include "posix.h" -#include "index.h" - -static git_repository *g_repo = NULL; - -void test_index_filemodes__initialize(void) -{ - g_repo = cl_git_sandbox_init("filemodes"); -} - -void test_index_filemodes__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -void test_index_filemodes__read(void) -{ - git_index *index; - unsigned int i; - static bool expected[6] = { 0, 1, 0, 1, 0, 1 }; - - cl_git_pass(git_repository_index(&index, g_repo)); - cl_assert_equal_i(6, (int)git_index_entrycount(index)); - - for (i = 0; i < 6; ++i) { - const git_index_entry *entry = git_index_get_byindex(index, i); - cl_assert(entry != NULL); - cl_assert(((entry->mode & 0100) ? 1 : 0) == expected[i]); - } - - git_index_free(index); -} - -static void replace_file_with_mode( - const char *filename, const char *backup, unsigned int create_mode) -{ - git_buf path = GIT_BUF_INIT, content = GIT_BUF_INIT; - - cl_git_pass(git_buf_joinpath(&path, "filemodes", filename)); - cl_git_pass(git_buf_printf(&content, "%s as %08u (%d)", - filename, create_mode, rand())); - - cl_git_pass(p_rename(path.ptr, backup)); - cl_git_write2file( - path.ptr, content.ptr, content.size, - O_WRONLY|O_CREAT|O_TRUNC, create_mode); - - git_buf_free(&path); - git_buf_free(&content); -} - -#define add_and_check_mode(I,F,X) add_and_check_mode_(I,F,X,__FILE__,__LINE__) - -static void add_and_check_mode_( - git_index *index, const char *filename, unsigned int expect_mode, - const char *file, int line) -{ - size_t pos; - const git_index_entry *entry; - - cl_git_pass(git_index_add_bypath(index, filename)); - - clar__assert(!git_index_find(&pos, index, filename), - file, line, "Cannot find index entry", NULL, 1); - - entry = git_index_get_byindex(index, pos); - - clar__assert_equal(file, line, "Expected mode does not match index", - 1, "%07o", (unsigned int)entry->mode, (unsigned int)expect_mode); -} - -void test_index_filemodes__untrusted(void) -{ - git_index *index; - - cl_repo_set_bool(g_repo, "core.filemode", false); - - cl_git_pass(git_repository_index(&index, g_repo)); - cl_assert((git_index_caps(index) & GIT_INDEXCAP_NO_FILEMODE) != 0); - - /* 1 - add 0644 over existing 0644 -> expect 0644 */ - replace_file_with_mode("exec_off", "filemodes/exec_off.0", 0644); - add_and_check_mode(index, "exec_off", GIT_FILEMODE_BLOB); - - /* 2 - add 0644 over existing 0755 -> expect 0755 */ - replace_file_with_mode("exec_on", "filemodes/exec_on.0", 0644); - add_and_check_mode(index, "exec_on", GIT_FILEMODE_BLOB_EXECUTABLE); - - /* 3 - add 0755 over existing 0644 -> expect 0644 */ - replace_file_with_mode("exec_off", "filemodes/exec_off.1", 0755); - add_and_check_mode(index, "exec_off", GIT_FILEMODE_BLOB); - - /* 4 - add 0755 over existing 0755 -> expect 0755 */ - replace_file_with_mode("exec_on", "filemodes/exec_on.1", 0755); - add_and_check_mode(index, "exec_on", GIT_FILEMODE_BLOB_EXECUTABLE); - - /* 5 - add new 0644 -> expect 0644 */ - cl_git_write2file("filemodes/new_off", "blah", 0, - O_WRONLY | O_CREAT | O_TRUNC, 0644); - add_and_check_mode(index, "new_off", GIT_FILEMODE_BLOB); - - /* 6 - add new 0755 -> expect 0644 if core.filemode == false */ - cl_git_write2file("filemodes/new_on", "blah", 0, - O_WRONLY | O_CREAT | O_TRUNC, 0755); - add_and_check_mode(index, "new_on", GIT_FILEMODE_BLOB); - - git_index_free(index); -} - -void test_index_filemodes__trusted(void) -{ - git_index *index; - - /* Only run these tests on platforms where I can actually - * chmod a file and get the stat results I expect! - */ - if (!cl_is_chmod_supported()) - return; - - cl_repo_set_bool(g_repo, "core.filemode", true); - - cl_git_pass(git_repository_index(&index, g_repo)); - cl_assert((git_index_caps(index) & GIT_INDEXCAP_NO_FILEMODE) == 0); - - /* 1 - add 0644 over existing 0644 -> expect 0644 */ - replace_file_with_mode("exec_off", "filemodes/exec_off.0", 0644); - add_and_check_mode(index, "exec_off", GIT_FILEMODE_BLOB); - - /* 2 - add 0644 over existing 0755 -> expect 0644 */ - replace_file_with_mode("exec_on", "filemodes/exec_on.0", 0644); - add_and_check_mode(index, "exec_on", GIT_FILEMODE_BLOB); - - /* 3 - add 0755 over existing 0644 -> expect 0755 */ - replace_file_with_mode("exec_off", "filemodes/exec_off.1", 0755); - add_and_check_mode(index, "exec_off", GIT_FILEMODE_BLOB_EXECUTABLE); - - /* 4 - add 0755 over existing 0755 -> expect 0755 */ - replace_file_with_mode("exec_on", "filemodes/exec_on.1", 0755); - add_and_check_mode(index, "exec_on", GIT_FILEMODE_BLOB_EXECUTABLE); - - /* 5 - add new 0644 -> expect 0644 */ - cl_git_write2file("filemodes/new_off", "blah", 0, - O_WRONLY | O_CREAT | O_TRUNC, 0644); - add_and_check_mode(index, "new_off", GIT_FILEMODE_BLOB); - - /* 6 - add 0755 -> expect 0755 */ - cl_git_write2file("filemodes/new_on", "blah", 0, - O_WRONLY | O_CREAT | O_TRUNC, 0755); - add_and_check_mode(index, "new_on", GIT_FILEMODE_BLOB_EXECUTABLE); - - git_index_free(index); -} - -#define add_entry_and_check_mode(I,FF,X) add_entry_and_check_mode_(I,FF,X,__FILE__,__LINE__) - -static void add_entry_and_check_mode_( - git_index *index, bool from_file, git_filemode_t mode, - const char *file, int line) -{ - size_t pos; - const git_index_entry* entry; - git_index_entry new_entry; - - /* If old_filename exists, we copy that to the new file, and test - * git_index_add(), otherwise create a new entry testing git_index_add_frombuffer - */ - if (from_file) - { - clar__assert(!git_index_find(&pos, index, "exec_off"), - file, line, "Cannot find original index entry", NULL, 1); - - entry = git_index_get_byindex(index, pos); - - memcpy(&new_entry, entry, sizeof(new_entry)); - } - else - memset(&new_entry, 0x0, sizeof(git_index_entry)); - - new_entry.path = "filemodes/explicit_test"; - new_entry.mode = mode; - - if (from_file) - { - clar__assert(!git_index_add(index, &new_entry), - file, line, "Cannot add index entry", NULL, 1); - } - else - { - const char *content = "hey there\n"; - clar__assert(!git_index_add_frombuffer(index, &new_entry, content, strlen(content)), - file, line, "Cannot add index entry from buffer", NULL, 1); - } - - clar__assert(!git_index_find(&pos, index, "filemodes/explicit_test"), - file, line, "Cannot find new index entry", NULL, 1); - - entry = git_index_get_byindex(index, pos); - - clar__assert_equal(file, line, "Expected mode does not match index", - 1, "%07o", (unsigned int)entry->mode, (unsigned int)mode); -} - -void test_index_filemodes__explicit(void) -{ - git_index *index; - - /* These tests should run and work everywhere, as the filemode is - * given explicitly to git_index_add or git_index_add_frombuffer - */ - cl_repo_set_bool(g_repo, "core.filemode", false); - - cl_git_pass(git_repository_index(&index, g_repo)); - - /* Each of these tests keeps overwriting the same file in the index. */ - /* 1 - add new 0644 entry */ - add_entry_and_check_mode(index, true, GIT_FILEMODE_BLOB); - - /* 2 - add 0755 entry over existing 0644 */ - add_entry_and_check_mode(index, true, GIT_FILEMODE_BLOB_EXECUTABLE); - - /* 3 - add 0644 entry over existing 0755 */ - add_entry_and_check_mode(index, true, GIT_FILEMODE_BLOB); - - /* 4 - add 0755 buffer entry over existing 0644 */ - add_entry_and_check_mode(index, false, GIT_FILEMODE_BLOB_EXECUTABLE); - - /* 5 - add 0644 buffer entry over existing 0755 */ - add_entry_and_check_mode(index, false, GIT_FILEMODE_BLOB); - - git_index_free(index); -} - -void test_index_filemodes__invalid(void) -{ - git_index *index; - git_index_entry entry; - const git_index_entry *dummy; - - cl_git_pass(git_repository_index(&index, g_repo)); - - /* add a dummy file so that we have a valid id */ - cl_git_mkfile("./filemodes/dummy-file.txt", "new-file\n"); - cl_git_pass(git_index_add_bypath(index, "dummy-file.txt")); - cl_assert((dummy = git_index_get_bypath(index, "dummy-file.txt", 0))); - - GIT_IDXENTRY_STAGE_SET(&entry, 0); - entry.path = "foo"; - entry.mode = GIT_OBJ_BLOB; - git_oid_cpy(&entry.id, &dummy->id); - cl_git_fail(git_index_add(index, &entry)); - - entry.mode = GIT_FILEMODE_BLOB; - cl_git_pass(git_index_add(index, &entry)); - - git_index_free(index); -} diff --git a/vendor/libgit2/tests/index/inmemory.c b/vendor/libgit2/tests/index/inmemory.c deleted file mode 100644 index 38e91e0fd..000000000 --- a/vendor/libgit2/tests/index/inmemory.c +++ /dev/null @@ -1,22 +0,0 @@ -#include "clar_libgit2.h" - -void test_index_inmemory__can_create_an_inmemory_index(void) -{ - git_index *index; - - cl_git_pass(git_index_new(&index)); - cl_assert_equal_i(0, (int)git_index_entrycount(index)); - - git_index_free(index); -} - -void test_index_inmemory__cannot_add_bypath_to_an_inmemory_index(void) -{ - git_index *index; - - cl_git_pass(git_index_new(&index)); - - cl_assert_equal_i(GIT_ERROR, git_index_add_bypath(index, "test.txt")); - - git_index_free(index); -} diff --git a/vendor/libgit2/tests/index/names.c b/vendor/libgit2/tests/index/names.c deleted file mode 100644 index d462088b2..000000000 --- a/vendor/libgit2/tests/index/names.c +++ /dev/null @@ -1,148 +0,0 @@ -#include "clar_libgit2.h" -#include "index.h" -#include "git2/sys/index.h" -#include "git2/repository.h" -#include "../reset/reset_helpers.h" - -static git_repository *repo; -static git_index *repo_index; - -#define TEST_REPO_PATH "mergedrepo" -#define TEST_INDEX_PATH TEST_REPO_PATH "/.git/index" - -// Fixture setup and teardown -void test_index_names__initialize(void) -{ - repo = cl_git_sandbox_init("mergedrepo"); - git_repository_index(&repo_index, repo); -} - -void test_index_names__cleanup(void) -{ - git_index_free(repo_index); - repo_index = NULL; - - cl_git_sandbox_cleanup(); -} - -void test_index_names__add(void) -{ - const git_index_name_entry *conflict_name; - - cl_git_pass(git_index_name_add(repo_index, "ancestor", "ours", "theirs")); - cl_git_pass(git_index_name_add(repo_index, "ancestor2", "ours2", NULL)); - cl_git_pass(git_index_name_add(repo_index, "ancestor3", NULL, "theirs3")); - - cl_assert(git_index_name_entrycount(repo_index) == 3); - - conflict_name = git_index_name_get_byindex(repo_index, 0); - cl_assert(strcmp(conflict_name->ancestor, "ancestor") == 0); - cl_assert(strcmp(conflict_name->ours, "ours") == 0); - cl_assert(strcmp(conflict_name->theirs, "theirs") == 0); - - conflict_name = git_index_name_get_byindex(repo_index, 1); - cl_assert(strcmp(conflict_name->ancestor, "ancestor2") == 0); - cl_assert(strcmp(conflict_name->ours, "ours2") == 0); - cl_assert(conflict_name->theirs == NULL); - - conflict_name = git_index_name_get_byindex(repo_index, 2); - cl_assert(strcmp(conflict_name->ancestor, "ancestor3") == 0); - cl_assert(conflict_name->ours == NULL); - cl_assert(strcmp(conflict_name->theirs, "theirs3") == 0); -} - -void test_index_names__roundtrip(void) -{ - const git_index_name_entry *conflict_name; - - cl_git_pass(git_index_name_add(repo_index, "ancestor", "ours", "theirs")); - cl_git_pass(git_index_name_add(repo_index, "ancestor2", "ours2", NULL)); - cl_git_pass(git_index_name_add(repo_index, "ancestor3", NULL, "theirs3")); - - cl_git_pass(git_index_write(repo_index)); - git_index_clear(repo_index); - cl_assert(git_index_name_entrycount(repo_index) == 0); - - cl_git_pass(git_index_read(repo_index, true)); - cl_assert(git_index_name_entrycount(repo_index) == 3); - - conflict_name = git_index_name_get_byindex(repo_index, 0); - cl_assert(strcmp(conflict_name->ancestor, "ancestor") == 0); - cl_assert(strcmp(conflict_name->ours, "ours") == 0); - cl_assert(strcmp(conflict_name->theirs, "theirs") == 0); - - conflict_name = git_index_name_get_byindex(repo_index, 1); - cl_assert(strcmp(conflict_name->ancestor, "ancestor2") == 0); - cl_assert(strcmp(conflict_name->ours, "ours2") == 0); - cl_assert(conflict_name->theirs == NULL); - - conflict_name = git_index_name_get_byindex(repo_index, 2); - cl_assert(strcmp(conflict_name->ancestor, "ancestor3") == 0); - cl_assert(conflict_name->ours == NULL); - cl_assert(strcmp(conflict_name->theirs, "theirs3") == 0); -} - -void test_index_names__cleaned_on_reset_hard(void) -{ - git_object *target; - - cl_git_pass(git_revparse_single(&target, repo, "3a34580")); - - test_index_names__add(); - cl_git_pass(git_reset(repo, target, GIT_RESET_HARD, NULL)); - cl_assert(git_index_name_entrycount(repo_index) == 0); - - git_object_free(target); -} - -void test_index_names__cleaned_on_reset_mixed(void) -{ - git_object *target; - - cl_git_pass(git_revparse_single(&target, repo, "3a34580")); - - test_index_names__add(); - cl_git_pass(git_reset(repo, target, GIT_RESET_MIXED, NULL)); - cl_assert(git_index_name_entrycount(repo_index) == 0); - - git_object_free(target); -} - -void test_index_names__cleaned_on_checkout_tree(void) -{ - git_oid oid; - git_object *obj; - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - - opts.checkout_strategy = GIT_CHECKOUT_SAFE | GIT_CHECKOUT_UPDATE_ONLY; - - test_index_names__add(); - git_reference_name_to_id(&oid, repo, "refs/heads/master"); - git_object_lookup(&obj, repo, &oid, GIT_OBJ_ANY); - git_checkout_tree(repo, obj, &opts); - cl_assert_equal_sz(0, git_index_name_entrycount(repo_index)); - - git_object_free(obj); -} - -void test_index_names__cleaned_on_checkout_head(void) -{ - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - - opts.checkout_strategy = GIT_CHECKOUT_SAFE | GIT_CHECKOUT_UPDATE_ONLY; - - test_index_names__add(); - git_checkout_head(repo, &opts); - cl_assert_equal_sz(0, git_index_name_entrycount(repo_index)); -} - -void test_index_names__retained_on_checkout_index(void) -{ - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - - opts.checkout_strategy = GIT_CHECKOUT_SAFE | GIT_CHECKOUT_UPDATE_ONLY; - - test_index_names__add(); - git_checkout_index(repo, repo_index, &opts); - cl_assert(git_index_name_entrycount(repo_index) > 0); -} diff --git a/vendor/libgit2/tests/index/nsec.c b/vendor/libgit2/tests/index/nsec.c deleted file mode 100644 index 244ab6362..000000000 --- a/vendor/libgit2/tests/index/nsec.c +++ /dev/null @@ -1,87 +0,0 @@ -#include "clar_libgit2.h" -#include "index.h" -#include "git2/sys/index.h" -#include "git2/repository.h" -#include "../reset/reset_helpers.h" - -static git_repository *repo; -static git_index *repo_index; - -#define TEST_REPO_PATH "nsecs" - -// Fixture setup and teardown -void test_index_nsec__initialize(void) -{ - repo = cl_git_sandbox_init("nsecs"); - git_repository_index(&repo_index, repo); -} - -void test_index_nsec__cleanup(void) -{ - git_index_free(repo_index); - repo_index = NULL; - - cl_git_sandbox_cleanup(); -} - -static bool has_nsecs(void) -{ - const git_index_entry *entry; - size_t i; - bool has_nsecs = false; - - for (i = 0; i < git_index_entrycount(repo_index); i++) { - entry = git_index_get_byindex(repo_index, i); - - if (entry->ctime.nanoseconds || entry->mtime.nanoseconds) { - has_nsecs = true; - break; - } - } - - return has_nsecs; -} - -void test_index_nsec__has_nanos(void) -{ - cl_assert_equal_b(true, has_nsecs()); -} - -void test_index_nsec__staging_maintains_other_nanos(void) -{ - const git_index_entry *entry; - - cl_git_rewritefile("nsecs/a.txt", "This is file A"); - cl_git_pass(git_index_add_bypath(repo_index, "a.txt")); - cl_git_pass(git_index_write(repo_index)); - - cl_git_pass(git_index_write(repo_index)); - - git_index_read(repo_index, 1); - cl_assert_equal_b(true, has_nsecs()); - - cl_assert((entry = git_index_get_bypath(repo_index, "a.txt", 0))); - - /* if we are writing nanoseconds to the index, expect them to be - * nonzero. if we are *not*, expect that we truncated the entry. - */ -#ifdef GIT_USE_NSEC - cl_assert(entry->ctime.nanoseconds != 0); - cl_assert(entry->mtime.nanoseconds != 0); -#else - cl_assert_equal_i(0, entry->ctime.nanoseconds); - cl_assert_equal_i(0, entry->mtime.nanoseconds); -#endif -} - -void test_index_nsec__status_doesnt_clear_nsecs(void) -{ - git_status_list *statuslist; - - cl_git_pass(git_status_list_new(&statuslist, repo, NULL)); - - git_index_read(repo_index, 1); - cl_assert_equal_b(true, has_nsecs()); - - git_status_list_free(statuslist); -} diff --git a/vendor/libgit2/tests/index/racy.c b/vendor/libgit2/tests/index/racy.c deleted file mode 100644 index 1768f5efd..000000000 --- a/vendor/libgit2/tests/index/racy.c +++ /dev/null @@ -1,324 +0,0 @@ -#include "clar_libgit2.h" -#include "../checkout/checkout_helpers.h" - -#include "buffer.h" -#include "index.h" -#include "repository.h" - -static git_repository *g_repo; - -void test_index_racy__initialize(void) -{ - cl_git_pass(git_repository_init(&g_repo, "diff_racy", false)); -} - -void test_index_racy__cleanup(void) -{ - git_repository_free(g_repo); - g_repo = NULL; - - cl_fixture_cleanup("diff_racy"); -} - -void test_index_racy__diff(void) -{ - git_index *index; - git_diff *diff; - git_buf path = GIT_BUF_INIT; - - cl_git_pass(git_buf_joinpath(&path, git_repository_workdir(g_repo), "A")); - cl_git_mkfile(path.ptr, "A"); - - /* Put 'A' into the index */ - cl_git_pass(git_repository_index(&index, g_repo)); - cl_git_pass(git_index_add_bypath(index, "A")); - cl_git_pass(git_index_write(index)); - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, index, NULL)); - cl_assert_equal_i(0, git_diff_num_deltas(diff)); - git_diff_free(diff); - - /* Change its contents quickly, so we get the same timestamp */ - cl_git_mkfile(path.ptr, "B"); - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, index, NULL)); - cl_assert_equal_i(1, git_diff_num_deltas(diff)); - - git_index_free(index); - git_diff_free(diff); - git_buf_free(&path); -} - -void test_index_racy__write_index_just_after_file(void) -{ - git_index *index; - git_diff *diff; - git_buf path = GIT_BUF_INIT; - struct p_timeval times[2]; - - /* Make sure we do have a timestamp */ - cl_git_pass(git_repository_index(&index, g_repo)); - cl_git_pass(git_index_write(index)); - - cl_git_pass(git_buf_joinpath(&path, git_repository_workdir(g_repo), "A")); - cl_git_mkfile(path.ptr, "A"); - /* Force the file's timestamp to be a second after we wrote the index */ - times[0].tv_sec = index->stamp.mtime.tv_sec + 1; - times[0].tv_usec = index->stamp.mtime.tv_nsec / 1000; - times[1].tv_sec = index->stamp.mtime.tv_sec + 1; - times[1].tv_usec = index->stamp.mtime.tv_nsec / 1000; - cl_git_pass(p_utimes(path.ptr, times)); - - /* - * Put 'A' into the index, the size field will be filled, - * because the index' on-disk timestamp does not match the - * file's timestamp. - */ - cl_git_pass(git_index_add_bypath(index, "A")); - cl_git_pass(git_index_write(index)); - - cl_git_mkfile(path.ptr, "B"); - /* - * Pretend this index' modification happened a second after the - * file update, and rewrite the file in that same second. - */ - times[0].tv_sec = index->stamp.mtime.tv_sec + 2; - times[0].tv_usec = index->stamp.mtime.tv_nsec / 1000; - times[1].tv_sec = index->stamp.mtime.tv_sec + 2; - times[0].tv_usec = index->stamp.mtime.tv_nsec / 1000; - - cl_git_pass(p_utimes(git_index_path(index), times)); - cl_git_pass(p_utimes(path.ptr, times)); - - cl_git_pass(git_index_read(index, true)); - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, index, NULL)); - cl_assert_equal_i(1, git_diff_num_deltas(diff)); - - git_buf_free(&path); - git_diff_free(diff); - git_index_free(index); -} - - -static void setup_race(void) -{ - git_buf path = GIT_BUF_INIT; - git_index *index; - git_index_entry *entry; - struct stat st; - - /* Make sure we do have a timestamp */ - cl_git_pass(git_repository_index__weakptr(&index, g_repo)); - cl_git_pass(git_index_write(index)); - - cl_git_pass(git_buf_joinpath(&path, git_repository_workdir(g_repo), "A")); - - cl_git_mkfile(path.ptr, "A"); - cl_git_pass(git_index_add_bypath(index, "A")); - - cl_git_mkfile(path.ptr, "B"); - cl_git_pass(git_index_write(index)); - - cl_git_mkfile(path.ptr, ""); - - cl_git_pass(p_stat(path.ptr, &st)); - cl_assert(entry = (git_index_entry *)git_index_get_bypath(index, "A", 0)); - - /* force a race */ - entry->mtime.seconds = st.st_mtime; - entry->mtime.nanoseconds = st.st_mtime_nsec; - - git_buf_free(&path); -} - -void test_index_racy__smudges_index_entry_on_save(void) -{ - git_index *index; - const git_index_entry *entry; - - setup_race(); - - /* write the index, which will smudge anything that had the same timestamp - * as the index when the index was loaded. that way future loads of the - * index (with the new timestamp) will know that these files were not - * clean. - */ - - cl_git_pass(git_repository_index__weakptr(&index, g_repo)); - cl_git_pass(git_index_write(index)); - - cl_assert(entry = git_index_get_bypath(index, "A", 0)); - cl_assert_equal_i(0, entry->file_size); -} - -void test_index_racy__detects_diff_of_change_in_identical_timestamp(void) -{ - git_index *index; - git_diff *diff; - - cl_git_pass(git_repository_index__weakptr(&index, g_repo)); - - setup_race(); - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, index, NULL)); - cl_assert_equal_i(1, git_diff_num_deltas(diff)); - - git_diff_free(diff); -} - -static void setup_uptodate_files(void) -{ - git_buf path = GIT_BUF_INIT; - git_index *index; - const git_index_entry *a_entry; - git_index_entry new_entry = {{0}}; - - cl_git_pass(git_repository_index(&index, g_repo)); - - cl_git_pass(git_buf_joinpath(&path, git_repository_workdir(g_repo), "A")); - cl_git_mkfile(path.ptr, "A"); - - /* Put 'A' into the index */ - cl_git_pass(git_index_add_bypath(index, "A")); - - cl_assert((a_entry = git_index_get_bypath(index, "A", 0))); - - /* Put 'B' into the index */ - new_entry.path = "B"; - new_entry.mode = GIT_FILEMODE_BLOB; - git_oid_cpy(&new_entry.id, &a_entry->id); - cl_git_pass(git_index_add(index, &new_entry)); - - /* Put 'C' into the index */ - new_entry.path = "C"; - new_entry.mode = GIT_FILEMODE_BLOB; - cl_git_pass(git_index_add_frombuffer(index, &new_entry, "hello!\n", 7)); - - git_index_free(index); - git_buf_free(&path); -} - -void test_index_racy__adding_to_index_is_uptodate(void) -{ - git_index *index; - const git_index_entry *entry; - - setup_uptodate_files(); - - cl_git_pass(git_repository_index(&index, g_repo)); - - /* ensure that they're all uptodate */ - cl_assert((entry = git_index_get_bypath(index, "A", 0))); - cl_assert_equal_i(GIT_IDXENTRY_UPTODATE, (entry->flags_extended & GIT_IDXENTRY_UPTODATE)); - - cl_assert((entry = git_index_get_bypath(index, "B", 0))); - cl_assert_equal_i(GIT_IDXENTRY_UPTODATE, (entry->flags_extended & GIT_IDXENTRY_UPTODATE)); - - cl_assert((entry = git_index_get_bypath(index, "C", 0))); - cl_assert_equal_i(GIT_IDXENTRY_UPTODATE, (entry->flags_extended & GIT_IDXENTRY_UPTODATE)); - - cl_git_pass(git_index_write(index)); - - git_index_free(index); -} - -void test_index_racy__reading_clears_uptodate_bit(void) -{ - git_index *index; - const git_index_entry *entry; - - setup_uptodate_files(); - - cl_git_pass(git_repository_index(&index, g_repo)); - cl_git_pass(git_index_write(index)); - - cl_git_pass(git_index_read(index, true)); - - /* ensure that no files are uptodate */ - cl_assert((entry = git_index_get_bypath(index, "A", 0))); - cl_assert_equal_i(0, (entry->flags_extended & GIT_IDXENTRY_UPTODATE)); - - cl_assert((entry = git_index_get_bypath(index, "B", 0))); - cl_assert_equal_i(0, (entry->flags_extended & GIT_IDXENTRY_UPTODATE)); - - cl_assert((entry = git_index_get_bypath(index, "C", 0))); - cl_assert_equal_i(0, (entry->flags_extended & GIT_IDXENTRY_UPTODATE)); - - git_index_free(index); -} - -void test_index_racy__read_tree_clears_uptodate_bit(void) -{ - git_index *index; - git_tree *tree; - const git_index_entry *entry; - git_oid id; - - setup_uptodate_files(); - - cl_git_pass(git_repository_index(&index, g_repo)); - cl_git_pass(git_index_write_tree_to(&id, index, g_repo)); - cl_git_pass(git_tree_lookup(&tree, g_repo, &id)); - cl_git_pass(git_index_read_tree(index, tree)); - - /* ensure that no files are uptodate */ - cl_assert((entry = git_index_get_bypath(index, "A", 0))); - cl_assert_equal_i(0, (entry->flags_extended & GIT_IDXENTRY_UPTODATE)); - - cl_assert((entry = git_index_get_bypath(index, "B", 0))); - cl_assert_equal_i(0, (entry->flags_extended & GIT_IDXENTRY_UPTODATE)); - - cl_assert((entry = git_index_get_bypath(index, "C", 0))); - cl_assert_equal_i(0, (entry->flags_extended & GIT_IDXENTRY_UPTODATE)); - - git_tree_free(tree); - git_index_free(index); -} - -void test_index_racy__read_index_smudges(void) -{ - git_index *index, *newindex; - const git_index_entry *entry; - - /* if we are reading an index into our new index, ensure that any - * racy entries in the index that we're reading are smudged so that - * we don't propagate their timestamps without further investigation. - */ - setup_race(); - - cl_git_pass(git_repository_index(&index, g_repo)); - cl_git_pass(git_index_new(&newindex)); - cl_git_pass(git_index_read_index(newindex, index)); - - cl_assert(entry = git_index_get_bypath(newindex, "A", 0)); - cl_assert_equal_i(0, entry->file_size); - - git_index_free(index); - git_index_free(newindex); -} - -void test_index_racy__read_index_clears_uptodate_bit(void) -{ - git_index *index, *newindex; - const git_index_entry *entry; - - setup_uptodate_files(); - - cl_git_pass(git_repository_index(&index, g_repo)); - cl_git_pass(git_index_new(&newindex)); - cl_git_pass(git_index_read_index(newindex, index)); - - /* ensure that files brought in from the other index are not uptodate */ - cl_assert((entry = git_index_get_bypath(newindex, "A", 0))); - cl_assert_equal_i(0, (entry->flags_extended & GIT_IDXENTRY_UPTODATE)); - - cl_assert((entry = git_index_get_bypath(newindex, "B", 0))); - cl_assert_equal_i(0, (entry->flags_extended & GIT_IDXENTRY_UPTODATE)); - - cl_assert((entry = git_index_get_bypath(newindex, "C", 0))); - cl_assert_equal_i(0, (entry->flags_extended & GIT_IDXENTRY_UPTODATE)); - - git_index_free(index); - git_index_free(newindex); -} diff --git a/vendor/libgit2/tests/index/read_index.c b/vendor/libgit2/tests/index/read_index.c deleted file mode 100644 index 82a771d54..000000000 --- a/vendor/libgit2/tests/index/read_index.c +++ /dev/null @@ -1,73 +0,0 @@ -#include "clar_libgit2.h" -#include "posix.h" -#include "index.h" - -static git_repository *_repo; -static git_index *_index; - -void test_index_read_index__initialize(void) -{ - git_object *head; - git_reference *head_ref; - - _repo = cl_git_sandbox_init("testrepo"); - cl_git_pass(git_revparse_ext(&head, &head_ref, _repo, "HEAD")); - cl_git_pass(git_reset(_repo, head, GIT_RESET_HARD, NULL)); - cl_git_pass(git_repository_index(&_index, _repo)); - - git_reference_free(head_ref); - git_object_free(head); -} - -void test_index_read_index__cleanup(void) -{ - git_index_free(_index); - cl_git_sandbox_cleanup(); -} - -void test_index_read_index__maintains_stat_cache(void) -{ - git_index *new_index; - git_oid index_id; - git_index_entry new_entry; - const git_index_entry *e; - git_tree *tree; - size_t i; - - cl_assert_equal_i(4, git_index_entrycount(_index)); - - /* write-tree */ - cl_git_pass(git_index_write_tree(&index_id, _index)); - - /* read-tree, then read index */ - git_tree_lookup(&tree, _repo, &index_id); - cl_git_pass(git_index_new(&new_index)); - cl_git_pass(git_index_read_tree(new_index, tree)); - git_tree_free(tree); - - /* add a new entry that will not have stat data */ - memset(&new_entry, 0, sizeof(git_index_entry)); - new_entry.path = "Hello"; - git_oid_fromstr(&new_entry.id, "0123456789012345678901234567890123456789"); - new_entry.file_size = 1234; - new_entry.mode = 0100644; - cl_git_pass(git_index_add(new_index, &new_entry)); - cl_assert_equal_i(5, git_index_entrycount(new_index)); - - cl_git_pass(git_index_read_index(_index, new_index)); - git_index_free(new_index); - - cl_assert_equal_i(5, git_index_entrycount(_index)); - - for (i = 0; i < git_index_entrycount(_index); i++) { - e = git_index_get_byindex(_index, i); - - if (strcmp(e->path, "Hello") == 0) { - cl_assert_equal_i(0, e->ctime.seconds); - cl_assert_equal_i(0, e->mtime.seconds); - } else { - cl_assert(0 != e->ctime.seconds); - cl_assert(0 != e->mtime.seconds); - } - } -} diff --git a/vendor/libgit2/tests/index/read_tree.c b/vendor/libgit2/tests/index/read_tree.c deleted file mode 100644 index 0e1882818..000000000 --- a/vendor/libgit2/tests/index/read_tree.c +++ /dev/null @@ -1,46 +0,0 @@ -#include "clar_libgit2.h" -#include "posix.h" - -/* Test that reading and writing a tree is a no-op */ -void test_index_read_tree__read_write_involution(void) -{ - git_repository *repo; - git_index *index; - git_oid tree_oid; - git_tree *tree; - git_oid expected; - - p_mkdir("read_tree", 0700); - - cl_git_pass(git_repository_init(&repo, "./read_tree", 0)); - cl_git_pass(git_repository_index(&index, repo)); - - cl_assert(git_index_entrycount(index) == 0); - - p_mkdir("./read_tree/abc", 0700); - - /* Sort order: '-' < '/' < '_' */ - cl_git_mkfile("./read_tree/abc-d", NULL); - cl_git_mkfile("./read_tree/abc/d", NULL); - cl_git_mkfile("./read_tree/abc_d", NULL); - - cl_git_pass(git_index_add_bypath(index, "abc-d")); - cl_git_pass(git_index_add_bypath(index, "abc_d")); - cl_git_pass(git_index_add_bypath(index, "abc/d")); - - /* write-tree */ - cl_git_pass(git_index_write_tree(&expected, index)); - - /* read-tree */ - git_tree_lookup(&tree, repo, &expected); - cl_git_pass(git_index_read_tree(index, tree)); - git_tree_free(tree); - - cl_git_pass(git_index_write_tree(&tree_oid, index)); - cl_assert_equal_oid(&expected, &tree_oid); - - git_index_free(index); - git_repository_free(repo); - - cl_fixture_cleanup("read_tree"); -} diff --git a/vendor/libgit2/tests/index/rename.c b/vendor/libgit2/tests/index/rename.c deleted file mode 100644 index 86eaf0053..000000000 --- a/vendor/libgit2/tests/index/rename.c +++ /dev/null @@ -1,86 +0,0 @@ -#include "clar_libgit2.h" -#include "posix.h" - -void test_index_rename__single_file(void) -{ - git_repository *repo; - git_index *index; - size_t position; - git_oid expected; - const git_index_entry *entry; - - p_mkdir("rename", 0700); - - cl_git_pass(git_repository_init(&repo, "./rename", 0)); - cl_git_pass(git_repository_index(&index, repo)); - - cl_assert(git_index_entrycount(index) == 0); - - cl_git_mkfile("./rename/lame.name.txt", "new_file\n"); - - /* This should add a new blob to the object database in 'd4/fa8600b4f37d7516bef4816ae2c64dbf029e3a' */ - cl_git_pass(git_index_add_bypath(index, "lame.name.txt")); - cl_assert(git_index_entrycount(index) == 1); - - cl_git_pass(git_oid_fromstr(&expected, "d4fa8600b4f37d7516bef4816ae2c64dbf029e3a")); - - cl_assert(!git_index_find(&position, index, "lame.name.txt")); - - entry = git_index_get_byindex(index, position); - cl_assert_equal_oid(&expected, &entry->id); - - /* This removes the entry from the index, but not from the object database */ - cl_git_pass(git_index_remove(index, "lame.name.txt", 0)); - cl_assert(git_index_entrycount(index) == 0); - - p_rename("./rename/lame.name.txt", "./rename/fancy.name.txt"); - - cl_git_pass(git_index_add_bypath(index, "fancy.name.txt")); - cl_assert(git_index_entrycount(index) == 1); - - cl_assert(!git_index_find(&position, index, "fancy.name.txt")); - - entry = git_index_get_byindex(index, position); - cl_assert_equal_oid(&expected, &entry->id); - - git_index_free(index); - git_repository_free(repo); - - cl_fixture_cleanup("rename"); -} - -void test_index_rename__casechanging(void) -{ - git_repository *repo; - git_index *index; - const git_index_entry *entry; - git_index_entry new = {{0}}; - - p_mkdir("rename", 0700); - - cl_git_pass(git_repository_init(&repo, "./rename", 0)); - cl_git_pass(git_repository_index(&index, repo)); - - cl_git_mkfile("./rename/lame.name.txt", "new_file\n"); - - cl_git_pass(git_index_add_bypath(index, "lame.name.txt")); - cl_assert_equal_i(1, git_index_entrycount(index)); - cl_assert((entry = git_index_get_bypath(index, "lame.name.txt", 0))); - - memcpy(&new, entry, sizeof(git_index_entry)); - new.path = "LAME.name.TXT"; - - cl_git_pass(git_index_add(index, &new)); - cl_assert((entry = git_index_get_bypath(index, "LAME.name.TXT", 0))); - - if (cl_repo_get_bool(repo, "core.ignorecase")) - cl_assert_equal_i(1, git_index_entrycount(index)); - else - cl_assert_equal_i(2, git_index_entrycount(index)); - - git_index_free(index); - git_repository_free(repo); - - cl_fixture_cleanup("rename"); -} - diff --git a/vendor/libgit2/tests/index/reuc.c b/vendor/libgit2/tests/index/reuc.c deleted file mode 100644 index e57facc0c..000000000 --- a/vendor/libgit2/tests/index/reuc.c +++ /dev/null @@ -1,372 +0,0 @@ -#include "clar_libgit2.h" -#include "index.h" -#include "git2/sys/index.h" -#include "git2/repository.h" -#include "../reset/reset_helpers.h" - -static git_repository *repo; -static git_index *repo_index; - -#define TEST_REPO_PATH "mergedrepo" -#define TEST_INDEX_PATH TEST_REPO_PATH "/.git/index" - -#define ONE_ANCESTOR_OID "478871385b9cd03908c5383acfd568bef023c6b3" -#define ONE_OUR_OID "4458b8bc9e72b6c8755ae456f60e9844d0538d8c" -#define ONE_THEIR_OID "8b72416545c7e761b64cecad4f1686eae4078aa8" - -#define TWO_ANCESTOR_OID "9d81f82fccc7dcd7de7a1ffead1815294c2e092c" -#define TWO_OUR_OID "8f3c06cff9a83757cec40c80bc9bf31a2582bde9" -#define TWO_THEIR_OID "887b153b165d32409c70163e0f734c090f12f673" - -// Fixture setup and teardown -void test_index_reuc__initialize(void) -{ - repo = cl_git_sandbox_init("mergedrepo"); - git_repository_index(&repo_index, repo); -} - -void test_index_reuc__cleanup(void) -{ - git_index_free(repo_index); - repo_index = NULL; - - cl_git_sandbox_cleanup(); -} - -void test_index_reuc__add(void) -{ - git_oid ancestor_oid, our_oid, their_oid; - const git_index_reuc_entry *reuc; - - git_oid_fromstr(&ancestor_oid, ONE_ANCESTOR_OID); - git_oid_fromstr(&our_oid, ONE_OUR_OID); - git_oid_fromstr(&their_oid, ONE_THEIR_OID); - - cl_git_pass(git_index_reuc_add(repo_index, "newfile.txt", - 0100644, &ancestor_oid, - 0100644, &our_oid, - 0100644, &their_oid)); - - cl_assert(reuc = git_index_reuc_get_bypath(repo_index, "newfile.txt")); - - cl_assert_equal_s("newfile.txt", reuc->path); - cl_assert(reuc->mode[0] == 0100644); - cl_assert(reuc->mode[1] == 0100644); - cl_assert(reuc->mode[2] == 0100644); - cl_assert_equal_oid(&reuc->oid[0], &ancestor_oid); - cl_assert_equal_oid(&reuc->oid[1], &our_oid); - cl_assert_equal_oid(&reuc->oid[2], &their_oid); -} - -void test_index_reuc__add_no_ancestor(void) -{ - git_oid ancestor_oid, our_oid, their_oid; - const git_index_reuc_entry *reuc; - - memset(&ancestor_oid, 0x0, sizeof(git_oid)); - git_oid_fromstr(&our_oid, ONE_OUR_OID); - git_oid_fromstr(&their_oid, ONE_THEIR_OID); - - cl_git_pass(git_index_reuc_add(repo_index, "newfile.txt", - 0, NULL, - 0100644, &our_oid, - 0100644, &their_oid)); - - cl_assert(reuc = git_index_reuc_get_bypath(repo_index, "newfile.txt")); - - cl_assert_equal_s("newfile.txt", reuc->path); - cl_assert(reuc->mode[0] == 0); - cl_assert(reuc->mode[1] == 0100644); - cl_assert(reuc->mode[2] == 0100644); - cl_assert_equal_oid(&reuc->oid[0], &ancestor_oid); - cl_assert_equal_oid(&reuc->oid[1], &our_oid); - cl_assert_equal_oid(&reuc->oid[2], &their_oid); -} - -void test_index_reuc__read_bypath(void) -{ - const git_index_reuc_entry *reuc; - git_oid oid; - - cl_assert_equal_i(2, git_index_reuc_entrycount(repo_index)); - - cl_assert(reuc = git_index_reuc_get_bypath(repo_index, "two.txt")); - - cl_assert_equal_s("two.txt", reuc->path); - cl_assert(reuc->mode[0] == 0100644); - cl_assert(reuc->mode[1] == 0100644); - cl_assert(reuc->mode[2] == 0100644); - git_oid_fromstr(&oid, TWO_ANCESTOR_OID); - cl_assert_equal_oid(&reuc->oid[0], &oid); - git_oid_fromstr(&oid, TWO_OUR_OID); - cl_assert_equal_oid(&reuc->oid[1], &oid); - git_oid_fromstr(&oid, TWO_THEIR_OID); - cl_assert_equal_oid(&reuc->oid[2], &oid); - - cl_assert(reuc = git_index_reuc_get_bypath(repo_index, "one.txt")); - - cl_assert_equal_s("one.txt", reuc->path); - cl_assert(reuc->mode[0] == 0100644); - cl_assert(reuc->mode[1] == 0100644); - cl_assert(reuc->mode[2] == 0100644); - git_oid_fromstr(&oid, ONE_ANCESTOR_OID); - cl_assert_equal_oid(&reuc->oid[0], &oid); - git_oid_fromstr(&oid, ONE_OUR_OID); - cl_assert_equal_oid(&reuc->oid[1], &oid); - git_oid_fromstr(&oid, ONE_THEIR_OID); - cl_assert_equal_oid(&reuc->oid[2], &oid); -} - -void test_index_reuc__ignore_case(void) -{ - const git_index_reuc_entry *reuc; - git_oid oid; - int index_caps; - - index_caps = git_index_caps(repo_index); - - index_caps &= ~GIT_INDEXCAP_IGNORE_CASE; - cl_git_pass(git_index_set_caps(repo_index, index_caps)); - - cl_assert(!git_index_reuc_get_bypath(repo_index, "TWO.txt")); - - index_caps |= GIT_INDEXCAP_IGNORE_CASE; - cl_git_pass(git_index_set_caps(repo_index, index_caps)); - - cl_assert_equal_i(2, git_index_reuc_entrycount(repo_index)); - - cl_assert(reuc = git_index_reuc_get_bypath(repo_index, "TWO.txt")); - - cl_assert_equal_s("two.txt", reuc->path); - cl_assert(reuc->mode[0] == 0100644); - cl_assert(reuc->mode[1] == 0100644); - cl_assert(reuc->mode[2] == 0100644); - git_oid_fromstr(&oid, TWO_ANCESTOR_OID); - cl_assert_equal_oid(&reuc->oid[0], &oid); - git_oid_fromstr(&oid, TWO_OUR_OID); - cl_assert_equal_oid(&reuc->oid[1], &oid); - git_oid_fromstr(&oid, TWO_THEIR_OID); - cl_assert_equal_oid(&reuc->oid[2], &oid); -} - -void test_index_reuc__read_byindex(void) -{ - const git_index_reuc_entry *reuc; - git_oid oid; - - cl_assert_equal_i(2, git_index_reuc_entrycount(repo_index)); - - cl_assert(reuc = git_index_reuc_get_byindex(repo_index, 0)); - - cl_assert_equal_s("one.txt", reuc->path); - cl_assert(reuc->mode[0] == 0100644); - cl_assert(reuc->mode[1] == 0100644); - cl_assert(reuc->mode[2] == 0100644); - git_oid_fromstr(&oid, ONE_ANCESTOR_OID); - cl_assert_equal_oid(&reuc->oid[0], &oid); - git_oid_fromstr(&oid, ONE_OUR_OID); - cl_assert_equal_oid(&reuc->oid[1], &oid); - git_oid_fromstr(&oid, ONE_THEIR_OID); - cl_assert_equal_oid(&reuc->oid[2], &oid); - - cl_assert(reuc = git_index_reuc_get_byindex(repo_index, 1)); - - cl_assert_equal_s("two.txt", reuc->path); - cl_assert(reuc->mode[0] == 0100644); - cl_assert(reuc->mode[1] == 0100644); - cl_assert(reuc->mode[2] == 0100644); - git_oid_fromstr(&oid, TWO_ANCESTOR_OID); - cl_assert_equal_oid(&reuc->oid[0], &oid); - git_oid_fromstr(&oid, TWO_OUR_OID); - cl_assert_equal_oid(&reuc->oid[1], &oid); - git_oid_fromstr(&oid, TWO_THEIR_OID); - cl_assert_equal_oid(&reuc->oid[2], &oid); -} - -void test_index_reuc__updates_existing(void) -{ - const git_index_reuc_entry *reuc; - git_oid ancestor_oid, our_oid, their_oid, oid; - int index_caps; - - git_index_clear(repo_index); - - index_caps = git_index_caps(repo_index); - - index_caps |= GIT_INDEXCAP_IGNORE_CASE; - cl_git_pass(git_index_set_caps(repo_index, index_caps)); - - git_oid_fromstr(&ancestor_oid, TWO_ANCESTOR_OID); - git_oid_fromstr(&our_oid, TWO_OUR_OID); - git_oid_fromstr(&their_oid, TWO_THEIR_OID); - - cl_git_pass(git_index_reuc_add(repo_index, "two.txt", - 0100644, &ancestor_oid, - 0100644, &our_oid, - 0100644, &their_oid)); - - cl_git_pass(git_index_reuc_add(repo_index, "TWO.txt", - 0100644, &our_oid, - 0100644, &their_oid, - 0100644, &ancestor_oid)); - - cl_assert_equal_i(1, git_index_reuc_entrycount(repo_index)); - - cl_assert(reuc = git_index_reuc_get_byindex(repo_index, 0)); - - cl_assert_equal_s("TWO.txt", reuc->path); - git_oid_fromstr(&oid, TWO_OUR_OID); - cl_assert_equal_oid(&reuc->oid[0], &oid); - git_oid_fromstr(&oid, TWO_THEIR_OID); - cl_assert_equal_oid(&reuc->oid[1], &oid); - git_oid_fromstr(&oid, TWO_ANCESTOR_OID); - cl_assert_equal_oid(&reuc->oid[2], &oid); -} - -void test_index_reuc__remove(void) -{ - git_oid oid; - const git_index_reuc_entry *reuc; - - cl_assert_equal_i(2, git_index_reuc_entrycount(repo_index)); - - cl_git_pass(git_index_reuc_remove(repo_index, 0)); - cl_git_fail(git_index_reuc_remove(repo_index, 1)); - - cl_assert_equal_i(1, git_index_reuc_entrycount(repo_index)); - - cl_assert(reuc = git_index_reuc_get_byindex(repo_index, 0)); - - cl_assert_equal_s("two.txt", reuc->path); - cl_assert(reuc->mode[0] == 0100644); - cl_assert(reuc->mode[1] == 0100644); - cl_assert(reuc->mode[2] == 0100644); - git_oid_fromstr(&oid, TWO_ANCESTOR_OID); - cl_assert_equal_oid(&reuc->oid[0], &oid); - git_oid_fromstr(&oid, TWO_OUR_OID); - cl_assert_equal_oid(&reuc->oid[1], &oid); - git_oid_fromstr(&oid, TWO_THEIR_OID); - cl_assert_equal_oid(&reuc->oid[2], &oid); -} - -void test_index_reuc__write(void) -{ - git_oid ancestor_oid, our_oid, their_oid; - const git_index_reuc_entry *reuc; - - git_index_clear(repo_index); - - /* Write out of order to ensure sorting is correct */ - git_oid_fromstr(&ancestor_oid, TWO_ANCESTOR_OID); - git_oid_fromstr(&our_oid, TWO_OUR_OID); - git_oid_fromstr(&their_oid, TWO_THEIR_OID); - - cl_git_pass(git_index_reuc_add(repo_index, "two.txt", - 0100644, &ancestor_oid, - 0100644, &our_oid, - 0100644, &their_oid)); - - git_oid_fromstr(&ancestor_oid, ONE_ANCESTOR_OID); - git_oid_fromstr(&our_oid, ONE_OUR_OID); - git_oid_fromstr(&their_oid, ONE_THEIR_OID); - - cl_git_pass(git_index_reuc_add(repo_index, "one.txt", - 0100644, &ancestor_oid, - 0100644, &our_oid, - 0100644, &their_oid)); - - cl_git_pass(git_index_write(repo_index)); - cl_assert_equal_i(2, git_index_reuc_entrycount(repo_index)); - - /* ensure sort order was round-tripped correct */ - cl_assert(reuc = git_index_reuc_get_byindex(repo_index, 0)); - cl_assert_equal_s("one.txt", reuc->path); - - cl_assert(reuc = git_index_reuc_get_byindex(repo_index, 1)); - cl_assert_equal_s("two.txt", reuc->path); -} - -static int reuc_entry_exists(void) -{ - return (git_index_reuc_get_bypath(repo_index, "newfile.txt") != NULL); -} - -void test_index_reuc__cleaned_on_reset_hard(void) -{ - git_object *target; - - cl_git_pass(git_revparse_single(&target, repo, "3a34580")); - - test_index_reuc__add(); - cl_git_pass(git_reset(repo, target, GIT_RESET_HARD, NULL)); - cl_assert(reuc_entry_exists() == false); - - git_object_free(target); -} - -void test_index_reuc__cleaned_on_reset_mixed(void) -{ - git_object *target; - - cl_git_pass(git_revparse_single(&target, repo, "3a34580")); - - test_index_reuc__add(); - cl_git_pass(git_reset(repo, target, GIT_RESET_MIXED, NULL)); - cl_assert(reuc_entry_exists() == false); - - git_object_free(target); -} - -void test_index_reuc__retained_on_reset_soft(void) -{ - git_object *target; - - cl_git_pass(git_revparse_single(&target, repo, "3a34580")); - - cl_git_pass(git_reset(repo, target, GIT_RESET_HARD, NULL)); - - test_index_reuc__add(); - cl_git_pass(git_reset(repo, target, GIT_RESET_SOFT, NULL)); - cl_assert(reuc_entry_exists() == true); - - git_object_free(target); -} - -void test_index_reuc__cleaned_on_checkout_tree(void) -{ - git_oid oid; - git_object *obj; - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - - opts.checkout_strategy = GIT_CHECKOUT_SAFE | GIT_CHECKOUT_UPDATE_ONLY; - - test_index_reuc__add(); - git_reference_name_to_id(&oid, repo, "refs/heads/master"); - git_object_lookup(&obj, repo, &oid, GIT_OBJ_ANY); - git_checkout_tree(repo, obj, &opts); - cl_assert(reuc_entry_exists() == false); - - git_object_free(obj); -} - -void test_index_reuc__cleaned_on_checkout_head(void) -{ - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - - opts.checkout_strategy = GIT_CHECKOUT_SAFE | GIT_CHECKOUT_UPDATE_ONLY; - - test_index_reuc__add(); - git_checkout_head(repo, &opts); - cl_assert(reuc_entry_exists() == false); -} - -void test_index_reuc__retained_on_checkout_index(void) -{ - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - - opts.checkout_strategy = GIT_CHECKOUT_SAFE | GIT_CHECKOUT_UPDATE_ONLY; - - test_index_reuc__add(); - git_checkout_index(repo, repo_index, &opts); - cl_assert(reuc_entry_exists() == true); -} diff --git a/vendor/libgit2/tests/index/stage.c b/vendor/libgit2/tests/index/stage.c deleted file mode 100644 index 58dc1fb5e..000000000 --- a/vendor/libgit2/tests/index/stage.c +++ /dev/null @@ -1,62 +0,0 @@ -#include "clar_libgit2.h" -#include "index.h" -#include "git2/repository.h" - -static git_repository *repo; -static git_index *repo_index; - -#define TEST_REPO_PATH "mergedrepo" -#define TEST_INDEX_PATH TEST_REPO_PATH "/.git/index" - -// Fixture setup and teardown -void test_index_stage__initialize(void) -{ - repo = cl_git_sandbox_init("mergedrepo"); - git_repository_index(&repo_index, repo); -} - -void test_index_stage__cleanup(void) -{ - git_index_free(repo_index); - repo_index = NULL; - - cl_git_sandbox_cleanup(); -} - - -void test_index_stage__add_always_adds_stage_0(void) -{ - size_t entry_idx; - const git_index_entry *entry; - - cl_git_mkfile("./mergedrepo/new-file.txt", "new-file\n"); - - cl_git_pass(git_index_add_bypath(repo_index, "new-file.txt")); - - cl_assert(!git_index_find(&entry_idx, repo_index, "new-file.txt")); - cl_assert((entry = git_index_get_byindex(repo_index, entry_idx)) != NULL); - cl_assert(git_index_entry_stage(entry) == 0); -} - -void test_index_stage__find_gets_first_stage(void) -{ - size_t entry_idx; - const git_index_entry *entry; - - cl_assert(!git_index_find(&entry_idx, repo_index, "one.txt")); - cl_assert((entry = git_index_get_byindex(repo_index, entry_idx)) != NULL); - cl_assert(git_index_entry_stage(entry) == 0); - - cl_assert(!git_index_find(&entry_idx, repo_index, "two.txt")); - cl_assert((entry = git_index_get_byindex(repo_index, entry_idx)) != NULL); - cl_assert(git_index_entry_stage(entry) == 0); - - cl_assert(!git_index_find(&entry_idx, repo_index, "conflicts-one.txt")); - cl_assert((entry = git_index_get_byindex(repo_index, entry_idx)) != NULL); - cl_assert(git_index_entry_stage(entry) == 1); - - cl_assert(!git_index_find(&entry_idx, repo_index, "conflicts-two.txt")); - cl_assert((entry = git_index_get_byindex(repo_index, entry_idx)) != NULL); - cl_assert(git_index_entry_stage(entry) == 1); -} - diff --git a/vendor/libgit2/tests/index/tests.c b/vendor/libgit2/tests/index/tests.c deleted file mode 100644 index 1498196b2..000000000 --- a/vendor/libgit2/tests/index/tests.c +++ /dev/null @@ -1,876 +0,0 @@ -#include "clar_libgit2.h" -#include "index.h" - -static const size_t index_entry_count = 109; -static const size_t index_entry_count_2 = 1437; -#define TEST_INDEX_PATH cl_fixture("testrepo.git/index") -#define TEST_INDEX2_PATH cl_fixture("gitgit.index") -#define TEST_INDEXBIG_PATH cl_fixture("big.index") -#define TEST_INDEXBAD_PATH cl_fixture("bad.index") - - -/* Suite data */ -struct test_entry { - size_t index; - char path[128]; - git_off_t file_size; - git_time_t mtime; -}; - -static struct test_entry test_entries[] = { - {4, "Makefile", 5064, 0x4C3F7F33}, - {62, "tests/Makefile", 2631, 0x4C3F7F33}, - {36, "src/index.c", 10014, 0x4C43368D}, - {6, "git.git-authors", 2709, 0x4C3F7F33}, - {48, "src/revobject.h", 1448, 0x4C3F7FE2} -}; - -/* Helpers */ -static void copy_file(const char *src, const char *dst) -{ - git_buf source_buf = GIT_BUF_INIT; - git_file dst_fd; - - cl_git_pass(git_futils_readbuffer(&source_buf, src)); - - dst_fd = git_futils_creat_withpath(dst, 0777, 0666); /* -V536 */ - if (dst_fd < 0) - goto cleanup; - - cl_git_pass(p_write(dst_fd, source_buf.ptr, source_buf.size)); - -cleanup: - git_buf_free(&source_buf); - p_close(dst_fd); -} - -static void files_are_equal(const char *a, const char *b) -{ - git_buf buf_a = GIT_BUF_INIT; - git_buf buf_b = GIT_BUF_INIT; - int pass; - - if (git_futils_readbuffer(&buf_a, a) < 0) - cl_assert(0); - - if (git_futils_readbuffer(&buf_b, b) < 0) { - git_buf_free(&buf_a); - cl_assert(0); - } - - pass = (buf_a.size == buf_b.size && !memcmp(buf_a.ptr, buf_b.ptr, buf_a.size)); - - git_buf_free(&buf_a); - git_buf_free(&buf_b); - - cl_assert(pass); -} - - -/* Fixture setup and teardown */ -void test_index_tests__initialize(void) -{ -} - -void test_index_tests__empty_index(void) -{ - git_index *index; - - cl_git_pass(git_index_open(&index, "in-memory-index")); - cl_assert(index->on_disk == 0); - - cl_assert(git_index_entrycount(index) == 0); - cl_assert(git_vector_is_sorted(&index->entries)); - - git_index_free(index); -} - -void test_index_tests__default_test_index(void) -{ - git_index *index; - unsigned int i; - git_index_entry **entries; - - cl_git_pass(git_index_open(&index, TEST_INDEX_PATH)); - cl_assert(index->on_disk); - - cl_assert(git_index_entrycount(index) == index_entry_count); - cl_assert(git_vector_is_sorted(&index->entries)); - - entries = (git_index_entry **)index->entries.contents; - - for (i = 0; i < ARRAY_SIZE(test_entries); ++i) { - git_index_entry *e = entries[test_entries[i].index]; - - cl_assert_equal_s(e->path, test_entries[i].path); - cl_assert_equal_i(e->mtime.seconds, test_entries[i].mtime); - cl_assert_equal_i(e->file_size, test_entries[i].file_size); - } - - git_index_free(index); -} - -void test_index_tests__gitgit_index(void) -{ - git_index *index; - - cl_git_pass(git_index_open(&index, TEST_INDEX2_PATH)); - cl_assert(index->on_disk); - - cl_assert(git_index_entrycount(index) == index_entry_count_2); - cl_assert(git_vector_is_sorted(&index->entries)); - cl_assert(index->tree != NULL); - - git_index_free(index); -} - -void test_index_tests__find_in_existing(void) -{ - git_index *index; - unsigned int i; - - cl_git_pass(git_index_open(&index, TEST_INDEX_PATH)); - - for (i = 0; i < ARRAY_SIZE(test_entries); ++i) { - size_t idx; - - cl_assert(!git_index_find(&idx, index, test_entries[i].path)); - cl_assert(idx == test_entries[i].index); - } - - git_index_free(index); -} - -void test_index_tests__find_in_empty(void) -{ - git_index *index; - unsigned int i; - - cl_git_pass(git_index_open(&index, "fake-index")); - - for (i = 0; i < ARRAY_SIZE(test_entries); ++i) { - cl_assert(GIT_ENOTFOUND == git_index_find(NULL, index, test_entries[i].path)); - } - - git_index_free(index); -} - -void test_index_tests__find_prefix(void) -{ - git_index *index; - const git_index_entry *entry; - size_t pos; - - cl_git_pass(git_index_open(&index, TEST_INDEX_PATH)); - - cl_git_pass(git_index_find_prefix(&pos, index, "src")); - entry = git_index_get_byindex(index, pos); - cl_assert(git__strcmp(entry->path, "src/block-sha1/sha1.c") == 0); - - cl_git_pass(git_index_find_prefix(&pos, index, "src/co")); - entry = git_index_get_byindex(index, pos); - cl_assert(git__strcmp(entry->path, "src/commit.c") == 0); - - cl_assert(GIT_ENOTFOUND == git_index_find_prefix(NULL, index, "blah")); - - git_index_free(index); -} - -void test_index_tests__write(void) -{ - git_index *index; - - copy_file(TEST_INDEXBIG_PATH, "index_rewrite"); - - cl_git_pass(git_index_open(&index, "index_rewrite")); - cl_assert(index->on_disk); - - cl_git_pass(git_index_write(index)); - files_are_equal(TEST_INDEXBIG_PATH, "index_rewrite"); - - git_index_free(index); - - p_unlink("index_rewrite"); -} - -void test_index_tests__sort0(void) -{ - /* sort the entires in an index */ - - /* - * TODO: This no longer applies: - * index sorting in Git uses some specific changes to the way - * directories are sorted. - * - * We need to specificially check for this by creating a new - * index, adding entries in random order and then - * checking for consistency - */ -} - -void test_index_tests__sort1(void) -{ - /* sort the entires in an empty index */ - git_index *index; - - cl_git_pass(git_index_open(&index, "fake-index")); - - /* FIXME: this test is slightly dumb */ - cl_assert(git_vector_is_sorted(&index->entries)); - - git_index_free(index); -} - -static void cleanup_myrepo(void *opaque) -{ - GIT_UNUSED(opaque); - cl_fixture_cleanup("myrepo"); -} - -void test_index_tests__add(void) -{ - git_index *index; - git_filebuf file = GIT_FILEBUF_INIT; - git_repository *repo; - const git_index_entry *entry; - git_oid id1; - - cl_set_cleanup(&cleanup_myrepo, NULL); - - /* Intialize a new repository */ - cl_git_pass(git_repository_init(&repo, "./myrepo", 0)); - - /* Ensure we're the only guy in the room */ - cl_git_pass(git_repository_index(&index, repo)); - cl_assert(git_index_entrycount(index) == 0); - - /* Create a new file in the working directory */ - cl_git_pass(git_futils_mkpath2file("myrepo/test.txt", 0777)); - cl_git_pass(git_filebuf_open(&file, "myrepo/test.txt", 0, 0666)); - cl_git_pass(git_filebuf_write(&file, "hey there\n", 10)); - cl_git_pass(git_filebuf_commit(&file)); - - /* Store the expected hash of the file/blob - * This has been generated by executing the following - * $ echo "hey there" | git hash-object --stdin - */ - cl_git_pass(git_oid_fromstr(&id1, "a8233120f6ad708f843d861ce2b7228ec4e3dec6")); - - /* Add the new file to the index */ - cl_git_pass(git_index_add_bypath(index, "test.txt")); - - /* Wow... it worked! */ - cl_assert(git_index_entrycount(index) == 1); - entry = git_index_get_byindex(index, 0); - - /* And the built-in hashing mechanism worked as expected */ - cl_assert_equal_oid(&id1, &entry->id); - - /* Test access by path instead of index */ - cl_assert((entry = git_index_get_bypath(index, "test.txt", 0)) != NULL); - cl_assert_equal_oid(&id1, &entry->id); - - git_index_free(index); - git_repository_free(repo); -} - -void test_index_tests__add_frombuffer(void) -{ - git_index *index; - git_repository *repo; - git_index_entry entry; - const git_index_entry *returned_entry; - - git_oid id1; - git_blob *blob; - - const char *content = "hey there\n"; - - cl_set_cleanup(&cleanup_myrepo, NULL); - - /* Intialize a new repository */ - cl_git_pass(git_repository_init(&repo, "./myrepo", 0)); - - /* Ensure we're the only guy in the room */ - cl_git_pass(git_repository_index(&index, repo)); - cl_assert(git_index_entrycount(index) == 0); - - /* Store the expected hash of the file/blob - * This has been generated by executing the following - * $ echo "hey there" | git hash-object --stdin - */ - cl_git_pass(git_oid_fromstr(&id1, "a8233120f6ad708f843d861ce2b7228ec4e3dec6")); - - /* Add the new file to the index */ - memset(&entry, 0x0, sizeof(git_index_entry)); - entry.mode = GIT_FILEMODE_BLOB; - entry.path = "test.txt"; - cl_git_pass(git_index_add_frombuffer(index, &entry, - content, strlen(content))); - - /* Wow... it worked! */ - cl_assert(git_index_entrycount(index) == 1); - returned_entry = git_index_get_byindex(index, 0); - - /* And the built-in hashing mechanism worked as expected */ - cl_assert_equal_oid(&id1, &returned_entry->id); - /* And mode is the one asked */ - cl_assert_equal_i(GIT_FILEMODE_BLOB, returned_entry->mode); - - /* Test access by path instead of index */ - cl_assert((returned_entry = git_index_get_bypath(index, "test.txt", 0)) != NULL); - cl_assert_equal_oid(&id1, &returned_entry->id); - - /* Test the blob is in the repository */ - cl_git_pass(git_blob_lookup(&blob, repo, &id1)); - cl_assert_equal_s( - content, git_blob_rawcontent(blob)); - git_blob_free(blob); - - git_index_free(index); - git_repository_free(repo); -} - -void test_index_tests__add_frombuffer_reset_entry(void) -{ - git_index *index; - git_repository *repo; - git_index_entry entry; - const git_index_entry *returned_entry; - git_filebuf file = GIT_FILEBUF_INIT; - - git_oid id1; - git_blob *blob; - const char *old_content = "here\n"; - const char *content = "hey there\n"; - - cl_set_cleanup(&cleanup_myrepo, NULL); - - /* Intialize a new repository */ - cl_git_pass(git_repository_init(&repo, "./myrepo", 0)); - cl_git_pass(git_repository_index(&index, repo)); - cl_git_pass(git_futils_mkpath2file("myrepo/test.txt", 0777)); - cl_git_pass(git_filebuf_open(&file, "myrepo/test.txt", 0, 0666)); - cl_git_pass(git_filebuf_write(&file, old_content, strlen(old_content))); - cl_git_pass(git_filebuf_commit(&file)); - - /* Store the expected hash of the file/blob - * This has been generated by executing the following - * $ echo "hey there" | git hash-object --stdin - */ - cl_git_pass(git_oid_fromstr(&id1, "a8233120f6ad708f843d861ce2b7228ec4e3dec6")); - - cl_git_pass(git_index_add_bypath(index, "test.txt")); - - /* Add the new file to the index */ - memset(&entry, 0x0, sizeof(git_index_entry)); - entry.mode = GIT_FILEMODE_BLOB; - entry.path = "test.txt"; - cl_git_pass(git_index_add_frombuffer(index, &entry, - content, strlen(content))); - - /* Wow... it worked! */ - cl_assert(git_index_entrycount(index) == 1); - returned_entry = git_index_get_byindex(index, 0); - - /* And the built-in hashing mechanism worked as expected */ - cl_assert_equal_oid(&id1, &returned_entry->id); - /* And mode is the one asked */ - cl_assert_equal_i(GIT_FILEMODE_BLOB, returned_entry->mode); - - /* Test access by path instead of index */ - cl_assert((returned_entry = git_index_get_bypath(index, "test.txt", 0)) != NULL); - cl_assert_equal_oid(&id1, &returned_entry->id); - cl_assert_equal_i(0, returned_entry->dev); - cl_assert_equal_i(0, returned_entry->ino); - cl_assert_equal_i(0, returned_entry->uid); - cl_assert_equal_i(0, returned_entry->uid); - cl_assert_equal_i(10, returned_entry->file_size); - - /* Test the blob is in the repository */ - cl_git_pass(git_blob_lookup(&blob, repo, &id1)); - cl_assert_equal_s(content, git_blob_rawcontent(blob)); - git_blob_free(blob); - - git_index_free(index); - git_repository_free(repo); -} - -static void cleanup_1397(void *opaque) -{ - GIT_UNUSED(opaque); - cl_git_sandbox_cleanup(); -} - -void test_index_tests__add_issue_1397(void) -{ - git_index *index; - git_repository *repo; - const git_index_entry *entry; - git_oid id1; - - cl_set_cleanup(&cleanup_1397, NULL); - - repo = cl_git_sandbox_init("issue_1397"); - - cl_repo_set_bool(repo, "core.autocrlf", true); - - /* Ensure we're the only guy in the room */ - cl_git_pass(git_repository_index(&index, repo)); - - /* Store the expected hash of the file/blob - * This has been generated by executing the following - * $ git hash-object crlf_file.txt - */ - cl_git_pass(git_oid_fromstr(&id1, "8312e0889a9cbab77c732b6bc39b51a683e3a318")); - - /* Make sure the initial SHA-1 is correct */ - cl_assert((entry = git_index_get_bypath(index, "crlf_file.txt", 0)) != NULL); - cl_assert_equal_oid(&id1, &entry->id); - - /* Update the index */ - cl_git_pass(git_index_add_bypath(index, "crlf_file.txt")); - - /* Check the new SHA-1 */ - cl_assert((entry = git_index_get_bypath(index, "crlf_file.txt", 0)) != NULL); - cl_assert_equal_oid(&id1, &entry->id); - - git_index_free(index); -} - -void test_index_tests__add_bypath_to_a_bare_repository_returns_EBAREPO(void) -{ - git_repository *bare_repo; - git_index *index; - - cl_git_pass(git_repository_open(&bare_repo, cl_fixture("testrepo.git"))); - cl_git_pass(git_repository_index(&index, bare_repo)); - - cl_assert_equal_i(GIT_EBAREREPO, git_index_add_bypath(index, "test.txt")); - - git_index_free(index); - git_repository_free(bare_repo); -} - -static void add_invalid_filename(git_repository *repo, const char *fn) -{ - git_index *index; - git_buf path = GIT_BUF_INIT; - - cl_git_pass(git_repository_index(&index, repo)); - cl_assert(git_index_entrycount(index) == 0); - - git_buf_joinpath(&path, "./invalid", fn); - - cl_git_mkfile(path.ptr, NULL); - cl_git_fail(git_index_add_bypath(index, fn)); - cl_must_pass(p_unlink(path.ptr)); - - cl_assert(git_index_entrycount(index) == 0); - - git_buf_free(&path); - git_index_free(index); -} - -/* Test that writing an invalid filename fails */ -void test_index_tests__add_invalid_filename(void) -{ - git_repository *repo; - - p_mkdir("invalid", 0700); - - cl_git_pass(git_repository_init(&repo, "./invalid", 0)); - cl_must_pass(p_mkdir("./invalid/subdir", 0777)); - - /* cl_git_mkfile() needs the dir to exist */ - if (!git_path_exists("./invalid/.GIT")) - cl_must_pass(p_mkdir("./invalid/.GIT", 0777)); - if (!git_path_exists("./invalid/.GiT")) - cl_must_pass(p_mkdir("./invalid/.GiT", 0777)); - - add_invalid_filename(repo, ".git/hello"); - add_invalid_filename(repo, ".GIT/hello"); - add_invalid_filename(repo, ".GiT/hello"); - add_invalid_filename(repo, "./.git/hello"); - add_invalid_filename(repo, "./foo"); - add_invalid_filename(repo, "./bar"); - add_invalid_filename(repo, "subdir/../bar"); - - git_repository_free(repo); - - cl_fixture_cleanup("invalid"); -} - -static void replace_char(char *str, char in, char out) -{ - char *c = str; - - while (*c++) - if (*c == in) - *c = out; -} - -static void write_invalid_filename(git_repository *repo, const char *fn_orig) -{ - git_index *index; - git_oid expected; - const git_index_entry *entry; - git_buf path = GIT_BUF_INIT; - char *fn; - - cl_git_pass(git_repository_index(&index, repo)); - cl_assert(git_index_entrycount(index) == 0); - - /* - * Sneak a valid path into the index, we'll update it - * to an invalid path when we try to write the index. - */ - fn = git__strdup(fn_orig); - replace_char(fn, '/', '_'); - - git_buf_joinpath(&path, "./invalid", fn); - - cl_git_mkfile(path.ptr, NULL); - - cl_git_pass(git_index_add_bypath(index, fn)); - - cl_assert(entry = git_index_get_bypath(index, fn, 0)); - - /* kids, don't try this at home */ - replace_char((char *)entry->path, '_', '/'); - - /* write-tree */ - cl_git_fail(git_index_write_tree(&expected, index)); - - p_unlink(path.ptr); - - cl_git_pass(git_index_remove_all(index, NULL, NULL, NULL)); - git_buf_free(&path); - git_index_free(index); - git__free(fn); -} - -/* Test that writing an invalid filename fails */ -void test_index_tests__write_invalid_filename(void) -{ - git_repository *repo; - - p_mkdir("invalid", 0700); - - cl_git_pass(git_repository_init(&repo, "./invalid", 0)); - - write_invalid_filename(repo, ".git/hello"); - write_invalid_filename(repo, ".GIT/hello"); - write_invalid_filename(repo, ".GiT/hello"); - write_invalid_filename(repo, "./.git/hello"); - write_invalid_filename(repo, "./foo"); - write_invalid_filename(repo, "./bar"); - write_invalid_filename(repo, "foo/../bar"); - - git_repository_free(repo); - - cl_fixture_cleanup("invalid"); -} - -void test_index_tests__honors_protect_filesystems(void) -{ - git_repository *repo; - - p_mkdir("invalid", 0700); - - cl_git_pass(git_repository_init(&repo, "./invalid", 0)); - - cl_repo_set_bool(repo, "core.protectHFS", true); - cl_repo_set_bool(repo, "core.protectNTFS", true); - - write_invalid_filename(repo, ".git./hello"); - write_invalid_filename(repo, ".git\xe2\x80\xad/hello"); - write_invalid_filename(repo, "git~1/hello"); - write_invalid_filename(repo, ".git\xe2\x81\xaf/hello"); - - git_repository_free(repo); - - cl_fixture_cleanup("invalid"); -} - -void test_index_tests__remove_entry(void) -{ - git_repository *repo; - git_index *index; - - p_mkdir("index_test", 0770); - - cl_git_pass(git_repository_init(&repo, "index_test", 0)); - cl_git_pass(git_repository_index(&index, repo)); - cl_assert(git_index_entrycount(index) == 0); - - cl_git_mkfile("index_test/hello", NULL); - cl_git_pass(git_index_add_bypath(index, "hello")); - cl_git_pass(git_index_write(index)); - - cl_git_pass(git_index_read(index, true)); /* reload */ - cl_assert(git_index_entrycount(index) == 1); - cl_assert(git_index_get_bypath(index, "hello", 0) != NULL); - - cl_git_pass(git_index_remove(index, "hello", 0)); - cl_git_pass(git_index_write(index)); - - cl_git_pass(git_index_read(index, true)); /* reload */ - cl_assert(git_index_entrycount(index) == 0); - cl_assert(git_index_get_bypath(index, "hello", 0) == NULL); - - git_index_free(index); - git_repository_free(repo); - cl_fixture_cleanup("index_test"); -} - -void test_index_tests__remove_directory(void) -{ - git_repository *repo; - git_index *index; - - p_mkdir("index_test", 0770); - - cl_git_pass(git_repository_init(&repo, "index_test", 0)); - cl_git_pass(git_repository_index(&index, repo)); - cl_assert_equal_i(0, (int)git_index_entrycount(index)); - - p_mkdir("index_test/a", 0770); - cl_git_mkfile("index_test/a/1.txt", NULL); - cl_git_mkfile("index_test/a/2.txt", NULL); - cl_git_mkfile("index_test/a/3.txt", NULL); - cl_git_mkfile("index_test/b.txt", NULL); - - cl_git_pass(git_index_add_bypath(index, "a/1.txt")); - cl_git_pass(git_index_add_bypath(index, "a/2.txt")); - cl_git_pass(git_index_add_bypath(index, "a/3.txt")); - cl_git_pass(git_index_add_bypath(index, "b.txt")); - cl_git_pass(git_index_write(index)); - - cl_git_pass(git_index_read(index, true)); /* reload */ - cl_assert_equal_i(4, (int)git_index_entrycount(index)); - cl_assert(git_index_get_bypath(index, "a/1.txt", 0) != NULL); - cl_assert(git_index_get_bypath(index, "a/2.txt", 0) != NULL); - cl_assert(git_index_get_bypath(index, "b.txt", 0) != NULL); - - cl_git_pass(git_index_remove(index, "a/1.txt", 0)); - cl_git_pass(git_index_write(index)); - - cl_git_pass(git_index_read(index, true)); /* reload */ - cl_assert_equal_i(3, (int)git_index_entrycount(index)); - cl_assert(git_index_get_bypath(index, "a/1.txt", 0) == NULL); - cl_assert(git_index_get_bypath(index, "a/2.txt", 0) != NULL); - cl_assert(git_index_get_bypath(index, "b.txt", 0) != NULL); - - cl_git_pass(git_index_remove_directory(index, "a", 0)); - cl_git_pass(git_index_write(index)); - - cl_git_pass(git_index_read(index, true)); /* reload */ - cl_assert_equal_i(1, (int)git_index_entrycount(index)); - cl_assert(git_index_get_bypath(index, "a/1.txt", 0) == NULL); - cl_assert(git_index_get_bypath(index, "a/2.txt", 0) == NULL); - cl_assert(git_index_get_bypath(index, "b.txt", 0) != NULL); - - git_index_free(index); - git_repository_free(repo); - cl_fixture_cleanup("index_test"); -} - -void test_index_tests__preserves_case(void) -{ - git_repository *repo; - git_index *index; - const git_index_entry *entry; - int index_caps; - - cl_set_cleanup(&cleanup_myrepo, NULL); - - cl_git_pass(git_repository_init(&repo, "./myrepo", 0)); - cl_git_pass(git_repository_index(&index, repo)); - - index_caps = git_index_caps(index); - - cl_git_rewritefile("myrepo/test.txt", "hey there\n"); - cl_git_pass(git_index_add_bypath(index, "test.txt")); - - cl_git_pass(p_rename("myrepo/test.txt", "myrepo/TEST.txt")); - cl_git_rewritefile("myrepo/TEST.txt", "hello again\n"); - cl_git_pass(git_index_add_bypath(index, "TEST.txt")); - - if (index_caps & GIT_INDEXCAP_IGNORE_CASE) - cl_assert_equal_i(1, (int)git_index_entrycount(index)); - else - cl_assert_equal_i(2, (int)git_index_entrycount(index)); - - /* Test access by path instead of index */ - cl_assert((entry = git_index_get_bypath(index, "test.txt", 0)) != NULL); - /* The path should *not* have changed without an explicit remove */ - cl_assert(git__strcmp(entry->path, "test.txt") == 0); - - cl_assert((entry = git_index_get_bypath(index, "TEST.txt", 0)) != NULL); - if (index_caps & GIT_INDEXCAP_IGNORE_CASE) - /* The path should *not* have changed without an explicit remove */ - cl_assert(git__strcmp(entry->path, "test.txt") == 0); - else - cl_assert(git__strcmp(entry->path, "TEST.txt") == 0); - - git_index_free(index); - git_repository_free(repo); -} - -void test_index_tests__elocked(void) -{ - git_repository *repo; - git_index *index; - git_filebuf file = GIT_FILEBUF_INIT; - const git_error *err; - int error; - - cl_set_cleanup(&cleanup_myrepo, NULL); - - cl_git_pass(git_repository_init(&repo, "./myrepo", 0)); - cl_git_pass(git_repository_index(&index, repo)); - - /* Lock the index file so we fail to lock it */ - cl_git_pass(git_filebuf_open(&file, index->index_file_path, 0, 0666)); - error = git_index_write(index); - cl_assert_equal_i(GIT_ELOCKED, error); - - err = giterr_last(); - cl_assert_equal_i(err->klass, GITERR_INDEX); - - git_filebuf_cleanup(&file); - git_index_free(index); - git_repository_free(repo); -} - -void test_index_tests__reload_from_disk(void) -{ - git_repository *repo; - git_index *read_index; - git_index *write_index; - - cl_set_cleanup(&cleanup_myrepo, NULL); - - cl_git_pass(git_futils_mkdir("./myrepo", 0777, GIT_MKDIR_PATH)); - cl_git_mkfile("./myrepo/a.txt", "a\n"); - cl_git_mkfile("./myrepo/b.txt", "b\n"); - - cl_git_pass(git_repository_init(&repo, "./myrepo", 0)); - cl_git_pass(git_repository_index(&write_index, repo)); - cl_assert_equal_i(false, write_index->on_disk); - - cl_git_pass(git_index_open(&read_index, write_index->index_file_path)); - cl_assert_equal_i(false, read_index->on_disk); - - /* Stage two new files against the write_index */ - cl_git_pass(git_index_add_bypath(write_index, "a.txt")); - cl_git_pass(git_index_add_bypath(write_index, "b.txt")); - - cl_assert_equal_sz(2, git_index_entrycount(write_index)); - - /* Persist the index changes to disk */ - cl_git_pass(git_index_write(write_index)); - cl_assert_equal_i(true, write_index->on_disk); - - /* Sync the changes back into the read_index */ - cl_assert_equal_sz(0, git_index_entrycount(read_index)); - - cl_git_pass(git_index_read(read_index, true)); - cl_assert_equal_i(true, read_index->on_disk); - - cl_assert_equal_sz(2, git_index_entrycount(read_index)); - - /* Remove the index file from the filesystem */ - cl_git_pass(p_unlink(write_index->index_file_path)); - - /* Sync the changes back into the read_index */ - cl_git_pass(git_index_read(read_index, true)); - cl_assert_equal_i(false, read_index->on_disk); - cl_assert_equal_sz(0, git_index_entrycount(read_index)); - - git_index_free(read_index); - git_index_free(write_index); - git_repository_free(repo); -} - -void test_index_tests__corrupted_extension(void) -{ - git_index *index; - - cl_git_fail_with(git_index_open(&index, TEST_INDEXBAD_PATH), GIT_ERROR); -} - -void test_index_tests__reload_while_ignoring_case(void) -{ - git_index *index; - unsigned int caps; - - cl_git_pass(git_index_open(&index, TEST_INDEX_PATH)); - cl_git_pass(git_vector_verify_sorted(&index->entries)); - - caps = git_index_caps(index); - cl_git_pass(git_index_set_caps(index, caps &= ~GIT_INDEXCAP_IGNORE_CASE)); - cl_git_pass(git_index_read(index, true)); - cl_git_pass(git_vector_verify_sorted(&index->entries)); - cl_assert(git_index_get_bypath(index, ".HEADER", 0)); - cl_assert_equal_p(NULL, git_index_get_bypath(index, ".header", 0)); - - cl_git_pass(git_index_set_caps(index, caps | GIT_INDEXCAP_IGNORE_CASE)); - cl_git_pass(git_index_read(index, true)); - cl_git_pass(git_vector_verify_sorted(&index->entries)); - cl_assert(git_index_get_bypath(index, ".HEADER", 0)); - cl_assert(git_index_get_bypath(index, ".header", 0)); - - git_index_free(index); -} - -void test_index_tests__change_icase_on_instance(void) -{ - git_index *index; - unsigned int caps; - const git_index_entry *e; - - cl_git_pass(git_index_open(&index, TEST_INDEX_PATH)); - cl_git_pass(git_vector_verify_sorted(&index->entries)); - - caps = git_index_caps(index); - cl_git_pass(git_index_set_caps(index, caps &= ~GIT_INDEXCAP_IGNORE_CASE)); - cl_assert_equal_i(false, index->ignore_case); - cl_git_pass(git_vector_verify_sorted(&index->entries)); - cl_assert(e = git_index_get_bypath(index, "src/common.h", 0)); - cl_assert_equal_p(NULL, e = git_index_get_bypath(index, "SRC/Common.h", 0)); - cl_assert(e = git_index_get_bypath(index, "COPYING", 0)); - cl_assert_equal_p(NULL, e = git_index_get_bypath(index, "copying", 0)); - - cl_git_pass(git_index_set_caps(index, caps | GIT_INDEXCAP_IGNORE_CASE)); - cl_assert_equal_i(true, index->ignore_case); - cl_git_pass(git_vector_verify_sorted(&index->entries)); - cl_assert(e = git_index_get_bypath(index, "COPYING", 0)); - cl_assert_equal_s("COPYING", e->path); - cl_assert(e = git_index_get_bypath(index, "copying", 0)); - cl_assert_equal_s("COPYING", e->path); - - git_index_free(index); -} - -void test_index_tests__can_lock_index(void) -{ - git_index *index; - git_indexwriter one = GIT_INDEXWRITER_INIT, - two = GIT_INDEXWRITER_INIT; - - cl_git_pass(git_index_open(&index, TEST_INDEX_PATH)); - cl_git_pass(git_indexwriter_init(&one, index)); - - cl_git_fail_with(GIT_ELOCKED, git_indexwriter_init(&two, index)); - cl_git_fail_with(GIT_ELOCKED, git_index_write(index)); - - cl_git_pass(git_indexwriter_commit(&one)); - - cl_git_pass(git_index_write(index)); - - git_indexwriter_cleanup(&one); - git_indexwriter_cleanup(&two); - git_index_free(index); -} diff --git a/vendor/libgit2/tests/main.c b/vendor/libgit2/tests/main.c deleted file mode 100644 index f67c8ffbc..000000000 --- a/vendor/libgit2/tests/main.c +++ /dev/null @@ -1,27 +0,0 @@ -#include "clar_libgit2.h" -#include "clar_libgit2_trace.h" - -#ifdef _WIN32 -int __cdecl main(int argc, char *argv[]) -#else -int main(int argc, char *argv[]) -#endif -{ - int res; - - clar_test_init(argc, argv); - - git_libgit2_init(); - cl_global_trace_register(); - cl_sandbox_set_search_path_defaults(); - - /* Run the test suite */ - res = clar_test_run(); - - clar_test_shutdown(); - - cl_global_trace_disable(); - git_libgit2_shutdown(); - - return res; -} diff --git a/vendor/libgit2/tests/merge/conflict_data.h b/vendor/libgit2/tests/merge/conflict_data.h deleted file mode 100644 index e6394a9e8..000000000 --- a/vendor/libgit2/tests/merge/conflict_data.h +++ /dev/null @@ -1,103 +0,0 @@ -#define AUTOMERGEABLE_MERGED_FILE \ - "this file is changed in master\n" \ - "this file is automergeable\n" \ - "this file is automergeable\n" \ - "this file is automergeable\n" \ - "this file is automergeable\n" \ - "this file is automergeable\n" \ - "this file is automergeable\n" \ - "this file is automergeable\n" \ - "this file is changed in branch\n" - -#define AUTOMERGEABLE_MERGED_FILE_CRLF \ - "this file is changed in master\r\n" \ - "this file is automergeable\r\n" \ - "this file is automergeable\r\n" \ - "this file is automergeable\r\n" \ - "this file is automergeable\r\n" \ - "this file is automergeable\r\n" \ - "this file is automergeable\r\n" \ - "this file is automergeable\r\n" \ - "this file is changed in branch\r\n" - -#define CONFLICTING_MERGE_FILE \ - "<<<<<<< HEAD\n" \ - "this file is changed in master and branch\n" \ - "=======\n" \ - "this file is changed in branch and master\n" \ - ">>>>>>> 7cb63eed597130ba4abb87b3e544b85021905520\n" - -#define CONFLICTING_DIFF3_FILE \ - "<<<<<<< HEAD\n" \ - "this file is changed in master and branch\n" \ - "||||||| initial\n" \ - "this file is a conflict\n" \ - "=======\n" \ - "this file is changed in branch and master\n" \ - ">>>>>>> 7cb63eed597130ba4abb87b3e544b85021905520\n" - -#define CONFLICTING_UNION_FILE \ - "this file is changed in master and branch\n" \ - "this file is changed in branch and master\n" - -#define CONFLICTING_RECURSIVE_F1_TO_F2 \ - "VEAL SOUP.\n" \ - "\n" \ - "<<<<<<< HEAD\n" \ - "PUT INTO A POT THREE QUARTS OF WATER, three onions cut small, ONE\n" \ - "=======\n" \ - "PUT INTO A POT THREE QUARTS OF WATER, three onions cut not too small, one\n" \ - ">>>>>>> branchF-2\n" \ - "spoonful of black pepper pounded, and two of salt, with two or three\n" \ - "slices of lean ham; let it boil steadily two hours; skim it\n" \ - "occasionally, then put into it a shin of veal, let it boil two hours\n" \ - "longer; take out the slices of ham, and skim off the grease if any\n" \ - "should rise, take a gill of good cream, mix with it two table-spoonsful\n" \ - "of flour very nicely, and the yelks of two eggs beaten well, strain this\n" \ - "mixture, and add some chopped parsley; pour some soup on by degrees,\n" \ - "stir it well, and pour it into the pot, continuing to stir until it has\n" \ - "boiled two or three minutes to take off the raw taste of the eggs. If\n" \ - "the cream be not perfectly sweet, and the eggs quite new, the thickening\n" \ - "will curdle in the soup. For a change you may put a dozen ripe tomatos\n" \ - "in, first taking off their skins, by letting them stand a few minutes in\n" \ - "hot water, when they may be easily peeled. When made in this way you\n" \ - "must thicken it with the flour only. Any part of the veal may be used,\n" \ - "but the shin or knuckle is the nicest.\n" \ - "\n" \ - "<<<<<<< HEAD\n" \ - "This certainly is a mighty fine recipe.\n" \ - "=======\n" \ - "This is a mighty fine recipe!\n" \ - ">>>>>>> branchF-2\n" - -#define CONFLICTING_RECURSIVE_H1_TO_H2_WITH_DIFF3 \ - "VEAL SOUP.\n" \ - "\n" \ - "<<<<<<< HEAD\n" \ - "put into a pot three quarts of water, three onions cut small, one\n" \ - "||||||| merged common ancestors\n" \ - "<<<<<<< Temporary merge branch 1\n" \ - "Put into a pot three quarts of water, THREE ONIONS CUT SMALL, one\n" \ - "||||||| merged common ancestors\n" \ - "Put into a pot three quarts of water, three onions cut small, one\n" \ - "=======\n" \ - "PUT INTO A POT three quarts of water, three onions cut small, one\n" \ - ">>>>>>> Temporary merge branch 2\n" \ - "=======\n" \ - "Put Into A Pot Three Quarts of Water, Three Onions Cut Small, One\n" \ - ">>>>>>> branchH-2\n" \ - "spoonful of black pepper pounded, and two of salt, with two or three\n" \ - "slices of lean ham; let it boil steadily two hours; skim it\n" \ - "occasionally, then put into it a shin of veal, let it boil two hours\n" \ - "longer; take out the slices of ham, and skim off the grease if any\n" \ - "should rise, take a gill of good cream, mix with it two table-spoonsful\n" \ - "of flour very nicely, and the yelks of two eggs beaten well, strain this\n" \ - "mixture, and add some chopped parsley; pour some soup on by degrees,\n" \ - "stir it well, and pour it into the pot, continuing to stir until it has\n" \ - "boiled two or three minutes to take off the raw taste of the eggs. If\n" \ - "the cream be not perfectly sweet, and the eggs quite new, the thickening\n" \ - "will curdle in the soup. For a change you may put a dozen ripe tomatos\n" \ - "in, first taking off their skins, by letting them stand a few minutes in\n" \ - "hot water, when they may be easily peeled. When made in this way you\n" \ - "must thicken it with the flour only. Any part of the veal may be used,\n" \ - "but the shin or knuckle is the nicest.\n" diff --git a/vendor/libgit2/tests/merge/files.c b/vendor/libgit2/tests/merge/files.c deleted file mode 100644 index daa73fada..000000000 --- a/vendor/libgit2/tests/merge/files.c +++ /dev/null @@ -1,379 +0,0 @@ -#include "clar_libgit2.h" -#include "git2/repository.h" -#include "git2/merge.h" -#include "buffer.h" -#include "merge.h" -#include "merge_helpers.h" -#include "conflict_data.h" -#include "refs.h" -#include "fileops.h" -#include "diff_xdiff.h" - -#define TEST_REPO_PATH "merge-resolve" -#define TEST_INDEX_PATH TEST_REPO_PATH "/.git/index" - -static git_repository *repo; -static git_index *repo_index; - -// Fixture setup and teardown -void test_merge_files__initialize(void) -{ - git_config *cfg; - - repo = cl_git_sandbox_init(TEST_REPO_PATH); - git_repository_index(&repo_index, repo); - - /* Ensure that the user's merge.conflictstyle doesn't interfere */ - cl_git_pass(git_repository_config(&cfg, repo)); - cl_git_pass(git_config_set_string(cfg, "merge.conflictstyle", "merge")); - git_config_free(cfg); -} - -void test_merge_files__cleanup(void) -{ - git_index_free(repo_index); - cl_git_sandbox_cleanup(); -} - -void test_merge_files__automerge_from_bufs(void) -{ - git_merge_file_input ancestor = GIT_MERGE_FILE_INPUT_INIT, - ours = GIT_MERGE_FILE_INPUT_INIT, - theirs = GIT_MERGE_FILE_INPUT_INIT; - git_merge_file_result result = {0}; - const char *expected = "Zero\n1\n2\n3\n4\n5\n6\n7\n8\n9\nTen\n"; - - ancestor.ptr = "0\n1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n"; - ancestor.size = strlen(ancestor.ptr); - ancestor.path = "testfile.txt"; - ancestor.mode = 0100755; - - ours.ptr = "Zero\n1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n"; - ours.size = strlen(ours.ptr); - ours.path = "testfile.txt"; - ours.mode = 0100755; - - theirs.ptr = "0\n1\n2\n3\n4\n5\n6\n7\n8\n9\nTen\n"; - theirs.size = strlen(theirs.ptr); - theirs.path = "testfile.txt"; - theirs.mode = 0100755; - - cl_git_pass(git_merge_file(&result, &ancestor, &ours, &theirs, 0)); - - cl_assert_equal_i(1, result.automergeable); - - cl_assert_equal_s("testfile.txt", result.path); - cl_assert_equal_i(0100755, result.mode); - - cl_assert_equal_i(strlen(expected), result.len); - cl_assert_equal_strn(expected, result.ptr, result.len); - - git_merge_file_result_free(&result); -} - -void test_merge_files__automerge_use_best_path_and_mode(void) -{ - git_merge_file_input ancestor = GIT_MERGE_FILE_INPUT_INIT, - ours = GIT_MERGE_FILE_INPUT_INIT, - theirs = GIT_MERGE_FILE_INPUT_INIT; - git_merge_file_result result = {0}; - const char *expected = "Zero\n1\n2\n3\n4\n5\n6\n7\n8\n9\nTen\n"; - - ancestor.ptr = "0\n1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n"; - ancestor.size = strlen(ancestor.ptr); - ancestor.path = "testfile.txt"; - ancestor.mode = 0100755; - - ours.ptr = "Zero\n1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n"; - ours.size = strlen(ours.ptr); - ours.path = "testfile.txt"; - ours.mode = 0100644; - - theirs.ptr = "0\n1\n2\n3\n4\n5\n6\n7\n8\n9\nTen\n"; - theirs.size = strlen(theirs.ptr); - theirs.path = "theirs.txt"; - theirs.mode = 0100755; - - cl_git_pass(git_merge_file(&result, &ancestor, &ours, &theirs, 0)); - - cl_assert_equal_i(1, result.automergeable); - - cl_assert_equal_s("theirs.txt", result.path); - cl_assert_equal_i(0100644, result.mode); - - cl_assert_equal_i(strlen(expected), result.len); - cl_assert_equal_strn(expected, result.ptr, result.len); - - git_merge_file_result_free(&result); -} - -void test_merge_files__conflict_from_bufs(void) -{ - git_merge_file_input ancestor = GIT_MERGE_FILE_INPUT_INIT, - ours = GIT_MERGE_FILE_INPUT_INIT, - theirs = GIT_MERGE_FILE_INPUT_INIT; - git_merge_file_result result = {0}; - - const char *expected = "<<<<<<< testfile.txt\nAloha!\nOurs.\n=======\nHi!\nTheirs.\n>>>>>>> theirs.txt\n"; - size_t expected_len = strlen(expected); - - ancestor.ptr = "Hello!\nAncestor!\n"; - ancestor.size = strlen(ancestor.ptr); - ancestor.path = "testfile.txt"; - ancestor.mode = 0100755; - - ours.ptr = "Aloha!\nOurs.\n"; - ours.size = strlen(ours.ptr); - ours.path = "testfile.txt"; - ours.mode = 0100644; - - theirs.ptr = "Hi!\nTheirs.\n"; - theirs.size = strlen(theirs.ptr); - theirs.path = "theirs.txt"; - theirs.mode = 0100755; - - cl_git_pass(git_merge_file(&result, &ancestor, &ours, &theirs, NULL)); - - cl_assert_equal_i(0, result.automergeable); - - cl_assert_equal_s("theirs.txt", result.path); - cl_assert_equal_i(0100644, result.mode); - - cl_assert_equal_i(expected_len, result.len); - cl_assert_equal_strn(expected, result.ptr, expected_len); - - git_merge_file_result_free(&result); -} - -void test_merge_files__automerge_from_index(void) -{ - git_merge_file_result result = {0}; - git_index_entry ancestor, ours, theirs; - - git_oid_fromstr(&ancestor.id, "6212c31dab5e482247d7977e4f0dd3601decf13b"); - ancestor.path = "automergeable.txt"; - ancestor.mode = 0100644; - - git_oid_fromstr(&ours.id, "ee3fa1b8c00aff7fe02065fdb50864bb0d932ccf"); - ours.path = "automergeable.txt"; - ours.mode = 0100755; - - git_oid_fromstr(&theirs.id, "058541fc37114bfc1dddf6bd6bffc7fae5c2e6fe"); - theirs.path = "newname.txt"; - theirs.mode = 0100644; - - cl_git_pass(git_merge_file_from_index(&result, repo, - &ancestor, &ours, &theirs, 0)); - - cl_assert_equal_i(1, result.automergeable); - - cl_assert_equal_s("newname.txt", result.path); - cl_assert_equal_i(0100755, result.mode); - - cl_assert_equal_i(strlen(AUTOMERGEABLE_MERGED_FILE), result.len); - cl_assert_equal_strn(AUTOMERGEABLE_MERGED_FILE, result.ptr, result.len); - - git_merge_file_result_free(&result); -} - -void test_merge_files__automerge_whitespace_eol(void) -{ - git_merge_file_input ancestor = GIT_MERGE_FILE_INPUT_INIT, - ours = GIT_MERGE_FILE_INPUT_INIT, - theirs = GIT_MERGE_FILE_INPUT_INIT; - git_merge_file_options opts = GIT_MERGE_FILE_OPTIONS_INIT; - git_merge_file_result result = {0}; - const char *expected = "Zero\n1\n2\n3\n4\n5\n6\n7\n8\n9\nTen\n"; - - ancestor.ptr = "0 \n1\n2\n3\n4\n5\n6\n7\n8\n9\n10 \n"; - ancestor.size = strlen(ancestor.ptr); - ancestor.path = "testfile.txt"; - ancestor.mode = 0100755; - - ours.ptr = "Zero\n1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n"; - ours.size = strlen(ours.ptr); - ours.path = "testfile.txt"; - ours.mode = 0100755; - - theirs.ptr = "0\n1\n2\n3\n4\n5\n6\n7\n8\n9\nTen\n"; - theirs.size = strlen(theirs.ptr); - theirs.path = "testfile.txt"; - theirs.mode = 0100755; - - opts.flags |= GIT_MERGE_FILE_IGNORE_WHITESPACE_EOL; - cl_git_pass(git_merge_file(&result, &ancestor, &ours, &theirs, &opts)); - - cl_assert_equal_i(1, result.automergeable); - - cl_assert_equal_s("testfile.txt", result.path); - cl_assert_equal_i(0100755, result.mode); - - cl_assert_equal_i(strlen(expected), result.len); - cl_assert_equal_strn(expected, result.ptr, result.len); - - git_merge_file_result_free(&result); -} - -void test_merge_files__automerge_whitespace_change(void) -{ - git_merge_file_input ancestor = GIT_MERGE_FILE_INPUT_INIT, - ours = GIT_MERGE_FILE_INPUT_INIT, - theirs = GIT_MERGE_FILE_INPUT_INIT; - git_merge_file_options opts = GIT_MERGE_FILE_OPTIONS_INIT; - git_merge_file_result result = {0}; - const char *expected = "Zero\n1\n2\n3\n4\n5 XXX\n6 YYY\n7\n8\n9\nTen\n"; - - ancestor.ptr = "0\n1\n2\n3\n4\n5 XXX\n6YYY\n7\n8\n9\n10\n"; - ancestor.size = strlen(ancestor.ptr); - ancestor.path = "testfile.txt"; - ancestor.mode = 0100755; - - ours.ptr = "Zero\n1\n2\n3\n4\n5 XXX\n6 YYY\n7\n8\n9\n10\n"; - ours.size = strlen(ours.ptr); - ours.path = "testfile.txt"; - ours.mode = 0100755; - - theirs.ptr = "0\n1\n2\n3\n4\n5 XXX\n6 YYY\n7\n8\n9\nTen\n"; - theirs.size = strlen(theirs.ptr); - theirs.path = "testfile.txt"; - theirs.mode = 0100755; - - opts.flags |= GIT_MERGE_FILE_IGNORE_WHITESPACE_CHANGE; - cl_git_pass(git_merge_file(&result, &ancestor, &ours, &theirs, &opts)); - - cl_assert_equal_i(1, result.automergeable); - - cl_assert_equal_s("testfile.txt", result.path); - cl_assert_equal_i(0100755, result.mode); - - cl_assert_equal_i(strlen(expected), result.len); - cl_assert_equal_strn(expected, result.ptr, result.len); - - git_merge_file_result_free(&result); -} - -void test_merge_files__doesnt_add_newline(void) -{ - git_merge_file_input ancestor = GIT_MERGE_FILE_INPUT_INIT, - ours = GIT_MERGE_FILE_INPUT_INIT, - theirs = GIT_MERGE_FILE_INPUT_INIT; - git_merge_file_options opts = GIT_MERGE_FILE_OPTIONS_INIT; - git_merge_file_result result = {0}; - const char *expected = "Zero\n1\n2\n3\n4\n5 XXX\n6 YYY\n7\n8\n9\nTen"; - - ancestor.ptr = "0\n1\n2\n3\n4\n5 XXX\n6YYY\n7\n8\n9\n10"; - ancestor.size = strlen(ancestor.ptr); - ancestor.path = "testfile.txt"; - ancestor.mode = 0100755; - - ours.ptr = "Zero\n1\n2\n3\n4\n5 XXX\n6 YYY\n7\n8\n9\n10"; - ours.size = strlen(ours.ptr); - ours.path = "testfile.txt"; - ours.mode = 0100755; - - theirs.ptr = "0\n1\n2\n3\n4\n5 XXX\n6 YYY\n7\n8\n9\nTen"; - theirs.size = strlen(theirs.ptr); - theirs.path = "testfile.txt"; - theirs.mode = 0100755; - - opts.flags |= GIT_MERGE_FILE_IGNORE_WHITESPACE_CHANGE; - cl_git_pass(git_merge_file(&result, &ancestor, &ours, &theirs, &opts)); - - cl_assert_equal_i(1, result.automergeable); - - cl_assert_equal_s("testfile.txt", result.path); - cl_assert_equal_i(0100755, result.mode); - - cl_assert_equal_i(strlen(expected), result.len); - cl_assert_equal_strn(expected, result.ptr, result.len); - - git_merge_file_result_free(&result); -} - -void test_merge_files__skips_large_files(void) -{ - git_merge_file_input ours = GIT_MERGE_FILE_INPUT_INIT, - theirs = GIT_MERGE_FILE_INPUT_INIT; - git_merge_file_options opts = GIT_MERGE_FILE_OPTIONS_INIT; - git_merge_file_result result = {0}; - - ours.size = GIT_XDIFF_MAX_SIZE + 1; - ours.path = "testfile.txt"; - ours.mode = 0100755; - - theirs.size = GIT_XDIFF_MAX_SIZE + 1; - theirs.path = "testfile.txt"; - theirs.mode = 0100755; - - cl_git_pass(git_merge_file(&result, NULL, &ours, &theirs, &opts)); - - cl_assert_equal_i(0, result.automergeable); - - git_merge_file_result_free(&result); -} - -void test_merge_files__skips_binaries(void) -{ - git_merge_file_input ancestor = GIT_MERGE_FILE_INPUT_INIT, - ours = GIT_MERGE_FILE_INPUT_INIT, - theirs = GIT_MERGE_FILE_INPUT_INIT; - git_merge_file_result result = {0}; - - ancestor.ptr = "ance\0stor\0"; - ancestor.size = 10; - ancestor.path = "ancestor.txt"; - ancestor.mode = 0100755; - - ours.ptr = "foo\0bar\0"; - ours.size = 8; - ours.path = "ours.txt"; - ours.mode = 0100755; - - theirs.ptr = "bar\0foo\0"; - theirs.size = 8; - theirs.path = "theirs.txt"; - theirs.mode = 0100644; - - cl_git_pass(git_merge_file(&result, &ancestor, &ours, &theirs, NULL)); - - cl_assert_equal_i(0, result.automergeable); - - git_merge_file_result_free(&result); -} - -void test_merge_files__handles_binaries_when_favored(void) -{ - git_merge_file_input ancestor = GIT_MERGE_FILE_INPUT_INIT, - ours = GIT_MERGE_FILE_INPUT_INIT, - theirs = GIT_MERGE_FILE_INPUT_INIT; - git_merge_file_options opts = GIT_MERGE_FILE_OPTIONS_INIT; - git_merge_file_result result = {0}; - - ancestor.ptr = "ance\0stor\0"; - ancestor.size = 10; - ancestor.path = "ancestor.txt"; - ancestor.mode = 0100755; - - ours.ptr = "foo\0bar\0"; - ours.size = 8; - ours.path = "ours.txt"; - ours.mode = 0100755; - - theirs.ptr = "bar\0foo\0"; - theirs.size = 8; - theirs.path = "theirs.txt"; - theirs.mode = 0100644; - - opts.favor = GIT_MERGE_FILE_FAVOR_OURS; - cl_git_pass(git_merge_file(&result, &ancestor, &ours, &theirs, &opts)); - - cl_assert_equal_i(1, result.automergeable); - - cl_assert_equal_s("ours.txt", result.path); - cl_assert_equal_i(0100755, result.mode); - - cl_assert_equal_i(ours.size, result.len); - cl_assert(memcmp(result.ptr, ours.ptr, ours.size) == 0); - - git_merge_file_result_free(&result); -} diff --git a/vendor/libgit2/tests/merge/merge_helpers.c b/vendor/libgit2/tests/merge/merge_helpers.c deleted file mode 100644 index 4b1b7d262..000000000 --- a/vendor/libgit2/tests/merge/merge_helpers.c +++ /dev/null @@ -1,365 +0,0 @@ -#include "clar_libgit2.h" -#include "fileops.h" -#include "refs.h" -#include "tree.h" -#include "merge_helpers.h" -#include "merge.h" -#include "index.h" -#include "git2/merge.h" -#include "git2/sys/index.h" -#include "git2/annotated_commit.h" - -int merge_trees_from_branches( - git_index **index, git_repository *repo, - const char *ours_name, const char *theirs_name, - git_merge_options *opts) -{ - git_commit *our_commit, *their_commit, *ancestor_commit = NULL; - git_tree *our_tree, *their_tree, *ancestor_tree = NULL; - git_oid our_oid, their_oid, ancestor_oid; - git_buf branch_buf = GIT_BUF_INIT; - int error; - - git_buf_printf(&branch_buf, "%s%s", GIT_REFS_HEADS_DIR, ours_name); - cl_git_pass(git_reference_name_to_id(&our_oid, repo, branch_buf.ptr)); - cl_git_pass(git_commit_lookup(&our_commit, repo, &our_oid)); - - git_buf_clear(&branch_buf); - git_buf_printf(&branch_buf, "%s%s", GIT_REFS_HEADS_DIR, theirs_name); - cl_git_pass(git_reference_name_to_id(&their_oid, repo, branch_buf.ptr)); - cl_git_pass(git_commit_lookup(&their_commit, repo, &their_oid)); - - error = git_merge_base(&ancestor_oid, repo, git_commit_id(our_commit), git_commit_id(their_commit)); - - if (error != GIT_ENOTFOUND) { - cl_git_pass(error); - - cl_git_pass(git_commit_lookup(&ancestor_commit, repo, &ancestor_oid)); - cl_git_pass(git_commit_tree(&ancestor_tree, ancestor_commit)); - } - - cl_git_pass(git_commit_tree(&our_tree, our_commit)); - cl_git_pass(git_commit_tree(&their_tree, their_commit)); - - error = git_merge_trees(index, repo, ancestor_tree, our_tree, their_tree, opts); - - git_buf_free(&branch_buf); - git_tree_free(our_tree); - git_tree_free(their_tree); - git_tree_free(ancestor_tree); - git_commit_free(our_commit); - git_commit_free(their_commit); - git_commit_free(ancestor_commit); - - return error; -} - -int merge_commits_from_branches( - git_index **index, git_repository *repo, - const char *ours_name, const char *theirs_name, - git_merge_options *opts) -{ - git_commit *our_commit, *their_commit; - git_oid our_oid, their_oid; - git_buf branch_buf = GIT_BUF_INIT; - int error; - - git_buf_printf(&branch_buf, "%s%s", GIT_REFS_HEADS_DIR, ours_name); - cl_git_pass(git_reference_name_to_id(&our_oid, repo, branch_buf.ptr)); - cl_git_pass(git_commit_lookup(&our_commit, repo, &our_oid)); - - git_buf_clear(&branch_buf); - git_buf_printf(&branch_buf, "%s%s", GIT_REFS_HEADS_DIR, theirs_name); - cl_git_pass(git_reference_name_to_id(&their_oid, repo, branch_buf.ptr)); - cl_git_pass(git_commit_lookup(&their_commit, repo, &their_oid)); - - error = git_merge_commits(index, repo, our_commit, their_commit, opts); - - git_buf_free(&branch_buf); - git_commit_free(our_commit); - git_commit_free(their_commit); - - return error; -} - -int merge_branches(git_repository *repo, - const char *ours_branch, const char *theirs_branch, - git_merge_options *merge_opts, git_checkout_options *checkout_opts) -{ - git_reference *head_ref, *theirs_ref; - git_annotated_commit *theirs_head; - git_checkout_options head_checkout_opts = GIT_CHECKOUT_OPTIONS_INIT; - - head_checkout_opts.checkout_strategy = GIT_CHECKOUT_FORCE; - - cl_git_pass(git_reference_symbolic_create(&head_ref, repo, "HEAD", ours_branch, 1, NULL)); - cl_git_pass(git_checkout_head(repo, &head_checkout_opts)); - - cl_git_pass(git_reference_lookup(&theirs_ref, repo, theirs_branch)); - cl_git_pass(git_annotated_commit_from_ref(&theirs_head, repo, theirs_ref)); - - cl_git_pass(git_merge(repo, (const git_annotated_commit **)&theirs_head, 1, merge_opts, checkout_opts)); - - git_reference_free(head_ref); - git_reference_free(theirs_ref); - git_annotated_commit_free(theirs_head); - - return 0; -} - -void merge__dump_index_entries(git_vector *index_entries) -{ - size_t i; - const git_index_entry *index_entry; - - printf ("\nINDEX [%"PRIuZ"]:\n", index_entries->length); - for (i = 0; i < index_entries->length; i++) { - index_entry = index_entries->contents[i]; - - printf("%o ", index_entry->mode); - printf("%s ", git_oid_allocfmt(&index_entry->id)); - printf("%d ", git_index_entry_stage(index_entry)); - printf("%s ", index_entry->path); - printf("\n"); - } - printf("\n"); -} - -void merge__dump_names(git_index *index) -{ - size_t i; - const git_index_name_entry *conflict_name; - - for (i = 0; i < git_index_name_entrycount(index); i++) { - conflict_name = git_index_name_get_byindex(index, i); - - printf("%s %s %s\n", conflict_name->ancestor, conflict_name->ours, conflict_name->theirs); - } - printf("\n"); -} - -void merge__dump_reuc(git_index *index) -{ - size_t i; - const git_index_reuc_entry *reuc; - - printf ("\nREUC:\n"); - for (i = 0; i < git_index_reuc_entrycount(index); i++) { - reuc = git_index_reuc_get_byindex(index, i); - - printf("%s ", reuc->path); - printf("%o ", reuc->mode[0]); - printf("%s\n", git_oid_allocfmt(&reuc->oid[0])); - printf(" %o ", reuc->mode[1]); - printf(" %s\n", git_oid_allocfmt(&reuc->oid[1])); - printf(" %o ", reuc->mode[2]); - printf(" %s ", git_oid_allocfmt(&reuc->oid[2])); - printf("\n"); - } - printf("\n"); -} - -static int index_entry_eq_merge_index_entry(const struct merge_index_entry *expected, const git_index_entry *actual) -{ - git_oid expected_oid; - bool test_oid; - - if (strlen(expected->oid_str) != 0) { - cl_git_pass(git_oid_fromstr(&expected_oid, expected->oid_str)); - test_oid = 1; - } else - test_oid = 0; - - if (actual->mode != expected->mode || - (test_oid && git_oid_cmp(&actual->id, &expected_oid) != 0) || - git_index_entry_stage(actual) != expected->stage) - return 0; - - if (actual->mode == 0 && (actual->path != NULL || strlen(expected->path) > 0)) - return 0; - - if (actual->mode != 0 && (strcmp(actual->path, expected->path) != 0)) - return 0; - - return 1; -} - -static int name_entry_eq(const char *expected, const char *actual) -{ - if (strlen(expected) == 0) - return (actual == NULL) ? 1 : 0; - - return (strcmp(expected, actual) == 0) ? 1 : 0; -} - -static int name_entry_eq_merge_name_entry(const struct merge_name_entry *expected, const git_index_name_entry *actual) -{ - if (name_entry_eq(expected->ancestor_path, actual->ancestor) == 0 || - name_entry_eq(expected->our_path, actual->ours) == 0 || - name_entry_eq(expected->their_path, actual->theirs) == 0) - return 0; - - return 1; -} - -static int index_conflict_data_eq_merge_diff(const struct merge_index_conflict_data *expected, git_merge_diff *actual) -{ - if (!index_entry_eq_merge_index_entry(&expected->ancestor.entry, &actual->ancestor_entry) || - !index_entry_eq_merge_index_entry(&expected->ours.entry, &actual->our_entry) || - !index_entry_eq_merge_index_entry(&expected->theirs.entry, &actual->their_entry)) - return 0; - - if (expected->ours.status != actual->our_status || - expected->theirs.status != actual->their_status) - return 0; - - return 1; -} - -int merge_test_merge_conflicts(git_vector *conflicts, const struct merge_index_conflict_data expected[], size_t expected_len) -{ - git_merge_diff *actual; - size_t i; - - if (conflicts->length != expected_len) - return 0; - - for (i = 0; i < expected_len; i++) { - actual = conflicts->contents[i]; - - if (!index_conflict_data_eq_merge_diff(&expected[i], actual)) - return 0; - } - - return 1; -} - -int merge_test_index(git_index *index, const struct merge_index_entry expected[], size_t expected_len) -{ - size_t i; - const git_index_entry *index_entry; - - /* - merge__dump_index_entries(&index->entries); - */ - - if (git_index_entrycount(index) != expected_len) - return 0; - - for (i = 0; i < expected_len; i++) { - if ((index_entry = git_index_get_byindex(index, i)) == NULL) - return 0; - - if (!index_entry_eq_merge_index_entry(&expected[i], index_entry)) - return 0; - } - - return 1; -} - -int merge_test_names(git_index *index, const struct merge_name_entry expected[], size_t expected_len) -{ - size_t i; - const git_index_name_entry *name_entry; - - /* - dump_names(index); - */ - - if (git_index_name_entrycount(index) != expected_len) - return 0; - - for (i = 0; i < expected_len; i++) { - if ((name_entry = git_index_name_get_byindex(index, i)) == NULL) - return 0; - - if (! name_entry_eq_merge_name_entry(&expected[i], name_entry)) - return 0; - } - - return 1; -} - -int merge_test_reuc(git_index *index, const struct merge_reuc_entry expected[], size_t expected_len) -{ - size_t i; - const git_index_reuc_entry *reuc_entry; - git_oid expected_oid; - - /* - dump_reuc(index); - */ - - if (git_index_reuc_entrycount(index) != expected_len) - return 0; - - for (i = 0; i < expected_len; i++) { - if ((reuc_entry = git_index_reuc_get_byindex(index, i)) == NULL) - return 0; - - if (strcmp(reuc_entry->path, expected[i].path) != 0 || - reuc_entry->mode[0] != expected[i].ancestor_mode || - reuc_entry->mode[1] != expected[i].our_mode || - reuc_entry->mode[2] != expected[i].their_mode) - return 0; - - if (expected[i].ancestor_mode > 0) { - cl_git_pass(git_oid_fromstr(&expected_oid, expected[i].ancestor_oid_str)); - - if (git_oid_cmp(&reuc_entry->oid[0], &expected_oid) != 0) - return 0; - } - - if (expected[i].our_mode > 0) { - cl_git_pass(git_oid_fromstr(&expected_oid, expected[i].our_oid_str)); - - if (git_oid_cmp(&reuc_entry->oid[1], &expected_oid) != 0) - return 0; - } - - if (expected[i].their_mode > 0) { - cl_git_pass(git_oid_fromstr(&expected_oid, expected[i].their_oid_str)); - - if (git_oid_cmp(&reuc_entry->oid[2], &expected_oid) != 0) - return 0; - } - } - - return 1; -} - -int dircount(void *payload, git_buf *pathbuf) -{ - size_t *entries = payload; - size_t len = git_buf_len(pathbuf); - - if (len < 5 || strcmp(pathbuf->ptr + (git_buf_len(pathbuf) - 5), "/.git") != 0) - (*entries)++; - - return 0; -} - -int merge_test_workdir(git_repository *repo, const struct merge_index_entry expected[], size_t expected_len) -{ - size_t actual_len = 0, i; - git_oid actual_oid, expected_oid; - git_buf wd = GIT_BUF_INIT; - - git_buf_puts(&wd, repo->workdir); - git_path_direach(&wd, 0, dircount, &actual_len); - - if (actual_len != expected_len) - return 0; - - for (i = 0; i < expected_len; i++) { - git_blob_create_fromworkdir(&actual_oid, repo, expected[i].path); - git_oid_fromstr(&expected_oid, expected[i].oid_str); - - if (git_oid_cmp(&actual_oid, &expected_oid) != 0) - return 0; - } - - git_buf_free(&wd); - - return 1; -} diff --git a/vendor/libgit2/tests/merge/merge_helpers.h b/vendor/libgit2/tests/merge/merge_helpers.h deleted file mode 100644 index e407c7d13..000000000 --- a/vendor/libgit2/tests/merge/merge_helpers.h +++ /dev/null @@ -1,68 +0,0 @@ -#ifndef INCLUDE_cl_merge_helpers_h__ -#define INCLUDE_cl_merge_helpers_h__ - -#include "merge.h" -#include "git2/merge.h" - -struct merge_index_entry { - uint16_t mode; - char oid_str[GIT_OID_HEXSZ+1]; - int stage; - char path[128]; -}; - -struct merge_name_entry { - char ancestor_path[128]; - char our_path[128]; - char their_path[128]; -}; - -struct merge_index_with_status { - struct merge_index_entry entry; - unsigned int status; -}; - -struct merge_reuc_entry { - char path[128]; - unsigned int ancestor_mode; - unsigned int our_mode; - unsigned int their_mode; - char ancestor_oid_str[GIT_OID_HEXSZ+1]; - char our_oid_str[GIT_OID_HEXSZ+1]; - char their_oid_str[GIT_OID_HEXSZ+1]; -}; - -struct merge_index_conflict_data { - struct merge_index_with_status ancestor; - struct merge_index_with_status ours; - struct merge_index_with_status theirs; - git_merge_diff_type_t change_type; -}; - -int merge_trees_from_branches( - git_index **index, git_repository *repo, - const char *ours_name, const char *theirs_name, - git_merge_options *opts); - -int merge_commits_from_branches( - git_index **index, git_repository *repo, - const char *ours_name, const char *theirs_name, - git_merge_options *opts); - -int merge_branches(git_repository *repo, - const char *ours_branch, const char *theirs_branch, - git_merge_options *merge_opts, git_checkout_options *checkout_opts); - -int merge_test_diff_list(git_merge_diff_list *diff_list, const struct merge_index_entry expected[], size_t expected_len); - -int merge_test_merge_conflicts(git_vector *conflicts, const struct merge_index_conflict_data expected[], size_t expected_len); - -int merge_test_index(git_index *index, const struct merge_index_entry expected[], size_t expected_len); - -int merge_test_names(git_index *index, const struct merge_name_entry expected[], size_t expected_len); - -int merge_test_reuc(git_index *index, const struct merge_reuc_entry expected[], size_t expected_len); - -int merge_test_workdir(git_repository *repo, const struct merge_index_entry expected[], size_t expected_len); - -#endif diff --git a/vendor/libgit2/tests/merge/trees/automerge.c b/vendor/libgit2/tests/merge/trees/automerge.c deleted file mode 100644 index 67f2cf786..000000000 --- a/vendor/libgit2/tests/merge/trees/automerge.c +++ /dev/null @@ -1,196 +0,0 @@ -#include "clar_libgit2.h" -#include "git2/repository.h" -#include "git2/merge.h" -#include "buffer.h" -#include "merge.h" -#include "fileops.h" -#include "../merge_helpers.h" -#include "../conflict_data.h" - -static git_repository *repo; - -#define TEST_REPO_PATH "merge-resolve" -#define TEST_INDEX_PATH TEST_REPO_PATH "/.git/index" - -#define THEIRS_AUTOMERGE_BRANCH "branch" - -#define THEIRS_UNRELATED_BRANCH "unrelated" -#define THEIRS_UNRELATED_OID "55b4e4687e7a0d9ca367016ed930f385d4022e6f" -#define THEIRS_UNRELATED_PARENT "d6cf6c7741b3316826af1314042550c97ded1d50" - -#define OURS_DIRECTORY_FILE "df_side1" -#define THEIRS_DIRECTORY_FILE "df_side2" - -/* Non-conflicting files, index entries are common to every merge operation */ -#define ADDED_IN_MASTER_INDEX_ENTRY \ - { 0100644, "233c0919c998ed110a4b6ff36f353aec8b713487", 0, "added-in-master.txt" } -#define AUTOMERGEABLE_INDEX_ENTRY \ - { 0100644, "f2e1550a0c9e53d5811175864a29536642ae3821", 0, "automergeable.txt" } -#define CHANGED_IN_BRANCH_INDEX_ENTRY \ - { 0100644, "4eb04c9e79e88f6640d01ff5b25ca2a60764f216", 0, "changed-in-branch.txt" } -#define CHANGED_IN_MASTER_INDEX_ENTRY \ - { 0100644, "11deab00b2d3a6f5a3073988ac050c2d7b6655e2", 0, "changed-in-master.txt" } -#define UNCHANGED_INDEX_ENTRY \ - { 0100644, "c8f06f2e3bb2964174677e91f0abead0e43c9e5d", 0, "unchanged.txt" } - -/* Expected REUC entries */ -#define AUTOMERGEABLE_REUC_ENTRY \ - { "automergeable.txt", 0100644, 0100644, 0100644, \ - "6212c31dab5e482247d7977e4f0dd3601decf13b", \ - "ee3fa1b8c00aff7fe02065fdb50864bb0d932ccf", \ - "058541fc37114bfc1dddf6bd6bffc7fae5c2e6fe" } -#define CONFLICTING_REUC_ENTRY \ - { "conflicting.txt", 0100644, 0100644, 0100644, \ - "d427e0b2e138501a3d15cc376077a3631e15bd46", \ - "4e886e602529caa9ab11d71f86634bd1b6e0de10", \ - "2bd0a343aeef7a2cf0d158478966a6e587ff3863" } -#define REMOVED_IN_BRANCH_REUC_ENTRY \ - { "removed-in-branch.txt", 0100644, 0100644, 0, \ - "dfe3f22baa1f6fce5447901c3086bae368de6bdd", \ - "dfe3f22baa1f6fce5447901c3086bae368de6bdd", \ - "" } -#define REMOVED_IN_MASTER_REUC_ENTRY \ - { "removed-in-master.txt", 0100644, 0, 0100644, \ - "5c3b68a71fc4fa5d362fd3875e53137c6a5ab7a5", \ - "", \ - "5c3b68a71fc4fa5d362fd3875e53137c6a5ab7a5" } - -// Fixture setup and teardown -void test_merge_trees_automerge__initialize(void) -{ - repo = cl_git_sandbox_init(TEST_REPO_PATH); -} - -void test_merge_trees_automerge__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -void test_merge_trees_automerge__automerge(void) -{ - git_index *index; - const git_index_entry *entry; - git_merge_options opts = GIT_MERGE_OPTIONS_INIT; - git_blob *blob; - - struct merge_index_entry merge_index_entries[] = { - ADDED_IN_MASTER_INDEX_ENTRY, - AUTOMERGEABLE_INDEX_ENTRY, - CHANGED_IN_BRANCH_INDEX_ENTRY, - CHANGED_IN_MASTER_INDEX_ENTRY, - - { 0100644, "d427e0b2e138501a3d15cc376077a3631e15bd46", 1, "conflicting.txt" }, - { 0100644, "4e886e602529caa9ab11d71f86634bd1b6e0de10", 2, "conflicting.txt" }, - { 0100644, "2bd0a343aeef7a2cf0d158478966a6e587ff3863", 3, "conflicting.txt" }, - - UNCHANGED_INDEX_ENTRY, - }; - - struct merge_reuc_entry merge_reuc_entries[] = { - AUTOMERGEABLE_REUC_ENTRY, - REMOVED_IN_BRANCH_REUC_ENTRY, - REMOVED_IN_MASTER_REUC_ENTRY - }; - - cl_git_pass(merge_trees_from_branches(&index, repo, "master", THEIRS_AUTOMERGE_BRANCH, &opts)); - - cl_assert(merge_test_index(index, merge_index_entries, 8)); - cl_assert(merge_test_reuc(index, merge_reuc_entries, 3)); - - cl_assert((entry = git_index_get_bypath(index, "automergeable.txt", 0)) != NULL); - cl_assert(entry->file_size == strlen(AUTOMERGEABLE_MERGED_FILE)); - - cl_git_pass(git_object_lookup((git_object **)&blob, repo, &entry->id, GIT_OBJ_BLOB)); - cl_assert(memcmp(git_blob_rawcontent(blob), AUTOMERGEABLE_MERGED_FILE, (size_t)entry->file_size) == 0); - - git_index_free(index); - git_blob_free(blob); -} - -void test_merge_trees_automerge__favor_ours(void) -{ - git_index *index; - git_merge_options opts = GIT_MERGE_OPTIONS_INIT; - - struct merge_index_entry merge_index_entries[] = { - ADDED_IN_MASTER_INDEX_ENTRY, - AUTOMERGEABLE_INDEX_ENTRY, - CHANGED_IN_BRANCH_INDEX_ENTRY, - CHANGED_IN_MASTER_INDEX_ENTRY, - { 0100644, "4e886e602529caa9ab11d71f86634bd1b6e0de10", 0, "conflicting.txt" }, - UNCHANGED_INDEX_ENTRY, - }; - - struct merge_reuc_entry merge_reuc_entries[] = { - AUTOMERGEABLE_REUC_ENTRY, - CONFLICTING_REUC_ENTRY, - REMOVED_IN_BRANCH_REUC_ENTRY, - REMOVED_IN_MASTER_REUC_ENTRY, - }; - - opts.file_favor = GIT_MERGE_FILE_FAVOR_OURS; - - cl_git_pass(merge_trees_from_branches(&index, repo, "master", THEIRS_AUTOMERGE_BRANCH, &opts)); - - cl_assert(merge_test_index(index, merge_index_entries, 6)); - cl_assert(merge_test_reuc(index, merge_reuc_entries, 4)); - - git_index_free(index); -} - -void test_merge_trees_automerge__favor_theirs(void) -{ - git_index *index; - git_merge_options opts = GIT_MERGE_OPTIONS_INIT; - - struct merge_index_entry merge_index_entries[] = { - ADDED_IN_MASTER_INDEX_ENTRY, - AUTOMERGEABLE_INDEX_ENTRY, - CHANGED_IN_BRANCH_INDEX_ENTRY, - CHANGED_IN_MASTER_INDEX_ENTRY, - { 0100644, "2bd0a343aeef7a2cf0d158478966a6e587ff3863", 0, "conflicting.txt" }, - UNCHANGED_INDEX_ENTRY, - }; - - struct merge_reuc_entry merge_reuc_entries[] = { - AUTOMERGEABLE_REUC_ENTRY, - CONFLICTING_REUC_ENTRY, - REMOVED_IN_BRANCH_REUC_ENTRY, - REMOVED_IN_MASTER_REUC_ENTRY, - }; - - opts.file_favor = GIT_MERGE_FILE_FAVOR_THEIRS; - - cl_git_pass(merge_trees_from_branches(&index, repo, "master", THEIRS_AUTOMERGE_BRANCH, &opts)); - - cl_assert(merge_test_index(index, merge_index_entries, 6)); - cl_assert(merge_test_reuc(index, merge_reuc_entries, 4)); - - git_index_free(index); -} - -void test_merge_trees_automerge__unrelated(void) -{ - git_index *index; - git_merge_options opts = GIT_MERGE_OPTIONS_INIT; - - struct merge_index_entry merge_index_entries[] = { - { 0100644, "233c0919c998ed110a4b6ff36f353aec8b713487", 0, "added-in-master.txt" }, - { 0100644, "ee3fa1b8c00aff7fe02065fdb50864bb0d932ccf", 2, "automergeable.txt" }, - { 0100644, "d07ec190c306ec690bac349e87d01c4358e49bb2", 3, "automergeable.txt" }, - { 0100644, "ab6c44a2e84492ad4b41bb6bac87353e9d02ac8b", 0, "changed-in-branch.txt" }, - { 0100644, "11deab00b2d3a6f5a3073988ac050c2d7b6655e2", 0, "changed-in-master.txt" }, - { 0100644, "4e886e602529caa9ab11d71f86634bd1b6e0de10", 2, "conflicting.txt" }, - { 0100644, "4b253da36a0ae8bfce63aeabd8c5b58429925594", 3, "conflicting.txt" }, - { 0100644, "ef58fdd8086c243bdc81f99e379acacfd21d32d6", 0, "new-in-unrelated1.txt" }, - { 0100644, "948ba6e701c1edab0c2d394fb7c5538334129793", 0, "new-in-unrelated2.txt" }, - { 0100644, "dfe3f22baa1f6fce5447901c3086bae368de6bdd", 0, "removed-in-branch.txt" }, - { 0100644, "c8f06f2e3bb2964174677e91f0abead0e43c9e5d", 0, "unchanged.txt" }, - }; - - cl_git_pass(merge_trees_from_branches(&index, repo, "master", THEIRS_UNRELATED_BRANCH, &opts)); - - cl_assert(merge_test_index(index, merge_index_entries, 11)); - - git_index_free(index); -} diff --git a/vendor/libgit2/tests/merge/trees/commits.c b/vendor/libgit2/tests/merge/trees/commits.c deleted file mode 100644 index 786a77a8b..000000000 --- a/vendor/libgit2/tests/merge/trees/commits.c +++ /dev/null @@ -1,148 +0,0 @@ -#include "clar_libgit2.h" -#include "git2/repository.h" -#include "git2/merge.h" -#include "merge.h" -#include "../merge_helpers.h" -#include "../conflict_data.h" - -static git_repository *repo; - -#define TEST_REPO_PATH "merge-resolve" - -void test_merge_trees_commits__initialize(void) -{ - repo = cl_git_sandbox_init(TEST_REPO_PATH); -} - -void test_merge_trees_commits__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -void test_merge_trees_commits__automerge(void) -{ - git_index *index; - const git_index_entry *entry; - git_merge_options opts = GIT_MERGE_OPTIONS_INIT; - git_blob *blob; - - struct merge_index_entry merge_index_entries[] = { - { 0100644, "233c0919c998ed110a4b6ff36f353aec8b713487", 0, "added-in-master.txt" }, - { 0100644, "f2e1550a0c9e53d5811175864a29536642ae3821", 0, "automergeable.txt" }, - { 0100644, "4eb04c9e79e88f6640d01ff5b25ca2a60764f216", 0, "changed-in-branch.txt" }, - { 0100644, "11deab00b2d3a6f5a3073988ac050c2d7b6655e2", 0, "changed-in-master.txt" }, - - { 0100644, "d427e0b2e138501a3d15cc376077a3631e15bd46", 1, "conflicting.txt" }, - { 0100644, "4e886e602529caa9ab11d71f86634bd1b6e0de10", 2, "conflicting.txt" }, - { 0100644, "2bd0a343aeef7a2cf0d158478966a6e587ff3863", 3, "conflicting.txt" }, - - { 0100644, "c8f06f2e3bb2964174677e91f0abead0e43c9e5d", 0, "unchanged.txt" }, - }; - - struct merge_reuc_entry merge_reuc_entries[] = { - { "automergeable.txt", 0100644, 0100644, 0100644, \ - "6212c31dab5e482247d7977e4f0dd3601decf13b", \ - "ee3fa1b8c00aff7fe02065fdb50864bb0d932ccf", \ - "058541fc37114bfc1dddf6bd6bffc7fae5c2e6fe" }, - { "removed-in-branch.txt", 0100644, 0100644, 0, \ - "dfe3f22baa1f6fce5447901c3086bae368de6bdd", \ - "dfe3f22baa1f6fce5447901c3086bae368de6bdd", \ - "" }, - { "removed-in-master.txt", 0100644, 0, 0100644, \ - "5c3b68a71fc4fa5d362fd3875e53137c6a5ab7a5", \ - "", \ - "5c3b68a71fc4fa5d362fd3875e53137c6a5ab7a5" }, - }; - - cl_git_pass(merge_commits_from_branches(&index, repo, "master", "branch", &opts)); - - cl_assert(merge_test_index(index, merge_index_entries, 8)); - cl_assert(merge_test_reuc(index, merge_reuc_entries, 3)); - - cl_assert((entry = git_index_get_bypath(index, "automergeable.txt", 0)) != NULL); - cl_assert(entry->file_size == strlen(AUTOMERGEABLE_MERGED_FILE)); - - cl_git_pass(git_object_lookup((git_object **)&blob, repo, &entry->id, GIT_OBJ_BLOB)); - cl_assert(memcmp(git_blob_rawcontent(blob), AUTOMERGEABLE_MERGED_FILE, (size_t)entry->file_size) == 0); - - git_index_free(index); - git_blob_free(blob); -} - -void test_merge_trees_commits__no_ancestor(void) -{ - git_index *index; - git_merge_options opts = GIT_MERGE_OPTIONS_INIT; - - struct merge_index_entry merge_index_entries[] = { - { 0100644, "233c0919c998ed110a4b6ff36f353aec8b713487", 0, "added-in-master.txt" }, - { 0100644, "ee3fa1b8c00aff7fe02065fdb50864bb0d932ccf", 2, "automergeable.txt" }, - { 0100644, "d07ec190c306ec690bac349e87d01c4358e49bb2", 3, "automergeable.txt" }, - { 0100644, "ab6c44a2e84492ad4b41bb6bac87353e9d02ac8b", 0, "changed-in-branch.txt" }, - { 0100644, "11deab00b2d3a6f5a3073988ac050c2d7b6655e2", 0, "changed-in-master.txt" }, - { 0100644, "4e886e602529caa9ab11d71f86634bd1b6e0de10", 2, "conflicting.txt" }, - { 0100644, "4b253da36a0ae8bfce63aeabd8c5b58429925594", 3, "conflicting.txt" }, - { 0100644, "ef58fdd8086c243bdc81f99e379acacfd21d32d6", 0, "new-in-unrelated1.txt" }, - { 0100644, "948ba6e701c1edab0c2d394fb7c5538334129793", 0, "new-in-unrelated2.txt" }, - { 0100644, "dfe3f22baa1f6fce5447901c3086bae368de6bdd", 0, "removed-in-branch.txt" }, - { 0100644, "c8f06f2e3bb2964174677e91f0abead0e43c9e5d", 0, "unchanged.txt" }, - }; - - cl_git_pass(merge_commits_from_branches(&index, repo, "master", "unrelated", &opts)); - - cl_assert(merge_test_index(index, merge_index_entries, 11)); - - git_index_free(index); -} - -void test_merge_trees_commits__df_conflict(void) -{ - git_index *index; - git_merge_options opts = GIT_MERGE_OPTIONS_INIT; - - struct merge_index_entry merge_index_entries[] = { - { 0100644, "49130a28ef567af9a6a6104c38773fedfa5f9742", 2, "dir-10" }, - { 0100644, "6c06dcd163587c2cc18be44857e0b71116382aeb", 3, "dir-10" }, - { 0100644, "43aafd43bea779ec74317dc361f45ae3f532a505", 0, "dir-6" }, - { 0100644, "a031a28ae70e33a641ce4b8a8f6317f1ab79dee4", 3, "dir-7" }, - { 0100644, "5012fd565b1393bdfda1805d4ec38ce6619e1fd1", 1, "dir-7/file.txt" }, - { 0100644, "a5563304ddf6caba25cb50323a2ea6f7dbfcadca", 2, "dir-7/file.txt" }, - { 0100644, "e9ad6ec3e38364a3d07feda7c4197d4d845c53b5", 0, "dir-8" }, - { 0100644, "3ef4d30382ca33fdeba9fda895a99e0891ba37aa", 2, "dir-9" }, - { 0100644, "fc4c636d6515e9e261f9260dbcf3cc6eca97ea08", 1, "dir-9/file.txt" }, - { 0100644, "76ab0e2868197ec158ddd6c78d8a0d2fd73d38f9", 3, "dir-9/file.txt" }, - { 0100644, "5c2411f8075f48a6b2fdb85ebc0d371747c4df15", 0, "file-1/new" }, - { 0100644, "a39a620dae5bc8b4e771cd4d251b7d080401a21e", 1, "file-2" }, - { 0100644, "d963979c237d08b6ba39062ee7bf64c7d34a27f8", 2, "file-2" }, - { 0100644, "5c341ead2ba6f2af98ce5ec3fe84f6b6d2899c0d", 0, "file-2/new" }, - { 0100644, "9efe7723802d4305142eee177e018fee1572c4f4", 0, "file-3/new" }, - { 0100644, "bacac9b3493509aa15e1730e1545fc0919d1dae0", 1, "file-4" }, - { 0100644, "7663fce0130db092936b137cabd693ec234eb060", 3, "file-4" }, - { 0100644, "e49f917b448d1340b31d76e54ba388268fd4c922", 0, "file-4/new" }, - { 0100644, "cab2cf23998b40f1af2d9d9a756dc9e285a8df4b", 2, "file-5/new" }, - { 0100644, "f5504f36e6f4eb797a56fc5bac6c6c7f32969bf2", 3, "file-5/new" }, - }; - - cl_git_pass(merge_trees_from_branches(&index, repo, "df_side1", "df_side2", &opts)); - - cl_assert(merge_test_index(index, merge_index_entries, 20)); - - git_index_free(index); -} - -void test_merge_trees_commits__fail_on_conflict(void) -{ - git_index *index; - git_merge_options opts = GIT_MERGE_OPTIONS_INIT; - - opts.flags |= GIT_MERGE_FAIL_ON_CONFLICT; - - cl_git_fail_with(GIT_EMERGECONFLICT, - merge_trees_from_branches(&index, repo, "df_side1", "df_side2", &opts)); - - cl_git_fail_with(GIT_EMERGECONFLICT, - merge_commits_from_branches(&index, repo, "master", "unrelated", &opts)); - cl_git_fail_with(GIT_EMERGECONFLICT, - merge_commits_from_branches(&index, repo, "master", "branch", &opts)); -} - diff --git a/vendor/libgit2/tests/merge/trees/modeconflict.c b/vendor/libgit2/tests/merge/trees/modeconflict.c deleted file mode 100644 index d858b8f66..000000000 --- a/vendor/libgit2/tests/merge/trees/modeconflict.c +++ /dev/null @@ -1,59 +0,0 @@ -#include "clar_libgit2.h" -#include "git2/repository.h" -#include "git2/merge.h" -#include "buffer.h" -#include "merge.h" -#include "../merge_helpers.h" -#include "fileops.h" - -static git_repository *repo; - -#define TEST_REPO_PATH "merge-resolve" - -#define DF_SIDE1_BRANCH "df_side1" -#define DF_SIDE2_BRANCH "df_side2" - -// Fixture setup and teardown -void test_merge_trees_modeconflict__initialize(void) -{ - repo = cl_git_sandbox_init(TEST_REPO_PATH); -} - -void test_merge_trees_modeconflict__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -void test_merge_trees_modeconflict__df_conflict(void) -{ - git_index *index; - - struct merge_index_entry merge_index_entries[] = { - { 0100644, "49130a28ef567af9a6a6104c38773fedfa5f9742", 2, "dir-10" }, - { 0100644, "6c06dcd163587c2cc18be44857e0b71116382aeb", 3, "dir-10" }, - { 0100644, "43aafd43bea779ec74317dc361f45ae3f532a505", 0, "dir-6" }, - { 0100644, "a031a28ae70e33a641ce4b8a8f6317f1ab79dee4", 3, "dir-7" }, - { 0100644, "5012fd565b1393bdfda1805d4ec38ce6619e1fd1", 1, "dir-7/file.txt" }, - { 0100644, "a5563304ddf6caba25cb50323a2ea6f7dbfcadca", 2, "dir-7/file.txt" }, - { 0100644, "e9ad6ec3e38364a3d07feda7c4197d4d845c53b5", 0, "dir-8" }, - { 0100644, "3ef4d30382ca33fdeba9fda895a99e0891ba37aa", 2, "dir-9" }, - { 0100644, "fc4c636d6515e9e261f9260dbcf3cc6eca97ea08", 1, "dir-9/file.txt" }, - { 0100644, "76ab0e2868197ec158ddd6c78d8a0d2fd73d38f9", 3, "dir-9/file.txt" }, - { 0100644, "5c2411f8075f48a6b2fdb85ebc0d371747c4df15", 0, "file-1/new" }, - { 0100644, "a39a620dae5bc8b4e771cd4d251b7d080401a21e", 1, "file-2" }, - { 0100644, "d963979c237d08b6ba39062ee7bf64c7d34a27f8", 2, "file-2" }, - { 0100644, "5c341ead2ba6f2af98ce5ec3fe84f6b6d2899c0d", 0, "file-2/new" }, - { 0100644, "9efe7723802d4305142eee177e018fee1572c4f4", 0, "file-3/new" }, - { 0100644, "bacac9b3493509aa15e1730e1545fc0919d1dae0", 1, "file-4" }, - { 0100644, "7663fce0130db092936b137cabd693ec234eb060", 3, "file-4" }, - { 0100644, "e49f917b448d1340b31d76e54ba388268fd4c922", 0, "file-4/new" }, - { 0100644, "cab2cf23998b40f1af2d9d9a756dc9e285a8df4b", 2, "file-5/new" }, - { 0100644, "f5504f36e6f4eb797a56fc5bac6c6c7f32969bf2", 3, "file-5/new" }, - }; - - cl_git_pass(merge_trees_from_branches(&index, repo, DF_SIDE1_BRANCH, DF_SIDE2_BRANCH, NULL)); - - cl_assert(merge_test_index(index, merge_index_entries, 20)); - - git_index_free(index); -} diff --git a/vendor/libgit2/tests/merge/trees/recursive.c b/vendor/libgit2/tests/merge/trees/recursive.c deleted file mode 100644 index c5b129bf8..000000000 --- a/vendor/libgit2/tests/merge/trees/recursive.c +++ /dev/null @@ -1,410 +0,0 @@ -#include "clar_libgit2.h" -#include "git2/repository.h" -#include "git2/merge.h" -#include "merge.h" -#include "../merge_helpers.h" - -static git_repository *repo; - -#define TEST_REPO_PATH "merge-recursive" - -void test_merge_trees_recursive__initialize(void) -{ - repo = cl_git_sandbox_init(TEST_REPO_PATH); -} - -void test_merge_trees_recursive__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -void test_merge_trees_recursive__one_base_commit(void) -{ - git_index *index; - git_merge_options opts = GIT_MERGE_OPTIONS_INIT; - - struct merge_index_entry merge_index_entries[] = { - { 0100644, "dea7215f259b2cced87d1bda6c72f8b4ce37a2ff", 0, "asparagus.txt" }, - { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" }, - { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" }, - { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" }, - { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" }, - { 0100644, "94d2c01087f48213bd157222d54edfefd77c9bba", 0, "veal.txt" }, - }; - - cl_git_pass(merge_commits_from_branches(&index, repo, "branchA-1", "branchA-2", &opts)); - - cl_assert(merge_test_index(index, merge_index_entries, 6)); - - git_index_free(index); -} - -void test_merge_trees_recursive__one_base_commit_norecursive(void) -{ - git_index *index; - git_merge_options opts = GIT_MERGE_OPTIONS_INIT; - - struct merge_index_entry merge_index_entries[] = { - { 0100644, "dea7215f259b2cced87d1bda6c72f8b4ce37a2ff", 0, "asparagus.txt" }, - { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" }, - { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" }, - { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" }, - { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" }, - { 0100644, "94d2c01087f48213bd157222d54edfefd77c9bba", 0, "veal.txt" }, - }; - - opts.flags |= GIT_MERGE_NO_RECURSIVE; - - cl_git_pass(merge_commits_from_branches(&index, repo, "branchA-1", "branchA-2", &opts)); - - cl_assert(merge_test_index(index, merge_index_entries, 6)); - - git_index_free(index); -} - -void test_merge_trees_recursive__two_base_commits(void) -{ - git_index *index; - git_merge_options opts = GIT_MERGE_OPTIONS_INIT; - - struct merge_index_entry merge_index_entries[] = { - { 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "asparagus.txt" }, - { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" }, - { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" }, - { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" }, - { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" }, - { 0100644, "666ffdfcf1eaa5641fa31064bf2607327e843c09", 0, "veal.txt" }, - }; - - cl_git_pass(merge_commits_from_branches(&index, repo, "branchB-1", "branchB-2", &opts)); - - cl_assert(merge_test_index(index, merge_index_entries, 6)); - - git_index_free(index); -} - -void test_merge_trees_recursive__two_base_commits_norecursive(void) -{ - git_index *index; - git_merge_options opts = GIT_MERGE_OPTIONS_INIT; - - struct merge_index_entry merge_index_entries[] = { - { 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "asparagus.txt" }, - { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" }, - { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" }, - { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" }, - { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" }, - { 0100644, "cb49ad76147f5f9439cbd6133708b76142660660", 1, "veal.txt" }, - { 0100644, "b2a81ead9e722af0099fccfb478cea88eea749a2", 2, "veal.txt" }, - { 0100644, "4e21d2d63357bde5027d1625f5ec6b430cdeb143", 3, "veal.txt" }, - }; - - opts.flags |= GIT_MERGE_NO_RECURSIVE; - - cl_git_pass(merge_commits_from_branches(&index, repo, "branchB-1", "branchB-2", &opts)); - - cl_assert(merge_test_index(index, merge_index_entries, 8)); - - git_index_free(index); -} - -void test_merge_trees_recursive__two_levels_of_multiple_bases(void) -{ - git_index *index; - git_merge_options opts = GIT_MERGE_OPTIONS_INIT; - - struct merge_index_entry merge_index_entries[] = { - { 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "asparagus.txt" }, - { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" }, - { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" }, - { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" }, - { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" }, - { 0100644, "15faa0c9991f2d65686e844651faa2ff9827887b", 0, "veal.txt" }, - }; - - cl_git_pass(merge_commits_from_branches(&index, repo, "branchC-1", "branchC-2", &opts)); - - cl_assert(merge_test_index(index, merge_index_entries, 6)); - - git_index_free(index); -} - -void test_merge_trees_recursive__two_levels_of_multiple_bases_norecursive(void) -{ - git_index *index; - git_merge_options opts = GIT_MERGE_OPTIONS_INIT; - - struct merge_index_entry merge_index_entries[] = { - { 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "asparagus.txt" }, - { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" }, - { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" }, - { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" }, - { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" }, - { 0100644, "b2a81ead9e722af0099fccfb478cea88eea749a2", 1, "veal.txt" }, - { 0100644, "898d12687fb35be271c27c795a6b32c8b51da79e", 2, "veal.txt" }, - { 0100644, "68a2e1ee61a23a4728fe6b35580fbbbf729df370", 3, "veal.txt" }, - }; - - opts.flags |= GIT_MERGE_NO_RECURSIVE; - - cl_git_pass(merge_commits_from_branches(&index, repo, "branchC-1", "branchC-2", &opts)); - - cl_assert(merge_test_index(index, merge_index_entries, 8)); - - git_index_free(index); -} - -void test_merge_trees_recursive__three_levels_of_multiple_bases(void) -{ - git_index *index; - git_merge_options opts = GIT_MERGE_OPTIONS_INIT; - - struct merge_index_entry merge_index_entries[] = { - { 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "asparagus.txt" }, - { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" }, - { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" }, - { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" }, - { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" }, - { 0100644, "d55e5dc038c52f1a36548625bcb666cbc06db9e6", 0, "veal.txt" }, - }; - - cl_git_pass(merge_commits_from_branches(&index, repo, "branchD-2", "branchD-1", &opts)); - - cl_assert(merge_test_index(index, merge_index_entries, 6)); - - git_index_free(index); -} - -void test_merge_trees_recursive__three_levels_of_multiple_bases_norecursive(void) -{ - git_index *index; - git_merge_options opts = GIT_MERGE_OPTIONS_INIT; - - struct merge_index_entry merge_index_entries[] = { - { 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "asparagus.txt" }, - { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" }, - { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" }, - { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" }, - { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" }, - { 0100644, "898d12687fb35be271c27c795a6b32c8b51da79e", 1, "veal.txt" }, - { 0100644, "f1b44c04989a3a1c14b036cfadfa328d53a7bc5e", 2, "veal.txt" }, - { 0100644, "5e8747f5200fac0f945a07daf6163ca9cb1a8da9", 3, "veal.txt" }, - }; - - opts.flags |= GIT_MERGE_NO_RECURSIVE; - - cl_git_pass(merge_commits_from_branches(&index, repo, "branchD-2", "branchD-1", &opts)); - - cl_assert(merge_test_index(index, merge_index_entries, 8)); - - git_index_free(index); -} - -void test_merge_trees_recursive__three_base_commits(void) -{ - git_index *index; - git_merge_options opts = GIT_MERGE_OPTIONS_INIT; - - struct merge_index_entry merge_index_entries[] = { - { 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "asparagus.txt" }, - { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" }, - { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" }, - { 0100644, "c4f7269b07c76d02755d75ccaf05c0b4c36cdc6c", 0, "gravy.txt" }, - { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" }, - { 0100644, "a7b066537e6be7109abfe4ff97b675d4e077da20", 0, "veal.txt" }, - }; - - cl_git_pass(merge_commits_from_branches(&index, repo, "branchE-1", "branchE-2", &opts)); - - cl_assert(merge_test_index(index, merge_index_entries, 6)); - - git_index_free(index); -} - -void test_merge_trees_recursive__three_base_commits_norecursive(void) -{ - git_index *index; - git_merge_options opts = GIT_MERGE_OPTIONS_INIT; - - struct merge_index_entry merge_index_entries[] = { - { 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "asparagus.txt" }, - { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" }, - { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" }, - { 0100644, "9e12bce04446d097ae1782967a5888c2e2a0d35b", 1, "gravy.txt" }, - { 0100644, "d8dd349b78f19a4ebe3357bacb8138f00bf5ed41", 2, "gravy.txt" }, - { 0100644, "e50fbbd701458757bdfe9815f58ed717c588d1b5", 3, "gravy.txt" }, - { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" }, - { 0100644, "a7b066537e6be7109abfe4ff97b675d4e077da20", 0, "veal.txt" }, - }; - - opts.flags |= GIT_MERGE_NO_RECURSIVE; - - cl_git_pass(merge_commits_from_branches(&index, repo, "branchE-1", "branchE-2", &opts)); - - cl_assert(merge_test_index(index, merge_index_entries, 8)); - - git_index_free(index); -} - -void test_merge_trees_recursive__conflict(void) -{ - git_index *index; - git_merge_options opts = GIT_MERGE_OPTIONS_INIT; - - struct merge_index_entry merge_index_entries[] = { - { 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "asparagus.txt" }, - { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" }, - { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" }, - { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" }, - { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" }, - { 0100644, "fa567f568ed72157c0c617438d077695b99d9aac", 1, "veal.txt" }, - { 0100644, "21950d5e4e4d1a871b4dfcf72ecb6b9c162c434e", 2, "veal.txt" }, - { 0100644, "3855170cef875708da06ab9ad7fc6a73b531cda1", 3, "veal.txt" }, - }; - - cl_git_pass(merge_commits_from_branches(&index, repo, "branchF-1", "branchF-2", &opts)); - - cl_assert(merge_test_index(index, merge_index_entries, 8)); - - git_index_free(index); -} - -/* - * Branch G-1 and G-2 have three common ancestors (815b5a1, ad2ace9, 483065d). - * The merge-base of the first two has two common ancestors (723181f, a34e5a1) - * which themselves have two common ancestors (8f35f30, 3a3f5a6), which - * finally has a common ancestor of 7c7bf85. This virtual merge base will - * be computed and merged with 483065d which also has a common ancestor of - * 7c7bf85. - */ -void test_merge_trees_recursive__oh_so_many_levels_of_recursion(void) -{ - git_index *index; - git_merge_options opts = GIT_MERGE_OPTIONS_INIT; - - struct merge_index_entry merge_index_entries[] = { - { 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "asparagus.txt" }, - { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" }, - { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" }, - { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" }, - { 0100644, "7c7e08f9559d9e1551b91e1cf68f1d0066109add", 0, "oyster.txt" }, - { 0100644, "898d12687fb35be271c27c795a6b32c8b51da79e", 0, "veal.txt" }, - }; - - cl_git_pass(merge_commits_from_branches(&index, repo, "branchG-1", "branchG-2", &opts)); - - cl_assert(merge_test_index(index, merge_index_entries, 6)); - - git_index_free(index); -} - -/* Branch H-1 and H-2 have two common ancestors (aa9e263, 6ef31d3). The two - * ancestors themselves conflict. - */ -void test_merge_trees_recursive__conflicting_merge_base(void) -{ - git_index *index; - git_merge_options opts = GIT_MERGE_OPTIONS_INIT; - - struct merge_index_entry merge_index_entries[] = { - { 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "asparagus.txt" }, - { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" }, - { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" }, - { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" }, - { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" }, - { 0100644, "3a66812fed1e03ea4a6a7ee28d8a57aec1ca6537", 1, "veal.txt" }, - { 0100644, "d604c75019c282144bdbbf3fd3462ba74b240efc", 2, "veal.txt" }, - { 0100644, "37a5054a9f9b4628e3924c5cb8f2147c6e2a3efc", 3, "veal.txt" }, - }; - - cl_git_pass(merge_commits_from_branches(&index, repo, "branchH-1", "branchH-2", &opts)); - - cl_assert(merge_test_index(index, merge_index_entries, 8)); - - git_index_free(index); -} - -/* Branch H-1 and H-2 have two common ancestors (aa9e263, 6ef31d3). The two - * ancestors themselves conflict. The generated common ancestor file will - * have diff3 style conflicts inside it. - */ -void test_merge_trees_recursive__conflicting_merge_base_with_diff3(void) -{ - git_index *index; - git_merge_options opts = GIT_MERGE_OPTIONS_INIT; - - struct merge_index_entry merge_index_entries[] = { - { 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "asparagus.txt" }, - { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" }, - { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" }, - { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" }, - { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" }, - { 0100644, "cd17a91513f3aee9e44114d1ede67932dd41d2fc", 1, "veal.txt" }, - { 0100644, "d604c75019c282144bdbbf3fd3462ba74b240efc", 2, "veal.txt" }, - { 0100644, "37a5054a9f9b4628e3924c5cb8f2147c6e2a3efc", 3, "veal.txt" }, - }; - - opts.file_flags |= GIT_MERGE_FILE_STYLE_DIFF3; - - cl_git_pass(merge_commits_from_branches(&index, repo, "branchH-1", "branchH-2", &opts)); - - cl_assert(merge_test_index(index, merge_index_entries, 8)); - - git_index_free(index); -} - -/* Branch I-1 and I-2 have two common ancestors (aa9e263, 6ef31d3). The two - * ancestors themselves conflict, but when each was merged, the conflicts were - * resolved identically, thus merging I-1 into I-2 does not conflict. - */ -void test_merge_trees_recursive__conflicting_merge_base_since_resolved(void) -{ - git_index *index; - git_merge_options opts = GIT_MERGE_OPTIONS_INIT; - - struct merge_index_entry merge_index_entries[] = { - { 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "asparagus.txt" }, - { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" }, - { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" }, - { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" }, - { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" }, - { 0100644, "a02d4fd126e0cc8fb46ee48cf38bad36d44f2dbc", 0, "veal.txt" }, - }; - - cl_git_pass(merge_commits_from_branches(&index, repo, "branchI-1", "branchI-2", &opts)); - - cl_assert(merge_test_index(index, merge_index_entries, 6)); - - git_index_free(index); -} - -/* There are multiple levels of criss-cross merges, and multiple recursive - * merges would create a common ancestor that allows the merge to complete - * successfully. Test that we can build a single virtual base, then stop, - * which will produce a conflicting merge. - */ -void test_merge_trees_recursive__recursionlimit(void) -{ - git_index *index; - git_merge_options opts = GIT_MERGE_OPTIONS_INIT; - - struct merge_index_entry merge_index_entries[] = { - { 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "asparagus.txt" }, - { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" }, - { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" }, - { 0100644, "ce7e553c6feb6e5f3bd67e3c3be04182fe3094b4", 1, "gravy.txt" }, - { 0100644, "d8dd349b78f19a4ebe3357bacb8138f00bf5ed41", 2, "gravy.txt" }, - { 0100644, "e50fbbd701458757bdfe9815f58ed717c588d1b5", 3, "gravy.txt" }, - { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" }, - { 0100644, "a7b066537e6be7109abfe4ff97b675d4e077da20", 0, "veal.txt" }, - }; - - opts.recursion_limit = 1; - - cl_git_pass(merge_commits_from_branches(&index, repo, "branchE-1", "branchE-2", &opts)); - - cl_assert(merge_test_index(index, merge_index_entries, 8)); - - git_index_free(index); -} - diff --git a/vendor/libgit2/tests/merge/trees/renames.c b/vendor/libgit2/tests/merge/trees/renames.c deleted file mode 100644 index d7721c894..000000000 --- a/vendor/libgit2/tests/merge/trees/renames.c +++ /dev/null @@ -1,252 +0,0 @@ -#include "clar_libgit2.h" -#include "git2/repository.h" -#include "git2/merge.h" -#include "buffer.h" -#include "merge.h" -#include "../merge_helpers.h" -#include "fileops.h" - -static git_repository *repo; - -#define TEST_REPO_PATH "merge-resolve" - -#define BRANCH_RENAME_OURS "rename_conflict_ours" -#define BRANCH_RENAME_THEIRS "rename_conflict_theirs" - -// Fixture setup and teardown -void test_merge_trees_renames__initialize(void) -{ - repo = cl_git_sandbox_init(TEST_REPO_PATH); -} - -void test_merge_trees_renames__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -void test_merge_trees_renames__index(void) -{ - git_index *index; - git_merge_options *opts = NULL; - - struct merge_index_entry merge_index_entries[] = { - { 0100644, "68c6c84b091926c7d90aa6a79b2bc3bb6adccd8e", 0, "0a-no-change.txt" }, - { 0100644, "f0ce2b8e4986084d9b308fb72709e414c23eb5e6", 0, "0b-duplicated-in-ours.txt" }, - { 0100644, "f0ce2b8e4986084d9b308fb72709e414c23eb5e6", 1, "0b-rewritten-in-ours.txt" }, - { 0100644, "e376fbdd06ebf021c92724da9f26f44212734e3e", 2, "0b-rewritten-in-ours.txt" }, - { 0100644, "b2d399ae15224e1d58066e3c8df70ce37de7a656", 3, "0b-rewritten-in-ours.txt" }, - { 0100644, "2f56120107d680129a5d9791b521cb1e73a2ed31", 0, "0c-duplicated-in-theirs.txt" }, - { 0100644, "2f56120107d680129a5d9791b521cb1e73a2ed31", 1, "0c-rewritten-in-theirs.txt" }, - { 0100644, "efc9121fdedaf08ba180b53ebfbcf71bd488ed09", 2, "0c-rewritten-in-theirs.txt" }, - { 0100644, "712ebba6669ea847d9829e4f1059d6c830c8b531", 3, "0c-rewritten-in-theirs.txt" }, - { 0100644, "0d872f8e871a30208305978ecbf9e66d864f1638", 0, "1a-newname-in-ours-edited-in-theirs.txt" }, - { 0100644, "d0d4594e16f2e19107e3fa7ea63e7aaaff305ffb", 0, "1a-newname-in-ours.txt" }, - { 0100644, "ed9523e62e453e50dd9be1606af19399b96e397a", 0, "1b-newname-in-theirs-edited-in-ours.txt" }, - { 0100644, "2b5f1f181ee3b58ea751f5dd5d8f9b445520a136", 0, "1b-newname-in-theirs.txt" }, - { 0100644, "178940b450f238a56c0d75b7955cb57b38191982", 0, "2-newname-in-both.txt" }, - { 0100644, "18cb316b1cefa0f8a6946f0e201a8e1a6f845ab9", 2, "3a-newname-in-ours-deleted-in-theirs.txt" }, - { 0100644, "18cb316b1cefa0f8a6946f0e201a8e1a6f845ab9", 1, "3a-renamed-in-ours-deleted-in-theirs.txt" }, - { 0100644, "36219b49367146cb2e6a1555b5a9ebd4d0328495", 3, "3b-newname-in-theirs-deleted-in-ours.txt" }, - { 0100644, "36219b49367146cb2e6a1555b5a9ebd4d0328495", 1, "3b-renamed-in-theirs-deleted-in-ours.txt" }, - { 0100644, "227792b52aaa0b238bea00ec7e509b02623f168c", 2, "4a-newname-in-ours-added-in-theirs.txt" }, - { 0100644, "8b5b53cb2aa9ceb1139f5312fcfa3cc3c5a47c9a", 3, "4a-newname-in-ours-added-in-theirs.txt" }, - { 0100644, "227792b52aaa0b238bea00ec7e509b02623f168c", 1, "4a-renamed-in-ours-added-in-theirs.txt" }, - { 0100644, "de872ee3618b894992e9d1e18ba2ebe256a112f9", 2, "4b-newname-in-theirs-added-in-ours.txt" }, - { 0100644, "98d52d07c0b0bbf2b46548f6aa521295c2cb55db", 3, "4b-newname-in-theirs-added-in-ours.txt" }, - { 0100644, "98d52d07c0b0bbf2b46548f6aa521295c2cb55db", 1, "4b-renamed-in-theirs-added-in-ours.txt" }, - { 0100644, "d3719a5ae8e4d92276b5313ce976f6ee5af2b436", 2, "5a-newname-in-ours-added-in-theirs.txt" }, - { 0100644, "98ba4205fcf31f5dd93c916d35fe3f3b3d0e6714", 3, "5a-newname-in-ours-added-in-theirs.txt" }, - { 0100644, "d3719a5ae8e4d92276b5313ce976f6ee5af2b436", 1, "5a-renamed-in-ours-added-in-theirs.txt" }, - { 0100644, "d3719a5ae8e4d92276b5313ce976f6ee5af2b436", 3, "5a-renamed-in-ours-added-in-theirs.txt" }, - { 0100644, "385c8a0f26ddf79e9041e15e17dc352ed2c4cced", 2, "5b-newname-in-theirs-added-in-ours.txt" }, - { 0100644, "63247125386de9ec90a27ad36169307bf8a11a38", 3, "5b-newname-in-theirs-added-in-ours.txt" }, - { 0100644, "63247125386de9ec90a27ad36169307bf8a11a38", 1, "5b-renamed-in-theirs-added-in-ours.txt" }, - { 0100644, "63247125386de9ec90a27ad36169307bf8a11a38", 2, "5b-renamed-in-theirs-added-in-ours.txt" }, - { 0100644, "d8fa77b6833082c1ea36b7828a582d4c43882450", 2, "6-both-renamed-1-to-2-ours.txt" }, - { 0100644, "d8fa77b6833082c1ea36b7828a582d4c43882450", 3, "6-both-renamed-1-to-2-theirs.txt" }, - { 0100644, "d8fa77b6833082c1ea36b7828a582d4c43882450", 1, "6-both-renamed-1-to-2.txt" }, - { 0100644, "b42712cfe99a1a500b2a51fe984e0b8a7702ba11", 1, "7-both-renamed-side-1.txt" }, - { 0100644, "b42712cfe99a1a500b2a51fe984e0b8a7702ba11", 3, "7-both-renamed-side-1.txt" }, - { 0100644, "b69fe837e4cecfd4c9a40cdca7c138468687df07", 1, "7-both-renamed-side-2.txt" }, - { 0100644, "b69fe837e4cecfd4c9a40cdca7c138468687df07", 2, "7-both-renamed-side-2.txt" }, - { 0100644, "b42712cfe99a1a500b2a51fe984e0b8a7702ba11", 2, "7-both-renamed.txt" }, - { 0100644, "b69fe837e4cecfd4c9a40cdca7c138468687df07", 3, "7-both-renamed.txt" }, - }; - - struct merge_name_entry merge_name_entries[] = { - { - "3a-renamed-in-ours-deleted-in-theirs.txt", - "3a-newname-in-ours-deleted-in-theirs.txt", - "" - }, - - { - "3b-renamed-in-theirs-deleted-in-ours.txt", - "", - "3b-newname-in-theirs-deleted-in-ours.txt", - }, - - { - "4a-renamed-in-ours-added-in-theirs.txt", - "4a-newname-in-ours-added-in-theirs.txt", - "", - }, - - { - "4b-renamed-in-theirs-added-in-ours.txt", - "", - "4b-newname-in-theirs-added-in-ours.txt", - }, - - { - "5a-renamed-in-ours-added-in-theirs.txt", - "5a-newname-in-ours-added-in-theirs.txt", - "5a-renamed-in-ours-added-in-theirs.txt", - }, - - { - "5b-renamed-in-theirs-added-in-ours.txt", - "5b-renamed-in-theirs-added-in-ours.txt", - "5b-newname-in-theirs-added-in-ours.txt", - }, - - { - "6-both-renamed-1-to-2.txt", - "6-both-renamed-1-to-2-ours.txt", - "6-both-renamed-1-to-2-theirs.txt", - }, - - { - "7-both-renamed-side-1.txt", - "7-both-renamed.txt", - "7-both-renamed-side-1.txt", - }, - - { - "7-both-renamed-side-2.txt", - "7-both-renamed-side-2.txt", - "7-both-renamed.txt", - }, - }; - - struct merge_reuc_entry merge_reuc_entries[] = { - { "1a-newname-in-ours-edited-in-theirs.txt", - 0, 0100644, 0, - "", - "c3d02eeef75183df7584d8d13ac03053910c1301", - "" }, - - { "1a-newname-in-ours.txt", - 0, 0100644, 0, - "", - "d0d4594e16f2e19107e3fa7ea63e7aaaff305ffb", - "" }, - - { "1a-renamed-in-ours-edited-in-theirs.txt", - 0100644, 0, 0100644, - "c3d02eeef75183df7584d8d13ac03053910c1301", - "", - "0d872f8e871a30208305978ecbf9e66d864f1638" }, - - { "1a-renamed-in-ours.txt", - 0100644, 0, 0100644, - "d0d4594e16f2e19107e3fa7ea63e7aaaff305ffb", - "", - "d0d4594e16f2e19107e3fa7ea63e7aaaff305ffb" }, - - { "1b-newname-in-theirs-edited-in-ours.txt", - 0, 0, 0100644, - "", - "", - "241a1005cd9b980732741b74385b891142bcba28" }, - - { "1b-newname-in-theirs.txt", - 0, 0, 0100644, - "", - "", - "2b5f1f181ee3b58ea751f5dd5d8f9b445520a136" }, - - { "1b-renamed-in-theirs-edited-in-ours.txt", - 0100644, 0100644, 0, - "241a1005cd9b980732741b74385b891142bcba28", - "ed9523e62e453e50dd9be1606af19399b96e397a", - "" }, - - { "1b-renamed-in-theirs.txt", - 0100644, 0100644, 0, - "2b5f1f181ee3b58ea751f5dd5d8f9b445520a136", - "2b5f1f181ee3b58ea751f5dd5d8f9b445520a136", - "" }, - - { "2-newname-in-both.txt", - 0, 0100644, 0100644, - "", - "178940b450f238a56c0d75b7955cb57b38191982", - "178940b450f238a56c0d75b7955cb57b38191982" }, - - { "2-renamed-in-both.txt", - 0100644, 0, 0, - "178940b450f238a56c0d75b7955cb57b38191982", - "", - "" }, - }; - - cl_git_pass(merge_trees_from_branches(&index, repo, - BRANCH_RENAME_OURS, BRANCH_RENAME_THEIRS, - opts)); - - cl_assert(merge_test_index(index, merge_index_entries, 41)); - cl_assert(merge_test_names(index, merge_name_entries, 9)); - cl_assert(merge_test_reuc(index, merge_reuc_entries, 10)); - - git_index_free(index); -} - -void test_merge_trees_renames__no_rename_index(void) -{ - git_index *index; - git_merge_options opts = GIT_MERGE_OPTIONS_INIT; - - struct merge_index_entry merge_index_entries[] = { - { 0100644, "68c6c84b091926c7d90aa6a79b2bc3bb6adccd8e", 0, "0a-no-change.txt" }, - { 0100644, "f0ce2b8e4986084d9b308fb72709e414c23eb5e6", 0, "0b-duplicated-in-ours.txt" }, - { 0100644, "f0ce2b8e4986084d9b308fb72709e414c23eb5e6", 1, "0b-rewritten-in-ours.txt" }, - { 0100644, "e376fbdd06ebf021c92724da9f26f44212734e3e", 2, "0b-rewritten-in-ours.txt" }, - { 0100644, "b2d399ae15224e1d58066e3c8df70ce37de7a656", 3, "0b-rewritten-in-ours.txt" }, - { 0100644, "2f56120107d680129a5d9791b521cb1e73a2ed31", 0, "0c-duplicated-in-theirs.txt" }, - { 0100644, "2f56120107d680129a5d9791b521cb1e73a2ed31", 1, "0c-rewritten-in-theirs.txt" }, - { 0100644, "efc9121fdedaf08ba180b53ebfbcf71bd488ed09", 2, "0c-rewritten-in-theirs.txt" }, - { 0100644, "712ebba6669ea847d9829e4f1059d6c830c8b531", 3, "0c-rewritten-in-theirs.txt" }, - { 0100644, "c3d02eeef75183df7584d8d13ac03053910c1301", 0, "1a-newname-in-ours-edited-in-theirs.txt" }, - { 0100644, "d0d4594e16f2e19107e3fa7ea63e7aaaff305ffb", 0, "1a-newname-in-ours.txt" }, - { 0100644, "c3d02eeef75183df7584d8d13ac03053910c1301", 1, "1a-renamed-in-ours-edited-in-theirs.txt" }, - { 0100644, "0d872f8e871a30208305978ecbf9e66d864f1638", 3, "1a-renamed-in-ours-edited-in-theirs.txt" }, - { 0100644, "241a1005cd9b980732741b74385b891142bcba28", 0, "1b-newname-in-theirs-edited-in-ours.txt" }, - { 0100644, "2b5f1f181ee3b58ea751f5dd5d8f9b445520a136", 0, "1b-newname-in-theirs.txt" }, - { 0100644, "241a1005cd9b980732741b74385b891142bcba28", 1, "1b-renamed-in-theirs-edited-in-ours.txt" }, - { 0100644, "ed9523e62e453e50dd9be1606af19399b96e397a", 2, "1b-renamed-in-theirs-edited-in-ours.txt" }, - { 0100644, "178940b450f238a56c0d75b7955cb57b38191982", 0, "2-newname-in-both.txt" }, - { 0100644, "18cb316b1cefa0f8a6946f0e201a8e1a6f845ab9", 0, "3a-newname-in-ours-deleted-in-theirs.txt" }, - { 0100644, "36219b49367146cb2e6a1555b5a9ebd4d0328495", 0, "3b-newname-in-theirs-deleted-in-ours.txt" }, - { 0100644, "227792b52aaa0b238bea00ec7e509b02623f168c", 2, "4a-newname-in-ours-added-in-theirs.txt" }, - { 0100644, "8b5b53cb2aa9ceb1139f5312fcfa3cc3c5a47c9a", 3, "4a-newname-in-ours-added-in-theirs.txt" }, - { 0100644, "de872ee3618b894992e9d1e18ba2ebe256a112f9", 2, "4b-newname-in-theirs-added-in-ours.txt" }, - { 0100644, "98d52d07c0b0bbf2b46548f6aa521295c2cb55db", 3, "4b-newname-in-theirs-added-in-ours.txt" }, - { 0100644, "d3719a5ae8e4d92276b5313ce976f6ee5af2b436", 2, "5a-newname-in-ours-added-in-theirs.txt" }, - { 0100644, "98ba4205fcf31f5dd93c916d35fe3f3b3d0e6714", 3, "5a-newname-in-ours-added-in-theirs.txt" }, - { 0100644, "385c8a0f26ddf79e9041e15e17dc352ed2c4cced", 2, "5b-newname-in-theirs-added-in-ours.txt" }, - { 0100644, "63247125386de9ec90a27ad36169307bf8a11a38", 3, "5b-newname-in-theirs-added-in-ours.txt" }, - { 0100644, "d8fa77b6833082c1ea36b7828a582d4c43882450", 0, "6-both-renamed-1-to-2-ours.txt" }, - { 0100644, "d8fa77b6833082c1ea36b7828a582d4c43882450", 0, "6-both-renamed-1-to-2-theirs.txt" }, - { 0100644, "b42712cfe99a1a500b2a51fe984e0b8a7702ba11", 2, "7-both-renamed.txt" }, - { 0100644, "b69fe837e4cecfd4c9a40cdca7c138468687df07", 3, "7-both-renamed.txt" }, - }; - - cl_git_pass(merge_trees_from_branches(&index, repo, - BRANCH_RENAME_OURS, BRANCH_RENAME_THEIRS, - &opts)); - - cl_assert(merge_test_index(index, merge_index_entries, 32)); - - git_index_free(index); -} diff --git a/vendor/libgit2/tests/merge/trees/treediff.c b/vendor/libgit2/tests/merge/trees/treediff.c deleted file mode 100644 index 3634568de..000000000 --- a/vendor/libgit2/tests/merge/trees/treediff.c +++ /dev/null @@ -1,554 +0,0 @@ -#include "clar_libgit2.h" -#include "git2/tree.h" -#include "merge.h" -#include "../merge_helpers.h" -#include "diff.h" -#include "git2/sys/hashsig.h" - -static git_repository *repo; - -#define TEST_REPO_PATH "merge-resolve" - -#define TREE_OID_ANCESTOR "0d52e3a556e189ba0948ae56780918011c1b167d" -#define TREE_OID_MASTER "1f81433e3161efbf250576c58fede7f6b836f3d3" -#define TREE_OID_BRANCH "eea9286df54245fea72c5b557291470eb825f38f" -#define TREE_OID_RENAMES1 "f5f9dd5886a6ee20272be0aafc790cba43b31931" -#define TREE_OID_RENAMES2 "5fbfbdc04b4eca46f54f4853a3c5a1dce28f5165" - -#define TREE_OID_DF_ANCESTOR "b8a3a806d3950e8c0a03a34f234a92eff0e2c68d" -#define TREE_OID_DF_SIDE1 "ee1d6f164893c1866a323f072eeed36b855656be" -#define TREE_OID_DF_SIDE2 "6178885b38fe96e825ac0f492c0a941f288b37f6" - -#define TREE_OID_RENAME_CONFLICT_ANCESTOR "476dbb3e207313d1d8aaa120c6ad204bf1295e53" -#define TREE_OID_RENAME_CONFLICT_OURS "c4efe31e9decccc8b2b4d3df9aac2cdfe2995618" -#define TREE_OID_RENAME_CONFLICT_THEIRS "9e7f4359c469f309b6057febf4c6e80742cbed5b" - -void test_merge_trees_treediff__initialize(void) -{ - repo = cl_git_sandbox_init(TEST_REPO_PATH); -} - -void test_merge_trees_treediff__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -static void test_find_differences( - const char *ancestor_oidstr, - const char *ours_oidstr, - const char *theirs_oidstr, - struct merge_index_conflict_data *treediff_conflict_data, - size_t treediff_conflict_data_len) -{ - git_merge_diff_list *merge_diff_list = git_merge_diff_list__alloc(repo); - git_oid ancestor_oid, ours_oid, theirs_oid; - git_tree *ancestor_tree, *ours_tree, *theirs_tree; - git_iterator *ancestor_iter, *ours_iter, *theirs_iter; - git_iterator_options iter_opts = GIT_ITERATOR_OPTIONS_INIT; - - git_merge_options opts = GIT_MERGE_OPTIONS_INIT; - opts.flags |= GIT_MERGE_FIND_RENAMES; - opts.target_limit = 1000; - opts.rename_threshold = 50; - - opts.metric = git__malloc(sizeof(git_diff_similarity_metric)); - cl_assert(opts.metric != NULL); - - opts.metric->file_signature = git_diff_find_similar__hashsig_for_file; - opts.metric->buffer_signature = git_diff_find_similar__hashsig_for_buf; - opts.metric->free_signature = git_diff_find_similar__hashsig_free; - opts.metric->similarity = git_diff_find_similar__calc_similarity; - opts.metric->payload = (void *)GIT_HASHSIG_SMART_WHITESPACE; - - cl_git_pass(git_oid_fromstr(&ancestor_oid, ancestor_oidstr)); - cl_git_pass(git_oid_fromstr(&ours_oid, ours_oidstr)); - cl_git_pass(git_oid_fromstr(&theirs_oid, theirs_oidstr)); - - cl_git_pass(git_tree_lookup(&ancestor_tree, repo, &ancestor_oid)); - cl_git_pass(git_tree_lookup(&ours_tree, repo, &ours_oid)); - cl_git_pass(git_tree_lookup(&theirs_tree, repo, &theirs_oid)); - - iter_opts.flags = GIT_ITERATOR_DONT_IGNORE_CASE; - - cl_git_pass(git_iterator_for_tree(&ancestor_iter, ancestor_tree, &iter_opts)); - cl_git_pass(git_iterator_for_tree(&ours_iter, ours_tree, &iter_opts)); - cl_git_pass(git_iterator_for_tree(&theirs_iter, theirs_tree, &iter_opts)); - - cl_git_pass(git_merge_diff_list__find_differences(merge_diff_list, ancestor_iter, ours_iter, theirs_iter)); - cl_git_pass(git_merge_diff_list__find_renames(repo, merge_diff_list, &opts)); - - /* - dump_merge_index(merge_index); - */ - - cl_assert(treediff_conflict_data_len == merge_diff_list->conflicts.length); - - cl_assert(merge_test_merge_conflicts(&merge_diff_list->conflicts, treediff_conflict_data, treediff_conflict_data_len)); - - git_iterator_free(ancestor_iter); - git_iterator_free(ours_iter); - git_iterator_free(theirs_iter); - - git_tree_free(ancestor_tree); - git_tree_free(ours_tree); - git_tree_free(theirs_tree); - - git_merge_diff_list__free(merge_diff_list); - - git__free(opts.metric); -} - -void test_merge_trees_treediff__simple(void) -{ - struct merge_index_conflict_data treediff_conflict_data[] = { - { - { { 0, "", 0, "" }, GIT_DELTA_UNMODIFIED }, - { { 0100644, "233c0919c998ed110a4b6ff36f353aec8b713487", 0, "added-in-master.txt" }, GIT_DELTA_ADDED }, - { { 0, "", 0, "" }, GIT_DELTA_UNMODIFIED }, - GIT_MERGE_DIFF_NONE - }, - - { - { { 0100644, "6212c31dab5e482247d7977e4f0dd3601decf13b", 0, "automergeable.txt" }, GIT_DELTA_UNMODIFIED }, - { { 0100644, "ee3fa1b8c00aff7fe02065fdb50864bb0d932ccf", 0, "automergeable.txt" }, GIT_DELTA_MODIFIED }, - { { 0100644, "058541fc37114bfc1dddf6bd6bffc7fae5c2e6fe", 0, "automergeable.txt" }, GIT_DELTA_MODIFIED }, - GIT_MERGE_DIFF_BOTH_MODIFIED - }, - - { - { { 0100644, "ab6c44a2e84492ad4b41bb6bac87353e9d02ac8b", 0, "changed-in-branch.txt" }, GIT_DELTA_UNMODIFIED }, - { { 0100644, "ab6c44a2e84492ad4b41bb6bac87353e9d02ac8b", 0, "changed-in-branch.txt" }, GIT_DELTA_UNMODIFIED }, - { { 0100644, "4eb04c9e79e88f6640d01ff5b25ca2a60764f216", 0, "changed-in-branch.txt" }, GIT_DELTA_MODIFIED }, - GIT_MERGE_DIFF_NONE - }, - - { - { { 0100644, "ab6c44a2e84492ad4b41bb6bac87353e9d02ac8b", 0, "changed-in-master.txt" }, GIT_DELTA_UNMODIFIED }, - { { 0100644, "11deab00b2d3a6f5a3073988ac050c2d7b6655e2", 0, "changed-in-master.txt" }, GIT_DELTA_MODIFIED }, - { { 0100644, "ab6c44a2e84492ad4b41bb6bac87353e9d02ac8b", 0, "changed-in-master.txt" }, GIT_DELTA_UNMODIFIED }, - GIT_MERGE_DIFF_NONE - }, - - { - { { 0100644, "d427e0b2e138501a3d15cc376077a3631e15bd46", 0, "conflicting.txt" }, GIT_DELTA_UNMODIFIED }, - { { 0100644, "4e886e602529caa9ab11d71f86634bd1b6e0de10", 0, "conflicting.txt" }, GIT_DELTA_MODIFIED }, - { { 0100644, "2bd0a343aeef7a2cf0d158478966a6e587ff3863", 0, "conflicting.txt" }, GIT_DELTA_MODIFIED }, - GIT_MERGE_DIFF_BOTH_MODIFIED - }, - - { - { { 0100644, "dfe3f22baa1f6fce5447901c3086bae368de6bdd", 0, "removed-in-branch.txt" }, GIT_DELTA_UNMODIFIED }, - { { 0100644, "dfe3f22baa1f6fce5447901c3086bae368de6bdd", 0, "removed-in-branch.txt" }, GIT_DELTA_UNMODIFIED }, - { { 0, "", 0, "" }, GIT_DELTA_DELETED }, - GIT_MERGE_DIFF_NONE - }, - - { - { { 0100644, "5c3b68a71fc4fa5d362fd3875e53137c6a5ab7a5", 0, "removed-in-master.txt" }, GIT_DELTA_UNMODIFIED }, - { { 0, "", 0, "" }, GIT_DELTA_DELETED }, - { { 0100644, "5c3b68a71fc4fa5d362fd3875e53137c6a5ab7a5", 0, "removed-in-master.txt" }, GIT_DELTA_UNMODIFIED }, - GIT_MERGE_DIFF_NONE - }, - }; - - test_find_differences(TREE_OID_ANCESTOR, TREE_OID_MASTER, TREE_OID_BRANCH, treediff_conflict_data, 7); -} - -void test_merge_trees_treediff__df_conflicts(void) -{ - struct merge_index_conflict_data treediff_conflict_data[] = { - { - { { 0, "", 0, "" }, GIT_DELTA_UNMODIFIED }, - { { 0100644, "49130a28ef567af9a6a6104c38773fedfa5f9742", 0, "dir-10" }, GIT_DELTA_ADDED }, - { { 0100644, "6c06dcd163587c2cc18be44857e0b71116382aeb", 0, "dir-10" }, GIT_DELTA_ADDED }, - GIT_MERGE_DIFF_BOTH_ADDED, - }, - - { - { { 0100644, "242591eb280ee9eeb2ce63524b9a8b9bc4cb515d", 0, "dir-10/file.txt" }, GIT_DELTA_UNMODIFIED }, - { { 0, "", 0, "" }, GIT_DELTA_DELETED }, - { { 0, "", 0, "" }, GIT_DELTA_DELETED }, - GIT_MERGE_DIFF_BOTH_DELETED, - }, - - { - { { 0, "", 0, "" }, GIT_DELTA_UNMODIFIED }, - { { 0, "", 0, "" }, GIT_DELTA_UNMODIFIED }, - { { 0100644, "43aafd43bea779ec74317dc361f45ae3f532a505", 0, "dir-6" }, GIT_DELTA_ADDED }, - GIT_MERGE_DIFF_NONE, - }, - - { - { { 0100644, "cf8c5cc8a85a1ff5a4ba51e0bc7cf5665669924d", 0, "dir-6/file.txt" }, GIT_DELTA_UNMODIFIED }, - { { 0100644, "cf8c5cc8a85a1ff5a4ba51e0bc7cf5665669924d", 0, "dir-6/file.txt" }, GIT_DELTA_UNMODIFIED }, - { { 0, "", 0, "" }, GIT_DELTA_DELETED }, - GIT_MERGE_DIFF_NONE, - }, - - { - { { 0, "", 0, "" }, GIT_DELTA_UNMODIFIED }, - { { 0, "", 0, "" }, GIT_DELTA_UNMODIFIED }, - { { 0100644, "a031a28ae70e33a641ce4b8a8f6317f1ab79dee4", 0, "dir-7" }, GIT_DELTA_ADDED }, - GIT_MERGE_DIFF_DIRECTORY_FILE, - }, - - { - { { 0100644, "5012fd565b1393bdfda1805d4ec38ce6619e1fd1", 0, "dir-7/file.txt" }, GIT_DELTA_UNMODIFIED }, - { { 0100644, "a5563304ddf6caba25cb50323a2ea6f7dbfcadca", 0, "dir-7/file.txt" }, GIT_DELTA_MODIFIED }, - { { 0, "", 0, "" }, GIT_DELTA_DELETED }, - GIT_MERGE_DIFF_DF_CHILD, - }, - - { - { { 0, "", 0, "" }, GIT_DELTA_UNMODIFIED }, - { { 0100644, "e9ad6ec3e38364a3d07feda7c4197d4d845c53b5", 0, "dir-8" }, GIT_DELTA_ADDED }, - { {0, "", 0, "" }, GIT_DELTA_UNMODIFIED }, - GIT_MERGE_DIFF_NONE, - }, - - { - { { 0100644, "f20c9063fa0bda9a397c96947a7b687305c49753", 0, "dir-8/file.txt" }, GIT_DELTA_UNMODIFIED }, - { { 0, "", 0, "" }, GIT_DELTA_DELETED }, - { { 0100644, "f20c9063fa0bda9a397c96947a7b687305c49753", 0, "dir-8/file.txt" }, GIT_DELTA_UNMODIFIED }, - GIT_MERGE_DIFF_NONE, - }, - - { - { { 0, "", 0, "" }, GIT_DELTA_UNMODIFIED }, - { { 0100644, "3ef4d30382ca33fdeba9fda895a99e0891ba37aa", 0, "dir-9" }, GIT_DELTA_ADDED }, - { { 0, "", 0, "" }, GIT_DELTA_UNMODIFIED }, - GIT_MERGE_DIFF_DIRECTORY_FILE, - }, - - { - { { 0100644, "fc4c636d6515e9e261f9260dbcf3cc6eca97ea08", 0, "dir-9/file.txt" }, GIT_DELTA_UNMODIFIED }, - { { 0, "", 0, "" }, GIT_DELTA_DELETED }, - { { 0100644, "76ab0e2868197ec158ddd6c78d8a0d2fd73d38f9", 0, "dir-9/file.txt" }, GIT_DELTA_MODIFIED }, - GIT_MERGE_DIFF_DF_CHILD, - }, - - { - { { 0100644, "1e4ff029aee68d0d69ef9eb6efa6cbf1ec732f99", 0, "file-1" }, GIT_DELTA_UNMODIFIED }, - { { 0100644, "1e4ff029aee68d0d69ef9eb6efa6cbf1ec732f99", 0, "file-1" }, GIT_DELTA_UNMODIFIED }, - { { 0, "", 0, "" }, GIT_DELTA_DELETED }, - GIT_MERGE_DIFF_NONE, - }, - - { - { { 0, "", 0, "" }, GIT_DELTA_UNMODIFIED }, - { { 0, "", 0, "" }, GIT_DELTA_UNMODIFIED }, - { { 0100644, "5c2411f8075f48a6b2fdb85ebc0d371747c4df15", 0, "file-1/new" }, GIT_DELTA_ADDED }, - GIT_MERGE_DIFF_NONE, - }, - - { - { { 0100644, "a39a620dae5bc8b4e771cd4d251b7d080401a21e", 0, "file-2" }, GIT_DELTA_UNMODIFIED }, - { { 0100644, "d963979c237d08b6ba39062ee7bf64c7d34a27f8", 0, "file-2" }, GIT_DELTA_MODIFIED }, - { { 0, "", 0, "" }, GIT_DELTA_DELETED }, - GIT_MERGE_DIFF_DIRECTORY_FILE, - }, - - { - { { 0, "", 0, "" }, GIT_DELTA_UNMODIFIED }, - { { 0, "", 0, "" }, GIT_DELTA_UNMODIFIED }, - { { 0100644, "5c341ead2ba6f2af98ce5ec3fe84f6b6d2899c0d", 0, "file-2/new" }, GIT_DELTA_ADDED }, - GIT_MERGE_DIFF_DF_CHILD, - }, - - { - { { 0100644, "032ebc5ab85d9553bb187d3cd40875ff23a63ed0", 0, "file-3" }, GIT_DELTA_UNMODIFIED }, - { { 0, "", 0, "" }, GIT_DELTA_DELETED }, - { { 0100644, "032ebc5ab85d9553bb187d3cd40875ff23a63ed0", 0, "file-3" }, GIT_DELTA_UNMODIFIED }, - GIT_MERGE_DIFF_NONE, - }, - - { - { { 0, "", 0, "" }, GIT_DELTA_UNMODIFIED }, - { { 0100644, "9efe7723802d4305142eee177e018fee1572c4f4", 0, "file-3/new" }, GIT_DELTA_ADDED }, - { { 0, "", 0, "" }, GIT_DELTA_UNMODIFIED }, - GIT_MERGE_DIFF_NONE, - }, - - { - { { 0100644, "bacac9b3493509aa15e1730e1545fc0919d1dae0", 0, "file-4" }, GIT_DELTA_UNMODIFIED }, - { { 0, "", 0, "" }, GIT_DELTA_DELETED }, - { { 0100644, "7663fce0130db092936b137cabd693ec234eb060", 0, "file-4" }, GIT_DELTA_MODIFIED }, - GIT_MERGE_DIFF_DIRECTORY_FILE, - }, - - { - { { 0, "", 0, "" }, GIT_DELTA_UNMODIFIED }, - { { 0100644, "e49f917b448d1340b31d76e54ba388268fd4c922", 0, "file-4/new" }, GIT_DELTA_ADDED }, - { { 0, "", 0, "" }, GIT_DELTA_UNMODIFIED }, - GIT_MERGE_DIFF_DF_CHILD, - }, - - { - { { 0100644, "ac4045f965119e6998f4340ed0f411decfb3ec05", 0, "file-5" }, GIT_DELTA_UNMODIFIED }, - { { 0, "", 0, "" }, GIT_DELTA_DELETED }, - { { 0, "", 0, "" }, GIT_DELTA_DELETED }, - GIT_MERGE_DIFF_BOTH_DELETED, - }, - - { - { { 0, "", 0, "" }, GIT_DELTA_UNMODIFIED }, - { { 0100644, "cab2cf23998b40f1af2d9d9a756dc9e285a8df4b", 0, "file-5/new" }, GIT_DELTA_ADDED }, - { { 0100644, "f5504f36e6f4eb797a56fc5bac6c6c7f32969bf2", 0, "file-5/new" }, GIT_DELTA_ADDED }, - GIT_MERGE_DIFF_BOTH_ADDED, - }, - }; - - test_find_differences(TREE_OID_DF_ANCESTOR, TREE_OID_DF_SIDE1, TREE_OID_DF_SIDE2, treediff_conflict_data, 20); -} - -void test_merge_trees_treediff__strict_renames(void) -{ - struct merge_index_conflict_data treediff_conflict_data[] = { - { - { { 0, "", 0, "" }, GIT_DELTA_UNMODIFIED }, - { { 0100644, "233c0919c998ed110a4b6ff36f353aec8b713487", 0, "added-in-master.txt" }, GIT_DELTA_ADDED }, - { { 0, "", 0, "" }, GIT_DELTA_UNMODIFIED }, - GIT_MERGE_DIFF_NONE, - }, - - { - { { 0100644, "6212c31dab5e482247d7977e4f0dd3601decf13b", 0, "automergeable.txt" }, GIT_DELTA_UNMODIFIED }, - { { 0100644, "ee3fa1b8c00aff7fe02065fdb50864bb0d932ccf", 0, "automergeable.txt" }, GIT_DELTA_MODIFIED }, - { { 0100644, "6212c31dab5e482247d7977e4f0dd3601decf13b", 0, "automergeable.txt" }, GIT_DELTA_UNMODIFIED }, - GIT_MERGE_DIFF_NONE, - }, - - { - { { 0100644, "ab6c44a2e84492ad4b41bb6bac87353e9d02ac8b", 0, "changed-in-master.txt" }, GIT_DELTA_UNMODIFIED }, - { { 0100644, "11deab00b2d3a6f5a3073988ac050c2d7b6655e2", 0, "changed-in-master.txt" }, GIT_DELTA_MODIFIED }, - { { 0100644, "ab6c44a2e84492ad4b41bb6bac87353e9d02ac8b", 0, "changed-in-master.txt" }, GIT_DELTA_UNMODIFIED }, - GIT_MERGE_DIFF_NONE, - }, - - { - { { 0100644, "d427e0b2e138501a3d15cc376077a3631e15bd46", 0, "conflicting.txt" }, GIT_DELTA_UNMODIFIED }, - { { 0100644, "4e886e602529caa9ab11d71f86634bd1b6e0de10", 0, "conflicting.txt" }, GIT_DELTA_MODIFIED }, - { { 0100644, "d427e0b2e138501a3d15cc376077a3631e15bd46", 0, "conflicting.txt" }, GIT_DELTA_UNMODIFIED }, - GIT_MERGE_DIFF_NONE, - }, - - { - { { 0100644, "dfe3f22baa1f6fce5447901c3086bae368de6bdd", 0, "removed-in-branch.txt" }, GIT_DELTA_UNMODIFIED }, - { { 0100644, "dfe3f22baa1f6fce5447901c3086bae368de6bdd", 0, "removed-in-branch.txt" }, GIT_DELTA_UNMODIFIED }, - { { 0100644, "dfe3f22baa1f6fce5447901c3086bae368de6bdd", 0, "renamed-in-branch.txt" }, GIT_DELTA_RENAMED }, - GIT_MERGE_DIFF_NONE, - }, - - { - { { 0100644, "5c3b68a71fc4fa5d362fd3875e53137c6a5ab7a5", 0, "removed-in-master.txt" }, GIT_DELTA_UNMODIFIED }, - { { 0, "", 0, "" }, GIT_DELTA_DELETED }, - { { 0100644, "5c3b68a71fc4fa5d362fd3875e53137c6a5ab7a5", 0, "removed-in-master.txt" }, GIT_DELTA_UNMODIFIED }, - GIT_MERGE_DIFF_NONE, - }, - - { - { { 0, "", 0, "" }, GIT_DELTA_UNMODIFIED }, - { { 0, "", 0, "" }, GIT_DELTA_UNMODIFIED }, - { { 0100644, "c8f06f2e3bb2964174677e91f0abead0e43c9e5d", 0, "renamed.txt" }, GIT_DELTA_ADDED }, - GIT_MERGE_DIFF_NONE, - }, - - { - { { 0100644, "c8f06f2e3bb2964174677e91f0abead0e43c9e5d", 0, "unchanged.txt" }, GIT_DELTA_UNMODIFIED }, - { { 0100644, "c8f06f2e3bb2964174677e91f0abead0e43c9e5d", 0, "unchanged.txt" }, GIT_DELTA_UNMODIFIED }, - { { 0100644, "c8f06f2e3bb2964174677e91f0abead0e43c9e5d", 0, "copied.txt" }, GIT_DELTA_RENAMED }, - GIT_MERGE_DIFF_NONE, - }, - }; - - test_find_differences(TREE_OID_ANCESTOR, TREE_OID_MASTER, TREE_OID_RENAMES1, treediff_conflict_data, 8); -} - -void test_merge_trees_treediff__rename_conflicts(void) -{ - struct merge_index_conflict_data treediff_conflict_data[] = { - { - { { 0, "", 0, "" }, GIT_DELTA_UNMODIFIED }, - { { 0100644, "f0ce2b8e4986084d9b308fb72709e414c23eb5e6", 0, "0b-duplicated-in-ours.txt" }, GIT_DELTA_ADDED }, - { { 0, "", 0, "" }, GIT_DELTA_UNMODIFIED }, - GIT_MERGE_DIFF_NONE, - }, - - { - { { 0100644, "f0ce2b8e4986084d9b308fb72709e414c23eb5e6", 0, "0b-rewritten-in-ours.txt" }, GIT_DELTA_UNMODIFIED }, - { { 0100644, "e376fbdd06ebf021c92724da9f26f44212734e3e", 0, "0b-rewritten-in-ours.txt" }, GIT_DELTA_MODIFIED }, - { { 0100644, "b2d399ae15224e1d58066e3c8df70ce37de7a656", 0, "0b-rewritten-in-ours.txt" }, GIT_DELTA_MODIFIED }, - GIT_MERGE_DIFF_BOTH_MODIFIED, - }, - - { - { { 0, "", 0, "" }, GIT_DELTA_UNMODIFIED }, - { { 0, "", 0, "" }, GIT_DELTA_UNMODIFIED }, - { { 0100644, "2f56120107d680129a5d9791b521cb1e73a2ed31", 0, "0c-duplicated-in-theirs.txt" }, GIT_DELTA_ADDED }, - GIT_MERGE_DIFF_NONE, - }, - - { - { { 0100644, "2f56120107d680129a5d9791b521cb1e73a2ed31", 0, "0c-rewritten-in-theirs.txt" }, GIT_DELTA_UNMODIFIED }, - { { 0100644, "efc9121fdedaf08ba180b53ebfbcf71bd488ed09", 0, "0c-rewritten-in-theirs.txt" }, GIT_DELTA_MODIFIED }, - { { 0100644, "712ebba6669ea847d9829e4f1059d6c830c8b531", 0, "0c-rewritten-in-theirs.txt" }, GIT_DELTA_MODIFIED }, - GIT_MERGE_DIFF_BOTH_MODIFIED, - }, - - { - { { 0100644, "c3d02eeef75183df7584d8d13ac03053910c1301", 0, "1a-renamed-in-ours-edited-in-theirs.txt" }, GIT_DELTA_UNMODIFIED }, - { { 0100644, "c3d02eeef75183df7584d8d13ac03053910c1301", 0, "1a-newname-in-ours-edited-in-theirs.txt" }, GIT_DELTA_RENAMED }, - { { 0100644, "0d872f8e871a30208305978ecbf9e66d864f1638", 0, "1a-renamed-in-ours-edited-in-theirs.txt" }, GIT_DELTA_MODIFIED }, - GIT_MERGE_DIFF_RENAMED_MODIFIED, - }, - - { - { { 0100644, "d0d4594e16f2e19107e3fa7ea63e7aaaff305ffb", 0, "1a-renamed-in-ours.txt" }, GIT_DELTA_UNMODIFIED }, - { { 0100644, "d0d4594e16f2e19107e3fa7ea63e7aaaff305ffb", 0, "1a-newname-in-ours.txt" }, GIT_DELTA_RENAMED }, - { { 0100644, "d0d4594e16f2e19107e3fa7ea63e7aaaff305ffb", 0, "1a-renamed-in-ours.txt" }, GIT_DELTA_UNMODIFIED }, - GIT_MERGE_DIFF_NONE, - }, - - { - { { 0100644, "241a1005cd9b980732741b74385b891142bcba28", 0, "1b-renamed-in-theirs-edited-in-ours.txt" }, GIT_DELTA_UNMODIFIED }, - { { 0100644, "ed9523e62e453e50dd9be1606af19399b96e397a", 0, "1b-renamed-in-theirs-edited-in-ours.txt" }, GIT_DELTA_MODIFIED }, - { { 0100644, "241a1005cd9b980732741b74385b891142bcba28", 0, "1b-newname-in-theirs-edited-in-ours.txt" }, GIT_DELTA_RENAMED }, - GIT_MERGE_DIFF_RENAMED_MODIFIED, - }, - - { - { { 0100644, "2b5f1f181ee3b58ea751f5dd5d8f9b445520a136", 0, "1b-renamed-in-theirs.txt" }, GIT_DELTA_UNMODIFIED }, - { { 0100644, "2b5f1f181ee3b58ea751f5dd5d8f9b445520a136", 0, "1b-renamed-in-theirs.txt" }, GIT_DELTA_UNMODIFIED }, - { { 0100644, "2b5f1f181ee3b58ea751f5dd5d8f9b445520a136", 0, "1b-newname-in-theirs.txt" }, GIT_DELTA_RENAMED }, - GIT_MERGE_DIFF_NONE, - }, - - { - { { 0100644, "178940b450f238a56c0d75b7955cb57b38191982", 0, "2-renamed-in-both.txt" }, GIT_DELTA_UNMODIFIED }, - { { 0100644, "178940b450f238a56c0d75b7955cb57b38191982", 0, "2-newname-in-both.txt" }, GIT_DELTA_RENAMED }, - { { 0100644, "178940b450f238a56c0d75b7955cb57b38191982", 0, "2-newname-in-both.txt" }, GIT_DELTA_RENAMED }, - GIT_MERGE_DIFF_BOTH_RENAMED, - }, - - { - { { 0100644, "18cb316b1cefa0f8a6946f0e201a8e1a6f845ab9", 0, "3a-renamed-in-ours-deleted-in-theirs.txt" }, GIT_DELTA_UNMODIFIED }, - { { 0100644, "18cb316b1cefa0f8a6946f0e201a8e1a6f845ab9", 0, "3a-newname-in-ours-deleted-in-theirs.txt" }, GIT_DELTA_RENAMED }, - { { 0, "", 0, "" }, GIT_DELTA_DELETED }, - GIT_MERGE_DIFF_RENAMED_DELETED, - }, - - { - { { 0100644, "36219b49367146cb2e6a1555b5a9ebd4d0328495", 0, "3b-renamed-in-theirs-deleted-in-ours.txt" }, GIT_DELTA_UNMODIFIED }, - { { 0, "", 0, "" }, GIT_DELTA_DELETED }, - { { 0100644, "36219b49367146cb2e6a1555b5a9ebd4d0328495", 0, "3b-newname-in-theirs-deleted-in-ours.txt" }, GIT_DELTA_RENAMED }, - GIT_MERGE_DIFF_RENAMED_DELETED, - }, - - { - { { 0, "", 0, "" }, GIT_DELTA_UNMODIFIED }, - { { 0, "", 0, "" }, GIT_DELTA_UNMODIFIED }, - { { 0100644, "8b5b53cb2aa9ceb1139f5312fcfa3cc3c5a47c9a", 0, "4a-newname-in-ours-added-in-theirs.txt" }, GIT_DELTA_ADDED }, - GIT_MERGE_DIFF_RENAMED_ADDED, - }, - - { - { { 0100644, "227792b52aaa0b238bea00ec7e509b02623f168c", 0, "4a-renamed-in-ours-added-in-theirs.txt" }, GIT_DELTA_UNMODIFIED }, - { { 0100644, "227792b52aaa0b238bea00ec7e509b02623f168c", 0, "4a-newname-in-ours-added-in-theirs.txt" }, GIT_DELTA_RENAMED }, - { { 0, "", 0, "" }, GIT_DELTA_DELETED }, - GIT_MERGE_DIFF_RENAMED_ADDED, - }, - - { - { { 0, "", 0, "" }, GIT_DELTA_UNMODIFIED }, - { { 0100644, "de872ee3618b894992e9d1e18ba2ebe256a112f9", 0, "4b-newname-in-theirs-added-in-ours.txt" }, GIT_DELTA_ADDED }, - { { 0, "", 0, "" }, GIT_DELTA_UNMODIFIED }, - GIT_MERGE_DIFF_RENAMED_ADDED, - }, - - { - { { 0100644, "98d52d07c0b0bbf2b46548f6aa521295c2cb55db", 0, "4b-renamed-in-theirs-added-in-ours.txt" }, GIT_DELTA_UNMODIFIED }, - { { 0, "", 0, "" }, GIT_DELTA_DELETED }, - { { 0100644, "98d52d07c0b0bbf2b46548f6aa521295c2cb55db", 0, "4b-newname-in-theirs-added-in-ours.txt" }, GIT_DELTA_RENAMED }, - GIT_MERGE_DIFF_RENAMED_ADDED, - }, - - { - { { 0100644, "d8fa77b6833082c1ea36b7828a582d4c43882450", 0, "5-both-renamed-1-to-2.txt" }, GIT_DELTA_UNMODIFIED }, - { { 0100644, "d8fa77b6833082c1ea36b7828a582d4c43882450", 0, "5-both-renamed-1-to-2-ours.txt" }, GIT_DELTA_RENAMED }, - { { 0100644, "d8fa77b6833082c1ea36b7828a582d4c43882450", 0, "5-both-renamed-1-to-2-theirs.txt" }, GIT_DELTA_RENAMED }, - GIT_MERGE_DIFF_BOTH_RENAMED_1_TO_2, - }, - - { - { { 0100644, "b42712cfe99a1a500b2a51fe984e0b8a7702ba11", 0, "6-both-renamed-side-1.txt" }, GIT_DELTA_UNMODIFIED }, - { { 0100644, "b42712cfe99a1a500b2a51fe984e0b8a7702ba11", 0, "6-both-renamed.txt" }, GIT_DELTA_RENAMED }, - { { 0100644, "b42712cfe99a1a500b2a51fe984e0b8a7702ba11", 0, "6-both-renamed-side-1.txt" }, GIT_DELTA_UNMODIFIED }, - GIT_MERGE_DIFF_BOTH_RENAMED_2_TO_1, - }, - - { - { { 0100644, "b69fe837e4cecfd4c9a40cdca7c138468687df07", 0, "6-both-renamed-side-2.txt" }, GIT_DELTA_UNMODIFIED }, - { { 0100644, "b69fe837e4cecfd4c9a40cdca7c138468687df07", 0, "6-both-renamed-side-2.txt" }, GIT_DELTA_UNMODIFIED }, - { { 0100644, "b69fe837e4cecfd4c9a40cdca7c138468687df07", 0, "6-both-renamed.txt" }, GIT_DELTA_RENAMED }, - GIT_MERGE_DIFF_BOTH_RENAMED_2_TO_1, - }, - }; - test_find_differences(TREE_OID_RENAME_CONFLICT_ANCESTOR, - TREE_OID_RENAME_CONFLICT_OURS, TREE_OID_RENAME_CONFLICT_THEIRS, treediff_conflict_data, 18); -} - -void test_merge_trees_treediff__best_renames(void) -{ - struct merge_index_conflict_data treediff_conflict_data[] = { - { - { { 0, "", 0, "" }, GIT_DELTA_UNMODIFIED }, - { { 0100644, "233c0919c998ed110a4b6ff36f353aec8b713487", 0, "added-in-master.txt" }, GIT_DELTA_ADDED }, - { { 0, "", 0, "" }, GIT_DELTA_UNMODIFIED }, - GIT_MERGE_DIFF_NONE, - }, - - { - { { 0100644, "6212c31dab5e482247d7977e4f0dd3601decf13b", 0, "automergeable.txt" }, GIT_DELTA_UNMODIFIED }, - { { 0100644, "ee3fa1b8c00aff7fe02065fdb50864bb0d932ccf", 0, "automergeable.txt" }, GIT_DELTA_MODIFIED }, - { { 0100644, "45299c1ca5e07bba1fd90843056fb559f96b1f5a", 0, "renamed-90.txt" }, GIT_DELTA_RENAMED }, - GIT_MERGE_DIFF_RENAMED_MODIFIED, - }, - - { - { { 0100644, "ab6c44a2e84492ad4b41bb6bac87353e9d02ac8b", 0, "changed-in-master.txt" }, GIT_DELTA_UNMODIFIED }, - { { 0100644, "11deab00b2d3a6f5a3073988ac050c2d7b6655e2", 0, "changed-in-master.txt" }, GIT_DELTA_MODIFIED }, - { { 0100644, "ab6c44a2e84492ad4b41bb6bac87353e9d02ac8b", 0, "changed-in-master.txt" }, GIT_DELTA_UNMODIFIED }, - GIT_MERGE_DIFF_NONE, - }, - - { - { { 0100644, "d427e0b2e138501a3d15cc376077a3631e15bd46", 0, "conflicting.txt" }, GIT_DELTA_UNMODIFIED }, - { { 0100644, "4e886e602529caa9ab11d71f86634bd1b6e0de10", 0, "conflicting.txt" }, GIT_DELTA_MODIFIED }, - { { 0100644, "d427e0b2e138501a3d15cc376077a3631e15bd46", 0, "conflicting.txt" }, GIT_DELTA_UNMODIFIED }, - GIT_MERGE_DIFF_NONE, - }, - - { - { { 0100644, "5c3b68a71fc4fa5d362fd3875e53137c6a5ab7a5", 0, "removed-in-master.txt" },GIT_DELTA_UNMODIFIED }, - { { 0, "", 0, "" }, GIT_DELTA_DELETED }, - { { 0100644, "5c3b68a71fc4fa5d362fd3875e53137c6a5ab7a5", 0, "removed-in-master.txt" }, GIT_DELTA_UNMODIFIED }, - GIT_MERGE_DIFF_MODIFIED_DELETED, - }, - - { - { { 0, "", 0, "" }, GIT_DELTA_UNMODIFIED }, - { { 0, "", 0, "" }, GIT_DELTA_UNMODIFIED }, - { { 0100644, "5843febcb23480df0b5edb22a21c59c772bb8e29", 0, "renamed-50.txt" }, GIT_DELTA_ADDED }, - GIT_MERGE_DIFF_NONE, - }, - - { - { { 0, "", 0, "" }, GIT_DELTA_UNMODIFIED }, - { { 0, "", 0, "" }, GIT_DELTA_UNMODIFIED }, - { { 0100644, "a77a56a49f8f3ae242e02717f18ebbc60c5cc543", 0, "renamed-75.txt" }, GIT_DELTA_ADDED }, - GIT_MERGE_DIFF_NONE, - }, - }; - - test_find_differences(TREE_OID_ANCESTOR, TREE_OID_MASTER, TREE_OID_RENAMES2, treediff_conflict_data, 7); -} diff --git a/vendor/libgit2/tests/merge/trees/trivial.c b/vendor/libgit2/tests/merge/trees/trivial.c deleted file mode 100644 index 2262edda6..000000000 --- a/vendor/libgit2/tests/merge/trees/trivial.c +++ /dev/null @@ -1,306 +0,0 @@ -#include "clar_libgit2.h" -#include "git2/repository.h" -#include "git2/merge.h" -#include "merge.h" -#include "../merge_helpers.h" -#include "refs.h" -#include "fileops.h" -#include "git2/sys/index.h" - -static git_repository *repo; - -#define TEST_REPO_PATH "merge-resolve" -#define TEST_INDEX_PATH TEST_REPO_PATH "/.git/index" - - -// Fixture setup and teardown -void test_merge_trees_trivial__initialize(void) -{ - repo = cl_git_sandbox_init(TEST_REPO_PATH); -} - -void test_merge_trees_trivial__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - - -static int merge_trivial(git_index **index, const char *ours, const char *theirs) -{ - git_commit *our_commit, *their_commit, *ancestor_commit; - git_tree *our_tree, *their_tree, *ancestor_tree; - git_oid our_oid, their_oid, ancestor_oid; - git_buf branch_buf = GIT_BUF_INIT; - git_merge_options opts = GIT_MERGE_OPTIONS_INIT; - - git_buf_printf(&branch_buf, "%s%s", GIT_REFS_HEADS_DIR, ours); - cl_git_pass(git_reference_name_to_id(&our_oid, repo, branch_buf.ptr)); - cl_git_pass(git_commit_lookup(&our_commit, repo, &our_oid)); - - git_buf_clear(&branch_buf); - git_buf_printf(&branch_buf, "%s%s", GIT_REFS_HEADS_DIR, theirs); - cl_git_pass(git_reference_name_to_id(&their_oid, repo, branch_buf.ptr)); - cl_git_pass(git_commit_lookup(&their_commit, repo, &their_oid)); - - cl_git_pass(git_merge_base(&ancestor_oid, repo, git_commit_id(our_commit), git_commit_id(their_commit))); - cl_git_pass(git_commit_lookup(&ancestor_commit, repo, &ancestor_oid)); - - cl_git_pass(git_commit_tree(&ancestor_tree, ancestor_commit)); - cl_git_pass(git_commit_tree(&our_tree, our_commit)); - cl_git_pass(git_commit_tree(&their_tree, their_commit)); - - cl_git_pass(git_merge_trees(index, repo, ancestor_tree, our_tree, their_tree, &opts)); - - git_buf_free(&branch_buf); - git_tree_free(our_tree); - git_tree_free(their_tree); - git_tree_free(ancestor_tree); - git_commit_free(our_commit); - git_commit_free(their_commit); - git_commit_free(ancestor_commit); - - return 0; -} - -static int merge_trivial_conflict_entrycount(git_index *index) -{ - const git_index_entry *entry; - int count = 0; - size_t i; - - for (i = 0; i < git_index_entrycount(index); i++) { - cl_assert(entry = git_index_get_byindex(index, i)); - - if (git_index_entry_is_conflict(entry)) - count++; - } - - return count; -} - -/* 2ALT: ancest:(empty)+, head:*empty*, remote:remote = result:remote */ -void test_merge_trees_trivial__2alt(void) -{ - git_index *result; - const git_index_entry *entry; - - cl_git_pass(merge_trivial(&result, "trivial-2alt", "trivial-2alt-branch")); - - cl_assert(entry = git_index_get_bypath(result, "new-in-branch.txt", 0)); - cl_assert(git_index_reuc_entrycount(result) == 0); - cl_assert(merge_trivial_conflict_entrycount(result) == 0); - - git_index_free(result); -} - -/* 3ALT: ancest:(empty)+, head:head, remote:*empty* = result:head */ -void test_merge_trees_trivial__3alt(void) -{ - git_index *result; - const git_index_entry *entry; - - cl_git_pass(merge_trivial(&result, "trivial-3alt", "trivial-3alt-branch")); - - cl_assert(entry = git_index_get_bypath(result, "new-in-3alt.txt", 0)); - cl_assert(git_index_reuc_entrycount(result) == 0); - cl_assert(merge_trivial_conflict_entrycount(result) == 0); - - git_index_free(result); -} - -/* 4: ancest:(empty)^, head:head, remote:remote = result:no merge */ -void test_merge_trees_trivial__4(void) -{ - git_index *result; - const git_index_entry *entry; - - cl_git_pass(merge_trivial(&result, "trivial-4", "trivial-4-branch")); - - cl_assert((entry = git_index_get_bypath(result, "new-and-different.txt", 0)) == NULL); - cl_assert(git_index_reuc_entrycount(result) == 0); - - cl_assert(merge_trivial_conflict_entrycount(result) == 2); - cl_assert(entry = git_index_get_bypath(result, "new-and-different.txt", 2)); - cl_assert(entry = git_index_get_bypath(result, "new-and-different.txt", 3)); - - git_index_free(result); -} - -/* 5ALT: ancest:*, head:head, remote:head = result:head */ -void test_merge_trees_trivial__5alt_1(void) -{ - git_index *result; - const git_index_entry *entry; - - cl_git_pass(merge_trivial(&result, "trivial-5alt-1", "trivial-5alt-1-branch")); - - cl_assert(entry = git_index_get_bypath(result, "new-and-same.txt", 0)); - cl_assert(git_index_reuc_entrycount(result) == 0); - cl_assert(merge_trivial_conflict_entrycount(result) == 0); - - git_index_free(result); -} - -/* 5ALT: ancest:*, head:head, remote:head = result:head */ -void test_merge_trees_trivial__5alt_2(void) -{ - git_index *result; - const git_index_entry *entry; - - cl_git_pass(merge_trivial(&result, "trivial-5alt-2", "trivial-5alt-2-branch")); - - cl_assert(entry = git_index_get_bypath(result, "modified-to-same.txt", 0)); - cl_assert(git_index_reuc_entrycount(result) == 0); - cl_assert(merge_trivial_conflict_entrycount(result) == 0); - - git_index_free(result); -} - -/* 6: ancest:ancest+, head:(empty), remote:(empty) = result:no merge */ -void test_merge_trees_trivial__6(void) -{ - git_index *result; - const git_index_entry *entry; - const git_index_reuc_entry *reuc; - - cl_git_pass(merge_trivial(&result, "trivial-6", "trivial-6-branch")); - - cl_assert((entry = git_index_get_bypath(result, "removed-in-both.txt", 0)) == NULL); - cl_assert(git_index_reuc_entrycount(result) == 1); - cl_assert(reuc = git_index_reuc_get_bypath(result, "removed-in-both.txt")); - - cl_assert(merge_trivial_conflict_entrycount(result) == 0); - - git_index_free(result); -} - -/* 8: ancest:ancest^, head:(empty), remote:ancest = result:no merge */ -void test_merge_trees_trivial__8(void) -{ - git_index *result; - const git_index_entry *entry; - const git_index_reuc_entry *reuc; - - cl_git_pass(merge_trivial(&result, "trivial-8", "trivial-8-branch")); - - cl_assert((entry = git_index_get_bypath(result, "removed-in-8.txt", 0)) == NULL); - - cl_assert(git_index_reuc_entrycount(result) == 1); - cl_assert(reuc = git_index_reuc_get_bypath(result, "removed-in-8.txt")); - - cl_assert(merge_trivial_conflict_entrycount(result) == 0); - - git_index_free(result); -} - -/* 7: ancest:ancest+, head:(empty), remote:remote = result:no merge */ -void test_merge_trees_trivial__7(void) -{ - git_index *result; - const git_index_entry *entry; - - cl_git_pass(merge_trivial(&result, "trivial-7", "trivial-7-branch")); - - cl_assert((entry = git_index_get_bypath(result, "removed-in-7.txt", 0)) == NULL); - cl_assert(git_index_reuc_entrycount(result) == 0); - - cl_assert(merge_trivial_conflict_entrycount(result) == 2); - cl_assert(entry = git_index_get_bypath(result, "removed-in-7.txt", 1)); - cl_assert(entry = git_index_get_bypath(result, "removed-in-7.txt", 3)); - - git_index_free(result); -} - -/* 10: ancest:ancest^, head:ancest, remote:(empty) = result:no merge */ -void test_merge_trees_trivial__10(void) -{ - git_index *result; - const git_index_entry *entry; - const git_index_reuc_entry *reuc; - - cl_git_pass(merge_trivial(&result, "trivial-10", "trivial-10-branch")); - - cl_assert((entry = git_index_get_bypath(result, "removed-in-10-branch.txt", 0)) == NULL); - - cl_assert(git_index_reuc_entrycount(result) == 1); - cl_assert(reuc = git_index_reuc_get_bypath(result, "removed-in-10-branch.txt")); - - cl_assert(merge_trivial_conflict_entrycount(result) == 0); - - git_index_free(result); -} - -/* 9: ancest:ancest+, head:head, remote:(empty) = result:no merge */ -void test_merge_trees_trivial__9(void) -{ - git_index *result; - const git_index_entry *entry; - - cl_git_pass(merge_trivial(&result, "trivial-9", "trivial-9-branch")); - - cl_assert((entry = git_index_get_bypath(result, "removed-in-9-branch.txt", 0)) == NULL); - cl_assert(git_index_reuc_entrycount(result) == 0); - - cl_assert(merge_trivial_conflict_entrycount(result) == 2); - cl_assert(entry = git_index_get_bypath(result, "removed-in-9-branch.txt", 1)); - cl_assert(entry = git_index_get_bypath(result, "removed-in-9-branch.txt", 2)); - - git_index_free(result); -} - -/* 13: ancest:ancest+, head:head, remote:ancest = result:head */ -void test_merge_trees_trivial__13(void) -{ - git_index *result; - const git_index_entry *entry; - git_oid expected_oid; - - cl_git_pass(merge_trivial(&result, "trivial-13", "trivial-13-branch")); - - cl_assert(entry = git_index_get_bypath(result, "modified-in-13.txt", 0)); - cl_git_pass(git_oid_fromstr(&expected_oid, "1cff9ec6a47a537380dedfdd17c9e76d74259a2b")); - cl_assert_equal_oid(&expected_oid, &entry->id); - - cl_assert(git_index_reuc_entrycount(result) == 0); - cl_assert(merge_trivial_conflict_entrycount(result) == 0); - - git_index_free(result); -} - -/* 14: ancest:ancest+, head:ancest, remote:remote = result:remote */ -void test_merge_trees_trivial__14(void) -{ - git_index *result; - const git_index_entry *entry; - git_oid expected_oid; - - cl_git_pass(merge_trivial(&result, "trivial-14", "trivial-14-branch")); - - cl_assert(entry = git_index_get_bypath(result, "modified-in-14-branch.txt", 0)); - cl_git_pass(git_oid_fromstr(&expected_oid, "26153a3ff3649b6c2bb652d3f06878c6e0a172f9")); - cl_assert(git_oid_cmp(&entry->id, &expected_oid) == 0); - - cl_assert(git_index_reuc_entrycount(result) == 0); - cl_assert(merge_trivial_conflict_entrycount(result) == 0); - - git_index_free(result); -} - -/* 11: ancest:ancest+, head:head, remote:remote = result:no merge */ -void test_merge_trees_trivial__11(void) -{ - git_index *result; - const git_index_entry *entry; - - cl_git_pass(merge_trivial(&result, "trivial-11", "trivial-11-branch")); - - cl_assert((entry = git_index_get_bypath(result, "modified-in-both.txt", 0)) == NULL); - cl_assert(git_index_reuc_entrycount(result) == 0); - - cl_assert(merge_trivial_conflict_entrycount(result) == 3); - cl_assert(entry = git_index_get_bypath(result, "modified-in-both.txt", 1)); - cl_assert(entry = git_index_get_bypath(result, "modified-in-both.txt", 2)); - cl_assert(entry = git_index_get_bypath(result, "modified-in-both.txt", 3)); - - git_index_free(result); -} diff --git a/vendor/libgit2/tests/merge/trees/whitespace.c b/vendor/libgit2/tests/merge/trees/whitespace.c deleted file mode 100644 index b99583cb3..000000000 --- a/vendor/libgit2/tests/merge/trees/whitespace.c +++ /dev/null @@ -1,82 +0,0 @@ -#include "clar_libgit2.h" -#include "git2/repository.h" -#include "git2/merge.h" -#include "buffer.h" -#include "merge.h" -#include "../merge_helpers.h" -#include "fileops.h" - -static git_repository *repo; - -#define TEST_REPO_PATH "merge-whitespace" - -#define BRANCH_A_EOL "branch_a_eol" -#define BRANCH_B_EOL "branch_b_eol" - -#define BRANCH_A_CHANGE "branch_a_change" -#define BRANCH_B_CHANGE "branch_b_change" - -// Fixture setup and teardown -void test_merge_trees_whitespace__initialize(void) -{ - repo = cl_git_sandbox_init(TEST_REPO_PATH); -} - -void test_merge_trees_whitespace__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -void test_merge_trees_whitespace__conflict(void) -{ - git_index *index; - git_merge_options opts = GIT_MERGE_OPTIONS_INIT; - - struct merge_index_entry merge_index_entries[] = { - { 0100644, "4026a6c83f39c56881c9ac62e7582db9e3d33a4f", 1, "test.txt" }, - { 0100644, "c3b1fb31424c98072542cc8e42b48c92e52f494a", 2, "test.txt" }, - { 0100644, "262f67de0de2e535a59ae1bc3c739601e98c354d", 3, "test.txt" }, - }; - - cl_git_pass(merge_trees_from_branches(&index, repo, BRANCH_A_EOL, BRANCH_B_EOL, &opts)); - - cl_assert(merge_test_index(index, merge_index_entries, 3)); - - git_index_free(index); -} - -void test_merge_trees_whitespace__eol(void) -{ - git_index *index; - git_merge_options opts = GIT_MERGE_OPTIONS_INIT; - - struct merge_index_entry merge_index_entries[] = { - { 0100644, "ee3c2aac8e03224c323b58ecb1f9eef616745467", 0, "test.txt" }, - }; - - opts.file_flags |= GIT_MERGE_FILE_IGNORE_WHITESPACE_EOL; - - cl_git_pass(merge_trees_from_branches(&index, repo, BRANCH_A_EOL, BRANCH_B_EOL, &opts)); - - cl_assert(merge_test_index(index, merge_index_entries, 1)); - - git_index_free(index); -} - -void test_merge_trees_whitespace__change(void) -{ - git_index *index; - git_merge_options opts = GIT_MERGE_OPTIONS_INIT; - - struct merge_index_entry merge_index_entries[] = { - { 0100644, "a827eab4fd66ab37a6ebcfaa7b7e341abfd55947", 0, "test.txt" }, - }; - - opts.file_flags |= GIT_MERGE_FILE_IGNORE_WHITESPACE_CHANGE; - - cl_git_pass(merge_trees_from_branches(&index, repo, BRANCH_A_CHANGE, BRANCH_B_CHANGE, &opts)); - - cl_assert(merge_test_index(index, merge_index_entries, 1)); - - git_index_free(index); -} diff --git a/vendor/libgit2/tests/merge/workdir/analysis.c b/vendor/libgit2/tests/merge/workdir/analysis.c deleted file mode 100644 index 351cfbdd5..000000000 --- a/vendor/libgit2/tests/merge/workdir/analysis.c +++ /dev/null @@ -1,141 +0,0 @@ -#include "clar_libgit2.h" -#include "git2/repository.h" -#include "git2/merge.h" -#include "git2/annotated_commit.h" -#include "git2/sys/index.h" -#include "merge.h" -#include "../merge_helpers.h" -#include "refs.h" -#include "posix.h" - -static git_repository *repo; -static git_index *repo_index; - -#define TEST_REPO_PATH "merge-resolve" -#define TEST_INDEX_PATH TEST_REPO_PATH "/.git/index" - -#define UPTODATE_BRANCH "master" -#define PREVIOUS_BRANCH "previous" - -#define FASTFORWARD_BRANCH "ff_branch" -#define FASTFORWARD_ID "fd89f8cffb663ac89095a0f9764902e93ceaca6a" - -#define NOFASTFORWARD_BRANCH "branch" -#define NOFASTFORWARD_ID "7cb63eed597130ba4abb87b3e544b85021905520" - - -// Fixture setup and teardown -void test_merge_workdir_analysis__initialize(void) -{ - repo = cl_git_sandbox_init(TEST_REPO_PATH); - git_repository_index(&repo_index, repo); -} - -void test_merge_workdir_analysis__cleanup(void) -{ - git_index_free(repo_index); - cl_git_sandbox_cleanup(); -} - -static void analysis_from_branch( - git_merge_analysis_t *merge_analysis, - git_merge_preference_t *merge_pref, - const char *branchname) -{ - git_buf refname = GIT_BUF_INIT; - git_reference *their_ref; - git_annotated_commit *their_head; - - git_buf_printf(&refname, "%s%s", GIT_REFS_HEADS_DIR, branchname); - - cl_git_pass(git_reference_lookup(&their_ref, repo, git_buf_cstr(&refname))); - cl_git_pass(git_annotated_commit_from_ref(&their_head, repo, their_ref)); - - cl_git_pass(git_merge_analysis(merge_analysis, merge_pref, repo, (const git_annotated_commit **)&their_head, 1)); - - git_buf_free(&refname); - git_annotated_commit_free(their_head); - git_reference_free(their_ref); -} - -void test_merge_workdir_analysis__fastforward(void) -{ - git_merge_analysis_t merge_analysis; - git_merge_preference_t merge_pref; - - analysis_from_branch(&merge_analysis, &merge_pref, FASTFORWARD_BRANCH); - cl_assert_equal_i(GIT_MERGE_ANALYSIS_FASTFORWARD, (merge_analysis & GIT_MERGE_ANALYSIS_FASTFORWARD)); - cl_assert_equal_i(GIT_MERGE_ANALYSIS_NORMAL, (merge_analysis & GIT_MERGE_ANALYSIS_NORMAL)); -} - -void test_merge_workdir_analysis__no_fastforward(void) -{ - git_merge_analysis_t merge_analysis; - git_merge_preference_t merge_pref; - - analysis_from_branch(&merge_analysis, &merge_pref, NOFASTFORWARD_BRANCH); - cl_assert_equal_i(GIT_MERGE_ANALYSIS_NORMAL, merge_analysis); -} - -void test_merge_workdir_analysis__uptodate(void) -{ - git_merge_analysis_t merge_analysis; - git_merge_preference_t merge_pref; - - analysis_from_branch(&merge_analysis, &merge_pref, UPTODATE_BRANCH); - cl_assert_equal_i(GIT_MERGE_ANALYSIS_UP_TO_DATE, merge_analysis); -} - -void test_merge_workdir_analysis__uptodate_merging_prev_commit(void) -{ - git_merge_analysis_t merge_analysis; - git_merge_preference_t merge_pref; - - analysis_from_branch(&merge_analysis, &merge_pref, PREVIOUS_BRANCH); - cl_assert_equal_i(GIT_MERGE_ANALYSIS_UP_TO_DATE, merge_analysis); -} - -void test_merge_workdir_analysis__unborn(void) -{ - git_merge_analysis_t merge_analysis; - git_merge_preference_t merge_pref; - git_buf master = GIT_BUF_INIT; - - git_buf_joinpath(&master, git_repository_path(repo), "refs/heads/master"); - p_unlink(git_buf_cstr(&master)); - - analysis_from_branch(&merge_analysis, &merge_pref, NOFASTFORWARD_BRANCH); - cl_assert_equal_i(GIT_MERGE_ANALYSIS_FASTFORWARD, (merge_analysis & GIT_MERGE_ANALYSIS_FASTFORWARD)); - cl_assert_equal_i(GIT_MERGE_ANALYSIS_UNBORN, (merge_analysis & GIT_MERGE_ANALYSIS_UNBORN)); - - git_buf_free(&master); -} - -void test_merge_workdir_analysis__fastforward_with_config_noff(void) -{ - git_config *config; - git_merge_analysis_t merge_analysis; - git_merge_preference_t merge_pref; - - git_repository_config(&config, repo); - git_config_set_string(config, "merge.ff", "false"); - - analysis_from_branch(&merge_analysis, &merge_pref, FASTFORWARD_BRANCH); - cl_assert_equal_i(GIT_MERGE_ANALYSIS_FASTFORWARD, (merge_analysis & GIT_MERGE_ANALYSIS_FASTFORWARD)); - cl_assert_equal_i(GIT_MERGE_ANALYSIS_NORMAL, (merge_analysis & GIT_MERGE_ANALYSIS_NORMAL)); - cl_assert_equal_i(GIT_MERGE_PREFERENCE_NO_FASTFORWARD, (merge_pref & GIT_MERGE_PREFERENCE_NO_FASTFORWARD)); -} - -void test_merge_workdir_analysis__no_fastforward_with_config_ffonly(void) -{ - git_config *config; - git_merge_analysis_t merge_analysis; - git_merge_preference_t merge_pref; - - git_repository_config(&config, repo); - git_config_set_string(config, "merge.ff", "only"); - - analysis_from_branch(&merge_analysis, &merge_pref, NOFASTFORWARD_BRANCH); - cl_assert_equal_i(GIT_MERGE_ANALYSIS_NORMAL, (merge_analysis & GIT_MERGE_ANALYSIS_NORMAL)); - cl_assert_equal_i(GIT_MERGE_PREFERENCE_FASTFORWARD_ONLY, (merge_pref & GIT_MERGE_PREFERENCE_FASTFORWARD_ONLY)); -} diff --git a/vendor/libgit2/tests/merge/workdir/dirty.c b/vendor/libgit2/tests/merge/workdir/dirty.c deleted file mode 100644 index 99e33e0cd..000000000 --- a/vendor/libgit2/tests/merge/workdir/dirty.c +++ /dev/null @@ -1,352 +0,0 @@ -#include "clar_libgit2.h" -#include "git2/merge.h" -#include "buffer.h" -#include "merge.h" -#include "index.h" -#include "../merge_helpers.h" -#include "posix.h" - -#define TEST_REPO_PATH "merge-resolve" -#define MERGE_BRANCH_OID "7cb63eed597130ba4abb87b3e544b85021905520" - -#define AUTOMERGEABLE_MERGED_FILE \ - "this file is changed in master\n" \ - "this file is automergeable\n" \ - "this file is automergeable\n" \ - "this file is automergeable\n" \ - "this file is automergeable\n" \ - "this file is automergeable\n" \ - "this file is automergeable\n" \ - "this file is automergeable\n" \ - "this file is changed in branch\n" - -#define CHANGED_IN_BRANCH_FILE \ - "changed in branch\n" - -static git_repository *repo; -static git_index *repo_index; - -static char *unaffected[][4] = { - { "added-in-master.txt", NULL }, - { "changed-in-master.txt", NULL }, - { "unchanged.txt", NULL }, - { "added-in-master.txt", "changed-in-master.txt", NULL }, - { "added-in-master.txt", "unchanged.txt", NULL }, - { "changed-in-master.txt", "unchanged.txt", NULL }, - { "added-in-master.txt", "changed-in-master.txt", "unchanged.txt", NULL }, - { "new_file.txt", NULL }, - { "new_file.txt", "unchanged.txt", NULL }, - { NULL }, -}; - -static char *affected[][5] = { - { "automergeable.txt", NULL }, - { "changed-in-branch.txt", NULL }, - { "conflicting.txt", NULL }, - { "removed-in-branch.txt", NULL }, - { "automergeable.txt", "changed-in-branch.txt", NULL }, - { "automergeable.txt", "conflicting.txt", NULL }, - { "automergeable.txt", "removed-in-branch.txt", NULL }, - { "changed-in-branch.txt", "conflicting.txt", NULL }, - { "changed-in-branch.txt", "removed-in-branch.txt", NULL }, - { "conflicting.txt", "removed-in-branch.txt", NULL }, - { "automergeable.txt", "changed-in-branch.txt", "conflicting.txt", NULL }, - { "automergeable.txt", "changed-in-branch.txt", "removed-in-branch.txt", NULL }, - { "automergeable.txt", "conflicting.txt", "removed-in-branch.txt", NULL }, - { "changed-in-branch.txt", "conflicting.txt", "removed-in-branch.txt", NULL }, - { "automergeable.txt", "changed-in-branch.txt", "conflicting.txt", "removed-in-branch.txt", NULL }, - { NULL }, -}; - -static char *result_contents[4][6] = { - { "automergeable.txt", AUTOMERGEABLE_MERGED_FILE, NULL, NULL }, - { "changed-in-branch.txt", CHANGED_IN_BRANCH_FILE, NULL, NULL }, - { "automergeable.txt", AUTOMERGEABLE_MERGED_FILE, "changed-in-branch.txt", CHANGED_IN_BRANCH_FILE, NULL, NULL }, - { NULL } -}; - -void test_merge_workdir_dirty__initialize(void) -{ - repo = cl_git_sandbox_init(TEST_REPO_PATH); - git_repository_index(&repo_index, repo); -} - -void test_merge_workdir_dirty__cleanup(void) -{ - git_index_free(repo_index); - cl_git_sandbox_cleanup(); -} - -static void set_core_autocrlf_to(git_repository *repo, bool value) -{ - git_config *cfg; - - cl_git_pass(git_repository_config(&cfg, repo)); - cl_git_pass(git_config_set_bool(cfg, "core.autocrlf", value)); - - git_config_free(cfg); -} - -static int merge_branch(void) -{ - git_oid their_oids[1]; - git_annotated_commit *their_head; - git_merge_options merge_opts = GIT_MERGE_OPTIONS_INIT; - git_checkout_options checkout_opts = GIT_CHECKOUT_OPTIONS_INIT; - int error; - - cl_git_pass(git_oid_fromstr(&their_oids[0], MERGE_BRANCH_OID)); - cl_git_pass(git_annotated_commit_lookup(&their_head, repo, &their_oids[0])); - - checkout_opts.checkout_strategy = GIT_CHECKOUT_SAFE; - error = git_merge(repo, (const git_annotated_commit **)&their_head, 1, &merge_opts, &checkout_opts); - - git_annotated_commit_free(their_head); - - return error; -} - -static void write_files(char *files[]) -{ - char *filename; - git_buf path = GIT_BUF_INIT, content = GIT_BUF_INIT; - size_t i; - - for (i = 0, filename = files[i]; filename; filename = files[++i]) { - git_buf_clear(&path); - git_buf_clear(&content); - - git_buf_printf(&path, "%s/%s", TEST_REPO_PATH, filename); - git_buf_printf(&content, "This is a dirty file in the working directory!\n\n" - "It will not be staged! Its filename is %s.\n", filename); - - cl_git_mkfile(path.ptr, content.ptr); - } - - git_buf_free(&path); - git_buf_free(&content); -} - -static void hack_index(char *files[]) -{ - char *filename; - struct stat statbuf; - git_buf path = GIT_BUF_INIT; - git_index_entry *entry; - struct p_timeval times[2]; - time_t now; - size_t i; - - /* Update the index to suggest that checkout placed these files on - * disk, keeping the object id but updating the cache, which will - * emulate a Git implementation's different filter. - * - * We set the file's timestamp to before now to pretend that - * it was an old checkout so we don't trigger the racy - * protections would would check the content. - */ - - now = time(NULL); - times[0].tv_sec = now - 5; - times[0].tv_usec = 0; - times[1].tv_sec = now - 5; - times[1].tv_usec = 0; - - for (i = 0, filename = files[i]; filename; filename = files[++i]) { - git_buf_clear(&path); - - cl_assert(entry = (git_index_entry *) - git_index_get_bypath(repo_index, filename, 0)); - - cl_git_pass(git_buf_printf(&path, "%s/%s", TEST_REPO_PATH, filename)); - cl_git_pass(p_utimes(path.ptr, times)); - cl_git_pass(p_stat(path.ptr, &statbuf)); - - entry->ctime.seconds = (int32_t)statbuf.st_ctime; - entry->mtime.seconds = (int32_t)statbuf.st_mtime; -#if defined(GIT_USE_NSEC) - entry->ctime.nanoseconds = statbuf.st_ctim.tv_nsec; - entry->mtime.nanoseconds = statbuf.st_mtim.tv_nsec; -#else - entry->ctime.nanoseconds = 0; - entry->mtime.nanoseconds = 0; -#endif - entry->dev = statbuf.st_dev; - entry->ino = statbuf.st_ino; - entry->uid = statbuf.st_uid; - entry->gid = statbuf.st_gid; - entry->file_size = (uint32_t)statbuf.st_size; - } - - git_buf_free(&path); -} - -static void stage_random_files(char *files[]) -{ - char *filename; - size_t i; - - write_files(files); - - for (i = 0, filename = files[i]; filename; filename = files[++i]) - cl_git_pass(git_index_add_bypath(repo_index, filename)); -} - -static void stage_content(char *content[]) -{ - git_reference *head; - git_object *head_object; - git_buf path = GIT_BUF_INIT; - char *filename, *text; - size_t i; - - cl_git_pass(git_repository_head(&head, repo)); - cl_git_pass(git_reference_peel(&head_object, head, GIT_OBJ_COMMIT)); - cl_git_pass(git_reset(repo, head_object, GIT_RESET_HARD, NULL)); - - for (i = 0, filename = content[i], text = content[++i]; - filename && text; - filename = content[++i], text = content[++i]) { - - git_buf_clear(&path); - - cl_git_pass(git_buf_printf(&path, "%s/%s", TEST_REPO_PATH, filename)); - - cl_git_mkfile(path.ptr, text); - cl_git_pass(git_index_add_bypath(repo_index, filename)); - } - - git_object_free(head_object); - git_reference_free(head); - git_buf_free(&path); -} - -static int merge_dirty_files(char *dirty_files[]) -{ - git_reference *head; - git_object *head_object; - int error; - - cl_git_pass(git_repository_head(&head, repo)); - cl_git_pass(git_reference_peel(&head_object, head, GIT_OBJ_COMMIT)); - cl_git_pass(git_reset(repo, head_object, GIT_RESET_HARD, NULL)); - - write_files(dirty_files); - - error = merge_branch(); - - git_object_free(head_object); - git_reference_free(head); - - return error; -} - -static int merge_differently_filtered_files(char *files[]) -{ - git_reference *head; - git_object *head_object; - int error; - - cl_git_pass(git_repository_head(&head, repo)); - cl_git_pass(git_reference_peel(&head_object, head, GIT_OBJ_COMMIT)); - cl_git_pass(git_reset(repo, head_object, GIT_RESET_HARD, NULL)); - - /* Emulate checkout with a broken or misconfigured filter: modify some - * files on-disk and then update the index with the updated file size - * and time, as if some filter applied them. These files should not be - * treated as dirty since we created them. - * - * (Make sure to update the index stamp to defeat racy-git protections - * trying to sanity check the files in the index; those would rehash the - * files, showing them as dirty, the exact mechanism we're trying to avoid.) - */ - - write_files(files); - hack_index(files); - - cl_git_pass(git_index_write(repo_index)); - - error = merge_branch(); - - git_object_free(head_object); - git_reference_free(head); - - return error; -} - -static int merge_staged_files(char *staged_files[]) -{ - stage_random_files(staged_files); - return merge_branch(); -} - -void test_merge_workdir_dirty__unaffected_dirty_files_allowed(void) -{ - char **files; - size_t i; - - for (i = 0, files = unaffected[i]; files[0]; files = unaffected[++i]) - cl_git_pass(merge_dirty_files(files)); -} - -void test_merge_workdir_dirty__unstaged_deletes_maintained(void) -{ - git_reference *head; - git_object *head_object; - - cl_git_pass(git_repository_head(&head, repo)); - cl_git_pass(git_reference_peel(&head_object, head, GIT_OBJ_COMMIT)); - cl_git_pass(git_reset(repo, head_object, GIT_RESET_HARD, NULL)); - - cl_git_pass(p_unlink("merge-resolve/unchanged.txt")); - - cl_git_pass(merge_branch()); - - git_object_free(head_object); - git_reference_free(head); -} - -void test_merge_workdir_dirty__affected_dirty_files_disallowed(void) -{ - char **files; - size_t i; - - for (i = 0, files = affected[i]; files[0]; files = affected[++i]) - cl_git_fail(merge_dirty_files(files)); -} - -void test_merge_workdir_dirty__staged_files_in_index_disallowed(void) -{ - char **files; - size_t i; - - for (i = 0, files = unaffected[i]; files[0]; files = unaffected[++i]) - cl_git_fail(merge_staged_files(files)); - - for (i = 0, files = affected[i]; files[0]; files = affected[++i]) - cl_git_fail(merge_staged_files(files)); -} - -void test_merge_workdir_dirty__identical_staged_files_allowed(void) -{ - char **content; - size_t i; - - set_core_autocrlf_to(repo, false); - - for (i = 0, content = result_contents[i]; content[0]; content = result_contents[++i]) { - stage_content(content); - - git_index_write(repo_index); - cl_git_pass(merge_branch()); - } -} - -void test_merge_workdir_dirty__honors_cache(void) -{ - char **files; - size_t i; - - for (i = 0, files = affected[i]; files[0]; files = affected[++i]) - cl_git_pass(merge_differently_filtered_files(files)); -} diff --git a/vendor/libgit2/tests/merge/workdir/recursive.c b/vendor/libgit2/tests/merge/workdir/recursive.c deleted file mode 100644 index 795126255..000000000 --- a/vendor/libgit2/tests/merge/workdir/recursive.c +++ /dev/null @@ -1,84 +0,0 @@ -#include "clar_libgit2.h" -#include "git2/repository.h" -#include "git2/merge.h" -#include "merge.h" -#include "../merge_helpers.h" -#include "../conflict_data.h" - -static git_repository *repo; - -#define TEST_REPO_PATH "merge-recursive" - -void test_merge_workdir_recursive__initialize(void) -{ - repo = cl_git_sandbox_init(TEST_REPO_PATH); -} - -void test_merge_workdir_recursive__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -void test_merge_workdir_recursive__writes_conflict_with_virtual_base(void) -{ - git_index *index; - git_merge_options opts = GIT_MERGE_OPTIONS_INIT; - git_buf conflicting_buf = GIT_BUF_INIT; - - struct merge_index_entry merge_index_entries[] = { - { 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "asparagus.txt" }, - { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" }, - { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" }, - { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" }, - { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" }, - { 0100644, "fa567f568ed72157c0c617438d077695b99d9aac", 1, "veal.txt" }, - { 0100644, "21950d5e4e4d1a871b4dfcf72ecb6b9c162c434e", 2, "veal.txt" }, - { 0100644, "3855170cef875708da06ab9ad7fc6a73b531cda1", 3, "veal.txt" }, - }; - - cl_git_pass(merge_branches(repo, GIT_REFS_HEADS_DIR "branchF-1", GIT_REFS_HEADS_DIR "branchF-2", &opts, NULL)); - - cl_git_pass(git_repository_index(&index, repo)); - cl_assert(merge_test_index(index, merge_index_entries, 8)); - - cl_git_pass(git_futils_readbuffer(&conflicting_buf, "merge-recursive/veal.txt")); - - cl_assert_equal_s(CONFLICTING_RECURSIVE_F1_TO_F2, conflicting_buf.ptr); - - git_index_free(index); - git_buf_free(&conflicting_buf); -} - -void test_merge_workdir_recursive__conflicting_merge_base_with_diff3(void) -{ - git_index *index; - git_merge_options opts = GIT_MERGE_OPTIONS_INIT; - git_checkout_options checkout_opts = GIT_CHECKOUT_OPTIONS_INIT; - git_buf conflicting_buf = GIT_BUF_INIT; - - struct merge_index_entry merge_index_entries[] = { - { 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "asparagus.txt" }, - { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" }, - { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" }, - { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" }, - { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" }, - { 0100644, "cd17a91513f3aee9e44114d1ede67932dd41d2fc", 1, "veal.txt" }, - { 0100644, "d604c75019c282144bdbbf3fd3462ba74b240efc", 2, "veal.txt" }, - { 0100644, "37a5054a9f9b4628e3924c5cb8f2147c6e2a3efc", 3, "veal.txt" }, - }; - - opts.file_flags |= GIT_MERGE_FILE_STYLE_DIFF3; - checkout_opts.checkout_strategy |= GIT_CHECKOUT_CONFLICT_STYLE_DIFF3; - - cl_git_pass(merge_branches(repo, GIT_REFS_HEADS_DIR "branchH-1", GIT_REFS_HEADS_DIR "branchH-2", &opts, &checkout_opts)); - - cl_git_pass(git_repository_index(&index, repo)); - cl_assert(merge_test_index(index, merge_index_entries, 8)); - - cl_git_pass(git_futils_readbuffer(&conflicting_buf, "merge-recursive/veal.txt")); - - cl_assert_equal_s(CONFLICTING_RECURSIVE_H1_TO_H2_WITH_DIFF3, conflicting_buf.ptr); - - git_index_free(index); - git_buf_free(&conflicting_buf); -} diff --git a/vendor/libgit2/tests/merge/workdir/renames.c b/vendor/libgit2/tests/merge/workdir/renames.c deleted file mode 100644 index fabcda2a8..000000000 --- a/vendor/libgit2/tests/merge/workdir/renames.c +++ /dev/null @@ -1,156 +0,0 @@ -#include "clar_libgit2.h" -#include "git2/repository.h" -#include "git2/merge.h" -#include "buffer.h" -#include "merge.h" -#include "../merge_helpers.h" -#include "fileops.h" -#include "refs.h" - -static git_repository *repo; - -#define TEST_REPO_PATH "merge-resolve" - -#define BRANCH_RENAME_OURS "rename_conflict_ours" -#define BRANCH_RENAME_THEIRS "rename_conflict_theirs" - -// Fixture setup and teardown -void test_merge_workdir_renames__initialize(void) -{ - git_config *cfg; - - repo = cl_git_sandbox_init(TEST_REPO_PATH); - - /* Ensure that the user's merge.conflictstyle doesn't interfere */ - cl_git_pass(git_repository_config(&cfg, repo)); - cl_git_pass(git_config_set_string(cfg, "merge.conflictstyle", "merge")); - git_config_free(cfg); -} - -void test_merge_workdir_renames__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -void test_merge_workdir_renames__renames(void) -{ - git_merge_options merge_opts = GIT_MERGE_OPTIONS_INIT; - - struct merge_index_entry merge_index_entries[] = { - { 0100644, "68c6c84b091926c7d90aa6a79b2bc3bb6adccd8e", 0, "0a-no-change.txt" }, - { 0100644, "f0ce2b8e4986084d9b308fb72709e414c23eb5e6", 0, "0b-duplicated-in-ours.txt" }, - { 0100644, "8aac75de2a34b4d340bf62a6e58197269cb55797", 0, "0b-rewritten-in-ours.txt" }, - { 0100644, "2f56120107d680129a5d9791b521cb1e73a2ed31", 0, "0c-duplicated-in-theirs.txt" }, - { 0100644, "7edc726325da726751a4195e434e4377b0f67f9a", 0, "0c-rewritten-in-theirs.txt" }, - { 0100644, "0d872f8e871a30208305978ecbf9e66d864f1638", 0, "1a-newname-in-ours-edited-in-theirs.txt" }, - { 0100644, "d0d4594e16f2e19107e3fa7ea63e7aaaff305ffb", 0, "1a-newname-in-ours.txt" }, - { 0100644, "ed9523e62e453e50dd9be1606af19399b96e397a", 0, "1b-newname-in-theirs-edited-in-ours.txt" }, - { 0100644, "2b5f1f181ee3b58ea751f5dd5d8f9b445520a136", 0, "1b-newname-in-theirs.txt" }, - { 0100644, "178940b450f238a56c0d75b7955cb57b38191982", 0, "2-newname-in-both.txt" }, - { 0100644, "18cb316b1cefa0f8a6946f0e201a8e1a6f845ab9", 0, "3a-newname-in-ours-deleted-in-theirs.txt" }, - { 0100644, "36219b49367146cb2e6a1555b5a9ebd4d0328495", 0, "3b-newname-in-theirs-deleted-in-ours.txt" }, - { 0100644, "227792b52aaa0b238bea00ec7e509b02623f168c", 0, "4a-newname-in-ours-added-in-theirs.txt~HEAD" }, - { 0100644, "8b5b53cb2aa9ceb1139f5312fcfa3cc3c5a47c9a", 0, "4a-newname-in-ours-added-in-theirs.txt~rename_conflict_theirs" }, - { 0100644, "de872ee3618b894992e9d1e18ba2ebe256a112f9", 0, "4b-newname-in-theirs-added-in-ours.txt~HEAD" }, - { 0100644, "98d52d07c0b0bbf2b46548f6aa521295c2cb55db", 0, "4b-newname-in-theirs-added-in-ours.txt~rename_conflict_theirs" }, - { 0100644, "d3719a5ae8e4d92276b5313ce976f6ee5af2b436", 0, "5a-newname-in-ours-added-in-theirs.txt~HEAD" }, - { 0100644, "98ba4205fcf31f5dd93c916d35fe3f3b3d0e6714", 0, "5a-newname-in-ours-added-in-theirs.txt~rename_conflict_theirs" }, - { 0100644, "385c8a0f26ddf79e9041e15e17dc352ed2c4cced", 0, "5b-newname-in-theirs-added-in-ours.txt~HEAD" }, - { 0100644, "63247125386de9ec90a27ad36169307bf8a11a38", 0, "5b-newname-in-theirs-added-in-ours.txt~rename_conflict_theirs" }, - { 0100644, "d8fa77b6833082c1ea36b7828a582d4c43882450", 0, "6-both-renamed-1-to-2-ours.txt" }, - { 0100644, "d8fa77b6833082c1ea36b7828a582d4c43882450", 0, "6-both-renamed-1-to-2-theirs.txt" }, - { 0100644, "b42712cfe99a1a500b2a51fe984e0b8a7702ba11", 0, "7-both-renamed.txt~HEAD" }, - { 0100644, "b69fe837e4cecfd4c9a40cdca7c138468687df07", 0, "7-both-renamed.txt~rename_conflict_theirs" }, - }; - - merge_opts.flags |= GIT_MERGE_FIND_RENAMES; - merge_opts.rename_threshold = 50; - - cl_git_pass(merge_branches(repo, GIT_REFS_HEADS_DIR BRANCH_RENAME_OURS, GIT_REFS_HEADS_DIR BRANCH_RENAME_THEIRS, &merge_opts, NULL)); - cl_assert(merge_test_workdir(repo, merge_index_entries, 24)); -} - -void test_merge_workdir_renames__ours(void) -{ - git_index *index; - git_merge_options merge_opts = GIT_MERGE_OPTIONS_INIT; - git_checkout_options checkout_opts = GIT_CHECKOUT_OPTIONS_INIT; - - struct merge_index_entry merge_index_entries[] = { - { 0100644, "68c6c84b091926c7d90aa6a79b2bc3bb6adccd8e", 0, "0a-no-change.txt" }, - { 0100644, "f0ce2b8e4986084d9b308fb72709e414c23eb5e6", 0, "0b-duplicated-in-ours.txt" }, - { 0100644, "e376fbdd06ebf021c92724da9f26f44212734e3e", 0, "0b-rewritten-in-ours.txt" }, - { 0100644, "2f56120107d680129a5d9791b521cb1e73a2ed31", 0, "0c-duplicated-in-theirs.txt" }, - { 0100644, "efc9121fdedaf08ba180b53ebfbcf71bd488ed09", 0, "0c-rewritten-in-theirs.txt" }, - { 0100644, "0d872f8e871a30208305978ecbf9e66d864f1638", 0, "1a-newname-in-ours-edited-in-theirs.txt" }, - { 0100644, "d0d4594e16f2e19107e3fa7ea63e7aaaff305ffb", 0, "1a-newname-in-ours.txt" }, - { 0100644, "ed9523e62e453e50dd9be1606af19399b96e397a", 0, "1b-newname-in-theirs-edited-in-ours.txt" }, - { 0100644, "2b5f1f181ee3b58ea751f5dd5d8f9b445520a136", 0, "1b-newname-in-theirs.txt" }, - { 0100644, "178940b450f238a56c0d75b7955cb57b38191982", 0, "2-newname-in-both.txt" }, - { 0100644, "18cb316b1cefa0f8a6946f0e201a8e1a6f845ab9", 0, "3a-newname-in-ours-deleted-in-theirs.txt" }, - { 0100644, "36219b49367146cb2e6a1555b5a9ebd4d0328495", 0, "3b-newname-in-theirs-deleted-in-ours.txt" }, - { 0100644, "227792b52aaa0b238bea00ec7e509b02623f168c", 0, "4a-newname-in-ours-added-in-theirs.txt" }, - { 0100644, "de872ee3618b894992e9d1e18ba2ebe256a112f9", 0, "4b-newname-in-theirs-added-in-ours.txt" }, - { 0100644, "d3719a5ae8e4d92276b5313ce976f6ee5af2b436", 0, "5a-newname-in-ours-added-in-theirs.txt" }, - { 0100644, "385c8a0f26ddf79e9041e15e17dc352ed2c4cced", 0, "5b-newname-in-theirs-added-in-ours.txt" }, - { 0100644, "63247125386de9ec90a27ad36169307bf8a11a38", 0, "5b-renamed-in-theirs-added-in-ours.txt" }, - { 0100644, "d8fa77b6833082c1ea36b7828a582d4c43882450", 0, "6-both-renamed-1-to-2-ours.txt" }, - { 0100644, "b69fe837e4cecfd4c9a40cdca7c138468687df07", 0, "7-both-renamed-side-2.txt" }, - { 0100644, "b42712cfe99a1a500b2a51fe984e0b8a7702ba11", 0, "7-both-renamed.txt" }, - }; - - merge_opts.flags |= GIT_MERGE_FIND_RENAMES; - merge_opts.rename_threshold = 50; - checkout_opts.checkout_strategy = GIT_CHECKOUT_SAFE | GIT_CHECKOUT_USE_OURS; - - cl_git_pass(merge_branches(repo, GIT_REFS_HEADS_DIR BRANCH_RENAME_OURS, GIT_REFS_HEADS_DIR BRANCH_RENAME_THEIRS, &merge_opts, &checkout_opts)); - cl_git_pass(git_repository_index(&index, repo)); - cl_git_pass(git_index_write(index)); - cl_assert(merge_test_workdir(repo, merge_index_entries, 20)); - - git_index_free(index); -} - -void test_merge_workdir_renames__similar(void) -{ - git_merge_options merge_opts = GIT_MERGE_OPTIONS_INIT; - - /* - * Note: this differs slightly from the core git merge result - there, 4a is - * tracked as a rename/delete instead of a rename/add and the theirs side - * is not placed in workdir in any form. - */ - struct merge_index_entry merge_index_entries[] = { - { 0100644, "68c6c84b091926c7d90aa6a79b2bc3bb6adccd8e", 0, "0a-no-change.txt" }, - { 0100644, "f0ce2b8e4986084d9b308fb72709e414c23eb5e6", 0, "0b-duplicated-in-ours.txt" }, - { 0100644, "8aac75de2a34b4d340bf62a6e58197269cb55797", 0, "0b-rewritten-in-ours.txt" }, - { 0100644, "2f56120107d680129a5d9791b521cb1e73a2ed31", 0, "0c-duplicated-in-theirs.txt" }, - { 0100644, "7edc726325da726751a4195e434e4377b0f67f9a", 0, "0c-rewritten-in-theirs.txt" }, - { 0100644, "0d872f8e871a30208305978ecbf9e66d864f1638", 0, "1a-newname-in-ours-edited-in-theirs.txt" }, - { 0100644, "d0d4594e16f2e19107e3fa7ea63e7aaaff305ffb", 0, "1a-newname-in-ours.txt" }, - { 0100644, "ed9523e62e453e50dd9be1606af19399b96e397a", 0, "1b-newname-in-theirs-edited-in-ours.txt" }, - { 0100644, "2b5f1f181ee3b58ea751f5dd5d8f9b445520a136", 0, "1b-newname-in-theirs.txt" }, - { 0100644, "178940b450f238a56c0d75b7955cb57b38191982", 0, "2-newname-in-both.txt" }, - { 0100644, "18cb316b1cefa0f8a6946f0e201a8e1a6f845ab9", 0, "3a-newname-in-ours-deleted-in-theirs.txt" }, - { 0100644, "36219b49367146cb2e6a1555b5a9ebd4d0328495", 0, "3b-newname-in-theirs-deleted-in-ours.txt" }, - { 0100644, "227792b52aaa0b238bea00ec7e509b02623f168c", 0, "4a-newname-in-ours-added-in-theirs.txt~HEAD" }, - { 0100644, "8b5b53cb2aa9ceb1139f5312fcfa3cc3c5a47c9a", 0, "4a-newname-in-ours-added-in-theirs.txt~rename_conflict_theirs" }, - { 0100644, "de872ee3618b894992e9d1e18ba2ebe256a112f9", 0, "4b-newname-in-theirs-added-in-ours.txt~HEAD" }, - { 0100644, "98d52d07c0b0bbf2b46548f6aa521295c2cb55db", 0, "4b-newname-in-theirs-added-in-ours.txt~rename_conflict_theirs" }, - { 0100644, "d3719a5ae8e4d92276b5313ce976f6ee5af2b436", 0, "5a-newname-in-ours-added-in-theirs.txt~HEAD" }, - { 0100644, "98ba4205fcf31f5dd93c916d35fe3f3b3d0e6714", 0, "5a-newname-in-ours-added-in-theirs.txt~rename_conflict_theirs" }, - { 0100644, "385c8a0f26ddf79e9041e15e17dc352ed2c4cced", 0, "5b-newname-in-theirs-added-in-ours.txt~HEAD" }, - { 0100644, "63247125386de9ec90a27ad36169307bf8a11a38", 0, "5b-newname-in-theirs-added-in-ours.txt~rename_conflict_theirs" }, - { 0100644, "d8fa77b6833082c1ea36b7828a582d4c43882450", 0, "6-both-renamed-1-to-2-ours.txt" }, - { 0100644, "d8fa77b6833082c1ea36b7828a582d4c43882450", 0, "6-both-renamed-1-to-2-theirs.txt" }, - { 0100644, "b42712cfe99a1a500b2a51fe984e0b8a7702ba11", 0, "7-both-renamed.txt~HEAD" }, - { 0100644, "b69fe837e4cecfd4c9a40cdca7c138468687df07", 0, "7-both-renamed.txt~rename_conflict_theirs" }, - }; - - merge_opts.flags |= GIT_MERGE_FIND_RENAMES; - merge_opts.rename_threshold = 50; - - cl_git_pass(merge_branches(repo, GIT_REFS_HEADS_DIR BRANCH_RENAME_OURS, GIT_REFS_HEADS_DIR BRANCH_RENAME_THEIRS, &merge_opts, NULL)); - cl_assert(merge_test_workdir(repo, merge_index_entries, 24)); -} - diff --git a/vendor/libgit2/tests/merge/workdir/setup.c b/vendor/libgit2/tests/merge/workdir/setup.c deleted file mode 100644 index 4aebf8701..000000000 --- a/vendor/libgit2/tests/merge/workdir/setup.c +++ /dev/null @@ -1,1096 +0,0 @@ -#include "clar_libgit2.h" -#include "git2/repository.h" -#include "git2/merge.h" -#include "merge.h" -#include "refs.h" -#include "fileops.h" - -static git_repository *repo; -static git_index *repo_index; - -#define TEST_REPO_PATH "merge-resolve" -#define TEST_INDEX_PATH TEST_REPO_PATH "/.git/index" - -#define ORIG_HEAD "bd593285fc7fe4ca18ccdbabf027f5d689101452" - -#define THEIRS_SIMPLE_BRANCH "branch" -#define THEIRS_SIMPLE_OID "7cb63eed597130ba4abb87b3e544b85021905520" - -#define OCTO1_BRANCH "octo1" -#define OCTO1_OID "16f825815cfd20a07a75c71554e82d8eede0b061" - -#define OCTO2_BRANCH "octo2" -#define OCTO2_OID "158dc7bedb202f5b26502bf3574faa7f4238d56c" - -#define OCTO3_BRANCH "octo3" -#define OCTO3_OID "50ce7d7d01217679e26c55939eef119e0c93e272" - -#define OCTO4_BRANCH "octo4" -#define OCTO4_OID "54269b3f6ec3d7d4ede24dd350dd5d605495c3ae" - -#define OCTO5_BRANCH "octo5" -#define OCTO5_OID "e4f618a2c3ed0669308735727df5ebf2447f022f" - -// Fixture setup and teardown -void test_merge_workdir_setup__initialize(void) -{ - repo = cl_git_sandbox_init(TEST_REPO_PATH); - git_repository_index(&repo_index, repo); -} - -void test_merge_workdir_setup__cleanup(void) -{ - git_index_free(repo_index); - cl_git_sandbox_cleanup(); -} - -static bool test_file_contents(const char *filename, const char *expected) -{ - git_buf file_path_buf = GIT_BUF_INIT, file_buf = GIT_BUF_INIT; - bool equals; - - git_buf_printf(&file_path_buf, "%s/%s", git_repository_path(repo), filename); - - cl_git_pass(git_futils_readbuffer(&file_buf, file_path_buf.ptr)); - equals = (strcmp(file_buf.ptr, expected) == 0); - - git_buf_free(&file_path_buf); - git_buf_free(&file_buf); - - return equals; -} - -static void write_file_contents(const char *filename, const char *output) -{ - git_buf file_path_buf = GIT_BUF_INIT; - - git_buf_printf(&file_path_buf, "%s/%s", git_repository_path(repo), - filename); - cl_git_rewritefile(file_path_buf.ptr, output); - - git_buf_free(&file_path_buf); -} - -/* git merge --no-ff octo1 */ -void test_merge_workdir_setup__one_branch(void) -{ - git_oid our_oid; - git_reference *octo1_ref; - git_annotated_commit *our_head, *their_heads[1]; - - cl_git_pass(git_oid_fromstr(&our_oid, ORIG_HEAD)); - cl_git_pass(git_annotated_commit_lookup(&our_head, repo, &our_oid)); - - cl_git_pass(git_reference_lookup(&octo1_ref, repo, GIT_REFS_HEADS_DIR OCTO1_BRANCH)); - cl_git_pass(git_annotated_commit_from_ref(&their_heads[0], repo, octo1_ref)); - - cl_git_pass(git_merge__setup(repo, our_head, (const git_annotated_commit **)their_heads, 1)); - - cl_assert(test_file_contents(GIT_MERGE_HEAD_FILE, OCTO1_OID "\n")); - cl_assert(test_file_contents(GIT_ORIG_HEAD_FILE, ORIG_HEAD "\n")); - cl_assert(test_file_contents(GIT_MERGE_MODE_FILE, "no-ff")); - cl_assert(test_file_contents(GIT_MERGE_MSG_FILE, "Merge branch '" OCTO1_BRANCH "'\n")); - - git_reference_free(octo1_ref); - - git_annotated_commit_free(our_head); - git_annotated_commit_free(their_heads[0]); -} - -/* git merge --no-ff 16f825815cfd20a07a75c71554e82d8eede0b061 */ -void test_merge_workdir_setup__one_oid(void) -{ - git_oid our_oid; - git_oid octo1_oid; - git_annotated_commit *our_head, *their_heads[1]; - - cl_git_pass(git_oid_fromstr(&our_oid, ORIG_HEAD)); - cl_git_pass(git_annotated_commit_lookup(&our_head, repo, &our_oid)); - - cl_git_pass(git_oid_fromstr(&octo1_oid, OCTO1_OID)); - cl_git_pass(git_annotated_commit_lookup(&their_heads[0], repo, &octo1_oid)); - - cl_git_pass(git_merge__setup(repo, our_head, (const git_annotated_commit **)their_heads, 1)); - - cl_assert(test_file_contents(GIT_MERGE_HEAD_FILE, OCTO1_OID "\n")); - cl_assert(test_file_contents(GIT_ORIG_HEAD_FILE, ORIG_HEAD "\n")); - cl_assert(test_file_contents(GIT_MERGE_MODE_FILE, "no-ff")); - cl_assert(test_file_contents(GIT_MERGE_MSG_FILE, "Merge commit '" OCTO1_OID "'\n")); - - git_annotated_commit_free(our_head); - git_annotated_commit_free(their_heads[0]); -} - -/* git merge octo1 octo2 */ -void test_merge_workdir_setup__two_branches(void) -{ - git_oid our_oid; - git_reference *octo1_ref; - git_reference *octo2_ref; - git_annotated_commit *our_head, *their_heads[2]; - - cl_git_pass(git_oid_fromstr(&our_oid, ORIG_HEAD)); - cl_git_pass(git_annotated_commit_lookup(&our_head, repo, &our_oid)); - - cl_git_pass(git_reference_lookup(&octo1_ref, repo, GIT_REFS_HEADS_DIR OCTO1_BRANCH)); - cl_git_pass(git_annotated_commit_from_ref(&their_heads[0], repo, octo1_ref)); - - cl_git_pass(git_reference_lookup(&octo2_ref, repo, GIT_REFS_HEADS_DIR OCTO2_BRANCH)); - cl_git_pass(git_annotated_commit_from_ref(&their_heads[1], repo, octo2_ref)); - - cl_git_pass(git_merge__setup(repo, our_head, (const git_annotated_commit **)their_heads, 2)); - - cl_assert(test_file_contents(GIT_MERGE_HEAD_FILE, OCTO1_OID "\n" OCTO2_OID "\n")); - cl_assert(test_file_contents(GIT_ORIG_HEAD_FILE, ORIG_HEAD "\n")); - cl_assert(test_file_contents(GIT_MERGE_MODE_FILE, "no-ff")); - cl_assert(test_file_contents(GIT_MERGE_MSG_FILE, "Merge branches '" OCTO1_BRANCH "' and '" OCTO2_BRANCH "'\n")); - - git_reference_free(octo1_ref); - git_reference_free(octo2_ref); - - git_annotated_commit_free(our_head); - git_annotated_commit_free(their_heads[0]); - git_annotated_commit_free(their_heads[1]); -} - -/* git merge octo1 octo2 octo3 */ -void test_merge_workdir_setup__three_branches(void) -{ - git_oid our_oid; - git_reference *octo1_ref; - git_reference *octo2_ref; - git_reference *octo3_ref; - git_annotated_commit *our_head, *their_heads[3]; - - cl_git_pass(git_oid_fromstr(&our_oid, ORIG_HEAD)); - cl_git_pass(git_annotated_commit_lookup(&our_head, repo, &our_oid)); - - cl_git_pass(git_reference_lookup(&octo1_ref, repo, GIT_REFS_HEADS_DIR OCTO1_BRANCH)); - cl_git_pass(git_annotated_commit_from_ref(&their_heads[0], repo, octo1_ref)); - - cl_git_pass(git_reference_lookup(&octo2_ref, repo, GIT_REFS_HEADS_DIR OCTO2_BRANCH)); - cl_git_pass(git_annotated_commit_from_ref(&their_heads[1], repo, octo2_ref)); - - cl_git_pass(git_reference_lookup(&octo3_ref, repo, GIT_REFS_HEADS_DIR OCTO3_BRANCH)); - cl_git_pass(git_annotated_commit_from_ref(&their_heads[2], repo, octo3_ref)); - - cl_git_pass(git_merge__setup(repo, our_head, (const git_annotated_commit **)their_heads, 3)); - - cl_assert(test_file_contents(GIT_MERGE_HEAD_FILE, OCTO1_OID "\n" OCTO2_OID "\n" OCTO3_OID "\n")); - cl_assert(test_file_contents(GIT_ORIG_HEAD_FILE, ORIG_HEAD "\n")); - cl_assert(test_file_contents(GIT_MERGE_MODE_FILE, "no-ff")); - cl_assert(test_file_contents(GIT_MERGE_MSG_FILE, "Merge branches '" OCTO1_BRANCH "', '" OCTO2_BRANCH "' and '" OCTO3_BRANCH "'\n")); - - git_reference_free(octo1_ref); - git_reference_free(octo2_ref); - git_reference_free(octo3_ref); - - git_annotated_commit_free(our_head); - git_annotated_commit_free(their_heads[0]); - git_annotated_commit_free(their_heads[1]); - git_annotated_commit_free(their_heads[2]); -} - -/* git merge 16f825815cfd20a07a75c71554e82d8eede0b061 158dc7bedb202f5b26502bf3574faa7f4238d56c 50ce7d7d01217679e26c55939eef119e0c93e272 */ -void test_merge_workdir_setup__three_oids(void) -{ - git_oid our_oid; - git_oid octo1_oid; - git_oid octo2_oid; - git_oid octo3_oid; - git_annotated_commit *our_head, *their_heads[3]; - - cl_git_pass(git_oid_fromstr(&our_oid, ORIG_HEAD)); - cl_git_pass(git_annotated_commit_lookup(&our_head, repo, &our_oid)); - - cl_git_pass(git_oid_fromstr(&octo1_oid, OCTO1_OID)); - cl_git_pass(git_annotated_commit_lookup(&their_heads[0], repo, &octo1_oid)); - - cl_git_pass(git_oid_fromstr(&octo2_oid, OCTO2_OID)); - cl_git_pass(git_annotated_commit_lookup(&their_heads[1], repo, &octo2_oid)); - - cl_git_pass(git_oid_fromstr(&octo3_oid, OCTO3_OID)); - cl_git_pass(git_annotated_commit_lookup(&their_heads[2], repo, &octo3_oid)); - - cl_git_pass(git_merge__setup(repo, our_head, (const git_annotated_commit **)their_heads, 3)); - - cl_assert(test_file_contents(GIT_MERGE_HEAD_FILE, OCTO1_OID "\n" OCTO2_OID "\n" OCTO3_OID "\n")); - cl_assert(test_file_contents(GIT_ORIG_HEAD_FILE, ORIG_HEAD "\n")); - cl_assert(test_file_contents(GIT_MERGE_MODE_FILE, "no-ff")); - cl_assert(test_file_contents(GIT_MERGE_MSG_FILE, "Merge commit '" OCTO1_OID "'; commit '" OCTO2_OID "'; commit '" OCTO3_OID "'\n")); - - git_annotated_commit_free(our_head); - git_annotated_commit_free(their_heads[0]); - git_annotated_commit_free(their_heads[1]); - git_annotated_commit_free(their_heads[2]); -} - -/* git merge octo1 158dc7bedb202f5b26502bf3574faa7f4238d56c */ -void test_merge_workdir_setup__branches_and_oids_1(void) -{ - git_oid our_oid; - git_reference *octo1_ref; - git_oid octo2_oid; - git_annotated_commit *our_head, *their_heads[2]; - - cl_git_pass(git_oid_fromstr(&our_oid, ORIG_HEAD)); - cl_git_pass(git_annotated_commit_lookup(&our_head, repo, &our_oid)); - - cl_git_pass(git_reference_lookup(&octo1_ref, repo, GIT_REFS_HEADS_DIR OCTO1_BRANCH)); - cl_git_pass(git_annotated_commit_from_ref(&their_heads[0], repo, octo1_ref)); - - cl_git_pass(git_oid_fromstr(&octo2_oid, OCTO2_OID)); - cl_git_pass(git_annotated_commit_lookup(&their_heads[1], repo, &octo2_oid)); - - cl_git_pass(git_merge__setup(repo, our_head, (const git_annotated_commit **)their_heads, 2)); - - cl_assert(test_file_contents(GIT_MERGE_HEAD_FILE, OCTO1_OID "\n" OCTO2_OID "\n")); - cl_assert(test_file_contents(GIT_ORIG_HEAD_FILE, ORIG_HEAD "\n")); - cl_assert(test_file_contents(GIT_MERGE_MODE_FILE, "no-ff")); - cl_assert(test_file_contents(GIT_MERGE_MSG_FILE, "Merge branch '" OCTO1_BRANCH "'; commit '" OCTO2_OID "'\n")); - - git_reference_free(octo1_ref); - - git_annotated_commit_free(our_head); - git_annotated_commit_free(their_heads[0]); - git_annotated_commit_free(their_heads[1]); -} - -/* git merge octo1 158dc7bedb202f5b26502bf3574faa7f4238d56c octo3 54269b3f6ec3d7d4ede24dd350dd5d605495c3ae */ -void test_merge_workdir_setup__branches_and_oids_2(void) -{ - git_oid our_oid; - git_reference *octo1_ref; - git_oid octo2_oid; - git_reference *octo3_ref; - git_oid octo4_oid; - git_annotated_commit *our_head, *their_heads[4]; - - cl_git_pass(git_oid_fromstr(&our_oid, ORIG_HEAD)); - cl_git_pass(git_annotated_commit_lookup(&our_head, repo, &our_oid)); - - cl_git_pass(git_reference_lookup(&octo1_ref, repo, GIT_REFS_HEADS_DIR OCTO1_BRANCH)); - cl_git_pass(git_annotated_commit_from_ref(&their_heads[0], repo, octo1_ref)); - - cl_git_pass(git_oid_fromstr(&octo2_oid, OCTO2_OID)); - cl_git_pass(git_annotated_commit_lookup(&their_heads[1], repo, &octo2_oid)); - - cl_git_pass(git_reference_lookup(&octo3_ref, repo, GIT_REFS_HEADS_DIR OCTO3_BRANCH)); - cl_git_pass(git_annotated_commit_from_ref(&their_heads[2], repo, octo3_ref)); - - cl_git_pass(git_oid_fromstr(&octo4_oid, OCTO4_OID)); - cl_git_pass(git_annotated_commit_lookup(&their_heads[3], repo, &octo4_oid)); - - cl_git_pass(git_merge__setup(repo, our_head, (const git_annotated_commit **)their_heads, 4)); - - cl_assert(test_file_contents(GIT_MERGE_HEAD_FILE, OCTO1_OID "\n" OCTO2_OID "\n" OCTO3_OID "\n" OCTO4_OID "\n")); - cl_assert(test_file_contents(GIT_ORIG_HEAD_FILE, ORIG_HEAD "\n")); - cl_assert(test_file_contents(GIT_MERGE_MODE_FILE, "no-ff")); - cl_assert(test_file_contents(GIT_MERGE_MSG_FILE, "Merge branches '" OCTO1_BRANCH "' and '" OCTO3_BRANCH "'; commit '" OCTO2_OID "'; commit '" OCTO4_OID "'\n")); - - git_reference_free(octo1_ref); - git_reference_free(octo3_ref); - - git_annotated_commit_free(our_head); - git_annotated_commit_free(their_heads[0]); - git_annotated_commit_free(their_heads[1]); - git_annotated_commit_free(their_heads[2]); - git_annotated_commit_free(their_heads[3]); -} - -/* git merge 16f825815cfd20a07a75c71554e82d8eede0b061 octo2 50ce7d7d01217679e26c55939eef119e0c93e272 octo4 */ -void test_merge_workdir_setup__branches_and_oids_3(void) -{ - git_oid our_oid; - git_oid octo1_oid; - git_reference *octo2_ref; - git_oid octo3_oid; - git_reference *octo4_ref; - git_annotated_commit *our_head, *their_heads[4]; - - cl_git_pass(git_oid_fromstr(&our_oid, ORIG_HEAD)); - cl_git_pass(git_annotated_commit_lookup(&our_head, repo, &our_oid)); - - cl_git_pass(git_oid_fromstr(&octo1_oid, OCTO1_OID)); - cl_git_pass(git_annotated_commit_lookup(&their_heads[0], repo, &octo1_oid)); - - cl_git_pass(git_reference_lookup(&octo2_ref, repo, GIT_REFS_HEADS_DIR OCTO2_BRANCH)); - cl_git_pass(git_annotated_commit_from_ref(&their_heads[1], repo, octo2_ref)); - - cl_git_pass(git_oid_fromstr(&octo3_oid, OCTO3_OID)); - cl_git_pass(git_annotated_commit_lookup(&their_heads[2], repo, &octo3_oid)); - - cl_git_pass(git_reference_lookup(&octo4_ref, repo, GIT_REFS_HEADS_DIR OCTO4_BRANCH)); - cl_git_pass(git_annotated_commit_from_ref(&their_heads[3], repo, octo4_ref)); - - cl_git_pass(git_merge__setup(repo, our_head, (const git_annotated_commit **)their_heads, 4)); - - cl_assert(test_file_contents(GIT_MERGE_HEAD_FILE, OCTO1_OID "\n" OCTO2_OID "\n" OCTO3_OID "\n" OCTO4_OID "\n")); - cl_assert(test_file_contents(GIT_ORIG_HEAD_FILE, ORIG_HEAD "\n")); - cl_assert(test_file_contents(GIT_MERGE_MODE_FILE, "no-ff")); - cl_assert(test_file_contents(GIT_MERGE_MSG_FILE, "Merge commit '" OCTO1_OID "'; branches '" OCTO2_BRANCH "' and '" OCTO4_BRANCH "'; commit '" OCTO3_OID "'\n")); - - git_reference_free(octo2_ref); - git_reference_free(octo4_ref); - - git_annotated_commit_free(our_head); - git_annotated_commit_free(their_heads[0]); - git_annotated_commit_free(their_heads[1]); - git_annotated_commit_free(their_heads[2]); - git_annotated_commit_free(their_heads[3]); -} - -/* git merge 16f825815cfd20a07a75c71554e82d8eede0b061 octo2 50ce7d7d01217679e26c55939eef119e0c93e272 octo4 octo5 */ -void test_merge_workdir_setup__branches_and_oids_4(void) -{ - git_oid our_oid; - git_oid octo1_oid; - git_reference *octo2_ref; - git_oid octo3_oid; - git_reference *octo4_ref; - git_reference *octo5_ref; - git_annotated_commit *our_head, *their_heads[5]; - - cl_git_pass(git_oid_fromstr(&our_oid, ORIG_HEAD)); - cl_git_pass(git_annotated_commit_lookup(&our_head, repo, &our_oid)); - - cl_git_pass(git_oid_fromstr(&octo1_oid, OCTO1_OID)); - cl_git_pass(git_annotated_commit_lookup(&their_heads[0], repo, &octo1_oid)); - - cl_git_pass(git_reference_lookup(&octo2_ref, repo, GIT_REFS_HEADS_DIR OCTO2_BRANCH)); - cl_git_pass(git_annotated_commit_from_ref(&their_heads[1], repo, octo2_ref)); - - cl_git_pass(git_oid_fromstr(&octo3_oid, OCTO3_OID)); - cl_git_pass(git_annotated_commit_lookup(&their_heads[2], repo, &octo3_oid)); - - cl_git_pass(git_reference_lookup(&octo4_ref, repo, GIT_REFS_HEADS_DIR OCTO4_BRANCH)); - cl_git_pass(git_annotated_commit_from_ref(&their_heads[3], repo, octo4_ref)); - - cl_git_pass(git_reference_lookup(&octo5_ref, repo, GIT_REFS_HEADS_DIR OCTO5_BRANCH)); - cl_git_pass(git_annotated_commit_from_ref(&their_heads[4], repo, octo5_ref)); - - cl_git_pass(git_merge__setup(repo, our_head, (const git_annotated_commit **)their_heads, 5)); - - cl_assert(test_file_contents(GIT_MERGE_HEAD_FILE, OCTO1_OID "\n" OCTO2_OID "\n" OCTO3_OID "\n" OCTO4_OID "\n" OCTO5_OID "\n")); - cl_assert(test_file_contents(GIT_ORIG_HEAD_FILE, ORIG_HEAD "\n")); - cl_assert(test_file_contents(GIT_MERGE_MODE_FILE, "no-ff")); - cl_assert(test_file_contents(GIT_MERGE_MSG_FILE, "Merge commit '" OCTO1_OID "'; branches '" OCTO2_BRANCH "', '" OCTO4_BRANCH "' and '" OCTO5_BRANCH "'; commit '" OCTO3_OID "'\n")); - - git_reference_free(octo2_ref); - git_reference_free(octo4_ref); - git_reference_free(octo5_ref); - - git_annotated_commit_free(our_head); - git_annotated_commit_free(their_heads[0]); - git_annotated_commit_free(their_heads[1]); - git_annotated_commit_free(their_heads[2]); - git_annotated_commit_free(their_heads[3]); - git_annotated_commit_free(their_heads[4]); -} - -/* git merge octo1 octo1 octo1 */ -void test_merge_workdir_setup__three_same_branches(void) -{ - git_oid our_oid; - git_reference *octo1_1_ref; - git_reference *octo1_2_ref; - git_reference *octo1_3_ref; - git_annotated_commit *our_head, *their_heads[3]; - - cl_git_pass(git_oid_fromstr(&our_oid, ORIG_HEAD)); - cl_git_pass(git_annotated_commit_lookup(&our_head, repo, &our_oid)); - - cl_git_pass(git_reference_lookup(&octo1_1_ref, repo, GIT_REFS_HEADS_DIR OCTO1_BRANCH)); - cl_git_pass(git_annotated_commit_from_ref(&their_heads[0], repo, octo1_1_ref)); - - cl_git_pass(git_reference_lookup(&octo1_2_ref, repo, GIT_REFS_HEADS_DIR OCTO1_BRANCH)); - cl_git_pass(git_annotated_commit_from_ref(&their_heads[1], repo, octo1_2_ref)); - - cl_git_pass(git_reference_lookup(&octo1_3_ref, repo, GIT_REFS_HEADS_DIR OCTO1_BRANCH)); - cl_git_pass(git_annotated_commit_from_ref(&their_heads[2], repo, octo1_3_ref)); - - cl_git_pass(git_merge__setup(repo, our_head, (const git_annotated_commit **)their_heads, 3)); - - cl_assert(test_file_contents(GIT_MERGE_HEAD_FILE, OCTO1_OID "\n" OCTO1_OID "\n" OCTO1_OID "\n")); - cl_assert(test_file_contents(GIT_ORIG_HEAD_FILE, ORIG_HEAD "\n")); - cl_assert(test_file_contents(GIT_MERGE_MODE_FILE, "no-ff")); - cl_assert(test_file_contents(GIT_MERGE_MSG_FILE, "Merge branches '" OCTO1_BRANCH "', '" OCTO1_BRANCH "' and '" OCTO1_BRANCH "'\n")); - - git_reference_free(octo1_1_ref); - git_reference_free(octo1_2_ref); - git_reference_free(octo1_3_ref); - - git_annotated_commit_free(our_head); - git_annotated_commit_free(their_heads[0]); - git_annotated_commit_free(their_heads[1]); - git_annotated_commit_free(their_heads[2]); -} - -/* git merge 16f825815cfd20a07a75c71554e82d8eede0b061 16f825815cfd20a07a75c71554e82d8eede0b061 16f825815cfd20a07a75c71554e82d8eede0b061 */ -void test_merge_workdir_setup__three_same_oids(void) -{ - git_oid our_oid; - git_oid octo1_1_oid; - git_oid octo1_2_oid; - git_oid octo1_3_oid; - git_annotated_commit *our_head, *their_heads[3]; - - cl_git_pass(git_oid_fromstr(&our_oid, ORIG_HEAD)); - cl_git_pass(git_annotated_commit_lookup(&our_head, repo, &our_oid)); - - cl_git_pass(git_oid_fromstr(&octo1_1_oid, OCTO1_OID)); - cl_git_pass(git_annotated_commit_lookup(&their_heads[0], repo, &octo1_1_oid)); - - cl_git_pass(git_oid_fromstr(&octo1_2_oid, OCTO1_OID)); - cl_git_pass(git_annotated_commit_lookup(&their_heads[1], repo, &octo1_2_oid)); - - cl_git_pass(git_oid_fromstr(&octo1_3_oid, OCTO1_OID)); - cl_git_pass(git_annotated_commit_lookup(&their_heads[2], repo, &octo1_3_oid)); - - cl_git_pass(git_merge__setup(repo, our_head, (const git_annotated_commit **)their_heads, 3)); - - cl_assert(test_file_contents(GIT_MERGE_HEAD_FILE, OCTO1_OID "\n" OCTO1_OID "\n" OCTO1_OID "\n")); - cl_assert(test_file_contents(GIT_ORIG_HEAD_FILE, ORIG_HEAD "\n")); - cl_assert(test_file_contents(GIT_MERGE_MODE_FILE, "no-ff")); - cl_assert(test_file_contents(GIT_MERGE_MSG_FILE, "Merge commit '" OCTO1_OID "'; commit '" OCTO1_OID "'; commit '" OCTO1_OID "'\n")); - - git_annotated_commit_free(our_head); - git_annotated_commit_free(their_heads[0]); - git_annotated_commit_free(their_heads[1]); - git_annotated_commit_free(their_heads[2]); -} - -static int create_remote_tracking_branch(const char *branch_name, const char *oid_str) -{ - int error = 0; - - git_buf remotes_path = GIT_BUF_INIT, - origin_path = GIT_BUF_INIT, - filename = GIT_BUF_INIT, - data = GIT_BUF_INIT; - - if ((error = git_buf_puts(&remotes_path, git_repository_path(repo))) < 0 || - (error = git_buf_puts(&remotes_path, GIT_REFS_REMOTES_DIR)) < 0) - goto done; - - if (!git_path_exists(git_buf_cstr(&remotes_path)) && - (error = p_mkdir(git_buf_cstr(&remotes_path), 0777)) < 0) - goto done; - - if ((error = git_buf_puts(&origin_path, git_buf_cstr(&remotes_path))) < 0 || - (error = git_buf_puts(&origin_path, "origin")) < 0) - goto done; - - if (!git_path_exists(git_buf_cstr(&origin_path)) && - (error = p_mkdir(git_buf_cstr(&origin_path), 0777)) < 0) - goto done; - - if ((error = git_buf_puts(&filename, git_buf_cstr(&origin_path))) < 0 || - (error = git_buf_puts(&filename, "/")) < 0 || - (error = git_buf_puts(&filename, branch_name)) < 0 || - (error = git_buf_puts(&data, oid_str)) < 0 || - (error = git_buf_puts(&data, "\n")) < 0) - goto done; - - cl_git_rewritefile(git_buf_cstr(&filename), git_buf_cstr(&data)); - -done: - git_buf_free(&remotes_path); - git_buf_free(&origin_path); - git_buf_free(&filename); - git_buf_free(&data); - - return error; -} - -/* git merge refs/remotes/origin/octo1 */ -void test_merge_workdir_setup__remote_tracking_one_branch(void) -{ - git_oid our_oid; - git_reference *octo1_ref; - git_annotated_commit *our_head, *their_heads[1]; - - cl_git_pass(create_remote_tracking_branch(OCTO1_BRANCH, OCTO1_OID)); - - cl_git_pass(git_oid_fromstr(&our_oid, ORIG_HEAD)); - cl_git_pass(git_annotated_commit_lookup(&our_head, repo, &our_oid)); - - cl_git_pass(git_reference_lookup(&octo1_ref, repo, GIT_REFS_REMOTES_DIR "origin/" OCTO1_BRANCH)); - cl_git_pass(git_annotated_commit_from_ref(&their_heads[0], repo, octo1_ref)); - - cl_git_pass(git_merge__setup(repo, our_head, (const git_annotated_commit **)their_heads, 1)); - - cl_assert(test_file_contents(GIT_MERGE_HEAD_FILE, OCTO1_OID "\n")); - cl_assert(test_file_contents(GIT_ORIG_HEAD_FILE, ORIG_HEAD "\n")); - cl_assert(test_file_contents(GIT_MERGE_MODE_FILE, "no-ff")); - cl_assert(test_file_contents(GIT_MERGE_MSG_FILE, "Merge remote-tracking branch 'refs/remotes/origin/" OCTO1_BRANCH "'\n")); - - git_reference_free(octo1_ref); - - git_annotated_commit_free(our_head); - git_annotated_commit_free(their_heads[0]); -} - -/* git merge refs/remotes/origin/octo1 refs/remotes/origin/octo2 */ -void test_merge_workdir_setup__remote_tracking_two_branches(void) -{ - git_oid our_oid; - git_reference *octo1_ref; - git_reference *octo2_ref; - git_annotated_commit *our_head, *their_heads[2]; - - cl_git_pass(create_remote_tracking_branch(OCTO1_BRANCH, OCTO1_OID)); - cl_git_pass(create_remote_tracking_branch(OCTO2_BRANCH, OCTO2_OID)); - - cl_git_pass(git_oid_fromstr(&our_oid, ORIG_HEAD)); - cl_git_pass(git_annotated_commit_lookup(&our_head, repo, &our_oid)); - - cl_git_pass(git_reference_lookup(&octo1_ref, repo, GIT_REFS_REMOTES_DIR "origin/" OCTO1_BRANCH)); - cl_git_pass(git_annotated_commit_from_ref(&their_heads[0], repo, octo1_ref)); - - cl_git_pass(git_reference_lookup(&octo2_ref, repo, GIT_REFS_REMOTES_DIR "origin/" OCTO2_BRANCH)); - cl_git_pass(git_annotated_commit_from_ref(&their_heads[1], repo, octo2_ref)); - - cl_git_pass(git_merge__setup(repo, our_head, (const git_annotated_commit **)their_heads, 2)); - - cl_assert(test_file_contents(GIT_MERGE_HEAD_FILE, OCTO1_OID "\n" OCTO2_OID "\n")); - cl_assert(test_file_contents(GIT_ORIG_HEAD_FILE, ORIG_HEAD "\n")); - cl_assert(test_file_contents(GIT_MERGE_MODE_FILE, "no-ff")); - cl_assert(test_file_contents(GIT_MERGE_MSG_FILE, "Merge remote-tracking branches 'refs/remotes/origin/" OCTO1_BRANCH "' and 'refs/remotes/origin/" OCTO2_BRANCH "'\n")); - - git_reference_free(octo1_ref); - git_reference_free(octo2_ref); - - git_annotated_commit_free(our_head); - git_annotated_commit_free(their_heads[0]); - git_annotated_commit_free(their_heads[1]); -} - -/* git merge refs/remotes/origin/octo1 refs/remotes/origin/octo2 refs/remotes/origin/octo3 */ -void test_merge_workdir_setup__remote_tracking_three_branches(void) -{ - git_oid our_oid; - git_reference *octo1_ref; - git_reference *octo2_ref; - git_reference *octo3_ref; - git_annotated_commit *our_head, *their_heads[3]; - - cl_git_pass(create_remote_tracking_branch(OCTO1_BRANCH, OCTO1_OID)); - cl_git_pass(create_remote_tracking_branch(OCTO2_BRANCH, OCTO2_OID)); - cl_git_pass(create_remote_tracking_branch(OCTO3_BRANCH, OCTO3_OID)); - - cl_git_pass(git_oid_fromstr(&our_oid, ORIG_HEAD)); - cl_git_pass(git_annotated_commit_lookup(&our_head, repo, &our_oid)); - - cl_git_pass(git_reference_lookup(&octo1_ref, repo, GIT_REFS_REMOTES_DIR "origin/" OCTO1_BRANCH)); - cl_git_pass(git_annotated_commit_from_ref(&their_heads[0], repo, octo1_ref)); - - cl_git_pass(git_reference_lookup(&octo2_ref, repo, GIT_REFS_REMOTES_DIR "origin/" OCTO2_BRANCH)); - cl_git_pass(git_annotated_commit_from_ref(&their_heads[1], repo, octo2_ref)); - - cl_git_pass(git_reference_lookup(&octo3_ref, repo, GIT_REFS_REMOTES_DIR "origin/" OCTO3_BRANCH)); - cl_git_pass(git_annotated_commit_from_ref(&their_heads[2], repo, octo3_ref)); - - cl_git_pass(git_merge__setup(repo, our_head, (const git_annotated_commit **)their_heads, 3)); - - cl_assert(test_file_contents(GIT_MERGE_HEAD_FILE, OCTO1_OID "\n" OCTO2_OID "\n" OCTO3_OID "\n")); - cl_assert(test_file_contents(GIT_ORIG_HEAD_FILE, ORIG_HEAD "\n")); - cl_assert(test_file_contents(GIT_MERGE_MODE_FILE, "no-ff")); - cl_assert(test_file_contents(GIT_MERGE_MSG_FILE, "Merge remote-tracking branches 'refs/remotes/origin/" OCTO1_BRANCH "', 'refs/remotes/origin/" OCTO2_BRANCH "' and 'refs/remotes/origin/" OCTO3_BRANCH "'\n")); - - git_reference_free(octo1_ref); - git_reference_free(octo2_ref); - git_reference_free(octo3_ref); - - git_annotated_commit_free(our_head); - git_annotated_commit_free(their_heads[0]); - git_annotated_commit_free(their_heads[1]); - git_annotated_commit_free(their_heads[2]); -} - -/* git merge octo1 refs/remotes/origin/octo2 */ -void test_merge_workdir_setup__normal_branch_and_remote_tracking_branch(void) -{ - git_oid our_oid; - git_reference *octo1_ref; - git_reference *octo2_ref; - git_annotated_commit *our_head, *their_heads[2]; - - cl_git_pass(create_remote_tracking_branch(OCTO2_BRANCH, OCTO2_OID)); - - cl_git_pass(git_oid_fromstr(&our_oid, ORIG_HEAD)); - cl_git_pass(git_annotated_commit_lookup(&our_head, repo, &our_oid)); - - cl_git_pass(git_reference_lookup(&octo1_ref, repo, GIT_REFS_HEADS_DIR OCTO1_BRANCH)); - cl_git_pass(git_annotated_commit_from_ref(&their_heads[0], repo, octo1_ref)); - - cl_git_pass(git_reference_lookup(&octo2_ref, repo, GIT_REFS_REMOTES_DIR "origin/" OCTO2_BRANCH)); - cl_git_pass(git_annotated_commit_from_ref(&their_heads[1], repo, octo2_ref)); - - cl_git_pass(git_merge__setup(repo, our_head, (const git_annotated_commit **)their_heads, 2)); - - cl_assert(test_file_contents(GIT_MERGE_HEAD_FILE, OCTO1_OID "\n" OCTO2_OID "\n")); - cl_assert(test_file_contents(GIT_ORIG_HEAD_FILE, ORIG_HEAD "\n")); - cl_assert(test_file_contents(GIT_MERGE_MODE_FILE, "no-ff")); - cl_assert(test_file_contents(GIT_MERGE_MSG_FILE, "Merge branch '" OCTO1_BRANCH "', remote-tracking branch 'refs/remotes/origin/" OCTO2_BRANCH "'\n")); - - git_reference_free(octo1_ref); - git_reference_free(octo2_ref); - - git_annotated_commit_free(our_head); - git_annotated_commit_free(their_heads[0]); - git_annotated_commit_free(their_heads[1]); -} - -/* git merge refs/remotes/origin/octo1 octo2 */ -void test_merge_workdir_setup__remote_tracking_branch_and_normal_branch(void) -{ - git_oid our_oid; - git_reference *octo1_ref; - git_reference *octo2_ref; - git_annotated_commit *our_head, *their_heads[2]; - - cl_git_pass(create_remote_tracking_branch(OCTO1_BRANCH, OCTO1_OID)); - - cl_git_pass(git_oid_fromstr(&our_oid, ORIG_HEAD)); - cl_git_pass(git_annotated_commit_lookup(&our_head, repo, &our_oid)); - - cl_git_pass(git_reference_lookup(&octo1_ref, repo, GIT_REFS_REMOTES_DIR "origin/" OCTO1_BRANCH)); - cl_git_pass(git_annotated_commit_from_ref(&their_heads[0], repo, octo1_ref)); - - cl_git_pass(git_reference_lookup(&octo2_ref, repo, GIT_REFS_HEADS_DIR OCTO2_BRANCH)); - cl_git_pass(git_annotated_commit_from_ref(&their_heads[1], repo, octo2_ref)); - - cl_git_pass(git_merge__setup(repo, our_head, (const git_annotated_commit **)their_heads, 2)); - - cl_assert(test_file_contents(GIT_MERGE_HEAD_FILE, OCTO1_OID "\n" OCTO2_OID "\n")); - cl_assert(test_file_contents(GIT_ORIG_HEAD_FILE, ORIG_HEAD "\n")); - cl_assert(test_file_contents(GIT_MERGE_MODE_FILE, "no-ff")); - cl_assert(test_file_contents(GIT_MERGE_MSG_FILE, "Merge branch '" OCTO2_BRANCH "', remote-tracking branch 'refs/remotes/origin/" OCTO1_BRANCH "'\n")); - - git_reference_free(octo1_ref); - git_reference_free(octo2_ref); - - git_annotated_commit_free(our_head); - git_annotated_commit_free(their_heads[0]); - git_annotated_commit_free(their_heads[1]); -} - -/* git merge octo1 refs/remotes/origin/octo2 octo3 refs/remotes/origin/octo4 */ -void test_merge_workdir_setup__two_remote_tracking_branch_and_two_normal_branches(void) -{ - git_oid our_oid; - git_reference *octo1_ref; - git_reference *octo2_ref; - git_reference *octo3_ref; - git_reference *octo4_ref; - git_annotated_commit *our_head, *their_heads[4]; - - cl_git_pass(create_remote_tracking_branch(OCTO2_BRANCH, OCTO2_OID)); - cl_git_pass(create_remote_tracking_branch(OCTO4_BRANCH, OCTO4_OID)); - - cl_git_pass(git_oid_fromstr(&our_oid, ORIG_HEAD)); - cl_git_pass(git_annotated_commit_lookup(&our_head, repo, &our_oid)); - - cl_git_pass(git_reference_lookup(&octo1_ref, repo, GIT_REFS_HEADS_DIR OCTO1_BRANCH)); - cl_git_pass(git_annotated_commit_from_ref(&their_heads[0], repo, octo1_ref)); - - cl_git_pass(git_reference_lookup(&octo2_ref, repo, GIT_REFS_REMOTES_DIR "origin/" OCTO2_BRANCH)); - cl_git_pass(git_annotated_commit_from_ref(&their_heads[1], repo, octo2_ref)); - - cl_git_pass(git_reference_lookup(&octo3_ref, repo, GIT_REFS_HEADS_DIR OCTO3_BRANCH)); - cl_git_pass(git_annotated_commit_from_ref(&their_heads[2], repo, octo3_ref)); - - cl_git_pass(git_reference_lookup(&octo4_ref, repo, GIT_REFS_REMOTES_DIR "origin/" OCTO4_BRANCH)); - cl_git_pass(git_annotated_commit_from_ref(&their_heads[3], repo, octo4_ref)); - - cl_git_pass(git_merge__setup(repo, our_head, (const git_annotated_commit **)their_heads, 4)); - - cl_assert(test_file_contents(GIT_MERGE_HEAD_FILE, OCTO1_OID "\n" OCTO2_OID "\n" OCTO3_OID "\n" OCTO4_OID "\n")); - cl_assert(test_file_contents(GIT_ORIG_HEAD_FILE, ORIG_HEAD "\n")); - cl_assert(test_file_contents(GIT_MERGE_MODE_FILE, "no-ff")); - cl_assert(test_file_contents(GIT_MERGE_MSG_FILE, "Merge branches '" OCTO1_BRANCH "' and '" OCTO3_BRANCH "', remote-tracking branches 'refs/remotes/origin/" OCTO2_BRANCH "' and 'refs/remotes/origin/" OCTO4_BRANCH "'\n")); - - git_reference_free(octo1_ref); - git_reference_free(octo2_ref); - git_reference_free(octo3_ref); - git_reference_free(octo4_ref); - - git_annotated_commit_free(our_head); - git_annotated_commit_free(their_heads[0]); - git_annotated_commit_free(their_heads[1]); - git_annotated_commit_free(their_heads[2]); - git_annotated_commit_free(their_heads[3]); -} - -/* git pull origin branch octo1 */ -void test_merge_workdir_setup__pull_one(void) -{ - git_oid our_oid; - git_oid octo1_1_oid; - git_annotated_commit *our_head, *their_heads[1]; - - cl_git_pass(git_oid_fromstr(&our_oid, ORIG_HEAD)); - cl_git_pass(git_annotated_commit_lookup(&our_head, repo, &our_oid)); - - cl_git_pass(git_oid_fromstr(&octo1_1_oid, OCTO1_OID)); - cl_git_pass(git_annotated_commit_from_fetchhead(&their_heads[0], repo, GIT_REFS_HEADS_DIR OCTO1_BRANCH, "http://remote.url/repo.git", &octo1_1_oid)); - - cl_git_pass(git_merge__setup(repo, our_head, (const git_annotated_commit **)their_heads, 1)); - - cl_assert(test_file_contents(GIT_MERGE_HEAD_FILE, OCTO1_OID "\n")); - cl_assert(test_file_contents(GIT_ORIG_HEAD_FILE, ORIG_HEAD "\n")); - cl_assert(test_file_contents(GIT_MERGE_MODE_FILE, "no-ff")); - cl_assert(test_file_contents(GIT_MERGE_MSG_FILE, "Merge branch 'octo1' of http://remote.url/repo.git\n")); - - git_annotated_commit_free(our_head); - git_annotated_commit_free(their_heads[0]); -} - -/* git pull origin octo1 octo2 */ -void test_merge_workdir_setup__pull_two(void) -{ - git_oid our_oid; - git_oid octo1_oid; - git_oid octo2_oid; - git_annotated_commit *our_head, *their_heads[2]; - - cl_git_pass(git_oid_fromstr(&our_oid, ORIG_HEAD)); - cl_git_pass(git_annotated_commit_lookup(&our_head, repo, &our_oid)); - - cl_git_pass(git_oid_fromstr(&octo1_oid, OCTO1_OID)); - cl_git_pass(git_annotated_commit_from_fetchhead(&their_heads[0], repo, GIT_REFS_HEADS_DIR OCTO1_BRANCH, "http://remote.url/repo.git", &octo1_oid)); - - cl_git_pass(git_oid_fromstr(&octo2_oid, OCTO2_OID)); - cl_git_pass(git_annotated_commit_from_fetchhead(&their_heads[1], repo, GIT_REFS_HEADS_DIR OCTO2_BRANCH, "http://remote.url/repo.git", &octo2_oid)); - - cl_git_pass(git_merge__setup(repo, our_head, (const git_annotated_commit **)their_heads, 2)); - - cl_assert(test_file_contents(GIT_MERGE_HEAD_FILE, OCTO1_OID "\n" OCTO2_OID "\n")); - cl_assert(test_file_contents(GIT_ORIG_HEAD_FILE, ORIG_HEAD "\n")); - cl_assert(test_file_contents(GIT_MERGE_MODE_FILE, "no-ff")); - cl_assert(test_file_contents(GIT_MERGE_MSG_FILE, "Merge branches '" OCTO1_BRANCH "' and '" OCTO2_BRANCH "' of http://remote.url/repo.git\n")); - - git_annotated_commit_free(our_head); - git_annotated_commit_free(their_heads[0]); - git_annotated_commit_free(their_heads[1]); -} - -/* git pull origin octo1 octo2 octo3 */ -void test_merge_workdir_setup__pull_three(void) -{ - git_oid our_oid; - git_oid octo1_oid; - git_oid octo2_oid; - git_oid octo3_oid; - git_annotated_commit *our_head, *their_heads[3]; - - cl_git_pass(git_oid_fromstr(&our_oid, ORIG_HEAD)); - cl_git_pass(git_annotated_commit_lookup(&our_head, repo, &our_oid)); - - cl_git_pass(git_oid_fromstr(&octo1_oid, OCTO1_OID)); - cl_git_pass(git_annotated_commit_from_fetchhead(&their_heads[0], repo, GIT_REFS_HEADS_DIR OCTO1_BRANCH, "http://remote.url/repo.git", &octo1_oid)); - - cl_git_pass(git_oid_fromstr(&octo2_oid, OCTO2_OID)); - cl_git_pass(git_annotated_commit_from_fetchhead(&their_heads[1], repo, GIT_REFS_HEADS_DIR OCTO2_BRANCH, "http://remote.url/repo.git", &octo2_oid)); - - cl_git_pass(git_oid_fromstr(&octo3_oid, OCTO3_OID)); - cl_git_pass(git_annotated_commit_from_fetchhead(&their_heads[2], repo, GIT_REFS_HEADS_DIR OCTO3_BRANCH, "http://remote.url/repo.git", &octo3_oid)); - - cl_git_pass(git_merge__setup(repo, our_head, (const git_annotated_commit **)their_heads, 3)); - - cl_assert(test_file_contents(GIT_MERGE_HEAD_FILE, OCTO1_OID "\n" OCTO2_OID "\n" OCTO3_OID "\n")); - cl_assert(test_file_contents(GIT_ORIG_HEAD_FILE, ORIG_HEAD "\n")); - cl_assert(test_file_contents(GIT_MERGE_MODE_FILE, "no-ff")); - cl_assert(test_file_contents(GIT_MERGE_MSG_FILE, "Merge branches '" OCTO1_BRANCH "', '" OCTO2_BRANCH "' and '" OCTO3_BRANCH "' of http://remote.url/repo.git\n")); - - git_annotated_commit_free(our_head); - git_annotated_commit_free(their_heads[0]); - git_annotated_commit_free(their_heads[1]); - git_annotated_commit_free(their_heads[2]); -} - -void test_merge_workdir_setup__three_remotes(void) -{ - git_oid our_oid; - git_oid octo1_oid; - git_oid octo2_oid; - git_oid octo3_oid; - git_annotated_commit *our_head, *their_heads[3]; - - cl_git_pass(git_oid_fromstr(&our_oid, ORIG_HEAD)); - cl_git_pass(git_annotated_commit_lookup(&our_head, repo, &our_oid)); - - cl_git_pass(git_oid_fromstr(&octo1_oid, OCTO1_OID)); - cl_git_pass(git_annotated_commit_from_fetchhead(&their_heads[0], repo, GIT_REFS_HEADS_DIR OCTO1_BRANCH, "http://remote.first/repo.git", &octo1_oid)); - - cl_git_pass(git_oid_fromstr(&octo2_oid, OCTO2_OID)); - cl_git_pass(git_annotated_commit_from_fetchhead(&their_heads[1], repo, GIT_REFS_HEADS_DIR OCTO2_BRANCH, "http://remote.second/repo.git", &octo2_oid)); - - cl_git_pass(git_oid_fromstr(&octo3_oid, OCTO3_OID)); - cl_git_pass(git_annotated_commit_from_fetchhead(&their_heads[2], repo, GIT_REFS_HEADS_DIR OCTO3_BRANCH, "http://remote.third/repo.git", &octo3_oid)); - - cl_git_pass(git_merge__setup(repo, our_head, (const git_annotated_commit **)their_heads, 3)); - - cl_assert(test_file_contents(GIT_MERGE_HEAD_FILE, OCTO1_OID "\n" OCTO2_OID "\n" OCTO3_OID "\n")); - cl_assert(test_file_contents(GIT_ORIG_HEAD_FILE, ORIG_HEAD "\n")); - cl_assert(test_file_contents(GIT_MERGE_MODE_FILE, "no-ff")); - cl_assert(test_file_contents(GIT_MERGE_MSG_FILE, "Merge branch '" OCTO1_BRANCH "' of http://remote.first/repo.git, branch '" OCTO2_BRANCH "' of http://remote.second/repo.git, branch '" OCTO3_BRANCH "' of http://remote.third/repo.git\n")); - - git_annotated_commit_free(our_head); - git_annotated_commit_free(their_heads[0]); - git_annotated_commit_free(their_heads[1]); - git_annotated_commit_free(their_heads[2]); -} - -void test_merge_workdir_setup__two_remotes(void) -{ - git_oid our_oid; - git_oid octo1_oid; - git_oid octo2_oid; - git_oid octo3_oid; - git_oid octo4_oid; - git_annotated_commit *our_head, *their_heads[4]; - - cl_git_pass(git_oid_fromstr(&our_oid, ORIG_HEAD)); - cl_git_pass(git_annotated_commit_lookup(&our_head, repo, &our_oid)); - - cl_git_pass(git_oid_fromstr(&octo1_oid, OCTO1_OID)); - cl_git_pass(git_annotated_commit_from_fetchhead(&their_heads[0], repo, GIT_REFS_HEADS_DIR OCTO1_BRANCH, "http://remote.first/repo.git", &octo1_oid)); - - cl_git_pass(git_oid_fromstr(&octo2_oid, OCTO2_OID)); - cl_git_pass(git_annotated_commit_from_fetchhead(&their_heads[1], repo, GIT_REFS_HEADS_DIR OCTO2_BRANCH, "http://remote.second/repo.git", &octo2_oid)); - - cl_git_pass(git_oid_fromstr(&octo3_oid, OCTO3_OID)); - cl_git_pass(git_annotated_commit_from_fetchhead(&their_heads[2], repo, GIT_REFS_HEADS_DIR OCTO3_BRANCH, "http://remote.first/repo.git", &octo3_oid)); - - cl_git_pass(git_oid_fromstr(&octo4_oid, OCTO4_OID)); - cl_git_pass(git_annotated_commit_from_fetchhead(&their_heads[3], repo, GIT_REFS_HEADS_DIR OCTO4_BRANCH, "http://remote.second/repo.git", &octo4_oid)); - - cl_git_pass(git_merge__setup(repo, our_head, (const git_annotated_commit **)their_heads, 4)); - - cl_assert(test_file_contents(GIT_MERGE_HEAD_FILE, OCTO1_OID "\n" OCTO2_OID "\n" OCTO3_OID "\n" OCTO4_OID "\n")); - cl_assert(test_file_contents(GIT_ORIG_HEAD_FILE, ORIG_HEAD "\n")); - cl_assert(test_file_contents(GIT_MERGE_MODE_FILE, "no-ff")); - cl_assert(test_file_contents(GIT_MERGE_MSG_FILE, "Merge branches '" OCTO1_BRANCH "' and '" OCTO3_BRANCH "' of http://remote.first/repo.git, branches '" OCTO2_BRANCH "' and '" OCTO4_BRANCH "' of http://remote.second/repo.git\n")); - - git_annotated_commit_free(our_head); - git_annotated_commit_free(their_heads[0]); - git_annotated_commit_free(their_heads[1]); - git_annotated_commit_free(their_heads[2]); - git_annotated_commit_free(their_heads[3]); -} - -void test_merge_workdir_setup__id_from_head(void) -{ - git_oid expected_id; - const git_oid *id; - git_reference *ref; - git_annotated_commit *heads[3]; - - cl_git_pass(git_oid_fromstr(&expected_id, OCTO1_OID)); - cl_git_pass(git_annotated_commit_from_fetchhead(&heads[0], repo, GIT_REFS_HEADS_DIR OCTO1_BRANCH, "http://remote.url/repo.git", &expected_id)); - id = git_annotated_commit_id(heads[0]); - cl_assert_equal_i(1, git_oid_equal(id, &expected_id)); - - cl_git_pass(git_annotated_commit_lookup(&heads[1], repo, &expected_id)); - id = git_annotated_commit_id(heads[1]); - cl_assert_equal_i(1, git_oid_equal(id, &expected_id)); - - cl_git_pass(git_reference_lookup(&ref, repo, GIT_REFS_HEADS_DIR OCTO1_BRANCH)); - cl_git_pass(git_annotated_commit_from_ref(&heads[2], repo, ref)); - id = git_annotated_commit_id(heads[2]); - cl_assert_equal_i(1, git_oid_equal(id, &expected_id)); - - git_reference_free(ref); - git_annotated_commit_free(heads[0]); - git_annotated_commit_free(heads[1]); - git_annotated_commit_free(heads[2]); -} - -struct annotated_commit_cb_data { - const char **oid_str; - unsigned int len; - - unsigned int i; -}; - -static int annotated_commit_foreach_cb(const git_oid *oid, void *payload) -{ - git_oid expected_oid; - struct annotated_commit_cb_data *cb_data = payload; - - git_oid_fromstr(&expected_oid, cb_data->oid_str[cb_data->i]); - cl_assert(git_oid_cmp(&expected_oid, oid) == 0); - cb_data->i++; - return 0; -} - -void test_merge_workdir_setup__head_notfound(void) -{ - int error; - - cl_git_fail((error = git_repository_mergehead_foreach(repo, - annotated_commit_foreach_cb, NULL))); - cl_assert(error == GIT_ENOTFOUND); -} - -void test_merge_workdir_setup__head_invalid_oid(void) -{ - int error; - - write_file_contents(GIT_MERGE_HEAD_FILE, "invalid-oid\n"); - - cl_git_fail((error = git_repository_mergehead_foreach(repo, - annotated_commit_foreach_cb, NULL))); - cl_assert(error == -1); -} - -void test_merge_workdir_setup__head_foreach_nonewline(void) -{ - int error; - - write_file_contents(GIT_MERGE_HEAD_FILE, THEIRS_SIMPLE_OID); - - cl_git_fail((error = git_repository_mergehead_foreach(repo, - annotated_commit_foreach_cb, NULL))); - cl_assert(error == -1); -} - -void test_merge_workdir_setup__head_foreach_one(void) -{ - const char *expected = THEIRS_SIMPLE_OID; - - struct annotated_commit_cb_data cb_data = { &expected, 1 }; - - write_file_contents(GIT_MERGE_HEAD_FILE, THEIRS_SIMPLE_OID "\n"); - - cl_git_pass(git_repository_mergehead_foreach(repo, - annotated_commit_foreach_cb, &cb_data)); - - cl_assert(cb_data.i == cb_data.len); -} - -void test_merge_workdir_setup__head_foreach_octopus(void) -{ - const char *expected[] = { THEIRS_SIMPLE_OID, - OCTO1_OID, OCTO2_OID, OCTO3_OID, OCTO4_OID, OCTO5_OID }; - - struct annotated_commit_cb_data cb_data = { expected, 6 }; - - write_file_contents(GIT_MERGE_HEAD_FILE, - THEIRS_SIMPLE_OID "\n" - OCTO1_OID "\n" - OCTO2_OID "\n" - OCTO3_OID "\n" - OCTO4_OID "\n" - OCTO5_OID "\n"); - - cl_git_pass(git_repository_mergehead_foreach(repo, - annotated_commit_foreach_cb, &cb_data)); - - cl_assert(cb_data.i == cb_data.len); -} - -void test_merge_workdir_setup__retained_after_success(void) -{ - git_oid our_oid; - git_reference *octo1_ref; - git_annotated_commit *our_head, *their_heads[1]; - - cl_git_pass(git_oid_fromstr(&our_oid, ORIG_HEAD)); - cl_git_pass(git_annotated_commit_lookup(&our_head, repo, &our_oid)); - - cl_git_pass(git_reference_lookup(&octo1_ref, repo, GIT_REFS_HEADS_DIR OCTO1_BRANCH)); - - cl_git_pass(git_annotated_commit_from_ref(&their_heads[0], repo, octo1_ref)); - - cl_git_pass(git_merge(repo, (const git_annotated_commit **)&their_heads[0], 1, NULL, NULL)); - - cl_assert(test_file_contents(GIT_MERGE_HEAD_FILE, OCTO1_OID "\n")); - cl_assert(test_file_contents(GIT_ORIG_HEAD_FILE, ORIG_HEAD "\n")); - cl_assert(test_file_contents(GIT_MERGE_MODE_FILE, "no-ff")); - cl_assert(test_file_contents(GIT_MERGE_MSG_FILE, "Merge branch '" OCTO1_BRANCH "'\n")); - - git_reference_free(octo1_ref); - - git_annotated_commit_free(our_head); - git_annotated_commit_free(their_heads[0]); -} - - -void test_merge_workdir_setup__removed_after_failure(void) -{ - git_oid our_oid; - git_reference *octo1_ref; - git_annotated_commit *our_head, *their_heads[1]; - - cl_git_pass(git_oid_fromstr(&our_oid, ORIG_HEAD)); - cl_git_pass(git_annotated_commit_lookup(&our_head, repo, &our_oid)); - - cl_git_pass(git_reference_lookup(&octo1_ref, repo, GIT_REFS_HEADS_DIR OCTO1_BRANCH)); - cl_git_pass(git_annotated_commit_from_ref(&their_heads[0], repo, octo1_ref)); - - cl_git_write2file("merge-resolve/.git/index.lock", "foo\n", 4, O_RDWR|O_CREAT, 0666); - - cl_git_fail(git_merge( - repo, (const git_annotated_commit **)&their_heads[0], 1, NULL, NULL)); - - cl_assert(!git_path_exists("merge-resolve/.git/" GIT_MERGE_HEAD_FILE)); - cl_assert(!git_path_exists("merge-resolve/.git/" GIT_MERGE_MODE_FILE)); - cl_assert(!git_path_exists("merge-resolve/.git/" GIT_MERGE_MSG_FILE)); - - git_reference_free(octo1_ref); - - git_annotated_commit_free(our_head); - git_annotated_commit_free(their_heads[0]); -} - -void test_merge_workdir_setup__unlocked_after_success(void) -{ - git_oid our_oid; - git_reference *octo1_ref; - git_annotated_commit *our_head, *their_heads[1]; - - cl_git_pass(git_oid_fromstr(&our_oid, ORIG_HEAD)); - cl_git_pass(git_annotated_commit_lookup(&our_head, repo, &our_oid)); - - cl_git_pass(git_reference_lookup(&octo1_ref, repo, GIT_REFS_HEADS_DIR OCTO1_BRANCH)); - cl_git_pass(git_annotated_commit_from_ref(&their_heads[0], repo, octo1_ref)); - - cl_git_pass(git_merge( - repo, (const git_annotated_commit **)&their_heads[0], 1, NULL, NULL)); - - cl_assert(!git_path_exists("merge-resolve/.git/index.lock")); - - git_reference_free(octo1_ref); - - git_annotated_commit_free(our_head); - git_annotated_commit_free(their_heads[0]); -} - -void test_merge_workdir_setup__unlocked_after_conflict(void) -{ - git_oid our_oid; - git_reference *octo1_ref; - git_annotated_commit *our_head, *their_heads[1]; - - cl_git_pass(git_oid_fromstr(&our_oid, ORIG_HEAD)); - cl_git_pass(git_annotated_commit_lookup(&our_head, repo, &our_oid)); - - cl_git_pass(git_reference_lookup(&octo1_ref, repo, GIT_REFS_HEADS_DIR OCTO1_BRANCH)); - cl_git_pass(git_annotated_commit_from_ref(&their_heads[0], repo, octo1_ref)); - - cl_git_rewritefile("merge-resolve/new-in-octo1.txt", - "Conflicting file!\n\nMerge will fail!\n"); - - cl_git_fail(git_merge( - repo, (const git_annotated_commit **)&their_heads[0], 1, NULL, NULL)); - - cl_assert(!git_path_exists("merge-resolve/.git/index.lock")); - - git_reference_free(octo1_ref); - - git_annotated_commit_free(our_head); - git_annotated_commit_free(their_heads[0]); -} diff --git a/vendor/libgit2/tests/merge/workdir/simple.c b/vendor/libgit2/tests/merge/workdir/simple.c deleted file mode 100644 index 3cdd15b5a..000000000 --- a/vendor/libgit2/tests/merge/workdir/simple.c +++ /dev/null @@ -1,636 +0,0 @@ -#include "clar_libgit2.h" -#include "git2/repository.h" -#include "git2/merge.h" -#include "buffer.h" -#include "merge.h" -#include "../merge_helpers.h" -#include "../conflict_data.h" -#include "refs.h" -#include "fileops.h" - -static git_repository *repo; -static git_index *repo_index; - -#define TEST_REPO_PATH "merge-resolve" -#define TEST_INDEX_PATH TEST_REPO_PATH "/.git/index" - -#define THEIRS_SIMPLE_BRANCH "branch" -#define THEIRS_SIMPLE_OID "7cb63eed597130ba4abb87b3e544b85021905520" - -#define THEIRS_UNRELATED_BRANCH "unrelated" -#define THEIRS_UNRELATED_OID "55b4e4687e7a0d9ca367016ed930f385d4022e6f" -#define THEIRS_UNRELATED_PARENT "d6cf6c7741b3316826af1314042550c97ded1d50" - -#define OURS_DIRECTORY_FILE "df_side1" -#define THEIRS_DIRECTORY_FILE "fc90237dc4891fa6c69827fc465632225e391618" - - -/* Non-conflicting files, index entries are common to every merge operation */ -#define ADDED_IN_MASTER_INDEX_ENTRY \ - { 0100644, "233c0919c998ed110a4b6ff36f353aec8b713487", 0, \ - "added-in-master.txt" } -#define AUTOMERGEABLE_INDEX_ENTRY \ - { 0100644, "f2e1550a0c9e53d5811175864a29536642ae3821", 0, \ - "automergeable.txt" } -#define CHANGED_IN_BRANCH_INDEX_ENTRY \ - { 0100644, "4eb04c9e79e88f6640d01ff5b25ca2a60764f216", 0, \ - "changed-in-branch.txt" } -#define CHANGED_IN_MASTER_INDEX_ENTRY \ - { 0100644, "11deab00b2d3a6f5a3073988ac050c2d7b6655e2", 0, \ - "changed-in-master.txt" } -#define UNCHANGED_INDEX_ENTRY \ - { 0100644, "c8f06f2e3bb2964174677e91f0abead0e43c9e5d", 0, \ - "unchanged.txt" } - -/* Unrelated files */ -#define UNRELATED_NEW1 \ - { 0100644, "ef58fdd8086c243bdc81f99e379acacfd21d32d6", 0, \ - "new-in-unrelated1.txt" } -#define UNRELATED_NEW2 \ - { 0100644, "948ba6e701c1edab0c2d394fb7c5538334129793", 0, \ - "new-in-unrelated2.txt" } - -/* Expected REUC entries */ -#define AUTOMERGEABLE_REUC_ENTRY \ - { "automergeable.txt", 0100644, 0100644, 0100644, \ - "6212c31dab5e482247d7977e4f0dd3601decf13b", \ - "ee3fa1b8c00aff7fe02065fdb50864bb0d932ccf", \ - "058541fc37114bfc1dddf6bd6bffc7fae5c2e6fe" } -#define CONFLICTING_REUC_ENTRY \ - { "conflicting.txt", 0100644, 0100644, 0100644, \ - "d427e0b2e138501a3d15cc376077a3631e15bd46", \ - "4e886e602529caa9ab11d71f86634bd1b6e0de10", \ - "2bd0a343aeef7a2cf0d158478966a6e587ff3863" } -#define REMOVED_IN_BRANCH_REUC_ENTRY \ - { "removed-in-branch.txt", 0100644, 0100644, 0, \ - "dfe3f22baa1f6fce5447901c3086bae368de6bdd", \ - "dfe3f22baa1f6fce5447901c3086bae368de6bdd", \ - "" } -#define REMOVED_IN_MASTER_REUC_ENTRY \ - { "removed-in-master.txt", 0100644, 0, 0100644, \ - "5c3b68a71fc4fa5d362fd3875e53137c6a5ab7a5", \ - "", \ - "5c3b68a71fc4fa5d362fd3875e53137c6a5ab7a5" } - - -// Fixture setup and teardown -void test_merge_workdir_simple__initialize(void) -{ - git_config *cfg; - - repo = cl_git_sandbox_init(TEST_REPO_PATH); - git_repository_index(&repo_index, repo); - - /* Ensure that the user's merge.conflictstyle doesn't interfere */ - cl_git_pass(git_repository_config(&cfg, repo)); - cl_git_pass(git_config_set_string(cfg, "merge.conflictstyle", "merge")); - git_config_free(cfg); -} - -void test_merge_workdir_simple__cleanup(void) -{ - git_index_free(repo_index); - cl_git_sandbox_cleanup(); -} - -static void merge_simple_branch(int merge_file_favor, int addl_checkout_strategy) -{ - git_oid their_oids[1]; - git_annotated_commit *their_heads[1]; - git_merge_options merge_opts = GIT_MERGE_OPTIONS_INIT; - git_checkout_options checkout_opts = GIT_CHECKOUT_OPTIONS_INIT; - - cl_git_pass(git_oid_fromstr(&their_oids[0], THEIRS_SIMPLE_OID)); - cl_git_pass(git_annotated_commit_lookup(&their_heads[0], repo, &their_oids[0])); - - merge_opts.file_favor = merge_file_favor; - checkout_opts.checkout_strategy = GIT_CHECKOUT_SAFE | GIT_CHECKOUT_ALLOW_CONFLICTS | - addl_checkout_strategy; - - cl_git_pass(git_merge(repo, (const git_annotated_commit **)their_heads, 1, &merge_opts, &checkout_opts)); - - git_annotated_commit_free(their_heads[0]); -} - -static void set_core_autocrlf_to(git_repository *repo, bool value) -{ - git_config *cfg; - - cl_git_pass(git_repository_config(&cfg, repo)); - cl_git_pass(git_config_set_bool(cfg, "core.autocrlf", value)); - - git_config_free(cfg); -} - -void test_merge_workdir_simple__automerge(void) -{ - git_index *index; - const git_index_entry *entry; - git_buf automergeable_buf = GIT_BUF_INIT; - - struct merge_index_entry merge_index_entries[] = { - ADDED_IN_MASTER_INDEX_ENTRY, - AUTOMERGEABLE_INDEX_ENTRY, - CHANGED_IN_BRANCH_INDEX_ENTRY, - CHANGED_IN_MASTER_INDEX_ENTRY, - - { 0100644, "d427e0b2e138501a3d15cc376077a3631e15bd46", 1, "conflicting.txt" }, - { 0100644, "4e886e602529caa9ab11d71f86634bd1b6e0de10", 2, "conflicting.txt" }, - { 0100644, "2bd0a343aeef7a2cf0d158478966a6e587ff3863", 3, "conflicting.txt" }, - - UNCHANGED_INDEX_ENTRY, - }; - - struct merge_reuc_entry merge_reuc_entries[] = { - AUTOMERGEABLE_REUC_ENTRY, - REMOVED_IN_BRANCH_REUC_ENTRY, - REMOVED_IN_MASTER_REUC_ENTRY - }; - - - set_core_autocrlf_to(repo, false); - - merge_simple_branch(0, 0); - - cl_git_pass(git_futils_readbuffer(&automergeable_buf, - TEST_REPO_PATH "/automergeable.txt")); - cl_assert(strcmp(automergeable_buf.ptr, AUTOMERGEABLE_MERGED_FILE) == 0); - git_buf_free(&automergeable_buf); - - cl_assert(merge_test_index(repo_index, merge_index_entries, 8)); - cl_assert(merge_test_reuc(repo_index, merge_reuc_entries, 3)); - - git_repository_index(&index, repo); - - cl_assert((entry = git_index_get_bypath(index, "automergeable.txt", 0)) != NULL); - cl_assert(entry->file_size == strlen(AUTOMERGEABLE_MERGED_FILE)); - - git_index_free(index); -} - -void test_merge_workdir_simple__automerge_crlf(void) -{ -#ifdef GIT_WIN32 - git_index *index; - const git_index_entry *entry; - git_buf automergeable_buf = GIT_BUF_INIT; - - struct merge_index_entry merge_index_entries[] = { - ADDED_IN_MASTER_INDEX_ENTRY, - AUTOMERGEABLE_INDEX_ENTRY, - CHANGED_IN_BRANCH_INDEX_ENTRY, - CHANGED_IN_MASTER_INDEX_ENTRY, - - { 0100644, "d427e0b2e138501a3d15cc376077a3631e15bd46", 1, "conflicting.txt" }, - { 0100644, "4e886e602529caa9ab11d71f86634bd1b6e0de10", 2, "conflicting.txt" }, - { 0100644, "2bd0a343aeef7a2cf0d158478966a6e587ff3863", 3, "conflicting.txt" }, - - UNCHANGED_INDEX_ENTRY, - }; - - struct merge_reuc_entry merge_reuc_entries[] = { - AUTOMERGEABLE_REUC_ENTRY, - REMOVED_IN_BRANCH_REUC_ENTRY, - REMOVED_IN_MASTER_REUC_ENTRY - }; - - set_core_autocrlf_to(repo, true); - - merge_simple_branch(0, 0); - - cl_git_pass(git_futils_readbuffer(&automergeable_buf, - TEST_REPO_PATH "/automergeable.txt")); - cl_assert(strcmp(automergeable_buf.ptr, AUTOMERGEABLE_MERGED_FILE_CRLF) == 0); - git_buf_free(&automergeable_buf); - - cl_assert(merge_test_index(repo_index, merge_index_entries, 8)); - cl_assert(merge_test_reuc(repo_index, merge_reuc_entries, 3)); - - git_repository_index(&index, repo); - - cl_assert((entry = git_index_get_bypath(index, "automergeable.txt", 0)) != NULL); - cl_assert(entry->file_size == strlen(AUTOMERGEABLE_MERGED_FILE_CRLF)); - - git_index_free(index); -#endif /* GIT_WIN32 */ -} - -void test_merge_workdir_simple__mergefile(void) -{ - git_buf conflicting_buf = GIT_BUF_INIT, mergemsg_buf = GIT_BUF_INIT; - - struct merge_index_entry merge_index_entries[] = { - ADDED_IN_MASTER_INDEX_ENTRY, - AUTOMERGEABLE_INDEX_ENTRY, - CHANGED_IN_BRANCH_INDEX_ENTRY, - CHANGED_IN_MASTER_INDEX_ENTRY, - - { 0100644, "d427e0b2e138501a3d15cc376077a3631e15bd46", 1, "conflicting.txt" }, - { 0100644, "4e886e602529caa9ab11d71f86634bd1b6e0de10", 2, "conflicting.txt" }, - { 0100644, "2bd0a343aeef7a2cf0d158478966a6e587ff3863", 3, "conflicting.txt" }, - - UNCHANGED_INDEX_ENTRY, - }; - - struct merge_reuc_entry merge_reuc_entries[] = { - AUTOMERGEABLE_REUC_ENTRY, - REMOVED_IN_BRANCH_REUC_ENTRY, - REMOVED_IN_MASTER_REUC_ENTRY - }; - - set_core_autocrlf_to(repo, false); - - merge_simple_branch(0, 0); - - cl_git_pass(git_futils_readbuffer(&conflicting_buf, - TEST_REPO_PATH "/conflicting.txt")); - cl_assert(strcmp(conflicting_buf.ptr, CONFLICTING_MERGE_FILE) == 0); - cl_git_pass(git_futils_readbuffer(&mergemsg_buf, - TEST_REPO_PATH "/.git/MERGE_MSG")); - cl_assert(strcmp(git_buf_cstr(&mergemsg_buf), - "Merge commit '7cb63eed597130ba4abb87b3e544b85021905520'\n" \ - "\n" \ - "Conflicts:\n" \ - "\tconflicting.txt\n") == 0); - git_buf_free(&conflicting_buf); - git_buf_free(&mergemsg_buf); - - cl_assert(merge_test_index(repo_index, merge_index_entries, 8)); - cl_assert(merge_test_reuc(repo_index, merge_reuc_entries, 3)); -} - -void test_merge_workdir_simple__diff3(void) -{ - git_buf conflicting_buf = GIT_BUF_INIT; - - struct merge_index_entry merge_index_entries[] = { - ADDED_IN_MASTER_INDEX_ENTRY, - AUTOMERGEABLE_INDEX_ENTRY, - CHANGED_IN_BRANCH_INDEX_ENTRY, - CHANGED_IN_MASTER_INDEX_ENTRY, - - { 0100644, "d427e0b2e138501a3d15cc376077a3631e15bd46", 1, "conflicting.txt" }, - { 0100644, "4e886e602529caa9ab11d71f86634bd1b6e0de10", 2, "conflicting.txt" }, - { 0100644, "2bd0a343aeef7a2cf0d158478966a6e587ff3863", 3, "conflicting.txt" }, - - UNCHANGED_INDEX_ENTRY, - }; - - struct merge_reuc_entry merge_reuc_entries[] = { - AUTOMERGEABLE_REUC_ENTRY, - REMOVED_IN_BRANCH_REUC_ENTRY, - REMOVED_IN_MASTER_REUC_ENTRY - }; - - set_core_autocrlf_to(repo, false); - - merge_simple_branch(0, GIT_CHECKOUT_CONFLICT_STYLE_DIFF3); - - cl_git_pass(git_futils_readbuffer(&conflicting_buf, - TEST_REPO_PATH "/conflicting.txt")); - cl_assert(strcmp(conflicting_buf.ptr, CONFLICTING_DIFF3_FILE) == 0); - git_buf_free(&conflicting_buf); - - cl_assert(merge_test_index(repo_index, merge_index_entries, 8)); - cl_assert(merge_test_reuc(repo_index, merge_reuc_entries, 3)); -} - -void test_merge_workdir_simple__union(void) -{ - git_buf conflicting_buf = GIT_BUF_INIT; - - struct merge_index_entry merge_index_entries[] = { - ADDED_IN_MASTER_INDEX_ENTRY, - AUTOMERGEABLE_INDEX_ENTRY, - CHANGED_IN_BRANCH_INDEX_ENTRY, - CHANGED_IN_MASTER_INDEX_ENTRY, - - { 0100644, "72cdb057b340205164478565e91eb71647e66891", 0, "conflicting.txt" }, - - UNCHANGED_INDEX_ENTRY, - }; - - struct merge_reuc_entry merge_reuc_entries[] = { - AUTOMERGEABLE_REUC_ENTRY, - CONFLICTING_REUC_ENTRY, - REMOVED_IN_BRANCH_REUC_ENTRY, - REMOVED_IN_MASTER_REUC_ENTRY - }; - - set_core_autocrlf_to(repo, false); - - merge_simple_branch(GIT_MERGE_FILE_FAVOR_UNION, 0); - - cl_git_pass(git_futils_readbuffer(&conflicting_buf, - TEST_REPO_PATH "/conflicting.txt")); - cl_assert(strcmp(conflicting_buf.ptr, CONFLICTING_UNION_FILE) == 0); - git_buf_free(&conflicting_buf); - - cl_assert(merge_test_index(repo_index, merge_index_entries, 6)); - cl_assert(merge_test_reuc(repo_index, merge_reuc_entries, 4)); -} - -void test_merge_workdir_simple__diff3_from_config(void) -{ - git_config *config; - git_buf conflicting_buf = GIT_BUF_INIT; - - struct merge_index_entry merge_index_entries[] = { - ADDED_IN_MASTER_INDEX_ENTRY, - AUTOMERGEABLE_INDEX_ENTRY, - CHANGED_IN_BRANCH_INDEX_ENTRY, - CHANGED_IN_MASTER_INDEX_ENTRY, - - { 0100644, "d427e0b2e138501a3d15cc376077a3631e15bd46", 1, "conflicting.txt" }, - { 0100644, "4e886e602529caa9ab11d71f86634bd1b6e0de10", 2, "conflicting.txt" }, - { 0100644, "2bd0a343aeef7a2cf0d158478966a6e587ff3863", 3, "conflicting.txt" }, - - UNCHANGED_INDEX_ENTRY, - }; - - struct merge_reuc_entry merge_reuc_entries[] = { - AUTOMERGEABLE_REUC_ENTRY, - REMOVED_IN_BRANCH_REUC_ENTRY, - REMOVED_IN_MASTER_REUC_ENTRY - }; - - cl_git_pass(git_repository_config(&config, repo)); - cl_git_pass(git_config_set_string(config, "merge.conflictstyle", "diff3")); - - set_core_autocrlf_to(repo, false); - - merge_simple_branch(0, 0); - - cl_git_pass(git_futils_readbuffer(&conflicting_buf, - TEST_REPO_PATH "/conflicting.txt")); - cl_assert(strcmp(conflicting_buf.ptr, CONFLICTING_DIFF3_FILE) == 0); - git_buf_free(&conflicting_buf); - - cl_assert(merge_test_index(repo_index, merge_index_entries, 8)); - cl_assert(merge_test_reuc(repo_index, merge_reuc_entries, 3)); - - git_config_free(config); -} - -void test_merge_workdir_simple__merge_overrides_config(void) -{ - git_config *config; - git_buf conflicting_buf = GIT_BUF_INIT; - - struct merge_index_entry merge_index_entries[] = { - ADDED_IN_MASTER_INDEX_ENTRY, - AUTOMERGEABLE_INDEX_ENTRY, - CHANGED_IN_BRANCH_INDEX_ENTRY, - CHANGED_IN_MASTER_INDEX_ENTRY, - - { 0100644, "d427e0b2e138501a3d15cc376077a3631e15bd46", 1, "conflicting.txt" }, - { 0100644, "4e886e602529caa9ab11d71f86634bd1b6e0de10", 2, "conflicting.txt" }, - { 0100644, "2bd0a343aeef7a2cf0d158478966a6e587ff3863", 3, "conflicting.txt" }, - - UNCHANGED_INDEX_ENTRY, - }; - - struct merge_reuc_entry merge_reuc_entries[] = { - AUTOMERGEABLE_REUC_ENTRY, - REMOVED_IN_BRANCH_REUC_ENTRY, - REMOVED_IN_MASTER_REUC_ENTRY - }; - - cl_git_pass(git_repository_config(&config, repo)); - cl_git_pass(git_config_set_string(config, "merge.conflictstyle", "diff3")); - - set_core_autocrlf_to(repo, false); - - merge_simple_branch(0, GIT_CHECKOUT_CONFLICT_STYLE_MERGE); - - cl_git_pass(git_futils_readbuffer(&conflicting_buf, - TEST_REPO_PATH "/conflicting.txt")); - cl_assert(strcmp(conflicting_buf.ptr, CONFLICTING_MERGE_FILE) == 0); - git_buf_free(&conflicting_buf); - - cl_assert(merge_test_index(repo_index, merge_index_entries, 8)); - cl_assert(merge_test_reuc(repo_index, merge_reuc_entries, 3)); - - git_config_free(config); -} - -void test_merge_workdir_simple__checkout_ours(void) -{ - struct merge_index_entry merge_index_entries[] = { - ADDED_IN_MASTER_INDEX_ENTRY, - AUTOMERGEABLE_INDEX_ENTRY, - CHANGED_IN_BRANCH_INDEX_ENTRY, - CHANGED_IN_MASTER_INDEX_ENTRY, - - { 0100644, "d427e0b2e138501a3d15cc376077a3631e15bd46", 1, "conflicting.txt" }, - { 0100644, "4e886e602529caa9ab11d71f86634bd1b6e0de10", 2, "conflicting.txt" }, - { 0100644, "2bd0a343aeef7a2cf0d158478966a6e587ff3863", 3, "conflicting.txt" }, - - UNCHANGED_INDEX_ENTRY, - }; - - struct merge_reuc_entry merge_reuc_entries[] = { - AUTOMERGEABLE_REUC_ENTRY, - REMOVED_IN_BRANCH_REUC_ENTRY, - REMOVED_IN_MASTER_REUC_ENTRY - }; - - merge_simple_branch(0, GIT_CHECKOUT_SAFE | GIT_CHECKOUT_USE_OURS); - - cl_assert(merge_test_index(repo_index, merge_index_entries, 8)); - cl_assert(merge_test_reuc(repo_index, merge_reuc_entries, 3)); - - cl_assert(git_path_exists(TEST_REPO_PATH "/conflicting.txt")); -} - -void test_merge_workdir_simple__favor_ours(void) -{ - struct merge_index_entry merge_index_entries[] = { - ADDED_IN_MASTER_INDEX_ENTRY, - AUTOMERGEABLE_INDEX_ENTRY, - CHANGED_IN_BRANCH_INDEX_ENTRY, - CHANGED_IN_MASTER_INDEX_ENTRY, - { 0100644, "4e886e602529caa9ab11d71f86634bd1b6e0de10", 0, "conflicting.txt" }, - UNCHANGED_INDEX_ENTRY, - }; - - struct merge_reuc_entry merge_reuc_entries[] = { - AUTOMERGEABLE_REUC_ENTRY, - CONFLICTING_REUC_ENTRY, - REMOVED_IN_BRANCH_REUC_ENTRY, - REMOVED_IN_MASTER_REUC_ENTRY, - }; - - merge_simple_branch(GIT_MERGE_FILE_FAVOR_OURS, 0); - - cl_assert(merge_test_index(repo_index, merge_index_entries, 6)); - cl_assert(merge_test_reuc(repo_index, merge_reuc_entries, 4)); -} - -void test_merge_workdir_simple__favor_theirs(void) -{ - struct merge_index_entry merge_index_entries[] = { - ADDED_IN_MASTER_INDEX_ENTRY, - AUTOMERGEABLE_INDEX_ENTRY, - CHANGED_IN_BRANCH_INDEX_ENTRY, - CHANGED_IN_MASTER_INDEX_ENTRY, - { 0100644, "2bd0a343aeef7a2cf0d158478966a6e587ff3863", 0, "conflicting.txt" }, - UNCHANGED_INDEX_ENTRY, - }; - - struct merge_reuc_entry merge_reuc_entries[] = { - AUTOMERGEABLE_REUC_ENTRY, - CONFLICTING_REUC_ENTRY, - REMOVED_IN_BRANCH_REUC_ENTRY, - REMOVED_IN_MASTER_REUC_ENTRY, - }; - - merge_simple_branch(GIT_MERGE_FILE_FAVOR_THEIRS, 0); - - cl_assert(merge_test_index(repo_index, merge_index_entries, 6)); - cl_assert(merge_test_reuc(repo_index, merge_reuc_entries, 4)); -} - -void test_merge_workdir_simple__directory_file(void) -{ - git_reference *head; - git_oid their_oids[1], head_commit_id; - git_annotated_commit *their_heads[1]; - git_merge_options merge_opts = GIT_MERGE_OPTIONS_INIT; - git_commit *head_commit; - - struct merge_index_entry merge_index_entries[] = { - { 0100644, "49130a28ef567af9a6a6104c38773fedfa5f9742", 2, "dir-10" }, - { 0100644, "6c06dcd163587c2cc18be44857e0b71116382aeb", 3, "dir-10" }, - { 0100644, "43aafd43bea779ec74317dc361f45ae3f532a505", 0, "dir-6" }, - { 0100644, "a031a28ae70e33a641ce4b8a8f6317f1ab79dee4", 3, "dir-7" }, - { 0100644, "5012fd565b1393bdfda1805d4ec38ce6619e1fd1", 1, "dir-7/file.txt" }, - { 0100644, "a5563304ddf6caba25cb50323a2ea6f7dbfcadca", 2, "dir-7/file.txt" }, - { 0100644, "e9ad6ec3e38364a3d07feda7c4197d4d845c53b5", 0, "dir-8" }, - { 0100644, "3ef4d30382ca33fdeba9fda895a99e0891ba37aa", 2, "dir-9" }, - { 0100644, "fc4c636d6515e9e261f9260dbcf3cc6eca97ea08", 1, "dir-9/file.txt" }, - { 0100644, "76ab0e2868197ec158ddd6c78d8a0d2fd73d38f9", 3, "dir-9/file.txt" }, - { 0100644, "5c2411f8075f48a6b2fdb85ebc0d371747c4df15", 0, "file-1/new" }, - { 0100644, "a39a620dae5bc8b4e771cd4d251b7d080401a21e", 1, "file-2" }, - { 0100644, "d963979c237d08b6ba39062ee7bf64c7d34a27f8", 2, "file-2" }, - { 0100644, "5c341ead2ba6f2af98ce5ec3fe84f6b6d2899c0d", 0, "file-2/new" }, - { 0100644, "9efe7723802d4305142eee177e018fee1572c4f4", 0, "file-3/new" }, - { 0100644, "bacac9b3493509aa15e1730e1545fc0919d1dae0", 1, "file-4" }, - { 0100644, "7663fce0130db092936b137cabd693ec234eb060", 3, "file-4" }, - { 0100644, "e49f917b448d1340b31d76e54ba388268fd4c922", 0, "file-4/new" }, - { 0100644, "cab2cf23998b40f1af2d9d9a756dc9e285a8df4b", 2, "file-5/new" }, - { 0100644, "f5504f36e6f4eb797a56fc5bac6c6c7f32969bf2", 3, "file-5/new" }, - }; - - cl_git_pass(git_reference_symbolic_create(&head, repo, GIT_HEAD_FILE, GIT_REFS_HEADS_DIR OURS_DIRECTORY_FILE, 1, NULL)); - cl_git_pass(git_reference_name_to_id(&head_commit_id, repo, GIT_HEAD_FILE)); - cl_git_pass(git_commit_lookup(&head_commit, repo, &head_commit_id)); - cl_git_pass(git_reset(repo, (git_object *)head_commit, GIT_RESET_HARD, NULL)); - - cl_git_pass(git_oid_fromstr(&their_oids[0], THEIRS_DIRECTORY_FILE)); - cl_git_pass(git_annotated_commit_lookup(&their_heads[0], repo, &their_oids[0])); - - merge_opts.file_favor = 0; - cl_git_pass(git_merge(repo, (const git_annotated_commit **)their_heads, 1, &merge_opts, NULL)); - - cl_assert(merge_test_index(repo_index, merge_index_entries, 20)); - - git_reference_free(head); - git_commit_free(head_commit); - git_annotated_commit_free(their_heads[0]); -} - -void test_merge_workdir_simple__unrelated(void) -{ - git_oid their_oids[1]; - git_annotated_commit *their_heads[1]; - git_merge_options merge_opts = GIT_MERGE_OPTIONS_INIT; - - struct merge_index_entry merge_index_entries[] = { - { 0100644, "233c0919c998ed110a4b6ff36f353aec8b713487", 0, "added-in-master.txt" }, - { 0100644, "ee3fa1b8c00aff7fe02065fdb50864bb0d932ccf", 0, "automergeable.txt" }, - { 0100644, "ab6c44a2e84492ad4b41bb6bac87353e9d02ac8b", 0, "changed-in-branch.txt" }, - { 0100644, "11deab00b2d3a6f5a3073988ac050c2d7b6655e2", 0, "changed-in-master.txt" }, - { 0100644, "4e886e602529caa9ab11d71f86634bd1b6e0de10", 0, "conflicting.txt" }, - { 0100644, "ef58fdd8086c243bdc81f99e379acacfd21d32d6", 0, "new-in-unrelated1.txt" }, - { 0100644, "948ba6e701c1edab0c2d394fb7c5538334129793", 0, "new-in-unrelated2.txt" }, - { 0100644, "dfe3f22baa1f6fce5447901c3086bae368de6bdd", 0, "removed-in-branch.txt" }, - { 0100644, "c8f06f2e3bb2964174677e91f0abead0e43c9e5d", 0, "unchanged.txt" }, - }; - - cl_git_pass(git_oid_fromstr(&their_oids[0], THEIRS_UNRELATED_PARENT)); - cl_git_pass(git_annotated_commit_lookup(&their_heads[0], repo, &their_oids[0])); - - merge_opts.file_favor = 0; - cl_git_pass(git_merge(repo, (const git_annotated_commit **)their_heads, 1, &merge_opts, NULL)); - - cl_assert(merge_test_index(repo_index, merge_index_entries, 9)); - - git_annotated_commit_free(their_heads[0]); -} - -void test_merge_workdir_simple__unrelated_with_conflicts(void) -{ - git_oid their_oids[1]; - git_annotated_commit *their_heads[1]; - git_merge_options merge_opts = GIT_MERGE_OPTIONS_INIT; - - struct merge_index_entry merge_index_entries[] = { - { 0100644, "233c0919c998ed110a4b6ff36f353aec8b713487", 0, "added-in-master.txt" }, - { 0100644, "ee3fa1b8c00aff7fe02065fdb50864bb0d932ccf", 2, "automergeable.txt" }, - { 0100644, "d07ec190c306ec690bac349e87d01c4358e49bb2", 3, "automergeable.txt" }, - { 0100644, "ab6c44a2e84492ad4b41bb6bac87353e9d02ac8b", 0, "changed-in-branch.txt" }, - { 0100644, "11deab00b2d3a6f5a3073988ac050c2d7b6655e2", 0, "changed-in-master.txt" }, - { 0100644, "4e886e602529caa9ab11d71f86634bd1b6e0de10", 2, "conflicting.txt" }, - { 0100644, "4b253da36a0ae8bfce63aeabd8c5b58429925594", 3, "conflicting.txt" }, - { 0100644, "ef58fdd8086c243bdc81f99e379acacfd21d32d6", 0, "new-in-unrelated1.txt" }, - { 0100644, "948ba6e701c1edab0c2d394fb7c5538334129793", 0, "new-in-unrelated2.txt" }, - { 0100644, "dfe3f22baa1f6fce5447901c3086bae368de6bdd", 0, "removed-in-branch.txt" }, - { 0100644, "c8f06f2e3bb2964174677e91f0abead0e43c9e5d", 0, "unchanged.txt" }, - }; - - cl_git_pass(git_oid_fromstr(&their_oids[0], THEIRS_UNRELATED_OID)); - cl_git_pass(git_annotated_commit_lookup(&their_heads[0], repo, &their_oids[0])); - - merge_opts.file_favor = 0; - cl_git_pass(git_merge(repo, (const git_annotated_commit **)their_heads, 1, &merge_opts, NULL)); - - cl_assert(merge_test_index(repo_index, merge_index_entries, 11)); - - git_annotated_commit_free(their_heads[0]); -} - -void test_merge_workdir_simple__binary(void) -{ - git_oid our_oid, their_oid, our_file_oid; - git_commit *our_commit; - git_annotated_commit *their_head; - const git_index_entry *binary_entry; - - struct merge_index_entry merge_index_entries[] = { - { 0100644, "1c51d885170f57a0c4e8c69ff6363d91a5b51f85", 1, "binary" }, - { 0100644, "23ed141a6ae1e798b2f721afedbe947c119111ba", 2, "binary" }, - { 0100644, "836b8b82b26cab22eaaed8820877c76d6c8bca19", 3, "binary" }, - }; - - cl_git_pass(git_oid_fromstr(&our_oid, "cc338e4710c9b257106b8d16d82f86458d5beaf1")); - cl_git_pass(git_oid_fromstr(&their_oid, "ad01aebfdf2ac13145efafe3f9fcf798882f1730")); - - cl_git_pass(git_commit_lookup(&our_commit, repo, &our_oid)); - cl_git_pass(git_reset(repo, (git_object *)our_commit, GIT_RESET_HARD, NULL)); - - cl_git_pass(git_annotated_commit_lookup(&their_head, repo, &their_oid)); - - cl_git_pass(git_merge(repo, (const git_annotated_commit **)&their_head, 1, NULL, NULL)); - - cl_assert(merge_test_index(repo_index, merge_index_entries, 3)); - - cl_git_pass(git_index_add_bypath(repo_index, "binary")); - cl_assert((binary_entry = git_index_get_bypath(repo_index, "binary", 0)) != NULL); - - cl_git_pass(git_oid_fromstr(&our_file_oid, "23ed141a6ae1e798b2f721afedbe947c119111ba")); - cl_assert(git_oid_cmp(&binary_entry->id, &our_file_oid) == 0); - - git_annotated_commit_free(their_head); - git_commit_free(our_commit); -} diff --git a/vendor/libgit2/tests/merge/workdir/submodules.c b/vendor/libgit2/tests/merge/workdir/submodules.c deleted file mode 100644 index 7c18c2ffb..000000000 --- a/vendor/libgit2/tests/merge/workdir/submodules.c +++ /dev/null @@ -1,95 +0,0 @@ -#include "clar_libgit2.h" -#include "git2/repository.h" -#include "git2/merge.h" -#include "buffer.h" -#include "merge.h" -#include "../merge_helpers.h" - -static git_repository *repo; - -#define TEST_REPO_PATH "merge-resolve" - -#define SUBMODULE_MAIN_BRANCH "submodules" -#define SUBMODULE_OTHER_BRANCH "submodules-branch" -#define SUBMODULE_OTHER2_BRANCH "submodules-branch2" - -#define TEST_INDEX_PATH TEST_REPO_PATH "/.git/index" - -// Fixture setup and teardown -void test_merge_workdir_submodules__initialize(void) -{ - repo = cl_git_sandbox_init(TEST_REPO_PATH); -} - -void test_merge_workdir_submodules__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -void test_merge_workdir_submodules__automerge(void) -{ - git_reference *our_ref, *their_ref; - git_commit *our_commit; - git_annotated_commit *their_head; - git_index *index; - - struct merge_index_entry merge_index_entries[] = { - { 0100644, "caff6b7d44973f53e3e0cf31d0d695188b19aec6", 0, ".gitmodules" }, - { 0100644, "950a663a6a7b2609eed1ed1ba9f41eb1a3192a9f", 0, "file1.txt" }, - { 0100644, "343e660b9cb4bee5f407c2e33fcb9df24d9407a4", 0, "file2.txt" }, - { 0160000, "d3d806a4bef96889117fd7ebac0e3cb5ec152932", 1, "submodule" }, - { 0160000, "297aa6cd028b3336c7802c7a6f49143da4e1602d", 2, "submodule" }, - { 0160000, "ae39c77c70cb6bad18bb471912460c4e1ba0f586", 3, "submodule" }, - }; - - cl_git_pass(git_reference_lookup(&our_ref, repo, "refs/heads/" SUBMODULE_MAIN_BRANCH)); - cl_git_pass(git_commit_lookup(&our_commit, repo, git_reference_target(our_ref))); - cl_git_pass(git_reset(repo, (git_object *)our_commit, GIT_RESET_HARD, NULL)); - - cl_git_pass(git_reference_lookup(&their_ref, repo, "refs/heads/" SUBMODULE_OTHER_BRANCH)); - cl_git_pass(git_annotated_commit_from_ref(&their_head, repo, their_ref)); - - cl_git_pass(git_merge(repo, (const git_annotated_commit **)&their_head, 1, NULL, NULL)); - - cl_git_pass(git_repository_index(&index, repo)); - cl_assert(merge_test_index(index, merge_index_entries, 6)); - - git_index_free(index); - git_annotated_commit_free(their_head); - git_commit_free(our_commit); - git_reference_free(their_ref); - git_reference_free(our_ref); -} - -void test_merge_workdir_submodules__take_changed(void) -{ - git_reference *our_ref, *their_ref; - git_commit *our_commit; - git_annotated_commit *their_head; - git_index *index; - - struct merge_index_entry merge_index_entries[] = { - { 0100644, "caff6b7d44973f53e3e0cf31d0d695188b19aec6", 0, ".gitmodules" }, - { 0100644, "b438ff23300b2e0f80b84a6f30140dfa91e71423", 0, "file1.txt" }, - { 0100644, "f27fbafdfa6693f8f7a5128506fe3e338dbfcad2", 0, "file2.txt" }, - { 0160000, "297aa6cd028b3336c7802c7a6f49143da4e1602d", 0, "submodule" }, - }; - - cl_git_pass(git_reference_lookup(&our_ref, repo, "refs/heads/" SUBMODULE_MAIN_BRANCH)); - cl_git_pass(git_commit_lookup(&our_commit, repo, git_reference_target(our_ref))); - cl_git_pass(git_reset(repo, (git_object *)our_commit, GIT_RESET_HARD, NULL)); - - cl_git_pass(git_reference_lookup(&their_ref, repo, "refs/heads/" SUBMODULE_OTHER2_BRANCH)); - cl_git_pass(git_annotated_commit_from_ref(&their_head, repo, their_ref)); - - cl_git_pass(git_merge(repo, (const git_annotated_commit **)&their_head, 1, NULL, NULL)); - - cl_git_pass(git_repository_index(&index, repo)); - cl_assert(merge_test_index(index, merge_index_entries, 4)); - - git_index_free(index); - git_annotated_commit_free(their_head); - git_commit_free(our_commit); - git_reference_free(their_ref); - git_reference_free(our_ref); -} diff --git a/vendor/libgit2/tests/merge/workdir/trivial.c b/vendor/libgit2/tests/merge/workdir/trivial.c deleted file mode 100644 index 4ddaf233d..000000000 --- a/vendor/libgit2/tests/merge/workdir/trivial.c +++ /dev/null @@ -1,262 +0,0 @@ -#include "clar_libgit2.h" -#include "git2/repository.h" -#include "git2/merge.h" -#include "git2/sys/index.h" -#include "merge.h" -#include "../merge_helpers.h" -#include "refs.h" -#include "fileops.h" - -static git_repository *repo; -static git_index *repo_index; - -#define TEST_REPO_PATH "merge-resolve" -#define TEST_INDEX_PATH TEST_REPO_PATH "/.git/index" - - -// Fixture setup and teardown -void test_merge_workdir_trivial__initialize(void) -{ - repo = cl_git_sandbox_init(TEST_REPO_PATH); - git_repository_index(&repo_index, repo); -} - -void test_merge_workdir_trivial__cleanup(void) -{ - git_index_free(repo_index); - cl_git_sandbox_cleanup(); -} - - -static int merge_trivial(const char *ours, const char *theirs) -{ - git_buf branch_buf = GIT_BUF_INIT; - git_checkout_options checkout_opts = GIT_CHECKOUT_OPTIONS_INIT; - git_reference *our_ref, *their_ref; - git_annotated_commit *their_heads[1]; - - checkout_opts.checkout_strategy = GIT_CHECKOUT_FORCE; - - git_buf_printf(&branch_buf, "%s%s", GIT_REFS_HEADS_DIR, ours); - cl_git_pass(git_reference_symbolic_create(&our_ref, repo, "HEAD", branch_buf.ptr, 1, NULL)); - - cl_git_pass(git_checkout_head(repo, &checkout_opts)); - - git_buf_clear(&branch_buf); - git_buf_printf(&branch_buf, "%s%s", GIT_REFS_HEADS_DIR, theirs); - cl_git_pass(git_reference_lookup(&their_ref, repo, branch_buf.ptr)); - cl_git_pass(git_annotated_commit_from_ref(&their_heads[0], repo, their_ref)); - - cl_git_pass(git_merge(repo, (const git_annotated_commit **)their_heads, 1, NULL, NULL)); - - git_buf_free(&branch_buf); - git_reference_free(our_ref); - git_reference_free(their_ref); - git_annotated_commit_free(their_heads[0]); - - return 0; -} - -static size_t merge_trivial_conflict_entrycount(void) -{ - const git_index_entry *entry; - size_t count = 0; - size_t i; - - for (i = 0; i < git_index_entrycount(repo_index); i++) { - cl_assert(entry = git_index_get_byindex(repo_index, i)); - - if (git_index_entry_is_conflict(entry)) - count++; - } - - return count; -} - -/* 2ALT: ancest:(empty)+, head:*empty*, remote:remote = result:remote */ -void test_merge_workdir_trivial__2alt(void) -{ - const git_index_entry *entry; - - cl_git_pass(merge_trivial("trivial-2alt", "trivial-2alt-branch")); - - cl_assert(entry = git_index_get_bypath(repo_index, "new-in-branch.txt", 0)); - cl_assert(git_index_reuc_entrycount(repo_index) == 0); - cl_assert(merge_trivial_conflict_entrycount() == 0); -} - -/* 3ALT: ancest:(empty)+, head:head, remote:*empty* = result:head */ -void test_merge_workdir_trivial__3alt(void) -{ - const git_index_entry *entry; - - cl_git_pass(merge_trivial("trivial-3alt", "trivial-3alt-branch")); - - cl_assert(entry = git_index_get_bypath(repo_index, "new-in-3alt.txt", 0)); - cl_assert(git_index_reuc_entrycount(repo_index) == 0); - cl_assert(merge_trivial_conflict_entrycount() == 0); -} - -/* 4: ancest:(empty)^, head:head, remote:remote = result:no merge */ -void test_merge_workdir_trivial__4(void) -{ - const git_index_entry *entry; - - cl_git_pass(merge_trivial("trivial-4", "trivial-4-branch")); - - cl_assert((entry = git_index_get_bypath(repo_index, "new-and-different.txt", 0)) == NULL); - cl_assert(git_index_reuc_entrycount(repo_index) == 0); - - cl_assert(merge_trivial_conflict_entrycount() == 2); - cl_assert(entry = git_index_get_bypath(repo_index, "new-and-different.txt", 2)); - cl_assert(entry = git_index_get_bypath(repo_index, "new-and-different.txt", 3)); -} - -/* 5ALT: ancest:*, head:head, remote:head = result:head */ -void test_merge_workdir_trivial__5alt_1(void) -{ - const git_index_entry *entry; - - cl_git_pass(merge_trivial("trivial-5alt-1", "trivial-5alt-1-branch")); - - cl_assert(entry = git_index_get_bypath(repo_index, "new-and-same.txt", 0)); - cl_assert(git_index_reuc_entrycount(repo_index) == 0); - cl_assert(merge_trivial_conflict_entrycount() == 0); -} - -/* 5ALT: ancest:*, head:head, remote:head = result:head */ -void test_merge_workdir_trivial__5alt_2(void) -{ - const git_index_entry *entry; - - cl_git_pass(merge_trivial("trivial-5alt-2", "trivial-5alt-2-branch")); - - cl_assert(entry = git_index_get_bypath(repo_index, "modified-to-same.txt", 0)); - cl_assert(git_index_reuc_entrycount(repo_index) == 0); - cl_assert(merge_trivial_conflict_entrycount() == 0); -} - -/* 6: ancest:ancest+, head:(empty), remote:(empty) = result:no merge */ -void test_merge_workdir_trivial__6(void) -{ - const git_index_entry *entry; - const git_index_reuc_entry *reuc; - - cl_git_pass(merge_trivial("trivial-6", "trivial-6-branch")); - - cl_assert((entry = git_index_get_bypath(repo_index, "removed-in-both.txt", 0)) == NULL); - cl_assert(git_index_reuc_entrycount(repo_index) == 1); - cl_assert(reuc = git_index_reuc_get_bypath(repo_index, "removed-in-both.txt")); - - cl_assert(merge_trivial_conflict_entrycount() == 0); -} - -/* 8: ancest:ancest^, head:(empty), remote:ancest = result:no merge */ -void test_merge_workdir_trivial__8(void) -{ - const git_index_entry *entry; - const git_index_reuc_entry *reuc; - - cl_git_pass(merge_trivial("trivial-8", "trivial-8-branch")); - - cl_assert((entry = git_index_get_bypath(repo_index, "removed-in-8.txt", 0)) == NULL); - - cl_assert(git_index_reuc_entrycount(repo_index) == 1); - cl_assert(reuc = git_index_reuc_get_bypath(repo_index, "removed-in-8.txt")); - - cl_assert(merge_trivial_conflict_entrycount() == 0); -} - -/* 7: ancest:ancest+, head:(empty), remote:remote = result:no merge */ -void test_merge_workdir_trivial__7(void) -{ - const git_index_entry *entry; - - cl_git_pass(merge_trivial("trivial-7", "trivial-7-branch")); - - cl_assert((entry = git_index_get_bypath(repo_index, "removed-in-7.txt", 0)) == NULL); - cl_assert(git_index_reuc_entrycount(repo_index) == 0); - - cl_assert(merge_trivial_conflict_entrycount() == 2); - cl_assert(entry = git_index_get_bypath(repo_index, "removed-in-7.txt", 1)); - cl_assert(entry = git_index_get_bypath(repo_index, "removed-in-7.txt", 3)); -} - -/* 10: ancest:ancest^, head:ancest, remote:(empty) = result:no merge */ -void test_merge_workdir_trivial__10(void) -{ - const git_index_entry *entry; - const git_index_reuc_entry *reuc; - - cl_git_pass(merge_trivial("trivial-10", "trivial-10-branch")); - - cl_assert((entry = git_index_get_bypath(repo_index, "removed-in-10-branch.txt", 0)) == NULL); - - cl_assert(git_index_reuc_entrycount(repo_index) == 1); - cl_assert(reuc = git_index_reuc_get_bypath(repo_index, "removed-in-10-branch.txt")); - - cl_assert(merge_trivial_conflict_entrycount() == 0); -} - -/* 9: ancest:ancest+, head:head, remote:(empty) = result:no merge */ -void test_merge_workdir_trivial__9(void) -{ - const git_index_entry *entry; - - cl_git_pass(merge_trivial("trivial-9", "trivial-9-branch")); - - cl_assert((entry = git_index_get_bypath(repo_index, "removed-in-9-branch.txt", 0)) == NULL); - cl_assert(git_index_reuc_entrycount(repo_index) == 0); - - cl_assert(merge_trivial_conflict_entrycount() == 2); - cl_assert(entry = git_index_get_bypath(repo_index, "removed-in-9-branch.txt", 1)); - cl_assert(entry = git_index_get_bypath(repo_index, "removed-in-9-branch.txt", 2)); -} - -/* 13: ancest:ancest+, head:head, remote:ancest = result:head */ -void test_merge_workdir_trivial__13(void) -{ - const git_index_entry *entry; - git_oid expected_oid; - - cl_git_pass(merge_trivial("trivial-13", "trivial-13-branch")); - - cl_assert(entry = git_index_get_bypath(repo_index, "modified-in-13.txt", 0)); - cl_git_pass(git_oid_fromstr(&expected_oid, "1cff9ec6a47a537380dedfdd17c9e76d74259a2b")); - cl_assert(git_oid_cmp(&entry->id, &expected_oid) == 0); - - cl_assert(git_index_reuc_entrycount(repo_index) == 0); - cl_assert(merge_trivial_conflict_entrycount() == 0); -} - -/* 14: ancest:ancest+, head:ancest, remote:remote = result:remote */ -void test_merge_workdir_trivial__14(void) -{ - const git_index_entry *entry; - git_oid expected_oid; - - cl_git_pass(merge_trivial("trivial-14", "trivial-14-branch")); - - cl_assert(entry = git_index_get_bypath(repo_index, "modified-in-14-branch.txt", 0)); - cl_git_pass(git_oid_fromstr(&expected_oid, "26153a3ff3649b6c2bb652d3f06878c6e0a172f9")); - cl_assert(git_oid_cmp(&entry->id, &expected_oid) == 0); - - cl_assert(git_index_reuc_entrycount(repo_index) == 0); - cl_assert(merge_trivial_conflict_entrycount() == 0); -} - -/* 11: ancest:ancest+, head:head, remote:remote = result:no merge */ -void test_merge_workdir_trivial__11(void) -{ - const git_index_entry *entry; - - cl_git_pass(merge_trivial("trivial-11", "trivial-11-branch")); - - cl_assert((entry = git_index_get_bypath(repo_index, "modified-in-both.txt", 0)) == NULL); - cl_assert(git_index_reuc_entrycount(repo_index) == 0); - - cl_assert(merge_trivial_conflict_entrycount() == 3); - cl_assert(entry = git_index_get_bypath(repo_index, "modified-in-both.txt", 1)); - cl_assert(entry = git_index_get_bypath(repo_index, "modified-in-both.txt", 2)); - cl_assert(entry = git_index_get_bypath(repo_index, "modified-in-both.txt", 3)); -} diff --git a/vendor/libgit2/tests/network/cred.c b/vendor/libgit2/tests/network/cred.c deleted file mode 100644 index 6994cc0c3..000000000 --- a/vendor/libgit2/tests/network/cred.c +++ /dev/null @@ -1,50 +0,0 @@ -#include "clar_libgit2.h" - -#include "git2/cred_helpers.h" - -void test_network_cred__stock_userpass_validates_args(void) -{ - git_cred_userpass_payload payload = {0}; - - cl_git_fail(git_cred_userpass(NULL, NULL, NULL, 0, NULL)); - - payload.username = "user"; - cl_git_fail(git_cred_userpass(NULL, NULL, NULL, 0, &payload)); - - payload.username = NULL; - payload.username = "pass"; - cl_git_fail(git_cred_userpass(NULL, NULL, NULL, 0, &payload)); -} - -void test_network_cred__stock_userpass_validates_that_method_is_allowed(void) -{ - git_cred *cred; - git_cred_userpass_payload payload = {"user", "pass"}; - - cl_git_fail(git_cred_userpass(&cred, NULL, NULL, 0, &payload)); - cl_git_pass(git_cred_userpass(&cred, NULL, NULL, GIT_CREDTYPE_USERPASS_PLAINTEXT, &payload)); - cred->free(cred); -} - -void test_network_cred__stock_userpass_properly_handles_username_in_url(void) -{ - git_cred *cred; - git_cred_userpass_plaintext *plain; - git_cred_userpass_payload payload = {"alice", "password"}; - - cl_git_pass(git_cred_userpass(&cred, NULL, NULL, GIT_CREDTYPE_USERPASS_PLAINTEXT, &payload)); - plain = (git_cred_userpass_plaintext*)cred; - cl_assert_equal_s(plain->username, "alice"); - cred->free(cred); - - cl_git_pass(git_cred_userpass(&cred, NULL, "bob", GIT_CREDTYPE_USERPASS_PLAINTEXT, &payload)); - plain = (git_cred_userpass_plaintext*)cred; - cl_assert_equal_s(plain->username, "alice"); - cred->free(cred); - - payload.username = NULL; - cl_git_pass(git_cred_userpass(&cred, NULL, "bob", GIT_CREDTYPE_USERPASS_PLAINTEXT, &payload)); - plain = (git_cred_userpass_plaintext*)cred; - cl_assert_equal_s(plain->username, "bob"); - cred->free(cred); -} diff --git a/vendor/libgit2/tests/network/fetchlocal.c b/vendor/libgit2/tests/network/fetchlocal.c deleted file mode 100644 index 17c8f26e3..000000000 --- a/vendor/libgit2/tests/network/fetchlocal.c +++ /dev/null @@ -1,520 +0,0 @@ -#include "clar_libgit2.h" - -#include "buffer.h" -#include "path.h" -#include "remote.h" - -static const char* tagger_name = "Vicent Marti"; -static const char* tagger_email = "vicent@github.com"; -static const char* tagger_message = "This is my tag.\n\nThere are many tags, but this one is mine\n"; - -static int transfer_cb(const git_transfer_progress *stats, void *payload) -{ - int *callcount = (int*)payload; - GIT_UNUSED(stats); - (*callcount)++; - return 0; -} - -static void cleanup_local_repo(void *path) -{ - cl_fixture_cleanup((char *)path); -} - -void test_network_fetchlocal__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -void test_network_fetchlocal__complete(void) -{ - git_repository *repo; - git_remote *origin; - int callcount = 0; - git_strarray refnames = {0}; - - const char *url = cl_git_fixture_url("testrepo.git"); - git_fetch_options options = GIT_FETCH_OPTIONS_INIT; - - options.callbacks.transfer_progress = transfer_cb; - options.callbacks.payload = &callcount; - - cl_set_cleanup(&cleanup_local_repo, "foo"); - cl_git_pass(git_repository_init(&repo, "foo", true)); - - cl_git_pass(git_remote_create(&origin, repo, GIT_REMOTE_ORIGIN, url)); - cl_git_pass(git_remote_fetch(origin, NULL, &options, NULL)); - - cl_git_pass(git_reference_list(&refnames, repo)); - cl_assert_equal_i(19, (int)refnames.count); - cl_assert(callcount > 0); - - git_strarray_free(&refnames); - git_remote_free(origin); - git_repository_free(repo); -} - -void test_network_fetchlocal__prune(void) -{ - git_repository *repo; - git_remote *origin; - int callcount = 0; - git_strarray refnames = {0}; - git_reference *ref; - git_repository *remote_repo = cl_git_sandbox_init("testrepo.git"); - const char *url = cl_git_path_url(git_repository_path(remote_repo)); - git_fetch_options options = GIT_FETCH_OPTIONS_INIT; - - options.callbacks.transfer_progress = transfer_cb; - options.callbacks.payload = &callcount; - - cl_set_cleanup(&cleanup_local_repo, "foo"); - cl_git_pass(git_repository_init(&repo, "foo", true)); - - cl_git_pass(git_remote_create(&origin, repo, GIT_REMOTE_ORIGIN, url)); - cl_git_pass(git_remote_fetch(origin, NULL, &options, NULL)); - - cl_git_pass(git_reference_list(&refnames, repo)); - cl_assert_equal_i(19, (int)refnames.count); - cl_assert(callcount > 0); - git_strarray_free(&refnames); - git_remote_free(origin); - - cl_git_pass(git_reference_lookup(&ref, remote_repo, "refs/heads/br2")); - cl_git_pass(git_reference_delete(ref)); - git_reference_free(ref); - - cl_git_pass(git_remote_lookup(&origin, repo, GIT_REMOTE_ORIGIN)); - cl_git_pass(git_remote_fetch(origin, NULL, &options, NULL)); - cl_git_pass(git_remote_prune(origin, &options.callbacks)); - - cl_git_pass(git_reference_list(&refnames, repo)); - cl_assert_equal_i(18, (int)refnames.count); - git_strarray_free(&refnames); - git_remote_free(origin); - - cl_git_pass(git_reference_lookup(&ref, remote_repo, "refs/heads/packed")); - cl_git_pass(git_reference_delete(ref)); - git_reference_free(ref); - - cl_git_pass(git_remote_lookup(&origin, repo, GIT_REMOTE_ORIGIN)); - cl_git_pass(git_remote_fetch(origin, NULL, &options, NULL)); - cl_git_pass(git_remote_prune(origin, &options.callbacks)); - - cl_git_pass(git_reference_list(&refnames, repo)); - cl_assert_equal_i(17, (int)refnames.count); - git_strarray_free(&refnames); - git_remote_free(origin); - - git_repository_free(repo); -} - -int update_tips_fail_on_call(const char *ref, const git_oid *old, const git_oid *new, void *data) -{ - GIT_UNUSED(ref); - GIT_UNUSED(old); - GIT_UNUSED(new); - GIT_UNUSED(data); - - cl_fail("update tips called"); - return 0; -} - -void assert_ref_exists(git_repository *repo, const char *name) -{ - git_reference *ref; - - cl_git_pass(git_reference_lookup(&ref, repo, name)); - git_reference_free(ref); -} - -void test_network_fetchlocal__prune_overlapping(void) -{ - git_repository *repo; - git_remote *origin; - int callcount = 0; - git_strarray refnames = {0}; - git_reference *ref; - git_config *config; - git_oid target; - - git_repository *remote_repo = cl_git_sandbox_init("testrepo.git"); - const char *url = cl_git_path_url(git_repository_path(remote_repo)); - - git_fetch_options options = GIT_FETCH_OPTIONS_INIT; - options.callbacks.transfer_progress = transfer_cb; - options.callbacks.payload = &callcount; - - cl_git_pass(git_reference_lookup(&ref, remote_repo, "refs/heads/master")); - git_oid_cpy(&target, git_reference_target(ref)); - git_reference_free(ref); - cl_git_pass(git_reference_create(&ref, remote_repo, "refs/pull/42/head", &target, 1, NULL)); - git_reference_free(ref); - - cl_set_cleanup(&cleanup_local_repo, "foo"); - cl_git_pass(git_repository_init(&repo, "foo", true)); - - cl_git_pass(git_remote_create(&origin, repo, GIT_REMOTE_ORIGIN, url)); - - cl_git_pass(git_repository_config(&config, repo)); - cl_git_pass(git_config_set_bool(config, "remote.origin.prune", true)); - cl_git_pass(git_config_set_multivar(config, "remote.origin.fetch", "^$", "refs/pull/*/head:refs/remotes/origin/pr/*")); - - git_remote_free(origin); - cl_git_pass(git_remote_lookup(&origin, repo, GIT_REMOTE_ORIGIN)); - cl_git_pass(git_remote_fetch(origin, NULL, &options, NULL)); - - assert_ref_exists(repo, "refs/remotes/origin/master"); - assert_ref_exists(repo, "refs/remotes/origin/pr/42"); - cl_git_pass(git_reference_list(&refnames, repo)); - cl_assert_equal_i(20, (int)refnames.count); - git_strarray_free(&refnames); - - cl_git_pass(git_config_delete_multivar(config, "remote.origin.fetch", "refs")); - cl_git_pass(git_config_set_multivar(config, "remote.origin.fetch", "^$", "refs/pull/*/head:refs/remotes/origin/pr/*")); - cl_git_pass(git_config_set_multivar(config, "remote.origin.fetch", "^$", "refs/heads/*:refs/remotes/origin/*")); - - git_remote_free(origin); - cl_git_pass(git_remote_lookup(&origin, repo, GIT_REMOTE_ORIGIN)); - options.callbacks.update_tips = update_tips_fail_on_call; - cl_git_pass(git_remote_fetch(origin, NULL, &options, NULL)); - - assert_ref_exists(repo, "refs/remotes/origin/master"); - assert_ref_exists(repo, "refs/remotes/origin/pr/42"); - cl_git_pass(git_reference_list(&refnames, repo)); - cl_assert_equal_i(20, (int)refnames.count); - git_strarray_free(&refnames); - - cl_git_pass(git_config_delete_multivar(config, "remote.origin.fetch", "refs")); - cl_git_pass(git_config_set_multivar(config, "remote.origin.fetch", "^$", "refs/heads/*:refs/remotes/origin/*")); - cl_git_pass(git_config_set_multivar(config, "remote.origin.fetch", "^$", "refs/pull/*/head:refs/remotes/origin/pr/*")); - - git_remote_free(origin); - cl_git_pass(git_remote_lookup(&origin, repo, GIT_REMOTE_ORIGIN)); - options.callbacks.update_tips = update_tips_fail_on_call; - cl_git_pass(git_remote_fetch(origin, NULL, &options, NULL)); - - git_config_free(config); - git_strarray_free(&refnames); - git_remote_free(origin); - git_repository_free(repo); -} - -void test_network_fetchlocal__fetchprune(void) -{ - git_repository *repo; - git_remote *origin; - int callcount = 0; - git_strarray refnames = {0}; - git_reference *ref; - git_config *config; - git_repository *remote_repo = cl_git_sandbox_init("testrepo.git"); - const char *url = cl_git_path_url(git_repository_path(remote_repo)); - git_fetch_options options = GIT_FETCH_OPTIONS_INIT; - - options.callbacks.transfer_progress = transfer_cb; - options.callbacks.payload = &callcount; - - cl_set_cleanup(&cleanup_local_repo, "foo"); - cl_git_pass(git_repository_init(&repo, "foo", true)); - - cl_git_pass(git_remote_create(&origin, repo, GIT_REMOTE_ORIGIN, url)); - cl_git_pass(git_remote_fetch(origin, NULL, &options, NULL)); - - cl_git_pass(git_reference_list(&refnames, repo)); - cl_assert_equal_i(19, (int)refnames.count); - cl_assert(callcount > 0); - git_strarray_free(&refnames); - git_remote_free(origin); - - cl_git_pass(git_reference_lookup(&ref, remote_repo, "refs/heads/br2")); - cl_git_pass(git_reference_delete(ref)); - git_reference_free(ref); - - cl_git_pass(git_remote_lookup(&origin, repo, GIT_REMOTE_ORIGIN)); - cl_git_pass(git_remote_fetch(origin, NULL, &options, NULL)); - cl_git_pass(git_remote_prune(origin, &options.callbacks)); - - cl_git_pass(git_reference_list(&refnames, repo)); - cl_assert_equal_i(18, (int)refnames.count); - git_strarray_free(&refnames); - git_remote_free(origin); - - cl_git_pass(git_reference_lookup(&ref, remote_repo, "refs/heads/packed")); - cl_git_pass(git_reference_delete(ref)); - git_reference_free(ref); - - cl_git_pass(git_repository_config(&config, repo)); - cl_git_pass(git_config_set_bool(config, "remote.origin.prune", 1)); - git_config_free(config); - cl_git_pass(git_remote_lookup(&origin, repo, GIT_REMOTE_ORIGIN)); - cl_assert_equal_i(1, git_remote_prune_refs(origin)); - cl_git_pass(git_remote_fetch(origin, NULL, &options, NULL)); - - cl_git_pass(git_reference_list(&refnames, repo)); - cl_assert_equal_i(17, (int)refnames.count); - git_strarray_free(&refnames); - git_remote_free(origin); - - git_repository_free(repo); -} - -void test_network_fetchlocal__prune_tag(void) -{ - git_repository *repo; - git_remote *origin; - int callcount = 0; - git_reference *ref; - git_config *config; - git_oid tag_id; - git_signature *tagger; - git_object *obj; - - git_repository *remote_repo = cl_git_sandbox_init("testrepo.git"); - const char *url = cl_git_path_url(git_repository_path(remote_repo)); - git_fetch_options options = GIT_FETCH_OPTIONS_INIT; - - options.callbacks.transfer_progress = transfer_cb; - options.callbacks.payload = &callcount; - - cl_set_cleanup(&cleanup_local_repo, "foo"); - cl_git_pass(git_repository_init(&repo, "foo", true)); - - cl_git_pass(git_remote_create(&origin, repo, GIT_REMOTE_ORIGIN, url)); - cl_git_pass(git_remote_fetch(origin, NULL, &options, NULL)); - git_remote_free(origin); - - cl_git_pass(git_revparse_single(&obj, repo, "origin/master")); - - cl_git_pass(git_reference_create(&ref, repo, "refs/remotes/origin/fake-remote", git_object_id(obj), 1, NULL)); - git_reference_free(ref); - - /* create signature */ - cl_git_pass(git_signature_new(&tagger, tagger_name, tagger_email, 123456789, 60)); - - cl_git_pass( - git_tag_create(&tag_id, repo, - "some-tag", obj, tagger, tagger_message, 0) - ); - git_signature_free(tagger); - - cl_git_pass(git_repository_config(&config, repo)); - cl_git_pass(git_config_set_bool(config, "remote.origin.prune", 1)); - git_config_free(config); - cl_git_pass(git_remote_lookup(&origin, repo, GIT_REMOTE_ORIGIN)); - cl_assert_equal_i(1, git_remote_prune_refs(origin)); - cl_git_pass(git_remote_fetch(origin, NULL, &options, NULL)); - - assert_ref_exists(repo, "refs/tags/some-tag"); - cl_git_fail_with(GIT_ENOTFOUND, git_reference_lookup(&ref, repo, "refs/remotes/origin/fake-remote")); - - git_object_free(obj); - git_remote_free(origin); - - git_repository_free(repo); -} - -static void cleanup_sandbox(void *unused) -{ - GIT_UNUSED(unused); - cl_git_sandbox_cleanup(); -} - -void test_network_fetchlocal__partial(void) -{ - git_repository *repo = cl_git_sandbox_init("partial-testrepo"); - git_remote *origin; - int callcount = 0; - git_strarray refnames = {0}; - const char *url; - git_fetch_options options = GIT_FETCH_OPTIONS_INIT; - - options.callbacks.transfer_progress = transfer_cb; - options.callbacks.payload = &callcount; - - cl_set_cleanup(&cleanup_sandbox, NULL); - cl_git_pass(git_reference_list(&refnames, repo)); - cl_assert_equal_i(1, (int)refnames.count); - - url = cl_git_fixture_url("testrepo.git"); - cl_git_pass(git_remote_create(&origin, repo, GIT_REMOTE_ORIGIN, url)); - cl_git_pass(git_remote_fetch(origin, NULL, &options, NULL)); - - git_strarray_free(&refnames); - - cl_git_pass(git_reference_list(&refnames, repo)); - cl_assert_equal_i(20, (int)refnames.count); /* 18 remote + 1 local */ - cl_assert(callcount > 0); - - git_strarray_free(&refnames); - git_remote_free(origin); -} - -static int remote_mirror_cb(git_remote **out, git_repository *repo, - const char *name, const char *url, void *payload) -{ - int error; - git_remote *remote; - - GIT_UNUSED(payload); - - if ((error = git_remote_create_with_fetchspec(&remote, repo, name, url, "+refs/*:refs/*")) < 0) - return error; - - *out = remote; - return 0; -} - -void test_network_fetchlocal__clone_into_mirror(void) -{ - git_clone_options opts = GIT_CLONE_OPTIONS_INIT; - git_repository *repo; - git_reference *ref; - - opts.bare = true; - opts.remote_cb = remote_mirror_cb; - cl_git_pass(git_clone(&repo, cl_git_fixture_url("testrepo.git"), "./foo.git", &opts)); - - cl_git_pass(git_reference_lookup(&ref, repo, "HEAD")); - cl_assert_equal_i(GIT_REF_SYMBOLIC, git_reference_type(ref)); - cl_assert_equal_s("refs/heads/master", git_reference_symbolic_target(ref)); - - git_reference_free(ref); - cl_git_pass(git_reference_lookup(&ref, repo, "refs/remotes/test/master")); - - git_reference_free(ref); - git_repository_free(repo); - cl_fixture_cleanup("./foo.git"); -} - -void test_network_fetchlocal__all_refs(void) -{ - git_repository *repo; - git_remote *remote; - git_reference *ref; - char *allrefs = "+refs/*:refs/*"; - git_strarray refspecs = { - &allrefs, - 1, - }; - - cl_git_pass(git_repository_init(&repo, "./foo.git", true)); - cl_git_pass(git_remote_create_anonymous(&remote, repo, cl_git_fixture_url("testrepo.git"))); - cl_git_pass(git_remote_fetch(remote, &refspecs, NULL, NULL)); - - cl_git_pass(git_reference_lookup(&ref, repo, "refs/remotes/test/master")); - git_reference_free(ref); - - cl_git_pass(git_reference_lookup(&ref, repo, "refs/tags/test")); - git_reference_free(ref); - - git_remote_free(remote); - git_repository_free(repo); - cl_fixture_cleanup("./foo.git"); -} - -void test_network_fetchlocal__multi_remotes(void) -{ - git_repository *repo = cl_git_sandbox_init("testrepo.git"); - git_remote *test, *test2; - git_strarray refnames = {0}; - git_fetch_options options = GIT_FETCH_OPTIONS_INIT; - - cl_set_cleanup(&cleanup_sandbox, NULL); - options.callbacks.transfer_progress = transfer_cb; - cl_git_pass(git_remote_set_url(repo, "test", cl_git_fixture_url("testrepo.git"))); - cl_git_pass(git_remote_lookup(&test, repo, "test")); - cl_git_pass(git_remote_fetch(test, NULL, &options, NULL)); - - cl_git_pass(git_reference_list(&refnames, repo)); - cl_assert_equal_i(32, (int)refnames.count); - git_strarray_free(&refnames); - - cl_git_pass(git_remote_set_url(repo, "test_with_pushurl", cl_git_fixture_url("testrepo.git"))); - cl_git_pass(git_remote_lookup(&test2, repo, "test_with_pushurl")); - cl_git_pass(git_remote_fetch(test2, NULL, &options, NULL)); - - cl_git_pass(git_reference_list(&refnames, repo)); - cl_assert_equal_i(44, (int)refnames.count); - - git_strarray_free(&refnames); - git_remote_free(test); - git_remote_free(test2); -} - -static int sideband_cb(const char *str, int len, void *payload) -{ - int *count = (int *) payload; - - GIT_UNUSED(str); - GIT_UNUSED(len); - - (*count)++; - return 0; -} - -void test_network_fetchlocal__call_progress(void) -{ - git_repository *repo; - git_remote *remote; - git_fetch_options options = GIT_FETCH_OPTIONS_INIT; - int callcount = 0; - - cl_git_pass(git_repository_init(&repo, "foo.git", true)); - cl_set_cleanup(cleanup_local_repo, "foo.git"); - - cl_git_pass(git_remote_create_with_fetchspec(&remote, repo, "origin", cl_git_fixture_url("testrepo.git"), "+refs/heads/*:refs/heads/*")); - - options.callbacks.sideband_progress = sideband_cb; - options.callbacks.payload = &callcount; - - cl_git_pass(git_remote_fetch(remote, NULL, &options, NULL)); - cl_assert(callcount != 0); - - git_remote_free(remote); - git_repository_free(repo); -} - -void test_network_fetchlocal__prune_load_remote_prune_config(void) -{ - git_repository *repo; - git_remote *origin; - git_config *config; - git_repository *remote_repo = cl_git_sandbox_init("testrepo.git"); - const char *url = cl_git_path_url(git_repository_path(remote_repo)); - - cl_set_cleanup(&cleanup_local_repo, "foo"); - cl_git_pass(git_repository_init(&repo, "foo", true)); - - cl_git_pass(git_repository_config(&config, repo)); - cl_git_pass(git_config_set_bool(config, "remote.origin.prune", 1)); - - cl_git_pass(git_remote_create(&origin, repo, GIT_REMOTE_ORIGIN, url)); - cl_assert_equal_i(1, git_remote_prune_refs(origin)); - - git_config_free(config); - git_remote_free(origin); - git_repository_free(repo); -} - -void test_network_fetchlocal__prune_load_fetch_prune_config(void) -{ - git_repository *repo; - git_remote *origin; - git_config *config; - git_repository *remote_repo = cl_git_sandbox_init("testrepo.git"); - const char *url = cl_git_path_url(git_repository_path(remote_repo)); - - cl_set_cleanup(&cleanup_local_repo, "foo"); - cl_git_pass(git_repository_init(&repo, "foo", true)); - - cl_git_pass(git_repository_config(&config, repo)); - cl_git_pass(git_config_set_bool(config, "fetch.prune", 1)); - - cl_git_pass(git_remote_create(&origin, repo, GIT_REMOTE_ORIGIN, url)); - cl_assert_equal_i(1, git_remote_prune_refs(origin)); - - git_config_free(config); - git_remote_free(origin); - git_repository_free(repo); -} diff --git a/vendor/libgit2/tests/network/matchhost.c b/vendor/libgit2/tests/network/matchhost.c deleted file mode 100644 index 3100dc21d..000000000 --- a/vendor/libgit2/tests/network/matchhost.c +++ /dev/null @@ -1,13 +0,0 @@ -#include "clar_libgit2.h" -#include "netops.h" - -void test_network_matchhost__match(void) -{ - cl_git_pass(gitno__match_host("*.example.org", "www.example.org")); - cl_git_pass(gitno__match_host("*.foo.example.org", "www.foo.example.org")); - cl_git_fail(gitno__match_host("*.foo.example.org", "foo.example.org")); - cl_git_fail(gitno__match_host("*.foo.example.org", "www.example.org")); - cl_git_fail(gitno__match_host("*.example.org", "example.org")); - cl_git_fail(gitno__match_host("*.example.org", "www.foo.example.org")); - cl_git_fail(gitno__match_host("*.example.org", "blah.www.www.example.org")); -} diff --git a/vendor/libgit2/tests/network/refspecs.c b/vendor/libgit2/tests/network/refspecs.c deleted file mode 100644 index c47f197ff..000000000 --- a/vendor/libgit2/tests/network/refspecs.c +++ /dev/null @@ -1,160 +0,0 @@ -#include "clar_libgit2.h" -#include "refspec.h" -#include "remote.h" - -static void assert_refspec(unsigned int direction, const char *input, bool is_expected_to_be_valid) -{ - git_refspec refspec; - int error; - - error = git_refspec__parse(&refspec, input, direction == GIT_DIRECTION_FETCH); - git_refspec__free(&refspec); - - if (is_expected_to_be_valid) - cl_assert_equal_i(0, error); - else - cl_assert_equal_i(GIT_ERROR, error); -} - -void test_network_refspecs__parsing(void) -{ - // Ported from https://github.com/git/git/blob/abd2bde78bd994166900290434a2048e660dabed/t/t5511-refspec.sh - - assert_refspec(GIT_DIRECTION_PUSH, "", false); - assert_refspec(GIT_DIRECTION_PUSH, ":", true); - assert_refspec(GIT_DIRECTION_PUSH, "::", false); - assert_refspec(GIT_DIRECTION_PUSH, "+:", true); - - assert_refspec(GIT_DIRECTION_FETCH, "", true); - assert_refspec(GIT_DIRECTION_PUSH, ":", true); - assert_refspec(GIT_DIRECTION_FETCH, "::", false); - - assert_refspec(GIT_DIRECTION_PUSH, "refs/heads/*:refs/remotes/frotz/*", true); - assert_refspec(GIT_DIRECTION_PUSH, "refs/heads/*:refs/remotes/frotz", false); - assert_refspec(GIT_DIRECTION_PUSH, "refs/heads:refs/remotes/frotz/*", false); - assert_refspec(GIT_DIRECTION_PUSH, "refs/heads/master:refs/remotes/frotz/xyzzy", true); - - /* - * These have invalid LHS, but we do not have a formal "valid sha-1 - * expression syntax checker" so they are not checked with the current - * code. They will be caught downstream anyway, but we may want to - * have tighter check later... - */ - //assert_refspec(GIT_DIRECTION_PUSH, "refs/heads/master::refs/remotes/frotz/xyzzy", false); - //assert_refspec(GIT_DIRECTION_PUSH, "refs/heads/maste :refs/remotes/frotz/xyzzy", false); - - assert_refspec(GIT_DIRECTION_FETCH, "refs/heads/*:refs/remotes/frotz/*", true); - assert_refspec(GIT_DIRECTION_FETCH, "refs/heads/*:refs/remotes/frotz", false); - assert_refspec(GIT_DIRECTION_FETCH, "refs/heads:refs/remotes/frotz/*", false); - assert_refspec(GIT_DIRECTION_FETCH, "refs/heads/master:refs/remotes/frotz/xyzzy", true); - assert_refspec(GIT_DIRECTION_FETCH, "refs/heads/master::refs/remotes/frotz/xyzzy", false); - assert_refspec(GIT_DIRECTION_FETCH, "refs/heads/maste :refs/remotes/frotz/xyzzy", false); - - assert_refspec(GIT_DIRECTION_PUSH, "master~1:refs/remotes/frotz/backup", true); - assert_refspec(GIT_DIRECTION_FETCH, "master~1:refs/remotes/frotz/backup", false); - assert_refspec(GIT_DIRECTION_PUSH, "HEAD~4:refs/remotes/frotz/new", true); - assert_refspec(GIT_DIRECTION_FETCH, "HEAD~4:refs/remotes/frotz/new", false); - - assert_refspec(GIT_DIRECTION_PUSH, "HEAD", true); - assert_refspec(GIT_DIRECTION_FETCH, "HEAD", true); - assert_refspec(GIT_DIRECTION_PUSH, "refs/heads/ nitfol", false); - assert_refspec(GIT_DIRECTION_FETCH, "refs/heads/ nitfol", false); - - assert_refspec(GIT_DIRECTION_PUSH, "HEAD:", false); - assert_refspec(GIT_DIRECTION_FETCH, "HEAD:", true); - assert_refspec(GIT_DIRECTION_PUSH, "refs/heads/ nitfol:", false); - assert_refspec(GIT_DIRECTION_FETCH, "refs/heads/ nitfol:", false); - - assert_refspec(GIT_DIRECTION_PUSH, ":refs/remotes/frotz/deleteme", true); - assert_refspec(GIT_DIRECTION_FETCH, ":refs/remotes/frotz/HEAD-to-me", true); - assert_refspec(GIT_DIRECTION_PUSH, ":refs/remotes/frotz/delete me", false); - assert_refspec(GIT_DIRECTION_FETCH, ":refs/remotes/frotz/HEAD to me", false); - - assert_refspec(GIT_DIRECTION_FETCH, "refs/heads/*/for-linus:refs/remotes/mine/*-blah", false); - assert_refspec(GIT_DIRECTION_PUSH, "refs/heads/*/for-linus:refs/remotes/mine/*-blah", false); - - assert_refspec(GIT_DIRECTION_FETCH, "refs/heads*/for-linus:refs/remotes/mine/*", false); - assert_refspec(GIT_DIRECTION_PUSH, "refs/heads*/for-linus:refs/remotes/mine/*", false); - - assert_refspec(GIT_DIRECTION_FETCH, "refs/heads/*/*/for-linus:refs/remotes/mine/*", false); - assert_refspec(GIT_DIRECTION_PUSH, "refs/heads/*/*/for-linus:refs/remotes/mine/*", false); - - assert_refspec(GIT_DIRECTION_FETCH, "refs/heads/*/for-linus:refs/remotes/mine/*", true); - assert_refspec(GIT_DIRECTION_PUSH, "refs/heads/*/for-linus:refs/remotes/mine/*", true); - - assert_refspec(GIT_DIRECTION_FETCH, "master", true); - assert_refspec(GIT_DIRECTION_PUSH, "master", true); - - assert_refspec(GIT_DIRECTION_FETCH, "refs/pull/*/head:refs/remotes/origin/pr/*", true); -} - -static void assert_valid_transform(const char *refspec, const char *name, const char *result) -{ - git_refspec spec; - git_buf buf = GIT_BUF_INIT; - - git_refspec__parse(&spec, refspec, true); - cl_git_pass(git_refspec_transform(&buf, &spec, name)); - cl_assert_equal_s(result, buf.ptr); - - git_buf_free(&buf); - git_refspec__free(&spec); -} - -void test_network_refspecs__transform_mid_star(void) -{ - assert_valid_transform("refs/pull/*/head:refs/remotes/origin/pr/*", "refs/pull/23/head", "refs/remotes/origin/pr/23"); - assert_valid_transform("refs/heads/*:refs/remotes/origin/*", "refs/heads/master", "refs/remotes/origin/master"); - assert_valid_transform("refs/heads/*:refs/remotes/origin/*", "refs/heads/user/feature", "refs/remotes/origin/user/feature"); - assert_valid_transform("refs/heads/*:refs/heads/*", "refs/heads/master", "refs/heads/master"); - assert_valid_transform("refs/heads/*:refs/heads/*", "refs/heads/user/feature", "refs/heads/user/feature"); - assert_valid_transform("refs/*:refs/*", "refs/heads/master", "refs/heads/master"); -} - -static void assert_invalid_transform(const char *refspec, const char *name) -{ - git_refspec spec; - git_buf buf = GIT_BUF_INIT; - - git_refspec__parse(&spec, refspec, true); - cl_git_fail(git_refspec_transform(&buf, &spec, name)); - - git_buf_free(&buf); - git_refspec__free(&spec); -} - -void test_network_refspecs__invalid(void) -{ - assert_invalid_transform("refs/heads/*:refs/remotes/origin/*", "master"); - assert_invalid_transform("refs/heads/*:refs/remotes/origin/*", "refs/headz/master"); -} - -static void assert_invalid_rtransform(const char *refspec, const char *name) -{ - git_refspec spec; - git_buf buf = GIT_BUF_INIT; - - git_refspec__parse(&spec, refspec, true); - cl_git_fail(git_refspec_rtransform(&buf, &spec, name)); - - git_buf_free(&buf); - git_refspec__free(&spec); -} - -void test_network_refspecs__invalid_reverse(void) -{ - assert_invalid_rtransform("refs/heads/*:refs/remotes/origin/*", "master"); - assert_invalid_rtransform("refs/heads/*:refs/remotes/origin/*", "refs/remotes/o/master"); -} - -void test_network_refspecs__matching(void) -{ - git_refspec spec; - - cl_git_pass(git_refspec__parse(&spec, ":", false)); - cl_assert_equal_s(":", spec.string); - cl_assert_equal_s("", spec.src); - cl_assert_equal_s("", spec.dst); - - git_refspec__free(&spec); -} diff --git a/vendor/libgit2/tests/network/remote/createthenload.c b/vendor/libgit2/tests/network/remote/createthenload.c deleted file mode 100644 index f811f3c4c..000000000 --- a/vendor/libgit2/tests/network/remote/createthenload.c +++ /dev/null @@ -1,37 +0,0 @@ -#include "clar_libgit2.h" - -static git_remote *_remote; -static git_repository *_repo; -static git_config *_config; -static char url[] = "http://github.com/libgit2/libgit2.git"; - -void test_network_remote_createthenload__initialize(void) -{ - cl_fixture_sandbox("testrepo.git"); - - cl_git_pass(git_repository_open(&_repo, "testrepo.git")); - - cl_git_pass(git_repository_config(&_config, _repo)); - cl_git_pass(git_config_set_string(_config, "remote.origin.fetch", "+refs/heads/*:refs/remotes/origin/*")); - cl_git_pass(git_config_set_string(_config, "remote.origin.url", url)); - git_config_free(_config); - - cl_git_pass(git_remote_lookup(&_remote, _repo, "origin")); -} - -void test_network_remote_createthenload__cleanup(void) -{ - git_remote_free(_remote); - _remote = NULL; - - git_repository_free(_repo); - _repo = NULL; - - cl_fixture_cleanup("testrepo.git"); -} - -void test_network_remote_createthenload__parsing(void) -{ - cl_assert_equal_s(git_remote_name(_remote), "origin"); - cl_assert_equal_s(git_remote_url(_remote), url); -} diff --git a/vendor/libgit2/tests/network/remote/defaultbranch.c b/vendor/libgit2/tests/network/remote/defaultbranch.c deleted file mode 100644 index 5edd79fb8..000000000 --- a/vendor/libgit2/tests/network/remote/defaultbranch.c +++ /dev/null @@ -1,108 +0,0 @@ -#include "clar_libgit2.h" -#include "buffer.h" -#include "refspec.h" -#include "remote.h" - -static git_remote *g_remote; -static git_repository *g_repo_a, *g_repo_b; - -void test_network_remote_defaultbranch__initialize(void) -{ - g_repo_a = cl_git_sandbox_init("testrepo.git"); - cl_git_pass(git_repository_init(&g_repo_b, "repo-b.git", true)); - cl_git_pass(git_remote_create(&g_remote, g_repo_b, "origin", git_repository_path(g_repo_a))); -} - -void test_network_remote_defaultbranch__cleanup(void) -{ - git_remote_free(g_remote); - git_repository_free(g_repo_b); - - cl_git_sandbox_cleanup(); - cl_fixture_cleanup("repo-b.git"); -} - -static void assert_default_branch(const char *should) -{ - git_buf name = GIT_BUF_INIT; - - cl_git_pass(git_remote_connect(g_remote, GIT_DIRECTION_FETCH, NULL, NULL)); - cl_git_pass(git_remote_default_branch(&name, g_remote)); - cl_assert_equal_s(should, name.ptr); - git_buf_free(&name); -} - -void test_network_remote_defaultbranch__master(void) -{ - assert_default_branch("refs/heads/master"); -} - -void test_network_remote_defaultbranch__master_does_not_win(void) -{ - cl_git_pass(git_repository_set_head(g_repo_a, "refs/heads/not-good")); - assert_default_branch("refs/heads/not-good"); -} - -void test_network_remote_defaultbranch__master_on_detached(void) -{ - cl_git_pass(git_repository_detach_head(g_repo_a)); - assert_default_branch("refs/heads/master"); -} - -void test_network_remote_defaultbranch__no_default_branch(void) -{ - git_remote *remote_b; - const git_remote_head **heads; - size_t len; - git_buf buf = GIT_BUF_INIT; - - cl_git_pass(git_remote_create(&remote_b, g_repo_b, "self", git_repository_path(g_repo_b))); - cl_git_pass(git_remote_connect(remote_b, GIT_DIRECTION_FETCH, NULL, NULL)); - cl_git_pass(git_remote_ls(&heads, &len, remote_b)); - cl_assert_equal_i(0, len); - - cl_git_fail_with(GIT_ENOTFOUND, git_remote_default_branch(&buf, remote_b)); - - git_remote_free(remote_b); -} - -void test_network_remote_defaultbranch__detached_sharing_nonbranch_id(void) -{ - git_oid id, id_cloned; - git_reference *ref; - git_buf buf = GIT_BUF_INIT; - git_repository *cloned_repo; - - cl_git_pass(git_reference_name_to_id(&id, g_repo_a, "HEAD")); - cl_git_pass(git_repository_detach_head(g_repo_a)); - cl_git_pass(git_reference_remove(g_repo_a, "refs/heads/master")); - cl_git_pass(git_reference_remove(g_repo_a, "refs/heads/not-good")); - cl_git_pass(git_reference_create(&ref, g_repo_a, "refs/foo/bar", &id, 1, NULL)); - git_reference_free(ref); - - cl_git_pass(git_remote_connect(g_remote, GIT_DIRECTION_FETCH, NULL, NULL)); - cl_git_fail_with(GIT_ENOTFOUND, git_remote_default_branch(&buf, g_remote)); - - cl_git_pass(git_clone(&cloned_repo, git_repository_path(g_repo_a), "./local-detached", NULL)); - - cl_assert(git_repository_head_detached(cloned_repo)); - cl_git_pass(git_reference_name_to_id(&id_cloned, g_repo_a, "HEAD")); - cl_assert(git_oid_equal(&id, &id_cloned)); - - git_repository_free(cloned_repo); -} - -void test_network_remote_defaultbranch__unborn_HEAD_with_branches(void) -{ - git_reference *ref; - git_repository *cloned_repo; - - cl_git_pass(git_reference_symbolic_create(&ref, g_repo_a, "HEAD", "refs/heads/i-dont-exist", 1, NULL)); - git_reference_free(ref); - - cl_git_pass(git_clone(&cloned_repo, git_repository_path(g_repo_a), "./semi-empty", NULL)); - - cl_assert(git_repository_head_unborn(cloned_repo)); - - git_repository_free(cloned_repo); -} diff --git a/vendor/libgit2/tests/network/remote/delete.c b/vendor/libgit2/tests/network/remote/delete.c deleted file mode 100644 index f23a638aa..000000000 --- a/vendor/libgit2/tests/network/remote/delete.c +++ /dev/null @@ -1,46 +0,0 @@ -#include "clar_libgit2.h" -#include "config/config_helpers.h" - -#include "repository.h" - -static git_repository *_repo; - -void test_network_remote_delete__initialize(void) -{ - _repo = cl_git_sandbox_init("testrepo.git"); -} - -void test_network_remote_delete__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -void test_network_remote_delete__remove_remote_tracking_branches(void) -{ - git_reference *ref; - - cl_git_pass(git_remote_delete(_repo, "test")); - cl_git_fail_with(GIT_ENOTFOUND, git_reference_lookup(&ref, _repo, "refs/remotes/test/master")); -} - -void test_network_remote_delete__remove_remote_configuration_settings(void) -{ - cl_assert(count_config_entries_match(_repo, "remote\\.test\\.+") > 0); - - cl_git_pass(git_remote_delete(_repo, "test")); - - cl_assert_equal_i(0, count_config_entries_match(_repo, "remote\\.test\\.+")); -} - -void test_network_remote_delete__remove_branch_upstream_configuration_settings(void) -{ - assert_config_entry_existence(_repo, "branch.mergeless.remote", true); - assert_config_entry_existence(_repo, "branch.master.remote", true); - - cl_git_pass(git_remote_delete(_repo, "test")); - - assert_config_entry_existence(_repo, "branch.mergeless.remote", false); - assert_config_entry_existence(_repo, "branch.mergeless.merge", false); - assert_config_entry_existence(_repo, "branch.master.remote", false); - assert_config_entry_existence(_repo, "branch.master.merge", false); -} diff --git a/vendor/libgit2/tests/network/remote/isvalidname.c b/vendor/libgit2/tests/network/remote/isvalidname.c deleted file mode 100644 index c26fbd0a5..000000000 --- a/vendor/libgit2/tests/network/remote/isvalidname.c +++ /dev/null @@ -1,17 +0,0 @@ -#include "clar_libgit2.h" - -void test_network_remote_isvalidname__can_detect_invalid_formats(void) -{ - cl_assert_equal_i(false, git_remote_is_valid_name("/")); - cl_assert_equal_i(false, git_remote_is_valid_name("//")); - cl_assert_equal_i(false, git_remote_is_valid_name(".lock")); - cl_assert_equal_i(false, git_remote_is_valid_name("a.lock")); - cl_assert_equal_i(false, git_remote_is_valid_name("/no/leading/slash")); - cl_assert_equal_i(false, git_remote_is_valid_name("no/trailing/slash/")); -} - -void test_network_remote_isvalidname__wont_hopefully_choke_on_valid_formats(void) -{ - cl_assert_equal_i(true, git_remote_is_valid_name("webmatrix")); - cl_assert_equal_i(true, git_remote_is_valid_name("yishaigalatzer/rules")); -} diff --git a/vendor/libgit2/tests/network/remote/local.c b/vendor/libgit2/tests/network/remote/local.c deleted file mode 100644 index 4d990ab71..000000000 --- a/vendor/libgit2/tests/network/remote/local.c +++ /dev/null @@ -1,467 +0,0 @@ -#include "clar_libgit2.h" -#include "buffer.h" -#include "path.h" -#include "posix.h" - -static git_repository *repo; -static git_buf file_path_buf = GIT_BUF_INIT; -static git_remote *remote; - -static char *push_refspec_strings[] = { - "refs/heads/master", -}; -static git_strarray push_array = { - push_refspec_strings, - 1, -}; - -void test_network_remote_local__initialize(void) -{ - cl_git_pass(git_repository_init(&repo, "remotelocal/", 0)); - cl_git_pass(git_repository_set_ident(repo, "Foo Bar", "foo@example.com")); - cl_assert(repo != NULL); -} - -void test_network_remote_local__cleanup(void) -{ - git_buf_free(&file_path_buf); - - git_remote_free(remote); - remote = NULL; - - git_repository_free(repo); - repo = NULL; - - cl_fixture_cleanup("remotelocal"); -} - -static void connect_to_local_repository(const char *local_repository) -{ - git_buf_sets(&file_path_buf, cl_git_path_url(local_repository)); - - cl_git_pass(git_remote_create_anonymous(&remote, repo, git_buf_cstr(&file_path_buf))); - cl_git_pass(git_remote_connect(remote, GIT_DIRECTION_FETCH, NULL, NULL)); -} - -void test_network_remote_local__connected(void) -{ - connect_to_local_repository(cl_fixture("testrepo.git")); - cl_assert(git_remote_connected(remote)); - - git_remote_disconnect(remote); - cl_assert(!git_remote_connected(remote)); -} - -void test_network_remote_local__retrieve_advertised_references(void) -{ - const git_remote_head **refs; - size_t refs_len; - - connect_to_local_repository(cl_fixture("testrepo.git")); - - cl_git_pass(git_remote_ls(&refs, &refs_len, remote)); - - cl_assert_equal_i(refs_len, 28); -} - -void test_network_remote_local__retrieve_advertised_before_connect(void) -{ - const git_remote_head **refs; - size_t refs_len = 0; - - git_buf_sets(&file_path_buf, cl_git_path_url(cl_fixture("testrepo.git"))); - - cl_git_pass(git_remote_create_anonymous(&remote, repo, git_buf_cstr(&file_path_buf))); - cl_git_fail(git_remote_ls(&refs, &refs_len, remote)); -} - -void test_network_remote_local__retrieve_advertised_references_after_disconnect(void) -{ - const git_remote_head **refs; - size_t refs_len; - - connect_to_local_repository(cl_fixture("testrepo.git")); - git_remote_disconnect(remote); - - cl_git_pass(git_remote_ls(&refs, &refs_len, remote)); - - cl_assert_equal_i(refs_len, 28); -} - -void test_network_remote_local__retrieve_advertised_references_from_spaced_repository(void) -{ - const git_remote_head **refs; - size_t refs_len; - - cl_fixture_sandbox("testrepo.git"); - cl_git_pass(p_rename("testrepo.git", "spaced testrepo.git")); - - connect_to_local_repository("spaced testrepo.git"); - - cl_git_pass(git_remote_ls(&refs, &refs_len, remote)); - - cl_assert_equal_i(refs_len, 28); - - git_remote_free(remote); /* Disconnect from the "spaced repo" before the cleanup */ - remote = NULL; - - cl_fixture_cleanup("spaced testrepo.git"); -} - -void test_network_remote_local__nested_tags_are_completely_peeled(void) -{ - const git_remote_head **refs; - size_t refs_len, i; - - connect_to_local_repository(cl_fixture("testrepo.git")); - - cl_git_pass(git_remote_ls(&refs, &refs_len, remote)); - - for (i = 0; i < refs_len; i++) { - if (!strcmp(refs[i]->name, "refs/tags/test^{}")) - cl_git_pass(git_oid_streq(&refs[i]->oid, "e90810b8df3e80c413d903f631643c716887138d")); - } -} - -void test_network_remote_local__shorthand_fetch_refspec0(void) -{ - char *refspec_strings[] = { - "master:remotes/sloppy/master", - "master:boh/sloppy/master", - }; - git_strarray array = { - refspec_strings, - 2, - }; - - git_reference *ref; - - connect_to_local_repository(cl_fixture("testrepo.git")); - - cl_git_pass(git_remote_fetch(remote, &array, NULL, NULL)); - - cl_git_pass(git_reference_lookup(&ref, repo, "refs/remotes/sloppy/master")); - git_reference_free(ref); - - cl_git_pass(git_reference_lookup(&ref, repo, "refs/heads/boh/sloppy/master")); - git_reference_free(ref); -} - -void test_network_remote_local__shorthand_fetch_refspec1(void) -{ - char *refspec_strings[] = { - "master", - "hard_tag", - }; - git_strarray array = { - refspec_strings, - 2, - }; - - git_reference *ref; - - connect_to_local_repository(cl_fixture("testrepo.git")); - - cl_git_pass(git_remote_fetch(remote, &array, NULL, NULL)); - - cl_git_fail(git_reference_lookup(&ref, repo, "refs/remotes/origin/master")); - cl_git_fail(git_reference_lookup(&ref, repo, "refs/tags/hard_tag")); -} - -void test_network_remote_local__tagopt(void) -{ - git_reference *ref; - git_fetch_options fetch_opts = GIT_FETCH_OPTIONS_INIT; - - cl_git_pass(git_remote_create(&remote, repo, "tagopt", cl_git_path_url(cl_fixture("testrepo.git")))); - fetch_opts.download_tags = GIT_REMOTE_DOWNLOAD_TAGS_ALL; - cl_git_pass(git_remote_fetch(remote, NULL, &fetch_opts, NULL)); - - cl_git_pass(git_reference_lookup(&ref, repo, "refs/remotes/tagopt/master")); - git_reference_free(ref); - cl_git_pass(git_reference_lookup(&ref, repo, "refs/tags/hard_tag")); - git_reference_free(ref); - - fetch_opts.download_tags = GIT_REMOTE_DOWNLOAD_TAGS_AUTO; - cl_git_pass(git_remote_fetch(remote, NULL, &fetch_opts, NULL)); - cl_git_pass(git_reference_lookup(&ref, repo, "refs/remotes/tagopt/master")); - git_reference_free(ref); -} - -void test_network_remote_local__push_to_bare_remote(void) -{ - char *refspec_strings[] = { - "master:master", - }; - git_strarray array = { - refspec_strings, - 1, - }; - - /* Should be able to push to a bare remote */ - git_remote *localremote; - - /* Get some commits */ - connect_to_local_repository(cl_fixture("testrepo.git")); - cl_git_pass(git_remote_fetch(remote, &array, NULL, NULL)); - - /* Set up an empty bare repo to push into */ - { - git_repository *localbarerepo; - cl_git_pass(git_repository_init(&localbarerepo, "./localbare.git", 1)); - git_repository_free(localbarerepo); - } - - /* Connect to the bare repo */ - cl_git_pass(git_remote_create_anonymous(&localremote, repo, "./localbare.git")); - cl_git_pass(git_remote_connect(localremote, GIT_DIRECTION_PUSH, NULL, NULL)); - - /* Try to push */ - cl_git_pass(git_remote_upload(localremote, &push_array, NULL)); - - /* Clean up */ - git_remote_free(localremote); - cl_fixture_cleanup("localbare.git"); -} - -void test_network_remote_local__push_to_bare_remote_with_file_url(void) -{ - char *refspec_strings[] = { - "master:master", - }; - git_strarray array = { - refspec_strings, - 1, - }; - /* Should be able to push to a bare remote */ - git_remote *localremote; - const char *url; - - /* Get some commits */ - connect_to_local_repository(cl_fixture("testrepo.git")); - cl_git_pass(git_remote_fetch(remote, &array, NULL, NULL)); - - /* Set up an empty bare repo to push into */ - { - git_repository *localbarerepo; - cl_git_pass(git_repository_init(&localbarerepo, "./localbare.git", 1)); - git_repository_free(localbarerepo); - } - - /* Create a file URL */ - url = cl_git_path_url("./localbare.git"); - - /* Connect to the bare repo */ - cl_git_pass(git_remote_create_anonymous(&localremote, repo, url)); - cl_git_pass(git_remote_connect(localremote, GIT_DIRECTION_PUSH, NULL, NULL)); - - /* Try to push */ - cl_git_pass(git_remote_upload(localremote, &push_array, NULL)); - - /* Clean up */ - git_remote_free(localremote); - cl_fixture_cleanup("localbare.git"); -} - - -void test_network_remote_local__push_to_non_bare_remote(void) -{ - char *refspec_strings[] = { - "master:master", - }; - git_strarray array = { - refspec_strings, - 1, - }; - /* Shouldn't be able to push to a non-bare remote */ - git_remote *localremote; - git_fetch_options fetch_opts = GIT_FETCH_OPTIONS_INIT; - - /* Get some commits */ - connect_to_local_repository(cl_fixture("testrepo.git")); - cl_git_pass(git_remote_fetch(remote, &array, &fetch_opts, NULL)); - - /* Set up an empty non-bare repo to push into */ - { - git_repository *remoterepo = NULL; - cl_git_pass(git_repository_init(&remoterepo, "localnonbare", 0)); - git_repository_free(remoterepo); - } - - /* Connect to the bare repo */ - cl_git_pass(git_remote_create_anonymous(&localremote, repo, "./localnonbare")); - cl_git_pass(git_remote_connect(localremote, GIT_DIRECTION_PUSH, NULL, NULL)); - - /* Try to push */ - cl_git_fail_with(GIT_EBAREREPO, git_remote_upload(localremote, &push_array, NULL)); - - /* Clean up */ - git_remote_free(localremote); - cl_fixture_cleanup("localbare.git"); -} - -void test_network_remote_local__fetch(void) -{ - char *refspec_strings[] = { - "master:remotes/sloppy/master", - }; - git_strarray array = { - refspec_strings, - 1, - }; - - git_reflog *log; - const git_reflog_entry *entry; - git_reference *ref; - - connect_to_local_repository(cl_fixture("testrepo.git")); - - cl_git_pass(git_remote_fetch(remote, &array, NULL, "UPDAAAAAATE!!")); - - cl_git_pass(git_reference_lookup(&ref, repo, "refs/remotes/sloppy/master")); - git_reference_free(ref); - - cl_git_pass(git_reflog_read(&log, repo, "refs/remotes/sloppy/master")); - cl_assert_equal_i(1, git_reflog_entrycount(log)); - entry = git_reflog_entry_byindex(log, 0); - cl_assert_equal_s("foo@example.com", git_reflog_entry_committer(entry)->email); - cl_assert_equal_s("UPDAAAAAATE!!", git_reflog_entry_message(entry)); - - git_reflog_free(log); -} - -void test_network_remote_local__reflog(void) -{ - char *refspec_strings[] = { - "master:remotes/sloppy/master", - }; - git_strarray array = { - refspec_strings, - 1, - }; - - git_reflog *log; - const git_reflog_entry *entry; - - connect_to_local_repository(cl_fixture("testrepo.git")); - - cl_git_pass(git_remote_fetch(remote, &array, NULL, "UPDAAAAAATE!!")); - - cl_git_pass(git_reflog_read(&log, repo, "refs/remotes/sloppy/master")); - cl_assert_equal_i(1, git_reflog_entrycount(log)); - entry = git_reflog_entry_byindex(log, 0); - cl_assert_equal_s("foo@example.com", git_reflog_entry_committer(entry)->email); - cl_assert_equal_s("UPDAAAAAATE!!", git_reflog_entry_message(entry)); - - git_reflog_free(log); -} - -void test_network_remote_local__fetch_default_reflog_message(void) -{ - char *refspec_strings[] = { - "master:remotes/sloppy/master", - }; - git_strarray array = { - refspec_strings, - 1, - }; - - git_reflog *log; - const git_reflog_entry *entry; - char expected_reflog_msg[1024]; - - connect_to_local_repository(cl_fixture("testrepo.git")); - - cl_git_pass(git_remote_fetch(remote, &array, NULL, NULL)); - - cl_git_pass(git_reflog_read(&log, repo, "refs/remotes/sloppy/master")); - cl_assert_equal_i(1, git_reflog_entrycount(log)); - entry = git_reflog_entry_byindex(log, 0); - cl_assert_equal_s("foo@example.com", git_reflog_entry_committer(entry)->email); - - sprintf(expected_reflog_msg, "fetch %s", git_remote_url(remote)); - cl_assert_equal_s(expected_reflog_msg, git_reflog_entry_message(entry)); - - git_reflog_free(log); -} - -void test_network_remote_local__opportunistic_update(void) -{ - git_reference *ref; - char *refspec_strings[] = { - "master", - }; - git_strarray array = { - refspec_strings, - 1, - }; - - /* this remote has a passive refspec of "refs/heads/:refs/remotes/origin/" */ - cl_git_pass(git_remote_create(&remote, repo, "origin", cl_git_fixture_url("testrepo.git"))); - /* and we pass the active refspec "master" */ - cl_git_pass(git_remote_fetch(remote, &array, NULL, NULL)); - - /* and we expect that to update our copy of origin's master */ - cl_git_pass(git_reference_lookup(&ref, repo, "refs/remotes/origin/master")); - git_reference_free(ref); -} - -void test_network_remote_local__update_tips_for_new_remote(void) { - git_repository *src_repo; - git_repository *dst_repo; - git_remote *new_remote; - git_reference* branch; - - /* Copy test repo */ - cl_fixture_sandbox("testrepo.git"); - cl_git_pass(git_repository_open(&src_repo, "testrepo.git")); - - /* Set up an empty bare repo to push into */ - cl_git_pass(git_repository_init(&dst_repo, "./localbare.git", 1)); - - /* Push to bare repo */ - cl_git_pass(git_remote_create(&new_remote, src_repo, "bare", "./localbare.git")); - cl_git_pass(git_remote_push(new_remote, &push_array, NULL)); - /* Make sure remote branch has been created */ - cl_git_pass(git_branch_lookup(&branch, src_repo, "bare/master", GIT_BRANCH_REMOTE)); - - git_reference_free(branch); - git_remote_free(new_remote); - git_repository_free(dst_repo); - cl_fixture_cleanup("localbare.git"); - git_repository_free(src_repo); - cl_fixture_cleanup("testrepo.git"); -} - -void test_network_remote_local__push_delete(void) -{ - git_repository *src_repo; - git_repository *dst_repo; - git_remote *remote; - git_reference *ref; - char *spec_push[] = { "refs/heads/master" }; - char *spec_delete[] = { ":refs/heads/master" }; - git_strarray specs = { - spec_push, - 1, - }; - - src_repo = cl_git_sandbox_init("testrepo.git"); - cl_git_pass(git_repository_init(&dst_repo, "target.git", 1)); - - cl_git_pass(git_remote_create(&remote, src_repo, "origin", "./target.git")); - - /* Push the master branch and verify it's there */ - cl_git_pass(git_remote_push(remote, &specs, NULL)); - cl_git_pass(git_reference_lookup(&ref, dst_repo, "refs/heads/master")); - git_reference_free(ref); - - specs.strings = spec_delete; - cl_git_pass(git_remote_push(remote, &specs, NULL)); - cl_git_fail(git_reference_lookup(&ref, dst_repo, "refs/heads/master")); - - git_remote_free(remote); - git_repository_free(dst_repo); - cl_fixture_cleanup("target.git"); - cl_git_sandbox_cleanup(); -} diff --git a/vendor/libgit2/tests/network/remote/push.c b/vendor/libgit2/tests/network/remote/push.c deleted file mode 100644 index 34860542e..000000000 --- a/vendor/libgit2/tests/network/remote/push.c +++ /dev/null @@ -1,114 +0,0 @@ -#include "clar_libgit2.h" -#include "git2/sys/commit.h" - -static git_remote *_remote; -static git_repository *_repo, *_dummy; - -void test_network_remote_push__initialize(void) -{ - cl_fixture_sandbox("testrepo.git"); - git_repository_open(&_repo, "testrepo.git"); - - /* We need a repository to have a remote */ - cl_git_pass(git_repository_init(&_dummy, "dummy.git", true)); - cl_git_pass(git_remote_create(&_remote, _dummy, "origin", cl_git_path_url("testrepo.git"))); -} - -void test_network_remote_push__cleanup(void) -{ - git_remote_free(_remote); - _remote = NULL; - - git_repository_free(_repo); - _repo = NULL; - - git_repository_free(_dummy); - _dummy = NULL; - - cl_fixture_cleanup("testrepo.git"); - cl_fixture_cleanup("dummy.git"); -} - -int negotiation_cb(const git_push_update **updates, size_t len, void *payload) -{ - const git_push_update *expected = payload; - - cl_assert_equal_i(1, len); - cl_assert_equal_s(expected->src_refname, updates[0]->src_refname); - cl_assert_equal_s(expected->dst_refname, updates[0]->dst_refname); - cl_assert_equal_oid(&expected->src, &updates[0]->src); - cl_assert_equal_oid(&expected->dst, &updates[0]->dst); - - return 0; -} - -void test_network_remote_push__delete_notification(void) -{ - git_push_options opts = GIT_PUSH_OPTIONS_INIT; - git_reference *ref; - git_push_update expected; - char *refspec = ":refs/heads/master"; - const git_strarray refspecs = { - &refspec, - 1, - }; - - cl_git_pass(git_reference_lookup(&ref, _repo, "refs/heads/master")); - - expected.src_refname = ""; - expected.dst_refname = "refs/heads/master"; - memset(&expected.dst, 0, sizeof(git_oid)); - git_oid_cpy(&expected.src, git_reference_target(ref)); - - opts.callbacks.push_negotiation = negotiation_cb; - opts.callbacks.payload = &expected; - cl_git_pass(git_remote_push(_remote, &refspecs, &opts)); - - git_reference_free(ref); - cl_git_fail_with(GIT_ENOTFOUND, git_reference_lookup(&ref, _repo, "refs/heads/master")); - -} - -void create_dummy_commit(git_reference **out, git_repository *repo) -{ - git_index *index; - git_oid tree_id, commit_id; - git_signature *sig; - - cl_git_pass(git_repository_index(&index, repo)); - cl_git_pass(git_index_write_tree(&tree_id, index)); - git_index_free(index); - - cl_git_pass(git_signature_now(&sig, "Pusher Joe", "pjoe")); - cl_git_pass(git_commit_create_from_ids(&commit_id, repo, NULL, sig, sig, - NULL, "Empty tree\n", &tree_id, 0, NULL)); - cl_git_pass(git_reference_create(out, repo, "refs/heads/empty-tree", &commit_id, true, "commit yo")); - git_signature_free(sig); -} - -void test_network_remote_push__create_notification(void) -{ - git_push_options opts = GIT_PUSH_OPTIONS_INIT; - git_reference *ref; - git_push_update expected; - char *refspec = "refs/heads/empty-tree"; - const git_strarray refspecs = { - &refspec, - 1, - }; - - create_dummy_commit(&ref, _dummy); - - expected.src_refname = "refs/heads/empty-tree"; - expected.dst_refname = "refs/heads/empty-tree"; - git_oid_cpy(&expected.dst, git_reference_target(ref)); - memset(&expected.src, 0, sizeof(git_oid)); - - opts.callbacks.push_negotiation = negotiation_cb; - opts.callbacks.payload = &expected; - cl_git_pass(git_remote_push(_remote, &refspecs, &opts)); - - git_reference_free(ref); - cl_git_pass(git_reference_lookup(&ref, _repo, "refs/heads/empty-tree")); - git_reference_free(ref); -} diff --git a/vendor/libgit2/tests/network/remote/remotes.c b/vendor/libgit2/tests/network/remote/remotes.c deleted file mode 100644 index 46abc6d33..000000000 --- a/vendor/libgit2/tests/network/remote/remotes.c +++ /dev/null @@ -1,469 +0,0 @@ -#include "clar_libgit2.h" -#include "config/config_helpers.h" -#include "buffer.h" -#include "refspec.h" -#include "remote.h" - -static git_remote *_remote; -static git_repository *_repo; -static const git_refspec *_refspec; - -void test_network_remote_remotes__initialize(void) -{ - _repo = cl_git_sandbox_init("testrepo.git"); - - cl_git_pass(git_remote_lookup(&_remote, _repo, "test")); - - _refspec = git_remote_get_refspec(_remote, 0); - cl_assert(_refspec != NULL); -} - -void test_network_remote_remotes__cleanup(void) -{ - git_remote_free(_remote); - _remote = NULL; - - cl_git_sandbox_cleanup(); -} - -void test_network_remote_remotes__parsing(void) -{ - git_remote *_remote2 = NULL; - - cl_assert_equal_s(git_remote_name(_remote), "test"); - cl_assert_equal_s(git_remote_url(_remote), "git://github.com/libgit2/libgit2"); - cl_assert(git_remote_pushurl(_remote) == NULL); - - cl_assert_equal_s(git_remote__urlfordirection(_remote, GIT_DIRECTION_FETCH), - "git://github.com/libgit2/libgit2"); - cl_assert_equal_s(git_remote__urlfordirection(_remote, GIT_DIRECTION_PUSH), - "git://github.com/libgit2/libgit2"); - - cl_git_pass(git_remote_lookup(&_remote2, _repo, "test_with_pushurl")); - cl_assert_equal_s(git_remote_name(_remote2), "test_with_pushurl"); - cl_assert_equal_s(git_remote_url(_remote2), "git://github.com/libgit2/fetchlibgit2"); - cl_assert_equal_s(git_remote_pushurl(_remote2), "git://github.com/libgit2/pushlibgit2"); - - cl_assert_equal_s(git_remote__urlfordirection(_remote2, GIT_DIRECTION_FETCH), - "git://github.com/libgit2/fetchlibgit2"); - cl_assert_equal_s(git_remote__urlfordirection(_remote2, GIT_DIRECTION_PUSH), - "git://github.com/libgit2/pushlibgit2"); - - git_remote_free(_remote2); -} - -void test_network_remote_remotes__pushurl(void) -{ - const char *name = git_remote_name(_remote); - git_remote *mod; - - cl_git_pass(git_remote_set_pushurl(_repo, name, "git://github.com/libgit2/notlibgit2")); - cl_git_pass(git_remote_lookup(&mod, _repo, name)); - cl_assert_equal_s(git_remote_pushurl(mod), "git://github.com/libgit2/notlibgit2"); - git_remote_free(mod); - - cl_git_pass(git_remote_set_pushurl(_repo, name, NULL)); - cl_git_pass(git_remote_lookup(&mod, _repo, name)); - cl_assert(git_remote_pushurl(mod) == NULL); - git_remote_free(mod); -} - -void test_network_remote_remotes__error_when_not_found(void) -{ - git_remote *r; - cl_git_fail_with(git_remote_lookup(&r, _repo, "does-not-exist"), GIT_ENOTFOUND); - - cl_assert(giterr_last() != NULL); - cl_assert(giterr_last()->klass == GITERR_CONFIG); -} - -void test_network_remote_remotes__error_when_no_push_available(void) -{ - git_remote *r; - git_remote_callbacks callbacks = GIT_REMOTE_CALLBACKS_INIT; - char *specs = { - "refs/heads/master", - }; - git_strarray arr = { - &specs, - 1, - }; - - - cl_git_pass(git_remote_create_anonymous(&r, _repo, cl_fixture("testrepo.git"))); - - callbacks.transport = git_transport_local; - cl_git_pass(git_remote_connect(r, GIT_DIRECTION_PUSH, &callbacks, NULL)); - - /* Make sure that push is really not available */ - r->transport->push = NULL; - - cl_git_fail_with(-1, git_remote_upload(r, &arr, NULL)); - - git_remote_free(r); -} - -void test_network_remote_remotes__refspec_parsing(void) -{ - cl_assert_equal_s(git_refspec_src(_refspec), "refs/heads/*"); - cl_assert_equal_s(git_refspec_dst(_refspec), "refs/remotes/test/*"); -} - -void test_network_remote_remotes__add_fetchspec(void) -{ - size_t size; - - size = git_remote_refspec_count(_remote); - - cl_git_pass(git_remote_add_fetch(_repo, "test", "refs/*:refs/*")); - size++; - - git_remote_free(_remote); - cl_git_pass(git_remote_lookup(&_remote, _repo, "test")); - - cl_assert_equal_i((int)size, (int)git_remote_refspec_count(_remote)); - - _refspec = git_remote_get_refspec(_remote, size - 1); - cl_assert_equal_s(git_refspec_src(_refspec), "refs/*"); - cl_assert_equal_s(git_refspec_dst(_refspec), "refs/*"); - cl_assert_equal_s(git_refspec_string(_refspec), "refs/*:refs/*"); - cl_assert_equal_b(_refspec->push, false); - - cl_git_fail_with(GIT_EINVALIDSPEC, git_remote_add_fetch(_repo, "test", "refs/*/foo/*:refs/*")); -} - -void test_network_remote_remotes__dup(void) -{ - git_strarray array; - git_remote *dup; - - cl_git_pass(git_remote_dup(&dup, _remote)); - - cl_assert_equal_s(git_remote_name(dup), git_remote_name(_remote)); - cl_assert_equal_s(git_remote_url(dup), git_remote_url(_remote)); - cl_assert_equal_s(git_remote_pushurl(dup), git_remote_pushurl(_remote)); - - cl_git_pass(git_remote_get_fetch_refspecs(&array, _remote)); - cl_assert_equal_i(1, (int)array.count); - cl_assert_equal_s("+refs/heads/*:refs/remotes/test/*", array.strings[0]); - git_strarray_free(&array); - - cl_git_pass(git_remote_get_push_refspecs(&array, _remote)); - cl_assert_equal_i(0, (int)array.count); - git_strarray_free(&array); - - git_remote_free(dup); -} - -void test_network_remote_remotes__add_pushspec(void) -{ - size_t size; - - size = git_remote_refspec_count(_remote); - - cl_git_pass(git_remote_add_push(_repo, "test", "refs/*:refs/*")); - size++; - - git_remote_free(_remote); - cl_git_pass(git_remote_lookup(&_remote, _repo, "test")); - - cl_assert_equal_i((int)size, (int)git_remote_refspec_count(_remote)); - - _refspec = git_remote_get_refspec(_remote, size - 1); - cl_assert_equal_s(git_refspec_src(_refspec), "refs/*"); - cl_assert_equal_s(git_refspec_dst(_refspec), "refs/*"); - cl_assert_equal_s(git_refspec_string(_refspec), "refs/*:refs/*"); - - cl_assert_equal_b(_refspec->push, true); -} - -void test_network_remote_remotes__fnmatch(void) -{ - cl_assert(git_refspec_src_matches(_refspec, "refs/heads/master")); - cl_assert(git_refspec_src_matches(_refspec, "refs/heads/multi/level/branch")); -} - -void test_network_remote_remotes__transform(void) -{ - git_buf ref = GIT_BUF_INIT; - - cl_git_pass(git_refspec_transform(&ref, _refspec, "refs/heads/master")); - cl_assert_equal_s(ref.ptr, "refs/remotes/test/master"); - git_buf_free(&ref); -} - -void test_network_remote_remotes__transform_destination_to_source(void) -{ - git_buf ref = GIT_BUF_INIT; - - cl_git_pass(git_refspec_rtransform(&ref, _refspec, "refs/remotes/test/master")); - cl_assert_equal_s(ref.ptr, "refs/heads/master"); - git_buf_free(&ref); -} - -void test_network_remote_remotes__missing_refspecs(void) -{ - git_config *cfg; - - git_remote_free(_remote); - _remote = NULL; - - cl_git_pass(git_repository_config(&cfg, _repo)); - cl_git_pass(git_config_set_string(cfg, "remote.specless.url", "http://example.com")); - cl_git_pass(git_remote_lookup(&_remote, _repo, "specless")); - - git_config_free(cfg); -} - -void test_network_remote_remotes__nonmatch_upstream_refspec(void) -{ - git_config *config; - git_remote *remote; - char *specstr[] = { - "refs/tags/*:refs/tags/*", - }; - git_strarray specs = { - specstr, - 1, - }; - - cl_git_pass(git_remote_create(&remote, _repo, "taggy", git_repository_path(_repo))); - - /* - * Set the current branch's upstream remote to a dummy ref so we call into the code - * which tries to check for the current branch's upstream in the refspecs - */ - cl_git_pass(git_repository_config(&config, _repo)); - cl_git_pass(git_config_set_string(config, "branch.master.remote", "taggy")); - cl_git_pass(git_config_set_string(config, "branch.master.merge", "refs/heads/foo")); - - cl_git_pass(git_remote_fetch(remote, &specs, NULL, NULL)); - - git_remote_free(remote); -} - -void test_network_remote_remotes__list(void) -{ - git_strarray list; - git_config *cfg; - - cl_git_pass(git_remote_list(&list, _repo)); - cl_assert(list.count == 5); - git_strarray_free(&list); - - cl_git_pass(git_repository_config(&cfg, _repo)); - - /* Create a new remote */ - cl_git_pass(git_config_set_string(cfg, "remote.specless.url", "http://example.com")); - - /* Update a remote (previously without any url/pushurl entry) */ - cl_git_pass(git_config_set_string(cfg, "remote.no-remote-url.pushurl", "http://example.com")); - - cl_git_pass(git_remote_list(&list, _repo)); - cl_assert(list.count == 7); - git_strarray_free(&list); - - git_config_free(cfg); -} - -void test_network_remote_remotes__loading_a_missing_remote_returns_ENOTFOUND(void) -{ - git_remote_free(_remote); - _remote = NULL; - - cl_assert_equal_i(GIT_ENOTFOUND, git_remote_lookup(&_remote, _repo, "just-left-few-minutes-ago")); -} - -void test_network_remote_remotes__loading_with_an_invalid_name_returns_EINVALIDSPEC(void) -{ - git_remote_free(_remote); - _remote = NULL; - - cl_assert_equal_i(GIT_EINVALIDSPEC, git_remote_lookup(&_remote, _repo, "Inv@{id")); -} - -/* - * $ git remote add addtest http://github.com/libgit2/libgit2 - * - * $ cat .git/config - * [...] - * [remote "addtest"] - * url = http://github.com/libgit2/libgit2 - * fetch = +refs/heads/\*:refs/remotes/addtest/\* - */ -void test_network_remote_remotes__add(void) -{ - git_remote_free(_remote); - _remote = NULL; - - cl_git_pass(git_remote_create(&_remote, _repo, "addtest", "http://github.com/libgit2/libgit2")); - cl_assert_equal_i(GIT_REMOTE_DOWNLOAD_TAGS_AUTO, git_remote_autotag(_remote)); - - git_remote_free(_remote); - _remote = NULL; - - cl_git_pass(git_remote_lookup(&_remote, _repo, "addtest")); - cl_assert_equal_i(GIT_REMOTE_DOWNLOAD_TAGS_AUTO, git_remote_autotag(_remote)); - - _refspec = git_vector_get(&_remote->refspecs, 0); - cl_assert_equal_s("refs/heads/*", git_refspec_src(_refspec)); - cl_assert(git_refspec_force(_refspec) == 1); - cl_assert_equal_s("refs/remotes/addtest/*", git_refspec_dst(_refspec)); - cl_assert_equal_s(git_remote_url(_remote), "http://github.com/libgit2/libgit2"); -} - -void test_network_remote_remotes__cannot_add_a_nameless_remote(void) -{ - git_remote *remote; - - cl_assert_equal_i( - GIT_EINVALIDSPEC, - git_remote_create(&remote, _repo, NULL, "git://github.com/libgit2/libgit2")); -} - -void test_network_remote_remotes__cannot_add_a_remote_with_an_invalid_name(void) -{ - git_remote *remote = NULL; - - cl_assert_equal_i( - GIT_EINVALIDSPEC, - git_remote_create(&remote, _repo, "Inv@{id", "git://github.com/libgit2/libgit2")); - cl_assert_equal_p(remote, NULL); - - cl_assert_equal_i( - GIT_EINVALIDSPEC, - git_remote_create(&remote, _repo, "", "git://github.com/libgit2/libgit2")); - cl_assert_equal_p(remote, NULL); -} - -void test_network_remote_remotes__tagopt(void) -{ - const char *name = git_remote_name(_remote); - - git_remote_set_autotag(_repo, name, GIT_REMOTE_DOWNLOAD_TAGS_ALL); - assert_config_entry_value(_repo, "remote.test.tagopt", "--tags"); - - git_remote_set_autotag(_repo, name, GIT_REMOTE_DOWNLOAD_TAGS_NONE); - assert_config_entry_value(_repo, "remote.test.tagopt", "--no-tags"); - - git_remote_set_autotag(_repo, name, GIT_REMOTE_DOWNLOAD_TAGS_AUTO); - assert_config_entry_existence(_repo, "remote.test.tagopt", false); -} - -void test_network_remote_remotes__can_load_with_an_empty_url(void) -{ - git_remote *remote = NULL; - - cl_git_pass(git_remote_lookup(&remote, _repo, "empty-remote-url")); - - cl_assert(remote->url == NULL); - cl_assert(remote->pushurl == NULL); - - cl_git_fail(git_remote_connect(remote, GIT_DIRECTION_FETCH, NULL, NULL)); - - cl_assert(giterr_last() != NULL); - cl_assert(giterr_last()->klass == GITERR_INVALID); - - git_remote_free(remote); -} - -void test_network_remote_remotes__can_load_with_only_an_empty_pushurl(void) -{ - git_remote *remote = NULL; - - cl_git_pass(git_remote_lookup(&remote, _repo, "empty-remote-pushurl")); - - cl_assert(remote->url == NULL); - cl_assert(remote->pushurl == NULL); - - cl_git_fail(git_remote_connect(remote, GIT_DIRECTION_FETCH, NULL, NULL)); - - git_remote_free(remote); -} - -void test_network_remote_remotes__returns_ENOTFOUND_when_neither_url_nor_pushurl(void) -{ - git_remote *remote = NULL; - - cl_git_fail_with( - git_remote_lookup(&remote, _repo, "no-remote-url"), GIT_ENOTFOUND); -} - -void assert_cannot_create_remote(const char *name, int expected_error) -{ - git_remote *remote = NULL; - - cl_git_fail_with( - git_remote_create(&remote, _repo, name, "git://github.com/libgit2/libgit2"), - expected_error); - - cl_assert_equal_p(remote, NULL); -} - -void test_network_remote_remotes__cannot_create_a_remote_which_name_conflicts_with_an_existing_remote(void) -{ - assert_cannot_create_remote("test", GIT_EEXISTS); -} - -void test_network_remote_remotes__cannot_create_a_remote_which_name_is_invalid(void) -{ - assert_cannot_create_remote("/", GIT_EINVALIDSPEC); - assert_cannot_create_remote("//", GIT_EINVALIDSPEC); - assert_cannot_create_remote(".lock", GIT_EINVALIDSPEC); - assert_cannot_create_remote("a.lock", GIT_EINVALIDSPEC); -} - -void test_network_remote_remote__git_remote_create_with_fetchspec(void) -{ - git_remote *remote; - git_strarray array; - - cl_git_pass(git_remote_create_with_fetchspec(&remote, _repo, "test-new", "git://github.com/libgit2/libgit2", "+refs/*:refs/*")); - git_remote_get_fetch_refspecs(&array, remote); - cl_assert_equal_s("+refs/*:refs/*", array.strings[0]); - git_remote_free(remote); -} - -static const char *fetch_refspecs[] = { - "+refs/heads/*:refs/remotes/origin/*", - "refs/tags/*:refs/tags/*", - "+refs/pull/*:refs/pull/*", -}; - -static const char *push_refspecs[] = { - "refs/heads/*:refs/heads/*", - "refs/tags/*:refs/tags/*", - "refs/notes/*:refs/notes/*", -}; - -void test_network_remote_remotes__query_refspecs(void) -{ - git_remote *remote; - git_strarray array; - int i; - - cl_git_pass(git_remote_create_with_fetchspec(&remote, _repo, "query", "git://github.com/libgit2/libgit2", NULL)); - git_remote_free(remote); - - for (i = 0; i < 3; i++) { - cl_git_pass(git_remote_add_fetch(_repo, "query", fetch_refspecs[i])); - cl_git_pass(git_remote_add_push(_repo, "query", push_refspecs[i])); - } - - cl_git_pass(git_remote_lookup(&remote, _repo, "query")); - - cl_git_pass(git_remote_get_fetch_refspecs(&array, remote)); - for (i = 0; i < 3; i++) { - cl_assert_equal_s(fetch_refspecs[i], array.strings[i]); - } - git_strarray_free(&array); - - cl_git_pass(git_remote_get_push_refspecs(&array, remote)); - for (i = 0; i < 3; i++) { - cl_assert_equal_s(push_refspecs[i], array.strings[i]); - } - git_strarray_free(&array); - - git_remote_free(remote); - git_remote_delete(_repo, "test"); -} diff --git a/vendor/libgit2/tests/network/remote/rename.c b/vendor/libgit2/tests/network/remote/rename.c deleted file mode 100644 index b44a0ae71..000000000 --- a/vendor/libgit2/tests/network/remote/rename.c +++ /dev/null @@ -1,255 +0,0 @@ -#include "clar_libgit2.h" -#include "config/config_helpers.h" - -#include "repository.h" - -static git_repository *_repo; -static const char *_remote_name = "test"; - -void test_network_remote_rename__initialize(void) -{ - _repo = cl_git_sandbox_init("testrepo.git"); -} - -void test_network_remote_rename__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -static int dont_call_me_cb(const char *fetch_refspec, void *payload) -{ - GIT_UNUSED(fetch_refspec); - GIT_UNUSED(payload); - - cl_assert(false); - - return -1; -} - -void test_network_remote_rename__renaming_a_remote_moves_related_configuration_section(void) -{ - git_strarray problems = {0}; - - assert_config_entry_existence(_repo, "remote.test.fetch", true); - assert_config_entry_existence(_repo, "remote.just/renamed.fetch", false); - - cl_git_pass(git_remote_rename(&problems, _repo, _remote_name, "just/renamed")); - cl_assert_equal_i(0, problems.count); - git_strarray_free(&problems); - - assert_config_entry_existence(_repo, "remote.test.fetch", false); - assert_config_entry_existence(_repo, "remote.just/renamed.fetch", true); -} - -void test_network_remote_rename__renaming_a_remote_updates_branch_related_configuration_entries(void) -{ - git_strarray problems = {0}; - - assert_config_entry_value(_repo, "branch.master.remote", "test"); - - cl_git_pass(git_remote_rename(&problems, _repo, _remote_name, "just/renamed")); - cl_assert_equal_i(0, problems.count); - git_strarray_free(&problems); - - assert_config_entry_value(_repo, "branch.master.remote", "just/renamed"); -} - -void test_network_remote_rename__renaming_a_remote_updates_default_fetchrefspec(void) -{ - git_strarray problems = {0}; - - cl_git_pass(git_remote_rename(&problems, _repo, _remote_name, "just/renamed")); - cl_assert_equal_i(0, problems.count); - git_strarray_free(&problems); - - assert_config_entry_value(_repo, "remote.just/renamed.fetch", "+refs/heads/*:refs/remotes/just/renamed/*"); -} - -void test_network_remote_rename__renaming_a_remote_without_a_fetchrefspec_doesnt_create_one(void) -{ - git_config *config; - git_remote *remote; - git_strarray problems = {0}; - - cl_git_pass(git_repository_config__weakptr(&config, _repo)); - cl_git_pass(git_config_delete_entry(config, "remote.test.fetch")); - - cl_git_pass(git_remote_lookup(&remote, _repo, "test")); - git_remote_free(remote); - - assert_config_entry_existence(_repo, "remote.test.fetch", false); - - cl_git_pass(git_remote_rename(&problems, _repo, _remote_name, "just/renamed")); - cl_assert_equal_i(0, problems.count); - git_strarray_free(&problems); - - assert_config_entry_existence(_repo, "remote.just/renamed.fetch", false); -} - -void test_network_remote_rename__renaming_a_remote_notifies_of_non_default_fetchrefspec(void) -{ - git_config *config; - git_remote *remote; - git_strarray problems = {0}; - - cl_git_pass(git_repository_config__weakptr(&config, _repo)); - cl_git_pass(git_config_set_string(config, "remote.test.fetch", "+refs/*:refs/*")); - cl_git_pass(git_remote_lookup(&remote, _repo, "test")); - git_remote_free(remote); - - cl_git_pass(git_remote_rename(&problems, _repo, _remote_name, "just/renamed")); - cl_assert_equal_i(1, problems.count); - cl_assert_equal_s("+refs/*:refs/*", problems.strings[0]); - git_strarray_free(&problems); - - assert_config_entry_value(_repo, "remote.just/renamed.fetch", "+refs/*:refs/*"); - - git_strarray_free(&problems); -} - -void test_network_remote_rename__new_name_can_contain_dots(void) -{ - git_strarray problems = {0}; - - cl_git_pass(git_remote_rename(&problems, _repo, _remote_name, "just.renamed")); - cl_assert_equal_i(0, problems.count); - git_strarray_free(&problems); - assert_config_entry_existence(_repo, "remote.just.renamed.fetch", true); -} - -void test_network_remote_rename__new_name_must_conform_to_reference_naming_conventions(void) -{ - git_strarray problems = {0}; - - cl_assert_equal_i( - GIT_EINVALIDSPEC, - git_remote_rename(&problems, _repo, _remote_name, "new@{name")); -} - -void test_network_remote_rename__renamed_name_is_persisted(void) -{ - git_remote *renamed; - git_repository *another_repo; - git_strarray problems = {0}; - - cl_git_fail(git_remote_lookup(&renamed, _repo, "just/renamed")); - - cl_git_pass(git_remote_rename(&problems, _repo, _remote_name, "just/renamed")); - cl_assert_equal_i(0, problems.count); - git_strarray_free(&problems); - - cl_git_pass(git_repository_open(&another_repo, "testrepo.git")); - cl_git_pass(git_remote_lookup(&renamed, _repo, "just/renamed")); - - git_remote_free(renamed); - git_repository_free(another_repo); -} - -void test_network_remote_rename__cannot_overwrite_an_existing_remote(void) -{ - git_strarray problems = {0}; - - cl_assert_equal_i(GIT_EEXISTS, git_remote_rename(&problems, _repo, _remote_name, "test")); - cl_assert_equal_i(GIT_EEXISTS, git_remote_rename(&problems, _repo, _remote_name, "test_with_pushurl")); -} - -void test_network_remote_rename__renaming_a_remote_moves_the_underlying_reference(void) -{ - git_reference *underlying; - git_strarray problems = {0}; - - cl_assert_equal_i(GIT_ENOTFOUND, git_reference_lookup(&underlying, _repo, "refs/remotes/just/renamed")); - cl_git_pass(git_reference_lookup(&underlying, _repo, "refs/remotes/test/master")); - git_reference_free(underlying); - - cl_git_pass(git_remote_rename(&problems, _repo, _remote_name, "just/renamed")); - cl_assert_equal_i(0, problems.count); - git_strarray_free(&problems); - - cl_assert_equal_i(GIT_ENOTFOUND, git_reference_lookup(&underlying, _repo, "refs/remotes/test/master")); - cl_git_pass(git_reference_lookup(&underlying, _repo, "refs/remotes/just/renamed/master")); - git_reference_free(underlying); -} - -void test_network_remote_rename__overwrite_ref_in_target(void) -{ - git_oid id; - char idstr[GIT_OID_HEXSZ + 1] = {0}; - git_reference *ref; - git_branch_t btype; - git_branch_iterator *iter; - git_strarray problems = {0}; - - cl_git_pass(git_oid_fromstr(&id, "a65fedf39aefe402d3bb6e24df4d4f5fe4547750")); - cl_git_pass(git_reference_create(&ref, _repo, "refs/remotes/renamed/master", &id, 1, NULL)); - git_reference_free(ref); - - cl_git_pass(git_remote_rename(&problems, _repo, _remote_name, "renamed")); - cl_assert_equal_i(0, problems.count); - git_strarray_free(&problems); - - /* make sure there's only one remote-tracking branch */ - cl_git_pass(git_branch_iterator_new(&iter, _repo, GIT_BRANCH_REMOTE)); - cl_git_pass(git_branch_next(&ref, &btype, iter)); - cl_assert_equal_s("refs/remotes/renamed/master", git_reference_name(ref)); - git_oid_fmt(idstr, git_reference_target(ref)); - cl_assert_equal_s("be3563ae3f795b2b4353bcce3a527ad0a4f7f644", idstr); - git_reference_free(ref); - - cl_git_fail_with(GIT_ITEROVER, git_branch_next(&ref, &btype, iter)); - git_branch_iterator_free(iter); -} - -void test_network_remote_rename__nonexistent_returns_enotfound(void) -{ - git_strarray problems = {0}; - - int err = git_remote_rename(&problems, _repo, "nonexistent", "renamed"); - - cl_assert_equal_i(GIT_ENOTFOUND, err); -} - -void test_network_remote_rename__symref_head(void) -{ - int error; - git_reference *ref; - git_branch_t btype; - git_branch_iterator *iter; - git_strarray problems = {0}; - char idstr[GIT_OID_HEXSZ + 1] = {0}; - git_vector refs; - - cl_git_pass(git_reference_symbolic_create(&ref, _repo, "refs/remotes/test/HEAD", "refs/remotes/test/master", 0, NULL)); - git_reference_free(ref); - - cl_git_pass(git_remote_rename(&problems, _repo, _remote_name, "renamed")); - cl_assert_equal_i(0, problems.count); - git_strarray_free(&problems); - - cl_git_pass(git_vector_init(&refs, 2, (git_vector_cmp) git_reference_cmp)); - cl_git_pass(git_branch_iterator_new(&iter, _repo, GIT_BRANCH_REMOTE)); - - while ((error = git_branch_next(&ref, &btype, iter)) == 0) { - cl_git_pass(git_vector_insert(&refs, ref)); - } - cl_assert_equal_i(GIT_ITEROVER, error); - git_vector_sort(&refs); - - cl_assert_equal_i(2, refs.length); - - ref = git_vector_get(&refs, 0); - cl_assert_equal_s("refs/remotes/renamed/HEAD", git_reference_name(ref)); - cl_assert_equal_s("refs/remotes/renamed/master", git_reference_symbolic_target(ref)); - git_reference_free(ref); - - ref = git_vector_get(&refs, 1); - cl_assert_equal_s("refs/remotes/renamed/master", git_reference_name(ref)); - git_oid_fmt(idstr, git_reference_target(ref)); - cl_assert_equal_s("be3563ae3f795b2b4353bcce3a527ad0a4f7f644", idstr); - git_reference_free(ref); - - git_vector_free(&refs); - - cl_git_fail_with(GIT_ITEROVER, git_branch_next(&ref, &btype, iter)); - git_branch_iterator_free(iter); -} diff --git a/vendor/libgit2/tests/network/urlparse.c b/vendor/libgit2/tests/network/urlparse.c deleted file mode 100644 index b3ac8ae60..000000000 --- a/vendor/libgit2/tests/network/urlparse.c +++ /dev/null @@ -1,211 +0,0 @@ -#include "clar_libgit2.h" -#include "netops.h" - -static char *host, *port, *path, *user, *pass; -static gitno_connection_data conndata; - -void test_network_urlparse__initialize(void) -{ - host = port = path = user = pass = NULL; - memset(&conndata, 0, sizeof(conndata)); -} - -void test_network_urlparse__cleanup(void) -{ -#define FREE_AND_NULL(x) if (x) { git__free(x); x = NULL; } - FREE_AND_NULL(host); - FREE_AND_NULL(port); - FREE_AND_NULL(path); - FREE_AND_NULL(user); - FREE_AND_NULL(pass); - - gitno_connection_data_free_ptrs(&conndata); -} - -void test_network_urlparse__trivial(void) -{ - cl_git_pass(gitno_extract_url_parts(&host, &port, &path, &user, &pass, - "http://example.com/resource", "8080")); - cl_assert_equal_s(host, "example.com"); - cl_assert_equal_s(port, "8080"); - cl_assert_equal_s(path, "/resource"); - cl_assert_equal_p(user, NULL); - cl_assert_equal_p(pass, NULL); -} - -void test_network_urlparse__root(void) -{ - cl_git_pass(gitno_extract_url_parts(&host, &port, &path, &user, &pass, - "http://example.com/", "8080")); - cl_assert_equal_s(host, "example.com"); - cl_assert_equal_s(port, "8080"); - cl_assert_equal_s(path, "/"); - cl_assert_equal_p(user, NULL); - cl_assert_equal_p(pass, NULL); -} - -void test_network_urlparse__just_hostname(void) -{ - cl_git_fail_with(GIT_EINVALIDSPEC, - gitno_extract_url_parts(&host, &port, &path, &user, &pass, - "http://example.com", "8080")); -} - -void test_network_urlparse__encoded_password(void) -{ - cl_git_pass(gitno_extract_url_parts(&host, &port, &path, &user, &pass, - "https://user:pass%2fis%40bad@hostname.com:1234/", "1")); - cl_assert_equal_s(host, "hostname.com"); - cl_assert_equal_s(port, "1234"); - cl_assert_equal_s(path, "/"); - cl_assert_equal_s(user, "user"); - cl_assert_equal_s(pass, "pass/is@bad"); -} - -void test_network_urlparse__user(void) -{ - cl_git_pass(gitno_extract_url_parts(&host, &port, &path, &user, &pass, - "https://user@example.com/resource", "8080")); - cl_assert_equal_s(host, "example.com"); - cl_assert_equal_s(port, "8080"); - cl_assert_equal_s(path, "/resource"); - cl_assert_equal_s(user, "user"); - cl_assert_equal_p(pass, NULL); -} - -void test_network_urlparse__user_pass(void) -{ - /* user:pass@hostname.tld/resource */ - cl_git_pass(gitno_extract_url_parts(&host, &port, &path, &user, &pass, - "https://user:pass@example.com/resource", "8080")); - cl_assert_equal_s(host, "example.com"); - cl_assert_equal_s(port, "8080"); - cl_assert_equal_s(path, "/resource"); - cl_assert_equal_s(user, "user"); - cl_assert_equal_s(pass, "pass"); -} - -void test_network_urlparse__port(void) -{ - /* hostname.tld:port/resource */ - cl_git_pass(gitno_extract_url_parts(&host, &port, &path, &user, &pass, - "https://example.com:9191/resource", "8080")); - cl_assert_equal_s(host, "example.com"); - cl_assert_equal_s(port, "9191"); - cl_assert_equal_s(path, "/resource"); - cl_assert_equal_p(user, NULL); - cl_assert_equal_p(pass, NULL); -} - -void test_network_urlparse__user_port(void) -{ - /* user@hostname.tld:port/resource */ - cl_git_pass(gitno_extract_url_parts(&host, &port, &path, &user, &pass, - "https://user@example.com:9191/resource", "8080")); - cl_assert_equal_s(host, "example.com"); - cl_assert_equal_s(port, "9191"); - cl_assert_equal_s(path, "/resource"); - cl_assert_equal_s(user, "user"); - cl_assert_equal_p(pass, NULL); -} - -void test_network_urlparse__user_pass_port(void) -{ - /* user:pass@hostname.tld:port/resource */ - cl_git_pass(gitno_extract_url_parts(&host, &port, &path, &user, &pass, - "https://user:pass@example.com:9191/resource", "8080")); - cl_assert_equal_s(host, "example.com"); - cl_assert_equal_s(port, "9191"); - cl_assert_equal_s(path, "/resource"); - cl_assert_equal_s(user, "user"); - cl_assert_equal_s(pass, "pass"); -} - -void test_network_urlparse__connection_data_http(void) -{ - cl_git_pass(gitno_connection_data_from_url(&conndata, - "http://example.com/foo/bar/baz", "bar/baz")); - cl_assert_equal_s(conndata.host, "example.com"); - cl_assert_equal_s(conndata.port, "80"); - cl_assert_equal_s(conndata.path, "/foo/"); - cl_assert_equal_p(conndata.user, NULL); - cl_assert_equal_p(conndata.pass, NULL); - cl_assert_equal_i(conndata.use_ssl, false); -} - -void test_network_urlparse__connection_data_ssl(void) -{ - cl_git_pass(gitno_connection_data_from_url(&conndata, - "https://example.com/foo/bar/baz", "bar/baz")); - cl_assert_equal_s(conndata.host, "example.com"); - cl_assert_equal_s(conndata.port, "443"); - cl_assert_equal_s(conndata.path, "/foo/"); - cl_assert_equal_p(conndata.user, NULL); - cl_assert_equal_p(conndata.pass, NULL); - cl_assert_equal_i(conndata.use_ssl, true); -} - -void test_network_urlparse__encoded_username_password(void) -{ - cl_git_pass(gitno_connection_data_from_url(&conndata, - "https://user%2fname:pass%40word%zyx%v@example.com/foo/bar/baz", "bar/baz")); - cl_assert_equal_s(conndata.host, "example.com"); - cl_assert_equal_s(conndata.port, "443"); - cl_assert_equal_s(conndata.path, "/foo/"); - cl_assert_equal_s(conndata.user, "user/name"); - cl_assert_equal_s(conndata.pass, "pass@word%zyx%v"); - cl_assert_equal_i(conndata.use_ssl, true); -} - -void test_network_urlparse__connection_data_cross_host_redirect(void) -{ - conndata.host = git__strdup("bar.com"); - cl_git_fail_with(gitno_connection_data_from_url(&conndata, - "https://foo.com/bar/baz", NULL), - -1); -} - -void test_network_urlparse__connection_data_http_downgrade(void) -{ - conndata.use_ssl = true; - cl_git_fail_with(gitno_connection_data_from_url(&conndata, - "http://foo.com/bar/baz", NULL), - -1); -} - -void test_network_urlparse__connection_data_relative_redirect(void) -{ - cl_git_pass(gitno_connection_data_from_url(&conndata, - "http://foo.com/bar/baz/biff", NULL)); - cl_git_pass(gitno_connection_data_from_url(&conndata, - "/zap/baz/biff?bam", NULL)); - cl_assert_equal_s(conndata.host, "foo.com"); - cl_assert_equal_s(conndata.port, "80"); - cl_assert_equal_s(conndata.path, "/zap/baz/biff?bam"); - cl_assert_equal_p(conndata.user, NULL); - cl_assert_equal_p(conndata.pass, NULL); - cl_assert_equal_i(conndata.use_ssl, false); -} - -void test_network_urlparse__connection_data_relative_redirect_ssl(void) -{ - cl_git_pass(gitno_connection_data_from_url(&conndata, - "https://foo.com/bar/baz/biff", NULL)); - cl_git_pass(gitno_connection_data_from_url(&conndata, - "/zap/baz/biff?bam", NULL)); - cl_assert_equal_s(conndata.host, "foo.com"); - cl_assert_equal_s(conndata.port, "443"); - cl_assert_equal_s(conndata.path, "/zap/baz/biff?bam"); - cl_assert_equal_p(conndata.user, NULL); - cl_assert_equal_p(conndata.pass, NULL); - cl_assert_equal_i(conndata.use_ssl, true); -} - -/* Run this under valgrind */ -void test_network_urlparse__connection_data_cleanup(void) -{ - cl_git_pass(gitno_connection_data_from_url(&conndata, - "http://foo.com/bar/baz/biff", "baz/biff")); - cl_git_pass(gitno_connection_data_from_url(&conndata, - "https://foo.com/bar/baz/biff", "baz/biff")); -} diff --git a/vendor/libgit2/tests/notes/notes.c b/vendor/libgit2/tests/notes/notes.c deleted file mode 100644 index a91bf5bdf..000000000 --- a/vendor/libgit2/tests/notes/notes.c +++ /dev/null @@ -1,390 +0,0 @@ -#include "clar_libgit2.h" - -#include "buffer.h" - -static git_repository *_repo; -static git_signature *_sig; - -void test_notes_notes__initialize(void) -{ - _repo = cl_git_sandbox_init("testrepo.git"); - cl_git_pass(git_signature_now(&_sig, "alice", "alice@example.com")); -} - -void test_notes_notes__cleanup(void) -{ - git_signature_free(_sig); - _sig = NULL; - - cl_git_sandbox_cleanup(); -} - -static void assert_note_equal(git_note *note, char *message, git_oid *note_oid) { - git_blob *blob; - - cl_assert_equal_s(git_note_message(note), message); - cl_assert_equal_oid(git_note_id(note), note_oid); - - cl_git_pass(git_blob_lookup(&blob, _repo, note_oid)); - cl_assert_equal_s(git_note_message(note), (const char *)git_blob_rawcontent(blob)); - - git_blob_free(blob); -} - -static void create_note(git_oid *note_oid, const char *canonical_namespace, const char *target_sha, const char *message) -{ - git_oid oid; - - cl_git_pass(git_oid_fromstr(&oid, target_sha)); - cl_git_pass(git_note_create(note_oid, _repo, canonical_namespace, _sig, _sig, &oid, message, 0)); -} - -static struct { - const char *note_sha; - const char *annotated_object_sha; -} -list_expectations[] = { - { "1c73b1f51762155d357bcd1fd4f2c409ef80065b", "4a202b346bb0fb0db7eff3cffeb3c70babbd2045" }, - { "1c73b1f51762155d357bcd1fd4f2c409ef80065b", "9fd738e8f7967c078dceed8190330fc8648ee56a" }, - { "257b43746b6b46caa4aa788376c647cce0a33e2b", "a65fedf39aefe402d3bb6e24df4d4f5fe4547750" }, - { "1ec1c8e03f461f4f5d3f3702172483662e7223f3", "c47800c7266a2be04c571c04d5a6614691ea99bd" }, - { NULL, NULL } -}; - -#define EXPECTATIONS_COUNT (sizeof(list_expectations)/sizeof(list_expectations[0])) - 1 - -static int note_list_cb( - const git_oid *blob_id, const git_oid *annotated_obj_id, void *payload) -{ - git_oid expected_note_oid, expected_target_oid; - - unsigned int *count = (unsigned int *)payload; - - cl_assert(*count < EXPECTATIONS_COUNT); - - cl_git_pass(git_oid_fromstr(&expected_note_oid, list_expectations[*count].note_sha)); - cl_assert_equal_oid(&expected_note_oid, blob_id); - - cl_git_pass(git_oid_fromstr(&expected_target_oid, list_expectations[*count].annotated_object_sha)); - cl_assert_equal_oid(&expected_target_oid, annotated_obj_id); - - (*count)++; - - return 0; -} - -/* - * $ git notes --ref i-can-see-dead-notes add -m "I decorate a65f" a65fedf39aefe402d3bb6e24df4d4f5fe4547750 - * $ git notes --ref i-can-see-dead-notes add -m "I decorate c478" c47800c7266a2be04c571c04d5a6614691ea99bd - * $ git notes --ref i-can-see-dead-notes add -m "I decorate 9fd7 and 4a20" 9fd738e8f7967c078dceed8190330fc8648ee56a - * $ git notes --ref i-can-see-dead-notes add -m "I decorate 9fd7 and 4a20" 4a202b346bb0fb0db7eff3cffeb3c70babbd2045 - * - * $ git notes --ref i-can-see-dead-notes list - * 1c73b1f51762155d357bcd1fd4f2c409ef80065b 4a202b346bb0fb0db7eff3cffeb3c70babbd2045 - * 1c73b1f51762155d357bcd1fd4f2c409ef80065b 9fd738e8f7967c078dceed8190330fc8648ee56a - * 257b43746b6b46caa4aa788376c647cce0a33e2b a65fedf39aefe402d3bb6e24df4d4f5fe4547750 - * 1ec1c8e03f461f4f5d3f3702172483662e7223f3 c47800c7266a2be04c571c04d5a6614691ea99bd - * - * $ git ls-tree refs/notes/i-can-see-dead-notes - * 100644 blob 1c73b1f51762155d357bcd1fd4f2c409ef80065b 4a202b346bb0fb0db7eff3cffeb3c70babbd2045 - * 100644 blob 1c73b1f51762155d357bcd1fd4f2c409ef80065b 9fd738e8f7967c078dceed8190330fc8648ee56a - * 100644 blob 257b43746b6b46caa4aa788376c647cce0a33e2b a65fedf39aefe402d3bb6e24df4d4f5fe4547750 - * 100644 blob 1ec1c8e03f461f4f5d3f3702172483662e7223f3 c47800c7266a2be04c571c04d5a6614691ea99bd -*/ -void test_notes_notes__can_retrieve_a_list_of_notes_for_a_given_namespace(void) -{ - git_oid note_oid1, note_oid2, note_oid3, note_oid4; - unsigned int retrieved_notes = 0; - - create_note(¬e_oid1, "refs/notes/i-can-see-dead-notes", "a65fedf39aefe402d3bb6e24df4d4f5fe4547750", "I decorate a65f\n"); - create_note(¬e_oid2, "refs/notes/i-can-see-dead-notes", "c47800c7266a2be04c571c04d5a6614691ea99bd", "I decorate c478\n"); - create_note(¬e_oid3, "refs/notes/i-can-see-dead-notes", "9fd738e8f7967c078dceed8190330fc8648ee56a", "I decorate 9fd7 and 4a20\n"); - create_note(¬e_oid4, "refs/notes/i-can-see-dead-notes", "4a202b346bb0fb0db7eff3cffeb3c70babbd2045", "I decorate 9fd7 and 4a20\n"); - - cl_git_pass(git_note_foreach -(_repo, "refs/notes/i-can-see-dead-notes", note_list_cb, &retrieved_notes)); - - cl_assert_equal_i(4, retrieved_notes); -} - -static int note_cancel_cb( - const git_oid *blob_id, const git_oid *annotated_obj_id, void *payload) -{ - unsigned int *count = (unsigned int *)payload; - - GIT_UNUSED(blob_id); - GIT_UNUSED(annotated_obj_id); - - (*count)++; - - return (*count > 2); -} - -void test_notes_notes__can_cancel_foreach(void) -{ - git_oid note_oid1, note_oid2, note_oid3, note_oid4; - unsigned int retrieved_notes = 0; - - create_note(¬e_oid1, "refs/notes/i-can-see-dead-notes", "a65fedf39aefe402d3bb6e24df4d4f5fe4547750", "I decorate a65f\n"); - create_note(¬e_oid2, "refs/notes/i-can-see-dead-notes", "c47800c7266a2be04c571c04d5a6614691ea99bd", "I decorate c478\n"); - create_note(¬e_oid3, "refs/notes/i-can-see-dead-notes", "9fd738e8f7967c078dceed8190330fc8648ee56a", "I decorate 9fd7 and 4a20\n"); - create_note(¬e_oid4, "refs/notes/i-can-see-dead-notes", "4a202b346bb0fb0db7eff3cffeb3c70babbd2045", "I decorate 9fd7 and 4a20\n"); - - cl_assert_equal_i( - 1, - git_note_foreach(_repo, "refs/notes/i-can-see-dead-notes", - note_cancel_cb, &retrieved_notes)); -} - -void test_notes_notes__retrieving_a_list_of_notes_for_an_unknown_namespace_returns_ENOTFOUND(void) -{ - int error; - unsigned int retrieved_notes = 0; - - error = git_note_foreach(_repo, "refs/notes/i-am-not", note_list_cb, &retrieved_notes); - cl_git_fail(error); - cl_assert_equal_i(GIT_ENOTFOUND, error); - - cl_assert_equal_i(0, retrieved_notes); -} - -void test_notes_notes__inserting_a_note_without_passing_a_namespace_uses_the_default_namespace(void) -{ - git_oid note_oid, target_oid; - git_note *note, *default_namespace_note; - git_buf default_ref = GIT_BUF_INIT; - - cl_git_pass(git_oid_fromstr(&target_oid, "08b041783f40edfe12bb406c9c9a8a040177c125")); - cl_git_pass(git_note_default_ref(&default_ref, _repo)); - - create_note(¬e_oid, NULL, "08b041783f40edfe12bb406c9c9a8a040177c125", "hello world\n"); - - cl_git_pass(git_note_read(¬e, _repo, NULL, &target_oid)); - cl_git_pass(git_note_read(&default_namespace_note, _repo, git_buf_cstr(&default_ref), &target_oid)); - - assert_note_equal(note, "hello world\n", ¬e_oid); - assert_note_equal(default_namespace_note, "hello world\n", ¬e_oid); - - git_buf_free(&default_ref); - git_note_free(note); - git_note_free(default_namespace_note); -} - -void test_notes_notes__can_insert_a_note_with_a_custom_namespace(void) -{ - git_oid note_oid, target_oid; - git_note *note; - - cl_git_pass(git_oid_fromstr(&target_oid, "08b041783f40edfe12bb406c9c9a8a040177c125")); - - create_note(¬e_oid, "refs/notes/some/namespace", "08b041783f40edfe12bb406c9c9a8a040177c125", "hello world on a custom namespace\n"); - - cl_git_pass(git_note_read(¬e, _repo, "refs/notes/some/namespace", &target_oid)); - - assert_note_equal(note, "hello world on a custom namespace\n", ¬e_oid); - - git_note_free(note); -} - -/* - * $ git notes --ref fanout list 8496071c1b46c854b31185ea97743be6a8774479 - * 08b041783f40edfe12bb406c9c9a8a040177c125 - */ -void test_notes_notes__creating_a_note_on_a_target_which_already_has_one_returns_EEXISTS(void) -{ - int error; - git_oid note_oid, target_oid; - - cl_git_pass(git_oid_fromstr(&target_oid, "08b041783f40edfe12bb406c9c9a8a040177c125")); - - create_note(¬e_oid, NULL, "08b041783f40edfe12bb406c9c9a8a040177c125", "hello world\n"); - error = git_note_create(¬e_oid, _repo, NULL, _sig, _sig, &target_oid, "hello world\n", 0); - cl_git_fail(error); - cl_assert_equal_i(GIT_EEXISTS, error); - - create_note(¬e_oid, "refs/notes/some/namespace", "08b041783f40edfe12bb406c9c9a8a040177c125", "hello world\n"); - error = git_note_create(¬e_oid, _repo, "refs/notes/some/namespace", _sig, _sig, &target_oid, "hello world\n", 0); - cl_git_fail(error); - cl_assert_equal_i(GIT_EEXISTS, error); -} - - -void test_notes_notes__creating_a_note_on_a_target_can_overwrite_existing_note(void) -{ - git_oid note_oid, target_oid; - git_note *note, *namespace_note; - - cl_git_pass(git_oid_fromstr(&target_oid, "08b041783f40edfe12bb406c9c9a8a040177c125")); - - create_note(¬e_oid, NULL, "08b041783f40edfe12bb406c9c9a8a040177c125", "hello old world\n"); - cl_git_pass(git_note_create(¬e_oid, _repo, NULL, _sig, _sig, &target_oid, "hello new world\n", 1)); - - cl_git_pass(git_note_read(¬e, _repo, NULL, &target_oid)); - assert_note_equal(note, "hello new world\n", ¬e_oid); - - create_note(¬e_oid, "refs/notes/some/namespace", "08b041783f40edfe12bb406c9c9a8a040177c125", "hello old world\n"); - cl_git_pass(git_note_create(¬e_oid, _repo, "refs/notes/some/namespace", _sig, _sig, &target_oid, "hello new ref world\n", 1)); - - cl_git_pass(git_note_read(&namespace_note, _repo, "refs/notes/some/namespace", &target_oid)); - assert_note_equal(namespace_note, "hello new ref world\n", ¬e_oid); - - git_note_free(note); - git_note_free(namespace_note); -} - -static char *messages[] = { - "08c041783f40edfe12bb406c9c9a8a040177c125", - "96c45fbe09ab7445fc7c60fd8d17f32494399343", - "48cc7e38dcfc1ec87e70ec03e08c3e83d7a16aa1", - "24c3eaafb681c3df668f9df96f58e7b8c756eb04", - "96ca1b6ccc7858ae94684777f85ac0e7447f7040", - "7ac2db4378a08bb244a427c357e0082ee0d57ac6", - "e6cba23dbf4ef84fe35e884f017f4e24dc228572", - "c8cf3462c7d8feba716deeb2ebe6583bd54589e2", - "39c16b9834c2d665ac5f68ad91dc5b933bad8549", - "f3c582b1397df6a664224ebbaf9d4cc952706597", - "29cec67037fe8e89977474988219016ae7f342a6", - "36c4cd238bf8e82e27b740e0741b025f2e8c79ab", - "f1c45a47c02e01d5a9a326f1d9f7f756373387f8", - "4aca84406f5daee34ab513a60717c8d7b1763ead", - "84ce167da452552f63ed8407b55d5ece4901845f", - NULL -}; - -#define MESSAGES_COUNT (sizeof(messages)/sizeof(messages[0])) - 1 - -/* - * $ git ls-tree refs/notes/fanout - * 040000 tree 4b22b35d44b5a4f589edf3dc89196399771796ea 84 - * - * $ git ls-tree 4b22b35 - * 040000 tree d71aab4f9b04b45ce09bcaa636a9be6231474759 96 - * - * $ git ls-tree d71aab4 - * 100644 blob 08b041783f40edfe12bb406c9c9a8a040177c125 071c1b46c854b31185ea97743be6a8774479 - */ -void test_notes_notes__can_insert_a_note_in_an_existing_fanout(void) -{ - size_t i; - git_oid note_oid, target_oid; - git_note *_note; - - cl_git_pass(git_oid_fromstr(&target_oid, "08b041783f40edfe12bb406c9c9a8a040177c125")); - - for (i = 0; i < MESSAGES_COUNT; i++) { - cl_git_pass(git_note_create(¬e_oid, _repo, "refs/notes/fanout", _sig, _sig, &target_oid, messages[i], 0)); - cl_git_pass(git_note_read(&_note, _repo, "refs/notes/fanout", &target_oid)); - git_note_free(_note); - - git_oid_cpy(&target_oid, ¬e_oid); - } -} - -/* - * $ git notes --ref fanout list 8496071c1b46c854b31185ea97743be6a8774479 - * 08b041783f40edfe12bb406c9c9a8a040177c125 - */ -void test_notes_notes__can_read_a_note_in_an_existing_fanout(void) -{ - git_oid note_oid, target_oid; - git_note *note; - - cl_git_pass(git_oid_fromstr(&target_oid, "8496071c1b46c854b31185ea97743be6a8774479")); - cl_git_pass(git_note_read(¬e, _repo, "refs/notes/fanout", &target_oid)); - - cl_git_pass(git_oid_fromstr(¬e_oid, "08b041783f40edfe12bb406c9c9a8a040177c125")); - cl_assert_equal_oid(git_note_id(note), ¬e_oid); - - git_note_free(note); -} - -void test_notes_notes__can_remove_a_note_in_an_existing_fanout(void) -{ - git_oid target_oid; - git_note *note; - - cl_git_pass(git_oid_fromstr(&target_oid, "8496071c1b46c854b31185ea97743be6a8774479")); - cl_git_pass(git_note_remove(_repo, "refs/notes/fanout", _sig, _sig, &target_oid)); - - cl_git_fail(git_note_read(¬e, _repo, "refs/notes/fanout", &target_oid)); -} - -void test_notes_notes__removing_a_note_which_doesnt_exists_returns_ENOTFOUND(void) -{ - int error; - git_oid target_oid; - - cl_git_pass(git_oid_fromstr(&target_oid, "8496071c1b46c854b31185ea97743be6a8774479")); - cl_git_pass(git_note_remove(_repo, "refs/notes/fanout", _sig, _sig, &target_oid)); - - error = git_note_remove(_repo, "refs/notes/fanout", _sig, _sig, &target_oid); - cl_git_fail(error); - cl_assert_equal_i(GIT_ENOTFOUND, error); -} - -void test_notes_notes__can_iterate_default_namespace(void) -{ - git_note_iterator *iter; - git_note *note; - git_oid note_id, annotated_id; - git_oid note_created[2]; - const char* note_message[] = { - "I decorate a65f\n", - "I decorate c478\n" - }; - int i, err; - - create_note(¬e_created[0], "refs/notes/commits", - "a65fedf39aefe402d3bb6e24df4d4f5fe4547750", note_message[0]); - create_note(¬e_created[1], "refs/notes/commits", - "c47800c7266a2be04c571c04d5a6614691ea99bd", note_message[1]); - - cl_git_pass(git_note_iterator_new(&iter, _repo, NULL)); - - for (i = 0; (err = git_note_next(¬e_id, &annotated_id, iter)) >= 0; ++i) { - cl_git_pass(git_note_read(¬e, _repo, NULL, &annotated_id)); - cl_assert_equal_s(git_note_message(note), note_message[i]); - git_note_free(note); - } - - cl_assert_equal_i(GIT_ITEROVER, err); - cl_assert_equal_i(2, i); - git_note_iterator_free(iter); -} - -void test_notes_notes__can_iterate_custom_namespace(void) -{ - git_note_iterator *iter; - git_note *note; - git_oid note_id, annotated_id; - git_oid note_created[2]; - const char* note_message[] = { - "I decorate a65f\n", - "I decorate c478\n" - }; - int i, err; - - create_note(¬e_created[0], "refs/notes/beer", - "a65fedf39aefe402d3bb6e24df4d4f5fe4547750", note_message[0]); - create_note(¬e_created[1], "refs/notes/beer", - "c47800c7266a2be04c571c04d5a6614691ea99bd", note_message[1]); - - cl_git_pass(git_note_iterator_new(&iter, _repo, "refs/notes/beer")); - - for (i = 0; (err = git_note_next(¬e_id, &annotated_id, iter)) >= 0; ++i) { - cl_git_pass(git_note_read(¬e, _repo, "refs/notes/beer", &annotated_id)); - cl_assert_equal_s(git_note_message(note), note_message[i]); - git_note_free(note); - } - - cl_assert_equal_i(GIT_ITEROVER, err); - cl_assert_equal_i(2, i); - git_note_iterator_free(iter); -} - -void test_notes_notes__empty_iterate(void) -{ - git_note_iterator *iter; - - cl_git_fail(git_note_iterator_new(&iter, _repo, "refs/notes/commits")); -} diff --git a/vendor/libgit2/tests/notes/notesref.c b/vendor/libgit2/tests/notes/notesref.c deleted file mode 100644 index 4159ddc0d..000000000 --- a/vendor/libgit2/tests/notes/notesref.c +++ /dev/null @@ -1,68 +0,0 @@ -#include "clar_libgit2.h" - -#include "notes.h" -#include "buffer.h" - -static git_repository *_repo; -static git_note *_note; -static git_signature *_sig; -static git_config *_cfg; - -void test_notes_notesref__initialize(void) -{ - cl_fixture_sandbox("testrepo.git"); - cl_git_pass(git_repository_open(&_repo, "testrepo.git")); -} - -void test_notes_notesref__cleanup(void) -{ - git_note_free(_note); - _note = NULL; - - git_signature_free(_sig); - _sig = NULL; - - git_config_free(_cfg); - _cfg = NULL; - - git_repository_free(_repo); - _repo = NULL; - - cl_fixture_cleanup("testrepo.git"); -} - -void test_notes_notesref__config_corenotesref(void) -{ - git_oid oid, note_oid; - git_buf default_ref = GIT_BUF_INIT; - - cl_git_pass(git_signature_now(&_sig, "alice", "alice@example.com")); - cl_git_pass(git_oid_fromstr(&oid, "8496071c1b46c854b31185ea97743be6a8774479")); - - cl_git_pass(git_repository_config(&_cfg, _repo)); - - cl_git_pass(git_config_set_string(_cfg, "core.notesRef", "refs/notes/mydefaultnotesref")); - - cl_git_pass(git_note_create(¬e_oid, _repo, NULL, _sig, _sig, &oid, "test123test\n", 0)); - - cl_git_pass(git_note_read(&_note, _repo, NULL, &oid)); - cl_assert_equal_s("test123test\n", git_note_message(_note)); - cl_assert_equal_oid(git_note_id(_note), ¬e_oid); - - git_note_free(_note); - - cl_git_pass(git_note_read(&_note, _repo, "refs/notes/mydefaultnotesref", &oid)); - cl_assert_equal_s("test123test\n", git_note_message(_note)); - cl_assert_equal_oid(git_note_id(_note), ¬e_oid); - - cl_git_pass(git_note_default_ref(&default_ref, _repo)); - cl_assert_equal_s("refs/notes/mydefaultnotesref", default_ref.ptr); - git_buf_clear(&default_ref); - - cl_git_pass(git_config_delete_entry(_cfg, "core.notesRef")); - - cl_git_pass(git_note_default_ref(&default_ref, _repo)); - cl_assert_equal_s(GIT_NOTES_DEFAULT_REF, default_ref.ptr); - - git_buf_free(&default_ref); -} diff --git a/vendor/libgit2/tests/object/blob/filter.c b/vendor/libgit2/tests/object/blob/filter.c deleted file mode 100644 index 0aaaee6f3..000000000 --- a/vendor/libgit2/tests/object/blob/filter.c +++ /dev/null @@ -1,150 +0,0 @@ -#include "clar_libgit2.h" -#include "posix.h" -#include "blob.h" -#include "buf_text.h" - -static git_repository *g_repo = NULL; - -#define CRLF_NUM_TEST_OBJECTS 9 - -static const char *g_crlf_raw[CRLF_NUM_TEST_OBJECTS] = { - "", - "foo\nbar\n", - "foo\rbar\r", - "foo\r\nbar\r\n", - "foo\nbar\rboth\r\nreversed\n\ragain\nproblems\r", - "123\n\000\001\002\003\004abc\255\254\253\r\n", - "\xEF\xBB\xBFThis is UTF-8\n", - "\xEF\xBB\xBF\xE3\x81\xBB\xE3\x81\x92\xE3\x81\xBB\xE3\x81\x92\r\n\xE3\x81\xBB\xE3\x81\x92\xE3\x81\xBB\xE3\x81\x92\r\n", - "\xFE\xFF\x00T\x00h\x00i\x00s\x00!" -}; - -static git_off_t g_crlf_raw_len[CRLF_NUM_TEST_OBJECTS] = { - -1, -1, -1, -1, -1, 17, -1, -1, 12 -}; - -static git_oid g_crlf_oids[CRLF_NUM_TEST_OBJECTS]; - -static git_buf g_crlf_filtered[CRLF_NUM_TEST_OBJECTS] = { - { "", 0, 0 }, - { "foo\nbar\n", 0, 8 }, - { "foo\rbar\r", 0, 8 }, - { "foo\nbar\n", 0, 8 }, - { "foo\nbar\rboth\nreversed\n\ragain\nproblems\r", 0, 38 }, - { "123\n\000\001\002\003\004abc\255\254\253\n", 0, 16 }, - { "\xEF\xBB\xBFThis is UTF-8\n", 0, 17 }, - { "\xEF\xBB\xBF\xE3\x81\xBB\xE3\x81\x92\xE3\x81\xBB\xE3\x81\x92\n\xE3\x81\xBB\xE3\x81\x92\xE3\x81\xBB\xE3\x81\x92\n", 0, 29 }, - { "\xFE\xFF\x00T\x00h\x00i\x00s\x00!", 0, 12 } -}; - -static git_buf_text_stats g_crlf_filtered_stats[CRLF_NUM_TEST_OBJECTS] = { - { 0, 0, 0, 0, 0, 0, 0 }, - { 0, 0, 0, 2, 0, 6, 0 }, - { 0, 0, 2, 0, 0, 6, 0 }, - { 0, 0, 2, 2, 2, 6, 0 }, - { 0, 0, 4, 4, 1, 31, 0 }, - { 0, 1, 1, 2, 1, 9, 5 }, - { GIT_BOM_UTF8, 0, 0, 1, 0, 16, 0 }, - { GIT_BOM_UTF8, 0, 2, 2, 2, 27, 0 }, - { GIT_BOM_UTF16_BE, 5, 0, 0, 0, 7, 5 }, -}; - -void test_object_blob_filter__initialize(void) -{ - int i; - - g_repo = cl_git_sandbox_init("empty_standard_repo"); - - for (i = 0; i < CRLF_NUM_TEST_OBJECTS; i++) { - if (g_crlf_raw_len[i] < 0) - g_crlf_raw_len[i] = strlen(g_crlf_raw[i]); - - cl_git_pass(git_blob_create_frombuffer( - &g_crlf_oids[i], g_repo, g_crlf_raw[i], (size_t)g_crlf_raw_len[i])); - } -} - -void test_object_blob_filter__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -void test_object_blob_filter__unfiltered(void) -{ - int i; - git_blob *blob; - - for (i = 0; i < CRLF_NUM_TEST_OBJECTS; i++) { - size_t raw_len = (size_t)g_crlf_raw_len[i]; - - cl_git_pass(git_blob_lookup(&blob, g_repo, &g_crlf_oids[i])); - - cl_assert_equal_sz(raw_len, (size_t)git_blob_rawsize(blob)); - cl_assert_equal_i( - 0, memcmp(g_crlf_raw[i], git_blob_rawcontent(blob), raw_len)); - - git_blob_free(blob); - } -} - -void test_object_blob_filter__stats(void) -{ - int i; - git_blob *blob; - git_buf buf = GIT_BUF_INIT; - git_buf_text_stats stats; - - for (i = 0; i < CRLF_NUM_TEST_OBJECTS; i++) { - cl_git_pass(git_blob_lookup(&blob, g_repo, &g_crlf_oids[i])); - cl_git_pass(git_blob__getbuf(&buf, blob)); - git_buf_text_gather_stats(&stats, &buf, false); - cl_assert_equal_i( - 0, memcmp(&g_crlf_filtered_stats[i], &stats, sizeof(stats))); - git_blob_free(blob); - } - - git_buf_free(&buf); -} - -void test_object_blob_filter__to_odb(void) -{ - git_filter_list *fl = NULL; - git_config *cfg; - int i; - git_blob *blob; - git_buf out = GIT_BUF_INIT, zeroed; - - cl_git_pass(git_repository_config(&cfg, g_repo)); - cl_assert(cfg); - - git_attr_cache_flush(g_repo); - cl_git_append2file("empty_standard_repo/.gitattributes", "*.txt text\n"); - - cl_git_pass(git_filter_list_load( - &fl, g_repo, NULL, "filename.txt", GIT_FILTER_TO_ODB, 0)); - cl_assert(fl != NULL); - - for (i = 0; i < CRLF_NUM_TEST_OBJECTS; i++) { - cl_git_pass(git_blob_lookup(&blob, g_repo, &g_crlf_oids[i])); - - /* try once with allocated blob */ - cl_git_pass(git_filter_list_apply_to_blob(&out, fl, blob)); - cl_assert_equal_sz(g_crlf_filtered[i].size, out.size); - cl_assert_equal_i( - 0, memcmp(out.ptr, g_crlf_filtered[i].ptr, out.size)); - - /* try again with zeroed blob */ - memset(&zeroed, 0, sizeof(zeroed)); - cl_git_pass(git_filter_list_apply_to_blob(&zeroed, fl, blob)); - cl_assert_equal_sz(g_crlf_filtered[i].size, zeroed.size); - cl_assert_equal_i( - 0, memcmp(zeroed.ptr, g_crlf_filtered[i].ptr, zeroed.size)); - git_buf_free(&zeroed); - - git_blob_free(blob); - } - - git_filter_list_free(fl); - git_buf_free(&out); - git_config_free(cfg); -} diff --git a/vendor/libgit2/tests/object/blob/fromchunks.c b/vendor/libgit2/tests/object/blob/fromchunks.c deleted file mode 100644 index b61cabfe1..000000000 --- a/vendor/libgit2/tests/object/blob/fromchunks.c +++ /dev/null @@ -1,156 +0,0 @@ -#include "clar_libgit2.h" -#include "buffer.h" -#include "posix.h" -#include "path.h" -#include "fileops.h" - -static git_repository *repo; -static char textual_content[] = "libgit2\n\r\n\0"; - -void test_object_blob_fromchunks__initialize(void) -{ - repo = cl_git_sandbox_init("testrepo.git"); -} - -void test_object_blob_fromchunks__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -static int text_chunked_source_cb(char *content, size_t max_length, void *payload) -{ - int *count; - - GIT_UNUSED(max_length); - - count = (int *)payload; - (*count)--; - - if (*count == 0) - return 0; - - strcpy(content, textual_content); - return (int)strlen(textual_content); -} - -void test_object_blob_fromchunks__can_create_a_blob_from_a_in_memory_chunk_provider(void) -{ - git_oid expected_oid, oid; - git_object *blob; - int howmany = 7; - - cl_git_pass(git_oid_fromstr(&expected_oid, "321cbdf08803c744082332332838df6bd160f8f9")); - - cl_git_fail_with( - git_object_lookup(&blob, repo, &expected_oid, GIT_OBJ_ANY), - GIT_ENOTFOUND); - - cl_git_pass(git_blob_create_fromchunks(&oid, repo, NULL, text_chunked_source_cb, &howmany)); - - cl_git_pass(git_object_lookup(&blob, repo, &expected_oid, GIT_OBJ_ANY)); - cl_assert(git_oid_cmp(&expected_oid, git_object_id(blob)) == 0); - - git_object_free(blob); -} - -void test_object_blob_fromchunks__doesnot_overwrite_an_already_existing_object(void) -{ - git_buf path = GIT_BUF_INIT; - git_buf content = GIT_BUF_INIT; - git_oid expected_oid, oid; - int howmany = 7; - - cl_git_pass(git_oid_fromstr(&expected_oid, "321cbdf08803c744082332332838df6bd160f8f9")); - - cl_git_pass(git_blob_create_fromchunks(&oid, repo, NULL, text_chunked_source_cb, &howmany)); - - /* Let's replace the content of the blob file storage with something else... */ - cl_git_pass(git_buf_joinpath(&path, git_repository_path(repo), "objects/32/1cbdf08803c744082332332838df6bd160f8f9")); - cl_git_pass(p_unlink(git_buf_cstr(&path))); - cl_git_mkfile(git_buf_cstr(&path), "boom"); - - /* ...request a creation of the same blob... */ - howmany = 7; - cl_git_pass(git_blob_create_fromchunks(&oid, repo, NULL, text_chunked_source_cb, &howmany)); - - /* ...and ensure the content of the faked blob file hasn't been altered */ - cl_git_pass(git_futils_readbuffer(&content, git_buf_cstr(&path))); - cl_assert(!git__strcmp("boom", git_buf_cstr(&content))); - - git_buf_free(&path); - git_buf_free(&content); -} - -#define GITATTR "* text=auto\n" \ - "*.txt text\n" \ - "*.data binary\n" - -static void write_attributes(git_repository *repo) -{ - git_buf buf = GIT_BUF_INIT; - - cl_git_pass(git_buf_joinpath(&buf, git_repository_path(repo), "info")); - cl_git_pass(git_buf_joinpath(&buf, git_buf_cstr(&buf), "attributes")); - - cl_git_pass(git_futils_mkpath2file(git_buf_cstr(&buf), 0777)); - cl_git_rewritefile(git_buf_cstr(&buf), GITATTR); - - git_buf_free(&buf); -} - -static void assert_named_chunked_blob(const char *expected_sha, const char *fake_name) -{ - git_oid expected_oid, oid; - int howmany = 7; - - cl_git_pass(git_oid_fromstr(&expected_oid, expected_sha)); - - cl_git_pass(git_blob_create_fromchunks(&oid, repo, fake_name, text_chunked_source_cb, &howmany)); - cl_assert(git_oid_cmp(&expected_oid, &oid) == 0); -} - -void test_object_blob_fromchunks__creating_a_blob_from_chunks_honors_the_attributes_directives(void) -{ - write_attributes(repo); - - assert_named_chunked_blob("321cbdf08803c744082332332838df6bd160f8f9", "dummy.data"); - assert_named_chunked_blob("e9671e138a780833cb689753570fd10a55be84fb", "dummy.txt"); - assert_named_chunked_blob("e9671e138a780833cb689753570fd10a55be84fb", "dummy.dunno"); -} - -static int failing_chunked_source_cb( - char *content, size_t max_length, void *payload) -{ - int *count = (int *)payload; - - GIT_UNUSED(max_length); - - (*count)--; - if (*count == 0) - return -1234; - - strcpy(content, textual_content); - return (int)strlen(textual_content); -} - -void test_object_blob_fromchunks__can_stop_with_error(void) -{ - git_oid expected_oid, oid; - git_object *blob; - int howmany = 7; - - cl_git_pass(git_oid_fromstr( - &expected_oid, "321cbdf08803c744082332332838df6bd160f8f9")); - - cl_git_fail_with( - git_object_lookup(&blob, repo, &expected_oid, GIT_OBJ_ANY), - GIT_ENOTFOUND); - - cl_git_fail_with(git_blob_create_fromchunks( - &oid, repo, NULL, failing_chunked_source_cb, &howmany), -1234); - - cl_git_fail_with( - git_object_lookup(&blob, repo, &expected_oid, GIT_OBJ_ANY), - GIT_ENOTFOUND); -} - diff --git a/vendor/libgit2/tests/object/blob/write.c b/vendor/libgit2/tests/object/blob/write.c deleted file mode 100644 index 203bc67c1..000000000 --- a/vendor/libgit2/tests/object/blob/write.c +++ /dev/null @@ -1,69 +0,0 @@ -#include "clar_libgit2.h" -#include "buffer.h" -#include "posix.h" -#include "path.h" -#include "fileops.h" - -static git_repository *repo; - -#define WORKDIR "empty_standard_repo" -#define BARE_REPO "testrepo.git" -#define ELSEWHERE "elsewhere" - -typedef int (*blob_creator_fn)( - git_oid *, - git_repository *, - const char *); - -void test_object_blob_write__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -static void assert_blob_creation(const char *path_to_file, const char *blob_from_path, blob_creator_fn creator) -{ - git_oid oid; - cl_git_mkfile(path_to_file, "1..2...3... Can you hear me?\n"); - - cl_must_pass(creator(&oid, repo, blob_from_path)); - cl_assert(git_oid_streq(&oid, "da5e4f20c91c81b44a7e298f3d3fb3fe2f178e32") == 0); -} - -void test_object_blob_write__can_create_a_blob_in_a_standard_repo_from_a_file_located_in_the_working_directory(void) -{ - repo = cl_git_sandbox_init(WORKDIR); - - assert_blob_creation(WORKDIR "/test.txt", "test.txt", &git_blob_create_fromworkdir); -} - -void test_object_blob_write__can_create_a_blob_in_a_standard_repo_from_a_absolute_filepath_pointing_outside_of_the_working_directory(void) -{ - git_buf full_path = GIT_BUF_INIT; - - repo = cl_git_sandbox_init(WORKDIR); - - cl_must_pass(p_mkdir(ELSEWHERE, 0777)); - cl_must_pass(git_path_prettify_dir(&full_path, ELSEWHERE, NULL)); - cl_must_pass(git_buf_puts(&full_path, "test.txt")); - - assert_blob_creation(ELSEWHERE "/test.txt", git_buf_cstr(&full_path), &git_blob_create_fromdisk); - - git_buf_free(&full_path); - cl_must_pass(git_futils_rmdir_r(ELSEWHERE, NULL, GIT_RMDIR_REMOVE_FILES)); -} - -void test_object_blob_write__can_create_a_blob_in_a_bare_repo_from_a_absolute_filepath(void) -{ - git_buf full_path = GIT_BUF_INIT; - - repo = cl_git_sandbox_init(BARE_REPO); - - cl_must_pass(p_mkdir(ELSEWHERE, 0777)); - cl_must_pass(git_path_prettify_dir(&full_path, ELSEWHERE, NULL)); - cl_must_pass(git_buf_puts(&full_path, "test.txt")); - - assert_blob_creation(ELSEWHERE "/test.txt", git_buf_cstr(&full_path), &git_blob_create_fromdisk); - - git_buf_free(&full_path); - cl_must_pass(git_futils_rmdir_r(ELSEWHERE, NULL, GIT_RMDIR_REMOVE_FILES)); -} diff --git a/vendor/libgit2/tests/object/cache.c b/vendor/libgit2/tests/object/cache.c deleted file mode 100644 index bdf12da7a..000000000 --- a/vendor/libgit2/tests/object/cache.c +++ /dev/null @@ -1,287 +0,0 @@ -#include "clar_libgit2.h" -#include "repository.h" - -static git_repository *g_repo; - -void test_object_cache__initialize(void) -{ - g_repo = NULL; -} - -void test_object_cache__cleanup(void) -{ - git_repository_free(g_repo); - g_repo = NULL; - - git_libgit2_opts(GIT_OPT_SET_CACHE_OBJECT_LIMIT, (int)GIT_OBJ_BLOB, (size_t)0); -} - -static struct { - git_otype type; - const char *sha; -} g_data[] = { - /* HEAD */ - { GIT_OBJ_BLOB, "a8233120f6ad708f843d861ce2b7228ec4e3dec6" }, /* README */ - { GIT_OBJ_BLOB, "3697d64be941a53d4ae8f6a271e4e3fa56b022cc" }, /* branch_file.txt */ - { GIT_OBJ_BLOB, "a71586c1dfe8a71c6cbf6c129f404c5642ff31bd" }, /* new.txt */ - - /* refs/heads/subtrees */ - { GIT_OBJ_BLOB, "1385f264afb75a56a5bec74243be9b367ba4ca08" }, /* README */ - { GIT_OBJ_TREE, "f1425cef211cc08caa31e7b545ffb232acb098c3" }, /* ab */ - { GIT_OBJ_BLOB, "d6c93164c249c8000205dd4ec5cbca1b516d487f" }, /* ab/4.txt */ - { GIT_OBJ_TREE, "9a03079b8a8ee85a0bee58bf9be3da8b62414ed4" }, /* ab/c */ - { GIT_OBJ_BLOB, "270b8ea76056d5cad83af921837702d3e3c2924d" }, /* ab/c/3.txt */ - { GIT_OBJ_TREE, "b6361fc6a97178d8fc8639fdeed71c775ab52593" }, /* ab/de */ - { GIT_OBJ_BLOB, "e7b4ad382349ff96dd8199000580b9b1e2042eb0" }, /* ab/de/2.txt */ - { GIT_OBJ_TREE, "3259a6bd5b57fb9c1281bb7ed3167b50f224cb54" }, /* ab/de/fgh */ - { GIT_OBJ_BLOB, "1f67fc4386b2d171e0d21be1c447e12660561f9b" }, /* ab/de/fgh/1.txt */ - { GIT_OBJ_BLOB, "45b983be36b73c0788dc9cbcb76cbb80fc7bb057" }, /* branch_file.txt */ - { GIT_OBJ_BLOB, "fa49b077972391ad58037050f2a75f74e3671e92" }, /* new.txt */ - - /* refs/heads/chomped */ - { GIT_OBJ_BLOB, "0266163a49e280c4f5ed1e08facd36a2bd716bcf" }, /* readme.txt */ - - { 0, NULL }, - { 0, NULL } -}; - -void test_object_cache__cache_everything(void) -{ - int i, start; - git_oid oid; - git_odb_object *odb_obj; - git_object *obj; - git_odb *odb; - - git_libgit2_opts( - GIT_OPT_SET_CACHE_OBJECT_LIMIT, (int)GIT_OBJ_BLOB, (size_t)32767); - - cl_git_pass(git_repository_open(&g_repo, cl_fixture("testrepo.git"))); - cl_git_pass(git_repository_odb(&odb, g_repo)); - - start = (int)git_cache_size(&g_repo->objects); - - for (i = 0; g_data[i].sha != NULL; ++i) { - int count = (int)git_cache_size(&g_repo->objects); - - cl_git_pass(git_oid_fromstr(&oid, g_data[i].sha)); - - /* alternate between loading raw and parsed objects */ - if ((i & 1) == 0) { - cl_git_pass(git_odb_read(&odb_obj, odb, &oid)); - cl_assert(g_data[i].type == git_odb_object_type(odb_obj)); - git_odb_object_free(odb_obj); - } else { - cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJ_ANY)); - cl_assert(g_data[i].type == git_object_type(obj)); - git_object_free(obj); - } - - cl_assert_equal_i(count + 1, (int)git_cache_size(&g_repo->objects)); - } - - cl_assert_equal_i(i, (int)git_cache_size(&g_repo->objects) - start); - - git_odb_free(odb); - - for (i = 0; g_data[i].sha != NULL; ++i) { - int count = (int)git_cache_size(&g_repo->objects); - - cl_git_pass(git_oid_fromstr(&oid, g_data[i].sha)); - cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJ_ANY)); - cl_assert(g_data[i].type == git_object_type(obj)); - git_object_free(obj); - - cl_assert_equal_i(count, (int)git_cache_size(&g_repo->objects)); - } -} - -void test_object_cache__cache_no_blobs(void) -{ - int i, start, nonblobs = 0; - git_oid oid; - git_odb_object *odb_obj; - git_object *obj; - git_odb *odb; - - git_libgit2_opts(GIT_OPT_SET_CACHE_OBJECT_LIMIT, (int)GIT_OBJ_BLOB, (size_t)0); - - cl_git_pass(git_repository_open(&g_repo, cl_fixture("testrepo.git"))); - cl_git_pass(git_repository_odb(&odb, g_repo)); - - start = (int)git_cache_size(&g_repo->objects); - - for (i = 0; g_data[i].sha != NULL; ++i) { - int count = (int)git_cache_size(&g_repo->objects); - - cl_git_pass(git_oid_fromstr(&oid, g_data[i].sha)); - - /* alternate between loading raw and parsed objects */ - if ((i & 1) == 0) { - cl_git_pass(git_odb_read(&odb_obj, odb, &oid)); - cl_assert(g_data[i].type == git_odb_object_type(odb_obj)); - git_odb_object_free(odb_obj); - } else { - cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJ_ANY)); - cl_assert(g_data[i].type == git_object_type(obj)); - git_object_free(obj); - } - - if (g_data[i].type == GIT_OBJ_BLOB) - cl_assert_equal_i(count, (int)git_cache_size(&g_repo->objects)); - else { - cl_assert_equal_i(count + 1, (int)git_cache_size(&g_repo->objects)); - nonblobs++; - } - } - - cl_assert_equal_i(nonblobs, (int)git_cache_size(&g_repo->objects) - start); - - git_odb_free(odb); -} - -static void *cache_parsed(void *arg) -{ - int i; - git_oid oid; - git_object *obj; - - for (i = ((int *)arg)[1]; g_data[i].sha != NULL; i += 2) { - cl_git_pass(git_oid_fromstr(&oid, g_data[i].sha)); - cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJ_ANY)); - cl_assert(g_data[i].type == git_object_type(obj)); - git_object_free(obj); - } - - for (i = 0; i < ((int *)arg)[1]; i += 2) { - cl_git_pass(git_oid_fromstr(&oid, g_data[i].sha)); - cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJ_ANY)); - cl_assert(g_data[i].type == git_object_type(obj)); - git_object_free(obj); - } - - return arg; -} - -static void *cache_raw(void *arg) -{ - int i; - git_oid oid; - git_odb *odb; - git_odb_object *odb_obj; - - cl_git_pass(git_repository_odb(&odb, g_repo)); - - for (i = ((int *)arg)[1]; g_data[i].sha != NULL; i += 2) { - cl_git_pass(git_oid_fromstr(&oid, g_data[i].sha)); - cl_git_pass(git_odb_read(&odb_obj, odb, &oid)); - cl_assert(g_data[i].type == git_odb_object_type(odb_obj)); - git_odb_object_free(odb_obj); - } - - for (i = 0; i < ((int *)arg)[1]; i += 2) { - cl_git_pass(git_oid_fromstr(&oid, g_data[i].sha)); - cl_git_pass(git_odb_read(&odb_obj, odb, &oid)); - cl_assert(g_data[i].type == git_odb_object_type(odb_obj)); - git_odb_object_free(odb_obj); - } - - git_odb_free(odb); - - return arg; -} - -#define REPEAT 20 -#define THREADCOUNT 50 - -void test_object_cache__threadmania(void) -{ - int try, th, max_i; - void *data; - void *(*fn)(void *); - -#ifdef GIT_THREADS - git_thread t[THREADCOUNT]; -#endif - - for (max_i = 0; g_data[max_i].sha != NULL; ++max_i) - /* count up */; - - for (try = 0; try < REPEAT; ++try) { - - cl_git_pass(git_repository_open(&g_repo, cl_fixture("testrepo.git"))); - - for (th = 0; th < THREADCOUNT; ++th) { - data = git__malloc(2 * sizeof(int)); - - ((int *)data)[0] = th; - ((int *)data)[1] = th % max_i; - - fn = (th & 1) ? cache_parsed : cache_raw; - -#ifdef GIT_THREADS - cl_git_pass(git_thread_create(&t[th], NULL, fn, data)); -#else - cl_assert(fn(data) == data); - git__free(data); -#endif - } - -#ifdef GIT_THREADS - for (th = 0; th < THREADCOUNT; ++th) { - cl_git_pass(git_thread_join(&t[th], &data)); - cl_assert_equal_i(th, ((int *)data)[0]); - git__free(data); - } -#endif - - git_repository_free(g_repo); - g_repo = NULL; - } -} - -static void *cache_quick(void *arg) -{ - git_oid oid; - git_object *obj; - - cl_git_pass(git_oid_fromstr(&oid, g_data[4].sha)); - cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJ_ANY)); - cl_assert(g_data[4].type == git_object_type(obj)); - git_object_free(obj); - - return arg; -} - -void test_object_cache__fast_thread_rush(void) -{ - int try, th, data[THREADCOUNT*2]; -#ifdef GIT_THREADS - git_thread t[THREADCOUNT*2]; -#endif - - for (try = 0; try < REPEAT; ++try) { - cl_git_pass(git_repository_open(&g_repo, cl_fixture("testrepo.git"))); - - for (th = 0; th < THREADCOUNT*2; ++th) { - data[th] = th; -#ifdef GIT_THREADS - cl_git_pass( - git_thread_create(&t[th], NULL, cache_quick, &data[th])); -#else - cl_assert(cache_quick(&data[th]) == &data[th]); -#endif - } - -#ifdef GIT_THREADS - for (th = 0; th < THREADCOUNT*2; ++th) { - void *rval; - cl_git_pass(git_thread_join(&t[th], &rval)); - cl_assert_equal_i(th, *((int *)rval)); - } -#endif - - git_repository_free(g_repo); - g_repo = NULL; - } -} diff --git a/vendor/libgit2/tests/object/commit/commitstagedfile.c b/vendor/libgit2/tests/object/commit/commitstagedfile.c deleted file mode 100644 index 5b48519b8..000000000 --- a/vendor/libgit2/tests/object/commit/commitstagedfile.c +++ /dev/null @@ -1,219 +0,0 @@ -#include "clar_libgit2.h" -#include "posix.h" - -static git_repository *repo; - -void test_object_commit_commitstagedfile__initialize(void) -{ - cl_fixture("treebuilder"); - cl_git_pass(git_repository_init(&repo, "treebuilder/", 0)); - cl_assert(repo != NULL); -} - -void test_object_commit_commitstagedfile__cleanup(void) -{ - git_repository_free(repo); - repo = NULL; - - cl_fixture_cleanup("treebuilder"); -} - -void test_object_commit_commitstagedfile__generate_predictable_object_ids(void) -{ - git_index *index; - const git_index_entry *entry; - git_oid expected_blob_oid, tree_oid, expected_tree_oid, commit_oid, expected_commit_oid; - git_signature *signature; - git_tree *tree; - git_buf buffer; - - /* - * The test below replicates the following git scenario - * - * $ echo "test" > test.txt - * $ git hash-object test.txt - * 9daeafb9864cf43055ae93beb0afd6c7d144bfa4 - * - * $ git add . - * $ git commit -m "Initial commit" - * - * $ git log - * commit 1fe3126578fc4eca68c193e4a3a0a14a0704624d - * Author: nulltoken - * Date: Wed Dec 14 08:29:03 2011 +0100 - * - * Initial commit - * - * $ git show 1fe3 --format=raw - * commit 1fe3126578fc4eca68c193e4a3a0a14a0704624d - * tree 2b297e643c551e76cfa1f93810c50811382f9117 - * author nulltoken 1323847743 +0100 - * committer nulltoken 1323847743 +0100 - * - * Initial commit - * - * diff --git a/test.txt b/test.txt - * new file mode 100644 - * index 0000000..9daeafb - * --- /dev/null - * +++ b/test.txt - * @@ -0,0 +1 @@ - * +test - * - * $ git ls-tree 2b297 - * 100644 blob 9daeafb9864cf43055ae93beb0afd6c7d144bfa4 test.txt - */ - - cl_git_pass(git_oid_fromstr(&expected_commit_oid, "1fe3126578fc4eca68c193e4a3a0a14a0704624d")); - cl_git_pass(git_oid_fromstr(&expected_tree_oid, "2b297e643c551e76cfa1f93810c50811382f9117")); - cl_git_pass(git_oid_fromstr(&expected_blob_oid, "9daeafb9864cf43055ae93beb0afd6c7d144bfa4")); - - /* - * Add a new file to the index - */ - cl_git_mkfile("treebuilder/test.txt", "test\n"); - cl_git_pass(git_repository_index(&index, repo)); - cl_git_pass(git_index_add_bypath(index, "test.txt")); - - entry = git_index_get_byindex(index, 0); - - cl_assert(git_oid_cmp(&expected_blob_oid, &entry->id) == 0); - - /* - * Information about index entry should match test file - */ - { - struct stat st; - cl_must_pass(p_lstat("treebuilder/test.txt", &st)); - cl_assert(entry->file_size == st.st_size); -#ifndef _WIN32 - /* - * Windows doesn't populate these fields, and the signage is - * wrong in the Windows version of the struct, so lets avoid - * the "comparing signed and unsigned" compilation warning in - * that case. - */ - cl_assert(entry->uid == st.st_uid); - cl_assert(entry->gid == st.st_gid); -#endif - } - - /* - * Build the tree from the index - */ - cl_git_pass(git_index_write_tree(&tree_oid, index)); - - cl_assert(git_oid_cmp(&expected_tree_oid, &tree_oid) == 0); - - /* - * Commit the staged file - */ - cl_git_pass(git_signature_new(&signature, "nulltoken", "emeric.fermas@gmail.com", 1323847743, 60)); - cl_git_pass(git_tree_lookup(&tree, repo, &tree_oid)); - - memset(&buffer, 0, sizeof(git_buf)); - cl_git_pass(git_message_prettify(&buffer, "Initial commit", 0, '#')); - - cl_git_pass(git_commit_create_v( - &commit_oid, - repo, - "HEAD", - signature, - signature, - NULL, - buffer.ptr, - tree, - 0)); - - cl_assert(git_oid_cmp(&expected_commit_oid, &commit_oid) == 0); - - git_buf_free(&buffer); - git_signature_free(signature); - git_tree_free(tree); - git_index_free(index); -} - -static void assert_commit_tree_has_n_entries(git_commit *c, int count) -{ - git_tree *tree; - cl_git_pass(git_commit_tree(&tree, c)); - cl_assert_equal_i(count, git_tree_entrycount(tree)); - git_tree_free(tree); -} - -static void assert_commit_is_head_(git_commit *c, const char *file, int line) -{ - git_commit *head; - cl_git_pass(git_revparse_single((git_object **)&head, repo, "HEAD")); - clar__assert(git_oid_equal(git_commit_id(c), git_commit_id(head)), file, line, "Commit is not the HEAD", NULL, 1); - git_commit_free(head); -} -#define assert_commit_is_head(C) assert_commit_is_head_((C),__FILE__,__LINE__) - -void test_object_commit_commitstagedfile__amend_commit(void) -{ - git_index *index; - git_oid old_oid, new_oid, tree_oid; - git_commit *old_commit, *new_commit; - git_tree *tree; - - /* make a commit */ - - cl_git_mkfile("treebuilder/myfile", "This is a file\n"); - cl_git_pass(git_repository_index(&index, repo)); - cl_git_pass(git_index_add_bypath(index, "myfile")); - cl_repo_commit_from_index(&old_oid, repo, NULL, 0, "first commit"); - - cl_git_pass(git_commit_lookup(&old_commit, repo, &old_oid)); - - cl_assert_equal_i(0, git_commit_parentcount(old_commit)); - assert_commit_tree_has_n_entries(old_commit, 1); - assert_commit_is_head(old_commit); - - /* let's amend the message of the HEAD commit */ - - cl_git_pass(git_commit_amend( - &new_oid, old_commit, "HEAD", NULL, NULL, NULL, "Initial commit", NULL)); - - /* fail because the commit isn't the tip of the branch anymore */ - cl_git_fail(git_commit_amend( - &new_oid, old_commit, "HEAD", NULL, NULL, NULL, "Initial commit", NULL)); - - cl_git_pass(git_commit_lookup(&new_commit, repo, &new_oid)); - - cl_assert_equal_i(0, git_commit_parentcount(new_commit)); - assert_commit_tree_has_n_entries(new_commit, 1); - assert_commit_is_head(new_commit); - - git_commit_free(old_commit); - - old_commit = new_commit; - - /* let's amend the tree of that last commit */ - - cl_git_mkfile("treebuilder/anotherfile", "This is another file\n"); - cl_git_pass(git_index_add_bypath(index, "anotherfile")); - cl_git_pass(git_index_write_tree(&tree_oid, index)); - cl_git_pass(git_tree_lookup(&tree, repo, &tree_oid)); - cl_assert_equal_i(2, git_tree_entrycount(tree)); - - /* fail to amend on a ref which does not exist */ - cl_git_fail_with(GIT_ENOTFOUND, git_commit_amend( - &new_oid, old_commit, "refs/heads/nope", NULL, NULL, NULL, "Initial commit", tree)); - - cl_git_pass(git_commit_amend( - &new_oid, old_commit, "HEAD", NULL, NULL, NULL, "Initial commit", tree)); - git_tree_free(tree); - - cl_git_pass(git_commit_lookup(&new_commit, repo, &new_oid)); - - cl_assert_equal_i(0, git_commit_parentcount(new_commit)); - assert_commit_tree_has_n_entries(new_commit, 2); - assert_commit_is_head(new_commit); - - /* cleanup */ - - git_commit_free(old_commit); - git_commit_free(new_commit); - git_index_free(index); -} diff --git a/vendor/libgit2/tests/object/lookup.c b/vendor/libgit2/tests/object/lookup.c deleted file mode 100644 index cfa6d4678..000000000 --- a/vendor/libgit2/tests/object/lookup.c +++ /dev/null @@ -1,65 +0,0 @@ -#include "clar_libgit2.h" - -#include "repository.h" - -static git_repository *g_repo; - -void test_object_lookup__initialize(void) -{ - cl_git_pass(git_repository_open(&g_repo, cl_fixture("testrepo.git"))); -} - -void test_object_lookup__cleanup(void) -{ - git_repository_free(g_repo); - g_repo = NULL; -} - -void test_object_lookup__lookup_wrong_type_returns_enotfound(void) -{ - const char *commit = "e90810b8df3e80c413d903f631643c716887138d"; - git_oid oid; - git_object *object; - - cl_git_pass(git_oid_fromstr(&oid, commit)); - cl_assert_equal_i( - GIT_ENOTFOUND, git_object_lookup(&object, g_repo, &oid, GIT_OBJ_TAG)); -} - -void test_object_lookup__lookup_nonexisting_returns_enotfound(void) -{ - const char *unknown = "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef"; - git_oid oid; - git_object *object; - - cl_git_pass(git_oid_fromstr(&oid, unknown)); - cl_assert_equal_i( - GIT_ENOTFOUND, git_object_lookup(&object, g_repo, &oid, GIT_OBJ_ANY)); -} - -void test_object_lookup__lookup_wrong_type_by_abbreviated_id_returns_enotfound(void) -{ - const char *commit = "e90810b"; - git_oid oid; - git_object *object; - - cl_git_pass(git_oid_fromstrn(&oid, commit, strlen(commit))); - cl_assert_equal_i( - GIT_ENOTFOUND, git_object_lookup_prefix(&object, g_repo, &oid, strlen(commit), GIT_OBJ_TAG)); -} - -void test_object_lookup__lookup_wrong_type_eventually_returns_enotfound(void) -{ - const char *commit = "e90810b8df3e80c413d903f631643c716887138d"; - git_oid oid; - git_object *object; - - cl_git_pass(git_oid_fromstr(&oid, commit)); - - cl_git_pass(git_object_lookup(&object, g_repo, &oid, GIT_OBJ_COMMIT)); - git_object_free(object); - - cl_assert_equal_i( - GIT_ENOTFOUND, git_object_lookup(&object, g_repo, &oid, GIT_OBJ_TAG)); -} - diff --git a/vendor/libgit2/tests/object/lookupbypath.c b/vendor/libgit2/tests/object/lookupbypath.c deleted file mode 100644 index 13cd6a128..000000000 --- a/vendor/libgit2/tests/object/lookupbypath.c +++ /dev/null @@ -1,83 +0,0 @@ -#include "clar_libgit2.h" - -#include "repository.h" - -static git_repository *g_repo; -static git_tree *g_root_tree; -static git_commit *g_head_commit; -static git_object *g_expectedobject, - *g_actualobject; - -void test_object_lookupbypath__initialize(void) -{ - git_reference *head; - git_tree_entry *tree_entry; - - cl_git_pass(git_repository_open(&g_repo, cl_fixture("attr/.gitted"))); - - cl_git_pass(git_repository_head(&head, g_repo)); - cl_git_pass(git_reference_peel((git_object**)&g_head_commit, head, GIT_OBJ_COMMIT)); - cl_git_pass(git_commit_tree(&g_root_tree, g_head_commit)); - cl_git_pass(git_tree_entry_bypath(&tree_entry, g_root_tree, "subdir/subdir_test2.txt")); - cl_git_pass(git_object_lookup(&g_expectedobject, g_repo, git_tree_entry_id(tree_entry), - GIT_OBJ_ANY)); - - git_tree_entry_free(tree_entry); - git_reference_free(head); - - g_actualobject = NULL; -} -void test_object_lookupbypath__cleanup(void) -{ - git_object_free(g_actualobject); - git_object_free(g_expectedobject); - git_tree_free(g_root_tree); - git_commit_free(g_head_commit); - g_expectedobject = NULL; - git_repository_free(g_repo); - g_repo = NULL; -} - -void test_object_lookupbypath__errors(void) -{ - cl_assert_equal_i(GIT_EINVALIDSPEC, - git_object_lookup_bypath(&g_actualobject, (git_object*)g_root_tree, - "subdir/subdir_test2.txt", GIT_OBJ_TREE)); // It's not a tree - cl_assert_equal_i(GIT_ENOTFOUND, - git_object_lookup_bypath(&g_actualobject, (git_object*)g_root_tree, - "file/doesnt/exist", GIT_OBJ_ANY)); -} - -void test_object_lookupbypath__from_root_tree(void) -{ - cl_git_pass(git_object_lookup_bypath(&g_actualobject, (git_object*)g_root_tree, - "subdir/subdir_test2.txt", GIT_OBJ_BLOB)); - cl_assert_equal_oid(git_object_id(g_expectedobject), - git_object_id(g_actualobject)); -} - -void test_object_lookupbypath__from_head_commit(void) -{ - cl_git_pass(git_object_lookup_bypath(&g_actualobject, (git_object*)g_head_commit, - "subdir/subdir_test2.txt", GIT_OBJ_BLOB)); - cl_assert_equal_oid(git_object_id(g_expectedobject), - git_object_id(g_actualobject)); -} - -void test_object_lookupbypath__from_subdir_tree(void) -{ - git_tree_entry *entry = NULL; - git_tree *tree = NULL; - - cl_git_pass(git_tree_entry_bypath(&entry, g_root_tree, "subdir")); - cl_git_pass(git_tree_lookup(&tree, g_repo, git_tree_entry_id(entry))); - - cl_git_pass(git_object_lookup_bypath(&g_actualobject, (git_object*)tree, - "subdir_test2.txt", GIT_OBJ_BLOB)); - cl_assert_equal_oid(git_object_id(g_expectedobject), - git_object_id(g_actualobject)); - - git_tree_entry_free(entry); - git_tree_free(tree); -} - diff --git a/vendor/libgit2/tests/object/message.c b/vendor/libgit2/tests/object/message.c deleted file mode 100644 index 40d8e7297..000000000 --- a/vendor/libgit2/tests/object/message.c +++ /dev/null @@ -1,199 +0,0 @@ -#include "clar_libgit2.h" -#include "buffer.h" -#include "message.h" - -static void assert_message_prettifying(char *expected_output, char *input, int strip_comments) -{ - git_buf prettified_message = GIT_BUF_INIT; - - git_message_prettify(&prettified_message, input, strip_comments, '#'); - cl_assert_equal_s(expected_output, git_buf_cstr(&prettified_message)); - - git_buf_free(&prettified_message); -} - -#define t40 "A quick brown fox jumps over the lazy do" -#define s40 " " -#define sss s40 s40 s40 s40 s40 s40 s40 s40 s40 s40 // # 400 -#define ttt t40 t40 t40 t40 t40 t40 t40 t40 t40 t40 // # 400 - -/* Ported from git.git */ -/* see https://github.com/git/git/blob/master/t/t0030-stripspace.sh */ -void test_object_message__long_lines_without_spaces_should_be_unchanged(void) -{ - assert_message_prettifying(ttt "\n", ttt, 0); - assert_message_prettifying(ttt ttt "\n", ttt ttt, 0); - assert_message_prettifying(ttt ttt ttt "\n", ttt ttt ttt, 0); - assert_message_prettifying(ttt ttt ttt ttt "\n", ttt ttt ttt ttt, 0); -} - -void test_object_message__lines_with_spaces_at_the_beginning_should_be_unchanged(void) -{ - assert_message_prettifying(sss ttt "\n", sss ttt, 0); - assert_message_prettifying(sss sss ttt "\n", sss sss ttt, 0); - assert_message_prettifying(sss sss sss ttt "\n", sss sss sss ttt, 0); -} - -void test_object_message__lines_with_intermediate_spaces_should_be_unchanged(void) -{ - assert_message_prettifying(ttt sss ttt "\n", ttt sss ttt, 0); - assert_message_prettifying(ttt sss sss ttt "\n", ttt sss sss ttt, 0); -} - -void test_object_message__consecutive_blank_lines_should_be_unified(void) -{ - assert_message_prettifying(ttt "\n\n" ttt "\n", ttt "\n\n\n\n\n" ttt "\n", 0); - assert_message_prettifying(ttt ttt "\n\n" ttt "\n", ttt ttt "\n\n\n\n\n" ttt "\n", 0); - assert_message_prettifying(ttt ttt ttt "\n\n" ttt "\n", ttt ttt ttt "\n\n\n\n\n" ttt "\n", 0); - - assert_message_prettifying(ttt "\n\n" ttt ttt "\n", ttt "\n\n\n\n\n" ttt ttt "\n", 0); - assert_message_prettifying(ttt "\n\n" ttt ttt ttt "\n", ttt "\n\n\n\n\n" ttt ttt ttt "\n", 0); - - assert_message_prettifying(ttt "\n\n" ttt "\n", ttt "\n\t\n \n\n \t\t\n" ttt "\n", 0); - assert_message_prettifying(ttt ttt "\n\n" ttt "\n", ttt ttt "\n\t\n \n\n \t\t\n" ttt "\n", 0); - assert_message_prettifying(ttt ttt ttt "\n\n" ttt "\n", ttt ttt ttt "\n\t\n \n\n \t\t\n" ttt "\n", 0); - - assert_message_prettifying(ttt "\n\n" ttt ttt "\n", ttt "\n\t\n \n\n \t\t\n" ttt ttt "\n", 0); - assert_message_prettifying(ttt "\n\n" ttt ttt ttt "\n", ttt "\n\t\n \n\n \t\t\n" ttt ttt ttt "\n", 0); -} - -void test_object_message__only_consecutive_blank_lines_should_be_completely_removed(void) -{ - assert_message_prettifying("", "\n", 0); - assert_message_prettifying("", "\n\n\n", 0); - assert_message_prettifying("", sss "\n" sss "\n" sss "\n", 0); - assert_message_prettifying("", sss sss "\n" sss "\n\n", 0); -} - -void test_object_message__consecutive_blank_lines_at_the_beginning_should_be_removed(void) -{ - assert_message_prettifying(ttt "\n", "\n" ttt "\n", 0); - assert_message_prettifying(ttt "\n", "\n\n\n" ttt "\n", 0); - assert_message_prettifying(ttt ttt "\n", "\n\n\n" ttt ttt "\n", 0); - assert_message_prettifying(ttt ttt ttt "\n", "\n\n\n" ttt ttt ttt "\n", 0); - assert_message_prettifying(ttt ttt ttt ttt "\n", "\n\n\n" ttt ttt ttt ttt "\n", 0); - assert_message_prettifying(ttt "\n", sss "\n" sss "\n" sss "\n" ttt "\n", 0); - assert_message_prettifying(ttt "\n", "\n" sss "\n" sss sss "\n" ttt "\n", 0); - assert_message_prettifying(ttt "\n", sss sss "\n" sss "\n\n" ttt "\n", 0); - assert_message_prettifying(ttt "\n", sss sss sss "\n\n\n" ttt "\n", 0); - assert_message_prettifying(ttt "\n", "\n" sss sss sss "\n\n" ttt "\n", 0); - assert_message_prettifying(ttt "\n", "\n\n" sss sss sss "\n" ttt "\n", 0); -} - -void test_object_message__consecutive_blank_lines_at_the_end_should_be_removed(void) -{ - assert_message_prettifying(ttt "\n", ttt "\n\n", 0); - assert_message_prettifying(ttt "\n", ttt "\n\n\n\n", 0); - assert_message_prettifying(ttt ttt "\n", ttt ttt "\n\n\n\n", 0); - assert_message_prettifying(ttt ttt ttt "\n", ttt ttt ttt "\n\n\n\n", 0); - assert_message_prettifying(ttt ttt ttt ttt "\n", ttt ttt ttt ttt "\n\n\n\n", 0); - assert_message_prettifying(ttt "\n", ttt "\n" sss "\n" sss "\n" sss "\n", 0); - assert_message_prettifying(ttt "\n", ttt "\n\n" sss "\n" sss sss "\n", 0); - assert_message_prettifying(ttt "\n", ttt "\n" sss sss "\n" sss "\n\n", 0); - assert_message_prettifying(ttt "\n", ttt "\n" sss sss sss "\n\n\n", 0); - assert_message_prettifying(ttt "\n", ttt "\n\n" sss sss sss "\n\n", 0); - assert_message_prettifying(ttt "\n", ttt "\n\n\n" sss sss sss "\n\n", 0); -} - -void test_object_message__text_without_newline_at_end_should_end_with_newline(void) -{ - assert_message_prettifying(ttt "\n", ttt, 0); - assert_message_prettifying(ttt ttt "\n", ttt ttt, 0); - assert_message_prettifying(ttt ttt ttt "\n", ttt ttt ttt, 0); - assert_message_prettifying(ttt ttt ttt ttt "\n", ttt ttt ttt ttt, 0); -} - -void test_object_message__text_plus_spaces_without_newline_should_not_show_spaces_and_end_with_newline(void) -{ - assert_message_prettifying(ttt "\n", ttt sss, 0); - assert_message_prettifying(ttt ttt "\n", ttt ttt sss, 0); - assert_message_prettifying(ttt ttt ttt "\n", ttt ttt ttt sss, 0); - assert_message_prettifying(ttt "\n", ttt sss sss, 0); - assert_message_prettifying(ttt ttt "\n", ttt ttt sss sss, 0); - assert_message_prettifying(ttt "\n", ttt sss sss sss, 0); -} - -void test_object_message__text_plus_spaces_ending_with_newline_should_be_cleaned_and_newline_must_remain(void){ - assert_message_prettifying(ttt "\n", ttt sss "\n", 0); - assert_message_prettifying(ttt "\n", ttt sss sss "\n", 0); - assert_message_prettifying(ttt "\n", ttt sss sss sss "\n", 0); - assert_message_prettifying(ttt ttt "\n", ttt ttt sss "\n", 0); - assert_message_prettifying(ttt ttt "\n", ttt ttt sss sss "\n", 0); - assert_message_prettifying(ttt ttt ttt "\n", ttt ttt ttt sss "\n", 0); -} - -void test_object_message__spaces_with_newline_at_end_should_be_replaced_with_empty_string(void) -{ - assert_message_prettifying("", sss "\n", 0); - assert_message_prettifying("", sss sss "\n", 0); - assert_message_prettifying("", sss sss sss "\n", 0); - assert_message_prettifying("", sss sss sss sss "\n", 0); -} - -void test_object_message__spaces_without_newline_at_end_should_be_replaced_with_empty_string(void) -{ - assert_message_prettifying("", "", 0); - assert_message_prettifying("", sss sss, 0); - assert_message_prettifying("", sss sss sss, 0); - assert_message_prettifying("", sss sss sss sss, 0); -} - -void test_object_message__consecutive_text_lines_should_be_unchanged(void) -{ - assert_message_prettifying(ttt ttt "\n" ttt "\n", ttt ttt "\n" ttt "\n", 0); - assert_message_prettifying(ttt "\n" ttt ttt "\n" ttt "\n", ttt "\n" ttt ttt "\n" ttt "\n", 0); - assert_message_prettifying(ttt "\n" ttt "\n" ttt "\n" ttt ttt "\n", ttt "\n" ttt "\n" ttt "\n" ttt ttt "\n", 0); - assert_message_prettifying(ttt "\n" ttt "\n\n" ttt ttt "\n" ttt "\n", ttt "\n" ttt "\n\n" ttt ttt "\n" ttt "\n", 0); - assert_message_prettifying(ttt ttt "\n\n" ttt "\n" ttt ttt "\n", ttt ttt "\n\n" ttt "\n" ttt ttt "\n", 0); - assert_message_prettifying(ttt "\n" ttt ttt "\n\n" ttt "\n", ttt "\n" ttt ttt "\n\n" ttt "\n", 0); -} - -void test_object_message__strip_comments(void) -{ - assert_message_prettifying("", "# comment", 1); - assert_message_prettifying("", "# comment\n", 1); - assert_message_prettifying("", "# comment \n", 1); - - assert_message_prettifying(ttt "\n", ttt "\n" "# comment\n", 1); - assert_message_prettifying(ttt "\n", "# comment\n" ttt "\n", 1); - assert_message_prettifying(ttt "\n" ttt "\n", ttt "\n" "# comment\n" ttt "\n", 1); -} - -void test_object_message__keep_comments(void) -{ - assert_message_prettifying("# comment\n", "# comment", 0); - assert_message_prettifying("# comment\n", "# comment\n", 0); - assert_message_prettifying("# comment\n", "# comment \n", 0); - - assert_message_prettifying(ttt "\n" "# comment\n", ttt "\n" "# comment\n", 0); - assert_message_prettifying("# comment\n" ttt "\n", "# comment\n" ttt "\n", 0); - assert_message_prettifying(ttt "\n" "# comment\n" ttt "\n", ttt "\n" "# comment\n" ttt "\n", 0); -} - -void test_object_message__message_prettify(void) -{ - git_buf buffer; - - memset(&buffer, 0, sizeof(buffer)); - cl_git_pass(git_message_prettify(&buffer, "", 0, '#')); - cl_assert_equal_s(buffer.ptr, ""); - git_buf_free(&buffer); - cl_git_pass(git_message_prettify(&buffer, "", 1, '#')); - cl_assert_equal_s(buffer.ptr, ""); - git_buf_free(&buffer); - - cl_git_pass(git_message_prettify(&buffer, "Short", 0, '#')); - cl_assert_equal_s("Short\n", buffer.ptr); - git_buf_free(&buffer); - cl_git_pass(git_message_prettify(&buffer, "Short", 1, '#')); - cl_assert_equal_s("Short\n", buffer.ptr); - git_buf_free(&buffer); - - cl_git_pass(git_message_prettify(&buffer, "This is longer\nAnd multiline\n# with some comments still in\n", 0, '#')); - cl_assert_equal_s(buffer.ptr, "This is longer\nAnd multiline\n# with some comments still in\n"); - git_buf_free(&buffer); - - cl_git_pass(git_message_prettify(&buffer, "This is longer\nAnd multiline\n# with some comments still in\n", 1, '#')); - cl_assert_equal_s(buffer.ptr, "This is longer\nAnd multiline\n"); - git_buf_free(&buffer); -} diff --git a/vendor/libgit2/tests/object/peel.c b/vendor/libgit2/tests/object/peel.c deleted file mode 100644 index 344885f1d..000000000 --- a/vendor/libgit2/tests/object/peel.c +++ /dev/null @@ -1,118 +0,0 @@ -#include "clar_libgit2.h" - -static git_repository *g_repo; - -void test_object_peel__initialize(void) -{ - cl_git_pass(git_repository_open(&g_repo, cl_fixture("testrepo.git"))); -} - -void test_object_peel__cleanup(void) -{ - git_repository_free(g_repo); - g_repo = NULL; -} - -static void assert_peel( - const char *sha, - git_otype requested_type, - const char* expected_sha, - git_otype expected_type) -{ - git_oid oid, expected_oid; - git_object *obj; - git_object *peeled; - - cl_git_pass(git_oid_fromstr(&oid, sha)); - cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJ_ANY)); - - cl_git_pass(git_object_peel(&peeled, obj, requested_type)); - - cl_git_pass(git_oid_fromstr(&expected_oid, expected_sha)); - cl_assert_equal_oid(&expected_oid, git_object_id(peeled)); - - cl_assert_equal_i(expected_type, git_object_type(peeled)); - - git_object_free(peeled); - git_object_free(obj); -} - -static void assert_peel_error(int error, const char *sha, git_otype requested_type) -{ - git_oid oid; - git_object *obj; - git_object *peeled; - - cl_git_pass(git_oid_fromstr(&oid, sha)); - cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJ_ANY)); - - cl_assert_equal_i(error, git_object_peel(&peeled, obj, requested_type)); - - git_object_free(obj); -} - -void test_object_peel__peeling_an_object_into_its_own_type_returns_another_instance_of_it(void) -{ - assert_peel("e90810b8df3e80c413d903f631643c716887138d", GIT_OBJ_COMMIT, - "e90810b8df3e80c413d903f631643c716887138d", GIT_OBJ_COMMIT); - assert_peel("7b4384978d2493e851f9cca7858815fac9b10980", GIT_OBJ_TAG, - "7b4384978d2493e851f9cca7858815fac9b10980", GIT_OBJ_TAG); - assert_peel("53fc32d17276939fc79ed05badaef2db09990016", GIT_OBJ_TREE, - "53fc32d17276939fc79ed05badaef2db09990016", GIT_OBJ_TREE); - assert_peel("0266163a49e280c4f5ed1e08facd36a2bd716bcf", GIT_OBJ_BLOB, - "0266163a49e280c4f5ed1e08facd36a2bd716bcf", GIT_OBJ_BLOB); -} - -void test_object_peel__tag(void) -{ - assert_peel("7b4384978d2493e851f9cca7858815fac9b10980", GIT_OBJ_COMMIT, - "e90810b8df3e80c413d903f631643c716887138d", GIT_OBJ_COMMIT); - assert_peel("7b4384978d2493e851f9cca7858815fac9b10980", GIT_OBJ_TREE, - "53fc32d17276939fc79ed05badaef2db09990016", GIT_OBJ_TREE); - assert_peel_error(GIT_EPEEL, "7b4384978d2493e851f9cca7858815fac9b10980", GIT_OBJ_BLOB); - assert_peel("7b4384978d2493e851f9cca7858815fac9b10980", GIT_OBJ_ANY, - "e90810b8df3e80c413d903f631643c716887138d", GIT_OBJ_COMMIT); -} - -void test_object_peel__commit(void) -{ - assert_peel_error(GIT_EINVALIDSPEC, "e90810b8df3e80c413d903f631643c716887138d", GIT_OBJ_BLOB); - assert_peel("e90810b8df3e80c413d903f631643c716887138d", GIT_OBJ_TREE, - "53fc32d17276939fc79ed05badaef2db09990016", GIT_OBJ_TREE); - assert_peel("e90810b8df3e80c413d903f631643c716887138d", GIT_OBJ_COMMIT, - "e90810b8df3e80c413d903f631643c716887138d", GIT_OBJ_COMMIT); - assert_peel_error(GIT_EINVALIDSPEC, "e90810b8df3e80c413d903f631643c716887138d", GIT_OBJ_TAG); - assert_peel("e90810b8df3e80c413d903f631643c716887138d", GIT_OBJ_ANY, - "53fc32d17276939fc79ed05badaef2db09990016", GIT_OBJ_TREE); -} - -void test_object_peel__tree(void) -{ - assert_peel_error(GIT_EINVALIDSPEC, "53fc32d17276939fc79ed05badaef2db09990016", GIT_OBJ_BLOB); - assert_peel("53fc32d17276939fc79ed05badaef2db09990016", GIT_OBJ_TREE, - "53fc32d17276939fc79ed05badaef2db09990016", GIT_OBJ_TREE); - assert_peel_error(GIT_EINVALIDSPEC, "53fc32d17276939fc79ed05badaef2db09990016", GIT_OBJ_COMMIT); - assert_peel_error(GIT_EINVALIDSPEC, "53fc32d17276939fc79ed05badaef2db09990016", GIT_OBJ_TAG); - assert_peel_error(GIT_EINVALIDSPEC, "53fc32d17276939fc79ed05badaef2db09990016", GIT_OBJ_ANY); -} - -void test_object_peel__blob(void) -{ - assert_peel("0266163a49e280c4f5ed1e08facd36a2bd716bcf", GIT_OBJ_BLOB, - "0266163a49e280c4f5ed1e08facd36a2bd716bcf", GIT_OBJ_BLOB); - assert_peel_error(GIT_EINVALIDSPEC, "0266163a49e280c4f5ed1e08facd36a2bd716bcf", GIT_OBJ_TREE); - assert_peel_error(GIT_EINVALIDSPEC, "0266163a49e280c4f5ed1e08facd36a2bd716bcf", GIT_OBJ_COMMIT); - assert_peel_error(GIT_EINVALIDSPEC, "0266163a49e280c4f5ed1e08facd36a2bd716bcf", GIT_OBJ_TAG); - assert_peel_error(GIT_EINVALIDSPEC, "0266163a49e280c4f5ed1e08facd36a2bd716bcf", GIT_OBJ_ANY); -} - -void test_object_peel__target_any_object_for_type_change(void) -{ - /* tag to commit */ - assert_peel("7b4384978d2493e851f9cca7858815fac9b10980", GIT_OBJ_ANY, - "e90810b8df3e80c413d903f631643c716887138d", GIT_OBJ_COMMIT); - - /* commit to tree */ - assert_peel("e90810b8df3e80c413d903f631643c716887138d", GIT_OBJ_ANY, - "53fc32d17276939fc79ed05badaef2db09990016", GIT_OBJ_TREE); -} diff --git a/vendor/libgit2/tests/object/raw/chars.c b/vendor/libgit2/tests/object/raw/chars.c deleted file mode 100644 index cde0bdbf6..000000000 --- a/vendor/libgit2/tests/object/raw/chars.c +++ /dev/null @@ -1,41 +0,0 @@ - -#include "clar_libgit2.h" - -#include "odb.h" - -void test_object_raw_chars__find_invalid_chars_in_oid(void) -{ - git_oid out; - unsigned char exp[] = { - 0x16, 0xa6, 0x77, 0x70, 0xb7, - 0xd8, 0xd7, 0x23, 0x17, 0xc4, - 0xb7, 0x75, 0x21, 0x3c, 0x23, - 0xa8, 0xbd, 0x74, 0xf5, 0xe0, - }; - char in[] = "16a67770b7d8d72317c4b775213c23a8bd74f5e0"; - unsigned int i; - - for (i = 0; i < 256; i++) { - in[38] = (char)i; - if (git__fromhex(i) >= 0) { - exp[19] = (unsigned char)(git__fromhex(i) << 4); - cl_git_pass(git_oid_fromstr(&out, in)); - cl_assert(memcmp(out.id, exp, sizeof(out.id)) == 0); - } else { - cl_git_fail(git_oid_fromstr(&out, in)); - } - } -} - -void test_object_raw_chars__build_valid_oid_from_raw_bytes(void) -{ - git_oid out; - unsigned char exp[] = { - 0x16, 0xa6, 0x77, 0x70, 0xb7, - 0xd8, 0xd7, 0x23, 0x17, 0xc4, - 0xb7, 0x75, 0x21, 0x3c, 0x23, - 0xa8, 0xbd, 0x74, 0xf5, 0xe0, - }; - git_oid_fromraw(&out, exp); - cl_git_pass(memcmp(out.id, exp, sizeof(out.id))); -} diff --git a/vendor/libgit2/tests/object/raw/compare.c b/vendor/libgit2/tests/object/raw/compare.c deleted file mode 100644 index 56c016b72..000000000 --- a/vendor/libgit2/tests/object/raw/compare.c +++ /dev/null @@ -1,123 +0,0 @@ - -#include "clar_libgit2.h" - -#include "odb.h" - -void test_object_raw_compare__succeed_on_copy_oid(void) -{ - git_oid a, b; - unsigned char exp[] = { - 0x16, 0xa6, 0x77, 0x70, 0xb7, - 0xd8, 0xd7, 0x23, 0x17, 0xc4, - 0xb7, 0x75, 0x21, 0x3c, 0x23, - 0xa8, 0xbd, 0x74, 0xf5, 0xe0, - }; - memset(&b, 0, sizeof(b)); - git_oid_fromraw(&a, exp); - git_oid_cpy(&b, &a); - cl_git_pass(memcmp(a.id, exp, sizeof(a.id))); -} - -void test_object_raw_compare__succeed_on_oid_comparison_lesser(void) -{ - git_oid a, b; - unsigned char a_in[] = { - 0x16, 0xa6, 0x77, 0x70, 0xb7, - 0xd8, 0xd7, 0x23, 0x17, 0xc4, - 0xb7, 0x75, 0x21, 0x3c, 0x23, - 0xa8, 0xbd, 0x74, 0xf5, 0xe0, - }; - unsigned char b_in[] = { - 0x16, 0xa6, 0x77, 0x70, 0xb7, - 0xd8, 0xd7, 0x23, 0x17, 0xc4, - 0xb7, 0x75, 0x21, 0x3c, 0x23, - 0xa8, 0xbd, 0x74, 0xf5, 0xf0, - }; - git_oid_fromraw(&a, a_in); - git_oid_fromraw(&b, b_in); - cl_assert(git_oid_cmp(&a, &b) < 0); -} - -void test_object_raw_compare__succeed_on_oid_comparison_equal(void) -{ - git_oid a, b; - unsigned char a_in[] = { - 0x16, 0xa6, 0x77, 0x70, 0xb7, - 0xd8, 0xd7, 0x23, 0x17, 0xc4, - 0xb7, 0x75, 0x21, 0x3c, 0x23, - 0xa8, 0xbd, 0x74, 0xf5, 0xe0, - }; - git_oid_fromraw(&a, a_in); - git_oid_fromraw(&b, a_in); - cl_assert(git_oid_cmp(&a, &b) == 0); -} - -void test_object_raw_compare__succeed_on_oid_comparison_greater(void) -{ - git_oid a, b; - unsigned char a_in[] = { - 0x16, 0xa6, 0x77, 0x70, 0xb7, - 0xd8, 0xd7, 0x23, 0x17, 0xc4, - 0xb7, 0x75, 0x21, 0x3c, 0x23, - 0xa8, 0xbd, 0x74, 0xf5, 0xe0, - }; - unsigned char b_in[] = { - 0x16, 0xa6, 0x77, 0x70, 0xb7, - 0xd8, 0xd7, 0x23, 0x17, 0xc4, - 0xb7, 0x75, 0x21, 0x3c, 0x23, - 0xa8, 0xbd, 0x74, 0xf5, 0xd0, - }; - git_oid_fromraw(&a, a_in); - git_oid_fromraw(&b, b_in); - cl_assert(git_oid_cmp(&a, &b) > 0); -} - -void test_object_raw_compare__compare_fmt_oids(void) -{ - const char *exp = "16a0123456789abcdef4b775213c23a8bd74f5e0"; - git_oid in; - char out[GIT_OID_HEXSZ + 1]; - - cl_git_pass(git_oid_fromstr(&in, exp)); - - /* Format doesn't touch the last byte */ - out[GIT_OID_HEXSZ] = 'Z'; - git_oid_fmt(out, &in); - cl_assert(out[GIT_OID_HEXSZ] == 'Z'); - - /* Format produced the right result */ - out[GIT_OID_HEXSZ] = '\0'; - cl_assert_equal_s(exp, out); -} - -void test_object_raw_compare__compare_static_oids(void) -{ - const char *exp = "16a0123456789abcdef4b775213c23a8bd74f5e0"; - git_oid in; - char *out; - - cl_git_pass(git_oid_fromstr(&in, exp)); - - out = git_oid_tostr_s(&in); - cl_assert(out); - cl_assert_equal_s(exp, out); -} - -void test_object_raw_compare__compare_pathfmt_oids(void) -{ - const char *exp1 = "16a0123456789abcdef4b775213c23a8bd74f5e0"; - const char *exp2 = "16/a0123456789abcdef4b775213c23a8bd74f5e0"; - git_oid in; - char out[GIT_OID_HEXSZ + 2]; - - cl_git_pass(git_oid_fromstr(&in, exp1)); - - /* Format doesn't touch the last byte */ - out[GIT_OID_HEXSZ + 1] = 'Z'; - git_oid_pathfmt(out, &in); - cl_assert(out[GIT_OID_HEXSZ + 1] == 'Z'); - - /* Format produced the right result */ - out[GIT_OID_HEXSZ + 1] = '\0'; - cl_assert_equal_s(exp2, out); -} diff --git a/vendor/libgit2/tests/object/raw/convert.c b/vendor/libgit2/tests/object/raw/convert.c deleted file mode 100644 index 88b1380a4..000000000 --- a/vendor/libgit2/tests/object/raw/convert.c +++ /dev/null @@ -1,112 +0,0 @@ - -#include "clar_libgit2.h" - -#include "odb.h" - -void test_object_raw_convert__succeed_on_oid_to_string_conversion(void) -{ - const char *exp = "16a0123456789abcdef4b775213c23a8bd74f5e0"; - git_oid in; - char out[GIT_OID_HEXSZ + 1]; - char *str; - int i; - - cl_git_pass(git_oid_fromstr(&in, exp)); - - /* NULL buffer pointer, returns static empty string */ - str = git_oid_tostr(NULL, sizeof(out), &in); - cl_assert(str && *str == '\0' && str != out); - - /* zero buffer size, returns static empty string */ - str = git_oid_tostr(out, 0, &in); - cl_assert(str && *str == '\0' && str != out); - - /* NULL oid pointer, sets existing buffer to empty string */ - str = git_oid_tostr(out, sizeof(out), NULL); - cl_assert(str && *str == '\0' && str == out); - - /* n == 1, returns out as an empty string */ - str = git_oid_tostr(out, 1, &in); - cl_assert(str && *str == '\0' && str == out); - - for (i = 1; i < GIT_OID_HEXSZ; i++) { - out[i+1] = 'Z'; - str = git_oid_tostr(out, i+1, &in); - /* returns out containing c-string */ - cl_assert(str && str == out); - /* must be '\0' terminated */ - cl_assert(*(str+i) == '\0'); - /* must not touch bytes past end of string */ - cl_assert(*(str+(i+1)) == 'Z'); - /* i == n-1 charaters of string */ - cl_git_pass(strncmp(exp, out, i)); - } - - /* returns out as hex formatted c-string */ - str = git_oid_tostr(out, sizeof(out), &in); - cl_assert(str && str == out && *(str+GIT_OID_HEXSZ) == '\0'); - cl_assert_equal_s(exp, out); -} - -void test_object_raw_convert__succeed_on_oid_to_string_conversion_big(void) -{ - const char *exp = "16a0123456789abcdef4b775213c23a8bd74f5e0"; - git_oid in; - char big[GIT_OID_HEXSZ + 1 + 3]; /* note + 4 => big buffer */ - char *str; - - cl_git_pass(git_oid_fromstr(&in, exp)); - - /* place some tail material */ - big[GIT_OID_HEXSZ+0] = 'W'; /* should be '\0' afterwards */ - big[GIT_OID_HEXSZ+1] = 'X'; /* should remain untouched */ - big[GIT_OID_HEXSZ+2] = 'Y'; /* ditto */ - big[GIT_OID_HEXSZ+3] = 'Z'; /* ditto */ - - /* returns big as hex formatted c-string */ - str = git_oid_tostr(big, sizeof(big), &in); - cl_assert(str && str == big && *(str+GIT_OID_HEXSZ) == '\0'); - cl_assert_equal_s(exp, big); - - /* check tail material is untouched */ - cl_assert(str && str == big && *(str+GIT_OID_HEXSZ+1) == 'X'); - cl_assert(str && str == big && *(str+GIT_OID_HEXSZ+2) == 'Y'); - cl_assert(str && str == big && *(str+GIT_OID_HEXSZ+3) == 'Z'); -} - -static void check_partial_oid( - char *buffer, size_t count, const git_oid *oid, const char *expected) -{ - git_oid_nfmt(buffer, count, oid); - buffer[count] = '\0'; - cl_assert_equal_s(expected, buffer); -} - -void test_object_raw_convert__convert_oid_partially(void) -{ - const char *exp = "16a0123456789abcdef4b775213c23a8bd74f5e0"; - git_oid in; - char big[GIT_OID_HEXSZ + 1 + 3]; /* note + 4 => big buffer */ - - cl_git_pass(git_oid_fromstr(&in, exp)); - - git_oid_nfmt(big, sizeof(big), &in); - cl_assert_equal_s(exp, big); - - git_oid_nfmt(big, GIT_OID_HEXSZ + 1, &in); - cl_assert_equal_s(exp, big); - - check_partial_oid(big, 1, &in, "1"); - check_partial_oid(big, 2, &in, "16"); - check_partial_oid(big, 3, &in, "16a"); - check_partial_oid(big, 4, &in, "16a0"); - check_partial_oid(big, 5, &in, "16a01"); - - check_partial_oid(big, GIT_OID_HEXSZ, &in, exp); - check_partial_oid( - big, GIT_OID_HEXSZ - 1, &in, "16a0123456789abcdef4b775213c23a8bd74f5e"); - check_partial_oid( - big, GIT_OID_HEXSZ - 2, &in, "16a0123456789abcdef4b775213c23a8bd74f5"); - check_partial_oid( - big, GIT_OID_HEXSZ - 3, &in, "16a0123456789abcdef4b775213c23a8bd74f"); -} diff --git a/vendor/libgit2/tests/object/raw/data.h b/vendor/libgit2/tests/object/raw/data.h deleted file mode 100644 index cf23819f1..000000000 --- a/vendor/libgit2/tests/object/raw/data.h +++ /dev/null @@ -1,323 +0,0 @@ - -/* - * Raw data - */ -static unsigned char commit_data[] = { - 0x74, 0x72, 0x65, 0x65, 0x20, 0x64, 0x66, 0x66, - 0x32, 0x64, 0x61, 0x39, 0x30, 0x62, 0x32, 0x35, - 0x34, 0x65, 0x31, 0x62, 0x65, 0x62, 0x38, 0x38, - 0x39, 0x64, 0x31, 0x66, 0x31, 0x66, 0x31, 0x32, - 0x38, 0x38, 0x62, 0x65, 0x31, 0x38, 0x30, 0x33, - 0x37, 0x38, 0x32, 0x64, 0x66, 0x0a, 0x61, 0x75, - 0x74, 0x68, 0x6f, 0x72, 0x20, 0x41, 0x20, 0x55, - 0x20, 0x54, 0x68, 0x6f, 0x72, 0x20, 0x3c, 0x61, - 0x75, 0x74, 0x68, 0x6f, 0x72, 0x40, 0x65, 0x78, - 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x2e, 0x63, 0x6f, - 0x6d, 0x3e, 0x20, 0x31, 0x32, 0x32, 0x37, 0x38, - 0x31, 0x34, 0x32, 0x39, 0x37, 0x20, 0x2b, 0x30, - 0x30, 0x30, 0x30, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, - 0x69, 0x74, 0x74, 0x65, 0x72, 0x20, 0x43, 0x20, - 0x4f, 0x20, 0x4d, 0x69, 0x74, 0x74, 0x65, 0x72, - 0x20, 0x3c, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, - 0x74, 0x65, 0x72, 0x40, 0x65, 0x78, 0x61, 0x6d, - 0x70, 0x6c, 0x65, 0x2e, 0x63, 0x6f, 0x6d, 0x3e, - 0x20, 0x31, 0x32, 0x32, 0x37, 0x38, 0x31, 0x34, - 0x32, 0x39, 0x37, 0x20, 0x2b, 0x30, 0x30, 0x30, - 0x30, 0x0a, 0x0a, 0x41, 0x20, 0x6f, 0x6e, 0x65, - 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x20, 0x63, 0x6f, - 0x6d, 0x6d, 0x69, 0x74, 0x20, 0x73, 0x75, 0x6d, - 0x6d, 0x61, 0x72, 0x79, 0x0a, 0x0a, 0x54, 0x68, - 0x65, 0x20, 0x62, 0x6f, 0x64, 0x79, 0x20, 0x6f, - 0x66, 0x20, 0x74, 0x68, 0x65, 0x20, 0x63, 0x6f, - 0x6d, 0x6d, 0x69, 0x74, 0x20, 0x6d, 0x65, 0x73, - 0x73, 0x61, 0x67, 0x65, 0x2c, 0x20, 0x63, 0x6f, - 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x69, 0x6e, 0x67, - 0x20, 0x66, 0x75, 0x72, 0x74, 0x68, 0x65, 0x72, - 0x20, 0x65, 0x78, 0x70, 0x6c, 0x61, 0x6e, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x0a, 0x6f, 0x66, 0x20, - 0x74, 0x68, 0x65, 0x20, 0x70, 0x75, 0x72, 0x70, - 0x6f, 0x73, 0x65, 0x20, 0x6f, 0x66, 0x20, 0x74, - 0x68, 0x65, 0x20, 0x63, 0x68, 0x61, 0x6e, 0x67, - 0x65, 0x73, 0x20, 0x69, 0x6e, 0x74, 0x72, 0x6f, - 0x64, 0x75, 0x63, 0x65, 0x64, 0x20, 0x62, 0x79, - 0x20, 0x74, 0x68, 0x65, 0x20, 0x63, 0x6f, 0x6d, - 0x6d, 0x69, 0x74, 0x2e, 0x0a, 0x0a, 0x53, 0x69, - 0x67, 0x6e, 0x65, 0x64, 0x2d, 0x6f, 0x66, 0x2d, - 0x62, 0x79, 0x3a, 0x20, 0x41, 0x20, 0x55, 0x20, - 0x54, 0x68, 0x6f, 0x72, 0x20, 0x3c, 0x61, 0x75, - 0x74, 0x68, 0x6f, 0x72, 0x40, 0x65, 0x78, 0x61, - 0x6d, 0x70, 0x6c, 0x65, 0x2e, 0x63, 0x6f, 0x6d, - 0x3e, 0x0a, -}; - - -static unsigned char tree_data[] = { - 0x31, 0x30, 0x30, 0x36, 0x34, 0x34, 0x20, 0x6f, - 0x6e, 0x65, 0x00, 0x8b, 0x13, 0x78, 0x91, 0x79, - 0x1f, 0xe9, 0x69, 0x27, 0xad, 0x78, 0xe6, 0x4b, - 0x0a, 0xad, 0x7b, 0xde, 0xd0, 0x8b, 0xdc, 0x31, - 0x30, 0x30, 0x36, 0x34, 0x34, 0x20, 0x73, 0x6f, - 0x6d, 0x65, 0x00, 0xfd, 0x84, 0x30, 0xbc, 0x86, - 0x4c, 0xfc, 0xd5, 0xf1, 0x0e, 0x55, 0x90, 0xf8, - 0xa4, 0x47, 0xe0, 0x1b, 0x94, 0x2b, 0xfe, 0x31, - 0x30, 0x30, 0x36, 0x34, 0x34, 0x20, 0x74, 0x77, - 0x6f, 0x00, 0x78, 0x98, 0x19, 0x22, 0x61, 0x3b, - 0x2a, 0xfb, 0x60, 0x25, 0x04, 0x2f, 0xf6, 0xbd, - 0x87, 0x8a, 0xc1, 0x99, 0x4e, 0x85, 0x31, 0x30, - 0x30, 0x36, 0x34, 0x34, 0x20, 0x7a, 0x65, 0x72, - 0x6f, 0x00, 0xe6, 0x9d, 0xe2, 0x9b, 0xb2, 0xd1, - 0xd6, 0x43, 0x4b, 0x8b, 0x29, 0xae, 0x77, 0x5a, - 0xd8, 0xc2, 0xe4, 0x8c, 0x53, 0x91, -}; - -static unsigned char tag_data[] = { - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x33, - 0x64, 0x37, 0x66, 0x38, 0x61, 0x36, 0x61, 0x66, - 0x30, 0x37, 0x36, 0x63, 0x38, 0x63, 0x33, 0x66, - 0x32, 0x30, 0x30, 0x37, 0x31, 0x61, 0x38, 0x39, - 0x33, 0x35, 0x63, 0x64, 0x62, 0x65, 0x38, 0x32, - 0x32, 0x38, 0x35, 0x39, 0x34, 0x64, 0x31, 0x0a, - 0x74, 0x79, 0x70, 0x65, 0x20, 0x63, 0x6f, 0x6d, - 0x6d, 0x69, 0x74, 0x0a, 0x74, 0x61, 0x67, 0x20, - 0x76, 0x30, 0x2e, 0x30, 0x2e, 0x31, 0x0a, 0x74, - 0x61, 0x67, 0x67, 0x65, 0x72, 0x20, 0x43, 0x20, - 0x4f, 0x20, 0x4d, 0x69, 0x74, 0x74, 0x65, 0x72, - 0x20, 0x3c, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, - 0x74, 0x65, 0x72, 0x40, 0x65, 0x78, 0x61, 0x6d, - 0x70, 0x6c, 0x65, 0x2e, 0x63, 0x6f, 0x6d, 0x3e, - 0x20, 0x31, 0x32, 0x32, 0x37, 0x38, 0x31, 0x34, - 0x32, 0x39, 0x37, 0x20, 0x2b, 0x30, 0x30, 0x30, - 0x30, 0x0a, 0x0a, 0x54, 0x68, 0x69, 0x73, 0x20, - 0x69, 0x73, 0x20, 0x74, 0x68, 0x65, 0x20, 0x74, - 0x61, 0x67, 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x72, 0x65, - 0x6c, 0x65, 0x61, 0x73, 0x65, 0x20, 0x76, 0x30, - 0x2e, 0x30, 0x2e, 0x31, 0x0a, -}; - -/* - * Dummy data - */ -static unsigned char zero_data[] = { - 0x00, -}; - -static unsigned char one_data[] = { - 0x0a, -}; - -static unsigned char two_data[] = { - 0x61, 0x0a, -}; - -static unsigned char some_data[] = { - 0x2f, 0x2a, 0x0a, 0x20, 0x2a, 0x20, 0x54, 0x68, - 0x69, 0x73, 0x20, 0x66, 0x69, 0x6c, 0x65, 0x20, - 0x69, 0x73, 0x20, 0x66, 0x72, 0x65, 0x65, 0x20, - 0x73, 0x6f, 0x66, 0x74, 0x77, 0x61, 0x72, 0x65, - 0x3b, 0x20, 0x79, 0x6f, 0x75, 0x20, 0x63, 0x61, - 0x6e, 0x20, 0x72, 0x65, 0x64, 0x69, 0x73, 0x74, - 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 0x69, - 0x74, 0x20, 0x61, 0x6e, 0x64, 0x2f, 0x6f, 0x72, - 0x20, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x0a, - 0x20, 0x2a, 0x20, 0x69, 0x74, 0x20, 0x75, 0x6e, - 0x64, 0x65, 0x72, 0x20, 0x74, 0x68, 0x65, 0x20, - 0x74, 0x65, 0x72, 0x6d, 0x73, 0x20, 0x6f, 0x66, - 0x20, 0x74, 0x68, 0x65, 0x20, 0x47, 0x4e, 0x55, - 0x20, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, - 0x20, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x20, - 0x4c, 0x69, 0x63, 0x65, 0x6e, 0x73, 0x65, 0x2c, - 0x20, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, - 0x20, 0x32, 0x2c, 0x0a, 0x20, 0x2a, 0x20, 0x61, - 0x73, 0x20, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x73, - 0x68, 0x65, 0x64, 0x20, 0x62, 0x79, 0x20, 0x74, - 0x68, 0x65, 0x20, 0x46, 0x72, 0x65, 0x65, 0x20, - 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, 0x72, 0x65, - 0x20, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x2e, 0x0a, 0x20, 0x2a, 0x0a, - 0x20, 0x2a, 0x20, 0x49, 0x6e, 0x20, 0x61, 0x64, - 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x74, - 0x6f, 0x20, 0x74, 0x68, 0x65, 0x20, 0x70, 0x65, - 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, - 0x73, 0x20, 0x69, 0x6e, 0x20, 0x74, 0x68, 0x65, - 0x20, 0x47, 0x4e, 0x55, 0x20, 0x47, 0x65, 0x6e, - 0x65, 0x72, 0x61, 0x6c, 0x20, 0x50, 0x75, 0x62, - 0x6c, 0x69, 0x63, 0x20, 0x4c, 0x69, 0x63, 0x65, - 0x6e, 0x73, 0x65, 0x2c, 0x0a, 0x20, 0x2a, 0x20, - 0x74, 0x68, 0x65, 0x20, 0x61, 0x75, 0x74, 0x68, - 0x6f, 0x72, 0x73, 0x20, 0x67, 0x69, 0x76, 0x65, - 0x20, 0x79, 0x6f, 0x75, 0x20, 0x75, 0x6e, 0x6c, - 0x69, 0x6d, 0x69, 0x74, 0x65, 0x64, 0x20, 0x70, - 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, - 0x6e, 0x20, 0x74, 0x6f, 0x20, 0x6c, 0x69, 0x6e, - 0x6b, 0x20, 0x74, 0x68, 0x65, 0x20, 0x63, 0x6f, - 0x6d, 0x70, 0x69, 0x6c, 0x65, 0x64, 0x0a, 0x20, - 0x2a, 0x20, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, - 0x6e, 0x20, 0x6f, 0x66, 0x20, 0x74, 0x68, 0x69, - 0x73, 0x20, 0x66, 0x69, 0x6c, 0x65, 0x20, 0x69, - 0x6e, 0x74, 0x6f, 0x20, 0x63, 0x6f, 0x6d, 0x62, - 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, - 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x6f, 0x74, - 0x68, 0x65, 0x72, 0x20, 0x70, 0x72, 0x6f, 0x67, - 0x72, 0x61, 0x6d, 0x73, 0x2c, 0x0a, 0x20, 0x2a, - 0x20, 0x61, 0x6e, 0x64, 0x20, 0x74, 0x6f, 0x20, - 0x64, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, - 0x74, 0x65, 0x20, 0x74, 0x68, 0x6f, 0x73, 0x65, - 0x20, 0x63, 0x6f, 0x6d, 0x62, 0x69, 0x6e, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x20, 0x77, 0x69, - 0x74, 0x68, 0x6f, 0x75, 0x74, 0x20, 0x61, 0x6e, - 0x79, 0x20, 0x72, 0x65, 0x73, 0x74, 0x72, 0x69, - 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x0a, 0x20, 0x2a, - 0x20, 0x63, 0x6f, 0x6d, 0x69, 0x6e, 0x67, 0x20, - 0x66, 0x72, 0x6f, 0x6d, 0x20, 0x74, 0x68, 0x65, - 0x20, 0x75, 0x73, 0x65, 0x20, 0x6f, 0x66, 0x20, - 0x74, 0x68, 0x69, 0x73, 0x20, 0x66, 0x69, 0x6c, - 0x65, 0x2e, 0x20, 0x20, 0x28, 0x54, 0x68, 0x65, - 0x20, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, - 0x20, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x20, - 0x4c, 0x69, 0x63, 0x65, 0x6e, 0x73, 0x65, 0x0a, - 0x20, 0x2a, 0x20, 0x72, 0x65, 0x73, 0x74, 0x72, - 0x69, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x20, - 0x64, 0x6f, 0x20, 0x61, 0x70, 0x70, 0x6c, 0x79, - 0x20, 0x69, 0x6e, 0x20, 0x6f, 0x74, 0x68, 0x65, - 0x72, 0x20, 0x72, 0x65, 0x73, 0x70, 0x65, 0x63, - 0x74, 0x73, 0x3b, 0x20, 0x66, 0x6f, 0x72, 0x20, - 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x2c, - 0x20, 0x74, 0x68, 0x65, 0x79, 0x20, 0x63, 0x6f, - 0x76, 0x65, 0x72, 0x0a, 0x20, 0x2a, 0x20, 0x6d, - 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x20, 0x6f, 0x66, 0x20, 0x74, - 0x68, 0x65, 0x20, 0x66, 0x69, 0x6c, 0x65, 0x2c, - 0x20, 0x61, 0x6e, 0x64, 0x20, 0x64, 0x69, 0x73, - 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, - 0x6e, 0x20, 0x77, 0x68, 0x65, 0x6e, 0x20, 0x6e, - 0x6f, 0x74, 0x20, 0x6c, 0x69, 0x6e, 0x6b, 0x65, - 0x64, 0x20, 0x69, 0x6e, 0x74, 0x6f, 0x0a, 0x20, - 0x2a, 0x20, 0x61, 0x20, 0x63, 0x6f, 0x6d, 0x62, - 0x69, 0x6e, 0x65, 0x64, 0x20, 0x65, 0x78, 0x65, - 0x63, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x2e, - 0x29, 0x0a, 0x20, 0x2a, 0x0a, 0x20, 0x2a, 0x20, - 0x54, 0x68, 0x69, 0x73, 0x20, 0x66, 0x69, 0x6c, - 0x65, 0x20, 0x69, 0x73, 0x20, 0x64, 0x69, 0x73, - 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x64, - 0x20, 0x69, 0x6e, 0x20, 0x74, 0x68, 0x65, 0x20, - 0x68, 0x6f, 0x70, 0x65, 0x20, 0x74, 0x68, 0x61, - 0x74, 0x20, 0x69, 0x74, 0x20, 0x77, 0x69, 0x6c, - 0x6c, 0x20, 0x62, 0x65, 0x20, 0x75, 0x73, 0x65, - 0x66, 0x75, 0x6c, 0x2c, 0x20, 0x62, 0x75, 0x74, - 0x0a, 0x20, 0x2a, 0x20, 0x57, 0x49, 0x54, 0x48, - 0x4f, 0x55, 0x54, 0x20, 0x41, 0x4e, 0x59, 0x20, - 0x57, 0x41, 0x52, 0x52, 0x41, 0x4e, 0x54, 0x59, - 0x3b, 0x20, 0x77, 0x69, 0x74, 0x68, 0x6f, 0x75, - 0x74, 0x20, 0x65, 0x76, 0x65, 0x6e, 0x20, 0x74, - 0x68, 0x65, 0x20, 0x69, 0x6d, 0x70, 0x6c, 0x69, - 0x65, 0x64, 0x20, 0x77, 0x61, 0x72, 0x72, 0x61, - 0x6e, 0x74, 0x79, 0x20, 0x6f, 0x66, 0x0a, 0x20, - 0x2a, 0x20, 0x4d, 0x45, 0x52, 0x43, 0x48, 0x41, - 0x4e, 0x54, 0x41, 0x42, 0x49, 0x4c, 0x49, 0x54, - 0x59, 0x20, 0x6f, 0x72, 0x20, 0x46, 0x49, 0x54, - 0x4e, 0x45, 0x53, 0x53, 0x20, 0x46, 0x4f, 0x52, - 0x20, 0x41, 0x20, 0x50, 0x41, 0x52, 0x54, 0x49, - 0x43, 0x55, 0x4c, 0x41, 0x52, 0x20, 0x50, 0x55, - 0x52, 0x50, 0x4f, 0x53, 0x45, 0x2e, 0x20, 0x20, - 0x53, 0x65, 0x65, 0x20, 0x74, 0x68, 0x65, 0x20, - 0x47, 0x4e, 0x55, 0x0a, 0x20, 0x2a, 0x20, 0x47, - 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x20, 0x50, - 0x75, 0x62, 0x6c, 0x69, 0x63, 0x20, 0x4c, 0x69, - 0x63, 0x65, 0x6e, 0x73, 0x65, 0x20, 0x66, 0x6f, - 0x72, 0x20, 0x6d, 0x6f, 0x72, 0x65, 0x20, 0x64, - 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x2e, 0x0a, - 0x20, 0x2a, 0x0a, 0x20, 0x2a, 0x20, 0x59, 0x6f, - 0x75, 0x20, 0x73, 0x68, 0x6f, 0x75, 0x6c, 0x64, - 0x20, 0x68, 0x61, 0x76, 0x65, 0x20, 0x72, 0x65, - 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x20, 0x61, - 0x20, 0x63, 0x6f, 0x70, 0x79, 0x20, 0x6f, 0x66, - 0x20, 0x74, 0x68, 0x65, 0x20, 0x47, 0x4e, 0x55, - 0x20, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, - 0x20, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x20, - 0x4c, 0x69, 0x63, 0x65, 0x6e, 0x73, 0x65, 0x0a, - 0x20, 0x2a, 0x20, 0x61, 0x6c, 0x6f, 0x6e, 0x67, - 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x74, 0x68, - 0x69, 0x73, 0x20, 0x70, 0x72, 0x6f, 0x67, 0x72, - 0x61, 0x6d, 0x3b, 0x20, 0x73, 0x65, 0x65, 0x20, - 0x74, 0x68, 0x65, 0x20, 0x66, 0x69, 0x6c, 0x65, - 0x20, 0x43, 0x4f, 0x50, 0x59, 0x49, 0x4e, 0x47, - 0x2e, 0x20, 0x20, 0x49, 0x66, 0x20, 0x6e, 0x6f, - 0x74, 0x2c, 0x20, 0x77, 0x72, 0x69, 0x74, 0x65, - 0x20, 0x74, 0x6f, 0x0a, 0x20, 0x2a, 0x20, 0x74, - 0x68, 0x65, 0x20, 0x46, 0x72, 0x65, 0x65, 0x20, - 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, 0x72, 0x65, - 0x20, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x2c, 0x20, 0x35, 0x31, 0x20, - 0x46, 0x72, 0x61, 0x6e, 0x6b, 0x6c, 0x69, 0x6e, - 0x20, 0x53, 0x74, 0x72, 0x65, 0x65, 0x74, 0x2c, - 0x20, 0x46, 0x69, 0x66, 0x74, 0x68, 0x20, 0x46, - 0x6c, 0x6f, 0x6f, 0x72, 0x2c, 0x0a, 0x20, 0x2a, - 0x20, 0x42, 0x6f, 0x73, 0x74, 0x6f, 0x6e, 0x2c, - 0x20, 0x4d, 0x41, 0x20, 0x30, 0x32, 0x31, 0x31, - 0x30, 0x2d, 0x31, 0x33, 0x30, 0x31, 0x2c, 0x20, - 0x55, 0x53, 0x41, 0x2e, 0x0a, 0x20, 0x2a, 0x2f, - 0x0a, -}; - -/* - * SHA1 Hashes - */ -static char *commit_id = "3d7f8a6af076c8c3f20071a8935cdbe8228594d1"; -static char *tree_id = "dff2da90b254e1beb889d1f1f1288be1803782df"; -static char *tag_id = "09d373e1dfdc16b129ceec6dd649739911541e05"; -static char *zero_id = "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391"; -static char *one_id = "8b137891791fe96927ad78e64b0aad7bded08bdc"; -static char *two_id = "78981922613b2afb6025042ff6bd878ac1994e85"; -static char *some_id = "fd8430bc864cfcd5f10e5590f8a447e01b942bfe"; - -/* - * In-memory objects - */ -static git_rawobj tree_obj = { - tree_data, - sizeof(tree_data), - GIT_OBJ_TREE -}; - -static git_rawobj tag_obj = { - tag_data, - sizeof(tag_data), - GIT_OBJ_TAG -}; - -static git_rawobj zero_obj = { - zero_data, - 0, - GIT_OBJ_BLOB -}; - -static git_rawobj one_obj = { - one_data, - sizeof(one_data), - GIT_OBJ_BLOB -}; - -static git_rawobj two_obj = { - two_data, - sizeof(two_data), - GIT_OBJ_BLOB -}; - -static git_rawobj commit_obj = { - commit_data, - sizeof(commit_data), - GIT_OBJ_COMMIT -}; - -static git_rawobj some_obj = { - some_data, - sizeof(some_data), - GIT_OBJ_BLOB -}; - -static git_rawobj junk_obj = { - NULL, - 0, - GIT_OBJ_BAD -}; diff --git a/vendor/libgit2/tests/object/raw/fromstr.c b/vendor/libgit2/tests/object/raw/fromstr.c deleted file mode 100644 index 8c11c105f..000000000 --- a/vendor/libgit2/tests/object/raw/fromstr.c +++ /dev/null @@ -1,30 +0,0 @@ - -#include "clar_libgit2.h" - -#include "odb.h" - -void test_object_raw_fromstr__fail_on_invalid_oid_string(void) -{ - git_oid out; - cl_git_fail(git_oid_fromstr(&out, "")); - cl_git_fail(git_oid_fromstr(&out, "moo")); - cl_git_fail(git_oid_fromstr(&out, "16a67770b7d8d72317c4b775213c23a8bd74f5ez")); -} - -void test_object_raw_fromstr__succeed_on_valid_oid_string(void) -{ - git_oid out; - unsigned char exp[] = { - 0x16, 0xa6, 0x77, 0x70, 0xb7, - 0xd8, 0xd7, 0x23, 0x17, 0xc4, - 0xb7, 0x75, 0x21, 0x3c, 0x23, - 0xa8, 0xbd, 0x74, 0xf5, 0xe0, - }; - - cl_git_pass(git_oid_fromstr(&out, "16a67770b7d8d72317c4b775213c23a8bd74f5e0")); - cl_git_pass(memcmp(out.id, exp, sizeof(out.id))); - - cl_git_pass(git_oid_fromstr(&out, "16A67770B7D8D72317C4b775213C23A8BD74F5E0")); - cl_git_pass(memcmp(out.id, exp, sizeof(out.id))); - -} diff --git a/vendor/libgit2/tests/object/raw/hash.c b/vendor/libgit2/tests/object/raw/hash.c deleted file mode 100644 index ede31e145..000000000 --- a/vendor/libgit2/tests/object/raw/hash.c +++ /dev/null @@ -1,166 +0,0 @@ - -#include "clar_libgit2.h" - -#include "odb.h" -#include "hash.h" - -#include "data.h" - -static void hash_object_pass(git_oid *oid, git_rawobj *obj) -{ - cl_git_pass(git_odb_hash(oid, obj->data, obj->len, obj->type)); -} -static void hash_object_fail(git_oid *oid, git_rawobj *obj) -{ - cl_git_fail(git_odb_hash(oid, obj->data, obj->len, obj->type)); -} - -static char *hello_id = "22596363b3de40b06f981fb85d82312e8c0ed511"; -static char *hello_text = "hello world\n"; - -static char *bye_id = "ce08fe4884650f067bd5703b6a59a8b3b3c99a09"; -static char *bye_text = "bye world\n"; - -void test_object_raw_hash__hash_by_blocks(void) -{ - git_hash_ctx ctx; - git_oid id1, id2; - - cl_git_pass(git_hash_ctx_init(&ctx)); - - /* should already be init'd */ - cl_git_pass(git_hash_update(&ctx, hello_text, strlen(hello_text))); - cl_git_pass(git_hash_final(&id2, &ctx)); - cl_git_pass(git_oid_fromstr(&id1, hello_id)); - cl_assert(git_oid_cmp(&id1, &id2) == 0); - - /* reinit should permit reuse */ - cl_git_pass(git_hash_init(&ctx)); - cl_git_pass(git_hash_update(&ctx, bye_text, strlen(bye_text))); - cl_git_pass(git_hash_final(&id2, &ctx)); - cl_git_pass(git_oid_fromstr(&id1, bye_id)); - cl_assert(git_oid_cmp(&id1, &id2) == 0); - - git_hash_ctx_cleanup(&ctx); -} - -void test_object_raw_hash__hash_buffer_in_single_call(void) -{ - git_oid id1, id2; - - cl_git_pass(git_oid_fromstr(&id1, hello_id)); - git_hash_buf(&id2, hello_text, strlen(hello_text)); - cl_assert(git_oid_cmp(&id1, &id2) == 0); -} - -void test_object_raw_hash__hash_vector(void) -{ - git_oid id1, id2; - git_buf_vec vec[2]; - - cl_git_pass(git_oid_fromstr(&id1, hello_id)); - - vec[0].data = hello_text; - vec[0].len = 4; - vec[1].data = hello_text+4; - vec[1].len = strlen(hello_text)-4; - - git_hash_vec(&id2, vec, 2); - - cl_assert(git_oid_cmp(&id1, &id2) == 0); -} - -void test_object_raw_hash__hash_junk_data(void) -{ - git_oid id, id_zero; - - cl_git_pass(git_oid_fromstr(&id_zero, zero_id)); - - /* invalid types: */ - junk_obj.data = some_data; - hash_object_fail(&id, &junk_obj); - - junk_obj.type = GIT_OBJ__EXT1; - hash_object_fail(&id, &junk_obj); - - junk_obj.type = GIT_OBJ__EXT2; - hash_object_fail(&id, &junk_obj); - - junk_obj.type = GIT_OBJ_OFS_DELTA; - hash_object_fail(&id, &junk_obj); - - junk_obj.type = GIT_OBJ_REF_DELTA; - hash_object_fail(&id, &junk_obj); - - /* data can be NULL only if len is zero: */ - junk_obj.type = GIT_OBJ_BLOB; - junk_obj.data = NULL; - hash_object_pass(&id, &junk_obj); - cl_assert(git_oid_cmp(&id, &id_zero) == 0); - - junk_obj.len = 1; - hash_object_fail(&id, &junk_obj); -} - -void test_object_raw_hash__hash_commit_object(void) -{ - git_oid id1, id2; - - cl_git_pass(git_oid_fromstr(&id1, commit_id)); - hash_object_pass(&id2, &commit_obj); - cl_assert(git_oid_cmp(&id1, &id2) == 0); -} - -void test_object_raw_hash__hash_tree_object(void) -{ - git_oid id1, id2; - - cl_git_pass(git_oid_fromstr(&id1, tree_id)); - hash_object_pass(&id2, &tree_obj); - cl_assert(git_oid_cmp(&id1, &id2) == 0); -} - -void test_object_raw_hash__hash_tag_object(void) -{ - git_oid id1, id2; - - cl_git_pass(git_oid_fromstr(&id1, tag_id)); - hash_object_pass(&id2, &tag_obj); - cl_assert(git_oid_cmp(&id1, &id2) == 0); -} - -void test_object_raw_hash__hash_zero_length_object(void) -{ - git_oid id1, id2; - - cl_git_pass(git_oid_fromstr(&id1, zero_id)); - hash_object_pass(&id2, &zero_obj); - cl_assert(git_oid_cmp(&id1, &id2) == 0); -} - -void test_object_raw_hash__hash_one_byte_object(void) -{ - git_oid id1, id2; - - cl_git_pass(git_oid_fromstr(&id1, one_id)); - hash_object_pass(&id2, &one_obj); - cl_assert(git_oid_cmp(&id1, &id2) == 0); -} - -void test_object_raw_hash__hash_two_byte_object(void) -{ - git_oid id1, id2; - - cl_git_pass(git_oid_fromstr(&id1, two_id)); - hash_object_pass(&id2, &two_obj); - cl_assert(git_oid_cmp(&id1, &id2) == 0); -} - -void test_object_raw_hash__hash_multi_byte_object(void) -{ - git_oid id1, id2; - - cl_git_pass(git_oid_fromstr(&id1, some_id)); - hash_object_pass(&id2, &some_obj); - cl_assert(git_oid_cmp(&id1, &id2) == 0); -} diff --git a/vendor/libgit2/tests/object/raw/short.c b/vendor/libgit2/tests/object/raw/short.c deleted file mode 100644 index 813cd86b6..000000000 --- a/vendor/libgit2/tests/object/raw/short.c +++ /dev/null @@ -1,137 +0,0 @@ - -#include "clar_libgit2.h" - -#include "odb.h" -#include "hash.h" - -void test_object_raw_short__oid_shortener_no_duplicates(void) -{ - git_oid_shorten *os; - int min_len; - - os = git_oid_shorten_new(0); - cl_assert(os != NULL); - - git_oid_shorten_add(os, "22596363b3de40b06f981fb85d82312e8c0ed511"); - git_oid_shorten_add(os, "ce08fe4884650f067bd5703b6a59a8b3b3c99a09"); - git_oid_shorten_add(os, "16a0123456789abcdef4b775213c23a8bd74f5e0"); - min_len = git_oid_shorten_add(os, "ce08fe4884650f067bd5703b6a59a8b3b3c99a09"); - - cl_assert(min_len == GIT_OID_HEXSZ + 1); - - git_oid_shorten_free(os); -} - -static int insert_sequential_oids( - char ***out, git_oid_shorten *os, int n, int fail) -{ - int i, min_len = 0; - char numbuf[16]; - git_oid oid; - char **oids = git__calloc(n, sizeof(char *)); - cl_assert(oids != NULL); - - for (i = 0; i < n; ++i) { - p_snprintf(numbuf, sizeof(numbuf), "%u", (unsigned int)i); - git_hash_buf(&oid, numbuf, strlen(numbuf)); - - oids[i] = git__malloc(GIT_OID_HEXSZ + 1); - cl_assert(oids[i]); - git_oid_nfmt(oids[i], GIT_OID_HEXSZ + 1, &oid); - - min_len = git_oid_shorten_add(os, oids[i]); - - /* After "fail", we expect git_oid_shorten_add to fail */ - if (fail >= 0 && i >= fail) - cl_assert(min_len < 0); - else - cl_assert(min_len >= 0); - } - - *out = oids; - - return min_len; -} - -static void free_oids(int n, char **oids) -{ - int i; - - for (i = 0; i < n; ++i) { - git__free(oids[i]); - } - git__free(oids); -} - -void test_object_raw_short__oid_shortener_stresstest_git_oid_shorten(void) -{ -#define MAX_OIDS 1000 - - git_oid_shorten *os; - size_t i, j; - int min_len = 0, found_collision; - char **oids; - - os = git_oid_shorten_new(0); - cl_assert(os != NULL); - - /* - * Insert in the shortener 1000 unique SHA1 ids - */ - min_len = insert_sequential_oids(&oids, os, MAX_OIDS, MAX_OIDS); - cl_assert(min_len > 0); - - /* - * Compare the first `min_char - 1` characters of each - * SHA1 OID. If the minimizer worked, we should find at - * least one collision - */ - found_collision = 0; - for (i = 0; i < MAX_OIDS; ++i) { - for (j = i + 1; j < MAX_OIDS; ++j) { - if (memcmp(oids[i], oids[j], min_len - 1) == 0) - found_collision = 1; - } - } - cl_assert_equal_b(true, found_collision); - - /* - * Compare the first `min_char` characters of each - * SHA1 OID. If the minimizer worked, every single preffix - * should be unique. - */ - found_collision = 0; - for (i = 0; i < MAX_OIDS; ++i) { - for (j = i + 1; j < MAX_OIDS; ++j) { - if (memcmp(oids[i], oids[j], min_len) == 0) - found_collision = 1; - } - } - cl_assert_equal_b(false, found_collision); - - /* cleanup */ - free_oids(MAX_OIDS, oids); - git_oid_shorten_free(os); - -#undef MAX_OIDS -} - -void test_object_raw_short__oid_shortener_too_much_oids(void) -{ - /* The magic number of oids at which an oid_shortener will fail. - * This was experimentally established. */ -#define MAX_OIDS 24556 - - git_oid_shorten *os; - char **oids; - - os = git_oid_shorten_new(0); - cl_assert(os != NULL); - - cl_assert(insert_sequential_oids(&oids, os, MAX_OIDS, MAX_OIDS - 1) < 0); - - free_oids(MAX_OIDS, oids); - git_oid_shorten_free(os); - -#undef MAX_OIDS -} diff --git a/vendor/libgit2/tests/object/raw/size.c b/vendor/libgit2/tests/object/raw/size.c deleted file mode 100644 index 930c6de23..000000000 --- a/vendor/libgit2/tests/object/raw/size.c +++ /dev/null @@ -1,13 +0,0 @@ - -#include "clar_libgit2.h" - -#include "odb.h" - -void test_object_raw_size__validate_oid_size(void) -{ - git_oid out; - cl_assert(20 == GIT_OID_RAWSZ); - cl_assert(40 == GIT_OID_HEXSZ); - cl_assert(sizeof(out) == GIT_OID_RAWSZ); - cl_assert(sizeof(out.id) == GIT_OID_RAWSZ); -} diff --git a/vendor/libgit2/tests/object/raw/type2string.c b/vendor/libgit2/tests/object/raw/type2string.c deleted file mode 100644 index a3585487f..000000000 --- a/vendor/libgit2/tests/object/raw/type2string.c +++ /dev/null @@ -1,54 +0,0 @@ - -#include "clar_libgit2.h" - -#include "odb.h" -#include "hash.h" - -void test_object_raw_type2string__convert_type_to_string(void) -{ - cl_assert_equal_s(git_object_type2string(GIT_OBJ_BAD), ""); - cl_assert_equal_s(git_object_type2string(GIT_OBJ__EXT1), ""); - cl_assert_equal_s(git_object_type2string(GIT_OBJ_COMMIT), "commit"); - cl_assert_equal_s(git_object_type2string(GIT_OBJ_TREE), "tree"); - cl_assert_equal_s(git_object_type2string(GIT_OBJ_BLOB), "blob"); - cl_assert_equal_s(git_object_type2string(GIT_OBJ_TAG), "tag"); - cl_assert_equal_s(git_object_type2string(GIT_OBJ__EXT2), ""); - cl_assert_equal_s(git_object_type2string(GIT_OBJ_OFS_DELTA), "OFS_DELTA"); - cl_assert_equal_s(git_object_type2string(GIT_OBJ_REF_DELTA), "REF_DELTA"); - - cl_assert_equal_s(git_object_type2string(-2), ""); - cl_assert_equal_s(git_object_type2string(8), ""); - cl_assert_equal_s(git_object_type2string(1234), ""); -} - -void test_object_raw_type2string__convert_string_to_type(void) -{ - cl_assert(git_object_string2type(NULL) == GIT_OBJ_BAD); - cl_assert(git_object_string2type("") == GIT_OBJ_BAD); - cl_assert(git_object_string2type("commit") == GIT_OBJ_COMMIT); - cl_assert(git_object_string2type("tree") == GIT_OBJ_TREE); - cl_assert(git_object_string2type("blob") == GIT_OBJ_BLOB); - cl_assert(git_object_string2type("tag") == GIT_OBJ_TAG); - cl_assert(git_object_string2type("OFS_DELTA") == GIT_OBJ_OFS_DELTA); - cl_assert(git_object_string2type("REF_DELTA") == GIT_OBJ_REF_DELTA); - - cl_assert(git_object_string2type("CoMmIt") == GIT_OBJ_BAD); - cl_assert(git_object_string2type("hohoho") == GIT_OBJ_BAD); -} - -void test_object_raw_type2string__check_type_is_loose(void) -{ - cl_assert(git_object_typeisloose(GIT_OBJ_BAD) == 0); - cl_assert(git_object_typeisloose(GIT_OBJ__EXT1) == 0); - cl_assert(git_object_typeisloose(GIT_OBJ_COMMIT) == 1); - cl_assert(git_object_typeisloose(GIT_OBJ_TREE) == 1); - cl_assert(git_object_typeisloose(GIT_OBJ_BLOB) == 1); - cl_assert(git_object_typeisloose(GIT_OBJ_TAG) == 1); - cl_assert(git_object_typeisloose(GIT_OBJ__EXT2) == 0); - cl_assert(git_object_typeisloose(GIT_OBJ_OFS_DELTA) == 0); - cl_assert(git_object_typeisloose(GIT_OBJ_REF_DELTA) == 0); - - cl_assert(git_object_typeisloose(-2) == 0); - cl_assert(git_object_typeisloose(8) == 0); - cl_assert(git_object_typeisloose(1234) == 0); -} diff --git a/vendor/libgit2/tests/object/raw/write.c b/vendor/libgit2/tests/object/raw/write.c deleted file mode 100644 index 273f08f2c..000000000 --- a/vendor/libgit2/tests/object/raw/write.c +++ /dev/null @@ -1,462 +0,0 @@ -#include "clar_libgit2.h" -#include "git2/odb_backend.h" - -#include "fileops.h" -#include "odb.h" - -typedef struct object_data { - char *id; /* object id (sha1) */ - char *dir; /* object store (fan-out) directory name */ - char *file; /* object store filename */ -} object_data; - -static const char *odb_dir = "test-objects"; - -void test_body(object_data *d, git_rawobj *o); - - - -// Helpers -static void remove_object_files(object_data *d) -{ - cl_git_pass(p_unlink(d->file)); - cl_git_pass(p_rmdir(d->dir)); - cl_assert(errno != ENOTEMPTY); - cl_git_pass(p_rmdir(odb_dir) < 0); -} - -static void streaming_write(git_oid *oid, git_odb *odb, git_rawobj *raw) -{ - git_odb_stream *stream; - int error; - - cl_git_pass(git_odb_open_wstream(&stream, odb, raw->len, raw->type)); - git_odb_stream_write(stream, raw->data, raw->len); - error = git_odb_stream_finalize_write(oid, stream); - git_odb_stream_free(stream); - cl_git_pass(error); -} - -static void check_object_files(object_data *d) -{ - cl_assert(git_path_exists(d->dir)); - cl_assert(git_path_exists(d->file)); -} - -static void cmp_objects(git_rawobj *o1, git_rawobj *o2) -{ - cl_assert(o1->type == o2->type); - cl_assert(o1->len == o2->len); - if (o1->len > 0) - cl_assert(memcmp(o1->data, o2->data, o1->len) == 0); -} - -static void make_odb_dir(void) -{ - cl_git_pass(p_mkdir(odb_dir, GIT_OBJECT_DIR_MODE)); -} - - -// Standard test form -void test_body(object_data *d, git_rawobj *o) -{ - git_odb *db; - git_oid id1, id2; - git_odb_object *obj; - git_rawobj tmp; - - make_odb_dir(); - cl_git_pass(git_odb_open(&db, odb_dir)); - cl_git_pass(git_oid_fromstr(&id1, d->id)); - - streaming_write(&id2, db, o); - cl_assert(git_oid_cmp(&id1, &id2) == 0); - check_object_files(d); - - cl_git_pass(git_odb_read(&obj, db, &id1)); - - tmp.data = obj->buffer; - tmp.len = obj->cached.size; - tmp.type = obj->cached.type; - - cmp_objects(&tmp, o); - - git_odb_object_free(obj); - git_odb_free(db); - remove_object_files(d); -} - - -void test_object_raw_write__loose_object(void) -{ - object_data commit = { - "3d7f8a6af076c8c3f20071a8935cdbe8228594d1", - "test-objects/3d", - "test-objects/3d/7f8a6af076c8c3f20071a8935cdbe8228594d1", - }; - - unsigned char commit_data[] = { - 0x74, 0x72, 0x65, 0x65, 0x20, 0x64, 0x66, 0x66, - 0x32, 0x64, 0x61, 0x39, 0x30, 0x62, 0x32, 0x35, - 0x34, 0x65, 0x31, 0x62, 0x65, 0x62, 0x38, 0x38, - 0x39, 0x64, 0x31, 0x66, 0x31, 0x66, 0x31, 0x32, - 0x38, 0x38, 0x62, 0x65, 0x31, 0x38, 0x30, 0x33, - 0x37, 0x38, 0x32, 0x64, 0x66, 0x0a, 0x61, 0x75, - 0x74, 0x68, 0x6f, 0x72, 0x20, 0x41, 0x20, 0x55, - 0x20, 0x54, 0x68, 0x6f, 0x72, 0x20, 0x3c, 0x61, - 0x75, 0x74, 0x68, 0x6f, 0x72, 0x40, 0x65, 0x78, - 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x2e, 0x63, 0x6f, - 0x6d, 0x3e, 0x20, 0x31, 0x32, 0x32, 0x37, 0x38, - 0x31, 0x34, 0x32, 0x39, 0x37, 0x20, 0x2b, 0x30, - 0x30, 0x30, 0x30, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, - 0x69, 0x74, 0x74, 0x65, 0x72, 0x20, 0x43, 0x20, - 0x4f, 0x20, 0x4d, 0x69, 0x74, 0x74, 0x65, 0x72, - 0x20, 0x3c, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, - 0x74, 0x65, 0x72, 0x40, 0x65, 0x78, 0x61, 0x6d, - 0x70, 0x6c, 0x65, 0x2e, 0x63, 0x6f, 0x6d, 0x3e, - 0x20, 0x31, 0x32, 0x32, 0x37, 0x38, 0x31, 0x34, - 0x32, 0x39, 0x37, 0x20, 0x2b, 0x30, 0x30, 0x30, - 0x30, 0x0a, 0x0a, 0x41, 0x20, 0x6f, 0x6e, 0x65, - 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x20, 0x63, 0x6f, - 0x6d, 0x6d, 0x69, 0x74, 0x20, 0x73, 0x75, 0x6d, - 0x6d, 0x61, 0x72, 0x79, 0x0a, 0x0a, 0x54, 0x68, - 0x65, 0x20, 0x62, 0x6f, 0x64, 0x79, 0x20, 0x6f, - 0x66, 0x20, 0x74, 0x68, 0x65, 0x20, 0x63, 0x6f, - 0x6d, 0x6d, 0x69, 0x74, 0x20, 0x6d, 0x65, 0x73, - 0x73, 0x61, 0x67, 0x65, 0x2c, 0x20, 0x63, 0x6f, - 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x69, 0x6e, 0x67, - 0x20, 0x66, 0x75, 0x72, 0x74, 0x68, 0x65, 0x72, - 0x20, 0x65, 0x78, 0x70, 0x6c, 0x61, 0x6e, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x0a, 0x6f, 0x66, 0x20, - 0x74, 0x68, 0x65, 0x20, 0x70, 0x75, 0x72, 0x70, - 0x6f, 0x73, 0x65, 0x20, 0x6f, 0x66, 0x20, 0x74, - 0x68, 0x65, 0x20, 0x63, 0x68, 0x61, 0x6e, 0x67, - 0x65, 0x73, 0x20, 0x69, 0x6e, 0x74, 0x72, 0x6f, - 0x64, 0x75, 0x63, 0x65, 0x64, 0x20, 0x62, 0x79, - 0x20, 0x74, 0x68, 0x65, 0x20, 0x63, 0x6f, 0x6d, - 0x6d, 0x69, 0x74, 0x2e, 0x0a, 0x0a, 0x53, 0x69, - 0x67, 0x6e, 0x65, 0x64, 0x2d, 0x6f, 0x66, 0x2d, - 0x62, 0x79, 0x3a, 0x20, 0x41, 0x20, 0x55, 0x20, - 0x54, 0x68, 0x6f, 0x72, 0x20, 0x3c, 0x61, 0x75, - 0x74, 0x68, 0x6f, 0x72, 0x40, 0x65, 0x78, 0x61, - 0x6d, 0x70, 0x6c, 0x65, 0x2e, 0x63, 0x6f, 0x6d, - 0x3e, 0x0a, - }; - - git_rawobj commit_obj = { - commit_data, - sizeof(commit_data), - GIT_OBJ_COMMIT - }; - - test_body(&commit, &commit_obj); -} - -void test_object_raw_write__loose_tree(void) -{ - static object_data tree = { - "dff2da90b254e1beb889d1f1f1288be1803782df", - "test-objects/df", - "test-objects/df/f2da90b254e1beb889d1f1f1288be1803782df", - }; - - static unsigned char tree_data[] = { - 0x31, 0x30, 0x30, 0x36, 0x34, 0x34, 0x20, 0x6f, - 0x6e, 0x65, 0x00, 0x8b, 0x13, 0x78, 0x91, 0x79, - 0x1f, 0xe9, 0x69, 0x27, 0xad, 0x78, 0xe6, 0x4b, - 0x0a, 0xad, 0x7b, 0xde, 0xd0, 0x8b, 0xdc, 0x31, - 0x30, 0x30, 0x36, 0x34, 0x34, 0x20, 0x73, 0x6f, - 0x6d, 0x65, 0x00, 0xfd, 0x84, 0x30, 0xbc, 0x86, - 0x4c, 0xfc, 0xd5, 0xf1, 0x0e, 0x55, 0x90, 0xf8, - 0xa4, 0x47, 0xe0, 0x1b, 0x94, 0x2b, 0xfe, 0x31, - 0x30, 0x30, 0x36, 0x34, 0x34, 0x20, 0x74, 0x77, - 0x6f, 0x00, 0x78, 0x98, 0x19, 0x22, 0x61, 0x3b, - 0x2a, 0xfb, 0x60, 0x25, 0x04, 0x2f, 0xf6, 0xbd, - 0x87, 0x8a, 0xc1, 0x99, 0x4e, 0x85, 0x31, 0x30, - 0x30, 0x36, 0x34, 0x34, 0x20, 0x7a, 0x65, 0x72, - 0x6f, 0x00, 0xe6, 0x9d, 0xe2, 0x9b, 0xb2, 0xd1, - 0xd6, 0x43, 0x4b, 0x8b, 0x29, 0xae, 0x77, 0x5a, - 0xd8, 0xc2, 0xe4, 0x8c, 0x53, 0x91, - }; - - static git_rawobj tree_obj = { - tree_data, - sizeof(tree_data), - GIT_OBJ_TREE - }; - - test_body(&tree, &tree_obj); -} - -void test_object_raw_write__loose_tag(void) -{ - static object_data tag = { - "09d373e1dfdc16b129ceec6dd649739911541e05", - "test-objects/09", - "test-objects/09/d373e1dfdc16b129ceec6dd649739911541e05", - }; - - static unsigned char tag_data[] = { - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x33, - 0x64, 0x37, 0x66, 0x38, 0x61, 0x36, 0x61, 0x66, - 0x30, 0x37, 0x36, 0x63, 0x38, 0x63, 0x33, 0x66, - 0x32, 0x30, 0x30, 0x37, 0x31, 0x61, 0x38, 0x39, - 0x33, 0x35, 0x63, 0x64, 0x62, 0x65, 0x38, 0x32, - 0x32, 0x38, 0x35, 0x39, 0x34, 0x64, 0x31, 0x0a, - 0x74, 0x79, 0x70, 0x65, 0x20, 0x63, 0x6f, 0x6d, - 0x6d, 0x69, 0x74, 0x0a, 0x74, 0x61, 0x67, 0x20, - 0x76, 0x30, 0x2e, 0x30, 0x2e, 0x31, 0x0a, 0x74, - 0x61, 0x67, 0x67, 0x65, 0x72, 0x20, 0x43, 0x20, - 0x4f, 0x20, 0x4d, 0x69, 0x74, 0x74, 0x65, 0x72, - 0x20, 0x3c, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, - 0x74, 0x65, 0x72, 0x40, 0x65, 0x78, 0x61, 0x6d, - 0x70, 0x6c, 0x65, 0x2e, 0x63, 0x6f, 0x6d, 0x3e, - 0x20, 0x31, 0x32, 0x32, 0x37, 0x38, 0x31, 0x34, - 0x32, 0x39, 0x37, 0x20, 0x2b, 0x30, 0x30, 0x30, - 0x30, 0x0a, 0x0a, 0x54, 0x68, 0x69, 0x73, 0x20, - 0x69, 0x73, 0x20, 0x74, 0x68, 0x65, 0x20, 0x74, - 0x61, 0x67, 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x72, 0x65, - 0x6c, 0x65, 0x61, 0x73, 0x65, 0x20, 0x76, 0x30, - 0x2e, 0x30, 0x2e, 0x31, 0x0a, - }; - - static git_rawobj tag_obj = { - tag_data, - sizeof(tag_data), - GIT_OBJ_TAG - }; - - - test_body(&tag, &tag_obj); -} - -void test_object_raw_write__zero_length(void) -{ - static object_data zero = { - "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391", - "test-objects/e6", - "test-objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391", - }; - - static unsigned char zero_data[] = { - 0x00 /* dummy data */ - }; - - static git_rawobj zero_obj = { - zero_data, - 0, - GIT_OBJ_BLOB - }; - - test_body(&zero, &zero_obj); -} - -void test_object_raw_write__one_byte(void) -{ - static object_data one = { - "8b137891791fe96927ad78e64b0aad7bded08bdc", - "test-objects/8b", - "test-objects/8b/137891791fe96927ad78e64b0aad7bded08bdc", - }; - - static unsigned char one_data[] = { - 0x0a, - }; - - static git_rawobj one_obj = { - one_data, - sizeof(one_data), - GIT_OBJ_BLOB - }; - - test_body(&one, &one_obj); -} - -void test_object_raw_write__two_byte(void) -{ - static object_data two = { - "78981922613b2afb6025042ff6bd878ac1994e85", - "test-objects/78", - "test-objects/78/981922613b2afb6025042ff6bd878ac1994e85", - }; - - static unsigned char two_data[] = { - 0x61, 0x0a, - }; - - static git_rawobj two_obj = { - two_data, - sizeof(two_data), - GIT_OBJ_BLOB - }; - - test_body(&two, &two_obj); -} - -void test_object_raw_write__several_bytes(void) -{ - static object_data some = { - "fd8430bc864cfcd5f10e5590f8a447e01b942bfe", - "test-objects/fd", - "test-objects/fd/8430bc864cfcd5f10e5590f8a447e01b942bfe", - }; - - static unsigned char some_data[] = { - 0x2f, 0x2a, 0x0a, 0x20, 0x2a, 0x20, 0x54, 0x68, - 0x69, 0x73, 0x20, 0x66, 0x69, 0x6c, 0x65, 0x20, - 0x69, 0x73, 0x20, 0x66, 0x72, 0x65, 0x65, 0x20, - 0x73, 0x6f, 0x66, 0x74, 0x77, 0x61, 0x72, 0x65, - 0x3b, 0x20, 0x79, 0x6f, 0x75, 0x20, 0x63, 0x61, - 0x6e, 0x20, 0x72, 0x65, 0x64, 0x69, 0x73, 0x74, - 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 0x69, - 0x74, 0x20, 0x61, 0x6e, 0x64, 0x2f, 0x6f, 0x72, - 0x20, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x0a, - 0x20, 0x2a, 0x20, 0x69, 0x74, 0x20, 0x75, 0x6e, - 0x64, 0x65, 0x72, 0x20, 0x74, 0x68, 0x65, 0x20, - 0x74, 0x65, 0x72, 0x6d, 0x73, 0x20, 0x6f, 0x66, - 0x20, 0x74, 0x68, 0x65, 0x20, 0x47, 0x4e, 0x55, - 0x20, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, - 0x20, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x20, - 0x4c, 0x69, 0x63, 0x65, 0x6e, 0x73, 0x65, 0x2c, - 0x20, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, - 0x20, 0x32, 0x2c, 0x0a, 0x20, 0x2a, 0x20, 0x61, - 0x73, 0x20, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x73, - 0x68, 0x65, 0x64, 0x20, 0x62, 0x79, 0x20, 0x74, - 0x68, 0x65, 0x20, 0x46, 0x72, 0x65, 0x65, 0x20, - 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, 0x72, 0x65, - 0x20, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x2e, 0x0a, 0x20, 0x2a, 0x0a, - 0x20, 0x2a, 0x20, 0x49, 0x6e, 0x20, 0x61, 0x64, - 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x74, - 0x6f, 0x20, 0x74, 0x68, 0x65, 0x20, 0x70, 0x65, - 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, - 0x73, 0x20, 0x69, 0x6e, 0x20, 0x74, 0x68, 0x65, - 0x20, 0x47, 0x4e, 0x55, 0x20, 0x47, 0x65, 0x6e, - 0x65, 0x72, 0x61, 0x6c, 0x20, 0x50, 0x75, 0x62, - 0x6c, 0x69, 0x63, 0x20, 0x4c, 0x69, 0x63, 0x65, - 0x6e, 0x73, 0x65, 0x2c, 0x0a, 0x20, 0x2a, 0x20, - 0x74, 0x68, 0x65, 0x20, 0x61, 0x75, 0x74, 0x68, - 0x6f, 0x72, 0x73, 0x20, 0x67, 0x69, 0x76, 0x65, - 0x20, 0x79, 0x6f, 0x75, 0x20, 0x75, 0x6e, 0x6c, - 0x69, 0x6d, 0x69, 0x74, 0x65, 0x64, 0x20, 0x70, - 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, - 0x6e, 0x20, 0x74, 0x6f, 0x20, 0x6c, 0x69, 0x6e, - 0x6b, 0x20, 0x74, 0x68, 0x65, 0x20, 0x63, 0x6f, - 0x6d, 0x70, 0x69, 0x6c, 0x65, 0x64, 0x0a, 0x20, - 0x2a, 0x20, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, - 0x6e, 0x20, 0x6f, 0x66, 0x20, 0x74, 0x68, 0x69, - 0x73, 0x20, 0x66, 0x69, 0x6c, 0x65, 0x20, 0x69, - 0x6e, 0x74, 0x6f, 0x20, 0x63, 0x6f, 0x6d, 0x62, - 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, - 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x6f, 0x74, - 0x68, 0x65, 0x72, 0x20, 0x70, 0x72, 0x6f, 0x67, - 0x72, 0x61, 0x6d, 0x73, 0x2c, 0x0a, 0x20, 0x2a, - 0x20, 0x61, 0x6e, 0x64, 0x20, 0x74, 0x6f, 0x20, - 0x64, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, - 0x74, 0x65, 0x20, 0x74, 0x68, 0x6f, 0x73, 0x65, - 0x20, 0x63, 0x6f, 0x6d, 0x62, 0x69, 0x6e, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x20, 0x77, 0x69, - 0x74, 0x68, 0x6f, 0x75, 0x74, 0x20, 0x61, 0x6e, - 0x79, 0x20, 0x72, 0x65, 0x73, 0x74, 0x72, 0x69, - 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x0a, 0x20, 0x2a, - 0x20, 0x63, 0x6f, 0x6d, 0x69, 0x6e, 0x67, 0x20, - 0x66, 0x72, 0x6f, 0x6d, 0x20, 0x74, 0x68, 0x65, - 0x20, 0x75, 0x73, 0x65, 0x20, 0x6f, 0x66, 0x20, - 0x74, 0x68, 0x69, 0x73, 0x20, 0x66, 0x69, 0x6c, - 0x65, 0x2e, 0x20, 0x20, 0x28, 0x54, 0x68, 0x65, - 0x20, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, - 0x20, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x20, - 0x4c, 0x69, 0x63, 0x65, 0x6e, 0x73, 0x65, 0x0a, - 0x20, 0x2a, 0x20, 0x72, 0x65, 0x73, 0x74, 0x72, - 0x69, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x20, - 0x64, 0x6f, 0x20, 0x61, 0x70, 0x70, 0x6c, 0x79, - 0x20, 0x69, 0x6e, 0x20, 0x6f, 0x74, 0x68, 0x65, - 0x72, 0x20, 0x72, 0x65, 0x73, 0x70, 0x65, 0x63, - 0x74, 0x73, 0x3b, 0x20, 0x66, 0x6f, 0x72, 0x20, - 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x2c, - 0x20, 0x74, 0x68, 0x65, 0x79, 0x20, 0x63, 0x6f, - 0x76, 0x65, 0x72, 0x0a, 0x20, 0x2a, 0x20, 0x6d, - 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x20, 0x6f, 0x66, 0x20, 0x74, - 0x68, 0x65, 0x20, 0x66, 0x69, 0x6c, 0x65, 0x2c, - 0x20, 0x61, 0x6e, 0x64, 0x20, 0x64, 0x69, 0x73, - 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, - 0x6e, 0x20, 0x77, 0x68, 0x65, 0x6e, 0x20, 0x6e, - 0x6f, 0x74, 0x20, 0x6c, 0x69, 0x6e, 0x6b, 0x65, - 0x64, 0x20, 0x69, 0x6e, 0x74, 0x6f, 0x0a, 0x20, - 0x2a, 0x20, 0x61, 0x20, 0x63, 0x6f, 0x6d, 0x62, - 0x69, 0x6e, 0x65, 0x64, 0x20, 0x65, 0x78, 0x65, - 0x63, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x2e, - 0x29, 0x0a, 0x20, 0x2a, 0x0a, 0x20, 0x2a, 0x20, - 0x54, 0x68, 0x69, 0x73, 0x20, 0x66, 0x69, 0x6c, - 0x65, 0x20, 0x69, 0x73, 0x20, 0x64, 0x69, 0x73, - 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x64, - 0x20, 0x69, 0x6e, 0x20, 0x74, 0x68, 0x65, 0x20, - 0x68, 0x6f, 0x70, 0x65, 0x20, 0x74, 0x68, 0x61, - 0x74, 0x20, 0x69, 0x74, 0x20, 0x77, 0x69, 0x6c, - 0x6c, 0x20, 0x62, 0x65, 0x20, 0x75, 0x73, 0x65, - 0x66, 0x75, 0x6c, 0x2c, 0x20, 0x62, 0x75, 0x74, - 0x0a, 0x20, 0x2a, 0x20, 0x57, 0x49, 0x54, 0x48, - 0x4f, 0x55, 0x54, 0x20, 0x41, 0x4e, 0x59, 0x20, - 0x57, 0x41, 0x52, 0x52, 0x41, 0x4e, 0x54, 0x59, - 0x3b, 0x20, 0x77, 0x69, 0x74, 0x68, 0x6f, 0x75, - 0x74, 0x20, 0x65, 0x76, 0x65, 0x6e, 0x20, 0x74, - 0x68, 0x65, 0x20, 0x69, 0x6d, 0x70, 0x6c, 0x69, - 0x65, 0x64, 0x20, 0x77, 0x61, 0x72, 0x72, 0x61, - 0x6e, 0x74, 0x79, 0x20, 0x6f, 0x66, 0x0a, 0x20, - 0x2a, 0x20, 0x4d, 0x45, 0x52, 0x43, 0x48, 0x41, - 0x4e, 0x54, 0x41, 0x42, 0x49, 0x4c, 0x49, 0x54, - 0x59, 0x20, 0x6f, 0x72, 0x20, 0x46, 0x49, 0x54, - 0x4e, 0x45, 0x53, 0x53, 0x20, 0x46, 0x4f, 0x52, - 0x20, 0x41, 0x20, 0x50, 0x41, 0x52, 0x54, 0x49, - 0x43, 0x55, 0x4c, 0x41, 0x52, 0x20, 0x50, 0x55, - 0x52, 0x50, 0x4f, 0x53, 0x45, 0x2e, 0x20, 0x20, - 0x53, 0x65, 0x65, 0x20, 0x74, 0x68, 0x65, 0x20, - 0x47, 0x4e, 0x55, 0x0a, 0x20, 0x2a, 0x20, 0x47, - 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x20, 0x50, - 0x75, 0x62, 0x6c, 0x69, 0x63, 0x20, 0x4c, 0x69, - 0x63, 0x65, 0x6e, 0x73, 0x65, 0x20, 0x66, 0x6f, - 0x72, 0x20, 0x6d, 0x6f, 0x72, 0x65, 0x20, 0x64, - 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x2e, 0x0a, - 0x20, 0x2a, 0x0a, 0x20, 0x2a, 0x20, 0x59, 0x6f, - 0x75, 0x20, 0x73, 0x68, 0x6f, 0x75, 0x6c, 0x64, - 0x20, 0x68, 0x61, 0x76, 0x65, 0x20, 0x72, 0x65, - 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x20, 0x61, - 0x20, 0x63, 0x6f, 0x70, 0x79, 0x20, 0x6f, 0x66, - 0x20, 0x74, 0x68, 0x65, 0x20, 0x47, 0x4e, 0x55, - 0x20, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, - 0x20, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x20, - 0x4c, 0x69, 0x63, 0x65, 0x6e, 0x73, 0x65, 0x0a, - 0x20, 0x2a, 0x20, 0x61, 0x6c, 0x6f, 0x6e, 0x67, - 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x74, 0x68, - 0x69, 0x73, 0x20, 0x70, 0x72, 0x6f, 0x67, 0x72, - 0x61, 0x6d, 0x3b, 0x20, 0x73, 0x65, 0x65, 0x20, - 0x74, 0x68, 0x65, 0x20, 0x66, 0x69, 0x6c, 0x65, - 0x20, 0x43, 0x4f, 0x50, 0x59, 0x49, 0x4e, 0x47, - 0x2e, 0x20, 0x20, 0x49, 0x66, 0x20, 0x6e, 0x6f, - 0x74, 0x2c, 0x20, 0x77, 0x72, 0x69, 0x74, 0x65, - 0x20, 0x74, 0x6f, 0x0a, 0x20, 0x2a, 0x20, 0x74, - 0x68, 0x65, 0x20, 0x46, 0x72, 0x65, 0x65, 0x20, - 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, 0x72, 0x65, - 0x20, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x2c, 0x20, 0x35, 0x31, 0x20, - 0x46, 0x72, 0x61, 0x6e, 0x6b, 0x6c, 0x69, 0x6e, - 0x20, 0x53, 0x74, 0x72, 0x65, 0x65, 0x74, 0x2c, - 0x20, 0x46, 0x69, 0x66, 0x74, 0x68, 0x20, 0x46, - 0x6c, 0x6f, 0x6f, 0x72, 0x2c, 0x0a, 0x20, 0x2a, - 0x20, 0x42, 0x6f, 0x73, 0x74, 0x6f, 0x6e, 0x2c, - 0x20, 0x4d, 0x41, 0x20, 0x30, 0x32, 0x31, 0x31, - 0x30, 0x2d, 0x31, 0x33, 0x30, 0x31, 0x2c, 0x20, - 0x55, 0x53, 0x41, 0x2e, 0x0a, 0x20, 0x2a, 0x2f, - 0x0a, - }; - - static git_rawobj some_obj = { - some_data, - sizeof(some_data), - GIT_OBJ_BLOB - }; - - test_body(&some, &some_obj); -} diff --git a/vendor/libgit2/tests/object/shortid.c b/vendor/libgit2/tests/object/shortid.c deleted file mode 100644 index d854cb78e..000000000 --- a/vendor/libgit2/tests/object/shortid.c +++ /dev/null @@ -1,51 +0,0 @@ -#include "clar_libgit2.h" - -git_repository *_repo; - -void test_object_shortid__initialize(void) -{ - cl_git_pass(git_repository_open(&_repo, cl_fixture("duplicate.git"))); -} - -void test_object_shortid__cleanup(void) -{ - git_repository_free(_repo); - _repo = NULL; -} - -void test_object_shortid__select(void) -{ - git_oid full; - git_object *obj; - git_buf shorty = {0}; - - git_oid_fromstr(&full, "ce013625030ba8dba906f756967f9e9ca394464a"); - cl_git_pass(git_object_lookup(&obj, _repo, &full, GIT_OBJ_ANY)); - cl_git_pass(git_object_short_id(&shorty, obj)); - cl_assert_equal_i(7, shorty.size); - cl_assert_equal_s("ce01362", shorty.ptr); - git_object_free(obj); - - git_oid_fromstr(&full, "038d718da6a1ebbc6a7780a96ed75a70cc2ad6e2"); - cl_git_pass(git_object_lookup(&obj, _repo, &full, GIT_OBJ_ANY)); - cl_git_pass(git_object_short_id(&shorty, obj)); - cl_assert_equal_i(7, shorty.size); - cl_assert_equal_s("038d718", shorty.ptr); - git_object_free(obj); - - git_oid_fromstr(&full, "dea509d097ce692e167dfc6a48a7a280cc5e877e"); - cl_git_pass(git_object_lookup(&obj, _repo, &full, GIT_OBJ_ANY)); - cl_git_pass(git_object_short_id(&shorty, obj)); - cl_assert_equal_i(9, shorty.size); - cl_assert_equal_s("dea509d09", shorty.ptr); - git_object_free(obj); - - git_oid_fromstr(&full, "dea509d0b3cb8ee0650f6ca210bc83f4678851ba"); - cl_git_pass(git_object_lookup(&obj, _repo, &full, GIT_OBJ_ANY)); - cl_git_pass(git_object_short_id(&shorty, obj)); - cl_assert_equal_i(9, shorty.size); - cl_assert_equal_s("dea509d0b", shorty.ptr); - git_object_free(obj); - - git_buf_free(&shorty); -} diff --git a/vendor/libgit2/tests/object/tag/list.c b/vendor/libgit2/tests/object/tag/list.c deleted file mode 100644 index 6d5a24347..000000000 --- a/vendor/libgit2/tests/object/tag/list.c +++ /dev/null @@ -1,115 +0,0 @@ -#include "clar_libgit2.h" - -#include "tag.h" - -static git_repository *g_repo; - -#define MAX_USED_TAGS 6 - -struct pattern_match_t -{ - const char* pattern; - const size_t expected_matches; - const char* expected_results[MAX_USED_TAGS]; -}; - -// Helpers -static void ensure_tag_pattern_match(git_repository *repo, - const struct pattern_match_t* data) -{ - int already_found[MAX_USED_TAGS] = { 0 }; - git_strarray tag_list; - int error = 0; - size_t sucessfully_found = 0; - size_t i, j; - - cl_assert(data->expected_matches <= MAX_USED_TAGS); - - if ((error = git_tag_list_match(&tag_list, data->pattern, repo)) < 0) - goto exit; - - if (tag_list.count != data->expected_matches) - { - error = GIT_ERROR; - goto exit; - } - - // we have to be prepared that tags come in any order. - for (i = 0; i < tag_list.count; i++) - { - for (j = 0; j < data->expected_matches; j++) - { - if (!already_found[j] && !strcmp(data->expected_results[j], tag_list.strings[i])) - { - already_found[j] = 1; - sucessfully_found++; - break; - } - } - } - cl_assert_equal_i((int)sucessfully_found, (int)data->expected_matches); - -exit: - git_strarray_free(&tag_list); - cl_git_pass(error); -} - -// Fixture setup and teardown -void test_object_tag_list__initialize(void) -{ - g_repo = cl_git_sandbox_init("testrepo"); -} - -void test_object_tag_list__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -void test_object_tag_list__list_all(void) -{ - // list all tag names from the repository - git_strarray tag_list; - - cl_git_pass(git_tag_list(&tag_list, g_repo)); - - cl_assert_equal_i((int)tag_list.count, 6); - - git_strarray_free(&tag_list); -} - -static const struct pattern_match_t matches[] = { - // All tags, including a packed one and two namespaced ones. - { "", 6, { "e90810b", "point_to_blob", "test", "packed-tag", "foo/bar", "foo/foo/bar" } }, - - // beginning with - { "t*", 1, { "test" } }, - - // ending with - { "*b", 2, { "e90810b", "point_to_blob" } }, - - // exact match - { "e", 0 }, - { "e90810b", 1, { "e90810b" } }, - - // either or - { "e90810[ab]", 1, { "e90810b" } }, - - // glob in the middle - { "foo/*/bar", 1, { "foo/foo/bar" } }, - - // The matching of '*' is based on plain string matching analog to the regular expression ".*" - // => a '/' in the tag name has no special meaning. - // Compare to `git tag -l "*bar"` - { "*bar", 2, { "foo/bar", "foo/foo/bar" } }, - - // End of list - { NULL } -}; - -void test_object_tag_list__list_by_pattern(void) -{ - // list all tag names from the repository matching a specified pattern - size_t i = 0; - while (matches[i].pattern) - ensure_tag_pattern_match(g_repo, &matches[i++]); -} diff --git a/vendor/libgit2/tests/object/tag/peel.c b/vendor/libgit2/tests/object/tag/peel.c deleted file mode 100644 index e2cd8d6a8..000000000 --- a/vendor/libgit2/tests/object/tag/peel.c +++ /dev/null @@ -1,61 +0,0 @@ -#include "clar_libgit2.h" -#include "tag.h" - -static git_repository *repo; -static git_tag *tag; -static git_object *target; - -void test_object_tag_peel__initialize(void) -{ - cl_fixture_sandbox("testrepo.git"); - cl_git_pass(git_repository_open(&repo, "testrepo.git")); -} - -void test_object_tag_peel__cleanup(void) -{ - git_tag_free(tag); - tag = NULL; - - git_object_free(target); - target = NULL; - - git_repository_free(repo); - repo = NULL; - - cl_fixture_cleanup("testrepo.git"); -} - -static void retrieve_tag_from_oid(git_tag **tag_out, git_repository *repo, const char *sha) -{ - git_oid oid; - - cl_git_pass(git_oid_fromstr(&oid, sha)); - cl_git_pass(git_tag_lookup(tag_out, repo, &oid)); -} - -void test_object_tag_peel__can_peel_to_a_commit(void) -{ - retrieve_tag_from_oid(&tag, repo, "7b4384978d2493e851f9cca7858815fac9b10980"); - - cl_git_pass(git_tag_peel(&target, tag)); - cl_assert(git_object_type(target) == GIT_OBJ_COMMIT); - cl_git_pass(git_oid_streq(git_object_id(target), "e90810b8df3e80c413d903f631643c716887138d")); -} - -void test_object_tag_peel__can_peel_several_nested_tags_to_a_commit(void) -{ - retrieve_tag_from_oid(&tag, repo, "b25fa35b38051e4ae45d4222e795f9df2e43f1d1"); - - cl_git_pass(git_tag_peel(&target, tag)); - cl_assert(git_object_type(target) == GIT_OBJ_COMMIT); - cl_git_pass(git_oid_streq(git_object_id(target), "e90810b8df3e80c413d903f631643c716887138d")); -} - -void test_object_tag_peel__can_peel_to_a_non_commit(void) -{ - retrieve_tag_from_oid(&tag, repo, "521d87c1ec3aef9824daf6d96cc0ae3710766d91"); - - cl_git_pass(git_tag_peel(&target, tag)); - cl_assert(git_object_type(target) == GIT_OBJ_BLOB); - cl_git_pass(git_oid_streq(git_object_id(target), "1385f264afb75a56a5bec74243be9b367ba4ca08")); -} diff --git a/vendor/libgit2/tests/object/tag/read.c b/vendor/libgit2/tests/object/tag/read.c deleted file mode 100644 index c9787a413..000000000 --- a/vendor/libgit2/tests/object/tag/read.c +++ /dev/null @@ -1,142 +0,0 @@ -#include "clar_libgit2.h" - -#include "tag.h" - -static const char *tag1_id = "b25fa35b38051e4ae45d4222e795f9df2e43f1d1"; -static const char *tag2_id = "7b4384978d2493e851f9cca7858815fac9b10980"; -static const char *tagged_commit = "e90810b8df3e80c413d903f631643c716887138d"; -static const char *bad_tag_id = "eda9f45a2a98d4c17a09d681d88569fa4ea91755"; -static const char *badly_tagged_commit = "e90810b8df3e80c413d903f631643c716887138d"; -static const char *short_tag_id = "5da7760512a953e3c7c4e47e4392c7a4338fb729"; -static const char *short_tagged_commit = "4a5ed60bafcf4638b7c8356bd4ce1916bfede93c"; -static const char *taggerless = "4a23e2e65ad4e31c4c9db7dc746650bfad082679"; - -static git_repository *g_repo; - -// Fixture setup and teardown -void test_object_tag_read__initialize(void) -{ - g_repo = cl_git_sandbox_init("testrepo"); -} - -void test_object_tag_read__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - - -void test_object_tag_read__parse(void) -{ - // read and parse a tag from the repository - git_tag *tag1, *tag2; - git_commit *commit; - git_oid id1, id2, id_commit; - - git_oid_fromstr(&id1, tag1_id); - git_oid_fromstr(&id2, tag2_id); - git_oid_fromstr(&id_commit, tagged_commit); - - cl_git_pass(git_tag_lookup(&tag1, g_repo, &id1)); - - cl_assert_equal_s(git_tag_name(tag1), "test"); - cl_assert(git_tag_target_type(tag1) == GIT_OBJ_TAG); - - cl_git_pass(git_tag_target((git_object **)&tag2, tag1)); - cl_assert(tag2 != NULL); - - cl_assert(git_oid_cmp(&id2, git_tag_id(tag2)) == 0); - - cl_git_pass(git_tag_target((git_object **)&commit, tag2)); - cl_assert(commit != NULL); - - cl_assert(git_oid_cmp(&id_commit, git_commit_id(commit)) == 0); - - git_tag_free(tag1); - git_tag_free(tag2); - git_commit_free(commit); -} - -void test_object_tag_read__parse_without_tagger(void) -{ - // read and parse a tag without a tagger field - git_repository *bad_tag_repo; - git_tag *bad_tag; - git_commit *commit; - git_oid id, id_commit; - - // TODO: This is a little messy - cl_git_pass(git_repository_open(&bad_tag_repo, cl_fixture("bad_tag.git"))); - - git_oid_fromstr(&id, bad_tag_id); - git_oid_fromstr(&id_commit, badly_tagged_commit); - - cl_git_pass(git_tag_lookup(&bad_tag, bad_tag_repo, &id)); - cl_assert(bad_tag != NULL); - - cl_assert_equal_s(git_tag_name(bad_tag), "e90810b"); - cl_assert(git_oid_cmp(&id, git_tag_id(bad_tag)) == 0); - cl_assert(bad_tag->tagger == NULL); - - cl_git_pass(git_tag_target((git_object **)&commit, bad_tag)); - cl_assert(commit != NULL); - - cl_assert(git_oid_cmp(&id_commit, git_commit_id(commit)) == 0); - - - git_tag_free(bad_tag); - git_commit_free(commit); - git_repository_free(bad_tag_repo); -} - -void test_object_tag_read__parse_without_message(void) -{ - // read and parse a tag without a message field - git_repository *short_tag_repo; - git_tag *short_tag; - git_commit *commit; - git_oid id, id_commit; - - // TODO: This is a little messy - cl_git_pass(git_repository_open(&short_tag_repo, cl_fixture("short_tag.git"))); - - git_oid_fromstr(&id, short_tag_id); - git_oid_fromstr(&id_commit, short_tagged_commit); - - cl_git_pass(git_tag_lookup(&short_tag, short_tag_repo, &id)); - cl_assert(short_tag != NULL); - - cl_assert_equal_s(git_tag_name(short_tag), "no_description"); - cl_assert(git_oid_cmp(&id, git_tag_id(short_tag)) == 0); - cl_assert(short_tag->message == NULL); - - cl_git_pass(git_tag_target((git_object **)&commit, short_tag)); - cl_assert(commit != NULL); - - cl_assert(git_oid_cmp(&id_commit, git_commit_id(commit)) == 0); - - git_tag_free(short_tag); - git_commit_free(commit); - git_repository_free(short_tag_repo); -} - -void test_object_tag_read__without_tagger_nor_message(void) -{ - git_tag *tag; - git_oid id; - git_repository *repo; - - cl_git_pass(git_repository_open(&repo, cl_fixture("testrepo.git"))); - - cl_git_pass(git_oid_fromstr(&id, taggerless)); - - cl_git_pass(git_tag_lookup(&tag, repo, &id)); - - cl_assert_equal_s(git_tag_name(tag), "taggerless"); - cl_assert(git_tag_target_type(tag) == GIT_OBJ_COMMIT); - - cl_assert(tag->message == NULL); - cl_assert(tag->tagger == NULL); - - git_tag_free(tag); - git_repository_free(repo); -} diff --git a/vendor/libgit2/tests/object/tag/write.c b/vendor/libgit2/tests/object/tag/write.c deleted file mode 100644 index 68e4b6c61..000000000 --- a/vendor/libgit2/tests/object/tag/write.c +++ /dev/null @@ -1,260 +0,0 @@ -#include "clar_libgit2.h" - -static const char* tagger_name = "Vicent Marti"; -static const char* tagger_email = "vicent@github.com"; -static const char* tagger_message = "This is my tag.\n\nThere are many tags, but this one is mine\n"; - -static const char *tag2_id = "7b4384978d2493e851f9cca7858815fac9b10980"; -static const char *tagged_commit = "e90810b8df3e80c413d903f631643c716887138d"; - -static git_repository *g_repo; - -// Fixture setup and teardown -void test_object_tag_write__initialize(void) -{ - g_repo = cl_git_sandbox_init("testrepo"); -} - -void test_object_tag_write__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -void test_object_tag_write__basic(void) -{ - // write a tag to the repository and read it again - git_tag *tag; - git_oid target_id, tag_id; - git_signature *tagger; - const git_signature *tagger1; - git_reference *ref_tag; - git_object *target; - - git_oid_fromstr(&target_id, tagged_commit); - cl_git_pass(git_object_lookup(&target, g_repo, &target_id, GIT_OBJ_COMMIT)); - - /* create signature */ - cl_git_pass(git_signature_new(&tagger, tagger_name, tagger_email, 123456789, 60)); - - cl_git_pass( - git_tag_create(&tag_id, g_repo, - "the-tag", target, tagger, tagger_message, 0) - ); - - git_object_free(target); - git_signature_free(tagger); - - cl_git_pass(git_tag_lookup(&tag, g_repo, &tag_id)); - cl_assert(git_oid_cmp(git_tag_target_id(tag), &target_id) == 0); - - /* Check attributes were set correctly */ - tagger1 = git_tag_tagger(tag); - cl_assert(tagger1 != NULL); - cl_assert_equal_s(tagger1->name, tagger_name); - cl_assert_equal_s(tagger1->email, tagger_email); - cl_assert(tagger1->when.time == 123456789); - cl_assert(tagger1->when.offset == 60); - - cl_assert_equal_s(git_tag_message(tag), tagger_message); - - cl_git_pass(git_reference_lookup(&ref_tag, g_repo, "refs/tags/the-tag")); - cl_assert(git_oid_cmp(git_reference_target(ref_tag), &tag_id) == 0); - cl_git_pass(git_reference_delete(ref_tag)); - git_reference_free(ref_tag); - - git_tag_free(tag); -} - -void test_object_tag_write__overwrite(void) -{ - // Attempt to write a tag bearing the same name than an already existing tag - git_oid target_id, tag_id; - git_signature *tagger; - git_object *target; - - git_oid_fromstr(&target_id, tagged_commit); - cl_git_pass(git_object_lookup(&target, g_repo, &target_id, GIT_OBJ_COMMIT)); - - /* create signature */ - cl_git_pass(git_signature_new(&tagger, tagger_name, tagger_email, 123456789, 60)); - - cl_assert_equal_i(GIT_EEXISTS, git_tag_create( - &tag_id, /* out id */ - g_repo, - "e90810b", - target, - tagger, - tagger_message, - 0)); - - git_object_free(target); - git_signature_free(tagger); -} - -void test_object_tag_write__replace(void) -{ - // Replace an already existing tag - git_oid target_id, tag_id, old_tag_id; - git_signature *tagger; - git_reference *ref_tag; - git_object *target; - - git_oid_fromstr(&target_id, tagged_commit); - cl_git_pass(git_object_lookup(&target, g_repo, &target_id, GIT_OBJ_COMMIT)); - - cl_git_pass(git_reference_lookup(&ref_tag, g_repo, "refs/tags/e90810b")); - git_oid_cpy(&old_tag_id, git_reference_target(ref_tag)); - git_reference_free(ref_tag); - - /* create signature */ - cl_git_pass(git_signature_new(&tagger, tagger_name, tagger_email, 123456789, 60)); - - cl_git_pass(git_tag_create( - &tag_id, /* out id */ - g_repo, - "e90810b", - target, - tagger, - tagger_message, - 1)); - - git_object_free(target); - git_signature_free(tagger); - - cl_git_pass(git_reference_lookup(&ref_tag, g_repo, "refs/tags/e90810b")); - cl_assert(git_oid_cmp(git_reference_target(ref_tag), &tag_id) == 0); - cl_assert(git_oid_cmp(git_reference_target(ref_tag), &old_tag_id) != 0); - - git_reference_free(ref_tag); -} - -void test_object_tag_write__lightweight(void) -{ - // write a lightweight tag to the repository and read it again - git_oid target_id, object_id; - git_reference *ref_tag; - git_object *target; - - git_oid_fromstr(&target_id, tagged_commit); - cl_git_pass(git_object_lookup(&target, g_repo, &target_id, GIT_OBJ_COMMIT)); - - cl_git_pass(git_tag_create_lightweight( - &object_id, - g_repo, - "light-tag", - target, - 0)); - - git_object_free(target); - - cl_assert(git_oid_cmp(&object_id, &target_id) == 0); - - cl_git_pass(git_reference_lookup(&ref_tag, g_repo, "refs/tags/light-tag")); - cl_assert(git_oid_cmp(git_reference_target(ref_tag), &target_id) == 0); - - cl_git_pass(git_tag_delete(g_repo, "light-tag")); - - git_reference_free(ref_tag); -} - -void test_object_tag_write__lightweight_over_existing(void) -{ - // Attempt to write a lightweight tag bearing the same name than an already existing tag - git_oid target_id, object_id, existing_object_id; - git_object *target; - - git_oid_fromstr(&target_id, tagged_commit); - cl_git_pass(git_object_lookup(&target, g_repo, &target_id, GIT_OBJ_COMMIT)); - - cl_assert_equal_i(GIT_EEXISTS, git_tag_create_lightweight( - &object_id, - g_repo, - "e90810b", - target, - 0)); - - git_oid_fromstr(&existing_object_id, tag2_id); - cl_assert(git_oid_cmp(&object_id, &existing_object_id) == 0); - - git_object_free(target); -} - -void test_object_tag_write__delete(void) -{ - // Delete an already existing tag - git_reference *ref_tag; - - cl_git_pass(git_tag_delete(g_repo, "e90810b")); - - cl_git_fail(git_reference_lookup(&ref_tag, g_repo, "refs/tags/e90810b")); - - git_reference_free(ref_tag); -} - -void test_object_tag_write__creating_with_an_invalid_name_returns_EINVALIDSPEC(void) -{ - git_oid target_id, tag_id; - git_signature *tagger; - git_object *target; - - git_oid_fromstr(&target_id, tagged_commit); - cl_git_pass(git_object_lookup(&target, g_repo, &target_id, GIT_OBJ_COMMIT)); - - cl_git_pass(git_signature_new(&tagger, tagger_name, tagger_email, 123456789, 60)); - - cl_assert_equal_i(GIT_EINVALIDSPEC, - git_tag_create(&tag_id, g_repo, - "Inv@{id", target, tagger, tagger_message, 0) - ); - - cl_assert_equal_i(GIT_EINVALIDSPEC, - git_tag_create_lightweight(&tag_id, g_repo, - "Inv@{id", target, 0) - ); - - git_object_free(target); - git_signature_free(tagger); -} - -void test_object_tag_write__deleting_with_an_invalid_name_returns_EINVALIDSPEC(void) -{ - cl_assert_equal_i(GIT_EINVALIDSPEC, git_tag_delete(g_repo, "Inv@{id")); -} - -void create_annotation(git_oid *tag_id, const char *name) -{ - git_object *target; - git_oid target_id; - git_signature *tagger; - - cl_git_pass(git_signature_new(&tagger, tagger_name, tagger_email, 123456789, 60)); - - git_oid_fromstr(&target_id, tagged_commit); - cl_git_pass(git_object_lookup(&target, g_repo, &target_id, GIT_OBJ_COMMIT)); - - cl_git_pass(git_tag_annotation_create(tag_id, g_repo, name, target, tagger, "boom!")); - git_object_free(target); - git_signature_free(tagger); -} - -void test_object_tag_write__creating_an_annotation_stores_the_new_object_in_the_odb(void) -{ - git_oid tag_id; - git_tag *tag; - - create_annotation(&tag_id, "new_tag"); - - cl_git_pass(git_tag_lookup(&tag, g_repo, &tag_id)); - cl_assert_equal_s("new_tag", git_tag_name(tag)); - - git_tag_free(tag); -} - -void test_object_tag_write__creating_an_annotation_does_not_create_a_reference(void) -{ - git_oid tag_id; - git_reference *tag_ref; - - create_annotation(&tag_id, "new_tag"); - cl_git_fail_with(git_reference_lookup(&tag_ref, g_repo, "refs/tags/new_tag"), GIT_ENOTFOUND); -} diff --git a/vendor/libgit2/tests/object/tree/attributes.c b/vendor/libgit2/tests/object/tree/attributes.c deleted file mode 100644 index 8654dfa31..000000000 --- a/vendor/libgit2/tests/object/tree/attributes.c +++ /dev/null @@ -1,118 +0,0 @@ -#include "clar_libgit2.h" -#include "tree.h" - -static git_repository *repo; - -static const char *blob_oid = "3d0970ec547fc41ef8a5882dde99c6adce65b021"; -static const char *tree_oid = "1b05fdaa881ee45b48cbaa5e9b037d667a47745e"; - -void test_object_tree_attributes__initialize(void) -{ - repo = cl_git_sandbox_init("deprecated-mode.git"); -} - -void test_object_tree_attributes__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -void test_object_tree_attributes__ensure_correctness_of_attributes_on_insertion(void) -{ - git_treebuilder *builder; - git_oid oid; - - cl_git_pass(git_oid_fromstr(&oid, blob_oid)); - - cl_git_pass(git_treebuilder_new(&builder, repo, NULL)); - - cl_git_fail(git_treebuilder_insert(NULL, builder, "one.txt", &oid, (git_filemode_t)0777777)); - cl_git_fail(git_treebuilder_insert(NULL, builder, "one.txt", &oid, (git_filemode_t)0100666)); - cl_git_fail(git_treebuilder_insert(NULL, builder, "one.txt", &oid, (git_filemode_t)0000001)); - - git_treebuilder_free(builder); -} - -void test_object_tree_attributes__group_writable_tree_entries_created_with_an_antique_git_version_can_still_be_accessed(void) -{ - git_oid tid; - git_tree *tree; - const git_tree_entry *entry; - - - cl_git_pass(git_oid_fromstr(&tid, tree_oid)); - cl_git_pass(git_tree_lookup(&tree, repo, &tid)); - - entry = git_tree_entry_byname(tree, "old_mode.txt"); - cl_assert_equal_i( - GIT_FILEMODE_BLOB, - git_tree_entry_filemode(entry)); - - git_tree_free(tree); -} - -void test_object_tree_attributes__treebuilder_reject_invalid_filemode(void) -{ - git_treebuilder *builder; - git_oid bid; - const git_tree_entry *entry; - - cl_git_pass(git_oid_fromstr(&bid, blob_oid)); - cl_git_pass(git_treebuilder_new(&builder, repo, NULL)); - - cl_git_fail(git_treebuilder_insert( - &entry, - builder, - "normalized.txt", - &bid, - GIT_FILEMODE_BLOB_GROUP_WRITABLE)); - - git_treebuilder_free(builder); -} - -void test_object_tree_attributes__normalize_attributes_when_creating_a_tree_from_an_existing_one(void) -{ - git_treebuilder *builder; - git_oid tid, tid2; - git_tree *tree; - const git_tree_entry *entry; - - cl_git_pass(git_oid_fromstr(&tid, tree_oid)); - cl_git_pass(git_tree_lookup(&tree, repo, &tid)); - - cl_git_pass(git_treebuilder_new(&builder, repo, tree)); - - entry = git_treebuilder_get(builder, "old_mode.txt"); - cl_assert(entry != NULL); - cl_assert_equal_i( - GIT_FILEMODE_BLOB, - git_tree_entry_filemode(entry)); - - cl_git_pass(git_treebuilder_write(&tid2, builder)); - git_treebuilder_free(builder); - git_tree_free(tree); - - cl_git_pass(git_tree_lookup(&tree, repo, &tid2)); - entry = git_tree_entry_byname(tree, "old_mode.txt"); - cl_assert(entry != NULL); - cl_assert_equal_i( - GIT_FILEMODE_BLOB, - git_tree_entry_filemode(entry)); - - git_tree_free(tree); -} - -void test_object_tree_attributes__normalize_600(void) -{ - git_oid id; - git_tree *tree; - const git_tree_entry *entry; - - git_oid_fromstr(&id, "0810fb7818088ff5ac41ee49199b51473b1bd6c7"); - cl_git_pass(git_tree_lookup(&tree, repo, &id)); - - entry = git_tree_entry_byname(tree, "ListaTeste.xml"); - cl_assert_equal_i(git_tree_entry_filemode(entry), GIT_FILEMODE_BLOB); - cl_assert_equal_i(git_tree_entry_filemode_raw(entry), 0100600); - - git_tree_free(tree); -} diff --git a/vendor/libgit2/tests/object/tree/duplicateentries.c b/vendor/libgit2/tests/object/tree/duplicateentries.c deleted file mode 100644 index 35dd383ec..000000000 --- a/vendor/libgit2/tests/object/tree/duplicateentries.c +++ /dev/null @@ -1,157 +0,0 @@ -#include "clar_libgit2.h" -#include "tree.h" - -static git_repository *_repo; - -void test_object_tree_duplicateentries__initialize(void) { - _repo = cl_git_sandbox_init("testrepo"); -} - -void test_object_tree_duplicateentries__cleanup(void) { - cl_git_sandbox_cleanup(); -} - -/* - * $ git show --format=raw refs/heads/dir - * commit 144344043ba4d4a405da03de3844aa829ae8be0e - * tree d52a8fe84ceedf260afe4f0287bbfca04a117e83 - * parent cf80f8de9f1185bf3a05f993f6121880dd0cfbc9 - * author Ben Straub 1343755506 -0700 - * committer Ben Straub 1343755506 -0700 - * - * Change a file mode - * - * diff --git a/a/b.txt b/a/b.txt - * old mode 100644 - * new mode 100755 - * - * $ git ls-tree d52a8fe84ceedf260afe4f0287bbfca04a117e83 - * 100644 blob a8233120f6ad708f843d861ce2b7228ec4e3dec6 README - * 040000 tree 4e0883eeeeebc1fb1735161cea82f7cb5fab7e63 a - * 100644 blob 45b983be36b73c0788dc9cbcb76cbb80fc7bb057 branch_file.txt - * 100644 blob a71586c1dfe8a71c6cbf6c129f404c5642ff31bd new.txt - */ - -static void tree_checker( - git_oid *tid, - const char *expected_sha, - git_filemode_t expected_filemode) -{ - git_tree *tree; - const git_tree_entry *entry; - git_oid oid; - - cl_git_pass(git_tree_lookup(&tree, _repo, tid)); - cl_assert_equal_i(1, (int)git_tree_entrycount(tree)); - entry = git_tree_entry_byindex(tree, 0); - - cl_git_pass(git_oid_fromstr(&oid, expected_sha)); - - cl_assert_equal_i(0, git_oid_cmp(&oid, git_tree_entry_id(entry))); - cl_assert_equal_i(expected_filemode, git_tree_entry_filemode(entry)); - - git_tree_free(tree); -} - -static void tree_creator(git_oid *out, void (*fn)(git_treebuilder *)) -{ - git_treebuilder *builder; - - cl_git_pass(git_treebuilder_new(&builder, _repo, NULL)); - - fn(builder); - - cl_git_pass(git_treebuilder_write(out, builder)); - git_treebuilder_free(builder); -} - -static void two_blobs(git_treebuilder *bld) -{ - git_oid oid; - const git_tree_entry *entry; - - cl_git_pass(git_oid_fromstr(&oid, - "a8233120f6ad708f843d861ce2b7228ec4e3dec6")); /* blob oid (README) */ - - cl_git_pass(git_treebuilder_insert( - &entry, bld, "duplicate", &oid, - GIT_FILEMODE_BLOB)); - - cl_git_pass(git_oid_fromstr(&oid, - "a71586c1dfe8a71c6cbf6c129f404c5642ff31bd")); /* blob oid (new.txt) */ - - cl_git_pass(git_treebuilder_insert( - &entry, bld, "duplicate", &oid, - GIT_FILEMODE_BLOB)); -} - -static void one_blob_and_one_tree(git_treebuilder *bld) -{ - git_oid oid; - const git_tree_entry *entry; - - cl_git_pass(git_oid_fromstr(&oid, - "a8233120f6ad708f843d861ce2b7228ec4e3dec6")); /* blob oid (README) */ - - cl_git_pass(git_treebuilder_insert( - &entry, bld, "duplicate", &oid, - GIT_FILEMODE_BLOB)); - - cl_git_pass(git_oid_fromstr(&oid, - "4e0883eeeeebc1fb1735161cea82f7cb5fab7e63")); /* tree oid (a) */ - - cl_git_pass(git_treebuilder_insert( - &entry, bld, "duplicate", &oid, - GIT_FILEMODE_TREE)); -} - -void test_object_tree_duplicateentries__cannot_create_a_duplicate_entry_through_the_treebuilder(void) -{ - git_oid tid; - - tree_creator(&tid, two_blobs); - tree_checker(&tid, "a71586c1dfe8a71c6cbf6c129f404c5642ff31bd", GIT_FILEMODE_BLOB); - - tree_creator(&tid, one_blob_and_one_tree); - tree_checker(&tid, "4e0883eeeeebc1fb1735161cea82f7cb5fab7e63", GIT_FILEMODE_TREE); -} - -static void add_fake_conflicts(git_index *index) -{ - git_index_entry ancestor_entry, our_entry, their_entry; - - memset(&ancestor_entry, 0x0, sizeof(git_index_entry)); - memset(&our_entry, 0x0, sizeof(git_index_entry)); - memset(&their_entry, 0x0, sizeof(git_index_entry)); - - ancestor_entry.path = "duplicate"; - ancestor_entry.mode = GIT_FILEMODE_BLOB; - GIT_IDXENTRY_STAGE_SET(&ancestor_entry, 1); - git_oid_fromstr(&ancestor_entry.id, "a8233120f6ad708f843d861ce2b7228ec4e3dec6"); - - our_entry.path = "duplicate"; - our_entry.mode = GIT_FILEMODE_BLOB; - GIT_IDXENTRY_STAGE_SET(&our_entry, 2); - git_oid_fromstr(&our_entry.id, "45b983be36b73c0788dc9cbcb76cbb80fc7bb057"); - - their_entry.path = "duplicate"; - their_entry.mode = GIT_FILEMODE_BLOB; - GIT_IDXENTRY_STAGE_SET(&their_entry, 3); - git_oid_fromstr(&their_entry.id, "a71586c1dfe8a71c6cbf6c129f404c5642ff31bd"); - - cl_git_pass(git_index_conflict_add(index, &ancestor_entry, &our_entry, &their_entry)); -} - -void test_object_tree_duplicateentries__cannot_create_a_duplicate_entry_building_a_tree_from_a_index_with_conflicts(void) -{ - git_index *index; - git_oid tid; - - cl_git_pass(git_repository_index(&index, _repo)); - - add_fake_conflicts(index); - - cl_assert_equal_i(GIT_EUNMERGED, git_index_write_tree(&tid, index)); - - git_index_free(index); -} diff --git a/vendor/libgit2/tests/object/tree/frompath.c b/vendor/libgit2/tests/object/tree/frompath.c deleted file mode 100644 index 86ca47e94..000000000 --- a/vendor/libgit2/tests/object/tree/frompath.c +++ /dev/null @@ -1,68 +0,0 @@ -#include "clar_libgit2.h" - -static git_repository *repo; -static git_tree *tree; - -void test_object_tree_frompath__initialize(void) -{ - git_oid id; - const char *tree_with_subtrees_oid = "ae90f12eea699729ed24555e40b9fd669da12a12"; - - cl_git_pass(git_repository_open(&repo, cl_fixture("testrepo.git"))); - cl_assert(repo != NULL); - - cl_git_pass(git_oid_fromstr(&id, tree_with_subtrees_oid)); - cl_git_pass(git_tree_lookup(&tree, repo, &id)); - cl_assert(tree != NULL); -} - -void test_object_tree_frompath__cleanup(void) -{ - git_tree_free(tree); - tree = NULL; - - git_repository_free(repo); - repo = NULL; -} - -static void assert_tree_from_path( - git_tree *root, - const char *path, - const char *expected_entry_name) -{ - git_tree_entry *entry; - - cl_git_pass(git_tree_entry_bypath(&entry, root, path)); - cl_assert_equal_s(git_tree_entry_name(entry), expected_entry_name); - git_tree_entry_free(entry); -} - -void test_object_tree_frompath__retrieve_tree_from_path_to_treeentry(void) -{ - git_tree_entry *e; - - assert_tree_from_path(tree, "README", "README"); - assert_tree_from_path(tree, "ab/de/fgh/1.txt", "1.txt"); - assert_tree_from_path(tree, "ab/de/fgh", "fgh"); - assert_tree_from_path(tree, "ab/de/fgh/", "fgh"); - assert_tree_from_path(tree, "ab/de", "de"); - assert_tree_from_path(tree, "ab/", "ab"); - assert_tree_from_path(tree, "ab/de/", "de"); - - cl_assert_equal_i(GIT_ENOTFOUND, git_tree_entry_bypath(&e, tree, "i-do-not-exist.txt")); - cl_assert_equal_i(GIT_ENOTFOUND, git_tree_entry_bypath(&e, tree, "README/")); - cl_assert_equal_i(GIT_ENOTFOUND, git_tree_entry_bypath(&e, tree, "ab/de/fgh/i-do-not-exist.txt")); - cl_assert_equal_i(GIT_ENOTFOUND, git_tree_entry_bypath(&e, tree, "nope/de/fgh/1.txt")); - cl_assert_equal_i(GIT_ENOTFOUND, git_tree_entry_bypath(&e, tree, "ab/me-neither/fgh/2.txt")); - cl_assert_equal_i(GIT_ENOTFOUND, git_tree_entry_bypath(&e, tree, "ab/me-neither/fgh/2.txt/")); -} - -void test_object_tree_frompath__fail_when_processing_an_invalid_path(void) -{ - git_tree_entry *e; - - cl_must_fail(git_tree_entry_bypath(&e, tree, "/")); - cl_must_fail(git_tree_entry_bypath(&e, tree, "/ab")); - cl_must_fail(git_tree_entry_bypath(&e, tree, "/ab/de")); - cl_must_fail(git_tree_entry_bypath(&e, tree, "ab//de")); -} diff --git a/vendor/libgit2/tests/object/tree/read.c b/vendor/libgit2/tests/object/tree/read.c deleted file mode 100644 index 59a809bf1..000000000 --- a/vendor/libgit2/tests/object/tree/read.c +++ /dev/null @@ -1,75 +0,0 @@ -#include "clar_libgit2.h" - -#include "tree.h" - -static const char *tree_oid = "1810dff58d8a660512d4832e740f692884338ccd"; - -static git_repository *g_repo; - -// Fixture setup and teardown -void test_object_tree_read__initialize(void) -{ - g_repo = cl_git_sandbox_init("testrepo"); -} - -void test_object_tree_read__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - - - -void test_object_tree_read__loaded(void) -{ - // acces randomly the entries on a loaded tree - git_oid id; - git_tree *tree; - - git_oid_fromstr(&id, tree_oid); - - cl_git_pass(git_tree_lookup(&tree, g_repo, &id)); - - cl_assert(git_tree_entry_byname(tree, "README") != NULL); - cl_assert(git_tree_entry_byname(tree, "NOTEXISTS") == NULL); - cl_assert(git_tree_entry_byname(tree, "") == NULL); - cl_assert(git_tree_entry_byindex(tree, 0) != NULL); - cl_assert(git_tree_entry_byindex(tree, 2) != NULL); - cl_assert(git_tree_entry_byindex(tree, 3) == NULL); - cl_assert(git_tree_entry_byindex(tree, (unsigned int)-1) == NULL); - - git_tree_free(tree); -} - -void test_object_tree_read__two(void) -{ - // read a tree from the repository - git_oid id; - git_tree *tree; - const git_tree_entry *entry; - git_object *obj; - - git_oid_fromstr(&id, tree_oid); - - cl_git_pass(git_tree_lookup(&tree, g_repo, &id)); - - cl_assert(git_tree_entrycount(tree) == 3); - - /* GH-86: git_object_lookup() should also check the type if the object comes from the cache */ - cl_assert(git_object_lookup(&obj, g_repo, &id, GIT_OBJ_TREE) == 0); - cl_assert(obj != NULL); - git_object_free(obj); - obj = NULL; - cl_git_fail(git_object_lookup(&obj, g_repo, &id, GIT_OBJ_BLOB)); - cl_assert(obj == NULL); - - entry = git_tree_entry_byname(tree, "README"); - cl_assert(entry != NULL); - - cl_assert_equal_s(git_tree_entry_name(entry), "README"); - - cl_git_pass(git_tree_entry_to_object(&obj, g_repo, entry)); - cl_assert(obj != NULL); - - git_object_free(obj); - git_tree_free(tree); -} diff --git a/vendor/libgit2/tests/object/tree/walk.c b/vendor/libgit2/tests/object/tree/walk.c deleted file mode 100644 index f8005e579..000000000 --- a/vendor/libgit2/tests/object/tree/walk.c +++ /dev/null @@ -1,177 +0,0 @@ -#include "clar_libgit2.h" -#include "tree.h" - -static const char *tree_oid = "1810dff58d8a660512d4832e740f692884338ccd"; -static git_repository *g_repo; - -void test_object_tree_walk__initialize(void) -{ - g_repo = cl_git_sandbox_init("testrepo"); -} - -void test_object_tree_walk__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -static int treewalk_count_cb( - const char *root, const git_tree_entry *entry, void *payload) -{ - int *count = payload; - - GIT_UNUSED(root); - GIT_UNUSED(entry); - - (*count) += 1; - - return 0; -} - -void test_object_tree_walk__0(void) -{ - git_oid id; - git_tree *tree; - int ct; - - git_oid_fromstr(&id, tree_oid); - - cl_git_pass(git_tree_lookup(&tree, g_repo, &id)); - - ct = 0; - cl_git_pass(git_tree_walk(tree, GIT_TREEWALK_PRE, treewalk_count_cb, &ct)); - cl_assert_equal_i(3, ct); - - ct = 0; - cl_git_pass(git_tree_walk(tree, GIT_TREEWALK_POST, treewalk_count_cb, &ct)); - cl_assert_equal_i(3, ct); - - git_tree_free(tree); -} - - -static int treewalk_stop_cb( - const char *root, const git_tree_entry *entry, void *payload) -{ - int *count = payload; - - GIT_UNUSED(root); - GIT_UNUSED(entry); - - (*count) += 1; - - return (*count == 2) ? -123 : 0; -} - -static int treewalk_stop_immediately_cb( - const char *root, const git_tree_entry *entry, void *payload) -{ - GIT_UNUSED(root); - GIT_UNUSED(entry); - GIT_UNUSED(payload); - return -100; -} - -void test_object_tree_walk__1(void) -{ - git_oid id; - git_tree *tree; - int ct; - - git_oid_fromstr(&id, tree_oid); - - cl_git_pass(git_tree_lookup(&tree, g_repo, &id)); - - ct = 0; - cl_assert_equal_i( - -123, git_tree_walk(tree, GIT_TREEWALK_PRE, treewalk_stop_cb, &ct)); - cl_assert_equal_i(2, ct); - - ct = 0; - cl_assert_equal_i( - -123, git_tree_walk(tree, GIT_TREEWALK_POST, treewalk_stop_cb, &ct)); - cl_assert_equal_i(2, ct); - - cl_assert_equal_i( - -100, git_tree_walk( - tree, GIT_TREEWALK_PRE, treewalk_stop_immediately_cb, NULL)); - - cl_assert_equal_i( - -100, git_tree_walk( - tree, GIT_TREEWALK_POST, treewalk_stop_immediately_cb, NULL)); - - git_tree_free(tree); -} - - -struct treewalk_skip_data { - int files; - int dirs; - const char *skip; - const char *stop; -}; - -static int treewalk_skip_de_cb( - const char *root, const git_tree_entry *entry, void *payload) -{ - struct treewalk_skip_data *data = payload; - const char *name = git_tree_entry_name(entry); - - GIT_UNUSED(root); - - if (git_tree_entry_type(entry) == GIT_OBJ_TREE) - data->dirs++; - else - data->files++; - - if (data->skip && !strcmp(name, data->skip)) - return 1; - else if (data->stop && !strcmp(name, data->stop)) - return -1; - else - return 0; -} - -void test_object_tree_walk__2(void) -{ - git_oid id; - git_tree *tree; - struct treewalk_skip_data data; - - /* look up a deep tree */ - git_oid_fromstr(&id, "ae90f12eea699729ed24555e40b9fd669da12a12"); - cl_git_pass(git_tree_lookup(&tree, g_repo, &id)); - - memset(&data, 0, sizeof(data)); - data.skip = "de"; - - cl_assert_equal_i(0, git_tree_walk( - tree, GIT_TREEWALK_PRE, treewalk_skip_de_cb, &data)); - cl_assert_equal_i(5, data.files); - cl_assert_equal_i(3, data.dirs); - - memset(&data, 0, sizeof(data)); - data.stop = "3.txt"; - - cl_assert_equal_i(-1, git_tree_walk( - tree, GIT_TREEWALK_PRE, treewalk_skip_de_cb, &data)); - cl_assert_equal_i(3, data.files); - cl_assert_equal_i(2, data.dirs); - - memset(&data, 0, sizeof(data)); - data.skip = "new.txt"; - - cl_assert_equal_i(0, git_tree_walk( - tree, GIT_TREEWALK_PRE, treewalk_skip_de_cb, &data)); - cl_assert_equal_i(7, data.files); - cl_assert_equal_i(4, data.dirs); - - memset(&data, 0, sizeof(data)); - data.stop = "new.txt"; - - cl_assert_equal_i(-1, git_tree_walk( - tree, GIT_TREEWALK_PRE, treewalk_skip_de_cb, &data)); - cl_assert_equal_i(7, data.files); - cl_assert_equal_i(4, data.dirs); - - git_tree_free(tree); -} diff --git a/vendor/libgit2/tests/object/tree/write.c b/vendor/libgit2/tests/object/tree/write.c deleted file mode 100644 index a9decf9c1..000000000 --- a/vendor/libgit2/tests/object/tree/write.c +++ /dev/null @@ -1,514 +0,0 @@ -#include "clar_libgit2.h" - -#include "tree.h" - -static const char *blob_oid = "fa49b077972391ad58037050f2a75f74e3671e92"; -static const char *first_tree = "181037049a54a1eb5fab404658a3a250b44335d7"; -static const char *second_tree = "f60079018b664e4e79329a7ef9559c8d9e0378d1"; -static const char *third_tree = "eb86d8b81d6adbd5290a935d6c9976882de98488"; - -static git_repository *g_repo; - -/* Fixture setup and teardown */ -void test_object_tree_write__initialize(void) -{ - g_repo = cl_git_sandbox_init("testrepo"); -} - -void test_object_tree_write__cleanup(void) -{ - cl_git_sandbox_cleanup(); - - cl_git_pass(git_libgit2_opts(GIT_OPT_ENABLE_STRICT_OBJECT_CREATION, 1)); -} - -void test_object_tree_write__from_memory(void) -{ - /* write a tree from a memory */ - git_treebuilder *builder; - git_tree *tree; - git_oid id, bid, rid, id2; - - git_oid_fromstr(&id, first_tree); - git_oid_fromstr(&id2, second_tree); - git_oid_fromstr(&bid, blob_oid); - - /* create a second tree from first tree using `git_treebuilder_insert` - * on REPOSITORY_FOLDER. - */ - cl_git_pass(git_tree_lookup(&tree, g_repo, &id)); - cl_git_pass(git_treebuilder_new(&builder, g_repo, tree)); - - cl_git_fail(git_treebuilder_insert(NULL, builder, "", - &bid, GIT_FILEMODE_BLOB)); - cl_git_fail(git_treebuilder_insert(NULL, builder, "/", - &bid, GIT_FILEMODE_BLOB)); - cl_git_fail(git_treebuilder_insert(NULL, builder, ".git", - &bid, GIT_FILEMODE_BLOB)); - cl_git_fail(git_treebuilder_insert(NULL, builder, "..", - &bid, GIT_FILEMODE_BLOB)); - cl_git_fail(git_treebuilder_insert(NULL, builder, ".", - &bid, GIT_FILEMODE_BLOB)); - cl_git_fail(git_treebuilder_insert(NULL, builder, "folder/new.txt", - &bid, GIT_FILEMODE_BLOB)); - - cl_git_pass(git_treebuilder_insert( - NULL, builder, "new.txt", &bid, GIT_FILEMODE_BLOB)); - - cl_git_pass(git_treebuilder_write(&rid, builder)); - - cl_assert(git_oid_cmp(&rid, &id2) == 0); - - git_treebuilder_free(builder); - git_tree_free(tree); -} - -void test_object_tree_write__subtree(void) -{ - /* write a hierarchical tree from a memory */ - git_treebuilder *builder; - git_tree *tree; - git_oid id, bid, subtree_id, id2, id3; - git_oid id_hiearar; - - git_oid_fromstr(&id, first_tree); - git_oid_fromstr(&id2, second_tree); - git_oid_fromstr(&id3, third_tree); - git_oid_fromstr(&bid, blob_oid); - - /* create subtree */ - cl_git_pass(git_treebuilder_new(&builder, g_repo, NULL)); - cl_git_pass(git_treebuilder_insert( - NULL, builder, "new.txt", &bid, GIT_FILEMODE_BLOB)); /* -V536 */ - cl_git_pass(git_treebuilder_write(&subtree_id, builder)); - git_treebuilder_free(builder); - - /* create parent tree */ - cl_git_pass(git_tree_lookup(&tree, g_repo, &id)); - cl_git_pass(git_treebuilder_new(&builder, g_repo, tree)); - cl_git_pass(git_treebuilder_insert( - NULL, builder, "new", &subtree_id, GIT_FILEMODE_TREE)); /* -V536 */ - cl_git_pass(git_treebuilder_write(&id_hiearar, builder)); - git_treebuilder_free(builder); - git_tree_free(tree); - - cl_assert(git_oid_cmp(&id_hiearar, &id3) == 0); - - /* check data is correct */ - cl_git_pass(git_tree_lookup(&tree, g_repo, &id_hiearar)); - cl_assert(2 == git_tree_entrycount(tree)); - git_tree_free(tree); -} - -/* - * And the Lord said: Is this tree properly sorted? - */ -void test_object_tree_write__sorted_subtrees(void) -{ - git_treebuilder *builder; - git_tree *tree; - unsigned int i; - int position_c = -1, position_cake = -1, position_config = -1; - - struct { - unsigned int attr; - const char *filename; - } entries[] = { - { GIT_FILEMODE_BLOB, ".gitattributes" }, - { GIT_FILEMODE_BLOB, ".gitignore" }, - { GIT_FILEMODE_BLOB, ".htaccess" }, - { GIT_FILEMODE_BLOB, "Capfile" }, - { GIT_FILEMODE_BLOB, "Makefile"}, - { GIT_FILEMODE_BLOB, "README"}, - { GIT_FILEMODE_TREE, "app"}, - { GIT_FILEMODE_TREE, "cake"}, - { GIT_FILEMODE_TREE, "config"}, - { GIT_FILEMODE_BLOB, "c"}, - { GIT_FILEMODE_BLOB, "git_test.txt"}, - { GIT_FILEMODE_BLOB, "htaccess.htaccess"}, - { GIT_FILEMODE_BLOB, "index.php"}, - { GIT_FILEMODE_TREE, "plugins"}, - { GIT_FILEMODE_TREE, "schemas"}, - { GIT_FILEMODE_TREE, "ssl-certs"}, - { GIT_FILEMODE_TREE, "vendors"} - }; - - git_oid bid, tid, tree_oid; - - cl_git_pass(git_oid_fromstr(&bid, blob_oid)); - cl_git_pass(git_oid_fromstr(&tid, first_tree)); - - cl_git_pass(git_treebuilder_new(&builder, g_repo, NULL)); - - for (i = 0; i < ARRAY_SIZE(entries); ++i) { - git_oid *id = entries[i].attr == GIT_FILEMODE_TREE ? &tid : &bid; - - cl_git_pass(git_treebuilder_insert(NULL, - builder, entries[i].filename, id, entries[i].attr)); - } - - cl_git_pass(git_treebuilder_write(&tree_oid, builder)); - - cl_git_pass(git_tree_lookup(&tree, g_repo, &tree_oid)); - for (i = 0; i < git_tree_entrycount(tree); i++) { - const git_tree_entry *entry = git_tree_entry_byindex(tree, i); - - if (strcmp(entry->filename, "c") == 0) - position_c = i; - - if (strcmp(entry->filename, "cake") == 0) - position_cake = i; - - if (strcmp(entry->filename, "config") == 0) - position_config = i; - } - - git_tree_free(tree); - - cl_assert(position_c != -1); - cl_assert(position_cake != -1); - cl_assert(position_config != -1); - - cl_assert(position_c < position_cake); - cl_assert(position_cake < position_config); - - git_treebuilder_free(builder); -} - -static struct { - unsigned int attr; - const char *filename; -} _entries[] = { - { GIT_FILEMODE_BLOB, "aardvark" }, - { GIT_FILEMODE_BLOB, ".first" }, - { GIT_FILEMODE_BLOB, "apple" }, - { GIT_FILEMODE_BLOB, "last"}, - { GIT_FILEMODE_BLOB, "apple_after"}, - { GIT_FILEMODE_BLOB, "after_aardvark"}, - { 0, NULL }, -}; - -void test_object_tree_write__removing_and_re_adding_in_treebuilder(void) -{ - git_treebuilder *builder; - int i, aardvark_i, apple_i, apple_after_i, apple_extra_i, last_i; - git_oid entry_oid, tree_oid; - git_tree *tree; - - cl_git_pass(git_oid_fromstr(&entry_oid, blob_oid)); - - cl_git_pass(git_treebuilder_new(&builder, g_repo, NULL)); - - cl_assert_equal_i(0, (int)git_treebuilder_entrycount(builder)); - - for (i = 0; _entries[i].filename; ++i) - cl_git_pass(git_treebuilder_insert(NULL, - builder, _entries[i].filename, &entry_oid, _entries[i].attr)); - - cl_assert_equal_i(6, (int)git_treebuilder_entrycount(builder)); - - cl_git_pass(git_treebuilder_remove(builder, "apple")); - cl_assert_equal_i(5, (int)git_treebuilder_entrycount(builder)); - - cl_git_pass(git_treebuilder_remove(builder, "apple_after")); - cl_assert_equal_i(4, (int)git_treebuilder_entrycount(builder)); - - cl_git_pass(git_treebuilder_insert( - NULL, builder, "before_last", &entry_oid, GIT_FILEMODE_BLOB)); - cl_assert_equal_i(5, (int)git_treebuilder_entrycount(builder)); - - /* reinsert apple_after */ - cl_git_pass(git_treebuilder_insert( - NULL, builder, "apple_after", &entry_oid, GIT_FILEMODE_BLOB)); - cl_assert_equal_i(6, (int)git_treebuilder_entrycount(builder)); - - cl_git_pass(git_treebuilder_remove(builder, "last")); - cl_assert_equal_i(5, (int)git_treebuilder_entrycount(builder)); - - /* reinsert last */ - cl_git_pass(git_treebuilder_insert( - NULL, builder, "last", &entry_oid, GIT_FILEMODE_BLOB)); - cl_assert_equal_i(6, (int)git_treebuilder_entrycount(builder)); - - cl_git_pass(git_treebuilder_insert( - NULL, builder, "apple_extra", &entry_oid, GIT_FILEMODE_BLOB)); - cl_assert_equal_i(7, (int)git_treebuilder_entrycount(builder)); - - cl_git_pass(git_treebuilder_write(&tree_oid, builder)); - - git_treebuilder_free(builder); - - cl_git_pass(git_tree_lookup(&tree, g_repo, &tree_oid)); - - cl_assert_equal_i(7, (int)git_tree_entrycount(tree)); - - cl_assert(git_tree_entry_byname(tree, ".first") != NULL); - cl_assert(git_tree_entry_byname(tree, "apple") == NULL); - cl_assert(git_tree_entry_byname(tree, "apple_after") != NULL); - cl_assert(git_tree_entry_byname(tree, "apple_extra") != NULL); - cl_assert(git_tree_entry_byname(tree, "last") != NULL); - - aardvark_i = apple_i = apple_after_i = apple_extra_i = last_i = -1; - - for (i = 0; i < 7; ++i) { - const git_tree_entry *entry = git_tree_entry_byindex(tree, i); - - if (!strcmp(entry->filename, "aardvark")) - aardvark_i = i; - else if (!strcmp(entry->filename, "apple")) - apple_i = i; - else if (!strcmp(entry->filename, "apple_after")) - apple_after_i = i; - else if (!strcmp(entry->filename, "apple_extra")) - apple_extra_i = i; - else if (!strcmp(entry->filename, "last")) - last_i = i; - } - - cl_assert_equal_i(-1, apple_i); - cl_assert_equal_i(6, last_i); - cl_assert(aardvark_i < apple_after_i); - cl_assert(apple_after_i < apple_extra_i); - - git_tree_free(tree); -} - -static int treebuilder_filter_prefixed( - const git_tree_entry *entry, void *payload) -{ - return !git__prefixcmp(git_tree_entry_name(entry), payload); -} - -void test_object_tree_write__filtering(void) -{ - git_treebuilder *builder; - int i; - git_oid entry_oid, tree_oid; - git_tree *tree; - - git_oid_fromstr(&entry_oid, blob_oid); - - cl_git_pass(git_treebuilder_new(&builder, g_repo, NULL)); - - for (i = 0; _entries[i].filename; ++i) - cl_git_pass(git_treebuilder_insert(NULL, - builder, _entries[i].filename, &entry_oid, _entries[i].attr)); - - cl_assert_equal_i(6, (int)git_treebuilder_entrycount(builder)); - - cl_assert(git_treebuilder_get(builder, "apple") != NULL); - cl_assert(git_treebuilder_get(builder, "aardvark") != NULL); - cl_assert(git_treebuilder_get(builder, "last") != NULL); - - git_treebuilder_filter(builder, treebuilder_filter_prefixed, "apple"); - - cl_assert_equal_i(4, (int)git_treebuilder_entrycount(builder)); - - cl_assert(git_treebuilder_get(builder, "apple") == NULL); - cl_assert(git_treebuilder_get(builder, "aardvark") != NULL); - cl_assert(git_treebuilder_get(builder, "last") != NULL); - - git_treebuilder_filter(builder, treebuilder_filter_prefixed, "a"); - - cl_assert_equal_i(2, (int)git_treebuilder_entrycount(builder)); - - cl_assert(git_treebuilder_get(builder, "aardvark") == NULL); - cl_assert(git_treebuilder_get(builder, "last") != NULL); - - cl_git_pass(git_treebuilder_write(&tree_oid, builder)); - - git_treebuilder_free(builder); - - cl_git_pass(git_tree_lookup(&tree, g_repo, &tree_oid)); - - cl_assert_equal_i(2, (int)git_tree_entrycount(tree)); - - git_tree_free(tree); -} - -void test_object_tree_write__cruel_paths(void) -{ - static const char *the_paths[] = { - "C:\\", - " : * ? \" \n < > |", - "a\\b", - "\\\\b\a", - ":\\", - "COM1", - "foo.aux", - REP1024("1234"), /* 4096 char string */ - REP1024("12345678"), /* 8192 char string */ - "\xC5\xAA\x6E\xC4\xAD\x63\xC5\x8D\x64\x65\xCC\xBD", /* ŪnÄ­cÅde̽ */ - NULL - }; - git_treebuilder *builder; - git_tree *tree; - git_oid id, bid, subid; - const char **scan; - int count = 0, i, j; - git_tree_entry *te; - - git_oid_fromstr(&bid, blob_oid); - - /* create tree */ - cl_git_pass(git_treebuilder_new(&builder, g_repo, NULL)); - for (scan = the_paths; *scan; ++scan) { - cl_git_pass(git_treebuilder_insert( - NULL, builder, *scan, &bid, GIT_FILEMODE_BLOB)); - count++; - } - cl_git_pass(git_treebuilder_write(&id, builder)); - git_treebuilder_free(builder); - - /* check data is correct */ - cl_git_pass(git_tree_lookup(&tree, g_repo, &id)); - - cl_assert_equal_i(count, git_tree_entrycount(tree)); - - for (scan = the_paths; *scan; ++scan) { - const git_tree_entry *cte = git_tree_entry_byname(tree, *scan); - cl_assert(cte != NULL); - cl_assert_equal_s(*scan, git_tree_entry_name(cte)); - } - for (scan = the_paths; *scan; ++scan) { - cl_git_pass(git_tree_entry_bypath(&te, tree, *scan)); - cl_assert_equal_s(*scan, git_tree_entry_name(te)); - git_tree_entry_free(te); - } - - git_tree_free(tree); - - /* let's try longer paths */ - cl_git_pass(git_treebuilder_new(&builder, g_repo, NULL)); - for (scan = the_paths; *scan; ++scan) { - cl_git_pass(git_treebuilder_insert( - NULL, builder, *scan, &id, GIT_FILEMODE_TREE)); - } - cl_git_pass(git_treebuilder_write(&subid, builder)); - git_treebuilder_free(builder); - - /* check data is correct */ - cl_git_pass(git_tree_lookup(&tree, g_repo, &subid)); - - cl_assert_equal_i(count, git_tree_entrycount(tree)); - - for (i = 0; i < count; ++i) { - for (j = 0; j < count; ++j) { - git_buf b = GIT_BUF_INIT; - cl_git_pass(git_buf_joinpath(&b, the_paths[i], the_paths[j])); - cl_git_pass(git_tree_entry_bypath(&te, tree, b.ptr)); - cl_assert_equal_s(the_paths[j], git_tree_entry_name(te)); - git_tree_entry_free(te); - git_buf_free(&b); - } - } - - git_tree_free(tree); -} - -void test_object_tree_write__protect_filesystems(void) -{ - git_treebuilder *builder; - git_oid bid; - - cl_git_pass(git_oid_fromstr(&bid, "fa49b077972391ad58037050f2a75f74e3671e92")); - - /* Ensure that (by default) we can write objects with funny names on - * platforms that are not affected. - */ - cl_git_pass(git_treebuilder_new(&builder, g_repo, NULL)); - -#ifndef GIT_WIN32 - cl_git_pass(git_treebuilder_insert(NULL, builder, ".git.", &bid, GIT_FILEMODE_BLOB)); - cl_git_pass(git_treebuilder_insert(NULL, builder, "git~1", &bid, GIT_FILEMODE_BLOB)); -#endif - -#ifndef __APPLE__ - cl_git_pass(git_treebuilder_insert(NULL, builder, ".git\xef\xbb\xbf", &bid, GIT_FILEMODE_BLOB)); - cl_git_pass(git_treebuilder_insert(NULL, builder, ".git\xe2\x80\xad", &bid, GIT_FILEMODE_BLOB)); -#endif - - git_treebuilder_free(builder); - - /* Now turn on core.protectHFS and core.protectNTFS and validate that these - * paths are rejected. - */ - - cl_repo_set_bool(g_repo, "core.protectHFS", true); - cl_repo_set_bool(g_repo, "core.protectNTFS", true); - - cl_git_pass(git_treebuilder_new(&builder, g_repo, NULL)); - - cl_git_fail(git_treebuilder_insert(NULL, builder, ".git.", &bid, GIT_FILEMODE_BLOB)); - cl_git_fail(git_treebuilder_insert(NULL, builder, "git~1", &bid, GIT_FILEMODE_BLOB)); - - cl_git_fail(git_treebuilder_insert(NULL, builder, ".git\xef\xbb\xbf", &bid, GIT_FILEMODE_BLOB)); - cl_git_fail(git_treebuilder_insert(NULL, builder, ".git\xe2\x80\xad", &bid, GIT_FILEMODE_BLOB)); - - git_treebuilder_free(builder); -} - -static void test_invalid_objects(bool should_allow_invalid) -{ - git_treebuilder *builder; - git_oid valid_blob_id, invalid_blob_id, valid_tree_id, invalid_tree_id; - -#define assert_allowed(expr) \ - clar__assert(!(expr) == should_allow_invalid, __FILE__, __LINE__, \ - (should_allow_invalid ? \ - "Expected function call to succeed: " #expr : \ - "Expected function call to fail: " #expr), \ - NULL, 1) - - cl_git_pass(git_oid_fromstr(&valid_blob_id, blob_oid)); - cl_git_pass(git_oid_fromstr(&invalid_blob_id, - "1234567890123456789012345678901234567890")); - cl_git_pass(git_oid_fromstr(&valid_tree_id, first_tree)); - cl_git_pass(git_oid_fromstr(&invalid_tree_id, - "0000000000111111111122222222223333333333")); - - cl_git_pass(git_treebuilder_new(&builder, g_repo, NULL)); - - /* test valid blobs and trees (these should always pass) */ - cl_git_pass(git_treebuilder_insert(NULL, builder, "file.txt", &valid_blob_id, GIT_FILEMODE_BLOB)); - cl_git_pass(git_treebuilder_insert(NULL, builder, "folder", &valid_tree_id, GIT_FILEMODE_TREE)); - - /* replace valid files and folders with invalid ones */ - assert_allowed(git_treebuilder_insert(NULL, builder, "file.txt", &invalid_blob_id, GIT_FILEMODE_BLOB)); - assert_allowed(git_treebuilder_insert(NULL, builder, "folder", &invalid_blob_id, GIT_FILEMODE_BLOB)); - - /* insert new invalid files and folders */ - assert_allowed(git_treebuilder_insert(NULL, builder, "invalid_file.txt", &invalid_blob_id, GIT_FILEMODE_BLOB)); - assert_allowed(git_treebuilder_insert(NULL, builder, "invalid_folder", &invalid_blob_id, GIT_FILEMODE_BLOB)); - - /* insert valid blobs as trees and trees as blobs */ - assert_allowed(git_treebuilder_insert(NULL, builder, "file_as_folder", &valid_blob_id, GIT_FILEMODE_TREE)); - assert_allowed(git_treebuilder_insert(NULL, builder, "folder_as_file.txt", &valid_tree_id, GIT_FILEMODE_BLOB)); - -#undef assert_allowed - - git_treebuilder_free(builder); -} - -static void test_inserting_submodule(void) -{ - git_treebuilder *bld; - git_oid sm_id; - - cl_git_pass(git_treebuilder_new(&bld, g_repo, NULL)); - cl_git_pass(git_treebuilder_insert(NULL, bld, "sm", &sm_id, GIT_FILEMODE_COMMIT)); - git_treebuilder_free(bld); -} - -void test_object_tree_write__object_validity(void) -{ - /* Ensure that we cannot add invalid objects by default */ - test_invalid_objects(false); - test_inserting_submodule(); - - /* Ensure that we can turn off validation */ - cl_git_pass(git_libgit2_opts(GIT_OPT_ENABLE_STRICT_OBJECT_CREATION, 0)); - test_invalid_objects(true); - test_inserting_submodule(); -} - diff --git a/vendor/libgit2/tests/odb/alternates.c b/vendor/libgit2/tests/odb/alternates.c deleted file mode 100644 index b5c0e79c0..000000000 --- a/vendor/libgit2/tests/odb/alternates.c +++ /dev/null @@ -1,80 +0,0 @@ -#include "clar_libgit2.h" -#include "odb.h" -#include "filebuf.h" - -static git_buf destpath, filepath; -static const char *paths[] = { - "A.git", "B.git", "C.git", "D.git", "E.git", "F.git", "G.git" -}; -static git_filebuf file; -static git_repository *repo; - -void test_odb_alternates__cleanup(void) -{ - size_t i; - - git_buf_free(&destpath); - git_buf_free(&filepath); - - for (i = 0; i < ARRAY_SIZE(paths); i++) - cl_fixture_cleanup(paths[i]); -} - -static void init_linked_repo(const char *path, const char *alternate) -{ - git_buf_clear(&destpath); - git_buf_clear(&filepath); - - cl_git_pass(git_repository_init(&repo, path, 1)); - cl_git_pass(git_path_prettify(&destpath, alternate, NULL)); - cl_git_pass(git_buf_joinpath(&destpath, destpath.ptr, "objects")); - cl_git_pass(git_buf_joinpath(&filepath, git_repository_path(repo), "objects/info")); - cl_git_pass(git_futils_mkdir(filepath.ptr, 0755, GIT_MKDIR_PATH)); - cl_git_pass(git_buf_joinpath(&filepath, filepath.ptr , "alternates")); - - cl_git_pass(git_filebuf_open(&file, git_buf_cstr(&filepath), 0, 0666)); - git_filebuf_printf(&file, "%s\n", git_buf_cstr(&destpath)); - cl_git_pass(git_filebuf_commit(&file)); - - git_repository_free(repo); -} - -void test_odb_alternates__chained(void) -{ - git_commit *commit; - git_oid oid; - - /* Set the alternate A -> testrepo.git */ - init_linked_repo(paths[0], cl_fixture("testrepo.git")); - - /* Set the alternate B -> A */ - init_linked_repo(paths[1], paths[0]); - - /* Now load B and see if we can find an object from testrepo.git */ - cl_git_pass(git_repository_open(&repo, paths[1])); - git_oid_fromstr(&oid, "a65fedf39aefe402d3bb6e24df4d4f5fe4547750"); - cl_git_pass(git_commit_lookup(&commit, repo, &oid)); - git_commit_free(commit); - git_repository_free(repo); -} - -void test_odb_alternates__long_chain(void) -{ - git_commit *commit; - git_oid oid; - size_t i; - - /* Set the alternate A -> testrepo.git */ - init_linked_repo(paths[0], cl_fixture("testrepo.git")); - - /* Set up the five-element chain */ - for (i = 1; i < ARRAY_SIZE(paths); i++) { - init_linked_repo(paths[i], paths[i-1]); - } - - /* Now load the last one and see if we can find an object from testrepo.git */ - cl_git_pass(git_repository_open(&repo, paths[ARRAY_SIZE(paths)-1])); - git_oid_fromstr(&oid, "a65fedf39aefe402d3bb6e24df4d4f5fe4547750"); - cl_git_fail(git_commit_lookup(&commit, repo, &oid)); - git_repository_free(repo); -} diff --git a/vendor/libgit2/tests/odb/backend/nobackend.c b/vendor/libgit2/tests/odb/backend/nobackend.c deleted file mode 100644 index 783641e8f..000000000 --- a/vendor/libgit2/tests/odb/backend/nobackend.c +++ /dev/null @@ -1,46 +0,0 @@ -#include "clar_libgit2.h" -#include "repository.h" -#include "git2/sys/repository.h" - -static git_repository *_repo; - -void test_odb_backend_nobackend__initialize(void) -{ - git_config *config; - git_odb *odb; - git_refdb *refdb; - - cl_git_pass(git_repository_new(&_repo)); - cl_git_pass(git_config_new(&config)); - cl_git_pass(git_odb_new(&odb)); - cl_git_pass(git_refdb_new(&refdb, _repo)); - - git_repository_set_config(_repo, config); - git_repository_set_odb(_repo, odb); - git_repository_set_refdb(_repo, refdb); - - /* The set increases the refcount and we don't want them anymore */ - git_config_free(config); - git_odb_free(odb); - git_refdb_free(refdb); -} - -void test_odb_backend_nobackend__cleanup(void) -{ - git_repository_free(_repo); -} - -void test_odb_backend_nobackend__write_fails_gracefully(void) -{ - git_oid id; - git_odb *odb; - const git_error *err; - - git_repository_odb(&odb, _repo); - cl_git_fail(git_odb_write(&id, odb, "Hello world!\n", 13, GIT_OBJ_BLOB)); - - err = giterr_last(); - cl_assert_equal_s(err->message, "Cannot write object - unsupported in the loaded odb backends"); - - git_odb_free(odb); -} diff --git a/vendor/libgit2/tests/odb/backend/nonrefreshing.c b/vendor/libgit2/tests/odb/backend/nonrefreshing.c deleted file mode 100644 index b43529479..000000000 --- a/vendor/libgit2/tests/odb/backend/nonrefreshing.c +++ /dev/null @@ -1,274 +0,0 @@ -#include "clar_libgit2.h" -#include "git2/sys/odb_backend.h" -#include "repository.h" - -typedef struct fake_backend { - git_odb_backend parent; - - git_error_code error_code; - - int exists_calls; - int read_calls; - int read_header_calls; - int read_prefix_calls; -} fake_backend; - -static git_repository *_repo; -static fake_backend *_fake; -static git_oid _oid; - -static int fake_backend__exists(git_odb_backend *backend, const git_oid *oid) -{ - fake_backend *fake; - - GIT_UNUSED(oid); - - fake = (fake_backend *)backend; - - fake->exists_calls++; - - return (fake->error_code == GIT_OK); -} - -static int fake_backend__read( - void **buffer_p, size_t *len_p, git_otype *type_p, - git_odb_backend *backend, const git_oid *oid) -{ - fake_backend *fake; - - GIT_UNUSED(buffer_p); - GIT_UNUSED(len_p); - GIT_UNUSED(type_p); - GIT_UNUSED(oid); - - fake = (fake_backend *)backend; - - fake->read_calls++; - - *len_p = 0; - *buffer_p = NULL; - *type_p = GIT_OBJ_BLOB; - - return fake->error_code; -} - -static int fake_backend__read_header( - size_t *len_p, git_otype *type_p, - git_odb_backend *backend, const git_oid *oid) -{ - fake_backend *fake; - - GIT_UNUSED(len_p); - GIT_UNUSED(type_p); - GIT_UNUSED(oid); - - fake = (fake_backend *)backend; - - fake->read_header_calls++; - - *len_p = 0; - *type_p = GIT_OBJ_BLOB; - - return fake->error_code; -} - -static int fake_backend__read_prefix( - git_oid *out_oid, void **buffer_p, size_t *len_p, git_otype *type_p, - git_odb_backend *backend, const git_oid *short_oid, size_t len) -{ - fake_backend *fake; - - GIT_UNUSED(out_oid); - GIT_UNUSED(buffer_p); - GIT_UNUSED(len_p); - GIT_UNUSED(type_p); - GIT_UNUSED(short_oid); - GIT_UNUSED(len); - - fake = (fake_backend *)backend; - - fake->read_prefix_calls++; - - *len_p = 0; - *buffer_p = NULL; - *type_p = GIT_OBJ_BLOB; - - return fake->error_code; -} - -static void fake_backend__free(git_odb_backend *_backend) -{ - fake_backend *backend; - - backend = (fake_backend *)_backend; - - git__free(backend); -} - -static int build_fake_backend( - git_odb_backend **out, - git_error_code error_code) -{ - fake_backend *backend; - - backend = git__calloc(1, sizeof(fake_backend)); - GITERR_CHECK_ALLOC(backend); - - backend->parent.version = GIT_ODB_BACKEND_VERSION; - - backend->parent.refresh = NULL; - backend->error_code = error_code; - - backend->parent.read = fake_backend__read; - backend->parent.read_prefix = fake_backend__read_prefix; - backend->parent.read_header = fake_backend__read_header; - backend->parent.exists = fake_backend__exists; - backend->parent.free = &fake_backend__free; - - *out = (git_odb_backend *)backend; - - return 0; -} - -static void setup_repository_and_backend(git_error_code error_code) -{ - git_odb *odb = NULL; - git_odb_backend *backend = NULL; - - _repo = cl_git_sandbox_init("testrepo.git"); - - cl_git_pass(build_fake_backend(&backend, error_code)); - - cl_git_pass(git_repository_odb__weakptr(&odb, _repo)); - cl_git_pass(git_odb_add_backend(odb, backend, 10)); - - _fake = (fake_backend *)backend; - - cl_git_pass(git_oid_fromstr(&_oid, "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef")); -} - -void test_odb_backend_nonrefreshing__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -void test_odb_backend_nonrefreshing__exists_is_invoked_once_on_failure(void) -{ - git_odb *odb; - - setup_repository_and_backend(GIT_ENOTFOUND); - - cl_git_pass(git_repository_odb__weakptr(&odb, _repo)); - cl_assert_equal_b(false, git_odb_exists(odb, &_oid)); - - cl_assert_equal_i(1, _fake->exists_calls); -} - -void test_odb_backend_nonrefreshing__read_is_invoked_once_on_failure(void) -{ - git_object *obj; - - setup_repository_and_backend(GIT_ENOTFOUND); - - cl_git_fail_with( - git_object_lookup(&obj, _repo, &_oid, GIT_OBJ_ANY), - GIT_ENOTFOUND); - - cl_assert_equal_i(1, _fake->read_calls); -} - -void test_odb_backend_nonrefreshing__readprefix_is_invoked_once_on_failure(void) -{ - git_object *obj; - - setup_repository_and_backend(GIT_ENOTFOUND); - - cl_git_fail_with( - git_object_lookup_prefix(&obj, _repo, &_oid, 7, GIT_OBJ_ANY), - GIT_ENOTFOUND); - - cl_assert_equal_i(1, _fake->read_prefix_calls); -} - -void test_odb_backend_nonrefreshing__readheader_is_invoked_once_on_failure(void) -{ - git_odb *odb; - size_t len; - git_otype type; - - setup_repository_and_backend(GIT_ENOTFOUND); - - cl_git_pass(git_repository_odb__weakptr(&odb, _repo)); - - cl_git_fail_with( - git_odb_read_header(&len, &type, odb, &_oid), - GIT_ENOTFOUND); - - cl_assert_equal_i(1, _fake->read_header_calls); -} - -void test_odb_backend_nonrefreshing__exists_is_invoked_once_on_success(void) -{ - git_odb *odb; - - setup_repository_and_backend(GIT_OK); - - cl_git_pass(git_repository_odb__weakptr(&odb, _repo)); - cl_assert_equal_b(true, git_odb_exists(odb, &_oid)); - - cl_assert_equal_i(1, _fake->exists_calls); -} - -void test_odb_backend_nonrefreshing__read_is_invoked_once_on_success(void) -{ - git_object *obj; - - setup_repository_and_backend(GIT_OK); - - cl_git_pass(git_object_lookup(&obj, _repo, &_oid, GIT_OBJ_ANY)); - - cl_assert_equal_i(1, _fake->read_calls); - - git_object_free(obj); -} - -void test_odb_backend_nonrefreshing__readprefix_is_invoked_once_on_success(void) -{ - git_object *obj; - - setup_repository_and_backend(GIT_OK); - - cl_git_pass(git_object_lookup_prefix(&obj, _repo, &_oid, 7, GIT_OBJ_ANY)); - - cl_assert_equal_i(1, _fake->read_prefix_calls); - - git_object_free(obj); -} - -void test_odb_backend_nonrefreshing__readheader_is_invoked_once_on_success(void) -{ - git_odb *odb; - size_t len; - git_otype type; - - setup_repository_and_backend(GIT_OK); - - cl_git_pass(git_repository_odb__weakptr(&odb, _repo)); - - cl_git_pass(git_odb_read_header(&len, &type, odb, &_oid)); - - cl_assert_equal_i(1, _fake->read_header_calls); -} - -void test_odb_backend_nonrefreshing__read_is_invoked_once_when_revparsing_a_full_oid(void) -{ - git_object *obj; - - setup_repository_and_backend(GIT_ENOTFOUND); - - cl_git_fail_with( - git_revparse_single(&obj, _repo, "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef"), - GIT_ENOTFOUND); - - cl_assert_equal_i(1, _fake->read_calls); -} diff --git a/vendor/libgit2/tests/odb/emptyobjects.c b/vendor/libgit2/tests/odb/emptyobjects.c deleted file mode 100644 index 783d05197..000000000 --- a/vendor/libgit2/tests/odb/emptyobjects.c +++ /dev/null @@ -1,57 +0,0 @@ -#include "clar_libgit2.h" -#include "odb.h" -#include "filebuf.h" - -git_repository *g_repo; - -void test_odb_emptyobjects__initialize(void) -{ - cl_git_pass(git_repository_open(&g_repo, cl_fixture("testrepo.git"))); -} -void test_odb_emptyobjects__cleanup(void) -{ - git_repository_free(g_repo); -} - -void test_odb_emptyobjects__read(void) -{ - git_oid id; - git_blob *blob; - - cl_git_pass(git_oid_fromstr(&id, "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391")); - cl_git_pass(git_blob_lookup(&blob, g_repo, &id)); - cl_assert_equal_i(GIT_OBJ_BLOB, git_object_type((git_object *) blob)); - cl_assert(git_blob_rawcontent(blob)); - cl_assert_equal_s("", git_blob_rawcontent(blob)); - cl_assert_equal_i(0, git_blob_rawsize(blob)); - git_blob_free(blob); -} - -void test_odb_emptyobjects__read_tree(void) -{ - git_oid id; - git_tree *tree; - - cl_git_pass(git_oid_fromstr(&id, "4b825dc642cb6eb9a060e54bf8d69288fbee4904")); - cl_git_pass(git_tree_lookup(&tree, g_repo, &id)); - cl_assert_equal_i(GIT_OBJ_TREE, git_object_type((git_object *) tree)); - cl_assert_equal_i(0, git_tree_entrycount(tree)); - cl_assert_equal_p(NULL, git_tree_entry_byname(tree, "foo")); - git_tree_free(tree); -} - -void test_odb_emptyobjects__read_tree_odb(void) -{ - git_oid id; - git_odb *odb; - git_odb_object *tree_odb; - - cl_git_pass(git_oid_fromstr(&id, "4b825dc642cb6eb9a060e54bf8d69288fbee4904")); - cl_git_pass(git_repository_odb(&odb, g_repo)); - cl_git_pass(git_odb_read(&tree_odb, odb, &id)); - cl_assert(git_odb_object_data(tree_odb)); - cl_assert_equal_s("", git_odb_object_data(tree_odb)); - cl_assert_equal_i(0, git_odb_object_size(tree_odb)); - git_odb_object_free(tree_odb); - git_odb_free(odb); -} diff --git a/vendor/libgit2/tests/odb/foreach.c b/vendor/libgit2/tests/odb/foreach.c deleted file mode 100644 index 12b81b4f1..000000000 --- a/vendor/libgit2/tests/odb/foreach.c +++ /dev/null @@ -1,126 +0,0 @@ -#include "clar_libgit2.h" -#include "odb.h" -#include "git2/odb_backend.h" -#include "pack.h" -#include "buffer.h" - -static git_odb *_odb; -static git_repository *_repo; - -void test_odb_foreach__cleanup(void) -{ - git_odb_free(_odb); - git_repository_free(_repo); - - _odb = NULL; - _repo = NULL; -} - -static int foreach_cb(const git_oid *oid, void *data) -{ - int *nobj = data; - (*nobj)++; - - GIT_UNUSED(oid); - - return 0; -} - -/* - * $ git --git-dir tests/resources/testrepo.git count-objects --verbose - * count: 47 - * size: 4 - * in-pack: 1640 - * packs: 3 - * size-pack: 425 - * prune-packable: 0 - * garbage: 0 - */ -void test_odb_foreach__foreach(void) -{ - int nobj = 0; - - cl_git_pass(git_repository_open(&_repo, cl_fixture("testrepo.git"))); - git_repository_odb(&_odb, _repo); - - cl_git_pass(git_odb_foreach(_odb, foreach_cb, &nobj)); - cl_assert_equal_i(47 + 1640, nobj); /* count + in-pack */ -} - -void test_odb_foreach__one_pack(void) -{ - git_odb_backend *backend = NULL; - int nobj = 0; - - cl_git_pass(git_odb_new(&_odb)); - cl_git_pass(git_odb_backend_one_pack(&backend, cl_fixture("testrepo.git/objects/pack/pack-a81e489679b7d3418f9ab594bda8ceb37dd4c695.idx"))); - cl_git_pass(git_odb_add_backend(_odb, backend, 1)); - _repo = NULL; - - cl_git_pass(git_odb_foreach(_odb, foreach_cb, &nobj)); - cl_assert(nobj == 1628); -} - -static int foreach_stop_cb(const git_oid *oid, void *data) -{ - int *nobj = data; - (*nobj)++; - - GIT_UNUSED(oid); - - return (*nobj == 1000) ? -321 : 0; -} - -static int foreach_stop_first_cb(const git_oid *oid, void *data) -{ - int *nobj = data; - (*nobj)++; - - GIT_UNUSED(oid); - - return -123; -} - -void test_odb_foreach__interrupt_foreach(void) -{ - int nobj = 0; - git_oid id; - - cl_git_pass(git_repository_open(&_repo, cl_fixture("testrepo.git"))); - git_repository_odb(&_odb, _repo); - - cl_assert_equal_i(-321, git_odb_foreach(_odb, foreach_stop_cb, &nobj)); - cl_assert(nobj == 1000); - - git_odb_free(_odb); - git_repository_free(_repo); - - cl_git_pass(git_repository_init(&_repo, "onlyloose.git", true)); - git_repository_odb(&_odb, _repo); - - cl_git_pass(git_odb_write(&id, _odb, "", 0, GIT_OBJ_BLOB)); - cl_assert_equal_i(-123, git_odb_foreach(_odb, foreach_stop_first_cb, &nobj)); -} - -void test_odb_foreach__files_in_objects_dir(void) -{ - git_repository *repo; - git_odb *odb; - git_buf buf = GIT_BUF_INIT; - int nobj = 0; - - cl_fixture_sandbox("testrepo.git"); - cl_git_pass(git_repository_open(&repo, "testrepo.git")); - - cl_git_pass(git_buf_printf(&buf, "%s/objects/somefile", git_repository_path(repo))); - cl_git_mkfile(buf.ptr, ""); - git_buf_free(&buf); - - cl_git_pass(git_repository_odb(&odb, repo)); - cl_git_pass(git_odb_foreach(odb, foreach_cb, &nobj)); - cl_assert_equal_i(47 + 1640, nobj); /* count + in-pack */ - - git_odb_free(odb); - git_repository_free(repo); - cl_fixture_cleanup("testrepo.git"); -} diff --git a/vendor/libgit2/tests/odb/loose.c b/vendor/libgit2/tests/odb/loose.c deleted file mode 100644 index c91927c4a..000000000 --- a/vendor/libgit2/tests/odb/loose.c +++ /dev/null @@ -1,152 +0,0 @@ -#include "clar_libgit2.h" -#include "odb.h" -#include "git2/odb_backend.h" -#include "posix.h" -#include "loose_data.h" - -#ifdef __ANDROID_API__ -# define S_IREAD S_IRUSR -# define S_IWRITE S_IWUSR -#endif - -static void write_object_files(object_data *d) -{ - int fd; - - if (p_mkdir(d->dir, GIT_OBJECT_DIR_MODE) < 0) - cl_assert(errno == EEXIST); - - cl_assert((fd = p_creat(d->file, S_IREAD | S_IWRITE)) >= 0); - cl_must_pass(p_write(fd, d->bytes, d->blen)); - - p_close(fd); -} - -static void cmp_objects(git_rawobj *o, object_data *d) -{ - cl_assert(o->type == git_object_string2type(d->type)); - cl_assert(o->len == d->dlen); - - if (o->len > 0) - cl_assert(memcmp(o->data, d->data, o->len) == 0); -} - -static void test_read_object(object_data *data) -{ - git_oid id; - git_odb_object *obj; - git_odb *odb; - git_rawobj tmp; - - write_object_files(data); - - cl_git_pass(git_odb_open(&odb, "test-objects")); - cl_git_pass(git_oid_fromstr(&id, data->id)); - cl_git_pass(git_odb_read(&obj, odb, &id)); - - tmp.data = obj->buffer; - tmp.len = obj->cached.size; - tmp.type = obj->cached.type; - - cmp_objects(&tmp, data); - - git_odb_object_free(obj); - git_odb_free(odb); -} - -void test_odb_loose__initialize(void) -{ - cl_must_pass(p_mkdir("test-objects", GIT_OBJECT_DIR_MODE)); -} - -void test_odb_loose__cleanup(void) -{ - cl_fixture_cleanup("test-objects"); -} - -void test_odb_loose__exists(void) -{ - git_oid id, id2; - git_odb *odb; - - write_object_files(&one); - cl_git_pass(git_odb_open(&odb, "test-objects")); - - cl_git_pass(git_oid_fromstr(&id, one.id)); - cl_assert(git_odb_exists(odb, &id)); - - cl_git_pass(git_oid_fromstrp(&id, "8b137891")); - cl_git_pass(git_odb_exists_prefix(&id2, odb, &id, 8)); - cl_assert_equal_i(0, git_oid_streq(&id2, one.id)); - - /* Test for a missing object */ - cl_git_pass(git_oid_fromstr(&id, "8b137891791fe96927ad78e64b0aad7bded08baa")); - cl_assert(!git_odb_exists(odb, &id)); - - cl_git_pass(git_oid_fromstrp(&id, "8b13789a")); - cl_assert_equal_i(GIT_ENOTFOUND, git_odb_exists_prefix(&id2, odb, &id, 8)); - - git_odb_free(odb); -} - -void test_odb_loose__simple_reads(void) -{ - test_read_object(&commit); - test_read_object(&tree); - test_read_object(&tag); - test_read_object(&zero); - test_read_object(&one); - test_read_object(&two); - test_read_object(&some); -} - -void test_write_object_permission( - mode_t dir_mode, mode_t file_mode, - mode_t expected_dir_mode, mode_t expected_file_mode) -{ - git_odb *odb; - git_odb_backend *backend; - git_oid oid; - struct stat statbuf; - mode_t mask, os_mask; - - /* Windows does not return group/user bits from stat, - * files are never executable. - */ -#ifdef GIT_WIN32 - os_mask = 0600; -#else - os_mask = 0777; -#endif - - mask = p_umask(0); - p_umask(mask); - - cl_git_pass(git_odb_new(&odb)); - cl_git_pass(git_odb_backend_loose(&backend, "test-objects", -1, 0, dir_mode, file_mode)); - cl_git_pass(git_odb_add_backend(odb, backend, 1)); - cl_git_pass(git_odb_write(&oid, odb, "Test data\n", 10, GIT_OBJ_BLOB)); - - cl_git_pass(p_stat("test-objects/67", &statbuf)); - cl_assert_equal_i(statbuf.st_mode & os_mask, (expected_dir_mode & ~mask) & os_mask); - - cl_git_pass(p_stat("test-objects/67/b808feb36201507a77f85e6d898f0a2836e4a5", &statbuf)); - cl_assert_equal_i(statbuf.st_mode & os_mask, (expected_file_mode & ~mask) & os_mask); - - git_odb_free(odb); -} - -void test_odb_loose__permissions_standard(void) -{ - test_write_object_permission(0, 0, GIT_OBJECT_DIR_MODE, GIT_OBJECT_FILE_MODE); -} - -void test_odb_loose_permissions_readonly(void) -{ - test_write_object_permission(0777, 0444, 0777, 0444); -} - -void test_odb_loose__permissions_readwrite(void) -{ - test_write_object_permission(0777, 0666, 0777, 0666); -} diff --git a/vendor/libgit2/tests/odb/loose_data.h b/vendor/libgit2/tests/odb/loose_data.h deleted file mode 100644 index c10c9bc7f..000000000 --- a/vendor/libgit2/tests/odb/loose_data.h +++ /dev/null @@ -1,522 +0,0 @@ -typedef struct object_data { - unsigned char *bytes; /* (compressed) bytes stored in object store */ - size_t blen; /* length of data in object store */ - char *id; /* object id (sha1) */ - char *type; /* object type */ - char *dir; /* object store (fan-out) directory name */ - char *file; /* object store filename */ - unsigned char *data; /* (uncompressed) object data */ - size_t dlen; /* length of (uncompressed) object data */ -} object_data; - -/* one == 8b137891791fe96927ad78e64b0aad7bded08bdc */ -static unsigned char one_bytes[] = { - 0x31, 0x78, 0x9c, 0xe3, 0x02, 0x00, 0x00, 0x0b, - 0x00, 0x0b, -}; - -static unsigned char one_data[] = { - 0x0a, -}; - -static object_data one = { - one_bytes, - sizeof(one_bytes), - "8b137891791fe96927ad78e64b0aad7bded08bdc", - "blob", - "test-objects/8b", - "test-objects/8b/137891791fe96927ad78e64b0aad7bded08bdc", - one_data, - sizeof(one_data), -}; - - -/* commit == 3d7f8a6af076c8c3f20071a8935cdbe8228594d1 */ -static unsigned char commit_bytes[] = { - 0x78, 0x01, 0x85, 0x50, 0xc1, 0x6a, 0xc3, 0x30, - 0x0c, 0xdd, 0xd9, 0x5f, 0xa1, 0xfb, 0x96, 0x12, - 0xbb, 0x29, 0x71, 0x46, 0x19, 0x2b, 0x3d, 0x97, - 0x1d, 0xd6, 0x7d, 0x80, 0x1d, 0xcb, 0x89, 0x21, - 0xb6, 0x82, 0xed, 0x40, 0xf3, 0xf7, 0xf3, 0x48, - 0x29, 0x3b, 0x6d, 0xd2, 0xe5, 0xbd, 0x27, 0xbd, - 0x27, 0x50, 0x4f, 0xde, 0xbb, 0x0c, 0xfb, 0x43, - 0xf3, 0x94, 0x23, 0x22, 0x18, 0x6b, 0x85, 0x51, - 0x5d, 0xad, 0xc5, 0xa1, 0x41, 0xae, 0x51, 0x4b, - 0xd9, 0x19, 0x6e, 0x4b, 0x0b, 0x29, 0x35, 0x72, - 0x59, 0xef, 0x5b, 0x29, 0x8c, 0x65, 0x6a, 0xc9, - 0x23, 0x45, 0x38, 0xc1, 0x17, 0x5c, 0x7f, 0xc0, - 0x71, 0x13, 0xde, 0xf1, 0xa6, 0xfc, 0x3c, 0xe1, - 0xae, 0x27, 0xff, 0x06, 0x5c, 0x88, 0x56, 0xf2, - 0x46, 0x74, 0x2d, 0x3c, 0xd7, 0xa5, 0x58, 0x51, - 0xcb, 0xb9, 0x8c, 0x11, 0xce, 0xf0, 0x01, 0x97, - 0x0d, 0x1e, 0x1f, 0xea, 0x3f, 0x6e, 0x76, 0x02, - 0x0a, 0x58, 0x4d, 0x2e, 0x20, 0x6c, 0x1e, 0x48, - 0x8b, 0xf7, 0x2a, 0xae, 0x8c, 0x5d, 0x47, 0x04, - 0x4d, 0x66, 0x05, 0xb2, 0x90, 0x0b, 0xbe, 0xcf, - 0x3d, 0xa6, 0xa4, 0x06, 0x7c, 0x29, 0x3c, 0x64, - 0xe5, 0x82, 0x0b, 0x03, 0xd8, 0x25, 0x96, 0x8d, - 0x08, 0x78, 0x9b, 0x27, 0x15, 0x54, 0x76, 0x14, - 0xd8, 0xdd, 0x35, 0x2f, 0x71, 0xa6, 0x84, 0x8f, - 0x90, 0x51, 0x85, 0x01, 0x13, 0xb8, 0x90, 0x23, - 0x99, 0xa5, 0x47, 0x03, 0x7a, 0xfd, 0x15, 0xbf, - 0x63, 0xec, 0xd3, 0x0d, 0x01, 0x4d, 0x45, 0xb6, - 0xd2, 0xeb, 0xeb, 0xdf, 0xef, 0x60, 0xdf, 0xef, - 0x1f, 0x78, 0x35, -}; - -static unsigned char commit_data[] = { - 0x74, 0x72, 0x65, 0x65, 0x20, 0x64, 0x66, 0x66, - 0x32, 0x64, 0x61, 0x39, 0x30, 0x62, 0x32, 0x35, - 0x34, 0x65, 0x31, 0x62, 0x65, 0x62, 0x38, 0x38, - 0x39, 0x64, 0x31, 0x66, 0x31, 0x66, 0x31, 0x32, - 0x38, 0x38, 0x62, 0x65, 0x31, 0x38, 0x30, 0x33, - 0x37, 0x38, 0x32, 0x64, 0x66, 0x0a, 0x61, 0x75, - 0x74, 0x68, 0x6f, 0x72, 0x20, 0x41, 0x20, 0x55, - 0x20, 0x54, 0x68, 0x6f, 0x72, 0x20, 0x3c, 0x61, - 0x75, 0x74, 0x68, 0x6f, 0x72, 0x40, 0x65, 0x78, - 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x2e, 0x63, 0x6f, - 0x6d, 0x3e, 0x20, 0x31, 0x32, 0x32, 0x37, 0x38, - 0x31, 0x34, 0x32, 0x39, 0x37, 0x20, 0x2b, 0x30, - 0x30, 0x30, 0x30, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, - 0x69, 0x74, 0x74, 0x65, 0x72, 0x20, 0x43, 0x20, - 0x4f, 0x20, 0x4d, 0x69, 0x74, 0x74, 0x65, 0x72, - 0x20, 0x3c, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, - 0x74, 0x65, 0x72, 0x40, 0x65, 0x78, 0x61, 0x6d, - 0x70, 0x6c, 0x65, 0x2e, 0x63, 0x6f, 0x6d, 0x3e, - 0x20, 0x31, 0x32, 0x32, 0x37, 0x38, 0x31, 0x34, - 0x32, 0x39, 0x37, 0x20, 0x2b, 0x30, 0x30, 0x30, - 0x30, 0x0a, 0x0a, 0x41, 0x20, 0x6f, 0x6e, 0x65, - 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x20, 0x63, 0x6f, - 0x6d, 0x6d, 0x69, 0x74, 0x20, 0x73, 0x75, 0x6d, - 0x6d, 0x61, 0x72, 0x79, 0x0a, 0x0a, 0x54, 0x68, - 0x65, 0x20, 0x62, 0x6f, 0x64, 0x79, 0x20, 0x6f, - 0x66, 0x20, 0x74, 0x68, 0x65, 0x20, 0x63, 0x6f, - 0x6d, 0x6d, 0x69, 0x74, 0x20, 0x6d, 0x65, 0x73, - 0x73, 0x61, 0x67, 0x65, 0x2c, 0x20, 0x63, 0x6f, - 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x69, 0x6e, 0x67, - 0x20, 0x66, 0x75, 0x72, 0x74, 0x68, 0x65, 0x72, - 0x20, 0x65, 0x78, 0x70, 0x6c, 0x61, 0x6e, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x0a, 0x6f, 0x66, 0x20, - 0x74, 0x68, 0x65, 0x20, 0x70, 0x75, 0x72, 0x70, - 0x6f, 0x73, 0x65, 0x20, 0x6f, 0x66, 0x20, 0x74, - 0x68, 0x65, 0x20, 0x63, 0x68, 0x61, 0x6e, 0x67, - 0x65, 0x73, 0x20, 0x69, 0x6e, 0x74, 0x72, 0x6f, - 0x64, 0x75, 0x63, 0x65, 0x64, 0x20, 0x62, 0x79, - 0x20, 0x74, 0x68, 0x65, 0x20, 0x63, 0x6f, 0x6d, - 0x6d, 0x69, 0x74, 0x2e, 0x0a, 0x0a, 0x53, 0x69, - 0x67, 0x6e, 0x65, 0x64, 0x2d, 0x6f, 0x66, 0x2d, - 0x62, 0x79, 0x3a, 0x20, 0x41, 0x20, 0x55, 0x20, - 0x54, 0x68, 0x6f, 0x72, 0x20, 0x3c, 0x61, 0x75, - 0x74, 0x68, 0x6f, 0x72, 0x40, 0x65, 0x78, 0x61, - 0x6d, 0x70, 0x6c, 0x65, 0x2e, 0x63, 0x6f, 0x6d, - 0x3e, 0x0a, -}; - -static object_data commit = { - commit_bytes, - sizeof(commit_bytes), - "3d7f8a6af076c8c3f20071a8935cdbe8228594d1", - "commit", - "test-objects/3d", - "test-objects/3d/7f8a6af076c8c3f20071a8935cdbe8228594d1", - commit_data, - sizeof(commit_data), -}; - -/* tree == dff2da90b254e1beb889d1f1f1288be1803782df */ -static unsigned char tree_bytes[] = { - 0x78, 0x01, 0x2b, 0x29, 0x4a, 0x4d, 0x55, 0x30, - 0x34, 0x32, 0x63, 0x30, 0x34, 0x30, 0x30, 0x33, - 0x31, 0x51, 0xc8, 0xcf, 0x4b, 0x65, 0xe8, 0x16, - 0xae, 0x98, 0x58, 0x29, 0xff, 0x32, 0x53, 0x7d, - 0x6d, 0xc5, 0x33, 0x6f, 0xae, 0xb5, 0xd5, 0xf7, - 0x2e, 0x74, 0xdf, 0x81, 0x4a, 0x17, 0xe7, 0xe7, - 0xa6, 0x32, 0xfc, 0x6d, 0x31, 0xd8, 0xd3, 0xe6, - 0xf3, 0xe7, 0xea, 0x47, 0xbe, 0xd0, 0x09, 0x3f, - 0x96, 0xb8, 0x3f, 0x90, 0x9e, 0xa2, 0xfd, 0x0f, - 0x2a, 0x5f, 0x52, 0x9e, 0xcf, 0x50, 0x31, 0x43, - 0x52, 0x29, 0xd1, 0x5a, 0xeb, 0x77, 0x82, 0x2a, - 0x8b, 0xfe, 0xb7, 0xbd, 0xed, 0x5d, 0x07, 0x67, - 0xfa, 0xb5, 0x42, 0xa5, 0xab, 0x52, 0x8b, 0xf2, - 0x19, 0x9e, 0xcd, 0x7d, 0x34, 0x7b, 0xd3, 0xc5, - 0x6b, 0xce, 0xde, 0xdd, 0x9a, 0xeb, 0xca, 0xa3, - 0x6e, 0x1c, 0x7a, 0xd2, 0x13, 0x3c, 0x11, 0x00, - 0xe2, 0xaa, 0x38, 0x57, -}; - -static unsigned char tree_data[] = { - 0x31, 0x30, 0x30, 0x36, 0x34, 0x34, 0x20, 0x6f, - 0x6e, 0x65, 0x00, 0x8b, 0x13, 0x78, 0x91, 0x79, - 0x1f, 0xe9, 0x69, 0x27, 0xad, 0x78, 0xe6, 0x4b, - 0x0a, 0xad, 0x7b, 0xde, 0xd0, 0x8b, 0xdc, 0x31, - 0x30, 0x30, 0x36, 0x34, 0x34, 0x20, 0x73, 0x6f, - 0x6d, 0x65, 0x00, 0xfd, 0x84, 0x30, 0xbc, 0x86, - 0x4c, 0xfc, 0xd5, 0xf1, 0x0e, 0x55, 0x90, 0xf8, - 0xa4, 0x47, 0xe0, 0x1b, 0x94, 0x2b, 0xfe, 0x31, - 0x30, 0x30, 0x36, 0x34, 0x34, 0x20, 0x74, 0x77, - 0x6f, 0x00, 0x78, 0x98, 0x19, 0x22, 0x61, 0x3b, - 0x2a, 0xfb, 0x60, 0x25, 0x04, 0x2f, 0xf6, 0xbd, - 0x87, 0x8a, 0xc1, 0x99, 0x4e, 0x85, 0x31, 0x30, - 0x30, 0x36, 0x34, 0x34, 0x20, 0x7a, 0x65, 0x72, - 0x6f, 0x00, 0xe6, 0x9d, 0xe2, 0x9b, 0xb2, 0xd1, - 0xd6, 0x43, 0x4b, 0x8b, 0x29, 0xae, 0x77, 0x5a, - 0xd8, 0xc2, 0xe4, 0x8c, 0x53, 0x91, -}; - -static object_data tree = { - tree_bytes, - sizeof(tree_bytes), - "dff2da90b254e1beb889d1f1f1288be1803782df", - "tree", - "test-objects/df", - "test-objects/df/f2da90b254e1beb889d1f1f1288be1803782df", - tree_data, - sizeof(tree_data), -}; - -/* tag == 09d373e1dfdc16b129ceec6dd649739911541e05 */ -static unsigned char tag_bytes[] = { - 0x78, 0x01, 0x35, 0x4e, 0xcb, 0x0a, 0xc2, 0x40, - 0x10, 0xf3, 0xbc, 0x5f, 0x31, 0x77, 0xa1, 0xec, - 0xa3, 0xed, 0x6e, 0x41, 0x44, 0xf0, 0x2c, 0x5e, - 0xfc, 0x81, 0xe9, 0x76, 0xb6, 0xad, 0xb4, 0xb4, - 0x6c, 0x07, 0xd1, 0xbf, 0x77, 0x44, 0x0d, 0x39, - 0x84, 0x10, 0x92, 0x30, 0xf6, 0x60, 0xbc, 0xdb, - 0x2d, 0xed, 0x9d, 0x22, 0x83, 0xeb, 0x7c, 0x0a, - 0x58, 0x63, 0xd2, 0xbe, 0x8e, 0x21, 0xba, 0x64, - 0xb5, 0xf6, 0x06, 0x43, 0xe3, 0xaa, 0xd8, 0xb5, - 0x14, 0xac, 0x0d, 0x55, 0x53, 0x76, 0x46, 0xf1, - 0x6b, 0x25, 0x88, 0xcb, 0x3c, 0x8f, 0xac, 0x58, - 0x3a, 0x1e, 0xba, 0xd0, 0x85, 0xd8, 0xd8, 0xf7, - 0x94, 0xe1, 0x0c, 0x57, 0xb8, 0x8c, 0xcc, 0x22, - 0x0f, 0xdf, 0x90, 0xc8, 0x13, 0x3d, 0x71, 0x5e, - 0x27, 0x2a, 0xc4, 0x39, 0x82, 0xb1, 0xd6, 0x07, - 0x53, 0xda, 0xc6, 0xc3, 0x5e, 0x0b, 0x94, 0xba, - 0x0d, 0xe3, 0x06, 0x42, 0x1e, 0x08, 0x3e, 0x95, - 0xbf, 0x4b, 0x69, 0xc9, 0x90, 0x69, 0x22, 0xdc, - 0xe8, 0xbf, 0xf2, 0x06, 0x42, 0x9a, 0x36, 0xb1, -}; - -static unsigned char tag_data[] = { - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x33, - 0x64, 0x37, 0x66, 0x38, 0x61, 0x36, 0x61, 0x66, - 0x30, 0x37, 0x36, 0x63, 0x38, 0x63, 0x33, 0x66, - 0x32, 0x30, 0x30, 0x37, 0x31, 0x61, 0x38, 0x39, - 0x33, 0x35, 0x63, 0x64, 0x62, 0x65, 0x38, 0x32, - 0x32, 0x38, 0x35, 0x39, 0x34, 0x64, 0x31, 0x0a, - 0x74, 0x79, 0x70, 0x65, 0x20, 0x63, 0x6f, 0x6d, - 0x6d, 0x69, 0x74, 0x0a, 0x74, 0x61, 0x67, 0x20, - 0x76, 0x30, 0x2e, 0x30, 0x2e, 0x31, 0x0a, 0x74, - 0x61, 0x67, 0x67, 0x65, 0x72, 0x20, 0x43, 0x20, - 0x4f, 0x20, 0x4d, 0x69, 0x74, 0x74, 0x65, 0x72, - 0x20, 0x3c, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, - 0x74, 0x65, 0x72, 0x40, 0x65, 0x78, 0x61, 0x6d, - 0x70, 0x6c, 0x65, 0x2e, 0x63, 0x6f, 0x6d, 0x3e, - 0x20, 0x31, 0x32, 0x32, 0x37, 0x38, 0x31, 0x34, - 0x32, 0x39, 0x37, 0x20, 0x2b, 0x30, 0x30, 0x30, - 0x30, 0x0a, 0x0a, 0x54, 0x68, 0x69, 0x73, 0x20, - 0x69, 0x73, 0x20, 0x74, 0x68, 0x65, 0x20, 0x74, - 0x61, 0x67, 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x72, 0x65, - 0x6c, 0x65, 0x61, 0x73, 0x65, 0x20, 0x76, 0x30, - 0x2e, 0x30, 0x2e, 0x31, 0x0a, -}; - -static object_data tag = { - tag_bytes, - sizeof(tag_bytes), - "09d373e1dfdc16b129ceec6dd649739911541e05", - "tag", - "test-objects/09", - "test-objects/09/d373e1dfdc16b129ceec6dd649739911541e05", - tag_data, - sizeof(tag_data), -}; - -/* zero == e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 */ -static unsigned char zero_bytes[] = { - 0x78, 0x01, 0x4b, 0xca, 0xc9, 0x4f, 0x52, 0x30, - 0x60, 0x00, 0x00, 0x09, 0xb0, 0x01, 0xf0, -}; - -static unsigned char zero_data[] = { - 0x00 /* dummy data */ -}; - -static object_data zero = { - zero_bytes, - sizeof(zero_bytes), - "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391", - "blob", - "test-objects/e6", - "test-objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391", - zero_data, - 0, -}; - -/* two == 78981922613b2afb6025042ff6bd878ac1994e85 */ -static unsigned char two_bytes[] = { - 0x78, 0x01, 0x4b, 0xca, 0xc9, 0x4f, 0x52, 0x30, - 0x62, 0x48, 0xe4, 0x02, 0x00, 0x0e, 0x64, 0x02, - 0x5d, -}; - -static unsigned char two_data[] = { - 0x61, 0x0a, -}; - -static object_data two = { - two_bytes, - sizeof(two_bytes), - "78981922613b2afb6025042ff6bd878ac1994e85", - "blob", - "test-objects/78", - "test-objects/78/981922613b2afb6025042ff6bd878ac1994e85", - two_data, - sizeof(two_data), -}; - -/* some == fd8430bc864cfcd5f10e5590f8a447e01b942bfe */ -static unsigned char some_bytes[] = { - 0x78, 0x01, 0x7d, 0x54, 0xc1, 0x4e, 0xe3, 0x30, - 0x10, 0xdd, 0x33, 0x5f, 0x31, 0xc7, 0x5d, 0x94, - 0xa5, 0x84, 0xd5, 0x22, 0xad, 0x7a, 0x0a, 0x15, - 0x85, 0x48, 0xd0, 0x56, 0x49, 0x2a, 0xd4, 0xa3, - 0x13, 0x4f, 0x88, 0x85, 0x63, 0x47, 0xb6, 0x43, - 0xc9, 0xdf, 0xef, 0x8c, 0x69, 0x17, 0x56, 0x0b, - 0x7b, 0xaa, 0x62, 0x7b, 0xde, 0xbc, 0xf7, 0xe6, - 0x4d, 0x6b, 0x6d, 0x6b, 0x48, 0xd3, 0xcb, 0x5f, - 0x5f, 0x66, 0xa7, 0x27, 0x70, 0x0a, 0x55, 0xa7, - 0x3c, 0xb4, 0x4a, 0x23, 0xf0, 0xaf, 0x43, 0x04, - 0x6f, 0xdb, 0xb0, 0x17, 0x0e, 0xe7, 0x30, 0xd9, - 0x11, 0x1a, 0x61, 0xc0, 0xa1, 0x54, 0x3e, 0x38, - 0x55, 0x8f, 0x81, 0x9e, 0x05, 0x10, 0x46, 0xce, - 0xac, 0x83, 0xde, 0x4a, 0xd5, 0x4e, 0x0c, 0x42, - 0x67, 0xa3, 0x91, 0xe8, 0x20, 0x74, 0x08, 0x01, - 0x5d, 0xef, 0xc1, 0xb6, 0xf1, 0xe3, 0x66, 0xb5, - 0x85, 0x1b, 0x34, 0xe8, 0x84, 0x86, 0xcd, 0x58, - 0x6b, 0xd5, 0xc0, 0x9d, 0x6a, 0xd0, 0x78, 0x4c, - 0xe0, 0x19, 0x9d, 0x57, 0xd6, 0xc0, 0x45, 0xc2, - 0x18, 0xc2, 0xc3, 0xc0, 0x0f, 0x7c, 0x87, 0x12, - 0xea, 0x29, 0x56, 0x2f, 0x99, 0x4f, 0x79, 0xe0, - 0x03, 0x4b, 0x4b, 0x4d, 0x44, 0xa0, 0x92, 0x33, - 0x2a, 0xe0, 0x9a, 0xdc, 0x80, 0x90, 0x52, 0xf1, - 0x11, 0x04, 0x1b, 0x4b, 0x06, 0xea, 0xae, 0x3c, - 0xe3, 0x7a, 0x50, 0x74, 0x4a, 0x84, 0xfe, 0xc3, - 0x81, 0x41, 0xf8, 0x89, 0x18, 0x43, 0x67, 0x9d, - 0x87, 0x47, 0xf5, 0x8c, 0x51, 0xf6, 0x68, 0xb4, - 0xea, 0x55, 0x20, 0x2a, 0x6f, 0x80, 0xdc, 0x42, - 0x2b, 0xf3, 0x14, 0x2b, 0x1a, 0xdb, 0x0f, 0xe4, - 0x9a, 0x64, 0x84, 0xa3, 0x90, 0xa8, 0xf9, 0x8f, - 0x9d, 0x86, 0x9e, 0xd3, 0xab, 0x5a, 0x99, 0xc8, - 0xd9, 0xc3, 0x5e, 0x85, 0x0e, 0x2c, 0xb5, 0x73, - 0x30, 0x38, 0xfb, 0xe8, 0x44, 0xef, 0x5f, 0x95, - 0x1b, 0xc9, 0xd0, 0xef, 0x3c, 0x26, 0x32, 0x1e, - 0xff, 0x2d, 0xb6, 0x23, 0x7b, 0x3f, 0xd1, 0x3c, - 0x78, 0x1a, 0x0d, 0xcb, 0xe6, 0xf6, 0xd4, 0x44, - 0x99, 0x47, 0x1a, 0x9e, 0xed, 0x23, 0xb5, 0x91, - 0x6a, 0xdf, 0x53, 0x39, 0x03, 0xf8, 0x5a, 0xb1, - 0x0f, 0x1f, 0xce, 0x81, 0x11, 0xde, 0x01, 0x7a, - 0x90, 0x16, 0xc4, 0x30, 0xe8, 0x89, 0xed, 0x7b, - 0x65, 0x4b, 0xd7, 0x03, 0x36, 0xc1, 0xcf, 0xa1, - 0xa5, 0xb1, 0xe3, 0x8b, 0xe8, 0x07, 0x4d, 0xf3, - 0x23, 0x25, 0x13, 0x35, 0x27, 0xf5, 0x8c, 0x11, - 0xd3, 0xa0, 0x9a, 0xa8, 0xf5, 0x38, 0x7d, 0xce, - 0x55, 0xc2, 0x71, 0x79, 0x13, 0xc7, 0xa3, 0xda, - 0x77, 0x68, 0xc0, 0xd8, 0x10, 0xdd, 0x24, 0x8b, - 0x15, 0x59, 0xc5, 0x10, 0xe2, 0x20, 0x99, 0x8e, - 0xf0, 0x05, 0x9b, 0x31, 0x88, 0x5a, 0xe3, 0xd9, - 0x37, 0xba, 0xe2, 0xdb, 0xbf, 0x92, 0xfa, 0x66, - 0x16, 0x97, 0x47, 0xd9, 0x9d, 0x1d, 0x28, 0x7c, - 0x9d, 0x08, 0x1c, 0xc7, 0xbd, 0xd2, 0x1a, 0x6a, - 0x04, 0xf2, 0xa2, 0x1d, 0x75, 0x02, 0x14, 0x5d, - 0xc6, 0x78, 0xc8, 0xab, 0xdb, 0xf5, 0xb6, 0x82, - 0x6c, 0xb5, 0x83, 0x87, 0xac, 0x28, 0xb2, 0x55, - 0xb5, 0x9b, 0xc7, 0xc1, 0xb0, 0xb7, 0xf8, 0x4c, - 0xbc, 0x38, 0x0e, 0x8a, 0x04, 0x2a, 0x62, 0x41, - 0x6b, 0xe0, 0x84, 0x09, 0x13, 0xe9, 0xe1, 0xea, - 0xfb, 0xeb, 0x62, 0x71, 0x4b, 0x25, 0xd9, 0x55, - 0x7e, 0x97, 0x57, 0x3b, 0x20, 0x33, 0x96, 0x79, - 0xb5, 0xba, 0x2e, 0x4b, 0x58, 0xae, 0x0b, 0xc8, - 0x60, 0x93, 0x15, 0x55, 0xbe, 0xd8, 0xde, 0x65, - 0x05, 0x6c, 0xb6, 0xc5, 0x66, 0x5d, 0x5e, 0x93, - 0xf7, 0x25, 0x65, 0x98, 0x41, 0x29, 0x86, 0x0c, - 0xf2, 0xf1, 0x14, 0xa2, 0xb3, 0xbd, 0x75, 0x08, - 0x12, 0x83, 0x50, 0xda, 0x1f, 0x23, 0xbe, 0xa3, - 0x1d, 0xf4, 0x9d, 0x1d, 0xb5, 0x84, 0x4e, 0x50, - 0x38, 0x1d, 0x36, 0x48, 0x21, 0x95, 0xd1, 0xac, - 0x81, 0x99, 0x1d, 0xc1, 0x3f, 0x41, 0xe6, 0x9e, - 0x42, 0x5b, 0x0a, 0x48, 0xcc, 0x5f, 0xe0, 0x7d, - 0x3f, 0xc4, 0x6f, 0x0e, 0xfe, 0xc0, 0x2d, 0xfe, - 0x01, 0x2c, 0xd6, 0x9b, 0x5d, 0xbe, 0xba, 0x21, - 0xca, 0x79, 0xcb, 0xe3, 0x49, 0x60, 0xef, 0x68, - 0x05, 0x28, 0x9b, 0x8c, 0xc1, 0x12, 0x3e, 0xdb, - 0xc7, 0x04, 0x7e, 0xa6, 0x74, 0x29, 0xcc, 0x13, - 0xed, 0x07, 0x94, 0x81, 0xd6, 0x96, 0xaa, 0x97, - 0xaa, 0xa5, 0xc0, 0x2f, 0xb5, 0xb5, 0x2e, 0xe6, - 0xfc, 0xca, 0xfa, 0x60, 0x4d, 0x02, 0xf7, 0x19, - 0x9c, 0x5f, 0xa4, 0xe9, 0xf9, 0xf7, 0xf4, 0xc7, - 0x79, 0x9a, 0xc0, 0xb6, 0xcc, 0x58, 0xec, 0xec, - 0xe4, 0x37, 0x22, 0xfa, 0x8b, 0x53, -}; - -static unsigned char some_data[] = { - 0x2f, 0x2a, 0x0a, 0x20, 0x2a, 0x20, 0x54, 0x68, - 0x69, 0x73, 0x20, 0x66, 0x69, 0x6c, 0x65, 0x20, - 0x69, 0x73, 0x20, 0x66, 0x72, 0x65, 0x65, 0x20, - 0x73, 0x6f, 0x66, 0x74, 0x77, 0x61, 0x72, 0x65, - 0x3b, 0x20, 0x79, 0x6f, 0x75, 0x20, 0x63, 0x61, - 0x6e, 0x20, 0x72, 0x65, 0x64, 0x69, 0x73, 0x74, - 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 0x69, - 0x74, 0x20, 0x61, 0x6e, 0x64, 0x2f, 0x6f, 0x72, - 0x20, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x0a, - 0x20, 0x2a, 0x20, 0x69, 0x74, 0x20, 0x75, 0x6e, - 0x64, 0x65, 0x72, 0x20, 0x74, 0x68, 0x65, 0x20, - 0x74, 0x65, 0x72, 0x6d, 0x73, 0x20, 0x6f, 0x66, - 0x20, 0x74, 0x68, 0x65, 0x20, 0x47, 0x4e, 0x55, - 0x20, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, - 0x20, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x20, - 0x4c, 0x69, 0x63, 0x65, 0x6e, 0x73, 0x65, 0x2c, - 0x20, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, - 0x20, 0x32, 0x2c, 0x0a, 0x20, 0x2a, 0x20, 0x61, - 0x73, 0x20, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x73, - 0x68, 0x65, 0x64, 0x20, 0x62, 0x79, 0x20, 0x74, - 0x68, 0x65, 0x20, 0x46, 0x72, 0x65, 0x65, 0x20, - 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, 0x72, 0x65, - 0x20, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x2e, 0x0a, 0x20, 0x2a, 0x0a, - 0x20, 0x2a, 0x20, 0x49, 0x6e, 0x20, 0x61, 0x64, - 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x74, - 0x6f, 0x20, 0x74, 0x68, 0x65, 0x20, 0x70, 0x65, - 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, - 0x73, 0x20, 0x69, 0x6e, 0x20, 0x74, 0x68, 0x65, - 0x20, 0x47, 0x4e, 0x55, 0x20, 0x47, 0x65, 0x6e, - 0x65, 0x72, 0x61, 0x6c, 0x20, 0x50, 0x75, 0x62, - 0x6c, 0x69, 0x63, 0x20, 0x4c, 0x69, 0x63, 0x65, - 0x6e, 0x73, 0x65, 0x2c, 0x0a, 0x20, 0x2a, 0x20, - 0x74, 0x68, 0x65, 0x20, 0x61, 0x75, 0x74, 0x68, - 0x6f, 0x72, 0x73, 0x20, 0x67, 0x69, 0x76, 0x65, - 0x20, 0x79, 0x6f, 0x75, 0x20, 0x75, 0x6e, 0x6c, - 0x69, 0x6d, 0x69, 0x74, 0x65, 0x64, 0x20, 0x70, - 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, - 0x6e, 0x20, 0x74, 0x6f, 0x20, 0x6c, 0x69, 0x6e, - 0x6b, 0x20, 0x74, 0x68, 0x65, 0x20, 0x63, 0x6f, - 0x6d, 0x70, 0x69, 0x6c, 0x65, 0x64, 0x0a, 0x20, - 0x2a, 0x20, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, - 0x6e, 0x20, 0x6f, 0x66, 0x20, 0x74, 0x68, 0x69, - 0x73, 0x20, 0x66, 0x69, 0x6c, 0x65, 0x20, 0x69, - 0x6e, 0x74, 0x6f, 0x20, 0x63, 0x6f, 0x6d, 0x62, - 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, - 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x6f, 0x74, - 0x68, 0x65, 0x72, 0x20, 0x70, 0x72, 0x6f, 0x67, - 0x72, 0x61, 0x6d, 0x73, 0x2c, 0x0a, 0x20, 0x2a, - 0x20, 0x61, 0x6e, 0x64, 0x20, 0x74, 0x6f, 0x20, - 0x64, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, - 0x74, 0x65, 0x20, 0x74, 0x68, 0x6f, 0x73, 0x65, - 0x20, 0x63, 0x6f, 0x6d, 0x62, 0x69, 0x6e, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x20, 0x77, 0x69, - 0x74, 0x68, 0x6f, 0x75, 0x74, 0x20, 0x61, 0x6e, - 0x79, 0x20, 0x72, 0x65, 0x73, 0x74, 0x72, 0x69, - 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x0a, 0x20, 0x2a, - 0x20, 0x63, 0x6f, 0x6d, 0x69, 0x6e, 0x67, 0x20, - 0x66, 0x72, 0x6f, 0x6d, 0x20, 0x74, 0x68, 0x65, - 0x20, 0x75, 0x73, 0x65, 0x20, 0x6f, 0x66, 0x20, - 0x74, 0x68, 0x69, 0x73, 0x20, 0x66, 0x69, 0x6c, - 0x65, 0x2e, 0x20, 0x20, 0x28, 0x54, 0x68, 0x65, - 0x20, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, - 0x20, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x20, - 0x4c, 0x69, 0x63, 0x65, 0x6e, 0x73, 0x65, 0x0a, - 0x20, 0x2a, 0x20, 0x72, 0x65, 0x73, 0x74, 0x72, - 0x69, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x20, - 0x64, 0x6f, 0x20, 0x61, 0x70, 0x70, 0x6c, 0x79, - 0x20, 0x69, 0x6e, 0x20, 0x6f, 0x74, 0x68, 0x65, - 0x72, 0x20, 0x72, 0x65, 0x73, 0x70, 0x65, 0x63, - 0x74, 0x73, 0x3b, 0x20, 0x66, 0x6f, 0x72, 0x20, - 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x2c, - 0x20, 0x74, 0x68, 0x65, 0x79, 0x20, 0x63, 0x6f, - 0x76, 0x65, 0x72, 0x0a, 0x20, 0x2a, 0x20, 0x6d, - 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x20, 0x6f, 0x66, 0x20, 0x74, - 0x68, 0x65, 0x20, 0x66, 0x69, 0x6c, 0x65, 0x2c, - 0x20, 0x61, 0x6e, 0x64, 0x20, 0x64, 0x69, 0x73, - 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, - 0x6e, 0x20, 0x77, 0x68, 0x65, 0x6e, 0x20, 0x6e, - 0x6f, 0x74, 0x20, 0x6c, 0x69, 0x6e, 0x6b, 0x65, - 0x64, 0x20, 0x69, 0x6e, 0x74, 0x6f, 0x0a, 0x20, - 0x2a, 0x20, 0x61, 0x20, 0x63, 0x6f, 0x6d, 0x62, - 0x69, 0x6e, 0x65, 0x64, 0x20, 0x65, 0x78, 0x65, - 0x63, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x2e, - 0x29, 0x0a, 0x20, 0x2a, 0x0a, 0x20, 0x2a, 0x20, - 0x54, 0x68, 0x69, 0x73, 0x20, 0x66, 0x69, 0x6c, - 0x65, 0x20, 0x69, 0x73, 0x20, 0x64, 0x69, 0x73, - 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x64, - 0x20, 0x69, 0x6e, 0x20, 0x74, 0x68, 0x65, 0x20, - 0x68, 0x6f, 0x70, 0x65, 0x20, 0x74, 0x68, 0x61, - 0x74, 0x20, 0x69, 0x74, 0x20, 0x77, 0x69, 0x6c, - 0x6c, 0x20, 0x62, 0x65, 0x20, 0x75, 0x73, 0x65, - 0x66, 0x75, 0x6c, 0x2c, 0x20, 0x62, 0x75, 0x74, - 0x0a, 0x20, 0x2a, 0x20, 0x57, 0x49, 0x54, 0x48, - 0x4f, 0x55, 0x54, 0x20, 0x41, 0x4e, 0x59, 0x20, - 0x57, 0x41, 0x52, 0x52, 0x41, 0x4e, 0x54, 0x59, - 0x3b, 0x20, 0x77, 0x69, 0x74, 0x68, 0x6f, 0x75, - 0x74, 0x20, 0x65, 0x76, 0x65, 0x6e, 0x20, 0x74, - 0x68, 0x65, 0x20, 0x69, 0x6d, 0x70, 0x6c, 0x69, - 0x65, 0x64, 0x20, 0x77, 0x61, 0x72, 0x72, 0x61, - 0x6e, 0x74, 0x79, 0x20, 0x6f, 0x66, 0x0a, 0x20, - 0x2a, 0x20, 0x4d, 0x45, 0x52, 0x43, 0x48, 0x41, - 0x4e, 0x54, 0x41, 0x42, 0x49, 0x4c, 0x49, 0x54, - 0x59, 0x20, 0x6f, 0x72, 0x20, 0x46, 0x49, 0x54, - 0x4e, 0x45, 0x53, 0x53, 0x20, 0x46, 0x4f, 0x52, - 0x20, 0x41, 0x20, 0x50, 0x41, 0x52, 0x54, 0x49, - 0x43, 0x55, 0x4c, 0x41, 0x52, 0x20, 0x50, 0x55, - 0x52, 0x50, 0x4f, 0x53, 0x45, 0x2e, 0x20, 0x20, - 0x53, 0x65, 0x65, 0x20, 0x74, 0x68, 0x65, 0x20, - 0x47, 0x4e, 0x55, 0x0a, 0x20, 0x2a, 0x20, 0x47, - 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x20, 0x50, - 0x75, 0x62, 0x6c, 0x69, 0x63, 0x20, 0x4c, 0x69, - 0x63, 0x65, 0x6e, 0x73, 0x65, 0x20, 0x66, 0x6f, - 0x72, 0x20, 0x6d, 0x6f, 0x72, 0x65, 0x20, 0x64, - 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x2e, 0x0a, - 0x20, 0x2a, 0x0a, 0x20, 0x2a, 0x20, 0x59, 0x6f, - 0x75, 0x20, 0x73, 0x68, 0x6f, 0x75, 0x6c, 0x64, - 0x20, 0x68, 0x61, 0x76, 0x65, 0x20, 0x72, 0x65, - 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x20, 0x61, - 0x20, 0x63, 0x6f, 0x70, 0x79, 0x20, 0x6f, 0x66, - 0x20, 0x74, 0x68, 0x65, 0x20, 0x47, 0x4e, 0x55, - 0x20, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, - 0x20, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x20, - 0x4c, 0x69, 0x63, 0x65, 0x6e, 0x73, 0x65, 0x0a, - 0x20, 0x2a, 0x20, 0x61, 0x6c, 0x6f, 0x6e, 0x67, - 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x74, 0x68, - 0x69, 0x73, 0x20, 0x70, 0x72, 0x6f, 0x67, 0x72, - 0x61, 0x6d, 0x3b, 0x20, 0x73, 0x65, 0x65, 0x20, - 0x74, 0x68, 0x65, 0x20, 0x66, 0x69, 0x6c, 0x65, - 0x20, 0x43, 0x4f, 0x50, 0x59, 0x49, 0x4e, 0x47, - 0x2e, 0x20, 0x20, 0x49, 0x66, 0x20, 0x6e, 0x6f, - 0x74, 0x2c, 0x20, 0x77, 0x72, 0x69, 0x74, 0x65, - 0x20, 0x74, 0x6f, 0x0a, 0x20, 0x2a, 0x20, 0x74, - 0x68, 0x65, 0x20, 0x46, 0x72, 0x65, 0x65, 0x20, - 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, 0x72, 0x65, - 0x20, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x2c, 0x20, 0x35, 0x31, 0x20, - 0x46, 0x72, 0x61, 0x6e, 0x6b, 0x6c, 0x69, 0x6e, - 0x20, 0x53, 0x74, 0x72, 0x65, 0x65, 0x74, 0x2c, - 0x20, 0x46, 0x69, 0x66, 0x74, 0x68, 0x20, 0x46, - 0x6c, 0x6f, 0x6f, 0x72, 0x2c, 0x0a, 0x20, 0x2a, - 0x20, 0x42, 0x6f, 0x73, 0x74, 0x6f, 0x6e, 0x2c, - 0x20, 0x4d, 0x41, 0x20, 0x30, 0x32, 0x31, 0x31, - 0x30, 0x2d, 0x31, 0x33, 0x30, 0x31, 0x2c, 0x20, - 0x55, 0x53, 0x41, 0x2e, 0x0a, 0x20, 0x2a, 0x2f, - 0x0a, -}; - -static object_data some = { - some_bytes, - sizeof(some_bytes), - "fd8430bc864cfcd5f10e5590f8a447e01b942bfe", - "blob", - "test-objects/fd", - "test-objects/fd/8430bc864cfcd5f10e5590f8a447e01b942bfe", - some_data, - sizeof(some_data), -}; diff --git a/vendor/libgit2/tests/odb/mixed.c b/vendor/libgit2/tests/odb/mixed.c deleted file mode 100644 index 2dad4b64e..000000000 --- a/vendor/libgit2/tests/odb/mixed.c +++ /dev/null @@ -1,110 +0,0 @@ -#include "clar_libgit2.h" -#include "odb.h" - -static git_odb *_odb; - -void test_odb_mixed__initialize(void) -{ - cl_git_pass(git_odb_open(&_odb, cl_fixture("duplicate.git/objects"))); -} - -void test_odb_mixed__cleanup(void) -{ - git_odb_free(_odb); - _odb = NULL; -} - -void test_odb_mixed__dup_oid(void) { - const char hex[] = "ce013625030ba8dba906f756967f9e9ca394464a"; - const char short_hex[] = "ce01362"; - git_oid oid; - git_odb_object *obj; - - cl_git_pass(git_oid_fromstr(&oid, hex)); - cl_git_pass(git_odb_read_prefix(&obj, _odb, &oid, GIT_OID_HEXSZ)); - git_odb_object_free(obj); - - cl_git_pass(git_odb_exists_prefix(NULL, _odb, &oid, GIT_OID_HEXSZ)); - - cl_git_pass(git_oid_fromstrn(&oid, short_hex, sizeof(short_hex) - 1)); - cl_git_pass(git_odb_read_prefix(&obj, _odb, &oid, sizeof(short_hex) - 1)); - git_odb_object_free(obj); - - cl_git_pass(git_odb_exists_prefix(NULL, _odb, &oid, sizeof(short_hex) - 1)); -} - -/* some known sha collisions of file content: - * 'aabqhq' and 'aaazvc' with prefix 'dea509d0' (+ '9' and + 'b') - * 'aaeufo' and 'aaaohs' with prefix '81b5bff5' (+ 'f' and + 'b') - * 'aafewy' and 'aaepta' with prefix '739e3c4c' - * 'aahsyn' and 'aadrjg' with prefix '0ddeaded' (+ '9' and + 'e') - */ - -void test_odb_mixed__dup_oid_prefix_0(void) { - char hex[10]; - git_oid oid, found; - git_odb_object *obj; - - /* ambiguous in the same pack file */ - - strncpy(hex, "dea509d0", sizeof(hex)); - cl_git_pass(git_oid_fromstrn(&oid, hex, strlen(hex))); - cl_assert_equal_i( - GIT_EAMBIGUOUS, git_odb_read_prefix(&obj, _odb, &oid, strlen(hex))); - cl_assert_equal_i( - GIT_EAMBIGUOUS, git_odb_exists_prefix(&found, _odb, &oid, strlen(hex))); - - strncpy(hex, "dea509d09", sizeof(hex)); - cl_git_pass(git_oid_fromstrn(&oid, hex, strlen(hex))); - cl_git_pass(git_odb_read_prefix(&obj, _odb, &oid, strlen(hex))); - cl_git_pass(git_odb_exists_prefix(&found, _odb, &oid, strlen(hex))); - cl_assert_equal_oid(&found, git_odb_object_id(obj)); - git_odb_object_free(obj); - - strncpy(hex, "dea509d0b", sizeof(hex)); - cl_git_pass(git_oid_fromstrn(&oid, hex, strlen(hex))); - cl_git_pass(git_odb_read_prefix(&obj, _odb, &oid, strlen(hex))); - git_odb_object_free(obj); - - /* ambiguous in different pack files */ - - strncpy(hex, "81b5bff5", sizeof(hex)); - cl_git_pass(git_oid_fromstrn(&oid, hex, strlen(hex))); - cl_assert_equal_i( - GIT_EAMBIGUOUS, git_odb_read_prefix(&obj, _odb, &oid, strlen(hex))); - cl_assert_equal_i( - GIT_EAMBIGUOUS, git_odb_exists_prefix(&found, _odb, &oid, strlen(hex))); - - strncpy(hex, "81b5bff5b", sizeof(hex)); - cl_git_pass(git_oid_fromstrn(&oid, hex, strlen(hex))); - cl_git_pass(git_odb_read_prefix(&obj, _odb, &oid, strlen(hex))); - cl_git_pass(git_odb_exists_prefix(&found, _odb, &oid, strlen(hex))); - cl_assert_equal_oid(&found, git_odb_object_id(obj)); - git_odb_object_free(obj); - - strncpy(hex, "81b5bff5f", sizeof(hex)); - cl_git_pass(git_oid_fromstrn(&oid, hex, strlen(hex))); - cl_git_pass(git_odb_read_prefix(&obj, _odb, &oid, strlen(hex))); - git_odb_object_free(obj); - - /* ambiguous in pack file and loose */ - - strncpy(hex, "0ddeaded", sizeof(hex)); - cl_git_pass(git_oid_fromstrn(&oid, hex, strlen(hex))); - cl_assert_equal_i( - GIT_EAMBIGUOUS, git_odb_read_prefix(&obj, _odb, &oid, strlen(hex))); - cl_assert_equal_i( - GIT_EAMBIGUOUS, git_odb_exists_prefix(&found, _odb, &oid, strlen(hex))); - - strncpy(hex, "0ddeaded9", sizeof(hex)); - cl_git_pass(git_oid_fromstrn(&oid, hex, strlen(hex))); - cl_git_pass(git_odb_read_prefix(&obj, _odb, &oid, strlen(hex))); - cl_git_pass(git_odb_exists_prefix(&found, _odb, &oid, strlen(hex))); - cl_assert_equal_oid(&found, git_odb_object_id(obj)); - git_odb_object_free(obj); - - strncpy(hex, "0ddeadede", sizeof(hex)); - cl_git_pass(git_oid_fromstrn(&oid, hex, strlen(hex))); - cl_git_pass(git_odb_read_prefix(&obj, _odb, &oid, strlen(hex))); - git_odb_object_free(obj); -} diff --git a/vendor/libgit2/tests/odb/pack_data.h b/vendor/libgit2/tests/odb/pack_data.h deleted file mode 100644 index e6371beb1..000000000 --- a/vendor/libgit2/tests/odb/pack_data.h +++ /dev/null @@ -1,151 +0,0 @@ - -static const char *packed_objects[] = { - "0266163a49e280c4f5ed1e08facd36a2bd716bcf", - "53fc32d17276939fc79ed05badaef2db09990016", - "6336846bd5c88d32f93ae57d846683e61ab5c530", - "6dcf9bf7541ee10456529833502442f385010c3d", - "bed08a0b30b72a9d4aed7f1af8c8ca124e8d64b9", - "e90810b8df3e80c413d903f631643c716887138d", - "fc3c3a2083e9f6f89e6bd53e9420e70d1e357c9b", - "fc58168adf502d0c0ef614c3111a7038fc8c09c8", - "fd0ec0333948dfe23265ac46be0205a436a8c3a5", - "fd8430bc864cfcd5f10e5590f8a447e01b942bfe", - "fd899f45951c15c1c5f7c34b1c864e91bd6556c6", - "fda23b974899e7e1f938619099280bfda13bdca9", - "fdbec189efb657c8325962b494875987881a356b", - "fe1ca6bd22b5d8353ce6c2f3aba80805c438a7a5", - "fe3a6a42c87ff1239370c741a265f3997add87c1", - "deb106bfd2d36ecf9f0079224c12022201a39ad1", - "dec93efc79e60f2680de3e666755d335967eec30", - "def425bf8568b9c1e20879bf5be6f9c52b7361c4", - "df48000ac4f48570054e3a71a81916357997b680", - "dfae6ed8f6dd8acc3b40a31811ea316239223559", - "dff79e27d3d2cdc09790ded80fe2ea8ff5d61034", - "e00e46abe4c542e17c8bc83d72cf5be8018d7b0e", - "e01b107b4f77f8f98645adac0206a504f2d29d7c", - "e032d863f512c47b479bd984f8b6c8061f66b7d4", - "e044baa468a1c74f9f9da36805445f6888358b49", - "e04529998989ba8ae3419538dd57969af819b241", - "e0637ddfbea67c8d7f557c709e095af8906e9176", - "e0743ad4031231e71700abdc6fdbe94f189d20e5", - "cf33ac7a3d8b2b8f6bb266518aadbf59de397608", - "cf5f7235b9c9689b133f6ea12015720b411329bd", - "cf6cccf1297284833a9a03138a1f5738fa1c6c94", - "cf7992bde17ce7a79cab5f0c1fcbe8a0108721ed", - "cfe3a027ab12506d4144ee8a35669ae8fc4b7ab1", - "cfe96f31dfad7bab49977aa1df7302f7fafcb025", - "cff54d138945ef4de384e9d2759291d0c13ea90a", - "d01f7573ac34c2f502bd1cf18cde73480c741151", - "d03f567593f346a1ca96a57f8191def098d126e3", - "d047b47aadf88501238f36f5c17dd0a50dc62087", - "d0a0d63086fae3b0682af7261df21f7d0f7f066d", - "d0a44bd6ed0be21b725a96c0891bbc79bc1a540c", - "d0d7e736e536a41bcb885005f8bf258c61cad682", - "d0e7959d4b95ffec6198df6f5a7ae259b23a5f50", - "bf2fe2acca17d13356ce802ba9dc8343f710dfb7", - "bf55f407d6d9418e51f42ea7a3a6aadf17388349", - "bf92206f8b633b88a66dca4a911777630b06fbac", - "bfaf8c42eb8842abe206179fee864cfba87e3ca9", - "bfe05675d4e8f6b59d50932add8790f1a06b10ee", - "bff8618112330763327cfa6ce6e914db84f51ddf", - "bff873e9853ed99fed52c25f7ad29f78b27dcec2", - "c01c3fae7251098d7af1b459bcd0786e81d4616d", - "c0220fca67f48b8a5d4163d53b1486224be3a198", - "c02d0b160b82ee72469c269f13de4c26a7ea09cb", - "c059510ad1b45ab58390e042d7dee1ac46703854", - "c07204a1897aeeaa3c248d29dbfa9b033baf9755", - "c073337a4dd7276931b4b3fdbc3f0040e9441793", - "0fd7e4bfba5b3a82be88d1057757ca8b2c5e6d26", - "100746511cc45c9f1ad6721c4ef5be49222fee4d", - "1088490171d9b984d68b8b9be9ca003f4eafff59", - "1093c8ff4cb78fcf5f79dbbeedcb6e824bd4e253", - "10aa3fa72afab7ee31e116ae06442fe0f7b79df2", - "10b759e734e8299aa0dca08be935d95d886127b6", - "111d5ccf0bb010c4e8d7af3eedfa12ef4c5e265b", - "11261fbff21758444d426356ff6327ee01e90752", - "112998d425717bb922ce74e8f6f0f831d8dc4510", - "2ef4e5d838b6507bd61d457cf6466662b791c5c0", - "2ef4faa0f82efa00eeac6cae9e8b2abccc8566ee", - "2f06098183b0d7be350acbe39cdbaccff2df0c4a", - "2f1c5d509ac5bffb3c62f710a1c2c542e126dfd1", - "2f205b20fc16423c42b3ba51b2ea78d7b9ff3578", - "2f9b6b6e3d9250ba09360734aa47973a993b59d1", - "30c62a2d5a8d644f1311d4f7fe3f6a788e4c8188", - "31438e245492d85fd6da4d1406eba0fbde8332a4", - "3184a3abdfea231992254929ff4e275898e5bbf6", - "3188ffdbb3a3d52e0f78f30c484533899224436e", - "32581d0093429770d044a60eb0e9cc0462bedb13", - "32679a9544d83e5403202c4d5efb61ad02492847", - "4e7e9f60b7e2049b7f5697daf133161a18ef688f", - "4e8cda27ddc8be7db875ceb0f360c37734724c6d", - "4ea481c61c59ab55169b7cbaae536ad50b49d6f0", - "4f0adcd0e61eabe06fe32be66b16559537124b7a", - "4f1355c91100d12f9e7202f91b245df0c110867c", - "4f6eadeb08b9d0d1e8b1b3eac8a34940adf29a2d", - "4f9339df943c53117a5fc8e86e2f38716ff3a668", - "4fc3874b118752e40de556b1c3e7b4a9f1737d00", - "4ff1dd0992dd6baafdb5e166be6f9f23b59bdf87", - "5018a35e0b7e2eec7ce5050baf9c7343f3f74164", - "50298f44a45eda3a29dae82dbe911b5aa176ac07", - "502acd164fb115768d723144da2e7bb5a24891bb", - "50330c02bd4fd95c9db1fcf2f97f4218e42b7226", - "5052bf355d9f8c52446561a39733a8767bf31e37", - "6f2cd729ae42988c1dd43588d3a6661ba48ad7a0", - "6f4e2c42d9138bfbf3e0f908f1308828cc6f2178", - "6f6a17db05a83620cef4572761831c20a70ba9b9", - "6faad60901e36538634f0d8b8ff3f21f83503c71", - "6fc72e46de3df0c3842dab302bbacf697a63abab", - "6fdccd49f442a7204399ca9b418f017322dbded8", - "6fe7568fc3861c334cb008fd85d57d9647249ef5", - "700f55d91d7b55665594676a4bada1f1457a0598", - "702bd70595a7b19afc48a1f784a6505be68469d4", - "7033f9ee0e52b08cb5679cd49b7b7999eaf9eaf8", - "70957110ce446c4e250f865760fb3da513cdcc92", - "8ec696a4734f16479d091bc70574d23dd9fe7443", - "8ed341c55ed4d6f4cdc8bf4f0ca18a08c93f6962", - "8edc2805f1f11b63e44bf81f4557f8b473612b69", - "8ef9060a954118a698fc10e20acdc430566a100f", - "8f0c4b543f4bb6eb1518ecfc3d4699e43108d393", - "8fac94df3035405c2e60b3799153ce7c428af6b9", - "904c0ac12b23548de524adae712241b423d765a3", - "90bbaa9a809c3a768d873a9cc7d52b4f3bf3d1b9", - "90d4d2f0fc362beabbbf76b4ffda0828229c198d", - "90f9ff6755330b685feff6c3d81782ee3592ab04", - "91822c50ebe4f9bf5bbb8308ecf9f6557062775c", - "91d973263a55708fa8255867b3202d81ef9c2868", - "af292c99c6148d772af3315a1c74e83330e7ead7", - "af3b99d5be330dbbce0b9250c3a5fb05911908cc", - "af55d0cdeb280af2db8697e5afa506e081012719", - "af795e498d411142ddb073e8ca2c5447c3295a4c", - "afadc73a392f8cc8e2cc77dd62a7433dd3bafa8c", - "affd84ed8ec7ce67612fe3c12a80f8164b101f6a", - "b0941f9c70ffe67f0387a827b338e64ecf3190f0", - "b0a3077f9ef6e093f8d9869bdb0c07095bd722cb", - "b0a8568a7614806378a54db5706ee3b06ae58693", - "b0fb7372f242233d1d35ce7d8e74d3990cbc5841", - "b10489944b9ead17427551759d180d10203e06ba", - "b196a807b323f2748ffc6b1d42cd0812d04c9a40", - "b1bb1d888f0c5e19278536d49fa77db035fac7ae" -}; - -static const char *loose_objects[] = { - "45b983be36b73c0788dc9cbcb76cbb80fc7bb057", - "a8233120f6ad708f843d861ce2b7228ec4e3dec6", - "fd093bff70906175335656e6ce6ae05783708765", - "c47800c7266a2be04c571c04d5a6614691ea99bd", - "a71586c1dfe8a71c6cbf6c129f404c5642ff31bd", - "8496071c1b46c854b31185ea97743be6a8774479", - "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391", - "814889a078c031f61ed08ab5fa863aea9314344d", - "5b5b025afb0b4c913b4c338a42934a3863bf3644", - "1385f264afb75a56a5bec74243be9b367ba4ca08", - "f60079018b664e4e79329a7ef9559c8d9e0378d1", - "be3563ae3f795b2b4353bcce3a527ad0a4f7f644", - "75057dd4114e74cca1d750d0aee1647c903cb60a", - "fa49b077972391ad58037050f2a75f74e3671e92", - "9fd738e8f7967c078dceed8190330fc8648ee56a", - "1810dff58d8a660512d4832e740f692884338ccd", - "181037049a54a1eb5fab404658a3a250b44335d7", - "a4a7dce85cf63874e984719f4fdd239f5145052f", - "4a202b346bb0fb0db7eff3cffeb3c70babbd2045" -}; diff --git a/vendor/libgit2/tests/odb/pack_data_one.h b/vendor/libgit2/tests/odb/pack_data_one.h deleted file mode 100644 index 13570ba78..000000000 --- a/vendor/libgit2/tests/odb/pack_data_one.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Just a few to make sure it's working, the rest is tested already */ -static const char *packed_objects_one[] = { - "9fcf811e00fa469688943a9152c16d4ee90fb9a9", - "a93f42a5b5e9de40fa645a9ff1e276a021c9542b", - "12bf5f3e3470d90db177ccf1b5e8126409377fc6", - "ed1ea164cdbe3c4b200fb4fa19861ea90eaee222", - "dfae6ed8f6dd8acc3b40a31811ea316239223559", - "aefe66d192771201e369fde830530f4475beec30", - "775e4b4c1296e9e3104f2a36ca9cf9356a130959", - "412ec4e4a6a7419bc1be00561fe474e54cb499fe", - "236e7579fed7763be77209efb8708960982f3cb3", - "09fe9364461cf60dd1c46b0e9545b1e47bb1a297", - "d76d8a6390d1cf32138d98a91b1eb7e0275a12f5", - "d0fdf2dcff2f548952eec536ccc6d266550041bc", - "a20d733a9fa79fa5b4cbb9639864f93325ec27a6", - "785d3fe8e7db5ade2c2242fecd46c32a7f4dc59f", - "4d8d0fd9cb6045075385701c3f933ec13345e9c4", - "0cfd861bd547b6520d1fc2e190e8359e0a9c9b90" -}; diff --git a/vendor/libgit2/tests/odb/packed.c b/vendor/libgit2/tests/odb/packed.c deleted file mode 100644 index b4f549b58..000000000 --- a/vendor/libgit2/tests/odb/packed.c +++ /dev/null @@ -1,79 +0,0 @@ -#include "clar_libgit2.h" -#include "odb.h" -#include "pack_data.h" - -static git_odb *_odb; - -void test_odb_packed__initialize(void) -{ - cl_git_pass(git_odb_open(&_odb, cl_fixture("testrepo.git/objects"))); -} - -void test_odb_packed__cleanup(void) -{ - git_odb_free(_odb); - _odb = NULL; -} - -void test_odb_packed__mass_read(void) -{ - unsigned int i; - - for (i = 0; i < ARRAY_SIZE(packed_objects); ++i) { - git_oid id; - git_odb_object *obj; - - cl_git_pass(git_oid_fromstr(&id, packed_objects[i])); - cl_assert(git_odb_exists(_odb, &id) == 1); - cl_git_pass(git_odb_read(&obj, _odb, &id)); - - git_odb_object_free(obj); - } -} - -void test_odb_packed__read_header_0(void) -{ - unsigned int i; - - for (i = 0; i < ARRAY_SIZE(packed_objects); ++i) { - git_oid id; - git_odb_object *obj; - size_t len; - git_otype type; - - cl_git_pass(git_oid_fromstr(&id, packed_objects[i])); - - cl_git_pass(git_odb_read(&obj, _odb, &id)); - cl_git_pass(git_odb_read_header(&len, &type, _odb, &id)); - - cl_assert(obj->cached.size == len); - cl_assert(obj->cached.type == type); - - git_odb_object_free(obj); - } -} - -void test_odb_packed__read_header_1(void) -{ - unsigned int i; - - for (i = 0; i < ARRAY_SIZE(loose_objects); ++i) { - git_oid id; - git_odb_object *obj; - size_t len; - git_otype type; - - cl_git_pass(git_oid_fromstr(&id, loose_objects[i])); - - cl_assert(git_odb_exists(_odb, &id) == 1); - - cl_git_pass(git_odb_read(&obj, _odb, &id)); - cl_git_pass(git_odb_read_header(&len, &type, _odb, &id)); - - cl_assert(obj->cached.size == len); - cl_assert(obj->cached.type == type); - - git_odb_object_free(obj); - } -} - diff --git a/vendor/libgit2/tests/odb/packed_one.c b/vendor/libgit2/tests/odb/packed_one.c deleted file mode 100644 index 0c6ed387b..000000000 --- a/vendor/libgit2/tests/odb/packed_one.c +++ /dev/null @@ -1,60 +0,0 @@ -#include "clar_libgit2.h" -#include "git2/odb_backend.h" - -#include "pack_data_one.h" -#include "pack.h" - -static git_odb *_odb; - -void test_odb_packed_one__initialize(void) -{ - git_odb_backend *backend = NULL; - - cl_git_pass(git_odb_new(&_odb)); - cl_git_pass(git_odb_backend_one_pack(&backend, cl_fixture("testrepo.git/objects/pack/pack-a81e489679b7d3418f9ab594bda8ceb37dd4c695.idx"))); - cl_git_pass(git_odb_add_backend(_odb, backend, 1)); -} - -void test_odb_packed_one__cleanup(void) -{ - git_odb_free(_odb); - _odb = NULL; -} - -void test_odb_packed_one__mass_read(void) -{ - unsigned int i; - - for (i = 0; i < ARRAY_SIZE(packed_objects_one); ++i) { - git_oid id; - git_odb_object *obj; - - cl_git_pass(git_oid_fromstr(&id, packed_objects_one[i])); - cl_assert(git_odb_exists(_odb, &id) == 1); - cl_git_pass(git_odb_read(&obj, _odb, &id)); - - git_odb_object_free(obj); - } -} - -void test_odb_packed_one__read_header_0(void) -{ - unsigned int i; - - for (i = 0; i < ARRAY_SIZE(packed_objects_one); ++i) { - git_oid id; - git_odb_object *obj; - size_t len; - git_otype type; - - cl_git_pass(git_oid_fromstr(&id, packed_objects_one[i])); - - cl_git_pass(git_odb_read(&obj, _odb, &id)); - cl_git_pass(git_odb_read_header(&len, &type, _odb, &id)); - - cl_assert(obj->cached.size == len); - cl_assert(obj->cached.type == type); - - git_odb_object_free(obj); - } -} diff --git a/vendor/libgit2/tests/odb/sorting.c b/vendor/libgit2/tests/odb/sorting.c deleted file mode 100644 index 6af8b0d1b..000000000 --- a/vendor/libgit2/tests/odb/sorting.c +++ /dev/null @@ -1,70 +0,0 @@ -#include "clar_libgit2.h" -#include "git2/sys/odb_backend.h" - -typedef struct { - git_odb_backend base; - size_t position; -} fake_backend; - -static git_odb_backend *new_backend(size_t position) -{ - fake_backend *b; - - b = git__calloc(1, sizeof(fake_backend)); - if (b == NULL) - return NULL; - - b->base.free = (void (*)(git_odb_backend *)) git__free; - b->base.version = GIT_ODB_BACKEND_VERSION; - b->position = position; - return (git_odb_backend *)b; -} - -static void check_backend_sorting(git_odb *odb) -{ - size_t i, max_i = git_odb_num_backends(odb); - fake_backend *internal; - - for (i = 0; i < max_i; ++i) { - cl_git_pass(git_odb_get_backend((git_odb_backend **)&internal, odb, i)); - cl_assert(internal != NULL); - cl_assert_equal_sz(i, internal->position); - } -} - -static git_odb *_odb; - -void test_odb_sorting__initialize(void) -{ - cl_git_pass(git_odb_new(&_odb)); -} - -void test_odb_sorting__cleanup(void) -{ - git_odb_free(_odb); - _odb = NULL; -} - -void test_odb_sorting__basic_backends_sorting(void) -{ - cl_git_pass(git_odb_add_backend(_odb, new_backend(0), 5)); - cl_git_pass(git_odb_add_backend(_odb, new_backend(2), 3)); - cl_git_pass(git_odb_add_backend(_odb, new_backend(1), 4)); - cl_git_pass(git_odb_add_backend(_odb, new_backend(3), 1)); - - check_backend_sorting(_odb); -} - -void test_odb_sorting__alternate_backends_sorting(void) -{ - cl_git_pass(git_odb_add_backend(_odb, new_backend(1), 5)); - cl_git_pass(git_odb_add_backend(_odb, new_backend(5), 3)); - cl_git_pass(git_odb_add_backend(_odb, new_backend(3), 4)); - cl_git_pass(git_odb_add_backend(_odb, new_backend(7), 1)); - cl_git_pass(git_odb_add_alternate(_odb, new_backend(0), 5)); - cl_git_pass(git_odb_add_alternate(_odb, new_backend(4), 3)); - cl_git_pass(git_odb_add_alternate(_odb, new_backend(2), 4)); - cl_git_pass(git_odb_add_alternate(_odb, new_backend(6), 1)); - - check_backend_sorting(_odb); -} diff --git a/vendor/libgit2/tests/odb/streamwrite.c b/vendor/libgit2/tests/odb/streamwrite.c deleted file mode 100644 index 591a20040..000000000 --- a/vendor/libgit2/tests/odb/streamwrite.c +++ /dev/null @@ -1,56 +0,0 @@ -#include "clar_libgit2.h" -#include "git2/odb_backend.h" - -static git_repository *repo; -static git_odb *odb; -static git_odb_stream *stream; - -void test_odb_streamwrite__initialize(void) -{ - repo = cl_git_sandbox_init("testrepo.git"); - cl_git_pass(git_repository_odb(&odb, repo)); - - cl_git_pass(git_odb_open_wstream(&stream, odb, 14, GIT_OBJ_BLOB)); - cl_assert_equal_sz(14, stream->declared_size); -} - -void test_odb_streamwrite__cleanup(void) -{ - git_odb_stream_free(stream); - git_odb_free(odb); - cl_git_sandbox_cleanup(); -} - -void test_odb_streamwrite__can_accept_chunks(void) -{ - git_oid oid; - - cl_git_pass(git_odb_stream_write(stream, "deadbeef", 8)); - cl_assert_equal_sz(8, stream->received_bytes); - - cl_git_pass(git_odb_stream_write(stream, "deadbeef", 6)); - cl_assert_equal_sz(8 + 6, stream->received_bytes); - - cl_git_pass(git_odb_stream_finalize_write(&oid, stream)); -} - -void test_odb_streamwrite__can_detect_missing_bytes(void) -{ - git_oid oid; - - cl_git_pass(git_odb_stream_write(stream, "deadbeef", 8)); - cl_assert_equal_sz(8, stream->received_bytes); - - cl_git_pass(git_odb_stream_write(stream, "deadbeef", 4)); - cl_assert_equal_sz(8 + 4, stream->received_bytes); - - cl_git_fail(git_odb_stream_finalize_write(&oid, stream)); -} - -void test_odb_streamwrite__can_detect_additional_bytes(void) -{ - cl_git_pass(git_odb_stream_write(stream, "deadbeef", 8)); - cl_assert_equal_sz(8, stream->received_bytes); - - cl_git_fail(git_odb_stream_write(stream, "deadbeef", 7)); -} diff --git a/vendor/libgit2/tests/online/badssl.c b/vendor/libgit2/tests/online/badssl.c deleted file mode 100644 index 66b090df4..000000000 --- a/vendor/libgit2/tests/online/badssl.c +++ /dev/null @@ -1,46 +0,0 @@ -#include "clar_libgit2.h" - -#include "git2/clone.h" - -static git_repository *g_repo; - -#if defined(GIT_OPENSSL) || defined(GIT_WINHTTP) || defined(GIT_SECURE_TRANSPORT) -static bool g_has_ssl = true; -#else -static bool g_has_ssl = false; -#endif - -void test_online_badssl__expired(void) -{ - if (!g_has_ssl) - cl_skip(); - - cl_git_fail_with(GIT_ECERTIFICATE, - git_clone(&g_repo, "https://expired.badssl.com/fake.git", "./fake", NULL)); -} - -void test_online_badssl__wrong_host(void) -{ - if (!g_has_ssl) - cl_skip(); - - cl_git_fail_with(GIT_ECERTIFICATE, - git_clone(&g_repo, "https://wrong.host.badssl.com/fake.git", "./fake", NULL)); -} - -void test_online_badssl__self_signed(void) -{ - if (!g_has_ssl) - cl_skip(); - - cl_git_fail_with(GIT_ECERTIFICATE, - git_clone(&g_repo, "https://self-signed.badssl.com/fake.git", "./fake", NULL)); -} - -void test_online_badssl__old_cipher(void) -{ - if (!g_has_ssl) - cl_skip(); - - cl_git_fail(git_clone(&g_repo, "https://rc4.badssl.com/fake.git", "./fake", NULL)); -} diff --git a/vendor/libgit2/tests/online/clone.c b/vendor/libgit2/tests/online/clone.c deleted file mode 100644 index b84be405c..000000000 --- a/vendor/libgit2/tests/online/clone.c +++ /dev/null @@ -1,655 +0,0 @@ -#include "clar_libgit2.h" - -#include "git2/clone.h" -#include "git2/cred_helpers.h" -#include "remote.h" -#include "fileops.h" -#include "refs.h" - -#define LIVE_REPO_URL "http://github.com/libgit2/TestGitRepository" -#define LIVE_EMPTYREPO_URL "http://github.com/libgit2/TestEmptyRepository" -#define BB_REPO_URL "https://libgit3@bitbucket.org/libgit2/testgitrepository.git" -#define BB_REPO_URL_WITH_PASS "https://libgit3:libgit3@bitbucket.org/libgit2/testgitrepository.git" -#define BB_REPO_URL_WITH_WRONG_PASS "https://libgit3:wrong@bitbucket.org/libgit2/testgitrepository.git" - -#define SSH_REPO_URL "ssh://github.com/libgit2/TestGitRepository" - -static git_repository *g_repo; -static git_clone_options g_options; - -static char *_remote_url = NULL; -static char *_remote_user = NULL; -static char *_remote_pass = NULL; -static char *_remote_ssh_pubkey = NULL; -static char *_remote_ssh_privkey = NULL; -static char *_remote_ssh_passphrase = NULL; -static char *_remote_ssh_fingerprint = NULL; - - -void test_online_clone__initialize(void) -{ - git_checkout_options dummy_opts = GIT_CHECKOUT_OPTIONS_INIT; - git_fetch_options dummy_fetch = GIT_FETCH_OPTIONS_INIT; - - g_repo = NULL; - - memset(&g_options, 0, sizeof(git_clone_options)); - g_options.version = GIT_CLONE_OPTIONS_VERSION; - g_options.checkout_opts = dummy_opts; - g_options.checkout_opts.checkout_strategy = GIT_CHECKOUT_SAFE; - g_options.fetch_opts = dummy_fetch; - - _remote_url = cl_getenv("GITTEST_REMOTE_URL"); - _remote_user = cl_getenv("GITTEST_REMOTE_USER"); - _remote_pass = cl_getenv("GITTEST_REMOTE_PASS"); - _remote_ssh_pubkey = cl_getenv("GITTEST_REMOTE_SSH_PUBKEY"); - _remote_ssh_privkey = cl_getenv("GITTEST_REMOTE_SSH_KEY"); - _remote_ssh_passphrase = cl_getenv("GITTEST_REMOTE_SSH_PASSPHRASE"); - _remote_ssh_fingerprint = cl_getenv("GITTEST_REMOTE_SSH_FINGERPRINT"); -} - -void test_online_clone__cleanup(void) -{ - if (g_repo) { - git_repository_free(g_repo); - g_repo = NULL; - } - cl_fixture_cleanup("./foo"); - - git__free(_remote_url); - git__free(_remote_user); - git__free(_remote_pass); - git__free(_remote_ssh_pubkey); - git__free(_remote_ssh_privkey); - git__free(_remote_ssh_passphrase); - git__free(_remote_ssh_fingerprint); -} - -void test_online_clone__network_full(void) -{ - git_remote *origin; - - cl_git_pass(git_clone(&g_repo, LIVE_REPO_URL, "./foo", &g_options)); - cl_assert(!git_repository_is_bare(g_repo)); - cl_git_pass(git_remote_lookup(&origin, g_repo, "origin")); - - cl_assert_equal_i(GIT_REMOTE_DOWNLOAD_TAGS_AUTO, origin->download_tags); - - git_remote_free(origin); -} - -void test_online_clone__network_bare(void) -{ - git_remote *origin; - - g_options.bare = true; - - cl_git_pass(git_clone(&g_repo, LIVE_REPO_URL, "./foo", &g_options)); - cl_assert(git_repository_is_bare(g_repo)); - cl_git_pass(git_remote_lookup(&origin, g_repo, "origin")); - - git_remote_free(origin); -} - -void test_online_clone__empty_repository(void) -{ - git_reference *head; - - cl_git_pass(git_clone(&g_repo, LIVE_EMPTYREPO_URL, "./foo", &g_options)); - - cl_assert_equal_i(true, git_repository_is_empty(g_repo)); - cl_assert_equal_i(true, git_repository_head_unborn(g_repo)); - - cl_git_pass(git_reference_lookup(&head, g_repo, GIT_HEAD_FILE)); - cl_assert_equal_i(GIT_REF_SYMBOLIC, git_reference_type(head)); - cl_assert_equal_s("refs/heads/master", git_reference_symbolic_target(head)); - - git_reference_free(head); -} - -static void checkout_progress(const char *path, size_t cur, size_t tot, void *payload) -{ - bool *was_called = (bool*)payload; - GIT_UNUSED(path); GIT_UNUSED(cur); GIT_UNUSED(tot); - (*was_called) = true; -} - -static int fetch_progress(const git_transfer_progress *stats, void *payload) -{ - bool *was_called = (bool*)payload; - GIT_UNUSED(stats); - (*was_called) = true; - return 0; -} - -void test_online_clone__can_checkout_a_cloned_repo(void) -{ - git_buf path = GIT_BUF_INIT; - git_reference *head; - bool checkout_progress_cb_was_called = false, - fetch_progress_cb_was_called = false; - - g_options.checkout_opts.checkout_strategy = GIT_CHECKOUT_SAFE; - g_options.checkout_opts.progress_cb = &checkout_progress; - g_options.checkout_opts.progress_payload = &checkout_progress_cb_was_called; - g_options.fetch_opts.callbacks.transfer_progress = &fetch_progress; - g_options.fetch_opts.callbacks.payload = &fetch_progress_cb_was_called; - - cl_git_pass(git_clone(&g_repo, LIVE_REPO_URL, "./foo", &g_options)); - - cl_git_pass(git_buf_joinpath(&path, git_repository_workdir(g_repo), "master.txt")); - cl_assert_equal_i(true, git_path_isfile(git_buf_cstr(&path))); - - cl_git_pass(git_reference_lookup(&head, g_repo, "HEAD")); - cl_assert_equal_i(GIT_REF_SYMBOLIC, git_reference_type(head)); - cl_assert_equal_s("refs/heads/master", git_reference_symbolic_target(head)); - - cl_assert_equal_i(true, checkout_progress_cb_was_called); - cl_assert_equal_i(true, fetch_progress_cb_was_called); - - git_reference_free(head); - git_buf_free(&path); -} - -static int remote_mirror_cb(git_remote **out, git_repository *repo, - const char *name, const char *url, void *payload) -{ - int error; - git_remote *remote; - - GIT_UNUSED(payload); - - if ((error = git_remote_create_with_fetchspec(&remote, repo, name, url, "+refs/*:refs/*")) < 0) - return error; - - *out = remote; - return 0; -} - -void test_online_clone__clone_mirror(void) -{ - git_clone_options opts = GIT_CLONE_OPTIONS_INIT; - git_reference *head; - - bool fetch_progress_cb_was_called = false; - - opts.fetch_opts.callbacks.transfer_progress = &fetch_progress; - opts.fetch_opts.callbacks.payload = &fetch_progress_cb_was_called; - - opts.bare = true; - opts.remote_cb = remote_mirror_cb; - - cl_git_pass(git_clone(&g_repo, LIVE_REPO_URL, "./foo.git", &opts)); - - cl_git_pass(git_reference_lookup(&head, g_repo, "HEAD")); - cl_assert_equal_i(GIT_REF_SYMBOLIC, git_reference_type(head)); - cl_assert_equal_s("refs/heads/master", git_reference_symbolic_target(head)); - - cl_assert_equal_i(true, fetch_progress_cb_was_called); - - git_reference_free(head); - git_repository_free(g_repo); - g_repo = NULL; - - cl_fixture_cleanup("./foo.git"); -} - -static int update_tips(const char *refname, const git_oid *a, const git_oid *b, void *payload) -{ - int *callcount = (int*)payload; - GIT_UNUSED(refname); GIT_UNUSED(a); GIT_UNUSED(b); - *callcount = *callcount + 1; - return 0; -} - -void test_online_clone__custom_remote_callbacks(void) -{ - int callcount = 0; - - g_options.fetch_opts.callbacks.update_tips = update_tips; - g_options.fetch_opts.callbacks.payload = &callcount; - - cl_git_pass(git_clone(&g_repo, LIVE_REPO_URL, "./foo", &g_options)); - cl_assert(callcount > 0); -} - -void test_online_clone__custom_headers(void) -{ - char *empty_header = ""; - char *unnamed_header = "this is a header about nothing"; - char *newlines = "X-Custom: almost OK\n"; - char *conflict = "Accept: defined-by-git"; - char *ok = "X-Custom: this should be ok"; - - g_options.fetch_opts.custom_headers.count = 1; - - g_options.fetch_opts.custom_headers.strings = &empty_header; - cl_git_fail(git_clone(&g_repo, LIVE_REPO_URL, "./foo", &g_options)); - - g_options.fetch_opts.custom_headers.strings = &unnamed_header; - cl_git_fail(git_clone(&g_repo, LIVE_REPO_URL, "./foo", &g_options)); - - g_options.fetch_opts.custom_headers.strings = &newlines; - cl_git_fail(git_clone(&g_repo, LIVE_REPO_URL, "./foo", &g_options)); - - g_options.fetch_opts.custom_headers.strings = &conflict; - cl_git_fail(git_clone(&g_repo, LIVE_REPO_URL, "./foo", &g_options)); - - /* Finally, we got it right! */ - g_options.fetch_opts.custom_headers.strings = &ok; - cl_git_pass(git_clone(&g_repo, LIVE_REPO_URL, "./foo", &g_options)); -} - -static int cred_failure_cb( - git_cred **cred, - const char *url, - const char *username_from_url, - unsigned int allowed_types, - void *data) -{ - GIT_UNUSED(cred); GIT_UNUSED(url); GIT_UNUSED(username_from_url); - GIT_UNUSED(allowed_types); GIT_UNUSED(data); - return -172; -} - -void test_online_clone__cred_callback_failure_return_code_is_tunnelled(void) -{ - if (!_remote_url || !_remote_user) - clar__skip(); - - g_options.fetch_opts.callbacks.credentials = cred_failure_cb; - - cl_git_fail_with(-172, git_clone(&g_repo, _remote_url, "./foo", &g_options)); -} - -static int cred_count_calls_cb(git_cred **cred, const char *url, const char *user, - unsigned int allowed_types, void *data) -{ - size_t *counter = (size_t *) data; - - GIT_UNUSED(url); GIT_UNUSED(user); GIT_UNUSED(allowed_types); - - if (allowed_types == GIT_CREDTYPE_USERNAME) - return git_cred_username_new(cred, "foo"); - - (*counter)++; - - if (*counter == 3) - return GIT_EUSER; - - return git_cred_userpass_plaintext_new(cred, "foo", "bar"); -} - -void test_online_clone__cred_callback_called_again_on_auth_failure(void) -{ - size_t counter = 0; - - if (!_remote_url || !_remote_user) - clar__skip(); - - g_options.fetch_opts.callbacks.credentials = cred_count_calls_cb; - g_options.fetch_opts.callbacks.payload = &counter; - - cl_git_fail_with(GIT_EUSER, git_clone(&g_repo, _remote_url, "./foo", &g_options)); - cl_assert_equal_i(3, counter); -} - -int cred_default( - git_cred **cred, - const char *url, - const char *user_from_url, - unsigned int allowed_types, - void *payload) -{ - GIT_UNUSED(url); - GIT_UNUSED(user_from_url); - GIT_UNUSED(payload); - - if (!(allowed_types & GIT_CREDTYPE_DEFAULT)) - return 0; - - return git_cred_default_new(cred); -} - -void test_online_clone__credentials(void) -{ - /* Remote URL environment variable must be set. - * User and password are optional. - */ - git_cred_userpass_payload user_pass = { - _remote_user, - _remote_pass - }; - - if (!_remote_url) - clar__skip(); - - if (cl_is_env_set("GITTEST_REMOTE_DEFAULT")) { - g_options.fetch_opts.callbacks.credentials = cred_default; - } else { - g_options.fetch_opts.callbacks.credentials = git_cred_userpass; - g_options.fetch_opts.callbacks.payload = &user_pass; - } - - cl_git_pass(git_clone(&g_repo, _remote_url, "./foo", &g_options)); - git_repository_free(g_repo); g_repo = NULL; - cl_fixture_cleanup("./foo"); -} - -void test_online_clone__bitbucket_style(void) -{ - git_cred_userpass_payload user_pass = { - "libgit2", "libgit2" - }; - - g_options.fetch_opts.callbacks.credentials = git_cred_userpass; - g_options.fetch_opts.callbacks.payload = &user_pass; - - cl_git_pass(git_clone(&g_repo, BB_REPO_URL, "./foo", &g_options)); - git_repository_free(g_repo); g_repo = NULL; - cl_fixture_cleanup("./foo"); - - /* User and pass from URL */ - user_pass.password = "wrong"; - cl_git_pass(git_clone(&g_repo, BB_REPO_URL_WITH_PASS, "./foo", &g_options)); - git_repository_free(g_repo); g_repo = NULL; - cl_fixture_cleanup("./foo"); - - /* Wrong password in URL, fall back to user_pass */ - user_pass.password = "libgit2"; - cl_git_pass(git_clone(&g_repo, BB_REPO_URL_WITH_WRONG_PASS, "./foo", &g_options)); - git_repository_free(g_repo); g_repo = NULL; - cl_fixture_cleanup("./foo"); -} - -static int cancel_at_half(const git_transfer_progress *stats, void *payload) -{ - GIT_UNUSED(payload); - - if (stats->received_objects > (stats->total_objects/2)) - return 4321; - return 0; -} - -void test_online_clone__can_cancel(void) -{ - g_options.fetch_opts.callbacks.transfer_progress = cancel_at_half; - - cl_git_fail_with( - git_clone(&g_repo, LIVE_REPO_URL, "./foo", &g_options), 4321); -} - -static int cred_cb(git_cred **cred, const char *url, const char *user_from_url, - unsigned int allowed_types, void *payload) -{ - GIT_UNUSED(url); GIT_UNUSED(user_from_url); GIT_UNUSED(payload); - - if (allowed_types & GIT_CREDTYPE_USERNAME) - return git_cred_username_new(cred, _remote_user); - - if (allowed_types & GIT_CREDTYPE_SSH_KEY) - return git_cred_ssh_key_new(cred, - _remote_user, _remote_ssh_pubkey, - _remote_ssh_privkey, _remote_ssh_passphrase); - - giterr_set(GITERR_NET, "unexpected cred type"); - return -1; -} - -static int check_ssh_auth_methods(git_cred **cred, const char *url, const char *username_from_url, - unsigned int allowed_types, void *data) -{ - int *with_user = (int *) data; - GIT_UNUSED(cred); GIT_UNUSED(url); GIT_UNUSED(username_from_url); GIT_UNUSED(data); - - if (!*with_user) - cl_assert_equal_i(GIT_CREDTYPE_USERNAME, allowed_types); - else - cl_assert(!(allowed_types & GIT_CREDTYPE_USERNAME)); - - return GIT_EUSER; -} - -void test_online_clone__ssh_auth_methods(void) -{ - int with_user; - -#ifndef GIT_SSH - clar__skip(); -#endif - g_options.fetch_opts.callbacks.credentials = check_ssh_auth_methods; - g_options.fetch_opts.callbacks.payload = &with_user; - - with_user = 0; - cl_git_fail_with(GIT_EUSER, - git_clone(&g_repo, SSH_REPO_URL, "./foo", &g_options)); - - with_user = 1; - cl_git_fail_with(GIT_EUSER, - git_clone(&g_repo, "ssh://git@github.com/libgit2/TestGitRepository", "./foo", &g_options)); -} - -static int custom_remote_ssh_with_paths( - git_remote **out, - git_repository *repo, - const char *name, - const char *url, - void *payload) -{ - int error; - - GIT_UNUSED(payload); - - if ((error = git_remote_create(out, repo, name, url)) < 0) - return error; - - return 0; -} - -void test_online_clone__ssh_with_paths(void) -{ - char *bad_paths[] = { - "/bin/yes", - "/bin/false", - }; - char *good_paths[] = { - "/usr/bin/git-upload-pack", - "/usr/bin/git-receive-pack", - }; - git_strarray arr = { - bad_paths, - 2, - }; - -#ifndef GIT_SSH - clar__skip(); -#endif - if (!_remote_url || !_remote_user || strncmp(_remote_url, "ssh://", 5) != 0) - clar__skip(); - - g_options.remote_cb = custom_remote_ssh_with_paths; - g_options.fetch_opts.callbacks.transport = git_transport_ssh_with_paths; - g_options.fetch_opts.callbacks.credentials = cred_cb; - g_options.fetch_opts.callbacks.payload = &arr; - - cl_git_fail(git_clone(&g_repo, _remote_url, "./foo", &g_options)); - - arr.strings = good_paths; - cl_git_pass(git_clone(&g_repo, _remote_url, "./foo", &g_options)); -} - -static int cred_foo_bar(git_cred **cred, const char *url, const char *username_from_url, - unsigned int allowed_types, void *data) - -{ - GIT_UNUSED(url); GIT_UNUSED(username_from_url); GIT_UNUSED(allowed_types); GIT_UNUSED(data); - - return git_cred_userpass_plaintext_new(cred, "foo", "bar"); -} - -void test_online_clone__ssh_cannot_change_username(void) -{ -#ifndef GIT_SSH - clar__skip(); -#endif - g_options.fetch_opts.callbacks.credentials = cred_foo_bar; - - cl_git_fail(git_clone(&g_repo, "ssh://git@github.com/libgit2/TestGitRepository", "./foo", &g_options)); -} - -int ssh_certificate_check(git_cert *cert, int valid, const char *host, void *payload) -{ - git_cert_hostkey *key; - git_oid expected = {{0}}, actual = {{0}}; - - GIT_UNUSED(valid); - GIT_UNUSED(payload); - - cl_assert(_remote_ssh_fingerprint); - - cl_git_pass(git_oid_fromstrp(&expected, _remote_ssh_fingerprint)); - cl_assert_equal_i(GIT_CERT_HOSTKEY_LIBSSH2, cert->cert_type); - key = (git_cert_hostkey *) cert; - - /* - * We need to figure out how long our input was to check for - * the type. Here we abuse the fact that both hashes fit into - * our git_oid type. - */ - if (strlen(_remote_ssh_fingerprint) == 32 && key->type & GIT_CERT_SSH_MD5) { - memcpy(&actual.id, key->hash_md5, 16); - } else if (strlen(_remote_ssh_fingerprint) == 40 && key->type & GIT_CERT_SSH_SHA1) { - memcpy(&actual, key->hash_sha1, 20); - } else { - cl_fail("Cannot find a usable SSH hash"); - } - - cl_assert(!memcmp(&expected, &actual, 20)); - - cl_assert_equal_s("localhost", host); - - return GIT_EUSER; -} - -void test_online_clone__ssh_cert(void) -{ - g_options.fetch_opts.callbacks.certificate_check = ssh_certificate_check; - - if (!_remote_ssh_fingerprint) - cl_skip(); - - cl_git_fail_with(GIT_EUSER, git_clone(&g_repo, "ssh://localhost/foo", "./foo", &g_options)); -} - -static char *read_key_file(const char *path) -{ - FILE *f; - char *buf; - long key_length; - - if (!path || !*path) - return NULL; - - cl_assert((f = fopen(path, "r")) != NULL); - cl_assert(fseek(f, 0, SEEK_END) != -1); - cl_assert((key_length = ftell(f)) != -1); - cl_assert(fseek(f, 0, SEEK_SET) != -1); - cl_assert((buf = malloc(key_length)) != NULL); - cl_assert(fread(buf, key_length, 1, f) == 1); - fclose(f); - - return buf; -} - -static int ssh_memory_cred_cb(git_cred **cred, const char *url, const char *user_from_url, - unsigned int allowed_types, void *payload) -{ - GIT_UNUSED(url); GIT_UNUSED(user_from_url); GIT_UNUSED(payload); - - if (allowed_types & GIT_CREDTYPE_USERNAME) - return git_cred_username_new(cred, _remote_user); - - if (allowed_types & GIT_CREDTYPE_SSH_KEY) - { - char *pubkey = read_key_file(_remote_ssh_pubkey); - char *privkey = read_key_file(_remote_ssh_privkey); - - int ret = git_cred_ssh_key_memory_new(cred, _remote_user, pubkey, privkey, _remote_ssh_passphrase); - - if (privkey) - free(privkey); - if (pubkey) - free(pubkey); - return ret; - } - - giterr_set(GITERR_NET, "unexpected cred type"); - return -1; -} - -void test_online_clone__ssh_memory_auth(void) -{ -#ifndef GIT_SSH_MEMORY_CREDENTIALS - clar__skip(); -#endif - if (!_remote_url || !_remote_user || !_remote_ssh_privkey || strncmp(_remote_url, "ssh://", 5) != 0) - clar__skip(); - - g_options.fetch_opts.callbacks.credentials = ssh_memory_cred_cb; - - cl_git_pass(git_clone(&g_repo, _remote_url, "./foo", &g_options)); -} - -void test_online_clone__url_with_no_path_returns_EINVALIDSPEC(void) -{ - cl_git_fail_with(git_clone(&g_repo, "http://github.com", "./foo", &g_options), - GIT_EINVALIDSPEC); -} - -static int fail_certificate_check(git_cert *cert, int valid, const char *host, void *payload) -{ - GIT_UNUSED(cert); - GIT_UNUSED(valid); - GIT_UNUSED(host); - GIT_UNUSED(payload); - - return GIT_ECERTIFICATE; -} - -void test_online_clone__certificate_invalid(void) -{ - g_options.fetch_opts.callbacks.certificate_check = fail_certificate_check; - - cl_git_fail_with(git_clone(&g_repo, "https://github.com/libgit2/TestGitRepository", "./foo", &g_options), - GIT_ECERTIFICATE); - -#ifdef GIT_SSH - cl_git_fail_with(git_clone(&g_repo, "ssh://github.com/libgit2/TestGitRepository", "./foo", &g_options), - GIT_ECERTIFICATE); -#endif -} - -static int succeed_certificate_check(git_cert *cert, int valid, const char *host, void *payload) -{ - GIT_UNUSED(cert); - GIT_UNUSED(valid); - GIT_UNUSED(payload); - - cl_assert_equal_s("github.com", host); - - return 0; -} - -void test_online_clone__certificate_valid(void) -{ - g_options.fetch_opts.callbacks.certificate_check = succeed_certificate_check; - - cl_git_pass(git_clone(&g_repo, "https://github.com/libgit2/TestGitRepository", "./foo", &g_options)); -} - -void test_online_clone__start_with_http(void) -{ - g_options.fetch_opts.callbacks.certificate_check = succeed_certificate_check; - - cl_git_pass(git_clone(&g_repo, "http://github.com/libgit2/TestGitRepository", "./foo", &g_options)); -} diff --git a/vendor/libgit2/tests/online/fetch.c b/vendor/libgit2/tests/online/fetch.c deleted file mode 100644 index c12df069f..000000000 --- a/vendor/libgit2/tests/online/fetch.c +++ /dev/null @@ -1,209 +0,0 @@ -#include "clar_libgit2.h" - -static git_repository *_repo; -static int counter; - -void test_online_fetch__initialize(void) -{ - cl_git_pass(git_repository_init(&_repo, "./fetch", 0)); -} - -void test_online_fetch__cleanup(void) -{ - git_repository_free(_repo); - _repo = NULL; - - cl_fixture_cleanup("./fetch"); -} - -static int update_tips(const char *refname, const git_oid *a, const git_oid *b, void *data) -{ - GIT_UNUSED(refname); GIT_UNUSED(a); GIT_UNUSED(b); GIT_UNUSED(data); - - ++counter; - - return 0; -} - -static int progress(const git_transfer_progress *stats, void *payload) -{ - size_t *bytes_received = (size_t *)payload; - *bytes_received = stats->received_bytes; - return 0; -} - -static void do_fetch(const char *url, git_remote_autotag_option_t flag, int n) -{ - git_remote *remote; - git_fetch_options options = GIT_FETCH_OPTIONS_INIT; - size_t bytes_received = 0; - - options.callbacks.transfer_progress = progress; - options.callbacks.update_tips = update_tips; - options.callbacks.payload = &bytes_received; - options.download_tags = flag; - counter = 0; - - cl_git_pass(git_remote_create(&remote, _repo, "test", url)); - cl_git_pass(git_remote_fetch(remote, NULL, &options, NULL)); - cl_assert_equal_i(counter, n); - cl_assert(bytes_received > 0); - - git_remote_free(remote); -} - -void test_online_fetch__default_git(void) -{ - do_fetch("git://github.com/libgit2/TestGitRepository.git", GIT_REMOTE_DOWNLOAD_TAGS_AUTO, 6); -} - -void test_online_fetch__default_http(void) -{ - do_fetch("http://github.com/libgit2/TestGitRepository.git", GIT_REMOTE_DOWNLOAD_TAGS_AUTO, 6); -} - -void test_online_fetch__default_https(void) -{ - do_fetch("https://github.com/libgit2/TestGitRepository.git", GIT_REMOTE_DOWNLOAD_TAGS_AUTO, 6); -} - -void test_online_fetch__no_tags_git(void) -{ - do_fetch("git://github.com/libgit2/TestGitRepository.git", GIT_REMOTE_DOWNLOAD_TAGS_NONE, 3); -} - -void test_online_fetch__no_tags_http(void) -{ - do_fetch("http://github.com/libgit2/TestGitRepository.git", GIT_REMOTE_DOWNLOAD_TAGS_NONE, 3); -} - -void test_online_fetch__fetch_twice(void) -{ - git_remote *remote; - cl_git_pass(git_remote_create(&remote, _repo, "test", "git://github.com/libgit2/TestGitRepository.git")); - cl_git_pass(git_remote_connect(remote, GIT_DIRECTION_FETCH, NULL, NULL)); - cl_git_pass(git_remote_download(remote, NULL, NULL)); - git_remote_disconnect(remote); - - git_remote_connect(remote, GIT_DIRECTION_FETCH, NULL, NULL); - cl_git_pass(git_remote_download(remote, NULL, NULL)); - git_remote_disconnect(remote); - - git_remote_free(remote); -} - -static int transferProgressCallback(const git_transfer_progress *stats, void *payload) -{ - bool *invoked = (bool *)payload; - - GIT_UNUSED(stats); - *invoked = true; - return 0; -} - -void test_online_fetch__doesnt_retrieve_a_pack_when_the_repository_is_up_to_date(void) -{ - git_repository *_repository; - bool invoked = false; - git_remote *remote; - git_fetch_options options = GIT_FETCH_OPTIONS_INIT; - git_clone_options opts = GIT_CLONE_OPTIONS_INIT; - opts.bare = true; - - cl_git_pass(git_clone(&_repository, "https://github.com/libgit2/TestGitRepository.git", - "./fetch/lg2", &opts)); - git_repository_free(_repository); - - cl_git_pass(git_repository_open(&_repository, "./fetch/lg2")); - - cl_git_pass(git_remote_lookup(&remote, _repository, "origin")); - cl_git_pass(git_remote_connect(remote, GIT_DIRECTION_FETCH, NULL, NULL)); - - cl_assert_equal_i(false, invoked); - - options.callbacks.transfer_progress = &transferProgressCallback; - options.callbacks.payload = &invoked; - cl_git_pass(git_remote_download(remote, NULL, &options)); - - cl_assert_equal_i(false, invoked); - - cl_git_pass(git_remote_update_tips(remote, &options.callbacks, 1, options.download_tags, NULL)); - git_remote_disconnect(remote); - - git_remote_free(remote); - git_repository_free(_repository); -} - -static int cancel_at_half(const git_transfer_progress *stats, void *payload) -{ - GIT_UNUSED(payload); - - if (stats->received_objects > (stats->total_objects/2)) - return -4321; - return 0; -} - -void test_online_fetch__can_cancel(void) -{ - git_remote *remote; - size_t bytes_received = 0; - git_fetch_options options = GIT_FETCH_OPTIONS_INIT; - - cl_git_pass(git_remote_create(&remote, _repo, "test", - "http://github.com/libgit2/TestGitRepository.git")); - - options.callbacks.transfer_progress = cancel_at_half; - options.callbacks.payload = &bytes_received; - - cl_git_pass(git_remote_connect(remote, GIT_DIRECTION_FETCH, NULL, NULL)); - cl_git_fail_with(git_remote_download(remote, NULL, &options), -4321); - git_remote_disconnect(remote); - git_remote_free(remote); -} - -void test_online_fetch__ls_disconnected(void) -{ - const git_remote_head **refs; - size_t refs_len_before, refs_len_after; - git_remote *remote; - - cl_git_pass(git_remote_create(&remote, _repo, "test", - "http://github.com/libgit2/TestGitRepository.git")); - cl_git_pass(git_remote_connect(remote, GIT_DIRECTION_FETCH, NULL, NULL)); - cl_git_pass(git_remote_ls(&refs, &refs_len_before, remote)); - git_remote_disconnect(remote); - cl_git_pass(git_remote_ls(&refs, &refs_len_after, remote)); - - cl_assert_equal_i(refs_len_before, refs_len_after); - - git_remote_free(remote); -} - -void test_online_fetch__remote_symrefs(void) -{ - const git_remote_head **refs; - size_t refs_len; - git_remote *remote; - - cl_git_pass(git_remote_create(&remote, _repo, "test", - "http://github.com/libgit2/TestGitRepository.git")); - cl_git_pass(git_remote_connect(remote, GIT_DIRECTION_FETCH, NULL, NULL)); - git_remote_disconnect(remote); - cl_git_pass(git_remote_ls(&refs, &refs_len, remote)); - - cl_assert_equal_s("HEAD", refs[0]->name); - cl_assert_equal_s("refs/heads/master", refs[0]->symref_target); - - git_remote_free(remote); -} - -void test_online_fetch__twice(void) -{ - git_remote *remote; - - cl_git_pass(git_remote_create(&remote, _repo, "test", "http://github.com/libgit2/TestGitRepository.git")); - cl_git_pass(git_remote_fetch(remote, NULL, NULL, NULL)); - cl_git_pass(git_remote_fetch(remote, NULL, NULL, NULL)); - - git_remote_free(remote); -} diff --git a/vendor/libgit2/tests/online/fetchhead.c b/vendor/libgit2/tests/online/fetchhead.c deleted file mode 100644 index 200edacfd..000000000 --- a/vendor/libgit2/tests/online/fetchhead.c +++ /dev/null @@ -1,103 +0,0 @@ -#include "clar_libgit2.h" - -#include "fileops.h" -#include "fetchhead.h" -#include "../fetchhead/fetchhead_data.h" -#include "git2/clone.h" - -#define LIVE_REPO_URL "git://github.com/libgit2/TestGitRepository" - -static git_repository *g_repo; -static git_clone_options g_options; - -void test_online_fetchhead__initialize(void) -{ - git_fetch_options dummy_fetch = GIT_FETCH_OPTIONS_INIT; - g_repo = NULL; - - memset(&g_options, 0, sizeof(git_clone_options)); - g_options.version = GIT_CLONE_OPTIONS_VERSION; - g_options.fetch_opts = dummy_fetch; -} - -void test_online_fetchhead__cleanup(void) -{ - if (g_repo) { - git_repository_free(g_repo); - g_repo = NULL; - } - - cl_fixture_cleanup("./foo"); -} - -static void fetchhead_test_clone(void) -{ - cl_git_pass(git_clone(&g_repo, LIVE_REPO_URL, "./foo", &g_options)); -} - -static void fetchhead_test_fetch(const char *fetchspec, const char *expected_fetchhead) -{ - git_remote *remote; - git_fetch_options fetch_opts = GIT_FETCH_OPTIONS_INIT; - git_buf fetchhead_buf = GIT_BUF_INIT; - int equals = 0; - git_strarray array, *active_refs = NULL; - - cl_git_pass(git_remote_lookup(&remote, g_repo, "origin")); - fetch_opts.download_tags = GIT_REMOTE_DOWNLOAD_TAGS_AUTO; - - if(fetchspec != NULL) { - array.count = 1; - array.strings = (char **) &fetchspec; - active_refs = &array; - } - - cl_git_pass(git_remote_fetch(remote, active_refs, &fetch_opts, NULL)); - git_remote_free(remote); - - cl_git_pass(git_futils_readbuffer(&fetchhead_buf, "./foo/.git/FETCH_HEAD")); - - equals = (strcmp(fetchhead_buf.ptr, expected_fetchhead) == 0); - - git_buf_free(&fetchhead_buf); - - cl_assert(equals); -} - -void test_online_fetchhead__wildcard_spec(void) -{ - fetchhead_test_clone(); - fetchhead_test_fetch(NULL, FETCH_HEAD_WILDCARD_DATA2); - cl_git_pass(git_tag_delete(g_repo, "annotated_tag")); - cl_git_pass(git_tag_delete(g_repo, "blob")); - cl_git_pass(git_tag_delete(g_repo, "commit_tree")); - cl_git_pass(git_tag_delete(g_repo, "nearly-dangling")); - fetchhead_test_fetch(NULL, FETCH_HEAD_WILDCARD_DATA); -} - -void test_online_fetchhead__explicit_spec(void) -{ - fetchhead_test_clone(); - fetchhead_test_fetch("refs/heads/first-merge:refs/remotes/origin/first-merge", FETCH_HEAD_EXPLICIT_DATA); -} - -void test_online_fetchhead__no_merges(void) -{ - git_config *config; - - fetchhead_test_clone(); - - cl_git_pass(git_repository_config(&config, g_repo)); - cl_git_pass(git_config_delete_entry(config, "branch.master.remote")); - cl_git_pass(git_config_delete_entry(config, "branch.master.merge")); - git_config_free(config); - - fetchhead_test_fetch(NULL, FETCH_HEAD_NO_MERGE_DATA2); - cl_git_pass(git_tag_delete(g_repo, "annotated_tag")); - cl_git_pass(git_tag_delete(g_repo, "blob")); - cl_git_pass(git_tag_delete(g_repo, "commit_tree")); - cl_git_pass(git_tag_delete(g_repo, "nearly-dangling")); - fetchhead_test_fetch(NULL, FETCH_HEAD_NO_MERGE_DATA); - cl_git_pass(git_tag_delete(g_repo, "commit_tree")); - fetchhead_test_fetch(NULL, FETCH_HEAD_NO_MERGE_DATA3); -} diff --git a/vendor/libgit2/tests/online/push.c b/vendor/libgit2/tests/online/push.c deleted file mode 100644 index 77c437622..000000000 --- a/vendor/libgit2/tests/online/push.c +++ /dev/null @@ -1,906 +0,0 @@ -#include "clar_libgit2.h" -#include "buffer.h" -#include "posix.h" -#include "vector.h" -#include "../submodule/submodule_helpers.h" -#include "push_util.h" -#include "refspec.h" -#include "remote.h" - -static git_repository *_repo; - -static char *_remote_url = NULL; - -static char *_remote_user = NULL; -static char *_remote_pass = NULL; - -static char *_remote_ssh_key = NULL; -static char *_remote_ssh_pubkey = NULL; -static char *_remote_ssh_passphrase = NULL; - -static char *_remote_default = NULL; - -static int cred_acquire_cb(git_cred **, const char *, const char *, unsigned int, void *); - -static git_remote *_remote; -static record_callbacks_data _record_cbs_data = {{ 0 }}; -static git_remote_callbacks _record_cbs = RECORD_CALLBACKS_INIT(&_record_cbs_data); - -static git_oid _oid_b6; -static git_oid _oid_b5; -static git_oid _oid_b4; -static git_oid _oid_b3; -static git_oid _oid_b2; -static git_oid _oid_b1; - -static git_oid _tag_commit; -static git_oid _tag_tree; -static git_oid _tag_blob; -static git_oid _tag_lightweight; -static git_oid _tag_tag; - -static int cred_acquire_cb( - git_cred **cred, - const char *url, - const char *user_from_url, - unsigned int allowed_types, - void *payload) -{ - GIT_UNUSED(url); - GIT_UNUSED(user_from_url); - GIT_UNUSED(payload); - - if (GIT_CREDTYPE_USERNAME & allowed_types) { - if (!_remote_user) { - printf("GITTEST_REMOTE_USER must be set\n"); - return -1; - } - - return git_cred_username_new(cred, _remote_user); - } - - if (GIT_CREDTYPE_DEFAULT & allowed_types) { - if (!_remote_default) { - printf("GITTEST_REMOTE_DEFAULT must be set to use NTLM/Negotiate credentials\n"); - return -1; - } - - return git_cred_default_new(cred); - } - - if (GIT_CREDTYPE_SSH_KEY & allowed_types) { - if (!_remote_user || !_remote_ssh_pubkey || !_remote_ssh_key || !_remote_ssh_passphrase) { - printf("GITTEST_REMOTE_USER, GITTEST_REMOTE_SSH_PUBKEY, GITTEST_REMOTE_SSH_KEY and GITTEST_REMOTE_SSH_PASSPHRASE must be set\n"); - return -1; - } - - return git_cred_ssh_key_new(cred, _remote_user, _remote_ssh_pubkey, _remote_ssh_key, _remote_ssh_passphrase); - } - - if (GIT_CREDTYPE_USERPASS_PLAINTEXT & allowed_types) { - if (!_remote_user || !_remote_pass) { - printf("GITTEST_REMOTE_USER and GITTEST_REMOTE_PASS must be set\n"); - return -1; - } - - return git_cred_userpass_plaintext_new(cred, _remote_user, _remote_pass); - } - - return -1; -} - -/** - * git_push_status_foreach callback that records status entries. - */ -static int record_push_status_cb(const char *ref, const char *msg, void *payload) -{ - record_callbacks_data *data = (record_callbacks_data *) payload; - push_status *s; - - cl_assert(s = git__calloc(1, sizeof(*s))); - if (ref) - cl_assert(s->ref = git__strdup(ref)); - s->success = (msg == NULL); - if (msg) - cl_assert(s->msg = git__strdup(msg)); - - git_vector_insert(&data->statuses, s); - - return 0; -} - -static void do_verify_push_status(record_callbacks_data *data, const push_status expected[], const size_t expected_len) -{ - git_vector *actual = &data->statuses; - push_status *iter; - bool failed = false; - size_t i; - - if (expected_len != actual->length) - failed = true; - else - git_vector_foreach(actual, i, iter) - if (strcmp(expected[i].ref, iter->ref) || - (expected[i].success != iter->success) || - (expected[i].msg && (!iter->msg || strcmp(expected[i].msg, iter->msg)))) { - failed = true; - break; - } - - if (failed) { - git_buf msg = GIT_BUF_INIT; - - git_buf_puts(&msg, "Expected and actual push statuses differ:\nEXPECTED:\n"); - - for(i = 0; i < expected_len; i++) { - git_buf_printf(&msg, "%s: %s\n", - expected[i].ref, - expected[i].success ? "success" : "failed"); - } - - git_buf_puts(&msg, "\nACTUAL:\n"); - - git_vector_foreach(actual, i, iter) { - if (iter->success) - git_buf_printf(&msg, "%s: success\n", iter->ref); - else - git_buf_printf(&msg, "%s: failed with message: %s", iter->ref, iter->msg); - } - - cl_fail(git_buf_cstr(&msg)); - - git_buf_free(&msg); - } - - git_vector_foreach(actual, i, iter) - git__free(iter); - - git_vector_free(actual); -} - -/** - * Verifies that after git_push_finish(), refs on a remote have the expected - * names, oids, and order. - * - * @param remote remote to verify - * @param expected_refs expected remote refs after push - * @param expected_refs_len length of expected_refs - */ -static void verify_refs(git_remote *remote, expected_ref expected_refs[], size_t expected_refs_len) -{ - const git_remote_head **actual_refs; - size_t actual_refs_len; - - git_remote_ls(&actual_refs, &actual_refs_len, remote); - verify_remote_refs(actual_refs, actual_refs_len, expected_refs, expected_refs_len); -} - -/** - * Verifies that after git_push_update_tips(), remote tracking branches have the expected - * names and oids. - * - * @param remote remote to verify - * @param expected_refs expected remote refs after push - * @param expected_refs_len length of expected_refs - */ -static void verify_tracking_branches(git_remote *remote, expected_ref expected_refs[], size_t expected_refs_len) -{ - git_refspec *fetch_spec; - size_t i, j; - git_buf msg = GIT_BUF_INIT; - git_buf ref_name = GIT_BUF_INIT; - git_vector actual_refs = GIT_VECTOR_INIT; - git_branch_iterator *iter; - char *actual_ref; - git_oid oid; - int failed = 0, error; - git_branch_t branch_type; - git_reference *ref; - - /* Get current remote-tracking branches */ - cl_git_pass(git_branch_iterator_new(&iter, remote->repo, GIT_BRANCH_REMOTE)); - - while ((error = git_branch_next(&ref, &branch_type, iter)) == 0) { - cl_assert_equal_i(branch_type, GIT_BRANCH_REMOTE); - - cl_git_pass(git_vector_insert(&actual_refs, git__strdup(git_reference_name(ref)))); - - git_reference_free(ref); - } - - cl_assert_equal_i(error, GIT_ITEROVER); - git_branch_iterator_free(iter); - - /* Loop through expected refs, make sure they exist */ - for (i = 0; i < expected_refs_len; i++) { - - /* Convert remote reference name into remote-tracking branch name. - * If the spec is not under refs/heads/, then skip. - */ - fetch_spec = git_remote__matching_refspec(remote, expected_refs[i].name); - if (!fetch_spec) - continue; - - cl_git_pass(git_refspec_transform(&ref_name, fetch_spec, expected_refs[i].name)); - - /* Find matching remote branch */ - git_vector_foreach(&actual_refs, j, actual_ref) { - if (!strcmp(git_buf_cstr(&ref_name), actual_ref)) - break; - } - - if (j == actual_refs.length) { - git_buf_printf(&msg, "Did not find expected tracking branch '%s'.", git_buf_cstr(&ref_name)); - failed = 1; - goto failed; - } - - /* Make sure tracking branch is at expected commit ID */ - cl_git_pass(git_reference_name_to_id(&oid, remote->repo, actual_ref)); - - if (git_oid_cmp(expected_refs[i].oid, &oid) != 0) { - git_buf_puts(&msg, "Tracking branch commit does not match expected ID."); - failed = 1; - goto failed; - } - - git__free(actual_ref); - cl_git_pass(git_vector_remove(&actual_refs, j)); - } - - /* Make sure there are no extra branches */ - if (actual_refs.length > 0) { - git_buf_puts(&msg, "Unexpected remote tracking branches exist."); - failed = 1; - goto failed; - } - -failed: - if (failed) - cl_fail(git_buf_cstr(&msg)); - - git_vector_foreach(&actual_refs, i, actual_ref) - git__free(actual_ref); - - git_vector_free(&actual_refs); - git_buf_free(&msg); - git_buf_free(&ref_name); -} - -static void verify_update_tips_callback(git_remote *remote, expected_ref expected_refs[], size_t expected_refs_len) -{ - git_refspec *fetch_spec; - git_buf msg = GIT_BUF_INIT; - git_buf ref_name = GIT_BUF_INIT; - updated_tip *tip = NULL; - size_t i, j; - int failed = 0; - - for (i = 0; i < expected_refs_len; ++i) { - /* Convert remote reference name into tracking branch name. - * If the spec is not under refs/heads/, then skip. - */ - fetch_spec = git_remote__matching_refspec(remote, expected_refs[i].name); - if (!fetch_spec) - continue; - - cl_git_pass(git_refspec_transform(&ref_name, fetch_spec, expected_refs[i].name)); - - /* Find matching update_tip entry */ - git_vector_foreach(&_record_cbs_data.updated_tips, j, tip) { - if (!strcmp(git_buf_cstr(&ref_name), tip->name)) - break; - } - - if (j == _record_cbs_data.updated_tips.length) { - git_buf_printf(&msg, "Did not find expected updated tip entry for branch '%s'.", git_buf_cstr(&ref_name)); - failed = 1; - goto failed; - } - - if (git_oid_cmp(expected_refs[i].oid, &tip->new_oid) != 0) { - git_buf_printf(&msg, "Updated tip ID does not match expected ID"); - failed = 1; - goto failed; - } - } - -failed: - if (failed) - cl_fail(git_buf_cstr(&msg)); - - git_buf_free(&ref_name); - git_buf_free(&msg); -} - -void test_online_push__initialize(void) -{ - git_vector delete_specs = GIT_VECTOR_INIT; - const git_remote_head **heads; - size_t heads_len; - git_push_options push_opts = GIT_PUSH_OPTIONS_INIT; - git_fetch_options fetch_opts = GIT_FETCH_OPTIONS_INIT; - - _repo = cl_git_sandbox_init("push_src"); - - cl_git_pass(git_repository_set_ident(_repo, "Random J. Hacker", "foo@example.com")); - cl_fixture_sandbox("testrepo.git"); - cl_rename("push_src/submodule/.gitted", "push_src/submodule/.git"); - - rewrite_gitmodules(git_repository_workdir(_repo)); - - /* git log --format=oneline --decorate --graph - * *-. 951bbbb90e2259a4c8950db78946784fb53fcbce (HEAD, b6) merge b3, b4, and b5 to b6 - * |\ \ - * | | * fa38b91f199934685819bea316186d8b008c52a2 (b5) added submodule named 'submodule' pointing to '../testrepo.git' - * | * | 27b7ce66243eb1403862d05f958c002312df173d (b4) edited fold\b.txt - * | |/ - * * | d9b63a88223d8367516f50bd131a5f7349b7f3e4 (b3) edited a.txt - * |/ - * * a78705c3b2725f931d3ee05348d83cc26700f247 (b2, b1) added fold and fold/b.txt - * * 5c0bb3d1b9449d1cc69d7519fd05166f01840915 added a.txt - */ - git_oid_fromstr(&_oid_b6, "951bbbb90e2259a4c8950db78946784fb53fcbce"); - git_oid_fromstr(&_oid_b5, "fa38b91f199934685819bea316186d8b008c52a2"); - git_oid_fromstr(&_oid_b4, "27b7ce66243eb1403862d05f958c002312df173d"); - git_oid_fromstr(&_oid_b3, "d9b63a88223d8367516f50bd131a5f7349b7f3e4"); - git_oid_fromstr(&_oid_b2, "a78705c3b2725f931d3ee05348d83cc26700f247"); - git_oid_fromstr(&_oid_b1, "a78705c3b2725f931d3ee05348d83cc26700f247"); - - git_oid_fromstr(&_tag_commit, "805c54522e614f29f70d2413a0470247d8b424ac"); - git_oid_fromstr(&_tag_tree, "ff83aa4c5e5d28e3bcba2f5c6e2adc61286a4e5e"); - git_oid_fromstr(&_tag_blob, "b483ae7ba66decee9aee971f501221dea84b1498"); - git_oid_fromstr(&_tag_lightweight, "951bbbb90e2259a4c8950db78946784fb53fcbce"); - git_oid_fromstr(&_tag_tag, "eea4f2705eeec2db3813f2430829afce99cd00b5"); - - /* Remote URL environment variable must be set. User and password are optional. */ - - _remote_url = cl_getenv("GITTEST_REMOTE_URL"); - _remote_user = cl_getenv("GITTEST_REMOTE_USER"); - _remote_pass = cl_getenv("GITTEST_REMOTE_PASS"); - _remote_ssh_key = cl_getenv("GITTEST_REMOTE_SSH_KEY"); - _remote_ssh_pubkey = cl_getenv("GITTEST_REMOTE_SSH_PUBKEY"); - _remote_ssh_passphrase = cl_getenv("GITTEST_REMOTE_SSH_PASSPHRASE"); - _remote_default = cl_getenv("GITTEST_REMOTE_DEFAULT"); - _remote = NULL; - - /* Skip the test if we're missing the remote URL */ - if (!_remote_url) - cl_skip(); - - cl_git_pass(git_remote_create(&_remote, _repo, "test", _remote_url)); - - record_callbacks_data_clear(&_record_cbs_data); - - cl_git_pass(git_remote_connect(_remote, GIT_DIRECTION_PUSH, &_record_cbs, NULL)); - - /* Clean up previously pushed branches. Fails if receive.denyDeletes is - * set on the remote. Also, on Git 1.7.0 and newer, you must run - * 'git config receive.denyDeleteCurrent ignore' in the remote repo in - * order to delete the remote branch pointed to by HEAD (usually master). - * See: https://raw.github.com/git/git/master/Documentation/RelNotes/1.7.0.txt - */ - cl_git_pass(git_remote_ls(&heads, &heads_len, _remote)); - cl_git_pass(create_deletion_refspecs(&delete_specs, heads, heads_len)); - if (delete_specs.length) { - git_strarray arr = { - (char **) delete_specs.contents, - delete_specs.length, - }; - - memcpy(&push_opts.callbacks, &_record_cbs, sizeof(git_remote_callbacks)); - cl_git_pass(git_remote_upload(_remote, &arr, &push_opts)); - } - - git_remote_disconnect(_remote); - git_vector_free(&delete_specs); - - /* Now that we've deleted everything, fetch from the remote */ - memcpy(&fetch_opts.callbacks, &_record_cbs, sizeof(git_remote_callbacks)); - cl_git_pass(git_remote_fetch(_remote, NULL, &fetch_opts, NULL)); -} - -void test_online_push__cleanup(void) -{ - if (_remote) - git_remote_free(_remote); - _remote = NULL; - - git__free(_remote_url); - git__free(_remote_user); - git__free(_remote_pass); - git__free(_remote_ssh_key); - git__free(_remote_ssh_pubkey); - git__free(_remote_ssh_passphrase); - git__free(_remote_default); - - /* Freed by cl_git_sandbox_cleanup */ - _repo = NULL; - - record_callbacks_data_clear(&_record_cbs_data); - - cl_fixture_cleanup("testrepo.git"); - cl_git_sandbox_cleanup(); -} - -static int push_pack_progress_cb( - int stage, unsigned int current, unsigned int total, void* payload) -{ - record_callbacks_data *data = (record_callbacks_data *) payload; - GIT_UNUSED(stage); GIT_UNUSED(current); GIT_UNUSED(total); - if (data->pack_progress_calls < 0) - return data->pack_progress_calls; - - data->pack_progress_calls++; - return 0; -} - -static int push_transfer_progress_cb( - unsigned int current, unsigned int total, size_t bytes, void* payload) -{ - record_callbacks_data *data = (record_callbacks_data *) payload; - GIT_UNUSED(current); GIT_UNUSED(total); GIT_UNUSED(bytes); - if (data->transfer_progress_calls < 0) - return data->transfer_progress_calls; - - data->transfer_progress_calls++; - return 0; -} - -/** - * Calls push and relists refs on remote to verify success. - * - * @param refspecs refspecs to push - * @param refspecs_len length of refspecs - * @param expected_refs expected remote refs after push - * @param expected_refs_len length of expected_refs - * @param expected_ret expected return value from git_push_finish() - * @param check_progress_cb Check that the push progress callbacks are called - */ -static void do_push( - const char *refspecs[], size_t refspecs_len, - push_status expected_statuses[], size_t expected_statuses_len, - expected_ref expected_refs[], size_t expected_refs_len, - int expected_ret, int check_progress_cb, int check_update_tips_cb) -{ - git_push_options opts = GIT_PUSH_OPTIONS_INIT; - size_t i; - int error; - git_strarray specs = {0}; - record_callbacks_data *data; - - if (_remote) { - /* Auto-detect the number of threads to use */ - opts.pb_parallelism = 0; - - memcpy(&opts.callbacks, &_record_cbs, sizeof(git_remote_callbacks)); - data = opts.callbacks.payload; - - opts.callbacks.pack_progress = push_pack_progress_cb; - opts.callbacks.push_transfer_progress = push_transfer_progress_cb; - opts.callbacks.push_update_reference = record_push_status_cb; - - if (refspecs_len) { - specs.count = refspecs_len; - specs.strings = git__calloc(refspecs_len, sizeof(char *)); - cl_assert(specs.strings); - } - - for (i = 0; i < refspecs_len; i++) - specs.strings[i] = (char *) refspecs[i]; - - /* if EUSER, then abort in transfer */ - if (check_progress_cb && expected_ret == GIT_EUSER) - data->transfer_progress_calls = GIT_EUSER; - - error = git_remote_push(_remote, &specs, &opts); - git__free(specs.strings); - - if (expected_ret < 0) { - cl_git_fail_with(expected_ret, error); - } else { - cl_git_pass(error); - } - - if (check_progress_cb && expected_ret == 0) { - cl_assert(data->pack_progress_calls > 0); - cl_assert(data->transfer_progress_calls > 0); - } - - do_verify_push_status(data, expected_statuses, expected_statuses_len); - - verify_refs(_remote, expected_refs, expected_refs_len); - verify_tracking_branches(_remote, expected_refs, expected_refs_len); - - if (check_update_tips_cb) - verify_update_tips_callback(_remote, expected_refs, expected_refs_len); - - } - -} - -/* Call push_finish() without ever calling git_push_add_refspec() */ -void test_online_push__noop(void) -{ - do_push(NULL, 0, NULL, 0, NULL, 0, 0, 0, 1); -} - -void test_online_push__b1(void) -{ - const char *specs[] = { "refs/heads/b1:refs/heads/b1" }; - push_status exp_stats[] = { { "refs/heads/b1", 1 } }; - expected_ref exp_refs[] = { { "refs/heads/b1", &_oid_b1 } }; - do_push(specs, ARRAY_SIZE(specs), - exp_stats, ARRAY_SIZE(exp_stats), - exp_refs, ARRAY_SIZE(exp_refs), 0, 1, 1); -} - -void test_online_push__b2(void) -{ - const char *specs[] = { "refs/heads/b2:refs/heads/b2" }; - push_status exp_stats[] = { { "refs/heads/b2", 1 } }; - expected_ref exp_refs[] = { { "refs/heads/b2", &_oid_b2 } }; - do_push(specs, ARRAY_SIZE(specs), - exp_stats, ARRAY_SIZE(exp_stats), - exp_refs, ARRAY_SIZE(exp_refs), 0, 1, 1); -} - -void test_online_push__b3(void) -{ - const char *specs[] = { "refs/heads/b3:refs/heads/b3" }; - push_status exp_stats[] = { { "refs/heads/b3", 1 } }; - expected_ref exp_refs[] = { { "refs/heads/b3", &_oid_b3 } }; - do_push(specs, ARRAY_SIZE(specs), - exp_stats, ARRAY_SIZE(exp_stats), - exp_refs, ARRAY_SIZE(exp_refs), 0, 1, 1); -} - -void test_online_push__b4(void) -{ - const char *specs[] = { "refs/heads/b4:refs/heads/b4" }; - push_status exp_stats[] = { { "refs/heads/b4", 1 } }; - expected_ref exp_refs[] = { { "refs/heads/b4", &_oid_b4 } }; - do_push(specs, ARRAY_SIZE(specs), - exp_stats, ARRAY_SIZE(exp_stats), - exp_refs, ARRAY_SIZE(exp_refs), 0, 1, 1); -} - -void test_online_push__b5(void) -{ - const char *specs[] = { "refs/heads/b5:refs/heads/b5" }; - push_status exp_stats[] = { { "refs/heads/b5", 1 } }; - expected_ref exp_refs[] = { { "refs/heads/b5", &_oid_b5 } }; - do_push(specs, ARRAY_SIZE(specs), - exp_stats, ARRAY_SIZE(exp_stats), - exp_refs, ARRAY_SIZE(exp_refs), 0, 1, 1); -} - -void test_online_push__b5_cancel(void) -{ - const char *specs[] = { "refs/heads/b5:refs/heads/b5" }; - do_push(specs, ARRAY_SIZE(specs), NULL, 0, NULL, 0, GIT_EUSER, 1, 1); -} - -void test_online_push__multi(void) -{ - git_reflog *log; - const git_reflog_entry *entry; - - const char *specs[] = { - "refs/heads/b1:refs/heads/b1", - "refs/heads/b2:refs/heads/b2", - "refs/heads/b3:refs/heads/b3", - "refs/heads/b4:refs/heads/b4", - "refs/heads/b5:refs/heads/b5" - }; - push_status exp_stats[] = { - { "refs/heads/b1", 1 }, - { "refs/heads/b2", 1 }, - { "refs/heads/b3", 1 }, - { "refs/heads/b4", 1 }, - { "refs/heads/b5", 1 } - }; - expected_ref exp_refs[] = { - { "refs/heads/b1", &_oid_b1 }, - { "refs/heads/b2", &_oid_b2 }, - { "refs/heads/b3", &_oid_b3 }, - { "refs/heads/b4", &_oid_b4 }, - { "refs/heads/b5", &_oid_b5 } - }; - do_push(specs, ARRAY_SIZE(specs), - exp_stats, ARRAY_SIZE(exp_stats), - exp_refs, ARRAY_SIZE(exp_refs), 0, 1, 1); - - cl_git_pass(git_reflog_read(&log, _repo, "refs/remotes/test/b1")); - entry = git_reflog_entry_byindex(log, 0); - if (entry) { - cl_assert_equal_s("update by push", git_reflog_entry_message(entry)); - cl_assert_equal_s("foo@example.com", git_reflog_entry_committer(entry)->email); - } - - git_reflog_free(log); -} - -void test_online_push__implicit_tgt(void) -{ - const char *specs1[] = { "refs/heads/b1" }; - push_status exp_stats1[] = { { "refs/heads/b1", 1 } }; - expected_ref exp_refs1[] = { { "refs/heads/b1", &_oid_b1 } }; - - const char *specs2[] = { "refs/heads/b2" }; - push_status exp_stats2[] = { { "refs/heads/b2", 1 } }; - expected_ref exp_refs2[] = { - { "refs/heads/b1", &_oid_b1 }, - { "refs/heads/b2", &_oid_b2 } - }; - - do_push(specs1, ARRAY_SIZE(specs1), - exp_stats1, ARRAY_SIZE(exp_stats1), - exp_refs1, ARRAY_SIZE(exp_refs1), 0, 1, 1); - do_push(specs2, ARRAY_SIZE(specs2), - exp_stats2, ARRAY_SIZE(exp_stats2), - exp_refs2, ARRAY_SIZE(exp_refs2), 0, 0, 0); -} - -void test_online_push__fast_fwd(void) -{ - /* Fast forward b1 in tgt from _oid_b1 to _oid_b6. */ - - const char *specs_init[] = { "refs/heads/b1:refs/heads/b1" }; - push_status exp_stats_init[] = { { "refs/heads/b1", 1 } }; - expected_ref exp_refs_init[] = { { "refs/heads/b1", &_oid_b1 } }; - - const char *specs_ff[] = { "refs/heads/b6:refs/heads/b1" }; - push_status exp_stats_ff[] = { { "refs/heads/b1", 1 } }; - expected_ref exp_refs_ff[] = { { "refs/heads/b1", &_oid_b6 } }; - - /* Do a force push to reset b1 in target back to _oid_b1 */ - const char *specs_reset[] = { "+refs/heads/b1:refs/heads/b1" }; - /* Force should have no effect on a fast forward push */ - const char *specs_ff_force[] = { "+refs/heads/b6:refs/heads/b1" }; - - do_push(specs_init, ARRAY_SIZE(specs_init), - exp_stats_init, ARRAY_SIZE(exp_stats_init), - exp_refs_init, ARRAY_SIZE(exp_refs_init), 0, 1, 1); - - do_push(specs_ff, ARRAY_SIZE(specs_ff), - exp_stats_ff, ARRAY_SIZE(exp_stats_ff), - exp_refs_ff, ARRAY_SIZE(exp_refs_ff), 0, 0, 0); - - do_push(specs_reset, ARRAY_SIZE(specs_reset), - exp_stats_init, ARRAY_SIZE(exp_stats_init), - exp_refs_init, ARRAY_SIZE(exp_refs_init), 0, 0, 0); - - do_push(specs_ff_force, ARRAY_SIZE(specs_ff_force), - exp_stats_ff, ARRAY_SIZE(exp_stats_ff), - exp_refs_ff, ARRAY_SIZE(exp_refs_ff), 0, 0, 0); -} - -void test_online_push__tag_commit(void) -{ - const char *specs[] = { "refs/tags/tag-commit:refs/tags/tag-commit" }; - push_status exp_stats[] = { { "refs/tags/tag-commit", 1 } }; - expected_ref exp_refs[] = { { "refs/tags/tag-commit", &_tag_commit } }; - do_push(specs, ARRAY_SIZE(specs), - exp_stats, ARRAY_SIZE(exp_stats), - exp_refs, ARRAY_SIZE(exp_refs), 0, 1, 1); -} - -void test_online_push__tag_tree(void) -{ - const char *specs[] = { "refs/tags/tag-tree:refs/tags/tag-tree" }; - push_status exp_stats[] = { { "refs/tags/tag-tree", 1 } }; - expected_ref exp_refs[] = { { "refs/tags/tag-tree", &_tag_tree } }; - do_push(specs, ARRAY_SIZE(specs), - exp_stats, ARRAY_SIZE(exp_stats), - exp_refs, ARRAY_SIZE(exp_refs), 0, 1, 1); -} - -void test_online_push__tag_blob(void) -{ - const char *specs[] = { "refs/tags/tag-blob:refs/tags/tag-blob" }; - push_status exp_stats[] = { { "refs/tags/tag-blob", 1 } }; - expected_ref exp_refs[] = { { "refs/tags/tag-blob", &_tag_blob } }; - do_push(specs, ARRAY_SIZE(specs), - exp_stats, ARRAY_SIZE(exp_stats), - exp_refs, ARRAY_SIZE(exp_refs), 0, 1, 1); -} - -void test_online_push__tag_lightweight(void) -{ - const char *specs[] = { "refs/tags/tag-lightweight:refs/tags/tag-lightweight" }; - push_status exp_stats[] = { { "refs/tags/tag-lightweight", 1 } }; - expected_ref exp_refs[] = { { "refs/tags/tag-lightweight", &_tag_lightweight } }; - do_push(specs, ARRAY_SIZE(specs), - exp_stats, ARRAY_SIZE(exp_stats), - exp_refs, ARRAY_SIZE(exp_refs), 0, 1, 1); -} - -void test_online_push__tag_to_tag(void) -{ - const char *specs[] = { "refs/tags/tag-tag:refs/tags/tag-tag" }; - push_status exp_stats[] = { { "refs/tags/tag-tag", 1 } }; - expected_ref exp_refs[] = { { "refs/tags/tag-tag", &_tag_tag } }; - do_push(specs, ARRAY_SIZE(specs), - exp_stats, ARRAY_SIZE(exp_stats), - exp_refs, ARRAY_SIZE(exp_refs), 0, 0, 0); -} - -void test_online_push__force(void) -{ - const char *specs1[] = {"refs/heads/b3:refs/heads/tgt"}; - push_status exp_stats1[] = { { "refs/heads/tgt", 1 } }; - expected_ref exp_refs1[] = { { "refs/heads/tgt", &_oid_b3 } }; - - const char *specs2[] = {"refs/heads/b4:refs/heads/tgt"}; - - const char *specs2_force[] = {"+refs/heads/b4:refs/heads/tgt"}; - push_status exp_stats2_force[] = { { "refs/heads/tgt", 1 } }; - expected_ref exp_refs2_force[] = { { "refs/heads/tgt", &_oid_b4 } }; - - do_push(specs1, ARRAY_SIZE(specs1), - exp_stats1, ARRAY_SIZE(exp_stats1), - exp_refs1, ARRAY_SIZE(exp_refs1), 0, 1, 1); - - do_push(specs2, ARRAY_SIZE(specs2), - NULL, 0, - exp_refs1, ARRAY_SIZE(exp_refs1), GIT_ENONFASTFORWARD, 0, 0); - - /* Non-fast-forward update with force should pass. */ - record_callbacks_data_clear(&_record_cbs_data); - do_push(specs2_force, ARRAY_SIZE(specs2_force), - exp_stats2_force, ARRAY_SIZE(exp_stats2_force), - exp_refs2_force, ARRAY_SIZE(exp_refs2_force), 0, 1, 1); -} - -void test_online_push__delete(void) -{ - const char *specs1[] = { - "refs/heads/b1:refs/heads/tgt1", - "refs/heads/b1:refs/heads/tgt2" - }; - push_status exp_stats1[] = { - { "refs/heads/tgt1", 1 }, - { "refs/heads/tgt2", 1 } - }; - expected_ref exp_refs1[] = { - { "refs/heads/tgt1", &_oid_b1 }, - { "refs/heads/tgt2", &_oid_b1 } - }; - - const char *specs_del_fake[] = { ":refs/heads/fake" }; - /* Force has no effect for delete. */ - const char *specs_del_fake_force[] = { "+:refs/heads/fake" }; - push_status exp_stats_fake[] = { { "refs/heads/fake", 1 } }; - - const char *specs_delete[] = { ":refs/heads/tgt1" }; - push_status exp_stats_delete[] = { { "refs/heads/tgt1", 1 } }; - expected_ref exp_refs_delete[] = { { "refs/heads/tgt2", &_oid_b1 } }; - /* Force has no effect for delete. */ - const char *specs_delete_force[] = { "+:refs/heads/tgt1" }; - - do_push(specs1, ARRAY_SIZE(specs1), - exp_stats1, ARRAY_SIZE(exp_stats1), - exp_refs1, ARRAY_SIZE(exp_refs1), 0, 1, 1); - - /* When deleting a non-existent branch, the git client sends zero for both - * the old and new commit id. This should succeed on the server with the - * same status report as if the branch were actually deleted. The server - * returns a warning on the side-band iff the side-band is supported. - * Since libgit2 doesn't support the side-band yet, there are no warnings. - */ - do_push(specs_del_fake, ARRAY_SIZE(specs_del_fake), - exp_stats_fake, 1, - exp_refs1, ARRAY_SIZE(exp_refs1), 0, 0, 0); - do_push(specs_del_fake_force, ARRAY_SIZE(specs_del_fake_force), - exp_stats_fake, 1, - exp_refs1, ARRAY_SIZE(exp_refs1), 0, 0, 0); - - /* Delete one of the pushed branches. */ - do_push(specs_delete, ARRAY_SIZE(specs_delete), - exp_stats_delete, ARRAY_SIZE(exp_stats_delete), - exp_refs_delete, ARRAY_SIZE(exp_refs_delete), 0, 0, 0); - - /* Re-push branches and retry delete with force. */ - do_push(specs1, ARRAY_SIZE(specs1), - exp_stats1, ARRAY_SIZE(exp_stats1), - exp_refs1, ARRAY_SIZE(exp_refs1), 0, 0, 0); - do_push(specs_delete_force, ARRAY_SIZE(specs_delete_force), - exp_stats_delete, ARRAY_SIZE(exp_stats_delete), - exp_refs_delete, ARRAY_SIZE(exp_refs_delete), 0, 0, 0); -} - -void test_online_push__bad_refspecs(void) -{ - /* All classes of refspecs that should be rejected by - * git_push_add_refspec() should go in this test. - */ - char *specs = { - "b6:b6", - }; - git_strarray arr = { - &specs, - 1, - }; - - if (_remote) { - cl_git_fail(git_remote_upload(_remote, &arr, NULL)); - } -} - -void test_online_push__expressions(void) -{ - /* TODO: Expressions in refspecs doesn't actually work yet */ - const char *specs_left_expr[] = { "refs/heads/b2~1:refs/heads/b2" }; - - /* TODO: Find a more precise way of checking errors than a exit code of -1. */ - do_push(specs_left_expr, ARRAY_SIZE(specs_left_expr), - NULL, 0, - NULL, 0, -1, 0, 0); -} - -void test_online_push__notes(void) -{ - git_oid note_oid, *target_oid, expected_oid; - git_signature *signature; - const char *specs[] = { "refs/notes/commits:refs/notes/commits" }; - push_status exp_stats[] = { { "refs/notes/commits", 1 } }; - expected_ref exp_refs[] = { { "refs/notes/commits", &expected_oid } }; - const char *specs_del[] = { ":refs/notes/commits" }; - - git_oid_fromstr(&expected_oid, "8461a99b27b7043e58ff6e1f5d2cf07d282534fb"); - - target_oid = &_oid_b6; - - /* Create note to push */ - cl_git_pass(git_signature_new(&signature, "nulltoken", "emeric.fermas@gmail.com", 1323847743, 60)); /* Wed Dec 14 08:29:03 2011 +0100 */ - cl_git_pass(git_note_create(¬e_oid, _repo, NULL, signature, signature, target_oid, "hello world\n", 0)); - - do_push(specs, ARRAY_SIZE(specs), - exp_stats, ARRAY_SIZE(exp_stats), - exp_refs, ARRAY_SIZE(exp_refs), 0, 1, 1); - - /* And make sure to delete the note */ - - do_push(specs_del, ARRAY_SIZE(specs_del), - exp_stats, 1, - NULL, 0, 0, 0, 0); - - git_signature_free(signature); -} - -void test_online_push__configured(void) -{ - git_oid note_oid, *target_oid, expected_oid; - git_signature *signature; - git_remote *old_remote; - const char *specs[] = { "refs/notes/commits:refs/notes/commits" }; - push_status exp_stats[] = { { "refs/notes/commits", 1 } }; - expected_ref exp_refs[] = { { "refs/notes/commits", &expected_oid } }; - const char *specs_del[] = { ":refs/notes/commits" }; - - git_oid_fromstr(&expected_oid, "8461a99b27b7043e58ff6e1f5d2cf07d282534fb"); - - target_oid = &_oid_b6; - - cl_git_pass(git_remote_add_push(_repo, git_remote_name(_remote), specs[0])); - old_remote = _remote; - cl_git_pass(git_remote_lookup(&_remote, _repo, git_remote_name(_remote))); - git_remote_free(old_remote); - - /* Create note to push */ - cl_git_pass(git_signature_new(&signature, "nulltoken", "emeric.fermas@gmail.com", 1323847743, 60)); /* Wed Dec 14 08:29:03 2011 +0100 */ - cl_git_pass(git_note_create(¬e_oid, _repo, NULL, signature, signature, target_oid, "hello world\n", 0)); - - do_push(NULL, 0, - exp_stats, ARRAY_SIZE(exp_stats), - exp_refs, ARRAY_SIZE(exp_refs), 0, 1, 1); - - /* And make sure to delete the note */ - - do_push(specs_del, ARRAY_SIZE(specs_del), - exp_stats, 1, - NULL, 0, 0, 0, 0); - - git_signature_free(signature); -} diff --git a/vendor/libgit2/tests/online/push_util.c b/vendor/libgit2/tests/online/push_util.c deleted file mode 100644 index eafec2f05..000000000 --- a/vendor/libgit2/tests/online/push_util.c +++ /dev/null @@ -1,141 +0,0 @@ - -#include "clar_libgit2.h" -#include "buffer.h" -#include "vector.h" -#include "push_util.h" - -const git_oid OID_ZERO = {{ 0 }}; - -void updated_tip_free(updated_tip *t) -{ - git__free(t->name); - git__free(t); -} - -void push_status_free(push_status *s) -{ - git__free(s->ref); - git__free(s->msg); - git__free(s); -} - -void record_callbacks_data_clear(record_callbacks_data *data) -{ - size_t i; - updated_tip *tip; - push_status *status; - - git_vector_foreach(&data->updated_tips, i, tip) - updated_tip_free(tip); - - git_vector_free(&data->updated_tips); - - git_vector_foreach(&data->statuses, i, status) - push_status_free(status); - - git_vector_free(&data->statuses); - - data->pack_progress_calls = 0; - data->transfer_progress_calls = 0; -} - -int record_update_tips_cb(const char *refname, const git_oid *a, const git_oid *b, void *data) -{ - updated_tip *t; - record_callbacks_data *record_data = (record_callbacks_data *)data; - - cl_assert(t = git__calloc(1, sizeof(*t))); - - cl_assert(t->name = git__strdup(refname)); - git_oid_cpy(&t->old_oid, a); - git_oid_cpy(&t->new_oid, b); - - git_vector_insert(&record_data->updated_tips, t); - - return 0; -} - -int create_deletion_refspecs(git_vector *out, const git_remote_head **heads, size_t heads_len) -{ - git_buf del_spec = GIT_BUF_INIT; - size_t i; - - for (i = 0; i < heads_len; i++) { - const git_remote_head *head = heads[i]; - /* Ignore malformed ref names (which also saves us from tag^{} */ - if (!git_reference_is_valid_name(head->name)) - return 0; - - /* Create a refspec that deletes a branch in the remote */ - if (strcmp(head->name, "refs/heads/master")) { - cl_git_pass(git_buf_putc(&del_spec, ':')); - cl_git_pass(git_buf_puts(&del_spec, head->name)); - cl_git_pass(git_vector_insert(out, git_buf_detach(&del_spec))); - } - } - - return 0; -} - -int record_ref_cb(git_remote_head *head, void *payload) -{ - git_vector *refs = (git_vector *) payload; - return git_vector_insert(refs, head); -} - -void verify_remote_refs(const git_remote_head *actual_refs[], size_t actual_refs_len, const expected_ref expected_refs[], size_t expected_refs_len) -{ - size_t i, j = 0; - git_buf msg = GIT_BUF_INIT; - const git_remote_head *actual; - char *oid_str; - bool master_present = false; - - /* We don't care whether "master" is present on the other end or not */ - for (i = 0; i < actual_refs_len; i++) { - actual = actual_refs[i]; - if (!strcmp(actual->name, "refs/heads/master")) { - master_present = true; - break; - } - } - - if (expected_refs_len + (master_present ? 1 : 0) != actual_refs_len) - goto failed; - - for (i = 0; i < actual_refs_len; i++) { - actual = actual_refs[i]; - if (master_present && !strcmp(actual->name, "refs/heads/master")) - continue; - - if (strcmp(expected_refs[j].name, actual->name) || - git_oid_cmp(expected_refs[j].oid, &actual->oid)) - goto failed; - - j++; - } - - return; - -failed: - git_buf_puts(&msg, "Expected and actual refs differ:\nEXPECTED:\n"); - - for(i = 0; i < expected_refs_len; i++) { - oid_str = git_oid_tostr_s(expected_refs[i].oid); - cl_git_pass(git_buf_printf(&msg, "%s = %s\n", expected_refs[i].name, oid_str)); - } - - git_buf_puts(&msg, "\nACTUAL:\n"); - for (i = 0; i < actual_refs_len; i++) { - actual = actual_refs[i]; - if (master_present && !strcmp(actual->name, "refs/heads/master")) - continue; - - oid_str = git_oid_tostr_s(&actual->oid); - cl_git_pass(git_buf_printf(&msg, "%s = %s\n", actual->name, oid_str)); - } - - cl_fail(git_buf_cstr(&msg)); - - git_buf_free(&msg); -} diff --git a/vendor/libgit2/tests/online/push_util.h b/vendor/libgit2/tests/online/push_util.h deleted file mode 100644 index 570873cfe..000000000 --- a/vendor/libgit2/tests/online/push_util.h +++ /dev/null @@ -1,83 +0,0 @@ -#ifndef INCLUDE_cl_push_util_h__ -#define INCLUDE_cl_push_util_h__ - -#include "git2/oid.h" - -/* Constant for zero oid */ -extern const git_oid OID_ZERO; - -/** - * Macro for initializing git_remote_callbacks to use test helpers that - * record data in a record_callbacks_data instance. - * @param data pointer to a record_callbacks_data instance - */ -#define RECORD_CALLBACKS_INIT(data) \ - { GIT_REMOTE_CALLBACKS_VERSION, NULL, NULL, cred_acquire_cb, NULL, NULL, record_update_tips_cb, NULL, NULL, NULL, NULL, NULL, data } - -typedef struct { - char *name; - git_oid old_oid; - git_oid new_oid; -} updated_tip; - -typedef struct { - git_vector updated_tips; - git_vector statuses; - int pack_progress_calls; - int transfer_progress_calls; -} record_callbacks_data; - -typedef struct { - const char *name; - const git_oid *oid; -} expected_ref; - -/* the results of a push status. when used for expected values, msg may be NULL - * to indicate that it should not be matched. */ -typedef struct { - char *ref; - int success; - char *msg; -} push_status; - - -void updated_tip_free(updated_tip *t); - -void record_callbacks_data_clear(record_callbacks_data *data); - -/** - * Callback for git_remote_update_tips that records updates - * - * @param data (git_vector *) of updated_tip instances - */ -int record_update_tips_cb(const char *refname, const git_oid *a, const git_oid *b, void *data); - -/** - * Create a set of refspecs that deletes each of the inputs - * - * @param out the vector in which to store the refspecs - * @param heads the remote heads - * @param heads_len the size of the array - */ -int create_deletion_refspecs(git_vector *out, const git_remote_head **heads, size_t heads_len); - -/** - * Callback for git_remote_list that adds refspecs to vector - * - * @param head a ref on the remote - * @param payload (git_vector *) of git_remote_head instances - */ -int record_ref_cb(git_remote_head *head, void *payload); - -/** - * Verifies that refs on remote stored by record_ref_cb match the expected - * names, oids, and order. - * - * @param actual_refs actual refs in the remote - * @param actual_refs_len length of actual_refs - * @param expected_refs expected remote refs - * @param expected_refs_len length of expected_refs - */ -void verify_remote_refs(const git_remote_head *actual_refs[], size_t actual_refs_len, const expected_ref expected_refs[], size_t expected_refs_len); - -#endif /* INCLUDE_cl_push_util_h__ */ diff --git a/vendor/libgit2/tests/online/remotes.c b/vendor/libgit2/tests/online/remotes.c deleted file mode 100644 index a86f2d9ae..000000000 --- a/vendor/libgit2/tests/online/remotes.c +++ /dev/null @@ -1,55 +0,0 @@ -#include "clar_libgit2.h" - -static const char *refspec = "refs/heads/first-merge:refs/remotes/origin/first-merge"; - -static int remote_single_branch(git_remote **out, git_repository *repo, const char *name, const char *url, void *payload) -{ - GIT_UNUSED(payload); - - cl_git_pass(git_remote_create_with_fetchspec(out, repo, name, url, refspec)); - - return 0; -} - -void test_online_remotes__single_branch(void) -{ - git_clone_options opts = GIT_CLONE_OPTIONS_INIT; - git_repository *repo; - git_remote *remote; - git_strarray refs; - size_t i, count = 0; - - opts.remote_cb = remote_single_branch; - opts.checkout_branch = "first-merge"; - - cl_git_pass(git_clone(&repo, "git://github.com/libgit2/TestGitRepository", "./single-branch", &opts)); - cl_git_pass(git_reference_list(&refs, repo)); - - for (i = 0; i < refs.count; i++) { - if (!git__prefixcmp(refs.strings[i], "refs/heads/")) - count++; - } - cl_assert_equal_i(1, count); - - git_strarray_free(&refs); - - cl_git_pass(git_remote_lookup(&remote, repo, "origin")); - cl_git_pass(git_remote_get_fetch_refspecs(&refs, remote)); - - cl_assert_equal_i(1, refs.count); - cl_assert_equal_s(refspec, refs.strings[0]); - - git_strarray_free(&refs); - git_remote_free(remote); - git_repository_free(repo); -} - -void test_online_remotes__restricted_refspecs(void) -{ - git_clone_options opts = GIT_CLONE_OPTIONS_INIT; - git_repository *repo; - - opts.remote_cb = remote_single_branch; - - cl_git_fail_with(GIT_EINVALIDSPEC, git_clone(&repo, "git://github.com/libgit2/TestGitRepository", "./restrict-refspec", &opts)); -} diff --git a/vendor/libgit2/tests/pack/indexer.c b/vendor/libgit2/tests/pack/indexer.c deleted file mode 100644 index 49a106d98..000000000 --- a/vendor/libgit2/tests/pack/indexer.c +++ /dev/null @@ -1,127 +0,0 @@ -#include "clar_libgit2.h" -#include -#include "fileops.h" -#include "hash.h" -#include "iterator.h" -#include "vector.h" -#include "posix.h" - - -/* - * This is a packfile with three objects. The second is a delta which - * depends on the third, which is also a delta. - */ -static const unsigned char out_of_order_pack[] = { - 0x50, 0x41, 0x43, 0x4b, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, - 0x32, 0x78, 0x9c, 0x63, 0x67, 0x00, 0x00, 0x00, 0x10, 0x00, 0x08, 0x76, - 0xe6, 0x8f, 0xe8, 0x12, 0x9b, 0x54, 0x6b, 0x10, 0x1a, 0xee, 0x95, 0x10, - 0xc5, 0x32, 0x8e, 0x7f, 0x21, 0xca, 0x1d, 0x18, 0x78, 0x9c, 0x63, 0x62, - 0x66, 0x4e, 0xcb, 0xcf, 0x07, 0x00, 0x02, 0xac, 0x01, 0x4d, 0x75, 0x01, - 0xd7, 0x71, 0x36, 0x66, 0xf4, 0xde, 0x82, 0x27, 0x76, 0xc7, 0x62, 0x2c, - 0x10, 0xf1, 0xb0, 0x7d, 0xe2, 0x80, 0xdc, 0x78, 0x9c, 0x63, 0x62, 0x62, - 0x62, 0xb7, 0x03, 0x00, 0x00, 0x69, 0x00, 0x4c, 0xde, 0x7d, 0xaa, 0xe4, - 0x19, 0x87, 0x58, 0x80, 0x61, 0x09, 0x9a, 0x33, 0xca, 0x7a, 0x31, 0x92, - 0x6f, 0xae, 0x66, 0x75 -}; -static const unsigned int out_of_order_pack_len = 112; - -/* - * Packfile with two objects. The second is a delta against an object - * which is not in the packfile - */ -static const unsigned char thin_pack[] = { - 0x50, 0x41, 0x43, 0x4b, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, - 0x32, 0x78, 0x9c, 0x63, 0x67, 0x00, 0x00, 0x00, 0x10, 0x00, 0x08, 0x76, - 0xe6, 0x8f, 0xe8, 0x12, 0x9b, 0x54, 0x6b, 0x10, 0x1a, 0xee, 0x95, 0x10, - 0xc5, 0x32, 0x8e, 0x7f, 0x21, 0xca, 0x1d, 0x18, 0x78, 0x9c, 0x63, 0x62, - 0x66, 0x4e, 0xcb, 0xcf, 0x07, 0x00, 0x02, 0xac, 0x01, 0x4d, 0x42, 0x52, - 0x3a, 0x6f, 0x39, 0xd1, 0xfe, 0x66, 0x68, 0x6b, 0xa5, 0xe5, 0xe2, 0x97, - 0xac, 0x94, 0x6c, 0x76, 0x0b, 0x04 -}; -static const unsigned int thin_pack_len = 78; - -static const unsigned char base_obj[] = { 07, 076 }; -static const unsigned int base_obj_len = 2; - -void test_pack_indexer__out_of_order(void) -{ - git_indexer *idx = 0; - git_transfer_progress stats = { 0 }; - - cl_git_pass(git_indexer_new(&idx, ".", 0, NULL, NULL, NULL)); - cl_git_pass(git_indexer_append( - idx, out_of_order_pack, out_of_order_pack_len, &stats)); - cl_git_pass(git_indexer_commit(idx, &stats)); - - cl_assert_equal_i(stats.total_objects, 3); - cl_assert_equal_i(stats.received_objects, 3); - cl_assert_equal_i(stats.indexed_objects, 3); - - git_indexer_free(idx); -} - -void test_pack_indexer__fix_thin(void) -{ - git_indexer *idx = NULL; - git_transfer_progress stats = { 0 }; - git_repository *repo; - git_odb *odb; - git_oid id, should_id; - - cl_git_pass(git_repository_init(&repo, "thin.git", true)); - cl_git_pass(git_repository_odb(&odb, repo)); - - /* Store the missing base into your ODB so the indexer can fix the pack */ - cl_git_pass(git_odb_write(&id, odb, base_obj, base_obj_len, GIT_OBJ_BLOB)); - git_oid_fromstr(&should_id, "e68fe8129b546b101aee9510c5328e7f21ca1d18"); - cl_assert_equal_oid(&should_id, &id); - - cl_git_pass(git_indexer_new(&idx, ".", 0, odb, NULL, NULL)); - cl_git_pass(git_indexer_append(idx, thin_pack, thin_pack_len, &stats)); - cl_git_pass(git_indexer_commit(idx, &stats)); - - cl_assert_equal_i(stats.total_objects, 2); - cl_assert_equal_i(stats.received_objects, 2); - cl_assert_equal_i(stats.indexed_objects, 2); - cl_assert_equal_i(stats.local_objects, 1); - - git_oid_fromstr(&should_id, "11f0f69b334728fdd8bc86b80499f22f29d85b15"); - cl_assert_equal_oid(&should_id, git_indexer_hash(idx)); - - git_indexer_free(idx); - git_odb_free(odb); - git_repository_free(repo); - - /* - * The pack's name/hash only tells us what objects there are, - * so we need to go through the packfile again in order to - * figure out whether we calculated the trailer correctly. - */ - { - unsigned char buffer[128]; - int fd; - ssize_t read; - struct stat st; - const char *name = "pack-11f0f69b334728fdd8bc86b80499f22f29d85b15.pack"; - - fd = p_open(name, O_RDONLY); - cl_assert(fd != -1); - - cl_git_pass(p_stat(name, &st)); - - cl_git_pass(git_indexer_new(&idx, ".", 0, NULL, NULL, NULL)); - read = p_read(fd, buffer, sizeof(buffer)); - cl_assert(read != -1); - p_close(fd); - - cl_git_pass(git_indexer_append(idx, buffer, read, &stats)); - cl_git_pass(git_indexer_commit(idx, &stats)); - - cl_assert_equal_i(stats.total_objects, 3); - cl_assert_equal_i(stats.received_objects, 3); - cl_assert_equal_i(stats.indexed_objects, 3); - cl_assert_equal_i(stats.local_objects, 0); - - git_indexer_free(idx); - } -} diff --git a/vendor/libgit2/tests/pack/packbuilder.c b/vendor/libgit2/tests/pack/packbuilder.c deleted file mode 100644 index 29f3e2d64..000000000 --- a/vendor/libgit2/tests/pack/packbuilder.c +++ /dev/null @@ -1,225 +0,0 @@ -#include "clar_libgit2.h" -#include "fileops.h" -#include "pack.h" -#include "hash.h" -#include "iterator.h" -#include "vector.h" -#include "posix.h" - -static git_repository *_repo; -static git_revwalk *_revwalker; -static git_packbuilder *_packbuilder; -static git_indexer *_indexer; -static git_vector _commits; -static int _commits_is_initialized; -static git_transfer_progress _stats; - -void test_pack_packbuilder__initialize(void) -{ - _repo = cl_git_sandbox_init("testrepo.git"); - cl_git_pass(p_chdir("testrepo.git")); - cl_git_pass(git_revwalk_new(&_revwalker, _repo)); - cl_git_pass(git_packbuilder_new(&_packbuilder, _repo)); - cl_git_pass(git_vector_init(&_commits, 0, NULL)); - _commits_is_initialized = 1; - memset(&_stats, 0, sizeof(_stats)); -} - -void test_pack_packbuilder__cleanup(void) -{ - git_oid *o; - unsigned int i; - - if (_commits_is_initialized) { - _commits_is_initialized = 0; - git_vector_foreach(&_commits, i, o) { - git__free(o); - } - git_vector_free(&_commits); - } - - git_packbuilder_free(_packbuilder); - _packbuilder = NULL; - - git_revwalk_free(_revwalker); - _revwalker = NULL; - - git_indexer_free(_indexer); - _indexer = NULL; - - cl_git_pass(p_chdir("..")); - cl_git_sandbox_cleanup(); - _repo = NULL; -} - -static void seed_packbuilder(void) -{ - git_oid oid, *o; - unsigned int i; - - git_revwalk_sorting(_revwalker, GIT_SORT_TIME); - cl_git_pass(git_revwalk_push_ref(_revwalker, "HEAD")); - - while (git_revwalk_next(&oid, _revwalker) == 0) { - o = git__malloc(GIT_OID_RAWSZ); - cl_assert(o != NULL); - git_oid_cpy(o, &oid); - cl_git_pass(git_vector_insert(&_commits, o)); - } - - git_vector_foreach(&_commits, i, o) { - cl_git_pass(git_packbuilder_insert(_packbuilder, o, NULL)); - } - - git_vector_foreach(&_commits, i, o) { - git_object *obj; - cl_git_pass(git_object_lookup(&obj, _repo, o, GIT_OBJ_COMMIT)); - cl_git_pass(git_packbuilder_insert_tree(_packbuilder, - git_commit_tree_id((git_commit *)obj))); - git_object_free(obj); - } -} - -static int feed_indexer(void *ptr, size_t len, void *payload) -{ - git_transfer_progress *stats = (git_transfer_progress *)payload; - - return git_indexer_append(_indexer, ptr, len, stats); -} - -void test_pack_packbuilder__create_pack(void) -{ - git_transfer_progress stats; - git_buf buf = GIT_BUF_INIT, path = GIT_BUF_INIT; - git_hash_ctx ctx; - git_oid hash; - char hex[GIT_OID_HEXSZ+1]; hex[GIT_OID_HEXSZ] = '\0'; - - seed_packbuilder(); - - cl_git_pass(git_indexer_new(&_indexer, ".", 0, NULL, NULL, NULL)); - cl_git_pass(git_packbuilder_foreach(_packbuilder, feed_indexer, &stats)); - cl_git_pass(git_indexer_commit(_indexer, &stats)); - - git_oid_fmt(hex, git_indexer_hash(_indexer)); - git_buf_printf(&path, "pack-%s.pack", hex); - - /* - * By default, packfiles are created with only one thread. - * Therefore we can predict the object ordering and make sure - * we create exactly the same pack as git.git does when *not* - * reusing existing deltas (as libgit2). - * - * $ cd tests/resources/testrepo.git - * $ git rev-list --objects HEAD | \ - * git pack-objects -q --no-reuse-delta --threads=1 pack - * $ sha1sum git-80e61eb315239ef3c53033e37fee43b744d57122.pack - * 5d410bdf97cf896f9007681b92868471d636954b - * - */ - - cl_git_pass(git_futils_readbuffer(&buf, git_buf_cstr(&path))); - - cl_git_pass(git_hash_ctx_init(&ctx)); - cl_git_pass(git_hash_update(&ctx, buf.ptr, buf.size)); - cl_git_pass(git_hash_final(&hash, &ctx)); - git_hash_ctx_cleanup(&ctx); - - git_buf_free(&path); - git_buf_free(&buf); - - git_oid_fmt(hex, &hash); - - cl_assert_equal_s(hex, "5d410bdf97cf896f9007681b92868471d636954b"); -} - -void test_pack_packbuilder__get_hash(void) -{ - char hex[GIT_OID_HEXSZ+1]; hex[GIT_OID_HEXSZ] = '\0'; - - seed_packbuilder(); - - git_packbuilder_write(_packbuilder, ".", 0, NULL, NULL); - git_oid_fmt(hex, git_packbuilder_hash(_packbuilder)); - - cl_assert_equal_s(hex, "80e61eb315239ef3c53033e37fee43b744d57122"); -} - -static void test_write_pack_permission(mode_t given, mode_t expected) -{ - struct stat statbuf; - mode_t mask, os_mask; - - seed_packbuilder(); - - git_packbuilder_write(_packbuilder, ".", given, NULL, NULL); - - /* Windows does not return group/user bits from stat, - * files are never executable. - */ -#ifdef GIT_WIN32 - os_mask = 0600; -#else - os_mask = 0777; -#endif - - mask = p_umask(0); - p_umask(mask); - - cl_git_pass(p_stat("pack-80e61eb315239ef3c53033e37fee43b744d57122.idx", &statbuf)); - cl_assert_equal_i(statbuf.st_mode & os_mask, (expected & ~mask) & os_mask); - - cl_git_pass(p_stat("pack-80e61eb315239ef3c53033e37fee43b744d57122.pack", &statbuf)); - cl_assert_equal_i(statbuf.st_mode & os_mask, (expected & ~mask) & os_mask); -} - -void test_pack_packbuilder__permissions_standard(void) -{ - test_write_pack_permission(0, GIT_PACK_FILE_MODE); -} - -void test_pack_packbuilder__permissions_readonly(void) -{ - test_write_pack_permission(0444, 0444); -} - -void test_pack_packbuilder__permissions_readwrite(void) -{ - test_write_pack_permission(0666, 0666); -} - -static int foreach_cb(void *buf, size_t len, void *payload) -{ - git_indexer *idx = (git_indexer *) payload; - cl_git_pass(git_indexer_append(idx, buf, len, &_stats)); - return 0; -} - -void test_pack_packbuilder__foreach(void) -{ - git_indexer *idx; - - seed_packbuilder(); - cl_git_pass(git_indexer_new(&idx, ".", 0, NULL, NULL, NULL)); - cl_git_pass(git_packbuilder_foreach(_packbuilder, foreach_cb, idx)); - cl_git_pass(git_indexer_commit(idx, &_stats)); - git_indexer_free(idx); -} - -static int foreach_cancel_cb(void *buf, size_t len, void *payload) -{ - git_indexer *idx = (git_indexer *)payload; - cl_git_pass(git_indexer_append(idx, buf, len, &_stats)); - return (_stats.total_objects > 2) ? -1111 : 0; -} - -void test_pack_packbuilder__foreach_with_cancel(void) -{ - git_indexer *idx; - - seed_packbuilder(); - cl_git_pass(git_indexer_new(&idx, ".", 0, NULL, NULL, NULL)); - cl_git_fail_with( - git_packbuilder_foreach(_packbuilder, foreach_cancel_cb, idx), -1111); - git_indexer_free(idx); -} diff --git a/vendor/libgit2/tests/pack/sharing.c b/vendor/libgit2/tests/pack/sharing.c deleted file mode 100644 index a67d65588..000000000 --- a/vendor/libgit2/tests/pack/sharing.c +++ /dev/null @@ -1,42 +0,0 @@ -#include "clar_libgit2.h" -#include -#include "strmap.h" -#include "mwindow.h" -#include "pack.h" - -extern git_strmap *git__pack_cache; - -void test_pack_sharing__open_two_repos(void) -{ - git_repository *repo1, *repo2; - git_object *obj1, *obj2; - git_oid id; - git_strmap_iter pos; - void *data; - int error; - - cl_git_pass(git_repository_open(&repo1, cl_fixture("testrepo.git"))); - cl_git_pass(git_repository_open(&repo2, cl_fixture("testrepo.git"))); - - git_oid_fromstr(&id, "a65fedf39aefe402d3bb6e24df4d4f5fe4547750"); - - cl_git_pass(git_object_lookup(&obj1, repo1, &id, GIT_OBJ_ANY)); - cl_git_pass(git_object_lookup(&obj2, repo2, &id, GIT_OBJ_ANY)); - - pos = 0; - while ((error = git_strmap_next(&data, &pos, git__pack_cache)) == 0) { - struct git_pack_file *pack = (struct git_pack_file *) data; - - cl_assert_equal_i(2, pack->refcount.val); - } - - cl_assert_equal_i(3, git_strmap_num_entries(git__pack_cache)); - - git_object_free(obj1); - git_object_free(obj2); - git_repository_free(repo1); - git_repository_free(repo2); - - /* we don't want to keep the packs open after the repos go away */ - cl_assert_equal_i(0, git_strmap_num_entries(git__pack_cache)); -} diff --git a/vendor/libgit2/tests/path/core.c b/vendor/libgit2/tests/path/core.c deleted file mode 100644 index 3dccfe5fb..000000000 --- a/vendor/libgit2/tests/path/core.c +++ /dev/null @@ -1,354 +0,0 @@ -#include "clar_libgit2.h" -#include "path.h" - -static void test_make_relative( - const char *expected_path, - const char *path, - const char *parent, - int expected_status) -{ - git_buf buf = GIT_BUF_INIT; - git_buf_puts(&buf, path); - cl_assert_equal_i(expected_status, git_path_make_relative(&buf, parent)); - cl_assert_equal_s(expected_path, buf.ptr); - git_buf_free(&buf); -} - -void test_path_core__make_relative(void) -{ - test_make_relative("foo.c", "/path/to/foo.c", "/path/to", 0); - test_make_relative("bar/foo.c", "/path/to/bar/foo.c", "/path/to", 0); - test_make_relative("foo.c", "/path/to/foo.c", "/path/to/", 0); - - test_make_relative("", "/path/to", "/path/to", 0); - test_make_relative("", "/path/to", "/path/to/", 0); - - test_make_relative("../", "/path/to", "/path/to/foo", 0); - - test_make_relative("../foo.c", "/path/to/foo.c", "/path/to/bar", 0); - test_make_relative("../bar/foo.c", "/path/to/bar/foo.c", "/path/to/baz", 0); - - test_make_relative("../../foo.c", "/path/to/foo.c", "/path/to/foo/bar", 0); - test_make_relative("../../foo/bar.c", "/path/to/foo/bar.c", "/path/to/bar/foo", 0); - - test_make_relative("../../foo.c", "/foo.c", "/bar/foo", 0); - - test_make_relative("foo.c", "/path/to/foo.c", "/path/to/", 0); - test_make_relative("../foo.c", "/path/to/foo.c", "/path/to/bar/", 0); - - test_make_relative("foo.c", "d:/path/to/foo.c", "d:/path/to", 0); - - test_make_relative("../foo", "/foo", "/bar", 0); - test_make_relative("path/to/foo.c", "/path/to/foo.c", "/", 0); - test_make_relative("../foo", "path/to/foo", "path/to/bar", 0); - - test_make_relative("/path/to/foo.c", "/path/to/foo.c", "d:/path/to", GIT_ENOTFOUND); - test_make_relative("d:/path/to/foo.c", "d:/path/to/foo.c", "/path/to", GIT_ENOTFOUND); - - test_make_relative("/path/to/foo.c", "/path/to/foo.c", "not-a-rooted-path", GIT_ENOTFOUND); - test_make_relative("not-a-rooted-path", "not-a-rooted-path", "/path/to", GIT_ENOTFOUND); - - test_make_relative("/path", "/path", "pathtofoo", GIT_ENOTFOUND); - test_make_relative("path", "path", "pathtofoo", GIT_ENOTFOUND); -} - -void test_path_core__isvalid_standard(void) -{ - cl_assert_equal_b(true, git_path_isvalid(NULL, "foo/bar", 0)); - cl_assert_equal_b(true, git_path_isvalid(NULL, "foo/bar/file.txt", 0)); - cl_assert_equal_b(true, git_path_isvalid(NULL, "foo/bar/.file", 0)); -} - -void test_path_core__isvalid_empty_dir_component(void) -{ - cl_assert_equal_b(false, git_path_isvalid(NULL, "foo//bar", 0)); - - /* leading slash */ - cl_assert_equal_b(false, git_path_isvalid(NULL, "/", 0)); - cl_assert_equal_b(false, git_path_isvalid(NULL, "/foo", 0)); - cl_assert_equal_b(false, git_path_isvalid(NULL, "/foo/bar", 0)); - - /* trailing slash */ - cl_assert_equal_b(false, git_path_isvalid(NULL, "foo/", 0)); - cl_assert_equal_b(false, git_path_isvalid(NULL, "foo/bar/", 0)); -} - -void test_path_core__isvalid_dot_and_dotdot(void) -{ - cl_assert_equal_b(true, git_path_isvalid(NULL, ".", 0)); - cl_assert_equal_b(true, git_path_isvalid(NULL, "./foo", 0)); - cl_assert_equal_b(true, git_path_isvalid(NULL, "foo/.", 0)); - cl_assert_equal_b(true, git_path_isvalid(NULL, "./foo", 0)); - - cl_assert_equal_b(true, git_path_isvalid(NULL, "..", 0)); - cl_assert_equal_b(true, git_path_isvalid(NULL, "../foo", 0)); - cl_assert_equal_b(true, git_path_isvalid(NULL, "foo/..", 0)); - cl_assert_equal_b(true, git_path_isvalid(NULL, "../foo", 0)); - - cl_assert_equal_b(false, git_path_isvalid(NULL, ".", GIT_PATH_REJECT_TRAVERSAL)); - cl_assert_equal_b(false, git_path_isvalid(NULL, "./foo", GIT_PATH_REJECT_TRAVERSAL)); - cl_assert_equal_b(false, git_path_isvalid(NULL, "foo/.", GIT_PATH_REJECT_TRAVERSAL)); - cl_assert_equal_b(false, git_path_isvalid(NULL, "./foo", GIT_PATH_REJECT_TRAVERSAL)); - - cl_assert_equal_b(false, git_path_isvalid(NULL, "..", GIT_PATH_REJECT_TRAVERSAL)); - cl_assert_equal_b(false, git_path_isvalid(NULL, "../foo", GIT_PATH_REJECT_TRAVERSAL)); - cl_assert_equal_b(false, git_path_isvalid(NULL, "foo/..", GIT_PATH_REJECT_TRAVERSAL)); - cl_assert_equal_b(false, git_path_isvalid(NULL, "../foo", GIT_PATH_REJECT_TRAVERSAL)); -} - -void test_path_core__isvalid_dot_git(void) -{ - cl_assert_equal_b(true, git_path_isvalid(NULL, ".git", 0)); - cl_assert_equal_b(true, git_path_isvalid(NULL, ".git/foo", 0)); - cl_assert_equal_b(true, git_path_isvalid(NULL, "foo/.git", 0)); - cl_assert_equal_b(true, git_path_isvalid(NULL, "foo/.git/bar", 0)); - cl_assert_equal_b(true, git_path_isvalid(NULL, "foo/.GIT/bar", 0)); - cl_assert_equal_b(true, git_path_isvalid(NULL, "foo/bar/.Git", 0)); - - cl_assert_equal_b(false, git_path_isvalid(NULL, ".git", GIT_PATH_REJECT_DOT_GIT_LITERAL)); - cl_assert_equal_b(false, git_path_isvalid(NULL, ".git/foo", GIT_PATH_REJECT_DOT_GIT_LITERAL)); - cl_assert_equal_b(false, git_path_isvalid(NULL, "foo/.git", GIT_PATH_REJECT_DOT_GIT_LITERAL)); - cl_assert_equal_b(false, git_path_isvalid(NULL, "foo/.git/bar", GIT_PATH_REJECT_DOT_GIT_LITERAL)); - cl_assert_equal_b(false, git_path_isvalid(NULL, "foo/.GIT/bar", GIT_PATH_REJECT_DOT_GIT_LITERAL)); - cl_assert_equal_b(false, git_path_isvalid(NULL, "foo/bar/.Git", GIT_PATH_REJECT_DOT_GIT_LITERAL)); - - cl_assert_equal_b(true, git_path_isvalid(NULL, "!git", 0)); - cl_assert_equal_b(true, git_path_isvalid(NULL, "foo/!git", 0)); - cl_assert_equal_b(true, git_path_isvalid(NULL, "!git/bar", 0)); - cl_assert_equal_b(true, git_path_isvalid(NULL, ".tig", 0)); - cl_assert_equal_b(true, git_path_isvalid(NULL, "foo/.tig", 0)); - cl_assert_equal_b(true, git_path_isvalid(NULL, ".tig/bar", 0)); -} - -void test_path_core__isvalid_backslash(void) -{ - cl_assert_equal_b(true, git_path_isvalid(NULL, "foo\\file.txt", 0)); - cl_assert_equal_b(true, git_path_isvalid(NULL, "foo/bar\\file.txt", 0)); - cl_assert_equal_b(true, git_path_isvalid(NULL, "foo/bar\\", 0)); - - cl_assert_equal_b(false, git_path_isvalid(NULL, "foo\\file.txt", GIT_PATH_REJECT_BACKSLASH)); - cl_assert_equal_b(false, git_path_isvalid(NULL, "foo/bar\\file.txt", GIT_PATH_REJECT_BACKSLASH)); - cl_assert_equal_b(false, git_path_isvalid(NULL, "foo/bar\\", GIT_PATH_REJECT_BACKSLASH)); -} - -void test_path_core__isvalid_trailing_dot(void) -{ - cl_assert_equal_b(true, git_path_isvalid(NULL, "foo.", 0)); - cl_assert_equal_b(true, git_path_isvalid(NULL, "foo...", 0)); - cl_assert_equal_b(true, git_path_isvalid(NULL, "foo/bar.", 0)); - cl_assert_equal_b(true, git_path_isvalid(NULL, "foo./bar", 0)); - - cl_assert_equal_b(false, git_path_isvalid(NULL, "foo.", GIT_PATH_REJECT_TRAILING_DOT)); - cl_assert_equal_b(false, git_path_isvalid(NULL, "foo...", GIT_PATH_REJECT_TRAILING_DOT)); - cl_assert_equal_b(false, git_path_isvalid(NULL, "foo/bar.", GIT_PATH_REJECT_TRAILING_DOT)); - cl_assert_equal_b(false, git_path_isvalid(NULL, "foo./bar", GIT_PATH_REJECT_TRAILING_DOT)); -} - -void test_path_core__isvalid_trailing_space(void) -{ - cl_assert_equal_b(true, git_path_isvalid(NULL, "foo ", 0)); - cl_assert_equal_b(true, git_path_isvalid(NULL, "foo ", 0)); - cl_assert_equal_b(true, git_path_isvalid(NULL, "foo/bar ", 0)); - cl_assert_equal_b(true, git_path_isvalid(NULL, " ", 0)); - cl_assert_equal_b(true, git_path_isvalid(NULL, "foo /bar", 0)); - - cl_assert_equal_b(false, git_path_isvalid(NULL, "foo ", GIT_PATH_REJECT_TRAILING_SPACE)); - cl_assert_equal_b(false, git_path_isvalid(NULL, "foo ", GIT_PATH_REJECT_TRAILING_SPACE)); - cl_assert_equal_b(false, git_path_isvalid(NULL, "foo/bar ", GIT_PATH_REJECT_TRAILING_SPACE)); - cl_assert_equal_b(false, git_path_isvalid(NULL, " ", GIT_PATH_REJECT_TRAILING_SPACE)); - cl_assert_equal_b(false, git_path_isvalid(NULL, "foo /bar", GIT_PATH_REJECT_TRAILING_SPACE)); -} - -void test_path_core__isvalid_trailing_colon(void) -{ - cl_assert_equal_b(true, git_path_isvalid(NULL, "foo:", 0)); - cl_assert_equal_b(true, git_path_isvalid(NULL, "foo/bar:", 0)); - cl_assert_equal_b(true, git_path_isvalid(NULL, ":", 0)); - cl_assert_equal_b(true, git_path_isvalid(NULL, "foo:/bar", 0)); - - cl_assert_equal_b(false, git_path_isvalid(NULL, "foo:", GIT_PATH_REJECT_TRAILING_COLON)); - cl_assert_equal_b(false, git_path_isvalid(NULL, "foo/bar:", GIT_PATH_REJECT_TRAILING_COLON)); - cl_assert_equal_b(false, git_path_isvalid(NULL, ":", GIT_PATH_REJECT_TRAILING_COLON)); - cl_assert_equal_b(false, git_path_isvalid(NULL, "foo:/bar", GIT_PATH_REJECT_TRAILING_COLON)); -} - -void test_path_core__isvalid_dotgit_ntfs(void) -{ - cl_assert_equal_b(true, git_path_isvalid(NULL, ".git", 0)); - cl_assert_equal_b(true, git_path_isvalid(NULL, ".git ", 0)); - cl_assert_equal_b(true, git_path_isvalid(NULL, ".git.", 0)); - cl_assert_equal_b(true, git_path_isvalid(NULL, ".git.. .", 0)); - - cl_assert_equal_b(true, git_path_isvalid(NULL, "git~1", 0)); - cl_assert_equal_b(true, git_path_isvalid(NULL, "git~1 ", 0)); - cl_assert_equal_b(true, git_path_isvalid(NULL, "git~1.", 0)); - cl_assert_equal_b(true, git_path_isvalid(NULL, "git~1.. .", 0)); - - cl_assert_equal_b(false, git_path_isvalid(NULL, ".git", GIT_PATH_REJECT_DOT_GIT_NTFS)); - cl_assert_equal_b(false, git_path_isvalid(NULL, ".git ", GIT_PATH_REJECT_DOT_GIT_NTFS)); - cl_assert_equal_b(false, git_path_isvalid(NULL, ".git.", GIT_PATH_REJECT_DOT_GIT_NTFS)); - cl_assert_equal_b(false, git_path_isvalid(NULL, ".git.. .", GIT_PATH_REJECT_DOT_GIT_NTFS)); - - cl_assert_equal_b(false, git_path_isvalid(NULL, "git~1", GIT_PATH_REJECT_DOT_GIT_NTFS)); - cl_assert_equal_b(false, git_path_isvalid(NULL, "git~1 ", GIT_PATH_REJECT_DOT_GIT_NTFS)); - cl_assert_equal_b(false, git_path_isvalid(NULL, "git~1.", GIT_PATH_REJECT_DOT_GIT_NTFS)); - cl_assert_equal_b(false, git_path_isvalid(NULL, "git~1.. .", GIT_PATH_REJECT_DOT_GIT_NTFS)); -} - -void test_path_core__isvalid_dos_paths(void) -{ - cl_assert_equal_b(true, git_path_isvalid(NULL, "aux", 0)); - cl_assert_equal_b(true, git_path_isvalid(NULL, "aux.", 0)); - cl_assert_equal_b(true, git_path_isvalid(NULL, "aux:", 0)); - cl_assert_equal_b(true, git_path_isvalid(NULL, "aux.asdf", 0)); - cl_assert_equal_b(true, git_path_isvalid(NULL, "aux.asdf\\zippy", 0)); - cl_assert_equal_b(true, git_path_isvalid(NULL, "aux:asdf\\foobar", 0)); - cl_assert_equal_b(true, git_path_isvalid(NULL, "con", 0)); - cl_assert_equal_b(true, git_path_isvalid(NULL, "prn", 0)); - cl_assert_equal_b(true, git_path_isvalid(NULL, "nul", 0)); - - cl_assert_equal_b(false, git_path_isvalid(NULL, "aux", GIT_PATH_REJECT_DOS_PATHS)); - cl_assert_equal_b(false, git_path_isvalid(NULL, "aux.", GIT_PATH_REJECT_DOS_PATHS)); - cl_assert_equal_b(false, git_path_isvalid(NULL, "aux:", GIT_PATH_REJECT_DOS_PATHS)); - cl_assert_equal_b(false, git_path_isvalid(NULL, "aux.asdf", GIT_PATH_REJECT_DOS_PATHS)); - cl_assert_equal_b(false, git_path_isvalid(NULL, "aux.asdf\\zippy", GIT_PATH_REJECT_DOS_PATHS)); - cl_assert_equal_b(false, git_path_isvalid(NULL, "aux:asdf\\foobar", GIT_PATH_REJECT_DOS_PATHS)); - cl_assert_equal_b(false, git_path_isvalid(NULL, "con", GIT_PATH_REJECT_DOS_PATHS)); - cl_assert_equal_b(false, git_path_isvalid(NULL, "prn", GIT_PATH_REJECT_DOS_PATHS)); - cl_assert_equal_b(false, git_path_isvalid(NULL, "nul", GIT_PATH_REJECT_DOS_PATHS)); - - cl_assert_equal_b(true, git_path_isvalid(NULL, "aux1", 0)); - cl_assert_equal_b(true, git_path_isvalid(NULL, "aux1", GIT_PATH_REJECT_DOS_PATHS)); - cl_assert_equal_b(true, git_path_isvalid(NULL, "auxn", GIT_PATH_REJECT_DOS_PATHS)); - cl_assert_equal_b(true, git_path_isvalid(NULL, "aux\\foo", GIT_PATH_REJECT_DOS_PATHS)); -} - -void test_path_core__isvalid_dos_paths_withnum(void) -{ - cl_assert_equal_b(true, git_path_isvalid(NULL, "com1", 0)); - cl_assert_equal_b(true, git_path_isvalid(NULL, "com1.", 0)); - cl_assert_equal_b(true, git_path_isvalid(NULL, "com1:", 0)); - cl_assert_equal_b(true, git_path_isvalid(NULL, "com1.asdf", 0)); - cl_assert_equal_b(true, git_path_isvalid(NULL, "com1.asdf\\zippy", 0)); - cl_assert_equal_b(true, git_path_isvalid(NULL, "com1:asdf\\foobar", 0)); - cl_assert_equal_b(true, git_path_isvalid(NULL, "com1\\foo", 0)); - cl_assert_equal_b(true, git_path_isvalid(NULL, "lpt1", 0)); - - cl_assert_equal_b(false, git_path_isvalid(NULL, "com1", GIT_PATH_REJECT_DOS_PATHS)); - cl_assert_equal_b(false, git_path_isvalid(NULL, "com1.", GIT_PATH_REJECT_DOS_PATHS)); - cl_assert_equal_b(false, git_path_isvalid(NULL, "com1:", GIT_PATH_REJECT_DOS_PATHS)); - cl_assert_equal_b(false, git_path_isvalid(NULL, "com1.asdf", GIT_PATH_REJECT_DOS_PATHS)); - cl_assert_equal_b(false, git_path_isvalid(NULL, "com1.asdf\\zippy", GIT_PATH_REJECT_DOS_PATHS)); - cl_assert_equal_b(false, git_path_isvalid(NULL, "com1:asdf\\foobar", GIT_PATH_REJECT_DOS_PATHS)); - cl_assert_equal_b(false, git_path_isvalid(NULL, "com1/foo", GIT_PATH_REJECT_DOS_PATHS)); - cl_assert_equal_b(false, git_path_isvalid(NULL, "lpt1", GIT_PATH_REJECT_DOS_PATHS)); - - cl_assert_equal_b(true, git_path_isvalid(NULL, "com0", 0)); - cl_assert_equal_b(true, git_path_isvalid(NULL, "com0", GIT_PATH_REJECT_DOS_PATHS)); - cl_assert_equal_b(true, git_path_isvalid(NULL, "com10", 0)); - cl_assert_equal_b(true, git_path_isvalid(NULL, "com10", GIT_PATH_REJECT_DOS_PATHS)); - cl_assert_equal_b(true, git_path_isvalid(NULL, "comn", GIT_PATH_REJECT_DOS_PATHS)); - cl_assert_equal_b(true, git_path_isvalid(NULL, "com1\\foo", GIT_PATH_REJECT_DOS_PATHS)); - cl_assert_equal_b(true, git_path_isvalid(NULL, "lpt0", GIT_PATH_REJECT_DOS_PATHS)); - cl_assert_equal_b(true, git_path_isvalid(NULL, "lpt10", GIT_PATH_REJECT_DOS_PATHS)); - cl_assert_equal_b(true, git_path_isvalid(NULL, "lptn", GIT_PATH_REJECT_DOS_PATHS)); -} - -void test_path_core__isvalid_nt_chars(void) -{ - cl_assert_equal_b(true, git_path_isvalid(NULL, "asdf\001foo", 0)); - cl_assert_equal_b(true, git_path_isvalid(NULL, "asdf\037bar", 0)); - cl_assert_equal_b(true, git_path_isvalid(NULL, "asdffoo", 0)); - cl_assert_equal_b(true, git_path_isvalid(NULL, "asdf:foo", 0)); - cl_assert_equal_b(true, git_path_isvalid(NULL, "asdf\"bar", 0)); - cl_assert_equal_b(true, git_path_isvalid(NULL, "asdf|foo", 0)); - cl_assert_equal_b(true, git_path_isvalid(NULL, "asdf?bar", 0)); - cl_assert_equal_b(true, git_path_isvalid(NULL, "asdf*bar", 0)); - - cl_assert_equal_b(false, git_path_isvalid(NULL, "asdf\001foo", GIT_PATH_REJECT_NT_CHARS)); - cl_assert_equal_b(false, git_path_isvalid(NULL, "asdf\037bar", GIT_PATH_REJECT_NT_CHARS)); - cl_assert_equal_b(false, git_path_isvalid(NULL, "asdffoo", GIT_PATH_REJECT_NT_CHARS)); - cl_assert_equal_b(false, git_path_isvalid(NULL, "asdf:foo", GIT_PATH_REJECT_NT_CHARS)); - cl_assert_equal_b(false, git_path_isvalid(NULL, "asdf\"bar", GIT_PATH_REJECT_NT_CHARS)); - cl_assert_equal_b(false, git_path_isvalid(NULL, "asdf|foo", GIT_PATH_REJECT_NT_CHARS)); - cl_assert_equal_b(false, git_path_isvalid(NULL, "asdf?bar", GIT_PATH_REJECT_NT_CHARS)); - cl_assert_equal_b(false, git_path_isvalid(NULL, "asdf*bar", GIT_PATH_REJECT_NT_CHARS)); -} - -void test_path_core__isvalid_dotgit_with_hfs_ignorables(void) -{ - cl_assert_equal_b(false, git_path_isvalid(NULL, ".git", GIT_PATH_REJECT_DOT_GIT_HFS)); - cl_assert_equal_b(false, git_path_isvalid(NULL, ".git\xe2\x80\x8c", GIT_PATH_REJECT_DOT_GIT_HFS)); - cl_assert_equal_b(false, git_path_isvalid(NULL, ".gi\xe2\x80\x8dT", GIT_PATH_REJECT_DOT_GIT_HFS)); - cl_assert_equal_b(false, git_path_isvalid(NULL, ".g\xe2\x80\x8eIt", GIT_PATH_REJECT_DOT_GIT_HFS)); - cl_assert_equal_b(false, git_path_isvalid(NULL, ".\xe2\x80\x8fgIt", GIT_PATH_REJECT_DOT_GIT_HFS)); - cl_assert_equal_b(false, git_path_isvalid(NULL, "\xe2\x80\xaa.gIt", GIT_PATH_REJECT_DOT_GIT_HFS)); - - cl_assert_equal_b(false, git_path_isvalid(NULL, "\xe2\x80\xab.\xe2\x80\xacG\xe2\x80\xadI\xe2\x80\xaet", GIT_PATH_REJECT_DOT_GIT_HFS)); - cl_assert_equal_b(false, git_path_isvalid(NULL, "\xe2\x81\xab.\xe2\x80\xaaG\xe2\x81\xabI\xe2\x80\xact", GIT_PATH_REJECT_DOT_GIT_HFS)); - cl_assert_equal_b(false, git_path_isvalid(NULL, "\xe2\x81\xad.\xe2\x80\xaeG\xef\xbb\xbfIT", GIT_PATH_REJECT_DOT_GIT_HFS)); - - cl_assert_equal_b(true, git_path_isvalid(NULL, ".", GIT_PATH_REJECT_DOT_GIT_HFS)); - cl_assert_equal_b(true, git_path_isvalid(NULL, ".g", GIT_PATH_REJECT_DOT_GIT_HFS)); - cl_assert_equal_b(true, git_path_isvalid(NULL, ".gi", GIT_PATH_REJECT_DOT_GIT_HFS)); - cl_assert_equal_b(true, git_path_isvalid(NULL, " .git", GIT_PATH_REJECT_DOT_GIT_HFS)); - cl_assert_equal_b(true, git_path_isvalid(NULL, "..git\xe2\x80\x8c", GIT_PATH_REJECT_DOT_GIT_HFS)); - cl_assert_equal_b(true, git_path_isvalid(NULL, ".gi\xe2\x80\x8dT.", GIT_PATH_REJECT_DOT_GIT_HFS)); - cl_assert_equal_b(true, git_path_isvalid(NULL, ".g\xe2\x80It", GIT_PATH_REJECT_DOT_GIT_HFS)); - cl_assert_equal_b(true, git_path_isvalid(NULL, ".\xe2gIt", GIT_PATH_REJECT_DOT_GIT_HFS)); - cl_assert_equal_b(true, git_path_isvalid(NULL, "\xe2\x80\xaa.gi", GIT_PATH_REJECT_DOT_GIT_HFS)); - cl_assert_equal_b(true, git_path_isvalid(NULL, ".gi\x80\x8dT", GIT_PATH_REJECT_DOT_GIT_HFS)); - cl_assert_equal_b(true, git_path_isvalid(NULL, ".gi\x8dT", GIT_PATH_REJECT_DOT_GIT_HFS)); - cl_assert_equal_b(true, git_path_isvalid(NULL, ".g\xe2i\x80T\x8e", GIT_PATH_REJECT_DOT_GIT_HFS)); - cl_assert_equal_b(true, git_path_isvalid(NULL, ".git\xe2\x80\xbf", GIT_PATH_REJECT_DOT_GIT_HFS)); - cl_assert_equal_b(true, git_path_isvalid(NULL, ".git\xe2\xab\x81", GIT_PATH_REJECT_DOT_GIT_HFS)); -} - -static void test_join_unrooted( - const char *expected_result, - ssize_t expected_rootlen, - const char *path, - const char *base) -{ - git_buf result = GIT_BUF_INIT; - ssize_t root_at; - - cl_git_pass(git_path_join_unrooted(&result, path, base, &root_at)); - cl_assert_equal_s(expected_result, result.ptr); - cl_assert_equal_i(expected_rootlen, root_at); - - git_buf_free(&result); -} - -void test_path_core__join_unrooted(void) -{ - git_buf out = GIT_BUF_INIT; - - test_join_unrooted("foo", 0, "foo", NULL); - test_join_unrooted("foo/bar", 0, "foo/bar", NULL); - - /* Relative paths have base prepended */ - test_join_unrooted("/foo/bar", 4, "bar", "/foo"); - test_join_unrooted("/foo/bar/foobar", 4, "bar/foobar", "/foo"); - test_join_unrooted("c:/foo/bar/foobar", 6, "bar/foobar", "c:/foo"); - test_join_unrooted("c:/foo/bar/foobar", 10, "foobar", "c:/foo/bar"); - - /* Absolute paths are not prepended with base */ - test_join_unrooted("/foo", 0, "/foo", "/asdf"); - test_join_unrooted("/foo/bar", 0, "/foo/bar", "/asdf"); - - /* Drive letter is given as root length on Windows */ - test_join_unrooted("c:/foo", 2, "c:/foo", "c:/asdf"); - test_join_unrooted("c:/foo/bar", 2, "c:/foo/bar", "c:/asdf"); - - /* Base is returned when it's provided and is the prefix */ - test_join_unrooted("c:/foo/bar/foobar", 6, "c:/foo/bar/foobar", "c:/foo"); - test_join_unrooted("c:/foo/bar/foobar", 10, "c:/foo/bar/foobar", "c:/foo/bar"); - - /* Trailing slash in the base is ignored */ - test_join_unrooted("c:/foo/bar/foobar", 6, "c:/foo/bar/foobar", "c:/foo/"); - - git_buf_free(&out); -} diff --git a/vendor/libgit2/tests/path/win32.c b/vendor/libgit2/tests/path/win32.c deleted file mode 100644 index 4ff039738..000000000 --- a/vendor/libgit2/tests/path/win32.c +++ /dev/null @@ -1,217 +0,0 @@ - -#include "clar_libgit2.h" -#include "path.h" - -#ifdef GIT_WIN32 -#include "win32/path_w32.h" -#endif - -void test_utf8_to_utf16(const char *utf8_in, const wchar_t *utf16_expected) -{ -#ifdef GIT_WIN32 - git_win32_path path_utf16; - int path_utf16len; - - cl_assert((path_utf16len = git_win32_path_from_utf8(path_utf16, utf8_in)) >= 0); - cl_assert_equal_wcs(utf16_expected, path_utf16); - cl_assert_equal_i(wcslen(utf16_expected), path_utf16len); -#else - GIT_UNUSED(utf8_in); - GIT_UNUSED(utf16_expected); -#endif -} - -void test_path_win32__utf8_to_utf16(void) -{ -#ifdef GIT_WIN32 - test_utf8_to_utf16("C:\\", L"\\\\?\\C:\\"); - test_utf8_to_utf16("c:\\", L"\\\\?\\c:\\"); - test_utf8_to_utf16("C:/", L"\\\\?\\C:\\"); - test_utf8_to_utf16("c:/", L"\\\\?\\c:\\"); -#endif -} - -void test_path_win32__removes_trailing_slash(void) -{ -#ifdef GIT_WIN32 - test_utf8_to_utf16("C:\\Foo\\", L"\\\\?\\C:\\Foo"); - test_utf8_to_utf16("C:\\Foo\\\\", L"\\\\?\\C:\\Foo"); - test_utf8_to_utf16("C:\\Foo\\\\", L"\\\\?\\C:\\Foo"); - test_utf8_to_utf16("C:/Foo/", L"\\\\?\\C:\\Foo"); - test_utf8_to_utf16("C:/Foo///", L"\\\\?\\C:\\Foo"); -#endif -} - -void test_path_win32__squashes_multiple_slashes(void) -{ -#ifdef GIT_WIN32 - test_utf8_to_utf16("C:\\\\Foo\\Bar\\\\Foobar", L"\\\\?\\C:\\Foo\\Bar\\Foobar"); - test_utf8_to_utf16("C://Foo/Bar///Foobar", L"\\\\?\\C:\\Foo\\Bar\\Foobar"); -#endif -} - -void test_path_win32__unc(void) -{ -#ifdef GIT_WIN32 - test_utf8_to_utf16("\\\\server\\c$\\unc\\path", L"\\\\?\\UNC\\server\\c$\\unc\\path"); - test_utf8_to_utf16("//server/git/style/unc/path", L"\\\\?\\UNC\\server\\git\\style\\unc\\path"); -#endif -} - -void test_path_win32__honors_max_path(void) -{ -#ifdef GIT_WIN32 - git_win32_path path_utf16; - - test_utf8_to_utf16("C:\\This path is 259 chars and is the max length in windows\\0123456789abcdefghij0123456789abcdefghij0123456789abcdefghij0123456789abcdefghij0123456789abcdefghij0123456789abcdefghij0123456789abcdefghij0123456789abcdefghij0123456789abcdefghij0123456789abcdefghij", - L"\\\\?\\C:\\This path is 259 chars and is the max length in windows\\0123456789abcdefghij0123456789abcdefghij0123456789abcdefghij0123456789abcdefghij0123456789abcdefghij0123456789abcdefghij0123456789abcdefghij0123456789abcdefghij0123456789abcdefghij0123456789abcdefghij"); - test_utf8_to_utf16("\\\\unc\\paths may also be 259 characters including the server\\123456789abcdefghij0123456789abcdefghij0123456789abcdefghij0123456789abcdefghij0123456789abcdefghij0123456789abcdefghij0123456789abcdefghij0123456789abcdefghij0123456789abcdefghij0123456789abcdefghij", - L"\\\\?\\UNC\\unc\\paths may also be 259 characters including the server\\123456789abcdefghij0123456789abcdefghij0123456789abcdefghij0123456789abcdefghij0123456789abcdefghij0123456789abcdefghij0123456789abcdefghij0123456789abcdefghij0123456789abcdefghij0123456789abcdefghij"); - - cl_check_fail(git_win32_path_from_utf8(path_utf16, "C:\\This path is 260 chars and is sadly too long for windows\\0123456789abcdefghij0123456789abcdefghij0123456789abcdefghij0123456789abcdefghij0123456789abcdefghij0123456789abcdefghij0123456789abcdefghij0123456789abcdefghij0123456789abcdefghij0123456789abcdefghij")); - cl_check_fail(git_win32_path_from_utf8(path_utf16, "\\\\unc\\paths are also bound by 260 character restrictions\\including the server name portion\\bcdefghij0123456789abcdefghij0123456789abcdefghij0123456789abcdefghij0123456789abcdefghij0123456789abcdefghij0123456789abcdefghij0123456789abcdefghij0123456789abcdefghij")); -#endif -} - -void test_path_win32__dot_and_dotdot(void) -{ -#ifdef GIT_WIN32 - test_utf8_to_utf16("C:\\Foo\\..\\Foobar", L"\\\\?\\C:\\Foobar"); - test_utf8_to_utf16("C:\\Foo\\Bar\\..\\Foobar", L"\\\\?\\C:\\Foo\\Foobar"); - test_utf8_to_utf16("C:\\Foo\\Bar\\..\\Foobar\\..", L"\\\\?\\C:\\Foo"); - test_utf8_to_utf16("C:\\Foobar\\..", L"\\\\?\\C:\\"); - test_utf8_to_utf16("C:/Foo/Bar/../Foobar", L"\\\\?\\C:\\Foo\\Foobar"); - test_utf8_to_utf16("C:/Foo/Bar/../Foobar/../Asdf/", L"\\\\?\\C:\\Foo\\Asdf"); - test_utf8_to_utf16("C:/Foo/Bar/../Foobar/..", L"\\\\?\\C:\\Foo"); - test_utf8_to_utf16("C:/Foo/..", L"\\\\?\\C:\\"); - - test_utf8_to_utf16("C:\\Foo\\Bar\\.\\Foobar", L"\\\\?\\C:\\Foo\\Bar\\Foobar"); - test_utf8_to_utf16("C:\\.\\Foo\\.\\Bar\\.\\Foobar\\.\\", L"\\\\?\\C:\\Foo\\Bar\\Foobar"); - test_utf8_to_utf16("C:/Foo/Bar/./Foobar", L"\\\\?\\C:\\Foo\\Bar\\Foobar"); - test_utf8_to_utf16("C:/Foo/../Bar/./Foobar/../", L"\\\\?\\C:\\Bar"); - - test_utf8_to_utf16("C:\\Foo\\..\\..\\Bar", L"\\\\?\\C:\\Bar"); -#endif -} - -void test_path_win32__absolute_from_no_drive_letter(void) -{ -#ifdef GIT_WIN32 - test_utf8_to_utf16("\\Foo", L"\\\\?\\C:\\Foo"); - test_utf8_to_utf16("\\Foo\\Bar", L"\\\\?\\C:\\Foo\\Bar"); - test_utf8_to_utf16("/Foo/Bar", L"\\\\?\\C:\\Foo\\Bar"); -#endif -} - -void test_path_win32__absolute_from_relative(void) -{ -#ifdef GIT_WIN32 - char cwd_backup[MAX_PATH]; - - cl_must_pass(p_getcwd(cwd_backup, MAX_PATH)); - cl_must_pass(p_chdir("C:/")); - - test_utf8_to_utf16("Foo", L"\\\\?\\C:\\Foo"); - test_utf8_to_utf16("..\\..\\Foo", L"\\\\?\\C:\\Foo"); - test_utf8_to_utf16("Foo\\..", L"\\\\?\\C:\\"); - test_utf8_to_utf16("Foo\\..\\..", L"\\\\?\\C:\\"); - test_utf8_to_utf16("", L"\\\\?\\C:\\"); - - cl_must_pass(p_chdir("C:/Windows")); - - test_utf8_to_utf16("Foo", L"\\\\?\\C:\\Windows\\Foo"); - test_utf8_to_utf16("Foo\\Bar", L"\\\\?\\C:\\Windows\\Foo\\Bar"); - test_utf8_to_utf16("..\\Foo", L"\\\\?\\C:\\Foo"); - test_utf8_to_utf16("Foo\\..\\Bar", L"\\\\?\\C:\\Windows\\Bar"); - test_utf8_to_utf16("", L"\\\\?\\C:\\Windows"); - - cl_must_pass(p_chdir(cwd_backup)); -#endif -} - -void test_canonicalize(const wchar_t *in, const wchar_t *expected) -{ -#ifdef GIT_WIN32 - git_win32_path canonical; - - cl_assert(wcslen(in) < MAX_PATH); - wcscpy(canonical, in); - - cl_must_pass(git_win32_path_canonicalize(canonical)); - cl_assert_equal_wcs(expected, canonical); -#else - GIT_UNUSED(in); - GIT_UNUSED(expected); -#endif -} - -void test_path_win32__canonicalize(void) -{ -#ifdef GIT_WIN32 - test_canonicalize(L"C:\\Foo\\Bar", L"C:\\Foo\\Bar"); - test_canonicalize(L"C:\\Foo\\", L"C:\\Foo"); - test_canonicalize(L"C:\\Foo\\\\", L"C:\\Foo"); - test_canonicalize(L"C:\\Foo\\..\\Bar", L"C:\\Bar"); - test_canonicalize(L"C:\\Foo\\..\\..\\Bar", L"C:\\Bar"); - test_canonicalize(L"C:\\Foo\\..\\..\\..\\..\\", L"C:\\"); - test_canonicalize(L"C:/Foo/Bar", L"C:\\Foo\\Bar"); - test_canonicalize(L"C:/", L"C:\\"); - - test_canonicalize(L"Foo\\\\Bar\\\\Asdf\\\\", L"Foo\\Bar\\Asdf"); - test_canonicalize(L"Foo\\\\Bar\\\\..\\\\Asdf\\", L"Foo\\Asdf"); - test_canonicalize(L"Foo\\\\Bar\\\\.\\\\Asdf\\", L"Foo\\Bar\\Asdf"); - test_canonicalize(L"Foo\\\\..\\Bar\\\\.\\\\Asdf\\", L"Bar\\Asdf"); - test_canonicalize(L"\\", L""); - test_canonicalize(L"", L""); - test_canonicalize(L"Foo\\..\\..\\..\\..", L""); - test_canonicalize(L"..\\..\\..\\..", L""); - test_canonicalize(L"\\..\\..\\..\\..", L""); - - test_canonicalize(L"\\\\?\\C:\\Foo\\Bar", L"\\\\?\\C:\\Foo\\Bar"); - test_canonicalize(L"\\\\?\\C:\\Foo\\Bar\\", L"\\\\?\\C:\\Foo\\Bar"); - test_canonicalize(L"\\\\?\\C:\\\\Foo\\.\\Bar\\\\..\\", L"\\\\?\\C:\\Foo"); - test_canonicalize(L"\\\\?\\C:\\\\", L"\\\\?\\C:\\"); - test_canonicalize(L"//?/C:/", L"\\\\?\\C:\\"); - test_canonicalize(L"//?/C:/../../Foo/", L"\\\\?\\C:\\Foo"); - test_canonicalize(L"//?/C:/Foo/../../", L"\\\\?\\C:\\"); - - test_canonicalize(L"\\\\?\\UNC\\server\\C$\\folder", L"\\\\?\\UNC\\server\\C$\\folder"); - test_canonicalize(L"\\\\?\\UNC\\server\\C$\\folder\\", L"\\\\?\\UNC\\server\\C$\\folder"); - test_canonicalize(L"\\\\?\\UNC\\server\\C$\\folder\\", L"\\\\?\\UNC\\server\\C$\\folder"); - test_canonicalize(L"\\\\?\\UNC\\server\\C$\\folder\\..\\..\\..\\..\\share\\", L"\\\\?\\UNC\\server\\share"); - - test_canonicalize(L"\\\\server\\share", L"\\\\server\\share"); - test_canonicalize(L"\\\\server\\share\\", L"\\\\server\\share"); - test_canonicalize(L"\\\\server\\share\\\\foo\\\\bar", L"\\\\server\\share\\foo\\bar"); - test_canonicalize(L"\\\\server\\\\share\\\\foo\\\\bar", L"\\\\server\\share\\foo\\bar"); - test_canonicalize(L"\\\\server\\share\\..\\foo", L"\\\\server\\foo"); - test_canonicalize(L"\\\\server\\..\\..\\share\\.\\foo", L"\\\\server\\share\\foo"); -#endif -} - -void test_path_win32__8dot3_name(void) -{ -#ifdef GIT_WIN32 - char *shortname; - - if (!cl_sandbox_supports_8dot3()) - clar__skip(); - - /* Some guaranteed short names */ - cl_assert_equal_s("PROGRA~1", (shortname = git_win32_path_8dot3_name("C:\\Program Files"))); - git__free(shortname); - - cl_assert_equal_s("WINDOWS", (shortname = git_win32_path_8dot3_name("C:\\WINDOWS"))); - git__free(shortname); - - /* Create some predictible short names */ - cl_must_pass(p_mkdir(".foo", 0777)); - cl_assert_equal_s("FOO~1", (shortname = git_win32_path_8dot3_name(".foo"))); - git__free(shortname); - - cl_git_write2file("bar~1", "foobar\n", 7, O_RDWR|O_CREAT, 0666); - cl_must_pass(p_mkdir(".bar", 0777)); - cl_assert_equal_s("BAR~2", (shortname = git_win32_path_8dot3_name(".bar"))); - git__free(shortname); -#endif -} diff --git a/vendor/libgit2/tests/perf/helper__perf__do_merge.c b/vendor/libgit2/tests/perf/helper__perf__do_merge.c deleted file mode 100644 index c77b46a1f..000000000 --- a/vendor/libgit2/tests/perf/helper__perf__do_merge.c +++ /dev/null @@ -1,75 +0,0 @@ -#include "clar_libgit2.h" -#include "helper__perf__do_merge.h" -#include "helper__perf__timer.h" - -static git_repository * g_repo; - -void perf__do_merge(const char *fixture, - const char *test_name, - const char *id_a, - const char *id_b) -{ - git_checkout_options checkout_opts = GIT_CHECKOUT_OPTIONS_INIT; - git_clone_options clone_opts = GIT_CLONE_OPTIONS_INIT; - git_merge_options merge_opts = GIT_MERGE_OPTIONS_INIT; - git_oid oid_a; - git_oid oid_b; - git_reference *ref_branch_a = NULL; - git_reference *ref_branch_b = NULL; - git_commit *commit_a = NULL; - git_commit *commit_b = NULL; - git_annotated_commit *annotated_commits[1] = { NULL }; - perf_timer t_total = PERF_TIMER_INIT; - perf_timer t_clone = PERF_TIMER_INIT; - perf_timer t_checkout = PERF_TIMER_INIT; - perf_timer t_merge = PERF_TIMER_INIT; - - perf__timer__start(&t_total); - - checkout_opts.checkout_strategy = GIT_CHECKOUT_SAFE; - clone_opts.checkout_opts = checkout_opts; - - perf__timer__start(&t_clone); - cl_git_pass(git_clone(&g_repo, fixture, test_name, &clone_opts)); - perf__timer__stop(&t_clone); - - git_oid_fromstr(&oid_a, id_a); - cl_git_pass(git_commit_lookup(&commit_a, g_repo, &oid_a)); - cl_git_pass(git_branch_create(&ref_branch_a, g_repo, - "A", commit_a, - 0)); - - perf__timer__start(&t_checkout); - cl_git_pass(git_checkout_tree(g_repo, (git_object*)commit_a, &checkout_opts)); - perf__timer__stop(&t_checkout); - - cl_git_pass(git_repository_set_head(g_repo, git_reference_name(ref_branch_a))); - - git_oid_fromstr(&oid_b, id_b); - cl_git_pass(git_commit_lookup(&commit_b, g_repo, &oid_b)); - cl_git_pass(git_branch_create(&ref_branch_b, g_repo, - "B", commit_b, - 0)); - - cl_git_pass(git_annotated_commit_lookup(&annotated_commits[0], g_repo, &oid_b)); - - perf__timer__start(&t_merge); - cl_git_pass(git_merge(g_repo, - (const git_annotated_commit **)annotated_commits, 1, - &merge_opts, &checkout_opts)); - perf__timer__stop(&t_merge); - - git_reference_free(ref_branch_a); - git_reference_free(ref_branch_b); - git_commit_free(commit_a); - git_commit_free(commit_b); - git_annotated_commit_free(annotated_commits[0]); - git_repository_free(g_repo); - - perf__timer__stop(&t_total); - - perf__timer__report(&t_clone, "%s: clone", test_name); - perf__timer__report(&t_checkout, "%s: checkout", test_name); - perf__timer__report(&t_merge, "%s: merge", test_name); - perf__timer__report(&t_total, "%s: total", test_name); -} diff --git a/vendor/libgit2/tests/perf/helper__perf__do_merge.h b/vendor/libgit2/tests/perf/helper__perf__do_merge.h deleted file mode 100644 index 4a4723da5..000000000 --- a/vendor/libgit2/tests/perf/helper__perf__do_merge.h +++ /dev/null @@ -1,4 +0,0 @@ -void perf__do_merge(const char *fixture, - const char *test_name, - const char *id_a, - const char *id_b); diff --git a/vendor/libgit2/tests/perf/helper__perf__timer.c b/vendor/libgit2/tests/perf/helper__perf__timer.c deleted file mode 100644 index 8a7ed09e8..000000000 --- a/vendor/libgit2/tests/perf/helper__perf__timer.c +++ /dev/null @@ -1,73 +0,0 @@ -#include "clar_libgit2.h" -#include "helper__perf__timer.h" - -#if defined(GIT_WIN32) - -void perf__timer__start(perf_timer *t) -{ - QueryPerformanceCounter(&t->time_started); -} - -void perf__timer__stop(perf_timer *t) -{ - LARGE_INTEGER time_now; - QueryPerformanceCounter(&time_now); - - t->sum.QuadPart += (time_now.QuadPart - t->time_started.QuadPart); -} - -void perf__timer__report(perf_timer *t, const char *fmt, ...) -{ - va_list arglist; - LARGE_INTEGER freq; - double fraction; - - QueryPerformanceFrequency(&freq); - - fraction = ((double)t->sum.QuadPart) / ((double)freq.QuadPart); - - printf("%10.3f: ", fraction); - - va_start(arglist, fmt); - vprintf(fmt, arglist); - va_end(arglist); - - printf("\n"); -} - -#else - -#include - -static uint32_t now_in_ms(void) -{ - struct timeval now; - gettimeofday(&now, NULL); - return (uint32_t)((now.tv_sec * 1000) + (now.tv_usec / 1000)); -} - -void perf__timer__start(perf_timer *t) -{ - t->time_started = now_in_ms(); -} - -void perf__timer__stop(perf_timer *t) -{ - uint32_t now = now_in_ms(); - t->sum += (now - t->time_started); -} - -void perf__timer__report(perf_timer *t, const char *fmt, ...) -{ - va_list arglist; - - printf("%10.3f: ", ((double)t->sum) / 1000); - - va_start(arglist, fmt); - vprintf(fmt, arglist); - va_end(arglist); - - printf("\n"); -} - -#endif diff --git a/vendor/libgit2/tests/perf/helper__perf__timer.h b/vendor/libgit2/tests/perf/helper__perf__timer.h deleted file mode 100644 index 5aff4b136..000000000 --- a/vendor/libgit2/tests/perf/helper__perf__timer.h +++ /dev/null @@ -1,27 +0,0 @@ -#if defined(GIT_WIN32) - -struct perf__timer -{ - LARGE_INTEGER sum; - LARGE_INTEGER time_started; -}; - -#define PERF_TIMER_INIT {0} - -#else - -struct perf__timer -{ - uint32_t sum; - uint32_t time_started; -}; - -#define PERF_TIMER_INIT {0} - -#endif - -typedef struct perf__timer perf_timer; - -void perf__timer__start(perf_timer *t); -void perf__timer__stop(perf_timer *t); -void perf__timer__report(perf_timer *t, const char *fmt, ...); diff --git a/vendor/libgit2/tests/perf/merge.c b/vendor/libgit2/tests/perf/merge.c deleted file mode 100644 index b2ef082eb..000000000 --- a/vendor/libgit2/tests/perf/merge.c +++ /dev/null @@ -1,44 +0,0 @@ -#include "clar_libgit2.h" -#include "helper__perf__do_merge.h" - -/* This test requires a large repo with many files. - * It doesn't care about the contents, just the size. - * - * For now, we use the LibGit2 repo containing the - * source tree because it is already here. - * - * `find . | wc -l` reports 5128. - * - */ -#define SRC_REPO (cl_fixture("../..")) - -/* We need 2 arbitrary commits within that repo - * that have a large number of changed files. - * Again, we don't care about the actual contents, - * just the size. - * - * For now, we use these public branches: - * maint/v0.21 d853fb9f24e0fe63b3dce9fbc04fd9cfe17a030b Always checkout with case sensitive iterator - * maint/v0.22 1ce9ea3ba9b4fa666602d52a5281d41a482cc58b checkout tests: cleanup realpath impl on Win32 - * - */ -#define ID_BRANCH_A "d853fb9f24e0fe63b3dce9fbc04fd9cfe17a030b" -#define ID_BRANCH_B "1ce9ea3ba9b4fa666602d52a5281d41a482cc58b" - - -void test_perf_merge__initialize(void) -{ -} - -void test_perf_merge__cleanup(void) -{ -} - -void test_perf_merge__m1(void) -{ -#if 1 - cl_skip(); -#else - perf__do_merge(SRC_REPO, "m1", ID_BRANCH_A, ID_BRANCH_B); -#endif -} diff --git a/vendor/libgit2/tests/rebase/abort.c b/vendor/libgit2/tests/rebase/abort.c deleted file mode 100644 index c4b3890bc..000000000 --- a/vendor/libgit2/tests/rebase/abort.c +++ /dev/null @@ -1,150 +0,0 @@ -#include "clar_libgit2.h" -#include "git2/rebase.h" -#include "merge.h" -#include "posix.h" -#include "annotated_commit.h" - -#include - -static git_repository *repo; - -// Fixture setup and teardown -void test_rebase_abort__initialize(void) -{ - repo = cl_git_sandbox_init("rebase"); -} - -void test_rebase_abort__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -static void test_abort(git_annotated_commit *branch, git_annotated_commit *onto) -{ - git_rebase *rebase; - git_reference *head_ref, *branch_ref = NULL; - git_status_list *statuslist; - git_reflog *reflog; - const git_reflog_entry *reflog_entry; - - cl_git_pass(git_rebase_open(&rebase, repo, NULL)); - cl_git_pass(git_rebase_abort(rebase)); - - cl_assert_equal_i(GIT_REPOSITORY_STATE_NONE, git_repository_state(repo)); - - /* Make sure the refs are updated appropriately */ - cl_git_pass(git_reference_lookup(&head_ref, repo, "HEAD")); - - if (branch->ref_name == NULL) - cl_assert_equal_oid(git_annotated_commit_id(branch), git_reference_target(head_ref)); - else { - cl_assert_equal_s("refs/heads/beef", git_reference_symbolic_target(head_ref)); - cl_git_pass(git_reference_lookup(&branch_ref, repo, git_reference_symbolic_target(head_ref))); - cl_assert_equal_oid(git_annotated_commit_id(branch), git_reference_target(branch_ref)); - } - - git_status_list_new(&statuslist, repo, NULL); - cl_assert_equal_i(0, git_status_list_entrycount(statuslist)); - git_status_list_free(statuslist); - - /* Make sure the reflogs are updated appropriately */ - cl_git_pass(git_reflog_read(&reflog, repo, "HEAD")); - - cl_assert(reflog_entry = git_reflog_entry_byindex(reflog, 0)); - cl_assert_equal_oid(git_annotated_commit_id(onto), git_reflog_entry_id_old(reflog_entry)); - cl_assert_equal_oid(git_annotated_commit_id(branch), git_reflog_entry_id_new(reflog_entry)); - cl_assert_equal_s("rebase: aborting", git_reflog_entry_message(reflog_entry)); - - git_reflog_free(reflog); - git_reference_free(head_ref); - git_reference_free(branch_ref); - git_rebase_free(rebase); -} - -void test_rebase_abort__merge(void) -{ - git_rebase *rebase; - git_reference *branch_ref, *onto_ref; - git_annotated_commit *branch_head, *onto_head; - - cl_git_pass(git_reference_lookup(&branch_ref, repo, "refs/heads/beef")); - cl_git_pass(git_reference_lookup(&onto_ref, repo, "refs/heads/master")); - - cl_git_pass(git_annotated_commit_from_ref(&branch_head, repo, branch_ref)); - cl_git_pass(git_annotated_commit_from_ref(&onto_head, repo, onto_ref)); - - cl_git_pass(git_rebase_init(&rebase, repo, branch_head, NULL, onto_head, NULL)); - cl_assert_equal_i(GIT_REPOSITORY_STATE_REBASE_MERGE, git_repository_state(repo)); - - test_abort(branch_head, onto_head); - - git_annotated_commit_free(branch_head); - git_annotated_commit_free(onto_head); - - git_reference_free(branch_ref); - git_reference_free(onto_ref); - git_rebase_free(rebase); -} - -void test_rebase_abort__detached_head(void) -{ - git_rebase *rebase; - git_oid branch_id; - git_reference *onto_ref; - git_signature *signature; - git_annotated_commit *branch_head, *onto_head; - - git_oid_fromstr(&branch_id, "b146bd7608eac53d9bf9e1a6963543588b555c64"); - cl_git_pass(git_reference_lookup(&onto_ref, repo, "refs/heads/master")); - - cl_git_pass(git_annotated_commit_lookup(&branch_head, repo, &branch_id)); - cl_git_pass(git_annotated_commit_from_ref(&onto_head, repo, onto_ref)); - - cl_git_pass(git_signature_new(&signature, "Rebaser", "rebaser@example.com", 1404157834, -400)); - - cl_git_pass(git_rebase_init(&rebase, repo, branch_head, NULL, onto_head, NULL)); - cl_assert_equal_i(GIT_REPOSITORY_STATE_REBASE_MERGE, git_repository_state(repo)); - - test_abort(branch_head, onto_head); - - git_signature_free(signature); - - git_annotated_commit_free(branch_head); - git_annotated_commit_free(onto_head); - - git_reference_free(onto_ref); - git_rebase_free(rebase); -} - -void test_rebase_abort__old_style_head_file(void) -{ - git_rebase *rebase; - git_reference *branch_ref, *onto_ref; - git_signature *signature; - git_annotated_commit *branch_head, *onto_head; - - cl_git_pass(git_reference_lookup(&branch_ref, repo, "refs/heads/beef")); - cl_git_pass(git_reference_lookup(&onto_ref, repo, "refs/heads/master")); - - cl_git_pass(git_annotated_commit_from_ref(&branch_head, repo, branch_ref)); - cl_git_pass(git_annotated_commit_from_ref(&onto_head, repo, onto_ref)); - - cl_git_pass(git_signature_new(&signature, "Rebaser", "rebaser@example.com", 1404157834, -400)); - - cl_git_pass(git_rebase_init(&rebase, repo, branch_head, NULL, onto_head, NULL)); - cl_assert_equal_i(GIT_REPOSITORY_STATE_REBASE_MERGE, git_repository_state(repo)); - - p_rename("rebase-merge/.git/rebase-merge/orig-head", - "rebase-merge/.git/rebase-merge/head"); - - test_abort(branch_head, onto_head); - - git_signature_free(signature); - - git_annotated_commit_free(branch_head); - git_annotated_commit_free(onto_head); - - git_reference_free(branch_ref); - git_reference_free(onto_ref); - git_rebase_free(rebase); -} diff --git a/vendor/libgit2/tests/rebase/inmemory.c b/vendor/libgit2/tests/rebase/inmemory.c deleted file mode 100644 index d5d89c719..000000000 --- a/vendor/libgit2/tests/rebase/inmemory.c +++ /dev/null @@ -1,116 +0,0 @@ -#include "clar_libgit2.h" -#include "git2/rebase.h" -#include "posix.h" - -#include - -static git_repository *repo; - -// Fixture setup and teardown -void test_rebase_inmemory__initialize(void) -{ - repo = cl_git_sandbox_init("rebase"); -} - -void test_rebase_inmemory__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -void test_rebase_inmemory__not_in_rebase_state(void) -{ - git_rebase *rebase; - git_reference *branch_ref, *upstream_ref; - git_annotated_commit *branch_head, *upstream_head; - git_rebase_options opts = GIT_REBASE_OPTIONS_INIT; - - opts.inmemory = true; - - cl_git_pass(git_reference_lookup(&branch_ref, repo, "refs/heads/beef")); - cl_git_pass(git_reference_lookup(&upstream_ref, repo, "refs/heads/master")); - - cl_git_pass(git_annotated_commit_from_ref(&branch_head, repo, branch_ref)); - cl_git_pass(git_annotated_commit_from_ref(&upstream_head, repo, upstream_ref)); - - cl_git_pass(git_rebase_init(&rebase, repo, branch_head, upstream_head, NULL, &opts)); - - cl_assert_equal_i(GIT_REPOSITORY_STATE_NONE, git_repository_state(repo)); - - git_rebase_free(rebase); - - git_annotated_commit_free(branch_head); - git_annotated_commit_free(upstream_head); - - git_reference_free(branch_ref); - git_reference_free(upstream_ref); -} - -void test_rebase_inmemory__can_resolve_conflicts(void) -{ - git_rebase *rebase; - git_reference *branch_ref, *upstream_ref; - git_annotated_commit *branch_head, *upstream_head; - git_rebase_operation *rebase_operation; - git_status_list *status_list; - git_oid pick_id, commit_id, expected_commit_id; - git_signature *signature; - git_index *rebase_index, *repo_index; - git_index_entry resolution = {{0}}; - git_rebase_options opts = GIT_REBASE_OPTIONS_INIT; - - cl_git_pass(git_signature_new(&signature, - "Rebaser", "rebaser@rebaser.rb", 1405694510, 0)); - - opts.inmemory = true; - - cl_git_pass(git_reference_lookup(&branch_ref, repo, "refs/heads/asparagus")); - cl_git_pass(git_reference_lookup(&upstream_ref, repo, "refs/heads/master")); - - cl_git_pass(git_annotated_commit_from_ref(&branch_head, repo, branch_ref)); - cl_git_pass(git_annotated_commit_from_ref(&upstream_head, repo, upstream_ref)); - - cl_git_pass(git_rebase_init(&rebase, repo, branch_head, upstream_head, NULL, &opts)); - - cl_git_pass(git_rebase_next(&rebase_operation, rebase)); - - git_oid_fromstr(&pick_id, "33f915f9e4dbd9f4b24430e48731a59b45b15500"); - - cl_assert_equal_i(GIT_REBASE_OPERATION_PICK, rebase_operation->type); - cl_assert_equal_oid(&pick_id, &rebase_operation->id); - - /* ensure that we did not do anything stupid to the workdir or repo index */ - cl_git_pass(git_repository_index(&repo_index, repo)); - cl_assert(!git_index_has_conflicts(repo_index)); - - cl_git_pass(git_status_list_new(&status_list, repo, NULL)); - cl_assert_equal_i(0, git_status_list_entrycount(status_list)); - - /* but that the index returned from rebase does have conflicts */ - cl_git_pass(git_rebase_inmemory_index(&rebase_index, rebase)); - cl_assert(git_index_has_conflicts(rebase_index)); - - cl_git_fail_with(GIT_EUNMERGED, git_rebase_commit(&commit_id, rebase, NULL, signature, NULL, NULL)); - - /* ensure that we can work with the in-memory index to resolve the conflict */ - resolution.path = "asparagus.txt"; - resolution.mode = GIT_FILEMODE_BLOB; - git_oid_fromstr(&resolution.id, "414dfc71ead79c07acd4ea47fecf91f289afc4b9"); - cl_git_pass(git_index_conflict_remove(rebase_index, "asparagus.txt")); - cl_git_pass(git_index_add(rebase_index, &resolution)); - - /* and finally create a commit for the resolved rebase operation */ - cl_git_pass(git_rebase_commit(&commit_id, rebase, NULL, signature, NULL, NULL)); - - cl_git_pass(git_oid_fromstr(&expected_commit_id, "db7af47222181e548810da2ab5fec0e9357c5637")); - cl_assert_equal_oid(&commit_id, &expected_commit_id); - - git_signature_free(signature); - git_status_list_free(status_list); - git_annotated_commit_free(branch_head); - git_annotated_commit_free(upstream_head); - git_reference_free(branch_ref); - git_reference_free(upstream_ref); - git_index_free(repo_index); - git_index_free(rebase_index); - git_rebase_free(rebase); -} diff --git a/vendor/libgit2/tests/rebase/iterator.c b/vendor/libgit2/tests/rebase/iterator.c deleted file mode 100644 index db57b0a83..000000000 --- a/vendor/libgit2/tests/rebase/iterator.c +++ /dev/null @@ -1,140 +0,0 @@ -#include "clar_libgit2.h" -#include "git2/rebase.h" -#include "posix.h" - -#include - -static git_repository *repo; -static git_index *_index; -static git_signature *signature; - -// Fixture setup and teardown -void test_rebase_iterator__initialize(void) -{ - repo = cl_git_sandbox_init("rebase"); - cl_git_pass(git_repository_index(&_index, repo)); - cl_git_pass(git_signature_new(&signature, "Rebaser", - "rebaser@rebaser.rb", 1405694510, 0)); -} - -void test_rebase_iterator__cleanup(void) -{ - git_signature_free(signature); - git_index_free(_index); - cl_git_sandbox_cleanup(); -} - -static void test_operations(git_rebase *rebase, size_t expected_current) -{ - size_t i, expected_count = 5; - git_oid expected_oid[5]; - git_rebase_operation *operation; - - git_oid_fromstr(&expected_oid[0], "da9c51a23d02d931a486f45ad18cda05cf5d2b94"); - git_oid_fromstr(&expected_oid[1], "8d1f13f93c4995760ac07d129246ac1ff64c0be9"); - git_oid_fromstr(&expected_oid[2], "3069cc907e6294623e5917ef6de663928c1febfb"); - git_oid_fromstr(&expected_oid[3], "588e5d2f04d49707fe4aab865e1deacaf7ef6787"); - git_oid_fromstr(&expected_oid[4], "b146bd7608eac53d9bf9e1a6963543588b555c64"); - - cl_assert_equal_i(expected_count, git_rebase_operation_entrycount(rebase)); - cl_assert_equal_i(expected_current, git_rebase_operation_current(rebase)); - - for (i = 0; i < expected_count; i++) { - operation = git_rebase_operation_byindex(rebase, i); - cl_assert_equal_i(GIT_REBASE_OPERATION_PICK, operation->type); - cl_assert_equal_oid(&expected_oid[i], &operation->id); - cl_assert_equal_p(NULL, operation->exec); - } -} - -void test_iterator(bool inmemory) -{ - git_rebase *rebase; - git_rebase_options opts = GIT_REBASE_OPTIONS_INIT; - git_reference *branch_ref, *upstream_ref; - git_annotated_commit *branch_head, *upstream_head; - git_rebase_operation *rebase_operation; - git_oid commit_id, expected_id; - int error; - - opts.inmemory = inmemory; - - cl_git_pass(git_reference_lookup(&branch_ref, repo, "refs/heads/beef")); - cl_git_pass(git_reference_lookup(&upstream_ref, repo, "refs/heads/master")); - - cl_git_pass(git_annotated_commit_from_ref(&branch_head, repo, branch_ref)); - cl_git_pass(git_annotated_commit_from_ref(&upstream_head, repo, upstream_ref)); - - cl_git_pass(git_rebase_init(&rebase, repo, branch_head, upstream_head, NULL, &opts)); - test_operations(rebase, GIT_REBASE_NO_OPERATION); - - if (!inmemory) { - git_rebase_free(rebase); - cl_git_pass(git_rebase_open(&rebase, repo, NULL)); - } - - cl_git_pass(git_rebase_next(&rebase_operation, rebase)); - cl_git_pass(git_rebase_commit(&commit_id, rebase, NULL, signature, - NULL, NULL)); - test_operations(rebase, 0); - - git_oid_fromstr(&expected_id, "776e4c48922799f903f03f5f6e51da8b01e4cce0"); - cl_assert_equal_oid(&expected_id, &commit_id); - - cl_git_pass(git_rebase_next(&rebase_operation, rebase)); - cl_git_pass(git_rebase_commit(&commit_id, rebase, NULL, signature, - NULL, NULL)); - test_operations(rebase, 1); - - git_oid_fromstr(&expected_id, "ba1f9b4fd5cf8151f7818be2111cc0869f1eb95a"); - cl_assert_equal_oid(&expected_id, &commit_id); - - cl_git_pass(git_rebase_next(&rebase_operation, rebase)); - cl_git_pass(git_rebase_commit(&commit_id, rebase, NULL, signature, - NULL, NULL)); - test_operations(rebase, 2); - - git_oid_fromstr(&expected_id, "948b12fe18b84f756223a61bece4c307787cd5d4"); - cl_assert_equal_oid(&expected_id, &commit_id); - - if (!inmemory) { - git_rebase_free(rebase); - cl_git_pass(git_rebase_open(&rebase, repo, NULL)); - } - - cl_git_pass(git_rebase_next(&rebase_operation, rebase)); - cl_git_pass(git_rebase_commit(&commit_id, rebase, NULL, signature, - NULL, NULL)); - test_operations(rebase, 3); - - git_oid_fromstr(&expected_id, "d9d5d59d72c9968687f9462578d79878cd80e781"); - cl_assert_equal_oid(&expected_id, &commit_id); - - cl_git_pass(git_rebase_next(&rebase_operation, rebase)); - cl_git_pass(git_rebase_commit(&commit_id, rebase, NULL, signature, - NULL, NULL)); - test_operations(rebase, 4); - - git_oid_fromstr(&expected_id, "9cf383c0a125d89e742c5dec58ed277dd07588b3"); - cl_assert_equal_oid(&expected_id, &commit_id); - - cl_git_fail(error = git_rebase_next(&rebase_operation, rebase)); - cl_assert_equal_i(GIT_ITEROVER, error); - test_operations(rebase, 4); - - git_annotated_commit_free(branch_head); - git_annotated_commit_free(upstream_head); - git_reference_free(branch_ref); - git_reference_free(upstream_ref); - git_rebase_free(rebase); -} - -void test_rebase_iterator__iterates(void) -{ - test_iterator(false); -} - -void test_rebase_iterator__iterates_inmemory(void) -{ - test_iterator(true); -} diff --git a/vendor/libgit2/tests/rebase/merge.c b/vendor/libgit2/tests/rebase/merge.c deleted file mode 100644 index c60113b64..000000000 --- a/vendor/libgit2/tests/rebase/merge.c +++ /dev/null @@ -1,597 +0,0 @@ -#include "clar_libgit2.h" -#include "git2/rebase.h" -#include "posix.h" -#include "signature.h" - -#include - -static git_repository *repo; -static git_signature *signature; - -static void set_core_autocrlf_to(git_repository *repo, bool value) -{ - git_config *cfg; - - cl_git_pass(git_repository_config(&cfg, repo)); - cl_git_pass(git_config_set_bool(cfg, "core.autocrlf", value)); - - git_config_free(cfg); -} - -// Fixture setup and teardown -void test_rebase_merge__initialize(void) -{ - repo = cl_git_sandbox_init("rebase"); - cl_git_pass(git_signature_new(&signature, - "Rebaser", "rebaser@rebaser.rb", 1405694510, 0)); - - set_core_autocrlf_to(repo, false); -} - -void test_rebase_merge__cleanup(void) -{ - git_signature_free(signature); - cl_git_sandbox_cleanup(); -} - -void test_rebase_merge__next(void) -{ - git_rebase *rebase; - git_reference *branch_ref, *upstream_ref; - git_annotated_commit *branch_head, *upstream_head; - git_rebase_operation *rebase_operation; - git_status_list *status_list; - const git_status_entry *status_entry; - git_oid pick_id, file1_id; - - cl_git_pass(git_reference_lookup(&branch_ref, repo, "refs/heads/beef")); - cl_git_pass(git_reference_lookup(&upstream_ref, repo, "refs/heads/master")); - - cl_git_pass(git_annotated_commit_from_ref(&branch_head, repo, branch_ref)); - cl_git_pass(git_annotated_commit_from_ref(&upstream_head, repo, upstream_ref)); - - cl_git_pass(git_rebase_init(&rebase, repo, branch_head, upstream_head, NULL, NULL)); - - cl_git_pass(git_rebase_next(&rebase_operation, rebase)); - - git_oid_fromstr(&pick_id, "da9c51a23d02d931a486f45ad18cda05cf5d2b94"); - - cl_assert_equal_i(GIT_REBASE_OPERATION_PICK, rebase_operation->type); - cl_assert_equal_oid(&pick_id, &rebase_operation->id); - cl_assert_equal_file("da9c51a23d02d931a486f45ad18cda05cf5d2b94\n", 41, "rebase/.git/rebase-merge/current"); - cl_assert_equal_file("1\n", 2, "rebase/.git/rebase-merge/msgnum"); - - cl_git_pass(git_status_list_new(&status_list, repo, NULL)); - cl_assert_equal_i(1, git_status_list_entrycount(status_list)); - cl_assert(status_entry = git_status_byindex(status_list, 0)); - - cl_assert_equal_s("beef.txt", status_entry->head_to_index->new_file.path); - - git_oid_fromstr(&file1_id, "8d95ea62e621f1d38d230d9e7d206e41096d76af"); - cl_assert_equal_oid(&file1_id, &status_entry->head_to_index->new_file.id); - - git_status_list_free(status_list); - git_annotated_commit_free(branch_head); - git_annotated_commit_free(upstream_head); - git_reference_free(branch_ref); - git_reference_free(upstream_ref); - git_rebase_free(rebase); -} - -void test_rebase_merge__next_with_conflicts(void) -{ - git_rebase *rebase; - git_reference *branch_ref, *upstream_ref; - git_annotated_commit *branch_head, *upstream_head; - git_rebase_operation *rebase_operation; - git_status_list *status_list; - const git_status_entry *status_entry; - git_oid pick_id, commit_id; - - const char *expected_merge = -"ASPARAGUS SOUP.\n" -"\n" -"<<<<<<< master\n" -"TAKE FOUR LARGE BUNCHES of asparagus, scrape it nicely, cut off one inch\n" -"OF THE TOPS, and lay them in water, chop the stalks and put them on the\n" -"FIRE WITH A PIECE OF BACON, a large onion cut up, and pepper and salt;\n" -"ADD TWO QUARTS OF WATER, boil them till the stalks are quite soft, then\n" -"PULP THEM THROUGH A SIEVE, and strain the water to it, which must be put\n" -"=======\n" -"Take four large bunches of asparagus, scrape it nicely, CUT OFF ONE INCH\n" -"of the tops, and lay them in water, chop the stalks and PUT THEM ON THE\n" -"fire with a piece of bacon, a large onion cut up, and pepper and salt;\n" -"add two quarts of water, boil them till the stalks are quite soft, then\n" -"pulp them through a sieve, and strain the water to it, which must be put\n" -">>>>>>> Conflicting modification 1 to asparagus\n" -"back in the pot; put into it a chicken cut up, with the tops of\n" -"asparagus which had been laid by, boil it until these last articles are\n" -"sufficiently done, thicken with flour, butter and milk, and serve it up.\n"; - - cl_git_pass(git_reference_lookup(&branch_ref, repo, "refs/heads/asparagus")); - cl_git_pass(git_reference_lookup(&upstream_ref, repo, "refs/heads/master")); - - cl_git_pass(git_annotated_commit_from_ref(&branch_head, repo, branch_ref)); - cl_git_pass(git_annotated_commit_from_ref(&upstream_head, repo, upstream_ref)); - - cl_git_pass(git_rebase_init(&rebase, repo, branch_head, upstream_head, NULL, NULL)); - - cl_git_pass(git_rebase_next(&rebase_operation, rebase)); - - git_oid_fromstr(&pick_id, "33f915f9e4dbd9f4b24430e48731a59b45b15500"); - - cl_assert_equal_i(GIT_REBASE_OPERATION_PICK, rebase_operation->type); - cl_assert_equal_oid(&pick_id, &rebase_operation->id); - cl_assert_equal_file("33f915f9e4dbd9f4b24430e48731a59b45b15500\n", 41, "rebase/.git/rebase-merge/current"); - cl_assert_equal_file("1\n", 2, "rebase/.git/rebase-merge/msgnum"); - - cl_git_pass(git_status_list_new(&status_list, repo, NULL)); - cl_assert_equal_i(1, git_status_list_entrycount(status_list)); - cl_assert(status_entry = git_status_byindex(status_list, 0)); - - cl_assert_equal_s("asparagus.txt", status_entry->head_to_index->new_file.path); - - cl_assert_equal_file(expected_merge, strlen(expected_merge), "rebase/asparagus.txt"); - - cl_git_fail_with(GIT_EUNMERGED, git_rebase_commit(&commit_id, rebase, NULL, signature, NULL, NULL)); - - git_status_list_free(status_list); - git_annotated_commit_free(branch_head); - git_annotated_commit_free(upstream_head); - git_reference_free(branch_ref); - git_reference_free(upstream_ref); - git_rebase_free(rebase); -} - -void test_rebase_merge__next_stops_with_iterover(void) -{ - git_rebase *rebase; - git_reference *branch_ref, *upstream_ref; - git_annotated_commit *branch_head, *upstream_head; - git_rebase_operation *rebase_operation; - git_oid commit_id; - int error; - - cl_git_pass(git_reference_lookup(&branch_ref, repo, "refs/heads/beef")); - cl_git_pass(git_reference_lookup(&upstream_ref, repo, "refs/heads/master")); - - cl_git_pass(git_annotated_commit_from_ref(&branch_head, repo, branch_ref)); - cl_git_pass(git_annotated_commit_from_ref(&upstream_head, repo, upstream_ref)); - - cl_git_pass(git_rebase_init(&rebase, repo, branch_head, upstream_head, NULL, NULL)); - - cl_git_pass(git_rebase_next(&rebase_operation, rebase)); - cl_git_pass(git_rebase_commit(&commit_id, rebase, NULL, signature, - NULL, NULL)); - - cl_git_pass(git_rebase_next(&rebase_operation, rebase)); - cl_git_pass(git_rebase_commit(&commit_id, rebase, NULL, signature, - NULL, NULL)); - - cl_git_pass(git_rebase_next(&rebase_operation, rebase)); - cl_git_pass(git_rebase_commit(&commit_id, rebase, NULL, signature, - NULL, NULL)); - - cl_git_pass(git_rebase_next(&rebase_operation, rebase)); - cl_git_pass(git_rebase_commit(&commit_id, rebase, NULL, signature, - NULL, NULL)); - - cl_git_pass(git_rebase_next(&rebase_operation, rebase)); - cl_git_pass(git_rebase_commit(&commit_id, rebase, NULL, signature, - NULL, NULL)); - - cl_git_fail(error = git_rebase_next(&rebase_operation, rebase)); - cl_assert_equal_i(GIT_ITEROVER, error); - - cl_assert_equal_file("5\n", 2, "rebase/.git/rebase-merge/end"); - cl_assert_equal_file("5\n", 2, "rebase/.git/rebase-merge/msgnum"); - - git_annotated_commit_free(branch_head); - git_annotated_commit_free(upstream_head); - git_reference_free(branch_ref); - git_reference_free(upstream_ref); - git_rebase_free(rebase); -} - -void test_rebase_merge__commit(void) -{ - git_rebase *rebase; - git_reference *branch_ref, *upstream_ref; - git_annotated_commit *branch_head, *upstream_head; - git_rebase_operation *rebase_operation; - git_oid commit_id, tree_id, parent_id; - git_signature *author; - git_commit *commit; - git_reflog *reflog; - const git_reflog_entry *reflog_entry; - - cl_git_pass(git_reference_lookup(&branch_ref, repo, "refs/heads/beef")); - cl_git_pass(git_reference_lookup(&upstream_ref, repo, "refs/heads/master")); - - cl_git_pass(git_annotated_commit_from_ref(&branch_head, repo, branch_ref)); - cl_git_pass(git_annotated_commit_from_ref(&upstream_head, repo, upstream_ref)); - - cl_git_pass(git_rebase_init(&rebase, repo, branch_head, upstream_head, NULL, NULL)); - - cl_git_pass(git_rebase_next(&rebase_operation, rebase)); - cl_git_pass(git_rebase_commit(&commit_id, rebase, NULL, signature, - NULL, NULL)); - - cl_git_pass(git_commit_lookup(&commit, repo, &commit_id)); - - git_oid_fromstr(&parent_id, "efad0b11c47cb2f0220cbd6f5b0f93bb99064b00"); - cl_assert_equal_i(1, git_commit_parentcount(commit)); - cl_assert_equal_oid(&parent_id, git_commit_parent_id(commit, 0)); - - git_oid_fromstr(&tree_id, "4461379789c777d2a6c1f2ee0e9d6c86731b9992"); - cl_assert_equal_oid(&tree_id, git_commit_tree_id(commit)); - - cl_assert_equal_s(NULL, git_commit_message_encoding(commit)); - cl_assert_equal_s("Modification 1 to beef\n", git_commit_message(commit)); - - cl_git_pass(git_signature_new(&author, - "Edward Thomson", "ethomson@edwardthomson.com", 1405621769, 0-(4*60))); - cl_assert(git_signature__equal(author, git_commit_author(commit))); - - cl_assert(git_signature__equal(signature, git_commit_committer(commit))); - - /* Make sure the reflogs are updated appropriately */ - cl_git_pass(git_reflog_read(&reflog, repo, "HEAD")); - cl_assert(reflog_entry = git_reflog_entry_byindex(reflog, 0)); - cl_assert_equal_oid(&parent_id, git_reflog_entry_id_old(reflog_entry)); - cl_assert_equal_oid(&commit_id, git_reflog_entry_id_new(reflog_entry)); - cl_assert_equal_s("rebase: Modification 1 to beef", git_reflog_entry_message(reflog_entry)); - - git_reflog_free(reflog); - git_signature_free(author); - git_commit_free(commit); - git_annotated_commit_free(branch_head); - git_annotated_commit_free(upstream_head); - git_reference_free(branch_ref); - git_reference_free(upstream_ref); - git_rebase_free(rebase); -} - -void test_rebase_merge__blocked_when_dirty(void) -{ - git_rebase *rebase; - git_reference *branch_ref, *upstream_ref; - git_annotated_commit *branch_head, *upstream_head; - git_rebase_operation *rebase_operation; - git_oid commit_id; - - cl_git_pass(git_reference_lookup(&branch_ref, repo, "refs/heads/beef")); - cl_git_pass(git_reference_lookup(&upstream_ref, repo, "refs/heads/master")); - - cl_git_pass(git_annotated_commit_from_ref(&branch_head, repo, branch_ref)); - cl_git_pass(git_annotated_commit_from_ref(&upstream_head, repo, upstream_ref)); - - cl_git_pass(git_rebase_init(&rebase, repo, branch_head, upstream_head, NULL, NULL)); - - /* Allow untracked files */ - cl_git_pass(git_rebase_next(&rebase_operation, rebase)); - cl_git_mkfile("rebase/untracked_file.txt", "This is untracked\n"); - cl_git_pass(git_rebase_commit(&commit_id, rebase, NULL, signature, - NULL, NULL)); - - /* Do not allow unstaged */ - cl_git_pass(git_rebase_next(&rebase_operation, rebase)); - cl_git_mkfile("rebase/veal.txt", "This is an unstaged change\n"); - cl_git_fail_with(GIT_EUNMERGED, git_rebase_commit(&commit_id, rebase, NULL, signature, - NULL, NULL)); - - git_annotated_commit_free(branch_head); - git_annotated_commit_free(upstream_head); - git_reference_free(branch_ref); - git_reference_free(upstream_ref); - git_rebase_free(rebase); -} - -void test_rebase_merge__commit_updates_rewritten(void) -{ - git_rebase *rebase; - git_reference *branch_ref, *upstream_ref; - git_annotated_commit *branch_head, *upstream_head; - git_rebase_operation *rebase_operation; - git_oid commit_id; - - cl_git_pass(git_reference_lookup(&branch_ref, repo, "refs/heads/beef")); - cl_git_pass(git_reference_lookup(&upstream_ref, repo, "refs/heads/master")); - - cl_git_pass(git_annotated_commit_from_ref(&branch_head, repo, branch_ref)); - cl_git_pass(git_annotated_commit_from_ref(&upstream_head, repo, upstream_ref)); - - cl_git_pass(git_rebase_init(&rebase, repo, branch_head, upstream_head, NULL, NULL)); - - cl_git_pass(git_rebase_next(&rebase_operation, rebase)); - cl_git_pass(git_rebase_commit(&commit_id, rebase, NULL, signature, - NULL, NULL)); - - cl_git_pass(git_rebase_next(&rebase_operation, rebase)); - cl_git_pass(git_rebase_commit(&commit_id, rebase, NULL, signature, - NULL, NULL)); - - cl_assert_equal_file( - "da9c51a23d02d931a486f45ad18cda05cf5d2b94 776e4c48922799f903f03f5f6e51da8b01e4cce0\n" - "8d1f13f93c4995760ac07d129246ac1ff64c0be9 ba1f9b4fd5cf8151f7818be2111cc0869f1eb95a\n", - 164, "rebase/.git/rebase-merge/rewritten"); - - git_annotated_commit_free(branch_head); - git_annotated_commit_free(upstream_head); - git_reference_free(branch_ref); - git_reference_free(upstream_ref); - git_rebase_free(rebase); -} - -void test_rebase_merge__commit_drops_already_applied(void) -{ - git_rebase *rebase; - git_reference *branch_ref, *upstream_ref; - git_annotated_commit *branch_head, *upstream_head; - git_rebase_operation *rebase_operation; - git_oid commit_id; - int error; - - cl_git_pass(git_reference_lookup(&branch_ref, repo, "refs/heads/beef")); - cl_git_pass(git_reference_lookup(&upstream_ref, repo, "refs/heads/green_pea")); - - cl_git_pass(git_annotated_commit_from_ref(&branch_head, repo, branch_ref)); - cl_git_pass(git_annotated_commit_from_ref(&upstream_head, repo, upstream_ref)); - - cl_git_pass(git_rebase_init(&rebase, repo, branch_head, upstream_head, NULL, NULL)); - - cl_git_pass(git_rebase_next(&rebase_operation, rebase)); - cl_git_fail(error = git_rebase_commit(&commit_id, rebase, NULL, signature, - NULL, NULL)); - - cl_assert_equal_i(GIT_EAPPLIED, error); - - cl_git_pass(git_rebase_next(&rebase_operation, rebase)); - cl_git_pass(git_rebase_commit(&commit_id, rebase, NULL, signature, - NULL, NULL)); - - cl_assert_equal_file( - "8d1f13f93c4995760ac07d129246ac1ff64c0be9 2ac4fb7b74c1287f6c792acad759e1ec01e18dae\n", - 82, "rebase/.git/rebase-merge/rewritten"); - - git_annotated_commit_free(branch_head); - git_annotated_commit_free(upstream_head); - git_reference_free(branch_ref); - git_reference_free(upstream_ref); - git_rebase_free(rebase); -} - -void test_rebase_merge__finish(void) -{ - git_rebase *rebase; - git_reference *branch_ref, *upstream_ref, *head_ref; - git_annotated_commit *branch_head, *upstream_head; - git_rebase_operation *rebase_operation; - git_oid commit_id; - git_reflog *reflog; - const git_reflog_entry *reflog_entry; - int error; - - cl_git_pass(git_reference_lookup(&branch_ref, repo, "refs/heads/gravy")); - cl_git_pass(git_reference_lookup(&upstream_ref, repo, "refs/heads/veal")); - - cl_git_pass(git_annotated_commit_from_ref(&branch_head, repo, branch_ref)); - cl_git_pass(git_annotated_commit_from_ref(&upstream_head, repo, upstream_ref)); - - cl_git_pass(git_rebase_init(&rebase, repo, branch_head, upstream_head, NULL, NULL)); - - cl_git_pass(git_rebase_next(&rebase_operation, rebase)); - cl_git_pass(git_rebase_commit(&commit_id, rebase, NULL, signature, - NULL, NULL)); - - cl_git_fail(error = git_rebase_next(&rebase_operation, rebase)); - cl_assert_equal_i(GIT_ITEROVER, error); - - cl_git_pass(git_rebase_finish(rebase, signature)); - - cl_assert_equal_i(GIT_REPOSITORY_STATE_NONE, git_repository_state(repo)); - - cl_git_pass(git_reference_lookup(&head_ref, repo, "HEAD")); - cl_assert_equal_i(GIT_REF_SYMBOLIC, git_reference_type(head_ref)); - cl_assert_equal_s("refs/heads/gravy", git_reference_symbolic_target(head_ref)); - - /* Make sure the reflogs are updated appropriately */ - cl_git_pass(git_reflog_read(&reflog, repo, "HEAD")); - cl_assert(reflog_entry = git_reflog_entry_byindex(reflog, 0)); - cl_assert_equal_oid(&commit_id, git_reflog_entry_id_old(reflog_entry)); - cl_assert_equal_oid(&commit_id, git_reflog_entry_id_new(reflog_entry)); - cl_assert_equal_s("rebase finished: returning to refs/heads/gravy", git_reflog_entry_message(reflog_entry)); - git_reflog_free(reflog); - - cl_git_pass(git_reflog_read(&reflog, repo, "refs/heads/gravy")); - cl_assert(reflog_entry = git_reflog_entry_byindex(reflog, 0)); - cl_assert_equal_oid(git_annotated_commit_id(branch_head), git_reflog_entry_id_old(reflog_entry)); - cl_assert_equal_oid(&commit_id, git_reflog_entry_id_new(reflog_entry)); - cl_assert_equal_s("rebase finished: refs/heads/gravy onto f87d14a4a236582a0278a916340a793714256864", git_reflog_entry_message(reflog_entry)); - - git_reflog_free(reflog); - git_annotated_commit_free(branch_head); - git_annotated_commit_free(upstream_head); - git_reference_free(head_ref); - git_reference_free(branch_ref); - git_reference_free(upstream_ref); - git_rebase_free(rebase); -} - -static void test_copy_note( - const git_rebase_options *opts, - bool should_exist) -{ - git_rebase *rebase; - git_reference *branch_ref, *upstream_ref; - git_annotated_commit *branch_head, *upstream_head; - git_commit *branch_commit; - git_rebase_operation *rebase_operation; - git_oid note_id, commit_id; - git_note *note = NULL; - int error; - - cl_git_pass(git_reference_lookup(&branch_ref, repo, "refs/heads/gravy")); - cl_git_pass(git_reference_lookup(&upstream_ref, repo, "refs/heads/veal")); - - cl_git_pass(git_annotated_commit_from_ref(&branch_head, repo, branch_ref)); - cl_git_pass(git_annotated_commit_from_ref(&upstream_head, repo, upstream_ref)); - - cl_git_pass(git_reference_peel((git_object **)&branch_commit, - branch_ref, GIT_OBJ_COMMIT)); - - /* Add a note to a commit */ - cl_git_pass(git_note_create(¬e_id, repo, "refs/notes/test", - git_commit_author(branch_commit), git_commit_committer(branch_commit), - git_commit_id(branch_commit), - "This is a commit note.", 0)); - - cl_git_pass(git_rebase_init(&rebase, repo, branch_head, upstream_head, NULL, opts)); - - cl_git_pass(git_rebase_next(&rebase_operation, rebase)); - cl_git_pass(git_rebase_commit(&commit_id, rebase, NULL, signature, - NULL, NULL)); - - cl_git_pass(git_rebase_finish(rebase, signature)); - - cl_assert_equal_i(GIT_REPOSITORY_STATE_NONE, git_repository_state(repo)); - - if (should_exist) { - cl_git_pass(git_note_read(¬e, repo, "refs/notes/test", &commit_id)); - cl_assert_equal_s("This is a commit note.", git_note_message(note)); - } else { - cl_git_fail(error = - git_note_read(¬e, repo, "refs/notes/test", &commit_id)); - cl_assert_equal_i(GIT_ENOTFOUND, error); - } - - git_note_free(note); - git_commit_free(branch_commit); - git_annotated_commit_free(branch_head); - git_annotated_commit_free(upstream_head); - git_reference_free(branch_ref); - git_reference_free(upstream_ref); - git_rebase_free(rebase); -} - -void test_rebase_merge__copy_notes_off_by_default(void) -{ - test_copy_note(NULL, 0); -} - -void test_rebase_merge__copy_notes_specified_in_options(void) -{ - git_rebase_options opts = GIT_REBASE_OPTIONS_INIT; - opts.rewrite_notes_ref = "refs/notes/test"; - - test_copy_note(&opts, 1); -} - -void test_rebase_merge__copy_notes_specified_in_config(void) -{ - git_config *config; - - cl_git_pass(git_repository_config(&config, repo)); - cl_git_pass(git_config_set_string(config, - "notes.rewriteRef", "refs/notes/test")); - - test_copy_note(NULL, 1); -} - -void test_rebase_merge__copy_notes_disabled_in_config(void) -{ - git_config *config; - - cl_git_pass(git_repository_config(&config, repo)); - cl_git_pass(git_config_set_bool(config, "notes.rewrite.rebase", 0)); - cl_git_pass(git_config_set_string(config, - "notes.rewriteRef", "refs/notes/test")); - - test_copy_note(NULL, 0); -} - -void rebase_checkout_progress_cb( - const char *path, - size_t completed_steps, - size_t total_steps, - void *payload) -{ - int *called = payload; - - GIT_UNUSED(path); - GIT_UNUSED(completed_steps); - GIT_UNUSED(total_steps); - - *called = 1; -} - -void test_rebase_merge__custom_checkout_options(void) -{ - git_rebase *rebase; - git_reference *branch_ref, *upstream_ref; - git_annotated_commit *branch_head, *upstream_head; - git_rebase_options rebase_options = GIT_REBASE_OPTIONS_INIT; - git_checkout_options checkout_options = GIT_CHECKOUT_OPTIONS_INIT; - git_rebase_operation *rebase_operation; - int called = 0; - - checkout_options.progress_cb = rebase_checkout_progress_cb; - checkout_options.progress_payload = &called; - - memcpy(&rebase_options.checkout_options, &checkout_options, - sizeof(git_checkout_options)); - - cl_git_pass(git_reference_lookup(&branch_ref, repo, "refs/heads/beef")); - cl_git_pass(git_reference_lookup(&upstream_ref, repo, "refs/heads/master")); - - cl_git_pass(git_annotated_commit_from_ref(&branch_head, repo, branch_ref)); - cl_git_pass(git_annotated_commit_from_ref(&upstream_head, repo, upstream_ref)); - - called = 0; - cl_git_pass(git_rebase_init(&rebase, repo, branch_head, upstream_head, NULL, &rebase_options)); - cl_assert_equal_i(1, called); - - called = 0; - cl_git_pass(git_rebase_next(&rebase_operation, rebase)); - cl_assert_equal_i(1, called); - - called = 0; - cl_git_pass(git_rebase_abort(rebase)); - cl_assert_equal_i(1, called); - - git_annotated_commit_free(branch_head); - git_annotated_commit_free(upstream_head); - git_reference_free(branch_ref); - git_reference_free(upstream_ref); - git_rebase_free(rebase); -} - -void test_rebase_merge__custom_merge_options(void) -{ - git_rebase *rebase; - git_reference *branch_ref, *upstream_ref; - git_annotated_commit *branch_head, *upstream_head; - git_rebase_options rebase_options = GIT_REBASE_OPTIONS_INIT; - git_rebase_operation *rebase_operation; - - rebase_options.merge_options.flags |= - GIT_MERGE_FAIL_ON_CONFLICT | - GIT_MERGE_SKIP_REUC; - - cl_git_pass(git_reference_lookup(&branch_ref, repo, "refs/heads/asparagus")); - cl_git_pass(git_reference_lookup(&upstream_ref, repo, "refs/heads/master")); - - cl_git_pass(git_annotated_commit_from_ref(&branch_head, repo, branch_ref)); - cl_git_pass(git_annotated_commit_from_ref(&upstream_head, repo, upstream_ref)); - - cl_git_pass(git_rebase_init(&rebase, repo, branch_head, upstream_head, NULL, &rebase_options)); - - cl_git_fail_with(GIT_EMERGECONFLICT, git_rebase_next(&rebase_operation, rebase)); - - git_annotated_commit_free(branch_head); - git_annotated_commit_free(upstream_head); - git_reference_free(branch_ref); - git_reference_free(upstream_ref); - git_rebase_free(rebase); -} - diff --git a/vendor/libgit2/tests/rebase/setup.c b/vendor/libgit2/tests/rebase/setup.c deleted file mode 100644 index 627d3b9de..000000000 --- a/vendor/libgit2/tests/rebase/setup.c +++ /dev/null @@ -1,391 +0,0 @@ -#include "clar_libgit2.h" -#include "git2/rebase.h" -#include "posix.h" - -#include - -static git_repository *repo; -static git_index *_index; -static git_signature *signature; - -// Fixture setup and teardown -void test_rebase_setup__initialize(void) -{ - repo = cl_git_sandbox_init("rebase"); - cl_git_pass(git_repository_index(&_index, repo)); - cl_git_pass(git_signature_now(&signature, "Rebaser", "rebaser@rebaser.rb")); -} - -void test_rebase_setup__cleanup(void) -{ - git_signature_free(signature); - git_index_free(_index); - cl_git_sandbox_cleanup(); -} - -/* git checkout beef ; git rebase --merge master - * git checkout beef ; git rebase --merge master */ -void test_rebase_setup__blocked_when_in_progress(void) -{ - git_rebase *rebase; - git_reference *branch_ref, *upstream_ref; - git_annotated_commit *branch_head, *upstream_head; - - cl_assert_equal_i(GIT_REPOSITORY_STATE_NONE, git_repository_state(repo)); - - cl_git_pass(git_reference_lookup(&branch_ref, repo, "refs/heads/beef")); - cl_git_pass(git_reference_lookup(&upstream_ref, repo, "refs/heads/master")); - - cl_git_pass(git_annotated_commit_from_ref(&branch_head, repo, branch_ref)); - cl_git_pass(git_annotated_commit_from_ref(&upstream_head, repo, upstream_ref)); - - cl_git_pass(git_rebase_init(&rebase, repo, branch_head, upstream_head, NULL, NULL)); - git_rebase_free(rebase); - - cl_assert_equal_i(GIT_REPOSITORY_STATE_REBASE_MERGE, git_repository_state(repo)); - - cl_git_fail(git_rebase_init(&rebase, repo, branch_head, upstream_head, NULL, NULL)); - - git_annotated_commit_free(branch_head); - git_annotated_commit_free(upstream_head); - git_reference_free(branch_ref); - git_reference_free(upstream_ref); -} - -/* git checkout beef ; git rebase --merge master */ -void test_rebase_setup__merge(void) -{ - git_rebase *rebase; - git_reference *branch_ref, *upstream_ref; - git_annotated_commit *branch_head, *upstream_head; - git_reference *head; - git_commit *head_commit; - git_oid head_id; - - cl_assert_equal_i(GIT_REPOSITORY_STATE_NONE, git_repository_state(repo)); - - cl_git_pass(git_reference_lookup(&branch_ref, repo, "refs/heads/beef")); - cl_git_pass(git_reference_lookup(&upstream_ref, repo, "refs/heads/master")); - - cl_git_pass(git_annotated_commit_from_ref(&branch_head, repo, branch_ref)); - cl_git_pass(git_annotated_commit_from_ref(&upstream_head, repo, upstream_ref)); - - cl_git_pass(git_rebase_init(&rebase, repo, branch_head, upstream_head, NULL, NULL)); - - cl_assert_equal_i(GIT_REPOSITORY_STATE_REBASE_MERGE, git_repository_state(repo)); - - git_oid_fromstr(&head_id, "efad0b11c47cb2f0220cbd6f5b0f93bb99064b00"); - cl_git_pass(git_repository_head(&head, repo)); - cl_git_pass(git_reference_peel((git_object **)&head_commit, head, GIT_OBJ_COMMIT)); - cl_assert_equal_oid(&head_id, git_commit_id(head_commit)); - - cl_assert_equal_file("b146bd7608eac53d9bf9e1a6963543588b555c64\n", 41, "rebase/.git/ORIG_HEAD"); - - cl_assert_equal_file("da9c51a23d02d931a486f45ad18cda05cf5d2b94\n", 41, "rebase/.git/rebase-merge/cmt.1"); - cl_assert_equal_file("8d1f13f93c4995760ac07d129246ac1ff64c0be9\n", 41, "rebase/.git/rebase-merge/cmt.2"); - cl_assert_equal_file("3069cc907e6294623e5917ef6de663928c1febfb\n", 41, "rebase/.git/rebase-merge/cmt.3"); - cl_assert_equal_file("588e5d2f04d49707fe4aab865e1deacaf7ef6787\n", 41, "rebase/.git/rebase-merge/cmt.4"); - cl_assert_equal_file("b146bd7608eac53d9bf9e1a6963543588b555c64\n", 41, "rebase/.git/rebase-merge/cmt.5"); - cl_assert_equal_file("5\n", 2, "rebase/.git/rebase-merge/end"); - cl_assert_equal_file("efad0b11c47cb2f0220cbd6f5b0f93bb99064b00\n", 41, "rebase/.git/rebase-merge/onto"); - cl_assert_equal_file("master\n", 7, "rebase/.git/rebase-merge/onto_name"); - cl_assert_equal_file("b146bd7608eac53d9bf9e1a6963543588b555c64\n", 41, "rebase/.git/rebase-merge/orig-head"); - - git_commit_free(head_commit); - git_reference_free(head); - git_annotated_commit_free(branch_head); - git_annotated_commit_free(upstream_head); - git_reference_free(branch_ref); - git_reference_free(upstream_ref); - git_rebase_free(rebase); -} - -/* git checkout beef && git rebase --merge --root --onto master */ -void test_rebase_setup__merge_root(void) -{ - git_rebase *rebase; - git_reference *branch_ref, *onto_ref; - git_annotated_commit *branch_head, *onto_head; - git_reference *head; - git_commit *head_commit; - git_oid head_id; - - cl_assert_equal_i(GIT_REPOSITORY_STATE_NONE, git_repository_state(repo)); - - cl_git_pass(git_reference_lookup(&branch_ref, repo, "refs/heads/beef")); - cl_git_pass(git_reference_lookup(&onto_ref, repo, "refs/heads/master")); - - cl_git_pass(git_annotated_commit_from_ref(&branch_head, repo, branch_ref)); - cl_git_pass(git_annotated_commit_from_ref(&onto_head, repo, onto_ref)); - - cl_git_pass(git_rebase_init(&rebase, repo, branch_head, NULL, onto_head, NULL)); - - git_oid_fromstr(&head_id, "efad0b11c47cb2f0220cbd6f5b0f93bb99064b00"); - cl_git_pass(git_repository_head(&head, repo)); - cl_git_pass(git_reference_peel((git_object **)&head_commit, head, GIT_OBJ_COMMIT)); - cl_assert_equal_oid(&head_id, git_commit_id(head_commit)); - - cl_assert_equal_file("b146bd7608eac53d9bf9e1a6963543588b555c64\n", 41, "rebase/.git/ORIG_HEAD"); - - cl_assert_equal_i(GIT_REPOSITORY_STATE_REBASE_MERGE, git_repository_state(repo)); - - cl_assert_equal_file("da9c51a23d02d931a486f45ad18cda05cf5d2b94\n", 41, "rebase/.git/rebase-merge/cmt.1"); - cl_assert_equal_file("8d1f13f93c4995760ac07d129246ac1ff64c0be9\n", 41, "rebase/.git/rebase-merge/cmt.2"); - cl_assert_equal_file("3069cc907e6294623e5917ef6de663928c1febfb\n", 41, "rebase/.git/rebase-merge/cmt.3"); - cl_assert_equal_file("588e5d2f04d49707fe4aab865e1deacaf7ef6787\n", 41, "rebase/.git/rebase-merge/cmt.4"); - cl_assert_equal_file("b146bd7608eac53d9bf9e1a6963543588b555c64\n", 41, "rebase/.git/rebase-merge/cmt.5"); - cl_assert_equal_file("5\n", 2, "rebase/.git/rebase-merge/end"); - cl_assert_equal_file("efad0b11c47cb2f0220cbd6f5b0f93bb99064b00\n", 41, "rebase/.git/rebase-merge/onto"); - cl_assert_equal_file("master\n", 7, "rebase/.git/rebase-merge/onto_name"); - cl_assert_equal_file("b146bd7608eac53d9bf9e1a6963543588b555c64\n", 41, "rebase/.git/rebase-merge/orig-head"); - - git_commit_free(head_commit); - git_reference_free(head); - git_annotated_commit_free(branch_head); - git_annotated_commit_free(onto_head); - git_reference_free(branch_ref); - git_reference_free(onto_ref); - git_rebase_free(rebase); -} - -/* git checkout gravy && git rebase --merge --onto master veal */ -void test_rebase_setup__merge_onto_and_upstream(void) -{ - git_rebase *rebase; - git_reference *branch1_ref, *branch2_ref, *onto_ref; - git_annotated_commit *branch1_head, *branch2_head, *onto_head; - git_reference *head; - git_commit *head_commit; - git_oid head_id; - - cl_assert_equal_i(GIT_REPOSITORY_STATE_NONE, git_repository_state(repo)); - - cl_git_pass(git_reference_lookup(&branch1_ref, repo, "refs/heads/gravy")); - cl_git_pass(git_reference_lookup(&branch2_ref, repo, "refs/heads/veal")); - cl_git_pass(git_reference_lookup(&onto_ref, repo, "refs/heads/master")); - - cl_git_pass(git_annotated_commit_from_ref(&branch1_head, repo, branch1_ref)); - cl_git_pass(git_annotated_commit_from_ref(&branch2_head, repo, branch2_ref)); - cl_git_pass(git_annotated_commit_from_ref(&onto_head, repo, onto_ref)); - - cl_git_pass(git_rebase_init(&rebase, repo, branch1_head, branch2_head, onto_head, NULL)); - - git_oid_fromstr(&head_id, "efad0b11c47cb2f0220cbd6f5b0f93bb99064b00"); - cl_git_pass(git_repository_head(&head, repo)); - cl_git_pass(git_reference_peel((git_object **)&head_commit, head, GIT_OBJ_COMMIT)); - cl_assert_equal_oid(&head_id, git_commit_id(head_commit)); - - cl_assert_equal_file("d616d97082eb7bb2dc6f180a7cca940993b7a56f\n", 41, "rebase/.git/ORIG_HEAD"); - - cl_assert_equal_i(GIT_REPOSITORY_STATE_REBASE_MERGE, git_repository_state(repo)); - - cl_assert_equal_file("d616d97082eb7bb2dc6f180a7cca940993b7a56f\n", 41, "rebase/.git/rebase-merge/cmt.1"); - cl_assert_equal_file("1\n", 2, "rebase/.git/rebase-merge/end"); - cl_assert_equal_file("efad0b11c47cb2f0220cbd6f5b0f93bb99064b00\n", 41, "rebase/.git/rebase-merge/onto"); - cl_assert_equal_file("master\n", 7, "rebase/.git/rebase-merge/onto_name"); - cl_assert_equal_file("d616d97082eb7bb2dc6f180a7cca940993b7a56f\n", 41, "rebase/.git/rebase-merge/orig-head"); - - git_commit_free(head_commit); - git_reference_free(head); - git_annotated_commit_free(branch1_head); - git_annotated_commit_free(branch2_head); - git_annotated_commit_free(onto_head); - git_reference_free(branch1_ref); - git_reference_free(branch2_ref); - git_reference_free(onto_ref); - git_rebase_free(rebase); -} - -/* Ensure merge commits are dropped in a rebase */ -/* git checkout veal && git rebase --merge master */ -void test_rebase_setup__branch_with_merges(void) -{ - git_rebase *rebase; - git_reference *branch_ref, *upstream_ref; - git_annotated_commit *branch_head, *upstream_head; - git_reference *head; - git_commit *head_commit; - git_oid head_id; - - cl_assert_equal_i(GIT_REPOSITORY_STATE_NONE, git_repository_state(repo)); - - cl_git_pass(git_reference_lookup(&branch_ref, repo, "refs/heads/veal")); - cl_git_pass(git_reference_lookup(&upstream_ref, repo, "refs/heads/master")); - - cl_git_pass(git_annotated_commit_from_ref(&branch_head, repo, branch_ref)); - cl_git_pass(git_annotated_commit_from_ref(&upstream_head, repo, upstream_ref)); - - cl_git_pass(git_rebase_init(&rebase, repo, branch_head, upstream_head, NULL, NULL)); - - cl_assert_equal_i(GIT_REPOSITORY_STATE_REBASE_MERGE, git_repository_state(repo)); - - git_oid_fromstr(&head_id, "efad0b11c47cb2f0220cbd6f5b0f93bb99064b00"); - cl_git_pass(git_repository_head(&head, repo)); - cl_git_pass(git_reference_peel((git_object **)&head_commit, head, GIT_OBJ_COMMIT)); - cl_assert_equal_oid(&head_id, git_commit_id(head_commit)); - - cl_assert_equal_file("f87d14a4a236582a0278a916340a793714256864\n", 41, "rebase/.git/ORIG_HEAD"); - - cl_assert_equal_file("4bed71df7017283cac61bbf726197ad6a5a18b84\n", 41, "rebase/.git/rebase-merge/cmt.1"); - cl_assert_equal_file("2aa3ce842094e08ebac152b3d6d5b0fff39f9c6e\n", 41, "rebase/.git/rebase-merge/cmt.2"); - cl_assert_equal_file("3e8989b5a16d5258c935d998ef0e6bb139cc4757\n", 41, "rebase/.git/rebase-merge/cmt.3"); - cl_assert_equal_file("4cacc6f6e740a5bc64faa33e04b8ef0733d8a127\n", 41, "rebase/.git/rebase-merge/cmt.4"); - cl_assert_equal_file("f87d14a4a236582a0278a916340a793714256864\n", 41, "rebase/.git/rebase-merge/cmt.5"); - cl_assert_equal_file("5\n", 2, "rebase/.git/rebase-merge/end"); - cl_assert_equal_file("efad0b11c47cb2f0220cbd6f5b0f93bb99064b00\n", 41, "rebase/.git/rebase-merge/onto"); - cl_assert_equal_file("master\n", 7, "rebase/.git/rebase-merge/onto_name"); - cl_assert_equal_file("f87d14a4a236582a0278a916340a793714256864\n", 41, "rebase/.git/rebase-merge/orig-head"); - - git_commit_free(head_commit); - git_reference_free(head); - git_annotated_commit_free(branch_head); - git_annotated_commit_free(upstream_head); - git_reference_free(branch_ref); - git_reference_free(upstream_ref); - git_rebase_free(rebase); -} - -/* git checkout barley && git rebase --merge master */ -void test_rebase_setup__orphan_branch(void) -{ - git_rebase *rebase; - git_reference *branch_ref, *upstream_ref; - git_annotated_commit *branch_head, *upstream_head; - git_reference *head; - git_commit *head_commit; - git_oid head_id; - - cl_assert_equal_i(GIT_REPOSITORY_STATE_NONE, git_repository_state(repo)); - - cl_git_pass(git_reference_lookup(&branch_ref, repo, "refs/heads/barley")); - cl_git_pass(git_reference_lookup(&upstream_ref, repo, "refs/heads/master")); - - cl_git_pass(git_annotated_commit_from_ref(&branch_head, repo, branch_ref)); - cl_git_pass(git_annotated_commit_from_ref(&upstream_head, repo, upstream_ref)); - - cl_git_pass(git_rebase_init(&rebase, repo, branch_head, upstream_head, NULL, NULL)); - - cl_assert_equal_i(GIT_REPOSITORY_STATE_REBASE_MERGE, git_repository_state(repo)); - - git_oid_fromstr(&head_id, "efad0b11c47cb2f0220cbd6f5b0f93bb99064b00"); - cl_git_pass(git_repository_head(&head, repo)); - cl_git_pass(git_reference_peel((git_object **)&head_commit, head, GIT_OBJ_COMMIT)); - cl_assert_equal_oid(&head_id, git_commit_id(head_commit)); - - cl_assert_equal_file("12c084412b952396962eb420716df01022b847cc\n", 41, "rebase/.git/ORIG_HEAD"); - - cl_assert_equal_file("aa4c42aecdfc7cd989bbc3209934ea7cda3f4d88\n", 41, "rebase/.git/rebase-merge/cmt.1"); - cl_assert_equal_file("e4f809f826c1a9fc929874bc0e4644dd2f2a1af4\n", 41, "rebase/.git/rebase-merge/cmt.2"); - cl_assert_equal_file("9539b2cc291d6a6b1b266df8474d31fdd344dd79\n", 41, "rebase/.git/rebase-merge/cmt.3"); - cl_assert_equal_file("013cc32d341bab0e6f039f50f153c18986f16c58\n", 41, "rebase/.git/rebase-merge/cmt.4"); - cl_assert_equal_file("12c084412b952396962eb420716df01022b847cc\n", 41, "rebase/.git/rebase-merge/cmt.5"); - cl_assert_equal_file("5\n", 2, "rebase/.git/rebase-merge/end"); - cl_assert_equal_file("efad0b11c47cb2f0220cbd6f5b0f93bb99064b00\n", 41, "rebase/.git/rebase-merge/onto"); - cl_assert_equal_file("master\n", 7, "rebase/.git/rebase-merge/onto_name"); - cl_assert_equal_file("12c084412b952396962eb420716df01022b847cc\n", 41, "rebase/.git/rebase-merge/orig-head"); - - git_commit_free(head_commit); - git_reference_free(head); - git_annotated_commit_free(branch_head); - git_annotated_commit_free(upstream_head); - git_reference_free(branch_ref); - git_reference_free(upstream_ref); - git_rebase_free(rebase); -} - -/* git checkout beef && git rebase --merge master */ -void test_rebase_setup__merge_null_branch_uses_HEAD(void) -{ - git_rebase *rebase; - git_reference *upstream_ref; - git_annotated_commit *upstream_head; - git_reference *head; - git_commit *head_commit; - git_oid head_id; - git_checkout_options checkout_opts = GIT_CHECKOUT_OPTIONS_INIT; - - checkout_opts.checkout_strategy = GIT_CHECKOUT_FORCE; - - cl_assert_equal_i(GIT_REPOSITORY_STATE_NONE, git_repository_state(repo)); - - cl_git_pass(git_repository_set_head(repo, "refs/heads/beef")); - cl_git_pass(git_checkout_head(repo, &checkout_opts)); - - cl_git_pass(git_reference_lookup(&upstream_ref, repo, "refs/heads/master")); - cl_git_pass(git_annotated_commit_from_ref(&upstream_head, repo, upstream_ref)); - - cl_git_pass(git_rebase_init(&rebase, repo, NULL, upstream_head, NULL, NULL)); - - cl_assert_equal_i(GIT_REPOSITORY_STATE_REBASE_MERGE, git_repository_state(repo)); - - git_oid_fromstr(&head_id, "efad0b11c47cb2f0220cbd6f5b0f93bb99064b00"); - cl_git_pass(git_repository_head(&head, repo)); - cl_git_pass(git_reference_peel((git_object **)&head_commit, head, GIT_OBJ_COMMIT)); - cl_assert_equal_oid(&head_id, git_commit_id(head_commit)); - - cl_assert_equal_file("b146bd7608eac53d9bf9e1a6963543588b555c64\n", 41, "rebase/.git/ORIG_HEAD"); - - cl_assert_equal_file("da9c51a23d02d931a486f45ad18cda05cf5d2b94\n", 41, "rebase/.git/rebase-merge/cmt.1"); - cl_assert_equal_file("8d1f13f93c4995760ac07d129246ac1ff64c0be9\n", 41, "rebase/.git/rebase-merge/cmt.2"); - cl_assert_equal_file("3069cc907e6294623e5917ef6de663928c1febfb\n", 41, "rebase/.git/rebase-merge/cmt.3"); - cl_assert_equal_file("588e5d2f04d49707fe4aab865e1deacaf7ef6787\n", 41, "rebase/.git/rebase-merge/cmt.4"); - cl_assert_equal_file("b146bd7608eac53d9bf9e1a6963543588b555c64\n", 41, "rebase/.git/rebase-merge/cmt.5"); - cl_assert_equal_file("5\n", 2, "rebase/.git/rebase-merge/end"); - cl_assert_equal_file("efad0b11c47cb2f0220cbd6f5b0f93bb99064b00\n", 41, "rebase/.git/rebase-merge/onto"); - cl_assert_equal_file("master\n", 7, "rebase/.git/rebase-merge/onto_name"); - cl_assert_equal_file("b146bd7608eac53d9bf9e1a6963543588b555c64\n", 41, "rebase/.git/rebase-merge/orig-head"); - - git_commit_free(head_commit); - git_reference_free(head); - git_annotated_commit_free(upstream_head); - git_reference_free(upstream_ref); - git_rebase_free(rebase); -} - -static int rebase_is_blocked(void) -{ - git_rebase *rebase = NULL; - int error; - - git_reference *branch_ref, *upstream_ref; - git_annotated_commit *branch_head, *upstream_head; - - cl_assert_equal_i(GIT_REPOSITORY_STATE_NONE, git_repository_state(repo)); - - cl_git_pass(git_reference_lookup(&branch_ref, repo, "refs/heads/beef")); - cl_git_pass(git_reference_lookup(&upstream_ref, repo, "refs/heads/master")); - - cl_git_pass(git_annotated_commit_from_ref(&branch_head, repo, branch_ref)); - cl_git_pass(git_annotated_commit_from_ref(&upstream_head, repo, upstream_ref)); - - error = git_rebase_init(&rebase, repo, branch_head, upstream_head, NULL, NULL); - - git_annotated_commit_free(branch_head); - git_annotated_commit_free(upstream_head); - - git_reference_free(branch_ref); - git_reference_free(upstream_ref); - git_rebase_free(rebase); - - return error; -} - -void test_rebase_setup__blocked_for_staged_change(void) -{ - cl_git_rewritefile("rebase/newfile.txt", "Stage an add"); - git_index_add_bypath(_index, "newfile.txt"); - cl_git_fail(rebase_is_blocked()); -} - -void test_rebase_setup__blocked_for_unstaged_change(void) -{ - cl_git_rewritefile("rebase/asparagus.txt", "Unstaged change"); - cl_git_fail(rebase_is_blocked()); -} - -void test_rebase_setup__not_blocked_for_untracked_add(void) -{ - cl_git_rewritefile("rebase/newfile.txt", "Untracked file"); - cl_git_pass(rebase_is_blocked()); -} - diff --git a/vendor/libgit2/tests/refs/branches/create.c b/vendor/libgit2/tests/refs/branches/create.c deleted file mode 100644 index 31dec0678..000000000 --- a/vendor/libgit2/tests/refs/branches/create.c +++ /dev/null @@ -1,300 +0,0 @@ -#include "clar_libgit2.h" -#include "refs.h" -#include "path.h" - -static git_repository *repo; -static git_commit *target; -static git_reference *branch; - -void test_refs_branches_create__initialize(void) -{ - repo = cl_git_sandbox_init("testrepo.git"); - branch = NULL; - target = NULL; -} - -void test_refs_branches_create__cleanup(void) -{ - git_reference_free(branch); - branch = NULL; - - git_commit_free(target); - target = NULL; - - cl_git_sandbox_cleanup(); - repo = NULL; -} - -static void retrieve_target_from_oid(git_commit **out, git_repository *repo, const char *sha) -{ - git_object *obj; - - cl_git_pass(git_revparse_single(&obj, repo, sha)); - cl_git_pass(git_commit_lookup(out, repo, git_object_id(obj))); - git_object_free(obj); -} - -static void retrieve_known_commit(git_commit **commit, git_repository *repo) -{ - retrieve_target_from_oid(commit, repo, "e90810b8df3"); -} - -#define NEW_BRANCH_NAME "new-branch-on-the-block" - -void test_refs_branches_create__can_create_a_local_branch(void) -{ - retrieve_known_commit(&target, repo); - - cl_git_pass(git_branch_create(&branch, repo, NEW_BRANCH_NAME, target, 0)); - cl_git_pass(git_oid_cmp(git_reference_target(branch), git_commit_id(target))); -} - -void test_refs_branches_create__can_not_create_a_branch_if_its_name_collide_with_an_existing_one(void) -{ - retrieve_known_commit(&target, repo); - - cl_assert_equal_i(GIT_EEXISTS, git_branch_create(&branch, repo, "br2", target, 0)); -} - -void test_refs_branches_create__can_force_create_over_an_existing_branch(void) -{ - retrieve_known_commit(&target, repo); - - cl_git_pass(git_branch_create(&branch, repo, "br2", target, 1)); - cl_git_pass(git_oid_cmp(git_reference_target(branch), git_commit_id(target))); - cl_assert_equal_s("refs/heads/br2", git_reference_name(branch)); -} - -void test_refs_branches_create__cannot_force_create_over_current_branch(void) -{ - const git_oid *oid; - git_reference *branch2; - retrieve_known_commit(&target, repo); - - cl_git_pass(git_branch_lookup(&branch2, repo, "master", GIT_BRANCH_LOCAL)); - cl_assert_equal_s("refs/heads/master", git_reference_name(branch2)); - cl_assert_equal_i(true, git_branch_is_head(branch2)); - oid = git_reference_target(branch2); - - cl_git_fail_with(-1, git_branch_create(&branch, repo, "master", target, 1)); - branch = NULL; - cl_git_pass(git_branch_lookup(&branch, repo, "master", GIT_BRANCH_LOCAL)); - cl_assert_equal_s("refs/heads/master", git_reference_name(branch)); - cl_git_pass(git_oid_cmp(git_reference_target(branch), oid)); - git_reference_free(branch2); -} - -void test_refs_branches_create__creating_a_branch_with_an_invalid_name_returns_EINVALIDSPEC(void) -{ - retrieve_known_commit(&target, repo); - - cl_assert_equal_i(GIT_EINVALIDSPEC, - git_branch_create(&branch, repo, "inv@{id", target, 0)); -} - -void test_refs_branches_create__default_reflog_message(void) -{ - git_reflog *log; - git_buf buf = GIT_BUF_INIT; - const git_reflog_entry *entry; - git_annotated_commit *annotated; - git_signature *sig; - git_config *cfg; - - cl_git_pass(git_repository_config(&cfg, repo)); - cl_git_pass(git_config_set_string(cfg, "user.name", "Foo Bar")); - cl_git_pass(git_config_set_string(cfg, "user.email", "foo@example.com")); - git_config_free(cfg); - - cl_git_pass(git_signature_default(&sig, repo)); - - retrieve_known_commit(&target, repo); - cl_git_pass(git_branch_create(&branch, repo, NEW_BRANCH_NAME, target, false)); - cl_git_pass(git_reflog_read(&log, repo, "refs/heads/" NEW_BRANCH_NAME)); - - entry = git_reflog_entry_byindex(log, 0); - cl_git_pass(git_buf_printf(&buf, "branch: Created from %s", git_oid_tostr_s(git_commit_id(target)))); - cl_assert_equal_s(git_buf_cstr(&buf), git_reflog_entry_message(entry)); - cl_assert_equal_s(sig->email, git_reflog_entry_committer(entry)->email); - - cl_git_pass(git_reference_remove(repo, "refs/heads/" NEW_BRANCH_NAME)); - git_reference_free(branch); - git_reflog_free(log); - git_buf_clear(&buf); - - cl_git_pass(git_annotated_commit_from_revspec(&annotated, repo, "e90810b8df3")); - cl_git_pass(git_branch_create_from_annotated(&branch, repo, NEW_BRANCH_NAME, annotated, true)); - cl_git_pass(git_reflog_read(&log, repo, "refs/heads/" NEW_BRANCH_NAME)); - - entry = git_reflog_entry_byindex(log, 0); - cl_git_pass(git_buf_printf(&buf, "branch: Created from e90810b8df3")); - cl_assert_equal_s(git_buf_cstr(&buf), git_reflog_entry_message(entry)); - cl_assert_equal_s(sig->email, git_reflog_entry_committer(entry)->email); - - git_annotated_commit_free(annotated); - git_buf_free(&buf); - git_reflog_free(log); - git_signature_free(sig); -} - -static void assert_branch_matches_name( - const char *expected, const char *lookup_as) -{ - git_reference *ref; - git_buf b = GIT_BUF_INIT; - - cl_git_pass(git_branch_lookup(&ref, repo, lookup_as, GIT_BRANCH_LOCAL)); - - cl_git_pass(git_buf_sets(&b, "refs/heads/")); - cl_git_pass(git_buf_puts(&b, expected)); - cl_assert_equal_s(b.ptr, git_reference_name(ref)); - - cl_git_pass( - git_oid_cmp(git_reference_target(ref), git_commit_id(target))); - - git_reference_free(ref); - git_buf_free(&b); -} - -void test_refs_branches_create__can_create_branch_with_unicode(void) -{ - const char *nfc = "\xC3\x85\x73\x74\x72\xC3\xB6\x6D"; - const char *nfd = "\x41\xCC\x8A\x73\x74\x72\x6F\xCC\x88\x6D"; - const char *emoji = "\xF0\x9F\x8D\xB7"; - const char *names[] = { nfc, nfd, emoji }; - const char *alt[] = { nfd, nfc, NULL }; - const char *expected[] = { nfc, nfd, emoji }; - unsigned int i; - bool fs_decompose_unicode = - git_path_does_fs_decompose_unicode(git_repository_path(repo)); - - retrieve_known_commit(&target, repo); - - if (cl_repo_get_bool(repo, "core.precomposeunicode")) - expected[1] = nfc; - /* test decomp. because not all Mac filesystems decompose unicode */ - else if (fs_decompose_unicode) - expected[0] = nfd; - - for (i = 0; i < ARRAY_SIZE(names); ++i) { - const char *name; - cl_git_pass(git_branch_create( - &branch, repo, names[i], target, 0)); - cl_git_pass(git_oid_cmp( - git_reference_target(branch), git_commit_id(target))); - - cl_git_pass(git_branch_name(&name, branch)); - cl_assert_equal_s(expected[i], name); - assert_branch_matches_name(expected[i], names[i]); - if (fs_decompose_unicode && alt[i]) - assert_branch_matches_name(expected[i], alt[i]); - - cl_git_pass(git_branch_delete(branch)); - git_reference_free(branch); - branch = NULL; - } -} - -/** - * Verify that we can create a branch with a name that matches the - * namespace of a previously delete branch. - * - * git branch level_one/level_two - * git branch -D level_one/level_two - * git branch level_one - * - * We expect the delete to have deleted the files: - * ".git/refs/heads/level_one/level_two" - * ".git/logs/refs/heads/level_one/level_two" - * It may or may not have deleted the (now empty) - * containing directories. To match git.git behavior, - * the second create needs to implicilty delete the - * directories and create the new files. - * "refs/heads/level_one" - * "logs/refs/heads/level_one" - * - * We should not fail to create the branch or its - * reflog because of an obsolete namespace container - * directory. - */ -void test_refs_branches_create__name_vs_namespace(void) -{ - const char * name; - struct item { - const char *first; - const char *second; - }; - static const struct item item[] = { - { "level_one/level_two", "level_one" }, - { "a/b/c/d/e", "a/b/c/d" }, - { "ss/tt/uu/vv/ww", "ss" }, - /* And one test case that is deeper. */ - { "xx1/xx2/xx3/xx4", "xx1/xx2/xx3/xx4/xx5/xx6" }, - { NULL, NULL }, - }; - const struct item *p; - - retrieve_known_commit(&target, repo); - - for (p=item; p->first; p++) { - cl_git_pass(git_branch_create(&branch, repo, p->first, target, 0)); - cl_git_pass(git_oid_cmp(git_reference_target(branch), git_commit_id(target))); - cl_git_pass(git_branch_name(&name, branch)); - cl_assert_equal_s(name, p->first); - - cl_git_pass(git_branch_delete(branch)); - git_reference_free(branch); - branch = NULL; - - cl_git_pass(git_branch_create(&branch, repo, p->second, target, 0)); - git_reference_free(branch); - branch = NULL; - } -} - -/** - * We still need to fail if part of the namespace is - * still in use. - */ -void test_refs_branches_create__name_vs_namespace_fail(void) -{ - const char * name; - struct item { - const char *first; - const char *first_alternate; - const char *second; - }; - static const struct item item[] = { - { "level_one/level_two", "level_one/alternate", "level_one" }, - { "a/b/c/d/e", "a/b/c/d/alternate", "a/b/c/d" }, - { "ss/tt/uu/vv/ww", "ss/alternate", "ss" }, - { NULL, NULL, NULL }, - }; - const struct item *p; - - retrieve_known_commit(&target, repo); - - for (p=item; p->first; p++) { - cl_git_pass(git_branch_create(&branch, repo, p->first, target, 0)); - cl_git_pass(git_oid_cmp(git_reference_target(branch), git_commit_id(target))); - cl_git_pass(git_branch_name(&name, branch)); - cl_assert_equal_s(name, p->first); - - cl_git_pass(git_branch_delete(branch)); - git_reference_free(branch); - branch = NULL; - - cl_git_pass(git_branch_create(&branch, repo, p->first_alternate, target, 0)); - cl_git_pass(git_oid_cmp(git_reference_target(branch), git_commit_id(target))); - cl_git_pass(git_branch_name(&name, branch)); - cl_assert_equal_s(name, p->first_alternate); - - /* we do not delete the alternate. */ - git_reference_free(branch); - branch = NULL; - - cl_git_fail(git_branch_create(&branch, repo, p->second, target, 0)); - git_reference_free(branch); - branch = NULL; - } -} diff --git a/vendor/libgit2/tests/refs/branches/delete.c b/vendor/libgit2/tests/refs/branches/delete.c deleted file mode 100644 index 8807db231..000000000 --- a/vendor/libgit2/tests/refs/branches/delete.c +++ /dev/null @@ -1,142 +0,0 @@ -#include "clar_libgit2.h" -#include "refs.h" -#include "repo/repo_helpers.h" -#include "config/config_helpers.h" - -static git_repository *repo; -static git_reference *fake_remote; - -void test_refs_branches_delete__initialize(void) -{ - git_oid id; - - repo = cl_git_sandbox_init("testrepo.git"); - - cl_git_pass(git_oid_fromstr(&id, "be3563ae3f795b2b4353bcce3a527ad0a4f7f644")); - cl_git_pass(git_reference_create(&fake_remote, repo, "refs/remotes/nulltoken/master", &id, 0, NULL)); -} - -void test_refs_branches_delete__cleanup(void) -{ - git_reference_free(fake_remote); - fake_remote = NULL; - - cl_git_sandbox_cleanup(); - repo = NULL; -} - -void test_refs_branches_delete__can_not_delete_a_branch_pointed_at_by_HEAD(void) -{ - git_reference *head; - git_reference *branch; - - /* Ensure HEAD targets the local master branch */ - cl_git_pass(git_reference_lookup(&head, repo, GIT_HEAD_FILE)); - cl_assert_equal_s("refs/heads/master", git_reference_symbolic_target(head)); - git_reference_free(head); - - cl_git_pass(git_branch_lookup(&branch, repo, "master", GIT_BRANCH_LOCAL)); - cl_git_fail(git_branch_delete(branch)); - git_reference_free(branch); -} - -void test_refs_branches_delete__can_delete_a_branch_even_if_HEAD_is_missing(void) -{ - git_reference *head; - git_reference *branch; - - cl_git_pass(git_reference_lookup(&head, repo, GIT_HEAD_FILE)); - git_reference_delete(head); - git_reference_free(head); - - cl_git_pass(git_branch_lookup(&branch, repo, "br2", GIT_BRANCH_LOCAL)); - cl_git_pass(git_branch_delete(branch)); - git_reference_free(branch); -} - -void test_refs_branches_delete__can_delete_a_branch_when_HEAD_is_unborn(void) -{ - git_reference *branch; - - make_head_unborn(repo, NON_EXISTING_HEAD); - - cl_git_pass(git_branch_lookup(&branch, repo, "br2", GIT_BRANCH_LOCAL)); - cl_git_pass(git_branch_delete(branch)); - git_reference_free(branch); -} - -void test_refs_branches_delete__can_delete_a_branch_pointed_at_by_detached_HEAD(void) -{ - git_reference *head, *branch; - - cl_git_pass(git_reference_lookup(&head, repo, GIT_HEAD_FILE)); - cl_assert_equal_i(GIT_REF_SYMBOLIC, git_reference_type(head)); - cl_assert_equal_s("refs/heads/master", git_reference_symbolic_target(head)); - git_reference_free(head); - - /* Detach HEAD and make it target the commit that "master" points to */ - git_repository_detach_head(repo); - - cl_git_pass(git_branch_lookup(&branch, repo, "master", GIT_BRANCH_LOCAL)); - cl_git_pass(git_branch_delete(branch)); - git_reference_free(branch); -} - -void test_refs_branches_delete__can_delete_a_local_branch(void) -{ - git_reference *branch; - cl_git_pass(git_branch_lookup(&branch, repo, "br2", GIT_BRANCH_LOCAL)); - cl_git_pass(git_branch_delete(branch)); - git_reference_free(branch); -} - -void test_refs_branches_delete__can_delete_a_remote_branch(void) -{ - git_reference *branch; - cl_git_pass(git_branch_lookup(&branch, repo, "nulltoken/master", GIT_BRANCH_REMOTE)); - cl_git_pass(git_branch_delete(branch)); - git_reference_free(branch); -} - -void test_refs_branches_delete__deleting_a_branch_removes_related_configuration_data(void) -{ - git_reference *branch; - - assert_config_entry_existence(repo, "branch.track-local.remote", true); - assert_config_entry_existence(repo, "branch.track-local.merge", true); - - cl_git_pass(git_branch_lookup(&branch, repo, "track-local", GIT_BRANCH_LOCAL)); - cl_git_pass(git_branch_delete(branch)); - git_reference_free(branch); - - assert_config_entry_existence(repo, "branch.track-local.remote", false); - assert_config_entry_existence(repo, "branch.track-local.merge", false); -} - -void test_refs_branches_delete__removes_reflog(void) -{ - git_reference *branch; - git_reflog *log; - git_oid oidzero = {{0}}; - git_signature *sig; - - /* Ensure the reflog has at least one entry */ - cl_git_pass(git_signature_now(&sig, "Me", "user@example.com")); - cl_git_pass(git_reflog_read(&log, repo, "refs/heads/track-local")); - cl_git_pass(git_reflog_append(log, &oidzero, sig, "message")); - cl_assert(git_reflog_entrycount(log) > 0); - git_signature_free(sig); - git_reflog_free(log); - - cl_git_pass(git_branch_lookup(&branch, repo, "track-local", GIT_BRANCH_LOCAL)); - cl_git_pass(git_branch_delete(branch)); - git_reference_free(branch); - - cl_assert_equal_i(false, git_reference_has_log(repo, "refs/heads/track-local")); - - /* Reading a nonexistant reflog creates it, but it should be empty */ - cl_git_pass(git_reflog_read(&log, repo, "refs/heads/track-local")); - cl_assert_equal_i(0, git_reflog_entrycount(log)); - git_reflog_free(log); -} - diff --git a/vendor/libgit2/tests/refs/branches/ishead.c b/vendor/libgit2/tests/refs/branches/ishead.c deleted file mode 100644 index 1df70b789..000000000 --- a/vendor/libgit2/tests/refs/branches/ishead.c +++ /dev/null @@ -1,98 +0,0 @@ -#include "clar_libgit2.h" -#include "refs.h" -#include "repo/repo_helpers.h" - -static git_repository *repo; -static git_reference *branch; - -void test_refs_branches_ishead__initialize(void) -{ - repo = cl_git_sandbox_init("testrepo.git"); - branch = NULL; -} - -void test_refs_branches_ishead__cleanup(void) -{ - git_reference_free(branch); - branch = NULL; - - cl_git_sandbox_cleanup(); - repo = NULL; -} - -void test_refs_branches_ishead__can_tell_if_a_branch_is_pointed_at_by_HEAD(void) -{ - cl_git_pass(git_reference_lookup(&branch, repo, "refs/heads/master")); - - cl_assert_equal_i(true, git_branch_is_head(branch)); -} - -void test_refs_branches_ishead__can_properly_handle_unborn_HEAD(void) -{ - make_head_unborn(repo, NON_EXISTING_HEAD); - - cl_git_pass(git_reference_lookup(&branch, repo, "refs/heads/master")); - - cl_assert_equal_i(false, git_branch_is_head(branch)); -} - -void test_refs_branches_ishead__can_properly_handle_missing_HEAD(void) -{ - delete_head(repo); - - cl_git_pass(git_reference_lookup(&branch, repo, "refs/heads/master")); - - cl_assert_equal_i(false, git_branch_is_head(branch)); -} - -void test_refs_branches_ishead__can_tell_if_a_branch_is_not_pointed_at_by_HEAD(void) -{ - cl_git_pass(git_reference_lookup(&branch, repo, "refs/heads/br2")); - - cl_assert_equal_i(false, git_branch_is_head(branch)); -} - -void test_refs_branches_ishead__wont_be_fooled_by_a_non_branch(void) -{ - cl_git_pass(git_reference_lookup(&branch, repo, "refs/tags/e90810b")); - - cl_assert_equal_i(false, git_branch_is_head(branch)); -} - -/* - * $ git init . - * Initialized empty Git repository in d:/temp/tempee/.git/ - * - * $ touch a && git add a - * $ git commit -m" boom" - * [master (root-commit) b47b758] boom - * 0 files changed - * create mode 100644 a - * - * $ echo "ref: refs/heads/master" > .git/refs/heads/linked - * $ echo "ref: refs/heads/linked" > .git/refs/heads/super - * $ echo "ref: refs/heads/super" > .git/HEAD - * - * $ git branch - * linked -> master - * * master - * super -> master - */ -void test_refs_branches_ishead__only_direct_references_are_considered(void) -{ - git_reference *linked, *super, *head; - - cl_git_pass(git_reference_symbolic_create(&linked, repo, "refs/heads/linked", "refs/heads/master", 0, NULL)); - cl_git_pass(git_reference_symbolic_create(&super, repo, "refs/heads/super", "refs/heads/linked", 0, NULL)); - cl_git_pass(git_reference_symbolic_create(&head, repo, GIT_HEAD_FILE, "refs/heads/super", 1, NULL)); - - cl_assert_equal_i(false, git_branch_is_head(linked)); - cl_assert_equal_i(false, git_branch_is_head(super)); - - cl_git_pass(git_repository_head(&branch, repo)); - cl_assert_equal_s("refs/heads/master", git_reference_name(branch)); - - git_reference_free(linked); - git_reference_free(super); - git_reference_free(head); -} diff --git a/vendor/libgit2/tests/refs/branches/iterator.c b/vendor/libgit2/tests/refs/branches/iterator.c deleted file mode 100644 index ca366c9f3..000000000 --- a/vendor/libgit2/tests/refs/branches/iterator.c +++ /dev/null @@ -1,151 +0,0 @@ -#include "clar_libgit2.h" -#include "refs.h" - -static git_repository *repo; -static git_reference *fake_remote; - -void test_refs_branches_iterator__initialize(void) -{ - git_oid id; - - cl_fixture_sandbox("testrepo.git"); - cl_git_pass(git_repository_open(&repo, "testrepo.git")); - - cl_git_pass(git_oid_fromstr(&id, "be3563ae3f795b2b4353bcce3a527ad0a4f7f644")); - cl_git_pass(git_reference_create(&fake_remote, repo, "refs/remotes/nulltoken/master", &id, 0, NULL)); -} - -void test_refs_branches_iterator__cleanup(void) -{ - git_reference_free(fake_remote); - fake_remote = NULL; - - git_repository_free(repo); - repo = NULL; - - cl_fixture_cleanup("testrepo.git"); - - cl_git_sandbox_cleanup(); -} - -static void assert_retrieval(unsigned int flags, unsigned int expected_count) -{ - git_branch_iterator *iter; - git_reference *ref; - int count = 0, error; - git_branch_t type; - - cl_git_pass(git_branch_iterator_new(&iter, repo, flags)); - while ((error = git_branch_next(&ref, &type, iter)) == 0) { - count++; - git_reference_free(ref); - } - - git_branch_iterator_free(iter); - cl_assert_equal_i(error, GIT_ITEROVER); - cl_assert_equal_i(expected_count, count); -} - -void test_refs_branches_iterator__retrieve_all_branches(void) -{ - assert_retrieval(GIT_BRANCH_ALL, 14); -} - -void test_refs_branches_iterator__retrieve_remote_branches(void) -{ - assert_retrieval(GIT_BRANCH_REMOTE, 2); -} - -void test_refs_branches_iterator__retrieve_local_branches(void) -{ - assert_retrieval(GIT_BRANCH_LOCAL, 12); -} - -struct expectations { - const char *branch_name; - int encounters; -}; - -static void assert_branch_has_been_found(struct expectations *findings, const char* expected_branch_name) -{ - int pos = 0; - - for (pos = 0; findings[pos].branch_name; ++pos) { - if (strcmp(expected_branch_name, findings[pos].branch_name) == 0) { - cl_assert_equal_i(1, findings[pos].encounters); - return; - } - } - - cl_fail("expected branch not found in list."); -} - -static void contains_branches(struct expectations exp[], git_branch_iterator *iter) -{ - git_reference *ref; - git_branch_t type; - int error, pos = 0; - - while ((error = git_branch_next(&ref, &type, iter)) == 0) { - for (pos = 0; exp[pos].branch_name; ++pos) { - if (strcmp(git_reference_shorthand(ref), exp[pos].branch_name) == 0) - exp[pos].encounters++; - } - - git_reference_free(ref); - } - - cl_assert_equal_i(error, GIT_ITEROVER); -} - -/* - * $ git branch -r - * nulltoken/HEAD -> nulltoken/master - * nulltoken/master - */ -void test_refs_branches_iterator__retrieve_remote_symbolic_HEAD_when_present(void) -{ - git_branch_iterator *iter; - struct expectations exp[] = { - { "nulltoken/HEAD", 0 }, - { "nulltoken/master", 0 }, - { NULL, 0 } - }; - - git_reference_free(fake_remote); - cl_git_pass(git_reference_symbolic_create(&fake_remote, repo, "refs/remotes/nulltoken/HEAD", "refs/remotes/nulltoken/master", 0, NULL)); - - assert_retrieval(GIT_BRANCH_REMOTE, 3); - - cl_git_pass(git_branch_iterator_new(&iter, repo, GIT_BRANCH_REMOTE)); - contains_branches(exp, iter); - git_branch_iterator_free(iter); - - assert_branch_has_been_found(exp, "nulltoken/HEAD"); - assert_branch_has_been_found(exp, "nulltoken/master"); -} - -void test_refs_branches_iterator__mix_of_packed_and_loose(void) -{ - git_branch_iterator *iter; - struct expectations exp[] = { - { "master", 0 }, - { "origin/HEAD", 0 }, - { "origin/master", 0 }, - { "origin/packed", 0 }, - { NULL, 0 } - }; - git_repository *r2; - - r2 = cl_git_sandbox_init("testrepo2"); - - cl_git_pass(git_branch_iterator_new(&iter, r2, GIT_BRANCH_ALL)); - contains_branches(exp, iter); - - git_branch_iterator_free(iter); - - assert_branch_has_been_found(exp, "master"); - assert_branch_has_been_found(exp, "origin/HEAD"); - assert_branch_has_been_found(exp, "origin/master"); - assert_branch_has_been_found(exp, "origin/packed"); -} diff --git a/vendor/libgit2/tests/refs/branches/lookup.c b/vendor/libgit2/tests/refs/branches/lookup.c deleted file mode 100644 index 95d49a4b3..000000000 --- a/vendor/libgit2/tests/refs/branches/lookup.c +++ /dev/null @@ -1,45 +0,0 @@ -#include "clar_libgit2.h" -#include "refs.h" - -static git_repository *repo; -static git_reference *branch; - -void test_refs_branches_lookup__initialize(void) -{ - cl_git_pass(git_repository_open(&repo, cl_fixture("testrepo.git"))); - - branch = NULL; -} - -void test_refs_branches_lookup__cleanup(void) -{ - git_reference_free(branch); - branch = NULL; - - git_repository_free(repo); - repo = NULL; -} - -void test_refs_branches_lookup__can_retrieve_a_local_branch(void) -{ - cl_git_pass(git_branch_lookup(&branch, repo, "br2", GIT_BRANCH_LOCAL)); -} - -void test_refs_branches_lookup__can_retrieve_a_remote_tracking_branch(void) -{ - cl_git_pass(git_branch_lookup(&branch, repo, "test/master", GIT_BRANCH_REMOTE)); -} - -void test_refs_branches_lookup__trying_to_retrieve_an_unknown_branch_returns_ENOTFOUND(void) -{ - cl_assert_equal_i(GIT_ENOTFOUND, git_branch_lookup(&branch, repo, "where/are/you", GIT_BRANCH_LOCAL)); - cl_assert_equal_i(GIT_ENOTFOUND, git_branch_lookup(&branch, repo, "over/here", GIT_BRANCH_REMOTE)); -} - -void test_refs_branches_lookup__trying_to_retrieve_a_branch_with_an_invalid_name_returns_EINVALIDSPEC(void) -{ - cl_assert_equal_i(GIT_EINVALIDSPEC, - git_branch_lookup(&branch, repo, "are/you/inv@{id", GIT_BRANCH_LOCAL)); - cl_assert_equal_i(GIT_EINVALIDSPEC, - git_branch_lookup(&branch, repo, "yes/i am", GIT_BRANCH_REMOTE)); -} diff --git a/vendor/libgit2/tests/refs/branches/move.c b/vendor/libgit2/tests/refs/branches/move.c deleted file mode 100644 index bec39e18b..000000000 --- a/vendor/libgit2/tests/refs/branches/move.c +++ /dev/null @@ -1,248 +0,0 @@ -#include "clar_libgit2.h" -#include "refs.h" -#include "config/config_helpers.h" - -static git_repository *repo; - -void test_refs_branches_move__initialize(void) -{ - repo = cl_git_sandbox_init("testrepo.git"); -} - -void test_refs_branches_move__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -#define NEW_BRANCH_NAME "new-branch-on-the-block" - -void test_refs_branches_move__can_move_a_local_branch(void) -{ - git_reference *original_ref, *new_ref; - - cl_git_pass(git_reference_lookup(&original_ref, repo, "refs/heads/br2")); - - cl_git_pass(git_branch_move(&new_ref, original_ref, NEW_BRANCH_NAME, 0)); - cl_assert_equal_s(GIT_REFS_HEADS_DIR NEW_BRANCH_NAME, git_reference_name(new_ref)); - - git_reference_free(original_ref); - git_reference_free(new_ref); -} - -void test_refs_branches_move__can_move_a_local_branch_to_a_different_namespace(void) -{ - git_reference *original_ref, *new_ref, *newer_ref; - - cl_git_pass(git_reference_lookup(&original_ref, repo, "refs/heads/br2")); - - /* Downward */ - cl_git_pass(git_branch_move(&new_ref, original_ref, "somewhere/" NEW_BRANCH_NAME, 0)); - git_reference_free(original_ref); - - /* Upward */ - cl_git_pass(git_branch_move(&newer_ref, new_ref, "br2", 0)); - git_reference_free(new_ref); - - git_reference_free(newer_ref); -} - -void test_refs_branches_move__can_move_a_local_branch_to_a_partially_colliding_namespace(void) -{ - git_reference *original_ref, *new_ref, *newer_ref; - - cl_git_pass(git_reference_lookup(&original_ref, repo, "refs/heads/br2")); - - /* Downward */ - cl_git_pass(git_branch_move(&new_ref, original_ref, "br2/" NEW_BRANCH_NAME, 0)); - git_reference_free(original_ref); - - /* Upward */ - cl_git_pass(git_branch_move(&newer_ref, new_ref, "br2", 0)); - git_reference_free(new_ref); - - git_reference_free(newer_ref); -} - -void test_refs_branches_move__can_not_move_a_branch_if_its_destination_name_collide_with_an_existing_one(void) -{ - git_reference *original_ref, *new_ref; - git_config *config; - git_buf buf = GIT_BUF_INIT; - char *original_remote, *original_merge; - const char *str; - - cl_git_pass(git_repository_config_snapshot(&config, repo)); - - cl_git_pass(git_config_get_string_buf(&buf, config, "branch.master.remote")); - original_remote = git_buf_detach(&buf); - cl_git_pass(git_config_get_string_buf(&buf, config, "branch.master.merge")); - original_merge = git_buf_detach(&buf); - git_config_free(config); - - cl_git_pass(git_reference_lookup(&original_ref, repo, "refs/heads/br2")); - - cl_assert_equal_i(GIT_EEXISTS, - git_branch_move(&new_ref, original_ref, "master", 0)); - - cl_assert(giterr_last()->message != NULL); - - cl_git_pass(git_repository_config_snapshot(&config, repo)); - cl_git_pass(git_config_get_string(&str, config, "branch.master.remote")); - cl_assert_equal_s(original_remote, str); - cl_git_pass(git_config_get_string(&str, config, "branch.master.merge")); - cl_assert_equal_s(original_merge, str); - git_config_free(config); - - cl_assert_equal_i(GIT_EEXISTS, - git_branch_move(&new_ref, original_ref, "cannot-fetch", 0)); - - cl_assert(giterr_last()->message != NULL); - - cl_git_pass(git_repository_config_snapshot(&config, repo)); - cl_git_pass(git_config_get_string(&str, config, "branch.master.remote")); - cl_assert_equal_s(original_remote, str); - cl_git_pass(git_config_get_string(&str, config, "branch.master.merge")); - cl_assert_equal_s(original_merge, str); - git_config_free(config); - - git_reference_free(original_ref); - cl_git_pass(git_reference_lookup(&original_ref, repo, "refs/heads/track-local")); - - cl_assert_equal_i(GIT_EEXISTS, - git_branch_move(&new_ref, original_ref, "master", 0)); - - cl_assert(giterr_last()->message != NULL); - - cl_git_pass(git_repository_config_snapshot(&config, repo)); - cl_git_pass(git_config_get_string(&str, config, "branch.master.remote")); - cl_assert_equal_s(original_remote, str); - cl_git_pass(git_config_get_string(&str, config, "branch.master.merge")); - cl_assert_equal_s(original_merge, str); - - git__free(original_remote); git__free(original_merge); - git_reference_free(original_ref); - git_config_free(config); -} - -void test_refs_branches_move__moving_a_branch_with_an_invalid_name_returns_EINVALIDSPEC(void) -{ - git_reference *original_ref, *new_ref; - - cl_git_pass(git_reference_lookup(&original_ref, repo, "refs/heads/br2")); - - cl_assert_equal_i(GIT_EINVALIDSPEC, git_branch_move(&new_ref, original_ref, "Inv@{id", 0)); - - git_reference_free(original_ref); -} - -void test_refs_branches_move__can_not_move_a_non_branch(void) -{ - git_reference *tag, *new_ref; - - cl_git_pass(git_reference_lookup(&tag, repo, "refs/tags/e90810b")); - cl_git_fail(git_branch_move(&new_ref, tag, NEW_BRANCH_NAME, 0)); - - git_reference_free(tag); -} - -void test_refs_branches_move__can_force_move_over_an_existing_branch(void) -{ - git_reference *original_ref, *new_ref; - - cl_git_pass(git_reference_lookup(&original_ref, repo, "refs/heads/br2")); - - cl_git_pass(git_branch_move(&new_ref, original_ref, "master", 1)); - - git_reference_free(original_ref); - git_reference_free(new_ref); -} - -void test_refs_branches_move__moving_a_branch_moves_related_configuration_data(void) -{ - git_reference *branch; - git_reference *new_branch; - - cl_git_pass(git_branch_lookup(&branch, repo, "track-local", GIT_BRANCH_LOCAL)); - - assert_config_entry_existence(repo, "branch.track-local.remote", true); - assert_config_entry_existence(repo, "branch.track-local.merge", true); - assert_config_entry_existence(repo, "branch.moved.remote", false); - assert_config_entry_existence(repo, "branch.moved.merge", false); - - cl_git_pass(git_branch_move(&new_branch, branch, "moved", 0)); - git_reference_free(branch); - - assert_config_entry_existence(repo, "branch.track-local.remote", false); - assert_config_entry_existence(repo, "branch.track-local.merge", false); - assert_config_entry_existence(repo, "branch.moved.remote", true); - assert_config_entry_existence(repo, "branch.moved.merge", true); - - git_reference_free(new_branch); -} - -void test_refs_branches_move__moving_the_branch_pointed_at_by_HEAD_updates_HEAD(void) -{ - git_reference *branch; - git_reference *new_branch; - - cl_git_pass(git_reference_lookup(&branch, repo, "refs/heads/master")); - cl_git_pass(git_branch_move(&new_branch, branch, "master2", 0)); - git_reference_free(branch); - git_reference_free(new_branch); - - cl_git_pass(git_repository_head(&branch, repo)); - cl_assert_equal_s("refs/heads/master2", git_reference_name(branch)); - git_reference_free(branch); -} - -void test_refs_branches_move__default_reflog_message(void) -{ - git_reference *branch; - git_reference *new_branch; - git_reflog *log; - const git_reflog_entry *entry; - git_signature *sig; - git_config *cfg; - git_oid id; - - cl_git_pass(git_repository_config(&cfg, repo)); - cl_git_pass(git_config_set_string(cfg, "user.name", "Foo Bar")); - cl_git_pass(git_config_set_string(cfg, "user.email", "foo@example.com")); - git_config_free(cfg); - - cl_git_pass(git_signature_default(&sig, repo)); - - cl_git_pass(git_reference_lookup(&branch, repo, "refs/heads/master")); - git_oid_cpy(&id, git_reference_target(branch)); - cl_git_pass(git_branch_move(&new_branch, branch, "master2", 0)); - - cl_git_pass(git_reflog_read(&log, repo, git_reference_name(new_branch))); - entry = git_reflog_entry_byindex(log, 0); - cl_assert_equal_s("branch: renamed refs/heads/master to refs/heads/master2", - git_reflog_entry_message(entry)); - cl_assert_equal_s(sig->email, git_reflog_entry_committer(entry)->email); - cl_assert_equal_oid(&id, git_reflog_entry_id_old(entry)); - cl_assert_equal_oid(&id, git_reflog_entry_id_new(entry)); - - git_reference_free(branch); - git_reference_free(new_branch); - git_reflog_free(log); - git_signature_free(sig); -} - -void test_refs_branches_move__can_move_with_unicode(void) -{ - git_reference *original_ref, *new_ref; - const char *new_branch_name = "\x41\xCC\x8A\x73\x74\x72\x6F\xCC\x88\x6D"; - - cl_git_pass(git_reference_lookup(&original_ref, repo, "refs/heads/br2")); - cl_git_pass(git_branch_move(&new_ref, original_ref, new_branch_name, 0)); - - if (cl_repo_get_bool(repo, "core.precomposeunicode")) - cl_assert_equal_s(GIT_REFS_HEADS_DIR "\xC3\x85\x73\x74\x72\xC3\xB6\x6D", git_reference_name(new_ref)); - else - cl_assert_equal_s(GIT_REFS_HEADS_DIR "\x41\xCC\x8A\x73\x74\x72\x6F\xCC\x88\x6D", git_reference_name(new_ref)); - - git_reference_free(original_ref); - git_reference_free(new_ref); -} diff --git a/vendor/libgit2/tests/refs/branches/name.c b/vendor/libgit2/tests/refs/branches/name.c deleted file mode 100644 index 176f836a4..000000000 --- a/vendor/libgit2/tests/refs/branches/name.c +++ /dev/null @@ -1,45 +0,0 @@ -#include "clar_libgit2.h" -#include "branch.h" - -static git_repository *repo; -static git_reference *ref; - -void test_refs_branches_name__initialize(void) -{ - cl_git_pass(git_repository_open(&repo, cl_fixture("testrepo.git"))); -} - -void test_refs_branches_name__cleanup(void) -{ - git_reference_free(ref); - ref = NULL; - - git_repository_free(repo); - repo = NULL; -} - -void test_refs_branches_name__can_get_local_branch_name(void) -{ - const char *name; - - cl_git_pass(git_branch_lookup(&ref,repo,"master",GIT_BRANCH_LOCAL)); - cl_git_pass(git_branch_name(&name,ref)); - cl_assert_equal_s("master",name); -} - -void test_refs_branches_name__can_get_remote_branch_name(void) -{ - const char *name; - - cl_git_pass(git_branch_lookup(&ref,repo,"test/master",GIT_BRANCH_REMOTE)); - cl_git_pass(git_branch_name(&name,ref)); - cl_assert_equal_s("test/master",name); -} - -void test_refs_branches_name__error_when_ref_is_no_branch(void) -{ - const char *name; - - cl_git_pass(git_reference_lookup(&ref,repo,"refs/notes/fanout")); - cl_git_fail(git_branch_name(&name,ref)); -} diff --git a/vendor/libgit2/tests/refs/branches/remote.c b/vendor/libgit2/tests/refs/branches/remote.c deleted file mode 100644 index 47526717f..000000000 --- a/vendor/libgit2/tests/refs/branches/remote.c +++ /dev/null @@ -1,68 +0,0 @@ -#include "clar_libgit2.h" -#include "branch.h" -#include "remote.h" - -static git_repository *g_repo; -static const char *remote_tracking_branch_name = "refs/remotes/test/master"; -static const char *expected_remote_name = "test"; -static int expected_remote_name_length; - -void test_refs_branches_remote__initialize(void) -{ - g_repo = cl_git_sandbox_init("testrepo"); - - expected_remote_name_length = (int)strlen(expected_remote_name) + 1; -} - -void test_refs_branches_remote__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -void test_refs_branches_remote__can_get_remote_for_branch(void) -{ - git_buf remotename = {0}; - - cl_git_pass(git_branch_remote_name(&remotename, g_repo, remote_tracking_branch_name)); - - cl_assert_equal_s("test", remotename.ptr); - git_buf_free(&remotename); -} - -void test_refs_branches_remote__no_matching_remote_returns_error(void) -{ - const char *unknown = "refs/remotes/nonexistent/master"; - git_buf buf; - - giterr_clear(); - memset(&buf, 0, sizeof(git_buf)); - cl_git_fail_with(git_branch_remote_name(&buf, g_repo, unknown), GIT_ENOTFOUND); - cl_assert(giterr_last() != NULL); -} - -void test_refs_branches_remote__local_remote_returns_error(void) -{ - const char *local = "refs/heads/master"; - git_buf buf; - - giterr_clear(); - memset(&buf, 0, sizeof(git_buf)); - cl_git_fail_with(git_branch_remote_name(&buf, g_repo, local), GIT_ERROR); - cl_assert(giterr_last() != NULL); -} - -void test_refs_branches_remote__ambiguous_remote_returns_error(void) -{ - git_remote *remote; - git_buf buf; - - /* Create the remote */ - cl_git_pass(git_remote_create_with_fetchspec(&remote, g_repo, "addtest", "http://github.com/libgit2/libgit2", "refs/heads/*:refs/remotes/test/*")); - - git_remote_free(remote); - - giterr_clear(); - memset(&buf, 0, sizeof(git_buf)); - cl_git_fail_with(git_branch_remote_name(&buf, g_repo, remote_tracking_branch_name), GIT_EAMBIGUOUS); - cl_assert(giterr_last() != NULL); -} diff --git a/vendor/libgit2/tests/refs/branches/upstream.c b/vendor/libgit2/tests/refs/branches/upstream.c deleted file mode 100644 index 8f2e7a2ca..000000000 --- a/vendor/libgit2/tests/refs/branches/upstream.c +++ /dev/null @@ -1,193 +0,0 @@ -#include "clar_libgit2.h" -#include "config/config_helpers.h" -#include "refs.h" - -static git_repository *repo; -static git_reference *branch, *upstream; - -void test_refs_branches_upstream__initialize(void) -{ - cl_git_pass(git_repository_open(&repo, cl_fixture("testrepo.git"))); - - branch = NULL; - upstream = NULL; -} - -void test_refs_branches_upstream__cleanup(void) -{ - git_reference_free(upstream); - git_reference_free(branch); - branch = NULL; - - git_repository_free(repo); - repo = NULL; -} - -void test_refs_branches_upstream__can_retrieve_the_remote_tracking_reference_of_a_local_branch(void) -{ - cl_git_pass(git_reference_lookup(&branch, repo, "refs/heads/master")); - - cl_git_pass(git_branch_upstream(&upstream, branch)); - - cl_assert_equal_s("refs/remotes/test/master", git_reference_name(upstream)); -} - -void test_refs_branches_upstream__can_retrieve_the_local_upstream_reference_of_a_local_branch(void) -{ - cl_git_pass(git_reference_lookup(&branch, repo, "refs/heads/track-local")); - - cl_git_pass(git_branch_upstream(&upstream, branch)); - - cl_assert_equal_s("refs/heads/master", git_reference_name(upstream)); -} - -void test_refs_branches_upstream__cannot_retrieve_a_remote_upstream_reference_from_a_non_branch(void) -{ - cl_git_pass(git_reference_lookup(&branch, repo, "refs/tags/e90810b")); - - cl_git_fail(git_branch_upstream(&upstream, branch)); -} - -void test_refs_branches_upstream__trying_to_retrieve_a_remote_tracking_reference_from_a_plain_local_branch_returns_GIT_ENOTFOUND(void) -{ - cl_git_pass(git_reference_lookup(&branch, repo, "refs/heads/subtrees")); - - cl_assert_equal_i(GIT_ENOTFOUND, git_branch_upstream(&upstream, branch)); -} - -void test_refs_branches_upstream__trying_to_retrieve_a_remote_tracking_reference_from_a_branch_with_no_fetchspec_returns_GIT_ENOTFOUND(void) -{ - cl_git_pass(git_reference_lookup(&branch, repo, "refs/heads/cannot-fetch")); - - cl_assert_equal_i(GIT_ENOTFOUND, git_branch_upstream(&upstream, branch)); -} - -void test_refs_branches_upstream__upstream_remote(void) -{ - git_buf buf = GIT_BUF_INIT; - - cl_git_pass(git_branch_upstream_remote(&buf, repo, "refs/heads/master")); - cl_assert_equal_s("test", buf.ptr); - git_buf_free(&buf); -} - -void test_refs_branches_upstream__upstream_remote_empty_value(void) -{ - git_repository *repository; - git_config *cfg; - git_buf buf = GIT_BUF_INIT; - - repository = cl_git_sandbox_init("testrepo.git"); - cl_git_pass(git_repository_config(&cfg, repository)); - cl_git_pass(git_config_set_string(cfg, "branch.master.remote", "")); - cl_git_fail_with(GIT_ENOTFOUND, git_branch_upstream_remote(&buf, repository, "refs/heads/master")); - - cl_git_pass(git_config_delete_entry(cfg, "branch.master.remote")); - cl_git_fail_with(GIT_ENOTFOUND, git_branch_upstream_remote(&buf, repository, "refs/heads/master")); - cl_git_sandbox_cleanup(); -} - -static void assert_merge_and_or_remote_key_missing(git_repository *repository, const git_commit *target, const char *entry_name) -{ - git_reference *branch; - - cl_assert_equal_i(GIT_OBJ_COMMIT, git_object_type((git_object*)target)); - cl_git_pass(git_branch_create(&branch, repository, entry_name, (git_commit*)target, 0)); - - cl_assert_equal_i(GIT_ENOTFOUND, git_branch_upstream(&upstream, branch)); - - git_reference_free(branch); -} - -void test_refs_branches_upstream__retrieve_a_remote_tracking_reference_from_a_branch_with_no_remote_returns_GIT_ENOTFOUND(void) -{ - git_reference *head; - git_repository *repository; - git_commit *target; - - repository = cl_git_sandbox_init("testrepo.git"); - - cl_git_pass(git_repository_head(&head, repository)); - cl_git_pass(git_reference_peel(((git_object **)&target), head, GIT_OBJ_COMMIT)); - git_reference_free(head); - - assert_merge_and_or_remote_key_missing(repository, target, "remoteless"); - assert_merge_and_or_remote_key_missing(repository, target, "mergeless"); - assert_merge_and_or_remote_key_missing(repository, target, "mergeandremoteless"); - - git_commit_free(target); - - cl_git_sandbox_cleanup(); -} - -void test_refs_branches_upstream__set_unset_upstream(void) -{ - git_reference *branch; - git_repository *repository; - - repository = cl_git_sandbox_init("testrepo.git"); - - /* remote */ - cl_git_pass(git_reference_lookup(&branch, repository, "refs/heads/test")); - cl_git_pass(git_branch_set_upstream(branch, "test/master")); - - assert_config_entry_value(repository, "branch.test.remote", "test"); - assert_config_entry_value(repository, "branch.test.merge", "refs/heads/master"); - - git_reference_free(branch); - - /* local */ - cl_git_pass(git_reference_lookup(&branch, repository, "refs/heads/test")); - cl_git_pass(git_branch_set_upstream(branch, "master")); - - assert_config_entry_value(repository, "branch.test.remote", "."); - assert_config_entry_value(repository, "branch.test.merge", "refs/heads/master"); - - /* unset */ - cl_git_pass(git_branch_set_upstream(branch, NULL)); - assert_config_entry_existence(repository, "branch.test.remote", false); - assert_config_entry_existence(repository, "branch.test.merge", false); - - git_reference_free(branch); - - cl_git_pass(git_reference_lookup(&branch, repository, "refs/heads/master")); - cl_git_pass(git_branch_set_upstream(branch, NULL)); - assert_config_entry_existence(repository, "branch.test.remote", false); - assert_config_entry_existence(repository, "branch.test.merge", false); - - git_reference_free(branch); - - cl_git_sandbox_cleanup(); -} - -void test_refs_branches_upstream__no_fetch_refspec(void) -{ - git_reference *ref, *branch; - git_repository *repo; - git_remote *remote; - git_config *cfg; - - repo = cl_git_sandbox_init("testrepo.git"); - - cl_git_pass(git_remote_create_with_fetchspec(&remote, repo, "matching", ".", NULL)); - cl_git_pass(git_remote_add_push(repo, "matching", ":")); - - cl_git_pass(git_reference_lookup(&branch, repo, "refs/heads/test")); - cl_git_pass(git_reference_create(&ref, repo, "refs/remotes/matching/master", git_reference_target(branch), 1, "fetch")); - cl_git_fail(git_branch_set_upstream(branch, "matching/master")); - cl_assert_equal_s("Could not determine remote for 'refs/remotes/matching/master'", - giterr_last()->message); - - /* we can't set it automatically, so let's test the user setting it by hand */ - cl_git_pass(git_repository_config(&cfg, repo)); - cl_git_pass(git_config_set_string(cfg, "branch.test.remote", "matching")); - cl_git_pass(git_config_set_string(cfg, "branch.test.merge", "refs/heads/master")); - /* we still can't find it because there is no rule for that reference */ - cl_git_fail_with(GIT_ENOTFOUND, git_branch_upstream(&ref, branch)); - - git_reference_free(ref); - git_reference_free(branch); - git_remote_free(remote); - - cl_git_sandbox_cleanup(); -} diff --git a/vendor/libgit2/tests/refs/branches/upstreamname.c b/vendor/libgit2/tests/refs/branches/upstreamname.c deleted file mode 100644 index d30002e08..000000000 --- a/vendor/libgit2/tests/refs/branches/upstreamname.c +++ /dev/null @@ -1,36 +0,0 @@ -#include "clar_libgit2.h" -#include "branch.h" - -static git_repository *repo; -static git_buf upstream_name; - -void test_refs_branches_upstreamname__initialize(void) -{ - cl_git_pass(git_repository_open(&repo, cl_fixture("testrepo.git"))); - - git_buf_init(&upstream_name, 0); -} - -void test_refs_branches_upstreamname__cleanup(void) -{ - git_buf_free(&upstream_name); - - git_repository_free(repo); - repo = NULL; -} - -void test_refs_branches_upstreamname__can_retrieve_the_remote_tracking_reference_name_of_a_local_branch(void) -{ - cl_git_pass(git_branch_upstream_name( - &upstream_name, repo, "refs/heads/master")); - - cl_assert_equal_s("refs/remotes/test/master", git_buf_cstr(&upstream_name)); -} - -void test_refs_branches_upstreamname__can_retrieve_the_local_upstream_reference_name_of_a_local_branch(void) -{ - cl_git_pass(git_branch_upstream_name( - &upstream_name, repo, "refs/heads/track-local")); - - cl_assert_equal_s("refs/heads/master", git_buf_cstr(&upstream_name)); -} diff --git a/vendor/libgit2/tests/refs/crashes.c b/vendor/libgit2/tests/refs/crashes.c deleted file mode 100644 index 7a10411c8..000000000 --- a/vendor/libgit2/tests/refs/crashes.c +++ /dev/null @@ -1,20 +0,0 @@ -#include "clar_libgit2.h" - -void test_refs_crashes__double_free(void) -{ - git_repository *repo; - git_reference *ref, *ref2; - const char *REFNAME = "refs/heads/xxx"; - - cl_git_pass(git_repository_open(&repo, cl_fixture("testrepo.git"))); - cl_git_pass(git_reference_symbolic_create(&ref, repo, REFNAME, "refs/heads/master", 0, NULL)); - cl_git_pass(git_reference_lookup(&ref2, repo, REFNAME)); - cl_git_pass(git_reference_delete(ref)); - git_reference_free(ref); - git_reference_free(ref2); - - /* reference is gone from disk, so reloading it will fail */ - cl_git_fail(git_reference_lookup(&ref2, repo, REFNAME)); - - git_repository_free(repo); -} diff --git a/vendor/libgit2/tests/refs/create.c b/vendor/libgit2/tests/refs/create.c deleted file mode 100644 index 6d5a5f1f6..000000000 --- a/vendor/libgit2/tests/refs/create.c +++ /dev/null @@ -1,250 +0,0 @@ -#include "clar_libgit2.h" - -#include "repository.h" -#include "git2/reflog.h" -#include "reflog.h" -#include "ref_helpers.h" - -static const char *current_master_tip = "099fabac3a9ea935598528c27f866e34089c2eff"; -static const char *current_head_target = "refs/heads/master"; - -static git_repository *g_repo; - -void test_refs_create__initialize(void) -{ - g_repo = cl_git_sandbox_init("testrepo"); -} - -void test_refs_create__cleanup(void) -{ - cl_git_sandbox_cleanup(); - - cl_git_pass(git_libgit2_opts(GIT_OPT_ENABLE_STRICT_OBJECT_CREATION, 1)); -} - -void test_refs_create__symbolic(void) -{ - // create a new symbolic reference - git_reference *new_reference, *looked_up_ref, *resolved_ref; - git_repository *repo2; - git_oid id; - - const char *new_head_tracker = "ANOTHER_HEAD_TRACKER"; - - git_oid_fromstr(&id, current_master_tip); - - /* Create and write the new symbolic reference */ - cl_git_pass(git_reference_symbolic_create(&new_reference, g_repo, new_head_tracker, current_head_target, 0, NULL)); - - /* Ensure the reference can be looked-up... */ - cl_git_pass(git_reference_lookup(&looked_up_ref, g_repo, new_head_tracker)); - cl_assert(git_reference_type(looked_up_ref) & GIT_REF_SYMBOLIC); - cl_assert(reference_is_packed(looked_up_ref) == 0); - cl_assert_equal_s(looked_up_ref->name, new_head_tracker); - - /* ...peeled.. */ - cl_git_pass(git_reference_resolve(&resolved_ref, looked_up_ref)); - cl_assert(git_reference_type(resolved_ref) == GIT_REF_OID); - - /* ...and that it points to the current master tip */ - cl_assert_equal_oid(&id, git_reference_target(resolved_ref)); - git_reference_free(looked_up_ref); - git_reference_free(resolved_ref); - - /* Similar test with a fresh new repository */ - cl_git_pass(git_repository_open(&repo2, "testrepo")); - - cl_git_pass(git_reference_lookup(&looked_up_ref, repo2, new_head_tracker)); - cl_git_pass(git_reference_resolve(&resolved_ref, looked_up_ref)); - cl_assert_equal_oid(&id, git_reference_target(resolved_ref)); - - git_repository_free(repo2); - - git_reference_free(new_reference); - git_reference_free(looked_up_ref); - git_reference_free(resolved_ref); -} - -void test_refs_create__deep_symbolic(void) -{ - // create a deep symbolic reference - git_reference *new_reference, *looked_up_ref, *resolved_ref; - git_oid id; - - const char *new_head_tracker = "deep/rooted/tracker"; - - git_oid_fromstr(&id, current_master_tip); - - cl_git_pass(git_reference_symbolic_create(&new_reference, g_repo, new_head_tracker, current_head_target, 0, NULL)); - cl_git_pass(git_reference_lookup(&looked_up_ref, g_repo, new_head_tracker)); - cl_git_pass(git_reference_resolve(&resolved_ref, looked_up_ref)); - cl_assert_equal_oid(&id, git_reference_target(resolved_ref)); - - git_reference_free(new_reference); - git_reference_free(looked_up_ref); - git_reference_free(resolved_ref); -} - -void test_refs_create__oid(void) -{ - // create a new OID reference - git_reference *new_reference, *looked_up_ref; - git_repository *repo2; - git_oid id; - - const char *new_head = "refs/heads/new-head"; - - git_oid_fromstr(&id, current_master_tip); - - /* Create and write the new object id reference */ - cl_git_pass(git_reference_create(&new_reference, g_repo, new_head, &id, 0, NULL)); - - /* Ensure the reference can be looked-up... */ - cl_git_pass(git_reference_lookup(&looked_up_ref, g_repo, new_head)); - cl_assert(git_reference_type(looked_up_ref) & GIT_REF_OID); - cl_assert(reference_is_packed(looked_up_ref) == 0); - cl_assert_equal_s(looked_up_ref->name, new_head); - - /* ...and that it points to the current master tip */ - cl_assert_equal_oid(&id, git_reference_target(looked_up_ref)); - git_reference_free(looked_up_ref); - - /* Similar test with a fresh new repository */ - cl_git_pass(git_repository_open(&repo2, "testrepo")); - - cl_git_pass(git_reference_lookup(&looked_up_ref, repo2, new_head)); - cl_assert_equal_oid(&id, git_reference_target(looked_up_ref)); - - git_repository_free(repo2); - - git_reference_free(new_reference); - git_reference_free(looked_up_ref); -} - -/* Can by default create a reference that targets at an unknown id */ -void test_refs_create__oid_unknown_succeeds_without_strict(void) -{ - git_reference *new_reference, *looked_up_ref; - git_oid id; - - const char *new_head = "refs/heads/new-head"; - - git_oid_fromstr(&id, "deadbeef3f795b2b4353bcce3a527ad0a4f7f644"); - - cl_git_pass(git_libgit2_opts(GIT_OPT_ENABLE_STRICT_OBJECT_CREATION, 0)); - - /* Create and write the new object id reference */ - cl_git_pass(git_reference_create(&new_reference, g_repo, new_head, &id, 0, NULL)); - git_reference_free(new_reference); - - /* Ensure the reference can't be looked-up... */ - cl_git_pass(git_reference_lookup(&looked_up_ref, g_repo, new_head)); - git_reference_free(looked_up_ref); -} - -/* Strict object enforcement enforces valid object id */ -void test_refs_create__oid_unknown_fails_by_default(void) -{ - git_reference *new_reference, *looked_up_ref; - git_oid id; - - const char *new_head = "refs/heads/new-head"; - - git_oid_fromstr(&id, "deadbeef3f795b2b4353bcce3a527ad0a4f7f644"); - - /* Create and write the new object id reference */ - cl_git_fail(git_reference_create(&new_reference, g_repo, new_head, &id, 0, NULL)); - - /* Ensure the reference can't be looked-up... */ - cl_git_fail(git_reference_lookup(&looked_up_ref, g_repo, new_head)); -} - -void test_refs_create__propagate_eexists(void) -{ - int error; - git_oid oid; - git_reference *ref; - - /* Make sure it works for oid and for symbolic both */ - git_oid_fromstr(&oid, current_master_tip); - error = git_reference_create(&ref, g_repo, current_head_target, &oid, false, NULL); - cl_assert(error == GIT_EEXISTS); - - error = git_reference_symbolic_create(&ref, g_repo, "HEAD", current_head_target, false, NULL); - cl_assert(error == GIT_EEXISTS); -} - -void test_refs_create__existing_dir_propagates_edirectory(void) -{ - git_reference *new_reference, *fail_reference; - git_oid id; - const char *dir_head = "refs/heads/new-dir/new-head", - *fail_head = "refs/heads/new-dir"; - - git_oid_fromstr(&id, current_master_tip); - - /* Create and write the new object id reference */ - cl_git_pass(git_reference_create(&new_reference, g_repo, dir_head, &id, 1, NULL)); - cl_git_fail_with(GIT_EDIRECTORY, - git_reference_create(&fail_reference, g_repo, fail_head, &id, false, NULL)); - - git_reference_free(new_reference); -} - -static void test_invalid_name(const char *name) -{ - git_reference *new_reference; - git_oid id; - - git_oid_fromstr(&id, current_master_tip); - - cl_assert_equal_i(GIT_EINVALIDSPEC, git_reference_create( - &new_reference, g_repo, name, &id, 0, NULL)); - - cl_assert_equal_i(GIT_EINVALIDSPEC, git_reference_symbolic_create( - &new_reference, g_repo, name, current_head_target, 0, NULL)); -} - -void test_refs_create__creating_a_reference_with_an_invalid_name_returns_EINVALIDSPEC(void) -{ - test_invalid_name("refs/heads/inv@{id"); - test_invalid_name("refs/heads/back\\slash"); - - test_invalid_name("refs/heads/foo "); - test_invalid_name("refs/heads/foo /bar"); - test_invalid_name("refs/heads/com1:bar/foo"); - - test_invalid_name("refs/heads/e:"); - test_invalid_name("refs/heads/c:/foo"); - - test_invalid_name("refs/heads/foo."); -} - -static void test_win32_name(const char *name) -{ - git_reference *new_reference = NULL; - git_oid id; - int ret; - - git_oid_fromstr(&id, current_master_tip); - - ret = git_reference_create(&new_reference, g_repo, name, &id, 0, NULL); - -#ifdef GIT_WIN32 - cl_assert_equal_i(GIT_EINVALIDSPEC, ret); -#else - cl_git_pass(ret); -#endif - - git_reference_free(new_reference); -} - -void test_refs_create__creating_a_loose_ref_with_invalid_windows_name(void) -{ - test_win32_name("refs/heads/foo./bar"); - - test_win32_name("refs/heads/aux"); - test_win32_name("refs/heads/aux.foo/bar"); - - test_win32_name("refs/heads/com1"); -} diff --git a/vendor/libgit2/tests/refs/createwithlog.c b/vendor/libgit2/tests/refs/createwithlog.c deleted file mode 100644 index 4f643635b..000000000 --- a/vendor/libgit2/tests/refs/createwithlog.c +++ /dev/null @@ -1,47 +0,0 @@ -#include "clar_libgit2.h" - -#include "repository.h" -#include "git2/reflog.h" -#include "reflog.h" -#include "ref_helpers.h" - -static const char *current_master_tip = "a65fedf39aefe402d3bb6e24df4d4f5fe4547750"; - -static git_repository *g_repo; - -void test_refs_createwithlog__initialize(void) -{ - g_repo = cl_git_sandbox_init("testrepo.git"); -} - -void test_refs_createwithlog__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -void test_refs_createwithlog__creating_a_direct_reference_adds_a_reflog_entry(void) -{ - git_reference *reference; - git_oid id; - git_reflog *reflog; - const git_reflog_entry *entry; - - const char *name = "refs/heads/new-head"; - const char *message = "You've been logged, mate!"; - - git_oid_fromstr(&id, current_master_tip); - - cl_git_pass( - git_reference_create(&reference, g_repo, name, &id, 0, message)); - - cl_git_pass(git_reflog_read(&reflog, g_repo, name)); - cl_assert_equal_sz(1, git_reflog_entrycount(reflog)); - - entry = git_reflog_entry_byindex(reflog, 0); - cl_assert(git_oid_streq(&entry->oid_old, GIT_OID_HEX_ZERO) == 0); - cl_assert_equal_oid(&id, &entry->oid_cur); - cl_assert_equal_s(message, entry->msg); - - git_reflog_free(reflog); - git_reference_free(reference); -} diff --git a/vendor/libgit2/tests/refs/delete.c b/vendor/libgit2/tests/refs/delete.c deleted file mode 100644 index a1b9e251e..000000000 --- a/vendor/libgit2/tests/refs/delete.c +++ /dev/null @@ -1,107 +0,0 @@ -#include "clar_libgit2.h" - -#include "fileops.h" -#include "git2/reflog.h" -#include "git2/refdb.h" -#include "reflog.h" -#include "ref_helpers.h" - -static const char *packed_test_head_name = "refs/heads/packed-test"; -static const char *current_master_tip = "a65fedf39aefe402d3bb6e24df4d4f5fe4547750"; - -static git_repository *g_repo; - - - -void test_refs_delete__initialize(void) -{ - g_repo = cl_git_sandbox_init("testrepo"); -} - -void test_refs_delete__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - - - -void test_refs_delete__packed_loose(void) -{ - // deleting a ref which is both packed and loose should remove both tracks in the filesystem - git_reference *looked_up_ref, *another_looked_up_ref; - git_buf temp_path = GIT_BUF_INIT; - - /* Ensure the loose reference exists on the file system */ - cl_git_pass(git_buf_joinpath(&temp_path, git_repository_path(g_repo), packed_test_head_name)); - cl_assert(git_path_exists(temp_path.ptr)); - - /* Lookup the reference */ - cl_git_pass(git_reference_lookup(&looked_up_ref, g_repo, packed_test_head_name)); - - /* Ensure it's the loose version that has been found */ - cl_assert(reference_is_packed(looked_up_ref) == 0); - - /* Now that the reference is deleted... */ - cl_git_pass(git_reference_delete(looked_up_ref)); - git_reference_free(looked_up_ref); - - /* Looking up the reference once again should not retrieve it */ - cl_git_fail(git_reference_lookup(&another_looked_up_ref, g_repo, packed_test_head_name)); - - /* Ensure the loose reference doesn't exist any longer on the file system */ - cl_assert(!git_path_exists(temp_path.ptr)); - - git_reference_free(another_looked_up_ref); - git_buf_free(&temp_path); -} - -void test_refs_delete__packed_only(void) -{ - // can delete a just packed reference - git_reference *ref; - git_refdb *refdb; - git_oid id; - const char *new_ref = "refs/heads/new_ref"; - - git_oid_fromstr(&id, current_master_tip); - - /* Create and write the new object id reference */ - cl_git_pass(git_reference_create(&ref, g_repo, new_ref, &id, 0, NULL)); - git_reference_free(ref); - - /* Lookup the reference */ - cl_git_pass(git_reference_lookup(&ref, g_repo, new_ref)); - - /* Ensure it's a loose reference */ - cl_assert(reference_is_packed(ref) == 0); - - /* Pack all existing references */ - cl_git_pass(git_repository_refdb(&refdb, g_repo)); - cl_git_pass(git_refdb_compress(refdb)); - - /* Reload the reference from disk */ - git_reference_free(ref); - cl_git_pass(git_reference_lookup(&ref, g_repo, new_ref)); - - /* Ensure it's a packed reference */ - cl_assert(reference_is_packed(ref) == 1); - - /* This should pass */ - cl_git_pass(git_reference_delete(ref)); - git_reference_free(ref); - git_refdb_free(refdb); -} - -void test_refs_delete__remove(void) -{ - git_reference *ref; - - /* Check that passing no old values lets us delete */ - - cl_git_pass(git_reference_lookup(&ref, g_repo, packed_test_head_name)); - git_reference_free(ref); - - cl_git_pass(git_reference_remove(g_repo, packed_test_head_name)); - - cl_git_fail(git_reference_lookup(&ref, g_repo, packed_test_head_name)); -} diff --git a/vendor/libgit2/tests/refs/foreachglob.c b/vendor/libgit2/tests/refs/foreachglob.c deleted file mode 100644 index a09191e79..000000000 --- a/vendor/libgit2/tests/refs/foreachglob.c +++ /dev/null @@ -1,95 +0,0 @@ -#include "clar_libgit2.h" -#include "refs.h" - -static git_repository *repo; -static git_reference *fake_remote; - -void test_refs_foreachglob__initialize(void) -{ - git_oid id; - - cl_fixture_sandbox("testrepo.git"); - cl_git_pass(git_repository_open(&repo, "testrepo.git")); - - cl_git_pass(git_oid_fromstr(&id, "be3563ae3f795b2b4353bcce3a527ad0a4f7f644")); - cl_git_pass(git_reference_create(&fake_remote, repo, "refs/remotes/nulltoken/master", &id, 0, NULL)); -} - -void test_refs_foreachglob__cleanup(void) -{ - git_reference_free(fake_remote); - fake_remote = NULL; - - git_repository_free(repo); - repo = NULL; - - cl_fixture_cleanup("testrepo.git"); -} - -static int count_cb(const char *reference_name, void *payload) -{ - int *count = (int *)payload; - - GIT_UNUSED(reference_name); - - (*count)++; - - return 0; -} - -static void assert_retrieval(const char *glob, int expected_count) -{ - int count = 0; - - cl_git_pass(git_reference_foreach_glob(repo, glob, count_cb, &count)); - - cl_assert_equal_i(expected_count, count); -} - -void test_refs_foreachglob__retrieve_all_refs(void) -{ - /* 12 heads (including one packed head) + 1 note + 2 remotes + 7 tags */ - assert_retrieval("*", 22); -} - -void test_refs_foreachglob__retrieve_remote_branches(void) -{ - assert_retrieval("refs/remotes/*", 2); -} - -void test_refs_foreachglob__retrieve_local_branches(void) -{ - assert_retrieval("refs/heads/*", 12); -} - -void test_refs_foreachglob__retrieve_partially_named_references(void) -{ - /* - * refs/heads/packed-test, refs/heads/test - * refs/remotes/test/master, refs/tags/test - */ - - assert_retrieval("*test*", 4); -} - - -static int interrupt_cb(const char *reference_name, void *payload) -{ - int *count = (int *)payload; - - GIT_UNUSED(reference_name); - - (*count)++; - - return (*count == 11) ? -1000 : 0; -} - -void test_refs_foreachglob__can_cancel(void) -{ - int count = 0; - - cl_assert_equal_i(-1000, git_reference_foreach_glob( - repo, "*", interrupt_cb, &count) ); - - cl_assert_equal_i(11, count); -} diff --git a/vendor/libgit2/tests/refs/isvalidname.c b/vendor/libgit2/tests/refs/isvalidname.c deleted file mode 100644 index 65c70ba4d..000000000 --- a/vendor/libgit2/tests/refs/isvalidname.c +++ /dev/null @@ -1,31 +0,0 @@ -#include "clar_libgit2.h" - -void test_refs_isvalidname__can_detect_invalid_formats(void) -{ - cl_assert_equal_i(false, git_reference_is_valid_name("refs/tags/0.17.0^{}")); - cl_assert_equal_i(false, git_reference_is_valid_name("TWO/LEVELS")); - cl_assert_equal_i(false, git_reference_is_valid_name("ONE.LEVEL")); - cl_assert_equal_i(false, git_reference_is_valid_name("HEAD/")); - cl_assert_equal_i(false, git_reference_is_valid_name("NO_TRAILING_UNDERSCORE_")); - cl_assert_equal_i(false, git_reference_is_valid_name("_NO_LEADING_UNDERSCORE")); - cl_assert_equal_i(false, git_reference_is_valid_name("HEAD/aa")); - cl_assert_equal_i(false, git_reference_is_valid_name("lower_case")); - cl_assert_equal_i(false, git_reference_is_valid_name("/stupid/name/master")); - cl_assert_equal_i(false, git_reference_is_valid_name("/")); - cl_assert_equal_i(false, git_reference_is_valid_name("//")); - cl_assert_equal_i(false, git_reference_is_valid_name("")); - cl_assert_equal_i(false, git_reference_is_valid_name("refs/heads/sub.lock/webmatrix")); -} - -void test_refs_isvalidname__wont_hopefully_choke_on_valid_formats(void) -{ - cl_assert_equal_i(true, git_reference_is_valid_name("refs/tags/0.17.0")); - cl_assert_equal_i(true, git_reference_is_valid_name("refs/LEVELS")); - cl_assert_equal_i(true, git_reference_is_valid_name("HEAD")); - cl_assert_equal_i(true, git_reference_is_valid_name("ONE_LEVEL")); - cl_assert_equal_i(true, git_reference_is_valid_name("refs/stash")); - cl_assert_equal_i(true, git_reference_is_valid_name("refs/remotes/origin/bim_with_3d@11296")); - cl_assert_equal_i(true, git_reference_is_valid_name("refs/master{yesterday")); - cl_assert_equal_i(true, git_reference_is_valid_name("refs/master}yesterday")); - cl_assert_equal_i(true, git_reference_is_valid_name("refs/master{yesterday}")); -} diff --git a/vendor/libgit2/tests/refs/iterator.c b/vendor/libgit2/tests/refs/iterator.c deleted file mode 100644 index c77451309..000000000 --- a/vendor/libgit2/tests/refs/iterator.c +++ /dev/null @@ -1,221 +0,0 @@ -#include "clar_libgit2.h" -#include "refs.h" -#include "vector.h" - -static git_repository *repo; - -void test_refs_iterator__initialize(void) -{ - cl_git_pass(git_repository_open(&repo, cl_fixture("testrepo.git"))); -} - -void test_refs_iterator__cleanup(void) -{ - git_repository_free(repo); -} - -static const char *refnames[] = { - "refs/heads/br2", - "refs/heads/cannot-fetch", - "refs/heads/chomped", - "refs/heads/haacked", - "refs/heads/master", - "refs/heads/not-good", - "refs/heads/packed", - "refs/heads/packed-test", - "refs/heads/subtrees", - "refs/heads/test", - "refs/heads/track-local", - "refs/heads/trailing", - "refs/notes/fanout", - "refs/remotes/test/master", - "refs/tags/annotated_tag_to_blob", - "refs/tags/e90810b", - "refs/tags/hard_tag", - "refs/tags/point_to_blob", - "refs/tags/taggerless", - "refs/tags/test", - "refs/tags/wrapped_tag", -}; - -static int refcmp_cb(const void *a, const void *b) -{ - const git_reference *refa = (const git_reference *)a; - const git_reference *refb = (const git_reference *)b; - - return strcmp(refa->name, refb->name); -} - -static void assert_all_refnames_match(git_vector *output) -{ - size_t i; - git_reference *ref; - - cl_assert_equal_sz(output->length, ARRAY_SIZE(refnames)); - - git_vector_sort(output); - - git_vector_foreach(output, i, ref) { - cl_assert_equal_s(ref->name, refnames[i]); - git_reference_free(ref); - } - - git_vector_free(output); -} - -void test_refs_iterator__list(void) -{ - git_reference_iterator *iter; - git_vector output; - git_reference *ref; - - cl_git_pass(git_vector_init(&output, 32, &refcmp_cb)); - cl_git_pass(git_reference_iterator_new(&iter, repo)); - - while (1) { - int error = git_reference_next(&ref, iter); - if (error == GIT_ITEROVER) - break; - cl_git_pass(error); - cl_git_pass(git_vector_insert(&output, ref)); - } - - git_reference_iterator_free(iter); - - assert_all_refnames_match(&output); -} - -void test_refs_iterator__empty(void) -{ - git_reference_iterator *iter; - git_odb *odb; - git_reference *ref; - git_repository *empty; - - cl_git_pass(git_odb_new(&odb)); - cl_git_pass(git_repository_wrap_odb(&empty, odb)); - - cl_git_pass(git_reference_iterator_new(&iter, empty)); - cl_assert_equal_i(GIT_ITEROVER, git_reference_next(&ref, iter)); - - git_reference_iterator_free(iter); - git_odb_free(odb); - git_repository_free(empty); -} - -static int refs_foreach_cb(git_reference *reference, void *payload) -{ - git_vector *output = payload; - cl_git_pass(git_vector_insert(output, reference)); - return 0; -} - -void test_refs_iterator__foreach(void) -{ - git_vector output; - cl_git_pass(git_vector_init(&output, 32, &refcmp_cb)); - cl_git_pass(git_reference_foreach(repo, refs_foreach_cb, &output)); - assert_all_refnames_match(&output); -} - -static int refs_foreach_cancel_cb(git_reference *reference, void *payload) -{ - int *cancel_after = payload; - - git_reference_free(reference); - - if (!*cancel_after) - return -333; - (*cancel_after)--; - return 0; -} - -void test_refs_iterator__foreach_can_cancel(void) -{ - int cancel_after = 3; - cl_git_fail_with( - git_reference_foreach(repo, refs_foreach_cancel_cb, &cancel_after), - -333); - cl_assert_equal_i(0, cancel_after); -} - -static int refs_foreach_name_cb(const char *name, void *payload) -{ - git_vector *output = payload; - cl_git_pass(git_vector_insert(output, git__strdup(name))); - return 0; -} - -void test_refs_iterator__foreach_name(void) -{ - git_vector output; - size_t i; - char *name; - - cl_git_pass(git_vector_init(&output, 32, &git__strcmp_cb)); - cl_git_pass( - git_reference_foreach_name(repo, refs_foreach_name_cb, &output)); - - cl_assert_equal_sz(output.length, ARRAY_SIZE(refnames)); - git_vector_sort(&output); - - git_vector_foreach(&output, i, name) { - cl_assert_equal_s(name, refnames[i]); - git__free(name); - } - - git_vector_free(&output); -} - -static int refs_foreach_name_cancel_cb(const char *name, void *payload) -{ - int *cancel_after = payload; - if (!*cancel_after) - return -333; - GIT_UNUSED(name); - (*cancel_after)--; - return 0; -} - -void test_refs_iterator__foreach_name_can_cancel(void) -{ - int cancel_after = 5; - cl_git_fail_with( - git_reference_foreach_name( - repo, refs_foreach_name_cancel_cb, &cancel_after), - -333); - cl_assert_equal_i(0, cancel_after); -} - -void test_refs_iterator__concurrent_delete(void) -{ - git_reference_iterator *iter; - size_t full_count = 0, concurrent_count = 0; - const char *name; - int error; - - git_repository_free(repo); - repo = cl_git_sandbox_init("testrepo"); - - cl_git_pass(git_reference_iterator_new(&iter, repo)); - while ((error = git_reference_next_name(&name, iter)) == 0) { - full_count++; - } - - git_reference_iterator_free(iter); - cl_assert_equal_i(GIT_ITEROVER, error); - - cl_git_pass(git_reference_iterator_new(&iter, repo)); - while ((error = git_reference_next_name(&name, iter)) == 0) { - cl_git_pass(git_reference_remove(repo, name)); - concurrent_count++; - } - - git_reference_iterator_free(iter); - cl_assert_equal_i(GIT_ITEROVER, error); - - cl_assert_equal_i(full_count, concurrent_count); - - cl_git_sandbox_cleanup(); - repo = NULL; -} diff --git a/vendor/libgit2/tests/refs/list.c b/vendor/libgit2/tests/refs/list.c deleted file mode 100644 index 374943b05..000000000 --- a/vendor/libgit2/tests/refs/list.c +++ /dev/null @@ -1,57 +0,0 @@ -#include "clar_libgit2.h" - -#include "repository.h" -#include "git2/reflog.h" -#include "reflog.h" - -static git_repository *g_repo; - - - -void test_refs_list__initialize(void) -{ - g_repo = cl_git_sandbox_init("testrepo"); -} - -void test_refs_list__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - - - -void test_refs_list__all(void) -{ - // try to list all the references in our test repo - git_strarray ref_list; - - cl_git_pass(git_reference_list(&ref_list, g_repo)); - - /*{ - unsigned short i; - for (i = 0; i < ref_list.count; ++i) - printf("# %s\n", ref_list.strings[i]); - }*/ - - /* We have exactly 12 refs in total if we include the packed ones: - * there is a reference that exists both in the packfile and as - * loose, but we only list it once */ - cl_assert_equal_i((int)ref_list.count, 15); - - git_strarray_free(&ref_list); -} - -void test_refs_list__do_not_retrieve_references_which_name_end_with_a_lock_extension(void) -{ - git_strarray ref_list; - - /* Create a fake locked reference */ - cl_git_mkfile( - "./testrepo/.git/refs/heads/hanwen.lock", - "144344043ba4d4a405da03de3844aa829ae8be0e\n"); - - cl_git_pass(git_reference_list(&ref_list, g_repo)); - cl_assert_equal_i((int)ref_list.count, 15); - - git_strarray_free(&ref_list); -} diff --git a/vendor/libgit2/tests/refs/listall.c b/vendor/libgit2/tests/refs/listall.c deleted file mode 100644 index c696fbb2e..000000000 --- a/vendor/libgit2/tests/refs/listall.c +++ /dev/null @@ -1,47 +0,0 @@ -#include "clar_libgit2.h" -#include "posix.h" - -static git_repository *repo; -static git_strarray ref_list; - -static void ensure_no_refname_starts_with_a_forward_slash(const char *path) -{ - size_t i; - - cl_git_pass(git_repository_open(&repo, path)); - cl_git_pass(git_reference_list(&ref_list, repo)); - - cl_assert(ref_list.count > 0); - - for (i = 0; i < ref_list.count; i++) - cl_assert(git__prefixcmp(ref_list.strings[i], "/") != 0); - - git_strarray_free(&ref_list); - git_repository_free(repo); -} - -void test_refs_listall__from_repository_opened_through_workdir_path(void) -{ - cl_fixture_sandbox("status"); - cl_git_pass(p_rename("status/.gitted", "status/.git")); - - ensure_no_refname_starts_with_a_forward_slash("status"); - - cl_fixture_cleanup("status"); -} - -void test_refs_listall__from_repository_opened_through_gitdir_path(void) -{ - ensure_no_refname_starts_with_a_forward_slash(cl_fixture("testrepo.git")); -} - -void test_refs_listall__from_repository_with_no_trailing_newline(void) -{ - cl_git_pass(git_repository_open(&repo, cl_fixture("bad_tag.git"))); - cl_git_pass(git_reference_list(&ref_list, repo)); - - cl_assert(ref_list.count > 0); - - git_strarray_free(&ref_list); - git_repository_free(repo); -} diff --git a/vendor/libgit2/tests/refs/lookup.c b/vendor/libgit2/tests/refs/lookup.c deleted file mode 100644 index 456d0d2a8..000000000 --- a/vendor/libgit2/tests/refs/lookup.c +++ /dev/null @@ -1,68 +0,0 @@ -#include "clar_libgit2.h" -#include "refs.h" - -static git_repository *g_repo; - -void test_refs_lookup__initialize(void) -{ - g_repo = cl_git_sandbox_init("testrepo.git"); -} - -void test_refs_lookup__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -void test_refs_lookup__with_resolve(void) -{ - git_reference *a, *b, *temp; - - cl_git_pass(git_reference_lookup(&temp, g_repo, "HEAD")); - cl_git_pass(git_reference_resolve(&a, temp)); - git_reference_free(temp); - - cl_git_pass(git_reference_lookup_resolved(&b, g_repo, "HEAD", 5)); - cl_assert(git_reference_cmp(a, b) == 0); - git_reference_free(b); - - cl_git_pass(git_reference_lookup_resolved(&b, g_repo, "HEAD_TRACKER", 5)); - cl_assert(git_reference_cmp(a, b) == 0); - git_reference_free(b); - - git_reference_free(a); -} - -void test_refs_lookup__invalid_name(void) -{ - git_oid oid; - cl_git_fail(git_reference_name_to_id(&oid, g_repo, "/refs/tags/point_to_blob")); -} - -void test_refs_lookup__oid(void) -{ - git_oid tag, expected; - - cl_git_pass(git_reference_name_to_id(&tag, g_repo, "refs/tags/point_to_blob")); - cl_git_pass(git_oid_fromstr(&expected, "1385f264afb75a56a5bec74243be9b367ba4ca08")); - cl_assert_equal_oid(&expected, &tag); -} - -void test_refs_lookup__namespace(void) -{ - int error; - git_reference *ref; - - error = git_reference_lookup(&ref, g_repo, "refs/heads"); - cl_assert_equal_i(error, GIT_ENOTFOUND); - - error = git_reference_lookup(&ref, g_repo, "refs/heads/"); - cl_assert_equal_i(error, GIT_EINVALIDSPEC); -} - -void test_refs_lookup__dwim_notfound(void) -{ - git_reference *ref; - - cl_git_fail_with(GIT_ENOTFOUND, git_reference_dwim(&ref, g_repo, "idontexist")); - cl_assert_equal_s("no reference found for shorthand 'idontexist'", giterr_last()->message); -} diff --git a/vendor/libgit2/tests/refs/normalize.c b/vendor/libgit2/tests/refs/normalize.c deleted file mode 100644 index 7f313ef38..000000000 --- a/vendor/libgit2/tests/refs/normalize.c +++ /dev/null @@ -1,403 +0,0 @@ -#include "clar_libgit2.h" - -#include "repository.h" -#include "git2/reflog.h" -#include "reflog.h" - -// Helpers -static void ensure_refname_normalized( - unsigned int flags, - const char *input_refname, - const char *expected_refname) -{ - char buffer_out[GIT_REFNAME_MAX]; - - cl_git_pass(git_reference_normalize_name(buffer_out, sizeof(buffer_out), input_refname, flags)); - - cl_assert_equal_s(expected_refname, buffer_out); -} - -static void ensure_refname_invalid(unsigned int flags, const char *input_refname) -{ - char buffer_out[GIT_REFNAME_MAX]; - - cl_assert_equal_i( - GIT_EINVALIDSPEC, - git_reference_normalize_name(buffer_out, sizeof(buffer_out), input_refname, flags)); -} - -void test_refs_normalize__can_normalize_a_direct_reference_name(void) -{ - ensure_refname_normalized( - GIT_REF_FORMAT_NORMAL, "refs/dummy/a", "refs/dummy/a"); - ensure_refname_normalized( - GIT_REF_FORMAT_NORMAL, "refs/stash", "refs/stash"); - ensure_refname_normalized( - GIT_REF_FORMAT_NORMAL, "refs/tags/a", "refs/tags/a"); - ensure_refname_normalized( - GIT_REF_FORMAT_NORMAL, "refs/heads/a/b", "refs/heads/a/b"); - ensure_refname_normalized( - GIT_REF_FORMAT_NORMAL, "refs/heads/a./b", "refs/heads/a./b"); - ensure_refname_normalized( - GIT_REF_FORMAT_NORMAL, "refs/heads/v@ation", "refs/heads/v@ation"); - ensure_refname_normalized( - GIT_REF_FORMAT_NORMAL, "refs///heads///a", "refs/heads/a"); -} - -void test_refs_normalize__cannot_normalize_any_direct_reference_name(void) -{ - ensure_refname_invalid( - GIT_REF_FORMAT_NORMAL, "a"); - ensure_refname_invalid( - GIT_REF_FORMAT_NORMAL, "/a"); - ensure_refname_invalid( - GIT_REF_FORMAT_NORMAL, "//a"); - ensure_refname_invalid( - GIT_REF_FORMAT_NORMAL, ""); - ensure_refname_invalid( - GIT_REF_FORMAT_NORMAL, "/refs/heads/a/"); - ensure_refname_invalid( - GIT_REF_FORMAT_NORMAL, "refs/heads/a/"); - ensure_refname_invalid( - GIT_REF_FORMAT_NORMAL, "refs/heads/a."); - ensure_refname_invalid( - GIT_REF_FORMAT_NORMAL, "refs/heads/a.lock"); - ensure_refname_invalid( - GIT_REF_FORMAT_NORMAL, "refs/heads/foo?bar"); - ensure_refname_invalid( - GIT_REF_FORMAT_NORMAL, "refs/heads\foo"); - ensure_refname_normalized( - GIT_REF_FORMAT_NORMAL, "refs/heads/v@ation", "refs/heads/v@ation"); - ensure_refname_normalized( - GIT_REF_FORMAT_NORMAL, "refs///heads///a", "refs/heads/a"); - ensure_refname_invalid( - GIT_REF_FORMAT_NORMAL, "refs/heads/.a/b"); - ensure_refname_invalid( - GIT_REF_FORMAT_NORMAL, "refs/heads/foo/../bar"); - ensure_refname_invalid( - GIT_REF_FORMAT_NORMAL, "refs/heads/foo..bar"); - ensure_refname_invalid( - GIT_REF_FORMAT_NORMAL, "refs/heads/./foo"); - ensure_refname_invalid( - GIT_REF_FORMAT_NORMAL, "refs/heads/v@{ation"); -} - -void test_refs_normalize__symbolic(void) -{ - ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, ""); - ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "heads\foo"); - ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "/"); - ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "///"); - - ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "ALL_CAPS_AND_UNDERSCORES", "ALL_CAPS_AND_UNDERSCORES"); - ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/MixedCasing", "refs/MixedCasing"); - ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs///heads///a", "refs/heads/a"); - - ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "HEAD", "HEAD"); - ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "MERGE_HEAD", "MERGE_HEAD"); - ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "FETCH_HEAD", "FETCH_HEAD"); -} - -/* Ported from JGit, BSD licence. - * See https://github.com/spearce/JGit/commit/e4bf8f6957bbb29362575d641d1e77a02d906739 - * - * Copyright (C) 2009, Google Inc. - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or - * without modification, are permitted provided that the following - * conditions are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * - Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials provided - * with the distribution. - * - * - Neither the name of the Git Development Community nor the - * names of its contributors may be used to endorse or promote - * products derived from this software without specific prior - * written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND - * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -void test_refs_normalize__jgit_suite(void) -{ - // tests borrowed from JGit - -/* EmptyString */ - ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, ""); - ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "/"); - -/* MustHaveTwoComponents */ - ensure_refname_invalid( - GIT_REF_FORMAT_NORMAL, "master"); - ensure_refname_normalized( - GIT_REF_FORMAT_NORMAL, "heads/master", "heads/master"); - -/* ValidHead */ - ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/master", "refs/heads/master"); - ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/pu", "refs/heads/pu"); - ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/z", "refs/heads/z"); - ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/FoO", "refs/heads/FoO"); - -/* ValidTag */ - ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/tags/v1.0", "refs/tags/v1.0"); - -/* NoLockSuffix */ - ensure_refname_invalid(GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/master.lock"); - -/* NoDirectorySuffix */ - ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/master/"); - -/* NoSpace */ - ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/i haz space"); - -/* NoAsciiControlCharacters */ - { - char c; - char buffer[GIT_REFNAME_MAX]; - for (c = '\1'; c < ' '; c++) { - strncpy(buffer, "refs/heads/mast", 15); - strncpy(buffer + 15, (const char *)&c, 1); - strncpy(buffer + 16, "er", 2); - buffer[18 - 1] = '\0'; - ensure_refname_invalid(GIT_REF_FORMAT_ALLOW_ONELEVEL, buffer); - } - } - -/* NoBareDot */ - ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/."); - ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/.."); - ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/./master"); - ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/../master"); - -/* NoLeadingOrTrailingDot */ - ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "."); - ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/.bar"); - ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/..bar"); - ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/bar."); - -/* ContainsDot */ - ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/m.a.s.t.e.r", "refs/heads/m.a.s.t.e.r"); - ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/master..pu"); - -/* NoMagicRefCharacters */ - ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/master^"); - ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/^master"); - ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "^refs/heads/master"); - - ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/master~"); - ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/~master"); - ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "~refs/heads/master"); - - ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/master:"); - ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/:master"); - ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, ":refs/heads/master"); - -/* ShellGlob */ - ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/master?"); - ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/?master"); - ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "?refs/heads/master"); - - ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/master["); - ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/[master"); - ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "[refs/heads/master"); - - ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/master*"); - ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/*master"); - ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "*refs/heads/master"); - -/* ValidSpecialCharacters */ - ensure_refname_normalized - (GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/!", "refs/heads/!"); - ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/\"", "refs/heads/\""); - ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/#", "refs/heads/#"); - ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/$", "refs/heads/$"); - ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/%", "refs/heads/%"); - ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/&", "refs/heads/&"); - ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/'", "refs/heads/'"); - ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/(", "refs/heads/("); - ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/)", "refs/heads/)"); - ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/+", "refs/heads/+"); - ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/,", "refs/heads/,"); - ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/-", "refs/heads/-"); - ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/;", "refs/heads/;"); - ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/<", "refs/heads/<"); - ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/=", "refs/heads/="); - ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/>", "refs/heads/>"); - ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/@", "refs/heads/@"); - ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/]", "refs/heads/]"); - ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/_", "refs/heads/_"); - ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/`", "refs/heads/`"); - ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/{", "refs/heads/{"); - ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/|", "refs/heads/|"); - ensure_refname_normalized( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/}", "refs/heads/}"); - - // This is valid on UNIX, but not on Windows - // hence we make in invalid due to non-portability - // - ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/\\"); - -/* UnicodeNames */ - /* - * Currently this fails. - * ensure_refname_normalized(GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/\u00e5ngstr\u00f6m", "refs/heads/\u00e5ngstr\u00f6m"); - */ - -/* RefLogQueryIsValidRef */ - ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/master@{1}"); - ensure_refname_invalid( - GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/master@{1.hour.ago}"); -} - -void test_refs_normalize__buffer_has_to_be_big_enough_to_hold_the_normalized_version(void) -{ - char buffer_out[21]; - - cl_git_pass(git_reference_normalize_name( - buffer_out, 21, "refs//heads///long///name", GIT_REF_FORMAT_NORMAL)); - cl_git_fail(git_reference_normalize_name( - buffer_out, 20, "refs//heads///long///name", GIT_REF_FORMAT_NORMAL)); -} - -#define ONE_LEVEL_AND_REFSPEC \ - GIT_REF_FORMAT_ALLOW_ONELEVEL \ - | GIT_REF_FORMAT_REFSPEC_PATTERN - -void test_refs_normalize__refspec_pattern(void) -{ - ensure_refname_invalid( - GIT_REF_FORMAT_REFSPEC_PATTERN, "heads/*foo/bar"); - ensure_refname_invalid( - GIT_REF_FORMAT_REFSPEC_PATTERN, "heads/foo*/bar"); - ensure_refname_invalid( - GIT_REF_FORMAT_REFSPEC_PATTERN, "heads/f*o/bar"); - - ensure_refname_invalid( - GIT_REF_FORMAT_REFSPEC_PATTERN, "foo"); - ensure_refname_normalized( - ONE_LEVEL_AND_REFSPEC, "FOO", "FOO"); - - ensure_refname_normalized( - GIT_REF_FORMAT_REFSPEC_PATTERN, "foo/bar", "foo/bar"); - ensure_refname_normalized( - ONE_LEVEL_AND_REFSPEC, "foo/bar", "foo/bar"); - - ensure_refname_normalized( - GIT_REF_FORMAT_REFSPEC_PATTERN, "*/foo", "*/foo"); - ensure_refname_normalized( - ONE_LEVEL_AND_REFSPEC, "*/foo", "*/foo"); - - ensure_refname_normalized( - GIT_REF_FORMAT_REFSPEC_PATTERN, "foo/*/bar", "foo/*/bar"); - ensure_refname_normalized( - ONE_LEVEL_AND_REFSPEC, "foo/*/bar", "foo/*/bar"); - - ensure_refname_invalid( - GIT_REF_FORMAT_REFSPEC_PATTERN, "*"); - ensure_refname_normalized( - ONE_LEVEL_AND_REFSPEC, "*", "*"); - - ensure_refname_invalid( - GIT_REF_FORMAT_REFSPEC_PATTERN, "foo/*/*"); - ensure_refname_invalid( - ONE_LEVEL_AND_REFSPEC, "foo/*/*"); - - ensure_refname_invalid( - GIT_REF_FORMAT_REFSPEC_PATTERN, "*/foo/*"); - ensure_refname_invalid( - ONE_LEVEL_AND_REFSPEC, "*/foo/*"); - - ensure_refname_invalid( - GIT_REF_FORMAT_REFSPEC_PATTERN, "*/*/foo"); - ensure_refname_invalid( - ONE_LEVEL_AND_REFSPEC, "*/*/foo"); -} diff --git a/vendor/libgit2/tests/refs/overwrite.c b/vendor/libgit2/tests/refs/overwrite.c deleted file mode 100644 index 5aea2a764..000000000 --- a/vendor/libgit2/tests/refs/overwrite.c +++ /dev/null @@ -1,136 +0,0 @@ -#include "clar_libgit2.h" - -#include "repository.h" -#include "git2/reflog.h" -#include "reflog.h" - -static const char *ref_name = "refs/heads/other"; -static const char *ref_master_name = "refs/heads/master"; -static const char *ref_branch_name = "refs/heads/branch"; -static const char *ref_test_name = "refs/heads/test"; - -static git_repository *g_repo; - -void test_refs_overwrite__initialize(void) -{ - g_repo = cl_git_sandbox_init("testrepo"); -} - -void test_refs_overwrite__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -void test_refs_overwrite__symbolic(void) -{ - // Overwrite an existing symbolic reference - git_reference *ref, *branch_ref; - - /* The target needds to exist and we need to check the name has changed */ - cl_git_pass(git_reference_symbolic_create(&branch_ref, g_repo, ref_branch_name, ref_master_name, 0, NULL)); - cl_git_pass(git_reference_symbolic_create(&ref, g_repo, ref_name, ref_branch_name, 0, NULL)); - git_reference_free(ref); - - /* Ensure it points to the right place*/ - cl_git_pass(git_reference_lookup(&ref, g_repo, ref_name)); - cl_assert(git_reference_type(ref) & GIT_REF_SYMBOLIC); - cl_assert_equal_s(git_reference_symbolic_target(ref), ref_branch_name); - git_reference_free(ref); - - /* Ensure we can't create it unless we force it to */ - cl_git_fail(git_reference_symbolic_create(&ref, g_repo, ref_name, ref_master_name, 0, NULL)); - cl_git_pass(git_reference_symbolic_create(&ref, g_repo, ref_name, ref_master_name, 1, NULL)); - git_reference_free(ref); - - /* Ensure it points to the right place */ - cl_git_pass(git_reference_lookup(&ref, g_repo, ref_name)); - cl_assert(git_reference_type(ref) & GIT_REF_SYMBOLIC); - cl_assert_equal_s(git_reference_symbolic_target(ref), ref_master_name); - - git_reference_free(ref); - git_reference_free(branch_ref); -} - -void test_refs_overwrite__object_id(void) -{ - // Overwrite an existing object id reference - git_reference *ref; - git_oid id; - - cl_git_pass(git_reference_lookup(&ref, g_repo, ref_master_name)); - cl_assert(git_reference_type(ref) & GIT_REF_OID); - git_oid_cpy(&id, git_reference_target(ref)); - git_reference_free(ref); - - /* Create it */ - cl_git_pass(git_reference_create(&ref, g_repo, ref_name, &id, 0, NULL)); - git_reference_free(ref); - - cl_git_pass(git_reference_lookup(&ref, g_repo, ref_test_name)); - cl_assert(git_reference_type(ref) & GIT_REF_OID); - git_oid_cpy(&id, git_reference_target(ref)); - git_reference_free(ref); - - /* Ensure we can't overwrite unless we force it */ - cl_git_fail(git_reference_create(&ref, g_repo, ref_name, &id, 0, NULL)); - cl_git_pass(git_reference_create(&ref, g_repo, ref_name, &id, 1, NULL)); - git_reference_free(ref); - - /* Ensure it has been overwritten */ - cl_git_pass(git_reference_lookup(&ref, g_repo, ref_name)); - cl_assert_equal_oid(&id, git_reference_target(ref)); - - git_reference_free(ref); -} - -void test_refs_overwrite__object_id_with_symbolic(void) -{ - // Overwrite an existing object id reference with a symbolic one - git_reference *ref; - git_oid id; - - cl_git_pass(git_reference_lookup(&ref, g_repo, ref_master_name)); - cl_assert(git_reference_type(ref) & GIT_REF_OID); - git_oid_cpy(&id, git_reference_target(ref)); - git_reference_free(ref); - - cl_git_pass(git_reference_create(&ref, g_repo, ref_name, &id, 0, NULL)); - git_reference_free(ref); - cl_git_fail(git_reference_symbolic_create(&ref, g_repo, ref_name, ref_master_name, 0, NULL)); - cl_git_pass(git_reference_symbolic_create(&ref, g_repo, ref_name, ref_master_name, 1, NULL)); - git_reference_free(ref); - - /* Ensure it points to the right place */ - cl_git_pass(git_reference_lookup(&ref, g_repo, ref_name)); - cl_assert(git_reference_type(ref) & GIT_REF_SYMBOLIC); - cl_assert_equal_s(git_reference_symbolic_target(ref), ref_master_name); - - git_reference_free(ref); -} - -void test_refs_overwrite__symbolic_with_object_id(void) -{ - // Overwrite an existing symbolic reference with an object id one - git_reference *ref; - git_oid id; - - cl_git_pass(git_reference_lookup(&ref, g_repo, ref_master_name)); - cl_assert(git_reference_type(ref) & GIT_REF_OID); - git_oid_cpy(&id, git_reference_target(ref)); - git_reference_free(ref); - - /* Create the symbolic ref */ - cl_git_pass(git_reference_symbolic_create(&ref, g_repo, ref_name, ref_master_name, 0, NULL)); - git_reference_free(ref); - /* It shouldn't overwrite unless we tell it to */ - cl_git_fail(git_reference_create(&ref, g_repo, ref_name, &id, 0, NULL)); - cl_git_pass(git_reference_create(&ref, g_repo, ref_name, &id, 1, NULL)); - git_reference_free(ref); - - /* Ensure it points to the right place */ - cl_git_pass(git_reference_lookup(&ref, g_repo, ref_name)); - cl_assert(git_reference_type(ref) & GIT_REF_OID); - cl_assert_equal_oid(&id, git_reference_target(ref)); - - git_reference_free(ref); -} diff --git a/vendor/libgit2/tests/refs/pack.c b/vendor/libgit2/tests/refs/pack.c deleted file mode 100644 index bda86f69a..000000000 --- a/vendor/libgit2/tests/refs/pack.c +++ /dev/null @@ -1,105 +0,0 @@ -#include "clar_libgit2.h" - -#include "fileops.h" -#include "git2/reflog.h" -#include "git2/refdb.h" -#include "reflog.h" -#include "refs.h" -#include "ref_helpers.h" - -static const char *loose_tag_ref_name = "refs/tags/e90810b"; - -static git_repository *g_repo; - -void test_refs_pack__initialize(void) -{ - g_repo = cl_git_sandbox_init("testrepo"); -} - -void test_refs_pack__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -static void packall(void) -{ - git_refdb *refdb; - - cl_git_pass(git_repository_refdb(&refdb, g_repo)); - cl_git_pass(git_refdb_compress(refdb)); - git_refdb_free(refdb); -} - -void test_refs_pack__empty(void) -{ - /* create a packfile for an empty folder */ - git_buf temp_path = GIT_BUF_INIT; - - cl_git_pass(git_buf_join_n(&temp_path, '/', 3, git_repository_path(g_repo), GIT_REFS_HEADS_DIR, "empty_dir")); - cl_git_pass(git_futils_mkdir_r(temp_path.ptr, GIT_REFS_DIR_MODE)); - git_buf_free(&temp_path); - - packall(); -} - -void test_refs_pack__loose(void) -{ - /* create a packfile from all the loose refs in a repo */ - git_reference *reference; - git_buf temp_path = GIT_BUF_INIT; - - /* Ensure a known loose ref can be looked up */ - cl_git_pass(git_reference_lookup(&reference, g_repo, loose_tag_ref_name)); - cl_assert(reference_is_packed(reference) == 0); - cl_assert_equal_s(reference->name, loose_tag_ref_name); - git_reference_free(reference); - - /* - * We are now trying to pack also a loose reference - * called `points_to_blob`, to make sure we can properly - * pack weak tags - */ - packall(); - - /* Ensure the packed-refs file exists */ - cl_git_pass(git_buf_joinpath(&temp_path, git_repository_path(g_repo), GIT_PACKEDREFS_FILE)); - cl_assert(git_path_exists(temp_path.ptr)); - - /* Ensure the known ref can still be looked up but is now packed */ - cl_git_pass(git_reference_lookup(&reference, g_repo, loose_tag_ref_name)); - cl_assert(reference_is_packed(reference)); - cl_assert_equal_s(reference->name, loose_tag_ref_name); - - /* Ensure the known ref has been removed from the loose folder structure */ - cl_git_pass(git_buf_joinpath(&temp_path, git_repository_path(g_repo), loose_tag_ref_name)); - cl_assert(!git_path_exists(temp_path.ptr)); - - git_reference_free(reference); - git_buf_free(&temp_path); -} - -void test_refs_pack__symbolic(void) -{ - /* create a packfile from loose refs skipping symbolic refs */ - int i; - git_oid head; - git_reference *ref; - char name[128]; - - cl_git_pass(git_reference_name_to_id(&head, g_repo, "HEAD")); - - /* make a bunch of references */ - - for (i = 0; i < 100; ++i) { - p_snprintf(name, sizeof(name), "refs/heads/symbolic-%03d", i); - cl_git_pass(git_reference_symbolic_create( - &ref, g_repo, name, "refs/heads/master", 0, NULL)); - git_reference_free(ref); - - p_snprintf(name, sizeof(name), "refs/heads/direct-%03d", i); - cl_git_pass(git_reference_create(&ref, g_repo, name, &head, 0, NULL)); - git_reference_free(ref); - } - - packall(); -} diff --git a/vendor/libgit2/tests/refs/peel.c b/vendor/libgit2/tests/refs/peel.c deleted file mode 100644 index 83f6109c0..000000000 --- a/vendor/libgit2/tests/refs/peel.c +++ /dev/null @@ -1,119 +0,0 @@ -#include "clar_libgit2.h" - -static git_repository *g_repo; -static git_repository *g_peel_repo; - -void test_refs_peel__initialize(void) -{ - cl_git_pass(git_repository_open(&g_repo, cl_fixture("testrepo.git"))); - cl_git_pass(git_repository_open(&g_peel_repo, cl_fixture("peeled.git"))); -} - -void test_refs_peel__cleanup(void) -{ - git_repository_free(g_repo); - g_repo = NULL; - git_repository_free(g_peel_repo); - g_peel_repo = NULL; -} - -static void assert_peel_generic( - git_repository *repo, - const char *ref_name, - git_otype requested_type, - const char* expected_sha, - git_otype expected_type) -{ - git_oid expected_oid; - git_reference *ref; - git_object *peeled; - - cl_git_pass(git_reference_lookup(&ref, repo, ref_name)); - - cl_git_pass(git_reference_peel(&peeled, ref, requested_type)); - - cl_git_pass(git_oid_fromstr(&expected_oid, expected_sha)); - cl_assert_equal_oid(&expected_oid, git_object_id(peeled)); - - cl_assert_equal_i(expected_type, git_object_type(peeled)); - - git_object_free(peeled); - git_reference_free(ref); -} - -static void assert_peel( - const char *ref_name, - git_otype requested_type, - const char* expected_sha, - git_otype expected_type) -{ - assert_peel_generic(g_repo, ref_name, requested_type, - expected_sha, expected_type); -} - -static void assert_peel_error(int error, const char *ref_name, git_otype requested_type) -{ - git_reference *ref; - git_object *peeled; - - cl_git_pass(git_reference_lookup(&ref, g_repo, ref_name)); - - cl_assert_equal_i(error, git_reference_peel(&peeled, ref, requested_type)); - - git_reference_free(ref); -} - -void test_refs_peel__can_peel_a_tag(void) -{ - assert_peel("refs/tags/test", GIT_OBJ_TAG, - "b25fa35b38051e4ae45d4222e795f9df2e43f1d1", GIT_OBJ_TAG); - assert_peel("refs/tags/test", GIT_OBJ_COMMIT, - "e90810b8df3e80c413d903f631643c716887138d", GIT_OBJ_COMMIT); - assert_peel("refs/tags/test", GIT_OBJ_TREE, - "53fc32d17276939fc79ed05badaef2db09990016", GIT_OBJ_TREE); - assert_peel("refs/tags/point_to_blob", GIT_OBJ_BLOB, - "1385f264afb75a56a5bec74243be9b367ba4ca08", GIT_OBJ_BLOB); -} - -void test_refs_peel__can_peel_a_branch(void) -{ - assert_peel("refs/heads/master", GIT_OBJ_COMMIT, - "a65fedf39aefe402d3bb6e24df4d4f5fe4547750", GIT_OBJ_COMMIT); - assert_peel("refs/heads/master", GIT_OBJ_TREE, - "944c0f6e4dfa41595e6eb3ceecdb14f50fe18162", GIT_OBJ_TREE); -} - -void test_refs_peel__can_peel_a_symbolic_reference(void) -{ - assert_peel("HEAD", GIT_OBJ_COMMIT, - "a65fedf39aefe402d3bb6e24df4d4f5fe4547750", GIT_OBJ_COMMIT); - assert_peel("HEAD", GIT_OBJ_TREE, - "944c0f6e4dfa41595e6eb3ceecdb14f50fe18162", GIT_OBJ_TREE); -} - -void test_refs_peel__cannot_peel_into_a_non_existing_target(void) -{ - assert_peel_error(GIT_EINVALIDSPEC, "refs/tags/point_to_blob", GIT_OBJ_TAG); -} - -void test_refs_peel__can_peel_into_any_non_tag_object(void) -{ - assert_peel("refs/heads/master", GIT_OBJ_ANY, - "a65fedf39aefe402d3bb6e24df4d4f5fe4547750", GIT_OBJ_COMMIT); - assert_peel("refs/tags/point_to_blob", GIT_OBJ_ANY, - "1385f264afb75a56a5bec74243be9b367ba4ca08", GIT_OBJ_BLOB); - assert_peel("refs/tags/test", GIT_OBJ_ANY, - "e90810b8df3e80c413d903f631643c716887138d", GIT_OBJ_COMMIT); -} - -void test_refs_peel__can_peel_fully_peeled_packed_refs(void) -{ - assert_peel_generic(g_peel_repo, - "refs/tags/tag-inside-tags", GIT_OBJ_ANY, - "0df1a5865c8abfc09f1f2182e6a31be550e99f07", - GIT_OBJ_COMMIT); - assert_peel_generic(g_peel_repo, - "refs/foo/tag-outside-tags", GIT_OBJ_ANY, - "0df1a5865c8abfc09f1f2182e6a31be550e99f07", - GIT_OBJ_COMMIT); -} diff --git a/vendor/libgit2/tests/refs/races.c b/vendor/libgit2/tests/refs/races.c deleted file mode 100644 index fbecf4a75..000000000 --- a/vendor/libgit2/tests/refs/races.c +++ /dev/null @@ -1,152 +0,0 @@ -#include "clar_libgit2.h" - -#include "repository.h" -#include "git2/reflog.h" -#include "reflog.h" -#include "ref_helpers.h" - -static const char *commit_id = "099fabac3a9ea935598528c27f866e34089c2eff"; -static const char *refname = "refs/heads/master"; -static const char *other_refname = "refs/heads/foo"; -static const char *other_commit_id = "a65fedf39aefe402d3bb6e24df4d4f5fe4547750"; - -static git_repository *g_repo; - -void test_refs_races__initialize(void) -{ - g_repo = cl_git_sandbox_init("testrepo"); -} - -void test_refs_races__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -void test_refs_races__create_matching(void) -{ - git_reference *ref, *ref2, *ref3; - git_oid id, other_id; - - git_oid_fromstr(&id, commit_id); - git_oid_fromstr(&other_id, other_commit_id); - - cl_git_fail_with(GIT_EMODIFIED, git_reference_create_matching(&ref, g_repo, refname, &other_id, 1, &other_id, NULL)); - - cl_git_pass(git_reference_lookup(&ref, g_repo, refname)); - cl_git_pass(git_reference_create_matching(&ref2, g_repo, refname, &other_id, 1, &id, NULL)); - cl_git_fail_with(GIT_EMODIFIED, git_reference_set_target(&ref3, ref, &other_id, NULL)); - - git_reference_free(ref); - git_reference_free(ref2); - git_reference_free(ref3); -} - -void test_refs_races__symbolic_create_matching(void) -{ - git_reference *ref, *ref2, *ref3; - git_oid id, other_id; - - git_oid_fromstr(&id, commit_id); - git_oid_fromstr(&other_id, other_commit_id); - - cl_git_fail_with(GIT_EMODIFIED, git_reference_symbolic_create_matching(&ref, g_repo, "HEAD", other_refname, 1, other_refname, NULL)); - - cl_git_pass(git_reference_lookup(&ref, g_repo, "HEAD")); - cl_git_pass(git_reference_symbolic_create_matching(&ref2, g_repo, "HEAD", other_refname, 1, NULL, refname)); - cl_git_fail_with(GIT_EMODIFIED, git_reference_symbolic_set_target(&ref3, ref, other_refname, NULL)); - - git_reference_free(ref); - git_reference_free(ref2); - git_reference_free(ref3); -} - -void test_refs_races__delete(void) -{ - git_reference *ref, *ref2; - git_oid id, other_id; - - git_oid_fromstr(&id, commit_id); - git_oid_fromstr(&other_id, other_commit_id); - - /* We can delete a value that matches */ - cl_git_pass(git_reference_lookup(&ref, g_repo, refname)); - cl_git_pass(git_reference_delete(ref)); - git_reference_free(ref); - - /* We cannot delete a symbolic value that doesn't match */ - cl_git_pass(git_reference_lookup(&ref, g_repo, "HEAD")); - cl_git_pass(git_reference_symbolic_create_matching(&ref2, g_repo, "HEAD", other_refname, 1, NULL, refname)); - cl_git_fail_with(GIT_EMODIFIED, git_reference_delete(ref)); - - git_reference_free(ref); - git_reference_free(ref2); - - cl_git_pass(git_reference_create(&ref, g_repo, refname, &id, 1, NULL)); - git_reference_free(ref); - - /* We cannot delete an oid value that doesn't match */ - cl_git_pass(git_reference_lookup(&ref, g_repo, refname)); - cl_git_pass(git_reference_create_matching(&ref2, g_repo, refname, &other_id, 1, &id, NULL)); - cl_git_fail_with(GIT_EMODIFIED, git_reference_delete(ref)); - - git_reference_free(ref); - git_reference_free(ref2); -} - -void test_refs_races__switch_oid_to_symbolic(void) -{ - git_reference *ref, *ref2, *ref3; - git_oid id, other_id; - - git_oid_fromstr(&id, commit_id); - git_oid_fromstr(&other_id, other_commit_id); - - /* Removing a direct ref when it's currently symbolic should fail */ - cl_git_pass(git_reference_lookup(&ref, g_repo, refname)); - cl_git_pass(git_reference_symbolic_create(&ref2, g_repo, refname, other_refname, 1, NULL)); - cl_git_fail_with(GIT_EMODIFIED, git_reference_delete(ref)); - - git_reference_free(ref); - git_reference_free(ref2); - - cl_git_pass(git_reference_create(&ref, g_repo, refname, &id, 1, NULL)); - git_reference_free(ref); - - /* Updating a direct ref when it's currently symbolic should fail */ - cl_git_pass(git_reference_lookup(&ref, g_repo, refname)); - cl_git_pass(git_reference_symbolic_create(&ref2, g_repo, refname, other_refname, 1, NULL)); - cl_git_fail_with(GIT_EMODIFIED, git_reference_set_target(&ref3, ref, &other_id, NULL)); - - git_reference_free(ref); - git_reference_free(ref2); - git_reference_free(ref3); -} - -void test_refs_races__switch_symbolic_to_oid(void) -{ - git_reference *ref, *ref2, *ref3; - git_oid id, other_id; - - git_oid_fromstr(&id, commit_id); - git_oid_fromstr(&other_id, other_commit_id); - - /* Removing a symbolic ref when it's currently direct should fail */ - cl_git_pass(git_reference_lookup(&ref, g_repo, "HEAD")); - cl_git_pass(git_reference_create(&ref2, g_repo, "HEAD", &id, 1, NULL)); - cl_git_fail_with(GIT_EMODIFIED, git_reference_delete(ref)); - - git_reference_free(ref); - git_reference_free(ref2); - - cl_git_pass(git_reference_symbolic_create(&ref, g_repo, "HEAD", refname, 1, NULL)); - git_reference_free(ref); - - /* Updating a symbolic ref when it's currently direct should fail */ - cl_git_pass(git_reference_lookup(&ref, g_repo, "HEAD")); - cl_git_pass(git_reference_create(&ref2, g_repo, "HEAD", &id, 1, NULL)); - cl_git_fail_with(GIT_EMODIFIED, git_reference_symbolic_set_target(&ref3, ref, other_refname, NULL)); - - git_reference_free(ref); - git_reference_free(ref2); - git_reference_free(ref3); -} diff --git a/vendor/libgit2/tests/refs/read.c b/vendor/libgit2/tests/refs/read.c deleted file mode 100644 index cb42a568b..000000000 --- a/vendor/libgit2/tests/refs/read.c +++ /dev/null @@ -1,299 +0,0 @@ -#include "clar_libgit2.h" - -#include "repository.h" -#include "git2/reflog.h" -#include "reflog.h" -#include "ref_helpers.h" - -static const char *loose_tag_ref_name = "refs/tags/e90810b"; -static const char *non_existing_tag_ref_name = "refs/tags/i-do-not-exist"; -static const char *head_tracker_sym_ref_name = "HEAD_TRACKER"; -static const char *current_head_target = "refs/heads/master"; -static const char *current_master_tip = "a65fedf39aefe402d3bb6e24df4d4f5fe4547750"; -static const char *packed_head_name = "refs/heads/packed"; -static const char *packed_test_head_name = "refs/heads/packed-test"; - -static git_repository *g_repo; - -void test_refs_read__initialize(void) -{ - cl_git_pass(git_repository_open(&g_repo, cl_fixture("testrepo.git"))); -} - -void test_refs_read__cleanup(void) -{ - git_repository_free(g_repo); - g_repo = NULL; -} - -void test_refs_read__loose_tag(void) -{ - // lookup a loose tag reference - git_reference *reference; - git_object *object; - git_buf ref_name_from_tag_name = GIT_BUF_INIT; - - cl_git_pass(git_reference_lookup(&reference, g_repo, loose_tag_ref_name)); - cl_assert(git_reference_type(reference) & GIT_REF_OID); - cl_assert(reference_is_packed(reference) == 0); - cl_assert_equal_s(reference->name, loose_tag_ref_name); - - cl_git_pass(git_object_lookup(&object, g_repo, git_reference_target(reference), GIT_OBJ_ANY)); - cl_assert(object != NULL); - cl_assert(git_object_type(object) == GIT_OBJ_TAG); - - /* Ensure the name of the tag matches the name of the reference */ - cl_git_pass(git_buf_joinpath(&ref_name_from_tag_name, GIT_REFS_TAGS_DIR, git_tag_name((git_tag *)object))); - cl_assert_equal_s(ref_name_from_tag_name.ptr, loose_tag_ref_name); - git_buf_free(&ref_name_from_tag_name); - - git_object_free(object); - - git_reference_free(reference); -} - -void test_refs_read__nonexisting_tag(void) -{ - // lookup a loose tag reference that doesn't exist - git_reference *reference; - - cl_git_fail(git_reference_lookup(&reference, g_repo, non_existing_tag_ref_name)); - - git_reference_free(reference); -} - - -void test_refs_read__symbolic(void) -{ - // lookup a symbolic reference - git_reference *reference, *resolved_ref; - git_object *object; - git_oid id; - - cl_git_pass(git_reference_lookup(&reference, g_repo, GIT_HEAD_FILE)); - cl_assert(git_reference_type(reference) & GIT_REF_SYMBOLIC); - cl_assert(reference_is_packed(reference) == 0); - cl_assert_equal_s(reference->name, GIT_HEAD_FILE); - - cl_git_pass(git_reference_resolve(&resolved_ref, reference)); - cl_assert(git_reference_type(resolved_ref) == GIT_REF_OID); - - cl_git_pass(git_object_lookup(&object, g_repo, git_reference_target(resolved_ref), GIT_OBJ_ANY)); - cl_assert(object != NULL); - cl_assert(git_object_type(object) == GIT_OBJ_COMMIT); - - git_oid_fromstr(&id, current_master_tip); - cl_assert_equal_oid(&id, git_object_id(object)); - - git_object_free(object); - - git_reference_free(reference); - git_reference_free(resolved_ref); -} - -void test_refs_read__nested_symbolic(void) -{ - // lookup a nested symbolic reference - git_reference *reference, *resolved_ref; - git_object *object; - git_oid id; - - cl_git_pass(git_reference_lookup(&reference, g_repo, head_tracker_sym_ref_name)); - cl_assert(git_reference_type(reference) & GIT_REF_SYMBOLIC); - cl_assert(reference_is_packed(reference) == 0); - cl_assert_equal_s(reference->name, head_tracker_sym_ref_name); - - cl_git_pass(git_reference_resolve(&resolved_ref, reference)); - cl_assert(git_reference_type(resolved_ref) == GIT_REF_OID); - - cl_git_pass(git_object_lookup(&object, g_repo, git_reference_target(resolved_ref), GIT_OBJ_ANY)); - cl_assert(object != NULL); - cl_assert(git_object_type(object) == GIT_OBJ_COMMIT); - - git_oid_fromstr(&id, current_master_tip); - cl_assert_equal_oid(&id, git_object_id(object)); - - git_object_free(object); - - git_reference_free(reference); - git_reference_free(resolved_ref); -} - -void test_refs_read__head_then_master(void) -{ - // lookup the HEAD and resolve the master branch - git_reference *reference, *resolved_ref, *comp_base_ref; - - cl_git_pass(git_reference_lookup(&reference, g_repo, head_tracker_sym_ref_name)); - cl_git_pass(git_reference_resolve(&comp_base_ref, reference)); - git_reference_free(reference); - - cl_git_pass(git_reference_lookup(&reference, g_repo, GIT_HEAD_FILE)); - cl_git_pass(git_reference_resolve(&resolved_ref, reference)); - cl_assert_equal_oid(git_reference_target(comp_base_ref), git_reference_target(resolved_ref)); - git_reference_free(reference); - git_reference_free(resolved_ref); - - cl_git_pass(git_reference_lookup(&reference, g_repo, current_head_target)); - cl_git_pass(git_reference_resolve(&resolved_ref, reference)); - cl_assert_equal_oid(git_reference_target(comp_base_ref), git_reference_target(resolved_ref)); - git_reference_free(reference); - git_reference_free(resolved_ref); - - git_reference_free(comp_base_ref); -} - -void test_refs_read__master_then_head(void) -{ - // lookup the master branch and then the HEAD - git_reference *reference, *master_ref, *resolved_ref; - - cl_git_pass(git_reference_lookup(&master_ref, g_repo, current_head_target)); - cl_git_pass(git_reference_lookup(&reference, g_repo, GIT_HEAD_FILE)); - - cl_git_pass(git_reference_resolve(&resolved_ref, reference)); - cl_assert_equal_oid(git_reference_target(master_ref), git_reference_target(resolved_ref)); - - git_reference_free(reference); - git_reference_free(resolved_ref); - git_reference_free(master_ref); -} - - -void test_refs_read__packed(void) -{ - // lookup a packed reference - git_reference *reference; - git_object *object; - - cl_git_pass(git_reference_lookup(&reference, g_repo, packed_head_name)); - cl_assert(git_reference_type(reference) & GIT_REF_OID); - cl_assert(reference_is_packed(reference)); - cl_assert_equal_s(reference->name, packed_head_name); - - cl_git_pass(git_object_lookup(&object, g_repo, git_reference_target(reference), GIT_OBJ_ANY)); - cl_assert(object != NULL); - cl_assert(git_object_type(object) == GIT_OBJ_COMMIT); - - git_object_free(object); - - git_reference_free(reference); -} - -void test_refs_read__loose_first(void) -{ - // assure that a loose reference is looked up before a packed reference - git_reference *reference; - - cl_git_pass(git_reference_lookup(&reference, g_repo, packed_head_name)); - git_reference_free(reference); - cl_git_pass(git_reference_lookup(&reference, g_repo, packed_test_head_name)); - cl_assert(git_reference_type(reference) & GIT_REF_OID); - cl_assert(reference_is_packed(reference) == 0); - cl_assert_equal_s(reference->name, packed_test_head_name); - - git_reference_free(reference); -} - -void test_refs_read__chomped(void) -{ - git_reference *test, *chomped; - - cl_git_pass(git_reference_lookup(&test, g_repo, "refs/heads/test")); - cl_git_pass(git_reference_lookup(&chomped, g_repo, "refs/heads/chomped")); - cl_assert_equal_oid(git_reference_target(test), git_reference_target(chomped)); - - git_reference_free(test); - git_reference_free(chomped); -} - -void test_refs_read__trailing(void) -{ - git_reference *test, *trailing; - - cl_git_pass(git_reference_lookup(&test, g_repo, "refs/heads/test")); - cl_git_pass(git_reference_lookup(&trailing, g_repo, "refs/heads/trailing")); - cl_assert_equal_oid(git_reference_target(test), git_reference_target(trailing)); - git_reference_free(trailing); - cl_git_pass(git_reference_lookup(&trailing, g_repo, "FETCH_HEAD")); - - git_reference_free(test); - git_reference_free(trailing); -} - -void test_refs_read__unfound_return_ENOTFOUND(void) -{ - git_reference *reference; - git_oid id; - - cl_assert_equal_i(GIT_ENOTFOUND, - git_reference_lookup(&reference, g_repo, "TEST_MASTER")); - cl_assert_equal_i(GIT_ENOTFOUND, - git_reference_lookup(&reference, g_repo, "refs/test/master")); - cl_assert_equal_i(GIT_ENOTFOUND, - git_reference_lookup(&reference, g_repo, "refs/tags/test/master")); - cl_assert_equal_i(GIT_ENOTFOUND, - git_reference_lookup(&reference, g_repo, "refs/tags/test/farther/master")); - - cl_assert_equal_i(GIT_ENOTFOUND, - git_reference_name_to_id(&id, g_repo, "refs/tags/test/farther/master")); -} - -static void assert_is_branch(const char *name, bool expected_branchness) -{ - git_reference *reference; - cl_git_pass(git_reference_lookup(&reference, g_repo, name)); - cl_assert_equal_i(expected_branchness, git_reference_is_branch(reference)); - git_reference_free(reference); -} - -void test_refs_read__can_determine_if_a_reference_is_a_local_branch(void) -{ - assert_is_branch("refs/heads/master", true); - assert_is_branch("refs/heads/packed", true); - assert_is_branch("refs/remotes/test/master", false); - assert_is_branch("refs/tags/e90810b", false); -} - -static void assert_is_tag(const char *name, bool expected_tagness) -{ - git_reference *reference; - cl_git_pass(git_reference_lookup(&reference, g_repo, name)); - cl_assert_equal_i(expected_tagness, git_reference_is_tag(reference)); - git_reference_free(reference); -} - -void test_refs_read__can_determine_if_a_reference_is_a_tag(void) -{ - assert_is_tag("refs/tags/e90810b", true); - assert_is_tag("refs/tags/test", true); - assert_is_tag("refs/heads/packed", false); - assert_is_tag("refs/remotes/test/master", false); -} - -static void assert_is_note(const char *name, bool expected_noteness) -{ - git_reference *reference; - cl_git_pass(git_reference_lookup(&reference, g_repo, name)); - cl_assert_equal_i(expected_noteness, git_reference_is_note(reference)); - git_reference_free(reference); -} - -void test_refs_read__can_determine_if_a_reference_is_a_note(void) -{ - assert_is_note("refs/notes/fanout", true); - assert_is_note("refs/heads/packed", false); - assert_is_note("refs/remotes/test/master", false); -} - -void test_refs_read__invalid_name_returns_EINVALIDSPEC(void) -{ - git_reference *reference; - git_oid id; - - cl_assert_equal_i(GIT_EINVALIDSPEC, - git_reference_lookup(&reference, g_repo, "refs/heads/Inv@{id")); - - cl_assert_equal_i(GIT_EINVALIDSPEC, - git_reference_name_to_id(&id, g_repo, "refs/heads/Inv@{id")); -} diff --git a/vendor/libgit2/tests/refs/ref_helpers.c b/vendor/libgit2/tests/refs/ref_helpers.c deleted file mode 100644 index 7676e65a7..000000000 --- a/vendor/libgit2/tests/refs/ref_helpers.c +++ /dev/null @@ -1,25 +0,0 @@ -#include "git2/repository.h" -#include "git2/refs.h" -#include "common.h" -#include "util.h" -#include "buffer.h" -#include "path.h" - -int reference_is_packed(git_reference *ref) -{ - git_buf ref_path = GIT_BUF_INIT; - int packed; - - assert(ref); - - if (git_buf_joinpath(&ref_path, - git_repository_path(git_reference_owner(ref)), - git_reference_name(ref)) < 0) - return -1; - - packed = !git_path_isfile(ref_path.ptr); - - git_buf_free(&ref_path); - - return packed; -} diff --git a/vendor/libgit2/tests/refs/ref_helpers.h b/vendor/libgit2/tests/refs/ref_helpers.h deleted file mode 100644 index 0ef55bfce..000000000 --- a/vendor/libgit2/tests/refs/ref_helpers.h +++ /dev/null @@ -1 +0,0 @@ -int reference_is_packed(git_reference *ref); diff --git a/vendor/libgit2/tests/refs/reflog/drop.c b/vendor/libgit2/tests/refs/reflog/drop.c deleted file mode 100644 index 916bd9933..000000000 --- a/vendor/libgit2/tests/refs/reflog/drop.c +++ /dev/null @@ -1,115 +0,0 @@ -#include "clar_libgit2.h" - -#include "reflog.h" - -static git_repository *g_repo; -static git_reflog *g_reflog; -static size_t entrycount; - -void test_refs_reflog_drop__initialize(void) -{ - g_repo = cl_git_sandbox_init("testrepo.git"); - - git_reflog_read(&g_reflog, g_repo, "HEAD"); - entrycount = git_reflog_entrycount(g_reflog); -} - -void test_refs_reflog_drop__cleanup(void) -{ - git_reflog_free(g_reflog); - g_reflog = NULL; - - cl_git_sandbox_cleanup(); -} - -void test_refs_reflog_drop__dropping_a_non_exisiting_entry_from_the_log_returns_ENOTFOUND(void) -{ - cl_assert_equal_i(GIT_ENOTFOUND, git_reflog_drop(g_reflog, entrycount, 0)); - - cl_assert_equal_sz(entrycount, git_reflog_entrycount(g_reflog)); -} - -void test_refs_reflog_drop__can_drop_an_entry(void) -{ - cl_assert(entrycount > 4); - - cl_git_pass(git_reflog_drop(g_reflog, 2, 0)); - cl_assert_equal_sz(entrycount - 1, git_reflog_entrycount(g_reflog)); -} - -void test_refs_reflog_drop__can_drop_an_entry_and_rewrite_the_log_history(void) -{ - const git_reflog_entry *before_current; - const git_reflog_entry *after_current; - git_oid before_current_old_oid, before_current_cur_oid; - - cl_assert(entrycount > 4); - - before_current = git_reflog_entry_byindex(g_reflog, 1); - - git_oid_cpy(&before_current_old_oid, &before_current->oid_old); - git_oid_cpy(&before_current_cur_oid, &before_current->oid_cur); - - cl_git_pass(git_reflog_drop(g_reflog, 1, 1)); - - cl_assert_equal_sz(entrycount - 1, git_reflog_entrycount(g_reflog)); - - after_current = git_reflog_entry_byindex(g_reflog, 0); - - cl_assert_equal_i(0, git_oid_cmp(&before_current_old_oid, &after_current->oid_old)); - cl_assert(0 != git_oid_cmp(&before_current_cur_oid, &after_current->oid_cur)); -} - -void test_refs_reflog_drop__can_drop_the_oldest_entry(void) -{ - const git_reflog_entry *entry; - - cl_assert(entrycount > 2); - - cl_git_pass(git_reflog_drop(g_reflog, entrycount - 1, 0)); - cl_assert_equal_sz(entrycount - 1, git_reflog_entrycount(g_reflog)); - - entry = git_reflog_entry_byindex(g_reflog, entrycount - 2); - cl_assert(git_oid_streq(&entry->oid_old, GIT_OID_HEX_ZERO) != 0); -} - -void test_refs_reflog_drop__can_drop_the_oldest_entry_and_rewrite_the_log_history(void) -{ - const git_reflog_entry *entry; - - cl_assert(entrycount > 2); - - cl_git_pass(git_reflog_drop(g_reflog, entrycount - 1, 1)); - cl_assert_equal_sz(entrycount - 1, git_reflog_entrycount(g_reflog)); - - entry = git_reflog_entry_byindex(g_reflog, entrycount - 2); - cl_assert(git_oid_streq(&entry->oid_old, GIT_OID_HEX_ZERO) == 0); -} - -void test_refs_reflog_drop__can_drop_all_the_entries(void) -{ - cl_assert(--entrycount > 0); - - do { - cl_git_pass(git_reflog_drop(g_reflog, 0, 1)); - } while (--entrycount > 0); - - cl_git_pass(git_reflog_drop(g_reflog, 0, 1)); - - cl_assert_equal_i(0, (int)git_reflog_entrycount(g_reflog)); -} - -void test_refs_reflog_drop__can_persist_deletion_on_disk(void) -{ - cl_assert(entrycount > 2); - - cl_git_pass(git_reflog_drop(g_reflog, 0, 1)); - cl_assert_equal_sz(entrycount - 1, git_reflog_entrycount(g_reflog)); - cl_git_pass(git_reflog_write(g_reflog)); - - git_reflog_free(g_reflog); - - git_reflog_read(&g_reflog, g_repo, "HEAD"); - - cl_assert_equal_sz(entrycount - 1, git_reflog_entrycount(g_reflog)); -} diff --git a/vendor/libgit2/tests/refs/reflog/reflog.c b/vendor/libgit2/tests/refs/reflog/reflog.c deleted file mode 100644 index fdb15502c..000000000 --- a/vendor/libgit2/tests/refs/reflog/reflog.c +++ /dev/null @@ -1,450 +0,0 @@ -#include "clar_libgit2.h" - -#include "fileops.h" -#include "git2/reflog.h" -#include "reflog.h" - - -static const char *new_ref = "refs/heads/test-reflog"; -static const char *current_master_tip = "a65fedf39aefe402d3bb6e24df4d4f5fe4547750"; -#define commit_msg "commit: bla bla" - -static git_repository *g_repo; - - -// helpers -static void assert_signature(const git_signature *expected, const git_signature *actual) -{ - cl_assert(actual); - cl_assert_equal_s(expected->name, actual->name); - cl_assert_equal_s(expected->email, actual->email); - cl_assert(expected->when.offset == actual->when.offset); - cl_assert(expected->when.time == actual->when.time); -} - - -// Fixture setup and teardown -void test_refs_reflog_reflog__initialize(void) -{ - g_repo = cl_git_sandbox_init("testrepo.git"); -} - -void test_refs_reflog_reflog__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -static void assert_appends(const git_signature *committer, const git_oid *oid) -{ - git_repository *repo2; - git_reference *lookedup_ref; - git_reflog *reflog; - const git_reflog_entry *entry; - - /* Reopen a new instance of the repository */ - cl_git_pass(git_repository_open(&repo2, "testrepo.git")); - - /* Lookup the previously created branch */ - cl_git_pass(git_reference_lookup(&lookedup_ref, repo2, new_ref)); - - /* Read and parse the reflog for this branch */ - cl_git_pass(git_reflog_read(&reflog, repo2, new_ref)); - cl_assert_equal_i(3, (int)git_reflog_entrycount(reflog)); - - /* The first one was the creation of the branch */ - entry = git_reflog_entry_byindex(reflog, 2); - cl_assert(git_oid_streq(&entry->oid_old, GIT_OID_HEX_ZERO) == 0); - - entry = git_reflog_entry_byindex(reflog, 1); - assert_signature(committer, entry->committer); - cl_assert(git_oid_cmp(oid, &entry->oid_old) == 0); - cl_assert(git_oid_cmp(oid, &entry->oid_cur) == 0); - cl_assert(entry->msg == NULL); - - entry = git_reflog_entry_byindex(reflog, 0); - assert_signature(committer, entry->committer); - cl_assert(git_oid_cmp(oid, &entry->oid_cur) == 0); - cl_assert_equal_s(commit_msg, entry->msg); - - git_reflog_free(reflog); - git_repository_free(repo2); - - git_reference_free(lookedup_ref); -} - -void test_refs_reflog_reflog__append_then_read(void) -{ - /* write a reflog for a given reference and ensure it can be read back */ - git_reference *ref; - git_oid oid; - git_signature *committer; - git_reflog *reflog; - - /* Create a new branch pointing at the HEAD */ - git_oid_fromstr(&oid, current_master_tip); - cl_git_pass(git_reference_create(&ref, g_repo, new_ref, &oid, 0, NULL)); - git_reference_free(ref); - - cl_git_pass(git_signature_now(&committer, "foo", "foo@bar")); - - cl_git_pass(git_reflog_read(&reflog, g_repo, new_ref)); - - cl_git_fail(git_reflog_append(reflog, &oid, committer, "no inner\nnewline")); - cl_git_pass(git_reflog_append(reflog, &oid, committer, NULL)); - cl_git_pass(git_reflog_append(reflog, &oid, committer, commit_msg "\n")); - cl_git_pass(git_reflog_write(reflog)); - git_reflog_free(reflog); - - assert_appends(committer, &oid); - - git_signature_free(committer); -} - -void test_refs_reflog_reflog__renaming_the_reference_moves_the_reflog(void) -{ - git_reference *master, *new_master; - git_buf master_log_path = GIT_BUF_INIT, moved_log_path = GIT_BUF_INIT; - - git_buf_joinpath(&master_log_path, git_repository_path(g_repo), GIT_REFLOG_DIR); - git_buf_puts(&moved_log_path, git_buf_cstr(&master_log_path)); - git_buf_joinpath(&master_log_path, git_buf_cstr(&master_log_path), "refs/heads/master"); - git_buf_joinpath(&moved_log_path, git_buf_cstr(&moved_log_path), "refs/moved"); - - cl_assert_equal_i(true, git_path_isfile(git_buf_cstr(&master_log_path))); - cl_assert_equal_i(false, git_path_isfile(git_buf_cstr(&moved_log_path))); - - cl_git_pass(git_reference_lookup(&master, g_repo, "refs/heads/master")); - cl_git_pass(git_reference_rename(&new_master, master, "refs/moved", 0, NULL)); - git_reference_free(master); - - cl_assert_equal_i(false, git_path_isfile(git_buf_cstr(&master_log_path))); - cl_assert_equal_i(true, git_path_isfile(git_buf_cstr(&moved_log_path))); - - git_reference_free(new_master); - git_buf_free(&moved_log_path); - git_buf_free(&master_log_path); -} - -void test_refs_reflog_reflog__deleting_the_reference_deletes_the_reflog(void) -{ - git_reference *master; - git_buf master_log_path = GIT_BUF_INIT; - - git_buf_joinpath(&master_log_path, git_repository_path(g_repo), GIT_REFLOG_DIR); - git_buf_joinpath(&master_log_path, git_buf_cstr(&master_log_path), "refs/heads/master"); - - cl_assert_equal_i(true, git_path_isfile(git_buf_cstr(&master_log_path))); - - cl_git_pass(git_reference_lookup(&master, g_repo, "refs/heads/master")); - cl_git_pass(git_reference_delete(master)); - git_reference_free(master); - - cl_assert_equal_i(false, git_path_isfile(git_buf_cstr(&master_log_path))); - git_buf_free(&master_log_path); -} - -void test_refs_reflog_reflog__removes_empty_reflog_dir(void) -{ - git_reference *ref; - git_buf log_path = GIT_BUF_INIT; - git_oid id; - - /* Create a new branch pointing at the HEAD */ - git_oid_fromstr(&id, current_master_tip); - cl_git_pass(git_reference_create(&ref, g_repo, "refs/heads/new-dir/new-head", &id, 0, NULL)); - - git_buf_joinpath(&log_path, git_repository_path(g_repo), GIT_REFLOG_DIR); - git_buf_joinpath(&log_path, git_buf_cstr(&log_path), "refs/heads/new-dir/new-head"); - - cl_assert_equal_i(true, git_path_isfile(git_buf_cstr(&log_path))); - - cl_git_pass(git_reference_delete(ref)); - git_reference_free(ref); - - /* new ref creation should succeed since new-dir is empty */ - git_oid_fromstr(&id, current_master_tip); - cl_git_pass(git_reference_create(&ref, g_repo, "refs/heads/new-dir", &id, 0, NULL)); - git_reference_free(ref); - - git_buf_free(&log_path); -} - -void test_refs_reflog_reflog__fails_gracefully_on_nonempty_reflog_dir(void) -{ - git_reference *ref; - git_buf log_path = GIT_BUF_INIT; - git_oid id; - - /* Create a new branch pointing at the HEAD */ - git_oid_fromstr(&id, current_master_tip); - cl_git_pass(git_reference_create(&ref, g_repo, "refs/heads/new-dir/new-head", &id, 0, NULL)); - git_reference_free(ref); - - git_buf_joinpath(&log_path, git_repository_path(g_repo), GIT_REFLOG_DIR); - git_buf_joinpath(&log_path, git_buf_cstr(&log_path), "refs/heads/new-dir/new-head"); - - cl_assert_equal_i(true, git_path_isfile(git_buf_cstr(&log_path))); - - /* delete the ref manually, leave the reflog */ - cl_must_pass(p_unlink("testrepo.git/refs/heads/new-dir/new-head")); - - /* new ref creation should fail since new-dir contains reflogs still */ - git_oid_fromstr(&id, current_master_tip); - cl_git_fail_with(GIT_EDIRECTORY, git_reference_create(&ref, g_repo, "refs/heads/new-dir", &id, 0, NULL)); - git_reference_free(ref); - - git_buf_free(&log_path); -} - -static void assert_has_reflog(bool expected_result, const char *name) -{ - cl_assert_equal_i(expected_result, git_reference_has_log(g_repo, name)); -} - -void test_refs_reflog_reflog__reference_has_reflog(void) -{ - assert_has_reflog(true, "HEAD"); - assert_has_reflog(true, "refs/heads/master"); - assert_has_reflog(false, "refs/heads/subtrees"); -} - -void test_refs_reflog_reflog__reading_the_reflog_from_a_reference_with_no_log_returns_an_empty_one(void) -{ - git_reflog *reflog; - const char *refname = "refs/heads/subtrees"; - git_buf subtrees_log_path = GIT_BUF_INIT; - - git_buf_join_n(&subtrees_log_path, '/', 3, git_repository_path(g_repo), GIT_REFLOG_DIR, refname); - cl_assert_equal_i(false, git_path_isfile(git_buf_cstr(&subtrees_log_path))); - - cl_git_pass(git_reflog_read(&reflog, g_repo, refname)); - - cl_assert_equal_i(0, (int)git_reflog_entrycount(reflog)); - - git_reflog_free(reflog); - git_buf_free(&subtrees_log_path); -} - -void test_refs_reflog_reflog__reading_a_reflog_with_invalid_format_returns_error(void) -{ - git_reflog *reflog; - const git_error *error; - const char *refname = "refs/heads/newline"; - const char *refmessage = - "Reflog*message with a newline and enough content after it to pass the GIT_REFLOG_SIZE_MIN check inside reflog_parse."; - git_reference *ref; - git_oid id; - git_buf logpath = GIT_BUF_INIT, logcontents = GIT_BUF_INIT; - char *star; - - git_oid_fromstr(&id, current_master_tip); - - /* create a new branch */ - cl_git_pass(git_reference_create(&ref, g_repo, refname, &id, 1, refmessage)); - - /* corrupt the branch reflog by introducing a newline inside the reflog message (we replace '*' with '\n') */ - git_buf_join_n(&logpath, '/', 3, git_repository_path(g_repo), GIT_REFLOG_DIR, refname); - cl_git_pass(git_futils_readbuffer(&logcontents, git_buf_cstr(&logpath))); - cl_assert((star = strchr(git_buf_cstr(&logcontents), '*')) != NULL); - *star = '\n'; - cl_git_rewritefile(git_buf_cstr(&logpath), git_buf_cstr(&logcontents)); - - /* confirm that the file was rewritten successfully and now contains a '\n' in the expected location */ - cl_git_pass(git_futils_readbuffer(&logcontents, git_buf_cstr(&logpath))); - cl_assert(strstr(git_buf_cstr(&logcontents), "Reflog\nmessage") != NULL); - - /* clear the error state so we can capture the error generated by git_reflog_read */ - giterr_clear(); - - cl_git_fail(git_reflog_read(&reflog, g_repo, refname)); - - error = giterr_last(); - - cl_assert(error != NULL); - cl_assert_equal_s("Unable to parse OID - contains invalid characters", error->message); - - git_reference_free(ref); - git_buf_free(&logpath); - git_buf_free(&logcontents); -} - -void test_refs_reflog_reflog__cannot_write_a_moved_reflog(void) -{ - git_reference *master, *new_master; - git_buf master_log_path = GIT_BUF_INIT, moved_log_path = GIT_BUF_INIT; - git_reflog *reflog; - - cl_git_pass(git_reference_lookup(&master, g_repo, "refs/heads/master")); - cl_git_pass(git_reflog_read(&reflog, g_repo, "refs/heads/master")); - - cl_git_pass(git_reflog_write(reflog)); - - cl_git_pass(git_reference_rename(&new_master, master, "refs/moved", 0, NULL)); - git_reference_free(master); - - cl_git_fail(git_reflog_write(reflog)); - - git_reflog_free(reflog); - git_reference_free(new_master); - git_buf_free(&moved_log_path); - git_buf_free(&master_log_path); -} - -void test_refs_reflog_reflog__renaming_with_an_invalid_name_returns_EINVALIDSPEC(void) -{ - cl_assert_equal_i(GIT_EINVALIDSPEC, - git_reflog_rename(g_repo, "refs/heads/master", "refs/heads/Inv@{id")); -} - -void test_refs_reflog_reflog__write_only_std_locations(void) -{ - git_reference *ref; - git_oid id; - - git_oid_fromstr(&id, current_master_tip); - - cl_git_pass(git_reference_create(&ref, g_repo, "refs/heads/foo", &id, 1, NULL)); - git_reference_free(ref); - cl_git_pass(git_reference_create(&ref, g_repo, "refs/tags/foo", &id, 1, NULL)); - git_reference_free(ref); - cl_git_pass(git_reference_create(&ref, g_repo, "refs/notes/foo", &id, 1, NULL)); - git_reference_free(ref); - - assert_has_reflog(true, "refs/heads/foo"); - assert_has_reflog(false, "refs/tags/foo"); - assert_has_reflog(true, "refs/notes/foo"); - -} - -void test_refs_reflog_reflog__write_when_explicitly_active(void) -{ - git_reference *ref; - git_oid id; - - git_oid_fromstr(&id, current_master_tip); - git_reference_ensure_log(g_repo, "refs/tags/foo"); - - cl_git_pass(git_reference_create(&ref, g_repo, "refs/tags/foo", &id, 1, NULL)); - git_reference_free(ref); - assert_has_reflog(true, "refs/tags/foo"); -} - -void test_refs_reflog_reflog__append_to_HEAD_when_changing_current_branch(void) -{ - size_t nlogs, nlogs_after; - git_reference *ref; - git_reflog *log; - git_oid id; - - cl_git_pass(git_reflog_read(&log, g_repo, "HEAD")); - nlogs = git_reflog_entrycount(log); - git_reflog_free(log); - - /* Move it back */ - git_oid_fromstr(&id, "be3563ae3f795b2b4353bcce3a527ad0a4f7f644"); - cl_git_pass(git_reference_create(&ref, g_repo, "refs/heads/master", &id, 1, NULL)); - git_reference_free(ref); - - cl_git_pass(git_reflog_read(&log, g_repo, "HEAD")); - nlogs_after = git_reflog_entrycount(log); - git_reflog_free(log); - - cl_assert_equal_i(nlogs_after, nlogs + 1); -} - -void test_refs_reflog_reflog__do_not_append_when_no_update(void) -{ - size_t nlogs, nlogs_after; - git_reference *ref, *ref2; - git_reflog *log; - - cl_git_pass(git_reflog_read(&log, g_repo, "HEAD")); - nlogs = git_reflog_entrycount(log); - git_reflog_free(log); - - cl_git_pass(git_reference_lookup(&ref, g_repo, "refs/heads/master")); - cl_git_pass(git_reference_create(&ref2, g_repo, "refs/heads/master", - git_reference_target(ref), 1, NULL)); - - git_reference_free(ref); - git_reference_free(ref2); - - cl_git_pass(git_reflog_read(&log, g_repo, "HEAD")); - nlogs_after = git_reflog_entrycount(log); - git_reflog_free(log); - - cl_assert_equal_i(nlogs_after, nlogs); -} - -static void assert_no_reflog_update(void) -{ - size_t nlogs, nlogs_after; - size_t nlogs_master, nlogs_master_after; - git_reference *ref; - git_reflog *log; - git_oid id; - - cl_git_pass(git_reflog_read(&log, g_repo, "HEAD")); - nlogs = git_reflog_entrycount(log); - git_reflog_free(log); - - cl_git_pass(git_reflog_read(&log, g_repo, "refs/heads/master")); - nlogs_master = git_reflog_entrycount(log); - git_reflog_free(log); - - /* Move it back */ - git_oid_fromstr(&id, "be3563ae3f795b2b4353bcce3a527ad0a4f7f644"); - cl_git_pass(git_reference_create(&ref, g_repo, "refs/heads/master", &id, 1, NULL)); - git_reference_free(ref); - - cl_git_pass(git_reflog_read(&log, g_repo, "HEAD")); - nlogs_after = git_reflog_entrycount(log); - git_reflog_free(log); - - cl_assert_equal_i(nlogs_after, nlogs); - - cl_git_pass(git_reflog_read(&log, g_repo, "refs/heads/master")); - nlogs_master_after = git_reflog_entrycount(log); - git_reflog_free(log); - - cl_assert_equal_i(nlogs_after, nlogs); - cl_assert_equal_i(nlogs_master_after, nlogs_master); - -} - -void test_refs_reflog_reflog__logallrefupdates_bare_set_false(void) -{ - git_config *config; - - cl_git_pass(git_repository_config(&config, g_repo)); - cl_git_pass(git_config_set_bool(config, "core.logallrefupdates", false)); - git_config_free(config); - - assert_no_reflog_update(); -} - -void test_refs_reflog_reflog__logallrefupdates_bare_unset(void) -{ - git_config *config; - - cl_git_pass(git_repository_config(&config, g_repo)); - cl_git_pass(git_config_delete_entry(config, "core.logallrefupdates")); - git_config_free(config); - - assert_no_reflog_update(); -} - -void test_refs_reflog_reflog__logallrefupdates_nonbare_set_false(void) -{ - git_config *config; - - cl_git_sandbox_cleanup(); - g_repo = cl_git_sandbox_init("testrepo"); - - - cl_git_pass(git_repository_config(&config, g_repo)); - cl_git_pass(git_config_set_bool(config, "core.logallrefupdates", false)); - git_config_free(config); - - assert_no_reflog_update(); -} diff --git a/vendor/libgit2/tests/refs/rename.c b/vendor/libgit2/tests/refs/rename.c deleted file mode 100644 index 6106e6c67..000000000 --- a/vendor/libgit2/tests/refs/rename.c +++ /dev/null @@ -1,387 +0,0 @@ -#include "clar_libgit2.h" - -#include "fileops.h" -#include "git2/reflog.h" -#include "reflog.h" -#include "refs.h" -#include "ref_helpers.h" - -static const char *loose_tag_ref_name = "refs/tags/e90810b"; -static const char *packed_head_name = "refs/heads/packed"; -static const char *packed_test_head_name = "refs/heads/packed-test"; -static const char *ref_one_name = "refs/heads/one/branch"; -static const char *ref_one_name_new = "refs/heads/two/branch"; -static const char *ref_two_name = "refs/heads/two"; -static const char *ref_master_name = "refs/heads/master"; -static const char *ref_two_name_new = "refs/heads/two/two"; - -static git_repository *g_repo; - - - -void test_refs_rename__initialize(void) -{ - g_repo = cl_git_sandbox_init("testrepo"); - cl_git_pass(git_repository_set_ident(g_repo, "me", "foo@example.com")); -} - -void test_refs_rename__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - - - -void test_refs_rename__loose(void) -{ - // rename a loose reference - git_reference *looked_up_ref, *new_ref, *another_looked_up_ref; - git_buf temp_path = GIT_BUF_INIT; - const char *new_name = "refs/tags/Nemo/knows/refs.kung-fu"; - - /* Ensure the ref doesn't exist on the file system */ - cl_git_pass(git_buf_joinpath(&temp_path, git_repository_path(g_repo), new_name)); - cl_assert(!git_path_exists(temp_path.ptr)); - - /* Retrieval of the reference to rename */ - cl_git_pass(git_reference_lookup(&looked_up_ref, g_repo, loose_tag_ref_name)); - - /* ... which is indeed loose */ - cl_assert(reference_is_packed(looked_up_ref) == 0); - - /* Now that the reference is renamed... */ - cl_git_pass(git_reference_rename(&new_ref, looked_up_ref, new_name, 0, NULL)); - cl_assert_equal_s(new_ref->name, new_name); - git_reference_free(looked_up_ref); - - /* ...It can't be looked-up with the old name... */ - cl_git_fail(git_reference_lookup(&another_looked_up_ref, g_repo, loose_tag_ref_name)); - - /* ...but the new name works ok... */ - cl_git_pass(git_reference_lookup(&another_looked_up_ref, g_repo, new_name)); - cl_assert_equal_s(new_ref->name, new_name); - - /* .. the new ref is loose... */ - cl_assert(reference_is_packed(another_looked_up_ref) == 0); - cl_assert(reference_is_packed(new_ref) == 0); - - /* ...and the ref can be found in the file system */ - cl_git_pass(git_buf_joinpath(&temp_path, git_repository_path(g_repo), new_name)); - cl_assert(git_path_exists(temp_path.ptr)); - - git_reference_free(new_ref); - git_reference_free(another_looked_up_ref); - git_buf_free(&temp_path); -} - -void test_refs_rename__packed(void) -{ - // rename a packed reference (should make it loose) - git_reference *looked_up_ref, *new_ref, *another_looked_up_ref; - git_buf temp_path = GIT_BUF_INIT; - const char *brand_new_name = "refs/heads/brand_new_name"; - - /* Ensure the ref doesn't exist on the file system */ - cl_git_pass(git_buf_joinpath(&temp_path, git_repository_path(g_repo), packed_head_name)); - cl_assert(!git_path_exists(temp_path.ptr)); - - /* The reference can however be looked-up... */ - cl_git_pass(git_reference_lookup(&looked_up_ref, g_repo, packed_head_name)); - - /* .. and it's packed */ - cl_assert(reference_is_packed(looked_up_ref) != 0); - - /* Now that the reference is renamed... */ - cl_git_pass(git_reference_rename(&new_ref, looked_up_ref, brand_new_name, 0, NULL)); - cl_assert_equal_s(new_ref->name, brand_new_name); - git_reference_free(looked_up_ref); - - /* ...It can't be looked-up with the old name... */ - cl_git_fail(git_reference_lookup(&another_looked_up_ref, g_repo, packed_head_name)); - - /* ...but the new name works ok... */ - cl_git_pass(git_reference_lookup(&another_looked_up_ref, g_repo, brand_new_name)); - cl_assert_equal_s(another_looked_up_ref->name, brand_new_name); - - /* .. the ref is no longer packed... */ - cl_assert(reference_is_packed(another_looked_up_ref) == 0); - cl_assert(reference_is_packed(new_ref) == 0); - - /* ...and the ref now happily lives in the file system */ - cl_git_pass(git_buf_joinpath(&temp_path, git_repository_path(g_repo), brand_new_name)); - cl_assert(git_path_exists(temp_path.ptr)); - - git_reference_free(new_ref); - git_reference_free(another_looked_up_ref); - git_buf_free(&temp_path); -} - -void test_refs_rename__packed_doesnt_pack_others(void) -{ - // renaming a packed reference does not pack another reference which happens to be in both loose and pack state - git_reference *looked_up_ref, *another_looked_up_ref, *renamed_ref; - git_buf temp_path = GIT_BUF_INIT; - const char *brand_new_name = "refs/heads/brand_new_name"; - - /* Ensure the other reference exists on the file system */ - cl_git_pass(git_buf_joinpath(&temp_path, git_repository_path(g_repo), packed_test_head_name)); - cl_assert(git_path_exists(temp_path.ptr)); - - /* Lookup the other reference */ - cl_git_pass(git_reference_lookup(&another_looked_up_ref, g_repo, packed_test_head_name)); - - /* Ensure it's loose */ - cl_assert(reference_is_packed(another_looked_up_ref) == 0); - git_reference_free(another_looked_up_ref); - - /* Lookup the reference to rename */ - cl_git_pass(git_reference_lookup(&looked_up_ref, g_repo, packed_head_name)); - - /* Ensure it's packed */ - cl_assert(reference_is_packed(looked_up_ref) != 0); - - /* Now that the reference is renamed... */ - cl_git_pass(git_reference_rename(&renamed_ref, looked_up_ref, brand_new_name, 0, NULL)); - git_reference_free(looked_up_ref); - - /* Lookup the other reference */ - cl_git_pass(git_reference_lookup(&another_looked_up_ref, g_repo, packed_test_head_name)); - - /* Ensure it's loose */ - cl_assert(reference_is_packed(another_looked_up_ref) == 0); - - /* Ensure the other ref still exists on the file system */ - cl_assert(git_path_exists(temp_path.ptr)); - - git_reference_free(renamed_ref); - git_reference_free(another_looked_up_ref); - git_buf_free(&temp_path); -} - -void test_refs_rename__name_collision(void) -{ - // can not rename a reference with the name of an existing reference - git_reference *looked_up_ref, *renamed_ref; - - /* An existing reference... */ - cl_git_pass(git_reference_lookup(&looked_up_ref, g_repo, packed_head_name)); - - /* Can not be renamed to the name of another existing reference. */ - cl_git_fail(git_reference_rename(&renamed_ref, looked_up_ref, packed_test_head_name, 0, NULL)); - git_reference_free(looked_up_ref); - - /* Failure to rename it hasn't corrupted its state */ - cl_git_pass(git_reference_lookup(&looked_up_ref, g_repo, packed_head_name)); - cl_assert_equal_s(looked_up_ref->name, packed_head_name); - - git_reference_free(looked_up_ref); -} - -void test_refs_rename__invalid_name(void) -{ - // can not rename a reference with an invalid name - git_reference *looked_up_ref, *renamed_ref; - - /* An existing oid reference... */ - cl_git_pass(git_reference_lookup(&looked_up_ref, g_repo, packed_test_head_name)); - - /* Can not be renamed with an invalid name. */ - cl_assert_equal_i( - GIT_EINVALIDSPEC, - git_reference_rename(&renamed_ref, looked_up_ref, "Hello! I'm a very invalid name.", 0, NULL)); - - /* Can not be renamed outside of the refs hierarchy - * unless it's ALL_CAPS_AND_UNDERSCORES. - */ - cl_assert_equal_i(GIT_EINVALIDSPEC, git_reference_rename(&renamed_ref, looked_up_ref, "i-will-sudo-you", 0, NULL)); - - /* Failure to rename it hasn't corrupted its state */ - git_reference_free(looked_up_ref); - cl_git_pass(git_reference_lookup(&looked_up_ref, g_repo, packed_test_head_name)); - cl_assert_equal_s(looked_up_ref->name, packed_test_head_name); - - git_reference_free(looked_up_ref); -} - -void test_refs_rename__force_loose_packed(void) -{ - // can force-rename a packed reference with the name of an existing loose and packed reference - git_reference *looked_up_ref, *renamed_ref; - git_oid oid; - - /* An existing reference... */ - cl_git_pass(git_reference_lookup(&looked_up_ref, g_repo, packed_head_name)); - git_oid_cpy(&oid, git_reference_target(looked_up_ref)); - - /* Can be force-renamed to the name of another existing reference. */ - cl_git_pass(git_reference_rename(&renamed_ref, looked_up_ref, packed_test_head_name, 1, NULL)); - git_reference_free(looked_up_ref); - git_reference_free(renamed_ref); - - /* Check we actually renamed it */ - cl_git_pass(git_reference_lookup(&looked_up_ref, g_repo, packed_test_head_name)); - cl_assert_equal_s(looked_up_ref->name, packed_test_head_name); - cl_assert_equal_oid(&oid, git_reference_target(looked_up_ref)); - git_reference_free(looked_up_ref); - - /* And that the previous one doesn't exist any longer */ - cl_git_fail(git_reference_lookup(&looked_up_ref, g_repo, packed_head_name)); -} - -void test_refs_rename__force_loose(void) -{ - // can force-rename a loose reference with the name of an existing loose reference - git_reference *looked_up_ref, *renamed_ref; - git_oid oid; - - /* An existing reference... */ - cl_git_pass(git_reference_lookup(&looked_up_ref, g_repo, "refs/heads/br2")); - git_oid_cpy(&oid, git_reference_target(looked_up_ref)); - - /* Can be force-renamed to the name of another existing reference. */ - cl_git_pass(git_reference_rename(&renamed_ref, looked_up_ref, "refs/heads/test", 1, NULL)); - git_reference_free(looked_up_ref); - git_reference_free(renamed_ref); - - /* Check we actually renamed it */ - cl_git_pass(git_reference_lookup(&looked_up_ref, g_repo, "refs/heads/test")); - cl_assert_equal_s(looked_up_ref->name, "refs/heads/test"); - cl_assert_equal_oid(&oid, git_reference_target(looked_up_ref)); - git_reference_free(looked_up_ref); - - /* And that the previous one doesn't exist any longer */ - cl_git_fail(git_reference_lookup(&looked_up_ref, g_repo, "refs/heads/br2")); - - git_reference_free(looked_up_ref); -} - - -void test_refs_rename__overwrite(void) -{ - // can not overwrite name of existing reference - git_reference *ref, *ref_one, *ref_one_new, *ref_two; - git_refdb *refdb; - git_oid id; - - cl_git_pass(git_reference_lookup(&ref, g_repo, ref_master_name)); - cl_assert(git_reference_type(ref) & GIT_REF_OID); - - git_oid_cpy(&id, git_reference_target(ref)); - - /* Create loose references */ - cl_git_pass(git_reference_create(&ref_one, g_repo, ref_one_name, &id, 0, NULL)); - cl_git_pass(git_reference_create(&ref_two, g_repo, ref_two_name, &id, 0, NULL)); - - /* Pack everything */ - cl_git_pass(git_repository_refdb(&refdb, g_repo)); - cl_git_pass(git_refdb_compress(refdb)); - - /* Attempt to create illegal reference */ - cl_git_fail(git_reference_create(&ref_one_new, g_repo, ref_one_name_new, &id, 0, NULL)); - - /* Illegal reference couldn't be created so this is supposed to fail */ - cl_git_fail(git_reference_lookup(&ref_one_new, g_repo, ref_one_name_new)); - - git_reference_free(ref); - git_reference_free(ref_one); - git_reference_free(ref_one_new); - git_reference_free(ref_two); - git_refdb_free(refdb); -} - - -void test_refs_rename__prefix(void) -{ - // can be renamed to a new name prefixed with the old name - git_reference *ref, *ref_two, *looked_up_ref, *renamed_ref; - git_oid id; - - cl_git_pass(git_reference_lookup(&ref, g_repo, ref_master_name)); - cl_assert(git_reference_type(ref) & GIT_REF_OID); - - git_oid_cpy(&id, git_reference_target(ref)); - - /* Create loose references */ - cl_git_pass(git_reference_create(&ref_two, g_repo, ref_two_name, &id, 0, NULL)); - - /* An existing reference... */ - cl_git_pass(git_reference_lookup(&looked_up_ref, g_repo, ref_two_name)); - - /* Can be rename to a new name starting with the old name. */ - cl_git_pass(git_reference_rename(&renamed_ref, looked_up_ref, ref_two_name_new, 0, NULL)); - git_reference_free(looked_up_ref); - git_reference_free(renamed_ref); - - /* Check we actually renamed it */ - cl_git_pass(git_reference_lookup(&looked_up_ref, g_repo, ref_two_name_new)); - cl_assert_equal_s(looked_up_ref->name, ref_two_name_new); - git_reference_free(looked_up_ref); - cl_git_fail(git_reference_lookup(&looked_up_ref, g_repo, ref_two_name)); - - git_reference_free(ref); - git_reference_free(ref_two); - git_reference_free(looked_up_ref); -} - -void test_refs_rename__move_up(void) -{ - // can move a reference to a upper reference hierarchy - git_reference *ref, *ref_two, *looked_up_ref, *renamed_ref; - git_oid id; - - cl_git_pass(git_reference_lookup(&ref, g_repo, ref_master_name)); - cl_assert(git_reference_type(ref) & GIT_REF_OID); - - git_oid_cpy(&id, git_reference_target(ref)); - - /* Create loose references */ - cl_git_pass(git_reference_create(&ref_two, g_repo, ref_two_name_new, &id, 0, NULL)); - git_reference_free(ref_two); - - /* An existing reference... */ - cl_git_pass(git_reference_lookup(&looked_up_ref, g_repo, ref_two_name_new)); - - /* Can be renamed upward the reference tree. */ - cl_git_pass(git_reference_rename(&renamed_ref, looked_up_ref, ref_two_name, 0, NULL)); - git_reference_free(looked_up_ref); - git_reference_free(renamed_ref); - - /* Check we actually renamed it */ - cl_git_pass(git_reference_lookup(&looked_up_ref, g_repo, ref_two_name)); - cl_assert_equal_s(looked_up_ref->name, ref_two_name); - git_reference_free(looked_up_ref); - - cl_git_fail(git_reference_lookup(&looked_up_ref, g_repo, ref_two_name_new)); - git_reference_free(ref); - git_reference_free(looked_up_ref); -} - -void test_refs_rename__propagate_eexists(void) -{ - git_reference *ref, *new_ref; - - cl_git_pass(git_reference_lookup(&ref, g_repo, packed_head_name)); - - cl_assert_equal_i(GIT_EEXISTS, git_reference_rename(&new_ref, ref, packed_test_head_name, 0, NULL)); - - git_reference_free(ref); -} - -void test_refs_rename__writes_to_reflog(void) -{ - git_reference *ref, *new_ref; - git_reflog *log; - const git_reflog_entry *entry; - - cl_git_pass(git_reference_lookup(&ref, g_repo, ref_master_name)); - cl_git_pass(git_reference_rename(&new_ref, ref, ref_one_name_new, false, - "message")); - cl_git_pass(git_reflog_read(&log, g_repo, git_reference_name(new_ref))); - entry = git_reflog_entry_byindex(log, 0); - cl_assert_equal_s("message", git_reflog_entry_message(entry)); - cl_assert_equal_s("foo@example.com", git_reflog_entry_committer(entry)->email); - - git_reflog_free(log); - git_reference_free(ref); - git_reference_free(new_ref); -} diff --git a/vendor/libgit2/tests/refs/revparse.c b/vendor/libgit2/tests/refs/revparse.c deleted file mode 100644 index c22c30440..000000000 --- a/vendor/libgit2/tests/refs/revparse.c +++ /dev/null @@ -1,829 +0,0 @@ -#include "clar_libgit2.h" - -#include "git2/revparse.h" -#include "buffer.h" -#include "refs.h" -#include "path.h" - -static git_repository *g_repo; -static git_object *g_obj; - -/* Helpers */ -static void test_object_and_ref_inrepo( - const char *spec, - const char *expected_oid, - const char *expected_refname, - git_repository *repo, - bool assert_reference_retrieval) -{ - char objstr[64] = {0}; - git_object *obj = NULL; - git_reference *ref = NULL; - int error; - - error = git_revparse_ext(&obj, &ref, repo, spec); - - if (expected_oid != NULL) { - cl_git_pass(error); - git_oid_fmt(objstr, git_object_id(obj)); - cl_assert_equal_s(objstr, expected_oid); - } else - cl_git_fail(error); - - if (assert_reference_retrieval) { - if (expected_refname == NULL) - cl_assert(NULL == ref); - else - cl_assert_equal_s(expected_refname, git_reference_name(ref)); - } - - git_object_free(obj); - git_reference_free(ref); -} - -static void test_object_inrepo(const char *spec, const char *expected_oid, git_repository *repo) -{ - test_object_and_ref_inrepo(spec, expected_oid, NULL, repo, false); -} - -static void test_id_inrepo( - const char *spec, - const char *expected_left, - const char *expected_right, - git_revparse_mode_t expected_flags, - git_repository *repo) -{ - git_revspec revspec; - int error = git_revparse(&revspec, repo, spec); - - if (expected_left) { - char str[64] = {0}; - cl_assert_equal_i(0, error); - git_oid_fmt(str, git_object_id(revspec.from)); - cl_assert_equal_s(str, expected_left); - git_object_free(revspec.from); - } else { - cl_assert_equal_i(GIT_ENOTFOUND, error); - } - - if (expected_right) { - char str[64] = {0}; - git_oid_fmt(str, git_object_id(revspec.to)); - cl_assert_equal_s(str, expected_right); - git_object_free(revspec.to); - } - - if (expected_flags) - cl_assert_equal_i(expected_flags, revspec.flags); -} - -static void test_object(const char *spec, const char *expected_oid) -{ - test_object_inrepo(spec, expected_oid, g_repo); -} - -static void test_object_and_ref(const char *spec, const char *expected_oid, const char *expected_refname) -{ - test_object_and_ref_inrepo(spec, expected_oid, expected_refname, g_repo, true); -} - -static void test_rangelike(const char *rangelike, - const char *expected_left, - const char *expected_right, - git_revparse_mode_t expected_revparseflags) -{ - char objstr[64] = {0}; - git_revspec revspec; - int error; - - error = git_revparse(&revspec, g_repo, rangelike); - - if (expected_left != NULL) { - cl_assert_equal_i(0, error); - cl_assert_equal_i(revspec.flags, expected_revparseflags); - git_oid_fmt(objstr, git_object_id(revspec.from)); - cl_assert_equal_s(objstr, expected_left); - git_oid_fmt(objstr, git_object_id(revspec.to)); - cl_assert_equal_s(objstr, expected_right); - } else - cl_assert(error != 0); - - git_object_free(revspec.from); - git_object_free(revspec.to); -} - - -static void test_id( - const char *spec, - const char *expected_left, - const char *expected_right, - git_revparse_mode_t expected_flags) -{ - test_id_inrepo(spec, expected_left, expected_right, expected_flags, g_repo); -} - -void test_refs_revparse__initialize(void) -{ - cl_git_pass(git_repository_open(&g_repo, cl_fixture("testrepo.git"))); -} - -void test_refs_revparse__cleanup(void) -{ - git_repository_free(g_repo); -} - -void test_refs_revparse__nonexistant_object(void) -{ - test_object("this-does-not-exist", NULL); - test_object("this-does-not-exist^1", NULL); - test_object("this-does-not-exist~2", NULL); -} - -static void assert_invalid_single_spec(const char *invalid_spec) -{ - cl_assert_equal_i( - GIT_EINVALIDSPEC, git_revparse_single(&g_obj, g_repo, invalid_spec)); -} - -void test_refs_revparse__invalid_reference_name(void) -{ - assert_invalid_single_spec("this doesn't make sense"); - assert_invalid_single_spec("Inv@{id"); - assert_invalid_single_spec(""); -} - -void test_refs_revparse__shas(void) -{ - test_object("c47800c7266a2be04c571c04d5a6614691ea99bd", "c47800c7266a2be04c571c04d5a6614691ea99bd"); - test_object("c47800c", "c47800c7266a2be04c571c04d5a6614691ea99bd"); -} - -void test_refs_revparse__head(void) -{ - test_object("HEAD", "a65fedf39aefe402d3bb6e24df4d4f5fe4547750"); - test_object("HEAD^0", "a65fedf39aefe402d3bb6e24df4d4f5fe4547750"); - test_object("HEAD~0", "a65fedf39aefe402d3bb6e24df4d4f5fe4547750"); - test_object("master", "a65fedf39aefe402d3bb6e24df4d4f5fe4547750"); -} - -void test_refs_revparse__full_refs(void) -{ - test_object("refs/heads/master", "a65fedf39aefe402d3bb6e24df4d4f5fe4547750"); - test_object("refs/heads/test", "e90810b8df3e80c413d903f631643c716887138d"); - test_object("refs/tags/test", "b25fa35b38051e4ae45d4222e795f9df2e43f1d1"); -} - -void test_refs_revparse__partial_refs(void) -{ - test_object("point_to_blob", "1385f264afb75a56a5bec74243be9b367ba4ca08"); - test_object("packed-test", "4a202b346bb0fb0db7eff3cffeb3c70babbd2045"); - test_object("br2", "a4a7dce85cf63874e984719f4fdd239f5145052f"); -} - -void test_refs_revparse__describe_output(void) -{ - test_object("blah-7-gc47800c", "c47800c7266a2be04c571c04d5a6614691ea99bd"); - test_object("not-good", "a65fedf39aefe402d3bb6e24df4d4f5fe4547750"); -} - -void test_refs_revparse__nth_parent(void) -{ - assert_invalid_single_spec("be3563a^-1"); - assert_invalid_single_spec("^"); - assert_invalid_single_spec("be3563a^{tree}^"); - assert_invalid_single_spec("point_to_blob^{blob}^"); - assert_invalid_single_spec("this doesn't make sense^1"); - - test_object("be3563a^1", "9fd738e8f7967c078dceed8190330fc8648ee56a"); - test_object("be3563a^", "9fd738e8f7967c078dceed8190330fc8648ee56a"); - test_object("be3563a^2", "c47800c7266a2be04c571c04d5a6614691ea99bd"); - test_object("be3563a^1^1", "4a202b346bb0fb0db7eff3cffeb3c70babbd2045"); - test_object("be3563a^^", "4a202b346bb0fb0db7eff3cffeb3c70babbd2045"); - test_object("be3563a^2^1", "5b5b025afb0b4c913b4c338a42934a3863bf3644"); - test_object("be3563a^0", "be3563ae3f795b2b4353bcce3a527ad0a4f7f644"); - test_object("be3563a^{commit}^", "9fd738e8f7967c078dceed8190330fc8648ee56a"); - - test_object("be3563a^42", NULL); -} - -void test_refs_revparse__not_tag(void) -{ - test_object("point_to_blob^{}", "1385f264afb75a56a5bec74243be9b367ba4ca08"); - test_object("wrapped_tag^{}", "a65fedf39aefe402d3bb6e24df4d4f5fe4547750"); - test_object("master^{}", "a65fedf39aefe402d3bb6e24df4d4f5fe4547750"); - test_object("master^{tree}^{}", "944c0f6e4dfa41595e6eb3ceecdb14f50fe18162"); - test_object("e90810b^{}", "e90810b8df3e80c413d903f631643c716887138d"); - test_object("tags/e90810b^{}", "e90810b8df3e80c413d903f631643c716887138d"); - test_object("e908^{}", "e90810b8df3e80c413d903f631643c716887138d"); -} - -void test_refs_revparse__to_type(void) -{ - assert_invalid_single_spec("wrapped_tag^{trip}"); - test_object("point_to_blob^{commit}", NULL); - cl_assert_equal_i( - GIT_EPEEL, git_revparse_single(&g_obj, g_repo, "wrapped_tag^{blob}")); - - test_object("wrapped_tag^{commit}", "a65fedf39aefe402d3bb6e24df4d4f5fe4547750"); - test_object("wrapped_tag^{tree}", "944c0f6e4dfa41595e6eb3ceecdb14f50fe18162"); - test_object("point_to_blob^{blob}", "1385f264afb75a56a5bec74243be9b367ba4ca08"); - test_object("master^{commit}^{commit}", "a65fedf39aefe402d3bb6e24df4d4f5fe4547750"); -} - -void test_refs_revparse__linear_history(void) -{ - assert_invalid_single_spec("~"); - test_object("foo~bar", NULL); - - assert_invalid_single_spec("master~bar"); - assert_invalid_single_spec("master~-1"); - assert_invalid_single_spec("master~0bar"); - assert_invalid_single_spec("this doesn't make sense~2"); - assert_invalid_single_spec("be3563a^{tree}~"); - assert_invalid_single_spec("point_to_blob^{blob}~"); - - test_object("master~0", "a65fedf39aefe402d3bb6e24df4d4f5fe4547750"); - test_object("master~1", "be3563ae3f795b2b4353bcce3a527ad0a4f7f644"); - test_object("master~2", "9fd738e8f7967c078dceed8190330fc8648ee56a"); - test_object("master~1~1", "9fd738e8f7967c078dceed8190330fc8648ee56a"); - test_object("master~~", "9fd738e8f7967c078dceed8190330fc8648ee56a"); -} - -void test_refs_revparse__chaining(void) -{ - assert_invalid_single_spec("master@{0}@{0}"); - assert_invalid_single_spec("@{u}@{-1}"); - assert_invalid_single_spec("@{-1}@{-1}"); - assert_invalid_single_spec("@{-3}@{0}"); - - test_object("master@{0}~1^1", "9fd738e8f7967c078dceed8190330fc8648ee56a"); - test_object("@{u}@{0}", "be3563ae3f795b2b4353bcce3a527ad0a4f7f644"); - test_object("@{-1}@{0}", "a4a7dce85cf63874e984719f4fdd239f5145052f"); - test_object("@{-4}@{1}", "be3563ae3f795b2b4353bcce3a527ad0a4f7f644"); - test_object("master~1^1", "9fd738e8f7967c078dceed8190330fc8648ee56a"); - test_object("master~1^2", "c47800c7266a2be04c571c04d5a6614691ea99bd"); - test_object("master^1^2~1", "5b5b025afb0b4c913b4c338a42934a3863bf3644"); - test_object("master^^2^", "5b5b025afb0b4c913b4c338a42934a3863bf3644"); - test_object("master^1^1^1^1^1", "8496071c1b46c854b31185ea97743be6a8774479"); - test_object("master^^1^2^1", NULL); -} - -void test_refs_revparse__upstream(void) -{ - assert_invalid_single_spec("e90810b@{u}"); - assert_invalid_single_spec("refs/tags/e90810b@{u}"); - test_object("refs/heads/e90810b@{u}", NULL); - - test_object("master@{upstream}", "be3563ae3f795b2b4353bcce3a527ad0a4f7f644"); - test_object("@{u}", "be3563ae3f795b2b4353bcce3a527ad0a4f7f644"); - test_object("master@{u}", "be3563ae3f795b2b4353bcce3a527ad0a4f7f644"); - test_object("heads/master@{u}", "be3563ae3f795b2b4353bcce3a527ad0a4f7f644"); - test_object("refs/heads/master@{u}", "be3563ae3f795b2b4353bcce3a527ad0a4f7f644"); -} - -void test_refs_revparse__ordinal(void) -{ - assert_invalid_single_spec("master@{-2}"); - - /* TODO: make the test below actually fail - * cl_git_fail(git_revparse_single(&g_obj, g_repo, "master@{1a}")); - */ - - test_object("nope@{0}", NULL); - test_object("master@{31415}", NULL); - test_object("@{1000}", NULL); - test_object("@{2}", NULL); - - test_object("@{0}", "a65fedf39aefe402d3bb6e24df4d4f5fe4547750"); - test_object("@{1}", "be3563ae3f795b2b4353bcce3a527ad0a4f7f644"); - - test_object("master@{0}", "a65fedf39aefe402d3bb6e24df4d4f5fe4547750"); - test_object("master@{1}", "be3563ae3f795b2b4353bcce3a527ad0a4f7f644"); - test_object("heads/master@{1}", "be3563ae3f795b2b4353bcce3a527ad0a4f7f644"); - test_object("refs/heads/master@{1}", "be3563ae3f795b2b4353bcce3a527ad0a4f7f644"); -} - -void test_refs_revparse__previous_head(void) -{ - assert_invalid_single_spec("@{-xyz}"); - assert_invalid_single_spec("@{-0}"); - assert_invalid_single_spec("@{-1b}"); - - test_object("@{-42}", NULL); - - test_object("@{-2}", "a65fedf39aefe402d3bb6e24df4d4f5fe4547750"); - test_object("@{-1}", "a4a7dce85cf63874e984719f4fdd239f5145052f"); -} - -static void create_fake_stash_reference_and_reflog(git_repository *repo) -{ - git_reference *master, *new_master; - git_buf log_path = GIT_BUF_INIT; - - git_buf_joinpath(&log_path, git_repository_path(repo), "logs/refs/fakestash"); - - cl_assert_equal_i(false, git_path_isfile(git_buf_cstr(&log_path))); - - cl_git_pass(git_reference_lookup(&master, repo, "refs/heads/master")); - cl_git_pass(git_reference_rename(&new_master, master, "refs/fakestash", 0, NULL)); - git_reference_free(master); - - cl_assert_equal_i(true, git_path_isfile(git_buf_cstr(&log_path))); - - git_buf_free(&log_path); - git_reference_free(new_master); -} - -void test_refs_revparse__reflog_of_a_ref_under_refs(void) -{ - git_repository *repo = cl_git_sandbox_init("testrepo.git"); - - test_object_inrepo("refs/fakestash", NULL, repo); - - create_fake_stash_reference_and_reflog(repo); - - /* - * $ git reflog -1 refs/fakestash - * a65fedf refs/fakestash@{0}: commit: checking in - * - * $ git reflog -1 refs/fakestash@{0} - * a65fedf refs/fakestash@{0}: commit: checking in - * - * $ git reflog -1 fakestash - * a65fedf fakestash@{0}: commit: checking in - * - * $ git reflog -1 fakestash@{0} - * a65fedf fakestash@{0}: commit: checking in - */ - test_object_inrepo("refs/fakestash", "a65fedf39aefe402d3bb6e24df4d4f5fe4547750", repo); - test_object_inrepo("refs/fakestash@{0}", "a65fedf39aefe402d3bb6e24df4d4f5fe4547750", repo); - test_object_inrepo("fakestash", "a65fedf39aefe402d3bb6e24df4d4f5fe4547750", repo); - test_object_inrepo("fakestash@{0}", "a65fedf39aefe402d3bb6e24df4d4f5fe4547750", repo); - - cl_git_sandbox_cleanup(); -} - -void test_refs_revparse__revwalk(void) -{ - test_object("master^{/not found in any commit}", NULL); - test_object("master^{/merge}", NULL); - assert_invalid_single_spec("master^{/((}"); - - test_object("master^{/anoth}", "5b5b025afb0b4c913b4c338a42934a3863bf3644"); - test_object("master^{/Merge}", "be3563ae3f795b2b4353bcce3a527ad0a4f7f644"); - test_object("br2^{/Merge}", "a4a7dce85cf63874e984719f4fdd239f5145052f"); - test_object("master^{/fo.rth}", "9fd738e8f7967c078dceed8190330fc8648ee56a"); -} - -void test_refs_revparse__date(void) -{ - /* - * $ git reflog HEAD --date=iso - * a65fedf HEAD@{2012-04-30 08:23:41 -0900}: checkout: moving from br2 to master - * a4a7dce HEAD@{2012-04-30 08:23:37 -0900}: commit: checking in - * c47800c HEAD@{2012-04-30 08:23:28 -0900}: checkout: moving from master to br2 - * a65fedf HEAD@{2012-04-30 08:23:23 -0900}: commit: - * be3563a HEAD@{2012-04-30 10:22:43 -0700}: clone: from /Users/ben/src/libgit2/tes - * - * $ git reflog HEAD --date=raw - * a65fedf HEAD@{1335806621 -0900}: checkout: moving from br2 to master - * a4a7dce HEAD@{1335806617 -0900}: commit: checking in - * c47800c HEAD@{1335806608 -0900}: checkout: moving from master to br2 - * a65fedf HEAD@{1335806603 -0900}: commit: - * be3563a HEAD@{1335806563 -0700}: clone: from /Users/ben/src/libgit2/tests/resour - */ - test_object("HEAD@{10 years ago}", NULL); - - test_object("HEAD@{1 second}", "a65fedf39aefe402d3bb6e24df4d4f5fe4547750"); - test_object("HEAD@{1 second ago}", "a65fedf39aefe402d3bb6e24df4d4f5fe4547750"); - test_object("HEAD@{2 days ago}", "a65fedf39aefe402d3bb6e24df4d4f5fe4547750"); - - /* - * $ git reflog master --date=iso - * a65fedf master@{2012-04-30 09:23:23 -0800}: commit: checking in - * be3563a master@{2012-04-30 09:22:43 -0800}: clone: from /Users/ben/src... - * - * $ git reflog master --date=raw - * a65fedf master@{1335806603 -0800}: commit: checking in - * be3563a master@{1335806563 -0800}: clone: from /Users/ben/src/libgit2/tests/reso - */ - - - /* - * $ git reflog -1 "master@{2012-04-30 17:22:42 +0000}" - * warning: Log for 'master' only goes back to Mon, 30 Apr 2012 09:22:43 -0800. - */ - test_object("master@{2012-04-30 17:22:42 +0000}", NULL); - test_object("master@{2012-04-30 09:22:42 -0800}", NULL); - - /* - * $ git reflog -1 "master@{2012-04-30 17:22:43 +0000}" - * be3563a master@{Mon Apr 30 09:22:43 2012 -0800}: clone: from /Users/ben/src/libg - */ - test_object("master@{2012-04-30 17:22:43 +0000}", "be3563ae3f795b2b4353bcce3a527ad0a4f7f644"); - test_object("master@{2012-04-30 09:22:43 -0800}", "be3563ae3f795b2b4353bcce3a527ad0a4f7f644"); - - /* - * $ git reflog -1 "master@{2012-4-30 09:23:27 -0800}" - * a65fedf master@{Mon Apr 30 09:23:23 2012 -0800}: commit: checking in - */ - test_object("master@{2012-4-30 09:23:27 -0800}", "a65fedf39aefe402d3bb6e24df4d4f5fe4547750"); - - /* - * $ git reflog -1 master@{2012-05-03} - * a65fedf master@{Mon Apr 30 09:23:23 2012 -0800}: commit: checking in - */ - test_object("master@{2012-05-03}", "a65fedf39aefe402d3bb6e24df4d4f5fe4547750"); - - /* - * $ git reflog -1 "master@{1335806603}" - * a65fedf - * - * $ git reflog -1 "master@{1335806602}" - * be3563a - */ - test_object("master@{1335806603}", "a65fedf39aefe402d3bb6e24df4d4f5fe4547750"); - test_object("master@{1335806602}", "be3563ae3f795b2b4353bcce3a527ad0a4f7f644"); -} - -void test_refs_revparse__colon(void) -{ - assert_invalid_single_spec(":/"); - assert_invalid_single_spec("point_to_blob:readme.txt"); - cl_git_fail(git_revparse_single(&g_obj, g_repo, ":2:README")); /* Not implemented */ - - test_object(":/not found in any commit", NULL); - test_object("subtrees:ab/42.txt", NULL); - test_object("subtrees:ab/4.txt/nope", NULL); - test_object("subtrees:nope", NULL); - test_object("test/master^1:branch_file.txt", NULL); - - /* From tags */ - test_object("test:readme.txt", "0266163a49e280c4f5ed1e08facd36a2bd716bcf"); - test_object("tags/test:readme.txt", "0266163a49e280c4f5ed1e08facd36a2bd716bcf"); - test_object("e90810b:readme.txt", "0266163a49e280c4f5ed1e08facd36a2bd716bcf"); - test_object("tags/e90810b:readme.txt", "0266163a49e280c4f5ed1e08facd36a2bd716bcf"); - - /* From commits */ - test_object("a65f:branch_file.txt", "3697d64be941a53d4ae8f6a271e4e3fa56b022cc"); - - /* From trees */ - test_object("a65f^{tree}:branch_file.txt", "3697d64be941a53d4ae8f6a271e4e3fa56b022cc"); - test_object("944c:branch_file.txt", "3697d64be941a53d4ae8f6a271e4e3fa56b022cc"); - - /* Retrieving trees */ - test_object("master:", "944c0f6e4dfa41595e6eb3ceecdb14f50fe18162"); - test_object("subtrees:", "ae90f12eea699729ed24555e40b9fd669da12a12"); - test_object("subtrees:ab", "f1425cef211cc08caa31e7b545ffb232acb098c3"); - test_object("subtrees:ab/", "f1425cef211cc08caa31e7b545ffb232acb098c3"); - - /* Retrieving blobs */ - test_object("subtrees:ab/4.txt", "d6c93164c249c8000205dd4ec5cbca1b516d487f"); - test_object("subtrees:ab/de/fgh/1.txt", "1f67fc4386b2d171e0d21be1c447e12660561f9b"); - test_object("master:README", "a8233120f6ad708f843d861ce2b7228ec4e3dec6"); - test_object("master:new.txt", "a71586c1dfe8a71c6cbf6c129f404c5642ff31bd"); - test_object(":/Merge", "a4a7dce85cf63874e984719f4fdd239f5145052f"); - test_object(":/one", "c47800c7266a2be04c571c04d5a6614691ea99bd"); - test_object(":/packed commit t", "41bc8c69075bbdb46c5c6f0566cc8cc5b46e8bd9"); - test_object("test/master^2:branch_file.txt", "45b983be36b73c0788dc9cbcb76cbb80fc7bb057"); - test_object("test/master@{1}:branch_file.txt", "3697d64be941a53d4ae8f6a271e4e3fa56b022cc"); -} - -void test_refs_revparse__disambiguation(void) -{ - /* - * $ git show e90810b - * tag e90810b - * Tagger: Vicent Marti - * Date: Thu Aug 12 03:59:17 2010 +0200 - * - * This is a very simple tag. - * - * commit e90810b8df3e80c413d903f631643c716887138d - * Author: Vicent Marti - * Date: Thu Aug 5 18:42:20 2010 +0200 - * - * Test commit 2 - * - * diff --git a/readme.txt b/readme.txt - * index 6336846..0266163 100644 - * --- a/readme.txt - * +++ b/readme.txt - * @@ -1 +1,2 @@ - * Testing a readme.txt - * +Now we add a single line here - * - * $ git show-ref e90810b - * 7b4384978d2493e851f9cca7858815fac9b10980 refs/tags/e90810b - * - */ - test_object("e90810b", "7b4384978d2493e851f9cca7858815fac9b10980"); - - /* - * $ git show e90810 - * commit e90810b8df3e80c413d903f631643c716887138d - * Author: Vicent Marti - * Date: Thu Aug 5 18:42:20 2010 +0200 - * - * Test commit 2 - * - * diff --git a/readme.txt b/readme.txt - * index 6336846..0266163 100644 - * --- a/readme.txt - * +++ b/readme.txt - * @@ -1 +1,2 @@ - * Testing a readme.txt - * +Now we add a single line here - */ - test_object("e90810", "e90810b8df3e80c413d903f631643c716887138d"); -} - -void test_refs_revparse__a_too_short_objectid_returns_EAMBIGUOUS(void) -{ - cl_assert_equal_i( - GIT_EAMBIGUOUS, git_revparse_single(&g_obj, g_repo, "e90")); -} - -/* - * $ echo "aabqhq" | git hash-object -t blob --stdin - * dea509d0b3cb8ee0650f6ca210bc83f4678851ba - * - * $ echo "aaazvc" | git hash-object -t blob --stdin - * dea509d097ce692e167dfc6a48a7a280cc5e877e - */ -void test_refs_revparse__a_not_precise_enough_objectid_returns_EAMBIGUOUS(void) -{ - git_repository *repo; - git_index *index; - git_object *obj; - - repo = cl_git_sandbox_init("testrepo"); - - cl_git_mkfile("testrepo/one.txt", "aabqhq\n"); - cl_git_mkfile("testrepo/two.txt", "aaazvc\n"); - - cl_git_pass(git_repository_index(&index, repo)); - cl_git_pass(git_index_add_bypath(index, "one.txt")); - cl_git_pass(git_index_add_bypath(index, "two.txt")); - - cl_git_fail_with(git_revparse_single(&obj, repo, "dea509d0"), GIT_EAMBIGUOUS); - - cl_git_pass(git_revparse_single(&obj, repo, "dea509d09")); - - git_object_free(obj); - git_index_free(index); - cl_git_sandbox_cleanup(); -} - -void test_refs_revparse__issue_994(void) -{ - git_repository *repo; - git_reference *head, *with_at; - git_object *target; - - repo = cl_git_sandbox_init("testrepo.git"); - - cl_assert_equal_i(GIT_ENOTFOUND, - git_revparse_single(&target, repo, "origin/bim_with_3d@11296")); - - cl_assert_equal_i(GIT_ENOTFOUND, - git_revparse_single(&target, repo, "refs/remotes/origin/bim_with_3d@11296")); - - - cl_git_pass(git_repository_head(&head, repo)); - cl_git_pass(git_reference_create( - &with_at, - repo, - "refs/remotes/origin/bim_with_3d@11296", - git_reference_target(head), - 0, - NULL)); - - cl_git_pass(git_revparse_single(&target, repo, "origin/bim_with_3d@11296")); - git_object_free(target); - - cl_git_pass(git_revparse_single(&target, repo, "refs/remotes/origin/bim_with_3d@11296")); - git_object_free(target); - - git_reference_free(with_at); - git_reference_free(head); - cl_git_sandbox_cleanup(); -} - -/** - * $ git rev-parse blah-7-gc47800c - * c47800c7266a2be04c571c04d5a6614691ea99bd - * - * $ git rev-parse HEAD~3 - * 4a202b346bb0fb0db7eff3cffeb3c70babbd2045 - * - * $ git branch blah-7-gc47800c HEAD~3 - * - * $ git rev-parse blah-7-gc47800c - * 4a202b346bb0fb0db7eff3cffeb3c70babbd2045 - */ -void test_refs_revparse__try_to_retrieve_branch_before_described_tag(void) -{ - git_repository *repo; - git_reference *branch; - git_object *target; - char sha[GIT_OID_HEXSZ + 1]; - - repo = cl_git_sandbox_init("testrepo.git"); - - test_object_inrepo("blah-7-gc47800c", "c47800c7266a2be04c571c04d5a6614691ea99bd", repo); - - cl_git_pass(git_revparse_single(&target, repo, "HEAD~3")); - cl_git_pass(git_branch_create(&branch, repo, "blah-7-gc47800c", (git_commit *)target, 0)); - - git_oid_tostr(sha, GIT_OID_HEXSZ + 1, git_object_id(target)); - - test_object_inrepo("blah-7-gc47800c", sha, repo); - - git_reference_free(branch); - git_object_free(target); - cl_git_sandbox_cleanup(); -} - -/** - * $ git rev-parse a65fedf39aefe402d3bb6e24df4d4f5fe4547750 - * a65fedf39aefe402d3bb6e24df4d4f5fe4547750 - * - * $ git rev-parse HEAD~3 - * 4a202b346bb0fb0db7eff3cffeb3c70babbd2045 - * - * $ git branch a65fedf39aefe402d3bb6e24df4d4f5fe4547750 HEAD~3 - * - * $ git rev-parse a65fedf39aefe402d3bb6e24df4d4f5fe4547750 - * a65fedf39aefe402d3bb6e24df4d4f5fe4547750 - * - * $ git rev-parse heads/a65fedf39aefe402d3bb6e24df4d4f5fe4547750 - * 4a202b346bb0fb0db7eff3cffeb3c70babbd2045 - */ -void test_refs_revparse__try_to_retrieve_sha_before_branch(void) -{ - git_repository *repo; - git_reference *branch; - git_object *target; - char sha[GIT_OID_HEXSZ + 1]; - - repo = cl_git_sandbox_init("testrepo.git"); - - test_object_inrepo("a65fedf39aefe402d3bb6e24df4d4f5fe4547750", "a65fedf39aefe402d3bb6e24df4d4f5fe4547750", repo); - - cl_git_pass(git_revparse_single(&target, repo, "HEAD~3")); - cl_git_pass(git_branch_create(&branch, repo, "a65fedf39aefe402d3bb6e24df4d4f5fe4547750", (git_commit *)target, 0)); - - git_oid_tostr(sha, GIT_OID_HEXSZ + 1, git_object_id(target)); - - test_object_inrepo("a65fedf39aefe402d3bb6e24df4d4f5fe4547750", "a65fedf39aefe402d3bb6e24df4d4f5fe4547750", repo); - test_object_inrepo("heads/a65fedf39aefe402d3bb6e24df4d4f5fe4547750", sha, repo); - - git_reference_free(branch); - git_object_free(target); - cl_git_sandbox_cleanup(); -} - -/** - * $ git rev-parse c47800 - * c47800c7266a2be04c571c04d5a6614691ea99bd - * - * $ git rev-parse HEAD~3 - * 4a202b346bb0fb0db7eff3cffeb3c70babbd2045 - * - * $ git branch c47800 HEAD~3 - * - * $ git rev-parse c47800 - * 4a202b346bb0fb0db7eff3cffeb3c70babbd2045 - */ -void test_refs_revparse__try_to_retrieve_branch_before_abbrev_sha(void) -{ - git_repository *repo; - git_reference *branch; - git_object *target; - char sha[GIT_OID_HEXSZ + 1]; - - repo = cl_git_sandbox_init("testrepo.git"); - - test_object_inrepo("c47800", "c47800c7266a2be04c571c04d5a6614691ea99bd", repo); - - cl_git_pass(git_revparse_single(&target, repo, "HEAD~3")); - cl_git_pass(git_branch_create(&branch, repo, "c47800", (git_commit *)target, 0)); - - git_oid_tostr(sha, GIT_OID_HEXSZ + 1, git_object_id(target)); - - test_object_inrepo("c47800", sha, repo); - - git_reference_free(branch); - git_object_free(target); - cl_git_sandbox_cleanup(); -} - - -void test_refs_revparse__range(void) -{ - assert_invalid_single_spec("be3563a^1..be3563a"); - - test_rangelike("be3563a^1..be3563a", - "9fd738e8f7967c078dceed8190330fc8648ee56a", - "be3563ae3f795b2b4353bcce3a527ad0a4f7f644", - GIT_REVPARSE_RANGE); - - test_rangelike("be3563a^1...be3563a", - "9fd738e8f7967c078dceed8190330fc8648ee56a", - "be3563ae3f795b2b4353bcce3a527ad0a4f7f644", - GIT_REVPARSE_RANGE | GIT_REVPARSE_MERGE_BASE); - - test_rangelike("be3563a^1.be3563a", NULL, NULL, 0); -} - -void test_refs_revparse__parses_range_operator(void) -{ - test_id("HEAD", "a65fedf39aefe402d3bb6e24df4d4f5fe4547750", NULL, GIT_REVPARSE_SINGLE); - test_id("HEAD~3..HEAD", - "4a202b346bb0fb0db7eff3cffeb3c70babbd2045", - "a65fedf39aefe402d3bb6e24df4d4f5fe4547750", - GIT_REVPARSE_RANGE); - - test_id("HEAD~3...HEAD", - "4a202b346bb0fb0db7eff3cffeb3c70babbd2045", - "a65fedf39aefe402d3bb6e24df4d4f5fe4547750", - GIT_REVPARSE_RANGE | GIT_REVPARSE_MERGE_BASE); -} - -void test_refs_revparse__ext_retrieves_both_the_reference_and_its_target(void) -{ - test_object_and_ref( - "master@{upstream}", - "be3563ae3f795b2b4353bcce3a527ad0a4f7f644", - "refs/remotes/test/master"); - - test_object_and_ref( - "@{-1}", - "a4a7dce85cf63874e984719f4fdd239f5145052f", - "refs/heads/br2"); -} - -void test_refs_revparse__ext_can_expand_short_reference_names(void) -{ - test_object_and_ref( - "master", - "a65fedf39aefe402d3bb6e24df4d4f5fe4547750", - "refs/heads/master"); - - test_object_and_ref( - "HEAD", - "a65fedf39aefe402d3bb6e24df4d4f5fe4547750", - "refs/heads/master"); - - test_object_and_ref( - "tags/test", - "b25fa35b38051e4ae45d4222e795f9df2e43f1d1", - "refs/tags/test"); -} - -void test_refs_revparse__ext_returns_NULL_reference_when_expression_points_at_a_revision(void) -{ - test_object_and_ref( - "HEAD~3", - "4a202b346bb0fb0db7eff3cffeb3c70babbd2045", - NULL); - - test_object_and_ref( - "HEAD~0", - "a65fedf39aefe402d3bb6e24df4d4f5fe4547750", - NULL); - - test_object_and_ref( - "HEAD^0", - "a65fedf39aefe402d3bb6e24df4d4f5fe4547750", - NULL); - - test_object_and_ref( - "@{-1}@{0}", - "a4a7dce85cf63874e984719f4fdd239f5145052f", - NULL); -} - -void test_refs_revparse__ext_returns_NULL_reference_when_expression_points_at_a_tree_content(void) -{ - test_object_and_ref( - "tags/test:readme.txt", - "0266163a49e280c4f5ed1e08facd36a2bd716bcf", - NULL); -} - -void test_refs_revparse__uneven_sizes(void) -{ - test_object("a65fedf39aefe402d3bb6e24df4d4f5fe454775", - "a65fedf39aefe402d3bb6e24df4d4f5fe4547750"); - - test_object("a65fedf39aefe402d3bb6e24df4d4f5fe45477", - "a65fedf39aefe402d3bb6e24df4d4f5fe4547750"); - - test_object("a65fedf39aefe402d3bb6e24df4d4f5fe4547", - "a65fedf39aefe402d3bb6e24df4d4f5fe4547750"); - - test_object("a65fedf39aefe402d3bb6e24df4d", - "a65fedf39aefe402d3bb6e24df4d4f5fe4547750"); -} diff --git a/vendor/libgit2/tests/refs/settargetwithlog.c b/vendor/libgit2/tests/refs/settargetwithlog.c deleted file mode 100644 index 58fbb5fee..000000000 --- a/vendor/libgit2/tests/refs/settargetwithlog.c +++ /dev/null @@ -1,51 +0,0 @@ -#include "clar_libgit2.h" - -#include "repository.h" -#include "git2/reflog.h" -#include "reflog.h" -#include "ref_helpers.h" - -static const char *br2_tip = "a4a7dce85cf63874e984719f4fdd239f5145052f"; -static const char *master_tip = "a65fedf39aefe402d3bb6e24df4d4f5fe4547750"; -static const char *br2_name = "refs/heads/br2"; - -static git_repository *g_repo; - -void test_refs_settargetwithlog__initialize(void) -{ - g_repo = cl_git_sandbox_init("testrepo.git"); -} - -void test_refs_settargetwithlog__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -void test_refs_settargetwithlog__updating_a_direct_reference_adds_a_reflog_entry(void) -{ - git_reference *reference, *reference_out; - git_oid current_id, target_id; - git_reflog *reflog; - const git_reflog_entry *entry; - - const char *message = "You've been logged, mate!"; - - git_oid_fromstr(¤t_id, br2_tip); - git_oid_fromstr(&target_id, master_tip); - - cl_git_pass(git_reference_lookup(&reference, g_repo, br2_name)); - - cl_git_pass(git_reference_set_target( - &reference_out, reference, &target_id, message)); - - cl_git_pass(git_reflog_read(&reflog, g_repo, br2_name)); - - entry = git_reflog_entry_byindex(reflog, 0); - cl_assert_equal_oid(¤t_id, &entry->oid_old); - cl_assert_equal_oid(&target_id, &entry->oid_cur); - cl_assert_equal_s(message, entry->msg); - - git_reflog_free(reflog); - git_reference_free(reference_out); - git_reference_free(reference); -} diff --git a/vendor/libgit2/tests/refs/setter.c b/vendor/libgit2/tests/refs/setter.c deleted file mode 100644 index 2b42ff253..000000000 --- a/vendor/libgit2/tests/refs/setter.c +++ /dev/null @@ -1,99 +0,0 @@ -#include "clar_libgit2.h" - -#include "repository.h" -#include "git2/reflog.h" -#include "reflog.h" -#include "git2/refs.h" - -static const char *ref_name = "refs/heads/other"; -static const char *ref_master_name = "refs/heads/master"; -static const char *ref_test_name = "refs/heads/test"; - -static git_repository *g_repo; - -void test_refs_setter__initialize(void) -{ - g_repo = cl_git_sandbox_init("testrepo"); -} - -void test_refs_setter__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -void test_refs_setter__update_direct(void) -{ - git_reference *ref, *test_ref, *new_ref; - git_oid id; - - cl_git_pass(git_reference_lookup(&ref, g_repo, ref_master_name)); - cl_assert(git_reference_type(ref) == GIT_REF_OID); - git_oid_cpy(&id, git_reference_target(ref)); - git_reference_free(ref); - - cl_git_pass(git_reference_lookup(&test_ref, g_repo, ref_test_name)); - cl_assert(git_reference_type(test_ref) == GIT_REF_OID); - - cl_git_pass(git_reference_set_target(&new_ref, test_ref, &id, NULL)); - - git_reference_free(test_ref); - git_reference_free(new_ref); - - cl_git_pass(git_reference_lookup(&test_ref, g_repo, ref_test_name)); - cl_assert(git_reference_type(test_ref) == GIT_REF_OID); - cl_assert_equal_oid(&id, git_reference_target(test_ref)); - git_reference_free(test_ref); -} - -void test_refs_setter__update_symbolic(void) -{ - git_reference *head, *new_head; - - cl_git_pass(git_reference_lookup(&head, g_repo, "HEAD")); - cl_assert(git_reference_type(head) == GIT_REF_SYMBOLIC); - cl_assert(strcmp(git_reference_symbolic_target(head), ref_master_name) == 0); - - cl_git_pass(git_reference_symbolic_set_target(&new_head, head, ref_test_name, NULL)); - git_reference_free(new_head); - git_reference_free(head); - - cl_git_pass(git_reference_lookup(&head, g_repo, "HEAD")); - cl_assert(git_reference_type(head) == GIT_REF_SYMBOLIC); - cl_assert(strcmp(git_reference_symbolic_target(head), ref_test_name) == 0); - git_reference_free(head); -} - -void test_refs_setter__cant_update_direct_with_symbolic(void) -{ - // Overwrite an existing object id reference with a symbolic one - git_reference *ref, *new; - git_oid id; - - cl_git_pass(git_reference_lookup(&ref, g_repo, ref_master_name)); - cl_assert(git_reference_type(ref) == GIT_REF_OID); - git_oid_cpy(&id, git_reference_target(ref)); - - cl_git_fail(git_reference_symbolic_set_target(&new, ref, ref_name, NULL)); - - git_reference_free(ref); -} - -void test_refs_setter__cant_update_symbolic_with_direct(void) -{ - // Overwrite an existing symbolic reference with an object id one - git_reference *ref, *new; - git_oid id; - - cl_git_pass(git_reference_lookup(&ref, g_repo, ref_master_name)); - cl_assert(git_reference_type(ref) == GIT_REF_OID); - git_oid_cpy(&id, git_reference_target(ref)); - git_reference_free(ref); - - /* Create the symbolic ref */ - cl_git_pass(git_reference_symbolic_create(&ref, g_repo, ref_name, ref_master_name, 0, NULL)); - - /* Can't set an OID on a direct ref */ - cl_git_fail(git_reference_set_target(&new, ref, &id, NULL)); - - git_reference_free(ref); -} diff --git a/vendor/libgit2/tests/refs/shorthand.c b/vendor/libgit2/tests/refs/shorthand.c deleted file mode 100644 index f995d26ca..000000000 --- a/vendor/libgit2/tests/refs/shorthand.c +++ /dev/null @@ -1,27 +0,0 @@ -#include "clar_libgit2.h" - -#include "repository.h" - -void assert_shorthand(git_repository *repo, const char *refname, const char *shorthand) -{ - git_reference *ref; - - cl_git_pass(git_reference_lookup(&ref, repo, refname)); - cl_assert_equal_s(git_reference_shorthand(ref), shorthand); - git_reference_free(ref); -} - -void test_refs_shorthand__0(void) -{ - git_repository *repo; - - cl_git_pass(git_repository_open(&repo, cl_fixture("testrepo.git"))); - - - assert_shorthand(repo, "refs/heads/master", "master"); - assert_shorthand(repo, "refs/tags/test", "test"); - assert_shorthand(repo, "refs/remotes/test/master", "test/master"); - assert_shorthand(repo, "refs/notes/fanout", "notes/fanout"); - - git_repository_free(repo); -} diff --git a/vendor/libgit2/tests/refs/transactions.c b/vendor/libgit2/tests/refs/transactions.c deleted file mode 100644 index 39ea1cae5..000000000 --- a/vendor/libgit2/tests/refs/transactions.c +++ /dev/null @@ -1,110 +0,0 @@ -#include "clar_libgit2.h" -#include "git2/transaction.h" - -static git_repository *g_repo; -static git_transaction *g_tx; - -void test_refs_transactions__initialize(void) -{ - g_repo = cl_git_sandbox_init("testrepo"); - cl_git_pass(git_transaction_new(&g_tx, g_repo)); -} - -void test_refs_transactions__cleanup(void) -{ - git_transaction_free(g_tx); - cl_git_sandbox_cleanup(); -} - -void test_refs_transactions__single_ref_oid(void) -{ - git_reference *ref; - git_oid id; - - git_oid_fromstr(&id, "a65fedf39aefe402d3bb6e24df4d4f5fe4547750"); - - cl_git_pass(git_transaction_lock_ref(g_tx, "refs/heads/master")); - cl_git_pass(git_transaction_set_target(g_tx, "refs/heads/master", &id, NULL, NULL)); - cl_git_pass(git_transaction_commit(g_tx)); - - cl_git_pass(git_reference_lookup(&ref, g_repo, "refs/heads/master")); - - cl_assert(!git_oid_cmp(&id, git_reference_target(ref))); - git_reference_free(ref); -} - -void test_refs_transactions__single_ref_symbolic(void) -{ - git_reference *ref; - - cl_git_pass(git_transaction_lock_ref(g_tx, "HEAD")); - cl_git_pass(git_transaction_set_symbolic_target(g_tx, "HEAD", "refs/heads/foo", NULL, NULL)); - cl_git_pass(git_transaction_commit(g_tx)); - - cl_git_pass(git_reference_lookup(&ref, g_repo, "HEAD")); - - cl_assert_equal_s("refs/heads/foo", git_reference_symbolic_target(ref)); - git_reference_free(ref); -} - -void test_refs_transactions__single_ref_mix_types(void) -{ - git_reference *ref; - git_oid id; - - git_oid_fromstr(&id, "a65fedf39aefe402d3bb6e24df4d4f5fe4547750"); - - cl_git_pass(git_transaction_lock_ref(g_tx, "refs/heads/master")); - cl_git_pass(git_transaction_lock_ref(g_tx, "HEAD")); - cl_git_pass(git_transaction_set_symbolic_target(g_tx, "refs/heads/master", "refs/heads/foo", NULL, NULL)); - cl_git_pass(git_transaction_set_target(g_tx, "HEAD", &id, NULL, NULL)); - cl_git_pass(git_transaction_commit(g_tx)); - - cl_git_pass(git_reference_lookup(&ref, g_repo, "refs/heads/master")); - cl_assert_equal_s("refs/heads/foo", git_reference_symbolic_target(ref)); - git_reference_free(ref); - - cl_git_pass(git_reference_lookup(&ref, g_repo, "HEAD")); - cl_assert(!git_oid_cmp(&id, git_reference_target(ref))); - git_reference_free(ref); -} - -void test_refs_transactions__single_ref_delete(void) -{ - git_reference *ref; - - cl_git_pass(git_transaction_lock_ref(g_tx, "refs/heads/master")); - cl_git_pass(git_transaction_remove(g_tx, "refs/heads/master")); - cl_git_pass(git_transaction_commit(g_tx)); - - cl_git_fail_with(GIT_ENOTFOUND, git_reference_lookup(&ref, g_repo, "refs/heads/master")); -} - -void test_refs_transactions__single_create(void) -{ - git_reference *ref; - const char *name = "refs/heads/new-branch"; - git_oid id; - - cl_git_fail_with(GIT_ENOTFOUND, git_reference_lookup(&ref, g_repo, name)); - - cl_git_pass(git_transaction_lock_ref(g_tx, name)); - - git_oid_fromstr(&id, "a65fedf39aefe402d3bb6e24df4d4f5fe4547750"); - cl_git_pass(git_transaction_set_target(g_tx, name, &id, NULL, NULL)); - cl_git_pass(git_transaction_commit(g_tx)); - - cl_git_pass(git_reference_lookup(&ref, g_repo, name)); - cl_assert(!git_oid_cmp(&id, git_reference_target(ref))); - git_reference_free(ref); -} - -void test_refs_transactions__unlocked_set(void) -{ - git_oid id; - - cl_git_pass(git_transaction_lock_ref(g_tx, "refs/heads/master")); - git_oid_fromstr(&id, "a65fedf39aefe402d3bb6e24df4d4f5fe4547750"); - cl_git_fail_with(GIT_ENOTFOUND, git_transaction_set_target(g_tx, "refs/heads/foo", &id, NULL, NULL)); - cl_git_pass(git_transaction_commit(g_tx)); -} diff --git a/vendor/libgit2/tests/refs/unicode.c b/vendor/libgit2/tests/refs/unicode.c deleted file mode 100644 index a279d5006..000000000 --- a/vendor/libgit2/tests/refs/unicode.c +++ /dev/null @@ -1,54 +0,0 @@ -#include "clar_libgit2.h" - -static git_repository *repo; - -void test_refs_unicode__initialize(void) -{ - repo = cl_git_sandbox_init("testrepo.git"); -} - -void test_refs_unicode__cleanup(void) -{ - cl_git_sandbox_cleanup(); - repo = NULL; -} - -void test_refs_unicode__create_and_lookup(void) -{ - git_reference *ref0, *ref1, *ref2; - git_repository *repo2; - - const char *REFNAME = "refs/heads/" "\303\205" "ngstr" "\303\266" "m"; - const char *master = "refs/heads/master"; - - /* Create the reference */ - cl_git_pass(git_reference_lookup(&ref0, repo, master)); - cl_git_pass(git_reference_create( - &ref1, repo, REFNAME, git_reference_target(ref0), 0, NULL)); - cl_assert_equal_s(REFNAME, git_reference_name(ref1)); - git_reference_free(ref0); - - /* Lookup the reference in a different instance of the repository */ - cl_git_pass(git_repository_open(&repo2, "testrepo.git")); - - cl_git_pass(git_reference_lookup(&ref2, repo2, REFNAME)); - cl_assert_equal_oid(git_reference_target(ref1), git_reference_target(ref2)); - cl_assert_equal_s(REFNAME, git_reference_name(ref2)); - git_reference_free(ref2); - -#if GIT_USE_ICONV - /* Lookup reference by decomposed unicode name */ - -#define REFNAME_DECOMPOSED "refs/heads/" "A" "\314\212" "ngstro" "\314\210" "m" - - cl_git_pass(git_reference_lookup(&ref2, repo2, REFNAME_DECOMPOSED)); - cl_assert_equal_oid(git_reference_target(ref1), git_reference_target(ref2)); - cl_assert_equal_s(REFNAME, git_reference_name(ref2)); - git_reference_free(ref2); -#endif - - /* Cleanup */ - - git_reference_free(ref1); - git_repository_free(repo2); -} diff --git a/vendor/libgit2/tests/refs/update.c b/vendor/libgit2/tests/refs/update.c deleted file mode 100644 index 403ea75b8..000000000 --- a/vendor/libgit2/tests/refs/update.c +++ /dev/null @@ -1,26 +0,0 @@ -#include "clar_libgit2.h" - -#include "refs.h" - -static git_repository *g_repo; - -void test_refs_update__initialize(void) -{ - g_repo = cl_git_sandbox_init("testrepo.git"); -} - -void test_refs_update__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -void test_refs_update__updating_the_target_of_a_symref_with_an_invalid_name_returns_EINVALIDSPEC(void) -{ - git_reference *head; - - cl_git_pass(git_reference_lookup(&head, g_repo, GIT_HEAD_FILE)); - cl_assert_equal_i(GIT_REF_SYMBOLIC, git_reference_type(head)); - git_reference_free(head); - - cl_assert_equal_i(GIT_EINVALIDSPEC, git_reference_symbolic_create(&head, g_repo, GIT_HEAD_FILE, "refs/heads/inv@{id", 1, NULL)); -} diff --git a/vendor/libgit2/tests/remote/insteadof.c b/vendor/libgit2/tests/remote/insteadof.c deleted file mode 100644 index 05d4757cf..000000000 --- a/vendor/libgit2/tests/remote/insteadof.c +++ /dev/null @@ -1,72 +0,0 @@ -#include "clar_libgit2.h" -#include "remote.h" -#include "repository.h" - -#define REPO_PATH "testrepo2/.gitted" -#define REMOTE_ORIGIN "origin" -#define REMOTE_INSTEADOF "insteadof-test" - -static git_repository *g_repo; -static git_remote *g_remote; - -void test_remote_insteadof__initialize(void) -{ - g_repo = NULL; - g_remote = NULL; -} - -void test_remote_insteadof__cleanup(void) -{ - git_repository_free(g_repo); - git_remote_free(g_remote); -} - -void test_remote_insteadof__url_insteadof_not_applicable(void) -{ - cl_git_pass(git_repository_open(&g_repo, cl_fixture(REPO_PATH))); - cl_git_pass(git_remote_lookup(&g_remote, g_repo, REMOTE_ORIGIN)); - - cl_assert_equal_s( - git_remote_url(g_remote), - "https://github.com/libgit2/false.git"); -} - -void test_remote_insteadof__url_insteadof_applicable(void) -{ - cl_git_pass(git_repository_open(&g_repo, cl_fixture(REPO_PATH))); - cl_git_pass(git_remote_lookup(&g_remote, g_repo, REMOTE_INSTEADOF)); - - cl_assert_equal_s( - git_remote_url(g_remote), - "http://github.com/libgit2/libgit2"); -} - -void test_remote_insteadof__pushurl_insteadof_not_applicable(void) -{ - cl_git_pass(git_repository_open(&g_repo, cl_fixture(REPO_PATH))); - cl_git_pass(git_remote_lookup(&g_remote, g_repo, REMOTE_ORIGIN)); - - cl_assert_equal_p(git_remote_pushurl(g_remote), NULL); -} - -void test_remote_insteadof__pushurl_insteadof_applicable(void) -{ - cl_git_pass(git_repository_open(&g_repo, cl_fixture(REPO_PATH))); - cl_git_pass(git_remote_lookup(&g_remote, g_repo, REMOTE_INSTEADOF)); - - cl_assert_equal_s( - git_remote_pushurl(g_remote), - "git@github.com:libgit2/libgit2"); -} - -void test_remote_insteadof__anonymous_remote(void) -{ - cl_git_pass(git_repository_open(&g_repo, cl_fixture(REPO_PATH))); - cl_git_pass(git_remote_create_anonymous(&g_remote, g_repo, - "http://example.com/libgit2/libgit2")); - - cl_assert_equal_s( - git_remote_url(g_remote), - "http://github.com/libgit2/libgit2"); - cl_assert_equal_p(git_remote_pushurl(g_remote), NULL); -} diff --git a/vendor/libgit2/tests/repo/config.c b/vendor/libgit2/tests/repo/config.c deleted file mode 100644 index 93dedd576..000000000 --- a/vendor/libgit2/tests/repo/config.c +++ /dev/null @@ -1,211 +0,0 @@ -#include "clar_libgit2.h" -#include "sysdir.h" -#include "fileops.h" -#include - -static git_buf path = GIT_BUF_INIT; - -void test_repo_config__initialize(void) -{ - cl_fixture_sandbox("empty_standard_repo"); - cl_git_pass(cl_rename( - "empty_standard_repo/.gitted", "empty_standard_repo/.git")); - - git_buf_clear(&path); - - cl_must_pass(p_mkdir("alternate", 0777)); - cl_git_pass(git_path_prettify(&path, "alternate", NULL)); -} - -void test_repo_config__cleanup(void) -{ - cl_sandbox_set_search_path_defaults(); - - git_buf_free(&path); - - cl_git_pass( - git_futils_rmdir_r("alternate", NULL, GIT_RMDIR_REMOVE_FILES)); - cl_assert(!git_path_isdir("alternate")); - - cl_fixture_cleanup("empty_standard_repo"); - -} - -void test_repo_config__can_open_global_when_there_is_no_file(void) -{ - git_repository *repo; - git_config *config, *global; - - cl_git_pass(git_libgit2_opts( - GIT_OPT_SET_SEARCH_PATH, GIT_CONFIG_LEVEL_GLOBAL, path.ptr)); - cl_git_pass(git_libgit2_opts( - GIT_OPT_SET_SEARCH_PATH, GIT_CONFIG_LEVEL_SYSTEM, path.ptr)); - cl_git_pass(git_libgit2_opts( - GIT_OPT_SET_SEARCH_PATH, GIT_CONFIG_LEVEL_XDG, path.ptr)); - - cl_git_pass(git_repository_open(&repo, "empty_standard_repo")); - cl_git_pass(git_repository_config(&config, repo)); - cl_git_pass(git_config_open_level( - &global, config, GIT_CONFIG_LEVEL_GLOBAL)); - - cl_git_pass(git_config_set_string(global, "test.set", "42")); - - git_config_free(global); - git_config_free(config); - git_repository_free(repo); -} - -void test_repo_config__can_open_missing_global_with_separators(void) -{ - git_repository *repo; - git_config *config, *global; - - cl_git_pass(git_buf_printf( - &path, "%c%s", GIT_PATH_LIST_SEPARATOR, "dummy")); - - cl_git_pass(git_libgit2_opts( - GIT_OPT_SET_SEARCH_PATH, GIT_CONFIG_LEVEL_GLOBAL, path.ptr)); - cl_git_pass(git_libgit2_opts( - GIT_OPT_SET_SEARCH_PATH, GIT_CONFIG_LEVEL_SYSTEM, path.ptr)); - cl_git_pass(git_libgit2_opts( - GIT_OPT_SET_SEARCH_PATH, GIT_CONFIG_LEVEL_XDG, path.ptr)); - - git_buf_free(&path); - - cl_git_pass(git_repository_open(&repo, "empty_standard_repo")); - cl_git_pass(git_repository_config(&config, repo)); - cl_git_pass(git_config_open_level( - &global, config, GIT_CONFIG_LEVEL_GLOBAL)); - - cl_git_pass(git_config_set_string(global, "test.set", "42")); - - git_config_free(global); - git_config_free(config); - git_repository_free(repo); -} - -#include "repository.h" - -void test_repo_config__read_with_no_configs_at_all(void) -{ - git_repository *repo; - int val; - - cl_git_pass(git_libgit2_opts( - GIT_OPT_SET_SEARCH_PATH, GIT_CONFIG_LEVEL_GLOBAL, path.ptr)); - cl_git_pass(git_libgit2_opts( - GIT_OPT_SET_SEARCH_PATH, GIT_CONFIG_LEVEL_SYSTEM, path.ptr)); - cl_git_pass(git_libgit2_opts( - GIT_OPT_SET_SEARCH_PATH, GIT_CONFIG_LEVEL_XDG, path.ptr)); - - /* with none */ - - cl_must_pass(p_unlink("empty_standard_repo/.git/config")); - cl_assert(!git_path_isfile("empty_standard_repo/.git/config")); - - cl_git_pass(git_repository_open(&repo, "empty_standard_repo")); - git_repository__cvar_cache_clear(repo); - val = -1; - cl_git_pass(git_repository__cvar(&val, repo, GIT_CVAR_ABBREV)); - cl_assert_equal_i(GIT_ABBREV_DEFAULT, val); - git_repository_free(repo); - - /* with no local config, just system */ - - cl_sandbox_set_search_path_defaults(); - - cl_must_pass(p_mkdir("alternate/1", 0777)); - cl_git_pass(git_buf_joinpath(&path, path.ptr, "1")); - cl_git_rewritefile("alternate/1/gitconfig", "[core]\n\tabbrev = 10\n"); - cl_git_pass(git_libgit2_opts( - GIT_OPT_SET_SEARCH_PATH, GIT_CONFIG_LEVEL_SYSTEM, path.ptr)); - - cl_git_pass(git_repository_open(&repo, "empty_standard_repo")); - git_repository__cvar_cache_clear(repo); - val = -1; - cl_git_pass(git_repository__cvar(&val, repo, GIT_CVAR_ABBREV)); - cl_assert_equal_i(10, val); - git_repository_free(repo); - - /* with just xdg + system */ - - cl_must_pass(p_mkdir("alternate/2", 0777)); - path.ptr[path.size - 1] = '2'; - cl_git_rewritefile("alternate/2/config", "[core]\n\tabbrev = 20\n"); - cl_git_pass(git_libgit2_opts( - GIT_OPT_SET_SEARCH_PATH, GIT_CONFIG_LEVEL_XDG, path.ptr)); - - cl_git_pass(git_repository_open(&repo, "empty_standard_repo")); - git_repository__cvar_cache_clear(repo); - val = -1; - cl_git_pass(git_repository__cvar(&val, repo, GIT_CVAR_ABBREV)); - cl_assert_equal_i(20, val); - git_repository_free(repo); - - /* with global + xdg + system */ - - cl_must_pass(p_mkdir("alternate/3", 0777)); - path.ptr[path.size - 1] = '3'; - cl_git_rewritefile("alternate/3/.gitconfig", "[core]\n\tabbrev = 30\n"); - cl_git_pass(git_libgit2_opts( - GIT_OPT_SET_SEARCH_PATH, GIT_CONFIG_LEVEL_GLOBAL, path.ptr)); - - cl_git_pass(git_repository_open(&repo, "empty_standard_repo")); - git_repository__cvar_cache_clear(repo); - val = -1; - cl_git_pass(git_repository__cvar(&val, repo, GIT_CVAR_ABBREV)); - cl_assert_equal_i(30, val); - git_repository_free(repo); - - /* with all configs */ - - cl_git_rewritefile("empty_standard_repo/.git/config", "[core]\n\tabbrev = 40\n"); - - cl_git_pass(git_repository_open(&repo, "empty_standard_repo")); - git_repository__cvar_cache_clear(repo); - val = -1; - cl_git_pass(git_repository__cvar(&val, repo, GIT_CVAR_ABBREV)); - cl_assert_equal_i(40, val); - git_repository_free(repo); - - /* with all configs but delete the files ? */ - - cl_git_pass(git_repository_open(&repo, "empty_standard_repo")); - git_repository__cvar_cache_clear(repo); - val = -1; - cl_git_pass(git_repository__cvar(&val, repo, GIT_CVAR_ABBREV)); - cl_assert_equal_i(40, val); - - cl_must_pass(p_unlink("empty_standard_repo/.git/config")); - cl_assert(!git_path_isfile("empty_standard_repo/.git/config")); - - cl_must_pass(p_unlink("alternate/1/gitconfig")); - cl_assert(!git_path_isfile("alternate/1/gitconfig")); - - cl_must_pass(p_unlink("alternate/2/config")); - cl_assert(!git_path_isfile("alternate/2/config")); - - cl_must_pass(p_unlink("alternate/3/.gitconfig")); - cl_assert(!git_path_isfile("alternate/3/.gitconfig")); - - git_repository__cvar_cache_clear(repo); - val = -1; - cl_git_pass(git_repository__cvar(&val, repo, GIT_CVAR_ABBREV)); - cl_assert_equal_i(40, val); - git_repository_free(repo); - - /* reopen */ - - cl_assert(!git_path_isfile("empty_standard_repo/.git/config")); - cl_assert(!git_path_isfile("alternate/3/.gitconfig")); - - cl_git_pass(git_repository_open(&repo, "empty_standard_repo")); - git_repository__cvar_cache_clear(repo); - val = -1; - cl_git_pass(git_repository__cvar(&val, repo, GIT_CVAR_ABBREV)); - cl_assert_equal_i(7, val); - git_repository_free(repo); - - cl_assert(!git_path_exists("empty_standard_repo/.git/config")); - cl_assert(!git_path_exists("alternate/3/.gitconfig")); -} diff --git a/vendor/libgit2/tests/repo/discover.c b/vendor/libgit2/tests/repo/discover.c deleted file mode 100644 index 86bd7458f..000000000 --- a/vendor/libgit2/tests/repo/discover.c +++ /dev/null @@ -1,143 +0,0 @@ -#include "clar_libgit2.h" - -#include "odb.h" -#include "fileops.h" -#include "repository.h" - -#define TEMP_REPO_FOLDER "temprepo/" -#define DISCOVER_FOLDER TEMP_REPO_FOLDER "discover.git" - -#define SUB_REPOSITORY_FOLDER_NAME "sub_repo" -#define SUB_REPOSITORY_FOLDER DISCOVER_FOLDER "/" SUB_REPOSITORY_FOLDER_NAME -#define SUB_REPOSITORY_FOLDER_SUB SUB_REPOSITORY_FOLDER "/sub" -#define SUB_REPOSITORY_FOLDER_SUB_SUB SUB_REPOSITORY_FOLDER_SUB "/subsub" -#define SUB_REPOSITORY_FOLDER_SUB_SUB_SUB SUB_REPOSITORY_FOLDER_SUB_SUB "/subsubsub" - -#define REPOSITORY_ALTERNATE_FOLDER DISCOVER_FOLDER "/alternate_sub_repo" -#define REPOSITORY_ALTERNATE_FOLDER_SUB REPOSITORY_ALTERNATE_FOLDER "/sub" -#define REPOSITORY_ALTERNATE_FOLDER_SUB_SUB REPOSITORY_ALTERNATE_FOLDER_SUB "/subsub" -#define REPOSITORY_ALTERNATE_FOLDER_SUB_SUB_SUB REPOSITORY_ALTERNATE_FOLDER_SUB_SUB "/subsubsub" - -#define ALTERNATE_MALFORMED_FOLDER1 DISCOVER_FOLDER "/alternate_malformed_repo1" -#define ALTERNATE_MALFORMED_FOLDER2 DISCOVER_FOLDER "/alternate_malformed_repo2" -#define ALTERNATE_MALFORMED_FOLDER3 DISCOVER_FOLDER "/alternate_malformed_repo3" -#define ALTERNATE_NOT_FOUND_FOLDER DISCOVER_FOLDER "/alternate_not_found_repo" - -static void ensure_repository_discover(const char *start_path, - const char *ceiling_dirs, - git_buf *expected_path) -{ - git_buf found_path = GIT_BUF_INIT; - cl_git_pass(git_repository_discover(&found_path, start_path, 0, ceiling_dirs)); - //across_fs is always 0 as we can't automate the filesystem change tests - cl_assert_equal_s(found_path.ptr, expected_path->ptr); - git_buf_free(&found_path); -} - -static void write_file(const char *path, const char *content) -{ - git_file file; - int error; - - if (git_path_exists(path)) { - cl_git_pass(p_unlink(path)); - } - - file = git_futils_creat_withpath(path, 0777, 0666); - cl_assert(file >= 0); - - error = p_write(file, content, strlen(content) * sizeof(char)); - p_close(file); - cl_git_pass(error); -} - -//no check is performed on ceiling_dirs length, so be sure it's long enough -static void append_ceiling_dir(git_buf *ceiling_dirs, const char *path) -{ - git_buf pretty_path = GIT_BUF_INIT; - char ceiling_separator[2] = { GIT_PATH_LIST_SEPARATOR, '\0' }; - - cl_git_pass(git_path_prettify_dir(&pretty_path, path, NULL)); - - if (ceiling_dirs->size > 0) - git_buf_puts(ceiling_dirs, ceiling_separator); - - git_buf_puts(ceiling_dirs, pretty_path.ptr); - - git_buf_free(&pretty_path); - cl_assert(git_buf_oom(ceiling_dirs) == 0); -} - -void test_repo_discover__0(void) -{ - // test discover - git_repository *repo; - git_buf ceiling_dirs_buf = GIT_BUF_INIT, repository_path = GIT_BUF_INIT, - sub_repository_path = GIT_BUF_INIT, found_path = GIT_BUF_INIT; - const char *ceiling_dirs; - const mode_t mode = 0777; - - git_futils_mkdir_r(DISCOVER_FOLDER, mode); - append_ceiling_dir(&ceiling_dirs_buf, TEMP_REPO_FOLDER); - ceiling_dirs = git_buf_cstr(&ceiling_dirs_buf); - - cl_assert_equal_i(GIT_ENOTFOUND, git_repository_discover(&repository_path, DISCOVER_FOLDER, 0, ceiling_dirs)); - - cl_git_pass(git_repository_init(&repo, DISCOVER_FOLDER, 1)); - cl_git_pass(git_repository_discover(&repository_path, DISCOVER_FOLDER, 0, ceiling_dirs)); - git_repository_free(repo); - - cl_git_pass(git_repository_init(&repo, SUB_REPOSITORY_FOLDER, 0)); - cl_git_pass(git_futils_mkdir_r(SUB_REPOSITORY_FOLDER_SUB_SUB_SUB, mode)); - cl_git_pass(git_repository_discover(&sub_repository_path, SUB_REPOSITORY_FOLDER, 0, ceiling_dirs)); - - cl_git_pass(git_futils_mkdir_r(SUB_REPOSITORY_FOLDER_SUB_SUB_SUB, mode)); - ensure_repository_discover(SUB_REPOSITORY_FOLDER_SUB, ceiling_dirs, &sub_repository_path); - ensure_repository_discover(SUB_REPOSITORY_FOLDER_SUB_SUB, ceiling_dirs, &sub_repository_path); - ensure_repository_discover(SUB_REPOSITORY_FOLDER_SUB_SUB_SUB, ceiling_dirs, &sub_repository_path); - - cl_git_pass(git_futils_mkdir_r(REPOSITORY_ALTERNATE_FOLDER_SUB_SUB_SUB, mode)); - write_file(REPOSITORY_ALTERNATE_FOLDER "/" DOT_GIT, "gitdir: ../" SUB_REPOSITORY_FOLDER_NAME "/" DOT_GIT); - write_file(REPOSITORY_ALTERNATE_FOLDER_SUB_SUB "/" DOT_GIT, "gitdir: ../../../" SUB_REPOSITORY_FOLDER_NAME "/" DOT_GIT); - write_file(REPOSITORY_ALTERNATE_FOLDER_SUB_SUB_SUB "/" DOT_GIT, "gitdir: ../../../../"); - ensure_repository_discover(REPOSITORY_ALTERNATE_FOLDER, ceiling_dirs, &sub_repository_path); - ensure_repository_discover(REPOSITORY_ALTERNATE_FOLDER_SUB, ceiling_dirs, &sub_repository_path); - ensure_repository_discover(REPOSITORY_ALTERNATE_FOLDER_SUB_SUB, ceiling_dirs, &sub_repository_path); - ensure_repository_discover(REPOSITORY_ALTERNATE_FOLDER_SUB_SUB_SUB, ceiling_dirs, &repository_path); - - cl_git_pass(git_futils_mkdir_r(ALTERNATE_MALFORMED_FOLDER1, mode)); - write_file(ALTERNATE_MALFORMED_FOLDER1 "/" DOT_GIT, "Anything but not gitdir:"); - cl_git_pass(git_futils_mkdir_r(ALTERNATE_MALFORMED_FOLDER2, mode)); - write_file(ALTERNATE_MALFORMED_FOLDER2 "/" DOT_GIT, "gitdir:"); - cl_git_pass(git_futils_mkdir_r(ALTERNATE_MALFORMED_FOLDER3, mode)); - write_file(ALTERNATE_MALFORMED_FOLDER3 "/" DOT_GIT, "gitdir: \n\n\n"); - cl_git_pass(git_futils_mkdir_r(ALTERNATE_NOT_FOUND_FOLDER, mode)); - write_file(ALTERNATE_NOT_FOUND_FOLDER "/" DOT_GIT, "gitdir: a_repository_that_surely_does_not_exist"); - cl_git_fail(git_repository_discover(&found_path, ALTERNATE_MALFORMED_FOLDER1, 0, ceiling_dirs)); - cl_git_fail(git_repository_discover(&found_path, ALTERNATE_MALFORMED_FOLDER2, 0, ceiling_dirs)); - cl_git_fail(git_repository_discover(&found_path, ALTERNATE_MALFORMED_FOLDER3, 0, ceiling_dirs)); - cl_assert_equal_i(GIT_ENOTFOUND, git_repository_discover(&found_path, ALTERNATE_NOT_FOUND_FOLDER, 0, ceiling_dirs)); - - append_ceiling_dir(&ceiling_dirs_buf, SUB_REPOSITORY_FOLDER); - ceiling_dirs = git_buf_cstr(&ceiling_dirs_buf); - - //this must pass as ceiling_directories cannot predent the current - //working directory to be checked - cl_git_pass(git_repository_discover(&found_path, SUB_REPOSITORY_FOLDER, 0, ceiling_dirs)); - cl_assert_equal_i(GIT_ENOTFOUND, git_repository_discover(&found_path, SUB_REPOSITORY_FOLDER_SUB, 0, ceiling_dirs)); - cl_assert_equal_i(GIT_ENOTFOUND, git_repository_discover(&found_path, SUB_REPOSITORY_FOLDER_SUB_SUB, 0, ceiling_dirs)); - cl_assert_equal_i(GIT_ENOTFOUND, git_repository_discover(&found_path, SUB_REPOSITORY_FOLDER_SUB_SUB_SUB, 0, ceiling_dirs)); - - //.gitfile redirection should not be affected by ceiling directories - ensure_repository_discover(REPOSITORY_ALTERNATE_FOLDER, ceiling_dirs, &sub_repository_path); - ensure_repository_discover(REPOSITORY_ALTERNATE_FOLDER_SUB, ceiling_dirs, &sub_repository_path); - ensure_repository_discover(REPOSITORY_ALTERNATE_FOLDER_SUB_SUB, ceiling_dirs, &sub_repository_path); - ensure_repository_discover(REPOSITORY_ALTERNATE_FOLDER_SUB_SUB_SUB, ceiling_dirs, &repository_path); - - cl_git_pass(git_futils_rmdir_r(TEMP_REPO_FOLDER, NULL, GIT_RMDIR_REMOVE_FILES)); - git_repository_free(repo); - git_buf_free(&ceiling_dirs_buf); - git_buf_free(&repository_path); - git_buf_free(&sub_repository_path); -} - diff --git a/vendor/libgit2/tests/repo/getters.c b/vendor/libgit2/tests/repo/getters.c deleted file mode 100644 index b8ede126c..000000000 --- a/vendor/libgit2/tests/repo/getters.c +++ /dev/null @@ -1,40 +0,0 @@ -#include "clar_libgit2.h" - -void test_repo_getters__is_empty_correctly_deals_with_pristine_looking_repos(void) -{ - git_repository *repo; - - repo = cl_git_sandbox_init("empty_bare.git"); - cl_git_remove_placeholders(git_repository_path(repo), "dummy-marker.txt"); - - cl_assert_equal_i(true, git_repository_is_empty(repo)); - - cl_git_sandbox_cleanup(); -} - -void test_repo_getters__is_empty_can_detect_used_repositories(void) -{ - git_repository *repo; - - cl_git_pass(git_repository_open(&repo, cl_fixture("testrepo.git"))); - - cl_assert_equal_i(false, git_repository_is_empty(repo)); - - git_repository_free(repo); -} - -void test_repo_getters__retrieving_the_odb_honors_the_refcount(void) -{ - git_odb *odb; - git_repository *repo; - - cl_git_pass(git_repository_open(&repo, cl_fixture("testrepo.git"))); - - cl_git_pass(git_repository_odb(&odb, repo)); - cl_assert(((git_refcount *)odb)->refcount.val == 2); - - git_repository_free(repo); - cl_assert(((git_refcount *)odb)->refcount.val == 1); - - git_odb_free(odb); -} diff --git a/vendor/libgit2/tests/repo/hashfile.c b/vendor/libgit2/tests/repo/hashfile.c deleted file mode 100644 index ae8e122f6..000000000 --- a/vendor/libgit2/tests/repo/hashfile.c +++ /dev/null @@ -1,85 +0,0 @@ -#include "clar_libgit2.h" -#include "buffer.h" - -static git_repository *_repo; - -void test_repo_hashfile__initialize(void) -{ - _repo = cl_git_sandbox_init("status"); -} - -void test_repo_hashfile__cleanup(void) -{ - cl_git_sandbox_cleanup(); - _repo = NULL; -} - -void test_repo_hashfile__simple(void) -{ - git_oid a, b; - git_buf full = GIT_BUF_INIT; - - /* hash with repo relative path */ - cl_git_pass(git_odb_hashfile(&a, "status/current_file", GIT_OBJ_BLOB)); - cl_git_pass(git_repository_hashfile(&b, _repo, "current_file", GIT_OBJ_BLOB, NULL)); - cl_assert_equal_oid(&a, &b); - - cl_git_pass(git_buf_joinpath(&full, git_repository_workdir(_repo), "current_file")); - - /* hash with full path */ - cl_git_pass(git_odb_hashfile(&a, full.ptr, GIT_OBJ_BLOB)); - cl_git_pass(git_repository_hashfile(&b, _repo, full.ptr, GIT_OBJ_BLOB, NULL)); - cl_assert_equal_oid(&a, &b); - - /* hash with invalid type */ - cl_git_fail(git_odb_hashfile(&a, full.ptr, GIT_OBJ_ANY)); - cl_git_fail(git_repository_hashfile(&b, _repo, full.ptr, GIT_OBJ_OFS_DELTA, NULL)); - - git_buf_free(&full); -} - -void test_repo_hashfile__filtered(void) -{ - git_oid a, b; - - cl_repo_set_bool(_repo, "core.autocrlf", true); - - cl_git_append2file("status/.gitattributes", "*.txt text\n*.bin binary\n\n"); - - /* create some sample content with CRLF in it */ - cl_git_mkfile("status/testfile.txt", "content\r\n"); - cl_git_mkfile("status/testfile.bin", "other\r\nstuff\r\n"); - - /* not equal hashes because of filtering */ - cl_git_pass(git_odb_hashfile(&a, "status/testfile.txt", GIT_OBJ_BLOB)); - cl_git_pass(git_repository_hashfile(&b, _repo, "testfile.txt", GIT_OBJ_BLOB, NULL)); - cl_assert(git_oid_cmp(&a, &b)); - - /* equal hashes because filter is binary */ - cl_git_pass(git_odb_hashfile(&a, "status/testfile.bin", GIT_OBJ_BLOB)); - cl_git_pass(git_repository_hashfile(&b, _repo, "testfile.bin", GIT_OBJ_BLOB, NULL)); - cl_assert_equal_oid(&a, &b); - - /* equal hashes when 'as_file' points to binary filtering */ - cl_git_pass(git_odb_hashfile(&a, "status/testfile.txt", GIT_OBJ_BLOB)); - cl_git_pass(git_repository_hashfile(&b, _repo, "testfile.txt", GIT_OBJ_BLOB, "foo.bin")); - cl_assert_equal_oid(&a, &b); - - /* not equal hashes when 'as_file' points to text filtering */ - cl_git_pass(git_odb_hashfile(&a, "status/testfile.bin", GIT_OBJ_BLOB)); - cl_git_pass(git_repository_hashfile(&b, _repo, "testfile.bin", GIT_OBJ_BLOB, "foo.txt")); - cl_assert(git_oid_cmp(&a, &b)); - - /* equal hashes when 'as_file' is empty and turns off filtering */ - cl_git_pass(git_odb_hashfile(&a, "status/testfile.txt", GIT_OBJ_BLOB)); - cl_git_pass(git_repository_hashfile(&b, _repo, "testfile.txt", GIT_OBJ_BLOB, "")); - cl_assert_equal_oid(&a, &b); - - cl_git_pass(git_odb_hashfile(&a, "status/testfile.bin", GIT_OBJ_BLOB)); - cl_git_pass(git_repository_hashfile(&b, _repo, "testfile.bin", GIT_OBJ_BLOB, "")); - cl_assert_equal_oid(&a, &b); - - /* some hash type failures */ - cl_git_fail(git_odb_hashfile(&a, "status/testfile.txt", 0)); - cl_git_fail(git_repository_hashfile(&b, _repo, "testfile.txt", GIT_OBJ_ANY, NULL)); -} diff --git a/vendor/libgit2/tests/repo/head.c b/vendor/libgit2/tests/repo/head.c deleted file mode 100644 index 31c228777..000000000 --- a/vendor/libgit2/tests/repo/head.c +++ /dev/null @@ -1,461 +0,0 @@ -#include "clar_libgit2.h" -#include "refs.h" -#include "repo_helpers.h" -#include "posix.h" -#include "git2/annotated_commit.h" - -static const char *g_email = "foo@example.com"; -static git_repository *repo; - -void test_repo_head__initialize(void) -{ - repo = cl_git_sandbox_init("testrepo.git"); - cl_git_pass(git_repository_set_ident(repo, "Foo Bar", g_email)); -} - -void test_repo_head__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -static void check_last_reflog_entry(const char *email, const char *message) -{ - git_reflog *log; - const git_reflog_entry *entry; - - cl_git_pass(git_reflog_read(&log, repo, GIT_HEAD_FILE)); - cl_assert(git_reflog_entrycount(log) > 0); - entry = git_reflog_entry_byindex(log, 0); - if (email) - cl_assert_equal_s(email, git_reflog_entry_committer(entry)->email); - if (message) - cl_assert_equal_s(message, git_reflog_entry_message(entry)); - git_reflog_free(log); -} - -void test_repo_head__head_detached(void) -{ - git_reference *ref; - - cl_assert_equal_i(false, git_repository_head_detached(repo)); - - cl_git_pass(git_repository_detach_head(repo)); - check_last_reflog_entry(g_email, "checkout: moving from master to a65fedf39aefe402d3bb6e24df4d4f5fe4547750"); - cl_assert_equal_i(true, git_repository_head_detached(repo)); - - /* take the repo back to it's original state */ - cl_git_pass(git_reference_symbolic_create(&ref, repo, "HEAD", "refs/heads/master", - true, "REATTACH")); - git_reference_free(ref); - - check_last_reflog_entry(g_email, "REATTACH"); - cl_assert_equal_i(false, git_repository_head_detached(repo)); -} - -void test_repo_head__unborn_head(void) -{ - git_reference *ref; - - cl_git_pass(git_repository_head_detached(repo)); - - make_head_unborn(repo, NON_EXISTING_HEAD); - - cl_assert(git_repository_head_unborn(repo) == 1); - - - /* take the repo back to it's original state */ - cl_git_pass(git_reference_symbolic_create(&ref, repo, "HEAD", "refs/heads/master", 1, NULL)); - cl_assert(git_repository_head_unborn(repo) == 0); - - git_reference_free(ref); -} - -void test_repo_head__set_head_Attaches_HEAD_to_un_unborn_branch_when_the_branch_doesnt_exist(void) -{ - git_reference *head; - - cl_git_pass(git_repository_set_head(repo, "refs/heads/doesnt/exist/yet")); - - cl_assert_equal_i(false, git_repository_head_detached(repo)); - - cl_assert_equal_i(GIT_EUNBORNBRANCH, git_repository_head(&head, repo)); -} - -void test_repo_head__set_head_Returns_ENOTFOUND_when_the_reference_doesnt_exist(void) -{ - cl_assert_equal_i(GIT_ENOTFOUND, git_repository_set_head(repo, "refs/tags/doesnt/exist/yet")); -} - -void test_repo_head__set_head_Fails_when_the_reference_points_to_a_non_commitish(void) -{ - cl_git_fail(git_repository_set_head(repo, "refs/tags/point_to_blob")); -} - -void test_repo_head__set_head_Attaches_HEAD_when_the_reference_points_to_a_branch(void) -{ - git_reference *head; - - cl_git_pass(git_repository_set_head(repo, "refs/heads/br2")); - - cl_assert_equal_i(false, git_repository_head_detached(repo)); - - cl_git_pass(git_repository_head(&head, repo)); - cl_assert_equal_s("refs/heads/br2", git_reference_name(head)); - - git_reference_free(head); -} - -static void assert_head_is_correctly_detached(void) -{ - git_reference *head; - git_object *commit; - - cl_assert_equal_i(true, git_repository_head_detached(repo)); - - cl_git_pass(git_repository_head(&head, repo)); - - cl_git_pass(git_object_lookup(&commit, repo, git_reference_target(head), GIT_OBJ_COMMIT)); - - git_object_free(commit); - git_reference_free(head); -} - -void test_repo_head__set_head_Detaches_HEAD_when_the_reference_doesnt_point_to_a_branch(void) -{ - cl_git_pass(git_repository_set_head(repo, "refs/tags/test")); - - cl_assert_equal_i(true, git_repository_head_detached(repo)); - - assert_head_is_correctly_detached(); -} - -void test_repo_head__set_head_detached_Return_ENOTFOUND_when_the_object_doesnt_exist(void) -{ - git_oid oid; - - cl_git_pass(git_oid_fromstr(&oid, "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef")); - - cl_assert_equal_i(GIT_ENOTFOUND, git_repository_set_head_detached(repo, &oid)); -} - -void test_repo_head__set_head_detached_Fails_when_the_object_isnt_a_commitish(void) -{ - git_object *blob; - - cl_git_pass(git_revparse_single(&blob, repo, "point_to_blob")); - - cl_git_fail(git_repository_set_head_detached(repo, git_object_id(blob))); - - git_object_free(blob); -} - -void test_repo_head__set_head_detached_Detaches_HEAD_and_make_it_point_to_the_peeled_commit(void) -{ - git_object *tag; - - cl_git_pass(git_revparse_single(&tag, repo, "tags/test")); - cl_assert_equal_i(GIT_OBJ_TAG, git_object_type(tag)); - - cl_git_pass(git_repository_set_head_detached(repo, git_object_id(tag))); - - assert_head_is_correctly_detached(); - - git_object_free(tag); -} - -void test_repo_head__detach_head_Detaches_HEAD_and_make_it_point_to_the_peeled_commit(void) -{ - cl_assert_equal_i(false, git_repository_head_detached(repo)); - - cl_git_pass(git_repository_detach_head(repo)); - - assert_head_is_correctly_detached(); -} - -void test_repo_head__detach_head_Fails_if_HEAD_and_point_to_a_non_commitish(void) -{ - git_reference *head; - - cl_git_pass(git_reference_symbolic_create(&head, repo, GIT_HEAD_FILE, "refs/tags/point_to_blob", 1, NULL)); - - cl_git_fail(git_repository_detach_head(repo)); - - git_reference_free(head); -} - -void test_repo_head__detaching_an_unborn_branch_returns_GIT_EUNBORNBRANCH(void) -{ - make_head_unborn(repo, NON_EXISTING_HEAD); - - cl_assert_equal_i(GIT_EUNBORNBRANCH, git_repository_detach_head(repo)); -} - -void test_repo_head__retrieving_an_unborn_branch_returns_GIT_EUNBORNBRANCH(void) -{ - git_reference *head; - - make_head_unborn(repo, NON_EXISTING_HEAD); - - cl_assert_equal_i(GIT_EUNBORNBRANCH, git_repository_head(&head, repo)); -} - -void test_repo_head__retrieving_a_missing_head_returns_GIT_ENOTFOUND(void) -{ - git_reference *head; - - delete_head(repo); - - cl_assert_equal_i(GIT_ENOTFOUND, git_repository_head(&head, repo)); -} - -void test_repo_head__can_tell_if_an_unborn_head_is_detached(void) -{ - make_head_unborn(repo, NON_EXISTING_HEAD); - - cl_assert_equal_i(false, git_repository_head_detached(repo)); -} - -static void test_reflog(git_repository *repo, size_t idx, - const char *old_spec, const char *new_spec, - const char *email, const char *message) -{ - git_reflog *log; - const git_reflog_entry *entry; - - cl_git_pass(git_reflog_read(&log, repo, "HEAD")); - entry = git_reflog_entry_byindex(log, idx); - - if (old_spec) { - git_object *obj; - cl_git_pass(git_revparse_single(&obj, repo, old_spec)); - cl_assert_equal_oid(git_object_id(obj), git_reflog_entry_id_old(entry)); - git_object_free(obj); - } - if (new_spec) { - git_object *obj; - cl_git_pass(git_revparse_single(&obj, repo, new_spec)); - cl_assert_equal_oid(git_object_id(obj), git_reflog_entry_id_new(entry)); - git_object_free(obj); - } - - if (email) { - cl_assert_equal_s(email, git_reflog_entry_committer(entry)->email); - } - if (message) { - cl_assert_equal_s(message, git_reflog_entry_message(entry)); - } - - git_reflog_free(log); -} - -void test_repo_head__setting_head_updates_reflog(void) -{ - git_object *tag; - git_signature *sig; - git_annotated_commit *annotated; - - cl_git_pass(git_signature_now(&sig, "me", "foo@example.com")); - - cl_git_pass(git_repository_set_head(repo, "refs/heads/haacked")); - cl_git_pass(git_repository_set_head(repo, "refs/heads/unborn")); - cl_git_pass(git_revparse_single(&tag, repo, "tags/test")); - cl_git_pass(git_repository_set_head_detached(repo, git_object_id(tag))); - cl_git_pass(git_repository_set_head(repo, "refs/heads/haacked")); - - test_reflog(repo, 2, NULL, "refs/heads/haacked", "foo@example.com", "checkout: moving from master to haacked"); - test_reflog(repo, 1, NULL, "tags/test^{commit}", "foo@example.com", "checkout: moving from unborn to e90810b8df3e80c413d903f631643c716887138d"); - test_reflog(repo, 0, "tags/test^{commit}", "refs/heads/haacked", "foo@example.com", "checkout: moving from e90810b8df3e80c413d903f631643c716887138d to haacked"); - - cl_git_pass(git_annotated_commit_from_revspec(&annotated, repo, "haacked~0")); - cl_git_pass(git_repository_set_head_detached_from_annotated(repo, annotated)); - - test_reflog(repo, 0, NULL, "refs/heads/haacked", "foo@example.com", "checkout: moving from haacked to haacked~0"); - - git_annotated_commit_free(annotated); - git_object_free(tag); - git_signature_free(sig); -} - -static void assert_head_reflog(git_repository *repo, size_t idx, - const char *old_id, const char *new_id, const char *message) -{ - git_reflog *log; - const git_reflog_entry *entry; - char id_str[GIT_OID_HEXSZ + 1] = {0}; - - cl_git_pass(git_reflog_read(&log, repo, GIT_HEAD_FILE)); - entry = git_reflog_entry_byindex(log, idx); - - git_oid_fmt(id_str, git_reflog_entry_id_old(entry)); - cl_assert_equal_s(old_id, id_str); - - git_oid_fmt(id_str, git_reflog_entry_id_new(entry)); - cl_assert_equal_s(new_id, id_str); - - cl_assert_equal_s(message, git_reflog_entry_message(entry)); - - git_reflog_free(log); -} - -void test_repo_head__detaching_writes_reflog(void) -{ - git_signature *sig; - git_oid id; - const char *msg; - - cl_git_pass(git_signature_now(&sig, "me", "foo@example.com")); - - msg = "checkout: moving from master to e90810b8df3e80c413d903f631643c716887138d"; - git_oid_fromstr(&id, "e90810b8df3e80c413d903f631643c716887138d"); - cl_git_pass(git_repository_set_head_detached(repo, &id)); - assert_head_reflog(repo, 0, "a65fedf39aefe402d3bb6e24df4d4f5fe4547750", - "e90810b8df3e80c413d903f631643c716887138d", msg); - - msg = "checkout: moving from e90810b8df3e80c413d903f631643c716887138d to haacked"; - cl_git_pass(git_repository_set_head(repo, "refs/heads/haacked")); - assert_head_reflog(repo, 0, "e90810b8df3e80c413d903f631643c716887138d", - "258f0e2a959a364e40ed6603d5d44fbb24765b10", msg); - - git_signature_free(sig); -} - -void test_repo_head__orphan_branch_does_not_count(void) -{ - git_oid id; - const char *msg; - - /* Have something known */ - msg = "checkout: moving from master to e90810b8df3e80c413d903f631643c716887138d"; - git_oid_fromstr(&id, "e90810b8df3e80c413d903f631643c716887138d"); - cl_git_pass(git_repository_set_head_detached(repo, &id)); - assert_head_reflog(repo, 0, "a65fedf39aefe402d3bb6e24df4d4f5fe4547750", - "e90810b8df3e80c413d903f631643c716887138d", msg); - - /* Switching to an orphan branch does not write tot he reflog */ - cl_git_pass(git_repository_set_head(repo, "refs/heads/orphan")); - assert_head_reflog(repo, 0, "a65fedf39aefe402d3bb6e24df4d4f5fe4547750", - "e90810b8df3e80c413d903f631643c716887138d", msg); - - /* And coming back, we set the source to zero */ - msg = "checkout: moving from orphan to haacked"; - cl_git_pass(git_repository_set_head(repo, "refs/heads/haacked")); - assert_head_reflog(repo, 0, "0000000000000000000000000000000000000000", - "258f0e2a959a364e40ed6603d5d44fbb24765b10", msg); -} - -void test_repo_head__set_to_current_target(void) -{ - git_reflog *log; - size_t nentries, nentries_after; - - cl_git_pass(git_reflog_read(&log, repo, GIT_HEAD_FILE)); - nentries = git_reflog_entrycount(log); - git_reflog_free(log); - - cl_git_pass(git_repository_set_head(repo, "refs/heads/haacked")); - cl_git_pass(git_repository_set_head(repo, "refs/heads/haacked")); - - cl_git_pass(git_reflog_read(&log, repo, GIT_HEAD_FILE)); - nentries_after = git_reflog_entrycount(log); - git_reflog_free(log); - - cl_assert_equal_i(nentries + 1, nentries_after); -} - -void test_repo_head__branch_birth(void) -{ - git_signature *sig; - git_oid id; - git_tree *tree; - git_reference *ref; - const char *msg; - git_reflog *log; - size_t nentries, nentries_after; - - cl_git_pass(git_reflog_read(&log, repo, GIT_HEAD_FILE)); - nentries = git_reflog_entrycount(log); - git_reflog_free(log); - - cl_git_pass(git_signature_now(&sig, "me", "foo@example.com")); - - cl_git_pass(git_repository_head(&ref, repo)); - cl_git_pass(git_reference_peel((git_object **) &tree, ref, GIT_OBJ_TREE)); - git_reference_free(ref); - - cl_git_pass(git_repository_set_head(repo, "refs/heads/orphan")); - - cl_git_pass(git_reflog_read(&log, repo, GIT_HEAD_FILE)); - nentries_after = git_reflog_entrycount(log); - git_reflog_free(log); - - cl_assert_equal_i(nentries, nentries_after); - - msg = "message 2"; - cl_git_pass(git_commit_create(&id, repo, "HEAD", sig, sig, NULL, msg, tree, 0, NULL)); - - git_tree_free(tree); - - cl_git_pass(git_reflog_read(&log, repo, "refs/heads/orphan")); - cl_assert_equal_i(1, git_reflog_entrycount(log)); - git_reflog_free(log); - - cl_git_pass(git_reflog_read(&log, repo, GIT_HEAD_FILE)); - nentries_after = git_reflog_entrycount(log); - git_reflog_free(log); - - cl_assert_equal_i(nentries + 1, nentries_after); - - git_signature_free(sig); - -} - -static size_t entrycount(git_repository *repo, const char *name) -{ - git_reflog *log; - size_t ret; - - cl_git_pass(git_reflog_read(&log, repo, name)); - ret = git_reflog_entrycount(log); - git_reflog_free(log); - - return ret; -} - -void test_repo_head__symref_chain(void) -{ - git_signature *sig; - git_oid id; - git_tree *tree; - git_reference *ref; - const char *msg; - size_t nentries, nentries_master; - - nentries = entrycount(repo, GIT_HEAD_FILE); - - cl_git_pass(git_signature_now(&sig, "me", "foo@example.com")); - - cl_git_pass(git_repository_head(&ref, repo)); - cl_git_pass(git_reference_peel((git_object **) &tree, ref, GIT_OBJ_TREE)); - git_reference_free(ref); - - nentries_master = entrycount(repo, "refs/heads/master"); - - msg = "message 1"; - cl_git_pass(git_reference_symbolic_create(&ref, repo, "refs/heads/master", "refs/heads/foo", 1, msg)); - git_reference_free(ref); - - cl_assert_equal_i(0, entrycount(repo, "refs/heads/foo")); - cl_assert_equal_i(nentries, entrycount(repo, GIT_HEAD_FILE)); - cl_assert_equal_i(nentries_master, entrycount(repo, "refs/heads/master")); - - msg = "message 2"; - cl_git_pass(git_commit_create(&id, repo, "HEAD", sig, sig, NULL, msg, tree, 0, NULL)); - git_tree_free(tree); - - cl_assert_equal_i(1, entrycount(repo, "refs/heads/foo")); - cl_assert_equal_i(nentries +1, entrycount(repo, GIT_HEAD_FILE)); - cl_assert_equal_i(nentries_master, entrycount(repo, "refs/heads/master")); - - git_signature_free(sig); - -} diff --git a/vendor/libgit2/tests/repo/headtree.c b/vendor/libgit2/tests/repo/headtree.c deleted file mode 100644 index e899ac399..000000000 --- a/vendor/libgit2/tests/repo/headtree.c +++ /dev/null @@ -1,53 +0,0 @@ -#include "clar_libgit2.h" -#include "repository.h" -#include "repo_helpers.h" -#include "posix.h" - -static git_repository *repo; -static git_tree *tree; - -void test_repo_headtree__initialize(void) -{ - repo = cl_git_sandbox_init("testrepo.git"); - tree = NULL; -} - -void test_repo_headtree__cleanup(void) -{ - git_tree_free(tree); - cl_git_sandbox_cleanup(); -} - -void test_repo_headtree__can_retrieve_the_root_tree_from_a_detached_head(void) -{ - cl_git_pass(git_repository_detach_head(repo)); - - cl_git_pass(git_repository_head_tree(&tree, repo)); - - cl_assert(git_oid_streq(git_tree_id(tree), "az")); -} - -void test_repo_headtree__can_retrieve_the_root_tree_from_a_non_detached_head(void) -{ - cl_assert_equal_i(false, git_repository_head_detached(repo)); - - cl_git_pass(git_repository_head_tree(&tree, repo)); - - cl_assert(git_oid_streq(git_tree_id(tree), "az")); -} - -void test_repo_headtree__when_head_is_unborn_returns_EUNBORNBRANCH(void) -{ - make_head_unborn(repo, NON_EXISTING_HEAD); - - cl_assert_equal_i(true, git_repository_head_unborn(repo)); - - cl_assert_equal_i(GIT_EUNBORNBRANCH, git_repository_head_tree(&tree, repo)); -} - -void test_repo_headtree__when_head_is_missing_returns_ENOTFOUND(void) -{ - delete_head(repo); - - cl_assert_equal_i(GIT_ENOTFOUND, git_repository_head_tree(&tree, repo)); -} diff --git a/vendor/libgit2/tests/repo/init.c b/vendor/libgit2/tests/repo/init.c deleted file mode 100644 index 04d4a5c5e..000000000 --- a/vendor/libgit2/tests/repo/init.c +++ /dev/null @@ -1,827 +0,0 @@ -#include "clar_libgit2.h" -#include "fileops.h" -#include "repository.h" -#include "config.h" -#include "path.h" -#include "config/config_helpers.h" - -enum repo_mode { - STANDARD_REPOSITORY = 0, - BARE_REPOSITORY = 1 -}; - -static git_repository *_repo = NULL; -static git_buf _global_path = GIT_BUF_INIT; -static git_buf _tmp_path = GIT_BUF_INIT; -static mode_t g_umask = 0; - -void test_repo_init__initialize(void) -{ - _repo = NULL; - - /* load umask if not already loaded */ - if (!g_umask) { - g_umask = p_umask(022); - (void)p_umask(g_umask); - } - - git_libgit2_opts(GIT_OPT_GET_SEARCH_PATH, GIT_CONFIG_LEVEL_GLOBAL, - &_global_path); -} - -void test_repo_init__cleanup(void) -{ - git_libgit2_opts(GIT_OPT_SET_SEARCH_PATH, GIT_CONFIG_LEVEL_GLOBAL, - _global_path.ptr); - git_buf_free(&_global_path); - - if (_tmp_path.size > 0 && git_path_isdir(_tmp_path.ptr)) - git_futils_rmdir_r(_tmp_path.ptr, NULL, GIT_RMDIR_REMOVE_FILES); - git_buf_free(&_tmp_path); -} - -static void cleanup_repository(void *path) -{ - git_repository_free(_repo); - _repo = NULL; - - cl_fixture_cleanup((const char *)path); -} - -static void ensure_repository_init( - const char *working_directory, - int is_bare, - const char *expected_path_repository, - const char *expected_working_directory) -{ - const char *workdir; - - cl_assert(!git_path_isdir(working_directory)); - - cl_git_pass(git_repository_init(&_repo, working_directory, is_bare)); - - workdir = git_repository_workdir(_repo); - if (workdir != NULL || expected_working_directory != NULL) { - cl_assert( - git__suffixcmp(workdir, expected_working_directory) == 0 - ); - } - - cl_assert( - git__suffixcmp(git_repository_path(_repo), expected_path_repository) == 0 - ); - - cl_assert(git_repository_is_bare(_repo) == is_bare); - -#ifdef GIT_WIN32 - if (!is_bare) { - DWORD fattrs = GetFileAttributes(git_repository_path(_repo)); - cl_assert((fattrs & FILE_ATTRIBUTE_HIDDEN) != 0); - } -#endif - - cl_assert(git_repository_is_empty(_repo)); -} - -void test_repo_init__standard_repo(void) -{ - cl_set_cleanup(&cleanup_repository, "testrepo"); - ensure_repository_init("testrepo/", 0, "testrepo/.git/", "testrepo/"); -} - -void test_repo_init__standard_repo_noslash(void) -{ - cl_set_cleanup(&cleanup_repository, "testrepo"); - ensure_repository_init("testrepo", 0, "testrepo/.git/", "testrepo/"); -} - -void test_repo_init__bare_repo(void) -{ - cl_set_cleanup(&cleanup_repository, "testrepo.git"); - ensure_repository_init("testrepo.git/", 1, "testrepo.git/", NULL); -} - -void test_repo_init__bare_repo_noslash(void) -{ - cl_set_cleanup(&cleanup_repository, "testrepo.git"); - ensure_repository_init("testrepo.git", 1, "testrepo.git/", NULL); -} - -void test_repo_init__bare_repo_escaping_current_workdir(void) -{ - git_buf path_repository = GIT_BUF_INIT; - git_buf path_current_workdir = GIT_BUF_INIT; - - cl_git_pass(git_path_prettify_dir(&path_current_workdir, ".", NULL)); - - cl_git_pass(git_buf_joinpath(&path_repository, git_buf_cstr(&path_current_workdir), "a/b/c")); - cl_git_pass(git_futils_mkdir_r(git_buf_cstr(&path_repository), GIT_DIR_MODE)); - - /* Change the current working directory */ - cl_git_pass(chdir(git_buf_cstr(&path_repository))); - - /* Initialize a bare repo with a relative path escaping out of the current working directory */ - cl_git_pass(git_repository_init(&_repo, "../d/e.git", 1)); - cl_git_pass(git__suffixcmp(git_repository_path(_repo), "/a/b/d/e.git/")); - - git_repository_free(_repo); - - /* Open a bare repo with a relative path escaping out of the current working directory */ - cl_git_pass(git_repository_open(&_repo, "../d/e.git")); - - cl_git_pass(chdir(git_buf_cstr(&path_current_workdir))); - - git_buf_free(&path_current_workdir); - git_buf_free(&path_repository); - - cleanup_repository("a"); -} - -void test_repo_init__reinit_bare_repo(void) -{ - cl_set_cleanup(&cleanup_repository, "reinit.git"); - - /* Initialize the repository */ - cl_git_pass(git_repository_init(&_repo, "reinit.git", 1)); - git_repository_free(_repo); - - /* Reinitialize the repository */ - cl_git_pass(git_repository_init(&_repo, "reinit.git", 1)); -} - -void test_repo_init__reinit_too_recent_bare_repo(void) -{ - git_config *config; - - /* Initialize the repository */ - cl_git_pass(git_repository_init(&_repo, "reinit.git", 1)); - git_repository_config(&config, _repo); - - /* - * Hack the config of the repository to make it look like it has - * been created by a recenter version of git/libgit2 - */ - cl_git_pass(git_config_set_int32(config, "core.repositoryformatversion", 42)); - - git_config_free(config); - git_repository_free(_repo); - - /* Try to reinitialize the repository */ - cl_git_fail(git_repository_init(&_repo, "reinit.git", 1)); - - cl_fixture_cleanup("reinit.git"); -} - -void test_repo_init__additional_templates(void) -{ - git_buf path = GIT_BUF_INIT; - - cl_set_cleanup(&cleanup_repository, "tester"); - - ensure_repository_init("tester", 0, "tester/.git/", "tester/"); - - cl_git_pass( - git_buf_joinpath(&path, git_repository_path(_repo), "description")); - cl_assert(git_path_isfile(git_buf_cstr(&path))); - - cl_git_pass( - git_buf_joinpath(&path, git_repository_path(_repo), "info/exclude")); - cl_assert(git_path_isfile(git_buf_cstr(&path))); - - cl_git_pass( - git_buf_joinpath(&path, git_repository_path(_repo), "hooks")); - cl_assert(git_path_isdir(git_buf_cstr(&path))); - /* won't confirm specific contents of hooks dir since it may vary */ - - git_buf_free(&path); -} - -static void assert_config_entry_on_init_bytype( - const char *config_key, int expected_value, bool is_bare) -{ - git_config *config; - int error, current_value; - const char *repo_path = is_bare ? - "config_entry/test.bare.git" : "config_entry/test.non.bare.git"; - - cl_set_cleanup(&cleanup_repository, "config_entry"); - - cl_git_pass(git_repository_init(&_repo, repo_path, is_bare)); - - cl_git_pass(git_repository_config(&config, _repo)); - error = git_config_get_bool(¤t_value, config, config_key); - git_config_free(config); - - if (expected_value >= 0) { - cl_assert_equal_i(0, error); - cl_assert_equal_i(expected_value, current_value); - } else { - cl_assert_equal_i(expected_value, error); - } -} - -static void assert_config_entry_on_init( - const char *config_key, int expected_value) -{ - assert_config_entry_on_init_bytype(config_key, expected_value, true); - git_repository_free(_repo); - - assert_config_entry_on_init_bytype(config_key, expected_value, false); -} - -void test_repo_init__detect_filemode(void) -{ - assert_config_entry_on_init("core.filemode", cl_is_chmod_supported()); -} - -void test_repo_init__detect_ignorecase(void) -{ - struct stat st; - bool found_without_match; - - cl_git_write2file("testCAPS", "whatever\n", 0, O_CREAT | O_WRONLY, 0666); - found_without_match = (p_stat("Testcaps", &st) == 0); - cl_must_pass(p_unlink("testCAPS")); - - assert_config_entry_on_init( - "core.ignorecase", found_without_match ? true : GIT_ENOTFOUND); -} - -void test_repo_init__detect_precompose_unicode_required(void) -{ -#ifdef GIT_USE_ICONV - char *composed = "ḱṷṓn", *decomposed = "kÌuÌ­oÌ„Ìn"; - struct stat st; - bool found_with_nfd; - - cl_git_write2file(composed, "whatever\n", 0, O_CREAT | O_WRONLY, 0666); - found_with_nfd = (p_stat(decomposed, &st) == 0); - cl_must_pass(p_unlink(composed)); - - assert_config_entry_on_init("core.precomposeunicode", found_with_nfd); -#else - assert_config_entry_on_init("core.precomposeunicode", GIT_ENOTFOUND); -#endif -} - -void test_repo_init__reinit_doesnot_overwrite_ignorecase(void) -{ - git_config *config; - int current_value; - - /* Init a new repo */ - cl_set_cleanup(&cleanup_repository, "not.overwrite.git"); - cl_git_pass(git_repository_init(&_repo, "not.overwrite.git", 1)); - - /* Change the "core.ignorecase" config value to something unlikely */ - git_repository_config(&config, _repo); - git_config_set_int32(config, "core.ignorecase", 42); - git_config_free(config); - git_repository_free(_repo); - _repo = NULL; - - /* Reinit the repository */ - cl_git_pass(git_repository_init(&_repo, "not.overwrite.git", 1)); - git_repository_config(&config, _repo); - - /* Ensure the "core.ignorecase" config value hasn't been updated */ - cl_git_pass(git_config_get_int32(¤t_value, config, "core.ignorecase")); - cl_assert_equal_i(42, current_value); - - git_config_free(config); -} - -void test_repo_init__reinit_overwrites_filemode(void) -{ - int expected = cl_is_chmod_supported(), current_value; - - /* Init a new repo */ - cl_set_cleanup(&cleanup_repository, "overwrite.git"); - cl_git_pass(git_repository_init(&_repo, "overwrite.git", 1)); - - /* Change the "core.filemode" config value to something unlikely */ - cl_repo_set_bool(_repo, "core.filemode", !expected); - - git_repository_free(_repo); - _repo = NULL; - - /* Reinit the repository */ - cl_git_pass(git_repository_init(&_repo, "overwrite.git", 1)); - - /* Ensure the "core.filemode" config value has been reset */ - current_value = cl_repo_get_bool(_repo, "core.filemode"); - cl_assert_equal_i(expected, current_value); -} - -void test_repo_init__sets_logAllRefUpdates_according_to_type_of_repository(void) -{ - assert_config_entry_on_init_bytype("core.logallrefupdates", GIT_ENOTFOUND, true); - git_repository_free(_repo); - assert_config_entry_on_init_bytype("core.logallrefupdates", true, false); -} - -void test_repo_init__extended_0(void) -{ - git_repository_init_options opts = GIT_REPOSITORY_INIT_OPTIONS_INIT; - - /* without MKDIR this should fail */ - cl_git_fail(git_repository_init_ext(&_repo, "extended", &opts)); - - /* make the directory first, then it should succeed */ - cl_git_pass(git_futils_mkdir("extended", 0775, 0)); - cl_git_pass(git_repository_init_ext(&_repo, "extended", &opts)); - - cl_assert(!git__suffixcmp(git_repository_workdir(_repo), "/extended/")); - cl_assert(!git__suffixcmp(git_repository_path(_repo), "/extended/.git/")); - cl_assert(!git_repository_is_bare(_repo)); - cl_assert(git_repository_is_empty(_repo)); - - cleanup_repository("extended"); -} - -void test_repo_init__extended_1(void) -{ - git_reference *ref; - git_remote *remote; - struct stat st; - git_repository_init_options opts = GIT_REPOSITORY_INIT_OPTIONS_INIT; - - opts.flags = GIT_REPOSITORY_INIT_MKPATH | - GIT_REPOSITORY_INIT_NO_DOTGIT_DIR; - opts.mode = GIT_REPOSITORY_INIT_SHARED_GROUP; - opts.workdir_path = "../c_wd"; - opts.description = "Awesomest test repository evah"; - opts.initial_head = "development"; - opts.origin_url = "https://github.com/libgit2/libgit2.git"; - - cl_git_pass(git_repository_init_ext(&_repo, "root/b/c.git", &opts)); - - cl_assert(!git__suffixcmp(git_repository_workdir(_repo), "/c_wd/")); - cl_assert(!git__suffixcmp(git_repository_path(_repo), "/c.git/")); - cl_assert(git_path_isfile("root/b/c_wd/.git")); - cl_assert(!git_repository_is_bare(_repo)); - /* repo will not be counted as empty because we set head to "development" */ - cl_assert(!git_repository_is_empty(_repo)); - - cl_git_pass(git_path_lstat(git_repository_path(_repo), &st)); - cl_assert(S_ISDIR(st.st_mode)); - if (cl_is_chmod_supported()) - cl_assert((S_ISGID & st.st_mode) == S_ISGID); - else - cl_assert((S_ISGID & st.st_mode) == 0); - - cl_git_pass(git_reference_lookup(&ref, _repo, "HEAD")); - cl_assert(git_reference_type(ref) == GIT_REF_SYMBOLIC); - cl_assert_equal_s("refs/heads/development", git_reference_symbolic_target(ref)); - git_reference_free(ref); - - cl_git_pass(git_remote_lookup(&remote, _repo, "origin")); - cl_assert_equal_s("origin", git_remote_name(remote)); - cl_assert_equal_s(opts.origin_url, git_remote_url(remote)); - git_remote_free(remote); - - git_repository_free(_repo); - cl_fixture_cleanup("root"); -} - -void test_repo_init__relative_gitdir(void) -{ - git_repository_init_options opts = GIT_REPOSITORY_INIT_OPTIONS_INIT; - git_buf dot_git_content = GIT_BUF_INIT; - - opts.workdir_path = "../c_wd"; - opts.flags = - GIT_REPOSITORY_INIT_MKPATH | - GIT_REPOSITORY_INIT_RELATIVE_GITLINK | - GIT_REPOSITORY_INIT_NO_DOTGIT_DIR; - - /* make the directory first, then it should succeed */ - cl_git_pass(git_repository_init_ext(&_repo, "root/b/my_repository", &opts)); - - cl_assert(!git__suffixcmp(git_repository_workdir(_repo), "root/b/c_wd/")); - cl_assert(!git__suffixcmp(git_repository_path(_repo), "root/b/my_repository/")); - cl_assert(!git_repository_is_bare(_repo)); - cl_assert(git_repository_is_empty(_repo)); - - /* Verify that the gitlink and worktree entries are relative */ - - /* Verify worktree */ - assert_config_entry_value(_repo, "core.worktree", "../c_wd/"); - - /* Verify gitlink */ - cl_git_pass(git_futils_readbuffer(&dot_git_content, "root/b/c_wd/.git")); - cl_assert_equal_s("gitdir: ../my_repository/", dot_git_content.ptr); - - git_buf_free(&dot_git_content); - cleanup_repository("root"); -} - -void test_repo_init__relative_gitdir_2(void) -{ - git_repository_init_options opts = GIT_REPOSITORY_INIT_OPTIONS_INIT; - git_buf dot_git_content = GIT_BUF_INIT; - git_buf full_path = GIT_BUF_INIT; - - cl_git_pass(git_path_prettify(&full_path, ".", NULL)); - cl_git_pass(git_buf_joinpath(&full_path, full_path.ptr, "root/b/c_wd")); - - opts.workdir_path = full_path.ptr; - opts.flags = - GIT_REPOSITORY_INIT_MKPATH | - GIT_REPOSITORY_INIT_RELATIVE_GITLINK | - GIT_REPOSITORY_INIT_NO_DOTGIT_DIR; - - /* make the directory first, then it should succeed */ - cl_git_pass(git_repository_init_ext(&_repo, "root/b/my_repository", &opts)); - git_buf_free(&full_path); - - cl_assert(!git__suffixcmp(git_repository_workdir(_repo), "root/b/c_wd/")); - cl_assert(!git__suffixcmp(git_repository_path(_repo), "root/b/my_repository/")); - cl_assert(!git_repository_is_bare(_repo)); - cl_assert(git_repository_is_empty(_repo)); - - /* Verify that the gitlink and worktree entries are relative */ - - /* Verify worktree */ - assert_config_entry_value(_repo, "core.worktree", "../c_wd/"); - - /* Verify gitlink */ - cl_git_pass(git_futils_readbuffer(&dot_git_content, "root/b/c_wd/.git")); - cl_assert_equal_s("gitdir: ../my_repository/", dot_git_content.ptr); - - git_buf_free(&dot_git_content); - cleanup_repository("root"); -} - -#define CLEAR_FOR_CORE_FILEMODE(M) ((M) &= ~0177) - -static void assert_hooks_match( - const char *template_dir, - const char *repo_dir, - const char *hook_path, - bool core_filemode) -{ - git_buf expected = GIT_BUF_INIT; - git_buf actual = GIT_BUF_INIT; - struct stat expected_st, st; - - cl_git_pass(git_buf_joinpath(&expected, template_dir, hook_path)); - cl_git_pass(git_path_lstat(expected.ptr, &expected_st)); - - cl_git_pass(git_buf_joinpath(&actual, repo_dir, hook_path)); - cl_git_pass(git_path_lstat(actual.ptr, &st)); - - cl_assert(expected_st.st_size == st.st_size); - - if (GIT_MODE_TYPE(expected_st.st_mode) != GIT_FILEMODE_LINK) { - mode_t expected_mode = - GIT_MODE_TYPE(expected_st.st_mode) | - (GIT_PERMS_FOR_WRITE(expected_st.st_mode) & ~g_umask); - - if (!core_filemode) { - CLEAR_FOR_CORE_FILEMODE(expected_mode); - CLEAR_FOR_CORE_FILEMODE(st.st_mode); - } - - cl_assert_equal_i_fmt(expected_mode, st.st_mode, "%07o"); - } - - git_buf_free(&expected); - git_buf_free(&actual); -} - -static void assert_mode_seems_okay( - const char *base, const char *path, - git_filemode_t expect_mode, bool expect_setgid, bool core_filemode) -{ - git_buf full = GIT_BUF_INIT; - struct stat st; - - cl_git_pass(git_buf_joinpath(&full, base, path)); - cl_git_pass(git_path_lstat(full.ptr, &st)); - git_buf_free(&full); - - if (!core_filemode) { - CLEAR_FOR_CORE_FILEMODE(expect_mode); - CLEAR_FOR_CORE_FILEMODE(st.st_mode); - expect_setgid = false; - } - - if (S_ISGID != 0) - cl_assert_equal_b(expect_setgid, (st.st_mode & S_ISGID) != 0); - - cl_assert_equal_b( - GIT_PERMS_IS_EXEC(expect_mode), GIT_PERMS_IS_EXEC(st.st_mode)); - - cl_assert_equal_i_fmt( - GIT_MODE_TYPE(expect_mode), GIT_MODE_TYPE(st.st_mode), "%07o"); -} - -static const char *template_sandbox(const char *name) -{ - git_buf hooks_path = GIT_BUF_INIT, link_path = GIT_BUF_INIT, - dotfile_path = GIT_BUF_INIT; - const char *path = cl_fixture(name); - - cl_fixture_sandbox(name); - - /* create a symlink from link.sample to update.sample if the filesystem - * supports it. - */ - - cl_git_pass(git_buf_joinpath(&hooks_path, name, "hooks")); - cl_git_pass(git_buf_joinpath(&link_path, hooks_path.ptr, "link.sample")); - -#ifdef GIT_WIN32 - cl_git_mkfile(link_path.ptr, "#!/bin/sh\necho hello, world\n"); -#else - cl_must_pass(symlink("update.sample", link_path.ptr)); -#endif - - /* create a file starting with a dot */ - cl_git_pass(git_buf_joinpath(&dotfile_path, hooks_path.ptr, ".dotfile")); - cl_git_mkfile(dotfile_path.ptr, "something\n"); - git_buf_free(&dotfile_path); - - git_buf_free(&dotfile_path); - git_buf_free(&link_path); - git_buf_free(&hooks_path); - - return path; -} - -static void configure_templatedir(const char *template_path) -{ - git_buf config_path = GIT_BUF_INIT; - git_buf config_data = GIT_BUF_INIT; - - cl_git_pass(git_libgit2_opts(GIT_OPT_GET_SEARCH_PATH, - GIT_CONFIG_LEVEL_GLOBAL, &_tmp_path)); - cl_git_pass(git_buf_puts(&_tmp_path, ".tmp")); - cl_git_pass(git_libgit2_opts(GIT_OPT_SET_SEARCH_PATH, - GIT_CONFIG_LEVEL_GLOBAL, _tmp_path.ptr)); - - cl_must_pass(p_mkdir(_tmp_path.ptr, 0777)); - - cl_git_pass(git_buf_joinpath(&config_path, _tmp_path.ptr, ".gitconfig")); - - cl_git_pass(git_buf_printf(&config_data, - "[init]\n\ttemplatedir = \"%s\"\n", template_path)); - - cl_git_mkfile(config_path.ptr, config_data.ptr); - - git_buf_free(&config_path); - git_buf_free(&config_data); -} - -static void validate_templates(git_repository *repo, const char *template_path) -{ - git_buf template_description = GIT_BUF_INIT; - git_buf repo_description = GIT_BUF_INIT; - git_buf expected = GIT_BUF_INIT; - git_buf actual = GIT_BUF_INIT; - int filemode; - - cl_git_pass(git_buf_joinpath(&template_description, template_path, - "description")); - cl_git_pass(git_buf_joinpath(&repo_description, git_repository_path(repo), - "description")); - - cl_git_pass(git_futils_readbuffer(&expected, template_description.ptr)); - cl_git_pass(git_futils_readbuffer(&actual, repo_description.ptr)); - - cl_assert_equal_s(expected.ptr, actual.ptr); - - filemode = cl_repo_get_bool(repo, "core.filemode"); - - assert_hooks_match( - template_path, git_repository_path(repo), - "hooks/update.sample", filemode); - - assert_hooks_match( - template_path, git_repository_path(repo), - "hooks/link.sample", filemode); - - assert_hooks_match( - template_path, git_repository_path(repo), - "hooks/.dotfile", filemode); - - git_buf_free(&expected); - git_buf_free(&actual); - git_buf_free(&repo_description); - git_buf_free(&template_description); -} - -void test_repo_init__external_templates_specified_in_options(void) -{ - git_repository_init_options opts = GIT_REPOSITORY_INIT_OPTIONS_INIT; - - cl_set_cleanup(&cleanup_repository, "templated.git"); - template_sandbox("template"); - - opts.flags = GIT_REPOSITORY_INIT_MKPATH | GIT_REPOSITORY_INIT_BARE | - GIT_REPOSITORY_INIT_EXTERNAL_TEMPLATE; - opts.template_path = "template"; - - cl_git_pass(git_repository_init_ext(&_repo, "templated.git", &opts)); - - cl_assert(git_repository_is_bare(_repo)); - - cl_assert(!git__suffixcmp(git_repository_path(_repo), "/templated.git/")); - - validate_templates(_repo, "template"); - cl_fixture_cleanup("template"); -} - -void test_repo_init__external_templates_specified_in_config(void) -{ - git_buf template_path = GIT_BUF_INIT; - - git_repository_init_options opts = GIT_REPOSITORY_INIT_OPTIONS_INIT; - - cl_set_cleanup(&cleanup_repository, "templated.git"); - template_sandbox("template"); - - cl_git_pass(git_buf_joinpath(&template_path, clar_sandbox_path(), - "template")); - - configure_templatedir(template_path.ptr); - - opts.flags = GIT_REPOSITORY_INIT_MKPATH | GIT_REPOSITORY_INIT_BARE | - GIT_REPOSITORY_INIT_EXTERNAL_TEMPLATE; - - cl_git_pass(git_repository_init_ext(&_repo, "templated.git", &opts)); - - validate_templates(_repo, "template"); - cl_fixture_cleanup("template"); - - git_buf_free(&template_path); -} - -void test_repo_init__external_templates_with_leading_dot(void) -{ - git_buf template_path = GIT_BUF_INIT; - - git_repository_init_options opts = GIT_REPOSITORY_INIT_OPTIONS_INIT; - - cl_set_cleanup(&cleanup_repository, "templated.git"); - template_sandbox("template"); - - cl_must_pass(p_rename("template", ".template_with_leading_dot")); - - cl_git_pass(git_buf_joinpath(&template_path, clar_sandbox_path(), - ".template_with_leading_dot")); - - configure_templatedir(template_path.ptr); - - opts.flags = GIT_REPOSITORY_INIT_MKPATH | GIT_REPOSITORY_INIT_BARE | - GIT_REPOSITORY_INIT_EXTERNAL_TEMPLATE; - - cl_git_pass(git_repository_init_ext(&_repo, "templated.git", &opts)); - - validate_templates(_repo, ".template_with_leading_dot"); - cl_fixture_cleanup(".template_with_leading_dot"); - - git_buf_free(&template_path); -} - -void test_repo_init__extended_with_template_and_shared_mode(void) -{ - git_repository_init_options opts = GIT_REPOSITORY_INIT_OPTIONS_INIT; - int filemode = true; - const char *repo_path = NULL; - - cl_set_cleanup(&cleanup_repository, "init_shared_from_tpl"); - template_sandbox("template"); - - opts.flags = GIT_REPOSITORY_INIT_MKPATH | - GIT_REPOSITORY_INIT_EXTERNAL_TEMPLATE; - opts.template_path = "template"; - opts.mode = GIT_REPOSITORY_INIT_SHARED_GROUP; - - cl_git_pass(git_repository_init_ext(&_repo, "init_shared_from_tpl", &opts)); - - cl_assert(!git_repository_is_bare(_repo)); - cl_assert(!git__suffixcmp(git_repository_path(_repo), "/init_shared_from_tpl/.git/")); - - filemode = cl_repo_get_bool(_repo, "core.filemode"); - - repo_path = git_repository_path(_repo); - assert_mode_seems_okay(repo_path, "hooks", - GIT_FILEMODE_TREE | GIT_REPOSITORY_INIT_SHARED_GROUP, true, filemode); - assert_mode_seems_okay(repo_path, "info", - GIT_FILEMODE_TREE | GIT_REPOSITORY_INIT_SHARED_GROUP, true, filemode); - assert_mode_seems_okay(repo_path, "description", - GIT_FILEMODE_BLOB, false, filemode); - - validate_templates(_repo, "template"); - - cl_fixture_cleanup("template"); -} - -void test_repo_init__can_reinit_an_initialized_repository(void) -{ - git_repository *reinit; - - cl_set_cleanup(&cleanup_repository, "extended"); - - cl_git_pass(git_futils_mkdir("extended", 0775, 0)); - cl_git_pass(git_repository_init(&_repo, "extended", false)); - - cl_git_pass(git_repository_init(&reinit, "extended", false)); - - cl_assert_equal_s(git_repository_path(_repo), git_repository_path(reinit)); - - git_repository_free(reinit); -} - -void test_repo_init__init_with_initial_commit(void) -{ - git_index *index; - - cl_set_cleanup(&cleanup_repository, "committed"); - - /* Initialize the repository */ - cl_git_pass(git_repository_init(&_repo, "committed", 0)); - - /* Init will be automatically created when requested for a new repo */ - cl_git_pass(git_repository_index(&index, _repo)); - - /* Create a file so we can commit it - * - * If you are writing code outside the test suite, you can create this - * file any way that you like, such as: - * FILE *fp = fopen("committed/file.txt", "w"); - * fputs("some stuff\n", fp); - * fclose(fp); - * We like to use the help functions because they do error detection - * in a way that's easily compatible with our test suite. - */ - cl_git_mkfile("committed/file.txt", "some stuff\n"); - - /* Add file to the index */ - cl_git_pass(git_index_add_bypath(index, "file.txt")); - cl_git_pass(git_index_write(index)); - - /* Intentionally not using cl_repo_commit_from_index here so this code - * can be used as an example of how an initial commit is typically - * made to a repository... - */ - - /* Make sure we're ready to use git_signature_default :-) */ - { - git_config *cfg, *local; - cl_git_pass(git_repository_config(&cfg, _repo)); - cl_git_pass(git_config_open_level(&local, cfg, GIT_CONFIG_LEVEL_LOCAL)); - cl_git_pass(git_config_set_string(local, "user.name", "Test User")); - cl_git_pass(git_config_set_string(local, "user.email", "t@example.com")); - git_config_free(local); - git_config_free(cfg); - } - - /* Create a commit with the new contents of the index */ - { - git_signature *sig; - git_oid tree_id, commit_id; - git_tree *tree; - - cl_git_pass(git_signature_default(&sig, _repo)); - cl_git_pass(git_index_write_tree(&tree_id, index)); - cl_git_pass(git_tree_lookup(&tree, _repo, &tree_id)); - - cl_git_pass(git_commit_create_v( - &commit_id, _repo, "HEAD", sig, sig, - NULL, "First", tree, 0)); - - git_tree_free(tree); - git_signature_free(sig); - } - - git_index_free(index); -} - -void test_repo_init__at_filesystem_root(void) -{ - git_repository *repo; - const char *sandbox = clar_sandbox_path(); - git_buf root = GIT_BUF_INIT; - int root_len; - - if (!cl_is_env_set("GITTEST_INVASIVE_FS_STRUCTURE")) - cl_skip(); - - root_len = git_path_root(sandbox); - cl_assert(root_len >= 0); - - git_buf_put(&root, sandbox, root_len+1); - git_buf_joinpath(&root, root.ptr, "libgit2_test_dir"); - - cl_assert(!git_path_exists(root.ptr)); - - cl_git_pass(git_repository_init(&repo, root.ptr, 0)); - cl_assert(git_path_isdir(root.ptr)); - cl_git_pass(git_futils_rmdir_r(root.ptr, NULL, GIT_RMDIR_REMOVE_FILES)); - - git_buf_free(&root); - git_repository_free(repo); -} diff --git a/vendor/libgit2/tests/repo/iterator.c b/vendor/libgit2/tests/repo/iterator.c deleted file mode 100644 index 6b5795b9c..000000000 --- a/vendor/libgit2/tests/repo/iterator.c +++ /dev/null @@ -1,1549 +0,0 @@ -#include "clar_libgit2.h" -#include "iterator.h" -#include "repository.h" -#include "fileops.h" -#include - -static git_repository *g_repo; - -void test_repo_iterator__initialize(void) -{ -} - -void test_repo_iterator__cleanup(void) -{ - cl_git_sandbox_cleanup(); - g_repo = NULL; -} - -static void expect_iterator_items( - git_iterator *i, - int expected_flat, - const char **expected_flat_paths, - int expected_total, - const char **expected_total_paths) -{ - const git_index_entry *entry; - int count, error; - int no_trees = !(git_iterator_flags(i) & GIT_ITERATOR_INCLUDE_TREES); - bool v = false; - - if (expected_flat < 0) { v = true; expected_flat = -expected_flat; } - if (expected_total < 0) { v = true; expected_total = -expected_total; } - - if (v) fprintf(stderr, "== %s ==\n", no_trees ? "notrees" : "trees"); - - count = 0; - - while (!git_iterator_advance(&entry, i)) { - if (v) fprintf(stderr, " %s %07o\n", entry->path, (int)entry->mode); - - if (no_trees) - cl_assert(entry->mode != GIT_FILEMODE_TREE); - - if (expected_flat_paths) { - const char *expect_path = expected_flat_paths[count]; - size_t expect_len = strlen(expect_path); - - cl_assert_equal_s(expect_path, entry->path); - - if (expect_path[expect_len - 1] == '/') - cl_assert_equal_i(GIT_FILEMODE_TREE, entry->mode); - else - cl_assert(entry->mode != GIT_FILEMODE_TREE); - } - - if (++count > expected_flat) - break; - } - - cl_assert_equal_i(expected_flat, count); - - cl_git_pass(git_iterator_reset(i, NULL, NULL)); - - count = 0; - cl_git_pass(git_iterator_current(&entry, i)); - - if (v) fprintf(stderr, "-- %s --\n", no_trees ? "notrees" : "trees"); - - while (entry != NULL) { - if (v) fprintf(stderr, " %s %07o\n", entry->path, (int)entry->mode); - - if (no_trees) - cl_assert(entry->mode != GIT_FILEMODE_TREE); - - if (expected_total_paths) { - const char *expect_path = expected_total_paths[count]; - size_t expect_len = strlen(expect_path); - - cl_assert_equal_s(expect_path, entry->path); - - if (expect_path[expect_len - 1] == '/') - cl_assert_equal_i(GIT_FILEMODE_TREE, entry->mode); - else - cl_assert(entry->mode != GIT_FILEMODE_TREE); - } - - if (entry->mode == GIT_FILEMODE_TREE) { - error = git_iterator_advance_into(&entry, i); - - /* could return NOTFOUND if directory is empty */ - cl_assert(!error || error == GIT_ENOTFOUND); - - if (error == GIT_ENOTFOUND) { - error = git_iterator_advance(&entry, i); - cl_assert(!error || error == GIT_ITEROVER); - } - } else { - error = git_iterator_advance(&entry, i); - cl_assert(!error || error == GIT_ITEROVER); - } - - if (++count > expected_total) - break; - } - - cl_assert_equal_i(expected_total, count); -} - -/* Index contents (including pseudotrees): - * - * 0: a 5: F 10: k/ 16: L/ - * 1: B 6: g 11: k/1 17: L/1 - * 2: c 7: H 12: k/a 18: L/a - * 3: D 8: i 13: k/B 19: L/B - * 4: e 9: J 14: k/c 20: L/c - * 15: k/D 21: L/D - * - * 0: B 5: L/ 11: a 16: k/ - * 1: D 6: L/1 12: c 17: k/1 - * 2: F 7: L/B 13: e 18: k/B - * 3: H 8: L/D 14: g 19: k/D - * 4: J 9: L/a 15: i 20: k/a - * 10: L/c 21: k/c - */ - -void test_repo_iterator__index(void) -{ - git_iterator *i; - git_iterator_options i_opts = GIT_ITERATOR_OPTIONS_INIT; - git_index *index; - - g_repo = cl_git_sandbox_init("icase"); - - cl_git_pass(git_repository_index(&index, g_repo)); - - /* autoexpand with no tree entries for index */ - cl_git_pass(git_iterator_for_index(&i, g_repo, index, NULL)); - expect_iterator_items(i, 20, NULL, 20, NULL); - git_iterator_free(i); - - /* auto expand with tree entries */ - i_opts.flags = GIT_ITERATOR_INCLUDE_TREES; - cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts)); - expect_iterator_items(i, 22, NULL, 22, NULL); - git_iterator_free(i); - - /* no auto expand (implies trees included) */ - i_opts.flags = GIT_ITERATOR_DONT_AUTOEXPAND; - cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts)); - expect_iterator_items(i, 12, NULL, 22, NULL); - git_iterator_free(i); - - git_index_free(index); -} - -void test_repo_iterator__index_icase(void) -{ - git_iterator *i; - git_iterator_options i_opts = GIT_ITERATOR_OPTIONS_INIT; - git_index *index; - int caps; - - g_repo = cl_git_sandbox_init("icase"); - - cl_git_pass(git_repository_index(&index, g_repo)); - caps = git_index_caps(index); - - /* force case sensitivity */ - cl_git_pass(git_index_set_caps(index, caps & ~GIT_INDEXCAP_IGNORE_CASE)); - - /* autoexpand with no tree entries over range */ - i_opts.start = "c"; - i_opts.end = "k/D"; - cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts)); - expect_iterator_items(i, 7, NULL, 7, NULL); - git_iterator_free(i); - - i_opts.start = "k"; - i_opts.end = "k/Z"; - cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts)); - expect_iterator_items(i, 3, NULL, 3, NULL); - git_iterator_free(i); - - /* auto expand with tree entries */ - i_opts.flags = GIT_ITERATOR_INCLUDE_TREES; - - i_opts.start = "c"; - i_opts.end = "k/D"; - cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts)); - expect_iterator_items(i, 8, NULL, 8, NULL); - git_iterator_free(i); - - i_opts.start = "k"; - i_opts.end = "k/Z"; - cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts)); - expect_iterator_items(i, 4, NULL, 4, NULL); - git_iterator_free(i); - - /* no auto expand (implies trees included) */ - i_opts.flags = GIT_ITERATOR_DONT_AUTOEXPAND; - - i_opts.start = "c"; - i_opts.end = "k/D"; - cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts)); - expect_iterator_items(i, 5, NULL, 8, NULL); - git_iterator_free(i); - - i_opts.start = "k"; - i_opts.end = "k/Z"; - cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts)); - expect_iterator_items(i, 1, NULL, 4, NULL); - git_iterator_free(i); - - /* force case insensitivity */ - cl_git_pass(git_index_set_caps(index, caps | GIT_INDEXCAP_IGNORE_CASE)); - - /* autoexpand with no tree entries over range */ - i_opts.flags = 0; - - i_opts.start = "c"; - i_opts.end = "k/D"; - cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts)); - expect_iterator_items(i, 13, NULL, 13, NULL); - git_iterator_free(i); - - i_opts.start = "k"; - i_opts.end = "k/Z"; - cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts)); - expect_iterator_items(i, 5, NULL, 5, NULL); - git_iterator_free(i); - - /* auto expand with tree entries */ - i_opts.flags = GIT_ITERATOR_INCLUDE_TREES; - - i_opts.start = "c"; - i_opts.end = "k/D"; - cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts)); - expect_iterator_items(i, 14, NULL, 14, NULL); - git_iterator_free(i); - - i_opts.start = "k"; - i_opts.end = "k/Z"; - cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts)); - expect_iterator_items(i, 6, NULL, 6, NULL); - git_iterator_free(i); - - /* no auto expand (implies trees included) */ - i_opts.flags = GIT_ITERATOR_DONT_AUTOEXPAND; - - i_opts.start = "c"; - i_opts.end = "k/D"; - cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts)); - expect_iterator_items(i, 9, NULL, 14, NULL); - git_iterator_free(i); - - i_opts.start = "k"; - i_opts.end = "k/Z"; - cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts)); - expect_iterator_items(i, 1, NULL, 6, NULL); - git_iterator_free(i); - - cl_git_pass(git_index_set_caps(index, caps)); - git_index_free(index); -} - -void test_repo_iterator__tree(void) -{ - git_iterator *i; - git_iterator_options i_opts = GIT_ITERATOR_OPTIONS_INIT; - git_tree *head; - - g_repo = cl_git_sandbox_init("icase"); - - cl_git_pass(git_repository_head_tree(&head, g_repo)); - - /* auto expand with no tree entries */ - cl_git_pass(git_iterator_for_tree(&i, head, NULL)); - expect_iterator_items(i, 20, NULL, 20, NULL); - git_iterator_free(i); - - /* auto expand with tree entries */ - i_opts.flags = GIT_ITERATOR_INCLUDE_TREES; - - cl_git_pass(git_iterator_for_tree(&i, head, &i_opts)); - expect_iterator_items(i, 22, NULL, 22, NULL); - git_iterator_free(i); - - /* no auto expand (implies trees included) */ - i_opts.flags = GIT_ITERATOR_DONT_AUTOEXPAND; - - cl_git_pass(git_iterator_for_tree(&i, head, &i_opts)); - expect_iterator_items(i, 12, NULL, 22, NULL); - git_iterator_free(i); - - git_tree_free(head); -} - -void test_repo_iterator__tree_icase(void) -{ - git_iterator *i; - git_tree *head; - git_iterator_options i_opts = GIT_ITERATOR_OPTIONS_INIT; - - g_repo = cl_git_sandbox_init("icase"); - - cl_git_pass(git_repository_head_tree(&head, g_repo)); - - i_opts.flags = GIT_ITERATOR_DONT_IGNORE_CASE; - - /* auto expand with no tree entries */ - i_opts.start = "c"; - i_opts.end = "k/D"; - cl_git_pass(git_iterator_for_tree(&i, head, &i_opts)); - expect_iterator_items(i, 7, NULL, 7, NULL); - git_iterator_free(i); - - i_opts.start = "k"; - i_opts.end = "k/Z"; - cl_git_pass(git_iterator_for_tree(&i, head, &i_opts)); - expect_iterator_items(i, 3, NULL, 3, NULL); - git_iterator_free(i); - - i_opts.flags = GIT_ITERATOR_DONT_IGNORE_CASE | GIT_ITERATOR_INCLUDE_TREES; - - /* auto expand with tree entries */ - i_opts.start = "c"; - i_opts.end = "k/Z"; - cl_git_pass(git_iterator_for_tree(&i, head, &i_opts)); - expect_iterator_items(i, 8, NULL, 8, NULL); - git_iterator_free(i); - - i_opts.start = "k"; - i_opts.end = "k/Z"; - cl_git_pass(git_iterator_for_tree(&i, head, &i_opts)); - expect_iterator_items(i, 4, NULL, 4, NULL); - git_iterator_free(i); - - /* no auto expand (implies trees included) */ - i_opts.flags = GIT_ITERATOR_DONT_IGNORE_CASE | GIT_ITERATOR_DONT_AUTOEXPAND; - i_opts.start = "c"; - i_opts.end = "k/D"; - cl_git_pass(git_iterator_for_tree(&i, head, &i_opts)); - expect_iterator_items(i, 5, NULL, 8, NULL); - git_iterator_free(i); - - i_opts.start = "k"; - i_opts.end = "k/D"; - cl_git_pass(git_iterator_for_tree(&i, head, &i_opts)); - expect_iterator_items(i, 1, NULL, 4, NULL); - git_iterator_free(i); - - /* auto expand with no tree entries */ - i_opts.flags = GIT_ITERATOR_IGNORE_CASE; - - i_opts.start = "c"; - i_opts.end = "k/D"; - cl_git_pass(git_iterator_for_tree(&i, head, &i_opts)); - expect_iterator_items(i, 13, NULL, 13, NULL); - git_iterator_free(i); - - i_opts.start = "k"; - i_opts.end = "k/Z"; - cl_git_pass(git_iterator_for_tree(&i, head, &i_opts)); - expect_iterator_items(i, 5, NULL, 5, NULL); - git_iterator_free(i); - - /* auto expand with tree entries */ - i_opts.flags = GIT_ITERATOR_IGNORE_CASE | GIT_ITERATOR_INCLUDE_TREES; - - i_opts.start = "c"; - i_opts.end = "k/D"; - cl_git_pass(git_iterator_for_tree(&i, head, &i_opts)); - expect_iterator_items(i, 14, NULL, 14, NULL); - git_iterator_free(i); - - i_opts.start = "k"; - i_opts.end = "k/Z"; - cl_git_pass(git_iterator_for_tree(&i, head, &i_opts)); - expect_iterator_items(i, 6, NULL, 6, NULL); - git_iterator_free(i); - - /* no auto expand (implies trees included) */ - i_opts.flags = GIT_ITERATOR_IGNORE_CASE | GIT_ITERATOR_DONT_AUTOEXPAND; - - i_opts.start = "c"; - i_opts.end = "k/D"; - cl_git_pass(git_iterator_for_tree(&i, head, &i_opts)); - expect_iterator_items(i, 9, NULL, 14, NULL); - git_iterator_free(i); - - i_opts.start = "k"; - i_opts.end = "k/Z"; - cl_git_pass(git_iterator_for_tree(&i, head, &i_opts)); - expect_iterator_items(i, 1, NULL, 6, NULL); - git_iterator_free(i); - - git_tree_free(head); -} - -void test_repo_iterator__tree_more(void) -{ - git_iterator *i; - git_iterator_options i_opts = GIT_ITERATOR_OPTIONS_INIT; - git_tree *head; - static const char *expect_basic[] = { - "current_file", - "file_deleted", - "modified_file", - "staged_changes", - "staged_changes_file_deleted", - "staged_changes_modified_file", - "staged_delete_file_deleted", - "staged_delete_modified_file", - "subdir.txt", - "subdir/current_file", - "subdir/deleted_file", - "subdir/modified_file", - NULL, - }; - static const char *expect_trees[] = { - "current_file", - "file_deleted", - "modified_file", - "staged_changes", - "staged_changes_file_deleted", - "staged_changes_modified_file", - "staged_delete_file_deleted", - "staged_delete_modified_file", - "subdir.txt", - "subdir/", - "subdir/current_file", - "subdir/deleted_file", - "subdir/modified_file", - NULL, - }; - static const char *expect_noauto[] = { - "current_file", - "file_deleted", - "modified_file", - "staged_changes", - "staged_changes_file_deleted", - "staged_changes_modified_file", - "staged_delete_file_deleted", - "staged_delete_modified_file", - "subdir.txt", - "subdir/", - NULL - }; - - g_repo = cl_git_sandbox_init("status"); - - cl_git_pass(git_repository_head_tree(&head, g_repo)); - - /* auto expand with no tree entries */ - cl_git_pass(git_iterator_for_tree(&i, head, NULL)); - expect_iterator_items(i, 12, expect_basic, 12, expect_basic); - git_iterator_free(i); - - /* auto expand with tree entries */ - i_opts.flags = GIT_ITERATOR_INCLUDE_TREES; - - cl_git_pass(git_iterator_for_tree(&i, head, &i_opts)); - expect_iterator_items(i, 13, expect_trees, 13, expect_trees); - git_iterator_free(i); - - /* no auto expand (implies trees included) */ - i_opts.flags = GIT_ITERATOR_DONT_AUTOEXPAND; - - cl_git_pass(git_iterator_for_tree(&i, head, &i_opts)); - expect_iterator_items(i, 10, expect_noauto, 13, expect_trees); - git_iterator_free(i); - - git_tree_free(head); -} - -/* "b=name,t=name", blob_id, tree_id */ -static void build_test_tree( - git_oid *out, git_repository *repo, const char *fmt, ...) -{ - git_oid *id; - git_treebuilder *builder; - const char *scan = fmt, *next; - char type, delimiter; - git_filemode_t mode = GIT_FILEMODE_BLOB; - git_buf name = GIT_BUF_INIT; - va_list arglist; - - cl_git_pass(git_treebuilder_new(&builder, repo, NULL)); /* start builder */ - - va_start(arglist, fmt); - while (*scan) { - switch (type = *scan++) { - case 't': case 'T': mode = GIT_FILEMODE_TREE; break; - case 'b': case 'B': mode = GIT_FILEMODE_BLOB; break; - default: - cl_assert(type == 't' || type == 'T' || type == 'b' || type == 'B'); - } - - delimiter = *scan++; /* read and skip delimiter */ - for (next = scan; *next && *next != delimiter; ++next) - /* seek end */; - cl_git_pass(git_buf_set(&name, scan, (size_t)(next - scan))); - for (scan = next; *scan && (*scan == delimiter || *scan == ','); ++scan) - /* skip delimiter and optional comma */; - - id = va_arg(arglist, git_oid *); - - cl_git_pass(git_treebuilder_insert(NULL, builder, name.ptr, id, mode)); - } - va_end(arglist); - - cl_git_pass(git_treebuilder_write(out, builder)); - - git_treebuilder_free(builder); - git_buf_free(&name); -} - -void test_repo_iterator__tree_case_conflicts_0(void) -{ - const char *blob_sha = "d44e18fb93b7107b5cd1b95d601591d77869a1b6"; - git_tree *tree; - git_oid blob_id, biga_id, littlea_id, tree_id; - git_iterator *i; - git_iterator_options i_opts = GIT_ITERATOR_OPTIONS_INIT; - - const char *expect_cs[] = { - "A/1.file", "A/3.file", "a/2.file", "a/4.file" }; - const char *expect_ci[] = { - "A/1.file", "a/2.file", "A/3.file", "a/4.file" }; - const char *expect_cs_trees[] = { - "A/", "A/1.file", "A/3.file", "a/", "a/2.file", "a/4.file" }; - const char *expect_ci_trees[] = { - "A/", "A/1.file", "a/2.file", "A/3.file", "a/4.file" }; - - g_repo = cl_git_sandbox_init("icase"); - - cl_git_pass(git_oid_fromstr(&blob_id, blob_sha)); /* lookup blob */ - - /* create tree with: A/1.file, A/3.file, a/2.file, a/4.file */ - build_test_tree( - &biga_id, g_repo, "b|1.file|,b|3.file|", &blob_id, &blob_id); - build_test_tree( - &littlea_id, g_repo, "b|2.file|,b|4.file|", &blob_id, &blob_id); - build_test_tree( - &tree_id, g_repo, "t|A|,t|a|", &biga_id, &littlea_id); - - cl_git_pass(git_tree_lookup(&tree, g_repo, &tree_id)); - - i_opts.flags = GIT_ITERATOR_DONT_IGNORE_CASE; - cl_git_pass(git_iterator_for_tree(&i, tree, &i_opts)); - expect_iterator_items(i, 4, expect_cs, 4, expect_cs); - git_iterator_free(i); - - i_opts.flags = GIT_ITERATOR_IGNORE_CASE; - cl_git_pass(git_iterator_for_tree(&i, tree, &i_opts)); - expect_iterator_items(i, 4, expect_ci, 4, expect_ci); - git_iterator_free(i); - - i_opts.flags = GIT_ITERATOR_DONT_IGNORE_CASE | GIT_ITERATOR_INCLUDE_TREES; - cl_git_pass(git_iterator_for_tree(&i, tree, &i_opts)); - expect_iterator_items(i, 6, expect_cs_trees, 6, expect_cs_trees); - git_iterator_free(i); - - i_opts.flags = GIT_ITERATOR_IGNORE_CASE | GIT_ITERATOR_INCLUDE_TREES; - cl_git_pass(git_iterator_for_tree(&i, tree, &i_opts)); - expect_iterator_items(i, 5, expect_ci_trees, 5, expect_ci_trees); - git_iterator_free(i); - - git_tree_free(tree); -} - -void test_repo_iterator__tree_case_conflicts_1(void) -{ - const char *blob_sha = "d44e18fb93b7107b5cd1b95d601591d77869a1b6"; - git_tree *tree; - git_oid blob_id, Ab_id, biga_id, littlea_id, tree_id; - git_iterator *i; - git_iterator_options i_opts = GIT_ITERATOR_OPTIONS_INIT; - - const char *expect_cs[] = { - "A/a", "A/b/1", "A/c", "a/C", "a/a", "a/b" }; - const char *expect_ci[] = { - "A/a", "a/b", "A/b/1", "A/c" }; - const char *expect_cs_trees[] = { - "A/", "A/a", "A/b/", "A/b/1", "A/c", "a/", "a/C", "a/a", "a/b" }; - const char *expect_ci_trees[] = { - "A/", "A/a", "a/b", "A/b/", "A/b/1", "A/c" }; - - g_repo = cl_git_sandbox_init("icase"); - - cl_git_pass(git_oid_fromstr(&blob_id, blob_sha)); /* lookup blob */ - - /* create: A/a A/b/1 A/c a/a a/b a/C */ - build_test_tree(&Ab_id, g_repo, "b|1|", &blob_id); - build_test_tree( - &biga_id, g_repo, "b|a|,t|b|,b|c|", &blob_id, &Ab_id, &blob_id); - build_test_tree( - &littlea_id, g_repo, "b|a|,b|b|,b|C|", &blob_id, &blob_id, &blob_id); - build_test_tree( - &tree_id, g_repo, "t|A|,t|a|", &biga_id, &littlea_id); - - cl_git_pass(git_tree_lookup(&tree, g_repo, &tree_id)); - - i_opts.flags = GIT_ITERATOR_DONT_IGNORE_CASE; - cl_git_pass(git_iterator_for_tree(&i, tree, &i_opts)); - expect_iterator_items(i, 6, expect_cs, 6, expect_cs); - git_iterator_free(i); - - i_opts.flags = GIT_ITERATOR_IGNORE_CASE; - cl_git_pass(git_iterator_for_tree(&i, tree, &i_opts)); - expect_iterator_items(i, 4, expect_ci, 4, expect_ci); - git_iterator_free(i); - - i_opts.flags = GIT_ITERATOR_DONT_IGNORE_CASE | GIT_ITERATOR_INCLUDE_TREES; - cl_git_pass(git_iterator_for_tree(&i, tree, &i_opts)); - expect_iterator_items(i, 9, expect_cs_trees, 9, expect_cs_trees); - git_iterator_free(i); - - i_opts.flags = GIT_ITERATOR_IGNORE_CASE | GIT_ITERATOR_INCLUDE_TREES; - cl_git_pass(git_iterator_for_tree(&i, tree, &i_opts)); - expect_iterator_items(i, 6, expect_ci_trees, 6, expect_ci_trees); - git_iterator_free(i); - - git_tree_free(tree); -} - -void test_repo_iterator__tree_case_conflicts_2(void) -{ - const char *blob_sha = "d44e18fb93b7107b5cd1b95d601591d77869a1b6"; - git_tree *tree; - git_oid blob_id, d1, d2, c1, c2, b1, b2, a1, a2, tree_id; - git_iterator *i; - git_iterator_options i_opts = GIT_ITERATOR_OPTIONS_INIT; - - const char *expect_cs[] = { - "A/B/C/D/16", "A/B/C/D/foo", "A/B/C/d/15", "A/B/C/d/FOO", - "A/B/c/D/14", "A/B/c/D/foo", "A/B/c/d/13", "A/B/c/d/FOO", - "A/b/C/D/12", "A/b/C/D/foo", "A/b/C/d/11", "A/b/C/d/FOO", - "A/b/c/D/10", "A/b/c/D/foo", "A/b/c/d/09", "A/b/c/d/FOO", - "a/B/C/D/08", "a/B/C/D/foo", "a/B/C/d/07", "a/B/C/d/FOO", - "a/B/c/D/06", "a/B/c/D/foo", "a/B/c/d/05", "a/B/c/d/FOO", - "a/b/C/D/04", "a/b/C/D/foo", "a/b/C/d/03", "a/b/C/d/FOO", - "a/b/c/D/02", "a/b/c/D/foo", "a/b/c/d/01", "a/b/c/d/FOO", }; - const char *expect_ci[] = { - "a/b/c/d/01", "a/b/c/D/02", "a/b/C/d/03", "a/b/C/D/04", - "a/B/c/d/05", "a/B/c/D/06", "a/B/C/d/07", "a/B/C/D/08", - "A/b/c/d/09", "A/b/c/D/10", "A/b/C/d/11", "A/b/C/D/12", - "A/B/c/d/13", "A/B/c/D/14", "A/B/C/d/15", "A/B/C/D/16", - "A/B/C/D/foo", }; - const char *expect_ci_trees[] = { - "A/", "A/B/", "A/B/C/", "A/B/C/D/", - "a/b/c/d/01", "a/b/c/D/02", "a/b/C/d/03", "a/b/C/D/04", - "a/B/c/d/05", "a/B/c/D/06", "a/B/C/d/07", "a/B/C/D/08", - "A/b/c/d/09", "A/b/c/D/10", "A/b/C/d/11", "A/b/C/D/12", - "A/B/c/d/13", "A/B/c/D/14", "A/B/C/d/15", "A/B/C/D/16", - "A/B/C/D/foo", }; - - g_repo = cl_git_sandbox_init("icase"); - - cl_git_pass(git_oid_fromstr(&blob_id, blob_sha)); /* lookup blob */ - - build_test_tree(&d1, g_repo, "b|16|,b|foo|", &blob_id, &blob_id); - build_test_tree(&d2, g_repo, "b|15|,b|FOO|", &blob_id, &blob_id); - build_test_tree(&c1, g_repo, "t|D|,t|d|", &d1, &d2); - build_test_tree(&d1, g_repo, "b|14|,b|foo|", &blob_id, &blob_id); - build_test_tree(&d2, g_repo, "b|13|,b|FOO|", &blob_id, &blob_id); - build_test_tree(&c2, g_repo, "t|D|,t|d|", &d1, &d2); - build_test_tree(&b1, g_repo, "t|C|,t|c|", &c1, &c2); - - build_test_tree(&d1, g_repo, "b|12|,b|foo|", &blob_id, &blob_id); - build_test_tree(&d2, g_repo, "b|11|,b|FOO|", &blob_id, &blob_id); - build_test_tree(&c1, g_repo, "t|D|,t|d|", &d1, &d2); - build_test_tree(&d1, g_repo, "b|10|,b|foo|", &blob_id, &blob_id); - build_test_tree(&d2, g_repo, "b|09|,b|FOO|", &blob_id, &blob_id); - build_test_tree(&c2, g_repo, "t|D|,t|d|", &d1, &d2); - build_test_tree(&b2, g_repo, "t|C|,t|c|", &c1, &c2); - - build_test_tree(&a1, g_repo, "t|B|,t|b|", &b1, &b2); - - build_test_tree(&d1, g_repo, "b|08|,b|foo|", &blob_id, &blob_id); - build_test_tree(&d2, g_repo, "b|07|,b|FOO|", &blob_id, &blob_id); - build_test_tree(&c1, g_repo, "t|D|,t|d|", &d1, &d2); - build_test_tree(&d1, g_repo, "b|06|,b|foo|", &blob_id, &blob_id); - build_test_tree(&d2, g_repo, "b|05|,b|FOO|", &blob_id, &blob_id); - build_test_tree(&c2, g_repo, "t|D|,t|d|", &d1, &d2); - build_test_tree(&b1, g_repo, "t|C|,t|c|", &c1, &c2); - - build_test_tree(&d1, g_repo, "b|04|,b|foo|", &blob_id, &blob_id); - build_test_tree(&d2, g_repo, "b|03|,b|FOO|", &blob_id, &blob_id); - build_test_tree(&c1, g_repo, "t|D|,t|d|", &d1, &d2); - build_test_tree(&d1, g_repo, "b|02|,b|foo|", &blob_id, &blob_id); - build_test_tree(&d2, g_repo, "b|01|,b|FOO|", &blob_id, &blob_id); - build_test_tree(&c2, g_repo, "t|D|,t|d|", &d1, &d2); - build_test_tree(&b2, g_repo, "t|C|,t|c|", &c1, &c2); - - build_test_tree(&a2, g_repo, "t|B|,t|b|", &b1, &b2); - - build_test_tree(&tree_id, g_repo, "t/A/,t/a/", &a1, &a2); - - cl_git_pass(git_tree_lookup(&tree, g_repo, &tree_id)); - - i_opts.flags = GIT_ITERATOR_DONT_IGNORE_CASE; - cl_git_pass(git_iterator_for_tree(&i, tree, &i_opts)); - expect_iterator_items(i, 32, expect_cs, 32, expect_cs); - git_iterator_free(i); - - i_opts.flags = GIT_ITERATOR_IGNORE_CASE; - cl_git_pass(git_iterator_for_tree(&i, tree, &i_opts)); - expect_iterator_items(i, 17, expect_ci, 17, expect_ci); - git_iterator_free(i); - - i_opts.flags = GIT_ITERATOR_IGNORE_CASE | GIT_ITERATOR_INCLUDE_TREES; - cl_git_pass(git_iterator_for_tree(&i, tree, &i_opts)); - expect_iterator_items(i, 21, expect_ci_trees, 21, expect_ci_trees); - git_iterator_free(i); - - git_tree_free(tree); -} - -void test_repo_iterator__workdir(void) -{ - git_iterator *i; - git_iterator_options i_opts = GIT_ITERATOR_OPTIONS_INIT; - - g_repo = cl_git_sandbox_init("icase"); - - /* auto expand with no tree entries */ - cl_git_pass(git_iterator_for_workdir(&i, g_repo, NULL, NULL, &i_opts)); - expect_iterator_items(i, 20, NULL, 20, NULL); - git_iterator_free(i); - - /* auto expand with tree entries */ - i_opts.flags = GIT_ITERATOR_INCLUDE_TREES; - cl_git_pass(git_iterator_for_workdir(&i, g_repo, NULL, NULL, &i_opts)); - expect_iterator_items(i, 22, NULL, 22, NULL); - git_iterator_free(i); - - /* no auto expand (implies trees included) */ - i_opts.flags = GIT_ITERATOR_DONT_AUTOEXPAND; - cl_git_pass(git_iterator_for_workdir(&i, g_repo, NULL, NULL, &i_opts)); - expect_iterator_items(i, 12, NULL, 22, NULL); - git_iterator_free(i); -} - -void test_repo_iterator__workdir_icase(void) -{ - git_iterator *i; - git_iterator_options i_opts = GIT_ITERATOR_OPTIONS_INIT; - - g_repo = cl_git_sandbox_init("icase"); - - /* auto expand with no tree entries */ - i_opts.flags = GIT_ITERATOR_DONT_IGNORE_CASE; - - i_opts.start = "c"; - i_opts.end = "k/D"; - cl_git_pass(git_iterator_for_workdir(&i, g_repo, NULL, NULL, &i_opts)); - expect_iterator_items(i, 7, NULL, 7, NULL); - git_iterator_free(i); - - i_opts.start = "k"; - i_opts.end = "k/Z"; - cl_git_pass(git_iterator_for_workdir(&i, g_repo, NULL, NULL, &i_opts)); - expect_iterator_items(i, 3, NULL, 3, NULL); - git_iterator_free(i); - - /* auto expand with tree entries */ - i_opts.flags = GIT_ITERATOR_DONT_IGNORE_CASE | GIT_ITERATOR_INCLUDE_TREES; - - i_opts.start = "c"; - i_opts.end = "k/D"; - cl_git_pass(git_iterator_for_workdir(&i, g_repo, NULL, NULL, &i_opts)); - expect_iterator_items(i, 8, NULL, 8, NULL); - git_iterator_free(i); - - i_opts.start = "k"; - i_opts.end = "k/Z"; - cl_git_pass(git_iterator_for_workdir(&i, g_repo, NULL, NULL, &i_opts)); - expect_iterator_items(i, 4, NULL, 4, NULL); - git_iterator_free(i); - - /* no auto expand (implies trees included) */ - i_opts.flags = GIT_ITERATOR_DONT_IGNORE_CASE | GIT_ITERATOR_DONT_AUTOEXPAND; - - i_opts.start = "c"; - i_opts.end = "k/D"; - cl_git_pass(git_iterator_for_workdir(&i, g_repo, NULL, NULL, &i_opts)); - expect_iterator_items(i, 5, NULL, 8, NULL); - git_iterator_free(i); - - i_opts.start = "k"; - i_opts.end = "k/Z"; - cl_git_pass(git_iterator_for_workdir(&i, g_repo, NULL, NULL, &i_opts)); - expect_iterator_items(i, 1, NULL, 4, NULL); - git_iterator_free(i); - - /* auto expand with no tree entries */ - i_opts.flags = GIT_ITERATOR_IGNORE_CASE; - - i_opts.start = "c"; - i_opts.end = "k/D"; - cl_git_pass(git_iterator_for_workdir(&i, g_repo, NULL, NULL, &i_opts)); - expect_iterator_items(i, 13, NULL, 13, NULL); - git_iterator_free(i); - - i_opts.start = "k"; - i_opts.end = "k/Z"; - cl_git_pass(git_iterator_for_workdir(&i, g_repo, NULL, NULL, &i_opts)); - expect_iterator_items(i, 5, NULL, 5, NULL); - git_iterator_free(i); - - /* auto expand with tree entries */ - i_opts.flags = GIT_ITERATOR_IGNORE_CASE | GIT_ITERATOR_INCLUDE_TREES; - - i_opts.start = "c"; - i_opts.end = "k/D"; - cl_git_pass(git_iterator_for_workdir(&i, g_repo, NULL, NULL, &i_opts)); - expect_iterator_items(i, 14, NULL, 14, NULL); - git_iterator_free(i); - - i_opts.start = "k"; - i_opts.end = "k/Z"; - cl_git_pass(git_iterator_for_workdir(&i, g_repo, NULL, NULL, &i_opts)); - expect_iterator_items(i, 6, NULL, 6, NULL); - git_iterator_free(i); - - /* no auto expand (implies trees included) */ - i_opts.flags = GIT_ITERATOR_IGNORE_CASE | GIT_ITERATOR_DONT_AUTOEXPAND; - - i_opts.start = "c"; - i_opts.end = "k/D"; - cl_git_pass(git_iterator_for_workdir(&i, g_repo, NULL, NULL, &i_opts)); - expect_iterator_items(i, 9, NULL, 14, NULL); - git_iterator_free(i); - - i_opts.start = "k"; - i_opts.end = "k/Z"; - cl_git_pass(git_iterator_for_workdir(&i, g_repo, NULL, NULL, &i_opts)); - expect_iterator_items(i, 1, NULL, 6, NULL); - git_iterator_free(i); -} - -static void build_workdir_tree(const char *root, int dirs, int subs) -{ - int i, j; - char buf[64], sub[64]; - - for (i = 0; i < dirs; ++i) { - if (i % 2 == 0) { - p_snprintf(buf, sizeof(buf), "%s/dir%02d", root, i); - cl_git_pass(git_futils_mkdir(buf, 0775, GIT_MKDIR_PATH)); - - p_snprintf(buf, sizeof(buf), "%s/dir%02d/file", root, i); - cl_git_mkfile(buf, buf); - buf[strlen(buf) - 5] = '\0'; - } else { - p_snprintf(buf, sizeof(buf), "%s/DIR%02d", root, i); - cl_git_pass(git_futils_mkdir(buf, 0775, GIT_MKDIR_PATH)); - } - - for (j = 0; j < subs; ++j) { - switch (j % 4) { - case 0: p_snprintf(sub, sizeof(sub), "%s/sub%02d", buf, j); break; - case 1: p_snprintf(sub, sizeof(sub), "%s/sUB%02d", buf, j); break; - case 2: p_snprintf(sub, sizeof(sub), "%s/Sub%02d", buf, j); break; - case 3: p_snprintf(sub, sizeof(sub), "%s/SUB%02d", buf, j); break; - } - cl_git_pass(git_futils_mkdir(sub, 0775, GIT_MKDIR_PATH)); - - if (j % 2 == 0) { - size_t sublen = strlen(sub); - memcpy(&sub[sublen], "/file", sizeof("/file")); - cl_git_mkfile(sub, sub); - sub[sublen] = '\0'; - } - } - } -} - -void test_repo_iterator__workdir_depth(void) -{ - git_iterator *iter; - git_iterator_options iter_opts = GIT_ITERATOR_OPTIONS_INIT; - - g_repo = cl_git_sandbox_init("icase"); - - build_workdir_tree("icase", 10, 10); - build_workdir_tree("icase/DIR01/sUB01", 50, 0); - build_workdir_tree("icase/dir02/sUB01", 50, 0); - - /* auto expand with no tree entries */ - cl_git_pass(git_iterator_for_workdir(&iter, g_repo, NULL, NULL, &iter_opts)); - expect_iterator_items(iter, 125, NULL, 125, NULL); - git_iterator_free(iter); - - /* auto expand with tree entries (empty dirs silently skipped) */ - iter_opts.flags = GIT_ITERATOR_INCLUDE_TREES; - cl_git_pass(git_iterator_for_workdir(&iter, g_repo, NULL, NULL, &iter_opts)); - expect_iterator_items(iter, 337, NULL, 337, NULL); - git_iterator_free(iter); -} - -void test_repo_iterator__fs(void) -{ - git_iterator *i; - git_iterator_options i_opts = GIT_ITERATOR_OPTIONS_INIT; - - static const char *expect_base[] = { - "DIR01/Sub02/file", - "DIR01/sub00/file", - "current_file", - "dir00/Sub02/file", - "dir00/file", - "dir00/sub00/file", - "modified_file", - "new_file", - NULL, - }; - static const char *expect_trees[] = { - "DIR01/", - "DIR01/SUB03/", - "DIR01/Sub02/", - "DIR01/Sub02/file", - "DIR01/sUB01/", - "DIR01/sub00/", - "DIR01/sub00/file", - "current_file", - "dir00/", - "dir00/SUB03/", - "dir00/Sub02/", - "dir00/Sub02/file", - "dir00/file", - "dir00/sUB01/", - "dir00/sub00/", - "dir00/sub00/file", - "modified_file", - "new_file", - NULL, - }; - static const char *expect_noauto[] = { - "DIR01/", - "current_file", - "dir00/", - "modified_file", - "new_file", - NULL, - }; - - g_repo = cl_git_sandbox_init("status"); - - build_workdir_tree("status/subdir", 2, 4); - - cl_git_pass(git_iterator_for_filesystem(&i, "status/subdir", NULL)); - expect_iterator_items(i, 8, expect_base, 8, expect_base); - git_iterator_free(i); - - i_opts.flags = GIT_ITERATOR_INCLUDE_TREES; - cl_git_pass(git_iterator_for_filesystem(&i, "status/subdir", &i_opts)); - expect_iterator_items(i, 18, expect_trees, 18, expect_trees); - git_iterator_free(i); - - i_opts.flags = GIT_ITERATOR_DONT_AUTOEXPAND; - cl_git_pass(git_iterator_for_filesystem(&i, "status/subdir", &i_opts)); - expect_iterator_items(i, 5, expect_noauto, 18, expect_trees); - git_iterator_free(i); - - git__tsort((void **)expect_base, 8, (git__tsort_cmp)git__strcasecmp); - git__tsort((void **)expect_trees, 18, (git__tsort_cmp)git__strcasecmp); - git__tsort((void **)expect_noauto, 5, (git__tsort_cmp)git__strcasecmp); - - i_opts.flags = GIT_ITERATOR_IGNORE_CASE; - cl_git_pass(git_iterator_for_filesystem(&i, "status/subdir", &i_opts)); - expect_iterator_items(i, 8, expect_base, 8, expect_base); - git_iterator_free(i); - - i_opts.flags = GIT_ITERATOR_IGNORE_CASE | GIT_ITERATOR_INCLUDE_TREES; - cl_git_pass(git_iterator_for_filesystem(&i, "status/subdir", &i_opts)); - expect_iterator_items(i, 18, expect_trees, 18, expect_trees); - git_iterator_free(i); - - i_opts.flags = GIT_ITERATOR_IGNORE_CASE | GIT_ITERATOR_DONT_AUTOEXPAND; - cl_git_pass(git_iterator_for_filesystem(&i, "status/subdir", &i_opts)); - expect_iterator_items(i, 5, expect_noauto, 18, expect_trees); - git_iterator_free(i); -} - -void test_repo_iterator__fs2(void) -{ - git_iterator *i; - static const char *expect_base[] = { - "heads/br2", - "heads/dir", - "heads/ident", - "heads/long-file-name", - "heads/master", - "heads/packed-test", - "heads/subtrees", - "heads/test", - "tags/e90810b", - "tags/foo/bar", - "tags/foo/foo/bar", - "tags/point_to_blob", - "tags/test", - NULL, - }; - - g_repo = cl_git_sandbox_init("testrepo"); - - cl_git_pass(git_iterator_for_filesystem( - &i, "testrepo/.git/refs", NULL)); - expect_iterator_items(i, 13, expect_base, 13, expect_base); - git_iterator_free(i); -} - -void test_repo_iterator__unreadable_dir(void) -{ - git_iterator *i; - const git_index_entry *e; - - if (!cl_is_chmod_supported()) - return; - -#ifndef GIT_WIN32 - if (geteuid() == 0) - cl_skip(); -#endif - - g_repo = cl_git_sandbox_init("empty_standard_repo"); - - cl_must_pass(p_mkdir("empty_standard_repo/r", 0777)); - cl_git_mkfile("empty_standard_repo/r/a", "hello"); - cl_must_pass(p_mkdir("empty_standard_repo/r/b", 0777)); - cl_git_mkfile("empty_standard_repo/r/b/problem", "not me"); - cl_must_pass(p_chmod("empty_standard_repo/r/b", 0000)); - cl_must_pass(p_mkdir("empty_standard_repo/r/c", 0777)); - cl_git_mkfile("empty_standard_repo/r/d", "final"); - - cl_git_pass(git_iterator_for_filesystem( - &i, "empty_standard_repo/r", NULL)); - - cl_git_pass(git_iterator_advance(&e, i)); /* a */ - cl_git_fail(git_iterator_advance(&e, i)); /* b */ - cl_assert_equal_i(GIT_ITEROVER, git_iterator_advance(&e, i)); - - cl_must_pass(p_chmod("empty_standard_repo/r/b", 0777)); - - git_iterator_free(i); -} - -void test_repo_iterator__skips_fifos_and_such(void) -{ -#ifndef GIT_WIN32 - git_iterator *i; - const git_index_entry *e; - git_iterator_options i_opts = GIT_ITERATOR_OPTIONS_INIT; - - g_repo = cl_git_sandbox_init("empty_standard_repo"); - - cl_must_pass(p_mkdir("empty_standard_repo/dir", 0777)); - cl_git_mkfile("empty_standard_repo/file", "not me"); - - cl_assert(!mkfifo("empty_standard_repo/fifo", 0777)); - cl_assert(!access("empty_standard_repo/fifo", F_OK)); - - i_opts.flags = GIT_ITERATOR_INCLUDE_TREES | - GIT_ITERATOR_DONT_AUTOEXPAND; - - cl_git_pass(git_iterator_for_filesystem( - &i, "empty_standard_repo", &i_opts)); - - cl_git_pass(git_iterator_advance(&e, i)); /* .git */ - cl_assert(S_ISDIR(e->mode)); - cl_git_pass(git_iterator_advance(&e, i)); /* dir */ - cl_assert(S_ISDIR(e->mode)); - /* skips fifo */ - cl_git_pass(git_iterator_advance(&e, i)); /* file */ - cl_assert(S_ISREG(e->mode)); - - cl_assert_equal_i(GIT_ITEROVER, git_iterator_advance(&e, i)); - - git_iterator_free(i); -#endif -} - -void test_repo_iterator__indexfilelist(void) -{ - git_iterator *i; - git_iterator_options i_opts = GIT_ITERATOR_OPTIONS_INIT; - git_index *index; - git_vector filelist; - int default_icase; - int expect; - - cl_git_pass(git_vector_init(&filelist, 100, &git__strcmp_cb)); - cl_git_pass(git_vector_insert(&filelist, "a")); - cl_git_pass(git_vector_insert(&filelist, "B")); - cl_git_pass(git_vector_insert(&filelist, "c")); - cl_git_pass(git_vector_insert(&filelist, "D")); - cl_git_pass(git_vector_insert(&filelist, "e")); - cl_git_pass(git_vector_insert(&filelist, "k/1")); - cl_git_pass(git_vector_insert(&filelist, "k/a")); - cl_git_pass(git_vector_insert(&filelist, "L/1")); - - g_repo = cl_git_sandbox_init("icase"); - - cl_git_pass(git_repository_index(&index, g_repo)); - - /* In this test we DO NOT force a case setting on the index. */ - default_icase = ((git_index_caps(index) & GIT_INDEXCAP_IGNORE_CASE) != 0); - - i_opts.pathlist.strings = (char **)filelist.contents; - i_opts.pathlist.count = filelist.length; - - /* All indexfilelist iterator tests are "autoexpand with no tree entries" */ - - cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts)); - expect_iterator_items(i, 8, NULL, 8, NULL); - git_iterator_free(i); - - i_opts.start = "c"; - i_opts.end = NULL; - - cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts)); - /* (c D e k/1 k/a L ==> 6) vs (c e k/1 k/a ==> 4) */ - expect = ((default_icase) ? 6 : 4); - expect_iterator_items(i, expect, NULL, expect, NULL); - git_iterator_free(i); - - i_opts.start = NULL; - i_opts.end = "e"; - - cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts)); - /* (a B c D e ==> 5) vs (B D L/1 a c e ==> 6) */ - expect = ((default_icase) ? 5 : 6); - expect_iterator_items(i, expect, NULL, expect, NULL); - git_iterator_free(i); - - git_index_free(index); - git_vector_free(&filelist); -} - -void test_repo_iterator__indexfilelist_2(void) -{ - git_iterator *i; - git_iterator_options i_opts = GIT_ITERATOR_OPTIONS_INIT; - git_index *index; - git_vector filelist = GIT_VECTOR_INIT; - int default_icase, expect; - - g_repo = cl_git_sandbox_init("icase"); - - cl_git_pass(git_repository_index(&index, g_repo)); - - cl_git_pass(git_vector_init(&filelist, 100, &git__strcmp_cb)); - cl_git_pass(git_vector_insert(&filelist, "0")); - cl_git_pass(git_vector_insert(&filelist, "c")); - cl_git_pass(git_vector_insert(&filelist, "D")); - cl_git_pass(git_vector_insert(&filelist, "e")); - cl_git_pass(git_vector_insert(&filelist, "k/1")); - cl_git_pass(git_vector_insert(&filelist, "k/a")); - - /* In this test we DO NOT force a case setting on the index. */ - default_icase = ((git_index_caps(index) & GIT_INDEXCAP_IGNORE_CASE) != 0); - - i_opts.pathlist.strings = (char **)filelist.contents; - i_opts.pathlist.count = filelist.length; - - i_opts.start = "b"; - i_opts.end = "k/D"; - - /* (c D e k/1 k/a ==> 5) vs (c e k/1 ==> 3) */ - expect = default_icase ? 5 : 3; - - cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts)); - expect_iterator_items(i, expect, NULL, expect, NULL); - git_iterator_free(i); - - git_index_free(index); - git_vector_free(&filelist); -} - -void test_repo_iterator__indexfilelist_3(void) -{ - git_iterator *i; - git_iterator_options i_opts = GIT_ITERATOR_OPTIONS_INIT; - git_index *index; - git_vector filelist = GIT_VECTOR_INIT; - int default_icase, expect; - - g_repo = cl_git_sandbox_init("icase"); - - cl_git_pass(git_repository_index(&index, g_repo)); - - cl_git_pass(git_vector_init(&filelist, 100, &git__strcmp_cb)); - cl_git_pass(git_vector_insert(&filelist, "0")); - cl_git_pass(git_vector_insert(&filelist, "c")); - cl_git_pass(git_vector_insert(&filelist, "D")); - cl_git_pass(git_vector_insert(&filelist, "e")); - cl_git_pass(git_vector_insert(&filelist, "k/")); - cl_git_pass(git_vector_insert(&filelist, "k.a")); - cl_git_pass(git_vector_insert(&filelist, "k.b")); - cl_git_pass(git_vector_insert(&filelist, "kZZZZZZZ")); - - /* In this test we DO NOT force a case setting on the index. */ - default_icase = ((git_index_caps(index) & GIT_INDEXCAP_IGNORE_CASE) != 0); - - i_opts.pathlist.strings = (char **)filelist.contents; - i_opts.pathlist.count = filelist.length; - - i_opts.start = "b"; - i_opts.end = "k/D"; - - /* (c D e k/1 k/a k/B k/c k/D) vs (c e k/1 k/B k/D) */ - expect = default_icase ? 8 : 5; - - cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts)); - expect_iterator_items(i, expect, NULL, expect, NULL); - git_iterator_free(i); - - git_index_free(index); - git_vector_free(&filelist); -} - -void test_repo_iterator__indexfilelist_4(void) -{ - git_iterator *i; - git_iterator_options i_opts = GIT_ITERATOR_OPTIONS_INIT; - git_index *index; - git_vector filelist = GIT_VECTOR_INIT; - int default_icase, expect; - - g_repo = cl_git_sandbox_init("icase"); - - cl_git_pass(git_repository_index(&index, g_repo)); - - cl_git_pass(git_vector_init(&filelist, 100, &git__strcmp_cb)); - cl_git_pass(git_vector_insert(&filelist, "0")); - cl_git_pass(git_vector_insert(&filelist, "c")); - cl_git_pass(git_vector_insert(&filelist, "D")); - cl_git_pass(git_vector_insert(&filelist, "e")); - cl_git_pass(git_vector_insert(&filelist, "k")); - cl_git_pass(git_vector_insert(&filelist, "k.a")); - cl_git_pass(git_vector_insert(&filelist, "k.b")); - cl_git_pass(git_vector_insert(&filelist, "kZZZZZZZ")); - - /* In this test we DO NOT force a case setting on the index. */ - default_icase = ((git_index_caps(index) & GIT_INDEXCAP_IGNORE_CASE) != 0); - - i_opts.pathlist.strings = (char **)filelist.contents; - i_opts.pathlist.count = filelist.length; - - i_opts.start = "b"; - i_opts.end = "k/D"; - - /* (c D e k/1 k/a k/B k/c k/D) vs (c e k/1 k/B k/D) */ - expect = default_icase ? 8 : 5; - - cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts)); - expect_iterator_items(i, expect, NULL, expect, NULL); - git_iterator_free(i); - - git_index_free(index); - git_vector_free(&filelist); -} - -void test_repo_iterator__indexfilelist_icase(void) -{ - git_iterator *i; - git_iterator_options i_opts = GIT_ITERATOR_OPTIONS_INIT; - git_index *index; - int caps; - git_vector filelist; - - cl_git_pass(git_vector_init(&filelist, 100, &git__strcmp_cb)); - cl_git_pass(git_vector_insert(&filelist, "a")); - cl_git_pass(git_vector_insert(&filelist, "B")); - cl_git_pass(git_vector_insert(&filelist, "c")); - cl_git_pass(git_vector_insert(&filelist, "D")); - cl_git_pass(git_vector_insert(&filelist, "e")); - cl_git_pass(git_vector_insert(&filelist, "k/1")); - cl_git_pass(git_vector_insert(&filelist, "k/a")); - cl_git_pass(git_vector_insert(&filelist, "L/1")); - - g_repo = cl_git_sandbox_init("icase"); - - cl_git_pass(git_repository_index(&index, g_repo)); - caps = git_index_caps(index); - - /* force case sensitivity */ - cl_git_pass(git_index_set_caps(index, caps & ~GIT_INDEXCAP_IGNORE_CASE)); - - /* All indexfilelist iterator tests are "autoexpand with no tree entries" */ - - i_opts.pathlist.strings = (char **)filelist.contents; - i_opts.pathlist.count = filelist.length; - - i_opts.start = "c"; - i_opts.end = "k/D"; - cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts)); - expect_iterator_items(i, 3, NULL, 3, NULL); - git_iterator_free(i); - - i_opts.start = "k"; - i_opts.end = "k/Z"; - cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts)); - expect_iterator_items(i, 1, NULL, 1, NULL); - git_iterator_free(i); - - /* force case insensitivity */ - cl_git_pass(git_index_set_caps(index, caps | GIT_INDEXCAP_IGNORE_CASE)); - - i_opts.start = "c"; - i_opts.end = "k/D"; - cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts)); - expect_iterator_items(i, 5, NULL, 5, NULL); - git_iterator_free(i); - - i_opts.start = "k"; - i_opts.end = "k/Z"; - cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts)); - expect_iterator_items(i, 2, NULL, 2, NULL); - git_iterator_free(i); - - cl_git_pass(git_index_set_caps(index, caps)); - git_index_free(index); - git_vector_free(&filelist); -} - -void test_repo_iterator__workdirfilelist(void) -{ - git_iterator *i; - git_iterator_options i_opts = GIT_ITERATOR_OPTIONS_INIT; - git_vector filelist; - bool default_icase; - int expect; - - cl_git_pass(git_vector_init(&filelist, 100, &git__strcmp_cb)); - cl_git_pass(git_vector_insert(&filelist, "a")); - cl_git_pass(git_vector_insert(&filelist, "B")); - cl_git_pass(git_vector_insert(&filelist, "c")); - cl_git_pass(git_vector_insert(&filelist, "D")); - cl_git_pass(git_vector_insert(&filelist, "e")); - cl_git_pass(git_vector_insert(&filelist, "k.a")); - cl_git_pass(git_vector_insert(&filelist, "k.b")); - cl_git_pass(git_vector_insert(&filelist, "k/1")); - cl_git_pass(git_vector_insert(&filelist, "k/a")); - cl_git_pass(git_vector_insert(&filelist, "kZZZZZZZ")); - cl_git_pass(git_vector_insert(&filelist, "L/1")); - - g_repo = cl_git_sandbox_init("icase"); - - /* All indexfilelist iterator tests are "autoexpand with no tree entries" */ - /* In this test we DO NOT force a case on the iteratords and verify default behavior. */ - - i_opts.pathlist.strings = (char **)filelist.contents; - i_opts.pathlist.count = filelist.length; - - cl_git_pass(git_iterator_for_workdir(&i, g_repo, NULL, NULL, &i_opts)); - expect_iterator_items(i, 8, NULL, 8, NULL); - git_iterator_free(i); - - i_opts.start = "c"; - i_opts.end = NULL; - cl_git_pass(git_iterator_for_workdir(&i, g_repo, NULL, NULL, &i_opts)); - default_icase = git_iterator_ignore_case(i); - /* (c D e k/1 k/a L ==> 6) vs (c e k/1 k/a ==> 4) */ - expect = ((default_icase) ? 6 : 4); - expect_iterator_items(i, expect, NULL, expect, NULL); - git_iterator_free(i); - - i_opts.start = NULL; - i_opts.end = "e"; - cl_git_pass(git_iterator_for_workdir(&i, g_repo, NULL, NULL, &i_opts)); - default_icase = git_iterator_ignore_case(i); - /* (a B c D e ==> 5) vs (B D L/1 a c e ==> 6) */ - expect = ((default_icase) ? 5 : 6); - expect_iterator_items(i, expect, NULL, expect, NULL); - git_iterator_free(i); - - git_vector_free(&filelist); -} - -void test_repo_iterator__workdirfilelist_icase(void) -{ - git_iterator *i; - git_iterator_options i_opts = GIT_ITERATOR_OPTIONS_INIT; - git_vector filelist; - - cl_git_pass(git_vector_init(&filelist, 100, &git__strcmp_cb)); - cl_git_pass(git_vector_insert(&filelist, "a")); - cl_git_pass(git_vector_insert(&filelist, "B")); - cl_git_pass(git_vector_insert(&filelist, "c")); - cl_git_pass(git_vector_insert(&filelist, "D")); - cl_git_pass(git_vector_insert(&filelist, "e")); - cl_git_pass(git_vector_insert(&filelist, "k.a")); - cl_git_pass(git_vector_insert(&filelist, "k.b")); - cl_git_pass(git_vector_insert(&filelist, "k/1")); - cl_git_pass(git_vector_insert(&filelist, "k/a")); - cl_git_pass(git_vector_insert(&filelist, "kZZZZ")); - cl_git_pass(git_vector_insert(&filelist, "L/1")); - - g_repo = cl_git_sandbox_init("icase"); - - i_opts.flags = GIT_ITERATOR_DONT_IGNORE_CASE; - i_opts.pathlist.strings = (char **)filelist.contents; - i_opts.pathlist.count = filelist.length; - - i_opts.start = "c"; - i_opts.end = "k/D"; - cl_git_pass(git_iterator_for_workdir(&i, g_repo, NULL, NULL, &i_opts)); - expect_iterator_items(i, 3, NULL, 3, NULL); - git_iterator_free(i); - - i_opts.start = "k"; - i_opts.end = "k/Z"; - cl_git_pass(git_iterator_for_workdir(&i, g_repo, NULL, NULL, &i_opts)); - expect_iterator_items(i, 1, NULL, 1, NULL); - git_iterator_free(i); - - i_opts.flags = GIT_ITERATOR_IGNORE_CASE; - - i_opts.start = "c"; - i_opts.end = "k/D"; - cl_git_pass(git_iterator_for_workdir(&i, g_repo, NULL, NULL, &i_opts)); - expect_iterator_items(i, 5, NULL, 5, NULL); - git_iterator_free(i); - - i_opts.start = "k"; - i_opts.end = "k/Z"; - cl_git_pass(git_iterator_for_workdir(&i, g_repo, NULL, NULL, &i_opts)); - expect_iterator_items(i, 2, NULL, 2, NULL); - git_iterator_free(i); - - git_vector_free(&filelist); -} - -void test_repo_iterator__treefilelist(void) -{ - git_iterator *i; - git_iterator_options i_opts = GIT_ITERATOR_OPTIONS_INIT; - git_vector filelist; - git_tree *tree; - bool default_icase; - int expect; - - cl_git_pass(git_vector_init(&filelist, 100, &git__strcmp_cb)); - cl_git_pass(git_vector_insert(&filelist, "a")); - cl_git_pass(git_vector_insert(&filelist, "B")); - cl_git_pass(git_vector_insert(&filelist, "c")); - cl_git_pass(git_vector_insert(&filelist, "D")); - cl_git_pass(git_vector_insert(&filelist, "e")); - cl_git_pass(git_vector_insert(&filelist, "k.a")); - cl_git_pass(git_vector_insert(&filelist, "k.b")); - cl_git_pass(git_vector_insert(&filelist, "k/1")); - cl_git_pass(git_vector_insert(&filelist, "k/a")); - cl_git_pass(git_vector_insert(&filelist, "kZZZZZZZ")); - cl_git_pass(git_vector_insert(&filelist, "L/1")); - - g_repo = cl_git_sandbox_init("icase"); - git_repository_head_tree(&tree, g_repo); - - /* All indexfilelist iterator tests are "autoexpand with no tree entries" */ - /* In this test we DO NOT force a case on the iteratords and verify default behavior. */ - - i_opts.pathlist.strings = (char **)filelist.contents; - i_opts.pathlist.count = filelist.length; - - cl_git_pass(git_iterator_for_tree(&i, tree, &i_opts)); - expect_iterator_items(i, 8, NULL, 8, NULL); - git_iterator_free(i); - - i_opts.start = "c"; - i_opts.end = NULL; - cl_git_pass(git_iterator_for_tree(&i, tree, &i_opts)); - default_icase = git_iterator_ignore_case(i); - /* (c D e k/1 k/a L ==> 6) vs (c e k/1 k/a ==> 4) */ - expect = ((default_icase) ? 6 : 4); - expect_iterator_items(i, expect, NULL, expect, NULL); - git_iterator_free(i); - - i_opts.start = NULL; - i_opts.end = "e"; - cl_git_pass(git_iterator_for_tree(&i, tree, &i_opts)); - default_icase = git_iterator_ignore_case(i); - /* (a B c D e ==> 5) vs (B D L/1 a c e ==> 6) */ - expect = ((default_icase) ? 5 : 6); - expect_iterator_items(i, expect, NULL, expect, NULL); - git_iterator_free(i); - - git_vector_free(&filelist); - git_tree_free(tree); -} - -void test_repo_iterator__treefilelist_icase(void) -{ - git_iterator *i; - git_iterator_options i_opts = GIT_ITERATOR_OPTIONS_INIT; - git_vector filelist; - git_tree *tree; - - cl_git_pass(git_vector_init(&filelist, 100, &git__strcmp_cb)); - cl_git_pass(git_vector_insert(&filelist, "a")); - cl_git_pass(git_vector_insert(&filelist, "B")); - cl_git_pass(git_vector_insert(&filelist, "c")); - cl_git_pass(git_vector_insert(&filelist, "D")); - cl_git_pass(git_vector_insert(&filelist, "e")); - cl_git_pass(git_vector_insert(&filelist, "k.a")); - cl_git_pass(git_vector_insert(&filelist, "k.b")); - cl_git_pass(git_vector_insert(&filelist, "k/1")); - cl_git_pass(git_vector_insert(&filelist, "k/a")); - cl_git_pass(git_vector_insert(&filelist, "kZZZZ")); - cl_git_pass(git_vector_insert(&filelist, "L/1")); - - g_repo = cl_git_sandbox_init("icase"); - git_repository_head_tree(&tree, g_repo); - - i_opts.flags = GIT_ITERATOR_DONT_IGNORE_CASE; - i_opts.pathlist.strings = (char **)filelist.contents; - i_opts.pathlist.count = filelist.length; - - i_opts.start = "c"; - i_opts.end = "k/D"; - cl_git_pass(git_iterator_for_tree(&i, tree, &i_opts)); - expect_iterator_items(i, 3, NULL, 3, NULL); - git_iterator_free(i); - - i_opts.start = "k"; - i_opts.end = "k/Z"; - cl_git_pass(git_iterator_for_tree(&i, tree, &i_opts)); - expect_iterator_items(i, 1, NULL, 1, NULL); - git_iterator_free(i); - - i_opts.flags = GIT_ITERATOR_IGNORE_CASE; - - i_opts.start = "c"; - i_opts.end = "k/D"; - cl_git_pass(git_iterator_for_tree(&i, tree, &i_opts)); - expect_iterator_items(i, 5, NULL, 5, NULL); - git_iterator_free(i); - - i_opts.start = "k"; - i_opts.end = "k/Z"; - cl_git_pass(git_iterator_for_tree(&i, tree, &i_opts)); - expect_iterator_items(i, 2, NULL, 2, NULL); - git_iterator_free(i); - - git_vector_free(&filelist); - git_tree_free(tree); -} diff --git a/vendor/libgit2/tests/repo/message.c b/vendor/libgit2/tests/repo/message.c deleted file mode 100644 index 87574590b..000000000 --- a/vendor/libgit2/tests/repo/message.c +++ /dev/null @@ -1,39 +0,0 @@ -#include "clar_libgit2.h" -#include "buffer.h" -#include "refs.h" -#include "posix.h" - -static git_repository *_repo; - -void test_repo_message__initialize(void) -{ - _repo = cl_git_sandbox_init("testrepo.git"); -} - -void test_repo_message__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -void test_repo_message__none(void) -{ - git_buf actual = GIT_BUF_INIT; - cl_assert_equal_i(GIT_ENOTFOUND, git_repository_message(&actual, _repo)); -} - -void test_repo_message__message(void) -{ - git_buf path = GIT_BUF_INIT, actual = GIT_BUF_INIT; - const char expected[] = "Test\n\nThis is a test of the emergency broadcast system\n"; - - cl_git_pass(git_buf_joinpath(&path, git_repository_path(_repo), "MERGE_MSG")); - cl_git_mkfile(git_buf_cstr(&path), expected); - - cl_git_pass(git_repository_message(&actual, _repo)); - cl_assert_equal_s(expected, git_buf_cstr(&actual)); - git_buf_free(&actual); - - cl_git_pass(p_unlink(git_buf_cstr(&path))); - cl_assert_equal_i(GIT_ENOTFOUND, git_repository_message(&actual, _repo)); - git_buf_free(&path); -} diff --git a/vendor/libgit2/tests/repo/new.c b/vendor/libgit2/tests/repo/new.c deleted file mode 100644 index d77e903f6..000000000 --- a/vendor/libgit2/tests/repo/new.c +++ /dev/null @@ -1,27 +0,0 @@ -#include "clar_libgit2.h" -#include "git2/sys/repository.h" - -void test_repo_new__has_nothing(void) -{ - git_repository *repo; - - cl_git_pass(git_repository_new(&repo)); - cl_assert_equal_b(true, git_repository_is_bare(repo)); - cl_assert_equal_p(NULL, git_repository_path(repo)); - cl_assert_equal_p(NULL, git_repository_workdir(repo)); - git_repository_free(repo); -} - -void test_repo_new__is_bare_until_workdir_set(void) -{ - git_repository *repo; - - cl_git_pass(git_repository_new(&repo)); - cl_assert_equal_b(true, git_repository_is_bare(repo)); - - cl_git_pass(git_repository_set_workdir(repo, clar_sandbox_path(), 0)); - cl_assert_equal_b(false, git_repository_is_bare(repo)); - - git_repository_free(repo); -} - diff --git a/vendor/libgit2/tests/repo/open.c b/vendor/libgit2/tests/repo/open.c deleted file mode 100644 index d3d087231..000000000 --- a/vendor/libgit2/tests/repo/open.c +++ /dev/null @@ -1,396 +0,0 @@ -#include "clar_libgit2.h" -#include "fileops.h" -#include "sysdir.h" -#include - -void test_repo_open__cleanup(void) -{ - cl_git_sandbox_cleanup(); - - if (git_path_isdir("alternate")) - git_futils_rmdir_r("alternate", NULL, GIT_RMDIR_REMOVE_FILES); -} - -void test_repo_open__bare_empty_repo(void) -{ - git_repository *repo = cl_git_sandbox_init("empty_bare.git"); - - cl_assert(git_repository_path(repo) != NULL); - cl_assert(git__suffixcmp(git_repository_path(repo), "/") == 0); - cl_assert(git_repository_workdir(repo) == NULL); -} - -void test_repo_open__format_version_1(void) -{ - git_repository *repo; - git_config *config; - - repo = cl_git_sandbox_init("empty_bare.git"); - - cl_git_pass(git_repository_open(&repo, "empty_bare.git")); - cl_git_pass(git_repository_config(&config, repo)); - - cl_git_pass(git_config_set_int32(config, "core.repositoryformatversion", 1)); - - git_config_free(config); - git_repository_free(repo); - cl_git_fail(git_repository_open(&repo, "empty_bare.git")); -} - -void test_repo_open__standard_empty_repo_through_gitdir(void) -{ - git_repository *repo; - - cl_git_pass(git_repository_open(&repo, cl_fixture("empty_standard_repo/.gitted"))); - - cl_assert(git_repository_path(repo) != NULL); - cl_assert(git__suffixcmp(git_repository_path(repo), "/") == 0); - - cl_assert(git_repository_workdir(repo) != NULL); - cl_assert(git__suffixcmp(git_repository_workdir(repo), "/") == 0); - - git_repository_free(repo); -} - -void test_repo_open__standard_empty_repo_through_workdir(void) -{ - git_repository *repo = cl_git_sandbox_init("empty_standard_repo"); - - cl_assert(git_repository_path(repo) != NULL); - cl_assert(git__suffixcmp(git_repository_path(repo), "/") == 0); - - cl_assert(git_repository_workdir(repo) != NULL); - cl_assert(git__suffixcmp(git_repository_workdir(repo), "/") == 0); -} - - -void test_repo_open__open_with_discover(void) -{ - static const char *variants[] = { - "attr", "attr/", "attr/.git", "attr/.git/", - "attr/sub", "attr/sub/", "attr/sub/sub", "attr/sub/sub/", - NULL - }; - git_repository *repo; - const char **scan; - - cl_fixture_sandbox("attr"); - cl_git_pass(p_rename("attr/.gitted", "attr/.git")); - - for (scan = variants; *scan != NULL; scan++) { - cl_git_pass(git_repository_open_ext(&repo, *scan, 0, NULL)); - cl_assert(git__suffixcmp(git_repository_path(repo), "attr/.git/") == 0); - cl_assert(git__suffixcmp(git_repository_workdir(repo), "attr/") == 0); - git_repository_free(repo); - } - - cl_fixture_cleanup("attr"); -} - -static void make_gitlink_dir(const char *dir, const char *linktext) -{ - git_buf path = GIT_BUF_INIT; - - cl_git_pass(git_futils_mkdir(dir, 0777, GIT_MKDIR_VERIFY_DIR)); - cl_git_pass(git_buf_joinpath(&path, dir, ".git")); - cl_git_rewritefile(path.ptr, linktext); - git_buf_free(&path); -} - -void test_repo_open__gitlinked(void) -{ - /* need to have both repo dir and workdir set up correctly */ - git_repository *repo = cl_git_sandbox_init("empty_standard_repo"); - git_repository *repo2; - - make_gitlink_dir("alternate", "gitdir: ../empty_standard_repo/.git"); - - cl_git_pass(git_repository_open(&repo2, "alternate")); - - cl_assert(git_repository_path(repo2) != NULL); - cl_assert_(git__suffixcmp(git_repository_path(repo2), "empty_standard_repo/.git/") == 0, git_repository_path(repo2)); - cl_assert_equal_s(git_repository_path(repo), git_repository_path(repo2)); - - cl_assert(git_repository_workdir(repo2) != NULL); - cl_assert_(git__suffixcmp(git_repository_workdir(repo2), "alternate/") == 0, git_repository_workdir(repo2)); - - git_repository_free(repo2); -} - -void test_repo_open__from_git_new_workdir(void) -{ -#ifndef GIT_WIN32 - /* The git-new-workdir script that ships with git sets up a bunch of - * symlinks to create a second workdir that shares the object db with - * another checkout. Libgit2 can open a repo that has been configured - * this way. - */ - - git_repository *repo2; - git_buf link_tgt = GIT_BUF_INIT, link = GIT_BUF_INIT, body = GIT_BUF_INIT; - const char **scan; - int link_fd; - static const char *links[] = { - "config", "refs", "logs/refs", "objects", "info", "hooks", - "packed-refs", "remotes", "rr-cache", "svn", NULL - }; - static const char *copies[] = { - "HEAD", NULL - }; - - cl_git_sandbox_init("empty_standard_repo"); - - cl_git_pass(p_mkdir("alternate", 0777)); - cl_git_pass(p_mkdir("alternate/.git", 0777)); - - for (scan = links; *scan != NULL; scan++) { - git_buf_joinpath(&link_tgt, "empty_standard_repo/.git", *scan); - if (git_path_exists(link_tgt.ptr)) { - git_buf_joinpath(&link_tgt, "../../empty_standard_repo/.git", *scan); - git_buf_joinpath(&link, "alternate/.git", *scan); - if (strchr(*scan, '/')) - git_futils_mkpath2file(link.ptr, 0777); - cl_assert_(symlink(link_tgt.ptr, link.ptr) == 0, strerror(errno)); - } - } - for (scan = copies; *scan != NULL; scan++) { - git_buf_joinpath(&link_tgt, "empty_standard_repo/.git", *scan); - if (git_path_exists(link_tgt.ptr)) { - git_buf_joinpath(&link, "alternate/.git", *scan); - cl_git_pass(git_futils_readbuffer(&body, link_tgt.ptr)); - - cl_assert((link_fd = git_futils_creat_withpath(link.ptr, 0777, 0666)) >= 0); - cl_must_pass(p_write(link_fd, body.ptr, body.size)); - p_close(link_fd); - } - } - - git_buf_free(&link_tgt); - git_buf_free(&link); - git_buf_free(&body); - - - cl_git_pass(git_repository_open(&repo2, "alternate")); - - cl_assert(git_repository_path(repo2) != NULL); - cl_assert_(git__suffixcmp(git_repository_path(repo2), "alternate/.git/") == 0, git_repository_path(repo2)); - - cl_assert(git_repository_workdir(repo2) != NULL); - cl_assert_(git__suffixcmp(git_repository_workdir(repo2), "alternate/") == 0, git_repository_workdir(repo2)); - - git_repository_free(repo2); -#endif -} - -void test_repo_open__failures(void) -{ - git_repository *base, *repo; - git_buf ceiling = GIT_BUF_INIT; - - base = cl_git_sandbox_init("attr"); - cl_git_pass(git_buf_sets(&ceiling, git_repository_workdir(base))); - - /* fail with no searching */ - cl_git_fail(git_repository_open(&repo, "attr/sub")); - cl_git_fail(git_repository_open_ext( - &repo, "attr/sub", GIT_REPOSITORY_OPEN_NO_SEARCH, NULL)); - - /* fail with ceiling too low */ - cl_git_pass(git_buf_joinpath(&ceiling, ceiling.ptr, "sub")); - cl_git_fail(git_repository_open_ext(&repo, "attr/sub", 0, ceiling.ptr)); - - /* fail with no repo */ - cl_git_pass(p_mkdir("alternate", 0777)); - cl_git_pass(p_mkdir("alternate/.git", 0777)); - cl_git_fail(git_repository_open_ext(&repo, "alternate", 0, NULL)); - cl_git_fail(git_repository_open_ext(&repo, "alternate/.git", 0, NULL)); - - git_buf_free(&ceiling); -} - -void test_repo_open__bad_gitlinks(void) -{ - git_repository *repo; - static const char *bad_links[] = { - "garbage\n", "gitdir", "gitdir:\n", "gitdir: foobar", - "gitdir: ../invalid", "gitdir: ../invalid2", - "gitdir: ../attr/.git with extra stuff", - NULL - }; - const char **scan; - - cl_git_sandbox_init("attr"); - - cl_git_pass(p_mkdir("invalid", 0777)); - cl_git_pass(git_futils_mkdir_r("invalid2/.git", 0777)); - - for (scan = bad_links; *scan != NULL; scan++) { - make_gitlink_dir("alternate", *scan); - cl_git_fail(git_repository_open_ext(&repo, "alternate", 0, NULL)); - } - - git_futils_rmdir_r("invalid", NULL, GIT_RMDIR_REMOVE_FILES); - git_futils_rmdir_r("invalid2", NULL, GIT_RMDIR_REMOVE_FILES); -} - -#ifdef GIT_WIN32 -static void unposix_path(git_buf *path) -{ - char *src, *tgt; - - src = tgt = path->ptr; - - /* convert "/d/..." to "d:\..." */ - if (src[0] == '/' && isalpha(src[1]) && src[2] == '/') { - *tgt++ = src[1]; - *tgt++ = ':'; - *tgt++ = '\\'; - src += 3; - } - - while (*src) { - *tgt++ = (*src == '/') ? '\\' : *src; - src++; - } - - *tgt = '\0'; -} -#endif - -void test_repo_open__win32_path(void) -{ -#ifdef GIT_WIN32 - git_repository *repo = cl_git_sandbox_init("empty_standard_repo"), *repo2; - git_buf winpath = GIT_BUF_INIT; - static const char *repo_path = "empty_standard_repo/.git/"; - static const char *repo_wd = "empty_standard_repo/"; - - cl_assert(git__suffixcmp(git_repository_path(repo), repo_path) == 0); - cl_assert(git__suffixcmp(git_repository_workdir(repo), repo_wd) == 0); - - cl_git_pass(git_buf_sets(&winpath, git_repository_path(repo))); - unposix_path(&winpath); - cl_git_pass(git_repository_open(&repo2, winpath.ptr)); - cl_assert(git__suffixcmp(git_repository_path(repo2), repo_path) == 0); - cl_assert(git__suffixcmp(git_repository_workdir(repo2), repo_wd) == 0); - git_repository_free(repo2); - - cl_git_pass(git_buf_sets(&winpath, git_repository_path(repo))); - git_buf_truncate(&winpath, winpath.size - 1); /* remove trailing '/' */ - unposix_path(&winpath); - cl_git_pass(git_repository_open(&repo2, winpath.ptr)); - cl_assert(git__suffixcmp(git_repository_path(repo2), repo_path) == 0); - cl_assert(git__suffixcmp(git_repository_workdir(repo2), repo_wd) == 0); - git_repository_free(repo2); - - cl_git_pass(git_buf_sets(&winpath, git_repository_workdir(repo))); - unposix_path(&winpath); - cl_git_pass(git_repository_open(&repo2, winpath.ptr)); - cl_assert(git__suffixcmp(git_repository_path(repo2), repo_path) == 0); - cl_assert(git__suffixcmp(git_repository_workdir(repo2), repo_wd) == 0); - git_repository_free(repo2); - - cl_git_pass(git_buf_sets(&winpath, git_repository_workdir(repo))); - git_buf_truncate(&winpath, winpath.size - 1); /* remove trailing '/' */ - unposix_path(&winpath); - cl_git_pass(git_repository_open(&repo2, winpath.ptr)); - cl_assert(git__suffixcmp(git_repository_path(repo2), repo_path) == 0); - cl_assert(git__suffixcmp(git_repository_workdir(repo2), repo_wd) == 0); - git_repository_free(repo2); - - git_buf_free(&winpath); -#endif -} - -void test_repo_open__opening_a_non_existing_repository_returns_ENOTFOUND(void) -{ - git_repository *repo; - cl_assert_equal_i(GIT_ENOTFOUND, git_repository_open(&repo, "i-do-not/exist")); -} - -void test_repo_open__no_config(void) -{ - git_buf path = GIT_BUF_INIT; - git_repository *repo; - git_config *config; - - cl_fixture_sandbox("empty_standard_repo"); - cl_git_pass(cl_rename( - "empty_standard_repo/.gitted", "empty_standard_repo/.git")); - - /* remove local config */ - cl_git_pass(git_futils_rmdir_r( - "empty_standard_repo/.git/config", NULL, GIT_RMDIR_REMOVE_FILES)); - - /* isolate from system level configs */ - cl_must_pass(p_mkdir("alternate", 0777)); - cl_git_pass(git_path_prettify(&path, "alternate", NULL)); - cl_git_pass(git_libgit2_opts( - GIT_OPT_SET_SEARCH_PATH, GIT_CONFIG_LEVEL_GLOBAL, path.ptr)); - cl_git_pass(git_libgit2_opts( - GIT_OPT_SET_SEARCH_PATH, GIT_CONFIG_LEVEL_SYSTEM, path.ptr)); - cl_git_pass(git_libgit2_opts( - GIT_OPT_SET_SEARCH_PATH, GIT_CONFIG_LEVEL_XDG, path.ptr)); - - git_buf_free(&path); - - cl_git_pass(git_repository_open(&repo, "empty_standard_repo")); - cl_git_pass(git_repository_config(&config, repo)); - - cl_git_pass(git_config_set_string(config, "test.set", "42")); - - git_config_free(config); - git_repository_free(repo); - cl_fixture_cleanup("empty_standard_repo"); - - cl_sandbox_set_search_path_defaults(); -} - -void test_repo_open__force_bare(void) -{ - /* need to have both repo dir and workdir set up correctly */ - git_repository *repo = cl_git_sandbox_init("empty_standard_repo"); - git_repository *barerepo; - - make_gitlink_dir("alternate", "gitdir: ../empty_standard_repo/.git"); - - cl_assert(!git_repository_is_bare(repo)); - - cl_git_pass(git_repository_open(&barerepo, "alternate")); - cl_assert(!git_repository_is_bare(barerepo)); - git_repository_free(barerepo); - - cl_git_pass(git_repository_open_bare( - &barerepo, "empty_standard_repo/.git")); - cl_assert(git_repository_is_bare(barerepo)); - git_repository_free(barerepo); - - cl_git_fail(git_repository_open_bare(&barerepo, "alternate/.git")); - - cl_git_pass(git_repository_open_ext( - &barerepo, "alternate/.git", GIT_REPOSITORY_OPEN_BARE, NULL)); - cl_assert(git_repository_is_bare(barerepo)); - git_repository_free(barerepo); - - cl_git_pass(p_mkdir("empty_standard_repo/subdir", 0777)); - cl_git_mkfile("empty_standard_repo/subdir/something.txt", "something"); - - cl_git_fail(git_repository_open_bare( - &barerepo, "empty_standard_repo/subdir")); - - cl_git_pass(git_repository_open_ext( - &barerepo, "empty_standard_repo/subdir", GIT_REPOSITORY_OPEN_BARE, NULL)); - cl_assert(git_repository_is_bare(barerepo)); - git_repository_free(barerepo); - - cl_git_pass(p_mkdir("alternate/subdir", 0777)); - cl_git_pass(p_mkdir("alternate/subdir/sub2", 0777)); - cl_git_mkfile("alternate/subdir/sub2/something.txt", "something"); - - cl_git_fail(git_repository_open_bare(&barerepo, "alternate/subdir/sub2")); - - cl_git_pass(git_repository_open_ext( - &barerepo, "alternate/subdir/sub2", GIT_REPOSITORY_OPEN_BARE, NULL)); - cl_assert(git_repository_is_bare(barerepo)); - git_repository_free(barerepo); -} diff --git a/vendor/libgit2/tests/repo/pathspec.c b/vendor/libgit2/tests/repo/pathspec.c deleted file mode 100644 index 5b86662bc..000000000 --- a/vendor/libgit2/tests/repo/pathspec.c +++ /dev/null @@ -1,385 +0,0 @@ -#include "clar_libgit2.h" -#include "git2/pathspec.h" - -static git_repository *g_repo; - -void test_repo_pathspec__initialize(void) -{ - g_repo = cl_git_sandbox_init("status"); -} - -void test_repo_pathspec__cleanup(void) -{ - cl_git_sandbox_cleanup(); - g_repo = NULL; -} - -static char *str0[] = { "*_file", "new_file", "garbage" }; -static char *str1[] = { "*_FILE", "NEW_FILE", "GARBAGE" }; -static char *str2[] = { "staged_*" }; -static char *str3[] = { "!subdir", "*_file", "new_file" }; -static char *str4[] = { "*" }; -static char *str5[] = { "S*" }; - -void test_repo_pathspec__workdir0(void) -{ - git_strarray s; - git_pathspec *ps; - git_pathspec_match_list *m; - - /* { "*_file", "new_file", "garbage" } */ - s.strings = str0; s.count = ARRAY_SIZE(str0); - cl_git_pass(git_pathspec_new(&ps, &s)); - - cl_git_pass(git_pathspec_match_workdir(&m, g_repo, 0, ps)); - cl_assert_equal_sz(10, git_pathspec_match_list_entrycount(m)); - cl_assert_equal_sz(0, git_pathspec_match_list_failed_entrycount(m)); - git_pathspec_match_list_free(m); - - cl_git_pass(git_pathspec_match_workdir(&m, g_repo, - GIT_PATHSPEC_FIND_FAILURES, ps)); - cl_assert_equal_sz(10, git_pathspec_match_list_entrycount(m)); - cl_assert_equal_sz(1, git_pathspec_match_list_failed_entrycount(m)); - cl_assert_equal_s("garbage", git_pathspec_match_list_failed_entry(m, 0)); - git_pathspec_match_list_free(m); - - cl_git_pass(git_pathspec_match_workdir(&m, g_repo, - GIT_PATHSPEC_FIND_FAILURES | GIT_PATHSPEC_FAILURES_ONLY, ps)); - cl_assert_equal_sz(0, git_pathspec_match_list_entrycount(m)); - cl_assert_equal_sz(1, git_pathspec_match_list_failed_entrycount(m)); - git_pathspec_match_list_free(m); - - git_pathspec_free(ps); -} - -void test_repo_pathspec__workdir1(void) -{ - git_strarray s; - git_pathspec *ps; - git_pathspec_match_list *m; - - /* { "*_FILE", "NEW_FILE", "GARBAGE" } */ - s.strings = str1; s.count = ARRAY_SIZE(str1); - cl_git_pass(git_pathspec_new(&ps, &s)); - - cl_git_pass(git_pathspec_match_workdir(&m, g_repo, - GIT_PATHSPEC_IGNORE_CASE, ps)); - cl_assert_equal_sz(10, git_pathspec_match_list_entrycount(m)); - git_pathspec_match_list_free(m); - - cl_git_pass(git_pathspec_match_workdir(&m, g_repo, - GIT_PATHSPEC_USE_CASE, ps)); - cl_assert_equal_sz(0, git_pathspec_match_list_entrycount(m)); - git_pathspec_match_list_free(m); - - cl_git_fail(git_pathspec_match_workdir(&m, g_repo, - GIT_PATHSPEC_USE_CASE | GIT_PATHSPEC_NO_MATCH_ERROR, ps)); - - cl_git_pass(git_pathspec_match_workdir(&m, g_repo, - GIT_PATHSPEC_IGNORE_CASE | GIT_PATHSPEC_FIND_FAILURES, ps)); - cl_assert_equal_sz(10, git_pathspec_match_list_entrycount(m)); - cl_assert_equal_sz(1, git_pathspec_match_list_failed_entrycount(m)); - git_pathspec_match_list_free(m); - - cl_git_pass(git_pathspec_match_workdir(&m, g_repo, - GIT_PATHSPEC_USE_CASE | GIT_PATHSPEC_FIND_FAILURES, ps)); - cl_assert_equal_sz(0, git_pathspec_match_list_entrycount(m)); - cl_assert_equal_sz(3, git_pathspec_match_list_failed_entrycount(m)); - git_pathspec_match_list_free(m); - - git_pathspec_free(ps); -} - -void test_repo_pathspec__workdir2(void) -{ - git_strarray s; - git_pathspec *ps; - git_pathspec_match_list *m; - - /* { "staged_*" } */ - s.strings = str2; s.count = ARRAY_SIZE(str2); - cl_git_pass(git_pathspec_new(&ps, &s)); - - cl_git_pass(git_pathspec_match_workdir(&m, g_repo, 0, ps)); - cl_assert_equal_sz(5, git_pathspec_match_list_entrycount(m)); - git_pathspec_match_list_free(m); - - cl_git_pass(git_pathspec_match_workdir(&m, g_repo, - GIT_PATHSPEC_FIND_FAILURES, ps)); - cl_assert_equal_sz(5, git_pathspec_match_list_entrycount(m)); - cl_assert_equal_sz(0, git_pathspec_match_list_failed_entrycount(m)); - git_pathspec_match_list_free(m); - - cl_git_fail(git_pathspec_match_workdir(&m, g_repo, - GIT_PATHSPEC_NO_GLOB | GIT_PATHSPEC_NO_MATCH_ERROR, ps)); - - cl_git_pass(git_pathspec_match_workdir(&m, g_repo, - GIT_PATHSPEC_NO_GLOB | GIT_PATHSPEC_FIND_FAILURES, ps)); - cl_assert_equal_sz(0, git_pathspec_match_list_entrycount(m)); - cl_assert_equal_sz(1, git_pathspec_match_list_failed_entrycount(m)); - git_pathspec_match_list_free(m); - - git_pathspec_free(ps); -} - -void test_repo_pathspec__workdir3(void) -{ - git_strarray s; - git_pathspec *ps; - git_pathspec_match_list *m; - - /* { "!subdir", "*_file", "new_file" } */ - s.strings = str3; s.count = ARRAY_SIZE(str3); - cl_git_pass(git_pathspec_new(&ps, &s)); - - cl_git_pass(git_pathspec_match_workdir(&m, g_repo, 0, ps)); - cl_assert_equal_sz(7, git_pathspec_match_list_entrycount(m)); - git_pathspec_match_list_free(m); - - cl_git_pass(git_pathspec_match_workdir(&m, g_repo, - GIT_PATHSPEC_FIND_FAILURES, ps)); - cl_assert_equal_sz(7, git_pathspec_match_list_entrycount(m)); - cl_assert_equal_sz(0, git_pathspec_match_list_failed_entrycount(m)); - - cl_assert_equal_s("current_file", git_pathspec_match_list_entry(m, 0)); - cl_assert_equal_s("modified_file", git_pathspec_match_list_entry(m, 1)); - cl_assert_equal_s("new_file", git_pathspec_match_list_entry(m, 2)); - cl_assert_equal_s("staged_changes_modified_file", git_pathspec_match_list_entry(m, 3)); - cl_assert_equal_s("staged_delete_modified_file", git_pathspec_match_list_entry(m, 4)); - cl_assert_equal_s("staged_new_file", git_pathspec_match_list_entry(m, 5)); - cl_assert_equal_s("staged_new_file_modified_file", git_pathspec_match_list_entry(m, 6)); - cl_assert_equal_s(NULL, git_pathspec_match_list_entry(m, 7)); - - git_pathspec_match_list_free(m); - - git_pathspec_free(ps); -} - -void test_repo_pathspec__workdir4(void) -{ - git_strarray s; - git_pathspec *ps; - git_pathspec_match_list *m; - - /* { "*" } */ - s.strings = str4; s.count = ARRAY_SIZE(str4); - cl_git_pass(git_pathspec_new(&ps, &s)); - - cl_git_pass(git_pathspec_match_workdir(&m, g_repo, 0, ps)); - cl_assert_equal_sz(13, git_pathspec_match_list_entrycount(m)); - cl_assert_equal_s("\xE8\xBF\x99", git_pathspec_match_list_entry(m, 12)); - git_pathspec_match_list_free(m); - - git_pathspec_free(ps); -} - - -void test_repo_pathspec__index0(void) -{ - git_index *idx; - git_strarray s; - git_pathspec *ps; - git_pathspec_match_list *m; - - cl_git_pass(git_repository_index(&idx, g_repo)); - - /* { "*_file", "new_file", "garbage" } */ - s.strings = str0; s.count = ARRAY_SIZE(str0); - cl_git_pass(git_pathspec_new(&ps, &s)); - - cl_git_pass(git_pathspec_match_index(&m, idx, 0, ps)); - cl_assert_equal_sz(9, git_pathspec_match_list_entrycount(m)); - cl_assert_equal_sz(0, git_pathspec_match_list_failed_entrycount(m)); - cl_assert_equal_s("current_file", git_pathspec_match_list_entry(m, 0)); - cl_assert_equal_s("modified_file", git_pathspec_match_list_entry(m, 1)); - cl_assert_equal_s("staged_changes_modified_file", git_pathspec_match_list_entry(m, 2)); - cl_assert_equal_s("staged_new_file", git_pathspec_match_list_entry(m, 3)); - cl_assert_equal_s("staged_new_file_deleted_file", git_pathspec_match_list_entry(m, 4)); - cl_assert_equal_s("staged_new_file_modified_file", git_pathspec_match_list_entry(m, 5)); - cl_assert_equal_s("subdir/current_file", git_pathspec_match_list_entry(m, 6)); - cl_assert_equal_s("subdir/deleted_file", git_pathspec_match_list_entry(m, 7)); - cl_assert_equal_s("subdir/modified_file", git_pathspec_match_list_entry(m, 8)); - cl_assert_equal_s(NULL, git_pathspec_match_list_entry(m, 9)); - git_pathspec_match_list_free(m); - - cl_git_pass(git_pathspec_match_index(&m, idx, - GIT_PATHSPEC_FIND_FAILURES, ps)); - cl_assert_equal_sz(9, git_pathspec_match_list_entrycount(m)); - cl_assert_equal_sz(2, git_pathspec_match_list_failed_entrycount(m)); - cl_assert_equal_s("new_file", git_pathspec_match_list_failed_entry(m, 0)); - cl_assert_equal_s("garbage", git_pathspec_match_list_failed_entry(m, 1)); - cl_assert_equal_s(NULL, git_pathspec_match_list_failed_entry(m, 2)); - git_pathspec_match_list_free(m); - - git_pathspec_free(ps); - git_index_free(idx); -} - -void test_repo_pathspec__index1(void) -{ - /* Currently the USE_CASE and IGNORE_CASE flags don't work on the - * index because the index sort order for the index iterator is - * set by the index itself. I think the correct fix is for the - * index not to embed a global sort order but to support traversal - * in either case sensitive or insensitive order in a stateless - * manner. - * - * Anyhow, as it is, there is no point in doing this test. - */ -#if 0 - git_index *idx; - git_strarray s; - git_pathspec *ps; - git_pathspec_match_list *m; - - cl_git_pass(git_repository_index(&idx, g_repo)); - - /* { "*_FILE", "NEW_FILE", "GARBAGE" } */ - s.strings = str1; s.count = ARRAY_SIZE(str1); - cl_git_pass(git_pathspec_new(&ps, &s)); - - cl_git_pass(git_pathspec_match_index(&m, idx, - GIT_PATHSPEC_USE_CASE, ps)); - cl_assert_equal_sz(0, git_pathspec_match_list_entrycount(m)); - cl_assert_equal_sz(0, git_pathspec_match_list_failed_entrycount(m)); - git_pathspec_match_list_free(m); - - cl_git_pass(git_pathspec_match_index(&m, idx, - GIT_PATHSPEC_USE_CASE | GIT_PATHSPEC_FIND_FAILURES, ps)); - cl_assert_equal_sz(0, git_pathspec_match_list_entrycount(m)); - cl_assert_equal_sz(3, git_pathspec_match_list_failed_entrycount(m)); - git_pathspec_match_list_free(m); - - cl_git_pass(git_pathspec_match_index(&m, idx, - GIT_PATHSPEC_IGNORE_CASE | GIT_PATHSPEC_FIND_FAILURES, ps)); - cl_assert_equal_sz(10, git_pathspec_match_list_entrycount(m)); - cl_assert_equal_sz(2, git_pathspec_match_list_failed_entrycount(m)); - git_pathspec_match_list_free(m); - - git_pathspec_free(ps); - git_index_free(idx); -#endif -} - -void test_repo_pathspec__tree0(void) -{ - git_object *tree; - git_strarray s; - git_pathspec *ps; - git_pathspec_match_list *m; - - /* { "*_file", "new_file", "garbage" } */ - s.strings = str0; s.count = ARRAY_SIZE(str0); - cl_git_pass(git_pathspec_new(&ps, &s)); - - cl_git_pass(git_revparse_single(&tree, g_repo, "HEAD~2^{tree}")); - - cl_git_pass(git_pathspec_match_tree(&m, (git_tree *)tree, - GIT_PATHSPEC_FIND_FAILURES, ps)); - cl_assert_equal_sz(4, git_pathspec_match_list_entrycount(m)); - cl_assert_equal_s("current_file", git_pathspec_match_list_entry(m, 0)); - cl_assert_equal_s("modified_file", git_pathspec_match_list_entry(m, 1)); - cl_assert_equal_s("staged_changes_modified_file", git_pathspec_match_list_entry(m, 2)); - cl_assert_equal_s("staged_delete_modified_file", git_pathspec_match_list_entry(m, 3)); - cl_assert_equal_s(NULL, git_pathspec_match_list_entry(m, 4)); - cl_assert_equal_sz(2, git_pathspec_match_list_failed_entrycount(m)); - cl_assert_equal_s("new_file", git_pathspec_match_list_failed_entry(m, 0)); - cl_assert_equal_s("garbage", git_pathspec_match_list_failed_entry(m, 1)); - cl_assert_equal_s(NULL, git_pathspec_match_list_failed_entry(m, 2)); - git_pathspec_match_list_free(m); - - git_object_free(tree); - - cl_git_pass(git_revparse_single(&tree, g_repo, "HEAD^{tree}")); - - cl_git_pass(git_pathspec_match_tree(&m, (git_tree *)tree, - GIT_PATHSPEC_FIND_FAILURES, ps)); - cl_assert_equal_sz(7, git_pathspec_match_list_entrycount(m)); - cl_assert_equal_s("current_file", git_pathspec_match_list_entry(m, 0)); - cl_assert_equal_s("modified_file", git_pathspec_match_list_entry(m, 1)); - cl_assert_equal_s("staged_changes_modified_file", git_pathspec_match_list_entry(m, 2)); - cl_assert_equal_s("staged_delete_modified_file", git_pathspec_match_list_entry(m, 3)); - cl_assert_equal_s("subdir/current_file", git_pathspec_match_list_entry(m, 4)); - cl_assert_equal_s("subdir/deleted_file", git_pathspec_match_list_entry(m, 5)); - cl_assert_equal_s("subdir/modified_file", git_pathspec_match_list_entry(m, 6)); - cl_assert_equal_s(NULL, git_pathspec_match_list_entry(m, 7)); - cl_assert_equal_sz(2, git_pathspec_match_list_failed_entrycount(m)); - cl_assert_equal_s("new_file", git_pathspec_match_list_failed_entry(m, 0)); - cl_assert_equal_s("garbage", git_pathspec_match_list_failed_entry(m, 1)); - cl_assert_equal_s(NULL, git_pathspec_match_list_failed_entry(m, 2)); - git_pathspec_match_list_free(m); - - git_object_free(tree); - - git_pathspec_free(ps); -} - -void test_repo_pathspec__tree5(void) -{ - git_object *tree; - git_strarray s; - git_pathspec *ps; - git_pathspec_match_list *m; - - /* { "S*" } */ - s.strings = str5; s.count = ARRAY_SIZE(str5); - cl_git_pass(git_pathspec_new(&ps, &s)); - - cl_git_pass(git_revparse_single(&tree, g_repo, "HEAD~2^{tree}")); - - cl_git_pass(git_pathspec_match_tree(&m, (git_tree *)tree, - GIT_PATHSPEC_USE_CASE | GIT_PATHSPEC_FIND_FAILURES, ps)); - cl_assert_equal_sz(0, git_pathspec_match_list_entrycount(m)); - cl_assert_equal_sz(1, git_pathspec_match_list_failed_entrycount(m)); - git_pathspec_match_list_free(m); - - cl_git_pass(git_pathspec_match_tree(&m, (git_tree *)tree, - GIT_PATHSPEC_IGNORE_CASE | GIT_PATHSPEC_FIND_FAILURES, ps)); - cl_assert_equal_sz(5, git_pathspec_match_list_entrycount(m)); - cl_assert_equal_s("staged_changes", git_pathspec_match_list_entry(m, 0)); - cl_assert_equal_s("staged_delete_modified_file", git_pathspec_match_list_entry(m, 4)); - cl_assert_equal_sz(0, git_pathspec_match_list_failed_entrycount(m)); - git_pathspec_match_list_free(m); - - git_object_free(tree); - - cl_git_pass(git_revparse_single(&tree, g_repo, "HEAD^{tree}")); - - cl_git_pass(git_pathspec_match_tree(&m, (git_tree *)tree, - GIT_PATHSPEC_IGNORE_CASE | GIT_PATHSPEC_FIND_FAILURES, ps)); - cl_assert_equal_sz(9, git_pathspec_match_list_entrycount(m)); - cl_assert_equal_s("staged_changes", git_pathspec_match_list_entry(m, 0)); - cl_assert_equal_s("subdir.txt", git_pathspec_match_list_entry(m, 5)); - cl_assert_equal_s("subdir/current_file", git_pathspec_match_list_entry(m, 6)); - cl_assert_equal_sz(0, git_pathspec_match_list_failed_entrycount(m)); - git_pathspec_match_list_free(m); - - git_object_free(tree); - - git_pathspec_free(ps); -} - -void test_repo_pathspec__in_memory(void) -{ - static char *strings[] = { "one", "two*", "!three*", "*four" }; - git_strarray s = { strings, ARRAY_SIZE(strings) }; - git_pathspec *ps; - - cl_git_pass(git_pathspec_new(&ps, &s)); - - cl_assert(git_pathspec_matches_path(ps, 0, "one")); - cl_assert(!git_pathspec_matches_path(ps, 0, "ONE")); - cl_assert(git_pathspec_matches_path(ps, GIT_PATHSPEC_IGNORE_CASE, "ONE")); - cl_assert(git_pathspec_matches_path(ps, 0, "two")); - cl_assert(git_pathspec_matches_path(ps, 0, "two.txt")); - cl_assert(!git_pathspec_matches_path(ps, 0, "three.txt")); - cl_assert(git_pathspec_matches_path(ps, 0, "anything.four")); - cl_assert(!git_pathspec_matches_path(ps, 0, "three.four")); - cl_assert(!git_pathspec_matches_path(ps, 0, "nomatch")); - cl_assert(!git_pathspec_matches_path(ps, GIT_PATHSPEC_NO_GLOB, "two")); - cl_assert(git_pathspec_matches_path(ps, GIT_PATHSPEC_NO_GLOB, "two*")); - cl_assert(!git_pathspec_matches_path(ps, GIT_PATHSPEC_NO_GLOB, "anyfour")); - cl_assert(git_pathspec_matches_path(ps, GIT_PATHSPEC_NO_GLOB, "*four")); - - git_pathspec_free(ps); -} diff --git a/vendor/libgit2/tests/repo/repo_helpers.c b/vendor/libgit2/tests/repo/repo_helpers.c deleted file mode 100644 index 61f696865..000000000 --- a/vendor/libgit2/tests/repo/repo_helpers.c +++ /dev/null @@ -1,22 +0,0 @@ -#include "clar_libgit2.h" -#include "refs.h" -#include "repo_helpers.h" -#include "posix.h" - -void make_head_unborn(git_repository* repo, const char *target) -{ - git_reference *head; - - cl_git_pass(git_reference_symbolic_create(&head, repo, GIT_HEAD_FILE, target, 1, NULL)); - git_reference_free(head); -} - -void delete_head(git_repository* repo) -{ - git_buf head_path = GIT_BUF_INIT; - - cl_git_pass(git_buf_joinpath(&head_path, git_repository_path(repo), GIT_HEAD_FILE)); - cl_git_pass(p_unlink(git_buf_cstr(&head_path))); - - git_buf_free(&head_path); -} diff --git a/vendor/libgit2/tests/repo/repo_helpers.h b/vendor/libgit2/tests/repo/repo_helpers.h deleted file mode 100644 index 6783d5701..000000000 --- a/vendor/libgit2/tests/repo/repo_helpers.h +++ /dev/null @@ -1,6 +0,0 @@ -#include "common.h" - -#define NON_EXISTING_HEAD "refs/heads/hide/and/seek" - -extern void make_head_unborn(git_repository* repo, const char *target); -extern void delete_head(git_repository* repo); diff --git a/vendor/libgit2/tests/repo/reservedname.c b/vendor/libgit2/tests/repo/reservedname.c deleted file mode 100644 index 2a5b38239..000000000 --- a/vendor/libgit2/tests/repo/reservedname.c +++ /dev/null @@ -1,132 +0,0 @@ -#include "clar_libgit2.h" -#include "../submodule/submodule_helpers.h" -#include "repository.h" - -void test_repo_reservedname__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -void test_repo_reservedname__includes_shortname_on_win32(void) -{ - git_repository *repo; - git_buf *reserved; - size_t reserved_len; - - repo = cl_git_sandbox_init("nasty"); - cl_assert(git_repository__reserved_names(&reserved, &reserved_len, repo, false)); - -#ifdef GIT_WIN32 - cl_assert_equal_i(2, reserved_len); - cl_assert_equal_s(".git", reserved[0].ptr); - cl_assert_equal_s("GIT~1", reserved[1].ptr); -#else - cl_assert_equal_i(1, reserved_len); - cl_assert_equal_s(".git", reserved[0].ptr); -#endif -} - -void test_repo_reservedname__includes_shortname_when_requested(void) -{ - git_repository *repo; - git_buf *reserved; - size_t reserved_len; - - repo = cl_git_sandbox_init("nasty"); - cl_assert(git_repository__reserved_names(&reserved, &reserved_len, repo, true)); - - cl_assert_equal_i(2, reserved_len); - cl_assert_equal_s(".git", reserved[0].ptr); - cl_assert_equal_s("GIT~1", reserved[1].ptr); -} - -/* Ensures that custom shortnames are included: creates a GIT~1 so that the - * .git folder itself will have to be named GIT~2 - */ -void test_repo_reservedname__custom_shortname_recognized(void) -{ -#ifdef GIT_WIN32 - git_repository *repo; - git_buf *reserved; - size_t reserved_len; - - if (!cl_sandbox_supports_8dot3()) - clar__skip(); - - repo = cl_git_sandbox_init("nasty"); - - cl_must_pass(p_rename("nasty/.git", "nasty/_temp")); - cl_git_write2file("nasty/git~1", "", 0, O_RDWR|O_CREAT, 0666); - cl_must_pass(p_rename("nasty/_temp", "nasty/.git")); - - cl_assert(git_repository__reserved_names(&reserved, &reserved_len, repo, true)); - - cl_assert_equal_i(3, reserved_len); - cl_assert_equal_s(".git", reserved[0].ptr); - cl_assert_equal_s("GIT~1", reserved[1].ptr); - cl_assert_equal_s("GIT~2", reserved[2].ptr); -#endif -} - -/* When looking at the short name for a submodule, we need to prevent - * people from overwriting the `.git` file in the submodule working - * directory itself. We don't want to look at the actual repository - * path, since it will be in the super's repository above us, and - * typically named with the name of our subrepository. Consequently, - * preventing access to the short name of the actual repository path - * would prevent us from creating files with the same name as the - * subrepo. (Eg, a submodule named "libgit2" could not contain a file - * named "libgit2", which would be unfortunate.) - */ -void test_repo_reservedname__submodule_pointer(void) -{ -#ifdef GIT_WIN32 - git_repository *super_repo, *sub_repo; - git_submodule *sub; - git_buf *sub_reserved; - size_t sub_reserved_len; - - if (!cl_sandbox_supports_8dot3()) - clar__skip(); - - super_repo = setup_fixture_submod2(); - - assert_submodule_exists(super_repo, "sm_unchanged"); - - cl_git_pass(git_submodule_lookup(&sub, super_repo, "sm_unchanged")); - cl_git_pass(git_submodule_open(&sub_repo, sub)); - - cl_assert(git_repository__reserved_names(&sub_reserved, &sub_reserved_len, sub_repo, true)); - - cl_assert_equal_i(2, sub_reserved_len); - cl_assert_equal_s(".git", sub_reserved[0].ptr); - cl_assert_equal_s("GIT~1", sub_reserved[1].ptr); - - git_submodule_free(sub); - git_repository_free(sub_repo); -#endif -} - -/* Like the `submodule_pointer` test (above), this ensures that we do not - * follow the gitlink to the submodule's repository location and treat that - * as a reserved name. This tests at an initial submodule update, where the - * submodule repo is being created. - */ -void test_repo_reservedname__submodule_pointer_during_create(void) -{ - git_repository *repo; - git_submodule *sm; - git_submodule_update_options update_options = GIT_SUBMODULE_UPDATE_OPTIONS_INIT; - git_buf url = GIT_BUF_INIT; - - repo = setup_fixture_super(); - - cl_git_pass(git_buf_joinpath(&url, clar_sandbox_path(), "sub.git")); - cl_repo_set_string(repo, "submodule.sub.url", url.ptr); - - cl_git_pass(git_submodule_lookup(&sm, repo, "sub")); - cl_git_pass(git_submodule_update(sm, 1, &update_options)); - - git_submodule_free(sm); - git_buf_free(&url); -} diff --git a/vendor/libgit2/tests/repo/setters.c b/vendor/libgit2/tests/repo/setters.c deleted file mode 100644 index 5a83fdbee..000000000 --- a/vendor/libgit2/tests/repo/setters.c +++ /dev/null @@ -1,109 +0,0 @@ -#include "clar_libgit2.h" -#include "git2/sys/repository.h" - -#include "buffer.h" -#include "posix.h" -#include "util.h" -#include "path.h" -#include "fileops.h" - -static git_repository *repo; - -void test_repo_setters__initialize(void) -{ - cl_fixture_sandbox("testrepo.git"); - cl_git_pass(git_repository_open(&repo, "testrepo.git")); - cl_must_pass(p_mkdir("new_workdir", 0777)); -} - -void test_repo_setters__cleanup(void) -{ - git_repository_free(repo); - repo = NULL; - - cl_fixture_cleanup("testrepo.git"); - cl_fixture_cleanup("new_workdir"); -} - -void test_repo_setters__setting_a_workdir_turns_a_bare_repository_into_a_standard_one(void) -{ - cl_assert(git_repository_is_bare(repo) == 1); - - cl_assert(git_repository_workdir(repo) == NULL); - cl_git_pass(git_repository_set_workdir(repo, "./new_workdir", false)); - - cl_assert(git_repository_workdir(repo) != NULL); - cl_assert(git_repository_is_bare(repo) == 0); -} - -void test_repo_setters__setting_a_workdir_prettifies_its_path(void) -{ - cl_git_pass(git_repository_set_workdir(repo, "./new_workdir", false)); - - cl_assert(git__suffixcmp(git_repository_workdir(repo), "new_workdir/") == 0); -} - -void test_repo_setters__setting_a_workdir_creates_a_gitlink(void) -{ - git_config *cfg; - git_buf buf = GIT_BUF_INIT; - git_buf content = GIT_BUF_INIT; - - cl_git_pass(git_repository_set_workdir(repo, "./new_workdir", true)); - - cl_assert(git_path_isfile("./new_workdir/.git")); - - cl_git_pass(git_futils_readbuffer(&content, "./new_workdir/.git")); - cl_assert(git__prefixcmp(git_buf_cstr(&content), "gitdir: ") == 0); - cl_assert(git__suffixcmp(git_buf_cstr(&content), "testrepo.git/") == 0); - git_buf_free(&content); - - cl_git_pass(git_repository_config(&cfg, repo)); - cl_git_pass(git_config_get_string_buf(&buf, cfg, "core.worktree")); - cl_assert(git__suffixcmp(git_buf_cstr(&buf), "new_workdir/") == 0); - - git_buf_free(&buf); - git_config_free(cfg); -} - -void test_repo_setters__setting_a_new_index_on_a_repo_which_has_already_loaded_one_properly_honors_the_refcount(void) -{ - git_index *new_index; - - cl_git_pass(git_index_open(&new_index, "./my-index")); - cl_assert(((git_refcount *)new_index)->refcount.val == 1); - - git_repository_set_index(repo, new_index); - cl_assert(((git_refcount *)new_index)->refcount.val == 2); - - git_repository_free(repo); - cl_assert(((git_refcount *)new_index)->refcount.val == 1); - - git_index_free(new_index); - - /* - * Ensure the cleanup method won't try to free the repo as it's already been taken care of - */ - repo = NULL; -} - -void test_repo_setters__setting_a_new_odb_on_a_repo_which_already_loaded_one_properly_honors_the_refcount(void) -{ - git_odb *new_odb; - - cl_git_pass(git_odb_open(&new_odb, "./testrepo.git/objects")); - cl_assert(((git_refcount *)new_odb)->refcount.val == 1); - - git_repository_set_odb(repo, new_odb); - cl_assert(((git_refcount *)new_odb)->refcount.val == 2); - - git_repository_free(repo); - cl_assert(((git_refcount *)new_odb)->refcount.val == 1); - - git_odb_free(new_odb); - - /* - * Ensure the cleanup method won't try to free the repo as it's already been taken care of - */ - repo = NULL; -} diff --git a/vendor/libgit2/tests/repo/shallow.c b/vendor/libgit2/tests/repo/shallow.c deleted file mode 100644 index 5aeaf2def..000000000 --- a/vendor/libgit2/tests/repo/shallow.c +++ /dev/null @@ -1,39 +0,0 @@ -#include "clar_libgit2.h" -#include "fileops.h" - -static git_repository *g_repo; - -void test_repo_shallow__initialize(void) -{ -} - -void test_repo_shallow__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -void test_repo_shallow__no_shallow_file(void) -{ - g_repo = cl_git_sandbox_init("testrepo.git"); - cl_assert_equal_i(0, git_repository_is_shallow(g_repo)); -} - -void test_repo_shallow__empty_shallow_file(void) -{ - g_repo = cl_git_sandbox_init("testrepo.git"); - cl_git_mkfile("testrepo.git/shallow", ""); - cl_assert_equal_i(0, git_repository_is_shallow(g_repo)); -} - -void test_repo_shallow__shallow_repo(void) -{ - g_repo = cl_git_sandbox_init("shallow.git"); - cl_assert_equal_i(1, git_repository_is_shallow(g_repo)); -} - -void test_repo_shallow__clears_errors(void) -{ - g_repo = cl_git_sandbox_init("testrepo.git"); - cl_assert_equal_i(0, git_repository_is_shallow(g_repo)); - cl_assert_equal_p(NULL, giterr_last()); -} diff --git a/vendor/libgit2/tests/repo/state.c b/vendor/libgit2/tests/repo/state.c deleted file mode 100644 index 7f20eebe8..000000000 --- a/vendor/libgit2/tests/repo/state.c +++ /dev/null @@ -1,132 +0,0 @@ -#include "clar_libgit2.h" -#include "buffer.h" -#include "refs.h" -#include "posix.h" -#include "fileops.h" - -static git_repository *_repo; -static git_buf _path; - -void test_repo_state__initialize(void) -{ - _repo = cl_git_sandbox_init("testrepo.git"); -} - -void test_repo_state__cleanup(void) -{ - cl_git_sandbox_cleanup(); - git_buf_free(&_path); -} - -static void setup_simple_state(const char *filename) -{ - cl_git_pass(git_buf_joinpath(&_path, git_repository_path(_repo), filename)); - git_futils_mkpath2file(git_buf_cstr(&_path), 0777); - cl_git_mkfile(git_buf_cstr(&_path), "dummy"); -} - -static void assert_repo_state(git_repository_state_t state) -{ - cl_assert_equal_i(state, git_repository_state(_repo)); -} - -void test_repo_state__none_with_HEAD_attached(void) -{ - assert_repo_state(GIT_REPOSITORY_STATE_NONE); -} - -void test_repo_state__none_with_HEAD_detached(void) -{ - cl_git_pass(git_repository_detach_head(_repo)); - assert_repo_state(GIT_REPOSITORY_STATE_NONE); -} - -void test_repo_state__merge(void) -{ - setup_simple_state(GIT_MERGE_HEAD_FILE); - assert_repo_state(GIT_REPOSITORY_STATE_MERGE); - cl_git_pass(git_repository_state_cleanup(_repo)); - assert_repo_state(GIT_REPOSITORY_STATE_NONE); -} - -void test_repo_state__revert(void) -{ - setup_simple_state(GIT_REVERT_HEAD_FILE); - assert_repo_state(GIT_REPOSITORY_STATE_REVERT); - cl_git_pass(git_repository_state_cleanup(_repo)); - assert_repo_state(GIT_REPOSITORY_STATE_NONE); -} - -void test_repo_state__revert_sequence(void) -{ - setup_simple_state(GIT_REVERT_HEAD_FILE); - setup_simple_state(GIT_SEQUENCER_TODO_FILE); - assert_repo_state(GIT_REPOSITORY_STATE_REVERT_SEQUENCE); - cl_git_pass(git_repository_state_cleanup(_repo)); - assert_repo_state(GIT_REPOSITORY_STATE_NONE); -} - -void test_repo_state__cherry_pick(void) -{ - setup_simple_state(GIT_CHERRYPICK_HEAD_FILE); - assert_repo_state(GIT_REPOSITORY_STATE_CHERRYPICK); - cl_git_pass(git_repository_state_cleanup(_repo)); - assert_repo_state(GIT_REPOSITORY_STATE_NONE); -} - -void test_repo_state__cherrypick_sequence(void) -{ - setup_simple_state(GIT_CHERRYPICK_HEAD_FILE); - setup_simple_state(GIT_SEQUENCER_TODO_FILE); - assert_repo_state(GIT_REPOSITORY_STATE_CHERRYPICK_SEQUENCE); - cl_git_pass(git_repository_state_cleanup(_repo)); - assert_repo_state(GIT_REPOSITORY_STATE_NONE); -} - -void test_repo_state__bisect(void) -{ - setup_simple_state(GIT_BISECT_LOG_FILE); - assert_repo_state(GIT_REPOSITORY_STATE_BISECT); - cl_git_pass(git_repository_state_cleanup(_repo)); - assert_repo_state(GIT_REPOSITORY_STATE_NONE); -} - -void test_repo_state__rebase_interactive(void) -{ - setup_simple_state(GIT_REBASE_MERGE_INTERACTIVE_FILE); - assert_repo_state(GIT_REPOSITORY_STATE_REBASE_INTERACTIVE); - cl_git_pass(git_repository_state_cleanup(_repo)); - assert_repo_state(GIT_REPOSITORY_STATE_NONE); -} - -void test_repo_state__rebase_merge(void) -{ - setup_simple_state(GIT_REBASE_MERGE_DIR "whatever"); - assert_repo_state(GIT_REPOSITORY_STATE_REBASE_MERGE); - cl_git_pass(git_repository_state_cleanup(_repo)); - assert_repo_state(GIT_REPOSITORY_STATE_NONE); -} - -void test_repo_state__rebase(void) -{ - setup_simple_state(GIT_REBASE_APPLY_REBASING_FILE); - assert_repo_state(GIT_REPOSITORY_STATE_REBASE); - cl_git_pass(git_repository_state_cleanup(_repo)); - assert_repo_state(GIT_REPOSITORY_STATE_NONE); -} - -void test_repo_state__apply_mailbox(void) -{ - setup_simple_state(GIT_REBASE_APPLY_APPLYING_FILE); - assert_repo_state(GIT_REPOSITORY_STATE_APPLY_MAILBOX); - cl_git_pass(git_repository_state_cleanup(_repo)); - assert_repo_state(GIT_REPOSITORY_STATE_NONE); -} - -void test_repo_state__apply_mailbox_or_rebase(void) -{ - setup_simple_state(GIT_REBASE_APPLY_DIR "whatever"); - assert_repo_state(GIT_REPOSITORY_STATE_APPLY_MAILBOX_OR_REBASE); - cl_git_pass(git_repository_state_cleanup(_repo)); - assert_repo_state(GIT_REPOSITORY_STATE_NONE); -} diff --git a/vendor/libgit2/tests/reset/default.c b/vendor/libgit2/tests/reset/default.c deleted file mode 100644 index c76f14813..000000000 --- a/vendor/libgit2/tests/reset/default.c +++ /dev/null @@ -1,212 +0,0 @@ -#include "clar_libgit2.h" -#include "posix.h" -#include "reset_helpers.h" -#include "path.h" - -static git_repository *_repo; -static git_object *_target; -static git_strarray _pathspecs; -static git_index *_index; - -static void initialize(const char *repo_name) -{ - _repo = cl_git_sandbox_init(repo_name); - cl_git_pass(git_repository_index(&_index, _repo)); - - _target = NULL; - - _pathspecs.strings = NULL; - _pathspecs.count = 0; -} - -void test_reset_default__initialize(void) -{ -} - -void test_reset_default__cleanup(void) -{ - git_object_free(_target); - _target = NULL; - - git_index_free(_index); - _index = NULL; - - cl_git_sandbox_cleanup(); -} - -static void assert_content_in_index( - git_strarray *pathspecs, - bool should_exist, - git_strarray *expected_shas) -{ - size_t i, pos; - int error; - - for (i = 0; i < pathspecs->count; i++) { - error = git_index_find(&pos, _index, pathspecs->strings[i]); - - if (should_exist) { - const git_index_entry *entry; - - cl_assert(error != GIT_ENOTFOUND); - - entry = git_index_get_byindex(_index, pos); - cl_assert(entry != NULL); - - if (!expected_shas) - continue; - - cl_git_pass(git_oid_streq(&entry->id, expected_shas->strings[i])); - } else - cl_assert_equal_i(should_exist, error != GIT_ENOTFOUND); - } -} - -void test_reset_default__resetting_filepaths_against_a_null_target_removes_them_from_the_index(void) -{ - char *paths[] = { "staged_changes", "staged_new_file" }; - - initialize("status"); - - _pathspecs.strings = paths; - _pathspecs.count = 2; - - assert_content_in_index(&_pathspecs, true, NULL); - - cl_git_pass(git_reset_default(_repo, NULL, &_pathspecs)); - - assert_content_in_index(&_pathspecs, false, NULL); -} - -/* - * $ git ls-files --cached -s --abbrev=7 -- "staged*" - * 100644 55d316c 0 staged_changes - * 100644 a6be623 0 staged_changes_file_deleted - * ... - * - * $ git reset 0017bd4 -- staged_changes staged_changes_file_deleted - * Unstaged changes after reset: - * ... - * - * $ git ls-files --cached -s --abbrev=7 -- "staged*" - * 100644 32504b7 0 staged_changes - * 100644 061d42a 0 staged_changes_file_deleted - * ... - */ -void test_reset_default__resetting_filepaths_replaces_their_corresponding_index_entries(void) -{ - git_strarray before, after; - - char *paths[] = { "staged_changes", "staged_changes_file_deleted" }; - char *before_shas[] = { "55d316c9ba708999f1918e9677d01dfcae69c6b9", - "a6be623522ce87a1d862128ac42672604f7b468b" }; - char *after_shas[] = { "32504b727382542f9f089e24fddac5e78533e96c", - "061d42a44cacde5726057b67558821d95db96f19" }; - - initialize("status"); - - _pathspecs.strings = paths; - _pathspecs.count = 2; - before.strings = before_shas; - before.count = 2; - after.strings = after_shas; - after.count = 2; - - cl_git_pass(git_revparse_single(&_target, _repo, "0017bd4")); - assert_content_in_index(&_pathspecs, true, &before); - - cl_git_pass(git_reset_default(_repo, _target, &_pathspecs)); - - assert_content_in_index(&_pathspecs, true, &after); -} - -/* - * $ git ls-files --cached -s --abbrev=7 -- conflicts-one.txt - * 100644 1f85ca5 1 conflicts-one.txt - * 100644 6aea5f2 2 conflicts-one.txt - * 100644 516bd85 3 conflicts-one.txt - * - * $ git reset 9a05ccb -- conflicts-one.txt - * Unstaged changes after reset: - * ... - * - * $ git ls-files --cached -s --abbrev=7 -- conflicts-one.txt - * 100644 1f85ca5 0 conflicts-one.txt - * - */ -void test_reset_default__resetting_filepaths_clears_previous_conflicts(void) -{ - const git_index_entry *conflict_entry[3]; - git_strarray after; - - char *paths[] = { "conflicts-one.txt" }; - char *after_shas[] = { "1f85ca51b8e0aac893a621b61a9c2661d6aa6d81" }; - - initialize("mergedrepo"); - - _pathspecs.strings = paths; - _pathspecs.count = 1; - after.strings = after_shas; - after.count = 1; - - cl_git_pass(git_index_conflict_get(&conflict_entry[0], &conflict_entry[1], - &conflict_entry[2], _index, "conflicts-one.txt")); - - cl_git_pass(git_revparse_single(&_target, _repo, "9a05ccb")); - cl_git_pass(git_reset_default(_repo, _target, &_pathspecs)); - - assert_content_in_index(&_pathspecs, true, &after); - - cl_assert_equal_i(GIT_ENOTFOUND, git_index_conflict_get(&conflict_entry[0], - &conflict_entry[1], &conflict_entry[2], _index, "conflicts-one.txt")); -} - -/* -$ git reset HEAD -- "I_am_not_there.txt" "me_neither.txt" -Unstaged changes after reset: -... -*/ -void test_reset_default__resetting_unknown_filepaths_does_not_fail(void) -{ - char *paths[] = { "I_am_not_there.txt", "me_neither.txt" }; - - initialize("status"); - - _pathspecs.strings = paths; - _pathspecs.count = 2; - - assert_content_in_index(&_pathspecs, false, NULL); - - cl_git_pass(git_revparse_single(&_target, _repo, "HEAD")); - cl_git_pass(git_reset_default(_repo, _target, &_pathspecs)); - - assert_content_in_index(&_pathspecs, false, NULL); -} - -void test_reset_default__staged_rename_reset_delete(void) -{ - git_index_entry entry; - const git_index_entry *existing; - char *paths[] = { "new.txt" }; - - initialize("testrepo2"); - - existing = git_index_get_bypath(_index, "new.txt", 0); - cl_assert(existing); - memcpy(&entry, existing, sizeof(entry)); - - cl_git_pass(git_index_remove_bypath(_index, "new.txt")); - - entry.path = "renamed.txt"; - cl_git_pass(git_index_add(_index, &entry)); - - _pathspecs.strings = paths; - _pathspecs.count = 1; - - assert_content_in_index(&_pathspecs, false, NULL); - - cl_git_pass(git_revparse_single(&_target, _repo, "HEAD")); - cl_git_pass(git_reset_default(_repo, _target, &_pathspecs)); - - assert_content_in_index(&_pathspecs, true, NULL); -} diff --git a/vendor/libgit2/tests/reset/hard.c b/vendor/libgit2/tests/reset/hard.c deleted file mode 100644 index e461f8093..000000000 --- a/vendor/libgit2/tests/reset/hard.c +++ /dev/null @@ -1,289 +0,0 @@ -#include "clar_libgit2.h" -#include "posix.h" -#include "reset_helpers.h" -#include "path.h" -#include "fileops.h" - -static git_repository *repo; -static git_object *target; - -void test_reset_hard__initialize(void) -{ - repo = cl_git_sandbox_init("status"); - target = NULL; -} - -void test_reset_hard__cleanup(void) -{ - if (target != NULL) { - git_object_free(target); - target = NULL; - } - - cl_git_sandbox_cleanup(); -} - -static int strequal_ignore_eol(const char *exp, const char *str) -{ - while (*exp && *str) { - if (*exp != *str) { - while (*exp == '\r' || *exp == '\n') ++exp; - while (*str == '\r' || *str == '\n') ++str; - if (*exp != *str) - return false; - } else { - exp++; str++; - } - } - return (!*exp && !*str); -} - -void test_reset_hard__resetting_reverts_modified_files(void) -{ - git_buf path = GIT_BUF_INIT, content = GIT_BUF_INIT; - int i; - static const char *files[4] = { - "current_file", - "modified_file", - "staged_new_file", - "staged_changes_modified_file" }; - static const char *before[4] = { - "current_file\n", - "modified_file\nmodified_file\n", - "staged_new_file\n", - "staged_changes_modified_file\nstaged_changes_modified_file\nstaged_changes_modified_file\n" - }; - static const char *after[4] = { - "current_file\n", - "modified_file\n", - NULL, - "staged_changes_modified_file\n" - }; - const char *wd = git_repository_workdir(repo); - - cl_assert(wd); - - for (i = 0; i < 4; ++i) { - cl_git_pass(git_buf_joinpath(&path, wd, files[i])); - cl_git_pass(git_futils_readbuffer(&content, path.ptr)); - cl_assert_equal_s(before[i], content.ptr); - } - - cl_git_pass(git_revparse_single(&target, repo, "26a125e")); - - cl_git_pass(git_reset(repo, target, GIT_RESET_HARD, NULL)); - - for (i = 0; i < 4; ++i) { - cl_git_pass(git_buf_joinpath(&path, wd, files[i])); - if (after[i]) { - cl_git_pass(git_futils_readbuffer(&content, path.ptr)); - cl_assert(strequal_ignore_eol(after[i], content.ptr)); - } else { - cl_assert(!git_path_exists(path.ptr)); - } - } - - git_buf_free(&content); - git_buf_free(&path); -} - -void test_reset_hard__cannot_reset_in_a_bare_repository(void) -{ - git_repository *bare; - - cl_git_pass(git_repository_open(&bare, cl_fixture("testrepo.git"))); - cl_assert(git_repository_is_bare(bare) == true); - - cl_git_pass(git_revparse_single(&target, bare, KNOWN_COMMIT_IN_BARE_REPO)); - - cl_assert_equal_i(GIT_EBAREREPO, git_reset(bare, target, GIT_RESET_HARD, NULL)); - - git_repository_free(bare); -} - -static void index_entry_init(git_index *index, int side, git_oid *oid) -{ - git_index_entry entry; - - memset(&entry, 0x0, sizeof(git_index_entry)); - - entry.path = "conflicting_file"; - GIT_IDXENTRY_STAGE_SET(&entry, side); - entry.mode = 0100644; - git_oid_cpy(&entry.id, oid); - - cl_git_pass(git_index_add(index, &entry)); -} - -static void unmerged_index_init(git_index *index, int entries) -{ - int write_ancestor = 1; - int write_ours = 2; - int write_theirs = 4; - git_oid ancestor, ours, theirs; - - git_oid_fromstr(&ancestor, "452e4244b5d083ddf0460acf1ecc74db9dcfa11a"); - git_oid_fromstr(&ours, "32504b727382542f9f089e24fddac5e78533e96c"); - git_oid_fromstr(&theirs, "061d42a44cacde5726057b67558821d95db96f19"); - - cl_git_rewritefile("status/conflicting_file", "conflicting file\n"); - - if (entries & write_ancestor) - index_entry_init(index, 1, &ancestor); - - if (entries & write_ours) - index_entry_init(index, 2, &ours); - - if (entries & write_theirs) - index_entry_init(index, 3, &theirs); -} - -void test_reset_hard__resetting_reverts_unmerged(void) -{ - git_index *index; - int entries; - - /* Ensure every permutation of non-zero stage entries results in the - * path being cleaned up. */ - for (entries = 1; entries < 8; entries++) { - cl_git_pass(git_repository_index(&index, repo)); - - unmerged_index_init(index, entries); - cl_git_pass(git_index_write(index)); - - cl_git_pass(git_revparse_single(&target, repo, "26a125e")); - cl_git_pass(git_reset(repo, target, GIT_RESET_HARD, NULL)); - - cl_assert(git_path_exists("status/conflicting_file") == 0); - - git_object_free(target); - target = NULL; - - git_index_free(index); - } -} - -void test_reset_hard__cleans_up_merge(void) -{ - git_buf merge_head_path = GIT_BUF_INIT, - merge_msg_path = GIT_BUF_INIT, - merge_mode_path = GIT_BUF_INIT, - orig_head_path = GIT_BUF_INIT; - - cl_git_pass(git_buf_joinpath(&merge_head_path, git_repository_path(repo), "MERGE_HEAD")); - cl_git_mkfile(git_buf_cstr(&merge_head_path), "beefbeefbeefbeefbeefbeefbeefbeefbeefbeef\n"); - - cl_git_pass(git_buf_joinpath(&merge_msg_path, git_repository_path(repo), "MERGE_MSG")); - cl_git_mkfile(git_buf_cstr(&merge_msg_path), "Merge commit 0017bd4ab1ec30440b17bae1680cff124ab5f1f6\n"); - - cl_git_pass(git_buf_joinpath(&merge_mode_path, git_repository_path(repo), "MERGE_MODE")); - cl_git_mkfile(git_buf_cstr(&merge_mode_path), ""); - - cl_git_pass(git_buf_joinpath(&orig_head_path, git_repository_path(repo), "ORIG_HEAD")); - cl_git_mkfile(git_buf_cstr(&orig_head_path), "0017bd4ab1ec30440b17bae1680cff124ab5f1f6"); - - cl_git_pass(git_revparse_single(&target, repo, "0017bd4")); - cl_git_pass(git_reset(repo, target, GIT_RESET_HARD, NULL)); - - cl_assert(!git_path_exists(git_buf_cstr(&merge_head_path))); - cl_assert(!git_path_exists(git_buf_cstr(&merge_msg_path))); - cl_assert(!git_path_exists(git_buf_cstr(&merge_mode_path))); - - cl_assert(git_path_exists(git_buf_cstr(&orig_head_path))); - cl_git_pass(p_unlink(git_buf_cstr(&orig_head_path))); - - git_buf_free(&merge_head_path); - git_buf_free(&merge_msg_path); - git_buf_free(&merge_mode_path); - git_buf_free(&orig_head_path); -} - -void test_reset_hard__reflog_is_correct(void) -{ - git_buf buf = GIT_BUF_INIT; - git_annotated_commit *annotated; - const char *exp_msg = "commit: Add a file which name should appear before the " - "\"subdir/\" folder while being dealt with by the treewalker"; - - reflog_check(repo, "HEAD", 3, "emeric.fermas@gmail.com", exp_msg); - reflog_check(repo, "refs/heads/master", 3, "emeric.fermas@gmail.com", exp_msg); - - /* Branch not moving, no reflog entry */ - cl_git_pass(git_revparse_single(&target, repo, "HEAD^{commit}")); - cl_git_pass(git_reset(repo, target, GIT_RESET_HARD, NULL)); - reflog_check(repo, "HEAD", 3, "emeric.fermas@gmail.com", exp_msg); - reflog_check(repo, "refs/heads/master", 3, "emeric.fermas@gmail.com", exp_msg); - - git_object_free(target); - - /* Moved branch, expect id in message */ - cl_git_pass(git_revparse_single(&target, repo, "HEAD~^{commit}")); - cl_git_pass(git_buf_printf(&buf, "reset: moving to %s", git_oid_tostr_s(git_object_id(target)))); - cl_git_pass(git_reset(repo, target, GIT_RESET_HARD, NULL)); - reflog_check(repo, "HEAD", 4, NULL, git_buf_cstr(&buf)); - reflog_check(repo, "refs/heads/master", 4, NULL, git_buf_cstr(&buf)); - - git_buf_free(&buf); - - /* Moved branch, expect revspec in message */ - exp_msg = "reset: moving to HEAD~^{commit}"; - cl_git_pass(git_annotated_commit_from_revspec(&annotated, repo, "HEAD~^{commit}")); - cl_git_pass(git_reset_from_annotated(repo, annotated, GIT_RESET_HARD, NULL)); - reflog_check(repo, "HEAD", 5, NULL, exp_msg); - reflog_check(repo, "refs/heads/master", 5, NULL, exp_msg); - - git_annotated_commit_free(annotated); - -} - -void test_reset_hard__switch_file_to_dir(void) -{ - git_index_entry entry = {{ 0 }}; - git_index *idx; - git_object *commit; - git_tree *tree; - git_signature *sig; - git_oid src_tree_id, tgt_tree_id; - git_oid src_id, tgt_id; - - entry.mode = GIT_FILEMODE_BLOB; - cl_git_pass(git_oid_fromstr(&entry.id, "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391")); - cl_git_pass(git_index_new(&idx)); - cl_git_pass(git_signature_now(&sig, "foo", "bar")); - - /* Create the old tree */ - entry.path = "README"; - cl_git_pass(git_index_add(idx, &entry)); - entry.path = "dir"; - cl_git_pass(git_index_add(idx, &entry)); - - cl_git_pass(git_index_write_tree_to(&src_tree_id, idx, repo)); - cl_git_pass(git_index_clear(idx)); - - cl_git_pass(git_tree_lookup(&tree, repo, &src_tree_id)); - cl_git_pass(git_commit_create(&src_id, repo, NULL, sig, sig, NULL, "foo", tree, 0, NULL)); - git_tree_free(tree); - - /* Create the new tree */ - entry.path = "README"; - cl_git_pass(git_index_add(idx, &entry)); - entry.path = "dir/FILE"; - cl_git_pass(git_index_add(idx, &entry)); - - cl_git_pass(git_index_write_tree_to(&tgt_tree_id, idx, repo)); - cl_git_pass(git_tree_lookup(&tree, repo, &tgt_tree_id)); - cl_git_pass(git_commit_create(&tgt_id, repo, NULL, sig, sig, NULL, "foo", tree, 0, NULL)); - git_tree_free(tree); - git_index_free(idx); - git_signature_free(sig); - - /* Let's go to a known state of the src commit with the file named 'dir' */ - cl_git_pass(git_object_lookup(&commit, repo, &src_id, GIT_OBJ_COMMIT)); - cl_git_pass(git_reset(repo, commit, GIT_RESET_HARD, NULL)); - git_object_free(commit); - - /* And now we move over to the commit with the directory named 'dir' */ - cl_git_pass(git_object_lookup(&commit, repo, &tgt_id, GIT_OBJ_COMMIT)); - cl_git_pass(git_reset(repo, commit, GIT_RESET_HARD, NULL)); - git_object_free(commit); -} diff --git a/vendor/libgit2/tests/reset/mixed.c b/vendor/libgit2/tests/reset/mixed.c deleted file mode 100644 index 97eac74e8..000000000 --- a/vendor/libgit2/tests/reset/mixed.c +++ /dev/null @@ -1,85 +0,0 @@ -#include "clar_libgit2.h" -#include "posix.h" -#include "reset_helpers.h" -#include "path.h" - -static git_repository *repo; -static git_object *target; - -void test_reset_mixed__initialize(void) -{ - repo = cl_git_sandbox_init("attr"); - target = NULL; -} - -void test_reset_mixed__cleanup(void) -{ - git_object_free(target); - target = NULL; - - cl_git_sandbox_cleanup(); -} - -void test_reset_mixed__cannot_reset_in_a_bare_repository(void) -{ - git_repository *bare; - - cl_git_pass(git_repository_open(&bare, cl_fixture("testrepo.git"))); - cl_assert(git_repository_is_bare(bare) == true); - - cl_git_pass(git_revparse_single(&target, bare, KNOWN_COMMIT_IN_BARE_REPO)); - - cl_assert_equal_i(GIT_EBAREREPO, git_reset(bare, target, GIT_RESET_MIXED, NULL)); - - git_repository_free(bare); -} - -void test_reset_mixed__resetting_refreshes_the_index_to_the_commit_tree(void) -{ - unsigned int status; - - cl_git_pass(git_status_file(&status, repo, "macro_bad")); - cl_assert(status == GIT_STATUS_CURRENT); - cl_git_pass(git_revparse_single(&target, repo, "605812a")); - - cl_git_pass(git_reset(repo, target, GIT_RESET_MIXED, NULL)); - - cl_git_pass(git_status_file(&status, repo, "macro_bad")); - cl_assert(status == GIT_STATUS_WT_NEW); -} - -void test_reset_mixed__reflog_is_correct(void) -{ - git_buf buf = GIT_BUF_INIT; - git_annotated_commit *annotated; - const char *exp_msg = "commit: Updating test data so we can test inter-hunk-context"; - - reflog_check(repo, "HEAD", 9, "yoram.harmelin@gmail.com", exp_msg); - reflog_check(repo, "refs/heads/master", 9, "yoram.harmelin@gmail.com", exp_msg); - - /* Branch not moving, no reflog entry */ - cl_git_pass(git_revparse_single(&target, repo, "HEAD^{commit}")); - cl_git_pass(git_reset(repo, target, GIT_RESET_MIXED, NULL)); - reflog_check(repo, "HEAD", 9, "yoram.harmelin@gmail.com", exp_msg); - reflog_check(repo, "refs/heads/master", 9, "yoram.harmelin@gmail.com", exp_msg); - - git_object_free(target); - target = NULL; - - /* Moved branch, expect id in message */ - cl_git_pass(git_revparse_single(&target, repo, "HEAD~^{commit}")); - git_buf_clear(&buf); - cl_git_pass(git_buf_printf(&buf, "reset: moving to %s", git_oid_tostr_s(git_object_id(target)))); - cl_git_pass(git_reset(repo, target, GIT_RESET_MIXED, NULL)); - reflog_check(repo, "HEAD", 10, NULL, git_buf_cstr(&buf)); - reflog_check(repo, "refs/heads/master", 10, NULL, git_buf_cstr(&buf)); - git_buf_free(&buf); - - /* Moved branch, expect revspec in message */ - exp_msg = "reset: moving to HEAD~^{commit}"; - cl_git_pass(git_annotated_commit_from_revspec(&annotated, repo, "HEAD~^{commit}")); - cl_git_pass(git_reset_from_annotated(repo, annotated, GIT_RESET_MIXED, NULL)); - reflog_check(repo, "HEAD", 11, NULL, exp_msg); - reflog_check(repo, "refs/heads/master", 11, NULL, exp_msg); - git_annotated_commit_free(annotated); -} diff --git a/vendor/libgit2/tests/reset/reset_helpers.c b/vendor/libgit2/tests/reset/reset_helpers.c deleted file mode 100644 index e6acec9ef..000000000 --- a/vendor/libgit2/tests/reset/reset_helpers.c +++ /dev/null @@ -1,20 +0,0 @@ -#include "clar_libgit2.h" -#include "reset_helpers.h" - -void reflog_check(git_repository *repo, const char *refname, - size_t exp_count, const char *exp_email, const char *exp_msg) -{ - git_reflog *log; - const git_reflog_entry *entry; - - GIT_UNUSED(exp_email); - - cl_git_pass(git_reflog_read(&log, repo, refname)); - cl_assert_equal_i(exp_count, git_reflog_entrycount(log)); - entry = git_reflog_entry_byindex(log, 0); - - if (exp_msg) - cl_assert_equal_s(exp_msg, git_reflog_entry_message(entry)); - - git_reflog_free(log); -} diff --git a/vendor/libgit2/tests/reset/reset_helpers.h b/vendor/libgit2/tests/reset/reset_helpers.h deleted file mode 100644 index e7e048514..000000000 --- a/vendor/libgit2/tests/reset/reset_helpers.h +++ /dev/null @@ -1,7 +0,0 @@ -#include "common.h" - -#define KNOWN_COMMIT_IN_BARE_REPO "e90810b8df3e80c413d903f631643c716887138d" -#define KNOWN_COMMIT_IN_ATTR_REPO "217878ab49e1314388ea2e32dc6fdb58a1b969e0" - -void reflog_check(git_repository *repo, const char *refname, - size_t exp_count, const char *exp_email, const char *exp_msg); diff --git a/vendor/libgit2/tests/reset/soft.c b/vendor/libgit2/tests/reset/soft.c deleted file mode 100644 index 506decaed..000000000 --- a/vendor/libgit2/tests/reset/soft.c +++ /dev/null @@ -1,189 +0,0 @@ -#include "clar_libgit2.h" -#include "posix.h" -#include "reset_helpers.h" -#include "path.h" -#include "repo/repo_helpers.h" - -static git_repository *repo; -static git_object *target; - -void test_reset_soft__initialize(void) -{ - repo = cl_git_sandbox_init("testrepo.git"); -} - -void test_reset_soft__cleanup(void) -{ - git_object_free(target); - target = NULL; - - cl_git_sandbox_cleanup(); -} - -static void assert_reset_soft(bool should_be_detached) -{ - git_oid oid; - - cl_git_pass(git_reference_name_to_id(&oid, repo, "HEAD")); - cl_git_fail(git_oid_streq(&oid, KNOWN_COMMIT_IN_BARE_REPO)); - cl_git_pass(git_revparse_single(&target, repo, KNOWN_COMMIT_IN_BARE_REPO)); - - cl_assert(git_repository_head_detached(repo) == should_be_detached); - - cl_git_pass(git_reset(repo, target, GIT_RESET_SOFT, NULL)); - - cl_assert(git_repository_head_detached(repo) == should_be_detached); - - cl_git_pass(git_reference_name_to_id(&oid, repo, "HEAD")); - cl_git_pass(git_oid_streq(&oid, KNOWN_COMMIT_IN_BARE_REPO)); -} - -void test_reset_soft__can_reset_the_non_detached_Head_to_the_specified_commit(void) -{ - assert_reset_soft(false); -} - -void test_reset_soft__can_reset_the_detached_Head_to_the_specified_commit(void) -{ - git_repository_detach_head(repo); - - assert_reset_soft(true); -} - -void test_reset_soft__resetting_to_the_commit_pointed_at_by_the_Head_does_not_change_the_target_of_the_Head(void) -{ - git_oid oid; - char raw_head_oid[GIT_OID_HEXSZ + 1]; - - cl_git_pass(git_reference_name_to_id(&oid, repo, "HEAD")); - git_oid_fmt(raw_head_oid, &oid); - raw_head_oid[GIT_OID_HEXSZ] = '\0'; - - cl_git_pass(git_revparse_single(&target, repo, raw_head_oid)); - - cl_git_pass(git_reset(repo, target, GIT_RESET_SOFT, NULL)); - - cl_git_pass(git_reference_name_to_id(&oid, repo, "HEAD")); - cl_git_pass(git_oid_streq(&oid, raw_head_oid)); -} - -void test_reset_soft__resetting_to_a_tag_sets_the_Head_to_the_peeled_commit(void) -{ - git_oid oid; - - /* b25fa35 is a tag, pointing to another tag which points to commit e90810b */ - cl_git_pass(git_revparse_single(&target, repo, "b25fa35")); - - cl_git_pass(git_reset(repo, target, GIT_RESET_SOFT, NULL)); - - cl_assert(git_repository_head_detached(repo) == false); - cl_git_pass(git_reference_name_to_id(&oid, repo, "HEAD")); - cl_git_pass(git_oid_streq(&oid, KNOWN_COMMIT_IN_BARE_REPO)); -} - -void test_reset_soft__cannot_reset_to_a_tag_not_pointing_at_a_commit(void) -{ - /* 53fc32d is the tree of commit e90810b */ - cl_git_pass(git_revparse_single(&target, repo, "53fc32d")); - - cl_git_fail(git_reset(repo, target, GIT_RESET_SOFT, NULL)); - git_object_free(target); - - /* 521d87c is an annotated tag pointing to a blob */ - cl_git_pass(git_revparse_single(&target, repo, "521d87c")); - cl_git_fail(git_reset(repo, target, GIT_RESET_SOFT, NULL)); -} - -void test_reset_soft__resetting_against_an_unborn_head_repo_makes_the_head_no_longer_unborn(void) -{ - git_reference *head; - - cl_git_pass(git_revparse_single(&target, repo, KNOWN_COMMIT_IN_BARE_REPO)); - - make_head_unborn(repo, NON_EXISTING_HEAD); - - cl_assert_equal_i(true, git_repository_head_unborn(repo)); - - cl_git_pass(git_reset(repo, target, GIT_RESET_SOFT, NULL)); - - cl_assert_equal_i(false, git_repository_head_unborn(repo)); - - cl_git_pass(git_reference_lookup(&head, repo, NON_EXISTING_HEAD)); - cl_assert_equal_i(0, git_oid_streq(git_reference_target(head), KNOWN_COMMIT_IN_BARE_REPO)); - - git_reference_free(head); -} - -void test_reset_soft__fails_when_merging(void) -{ - git_buf merge_head_path = GIT_BUF_INIT; - - cl_git_pass(git_repository_detach_head(repo)); - cl_git_pass(git_buf_joinpath(&merge_head_path, git_repository_path(repo), "MERGE_HEAD")); - cl_git_mkfile(git_buf_cstr(&merge_head_path), "beefbeefbeefbeefbeefbeefbeefbeefbeefbeef\n"); - - cl_git_pass(git_revparse_single(&target, repo, KNOWN_COMMIT_IN_BARE_REPO)); - - cl_assert_equal_i(GIT_EUNMERGED, git_reset(repo, target, GIT_RESET_SOFT, NULL)); - cl_git_pass(p_unlink(git_buf_cstr(&merge_head_path))); - - git_buf_free(&merge_head_path); -} - -void test_reset_soft__fails_when_index_contains_conflicts_independently_of_MERGE_HEAD_file_existence(void) -{ - git_index *index; - git_reference *head; - git_buf merge_head_path = GIT_BUF_INIT; - - cl_git_sandbox_cleanup(); - - repo = cl_git_sandbox_init("mergedrepo"); - - cl_git_pass(git_buf_joinpath(&merge_head_path, git_repository_path(repo), "MERGE_HEAD")); - cl_git_pass(p_unlink(git_buf_cstr(&merge_head_path))); - git_buf_free(&merge_head_path); - - cl_git_pass(git_repository_index(&index, repo)); - cl_assert_equal_i(true, git_index_has_conflicts(index)); - git_index_free(index); - - cl_git_pass(git_repository_head(&head, repo)); - cl_git_pass(git_reference_peel(&target, head, GIT_OBJ_COMMIT)); - git_reference_free(head); - - cl_assert_equal_i(GIT_EUNMERGED, git_reset(repo, target, GIT_RESET_SOFT, NULL)); -} - -void test_reset_soft__reflog_is_correct(void) -{ - git_annotated_commit *annotated; - const char *exp_msg = "checkout: moving from br2 to master"; - const char *master_msg = "commit: checking in"; - - reflog_check(repo, "HEAD", 7, "yoram.harmelin@gmail.com", exp_msg); - reflog_check(repo, "refs/heads/master", 2, "yoram.harmelin@gmail.com", master_msg); - - /* Branch not moving, no reflog entry */ - cl_git_pass(git_revparse_single(&target, repo, "HEAD^{commit}")); - cl_git_pass(git_reset(repo, target, GIT_RESET_SOFT, NULL)); - reflog_check(repo, "HEAD", 7, "yoram.harmelin@gmail.com", exp_msg); - reflog_check(repo, "refs/heads/master", 2, "yoram.harmelin@gmail.com", master_msg); - git_object_free(target); - - /* Moved branch, expect id in message */ - exp_msg = "reset: moving to be3563ae3f795b2b4353bcce3a527ad0a4f7f644"; - cl_git_pass(git_revparse_single(&target, repo, "HEAD~^{commit}")); - cl_git_pass(git_reset(repo, target, GIT_RESET_SOFT, NULL)); - reflog_check(repo, "HEAD", 8, "yoram.harmelin@gmail.com", exp_msg); - reflog_check(repo, "refs/heads/master", 3, NULL, exp_msg); - - /* Moved branch, expect message with annotated string */ - exp_msg = "reset: moving to HEAD~^{commit}"; - cl_git_pass(git_annotated_commit_from_revspec(&annotated, repo, "HEAD~^{commit}")); - cl_git_pass(git_reset_from_annotated(repo, annotated, GIT_RESET_SOFT, NULL)); - reflog_check(repo, "HEAD", 9, "yoram.harmelin@gmail.com", exp_msg); - reflog_check(repo, "refs/heads/master", 4, NULL, exp_msg); - - git_annotated_commit_free(annotated); -} diff --git a/vendor/libgit2/tests/resources/.gitattributes b/vendor/libgit2/tests/resources/.gitattributes deleted file mode 100644 index 556f8c827..000000000 --- a/vendor/libgit2/tests/resources/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -* binary diff --git a/vendor/libgit2/tests/resources/.gitignore b/vendor/libgit2/tests/resources/.gitignore deleted file mode 100644 index 43a19cc9d..000000000 --- a/vendor/libgit2/tests/resources/.gitignore +++ /dev/null @@ -1 +0,0 @@ -discover.git diff --git a/vendor/libgit2/tests/resources/attr/.gitted/HEAD b/vendor/libgit2/tests/resources/attr/.gitted/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/vendor/libgit2/tests/resources/attr/.gitted/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/vendor/libgit2/tests/resources/attr/.gitted/config b/vendor/libgit2/tests/resources/attr/.gitted/config deleted file mode 100644 index af107929f..000000000 --- a/vendor/libgit2/tests/resources/attr/.gitted/config +++ /dev/null @@ -1,6 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true diff --git a/vendor/libgit2/tests/resources/attr/.gitted/description b/vendor/libgit2/tests/resources/attr/.gitted/description deleted file mode 100644 index 498b267a8..000000000 --- a/vendor/libgit2/tests/resources/attr/.gitted/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/vendor/libgit2/tests/resources/attr/.gitted/index b/vendor/libgit2/tests/resources/attr/.gitted/index deleted file mode 100644 index 439ffb151ef49cb3e655e6cda9eee1a64aeaaa54..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1856 zcmZ?q402{*U|<4basLNAen6T5M)NT+urM6wlVxCNT*AP>_!TH60>qr5`8`e5eO^p! zV^){nS+r;KBee~i8CVlbN{S3X+Tr@q%#lMihjE*A$?dAmjRLU;F7-D}U0$EnG-J{v zh&hJ%%#lYmhe<;x?V*3UWZv@R-*S$LI#P@F==NQLm}7*`90gQ!7}}1su6`V~*K66| z<_%@byZ5bp^!z~%#2jOM<|v|>!+e9GBX>?)vDDKe%e1-6kC-#YFC?h7!3?(CI(9r0aSCCqO={3u2~ql!EePS{(oj?e{7hXxzUS(H$Afi6x5kX zr6sAw_}ry|Y90eigyh23>($IgQR~}J{VA8-oS%DVIRj^IVscS_d{SZxu6WZ#Gl%(q z=8xn#kDf7d+Z!);OjvcZ+vAot0~f>`pqom-jsg;}_=nNZ^rVGmo`|c6RORvtr=zoy zm8LK&art>a_p@c-D$36f4^BIDp!16EDy;%Na6sQ_g5N}kKi=ezvt_@(9FBL z;Jaeg%lT1hCkIC z!WlR~=0FlI%pEWq>K+TC%;5o9pTHomsmkyZm&7g{u)LtpdZ>2+75kV*j;%=xEQ{FKxE9(=ctjV+T7o02eg> A2LJ#7 diff --git a/vendor/libgit2/tests/resources/attr/.gitted/info/attributes b/vendor/libgit2/tests/resources/attr/.gitted/info/attributes deleted file mode 100644 index 5fe62a37a..000000000 --- a/vendor/libgit2/tests/resources/attr/.gitted/info/attributes +++ /dev/null @@ -1,4 +0,0 @@ -* repoattr -a* foo !bar -baz -sub/*.txt reposub -sub/sub/*.txt reposubsub diff --git a/vendor/libgit2/tests/resources/attr/.gitted/info/exclude b/vendor/libgit2/tests/resources/attr/.gitted/info/exclude deleted file mode 100644 index a5196d1be..000000000 --- a/vendor/libgit2/tests/resources/attr/.gitted/info/exclude +++ /dev/null @@ -1,6 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ diff --git a/vendor/libgit2/tests/resources/attr/.gitted/logs/HEAD b/vendor/libgit2/tests/resources/attr/.gitted/logs/HEAD deleted file mode 100644 index 8ece39f37..000000000 --- a/vendor/libgit2/tests/resources/attr/.gitted/logs/HEAD +++ /dev/null @@ -1,9 +0,0 @@ -0000000000000000000000000000000000000000 6bab5c79cd5140d0f800917f550eb2a3dc32b0da Russell Belfer 1324416995 -0800 commit (initial): initial test data -6bab5c79cd5140d0f800917f550eb2a3dc32b0da 605812ab7fe421fdd325a935d35cb06a9234a7d7 Russell Belfer 1325143098 -0800 commit: latest test updates -605812ab7fe421fdd325a935d35cb06a9234a7d7 a5d76cad53f66f1312bd995909a5bab3c0820770 Russell Belfer 1325281762 -0800 commit: more macro tests -a5d76cad53f66f1312bd995909a5bab3c0820770 370fe9ec224ce33e71f9e5ec2bd1142ce9937a6a Russell Belfer 1327611749 -0800 commit: Updating files so we can do diffs -370fe9ec224ce33e71f9e5ec2bd1142ce9937a6a f5b0af1fb4f5c0cd7aad880711d368a07333c307 Russell Belfer 1327621027 -0800 commit: Updating test data -f5b0af1fb4f5c0cd7aad880711d368a07333c307 a97cc019851d401a4f1d091cb91a15890a0dd1ba Russell Belfer 1328653313 -0800 commit: Some whitespace only changes for testing purposes -a97cc019851d401a4f1d091cb91a15890a0dd1ba 217878ab49e1314388ea2e32dc6fdb58a1b969e0 Russell Belfer 1332734901 -0700 commit: added files in sub/sub -217878ab49e1314388ea2e32dc6fdb58a1b969e0 24fa9a9fc4e202313e24b648087495441dab432b Russell Belfer 1332735555 -0700 commit: adding more files in sub for tree status -24fa9a9fc4e202313e24b648087495441dab432b 8d0b9df9bd30be7910ddda60548d485bc302b911 yorah 1341230701 +0200 commit: Updating test data so we can test inter-hunk-context diff --git a/vendor/libgit2/tests/resources/attr/.gitted/logs/refs/heads/master b/vendor/libgit2/tests/resources/attr/.gitted/logs/refs/heads/master deleted file mode 100644 index 8ece39f37..000000000 --- a/vendor/libgit2/tests/resources/attr/.gitted/logs/refs/heads/master +++ /dev/null @@ -1,9 +0,0 @@ -0000000000000000000000000000000000000000 6bab5c79cd5140d0f800917f550eb2a3dc32b0da Russell Belfer 1324416995 -0800 commit (initial): initial test data -6bab5c79cd5140d0f800917f550eb2a3dc32b0da 605812ab7fe421fdd325a935d35cb06a9234a7d7 Russell Belfer 1325143098 -0800 commit: latest test updates -605812ab7fe421fdd325a935d35cb06a9234a7d7 a5d76cad53f66f1312bd995909a5bab3c0820770 Russell Belfer 1325281762 -0800 commit: more macro tests -a5d76cad53f66f1312bd995909a5bab3c0820770 370fe9ec224ce33e71f9e5ec2bd1142ce9937a6a Russell Belfer 1327611749 -0800 commit: Updating files so we can do diffs -370fe9ec224ce33e71f9e5ec2bd1142ce9937a6a f5b0af1fb4f5c0cd7aad880711d368a07333c307 Russell Belfer 1327621027 -0800 commit: Updating test data -f5b0af1fb4f5c0cd7aad880711d368a07333c307 a97cc019851d401a4f1d091cb91a15890a0dd1ba Russell Belfer 1328653313 -0800 commit: Some whitespace only changes for testing purposes -a97cc019851d401a4f1d091cb91a15890a0dd1ba 217878ab49e1314388ea2e32dc6fdb58a1b969e0 Russell Belfer 1332734901 -0700 commit: added files in sub/sub -217878ab49e1314388ea2e32dc6fdb58a1b969e0 24fa9a9fc4e202313e24b648087495441dab432b Russell Belfer 1332735555 -0700 commit: adding more files in sub for tree status -24fa9a9fc4e202313e24b648087495441dab432b 8d0b9df9bd30be7910ddda60548d485bc302b911 yorah 1341230701 +0200 commit: Updating test data so we can test inter-hunk-context diff --git a/vendor/libgit2/tests/resources/attr/.gitted/objects/10/8bb4e7fd7b16490dc33ff7d972151e73d7166e b/vendor/libgit2/tests/resources/attr/.gitted/objects/10/8bb4e7fd7b16490dc33ff7d972151e73d7166e deleted file mode 100644 index edcf7520c758be0f9bc4b51b8e4056982e9f1527..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 130 zcmV-|0Db>>0VRwv4#F@LLz#05Z_Erxtd)8L2If@xAra}f)cg|l_6=e2@cithaKY{V zxIDQEd@L+>UHD6|Sj kyvcxSdyHc?>CwjX!5z)34LVb=h99z&_0uoh38$AdjSm?>ivR!s diff --git a/vendor/libgit2/tests/resources/attr/.gitted/objects/16/983da6643656bb44c43965ecb6855c6d574512 b/vendor/libgit2/tests/resources/attr/.gitted/objects/16/983da6643656bb44c43965ecb6855c6d574512 deleted file mode 100644 index e49c94acdaa60287fbaeb2e98bcfab43710b327d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 446 zcmV;v0YUzF0V^p=O;s>8He)a}FfcPQQAjK)DKcOP&F^Wd?(mk!9N4*WOR^9COxTOtMRg|A! z5)V>j$lxj>Rk^&v>FBIvr76rxTz=lq{cO=y88P@4+8*i4mcAa%o4A&}d*vysu##AG zRmKbg-CLgjtrqj-J#7E|W|62|@pZ90bX6vLB^4zM3%)B>y__F)_(iM9*K>=~|Luui z5p7}s1PaBaNepjx)_z)8GNYt)O=F&g`=7q~Ig#0L*_6y8hWT5#(@O6?;|`m?{@l8W o+j1xLFx^B}V8o!Qc~3*<<;<6X&FgL*bCor237z8&0JNyxfdtg*5dZ)H diff --git a/vendor/libgit2/tests/resources/attr/.gitted/objects/21/7878ab49e1314388ea2e32dc6fdb58a1b969e0 b/vendor/libgit2/tests/resources/attr/.gitted/objects/21/7878ab49e1314388ea2e32dc6fdb58a1b969e0 deleted file mode 100644 index b537899f2..000000000 --- a/vendor/libgit2/tests/resources/attr/.gitted/objects/21/7878ab49e1314388ea2e32dc6fdb58a1b969e0 +++ /dev/null @@ -1,4 +0,0 @@ -xŽQ -Â0DýÎ)öên“ØDÄ#xƒmvƒ…ÖJ’Þ߀7ðcx0¼IۺΠ­¨‚óž-¹ÌÁñ+e"¼vù‚Á‡œâ˜ùpÑwŽcJH1x‡Ô%Œ”¦HL>Dd¡‰ ïíµxîµê²ÀC—¬®\ʤzÿᔶõdí0Z‘àˆ#¢émÿغþÏÚ°ˆ -äyÑ -óê>{Ì–qK² \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/attr/.gitted/objects/24/fa9a9fc4e202313e24b648087495441dab432b b/vendor/libgit2/tests/resources/attr/.gitted/objects/24/fa9a9fc4e202313e24b648087495441dab432b deleted file mode 100644 index e7099bbaa476b5da9cd9a8dbad59e73d705a83a6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 180 zcmV;l089UP0iBQAX#_D8L-Xw_ZUb5T7|*p~2_YqH2iG2XGcb=}d-{*rbP)Xrgbqmg z-1oJU_59W=Kp8GdWZ{xbk*HHH9&C)AVm9!aC!Pfw>PIS$0U8b*Bux>4WH2-^Ff%bxC@xJ($t*I8FG(#fF=V)N>Xw_X?TCDï yNlÍ£¡>c¯;gÓ•¥kÇYXÄ9b|Dª~VØ—)…v¿øñÎÜ• \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/attr/.gitted/objects/2c/66e14f77196ea763fb1e41612c1aa2bc2d8ed2 b/vendor/libgit2/tests/resources/attr/.gitted/objects/2c/66e14f77196ea763fb1e41612c1aa2bc2d8ed2 deleted file mode 100644 index 4b75d50eb4ab255f84521d505088a79ecaa6c12c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 316 zcmV-C0mJ@y0d-MJPs1<_=G;cNeeRIo+J}L z1Gebc0w#|gMO#+es)T<|o~W_e!0N31W|`0glDs$Ahmke$U%5}td#LG$e OFJMp&g~K-|%DK85WSqMI diff --git a/vendor/libgit2/tests/resources/attr/.gitted/objects/2d/e7dfe3588f3c7e9ad59e7d50ba90e3329df9d9 b/vendor/libgit2/tests/resources/attr/.gitted/objects/2d/e7dfe3588f3c7e9ad59e7d50ba90e3329df9d9 deleted file mode 100644 index e0fd0468e8db788cd831d69d4ac10a6a427ba884..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 124 zcmV-?0E7Q{0V^p=O;s>7GGj0_FfcPQQP4}zEJ-XWDauSLElDkAIKJv`Id3HU3ilYz zm+ur8Rd?)9kA e!|#Cfjq5(Ik-Ft=K6lUdi$$ULYbyYn_BZ6rjW<~U diff --git a/vendor/libgit2/tests/resources/attr/.gitted/objects/37/0fe9ec224ce33e71f9e5ec2bd1142ce9937a6a b/vendor/libgit2/tests/resources/attr/.gitted/objects/37/0fe9ec224ce33e71f9e5ec2bd1142ce9937a6a deleted file mode 100644 index 9c37c5946cf33f0dae9266d1e87d926d546010b7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 177 zcmV;i08amS0i90UX#+73%(tr81`_l*NhdHNq=bMASZQ~YgS(TFWZb?5>A+vZJeg9D zV;f+-ejAM$qKQ(Rk&xF#5`{@{Vaf%qPc*$`Gc#Lt!^YBzV`W)@rKrke diff --git a/vendor/libgit2/tests/resources/attr/.gitted/objects/3a/6df026462ebafe455af9867d27eda20a9e0974 b/vendor/libgit2/tests/resources/attr/.gitted/objects/3a/6df026462ebafe455af9867d27eda20a9e0974 deleted file mode 100644 index c74add8265383a1c4d303e844383353cac3c4db5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 84 zcmV-a0IUCa0X51o3V<*S1yJXn;-A6E19$@m=aznGAWfhKdwoT4dDAQE1>3qD-ichR qgt%peit$Qm_i1PxM4|dbG{RrTA5Mt|-ZXT7SB|gHYI*>84<5l5-zBF2 diff --git a/vendor/libgit2/tests/resources/attr/.gitted/objects/3b/74db7ab381105dc0d28f8295a77f6a82989292 b/vendor/libgit2/tests/resources/attr/.gitted/objects/3b/74db7ab381105dc0d28f8295a77f6a82989292 deleted file mode 100644 index e5cef35fa4e79e2ad52c112c675747678f8c77ef..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 276 zcmV+v0qg#F0ZouiZo)7Sg}e4CrplrcQWGE$!is|ci%IMd3ulbtDL*}Z?MYhI3w!*@ zZ^rL6&Nr|r>$eOLT0abi7&`Bqe;5tT3xXdEG!E$s&XNf#E|3)!O&qd1bd;BWB~0=pbw4_eGw~#F8JbCHpMvaO3gUO3tB2t ac4VGBwT_|2XpQe=ZZx+SzW)Iljg8nEEP|l` diff --git a/vendor/libgit2/tests/resources/attr/.gitted/objects/3e/42ffc54a663f9401cc25843d6c0e71a33e4249 b/vendor/libgit2/tests/resources/attr/.gitted/objects/3e/42ffc54a663f9401cc25843d6c0e71a33e4249 deleted file mode 100644 index 091d79b149cc070376589fafbf13cc16a6b0f692..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 596 zcmV-a0;~Oa0fkh-j@mE~?Uj7Rbh`&wg`nN-UMlslRn>}X#l3Qp39;nZ)OMik*Y}N+ z5@5G#4xpIvoA=(lp){_f`-hKD?>^9mL!?FM->JCMC8t3SJsXQ%9 z^@4M`S6uK|pt!6~#Zo(!#?>3e19ZoJ%by{x@jO8+r6GFxY<5?SsNO}ihANskLfD=y zMMpaoTZ${;pgdFMx*hDPNd=HM#vK9_-xu`dnC#M4+b!xZdC~mP>Z&Cj2m+;5P#sgP zJy+5BqoB#DG!y$!^sC2kw6lv`Oop|#mKqgPVWT}pXS8MNRID(Of|BA%1DXj`;8@T) zk}|w1GzN%1)B*kVF5ggja2 zM4MrRUWT1~NFaj&^!yh~5-GDywmcT}O8He)a}FfcPQQAjK)DKcOP&F^Wd?(mk!9N4*WOR^9COxTOtMRg|A! z5)V>j$lxj>Rk^&v>FBIvr76rxTz=lq{cO=y88P@4+8*i4mcAa%o4A&}d*vysu##AG zRmKbg-CLgjtrqj-J#7E|W|62|@pZ90bX6vLB^4zM|H{n^jxIY>*c!nziDlz|iN*Gx z|Cks6fkJU<62s)gFWfteEYF8FN=$m_`{=QYSocD>Y)WPk!~8AWX{C3cafeM`e{S8x oZMhSAm~J8~Fk;Zuyr-e_a^}mx=5@D@xyl;1gwF8>0Ji4Z{~yNdr~m)} diff --git a/vendor/libgit2/tests/resources/attr/.gitted/objects/45/b983be36b73c0788dc9cbcb76cbb80fc7bb057 b/vendor/libgit2/tests/resources/attr/.gitted/objects/45/b983be36b73c0788dc9cbcb76cbb80fc7bb057 deleted file mode 100644 index 7ca4ceed50400af7e36b25ff200a7be95f0bc61f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18 acmbAU@$Z=Ff%bxNXyJgWpLfuyw7aA4SUC(IeWI}>~8o|y&)Vb nUtF35M0zC^B@FYT@3>!E!LR+`m4WBl5@qQr36q=vdCDH$Y{(@5 diff --git a/vendor/libgit2/tests/resources/attr/.gitted/objects/55/6f8c827b8e4a02ad5cab77dca2bcb3e226b0b3 b/vendor/libgit2/tests/resources/attr/.gitted/objects/55/6f8c827b8e4a02ad5cab77dca2bcb3e226b0b3 deleted file mode 100644 index 4bcff1faaa88bdb8c53b904ce67b59e46a293e56..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24 gcmbbpXS{V*Jz-+dlx4XD0EjONFaQ7m diff --git a/vendor/libgit2/tests/resources/attr/.gitted/objects/58/19a185d77b03325aaf87cafc771db36f6ddca7 b/vendor/libgit2/tests/resources/attr/.gitted/objects/58/19a185d77b03325aaf87cafc771db36f6ddca7 deleted file mode 100644 index fe34eb63a24a5a6f018ec69a08111506d58efe31..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19 acmb¥®M§ýS»þOmʧhá -*‡ÂÂÊæ ¿<- \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/attr/.gitted/objects/6d/968d62c89c7d9ea23a4c9a7b665d017c3d8ffd b/vendor/libgit2/tests/resources/attr/.gitted/objects/6d/968d62c89c7d9ea23a4c9a7b665d017c3d8ffd deleted file mode 100644 index e832241c9e518a3c468902831f57f8cd6d60be61..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 422 zcmV;X0a^Zd0V^p=O;s>8Fk>(@FfcPQQAjK)DKcOP&F^Wd?(mk!9N4*WOR^9COxTOtMRg|A! z5)V>j$lxj>Rk^&v>FBIvr76rxTz=lq{cO=y88P@4+8*i4mcAa%o4A&}d*vysu##AG zRmKbg-CLgjtrqj-J#7E|W|62|@pZ90bX6vLB^4zM|H{n^jxIY>*c!nziDlz|iN*Gx z|Cks6fkJU0M1R$f1PUG6#xJL diff --git a/vendor/libgit2/tests/resources/attr/.gitted/objects/71/7fc31f6b84f9d6fc3a4edbca259d7fc92beee2 b/vendor/libgit2/tests/resources/attr/.gitted/objects/71/7fc31f6b84f9d6fc3a4edbca259d7fc92beee2 deleted file mode 100644 index a80265caca9c51a629bd5e994dcfcb4e7f361800..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 422 zcmV;X0a^Zd0V^p=O;s>8Fk>(@FfcPQQAjK)DKcOP&F^Wd?(mk!9N4*WOR^9COxTOtMRg|A! z5)V>j$lxj>Rk^&v>FBIvr76rxTz=lq{cO=y88P@4+8*i4mcAa%o4A&}d*vysu##AG zRmKcfxgXTr^mhGojr!SEtNwNo*F4S=bX6vLB^4zMzXQ@YuKT=3>Xx_p+&$Yb7KPrg ztuQeF0)^tzq?F7ehWT5#(@O6?;|`m?{@l8W+j1xLFx^B}V8o!Qc~3*<<;<6X&FgL* QbCor237z8&01I2sMPj(!-T(jq diff --git a/vendor/libgit2/tests/resources/attr/.gitted/objects/8d/0b9df9bd30be7910ddda60548d485bc302b911 b/vendor/libgit2/tests/resources/attr/.gitted/objects/8d/0b9df9bd30be7910ddda60548d485bc302b911 deleted file mode 100644 index 3dcf088e4..000000000 --- a/vendor/libgit2/tests/resources/attr/.gitted/objects/8d/0b9df9bd30be7910ddda60548d485bc302b911 +++ /dev/null @@ -1 +0,0 @@ -xŽKj1D³Ö)zolôiõŒ _"hiÚK2²L’ÛG!7Ȫ¯¨ÔJÉ,ù—ÑEÀPXÝÆDèÈSŒˆ ] /)Òê}¢Í/èUwîR§ˆ. Åj댋‘pÕë‚Á#š#:?ÇÞ:|·Î;¼þF9íÜ‹Ür=_ çÛ)µòÆ¡±N/ÚÀA[­ÕlçÃ!ÿqÕû}ã‘ë†<Lfx4øH\ÿº\çôqÖcj“¿†úƒTè \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/attr/.gitted/objects/93/61f40bb97239cf55811892e14de2e344168ba1 b/vendor/libgit2/tests/resources/attr/.gitted/objects/93/61f40bb97239cf55811892e14de2e344168ba1 deleted file mode 100644 index 4b57836cd2415320e671db485adc3710da4c6398..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 45 zcmV+|0Mh?>0V^p=O;s>9U@$QN0)^tzBnCgvT|Ln`M*lU=&OM#5&*XlW%35~|9HgyJ95f>8YBP+#nw)?MB*-lUKLEX>J=}AdmWdNI#WD# eN}gsxo#jqj`XRSVh0m9=`a|s8w($*^PCE44>pKGg diff --git a/vendor/libgit2/tests/resources/attr/.gitted/objects/96/089fd31ce1d3ee2afb0ba09ba063066932f027 b/vendor/libgit2/tests/resources/attr/.gitted/objects/96/089fd31ce1d3ee2afb0ba09ba063066932f027 deleted file mode 100644 index efa62f9126094e49dd42e2c035cbc2e1cc53926f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 422 zcmV;X0a^Zd0V^p=O;s>8Fk>(@FfcPQQAjK)DKcOP&F^Wd?(mk!9N4*WOR^9COxTOtMRg|A! z5)V>j$lxj>Rk^&v>FBIvr76rxTz=lq{cO=y88P@4+8*i4mcAa%o4A&}d*vysu##AG zRmKb_vv=#LhOaP+dKfy-dik6?Z#Ef}p{p{{E2$`9_*ZUTaCF(3!qy0$Nh}-xODwkk z{Kv!q2o#D-lTtE^80K%`PAk3pj5}=l`g7|hZp)p}!*ml_ff0kI<~7HD@q1FfcPQQP4}zEJ-XWDauSLElDkAnEC2SS!cc{yOL+c zj=s24%Z~0&UkO#2n3T+5=k))mSDO74#xtrdwmE!-i|w2|q0+^rNhz5{@jydL3>ls# zpLdV=aLw)GM(;AltcCR}pL#CARA;1DQc=S2J0N}Iy3cE*Zh4!}-Lw5-QRw~J3IJAC FLlg=pNhkmS diff --git a/vendor/libgit2/tests/resources/attr/.gitted/objects/a0/f7217ae99f5ac3e88534f5cea267febc5fa85b b/vendor/libgit2/tests/resources/attr/.gitted/objects/a0/f7217ae99f5ac3e88534f5cea267febc5fa85b deleted file mode 100644 index 985c2e281..000000000 --- a/vendor/libgit2/tests/resources/attr/.gitted/objects/a0/f7217ae99f5ac3e88534f5cea267febc5fa85b +++ /dev/null @@ -1 +0,0 @@ -x5Ž1Â0 E™}Š?–΀;•˜SâˆÔ®’”ŠÛ“Ðv´ýߢ8ŸO‡'FÈÈ:2r™ƒ)(¾ &¢Þ·«×9Z¼A Âð³¼Ñ¹r9Ýl¬ %¨˜ˆ„3ÑEo‚£.ÿV­Õi4H()R{FfcPQQP4}zEJ-XWDauSLElDkAm~zX16<7A}zGr8? zi&`))o5ZwPA{?p`q{@IHG{2{*y3dPgZOrQOJB#*gex$ZxGm-*B2J4dBRht_HVh>#E zZ<@NiKC5ZQq)A8$j2Lv%9{QI{<}FYDE$5i1BeiIcZr>#&1;z|VT30`g+UvFKZ}Wz- z<=y*MK6?Hj2dW?`GcPSOCzas_Lr3nMwqmKLN0w=Gmme`_jAMYAk(-!YlphcDO9{jO z%pb{f9zA2^wl`kxn6T<*x5q7Qs6j>f`6XaQh77JEQkBaqoQ}>)R+_@B#O3Gx+|L$W zl@U>@jEPcZqE}K;!tgsFedD^%You;@o6p^|{bEt*{n`o>10YZ+E=@|wEMl0yg*&bE x?lbPN>Fdv}o474^LJ!kTWCcbHnws}CbY9MU8Q8q;)-hLE!"ZB;u¤à3Cmÿ í § ‡{.7µZŸ4âavfÈÖgBLÊEeP;NQÚ¬BŒLAnŲIÆç ÞÔù5ÁI»)MÑ6Z•œQ[ -h3Úe: - ùì}æ£u¸Æà}‡ï…;œ©÷È|ýÅ)µzµ&ô¦¼Óp”›”bÑõq®ú?¶¨­3TJ½Áä1‡ø3ÙJX \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/attr/.gitted/objects/a9/7cc019851d401a4f1d091cb91a15890a0dd1ba b/vendor/libgit2/tests/resources/attr/.gitted/objects/a9/7cc019851d401a4f1d091cb91a15890a0dd1ba deleted file mode 100644 index 1a7ec0c55..000000000 --- a/vendor/libgit2/tests/resources/attr/.gitted/objects/a9/7cc019851d401a4f1d091cb91a15890a0dd1ba +++ /dev/null @@ -1,2 +0,0 @@ -xŽQjÄ0 DûíSè[ähc;PJéÚ(²¼ $q°–Þ¾†Þ _3oàIÞ÷µÁàÜK+ªàâäBtƒ„I|œ”â»LìgçÆˆÖ ÅR4'=¤qFN6Í÷4 -JôÌ1ôÖFrÑ‘zÃW[r¯«VÝ6øÔ-i7.eVýø‹WÉû;X‚‰,Á ¢émwlÿÏÛ|ç]ṬMëÉ¢ídáã¡RwêC[œW9sÕj~’Wy \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/attr/.gitted/objects/b4/35cd5689a0fb54afbeda4ac20368aa480e8f04 b/vendor/libgit2/tests/resources/attr/.gitted/objects/b4/35cd5689a0fb54afbeda4ac20368aa480e8f04 deleted file mode 100644 index ffe3473f4bdc5fa059754fe5b4a2ff796f2f2e17..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 40 wcmb9JYNhwKbiK)rYAEZ2R5@KbTm&?`-05dHQTmS$7 diff --git a/vendor/libgit2/tests/resources/attr/.gitted/objects/c0/091889c0c77142b87a1fa5123a6398a61d33e7 b/vendor/libgit2/tests/resources/attr/.gitted/objects/c0/091889c0c77142b87a1fa5123a6398a61d33e7 deleted file mode 100644 index 11dc63c79e90d929ded1c24084b5eadbe4c49e5a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 290 zcmV+-0p0$10V^p=O;s?qG-oh0FfcPQQP4}zEJ-XWDauSLElDkA_;l>L_<64=yKJTm z$I#X6+tX$!rb1PMR2eXY=JzyJ_jxg`jaglOXVIR`kJL77Mp9tNU|n*%YICDN?14-D zO;eZGXEn{3Gzm$85ra*~i*d%c$ZZQf9} zynEluN6#PRKou0_=a<9--C1JD;3^_jxxB*Z=&WR=Da=Y-e%{ahY|&L25v9tQC{-qU zB^4zMzXQ@YuKT=3>Xx_p+&$Yb7KPrgtuQeF0)^tzq?F7e2HofPA4l}t)Xlm&uQp)U ogvUm6f8In^V8o!Qc~3*<<;<6X&FgL*bCor237z8&08Q7Q26U*DKL7v# diff --git a/vendor/libgit2/tests/resources/attr/.gitted/objects/c4/85abe35abd4aa6fd83b076a78bbea9e2e7e06c b/vendor/libgit2/tests/resources/attr/.gitted/objects/c4/85abe35abd4aa6fd83b076a78bbea9e2e7e06c deleted file mode 100644 index 58569ca0ee1024fc51434779cb9d6158923d5e6c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 129 zcmV-{0Dk{?0WHe03c@fHMq%eX#V>9`3Pslr1v|Eb_yV`-O%qL;ki?>IuT-~>!x>!| zQJ>Dc18#;hgA#*Z%}Y%OakzkjDVas_X_+~x3W<67 SB^jwjw)uIfTwDMmkQ0IQ4H-B9 diff --git a/vendor/libgit2/tests/resources/attr/.gitted/objects/c9/6bbb2c2557a8325ae1559e3ba79cdcecb23076 b/vendor/libgit2/tests/resources/attr/.gitted/objects/c9/6bbb2c2557a8325ae1559e3ba79cdcecb23076 deleted file mode 100644 index 589f9ad31..000000000 --- a/vendor/libgit2/tests/resources/attr/.gitted/objects/c9/6bbb2c2557a8325ae1559e3ba79cdcecb23076 +++ /dev/null @@ -1,2 +0,0 @@ -x5A -Â0D]ÿSÌεèoàÂuJ~L0ýͯ¡··)¸xÃcfªœp¹]OOΊcñB µ˜6‘»!뢘´²Ã³‚{,áU8He)a}FfcPQQAjK)DKcOP&F^Wd?(mk!9N4*WOR^9COxTOtMRg|A! z5)V>j$lxj>Rk^&v>FBIvr76rxTz=lq{cO=y88P@4+8*i4mcAa%o4A&}d*vysu##AG zRmKbg-CLgjtrqj-J#7E|W|62|@pZ90bX6vLB^4zM|H{n^jxIY>*c!nziDlz|iN*Gx z|Cks6fkJU<62qIFwVxK2%qS^c)0k)B{-oJxWlHeKeuk; ow%iFlOgE7g7%^yS-qX-|IrC*;^SWEdTxE@0Lg#n`01lbk{pJ0fhc|0V^p=O;s>8Fk>(@FfcPQQAjK)DKcOP&F^Wd?(mk!9N4*WOR^9COxTOtMRg|A! z5)V>j$lxj>Rk^&v>FBIvr76rxTz=lq{cO=y84;z*m?%{ydLL(xjBkB8K@}xYJ7SKI0CXzW&_0iQ94~^f28-R$#=Ssd-OB Z=jF_ofz9h~9dng6ZV8>^4FLUm%U%!i#s&ZY diff --git a/vendor/libgit2/tests/resources/attr/.gitted/objects/d8/00886d9c86731ae5c4a62b0b77c437015e00d2 b/vendor/libgit2/tests/resources/attr/.gitted/objects/d8/00886d9c86731ae5c4a62b0b77c437015e00d2 deleted file mode 100644 index 83f3b726d20dedb2de52bd8cc34308ac17b4284d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18 Zcmbz{H4+L0~6SCjdFf1%Chl diff --git a/vendor/libgit2/tests/resources/attr/.gitted/objects/dc/cada462d3df8ac6de596fb8c896aba9344f941 b/vendor/libgit2/tests/resources/attr/.gitted/objects/dc/cada462d3df8ac6de596fb8c896aba9344f941 deleted file mode 100644 index ef62f8b9ddbc1a55a405edbab31f1d5fdf29fcfd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 35 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 R002ovPDHLkV1lr3z0p*+!u9|F diff --git a/vendor/libgit2/tests/resources/attr/.gitted/objects/e5/63cf4758f0d646f1b14b76016aa17fa9e549a4 b/vendor/libgit2/tests/resources/attr/.gitted/objects/e5/63cf4758f0d646f1b14b76016aa17fa9e549a4 deleted file mode 100644 index 1bc1f0f0b6c9da9cc039417347270d2fa2740c62..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 39 vcmb7H)k+3FfcPQQAkWmX0UVmf7C0@ehT9m)fU?vzQVi6uy@>O5_b5~Dvj?sUOvvW@;>@&F^ z@aIS?R5wsMC9^2LB(=E2kl|_adH0A9*W5mC^e$t}T3EmGspk?*bw+w66(tP61JXCH Z`@BZ#mbdxbJ=-r9h2F2N0071zOs-2+R7n5; diff --git a/vendor/libgit2/tests/resources/attr/.gitted/objects/ed/f3dcee4003d71f139777898882ccd097e34c53 b/vendor/libgit2/tests/resources/attr/.gitted/objects/ed/f3dcee4003d71f139777898882ccd097e34c53 deleted file mode 100644 index d28184670fc72db86d7342d0308a7bbbe5f33f57..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6289 zcmV;C7;fiy0Re^>dFNtmZ(<-eGB!8>iBL{Q4GJ0x0000DNk~Le0000$0000$2nGNE z0IF$m-T(jq32;bRa{vGqB>(^xB>_oNB=7(L7%oXfK~#7F?OF+NRM(Zgy?3iy-P%A% z2!W75>|jO^2*M^{8*Ik`8@whd*LcZhCY73{QZYAwhtuBr08($oL_m-p_u+q?I^uS+JA z@qU>A*%FC_B+=vXxWr>IiAJLXI3A6~qVL4w@mCrS9z2!#{FOStq72a0)R^X&Ot+eh z#)m8x>w1gTYBrio0w#z-uM;3gSAXhUC#e-E$%{!afT;Kn=kY{R0A6Czs6>LnXebii z6^+GqG(@AXB@Z8t{-0yO{8g*An#|_Ewd6RKTdfu`o6Vw!#C1BIQ1UjjMO^tVaXRy) zurN>TR-2f?9JUBR4u*o#*XI?#-z&a;p9CXer3uu~1T-QNiAX3Emhe#EXfzV}aovFf zf4CA%xNHrmuBn-4vf2ODX3x3ZX0r(-FM0!19H8@Zb7gjAr7Wzfl=9N)lJ9Z?xK#`Q zo^5($R9rD4B>g_Ww05-1DR-lsYitznz<^>xBA$?NI3&SfP=bR){~Zku{@t0whwCqg z5tqe)`KwnyWXrMtG{@m^S^?fj8%HmhK3!HXUoMNQ=SqRoDSD`WEFO~t)S6wAaY+Jj zW&pyv6NUl-e{eAPH+2X0{W^23 z&vJfA44|zqFk63NcRIi0aM;BHb=E=ZMN_88hBa$s`N9QafeAzbItHn!mX0__!X8bk z@&mk_W{?r%n!t=OOyKCL)3R&dKI!f0Q4TW?iHE`w!IFkBD-Bmel_B+PMre;@GK;=ZHE0c% zPO)0dN+aIcvsaECKMp4e-vGZb7#M)>@V^?4gumHv;DA5<)}#)fi2;>0HLjc-`zx-z zyzA@^2f$k;$8MJmYp<0RixZS%c`J;g@*yfpLZ$ad}c2uwc!a z?>h7HpLDuhqEsIaZXN7>K9)GH&1`x~I77-jzmkoh*)%Okq<=H!sB1hYyZ7u-u>wuO z@AHY@+yA}O`}Y0nVl-To0dRT?T)EDV@(K%~@wsXZU$AhYtXZ}c_8wCNX_6m?oWY2T z5ir^NnkMjhjR|B5=QNp&vhUb&ISs$SSYiMs;qB`S_y+u6f>S&_(Hs{wfgG#tXSpty z!m6uk=?sTtG+dv5L~VmQ5b?|*6UXCKEkff--^vTdr(ezagp(Y#!z3yv>G z@(c21^)=Thsbdyp_nO47w9RJ|n*Ey~HD)M(0Olv54f{X-So%Hv$Qg!Y!0!`JPjCH& z;NbGM4?hfMkHO#LYCxXBur0@7pNEW2t@mb=S&F9?sY#KHsC0H%^*;y6XA`f1=aI~y zIWp@ko;npV!Jvv1El8+{AukfzhR2@E9)rKfWB`Eam#yEhowj6!+B4uW
  • Ks*sdw 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 HkUYVmJKDxa diff --git a/vendor/libgit2/tests/resources/attr/.gitted/objects/f2/c6d717cf4a5a3e6b02684155ab07b766982165 b/vendor/libgit2/tests/resources/attr/.gitted/objects/f2/c6d717cf4a5a3e6b02684155ab07b766982165 deleted file mode 100644 index 27a25dc86f68a17df08f1c232b7a579e8294cfca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 44 zcmbHu6c1iRi0DmMA A9{>OV diff --git a/vendor/libgit2/tests/resources/attr/.gitted/objects/f5/b0af1fb4f5c0cd7aad880711d368a07333c307 b/vendor/libgit2/tests/resources/attr/.gitted/objects/f5/b0af1fb4f5c0cd7aad880711d368a07333c307 deleted file mode 100644 index 21faeb8a2..000000000 --- a/vendor/libgit2/tests/resources/attr/.gitted/objects/f5/b0af1fb4f5c0cd7aad880711d368a07333c307 +++ /dev/null @@ -1,2 +0,0 @@ -xN[j1 Ì·O¡ 4ÈRbÇPJÈ -=€Ö;NûÂë½ ½A?†y 1“×y~7½žZ(¾¥2ªÏð£beàÁ8uå’Ja‰n³Š¥‘F.HÈ"— UD_®Ý£÷ÉHI£sv´×ZéûØwL=0Tú´ZàþGç¼Î_äUbßKèƒoÌ®§}cëçÿùv?Ûhí½<©aoÔµ¹_áEK \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/attr/.gitted/objects/fb/5067b1aef3ac1ada4b379dbcb7d17255df7d78 b/vendor/libgit2/tests/resources/attr/.gitted/objects/fb/5067b1aef3ac1ada4b379dbcb7d17255df7d78 deleted file mode 100644 index 6c8ff837e231ec5208dcfac65fe557371fbfb44e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 28 kcmb4V4FlPAMHeEiRxdCbJ%xQ5LU0JnAwK>z>% diff --git a/vendor/libgit2/tests/resources/attr/.gitted/objects/fe/773770c5a6cc7185580c9204b1ff18a33ff3fc b/vendor/libgit2/tests/resources/attr/.gitted/objects/fe/773770c5a6cc7185580c9204b1ff18a33ff3fc deleted file mode 100644 index e6fcbc0b3..000000000 --- a/vendor/libgit2/tests/resources/attr/.gitted/objects/fe/773770c5a6cc7185580c9204b1ff18a33ff3fc +++ /dev/null @@ -1 +0,0 @@ -x5ŽAÂ0 9ûû„xBÜAâœG¤vÕ¤Tüž¤Ð£åõÙ<ûãîÂ#¥Î1ÂUT釛*ÑMúWlÎOCR˜2dÖѵC.„T“©ËÈI¹lQH/öœmYÛ¬UN[àžª€ß¬¬¥þBÖ@t¶Üð8~˜†Õ‹¿}}R#Ä#kAØdD_=-H– \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/attr/.gitted/objects/ff/69f8639ce2e6010b3f33a74160aad98b48da2b b/vendor/libgit2/tests/resources/attr/.gitted/objects/ff/69f8639ce2e6010b3f33a74160aad98b48da2b deleted file mode 100644 index b736c0b2b31edac3a69995d507dd3c41d837b027..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18 Zcmb6s;oB_&0f zNu?#J#US(R{RjZD=unR>H~+w4ZO^pQzM#~z+pr_LYxeQ>2+ces|MzznKHjhCbo)McKz(_({6d?1FV+A6XU&kk diff --git a/vendor/libgit2/tests/resources/attr_index/.gitted/info/exclude b/vendor/libgit2/tests/resources/attr_index/.gitted/info/exclude deleted file mode 100644 index a5196d1be..000000000 --- a/vendor/libgit2/tests/resources/attr_index/.gitted/info/exclude +++ /dev/null @@ -1,6 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ diff --git a/vendor/libgit2/tests/resources/attr_index/.gitted/info/refs b/vendor/libgit2/tests/resources/attr_index/.gitted/info/refs deleted file mode 100644 index 60feca293..000000000 --- a/vendor/libgit2/tests/resources/attr_index/.gitted/info/refs +++ /dev/null @@ -1 +0,0 @@ -58f7cf825b553ef7c26e5b9f8a23599c1a9ca296 refs/heads/master diff --git a/vendor/libgit2/tests/resources/attr_index/.gitted/logs/HEAD b/vendor/libgit2/tests/resources/attr_index/.gitted/logs/HEAD deleted file mode 100644 index ffd298c04..000000000 --- a/vendor/libgit2/tests/resources/attr_index/.gitted/logs/HEAD +++ /dev/null @@ -1,4 +0,0 @@ -0000000000000000000000000000000000000000 67c1640e91ccbaf0793591be09bf572cf40c9a53 Russell Belfer 1335817070 -0700 commit (initial): Initial commit -67c1640e91ccbaf0793591be09bf572cf40c9a53 d441d7d88f52c28c2b23940ce4c33756748425f9 Russell Belfer 1335817296 -0700 commit: Adding some files in subtrees -d441d7d88f52c28c2b23940ce4c33756748425f9 67c1640e91ccbaf0793591be09bf572cf40c9a53 Russell Belfer 1335817353 -0700 HEAD^: updating HEAD -67c1640e91ccbaf0793591be09bf572cf40c9a53 58f7cf825b553ef7c26e5b9f8a23599c1a9ca296 Russell Belfer 1335817372 -0700 commit: Adding subtree data diff --git a/vendor/libgit2/tests/resources/attr_index/.gitted/logs/refs/heads/master b/vendor/libgit2/tests/resources/attr_index/.gitted/logs/refs/heads/master deleted file mode 100644 index ffd298c04..000000000 --- a/vendor/libgit2/tests/resources/attr_index/.gitted/logs/refs/heads/master +++ /dev/null @@ -1,4 +0,0 @@ -0000000000000000000000000000000000000000 67c1640e91ccbaf0793591be09bf572cf40c9a53 Russell Belfer 1335817070 -0700 commit (initial): Initial commit -67c1640e91ccbaf0793591be09bf572cf40c9a53 d441d7d88f52c28c2b23940ce4c33756748425f9 Russell Belfer 1335817296 -0700 commit: Adding some files in subtrees -d441d7d88f52c28c2b23940ce4c33756748425f9 67c1640e91ccbaf0793591be09bf572cf40c9a53 Russell Belfer 1335817353 -0700 HEAD^: updating HEAD -67c1640e91ccbaf0793591be09bf572cf40c9a53 58f7cf825b553ef7c26e5b9f8a23599c1a9ca296 Russell Belfer 1335817372 -0700 commit: Adding subtree data diff --git a/vendor/libgit2/tests/resources/attr_index/.gitted/objects/38/12cfef36615db1788d4e63f90028007e17a348 b/vendor/libgit2/tests/resources/attr_index/.gitted/objects/38/12cfef36615db1788d4e63f90028007e17a348 deleted file mode 100644 index ee2991571..000000000 --- a/vendor/libgit2/tests/resources/attr_index/.gitted/objects/38/12cfef36615db1788d4e63f90028007e17a348 +++ /dev/null @@ -1,3 +0,0 @@ -x•Ž[ -à Eûí*Ü@‹ŽPJé -]€š™&“`Ìþëúw¸œ 'o¥ÌM¸K«D’ ‚q•4¤ÊËì5DFË#šä!!ˆ=VZ›DÏ.³Lˆ†:ƒ%L}ƒ!dCŽ¬ˆg›¶*ßçqвÈ-LUÞkz~ç6é–·òÚ«íàWå”}í}­«ÿ>Åg˾Õ{fžâú%ñ ¡Gò \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/attr_index/.gitted/objects/59/d942b8be2784bc96db9b22202c10815c9a077b b/vendor/libgit2/tests/resources/attr_index/.gitted/objects/59/d942b8be2784bc96db9b22202c10815c9a077b deleted file mode 100644 index ff33737db..000000000 --- a/vendor/libgit2/tests/resources/attr_index/.gitted/objects/59/d942b8be2784bc96db9b22202c10815c9a077b +++ /dev/null @@ -1 +0,0 @@ -x ÃÑ €0 @¿âÍà‡“¸@kR”’@ßÂ]½ã<¶K4±ÜnÕÔÅY‰á)l(a¨hF˜Hcƒcÿ^Ô \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/attr_index/.gitted/objects/cd/f17ea3fe625ef812f4dce7f423f4f299287505 b/vendor/libgit2/tests/resources/attr_index/.gitted/objects/cd/f17ea3fe625ef812f4dce7f423f4f299287505 deleted file mode 100644 index 2a410057efc046964ef7daddc48c5593b0f90b6a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 61 zcmV-D0K)%x0ZYosPf{?kV9-)XN-W~i(krPbQP54x&sRuFO)aoBGyn?arYI!kBo?J- T*rw;_7bxh06mkIo(#8;@NN*bR diff --git a/vendor/libgit2/tests/resources/attr_index/.gitted/objects/f7/2502ddd01412bb20796ff812af56fd53b82b52 b/vendor/libgit2/tests/resources/attr_index/.gitted/objects/f7/2502ddd01412bb20796ff812af56fd53b82b52 deleted file mode 100644 index 0489280004cf91b81dce86c99fa6d95e1ba6dc5a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 149 zcmV;G0BZku0V^p=O;s>7F=sF|FfcPQQP4}zEJ-XWDauSLElDkA$T09pm1#YTpe9}UG;KP7$R>v?bxT@vS-@u*-8pJ0*x`V*sD<$l~j~4wEGBc zpJnoH-mi0$f5@u){R(;!lwx841PaBaNen4-wR-Kl{>3FNJ#%4YS9pQow28X`%QibL D+?_#p diff --git a/vendor/libgit2/tests/resources/attr_index/.gitted/objects/info/packs b/vendor/libgit2/tests/resources/attr_index/.gitted/objects/info/packs deleted file mode 100644 index 559dc741c..000000000 --- a/vendor/libgit2/tests/resources/attr_index/.gitted/objects/info/packs +++ /dev/null @@ -1,2 +0,0 @@ -P pack-4e6438607204ce78827e3885594b2c0bb4f13895.pack - diff --git a/vendor/libgit2/tests/resources/attr_index/.gitted/objects/pack/pack-4e6438607204ce78827e3885594b2c0bb4f13895.idx b/vendor/libgit2/tests/resources/attr_index/.gitted/objects/pack/pack-4e6438607204ce78827e3885594b2c0bb4f13895.idx deleted file mode 100644 index fbef4aa1d2392d09a91ab4cfc0b58eff968af9e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1492 zcmexg;-AdGz`z8=j7S*7AH@s|%)oG<7G?pO#YzHZ1FD5#b|9OBM9c|PPc6&^Gz%N% z0g4mCyg)T04f6s0%s-?scMnTLl0(@A?;)wDin{m0jTlg3~7MPCuB!H}TA_50$19_i^qI z*ZIOTD>%czCsn5P+`j(rSxaQ!Oh_^ku<$GSdOUWumHw9xmks@ko?km3FBSc?-A8Eq zER%Qhew~~ALss4ISI~=~lwPCm|318@*7DcH$UU1mMdMt%$CBQ=O5#r|7w65L9`N(J z$f8|!*UFwuyEOfvg^TXmRM)>}eswPNDXu=la5>!7`)s)Ixt0H~?WkpHxxa}wU-ydR z^&9;`hkCS?r|>*EY#vt9qWbgMTsHj;f89)@mbu1Dw=2hGW-oty?|S)t4(7)d*^=Ic zX{|1YR=7%7?2Y4#?i7(|n| z=uKqpqaY1QoK8NVRpIFKUg2}J#>)b4UW6;$YkW?n&qutbeSLtj7H@_IKf*7DXmcZCTRQ0AZ6hOWrKFaettIf1JHU&NbCiGCU~5C$M}R%x1=aFRly>~*vKL& zEzKm^ASF35F~uOwJlQnaFg4Z8($dnz$Rat_!ra6n(PW}-9J8^x(ZoJ;c_5{rYhZ3* zz{Ta5l9HL1u25W>1U4)su_TcT03hHSfS(F@oRy403d0}}0PntHKhUyj)D4tUdh0bm zP_u0W(|}q3-#}lG%Nzz~q%i{`CdxPvx~S)ooG~0V*&%3;KA16kW=FG%U6!rE)c2ih zg(ufHH@LO*_!L=sy5?=YgSOU@4j2$F2T&b$Eh2orRIhK55-a={>Ic0(@A?;)wDin{m0jTlg3~7M1^|f1IhU{lc%0KxNJ=c?($XubC{aku z&sWd|aut$NQwwZOfugx73Q0MMMd=x~>4`;2IjLM+0A%P6*S!OHoDIUk3BW)I1i*i) z*rL+F5fzt!f(m!#C&S#%#{bEf#b}K7G%O3-H88GVh#ssE?5tN<5SnRSAGuBzNVWuc zoE^u(34lNh1i-&lY*99Fn8Ykf4wArGzT#(Kc4y(3(SuPi-ugKct<{VZ%QeuhV2C~# zA^+CQOPCOvX>Ko@mKm$A0eGAU}m`_}t3>*LKu0wcOvto3CpK zQ5odw=;G_Dmz%;6nW|?p^=28j*^OrDBa@7dJv_5c9aT|DMG00_0Q;IO*s%h5oYT@P zsVGrM%*!vyNG-C>&r9Xf(#uUzNJ=cSH8eIh=i&kYyIKkGJ$Rh+%`Zw-C`m0Y$;?aV z0staG1ib43gA{n2o6IL(jiYN0ug--&#nopR0I!S<5~~DwoHH~qFf%bx2y%6F@paY9 zO<{;k)iarTvy9v9Mzi#hNk+#Wo>`}Eh@z;Zq6Did0IOsho@Im^c$}NeSURB;00rCv Y4+!&CAWH;&In3Pa1I7cpWAh&;a1LJwv;Y7A diff --git a/vendor/libgit2/tests/resources/attr_index/.gitted/packed-refs b/vendor/libgit2/tests/resources/attr_index/.gitted/packed-refs deleted file mode 100644 index 6b3e4decf..000000000 --- a/vendor/libgit2/tests/resources/attr_index/.gitted/packed-refs +++ /dev/null @@ -1,2 +0,0 @@ -# pack-refs with: peeled -58f7cf825b553ef7c26e5b9f8a23599c1a9ca296 refs/heads/master diff --git a/vendor/libgit2/tests/resources/attr_index/.gitted/refs/heads/master b/vendor/libgit2/tests/resources/attr_index/.gitted/refs/heads/master deleted file mode 100644 index 9b7562931..000000000 --- a/vendor/libgit2/tests/resources/attr_index/.gitted/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -3812cfef36615db1788d4e63f90028007e17a348 diff --git a/vendor/libgit2/tests/resources/attr_index/README.md b/vendor/libgit2/tests/resources/attr_index/README.md deleted file mode 100644 index 59d942b8b..000000000 --- a/vendor/libgit2/tests/resources/attr_index/README.md +++ /dev/null @@ -1 +0,0 @@ -This is contains tests for when the index and work dir differ diff --git a/vendor/libgit2/tests/resources/attr_index/README.txt b/vendor/libgit2/tests/resources/attr_index/README.txt deleted file mode 100644 index 874c12b79..000000000 --- a/vendor/libgit2/tests/resources/attr_index/README.txt +++ /dev/null @@ -1 +0,0 @@ -This contains files for testing when the index and the workdir differ diff --git a/vendor/libgit2/tests/resources/attr_index/gitattributes b/vendor/libgit2/tests/resources/attr_index/gitattributes deleted file mode 100644 index cdf17ea3f..000000000 --- a/vendor/libgit2/tests/resources/attr_index/gitattributes +++ /dev/null @@ -1,4 +0,0 @@ -* bar -*.txt -foo beep=10 -*.md blargh=goop -bar - diff --git a/vendor/libgit2/tests/resources/attr_index/sub/sub/.gitattributes b/vendor/libgit2/tests/resources/attr_index/sub/sub/.gitattributes deleted file mode 100644 index 060c9a261..000000000 --- a/vendor/libgit2/tests/resources/attr_index/sub/sub/.gitattributes +++ /dev/null @@ -1,3 +0,0 @@ -*.txt another=one again -*.md bar=1234 - diff --git a/vendor/libgit2/tests/resources/attr_index/sub/sub/README.md b/vendor/libgit2/tests/resources/attr_index/sub/sub/README.md deleted file mode 100644 index 59652e349..000000000 --- a/vendor/libgit2/tests/resources/attr_index/sub/sub/README.md +++ /dev/null @@ -1 +0,0 @@ -More testing diff --git a/vendor/libgit2/tests/resources/attr_index/sub/sub/README.txt b/vendor/libgit2/tests/resources/attr_index/sub/sub/README.txt deleted file mode 100644 index 59652e349..000000000 --- a/vendor/libgit2/tests/resources/attr_index/sub/sub/README.txt +++ /dev/null @@ -1 +0,0 @@ -More testing diff --git a/vendor/libgit2/tests/resources/bad.index b/vendor/libgit2/tests/resources/bad.index deleted file mode 100644 index 53746549feed9f42cbc8e96ff1a7012a779f8f39..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 412 zcmZ?q402{*U|<4bmY|Nc>wq*vP{-~&AQ}N0mmt^-YVwiUkGV_Bb{KE_b8o@KP1R2| zpGGmT1-Ux9__~7B0rmGo=)Jp<^Z}VD<|v%cthDU)aZqzLimwY$>hU-g-X_Ap9^~rd z>KF_%D5zs^HPjq1jW7$v9ATGtvSOjFAx>|WM&xf#d6$}@FO$Z=nP#XDbrQ@!F!OMj zgWWxxX+|(}LV{dD&hlq4Q841=GP`ChQI@tg&2XxUt;Xitc@?}|mCk8~42B8@yj)RU z4yAc2msD5OoRU6b))oF+P%=Hu2qMS*gF~^`e5S##c1QJW8@pFU}y=;P0kbyvuh Sm+Re*JqAXh|C)WywE_U^$Z9|U diff --git a/vendor/libgit2/tests/resources/bad_tag.git/HEAD b/vendor/libgit2/tests/resources/bad_tag.git/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/vendor/libgit2/tests/resources/bad_tag.git/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/vendor/libgit2/tests/resources/bad_tag.git/config b/vendor/libgit2/tests/resources/bad_tag.git/config deleted file mode 100644 index 2f8958058..000000000 --- a/vendor/libgit2/tests/resources/bad_tag.git/config +++ /dev/null @@ -1,5 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = true - logallrefupdates = true diff --git a/vendor/libgit2/tests/resources/bad_tag.git/objects/pack/pack-7a28f4e000a17f49a41d7a79fc2f762a8a7d9164.idx b/vendor/libgit2/tests/resources/bad_tag.git/objects/pack/pack-7a28f4e000a17f49a41d7a79fc2f762a8a7d9164.idx deleted file mode 100644 index c404aa15bb04cf5b4fbfc8bb4d9638cd5d420643..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1268 zcmexg;-AdGz`z8=Fu(|8jAF{d02H2-U}m6xVlWF(-6*Ck3|N6-I8-nj(5=Xr9muB& zW=a#Y@_f{Ax{fgShl8jc9xWd3HDVpEvWF5LTe<(DX}8CMQgab9b@(VF?oZ>4zX8h_h;G0T14 z|BH0+oRA_vW%fS@wRi2Ms}zD$t^>2>HXv>VW-mpc-tVk0A!ABL;wH) diff --git a/vendor/libgit2/tests/resources/bad_tag.git/objects/pack/pack-7a28f4e000a17f49a41d7a79fc2f762a8a7d9164.pack b/vendor/libgit2/tests/resources/bad_tag.git/objects/pack/pack-7a28f4e000a17f49a41d7a79fc2f762a8a7d9164.pack deleted file mode 100644 index 90eac50322033985e5623ba611255e53895e2d58..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 596 zcmWG=boORoU|<4b_6d9ybLO6LB2ZL-fLMnU}tes`9ibm`tURpR~n zN4$6HD)yU)CWLQZoTPkI!7rVgzg+9v``Z_ETFHpbhKWQbKFLPm4J!}4hZ-;;1 za#iqhJ1^nhV_bNmPxbulr)SmY-soaD~5%da!2C_U9Y#XivXB zA!=`fYW_quaW@M^#aa1lT|@sZc&3)$dY@sb~&ytJ0pw-~IMyXRO#PXcU)}Br5Fo$U@q0+Q~i{wM|OG8(lK~ z2Jxh8?sP1EZO^0=z3#`;4;ObQpM7d2VsCVSdxM_%Er7piGjqipZckmklV`lcJwgzA9)3El zAFkma>fz(b*d@-qv^Yq#$mnyBs8LXN&`ySH`hq*KTjgPveR5ybqU$e~U%h;5+LmYO uLDBtE3=FJx{CBo8;;@Q|AvB%6%_2xXV*ZRJb+SL>o2Gb(o_c6~o*4lB%?J|! diff --git a/vendor/libgit2/tests/resources/bad_tag.git/packed-refs b/vendor/libgit2/tests/resources/bad_tag.git/packed-refs deleted file mode 100644 index 9da16459b..000000000 --- a/vendor/libgit2/tests/resources/bad_tag.git/packed-refs +++ /dev/null @@ -1,5 +0,0 @@ -# pack-refs with: peeled -eda9f45a2a98d4c17a09d681d88569fa4ea91755 refs/tags/e90810b -^e90810b8df3e80c413d903f631643c716887138d -d3bacb8d3ff25876a961b1963b6515170d0151ab refs/tags/hello -^6dcf9bf7541ee10456529833502442f385010c3d \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/bad_tag.git/refs/dummy-marker.txt b/vendor/libgit2/tests/resources/bad_tag.git/refs/dummy-marker.txt deleted file mode 100644 index e69de29bb..000000000 diff --git a/vendor/libgit2/tests/resources/big.index b/vendor/libgit2/tests/resources/big.index deleted file mode 100644 index 66932f14b5e007fb01893750e5cbf1485b40bf57..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 335272 zcmb512|QF^|Htpx_q{|5DoH{pOOh?Sl!R2$U@(>$&DcwX3YGG!XjKtPMQNd;qLm7z zq)1wj3T@It{qM}&!<@_I`Fo!F_Vm1ZpU?Szzh^)9-bHrHED;3ZK@jmPiw%-P(LW== zO0fQ3%%=uHHXTP0QZM>{$)PqXmA_%)$4j&dBjj%A8kK+Ek?y+@L|Dt0?h_tDp@j|p zdmN`0<}CD^W%wfbKmHxz3-tZUx{7x@tTTwvL4>sYeZ8qPYS@qt9H$QEOqr<^VY_p! zPpgf>%tw6rO*B4|y!in{M9ZHVM)jxB85CBXSU-RRELOiqFb@d~RF2_a?rPOiBd~kc z`#Ku~@poFw5m7BF%@?hmRw#qc!4dHu!#sYT1cvL}-}hG?*p(0%es2-EJ=6Nh9E8up zWsxHX1oQxl>8gi0!uO7SIr8i9Ijb(id6EjNmv8EsIU~Xj5wu*g)WgonhPZxDV2;ql zRjbk~?2g?|FJx*8w9CFVKkBsB1QEeFT7hJ&dPMbm3h{X2U3}`MuTYGic0~O2O0$JV zcFu~lRXY)3%K$RXpW;aOC*m|f9K_mV6>WoGWkd&A+@5(?qT*Oz1)}SL@Y*cJ+(g8A z26IR&S4%8*b_;*IAuej%KlvlC`#uB*S|VZ&PD|XKEL?3|v>4u_`n?h6ITV|`a+eO@ zvZ-k5LA!uW3Oi_)uaUx}Lf)^?KGkFrA=CZ@Nu ziZ&yni^)M0KWZ=q%`eRHfCDVXdja#r&&PxvKAm03c=@Ac=7vH!kH^8vt#$~Xla;&6 zsP$`tInp!}Eg#zA%OwL7A0$>@el0uqfqe1=L|~bf`J%;EEE3QGET*R!<`jrk7C(Qg z`Qw;Ya{ZrIzP}UYTwm%ZA|f1)meq>oSoMf_FJWGBbi<2^edN&1jr$jT@7!m9_q&LG z^)W)s;NJs_abCe3 zS;>uSdZ(S>*-4F_RF-+Vp1SCPjdm--x17ER>lnbl2NvVB!W?~S`h{!zPt8s}AX6~g zTWLb@)u6b5a72{s>&ws$rqU={KA6J*2Uv{v8s?F*?w?Crc|<_vb&y5Dzh?6*XY+Qe z@pJP6M(4eOc%<4R5z}A)Ys-4jt$r@WSwnx8(W~~n5=4;9V34EP+JGKlFZB&zLS(#seDrj+2eY3UjtLL_Jh=}SK9RzGn+5IoBMGYKkZ&an{sHw9z>F(mq`f=57i1G2cb%V zK43AOA7CCye?jAk0fXYQg83_c{A!(~b)VO%O&3x0rqFx>Ldc9DZSN2-a%iX*nZ}Hy zFviyV5y!V_+ZHqTSc|y(c3a>1`~@3!{do6#1|mOQAgL^4Rc9yN1J=!hZXfz&EBQI?aw*^owu=}ddQSvx1U9sObUw)^a6|N{(|Eg-09iG@L9hqd(Yi# zU9`UZAi-ucvk`PN!x(6*^dSSc5b?j_`2Y2^8A>{39@L!s#A$uE;lMKL8)a`-1c% zien#+pS$4GiaUiTBzgq=Cu&z2-oK!^IjQ6=K z7OGb~U9-DcEWrht0O=2=(?h-d=$zgV|)hdJ)Co+W5pXmXdQ^v!Kq z?Ugvcv$_5h8ihed`z*{efD0_f|Bd61U#7%3qZnanblKFHVQ6af4JEasm9m`^f}y?AZc($j7Yh1X~PUiYidlHR35 z$K@rH?nU+qqA<|Dmo`>j{>Ab4YwWDqxxdq}T=nG~kAW*4f{L5f5^;IM;4-Fvv*VMapXvStlO2^;d$dnW`>d3aNrMMF~9J`Tt3Yg zFV1%yqCIuncMvh^Pg!!ou&&E{=r5a@yvf^O z+^p#xvvsRh1nlp3EgP;on99Uvxqt^O#ubFQ`~eYqlYC3dzuj+i;;p&`m%BLJ5STflQvt4-XbZdTT(GsFE&V^S#*qs$k5 z#bGY50qNj2pM=Uh|MTjRo(IJ#&#rj(T^vC-n~QdjgKI6|XJ9dZqlUX*~S9cU7&qdLmt5xNf?4AjN02I7;HU0zRTv_ji2gf3PlIT)lr_y-bPApJ&6{ zWhj{uhAvvXnBgHptjiH@v?JrTS9Q zEmP3h63*{@rC~m4QsRw<`uKO_XDLfD@)dL3NX@~Qb%*)j3sW}U6I=8&tV|ZMd zp=i1=$ie7NHQPHx^8nv*Fdwnkyw#!67W>*=>&u}9>V;GLbS?{b{SM$B`kSp8jjIvr{Zi7hDz@fs6K7qxM(wIBvkrk|}3a_AB@1 zIEp6t&;F}f(!Z08n~$>eQfN%p{tDQoCG^Jx9N%&Ad%c|T8B`6m7W*VC#S?l1Ve9VW z;>hAtBgmu8(|r|iTkL2R z2$%MYeZ{Ab;?|8U{WQutj&z_GSWNdM9M|EC(ci{v8YL^Xor`z;w7=^HuhjRVk+@*P z0`P#vxRY^QYq5QG65_eL-<^n|{3rd@!e;B5hQ}lLgF#{Xg#QnDG6l!CyJy*LlKJld zX@+E8?S@sY?PWXa1`uVaUt#%!No92?40HpH!I>ih-N0h{m2iCfT*{>%%`yMhn_Dlq z(ffASDUSznQ%1-`W+a)jA_6>MF|IO>yX4IwX=TZE%+m=~p4um7c=&wEiB2EZE_H_% z6o3aT##O;_)2H0DZ}@MyS9r$z@ySVR&kC&9H^>{NSJ%sj%-Oyn%DbsJuBn0NgBue6 zSxu?*7^%UV*j^Cq3;8G&6tvH|)SWNFU9M|)~p3+k$Vlz~38C&JZHE*K6c&=AF zEI)L;(1}$5eP}maOiQ~F1`q5>kRWv_k|DN>dUTQwju2M{#UI@(A6vINjvr7d zUj8`voXCJnSk<%Uj(1dv93*%I-AoFNlQlpuu$b;yIPSjCdqDkvhH=9JSi6YWR;5=UoeEa?KsT_Mer;Si&AvyJUY<@($;sf!QJBHEfX`d5V!^QS zLC*^-XRsR}^3NO`f3>KC%AstJ#CysHzu(?>Zf3|gN1sND=oo^mK`WZg-&D5nlB0u+VTY0|H!NG5%bbk6cxrGWF%} zvPc2foyX4DF8A*@cQC5wUZ2pz0w@g4VDvhHHo6(76&lP*M4Yfriff+f{v^|H{BaNGJ=mOfuZnyAiSrNBCxlZ0zy%iL8^U~EUc>PJm?_B9 zAMF*Ya)uJIMGWoPVg&rbv6@u^-~x;BjbJ{Ke)8<4L$8!e@0a8#&c65X?MbF6`4j=4 zbv8E`V88_yylX#6qSmnn|F_|uAwr&?#HlTL1&rfnC}p2<+y_`!q(GfC|GRT({#Kp6 z3v@pkJ|N(;chf)sKwN>v;%kBDBL;TY=O3xi^`i5;&p)TV@lf5;)=~MR=RbNMkbBjAM`38q(77I+mD1p-)&7EC;bTs zalgB?*|ExLH2xUv%NEBU`5c_D8Ydk!eHoo=^q_-8`juu@9~A zhf2ibm;+o6;`w#wqP53_HU=EIpvHGJ`IE@Rd07I;^byM$euzR`jw7xduQ;J};T8*} z+IqK{_x%eLpDnal>W$1Au^i&fPvY_x!{zZkjybWce{+3SL99v6jw70Bn&NvLthncm zsQb{HNn_3%onWpoh4yuizJ+$V^LEW= ztINH9M{BjCe4=%9oC2DcBGM3#y`%vB0kBxVuoULW*O|+iUb(SdT!Fv+_3fy+H-#!b zABf}Lzl!uh?_{#3v)<^=2eCh$AudUNYgcOvW!jvN(mHb!EG2L9c<_0Ohaf`U=w;;a z5Z1*xpbJ<`A9`z(dmSaM8T8-jsY%P0^o_Te5pYgjaN8ArcWp!vJ=fJnuSOB;Sq^h} zrpn!{zZD-4Hlao9FnC&9ys@oinKZP|_1Ui7l^ti$tl74U!(yz;W@Xn zsBWTU(#0h|`YoQkd=PgbXk(5C#zF6*6LMC-9K>$=Ja@AN0lhM7lDSUru@!j(F1;Z2C_B{2M4Z@$gy(mOPSRB^L9vBq~d8<&~@u7Q& zq-SA{A}=cVCuE7*>$fQScataOo!yDtNctK zxBV{;ZIt?y;C(t%2i;eIxGd3LbRg854CYvPczde;V8tAE`;o>;&5Q1)rBb!Xxti(5o%M)R-~y(-+6L z|EFLZP;5JWN!6|fQ{TN}Vy60YTSxSdUodrW^MyFRXivqhUwc+kkBYBKYI@DgzE!)0 zLq3jAl+`#$z^6wJ4W~r;?+5dFbDnq3jtN@avNm#|T35$qi7oHcKlY5wr!%lCi>&k{ z;`_sVp7M_YRY_|Ms?_76FH8)3IBmJN3uzs`zhSpuZ08Qd6Id*+0Weo6lF3(CHltp} zdg&_}g|{}X!JnHW9Y*9*Iaf~s4_J(g_Ql-(7LUDclISrdWJ~-e+ikKI*9 z^haR$&}JI3KLTOC66F+6+UzOopLLvFlJYT9=xN;5PjTYtx?y;}2cwq?(Gy${QlJ}H zOn(r}=TUB7u=~XKf{>&puNLFf`5E*6y=u8KqJFNvY?OGS+hW}QL6&cvD^I3wwsPK&NGXuudk4_c1`O+68eO_AF|6bcL)ssQ*-j@IKH6!x_0iVf4 zXFp^3hX(WGw04MJdKXosNiE*LqGmR7<@i&L`>gwU!~Kst=>dKR7V|$H=JW2i4O#h* zX={0X@0=wssw=XVzmfg-8NHt~oX@$^!3-t)jCLO-6y}dFo0)A8nRBtvB48NBq zxd#GvE*>$ygC`}d=n}Tqbub?Z%k%Jk`m6lEKe>G=KPsy`W|S?tx@<)MpwoqL&XttW z_zajI_oz@VdEUb9f949lz88_SGeq*RcQb2WWVnBr(X=o!`zUNQJ`?6o+%SF5gZtl} zsD1r4{`cKDB{QV!N885{`JA10kUm8HSs2XEco*@#XUo*C4YgHo_ufBQ}AMqA^(DnCwaPfzQZRS=&_lartK3=u}}n}nd32Sb90I1w;MwuREt zmy~pt5i{<@wNI_8B|QnTFO(4>*1Z+Bl98B69sXQyw%kEnyDWSnMXJrnBk#UvTlv~N|jCyCm220B;=sm3tasG z$)|gb+^fLc#-CKV3mPATk53l~h`*eGJ~uk}qzrhl4YWsKv33~)@erQMGg-YyDRGI- zQJyyU%|2*`FDtyY01;tdHzA|9d(iQP^8+}*V!ZV*Z=cc`we>G1=U%Uk@4ox(_~nB# z=Y>hxhyd%t9n0&4c@PV8#BM7*V#Gd6@8GYWa5wO(n@)bWg@he4&L`SG5}o4PIJvUU zLAamf1G<34^lgN>(s9jqrONEnZ(pmYeOL5TOQ>$x8&-)3`ck~Z{n-M+zXulM#K9cC z-Y<`2`99mkT${H=ccJ@^w~FzZb_~E_ISu@KU@^`nm?P9N(Oscnvv5z4t5>!hvZe5V z)jzX*MBJC+$J7p@M6++?vI77(z+$`vn8(+&;A5vq+Hzx=&H8&nE*%uF5TD<-2N}oV z(ddyhFA9S}XE3$UzZs322y+Q^O0c=?1lD3QMvHF}%pJhKy(P=%Ha=R2q}!#X4*SLP5QO#p=Hq=JIr}KK9IPrj*e^&1FaU_E%kc`u?Dx z6e2gsrK88f=-oI#C5+P+m|OFQQg&d=j`nwP|6N(=waCrtqkwC96~gaJWp^gT@!kq^ zwj^eZ`|sJ=R*MTa`$c{5EN&4Va!l3@<-zf8u2**O%8lpy*U@_iKh$p%>=XG%066IBzYiJrS7Xvkl_nnRS?-(MBZmDPwKGUtKqh+Xt9&EFJ z01sGSvHO2eXb$|H`=Nf70jm}MnxI7m9RrTuQYi~pZ z=V_W~7d+bDn@1ISj>y1zJ%G0?RZ*|2-&II|$dis12jcj{!a zt>!OBBv@S5GuCVu7_f+d11!ed4f9NHeJwgF+Wb}3B*SmF!6fVS$0|vrQix}yg`VjX z^7g9(tBf$lD9^1Y<58*_U*trTp*fx&2I4 zuT%9NdyJ~lc8AuN5{7Q9qU&kS52z=wSbZ~aJY%C{J=ed~yqHoqV};MPlBFMC`a21s z?PZWR`t#eqnJ`Z%L84mqvdI4A#nSH^uHIEEka*|)_!lS6=#y8GWQH%<8=e1*sdFEW z>uNh8NLp!n+xwok%L;RAre!59&pd{XPpD3qJBHo^FgKL{;_s5x=9gdo5lEe0^5uBN z+lr6XeTWi^OAR6WQ<&PUsWj{1D^2#C6n#u5l!h+KiSp?X%$NKXDgBEkRHQob^o?&4 zh)aG;L;YV0BG2YCytUCiSKSg)&)O%*TKOEXK=%d0KKVedPF0o5%fq;O3IT(6am~`#4w-k>=8gDFhr~ zG2T&_CnD3Jztdoa^(_TL|wIp*Gmx+xni(Rm$9-w;m=y>f=$(`I3bxY;;vY*P|-P1~}6;cdYIKQnU{ zDkq1A`XduYU+p>m*NBTU$ACKGLxc zQ6A*67Gmi9$&2;Q1g~%=+Op7m8fE|gB+Tc@GWuCob9OWT@(-yx&;DNP5`Px?Z91Yj z$frb+Sr>t|mtoU;b{{=T9u(mC?(=jcYA))BYkK${YfC7)c>L2*xA;-`>^^%G{wbJ` zn0rgm;{`iZE*2%#+>l%x@?zPYnU(1L62uSaCyy}?IF08XoL(Tq{Hc4mN0wZ%Z_+^5 zZPmho5xCxCaL?el{zt7=WIO8}d+>Cz!O^$k8cd!Uw$hw_i=A&kZwMK^xyPEifcyX! z%acNwD`+5gY|Cze%=wYpPnzC#yZ97(JJiOa^LO9}|6n?ki9QmEWd|X*2i|mEyEFw%$N;2$j8C5A*?x={yVbgxifSmu^>DJ8*ILZu^#J zmItog@77A@^b2erx*HTm_hS8V^gKQXbFH<17BX(mdQ{pbcTC>pnWD33>Tlj;uKKfx z?Byw^br9CS80JoJ>@#m)^>d<9WX*5Qqjl8v&ws7C?+bBRPf@bA5817bkb42<3S|5d z^K{bxct|?(`i0Ctw|Nth#fpFaHN|}0aRJK%bCwJfZoBreiT1kg}GB?Qk6EWj8ED3(=(^# z=GBwC6MC&aX`|~Iv>h`8D8Z~eW6=ofUk39g-O+11*>!OI`^k@I9Q+lW9&I!*Z>KqD zJOaE?=SSCI9{&-O)13qDIugF7&%##ZhisLh3T!S#B+*6S(A#X-TV5b8z+&;a4)Y|s zO}sxH>?@nOQY5e5_iba*6Ai1Ys)#6yM`rp^si1o$iuVner*ACqq<-ry!AA=H;(^JY zc3t*@4l)lA5f%@Weac2ZuW%-ffsS=YmhN)vDM9b|+gj9{FXydHci4;QU-fjIA%+$15-t zI1u;^Sj>NSVBVxPUq#&84=g&BE`nI>wd|BQdbQdrdx#eVwttB9-GzD6(`)zcb+}zu zyL^-G#`2u*fm=-Gg~nQoV=$XtV=H|5=}T;t}VZ+p{v3u@Dhw)z{x! z$8e6`91IBR2`pCMDwv1#(JS2N^>-^bD)1OzH&M-3Xlhsb%+crXt*fV_JBGe$n5P`K z@Xy2_`u>rP2Ylr|4NSJ|Tl+!wFoIrJV(AM)VL%VCn6CRUhi~Kd-*wjncFA}i_;gQI z|Ah79y)shDh%}2sMX#Fa&e7Fn1vh|*_WowYP1IbxWhV*fGtXKdJuo$lf z=E-)c#vV>l5ZW^7ooV9So8F0wTgvZw<9RHBfCDVXtA%;fUwl1O{ALqPr}w&)$?SJyq}7*NtBf;CXY2d5>^BORZZI{cfD( zjZE#*ZuHnO??RYsVm+S6>P|sDfyL_k7{^mLX`Y;Z=b3*0d9NS7cMOAN7Z>X<$Mf`w zdG#<))hJk8Gq%FyM9}uWN>zhnyTci`C--~yH$2Q{F*?ux!}=rF5CW&Uyu-ujI|Ks|xQ>iZ1l$yPCw1QeA{8;OxzvnRDm z-gJ|(cksmVSm7Yj*9h~bz0gi4uWRyHRV5x==UKNd=g+|!$Co&s!6>}vFi*CsTyS~i zxl{hPQ$K0O81xv0Pd)ls5XUndh4%vHsq!th?yz_x7W-!Dl*D}b8B$laPjH@$5w2YjOVuI(K`;f^jedx788oD@HivHI~PuF#kxvHzB3pget z;=hIY6PFnu)E9s9Nnx&0<9(t3mZ>-vEi`jNREG227Fn9vSu7qb1Ly`8)Bg_UE5<}* zJQr?V=ePGiqn{h5tJKOxsX=la9XE1NPG(AM+Kv z4B#JNF+X*{d_~$XbN_RBTnoSz^*=Bu&l(FvEMu0~xZ8QxM} zW%aYbaoD( z_3C|y?*CGrrmGWLP3}65lJ96=$aPNxQ4%IO3!0nOd=_>K4PNzF$go8JdYBP1XRLBv zmRK*hFn4koDi!1x`xR+MGu*)-nX7U2wgk@$!^y? zGW*r={28j>Ph@2bmJ79BoPB`L=eYp?5aUo`M7J( zQx0a9HGjQ+qL%!@q`|ihnKYEIHWu187CO3mbLS1Ug;Cny518L#{wU+h#d(fGK8Bin zi62`0Cox{D_9GK%#uMdzAIyKVD(#+5lHs=v-|BnUJ0^%yCaaUzG~@KMoQ2h4 z%y|5S`7MiecmK`ft6b#kF{#A!&V_q1N5Zb5&uK&YIehk_9J_o&-0%N}_=woI$E#LI zc9oS2*c=c2#Xw%fBvoW|Ak&8UXfLmg{#r3dcaDyxgSittdm+rLKTtWOvfRq*hZb5F zE3dwOrWBZ<(OZ*HbowPhIfiCBMn-e~w|Ml!ckY2T12h6 z$A7N+7@94187u|lDX>_+4nTaw_~jAL=VrSUpJ+RraO$8Q_PCw@=w&t$-*wT@umQNh zV*I}_U%=t|#{5e$8LL&5Qnh1M)=)MpN(Im3o?me5XU$*G`Nd!zMrjxSpmIp56}3(q zYrUtZP1XC5$a70#M}hhHhzexNNO6ao2G9>IrydlvXs&UOw88En|C^Bce`hT;Ds7ys z+#k`_YZX~DvY&Kx$BqMq1o08$*U#TS+))3@ROEc+-Yd?gl6lJ{Gz5tFW5y1 z(wSZQ@@Kq7kGWOv`1e71%gN<#dLzd{M;AZmCXNGz7cNJv-@Op|YW#BTx=_g@(K(9l z$j%7mxKw%e?y{`g9pee*{thtmef zE{7j3r)WxCo_BYK_U3SY8Q0e8jk0fbYk< zkGIWQjviXNYMs)&4||=vR7c~Zu^){u2=fK}o-2tyZj6aXzTbKkuV*i_&T)ggI6m&& z`mr`R=qaEdSgamGP&uS+0^f=|gbtcnPdnnyXKwj0M8*34w!irHH&hO~-#Y5ON{TSd z->^nWY{7!@h%w0^Sf_Cog%ad_;i3((pV)11G(U+zd^8TGu||;^Vtwtrg)_q`tB%Be zuSyXajXy>lL}9*QgOHD$;8J7jcUk8e?l|3wl>4#%&q?Aq47NewCZcvB29+c7l3Z}a z*!A~&^A5K|cc-hp$uu&YR!-&~UsOhWc4HKb%YlbdWc|V)=s_uKpF_JAU}|fYQb))1|H!n4{?{#t*A4!_~z9Nsu&JQp|AaNZo?1Y*6?Fjq*} z-{*Q>Cpk~jX=fr*bunXt+rr8Xc&_f)Tp1i!i_vC#`TmOo{)Zz=PRc&aO3CvRLGLBQ zdgqPJm4&!GJ2NC~<{2)%=Ca&=*8OR7_|9oh&A;~m=Ax&2V{_#ot`OyuFjY7+7W>P&$#M z`D$56lb-O8;zMP~I2?a4D+u##Jj_*Ckm-H6IO+#QZr;fQcP=vvZ5q>3ZXi=}Trc!2 zhJCaX`DX&m=NF?mbjdo!S0Au`&;qC{)sp=U0;1q}}u=K`^Ucv2F@rH@b-+g|@ zz1troFMrpSyWd7nLkG2v(r+t4T!dsO{>4@yExB{~$y%ju-SPV>B`<_s=j^+4_Mcg& ztU&81TxFOmq`b0yvG)|$JTHn?t>M%DzZM^*o~Cm9f$AMHSI=NbGVm*~n15ApT*+Ry z=r?7m z47w&Om=u`i$KH|DO12xu9oxUEFjr`Dp-QUEkuCY$TA0A7O2)W0e@js%U z`zM=Ne5VfMjvcp|IIeP&wAi=pyPJ80{d7#$^{sa*e$bIOjH@@MUUfWo>f5P*bP^(k zO`Cr(j_0pdi~o;z@i6Y#`7jH|wb^^QJACdH`4;)GYlqVglp8N*x#w1yv7CD5HnG3@1LG~r6i4R66#!gdF}^mA-4X+*Pp>_{l9rB- zzsa-nLiC9F!`1dtJW+i0aD2LrbGMkt#WrEz_&<&H_q3SH#B`pI$cNoe#Gi}fcmI=3 z)>C=L_s6Qm;PtgySy@|EyGJAPVfPd9=fQjd#j`#7foderHC>$)*Ue{+zIv>9`R|B) z*!@I&eVET{SHIOjV_&ju`$miN8^89au4_juV@Kq3^*N*X-vH+Gzji8XtN5~2a7|xb zszuP{j*Y@GI(J6obB%GM@C{);Z$(`^-D>)ptJ(Q`1w#WKnYoopr@SALZwRG7k$;R} zK7Xayb4_w*fUHn}H=pUYzS;vy7jNZ_$mi-iN6|kY<}aLTYWCpmJz0cqEoXS@O3}U5 zXZ}2U0QJk9mCxYZ4fHp_V*QRW%oTcC<0)Dq`M#H$a{X_Pv+ZI-arXy+>qQCo85B+2UQJ*=A0P6e zMlDBBYujN#qutMvZqB=F{63HSe!w7~wN&FO0O$r5)4ver3)vm(_4@jDubQf)`i&{S zNX3Wk^iRI$_BZPmjV9MZ1n_{xxTZL+`TLk-1*Xi`&v#_Uo#T_DSr+_uP8-GzAId?% z0~X_&!CX>%&!kuP(-tI6y71?fe?-Qe)kQxh9OYg&1)<+sCewx-0eHY-TyvN!_+s9^ zs833&jBx*4MfGqOWk&Wq&kF81qL+Am7<4lF^%L5VXyQ0pzy;0 zw(ZpnIu&4`iRVW%sKLQhpZ|q#3G)TN#Dx#EKNf#{afYnS%!N@I|6TU~634x-hU)i6 zzrr=Rm;(L)7W2y@9JglEj{Q@^ymprMKJxqiA>;G7OBxCx-0dCZQhg}sdy#!1*+l(` z6^`GyGpsv1j#0bUTykR8Mw6}P=Pp|=#p!0y(MPKQ9q0uX(`}98HvijuyVL!pil3vy z=I3gX)PEOzJ_q7-v$<3)iITO=daep@zHNK z1W}m*{}bO9<_jrP&5J0D2byAX$tF>16Q*5#VW@i<#}5xezuicq{7-y4m@l?68~KFf z@9NAvRGgQqK@!?v-1-h$$I>W~?C<}AH8Suwu$bTNVXkx^^sk7XlA9sXzWnf+J;@(`Y~tQ8U~3)o-aW+$;_^9$ zrfVlPRHp^W|8PDmQ#M09c;B~tOYZ%=aGwxu|6r=OkEVs4%{)zAEj{!<=wGsvkvJch zK;`fsqE~Nnz3}miOzfP-F4GsU40pu&iUcESL;F5(IkpZimM&0Xz(2rZep(8ZBVb@B zX{3MeQT2pVtDVTjRkhY%bH7U#;Om3Fio};5$<#DLcd&Km%$f5))W;brM^No(->2T3 zrij}|H^<(#vz;?}663zyPGlxrAFgt|I7bp_X*!(JKs|uP>az?g2U#oneQs3w!c_;{ zs%Jg=?0-FFLfO8()4BVf@Gw6^^s{b*oigA7i*a3GuKYrAYSZz+rFRqjh0C&bEHpmB zK=yEJ4)IyTN=RsjXt`wlN%i z71KpYvcU^lLJN{qlL+|G!V>5P7Srzz^9487^fO+4U7g%wvp?%Yg%MxK4&fjE1bk@a z1h~Lr{1rI9h^$uA+AAwwUs5by{BW+*3g>P?xjO`WXypXBz+!w49N%|SzD-eqN_Z_Z zxM=+Q?JWZOYu275;6p1Xzy%iLuY~!+vv(!s21>bqDE{dbF1^=LRdL=UlS~3Wv~mJm zU@`tGm@g!#dVA}Vv!Og`eJaNbS4=w*RW-fk00AFbIRP%P7=Ja)7hIT?QhfHJL+z@H z_!g(Gw6@2ANioF)d}!qaxWHn3Pna(-mw(wSlbMr4vpm9VZ?3W9%Q!j7teks(2J+v~ z0CGQ3{;z@fBxP~azsm0SuOH)IaO;so!_(dSXxD4^aGpm(-{yn9xrO!4tWn0nwGdBm z$-m=kat}DzzRSNa;QW1=?zU1Js+BvZf5CX#G;#<<*C#9*J)H<3oY#>5CocQ`*+^V1 z@8B@DY$88+Lwo@>2Q9U4eJ$a%`NlC>&F4;jOZ(XTeKw-V>eol$2SxgF=!E)Fr*WMF z|9|;I*TabPqvdn)5#BPbjF*PirDjIvk;k`N(hQb(Mo)3)+`A8FdT~7}3GxkCEbq{Z zLEJoqc6R2mV_MIPYx;Mt?_HsEul47`Z#|rQ_vi?L_2g*yi1hivyh*N8^eR8au4#M! zxjFZjcy8#OKN??uVfxrSZ!FP(E?_Zz{xEOio@+NBPfNa{AklMBRiRPEe^$%uecQQt zoTnNI^`X+a>pM<`+)?-CVp!hC6B1V>_fVqE&*%P{HpJ7@9YY@#$1|TVVtzG${<0%l zYRSv8ydARkGF55ZyfO3z!aOAE_Yr|}=TBzK*B)zr%&;&o(3S{N<~(=Fiig4Ai{F6X zfW`b51oIXx5nGhg^KpuQfX>16drJHkrC)T7lDr3@x7j|o> znm&=AVyE@sT-kIjK6?@(!)iZR59Ni9(CjDlMs1hq{E|B^yk-AYl~oV4N`0*Sd8}I| z<@ZPDvJ)Dd{wd0feU^&V9OwfU(@BGQ={mFaZMrJdxYmDbriARio3;PVNWHU;{d_I= zOR9+Tnhx7vL2JSE_QHvX00n!SIbr^VLL6l6d7Iq3pGqfx zv|T=MamVI%#Yx{AoF}oK?+FjVK5x$HhKbtSI+(X#N+r_l*YnMrrE`AnRgVvArSvs~N;BR0tzcXRZ zxQmxozm65H_-4JTuJi8(r|Z12^!V*){ZJ0)4R_cuLsUPsH|Nd^d8z8^yqnVPDmyaH z+n-9QT{UHf_l;#}Ua)vn^kc#3R|#3Y6QTdZVV>yf36~OAAL`Fe%l~Jm0Vg7x~T-otT@m*3jc4p{$Gb&75ll7WlO>MHT zFZ#J!KR;@eHh7oeD0*XHKBBwFMEr<~gvp0e7!u5f1OTWFF|IMrVe(BNw7%`?!!q6~PzV%!9ni>UeR>VKm!Wz*}qRqw^eHy+pMyiyQ^-a8zD3;PCe zfyMYqFrSpOJN!kBl$S_d|7t7WJ?D9C>ur>qhwIkY*BxE=W|)hp#Y|-KEZFk(!f)RA zTUP5b3)auajC*%0?yF+H~RJxj!|Gl@|;zS@96!YA-}NR2d(Xk zepVIz1uPm+;16Iizog*!+TL56f*Q9*4kYV|N-OtP)``h|JPqX~#E0uJO8ec0E9Z|z zh3I~VD5}Eg)$?2p9S^?kOueVk-O)Wx%o+EBlSanW!6 zdZ8cX1>HK4|I=VTUpjq>-;P)B<(K;dp}g+#T{os+aCOu~&=I_{7YpMQwuuI=&9-!`w!s zZx759w$9f39_L$f%e`~@h7W=b31_lIC|c+}LX?Nzg!QHPpl|65=6anR5qB@djnkwU!4ADNHmv=&<}QN1%!nJ z6ZvN!%x9i7xO)Gpu%S$`Mqr88)g~^|V*34jkQR?ZQ) zoQZ`MQRV}egTzlhyo^$f6|`g`1a) zmTQbvpYSm1;0=9H4`8wSw9G>9?ZSRza$ZKr zIv~P6V^0+S<1n9hQ5+*Hu;97b)sCw!I!8N}NNi3qxxkqxa^)|^rv)?V!4aI7BLLmN zV)}DoK5311?Bm$A&o=aF@Ap5mxADbN+dW5;hV@GrKa>ihP1rBx!+eBRNWB!?Nbdi= zT*^!q<7|8paUO;?EgUjXxk=<26KcYT|A`19i%olgY})oHvbWJB~^p3O&J z)r`Kl5-o`HhtYJOg1Lx$tyFc&?PW9he}^B~CPaIEjeoL|8;*+>0(vDvf1iQ5cX!7H z6i)~|pR($;O8KQ-_9dluxr#ODxg1MxID?74laFJ@8ovr*F5>X1B+FUz!OerR@deN6 zo`0to8GH7i@4*@3Vtq4+7qD2|ieMi90dvN^yh}2l>E%*VE?=KDF1xt>(sE9JkLiSJ zPgwu6FqhO5=iW%lsZO}>>y+_^#v|?vp!&1kM#uSN&1mzOb1;|p+bxZoN_yuE zQ$H-fJ)QDiDm3?qKmo)Jp@*Z7wG4hR4AdW3%n!vdm;ays=bww;cs8qjzH-Dh%*NW% z@$X_!bbo5dudFlcAuLheo`<=7t6KF2Qs10bu5HsPNprrEU4$5Q?Si-wRLa=jGooC8 zxneZl$aUE>>>ko0B{!S6If&^064?3#@&k)I_%%+#xLty|Yadm2&UB37IoEo}&AWCx zDJn3jUtm0E-s$TdqK*E-G8Xs~Sj?{_Fb}cvDvUpy5!-(?EHRRveA3hD`$v;Rbe|LT zE1Ng?&N{#W7UPw|JpRDq3jBFwt8)xw$QPJ<4+b3m#k=J0Uodz_bSX4 zpI9}kZT9m@g+22l=(gvjH;y|{h^#EfyK%x zgUdk<6_adRo_M_$9?$oDQsqxZ*IUIUUpVVu-x10gnrHzouo%A_$7i_QPuy+aV^e<1 zqw5+e&u!B22svNQ`gA1z|Lm`8a5*Ht$YXQA`Py~(1sAM|*s&@y^kGIh>-}D=xN_>j z`a}b|#|HEQi|M`&^N=9RwTj9+uQc#KHD&1M>R24!HD%%k9FP5aL%;zR)D^i{?&yP^6JM81v};i0*?>L|G~^GKUi248IKTrIT1WtrP|IHH#kCh zf$1G%|K}mhMWUbEzj>&=aM|t8@(V8g%-9f+Wzl?XBrf_oY4!;L&4-#@wUjQDk7`G1Ql9psoUYFe5{IizUuKjXO>O!({W8o2q z%Lwt+(VsJzYJdkU#(jk2Ha*avVxrM3c*JJ?f=T^1+$3}U&AiFkzr*qj<8r0iX!D@Q zFyH8Fa{AVp4?T7z76=P3vT9N)Q(kGb6g`g~$~TP9F(B&*{ZbF}1p;U9`!cDnIOF8s zI;o$tk5_zH-Ragj3LkWLM1Fq)^ZCStjJ}jAOE(J!X%zUsm%W=DTK4NUG!8=gK^79~ ze+u)F%&$&9ZyP`Jewq7vme2X5C1Rh;?qw14K{gWd8(=;u$>duq>BckHZl%7v6(s)i zWi`7*u>E&9zMN{X`D`D7ya5)=pGF+tjJ!5#QQgFU!pQ_I1{}uJQQE_ zqk}qwSxKn-IgWed_kOE~mJ;om7j&ctVrtx-r(aQWh2qNQ;-G~6F7y+b+3YN#N7z+!QH3GY zy^r)b@?h@P9rtHWZW@_Cl!K%2TVOuPcjx}32fh!=$Jx9rS#4T++Gc!&kEZ=pKR~hlK*n<%GgDP zGhIy1;&tQCfJX7lTbR#ZSo&`5o~VLS<9*F;x69YYd_yX|Tsiv@So=gns;kYKq_F+~ zW+#MkeFyX7$fx7huZoeMIe%|^;*sbM*ALs5>`)%=7dD%HGz{_tSS(-KVD7~A)-LYsI-@BlG{KJb#blXIZE}a{P5W#Zl_KfXtfy z&0=fHCS;GoA1lv0VLp$B?)LETb~DBi-ax6$0;`;7U8ip?#@3ab^$hD&UW+*v_Y=$| zy@;7y(e2$T{JmAmJX9?D_xhQ^Q=Ve+4A%A`2M2qTeS*erKV3L(Sg_t!fAPTEpPrf} z{xkCpop!#9CXV@oi~B$KW3K#3 z?Paektp|ByuRFfNJlWigdC|6s^hfIZl^-(eol%0&6o^Ukby@RCn|^@XzY zM3Tsdb4l3xJD7W01#p1Hc)c)B`>WE@1+CKae$l3D!p6 zUE+&fa047*F@7#4BE25Vu zERX!8cg#UyF=-99o*3ey->hX~A7BSOU@`6=m@D;m!Bng7vaP%9yO&E^U9edZd`%+u z1GXL>=lJ&)ImeiM4|Q|o{SEXMr{bA|Uc zPc_(i|E68w{$S<@dm;4mpP$l|2K!S^9%wVehQNRaEXMr@b7fmfuRX}S)OqpSuho8E z*KTUB$um4Y7w-q|PeB77upBOWtrfb5#&@`M<-J`Gc_X(v<D=xVf*(Z!CaB+&cA}xjhzHer^hbWO%kj6;damt%o7Il0ll0S4z|L9PGB*;yf7DW z&!2t#kbrH_(~k>wpDOy)QdR$~JA2R%=v7TU+@uWffW^4{FqgOX%l1$1b|EXH1Kr{d zU5V-SxmQl_!PdjUtSg`>mlZvC)}PFm+JWJOpxyZi!hDYjw3nMp|7^N7|Jt~knP*C- z9lZJ~;smzu$<61K#Gv@2-vVNN%?iEe&G`ZPfyL?}1ec@nBb8z^Gtwi()tb8Ak!lm> zyS;N(Gv^!-Z7)Oh0Oha_0@ zFBk57sVm^j!`M9Tqd0cpKz)J5>Wv!i_t_g)e>b`&W4lu!NwV$f&i2FoZNEZXw{h;j zpkq?VU^hgRZ&I*M#7^qNC41{d3gr?>zU3CXZ{%*8%3Q`7kNkXSVd#*KoooPIz+(EO zalDz^*2UVdI=d4i~vl&ORT9ho8v-9sZg@7}q2$VBRR-F7aX=ie&b|%nNeeEB2 z%`*{_3@OU26iE?DWQb5HLuS`Jk0mKorW6`PDrrC&qCuuKYeq#}QW>?|ot3>?Vkbe{z=_aJU=uR>4(+!z? zsJSA)Xcra?uCL&ge-6xL@|8;BmrYo$6mv<<#;204m6c7+-H|RAn}C6M0*l2}9OiP% zR9ib2KCs=$_S;Y*7nyW2$@rB2M&}J4MAY8^f9xlT$vTEY zldymXEXJJ&b6FnB#TD~gtMYMis28l6y5JY^R4u+A{l0>6QG@j=xc*AQT#my*?%9Xs zMhtb^2UsJP8D0&2QJyo89+&aF*+UBE@<(LM%ZdAIzhhzCy-&G{N^cc{-sw6(aUe~~ zNJlFe_k+?fmnopvXj|3Bn|%6bdY8NU&wrjcF~FispNo17;tDJl-}x|?d2MnEdkzbM zv!pJhdGKC;(AdSLUj7g&--~o$q7rBi)RYzXP>;qBeVWuoes*75x3pu3iHdeiJg-Qpu?{*wKpX>GXm zrT}xJ);@Rky|*$@&-|Nu`PWnFKbsSi%05u}NrICz7nB!RtlUa4k89_X&CzM9meR{v z+(I)qY_{@wawK64-IqXa3;KtvA@5cqYoAajXJ4W-nDdeb3cv*x<152_rhUb>w%Jb~ z2p(^$J07%AsDHw7rAZSy?xK7USik`mKPZapSoZ=BfnDs$R2po4M?Wox`Rd zlbSD|#I%}gqWu9efOK>VnZS}xR*@|!5kR?t#mcV%a|w60Jc)j@`)AtGzBP}V*W2$7 zZ#o*5i>|M!xKzOfJYX^Ia+u3hefdd)Z~tz+HX*s$fnQ?Whu#ja-GSv-fSP}Rzl(1G zvY$o;CeK1}{nmu}oQbcyiqib^QEY0rLqX-aN;m$09KCyY7x%FP#WJsJb=aGq78HTZwXh*){G9xWy>zyS2A0- zOLV7IksCU1M&eE8lKz^}Umcjsv^as|*uAwQeDVEL=g&SAX|pMan{yTIcf3Q8^Md~g zH1HEx%-_{CT)FD-5;rDZHODad#L-@&P|}D>CkL7zWUi;XKYFhXOr!x1Sd6Pn!>zut zF{rOXf2&rhSaIjU)#VnSO|Ps#_bq9-G@b)4uozzt=9e>%-!G~f2}?1(_Wa70wJUbN zD9&1b2VI}h@F^ugV-C2$V*E8QU#g`-Xil+eAlKb>0s71SG&edOzZ$-520nQL0Jy+n zd;^%zbSN^1uh)p9P5ko7!yAX}HYAk#>c2z#JF@?zQJVA*%E}n z7PVkjzK12^hNpBy6PwqzP{kc^N!Qwt?gW{4V@q$q1s3BQ!Te=?!ksn39*>wm__?mp zkJWTaK3dtug?`V0{6^S*epK$`^;hd*J|Xd3_w1A{qUG-^hd$4`Sn|yJVPUo{+7H5f zByAY2=Z$H&0=54*%kFn~=}6j&6pRb37Ps2|=mom(0dujrJqQb)-y2{)(>%v3e$Us; z`YTi(vrkU>)9v*~{#9q9{Rx?m?lgi%gx^n@(s1qEUIckZ3s$dIvN~?~E%*21Tr-_P zv>&AA(ljD`z8TCv=XmDl4v7ZIrF|k^3z=8-NQ6tLN|R^GN5U9vqmGcjS- z=dKKow^aQV>~ApMeGZR}Fqg?-^rZ@0+JZ*er*db_dAmJ=Di&Q|Mu!{h9_${Z>gR*! z?mCU#Wncht02YgfH4R_A z<;BLo*Xus=yjYv3@ANfWs@eU=QZ%n&K5d2oF0dHimWIFNX1Kaf%nFWed**6B6JVJT zQaPi23++!(elYpGI&#N|MgVYu#rT_P_#TRPj~_R(QB@?o==#LvZkHi&g8c|xJ`lnp z1h~Lr{H-+nWBhNXF1&Q|(b_Sf@kd=XtM$J1`#f}?&ELmk=Jseu!;=qUcNso;joa?1 z$lWO2tr~Yv6N01A@twq@2?BmQ+zxX^@BMDLoNnjj5@T>F`_xmf_)8*{?l;i!fW#$r z+diau`%L|k1I%Sru+H~`U%>mDiY)hRh%U8}>Q;p^|iHrQFLV8IENk4xNq9^V- zQ4dFm%N+96E8@yWEfcwVY5#(_W5+cteVP0&q5U1iMg9lFan}jrGR@+9xBi4cQoFtQ z>(3XS*O_}18=BQj;cyv^w>uy%$GO>p-|q1`WS-Xvm1{4G@34G)YGvX)v>%21B?W`@ zyAc+%5oO%rSWZw}yUO$4Y_^I#FYaC~r z)a-OSd}qzJ=K{Pk2_`Jg=O2AS_jfV>8Mg~Jn8#$ipg`G7W?Z6cc=2)*-JmOTH}i)s zM!zovxOj&kUxa8bbAxsUEY{xKVeTrMPg3m%Zx|=vVOO&s-v9K{f{$&-m1(#@fb22g z0gG`xVXi=8*~pvJ_9*5Mu20P|RSTWoN=_(7qj`aRd-6vPG19a>zylWJ5@9Yg-^6_T zj?G45+nNO1{yfzlO>rkgw4wC|xTLm+{hQMIaO=&7hVSTNCLCn1s`^9x=jr!W?K{-> z9=!4Z?ceC|)m$hOKHxX7nE$>oUtC&!@znNB715$&g#vCy8&(RoXQebSEkybu;4``J z09r1{Lk8}o`^uD(06wsojvuVU?ytaqQc|TTmv?;2BL!twnVuq1-ks>a4`5TpNzIiQ z=!GtU0T)<|?+^1O%}?D?c3FAgv*MN2fpT9zTAa(NWhFA;qumw$zES|pXFK|d<&I>} zE@PuP!||2=fJ>-RIe!?sF$y)BeiTb0$7@?>mEK z0q8wGdhtQ>RRw+i0(qZ4d;K zOs$tbZ`1UTEjiMt=PO>o9dsmSZudd-9vr=LkaQTvDHP^Q8tP5COKcaHcE6fFu5qh= zQP_y5StH!;FdZj9VhHI`NyhzW7|frofBN?3n=%!@G-hX~aLFjttEAkEuVKtbyL=EA zV6pgw!+cvdsf|ahUubhN|8o+$Ez;!@u5S^!7oBH-`1~*Dw>% zL;lF6M9y~e#PrQ{xHFAUkuZ0^ebuhPyFW@L`Cg3W7^M7Bwsgs}>c{$htbZo?i@b2< zj~+M$kq%w=osNLt#~ zCUJhw)>7Mr6Lqt7ux@YSdD9L}e zXA6|V;gVwvc)()ZoiNvQHFpLv`gC0RvDCYp9d*8nEYo$dkU+mfQ0IdaGJv2{7r+A+ z#*@9w)I7QVe@(?(DFT!#4@3v)GpCNF$Hd((+4u66S^G`RmX ztIOXi{u-TkLjGa{1@3px-7uHXUfVLBptCu*w`ZhCV5hb8#g!8Y-uPU+druy5Fqb{# zGt*x6@Qo4!S@IkB5*^jLPXsidrpHAG9$bI-z+A$;CRv|Fz27%J619|n%=+s2H;xVN-=xEs;4z`RnA+B`KMEsxm1a%QUZL*yD3?{Y`|qBJFQ>H}(e?q(pg-FW zb46LJcDDweDW|dcYv3E@_JdY*!XZ|5hA%Q+btdqd^`vA-*-aA z7J=v-(U-o*N~MqO>KJ0cM>`9A{y~_(@%;p0;ZoL)w?H%*!#3jHr zB#`Vph%>NQypv%rGpGC2k&k*wzNQ0f@6B6zNp0AAGrk%f`1M)`6a<`UwbDt>sOP`=VmbNJjn z!*6X31d|o>@VE@}!zg{Cp*yw|M5Fc=$QyU?)q6dy&SVY1 z&Tm5bM_Q90uYiP54hDg|0~X7_T$oSTD!!_}^nlU@lhZBxUrDaaw|!ML#Y89nz~>~g z?+pCUgZX@>lae{UvDIGJW1jKdO$`oiEE#Yeqf?LMg)xKq$0?Z0Svhy@=0hRo)!RZ3 z4C_|1Wd~0RYq{ca8RSPk%$-v)w@mYJi!D*3n&sSH-29iM;zs{kQTOhdg zc^c-gI>;>cufFU0t}krjqn-Tn3N6RBGl$~vUEPsG@}!uM{(yP}7OT%QFkf}$bJ@9b zZjDGwniKwAFPZgv_DSw1#dPYE=k_4`vJA-h3f0xTAvb1+{% zRx|nEqHyoPhbM9pIJLc#kWkWhajXO&F2G{(xd8K7m%CjHkiS~|$Jep3v#)E}s*$A$%VOd91c$jqQ8t@q z>JMn%U1C!5lsTlkzj2*Z#W^+RSP-w8ZA@%TAT^t5@Z_*7PgLiP7VN3Iu)vi}_mya|u$j zer{-B6@2`R|IXLWmL*OhY0EBcN5Ai3{?eSN2RvXgZUxMh+IMq|HZnEWGe_La={ZVTTCvgOSEioM@T z%O{HLEjk@e(PTlWzE7hhCmk!yNRU4n00{l?(Y1MX+mq7*{hmNq2a!R3+$oIc3vvqNKd@LksDX93Ec5J) z+AmJn9NcrJeyPe>cj1$q1Lx@Ht3Q&j(y1AC zOyxT*x&rwfcVvA`zZ}TVt^0yECz0lYr*j9^;rQ5dU87n3^566?&ML01PuXR@e)*Bf zs9r+cgTjzsRha2~-CbCR2&Y#^`c9bteyZ_@etn=d z?t~bBLzesY_J%ZSpV8fztzeMQcaQT?NiF?2!Cf%$8(7T$CfI+@g~=927t9v3cpm&~ zi{8kwvX>w4zL`xwpZ?SJl9~rz`*;lNFkKWZHv1SDw?t0-qGQU0e&MqRDmE4L$MbMv z2oafKV_h)tA6Tp$Phmcrsrp+nXO)s?UyQybrR}YAied77eG>h?PFoLvPniNTnm0Uy zb(q!OvG=ia5D$%gQLK7;;9~uuRJ{ui(07b+bw~rS6DfKO`mN`%j-+*{^@@_?u7g49 za;BHp?NLqobgX>g4CM(8a3ZZC&?E!#0v3zg3s{F>VjdCvbFo3Zb(0~{vnF}vec!UG zoipfQ0c5E264qI?<@1a9F^=uuO^oY$jStCeRnGsn;Pwo0i*ok!ohfe3u#Ws24v7>F z88O}MH@7X7xR6pVURxXR0R4WA*3a}wRdV{`kpL%p{{-`wJU7SvKJW_WF^!*+ z=rK7HeY%iopWFNRl7jn}HuVkvmxudZ;5E!+)%v<=U6*R~nVYNs9sIog{i>j->i5#r z>m87EU_lS^4OlGi-oRWY-a6a9S?vG2j7CaG%z%3=JTiT zU>@P(YCi!fqx_>%JA2>UuPkI@(J|GQ!SWR0A@d&6NzR$aq4zMCZL!U>z`T!Lbu#O< zihteQre-PiBIyEFeuPU}?YTz=y1P<_I8bh2vGRX_xrVjjHmh$Ao-O1&rYdppb4_@u z7sswP^xPt;{K$XU3LS8O#dzH?kLg$3)sF62Ov=H-Hj3*$b|`fi-JO3EUGD}Xzp#wF zFhjc5HhoPHubuY5T!+Og6%T&4m}PmvwAGt^@aBWP{d1cq(eFakTog}o8Tbh-=5H^| zWipLnzYsUNQ`%Q*zN4tg^BYIF;;b$I>o2%1hs*s$!*$XU{5AI3w4rdFLH$1c583^j z+st2}^Ac)*|L1(@gZYGvEq5iH9Imh!5T5vM?RHq|q2zKe4sE~4LeP!$aywO!@#hI& zVD8dJ`!v3DoFlp!X&;J{)LMB9KI|?q#Nq*SRlSijwz%==hq+7}-2?CDYtFX4H~;E9 z&y0P~{#p%BaMSoZ9b|m&0LwKN22>zlsG^^2KfLi zmKTFCH_tI%v-R9?oiB01NLI=6S=H=QzslCqaDf21g#aF~821~@We(z$Bj{XYmP-6_ zHtubp#kr}>0bvPrdsZrjUKBA#dzOgp1e{r-$|`4O8xcy7Iub48|Q1ZpXryy>L2ybJskPz7@}JU>7zM*Jq^QL z<^?9RU-L&cpOL+Pq5bCrvnTahKllDY`!B5AP%Yu+)eo4ZqmL=LFV=-9OR!_<#8xL|@WYDWiGv z7|a)Zu)VfBkG+QIIJvFw(v7gj7+1~|c69&izkK9=3&7*`o4;W`m)wZFK;Jtz&x8#u zvjg>J=`weI8P&#%PY5zJ%@Ch)g#VR^iGb7t6Y`b@L8I)Hf2#eSNQD(LDt-2M-C}dO zGWpQ?D&~J^K!9(E8g_foT?H9eoc&ag2b6;Y$SW5Re_*kCn1FToon;$~`L7LiJpIyP z-|dy5>(TyOSPk8mqN@XnffuL0FrVFoU3+Igo0`i9!9B;{+<(_}ExYidGP;h3_{bJ# zU~mBC^=I7tpM?2L&yMS_(v*C(>48)2o%r2$5|i5`PAQ`2Q6N6DI3<$n0K@}WEH3{L zF7nL^#NXohP?1VgRO+7Kx+b56xm~M_Q_S*1(EH;dq$>E#AC`EVf%V- zmP=Pv)#|CkBa$w0<;=Y9=>2&zkJ9%8zko&k^CZyl^gW{j>JCN-4}UOuwd?4SZ`t>b zPhsz0ka;w{30^!snPIN(ugPnZ1`opxHA+pZCJ!vcp`_`0qC&UY|^9>^Y~p{$Q2Ex`2NVJ=D?u8RH@s zQjv=Z9svx057LtZ=C%;`Xs-?W_nr4``t{1qXN?9kw>a$Ufc$m#cXe|Pr5rE;2EaE|@D|qWveKLNqbE zcOQ%G&8FGaU-rC|{fCZ!7?*U%Kh)Vjl>E93ZoP5CT-H^;18@9Z_W4DgnXBXuJ=v`&iPP%(X;>%PhhdQ^1@tQ zW{vpo{F~0tU7lg?5aqDpN9T3j^4CyYJ>5eosen7r_T+=P;&Crp|M`aetv-;?IqYxl zy3)+{%~N$+F6k>NImPg~h}+ct)RO3dhb*%!W2@Rn4(E%xJY3+Rvt8B;iYwM)LAim& z$}a%(=4ZW&z0PBM>2saX+shAP^_dwRKQ z!GU_gWrWK9ol;QwN%IMeOd9BcpTJ`N3c*~B^^WfIzC(dT{+k z#&YWV8nf|Jbj%1k>e^Ls>D8_Sp%U%7)^UHJ_7zN>UASBkm^**Lj$*lqn)(36vByK> z-%hyr37OmqN9XI9zoe}>EWQl-TTz(%t2454}=i%4-|E?+Kvm7L1EA z$&+FHd=P`V9GjigUanKmb$yoWeO+-&S;s!TmI+-b&q!SIbCM))apN!t=Cb-U^+m}B zi5%A4to~$eW>~xXTwzx+D9=dTkZGqu9srBwgE-9PH;O4$$@ngEo2$jCSZrBRx6IrN z`8S|?3v~@d-s(ioQ!!c>c+Q2n?4t&+9d?K`#Vrkrn{udZ`%U5haLFSZL#_nO zof}mixk>k?%4;QQ*;9XcpUzRzd|2lMal_o8h78INEEb1(Fqgk&V~1p5uDZEGr_ZMD z0f~)`LWl0uLV1S#%zY$PAOH_oj4KIqmsrc4Y3N>}CK~*3tKRI88!fPV)zV6(>2(@cIWCn9EeI zkyg{Ikk$L=L||jsl-9YYx}`DtG+fG@jzRv;r{OB4KQPr=KIiov$@ovlFCUpZHS(}} zD;5XfFEp}&@&k*-K^ErjO_xb;dF_AGG`s#@ymIz(i`CcqUbxV3K|sif26(_?+=Vcg z>0tP;4`s>MkFRP`Yn>&kddW{qk2?_E??Z5;Z(3A)hz#N&N5fU%o1YzUn??K1j?V8A zvD@O0H1cFuWBH45p)lapn>@@-S5g`-7(X*r`Jw#!HT_@7k@N0)tiOfzI~W)98*OfQ z+{G~0Hp~89`Qjx3tZ^NiMT(1-S?o5H3wVU(LlpARkV{mkJLw<_M#b&V6ksm%THQhO z&x)@ITo2xC_0Ez@%DdSicoLgGlem-|1N8(fR$q!R@4$;=+b86hbhg~K-*@5fhC`9p zcg{n)X7cZsAshY3gGe;TlJLr}1aq16eFY6u0#yvyi$(v`==T|Hejm< z^}lb;P8bhN=O3RGc*Eaj_}&j&kC3?JSs3z<8P@rp8ZcMb)ls|0vQtzj@|g0Ho*iA6 zyZ@Xq#eN^1oL7LWhAd0mL6R|;=PiTz;_n=8$4pMyS)XZ$7VnN$@44f1BJMQ0-|}BR zIHSR!zgZ6RS@XrG42BZ+wSUgoeT~)Pt;T3skUj*}^$s~RrYr=fyq4wu4$ITS- zF5J7AlXSu>XhPjFZ67`Vkuw)vFfFXI0=SPFgt2EO=3>rU5Up=c9U{ z%|&f=za949Jvcaka>xMR{}nKwu=ucjUQfBTlfLz}7T?>wpU-z`aBoBRabP~_XU!>_ zY506?n6K^jyLu{L_D4-+TmQto+{e1|yRSuFr5AtFG@}aR(NQzYfgj7>GD?eNk_UxEHsV)rXIBuW27vu~w#6 zzm!3iyqk&J53YjwOt%Glne~i#)C2!kK0O}0R?khMDmo2Y=TNs>HBxPm8ZYn{Sj_L$ zFqb##q+f58^^Y)>V}tjU8-qUSI9dIBgw2;BZm2W*CIjFBi*a>fuJAs4p%YC7#g4p6 zaVOpkjQel<%)b+RZv@U4>bhjmUiDx;Yopq^80n+_zT=OICrc`lKJ{$iw_~LjZ_@YH z|Diuv1M}H@n9ZAZTU?1T66sl}8O+gHa=m}W6?*L{igY@d(p%!zrvc1o>e%iu&%~nX z{668}gC5RYrjhQOPn@BtPm=31)#qB6EBRn~!%r*At1{(@LlIlHYE2wm+va$OYJ4My zf;1R``U4iLM?;u5{_@;};=Jf;&(fu)6Mws2H}yq-^md{e-$>078QUq-8a(bgn5)3# z-E%OkR{yYa*5Mr=H?W^P+N(1A43(ecG-lwZ5zJFB+}*ZYg1daBO+h<%xZ=v9R;d!msHnFNs~knNx%aZkYa6+0&8$qY zeWj=n-vCcA^8_4VF`gL>@3uhxEsY$TBe92!+!dC6Tc_P4T^@qXyHOs^3=!~v#kl4$ zccE|E;GUk}qav#erG9j558Kx@`f213C_mZH5HcQw6|ejjFqgYwd5u}=maBsXccRkO zl}c~qbBu6{LjGdh(8y3makYfGZp|AmHaWj)+-nz?cJ}O^ME;`pf}=)gyASnITZ>E= zJ>AU$JXJ$|ka!@ICOm(wV6N%U2JOsU1z}UA*N*m>zff9nIY`Fh587WLTyuR3TYWR9 zP*>kj9|Wq3++rs?jh_#jV7}9J`HE9fYrigNR*p0|b0MmFZ?p2-VRZbY#}9M$#son9 z0gKh6HOyxj_}g2$P-%n^JN0-0aoPBGDfYJHbTr=(KKiP%>XML9ym;8aJg&F(e}>X~ zZfOrxKT+pnyON>R<8*&Hy561U=_3zrhr8Rj`r^mI7Ur_83)~g?S7@v=e350rs$FX> zHBz;ai*@An(=^v3AlPSy_-=-|98cvge2w2Jwf%HVXP+mJx=`sy6`#M9yuiwjeBBEO ziBxe83UkJb!xoq;#xEyq{AKQPhrNxl_I0WXx;)&A#G=r3^t8VqFGxOvdIA=!udOhb zx$mZPRBVnR|C5!!ven-!&ily2n)3y19|)Ip#)s(X*qF@cUON!YCyxK>d4-)%~ypjDmW%{ zR2t1Gc}3Od0Kb66{IiF7tS)wQrcA#RugX|!`?37FsMNP5E&LUQM_T1zFMtCMuo%w) z;t>v<9_s(ImwWk|)bGAFdMayL`vcQsm?-r_;`xR7h7wgm!HNvAOnNKhX!x;6iWV+xWVpz0io^`FyH};ah+i9VjYzq<&!D=(N7GD)>!p$ zNGq7VZH+|xTcmzSTyio^Plx~ySd6;^;xZq&^qqSuFJEToCcgqr&$8CO;%%)xTF zS=91a>B^XiLhA}qJEQS#bRJGAznY8Z^y&@pfW^4(Fqiw{f~y~{HQsbH$rd75-7Ku! z|M{xJjsI|o{%$kO?>%5H=lk6o4~#D4OtPAc6Z_%f$@{K1vT`1!{bO-(2@9e8bPn(n zSj=B!9HNdd3&DNCs*EZ=Tm7Y_yrS2_B1I1bSR91%772$-SZFA?Qv`UxVq9dpL(Sb{ z{=F$|`)l7ywW|uV!i*-;R=mtxxQUjF>{f<@$L0YKSd2@AxeFUi91dT+&`6js(DVMh zq3+Vi?$Ue?%D9Wg0p)@Sle2$&d2ggR%8uWa| zbY8f6xx4yM2L-<$N5&;;K6^@w%r^VQb2UC(9!ThDT70@d_)jp)fBg3)2D$_|2a^*T zbsx`vWGIFB?iQIVMvFe0J>qYE++xwVO+ogCVBi2TF~WycA`8(1vvelS-p=A-BR zGfMns3-?}W|F}Tmik?DWQ15^IM&7OsKo0X$F1g^x#UJLgiMoBWBt6;iXCD9ez%Xnihsf16CEZ&2c~M9%$``5Bgn<#H)IQ9#{M}7 z=5udsxx_M3RVlP!BOmtxjr=E5%A1q0b8*x0Kn})Hek%+33oPb$Fw8Y#sk0DTAWJ-N zl)p{I(Lwvx*gCcBueA9=K5~b-40ym|+z^;MY{v37K_ENQR6s)H-nIKicmJ?*4&9~g zpF9HmXE-nHiA?UP^O=7+m)c*}x{1@?#<{uuG3*PyZ9ZG((Y8kt*VQW^0Q`0zsmTC; zfyMj|gZX?9t>zp#x->W2jW;q&o?Caw@rL)3gS7GRKsLQWP6HmW7&jc|O5N}Ju+wnd znAn?M+!vv#DfH)abNPDOcz6aADNP*kfW^2GFjwr1_N!%)h31Q$W5#o?#n#vAs&TJv zr}dZU=j=IyzmYJvBYn2^4&$50mmTUEj(_>2!nAr)QT8BhJ|ivL51nexn9or#Uv6<_ z`^M8lPqH2<69*3FrydO|WcwXTJC2k1AV)wPfW_hw4RhI7SLucM4S9=O8+oprG7rwB?nJ=DXDQdTNG;?E#*t7a7+Bo|ijQPMFK`E5I|)wvyA^uckKekfob*%Lk#S^J(Ku=29meem?Jl`O@n>4a$X;Z*JLh z*=@iva{ZH=3r@V*Mmzr?trJ`VBFU8q;tMPm=UAA_ac0%|tX0BaGmXbD3oa1Ya_vuF zpZ9CpI3w$&Kp)2a=x&&6sdDS3C9~g&gpv0p>qBJ3dRss9`YxbtCw}h!VIbpxpTJ`N z#=%@cvs~MtJAnc}98RAR|F=}JRJ%gN?GtSrNL&}}@+aT{i*fhBTrJkD`KPzEHQL%d zy|jAWmCdQH-d{yzY4e!G4M8qPkbDL_U@>ky%w?{03aMZZNM7CFG<4Onbj74>X<1t0 zfBg*!0WBNwfW^3bX}J0MPB%8DE!J+DU%RJ$Tf^h73b|Or|M=_g=@H->#^4;Q=RTM_ z-(f@bqc@J;MQ5(o+?i*telVwwt+Mq$`4HlX+@nWp4)_Ty=5GSbUCFoMcgAr?Cc8%N zpWebdu6ajxNd4VIJI^4U+af^I|rS+!k?;6|JAGY1_%nzuW400Os;6=UsYq>8SEZUuXXO$Zaowf66$;UPGIA zB<>7(cM#^X#$~!xvwNEQ?rfZRYPxY-k{8SMgya9^`nn^Ja*(3|@&Z^aKaydtG(YQ_ zNalXevl_o2eCIl@rh9u;r#2Vud?3)--`x%QrBAnj2uh>@7g&s+0`mm|1alJu+8;-H z9OUq>`*yUs>&Scc$F%)^pfBkg%;o5J+4ZaKnS4px)xH8N59^R8<$0_G zTECH_XvBd3ZC#ND^Eu_Ney(^qL%<{WZ0El~40Pn#dX0Rc13ztUkY4<}DY z|Lc+1Ea_t>>ksA*757I-TmIO~BtMtue7IX-uDs4W z+Ho)hIb83H42Bdqeml>A`9c@!i)H3EeQx?~r8(=WC+FVnZERPu-=&|PKcjpw0w8dF z{$ZHUn)H&xpwNTm>d8||C-%8 zYn-+}t*_Dhpm&6}KM8U7MQ-4co+=})h#2xSVLq?iNXD)mkFHduZrWSidccK0OSz&} zpSFD>zhdh@!#p7i=CW)*9T$@I(zsDQ^O#>{wsem~(#MLEv|MCm4yJi{<6}0=txCD2 zn1AL-okI}Qcx?SM&0($O_19j}=65LR%NQ04&>n%s+T~H0%h`3DIhuXKP3bqgLF)XM z{Q0xYMwzg8zNYhp#HF57lOhecz+(JkFkkr0i~T8%HcO+*(sk>d3KW<85L#<1O*`I@ z_|TmAB|;g1@pU+PHkUuxF)Pn-jgpVkRS zr|f_SEXK`+xjbJt$(nq+I5+V2gZP>Vxi%SNmxF1K(eK_=@d))n9t|Y5#p$CSfD0_f zr+L?pWtNRVoS#_hVdKTjVJovIzI~E+F5$kZ?OWyCB>9prr#Yuo(Xo?7w^< ze~rD>wWWUzyx(ZNT4QVareNjK&$Rt4@_Xb&u5*kr@uR$BF4=2(awtz?o8{X0+_2~T6X5^e(#RB1}9_7dyU0$ zgqZ7!UGR4RAGHXo2bqAMz+(QMgSp(l>V@{ z(_p{@7ULGeTqf;bcI)<=UHEmaV1>r#P02fVX)WAaOVeLde-6OwKhD!|^*V1xZy7)K z;Dvg^fR)7cBwquo2RCWrOTBH6$Gt$qU6r-a*&yR@UEKEb6X8`4%-xO#oGzlt2kPx= zJnlu9%W^PjwD^wot37AexqdoX#-C`l+I>8WCJwH?&LNZss6bqS#o~Jj<}&FW-|_Bx zvG`%ud8?xK?Ods?!T#x4CrunkN9T}V2}Kha@PNg*MKs)1wRd}8o)EcOJ?O&}m9i^K zYu(VY(=>6Q-Y&(9Lop3kTjklK%Jv)a#hzO>)k`Vfd6slJ7Q637$usKhOg!#om`f0! z^Tv$r%hToGH}lJ#zC8RoeZ7BVCr$r}jDn;InaSFX7S=QMpQSLL*R5tr+$CG9kW-sy zC(k#!8Q5xWAb1*m=WE(;D!v-&S6?ZWi9b&$gLMe2zOC`~&9_`=>#rNXn+eW#;=3`Ys(^|4G;8p`HrxfyH!g!#eT~GL8zL?(Xh+AbI~( z5G%{pqEDv>cH-AVD434pm7@{n^X!d3;_KP`F~KKp&t%M}`d`6wBNq2E$>Y@n!uLl` zySM}d%y5q84y>a-bSKC+gmvPFD8WN7j<97|{?vxAmiYC7=wQ$6f%pK6#py20XLq$O zI`QPvY7=F%r*`u>Yh?vLth_jm-`=oCV3DB@aDm16_h3HD{(C#Gym_TQN4MD_{&&aq zDRFMsmCNw^^HAap^RovqpP-}4>H4fzuiSLt$o<>88&^&)E%}zjpdJuDbbJG^91m%9 zg4-AH*vUoyDsCE5$uqoJy8cqllfz6(xb;oap?53-Pwx?po~F&RE2hCUhP~}0Jc~?S zX7Q+hU$zgwosiV#5lyWo}Q8LZ#_m9=iUWkOEiYenw(w;Sy{su;8*?6pPQcKRIV2N<*Zj{Vl+ zbuy~k{p@yAhfzlB!B6k;$9K|ej^RZ2>CXvx<#++>2;4f5J@z0Y{EgwS*IT$_uf$(u z{+_FguS2@b>*R*~#0S{s!P9vO>j)nTRXrrBYu?|KF_2*TY-3ip%U*&We!m$`*{cHe z4J=mg%`l(eT|s`qzpX0+A|DtWhzmbSG(RL0_Yr@5iEu^^WRMF1xWHok7MRZ_8htOn z<1a_F6q8w=53%R;m-7qWCgb;Or0uXkeJMAEFYIm@ zewH=Jpd3VhY*GjO2No;GE0{lPFk0%L)tlt=L);G!-aS4ll%3zsbqr^Gi6FWmk6U0> z4Yunq@vVW-9&-tNAw_UGoyr*^lj5SABr#p%C5dB{35 zd@ zjLSn>6HOlm1oaOrmIv=?bS8Sgq~Ef7&TjQqo3|^2SF<(gCQKPHZbxoW$hiX|GRg6!TIS)!uM5^=nV)*c#CbvLwZz0< z_Y{vV7qae4x34tUKFN=P@O4Q&w6~?J5_+%sVA}7PUyuCQ{4Xiw59ZI1<9srBwLl3OOD#9T+BK%$N z@d<6g@a$6wJcEJe{cit*4rOi#_`qU1y|9j?=@Hh92gK`=ZXPc64bG}}u8EYeG~$du zpgdHksBrtAPp}U6rNeSMZ<;&xN^ZXWWE6HXmQyabbdquZO?BKc8V8!IBsk z=k;35R+smriq}Q5N=)qK-s8wPZpfJ$(&-{MU-Ahq5HDb{xb?w0e3oAq-+JTSP-L#s zb#mg%A(8T_Z}stv+bg^<1bkpIoiDHso79r(;fdt?&tudy28%foiBFnOW>4YFr?L78 zL<$q)=j@M|>1`&w`1QkjEV?$&*qb_+Y}JZTD_TEj_^bW8d;t&R{(;`96WqKQfc03P z&a2BXl;a$gf03G8Ld-mHe}lz_C5-Efq~}XX3=ltHu{aLW=*ah5KG-?Lk^ktf&K04k zzvdN8@hjgm&c8t9>qLYbmKJ#N`wHt2j?WqJT$Z!5&@$jyX@JugueTMEwyS1{UvPkD zFp`7+(|L?ES=KrP#N=BNk;MUg=tjD6X{W+gk zpr31!L?ydat4XfgKb;rROsb6LVd!#;wDCfzG%58wVN%AT_-ChP*^d_>C!R!M*l zET%I8>#*0Ya}Mi^&51u*f4KErWWmjIVxy<;GOjoDOS>y_)zf-#_cS`o%E(CI6?sUz+yV1G&=OZ8!cp*7tog@zy}u7`3386hHu}4h^I9 z8lW7&V&(Y_>o8{pC1uQNIJ8P$OlZpP^()!G;~LBh8RtPLF_fz50zR;q&L3Du!JhM^ zv05MNS&@0y^$#hknsSWrZR)~V|6}78_~i(4cZ8SMA^m1TFThx|>gI zJ6+GQwS@6H0F?tf4WJyrV&$2DbqKPO{?AxPru3wp**2R-O=KBs{VGkRIZuKlAL)B5 z5xJQN=(zPi3G-)}ru$T^tY!A$7P~)qUp+Zv>GJxJ74+w?B)%Ha-!+(Y&zd3x{09~* z#}uqX$P27UGZEeM;k}!hL*D|=_mj*QM`qFAFCpttJ}dw(uo(Xz4PPqsaEETxJLgw zF2cvc1oq+?=rF@Ngd7_a`JoRNith4u&fc{;^2y4hIexzM_e)4RlrZ7strrW-pT#@S z@+^$wlktt1q|y2xtl!o0e~66H-{&Ku35$II1MvqItp_hQn9p@K@*_p({Ja1kL{OZD{;UF7Smyeb-3-$txwr`kH2@8sqJ6q^z+0~|6ySw{eFw0 zLpn9<@5b={ffom?!*WvM z{!;%>@u?Rt9!@glo@x=9DURgpm<;c;cyYrzoX6rjMjUvS$q_yM%om<|b7_;QY?<{; zI@B99pd7$r<>7&K2v?5fvq{-rU8m)Hmo4bWyHC-ltsE<6$Uo#Lp8E{zWG`M=hgHh5 zbIJGxCq^PQPWFT^_l*@LFOPKBo@ z2~sQuN3jm zy$`ciao4r-KG@8B?EDP*ffRmv+Zg0Iuvoqe!8$A#)rPlMa=ocJx8{g-%5LVBf46A( zRWWHWj3e@YBELA`PC3m!-AUo+i!iLqeAx0-$1hFh1q<4)$|^7YamwlZoE{S<&HtC~ z|B|P(X>?;0o|_$X;7^bUoj3V1y_hF>Pw?4?GxQ@K?(S|b$dwxMoCU-aSS+q0untRM zfn24IlTEJAn8M(D-^`Dh?w^ZmnbaAUk8V(b4zQS>D6GdEKk(#A3eW6ClE+n_`i;t5 zsxu8`KQ==>LV8dz@#|3x)@89;y-AhhfkyFF{Ygb{or=Qh<;xblouOTLAUAzzr1NCtw-!JgfyLq}4(qTuxAe~~ zc2AX+Py0HiVfA~B(+x)r`I&U0kl$wk+s%LvET%IT)?xnVo~6BS5zC6e2G3Vc_a`)) z3pq|PGbuC76Le$Nje1uCZ@%s&0qe1ZHv1VQrCz+ZQH_vSHL%OYU^p*Dn*P27r60re z{+IQK*F0E{&2ivo-2As$q95Zt6rTvWei?q;>Y6!2evmd$kq?H{x504BCkgA#8vS#6 z7mqD}x2}OHA^(+TAlJDE$8+fKZ&J!feXSHP52auojx*kGt=seuc5Mh1Q0z2(>Z(xI%>a_&iILg3! z{JF6$Lf+t|J{flFC zx`j8_sv_0-GsF?SmPvid7{9-gh4r|@+>KT}*d|}CvnqRDkz?Sj`$9%6ZZphN=x!8) zasi8#Zvl;-jr`DyUtlOr4+(UD#q<`!ddz8; zH%G=F$kZP4+v46@pCcAgx!`)> zv(>$$>BB~YVxf7qGvo<+ZieyvUmn(BUcl!2##)xkGvfS5mCJF1k1US%S8SLejv=lA zf$na|^PVzS=P>rmagy0!0O^D)b~sj`XS8QM3{g9ZXnU%+DZra+^o)1lx|W9(fvR+Dx1 z+=Y|!xgIRyWi!T;biLEv%`4PzdcqELfW`C_VLibeG6hd0H5Ym45xr-fA4~Z8!(N3r zIKzA$l<$9;uPecNdOwKQnrBZ+do9e=y7Ip2a!=8_qkdffWBDj&UKz9lWmu2U)yl)Eu34zUP0;7ieGwaRe5NrwXjcxosf5yJVBX-{-+~F{$4~M#n#P zUsIi_eBk;i^#}xXfW`DwVLgt#b(fzl^+<6`ig9uOy+!`7YhAVchneaR=uvlNKnGY% zPYu??IY%tVa9%XMnT6kfslz(VkM8d1E>Og`*O()^B+lt|?Kti)J2;O`tu!{*y|AP+Y3IX5)i|H(bby%*;{1%Vq%5hmTlx2Qz{;xw769tvY|3lnJS5g_pZ8@wX zuyE9W{KOUQD}18mBMCkGo^A;|o_= z(}yVW>qiICLB73%-_aB78N63_dPzps$)Odi?&tNIRrzliy-WYQ0CEM@iF{<6`gjE1 zd}b9~9)fz*_+!WJfB(|nO^&Lhd=8Inyjo&F|K1(cjpFfF!+h?V#Y>JIwd39OdiFjy z*G{SD_wSW7@YCG8MmlfuLkq6Hh(UWB+y9 z^uPZgUzbQS4Br{`S_AV1(^ZD->O#y4*TmJ_TPNY~n{v)vCWwANgYij^SfVo&M*WOF ztiu{!wQu!sxJYK={KIvN@)8e_5JH_Yj}=*F1|jyg7r$WWTu?VJo?|8feti1#jBt7unxDs{rW$FIfO-v z-)%W;93~)sKU(miD*f-YKqo9XgzCfwC%`}m!=nA zE|s22T;{WFP^a_P(V!|T3x@3#ne38&bcgZ1KQB{Qhn+1ke@K>?d|>fU9RvN76Q#8+ zV_`82>xX($jo(hqU>)v7#zB%g9)C3EUvRqQ^7tet=joj028MA%j=ZD4$-!`bXb$VJ z<>t?|sC(S&AC$ds%IvANX4F=LpIhmVpIE+mA;&WVD9>Z!<+TN@BM_;1R@sNE*W<%( z9bUnUH^!s7^!QvEjtj_zZ&FD>9s`Tz^G2A@eyR7v?-muS+3Q~~i1*kW(NxT5^YS^v z`X>fDQ6^9L^EEcy-unwPDV5L7T6sUw01m zJ)C8GN4-$plVQJx+zpw24G6b9*02sc8#Av}(~EyEx0ngGa9>((``e5Vz{_wvfRAC~ z<$(>XlWn;w)3n^w7`H&*0OU>$|h<7{fPzi_9uW2 zbc_!#@3z4@?14rFH{Mi*W-6~X;HgwMO+8VYk@b>c-XT9eOm(~tPiH%Lqvg3Tpg3b4l5V zVS5b;L%ym_Z*hY92Nuf%2Uv%F&#%(hxz1Hf#~hYU*4xCT~_NfcxtAwJa&N_!}>v1@xJcULVyn}rsD+bxUWm# z4|}t2;(dj?itfVbWbR~Z6S3J0+Yv>_$u%GtdsGI0JlX;4vGj1y-m35Tn{U4Y=dt!I z8S%1bDL+O2N4@Dw()fDLu%5(AHGfmXzb>6$FBJXIU%Jc2V$|+QHp9FK^$8@pPj|2& ze!yaJbb)pFT>LLvRCJ}-9I2hE9I%XitD1DWFpuH91lm2o9hY2T9nLBae%JGr%ZHQl z6ce-eeZOCQV|=&Pj5?u2%2g#$4q&nJxWPJHHd`jg&V|(x91k@wSN(G2v{$vy6ElYM zMyjkvd%ZX5|W^z)wc&tU6tL&{0X?n>Ew`sYZI{tkVrn1sjce>`dU^v^}l z$LUWarw=ZI_yCK=$qVMQAKrE-{Rxlqv$m^mwN}+<&3mwYhrkg1bCD$fNx#y;=)Gkx zBFxw5@tyTi=(6}{t@%}_vyxw}iekN2#)=akpw|Ij@{9ITaGh7B;B>ASsmckgDvrxnVQ-~x zvZbo!6x*v=Xx=Xn#K~7OpBU|qJiAV57I^vO59=t2{7C(Jj^+DgqB8(#hD{O2&o`x;KaNY8MOD{g)T)97qZmDe~Qy2H=^WY(yYa{ukh@H3CEFv#Oj zs-*`xaG)H(V&w^eby!xtYFQ$`IJv<-Mfdga`EM&H+Qd0K8R<;VFc{WPD6Nj|jf0Q9 z<~rH%=2zelEc#$(}{$2=FWXpvS6JZ zPumTfWkENdxLsyf39HX%R6pdy9@E`3o=z03!*-T8SETF4!zSxp3%05l{^b0Y^QvMI zqjriM@_=s7;glyD)?w9hsFP>^Khn-T9_r_h72M@pwIF-gACt-ZSHF z>15@5$}{yITd?JmrStJocrJw%4 z3pX%05io~o?T+5+0hOKNX3_$uJ`_C<)Smfs$qs7eGx_f7$>k4tNIlpNbC^dT+|1p@ zapRVOcH+F*Ega1c#oHdmVSEpa)wl7_(1~p$ta`8m<}mn;*8co;j3-{8w&=hCrUu)S zyrRL!sdAuGWPj^3DnC164(nGXg`oTA_a^BlxH{fjf%EPSH6E6yRzC3QE=*1&%pvSL zGpnH_KB|fMr^x8`j*-*~)mHOM)W*3W^5c7xJ~y!ZwhQLqlkF_q^@WKA8pCUhA`kIs zZ}ECMd&kuKQzUPFGyRDc3j72tQvQ2T`cuy@rKg-9mL}7g*kl9hpL8m&Z@|>Ghp!fBrBKN zXtCyVHZ=~(8@i?jixUlV@KO%VErFxaqZ#TOxz;l+{XUd#Ep-@UU(efU-I~>)V1S>1 zMf?>D>(7xa=}9?Pt;cuKJm%b!s?aMs&wnn9!syS&^pz;lN0Yu`fIhGYCl2Od%xkA! zuNmh|%xtNae>}_~#FWplsp~B@Ff`S270L+T{KjkF$z-g0O!P$_U%{?liLgF{qg$Pe z+w(^bZZYp3{oK5Yr;3|t`&^9g7;myZ*apQa?<82C;NF!YEP662=I0uV4T^l*Peki{ z6xc~k-`RJ3ZVvnpEK&~1D1DC?E9--uL{@!SRW9f}qvxvCv0YCcsOftU-N&jF&;=IJ z--p)!c;u}?=YyCenOY8^-~}#~L5>^0Q`1Mb1F-y)g3|Yun#+%O%38Zzsi5RSF@u6f>3evp{HWX9w5C$x(V|jiSN{@ z^iyGd27y~*G3*0JVlF%j(a@9o)|kC%hgmyDe?FG}0Ad)lAq@NvEK&|>Fo)n_yZe|? zZKPe$!XW{kBi4p%yxY4ggH}f4_Rn^3z5n#95WI%#UHGye&^HbscGWCMpd7Bd&`FP@roMuMQVp~ei3=S zKFxd{Hs7z{k5ef9fAbebpFV%(!W_outrq2}d;<0T9d8#G9uqS4E8j8G z8q;569J0S?=jSxc!7mWeAKKIY%W~ECneTqHo^(hmlH^!~(Vvs|IbBGBNQgV|6R?QC z&Y<+C_Scm0%9KxKiazWxpbsp84GXCRVi5eozpi}EkP;$;g0w+yG)F@F2JEU zY;u;yCbWP9EW$en^YF851UdvATAwUTNfVbUb5OyRw=kAr%x44r-9gj~=J(PCl>XFy zn|d6i=)+FKo;T;i9EPvqbD2*BH?5wV`zGpC{E&IoZNu6b7~e}{91@fp%={F<9NcEp z-mpLG)_2Sg7u}z|roTCDfmv(y)a^3FEimZs6E2_}fJMrq5Y}g?tes5OYavU|k0 z`)fY4m&*62SfSo;A%E0T0w6=i-e3fJz#_Uuur6a{$?$L4?`bE5TxCOcob}ugA%r&< zoZ3Gj!IbOy|K2=4R-LfMsY@u%yS>B<>vau^@xz;xS*)}p{5uM{w@p2ckU3-9d*gKq zq#sx$AH}df%bPWfhfLNtTxls~yB@E)ZGQIsSez7w|AWVNNvMw_mtlQD4sT8)yZA1( znF)o)tLpJ=6|>47&z<^vn4Es{4kaRw<)16CKE}LIa;kL-vi_t=A@B>Zh<~o4^t-n^ zG5)BzZ)d9R@G4z_B{}ocPS>uf=Q|YrzYmH5U0@OYYbbq#>TSsvY#GH%ESU}6JlAa> zvKlE|k+j!W`TZjkE5HT10TAzVfv_9}|?WW#+FYqTcfXS6PiU zG>~p!k@T0MbhQ_6;0~)+-WsspB4erM_T{}j$Kpj%@4`%e{uL{|w@|t(0;J4eiC$RG ztlktUNw|1McFW!SlBjoV#k#+m<8EA(0qHlYA4Zmt#}7J!@&Xnqw>v1^C5Q5zPj+#BlaOLNtF)>oyw-@H z)dE!?pg=jG2P~p{7o}_PW3Vlg{ZVT3&F@Su4-Vs9NX4nEQ0ax9=K^}bBD(iby4rix zXRY(?KX_%}`u0jCO&%vEoJ1U|o{?L|#PeBL{;hy@XPzAio-Hq&`JjK*kZW_BIHwDL z4#UZb`I^6vtHOAEzan{~p5#qAPv92p;)UJ5@5B0P{@s(`x4I#qYc}YbySK6Ks#8!q#R&j6^n|;-n@^_r@3!?8#J~u}6^Kcmd zb36y29Dzm3^AW7ibE#;N>rKzt!#e_gT~#Z79oUGI^;VrqpZrcCJ^GJfeWt;|UB46T ziC04pwzKpsD7wURL|nG0#FFItgNB*_$hanph1 zHW8+V)t;(heLUf4#s2lHJ}BOBd=uEKg2N9NS^Tz{c;5-6dtBc?IMBsytWsk8{W+}9 z?sxB}&kr_5KD*qwx3V5=mqPZu(BYn#*CG0@Zod9O3T}Q%dY(>x9&W4s$x%SSFTf)H zse$$JvQ|Fr>}BiEeT&|gk=GUUT5{PeeZz_UVoZI-fIv6$7B_Z2YGIDB+5*;d8t*k% z7rl6}@}9gn>HM1d-%RLon8*im#)yi39js4y*{bqwPOWZnbl&PUC*#$04!z2e@|&1{ zq4Rp&U+`J5&JcD0|#l2*w>1Q{S*v+lDC_mi$A5yz$}j! zFh|g_yV2xn?Yfx}`!kX(JZ;e4_2#jdoUMN2*P zFY6s_vU;g>?xXluOn;F%p-v%Vb8b+dfJN$61FS#C$3V*JId7I|$Ly0GPhSW3nwTZk z@u2&QiSi!1nxATa+6e3OF1x$`eGt31u4t5RL);SGPL7OoGw>7NBWOQSI&NgZ0qF)7 zNq-Zp&oa6L2I=i|D_C^_d?syt81~6xiuw z_03UqcIYu1yChOQcKXRL7X-PfP-zdZVSUzTU-B7WKOrb5|5`W$&q}EI`1*`O9Swa| zD*A6w`a(Z7m9&^|Ob>Th1y{`nio0{j9j;-6+%pJnH5jvzxX-*>Ki zN6hBeiptIK3U`&ntUqJHSyby!3#`x8YrajArSxoe>G#fE+B)^_hhGy_|E}wz>(7|J z>KFi|8(1X$Z()75c;6F=Mf}RytLLQzKQRiIK5{PJAsw@Qx%dPI5XWaNKo?jHQ?SApZODSvUkmh}$V)I?1Gk6jW>^?Sb!*5?Xs2ytYyeSN^DWD5s<3?-@*EP7CI*j%kwW4&khOcG~1-0Zgx9Y?I5;)#;5!g0`Lp4h=1B) zebJcK)tB~sz4CE%ey&CWgU#C%^Xn#o*y;Z}^#{7ZBKq%PeTL9NL%%Af56Z_jB}%Jb z&;O{l@;A{AGyUUHqbgL=-+|Ik?X9>b@anbfN$*^noB7XJ!gl=>!mdB#`ePLoq#IZy z{U2d{{N5Cg?TZBKuDaOTTJ0u&2uv+B?9{>>_g(#66#WDLZhDhD3ZM@x!ubSq2#Z%< zPE89-OuCrRRQ=2$bz7F%V;5h{aTDe!nvhR(0exT*PAAM^HGL>~Xgf)ak7NCoAdZnQ zFP}KHN{vjc-=fKlpo*#i}1QoyyFay{hz30HC9(E%G@*l@Y$yE&du2q zar{_3AEJw!Uyz$3`MDlna%3eHUN>DlaQ`S>JjJnWf_wps}%>HF8m~^aqWBKn3tj{@v>2#&`2=4di&P)~=)5yPLADE;tV{EWp0(?4VSRQ=xv>EoDgoG)%| zx97b zm{aQYwHH1Z{j%ye3@pJc2g;+(`a)kwy1A90Nr=Qlpb zOh3_={0Irve&QFb&q0{M7XR()(VD&^XMNAT)8DW@x6YTVwJNuZ zSGn1yCiJ_{+>=C@zZg$lpK3ob2(B14jtV^A z`Z%^-Ief>tKUs~+i%JIfVScxd>5qLzVAY=ySYLX`|6pzz@6PR8=ZfmQFmVpbwO?z| zia8JQ_9J?Dl8?=kS5lB_ipBW@b6Ao$xB3~|9&t7`U`gN(mchB%}UcNkEW!TnqUdX=Q5lzs z46wdvOu+z4ZQbv3XBZ z>H&o|!>cD+e;8i>8<&MHXWt+Xa3>tl1s2g~g7vw0?#{b%q-b71p7Q1yb{~ZH-QqHG zQNsML7}p=`@PIC`h(0r{&)ie@(pOAS@SAqRCxw`hT~}ZEo|brl>7TJf8`S!1A`7g~ zSxQ)-#lTj%zKz#@MP8OjowCXrs|4!$)cR{8E37};M%n9;iPTk3vx~L(fJC+O4x?8o zqL|};0Qp^kV4q+xx1jWVz(2queqw_;+$sZH=T=;Lbisq8&E&#QJCgR158G@o+X3ZH z0_yF69oFYs`OQ_}+-k!?>BA9G2C|t)134PE%3=E{I6NFV+z8SQERuc>SfBOzt@fF$ zZQ5Ux<5g@uaS!jjHM(+Z7_+|{JIpek0iX*kqR$EIb8!R?%R6yu&KXF1d&Vc`Yx!%t z+{Ifk(?6z9wVb(NeLh^gz>em;ADVkAhSVGrn{(`5wz=t0*QYiv6Uo__+>eS`2mMqL zW>?esHP4P!bG6O}js0(C2cy^RC)OteeUVWUv;OeF`cj^mI?A1duMzt;IG@k6tawx8 ztYB<_S%1j)fBL(+khr?-qD*H)mmD4_On0pgNPS$&Ar&nnv|R|heE;5M0m>Cv zqw;!`9_@eTv=bX!07L5nEg`hSLE5D0lg)U)aqB)e!;H)L2i_L#;J`1Ghlr-o)=;}+(q#B1sAE=|1nv7V71B3 zqvDwUr^I7WZ@&VtK64K4c8krZTc`B!w^t=4mz7>;%dPtxkAWTs#t-jMiWjT@nF;H& zS>%?BMn@Rz=(+d$iI=bI;-e*t+iqgkf6CnyZe#Ap(iepF7c8=k302S56!CvR3N+mr z5qhxmNyZ3f{h4$p1t?cwk@6LS^%b?XU0w!p^$qvk=4+5@*!s@RbfNPa%y}buN0|JI z88!b1!}`4G8xNeZk8#(0VE$EZos1ysAG5R8o|xtPcXWX^N>xlOsxPl6 z>r|B`D16@4Ggl6CoT2CkxJ|w;28$yKbJ#4cPl@BozbE!T&-VP4<|z`WxvZ`VbN)WI z`#I(&EPXLppO6wr+J8F#iB2R#y1e0{#r^xEWkXM4&P)GpSRt(ev%b!PIRZu>pLDNW ztSmfw&v?!j%f~Vv@`1*CG5d>2cRzr71T0dY#9@72t19OkiAT1b)N)ID^OTK0Q1_&! zuo`xGljAa}w`U1hU*LIORPR$(rBUrG+Z&1GO}^NhT7M)7>vJtn zJG^1fj12R)+L`wTt4m0E%`N2kEpYxH-CvOP!PFY~1z5yCvr+mvrJUQAWd81a!65(O zC12us(MQ$|-qiFd=YA;}0J^{;`ckmIhGI!m|5K!& zGIgY)FAeLn<=oRftKo3Jo^`WUuzqPkqV+;EkyV)Afn@)HbG}G1W94HG%$fVe@ub1? z%hDxcym!`AGIoFO@fq%XjoI&!FE|7nhrmC;B7TyA_0>NX2F+;R{VV;ouZYpp{T{xj zTgnb#e}9bWQ=J#d!umWlJ=-=7&b+!sZj;6f7JrB3j!Zec-!R*AFeMVu)y*HNtCXGt zq#sx$A9G<2OV~yGn%RLbjiRqce;MAe#Qdo|ugpu#_7FmAU5Ypl*3Sr#<+R=}D4W1N zlOWV1+@VV z+;L}1V(C%-%ykXLnj)zw%m2hHPCYJ=^=ZZd5S3tkRw2H$Pc1S9=|vY;uw6g1@`{Gu zoOMi7w}UZ#5;)Wc(hV$;Fp}z=ZzT0v<>=ut@sJ z|2J8mi(!2>$vd%u z+M85QW@{3bFMP(iGnGT-?rY5UMKcb7xCGW0esJs=!=fvz!g)ErH|3f=lU5hQ!S+9`H~^vstj{OSuF{uaKUmSa z$7i);0B^L$x=RR+<9D+_r5Z?!(PR1WUrToYP882);BhQQlD+7k2m zad;x1wUB)VrhjP00T7qL`u`FKK<*#leRFE#@p72+FL40>$DtAjKwJTH{v{6J|2eed z0Ejv$-ao_vOybcU2SC)Ni#KH)02Ys08~|}8ipSc$^N|$kg3H_%)b**(m-S(NiI?-{w{WB#2)fT{ z@$^a4$o;;>7goAb*QdIUXaMVTZXWFzy8ocvGW_GsKd%PAe$_a>w4@QUebS5rAg+S+ z@xF({p3XU8kR&Rv!opiC;klaaTGfYs%>IjJ901V})(@3Qz3}0R=&NORMoonqhrdK_ zzaC@lhUp)gaR5XkNFT?{ANA!xOKd|zQmkz~qdb3@p%hP+66XAjW*h*~7}g)!(Pb&N z`|}JfiwzBNZjvS4tfzOyC}7T$>5c;+n!p@f5$m^g^@s5@0~!|CcD|7l_Y=NpaA@jv z8gjd%83#Z#h4oo7H_SY@_SQGS*u_fM{FCwR3f}skFyb*N`ZT|{R>S%nPt(?m=xyHb z_vwrg>2RWK^g@>!^jBimBbspl zL^D{Q!+d!{%qqz%rdDS|Gg4CfRa`Rbi?I8lF@382ggLCwo#$*%JR#n`{au?Ev&EMqpy=^#l3l#pH5MdV$!{HyLp#xzm&za z+u}6l_cYBo0HPJFKS!c~X9kO(@(E_oIax-rHGYiS+Bg2aw+@|ty5j(d>tGH`xd^Yl z{}vyQwYwtEZLjoN8Z%NhuM@KzXvP5$*Tec8jMW{CKdv?%H6eWR-T!Ud=%q!+dUi~` zK0_`C`r`mLz#Kj{_5QbKx}Vf+i4N^Dclp}9GFsOT`@4m99Kc3cUs|v|epLXDw?1Fc z_>5`!ll5=SJr6Wt_7`BW5_|o`8rGlF%4TGhH~;jm=Vv=-4Qk@%UgS5tC5YMHXvYEA z!1{Ba8DBUZ=6gq2`y+GV7Gi0DKrSHx`@4NipW1yt#7(fi__i?J#P%-Bb)2!QS~r>8 zUH8BoNuo>3py!*utFRQq4Hp9ZlxFc(aqhxL#>W;wHrx|Bp3+r>mBu2I- z1^8skGnr}o?y2lew!Ow#ggI}a9cN$%>$6+I4{UC@8Fe-Pg+{?ajB^g;{*-o{fh(-frxc=XDPwdff8{NU zJ{i{4uXBTxM*rTMh8}mu^r?>fZm|Bp#2HZ1PczQI9oCofJQhI%vpnxq)Nk`GzY|v1e^4!%S@1MA3A6qn`U+l{>-3(mzQ|yn zRLLfhk!T7v#Ae z&tSvs=V-?LBunyZlG~*cjVEuWQRpQ!yHnwmcn7?=H`6sC?+LbfU@nO~<+Hnlz=o;;)2AJz@UQwd9&ft21cSPxm-9IqfG41#Qay-}M^z&}SHO!nZ z$NG{*&LQPNtKnTWZqaNz>~f$PUl0uI&m^UMUQxYS%}lQLQ}G>Ak>@e4ZMZ(nc0fD6 zAOzOu*2oU?NK9_xdHJws!Gg$V`{tatIsOgXKQ!YDLScO#iLX_%v1uGt8&xDfixh0H zUh&n~79$>vQobZ_8u10>Shvak7rB*p+4}SztpWC`+Lc2i=gw|PdA3ZFTKZ|k7i@*~ z*?M-zCG>Nbt#Fkml&DxZu3`vZ_O5p7_=55D(-~h74s&F0-Qr+oSy$(7bjC@aZ&Um8 zs;!TXiD33ewBrl5!TK8C58^nu1&-RD|4=kvcz7ttA;W~X9lIV;;uomSdm~_dUI(L% zRWrng4}IBZY>=U5?GdMQK!FSM`<4Fqg6%MemFGCy&W4@tRo|-4E;VKf`Mq&*8jBic zK4`}m?11&N_q{!L6lYdLVq0oq<>cL1T^lWJB7)g((~d9L3F~uy2+yoH;P_rvKw^8z zKT}onie1FAA#{Cpb0v;lLFh2)rFF2M1T3CCS6H6 zTp@!_Klye6I`8u!?t=A|^<+Og?fVpWKcW2P!!QdTJkga|{5QIux)VKo$yZCzaUThB z53K(fCoi2{#5-%m;;ro?(bc`e?FkOm|F_;awoDhKL=NsGc`A}GB&LiAz%Rfe{)vM1 zg&$V*7^=@ZHuK8fmU(%7!pHMn@>h4F{XbbhkQg+E0J^{;`g>u0m5U6G3x3oLFTNAC z`g-HTMC+>ktUQWn|0DYDPA+bW$BLeKYw3X_L8n$k@l{dUpi97 zD>Am~VWi*P$H~LhKh$rG0d#>y^kY!^)_xZoSDjq2+qr|SyQVhN_i?(>Wp8x(g7lO1 zg9DHp09{}a{a9EZKjV^G@e_{rD;+Bt_+BkC*tt#i%_u8|KKV+!t*VQu>&MZhKMT39 z4f!rZ(ocTxVXLAldFP$-1L+19Nq;$7a;;op!X%FNc^cP59sK=bjc??UHe(ES^d{;^xK$lLN`RS2XTSS0<4D1E1m zB!06$=}Ve81wCE)_8H6T2{#sC)E__paRRmalLYJIdEcts7>INDkjJ{|+2@@MCzjf* z{rSdSzgogc>zEBivRnrMEpa(ips~| z!+*So0Db`$@y|X;p8>~n{rukVxwXrEw@3SDdEGcP=XdOAHAej;xj6-p&u;_-P+Bn1 z1s2gyf%I{NO99P`-oKj3$Z(kVURT_e(>b{M{0kHJbAkF3=uGlP0u+HBu!!z{SeJvH zu|;#Xv;pa8+KGnE8chZ@$7PrBOx)KtS(g$gMV_SrJzx>tR9F|MqqyQj*FwVa-5>j% zuNQs()NKD%UKPE6MGW#+RaRA1@D5ZYg^_2-lpoLq7ST_G^_hE5EPBuy`z4Lh=1pn- z11r<$241@d==+-}%dF%pE~(suKs*5JvbeWbd3NX^ zkWOHc^rpkQ>?Qn1M?#O362E1thupTo-RUj4oUMnUJGS5h^ngWl55c;)f~M$Jm65ZI z9(?QC>!pc`(bhLL9-{qBUQP{i2%LCIotmFBV13SLkz)&kZuthpER;Kcq>H_5bm)gs zAeO#MkRlm1CXZE)hf(@*^EF6sSH{j2jt<OM4^90eus(C>k$^erd^#Pj>g(17)?Zv1RqJf^5>wxg zrv6b_AGhPs{WzN<+51aH-h_&kwz=Nlw!t|S-LHW1b@OxZa7GZI-T;f#pDb9PbFQHB zTl+nye>mQoy9cKzBQE&n@!u_t$be_9S8H6G=4nkHh--A|2}pNpa)(0!8oU-K}c7c)xP#)BoG&2mbeRqN#rZ z))%}g^Ip6lde%d)CCe_x5U!rk(k^qcz)HU#?fQQb*5@qd(9$=!dq+&_>v4-67w5(o z=cjEb#?lXzLwUcS;AOJr+(AG>97ge<21 zqz(?WTVRp)dj{6$){FX-dAhf9+rZ|1d$gRo+CmnJ#5rT?PpUvb7g$999ITILez;Om z^T=(V!|uyVUM3Lka~|4PAUdW0N#2v)gVq0^hxK^}i2(r__U^xNx%yvtt`yzeep=dK z9hN>F}8u=ME|UkYG-jx{aTz9RPTbaUJH3!mO|=mn4QJeGNw`n1QFLRcRc zFPeKfE%KILhM-17d(y!oyJc?!9Hty!$mL7N_;L}}=l%F$Pj%m+tVfwEikC<(_3(c4 zv#0p)z4OTYa;$w(^l6VTMJRpe8yWmdPOcDk{1n%%6a7fHHFoa_W=#Lk9$zk@^uxMu zo=QBPYl1ACPgpN~{c=@&X?g>RrRS&mqtOEuSo)K?2dw&k1=eSsIvy3=_4&5WJ^WtoE!S%E&>JhN zuU|iWr19$`87x21F^*k_^(76Di^v6}^J*)&YR!KuMBMf#=4dY-OP`K$tOVBQ6!`p% zfd8eS8oKUyTiKVWs!bXW{fy}EXWw8S5>bH|FnNIu^#8yjAApKy8W!=%q9FOKkJ z$sg^m4lB^;&?#Ps{{BblQ~N%;3G1^e=k1a;nLi_`L2uq$3HSN^se%jaS1nDjsP==1mFHTVE05AxAwaL5n)d-N8p z&!qOVr>S#qaHaE++se2Mu|E%$89E7Q{{)g3H%V@A0RX=Pi}=3`)@Q!i_)I%w?dWVD zh3^JR(Z3S)I96;oM#qPs^~YD@seX^$hB^4YrI+zbx4dHbJ!8F?H+S#BW$nUx=g{A& z$*T)HcAEKXIkTT^Cb}YX?fb|&; zACoF@3C%dHUp1sqwst`nTSmtxbIkOQ=~KPe244;l zNNv>h$7?$%S74FytwiY$KF;My{dik_{ktwhEwYE6rLd3u-+dymf2hXcJc9KZY{U72 zOIuGIw7<%mxhrhu{il`3S4UD$Kh=AO9>e4%udDe_{y!eQWLe?U?DOG_ZB!D~~`I zSVaFRO24gYbtLh!`YVIowV|hanR|X&;b%!;*3a>IgfgXD2D-o^`c<(0=2;?cVKW!K zIBfd1Oini|R{!Qh6U+aLH=OX#xIVRY!fIGwRq0#I%WClhQk5@N)lDk7YqBE<%^ft- zPi;JW2J4F)7!tGoVLjk~%~2tVlgKXnpmNA;IeNc<c zCU)IME-g@h$l%gK;z~x6)x>)p$h?rOkG#T%sap%{GXLK2;tbC-2|3RQKcPF$7wY@& z*(I8z#}Tsb*uhmQ^`#EhRsC-BdV>S=8g=9M?EX@FI}(<0b#$cvzrS552M+1+cRj4n zbh|t8x#2;X-^=6$&5x!SDk`l>OsV<*bdMjXqmu3hSeKJ`OS{eb%rslOn-ZZX%U?Dp zhI^Zc;wX<^kl&+In(#CEZ^~0r#(L&vR!Zi9L=T76#(D;3Rt6Ib@1VW_i`1J&h=;E^ z#kE;JI=$vx-t5as#s+<)Co8&BG|>C?Mfa3mJ*6~x2J*L-?-;~HT+(+iktm>J_kf}ZC)SekddTZvmhl@mgA3mx+ym3q+(b2z?6^NP*p5 zw`Su~ccFbo8aL*5;O1d)oP9`?x4_1p=~_&oVEU~E=5X6b*XiiJ3D}*PW|gU6^^o`H zoNLiHC*J)-*FOr!h5Sm7pDTD)2&;VFLLB^HNpa70eie54<598SH}5{hH_Ct1B>=PD zQ8;4{n=Kj740e86Ar6i)Ea;j*Fo)$qQg4W( zqrCuUQdQ(RY5U?h72Pv$(D6YN?PwxD>f?{1V&~@_%we=kz*o2KKh2T@*Tr_ zUKd6s>EJkn41xL#EK;xAQJkCgUqs#W^|n{bL@iDf|0Hbhl6TOO4vq^AP6x~pk9*fp zmgO8duvPZ>mg3>z#7wITYtnIwRO&Udsp}l<;vM8ozIKax+{Xu)$0w>>n;9tOd}yeB zwlG6Q@uj@@^m*PmIodpOTk`P+FzoXB2=myZC4!PadEef4c8NccsoOr;m)}ZH8M8m9 z)C(kkTS8Qn$usx~A}B9lk#hS4^SB>1+|=E=^zFM<6^HDOvv0bUahji*l>0$D^ARdmr z>~^NaL*pFz&)2k=v5syZ&7W}0ZxH#B;;`c?0j{@9NZww+aJ4A^*fKYKaD8o z3$8l%ZRI8NiT8o0>IW%jE5<*GDDK1Z-)9tOG+z6Yl=Gc>|bL4ASLYtGW)vmf}znlDq6qR}(=;q|=OTKCz*~ka=4p^lA z^}-z97lz*}p1V9`lnZM^CLWk+UuP~3H z?a)2Z6X|d2pJy!KNy|Ev48452&W(B za4lG8(Opu$ZpE8DKiMCgaMr!}*){70cE1ET;}!}1qSmf{!aVWfir!lPW+i40&MKfogS8h|;>Jw-*&97m;JMM!>`AyL*~nR8HzCj`4) z0S>qo46~m9f;j?CxtT)=(aO)cw(!d?Y;Rj2(P^@35Obah>V>b9ANj)cKuVTCK7d8? z^Bd;ys%VPt;uer0m@Z3nmvS2w*vS0;%{laY8-M$ABtJoJKIEs9$2-WmfM$M3R0Q2!e zw+x))^Dfv3v}qhZs@jvDt;k)>d1BYqMue=ywKJNE#vFt2~Vm;0rv0FbB zPd$lxUTHcoUA{m0DHkvS0_6_uc=>xV!hAeekjS?;7xP{w_kPh($h)O}W=YV)8943f z_}|4pVCw`Pqkr&Xg88`OmDWYU`xXC$R+{^M_z^bWVZ&u*!t~1Dg?y_Z$USEHGsAp* z;(O;Zh83>v9-YK;o}CB1Rw;ay%AH>R-NMNGuM-IXeg_uuKMRV#yZOy^M$@gPGkX?F zt0fp7uw1xf#_Z|w-6?lN(&Dqie1duDKH+k%>QTcLcjiVXZmFm|n4{$|J^t7tAT2%{ z%x4H+C0%eRVf)OwqYPzXLu{&_XE8ZQO^;96MEKhQ0KWr^_@5o-Z`@{_md>(%!@ ztm(iXjN{>RNEfV;E5AQYeu$F~&GIKFWAZsKeAr=9pH_d+>9QLKf6X5#sSuOi(Z6qc z{cnI%5P4@9GysrqV3GXuz3;+KiGCy` zY9F)zKkced!vR!^#_msi;t*IWD?~)g1aR%FlajJB3QETMb>qA~5FcK3?HQYj>XJQuXcO4y2(gapKw@&;D4_?{7~x z7jKYbs@z#Hm!W(~RItX&nBXY22WgS@D}@qbTl0tL=lM)| zhD%v?`aYRsvFu*ZMY`*?D>=q#?CwP5qm`UxP`rQm@0goeNb0uLe!9dNp%5>SmGXvHqmK{7&-KMM8u_70zOlQ5GRH;Dz zfJO2-8|LA2aXp8_eCFyuzSdK})clwd&Q*jZ5V!cBctMnF`GAK34_JgNh2k1{%I{rn zm?71xXT81lT7J~tK4Skd+)}!^L0*(u0?qTkUeYj^8MoIZCvMHz71e{YbGEMQ&w4xC z-I@(C=G-#I9*SmV>Td)If4FrI#$d&B20?b@4run3sz16 z4_JgN19O>bRd=SuX1h z^L&_(8`>6=v)~JXon2w%#LOC>D2vU!1ZKMXX?Hg_S7)d32eZeA2dw^b0g79#x!FRi zWtUy;*Pz>H?)h&~SX)OvU!_TBzOkH+-ES_0`Gj?&(wBbft%(cHdBCFjOYOI@u)k3T z-Q^DPCpjIPF9-AS8~M10jvP$5yf(zP^-b3M-aC#=ZGkv7y7TYn3S+VSE)R1VYFO6> ze6aM47QQjlSZM767l+Mlf9BBL&OC{3fs}BFtu))20?fth{eC3(^UcG$Gg~%{mRJ-i z^LzVMy`-PJHNY)!Qm_@apA}Kuw`Ph`ALorqmXp|?H|2?lv>ezXnM-$nHg+$ho9pCA zR?wb-McTCzihF!x@Y=%ln=X`iUm3usevuO2)~Z^GQ>U|h5$^b^^SG}84_Jh&40Bl+ zA9?JQ4sbf-%vqDLDoC0~X1rD$HXNH;mZt$I@{g@1jtd&miad z@y~sib#(Vz2oH>noJnw$z2uT0gG^#z+8q%CM*8W2j?epUJeL!e00}6X}^2P zC%Vg*a_Nz?zdtzhPo;d-QQV!noz-H)J8a$sF~&N@N50;q^89Nl-Tf5cPIwu!UTMHw zysccSYht)A$Zfq#KT{Ja$A5}0F$bp-bC z%eI|rXj4>NmifVZp{WSn^=j-sPq@PXJYW&7CWxVOYQNej zF4ITfSFsQBTNr*b+?I)0dEi}7RLu^$%Qql6$P+ce1^EOP$?q~0*W>8R9KywCmALp* z$@{BFj8+x0`PFo{qp^E7>H7X(j^a9`J~BOcv*!m-T$SvP_;s`PJPa18rhC0*`~ZoY z>-hS|Se*v>1QyBf3Ybec(s3*0_>+V}?-!*xKO{mTQf3_pPN2KL0^CUhKHve1aCKlV z{-K6^*B!cJd;hZP$g-&P{hL#o9%05Yq32bT zR$2fDScJC<=HYe;iG;gf3(u3y*2sDmUGjacyn%!#-TejS-c!mN+QcY?IsO^KTs+Ua z=2kJ`r?IBFstuMb77o=5J7W&eJ%6NdDVreJ^G73?$B^PR`(k&@zDo}+|C9=uu4AY_ z6&~{RpLl-M;(@%3VIFRm{ES%B1Hue}SG^anj?QCO7I4V;_D_DL+|^0juO={;P^%%Q zR##o8msmQZ*`<%+y3iNd6HDkG-^sV;fhi3@gZcw3QjbhwE`$5rxZoo#zWknR?HD(8 z=ajrVhC5$RcRQWLr7^y*Mse??l&!kV(Z1=H;ov*b+_HYR!|V>Nbgze!xj}B!;;+2c zz&xDKDx0MTw!L4fW1@CME?P)yL#(mk3A*Qtlrp7nz1a-Ky?4{bfH5gGgS4`wv|i%U z;g845lj)zQQn>W3H=Dy;kyDPzBkbSgE7qDx^BkY0m6+A&z40yG?S|%kuwH9n9{%>i zey!75i(}pyY<^|xdPlM)ut0e)-Thyv6A5{)8f%_r3G>)x=FPW?;asz*%g*%HaC_;p z){_^>Z^>cB(UT9#QH~Eyb#Mr@4`7jYVg>UEDT~(@Zl81NSD*2vfU<+=$c~q%3aGJgm#7J+3Nal#EknzI00_t22H-}k9^D=s~tPS9G*Ms z?ay}(>_|BK`Mf`StKfVCgYxB;nB&|Shvex-UXM|7_6c?y`-dve8Rp@&w8c6bBh&XV zlrzoSBgPrm5*Xqrgc+|eC2#yyS;_^f3KO@?V&>Nc#n+fs?00|N@<{8JKZ(BYx5n25 za-7qjHa~!7yof7`zqH-up7WOr!QJl4!aI^QC4Y7E$uME=SJ24+Upi*~-B5hvC-+{@ z+Yq?1!ggt0UDcofN63>syQhhiMfC%qi+94uVRIUWB~@=u5VJyCp<{mZk?n$ES-HC?jG zv^YGVf1l&>J(&ANRLY-x#@KUm0f7DlSfpPeqWFf-rCEmusvS%3zxaY1b{;bAp0&?% z`ux8I0Jy*+d@mGVUyeue`L;dp-@lGBEx(r%{$+vVmD!kaEVS}JsQ>^MScLD5;xBfz zxzT#yeNf!en-bOorxgT8mt^Trr~HEhCf9z<_DAlCp?Jxqv#*|!`60*C^lrn~nTBr` z589vheKSq|U*}_wlfEdvru9ZA=lMcE^d!3Og>;9s84`{t9mZTwqvC(^1=C}ZYQW#X zB7XOSxrFO%hCj4YWYQ$f^$l3^s}7z%wR=kt=DNq!-0_u5#O;6wEW-7NxeSD+D9b&$ zR>A_uKIwPAj94T8jK9!ldff5gT)+bs;Re85mV@odHQ7!q<;-hVL?sJVy!x}C^z5eT za>HEQvBvW)FqZ-UNu;R6!k@K!$wKDA^R^Ec8O}B`3**KJN%dM zj5tdebaF+tTx{8V;6~(DhsjH6_Ir-+B%U z{NsF-%nkX!jD!3Fi{yJdim%4Z(b24XH*EQmc{bLu?#xwPpTBhd<9uL(KRzOpCj;2? zfgLa(clAzrT+8yg`uAEsEAlBKh78 zb8)xKFI)&{6f9m!O7vsZ9FcNpCi2e5+&BI|e+PJb82h=pg&~V2*!3$4=8A3EI^0lh z7KQ)#jnpG&zw`8|ow*_TnCthGx!&XuF<+v$5@G=v5!QHCcl{b z(f7BTf6WN2wppKFrd3#v89z+3y^z0-5oZ7{un0d1#pmJQPkdidyHPB_y2sv1mAhE| z!K+RGiH|q|aDhem$uOU>@6VCn`*ulbRu9}`im$nL=V$68*NeCn)2I)~S1LG447k7| z{CzN=AySG(t)^g!taoExc7so=Ns#8F+s*%l50*v&7g&U!g5qznmnb~5&b*yz?!rzy%iJ zr^0-O&AjPfg7?_jE4p|YMI;;CKPrVwllU+E@z=>P$B8tUkH5tHX{+6@<#SIvKmNqy zdbjPx%&XStFwYTEYk%Wk(c>SL*yHp86hBX!FkH5awN_yTYhLrC>)!@XNirV!5B%|u z4{Uxqioahx?T~gbQ{N29^9>h%9DJPgXTHi0y5`}id4iHBc{&U#A2$CWik~1nRKR+^ zd5-z=SLbau_SKZixZXZCZ9b@c*!)8@D#75t)@Zt^Usw znVnMae=}e{qphOSEG6EJq19KdwfETFI%*?nTKko*bz!vseaRi5g44vO2xxb}BJJ-m z%*QP=5{bC|$aXMl$B}ia(rS_Ina3`wPiq_;=LeE6D4kplu;xjba5@;JOct0LM`^1! zaYW8vW`~s;>LAz%KY%*Xf z3MJ(qmEC|o7|dtzJOA11hK^gYI7{X|!ZinyUygw6?P>FA_d_`-euBKT)`|PYi;RbcZ;CJp z99LX>^tA4@>K}=G;VJEY;5f|3^@R4u&wZxxymOgbCeyvQx)RnU^Yy3Cr&<3`zd zDqF9IHyL#Fz4=}BIGylXR*H*1V*32Q1pvw&Sfu<{}-dmhZ4pB$L?AVvIrm66EDAG!s%LOW{>9aFI5wFIt!u>AixQ-t=b!;D=eEtaQyf-x8B=eNUpw!|_&ci$c`^V!t zEiGE1Z#X`T%5*Vs`HUF#KA~%!k%AiIDbch4cLBv+7SdO{ z_O^k_q1c#RJhz-DR0+|#_4gX z?ps_$ag|Oa&fiykIO=1>XZ}9_t2@6LI}Yrc7MJ=yO%aMa*LF^tSm}e#_)z(o%3bfw zbpsO0zfX@#HNTf&E+KL8v9_lPnWfo3en0J-{k^Tpd-LiG|H!3hAFde1jXJifcxD1zS(WYYkM!+#{_U^m*@wG|;xY=Qgzk?Jc%JRUbs||-AmD@a z3Z7?lt<#TjQG*ZmcyJxXOA^!8`myY&BKI_UAoZB#n8{kY=tr&e;8scYSneLvh6Iq|yjo>ly5{9m`h({Fz+IS+8;bi~oEUV?U-I$ieHfj8XcmjvJ}XfCo5m+>*uIDLn>_nL zV7ajIT;S%po6i0hKKL>Q`34rr|9uo+@zaVOO?x*hxM}YlP1ZBI{l=ViM#O*NgE|Pf zz#{wyFdujJ($>MXjc1O!GqswBC~q=%cQiS?U|M`=c8lr%hbaEJ&E}WCs+YF;S-CE# z|COWUJbSoa>%Z{9!W76iut@$ZQT*V5Nd%rEiqKZ`fb<`qadMlgSvKCS+bzWsqJn2)=(Xn*L;i)ZF+zvB4n%b&gb?HdnYozRd;R~yr&0f&q4=MF1uk0>J{p*| zY7x_>JCA?f%{%b2=0EUhwZG>m{-q%coe#&ij4lcma^luo+3@=9_9t`y3!g^*YtVcl zXW6E<);wK<_Vc}`zA&$7-5uunANaJ|UoFhX`|Z6^u`xTEpvv?m?x<&PMrni)&ti9GtQXd^*-^OfmGCkbo_BBbW=yO7(YG#H5A*qq%vc%BRBT6|`Dc%? z>3!)=kF4$(rLjKf@9#4{*#O^0i_eU5g;fhV3G2A1M`^ne|mziUwc}8=xl%6 zX}*Hh^)iw?ZvVmq83Y_)5neOQV>@+E=;n*3i^LhqKJrJdtNS%8a&3$0zwlJ4=dT6k z@pN7=)qZin@A$$a1j`n;Z@N7lT7^RY!dpb0_ZH^i7T>!lYu&z2{cF#Mn;+#z&gjWK z-q-&xJT>aPRupgHtGNwqiVKTA6wT`^oVnb7WnsAAjDM(~z@1qANgK@L+TS$mZQ=RM z$lu{Qq!j(r!eU}uj4J1Xh=F9<2M?4EPVBv{dz04RvY{SZ!uDQSiJWzk2N-%=^W1z-jP4dpJuwS z_OIo8vFWJKKk$~&;B~+}mJcxpH`LqaiQIm7SR>bD=KnZ5^KdA;H;zB{ExWR1DIsLZ z8nRWSh$LEs27_V7XlCqN3XyiAQb|-=q%18eic;E((yC2LJFQgwo|$Dh9v3$yY9*KerPpm-d}8BIO|dLxWSA7DLx52rf= zmZ2(P{@2>lSN92Aa(P~M)Q=av5yqpBupTmiUmA{gs=WQlSL;O%Ne?Pvl?WZ2m}O3om*gfdU<1F}=^Q9@0djR;-?0 z;+VAV;0`T|dd-5j`Kh_Q=z#+w&pt+>}M*6u4`*)Fm&+b6%|aOZR?FM1$> z0v%v6y>GA{VsXxsR1k;Da5|Z+Jy~eFvobCE8jqBlZ5>xcD_!iK+Y zb9}$VmpmEN6N&JTo~eH4xi~L+BjmH+upZx~X5W5KlU3Jk+rkXD*ZA$q?%ZPVffv0I z^4T9)k6-j`-ruSv_bbLXl`r+JO_&vv@X>i2FM1>7v%hS577@2U_q?G^OxZqZRf_7L zOxNlDANTX3H$pxefc5zHWPfSDx&O=F1$o&GKHmfq^4FfNvgbu_gnTv#>mdoxqn%b) zyCJ@>;?H|0J3W!QlHXFniyrrU7KzT>Sl@-v_deoKYEO>do_gr_`kgzM>-h-Y{MEuk zJ_Fr>Lq3b-gZ20e=Q?c_G*?r#H~A)TVPm}4@70yISv-`_jC($dzqTdRE+6&(oyTAUiFV7Q? zOsK|bZ8MJ3aQh>|Q~9{(vq)iBkH76`nWu^3#|^O|6XdRae=M?Y_T+FUUgF6;pGAtm zdVKkHpQQv=o*r)}+P(RCu4&k>dvP>fUi7%)Mwhe!7XneUj z_rthR?Pp=@6*KPnEK&^C(_H&<+jBQPwHrH@-1|&u{d{QZWaP~YUdqQkpGAtpdVDKh zL>bH6b0-DO|EQl~Z~f(WPiBb(FM1>7GYK}mF}nj?PQK1Lov8e22hK~X`>f&z!l>5M zSUf@Vo zE_0LQy%`ziyAF+$Pvb!kG*3=?Xt!q_ANX~pA})vzUU021!uR<9dUu+zaI!-K4|3ukUwcV!M_M{b6^GaHG zZ^|?a+=tsd=z-?RNlzBmTUni2X*i`N_?Bwc(q)a~mIZYAE88p>&HfA8K1Z?t5-AVs zAuH17sc#hR_%+uXs;2!p-%gDWBP>_Fp0uU_JTg&WJ{(kk-*3?PF3ly}g_* zHY@m>_GtP$&>LZV9}DZrW+uBUN>7OPj=5T1-|O@2A*JBb@=#v%Mi}46!FrOvH`!BX z?O(gWYI{q%giPPSc$v2R1YYz;7~d6PJ^8_jB+u~1_k~aAmn_Qn-*PW$ps%uu7rhb2 zcO_U)N`Aw-73uCOF^VEz$2Yk}Xg$%f(pKd~4*5f}o&Z{ofX<6Fu)EnZYo4R`~e9jG?;6V?Blarn* ztS9lM7Jucb)UFxp)XJL7F7-RElHabK!Gj(MCnvq}u%2k&3!U8b^F{8;o(l+*dSAQ} zNJakeQofPKBQ;nL@l=V_k#LN?C>X!KF37HVvhWr29dCIk-$>(;I;{R#g@-80qMjDSaU_F856_T{|_~s+OUVSc|d@rxc{bHiwbsqFa8jmz# zJux?zidX1IMx$CB>cu^FrPLPi?R#~S2fdNTqY026-@fXbTi)(9QcziVZTngOx@!u4 zR=ytfqZyCTd_9`+NDIj^#oQo5k;_T7BNS(6Cuz4w~7 zYB}ij@}M_TewhO4@fp6p+|XgM?|J`wfr*up0lERQik0!sM{ckk+#Sqd%^shL# zJxC!uH+PPm`=B-NLhasFeD}IXx@SYBj&#o^(iqa=bDY}d{r1zYc*^4I>gDl7=ehM+ zJ2F;qxi>^0g&9K+jDvX*u-Np+!xmQF6mH{6(bZ;LD6h&sV!5(yW@_-ZrY1B>aP`HWR( z%tJnspN0KuD~0mufz^cj9=`l>@$DnVEd(DF6UOXgfDbIDgXS?-9kGP#lsyw}%`H0W zm{PdPwdcM()n(39E_sSsKOqTGIP?JymhQ}{ouhe-RZrv$?S^XY@0oVWwG^*=L?^zS^7!^lIA zsc_bt4(o}o*w)>Yx%Bh?zoP3+ABF#Jx@DibzH`L(5sO2gROH$|>|q`8QpsGaQ|f+i z4Ab^+PHVebv+(R&JePG21&0P7W1`OZcBo@kksym@f?){&%- zRTdX_*K;lx&>K$qpj`lqwGT&F$I?-Co&KsdMJ~cU=9B7z9iu8bW%m?wUVj4}d_4L^ z4hr*&PH1JJe}E3Kn4S}?XPPqg!|v)|&6=*(1#a1ozGkQUZl0qza=C`TWefPgVmdQm z9T_ExyvMoyds`cW=kIc^>6gl}dlI0|xqpFj5lG}%0=ND(6V{R2;<~n8|6r)W^8Cds zWQASH-vxVvevYg|#3hhpxO{&rau%$kAFk?krf9;(ex;uIlu6Ng8%v*SSKr{=k3o6R z57ZLlaA-%SfEfpf8?adX(A&kV`AO#6!_bxSp%uF#-cj}$+%KG3c_IJ%ERNsbq5(a$ zP(<`QqK2VlBKlP7DB8UXtm_nIzIB1ovbu@x+WQ}G%QIQ3wp&`Ug5&q0{-Ya(j|-!a z(Kp-CFPky{fN}zhmDd&4<*OA_93!Pur#*FF@7YzW-B;weCus9=z6TD<8%+pCzYszQ zGYlaTxxG^wIfqRz`o)eTDu$7L;@L@;lZw=&Z7zHmpUs0FJ|53iZ!VkOU1E%uTq(hW zV638ZQunMvx1X&{F30as4aIe+eDp7PGXy~#fyLtK#-?{oiC8%2?~5yr{yr1Rk`)7P z+{`oFP-%YXp%fW>s(*>tlHnr~SgwX0G8&NGb*)3)>nEi*AD^AJ~BJodE< zpaU$XHxJfBJZy^;BdP;wO=k_mrZi-4d(oM=e)cH!7{AcNV^3!R9bhp%4_J>+algC1 z@VT;}9)t5Yr55JY_$?P%kT-H3V8nH(4!PuOPgoBjiwn<;ZHZZCFumyOphxHD8p$Ol zvYdan4)qIW5-Rw&!iLgk_6sauC<&DA>Ya-r2Z0E#bSu>z8t3_^bChze~VDm!-%+4_Hjsn@u<4#Z5KJci-8#7 zZM~7^k$(EN?#Owb(ViIPrT>^ zUFINdXfkyax<0V3qLQ8Ac*RDazd^+doo1dd4a7Bxv`ynt*K`!RzOb&`;^ON)244E4 zpGsG@+_`qA5of)?&xuD}vr*_Sf_29ge*Wdvawfj)nZn&Neq7p=QP3lLa-cC!e|SsB1L}T|ZbCap`gmEzLh! zSa#@KVzh?FCu8#Zzg3*~YoNS=egPIwiNezinLiaLhla8^0P+T~SpHbXrtf|WZ}7SI z)g0xnDOJ;RRO=TOrT;YL{LVaAeU@y^ah&jH(@#!p^pojU(|9qX?BPjSy>q|Uxz@#w zGH(u*Kbk`S7%t;8Kb-Pc0GsZtO`n4bH8Rb=#cZCk==hkFsfS&@9_2Oe%%2F4D(-=7 z`m=YvnQ>v89kKXiV(vEcRpLG!v8MdI#vRiiP288W=~Faz2*&Ykvi4rT+g<)U{hIrrH?QTU;)7!- z1X==1bLUj==rV$JUBoA!ZZc)%g~ve(kJe3&RW|$b`SgICC>T`;g=+|7ai%S~ie44I{F4*ZCZ_GB%W&Rfe z>mqZGH&(Xki)Yu(jF;Etf8C`% zJ>yn?-#NWSlQdV6M;T|J8%!jC*EcxklTbF@waHg3i`)h#9y!_D_t-=&=2mdpVEriD zHP8(~zg|uQGhR?mV6pOsvFT>@Y|Rvswv^EDtJZvQ>1zJ7*4L#oc#Lxh1vmVyKA;CI zrW?+tn_2zS%-44M@*lfn3(tI*U3oEVPgeLS^Cu`TbDob?Fwg@Q(%UtPWO&aI{i|IzN>1KXYTRCf%=!IF|BF{a|+qEF+{HwP{ zJn9mng2?eBv}g3G!MdQ0cz)d6B>m8djT3q7N9ZQf@DKsw3oI6A5}R)J<+nn*dn%`pcAkm! zu@V2c^oOdzM;_Z1+P;PZ4fKG;bfaKhzD34kODl!O%Iz*T7MkUFm7vmY<@SR|UHaa) zA(-R?Jzz0iGMlc+{ytyL#7VJ)Nl`UhvlsDutUa1+#bcc5x}aHc8jqr3T_mHx*7st| ztEReXlfA9~RE+6tt#JCoqb?Qwr20s@E7){PTjpo@2l=Hx4!+#v% zil@Y)83r*m_-DT)U$3ZXxf%IY?)54jbz`DfA`R*lSgd}jur3m` z=0lde+{=!}^K%c9X6!q5nHKVy*Sx{}x;poKMT2#fEl>XLnJX@%d_TS2{J`wnAFJgm zUiEYSjx{vTqDHdJa6tKh#mX52>+xAVSQF6b;O8S@C->^uq46;St3SW@9pyTPO2QF| z!#kn$Sq8^E6$|SkR6?u7yBlM@3vSh0myv``3O8gY2lAvlv?Iz@HxAb2TkzE}baKM6 zdcy;You&sQZhx}YA}4>8^D1U}p8uHHyR0$F zev9eCJEWjqfyL@Kflb%w#^q}R+uI5Cr{dh*yZ%^jT)#r8f~PnS?T~Vfb0VyZxURN$ z)ya)to4Wp?!N!ap;>C1Iu+S)VW1^s)Qm(p5u&%Ay%p?0vR~PPC)4#0z;CRPRwo5ms zaXDuN{fB~1mdPagDFTQmuvlD^VI3r_Sm%iF&Tng5PA91TzLW50s-4t*HO}Y9Lpo^6 zC*hed$Z#!J3aqE67h%71BH!1FTsg~-J9;|04^oPbo#uSc1?a`a#Tk;LY3Q{Ka5e+V z1uRy+G+0l3#`oTz(YM;t8|9lW#fgg?FEGP@E8$qa*cj#;Iqq|2I(v9KkD`1lVLict zn}JpuN0zU9yLWuemz|T09K%Y3^f}&lLG_q#M1f^ku?b7*+d2=QA5>j*#2Tw#Cqt3=0&sNXGnn!*n_mcDYA z=lGp_Ovjr>2u7bj9Q_G-~vy@zi8 zQ9GqyJ7-!1x44n1!36Zu0yP-jbLSGbHL#9w)0IBmC=Z!J|8l3|5+|_=iGXRibVQTG zeGIgIqM66hoZ^)Y^F>`P)|<`=R5{(3tYE(Fvi#}&f3sZ3-1<#y3~Q}$j8_h!_f7iiW z`IxmYEb_H`f9QOY+o|tydHJ{YhpVd)HFkeV_^24{jWXr-lXNXof^GE+mi=#HBrMVB?%}{3W_gdTrZlHUdgSFspVb{S|pcp zY=-&X4@#;__V#=AyFNUW*ixLGJb){*-20Dm#1PS(N+!mTqKE`4;{pcva%_Qh=H|t1 z4%z9(*Nc0dL^!df*(7S6Kz1*p@t=6nb?6H81uUb+K|KSD)ps7uj|fc`KeA)@q&^8x zQ|)Mn&EHR)&|UEDA8`WwQ1s)W-11L8%omTbrYuU5p7z30G|(*nY2V%1&!f(N_^^pzF0%OH11ZFbabRZQ+ibk(PaI4pCFkd5~s%FgQX%FU%OLP>kx^hO^apuR? zImmc+|7qy|7^+f6%LMHOSghS_hxto2!gd&}n4vhwJ#x>JTbmBbef<0Vm<6KzFFt{h zH~|k>jJpHo3M3t`sI3+D{w-c_U|>c)7@!zpE#vv$`W%ir-~o$qi(szsaXGKCZ-bZn zg>QSeGv#*mO3h!U4<`S^UwUnFo0sf_xgx5fZ%ePXm0b+$opISuKJw;i)4N&IIB?Cl z0B<~p@}Spxe6wo?{_AI$P6g|y}e9C79ScnY1iuL|Fkz+WMCWx z7ah&gV?ezDi`CyAm~SfR#{ai{@_SdK8#XfZ)lBlHY|W8Nr% zc><@BH#=14t(`S)`C6xB^Xp$Lao>78*m&sPHAmiFh$nb3-OJ)x`QxQTic4gdxcH%Y z(XC~f_J}Oz9~wzoB#{t=x(Lb%ELPq!h=(9# z-16mqm|H_K-coITW<62w|aA%)-Z759)`Jmd53LONu0HBW;=eV2F!0gdyjdotJYvt6<|t z?9Z*(@hkoCi)6>B2UlH|HGe6&R)%Op@nGc}M^n%R0|h;MI~7-YWflENSh49y^|#iB zEsqJmbyfe?V%;7jU4>GObJ<6KCPdb_u2jDdcU_C=JNlU5|KD<`qiCIJ7~m|yQvnr z`aBW!sM2r&{dhzGD(T+TpTL?~`fvCkeC z7l$@!Rm%zbCpue~CrD;8^Kc?P-$1#NOFudbarrh>j#qG!DLB=+t-&E{tl_hoFxUqpl%o95i+2lX(=}M@RDhy8wM1MO&j0wS}ft<#v z3ouX2a%ON%!51@cEt|tZCzY~P>c=H*h(e^p$iz?>2-*d(So>&%d3?Q!^>|lgiLSxA z>5Jw5@(*gcHC#$TM8n9Gn4koD%)q|~7UMKQ96tH5%SWu;t|b&#knik}xG`3^S2{u_ z3lR=Se^bDWJoxv(Vw{T*2MzERCqIwE>;Bs}e(afPWg@wG*6Xw?M3{iHG&e%e+Bo`i z3FZiI&N({QBks=JsGJf_1GRhu>dD9k8$=NOH4mdTapYWvIRZ1X492Z#Gfx&%m@0X? z9=XJKXqs6*B1MP_rq`V@BTC%nn^$2T(td9esn+Gh#5vc4)a1^z$u(63c94&uX z?z?xhm(9+xG(;BW(wiRO0E_YN!aS+`!{-csMStJ-V~a%x-)oyML4Nc5o!H_^B2cNI z_?)<{FgNF3Se#ASs#1bvNA9l8i|<^jo-6p}CZYuSNsc0f#ZY2MIC=ws8f(8Km0~Yi1Da;j2BA;}bzNqPKlG>M_yCY;=L#3kHYY`Db6oJOvkOBW5Sd7yF zb9T+^^c6d`(lFWS^P|0a!AsXxbZD(kMZ^eERP^K+O{ARa;~B&eG<*1N;Bxls{@7?0 zjl?@w7p^|GVytpBI$o1U7_Xm09Ax*!@4?*x3mvVuxvY5hyIa{X?=&izua|WK<8T{~U&0*Cbt-SgHl4n9|AB+l&mCD= zvxP0|$}ABvBAN(-je>|YPVwo4If5>&7fa9!r};%ICN|nE*|&H?;yFqeB1xaZ8-W zSUc!~d6KKj&+J@pSL=3u%Vz${Jn<*S_&-g{5OF$>^{X@-^Ya^+C)SEL2`fmyRMYTh zR!s3%Tziw0)ZT5(^5TMmDEOf-&;Y-H#r%5<^Tf0EI-WGCX)eEdFMaOri<{=Co!YE? ziOEABPr#$IOYZBzZkXp1bJy!nYW9}{6Zwz%M!!2eA35RX;)=-7%NvA_^Wh{Mg?S(X z`~nv9?;Xt3zGBn6Vu9@zVNa_ByPD}Qq%!BW7QSZ2FF0&yG0(YvKfpXh+{wEyabIz1 z%HA%Vk;QWVxy4gO4!0OhDh3@=X9(Yd! zuaAXmG!Qx99~F;IWzeAkYc!ner5EOodA8p!#X3WGto!M;vu#r|$T`VMo>WAcjcXiD zrC|{O#)v(V{;})V?F6EU=qV8;QHjv zTrWQ%9`Zw;;(0SO zUgGo?aYPCD$K)AD<0$B5Sw^b_JYX^IADAn=ZrMn0L@cDM0dtg2LWMWcA{1}eh z1djFn7v`o^h39uWzdCsAO-;`2X}PPc6fPb1n8)ltjPi$)DQGhqx&I8nT#xgoX<2tI z1s83qKD2$zY)jIlwwUa7%y!B0m<#868iaY1uiQI4Zrc3img-|aEUaGtuDP=B>*8=` zzoGv;BW$SdK^%c)#*>IDLHGCN^RB0>D_jb8RDbifE3!8+N$-=92D4p;FfUx7|APJp zaDc^l{4h`4J8S$}uX&mc6TWOqU%q*KQ_CA`X$rI7pgdz-FxYDZ9AGh?0L;7f=<4+n z=k8zkkEhX8i|nGyXI*-AW6CgZ*hjzt7UK!RJmg*Q0fk z=+P3ZYh&i~KmFizNc;0L<*moF`i`j~@{Im7%w^oEJWi7RYEp%a1Aa2@4-i7o0~F8(fPcVZevW~;Vr8XqPqzn9KE@F57%i%oT>O;c zHzFGOW-oTG0Z%D(ugQ?V)4X>JBZtr@T zaC?@vnA_{<52vp)=cn{Nb^3gOc{3IG1uW*D49pW%ULvFUPVnl|t5>8w$4?A4BAU#L zoyr^^(akcfEpo|gvM_J_!eEl2r1;_g$8nb^5A&3(&@&T* zn??R6itkn}+&B}LrTa{YkJ-M%pe_UA2P_sx1(>&N{KSau%O@Dt1z#-+`TN7*``izL z0%gp0Lx{$OgfIth&gC5o^VEb}>rNGJ+&*FN!_1af9h%DB+k#$NGusVeH0?$S=J7S- zTjKa4b^dJV`djzFUHijDgO06Zn0W%_83&U>jDy2jA2I{w1r{r}G8^}IW2lSH(V12^ zzq$W;Fge9xnm5_&D$GUe9lJxur5&ljT>iMzE+6>*xL7#EPMm2H`)V(xWzGRI%pHCc ziVIg2<_ZSslU}N~A3c#G+w?(W4>kYoytD@oVJ`g=*I~e)6LY1| zpsD-v<5<}-+O@~Wl;2^tdl26!@=)^N+z!-WF8_?cdtub^Hx^v~vhBBr5kdHP%N=KN zWGp>z0&a8+m8Ir@pTJ`Nsq^2JV<7L5-&Ogp$JyRY^5Vk!%lu_mDZ{s2T6@PNg*nlM*&7p_)WQF2eY zQfXUcpU=& zLFPP}9$)&oXK*+!DhzLkbq?Ssu$aGEFjwS{!q&d`3Spi8B?MD{kDZY?GtIYund2Sc zhNIU*$rNxA1n_{xxRYS6XpT;)re$n6?i|s%wD_p8(p#57fs*0)(*32k-{A{gfCntb z)rPtJ`cCx;8RO$$UF)x@zpmUlIJ?m)~k#oRED zKeO-e?&gg*2E*^}uA;JW>33NTK~n=fU@@*P%oUy8*RuME?7^IkvO5c&rk_yxv8-n4 zF+>&g3wj)=xLCX)9AwV@ZZgal^mjRU&&KG?4%5J?C&zxg`Tcg6jI9V9XBq_;JYt;n zV6Kp8$Yk4`oUnaT6!nF^9+7;n|3+^nGWQ8UyNIFU85g;kY!C-vv3TgiT!CEK4g0p8 z7qfWQk-hmsbl_*=mpN7OFgFg(!_;WhXT}5p@PNg*1~6CktMZsRN8{f&H3(QImyJ6Z_ zg(zFieLr96l^cJvh)8;vFE-4h@24}94d4Ka@r+@fSTjZUnfo54*E1zP%3hhL`dqpz zS8pqG{!jOh5EUImGaSYI-vs80J~`|)*?RZq`O9@P?0%;g3-osy?IIxxpnlN(`e^he zO7hV3gHv8Kg}DNYXp<+rs(e3dui#RRC>Po1E5nl&P7jZh#9(7Q`l`b)mJ`1av85mk)u07p;q>8WhS3G)TbcEm=1TY`IjVNz|JP>yD4 z82Q>@;&494_$(m-?EzS5y%14Wq?l<11=R-H!HAU2K&<{gYV87Wyf<}eo zKEpJaFH2A`*s;V*O6t$drW=p%J_~mItj>q+SJB%Y<4FO=bR75zEatB@%oA|Wk_!@& zYB)VlNxJ9JMhUh!KISx3>|6M^`mPYkei zJWzgMu{cbJxr?n$25v>0k>0Nsj*c^!nRxujQR;#P!~W9mj~EVbesZoaJD95`>#cEW z$zV_Qn*Hzmw?#~C?A@{QRqk+n8C)8=RWQ>0$sXn^uCCttt}Nz;QuH_bBZQYofbiGb z{N2O(4Ef;2osCz{@GyU|@Iq;pn#*weild@Wp;8Qk z(QJdhC_(oc@PNg*GhwdqZ39Kam2Uv_Z z3+Bz+q#;%*9VzG09wcvHblq1b*M9DDbLRRKeR(--xMu+luo%x7=1IL=5$U?z(E0qk zH+#;_I&mrN!jC=HtC;(>^m*b?^W;=s7nrwA%;Ayf@%0ZA3o>Fh`XNGu+fRb#J!blc z@+e>zhhzL)VIE(E-`Bv1Q|~K6(liGM>%02$2A%pYFxw}IK6sK0`6=oo0@n0=%uY+J)3^1Y-P@ehPco{A>aXvap%HZk?M*;n$H1T zV7lu{S^tX*=F8cSAGes1UXv2)&=`O1Y$C$RZTpL&ecpXR|_ zzbYBYxF0H4@3u{NLzWS(J*;MvBv!}9MK|?^S9+lQz+!RmfVh0(I@gOg=PWMqkh|CF zL0Tm1`X&AT%xTPhE>a|k`O^yeu*#|Yo)8aFJk!>2BD%_a%H7R_7MXt6=Jm=^J}WW% zCkef`G(6)1egTX5Hy`E+OPtP23ieNk&6Z!(Cz2#C=z7$9)*!}$V zU>-6f*!0Zq)X>vjGJ8U$3oER4PIUA>&)hFVU;G>KoS5hh^ZYM)-1Ul95>CmJOz`e$ z*V~;j^>gP$rhjx^C~bs%v=HL)&E{*7(9}y7b=q`t!wwO; z;rK-l?F|7Auo!PK%v0~|6a89pKk(?f{p$XGNhdY-)HmDRV9r12Sv(~Bn7;c9&JP~!5o+LndfyK)02lK{`{p7%RGH>>rJqM`nKL)IJuG%iJKbGkq zeAWRtz+${*FfVlX6>EnwtEbD0Wt4-?n)Qp-hs~DVkMYnSa~Y!V1Ts??-~fy9{9)dL z*b~c+=L`58Ii0^}g246#b?b=Uln&;&NPnEyY@~b`0Q0WSiT+zIC$gqxMaofwpV&E zbvoS`oBxE*dqvK(3i(awJvMZIIhv8u!M_I<-1Msb{Z+khg2@3h-{;(N7}Szu_9v7$a(xqE z9&$tf)AerAUJp^h%EFB&>1Wmpx_ueUdb5O1<=7viATFO$!Rx}u z0aa^$n=kJ-Ia@@s%=MaUY{HyRQE-vN-H=mWkA`>%pX$I#-|e9%_=t_`%Gb?)?ck+0 z_Jc2?MsJ67o^db{hu+Kz4va#dJ78>Lf{qU22`m=Z6)<1mLr`zZA}_=2{DSQRp&845 z2~WCT`HndbVSGG}u@V3rU@;yQ=J5qg{VXckURJqg;dJ|E<6oM);=6=&5uIUw(E|wz z>OB1t6q$;yH=<*L=(jJ27FvK0ET)5A_GInvQaj~32emtF#(YVA|K)zfF~POh+axX_ z_X4Wx3}4_tlM~XEa-q_J|Q#fD!EH23~7l~S* zQZYT>RpUTePjjqiV)D+X4Fw-r{H6y7{V*Jr76>0pacVy)Y<#aJF}ayHmY;}+@D?n^?GXUs2~rO*xkw!2fDMPi9&GcP%MRo$`C>h-z_?`saPYEV3O!16tFJfz_0=f3C*wv0&ts2^al zddgtq^%tccuAxdrr_R)q-!iix;Qr%l+Ox2B8$^E;fq;JJ5J$tIzbxj;&4jr~^Skb` zOMi4sa`}kAZW`bDwCU8sRocvbI||^U3kvi%#n>fL;3u${zgaL>`u1o38WUaIdskfV zCH1_^t?kllc1L34BHC0(toLk~Cz{kh)9(Di2X~v}2W}mIPWWwerW$8})ep)uW}IZu zslYE_G5>O49+D*Z3BP(?=ABeB}3eVK-S|ePX6Y?T+u6q{Y?`MMR$HY-+R}z zXKtp}f^$Yf%ym7}UmA^B@xVV|F+bPAJiSXH*Z&^AZ)$$2YocaHwDiqGUy74*uzIJL zpHcKc^praWyQKtpz+&9>FjsCHe^u|FAA*e)W9IZPn`Tro^T^`4-?4Ve;G*Z|f#jeF z^e~QVJKX?t`4yWbE4Dln-1bmC;o4Qc)d$^rZ|}Ix>hCa@>;A?@m@6zKM0{aVpHx74 zW3zSq`e))DzX!B!v3$bx7k$bAhrSC8X6&H+z+!RO1apIKUYzuKT)#mKa; z{+|l6+p+wIap8*^fCntb-3)U@L#apS`&X`=FWSASOWJfW!!1PgOVoB(JDiSwUs#U+5)0Zto=#^I)Ek$!-0ZY3GGwu00$$YN60+ zZu9YtJD$1U%4o0X3k7&I5e}c6f^q|km47SD)oWg~#yq?;ZQRU;Z}Jwa^R|(18U`C6 z>Wp!a9@il*nhhzDp(FjyhgbmfWv;p!->oXu`uU>kQ&(7h=xUoU0hhb5aUAB;e*wet zfi>Vau$cdaFkjgH`DCF^>3&b^?rxRsG7@F2yAl!;SlaQh|Ja5L-~o$qcfec(>Du+O zsOrxBnQpmyN8^@0XzX0)y%{n3M_kZ1JEMt=EBaV~ST;d9x0fPVZ}PU3F%?oDJ-qlE zOY5Z;PyD+2b)Zc@Vm>N8Ms8tzFNs3`-3on{&T(F`6V{cPU1d_{TY9c_TXjW&$fhl4 zZS5b`%ty>drAwbLvdePHzq?^wzKii*x6E5yUWZa9yqcXAKHvWM4XOiTF)CejlQayE zejbm4zG7+=9ffWga4v5#tjqsrcLSe|*1k}0{8DN}s=}`KRQx*u#D-_xK=eh&VR6p- zdtiM5VZ*@FQq7-4zgy3Kt`o85m_tmCxyvZy4a$vvf)ycpxKtBQ&>rZ>x^l#N9zYYxdKjQmoS8#7r zn@$7zxV#E7^Z(GNp~s3ud?0$t6hj?$gHyXJW%J|Cj+*j3jvu78$Pz)Zq%zn1umVIu^N!sLQ-gFuFw@1?559^K_SfwZJYUZAI82y`|c%6L~MD{M?ZJt;xZ%56>9#R>bo4)7w~yBUEh#acYH~mG`{`ua>a1%wSTG* zD_-=mr8L&&L3x42%6$;lAGW!*n}x{F+tasRw;Z|Ds^hd0vF4?`G+Y=< za|7iB7AtQhn{LpuRq_Mh4;K^*DD9dV_R45U>a=rdyu~?=LjNK52ys5frt9jvG|%LD ziSM)T^>53 z)S~?Go!U3YQPX*==R`94mNt;()UT^xUD3N!w@o6i72Bb*fM_pu;%J#{x@>+5VlujN zM}^RDg)!%8d#E>k!B<)L*R*EM0cj^op@S2WL$a^4g{9bUXdpd0Rt zKR^#yOt%)+efXrZ`;Ggit#kL6?ie>gbi;M+V*(w^k*T99C#oB7Imj6_?sL zJbLl_xomnG)n!VreRAt%zHQeK`_Yz@7LMwoZ&K55Y@_FLRQiW`x$2*S^-YzuG>Xy$ zm*3ml5P>Ies*&1TKa*;S7>-Jxz5q4~rZQ_5loMF2yr*G3WWBP1%XbZ(cfV}NVF!F; z(}n+@o1V$KZVX3{Jy~~_01sGRiYM@dwc5Bfzj?}stg|B+GTIBbKB>;2=iFxTzS zmCc^-WW8@$Y?4$btE}I?(b-Mf4m-!Aug}?5W*a&|1YBS-{&|=$Bp1G6!z!aG2G8DHeo`oI zpwK;U?b&MP??D)G$I5|9F`iTzv0g90e2L;b(XI1dDEr_jn-55Tl%kM z&VTEb&J9Fow%`^X$9P88C$}uVJoWIIAbGDUEQhc7zwsV^Kmx=ASS&6rFjtoJy6CR%Nuh>m zZJh#IFK31RB5C>Lvg|iv@kYlG^m$4$`kNwfrw4F>#rRiYzQCocYmyTx&x&?Uk01NA zrMoajS&Dxy%XtCDr{KU3?Ew#1jC&2{@~NGS?>#FfvgKK>#OVT>+mjBe+S=9sZ6_44 zz0WCsU5B~i)W!+I+msl5AMPx&{J8qB7t_AR~JlyK~yeh)w0 z!)=~-n~lGubl{ZhUWHwbZ3k#O&K@5?n>52|jT65O z<|C=k&*K~GcE3tCv%uYHdZ4ZFt1+yAwV$E)AXukmoVfR3uG;&tTjuS)t!+SUY7DIw z_j%p5?PYsB%tfEb2&B(Pn1d5&kHBK>@;=NJdanN9T_3I1BueI8ub-Y*u*v?(XP>aN z_bB?njkXv1H6w2Ay&dKXuB4S}=!Bb&J6#?{S~#;In1CDaugH>rG4AkzBJdMf%-;tv z*Y&+!tnZH01{r>p^=V%Tx3@d=$Sb^NnV+JU2+_lIkaRicm4`4_A^NV;;r;p&8>7^P za%cT1p64hLE~vmVj~pH-7`>8XzkdvK3CkW^ZSy02pK@nRq4@rr)qhf6xoz4nlZV)G-%7%KkG_a+5^UA?13;kA>aXvai79m zi9-&!P1zpnJzM9U?|vHEd|@!t<<23N`6vrF5V}|exWHok4wx_SQGM0>`GtnLMq_Ms z&il*ur%wOne3zwNV0sF|uo&+-%oAwBx3+~mI(~i5!-7w1tdd_RyJb}+v9vP^9$l(}H{0k<0`P#vxG!KX z(xv#wp?>wkNbU7&m)?*Luk;3u${ zzg;kQ+r8yQg8GJiP6)i5%c*w zm^*%6^ef!Jp-AgY*X%rE=KHD6S*vOiS?&X%mm<)IRMAWW`~w#A^8?HiTB5ng%)l^J zJ8qot^_VXkqHF^!7X4-Qlg=|{juPD3*GHHuF!9sfB>n98dzWtxKASP4sQuubSveIf zd6D5KeVd8->k5wj_7fZT{!CG^qau4=kGp4~6oG2R!Lr_`f)W3BdD%kM|d z9Pp_X{L>b~U*I0j%A=n^aGAIEz&wGUzq8Yf%S=;+$4+Rp@gYzu7tQEE-=iMN1B@mb zh~BWr_w+xPanAdPj;TQ=T5)Z(*-bXkimu6c|lZ=p{Yq1`GLKlDo- zzylWJeucThKL*YFBx^!1UM9Z1_57*)8LM@<kh$Sdw^4W{RVSC zMkrMg^4ljH%JapjW-60{Ol4oL5@+5&N4E=6E+eR%`~MG^C$jE?2hn!@G4fvG`eg01 z=dahR?A>||iz^=eq6U3uiN3fF!DBDpfpP^SFdSaf{zJ*u*%ulVv=3Pu~IDyFW>=38=>W8_a$(?*+ z0d`Z7Vfr9O`FyatG3;9o5qYsdP3oOPT zg!w|c1yR=T7EQ=W$oeWJqZ$3RLa`*Z28svDM>R%>GYM5>ZEt*Kdm2LI5s~VZOYs8+ z)%^OM$6Qy9W%nC>u##SfLw$s^-y}YmFPwgGa-_kgMrHY5U*lt>y=#uo@M&$w)`3HD zLD>Xa0)*!f7ZN|r7t~U`bNaKMeR1ew4MpEozs8T#*yOhmn@11v(bpRoHvw1`K)iuv z#+@Vp^D7Msf8P%A`}z4*;id7NZGZOcNr@ipVU0T$n~~x!2y=yJ+b2CcaY(~P=F*OU z(7ZM`yzbsGke3;LvtK9#egcd6D+F^De%ht~zC5k_d27=}9f3si(A#UbP4vX((-@Z? z>mheJ#aRUAN|=3cnj@I9ZBp6O;Fh!Z+9pq*{P(sgqQMxS7~G**Dtd^955=KxDls*H zzrbRCi^6_R5~(|`0~C3H`VhR)`P!^A00;;@cES)$PGTg6MVCI&}# z=Ipxvs4v6*{BG89Ar$?ZJnPaK_zf)PzXZ$`75jD4d|$28^BZpGn;z+(>0RnP{Y3-o zIEKEo!}$3fx+-UQ4S2v}TuGQKSAQj1!{$u8#xd`fG1A{H8zOCDKTXBvag4YV31Q(h zbb<(ep$~Y#VqDa)<`qHzqt(`*R&Oa=OI7Ay{O0VjKU-H6U1W^|`wyuA4_J&V4Rb{W zGM&>@Zm%@Xc$!FdADgQ6z)72ky~D^HAAzTU11!dqfq8t}V~nHJ95bonZ9!Qf9c!sp z)cq4OSo;g}g_hxl0C>P+Tv?ba>nUEm(o5`ML2(_C^g;LBhEtS1$S+ndx&UV#7CE&q zIhZThIcA>E;YWK{<6O_3(~GLR?dfRtatv!eWi0IJpWtI`(2VG}0?c<`|0#FenAbmF z(&ij{k^M2~rFm{+tP^WLXKoyzw<^)2ALieg8Xz9PVsRM@^M!6+E!c8#&WWuhqD!av z6;4qOO)E`!gZ)m5(cS=`(e79T02f${KMv+A_=cAarXIbYT<@r?817%UG~~z0=2Bo-0mKDZEI!IGU-DxbZe6u~j7#!F4rS)ud0?$s4-5c~WE(f>yv5q)t6B3G;|2wtjdd}=0~X_|!CWD=U)#MDRZ=tM z_pk1Xbb4kdDbq4Vj&&Z+sO8~q%c)(e!(6G*aFb3~n+DBz>5Z~$jr2>~ckD6O!`97= zenoGO^o0)n{y!ZL`~(*BR|Dp%t(cfJ#`j{1qna3%dch4V^nesWq6gx zvHmn+uJmf$&IMcJaSQCV-~LeZ-O((yZ}q|u);z{+->e?fXPq4R6JS1nh3xX8XLg5* z$63xhba21hfwmJp-QfIz8IOdhV0;vM7!Um#f+K$-%(rk9x@WF(Cc4r7U8USQl{{IA zGhUm@uzeZ^AN8iZ%@|#AB%QMbcu;hBaG4S z2;$_eP zS`Ry0n-_`|T+g(M^S^GHKc#dUb{@)z|1jKm_^)utxV5Lru-+K8^j4ubQ{B7Qe*L;} zeML><37oS;I_o+BT|2TaFF5rtJ($Zcm2&ZIRb5by=exVxB&mU~CN#V`H<>lhpj^h@ z57?;%@dp;G2Yr}3CN?nj=764ZP&Rel0=#$llF21+QWvx48Ae_lIqn89H{_h{U~A6p zBbQ&bWIPV+ZC`R>pz(+iYo1|n1BVkX@Do_fUqhISXe`Nzs|>f97hjytpHuuvu72L9 zdzZ01gT4cfgMTc;IS&}YTtzjdml^wJwP&P7zh9_bm+$MBw!6{?ivxp8q5pT}I2f~W z^=+5b*i_n7P1R{Ai!Iju?seI8Zx`180hh~r;3N~6XB91Lv!`Qh)xq?p+X;WBeyJmU zt9h{kn};)awEr=7Cg4;yUjV=N+V_2H5iOR_8d8Wtl*pDA`@UuEUWBNGq7v<;BukqX zN?9rtCG8=5i$aA^p|s#X@4fGP@10w({+_32^ew+RbLPyMdC$z8i3E?CFl8RV^ofK>v@?Rqp8~v`n8Sw$n|dl#qDJxil`r9a5es^Pkk2d z`J{d4k1eEZTh=jFvvf{zX~C70?<0S5|EX64m@5=*6w{yoOJC#Q?|D7))9ap++Y{|? zq5hO6FNpE~`y5-yVwfvjwmSb|cyr#>o)?AF_S}=Xv|m#*T?CEq0j>{{1p_>n$=FfE z`U@-3elvo(M9HCdqwOye!aF=qW}ayAKey>AXG$CD_aH8&VvL8CD0d0WCEPxHLN+P? zxvxAQTicp}ss*1;-9oLGsDv!zg z;f`B#n5!f>Jv+`ICX8(~A#lB2Rjixan3?}2RxV@I;&PY6T*(TFD>^6s3w<40pO>Qt#{3CyV$SRmSzn7>i zznkA_Ik&?s4O!37EgY3j-hHfk_VWeD^3e?&Ob=Lz>cbl5@_D^04&~*RBmQ{fzx2SB z{hbn9uIFL<>~wuFyaKKsY+&w8p4}00?TbGyZ|F}W)rh{A(NVFh+>fq{7+kt{z~$P) zT+$oGOGAsaGD`feN2#!JnAg0B(f<60ektHI)<3@Q?O-m^wM@lmpE+0XkWm)bdaUN~R5CG~_cU!Yu&vMUIA zMI18@{B^hk%s1@5tB|v^?AO<4c3=H@o$`F{6y>`&G5q^KzZcfPJa*5Gq8D`oZ=_yb zuIBvVghcPi)|BZcjPXH@qA;NNa;}BBiQko4A9o3GaLhhh^hHuYj5;$4y!ZT{ikJNJgh{yjxd+6zf65i`{O;~gfGSN+zYLo<47{KF6j3c zuv=z}qAnBg{I3(tou=nF(cy0NQ1I-AtFZ!Hd;b%ex3>d*9{}i519`&&wkS+atVHE? zhPk|y$Rby>`-Ma1%O&DheDxdrOv%qOXXy1`?@)!fz&!56!-I!71Zz2*`R3mtD3ee8 zIL8qq%NSSSD_o5d5d*%!0(_^+7aHOUb2;8j`xsqH7Sru5SUr1J)Jf&z?e|w)W7rem zqGJhbFIJ-Mc7u7GS_K&@U5A5yDXD+GenDE8k0UCpIGi!B10H1cxc<-`=5lYC@h0JR zO_g_L_`ZZQF9Vky8V}~1$(R=am*VXiipCBR3&7;WN>pACn7c)iyEgJ%ST^bNw-tlh zUtd<4hb&%o1pR&jN3THIGBmJ(aj+8Qfs^0N`${}dt~VXNGW@}2FyZqP-E_qp4Q34) z1av+?c^Y1k;3xxj5)b2HCCc@NxmrJt+Ah8(G7dSwK+ z{XQ^P^ruIw>JGQPJXfw?pYV)qHa%spthOJGx3O^Ht4)}^Sc%H*2lF|KoGz|7=r~l} z@Wn++SMutr@Yj7IPtkijEPSwMgDA!wY6f0E`os0`8%XsPh%7nWW;@4nS9G+0w33Qb zcQP8+|Dzu8EKLMUHF)&|!1Zu7w&=~Z9H^W3sBMk$tNJSg`4JCq1mm^GJHXdFh@~P- zUs#FiEfB7UubTgjt*OyIdyN>MJBBl~;_SLK^v;q01#4y)1rC$$*>l1!A_WG#V@|jB`?8g@H zv9HgvOFB^6OHloLyL>~V0?A>a$QhD9D#Y4_m1z6GK^5k4&sB4Kyw1oxBG9O@NdDdv zr+`J{pT8c#vkO1p2=4%vnlL_AqVkcAxAVoSfu&{ct60I)`u1}00xnK6u!d+pDbFj5n^3cUa(B zaQ#p?T#q<;wNON8YOiC>x+b5@;ZSYEl66bf@$4NrOW+v{ZX+cf4OS>zsGSnVX#A?_%-VL%r3;TnYZXLWb+%=gWz242hkqwoUf1aRTR6HRUMV z`#!k!fQJj9#^BdOf$L$n;?3O2DcHtwHt~ReNwK==v$7{IkK>JBa8>|GwgS0WtpBkR zwSx$_9&Wwen*_rg2IKc`tWGZ(SRi26?kHn~XW!rouP>RUK^Pw^(Rw1`dU$($`u6nB z_>r75$7bbFs_`mSkM5?ocP5SgOHmPYhfSTiVPS zGOI2g+31K)-GIW(JrG5)R@$deJc7Y$R32O&dqV0)=>*2jBAboB&k@MN&jLMJW zsrA;K;&%Ka`1O!MH1_|hXER)n!cgfiuV<^fRYL7{_6{7M*&30rQKN^~KNMfE%K=w| zr?)t`9zi$Lt*0ZNxBN0GPx9(uGi-bKv*Kqlo`0k5Swqt-UOn+}J^Xe@w=5Ml(Vt^i z?vp22q9q?cgUu)g&G+`lJc~R)0-lYced+&y?b-s@$2OEnvMC6$ET6Tl>yxW3!8X9D z!mk!rf52-)gB5=qZH4RM8MbdKGU~Xgx#>rmNLa+O0dpe*(pAELf44jE0Loux2xQda zj@xZ;ef%kIe07>%2jmt~wy$~_A#?KmhRFqI@a!)#6v=4>D-g49tVHcR0j@`U_0?~g z&i0Xxv(LLe5H;SdQ|2!^X@FZ#IO4wluX?t_^>E+0Ts})~@q;(#2jjd)bVR*GtYh4QSVse;i%Dlnh!0~D<$skvpLm=#vK{@7m z=h&a}p}@+j;Kb1vCLaav=&2upSj1Hf1*rI8okH%v$K6-wX_F;(euoC6&fVpA|>JNK&S9}f2;VL%G6MQ80 zO{t+T5{+LmxY)Ay-|?%RFkj)Ep4f0ubx3LY*>?VM;nw(TG5)hop?NC)c1pyJ0Txsi=S#gM1@ANgR@@_V!mr?c~3|B(n4`{d5P$p28pP zf%&BBJx^mfZ;bhcE0PE)>5WAeLeh1?X#9&VH}eC(n4Yl`)%RYQ%h{4T_rFQ*)zgZk z^?B~i*KRt_QR*4PqHpA}SSV&Oh1}^dpDoyrgCqREM1|XmZRMNxX`Xa_lJAF|w_}nU z*;ocXArhoZV5td{A1l#zfS?NV_ZOSpC#}dA`qTSdwWqbTY_W2?%3UMv$726TJCOVX zNL{Se;MvbUxE}V##_NyHx=hTEep)qjGve*b*&JFeZ0NZ@=JrtYx-&NglOHS5cI=1w z+>zOPH>Z~y419>M(%UrsOT)b8jmFgJ73C@(2%wf(8BX{lY<*&o`WPncy{>uPG*J_+3lx?a-*%JQOqZTqvd& zgpZs^bf>Kgr#$C(2E6! zpmAtSPtfFo@vsu*X2M*-8>RLpi_E?!ru*l}7`rsxuA9~W!-8e}QXgXl(|Sl4SOme+ zQT?2Rxuo`UG6xQk9!SexmEu|dr2N2qbFan% z^xPt*ca*E)=MJ`6yxr+3|EIFgY`C6j3ruIFYah3qYx*=ZI2Y-%fs}9m8iaQ zV7_opRkU+$YmVWInHNeIuaxxKk@?&~Zi;rWUZcRPCl{`VXSv}1+0(qP%I{bxG+X_O zXOrQD`lR(!)C2Cv{$KjaXQ@Z6sdnyg)0dZ0D@eWE8702YApu@bH4 z3|x<}v-*kDR-F$SvSp*qFY}F#pDveMs)_DHv)Hpc{q8ejU>FxGQT|z&FZrazV^6gB zi0rBJYfBT^3V-=6nvh+>vW`d6og?F%I+J2NtVFrzV6FyFfw!L0iZ^%P8uo_`9qJj1 z`ksH=hvoYN^-$C(FI_hn7b{Wzd6>_Z=y_|}54o_{#+DDqHdyym@^pIb(P4?>pdU8W zxs<}Xkiqy^iPlp9*CW)vYxGz1wXl*q|9Lp>3JX6MKIU^;h-E#1)&pIS#nb-;n# z+pyr^YNeFTTjuPY?jAAkIlrxJ4~zaOzTV*JIP|g~CNEZ^a$khG>%F5M&HidH`g6s? zi^^M%sw_JqEmqgbvOc2tBH^H^*GHFN?i@=KJ78CDE$v686?wnTs;A8M}7JHGS4dM|?c0*_MFSGDyt@g*!`OXnF~ zsr&uT1GixoyQe;5#JV)XxLAquufTjx#aCZG%AGxFBys+d#Ne|_tJiL?xPYAp!{o=V zEFf+G&knD`+!^Pk9Tj>lj_yD7Rci-0v-MzS*8OnoJ{rcQhl}V&gU>I9`O23#%a%Vg zc0Ew{c+QjkmHlnLCc>_rEZ+l>z#xIu06*zTy;?byzqtnU#X1`zg~a=2WeSf<&Ca;| zwf9PxRcrk9HL->l84E zDA;vPJbjnIT&~=h_H=89lD;wc&gA?ykLg`|H%(+se4b2?JGR-4Q)5_Y$%XTIk2^@a&)h=IgH? z{#wOR5+POcGSAxQNQaKz&Ld_YXm&v3qg*vKJ0ktT7ff!fMCGr9`6Shj(v&m5_j$h^ zPRqEEk-JG_E9ZI*+BtO^pBluWYX#R|RKZ-%?MqUgk2cIXZ+82^@udBGg}h$*R+gdm zK-CL~T0#pROirvs<-HAar>~GdT9#&~X_(@G!hl{lzD^We%g?Tgl7bje8eDo=^;^(U}$FlosjDn5Xo{;j_TI zqHPoB?({ho9eX{pUvbN?NZNTLRZ>*?1;|O0674` z37Y>Wzh1~Am`|Mj$xv5S-j!RvE&p3q(C&)rQv1HmwE2v|M}EUn_hRy5B`Wu0m@D0u zGNyCS)=I`&(U~uZ6hs={|4aWPEiX?*0P-<}^%TazN|g5m<_XjvUNTZ&a$HJM>bFnJ zLaUa-xS6k;Fy1E5K)MUZI9Q4Dp29rSkeHBhZ_hv%4?SLmY2>J<%F|50k!f}WJL^~((~Z@T*P;U`uFR|YLe6FtI>hV0f)AMhNZ&3_S;Ff!I!TwWv0Bl1tw zZToH@@t?bg@djshnQL!K#}8eh=?`5NPOZNeFi*~Y@hqcn?KLoSF5|=>2)0)3kK~(q8I`s6ZySji<*Bn9Dmi@T_mD^zoc+ z`2qQd$(uh2l?6J5)BHBV4T!)5#oCLNXuDs+JYwAu@VYd6%I{FpVgKiK&DEr|SKSdb zzm4&x++TbJ^Z48S^-f6_hRrdzDm+#zoH@44Lez8)L%v`iPgIeZTv&<9_ZsFAWkd3` zC4|(@N9@(IUa|BB`_9nAtJoRxA-pN&djs=iej2r3JTUxu1NXM1nH%37iXV8>d900L zHzA&2Srvv1IZQ6BMCI#*d0h54^ybbrtI)W3F|$!7&{R#Y_GCj9&2BdNdIm948e<%+ zM0syv9-B(~!-N~Z+zuVExn-fd@frX3{kfx37?1Ws8#P>uCtnxL<0(G>arKgVlL0+z z>G~l>Ynuoi<(PI_{9}_Zm8Ss=0Hg&E4x?p}$K=CGRL*XgJ3Vw;2nXK-pAYAAYWv(g zh4g-Hr~K-m**C`Z_WyUj>yRFpOT2bzlSj$YTVYl%)16!*%GTb=3zu-Fov)^I!IK!C zbVrNHiIu3l?_sV;@*W>WlEAJPGEWXy?M{{DJKO)vL7A0{Z2kRXe*OS+`Q;O={mk;V zj+%ZsCFUDxXnD(KR`4J4h6M%w>ps>;m`hsmEX_fcr|UJbz_fkDo^rEtY-x55+;2$Y z?0=r$?}fP>hT?JTq#4g|ZPWgFB{ZR7yGAOH`~lkcHl|<1hj>O}2|F;oVkN5IewfQM zuWgCw`BQqU`|R%FO$>+7xRq|J_SAvJVZarYyuoV@n-H%XOTUR}F8?OrNkmL;KGA3*Vm{ zhCLOEaj_ERe}?&7{ku3)JR3LN_TY$>IGdVpq`POOd@Qc~;b5h{iMI5`xLAquzrcJ_ zIVpMUfc?zWir+QA52oDSJZ`genltUY{SWz(xRww0R5!-ON|gT<=F3$+J$BDEJtX|6 zaK6!;vp3o{EHYR%mvwwagoCf)Xj&3DjE9vdcNpfX@2-zI=DNw@b$XF;LSdl5rCSxV zM@ne>ddzYoA#Gqgn6tsRn-Q2Vr^2tSGN5K75Sy$u>3K$U+ua=lmkem%MKGTd4$_X( zy$-Hjf;bVg{c}3K%97e4UA6T?P~6+Dq&ZFBd#wV{`{vAi#>o*(A6SX%IFd?>8|S<(!R70=nGmPV zP7iwjr@n!OM1jXP|E=#IFrTw~tV%pjlh>cjv+Jp6)IqPA)tu6cX#4T3as$4Grx(b_ z1EQ;piZJ=H5^cv%xE{8rTAxZL2u~K5y;LjRFgM*H`KoAP%%A=fZHES!TUm}6V0^4Z z>-h!OBQQ@U>T=+U@`uJcdrJ9Ur)3`#;YxR$vYr4Cb)!dtaP8-M=yTOVdL=D zBsBP~?pLmoJ+Zirf?p5FQ~dwcGY;3YaI*c*ZeClU-hUwP2aI%9)3MY6z%`2XA-VQ&@TUY zmr8Ht-0c^#^zx3RUVd_RWAmQBj1!Qk6TFj(yG{)S9))>aD+zyAZhy44*?V3{>?$XM zRehFQe&O*y{oTLT6QM+y%O15OBUYhe3-NMv(bkie1>N<%Cmp^29Dl4)IXpWGCBb~| z8Eb^H*EWlvS?7H}$A~>E+3(G{SDf%V6I;0=vo9`}4dzM)+-)#u-t6*>{bh{qu^^5J zwwU@LQ+PdyjJ1Eo2SV9lu5eB9i9yeQY+%y`)Q=zsf-%|4jXMXnU z9YVF-({6IF*HVSKAUYbsSg>I2$4XQWLNHfwX>%Q~YWd^I7k7*-)7{Lsv-R&S-vikL za#Wouw2ASs66FfRTp^|N9&SHlxr-NSCM|ec7~k+khg5ot<}XouKt7Y0Tm;6$N|Y-C zb2&Nc<+mq_W++%#M^_kx6mY4iyy%gH>fM^>|^$| z0oT$<>JPHCcV)eAhxGe@-FFTZgSl&MN_AY?nnN7Vb*w30@MA~oul8fUq7au!2UCnU zuouZ}4+59Ve0d(}hXzN7R#%=sxpTXt$^7I5u=oj`@8Na9(khfmY5$mH?w?a zGA*8k@HBk9rp#*1p+b`@a4NZG!5l$Cww*$mo(_fbs$Kr%*E!+~wI!nr3A~70$Wd$1 zK=cReH>^baPY&h@Ck*O%=bVpzK6!KJKDKGwdY6tT#?K&dQ+a_14g3GG66MIl9NjHK zVKPVN*(kUf?r_=n-a)pJ$mUXl$^|wO{wddNn0Ni#f1agDE518x4$j=CKF8aO#7oIM ziRg>woV@Ymnger|i*%h$kLbE5eB8*YFDG-UrMn-=w*j#$5MP?gKIg(5zAv6@oVl{C zKXY*IKJ?(|saMgVW8Zmzo_r&~Gh^xjxO!56Iiwi}>R)GEUF7|g|8`aFyRxv4ujl8v z68J&_Dc%~imBZBirwH>5q^h@;EO_m(jANGC?7c&4d8Bg5#P^rrP6-aK zU#q{5bgQ4p@3Fps+7n_+K3-bUR4S%NtVH#x0rSM7vx4r$J6T#EInzhcSt3mS+!^@# z8pP9{k_S8x^SsUFQXA;(cv527wg!*L=ksC{B$AcJei4K~yOCoJU@svIWP(BlHYOKV zqVj3MJPFPQJ*naEg_-|NU$sb*vhBr;Y_{-xs(dtFFml))0b(4iM0wgUk8pDOqgw6# zMG1>i%wu-w>^o7tjf+2sAc)E5?FF`Ir}8^GFpoVYQ8seutrwT`C;O4r7PpqFXMZ6! zFxu-Kj6AP2MSB;(yofu)4csf1wafSPJN32vjA-mV-jVOj#3RRq(*(rYiIr%3bzvU+ zkw^z_E7wa25ySUY|9cQGJNsBGuPURxK9S*CQ?_>@%;VkJqH0}eEfV+U(Y>uI_t*js z<=9O!; zs9DSuy7R^)(V(8wLNz{1Y(RK?h|yl^xfQBo#Po)hsQ&a}9zo`DS+oDO_hy~`j_mH_ z1k>))n>E=~zeu$|gy#iJFbES9uiXYL+=L5JJLYeG(rEHdWXAII>t|ffJhgru!>&Pw zYH(g1X*wn!R-$q)hIzaziZphQX+4>-#5mdIeDyb zSN-LaNeo^f&?e1tFuAZ2m2U~mBlN8|Ke*MFca@!{qD0+CpANURaS11xd7+-Pg(=3t zN|d)0=85S!+PwY!<$RCRc_rgKa-ZYbjY_L>ss5VU&)_+8e;{EPYK-{)%NXWzTlzfQ zo-I5*@9>+e9?tJn>bmTQRX;Lu{XN04MR)Q)xh61|7nVrWmI&luJc+qZBG$({-d@Z@Iu1CJ1)5E zx@9nr&p>Czlj?*kHLp3|-V+kkSnL+G?!X7exDKPBZU@i4&0roeStIUaEzwkRt?rU< z?b4ND_qj!ev>EbI0{uh1z+op``OH~(AI#mkN@PuYhL;L`H#EKUCG$#r-!6v!K$PA) zfZ8jV-C!kZKg(HodKsIY1_dVPzxm-3kobB-df)r4VGfLbMzZje$zV5=I=2Ax!E5&l zn9Hkdtrl13M9~Rvzsj*EOsi6l{HFT@Q@bO`!C;#dzuguvkLQN^twlf5^&(n3M|>}N z7VdUDHAi(NI!e(OI|KJ6~Vn)tLUU64j$6 z%p*SCSwRuC+FHBvv2&|8FW-$yTrS>&xxN8 z@I6g@#^6Oz$KMpZRWOgRCqz`Sq+#BqY2O(8f#lw&$8=)sB?wa3{1?4Q*Iidf%{w57 z5)q_M!S82lnCs+re^$OnZ+8vYVt%W$GWn%wr z(3)}0vCJ;-jZIw9X8DRGX+<#v9)tr9@! zZNCZJ=q&@Y_v*25fkA8Efg5?r<)B(!$bs@4_0zx||h@&bViaQx}(;=gemVa}sX zgrb8yg~M_tiR-);WUK9q@w`r$M&JdHj)3F6AR0=wfhqLu1o4Q$U*y*f?(`XVQW2lD zIKWd}7y0f#&FKVokk1??;q;p`#332ZDmWdO?6vY!N%nI;L7%p$g7l=dHIIh)T9o1I)*wMgD67W`Jst9CE1N!y_CjqGzfFqA9%u)7|oX9E@Gw?Tg z^k#%gyD1y16|$8$7fDucTYcW4vorGo&^M6hk9q8G z{pSwxh#`CVHP+cAY*je#bmVthSoZC$`ORWJR6Y4d`%d9cJRlAsdgnme+vieWqj@Lt z`t_xA0)2Sqw^mWx2QDt5ah|`);|XzyBVVePdKkVcJasx#Y?G}L$iRMVqG*uXKAJ1| zmpyqwJc4HYuby1HGb!vPjS-pLKdzL^*$u^HF!89qcMAIi^)Y`(t6u-@o%Q>TlAf!> z*Dtn|s@!7ZcSWNFKA?YaoF8P7#mp41KYd_ck+o;;fu1cRpAYVF>T1lAdg5VoE#?=2 zlNx@awiU-Nd|?i+$h!f@mX~W?GeKPAyAkfFRJvZB<=-C@D2Zb#Gw`$8G z>u(aoP@Y#{7&#y&A^?rWPtgy7Fjt6kQPesMA+DK0q>{>#nv08`oOv?d)`pZuu&927?l%*AHbnd>fRYnyMtgJ@t}~QRF%w! zz+SVQumuOE3Qg-65KIKDnw71J`C zAd2z8Hvriacy8Jm(<$^A0&@xFC5nsm%p1)mwdCjhRJmE0V72Q9KV6UTx&6QCF%0Ih z$GdzPl@T)?f4TKMzuJ})9AuHOrXxg7EA;s%*b9$X89 zzWaWb`dacc(R`)>LF#W@^$ozO;ElhHFqiP?&>(S=Eh6Z3Ly_(KBc1(Sqc`*RLh|}} zlF6Qo2SsuE3+RTqzewp<5*ieabvlN(tL`utd|{ap5_athL4rwM8kc^Q9ES^*s?1zA z+4Re!d|WTzKGU+<`{Sx-P=MRPl$efyaN3g*BJ5i05-#!xuokG<_7R<|6UtC z-Aw$wO5S+zXmE=nEU!02#*sIYgpbWF89!poOb`!^$J@yZS{pDupi58XW*O-or*gyVqq@HH#;+Td~JMg zu5yddiM9EzLy@ap8vfwYZ$;s9H^W>ahe6K6bNoB5oLT&7u-~w7AiJoq<^KsXW*o1 zB*UZQ$h#HhlJW>*D&}=Mf%-Q*8(aVL`*t|?$~FsFzho~abHE#K+gP}x7Vcka%n$9D z7k@NX#DE?>1nKb zV0bg!@s8yAxqhr1Kzax6-0-FPPV0$h7 z$iRjiU2#V)c`}AGo?WECe4;An?C7P^dNt>Ncj)f4`md*2NJ9_g!DHh4Z*pfj2mH5r zBb9|~Dd^T1lzu#XrSXN|GQ}yH8lu6XoB!ZOG6cra$1a#lcvW3_>c*wd8#?C;ebzs9 zQ*+#;A-xQ;3m`A1<0UC9 zv|9C~=~Ln5kbaSKUD#uK`2J@v%;gRf77z_eU+en*ytx+^^TgJ)?VUeiNTdc{!qUm@0>Es0Z+dfFqhc*ts_ixwhZUV zqYHRc`C9|dTCt@*g!F)L>Ai;QC-%WyL2e_la`m^<@0q;d&onYFx%c?z+wxw*45o2` zWHn=bq!C}w`(Zv|SD40S7a_Tc(;q$d%saa#b#xtPwFKlZs1H@TM_`75qvr!KmuN(; z_F64xrv<#N{4_xx_QK z4?hXlIiM1LD>h27*!c05*QVyqkl&spwT2+W#H9ox zp$DqvA;SfSdkp3hy~LXoUZkDQY>jg`dE!*lVb2dI4?KYS4=BRd=bv_w$-;dcb?s`_ zjr8LfA<^S6zR}^>9eo^LHq0ZXJP567jyg9OFrLdNd~%{=e#lZM2PR$&xIIgi5QldP z<`Lps#bcL#vG;nsdj5Se-ssa4!{@rm^!EBOt`6bwa#(njEtRR7qoWICQnp>{p6DCu zlz$MZ!{C8070*o|ri45Gb6I!^2c0aG&z@X3eTL!U&0T9wN^0#NN}$Ja`~WW;gp}}k zc`Ur`iPEH*bI>>T;?yeiQLmV(nqv;HO)%t=d_37L*pY`=<5l;$YAg;7IyU)X*Qmp zJkP>Cxx33zIK8n_ea#D*BQ~--x>{(knBt5E2n#b=% zam^@q%-0D4`54f4GtznE$#((f5pDNbl^qNH>2~N+SJm=^o*;Echp`Ajh>52~>lhsQ zF0$|(XGVs-`8-qd%r$w}{N-YLd-G*FiXoo%l)TF@kBz+F@=<=#(N{+uM2^nwNOi3* z-lK7dJ|BS43)q*@@C?VYP~i4UA_t8-3u!mM288&o*$ zFJj@6D^l$9FAHD%?;Y>LkWXa32#*x^cKUpP%1a3d^aHuOu=lgDKUZNMX=&)z+uu`y*|yws`6*I$Y-`+IQv-g2 z2-@!wR_P~jzu>6Yn5889V%tgj`7gvmoP8-2Llf8I?N+P&2oRHnEy_L?S@#};F^>3 z8WL-ZXVB#f^9GqNX&xMhSHi;Uv97(m{P+{cCH=*H6)&DIXjhz7aF~Th^|&~^QWoCW z!=2Ax4J{w|9pw-#7`Hbkx>M9%iqT#~KH5OU;g!QY!C8ejea)njcdOQovzJtHzP~B& z*aGfbqy39!5!dhr*_uIElqsx)=QnP^d}6e1`)und%IT#SH`U&zBr4x&nfKF}FrAeT z(oktZX(93WH(|bj#m(A<-vV@E6uh!GWSQ*m9w4ljSol{y{bmT&E#vWT!F=|d^;ZNu z%nvzPt$Vg&<661m8S$<^2k7fQ?u)bZ}Y!*OQIU-=EgM8!gJ|RQd-W`Mhxl7u`^w zFvWaT1@pP)Y|MIJnWU>&ymK!1>VpT4X9ss5R{cAl5{2b(oq~TG=CjM2D1~qBP?@VD zaV+YI<7U#8^5HM1>HZPZJJ|ep_oh(sIC{SWbBV1|dN#+?7EIo+Sls8}!Dln#l(or) z{(X&cDIp;D7O;6nx-mR^sfPI^^VQCVe#sNAnfvOl$1cfN7`Vk zdK~#{SolW=y~*qyJ*OlypB`#2uo%^TT4^wY{{4>0zsa9|S09Ia4{!$_f|Um8BMq2~7P-yEdT#?oa%G@xEG^Py8i+SFM>>_Q9u;Pm(tU2GX?6 z2p-p%^n&s!kzU|j2)MmN-_gL4|2~UeCSB4^>txb{)sO4%NbR_85jSRI(M|V@;Q@i* zpgC35IJ`QTM>O@WJYtgEA>5nn*B@M-8TQgwvg`nXAMM9*#)!e;J%o8|+Zv0=WsA?O zUFmg`B($!!Xsk9ixx;kz@1hDW)-;Wlt(b1B$lBc7FpqHXB^U4^*QLq z+7Fc{mVx(LF?j)>;!O?&XXCLQ9UQqI!(5K~CxvO0qx}{^RsSgrFX!5Hv8RoD5quP-HOO|L=&Fbq3#=V9+chkR* z5c#J5K5Bq@#MpvuG5r}SM1BwPv@#WP>9P9t*F6bxXulwrtijvxF$4Qn%)BPDUpT)3n`l|`%^LV8DjGh(S8+q-} z9j;Ft0`;xL(LxEjUjP;r4%XGkDH$y!of4)Tpl}?1Gt4K7Rw$I@ZPJ@wa_z+>`Bk;k z&$V{mJWPx1(B_-nYLo4s z>2X@*X=txt@J1;^a2#$M%;k9SzG|d)PRFy5-R~wOZ(sIYm7ex^Ej_-Da6tlCa2SL> z;BdI@Fqdom7*9m&=!)UJKi?>xUvR=!bI*_WKN$J|Tk~NKcPv~URqnab9KKuS7Uo=xQBGX5n9KsGF~C+iT-FX|S0` z>ZG#rp3Apx(ETVgpQQ;n`ssoBgj&P7uY6}qORZkG>E`s{-<8F~cNB~1;_yDgJmMPt1sCP3t;Xis_lCHZG5^fefYvVSJTy9|;Eg4{y^)b2zGT|5I~?98n8!8!e(tF=`QmGL2xXhqj$b-vaJImq zm_Dyzsat%&8%1i&Q6t>;gE@!UZxO|~5BzL@Q_kBxuxH|E)?h{}x%I~wK^~pgAbv<> za6}+A@By+?;puk}<`cG^kbdl2|Ec)nk}iVgl4t9>$0#z~bbE#PNC zw>vy+w`1bEH*)N{$w>!{-Uvn$w^WNXp*YN9CCv(nOl|SaN z8+WEC^B23!0&#kThrau%9)kSsANKkK<|ZbmK3%>v)kx6dwf2d!w=svJmO7M<6L=`# z3G2`Z+Bg)dqWh_P$Cl8!BHAiA{@>yn6qiNQg-Nz zUA(HfQ7)}&&4+n+b}9NCB=CY2Gl(36N#$Sd`wj6({l`M(dF3Lvg+Ke1z*Uj@u_@8} z>Y}%xKfwwd#GwHVN3L;*L-6d19@8BgU4E{P5Al?xZ;uQ#ThM>u+Ry(dTu`sqq`ttAcg@J#=?4O0U zu0N*_0?%R~d5%YE+|{cC-{OXTfpsv-MV^+VK4S?IMNmH<@wh~oOH3MTIcKZ)a`edc zn`8THI6waujt!g+`~%8G@4=~g`g(c=QacAnUJ}e@x4Gw&ea$JME`#`OE*pF8ld)i> zO7NZ}D>pn4q;sbBIS!W%=JKw3EB*aI=UXGruOc%nmF4X8j=nox1Ljp!UT|Majr#f} zUi;Z$o}O;Rr2L%?ze2*J(ih(>o6yr)|0t{rtglfX_2q5qki(IW6Xq!z{8uHSZSDv@DHZwe=eBIooEu7U;SA+Nbh4?3?E?z zdCN4u27Q7AoeO3(kPu{Q93seBynK~3)ndN z<%PM#cwf^14>t1CXS#kr7F^%+@u2Vh$cqFi1~-%vN&(V(V{jZUAI#-&Io4fzy|~Og zS^kl+#VnChvn2yQs)QLZ7d)l}u8cFm@#W@+`9#;(*R7YetRBhI9DUSX+Gi`atFrhL zL6*)B3Ju#7>W;nu%v=MG`~oa|!Sc?9z0uMIY7G_alwtLOD5>o~%LvkRKG;cv6@$YS zgt?^B__z;JFOQl|`(6-Prx5G?@UyLy1rrwpSlub!Ogh2g3bAmLuU#uCaw_l7@C&$d zHsn>$-7~?nFA-$u@&Ya*F$0Xl6^6NNL7uuR4PJb9w-TsX>t@N7tzdFGMVc^;nF~Hh zK^6*T9ZxY1MOgUh@~M7tZWUV273(eXWiqx%I1lYoU>Yyf3s~WZLZ%)sqA-_p$@6Ez zV#|JpxeDz2BnHZ}3#Waal#eLBYgMWI zFxreDPS;0N2#Y3gxZ*IE*yBFS?$qwC>4F8?mtRFCl-Y~<>)SB-xu_6uH-lNnI9v&s zOV|(__0DDj0_=33D~#YqYAlMU0Yn zo4=lsclArkJ^`fwke89J2RfH}2?&2&OTk>i&zzZ`&x$rh9>`i+opsb(>FAGx10R^| zIL4C_0wTJeh!3UuW*m8^!(6u1z4k#){8qe)bJDfUrsveY>%6GgK$wMm*lVbPqs(d= z)aykW$UgvKDoSANlyRl7nJ}NwwY@<2yt~k5BVq3Bv*H?$N?+t{42SqgN;w+dCoIAp z{GomDWBb#eSrmCCD?$Pg|nVY5>!$JNPI=YQW*k z!F+B(4!Ijcd%QfF9h44b4~!eR=$eh&5@s^-shR=78+S^ipI;y?NR8jG@-Uy+`^5CQ zwm{FAaiqVkc`N1Wj2|Ovz%K*NMZ|)kV*$Ou?TE^F_Tgd#tW;RP>yFc66=8YuB_2BZ)S!PfnGemVuO} zd6sOXxbiE&d_rA_9>@BNbI<&mZ**1FGwxR2le`CV1UVWXEJgy5T>`WU?5|WM;pj&R z=9Bj%aB4anUne?|@j}4i9Vx%tTiInXVK$8)={ zJOkdo^fc@hM*EqCk8}m20XTY6h4}(M@6_fAhJXCIOKVsIY#TgTRzyyb+0lq z`-udyo@138pB^ov z)qo@ae3&oMI$ZXi+qWlD^~`*KvDlP{*Xt#}O#7Ss6mZmzv8#gHuUatQs9#yrH@c`n z@!7a;wIIjun7;KoT$8BXL;V`z=?@;;4hGw1G~2|HUmNDLH*Ne_dC~A|_I8u+-j^fh zkixuUS~mU7ZjiLEQ`pS{m`l`E?fZ61PuDUc>i%8bWJmrzznk1@SoDI-w;ISt)_iqj zlMnHlxO&lr_$0517D>IZya94#U|)7@+1a@RuXOg7u-GM)AMA+)aKl6WX?Q$;vk>AF z2=$@IRvHO~QQ8N!reYrGsh0W2w@hQN)1^=6`2lI)0E_P>WZ6{tl(;DWuO7jXa zJ0xvQ6K0p_ZEw^mz<0lK`qcpD6Jkw9ek$}yZZ7ShEOTl1o>Mg`9Cn5vOtX7Rlm^|2 z;qVr-@C@|cl23MD4$NqGuLz7W>{Ki{zv?IQeSwT4zzYT^0NufcCy3@y)cs>|`_T|^ znZ9dhvaPAF{Kz-4W!2Z6s}Db2_IovVc}osvCxDAo0FL5Bfyb=DW3#j)i&NQ&5zH5U z5^gm!{-xFrZKBGx#g^^w!=$B`rTmSL9Gdw*_)B2E{A_JIFG1nUKQ zf6h^Kens>`l^-!g;Ml4Aw&2ZN>Hx*j`%;*%TtM(|9$oV8kXL@}p6xFV)#=UHRjH1y z59oX_afi_~k9kL2{TsvlSyck3*S&vRmF{lzrI!1Win7tRWZ_C|{A2R_fehf0VDUP| z_&0&Ma!U!9w-<80_e_!$OOEYUT^X$NUoiE16tx$sUTAa1l=?7b;Z`S_iu*hCC7$l* zXz`y@WooZ*FI0_HAJn&$!I^!gX&P_bFN68=vvr(f=a^U(H=11A)}<;P&HiqF<8kEs zgIR8J*e05j#rIccFjt_Bx8sPaMqBo$_E_<}zK_MjGuAB1!p1wMXRxCZ=ouUsOHHnW z)_`Lt<}hDn^0`@gVfWQ;m$40}9N+dC-aSqpNJhT%nB|V}1cwr)<}L@^e8xUG@vF_H zo94ZT)KeDa9GWG{rnyIUW2P(;AHuj4cf|kw)9x%_uHeYm%9C^NKG_?4+^I0DwkBbf zMDLewR9-M#eCY${AM&n*xw85Zt{wHkU3Uv?Jnn~W_+%bHID5z%9q%yL-4l#>#>rD0 zJzK(j{s(qDn;LscWw$Eaej<7Mnw=?IX}~;mUSQ=%fDCMO#o+L*VE&@Jxqci;Vzbxo zT%Y>1q*TH!aHGMe_kZWpUHDY~a23pF%h;Yoh~TQ}w>wtj&(^^wx;ESK=@0aKj75GV zkrMQt+h6wU!>nPx@XPkk3r!Bb?Y$qUD!#eaAlB{L__?cpmmhJ6|J08S%qMNo*m16| zI>-36pOSgz!SSXC_e2*yM8^?}{8&!xDc5thFkdcOd~z=NpkRSPvB=g~Lo_*-}TeBTT+`{xrzyrRt&2mWrKw1h~Q0pZw>JH|!TT2ti-g?HObmFogvqWRvGb2FSKz|>mHJ*Bil+X~FiX67V?8XlK<>J& zE%|GT6>f*0kJa@)sGsv}VBSSEjzW7Sj+qY*dqkk8!*KNC2=fVRjIOMu9H|&xY&AZ- zC+Q&D;U5+J^D({uA-_BLtVgdt;_#heKL06$*-xFy^-N#P*I9wN)%eisD;JxPu52u8+UzUxYJDd0B@!VZJ=(^Dd<$`QZ!Cpv0LBtSoxUMjl zYwqnE*VYl@zP*c99{=f1@zpZ6^Z0`7vw(St&h?9Ayugjab%VKt7K0CpXB}fFc~8$2 zy1&(f?|Ekap;RQk%gm*Y%&EV#++nWR&>{V=JKn~uyigQUx=z)>y|M+~#>d&|Qf&`)k*C26jCV72={~ed|gt-FhFBbhU<9z(E zc=-G-lXt7NmD4-#TgWAi?0 z53~om&@qUk2e22(%oYBsP(ED8_VC^j6CsV9ITQLimL}q9EL?EW7`tVPYiB+%mtFMv z-F4H)I=B}KL@z$L<8_@%&mEyTEOxdjFjSkaVH|n=VD2ow)3en+dF-sX?XmK1STOHc zm*8(pf2`k-EKg)Fqz@U62!{(kYnk;xq&&Yl%c4kKZdQO@{p);O|Ib%>i8!=0OpINZtW7XTKQDaP*t+#w?LLOdG0NLOUy0+9}(J}ksSqB&)~!j zv)q#Q$N0tpHfVmvf>A^O0jH3(ooZrpSFXz3r zesGW!ij8MXUcjY4{)NL0g1Kyb&Id--R6CB>rIlH3HeH~;^nR&s2Ikk8xL^}&s&m(2 zAnL)a2cmSyk?6@=0vb9YAGGQhNyU8{atyR)(nBQB?*EamEGz`(l4RE|D_l#651wcL z?y^JPw`M|D@~1OQc7bsbqoC^oSyHuV2(p{%%<>n~r{m0Fem=?t@9sPF%>a_bXX$$-(b7 znmV@sBeve4%ZqR!ZQ#lc*51teAgQeS;r-#sWPC}=s$UZCWA`~~sq&m;@*hASOqcZW z`;o%JU3Ldrti{!{;Z2aK# zUlhz`9|-e%rG232_h5f-W?E}`OOcBB2kQPbGOyD54_VuiX<2j_ZWM34M8kZ7R#X2Y zN_orSn%9G`2j%#;U(c1dxrEv?c#uhhb}|wChKv#92S@H0m@8+<(Xhr#pMBbmdE07I zo^ADp^HSX_<_t9~} z%ykc$zi_Jk!8n-9OG+=kmYnyt?@;WsZs#7SIQOcRTRJd#BfL?0|Cv89Yzqr_<&|0L zOKV>XmuXzs`{~l5;mqB?HiGwhsOuuXKp*gODxzX~v>aEzTVXDHb2!1l?^05Os`kaC zgLgNW-x(tq?Lhq~%B89pd4L3j%;;*y>%VO>Mh!i4>4Q}LNA$FlS#TK_9e zAm?@kq48XX{8T>uuT&l3@OQv`Zb7ri#t(&CG&APUbcj_r74SmsG0_T*U(kUxs|P2I zK!gf2Asqfrm{00{FPPkCZTTTLIl%B<#{U>Q6L6@%?tzb;2-#A!$i8PMB`r#lNJR^i zWiYnE*hQicLX@aPiWW;n3DvJft1PXOED@0ug-DC{JIi-w?u^UZ^Su9O{Ql4LIp=%s zx#w=@p8Gid%+ZDGz4(35vl%E(ys z-7o5RN#V1;!#LIcTq?-rTCh%u=z7ui+?nE^O$jDpk0m>DUO7?69lS5;6o=&7GwYiU zas~D^$iB;c{YZ^d&&Yj;SrJ>COQLuQH4gw!AYED`5|Efn?l^elZaC%dndKY><#60} zc(~L3U%|KE+_x)^8ixe#elDRIO!aR>jxWKN{45Yfkehc9t+oK9T{A&Gn}wrtv~h)l zjZyvJ`Zd8nHP6n=R@0%b7mx=DDO|d@K>aWq<@`>c zYL_YaOKAcib~(w!Ul9D|*fsm*DZN(Tj9cY9-{U(kjogIu=^p^$pJL)K3bCJMwxs!S zy4k^n0cTw;c=*a+Cd2vKGwGkh#8)*q%6Du3{@4+LGU~Ra)d=#eF!R zZXihiDq!M^ZLnyQK9km|QZJpNTfF~-i^NmKTX6o2{$I$%7p|R@J^4ppIWjLniO+`X z=7xyGK@~WEM*lz0#9yHP`{j;rL(LM{LQDI3VrL{HRaVNt`FbRm8*>>~Hquce-} zf>Nbq#e;a(FL@8;>(iPS#xG^&CuUwYvHJ9Q^6%loRqd^BtqbZl0H09RZ*=Yprf@wwluvgb82<_rU&3D8ZnM6Led7_kl(f?$EjLY7g4&^c zdiaO&uY!CouTZ5w_YACZ?-8c zEq~?8`gi+%p8e?6ubZ-ek@<87g2c~qCjR0F%Rb(ZOE#>~P|L5g>q>P{RXAk>=hGbs z!oSAEU*cRPWAU}{twq3>fo~nNO7;1^KQe^#=?(1#7Y%oO+%9Db{=Ty!g?r-BA6tXSB}^CjL<~r8kS_ zKN9clTyRrVrZrnKglni7s{hRKtrFogoDXYPV0tud=KtzbT*dRU>Y(t~lKo8@xzu$n zdHzgZxsZNQ*DMgbSAks7ow`HkrOa=0@nl+aL@X#SJRDW^`yln)7UYr&7$7NVr~nAR z8nnx-t@Q&1(dlxp6_yG7yu3y1PnEQ^^0KM&%ewX>)>eWn163H#4T;qLB4W+o1+t>U((tYi)_S`ZktcvzIQo?kY4cO!g zy9(X4nx*?)9&eB&9XLtd2cTA4Buk+Drn0A5*WCm8S`MOh+R^;&;h&}UuM%J25x1m^ zyD^%|N0QtF@S&6?DdqRf{QDq(R*$_r-`~Znp0x6154ESauM^nnQM-5welSu)3VB8o z-8F`;OCK=t-|*(}FaO}_a89N7=C_U`eT#U{3E#yik!+%g+;v0tw~!xX3!#5uo&TSE z2oFIyykBpw4txA!V~l4=V&XHazpo1Saz_2e$WAB6hx9Zr?Smlx^azwAWlCKBVf3-t zS^17n$;HIuszD+dxf`dKL%IzQ zc7(80y6mv;$(w#J`cefR*-_)P4~a)^Ytn`uviXarrz66~nP(uMy=!;Fljy&zaUZf_eZaGDOGjcr)7l3oc;>nfsA^g`MU#C~HHmq01r9kS|vA>G^ zp5m4x)};y5_y+Pxl4#mP?fwSj%jg=MI{BhR>qkzizRvlU;g26JiMpI5aHMN!YSSmn@8ZJ>5)2KgMt+a+VU;@_V*A=R~GhqV5-is8K)DA=}tr`i$PVYcI-;j1g{`ust8(>Ni|0*viaeBp!R5G;(9fkmw8?h zIet9VCY9=JCI{L>DSEtr~~Bl znC&>ezAgCIxTd?^mv`BsEp~AoO2rrz@;F4ZGmTHWNlSKg^0g53$`i@mVc*jU%Hx0e z=VtcE|wpz`$Xv=cd(bp;vX83P}AREmg9p{NyMA^P`%d;u@M zyA9FH>;&0b4?a7df3B!hvSC#|+E2Zx(*rNk{9t;!^nqM<0itp*R%DxU(yxxsa;xY4 z4j<{L5v1l3_@Z3o2hAc7efvQ!_Z!Z$hI8BZ`EN2>cDvHBND!OCR$fAFPvkLeBJvP6 z^;8S}YkIv0K)yqj*ih=tYvB&p%NjWqhS(eL?Ip2y(e?UzKcossC4e zqxYeNzh9K&KP zAX-I~?Unj#bg;yz;QEw&a)lw9o5Soq0`mDrK3^*l^*Oyw)462z&UH1bug5J2_n3-L zNoJpsKML~stHuRZn3k6DTa_P-t|+hA{OQco&N_1xja(FjV6TuuDACUs3v3`zb@dqTK?u%>bw_dPhTRI z=;wv@O6d4A4)VEI&#Q^rqVTY7A=Z5JYTI*;u zm4Enoxe&Ez+0amX{08~rnYs^UFV!i1THS^nOYsq%y`DR?+KDNikozTxZ$NiHn1BBP z`CJZ99}d4u<~vZ~RBBS8rO4Ic64Db*U6%sw>4(gUumMC;A&}|%=UMb=Q&qAlydlKX?etGw4=4ZErC=q)@+rEKPU48=$R~2>yM<@0^<+w z!$a402c#DG^~Z+Zwdxc;8uj_^=usFSxfO$&9n!9TY#?7DZ!lYavC7_HjpF~_y=hJ@ zkn~-Y_5@}h#wYn8`m=+4v9(fe0(mw?$1}4c>sHE%MjSXNY1akQpZ;@N7SUo?$FwoQ4aDn z0V0^TGKJWO7vysvGVy(_d89vMC@pkCQL`{bOUY7h9WAag@_h+NB>|dy!tBHc^0^3$ z?LYeG=%_Alk7-l8^PySc+y&E2n*T8J5#<>LK=hvl@_GC{FHAhPTcE7vX&(dkhCnGN#Uy9M0e4*l9?{KG1q-?1&g zKzGfs#l)2ULkvRRhX|lO1P{?)kcn>-wd=g-0m1C!B}eV99yYn37`pgGFh*{Qeh@xo zH-Pz(Ferzsb$9HYm-+cmh$>yjqRxaa#~l7uwg|Noa+4FOeo5(W1j-*YM}>Tc2*}Ue z6j!%95-EaZFQG36)wwX@1wRe>E$s}=%ffh|C-*9L_t1R#@5dgH;hf5T6UM4 zC>zEuIsMq#+JZVhB6~fg)K|)-B=j~pL~n7B%iZV1ndAMV#l!NdLSem5VQH=GqQsrl zb)O$G%*BH#%^PO#xlG(k{&Kk2cQqG`ANMIgW9;vcbnDR_Yt$ZOF8%Zlu{h3Y`g~VE zNs!OhoqVd9$J1g$es_*po0*4*qNWnxUh4inMQ`$K2dM_&gxs)4cC($3T1|`xFcAC9 zW0JFEh`TP%yMOKcloJuY3k>h;6Bj0VpmryJ2SpC;P7#DVALMdWR%{>nCAhz7>43iH z{Mn+Ly2bXanopgtG3f71K(aom6~4*SDVY7GKt9{Toko?9EsUf8J>FkFz_-ArZ{sPi!iQq=y*U=Pw2Y%Kj!G-476e<8>hTb3X2URK+3aO*M@@0162r{7-Ny*1;^y!2U@ zsN*0bpWuR&ME9jn(_s292Kju;xwe*K5B9IE*-&+)?@Zk1Wma!S->~`%&IgY?1T^zG zqn`}O7ru~k+)X=Ybuf0Af4j&^?saN{-~BCF^#{+uNgfHY&k~T&`7P;f)4i5F&GA_x zy8CcP-?@95T7f{%-Vt%&IpjSYnYdNk5r@@D)Hl+pbT`y#wMF zSrzWh_VoPP%4t9J`RX$2ej$V2zLerraC;~+aYaAd+U#r=yV3gJo6fggg*u;(8-F{` zY7bxJ;Z4dw2hmrFiQAGPq&0M95ANZq%CScRX;PwzEPUp|6AXn(c{y%kfuZ=MrC9dN8>~fwKZ?in0z#3=CCYdgNtASk1-A_00 zL4~E}xBtkw{W{j7dn^9ikP)lCM5LyG({%c(gIun^_*Rhs{k>jC6D6F#m0BBW-I4bd zVeQ`(E>cO?$rnjRnWlehfP4;x(c?GrY<5%`U;H~qU;J#m!bz{yl^8|xJdwdK&5ICQHk&RP{P*R=rJ9FsY@g?EIm+5!kV2jmw}!=!r689} zDM~Zjop+JFdiN*%O3jPbpZXlfT&J)*Z7KxuKP`~USv|k)>E9)JNp^q2MP9or*Sy&@ z%%3|Yms*?)!qsNtYVP(udGICIqS!0`OS>{SvWk8ScZp8PCDo0G$7vmq%f_#|*6+oE zq0CDP=KroHCrrxiKkS$^1sADHP9R4Ph`zcYmn&?S`JM-QYu+~y2Ct=ttMxl#bz{C# z*V7FC5lFy>Ir(^#jz^KZi-CC5JD~od2g>1D9sa7VId3g5XJLb##bK@IQN_P=+^G3h zjB=1rjU^XoM+albcj$xs$meGDMoq!S>r5UNo%MURduVKhVM_yRoFaV$#Q`B)Ly#+& z9=g8aY{3oBZAX;0h1`sOc=d3#k{U2y4#pEn*$70+Durbt0g+<_%26u1UfH>Jh3<`A zuCb-qy|>l(XBwIOokkAQAV674Sbtgu$`NAwdZ;%J;}V&9?()&fC-pXSePrLB0NNY; z9&)QQ4xo_lSq{o!3m&z4po#w%`s_^8L~-h>%HlHdxLwqFQ2i=#^+K0bKcYt696wO~m4WX|U={(fk15FKj^kL@=3i@&=8#tDP`2yY zBg+DU;t+LSP2m%Kkt{pv#VEh7HRO&jC z%tuxPPMR(rPDmAX%`HfSkXFKo`C;}kW8x1i`RXWe@#&j9`F9T_-gJ!no#hPSXS5HQ zPkot$Q2<2$^&p?kca}$96Sta8lb&g|mnHAM4IKLO(K?lM{V7*%8SyavH-LQh%|~6O z@BxOaC+8Ve5!M+WS!mW2zL$FLPv?`j2V9U_w>*12hQ4UX~yqBgE;tVs^^xW+BhGxN*~MLT}<+7Yehq zH_CU#A@1IuXH_mgxKmTLllXinBN8dD;h48n4e2m;p=~X99FLPmx zRbK6gnddheBKS$4g-`ktZ)&GQPIr;NVE(j~i7(^M&G}Ym*IXa#$lL15A!^zycCT)u z<}c9g6X1*-HE5FlCV3WlAcE+>jftNWl9FRah&a5qNN`Bt$(=chR;R@uQ|GmGKJ`sZ zQp-ZPc1+y$9_&lEjE|WPY}vdytvlnY+OdA3G<6@5fg6Yv;v@#(kcjO|Z(5T3z~t;; zlC$WPapFDc1oJi7w`Ys9DK+~Vy!HLVVjof}DS2wTg%*(@-?58{FW7WrQ2WXHMDv>L zO|`9YvHRBeOK!p_lVSAlpz)Det}8x3Q^Os}d?!~Xf_=wsP!4;0_oI*NTLQjVhjI+R zuIql&66iKdojMOA%ON!^8ZoAs-#IXG^M}rwPCPB_KJ=f{N7;zzq0-!iB|41bB_4VG z!#5ZoK=A#)_CXv$KIU@!(KlYEt7DVm3kBZsmFoDkalD*IT`!aMCjB4EPAK_J8_FaJ z-o98SzJ_hU){SmgC!FLR+h)BfxH7y)yEB=(A4=il{AoTvjo<8H=HjxAc!~}4y0iN> z+s@fuT8%q@wuO3*#K_e~6^8hW6EkN!_ax0t-uc3|`mBB{a(ax8_u2@TQL1=M%_ha>hLr*U?Q z$F2)C4mtkbSd#i~X9MGWf#m5}Ds<_a9$eeAn5uXIRuG zH!h=bJd8SjCfk|JccE{pLb%8rf-w(>S5jhw{lFWMm=gadstwLRwf^0X7+=YvH!@Ek z<>Vu3Q#MuMeuqRhMn3ywzLJ<**eXHpPeIaqFv`6?JJ;Z!Gxi&@-Z-ZK?=WEd6V~6| zK|W{iQQgGLg$m~ny8gHIMQEQ;?#@7cZ&p63tRgVYgz-HTgK~u5NeRr_E*3v3sv_<8&9g?v?~Eink>xwca!Au0 z8Xm^?1o>;Zc+EUFU2x8M7`u9Lr)t)1HtrkoFR1&hbpIjoN$>sA@i4v@$e+g{;W`jq z)3&kc_LmdBeVd-|&N~srKBfM^sWNnY@&@_bKUBFl7!WfsmqqvHS3QeJRP-P4K26Pc zrt6RQ4JJ^!7nVGAp7}d`Ksg*S;u*$^PF~e175Z@N{=a?ggf_!(O^ovpa(nwwhd(Uo zk(FupdwfAYSLyLNy}eNnxioaTWy~&q%`7KQF9cr-uD-Q*cLRRo03R3A+`T|P*;DE_+R1O0Wiy7iL^4W2#_V#D*S>V>53yJ;7IKQWGiMSwF0i!zt?xbJS+XKnyX0$iQoD^S;oL!ycIT}(D z*YD!6njUmQux55)<5MYMb0eaNkEV{ zx|0O4LomqY>wnF*cKGi*t_G~WW6*4=#X~DCKh-kMBgu9qxi(U-(4Bl{L@_jk9|H14 z6&I#=Vei=TW`0|4`tiedzqN-43?H!gADPc^*a9D~LP0*J>Pb~YeOb(!6GG=(Ub3b3 z;4U3;e9q#3BtEhZAvGmL?=X-n8$Cy`%k#8ew*q@g#%u12w~lsI62@5UP2x`Pci|wH zMnek5@{km7X63tQoMKaIdpgbmSmKgi|Qy7=e;UYgkFWxOr# z*^Zpce?qVN1*7W<5|`u}8lFxX)as4Mef?lJO7#-7F=u}oa)%+B{2ue|@I4ee~c|I+r9x-ZY_1?c>rkxMoP+|CC;E@qa* z)y)nUyZ$r{4<|qEIneN9_^IH3)H+vWe<0ffg~GW9L9Wmx`Mz35&Sgm(1{)_8vhUft zTICL0pzaUTxL7Bo^grG?2s!HqgA-g%94Lp4eR9KzU(Rtag6$0s$7@`vTPAV{zl^y( zu_TGe`wK{p2(80I{3Rab3uLQ=f96ziJpD!Sj#;mJY(_`3@(Evb{)5_`%J&V!`rraR z2;`gs2tNVjbJQNUshjKYB%CeiSmu(aZ$%`$SOA?5xDD=BkA+q(;jwN4QVxq|4t zg;|a-GI2q3Fd+P7kgu=??=<#OEbWSc$MAt2z56}ndLOM@g^s5z{6KmpE`)y=jL z?k)T?G%<3a>36pa7d3PT=Uq>!oLYY{2Lr-S0r>*!tFkz%?>Pq@RFksg3Uf(l`&Mfj ziS8?b`cvx!5CX8S$lG>qcuEO4h@4bV4)<8->{Ac@a&wdigwLc74nONQZM}4LYQLh( zpw|5#SN5IX$|5wrY+?1MZ?YVJbshiXyg@lTyZV%*jPVb-@>Js=J0r_l$xuI^q zcU~%aVsdWz#$z9%Z!YC$i$~Y{puI>h00z;nib3p@4)Ud+RBW~T6UDj0c(bTQSxRhS z=+~s1+8FXEqe+j0e-=q;QiR*6IR8>VU>=9`WXIhmlG*{#>!+o*l4ym3wI z)Ns!4OsPlBgBK#E?l;tSLK4VG$IC9%OXv_e$3Z!4*RAYsbQsBvR*T}<_Zsimko5i7 zxmQzeSi zcjbU`X2)T|S9)=2c5g!nco& zo|d##m^vO%S7Y6EByM%j$*IR3N|jU8wITd7 zAfI>R2j|lU73u2d6SRpL`8e$zTwRZYrXF|bIc3w>DIer-X=*#@E!9|oyw+;rsVH>8 zWVhshI~=B-XHfW9s%Js;KMV2;qgyX;7sb0IDxQ(QdXn(q`Sm%i9&%Ir6_pRBf56)N z94Lp+FZt_4{-2HZ1>SY;0=9u^eMh#n2TtAIR5?WC(3oKY3;CV`P>$fGCPz(OMa#s5 zw#OgahGJwpl4lFcOg#^0?1fOjEd=>&oj0;~PDZdfRc`8g@%)ymqgI*x9^9lkgmW%>~jI+ zbDsY+ydu)^ySTlZiUx0iyOnJ5$%Oo={R!cd?mkSvZ*vjk%f#%>wR*yz9kNwgK2sNYpW%WRME^@5pS@;H*2tV(yBp;Jtz1^3Z3=>Ze=k0Q@PnMgklh>V3)>KW z5yj+a-RpXe(RzT#Wmqw%#c#7pz~EfqdD;e-`>5b&lA&Hr&8r*T|yMtViz7Ptmx5b8;nB8mDCHAz3}- zzo<r?hAv8D=}P2aw3e9-*}T@Osj$9fJk6<^4@{j^%3ZN1sCe$ ztw~M@vqY|mAuX_l94@_(StaSoUh+SPoN7=GM-T7vpBBDxi#ulTcw>U?^^4NBe0K<) z=h5X@2O!%ns6xNwYuAPR>rQ6fDf|Z!>Z85)82w zolZ@1k-l}^b6xYKr5C*^L(diH`cmF8ASn#d_dk%!8Dsa_zES0}=aI6L?%SHX1={$2 zSiME#JQFv_4{2lE^m^X``Rvkfew=n#B$9cg$<6$yaAi&oVS#!kdTz|X4imT0glDaxuFXYG;XakFQU8ZbS@v zJMWNjtG#S4I!~kPO--=0Li6Hg)V~Il!_icjR$GKmEUGP^6yfcL-f%ebbSu+$(tsW)Rk%c^C8Gz zv;S<(s-sy0BhQ|_I{!T6HjnA93z^=m{RtQ3LNyJ99way z?qyH?Xk=%tBN zm6rjoIIFRgcLS?E+zAACWU-(Onr6#f1>rvsDMx@b|c| z8*bONZ46}BMC%;|F!6O5@G$!{fPBoE4c8pXj_fw=G|(LVE8+7oJ9Kx9BKJNdd( z=n%U!f?PILC1Wcg-d$YUW)CoVRmT;xERh9zB#|8=6Clmama`$wKyQsm|Dt-))QuE*FXb3sv|=5{Qz=3?lf{- zQ{^}5yHvzOIDCunETD+AsK7@OxCda3kgk| zRMWlz2{$nNe+1?5C3hy}&n}&utDG<|);dg_4j7w+S z?y!&vyUq6p*wwLP8_Ub%e`m4AVe)}GxmQ8#(*tlhR6NFdKF=2Tc3{+4dc~dX4q3nK zZ15jh*Bya)QUOk^mex{iP@tQZJ{rxS_W17<4#7=!6KW5vS&`p}` z=DXdN^vYw4L=q;SDLC7(j^lwr$kq?(AwF7UgYZ9te2mo`v2`Q2t*j?SLaXEcZEO7Y z_ER4(Z6Ax)4}yG=^kAY3G8;i9K=}P2pTqjN+UU!GBRN@fx2}BqJ0vEqCN*52bvy~d zIa9$9?iY}Y*%`S$$KdnL7kyjKJMJUyyf$I>J3yS(FA*+vpn`A*K<@m&@?^8o=A~Kp zf>Xxk2dZI&UOtID#M+-i2mxN?3){4f0to*r$Y+20+Q=sh9~8)t2+l#r^B##@QsQ88E0c4AJlQQMa6#ba;&1e&vG3>UDkO)D3X0gBxm+P z^d1DcGFlbOj+)+DrR?@-RbuCz>vIg}z1V=(p=5~1VNM>@6(58<1adiwE~In)b1=%U zcQHx%6S&`Z?%;uli-5kQJbu#47}M{ceh0ajh$Fs4_e~k4oj&VVsvBJO-}7r_&lA9} z$y!rxA~B}&L-hUu@+Bl}&WCIiGJdsj=ZjJHnxK}AdxjiCfqqX4x%8wE+Q9*YKMe9Y z@~sc$aPxeW-Xf8{;_2*!n|HBS7u*K+IhpuaAABeteY^!eevE)}IA=e)H+o|Jk29VE zBfPvS=AnE`_&((UahNOzxrIQg{Nj$>4MWnvsHF->!wAeTM?pE}GRD<;vE}^swz#zu zt>G^Tw@Ux>DgfqZ6giaJ$n;|n82=~8&re8eUOA`0+r_I%{=LO}#V7u~&z0!=&7?R+ z<)d#FL)u{s9Sb)TJr`CZC+jn(yD=>Vh&N=t5k6zG58Up*nE0VG7|t_y%O!2Uy1(1;VAx)-e0zXB zD<9{LBVG5Sc`3AACqO>`;m%*m9x|f0K4Nl$WL(yb2Z(*G-8u!I*==C$`WxhPuhclO z%RVo*?uEuz-he{}L&L8s$2C~{8S0kUneONP0r?`6#>2wrYPIM4K2+v!=oeILx4bZP z0GJn(?T^?7A4sm92l1P~Ab0-i595XV?qT+Pv_CdJT;)WFxZ1X#4;Z(}T$VI*m|gyX ze2!~N&7ZVkE_}pirP{o0s2x3|_`UoSYkZ*bv6K}p-9aJWF$u~Mc`oUfe!#G&QceEN zhg}C=e4R*A8A$}jS@L&~_npY_skzAY7~nn#AJO=9V#mN2wm?(6d&v{ShkCQ;r}VLM zz47iIlv`X7E*r>Y)A^>;%KJCk-b*StGj)#jrnbFL+D`*0Evy?M#CzI&0Dn%9&*T0^Mqc;cXTeN9z25HXe|;Rn%JJR6xfYr4 zOF$00k!zB!I2UhlWP#X;3zWki=y_nn$H@BouXZ1d*;CfIGCDz+(+SuIVU)XIb*7)X!Y!LzO3bPL%$Y+bm`!W&I*519t;fU6^{4z zrd5ZAjRXF(Ksk$kZcq1XxVk<}t74s)Z2XDO&hy(LDa(feTHu86XM_BW_E%(G9%NvL%8vB^Q&>1zC-OSaWG-+XMYacWtb<1mGf7oH z0+5|=xZewce2!f%asR#k{`LLMogwuLN5UPn?EMY3(EMcbeiWIHOnk7UK8)n>l7%2X zgbZcKrBb{%wSpq#dxSuFQSon!G8bQPD>~M=fp^J7L#Sufp)v6Mks^ll^q&LD;YfIXEpTE~ zvS^I&i)_k!5vQNVbxvNa?TwW23G~4F5Xq^#NYsY$NWk zS4t|%@`_peF@=vrjT!1!`ip}6S=(xijN*ShD_b4N?(r<{+Veju&iOF?8E!W~^%n>E zTE!J7U5Z1qk5wA3Ip|)lXy7ug@|cLmQRKBTCu%Ya>F0FqD*=P2OHwcnB zxwTnJrOGr|tND<5|B=^tRX~z1~{*p}m<2>iT=E+*_r; zS~Eyo7xZ-zrW=IFQ_-l{eS9(`b&ZQIOn~ixOKJGuPaVH z+2PKwsBC$A$!uXX{xIlGu?rTt^GKcjL-dyh`OaSQ-B(S#haBeAtm+BaDe>V{owv~} zbbph9Ppu@#Ab{Mfpnka!l!GCh!ta^T%snWi*uNk;WK8-}gEqSsdhd}))N~~v?^5}? zLwSn;9-FXp+^@FyyIMX?S3eZh@Ty3tTDO$upms-iNalw+QgWA6dyb(<1l(U11AL6e zX-~h53oXk7TzD^kO%p%rBf7qXV~_Lc#;i@G;%@a(7`6|%VVt4cVM zz1OLyLw6XxuZeKU&Z4C;<2bbhji>2*z zqg-nC&UEol0p!ZvUs5R+JCboOO)tt(_-m{Bw$p)4+-UqmxvoK^xg&XZm6X~`{s*y# zBFLBW6qefeH~)S0_R#8v#eRGK?hHwZd5q4xP(Jcx8FEHVK|{DoAeVFQ*wW0AP@&5$ z*TS2&>=+rf^5u@X#^A?ff5ZEF-~y<(CtSD1$JV#%%45?X0^4OLbB!?bUZ-qPO*;@ z(tD77zCg+Z3t}G)kZ+o4U$A@4s=eV@Fwwac~|(<*SxJzC*^ z@kicUbesqIuH+jR5WTfPE|1RUYPGRr6FL2-m+DAy-Ba1>7k)(@op*v<#$F25TN~t? zbIF`*TcrFxmJn{|f5Ra1Nkq}|M~l&UCljBcS3&tYAfH3>$M0YHS{7>zKc!sWu=;Yo z!OA(hkyGnWL~7MjFA2i?l`a#Xu#(+t_o>E$lI_+L3gevF{ohx0ex2Ix#A){5{PjRC zZ{5R2$&!26J@&7&PQNcO>C=tRS-pxm?o#|c&?%Js;wm}p!s3BG$mh8G?w`u@1#gqT z`DS%p@80xKvbWcHbZUPO3_z;LI3xd?Zrm^c`8+S~wGsTk8qWz|=C^Ufy@YrT$@ft% z=speDuE-isofsH~%s)MFw6e#r?=S@AaN#tPPjoD0#i4gGh_>K=7Vp%=V{FK7oJ<;V%RE{4R1C>tD4JUwdud zzeBLTUfFDi%XPFKK5c$MBhb6 zZ&P=fj*m7rgufEx%a+c~bGwlDc>cXciRRKP3B#uSE~iYV$a3<4McE%g*Cg-Lp4vLTrS1XqMFq z9D1JvDhF+BcsyMV%9(R$5l28%uX5|(O-&0GGNjnD3~%kwM)&)sl7k0E1?af229(3` zmSjBH4In1NgY0esWQTG!}hPWL#73A}EF3wgN&ikQbWVwkThQ<+0pzg`FO zMTtkYYiER zHw6^O?|WXwy#7J1IMYt@Aoef^xq|6yOcFMInO)C5QhZ$fkI(iNiLl=5%=1rhB%5}; z+yL@1$L6}HiM-10aS7%3s*HNN#7CsMjCPKM`X!R+N-J&%(c1##&c5&4GSQ#6^;21a z!4J7znFc$5v~H_K^C?j7R3jvWZwc~w*Ls%)oSb*c|H$k9MfWGVF=Jb=bn~P3MlKv` zBJVkoo|>G=-kU%!#~SaBtB!@wzLW*WV>R#x-(N`*3G7AvgT!^lA?NKrNZD+h?=*F3 z{5OMKc9p(=?0y%__xMc)J!xIP`^OKiPUB{@9Z6i|q?EGwcE-Ew&Abk>X5y=V3VK{A z@UOx0jUeCSN7=KZ(w$QI&~Y8$yZ9ODGAy(p_O=1}W~pgnmXnjhDfd*)bvtC{g| z-^!hmkMkjT(yAXo)Ay@d1vx- zQ!Z!OHDyqK;Eem&+d#f}?r@m(Ci9&YjrXsnS7%&NuJR13)<@S9fPLJZwG5Z)&^DYP z?YkZ1vnw{WI`~N0oI9<5y3pKS)WJqrutb{C?`i(&?o6IAL%4PzSJczBZtq*4LbbXa zsZmAz&>%-^vwQ`*J_Pi}6A4(-9So}PL-_U}pIx&-{g8bBjfmowv&2WaKe}#)uiWu{ z%6{cVz#GoouXccZj)mjWH=?EWl$G&UKUT{crQeNxtY4ByZ?I z^xp~cl~d9#XqmcuoO*le;Y6;3rhex~V||V(`xPb6a;AN#T_B&oafOB1K@r(Hq3z!H z?_azfXQi@2yA8(Ip=D`6{eCydXFE%{qqXBqu4y%gfb_;I;(OBOy-J>o&Nl%2Ahq>e z2_ZzRmbM=G;q2+>;|`!4%!Y`4$48HIKfIIt@rOY!CV;c=sPrz-KV6-@k!RsUoC1(D zJLoyJBgmaA6CrEE{p_q)ZkM~@td6~FgxTXJ+0cDfivGc*G&Gv$K-v`xa@qHEga)(* zyD$3I`Ejn8Ufx&n_=S0;7*W!8mnNxlgQmAL={F4vi(`90uKGr!_4A8et=Kf{%o^T4 ziLdjPJLKfY*q%rR0@1_Cn*^s;keqft-~{qlud*Id_c-`bnQ-_?*!TtWcK-H<8s8bm zRU)zjg~S4M+Y+WXvR%qpXO#Pd%VH6!2C;%$FKoJCl+twk902;8jriVBw4rT*Uy{iJe1B2aG$=OjK3?$?GJXBb6Iy}*~j4g zniL%)yQU+)+e;3z>PvgR5M~D)$lcTWF==tx!SD#@KL@kSc%9-exeFls+0t~spxA*( zM9R_wh2A0da0B^lHupKw;u;(61dl7&Ec4m?xiKg2%2CF6NZ})C$)wW4boYbl?+)_K zPELw-pD$cp<-1AHR1A+d9E{p$p@^!vmBf_=d}Lv_rbJ zm3>#8q}s^u6$hUr4%6ym(B+UOW5`5|-1Dc6yLgbVzE8o@c*fsEq}x&Kg}l_samK=k$lxNPi(R+$1O`a`>}5zh%~oZo-=?!bS__gVTS zmCG;;!}=wXxW^b@Ro1M3sP`xDy7LvqnxWNJcZhMX?TZJ|{VKpNNF^3Z(g|`a0X|L! zfPA(^)f(Ih!_7LCQgwwN*%A~zB^c0m^Aq!U_tV1d|&2=X~j8Sob5)!JK! zCzXH9SeSY&?Wv4@D6799XTQ`j6T(Gu=Naw7t@e1{`((Y?)UF>|ImZNuQCa7ol?F1- zKT*Arv_0e^H(hlIKM3T{(%>=Q^|Efsou;qm@=yQjZI_F47|CMs7xMcCl!FxrHyGrK zR>~6I9eIzveWAZCc5rTY{on4-0*@HSVY1%H8z!iwA>0sA>{yaph(@*mggp2jjGGJ&%m>-6M{L=#%4^4c1^yi#NqIkoh-ANcn`}81|cEllP zLBZ3;>oAbZe{Ef*ckP|}k@Mk-OU`Z#bx{{uGyfY)|3TA@QKKMJABbJTLB3Mo8@-ht z0z2w^u9z;G9iw*1(x|allqJ66(9r#ZUif|9@sm}jniIMzH(jou$MJ+^ zyeDySNUvmgXc?mSUXU+$(nCt7N$iUF?s?*}*7>ap!(X&Um$Uc@@^TDn5(qaEHwxrRWafLe^X%&WR(CDKU}0y-M7P4P zvjHq|g!Q>uSUc_m`9g08Tz|zV&n7?{J@;O#UpWh~=5 zj~q|kY2_ec{uT#vH$SwTz0D)DR&0yos}>Eza)&3kJkM9K_yzrWV;DCc+@6?9zuxfTb%W-gRa0I~py$4{_>bJF z#JOUT*Zjz}?~(T=o&09VOUnf1?79$tF3oZI*T(91C*mcJ-}gV0i%~9R)t_FxAJU%3 zK`z&|jvk5Fr+g0LKhNC07#NqZ?BCii94uVq8V^!cl{`~`aI-+Jh-#)gCtl*NwO%7( zmTGR~%c{1`BVSnhBY7H$pDqt78|3OLyWD%FI{5cZ!DQUQE8QOb1I_u%@3QF2@VWp* z-xDC0M_Z0KKis%1m5+rql%42XF(qm}%Q)&I&F92yibjC}H zPEftifc#+5!8iH%zt^{fC0!nyeQ0EE#G{?jSXRA}dh^q_Up~l9ciUF|0mt7h_CENg z%zdGj|J3rM_;$1O!x`(?`=155Ydo<({yBPVUv{}&+wx!Qu9Mg8&%Ekk(Ko<}a_9`V z!#R+G$hc{EwmJHH3Q!HB3d$QQ20WYs-1dj7p5 zhV3B#lML%;sZ};@EcPays!*E}VwVz-%O+UzAl_NR?r8A-Ia_&ZtF!XW%-)u<^dF)( z4o6K%fN)DeuCBh!VVQ&*@m3`QN_*Fsy&EZZkC??eza}C9&=;ws2A@w}2D$3e3Ujq@ z-IAZ1ux764^AP(k5i=W+NLD*jxQtU_h~8H~e!bIiO>NJzLBB7PT)M&H2|D$^)qm|| zwKMVz73JC_%s;MzT#=}?Ph2e79bOi(*;HvAvom=x8vCPzWuFW=P(rv!(F@wPCyZYP z@+BNMw7xehv(+k;K9$KFiJea%W4L8ARr}WCXE2=xcF5 zBJ3QPYiCBQ8$cV+iD5|1m}$?`Zh%~+7q|F3yI(eR`W;O_yYhF{!NGgzJk`nW8-g1)qQ10{9qqwa%x} z!FT_q&3)E!svLW14S%_7xEhPzq%v021A2%(Zi8H%{k*CB8^p{H*lJ+q^2_nb5+j`F zJ<$APn!kZ7#OeIwKakI}#r6XSTPx;bqiXrtNA}}CV^7;4@8Hd6nokEiA;rBIPZ^=( z_#KeX-Mw8&Yj36V?X~R(!j^e`SYa=A+&PRT-i09d!Er%IjT74R1LiMxLB6_&jzMW& zXzh#f-JgE=`Sbsj`#w;hz+(3>JZ^^j=J!DEtcDvhIqz-sL{`{c4ZV9Med&T)L8~Oj zyq2IqERKLCTfqIK2IR7H{1e$Ky~66m;>`-WOU`Kw)x6*P0Lw7{aL4%&HJu6WLCC$t zpaA50BE`$0_I?QRxl>IxcGsU6GI;ozqkAJ@QK(86Ja? zs?Jz1T$qL*4msO~%6SCJ;mk_dH8zY-7CW7Av(lEWxqI2BHzw6^Iiw4QE?5`jTI&pQ zo`7=LIWCRF>)nlXNqD<1eAQgNnxSYbFC2Og1^pg3z7AV+}ZTw(p77&8~H!Wa$D|P zj@B_i^+$wYN!cn$Rt9npk-So#=^k)BC`a&~otjr7`;7%-s{~#d4GkaW`d%vBj8UP* z3-Wi6^v1Ev^WWEoQ&qw+OhIC?B{CfrR*^&m?PWWdyRufj< z

    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 z z{_Gv|I#d6%{MOeLD{3l8nOd(IWbV3-ZddvOiJ|%^?gyAFSjO?Q_W7mljXtBHb4H6z z`83z$SvAwSULN280E7pR@8%-y@Db*6_Xc^l@ju;YC&JO6@TR4Ymn@e_+)WUo*%j;$ zQy;xxGN0^%c|?}O9TNr4@3gtNCdANE+6ZZU73fU3GJ;}W%??=rciizZhosn zAVHAM!zR2mAc6;cow0mk58ZXw5syX*+{)UZ=w#rP8FyfG*F1Xp7<~xA`wa6~pAPS8 z){t|!OXN!L*m*ed@#RCdg)(&efpBdH`T&C9eSvtyj+EnvDw~bioX)=JvmF$1-!$<1 zNzDQRKdrvhf8sy{?<>S35GwUUcH1oyXpQSD5h6%_($nHHsFSAG7w|x6uQ!z_(_#EE VG(3WMz{zEAtze$S?|uQx{{e9W4*UQB diff --git a/vendor/libgit2/tests/resources/binaryunicode/.gitted/HEAD b/vendor/libgit2/tests/resources/binaryunicode/.gitted/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/vendor/libgit2/tests/resources/binaryunicode/.gitted/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/vendor/libgit2/tests/resources/binaryunicode/.gitted/config b/vendor/libgit2/tests/resources/binaryunicode/.gitted/config deleted file mode 100644 index f9845fe7e..000000000 --- a/vendor/libgit2/tests/resources/binaryunicode/.gitted/config +++ /dev/null @@ -1,6 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - autocrlf = true - logallrefupdates = true diff --git a/vendor/libgit2/tests/resources/binaryunicode/.gitted/description b/vendor/libgit2/tests/resources/binaryunicode/.gitted/description deleted file mode 100644 index 498b267a8..000000000 --- a/vendor/libgit2/tests/resources/binaryunicode/.gitted/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/vendor/libgit2/tests/resources/binaryunicode/.gitted/index b/vendor/libgit2/tests/resources/binaryunicode/.gitted/index deleted file mode 100644 index a216d221940d9aa1db7ddefa79f1aca907140bd1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 104 zcmZ?q402{*U|<4b#()nqCR=IML9F)~7#f!_FfhM>U$5CsnVcqJ)7VKf?RUtA>Nm=dOL4l9rvly=;R11^`9eBpUz# diff --git a/vendor/libgit2/tests/resources/binaryunicode/.gitted/info/exclude b/vendor/libgit2/tests/resources/binaryunicode/.gitted/info/exclude deleted file mode 100644 index a5196d1be..000000000 --- a/vendor/libgit2/tests/resources/binaryunicode/.gitted/info/exclude +++ /dev/null @@ -1,6 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ diff --git a/vendor/libgit2/tests/resources/binaryunicode/.gitted/info/refs b/vendor/libgit2/tests/resources/binaryunicode/.gitted/info/refs deleted file mode 100644 index 128eea7c9..000000000 --- a/vendor/libgit2/tests/resources/binaryunicode/.gitted/info/refs +++ /dev/null @@ -1,3 +0,0 @@ -39e046d1416a208265b754124d0d197b4c9c0c47 refs/heads/branch1 -9e7d8bcd4d24dd57e3f1179aaf7afe648ff50e80 refs/heads/branch2 -d2a291469f4c11f387600d189313b927ddfe891c refs/heads/master diff --git a/vendor/libgit2/tests/resources/binaryunicode/.gitted/objects/info/packs b/vendor/libgit2/tests/resources/binaryunicode/.gitted/objects/info/packs deleted file mode 100644 index c2de8f5cb..000000000 --- a/vendor/libgit2/tests/resources/binaryunicode/.gitted/objects/info/packs +++ /dev/null @@ -1,2 +0,0 @@ -P pack-c5bfca875b4995d7aba6e5abf36241f3c397327d.pack - diff --git a/vendor/libgit2/tests/resources/binaryunicode/.gitted/objects/pack/pack-c5bfca875b4995d7aba6e5abf36241f3c397327d.idx b/vendor/libgit2/tests/resources/binaryunicode/.gitted/objects/pack/pack-c5bfca875b4995d7aba6e5abf36241f3c397327d.idx deleted file mode 100644 index 8a05b2beb0d57cee7d9f0005a7f1a1882775aa86..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1380 zcmexg;-AdGz`z8=g9R`G9fA#m+{jD@W&!GfVOAh}IAS)SzvzY8fp(FCIe_Z%VNRg@ zaKcm6&eEf*J3#R{PB1anEmi+c@P#iulyK>bXzORH;wa_-@s;f%V3Of5G44Zi#F%EBeMe z-|y(cY0*j+4R@V9A05l$Ik4sYKiMPvQS)lM&-$v|4S)PmeAfD^e<}T6`5G=Qn&>v) zNAPod0f|yX*W_`Q9V{%{mofdHvE&T8^QuPZo2XEj?QQhdty`fP_7B z%faqL0T;f_Xj>ySVcU{vnGTwfo%&v}`+lX>`pPjd1Om%L#>+t50>qnvVY?hyJca^s zDNqi`W#9pd1Iwa7(_b9IlIJ-+Hr;hJtz^3=C+%1CZ=)=S{juoXcKe*Juko4sx-5ID HyWnyFb4;OX diff --git a/vendor/libgit2/tests/resources/binaryunicode/.gitted/objects/pack/pack-c5bfca875b4995d7aba6e5abf36241f3c397327d.pack b/vendor/libgit2/tests/resources/binaryunicode/.gitted/objects/pack/pack-c5bfca875b4995d7aba6e5abf36241f3c397327d.pack deleted file mode 100644 index 6b5ddc414460411e2ce8a1212a755bdfff081499..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20879 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 WU@JVr( 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 diff --git a/vendor/libgit2/tests/resources/binaryunicode/.gitted/refs/heads/branch1 b/vendor/libgit2/tests/resources/binaryunicode/.gitted/refs/heads/branch1 deleted file mode 100644 index 0595fbd31..000000000 --- a/vendor/libgit2/tests/resources/binaryunicode/.gitted/refs/heads/branch1 +++ /dev/null @@ -1 +0,0 @@ -39e046d1416a208265b754124d0d197b4c9c0c47 diff --git a/vendor/libgit2/tests/resources/binaryunicode/.gitted/refs/heads/branch2 b/vendor/libgit2/tests/resources/binaryunicode/.gitted/refs/heads/branch2 deleted file mode 100644 index d86856687..000000000 --- a/vendor/libgit2/tests/resources/binaryunicode/.gitted/refs/heads/branch2 +++ /dev/null @@ -1 +0,0 @@ -9e7d8bcd4d24dd57e3f1179aaf7afe648ff50e80 diff --git a/vendor/libgit2/tests/resources/binaryunicode/.gitted/refs/heads/master b/vendor/libgit2/tests/resources/binaryunicode/.gitted/refs/heads/master deleted file mode 100644 index 552d166da..000000000 --- a/vendor/libgit2/tests/resources/binaryunicode/.gitted/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -d2a291469f4c11f387600d189313b927ddfe891c diff --git a/vendor/libgit2/tests/resources/binaryunicode/file.txt b/vendor/libgit2/tests/resources/binaryunicode/file.txt deleted file mode 100644 index 2255035d4..000000000 --- a/vendor/libgit2/tests/resources/binaryunicode/file.txt +++ /dev/null @@ -1 +0,0 @@ -Master branch. diff --git a/vendor/libgit2/tests/resources/blametest.git/HEAD b/vendor/libgit2/tests/resources/blametest.git/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/vendor/libgit2/tests/resources/blametest.git/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/vendor/libgit2/tests/resources/blametest.git/config b/vendor/libgit2/tests/resources/blametest.git/config deleted file mode 100644 index c53d818dd..000000000 --- a/vendor/libgit2/tests/resources/blametest.git/config +++ /dev/null @@ -1,5 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = true - ignorecase = true diff --git a/vendor/libgit2/tests/resources/blametest.git/description b/vendor/libgit2/tests/resources/blametest.git/description deleted file mode 100644 index 498b267a8..000000000 --- a/vendor/libgit2/tests/resources/blametest.git/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/vendor/libgit2/tests/resources/blametest.git/objects/0c/bab4d45fd61e55a1c9697f9f9cb07a12e15448 b/vendor/libgit2/tests/resources/blametest.git/objects/0c/bab4d45fd61e55a1c9697f9f9cb07a12e15448 deleted file mode 100644 index 90331cef9e2a034476d47724607ec51c6f3c331b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 46 zcmbsD%Uw5aL{8&niX*d0IDPmDF6Tf diff --git a/vendor/libgit2/tests/resources/blametest.git/objects/1b/5f0775af166331c854bd8d1bca3450eaf2532a b/vendor/libgit2/tests/resources/blametest.git/objects/1b/5f0775af166331c854bd8d1bca3450eaf2532a deleted file mode 100644 index e664306379cc7a955ee09ed741426c94ca112c06..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 35 rcmbsD%Uw5aL`lNYMz*(AkH9ey}BL%0EG>N diff --git a/vendor/libgit2/tests/resources/blametest.git/objects/37/681a80ca21064efd5c3bf2ef41eb3d05a1428b b/vendor/libgit2/tests/resources/blametest.git/objects/37/681a80ca21064efd5c3bf2ef41eb3d05a1428b deleted file mode 100644 index a6ca0fb71bc4e4628b259c54724aefb548e19f20..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 106 zcmV-w0G0oE0V^p=O;s>7Fk&z?FfcPQQApG)sVHIK*|p_L{584Ig(oxX=g-+tCG;@F z1F9eitl+)TeP7jy&XdhWk9!9GG`iWToN^JWAfq%r6|5#ITu*OGQ+&wI5b;;17Ia=s MIJ)#D0Ko1mZLd!-CIA2c diff --git a/vendor/libgit2/tests/resources/blametest.git/objects/48/2f2c370e35c2c314fc1f96db2beb33f955a26a b/vendor/libgit2/tests/resources/blametest.git/objects/48/2f2c370e35c2c314fc1f96db2beb33f955a26a deleted file mode 100644 index 7da4cf5d4ee517f5b98dd5fe020b7ef5b486ab5d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 35 rcmbsD%Uw5aL`NFYMz*(AkOf_dd+?S2Kx@u diff --git a/vendor/libgit2/tests/resources/blametest.git/objects/4e/ecfea484f8005d101e547f6bfb07c99e2b114e b/vendor/libgit2/tests/resources/blametest.git/objects/4e/ecfea484f8005d101e547f6bfb07c99e2b114e deleted file mode 100644 index 79e0ada916ce5490fbde3d8007cf2b9dc2483c7b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 163 zcmV;U09^lg0gcZ~3c@fDfMM4;MRr{XlF4%lB7)#r@C1`&LQCm`G~QoO58wel`2V!d z^Vp<@{?ID3G{GYfsze%;w_LJICKk=b0!NdTBd{8y*r@W-WK1DBN;*LE=r8w`vFfo40Hcy7m3*$}=mr8YUcQU}R?FkuVr#U<5*a K0)x|A=6C=U8&RYH diff --git a/vendor/libgit2/tests/resources/blametest.git/objects/63/d671eb32d250e4a83766ebbc60e818c1e1e93a b/vendor/libgit2/tests/resources/blametest.git/objects/63/d671eb32d250e4a83766ebbc60e818c1e1e93a deleted file mode 100644 index 5f41f2936..000000000 --- a/vendor/libgit2/tests/resources/blametest.git/objects/63/d671eb32d250e4a83766ebbc60e818c1e1e93a +++ /dev/null @@ -1,3 +0,0 @@ -x•A E]sŠÙu¥Ê@bŒ±GðÀP뢭Azk<ù’—¼Ÿ×y~60­–I³“1S´’=“-6÷FfC.†ìcp½õŠµ, $b -¶8MF -ᨹO!1eïÈò]TqkÓZáV¸··çô¾>žmÚÒ)¯ó49dì-Ñ#ªîm­üg©áw©ºTK@Î \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/blametest.git/objects/63/eb57322e363e18d460da5ea8284f3cd2340b36 b/vendor/libgit2/tests/resources/blametest.git/objects/63/eb57322e363e18d460da5ea8284f3cd2340b36 deleted file mode 100644 index c6c285eeb494bad55823949cb8c8a20769b6a058..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 76 zcmV-S0JHyi0V^p=O;s>6V=y!@Ff%bxNYpE-C}G&iy`z2m0rP-$*{1sc%2vA4jLl#`EV(ko z5{*kC2u1)B#qai7tA22+W194{$+*0@=BCfve%+@1G|m?dM83Dy1L>myV^sS3n*3j? O+i$JAcj^PtVntJpk4Ve_ diff --git a/vendor/libgit2/tests/resources/blametest.git/objects/8b/137891791fe96927ad78e64b0aad7bded08bdc b/vendor/libgit2/tests/resources/blametest.git/objects/8b/137891791fe96927ad78e64b0aad7bded08bdc deleted file mode 100644 index 9d8f60531ebc0489c29cf79c42b6fc0e3583f9d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16 Xcmb;(lYc)^IP?*j=^`M8z1a1bUN)>Ma Dwn-5* diff --git a/vendor/libgit2/tests/resources/blametest.git/objects/98/89d6e5557761aa8e3607e80c874a6dc51ada7c b/vendor/libgit2/tests/resources/blametest.git/objects/98/89d6e5557761aa8e3607e80c874a6dc51ada7c deleted file mode 100644 index 12407f662d3eec83787ce6518f9d9bfb160bdf2d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 43 zcmb7Fk&z?FfcPQQApG)sVHIK*|p_L{584Ig(oxX=g-+tCG;@F z1F9eitl+)TeP7jy&XdhWk9!9GG`iWToN^JWAfq%r6|Cmo{KxS#*&fdH6V=y!@Ff%bxNYpE-C}EhEJ~#6G{E}<4Z6@)nwnlD!adKf7 iR6!D0fpk23>3Xqb!xJHUd!6H!x*zq%z>5vU!dp(LgRIDua<|AeS?h!ALZa%Z18dBpS%& ON@Xw-4Fmw90J^4*t`?2} diff --git a/vendor/libgit2/tests/resources/blametest.git/objects/b9/9f7ac0b88909253d829554c14af488c3b0f3a5 b/vendor/libgit2/tests/resources/blametest.git/objects/b9/9f7ac0b88909253d829554c14af488c3b0f3a5 deleted file mode 100644 index a428fd63b..000000000 --- a/vendor/libgit2/tests/resources/blametest.git/objects/b9/9f7ac0b88909253d829554c14af488c3b0f3a5 +++ /dev/null @@ -1,2 +0,0 @@ -x•ŽK -1]ç½›•ÒIg2Yˆˆâ ­3‹L vîoÀ¸{õR-eÐΤ1ƒ#ŽóBÆ0©}¶s˜9xãí‹R6d1’S¡ËZÜx‡§´Ð#œãçúÞdíñ”j¹€&‡‹F§ Ñ#ªAGKø?KݧÇôgõ2r \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/blametest.git/objects/bc/7c5ac2bafe828a68e9d1d460343718d6fbe136 b/vendor/libgit2/tests/resources/blametest.git/objects/bc/7c5ac2bafe828a68e9d1d460343718d6fbe136 deleted file mode 100644 index 4e6ad159e..000000000 --- a/vendor/libgit2/tests/resources/blametest.git/objects/bc/7c5ac2bafe828a68e9d1d460343718d6fbe136 +++ /dev/null @@ -1,3 +0,0 @@ -x•AnÃ0 {Ö+tË))J´AÛ6V=y!@Ff%bxNYpE-C}H5)wdG3uHM!7*Co}8k&)HBV^f1H& isvrrhz(ZfhoX_;oVUa)b({5|OHvSp9C<_3_8ynl&3L^Lb diff --git a/vendor/libgit2/tests/resources/blametest.git/objects/d0/67729932057cdb7527a833d6799c4ddc520640 b/vendor/libgit2/tests/resources/blametest.git/objects/d0/67729932057cdb7527a833d6799c4ddc520640 deleted file mode 100644 index 926c4bbb0..000000000 --- a/vendor/libgit2/tests/resources/blametest.git/objects/d0/67729932057cdb7527a833d6799c4ddc520640 +++ /dev/null @@ -1 +0,0 @@ -x+)JMU03c040031QHÔ+©(a˜Ñyíihyâª>3ö<í^¹G¥nÕ@$H­É\;ÍMêo㶜úѬ‹£Ƥ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/blametest.git/objects/da/237394e6132d20d30f175b9b73c8638fddddda b/vendor/libgit2/tests/resources/blametest.git/objects/da/237394e6132d20d30f175b9b73c8638fddddda deleted file mode 100644 index e9e13833f..000000000 --- a/vendor/libgit2/tests/resources/blametest.git/objects/da/237394e6132d20d30f175b9b73c8638fddddda +++ /dev/null @@ -1,4 +0,0 @@ -x•K -Â0@]÷³ëJ™|'"¢ÞÀ$“ÔvÑVbz žÀíƒïÉ:ÏS­ðÐj)Ñif£Ñ‘äDNS ÆdOÌbs§Ñ[ìÞ±–¥Ab( -¦Y;“ƒfç¬(‚˜„ƒ‰®‹[× -·²À³Õ¸%8§Ïõ5µqK'Yç (ã‘zF8b@ìvº·µòŸÕÝKý£ÿc–?S \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/blametest.git/objects/de/9fe35f9906e1994e083cc59c87232bf418795b b/vendor/libgit2/tests/resources/blametest.git/objects/de/9fe35f9906e1994e083cc59c87232bf418795b deleted file mode 100644 index 11ec90d6839512b82f0b93a3093d0b9cf9716b7b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmb;M1& diff --git a/vendor/libgit2/tests/resources/blametest.git/objects/e5/b41c1ea533f87388ab69b13baf0b5a562d6243 b/vendor/libgit2/tests/resources/blametest.git/objects/e5/b41c1ea533f87388ab69b13baf0b5a562d6243 deleted file mode 100644 index 7e5586c2b4c5f245ac6d70cf03894bc70a7087ee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 76 zcmV-S0JHyi0V^p=O;s>6V=y!@Ff%bxNYpE-C}H5)wdG3uHM!7*Co}8k&)HBV^f1H& isvrrh;Jwj(U)71ulg&ksdj|eAy4k6mauER7KOAA>86!;q diff --git a/vendor/libgit2/tests/resources/blametest.git/objects/ef/32df4d259143933715c74951f932d9892364d1 b/vendor/libgit2/tests/resources/blametest.git/objects/ef/32df4d259143933715c74951f932d9892364d1 deleted file mode 100644 index d021ccfde398a7a28a468512c73378ba42d41e46..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 42 zcmV+_0M-9^0ZYosPg1ZnH)U|8GT@@Jd9FjiKrSaLgOO+;mot^YNHmZO0Keb=dyAkF A$N&HU diff --git a/vendor/libgit2/tests/resources/blametest.git/refs/heads/master b/vendor/libgit2/tests/resources/blametest.git/refs/heads/master deleted file mode 100644 index d1bc4ca6b..000000000 --- a/vendor/libgit2/tests/resources/blametest.git/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -6653ff42313eb5c82806f145391b18a9699800c7 diff --git a/vendor/libgit2/tests/resources/cherrypick/.gitted/HEAD b/vendor/libgit2/tests/resources/cherrypick/.gitted/HEAD deleted file mode 100644 index 656ac0e0a..000000000 --- a/vendor/libgit2/tests/resources/cherrypick/.gitted/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/automerge-branch diff --git a/vendor/libgit2/tests/resources/cherrypick/.gitted/config b/vendor/libgit2/tests/resources/cherrypick/.gitted/config deleted file mode 100644 index 6c9406b7d..000000000 --- a/vendor/libgit2/tests/resources/cherrypick/.gitted/config +++ /dev/null @@ -1,7 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = true diff --git a/vendor/libgit2/tests/resources/cherrypick/.gitted/index b/vendor/libgit2/tests/resources/cherrypick/.gitted/index deleted file mode 100644 index 7291006c88cac48740211d1a74f551eafbb14eef..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 248 zcmZ?q402{*U|<4b=3rZ~nLwHWMl%A%IqvVC!@$tEgn@zaD^N-Vh_fsXM77p6OVyRm zZ7%Qr(|UpVk&G(?XIf@Xs-a#)v_Vx z7~wN#9=bWLOBPxv646rPp@ Hn=SYjD=rRaaJf=~^$e>puw*UY{^AEQG diff --git a/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/06/3fc9f01e6e9ec2a8d8f749885e931875e50d37 b/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/06/3fc9f01e6e9ec2a8d8f749885e931875e50d37 deleted file mode 100644 index 48fa6efcdd3718cb912f879dd32bc4281e468273..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmV;80CN9$0iDe;4gw(%Kv8Q>F};Zy*nvP|jGc*%X8?9qFu_$|3vcfx>j`Xs@qV03 z$sMFKyIz@rf>nBqhExoOgY#&RHHFEJ#wly3z)TKF_@$@0!qvz3!VNB5OKxfTG&nxC vc0adXv+w>8=W+r$IHRQ+9KjwHqFC#??)(QrsD6mJ)mQRQ*f8-0&j~^HUf@Er diff --git a/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/08/9ac03f76058b5ba0b44bb268f317f9242481e9 b/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/08/9ac03f76058b5ba0b44bb268f317f9242481e9 deleted file mode 100644 index 06d1c694e..000000000 --- a/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/08/9ac03f76058b5ba0b44bb268f317f9242481e9 +++ /dev/null @@ -1,3 +0,0 @@ -x¥ÎA -Â0@Q×9Å왤“i"î—Þ`L§µB¬MÓ…··àܾÅç§)籂#ÞÕ¢ -^CNØä™”Îb+˜%¸˜¬Š÷¨bÞRôU!õ‰zŒ1Jh¸õ)JO}딼ëƒ b½‘µ>¦WIóª \´äqy¬ŸŽÏŸ 祖QªÒ”O`›ÈDÍ6{tˆfÓmµê_sÓy‹‚@Ö2¨ù("O- \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/0d/447a6c2528b06616cde3b209a4b4ea3dcb8d65 b/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/0d/447a6c2528b06616cde3b209a4b4ea3dcb8d65 deleted file mode 100644 index 9a3ea32097ec5ac637f6f9b9b3b660a07e55e009..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 107 zcmV-x0F?iD0V^p=O;s>7G-NO|FfcPQQAo?oNj20fsVHHvI1trZ*DO_6I=8vJ`%miy z=0`HFNQ#WWik2mAy?2noPbVqW_pN!7Igk2zwQM9s#$ZLQOBP diff --git a/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/12/905f4ea5b76f9d3fdcfe73e462201c06ae632a b/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/12/905f4ea5b76f9d3fdcfe73e462201c06ae632a deleted file mode 100644 index 162844a70bfa51f94939622c78dfd1c91515c984..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 108 zcmV-y0F(cC0V^p=O;s>7G-NO|FfcPQQAo?oNj20fsVHHHJ^t{E!?}{H0am=fj~(XY z6e;~)f~3d@tY~lkpPn4Y4?p66KE5V1r7|#k4TB1jB4e;3L6t)X*RgNPzjrO^+TqX1 OvU3mScK`siFfjX{R4`Kj diff --git a/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/19/c5c7207054604b69c84d08a7571ef9672bb5c2 b/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/19/c5c7207054604b69c84d08a7571ef9672bb5c2 deleted file mode 100644 index d5cd6d3f2dd607cea68b2f9862e4827f5e81b64f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 28 kcmb40V^p=O;s>7v}7DpTlAt^EfD_YvK_}|ml85^bUs53upv7gp6cdZm>kzn=qR_fHZah diff --git a/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/1c/c85eb4ff0a8438fde1b14274c6f87f891b36a0 b/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/1c/c85eb4ff0a8438fde1b14274c6f87f891b36a0 deleted file mode 100644 index 98b792b644a89aa176b6fa2ee60e3657eb1c79a4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 117 zcmV-*0E+*30V^p=O;s>7v}7twU#?o)JrS6XTOS zooV;w1(G5ou%a;gl;Xv${WEv)#ZNw#5U6*#Pc9!xkugY-UQudZVs2^*!z1IJZyma( XzPz$6{!RU1Pv@m!_cj3l=?628#`-me diff --git a/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/1e/1cb7391d25dcd8daba88f1f627f3045982286c b/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/1e/1cb7391d25dcd8daba88f1f627f3045982286c deleted file mode 100644 index 10a5be6fe1fe89fdf9a213932741f802967b028f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32 ocmbOpD`K)fiR@$$w34d>0Nv#c9RL6T diff --git a/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/20/fc1a4c9d994021f43d33ab75e4252e27ca661d b/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/20/fc1a4c9d994021f43d33ab75e4252e27ca661d deleted file mode 100644 index c8b26cd011248b10185873a57774bb1afea4ef59..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 126 zcmV-^0D=E_0V^p=O;s>7vSctcFfcPQQAo?oNj20fsVHHPJbGNAASA&%^Mo(Q@^HDI z>DpTlAt^EfD_YvK_}|ml85^bUs53upv7gp6cdZUø_uæ+5ž ÎŸìùx9þ…a?õ¨Õ7˜W… \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/2a/c3b376093de405b0a951bff578655b1c2b7fa1 b/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/2a/c3b376093de405b0a951bff578655b1c2b7fa1 deleted file mode 100644 index a3294d764..000000000 --- a/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/2a/c3b376093de405b0a951bff578655b1c2b7fa1 +++ /dev/null @@ -1 +0,0 @@ -x•ÁJÅ0E]ç+f÷¢¤“Išw‚àGLÒÉk…´š¦ ÿÞÊóÜž‡{óVëÒG{×›*¤ˆA9¹ ˆÊÄšcô:ÊPÜ”ˆCJ’Bž¬ù”¦k‡\2ËÌ]}ˆj‰¥PQÉãD6b”Á9ú¼5x“üuè¯Úê²ÏÇ÷O7v}Ù{[¤ËcÞê3 Ž‘‹žàÞ¢µæ¤çÔ®ÿ#þEÌ»¶ëy³Éšg¸TÙÏà–µoPÕÃM™Í/X˜ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/2c/acbcaabf785f1ac231e8519849d4ad38692f2c b/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/2c/acbcaabf785f1ac231e8519849d4ad38692f2c deleted file mode 100644 index 74b48dd6b62c069cfe443c4362051e0ec1423f4c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 26 icmbUMG471sVx-h!L?TQV-rgoXg4@4%Ka`x4 z0D8BR8Y4tEATr&9wY{+u4&I$dgCKi_E3Mjl*Y&4KA_f)aK>e;P~9y r$Do(s|s$DS*5(;v?0Mla&Bme*a diff --git a/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/44/cd2ed2052c9c68f9a439d208e9614dc2a55c70 b/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/44/cd2ed2052c9c68f9a439d208e9614dc2a55c70 deleted file mode 100644 index 8697c4e66..000000000 --- a/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/44/cd2ed2052c9c68f9a439d208e9614dc2a55c70 +++ /dev/null @@ -1 +0,0 @@ -x¥ÁNÄ0C9ç+推’É$M$´â†Ä‘XÍ&Úi!M%ø{ºð ÜìgɲÓZëÜÇp×› .É0¥˜c$¦ÍÖòetBèPpLì½Éꃛ,RITtŒ‘ƒõ£óA4E.TFr˜I lœâ½OkƒNŸ»lð,­ÎÛ´oðxýcoO[o3wÒZO`lôD.÷µV=¦vùW‰z•…«d(ó»Ø¡ux8ýš›ŽO·ô¼.çKã%MêÖ?ZØ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/48/7434cace79238a7091e2220611d4f20a765690 b/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/48/7434cace79238a7091e2220611d4f20a765690 deleted file mode 100644 index a1fa599e18092197d595a607bf818fd91ece0f8e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 33 ocmbiRGfItRJ#HWi|%AFi7G-NO|FfcPQQAo?oNj20fsVHHPJbGNAASA&%^Mo(Q@^HDI z>DpTlAt^EfD_YvK_}|ml85^bUs53upv7gp6cdZfd`Ib80rcd`oE N=YHwP2>=NtEy_Z5FYW*U diff --git a/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/54/61de53ffadbf15be4dd6345997c15689573209 b/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/54/61de53ffadbf15be4dd6345997c15689573209 deleted file mode 100644 index 7d2b233a6..000000000 --- a/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/54/61de53ffadbf15be4dd6345997c15689573209 +++ /dev/null @@ -1,4 +0,0 @@ -xMjÃ0…»Ö)fj¤ñH– „ì]æÃdÔ¸Dq#ËÐÞ¾ --tßåûáã=YJ™`HO­ª‚t.DòS´ä½JN.ø1ŠÁIÉ#góÁUo $ e›Râ8†É‡¨–gÊj/žÉFŒì¼á­]– -¯,÷MW8j-ózÙ¾VxyÿñÞk«37d){pc -Ôˆ°³h­énŸÚô?J¿sÒ=Cž¯:í³ÁóþO ýÔ#6ßïäV< \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/54/784f10955e92ab27e4fa832e40cb2baf1edbdc b/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/54/784f10955e92ab27e4fa832e40cb2baf1edbdc deleted file mode 100644 index 2a5bcec27536832d6fba52d34aa0ed6d93bafb55..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 74 zcmV-Q0JZ;k0ZYosPf{>6w`5Rs%gjktFy^8mWdi{U9P`kZPG^ gW}IfMr>CdjoROH9o~n?TlcSIZbZape04%04V46fA8vpz>% diff --git a/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/5d/c7e1f440ce74d5503a0dfbc6c30e091475f774 b/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/5d/c7e1f440ce74d5503a0dfbc6c30e091475f774 deleted file mode 100644 index 77deeaf0bde08841c53ecc3ae4578f8d3c38418c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 31 ncmb7G-NO|FfcPQQAo?oNj20fsVHHvI1trZ*DO_6I=8vJ`%miy z=0`HFNQ#WWik2mAy?2noPbVqW_pN!7Igk2zwQM9s#$ZJ{Yxb<#UlA{L$nZtr49_cT MEi(0W0MvLZz#$$lYybcN diff --git a/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/63/c0d92b95253c4a40d3883f423a54be47d2c4c8 b/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/63/c0d92b95253c4a40d3883f423a54be47d2c4c8 deleted file mode 100644 index eafe2c30af02ad41e99c5e26d510d143c9c82c36..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 30 mcmb7G-NO|FfcPQQAo?oNj20fsVHICEuxwKYwqu#rf=pv`uVnk z<7SXjHj*MEup*}P=048dN2kr+#T@e OHPX2tBnSZbx-o{GOf{hZ diff --git a/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/6d/1c2afe5eeb9e497528e2780ac468a5465cbc96 b/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/6d/1c2afe5eeb9e497528e2780ac468a5465cbc96 deleted file mode 100644 index a98378a70..000000000 --- a/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/6d/1c2afe5eeb9e497528e2780ac468a5465cbc96 +++ /dev/null @@ -1 +0,0 @@ -x¥Î=jÃ@@áÔ{Šé fvöLpgp“3ÌŽF–²œÕªðímðÒ¾âãɺ,sòþ«7Uàì$Ž ©¤š1 :HðEcÈ.d*1ŽQ«p5nzïà‚T²h}A"I.•ŠSÅAÅ:‘Hys ï}Z\YþvÝà¢m™·inpúý´ÛyëmæÎGY—o°®Ä`É$Dó®ïÕ®ÿBÌO{L|‡f^äðOA \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/74/f06b5bfec6d33d7264f73606b57a7c0b963819 b/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/74/f06b5bfec6d33d7264f73606b57a7c0b963819 deleted file mode 100644 index 732011fce224168f6054ed90be00345cb92ee234..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmV;80CN9$0iDfF3c@fDKw;N8#q0%{Nv5#@5qE+c&yXg;L`bXoS$KO3^#pF;;(Kn% zIW-`ocddi~lVk7k$gDJb@{=0TnvrPoQnMo@)PqzMgzYUZ1#Z^8d#G>?C8rwur^4yE vwa2Bll5DdFx8yUBGI}7X48tBJqFC#?Zs8AvQT`BdFRy54*f8-0ImJN=j}=3c diff --git a/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/82/8b08c52d2cba30952e0e008f60b25b5ba0d41a b/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/82/8b08c52d2cba30952e0e008f60b25b5ba0d41a deleted file mode 100644 index 302014bffc0867e2c5fc5203c29b47ee9e84faac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 107 zcmV-x0F?iD0V^p=O;s>7G-NO|FfcPQQAo?oNj20fsVHHPJbGNAASA&%^Mo(Q@^HDI z>DpTlAt^EfD_YvK_}|ml85^bUs53upv7gp6cdZ)aLEr}$|Ev*0m diff --git a/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/85/36dd6f0ec3ddecb9f9b6c8c64c6d322cd01211 b/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/85/36dd6f0ec3ddecb9f9b6c8c64c6d322cd01211 deleted file mode 100644 index db6faa9e2186ba8b1e720431de915d32c4c8d631..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 36 scmbZ9OAhNJcyNHp&s8wz~04U-QfdBvi diff --git a/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/85/a4a1d791973644f24c72f5e89420d3064cc452 b/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/85/a4a1d791973644f24c72f5e89420d3064cc452 deleted file mode 100644 index 7fe69b6f837115d80c433bbeba2d15205f775543..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 27 jcmb7G-NO|FfcPQQAo?oNj20fsVHHPJbGNAASA&%^Mo(Q@^HDI z>DpTlAt^EfD_YvK_}|ml85^bUs53upv7gp6cdZ*RGe=>%yH+X)9-V8qUN(7GBXH js-qsOUH*lr_nFtLOpupvF{l31VOybaJ6!buZ&y;-W-wmN diff --git a/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/9c/c39fca3765a2facbe31157f7d60c2602193f36 b/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/9c/c39fca3765a2facbe31157f7d60c2602193f36 deleted file mode 100644 index 00314454f7963adc1b554ae83228f74ed85ce284..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 107 zcmV-x0F?iD0V^p=O;s>7G-NO|FfcPQQAo?oNj20fsVHIi5O=||)kk#N@-uu>>sOmh z6Da?@4oQ&_SkdcSh5uacY~u;u@%yR~$3g{PqnD9Lij2XEJQddJi;L-==}=zlDdKWx NM}5T1lK@iqEo8;;GWP%g diff --git a/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/9c/cb9bf50c011fd58dcbaa65df917bf79539717f b/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/9c/cb9bf50c011fd58dcbaa65df917bf79539717f deleted file mode 100644 index 1266aff36c892a0454156b622baa9d45cb57c5b7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 30 mcmb(agC-k*Wc$|66#Nf4uZ7~4LwhbNt diff --git a/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/a1/0b59f4280491afe6e430c30654a7acc67d4a33 b/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/a1/0b59f4280491afe6e430c30654a7acc67d4a33 deleted file mode 100644 index 7aa0a5dcdd07c2f776f15bf181d60abf0a746607..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 30 mcmbU(mXfDsT;Ge{-+%0OTxyxP@-EK#prH#6u`PSOHP#r_ bXiKf~mqeXLe%x9Br?07f;4JC`JaJH-!YWbg diff --git a/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/a4/3a050c588d4e92f11a6b139680923e9728477d b/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/a4/3a050c588d4e92f11a6b139680923e9728477d deleted file mode 100644 index 4713fb2db..000000000 --- a/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/a4/3a050c588d4e92f11a6b139680923e9728477d +++ /dev/null @@ -1 +0,0 @@ -x¥ÎMjÃ0†á®uŠÙÂHŠþ ”BÜb4Ç.‘ÝJ2´· Gèöáãåã½”µƒqñ¥WÈ9¼ãl=#»`5GÎsDD5ê(ꋪlìXš!—„Æp°!e$2NÂÚ2{ç9†IÑÑ—½ÂøûW©emËñÛàõóÏîï­×•:y/o mò“‚7pBƒ¨†Ž«]þQ mw™`^¢Ïý§Ã¾A¡6ºê mT \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/a5/8ca3fee5eb68b11adc2703e5843f968c9dad1e b/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/a5/8ca3fee5eb68b11adc2703e5843f968c9dad1e deleted file mode 100644 index 1c3f2fb016b9cce630dede39bfb35d2656ea1069..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 28 kcmb7v1BkbFfcPQQAo?oNj20fsVHIa305yTBmc_$+xtVR>B-A{ zEl!-hhor~|tY{?@&n1U)Ki_n9qdhxx19PXf-YP>Dga-80D|_o?exDe`59bsg{NH0L2wOH+8Z=fdBvi diff --git a/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/a9/020cd240774e4d672732bcb82d516d9685da76 b/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/a9/020cd240774e4d672732bcb82d516d9685da76 deleted file mode 100644 index 61741aff9f8cea6cf5cf8e78cf20ef4ff0c97db3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 26 icmb22BP z<9mmvj~lzb?4vI{_%Uzo85Bil3^^0v9yQ{0((~Goe?_Ku=~sc&dCfCi8t-TD0?Rr! PXus3LZJK@nIM`+;ML207 diff --git a/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/ab/e4603bc7cd5b8167a267e0e2418fd2348f8cff b/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/ab/e4603bc7cd5b8167a267e0e2418fd2348f8cff deleted file mode 100644 index 4e4fe6f12..000000000 --- a/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/ab/e4603bc7cd5b8167a267e0e2418fd2348f8cff +++ /dev/null @@ -1,4 +0,0 @@ -x¥KNÄ0DYç½›Ùî´?Bì8D»ÓžÉHNÀqÜžŒFœ€í«ª'•¬µÎÐƇÞT!‰`*Â<±+,YÑZ -%LÞˆóÆÙ„ýðÅM—ì“–X$çÄNÈ$S.cq89 -š‰ìDÞš¿¾¦ìo{¢ìxŠFL)Æ”‰ÅÄÈÁ}ÞûemðÁò½ëïÚê¼]öŸ ^®wv~Ûz›¹ó³¬õ,&?Ži„GãŒz\ëú/Éð©í¬/rSåíž`^ú -õ=Ý£áX¾fZ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/b8/26e9b36e22e949ec885e7a1f3db496bbab6cd0 b/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/b8/26e9b36e22e949ec885e7a1f3db496bbab6cd0 deleted file mode 100644 index e3bf3a01792dba130f6e8e3cf42cbbd464dda045..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 108 zcmV-y0F(cC0V^p=O;s>7G-NO|FfcPQQAo?oNj20fsVHIi$v^k>twU#?o)JrS6XTOS zooV;w1(G5ou%a;gl;Xv${WEv)#ZNw#5U6*#Pc9!xkug}&BjcTK9lEBzys|C+P5og{ O=cQryHUR*2`!Iay^D;vK diff --git a/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/ba/fbf6912c09505ac60575cd43d3f2aba3bd84d8 b/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/ba/fbf6912c09505ac60575cd43d3f2aba3bd84d8 deleted file mode 100644 index 956da8b71ca61f3604dc70fab9e9f761eff72946..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 175 zcmV;g08syU0j178Zo@DPK;g_f1@{02^<&8ff}mT_+=8K~#zAbQ5T-pb{RYl_@Z6J$e@)fHxU3uvk&k9 diff --git a/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/bc/4dd0744364d1db380a9811bd264c101065231e b/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/bc/4dd0744364d1db380a9811bd264c101065231e deleted file mode 100644 index 01d88a283d1f7ae6df24aef5d3e0d79533e0b9ec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 55 zcmV-70LcG%0V^p=O;s?qU@$Z=Ff%bx$S*3$NX*kKsVHHXb9(ky9!B}Ay{A{D-k(_g NeX3<)Jpgb!5}-}h7dZd` diff --git a/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/bd/65d4083845ed5ed4e1fe5feb85ac395d0760c8 b/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/bd/65d4083845ed5ed4e1fe5feb85ac395d0760c8 deleted file mode 100644 index 6a0eccb5e..000000000 --- a/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/bd/65d4083845ed5ed4e1fe5feb85ac395d0760c8 +++ /dev/null @@ -1,2 +0,0 @@ -x¥ÍA -B!€áÖžböAŒ6ŠBD» [¨o^Ï@$ݾ¡í·øÿÜj-Ú›ƒtf ä]²#““ã":dKiõ‹ Æû51S@RqÊÖ:7G-NO|FfcPQQAo?oNj20fsVHHPJbGNAASA&%^Mo(Q@^HDI z>DpTlAt^EfD_Y6KbIGCH&o^D&XwMGaz}#uAx5|(d8G{w+tl6__e?`31A;TAeGd!=X NwaC=h0RV)BD<)fqFmC_= diff --git a/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/ce/d8fb81b6ec534d5deaf2a48b4b96c799712507 b/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/ce/d8fb81b6ec534d5deaf2a48b4b96c799712507 deleted file mode 100644 index 569ee0c99..000000000 --- a/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/ce/d8fb81b6ec534d5deaf2a48b4b96c799712507 +++ /dev/null @@ -1 +0,0 @@ -x¥ÎÍJÅ0@a×yŠì…Ëä?] ¾Åd2i+7¦)èÛ[ðÜ~‹Ã¡ÞÚ6¥öîafY–’ÏÕH1„ì¼K%¢+E!…(>qð>¥q”µehMÁ„”}ÈP˜”!ò:ÖCxεùŽôuò!ßx´íXÏŸC>}üÙòṟáÄõö,•IÞç‚“ Ä¥×êäEÄë9{ã±0æ;KZq_®¾ËºÝYÝæ÷¿t3V \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/cf/c4f0999a8367568e049af4f72e452d40828a15 b/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/cf/c4f0999a8367568e049af4f72e452d40828a15 deleted file mode 100644 index d7deb0bff1a0edb85ea5556fa508b7ca3b1d4c97..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 180 zcmV;l089UP0j17OYQr!PK;f=+irELk=+7QODS<2ky~Rix$1aiGN;0&!uOUas_ANeM z+DchE7*B7#iU1jkNXeUQQe=z48$m&&X~1ZF^pP<;&FY)0tR2GOgl%SYE(av5Ni$L8 zVMLuJi1p)0adL|HK5rF1IsNR?;3l;!ZQlPHynj90{nC0}xbrz}>rtNsBbv{SVElvafR diff --git a/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/d0/f21e17beb5b9d953b1d8349049818a4f2edd1e b/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/d0/f21e17beb5b9d953b1d8349049818a4f2edd1e deleted file mode 100644 index 65c846fa4..000000000 --- a/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/d0/f21e17beb5b9d953b1d8349049818a4f2edd1e +++ /dev/null @@ -1 +0,0 @@ -x¥ŽAjÃ0E»Ö)f_¶¤‘,¡]z‹‘<²]"«•ÇÐÞ¾‚!Ëÿø<^ª¥lÚá‹4fÀì=iM0HÉir: š<kiFGž§hI}Sã] õ™ã4FÇ qfÊšlÿÄà’Á¯è”µ6ø¤ôsòÜÊv¬çßׯ[Þi ]R-7è ÎÄ áuÐà:í©ÂOIÔû)µp[˜â!­´/=§î·;ë‹üŠú&éWY \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/d3/d77487660ee3c0194ee01dc5eaf478782b1c7e b/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/d3/d77487660ee3c0194ee01dc5eaf478782b1c7e deleted file mode 100644 index b42df7e50..000000000 --- a/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/d3/d77487660ee3c0194ee01dc5eaf478782b1c7e +++ /dev/null @@ -1 +0,0 @@ -x¥ÎKJ1€a×9Eí…!ïI@df%x‹ª¤ú!“Ž¦«AooƒGpû-~þÒ[[l O2˜AW﯋ 6‘ŽÑÄRÙ‘Õ=yFW ¥ƒúÄÁ›@Õ“5l®Ä(×™šœÏÚçdúÉr­†²ôïX¾ÞáG[÷åøÙáåãÏæÛ.cEÁKéíŒËÑ»²…gmµV§ž«ÂÿŠ¨û!½ñ˜éÁPÜæs§o0­vùõ *Wd \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/e2/33b9ed408a95e9d4b65fec7fc34943a556deb2 b/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/e2/33b9ed408a95e9d4b65fec7fc34943a556deb2 deleted file mode 100644 index b344c9cc8a2251f512f3324e4085fc06792bbd05..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 31 ncmb7G-NO|FfcPQQAo?oNj20fsVHIaC^0#8u2Q+HVB#YsHo+^O zxXQvNASp5eD|#wn{a51gf@Kqb-F@`oY9e>BhOQx!B4e;3hgs5ZBKDh_^mQj~*WP*X NOU&1$?Eo1oF8cCFFR%ar diff --git a/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/e7/811a2bc55635f182750f0420da5ad232c1af91 b/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/e7/811a2bc55635f182750f0420da5ad232c1af91 deleted file mode 100644 index 2388730252b02727e7edf3e4a0e4fb35ac4e3f8a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 107 zcmV-x0F?iD0V^p=O;s>7G-NO|FfcPQQAo?oNj20fsVHIa305yTBmc_$+xtVR>B-A{ zEl!-hhor~|tY{?@&n1U)Ki_n9qdhxx19PXf-YP>{MRzh7dB`mQ00?Xi8vp@A1VvX)jaD5bYRARn<-R&6>oi7E1Wp}Zqnc=wajhWZVf)ZpX~b8dY!rRds@pU3?@1v6D+|i tYDBfueYMN~BNpB87g1-aSAntek|sD5ZhPJA>fSJHwnSib-O diff --git a/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/f2/ec8c8cf1a9fb7aa047a25a4308bfe860237ad4 b/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/f2/ec8c8cf1a9fb7aa047a25a4308bfe860237ad4 deleted file mode 100644 index a0117515ce7c973c3b64f74e5cd741c8d45b2a59..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32 ocmb7G-NO|FfcPQQAo?oNj20fsVHHvI1trZ*DO_6I=8vJ`%miy z=0`HFNQ#WWidHi5TyiM)^G#Pb+OtD9Fn3z(tuiD<#$ZJ{Yxb<#UlA{L$nZtr49_cT MEi(0W0LmRJ?DkSF3;+NC diff --git a/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/f9/0f9dcbdac2cce5cc166346160e19cb693ef4e8 b/vendor/libgit2/tests/resources/cherrypick/.gitted/objects/f9/0f9dcbdac2cce5cc166346160e19cb693ef4e8 deleted file mode 100644 index 71be9f8344cfa96b5507c6838810363e0ec86ead..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 31 ncmb%isZfQxH zMN)n)!aW4sB~m%P;Ntl&>A_2Dw=YN&ogF4{E6<974P+k3RS5UM+=s(m;x*^epEedh z+8|%MQRUpKeTK~!=Xf&kLCit8ifDI9w3@Joo`3qNN5iy2vSPQ)o0rnI{0#g_nR$st zmAWwRg55_{_=~L1KcBmB+BebbXBTB|jgIje;yxh!+)D&O<0^=4IUNG}uG)$a<0VRG#SAA$+c{=#k;k3Eu z7d+`yjNnb0cbq{S(_Cn>0lD`e$SfF*-CV}!e5@KBOVxzI!aGz4fKG5K2fqFmiK>*cp)H*efI=l1%eRjr;smN0N*CIBMM6LBnW z`(wKKxYSa&$3Nq?-m>Xk+vCU}fMg!LydcVb()?eS+Dq=gwDsM>U7<`h{r}(`lIn`;}uj&qdjq!OTsKdYy zH3#l0qT`d{+1y97H(k8u?A@)ot~~0-p(j1T6B#(GQj79+lPXJ68A5_wU4d?qVlcE+ zFyQ*M-SzsHT0t+XY{TW-G@i*d_)0|txrPF32Sz)zJOC=@^-3yA7z_;z%uGxe3}6gw zITM>0nt3=(!}8;HYw*zzGZv5b42>NBi2ak;fhd@KmpVZ4#` GmlFVw-yjhH diff --git a/vendor/libgit2/tests/resources/crlf/.gitted/objects/04/4bcd5c9bf5ebdd51e514a9a36457018f06f6e1 b/vendor/libgit2/tests/resources/crlf/.gitted/objects/04/4bcd5c9bf5ebdd51e514a9a36457018f06f6e1 deleted file mode 100644 index a32a9b282..000000000 --- a/vendor/libgit2/tests/resources/crlf/.gitted/objects/04/4bcd5c9bf5ebdd51e514a9a36457018f06f6e1 +++ /dev/null @@ -1 +0,0 @@ -x-ŽÁjÃ0D{ÖWì½4H+Ù+C(É¡·þ„¤]aÓØJU…|}•˜Ã̃“ʺ. к·VE@²æÄv™ÑÈ”²ËvB½x=%‰êªl ÈsDÒÉx÷H¦!x3E9ÅA‡hPÆdU¸´¹Tøâk¨ {éký+ÛAžàµv©¬Ÿ`¬ŸŒC2|h¯µê´ŸlRá{Ù~/Ë]`zµÃ-Ì¥<ÄÝüÓ]×MÄ5¼?]ud†»ÔñÖòrõÄ&K! \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/crlf/.gitted/objects/04/de00b358f13389948756732158eaaaefa1448c b/vendor/libgit2/tests/resources/crlf/.gitted/objects/04/de00b358f13389948756732158eaaaefa1448c deleted file mode 100644 index c3b7598c071994569e9954e5249374cd54d059a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 28 kcmb4GiER}FfcPQQAo_m(M>MONz*MYNwZ+!TAt_bt2+DoLA&j0 z3oUajWVgn2ASr|?t2vkcw6XZn2Km~JD(6=1Gi<&%#}le7DKjszs8SbZEJLdad+7P6 zk9ssrDr-}x;|H=`=d&8$dG(FM98 zxrjl*H1ueCZt2;EYqJCPZTzyeJEO5@p&Yu q165a*T9mJwR9TYB@NDj**_$q2bN24mTvr}-7F=8+@FfcPQQAo_m(M>MONn=>K=*2`E*?k&9zm7iJ@?go{ zSl-AqBsD-4mD39@p8t{_ytH=vf;7?DVFI`Ete`4#^NUg;#_)e#YA?C}($;qicZD)d oJyI%~-r0_<2xtz=J%-H@AB{Vww1*WdM!Z_}exXYb04_5;YpzQ?d;kCd diff --git a/vendor/libgit2/tests/resources/crlf/.gitted/objects/0e/052888828a954ca17e5882638e3c6a083e75c0 b/vendor/libgit2/tests/resources/crlf/.gitted/objects/0e/052888828a954ca17e5882638e3c6a083e75c0 deleted file mode 100644 index 746143f85fbceb0f63fe7c4f6adfec3383afa43a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 107 zcmb0{37MT5%ubAoQ@dTYz(`>&5B1@+fN|hH%s!!aS|GO;z*0+-u_f^i9 z_Mgt_vz(XKyG;6*0N2yVU*X+Ri>$72ZFS2Hu+8#b#Uz@4X!ZxSJ)AH~EMF}D+wQ&n HOg;So;|(x` diff --git a/vendor/libgit2/tests/resources/crlf/.gitted/objects/0f/f5a53f19bfd2b5eea1ba550295c47515678987 b/vendor/libgit2/tests/resources/crlf/.gitted/objects/0f/f5a53f19bfd2b5eea1ba550295c47515678987 deleted file mode 100644 index 5366acd8c00ad78fdfe9f536f09cf6b540e491b9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 29 lcmb5GG#C{FfcPQQAo_m(M>MONn=>K=*2`E*?k&9zm7iJ@?go{ zSl-AqBsD-4mD39@p8t{_ytH=vf;7?DVFI`Ete`4#Gb>V4baT>xMloEJtNUiX{I=}o zjXUSuUVpTz)$_*^Ol1&D9n0JPm~K8UwbbqL&$z9(Y*^aCT=ropl44Wf98h1`<4=YxTc(v;NLYE!@<*i^c2jO2d diff --git a/vendor/libgit2/tests/resources/crlf/.gitted/objects/16/c72b67861f8524a5bebc05cd20472d3fca00da b/vendor/libgit2/tests/resources/crlf/.gitted/objects/16/c72b67861f8524a5bebc05cd20472d3fca00da deleted file mode 100644 index e2b199458a2a0ae90b13e311605757afb96c772d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 64 zcmV-G0Kflu0V^p=O;s>7G-NO|FfcPQQ7B0*E-}6Fl8__FfcPQQAo_m(M>MONn=>K=*2`E*?k&9zm7iJ@?go{ zSl-AqG&Q=VC21B6T+8#^eN|^)KWMjIZJ}k3h3wXt4kU#@qbjEtTs;3JJ$PyD_62F8 zv%>^#+{d&E}ZsF^!nLFnOmb{{LXJ#x*1hrZe~Slif&FC(ANwK zrlCjEb4$-QT$>%RZ{wG(9Y^Q9#;F<-OshULuRI-m>u}oK^9!DIDn{@o%{va&f^70d zxw>!G%WunW-netl?e#~iT0MU(!Bhq@(y_elkLl*)QcK+)|BTyu%cgg2k0VTNeo-n! z5&zev_LBQAZGE?JS18leBc-D0o$cs~Ai?^Inb#)gjiN&4n`JXj?OM7elwVX3StT%( zSne@wj`(QYIi)?USTW+&s`m?BdQg=>jJnhDc>iCOOq<+OO&kevR>YB&Y*bSCv|n kubWg^lFIOG?xWe8E?#r??$%sa9(Ci;lb+y-05wtiqQal$0RR91 diff --git a/vendor/libgit2/tests/resources/crlf/.gitted/objects/20/3555c5676d75cd80d69b50beb1f4b588c59ceb b/vendor/libgit2/tests/resources/crlf/.gitted/objects/20/3555c5676d75cd80d69b50beb1f4b588c59ceb deleted file mode 100644 index 8038a9b10bc3b9af4e1e4a198291456e74566343..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 36 scmbqt<@26Ut=b!7I)bR3s>UCOQ_Yo^Y)g6w504Ajn00000 diff --git a/vendor/libgit2/tests/resources/crlf/.gitted/objects/23/f4582779e60bfa7f14750ad507399a58876611 b/vendor/libgit2/tests/resources/crlf/.gitted/objects/23/f4582779e60bfa7f14750ad507399a58876611 deleted file mode 100644 index 4a4e4dc9e6538d5a2b15feef79c8c1e4cfc1668d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 219 zcmV<103`o-0Zoq0PQx$|ggNIa_KsSu|6{2_CS z!J|bTg*4h*FVPt_FmV@dEtLu%dHTNPABMyAk&gF}O4-LU?$hN3gce#Up@e~F>=C;a ztPdMkc%vm$f>SEvTqZd1YTVM1|G=YdrcI-ik;WMfJJhSDdnJM)UwMWlw*+ID?(lhf V-}Mkvs569V<-Gjgx?k|gSZ$FwZKwbM diff --git a/vendor/libgit2/tests/resources/crlf/.gitted/objects/2a/d3df895f68f4dda6a0a815c620b909bdd27c05 b/vendor/libgit2/tests/resources/crlf/.gitted/objects/2a/d3df895f68f4dda6a0a815c620b909bdd27c05 deleted file mode 100644 index f5421cf6a0d6e21d8dbdcfa292999ae7ac44ea7d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 462 zcmV;<0Wtn~0V^p=O;s>6F=a3`FfcPQQAo_m(M>MONn=>K=*2`E*?k&9zm7iJ@?go{ zSl-AqBsD-4mD39@p8t{_ytH=vf;7?DVFI`Ete`5AGV>CPDs|z8wVJSpo`3qNN5iy2 zvSPQ)o0rnI{Fq9CX0FdapSy6{H__{77iDgZj`2IcW$9*Ag}Ip(sVTZSX+T#pD42#G zP0uYo+i-1mz`l)Nwssty^BSjWh__aKXkK|b_}1aHx#t%==~Rs1O`3NcswFM8T(`6& z%|bUhBeAF$tX!|8qJ)8uRimS+YpTz}x`?LaKAS8KyV3*LwdACMHGH`gU76cvQN+5` zv$6DA-o%Sf8M2@nauf3^v08FA+&@Ztl}}}We~0;YgJ0Z&_x{bqp$BTqtQ=G0e;;S< z&3n_AsE{2KI77SPCQJuX7+sXB`)0lTw(RDOJLlY9f3&LA^T!fQWstyeEN}Z`y7{=& zQn$xH0R672veJ1lnPPA|8=Ro>n2r}q%u64`)Ky2i`SgJyEWI9N8LE|q$hYH0Fwd; Eqk5(BVgLXD diff --git a/vendor/libgit2/tests/resources/crlf/.gitted/objects/2b/55b4b94f655c857635b6a9005c056aa7de3532 b/vendor/libgit2/tests/resources/crlf/.gitted/objects/2b/55b4b94f655c857635b6a9005c056aa7de3532 deleted file mode 100644 index 031fd6681..000000000 --- a/vendor/libgit2/tests/resources/crlf/.gitted/objects/2b/55b4b94f655c857635b6a9005c056aa7de3532 +++ /dev/null @@ -1,2 +0,0 @@ -x-ŽKjÄ0D³Ö)z2tëcµa³™].¡O ›ÄV¢È„Éé£ µ¨zð RݶµƒÖøÔ›AvyIfLiò.²Ï…œPɘL0dÑõšì<ç¨=&b{Oñ.09o4Åœ¢ÃIË”Œ -G_jƒkþ -ÃYÆÚ¾ë~‘ðX§T·W ãØ°çÙ NˆjÐq²Kƒ·uÿ:Ö_óÇ£]na©õ.ž–÷áZ²Zk7!<#W½°ú²F \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/crlf/.gitted/objects/2b/d9d81b51a867352bab307b89cbb5b4a69adfe1 b/vendor/libgit2/tests/resources/crlf/.gitted/objects/2b/d9d81b51a867352bab307b89cbb5b4a69adfe1 deleted file mode 100644 index 96d952e855d00125a1156aa71296fdc6c5e0315c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 336 zcmV-W0k8ge0V^p=O;s>4F=j9{FfcPQQAo_m(M>MONn=>K=*2`E*?k&9zm7iJ@?go{ zSl-AqBsD-4mD39@p8t{_ytH=vf;7?DVFI`Ete`5AGV>CPDs|z8wVJSpo`3qNN5iy2 zvSPQ)o0rnI{Fq9CX0FdapSy6{H__{77iDgZj`2IcW$9*Ag}Ip(sVTZSX+T#pD42#G zP0uYo+i-1mz`l)Nwssty^BSjWh__aKXkK|b_}1aHx#t%==~Rs1O`3Ncss-8Pi*j|} zte4-G-Mn$vRd6#@Oua*tti#7E=KDeYm!iV?3?y6vSctcFfcPQQAo_m(M>MONn=>K=*2`E*?k&9zm7iJ@?go{ zSl-AqBsD-4mD39@p8t{_ytH=vf;7?DVFI`Ete`5AGV>CPDs|z8wVJSpo`3qNN5iy2 zvSPQ)o0rnI{Fq9CX0FdapSy6{H__{77iDgZj`2IcW$9*Ag}Ip(sVTZSX+T#pD42#G zP0uYo+i-1mz`l)Nwssty^BSjWh__aKXkK|b_}1aHx#t%==~Rs1O`3NcswFM8T(`6& z%|bUhBeAF$qMVOaqob*7s?Wl@h^FK|n=B5y(gWC)10Db6Qgmf*n?(`pQqRWHYk3nd zK4r*)D$Y&JtHdz;Y`A}v_9~ys0RIm2?FPTN1@HZvi9o zCUAy!!%diKq%gTCSNF|&`EA+F8+XpRz5ZxbtLKj;n93l&b1ZNBW4igc)Ka&{KjXIE zvguvh;|NomUz7?_#Q$}vz2yE&Ti-3*70NXANU3OgXFIYYpwn3HF>H?bXxuraJ*-$U x;?=763tf7kN~%(e@^zCcOHvu0&3!a`)5UAf-rbt(%A;-^deRd-5dgx#0&PLZ?N$H) diff --git a/vendor/libgit2/tests/resources/crlf/.gitted/objects/33/cdead44e1c3ec178e39a4a69085280dbacf01b b/vendor/libgit2/tests/resources/crlf/.gitted/objects/33/cdead44e1c3ec178e39a4a69085280dbacf01b deleted file mode 100644 index 72dc780a06a277add6ad40c64246e094d45eb5c1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 221 zcmV<303!c*0ZooOZo@DTL{sY&+XpuI(eeWrfm0+^O6LIUB?$_)#Dt7N1&;5flX-lJl61OMM7rNRX4rMv1c*{v3j`EU^2c8m9(^(RqtD86seTW0<~g!%u|6^^uNu%BAeNjQf0f0olu5YpEr|vv5Lm zD_9@4Sm7-!R0EuH8Rs&=A+E+P9pfK(w9T|>v_^&A7}$w^)pV~RKpL)bhGl3OMw;&M Xd3xVD;7oM}npPf{|6BJ9E1y`>DBos_ diff --git a/vendor/libgit2/tests/resources/crlf/.gitted/objects/38/1cfe630df902bc29271a202d3277981180e4a6 b/vendor/libgit2/tests/resources/crlf/.gitted/objects/38/1cfe630df902bc29271a202d3277981180e4a6 deleted file mode 100644 index 0cf707296e6387ddd83ed274456f93f0fd082509..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 25 gcmbR diff --git a/vendor/libgit2/tests/resources/crlf/.gitted/objects/3f/96bdca0e37616026afaa325c148cec4aa62d04 b/vendor/libgit2/tests/resources/crlf/.gitted/objects/3f/96bdca0e37616026afaa325c148cec4aa62d04 deleted file mode 100644 index a204fc98328eeb9d2982f78f256abac4ae829286..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 164 zcmV;V09*ff0j17C3c@fDKvCB@MfQSB(wQ^?5y6GvEhfoCE7oe7F1)=3kKpz#K0i(4 zI5cfLw`o;GWAv7Ca%fX@5(9$+A&kXm7p(UsieLa#FRt=z8W3a3ltL^dF=sMD203u& zka{q_fGbXn;-%fDsxO@0i_H2gbsXl~@|pGi{uQs~BI@)IuIdZyxJ;Rw2v6kz diff --git a/vendor/libgit2/tests/resources/crlf/.gitted/objects/41/7786fc35b3c71aa546e3f95eb5da3c8dad8c41 b/vendor/libgit2/tests/resources/crlf/.gitted/objects/41/7786fc35b3c71aa546e3f95eb5da3c8dad8c41 deleted file mode 100644 index ec57bdeba5e506e741354d77acdcb22472929fb2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 36 scmb0WSRzqyPW_ diff --git a/vendor/libgit2/tests/resources/crlf/.gitted/objects/47/fbc2c28a18df0dc773276a253eb85c7516ca50 b/vendor/libgit2/tests/resources/crlf/.gitted/objects/47/fbc2c28a18df0dc773276a253eb85c7516ca50 deleted file mode 100644 index d16db963350a363f848c5edbb98d186df2a9d264..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 36 scmb diff --git a/vendor/libgit2/tests/resources/crlf/.gitted/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 b/vendor/libgit2/tests/resources/crlf/.gitted/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 deleted file mode 100644 index adf64119a33d7621aeeaa505d30adb58afaa5559..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15 WcmbyHaR2}S diff --git a/vendor/libgit2/tests/resources/crlf/.gitted/objects/68/03c385642cebc8103fddd526ef395d75678a7e b/vendor/libgit2/tests/resources/crlf/.gitted/objects/68/03c385642cebc8103fddd526ef395d75678a7e deleted file mode 100644 index f8d489fcb..000000000 --- a/vendor/libgit2/tests/resources/crlf/.gitted/objects/68/03c385642cebc8103fddd526ef395d75678a7e +++ /dev/null @@ -1,2 +0,0 @@ -x¥ÎKjÄ0ЬuŠ¾À},µ !dÉ &h·ZØ0²‚¬ÁäöQvÙgW¼‚¢¸–²u°ŸzËÚå9OAH¢v£ ÓB¬ØhÉ9!õEMö}œÑcžfÔ˜52vÙ%ëmä` /¬èÑ×Úà=ÔÜÖZŽºÃ‹ ýMoeãVšû3×ò -fr1ƒpÑ“Öjè8Úåêšäí.œ[_¡Ðþ Ÿ·K^©@ûèåükêÑ¡Yj \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/crlf/.gitted/objects/69/597764abeaa1a403ebf589d2ea579c6a8f877e b/vendor/libgit2/tests/resources/crlf/.gitted/objects/69/597764abeaa1a403ebf589d2ea579c6a8f877e deleted file mode 100644 index ee4f4273d..000000000 --- a/vendor/libgit2/tests/resources/crlf/.gitted/objects/69/597764abeaa1a403ebf589d2ea579c6a8f877e +++ /dev/null @@ -1 +0,0 @@ -xÎÑÂ0 €až3…ßOwr“&­%„`†NàÄŽˆ -JÃ!¶1|¿þ´Îsi`ݸkUÈ¢r.*{z¤‘Ägr>ɱcòbn\ui êcæ.x"’‚DÎ,–ÞN“Ã,†ïí¼V˜þu©Õ’.umgØëÌåzLÛïãü=@×[kðƒ¢IŸÇ¦ßismbY¸>!—«næJ“LÅ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/crlf/.gitted/objects/6a/e3e9c11a51f0aabebcffcbd5c00f4beed143c9 b/vendor/libgit2/tests/resources/crlf/.gitted/objects/6a/e3e9c11a51f0aabebcffcbd5c00f4beed143c9 deleted file mode 100644 index 6c18a3ad253e28c4fc65e876a0226a548f416c47..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 87 zcmV-d0I2_X0V^p=O;s>7G-NO|FfcPQQ7B0*E-}$8˜Ð1ÛìeU eÃú órÓ}ø.Q¯ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/crlf/.gitted/objects/77/afe26d93c49279ca90604c125496920753fede b/vendor/libgit2/tests/resources/crlf/.gitted/objects/77/afe26d93c49279ca90604c125496920753fede deleted file mode 100644 index a377cb04d0ce55637b35067787115e38bce08718..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 178 zcmV;j08RgR0i}*h3IZ_@L|x|;eE~JUPBJ1Qf=hAZ1!AWM1!H6;GS@dF-oQ;!^$Loj zlJmWSc6Lz*W>A5g@r0?1*XWp&)=gEgl9HmR*^y;SC|+^kX9Y(XI*-107&|YcBa)uH zBGa3sQMWmz=t?5K>#YoMOj8^ZTy7qiF&~x^d@E#AHf~rol8t^y`h%-8}~m*QXfg z0=zSal8FEVYGV~~6-FTlweGZZWKk1RkaX*;7ub%>ZDmRsF5%^JfSxMFH7x`E#ZHY+ z@eEwHMsjYgffH&(R&6~kl;Jur&u#t?^pAZFZ#Sj%3!CX)Tg84Fk>(@FfcPQQAo_m(M>MONn=>K=*2`E*?k&9zm7iJ@?go{ zSl-AqBsD-4mD39@p8t{_ytH=vf;7?DVFI`Ete`5AGV>CPDs|z8wVJSpo`3qNN5iy2 zvSPQ)o0rnI{Fq9CX0FdapSy6{H__{77iDgZj`2IcW$9*Ag}Ip(sVTZSX+T#pD42#G zP0uYo+i-1mz`l)Nwssty^BSjWh__aKXkK|b_}1aHx#t%==~Rs1O`3Ncss-8Pi*j|} zte4-G-Mn$vRd6#@Oua*tti#7E=KDeYm!iV?3?yI@2sDf1`ZZR2;Nf2&|?JRox25|(o&*Ihh z$yVz+fP#M-O%-gEL~~42v}Fq9Im|i>2FZjzQFcWbF|)aG)9V0NPI1nMsY}sDq{xNY zQ4s4VQSr=?GJ3=NShfZqEI+$;xM-_uU-o;4*RMbOeCwmFJorVndIsw$p?Bfr;283V(>{VDOM=X%u83~dNgzOqnWE7&0O5Gh#3_FfcPQQAo_m(M>MONn=>K=*2`E*?k&9zm7iJ@?go{ zSl-AqBsD-4mD39@p8t{_ytH=vf;7?DVFI`Ete`4#Gb>V4baT>xMloEJtNUiX{I=}o zjXUSuUVpTz)$_*^Ol1&D9n0JPm~K8UwbbqL&$z9(Y*^aCT=ropl44Wf98h1`<4=YxTc(v;NLYE$>lB(3AeBGqVl2nFg db05v#bn%+Acem!c@~9h!p7aDy1OVRYaVs`ob4LIG diff --git a/vendor/libgit2/tests/resources/crlf/.gitted/objects/a2/34455d62297f1856c4603686150c59fcb0aafe b/vendor/libgit2/tests/resources/crlf/.gitted/objects/a2/34455d62297f1856c4603686150c59fcb0aafe deleted file mode 100644 index 7d204f4c875a651752db9252897548e9751b5f6d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 189 zcmV;u07CzG0iBM$Zo)7WMw$H-cSlA3yS5`C1PfEg@&MP)jck#`Z7@Rg>6@VgGux+g zbfhoUX(|o0vzxXsLo%$C*E%2$gLX3Z+FKR65GX0@e6rlJHzdAk;du=sVzjZdgF{RK zy)zgcby8xI=!ksJ28|YUZ@Dh;S>~U6`DNIT|LgdqTqt<@26Ut=bvkx)bR3s>UCOQ_Yo6A)mDz(043!Q%>V!Z diff --git a/vendor/libgit2/tests/resources/crlf/.gitted/objects/bb/29a7b46b5d4ba3ea17b238ae561b81d59dc818 b/vendor/libgit2/tests/resources/crlf/.gitted/objects/bb/29a7b46b5d4ba3ea17b238ae561b81d59dc818 deleted file mode 100644 index a08789b54d36d2eec62f94d96cd643e953f3612e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 170 zcmV;b09F5Z0fml1PD3#a1zG15xd6zCV>^)$>V_L|fy8kHi{D>;QgQu8fV%B+o;0JU z`?h^eA2B@5!^}ewiLqH}EG^|e3|lBzxI-MBkPyHuvAfj6&eO9}EUA@lF{qXPorykwE+M?}yKcDP(_@@`$w>KY9Ghr|^FfcPQQAo_m(M>MONz*MYNwZ+!TAt_bt2+DoLA&j0 z3oUajWVgn2ASr|?t2vkcw6XZn2Km~JD(6=1Gi<&%#}le7EwvnMlx}iHVo@>JXuXn( z5(Yk2jgF?SsXhzqBASx>Y_d4)N)KSyl9LA3@a0l;Wp0~A5$jUV#?otf6E8kx$bxFf zP0XvrYRTDf|0wNMK9vFf9p>8&esK%l`!^GZ9;hv|a!if?eVny7?@eE#LUv5x4DE)S zFdg|tsYpTdika6Y=Z&I5=9^_RPVHK{C6r%O5LqQGZ0>YC-YI^sNltZ|_N%&sUt@e8 L3F-gÄ=ßR~ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/crlf/.gitted/objects/cd/574f5a2baa4c79504f8837b730fa0b11defe99 b/vendor/libgit2/tests/resources/crlf/.gitted/objects/cd/574f5a2baa4c79504f8837b730fa0b11defe99 deleted file mode 100644 index e8d0202463d9aa9e2cc11002ee58f5252229249a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 62 zcmV-E0Kxxw0ZYosPf{>3WAI5WDOM=X%u83~<$5%8^`n`q9?e|yXy!^@F4x2og|z(q U6ke_m^Ltx?cq%U!08z~r+MU}ScK`qY diff --git a/vendor/libgit2/tests/resources/crlf/.gitted/objects/cd/d3dacc5c0501d5ea57bbdf90e3d80176606139 b/vendor/libgit2/tests/resources/crlf/.gitted/objects/cd/d3dacc5c0501d5ea57bbdf90e3d80176606139 deleted file mode 100644 index 72cf3b0fda1d2c7311629261bbd8e1275aa19120..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 565 zcmV-50?Pe(0V^p=O;xZkFlR6{FfcPQQAo_m(M>MONn=>K=*2`E*?k&9zm7iJ@?go{ zSl-AqG&Q=VC21B6T+8#^eN|^)KWMjIZJ}k3h3wXt4kU#@qbjEtTs;3JJ$PyD_62F8 zv%>^#+{d&E}ZsF^!nLFnOmb{{LXJ#x*1hrZe~Slif&FC(ANwK zrlCjEb4$-QT$>%RZ{wG(9Y^Q9#;F<-OshULuRI-m>u}oK^9!DIDn{@o%{va&l9pNy z_Ly#RMq*JhSh-$FMF|5Rt42pt*HoW{brDU;eKuJfcBKcfYspCiYxr_0x-z%TqKI{= zXJhHLyonc|GGswDN`Sl;%>bn|hk zrEZUZ#%;Z2)4R6E5vDf3C>5fJ|LanF$^DnMzFW8}lxgabQqlCzc63FM1oDcR*CywU zqC)1IWiw9gTDm2aUsMoTB{05O?lEkR_-NcYr9G@zG2+##_X}NmP?bQ8y3_G^r}(`l zIn`;}uj&qdjq!OTr~_43m0Faqn^akn%J6LNquHA-UUT;D)?8N}b>q;Jp5Tc9=fg(b DK&m1x diff --git a/vendor/libgit2/tests/resources/crlf/.gitted/objects/d1/1e7ef63ba7db1db3b1b99cdbafc57a8549f8a4 b/vendor/libgit2/tests/resources/crlf/.gitted/objects/d1/1e7ef63ba7db1db3b1b99cdbafc57a8549f8a4 deleted file mode 100644 index 05d88fc8645aa8f991a418ec6ac102ca78bde4e5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 35 rcmb$JY^BUXk=Uyc(1B{~n8 diff --git a/vendor/libgit2/tests/resources/crlf/.gitted/objects/dc/88e3b917de821e25962bea7ec1f55c4ce2112c b/vendor/libgit2/tests/resources/crlf/.gitted/objects/dc/88e3b917de821e25962bea7ec1f55c4ce2112c deleted file mode 100644 index 3db13aa7988f331954a31832c2e29a78fe4b11dd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32 ocmb|?0<0C)mjfjDd`z<0%^4(qIO&q^>O^BAqObT?+hdR zwzUCv=BLqBfqaO_q>7f41{8|(A2qlX$pyBQ zi)4o>lT|Nl(&squ9Zp|*fz#+s-uphz@Srt-L_bvEb^c85f7I}#r;edo_Fc:D´&Rr.†ì1#÷ÎDõÇ“Ü¥,œ­H’î‚PÏ–}Á™€9rPGÅ6Ö ~ó“§ —±–¹Þa/ }«ƒü·Iµü€¶DÎx$k´ˆj¡ËØ&_Ö¨GÂæZ–¿×›ÌðÜ›Áñ|šÕ ǸUë \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/crlf/.gitted/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 b/vendor/libgit2/tests/resources/crlf/.gitted/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 deleted file mode 100644 index 711223894375fe1186ac5bfffdc48fb1fa1e65cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15 Wcmb7w`4FhFfcPQQAo_m(M>MONn=>K=*2`E*?k&9zm7iJ@?go{ zSl-AqBsD-4mD39@p8t{_ytH=vf;7?DVFI`Ete`4#^NUg;#_)e#YA?C}($;qicZD)d zJyI%~-r0_<2xtz=J%-H@AB{Vww1*WdM!Z_}exXYbR7q88QNC_cWl1W-v$>CEZ@PHR W*}GeFU3t`vLr;2wCjtNgYE5lVp-lz= diff --git a/vendor/libgit2/tests/resources/crlf/.gitted/objects/f2/b745d7f47d114a3a6b31a7b628e61e804d1a58 b/vendor/libgit2/tests/resources/crlf/.gitted/objects/f2/b745d7f47d114a3a6b31a7b628e61e804d1a58 deleted file mode 100644 index 7b2e7a11617389b0edb33ff0462df36752badf05..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 561 zcmV-10?z$-0V^p=O;xZkFlI0`FfcPQQAo_m(M>MONn=>K=*2`E*?k&9zm7iJ@?go{ zSl-AqG&Q=VC21B(`MC^S%k$iQRcBv6Xt!N$p=FMR?ADkLB(*@(DyJ7*JpUySS)r(an^kiz{b^(IqYd)48&%G&+Gp5&agHZcWm0BdVo{|o+=;Cw?4jqM zKI+jht&ptPE%WB3v@JiTQlRbY^Uvoloc2xh`q@R9TcczA&Tm<|8C79!W<_d>ZcZA| z?+gm2p-0nmOV2i3n;o!kn{IMOVo@bn|hkrEZUZ z#%;Z2)4R6E5vDf3C>5fJ|LanF$^DnMzFW8}lxgabQqlCzc63GXH1Ud=*CywUqC)1I zWiw9gTDm2aUsMoTG0-0@_ZT)ud^GNy(jHc<81ZV=`-Lt&s7m0b-RXF|Q~X|&oa!{~ zS9J%!#`ruE)PX9kN-fIQO{y$OWq3CC(d7Gh#3_FfcPQQAo_m(M>MONz*MYNwZ+!TAt_bt2+DoLA&j0 z3oUajWVgn2ASr|?t2vkcw6XZn2Km~JD(6=1Gi<&%#}le7H@_$q$-r04yf!&+6csYx tESqs^*U~Ma{Gx)$Dq$wx>3FNM?FbqBx3_&gHS0RVRAK%_12LXH3c diff --git a/vendor/libgit2/tests/resources/crlf/.gitted/objects/fe/ab3713c4659bb22700042b3c55b8d60d0a952b b/vendor/libgit2/tests/resources/crlf/.gitted/objects/fe/ab3713c4659bb22700042b3c55b8d60d0a952b deleted file mode 100644 index 8552c7bf73deb0ae1c6e2eeccad23be1de871c60..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 568 zcmV-80>}M$0V^p=O;xZkv}7MONn=>K=*2`E*?k&9zm7iJ@?go{ zSl-AqG&Q=VC21B(`MC^S%k$iQRcBv6Xt!N$p=FMR?ADkLB(*@(DyJ7*JpUySS)r(an^kiz{b^(IqYd)48&%G&+Gp5&agHZcWm0BdVo{|o+=;Cw?4jqM zKI+jht&ptPE%WB3v@JiTQlRbY^Uvoloc2xh`q@R9TcczA&Tm<|8C79!W<_d>ZcZA| z?+gm2p-0nmOV2i3n;o!kn{IMOVo@oi_;M+_GPlj5 zh;^xFW9hZLi5H(TWI;9LCgxRQwd8ELf0XtrpUMFL4)g5>zqkeO{hNtH57d@fIi|+{ zKF->k_ogpVAv-2;hIYeEm=2^cx+quo&3gH5+07ew&bht*XjQA{k0qGOAc5mp-uB0I z^Kq%AZjXP)ZM|jFySB#>rZ&GQ6{3j$>r#8k{g<}BTevHfY3h+u(e%!CbVcwq@`{<) zCg+W!Lgt%gGfwSVx+RofR1jG)Fv?l(F>H?bXxuraJ*-$U;?=763tf6pmB3BA)A4wx z_`N1M)oI$V>JEO5@p&Yu165j;T9mJwR9TYB@NDj**_$q2bN24mTvr}-|QC%3wWl;C0{qH`#Zi@?5=Pj9H)Aj~FfcPQQP4}yNh~fdNG!=nyIYp;out;?UH&P)!NdRv6!eNyOG+~H(u)~7 z8$O>p&>Wt3RYLE6;@+Ka>lo*#K+W;VEG|iO)~m?PVR-Iw#7vRRbkm-Nk$s!hPXF9~ zYQ6q zobXeFon>>CPqfG7U}ctBhEH>#YD0@ti@<6;n-rB+2XA>&5~r5J7Z@qi;cRgo;)mj* zWQM!F-;|f%=UeIS9J|c&(oFG787#jbvL!%E7_My7vfP#u|6|4ag%4-`6qs>aZwE8f wf{NmjqSVA(T|+$+JtMuW#3F`YeR@~9_pxpDl?|O~7P;lElU0ic0Dr=lBh^;0Z2$lO diff --git a/vendor/libgit2/tests/resources/deprecated-mode.git/objects/1b/05fdaa881ee45b48cbaa5e9b037d667a47745e b/vendor/libgit2/tests/resources/deprecated-mode.git/objects/1b/05fdaa881ee45b48cbaa5e9b037d667a47745e deleted file mode 100644 index ae7765a70894fcafa7c67eb054a36a415bb19c4b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 57 zcmV-90LK4#0V^p=O;s>4U@$Z=Ff%hz$j?cM&&^Ls)hnqeVX);acoR~8MDEAZ4&8e* PkF7nIxq`N^h0yHi`uo+k+<=1yCZOWSYrF7T&ZsAlNKZpI# z7}yi@@=G#Oi+~D)T!KD=)C0|#kE9RCL@|dc>BhhLx!Vl)T1kqq%@mNCry(iZfH7=7a>fx&n=1W6(8JFyLCW&gbA7u3wwPAIE$=b}`&IIf7XL E0L~UVAOHXW diff --git a/vendor/libgit2/tests/resources/describe/.gitted/logs/HEAD b/vendor/libgit2/tests/resources/describe/.gitted/logs/HEAD deleted file mode 100644 index fc49c6fa3..000000000 --- a/vendor/libgit2/tests/resources/describe/.gitted/logs/HEAD +++ /dev/null @@ -1,14 +0,0 @@ -0000000000000000000000000000000000000000 108b485d8268ea595df8ffea74f0f4b186577d32 nulltoken 1380209394 +0200 commit (initial): initial -108b485d8268ea595df8ffea74f0f4b186577d32 4d6558b8fa764baeb0f19c1e857df91e0eda5a0f nulltoken 1380209404 +0200 commit: second -4d6558b8fa764baeb0f19c1e857df91e0eda5a0f b240c0fb88c5a629e00ebc1275fa1f33e364a705 nulltoken 1380209414 +0200 commit: third -b240c0fb88c5a629e00ebc1275fa1f33e364a705 81f4b1aac643e6983fab370eae8aefccecbf3a4c nulltoken 1380209425 +0200 commit: A -81f4b1aac643e6983fab370eae8aefccecbf3a4c 6126a5f9c57ebc81e64370ec3095184ad92dab1c nulltoken 1380209445 +0200 commit: c -6126a5f9c57ebc81e64370ec3095184ad92dab1c 4d6558b8fa764baeb0f19c1e857df91e0eda5a0f nulltoken 1380209455 +0200 reset: moving to 4d6558b8fa764baeb0f19c1e857df91e0eda5a0f -4d6558b8fa764baeb0f19c1e857df91e0eda5a0f 31fc9136820b507e938a9c6b88bf2c567a9f6f4b nulltoken 1380209465 +0200 commit: B -31fc9136820b507e938a9c6b88bf2c567a9f6f4b ce1c4f8b6120122e23d4442925d98c56c41917d8 nulltoken 1380209486 +0200 merge c: Merge made by the 'recursive' strategy. -ce1c4f8b6120122e23d4442925d98c56c41917d8 4d6558b8fa764baeb0f19c1e857df91e0eda5a0f nulltoken 1380209486 +0200 reset: moving to 4d6558b8fa764baeb0f19c1e857df91e0eda5a0f -4d6558b8fa764baeb0f19c1e857df91e0eda5a0f 6a12b56088706aa6c39ccd23b7c7ce60f3a0b9a1 nulltoken 1380209496 +0200 commit: D -6a12b56088706aa6c39ccd23b7c7ce60f3a0b9a1 1e016431ec7b22dd3e23f3e6f5f68f358f9227cf nulltoken 1380209527 +0200 commit: another -1e016431ec7b22dd3e23f3e6f5f68f358f9227cf a9eb02af13df030159e39f70330d5c8a47655691 nulltoken 1380209547 +0200 commit: yet another -a9eb02af13df030159e39f70330d5c8a47655691 949b98e208015bfc0e2f573debc34ae2f97a7f0e nulltoken 1380209557 +0200 merge ce1c4f8b6120122e23d4442925d98c56c41917d8: Merge made by the 'recursive' strategy. -949b98e208015bfc0e2f573debc34ae2f97a7f0e a6095f816e81f64651595d488badc42399837d6a nulltoken 1380209567 +0200 commit: x diff --git a/vendor/libgit2/tests/resources/describe/.gitted/logs/refs/heads/master b/vendor/libgit2/tests/resources/describe/.gitted/logs/refs/heads/master deleted file mode 100644 index fc49c6fa3..000000000 --- a/vendor/libgit2/tests/resources/describe/.gitted/logs/refs/heads/master +++ /dev/null @@ -1,14 +0,0 @@ -0000000000000000000000000000000000000000 108b485d8268ea595df8ffea74f0f4b186577d32 nulltoken 1380209394 +0200 commit (initial): initial -108b485d8268ea595df8ffea74f0f4b186577d32 4d6558b8fa764baeb0f19c1e857df91e0eda5a0f nulltoken 1380209404 +0200 commit: second -4d6558b8fa764baeb0f19c1e857df91e0eda5a0f b240c0fb88c5a629e00ebc1275fa1f33e364a705 nulltoken 1380209414 +0200 commit: third -b240c0fb88c5a629e00ebc1275fa1f33e364a705 81f4b1aac643e6983fab370eae8aefccecbf3a4c nulltoken 1380209425 +0200 commit: A -81f4b1aac643e6983fab370eae8aefccecbf3a4c 6126a5f9c57ebc81e64370ec3095184ad92dab1c nulltoken 1380209445 +0200 commit: c -6126a5f9c57ebc81e64370ec3095184ad92dab1c 4d6558b8fa764baeb0f19c1e857df91e0eda5a0f nulltoken 1380209455 +0200 reset: moving to 4d6558b8fa764baeb0f19c1e857df91e0eda5a0f -4d6558b8fa764baeb0f19c1e857df91e0eda5a0f 31fc9136820b507e938a9c6b88bf2c567a9f6f4b nulltoken 1380209465 +0200 commit: B -31fc9136820b507e938a9c6b88bf2c567a9f6f4b ce1c4f8b6120122e23d4442925d98c56c41917d8 nulltoken 1380209486 +0200 merge c: Merge made by the 'recursive' strategy. -ce1c4f8b6120122e23d4442925d98c56c41917d8 4d6558b8fa764baeb0f19c1e857df91e0eda5a0f nulltoken 1380209486 +0200 reset: moving to 4d6558b8fa764baeb0f19c1e857df91e0eda5a0f -4d6558b8fa764baeb0f19c1e857df91e0eda5a0f 6a12b56088706aa6c39ccd23b7c7ce60f3a0b9a1 nulltoken 1380209496 +0200 commit: D -6a12b56088706aa6c39ccd23b7c7ce60f3a0b9a1 1e016431ec7b22dd3e23f3e6f5f68f358f9227cf nulltoken 1380209527 +0200 commit: another -1e016431ec7b22dd3e23f3e6f5f68f358f9227cf a9eb02af13df030159e39f70330d5c8a47655691 nulltoken 1380209547 +0200 commit: yet another -a9eb02af13df030159e39f70330d5c8a47655691 949b98e208015bfc0e2f573debc34ae2f97a7f0e nulltoken 1380209557 +0200 merge ce1c4f8b6120122e23d4442925d98c56c41917d8: Merge made by the 'recursive' strategy. -949b98e208015bfc0e2f573debc34ae2f97a7f0e a6095f816e81f64651595d488badc42399837d6a nulltoken 1380209567 +0200 commit: x diff --git a/vendor/libgit2/tests/resources/describe/.gitted/objects/03/00021985931292d0611b9232e757035fefc04d b/vendor/libgit2/tests/resources/describe/.gitted/objects/03/00021985931292d0611b9232e757035fefc04d deleted file mode 100644 index 4b98de8fbb610b4b0d059777d1e0dfb0575fed86..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 108 zcmV-y0F(cC0V^p=O;xb8WH2-^Ff%bxNX*MG$w)0?kd$BFv9u{`=9ki4>$`e7{s)WtG!-Jcit9d0@+sKc`{x<@8wQ5SgQ&99K3sSr z%3Fj42U=zJ-9U&Q50@io;{hFHAFvcDJ{4WGu<71(eUS-{^ZD@?en)^3r=-)6fFx+ZghXx3j z(M9wOsi5~Wfd~UE0+=u*i`hq$`L9=4r^xp9_^Q&P>5B4*&`gCZnWhCk_Ar diff --git a/vendor/libgit2/tests/resources/describe/.gitted/objects/2b/df67abb163a4ffb2d7f3f0880c9fe5068ce782 b/vendor/libgit2/tests/resources/describe/.gitted/objects/2b/df67abb163a4ffb2d7f3f0880c9fe5068ce782 deleted file mode 100644 index d0398e6e35843bd981cec5cab597cfe98a20641d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmblwFt{&6XD~D{Ff%bxNX*MG$w)0?@YkL5KoYi+yQ_Zq|tp5=$ mstQ$-mYI{v@Llr#6@#nV=TC%XId6KM8rE^SqYwZE+8%DJ{4W%rafMQPm0exi(5S_j`!{Fk-!L#Rsn@zrX^g+j z!7LFoWS_X$s6A2uvc?1?L`*T#VlqW0@5C1ew<)y(a^N$V1sHwwxj-q5!4*{;X;^#+ z*&2bzeD@*Sv2C+|xXC+L9&5T49u@cJtKz!dQm+rGEhwX+Q%+t_P~x=bN3{w7^S@F}(?p2SK4UhzoBoZYHyt87_g4cxnDg zVSo}bpitUM?l*1-m30`jx7J4)HfW8&&E# hERlM3??DJ{4WG`H$I@0US-{^ZD@?en)^3r=-)6fFx+Zghjz|f zMiaq_VZNY4b*dvHf5ej7pMo1z_VHVB> z2wBlFUajl>*tXH$vg?~v=_^k~dZq8 FM}&2eM&$qi diff --git a/vendor/libgit2/tests/resources/describe/.gitted/objects/62/d8fe9f6db631bd3a19140699101c9e281c9f9d b/vendor/libgit2/tests/resources/describe/.gitted/objects/62/d8fe9f6db631bd3a19140699101c9e281c9f9d deleted file mode 100644 index 734f7dc4297b667e4acfca190dffaab6fc015706..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17 Ycmb6VK6i>Ff%bxNXyJgW%w@n{))j>?eizXvYa=)P7Uk0+))UX jFV0L!Wl*xNF#9d}_nY^k%V!gdk1c8zk*@#%-#Q&|6`CU{ diff --git a/vendor/libgit2/tests/resources/describe/.gitted/objects/68/0166b6cd31f76354fee2572618e6b0142d05e6 b/vendor/libgit2/tests/resources/describe/.gitted/objects/68/0166b6cd31f76354fee2572618e6b0142d05e6 deleted file mode 100644 index 36f198686..000000000 --- a/vendor/libgit2/tests/resources/describe/.gitted/objects/68/0166b6cd31f76354fee2572618e6b0142d05e6 +++ /dev/null @@ -1,2 +0,0 @@ -xŒK @]sŠÙ›4¤|cGp0iBLP4#FT106p^x?k3GH!WI%^Jou3X7HurWApO66gSW{flT2#0E<+mw zr_n|9>|#V`5&@8%ou_0B<=`!1#B56Ngj^h}4|myywwavs(HEY{MwSQ#LqhRx&LyCL zWOfWi@jhOy>uq1x(cZG@t5oSrnu_$w-}|%jvQDYho5qU=1HlH;=L0|;_Lv;6VK6i>Ff%bxNXyJgW%#r6XD~D{Ff%bxNX*MG$w)0?5N~N@W$ZZ5aQ)`lD8VOIJAUod m^oJ@*%gjk-_%8YWiosRw^C!ZxoHxBr4ePkvQ3wF)fgTu2AG0y74UACbUTF6jR2-)$3Q2-=mgWeT3g-B?! z?7=DC$E$U{?dv+)TQ+@_Dt*b9BE9nW{;a&Lm)z=28w!9BEjoQZ0MucR$svE{>Y;v6 G&_z7PhD&Y$ diff --git a/vendor/libgit2/tests/resources/describe/.gitted/objects/8e/c1d96451ff05451720e4e8968812c46b35e5e4 b/vendor/libgit2/tests/resources/describe/.gitted/objects/8e/c1d96451ff05451720e4e8968812c46b35e5e4 deleted file mode 100644 index 432b2c1934abe84c9e4a2b706ed5f51c26fe78d6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 49 zcmV-10M7q-0V^p=O;s>9VlXr?Ff%bxNXyJgWzfE#zItQwlK-2ofBw+HGyf@D&+{e# HAyW}|D3l0DXC9yapp$Y+U6LO@HBRFo_3ixWi^U!nJEV=>ZhOV~dB8xg{3v^Jq zr0ip04uXGtQ7pctEg%6BDY@#sUqf6a6%NItV64gH=lr~eJ)g%huP;6AUAvCG+?tM_ of8HNG@5ilN{mr6FKp@P~zODdfwd>T>f9mE#$3v_61<>D8(bq6rssI20 diff --git a/vendor/libgit2/tests/resources/describe/.gitted/objects/9c/06d71b8406ab97537e3acdc39a2c4ade7a9411 b/vendor/libgit2/tests/resources/describe/.gitted/objects/9c/06d71b8406ab97537e3acdc39a2c4ade7a9411 deleted file mode 100644 index 5fff6fa1f09472bebd210fa4595edd2df3cf3454..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 49 zcmb}1kzOc(H3fdZ{j8^z_e-vJ~Db{k6%6QTg?8V9R7$k-rCp-Sk#aH|Q Hxid$IwD?Oi diff --git a/vendor/libgit2/tests/resources/describe/.gitted/objects/a9/e3325a07117aa5381e044a8d96c26eb30d729d b/vendor/libgit2/tests/resources/describe/.gitted/objects/a9/e3325a07117aa5381e044a8d96c26eb30d729d deleted file mode 100644 index ee45b76500979b29c85a78bd0253fc7f96421ebe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 49 zcmV-10M7q-0V^p=O;s>9VlXr?Ff%bxNXyJgW%$l7@Z`26TYu#q=N50z&+pE;9(e%( H1x63p%}x|j diff --git a/vendor/libgit2/tests/resources/describe/.gitted/objects/a9/eb02af13df030159e39f70330d5c8a47655691 b/vendor/libgit2/tests/resources/describe/.gitted/objects/a9/eb02af13df030159e39f70330d5c8a47655691 deleted file mode 100644 index 320161a55..000000000 --- a/vendor/libgit2/tests/resources/describe/.gitted/objects/a9/eb02af13df030159e39f70330d5c8a47655691 +++ /dev/null @@ -1,2 +0,0 @@ -xŽA -à »öî Aý&1PJ¯òÕgc±fÑÛ×3t÷˜aà…’óÖ¤!uiqdöF/ì´ÑÃzbFLŠBÛEwé¬xsÅѤ†Ò“%0{cb$J„)ir‰F—cæŸm-Uç¾·òÂ!oȨ[jæÏã™yÛ‡Pò]jrʨe´³¼ö¡D§ýdß¹ø¢I>J[QÅhK% \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/describe/.gitted/objects/aa/d8d5cef3915ab78b3227abaaac99b62db9eb54 b/vendor/libgit2/tests/resources/describe/.gitted/objects/aa/d8d5cef3915ab78b3227abaaac99b62db9eb54 deleted file mode 100644 index 4cbaff19220b3f9325a2e9c3135ce500d28619f0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 49 zcmV-10M7q-0V^p=O;s>9VlXr?Ff%bxNXyJgW%w@n{))j>?eizXvYa=)P7Uk0+))Ss H8ORWB*xVH2 diff --git a/vendor/libgit2/tests/resources/describe/.gitted/objects/aa/ddd4f14847e0e323924ec262c2343249a84f8b b/vendor/libgit2/tests/resources/describe/.gitted/objects/aa/ddd4f14847e0e323924ec262c2343249a84f8b deleted file mode 100644 index 651ec782e79bd0b03a186e6d82a86985c20840a5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 125 zcmV-@0D}K`0Tqlv4#FT106p`Hy_+;pu+qdB`;=v~5EM#->%rfPm&sga1QVEfJ+<&; z67VLvU=V3>mY3Drh{0YpBYWgX#1x`MM@qg21GQSSC>f9K&%_<}Pbtz~yu*zv_e@jd fUh(}%6?2(JatC9*p7rYN1JOw-< diff --git a/vendor/libgit2/tests/resources/describe/.gitted/objects/b2/40c0fb88c5a629e00ebc1275fa1f33e364a705 b/vendor/libgit2/tests/resources/describe/.gitted/objects/b2/40c0fb88c5a629e00ebc1275fa1f33e364a705 deleted file mode 100644 index fe86e7c7c..000000000 --- a/vendor/libgit2/tests/resources/describe/.gitted/objects/b2/40c0fb88c5a629e00ebc1275fa1f33e364a705 +++ /dev/null @@ -1,3 +0,0 @@ -xŽM -à »öî AͧQ(¥WñçÙJc,ÖÜ¿ž¡«7 ¼Øj-ƒ+E—Ñner†´ÌYè9› Xg¬•*’ «†±ï8§d´¶Áf¿ -Ad预Õ[ÊNB yíEfþ¯Öùqîûhoü†Š^â’Ñ«ÿ>žÕ—}‰­Þ¹\­P‘$~ Ø´óäÀŸ9¯ÒûµGG¬ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/describe/.gitted/objects/ce/1c4f8b6120122e23d4442925d98c56c41917d8 b/vendor/libgit2/tests/resources/describe/.gitted/objects/ce/1c4f8b6120122e23d4442925d98c56c41917d8 deleted file mode 100644 index 408c5da33734ffa080e23b09953894bc66f92925..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 187 zcmV;s07UCh=mv%hY384_z{NVstgSq}g-HLY298 zlt`)MPCe8=p8%=Eo+T!&!k`pRIcIa|ovai>0=AzfBrT@&$ht7vK^9xC5RMDw4T?GID diff --git a/vendor/libgit2/tests/resources/describe/.gitted/objects/d5/aab219a814ddbe4b3aaedf03cdea491b218ec4 b/vendor/libgit2/tests/resources/describe/.gitted/objects/d5/aab219a814ddbe4b3aaedf03cdea491b218ec4 deleted file mode 100644 index 4512d16d665e06dc8a28ad9df83330f83bc3db75..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 80 zcmV-W0I&ae0V^p=O;s>6XD~D{Ff%bxNX*MG$w)0?kd$BFv9u{`=9ki4>$`5}$28-C zosRgtPVU+(smmF-ic%9(a#N9vV+aXybp;wI$zY^lz|~PPk<)pOoQ%yCpe=Iuo*MXF bwORhx;$F$KQ|EaCrZ0Y!VBQ#TE 1347559804 -0700 commit (initial): initial commit -d70d245ed97ed2aa596dd1af6536e4bfdb047b69 7a9e0b02e63179929fed24f0a3e0f19168114d10 Russell Belfer 1347560491 -0700 commit: some changes diff --git a/vendor/libgit2/tests/resources/diff/.gitted/logs/refs/heads/master b/vendor/libgit2/tests/resources/diff/.gitted/logs/refs/heads/master deleted file mode 100644 index 8c6f6fd18..000000000 --- a/vendor/libgit2/tests/resources/diff/.gitted/logs/refs/heads/master +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 d70d245ed97ed2aa596dd1af6536e4bfdb047b69 Russell Belfer 1347559804 -0700 commit (initial): initial commit -d70d245ed97ed2aa596dd1af6536e4bfdb047b69 7a9e0b02e63179929fed24f0a3e0f19168114d10 Russell Belfer 1347560491 -0700 commit: some changes diff --git a/vendor/libgit2/tests/resources/diff/.gitted/objects/29/ab7053bb4dde0298e03e2c179e890b7dd465a7 b/vendor/libgit2/tests/resources/diff/.gitted/objects/29/ab7053bb4dde0298e03e2c179e890b7dd465a7 deleted file mode 100644 index 94f9a676defa4c774ba2a2ff227c2e3c7f668ae2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 730 zcmV<00ww);0ZmlPlG8v8#WywNi0pFEt#ImzXU-_h zI#D`sM#15H$SY|XCDYftPmL}G00Nlc_l(-isT)H&(xkn_ebaa^fa}G`F(q}nWIl?~ zstXmRk}?G+lfQM|H{C%vt-T+ca?6 z?5<9Da~CCa(R_jt@NdveMXWpsHK@rP8=K%e2Bogjt9oADaR2h_5cmEXf{pff91fV& zp6=X2p(K~bQ8+@i+E4G(141`h8i(_t!(G!lShvW8rzmESXO~bgrIx!>9R|P(eoDEB zB#+Rv^Uu`ODaqDo3lprVCGh9I>roK3>O;SI02&$T4XMr)!rlg()wo5X-u;{<2cKnnccL)3X*Y<d0NE z(;Nf(m`>uWgB`H{?vbrlWU?K#+tW~eXhJ$`JVTf7(t;pN3fMjjL+G&i+slx%=37KR z$-cf&c#V7=ya7%-1PM4;?mj>_5@Kt;2j1Pt$zK%r2wZ_)XH%D2GWcN@_c4-{qHs=4 MDEp`X0Iq4%(`Pbl!2kdN diff --git a/vendor/libgit2/tests/resources/diff/.gitted/objects/3e/5bcbad2a68e5bc60a53b8388eea53a1a7ab847 b/vendor/libgit2/tests/resources/diff/.gitted/objects/3e/5bcbad2a68e5bc60a53b8388eea53a1a7ab847 deleted file mode 100644 index 9fed523dc6c22b4dcdb19e208f63df5e4ee8d9da..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1108 zcmV-a1graa0d-YNZ`?Kz?wP-0ZoVkn2N0mw)Ic9V>K5H1IghAWi8VzEB(=)s*Y_Jz zvNtIT7_cpg^Y~uueeCIn@87=t<`-AUWx8-KC;I5hM0nCs5KjI^>^;Rr5*HUkCQd^5 z?-J821Nmt2{?^gxt}cuQm6)b=6v~U>Jr7q7h4Ft3WF?fu-hIZ4e9J}VOl9Ii7KIDG zL$`^qLM0j-=XnjzauM2eB&ICsDv5HOWt$|)$rzn{<4pbPe8Dl=VtUqAWfFSt!upAx zB?a*v&B6f_wuU%1;n>83_L9p*Y;jkq{lnmeJSWVYWQp08n4AEf6lWUvhVpV!gcP$a zxl$yM3-s8TB*SW36D*8jCqajJp|pnLW)$I^qjgwnXj@Hg#42yRpt5;p)o&p_#p zR(xllXriHj=zPfUb39AkZz!dQ6$q4!$ZMT#ZJ1Qd}0eboak3<4e{!86;_kB@o@uG zN9#dCoLyiDwYq^J$$5dsPNb-!*1ULB(S{G&(UpgabvEpC1e(^b18j%)DpTEgS@T3N zd5eNF#dQQ|5lwfM)emoRh2>U1P>97~(V*JL+qWWhFLs0K<7PPzKWG#nfMv-9h0RU0~XnM_(uD6rQ`2 zXu2!(Ys0>}zdPa#?op?fE#lVz`)m7|$KZ+zL~jUihRG`fUE6F8_>$Zph#=rKxOP!s zRnutt163E#2(U)-o}F!3Wo@^!LmQ_>e4XRCa}E<|uHoY$Zb3;qau#ejC>oOT@CGJsXpH>OP_Al5~ z8g;DN>)!MTIyhcy?Ir_sE#Fj1sQ)5e2o-nY!Suj|cb@}^DmI-$dtiPHvIlEb)o#oh zPHJVn)$jtJ9c+WZ_TU0ZRsCUO^A%{j$d(lUf!a^>ceRuEYsQ5Q=<20`Ytq>|PrLiL a=q@$DGzWGJDegG}{ni@!2Aa#pgkvy-cJ&83%3M6&P<=1zX zlyO4Cs!uIla7LL@;74dDK3(@xEL~V z62gC%m}VKsM~nBjjz)KNVKk`3fu?m7%8TFw9jOl zDQR1BrAQzb=&>_NhSjzv0E}TLL5Fyuw1(nl6ycnsbpSOqRFfM4<&76KH=e_|f~$O@ zb7Lh6*opRbyy_ka=~=nj_&QJ zGv-#}EhgK*C@3zpE{dj}^%3*yK*yMUa&JpJAZs?$7&Vt0SeUj5!;&CPA*99 zYN5Z@{`N}dO;?5mFAfK=vwA@JJZiQ@Xv{5w_;8%8TWI(poXg!Z0~j zg6(6o;PWZMeAS?3g4Xe)5c*0DD5eZUb8@i)Q8B!Eb!qi%h)4(?OfztxpTGP4mv7-# zwBFnRnZWo#t*5*8|y#h^d>HY+t^Fgd&v)cAO#jOrjxozQ~isIM`R zb+M@f8P1D=GGOKx&-|zCP72p#z^09P^mUR>>A5?Jrn^F6_pCsGsib%xn%$8Wa1X^~ z$`ys-8zyr_y=t_hDhN{eZa-=dYo(ux^w>1=-Dr1PmJK@#9$${aJ4Wi(EXcDN0|7Ixd~VrJ8H_c!*n2RUJ7Cxj0B03WY%t zGYpaJB*p+EsAfHc4d6Sj6TQs_eAU?2*W4ql$xet$qz>$x)o{vo2JeY`l-Z|Mg<(A} z^j1=ItlH~7mB0ofNo(yXfZetLR^m|q#anO^?!-fi0~g+d2uxHr=oH!m^J9>m{VMxC zIcj=p*66K<7x?VhAr#ggT%h@C5Fj>Rk+!>FN%0@p@kD=Dzk9!CT-czlDht=7vvrL#>HAb?rXwk(MCT9#GYGDy)k%XNs>YJKu9XKExa>6kPo0MGi%sP$USud1F z&PXBqsM68r+TeZcyDSU5WErKwz2)ch>GP3qrLGUqmV)z0QNtAjqB`mM*H87|QtfpW OD0A8-+0_qJbw!$C0Z#n@ diff --git a/vendor/libgit2/tests/resources/diff/.gitted/objects/7b/808f723a8ca90df319682c221187235af76693 b/vendor/libgit2/tests/resources/diff/.gitted/objects/7b/808f723a8ca90df319682c221187235af76693 deleted file mode 100644 index 2fd266be66d9951a4bb7c6c9dd3b94318a678463..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 922 zcmV;L17-Yp0cBN9kJ~m7?U}z~ZrcK011%5~=&{=-y|jlUK+q#4jV)#=jzChYD5w00 z{KEW_yhqvIEqbwGc{qIYK1N-%PJaINmsdZ$A64FjDkt@I$trd9RkHdRH<|pS7QvsT z`ZS22eMVunNs{`E0)5iFiPcfFynFcD*;3I!(I)U*kuLkxk0G69vO(j~Io^flwiaPe zO}#DIpK;G-i&T@*KdDShtYMBS(Rv>*ZBWzD^*%|bPE!q8fg+?qXT?XVVkc4Gk2|KL zaJnAT)L`i#ljbw99NNu*qkN1bu8vl4S4g-59R|!5ZJyY$HV%sRmWBfS??;R_sZSR$ zL`^`00UVkaw0YFuoO_)^&;C(Mkq1jvKUI0RhT8Zz$^&7k_{(q{y^>5&h<0I6e~{j$ ziF~<}u2RFKWY1WMPVDw54 zxq^%p>|*M-7WMvjU(o%5LXxSY{6(pr2cUC&T>Vx6JXIgS5$4~35&xWx`k9-v4NGH& zI_%zQvT}y~*46SO?!|N`%Tl#G!z#3#kFHEG5nN}Kj8%i*NC&@o9GG8U9KFN-fQKj8 z?nZn9r5DQf4$U`wdW`}A-DP!bM+d_y#hOd0cTqo4T8#Hn5qcVM>IjF{RW&gW(}ADK zHOql*8g##!^05T`TyH%qa?^Mib`Ag|BZ?t4gJQ5hLYb}j4)OT&CS0@lZMbJq?1i}K zcWBuTpDFEKao``qa5`EEgYMb*xRi<%ARx^G_u@MYW~mh-Qmp*;vc!@7u8g-AC0L;aTytcHZ=Ui4e*~M-~{Td zY_*FCyP-Af_?ue>JE39&(cp-mVpKJ*FZ^Vv=_)3=2q{CvX{x-DCf_mffPE2Rj(|4W z+IG~%9f}+S;7zC(*%ZrehY!A+9*y07Q*jaVV2dQ6_#O*ojsa8_o7$k*Sv#nUDrGBG zC#;!nU*%0|7t)i(CrHQLx4^xVq3sY(r_f_lH>{eo<$I(%>9M_0_P0m708e{l1%0rL whX832f`X}#7U1qjpZEr#4S*HhoBi4n)(m{G+chcRBI4zfT&PF)9c<)o4UJ^Y_5c6? diff --git a/vendor/libgit2/tests/resources/diff/.gitted/objects/88/789109439c1e1c3cd45224001edee5304ed53c b/vendor/libgit2/tests/resources/diff/.gitted/objects/88/789109439c1e1c3cd45224001edee5304ed53c deleted file mode 100644 index 7598b5914..000000000 --- a/vendor/libgit2/tests/resources/diff/.gitted/objects/88/789109439c1e1c3cd45224001edee5304ed53c +++ /dev/null @@ -1 +0,0 @@ -x+)JMU07g040031QHÌË/ÉH-Ò+©(aÉ)Ž[¼Åwz {Œïj­“û%;¡ÊŠRSrSÁª4Wïö½Ç4ãŽø¼NîÚ+©Ë¶a \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/diff/.gitted/objects/cb/8294e696339863df760b2ff5d1e275bee72455 b/vendor/libgit2/tests/resources/diff/.gitted/objects/cb/8294e696339863df760b2ff5d1e275bee72455 deleted file mode 100644 index 86ebe04fed9f553f544550a852412fde027e28cf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 86 zcmV-c0IC0Y0V^p=O;s>AXD~D{Ff%bxNX*MG$w)2IE2$`9u!}yuRx9J_o`j{=%^mNS sT1i#yaEB@@N=;13O$Do}Zs;$v>RHMASu#UMNw8fx>U-K`01J% zuz$NZ+w(Ir9;}hKpEGcR%rgR+#}F3cDI@*iP6e3mR%V5o^9;=#)nd+66W2E%EG|F3 zJMU`T?VPQSOLjrbF$S9x66ER%^rs|)v4R2D)&J>bK26^>H`=Hzm|7Oj+u=K{-7x3M WIhWHrj?BLI;jhpIC#7ljj1d4=4r9Oo diff --git a/vendor/libgit2/tests/resources/diff_format_email/.gitted/info/exclude b/vendor/libgit2/tests/resources/diff_format_email/.gitted/info/exclude deleted file mode 100644 index a5196d1be..000000000 --- a/vendor/libgit2/tests/resources/diff_format_email/.gitted/info/exclude +++ /dev/null @@ -1,6 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ diff --git a/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/0a/37045ca6d8503e9bcf06a12abbbc8e92664cce b/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/0a/37045ca6d8503e9bcf06a12abbbc8e92664cce deleted file mode 100644 index 1ece99cde7f29ee21d52ee35a7447a4538acdf83..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 29 lcmbQGc& zmt|J)X?)Nw0#!T~-zrIFw2{(Stiu$^rW^>P%j6wrGN07tLjj2eN9GWxi6VwjTgjL$ zmR1@^ifN?caxt{)W$o}r^|s3fuhN%!yX@Z^JiY(B^J&vQlhRPv7HD@q1FfcPQQAoTkz954FXj z{M>9ufU3+*O%>8Ib5afUN-9e9ic<3ub5m0oRu+aYxDYNjqo_MyzpQji*vX#AM5vJ< z#YP~-3|0RHZ%sX={b2ugZ?@-WWIR|SZ$C#;WDHg`OSgjS&?~N2dv{)1QTA;2|Bux= JE&w2$LZ@WfMQi{7 diff --git a/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/1a/9932083f96b0db42552103d40076f62fa8235e b/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/1a/9932083f96b0db42552103d40076f62fa8235e deleted file mode 100644 index b6f04538e8fe30bb8096094af233382a3f795c0f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 54 zcmb(jYs0@?RQAuF=IWMp=jL>|nxx22 K^$b~agaZH_^cCL# diff --git a/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/1a/e3be57f869687d983066a0f5d2aaea1b82ddc5 b/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/1a/e3be57f869687d983066a0f5d2aaea1b82ddc5 deleted file mode 100644 index be85c78ba0c98841fe66262efc3dca34d1614e7d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 162 zcmV;T0A2rh0i}*X3c@fD06pgwxeJnJ)9w~TJSq5#?RH};#MU$g{k;XB;Bn?Kj7%ww z#d>IVC97JlSz4q%M9&pch!ik}%6ni40*cf^@IYqftj}WmP6<6~AlI-Gi3mi8buAl3 zk`6Vp7csn+VaoQ#@>+GVSIuc$hV`@9_4qbrC?wxneY<62M Q`d7qU#`ij#FU9~&&28gNLI3~& diff --git a/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/1b/525b0a6c5218b069b601ce91fce8eaf0a54e20 b/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/1b/525b0a6c5218b069b601ce91fce8eaf0a54e20 deleted file mode 100644 index e8145edfd2b60a471a44202c02e7081ab3a96f02..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 31 ncmba1HPt#{ile+}EyahdbxEa1Y;@$xO$4v~9 diff --git a/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/1e/82c3b234e37da82e5b23e0e2a70bca68ee12c6 b/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/1e/82c3b234e37da82e5b23e0e2a70bca68ee12c6 deleted file mode 100644 index 3ae87cfa97e2003303d5bb6a6e375af19e7dfdbc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 28 kcmb7Hf1n0FfcbYRY=RsNj20fsVLDaO3h2mO-*4~Ss1?HLb%wB zqV9bCveGSKCwn3jfr`ycOu&kbP!#{~HQgdI<@<*_lYYjgfA#;b?rVP7v}77HD@q1FfcPQQAo8Ib5afUN-9e9ic<3ub5m0oRu+aYxDYNjqo_MyzpQji*vX#AM5vJ< z#YP~-3|0RHZ%sX={b2ugZ?@-WWIR|SZ$C#;WDHg`OSgjS&?~N2dv{)1QTA;2|Bux= JE&#_MLLg!sMF9W+ diff --git a/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/24/97c5249408494e66e25070a8c74e49eaeeb6c3 b/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/24/97c5249408494e66e25070a8c74e49eaeeb6c3 deleted file mode 100644 index e1ede9ae9b0e3f139846a25a10c776e12991a386..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 162 zcmV;T0A2rh0i}*R3IZ_{0IhS1^n$$n6A-ad@D@q-#f=bm%?I@ME_ejHVTxhmQcCWW z3%%<)$lGkMQ6`!3Z2__&gAtY{;f=$ZAiG#5T z5CsO!5Ue78^m(cD=HqK%qgSjYw|RUTJwAT!er~;H-~Ayj6tq9UlQ{s0;5%h-0t%{Fu#NHQc7hPR$Bl7 diff --git a/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/25/2a3e19fd2c6fb7b20c111142c5bd5fb9ea6b8e b/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/25/2a3e19fd2c6fb7b20c111142c5bd5fb9ea6b8e deleted file mode 100644 index 10c34009d1598d0728686138bddf8f5c247d2769..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 121 zcmV-<0EYi~0V^p=O;s>7Hf1n0FfcbYRY=RsNj20fsVLDaO3h2mO-*4~Ss1?HLb%wB zqV9bCveGSKCwn3jfr`ycOu&kbP!w1F7rZs~l=g%D+r8PIpONukjlBIFNwG1CV&ONR buNK`t`gF5S_k#3`7avTXTJ!<{@Q^zku0uJS diff --git a/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/27/93544db9060bab4f9169e5b89c82f9fa7c7fa6 b/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/27/93544db9060bab4f9169e5b89c82f9fa7c7fa6 deleted file mode 100644 index 689f5b9a1197cf2fb281cca0c2f654db6225adb5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 120 zcmV-;0Ehp00V^p=O;s>7v}7cYf diff --git a/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/29/1f1ff3cbb9a6f153678d9657679e3d4bf257df b/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/29/1f1ff3cbb9a6f153678d9657679e3d4bf257df deleted file mode 100644 index 6af5dda9d1dc701d5b4c6e444bec868d5a67151f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 29 lcmb9XD~D{Ff%bxNXyJgHPkDqC}9XXd{+LOviH<~r`ON>Xr^*Y MJhQqN09W)8rXjr-3;+NC diff --git a/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/39/91dce9e71a0641ca49a6a4eea6c9e7ff402ed4 b/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/39/91dce9e71a0641ca49a6a4eea6c9e7ff402ed4 deleted file mode 100644 index 69d213dcb0c7235a5a5755d309486fbc493496bf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 166 zcmV;X09pTd0i}*f3IZ_@06pgweHSE4X9E#$f+xSwc6xM#IGV{E{JjG{!D~Sk#Z#?g z2a9&on+SM~F7ZGTU)MaS`>pE3YU*q0Q+74n#+5i9m diff --git a/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/45/eef2a9317e179984649de247269e38cd5d99cf b/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/45/eef2a9317e179984649de247269e38cd5d99cf deleted file mode 100644 index e5014565b..000000000 --- a/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/45/eef2a9317e179984649de247269e38cd5d99cf +++ /dev/null @@ -1,2 +0,0 @@ -x¥ÎÁJÅ0…a×yŠÙ_I›IqwÁ¥o0Lo+$¹&©àÛ[õÜþŸ””öƒŸzU…à&ÒÁFY„,ñ:¯ÞYš¼CT·8B¥Õ ŽæÎUs¯H,BL‘Â)ËÈ(‚ër.cŒažÃ }+^Y>mpÕšö¶_ žÞÿÚí¥õºsçG)éì&k}˜G¸à€hÎzR»þëļi*Ÿ -RrÿñsŽ ç›Âý—Ôö’›ùÐXã \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/4a/076277b884c519a932be67e346db2ac80a98fa b/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/4a/076277b884c519a932be67e346db2ac80a98fa deleted file mode 100644 index b855408e8f40413af0f82c04e253d0a0db1d90e4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 40 wcmb)Rn7uKSep}~+`T@H&QB<%1S>pfz diff --git a/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/4c/a10087e696d2ba78d07b146a118e9a7096ed4f b/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/4c/a10087e696d2ba78d07b146a118e9a7096ed4f deleted file mode 100644 index b05e7d634f2498bcd3cf136b809b23a0d24efa1f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 173 zcmV;e08;;W0j17CYQr!PM&Yb=irE*+$dauHLdh=BWp40$G>#pRol5eex33{b==NJY zo@_ZUjk=yst*BDpa|(_}*zqhrx}dOuM;9cFh&F}T2?H=M6kQv+c%W$1V8Mg80v|EJ zt74Etr^$1t$s6o#-U@v~es-;N(~_4u@4uBU&$m6UwUq@8pR(mIvMvU9?maVoaK~&8 bJyx6kD`M`tB5NY7iDbt5&}#kwSj18SapzOF diff --git a/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/4d/de2b17d1c982cd988f21d24350a214401e4a1e b/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/4d/de2b17d1c982cd988f21d24350a214401e4a1e deleted file mode 100644 index 57a8dfed1977454596f062590d33ed043ef6c844..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 121 zcmV-<0EYi~0V^p=O;s>7v}79XD~D{Ff%bxNXyJgHPkDqC}EhgYF%f@i`|K~&&=3mmnAP# M%#0KS08eHQ)*P`Fl>h($ diff --git a/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/50/17c9456d013b2c7712d29aab73b681c880f509 b/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/50/17c9456d013b2c7712d29aab73b681c880f509 deleted file mode 100644 index 5b96aa5ea61edcc9ecb2a62f6ab9e2f65cdef1b0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 54 zcmb0EGW|0V^p=O;s>7HfJz2FfcbYRY=RsNj20fsVLDaO3h2mO-*4~Ss1?HLb%wB zqV9bCveGSKCwn3jfr`ycOu&kbkQEy-{O>j0A~NOshdYyg#-@Mu|F76HDO50%t0EGW|0V^p=O;s>7He)a}FfcbYRY=RsNj20fsVLDaO3h2mO-*4~Ss1?HLb%wB zqV9bCveGSKCwn3jfr`ycOu&kbkQEy-%sOB+ySvK4O_8^|n`sRbYgqcdWF*zb$f_BH d-+aDWbo=Pj%{tu+(l1_oFnMax3jk}{I4rE}I5z+Q diff --git a/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/62/7e7e12d87e07a83fad5b6bfa25e86ead4a5270 b/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/62/7e7e12d87e07a83fad5b6bfa25e86ead4a5270 deleted file mode 100644 index 269a5bcf4..000000000 --- a/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/62/7e7e12d87e07a83fad5b6bfa25e86ead4a5270 +++ /dev/null @@ -1 +0,0 @@ -x•MNÃ0…Yû³GŠ’ر] !8@%$NàŸqb5±#{Jéíq+`ÁŽõèûÞ›çò¶E!¦*ˆà§¤RR8=5ìÀÝ(M˜”œTïµþ µb»)˜´âº—A†Q¡äÚÞŽ…¤E3Ú`Ü Wœ™3-¹À›¡Ý Þ cZLñO{}ÙOµ‹Û3 Bh.µPx쇾gîÞðÿ$;fÃ\Ntkz‰´À†µšÙßc⊼£O{³ï˜|L3Hx5&ìàhN´Äú]ëG5oxY ÁšÓܺRÂÚL¸˜ØÞ¾‡7ÑÍSn½G15þjlö׎±×µ~ó1ÜÓÛÖf.f_*´ÕåÖó w¹t´6è T¡–; \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/66/81f1844dc677e5ff07ffd993461f5c441e6af5 b/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/66/81f1844dc677e5ff07ffd993461f5c441e6af5 deleted file mode 100644 index 86a38289b8162a6f0204922380652a2423b2358b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 35 rcmbkUwo~F;3CU?brOt6wWw6vpTCJRI1MfrUI9Lx{c diff --git a/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/69/ddefb5c245e2f9ee62bd4cabd8ebe60a01e448 b/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/69/ddefb5c245e2f9ee62bd4cabd8ebe60a01e448 deleted file mode 100644 index 81b606f4e4b5e3e0c03d9bf92a679d36a5708f3e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 54 zcmV-60LlM&0V^p=O;s>9XD~D{Ff%bxNXyJgHPkDqC}Gf)m;Zcv=dzE%>Alm!)92ZG Me+s`3080lEM@qOCumAu6 diff --git a/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/6b/6c2067c6d968f9bddb9b900ee1ab7e5b067430 b/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/6b/6c2067c6d968f9bddb9b900ee1ab7e5b067430 deleted file mode 100644 index aa9d7b0cd..000000000 --- a/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/6b/6c2067c6d968f9bddb9b900ee1ab7e5b067430 +++ /dev/null @@ -1,2 +0,0 @@ -x¥Î; -1…aë¬âö‚ä ˆX)¸‹$sãDˆ3æº{.Áö+þsšsjÀ…Þµ‚ '£fg=Cm⤄çˆA §7v}7tC!a8=C#M2}q>Z#* zlu;5#*DwV#ywuxN?3v?h(b=A~¥Õ LîqŠÞGø°h­Ùé~uè¿$æ+g¨­+H[Æ^`ÞÈQW \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/7a/de76dd34bba4733cf9878079f9fd4a456a9189 b/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/7a/de76dd34bba4733cf9878079f9fd4a456a9189 deleted file mode 100644 index cf9bdaa5f..000000000 --- a/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/7a/de76dd34bba4733cf9878079f9fd4a456a9189 +++ /dev/null @@ -1,3 +0,0 @@ -x¥ŽA -Â0E]ç³d’4M"î÷`šm…´5IÞÞ¢Gpû>¼ÿâœÒXÁ4aW³°nˆŒ3â y Œ–,[F­í½ôH­oD-”eªÐ -:ŠÑ‘cêzš0F¼÷Ûb™C×ÊÖ:Ì®_«¸HNcÖwãóÇçRóH•qN'Ð6x­½F {4ˆj£[j•¿$ê¶0Uåû_Æy*ê&R \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/7a/ff11da95ca2be0bfb74b06e7cc1c480559dbe7 b/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/7a/ff11da95ca2be0bfb74b06e7cc1c480559dbe7 deleted file mode 100644 index d8c9934f7ad2c0d2dbf4f0bc4eb8e4afc457d6c9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 26 icmbd+B#e$|86?qti7(|y4?r7eLvXOY0SRLl-JzqJ2*<_|#RP`ER{TF3wZ diff --git a/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/87/3806f6f27e631eb0b23e4b56bea2bfac14a373 b/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/87/3806f6f27e631eb0b23e4b56bea2bfac14a373 deleted file mode 100644 index 890abcd4a91aa4f33b8566a8b5242d032e1499f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 181 zcmV;m080OO0i}*XN(3R>tqCC;DP)?C^NikNY!od$HOd%j?5K{LcU9Sd&5o6Vq)1-q?!ix!0%FdJ~gFUgk$2pN=$87)H29 jMs&N~ubTcV;?7HHwP}Ic-jxsbWe>mTZ|HsiqzO~x^$J?j diff --git a/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/89/47a46e2097638ca6040ad4877246f4186ec3bd b/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/89/47a46e2097638ca6040ad4877246f4186ec3bd deleted file mode 100644 index d4018bf8e..000000000 --- a/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/89/47a46e2097638ca6040ad4877246f4186ec3bd +++ /dev/null @@ -1,2 +0,0 @@ -x•ŽAjÃ0E³Ö)´/„ÑŒ,ÉJw….{ƒ‘ò8 ;•åEo_C{nßâ½WÖZçnYÒ©7À:¤8\uÌ!NiÌ@0qaWRˆ4FožÚ°t›¢$ -S˜8"ˆC¦ÌŸ‡¡œ'-ΫD1º÷ûÚ쇖¯›}G«óvß¿7{yü²ÛÛÖÛ¬]Ïe­¯ÖÉ¢‘¼Øb"sÐcµãßöÎñŸÄ|bÑŠ«ùþûLÊ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/89/7d3af16ca9e420cd071b1c4541bd2b91d04c8c b/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/89/7d3af16ca9e420cd071b1c4541bd2b91d04c8c deleted file mode 100644 index 1dce143b7..000000000 --- a/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/89/7d3af16ca9e420cd071b1c4541bd2b91d04c8c +++ /dev/null @@ -1 +0,0 @@ -x¥ÎANÄ0 @QÖ9…÷HȵÓ$•šY!q '±™ éÒt1·g$ŽÀö-¾~ÙÖµ ŸžFWb[hñ¡²qÊ´ˆXY“Æ)™•9Qðî[ºÞ¤È ƒ£¨'͘‰Õç9dÊ&eò‘ã²uøòsèïÚ׶_Žû¯_öyÚGo2ä¥lëL¼D3§ÏHˆî¡Õ¡ÿŠ¸s­Z!·›ô;X»ªû"Pq \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/8d/7523f6fcb2404257889abe0d96f093d9f524f9 b/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/8d/7523f6fcb2404257889abe0d96f093d9f524f9 deleted file mode 100644 index 903ec751c..000000000 --- a/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/8d/7523f6fcb2404257889abe0d96f093d9f524f9 +++ /dev/null @@ -1 +0,0 @@ -x¥ÎAJÅ0€a×9Åì™IÓ¤w‚à!f&_äõUÓtñnoÁ#¸ý¿nëÚø™F7JZ¹LÑòT$%ŒBQ¬ÎV—à…ÉfeŒ,î›»Ý,9•‰+EålÁ£L$¤a$ÅK¦‚Au|ŒËÖáõç°Þ¬¯m¿÷ž¿þÚçë>zãÁOº­/@SNOfGôˆî¬çê°!îc+­6+ íÆýµ]ÍýERÚ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/8d/fa038554d5b682a51bda8ee3038cee6c63be76 b/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/8d/fa038554d5b682a51bda8ee3038cee6c63be76 deleted file mode 100644 index b5e08f901f1feccd5744ae5682797aed72ddbb4f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 120 zcmV-;0Ehp00V^p=O;s>7Hf1n0FfcbYRY=RsNj20fsVLDaO3h2mO-*4~Ss1?HLb%wB zqV9bCveGSKCwn3jfr`ycOu&kbP!w1F7rZs~l=g%D+r8PIpONukjlBIFNwG1CV(Fl0 auACr=4Vl{*&rSUE;?;+xehL7)hBuLWmO4@Z diff --git a/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/92/64b96c6d104d0e07ae33d3007b6a48246c6f92 b/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/92/64b96c6d104d0e07ae33d3007b6a48246c6f92 deleted file mode 100644 index 75b047a64a1c7783d040ce8edc91742292e3e5f0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 181 zcmV;m080OO0hN!tY6CG408{HLwhx%ym2{H8gmi&`KVnZ0`vS5ONmuyqbKv|y+9`&a z*lOJ-u*H|za|Vm#VlZ||NP6Yy9C6|xvO2vko}%|yEC%&0J>MskC>ROz8VX5SOfX`M zPu6Lj*z00hvsf}p_IYa^J|+I_dB8{RbsM++G2s05WY_mG`zBLPvDG&q9ULyfGr=n| jqB`i2I`h9J4lTPsiMq73l?RMgGsJeE$AtO?Aq!BajS*H< diff --git a/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/94/350226b3aa14efac831c803a51f7a09f3fc31a b/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/94/350226b3aa14efac831c803a51f7a09f3fc31a deleted file mode 100644 index a5286bc68f29157e2424d43ea5e6b1f70a9ef42b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24 gcmb-QQ0DUkD8vp4WiT`_Ff%bxNXyJgHPkDqDA6lQ%}dNpO<{Pb^}QyLujk33 U#KooUW&(3`bT57Y0Mktq{ph0_jsO4v diff --git a/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/94/aaae8954e8bb613de636071da663a621695911 b/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/94/aaae8954e8bb613de636071da663a621695911 deleted file mode 100644 index 5fc167e7965f4d5758f37b8057a39bf1343433e4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 29 lcmb9XD~D{Ff%bxNXyJgHPkDqC}HqoPb%Nha#V7q(Z2M@Znw2g MaLxDy06`%Tzb4xj!vFvP diff --git a/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/a7/29eab45c84563135e8631d4010230bc0479f1f b/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/a7/29eab45c84563135e8631d4010230bc0479f1f deleted file mode 100644 index 5c1faf009b1260acdd5808c335a153a27f5158f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 40 wcmbliab|5l}Z08U&G8UO$Q diff --git a/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/a9/7157a0d0571698728b6f2f7675b456c98c5961 b/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/a9/7157a0d0571698728b6f2f7675b456c98c5961 deleted file mode 100644 index 3baf494bef2dbfebb4181b38b445dbfbc7fed222..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 62 zcmV-E0Kxxw0ZYosPf{>6H(^N2%tF*h{@A;QIl U#3oJ$LKU*T$ZUiP05fJjM>NzJwEzGB diff --git a/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/af/8f41d0cb7a3079a8f8e231ea2ab8b97837ce13 b/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/af/8f41d0cb7a3079a8f8e231ea2ab8b97837ce13 deleted file mode 100644 index f0dcaa9acbd4b5712f9b374c1606cd2681a2d19c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 50 zcmV-20L}k+0ZYosPf{>6wO~lg%tkUwo~Dnw*n>aD2*}L{ad|f3fSV~7L$Rg&dH^z24@Cd~ diff --git a/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/b4/f457c219dbb3517be908d4e70f0ada2fd8b8f9 b/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/b4/f457c219dbb3517be908d4e70f0ada2fd8b8f9 deleted file mode 100644 index 0c74e76964a3b9ca3153741a4c5f86acbb2e2a61..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 54 zcmbGG?-$?rim$hjcN1OH6MzW_my2G;-p diff --git a/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/bd/f7ba6bc5c4e57ca6595928dcbe6753c8a663ff b/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/bd/f7ba6bc5c4e57ca6595928dcbe6753c8a663ff deleted file mode 100644 index af0232aa14f672c99f9c66213792d546bb7f1295..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 35 rcmbx|+#*0aG2=dURpo~7+uU*~s+hqvE$dFrEWJorAJ`y&_^$r|#(z^%4g it82Zk4*3Uygnx*7ogZVnTj%i(dFA6GUHt$rYEYpJ)>^v& diff --git a/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/cd/ed722d05305c6b181f188c118d2d9810f39bb8 b/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/cd/ed722d05305c6b181f188c118d2d9810f39bb8 deleted file mode 100644 index fd93636125d3e2745134b5ca8355b68d845151dc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 163 zcmV;U09^lg0i}*h3c@fH0A1%4*$a}qHa`$?rQj`IUS4d3+M1@Ix3}OCoaHQrp=lgT zlhD~+tIQG%V8=S-1Y~n`5ftf-9>~OGatw?%dKNQQel|%Fedv`>q_oXFVM@^^^4?~O z#%JRlI-jz@wGC61H>B6fi@b6j%QCE=MIIkNcRw$!7HoK+X*@~Y1qUiXaB{CeDY4mY RweepOaVhV07GIz&P40AdNlO3# diff --git a/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/ce/2792fcae8d704a56901754a0583a7418a21d8a b/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/ce/2792fcae8d704a56901754a0583a7418a21d8a deleted file mode 100644 index 5863cec1ba2cedfe621ab8ac730842dba6c3c8f3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 121 zcmV-<0EYi~0V^p=O;s>7v}7|DB*`v|AAvQg diff --git a/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/d1/4aa252e52a709d03a3d3d0d965e177eb0a674e b/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/d1/4aa252e52a709d03a3d3d0d965e177eb0a674e deleted file mode 100644 index a5d4d78e9..000000000 --- a/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/d1/4aa252e52a709d03a3d3d0d965e177eb0a674e +++ /dev/null @@ -1 +0,0 @@ -x+)JMU01e040075UHËÌI5Ô+©(Ñ+JÍKÌMMaXY¾àB¸ØŒ¢î|ý²Ò-a'{"Íz \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/d5/ff67764c82f729b13c26a09576570d884d9687 b/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/d5/ff67764c82f729b13c26a09576570d884d9687 deleted file mode 100644 index e838eeb25e7fccc4d3ac8a42a6ffa8b72a00f7c2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 121 zcmV-<0EYi~0V^p=O;s>7v}77HD@q1FfcPQQAoZdj~tl)x2qfdYU d>Y&HfDKAOXSIb*@=+Ua^)b8_$Q2!UuP|>)hS~dUx diff --git a/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/e1/2af77c510e8ce4c261a3758736109c2c2dd1f0 b/vendor/libgit2/tests/resources/diff_format_email/.gitted/objects/e1/2af77c510e8ce4c261a3758736109c2c2dd1f0 deleted file mode 100644 index 92a89a2cf6cb86271d9845660e3f6ce3210cdd9c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 51 zcmV-30L=e*0ZYosPf{>6Fk(o{%t$N_#W{1@yp(y$Lu>#ekiRz!4fjzB~wmtj~>yT e^h}-lZwXJpG-aKFbp6#%;Y3(^1p diff --git a/vendor/libgit2/tests/resources/diff_format_email/.gitted/refs/heads/binary b/vendor/libgit2/tests/resources/diff_format_email/.gitted/refs/heads/binary deleted file mode 100644 index 7e563c957..000000000 --- a/vendor/libgit2/tests/resources/diff_format_email/.gitted/refs/heads/binary +++ /dev/null @@ -1 +0,0 @@ -a3ac918e3a6604294b239cb956363e83d71abb3b diff --git a/vendor/libgit2/tests/resources/diff_format_email/.gitted/refs/heads/master b/vendor/libgit2/tests/resources/diff_format_email/.gitted/refs/heads/master deleted file mode 100644 index 3bc734d47..000000000 --- a/vendor/libgit2/tests/resources/diff_format_email/.gitted/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -627e7e12d87e07a83fad5b6bfa25e86ead4a5270 diff --git a/vendor/libgit2/tests/resources/diff_format_email/.gitted/refs/heads/multihunk b/vendor/libgit2/tests/resources/diff_format_email/.gitted/refs/heads/multihunk deleted file mode 100644 index 41bd37f39..000000000 --- a/vendor/libgit2/tests/resources/diff_format_email/.gitted/refs/heads/multihunk +++ /dev/null @@ -1 +0,0 @@ -cd471f0d8770371e1bc78bcbb38db4c7e4106bd2 diff --git a/vendor/libgit2/tests/resources/diff_format_email/.gitted/refs/heads/rename b/vendor/libgit2/tests/resources/diff_format_email/.gitted/refs/heads/rename deleted file mode 100644 index 3025fbc64..000000000 --- a/vendor/libgit2/tests/resources/diff_format_email/.gitted/refs/heads/rename +++ /dev/null @@ -1 +0,0 @@ -4ca10087e696d2ba78d07b146a118e9a7096ed4f diff --git a/vendor/libgit2/tests/resources/diff_format_email/file1.txt.renamed b/vendor/libgit2/tests/resources/diff_format_email/file1.txt.renamed deleted file mode 100755 index a97157a0d..000000000 --- a/vendor/libgit2/tests/resources/diff_format_email/file1.txt.renamed +++ /dev/null @@ -1,17 +0,0 @@ -file1.txt -file1.txt -_file1.txt_ -file1.txt -file1.txt -file1.txt_renamed -file1.txt - - -file1.txt -file1.txt -file1.txt_renamed -file1.txt -file1.txt -_file1.txt_ -_file1.txt_ -file1.txt diff --git a/vendor/libgit2/tests/resources/diff_format_email/file2.txt b/vendor/libgit2/tests/resources/diff_format_email/file2.txt deleted file mode 100644 index 7aff11da9..000000000 --- a/vendor/libgit2/tests/resources/diff_format_email/file2.txt +++ /dev/null @@ -1,5 +0,0 @@ -file2 -file2 -file2 -file2! -file2 diff --git a/vendor/libgit2/tests/resources/diff_format_email/file3.txt b/vendor/libgit2/tests/resources/diff_format_email/file3.txt deleted file mode 100644 index 730965344..000000000 --- a/vendor/libgit2/tests/resources/diff_format_email/file3.txt +++ /dev/null @@ -1,6 +0,0 @@ -file3 -file3! -file3 -file3 -file3 -file3 diff --git a/vendor/libgit2/tests/resources/duplicate.git/COMMIT_EDITMSG b/vendor/libgit2/tests/resources/duplicate.git/COMMIT_EDITMSG deleted file mode 100644 index 01f9a2aac..000000000 --- a/vendor/libgit2/tests/resources/duplicate.git/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -commit diff --git a/vendor/libgit2/tests/resources/duplicate.git/HEAD b/vendor/libgit2/tests/resources/duplicate.git/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/vendor/libgit2/tests/resources/duplicate.git/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/vendor/libgit2/tests/resources/duplicate.git/config b/vendor/libgit2/tests/resources/duplicate.git/config deleted file mode 100644 index a4ef456cb..000000000 --- a/vendor/libgit2/tests/resources/duplicate.git/config +++ /dev/null @@ -1,5 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = true - logallrefupdates = true diff --git a/vendor/libgit2/tests/resources/duplicate.git/description b/vendor/libgit2/tests/resources/duplicate.git/description deleted file mode 100644 index 498b267a8..000000000 --- a/vendor/libgit2/tests/resources/duplicate.git/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/vendor/libgit2/tests/resources/duplicate.git/index b/vendor/libgit2/tests/resources/duplicate.git/index deleted file mode 100644 index a61e1c5ca69e3077c386684324e0930535b34fa1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 104 zcmZ?q402{*U|<4bM*npSM1@aDpMlW~41XCI_|(i97#f!VrN2Nh1KT-9GgW5p6}MNi ueGi*fKX1 1336844322 -0300 commit (initial): commit diff --git a/vendor/libgit2/tests/resources/duplicate.git/logs/refs/heads/master b/vendor/libgit2/tests/resources/duplicate.git/logs/refs/heads/master deleted file mode 100644 index be9b4c6cb..000000000 --- a/vendor/libgit2/tests/resources/duplicate.git/logs/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 8d2f05c97ef29a4697b37c30fe81c248ef411a23 Han-Wen Nienhuys 1336844322 -0300 commit (initial): commit diff --git a/vendor/libgit2/tests/resources/duplicate.git/objects/03/8d718da6a1ebbc6a7780a96ed75a70cc2ad6e2 b/vendor/libgit2/tests/resources/duplicate.git/objects/03/8d718da6a1ebbc6a7780a96ed75a70cc2ad6e2 deleted file mode 100644 index 7350d98a2325dbac9a8a9a1a474734ae0767abb8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23 fcmb$Jv diff --git a/vendor/libgit2/tests/resources/duplicate.git/objects/0d/deadede9e6d6ccddce0ee1e5749eed0485e5ea b/vendor/libgit2/tests/resources/duplicate.git/objects/0d/deadede9e6d6ccddce0ee1e5749eed0485e5ea deleted file mode 100644 index 47c2a631abd12d79b08f6d17d28995b531874f30..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 22 dcmbU|EC5~E2V?*M diff --git a/vendor/libgit2/tests/resources/duplicate.git/objects/ce/013625030ba8dba906f756967f9e9ca394464a b/vendor/libgit2/tests/resources/duplicate.git/objects/ce/013625030ba8dba906f756967f9e9ca394464a deleted file mode 100644 index 6802d49492403f3d23831789ec6a4a14984b1538..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 dcmbaGC@!97;}bY>_WB(E(C5qj zV;8+%qP3xM>;A918|0+AWm^K8o=iQnT!Q)8qF&|NehG%CP_-*vig^o9-Z~>~d;e2W zQ)z6P{*pO8mnHtp$mps(8R{f#w`%6WrbBm(8dh^W<2?xU-%%jG3dB4>+`Q{U(mRiW o-}Wrc^4Vb@-d{a3Rh~m{*TbU9KNlW9x?i!bT~Y2+iQDl90Qwh9m;e9( diff --git a/vendor/libgit2/tests/resources/duplicate.git/objects/pack/pack-29a4896f0a0b9c9947b0927c57a5c03dcae052e3.pack b/vendor/libgit2/tests/resources/duplicate.git/objects/pack/pack-29a4896f0a0b9c9947b0927c57a5c03dcae052e3.pack deleted file mode 100644 index 652b0c91fe9e5fd36849d0f6cd0656036636fba9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 249 zcmVCOc7%Or9tpM|Mty(YM;*JdhET+|5JUd`T_1rFwv?5c$_mdFfcPQQK)1no@e6| zIC1v+9RJYg%l%^)y2ahQB32R&*5o;D_YP?t}S3J+gXHS^dywmgJit^ik z@N4)tF*R=8|Mg4zekX&zpm(#XuWn18-raEf_i=G|ednZ-e80utUOYFPzG33!drLVl zOh1>YCsz9>%VYVXhBI;Pbs(|Lr~4kH^5-lP*wg$ay(4f}cYEDyc`m_yv-SVFzl@#s z)Bb#I#f>(88>OC9dth@As5jMnpy6Tp@*S*ESDqBfO$o4aG7l)uWpO?*=l6Bd zU%w82&lYa1bXN2GEM!x4+)Q0XzSZD}%<|US2?94eJ7d3ZKDax6`V}tymGYS%GG6}F z-SxfX{PT@XvpF))=o~sbX=~b*#VbzzFS-zQTJ0J87B{1!g`5?0j7g z^7+uS%eDMLKa0gU-(>!qbWd={X#u5~EYs%H=>_|*`Q|_E_$OE1^hdW|FPLip1lIlLujBo%rnVwQi~0TD zt@+E1e5Y6c|Ij(-Wb5*@wPF1~7z1Y72AfyR@%Hi2I-~J~iGk}FQzeAIM$7vdkpG#f z5yIE?J^dWWzs*zw;d|?@2dRI~)B)z7(O7rpF%tu~BvXHy?SuDw%B>@k|J-f6n`zkA I^l)1f0Gki4jsO4v diff --git a/vendor/libgit2/tests/resources/duplicate.git/objects/pack/pack-e87994ad581c9af946de0eb890175c08cd005f38.idx b/vendor/libgit2/tests/resources/duplicate.git/objects/pack/pack-e87994ad581c9af946de0eb890175c08cd005f38.idx deleted file mode 100644 index fd8abee98e1e5d320ad6bff8ed99ff1410fee785..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1156 zcmexg;-AdGz`z8=qhK@yNDTo-poWo-L3wAWVP>G4QE;z5>&d!Lv)ra{t}*!6c*x_u zqm=SFMl)4r?iIIJvV9MmRzGjf;wf%kzoXhD=O?QeCcKMwv(>qJIDh@?+}{~#WAP@l1-LLQmQqe~6#69eV~ ziJ|S^cj*`O?XU05y2L;u+G#2X&Vxn69HK|aF6EE_3l)x-6`j3qyS|eQPZs@HSnByX z^tF<_SmyWPskMu=o3;QrdJoR&!GJL;ZR@)9&VTmbS6>vtHY=b4c$_mdFfcPQQAo?o zNo6?4Xr{`{z2f#tw(nun>gUZ_JjKlm0HE6oy*7B9%Sg@1$>#z92ulJV25EQm{aU27 P`>Lhm`q)i$Pq69PmE&v{ diff --git a/vendor/libgit2/tests/resources/duplicate.git/objects/pack/pack-f4ef1aa326265de7d05018ee51acc0a8717fe1ea.idx b/vendor/libgit2/tests/resources/duplicate.git/objects/pack/pack-f4ef1aa326265de7d05018ee51acc0a8717fe1ea.idx deleted file mode 100644 index 9f78f6e0f7d243f298189b35f19af590295b7011..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1100 zcmexg;-AdGz`z8=qhK@yMniz~5MTsq8S?lXqnRo*_lnyq*}jKOtDiS#@f0_&pedrD w(BQepBIF?NH7}mkQQqa%&l9+4fd?z5f_^jYoP9{cY0JI1iG5`Po diff --git a/vendor/libgit2/tests/resources/duplicate.git/objects/pack/pack-f4ef1aa326265de7d05018ee51acc0a8717fe1ea.pack b/vendor/libgit2/tests/resources/duplicate.git/objects/pack/pack-f4ef1aa326265de7d05018ee51acc0a8717fe1ea.pack deleted file mode 100644 index d1dd3b61af11b23c05d779832d773633a48462f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 47 zcmWG=boORoU|<4bMze}Jr#;S|Jo%i7fy0|g{vL~vgS^+gcveSwmsdYed5aR~zh<5!@R2uR)1qj&j_9Tpay zmAUca-1@|oKPz5*WZ+1xNKKB m&fm|7av#*+5OY!e-4a!mvDo{jxEjO%3x450zTWtGj0XV0;i; 1338847682 -0700 commit (initial): Initial commit of test data diff --git a/vendor/libgit2/tests/resources/filemodes/.gitted/logs/refs/heads/master b/vendor/libgit2/tests/resources/filemodes/.gitted/logs/refs/heads/master deleted file mode 100644 index 1cb6a84c1..000000000 --- a/vendor/libgit2/tests/resources/filemodes/.gitted/logs/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 9962c8453ba6f0cf8dac7c5dcc2fa2897fa9964a Russell Belfer 1338847682 -0700 commit (initial): Initial commit of test data diff --git a/vendor/libgit2/tests/resources/filemodes/.gitted/objects/99/62c8453ba6f0cf8dac7c5dcc2fa2897fa9964a b/vendor/libgit2/tests/resources/filemodes/.gitted/objects/99/62c8453ba6f0cf8dac7c5dcc2fa2897fa9964a deleted file mode 100644 index cbd2b557ae502c93ddd7cc2a10b22d12f744cca0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 139 zcmV;60CfL&0hNtG4#FT1MO|}>xqt?k2FAn~I=&SJz!mYKNkQ1 diff --git a/vendor/libgit2/tests/resources/filemodes/.gitted/objects/a5/c5dd0fc6c313159a69b1d19d7f61a9f978e8f1 b/vendor/libgit2/tests/resources/filemodes/.gitted/objects/a5/c5dd0fc6c313159a69b1d19d7f61a9f978e8f1 deleted file mode 100644 index a9eaf2cba81d9bb3485be1167e61a27546d17ab0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb5HD@q1FfcPQQAn*wO^(k`OJi7i^e+Fg!@{DoGB;kFTc5b{ zXT^(;Xljh|^Wuw364O&th*e#lUzDAaS%gcuxv44C0eM6yF#qvr Fb^<2{Dr*1$ diff --git a/vendor/libgit2/tests/resources/filemodes/.gitted/refs/heads/master b/vendor/libgit2/tests/resources/filemodes/.gitted/refs/heads/master deleted file mode 100644 index 9822d2d3f..000000000 --- a/vendor/libgit2/tests/resources/filemodes/.gitted/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -9962c8453ba6f0cf8dac7c5dcc2fa2897fa9964a diff --git a/vendor/libgit2/tests/resources/filemodes/exec_off b/vendor/libgit2/tests/resources/filemodes/exec_off deleted file mode 100644 index a5c5dd0fc..000000000 --- a/vendor/libgit2/tests/resources/filemodes/exec_off +++ /dev/null @@ -1 +0,0 @@ -Howdy diff --git a/vendor/libgit2/tests/resources/filemodes/exec_off2on_staged b/vendor/libgit2/tests/resources/filemodes/exec_off2on_staged deleted file mode 100755 index a5c5dd0fc..000000000 --- a/vendor/libgit2/tests/resources/filemodes/exec_off2on_staged +++ /dev/null @@ -1 +0,0 @@ -Howdy diff --git a/vendor/libgit2/tests/resources/filemodes/exec_off2on_workdir b/vendor/libgit2/tests/resources/filemodes/exec_off2on_workdir deleted file mode 100755 index a5c5dd0fc..000000000 --- a/vendor/libgit2/tests/resources/filemodes/exec_off2on_workdir +++ /dev/null @@ -1 +0,0 @@ -Howdy diff --git a/vendor/libgit2/tests/resources/filemodes/exec_off_untracked b/vendor/libgit2/tests/resources/filemodes/exec_off_untracked deleted file mode 100644 index a5c5dd0fc..000000000 --- a/vendor/libgit2/tests/resources/filemodes/exec_off_untracked +++ /dev/null @@ -1 +0,0 @@ -Howdy diff --git a/vendor/libgit2/tests/resources/filemodes/exec_on b/vendor/libgit2/tests/resources/filemodes/exec_on deleted file mode 100755 index a5c5dd0fc..000000000 --- a/vendor/libgit2/tests/resources/filemodes/exec_on +++ /dev/null @@ -1 +0,0 @@ -Howdy diff --git a/vendor/libgit2/tests/resources/filemodes/exec_on2off_staged b/vendor/libgit2/tests/resources/filemodes/exec_on2off_staged deleted file mode 100644 index a5c5dd0fc..000000000 --- a/vendor/libgit2/tests/resources/filemodes/exec_on2off_staged +++ /dev/null @@ -1 +0,0 @@ -Howdy diff --git a/vendor/libgit2/tests/resources/filemodes/exec_on2off_workdir b/vendor/libgit2/tests/resources/filemodes/exec_on2off_workdir deleted file mode 100644 index a5c5dd0fc..000000000 --- a/vendor/libgit2/tests/resources/filemodes/exec_on2off_workdir +++ /dev/null @@ -1 +0,0 @@ -Howdy diff --git a/vendor/libgit2/tests/resources/filemodes/exec_on_untracked b/vendor/libgit2/tests/resources/filemodes/exec_on_untracked deleted file mode 100755 index a5c5dd0fc..000000000 --- a/vendor/libgit2/tests/resources/filemodes/exec_on_untracked +++ /dev/null @@ -1 +0,0 @@ -Howdy diff --git a/vendor/libgit2/tests/resources/gitgit.index b/vendor/libgit2/tests/resources/gitgit.index deleted file mode 100644 index 215da649e1c68079fb03f4f9bc0f196cca9855c8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 134799 zcma%^30zFw8^`ao@B5y1L^Ul+La2z6LQ)YjO;e3lv$W8n2vL!gQW6PClwD+(l4J=L z6463MBt`PxnYp)_(>r&{=l}UUulN7|e}B(;&U5y2&n$3soex0}9|Q>=a!9Lpg#Q^r zEd>3Aa9LIFASnJAgj@a{g5-C?|FwBw?#8t`FC0QviOjnstmtqZqo!t<9dTjl7o2&-J#5FBeD?y_%7P32?UzRoM{!8KC5*7P`?J9i$MuppF34L=R4lac)GEvv6(R~63z_PAC!+;L?;E*5fvyUe3Jg= zwN73~{k-A_n*%OMDXm6h=u8`jPAaG)G_`h_bmq-hbEhOml&<+ZY#tM5n0Rdr9rJPM z>;ZLfkB7e&zN_!~)R#W=Lsautvuv>K(%WO`Sd2qwFQ~&u=;@k6eWE6HnDEXouw<9R zu|B=|yT;I&J`SBUPzU$%mbPMv_iNP^C2Gk(OS@lvjTZQGdJG-Qap>$DrSrjG?73m0 ze{%W`(F@TtUOqg1ZQYHjW9ZBnhfX@EhF^%%7;h)QZ^B6kgX*UN!9rKQ+Zc9qo;lTZi z_EeVGc^)Wkoo{`RXFemnG@8e#Me;cZV4V&3D0s& z8&^K(f;u9T`e)ADwZG4;@7KjgUKggsU-C05`8S5nc=GuWsKY;@

    wmy64a1;2V{ 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 diff --git a/vendor/libgit2/tests/resources/icase/.gitted/HEAD b/vendor/libgit2/tests/resources/icase/.gitted/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/vendor/libgit2/tests/resources/icase/.gitted/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/vendor/libgit2/tests/resources/icase/.gitted/config b/vendor/libgit2/tests/resources/icase/.gitted/config deleted file mode 100644 index bb4d11c1f..000000000 --- a/vendor/libgit2/tests/resources/icase/.gitted/config +++ /dev/null @@ -1,7 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = false diff --git a/vendor/libgit2/tests/resources/icase/.gitted/description b/vendor/libgit2/tests/resources/icase/.gitted/description deleted file mode 100644 index 498b267a8..000000000 --- a/vendor/libgit2/tests/resources/icase/.gitted/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/vendor/libgit2/tests/resources/icase/.gitted/index b/vendor/libgit2/tests/resources/icase/.gitted/index deleted file mode 100644 index f8288ec137c4bdcb5c92955d588688424ed7b8a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1392 zcmZ?q402{*U|<4bkw9i~79h<4qxl#ZSeQ7s++bj6T*AP>_!XoEh}o|AN&KF?U7$MV z;?CFv(TUe9G8b-RU~~fMV}t4k(@_0)iPP@_($5Li52m5|?-Qrr4Wyq3svk^4^*Wn#^7f*6C#993e?alvnn60zna;x|WySaXsQ<}iVnz;FW7(0ICrW)6;Y znh4Uz3e^v$q55wUr#~5_p988NOhfhGBTj!RNIw@;KbVH 1359157123 -0800 commit (initial): initial commit diff --git a/vendor/libgit2/tests/resources/icase/.gitted/logs/refs/heads/master b/vendor/libgit2/tests/resources/icase/.gitted/logs/refs/heads/master deleted file mode 100644 index 3b16bd163..000000000 --- a/vendor/libgit2/tests/resources/icase/.gitted/logs/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 76d6e1d231b1085fcce151427e9899335de74be6 Russell Belfer 1359157123 -0800 commit (initial): initial commit diff --git a/vendor/libgit2/tests/resources/icase/.gitted/objects/3e/257c57f136a1cb8f2b8e9a2e5bc8ec0258bdce b/vendor/libgit2/tests/resources/icase/.gitted/objects/3e/257c57f136a1cb8f2b8e9a2e5bc8ec0258bdce deleted file mode 100644 index 10691c788ef81beafc66d471e9968e9580300bbb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 114 zcmV-&0FD260V^p=O;s>9F=H?^FfcPQQE+0o;wSNY@^*phn2S4O6GSIougF}u4Jzq^ zPtpyaqz67pFRYR#20)G&iwu}VT5n~l}60DF**HrlT7F=a3`FfcPQQ7~jkdayp|;LJD0@=w+(GdP|#YLnFUgi1Q$ TlXSr+nTSs^8LK1!g`+qnv|Si2 diff --git a/vendor/libgit2/tests/resources/icase/.gitted/objects/62/e0af52c199ec731fe4ad230041cd3286192d49 b/vendor/libgit2/tests/resources/icase/.gitted/objects/62/e0af52c199ec731fe4ad230041cd3286192d49 deleted file mode 100644 index e264aeab3bf5d3810397302ce55ba3f006b5484a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19 acmbmd_^oD+*408P6E_5c6? diff --git a/vendor/libgit2/tests/resources/icase/.gitted/refs/heads/master b/vendor/libgit2/tests/resources/icase/.gitted/refs/heads/master deleted file mode 100644 index 37410ec2a..000000000 --- a/vendor/libgit2/tests/resources/icase/.gitted/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -76d6e1d231b1085fcce151427e9899335de74be6 diff --git a/vendor/libgit2/tests/resources/icase/B b/vendor/libgit2/tests/resources/icase/B deleted file mode 100644 index d44e18fb9..000000000 --- a/vendor/libgit2/tests/resources/icase/B +++ /dev/null @@ -1 +0,0 @@ -start diff --git a/vendor/libgit2/tests/resources/icase/D b/vendor/libgit2/tests/resources/icase/D deleted file mode 100644 index d44e18fb9..000000000 --- a/vendor/libgit2/tests/resources/icase/D +++ /dev/null @@ -1 +0,0 @@ -start diff --git a/vendor/libgit2/tests/resources/icase/F b/vendor/libgit2/tests/resources/icase/F deleted file mode 100644 index d44e18fb9..000000000 --- a/vendor/libgit2/tests/resources/icase/F +++ /dev/null @@ -1 +0,0 @@ -start diff --git a/vendor/libgit2/tests/resources/icase/H b/vendor/libgit2/tests/resources/icase/H deleted file mode 100644 index d44e18fb9..000000000 --- a/vendor/libgit2/tests/resources/icase/H +++ /dev/null @@ -1 +0,0 @@ -start diff --git a/vendor/libgit2/tests/resources/icase/J b/vendor/libgit2/tests/resources/icase/J deleted file mode 100644 index d44e18fb9..000000000 --- a/vendor/libgit2/tests/resources/icase/J +++ /dev/null @@ -1 +0,0 @@ -start diff --git a/vendor/libgit2/tests/resources/icase/L/1 b/vendor/libgit2/tests/resources/icase/L/1 deleted file mode 100644 index 62e0af52c..000000000 --- a/vendor/libgit2/tests/resources/icase/L/1 +++ /dev/null @@ -1 +0,0 @@ -sub diff --git a/vendor/libgit2/tests/resources/icase/L/B b/vendor/libgit2/tests/resources/icase/L/B deleted file mode 100644 index 62e0af52c..000000000 --- a/vendor/libgit2/tests/resources/icase/L/B +++ /dev/null @@ -1 +0,0 @@ -sub diff --git a/vendor/libgit2/tests/resources/icase/L/D b/vendor/libgit2/tests/resources/icase/L/D deleted file mode 100644 index 62e0af52c..000000000 --- a/vendor/libgit2/tests/resources/icase/L/D +++ /dev/null @@ -1 +0,0 @@ -sub diff --git a/vendor/libgit2/tests/resources/icase/L/a b/vendor/libgit2/tests/resources/icase/L/a deleted file mode 100644 index 62e0af52c..000000000 --- a/vendor/libgit2/tests/resources/icase/L/a +++ /dev/null @@ -1 +0,0 @@ -sub diff --git a/vendor/libgit2/tests/resources/icase/L/c b/vendor/libgit2/tests/resources/icase/L/c deleted file mode 100644 index 62e0af52c..000000000 --- a/vendor/libgit2/tests/resources/icase/L/c +++ /dev/null @@ -1 +0,0 @@ -sub diff --git a/vendor/libgit2/tests/resources/icase/a b/vendor/libgit2/tests/resources/icase/a deleted file mode 100644 index d44e18fb9..000000000 --- a/vendor/libgit2/tests/resources/icase/a +++ /dev/null @@ -1 +0,0 @@ -start diff --git a/vendor/libgit2/tests/resources/icase/c b/vendor/libgit2/tests/resources/icase/c deleted file mode 100644 index d44e18fb9..000000000 --- a/vendor/libgit2/tests/resources/icase/c +++ /dev/null @@ -1 +0,0 @@ -start diff --git a/vendor/libgit2/tests/resources/icase/e b/vendor/libgit2/tests/resources/icase/e deleted file mode 100644 index d44e18fb9..000000000 --- a/vendor/libgit2/tests/resources/icase/e +++ /dev/null @@ -1 +0,0 @@ -start diff --git a/vendor/libgit2/tests/resources/icase/g b/vendor/libgit2/tests/resources/icase/g deleted file mode 100644 index d44e18fb9..000000000 --- a/vendor/libgit2/tests/resources/icase/g +++ /dev/null @@ -1 +0,0 @@ -start diff --git a/vendor/libgit2/tests/resources/icase/i b/vendor/libgit2/tests/resources/icase/i deleted file mode 100644 index d44e18fb9..000000000 --- a/vendor/libgit2/tests/resources/icase/i +++ /dev/null @@ -1 +0,0 @@ -start diff --git a/vendor/libgit2/tests/resources/icase/k/1 b/vendor/libgit2/tests/resources/icase/k/1 deleted file mode 100644 index 62e0af52c..000000000 --- a/vendor/libgit2/tests/resources/icase/k/1 +++ /dev/null @@ -1 +0,0 @@ -sub diff --git a/vendor/libgit2/tests/resources/icase/k/B b/vendor/libgit2/tests/resources/icase/k/B deleted file mode 100644 index 62e0af52c..000000000 --- a/vendor/libgit2/tests/resources/icase/k/B +++ /dev/null @@ -1 +0,0 @@ -sub diff --git a/vendor/libgit2/tests/resources/icase/k/D b/vendor/libgit2/tests/resources/icase/k/D deleted file mode 100644 index 62e0af52c..000000000 --- a/vendor/libgit2/tests/resources/icase/k/D +++ /dev/null @@ -1 +0,0 @@ -sub diff --git a/vendor/libgit2/tests/resources/icase/k/a b/vendor/libgit2/tests/resources/icase/k/a deleted file mode 100644 index 62e0af52c..000000000 --- a/vendor/libgit2/tests/resources/icase/k/a +++ /dev/null @@ -1 +0,0 @@ -sub diff --git a/vendor/libgit2/tests/resources/icase/k/c b/vendor/libgit2/tests/resources/icase/k/c deleted file mode 100644 index 62e0af52c..000000000 --- a/vendor/libgit2/tests/resources/icase/k/c +++ /dev/null @@ -1 +0,0 @@ -sub diff --git a/vendor/libgit2/tests/resources/issue_1397/.gitted/HEAD b/vendor/libgit2/tests/resources/issue_1397/.gitted/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/vendor/libgit2/tests/resources/issue_1397/.gitted/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/vendor/libgit2/tests/resources/issue_1397/.gitted/config b/vendor/libgit2/tests/resources/issue_1397/.gitted/config deleted file mode 100644 index ba5bbde24..000000000 --- a/vendor/libgit2/tests/resources/issue_1397/.gitted/config +++ /dev/null @@ -1,6 +0,0 @@ -[core] - bare = false - repositoryformatversion = 0 - filemode = false - logallrefupdates = true - ignorecase = true diff --git a/vendor/libgit2/tests/resources/issue_1397/.gitted/index b/vendor/libgit2/tests/resources/issue_1397/.gitted/index deleted file mode 100644 index fa0f541d682c27cb907103903c5f5cee2a914f43..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 233 zcmZ?q402{*U|<5_K#QOIfiy#)#ovAqjR1{H5NrnZW}yciv*zsDUQ?`{eRy`@vgXH& zB^Y>?2X)ol9JgS(^-#Fcx! Zt96*&*|Irjp3UNDk*o2SHn6w70ssOqMw$Qs diff --git a/vendor/libgit2/tests/resources/issue_1397/.gitted/objects/7f/483a738f867e5b21c8f377d70311f011eb48b5 b/vendor/libgit2/tests/resources/issue_1397/.gitted/objects/7f/483a738f867e5b21c8f377d70311f011eb48b5 deleted file mode 100644 index 63bcb5d76..000000000 --- a/vendor/libgit2/tests/resources/issue_1397/.gitted/objects/7f/483a738f867e5b21c8f377d70311f011eb48b5 +++ /dev/null @@ -1,3 +0,0 @@ -xÎQNÃ0 €ažs -¿£!'nâTBÓî°¸ŽC+Öe\Äv€ÿӯǾoÑËèfPƒ¦PL8FΆ‘ÒÌ%ª_Ä‹b4æIÜ—tk²°Uœ¸êLdeIÁòd<3/˜|0¥šjÈää1Ö£ÃõÛ\Gßô³c…wÛe»]ô~úùߊÁS -)ÏGxEèôÿqØsµÓUÚ‡8šÁmkæ~yIæ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/issue_1397/.gitted/objects/83/12e0889a9cbab77c732b6bc39b51a683e3a318 b/vendor/libgit2/tests/resources/issue_1397/.gitted/objects/83/12e0889a9cbab77c732b6bc39b51a683e3a318 deleted file mode 100644 index 06b59fede0a6cf2f69a233ec6b0193ee2ea260cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 48 zcmV-00MGw;0ZYosPf{?pWJt>_DlSpT$;?aTbjN= z==`BKX2@BY(UH}J-jj*ikso4=#(I`v7!_;8QKJa2KGz1*o1ZZCR??%@KEs9AP?lTT vPJ3v4CcXkHJ6LC=F>sV9rAXhi^B>ylpB8r_Cg^*G)RqjnEWC*i1sy#$=MO`P diff --git a/vendor/libgit2/tests/resources/issue_1397/.gitted/objects/8e/8f80088a9274fd23584992f587083ca1bcbbac b/vendor/libgit2/tests/resources/issue_1397/.gitted/objects/8e/8f80088a9274fd23584992f587083ca1bcbbac deleted file mode 100644 index f5c776b1704a072e0b229fa2b8a67c37f2d79a9a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 63 zcmV-F0Korv0ZYosPf{>7V@S&^DlSpT$;?aT%mOEMIS^K(-bk~0$X V(t)x``9Kk{aB@*j8UVhP7870q8eaea diff --git a/vendor/libgit2/tests/resources/issue_1397/.gitted/objects/f2/c62dea0372a0578e053697d5c1ba1ac05e774a b/vendor/libgit2/tests/resources/issue_1397/.gitted/objects/f2/c62dea0372a0578e053697d5c1ba1ac05e774a deleted file mode 100644 index f932f36183338a2623adff268e0d6116ecea66d5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 94 zcmV-k0HObQ0V^p=O;xZoW-v4`Ff%bxNG{4ri%-kUN!2T#oF12 zX9q58e!N%$s<1deH#I)LBqOyb9#v0Ye*;I?q>{hN5uTI2wsY7l+_QTP0D0~xg5r)R A!2kdN diff --git a/vendor/libgit2/tests/resources/issue_1397/.gitted/objects/ff/3578d64d199d5b48d92bbb569e0a273e411741 b/vendor/libgit2/tests/resources/issue_1397/.gitted/objects/ff/3578d64d199d5b48d92bbb569e0a273e411741 deleted file mode 100644 index fbd7317276615c933f2300b066f6140b3ca973fd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 73 zcmV-P0Ji^l0V^p=O;xZoW-v4`Ff%bxNG{4ri%-kUN!2T#oF12 fX9q58e!N%$s<1deH#I)LBqOybp0FMOg{~_;nxj*S z(`kGDk)20*ay-3{Gq5J=l~j~~w8QnIne&GzbJ&yhVJ5-!!)T~`{t{&lYYrjz{3psB p_7Vc_;RpJdi0}cLlLU3qd&9h?|8Eo(2_>vuVPIe7nQ(pbQ~+(}YqkIY diff --git a/vendor/libgit2/tests/resources/issue_592/.gitted/info/exclude b/vendor/libgit2/tests/resources/issue_592/.gitted/info/exclude deleted file mode 100644 index a5196d1be..000000000 --- a/vendor/libgit2/tests/resources/issue_592/.gitted/info/exclude +++ /dev/null @@ -1,6 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ diff --git a/vendor/libgit2/tests/resources/issue_592/.gitted/logs/HEAD b/vendor/libgit2/tests/resources/issue_592/.gitted/logs/HEAD deleted file mode 100644 index f19fe35a6..000000000 --- a/vendor/libgit2/tests/resources/issue_592/.gitted/logs/HEAD +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 4d383e87f0371ba8fa353f3912db6862b2625e85 nulltoken 1331989635 +0100 commit (initial): Initial commit -4d383e87f0371ba8fa353f3912db6862b2625e85 e38fcc7a6060f5eb5b876e836b52ae4769363f21 nulltoken 1332227062 +0100 commit (amend): Initial commit diff --git a/vendor/libgit2/tests/resources/issue_592/.gitted/logs/refs/heads/master b/vendor/libgit2/tests/resources/issue_592/.gitted/logs/refs/heads/master deleted file mode 100644 index f19fe35a6..000000000 --- a/vendor/libgit2/tests/resources/issue_592/.gitted/logs/refs/heads/master +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 4d383e87f0371ba8fa353f3912db6862b2625e85 nulltoken 1331989635 +0100 commit (initial): Initial commit -4d383e87f0371ba8fa353f3912db6862b2625e85 e38fcc7a6060f5eb5b876e836b52ae4769363f21 nulltoken 1332227062 +0100 commit (amend): Initial commit diff --git a/vendor/libgit2/tests/resources/issue_592/.gitted/objects/06/07ee9d4ccce8e4c4fa13c2c7d727e7faba4e0e b/vendor/libgit2/tests/resources/issue_592/.gitted/objects/06/07ee9d4ccce8e4c4fa13c2c7d727e7faba4e0e deleted file mode 100644 index 05dec10f7319fd5f921d7812bdcc61036393f017..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 87 zcmV-d0I2_X0V^p=O;s>7GGZ_^FfcPQQApG)sVHIixb}VWX^u`QPN(hpM|K|N$?^0) tZejog3dszGF8kEH6Px1qe`|32H*@y=ms#SIpqg_CXfDC3834qIH6T`qC++|M diff --git a/vendor/libgit2/tests/resources/issue_592/.gitted/objects/49/363a72a90d9424240258cd3759f23788ecf1d8 b/vendor/libgit2/tests/resources/issue_592/.gitted/objects/49/363a72a90d9424240258cd3759f23788ecf1d8 deleted file mode 100644 index e997e1b497234b378110991a283e4c54a4574e0b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 55 zcmV-70LcG%0V^p=O;s>6V=y!@Ff%bxNYpE-C}H@x_I>hcj!r2~r|tPib{^%)@$^0p NRgi>J0RY@!9Fj_07cl?; diff --git a/vendor/libgit2/tests/resources/issue_592/.gitted/objects/4d/383e87f0371ba8fa353f3912db6862b2625e85 b/vendor/libgit2/tests/resources/issue_592/.gitted/objects/4d/383e87f0371ba8fa353f3912db6862b2625e85 deleted file mode 100644 index c49a8be58..000000000 --- a/vendor/libgit2/tests/resources/issue_592/.gitted/objects/4d/383e87f0371ba8fa353f3912db6862b2625e85 +++ /dev/null @@ -1,2 +0,0 @@ -xM -Â0]ço/”¤I›DÜzŒçë æbz ÞÀíÀÌHÍ9v2Ëtê =k¬›,pâ+£øÍ>ðƒ4ïýU•=¥^ß(tAF‹2´ÌŸÛ3sLƒÔ|%c­Y—u¶µÑZô˜vü©«{‰=r¢_G}KÈ>ˆ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/issue_592/.gitted/objects/71/44be264b61825fbff68046fe999bdfe96a1792 b/vendor/libgit2/tests/resources/issue_592/.gitted/objects/71/44be264b61825fbff68046fe999bdfe96a1792 deleted file mode 100644 index 25d44d9381bd35d101ebbc205102169fe4cc150f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 50 zcmb7GGZ_^FfcPQQApG)sVHIixb}VWX^u`QPN(hpM|K|N$?^0) zZejog3dszGF8kEH6Px1qe`|32H*@y=ms#SIpqg_CXf9#!G_xvN$vZ_wg(>2!dE_Va NjyE4~005;)Gfdx%FoggB diff --git a/vendor/libgit2/tests/resources/issue_592/.gitted/objects/e3/8fcc7a6060f5eb5b876e836b52ae4769363f21 b/vendor/libgit2/tests/resources/issue_592/.gitted/objects/e3/8fcc7a6060f5eb5b876e836b52ae4769363f21 deleted file mode 100644 index 36c5b9aabbd2a27b0eeb173532f9be1a2533084c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 137 zcmV;40CxX)0ga7G3IZ_@06pgweHVsKVqykFy!wnR9SvrI*z^39C32cbVlY8xM5R}2F(CR#Q6*z?!r)HAZ~Pn+`c^BC7j?K$qgmpTX*U19J(@3d riKAUXYAsi{T5aHn5>f1QpECWeE2Yk8)lV1qUby%Q-;VeI>GeI#-X1+@ diff --git a/vendor/libgit2/tests/resources/issue_592/.gitted/objects/f1/adef63cb08891a0942b76fc4b9c50c6c494bc7 b/vendor/libgit2/tests/resources/issue_592/.gitted/objects/f1/adef63cb08891a0942b76fc4b9c50c6c494bc7 deleted file mode 100644 index c08ecd5edaf4373090ce12dad69e53761e4a156b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 29 lcmb|7XJBYt!oa}z6(}VF#GDQ6S7gJdJUi#> zt26y^!PS+ka)X2!xb)I9OES~*@{3YIW`KbI7UdJjG}OE-H1k9@yKD$;t3P}2gWRf8 z)-2~28L$2KFvvm7O3_cw&nrpH%u7wtFDXh)&Q47+)+?zfftafTau3M8U>a(EADa0* z`70(~ep+$DPKJ5!&If;QJbP&(TF)Q?GaqWI5zJJud0bF)!8Fv|PNK}^ftqKCFz?bE X?hg~%?(*1Bp diff --git a/vendor/libgit2/tests/resources/issue_592b/.gitted/info/exclude b/vendor/libgit2/tests/resources/issue_592b/.gitted/info/exclude deleted file mode 100644 index a5196d1be..000000000 --- a/vendor/libgit2/tests/resources/issue_592b/.gitted/info/exclude +++ /dev/null @@ -1,6 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ diff --git a/vendor/libgit2/tests/resources/issue_592b/.gitted/logs/HEAD b/vendor/libgit2/tests/resources/issue_592b/.gitted/logs/HEAD deleted file mode 100644 index 6f3ba90cc..000000000 --- a/vendor/libgit2/tests/resources/issue_592b/.gitted/logs/HEAD +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 3fbf1852f72fd268e36457b13a18cdd9a4c9ea35 Russell Belfer 1337205933 -0700 commit (initial): Initial commit diff --git a/vendor/libgit2/tests/resources/issue_592b/.gitted/logs/refs/heads/master b/vendor/libgit2/tests/resources/issue_592b/.gitted/logs/refs/heads/master deleted file mode 100644 index 6f3ba90cc..000000000 --- a/vendor/libgit2/tests/resources/issue_592b/.gitted/logs/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 3fbf1852f72fd268e36457b13a18cdd9a4c9ea35 Russell Belfer 1337205933 -0700 commit (initial): Initial commit diff --git a/vendor/libgit2/tests/resources/issue_592b/.gitted/objects/3f/bf1852f72fd268e36457b13a18cdd9a4c9ea35 b/vendor/libgit2/tests/resources/issue_592b/.gitted/objects/3f/bf1852f72fd268e36457b13a18cdd9a4c9ea35 deleted file mode 100644 index 6eaf64b46..000000000 --- a/vendor/libgit2/tests/resources/issue_592b/.gitted/objects/3f/bf1852f72fd268e36457b13a18cdd9a4c9ea35 +++ /dev/null @@ -1,2 +0,0 @@ -x•K -1]ç}%Bwn½A§íq‰™Îý x·ªz¼µVƃv É‚còžÑ&”%9¦@˜9x¤dÝëŒìÙÐÐuëðû.µÂ]ê".=ßÞEבO¼µ+¸ÐÛ˜B€£EkÍ\çŸNô_Ó<>E Uø%Ìû•9 \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/issue_592b/.gitted/objects/6f/a891d3e578c83e1c03bdb9e0fdd8e6e934157f b/vendor/libgit2/tests/resources/issue_592b/.gitted/objects/6f/a891d3e578c83e1c03bdb9e0fdd8e6e934157f deleted file mode 100644 index c4becfe2f1e3346ab4868611c31637ca67503936..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 28 kcmb`T0E##X@c;k- diff --git a/vendor/libgit2/tests/resources/issue_592b/.gitted/objects/a6/5fb6583a7c425284142f285bc359a2d6565513 b/vendor/libgit2/tests/resources/issue_592b/.gitted/objects/a6/5fb6583a7c425284142f285bc359a2d6565513 deleted file mode 100644 index 9b74072213b43924e48b2b521487d31512f371d6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 93 zcmV-j0HXhR0V^p=O;s>AV=yrQ0)^!KypqJsywnti@7Lq^ukDuAGpKp1QMbHnt%J>- z$A$(5W+o;IB}IwJ*{LZ;dL-Z@Z diff --git a/vendor/libgit2/tests/resources/issue_592b/.gitted/objects/ae/be7a55922c7097ef91ca3a7bc327a901d87c2c b/vendor/libgit2/tests/resources/issue_592b/.gitted/objects/ae/be7a55922c7097ef91ca3a7bc327a901d87c2c deleted file mode 100644 index 1494ed8229d77d650cdf2aef711ce298a15c7a0f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 122 zcmV-=0EPc}0V^p=O;s>7G-5C`FfcPQQP4}zEXhpI%P&f0Xkfo08$RXPIbUC$>5mJp zu3VKHBy3^;1PTxZDGbZvw?$ahI0dzc=xanDj$CvtEL0e3PDxQ>a&~Hpp4U@$Z=Ff%bxC@D%z&Q47+)+?zfVc6`lA+)Xj?7^;7QRxSqar2Nv% zoSaO!t8lt&Dyn&mZAYG+S^OsJfk@va!=FXr_j?TG7~>f@(~A5GG{O}FfcPQQAjKi J1OUKwTBN=BVB7!z diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/00/7f1ee2af8e5d99906867c4237510e1790a89b8 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/00/7f1ee2af8e5d99906867c4237510e1790a89b8 deleted file mode 100644 index d9399d71c..000000000 --- a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/00/7f1ee2af8e5d99906867c4237510e1790a89b8 +++ /dev/null @@ -1,3 +0,0 @@ -x¥NI -1ô<¯ÈF²tgA05AV|0V^p=O;s>5GG{O}FfcPQQAjKNcK?DVcI~22@p9YGMvp&D4qwehTf=^DNYqjI@`Ot#YvJ KJq`f;l3aIJ+G3Re diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/05/c6a04ac101ab1a9836a95d5ec8d16b6f6304fd b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/05/c6a04ac101ab1a9836a95d5ec8d16b6f6304fd deleted file mode 100644 index c6a3a3b8def22521b0be327923d3bb028613e4e4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 208 zcmV;>05AV|0V^p=O;s>5GG{O}FfcPQQAjKdv{d K)&Ky^dR($J31Z&> diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/06/db153c36829fc656e05cdf5a3bf7183f3c10aa b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/06/db153c36829fc656e05cdf5a3bf7183f3c10aa deleted file mode 100644 index 85887e0f5..000000000 --- a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/06/db153c36829fc656e05cdf5a3bf7183f3c10aa +++ /dev/null @@ -1,2 +0,0 @@ -x%P»nÃ@ ë|_ÁH‚ŠN™Š.}%)Q¶eû€óÉ8É1ò÷Õ9›@R$¥&Iƒ—×ç§÷ßãߧ¯Ë÷!„w6pFÃ,KîÒ£*ÊHL s¿ß¯¤#¢¡Ý0ÊÝ+3î²”0‹í0/`#Cib'‡Â]äl -RôR°q£o©,ók´ñ¹>ü\ŽŸçóµvXɸìP£zIIÖM6iY],ÜW®z’p²Bîë¡zûPdF4òVÊåæ½ .¨·xÂV!‹y©“®~9˜Ö€¦0uõÌho°U`Ô$Þë,’µ_Rí:-êa2¡%Sw^cJ ®…>fFŸèæO‚ùvý×;„+‹Ÿ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/07/10c3c796e0704361472ecb904413fca0107a25 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/07/10c3c796e0704361472ecb904413fca0107a25 deleted file mode 100644 index 9f48594b5e9dd2d86998975017e8b841120dcc46..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 208 zcmV;>05AV|0V^p=O;s>5GG{O}FfcPQQAjKNcK?DVcI~22@p9YGMvp&6G05AV|0V^p=O;s>5GG{O}FfcPQQAjK9+jN$ zO%DLOR++W2fmr~9up}2^BE;EY8b=2(r$nAcM=`1=R(>=s*0GHgVqbY79#}-sM+Sn) z4Pd}HV6h6fwv?(b>4i1v>r(Ps9{R{V{irj4i=R7C$tP_AyoYJ_M(;bvsGjz-jsL_b PT>E>xZL4|%(vDH^g)m9w diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/0e/8126647ec607f0a14122cec4b15315d790c8ff b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/0e/8126647ec607f0a14122cec4b15315d790c8ff deleted file mode 100644 index c99a6865c2694d0e01ab408d95c2303c75596416..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 208 zcmV;>05AV|0V^p=O;s>5GG{O}FfcPQQAjK*bF-)ZbitUz~A8-NutKB~y;hfT}7>P0RtSS-v4HxGwv-z^wgG{!ialdgVd+ KEd>DYnqMw)Z)Roy diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/0f/a6ead2731b9d138afe38c336c9727ea05027a7 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/0f/a6ead2731b9d138afe38c336c9727ea05027a7 deleted file mode 100644 index b06362dd8..000000000 --- a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/0f/a6ead2731b9d138afe38c336c9727ea05027a7 +++ /dev/null @@ -1 +0,0 @@ -x¥»JAEç+*Ûh¥k«ú"ÂbhæTwÕ8Ì´´-ûûŽ¯\0»/ÜÚÖõ2€<ÝŒnŒKIÊÎò\9¹Dµº`5TdÏ©Ä4½J·m€› ³I)ꈼ"-鄱晴ˆOú»'„3–YÉG ŠJAXSd#´(NPx’÷±´z•®ð¼´õ­mpg{ú©ì«øq·µ­÷€Ì>eÌ9ÁѱsÓžîç†ý3=Y1ø¦Áá¯pÙFƒÒe«ËùˆÓ2Õoz \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/12/4d4fe29d3433fdaa2f0f455d226f2c79d89cf3 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/12/4d4fe29d3433fdaa2f0f455d226f2c79d89cf3 deleted file mode 100644 index f0ea020fb001f27b4f65ca32006f9280676ad0e1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 208 zcmV;>05AV|0V^p=O;s>5GG{O}FfcPQQAjKv0G{d^~5I z7I;MXskJ>b=jK#CR`l%o>z7Zy?6x;_w|_XSjd`;yy4r0&n8U+8UEkjCX-kLwJ>@Pj z)8lAU7K$xRHgj5?w_|WI2-RaI>87mz24v6(RP^J8KwOs)mR*$6uMhLRHo4DDm-=zJ087$Z!@b+qZ-_eBAKQvlgko}U&O z1v(laZ9OOgZ<;AU80A$&1g4q&sR*T|d^`$OjCci_ShFNKS+LEW6N5o{OaP;`wrNOW z&s292_B1ruB%bGu`jnOi^KM(lX4?W`EJ5mQSJ&aOj=FlN|}f<^bUuE|c=famI(PEej}x^9jBDKdgJ1v~@< zt>ro+88R^g$3>?i&Ex3MB=A&np{mp;4!~$8HKra@yp4pds6P_Xh1V0CCEy(MB*R~bm_Q0DrJM0F^qlsT?Z^~Sjz08H6$D*;luKjRmHj@k z6(-lg;${S$d`rm*Lx%RT)H`3m^f9*7;5gb$?$?C?#HoO6YtNqwMgd0yrJaXG=uI01 zfKgusA~bF6#{x=Ax$lK)wi%vR)71JD%X%jG6WLGR8b4^WeP@g+`?2LXCjBrgMX3SdZxXG9dS(%~Z#;KtB zu{bmdyq398D$U3N8qKP~G)rnd@>5<&8}4`X5EF8128(&1EiN?Kt<009HvR_Zu1=g^D_t1WDRayobo6It5Zuwb?oYP83U`9SO{JP?Q6U$TCA0F*VC^zbG5Bpqhk#Z#F~8I==~LNlF6$@t$me|db>MGGVSkT;MBOoNrj^%~6Yxstxo^mZp7Iv;f>@s$ z+FYKFlXO5E@vh^#(X$OS+2u^0K`m1oohQj`d*}B$HN}$TOftI#7fkFrD_{mjyHe#q z>rEBrEy?79F8|3Eod1VaRu#?o7)DNK%64Xo7zYmhV+BHoj=D4sL;XJ{w!-8FNZgG8 z$@i3;FlZ=_rP29n%ot-&9j*gralZ}+Ku!r{+j@RqZ4~%uz;y7C2)=2j0Ao~FH4&V4 z_H#8#M|m8DT1H5LHr7NWCkwTCa$>M3mjp68Yx|xgE==7N5l>I6P2zb!YfkC-C9$l? zl-iwohB%hSNOnnMIN%kj-p5I;joO6bG}OhAT_`S$gf`Wwf)lT^lNF;eVr%WeHFY=< zN=ED$IDEhQn(T%HWUi^{2Gx0@%V6}Q+6dJYP*@ag;4Y&XvN40l&8KS3TX6shywzT) zE8WZi9L=V|bS3p3`Kez>8|qK=7!z{qCW}7M9t$mYuYI!A$KUWdxs}0qu{nxyp`pPg zL6UY>?bm9+Gc+Ygqh6wMum-+Nyug{71`WLZ)$f9tpym45Hf=EO?sYYEqGVeAl^G76 z=!gDaY=0&01cSR$HA_(ot-gxerXqN+roGj_zMDjI UDBY|+At``qBPE~AAEX6|z4XmEIRF3v diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/1c/1bdb80c04233d1a9b9755913ee233987be6175 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/1c/1bdb80c04233d1a9b9755913ee233987be6175 deleted file mode 100644 index a2146496decf282eba468c692c6f7e10bf64d1c0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 208 zcmV;>05AV|0V^p=O;s>5GG{O}FfcPQQAjKTiU*U#^-LkMR!aGYktDm4!Z8PN+BWhADIj(I$tHqsf<(C--K0g3Jn zh#7aOC9GmctaS%$W+*M} zHA+gd?XtB<&#D+=;oi7$&6DgIS1aVc9uS(h4@K%UgP@Ub{IF6kH}7R|LA%8h_6k|d zOHEj$aP!N-gtP^8g=uJKMtg^C0;4YRNmr4qV@<8=Qq{v`K~JXcyv3A2!vG3n%#1P7 S&7TDG?e-h5cL@L5MT~_s`-Tqy diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/21/950d5e4e4d1a871b4dfcf72ecb6b9c162c434e b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/21/950d5e4e4d1a871b4dfcf72ecb6b9c162c434e deleted file mode 100644 index a87732611a38ea041d580d75e7e8b5a865babf96..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 670 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 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/3a/3f5a6ec1c968d1d2d5d20dee0d161a4351f279 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/3a/3f5a6ec1c968d1d2d5d20dee0d161a4351f279 deleted file mode 100644 index f39a1271f..000000000 --- a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/3a/3f5a6ec1c968d1d2d5d20dee0d161a4351f279 +++ /dev/null @@ -1 +0,0 @@ -x¥OÛ !ô›*h@³àÂBbŒ?× ðXr&Þaµ}ÑØóÈLfR]–K—qÓ³°Q{— Ž€ `OzãÉšètɤµ¸…Æk—”(gØ“+*+—ÀX[F8뉬>¹ŒE„GŸk“S~…–åy®Ë½®òÀCý Û¥º¥B4Æ€³NnÄPÇØÎÖˆ)ËOWñ¯N: \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/3b/919b6e8a575b4779c8243ebea3e3beb436e88f b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/3b/919b6e8a575b4779c8243ebea3e3beb436e88f deleted file mode 100644 index c85731d6bddd857db09da0d014be4038dfe35be3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 208 zcmV;>05AV|0V^p=O;s>5GG{O}FfcPQQAjKTj;SFV484ZsWk8T$lY^VAlR8|EF&&z4D;^ KmI44rFkeE4X<!?*!?#? z_;cH~%K&1!8C?~Sa}e~BEm}!d;zB_p7uLKK8&ar&(AQ#KrRzRmsl=5qRmI4bY7Dt9 zBED2y$cvKKNJ;c}PePR?Xtp_qNi42#aadGw;;ndMTisnW@;27i;jz3+FYvs!?b>!Y z=}bS>S-*-OcbnUG57v8TwhjXv(Ic9f&T~Wmi7`*wUlhJ+aQN$m16=meAa&XE`fzmS I18dK3v%N-Vt^fc4 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/41/71bb8d40e9fc830d79b757dc06ec6c14548b78 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/41/71bb8d40e9fc830d79b757dc06ec6c14548b78 deleted file mode 100644 index 5dc102d358917edae09f34364facca556412efae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 207 zcmV;=05Jb}0V^p=O;s>5GG{O}FfcPQQAjKKV#Ms+PV JoB-JMTjB{mWX1ph diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/42/1b392106e079df6d412babd5636697938269ec b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/42/1b392106e079df6d412babd5636697938269ec deleted file mode 100644 index 3a8324c1b..000000000 --- a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/42/1b392106e079df6d412babd5636697938269ec +++ /dev/null @@ -1,2 +0,0 @@ -x¥Q -Â0DýÎ)re7ÉDüé ¼@“Ý¥‚m¤F½¾U¼3o`˜)uš.ÍzÄM[D¬Š‚Ó½,˜‚PH^‚w*)c&Îæ6,27›JÊJAºDêØQ£&ðìKN)ÆÜbT3<ÚXÛókXØžÇ:Ýël²Ò:É7ø¹]©ÓÑ:Ä¢‹v `VºŽmògéy½ü”ájÞ=ïO“ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/42/44d13e2bbc38510320443bbb003f3967d12436 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/42/44d13e2bbc38510320443bbb003f3967d12436 deleted file mode 100644 index a19b1912041308d6bd7c6d11d312053712c29500..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 207 zcmV;=05Jb}0V^p=O;s>5GG{O}FfcPQQAjK05AV|0V^p=O;s>5GG{O}FfcPQQAjKþ~WöŠ€EŒNéYZGj¡ -“RSÓÀj2¾Ièû´^ž'Ìy³¦Î51ìΆi05ù¥™99™`eÞ5a Ýz%õ潎’½Ç×ÐÊU–^”XV VtäÙ™Åo²ˆô]2üY~¿ÇPŽ1ª(¿²¸$µbãzùãõ7×Þg\Q·ñdLÉ”£3 ªÊRsÀjü/]3ßû”©VLõë›lgž{ÄW[ÿ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/43/5424798e5e1b21dd4588d1c291ba4eb179a838 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/43/5424798e5e1b21dd4588d1c291ba4eb179a838 deleted file mode 100644 index 58ab2391707739b6ce0fe4b0c7c9f33400b20ee7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 208 zcmV;>05AV|0V^p=O;s>5GG{O}FfcPQQAjKX{GYz9^vZ+s KTM7VwgIs}8-eWre diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/43/6ea75c99f527e4b42fddb46abedf7726eb719d b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/43/6ea75c99f527e4b42fddb46abedf7726eb719d deleted file mode 100644 index e8825d867..000000000 --- a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/43/6ea75c99f527e4b42fddb46abedf7726eb719d +++ /dev/null @@ -1,2 +0,0 @@ -x¥ŽKj1D³Ö)t‡n©õc¼™ev¾@»ÕÃÌbFf,“ëG ¹¡U¯ (iÛ¶vë}ôCÕ‚ft1RR‰f`$tNTèŽÁc¨©€äy6>tï–]‡R€ÙÇ!Þ=@̱Tä\ -Ç”½áW_Úa§úÍGµ·¥m϶۳úë®úWü§OiÛÅ"QÈ%ø”ì À :Îv}sÆ|µºÎ«p_Ç…¡éäÌ7QA \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/48/3065df53c0f4a02cdc6b2910b05d388fc17ffb b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/48/3065df53c0f4a02cdc6b2910b05d388fc17ffb deleted file mode 100644 index 298251b3c681d267273687ff05e384797aa3c050..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 165 zcmV;W09yZe0i};k4#FT1gvzPwlJ zvRs>X5O!@9(J**$fRV(D&CW7|Ct_P%v^jxfi!sqa>Yi4)HH`)HL|!7&WZ6D%8Onl|EL(9jB2A{ZB9%z(Q zDp~`0c9}Zy!LU4TnP`R_a2j)I$sDeGffp+4!3AhA43rTJ zWFou6(+HCX3{H(@VP2uCCwfgfFK{R0k?|pZ5Tn=5VX^q(kEe+?4x#DTDaRH8q9={` zWw}8EEsSAvd9G9{tKCHm=?0zGU48B3V`RP-+bXJ(v;jb>SGxw2^@RZPNXkU^> z6Gz{R_OmI(24P;kl#I&RsBV>}TARmX?7g^Q>{EiS6pz508ZlJQ-6Vs%~M z*Ma+pM6e6PV2lD}J@`D|vUsK*C(2mlkIO%jE^wf>mCH&U9&2BqrrV&ut0!AnSYv1%RxAJj diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/4d/fc1be85a9d6c9898152444d32b238b4aecf8cc b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/4d/fc1be85a9d6c9898152444d32b238b4aecf8cc deleted file mode 100644 index 9db684d40b16434bca775fe6138b14567c1a4a89..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 168 zcmV;Z09XHb0i{k`3IZV%?b}t{4NR!xYak+sKKp9}SG_WRIEEQ*KZ|w{95^pHoKQ>2 z9i&#f-iQFBAmlR05LD7Sh?tVI-f`s4NN&*1&S~=Oj*Yes0o4)(I&Xw9DUnAhjj?{P z(FwIQW5J?l`0Q(KaEUK$5pHWOkGjEuM*2}F`W8R8549XYD5c$^=4FA2E6&+S$JtJQ W&ai8ZIpu&oj|&6mNw7CPgj3meM@@$S diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/4e/21d2d63357bde5027d1625f5ec6b430cdeb143 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/4e/21d2d63357bde5027d1625f5ec6b430cdeb143 deleted file mode 100644 index 34f183dd17d3105fc11c39606b2e10b2924c3024..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 662 zcmV;H0%`qt0Zo)abJH*og*oe2EccL^a^R9v4(ZSthJ-eyXW3rc8q1Q=${6$Oc`GNt zt&yeGd*6F%kLet8AD4_Hxcb!nhHpBD6nuz3N;Wqb93@*xZf*3t(n}#HgOm!a-PeYSU;(0x2 zPHFojah{MVRVy_Nb1XX}*(Jrejn_$KKUNB0#WY1^TE~!Gm|f@y+{>vMD_+m`R*c4o zTT2gase?qAGh)Yqjr)yjvI`cFxu&K!sLwq;wMKswjBrgMW^^sJTxT>x7G~(Ub1Gh&ahNcABDN8gCXuzfC5oAgl)bjGzzYC^^mjyW{ybf(J_O9h> z_(aLH`V%t5GG{O}FfcPQQAjKg*oR}_y-IlIB-C7+5<={A$BEp;heVaG-?`m~s}LV~uvbi@u*}<#pvutJE~`a3Y@uDx25^^|7323uQV^ z^3mF93_Z7rk$s}cFBghjC=}`>MAE{32yt&!lhmvi(m5=+;H2-pLKzh8CY2MdkQh=C ztM{Z+NH+W@duaZ@t*L6=T$FU>e4*lJCP6v+&_7iWbogjPWgOf8Yi6%ZVT8rqDLTc0 za!`g0>*MJfVgqv(8K}o~v{}Nhg8;;tfa1HzZyQDhM+c>2ghlAhJ0*ZIUkxHO?HuO@ z%1ZfqRq7ZaCEC~$(ULvfmMN&ipi(o$SgjuhQdyY#Nf6IKtIryFzgSNB_@z=;WJ=vm z1H&Ba$!Q7MFdpr#Q@f9o2G}sIf=qi!C8QeCmB77KRh&etoxD1W5mVb9+)@XLR10E9 z!NL8;HTw+*$lOx13Fh-m_oK6qh7qnQNx`n=k^6$p(2W^7UO6>1FEyY^;;rq4QR!z+ z(C9V`rmuO3$j^8oZMZ+vXUWK|pFH+~cB!=Zz3r2yL4JdC4l6_P;)|#Y=|p45iX{DP z-fyb`X4sUZCu50?0~&CdcmbJ~293P^^&gU(;N|w%Hrrs_-P>sR#FE+SugoBLrXTiy z@xx7cP!#Sa)h*S8941?4?VZ8eu}_lXex|#GR(Rj9Z0%LNPO6Ic>blqUZ|^44oN7NC RCnSYtwvk%S?hhNSg)?_+K#TwY diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/50/e4facaafb746cfed89287206274193c1417288 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/50/e4facaafb746cfed89287206274193c1417288 deleted file mode 100644 index b1eaee557..000000000 --- a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/50/e4facaafb746cfed89287206274193c1417288 +++ /dev/null @@ -1,2 +0,0 @@ -x+)JMU022g040031QH,.H,JL/-Ö+©(aø¿9/Ð>þ~WöŠ€EŒNéYZGj¡ -“RSÓÀj2¾Ièû´^ž'Ìy³¦Î51ìΆi05ù¥™99™`eÞ5a Ýz%õ潎’½Ç×ÐÊU–^”XV VtäÙ™Åo²ˆô]2üY~¿ÇPŽ1ª(¿²¸$µbãzùãõ7×Þg\Q·ñdLÉ”£3 ªÊRsÀjD-89S^75#¯Å-ð×¢ÿ3Ô;ªÊ\¥ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/53/9bd011c4822c560c1d17cab095006b7a10f707 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/53/9bd011c4822c560c1d17cab095006b7a10f707 deleted file mode 100644 index 3fa1e1f9458515e943efedf0aaa0bd442f2f8f0a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 163 zcmV;U09^lg0i};k3c@fDgm7XuWuD^;O_mv<9oSI z)1_IDxM_>3W%BI2Q|{v6TnI=Kg~ex~sM+@gV(Ett%#9bFnZsr1=XSYH2kQ_&04er%3kYD=bcJpD R=ZrbYdikk*HE-92PWSkwP(uI! diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/56/07a8c4601a737daadd1f470bde3142aff57026 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/56/07a8c4601a737daadd1f470bde3142aff57026 deleted file mode 100644 index bf3639d05..000000000 --- a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/56/07a8c4601a737daadd1f470bde3142aff57026 +++ /dev/null @@ -1 +0,0 @@ -x¥MJ1„]Ï)ú#éÎ?<Ä‹·pç:Žó3‘¼ˆ×w=Ô¦ê£((éû~›`Mx˜CrB‰Y‹MSµ‰P£-}®âðtŽjè–zL`ÎJÁRv­R §jåBV8‰Ze&þõƒ6‹Õz¶ÍsTr͵̽2š±©.ü9·>à¥~ñ¨ð¶õýÞ¸èIÜó~“Ñï½ÍGéû s1GŠ!Áj¼1ËIÏcSÿ1±¼êxW(ƒÙàºÜŽÙóuÅå#rbV \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/5a/ba269b3be41fc8db38068d3948c8af543fe609 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/5a/ba269b3be41fc8db38068d3948c8af543fe609 deleted file mode 100644 index 85bc8f569e855cbf01f67de58f490d51f7e8b5f8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 208 zcmV;>05AV|0V^p=O;s>5GG{O}FfcPQQAjKP}<4`%GqoWfxRYer0h< zY7xZ7_43CZ>Tj;SFV484ZsWk8T$lY^VAlR8|EF&&z4D;^ KmI45u^05AV|0V^p=O;s>5GG{O}FfcPQQAjK-wLp;;n{f K7XkpfJzPUFfMJ;c diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/5e/8747f5200fac0f945a07daf6163ca9cb1a8da9 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/5e/8747f5200fac0f945a07daf6163ca9cb1a8da9 deleted file mode 100644 index fa1c9e5dc44270905b8af66ec3cf6e38bbcb0a1f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 672 zcmV;R0$=@j0acVwkJB&^#X0*^4EIoJLE_R=4@J8Y+Ah0Y_EF)01=Xc+ahp+TFAo z@=c>7)Irl)p&vV%A=9|zrCw7UjFZ+sS=;KrwxX(ZQ`Wnl!=92JnLNtThyJO8pv_0Q z)OTIk?*r?|WI9+}RYWJ-QZSJrL;7gyjV)k$?^|kc9Bn4^Ya;-0A|UD7@`r*kf}?`c z&cY(}hLs$^h_3<>npU=B0VSo}_mOJW37!|Wa2He1aGM4b6)s9SK#bJtwx#GNre^Sn zr=?kkXnEaBPGQ@MKF>&+>XllCIgXWz$ppc;wULB5ALhLBmxL>&jyEOKNh1_}tM$r{tqxgllp>Vb(&&O~Pcv zg&8_-oC=yB*`SHzrObs;X-0O?s1^yP$)UB#Pk141xZlwiACOx!Xv_nxKGUSvGEbUX z{~MfxnHh>FoqSZrRn(afk)$5Q`*k$H43pwwB`h(>Km#rVPasp$ppKWn{*6-uye!Bu z;C09ZjxZRW^-m9u_<6quQpwZ=K6i!GA&152D!hgs4{^3OyHH`E_T0z1w1#Up-z4`;| Ggp305AV|0V^p=O;s>5GG{O}FfcPQQAjKsMr4E8`L(}{dV`nm Ki30$}rCe1lgkm%R diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/63/e8773becdea9c3699c95a5740be5baa8be8d69 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/63/e8773becdea9c3699c95a5740be5baa8be8d69 deleted file mode 100644 index 6d5c320fe3eafb23ef1b8056324cabfef9ee5260..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 207 zcmV;=05Jb}0V^p=O;s>5GG{O}FfcPQQAjKOO?0vKod_BCz|3M8g6!ELqmCq zxK)oFg_$!mkR7K}WGTX-awVdkXoa8_Py%U3r@|++>&)TLTi6c|pN5s?6WRrMa z51LcjK1rM>q)gRH4Z|GE&PaAiF>d2^QrVA{0$4Fk5t-I8WEW-^Is*4{YQ~D!v%M9g zG2+(JgKO#_5$258abV+q<(lk*1!S(N=?&_0PY^Q-~Q|OD)$K&5(r|I&Pc_ znjf>nkibjng;J>p4$x>84W^z`3Ia1k_NTB{PpjG>EUHTjtQ?r8;rec zxf(uEGOhl^41#-l*YBfkuEL$*;Hpy1IIED&WXY_&Gg#aD6oX&)bPO0}Q@*j)S8=;( y7Q9ze-RfW7O`;*p^`M-P6ozRdCF6g`1trr(3nN{hSC9xyiE9x0X#N1NX^iCWjYJFp diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/68/a2e1ee61a23a4728fe6b35580fbbbf729df370 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/68/a2e1ee61a23a4728fe6b35580fbbbf729df370 deleted file mode 100644 index 6d7c948c9dd91c54e87877ae3982a8b1a9415fea..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 665 zcmV;K0%rYq0Zo)abJH*og*oe2EccL^a^R9v4(YTrOjFvFo@IM&Yb;AfD`U*B=dGLo zw^-7y-uvDvm5&wO-F^P@;rr?Mm0r(p&wFE@-!Am{bUD+Jp3fJ$JiMGv^zH5Va(Sim zJ-r_OO?0vKod_BCz|3M8g6!ELqmCq zdO)ntJ6c@sx0STDHsW2)q9;7tK)oFg_?5|Js-p8GnQi0zTB`auCpnM|Zo~l->)HyG zLD8yGInV@&F65~7mZWz!6@KpptSX{2)${g z05IySK!m21{ZK$@DR-Sv#Wut9!kUQWWZ^dVP7E%}bAlMHwM|13N2a=uh^L{+Ch@!; zG^ey}Nt`F7Ow~#a!yL=bNOnmvZtb;GIggbBSTRiznbt967iJea0{2oiW5sK2Z^dYg zxV6l|HFb~(b4Kha*tlQ0Cc9t(nQLl#gZkXlV{7!IV1#Q5F=N(J%XP+N$ifUAH%B#F7cGo*eO^H#FeR=*=%e`qr0I-=FuYHp diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/68/af1fc7407fd9addf1701a87eb1c95c7494c598 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/68/af1fc7407fd9addf1701a87eb1c95c7494c598 deleted file mode 100644 index 6aaf79fcbfc06afb1e1f44d7b4d3b28dc0039f73..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 443 zcmV;s0Yv_I0cBD^J)#)~`ji=kUB$8BMjIypcL0h$;xRP)6!ZczhVDt&1Uz7p0H#<{OJl97U zgcwL^i5W6ZZB!^p_&s_KCn&Y+wT76b&1wP);T2CVV{KWjLBcUKIyRwQV5gK<6 z)~_RqSxxl-GK~?&j23};H_~@_E=n^{u@yQ>XL$7&gwgEO=&L0>iH;?yFt$ALrztI(nqaC8z&a>7Zp&I8pAN0WCFP$2O-q(?ym5+LeLvPrCSY~yt{$?L+G6)tk4kU%Y>M`aoYkefxZI?kit~>LRrGIFjO%(nP(;)X}h2946ur z+LbAYF6|e45M+MnQfz#Cg!Q=4 zcScoIbgOWsAqe9+zywtAm4JvTr`nO`;^Q?4rJEG{3*AXqz;l)RAP<^TiqjU1LQY#8 zWu!jvaHT9cOX*tOx+lA!9O@(b7D2)2Q&eZP)c?X6q-l}(Qc33dRH8Kk2>NQ?wqlvpHMgV+B-53jsBV)y09GA#Q*rNI9BU?-PR8n4rX8b{NiUDrkJS z#>IVIL}6sEP#W!F$k9Vhr9Eu{287ne%oiFZ_yGf?T1>7bFzwL9(DilYug92+rlY;JP3e_oWtY%)Op0?3(po5hq;V1r2sz+akEz z?=)AlD5y6_xc@uC++(7eNLWJI3%(6++bHOZXKwxdU$y}81q;%xsW4ST4JU=CT4mqHf5nW&}uWMhMvEC zyS=4{`@4txC;IgAOiy2LPN#-qU?WS6VJKd&x88OWExat8fLB7#eM2_%l-H;i#QNOO z>hidsqepG` z&~jCUc}p_7pv!-<_04~<%BrFnAH$i`k+PkbBF2G3|5$<0uA?rE!%+X96I)?&10-%n zfaH5hP8c*4$I{vPYRoyto;q9y%Qupr*V)mE(HOC{_TZ8_ zoCqZ&b`0#kUwln=#Q`$c)O3UDJkZ@>^rPAc)f7-z6m8%xqZzU?gU8jUYRzkL013R- zUZ^YG!~q=5s=;(6^&a`DUq~D35A-=EMI$Gc^qwc>Sy21v5g+<*}{WVBFp6YUo7CwE7D( z96Znu{Xg6OLfi=kH>GOkqC|F)HM9E8AZ_nc41PP%O#l?$_tjf{71vEg@Lo-Ot$%$t WiKbAxNqs_60MkZFKA1nlLWC2#0zgav diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/6e/f31d35a3f5abc1e24f4f9afa5cb2016f03fa2d b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/6e/f31d35a3f5abc1e24f4f9afa5cb2016f03fa2d deleted file mode 100644 index e95a5e2db..000000000 --- a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/6e/f31d35a3f5abc1e24f4f9afa5cb2016f03fa2d +++ /dev/null @@ -1 +0,0 @@ -x¥AN!]sŠ¾€¦ahcÜüx ÿ$2õúŽgpW©Eå½:zß8‡5UA-YG„ “¤ˆÎzõAƒl²+ë&LLd>óÔcW.-’&ŽÍŠ)„ÆèÄÕÂBI5Šo&­û˜p“Ÿ<Þã€g½ì½ö½ÎqŽ¶žêè/`½çÄnÛ,<"!šË^C—þ#anr]ýÖüû]ç»Bɧš_*íPV \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/71/3e438567b28543235faf265c4c5b02b437c7fd b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/71/3e438567b28543235faf265c4c5b02b437c7fd deleted file mode 100644 index 8b1f688ca1a56193372ab7dc452b28bc4379796f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 207 zcmV;=05Jb}0V^p=O;s>5GG{O}FfcPQQAjKTj;SFV484ZsW05AV|0V^p=O;s>5GG{O}FfcPQQAjKTj;SFV484ZsWk8T$lY^VAlR8|EF&&z4D;^ KmI443F<*?<6J%rn diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/74/4df1bdf0f7bca20deb23e5a5eb8255fc237901 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/74/4df1bdf0f7bca20deb23e5a5eb8255fc237901 deleted file mode 100644 index c05cdad8f6c0414a80c9cedf91966abd41f0682e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 207 zcmV;=05Jb}0V^p=O;s>5GG{O}FfcPQQAjKO^aWb JodCsxT!hleVc-A& diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/75/c653822173a8e5795153ec3773dfe44bb9bb63 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/75/c653822173a8e5795153ec3773dfe44bb9bb63 deleted file mode 100644 index 1495f70f4..000000000 --- a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/75/c653822173a8e5795153ec3773dfe44bb9bb63 +++ /dev/null @@ -1 +0,0 @@ -x¥»J1†­÷)¦;Õ‘LfrYÄÒΘdfÝSìFbÄ×w½õ‚Ýヿ¶m»  @W£›cÂR²²³y©™œ¦¹¤´ºh5VäÀ¹¤<½H·}@ò„,‹’3N•¢°æÄFhIœ ðï^ˆ-ÆŤuDA"‘ˆ–ì1Õy!-²Nò6ÖÖáAߥ+<­m{m;ÜØ‘~ª;û*~ÜumÛ- sȳwÞÁÙ±sÓ‘ç†ý3=Z6ø¦Áé¯NpÙGƒÒe¯ëýÙOƒp< \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/78/3d6539dde96b8873c5b5da3e79cc14cd64830b b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/78/3d6539dde96b8873c5b5da3e79cc14cd64830b deleted file mode 100644 index e2f34d6bb..000000000 --- a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/78/3d6539dde96b8873c5b5da3e79cc14cd64830b +++ /dev/null @@ -1,4 +0,0 @@ -x¥k -Â0„ýSì*y4/DOà6Ù-ØFjÄë[Åøoæfr¦±vrÓfÈèÉ(GŽ"–I÷Aq ’\HÞ³õš‚,ìÅž éÙ¢r…1%’ÆXtÆ R -Zù‹¡„6Àgê'záBpêô¨3ìx¥uàoðsÛ\§=¨¾·18#tÒJ)VºŽmüg8Ö¹ÜÆÜÆù -Lëý×Ø8wZ¼´Uò \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/7a/9277e0c5ec75339f011c176d0c20e513c4de1c b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/7a/9277e0c5ec75339f011c176d0c20e513c4de1c deleted file mode 100644 index 9fb34f7ee..000000000 --- a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/7a/9277e0c5ec75339f011c176d0c20e513c4de1c +++ /dev/null @@ -1 +0,0 @@ -x¥OANE!sýNÁ¾™>‰1nLܸóÃ0øÞ‚‡ác¼¾¸Ð ˜nÚ¦iSé­Ó õws¨¢âP!gÁ«wÁaÎÙZ¬˜B,ÃöÁCÏi˜“B@HT Ô°P’(g@á«(*ƒh´ñ7´¢+è«ç,N*ÕÄ•½d°.Ô5ÃP6þœ{æ¹|ñ(æmïíÖOó ËýaOíÑo½Î{éíÑ8¢˜"Pôæb½µÛr×±©ÿ¨Ø^u¼«ÉƒOÙ_.`Žsö?é¶o0Xa£ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/7c/7bf85e978f1d18c0566f702d2cb7766b9c8d4f b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/7c/7bf85e978f1d18c0566f702d2cb7766b9c8d4f deleted file mode 100644 index fe8b15777..000000000 --- a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/7c/7bf85e978f1d18c0566f702d2cb7766b9c8d4f +++ /dev/null @@ -1 +0,0 @@ -x¥±NÄ0D©ý««ádç'‘‚ úýÆÞ\VŠ½‘í\~Ÿ€øº™÷¤/1r…¦w5m|À0è Òt¡ntƺ®%×öû‘¬ékcnu– ïaÇà:K,’à™ú“^éWüµ³—øÆêÖ5¦í55hsg|M4jumFDc(8Lr00^ z_eYM2M|gbv`sw-4%j>tF@bdiY$7kn$`x?RL8Rp_CgX|1%%@?V_0r;qbr4Fz)0g1Q* zXV^)iJ__PTr`x?Y4!3X4#JR#0dE0P?wrN3ex!meC(S)5Kq0bQgstl;T#hH@olRUx5 zlz^0$Qi6hWn-q#Oeu+MX0jhMp)({J~MNL2@yyD;rN-Jt5A|!fiGy`Sf{@z$lGip__ zP6OsN6x1Bv{TjKulPk~xz97^V0!@Tj(gCy14?Q`FG+po{tlYLUp}?)Uy0In^TIw80 zzs@KYHPr(sG)0&SS_J0ZL?4(gy;$ilWZYfy>H(Lf!ibu)t^iZ|NXSFL9ahRsG*usT z6CLNKi}C_gZH12V1HAeR!en+Nda;CO*0Ib2Q!8_NH>E{W6HK)MSO;a7+Pc*zs93IO z(|5l;ZeQgd;t9W_64~___4i0QXUzR9bn`RSiMtIGX)Ahg{{W#06#c{j+qVD! diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/7e/3056f6765b3044ab09701077dbe1eb5b0e9ad0 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/7e/3056f6765b3044ab09701077dbe1eb5b0e9ad0 deleted file mode 100644 index c4b8355186272c1eb916727bae0a16c6ad75a545..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 208 zcmV;>05AV|0V^p=O;s>5GG{O}FfcPQQAjKgOR@qzp6TSus({L12z z)FOzD>*bF-)ZbitUz~A8-NutKB~y;hfT}7>P0RtSS-v4HxGwv-z^wgG{!ialdgVd+ KEd>AsJzr5;MP&d0 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/81/5b5a1c80ca749d705c7aa0cb294a00cbedd340 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/81/5b5a1c80ca749d705c7aa0cb294a00cbedd340 deleted file mode 100644 index 12eb0662a..000000000 --- a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/81/5b5a1c80ca749d705c7aa0cb294a00cbedd340 +++ /dev/null @@ -1,5 +0,0 @@ -x¥ŽK -1D]ç}‘|:é ˆâ ¼@’é`™HŒx}Gñîª^AñR«µ Ðw£32Éà¢t99^e/sŒ„F“Ç™I‘dŽ9‹{è¼ ›œ5^kE&x¶4[e 'Cd–̈1Î1:#ÂsÜZ‡Ëò -}ë­ÕG[áÀý¤‡_Û§V ­ŸµU“D)ÅF7ÙÁÞˆÚ–’K -£l -e…ó¤Å6Rb \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/88/8588a782ad433fbf0cc526e07cfe6f4a6b60b3 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/88/8588a782ad433fbf0cc526e07cfe6f4a6b60b3 deleted file mode 100644 index 44efd3315b4326a3f381c0ce6633451ce0b1ef91..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 208 zcmV;>05AV|0V^p=O;s>5GG{O}FfcPQQAjK&1{U>Y&HCDgS(&Liz*)u&&*EO64-efAr_ LELMF1OGsspd1+=4 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/89/8d12687fb35be271c27c795a6b32c8b51da79e b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/89/8d12687fb35be271c27c795a6b32c8b51da79e deleted file mode 100644 index 2ce4f7f0a4c72bf27a73631283d2ad87f508e7ba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 663 zcmV;I0%-ks0Zo)abJH*og*oe2EO(QcmSaviq(f(zrnD(N%l6vVSeA@d#+YBvTO|Q* zjV!I+``%M)A8We1yTAYN{do9Fucx=?oiWdEXL@`(pXfl(r!$?uyd018?d|Y#ex=g` zy&ulUmx?}93@!$tX2~Rz^}eFh)6vKrW9Sx7v7_4CW~7w$5+m)DV{>dy>&j*kEGQSb;Jq z+A7TBKrDy+M8M=&>{UqhN$<3NfQ=spBT28L~1%$Bk1# z^J8%s5_m1WP%6#H0UFJ!!8A*1J@QjtNE_~V^biwrYX*xx&=wb(>{j|@sg1wEIk}mk zc(OT)aiOBlB|(yQRPWbnfEk(+q*9h>9MFKvz!S)nG^peCuYVWJ052z> z)$oauY4vAj5ZuwbexGc6748HFHF~8I==~!Z2;5Wc=Saqhz{hVWc1O1`>fOaRWjh%^z&2iu=paO|$?2 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/8a/bda8de114a93f2d3c5a975ee2960f31e24be58 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/8a/bda8de114a93f2d3c5a975ee2960f31e24be58 deleted file mode 100644 index a03624d81..000000000 --- a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/8a/bda8de114a93f2d3c5a975ee2960f31e24be58 +++ /dev/null @@ -1,2 +0,0 @@ -x¥N; -1´Î)r•üó"6[ÚyìË ›"Y#^ß(Þ@˜b>Ì0Øj-+k}'⤒›#(Ÿ,Hm¢K ™2 Z£³N»Ç¶Î=ú%ƒ¥à!ËQEaË^¨¤pñÞ¹% $“Y|öµí|N¯¸'~[[}´Ÿh¸v¡oðSGlõÌ¥1‚•ÎñI!ØpÇÙNΰkK%Œ½Œ ó¤Ù[„RÀ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/8f/35f30bfe09513f96cf8aa4df0834ae34e93bae b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/8f/35f30bfe09513f96cf8aa4df0834ae34e93bae deleted file mode 100644 index 1011a885d..000000000 --- a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/8f/35f30bfe09513f96cf8aa4df0834ae34e93bae +++ /dev/null @@ -1 +0,0 @@ -x¥OË 1õœ*Ò€’fAÄËv`™Ì„\#1jûF±oïï“뺞»4Îmzc–l&‹…ˆtoQôÀ‚ Å*p:9qK¯]Ʊ€ç)BѤ!+B‰ÊÉc8e WDzô¥69Ó+5’§¥®÷z•{êùküØ.×õ µsÞûÑgåV9¥ÄPÇØÎƈ™Æå'§‹xxO» \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/94/d2c01087f48213bd157222d54edfefd77c9bba b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/94/d2c01087f48213bd157222d54edfefd77c9bba deleted file mode 100644 index 76ffe4ea7983ef339264078ca8ee74ff68cdbd64..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 621 zcmV-z0+RiB0ZmgqkJK;_rS`8F`mln60$p_lNGBn25(4T;GTB&h?3~9YgkR4aXBQ~r zc;37(_aXK4?(K*7ufBhL{7hfJe0zTF+;c7DV@brcr9x%SBJ@%@7o{}O&P8%}J5JH3 zs5D?iR}P`06vgS5Qk-hA>wVy1p-r|;GVp2~W$cLKNM%oUK{=F;c3zVALLE5QQ@Nl(JJ(P;zT>A#b=A* zgg2yiA1AFgW)q6j(U4;CvHEx=w5d&1oCKSlS)Ij*t*r;Q)Zs*|1+in`^!?^*<{byf z+)}d*rt?Bile3RzBUDpFVNtY6hJt43E&?8RpPDr<)dM8T-g;rK42wi?bh`yJ)I0{{ zXMQ1VsK3ysl#$yoGx|VBs zmuMWUfiJVHaHgd}lk9)>`{-t9xjnYs8jQO~TMeBknN@!ifrA(NVgFYiZ^XS~@Gz=w ztw!V&*)nVI4ARa%r5KJ2Jw`y`ec!#cS8?A|74Oyc_xiVYlWB={Sj;CR1u$!*mW%rX H{Cb92!PzdT diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/95/78b04e2087976e382622322ba476aa40398dc7 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/95/78b04e2087976e382622322ba476aa40398dc7 deleted file mode 100644 index e3d15aac36c0fbbfd053d8ab640d1422fdfebd9f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 620 zcmV-y0+aoC0Zmi8uGBCPrS?}0eON(3fwrOm2?>cSA)uZllZ_R}&h^-Y@b#Q=c7ZaE z=gfJz52>d&uiw3W@%_X5&-C@nx2KoRJ=H=!mPAZjDpckyLeG_RQA!i-TqJk*;}m_0 zN&`l8kI*SooTMzE3!--f6V#mPg``y>fI}VV! zrDhvU=Y>8^&OVxrP)!kqMbRc13Yww22zWevYSuhg50EH(>xH>8EE2)d?H0^X^B9ny z`GvHh{z4y9MsCB*=mQ<8(#l8c6VsS}!{_Wb0ppcRQs-kwlh2AIc`@zxYQQrzC2D70 zqH(YWzRa@1nU)4kvj5fZqnn}S{@8YFFzz00HFTn6R{c!`4qoVo{a<;!6ZeY2!>GEo z8j(|E%dEXKNIUzKVmL1JJ^~8w`{AvÏ€ˆ›YºóI§Ãd1‰¯oo Ô¢ê…uÛJçÊÀ¡7"žBtÑhíu™¬ÕŠ¬2ypHç@²b÷ÐhïÜ¡‹ÙšÏ2IÂX›PIatÎÚ8£OYxöµ6¾¤Wh‰ßÖº=êÎO4èÇ]è[üÒëvæÀøÙH| tœíôç »ÖTrÁÐ˸0´LŠ½Ì#S; \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/97/3b70322e758da87e1ce21d2195d86c5e4e9647 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/97/3b70322e758da87e1ce21d2195d86c5e4e9647 deleted file mode 100644 index a90a61cd7..000000000 --- a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/97/3b70322e758da87e1ce21d2195d86c5e4e9647 +++ /dev/null @@ -1 +0,0 @@ -x¥½N1 „©÷)Ü]uÈ^Ç!‘Nè„DIÇ 8‰Ã^±”[Äëþz$ºñø›‘&·u½ìÀÂ7{7”ìfBÒD{RÄr(䓯žÑÕ2½j·m•«¨·L9úA”¹H™±˜áÀI Õù.þò¡²TÆT £×ès ª®T ìÔØYä¤6éÛ¾´å]{祭׶ÁɆû©Îöõø¹ns[(pD‡8 wŒÛíŸ5Ó“õƒï68üuÂ.ÛÞ uÝòòp¤é`p3 \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/98/1c79eb38518d3821e73bb159dc413bb42d6614 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/98/1c79eb38518d3821e73bb159dc413bb42d6614 deleted file mode 100644 index d5787b44da4db0a272e3062b08e6d0ccfa2325b5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 208 zcmV;>05AV|0V^p=O;s>5GG{O}FfcPQQAjKVPQ*YAg{gCj>9$&Adwya|2+?dw#|1oN4@;2*WrMgr0Tws_-Fx5r z5=9_JG4{E}-YbvAk3Q$=HMg>KzTx%E9=*e7$S6zMHLNytMp%EDpWsqhj znEQ^IEtkd?)d_xlDHLPj4!z|f9nB7SV z^oUNWdgejjw)3)vlfCO|;px0gmt_ujzSGb2;9tYF-L_@A513MB$;dGrAps0K-Jh}f qKhF%0zCL@XtIqB0mvHz_rz0JL&i2>iA-v4nay3s!96kWmDSDv#$acp7 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/9b/258ad4c39f40c24f66bf1faf48eb6202d59c85 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/9b/258ad4c39f40c24f66bf1faf48eb6202d59c85 deleted file mode 100644 index 305e1f3e92c78d686d7e067ced299cfdb8a3b3ee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 240 zcmV_5Q>b2+>?g#|wDZUhaxyQ3&Go2|q`D5}p0c zc%*Ud^L*Z1On9@cW=@o;G>LiQRsaey!XzNx7b>N(mtawihgVr`*&InxAvN!#aA>HZ zCgCZWA!lg88^&UZF8-oCF+oLCkC=d~D*M!SOr$AS(jbO#@pHxyGBs#5Wz?(`AxtRd zC#|v8fSSAz4D!C6`s$AQA*;IQQ=i}Z;_hvyU(=&~3%}cK?el~4F(%@KF}njqfMKWm qGdBBY%05AV|0V^p=O;s>5GG{O}FfcPQQAjKTiU*U#^-QwV1^aGYktDm4!Z8PN+BWhADIj(I#DH_{o=(C--K0g3Jn zh#7aOC9GlxtaS%$W+*M}FLD0xIepo4&oA)xfpxxpLdxb3K zr6w#=xcTK^LfQhl!ZfrqqrJm6fl-(EsH;fUv8L8_sp?^}peIvz-eO9iVE~0OX2zK4 S=1+q8cKeOjdk+8Yk&Keol8Ar+ diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/a0/2d4fd126e0cc8fb46ee48cf38bad36d44f2dbc b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/a0/2d4fd126e0cc8fb46ee48cf38bad36d44f2dbc deleted file mode 100644 index 566976715362ed5477f8ad2709fec752840cb658..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 649 zcmV;40(Sj)0aa7Wj?*v{W$mxH9}p^7us~f^sECnEU!e(}AAOSGsFAq@=c?o z@lIR2R={INbH=DkUgkB$!8n2b$=X)`!3wK_rmS~8hdm`dGI@*xhyJkwp-o3w>btId z?*r?|WI9M(RRof4DVWHhAvl_PV~a7p_boNJ4w%XO+8h8mA&_)!`E9W=!bb(BorOg3 z4J$bqBf5%-;Iy(Gi%~MleIKc2ouGMP3w1FC4Yg@7QDITa0c2!Ww=G3KF*SonJT1*S zM9b@5athn0=<`h8QN2>j5XZ4nF_|DXZt#Ls?&G8wEH=#^nKs@fr;=&9b zcb|$iKe7Rcw?ZxlQ5_CD}FxvcBC zX+Yex%B(FQp)f=ma2SMA0x^Q)NB~YC`$!>X8PqLRzBcW%pCybOeGp4FWHUM^-T* -‡†jž’r†¼a,–h÷íÔWwÔYÕ=ŸúüÖwo;ýší[øÝnkŸœ1'Dï†îÏØìŸ1Ó­/æ~ÒÜxmåñîrrmëÑ—­»²ÊROÇŸ™‹a \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/a2/fa36ffc4a565a223e225d15b18774f87d0c4f0 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/a2/fa36ffc4a565a223e225d15b18774f87d0c4f0 deleted file mode 100644 index 347139464..000000000 --- a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/a2/fa36ffc4a565a223e225d15b18774f87d0c4f0 +++ /dev/null @@ -1,3 +0,0 @@ -x¥A D]s -. ¡ðáCbŒ›ÞÀ ðác]´˜–Æë‹Æ¸›™—LfRçG“¡­ÌÒP9öÑ¢%@ Ék0L bÓ¡/âW^šÄ„T¼å€¾ yðIYç -*u"Dç¨d("îmª«ó+®YÞ¦:ou‘gîéG]ù ~î”ê|‘€µà²ò¨@)ÑÓ>¶ñŸ5bÌýrÜú…xß7ñQù \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/a3/4e5a16feabbd0335a633aadb8217c9f3dba58d b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/a3/4e5a16feabbd0335a633aadb8217c9f3dba58d deleted file mode 100644 index 00f9c2ddd1d8e6b2df28ccc58ebedb4e3369507d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 164 zcmV;V09*ff0i}=K4FVw$gngz88qn~wu#gzz%XMG_!0zQtJTZvczG&>gx0!E}$xNy1 zdhXHyYQpSGzyV#(Xy$BVF0%$gaZ8P_T}HGSl{JRZ1xf)~7dD!V zj*fyaj)9{G6zS2I+T=v9)JUF|y58$m?s?FUI`TL8xm~I2L23Z!oHoJBtpcUQpkr+3 SKWoH9lIJ-a@ z$8+Yq+=tZD+c)puz54#)=`(%(^6mNJ+;c7DV@brcr9x%SBJ@%@7o{}O&P8%}KTgr7 zs5D?iR}P`06vgS5Qk-hA>wVy1p-r|;GVp2~W$cLKNM%oUK{=F;c3<2ht)u`f#+VIn}IJ(#5a1;LR5xTw{XwHZoM`8?_-rwp z@P^dxM!&$W#l%@j6TqjDy@99J~55yH+;^16EI%6By~P^H2JJZk{8o{uLe9rQ=)d} zB^n27;L9v4oM~y$B>P|eKDrrN?vHJ^2IKD0RzoLBX4T(B;NXRR*#DKsJ8`cVJdCPa zs}VUxw#?c)gS4|xDTd=hPZ3af-w$u?RXjFT#d~%AqyFvPWLjb!7V`;70n8ey<>LMT HT=<4_?*22G diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/a8/2a121ea36b115548d6dad2cd86ec27f06f7b30 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/a8/2a121ea36b115548d6dad2cd86ec27f06f7b30 deleted file mode 100644 index e740872fa03f7c70cd80cba278edec8365618b7b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 208 zcmV;>05AV|0V^p=O;s>5GG{O}FfcPQQAjKTj;SFV484ZsWRS0W8c16-eS26m%ajNX&p z+CITYe3(NOm^m_MVxMbRS1X1h(I-U`(_|s1lCZ4qGY>r`kWev>x)Iw_7Z!{u8KJLU z3Qt+Awwe2$c*=;^aZ!fTfKpXiLH+aN|=q`H= do%)Z2yVdLJx8@Jn4`@2x6-qwU{Q?TRQDDTZQfvSK diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/ad/1ea02c2cc4f55c1dff87b80a086206a73885eb b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/ad/1ea02c2cc4f55c1dff87b80a086206a73885eb deleted file mode 100644 index 99207a9dd..000000000 --- a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/ad/1ea02c2cc4f55c1dff87b80a086206a73885eb +++ /dev/null @@ -1,2 +0,0 @@ -x+)JMU022g040031QH,.H,JL/-Ö+©(aø¿9/Ð>þ~WöŠ€EŒNéYZGj¡ -“RSÓÀj2¾Ièû´^ž'Ìy³¦Î51ìΆi05ù¥™99™`eÞ5a Ýz%õ潎’½Ç×ÐÊU–^”XV VtäÙ™Åo²ˆô]2üY~¿ÇPŽ1ª(¿²¸$µbãzùãõ7×Þg\Q·ñdLÉ”£3 ªÊRsÀjâÚÝ¿*ð¯áŸÅ~뛘ÍÊÓR½+»<[{ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/ad/2ace9e15f66b3d1138922e6ffdc3ea3f967fa6 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/ad/2ace9e15f66b3d1138922e6ffdc3ea3f967fa6 deleted file mode 100644 index 8ae3ba5a744f2a3f167491861e15ec70c7ba69f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 170 zcmV;b09F5Z0i}+?3c@fDL_Oy#@&n3dlQb!a2;$M3Kd{~1Vh?SkM*MxF_y@uqX5PRs zT;_SI7Gv1dRn;;K0x47H1ep;zB2#3AK!dPwWOf;QHFsKdsTM}+lmwG^Lod!}8r5g^ zzT-Y&Qi2GWC>eUzTUqT{UbKq6-pc$ai`{FZA9vJm@k=`{^TE0hV(u|Uuv-WKrqOn` Y>Yp>_Qe+w@raH9?O{c9hZ%Q&#vn`5F+W-In diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/ad/98bfa4679fb00b89207a0a11b8bbf91a3e4de9 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/ad/98bfa4679fb00b89207a0a11b8bbf91a3e4de9 deleted file mode 100644 index 457f9da1f1bc3fc5daa3c7f492f9fb2685f6700c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 208 zcmV;>05AV|0V^p=O;s>5GG{O}FfcPQQAjKTj;SFV484ZsWk8T$lY^VAlR8|EF&&z4D;^ KmI44|zFlT3oMPwz diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/b2/a81ead9e722af0099fccfb478cea88eea749a2 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/b2/a81ead9e722af0099fccfb478cea88eea749a2 deleted file mode 100644 index 7a8ffe58a65ef3a9c38de40dd9727e7261d202b5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 664 zcmV;J0%!er0Zo*_Zrd;rM0@5}><738(nBvk`QV@dir7t@=1fT|i4aAqT&k-2^_`{c zwzrrfmosmMseG*H;o;Ng58qG6uk?C;yX=j*yj|((`Ff@!UCvj!et9{a=-b=z<@!qJ zM|wYAPcJ*lePX5oJmIO{f^GhCnHmgp`AU&mMU-SfhL|NPBg_iG~DdShKBMI zb%R)+ceJ?NZ!2jVZN$5pMR$0%fqFY0@K+|6sfx~%WVVg-YdO`&Imv-!a3eODSl3pd z42o8j%7G?GbRkDQZ%KL=bo5WQ(ER^cRaK@LA4A9KK-ms3isP6=|5QQH=A&F1+qQh~ z5?f(%EiA4^Fv&NRoG@hQ97~<^1xy!XLp8Qz%;9dX&3PsA8Mpd0|aNaam3&>nk(;L+1o}OBxKMF>;rVul_mRhbenjs4_blf== zG(TpCA%U0D3#C#I9H7xG8caQ>#v?!Fg|y**PmeJnx4O6J1FdnU(XORWmYVn*oRgav zibtEH7#DWbx+F-_4(k0@4KPDfg6xzf8V5As((?#1B@JqM`Rm^W)5FVx91~uLHW+)? zay5LSWLo`+83gzAuHQ%7+=M&9!BwT2aaJLl$&y)lXRx;QDF(mp=@>A|rhI3sui}2w yEO@V`y4SzFn?ysH>p?joDGbv_O2+?=D@vw|7Dl>0uOJba64xNKH-7-HgN*UF>qEl; diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/b4/cefb3c75770e57bb8bb44e4a50d9578009e847 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/b4/cefb3c75770e57bb8bb44e4a50d9578009e847 deleted file mode 100644 index 836bb4edcb1dec682ff243dd480df1024b5c1553..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 639 zcmV-_0)YK^0Zml9uGBCPrS@0M2ZWWNpxNpcAR!@fC0_L;nQW{$cCN=JgsoAr8w1K*ZaW3LYr)xWZ=~}%GeRdk;Ep1!KGnf1v4-@jH*Q19;z_Uq_dB<{HHKD z{|{@d8k!3!-XveC@FJ8j4jlT&3WQD_ZE2dO_WhQHRme|}csK=87%6)d&@ddPn-9&H zTS_AhxDJ@r|2iE2IU`WG5AwR%sPNH&=@cLleDgsO#+a^VA~+oqmS&WV%I&7q3qp#t zizT8ZGt`#ZtHYvFGsxI1k0WVXg@!pHo{=`r8sxZIPWk+#scy)W`h!M+IML2&@!4WH z;SH(X$4RS=*@WVBG^AL3tUlfdZE8~$C&6ZCR%bC{YwN*1bvO}gLF^bfeZTvfdB*`V zx72Kd>AcX#$=Q!)BUDpFVNtY6hJt43E&?78pPDr<)dM8T-g;rK42wi?bh`yJ)I0{{ zXMQ1VsK3yMl#$yoGx|VBs zmuMWUfiJVHaHgd}lk9)>`{-t9xj(ku8jQO~TMeBknN@!ifrA(NVc%CC@5H@g@Gz=w ztw!V&*)nVI4ARa%r5KJ2Jw-s_eLuXlSMk_X74OyckNUTFlWB={Sj;CR1u$!*7W{X7 ZMak@tA>=lf15QMtECU?6xIZ-FkkMG{L{P z0v8ZIwYF#G`*RLH9_Yo@^~-0Ux0^e9*nQfsjCr*zy4h~tnf;i_g&fJ!5Hsa2G1Jp% zQx=LXO*V6?=<(*`c1yea+ui*Gz5Vn^4<9yncNN9J=Et(A=XB(T>e%-&kPS6Uj!FJ= z!ZJ7p7lTj@P|{oPmkFW6{9v{YRSRbbtn!K!C4O0Jxz~*!XsB;=qL1-o`&i473#GJm8l2=4C;&FpF}Bm6 RG3@+3J^GhPuov*HPsMvROWptg diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/c0/bd078a61d2cc22c52ca5ce04abdcdc5cc1829e b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/c0/bd078a61d2cc22c52ca5ce04abdcdc5cc1829e deleted file mode 100644 index 3dde6c243e93aec666ae3ef6a209106eb9e07e14..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 207 zcmV;=05Jb}0V^p=O;s>5GG{O}FfcPQQAjKNiI}Dm+wE8I^5xVyo=( Jc>u|AT#}r9UuXaT diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/c4/83ca4bb087174af5cb51d7caa9c09fe4a28ccb b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/c4/83ca4bb087174af5cb51d7caa9c09fe4a28ccb deleted file mode 100644 index 643a98280..000000000 --- a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/c4/83ca4bb087174af5cb51d7caa9c09fe4a28ccb +++ /dev/null @@ -1 +0,0 @@ -x¥PKNÅ@ cÝSÌ®«¢dþ#!„„+v\ “dè[´E}E\ŸÞ`Û±lɼ-Ëé0.ç›cW5Î熱5Òš\sX(V#ù$V‚ÚÄÃ;íºÆg1H Ž¡y˱ڂP!HmŒ©µzõ“Xb-Š¡ÅX º\¬Õ^)ì”\+15ŠWÆP!g`J¾H‚À‰¸wôº~UÄyè㘷Ý<É'íb^çm9o«¹Ó®~£ýy\Ø-o˽AïdC2€¡«}ŒCÿ3¼èþ¦¦î´ò¬g3þ¢Ç GC«üq;šÓzlçó„Ã<©{ê \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/c4/e6cca3ec6ae0148ed231f97257df8c311e015f b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/c4/e6cca3ec6ae0148ed231f97257df8c311e015f deleted file mode 100644 index 2bbf28f57..000000000 --- a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/c4/e6cca3ec6ae0148ed231f97257df8c311e015f +++ /dev/null @@ -1 +0,0 @@ -x%P1nÄ0 ëìWð¹CNE§N7¶è¡:*‰’p¬Ô’/¸ßWÎmI‘”ú$=^^ŸŸ._ï?¿¸~|žC¸°ã¼6©yTÈ„A¨(#1eôÌÓé´“.ˆ†áÀ(Hto@̸K-aë°Õ°…¡´²“sá1r6)&)8¸Å·TêÖa¶<0ׇ¿JÙ¢Ý[‡ŒK‡5IJ²²­ÈÀªcáÁ¸q͓쌫r_ÍÛ‡"u^@ÐÈ7~X)—›÷2¸ Ýâ G…,æ¥f¬R¸ùå`BÚúÂ4¶3£½ÁvQŸø¤›HÖ©¦Öu­êa²b SwÞcJ q…)fÆ”èæO‚ùvû×;‡í«ŒŸ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/ca/224bba0a8a24f1768804fe5f565b1014af7ef2 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/ca/224bba0a8a24f1768804fe5f565b1014af7ef2 deleted file mode 100644 index 0dd861f2c43e7f10a1ccbaf4ad794e9b7bac5091..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 170 zcmV;b09F5Z0i}*j3c@fHgk9$pxj^N;{5Bxsrb~BT;3avbU9^!H@%l#b2Er_6zJXy< z*|xPwWzC^gX6adjb+hx%Mh(VLgx~?e`y3fL+6WvdgSb=Wy~#lAbTl+3h8ahUDr1H) z29I8ALeNUNfL_qEEv3pSzo=$;Tgvt*yF78HA9vwz@k_^4wzEWI>=>-JP7YuIM5q01 Y<3DG_wd8eP6ScKp=$Zx;Z>2v`!Lnvk6951J diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/ca/49d1a8b6116ffeba22667bba265fa5261df7ab b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/ca/49d1a8b6116ffeba22667bba265fa5261df7ab deleted file mode 100644 index 1ea596763..000000000 --- a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/ca/49d1a8b6116ffeba22667bba265fa5261df7ab +++ /dev/null @@ -1,2 +0,0 @@ -x¥»N1 D©÷+ÜÝê¢8q^BHˆ’Žð:{‹Ý Äï^=•Çgì‘FÚ¾_8ï®FWo”* s]#©ZR¶)Zl$ÌN0Ú”–îz àbY4+úÂê -¢›VC­Eœ²«9ÄÊá÷>¡_=£$#)—h¼Df#«ÍÄfN-Å‘Yøml­ÃCyç^àikûk;àF'ýTwúeül×Òö[@"Ÿ2Yôp6dÌ2é,7ôŸ1Ë£ög…ï48ýµÂ .Çh°v>d»?ãò;NoÁ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/ca/7d316d6d9af99d2481e980d68b77e572d80fe7 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/ca/7d316d6d9af99d2481e980d68b77e572d80fe7 deleted file mode 100644 index 0733fa232bf68c48a5dc822e57159816e07198d7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 207 zcmV;=05Jb}0V^p=O;s>5GG{O}FfcPQQAjKOT{yeRq_OJQS&u^q;^Fzm zX@Micr`Gn&e1Fct#{*rxdVTZa%VvE~kK3o+(wH~%qT9{-gV{ap>F!~_r8Vugd&+HM zrsu(?EEF3WZRWH%Z^z(b5UPeu(pm2p6a$-|^P-N^k!z}A*Tq0KR4h3rF*{s$AxE;* z$NWDN-p=bEJMC{jZ#J}jxZ6HF(tFT*{ItHmpRvB17u|4keN|r@>0=Dd;FapZ+v-F; z_dO>d9YW3Z0z7KUW7G>`eO}P$ay##&nTrwcz*TQ}wt-sPt?&z^GaaJyB$;jP{8Xyi zI3!t-oLq+sCRUXds0uYFm6-$e7rjt#Nm>`Q^*6TA`|q}js&q3xh9jpHWqV?ZC`TXq zg9?CV9%X23nsRTMFw(@K3x^O3}%M;_@gQOzL7vM`ceQXA&>+Ns>fP6?#Sgh(!s*^pfr zTsRVPTB-)@c&%-%7_|{oOAgMiLy0hC*p7l(_p`3aj@W?b>Y7eao=duGjQ%Myf;9y^ z1q7|(DkB*(G6Tm&ry|Ys;Ls%SSaPANR3{F=Xht=r8dB}ypXvp-!G1{}V}fs0Ymo<< z;y|69N}ep$@dtEHu4f?bY>r}FSWx4Vz)5>j?&oMgGbAO*LbXKVAPsbBxq~vr4QhD& z&EEyng3I|sF=~QwcPgX76Cu;+_smdmNniE6v-KIc6BJGg)pUabnMoGU$~yzKIZrY8 uX-VsVR`@nuwAEK}nKTIAt2tcaU*1ikQy8j~>IA3IOcN=2X?_9!X2$$2(9 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/cb/49ad76147f5f9439cbd6133708b76142660660 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/cb/49ad76147f5f9439cbd6133708b76142660660 deleted file mode 100644 index 849668c8b64d036d37466e7d3036b4c2dd30ec16..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 641 zcmV-{0)G8?0ZmiOlG88{G*}7&o7UAV;)~F^zij^rXxL`FLe3*bUM+um*dmrna-c+ z^>{fw?I;h4nPPA;2(=}XOxF7yPT0sCW9W;g*i++eJJQVa%!%e$LdV^XZ0IO2Q7?$~ zc}I)O!*-H3Xd~XWEPBJU4KfM1zhrY1U1lG%37uXSpOCCPzgbQ3O^*tS-{42)K# z%7JE3bRkEbw zRTIH!Wj|J|n)cjM!Rx za7!Idgpv_E1~%Vsz9zfi0GVrQx7h6Jr`ibB6klA#JGN)2En_TRT|vf!0`PvTN;=r7r%4&&kaU#*@ua zj0-#JT@oZ|N7a6-20TMkg6z~wG!E9lmw_iZQ`4ZHm%sX5FaxwK$T8t{XoGQgt*fCE zCDZE9%y4i|uljwm-Ho^t46aJmOht)oB5P*#ok7~xrx^UYr(*z=P5JJvzKZ*%B6zQ+ bx!1qGn?z$M?WjH>DS&AsCGX82&R2r-HC8|q diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/d0/dd5d9083bda65ec99aa8b9b64a5a278771b70a b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/d0/dd5d9083bda65ec99aa8b9b64a5a278771b70a deleted file mode 100644 index b0d951c9e75d5555fc1c0b95e1b8d44bbee483e4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 620 zcmV-y0+aoC0Zmi8uGBCPrS?}0eON(3fwrOm2?>cSA)uZllZ_R}&h^-Y@b#Q=c7ZaE z=gfJz52>d&uiw3W@%_X5&-C@nx2KD9PqmPbB@xq>3Y9sF&~xQnl+r{y7s=iII7OeL z(tr_NIfRZ<6sKECajLeVNabd_p@7evq~? z2uGTEy;2ZRE7T_+NQ?03!_lVZRI^@57r)|yOT)klW?*y}Rf)7cRAHV;XCH0(PhoKW zAJ$kkG#665Nxo9yMJQn$IP{Md2%S3G(lkx&|1Arvke?v&a0;X_QuZpKVK_`TADS_@ zltvnG9Wbl^bvgiYMxbyXa5^L`%_tj{+fAt#gcNBP zOGHa%s4cTshef4kkg-`FN7A$k4Rb;~BW;{D$Z@rt^7%_s-H<8u2aN)8qMg&?v&C@2 z8&bQElU5tE3B~DXNU``>eY_Fc)TSyanl;bW10>4cdSR{%i$rjAy9G1UJO<=v zej#nBztG2&k=rmc`anmjwDQsV#5AVg@HzWUz*0QkATAaet2uI;<2eJ-mB{$^>6Pc(-P~jm`_LwVAe=2FWnzp G-iBs$mNeu5 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/d2/682aaf9594080ce877b5eeee110850fd6e3480 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/d2/682aaf9594080ce877b5eeee110850fd6e3480 deleted file mode 100644 index c79a3bb0f..000000000 --- a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/d2/682aaf9594080ce877b5eeee110850fd6e3480 +++ /dev/null @@ -1 +0,0 @@ -x%P»nÃ@ ë|_ÁîIP SÑ)SÐ¥¯$2ʶp>'9Fþ¾:gHŠ¤Ô$iðúöòtøÝÿ]pü:?‡p`Çë`˜dÎBz´BE‰)£aî·Û…t@4´+F¹C¢{bÆ]æ&± ¦yl`(ìäµp9›‚½¬Üà[*ó´Ámx`®?çýçéãt©2.Ô¨^R’e•MEZVE ·Æ•«žd;­ûz@¨Þ>™¯ùÆ+åró^Ô[fFŸèæO‚ùvý×Û…ðЋ’ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/d6/04c75019c282144bdbbf3fd3462ba74b240efc b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/d6/04c75019c282144bdbbf3fd3462ba74b240efc deleted file mode 100644 index 059fcfe72f6598e0a631ed1165559606dacc47cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 620 zcmV-y0+aoC0Zmi8uGBCPrS@0M2ZR+A6lkkkfP{nu5(4T;GTB&h>|Bpc2w%?`XZJ!G z$8+Yq+=tZD+c)puz54Ot=`(%%^8M?@xvduRu_R*JQlTh&?eg^8F)30GIqpqq_QWwpd3m^yD#&3l22%-!4J|l z2H{9EuU85JYK8jb18ET+eK^|GoNCr9>Ec&haA_D=!3>NJqbiYJRAHV;XCH0(FJW;0 zAJ$kkG#665Nxo9yMJPcbaOfW^5IS|VrD>Yl|63MTAwNOl;S@+=r0i8d!*G~xJ~U%) zDUCGXI$&1+`*Z;0j6mT&$m?dK!bbno%|?x0_Ng2r1Go zmWYy}M%p-QkmG7O<@1-Ox*=2Q4;lsHL_4R&XN%#4 zH>7qSC#^PS6N=N(kYe$%`gkL>sZCX!1e={%oyCZ)tq1qi;Y6$jv18!${qAe#9S6wV zQnL-F^Fp5{XCKW*sHTX*qG*#01)})ML^+wKfJY9@z_)q@748>`nPwJX^C}M%qJuTFl(fii~9@Y GSca3)DKNPJ diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/d7/1c24b3b113fd1d1909998c5bfe33b86a65ee03 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/d7/1c24b3b113fd1d1909998c5bfe33b86a65ee03 deleted file mode 100644 index 66720086ccd376bee2122815f5ceae9c1cb81267..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 240 zcmVl)gY-kImz{;W8NI*V`lb|l~@J_p~haqvqTGWOXV@0tR zb8$|4g)k~%D={^SSHI5)F-Qx@&^&=-;aFXeZiZsDUhJU`oD7g20Ig zxMzC2ql%!1fj*CU+s(6l(Jtn7-j5lYGkOc6D6x7#hG1H7SGHHs|) z-HYHO?lLDgiES~>t6&2|Y2AlPuv(6uVj)v<6NEgha;-54_C6Ynq=+=5Y+RHA5qHbmbnah zpxlxhR)i>)p?Zvxxa37=LRt#y#MG8Ey}iR0fl(cJr;|w3ZVrWYoHduph=xpa^5R1P bwJpeXJ~FyMxBMhn-Y&n%cpLW*MV5+%UnhpR diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/d8/e05a90b3c2240d71a20c2502c937d9b7d22777 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/d8/e05a90b3c2240d71a20c2502c937d9b7d22777 deleted file mode 100644 index b157ba17c..000000000 --- a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/d8/e05a90b3c2240d71a20c2502c937d9b7d22777 +++ /dev/null @@ -1,2 +0,0 @@ -x%P»nÃ@ ë|_ÁìIQ SÑ)SÐ¥¯$2ʶp>'9Fþ¾:gHŠ¤Ô$iðúöòtøÝÿ]pü:oB8°ãu0L2çN!=Z¡¢ŒÄ”Ñ0÷»ÝB: Ú£Ü!ѽ1ã.s “ØÓ¼60”FvòZ¸‹œMAŠ^ -Vnð-•yÚb‰6<0ׇŸóþóôqºÔ —-jT/)ɲʦ"-«¢‹…[ãÊUO²g­ûz@¨Þ>™¯ùÆ+åró^Ô[fFŸèæO‚ùvý×Û„𶋅 \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/da/b7b53383a1fec46632e60a1d847ce4f9ae14f2 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/da/b7b53383a1fec46632e60a1d847ce4f9ae14f2 deleted file mode 100644 index cc4f2436978fb00dbe6924319fbfc1ace3025a15..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 208 zcmV;>05AV|0V^p=O;s>5GG{O}FfcPQQAjK$0B<%-a9t|MYF8S00q# KQUCxBQe1Jq@?@z1 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/db/203155a789fb749aa3c14e93eea2c744a9c6c7 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/db/203155a789fb749aa3c14e93eea2c744a9c6c7 deleted file mode 100644 index e9f7fd8fd..000000000 --- a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/db/203155a789fb749aa3c14e93eea2c744a9c6c7 +++ /dev/null @@ -1 +0,0 @@ -x¥MJ1„]ç¹À“$_qóÀ;/Ðét;³ÈDòòðúŽ ½€Ô¦ê£((½ïKƒ k2ëœS‚ÊÔ A,…JÀ¼©*b®œ[,ê'KG° ‚¬dÙyñRP0PuÆF1 èÚo±°‹àŠ—æ$žj…«ÂL ŒŽ8™¤ð¾¶1õµ}álú}ý6ýÄ'ýq/}§9nCÖ#þ¬­÷©$çmÖŒQ'=-þÇ„zãùÁºN@Wr4)?}<@**_Fn#prM3k@~cSqjC8xFpVeu4PBXW==v* zDL5I0NTxD3=ZgKp{7+VNlKDCVPUT?hR2cg8tJQY)*ff`Fhu89L3O^L z=+_N|zp7KA5+~g?P%wwn+hK#xIo5NtRh)dws#`QO@&USLM1D+ZN7vcenJ%>`4MNCh z5MgPfXwVe(r4{kt@!+&*SmZxcpFqR5fno&aZyOu;%p<7L;o0GYmGop-Q4L7ebc)~- z4ln^{J(kK@OsUi4tdpSrMkChOg09+KbMkl$AghX%^?_cTU$(T8zxykw>B0N}=djOq D3bL=J diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/e1/512550f09d980214e46e6d3f5a2b20c3d75755 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/e1/512550f09d980214e46e6d3f5a2b20c3d75755 deleted file mode 100644 index a5f506fb30b11082e62870bbc305d849e835ca39..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 208 zcmV;>05AV|0V^p=O;s>5GG{O}FfcPQQAjKܶ{nÛDŸ2Z›à¨Qk5ÝYnÈÿ0hnõ,ýUà‡‡¿V8Àe –N;¯G«>>MpM \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/e2/93bfdddb81a853bbb16b8b58e68626f30841a4 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/e2/93bfdddb81a853bbb16b8b58e68626f30841a4 deleted file mode 100644 index fab55fea641a6f1468010aec61395fccd7374c4b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 207 zcmV;=05Jb}0V^p=O;s>5GG{O}FfcPQQAjK05AV|0V^p=O;s>5GG{O}FfcPQQAjK05AV|0V^p=O;s>5GG{O}FfcPQQAjK*bF-)ZbitUz~A8-NutKB~y;hfT}7>P0RtSS-v4HxGwv-z^wgG{!ialdgVd+ KEd>C}tX{rBZ(}Y1 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/e5/0fbbd701458757bdfe9815f58ed717c588d1b5 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/e5/0fbbd701458757bdfe9815f58ed717c588d1b5 deleted file mode 100644 index 96467c106..000000000 --- a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/e5/0fbbd701458757bdfe9815f58ed717c588d1b5 +++ /dev/null @@ -1,3 +0,0 @@ -x%P1nÄ0 ëìW°ûÝ¡@§¢S§¢KC¯CG%QŽXr‚û}åÜ&I©KÒáõíåi*´Ý¡R×KŸlà8͆Uj2¢*ÊHLóx>ï¤3¢¡?0ÊÝ3îRKXÅNXëØÌPZØÉ©ð9›‚£Üì[-þ„=ÚüÀ\®¿ß·¯Û_ë°“q9¡E’’ì‡l-Ò³*†X¸7n\ó$»àÇ -¹¯„æíC‘:Í häVÊeó^´[<á¨Å¼Ô„E -7¿LH[@W˜†vf´wØ.0êŸuÉ:ÖÔº.U=LôdêÎ{L 4  0ÆÌmþ$˜o·ßx½çðµàŒ² \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/ef/1783444b61a8671beea4ce1f4d0202677dfbfb b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/ef/1783444b61a8671beea4ce1f4d0202677dfbfb deleted file mode 100644 index 67e6e8a5e..000000000 --- a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/ef/1783444b61a8671beea4ce1f4d0202677dfbfb +++ /dev/null @@ -1,3 +0,0 @@ -x¥O[ -Â0ô;§Ø T²Iš¤ "ˆžÀ l“-˜FjÄëÅø3̆™Prž+(+7ue†~ôŒÜÛ0û”bžxLÖ4¢ôAŠ;­¼TpJ£Ç„cŠZ²qd#FmÉDï kdG’Œ gÊ -§ø¢5Âe*ùQØqs?ìÀß৶¡ä= 1ýà­Vì¥Ímc+ÿY#ŽeI·9Ôy¹Çvÿ5× ÎŠ70‘UÞ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/f1/3e1bc6ba935fce2efffa5be4c4832404034ef1 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/f1/3e1bc6ba935fce2efffa5be4c4832404034ef1 deleted file mode 100644 index e115747a27463e7a9ead594d12413c330a9eaa46..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 206 zcmV;<05Sh~0i};QP6RO!MTz?ql}$9ruEmRl5Cnu|T)<12o}k;v7;$}?Ek`2zo1XMb z-?qyH61tj06}%;73gUdmAWTToQbQ+&i)4eD$rs=1@{)$`6B4#WuC>BRoFqh2M5$J? z4c>DLzM8_#{O%cTrij)!H9pqnDqGAcS8?QA^pOI(sAWlSbL|5j>U$a$p4Ps-_8o5Y zNI%t`eic9Ny7cW9EVBrQXc5kajaiQLI5+j5nB`H&v%)tGPJg{{g3CTTTiU*U#^-=Mc_p;5f~ORcam-GNKnM%1BHZ9rJiRZlp7!q2Dpe0}|aE z5Hs#lOIXDYSnCeh%urg`$*J%VIh%qMqZI7i>{}{zJz$GAKQPyaze?Gn-CKu^jLQKn zYLt{@+huE!o>ei#!o6|hnkU%_S1aVc9uS(h4@K%UgP@Ub{IF6kH}7R|LA%8h_6k|d zOHEj$aP!N-gtP^8g=uJKMtg^C0;4YRQCE?yV@<8=Qq{v`K~JXcyv3A2!vG3n%#1P7 S&7TDG?e-h5cMAX7UyPDbtcA4z diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/f1/b44c04989a3a1c14b036cfadfa328d53a7bc5e b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/f1/b44c04989a3a1c14b036cfadfa328d53a7bc5e deleted file mode 100644 index 7cbaaeecf596e2fa780fe9255822559fc9527259..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 672 zcmV;R0$=@j0Zo)okJB&^#X0*^4A&}DT9CN()I(Rh651}iT{t_*B(dVy!G8$h)APn@ zfm>sH#_#>!xV7~)-Q9is{O;T7_=R52Z_j(Bp5HF?_;fkbk)F>Nx;(s`PW1Kd_;Pur z^F4h(UQRC+eIoCScafT$C{Ehiiq20b6=&~Vmo52@YO9-(W}asbH2dsYZY$ERrL=fC z5VcJeEhY`yN}x0ZW)-bzILZmj+R>n=1AZkkiE3{w#l*Tbb}dzd&mkTtj%LCE<(o!F zD1)N4LO*siL!xoXOTDHz7$>cNvWDjW+ls2vOXf;J!JQr~rD zzYnYF?(akQDtuZ;l2iGZYQ%O48H2#yL$I}3}@ z8&+}vBfbhmXj<8h1(cL>-$$xhCwN|15{W5jxJ`qJ3KyjuAVz9++fwusQ!{wP)6%R% zw7ec9r?72BpJ${@^-3+n9LGwicf{M(4xzxK`?T zz0m&a<$&4a;X;?!({4xKuG`b)OotbG-(Gg76{RjPlXu3uNOevW2W{;NC#>S=y=${2 z-%@3D-P6e9$bm+mUBk_av}-6$UIwDJX+@Js-EtBZXceugIm(1(?Wohk2EP)SM3py| zVq)DGJD07_=MXm(doy4_`MTB-%)n?Cs_bY4MdOl}eNC}5PN09X2Iv1_g;haQ*1H>r z4JF+}DAs{P|5$<0qN7~u+qQha1=f+tw2(Nf2qfE3Fp)t+a5UYFEymouZ>YvNUt-VXeW#euH-^*6UiIv?>MTts4gxImL_Kq!2{KPM$4fSh! z@d3HjokkyM_L&Afmp*A~{BQUi%*bFo=;Wg^ZbhvL5lQM^wBM@%&(IVXSK=ia2W#L< z#{--xX;914U;W0Z4q7JU81Ooz!I+)P)zFEON%co&IJl;F`9A38PTWK+&O%iUS%@qm zOJ?PrLE6$M@9ey$tpk(}>EW%sipNbk;=QWsQUCI80`)G}z4(Nr049x$X|4VMzm1CR DzwlOd diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/f5/1658077d85f2264fa179b4d0848268cb3475c3 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/f5/1658077d85f2264fa179b4d0848268cb3475c3 deleted file mode 100644 index 3b4eb97e9..000000000 --- a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/f5/1658077d85f2264fa179b4d0848268cb3475c3 +++ /dev/null @@ -1,2 +0,0 @@ -xER»N1¤öW,}D‡@J•Š’ˆØóíå¬slÇ^'Êß3ö¨üšÇ®z}{Úö»¯ÝÇñ@‡ÏãþÙ˜o^„¦X3yÎ'¡¡;K¡8—Ä™Oµl¨ØÌIÈ)gÅß7d«3Q ¸F‰AÎBðFðÝÛÍÏtc•Œ¢9¦Ž*Ê~)–@Ôa1´ÕL. ÝœÎÄ”œXiV¶1€öa2t³PÓ*–$%É°°×­áq$½EºTÎÚã<< ÑùUPï;úuáKu*T⤛ -&Uß-Ÿq̱žš­âä*«nÑÌÈèšùÑ¥ Ýfgg:×¢4!£A„¥µ¢ASÔm»Ä¹ãÁiQ°È¨Þ†m E Ìß4Ü3 F…g‡FÒ“aD5 YÓ)‚G8@œõ*g1¥N“³N‚ú;_ ºjwÍÉã3€¬*FÖzv~y¤•|í¿ ¦ósÿÏö \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/f7/929c5a67a4bdc98247fb4b5098675723932a64 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/f7/929c5a67a4bdc98247fb4b5098675723932a64 deleted file mode 100644 index 2861579e8554903dfcac5862b5881c7a8f3dea92..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 207 zcmV;=05Jb}0i};iPQ)+}L|Nw)eSsi%`xi?i#AX(=V8;d8?Ka6GG4dGA^$8N30M(}I zsZ>%)+xKmNHQ{M=RY(g;Oq%WDaVd5o)M#@?pNcpbslTxshTrE_?sgguFlNDY>tul#56DR%}YwK_=5AFrt*S6o= z0T(^#k9*xW>FwU?c$T)m06G^_q=*4#v78DTp{`^~qR Jrf(5uVo0VDWGVmv diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/fa/567f568ed72157c0c617438d077695b99d9aac b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/fa/567f568ed72157c0c617438d077695b99d9aac deleted file mode 100644 index ad5a3cf4f2289302c712888568f61f6afd43fa1a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 662 zcmV;H0%`qt0Zo*_a?~&oL^*we5nZCWAp06)- zd7!t`_555>9uhOf;9?MJmP|5P?<=gZkvYcDEuLaWwYSYkGtV<8n&T2$ZY#2(rMyPn zAlB!KR+oo;CGDe)c-OG#4$n5wV5cMg%H%TD(Rq^0wsn3hr-ryBIg*TS!UhwY#tM`{ z(WX*4&4&H{>c`a{~xQW$~5C+=s6uJ+Yv@_9CPTODhS$rluKjRmG6CG zD@?9~#mxvN`IeFsh76r!sdv7B>0@lE!FG(9+^?Mg#HoO6YtQcsMgd0yrJaXG=uI01 zfKgusA~bF6#{x=^a^DNpY%@HstcgfY7H;$4#NeX5B#6|30E2cRj(5<&8}1ME5EF8128%w>78jcAR{CVAjlaP;xtXDO zvN?)zp`y+uL6UY<@3(4z8JZHLQkG~O(16Rp6UdY_sN?moe;3REFDr6Pcpchc?A^-M z@QIRX^=D=fJkXndpKN;*?gR%nm1?F%h3qCvX62p1+TN!a{C1#Iz$lyYovpr#`%R1B wy_))7|MG4UjbUj<<%Fa#OdBZ~|2wWInJ!uw>4&_5L|{tXfY8DG0Xe~qQL@xg)c^nh diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/fd/8b5fe88cda995e70a22ed98701e65b843e05ec b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/fd/8b5fe88cda995e70a22ed98701e65b843e05ec deleted file mode 100644 index b6f14634e403147301851fbcdffc67b275b3bd7c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 165 zcmV;W09yZe0i}=44FVw$g*{UR4QPNJU`UMdvK`m}FhkbEieWLv?nPq<-ri60<-J_j z_1dKYx9g2r!eqgK56G5vGMWf1BI#^`P7ye1A0kdD?y>Q$OP_rzXgPQ+nlxr*ohx1$ zGC6tgTnZTpiinTC)Fx+o#zyk8)OD*jdE}9P)S17<&mD4IPf`O|3+N`4dj(2~k&dyQ T|HO!y#^w6j21&dDYs63!76MG; diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/fe/f01f3104c8047d05e8572e521c454f8fd4b8db b/vendor/libgit2/tests/resources/merge-recursive/.gitted/objects/fe/f01f3104c8047d05e8572e521c454f8fd4b8db deleted file mode 100644 index 715b6a8657cb82115e844624d7b8153d1d17b9f3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 207 zcmV;=05Jb}0V^p=O;s>5GG{O}FfcPQQAjKnBG<2*eK(fL(So$ovP zbpzpRbt+Wiq?-l`CRN`pUvSK^o|~=WB!phksfhaE=JlVLJ)Dn`~DdU1Yvrj>l_zo4eA`2mp_&;vFX BuR#C+ diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchA-1 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchA-1 deleted file mode 100644 index b55325c3e..000000000 --- a/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchA-1 +++ /dev/null @@ -1 +0,0 @@ -539bd011c4822c560c1d17cab095006b7a10f707 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchA-2 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchA-2 deleted file mode 100644 index d35574340..000000000 --- a/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchA-2 +++ /dev/null @@ -1 +0,0 @@ -0bb7ed583d7e9ad507e8b902594f5c9126ea456b diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchB-1 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchB-1 deleted file mode 100644 index d2eecb741..000000000 --- a/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchB-1 +++ /dev/null @@ -1 +0,0 @@ -a34e5a16feabbd0335a633aadb8217c9f3dba58d diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchB-2 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchB-2 deleted file mode 100644 index d5cfb2762..000000000 --- a/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchB-2 +++ /dev/null @@ -1 +0,0 @@ -723181f1bfd30e47a6d1d36a4d874e31e7a0a1a4 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchC-1 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchC-1 deleted file mode 100644 index 346b039b4..000000000 --- a/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchC-1 +++ /dev/null @@ -1 +0,0 @@ -ad2ace9e15f66b3d1138922e6ffdc3ea3f967fa6 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchC-2 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchC-2 deleted file mode 100644 index 67f3153f5..000000000 --- a/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchC-2 +++ /dev/null @@ -1 +0,0 @@ -815b5a1c80ca749d705c7aa0cb294a00cbedd340 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchD-1 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchD-1 deleted file mode 100644 index fa96ccb28..000000000 --- a/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchD-1 +++ /dev/null @@ -1 +0,0 @@ -4dfc1be85a9d6c9898152444d32b238b4aecf8cc diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchD-2 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchD-2 deleted file mode 100644 index 8a87f9868..000000000 --- a/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchD-2 +++ /dev/null @@ -1 +0,0 @@ -007f1ee2af8e5d99906867c4237510e1790a89b8 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchE-1 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchE-1 deleted file mode 100644 index b8d011e2d..000000000 --- a/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchE-1 +++ /dev/null @@ -1 +0,0 @@ -ca224bba0a8a24f1768804fe5f565b1014af7ef2 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchE-2 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchE-2 deleted file mode 100644 index 5e1e1acd9..000000000 --- a/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchE-2 +++ /dev/null @@ -1 +0,0 @@ -436ea75c99f527e4b42fddb46abedf7726eb719d diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchE-3 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchE-3 deleted file mode 100644 index eaec8d81a..000000000 --- a/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchE-3 +++ /dev/null @@ -1 +0,0 @@ -9b258ad4c39f40c24f66bf1faf48eb6202d59c85 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchF-1 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchF-1 deleted file mode 100644 index 5f2ca915b..000000000 --- a/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchF-1 +++ /dev/null @@ -1 +0,0 @@ -783d6539dde96b8873c5b5da3e79cc14cd64830b diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchF-2 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchF-2 deleted file mode 100644 index abe2ea947..000000000 --- a/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchF-2 +++ /dev/null @@ -1 +0,0 @@ -ef1783444b61a8671beea4ce1f4d0202677dfbfb diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchG-1 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchG-1 deleted file mode 100644 index af511439b..000000000 --- a/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchG-1 +++ /dev/null @@ -1 +0,0 @@ -c483ca4bb087174af5cb51d7caa9c09fe4a28ccb diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchG-2 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchG-2 deleted file mode 100644 index 24177a247..000000000 --- a/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchG-2 +++ /dev/null @@ -1 +0,0 @@ -d71c24b3b113fd1d1909998c5bfe33b86a65ee03 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchH-1 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchH-1 deleted file mode 100644 index ffe9f8cf3..000000000 --- a/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchH-1 +++ /dev/null @@ -1 +0,0 @@ -7a9277e0c5ec75339f011c176d0c20e513c4de1c diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchH-2 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchH-2 deleted file mode 100644 index 84ed1a2a9..000000000 --- a/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchH-2 +++ /dev/null @@ -1 +0,0 @@ -db203155a789fb749aa3c14e93eea2c744a9c6c7 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchI-1 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchI-1 deleted file mode 100644 index 2d1ecd026..000000000 --- a/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchI-1 +++ /dev/null @@ -1 +0,0 @@ -5607a8c4601a737daadd1f470bde3142aff57026 diff --git a/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchI-2 b/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchI-2 deleted file mode 100644 index fc360bae2..000000000 --- a/vendor/libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchI-2 +++ /dev/null @@ -1 +0,0 @@ -f7929c5a67a4bdc98247fb4b5098675723932a64 diff --git a/vendor/libgit2/tests/resources/merge-recursive/asparagus.txt b/vendor/libgit2/tests/resources/merge-recursive/asparagus.txt deleted file mode 100644 index ffb36e513..000000000 --- a/vendor/libgit2/tests/resources/merge-recursive/asparagus.txt +++ /dev/null @@ -1,10 +0,0 @@ -ASPARAGUS SOUP. - -Take four large bunches of asparagus, scrape it nicely, cut off one inch -of the tops, and lay them in water, chop the stalks and put them on the -fire with a piece of bacon, a large onion cut up, and pepper and salt; -add two quarts of water, boil them till the stalks are quite soft, then -pulp them through a sieve, and strain the water to it, which must be put -back in the pot; put into it a chicken cut up, with the tops of -asparagus which had been laid by, boil it until these last articles are -sufficiently done, thicken with flour, butter and milk, and serve it up. diff --git a/vendor/libgit2/tests/resources/merge-recursive/beef.txt b/vendor/libgit2/tests/resources/merge-recursive/beef.txt deleted file mode 100644 index 68f6182f4..000000000 --- a/vendor/libgit2/tests/resources/merge-recursive/beef.txt +++ /dev/null @@ -1,22 +0,0 @@ -BEEF SOUP. - -Take the hind shin of beef, cut off all the flesh off the leg-bone, -which must be taken away entirely, or the soup will be greasy. Wash the -meat clean and lay it in a pot, sprinkle over it one small -table-spoonful of pounded black pepper, and two of salt; three onions -the size of a hen's egg, cut small, six small carrots scraped and cut -up, two small turnips pared and cut into dice; pour on three quarts of -water, cover the pot close, and keep it gently and steadily boiling five -hours, which will leave about three pints of clear soup; do not let the -pot boil over, but take off the scum carefully, as it rises. When it has -boiled four hours, put in a small bundle of thyme and parsley, and a -pint of celery cut small, or a tea-spoonful of celery seed pounded. -These latter ingredients would lose their delicate flavour if boiled too -much. Just before you take it up, brown it in the following manner: put -a small table-spoonful of nice brown sugar into an iron skillet, set it -on the fire and stir it till it melts and looks very dark, pour into it -a ladle full of the soup, a little at a time; stirring it all the while. -Strain this browning and mix it well with the soup; take out the bundle -of thyme and parsley, put the nicest pieces of meat in your tureen, and -pour on the soup and vegetables; put in some toasted bread cut in dice, -and serve it up. diff --git a/vendor/libgit2/tests/resources/merge-recursive/bouilli.txt b/vendor/libgit2/tests/resources/merge-recursive/bouilli.txt deleted file mode 100644 index 4b7c56500..000000000 --- a/vendor/libgit2/tests/resources/merge-recursive/bouilli.txt +++ /dev/null @@ -1,18 +0,0 @@ -SOUP WITH BOUILLI. - -Take the nicest part of the thick brisket of beef, about eight pounds, -put it into a pot with every thing directed for the other soup; make it -exactly in the same way, only put it on an hour sooner, that you may -have time to prepare the bouilli; after it has boiled five hours, take -out the beef, cover up the soup and set it near the fire that it may -keep hot. Take the skin off the beef, have the yelk of an egg well -beaten, dip a feather in it and wash the top of your beef, sprinkle over -it the crumb of stale bread finely grated, put it in a Dutch oven -previously heated, put the top on with coals enough to brown, but not -burn the beef; let it stand nearly an hour, and prepare your gravy -thus:--Take a sufficient quantity of soup and the vegetables boiled in -it; add to it a table-spoonful of red wine, and two of mushroom catsup, -thicken with a little bit of butter and a little brown flour; make it -very hot, pour it in your dish, and put the beef on it. Garnish it with -green pickle, cut in thin slices, serve up the soup in a tureen with -bits of toasted bread. diff --git a/vendor/libgit2/tests/resources/merge-recursive/gravy.txt b/vendor/libgit2/tests/resources/merge-recursive/gravy.txt deleted file mode 100644 index c4e6cca3e..000000000 --- a/vendor/libgit2/tests/resources/merge-recursive/gravy.txt +++ /dev/null @@ -1,8 +0,0 @@ -GRAVY SOUP. - -Get eight pounds of coarse lean beef--wash it clean and lay it in your -pot, put in the same ingredients as for the shin soup, with the same -quantity of water, and follow the process directed for that. Strain the -soup through a sieve, and serve it up clear, with nothing more than -toasted bread in it; two table-spoonsful of mushroom catsup will add a -fine flavour to the soup. diff --git a/vendor/libgit2/tests/resources/merge-recursive/oyster.txt b/vendor/libgit2/tests/resources/merge-recursive/oyster.txt deleted file mode 100644 index 7c7e08f95..000000000 --- a/vendor/libgit2/tests/resources/merge-recursive/oyster.txt +++ /dev/null @@ -1,13 +0,0 @@ -OYSTER SOUP! - -Wash and drain two quarts of oysters, put them on with three quarts of -water, three onions chopped up, two or three slices of lean ham, pepper -and salt; boil it till reduced one-half, strain it through a sieve, -return the liquid into the pot, put in one quart of fresh oysters, boil -it till they are sufficiently done, and thicken the soup with four -spoonsful of flour, two gills of rich cream, and the yelks of six new -laid eggs beaten well; boil it a few minutes after the thickening is put -in. Take care that it does not curdle, and that the flour is not in -lumps; serve it up with the last oysters that were put in. If the -flavour of thyme be agreeable, you may put in a little, but take care -that it does not boil in it long enough to discolour the soup. diff --git a/vendor/libgit2/tests/resources/merge-recursive/veal.txt b/vendor/libgit2/tests/resources/merge-recursive/veal.txt deleted file mode 100644 index 898d12687..000000000 --- a/vendor/libgit2/tests/resources/merge-recursive/veal.txt +++ /dev/null @@ -1,20 +0,0 @@ -VEAL SOUP. - -PUT INTO A POT THREE QUARTS OF WATER, 3 onions cut small, ONE -spoonful of black pepper pounded, and two of salt, with two or three -slices of lean ham; let it boil steadily two hours; skim it -occasionally, then put into it a shin of veal, let it boil two hours -longer; take out the slices of ham, and skim off the grease if any -should rise, take a gill of good cream, mix with it two table-spoonsful -of flour very nicely, and the yelks of two eggs beaten well, strain this -mixture, and add some chopped parsley; pour some soup on by degrees, -stir it well, and pour it into the pot, continuing to stir until it has -boiled two or three minutes to take off the raw taste of the eggs. If -the cream be not perfectly sweet, and the eggs quite new, the thickening -will curdle in the soup. For a change you may put a dozen ripe tomatos -in, first taking off their skins, by letting them stand a few minutes in -hot water, when they may be easily peeled. When made in this way you -must thicken it with the flour only. Any part of the veal may be used, -but the shin or knuckle is the nicest. - -This is a mighty fine recipe! diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/COMMIT_EDITMSG b/vendor/libgit2/tests/resources/merge-resolve/.gitted/COMMIT_EDITMSG deleted file mode 100644 index 245b18a2c..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -rename conflict theirs diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/HEAD b/vendor/libgit2/tests/resources/merge-resolve/.gitted/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/ORIG_HEAD b/vendor/libgit2/tests/resources/merge-resolve/.gitted/ORIG_HEAD deleted file mode 100644 index 4092d428f..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -2392a2dacc9efb562b8635d6579fb458751c7c5b diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/config b/vendor/libgit2/tests/resources/merge-resolve/.gitted/config deleted file mode 100644 index 26c48426d..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/config +++ /dev/null @@ -1,8 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true -[submodule "submodule"] - url = ../submodule diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/description b/vendor/libgit2/tests/resources/merge-resolve/.gitted/description deleted file mode 100644 index 498b267a8..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/index b/vendor/libgit2/tests/resources/merge-resolve/.gitted/index deleted file mode 100644 index 230eba9eb269af72a059d8017d293e3b375e751a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 624 zcmZ?q402{*U|<4b_P}(lB|w@1Ml&)nurmES{eyv_5h%|16(}VF#InjZoRTMJycOi~ z&i|ZmYW1eO(4?I~I58z9HAOcwPd7KQxFoemucV>`WEc>@%!AQTbAO_l`~98$!W{>= z{?|WHNd3E&BV{-5WS#R2f{CRi`MIe@>8XiHIjLY%VdlVSsCmE8%oALlGHC#i`gwZ z*0A#ER;PtNLNOOD1YqXDXsEe=(9G5H>&Qz`)jYLwwcvI6wq);%+aBB#VBk;A&r8e6 zOfJdHONY7?W)6&on)esYJgNJSKWVR$&p#L9K0(HyZP(+Bd)apxM2k{$^UFx_|35Ty z 1351563869 -0500 commit (initial): initial -c607fc30883e335def28cd686b51f6cfa02b06ec c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson 1351563886 -0500 checkout: moving from master to branch -c607fc30883e335def28cd686b51f6cfa02b06ec 7cb63eed597130ba4abb87b3e544b85021905520 Edward Thomson 1351563965 -0500 commit: branch -7cb63eed597130ba4abb87b3e544b85021905520 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson 1351563968 -0500 checkout: moving from branch to master -c607fc30883e335def28cd686b51f6cfa02b06ec 977c696519c5a3004c5f1d15d60c89dbeb8f235f Edward Thomson 1351564033 -0500 commit: master -977c696519c5a3004c5f1d15d60c89dbeb8f235f 977c696519c5a3004c5f1d15d60c89dbeb8f235f Edward Thomson 1351605785 -0500 checkout: moving from master to ff_branch -977c696519c5a3004c5f1d15d60c89dbeb8f235f 33d500f588fbbe65901d82b4e6b008e549064be0 Edward Thomson 1351605830 -0500 commit: fastforward -33d500f588fbbe65901d82b4e6b008e549064be0 977c696519c5a3004c5f1d15d60c89dbeb8f235f Edward Thomson 1351605889 -0500 checkout: moving from ff_branch to master -977c696519c5a3004c5f1d15d60c89dbeb8f235f 977c696519c5a3004c5f1d15d60c89dbeb8f235f Edward Thomson 1351874933 -0500 checkout: moving from master to octo1 -977c696519c5a3004c5f1d15d60c89dbeb8f235f 16f825815cfd20a07a75c71554e82d8eede0b061 Edward Thomson 1351874954 -0500 commit: octo1 -16f825815cfd20a07a75c71554e82d8eede0b061 977c696519c5a3004c5f1d15d60c89dbeb8f235f Edward Thomson 1351874957 -0500 checkout: moving from octo1 to master -977c696519c5a3004c5f1d15d60c89dbeb8f235f 977c696519c5a3004c5f1d15d60c89dbeb8f235f Edward Thomson 1351874960 -0500 checkout: moving from master to octo2 -977c696519c5a3004c5f1d15d60c89dbeb8f235f 158dc7bedb202f5b26502bf3574faa7f4238d56c Edward Thomson 1351874974 -0500 commit: octo2 -158dc7bedb202f5b26502bf3574faa7f4238d56c 977c696519c5a3004c5f1d15d60c89dbeb8f235f Edward Thomson 1351874976 -0500 checkout: moving from octo2 to master -977c696519c5a3004c5f1d15d60c89dbeb8f235f 977c696519c5a3004c5f1d15d60c89dbeb8f235f Edward Thomson 1351874980 -0500 checkout: moving from master to octo3 -977c696519c5a3004c5f1d15d60c89dbeb8f235f 50ce7d7d01217679e26c55939eef119e0c93e272 Edward Thomson 1351874998 -0500 commit: octo3 -50ce7d7d01217679e26c55939eef119e0c93e272 977c696519c5a3004c5f1d15d60c89dbeb8f235f Edward Thomson 1351875006 -0500 checkout: moving from octo3 to master -977c696519c5a3004c5f1d15d60c89dbeb8f235f 977c696519c5a3004c5f1d15d60c89dbeb8f235f Edward Thomson 1351875010 -0500 checkout: moving from master to octo4 -977c696519c5a3004c5f1d15d60c89dbeb8f235f 54269b3f6ec3d7d4ede24dd350dd5d605495c3ae Edward Thomson 1351875023 -0500 commit: octo4 -54269b3f6ec3d7d4ede24dd350dd5d605495c3ae 977c696519c5a3004c5f1d15d60c89dbeb8f235f Edward Thomson 1351875031 -0500 checkout: moving from octo4 to master -977c696519c5a3004c5f1d15d60c89dbeb8f235f 977c696519c5a3004c5f1d15d60c89dbeb8f235f Edward Thomson 1351875031 -0500 checkout: moving from master to octo5 -977c696519c5a3004c5f1d15d60c89dbeb8f235f e4f618a2c3ed0669308735727df5ebf2447f022f Edward Thomson 1351875041 -0500 commit: octo5 -e4f618a2c3ed0669308735727df5ebf2447f022f 977c696519c5a3004c5f1d15d60c89dbeb8f235f Edward Thomson 1351875046 -0500 checkout: moving from octo5 to master -977c696519c5a3004c5f1d15d60c89dbeb8f235f 977c696519c5a3004c5f1d15d60c89dbeb8f235f Edward Thomson 1351875046 -0500 checkout: moving from master to octo6 -977c696519c5a3004c5f1d15d60c89dbeb8f235f 4ca408a8c88655f7586a1b580be6fad138121e98 Edward Thomson 1351875057 -0500 commit: octo5 -4ca408a8c88655f7586a1b580be6fad138121e98 b6f610aef53bd343e6c96227de874c66f00ee8e8 Edward Thomson 1351875065 -0500 commit (amend): octo6 -b6f610aef53bd343e6c96227de874c66f00ee8e8 977c696519c5a3004c5f1d15d60c89dbeb8f235f Edward Thomson 1351875071 -0500 checkout: moving from octo6 to master -977c696519c5a3004c5f1d15d60c89dbeb8f235f 4e0d9401aee78eb345a8685a859d37c8c3c0bbed Edward Thomson 1351875091 -0500 merge octo1 octo2 octo3 octo4: Merge made by the 'octopus' strategy. -4e0d9401aee78eb345a8685a859d37c8c3c0bbed 54269b3f6ec3d7d4ede24dd350dd5d605495c3ae Edward Thomson 1351875108 -0500 reset: moving to 54269b3f6ec3d7d4ede24dd350dd5d605495c3ae -54269b3f6ec3d7d4ede24dd350dd5d605495c3ae 977c696519c5a3004c5f1d15d60c89dbeb8f235f Edward Thomson 1351875584 -0500 reset: moving to 977c696519c5a3004c5f1d15d60c89dbeb8f235f -bd593285fc7fe4ca18ccdbabf027f5d689101452 33d500f588fbbe65901d82b4e6b008e549064be0 Edward Thomson 1351990193 -0500 checkout: moving from master to ff_branch -33d500f588fbbe65901d82b4e6b008e549064be0 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson 1351990202 -0500 reset: moving to c607fc30883e335def28cd686b51f6cfa02b06ec -c607fc30883e335def28cd686b51f6cfa02b06ec bd593285fc7fe4ca18ccdbabf027f5d689101452 Edward Thomson 1351990205 -0500 merge master: Fast-forward -bd593285fc7fe4ca18ccdbabf027f5d689101452 fd89f8cffb663ac89095a0f9764902e93ceaca6a Edward Thomson 1351990229 -0500 commit: fastforward -fd89f8cffb663ac89095a0f9764902e93ceaca6a bd593285fc7fe4ca18ccdbabf027f5d689101452 Edward Thomson 1351990233 -0500 checkout: moving from ff_branch to master -bd593285fc7fe4ca18ccdbabf027f5d689101452 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson 1352091703 -0600 checkout: moving from master to trivial-2alt -c607fc30883e335def28cd686b51f6cfa02b06ec c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson 1352092411 -0600 checkout: moving from trivial-2alt to trivial-2alt-branch -c607fc30883e335def28cd686b51f6cfa02b06ec c9174cef549ec94ecbc43ef03cdc775b4950becb Edward Thomson 1352092434 -0600 commit: 2alt-branch -c9174cef549ec94ecbc43ef03cdc775b4950becb c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson 1352092440 -0600 checkout: moving from trivial-2alt-branch to trivial-2alt -c607fc30883e335def28cd686b51f6cfa02b06ec 566ab53c220a2eafc1212af1a024513230280ab9 Edward Thomson 1352092452 -0600 commit: 2alt -bd593285fc7fe4ca18ccdbabf027f5d689101452 566ab53c220a2eafc1212af1a024513230280ab9 Edward Thomson 1352094476 -0600 checkout: moving from master to trivial-3alt -566ab53c220a2eafc1212af1a024513230280ab9 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson 1352094547 -0600 reset: moving to c607fc30883e335def28cd686b51f6cfa02b06ec -c607fc30883e335def28cd686b51f6cfa02b06ec 5459c89aa0026d543ce8343bd89871bce543f9c2 Edward Thomson 1352094580 -0600 commit: 3alt -5459c89aa0026d543ce8343bd89871bce543f9c2 4c9fac0707f8d4195037ae5a681aa48626491541 Edward Thomson 1352094610 -0600 commit: 3alt-branch -4c9fac0707f8d4195037ae5a681aa48626491541 bd593285fc7fe4ca18ccdbabf027f5d689101452 Edward Thomson 1352094620 -0600 checkout: moving from trivial-3alt to master -bd593285fc7fe4ca18ccdbabf027f5d689101452 566ab53c220a2eafc1212af1a024513230280ab9 Edward Thomson 1352094752 -0600 checkout: moving from master to trivial-4 -566ab53c220a2eafc1212af1a024513230280ab9 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson 1352094764 -0600 reset: moving to c607fc30883e335def28cd686b51f6cfa02b06ec -c607fc30883e335def28cd686b51f6cfa02b06ec cc3e3009134cb88014129fc8858d1101359e5e2f Edward Thomson 1352094815 -0600 commit: trivial-4 -cc3e3009134cb88014129fc8858d1101359e5e2f c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson 1352094843 -0600 checkout: moving from trivial-4 to trivial-4-branch -c607fc30883e335def28cd686b51f6cfa02b06ec 183310e30fb1499af8c619108ffea4d300b5e778 Edward Thomson 1352094856 -0600 commit: trivial-4-branch -183310e30fb1499af8c619108ffea4d300b5e778 bd593285fc7fe4ca18ccdbabf027f5d689101452 Edward Thomson 1352094860 -0600 checkout: moving from trivial-4-branch to master -bd593285fc7fe4ca18ccdbabf027f5d689101452 cc3e3009134cb88014129fc8858d1101359e5e2f Edward Thomson 1352096588 -0600 checkout: moving from master to trivial-4 -cc3e3009134cb88014129fc8858d1101359e5e2f c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson 1352096612 -0600 checkout: moving from trivial-4 to trivial-5alt-1 -c607fc30883e335def28cd686b51f6cfa02b06ec 4fe93c0ec83eb6305cbace3dace88ecee1b63cb6 Edward Thomson 1352096643 -0600 commit: 5alt-1 -4fe93c0ec83eb6305cbace3dace88ecee1b63cb6 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson 1352096661 -0600 checkout: moving from trivial-5alt-1 to trivial-5alt-1-branch -c607fc30883e335def28cd686b51f6cfa02b06ec 4fe93c0ec83eb6305cbace3dace88ecee1b63cb6 Edward Thomson 1352096671 -0600 checkout: moving from trivial-5alt-1-branch to trivial-5alt-1 -4fe93c0ec83eb6305cbace3dace88ecee1b63cb6 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson 1352096678 -0600 checkout: moving from trivial-5alt-1 to trivial-5alt-1-branch -c607fc30883e335def28cd686b51f6cfa02b06ec 478172cb2f5ff9b514bc9d04d3bd5ef5840cb3b2 Edward Thomson 1352096689 -0600 commit: 5alt-1-branch -478172cb2f5ff9b514bc9d04d3bd5ef5840cb3b2 4fe93c0ec83eb6305cbace3dace88ecee1b63cb6 Edward Thomson 1352096701 -0600 checkout: moving from trivial-5alt-1-branch to trivial-5alt-1 -4fe93c0ec83eb6305cbace3dace88ecee1b63cb6 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson 1352096715 -0600 checkout: moving from trivial-5alt-1 to trivial-5alt-2 -c607fc30883e335def28cd686b51f6cfa02b06ec ebc09d0137cfb0c26697aed0109fb943ad906f3f Edward Thomson 1352096764 -0600 commit: existing file -ebc09d0137cfb0c26697aed0109fb943ad906f3f 3b47b031b3e55ae11e14a05260b1c3ffd6838d55 Edward Thomson 1352096815 -0600 commit: 5alt-2 -3b47b031b3e55ae11e14a05260b1c3ffd6838d55 ebc09d0137cfb0c26697aed0109fb943ad906f3f Edward Thomson 1352096840 -0600 checkout: moving from trivial-5alt-2 to trivial-5alt-2-branch -ebc09d0137cfb0c26697aed0109fb943ad906f3f f48097eb340dc5a7cae55aabcf1faf4548aa821f Edward Thomson 1352096855 -0600 commit: 5alt-2-branch -f48097eb340dc5a7cae55aabcf1faf4548aa821f bd593285fc7fe4ca18ccdbabf027f5d689101452 Edward Thomson 1352096858 -0600 checkout: moving from trivial-5alt-2-branch to master -bd593285fc7fe4ca18ccdbabf027f5d689101452 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson 1352097377 -0600 checkout: moving from master to trivial-6 -c607fc30883e335def28cd686b51f6cfa02b06ec f7c332bd4d4d4b777366cae4d24d1687477576bf Edward Thomson 1352097389 -0600 commit: 6 -f7c332bd4d4d4b777366cae4d24d1687477576bf 99b4f7e4f24470fa06b980bc21f1095c2a9425c0 Edward Thomson 1352097404 -0600 commit: trivial-6 -99b4f7e4f24470fa06b980bc21f1095c2a9425c0 f7c332bd4d4d4b777366cae4d24d1687477576bf Edward Thomson 1352097420 -0600 checkout: moving from trivial-6 to trivial-6-branch -f7c332bd4d4d4b777366cae4d24d1687477576bf a43150a738849c59376cf30bb2a68348a83c8f48 Edward Thomson 1352097431 -0600 commit: 6-branch -a43150a738849c59376cf30bb2a68348a83c8f48 bd593285fc7fe4ca18ccdbabf027f5d689101452 Edward Thomson 1352097442 -0600 checkout: moving from trivial-6-branch to master -bd593285fc7fe4ca18ccdbabf027f5d689101452 99b4f7e4f24470fa06b980bc21f1095c2a9425c0 Edward Thomson 1352098040 -0600 checkout: moving from master to trivial-6 -99b4f7e4f24470fa06b980bc21f1095c2a9425c0 bd593285fc7fe4ca18ccdbabf027f5d689101452 Edward Thomson 1352098057 -0600 checkout: moving from trivial-6 to master -bd593285fc7fe4ca18ccdbabf027f5d689101452 cc3e3009134cb88014129fc8858d1101359e5e2f Edward Thomson 1352098792 -0600 checkout: moving from master to trivial-4 -cc3e3009134cb88014129fc8858d1101359e5e2f c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson 1352098818 -0600 checkout: moving from trivial-4 to trivial-8 -c607fc30883e335def28cd686b51f6cfa02b06ec 75a811bf6bc57694adb3fe604786f3a4efd1cd1b Edward Thomson 1352098884 -0600 commit: trivial-8 -75a811bf6bc57694adb3fe604786f3a4efd1cd1b 75a811bf6bc57694adb3fe604786f3a4efd1cd1b Edward Thomson 1352098947 -0600 checkout: moving from trivial-8 to trivial-8-branch -75a811bf6bc57694adb3fe604786f3a4efd1cd1b 52d8bc572af2b6d4ee0d5e62ed5d1fbad92210a9 Edward Thomson 1352098979 -0600 commit: trivial-8-branch -52d8bc572af2b6d4ee0d5e62ed5d1fbad92210a9 75a811bf6bc57694adb3fe604786f3a4efd1cd1b Edward Thomson 1352098982 -0600 checkout: moving from trivial-8-branch to trivial-8 -75a811bf6bc57694adb3fe604786f3a4efd1cd1b 3575826c96a975031d2c14368529cc5c4353a8fd Edward Thomson 1352099000 -0600 commit: trivial-8 -3575826c96a975031d2c14368529cc5c4353a8fd bd593285fc7fe4ca18ccdbabf027f5d689101452 Edward Thomson 1352099008 -0600 checkout: moving from trivial-8 to master -bd593285fc7fe4ca18ccdbabf027f5d689101452 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson 1352099776 -0600 checkout: moving from master to trivial-7 -c607fc30883e335def28cd686b51f6cfa02b06ec 092ce8682d7f3a2a3a769a6daca58950168ba5c4 Edward Thomson 1352099790 -0600 commit: trivial-7 -092ce8682d7f3a2a3a769a6daca58950168ba5c4 092ce8682d7f3a2a3a769a6daca58950168ba5c4 Edward Thomson 1352099799 -0600 checkout: moving from trivial-7 to trivial-7-branch -092ce8682d7f3a2a3a769a6daca58950168ba5c4 73cbfdc4fe843169e5b2af8dcad03cbf3acf306c Edward Thomson 1352099812 -0600 commit: trivial-7-branch -73cbfdc4fe843169e5b2af8dcad03cbf3acf306c 092ce8682d7f3a2a3a769a6daca58950168ba5c4 Edward Thomson 1352099815 -0600 checkout: moving from trivial-7-branch to trivial-7 -092ce8682d7f3a2a3a769a6daca58950168ba5c4 73cbfdc4fe843169e5b2af8dcad03cbf3acf306c Edward Thomson 1352099838 -0600 checkout: moving from trivial-7 to trivial-7-branch -73cbfdc4fe843169e5b2af8dcad03cbf3acf306c 092ce8682d7f3a2a3a769a6daca58950168ba5c4 Edward Thomson 1352099874 -0600 reset: moving to 092ce8682d7f3a2a3a769a6daca58950168ba5c4 -092ce8682d7f3a2a3a769a6daca58950168ba5c4 009b9cab6fdac02915a88ecd078b7a792ed802d8 Edward Thomson 1352099921 -0600 commit: removed in 7 -009b9cab6fdac02915a88ecd078b7a792ed802d8 5195a1b480f66691b667f10a9e41e70115a78351 Edward Thomson 1352099927 -0600 commit (amend): trivial-7-branch -5195a1b480f66691b667f10a9e41e70115a78351 092ce8682d7f3a2a3a769a6daca58950168ba5c4 Edward Thomson 1352099937 -0600 checkout: moving from trivial-7-branch to trivial-7 -092ce8682d7f3a2a3a769a6daca58950168ba5c4 d874671ef5b20184836cb983bb273e5280384d0b Edward Thomson 1352099947 -0600 commit: trivial-7 -d874671ef5b20184836cb983bb273e5280384d0b bd593285fc7fe4ca18ccdbabf027f5d689101452 Edward Thomson 1352099949 -0600 checkout: moving from trivial-7 to master -bd593285fc7fe4ca18ccdbabf027f5d689101452 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson 1352100174 -0600 checkout: moving from master to trivial-10 -c607fc30883e335def28cd686b51f6cfa02b06ec 53825f41ac8d640612f9423a2f03a69f3d96809a Edward Thomson 1352100193 -0600 commit: trivial-10 -53825f41ac8d640612f9423a2f03a69f3d96809a 53825f41ac8d640612f9423a2f03a69f3d96809a Edward Thomson 1352100200 -0600 checkout: moving from trivial-10 to trivial-10-branch -53825f41ac8d640612f9423a2f03a69f3d96809a 11f4f3c08b737f5fd896cbefa1425ee63b21b2fa Edward Thomson 1352100211 -0600 commit: trivial-10-branch -11f4f3c08b737f5fd896cbefa1425ee63b21b2fa 53825f41ac8d640612f9423a2f03a69f3d96809a Edward Thomson 1352100214 -0600 checkout: moving from trivial-10-branch to trivial-10 -53825f41ac8d640612f9423a2f03a69f3d96809a 0ec5f433959cd46177f745903353efb5be08d151 Edward Thomson 1352100223 -0600 commit: trivial-10 -0ec5f433959cd46177f745903353efb5be08d151 bd593285fc7fe4ca18ccdbabf027f5d689101452 Edward Thomson 1352100225 -0600 checkout: moving from trivial-10 to master -bd593285fc7fe4ca18ccdbabf027f5d689101452 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson 1352100270 -0600 checkout: moving from master to trivial-9 -c607fc30883e335def28cd686b51f6cfa02b06ec f0053b8060bb3f0be5cbcc3147a07ece26bf097e Edward Thomson 1352100304 -0600 commit: trivial-9 -f0053b8060bb3f0be5cbcc3147a07ece26bf097e f0053b8060bb3f0be5cbcc3147a07ece26bf097e Edward Thomson 1352100310 -0600 checkout: moving from trivial-9 to trivial-9-branch -f0053b8060bb3f0be5cbcc3147a07ece26bf097e 13d1be4ea52a6ced1d7a1d832f0ee3c399348e5e Edward Thomson 1352100317 -0600 commit: trivial-9-branch -13d1be4ea52a6ced1d7a1d832f0ee3c399348e5e f0053b8060bb3f0be5cbcc3147a07ece26bf097e Edward Thomson 1352100319 -0600 checkout: moving from trivial-9-branch to trivial-9 -f0053b8060bb3f0be5cbcc3147a07ece26bf097e c35dee9bcc0e989f3b0c40f68372a9a51b6c4e6a Edward Thomson 1352100333 -0600 commit: trivial-9 -c35dee9bcc0e989f3b0c40f68372a9a51b6c4e6a bd593285fc7fe4ca18ccdbabf027f5d689101452 Edward Thomson 1352100335 -0600 checkout: moving from trivial-9 to master -bd593285fc7fe4ca18ccdbabf027f5d689101452 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson 1352100576 -0600 checkout: moving from master to trivial-13 -c607fc30883e335def28cd686b51f6cfa02b06ec 8f4433f8593ddd65b7dd43dd4564d841f4d9c8aa Edward Thomson 1352100589 -0600 commit: trivial-13 -8f4433f8593ddd65b7dd43dd4564d841f4d9c8aa 8f4433f8593ddd65b7dd43dd4564d841f4d9c8aa Edward Thomson 1352100604 -0600 checkout: moving from trivial-13 to trivial-13-branch -8f4433f8593ddd65b7dd43dd4564d841f4d9c8aa 05f3c1a2a56ca95c3d2ef28dc9ddf32b5cd6c91c Edward Thomson 1352100610 -0600 commit: trivial-13-branch -05f3c1a2a56ca95c3d2ef28dc9ddf32b5cd6c91c 8f4433f8593ddd65b7dd43dd4564d841f4d9c8aa Edward Thomson 1352100612 -0600 checkout: moving from trivial-13-branch to trivial-13 -8f4433f8593ddd65b7dd43dd4564d841f4d9c8aa a3fabece9eb8748da810e1e08266fef9b7136ad4 Edward Thomson 1352100625 -0600 commit: trivial-13 -a3fabece9eb8748da810e1e08266fef9b7136ad4 bd593285fc7fe4ca18ccdbabf027f5d689101452 Edward Thomson 1352100627 -0600 checkout: moving from trivial-13 to master -bd593285fc7fe4ca18ccdbabf027f5d689101452 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson 1352100936 -0600 checkout: moving from master to trivial-11 -c607fc30883e335def28cd686b51f6cfa02b06ec 35632e43612c06a3ea924bfbacd48333da874c29 Edward Thomson 1352100958 -0600 commit: trivial-11 -35632e43612c06a3ea924bfbacd48333da874c29 35632e43612c06a3ea924bfbacd48333da874c29 Edward Thomson 1352100964 -0600 checkout: moving from trivial-11 to trivial-11-branch -35632e43612c06a3ea924bfbacd48333da874c29 6718a45909532d1fcf5600d0877f7fe7e78f0b86 Edward Thomson 1352100978 -0600 commit: trivial-11-branch -6718a45909532d1fcf5600d0877f7fe7e78f0b86 35632e43612c06a3ea924bfbacd48333da874c29 Edward Thomson 1352100981 -0600 checkout: moving from trivial-11-branch to trivial-11 -35632e43612c06a3ea924bfbacd48333da874c29 3168dca1a561889b045a6441909f4c56145e666d Edward Thomson 1352100992 -0600 commit: trivial-11 -3168dca1a561889b045a6441909f4c56145e666d bd593285fc7fe4ca18ccdbabf027f5d689101452 Edward Thomson 1352100996 -0600 checkout: moving from trivial-11 to master -bd593285fc7fe4ca18ccdbabf027f5d689101452 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson 1352101098 -0600 checkout: moving from master to trivial-14 -c607fc30883e335def28cd686b51f6cfa02b06ec 596803b523203a4851c824c07366906f8353f4ad Edward Thomson 1352101113 -0600 commit: trivial-14 -596803b523203a4851c824c07366906f8353f4ad 596803b523203a4851c824c07366906f8353f4ad Edward Thomson 1352101117 -0600 checkout: moving from trivial-14 to trivial-14-branch -596803b523203a4851c824c07366906f8353f4ad 8187117062b750eed4f93fd7e899f17b52ce554d Edward Thomson 1352101132 -0600 commit: trivial-14-branch -8187117062b750eed4f93fd7e899f17b52ce554d 596803b523203a4851c824c07366906f8353f4ad Edward Thomson 1352101135 -0600 checkout: moving from trivial-14-branch to trivial-14 -596803b523203a4851c824c07366906f8353f4ad 7e2d058d5fedf8329db44db4fac610d6b1a89159 Edward Thomson 1352101141 -0600 commit: trivial-14 -7e2d058d5fedf8329db44db4fac610d6b1a89159 bd593285fc7fe4ca18ccdbabf027f5d689101452 Edward Thomson 1352101145 -0600 checkout: moving from trivial-14 to master -bd593285fc7fe4ca18ccdbabf027f5d689101452 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson 1353177749 -0600 checkout: moving from master to renames1 -c607fc30883e335def28cd686b51f6cfa02b06ec 412b32fb66137366147f1801ecc962452757d48a Edward Thomson 1353177886 -0600 commit: renames -412b32fb66137366147f1801ecc962452757d48a bd593285fc7fe4ca18ccdbabf027f5d689101452 Edward Thomson 1353794607 -0600 checkout: moving from renames1 to master -bd593285fc7fe4ca18ccdbabf027f5d689101452 bd593285fc7fe4ca18ccdbabf027f5d689101452 Edward Thomson 1353794647 -0600 checkout: moving from master to renames2 -bd593285fc7fe4ca18ccdbabf027f5d689101452 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson 1353794677 -0600 reset: moving to c607fc30883e335def28cd686b51f6cfa02b06ec -c607fc30883e335def28cd686b51f6cfa02b06ec ab40af3cb8a3ed2e2843e96d9aa7871336b94573 Edward Thomson 1353794852 -0600 commit: renames2 -ab40af3cb8a3ed2e2843e96d9aa7871336b94573 bd593285fc7fe4ca18ccdbabf027f5d689101452 Edward Thomson 1353794883 -0600 checkout: moving from renames2 to master -bd593285fc7fe4ca18ccdbabf027f5d689101452 bd593285fc7fe4ca18ccdbabf027f5d689101452 Edward Thomson 1354574697 -0600 checkout: moving from master to df_side1 -bd593285fc7fe4ca18ccdbabf027f5d689101452 d4207f77243500bec335ab477f9227fcdb1e271a Edward Thomson 1354574962 -0600 commit: df_ancestor -d4207f77243500bec335ab477f9227fcdb1e271a c94b27e41064c521120627e07e2035cca1d24ffa Edward Thomson 1354575027 -0600 commit: df_side1 -c94b27e41064c521120627e07e2035cca1d24ffa d4207f77243500bec335ab477f9227fcdb1e271a Edward Thomson 1354575070 -0600 checkout: moving from df_side1 to df_side2 -d4207f77243500bec335ab477f9227fcdb1e271a f8958bdf4d365a84a9a178b1f5f35ff1dacbd884 Edward Thomson 1354575206 -0600 commit: df_side2 -f8958bdf4d365a84a9a178b1f5f35ff1dacbd884 bd593285fc7fe4ca18ccdbabf027f5d689101452 Edward Thomson 1354575381 -0600 checkout: moving from df_side2 to master -bd593285fc7fe4ca18ccdbabf027f5d689101452 c94b27e41064c521120627e07e2035cca1d24ffa Edward Thomson 1355017614 -0600 checkout: moving from master to df_side1 -c94b27e41064c521120627e07e2035cca1d24ffa a90bc3fb6f15181972a2959a921429efbd81a473 Edward Thomson 1355017650 -0600 commit: df_added -a90bc3fb6f15181972a2959a921429efbd81a473 c94b27e41064c521120627e07e2035cca1d24ffa Edward Thomson 1355017673 -0600 checkout: moving from df_side1 to c94b27e -c94b27e41064c521120627e07e2035cca1d24ffa d4207f77243500bec335ab477f9227fcdb1e271a Edward Thomson 1355017673 -0600 rebase -i (squash): updating HEAD -d4207f77243500bec335ab477f9227fcdb1e271a 005b6fcc8fec71d2550bef8462d169b3c26aa14b Edward Thomson 1355017673 -0600 rebase -i (squash): df_side1 -005b6fcc8fec71d2550bef8462d169b3c26aa14b 005b6fcc8fec71d2550bef8462d169b3c26aa14b Edward Thomson 1355017676 -0600 rebase -i (finish): returning to refs/heads/df_side1 -005b6fcc8fec71d2550bef8462d169b3c26aa14b f8958bdf4d365a84a9a178b1f5f35ff1dacbd884 Edward Thomson 1355017715 -0600 reset: moving to df_side2 -f8958bdf4d365a84a9a178b1f5f35ff1dacbd884 8c749d9968d4b10dcfb06c9f97d0e5d92d337071 Edward Thomson 1355017744 -0600 commit: df_added -8c749d9968d4b10dcfb06c9f97d0e5d92d337071 f8958bdf4d365a84a9a178b1f5f35ff1dacbd884 Edward Thomson 1355017754 -0600 checkout: moving from df_side1 to f8958bd -f8958bdf4d365a84a9a178b1f5f35ff1dacbd884 d4207f77243500bec335ab477f9227fcdb1e271a Edward Thomson 1355017754 -0600 rebase -i (squash): updating HEAD -d4207f77243500bec335ab477f9227fcdb1e271a 0204a84f822acbf6386b36d33f1f6bc68bbbf858 Edward Thomson 1355017754 -0600 rebase -i (squash): df_side2 -0204a84f822acbf6386b36d33f1f6bc68bbbf858 0204a84f822acbf6386b36d33f1f6bc68bbbf858 Edward Thomson 1355017756 -0600 rebase -i (finish): returning to refs/heads/df_side1 -0204a84f822acbf6386b36d33f1f6bc68bbbf858 005b6fcc8fec71d2550bef8462d169b3c26aa14b Edward Thomson 1355017793 -0600 reset: moving to 005b6fcc8fec71d2550bef8462d169b3c26aa14b -005b6fcc8fec71d2550bef8462d169b3c26aa14b 0204a84f822acbf6386b36d33f1f6bc68bbbf858 Edward Thomson 1355017826 -0600 reset: moving to 0204a84 -0204a84f822acbf6386b36d33f1f6bc68bbbf858 bd593285fc7fe4ca18ccdbabf027f5d689101452 Edward Thomson 1355017847 -0600 checkout: moving from df_side1 to master -bd593285fc7fe4ca18ccdbabf027f5d689101452 0204a84f822acbf6386b36d33f1f6bc68bbbf858 Edward Thomson 1355168677 -0600 checkout: moving from master to df_side1 -005b6fcc8fec71d2550bef8462d169b3c26aa14b 005b6fcc8fec71d2550bef8462d169b3c26aa14b Edward Thomson 1355168829 -0600 checkout: moving from df_side1 to df_side1 -005b6fcc8fec71d2550bef8462d169b3c26aa14b 005b6fcc8fec71d2550bef8462d169b3c26aa14b Edward Thomson 1355168838 -0600 checkout: moving from df_side1 to df_side1 -005b6fcc8fec71d2550bef8462d169b3c26aa14b e8107f24196736b870a318a0e28f048e29f6feff Edward Thomson 1355169065 -0600 commit: df_side1 -e8107f24196736b870a318a0e28f048e29f6feff 005b6fcc8fec71d2550bef8462d169b3c26aa14b Edward Thomson 1355169081 -0600 checkout: moving from df_side1 to 005b6fc -005b6fcc8fec71d2550bef8462d169b3c26aa14b d4207f77243500bec335ab477f9227fcdb1e271a Edward Thomson 1355169081 -0600 rebase -i (squash): updating HEAD -d4207f77243500bec335ab477f9227fcdb1e271a 80a8fbb3abb1ba423d554e9630b8fc2e5698f86b Edward Thomson 1355169081 -0600 rebase -i (squash): df_side1 -80a8fbb3abb1ba423d554e9630b8fc2e5698f86b 80a8fbb3abb1ba423d554e9630b8fc2e5698f86b Edward Thomson 1355169084 -0600 rebase -i (finish): returning to refs/heads/df_side1 -80a8fbb3abb1ba423d554e9630b8fc2e5698f86b 0204a84f822acbf6386b36d33f1f6bc68bbbf858 Edward Thomson 1355169141 -0600 checkout: moving from df_side1 to df_side2 -0204a84f822acbf6386b36d33f1f6bc68bbbf858 944f5dd1a867cab4c2bbcb896493435cae1dcc1a Edward Thomson 1355169174 -0600 commit: both -944f5dd1a867cab4c2bbcb896493435cae1dcc1a 0204a84f822acbf6386b36d33f1f6bc68bbbf858 Edward Thomson 1355169182 -0600 checkout: moving from df_side2 to 0204a84 -0204a84f822acbf6386b36d33f1f6bc68bbbf858 d4207f77243500bec335ab477f9227fcdb1e271a Edward Thomson 1355169182 -0600 rebase -i (squash): updating HEAD -d4207f77243500bec335ab477f9227fcdb1e271a 57079a46233ae2b6df62e9ade71c4948512abefb Edward Thomson 1355169182 -0600 rebase -i (squash): df_side2 -57079a46233ae2b6df62e9ade71c4948512abefb 57079a46233ae2b6df62e9ade71c4948512abefb Edward Thomson 1355169185 -0600 rebase -i (finish): returning to refs/heads/df_side2 -57079a46233ae2b6df62e9ade71c4948512abefb 80a8fbb3abb1ba423d554e9630b8fc2e5698f86b Edward Thomson 1355169241 -0600 checkout: moving from df_side2 to df_side1 -80a8fbb3abb1ba423d554e9630b8fc2e5698f86b e65a9bb2af9f4c2d1c375dd0f8f8a46cf9c68812 Edward Thomson 1355169419 -0600 commit: side1 -e65a9bb2af9f4c2d1c375dd0f8f8a46cf9c68812 80a8fbb3abb1ba423d554e9630b8fc2e5698f86b Edward Thomson 1355169431 -0600 checkout: moving from df_side1 to 80a8fbb -80a8fbb3abb1ba423d554e9630b8fc2e5698f86b d4207f77243500bec335ab477f9227fcdb1e271a Edward Thomson 1355169431 -0600 rebase -i (squash): updating HEAD -d4207f77243500bec335ab477f9227fcdb1e271a 5dc1018e90b19654bee986b7a0c268804d39659d Edward Thomson 1355169431 -0600 rebase -i (squash): df_side1 -5dc1018e90b19654bee986b7a0c268804d39659d 5dc1018e90b19654bee986b7a0c268804d39659d Edward Thomson 1355169435 -0600 rebase -i (finish): returning to refs/heads/df_side1 -5dc1018e90b19654bee986b7a0c268804d39659d 57079a46233ae2b6df62e9ade71c4948512abefb Edward Thomson 1355169439 -0600 checkout: moving from df_side1 to df_side2 -57079a46233ae2b6df62e9ade71c4948512abefb 58e853f66699fd02629fd50bde08082bc005933a Edward Thomson 1355169460 -0600 commit: side2 -58e853f66699fd02629fd50bde08082bc005933a 57079a46233ae2b6df62e9ade71c4948512abefb Edward Thomson 1355169469 -0600 checkout: moving from df_side2 to 57079a4 -57079a46233ae2b6df62e9ade71c4948512abefb d4207f77243500bec335ab477f9227fcdb1e271a Edward Thomson 1355169469 -0600 rebase -i (squash): updating HEAD -d4207f77243500bec335ab477f9227fcdb1e271a fada9356aa3f74622327a3038ae9c6f92e1c5c1d Edward Thomson 1355169469 -0600 rebase -i (squash): df_side2 -fada9356aa3f74622327a3038ae9c6f92e1c5c1d fada9356aa3f74622327a3038ae9c6f92e1c5c1d Edward Thomson 1355169471 -0600 rebase -i (finish): returning to refs/heads/df_side2 -fada9356aa3f74622327a3038ae9c6f92e1c5c1d 5dc1018e90b19654bee986b7a0c268804d39659d Edward Thomson 1355169494 -0600 checkout: moving from df_side2 to df_side1 -5dc1018e90b19654bee986b7a0c268804d39659d d4207f77243500bec335ab477f9227fcdb1e271a Edward Thomson 1355169663 -0600 checkout: moving from df_side1 to d4207f77243500bec335ab477f9227fcdb1e271a -d4207f77243500bec335ab477f9227fcdb1e271a 849619b03ae540acee4d1edec96b86993da6b497 Edward Thomson 1355169683 -0600 commit: both_dirs -849619b03ae540acee4d1edec96b86993da6b497 d4207f77243500bec335ab477f9227fcdb1e271a Edward Thomson 1355169691 -0600 checkout: moving from 849619b03ae540acee4d1edec96b86993da6b497 to d4207f7 -d4207f77243500bec335ab477f9227fcdb1e271a bd593285fc7fe4ca18ccdbabf027f5d689101452 Edward Thomson 1355169691 -0600 rebase -i (squash): updating HEAD -bd593285fc7fe4ca18ccdbabf027f5d689101452 a765fb87eb2f7a1920b73b2d5a057f8f8476a42b Edward Thomson 1355169691 -0600 rebase -i (squash): df_ancestor -a765fb87eb2f7a1920b73b2d5a057f8f8476a42b 5dc1018e90b19654bee986b7a0c268804d39659d Edward Thomson 1355169706 -0600 checkout: moving from a765fb87eb2f7a1920b73b2d5a057f8f8476a42b to df_side1 -5dc1018e90b19654bee986b7a0c268804d39659d a765fb87eb2f7a1920b73b2d5a057f8f8476a42b Edward Thomson 1355169715 -0600 checkout: moving from df_side1 to a765fb87eb2f7a1920b73b2d5a057f8f8476a42b^0 -a765fb87eb2f7a1920b73b2d5a057f8f8476a42b bc744705e1d8a019993cf88f62bc4020f1b80919 Edward Thomson 1355169801 -0600 commit: df_side1 -bc744705e1d8a019993cf88f62bc4020f1b80919 bc744705e1d8a019993cf88f62bc4020f1b80919 Edward Thomson 1355169822 -0600 checkout: moving from bc744705e1d8a019993cf88f62bc4020f1b80919 to df_side1 -bc744705e1d8a019993cf88f62bc4020f1b80919 fada9356aa3f74622327a3038ae9c6f92e1c5c1d Edward Thomson 1355169826 -0600 checkout: moving from df_side1 to df_side2 -fada9356aa3f74622327a3038ae9c6f92e1c5c1d a765fb87eb2f7a1920b73b2d5a057f8f8476a42b Edward Thomson 1355169866 -0600 checkout: moving from df_side2 to a765fb87eb2f7a1920b73b2d5a057f8f8476a42b^0 -a765fb87eb2f7a1920b73b2d5a057f8f8476a42b 95646149ab6b6ba6edc83cff678582538b457b2b Edward Thomson 1355169897 -0600 rebase: df_side2 -95646149ab6b6ba6edc83cff678582538b457b2b 95646149ab6b6ba6edc83cff678582538b457b2b Edward Thomson 1355169897 -0600 rebase finished: returning to refs/heads/df_side2 -95646149ab6b6ba6edc83cff678582538b457b2b bc744705e1d8a019993cf88f62bc4020f1b80919 Edward Thomson 1355169949 -0600 checkout: moving from df_side2 to df_side1 -bc744705e1d8a019993cf88f62bc4020f1b80919 bd593285fc7fe4ca18ccdbabf027f5d689101452 Edward Thomson 1355170046 -0600 checkout: moving from df_side1 to master -bd593285fc7fe4ca18ccdbabf027f5d689101452 bd593285fc7fe4ca18ccdbabf027f5d689101452 Edward Thomson 1355181639 -0600 checkout: moving from master to df_ancestor -bd593285fc7fe4ca18ccdbabf027f5d689101452 2da538570bc1e5b2c3e855bf702f35248ad0735f Edward Thomson 1355181673 -0600 commit: df_ancestor -2da538570bc1e5b2c3e855bf702f35248ad0735f a7dbfcbfc1a60709cb80b5ca24539008456531d0 Edward Thomson 1355181715 -0600 commit: df_side1 -a7dbfcbfc1a60709cb80b5ca24539008456531d0 a7dbfcbfc1a60709cb80b5ca24539008456531d0 Edward Thomson 1355181743 -0600 checkout: moving from df_ancestor to df_ancestor -a7dbfcbfc1a60709cb80b5ca24539008456531d0 9a301fbe6fada7dcb74fcd7c20269b5c743459a7 Edward Thomson 1355181775 -0600 commit: df_side2 -9a301fbe6fada7dcb74fcd7c20269b5c743459a7 a7dbfcbfc1a60709cb80b5ca24539008456531d0 Edward Thomson 1355181793 -0600 checkout: moving from df_ancestor to df_side1 -a7dbfcbfc1a60709cb80b5ca24539008456531d0 9a301fbe6fada7dcb74fcd7c20269b5c743459a7 Edward Thomson 1355181797 -0600 checkout: moving from df_side1 to df_side2 -9a301fbe6fada7dcb74fcd7c20269b5c743459a7 9a301fbe6fada7dcb74fcd7c20269b5c743459a7 Edward Thomson 1355182062 -0600 checkout: moving from df_side2 to df_ancestor -9a301fbe6fada7dcb74fcd7c20269b5c743459a7 2da538570bc1e5b2c3e855bf702f35248ad0735f Edward Thomson 1355182067 -0600 reset: moving to 2da538570bc1e5b2c3e855bf702f35248ad0735f -2da538570bc1e5b2c3e855bf702f35248ad0735f 2da538570bc1e5b2c3e855bf702f35248ad0735f Edward Thomson 1355182087 -0600 checkout: moving from df_ancestor to df_side2 -2da538570bc1e5b2c3e855bf702f35248ad0735f fc90237dc4891fa6c69827fc465632225e391618 Edward Thomson 1355182104 -0600 commit: df_side2 -fc90237dc4891fa6c69827fc465632225e391618 a7dbfcbfc1a60709cb80b5ca24539008456531d0 Edward Thomson 1355182111 -0600 checkout: moving from df_side2 to df_side1 -a7dbfcbfc1a60709cb80b5ca24539008456531d0 fc90237dc4891fa6c69827fc465632225e391618 Edward Thomson 1355182115 -0600 checkout: moving from df_side1 to df_side2 -fc90237dc4891fa6c69827fc465632225e391618 bd593285fc7fe4ca18ccdbabf027f5d689101452 Edward Thomson 1355182122 -0600 checkout: moving from df_side2 to master -bd593285fc7fe4ca18ccdbabf027f5d689101452 d6cf6c7741b3316826af1314042550c97ded1d50 Edward Thomson 1358997543 -0600 checkout: moving from master to unrelated -d6cf6c7741b3316826af1314042550c97ded1d50 55b4e4687e7a0d9ca367016ed930f385d4022e6f Edward Thomson 1358997664 -0600 commit: conflicting changes -55b4e4687e7a0d9ca367016ed930f385d4022e6f bd593285fc7fe4ca18ccdbabf027f5d689101452 Edward Thomson 1358997675 -0600 checkout: moving from unrelated to master -bd593285fc7fe4ca18ccdbabf027f5d689101452 88e185910a15cd13bdf44854ad037f4842b03b29 Edward Thomson 1365714471 -0500 checkout: moving from master to rename_conflict_ours -88e185910a15cd13bdf44854ad037f4842b03b29 bef6e37b3ee632ba74159168836f382fed21d77d Edward Thomson 1365714516 -0500 checkout: moving from rename_conflict_ours to bef6e37b3ee632ba74159168836f382fed21d77d -bef6e37b3ee632ba74159168836f382fed21d77d 01f149e1b8f84bd8896aaff6d6b22af88459ded0 Edward Thomson 1365714831 -0500 commit: rename ancestor -0000000000000000000000000000000000000000 2392a2dacc9efb562b8635d6579fb458751c7c5b Edward Thomson 1365714958 -0500 commit (initial): rename conflict ancestor -2392a2dacc9efb562b8635d6579fb458751c7c5b 88e185910a15cd13bdf44854ad037f4842b03b29 Edward Thomson 1365714980 -0500 checkout: moving from rename_conflict_ancestor to rename_conflict_ours -88e185910a15cd13bdf44854ad037f4842b03b29 7c2c5228c9e90170d4a35e6558e47163daf092e5 Edward Thomson 1365715250 -0500 commit: rename conflict ours -7c2c5228c9e90170d4a35e6558e47163daf092e5 2f4024ce528d36d8670c289cce5a7963e625bb0c Edward Thomson 1365715274 -0500 checkout: moving from rename_conflict_ours to rename_conflict_theirs -2f4024ce528d36d8670c289cce5a7963e625bb0c 56a638b76b75e068590ac999c2f8621e7f3e264c Edward Thomson 1365715362 -0500 commit: rename conflict theirs -56a638b76b75e068590ac999c2f8621e7f3e264c 2392a2dacc9efb562b8635d6579fb458751c7c5b Edward Thomson 1365715368 -0500 checkout: moving from rename_conflict_theirs to rename_conflict_ancestor -2392a2dacc9efb562b8635d6579fb458751c7c5b 56a638b76b75e068590ac999c2f8621e7f3e264c Edward Thomson 1365715371 -0500 checkout: moving from rename_conflict_ancestor to rename_conflict_theirs -56a638b76b75e068590ac999c2f8621e7f3e264c 2392a2dacc9efb562b8635d6579fb458751c7c5b Edward Thomson 1365715404 -0500 checkout: moving from rename_conflict_theirs to rename_conflict_ancestor -2392a2dacc9efb562b8635d6579fb458751c7c5b 2392a2dacc9efb562b8635d6579fb458751c7c5b Edward Thomson 1365715438 -0500 checkout: moving from rename_conflict_ancestor to rename_conflict_ours -2392a2dacc9efb562b8635d6579fb458751c7c5b 2392a2dacc9efb562b8635d6579fb458751c7c5b Edward Thomson 1365715480 -0500 checkout: moving from rename_conflict_ours to rename_conflict_ancestor -2392a2dacc9efb562b8635d6579fb458751c7c5b 2392a2dacc9efb562b8635d6579fb458751c7c5b Edward Thomson 1365715486 -0500 checkout: moving from rename_conflict_ancestor to rename_conflict_ours -2392a2dacc9efb562b8635d6579fb458751c7c5b f3293571dcd708b6a3faf03818cd2844d000e198 Edward Thomson 1365715538 -0500 commit: rename conflict ours -f3293571dcd708b6a3faf03818cd2844d000e198 2392a2dacc9efb562b8635d6579fb458751c7c5b Edward Thomson 1365715546 -0500 checkout: moving from rename_conflict_ours to rename_conflict_ancestor -2392a2dacc9efb562b8635d6579fb458751c7c5b 2392a2dacc9efb562b8635d6579fb458751c7c5b Edward Thomson 1365715550 -0500 checkout: moving from rename_conflict_ancestor to rename_conflict_thiers -2392a2dacc9efb562b8635d6579fb458751c7c5b 2392a2dacc9efb562b8635d6579fb458751c7c5b Edward Thomson 1365715554 -0500 checkout: moving from rename_conflict_thiers to rename_conflict_ancestor -2392a2dacc9efb562b8635d6579fb458751c7c5b 2392a2dacc9efb562b8635d6579fb458751c7c5b Edward Thomson 1365715557 -0500 checkout: moving from rename_conflict_ancestor to rename_conflict_theirs -2392a2dacc9efb562b8635d6579fb458751c7c5b a802e06f1782a9645b9851bc7202cee74a8a4972 Edward Thomson 1365715572 -0500 commit: rename conflict theirs -a802e06f1782a9645b9851bc7202cee74a8a4972 bd593285fc7fe4ca18ccdbabf027f5d689101452 Edward Thomson 1365715620 -0500 checkout: moving from rename_conflict_theirs to master diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/branch b/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/branch deleted file mode 100644 index 8b0acb702..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/branch +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson 1351563886 -0500 branch: Created from HEAD -c607fc30883e335def28cd686b51f6cfa02b06ec 7cb63eed597130ba4abb87b3e544b85021905520 Edward Thomson 1351563965 -0500 commit: branch diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/df_ancestor b/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/df_ancestor deleted file mode 100644 index df7695a66..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/df_ancestor +++ /dev/null @@ -1,5 +0,0 @@ -0000000000000000000000000000000000000000 bd593285fc7fe4ca18ccdbabf027f5d689101452 Edward Thomson 1355181639 -0600 branch: Created from HEAD -bd593285fc7fe4ca18ccdbabf027f5d689101452 2da538570bc1e5b2c3e855bf702f35248ad0735f Edward Thomson 1355181673 -0600 commit: df_ancestor -2da538570bc1e5b2c3e855bf702f35248ad0735f a7dbfcbfc1a60709cb80b5ca24539008456531d0 Edward Thomson 1355181715 -0600 commit: df_side1 -a7dbfcbfc1a60709cb80b5ca24539008456531d0 9a301fbe6fada7dcb74fcd7c20269b5c743459a7 Edward Thomson 1355181775 -0600 commit: df_side2 -9a301fbe6fada7dcb74fcd7c20269b5c743459a7 2da538570bc1e5b2c3e855bf702f35248ad0735f Edward Thomson 1355182067 -0600 reset: moving to 2da538570bc1e5b2c3e855bf702f35248ad0735f diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/df_side1 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/df_side1 deleted file mode 100644 index a504ad610..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/df_side1 +++ /dev/null @@ -1,14 +0,0 @@ -0000000000000000000000000000000000000000 bd593285fc7fe4ca18ccdbabf027f5d689101452 Edward Thomson 1354574697 -0600 branch: Created from HEAD -bd593285fc7fe4ca18ccdbabf027f5d689101452 d4207f77243500bec335ab477f9227fcdb1e271a Edward Thomson 1354574962 -0600 commit: df_ancestor -d4207f77243500bec335ab477f9227fcdb1e271a c94b27e41064c521120627e07e2035cca1d24ffa Edward Thomson 1354575027 -0600 commit: df_side1 -c94b27e41064c521120627e07e2035cca1d24ffa a90bc3fb6f15181972a2959a921429efbd81a473 Edward Thomson 1355017650 -0600 commit: df_added -a90bc3fb6f15181972a2959a921429efbd81a473 005b6fcc8fec71d2550bef8462d169b3c26aa14b Edward Thomson 1355017676 -0600 rebase -i (finish): refs/heads/df_side1 onto c94b27e -005b6fcc8fec71d2550bef8462d169b3c26aa14b f8958bdf4d365a84a9a178b1f5f35ff1dacbd884 Edward Thomson 1355017715 -0600 reset: moving to df_side2 -f8958bdf4d365a84a9a178b1f5f35ff1dacbd884 8c749d9968d4b10dcfb06c9f97d0e5d92d337071 Edward Thomson 1355017744 -0600 commit: df_added -8c749d9968d4b10dcfb06c9f97d0e5d92d337071 0204a84f822acbf6386b36d33f1f6bc68bbbf858 Edward Thomson 1355017756 -0600 rebase -i (finish): refs/heads/df_side1 onto f8958bd -0204a84f822acbf6386b36d33f1f6bc68bbbf858 005b6fcc8fec71d2550bef8462d169b3c26aa14b Edward Thomson 1355017793 -0600 reset: moving to 005b6fcc8fec71d2550bef8462d169b3c26aa14b -005b6fcc8fec71d2550bef8462d169b3c26aa14b 0204a84f822acbf6386b36d33f1f6bc68bbbf858 Edward Thomson 1355017826 -0600 reset: moving to 0204a84 -005b6fcc8fec71d2550bef8462d169b3c26aa14b e8107f24196736b870a318a0e28f048e29f6feff Edward Thomson 1355169065 -0600 commit: df_side1 -e8107f24196736b870a318a0e28f048e29f6feff 80a8fbb3abb1ba423d554e9630b8fc2e5698f86b Edward Thomson 1355169084 -0600 rebase -i (finish): refs/heads/df_side1 onto 005b6fc -80a8fbb3abb1ba423d554e9630b8fc2e5698f86b e65a9bb2af9f4c2d1c375dd0f8f8a46cf9c68812 Edward Thomson 1355169419 -0600 commit: side1 -e65a9bb2af9f4c2d1c375dd0f8f8a46cf9c68812 5dc1018e90b19654bee986b7a0c268804d39659d Edward Thomson 1355169435 -0600 rebase -i (finish): refs/heads/df_side1 onto 80a8fbb diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/df_side2 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/df_side2 deleted file mode 100644 index 27d833eda..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/df_side2 +++ /dev/null @@ -1,9 +0,0 @@ -0000000000000000000000000000000000000000 d4207f77243500bec335ab477f9227fcdb1e271a Edward Thomson 1354575051 -0600 branch: Created from d4207f77243500bec335ab477f9227fcdb1e271a -d4207f77243500bec335ab477f9227fcdb1e271a f8958bdf4d365a84a9a178b1f5f35ff1dacbd884 Edward Thomson 1354575206 -0600 commit: df_side2 -0204a84f822acbf6386b36d33f1f6bc68bbbf858 944f5dd1a867cab4c2bbcb896493435cae1dcc1a Edward Thomson 1355169174 -0600 commit: both -944f5dd1a867cab4c2bbcb896493435cae1dcc1a 57079a46233ae2b6df62e9ade71c4948512abefb Edward Thomson 1355169185 -0600 rebase -i (finish): refs/heads/df_side2 onto 0204a84 -57079a46233ae2b6df62e9ade71c4948512abefb 58e853f66699fd02629fd50bde08082bc005933a Edward Thomson 1355169460 -0600 commit: side2 -58e853f66699fd02629fd50bde08082bc005933a fada9356aa3f74622327a3038ae9c6f92e1c5c1d Edward Thomson 1355169471 -0600 rebase -i (finish): refs/heads/df_side2 onto 57079a4 -fada9356aa3f74622327a3038ae9c6f92e1c5c1d 95646149ab6b6ba6edc83cff678582538b457b2b Edward Thomson 1355169897 -0600 rebase finished: refs/heads/df_side2 onto a765fb87eb2f7a1920b73b2d5a057f8f8476a42b -0000000000000000000000000000000000000000 2da538570bc1e5b2c3e855bf702f35248ad0735f Edward Thomson 1355182087 -0600 branch: Created from HEAD -2da538570bc1e5b2c3e855bf702f35248ad0735f fc90237dc4891fa6c69827fc465632225e391618 Edward Thomson 1355182104 -0600 commit: df_side2 diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/ff_branch b/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/ff_branch deleted file mode 100644 index c4706175d..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/ff_branch +++ /dev/null @@ -1,5 +0,0 @@ -0000000000000000000000000000000000000000 977c696519c5a3004c5f1d15d60c89dbeb8f235f Edward Thomson 1351605785 -0500 branch: Created from HEAD -977c696519c5a3004c5f1d15d60c89dbeb8f235f 33d500f588fbbe65901d82b4e6b008e549064be0 Edward Thomson 1351605830 -0500 commit: fastforward -33d500f588fbbe65901d82b4e6b008e549064be0 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson 1351990202 -0500 reset: moving to c607fc30883e335def28cd686b51f6cfa02b06ec -c607fc30883e335def28cd686b51f6cfa02b06ec bd593285fc7fe4ca18ccdbabf027f5d689101452 Edward Thomson 1351990205 -0500 merge master: Fast-forward -bd593285fc7fe4ca18ccdbabf027f5d689101452 fd89f8cffb663ac89095a0f9764902e93ceaca6a Edward Thomson 1351990229 -0500 commit: fastforward diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/master b/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/master deleted file mode 100644 index 60475992a..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/master +++ /dev/null @@ -1,5 +0,0 @@ -0000000000000000000000000000000000000000 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson 1351563869 -0500 commit (initial): initial -c607fc30883e335def28cd686b51f6cfa02b06ec 977c696519c5a3004c5f1d15d60c89dbeb8f235f Edward Thomson 1351564033 -0500 commit: master -977c696519c5a3004c5f1d15d60c89dbeb8f235f 4e0d9401aee78eb345a8685a859d37c8c3c0bbed Edward Thomson 1351875091 -0500 merge octo1 octo2 octo3 octo4: Merge made by the 'octopus' strategy. -4e0d9401aee78eb345a8685a859d37c8c3c0bbed 54269b3f6ec3d7d4ede24dd350dd5d605495c3ae Edward Thomson 1351875108 -0500 reset: moving to 54269b3f6ec3d7d4ede24dd350dd5d605495c3ae -54269b3f6ec3d7d4ede24dd350dd5d605495c3ae 977c696519c5a3004c5f1d15d60c89dbeb8f235f Edward Thomson 1351875584 -0500 reset: moving to 977c696519c5a3004c5f1d15d60c89dbeb8f235f diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/octo1 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/octo1 deleted file mode 100644 index 0b6c9214a..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/octo1 +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 977c696519c5a3004c5f1d15d60c89dbeb8f235f Edward Thomson 1351874933 -0500 branch: Created from HEAD -977c696519c5a3004c5f1d15d60c89dbeb8f235f 16f825815cfd20a07a75c71554e82d8eede0b061 Edward Thomson 1351874954 -0500 commit: octo1 diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/octo2 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/octo2 deleted file mode 100644 index 5392a4f86..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/octo2 +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 977c696519c5a3004c5f1d15d60c89dbeb8f235f Edward Thomson 1351874960 -0500 branch: Created from HEAD -977c696519c5a3004c5f1d15d60c89dbeb8f235f 158dc7bedb202f5b26502bf3574faa7f4238d56c Edward Thomson 1351874974 -0500 commit: octo2 diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/octo3 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/octo3 deleted file mode 100644 index 7db5617c8..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/octo3 +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 977c696519c5a3004c5f1d15d60c89dbeb8f235f Edward Thomson 1351874980 -0500 branch: Created from HEAD -977c696519c5a3004c5f1d15d60c89dbeb8f235f 50ce7d7d01217679e26c55939eef119e0c93e272 Edward Thomson 1351874998 -0500 commit: octo3 diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/octo4 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/octo4 deleted file mode 100644 index b0f9e42ef..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/octo4 +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 977c696519c5a3004c5f1d15d60c89dbeb8f235f Edward Thomson 1351875010 -0500 branch: Created from HEAD -977c696519c5a3004c5f1d15d60c89dbeb8f235f 54269b3f6ec3d7d4ede24dd350dd5d605495c3ae Edward Thomson 1351875023 -0500 commit: octo4 diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/octo5 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/octo5 deleted file mode 100644 index 614563edf..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/octo5 +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 977c696519c5a3004c5f1d15d60c89dbeb8f235f Edward Thomson 1351875031 -0500 branch: Created from HEAD -977c696519c5a3004c5f1d15d60c89dbeb8f235f e4f618a2c3ed0669308735727df5ebf2447f022f Edward Thomson 1351875041 -0500 commit: octo5 diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/octo6 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/octo6 deleted file mode 100644 index 4c812eacc..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/octo6 +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 977c696519c5a3004c5f1d15d60c89dbeb8f235f Edward Thomson 1351875046 -0500 branch: Created from HEAD -977c696519c5a3004c5f1d15d60c89dbeb8f235f 4ca408a8c88655f7586a1b580be6fad138121e98 Edward Thomson 1351875057 -0500 commit: octo5 -4ca408a8c88655f7586a1b580be6fad138121e98 b6f610aef53bd343e6c96227de874c66f00ee8e8 Edward Thomson 1351875065 -0500 commit (amend): octo6 diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/renames1 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/renames1 deleted file mode 100644 index 58a7e0565..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/renames1 +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson 1353177745 -0600 branch: Created from c607fc30883e335def28cd686b51f6cfa02b06ec -c607fc30883e335def28cd686b51f6cfa02b06ec 412b32fb66137366147f1801ecc962452757d48a Edward Thomson 1353177886 -0600 commit: renames diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/renames2 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/renames2 deleted file mode 100644 index 5645ecee7..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/renames2 +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 bd593285fc7fe4ca18ccdbabf027f5d689101452 Edward Thomson 1353794647 -0600 branch: Created from HEAD -bd593285fc7fe4ca18ccdbabf027f5d689101452 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson 1353794677 -0600 reset: moving to c607fc30883e335def28cd686b51f6cfa02b06ec -c607fc30883e335def28cd686b51f6cfa02b06ec ab40af3cb8a3ed2e2843e96d9aa7871336b94573 Edward Thomson 1353794852 -0600 commit: renames2 diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-10 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-10 deleted file mode 100644 index b6bd247e7..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-10 +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson 1352100171 -0600 branch: Created from c607fc30883e335def28cd686b51f6cfa02b06ec -c607fc30883e335def28cd686b51f6cfa02b06ec 53825f41ac8d640612f9423a2f03a69f3d96809a Edward Thomson 1352100193 -0600 commit: trivial-10 -53825f41ac8d640612f9423a2f03a69f3d96809a 0ec5f433959cd46177f745903353efb5be08d151 Edward Thomson 1352100223 -0600 commit: trivial-10 diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-10-branch b/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-10-branch deleted file mode 100644 index 14ce9e545..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-10-branch +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 53825f41ac8d640612f9423a2f03a69f3d96809a Edward Thomson 1352100200 -0600 branch: Created from HEAD -53825f41ac8d640612f9423a2f03a69f3d96809a 11f4f3c08b737f5fd896cbefa1425ee63b21b2fa Edward Thomson 1352100211 -0600 commit: trivial-10-branch diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-11 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-11 deleted file mode 100644 index 3e6b77437..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-11 +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson 1352100930 -0600 branch: Created from c607fc30883e335def28cd686b51f6cfa02b06ec -c607fc30883e335def28cd686b51f6cfa02b06ec 35632e43612c06a3ea924bfbacd48333da874c29 Edward Thomson 1352100958 -0600 commit: trivial-11 -35632e43612c06a3ea924bfbacd48333da874c29 3168dca1a561889b045a6441909f4c56145e666d Edward Thomson 1352100992 -0600 commit: trivial-11 diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-11-branch b/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-11-branch deleted file mode 100644 index 30d5ec7a3..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-11-branch +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 35632e43612c06a3ea924bfbacd48333da874c29 Edward Thomson 1352100964 -0600 branch: Created from HEAD -35632e43612c06a3ea924bfbacd48333da874c29 6718a45909532d1fcf5600d0877f7fe7e78f0b86 Edward Thomson 1352100978 -0600 commit: trivial-11-branch diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-13 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-13 deleted file mode 100644 index 3a7302dea..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-13 +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson 1352100559 -0600 branch: Created from c607fc30883e335def28cd686b51f6cfa02b06ec -c607fc30883e335def28cd686b51f6cfa02b06ec 8f4433f8593ddd65b7dd43dd4564d841f4d9c8aa Edward Thomson 1352100589 -0600 commit: trivial-13 -8f4433f8593ddd65b7dd43dd4564d841f4d9c8aa a3fabece9eb8748da810e1e08266fef9b7136ad4 Edward Thomson 1352100625 -0600 commit: trivial-13 diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-13-branch b/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-13-branch deleted file mode 100644 index bb2604244..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-13-branch +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 8f4433f8593ddd65b7dd43dd4564d841f4d9c8aa Edward Thomson 1352100604 -0600 branch: Created from HEAD -8f4433f8593ddd65b7dd43dd4564d841f4d9c8aa 05f3c1a2a56ca95c3d2ef28dc9ddf32b5cd6c91c Edward Thomson 1352100610 -0600 commit: trivial-13-branch diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-14 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-14 deleted file mode 100644 index 4b70d2898..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-14 +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson 1352101083 -0600 branch: Created from c607fc30883e335def28cd686b51f6cfa02b06ec -c607fc30883e335def28cd686b51f6cfa02b06ec 596803b523203a4851c824c07366906f8353f4ad Edward Thomson 1352101113 -0600 commit: trivial-14 -596803b523203a4851c824c07366906f8353f4ad 7e2d058d5fedf8329db44db4fac610d6b1a89159 Edward Thomson 1352101141 -0600 commit: trivial-14 diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-14-branch b/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-14-branch deleted file mode 100644 index 8e491ca68..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-14-branch +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 596803b523203a4851c824c07366906f8353f4ad Edward Thomson 1352101117 -0600 branch: Created from HEAD -596803b523203a4851c824c07366906f8353f4ad 8187117062b750eed4f93fd7e899f17b52ce554d Edward Thomson 1352101132 -0600 commit: trivial-14-branch diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-2alt b/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-2alt deleted file mode 100644 index a2a28d401..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-2alt +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson 1352091695 -0600 branch: Created from c607fc30883e335def28cd686b51f6cfa02b06ec -c607fc30883e335def28cd686b51f6cfa02b06ec 566ab53c220a2eafc1212af1a024513230280ab9 Edward Thomson 1352092452 -0600 commit: 2alt diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-2alt-branch b/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-2alt-branch deleted file mode 100644 index a0a48ae35..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-2alt-branch +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson 1352092411 -0600 branch: Created from HEAD -c607fc30883e335def28cd686b51f6cfa02b06ec c9174cef549ec94ecbc43ef03cdc775b4950becb Edward Thomson 1352092434 -0600 commit: 2alt-branch diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-3alt b/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-3alt deleted file mode 100644 index 4374d3888..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-3alt +++ /dev/null @@ -1,3 +0,0 @@ -566ab53c220a2eafc1212af1a024513230280ab9 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson 1352094547 -0600 reset: moving to c607fc30883e335def28cd686b51f6cfa02b06ec -c607fc30883e335def28cd686b51f6cfa02b06ec 5459c89aa0026d543ce8343bd89871bce543f9c2 Edward Thomson 1352094580 -0600 commit: 3alt -5459c89aa0026d543ce8343bd89871bce543f9c2 4c9fac0707f8d4195037ae5a681aa48626491541 Edward Thomson 1352094610 -0600 commit: 3alt-branch diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-3alt-branch b/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-3alt-branch deleted file mode 100644 index 7a2e6f822..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-3alt-branch +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson 1352094594 -0600 branch: Created from c607fc30883e335def28cd686b51f6cfa02b06ec diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-4 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-4 deleted file mode 100644 index 3ee6d2503..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-4 +++ /dev/null @@ -1,2 +0,0 @@ -566ab53c220a2eafc1212af1a024513230280ab9 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson 1352094764 -0600 reset: moving to c607fc30883e335def28cd686b51f6cfa02b06ec -c607fc30883e335def28cd686b51f6cfa02b06ec cc3e3009134cb88014129fc8858d1101359e5e2f Edward Thomson 1352094815 -0600 commit: trivial-4 diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-4-branch b/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-4-branch deleted file mode 100644 index 51f8a9290..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-4-branch +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson 1352094830 -0600 branch: Created from c607fc30883e335def28cd686b51f6cfa02b06ec -c607fc30883e335def28cd686b51f6cfa02b06ec 183310e30fb1499af8c619108ffea4d300b5e778 Edward Thomson 1352094856 -0600 commit: trivial-4-branch diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-5alt-1 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-5alt-1 deleted file mode 100644 index 14497029a..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-5alt-1 +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson 1352096606 -0600 branch: Created from c607fc30883e335def28cd686b51f6cfa02b06ec -c607fc30883e335def28cd686b51f6cfa02b06ec 4fe93c0ec83eb6305cbace3dace88ecee1b63cb6 Edward Thomson 1352096643 -0600 commit: 5alt-1 diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-5alt-1-branch b/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-5alt-1-branch deleted file mode 100644 index 4cff83526..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-5alt-1-branch +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson 1352096657 -0600 branch: Created from c607fc30883e335def28cd686b51f6cfa02b06ec -c607fc30883e335def28cd686b51f6cfa02b06ec 478172cb2f5ff9b514bc9d04d3bd5ef5840cb3b2 Edward Thomson 1352096689 -0600 commit: 5alt-1-branch diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-5alt-2 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-5alt-2 deleted file mode 100644 index 3ca077b29..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-5alt-2 +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson 1352096711 -0600 branch: Created from c607fc30883e335def28cd686b51f6cfa02b06ec -c607fc30883e335def28cd686b51f6cfa02b06ec ebc09d0137cfb0c26697aed0109fb943ad906f3f Edward Thomson 1352096764 -0600 commit: existing file -ebc09d0137cfb0c26697aed0109fb943ad906f3f 3b47b031b3e55ae11e14a05260b1c3ffd6838d55 Edward Thomson 1352096815 -0600 commit: 5alt-2 diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-5alt-2-branch b/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-5alt-2-branch deleted file mode 100644 index e7bb901f2..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-5alt-2-branch +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 ebc09d0137cfb0c26697aed0109fb943ad906f3f Edward Thomson 1352096833 -0600 branch: Created from ebc09d0 -ebc09d0137cfb0c26697aed0109fb943ad906f3f f48097eb340dc5a7cae55aabcf1faf4548aa821f Edward Thomson 1352096855 -0600 commit: 5alt-2-branch diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-6 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-6 deleted file mode 100644 index 7c717a210..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-6 +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson 1352097371 -0600 branch: Created from c607fc30883e335def28cd686b51f6cfa02b06ec -c607fc30883e335def28cd686b51f6cfa02b06ec f7c332bd4d4d4b777366cae4d24d1687477576bf Edward Thomson 1352097389 -0600 commit: 6 -f7c332bd4d4d4b777366cae4d24d1687477576bf 99b4f7e4f24470fa06b980bc21f1095c2a9425c0 Edward Thomson 1352097404 -0600 commit: trivial-6 diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-6-branch b/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-6-branch deleted file mode 100644 index 715f3ae1c..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-6-branch +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 f7c332bd4d4d4b777366cae4d24d1687477576bf Edward Thomson 1352097414 -0600 branch: Created from f7c332bd4d4d4b777366cae4d24d1687477576bf -f7c332bd4d4d4b777366cae4d24d1687477576bf a43150a738849c59376cf30bb2a68348a83c8f48 Edward Thomson 1352097431 -0600 commit: 6-branch diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-7 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-7 deleted file mode 100644 index a014f1722..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-7 +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson 1352099765 -0600 branch: Created from c607fc30883e335def28cd686b51f6cfa02b06ec -c607fc30883e335def28cd686b51f6cfa02b06ec 092ce8682d7f3a2a3a769a6daca58950168ba5c4 Edward Thomson 1352099790 -0600 commit: trivial-7 -092ce8682d7f3a2a3a769a6daca58950168ba5c4 d874671ef5b20184836cb983bb273e5280384d0b Edward Thomson 1352099947 -0600 commit: trivial-7 diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-7-branch b/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-7-branch deleted file mode 100644 index 22331d78c..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-7-branch +++ /dev/null @@ -1,5 +0,0 @@ -0000000000000000000000000000000000000000 092ce8682d7f3a2a3a769a6daca58950168ba5c4 Edward Thomson 1352099799 -0600 branch: Created from HEAD -092ce8682d7f3a2a3a769a6daca58950168ba5c4 73cbfdc4fe843169e5b2af8dcad03cbf3acf306c Edward Thomson 1352099812 -0600 commit: trivial-7-branch -73cbfdc4fe843169e5b2af8dcad03cbf3acf306c 092ce8682d7f3a2a3a769a6daca58950168ba5c4 Edward Thomson 1352099874 -0600 reset: moving to 092ce8682d7f3a2a3a769a6daca58950168ba5c4 -092ce8682d7f3a2a3a769a6daca58950168ba5c4 009b9cab6fdac02915a88ecd078b7a792ed802d8 Edward Thomson 1352099921 -0600 commit: removed in 7 -009b9cab6fdac02915a88ecd078b7a792ed802d8 5195a1b480f66691b667f10a9e41e70115a78351 Edward Thomson 1352099927 -0600 commit (amend): trivial-7-branch diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-8 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-8 deleted file mode 100644 index 7670c3506..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-8 +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson 1352098816 -0600 branch: Created from c607fc30883e335def28cd686b51f6cfa02b06ec -c607fc30883e335def28cd686b51f6cfa02b06ec 75a811bf6bc57694adb3fe604786f3a4efd1cd1b Edward Thomson 1352098884 -0600 commit: trivial-8 -75a811bf6bc57694adb3fe604786f3a4efd1cd1b 3575826c96a975031d2c14368529cc5c4353a8fd Edward Thomson 1352099000 -0600 commit: trivial-8 diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-8-branch b/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-8-branch deleted file mode 100644 index c4d68edcf..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-8-branch +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 75a811bf6bc57694adb3fe604786f3a4efd1cd1b Edward Thomson 1352098947 -0600 branch: Created from HEAD -75a811bf6bc57694adb3fe604786f3a4efd1cd1b 52d8bc572af2b6d4ee0d5e62ed5d1fbad92210a9 Edward Thomson 1352098979 -0600 commit: trivial-8-branch diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-9 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-9 deleted file mode 100644 index 09a343bdb..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-9 +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson 1352100268 -0600 branch: Created from c607fc30883e335def28cd686b51f6cfa02b06ec -c607fc30883e335def28cd686b51f6cfa02b06ec f0053b8060bb3f0be5cbcc3147a07ece26bf097e Edward Thomson 1352100304 -0600 commit: trivial-9 -f0053b8060bb3f0be5cbcc3147a07ece26bf097e c35dee9bcc0e989f3b0c40f68372a9a51b6c4e6a Edward Thomson 1352100333 -0600 commit: trivial-9 diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-9-branch b/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-9-branch deleted file mode 100644 index 1b126fb7b..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/trivial-9-branch +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 f0053b8060bb3f0be5cbcc3147a07ece26bf097e Edward Thomson 1352100310 -0600 branch: Created from HEAD -f0053b8060bb3f0be5cbcc3147a07ece26bf097e 13d1be4ea52a6ced1d7a1d832f0ee3c399348e5e Edward Thomson 1352100317 -0600 commit: trivial-9-branch diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/unrelated b/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/unrelated deleted file mode 100644 index a83ffc26a..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/logs/refs/heads/unrelated +++ /dev/null @@ -1 +0,0 @@ -d6cf6c7741b3316826af1314042550c97ded1d50 55b4e4687e7a0d9ca367016ed930f385d4022e6f Edward Thomson 1358997664 -0600 commit: conflicting changes diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/modules/submodule/HEAD b/vendor/libgit2/tests/resources/merge-resolve/.gitted/modules/submodule/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/modules/submodule/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/modules/submodule/ORIG_HEAD b/vendor/libgit2/tests/resources/merge-resolve/.gitted/modules/submodule/ORIG_HEAD deleted file mode 100644 index d1bfcf0f4..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/modules/submodule/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -ae39c77c70cb6bad18bb471912460c4e1ba0f586 diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/modules/submodule/config b/vendor/libgit2/tests/resources/merge-resolve/.gitted/modules/submodule/config deleted file mode 100644 index 575cc8599..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/modules/submodule/config +++ /dev/null @@ -1,15 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = false - bare = false - logallrefupdates = true - worktree = ../../../submodule - symlinks = false - ignorecase = true - hideDotFiles = dotGitOnly -[remote "origin"] - url = c:/Temp/TestRepos/submodule - fetch = +refs/heads/*:refs/remotes/origin/* -[branch "master"] - remote = origin - merge = refs/heads/master diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/modules/submodule/index b/vendor/libgit2/tests/resources/merge-resolve/.gitted/modules/submodule/index deleted file mode 100644 index e948afb27f73293d4323c643da10838a3efc83bf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 153 zcmZ?q402{*U|<4b#-O`A3xG63&|O|@5RCwhOAu@ZjYI6I-yZpO?@nIkap9tD%dKQ_ z#t96<#idEP`6;D2sk&*IIjM$vB^4!5O(8+9u0WefrL8O|CP__jfonrR@v`0KF(KYybcN diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/modules/submodule/info/exclude b/vendor/libgit2/tests/resources/merge-resolve/.gitted/modules/submodule/info/exclude deleted file mode 100644 index a5196d1be..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/modules/submodule/info/exclude +++ /dev/null @@ -1,6 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/modules/submodule/objects/18/fae1354bba0a5f1e6a531f9988369142c24a9e b/vendor/libgit2/tests/resources/merge-resolve/.gitted/modules/submodule/objects/18/fae1354bba0a5f1e6a531f9988369142c24a9e deleted file mode 100644 index fcf1c6381035007b5d04f842991b054cba0eb83b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 54 zcmbG9a%9D~+ KF%0z+_-g=4j1?pR diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/modules/submodule/objects/29/7aa6cd028b3336c7802c7a6f49143da4e1602d b/vendor/libgit2/tests/resources/merge-resolve/.gitted/modules/submodule/objects/29/7aa6cd028b3336c7802c7a6f49143da4e1602d deleted file mode 100644 index aa9fc50069e2fd15b708772e9e582b3f889ac548..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 161 zcmV;S0ABxi0i}-14Z<)G1v$HlZ2;s?;&>&5xX=L&tk-KL2gk@UqJ2ya+@3~yqv2Z0 z*1P-YF884a^A0{E3V-9FBXtE-cu@)T(F37B2)MW3FTngIL6eXh%0gYL5S|k!{ zaU5r1Gmn>5^zLhI@JJtO37%^$N8RBngZ|dNY~1QmbH8vcH!u#hHNja2XC1UwgO1QH Pe<)O;V+hn2;s{H@yd_0K diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/modules/submodule/objects/38/6c80dc813b89d719797668f40c1be0a6efa996 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/modules/submodule/objects/38/6c80dc813b89d719797668f40c1be0a6efa996 deleted file mode 100644 index bc9a32ebc1e915a4dfe63bb48229764bd5175666..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32 ocmb4XD~D{Ff%bxC@xLP%}*)KN!3lu%t4XD~D{Ff%bxC@xLP%}*)KN!3lu%tô­|h}_{{õMŸe·?º¶þêuž¸·‹6˜Àšˆô"€Úí>:å„ʃ6^Õ¤±Kd \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/modules/submodule/objects/c2/0765f6e24e8bbb63a648d0d11d84da63170190 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/modules/submodule/objects/c2/0765f6e24e8bbb63a648d0d11d84da63170190 deleted file mode 100644 index 14781032fdaca8f6c9c30d2daf400862216c55cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 52 zcmV-40L%Y)0ZYosPf{?pU4XD~D{Ff%bxC@xLP%}*)KN!3lu%t=@j`Xe(xjfb>Gl~x~dQMW-^iD7U diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/00/9b9cab6fdac02915a88ecd078b7a792ed802d8 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/00/9b9cab6fdac02915a88ecd078b7a792ed802d8 deleted file mode 100644 index f663a3c5146f02f7aeabdee6732abab596d9cbee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 164 zcmV;V09*ff0i}-14Z<)GL^->PZ2)9D{;h-%7doJU&3dEc;20SL?Gq3kaGQCf84cG` zmJZg%U2h^FCK8KrXoE|PnSIn|r0m&6nlPI&Xm*0?MorcZ8ZAo-$>ul>WNDxnkU}OV zpU`U)(nwob(WB3`!6m<_Ww_3@-0KQQ+2}`|Y S8P%lJr({@Gi0Tb@V^GR)1x=s; diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/00/c7d33f1ffa79d19c2272b370fcaeaadba49c08 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/00/c7d33f1ffa79d19c2272b370fcaeaadba49c08 deleted file mode 100644 index 72698dc3df0cac29445308ad42e04b1954cab618..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 147 zcmV;E0Brww0V^p=O;s>7wqP(Z00M=i{E`gal+2=H22-BA&5V419IUe6W+)pa2aCLX z8)0Z*U}j>XkdhXkn39s3!k{i}yPRp4O~QID#+Ny&q5mCRuT6rf$t+@M-!dsF;d+&I zt6brmb8OACuLW!}gjkc7nUktlQc=Q?zi;FeH-sWH BMcn`Z diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/01/f149e1b8f84bd8896aaff6d6b22af88459ded0 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/01/f149e1b8f84bd8896aaff6d6b22af88459ded0 deleted file mode 100644 index aa6336d3fac865556fb2c7e9f84e69a304fb13b0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 166 zcmV;X09pTd0i}*f4gw(%06p`H{(uIWr6DoKi$CxKEKOz(42Hq@eaAO=tJI-Vxwp1X zK!c|_n4xAWl)SW+Vle0}nQE$+n2@!}1!YX3gdkpV@HQcFb*w3AW~VVlGRg+!yw|R3 zkCh9mLR3V2&!rD|lusN5o=b0g-{8uJ{n5RxdGx*4dC9%qKxt=58Lt(brIk_~_86V~ UM?xIOu`$Fg^FI3!Uu`Z<;^BBtW&i*H diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/02/04a84f822acbf6386b36d33f1f6bc68bbbf858 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/02/04a84f822acbf6386b36d33f1f6bc68bbbf858 deleted file mode 100644 index 2f0a0e1bb139f469d893b97328c111886fdc93d1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 168 zcmV;Z09XHb0hNwH3IZ_@1U=^!`G7K+WOg90$m)T^39(E%!;`d#}4|waYhN4rQ z=UcZJ{H8Zmn_!SQDUCr=h$4WAh@5wrqhcH}MVE^MbC;$|w>cniVO|9UFlq9hWD3kB zB63N2a*FK4$g^K-v#0!$mhJgk=SN-aURU}_NBs`Jwo7$BSm!Aa6T)D(FaVg9u4lXc Wts!vC6n+|$%jI#)islV~F;1nsUQS^E diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/02/251f990ca8e92e7ae61d3426163fa821c64001 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/02/251f990ca8e92e7ae61d3426163fa821c64001 deleted file mode 100644 index d623117c5451f527ebff27812643d7856fbe5a0a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 264 zcmV+j0r&oR0V^p=O;s>9H()R{FfcPQQAjK;$5Ep%1PBLsVHGc5;`oqI?hAM z{rdDef8NUpvTr_GLlq}yB<7{3rs!to=_VB=<|Su>F;6I8oGd50*9~fRUTQg- zLz>xdT8Tz7FFi7~EW)1W;kW;tHGELTMX9;@Wf(5M|M-*kD*60#A?_1o4BB=*&bXI- z7gGb0%VVrFmdhXc6>Fw{xjimexF#!V`%9H)b$2FfcPQQAjK;$5Ep%1PBLsVHGc5;`oqI?hAM z{rdDef8NUpvTr_GLlq}yB<7{3rs!to=_VB=<|Su>F;6I8oGd50*9~fRZhlH; zS|-#r`6Upy{0m|K6R_0k%@$dyym`yF2|aCG-wst@l$x7ghT-`8k3VUzlFvUE;yyvf zpl#RVjC4GGj0_FfcPQQAkWlNlnqs%+t+HEG|hc(krPbVNkZ=lsq}( ztss|o{^xvCt2f<+Chaigr6u{fsYU6jiAg!BV8!q37w$N~^}qgsLh9eG94WhbC+nPt zDo)BT$o((3Q3>52inSC)Oh*VHo652`3RBQY->;)JB4#JuDTu&Jwa zTo%1>nY7m1ad-Bbc2m2#Ol!I^H6XcJ@ZM^MO_!H_UCeITv4)jLw>mBK5llmVURq9O za!F=hI@oN#j=Tg_%~LB^3tpFROZL9F?ZG_(69XVn0J@do>N06=&q+%@oLbTTi({*b z;dAxf`A~z>GNFEMZ z`ve(-wq1`i?q%PFYA6MI85{y&x1IQquV=k!nqx_N-NX;8UtM@&GcOhZ40*2>4RNg| diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/03/dad1005e5d06d418f50b12e0bcd48ff2306a03 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/03/dad1005e5d06d418f50b12e0bcd48ff2306a03 deleted file mode 100644 index 04011a2ceb576207e2311a43982bbd4414831946..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 264 zcmV+j0r&oR0V^p=O;s>9vt%$dFfcPQQAjK;$5Ep%1PBLsVHGc5;`oqI?hAM z{rdDef8NUpvTr_GLlq}yB<7{3rs!to=_VB=<|Su>F;6I8oGd50*9~fRQEF~} z8N@LbV6{`{K8p)$DiPwpKhNst_iE7qAw^G2wMY)X|M-*kD*60#A?_1o4BB=*&bXI- z7gGb0!(*&7mdhXc6>Fw{xjimexF#!V`%z>-JwUU=aE diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/05/1ffd7901a442faf56b226161649074f15c7c47 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/05/1ffd7901a442faf56b226161649074f15c7c47 deleted file mode 100644 index 65fa6894f..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/05/1ffd7901a442faf56b226161649074f15c7c47 +++ /dev/null @@ -1 +0,0 @@ -x+)JMU06·`040031QH,-ÉÏM-JOMLÊIÕ+©(aH:,»:ÎCÉýúô:ÞË ²o>ZC'g$楧¦èfæé&%æ%g€5¬ÎqYôÂeÒZoÇÝÙkÚMíæ2­éÆÔ›X\’ZDPC~^ZNfrIf^:Xéõ›ZHÙŠž1O(_œ,'º× jvn~JfZ&Ä5†&ȚؽùÁ„ +gÆz¬Ÿ¥•4íú3Ž^¨¦¢ÔÜü2 ÜüI{•|þ¹÷ 2m»gÜ˾‹©É1ÖËåüŠ5Ó¿Ü,\“µ})TC)0XÀ¡vÿ‰ùzÖ›¦9–¤×Mü°úÕ…'6óbó#— \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/05/8541fc37114bfc1dddf6bd6bffc7fae5c2e6fe b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/05/8541fc37114bfc1dddf6bd6bffc7fae5c2e6fe deleted file mode 100644 index d79dc30ba7155121f8e844b28d20c391df897375..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 63 zcmV-F0Korv0ZYosPf{>4F=r^r$ShV!%gjkt0Md!2CHc9jMd_)DNja%p!$&GPBQY;M VHANvaPa&x&F)ulT3jm+qT_Q;S7;yjq diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/05/f3c1a2a56ca95c3d2ef28dc9ddf32b5cd6c91c b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/05/f3c1a2a56ca95c3d2ef28dc9ddf32b5cd6c91c deleted file mode 100644 index 7b4b152f34b81cc4b40ed01324ac1946c396b058..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 170 zcmV;b09F5Z0i}*nYQr!PMDwjv=mHK}X;)UDg#P3PxxiYx!iLx?irQX3PRI@N_vQ@@ zlk2)J-Fote-c&6M6ETtik{=}pDR~4`h8#(}g2pmw8qE(k-MUQ$F@%!n6htJ_G>YJk zND(C=6qHj=%!YsaT${bfKR2=0xvuxR*)QGglfLy;ywfq)^=u)K2j?OxVO@x8-l)+W=vh8gF?v4}39G9kOy#6aWAK diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/07/a759da919f737221791d542f176ab49c88837f b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/07/a759da919f737221791d542f176ab49c88837f deleted file mode 100644 index a34b6c23561a462aec7a79e840174db595fd093c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 165 zcmV;W09yZe0i}-1jRG+cL^(T(P5{()`zx&w7cw9LPrI$*V2r#5(q~w02HdLNlS;+C zwd(|9!)^`{5YiHIAt@%sYOGKsw#i|&KIoK47(*1R?s>><0(%UV31cK7az(0%TzvG4 z)75j$XcqLsDnI7h2b{|*j{=vqx8Ht)AKB<9o#apaw*&Wf1Wit-n9y3-qeE01-Of(= Taz-tEt}vwarxf)DDF;yiw$w}5 diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/07/c514b04698e068892b31c8d352b85813b99c6e b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/07/c514b04698e068892b31c8d352b85813b99c6e deleted file mode 100644 index 23ab9217148566bcba07573afa4c376fd0f80c40..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32 ocmbS$%Kcz!PVJJx=MLe89wz^nv|30NO4M_W%F@ diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/09/055301463b7f2f8ee5d368f8ed5c0a40ad8515 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/09/055301463b7f2f8ee5d368f8ed5c0a40ad8515 deleted file mode 100644 index bf5b0fcc57ff618efc5784f508aee1634073bce2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 41 zcmV+^0M`F_0ZYosPf{>4X9&s2ELKR%%t=)M(s`-n3YmEd`N<{uMtWQT%DoF6bTtwL diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/09/17bb159596aea4d295f4857da77e8f96b3c7dc b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/09/17bb159596aea4d295f4857da77e8f96b3c7dc deleted file mode 100644 index 9fb640dd5c947abdbcfa0a83f0d421d755fc5d1a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 36 ucmV+<0Nej~0ZYosPf{>4VkpVTEan2Dl*}Uiw9K4TL%ouU5-tFg0turl1P{3Y diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/09/2ce8682d7f3a2a3a769a6daca58950168ba5c4 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/09/2ce8682d7f3a2a3a769a6daca58950168ba5c4 deleted file mode 100644 index b709cf461bec50d06c7e92a4d9dc386fbe054808..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 163 zcmV;U09^lg0i}-74FVw$ME#};8aT7S-2#a*{@8&HEXxuv@x&l%`<})Q{F`}`ybRZ6 znY*^*xamzqm*ia_1IQ&q^fVHuh%Clg;bbTykC?!z8#TFh%?Q4*gAklJH)Sa{aK?aX zGG&zz*aRr7=+V!$>0^FT%ldS#%e`LpPFDI!2l)=aw&l9)wQ-Y$7<~ji00O9$u4lXa RsZqVn&zUZRS8o8yP?i&^P>KKm diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/09/3bebf072dd4bbba88833667d6ffe454df199e1 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/09/3bebf072dd4bbba88833667d6ffe454df199e1 deleted file mode 100644 index ae13207d7490a064ecf276149d49ccc8ddad31f4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 266 zcmV+l0rmcP0V^p=O;s>9H)k+3FfcPQQAjK;$5Ep%1PBLsVHGc5;`oqI?hAM z{rdDef8NUpvTr_GLlq}yB<7{3rs!to=_VB=<|Su>F;6I8oGd50*9~fRQEF~} z8N@M$2FUI?HtEeb1@;4L=5NZ=TG4V()A*j~TTDGj9=QMbllCh4{Bt4h6J!k9c0JCx zmwgvg1Cj?~tTUF&ANdt)rhmCTE?BrGD{A{vsD@HtsDJ|r?EDiS^7X7YO>-9H)b$2FfcPQQAjK;$5Ep%1PBLsVHGc5;`oqI?hAM z{rdDef8NUpvTr_GLlq}yB<7{3rs!to=_VB=<|Su>F;6I8oGd50*9~fRZhlH; zS|-pnCHcC=iMbHR$KK_CmOqpCz|-^d-{j7A3vzfFTn|-Wl$x7ghT-`8k3VUzlFvUE z;yyvfpl#RVjC9H)b$2FfcPQQAjK;$5Ep%1PBLsVHGc5;`oqI?hAM z{rdDef8NUpvTr_GLlq}yB<7{3rs!to=_VB=<|Su>F;6I8oGd50*9~fRZhlH; zS|-pnCHcC=iMbHRdwbk_YvpXox&PX>)wbRfO}ewbq(IddrRL_BVL1N&<4@YF4dj#_=z*Y27YHWA2KmGY-VEu0Hgp4jsO4v diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/0d/52e3a556e189ba0948ae56780918011c1b167d b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/0d/52e3a556e189ba0948ae56780918011c1b167d deleted file mode 100644 index 4b633e5043d1b0ba3cbb9ac4b0223b2a93342f38..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 235 zcmV9GG#C{FfcPQQAjK;$5Ep%1PBLsVHGc5;`oqI?hAM z{rdDef8NUpvTr_GLlq}yB<7{3rs!to=_VB=<|Su>F;6I8oGd50*9~fRQEF~} z8HQu-KmMe>NBDf3F=Qyo$ShVU&&>GO3h2mO-)hA%u~oOEh^?p%u7*7 vP01{Q2$f`{W&#DdG&1v2Qd3iO6f#Q`fSS=2XmW9pVd$t95~BeC!$_Pzca$Uz diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/0e/c5f433959cd46177f745903353efb5be08d151 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/0e/c5f433959cd46177f745903353efb5be08d151 deleted file mode 100644 index 1bee56c14b889c8933ce73c9797c99532081c84a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 165 zcmV;W09yZe0i}-74FVw$ME#};8qh4ez(Hb+KXzaP%dx~uyu%=B`<})Q{F`|%nao({ zdFmRi+w>-)AySf5V8EPhN{K@VMBWeCmm=2LTuh8&)Qy`gT{{ZsiZwij>@9eMC0ZoL z0>nNR%FzditoYF{wdqrSam)IAsq?)qdM_*eq@#SrukFS3X)y TpEIhr={fOrYe2mLSI9Wk}1+Nj2mmnzUBP%}>cp%S=sC$jnnnDoV^t&M<;%2LL}o F8Z!RK6Y&55 diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/11/aeee27ac45a8402c2fd5b875d66dd844e5df00 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/11/aeee27ac45a8402c2fd5b875d66dd844e5df00 deleted file mode 100644 index 90e729f6d414d57c5bb523246370e8ffc6790e29..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 51 zcmV-30L=e*0V^p=O;s>9VK6i>Ff%bxNXpDhEUIKsek&rC_3-(OP2UyQzuh;bMsT9w JE&wg05VhTO6$1bO diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/11/deab00b2d3a6f5a3073988ac050c2d7b6655e2 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/11/deab00b2d3a6f5a3073988ac050c2d7b6655e2 deleted file mode 100644 index 857b2368673162beade05b28613354cbc3514d3e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 34 qcmbb)7unqPA diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/11/f4f3c08b737f5fd896cbefa1425ee63b21b2fa b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/11/f4f3c08b737f5fd896cbefa1425ee63b21b2fa deleted file mode 100644 index 6555194cb..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/11/f4f3c08b737f5fd896cbefa1425ee63b21b2fa +++ /dev/null @@ -1 +0,0 @@ -x¥ŽQ Dýæ\ fw)cüñ^` Û´‰-Q¯/oàßÌ›Ìdb^×¥j²´«EDC²$†­u‚>Œ ¡÷,Ö z@Œ8¢’ºq‘­jk<Ù©GŽ>¹Òz2Lva2)¸VeÅ:ç¢ÏéÅ%éËœ×{ÞôAý¨“|ƒŸÛǼ5K@ˆº mg«ü9£jYž _;„n,¼ÅY½y²P” \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/13/d1be4ea52a6ced1d7a1d832f0ee3c399348e5e b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/13/d1be4ea52a6ced1d7a1d832f0ee3c399348e5e deleted file mode 100644 index 4e4e175e8164e9fdc33ed173a3089ea2c7e75be1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 168 zcmV;Z09XHb0i}-J4Z<)GgL%#rS)k}HY5pXHcwqw;xJ$2UCEB16V0{W=1K#Y
  • iU zWp3Iy+_fsAVQ@w)Ip+mqVuI9166ZsNgb@%kGWsy68&z4G9s!)?2p*X22rMph&KCPX z5G0H7JVFYh=+UN9^?7(v9rR@?%e}1nARGOtlYE1p+vl3VJOMSEan2Dl*}Uiw9K4TL%ouU5-yG8jKsY3)D(rxJcX3B Q_~OizR6|WJ0Kk(F;!lblxc~qF diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/15/8dc7bedb202f5b26502bf3574faa7f4238d56c b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/15/8dc7bedb202f5b26502bf3574faa7f4238d56c deleted file mode 100644 index 064423d0c..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/15/8dc7bedb202f5b26502bf3574faa7f4238d56c +++ /dev/null @@ -1,2 +0,0 @@ -x¥ŽK!D]sŠ¾€¦ùCbŒoà i2. b¼¾£ñîªÞK*E½µÛep73UƒÓ¾*NYYôI²Ô”)–j¼ŠL:8§<‹{¼NˆÞ“‹ÎÊH6iDC¶Ê"mqH!–Ì9T¥mé9—>àR^i¸.½=ú -GÞè'ù+~í@½@j+ƒ7ÑØ£EÝÎNþsFtš]‰7bN) \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/16/f825815cfd20a07a75c71554e82d8eede0b061 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/16/f825815cfd20a07a75c71554e82d8eede0b061 deleted file mode 100644 index 82d65253b..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/16/f825815cfd20a07a75c71554e82d8eede0b061 +++ /dev/null @@ -1 +0,0 @@ -x¥ŽK!D]sŠ¾€†šObŒoà Œ ƒ¯ïh¼»ª÷’Jqoí6A¹›£°JÙ€ˆ¬“T1h¢3§£·Î'LÕ ó.‰{eœc,a`ŠZJÃT1#e+Ù‡œJòUiª">çÒ\ò+Ž ×¥·G_áX6úIçò¿vàÞN€šÐ;ÈÀ^’”b£ÛÙYþœgGñ—MMµ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/17/8940b450f238a56c0d75b7955cb57b38191982 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/17/8940b450f238a56c0d75b7955cb57b38191982 deleted file mode 100644 index 94e571e6547c9f6826e73200aeb24b334dc6b5a5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 65 zcmV-H0KWft0ZYosPf{>8FlQ*q$ShV!%gjktD9_BvQAkQvC`!#s%uP+<%FI(p$}h=K XNGeLqOU_6w=HePv3l0YWsc3D@sF55# diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/18/3310e30fb1499af8c619108ffea4d300b5e778 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/18/3310e30fb1499af8c619108ffea4d300b5e778 deleted file mode 100644 index 1c4010d0479c8f28d62969968746d6c346597c5c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 170 zcmV;b09F5Z0i}*nYQ!)MMEmVi_yQ?%6e|vtWq*2uy?`vqB+$gg>us;!Z0Qa9H}f70 zBX!@m?#CEjdNcE!(yWRLE1D_=D6&98l}y1V;2eQw)Zjk3+0nfa%ta7VLPLydWlW-! zD92Dp3d5LzOdLP@TAP2@Z*J;uYu)el@Nag~XS&+2_-n6H_lpl0M_8s5$qzsP?xg40 YZvUKdy=`9`e+<)*8y~W|ANj&k)P+J+s{jB1 diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/18/cb316b1cefa0f8a6946f0e201a8e1a6f845ab9 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/18/cb316b1cefa0f8a6946f0e201a8e1a6f845ab9 deleted file mode 100644 index 30f3110f122695066575e549207def7ff17a06ca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 68 zcmV-K0K5Nq0ZYosPf{>8GiE5s$ShVU&&>GO3h2mO-)hA%u~oOEh^?p%u7*7 aNzF+ufryo4q-Fv|xkmMn6$Suk#)28*xEz!K diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/19/b7ac485269b672a101060894de3ba9c2a24dd1 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/19/b7ac485269b672a101060894de3ba9c2a24dd1 deleted file mode 100644 index e34ccb855c0976b4a5f87a375b8af037a39364b7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 53 zcmV-50LuS(0ZYosPf{>3W(Z2n%`Zz$QOL|wP&ZdsNGdH+$jwj5Ov{9c=_VB=<|SvS L>u~`9q0|r1O8^$N diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/1a/010b1c0f081b2e8901d55307a15c29ff30af0e b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/1a/010b1c0f081b2e8901d55307a15c29ff30af0e deleted file mode 100644 index 6039df00ebea6884c4b22809ca2772b3a01695af..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19 acmb9GG;I|FfcPQQAkWlNlnqs%+t+HEG|hc(krPbVNkZ=lsq}( ztss|o{^xvCt2f<+Chaigr6u{fsYU6jiAg!BV8!q37w$N~^}qgsLh9eG94WhbC+nPt zDo)Nw%u9!uo>Y{Wmz)9CusX+O(F>PJYrP$JXRm2DwVTVdrW;cOl5+&_t!CJCdD+*+ z?3NvCSb21-(?TD?H00-{tM4hkQNjP177p((5LESpDk4 M6PtOl0L5v7+NnT@tpET3 diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/20/91d94c8bd3eb0835dc5220de5e8bb310fa1513 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/20/91d94c8bd3eb0835dc5220de5e8bb310fa1513 deleted file mode 100644 index a843890c07c438afbf35caec02aa95cb7ed8e0bf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 271 zcmV+q0r38K0V^p=O;s>9w_q?dFfcPQQAjK;$5Ep%1PBLsVHGc5;`oqI?hAM z{rdDef8NUpvTr_GLlq}yB<7{3rs!to=_VB=<|Su>F;6I8oGd50*9~fRZhlH; zS|-Fbh9<}kQWLeZ|C};AM|)e)gf0V^p=O;s>AVK6i>Ff%bxNXyJgHPkDqC}9w>f^`v?#EoR&lyh^e#{@%Ki-H+b=~r`cK9q$OdT=Amb4 zI7AhRQQ6|k1TmDowh)aFv52xGJ)>tva{@OO-j*2g#va!7L?mJgZg5!K5&nhe+pk}` I0OLKb{)H1UA^-pY diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/23/3c0919c998ed110a4b6ff36f353aec8b713487 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/23/3c0919c998ed110a4b6ff36f353aec8b713487 deleted file mode 100644 index d0c8c9e1df90d8ef56a1aefeeed35636eed062cb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 43 zcmb diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/23/92a2dacc9efb562b8635d6579fb458751c7c5b b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/23/92a2dacc9efb562b8635d6579fb458751c7c5b deleted file mode 100644 index 86127a344bcd2dc01885a87ad9e6aa346a11d7c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 142 zcmV;90CE3#0i}(>4FVw$0DV)%HlSHK5J-&iV+S_CElchaVH0kR?R(bXZ!(V=lGauQ zi_<{|GgJyC%n^MJIXN4BaMjg_cD6h@Di-scN=hcbb&&y&^2wvXbCI@5hb!;)NB6eU wkWH$dNZJj~)5V9gOFqI8J)+s|K34uCVFvfy7)W}3t)!4U@uo7&7i`-^t=uR|3FlQ*q$ShVU&&>GO3h2mO-)hA%u^`INX;xN=1R;< ZQAkb6EP)8-mjZ>jMzzpB!~oPvkr~kB9dG~u diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/24/2591eb280ee9eeb2ce63524b9a8b9bc4cb515d b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/24/2591eb280ee9eeb2ce63524b9a8b9bc4cb515d deleted file mode 100644 index 74a01373f44bdc87acb162136fd0dbe4527f9b49..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 30 mcmbxmhoiK()PmVkaVRdHKV~G30t^@$Pd<$;? diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/24/90b9f1a079420870027deefb49f51d6656cf74 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/24/90b9f1a079420870027deefb49f51d6656cf74 deleted file mode 100644 index 60497caa56d0a276b89635791f80b13b00d2f717..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 268 zcmV+n0rUQN0V^p=O;s>9GGH(?FfcPQQAjK;$5Ep%1PBLsVHH1XTNaA0j~e` z4-``WZskbX%{y7=JXCRVMq*xiYKm@Vo^Dc6VqS6vSi|ZZmqjmJCav{$+?~Cq-PCR_ z)0%Ef4Y`TMC8e=fv*f{a1iuE!bovhP9-F9muI>{qbKCqCrsS#O%=Sdv~h S@x$s@7oOP6iv<9|ErgF|_<-vG diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/25/9d08ca43af9200e9ea9a098e44a5a350ebd9b3 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/25/9d08ca43af9200e9ea9a098e44a5a350ebd9b3 deleted file mode 100644 index 2bae66998977385146fbe69aeb71f387b4ba800d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 381 zcmV-@0fPQ`0V^p=O;s>4Gh{F{FfcPQQAkWlNlnqs%+t+HEG|hc(krPbVNkZ=lsq}( ztss|o{^xvCt2f<+Chaigr6u{fsYU6jiAg!BV8!q37w$N~^}qgsLh9eG94WhbC+nOy zF#rOEr2LW$-IUCtVg^&5yv>Y!e;ll`-)1NqB?pVVd>a8ZFgYVJFCF57q@u*UOYd*4uG+_L_E6ySYqjx-m5%Ia%=DYKBdhmwjE#ZrQPhl}EQaE%XsgLw;Ub zPG)jRW?nkjY`>1Y1XaybD_09%mv2k}vs=3?Y6_%Y+6?{=WG;V%n}>bdE3T zT_Umff6y_9l~5CkQgidmFuZ*K@h9z7^7-dN+$YEwwC#GFaWDHWR6{8+SiqqKcK?YF b`Fhryra6|R*G>Ge`qhOeHuGWur60HSw0OLC diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/25/c40b7660c08c8fb581f770312f41b9b03119d1 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/25/c40b7660c08c8fb581f770312f41b9b03119d1 deleted file mode 100644 index 185214727f41552c6820f66bf63641d28505021e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 31 ncmbL(MnP81`KAxtJm>9ygvkL$KyV?si diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/26/153a3ff3649b6c2bb652d3f06878c6e0a172f9 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/26/153a3ff3649b6c2bb652d3f06878c6e0a172f9 deleted file mode 100644 index 4fcaa07e228f0f20883cb11889c7b2bf3af0bc2c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 48 zcmV-00MGw;0ZYosPf{>8V(`sR$xO>kO;O0qQ&2A{$}G!F%+WP8(M>8!%uCKt=K=r< Gt_7HfJy~00M=i{E`gal+2=Hh9%O{+b-<0QTm&@!ZK-Ar!bX?Dpyx@zbD6GK&}#)8#aoDm3ypo%2b) zAU1Pb)t$$Nh6V;^CMF7LnK`L?B^4zMU2Es^EjF1dyQDfv%01fhOy2d#{QwO{Hryq0 BNbLXs diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/2b/5f1f181ee3b58ea751f5dd5d8f9b445520a136 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/2b/5f1f181ee3b58ea751f5dd5d8f9b445520a136 deleted file mode 100644 index d24231eda0f690b57f01446f58ae5499ab63533d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 53 zcmV-50LuS(0ZYosPf{>3Heo2q$ShVU&&>GO3h2mO-)hA%u^`INX;xN<{FhA Lbio1u#AcpFSWp&g diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/2b/d0a343aeef7a2cf0d158478966a6e587ff3863 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/2b/d0a343aeef7a2cf0d158478966a6e587ff3863 deleted file mode 100644 index d10ca636b6bf5f66bce633362d871d17d9a292c6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 56 zcmV-80LTA$0ZYosPf{>3VkpVTELKR%%t=)M(#aW#dFiPs3YmEdNkxfy$r%cXc_|9H OiNz(UMO*-@y%7?c&=$P_ diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/2b/fdd7e1b6c6ae993f23dfe8e84a8e06a772fa2a b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/2b/fdd7e1b6c6ae993f23dfe8e84a8e06a772fa2a deleted file mode 100644 index c86edfb689fdbfcb9d7837512b2c158a31f11ffe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 231 zcmV5H(@X|FfcPQQAkWlNlnqs%+t+HEG|hc(krPbVNkZ=lsq}( ztss|o{^xvCt2f<+Chaigr6u{fsYU6jiAg!BV8x#vhH~-D3%=SYSlZ^L8Jy;{&O#BY zI5{IRFCAifQc+@Fat2s~-v*y~l`s0!94^Rz-4wHE8GFhnF-#3e&Jnz~nqkxBWnUMw zTXw8r<9lbKwSnU@YWyXfqO@XZbifhq2-sW0WWi@86`mk_ZFm3x diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/2d/a538570bc1e5b2c3e855bf702f35248ad0735f b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/2d/a538570bc1e5b2c3e855bf702f35248ad0735f deleted file mode 100644 index 83253f81c..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/2d/a538570bc1e5b2c3e855bf702f35248ad0735f +++ /dev/null @@ -1,2 +0,0 @@ -x¥ŽK -1D]ç¹€ÒùN"n¼{ét:Œ‹L$ñúŽâ ÜU½EQ«õ>¤¶~7:³L ðÙD [´±5—¬É‡,Øy2e®ÐTت@”¦z*.û(ë´Àç˜[——üžåunum‹<òF?éÌ_ñkjõ$•qNå'#÷àÄF·³ƒÿœ¹Üp!^Gëâ 9+Q. \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/2f/2e37b7ebbae467978610896ca3aafcdad2ee67 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/2f/2e37b7ebbae467978610896ca3aafcdad2ee67 deleted file mode 100644 index 7adffb165a09cdd027d1c4d38f98908e2e1fc65a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 52 zcmV-40L%Y)0ZYosPf{>3VhBpj%`Zz$QOL|wP`A`gDoV^t&QMoKDlJjS%}>cp%Y;d( Ka{&OEIuE5qZx!?a diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/2f/4024ce528d36d8670c289cce5a7963e625bb0c b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/2f/4024ce528d36d8670c289cce5a7963e625bb0c deleted file mode 100644 index 0100fd70e832555800236cc897868c9a56402c62..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 179 zcmV;k08IaQ0iBLZYQr!PhP&1&bb*Gk9y1bzkWFvUz0qTY4V4vSgi~AMo*| zR_i*Xvh*=Jv-C{GXzPtDL_|8cfUYV{^3jR49TAo&RnKpg8K hJNONZLp1iph{HToo>SY(&zi_|Å Ât@„ -“ñapg%hò•aãJYÁÕ®Aâ8Õ©í› fçà²ûN©ì¦¯4À;œ”h[º%cÍO¦ÆÎÕÑuJÑ÷çWÖyÎ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/2f/598248eeccfc27e5ca44d9d96383f6dfea7b16 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/2f/598248eeccfc27e5ca44d9d96383f6dfea7b16 deleted file mode 100644 index 1d9f226e2..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/2f/598248eeccfc27e5ca44d9d96383f6dfea7b16 +++ /dev/null @@ -1 +0,0 @@ -x+)JMU067c040031QH,-ÉÏM-JOMLÊIÕ+©(aH:,»:ÎCÉýúô:ÞË ²o>ZC'g$楧¦èfæé&%æ%g€5¬ÎqYôÂeÒZoÇÝÙkÚMíæ2­éÆÔ›X\’ZDPC~^ZNfrIf^:Xéõ›ZHÙŠž1O(_œ,'º× jvQjn~Ä1–ÈÎÑ×3ßþzדôém9‹Wý¹ué]:¦$÷ßüI{•|þ¹÷ 2m»gÜ˾‹©Éý1ÖËåüŠ5Ó¿Ü,\“µ})TC)0PÀavý‰ùzÖ›¦9–¤×Mü°úÕ…'6óbˆ—¢ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/31/68dca1a561889b045a6441909f4c56145e666d b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/31/68dca1a561889b045a6441909f4c56145e666d deleted file mode 100644 index 2de1c5a79..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/31/68dca1a561889b045a6441909f4c56145e666d +++ /dev/null @@ -1,2 +0,0 @@ -x¥ŽQ -Â0DýÎ)rJ²›MñÇxM²¥ÛHŒz}«xÿfÞƒaRY–¹ip´kUD $Ï1f¢Q2qê-Ó=Y£ëÁ3R7®²6äÄ¡·Œgàâ9e7 bæ¡w ‚âG›JÕçüâšõe*˽¬ú ý¤“|ůíSYŽÚ"5&Ðñƨng›ü9£ZŸ3_;kÕ¬dO¼ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/31/d5472536041a83d986829240bbbdc897c6f8a6 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/31/d5472536041a83d986829240bbbdc897c6f8a6 deleted file mode 100644 index 5ec5acb596853e163ca7c0de2dddb36f8ed17446..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 41 zcmV+^0M`F_0ZYosPf{>4X9&s2ELKR%%t=)M(s`-n3YmEd`N<{u#(G=;%D@XAcs~+| diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/32/21dd512b7e2dc4b5bd03046df6c81b2ab2070b b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/32/21dd512b7e2dc4b5bd03046df6c81b2ab2070b deleted file mode 100644 index d36138d796c849f28fc5131ef23a56a58b747c01..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 47 zcmbSr<#>h{|9Gnb DkgXG9 diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/33/46d64325b39e5323733492cd55f808994a2475 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/33/46d64325b39e5323733492cd55f808994a2475 deleted file mode 100644 index 11546cea449c383f0c292d17e7e773de4c722ed3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 33 pcmbÕy­‹>çî隿ï¤ÎmŒŠú 6ºÉöüç*¼öRÛn¢>úåOÇ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/34/8dcd41e2b467991578e92bedd16971b877ef1e b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/34/8dcd41e2b467991578e92bedd16971b877ef1e deleted file mode 100644 index fd61b6ce591d470d01693162289cecf05c3bbae7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 51 zcmV-30L=e*0V^p=O;s>9VK6i>Ff%bxNXpDhEUILX3B1uN&L6(u$ctn1znR%iT)I`h J6#yX^5B%a^6yg8? diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/34/bfafff88eaf118402b44e6f3e2dbbf1a582b05 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/34/bfafff88eaf118402b44e6f3e2dbbf1a582b05 deleted file mode 100644 index c653cec50..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/34/bfafff88eaf118402b44e6f3e2dbbf1a582b05 +++ /dev/null @@ -1 +0,0 @@ -x•ŽKj1D½Ö)ú úµ>`Œ7¾A. µ$<`MŒ¯orlŠ¢ ¸÷m‚¶þ4G­›·&údVdƒ[j2ÖµËJÉâ›C«ÑŠgu_GuÒ%ÅÚ2:ƒ3XúزÅàQ‘'Ì"½æÜÊ;?wîïp®kým×¾ÑàƒÛü&îPf!¢ ð%QJ±Ö%:ëûCˆeœzâ½=6šÀ¯qˆ;iOè \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/35/0c6eb3010efc403a6bed682332635314e9ed58 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/35/0c6eb3010efc403a6bed682332635314e9ed58 deleted file mode 100644 index 2eee602335c69d4c9f13f8a8b4e3e20096b21190..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 92 zcmV-i0HgnS0V^p=O;xZoWH2-^Ff%bxNK8pdP0`KF(@n}R$LJ2x0gUIYNNCnV+hk|<>W diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/35/411bfb77cd2cc431f3a03a2b4976ed94b5d241 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/35/411bfb77cd2cc431f3a03a2b4976ed94b5d241 deleted file mode 100644 index ea024ccd9e3dce798de1762fcababd72d55f9e43..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 31 ncmbL(MnP81`KAxsem>9ygvhxD~yWtBo diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/35/4704d3613ad4228e4786fc76656b11e98236c4 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/35/4704d3613ad4228e4786fc76656b11e98236c4 deleted file mode 100644 index 1dd13c44a00f1c388d5b23fa12cdb68a82fde9c7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 41 xcmb5!L_z diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/35/632e43612c06a3ea924bfbacd48333da874c29 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/35/632e43612c06a3ea924bfbacd48333da874c29 deleted file mode 100644 index be7684f19..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/35/632e43612c06a3ea924bfbacd48333da874c29 +++ /dev/null @@ -1 +0,0 @@ -x¥NË !õLÓÀšd–MŒñb60ÀÝă¨í‹Æ¼½^,ëº40;·iUFf+)›³ˆ1vòBÁ939fG–(ôDIݸʵA$s´è½k]’l|Lä{IgŠ™Ñ$‰Šm.NéÅ5Áy.ë½\a/]ý £|ÛƲ@[g4âä< Hˆª«ýl“?gT«ËsáË µzCøP˜ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/35/75826c96a975031d2c14368529cc5c4353a8fd b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/35/75826c96a975031d2c14368529cc5c4353a8fd deleted file mode 100644 index 24e33bc41cfc3d41d574d366c4311ffd44d005a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 163 zcmV;U09^lg0i}*z3c@fDgniB_a)HWj^A94vcmpr6Nj9`#8;Mb`ZxwIg+syaDFsUxf z+~uhCt~X{0*^I2n7|ZBGBna9Q8|yp-^njQ!qIFr^sPWpRGvpCtu`wBEgQgr+VGG)M zTNG(78B@k6=+URzxtJKOos R8PVJPoas7v@dn@TPdO==P_O_1 diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/36/219b49367146cb2e6a1555b5a9ebd4d0328495 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/36/219b49367146cb2e6a1555b5a9ebd4d0328495 deleted file mode 100644 index 7f8044372ad4d15a6ed522b15fa7c3fdcb6f01fd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 68 zcmV-K0K5Nq0ZYosPf{>3G-W8s$ShVU&&>GO3h2mO-)hA%u~oOEh^?p%u7*7 aNzF+ufryo4q-Fv|xkmNSEers*8I)M#?Hu0# diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/36/4bbe4ce80c7bd31e6307dce77d46e3e1759fb3 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/36/4bbe4ce80c7bd31e6307dce77d46e3e1759fb3 deleted file mode 100644 index 90fd9651f8c2a1f4e6803607a09b2f47b8ce092b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 35 rcmb4X9&s2ELKR%%t=)M(s`-n3YmEd`N<{urg~fe%Ek*IcT*B@ diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/38/5c8a0f26ddf79e9041e15e17dc352ed2c4cced b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/38/5c8a0f26ddf79e9041e15e17dc352ed2c4cced deleted file mode 100644 index e95ff3a88..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/38/5c8a0f26ddf79e9041e15e17dc352ed2c4cced +++ /dev/null @@ -1,2 +0,0 @@ -x-MK -1 uS¼YÍRÄ…ñ™6C±…6Ò뛪ð¼okn÷ÇåYt àEpª iÅDûØCd§Éœ³dLõB+8ø%¨q‚±ƒk µÿú+Þe™Þ6¢ï‡©fHüBü·¯1J©ÕÓ4ùFà1l \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/3b/47b031b3e55ae11e14a05260b1c3ffd6838d55 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/3b/47b031b3e55ae11e14a05260b1c3ffd6838d55 deleted file mode 100644 index 82086466f5eb3142bf86233dbb9d3600ec655264..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 161 zcmV;S0ABxi0i}-J4FVw$gngz88aT7S@w16BzSw~cz_R2_yu%>I_C;d{zRi4-%na3a zy>_W*wd;*p0(ut`XRTcT$_au+7fgxhyeFcNZPb>OxW~p@mz)SNgEF2<0@BW*k30Zi zNjRIB5nM4v#Ajb>ljr=3Ez8SN*GJvtfd~Dl6MuuB+f!YSQW>jZtSc)gZ~$V^aklfH PHNwVQpR{-bS`tn#OrcCs diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/3b/bf0bf59b20df5d5fc58b9fc1dc07be637c301f b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/3b/bf0bf59b20df5d5fc58b9fc1dc07be637c301f deleted file mode 100644 index 723a9ae4c919bbd0cad50bb475b5a80764e28dd0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 269 zcmV+o0rLKM0V^p=O;s>9GGH(?FfcPQQAjK;$5Ep%1PBLsVHH1XTNaA0j~e` z4-``WZskbX%{y7=JXCRVMq*xiYKm@Vo^Dc6VqS6vSi|ZZmqjmJCav{$+?~Cq-PCR_ z)0%Ef4Y`TMC802Pi7oB#j- diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/3e/f9bfe82f9635518ae89152322f3b46fd4ba25b b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/3e/f9bfe82f9635518ae89152322f3b46fd4ba25b deleted file mode 100644 index 3b5998ca61dbf820b46e70619c4143407fa11688..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 172 zcmV;d08{^X0i}*j4#FT5gk5tAE}-G3JZNH!8*kvg0p25RBE?V|uP+*J;BMxdWM*Q? zd1+i3b7+-_kILdO4mx7MIC=n!!4asKQ20SQE0i|TNcQxV*2V)RAZ>#t06V=yrQ0)>>!B8IEWq`5sOE%|V2Mf)#~tty7k)pzF`8W@"n¼èt:Œ‹™‰x}£xwU¯ xÜj½um'»ë«ˆ.®Ì9»=y 6Ø$@T8ÌÀ‰&Lhf4êA«Ü»f¡0BŒ(ˆ.K±‘³>9S<›À +zö¥­ú’_´f}]ZÝÚ]eÐO:Ëwøµ·zÒš†‹ÞƒPƒÙ.Þ¨aNU6õÎOÖ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/42/18670ab81cc219a9f94befb5c5dad90ec52648 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/42/18670ab81cc219a9f94befb5c5dad90ec52648 deleted file mode 100644 index 33ead6112c06f03417afcaf5cd3395881d030b22..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 47 zcmV+~0MP$<0ZYosPg1b7U`Wf%Nj2gElhz8k`6-!cnW-rXnRyDiiNz(UMGzT^NB||a FA)F696pR1> diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/43/aafd43bea779ec74317dc361f45ae3f532a505 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/43/aafd43bea779ec74317dc361f45ae3f532a505 deleted file mode 100644 index ac86823b67ad33129ed2a6874cb5ed85a4318ec0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 37 tcmb9G-oh0FfcPQQAjK;$5Ep%1PBLsVHH1XTNaA0j~e` z4-``WZskbX%{y7=JXCRVMq*xiYKm@Vo^Dc6VqS6vSi|ZZmqjmJCav{$+?~Cq-PCR_ z)0%Ef4Y`TMC8-4F=Qyo$ShV!%gjkt0Md!2CHc9jMd_)DNja%pLrlujKvkhQ QGdD9Qu?U~j0Zl+!Z0_9{>i_@% diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/46/6daf8552b891e5c22bc58c9d7fc1a2eb8f0289 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/46/6daf8552b891e5c22bc58c9d7fc1a2eb8f0289 deleted file mode 100644 index c39b53aa8f4435495440249b2c4b1186bce3460f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 382 zcmV-^0fGK_0V^p=O;s>4Gh{F{FfcPQQAkWlNlnqs%+t+HEG|hc(krPbVNkZ=lsq}( ztss|o{^xvCt2f<+Chaigr6u{fsYU6jiAg!BV8!q37w$N~^}qgsLh9eG94WhbC+nOy zF#rOEr2LW$-IUCtVunN$zIWG6_?NAy)O|lI(qeb4i^*=Nfyo((dFc=rBo!s*C1-#Q zU7h2y=!MIqwcd`qv)8nn+RbHJ(~YSC$;pEERx@n6yzJ{@cFT@6tUS8aX`zo`8uIhf zax#-kGV{{GX8U#IC8%niTDe;Ax_n!*_r+}w?g>DZrliG#!-GLx*mgP7E}Mk)T8uAq zR73wexL%tCQsGnKH|N-zXI~50WC-zdS|&7D^7qZ(5z}`4qH}yv z?-Gf<|AUS>tc03Sl$x7ghT-M=k3VUzlFvUE;yyvfpl#RVjC8-%)vqo*v6&YO02yex1P1}fp#T5? diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/47/6dbb3e207313d1d8aaa120c6ad204bf1295e53 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/47/6dbb3e207313d1d8aaa120c6ad204bf1295e53 deleted file mode 100644 index 3e5f66e5560744991baf7532f0bb954b9600e11f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 522 zcmV+l0`>iP0V^p=O;xZkGh#3_FfcPQQ7}l<&CAzK&PdElPt_}_C}GGrcEX!eQtkLn zu4T(-Yaia7b?0m!Ol^{GQEGWnW=TnEo^EEIZhmP|F<8%sbJ~5LZ5+O{4f?mMb3PF{ zWViJhOiwbZo|25zOsFpXFd;_vYYjrPVy92ss(4zic+p!!s4l}qpsu{c+|(49J-VqW znI#Y|k`ae5=)Lb$IDB|J>J^4Jn-w? z*#6lrp$ZGlpn8muZB5EA$pC8*?{wG_@X2Cn4sYr9sWDrtEhHtIpc;%Z11BXlClxbv zBu*P<%e-IkW7(8^J_V^hsr;6xoiH=7`4!0&xM$52XM36zx}Da`5)IwD^7WMqMlDmJ zW|&~QBQYffBaW2HCvDYQ#jV`^is4ONz-*=@d$Asv3D{f#Hv{g58CP}L4{X@|X-lfd zw^czxQxBaEy$vq40teuYU*+4H4Vn(VGTYwN6`||n+@TTx)ntaM zsW>wwRo4)#X^Xnh`Iob#0=TsT|IP5@?kZ>6C5T58#HMZYUzk5RcmB%BB|LYQAGC05 MYroG904*0qfHpz+zW@LL diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/47/8172cb2f5ff9b514bc9d04d3bd5ef5840cb3b2 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/47/8172cb2f5ff9b514bc9d04d3bd5ef5840cb3b2 deleted file mode 100644 index d9e250e6664438ecd41046a769dab963dd08e2df..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 165 zcmV;W09yZe0i}*n4#FT1ME&LzT%cxwvO;2vKiOoDGt{LHw*+B?SobySt4V*CG zU6`fRD diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/49/130a28ef567af9a6a6104c38773fedfa5f9742 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/49/130a28ef567af9a6a6104c38773fedfa5f9742 deleted file mode 100644 index e2c49f5c45ebcceed1bcfdd595a2c5be008a778f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 37 tcmb# \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/4a/9550ebcc97ce22b22f45af7b829bb030d003f5 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/4a/9550ebcc97ce22b22f45af7b829bb030d003f5 deleted file mode 100644 index 6ec674adc574f87446749829eeded3fcf367038f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 53 zcmbtR22&{sO^Tl}?;T=y^QaQ46y9M}m0fEje0 V?fTCdgL3QB(&WgSc>?+*PaNcdRCE9U diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/4c/a408a8c88655f7586a1b580be6fad138121e98 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/4c/a408a8c88655f7586a1b580be6fad138121e98 deleted file mode 100644 index 15cb7f29af812ea83abf3da21b8d664ebc3053db..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 159 zcmV;Q0AT-k0i}*h4gw(%L|t(zG%FGyH~H0N~Koo zZAfikH#+kKf=ERLaAY)i2cTVMF40gym90gaiZkLKI&VXgbIFoLMG3-FQ6X z$Fy~x-**>0-t3#1t1WXAR?a>}45Da~OOob2#H2}USHVuxN7-!I9mbxB6LRZHP(X?d zKQaePq{&PTDnz{MIcbw>S_!CgrN}_FdzR2kksin=<=8HIhGwFofP@ky8^y-sxNO!D zvq8(=NUryApqQ)g(V8E&F!obW^$e=45jc$he6gu~?#Fd=&-zt1b+5;DKCO#;u)+SI zC;M&uRrhV3A02weBn%nd9WcN&*b&}t{~R;D*!DJ}-^$XCc5;Wc?JFK`&wwt#A6!}V MOoqes4Yh%VE1n{S9RL6T diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/4e/886e602529caa9ab11d71f86634bd1b6e0de10 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/4e/886e602529caa9ab11d71f86634bd1b6e0de10 deleted file mode 100644 index 53168a038b77edb9bb0073f155cf7e2315c07f59..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 56 zcmV-80LTA$0ZYosPf{>3VkpVTELKR%%t=)M(#aW#dFiPs3YmEdxrxOksYMEjc_|7> OMTvRI8C(FZ2N4pV?iL9E diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/4e/b04c9e79e88f6640d01ff5b25ca2a60764f216 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/4e/b04c9e79e88f6640d01ff5b25ca2a60764f216 deleted file mode 100644 index f4ec0efecb41f295973d32a8d8714c6003cdd54e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 34 qcmbMm*mHjKlI>-x^RwRVL07t|lYWDr+e@8~)?x6Fh+4 J7+ib=ngRRb6OsS` diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/50/ce7d7d01217679e26c55939eef119e0c93e272 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/50/ce7d7d01217679e26c55939eef119e0c93e272 deleted file mode 100644 index e2f9f67fdf9f04909cb4b067bb05982887bc686a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 159 zcmV;Q0AT-k0i}-74FVw$ME#};8qh2U3v6PHKXzaPuq-)0ILwK$eNSTt&ezPFWHQ`a zyA3@#*o{?0Gv+Lakf{PW=W^L(g{v(T7_ysE3emH=r&X4rDFpW9(GX*@0FJSmVz7AN zNF_^-b+TAhdXBlT`chtLE&4k5_UMZ~%0@r#EZ^dn4&2*G8;d3eM-=rQ5I}8oJ3Hjh N8P$1otKOQ@Y$wPd_em07lC}d8I^8``N~S YV#0²’cTôhS©úÌ/ª¬/SYîeÕÙè'ä+~mŸÊrÔh\c‡QwàÔF·³MþœQ­ÎÏ™®]èb¥5Mê ¨ÚRŸ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/53/825f41ac8d640612f9423a2f03a69f3d96809a b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/53/825f41ac8d640612f9423a2f03a69f3d96809a deleted file mode 100644 index 08cb0b66fe7341717f2a9cffd560cb5881568657..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 164 zcmV;V09*ff0i}-14FWL`Lpi64G_Yv$n@uEyxX=L&t~VkMP6Y}XW|@)>A$V)8QiyZHoJkvÏmy´›ÞËJ?é(_ñk»Ü–ƒ6è-$ç#è-€ZézvÈŸ3 -ù:ÔNqMB \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/54/7607c690372fe81fab8e3bb44c530e129118fd b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/54/7607c690372fe81fab8e3bb44c530e129118fd deleted file mode 100644 index dccd220068018e53496f4cd75b5184f91c646594..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 58 zcmV-A0LA}!0ZYosPf{>3VJOMSEan2Dl*}Uiw9K4TBfXM}5-yG8jKsY3)D(rxJcX3B Q_~OizR3l9;0Kl>kÈ$Ñ^•‘R²bâÏØ[‡{þ=Ãcoõj'|褯õUéíje¼K«Ÿ°¬Ln¡•n–¬5“ÎСÿP˜Y«‚´³|2`ìzôËü—zQ{ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/57/079a46233ae2b6df62e9ade71c4948512abefb b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/57/079a46233ae2b6df62e9ade71c4948512abefb deleted file mode 100644 index c7eabc46b2d774774dcc7b7caa89f632b5703db5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 168 zcmV;Z09XHb0hNwP4gw(%MO||WE}(&eVn~c};|<&!h9cdIZVZj_`l9Izxcfu?%TIM# z=FUN@LvKV}8q(XK1u`o;3(ttQ`OpB2rQcL)6w5 z4=^S0rmOTprt;3D^hVy-y-?yGlI( diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/58/43febcb23480df0b5edb22a21c59c772bb8e29 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/58/43febcb23480df0b5edb22a21c59c772bb8e29 deleted file mode 100644 index f6b2a2bfeb4d48d806b494808d911568d1f0596e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 71 zcmV-N0J#5n0ZYosPf{>4He@i>w^Yc<%u6j+NGwWK$jnnn&d<%w&*Lh|$ShV!%gh0a d0i{Yy@^e#*(o++Ya#FeIqlLN-0066CQ>C;SA)^2Q diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/58/87a5e516c53bd58efb0f02ec6aa031b6fe9ad7 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/58/87a5e516c53bd58efb0f02ec6aa031b6fe9ad7 deleted file mode 100644 index 550d288d490bac0c1eac2f66889f86ad6c75e727..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 47 zcmV+~0MP$<0ZYosPf{>9VMxo&Nj2mGlhz8k`6-!cnW-rXnRyDiiNz(UMGzUHNB~Tw F8Xf5j6FL9@ diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/58/e853f66699fd02629fd50bde08082bc005933a b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/58/e853f66699fd02629fd50bde08082bc005933a deleted file mode 100644 index cf6db633cb14c78d897ce66f18b6c3b8eaf0be8e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 160 zcmV;R0AK%j0i}-14Z<)GL^-<(Hvn3%Kgmi6aiIemSlb&V2gk@UqJ09Q18y_#Nux=% zl%;EQaOh1$qo)jGVrO|G1P~G?1{%dV_G~>!%oMG9aFexbKfplj0$R(0G2|(r5N8=o za^yyDkfTgd@w3mh>05qr%lbaovei|eWv8EXm9O}x{njrHCHasl)a0)X1-ezwb> OGiqD1pn3x#AWl##I7qhu diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/59/6803b523203a4851c824c07366906f8353f4ad b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/59/6803b523203a4851c824c07366906f8353f4ad deleted file mode 100644 index cbc8cbef31cfa7d4903799d2b4ff665e98991f28..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 163 zcmV;U09^lg0i}*z3c@fDgniB_a)HWj{tF_$cmpqxZZ@=F8;Mb`ZxnAJ^D^@d3`1pI zmnN05yH=ScSj;*35ilB~a?I9EN;&K@BY2b1k|*QEEmq!|BnLi|h7dGsZ4+k|D7oOK zKIAAzP!l*N5g%%AflE7H~`UUKil}v R8PV$UT;g>=Bi;=0PayLcMuh+X diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/5c/2411f8075f48a6b2fdb85ebc0d371747c4df15 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/5c/2411f8075f48a6b2fdb85ebc0d371747c4df15 deleted file mode 100644 index 7b41413dad72f58fe84603614b4841980a210781..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 37 tcmb4V<^eUELH%bqSV~{veXoX%shqM#Nv|FA}#>O3=5lsKNCg( diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/5d/c1018e90b19654bee986b7a0c268804d39659d b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/5d/c1018e90b19654bee986b7a0c268804d39659d deleted file mode 100644 index 7500b99146bf4f8687cc39ff009bb767740ab83e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 168 zcmV;Z09XHb0hNwT3c@fDgE2 z#$ZkqH5=4HgjbtNl{b2aO7cFHWh<*Zb5FnO%D-ZFr&N}U)D|2dD1-8-yi%g4{cPjE WF`)hEtllw#@?)EcwfF#MV^6TQs!*%| diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/5d/dd0fe66f990dc0e5cf9fec6d9b465240e9537f b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/5d/dd0fe66f990dc0e5cf9fec6d9b465240e9537f deleted file mode 100644 index 9d8691eb231f4bb873bb27c7ba7f170cac33bda3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 43 zcmbfc@eT%#r#wpmh@cW4 diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/5e/b7bb6a146eb3c7fd3990b240a2308eceb1cf8d b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/5e/b7bb6a146eb3c7fd3990b240a2308eceb1cf8d deleted file mode 100644 index aca2666cfbbc4bc54b331124e3fd1219af9ba422..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 268 zcmV+n0rUQN0V^p=O;s>9GGH(?FfcPQQAjK;$5Ep%1PBLsVHH1XTNaA0j~e` z4-``WZskbX%{y7=JXCRVMq*xiYKm@Vo^Dc6VqS6vSi|ZZmqjmJCav{$+?~Cq-PCR_ z)0%Ef4Y`TMC84Fk>(@FfcPQQAo~6%u7#A(ap@$O)5&vOU}?MsVHGso#V3T zh0CP1-j2Jo*R-43&1G8Cjj16wvA86)h@gi2ytJImJK(OvPIRvu)a;_v-25^O$J~GXNqd!i{<#qM2{Hz4yB=rU%f5@L0m(5j))~v?kNk=? z)4$vv7c5+p6}5dSTti-BF3<*31F%~nod50FWYTb-JMOm9BALkJMZ5bn(Nvn7f>kcB z3R^P2-|CUm19kC_eY=nG#2j@-Q)vk?(^Yeh%+d$dyX0?jIJ4$&jr^G{9|cue3JhOx haD$CJ@gZN&debz=lJvTXA6CD*@Wf_bEC3IeppN(ik30YX diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/60/61fe116ecba0800c26113ea1a7dfac2e16eeaf b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/60/61fe116ecba0800c26113ea1a7dfac2e16eeaf deleted file mode 100644 index 3f266f6df1e18d53bc4d5f16806b0f8562c75860..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 87 zcmV-d0I2_X0ZYosPf{>6FlMlU00j?MM;ETV)N+N)JOvZ38VFFxO)W}KO;JeB&&|!x tQ%KB9PAx9UFDmA;g#fq)-J~L*WCoWV1SpggWtL?o=IENhBmkZZBQoJfB8C6} diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/60/91fc2c036a382a69489e3f518ee5aae9a4e567 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/60/91fc2c036a382a69489e3f518ee5aae9a4e567 deleted file mode 100644 index fa63afba1ca8ab9a3ce31f0d78e2a27de4e1a923..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 258 zcmV+d0sa1X0V^p=O;s>9GG#C{FfcPQQAjK;$5Ep%1PBLsVHGc5;`oqI?hAM z{rdDef8NUpvTr_GLlq}yB<7{3rs!to=_VB=<|Su{!Ffqg$O8`Us{WKQApOGr1%)FCDD(iu!|1 z4=nwQCzLNvmJ{9U231;=nwwvS;h6i6KWVR$&p#L9K0(HyZP(+Bd)ap}H6S@A z#yVrU{E=U=X8M=g8-%)vqo*v6&YO I051iBvbQ&TDgXcg diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/61/340eeed7340fa6a8792def9a5938bb5d4434bb b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/61/340eeed7340fa6a8792def9a5938bb5d4434bb deleted file mode 100644 index e830cafe5eff805763300f2b48d7c9200bfda9e7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 92 zcmV-i0HgnS0V^p=O;xZoWH2-^Ff%bxNK8pdP0`KF(@n}R$y(6_CBq$XC diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/61/78885b38fe96e825ac0f492c0a941f288b37f6 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/61/78885b38fe96e825ac0f492c0a941f288b37f6 deleted file mode 100644 index bedc5f27ecdb5d005c8e8c787350359c204911de..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 289 zcmV++0p9+20V^p=O;s>9He@g~FfcPQQAo)w(ls<-$YHy4F*%|}=V12}kMIZE1;s41 zUL&b6V{l&e*LmOa$~Ps3wTBbGL_Pj$w3HP|fjPqh!$n=s`HYu2p7ZYNPZs~Uy7Jx= z69XUsTVcTv(DFyCW82zu3&FX8D n-zfWSNI0ZYosPf{>4F=i;q$ShV!%gjkt0Md!2CHc9jMd_)DNja%p!&M3ZEje5) D!8{Wo diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/62/269111c3b02a9355badcb9da8678b1bf41787b b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/62/269111c3b02a9355badcb9da8678b1bf41787b deleted file mode 100644 index 0edf6599447ee43958038f7768201d1320ca0e42..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 269 zcmV+o0rLKM0V^p=O;s>9GGH(?FfcPQQAjK;$5Ep%1PBLsVHH1XTNaA0j~e` z4-``WZskbX%{y7=JXCRVMq*xiYKm@Vo^Dc6VqS6vSi|ZZmqjmJCav{$+?~Cq-PCR_ z)0%Ef4Y`TMC89V=y!@Ff%bxNXyJg)hnqeVJKV8r;#C9cQE4awd1{Ay!zK| LEq($3HxCdv1CbQA diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/63/247125386de9ec90a27ad36169307bf8a11a38 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/63/247125386de9ec90a27ad36169307bf8a11a38 deleted file mode 100644 index bc2d7384d..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/63/247125386de9ec90a27ad36169307bf8a11a38 +++ /dev/null @@ -1 +0,0 @@ -xÝ;1 D©}Šé¶A‹Vâô\ÀÙ8¬¥àHIVp|²?‰‚ÐLãyO“ÃuN7C] Í¥ƒËlãt¦:iAÐ(xiŒp‚,ÆOñÄæ¡;•æo†7 …UYZ B‡½ß÷ý]ÆdUmÔyk©ô[…½Úc©ñþÍ¥)©ñ!êX{¢¿Zó±ö \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/67/110d77886b2af6309b9212961e72b8583e5fa9 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/67/110d77886b2af6309b9212961e72b8583e5fa9 deleted file mode 100644 index 877bad703..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/67/110d77886b2af6309b9212961e72b8583e5fa9 +++ /dev/null @@ -1 +0,0 @@ -x¥=N1 „©÷î^rœ !J:.`'ûŠlP^×gâT3ú43Ò”Ñûuåp·¦*´Z£ %°ælÙÚ4irœÇH‰·žz,ê³¥ä[‰M]a“J©ÂÒbó5¤lÐ8OùX$XÕ³EaÇ")ŠUïœ$d2zO¸ñçÚÇ„—úųÂÛ>úmð¨'ýqÏýZ渶ÊèO`lF“³Oî1!n'=-ýÇÄöªó]A&e‡Ë¯^¶o––^Ý \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/67/18a45909532d1fcf5600d0877f7fe7e78f0b86 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/67/18a45909532d1fcf5600d0877f7fe7e78f0b86 deleted file mode 100644 index ffda698f0..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/67/18a45909532d1fcf5600d0877f7fe7e78f0b86 +++ /dev/null @@ -1 +0,0 @@ -x¥ŽÑM1 DùNi`‘ǹDBè~è€ǧ]‰Ý ƒöYð7óž4íû¾M8<ÌaæF䬵@Ò˜r*‹Ü85ÆV«±eV÷.Î鉋”0($!“b½UÑ35É—¨¡8¹ÏµÿÒ¾d4ÿºöý£þÉNú“®ö+þÚ£öýÙ#q@€rÉ~àNzžöÏ7Çö¹ÉÛ‚¸Ô!‡®î÷uQu \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/68/c6c84b091926c7d90aa6a79b2bc3bb6adccd8e b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/68/c6c84b091926c7d90aa6a79b2bc3bb6adccd8e deleted file mode 100644 index 1e4b0757413ab8f3a4fe2dbf2ecec68a159d0bfc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 55 zcmV-70LcG%0ZYosPf{?mG-fEtNG(cL$ShXK%U4LwNX$zIa`F^PGJqm!nK`L?T%!s` N!(p(c2LRAl@fd*X7ajlr diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/69/f570c57b24ea7c086e94c5e574964798321435 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/69/f570c57b24ea7c086e94c5e574964798321435 deleted file mode 100644 index 6975f0bab187889e713dbe5de4f82142ae7896e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 266 zcmV+l0rmcP0V^p=O;s>9H)1d}FfcPQQAkWlNlnqs%+t+HEG|hc(krPbVNkZ=lsq}( ztss|o{^xvCt2f<+Chaigr6u{fsYU6jiAg!BV8uy7hhOYd*4uG+_L_E6ySYqjx-m5%IR~GH{JgZB%;b{H zymYYHSJWSDdT0?KWh;8dJfVDXvYhB%H>lY~sk!-O7>>FB_>=Z3`TTPs?h|AT+IBt8 zxR-qwQv;G?VyrWk%OCj_Yo>p>JuX9vt%$dFfcPQQAjK;$5Ep%1PBLsVHGc5;`oqI?hAM z{rdDef8NUpvTr_GLlq}yB<7{3rs!to=_VB=<|Su>F;6I8oGd50*9~fRUTV2+ zVqS`FabhmS;iuCkFYhRfZgSxYdGPA2E7nZ^a(i5`a7|X!_N7n_rNGbt2M*ZTCqCrsS#O%= WSdv~h@x$s@7oOP6iv<87+mri?YJ;Qz diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/6b/7e37be8ce0b897093f2878a9dcd8f396beda2c b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/6b/7e37be8ce0b897093f2878a9dcd8f396beda2c deleted file mode 100644 index c39318683c48cf2f6efd2d7534311546e5f52536..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 53 zcmV-50LuS(0V^p=O;s>9V=y!@Ff%bxNXyJg)hnqeVOSbw%yReJsa>k41B|TnmVLkd LXYDBfM0pYg4$u|k diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/6c/06dcd163587c2cc18be44857e0b71116382aeb b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/6c/06dcd163587c2cc18be44857e0b71116382aeb deleted file mode 100644 index 2f54be818f84403317ba606d205d00e2a67f14b8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 30 mcmb20V^p=O;s>7FfnE@G%zqTF;Or`)XmG+P0mQnOHb7+sVHH{ICjFDQ&R2t zO|E6jXKNqcoptAIA53kMZc1rEPG)jqNotC2W}a?-X;Cp)(}#1~eV%O`zOxPbx2tnL z5jkYH^%+7_QEGWnW=TnE9*UmFWxwyTz5bwhQeEZNe6=r5LdAY|Fg?k-D0)gVQZu18 zy+0`=fA7|Z?u89o?e_2aE`6orEhki$Aeu{4Lbbo89EZD4YOt5FZi)+ zN0RG(CSOVm!N877!!B&MVw`yA{FrSeHzwN`N}cfVqIQx`CsDal@}2WCPNvb&+7 z1vdj8SohlX9w&BpdQN(I@nQF(*N?&$3jKtdU`m`DE*H*yYwDt_WQp=MI$s zs7`ZKoyD0csk%nsVBa?Xh53_n=dYYx!gFW&K?}FG_WSHuHGx%cQ5QP@a+Xv8w^rc4 Q8GhVd(@FfcPQQAjK;$5Ep%1PBLsVHH%P`VYWA! z+-pqcwO^2Nj(9SA6I5|>eqLHmW^zepUOHH*x2o;pEUp*(&n2&0edFlX7R^baQ=m%o zQpA(GGaI=Zf^vM7aA5L>elTZQx diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/6f/be9fb85c86d7d1435f728da418bdff52c640a9 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/6f/be9fb85c86d7d1435f728da418bdff52c640a9 deleted file mode 100644 index a2c8d93ad5351c7bd8d8cb65b82c56b464480bdf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 83 zcmV-Z0IdIb0V^p=O;xZkWH2-^Ff%bx$V)BPP0P$l)hnqeVK}&Lsr2slLqD{|M1&4s p;*R{2xnTmDIwP>cwF_M)c{ZAr%V*wol}J0aXT!_)vjCBvBKOVWCfNW0 diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/71/17467b18605a660ebe5586df69e2311ed5609f b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/71/17467b18605a660ebe5586df69e2311ed5609f deleted file mode 100644 index 02e183144619b23cdaa815ce9571b136b323f1bd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 265 zcmV+k0rviQ0V^p=O;s>9H)1d}FfcPQQAjK;$5Ep%1PBLsVHGc5;`oqI?hAM z{rdDef8NUpvTr_GLlq}yB<7{3rs!to=_VB=<|Su>F;6I8oGd50*9~fRQEF~} z8PqZPB@m~u9~If)Hse7?r?%mV%RxILgm=!#!=fDF_WO@NX|IycKNsRYLB^nM*W-+P z*>^EDAh|upI%B!~kzcW9`j^||f`x0cqP8!EYA6K;2snJeEw diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/71/2ebba6669ea847d9829e4f1059d6c830c8b531 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/71/2ebba6669ea847d9829e4f1059d6c830c8b531 deleted file mode 100644 index dd7d58f1fd9cd06cf97f859c9583c94dbf1bd5be..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 152 zcmV;J0B8Sr0qv4O4#GePMP1J+IDlhtnrN%C4D=K%}in1?r(Csl&(Hz z;et-JW9{C9H)Aj~FfcPQQAjK;$5Ep%1PBLsVHGc5;`oqI?hAM z{rdDef8NUpvTr_GLlq}yB<7{3rs!to=_VB=<|Su>F;6I8oGd50*9~fRQEF~} z8N@M`$j+I=on!Lee3sLVh!6JfEt2`&vnMiPYC&@U{l}lQSIOs}3vr(yW6-wiamKyu zyO XMTvRI8CMc diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/72/ea499e108df5ff0a4a913e7655bbeeb1fb69f2 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/72/ea499e108df5ff0a4a913e7655bbeeb1fb69f2 deleted file mode 100644 index 4886e492e7ec709a9988e222d98d811fc7f13517..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 26 icmb<|&`U#o< diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/74/df13f0793afdaa972150bba976f7de8284914e b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/74/df13f0793afdaa972150bba976f7de8284914e deleted file mode 100644 index cb50e67577cefdd437ad9436689a3a59ec99e4c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 26 icmbÈJ?é$_ñk[ªóQ,ìÑë"€Zéz¶ËŸ3ª·é9¥ë€ê LŽOÊ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/76/63fce0130db092936b137cabd693ec234eb060 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/76/63fce0130db092936b137cabd693ec234eb060 deleted file mode 100644 index f578a4a680a3ea718e8bdda793058aecb3df291a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 49 zcmV-10M7q-0ZYosPf{>8WhlwWELH%bw9K4T1rr60-29Zxw9M2Lh0HvKqRjM+5=|}u HFjWoVCBYV3 diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/76/ab0e2868197ec158ddd6c78d8a0d2fd73d38f9 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/76/ab0e2868197ec158ddd6c78d8a0d2fd73d38f9 deleted file mode 100644 index 4d41ad8cd0441142957aa75ba9b07914728eb842..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 37 tcmb9H)b$2FfcPQQAjK;$5Ep%1PBLsVHGc5;`oqI?hAM z{rdDef8NUpvTr_GLlq}yB<7{3rs!to=_VB=<|Su>F;6I8oGd50*9~fRZhlH; zS|-#r`6UpyTzw-L^iTEWzXOb&uNgMqF1)RBNCK+9C^a{~48!sFAAizbC7*vT#C?K{ zLEEm!8TYd9VroEge2jI*a`_{_V$Jj~x5otw*JMR)UkcSw3Jei&0D+x;;zPck^`>c# VCFyk&KdgRr;fc+>SODQ{mRtGjeQ^K) diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/7a/f14d9c679baaef35555095f4f5d33e9a569ab9 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/7a/f14d9c679baaef35555095f4f5d33e9a569ab9 deleted file mode 100644 index b4c4ef734ec6e6e1d6418f12fb3dc383f053c0d4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 149 zcmV;G0BZku0V^p=O;s>7HDE9_FfcPQQP4}zEXmDJDa}bOW;pdfyVhm8eemN4=M67h zn<~*Qx$YQLSz2aJs-a#åEñ§¯µÁ#}¹%x®µìuƒ« z¸{yÅV÷šû%ÖrƒÉžÇ†·pÖ¨µtíòÇ„ -·¸ÎêUrL \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/7c/2c5228c9e90170d4a35e6558e47163daf092e5 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/7c/2c5228c9e90170d4a35e6558e47163daf092e5 deleted file mode 100644 index 52fde92a14135ddf042413bcc61825ef840ba4ac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 172 zcmV;d08{^X0i}*fP6ROw06FIs{s72{?JN>PT=)SWNN3TsMA|5w(R_cJH*hP}p;Sf3 z*cUhsFKf02zLN`-3I)g2R_Rg1r9_xI#puy@#=t(B-#pu~AjW2+B#YTfsg}0dnWJ#7 zNTG9Nw;^pVnS5V2o$ys3c~)i6%hxC`b6M|YlZVvl$DPu*_@#X)>rtX+g@8yX2QUDl(|)$4 TKW9X%%X9J90ZF_8=h01b0%1%w diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/7f/7a2da58126226986d71c6ddfab4afba693280d b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/7f/7a2da58126226986d71c6ddfab4afba693280d deleted file mode 100644 index 2f833c2924a9765de95b5d05b189c632dc944c5c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 199 zcmV;&067160i{nnPDLRQwPqD`uhI+*!zVGu#?sCWz%Y0%xELPB?TbcNU~_VQImzMC z``gk8{$@=P-Fy*nNo;fsEmbasgClYnBNagcE19fO?|I6(bg7ikMrs_IIL;9{oWZ^ZJi!m}2@%l!Y3%IL#1&`u7 z&-bR$*EaM*Bb%y6K1!$Gbe7++wFB4rq>c5?lLsWdhX9~D?Pr_( Wt??!#h-TBMGTzpE5u-i`{!TB?T2e3o diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/81/1c70fcb6d5bbd022d04cc31836d30b436f9551 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/81/1c70fcb6d5bbd022d04cc31836d30b436f9551 deleted file mode 100644 index 6d8702404f3c9e89089063de15130c0a71f370e3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 169 zcmV;a09OBa0i}-14Z<)GL^->PZ2**wKd~i*xKIH!V6WFoBpf5h5$)sDfHa4hcX%2q zIWG-HB~Ps~gTtg0B2qXawe@72Qa(y;$m1lfMadq;$5&n(Bx7_?nj*WPjU5I@hE14` z!PZgY38$E>@Ozs}g-87Q8sRmUyp(MiH$$j?rCIy{ag0vwTnJ3h diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/81/87117062b750eed4f93fd7e899f17b52ce554d b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/81/87117062b750eed4f93fd7e899f17b52ce554d deleted file mode 100644 index 19cac9faf4a65b1ebae6515b1ea3c58745f85e87..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 170 zcmV;b09F5Z0i}*xYQr!TMEk8(Xaf%Sp{vMHLVmh~Za|M~Y^bfED(UvCmh2#ZGiTs1 zx$gVcEeXB#rfLahEVIiY71jiSrDP$3qM{)sMpz;Wvbn{kN4GNj0Gx!FfTIh7Igrb6 zX76Y4%MkG5VlnaF*V^ny`H8LA&$aH~^|0?c=wG_(|L|<5T=$Db7D7N|vJ-d!Gw3+m Y^+k>8ZF_9-YeF}r7LUA|U!_%0xC}*EumAu6 diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/83/07d93a155903a5c49576583f0ce1f6ff897c0e b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/83/07d93a155903a5c49576583f0ce1f6ff897c0e deleted file mode 100644 index 5a96a4e4e3c624146e03fd75965117b132d562e8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 30 mcmb!yw5#gVhE67`v(BN9tqHv4Ghi?@FfcPQQAkWlNlnqs%+t+HEG|hc(krPbVNkZ=lsq}( ztss|o{^xvCt2f<+Chaigr6u{fsYU6jiAg!BV8!q37w$N~^}qgsLh9eG94WhbC+nOy zF#rOEr2LW$-IUCtVupu8vu%Dy%y{to8ry@@4Vy~i0xl*(4NT5R%u9#3AgL%ZFF6Bj z=;|DoMK4??t@U=?oxP^r)NU@*nr=)DNKO{Kx0+$odm6iz&m9DjO`4*c@m0ePu zB;_7$c_#0A%m3;oW5cdf(25q|@XWYxa3)N5x3>9!7ft`Qi cL%yE%rfH5P>2(u7tbTRjiOsxN0LB=(`fXvqU;qFB diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/84/9619b03ae540acee4d1edec96b86993da6b497 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/84/9619b03ae540acee4d1edec96b86993da6b497 deleted file mode 100644 index 67271ac50..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/84/9619b03ae540acee4d1edec96b86993da6b497 +++ /dev/null @@ -1,3 +0,0 @@ -x¥ŽK -1D]ç¹€Òùv7ÞÀ½t’3‹L$ñúŽâ ÜU½E¥Vë<¤¶v7:³"xç¥K@›R¶ -rÌŠ#Ç"Ôy2[ Xµ5 r2ÆQ´ˆå¨5–”£bŠ=ÇÔº¼æõ,oS«k[ä‰7úIþŠ_;¤VÏRç”?ú`ä<€ØèvvðŸ3"¶1ÝóÜWñEÇP \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/84/de84f8f3a6d63e636ee9ad81f4b80512fa9bbe b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/84/de84f8f3a6d63e636ee9ad81f4b80512fa9bbe deleted file mode 100644 index 32f1461d40d08014636f37123dd8c6aaac836984..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 41 zcmV+^0M`F_0ZYosPf{>4X9&s2ELKR%%t=)M(s`-n3YmEd`N<{uhI(88%DM|2b}JG< diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/86/088dae8bade454995b21a1c88107b0e1accdab b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/86/088dae8bade454995b21a1c88107b0e1accdab deleted file mode 100644 index 623a747f01c770b9e71d758624383a1d6967dfd7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 47 zcmV+~0MP$<0ZYosPf{>8W+=(XEan2DM6R^VoK!B2%shpXj8uihyyVp4lKdh~E&vNJ F4D}Gn7F7TM diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/87/b4926260d77a3b851e71ecce06839bd650b231 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/87/b4926260d77a3b851e71ecce06839bd650b231 deleted file mode 100644 index 91944ffb57fde51caf171042f60e03d565e03f5d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 43 zcmV+`0M!3@0ZYosPf{?lWGKnVEan2DM6R^VoK!B2%shpZwD{u8lvE>4E&$k?3p&Qe B6oUW& diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/88/e185910a15cd13bdf44854ad037f4842b03b29 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/88/e185910a15cd13bdf44854ad037f4842b03b29 deleted file mode 100644 index ae1c5e242c1878b29dce3a1aa7b5372f92c958b6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 177 zcmV;i08amS0iBLPYC|CyguC_>ULZyNpFV|9vdIm)59&XXKz$aUA=j@7IYDPN^9>A> zTdlVtjkO=612QitAdSGtQ$CrrFmVYnW|O(VgkYWa;x~3|LnaglS`z_|Op5EGZP3np za)rDpV550mS;YIewl2^7h@Iv4wbi|C@`y>F?u1wIPM^8eFR95XWyonQ56UYgCY@&o f{xRd7CI6lg^Lebe8XDG?YEan2DM6R^VoK!B2ZC'g$楧¦èfæé&%æ%g€5¬ÎqYôÂeÒZoÇÝÙkÚMíæ2­éÆÔ›X\’ZDPC~^ZNfrIf^:Xéõ›ZHÙŠž1O(_œ,'º× jv^j9È!Ɖ9%`¥<sBÞ§ÝHrèSæ¼3§d ã ¨Ò¢ÔÜü2 wßüI{•|þ¹÷ 2m»gÜ˾‹©ÉÝ1ÖËåüŠ5Ó¿Ü,\“µ})TC)00ÀavʉùzÖ›¦9–¤×Mü°úÕ…'6óbÊå’G \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/8b/095d8fd01594f4d14454d073e3ac57b9ce485f b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/8b/095d8fd01594f4d14454d073e3ac57b9ce485f deleted file mode 100644 index 4ec0138816823c0fad877882b0bf10fff18ddfd5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 201 zcmV;)05<=40i};UP6aUxgsF3ibgu$Aaef>LAsR|LE?_4POOXxATg3HQ5S)N+=9|$- zQ|B0Oheb#?$5OQ&yK^Z>B8gdCDN#}+CQs-=Q|k!iI;(l-rTbx}#e$wkxX#_) z>q)=Wqy7ZH?yk=9U>zm^zzEUa0s)wlp63qz=ZtyQ^{Q4D?{%}6^EVH@`iuDjY}aAH DgREd- diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/8b/5b53cb2aa9ceb1139f5312fcfa3cc3c5a47c9a b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/8b/5b53cb2aa9ceb1139f5312fcfa3cc3c5a47c9a deleted file mode 100644 index f4249c23d..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/8b/5b53cb2aa9ceb1139f5312fcfa3cc3c5a47c9a +++ /dev/null @@ -1 +0,0 @@ -xí± À0 S{Š"2ŽŒd,0²‘^?&S¤HóÕÝŸ[Ï8ï눪E›`Ñ„ËrƒZŠ*êdŒ¥­ÆrlŒ,©± ÙcbF/ ·“¶÷'¿ûågв \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/8b/7cd60d49ce3a1a770ece43b7d29b5cf462a33a b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/8b/7cd60d49ce3a1a770ece43b7d29b5cf462a33a deleted file mode 100644 index 790750c0ff9a54e21953ac1fecb6cd7493827d5f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 82 zcmV-Y0ImOc0ZYosPf{>6GGMTQ00j?MM;ES=jLc$%w9K4T1t6WAk(igBnxc@Ir;wXi oT#{O(keHXEkW`eImz=?63jsKFK$L-XKs0mNK>*AE04{GS3e5!~`2YX_ diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/8b/fb012a6d809e499bd8d3e194a3929bc8995b93 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/8b/fb012a6d809e499bd8d3e194a3929bc8995b93 deleted file mode 100644 index a90ee08ce132010f28ed711bdad9338958303f0f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 34 qcmb@98t1tPJHUoHhU!%MSMd diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/8c/749d9968d4b10dcfb06c9f97d0e5d92d337071 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/8c/749d9968d4b10dcfb06c9f97d0e5d92d337071 deleted file mode 100644 index e42393cf7..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/8c/749d9968d4b10dcfb06c9f97d0e5d92d337071 +++ /dev/null @@ -1,2 +0,0 @@ -x¥ŽAB!C]s -. a€ùcÜx÷f`†|_ b¼¾h¼»ö5mšëº^»¶ÞmzÑÙL“`ð”}$26#"8°ÅÆ`s.`Ԛܺ.!bH\<» i´"Á,K¦œ8¯èÙ—Úô‰_ÔXŸ—º>êMïeÐ:Ê7ø¹]®ëAƒC40ÏÞë­™ŒQƒŽ³]þœQ\.Ä,¬ÞVO  \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/8f/4433f8593ddd65b7dd43dd4564d841f4d9c8aa b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/8f/4433f8593ddd65b7dd43dd4564d841f4d9c8aa deleted file mode 100644 index d2de777ccdec25efd39427d93f9d31fbb6850225..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 164 zcmV;V09*ff0i}*n3c@fDME%Ywa)HVw>824x{P6}}V7t4a1#2Wmy}nhvfqyga!7yBw zWp38@xM@|@k`N;GD6U682nWeLxL(O|MDgl0=26pNZdCQ!EJqkJ2S_Ps2q>C;Vu>k^ z=yK#t;75qch8}Gy)t=-D60 diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/90/a336c7dacbe295159413559b0043b8bdc60d57 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/90/a336c7dacbe295159413559b0043b8bdc60d57 deleted file mode 100644 index 35453ebfd5d3284e933cfe2358d17e7f9fe4cff6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 271 zcmV+q0r38K0V^p=O;s>9H)Jq0FfcPQQAjK;$5Ep%1PBLsVHGc5;`oqI?hAM z{rdDef8NUpvTr_GLlq}yB<7{3rs!to=_VB=<|Su>F;6I8oGd50*9~fRZhlH; zS|-FbhQ?skGXLitTT&HV+;H#yUGbC8b4yfbX+u>PrRL_BVL1K%<4@YF9Ghr|^FfcPQQAkWlNlnqs%+t+HEG|hc(krPbVNkZ=lsq}( ztss|o{^xvCt2f<+Chaigr6u{fsYU6jiAg!BV8!q37w$N~^}qgsLh9eG94WhbC+nPt zDo)Nw%u9!uo>Y{Wmz)9CusX+O(F>PJYrP$JXRm2DwVTVdrW;cOl5_UX*>aYvoM-3S z)A8pN6`kHYypl16X~@q@%gIbG$;?X!o9)+;m!PV7YUOId>+)^M-WRt$xF-NrnwMG* z@@85ZSfQEsKA#sn)tBXx+3!5Bb$k4L(Mncx6@%~Lw3ea>7oH3@vq#L$0?;}ZZT_z%7HDE9_FfcPQQP4}zEXmDJDa}bOW;pdfyVhm8eemN4=M67h zn<~*Qx$YQLSz2aJs-a#8A4N0YI#v+Nl9uRik`=1zwffW{-AhLUFFt%wJ%OW#eQ}$J;}N#dP*`>1-*CQ1Do%c zw%oXAb-*BaB9Aa5P9wnHyKp7aPwdmfiR_Pm)h)BDTJ_%`{x?iV640q2JHY`0u?5Lm zcnH0ns{BmP)h^)f?1u?iA1BY;nP*vr#|W^s+VS!da*wz6Ef4&9H@1JaOQ^y^GpHUT zWUnUWmt=r7h<7?{3HW5OG>5lz`_!1N)fSSHO;8QSn1Pd$nv;qdIufT1vt`~d__1tC zKA(bApHzNJ)J~`wCYWX}F5$Ve{Gf$fTl;->teU`9Y*80F Z|8ka80Jm1)zZrhqUFA%>1OY*1MnrK80~P=P diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/93/77fccdb210540b8c0520cc6e80eb632c20bd25 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/93/77fccdb210540b8c0520cc6e80eb632c20bd25 deleted file mode 100644 index 4b2d93b07de774c1c0c7aa7cf266e6034d4ac9b2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 53 zcmbXvEU#p|pKHt;UtbER6gj5# d+XD%?D8yil28|jcL2~arFGPE?-~;t=8hU`!AFKcX diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/95/646149ab6b6ba6edc83cff678582538b457b2b b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/95/646149ab6b6ba6edc83cff678582538b457b2b deleted file mode 100644 index de9ba2894..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/95/646149ab6b6ba6edc83cff678582538b457b2b +++ /dev/null @@ -1,3 +0,0 @@ -x•ŽM …]s -. ™ÃObŒoàÞ eH»h1ãõEÓ ¸{?y_ÞX–enR}h•Y* üHFS -€S ž!$À1…¨Å“*¯M’³˜£wUv4ôIt:ª„è²ÏÞ8KFEA¯6•*oéM5ÉûT–­¬òÌ=ýª+ÿŠÝƲ\ä Ñ CVÁˆžö³ÿÆà`ƒnLj”ÛœX‰iO\ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/95/9de65e568274120fdf9e3af9f77b1550122149 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/95/9de65e568274120fdf9e3af9f77b1550122149 deleted file mode 100644 index e998de849c865efaac9d2aa5e89b23d36dc55a4f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 40 ycmV+@0N4L`0ZYosPf{>4VF*gi%`Zz$QOL|wP%kOUEXz#H(X~+5;{pJy9|`qUiV=bU diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/96/8ca794a4597f7f6abbb2b8d940b4078a0f3fd4 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/96/8ca794a4597f7f6abbb2b8d940b4078a0f3fd4 deleted file mode 100644 index 359e43a8834a5bd911de3f1c2c258301ab22eff6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 53 zcmV-50LuS(0V^p=O;s>9V=y!@Ff%bxNXyJg)hnqeVL0Ctb7Do5{MRMB0w3(D`I;7% LIms6QRPquG^QRP3 diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/96/bca8d4f05cc4c5e33e4389f80a1309e86fe054 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/96/bca8d4f05cc4c5e33e4389f80a1309e86fe054 deleted file mode 100644 index 8938d3e56b81ad02b42bf21a2c3a32ed9b859b59..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 149 zcmV;G0BZku0V^p=O;s>7HDE9_FfcPQQP4}zEXmDJDa}bOW;pdfyVhm8eemN4=M67h zn<~*Qx$YQLSz2aJs-a#0uWap4Diz;zszLmJcu@qGf~2i$gNrO`?) z<=!j~Zr4^-n`q=TA|rSV(Ps$=PLT5v91y1g6T*0$%!5~5nw0=!7J?W_iG0$GQBsIu z@-7F-3^+khG5l;*Rs{cp0v|Xy6AWKwS&}hwvN2>VE`h#2M=I6?Pr_* OsWFAOE-`NlT~2zA6-V&^ diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/98/ba4205fcf31f5dd93c916d35fe3f3b3d0e6714 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/98/ba4205fcf31f5dd93c916d35fe3f3b3d0e6714 deleted file mode 100644 index 6f5e97978..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/98/ba4205fcf31f5dd93c916d35fe3f3b3d0e6714 +++ /dev/null @@ -1 +0,0 @@ -x-ŒÁ Ã0 ûÖ ÐþºG% È…­"ë×Mú!@yÉjÂýñ¼½Šv¬j‚¢:ïAÜÁ‹ÂAÇèM~dú¹­ãÐ{.3Ñ);ÔlÂç]vi›ú6Á„D%þ «¯¦9fú|.z \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/98/d52d07c0b0bbf2b46548f6aa521295c2cb55db b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/98/d52d07c0b0bbf2b46548f6aa521295c2cb55db deleted file mode 100644 index c8d636e8b..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/98/d52d07c0b0bbf2b46548f6aa521295c2cb55db +++ /dev/null @@ -1,3 +0,0 @@ -xíA -€0=÷y„}NË®taÝJ[ï -ú/^r“’´$ŒÓ<ô, ‡¨"1*[\™ †žYj Ñ‹(;Ôóm£9ƒ oNŒxcëz"1ï(»7„áy÷Û—.øõ®þ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/99/b4f7e4f24470fa06b980bc21f1095c2a9425c0 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/99/b4f7e4f24470fa06b980bc21f1095c2a9425c0 deleted file mode 100644 index 01ad66eaac30ec303895cc9307a6615643841fba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 164 zcmV;V09*ff0i}-J2?8+?gndpGX+YT|o826U_+ke(ke@y7z%vq~w(lu+AoDWw4Gfd( zvdmpu#7%D^8j82#qW2^w3@O5ZA&MssFqiU1gvn6l;FvVV4AlmmAqK0eCQ8OvCmwO-dzaCdRP&IE4m^aM2omO~ zEt&v879AQ@K*VRC+A1&Q71tuKQ(Lxnmq#A-9WH2-^Ff%bx$V)9}crt%twM(zC!)DpCr{0S@)cUWSR006| Gr4E*%ITSzu diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/9c/0b6c34ef379a42d858f03fef38630f476b9102 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/9c/0b6c34ef379a42d858f03fef38630f476b9102 deleted file mode 100644 index e6f8500790efd5b74d9339fbc567300bb5719056..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 38 ucmbqhTS#F!Zm<7~gOe4TPyl^GbPwdmfiR_Pm)h)BDTJ_%`{x?iVl5SpVImlLo_mHfG z2a<}E0PES=GuVwvq)RNKI|ZHg?9#wv1lU^bczFrA$6NcB2Y$U9+dtbSRAHeRRF4s| ztx5SM8DI_Koeo<9K3Ocy;Vs=hHD+tIg`{K?RD&@#cc!G~q(Z|7?oczu*`8*FZm0FK zL_@c(e0}ADQOi`Q879Egg77OifD=2C>;QpgL)Th!1s?za diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/9e/fe7723802d4305142eee177e018fee1572c4f4 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/9e/fe7723802d4305142eee177e018fee1572c4f4 deleted file mode 100644 index c63fc2c969e292d9cd3aad9e53818bb4a8d7acf8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 36 scmb7FfnE@G%zqTF;Or`)XmG+P0mQnOHb7+sVHH{ICjFDQ&R2t zO|E6jXKNqcoptAIA53kMZc1rEPG)jqNotC2W}a?-X;Cp)(}#1~eV%O`zOxPbx2tnL z5jkYH^%+7_QEGWnW=TnE9*UmFWxwyTz5bwhQeEZNe6=r5LdAY|Fg?k-D0)gVQZu18 zy+0`=fA7|Z?u89o?e_2aE`6orEhki$Aeu{4Lbbo89EZD4YOt5FZi)+ zN0RG(CSOVm!N877!!B&MVw`yA{FrSeHzwN`N}cfVqIQx`CsDal@}2WCPNvb&+7 z1vdj8SohlX9w&BpdQN(I@nQF(*N?&$3jKtdU`m`DE*H*Rxi8;LSX6a6G1H*> z$3iI!s0n7epg4o497Elbd|e|%cDnJad|R_Y)4^9}+nc%~bbXvVR05zn%~5q0XQrg; z8i9j-+x!>iPtKjca&igJo#h8D+}hgjvt!i+R=q`C=={rBQUTmrf&XUsad(w7?Ggk4 HRR@?)?dUH% diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/a0/31a28ae70e33a641ce4b8a8f6317f1ab79dee4 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/a0/31a28ae70e33a641ce4b8a8f6317f1ab79dee4 deleted file mode 100644 index a6c05d1821889a71bfd029059b1ff84cf2992a7f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 37 tcmb+2;a~44FIfP3wHnj diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/a3/fabece9eb8748da810e1e08266fef9b7136ad4 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/a3/fabece9eb8748da810e1e08266fef9b7136ad4 deleted file mode 100644 index 24d7dbc2eb253f6470cb837fbe8b70361e5b6e94..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 164 zcmV;V09*ff0i}*n4#FT1ME&LzT%cxwT?&aY{&)i~04z^>ZTZmRHC0XtU2$<{N~$4PwW*`@@A9)cM+`qNu+sJ{dpl+8B}V{{JS3 diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/a4/3150a738849c59376cf30bb2a68348a83c8f48 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/a4/3150a738849c59376cf30bb2a68348a83c8f48 deleted file mode 100644 index 06ae09eb6d090f5a394cd7c39882de7d68e82565..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 162 zcmV;T0A2rh0i}*h3IZ_@L|x|;xxh#|pY8-i+;{^okWUZeA`^)bukVa_1F22bD<~?r zTJJ+@YYw9`OI4g^6P-f_A5v7o`p6E+s{mdBWJrKi#3OcIhny)Jqf@cF5)m219N89a z3!o=U8VJOMSELH%bL(MnP87o`X?VaJJb+r$_3V(p YF=%}9$^0;?)C(;vkI}k%17&AXZjo(N>Hq)$ diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/a7/7a56a49f8f3ae242e02717f18ebbc60c5cc543 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/a7/7a56a49f8f3ae242e02717f18ebbc60c5cc543 deleted file mode 100644 index 76dd5f91b42a319c9ab512351b355f50e2cbeaa7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 65 zcmV-H0KWft0ZYosPf{>4wqz*D$ShV!%gjkt0Md!2CHc9jMd_)DNja%p#7dc)swxy` X=4R$377?w7Je%<7BGM56^gmd;=`kMA diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/a7/dbfcbfc1a60709cb80b5ca24539008456531d0 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/a7/dbfcbfc1a60709cb80b5ca24539008456531d0 deleted file mode 100644 index 67126c90b..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/a7/dbfcbfc1a60709cb80b5ca24539008456531d0 +++ /dev/null @@ -1 +0,0 @@ -x¥NË !õL4 a˜ÀÄ/vàÝð²{`1,ÆöEcÞÞ?/ÖR–.õ„»Þ˜%3$“ÁL15fe53'4Á2ÅÃ7^G1yBGV…LAGä Ù*‘ôä|R) ÿìsmòš^¾%y›kÙê*O<Ôºð×ø±C¬å,‰À’{e”Cg;ÿ9#R¾oKboœ³NÀ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/a8/02e06f1782a9645b9851bc7202cee74a8a4972 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/a8/02e06f1782a9645b9851bc7202cee74a8a4972 deleted file mode 100644 index d39034b82f3cd141006946fc99129f860142c13a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 172 zcmV;d08{^X0i}*zs=_c3Mt#mIW&=ty?c@h87hl|g8%QP-S}={I5w~w#gKr-PzQf^K z%GLoFf9g#HQZ#6EuxyBJPR2UIiG7SFBQKU5hUg`cdWI(ZIL;meroikaM=}_lnJF2v zKF5WeCC!#8s_^P-ZE#EP&=TC&T8_HIpA7n4*RpY|N6r1hwfuvghe8usg!4qxqy`ZC'g$楧¦èfæé&%æ%g€5¬ÎqYôÂeÒZoÇÝÙkÚMíæ2­éÆÔ›X\’ZDPC~^ZNfrIf^:Xéõ›ZHÙŠž1O(_œ,'º× jv^j¹nb^ŠnJfZZjQj^ XÃû#3ƒ|>²^Uó:þ'äAÝÔ2¿†R¨†¢ÔÜü2 ×ßüI{•|þ¹÷ 2m»gÜ˾‹©Éõ1ÖËåüŠ5Ó¿Ü,\“µ})TC)0HÀ!vʉùzÖ›¦9–¤×Mü°úÕ…'6óbG–x \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/a9/0bc3fb6f15181972a2959a921429efbd81a473 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/a9/0bc3fb6f15181972a2959a921429efbd81a473 deleted file mode 100644 index 91113ee8e..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/a9/0bc3fb6f15181972a2959a921429efbd81a473 +++ /dev/null @@ -1,2 +0,0 @@ -x¥ŽK -1D]ç}¥;ÿ7ÞÀ½dÒ=Œ‹‰¯ooà®^UQT®¥\;hk6½‰@¦™Â‰gŒ §5r’èƒÑ“–Œ]uOMnòdgÄz›&ÒècÆ圈õ¨'•ž}­ NüJá¼Öò¨7ØËp?ê(ßàG»\ËÈ8‡¼CØ¢GTÃg»ü9£x¹$faõxN" \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/ab/40af3cb8a3ed2e2843e96d9aa7871336b94573 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/ab/40af3cb8a3ed2e2843e96d9aa7871336b94573 deleted file mode 100644 index 7da1da656f6ab89f34f15cc1162a92b04458e657..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 161 zcmV;S0ABxi0i}-74FVw$ME#};8qjbo%VA=SKXzaPu{8eW`=4h z_pYsjU2n`9B}vL;Tyjj&c|j*GAVeUHQzo`SaPp`gvGLk9c{2-v2>}=YGm8zBeeek< z@g&jMWIU6K&%V^AulW^Q*0-gWt*-jSgMQS7zroKPsFt&y0AW6kb*uNr8>0ptXFLB{ PqsH@Cc(dva#nMn^m!eK? diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/ab/6c44a2e84492ad4b41bb6bac87353e9d02ac8b b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/ab/6c44a2e84492ad4b41bb6bac87353e9d02ac8b deleted file mode 100644 index d840c1a573d3e52ace510582218e0665a8806093..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 33 pcmbL(MnP87o`X?V;(m3biX?o>}lPD{Lxft&)08*I{F#rGn diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/ac/4045f965119e6998f4340ed0f411decfb3ec05 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/ac/4045f965119e6998f4340ed0f411decfb3ec05 deleted file mode 100644 index 4c32d63f82cfe08f3000fc0e168eecba1dc7b0f0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 29 lcmbqAVHe6d<3@-YxwD_&{vHf8as0uef&HIc^ZK?O8SP)n#a zC#sN*QzE_R(uaJMPZ~u&m)`ci$txfBNB6eU=zFj8LcQH2U{nAYf|F+zloE$MMkoJ~ M5M0(NzIgIWH$$69`v3p{ diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/ad/26b598134264fd284292cb233fc0b2f25851da b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/ad/26b598134264fd284292cb233fc0b2f25851da deleted file mode 100644 index 5819a2e25d60c4e46c1112a74388a4b2eda38dd3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 43 zcmba1HPtzw#6SstU_@319^bI_5CfGyE>x}og2TTkvog}pZlWh_T diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/ad/a14492498136771f69dd451866cabcb0e9ef9a b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/ad/a14492498136771f69dd451866cabcb0e9ef9a deleted file mode 100644 index 71023de39026af7107281ddc0c3d94fff9b5fa31..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 39 xcmV+?0NDR{0ZYosPf{>4WhlwWEan2D#Jv2HjMO59ywq~8w9K4TE&#U}3f_356G;F7 diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/ad/a55a45d14527dc3dfc714ea1c65d2e1e6fbe87 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/ad/a55a45d14527dc3dfc714ea1c65d2e1e6fbe87 deleted file mode 100644 index 3091b8f3d..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/ad/a55a45d14527dc3dfc714ea1c65d2e1e6fbe87 +++ /dev/null @@ -1 +0,0 @@ -x+)JMU067d040031QH,-ÉÏM-JOMLÊIÕ+©(aH:,»:ÎCÉýúô:ÞË ²o>ZC'g$楧¦èfæé&%æ%g€5¬ÎqYôÂeÒZoÇÝÙkÚMíæ2­éÆÔ›X\’ZDPC~^ZNfrIf^:Xéõ›ZHÙŠž1O(_œ,'º× jvn~JfZ&Ä5†Æ`ÕÆnלU7Ï V.6™t6ôÇL/•R¨ê¢ÔÜü2 §ßüI{•|þ¹÷ 2m»gÜ˾‹©Éé1ÖËåüŠ5Ó¿Ü,\“µ})TC)0<ÀÁvʉùzÖ›¦9–¤×Mü°úÕ…'6ób±N’* \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/b2/d399ae15224e1d58066e3c8df70ce37de7a656 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/b2/d399ae15224e1d58066e3c8df70ce37de7a656 deleted file mode 100644 index 20fa838f2..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/b2/d399ae15224e1d58066e3c8df70ce37de7a656 +++ /dev/null @@ -1,2 +0,0 @@ -xíQA1ôÌ+x€ÙÄ‹‰Ï¡-kI*5”f¿/»zõîÁ af˜!¤Ö^/·“W¸Jcܤ5LŒÆ›‰;+ŠBŸ6ÎHZP|`îóh>\(óÙ$“sà´î•íX·@š¢75€}57¹K -¯µ+= ;g—® @нÒ!¬4Úè!Œ,\$\ \Âb/±ÉHsø©#þa¾¼÷QÄß \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/b4/2712cfe99a1a500b2a51fe984e0b8a7702ba11 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/b4/2712cfe99a1a500b2a51fe984e0b8a7702ba11 deleted file mode 100644 index 2820b46cc..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/b4/2712cfe99a1a500b2a51fe984e0b8a7702ba11 +++ /dev/null @@ -1,5 +0,0 @@ -xíA -À {öû†Bé{M1  ¨¥ß¯>£PØËË–‹3ŽýÜFÖŽ7Á¥E02 †Ûý¶‹XŽ0üš¹Ì’ê,)ë$;:¯‚­Ü·îþÍÆ(óä: \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/b6/f610aef53bd343e6c96227de874c66f00ee8e8 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/b6/f610aef53bd343e6c96227de874c66f00ee8e8 deleted file mode 100644 index fb102f15dc5a37b8cdedca9064e37463ec832a2e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 162 zcmV;T0A2rh0iBLZ4gw(%L|t^KaPNA+>svYC+{40y?<|1Q3(XvxEQB QSll$CrO~YT09BApVed#rm;e9( diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/b7/a2576f9fc20024ac9ef17cb134acbd1ac73127 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/b7/a2576f9fc20024ac9ef17cb134acbd1ac73127 deleted file mode 100644 index 22f2d137d4d55d218d30aa0f04ca3aece24a4c96..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 320 zcmV-G0l)ru0V^p=O;s?quw*baFfcPQQAkWlNlnqs%+t+HEG|hc(krPbVNkZ=lsq}( ztss|o{^xvCt2f<+Chaigr6u{fsYU6jiAg!BV8!q37w$N~^}qgsLh9eG94WhbC+nPt zDo)Nw%u9!uo>Y{Wmz)9CusX+O(F>PJYrP$JXRm2DwVTVdrW;cOl5+&_t!CJCdD+*+ z?3NvCSb21-(?TD?H00-{|BDN`YPmhXB}ZCqCrsS#O%=Sdv~h S@x$s@7oOP6iv9He@g{00M=S%pzSw1BS`vf6i_a2;uHwRXCH^@H$yXVXrDe zff>WJp5;@PMAp}5?cTKGro$HYE`Iwf2zhe`uc-mA&rCn3v`OD}eRb394F(sOzar!< z7y?@UXmxDcyQ_Dn_2sEn{rV%FFfn3DqYLL z!njBdS%onJv)-Pl9kEk`cT3dTT;VAFue{9e04HDWL{FfcPQQAjK;$5Ep%1PBLsVHH1XTNaA0j~e` z4-``WZskbX%{y7=JXCRVMq*xiYKm@Vo^Dc6VqS6vSi|ZZmqjmJCav{$+?~Cq-PCR_ z)0%Ef4Y`TMC8#9Cq(LG5y$& zWteJBz-m9utKT{yRA8zyPon4P=lXgRS(Z|BDN`V0k4sWo@CqCrsS#O%=Sdv~h@x$s@7oOP6ivg+xyA;@=`73 z-nE3VMxwM%u7#AQOL|w$W1IRNiE_^%qh-SKoU+%(@iQ$%uCMT J0szul5x^+`6>4GG#C{FfcPQQAkWlNlnqs%+t+HEG|hc(krPbVNkZ=lsq}( ztss|o{^xvCt2f<+Chaigr6u{fsYU6jiAg!BV8!q37w$N~^}qgsLh9eG94WhbC+nPt zDo)Nw%u9!uo>Y{Wmz)9CusX+O(F>PJYrP$JXRm2DwVTVdrW;cOl5+&_t!CJCdD+*+ z?3NvCSb21-(?TD?H00-{sGnKH|N-zXI~50WN2al z1PW=HP%r22o4+Hb?fOOM_@dq=5_|s#9dlR-HK8aqH@^(S%l99D(q1K>e=fv*f{a1i uuE!bovhPAQlmdeV974GGQ<@FfcPQQAkWlNlnqs%+t+HEG|hc(krPbVNkZ=lsq}( ztss|o{^xvCt2f<+Chaigr6u{fsYU6jiAg!BV8!q37w$N~^}qgsLh9eG94WhbC+nPt zDo)Nw%u9!uo>Y{Wmz)9CusX+O(F>PJYrP$JXRm2DwVTVdrW;cOl5+&_t!CJCdD+*+ z?3NvCSb21-(?TD?H00-{e=fv*f{a1i uuE!bovhPAQlmbHq97tg2pZJikXT52fV@Z15#1E@qU3g+MFBSk{8W+=(XEan2DM1{Q6a)q?aoK!B2%shpZwD{u8lvE>4E&vVI F47C%Q7E}NL diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/c3/5dee9bcc0e989f3b0c40f68372a9a51b6c4e6a b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/c3/5dee9bcc0e989f3b0c40f68372a9a51b6c4e6a deleted file mode 100644 index d22b3b23cac60ba521d25c4293898064c0ae1593..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 162 zcmV;T0A2rh0i{k`4#FT1^qW&~ftoGLqa?=o;|;t3EKAzN7K5nQ7mYXYZ(f-hD(kv5 zskGj;$}Ckjeo}g3Cd#B78wy${pS;BhvrU#qs^ttb9#lE3FlQ*q$ShVU&&>GO3h2mO-)hA%u~oOEh^?p%u7*7 ZP01{Q2$f`{W&#DdMzzpB!~n^9kr}|f9F710 diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/c4/efe31e9decccc8b2b4d3df9aac2cdfe2995618 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/c4/efe31e9decccc8b2b4d3df9aac2cdfe2995618 deleted file mode 100644 index c7572d5bc5eb9063222d584fc3d15e6d3e8c78ea..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 538 zcmV+#0_FX90V^p=O;xZkF=a3`FfcPQQ7}l<&CAzK&PdElPt_}_C}GGrcEX!eQtkLn zu4T(-Yaia7b?0m!Ol^{GN@+n(W^!UlYKm@Vo^F0=Q88H4hjZF}o^2eyvkm&Ut8+dP zIb^r>8A4N0YI#v+Nl9uRik`=1zwffW{-AhLUFFt%wJ%OW#eQ}$J;}N#dP*`>1-*CQ1Do%c zw%oXAb-*BaB9Aa5P9wnHyKp7aPwdmfiR_Pm)h)BDTJ_%`{x?iV640q2JHY`0u?5Lm zcnH0ns{BmP)h^)f?1u?iA1BY;nP*vr#|W^s+VS!da*wz6Ef4&9H@1JaOQ^y^GpHUT zWUnUWmt=r7h<7?{3HW5OG>5lz`_!1N)fSSHO;8QSn1Pd$nv;qdIufT1vt`~d__1tC zKA(bApHzNJ)J~`wCYWXNG>uS)7@Ys%r#x@V5Cc%%7Y)f92#7o;%AATDY~f-)G0F39NdH cy3qNTv!nvJwF3Xm@Z;_(XWAtQ0Q_A_2K7t`WdHyG diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/c5/0d0f1cb60b8b0fe1615ad20ace557e9d68d7bd b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/c5/0d0f1cb60b8b0fe1615ad20ace557e9d68d7bd deleted file mode 100644 index a1d5321e8..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/c5/0d0f1cb60b8b0fe1615ad20ace557e9d68d7bd +++ /dev/null @@ -1 +0,0 @@ -x¥ŽKj1D³Ö)t˜–4ê–À˜l|ï>-f ‚¯9äÞU½‚â¥Vë6¤¶ô1:³Ì¸èè‰ !ÆüÀå>Z.¼P…0“x„Îû‘ ²¡h˜ÑèhQÖ+tÎ`1NÎZe¢,ÂÏX[—×ü =ËÛÚêÑvyæI_é‹ÿ†ÿvJ­^¤2 í$?ÁˆI§ìà7oÄ4•ï©íå{Kã>VÞú!~|”U= \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/c5/bbe550b9f09444bdddd3ecf3d97c0b42aa786c b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/c5/bbe550b9f09444bdddd3ecf3d97c0b42aa786c deleted file mode 100644 index 2f2ada732bb550a444b455b69cd88602c3d67f07..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 269 zcmV+o0rLKM0V^p=O;s>9GGH(?FfcPQQAjK;$5Ep%1PBLsVHH1XTNaA0j~e` z4-``WZskbX%{y7=JXCRVMq*xiYKm@Vo^Dc6VqS6vSi|ZZmqjmJCav{$+?~Cq-PCR_ z)0%Ef4Y`TMC8,‚aò¢ìf<EZÈÍÉȳ¯µÁ5½¤%¸­µ<ê'ô“.ú¿vˆµœ,;ë]€=2¢tœwýsÆä-÷,wóÊ8@° \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/c6/92ecf62007c0ac9fb26e2aa884de2933de15ed b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/c6/92ecf62007c0ac9fb26e2aa884de2933de15ed deleted file mode 100644 index ae430bd4afba7895c20f6edf0ded1ed7cfc1fac1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 40 wcmb_-c8b@je%D{V@~65^K(h082;^T>t<8 diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/c8/f06f2e3bb2964174677e91f0abead0e43c9e5d b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/c8/f06f2e3bb2964174677e91f0abead0e43c9e5d deleted file mode 100644 index 5dae4c3acfaa6a68557540b75781f0684061f48d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 45 zcmb1a-}BM%t|iLpQ@5E3@i_MjRCl> B5-|V( diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/c9/174cef549ec94ecbc43ef03cdc775b4950becb b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/c9/174cef549ec94ecbc43ef03cdc775b4950becb deleted file mode 100644 index da8dba244..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/c9/174cef549ec94ecbc43ef03cdc775b4950becb +++ /dev/null @@ -1,2 +0,0 @@ -x¥ŽQ -Â0DýÎ)rÊf“nSñÇxífCÛHŒx}«xÿfÞÀc¤,˵Y ´kUÕbïò8‚pÔu`%—|@rä3GtBÀ™;W]›‚!‹‡½zß'Í%Q¤iÓdœ€T ?Û\ª=§×d/sYeµÝè'ô;üÚ^Êr´Î÷#l`6ºmú§Æ ßZ7U^e6oVòO´ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/c9/4b27e41064c521120627e07e2035cca1d24ffa b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/c9/4b27e41064c521120627e07e2035cca1d24ffa deleted file mode 100644 index fd1ec9fab86ffc33f034346301fe738c72bafa5d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 162 zcmV;T0A2rh0i}*h3IZ_@L|x|;xq#B?NvCH(#Emy_FZpzsS&WfP#OoWy8@Q`_1&@kl zU6-cO4!c%GbfVyLoE*gooj0Lp5lap%hRMP>28xu>sE4m|Z#r27&dgmv072p~kPntQ zPl%jj3PzBPSN_@NQuQUhd`Ti}ylK=n! diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/ca/b2cf23998b40f1af2d9d9a756dc9e285a8df4b b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/ca/b2cf23998b40f1af2d9d9a756dc9e285a8df4b deleted file mode 100644 index 32ba2aa53a6f19f21a89b0dc13c6e221ea00f81d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 40 wcmb7-s7w2Zl(JJfmRniF`=WS>qk5dtT)>G!ul%4q|lT92TiIa-m2w zno3+V*cnJz<>y%Xs?X(>*P<^=Z;yV{2ifQ+o#ZQiZO^?OwQ*=tjEP83fB5oQ1Y diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/cc/338e4710c9b257106b8d16d82f86458d5beaf1 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/cc/338e4710c9b257106b8d16d82f86458d5beaf1 deleted file mode 100644 index 85b3b8112..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/cc/338e4710c9b257106b8d16d82f86458d5beaf1 +++ /dev/null @@ -1,2 +0,0 @@ -x¥ŽK!]sŠ¾€†æ3`bŒoà »ÉÌ1 Æë‹gpW©E½G­Öm€±x]“ˆ˜Èù6d -ûƒçeaŽÎ‰ç¢µz¥.ϬŽDv Ù[êhŽ¥äD³[´Jﱶwþ¤ÎðX[ÝÛ.2ínu£ÞöVƉZ½Ú³F´!x8ê8÷¦G‡ü‘PÂÛP_’?KN \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/cc/3e3009134cb88014129fc8858d1101359e5e2f b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/cc/3e3009134cb88014129fc8858d1101359e5e2f deleted file mode 100644 index 9a0cb7a0c..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/cc/3e3009134cb88014129fc8858d1101359e5e2f +++ /dev/null @@ -1,2 +0,0 @@ -x¥Ž] -Â0„}Î)ö•Íß&_¼H“ -ØFbÔë[Åø6ó}0LªË2wPÆìzc†’­Ë*“sXbö‚ Rt”®#Gë$‰[l¼vH„®$ÞkÖÚf.ʧLžF+ ¥QHœD|ô©68çWl.S]îu…oô“Nü¿¶Ou9‚ÔVa0^ZÅF·³ÿœ½ÍÏ9^#Þ ØOd \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/ce/8860d49e3bea6fd745874a01b7c3e46da8cbc3 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/ce/8860d49e3bea6fd745874a01b7c3e46da8cbc3 deleted file mode 100644 index 860f9952f115c5613a9ad3706050f35c37da9b38..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 48 zcmb3Ghryn$ShVU&&>GO3h2mO-)hA%u~oOEh^?3l^k+` J002O@s4gWp6x09! diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/d2/f8637f2eab2507a1e13cbc9df4729ec386627e b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/d2/f8637f2eab2507a1e13cbc9df4729ec386627e deleted file mode 100644 index 558a8513fd0e24e1957965d5b64174e87018989e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 268 zcmV+n0rUQN0V^p=O;s>9GGH(?FfcPQQAjK;$5Ep%1PBLsVHH1XTNaA0j~e` z4-``WZskbX%{y7=JXCRVMq*xiYKm@Vo^Dc6VqS6vSi|ZZmqjmJCav{$+?~Cq-PCR_ z)0%Ef4Y`TMC8AVK6i>Ff%bxNXyJgHPkDqC}H@zm8W$@&6^UR-xF m%!g?*k|HCpBG0)$#6{!0@7m-&oU~jg=u2Z`lK}wRQy>;UUn6<| diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/d3/7ad72a2052685fc6201c2af90103ad42d2079b b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/d3/7ad72a2052685fc6201c2af90103ad42d2079b deleted file mode 100644 index b2f39bff413f61faf64377a96e8132790ec9911e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 233 zcmV5H)Aj~FfcPQQAjK;$5Ep%1PBLsVHH1XTNaA0j~e` z4-``WZskbX%{y7=JXCRVMq*xiYKm@Vo^Dc6VqS6vSi|ZZmqjmJCav{$+?~Cq-PCR_ z)0%Ef4Y`TMC8L(MnP87o`X?VSG5BY&Jp}-?)eH9k diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/d5/a61b0b4992a4f0caa887fa08b52431e727bb6f b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/d5/a61b0b4992a4f0caa887fa08b52431e727bb6f deleted file mode 100644 index a7921de43c86dc803ee6c2958286aec2d7c0c8d0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 81 zcmV-X0IvUd0V^p=O;s>AVK6i>Ff%bxNXyJgHPkDqC}H3f-z_?I+PWo|rhaLyU0&Be nZS(OvNQ#WWitf$|=P_Y;_MrO6^;FqBg$Y{Wmz)9CusX+O(F>PJYrP$JXRm2DwVTVdrW;cOl5+&_t!CJCdD+*+ z?3NvCSb21-(?TD?H00-{yi7R zYKl^G^UE;2bN}%t?N##m=R({k$QZQkdYo}D`z};NDbUN{5CFUF#D{!6>rK-fOVaBm RepvnL!V{Z$u>dpcn{GXBs5Jlp diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/d5/ec1152fe25e9fec00189eb00b3db71db24c218 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/d5/ec1152fe25e9fec00189eb00b3db71db24c218 deleted file mode 100644 index 0d2534bc9be203e229c6ed85d5330c2480e8ac0b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24 gcmbqhTS#F!Zm<7~gOe4TPyl^GbPwdmfiR_Pm)h)BDTJ_%`{x?iVl5SpVImlLo_mHfG z2a<}E0PES=GuVwvq)RNKI|ZHg?9#wv1lU^bczFrA$6NcB2Y$U9+dtbSRAHeRRF4s| ztx5SM8DI_Koeo<9K3Ocy;Vs=hHD+tIg`{K?RD&@#cc!G~q(Z|7?oczu*`8*FZm0FK zL_@c(e0}ADQOi`Q879Egg77OifD=jA d=D#q1a_;<9WH2-^Ff%bx$V)9}_!{7E_Uy~+%BrwG(Q9&Y>W!w&{saIG G+YnXBv=vzZ diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/d6/cf6c7741b3316826af1314042550c97ded1d50 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/d6/cf6c7741b3316826af1314042550c97ded1d50 deleted file mode 100644 index 8f9ae1fc6..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/d6/cf6c7741b3316826af1314042550c97ded1d50 +++ /dev/null @@ -1,2 +0,0 @@ -x¥Q -1 Dýî)r%µ¦i@Äoàj›e»…ÚÅë[Åø7ó̤Zʽƒ¿éMSLB‘­Nl°ìm öÑBºÉ~×>×—üŠ-Ãu®åY8ê ŸtÖ¯øµ]ªåÖQaǶèÍ ã¼ëŸ3f]š>b×lÞ(„A] \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/d7/308cc367b2cc23f710834ec1fd8ffbacf1b460 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/d7/308cc367b2cc23f710834ec1fd8ffbacf1b460 deleted file mode 100644 index b02cda4fa..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/d7/308cc367b2cc23f710834ec1fd8ffbacf1b460 +++ /dev/null @@ -1 +0,0 @@ -x¥K @]sŠ¹€†)ÐÄ7ÞÀ ð™¦]ÐI(Æx{ñ î^Þâ½,µnлSoÌ`¬/¹Xä)Ù™B@GžÃ”¸œaòD¼ «øê«4x”wlž«ÔCv¸ò°?º×-79dé—,õh‚F4Žœµ×Z ;ÆÿH¨´í±}Ô·š=  \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/d8/74671ef5b20184836cb983bb273e5280384d0b b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/d8/74671ef5b20184836cb983bb273e5280384d0b deleted file mode 100644 index 1d8037895d1381f172b57a4d583d94675912a95c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 162 zcmV;T0A2rh0i}*h3IZ_@L|x|;xxh&0-wh&eynz?!Nm^#WF%qL*-%-4QyQ=q~s9cw2 z?%I04=}kmK305435XB&k4CIj|#DqWw!I*4D6H`$)ZgTA!$Y#NawxqLT%Z^hdj)gM^ zqyQ%3$RT^hk3Q9=kLAU!=+jh}d%fzNtn`x(@)f_f&2`ypY;PmHm#v~vUScw{J;XBdpzmsx||J*POiK&{om z7ZpyUBl2JqM4xpL20(*BrBEv$iWgBT5zyO$!f5u69k;=YwI*o;8ACGG3lYGgP3{2n z0SY?la`7yF#!8((@;CO(Un{kpHh#rvk9BVqI_*@(1*qM)R6#7#8>jeL%q*LB9v%2c Sf;}nMQX!5?8~XvTElv*Nf=A5& diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/d8/fa77b6833082c1ea36b7828a582d4c43882450 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/d8/fa77b6833082c1ea36b7828a582d4c43882450 deleted file mode 100644 index 988145322..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/d8/fa77b6833082c1ea36b7828a582d4c43882450 +++ /dev/null @@ -1 +0,0 @@ -xíÐ1€ DQkN1¥–&6‡•%l²BkŒ·naa1Åk¦ø¤…°íëdI¢(ãU£rö'7‰‘»LŸ’AÅ,±+Wmð9 ŒI'UŸÄ͹ÿñ£_ÛÜ°N \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/d9/63979c237d08b6ba39062ee7bf64c7d34a27f8 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/d9/63979c237d08b6ba39062ee7bf64c7d34a27f8 deleted file mode 100644 index 5fa10405ced48bb23de6f6e2c9f30610494a9c01..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 48 zcmV-00MGw;0ZYosPf{>8VJOMSELH%bw9K4T1tSHG-29Zxw9M2Lh0HvKoYb@uO)dZ- GSq*CoG8G&E diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/da/178208145ef585a1bd5ca5f4c9785d738df2cf b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/da/178208145ef585a1bd5ca5f4c9785d738df2cf deleted file mode 100644 index 6292118e04480b8dca7e237cc3539b7fc92704d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 41 zcmV+^0M`F_0ZYosPf{>4X9&s2ELKR%%t=)M(s`-n3YmEd`N<{uW_nxz%E=2MbzKrP diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/db/6261a7c65c7fd678520c9bb6f2c47582ab9ed5 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/db/6261a7c65c7fd678520c9bb6f2c47582ab9ed5 deleted file mode 100644 index b82e7fcafe919ebc819e724da40b51811ee2e77f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 624 zcmV-$0+0Q80V^p=O;s>7FfnH^G%zqTF;Or`)XmG+P0mQnOHb7+sVHH{ICjFDQ&R2t zO|E6jXKNqcoptAIA53kMZc%D^QD#X=YMyRpo^F0=Q88H0rpq(ei7NTYMzH1C^nT}g zT>E@k7)(#HZc1rEPG)jqNoop6Q%Oc@CRCe#m=GiTwFaSCvC}7RRXi#BH$ZIDIPHctgGE4+IFfTC|ViU-Dx~VCdm=^Q4>-V)w87MTf zPVYPY^I2}2znBHoVoW2zKD=-x(ogKu!-?#Vf7LCst6KHnApSQ@N0M${YB|VOg!hoF zg$I&~lmP45*)!OUN~B9HqB{kh_UzKYV+7b*?Ra?!xyM`kmIr>l8{0qIB~)Rd8B~uE zvaLz^B^h81;++m#0zO$R&EYNGJ~d`*wS}Z)6I6pSHg~3^=A=Ty2kuZa#o3-_g>I+y zvP46-u6%vvf>Fyari$u=~@NRF7|~f`q0XIvsi&YJw?oZkVyliS^HC`PiE_6LU@f*<0K4 zrHdd;Ku;!c7a%3H%Z0O|UOc&}RJPU7=4IKpcTu0VzyjZtIA0{I6slU}zI-!bQPt(d zOoQql3#DM`%uE*)XYk}|s9Tb+YlNIRZu~0W)@;yp@Riy2rmhHGALkC00I2)TQS}yQ zrljf`f}?+ny3qNTv!nvJwF3Xm@Z;_(XWAu*RTEhCw)rp2pPV~?<>V5cJIfDRxV5$4 KX9oay(2y@gz%(=f diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/dd/2ae5ab264e5592aa754235d5ad5eac8f0ecdfd b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/dd/2ae5ab264e5592aa754235d5ad5eac8f0ecdfd deleted file mode 100644 index 55626a57b14e389308c1fa035a5276e35efd7d94..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 149 zcmV;G0BZku0V^p=O;s>7HDE9_FfcPQQP4}zEXmDJDa}bOW;pdfyVhm8eemN4=M67h zn<~*Qx$YQLSz2aJs-a#4VkpVTEan2Dl*}Uiw9K4TBfXM}5-tFg2nnPqw-2BI diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/de/872ee3618b894992e9d1e18ba2ebe256a112f9 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/de/872ee3618b894992e9d1e18ba2ebe256a112f9 deleted file mode 100644 index 04dda4a75..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/de/872ee3618b894992e9d1e18ba2ebe256a112f9 +++ /dev/null @@ -1 +0,0 @@ -xí± À S3Å‚…ŒlK–A†ˆõƒ²BÚ4W®¸b­ Ÿù˜—T5Á¢:§8ÔS»c€œ±Ô Ô»P`KäI¥Ë†O3Z½•”þàç‡&ØÝ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/df/e3f22baa1f6fce5447901c3086bae368de6bdd b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/df/e3f22baa1f6fce5447901c3086bae368de6bdd deleted file mode 100644 index e135694400ea648ddc37f5f9aaab082ab2c75097..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 40 ycmV+@0N4L`0ZYosPf{>4V<^eUELH%bqSV~{veXoX%shppqQt!93@!l1nG1b@;uBy1 diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/e0/67f9361140f19391472df8a82d6610813c73b7 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/e0/67f9361140f19391472df8a82d6610813c73b7 deleted file mode 100644 index 955431dd7f86a53df75f5e724b277f513956f5a7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 53 zcmV-50LuS(0V^p=O;s>9V=y!@Ff%bxNXyJg)hnqeVff>doSQ28@=@YXHQqg+&*Yt& L{)z(tOS2K(E*BT$ diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/e1/129b3cfb5898e0fbd606e0cb80b2755e50d161 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/e1/129b3cfb5898e0fbd606e0cb80b2755e50d161 deleted file mode 100644 index 751f1dd3339cf62eb47d7ecdec90c61467ef6a25..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 92 zcmV-i0HgnS0V^p=O;xZoWH2-^Ff%bxNK8pdP0`KF(@n}R$Ma%9vt%$dFfcPQQAjK;$5Ep%1PBLsVHGc5;`oqI?hAM z{rdDef8NUpvTr_GLlq}yB<7{3rs!to=_VB=<|Su>F;6I8oGd50*9~fRQEF~} z8N@N>V6~Fl*LVbFZYx^I$i^|{p7qK@i+nF)szq}6{l}lQSIOs}3vr(yW6-wiamKyu zyO diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/e2/c6abbd55fed5ac71a5f2751e29b4a34726a595 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/e2/c6abbd55fed5ac71a5f2751e29b4a34726a595 deleted file mode 100644 index 7b84ce966..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/e2/c6abbd55fed5ac71a5f2751e29b4a34726a595 +++ /dev/null @@ -1 +0,0 @@ -x+)JMU067f040031QH,-ÉÏM-JOMLÊIÕ+©(aH:,»:ÎCÉýúô:ÞË ²o>ZC'g$楧¦èfæé&%æ%g€5¬ÎqYôÂeÒZoÇÝÙkÚMíæ2­éÆÔ›X\’ZDPC~^ZNfrIf^:Xéõ›ZHÙŠž1O(_œ,'º× jvn~JfZ&Ô5ù%·˜º³\N´º¢ÔçÞö§,5[ðe“Ù¨ú¢ÔÜü2 ÇßüI{•|þ¹÷ 2m»gÜ˾‹©Éñ1ÖËåüŠ5Ó¿Ü,\“µ})TC)0DÀvú‰ùzÖ›¦9–¤×Mü°úÕ…'6ób‹” \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/e3/1e7ad3ed298f24e383c4950f4671993ec078e4 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/e3/1e7ad3ed298f24e383c4950f4671993ec078e4 deleted file mode 100644 index a28ded3fba14e82d26b34749d3a0eaf2ebee1bc8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 210 zcmV;@04@J`0V^p=O;s>5H)Aj~FfcPQQAjK;$5Ep%1PBLsVHGc5;`oqI?hAM z{rdDef8NUpvTr_GLlq}yB<7{3rs!to=_VB=<|Su>F;6I8oGd50*9~fRQEF~} z8HQu-KmMe>N>Q@(@ M*vyLs00YTyo6fjkXaE2J diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/e3/76fbdd06ebf021c92724da9f26f44212734e3e b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/e3/76fbdd06ebf021c92724da9f26f44212734e3e deleted file mode 100644 index 8da234114..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/e3/76fbdd06ebf021c92724da9f26f44212734e3e +++ /dev/null @@ -1,3 +0,0 @@ -xíAÂ@E]s -`ö@Ì uHš)M=¾Scô®Üþü’zÂé:¢ÊŠ³(ãN+6Þ›D°¡Feð­­˜Y®g$+GˆÞä&F -Ÿ½ì‹p‡þâG —4”mQÉ\±á85Æ#FìCð¥ï~QEóÀÄÀÚR—š½u)£;cáàâ6ü­öë'ÍjÄÇ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/e4/9f917b448d1340b31d76e54ba388268fd4c922 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/e4/9f917b448d1340b31d76e54ba388268fd4c922 deleted file mode 100644 index 870c3e732127964210a7f5f278df26e3cb8f5010..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 36 scmbäÄÉ—Ecñ9ÖÖå%¿bÏòº¶úh›<ò¤Ÿtæ¯øµµz’J£òÁ(¹“γƒÿœFCñ_‹NŒ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/e5/060729746ca9888239cba08fdcf4bee907b406 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/e5/060729746ca9888239cba08fdcf4bee907b406 deleted file mode 100644 index 33299c2b0f4938c5fce98240aef565857324bbda..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24 gcmb37z~5)`i{mMxT|_EsZ?sU zE<+lp4x=+m4#j!mloFZ@7A700P-bEk0XR<@v$u%i5j(F#dKG;kvXMwrbjD@?#{sP( zUy@h@=eD;&&t>8mSo8%# E0I#nTssI20 diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/e9/ad6ec3e38364a3d07feda7c4197d4d845c53b5 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/e9/ad6ec3e38364a3d07feda7c4197d4d845c53b5 deleted file mode 100644 index da4a5edd1879fd8a04095cbe6861992870e543fe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 36 scmb4Ghi?@FfcPQQAkWlNlnqs%+t+HEG|hc(krPbVNkZ=lsq}( ztss|o{^xvCt2f<+Chaigr6u{fsYU6jiAg!BV8!q37w$N~^}qgsLh9eG94WhbC+nOy zF#rOEr2LW$-IUCtVumHs(%UZVvr+n;>SS`*+Nn?U#2Iy{fyo((dFc=rBo!s*C1-#Q zU7h2y=!MIqwcd`qv)8nn+RbHJ(~YSC$;pEERx@n6yzJ{@cFT@6tUS8aX`zo`8uIhf zax#-kGV{{GX8U#IC8%niTDe;Ax_n!*_r+}w?g>B~oRSs~4i1LPRf~83li~5)$yp&3 zxHIhb>KF0Tph_}}7!=dxG?^+i@;9CHNxmR9b6eG&$A(b5(lVi;(zSLj-(r)gvP-Iy zq}-z|&*WW?+z(Y#l$x7ghT-G;k3VUzlFvUE;yyvfpl#RVjC8-%)vqo*v6&YO051!-Ob*V-0{{R3 diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/eb/c09d0137cfb0c26697aed0109fb943ad906f3f b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/eb/c09d0137cfb0c26697aed0109fb943ad906f3f deleted file mode 100644 index 83b489d3af2d92dec412f70ec7f4dcc9f56e8186..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 166 zcmV;X09pTd0i}-J4Z<)GgL%#rw*csxeVFMPpUM{o}ZBQEo;}Z}Y@MimyEpwTs zv4Xa7Qx_3H3NG!5xJw*u?j4cqaxmI4QtynmIwi?L-D#1z0(%UZ4aR817}t=FoP6|s zt9j0Zx<@ap=uwBVz&Sl>NpKm;w3ZnT($bGQ$rt?Gj>~j}&Nz*GAH0PvdPLRIcDBl& UGfH0LTF3bcdAx~w15FfCVrz#@_5c6? diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/ec/67e5a86adff465359f1c8f995e12dbdfa08d8a b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/ec/67e5a86adff465359f1c8f995e12dbdfa08d8a deleted file mode 100644 index 8490346e1a44c34a5cc8749097072053d727e94f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 166 zcmV;X09pTd0i}*XuEH=3ME^Rc@C86l(zuC)5F2j51zg9Wf6)eoAg)hA+<@K8d(vp6 zF3W!hH;jM1sRCiLMVz1~_R%q=Atv=D*r*zqHSwT15i+GIDtM?&maZxfw znu0APh0#q&Duy3@t_{xl$t}ZWuFJiyaL|pu(@8(#+xAkIBUm47ipdTLI}C_squbf8 UKhBt`_8Da6^{Uyt06KtB`Og|r)c^nh diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/ed/9523e62e453e50dd9be1606af19399b96e397a b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/ed/9523e62e453e50dd9be1606af19399b96e397a deleted file mode 100644 index 7853e235cb6cc2e4aacfc92f61d976c1b13afbfe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 87 zcmV-d0I2_X0ZYosPf{>3wqz*D$ShVU&&>GO3h2mO-)hA%u^`INX;xN=1R;< tQAkb6EP)8-mjZ>jG(dtm`8o=jB?>^zsM4BTTx1wIs)fWz001s1n?-`eB#{6B diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/ee/1d6f164893c1866a323f072eeed36b855656be b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/ee/1d6f164893c1866a323f072eeed36b855656be deleted file mode 100644 index 87d808007f0f50037fc92a0ba5c11d7430530327..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 291 zcmV+;0o?w00V^p=O;s>9He@g~FfcPQQAo)w(ls<-@D%3Kcpp~vbJ;QhAB%GPx4+`2 zJDC^&0a$?x0 z`)=tV*$IU5=FVw$Xenhg?wkpnVU`-|9!pk?~17_=W$Hj zWxfikAT2W|Ro9R~&i{kvx@Wz-neXRqd%x`T$2Z0LGm%voG2Bd^K1aEhW7{rEHofQj zQ;uKuQvU&QCD;gK1|!A0f!cMtN4D-|X370_LRxDRJ2#R76NXve4Sxyd%I#csKwxT; pyUxF7UsqNlDKKR?*O72#p7pEz>#pryjN1=C$z5^!FaVUJit5r)lRN+b diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/ee/3fa1b8c00aff7fe02065fdb50864bb0d932ccf b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/ee/3fa1b8c00aff7fe02065fdb50864bb0d932ccf deleted file mode 100644 index 974b72dfd16aba70c9dd263a606d7c89f6f8d542..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 64 zcmV-G0Kflu0ZYosPf{>4F=r^r$ShV!%gjkt0Mf}BiFxU%DGHf+3b~2JC85H)Aj~FfcPQQAjK;$5Ep%1PBLsVHG!ZFT%(F6jM7 z_U^a6+5eCKdV1*DKd9p5jKsY3)D+#!Jl&+C#JuDTum-;kKJzMH^rtyokpH?VX3;YC zluu%q8gdhhOHzx#8dm4HEPCNGX|1>8?(8+~rgn3g)^x)(=^5eiw>y=j_bNqXJH5365Ycw#dz7683sbmAR6dtv|p diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/ef/58fdd8086c243bdc81f99e379acacfd21d32d6 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/ef/58fdd8086c243bdc81f99e379acacfd21d32d6 deleted file mode 100644 index 55f79e066..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/ef/58fdd8086c243bdc81f99e379acacfd21d32d6 +++ /dev/null @@ -1,2 +0,0 @@ -x ÉÁ À0Оâï:JŠB¢ÝŸæôOV -Þñ´yáó5éê†5jã†q!’4÷Î{¡³:ýp;¼ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/ef/c499524cf105d5264ac7fc54e07e95764e8075 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/ef/c499524cf105d5264ac7fc54e07e95764e8075 deleted file mode 100644 index bc9350bc0ae4db2b21c363fba25efd2112002d92..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32 ocmb#%dHz)aQ|tRo0kXhC#vbaZ}yyT}ujqZm3Y=++B%$EEZu~wgp|->3lVI>(Gr4_Tbi8u90;O~R0V}V0fNWold~r)jnML^ Oj`-L4^5O@<{^3(s5>KW8 diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/f0/053b8060bb3f0be5cbcc3147a07ece26bf097e b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/f0/053b8060bb3f0be5cbcc3147a07ece26bf097e deleted file mode 100644 index c63d37fb0c17e54194d10b7b63f254ad28294dca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 163 zcmV;U09^lg0i}*n4#FT1ME&LzT%cxwLTO@*Ki{8eCJ#%_ zYm<5$cdatZNd+QJQ=AQ18YHORC%UXs3b2-$@j9!19$pKC;kqQW>iifPqmC&^<(_UAFO` RH=@<`xrXa7i#PWmP;1?^OtSz0 diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/f0/ce2b8e4986084d9b308fb72709e414c23eb5e6 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/f0/ce2b8e4986084d9b308fb72709e414c23eb5e6 deleted file mode 100644 index e78c19f1a7fc0d2c60a6f7ec2db9068059635032..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 125 zcmV-@0D}K`0qu}W4gx_4L|t$=Ne&I7OQ(?<^m}NE@ diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/f2/0c9063fa0bda9a397c96947a7b687305c49753 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/f2/0c9063fa0bda9a397c96947a7b687305c49753 deleted file mode 100644 index 34d9aed2078aaf12eecf75dd49070222816386c5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 29 lcmb4X9&s2ELKR%%t=)M(s`-n3YmEd`N<{uCVE@|%EJpEb4d~G diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/f2/e1550a0c9e53d5811175864a29536642ae3821 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/f2/e1550a0c9e53d5811175864a29536642ae3821 deleted file mode 100644 index 1fdcbe22a8a915a325ab9b622db2bacded3e30d8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 73 zcmV-P0Ji^l0ZYosPf{>4HDoBs$ShV!%gjkt0Mf}BiFxU%DGHf+3b~2JC84Fkvt>FfcPQQAkWlNlnqs%+t+HEG|hc(krPbVNkZ=lsq}( ztss|o{^xvCt2f<+Chbt=$r*`x=@1P`MTvRI8DI^ob6gg^aGA8$+i`dHns!sWxlC)i zF*P9BAb4*z!=}s2zAk3B>{!Ffqg$O8`Us{WKQApOGr1%)FCA>QUq@bos^+Pcs|Byi zwZ`ve(-wq1`i?q%PFYsgE?1!^!g02>|Q z{BO@DlZN};akrHg$wVG6+TEv#rqbLLta5o(*pm7ER*#$>sEdE>+kK2D=BP88N=t~D zzYf^z1X?EcwqG?9IT+kz{qeK#G^ol_U~qv$4{YR#5BYl5o2EIIq}NUSu=>@7CpPn9 I0c?$+eO|GbjQ{`u diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/f4/15caf3fcad16304cb424b67f0ee6b12dc03aae b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/f4/15caf3fcad16304cb424b67f0ee6b12dc03aae deleted file mode 100644 index 21ce1a0fc8e574dba18fe5844e053a5d8ba1f42a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 320 zcmV-G0l)ru0V^p=O;s?quw*baFfcPQQAkWlNlnqs%+t+HEG|hc(krPbVNkZ=lsq}( ztss|o{^xvCt2f<+Chaigr6u{fsYU6jiAg!BV8!q37w$N~^}qgsLh9eG94WhbC+nPt zDo)Nw%u9!uo>Y{Wmz)9CusX+O(F>PJYrP$JXRm2DwVTVdrW;cOl5+&_t!CJCdD+*+ z?3NvCSb21-(?TD?H00-{WH4yjTF=BcAs?_@;vZ diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/f4/8097eb340dc5a7cae55aabcf1faf4548aa821f b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/f4/8097eb340dc5a7cae55aabcf1faf4548aa821f deleted file mode 100644 index 5a4a9a54ff8c314cd2ad57c89720e64ccdcf51d4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 165 zcmV;W09yZe0i}-J2?8+?gndpGY2aipx%`2MFLq!9o6Uw3%td0v_Kji(zRi3CGefnM zYnN*AyWW^31ZREZq?GkQDS|h_dYv&?=ZMHBgUZk>?$~(ik|RM#Fl$FS0x4^QLmmJ^ zj$zT50@$pxz-M1;ljropmgHrv&D0lEPxnvobCK) TjWBrYlbT|~jaKmnl08t_mX=cO diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/f5/504f36e6f4eb797a56fc5bac6c6c7f32969bf2 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/f5/504f36e6f4eb797a56fc5bac6c6c7f32969bf2 deleted file mode 100644 index 2aa0c3b9ac075224b59d6b1e498ac5798182e253..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 42 ycmbXs^_G$iz?`#c>w^1pW?r diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/f5/f9dd5886a6ee20272be0aafc790cba43b31931 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/f5/f9dd5886a6ee20272be0aafc790cba43b31931 deleted file mode 100644 index 17ad5063d7cc04ca26dea94be689a6d5446dc2d3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 244 zcmV9Gh{F{FfcPQQAjK;$5Ep%1PBLsVHGc5;`oqI?hAM z{rdDef8NUpvTr_GLlq}yB<7{3rs!to=_VB=<|Su>F;6I8oGd50*9~TNenDnx z3Ru;N5BYl5o2EIIq}NUSu=>@7CpPn9p{j~fbMwm}PDXM;jCICx`6It#&Gav~#{~=5 uWJPUX3fGXAn2X`Z`;R|quaeI{7vera#-MH2~Lu`san0TVlFBvMOh5Z|Y~f$em|UD8@h z2N%afZz90#Nsyj?41zd$qB90RAR{pfrI@WG&TQ!27j1Ck4>g9zqIJ_1X4&nJuC=75 mo92E>S})*+$$A&V;NWPZwPv^bxXT|2b6-m@^fF(oVLt-Rx;&Hs diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/f6/be049e284c0f9dcbbc745543885be3502ea521 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/f6/be049e284c0f9dcbbc745543885be3502ea521 deleted file mode 100644 index 12d3c25c253195dc84a92b4f658ba46bb4386e11..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 265 zcmV+k0rviQ0V^p=O;s>9wPY|fFfcPQQAkWlNlnqs%+t+HEG|hc(krPbVNkZ=lsq}( ztss|o{^xvCt2f<+Chaigr6u{fsYU6jiAg!BV8!q37w$N~^}qgsLh9eG94WhbC+nPt zDo)Nw%u9!uo>Y{Wmz)9CusX+O(F>PJYrP$JXRm2DwVTVdrW;cOl5+&_t!CJCdD+*+ z?3NvCSb21-(?TD?H00-{3R=>LN#AaSBR8>)GUSckWlkY$Nq`gW$|6GXs1Q~<2U5_*F PW#2{BfYV$6R3ehVI5CG+ diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/f7/c332bd4d4d4b777366cae4d24d1687477576bf b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/f7/c332bd4d4d4b777366cae4d24d1687477576bf deleted file mode 100644 index b36bceabf726a44d0d0d4a49070f3f812b52f583..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 156 zcmV;N0Av4n0i}-34T2#ML_Jf*HlSHpSs*dSiyhbiKTAFjh(V0)`)TaJ+su2(WO8rq zI>8Wc<`4m=wcE2x+B4e7jFQA!&!ut@Lt0C*jG?M~9CDkG8C}hU-jfj7BGvd@*mJVF za;_0gLYA!Jb1r?rxxC^ia9MhL^cx&xrJrf1’‰x}£xwU¯àQ±–²v kv½‰@`OŽ§<çHˆd}œ%kŽA›‘CÒ>²ÑÄêá›Ü;$KÈ™ybhŒóÁ2癈sLA ±öÊ?ûR\ÒË·×¥–­Þá(ƒ~ÒY¾Ã¯b-'ÐÆYÇŽp‚=NˆjÐq¶ËŸ•òm[“zí O+ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/fa/c03f2c5139618d87d53614c153823bf1f31396 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/fa/c03f2c5139618d87d53614c153823bf1f31396 deleted file mode 100644 index 30e07e5b71907affcaa1fe169114c2091179b9f9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 76 zcmV-S0JHyi0ZYosPf{>4F=Z&p$ShV!%gjkt0Mf}BiFxU%DGHf+3b~2JC8`5|TmSkbE%WNtM?olhxoR=Q;oZ0!L$zf_1L1 zwVPrJinUWD=+)*@o_Yw-ci3{MpqXiz%< diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/fb/738a106cfd097a4acb96ce132ecb1ad6c46b03 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/fb/738a106cfd097a4acb96ce132ecb1ad6c46b03 deleted file mode 100644 index 4f1e7268818a62a5d3fdf8ec89d1ec7a62624e79..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 264 zcmV+j0r&oR0V^p=O;s>9vt%$dFfcPQQAjK;$5Ep%1PBLsVHGc5;`oqI?hAM z{rdDef8NUpvTr_GLlq}yB<7{3rs!to=_VB=<|Su>F;6I8oGd50*9~fRQEF~} z8N@N>V72F-g&m%>mNk6yst3OvMM@8`J(`q{sTRrM_aA@KUL~J@F2sF;j6vJ3#~Jss z?_z2|a(Ik&#&Y>1zhcewFSo}93)f^tZC?u2PznqUaNvNQa^ge2p7o|_jwR`J6F;ne Ob>WH4yjTEmHI#L$M0@uD diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/fc/4c636d6515e9e261f9260dbcf3cc6eca97ea08 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/fc/4c636d6515e9e261f9260dbcf3cc6eca97ea08 deleted file mode 100644 index be8a810cd868bbbd5bcf1e52b507985151ed663f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 29 lcmbJ%v0V^p=O;xb8G+{6_FfcPQQ7}l<&CAzK&PdElPt_}_C}GGrcEX!eQtkLn zu4T(-Yaia7b?0m!Ol^{GQEGWnW=TnEo^EEIZhmP|F<8%sbJ~5LZ5+O{4f?mMb3PF{ zWViJhOiwbZo|25zOsFpXFd;_vYYjrPVy92ss(4zic+p!!s4l}qpsu{c+|(49J-VqW znI#Y|k`ae5=)Lb$IDB|J>J^4Jn-w? z*#6lrp$ZGlpn8muZB5EA$pC8*?{wG_@X2Cn4sYr9sWDrtEhHtIpc;%Z11BXlClxbv zBu*P<%e-IkW7(8^J_V^hsr;6xoiH=7`4!0&xM$52XM36zx}Da`5)IwD^7WMqMlDmJ zW|&~QBQYffBaW2HCvDYQ#jV`^is4ONz-*=@d$Asv3D{f#Hv{g58CP}L4{X@|X-lfd zw^czxQxBaEy$vk^=vaNJ3psPGU;0P7weA diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/fd/57d2d6770fad8e9959124793a17f441b571e66 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/fd/57d2d6770fad8e9959124793a17f441b571e66 deleted file mode 100644 index 21e6b2c558d523a599df3883b7c13b0080096328..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 279 zcmV+y0qFjC0V^p=O;s>9H(@X|FfcPQQAjK;$5Ep%1PBLsVHGc5;`oqI?hAM z{rdDef8NUpvTr_GLlq}yB<7{3rs!to=_VB=<|Su>F;6I8oGd50*9~fRUTV2+ zVqS`FN@iMGYEf!l30T8_&kGfq%~IDBci(!&l+gC0V)kj6SBp|}^UE+?fB*3(?N##m z=R({k$QZQkdYo}D`!3W5Bn?QekFm~JE`Q`#teO7h_PAi-nyjepOQ9M{fk6TeA+S?U de8|_c-ZagzB)x9pht;nxJh7P<3jkUVmYXeUg!BLa diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/fd/89f8cffb663ac89095a0f9764902e93ceaca6a b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/fd/89f8cffb663ac89095a0f9764902e93ceaca6a deleted file mode 100644 index 2f9d83b26..000000000 --- a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/fd/89f8cffb663ac89095a0f9764902e93ceaca6a +++ /dev/null @@ -1,2 +0,0 @@ -x¥ŽK!D]s -. ¡{` cÜx/À§É¸`0 ÆëËoà®êURy±–òèõ|èY`ÀdPÌA!±íÜäŒå4C2d=x#ž¾ñÚe`Bgr´™uôàbLÁ‡¬Ðf“fG @þÕ—Úä-½}Kò¾Ô²ÕUžyÐ=]ù;üÚ)Ör‘0 Rˆ$Ê(%²ÿ¼Ùo=׶›ˆ‡OPw \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/fe/5407fc50a53aecb41d1a6e9ea7b612e581af87 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/fe/5407fc50a53aecb41d1a6e9ea7b612e581af87 deleted file mode 100644 index 4ce7d2297be2cd33aee824f46f5a127f4c56ca98..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 48 zcmV-00MGw;0ZYosPf{>8V(`sR$xO>kO;O0qQ&2A{$}G!F%+WP8)J-Z%%uCKt=K=r< GkPO-w^A&6W diff --git a/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/ff/49d07869831ad761bbdaea026086f8789bcb00 b/vendor/libgit2/tests/resources/merge-resolve/.gitted/objects/ff/49d07869831ad761bbdaea026086f8789bcb00 deleted file mode 100644 index eada39b77e4dc3894bb405dbb2c7d93d0d6ab6a7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24 gcmb8W-#C~VQnGUu}3vg8U$&Eo<9 HuxJQ7I$swf diff --git a/vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/08/3f868fb4324e32a4999173b2437b31d7a1ef25 b/vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/08/3f868fb4324e32a4999173b2437b31d7a1ef25 deleted file mode 100644 index ec6ed4d4cb0af4342c6c18613f306e6da14e0145..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 53 zcmb4ÿ?« \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/11/89e10a62aadf2fea8cd018afb52c1980f40b4f b/vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/11/89e10a62aadf2fea8cd018afb52c1980f40b4f deleted file mode 100644 index f9f59840e22e1676fa49674ea8ffcbed0e3b207e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 183 zcmV;o07(CM0i};iN(C_xMIC1qH5VkGm+B6PI8tyI_f@Lx7SeepY1G}@;1Zl3xQBbB zma+}<%y*-yQjkl~X%Uaei_AVsaCuSXh->DYF=xkFU~Xu-53+!V02~A&6H;1mwcGb&V$KId&Xd4C|q?RXg7a!A{cw)M@-dc0g l^XkxlNzBXkO}!SSuXP*RZxAKynUFI{-NzYaegP*oS(hg!TFn3e diff --git a/vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/24/2c8f6cf388e96e2c12b6e49cb7ae60167cba1e b/vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/24/2c8f6cf388e96e2c12b6e49cb7ae60167cba1e deleted file mode 100644 index 7cfc318ed3cd24349162b68e9083f69c7e0389e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 50 zcmV-20L}k+0ZYosPf{>8VTejC%I7lVGU77kGT|~+h=_>bGE<0*jN~%svf#4hGBn@< I0M(ZW##lZWkN^Mx diff --git a/vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/25/246acb001858ffeffb03ea399fd2c0a163b832 b/vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/25/246acb001858ffeffb03ea399fd2c0a163b832 deleted file mode 100644 index f7160ce446fdb4d6b704c9b427e770157c9c9549..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 53 zcmb0NMX|0ZYosPf{>4Vldz`lS111~BHqrQ9~bcedQwZpW205M diff --git a/vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/3c/43e7fc2a56fc825c31dfee65abd6dda8d16dca b/vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/3c/43e7fc2a56fc825c31dfee65abd6dda8d16dca deleted file mode 100644 index 0ec95b5c2101f48e72113ebcb7e068fc198ab58f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 52 zcmb65wT!^myfi!uYK5dh+?-lXyjavKw z;jRwn-W&2flR#Y^u4F+34A$2+w6^bJjc8ntv2L9^^i_jSyQrHX21Mmo8S?_qKD@8U z@QBMyJg%P%r`KP0zGqp;i{FPl-$B(F>$?wJnoFETizCpR*{f~t((89988-^K~{TWO5sMJ#;AwQ{2H7Rc5pY}o11U&-3(dB}% QbavMdISD3FUzeR}tftaxA^-pY diff --git a/vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/43/ad73e75e15f03bb0b4398a48a57ecfc20788e2 b/vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/43/ad73e75e15f03bb0b4398a48a57ecfc20788e2 deleted file mode 100644 index 1936bc34a04b70f79f40466b714b8386309d0a04..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 53 zcmV-50LuS(0V^p=O;s>9V=y!@Ff%bxC`m0Y(JQGaVR&bwwWg0*$;Ze#;?2gN@4ktZ LgroxiI_yF?F6m$Rp diff --git a/vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/5e/fb9bc29c482e023e40e0a2b3b7e49cec842034 b/vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/5e/fb9bc29c482e023e40e0a2b3b7e49cec842034 deleted file mode 100644 index d615c02a6b36669ca11cf0c4d92dde442130dcbc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 53 zcmb8#W%j<>n*Fxv)5_&?<#!Z>Hoon JAu&woJ^;~d6Yu~4 diff --git a/vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/70/d3d2e7d51a18fcc6f035a67e5c3f33069be04d b/vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/70/d3d2e7d51a18fcc6f035a67e5c3f33069be04d deleted file mode 100644 index 1718878a71ba17a791ba635061892e47fc24263a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 53 zcmV-50LuS(0V^p=O;s>9V=y!@Ff%bxC`m0Y(JQGaVNlWO&-vW(GEYZn+mkul*CmM6 L?2-cjLRk=(_fi#O diff --git a/vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/74/e83b6c5df14f1fba7c4ea1f99c6d007b591002 b/vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/74/e83b6c5df14f1fba7c4ea1f99c6d007b591002 deleted file mode 100644 index 779e1bcb3e2bc9b0412890a98778ff1187685afd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 43 zcmV+`0M!3@0ZYosPf{>4XE5M0B6 diff --git a/vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/77/f40c621ceae77ad8d756ef507bdbafe2713aa7 b/vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/77/f40c621ceae77ad8d756ef507bdbafe2713aa7 deleted file mode 100644 index f2efa93be2ae789348688a49a1c2d6e6c2a8dc39..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 53 zcmV-50LuS(0V^p=O;s>9V=y!@Ff%bxC`m0Y(JQGaVPM>w%913U<aq?g$&m;qSdq+Hi+gcP= zT(_+ZK<^$#69FAUel>-G%B;gn+Z7~!H( mYjx5yb;!RY>U}Lk`kh!Hm#?#g_64}^9V=y!@Ff%bxC`m0Y(JQGaVNlagzsLLNsp-;L5BJy‘ZEkÔÀ®”(¨Dü×çªA ³EªÎòP‚Êkô!äXs í}\¼’|îºÁ‹¶yÚÆýkƒÇ÷»>o½MÔéAÖù †ϱLî­³Öô¸Öõ_ó¦íªÀátË3Ÿ`Zúú‹Ïd¾“AeÏ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/a8/27eab4fd66ab37a6ebcfaa7b7e341abfd55947 b/vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/a8/27eab4fd66ab37a6ebcfaa7b7e341abfd55947 deleted file mode 100644 index fe2bdf4929e9d9aa307a0d8ef1ead80426c4f5fd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 51 zcmV-30L=e*0ZYosPf{>8Wr#{G%I7lVGU77kGT|~+h=_>bGE<0*jN~%svf#4h3Q5i5 J0s!ED35|2H84Lgb diff --git a/vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/a9/66acc271e50b5d4595911752a77def0a5e5d40 b/vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/a9/66acc271e50b5d4595911752a77def0a5e5d40 deleted file mode 100644 index cd6f64d6faaf2705a52d33dbb15aa85628084cec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 132 zcmV-~0DJ#<0j14B3IZ_IIrNK4vdq{_~v|9Q+J{=B^pWRPg mTS=OBywoF1j(iNk`T$!bM6>F;R{1MpF0Y~`J+KX diff --git a/vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/b2/a69114f4897109fedf1aafea363cb2d2557029 b/vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/b2/a69114f4897109fedf1aafea363cb2d2557029 deleted file mode 100644 index b95a7be74f974c4b7714dfcfbeb1bde4e01a684d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 178 zcmV;j08RgR0j16{YQ!)QM&Z;t#q@z7$(Bck5JH;3USR9rqtV&{+Z#zPa{Cze2;08m zi{-)6x|v*7e{p#g9lRfSrH{! z7m=sn#f{OP-qdG¸­¥/û_‡×ëƒ}¿wiÏT×70£u)FïF8i«µ:è‘*üÔˆúZŠp¿!1Ìå÷(Á-ÕMîoêõzX \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/c3/b1fb31424c98072542cc8e42b48c92e52f494a b/vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/c3/b1fb31424c98072542cc8e42b48c92e52f494a deleted file mode 100644 index 4006460e8f08f94159e499536e0496b309491697..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 39 xcmV+?0NDR{0ZYosPf{>4W^m*(<>^Yçyêà‡øЛ*Ïçä5¡X­±|&Ę´Ôâl"Rg>¹éÒ!ôÑÙ˜æ*>±Z‹Ö¨A\ÍXbAe–¿¿T ÊH¹:Ç(C³œ9V¬Ñ‡@±R ï}\¼q¹îºÁ«¶yÚÆýkƒç;»·Þ&îüTÖù†¡…Gë¬57zKëú/‰y×vQÆKápß“`Zúú‹Ol¾$eÅ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/d9/5182053c31f8aa09df4fa225f4e668c5320b59 b/vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/d9/5182053c31f8aa09df4fa225f4e668c5320b59 deleted file mode 100644 index 6b9483a5c..000000000 --- a/vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/d9/5182053c31f8aa09df4fa225f4e668c5320b59 +++ /dev/null @@ -1,5 +0,0 @@ -x¥ÎM -Â0@a×9Åì™$M›€ˆ®/àz:™Ø -ý1IÞ^Á#¸ýÇË4Œ³»šE Ãh£‘.:MÚ'æ6¡uÔvâØ&k± ½`ÕJYæ -Zû ©5D1™$ä9¢ö”zgX©Á¾IŠ¶:,nįM -\%Oc¶wãógs©y¤J^¦èƸàCç,ìÑ ª¯~W«üQ÷a¬RVbh~,3\ÔgäRý \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 b/vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 deleted file mode 100644 index 711223894375fe1186ac5bfffdc48fb1fa1e65cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15 Wcmb9V=y!@Ff%bxC`m0Y(JQGaVfer^Ew-86pe6IExq0NMX|0ZYosPf{>4VsPX#6FlMlU00j?MM;9(fE?WrTGT^d<0EMKY#JuE;_#`evE+Z~u eE)y0n25`+zn3@51G#Lk~_ZZFq diff --git a/vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/f0/0c965d8307308469e537302baa73048488f162 b/vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/f0/0c965d8307308469e537302baa73048488f162 deleted file mode 100644 index 343037e77ed919a238aba0200439e1dbf264c849..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 37 vcmV+=0NVd}0ZYosPf{>4WH971;xgtk;WFhi<1**6;Iia0G~faNRow)|Mlcb= diff --git a/vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/f1/90a0d111ca1688778657798743ddfb4ed4bd64 b/vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/f1/90a0d111ca1688778657798743ddfb4ed4bd64 deleted file mode 100644 index 4e2291208..000000000 --- a/vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/f1/90a0d111ca1688778657798743ddfb4ed4bd64 +++ /dev/null @@ -1,2 +0,0 @@ -x¥ÎM -Â0@a×9Eö‚äoš ˆ.o1I¦Z!¦éÂÛ[ðn¿Åã¥ZÊÔ¥±a׳äd!yˆ![fƒ‘³õˆCÔŽQaVn̉Y¼¨ñÜ%á0PJÆk!;@@­=ò>ó¨xS%híÚäÒ{åE^¹•iy¬ŸEŸ?»Ÿ—Þ&êtHµœ¤v0g¬Ü+£”Øt[íüWD\êÜ·qñÃMØ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/f4/9b2c244e9d3b0647fdfb95954c38fbfeecf3ad b/vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/f4/9b2c244e9d3b0647fdfb95954c38fbfeecf3ad deleted file mode 100644 index 437f667f5..000000000 --- a/vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/f4/9b2c244e9d3b0647fdfb95954c38fbfeecf3ad +++ /dev/null @@ -1,2 +0,0 @@ -x¥Í= -1@aëœbzAf‡Iœ€ˆà-’ì¬!,æ§ðö.xÛ¯x/m¥ä“СWUà(dçä˜Rt}@‡j9.2;O"KTelÂèëVáÒ{hƒ»Ö’Û:> .¯Ÿ=o­×z8¥­\ab²^ÄžŽHˆf×}Ýõ¯ˆùR<ì \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/f8/7905f99f0e66d179a8379d8ca4d8cbbd32c231 b/vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/f8/7905f99f0e66d179a8379d8ca4d8cbbd32c231 deleted file mode 100644 index d568dc1e9..000000000 --- a/vendor/libgit2/tests/resources/merge-whitespace/.gitted/objects/f8/7905f99f0e66d179a8379d8ca4d8cbbd32c231 +++ /dev/null @@ -1 +0,0 @@ -x¥KjÄ0D³ö)´›E tëg5„0»@ g0-©e;`;#Ë‹Ü>†™œ «‚WEQ•¶e™›2žZQÎö–aoÀj‡š£7€„œ{L9IŽÞúHÜ}s•µ©Lƒg’Á˜r±…µvÅŠ÷!9£!:úËGÍžm±z*’ 2aãMŠ:kçzÐÔñѦ­ªN·Cvõ.u™÷éøÙÕë××½Õ™¿¤mySxî=—ãÕ3h€î¤çµ&ÿ*é>¥Ž¢bå5Mêr×!iâu”‹š×¶=Ü´û´Äià \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/merge-whitespace/.gitted/refs/heads/branch_a_change b/vendor/libgit2/tests/resources/merge-whitespace/.gitted/refs/heads/branch_a_change deleted file mode 100644 index 3a46eff10..000000000 --- a/vendor/libgit2/tests/resources/merge-whitespace/.gitted/refs/heads/branch_a_change +++ /dev/null @@ -1 +0,0 @@ -d95182053c31f8aa09df4fa225f4e668c5320b59 diff --git a/vendor/libgit2/tests/resources/merge-whitespace/.gitted/refs/heads/branch_a_eol b/vendor/libgit2/tests/resources/merge-whitespace/.gitted/refs/heads/branch_a_eol deleted file mode 100644 index a59d5b534..000000000 --- a/vendor/libgit2/tests/resources/merge-whitespace/.gitted/refs/heads/branch_a_eol +++ /dev/null @@ -1 +0,0 @@ -9c5362069759fb37ae036cef6e4b2f95c6c5eaab diff --git a/vendor/libgit2/tests/resources/merge-whitespace/.gitted/refs/heads/branch_b_change b/vendor/libgit2/tests/resources/merge-whitespace/.gitted/refs/heads/branch_b_change deleted file mode 100644 index c14ced31e..000000000 --- a/vendor/libgit2/tests/resources/merge-whitespace/.gitted/refs/heads/branch_b_change +++ /dev/null @@ -1 +0,0 @@ -b2a69114f4897109fedf1aafea363cb2d2557029 diff --git a/vendor/libgit2/tests/resources/merge-whitespace/.gitted/refs/heads/branch_b_eol b/vendor/libgit2/tests/resources/merge-whitespace/.gitted/refs/heads/branch_b_eol deleted file mode 100644 index 9e25c6e29..000000000 --- a/vendor/libgit2/tests/resources/merge-whitespace/.gitted/refs/heads/branch_b_eol +++ /dev/null @@ -1 +0,0 @@ -bfe4ea5805af22a5b194259bda6f5f634486f891 diff --git a/vendor/libgit2/tests/resources/merge-whitespace/.gitted/refs/heads/master b/vendor/libgit2/tests/resources/merge-whitespace/.gitted/refs/heads/master deleted file mode 100644 index 61e8ae782..000000000 --- a/vendor/libgit2/tests/resources/merge-whitespace/.gitted/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -1189e10a62aadf2fea8cd018afb52c1980f40b4f diff --git a/vendor/libgit2/tests/resources/merge-whitespace/test.txt b/vendor/libgit2/tests/resources/merge-whitespace/test.txt deleted file mode 100644 index 74e83b6c5..000000000 --- a/vendor/libgit2/tests/resources/merge-whitespace/test.txt +++ /dev/null @@ -1,11 +0,0 @@ -0 -1 -2 -3 -4 -5 XXX -6 -7 -8 -9 -10 diff --git a/vendor/libgit2/tests/resources/mergedrepo/.gitted/COMMIT_EDITMSG b/vendor/libgit2/tests/resources/mergedrepo/.gitted/COMMIT_EDITMSG deleted file mode 100644 index 1f7391f92..000000000 --- a/vendor/libgit2/tests/resources/mergedrepo/.gitted/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -master diff --git a/vendor/libgit2/tests/resources/mergedrepo/.gitted/HEAD b/vendor/libgit2/tests/resources/mergedrepo/.gitted/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/vendor/libgit2/tests/resources/mergedrepo/.gitted/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/vendor/libgit2/tests/resources/mergedrepo/.gitted/MERGE_HEAD b/vendor/libgit2/tests/resources/mergedrepo/.gitted/MERGE_HEAD deleted file mode 100644 index a5bdf6e40..000000000 --- a/vendor/libgit2/tests/resources/mergedrepo/.gitted/MERGE_HEAD +++ /dev/null @@ -1 +0,0 @@ -e2809157a7766f272e4cfe26e61ef2678a5357ff diff --git a/vendor/libgit2/tests/resources/mergedrepo/.gitted/MERGE_MODE b/vendor/libgit2/tests/resources/mergedrepo/.gitted/MERGE_MODE deleted file mode 100644 index e69de29bb..000000000 diff --git a/vendor/libgit2/tests/resources/mergedrepo/.gitted/MERGE_MSG b/vendor/libgit2/tests/resources/mergedrepo/.gitted/MERGE_MSG deleted file mode 100644 index 7c4d1f5a9..000000000 --- a/vendor/libgit2/tests/resources/mergedrepo/.gitted/MERGE_MSG +++ /dev/null @@ -1,5 +0,0 @@ -Merge branch 'branch' - -Conflicts: - conflicts-one.txt - conflicts-two.txt diff --git a/vendor/libgit2/tests/resources/mergedrepo/.gitted/ORIG_HEAD b/vendor/libgit2/tests/resources/mergedrepo/.gitted/ORIG_HEAD deleted file mode 100644 index 13d4d6721..000000000 --- a/vendor/libgit2/tests/resources/mergedrepo/.gitted/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -3a34580a35add43a4cf361e8e9a30060a905c876 diff --git a/vendor/libgit2/tests/resources/mergedrepo/.gitted/config b/vendor/libgit2/tests/resources/mergedrepo/.gitted/config deleted file mode 100644 index af107929f..000000000 --- a/vendor/libgit2/tests/resources/mergedrepo/.gitted/config +++ /dev/null @@ -1,6 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true diff --git a/vendor/libgit2/tests/resources/mergedrepo/.gitted/description b/vendor/libgit2/tests/resources/mergedrepo/.gitted/description deleted file mode 100644 index 498b267a8..000000000 --- a/vendor/libgit2/tests/resources/mergedrepo/.gitted/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/vendor/libgit2/tests/resources/mergedrepo/.gitted/index b/vendor/libgit2/tests/resources/mergedrepo/.gitted/index deleted file mode 100644 index 3d29f78e7e408ffd878814458164c17daf4d419e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 842 zcmZ?q402{*U|<4b4j{$>8kZnT$hV#f-0@)5iOI_pw@J-WOT4x!w^2YaIX^EgCo{RE zST{c}Rj;I?1X&9j8`Zq5SMi#`EQb?a*5*xeUo>(14?*Rb3KW{2&ROZ`%2@GZKLH2J+c|J-0?Y4Km*VGJ8oUdwrZ+UE|>(mdd;)-&}{)L$r(Btb3iU=6Z$iTqD z5VOObfdLdBj9;OVw54=%@59IGoZWV_s^tzJS>x)l{{IsOc0{bg^uuVVIc{j?+^ANY zWVPN^TeAE$M`BH+d;I3_-h~Y8FxN0J1i6NS(%vSR$%Y07W+o;KsFZt0p+)qZ3zi&5 zEv(L8&Di%r`PgQch#h<86>U3F8ucXX8{Z6<3&FiT-9?V6uE(DzZu5Dw)?cjc)f4uv z6)>w%O@#91HvZ5*bNtTrdsXuP)=G$K`si`$^xLqV|GC0E{M-?qhCQ=COQ|;Pec4eh sYAqIP 1351371828 -0500 commit (initial): initial -9a05ccb4e0f948de03128e095f39dae6976751c5 9a05ccb4e0f948de03128e095f39dae6976751c5 Edward Thomson 1351371835 -0500 checkout: moving from master to branch -9a05ccb4e0f948de03128e095f39dae6976751c5 e2809157a7766f272e4cfe26e61ef2678a5357ff Edward Thomson 1351371872 -0500 commit: branch -e2809157a7766f272e4cfe26e61ef2678a5357ff 9a05ccb4e0f948de03128e095f39dae6976751c5 Edward Thomson 1351371873 -0500 checkout: moving from branch to master -9a05ccb4e0f948de03128e095f39dae6976751c5 3a34580a35add43a4cf361e8e9a30060a905c876 Edward Thomson 1351372106 -0500 commit: master diff --git a/vendor/libgit2/tests/resources/mergedrepo/.gitted/logs/refs/heads/branch b/vendor/libgit2/tests/resources/mergedrepo/.gitted/logs/refs/heads/branch deleted file mode 100644 index 26a5e8dc5..000000000 --- a/vendor/libgit2/tests/resources/mergedrepo/.gitted/logs/refs/heads/branch +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 9a05ccb4e0f948de03128e095f39dae6976751c5 Edward Thomson 1351371835 -0500 branch: Created from HEAD -9a05ccb4e0f948de03128e095f39dae6976751c5 e2809157a7766f272e4cfe26e61ef2678a5357ff Edward Thomson 1351371872 -0500 commit: branch diff --git a/vendor/libgit2/tests/resources/mergedrepo/.gitted/logs/refs/heads/master b/vendor/libgit2/tests/resources/mergedrepo/.gitted/logs/refs/heads/master deleted file mode 100644 index 425f7bd89..000000000 --- a/vendor/libgit2/tests/resources/mergedrepo/.gitted/logs/refs/heads/master +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 9a05ccb4e0f948de03128e095f39dae6976751c5 Edward Thomson 1351371828 -0500 commit (initial): initial -9a05ccb4e0f948de03128e095f39dae6976751c5 3a34580a35add43a4cf361e8e9a30060a905c876 Edward Thomson 1351372106 -0500 commit: master diff --git a/vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/03/db1d37504ca0c4f7c26d7776b0e28bdea08712 b/vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/03/db1d37504ca0c4f7c26d7776b0e28bdea08712 deleted file mode 100644 index 9232f79d9f2c76bee13913511faf76209e4f3193..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmV;80CN9$0V^p=O;s>7Ghi?@FfcPQQAp0uOUubjE-BW{&r8)SsVHH{dKIr3%yKx< zWo_Oh_eB%8{}5E3iJ`cpJRhvM+ur$-gNEuMh99P<#FHHDEb=dGf+~iY=Mu4F&%B~- vCrYE9gni?i;c_9kw+E^OW=g*e+xed>%)`$e;c3`2`?Hj4)83Z=R{}xZ$ZJIT diff --git a/vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/17/0efc1023e0ed2390150bb4469c8456b63e8f91 b/vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/17/0efc1023e0ed2390150bb4469c8456b63e8f91 deleted file mode 100644 index 3e124d9a4532764c32ee1ad8de32309ea7ac20d4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmV;80CN9$0V^p=O;s>7Ghi?@FfcPQQAp0uOUubjE-BW{&r8)SsVHFxK6o>V@k^k$ zm_pj08DXvrCv)7^Vkj;t&j%~MAkq3N(o^l#%U#hSYs)gVzD}DT2vrO-uXJ+n!^i2I v-FCC8C=18oGbdTTs-MbI~&1FHiBJD(Z diff --git a/vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/1f/85ca51b8e0aac893a621b61a9c2661d6aa6d81 b/vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/1f/85ca51b8e0aac893a621b61a9c2661d6aa6d81 deleted file mode 100644 index 7bb19c87380f77e925faaa4128398f5fdece1eab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 34 qcmb`ELH%b#Jv2HjMO59YyNg#frRBsoPzE;|TNNGeLqOU~c|0E#6Y1CVkZe*gdg diff --git a/vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/3a/34580a35add43a4cf361e8e9a30060a905c876 b/vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/3a/34580a35add43a4cf361e8e9a30060a905c876 deleted file mode 100644 index 0d4095ffc..000000000 --- a/vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/3a/34580a35add43a4cf361e8e9a30060a905c876 +++ /dev/null @@ -1,2 +0,0 @@ -x¥ŽK -1D]ç}¥óíDÜx/Oã"F2¯ooà®ê<*·Zo”‘»Ñ™uI²h²hrÄlÊÊ"r YùT8¢'©Ä#v¾mÎÉ0.Áø¨¥òŒÁ.:”È.#+³ñ9ÖÖáR^±¸®­níGžô“Îü~í[=ÔVjRìÑ"ŠIçÙÁjDÛ”ˆ7|N` \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/44/58b8bc9e72b6c8755ae456f60e9844d0538d8c b/vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/44/58b8bc9e72b6c8755ae456f60e9844d0538d8c deleted file mode 100644 index 33389c3027aa1df051aae2d5fb0936e535b06217..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 39 vcmbYne diff --git a/vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/47/8871385b9cd03908c5383acfd568bef023c6b3 b/vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/47/8871385b9cd03908c5383acfd568bef023c6b3 deleted file mode 100644 index 5361ea685fed14e406134365822394be85257772..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 36 ucmV+<0Nej~0ZYosPf{?nFklGD$ShU>qO{DMRE7M!R6VZ2F9HD3ay_La+Yl`P diff --git a/vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/51/6bd85f78061e09ccc714561d7b504672cb52da b/vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/51/6bd85f78061e09ccc714561d7b504672cb52da deleted file mode 100644 index a60da877cb864212c63d89d5ebda31060f740aed..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 36 scmb0ZYosPf{>8WC+Q~ELH%bl+?7$yv&l+oJxg6h2;Faw4BW35=AZm1ELKh D@g5a` diff --git a/vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/6a/ea5f295304c36144ad6e9247a291b7f8112399 b/vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/6a/ea5f295304c36144ad6e9247a291b7f8112399 deleted file mode 100644 index b16b521e6e84622d80aafdaf7f6b4be8e7490cea..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 49 zcmV-10M7q-0ZYosPf{>8WeCa0ELH%b-2CDah2+$tlElosoJxg6h2;Faw4BW35=AZm HK76FlDfT00j?MM;ES;jLc#MAS%r(EKMyg$;{77Ovnb`YSDRFs&PoWTVE696P0uj3)y diff --git a/vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/75/938de1e367098b3e9a7b1ec3c4ac4548afffe4 b/vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/75/938de1e367098b3e9a7b1ec3c4ac4548afffe4 deleted file mode 100644 index 65173fc4d0eccaee447d223a2f3752b5ff3bb261..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 41 zcmV+^0M`F_0ZYosPf{?nFklGD$ShU>qO{DMRE7M!R7Eay5xqesqR0gR$pk%%bTtu6 diff --git a/vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/7b/26923aaf452b1977eb08617c59475fb3f74b71 b/vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/7b/26923aaf452b1977eb08617c59475fb3f74b71 deleted file mode 100644 index 162fa44550249157a1940862d0118e02055b06ca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 41 xcmb4V+hH}ELH%b#Jv2HjMO594H(&_K$ShU>qO{DMRE3iAd_^vF5xpTGVgmsR90NMX|0ZYosPf{>4G-C+K$ShU>qO{DMRE3iAd_At=Afm_x0MmI&lsvK#DF6Tf diff --git a/vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/8a/ad34cc83733590e74b93d0f7cf00375e2a735a b/vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/8a/ad34cc83733590e74b93d0f7cf00375e2a735a deleted file mode 100644 index a413bc6b06e6e597abd408f9559d4f9a3a79b41d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 78 zcmV-U0I~mg0ZYosPg1ZnX0U+(1rJw87p{QAkcLDoM=D%c)dIR7lRx kOUubjE>YyNg#frxBsoPzE;|TNNGeLqOU~c|01^ovf8S{yXaE2J diff --git a/vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/8b/3f43d2402825c200f835ca1762413e386fd0b2 b/vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/8b/3f43d2402825c200f835ca1762413e386fd0b2 deleted file mode 100644 index 3ac8f6018e6b0c4901a77d4691ab92a4960919fe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 57 zcmV-90LK4#0ZYosPf{>3W(dj1ELH%b^30Nq{L&JI!qU{@lFa-(g~Yu4l8n?Mh2;Fa Pw4BW35=AZm(NYpMXha^v diff --git a/vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/8b/72416545c7e761b64cecad4f1686eae4078aa8 b/vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/8b/72416545c7e761b64cecad4f1686eae4078aa8 deleted file mode 100644 index 589a5ae9bd2c7ae839e3e076095cc536c5bbe83a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 38 wcmV+>0NMX|0ZYosPf{?nFklGD$ShU>qO{DMRE7M!R6VZ2E~3Z<0MS@Im`fcIasU7T diff --git a/vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/8f/3c06cff9a83757cec40c80bc9bf31a2582bde9 b/vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/8f/3c06cff9a83757cec40c80bc9bf31a2582bde9 deleted file mode 100644 index 6503985e31c31629d67165f8e5be722af6ef472f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 39 vcmb7Ghi?@FfcPQQAp0uOUubjE-BW{&r8)SsVHFx%)Sv{!6wIf z=D0|hY;}NJ(dnRD7>Y~E^TCRhxUZ=ho;Y9C{ND1|PS>d)Sj83Ppo(GUbr(6Nx*mU? uxXtIyT7R*&S5MfxRzQ`&OzEf=wHAvta+p&fX2)Ob!^to7tr!5l8a!L~@kGG@ diff --git a/vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/9a/05ccb4e0f948de03128e095f39dae6976751c5 b/vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/9a/05ccb4e0f948de03128e095f39dae6976751c5 deleted file mode 100644 index 7373a80d8..000000000 --- a/vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/9a/05ccb4e0f948de03128e095f39dae6976751c5 +++ /dev/null @@ -1 +0,0 @@ -x¥Ñ !Dý¦Šm@³Ë ÉÅøc6Àq#‘#AŒí‹Æü›y/™ µ”Üœ:ô#$–l•tH:é—„*D³XÖh¬VœáŸ}« ®ëË·n[-ºÃý¤KüŠ_;…ZÎ@“¦‰ÉJ GÔˆbÐqÞãŸ3"ï¹goŒ«@I \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/9d/81f82fccc7dcd7de7a1ffead1815294c2e092c b/vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/9d/81f82fccc7dcd7de7a1ffead1815294c2e092c deleted file mode 100644 index c5a651f975a5ae85c1f1dbdd187ad3a50b948848..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 36 ucmV+<0Nej~0ZYosPf{>4G-C+K$ShU>qO{DMRE3iAd_At=Ap!u?lS-i%S`Xv^ diff --git a/vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/b7/cedb8ad4cbb22b6363f9578cbd749797f7ef0d b/vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/b7/cedb8ad4cbb22b6363f9578cbd749797f7ef0d deleted file mode 100644 index 3e14b5dc83777129d3af90b02ef03623870f9908..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 66 zcmV-I0KNZs0ZYosPf{>4Hem?K$ShU>qO{DMRE7M!R7Eay5xoHxv4H>u4_8MQE?Wq| Y;v_o=P)I6D%uCL|P@u>K02293SXj^*E&u=k diff --git a/vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/d0/1885ea594926eae9ba5b54ad76692af5969f51 b/vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/d0/1885ea594926eae9ba5b54ad76692af5969f51 deleted file mode 100644 index a641adc2e08cc89fcbbb745994a166a8f35b2125..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 55 zcmV-70LcG%0ZYosPf{>3WC+Q~ELH%b(!9db)Z&uN{Jg}ZoJxhny!?`k)FOrC{JgZB N%;XY9E̯sEg}9y9;| diff --git a/vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/e2/809157a7766f272e4cfe26e61ef2678a5357ff b/vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/e2/809157a7766f272e4cfe26e61ef2678a5357ff deleted file mode 100644 index fa86662e0..000000000 --- a/vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/e2/809157a7766f272e4cfe26e61ef2678a5357ff +++ /dev/null @@ -1,3 +0,0 @@ -x¥ŽK -1D]ç¹€Òùt> âÆxžN‡q1‰¯ï(ÞÀ]Õ{P·e¹ m½Ù.¢S­Ì0[Dc’õd­ -Å…ˆbM‰Ôº¬Cgdž¼@Í>glÈX].$!ÇÑ0*zŽ¹u})/êE_ç¶<Úª²ÑO:ËWüÚÛrÒÆ¡qѤhõ@mt;;äÏ5uZyVoÓ\Mÿ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/e6/2cac5c88b9928f2695b934c70efa4285324478 b/vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/e6/2cac5c88b9928f2695b934c70efa4285324478 deleted file mode 100644 index c9841c69848c5005a46c8c23ab428b63ea526951..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 87 zcmV-d0I2_X0ZYosPf{>6FlVrV00j?MM;ES;jLc#MAS%x+$;dA)Q79};EiTE-&r?Xu t%P+}DEmBC%&r8e6OfFI6vV{P+77P`Nid=ROppaCQn3tTv1pr+qB+27-BWM5s diff --git a/vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/f7/2784290c151092abf04ce6b875068547f70406 b/vendor/libgit2/tests/resources/mergedrepo/.gitted/objects/f7/2784290c151092abf04ce6b875068547f70406 deleted file mode 100644 index cd587dbec9aa514bab3d536b1e8e16c9247783db..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmV;80CN9$0V^p=O;s>7Ghi?@FfcPQQAp0uOUubjE-BW{&r8)SsVHHPZ#@;b>>>>>> branch diff --git a/vendor/libgit2/tests/resources/mergedrepo/conflicts-two.txt b/vendor/libgit2/tests/resources/mergedrepo/conflicts-two.txt deleted file mode 100644 index e62cac5c8..000000000 --- a/vendor/libgit2/tests/resources/mergedrepo/conflicts-two.txt +++ /dev/null @@ -1,5 +0,0 @@ -<<<<<<< HEAD -This is without question another conflict! -======= -This is another conflict!!! ->>>>>>> branch diff --git a/vendor/libgit2/tests/resources/mergedrepo/one.txt b/vendor/libgit2/tests/resources/mergedrepo/one.txt deleted file mode 100644 index 75938de1e..000000000 --- a/vendor/libgit2/tests/resources/mergedrepo/one.txt +++ /dev/null @@ -1,10 +0,0 @@ -This is file one! -This is file one. -This is file one. -This is file one. -This is file one. -This is file one. -This is file one. -This is file one. -This is file one. -This is file one! diff --git a/vendor/libgit2/tests/resources/mergedrepo/two.txt b/vendor/libgit2/tests/resources/mergedrepo/two.txt deleted file mode 100644 index 7b26923aa..000000000 --- a/vendor/libgit2/tests/resources/mergedrepo/two.txt +++ /dev/null @@ -1,12 +0,0 @@ -This is file two! -This is file two. -This is file two. -This is file two. -This is file two. -This is file two. -This is file two. -This is file two. -This is file two. -This is file two. -This is file two. -This is file two! diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/HEAD b/vendor/libgit2/tests/resources/nasty/.gitted/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/vendor/libgit2/tests/resources/nasty/.gitted/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/index b/vendor/libgit2/tests/resources/nasty/.gitted/index deleted file mode 100644 index 782a50d0a8a2df69bda7abb381350bb366e11cb6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 120 zcmZ?q402{*U|<4bhL9jvS0EL@V5nfo)#Rad=~?sJKO*1nna=Z{71uFgPGDMoK3Hy= z{e1@O?`qN$Lywm99+(pBxouvCo*q!jfQzf*317$=cNrGZQ)~^P{3?1C&W~RFJrV6^ Tqu_LRtD)6HX4~A=uCiGG7NjaL diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/objects/02/28b21d477f67b9f7720565da9e760b84c8b85b b/vendor/libgit2/tests/resources/nasty/.gitted/objects/02/28b21d477f67b9f7720565da9e760b84c8b85b deleted file mode 100644 index e7cd63a28..000000000 --- a/vendor/libgit2/tests/resources/nasty/.gitted/objects/02/28b21d477f67b9f7720565da9e760b84c8b85b +++ /dev/null @@ -1,3 +0,0 @@ -x¥] -!…{vw ^Gˆè¥Ô½b#8F´û,ÚAoç|œj)·èä®7"ˆAÚ ji±&ôÁ.(q¶ÉIg¼vBYæ=×çøô-Â5ײÕ4è'è+~m -µ§Älì¹æœ :Î;ý9Ã.w¿å×ôõ’@õ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/objects/04/18f28a75dc0c4951c01842e0d794843a88178a b/vendor/libgit2/tests/resources/nasty/.gitted/objects/04/18f28a75dc0c4951c01842e0d794843a88178a deleted file mode 100644 index 7f8722e78fa65496a07231a18d8213f150244085..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 46 zcmb9VK6ZO0)PA<=i?PL)e}BX+Mg4cr?dOt8S@{k J3})>D^#B9<6#f7J diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/objects/09/9ed86cb8501ae483b1855c351fe1a506ac9631 b/vendor/libgit2/tests/resources/nasty/.gitted/objects/09/9ed86cb8501ae483b1855c351fe1a506ac9631 deleted file mode 100644 index 7738fc85d6f2322a3e51b1db4a99da20eeb7a13c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 133 zcmV;00DAv;0i}&g3IZ_@L|x|;eF2AbeojEdjVI6xv`L2uW&)XrczdIG19w&LK~<=w z+&ZAwo8FjV4!k4H$@-w9lZvGBPAlZAcShlybhIiF3wrci8=T^kT7*lkWvvVBdC*Tf n@>l%Y6lysD8g$;^j1IQaN+|{%=bitY5$8Lt`8B-(1lBmv^%jMCzfVjzIZaa)Z1y1Pq6fJCI+8g G!5{$3{1Zk1 diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/objects/0d/45fb57852c2229346a800bd3fc58e32527a21c b/vendor/libgit2/tests/resources/nasty/.gitted/objects/0d/45fb57852c2229346a800bd3fc58e32527a21c deleted file mode 100644 index d0433a0d59b6875a3e650541239bc8410c6e27ec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 45 zcmbmv^%jMCzfVjzIZaa)Z1y1Pq6fJCI+7# G!5{#;84|_- diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/objects/11/9f6cd3535de0e2a15654947a7b1a5affbf1406 b/vendor/libgit2/tests/resources/nasty/.gitted/objects/11/9f6cd3535de0e2a15654947a7b1a5affbf1406 deleted file mode 100644 index fb03b26b09f8bc42651d6ce3c201985d1e5a4873..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 50 zcmbmv^%jMCzfVjzIZaa)Z1y1Pq6fJCI+A7 Gg24dHYZGDs diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/objects/12/12c12915820e1ad523b6305c0dcdefea8b7e97 b/vendor/libgit2/tests/resources/nasty/.gitted/objects/12/12c12915820e1ad523b6305c0dcdefea8b7e97 deleted file mode 100644 index 95bc4c889..000000000 --- a/vendor/libgit2/tests/resources/nasty/.gitted/objects/12/12c12915820e1ad523b6305c0dcdefea8b7e97 +++ /dev/null @@ -1 +0,0 @@ -x¥Q Dýæ{¶P ‰1þx½ÀÛ`"%¡ãíEã ü›y/™ %ç[œÕ®Uf°Q³r£v–Æ-Þ)oó„„ÁXM‹£ GK¥Â9>©F¸¦’·²Â;ý¤ů ¡ä# F3+«q„½œ¤öóÆΈ˶ôÞVAž \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/objects/13/e5f8be09e8b7db074fb39b96e08215cc4a36f1 b/vendor/libgit2/tests/resources/nasty/.gitted/objects/13/e5f8be09e8b7db074fb39b96e08215cc4a36f1 deleted file mode 100644 index ea54830c12022227c1f4fa4ff7557a32992bc5eb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 56 zcmV-80LTA$0V^p=O;s?qWH2-^Ff%bx&~x_;(ND|IPf9FeXjt*jUmz(bVDpl{Y*B73 OyZ+2K_yqu5(h+829v4gi diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/objects/14/e70ab559b4c6a8a6fc9b6f538bd1f3934be725 b/vendor/libgit2/tests/resources/nasty/.gitted/objects/14/e70ab559b4c6a8a6fc9b6f538bd1f3934be725 deleted file mode 100644 index 371951aac13115d19bc037e06b21a6cd5c32697e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 48 zcmV-00MGw;0ZYosPf{>8VhG8|ELJEl$}CAORw&6=NK`1U%uUMA$xK$r$;`{v;{pH^ GlnsaBNfhb; diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/objects/15/f7d9f9514eeb65b9588c49b10b1da145a729a2 b/vendor/libgit2/tests/resources/nasty/.gitted/objects/15/f7d9f9514eeb65b9588c49b10b1da145a729a2 deleted file mode 100644 index a7f3683e4..000000000 --- a/vendor/libgit2/tests/resources/nasty/.gitted/objects/15/f7d9f9514eeb65b9588c49b10b1da145a729a2 +++ /dev/null @@ -1,2 +0,0 @@ -x1Â0 E™s -ïH(iÚº‘baeâ&q”Á(5BÜžpÞôõ†ÿ¢Ôº*¸`wژѓ3ºìÝC”‡œ1øepB²>»™ ½´HƒKzSKp+R7yÀ‘»ý­s]c“M²¢Ô¸ÁÓŒK€½í˜.{Wùÿs¥M?P)“´|?ó \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/objects/16/35c47d80914f0abfa43dd4234a948db5bdb107 b/vendor/libgit2/tests/resources/nasty/.gitted/objects/16/35c47d80914f0abfa43dd4234a948db5bdb107 deleted file mode 100644 index f82b82be7..000000000 --- a/vendor/libgit2/tests/resources/nasty/.gitted/objects/16/35c47d80914f0abfa43dd4234a948db5bdb107 +++ /dev/null @@ -1,2 +0,0 @@ -x=!…­9Åô&–Ÿ…Ä[+/ÀÂÝgcŒ·¯àkÞËW|/Q­ƒ -òÀ ¼œŒ±gD’±®d?*k† ÝRœÒ‹ñÅ+5¸åwl+ÕNO8ã ¿u­[jÔ©ð)Q½€šôÍ>ÀQŽˆÇ/ãÿq?Pc‚=òú¼Õ?q \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/objects/16/a701796bc3670e5c2fdaeccb7f1280c60b373f b/vendor/libgit2/tests/resources/nasty/.gitted/objects/16/a701796bc3670e5c2fdaeccb7f1280c60b373f deleted file mode 100644 index 46ed5c1e072f78dbe1d32a0cdbf429bff3749793..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 62 zcmV-E0Kxxw0V^p=O;s>4V=y!@Ff%bxNXyUH*VEJ2bN39<2eOkAix?VK{PPz`$_d!K UL=5ib54O)5VqnO?#A<8HCf4a6yR^K*hMC{P!ghz<(xa=K_i!_unaa}+01tHy A+5i9m diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/objects/2b/4b774d8c5441b22786531f34ffc77800cda8cf b/vendor/libgit2/tests/resources/nasty/.gitted/objects/2b/4b774d8c5441b22786531f34ffc77800cda8cf deleted file mode 100644 index b286daa0c0d9397033990d890fcaba5def2693e3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 50 zcmb9VK6ZO0)%ªPÚØÉÍ~£ˆ!G—ñÿq?PC‚=ðúª?Ü \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/objects/38/0b9e58872ccf1d858be4b0fc612514a080bc40 b/vendor/libgit2/tests/resources/nasty/.gitted/objects/38/0b9e58872ccf1d858be4b0fc612514a080bc40 deleted file mode 100644 index a911c3ca8dbdbec4d2e3916249bf75ccaf5b80fb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 49 zcmbwE{~u20cAVbOF)t~b<7xQC)dh7d3_?o0 F@c^M25!Cô{ôãŽò-~iS´À¡KDÖ¢‡µ2ƒŽó.ÎÖçËdÞΤ?ï \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/objects/3b/24e5c751ee9c7c89df32a0d959748aa3d0112c b/vendor/libgit2/tests/resources/nasty/.gitted/objects/3b/24e5c751ee9c7c89df32a0d959748aa3d0112c deleted file mode 100644 index 5adcd1446..000000000 --- a/vendor/libgit2/tests/resources/nasty/.gitted/objects/3b/24e5c751ee9c7c89df32a0d959748aa3d0112c +++ /dev/null @@ -1,2 +0,0 @@ -x1Â0 E™s -ïHÈmš&•baeâ&‰ÕÁ(1BÜžpþôô†÷£”²) î´æ !ÌÙ±Ðù¦¹£#tœ˜)Y;Þ#z4ôÒU*\Ò›j‚Û*¥ÉŽ¹ÛË«4a=D)'F;¹Ù‡öØgºì¿šÿ/˜+5ý@¡OÒõ c?ä \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/objects/44/14ac920acabc3eb00e3cf9375eeb0cb6859c15 b/vendor/libgit2/tests/resources/nasty/.gitted/objects/44/14ac920acabc3eb00e3cf9375eeb0cb6859c15 deleted file mode 100644 index 4eaaa0cd7485dc7c1a43e7338a61d74f2771f3f0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 135 zcmV;20C@j+0i{n%3c@fHbe&VYy-@OR6%jYyzze**yx1<%KpOG-rs55p)qG%vp_22` zKudjSl^Hy#9(uB?T1tYICV@k8i9I9&^cCS>eLn-Pw)5 p!A}iT@)eX-<7h`USvblL(cM1Y_|Fi2jeO+LfoEk1>W@ahX1lK zuL@%vc3O#mFjy=udi1`;fvhVbjF}=vo6$K;IF-3LlU}+=h1>j2b%w_x+~f&o>h`y; ryyhxRiXO7?1x9|Le*AIv>9{Q##7ThiqVj{!isi~&HO diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/objects/46/fe10fa23259b089ab050788b06df979cd7d054 b/vendor/libgit2/tests/resources/nasty/.gitted/objects/46/fe10fa23259b089ab050788b06df979cd7d054 deleted file mode 100644 index 6d1f52df992216f0467f813474b75c38bacbee96..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 137 zcmV;40CxX)0iBI84gw(%MXfo-^d<&a*ku!AY;3K(01Obez}dhU)fIdvx?5TkW7#nXQiz&UJe0`6#m798r!$}9KW3YUl4cS`2*D>?4HXP=OaI?ZS+B= diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/objects/4a/a347c8bb0456230f43f34833c97b9f52c40f62 b/vendor/libgit2/tests/resources/nasty/.gitted/objects/4a/a347c8bb0456230f43f34833c97b9f52c40f62 deleted file mode 100644 index 2a54fe205..000000000 --- a/vendor/libgit2/tests/resources/nasty/.gitted/objects/4a/a347c8bb0456230f43f34833c97b9f52c40f62 +++ /dev/null @@ -1,3 +0,0 @@ -x¥] -Â0„}Î)ö–Ý6? ˆøâ ôi²!‚i ˆ·7Š7ðmæû`Æ—œo ÈN»V™ÁE©œ#^ ‡8£ä@ r\¬ŽÌ¬FãÉxá-• -çðt5À5•¼•Üé'ø+~mð%$i;i‰#ìQ!ŠNûyã?gÄåî¶ôÞŠ½AÍ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/objects/4d/83272d0d372e1232ddc4ff3260d76fdfa2015a b/vendor/libgit2/tests/resources/nasty/.gitted/objects/4d/83272d0d372e1232ddc4ff3260d76fdfa2015a deleted file mode 100644 index d362f1dce..000000000 --- a/vendor/libgit2/tests/resources/nasty/.gitted/objects/4d/83272d0d372e1232ddc4ff3260d76fdfa2015a +++ /dev/null @@ -1,2 +0,0 @@ -x¥K -1D]ç}¥“ÉDÜx/Oà NH"2·woà®ê=¨Š5çe€@}L<%´AD“Ì„VºI:%Ir§IDPÇüs̵Á-½|KpŸkîµÀ™vúIWúŠ_;Åš/À¥@Ç-WGTˆl§ûù ?gXñ}lзêºDX—ò`oÔ™Dù \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/objects/53/41a7b545d71198b076b8ba3374a75c9a290640 b/vendor/libgit2/tests/resources/nasty/.gitted/objects/53/41a7b545d71198b076b8ba3374a75c9a290640 deleted file mode 100644 index fdfe6eb37..000000000 --- a/vendor/libgit2/tests/resources/nasty/.gitted/objects/53/41a7b545d71198b076b8ba3374a75c9a290640 +++ /dev/null @@ -1,3 +0,0 @@ -x¥] -Â0„}Î)ö–ݤiñÅèò³%‚i ˆ·7Š7ðmæø&”œo Ȫ]«Ìàš­öÄÈ^‹”ËŒz"²Ñ“’1bˆµp–J…s|ºášJÞÊ -îô“Nü~m%Fš¬ÒFØcW‰Nûyã?5ârw[z o·f@© \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/objects/5d/1ee4f24f66dcd62a30248588d33804656b2073 b/vendor/libgit2/tests/resources/nasty/.gitted/objects/5d/1ee4f24f66dcd62a30248588d33804656b2073 deleted file mode 100644 index ffd9bfd3619b9858286ed58ac02da4b464bb594c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 46 zcmb4 diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/objects/65/94bdbad86bbc8d3ed0806a23827203fbab56c6 b/vendor/libgit2/tests/resources/nasty/.gitted/objects/65/94bdbad86bbc8d3ed0806a23827203fbab56c6 deleted file mode 100644 index fa990d4084cc27cd6c0c50b0b3be8a6717ecaf40..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 132 zcmV-~0DJ#<0i}&m3PK?eMf-LYvw(N_OL~Zs0JP9UH+U=r(0O_YkC81n?OH^8$NXa diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/objects/68/e8bce48725490c376d57ebc60f0170605951a5 b/vendor/libgit2/tests/resources/nasty/.gitted/objects/68/e8bce48725490c376d57ebc60f0170605951a5 deleted file mode 100644 index c23f81597f2701fd30861cfbe6ed3ad1af8d9229..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 58 zcmV-A0LA}!0V^p=O;s>4WH2-^Ff%bx(9_p*_YBcb%g;|rEMjO_@y}l%DJNj_lD}+G QZY;b0%s2Q20B-3Kyp>uQ@Bjb+ diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/objects/69/7dc3d723a018538eb819d5db2035c15109af73 b/vendor/libgit2/tests/resources/nasty/.gitted/objects/69/7dc3d723a018538eb819d5db2035c15109af73 deleted file mode 100644 index 6d7d9f5007a1c29cd55fc1343cfb48c943fca01f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 132 zcmV-~0DJ#<0i}&g3IZ_@L|x|;eF29glaCD|Zajfrpp$fnU<}Me#M>Li8@Q|Y3aVnO z_1ZzN diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/objects/6b/7d8a5a48a3c753b75a8fe5196f9c8704ac64ad b/vendor/libgit2/tests/resources/nasty/.gitted/objects/6b/7d8a5a48a3c753b75a8fe5196f9c8704ac64ad deleted file mode 100644 index 121277fdfa40ef6654c518f0248e45a62a46d468..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 50 zcmb2o)b_2 diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/objects/6c/1f5f6fec515d33036b44c596bfae28fc460cba b/vendor/libgit2/tests/resources/nasty/.gitted/objects/6c/1f5f6fec515d33036b44c596bfae28fc460cba deleted file mode 100644 index 8172b7f0a10cc26a4b05d5a61d6a9a5e890b48a7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 47 zcmbL=5ib54OKd DYXK1< diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/objects/71/2ceb8eb3e57072447715bc4057c57aa50f629a b/vendor/libgit2/tests/resources/nasty/.gitted/objects/71/2ceb8eb3e57072447715bc4057c57aa50f629a deleted file mode 100644 index 9ed35d78a66fde762c8053efd176070c80ff55be..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 138 zcmV;50CoR(0iBI84gw(%MXfo-^d<(_*@aDvv9Y!C0_*_UEpRq4#&~=23cl*+75@>J zvI&@3AEc%PcEQCtjGjhBvsml=G!7;Ym@_%&wWb(6Wffksa)n!bhZ^Cra%ud8bL#fD su4SXjjkBDH%LR-baGac<;ix;R%ifjr|AV@RCLbt)U=Ol>0p*!Lx}!Hl2mk;8 diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/objects/7a/0538bc4e20aecb36ef221f2077eb30ebe0bcb2 b/vendor/libgit2/tests/resources/nasty/.gitted/objects/7a/0538bc4e20aecb36ef221f2077eb30ebe0bcb2 deleted file mode 100644 index 0c3ea2694..000000000 --- a/vendor/libgit2/tests/resources/nasty/.gitted/objects/7a/0538bc4e20aecb36ef221f2077eb30ebe0bcb2 +++ /dev/null @@ -1,2 +0,0 @@ -x1!E­9Åô&X!1ÆÆÖÊ ÌÂÝÇÀãíÅ+øªŸWü—¸ÖMÀD½“FÚ\‚‰9ئèÓBÖÅÙMŽ¼¥ŠCc¼Â—¬ÜàšßØ2ÜW®p¢aëR·Ô¸s‘Câz3Yççcˆ°×5äè -ýÿ nØåLg;CMh+Vud pO~5LW5>s+A^RgM9%GfXQf7$p(lc(SP-*U6h|Fu3X0{|q>A6HtsB{2X1 diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/objects/7d/4e382485ace068fb83b768ba1a1c674afbdc1d b/vendor/libgit2/tests/resources/nasty/.gitted/objects/7d/4e382485ace068fb83b768ba1a1c674afbdc1d deleted file mode 100644 index f7be9ab39c6fe4d95b63d3eb2e64855b5c3050e0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 62 zcmV-E0Kxxw0V^p=O;s>4V=y!@Ff%bxNXyUH*VEJ2OV2FP2eOkAix?VK{PPz`$_d!K UL=5ib54O9VK6ZO0tG$yM-9E6Aq-UyOYW}t$hx%Y=;W=sB_UC!sf}|1 HJ}nT^s!tQb diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/objects/82/482ad2e683edfc14f7de359e4f9a5e88909c51 b/vendor/libgit2/tests/resources/nasty/.gitted/objects/82/482ad2e683edfc14f7de359e4f9a5e88909c51 deleted file mode 100644 index 16ea98e26942ea674e033aa276cdfc79739888f7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 45 zcmbTux5O&BX?J2jPAtv5eDP#-skhT2pJ3_dObkA^ G1w#Sdi4+(B diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/objects/89/9ff28744bed5bece69c78ba752c7dc3e954629 b/vendor/libgit2/tests/resources/nasty/.gitted/objects/89/9ff28744bed5bece69c78ba752c7dc3e954629 deleted file mode 100644 index 6f552e5c332c21baf30e4ec311946dc4f0689b83..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 136 zcmV;30C)d*0i})04FVw)06kO1Yd{5-Z(@uWJFo#h50?Y`5*Fjl+Qk~YP3AC@sI@vk zcySmV5u`HKWQ~3)z62Y!abUJuxA|~c`igTboK=oDL;V#sX0^t diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/objects/8b/cbb6e0c0f9554efd5401e1ec14a4b2595eb3bf b/vendor/libgit2/tests/resources/nasty/.gitted/objects/8b/cbb6e0c0f9554efd5401e1ec14a4b2595eb3bf deleted file mode 100644 index bba2035da..000000000 --- a/vendor/libgit2/tests/resources/nasty/.gitted/objects/8b/cbb6e0c0f9554efd5401e1ec14a4b2595eb3bf +++ /dev/null @@ -1,2 +0,0 @@ -x¥] -!…{vw ^F…ˆ^ZAmÀÑ+9‚cD»Ï¢ôvÎ÷Á9¡–rë€Nîz#‚—&:ΈÙÖ„)ðTVz‹z‰Æ-–ùGϵÁ9>}‹p͵lu… úI'úŠ_›B-G@…³SR*{®9gƒŽóNΰËÝoù5½ƒA) \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/objects/8c/e7a3ef59c3d602a0296321eb964218f3d52fae b/vendor/libgit2/tests/resources/nasty/.gitted/objects/8c/e7a3ef59c3d602a0296321eb964218f3d52fae deleted file mode 100644 index 6f3484c1ae520cbb98c6625cf622beb31a102b47..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 56 zcmV-80LTA$0V^p=O;s?qWH2-^Ff%bx&`ZxOiAl@PPf9FeXjt*jUmz(bVDpl{Y*B73 OyZ+2K_yquL{t@$0lNXl& diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/objects/8f/1dcd43aa0164eb6ec319c3ec8879ca5cf62c1e b/vendor/libgit2/tests/resources/nasty/.gitted/objects/8f/1dcd43aa0164eb6ec319c3ec8879ca5cf62c1e deleted file mode 100644 index f802e5af7..000000000 --- a/vendor/libgit2/tests/resources/nasty/.gitted/objects/8f/1dcd43aa0164eb6ec319c3ec8879ca5cf62c1e +++ /dev/null @@ -1,2 +0,0 @@ -x¥K -1D]ç}‡|:c7ˆ¸ñztˆ` ÌDÄÛŸ«zªb«õÚÁ°ÛôEÈ"Ù¬Ìä$åh0ï’8Ï‚™ƒ"Ö½QáÑK[à”žaIp)­®í{ô“Žò¿6ÅV`ÐÌŒHÚÂV{­Õ ã¼ËŸ3ê| kyMoA/ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/objects/91/602c85bb50dd834205edd30435b77d5bb9ccf0 b/vendor/libgit2/tests/resources/nasty/.gitted/objects/91/602c85bb50dd834205edd30435b77d5bb9ccf0 deleted file mode 100644 index d7147fb1c..000000000 --- a/vendor/libgit2/tests/resources/nasty/.gitted/objects/91/602c85bb50dd834205edd30435b77d5bb9ccf0 +++ /dev/null @@ -1,3 +0,0 @@ -x¥Q -1 Dýî)r—d»ÛZñÇèB“¥‚µÐ­ˆ··Š7ðoÞ˜‰%çk -vÓª*ÄiÔ£Š“°8kÉw`‰½šy¢(!~´T*œäÉUà’J^ËöÚí'õ[ühˆ%€&òH“ö8#šnûyÓ?gÌùÆkz o!çA2 \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/objects/91/cd2c95af92883550b45fcc838013ae7e2954df b/vendor/libgit2/tests/resources/nasty/.gitted/objects/91/cd2c95af92883550b45fcc838013ae7e2954df deleted file mode 100644 index da9d5c46736658c645d71008944d1cc678f442b6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 138 zcmV;50CoR(0V^p=O;s>7HefI`G5`VvCr1|_Pd{%4N#VwKCHIcZ>HIk>=|bpffrwqa zFHOKI{QX=R*0kJ+a*Ebc{LBC6)Tv`fI+Xv+I02DON=(Vg%*$qYDr3LI|7GJFO`d-D sf6L82|JVAo3~EJwUMfSJ!-4jKh@&hDmPSv769UiMTn?NK0FQ__;@WLN-2eap diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/objects/94/f37c29173c8fa45a232b17e745c82132b2fafd b/vendor/libgit2/tests/resources/nasty/.gitted/objects/94/f37c29173c8fa45a232b17e745c82132b2fafd deleted file mode 100644 index 475d26b2face0710ed9454c3d5d25b991dd01d0f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 132 zcmV-~0DJ#<0i}&g3IZ_@L|x|;eF29~Co?f1;>Hu`1@h?-!5GLy#M>Li8@Q`_1+PLa z<=R17wdsu+IBFk|R9a*VO3x`F?zFc=p2$YhkqH+z!aaJf4NmdtT7*lkWvzGE^Prz} mf(tQcE+`Xb`qIBZ@)CdFMYh;(T*!eob%rI6&s&yFCg3 diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/objects/96/156716851c0afb4702b0d2c4ac8c496a730e29 b/vendor/libgit2/tests/resources/nasty/.gitted/objects/96/156716851c0afb4702b0d2c4ac8c496a730e29 deleted file mode 100644 index 57419bc77..000000000 --- a/vendor/libgit2/tests/resources/nasty/.gitted/objects/96/156716851c0afb4702b0d2c4ac8c496a730e29 +++ /dev/null @@ -1 +0,0 @@ -x;Â0©sŠí‘PüÙKÑÐRqµ½VR˜EÎ"Äí1W`ª§)Þ$©uU0aÜic›­Ëh0ŒœlAWØGŒÑ1&š,;dÏeF襋4¸æ7µ ÷Eê&8q·¿u©kj²IÑC’zcÇé8Ø¡ËÞUþÿa¸Ñ¦¨”àIº|\ä@o \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/objects/96/3fdf003bf7261b9155c5748dc0945349b69e68 b/vendor/libgit2/tests/resources/nasty/.gitted/objects/96/3fdf003bf7261b9155c5748dc0945349b69e68 deleted file mode 100644 index ff1d33e5cc4aecbb998f62863ebf782f13eb0878..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 44 zcmb)5VqnO?#A<8HwysOPMlt^ñ=âZ79N;i9ƒ[| -hÑÔä­^¼ÅP²£+‘‚Ÿ ’3˜¾då×ôÆ–à¾ríü€Sö·.u£Æ‹ˆëæ£6Öùa? Ô£+ùÿuÃ.¨HðDY¿2Ù@% \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/objects/9d/5898503adc01d763e279ac8fcefbe865b19031 b/vendor/libgit2/tests/resources/nasty/.gitted/objects/9d/5898503adc01d763e279ac8fcefbe865b19031 deleted file mode 100644 index 7cb310622..000000000 --- a/vendor/libgit2/tests/resources/nasty/.gitted/objects/9d/5898503adc01d763e279ac8fcefbe865b19031 +++ /dev/null @@ -1,4 +0,0 @@ -x¥O[ ô›Sì4 R -Icüñz -Û´±t bÔÛK7ðk^ÉL&pJS%qS2ôTô=5­1vo•4Ñ5ƒt®‚÷zˆºu­þQFÎpŠOŸ#\FNw^ £ê®ìHßà§vÓ¤V袶°ÅQT·Žú³Fœß©çy -0OËèu›yý$>›…Fû \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/objects/9e/24726d64589ba02430da8cebb5712dad35593d b/vendor/libgit2/tests/resources/nasty/.gitted/objects/9e/24726d64589ba02430da8cebb5712dad35593d deleted file mode 100644 index 2cf9535ae0d03ab9ccad9b18ef851182336f452b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 136 zcmV;30C)d*0iBII4niRiMXg!I^d<(F2R;&GY;3LE0N?Nm90OyFyBD|MscuejPo&m1 z2Ib_Ad(KdFl*T0=&=hNM30Ra(P6l06$|zT>3~CvLe{rP_*Yx&1!M#!&^ng>I_O~u= qi=74)K16C~P#PCwkE?^doQNrBm-GJ*;^qf`p!o<-&-DxF4?m=Olsw)5 diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/objects/9e/683cdaf9ea2727c891b4cf8f7f11e9e28a67ca b/vendor/libgit2/tests/resources/nasty/.gitted/objects/9e/683cdaf9ea2727c891b4cf8f7f11e9e28a67ca deleted file mode 100644 index 2e36dcae7225d8e2c55b2b11a79b24efe93a92f3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 50 zcmb2CtPDKy G{O$nMpA)tK diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/objects/a0/d89aa95628fcd6b64fd5b23dd56b906b06bfe2 b/vendor/libgit2/tests/resources/nasty/.gitted/objects/a0/d89aa95628fcd6b64fd5b23dd56b906b06bfe2 deleted file mode 100644 index c1de43b2a4349c32ac643379e3ad30a1776bcfe8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 166 zcmV;X09pTd0V^p=O;s>7Gh{F{G5`VvCr1|_Pd{%4N#VwKCHIcZ>HIk>=|bpffrwqa zFHOKI{QX=R*0kJ+a*Ebc{LBC6)Tv`fI+Xv+I02DOEKW&dc#*O3TC=$TlXz={)I7o4 zE8P06LLt&gi77dmdD#q4W$c&uzifP?$);wX!P UrO{L2guwGQmjh=50GrT4-z8d8x&QzG diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/objects/a5/76a98d3279989226992610372035b76a01a3e9 b/vendor/libgit2/tests/resources/nasty/.gitted/objects/a5/76a98d3279989226992610372035b76a01a3e9 deleted file mode 100644 index 75fa458e758747804440cef38d59518a5fa7853c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 136 zcmV;30C)d*0iBI84#F@H1gZUs>yc0{Hi<1EL_^C diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/objects/a7/8dde970cffbb71d67bef2a74aa72c6621d9819 b/vendor/libgit2/tests/resources/nasty/.gitted/objects/a7/8dde970cffbb71d67bef2a74aa72c6621d9819 deleted file mode 100644 index 78c2fe4f82fb28305c7337015557bd8c868b8b10..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 86 zcmV-c0IC0Y0V^p=O;s>AVlXr^00IRkM;9MYKW_#};l_6*_m0fz{5dP>Lg;CMh+Vud sO~5LW5>p;E^yFmbWivdLv0vi4WH2-^Ff%bx(9_pT&n(eT%g;|rEMjO_@y}l%DJNj_lD}+G QZY;b0%s2Q20D37B9E)@pZ2$lO diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/objects/b1/1df9aee97a65817e8904a74f5e6a1c62c7a275 b/vendor/libgit2/tests/resources/nasty/.gitted/objects/b1/1df9aee97a65817e8904a74f5e6a1c62c7a275 deleted file mode 100644 index b2e0eda1a44a425399be1040d97a2512a840234f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 50 zcmV-20L}k+0V^p=O;s>9VK6ZO0)_Xx_v@u+mM~O3EV;YlBkR(pqm#GlmV`u^rZ&z6 I09FMNtPGzO{Qv*} diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/objects/b8/3795b1e0eb54f22f7056119db132500d0cdc05 b/vendor/libgit2/tests/resources/nasty/.gitted/objects/b8/3795b1e0eb54f22f7056119db132500d0cdc05 deleted file mode 100644 index 6cee4f9d823d3ff9160feaa143681c6d564f3c69..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 56 zcmV-80LTA$0V^p=O;s?qWH2-^Ff%bx&`ZxO(ND|IPf9FeXjt*jUmz(bVDpl{Y*B73 OyZ+2K_yquH5)sB(HWtVL diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/objects/bb/29ec85546d29b0bcc314242660d7772b0a3803 b/vendor/libgit2/tests/resources/nasty/.gitted/objects/bb/29ec85546d29b0bcc314242660d7772b0a3803 deleted file mode 100644 index 00ab02c217ff63114b4cde9edddc3d0977df798a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 50 zcmbmv^%jMCzfVjzIZaa)Z1y1Pq6fJCI+7( G!9W1IsuHRI diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/objects/bc/e2dabe5766838216d95f199d95aa4fd479a084 b/vendor/libgit2/tests/resources/nasty/.gitted/objects/bc/e2dabe5766838216d95f199d95aa4fd479a084 deleted file mode 100644 index b1eab10050a60a8155f381e4f05195a53c8b4c88..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 83 zcmV-Z0IdIb0V^p=O;s?nWH2!R0tF{W7avbQZ-%Eb_DlR39FP-0bsztxwAg pjlfEh5>s+A^RgKvg&W_M+&eO-^XIIj3!$e4B6jh<1OPW&A6KplB)bK&wzExH=ZVldYl89Q7bHuiECr2rie9pEgKK(IOK@Mgc7DJq5Bpn} ry2ZwwiyR`?GvG8E>-;gmUJuleqbvFU2X&(^AE*@JNwR(c0CPXvT;M*; diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/objects/c3/a70f8a376f17adccfb52b48e2831bfef2a2172 b/vendor/libgit2/tests/resources/nasty/.gitted/objects/c3/a70f8a376f17adccfb52b48e2831bfef2a2172 deleted file mode 100644 index b43d3f165..000000000 --- a/vendor/libgit2/tests/resources/nasty/.gitted/objects/c3/a70f8a376f17adccfb52b48e2831bfef2a2172 +++ /dev/null @@ -1,2 +0,0 @@ -xÍ= -1`ë=Åô‚d'n6"6¶V^ ¿d‹8’Œˆ·7^ÁW=¾â½Àµn3©´”@y‹Êĸ¢Ó^{Ò˜ýb0F¤™hYMjr/)Üàß®E¸®pJCíR·Ð¸s–Càz†õq1«%Ø«‘iàø•ôÿÂts]>P]€§“ò?1 \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/objects/c4/89e70ed6d9f6331770eae21a77d15afd11cd99 b/vendor/libgit2/tests/resources/nasty/.gitted/objects/c4/89e70ed6d9f6331770eae21a77d15afd11cd99 deleted file mode 100644 index 1d763482f01fb9ba80823f8708df898a0c334a9f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 56 zcmV-80LTA$0V^p=O;s>4WH2-^Ff%bxNXyUH*VEGnQb~zL3=J#(`3ofF1Z-aNmo3VT OW!Ini2EPD&SrQycd=_K? diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/objects/c6/72414d4d08111145ef8202f21c95fa7e688aee b/vendor/libgit2/tests/resources/nasty/.gitted/objects/c6/72414d4d08111145ef8202f21c95fa7e688aee deleted file mode 100644 index 1b79b342c36e06fc2ca5638bd5a84e0b9cbea7fc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 56 zcmV-80LTA$0V^p=O;s?qWH2-^Ff%bx&~x_;iAl@PPf9FeXjt*jUmz(bVDpl{Y*B73 OyZ+2K_yquAz7dmGe-|78 diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/objects/c8/f98a1762ec016c30f0d73512df399dedefc3fd b/vendor/libgit2/tests/resources/nasty/.gitted/objects/c8/f98a1762ec016c30f0d73512df399dedefc3fd deleted file mode 100644 index 85ddc7f9b..000000000 --- a/vendor/libgit2/tests/resources/nasty/.gitted/objects/c8/f98a1762ec016c30f0d73512df399dedefc3fd +++ /dev/null @@ -1,3 +0,0 @@ -x= -1F­sŠéÙÄ͈ØØZy1™%[ÄY’ñöÆ+øªW|/q­«€ŽÓN<´ÎKD¢èÑÙ =…8ÍèçÅ’CœI· -_R¸Á5¿±e¸®Ÿp¢aëR×Ô¸ó"‡Äõ Úgë|ˆ°ŸjÈÑúÿAÝ°Ë*&ØPÊ+?ò \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/objects/cc/bbfdb796f9b03298f5c7225e8f830784e1a3b1 b/vendor/libgit2/tests/resources/nasty/.gitted/objects/cc/bbfdb796f9b03298f5c7225e8f830784e1a3b1 deleted file mode 100644 index 732474aef..000000000 --- a/vendor/libgit2/tests/resources/nasty/.gitted/objects/cc/bbfdb796f9b03298f5c7225e8f830784e1a3b1 +++ /dev/null @@ -1,2 +0,0 @@ -x¥OI -1ôœWô]²tŒ#"^üè$­3‡LC&â÷͈?°Nµ@•¤”¹Õ~×*30rŽî`Ø›ÑÙèSê:f4³#´Ç‘8±¢W›¤Â-¿©f¸ORVYàÌÝÝØ•¿ÁO IÊ š0X°×ª»}¼ñŸ5jxÎíôZ`û¡>Þ›E® \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/objects/cd/44b4ea1066b3fa1d4b3baad8dc1531aec287a6 b/vendor/libgit2/tests/resources/nasty/.gitted/objects/cd/44b4ea1066b3fa1d4b3baad8dc1531aec287a6 deleted file mode 100644 index 51ad3880e5eee944f1b25163fa6ca0d852477fb5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 47 zcmbx-Rt^#q>L=5ib54O}‹p͵¬uúI'þŠ_›¨–#È4NYm¶¨Å ã¼óŸ3âr÷k~Mo"A< \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/objects/dc/37c5f1521fb76fe1c1ac7b13187f9396a59247 b/vendor/libgit2/tests/resources/nasty/.gitted/objects/dc/37c5f1521fb76fe1c1ac7b13187f9396a59247 deleted file mode 100644 index 57329de37fbc1a7a590ed7d975f5ecc1fc26d6c3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 58 zcmV-A0LA}!0V^p=O;s>4WH2-^Ff%bx(2LP?_Y8?i%g;|rEMjO_@y}l%DJNj_lD}+G QZY;b0%s2Q20C}Pk7JWY#a{vGU diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/objects/de/bdc4a004fda6141a17d9c297617be70d40248f b/vendor/libgit2/tests/resources/nasty/.gitted/objects/de/bdc4a004fda6141a17d9c297617be70d40248f deleted file mode 100644 index de34bd430..000000000 --- a/vendor/libgit2/tests/resources/nasty/.gitted/objects/de/bdc4a004fda6141a17d9c297617be70d40248f +++ /dev/null @@ -1,2 +0,0 @@ -x¥K -1D]ç}‡tf&qã ôm§ÃÆ@&"ÞÞ(ÞÀ]Õ{PÅ%çk ã¦UbýÈ‘R2Î8ö/'Ÿ\B” Æ“uLŠm)ŽñI5Ây)y-wØI§Ÿt¯øµKÞNè4ζzÖZuÚÏ›ü9£N7Z—×ðmÐA¤ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/objects/e2/377bdbc93b30a34ed5deefedded89b947ff8f4 b/vendor/libgit2/tests/resources/nasty/.gitted/objects/e2/377bdbc93b30a34ed5deefedded89b947ff8f4 deleted file mode 100644 index f365908e0..000000000 --- a/vendor/libgit2/tests/resources/nasty/.gitted/objects/e2/377bdbc93b30a34ed5deefedded89b947ff8f4 +++ /dev/null @@ -1,2 +0,0 @@ -x¥K -1D]ç}‡îÉDÜx½@&i‰` d"âíâ ÜU½U±–rí@^nzcãØ-‘•³³V£´&iËK4xA²hP{MA‹ðè¹68¦gh ι–µÞaǃ~Ò¿âצXËH‘ñÒÎ$a‹Q :Î;ÿ9#N·°æ×ôÑ@W \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/objects/e3/99c4fc4c07cb7947d2f3d966bc374df6ccc691 b/vendor/libgit2/tests/resources/nasty/.gitted/objects/e3/99c4fc4c07cb7947d2f3d966bc374df6ccc691 deleted file mode 100644 index d8c237946..000000000 --- a/vendor/libgit2/tests/resources/nasty/.gitted/objects/e3/99c4fc4c07cb7947d2f3d966bc374df6ccc691 +++ /dev/null @@ -1,2 +0,0 @@ -x¥Q -1 Dýî)r—¤›Ú.,â'Ð ”l¤‚µÐ­ˆ··Š7ðoæ=˜‘’óµMã¦UUÀèƒ2ªcö$Èä$â. sx±lÕÕšøh©T8.ÏX8§’×r‡Y;ý¤ƒ~ů RòˆÉ#… ¶èM§ý¼éŸ3æt‹kz o{˜@8 \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/objects/e4/edb361e51932b5ccedbc7ee41b4d3a4289aece b/vendor/libgit2/tests/resources/nasty/.gitted/objects/e4/edb361e51932b5ccedbc7ee41b4d3a4289aece deleted file mode 100644 index a9b181815a9e29bb5000680fac07fc49e1ae4688..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 50 zcmb9VK6i>Ff%bxNXySpN-Sa!dCs*pa?7z5%l^#H5AMGBd9wF& JRRA&w5pCXI6#oDK diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/objects/e7/3a04f71f11ab9d7dde72ff793882757a03f16e b/vendor/libgit2/tests/resources/nasty/.gitted/objects/e7/3a04f71f11ab9d7dde72ff793882757a03f16e deleted file mode 100644 index 14144d736c6e29a96dc4d9193fa71928d0c83248..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 50 zcmbTux5O&BX?J2jPAtv5eDP#-skhT2pJ3_dObkB7 Gf`I_k4HIkt diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/objects/e8/68b1d6833710021785581a9e11dba8468f3a55 b/vendor/libgit2/tests/resources/nasty/.gitted/objects/e8/68b1d6833710021785581a9e11dba8468f3a55 deleted file mode 100644 index 8311ad31ba004280931e2433b6b23b35f7bbdf44..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 49 zcmV-10M7q-0V^p=O;s>9VlXr?Ff%bxNGwiCW9Yt?(s$8d&AfB`oo8qD@BXXC;Zy|x H7Mu^i$L=5ib54O)5U|`6=#A?g7u1mc}G5tTux5O&BX?J2jPAtv5eDP#-skhT2pJ3_dObk8| Gf&l=+yAsd< diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/objects/fa/9cfdbeaaf3a91ff4b84d74412cd59d9b16a615 b/vendor/libgit2/tests/resources/nasty/.gitted/objects/fa/9cfdbeaaf3a91ff4b84d74412cd59d9b16a615 deleted file mode 100644 index 890324e6cbe86ef6f805389c1dde2ac2f889bfae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 136 zcmV;30C)d*0i}((4FWL`0Eu12HUN0fd&VarL_!BNu>Lp)W+k5y8MR|-ARA3E6QtJC z0ThO??5$ra+g%9zYZT diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/objects/fd/7a37d92197267e55e1fc0cc4f283a815bd79b8 b/vendor/libgit2/tests/resources/nasty/.gitted/objects/fd/7a37d92197267e55e1fc0cc4f283a815bd79b8 deleted file mode 100644 index c8d38ca46c6e7471571bd7154436210c82f3e126..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 43 zcmb)5U|`6=#A?eX*6AO+w7kNGncu_0c8A^4qpO_va5Efb<%s|Q0-+4k diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dot_backslash_dotcapitalgit_path b/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dot_backslash_dotcapitalgit_path deleted file mode 100644 index 06132bc80..000000000 --- a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dot_backslash_dotcapitalgit_path +++ /dev/null @@ -1 +0,0 @@ -0228b21d477f67b9f7720565da9e760b84c8b85b diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dot_dotcapitalgit_path b/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dot_dotcapitalgit_path deleted file mode 100644 index fd12c3ec5..000000000 --- a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dot_dotcapitalgit_path +++ /dev/null @@ -1 +0,0 @@ -e2377bdbc93b30a34ed5deefedded89b947ff8f4 diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dot_dotgit_path b/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dot_dotgit_path deleted file mode 100644 index 1f9b2d4a1..000000000 --- a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dot_dotgit_path +++ /dev/null @@ -1 +0,0 @@ -4aa347c8bb0456230f43f34833c97b9f52c40f62 diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dot_dotgit_tree b/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dot_dotgit_tree deleted file mode 100644 index dd9a6c0f7..000000000 --- a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dot_dotgit_tree +++ /dev/null @@ -1 +0,0 @@ -8bcbb6e0c0f9554efd5401e1ec14a4b2595eb3bf diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dot_git_colon b/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dot_git_colon deleted file mode 100644 index 39052d99a..000000000 --- a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dot_git_colon +++ /dev/null @@ -1 +0,0 @@ -4414ac920acabc3eb00e3cf9375eeb0cb6859c15 diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dot_git_colon_stuff b/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dot_git_colon_stuff deleted file mode 100644 index a3bc39f66..000000000 --- a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dot_git_colon_stuff +++ /dev/null @@ -1 +0,0 @@ -ccbbfdb796f9b03298f5c7225e8f830784e1a3b1 diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dot_git_dot b/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dot_git_dot deleted file mode 100644 index b20a1e0ac..000000000 --- a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dot_git_dot +++ /dev/null @@ -1 +0,0 @@ -26b665c162f67acae67779445f3c7b9782b0a6d7 diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dot_path b/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dot_path deleted file mode 100644 index b3c7ab682..000000000 --- a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dot_path +++ /dev/null @@ -1 +0,0 @@ -bf7ab4723fcc57ecc7fceccf591d6c4773491569 diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dot_path_two b/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dot_path_two deleted file mode 100644 index 515e983c5..000000000 --- a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dot_path_two +++ /dev/null @@ -1 +0,0 @@ -debdc4a004fda6141a17d9c297617be70d40248f diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dot_tree b/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dot_tree deleted file mode 100644 index cf95837cc..000000000 --- a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dot_tree +++ /dev/null @@ -1 +0,0 @@ -697dc3d723a018538eb819d5db2035c15109af73 diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotcapitalgit_backslash_path b/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotcapitalgit_backslash_path deleted file mode 100644 index 6e4344dd6..000000000 --- a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotcapitalgit_backslash_path +++ /dev/null @@ -1 +0,0 @@ -099ed86cb8501ae483b1855c351fe1a506ac9631 diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotcapitalgit_path b/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotcapitalgit_path deleted file mode 100644 index 58227911e..000000000 --- a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotcapitalgit_path +++ /dev/null @@ -1 +0,0 @@ -e87caf56c91ab8d14e4ee8eb56308533503d1885 diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotcapitalgit_tree b/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotcapitalgit_tree deleted file mode 100644 index dfb7a1ab0..000000000 --- a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotcapitalgit_tree +++ /dev/null @@ -1 +0,0 @@ -39fb3af508440cf970b92767f6d081c811574d2a diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotdot_dotcapitalgit_path b/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotdot_dotcapitalgit_path deleted file mode 100644 index 6a24cd70e..000000000 --- a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotdot_dotcapitalgit_path +++ /dev/null @@ -1 +0,0 @@ -d2eb26d4938550487de59a017a7bfee8ca46b5f4 diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotdot_dotgit_path b/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotdot_dotgit_path deleted file mode 100644 index 4d79b3bb6..000000000 --- a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotdot_dotgit_path +++ /dev/null @@ -1 +0,0 @@ -1212c12915820e1ad523b6305c0dcdefea8b7e97 diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotdot_dotgit_tree b/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotdot_dotgit_tree deleted file mode 100644 index 6ae117ee9..000000000 --- a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotdot_dotgit_tree +++ /dev/null @@ -1 +0,0 @@ -1e3c845808fa5883aa4bcf2f882172edb72a7a32 diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotdot_path b/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotdot_path deleted file mode 100644 index 185e13b11..000000000 --- a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotdot_path +++ /dev/null @@ -1 +0,0 @@ -91602c85bb50dd834205edd30435b77d5bb9ccf0 diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotdot_tree b/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotdot_tree deleted file mode 100644 index d30a7b52e..000000000 --- a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotdot_tree +++ /dev/null @@ -1 +0,0 @@ -8f1dcd43aa0164eb6ec319c3ec8879ca5cf62c1e diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_backslash_path b/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_backslash_path deleted file mode 100644 index 6e4344dd6..000000000 --- a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_backslash_path +++ /dev/null @@ -1 +0,0 @@ -099ed86cb8501ae483b1855c351fe1a506ac9631 diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_hfs_ignorable_1 b/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_hfs_ignorable_1 deleted file mode 100644 index dc48bd6fc..000000000 --- a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_hfs_ignorable_1 +++ /dev/null @@ -1 +0,0 @@ -46fe10fa23259b089ab050788b06df979cd7d054 diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_hfs_ignorable_10 b/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_hfs_ignorable_10 deleted file mode 100644 index b3a972629..000000000 --- a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_hfs_ignorable_10 +++ /dev/null @@ -1 +0,0 @@ -9ab85e507899c19dca57778c9b6e5f1ec799b911 diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_hfs_ignorable_11 b/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_hfs_ignorable_11 deleted file mode 100644 index edf27988a..000000000 --- a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_hfs_ignorable_11 +++ /dev/null @@ -1 +0,0 @@ -15f7d9f9514eeb65b9588c49b10b1da145a729a2 diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_hfs_ignorable_12 b/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_hfs_ignorable_12 deleted file mode 100644 index c4e682e10..000000000 --- a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_hfs_ignorable_12 +++ /dev/null @@ -1 +0,0 @@ -c3a70f8a376f17adccfb52b48e2831bfef2a2172 diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_hfs_ignorable_13 b/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_hfs_ignorable_13 deleted file mode 100644 index 76a155c20..000000000 --- a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_hfs_ignorable_13 +++ /dev/null @@ -1 +0,0 @@ -c2a2ddd339574e5cbfd9228be840eb1bf496de4e diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_hfs_ignorable_14 b/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_hfs_ignorable_14 deleted file mode 100644 index be2f83551..000000000 --- a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_hfs_ignorable_14 +++ /dev/null @@ -1 +0,0 @@ -712ceb8eb3e57072447715bc4057c57aa50f629a diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_hfs_ignorable_15 b/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_hfs_ignorable_15 deleted file mode 100644 index 3fdeecea6..000000000 --- a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_hfs_ignorable_15 +++ /dev/null @@ -1 +0,0 @@ -3b24e5c751ee9c7c89df32a0d959748aa3d0112c diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_hfs_ignorable_16 b/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_hfs_ignorable_16 deleted file mode 100644 index 2739555f7..000000000 --- a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_hfs_ignorable_16 +++ /dev/null @@ -1 +0,0 @@ -c8f98a1762ec016c30f0d73512df399dedefc3fd diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_hfs_ignorable_2 b/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_hfs_ignorable_2 deleted file mode 100644 index 480832e01..000000000 --- a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_hfs_ignorable_2 +++ /dev/null @@ -1 +0,0 @@ -35ae236308929a536fb4e852278a9b98c42babb3 diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_hfs_ignorable_3 b/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_hfs_ignorable_3 deleted file mode 100644 index 8510ece13..000000000 --- a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_hfs_ignorable_3 +++ /dev/null @@ -1 +0,0 @@ -96156716851c0afb4702b0d2c4ac8c496a730e29 diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_hfs_ignorable_4 b/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_hfs_ignorable_4 deleted file mode 100644 index 754b55edd..000000000 --- a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_hfs_ignorable_4 +++ /dev/null @@ -1 +0,0 @@ -7a0538bc4e20aecb36ef221f2077eb30ebe0bcb2 diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_hfs_ignorable_5 b/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_hfs_ignorable_5 deleted file mode 100644 index 161ebc43b..000000000 --- a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_hfs_ignorable_5 +++ /dev/null @@ -1 +0,0 @@ -1635c47d80914f0abfa43dd4234a948db5bdb107 diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_hfs_ignorable_6 b/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_hfs_ignorable_6 deleted file mode 100644 index f8a5fa3f7..000000000 --- a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_hfs_ignorable_6 +++ /dev/null @@ -1 +0,0 @@ -9e24726d64589ba02430da8cebb5712dad35593d diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_hfs_ignorable_7 b/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_hfs_ignorable_7 deleted file mode 100644 index ad5ad1d70..000000000 --- a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_hfs_ignorable_7 +++ /dev/null @@ -1 +0,0 @@ -ce22b3cd9a01efafc370879c1938e0c32fb6f195 diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_hfs_ignorable_8 b/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_hfs_ignorable_8 deleted file mode 100644 index 4d10c4009..000000000 --- a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_hfs_ignorable_8 +++ /dev/null @@ -1 +0,0 @@ -a576a98d3279989226992610372035b76a01a3e9 diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_hfs_ignorable_9 b/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_hfs_ignorable_9 deleted file mode 100644 index a935018fa..000000000 --- a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_hfs_ignorable_9 +++ /dev/null @@ -1 +0,0 @@ -442894787eddb1e84a952f17a027590e2c6c02cd diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_path b/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_path deleted file mode 100644 index dd71efaa4..000000000 --- a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_path +++ /dev/null @@ -1 +0,0 @@ -5341a7b545d71198b076b8ba3374a75c9a290640 diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_tree b/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_tree deleted file mode 100644 index 3b7a08d7c..000000000 --- a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/dotgit_tree +++ /dev/null @@ -1 +0,0 @@ -6594bdbad86bbc8d3ed0806a23827203fbab56c6 diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/git_tilde1 b/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/git_tilde1 deleted file mode 100644 index d48a18530..000000000 --- a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/git_tilde1 +++ /dev/null @@ -1 +0,0 @@ -94f37c29173c8fa45a232b17e745c82132b2fafd diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/git_tilde2 b/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/git_tilde2 deleted file mode 100644 index 77082e153..000000000 --- a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/git_tilde2 +++ /dev/null @@ -1 +0,0 @@ -899ff28744bed5bece69c78ba752c7dc3e954629 diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/git_tilde3 b/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/git_tilde3 deleted file mode 100644 index 73022aad6..000000000 --- a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/git_tilde3 +++ /dev/null @@ -1 +0,0 @@ -fa9cfdbeaaf3a91ff4b84d74412cd59d9b16a615 diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/master b/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/master deleted file mode 100644 index b19343373..000000000 --- a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -e399c4fc4c07cb7947d2f3d966bc374df6ccc691 diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/symlink1 b/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/symlink1 deleted file mode 100644 index efa2e88b6..000000000 --- a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/symlink1 +++ /dev/null @@ -1 +0,0 @@ -4d83272d0d372e1232ddc4ff3260d76fdfa2015a diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/symlink2 b/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/symlink2 deleted file mode 100644 index e4f3d6067..000000000 --- a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/symlink2 +++ /dev/null @@ -1 +0,0 @@ -9d5898503adc01d763e279ac8fcefbe865b19031 diff --git a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/symlink3 b/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/symlink3 deleted file mode 100644 index 2b33e4ff7..000000000 --- a/vendor/libgit2/tests/resources/nasty/.gitted/refs/heads/symlink3 +++ /dev/null @@ -1 +0,0 @@ -cf6fcf8cdf7e8d4cda3b11b0ba02d0d5125fbbd7 diff --git a/vendor/libgit2/tests/resources/nsecs/.gitted/HEAD b/vendor/libgit2/tests/resources/nsecs/.gitted/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/vendor/libgit2/tests/resources/nsecs/.gitted/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/vendor/libgit2/tests/resources/nsecs/.gitted/config b/vendor/libgit2/tests/resources/nsecs/.gitted/config deleted file mode 100644 index 78387c50b..000000000 --- a/vendor/libgit2/tests/resources/nsecs/.gitted/config +++ /dev/null @@ -1,8 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = false - bare = false - logallrefupdates = true - symlinks = false - ignorecase = true - hideDotFiles = dotGitOnly diff --git a/vendor/libgit2/tests/resources/nsecs/.gitted/index b/vendor/libgit2/tests/resources/nsecs/.gitted/index deleted file mode 100644 index 9233f1b11e8179f0f9655631bd9064d4e4229fe0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 281 zcmZ?q402{*U|<4b<}eMjgR(2EG=TJB_Mr0bI!T~d62^l|LnLd9wO)Yqy)Ethzf{Hf#$6YckxN zkRVrApk_%1V+8{)=2?Fyp6qWr=;su@tunV~W#62hH5rSxp7WY#$)m^phWFf~Ww-2J HvG4-`s})W= diff --git a/vendor/libgit2/tests/resources/nsecs/.gitted/objects/03/1986a8372d1442cfe9e3b54906a9aadc524a7e b/vendor/libgit2/tests/resources/nsecs/.gitted/objects/03/1986a8372d1442cfe9e3b54906a9aadc524a7e deleted file mode 100644 index a813b7424..000000000 --- a/vendor/libgit2/tests/resources/nsecs/.gitted/objects/03/1986a8372d1442cfe9e3b54906a9aadc524a7e +++ /dev/null @@ -1,2 +0,0 @@ -x¥A -Â0D]çÿJÓ4DéÖMu-éÏ/í"FÒHñöFñ®fæ ÌP aÊ ”ZåÄ r‹nðXÚÁ*ª4kU÷½iÐxK-#%ážyŒ Z¿¸äá2Æ0Ç;ì¸Ð;ð·ø¥ Å°‡JëZ7F¢µÔRŠBËyæ?gÄ?â<å˜^@‰]fË”G¸vííܵ§N¼UOKv \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/nsecs/.gitted/objects/03/9afd91c98f82c14e425bb6796d8ca98e9c8cac b/vendor/libgit2/tests/resources/nsecs/.gitted/objects/03/9afd91c98f82c14e425bb6796d8ca98e9c8cac deleted file mode 100644 index 74bb7d3feae8d45514385a02947566a60e2e7556..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 102 zcmV-s0Ga=I0V^p=O;xb8WH2-^Ff%bxNYpE-C}GI$mSC?rIcsn4E!JghIw>h^t2bSN zDo6q=I4ZR5m|NJ6x)rBBR~hYz3e&ADcZDiQ1}nH--7WB8+ zw#hu&uGDwr@x5aVY(cJ$F21hF`q9j30-Ey{$sCq6tJ|C+=IJy1t6x}6eE-Y+p~i7j z2KGe#B)yV~5+rw^nbVBs9%k2_&HK!@+pu@snX_km&hCak)f>VY_>+nf^O7^-(=u~X z@tfCzW**OS(YAy4Uo4l&*`Fgc-@zx$>A&G#2KKzva;Q0{LLMu1v`F9O=3sDJ5MF0n I)f+e+0InHZ3;+NC diff --git a/vendor/libgit2/tests/resources/partial-testrepo/.gitted/objects/13/85f264afb75a56a5bec74243be9b367ba4ca08 b/vendor/libgit2/tests/resources/partial-testrepo/.gitted/objects/13/85f264afb75a56a5bec74243be9b367ba4ca08 deleted file mode 100644 index cedb2a22e6914c3bbbed90bbedf8fd2095bf5a7d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19 acmb-^#H0=gNM4#XbHp#9nm{w}~e~VA>HVh0*UTU2h zI2R9X6@d~QlL~cNq^RqWRXRmSLrR(%JGOQZ^5)H}%nh;F=&ild+RI_ zmV#MRj)u23E-Tz*hDTd@OK?t~A6%bP8@F`IOTB>gogYF7*uxPAM6=s{u*n~(xsN7F<>w>FfcPQQ3!H%bn$g%SfOmF@NI2De~WFK%%kl}eMcVO zJ7!`41PX}^Nw33h?e?CjxkvQwq~t@#jW^oro`LF4DoV^t&WKOT%t_TNsVHG^-Pyd) zY`YD6$DKKQw&(0__*17G-5C`FfcPQQ3!H%bn$g%SfOmF@NI2De~WFK%%kl}eMcVO zI|fyeRFs&PoDrXvnUktlQc=R-y0dwo*>)TDjyrSqY|q)<@TYo1I8Fm*0&IVk`D diff --git a/vendor/libgit2/tests/resources/partial-testrepo/.gitted/objects/45/b983be36b73c0788dc9cbcb76cbb80fc7bb057 b/vendor/libgit2/tests/resources/partial-testrepo/.gitted/objects/45/b983be36b73c0788dc9cbcb76cbb80fc7bb057 deleted file mode 100644 index 7ca4ceed50400af7e36b25ff200a7be95f0bc61f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18 acmb9W-v4`FgG<-NYX2*C}Bvmy3HwKo<76B`i0fR_rKg9Y8*EO I00q(x`N*;qRsaA1 diff --git a/vendor/libgit2/tests/resources/partial-testrepo/.gitted/objects/5b/5b025afb0b4c913b4c338a42934a3863bf3644 b/vendor/libgit2/tests/resources/partial-testrepo/.gitted/objects/5b/5b025afb0b4c913b4c338a42934a3863bf3644 deleted file mode 100644 index c1f22c54f..000000000 --- a/vendor/libgit2/tests/resources/partial-testrepo/.gitted/objects/5b/5b025afb0b4c913b4c338a42934a3863bf3644 +++ /dev/null @@ -1,2 +0,0 @@ -xŽÛ 1EýNi@™Ék2 "X‚$ÙYW0YcÿíÀ¿Ã…s¸¥ÕzïÚÚõMDÏ€0æœ8!¶†ÉÌÞs‰ XŠªgÚdí::@X0»P¢wÙ"F/‰‰œÍRàˆUz÷¥múZZïú²¤ÒV}|•/œo5݇ÒêI£!¬1z Æ:vùÇUim}ê/¢> -öF- \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/partial-testrepo/.gitted/objects/62/eb56dabb4b9929bc15dd9263c2c733b13d2dcc b/vendor/libgit2/tests/resources/partial-testrepo/.gitted/objects/62/eb56dabb4b9929bc15dd9263c2c733b13d2dcc deleted file mode 100644 index b669961d8f9fe449aa715bcc4574e838309f83f1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 50 zcmV-20L}k+0V^p=O;s>9W-v4`Ff%bxNYX2*C}Bvmy3HwKo<76B`i0fR_rKg9Y8*EO I00nyv_QnPi@Bjb+ diff --git a/vendor/libgit2/tests/resources/partial-testrepo/.gitted/objects/66/3adb09143767984f7be83a91effa47e128c735 b/vendor/libgit2/tests/resources/partial-testrepo/.gitted/objects/66/3adb09143767984f7be83a91effa47e128c735 deleted file mode 100644 index 9ff5eb2b5dde9d39204782babe64bb240aced32f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19 acmb7G-5C`FfcPQQ3!H%bn$g%5N`dHvVMD1*wTH+ot*d0HmhE8 ziUX=5sVFfoIU_zTGbdHAq@skub!YQFv+XwQ9e3vJ*`Bkz;ZOC3aH!I})N-(rU!EJv Zrz=lf8^K%<@M(E`$>VgnNdSzWFYprfIFkSX diff --git a/vendor/libgit2/tests/resources/partial-testrepo/.gitted/objects/81/4889a078c031f61ed08ab5fa863aea9314344d b/vendor/libgit2/tests/resources/partial-testrepo/.gitted/objects/81/4889a078c031f61ed08ab5fa863aea9314344d deleted file mode 100644 index 2f9b6b6e3d9250ba09360734aa47973a993b59d1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 82 zcmV-Y0ImOc0V^p=O;s?nWH2-^Ff%bx2y%6F@pWZbp=_w|ZEZn+i*1|CqwPw4M;_lh o233)lTCP`8QNplXwC&*i7t3XG_U8!Ackl^w`fs=w02$OB|A$m1)Bpeg diff --git a/vendor/libgit2/tests/resources/partial-testrepo/.gitted/objects/84/96071c1b46c854b31185ea97743be6a8774479 b/vendor/libgit2/tests/resources/partial-testrepo/.gitted/objects/84/96071c1b46c854b31185ea97743be6a8774479 deleted file mode 100644 index 5df58dda56789631c78aeed62708e1b694440195..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 126 zcmV-^0D=E_0iBK82?8+?0R2uC+kmpkZXSY&U

    RiSaIAE^xQ@?_ml44FkiJ(R)*{ z(H(TH6>PFd5&0~h#n$X!k{LPpBqYvbW+w8_Xyl{wSm9BID%@u&V}Z+7esG(*wD+lu geg*3yQ9w!oju;WmZug_se_Eq;)3!|J3!n-%%(!(uEdT%j diff --git a/vendor/libgit2/tests/resources/partial-testrepo/.gitted/objects/9f/d738e8f7967c078dceed8190330fc8648ee56a b/vendor/libgit2/tests/resources/partial-testrepo/.gitted/objects/9f/d738e8f7967c078dceed8190330fc8648ee56a deleted file mode 100644 index a79612435..000000000 --- a/vendor/libgit2/tests/resources/partial-testrepo/.gitted/objects/9f/d738e8f7967c078dceed8190330fc8648ee56a +++ /dev/null @@ -1,3 +0,0 @@ -xŽ[ -Â0EýÎ*fÊäÕ¤ "¸W0“‡-ØFâtÿÝ—çpS[–YÀ˜x^ -Díb CLhutɉ}¥8X*4Zí¬sY½¨—UÀ‘AÃÖ ÌX3‡R«Mµ¶) s6è¼¢M¦ÖážšÜ&Jm…ó;}Çõ±Ðü<¥¶\@›à‚ÑÞpÄ€¨vº?”ò«jÛºLð«¨Ø?Hå \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/partial-testrepo/.gitted/objects/a4/a7dce85cf63874e984719f4fdd239f5145052f b/vendor/libgit2/tests/resources/partial-testrepo/.gitted/objects/a4/a7dce85cf63874e984719f4fdd239f5145052f deleted file mode 100644 index f8588696b..000000000 --- a/vendor/libgit2/tests/resources/partial-testrepo/.gitted/objects/a4/a7dce85cf63874e984719f4fdd239f5145052f +++ /dev/null @@ -1,2 +0,0 @@ -x;j1DëmdÓú·À˜ÇŽ|M«µ3`ŒV{ >€³âQ¯ ¸·vL0I?Í!š4–Z=Ê! ×¦8²F¢Ã’!rÖsQßyÈ9]$DŽ&„l6AÇ>jFWüÒµ IKNiûë§Z¢%¡SˆŒ‘ -‹Ò ­ÅʉøU~̽øä>'¼ï™û ¯wþ ×[ËÇ× ÷öÚDGÚ¡±ðŒQ-ºMù«>dܶ‘OÞáÒò}í\à8g_ШÂoYr \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/partial-testrepo/.gitted/objects/a7/1586c1dfe8a71c6cbf6c129f404c5642ff31bd b/vendor/libgit2/tests/resources/partial-testrepo/.gitted/objects/a7/1586c1dfe8a71c6cbf6c129f404c5642ff31bd deleted file mode 100644 index d0d7e736e536a41bcb885005f8bf258c61cad682..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 28 kcmbBQQQ6W+Sv9;eTEK4oHX{LN+y0Ic;3tpET3 diff --git a/vendor/libgit2/tests/resources/partial-testrepo/.gitted/objects/a8/233120f6ad708f843d861ce2b7228ec4e3dec6 b/vendor/libgit2/tests/resources/partial-testrepo/.gitted/objects/a8/233120f6ad708f843d861ce2b7228ec4e3dec6 deleted file mode 100644 index 18a7f61c29ea8c5c9a48e3b30bead7f058d06293..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 26 icmb7F<>w>FfcPQQ3!H%bn$g%SfOmF@NI2De~WFK%%kl}eMcVO zJ7!`41PX}^ejLs3-n~BfTijGk=2g@8)A6h8lA*ejiW2jZGvd=Sb5iw6DoPk!cQ)@c z+it_&ac9n+?K!&}{#0)WhbqlWEe9)EF4}hR{)^=@Is0>j<~#U=IsG@>3joZzJl^$Q BMxFow diff --git a/vendor/libgit2/tests/resources/partial-testrepo/.gitted/objects/f6/0079018b664e4e79329a7ef9559c8d9e0378d1 b/vendor/libgit2/tests/resources/partial-testrepo/.gitted/objects/f6/0079018b664e4e79329a7ef9559c8d9e0378d1 deleted file mode 100644 index 03770969aa16f40d4192c733408f152fc17b1f19..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 82 zcmV-Y0ImOc0V^p=O;s?nWH2-^Ff%bx2y%6F@pWYoZvB+9etT5d(tXFBocGN(t6p-7 o1F9k~wOp^HqJ-g>=Z5m>$`jW{Fc$=TS{`5WI9+ZM01*fsda7_Ea{vGU diff --git a/vendor/libgit2/tests/resources/partial-testrepo/.gitted/objects/fa/49b077972391ad58037050f2a75f74e3671e92 b/vendor/libgit2/tests/resources/partial-testrepo/.gitted/objects/fa/49b077972391ad58037050f2a75f74e3671e92 deleted file mode 100644 index 112998d425717bb922ce74e8f6f0f831d8dc4510..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24 gcmbr!Y~W~(S1(g3xJ#!=OZD+ z8cyM)c2uM$Rpkx0hi>N0C?BZ?xTt4JfokHS6|;Jse3~Ti?28bgta1e*{&H-gP8_(VeRdm99oB#j- diff --git a/vendor/libgit2/tests/resources/peeled.git/packed-refs b/vendor/libgit2/tests/resources/peeled.git/packed-refs deleted file mode 100644 index ad053d550..000000000 --- a/vendor/libgit2/tests/resources/peeled.git/packed-refs +++ /dev/null @@ -1,6 +0,0 @@ -# pack-refs with: peeled fully-peeled -c2596aa0151888587ec5c0187f261e63412d9e11 refs/foo/tag-outside-tags -^0df1a5865c8abfc09f1f2182e6a31be550e99f07 -0df1a5865c8abfc09f1f2182e6a31be550e99f07 refs/heads/master -c2596aa0151888587ec5c0187f261e63412d9e11 refs/tags/tag-inside-tags -^0df1a5865c8abfc09f1f2182e6a31be550e99f07 diff --git a/vendor/libgit2/tests/resources/peeled.git/refs/heads/master b/vendor/libgit2/tests/resources/peeled.git/refs/heads/master deleted file mode 100644 index 76c15e203..000000000 --- a/vendor/libgit2/tests/resources/peeled.git/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -0df1a5865c8abfc09f1f2182e6a31be550e99f07 diff --git a/vendor/libgit2/tests/resources/push.sh b/vendor/libgit2/tests/resources/push.sh deleted file mode 100644 index 607117675..000000000 --- a/vendor/libgit2/tests/resources/push.sh +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/sh -#creates push_src repo for libgit2 push tests. -set -eu - -#Create src repo for push -mkdir push_src -pushd push_src - git init - - echo a > a.txt - git add . - git commit -m 'added a.txt' - - mkdir fold - echo b > fold/b.txt - git add . - git commit -m 'added fold and fold/b.txt' - - git branch b1 #b1 and b2 are the same - git branch b2 - - git checkout -b b3 - echo edit >> a.txt - git add . - git commit -m 'edited a.txt' - - git checkout -b b4 master - echo edit >> fold\b.txt - git add . - git commit -m 'edited fold\b.txt' - - git checkout -b b5 master - git submodule add ../testrepo.git submodule - git commit -m "added submodule named 'submodule' pointing to '../testrepo.git'" - - git checkout master - git merge -m "merge b3, b4, and b5 to master" b3 b4 b5 - - #Log commits to include in testcase - git log --format=oneline --decorate --graph - #*-. 951bbbb90e2259a4c8950db78946784fb53fcbce (HEAD, master) merge b3, b4, and b5 to master - #|\ \ - #| | * fa38b91f199934685819bea316186d8b008c52a2 (b5) added submodule named 'submodule' pointing to '../testrepo.git' - #| * | 27b7ce66243eb1403862d05f958c002312df173d (b4) edited fold\b.txt - #| |/ - #* | d9b63a88223d8367516f50bd131a5f7349b7f3e4 (b3) edited a.txt - #|/ - #* a78705c3b2725f931d3ee05348d83cc26700f247 (b2, b1) added fold and fold/b.txt - #* 5c0bb3d1b9449d1cc69d7519fd05166f01840915 added a.txt - - #fix paths so that we can add repo folders under libgit2 repo - #rename .git to .gitted - find . -name .git -exec mv -i '{}' '{}ted' \; - mv -i .gitmodules gitmodules -popd diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/COMMIT_EDITMSG b/vendor/libgit2/tests/resources/push_src/.gitted/COMMIT_EDITMSG deleted file mode 100644 index b1295084c..000000000 --- a/vendor/libgit2/tests/resources/push_src/.gitted/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -added submodule named 'submodule' pointing to '../testrepo.git' diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/HEAD b/vendor/libgit2/tests/resources/push_src/.gitted/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/vendor/libgit2/tests/resources/push_src/.gitted/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/ORIG_HEAD b/vendor/libgit2/tests/resources/push_src/.gitted/ORIG_HEAD deleted file mode 100644 index afadf9d26..000000000 --- a/vendor/libgit2/tests/resources/push_src/.gitted/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -a78705c3b2725f931d3ee05348d83cc26700f247 diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/config b/vendor/libgit2/tests/resources/push_src/.gitted/config deleted file mode 100644 index 51de0311b..000000000 --- a/vendor/libgit2/tests/resources/push_src/.gitted/config +++ /dev/null @@ -1,10 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = false - bare = false - logallrefupdates = true - symlinks = false - ignorecase = true - hideDotFiles = dotGitOnly -[submodule "submodule"] - url = m:/dd/libgit2/tests-clar/resources/testrepo.git diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/description b/vendor/libgit2/tests/resources/push_src/.gitted/description deleted file mode 100644 index 498b267a8..000000000 --- a/vendor/libgit2/tests/resources/push_src/.gitted/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/index b/vendor/libgit2/tests/resources/push_src/.gitted/index deleted file mode 100644 index 0ef6594b3c4f4d89a0bce1de20c275379be67ab5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 470 zcmZ?q402{*U|<4b)_}!7+<-I#koE-82++6$!Devz-et&kB7UpqvA`Ld7I7q%9TWG| zVBpqE&n(H!PbtkwEru!vn&SXs0%>=s5R^hOkMkf4r*KwP=>yeY0b0`f*SBexU#eta zP1Gx?C;_WSGRFarIZTNa>@$>l#n%gg%m%m1)uVys%3h7T^-~^e6VjQXwVBP~1v1RdZKhJvqgz56` zJeB*t{_#&j$^#fUi%XLr!Nm{~_jP|X85UnRKezJTlW@(yp=EMXrozXoLM{l*;=MN2YwN65ZTCVUHvsbW Bdb9ul diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/info/exclude b/vendor/libgit2/tests/resources/push_src/.gitted/info/exclude deleted file mode 100644 index a5196d1be..000000000 --- a/vendor/libgit2/tests/resources/push_src/.gitted/info/exclude +++ /dev/null @@ -1,6 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/logs/HEAD b/vendor/libgit2/tests/resources/push_src/.gitted/logs/HEAD deleted file mode 100644 index 4ef336f84..000000000 --- a/vendor/libgit2/tests/resources/push_src/.gitted/logs/HEAD +++ /dev/null @@ -1,10 +0,0 @@ -0000000000000000000000000000000000000000 5c0bb3d1b9449d1cc69d7519fd05166f01840915 Congyi Wu 1352923200 -0500 commit (initial): added a.txt -5c0bb3d1b9449d1cc69d7519fd05166f01840915 a78705c3b2725f931d3ee05348d83cc26700f247 Congyi Wu 1352923200 -0500 commit: added fold and fold/b.txt -a78705c3b2725f931d3ee05348d83cc26700f247 a78705c3b2725f931d3ee05348d83cc26700f247 Congyi Wu 1352923201 -0500 checkout: moving from master to b3 -a78705c3b2725f931d3ee05348d83cc26700f247 d9b63a88223d8367516f50bd131a5f7349b7f3e4 Congyi Wu 1352923201 -0500 commit: edited a.txt -d9b63a88223d8367516f50bd131a5f7349b7f3e4 a78705c3b2725f931d3ee05348d83cc26700f247 Congyi Wu 1352923201 -0500 checkout: moving from b3 to b4 -a78705c3b2725f931d3ee05348d83cc26700f247 27b7ce66243eb1403862d05f958c002312df173d Congyi Wu 1352923201 -0500 commit: edited fold\b.txt -27b7ce66243eb1403862d05f958c002312df173d a78705c3b2725f931d3ee05348d83cc26700f247 Congyi Wu 1352923201 -0500 checkout: moving from b4 to b5 -a78705c3b2725f931d3ee05348d83cc26700f247 fa38b91f199934685819bea316186d8b008c52a2 Congyi Wu 1352923206 -0500 commit: added submodule named 'submodule' pointing to '../testrepo.git' -fa38b91f199934685819bea316186d8b008c52a2 a78705c3b2725f931d3ee05348d83cc26700f247 Congyi Wu 1352923207 -0500 checkout: moving from b5 to master -a78705c3b2725f931d3ee05348d83cc26700f247 951bbbb90e2259a4c8950db78946784fb53fcbce Congyi Wu 1352923207 -0500 merge b3 b4 b5: Merge made by the 'octopus' strategy. diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/logs/refs/heads/b1 b/vendor/libgit2/tests/resources/push_src/.gitted/logs/refs/heads/b1 deleted file mode 100644 index 390a03d5c..000000000 --- a/vendor/libgit2/tests/resources/push_src/.gitted/logs/refs/heads/b1 +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 a78705c3b2725f931d3ee05348d83cc26700f247 Congyi Wu 1352923200 -0500 branch: Created from master diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/logs/refs/heads/b2 b/vendor/libgit2/tests/resources/push_src/.gitted/logs/refs/heads/b2 deleted file mode 100644 index 390a03d5c..000000000 --- a/vendor/libgit2/tests/resources/push_src/.gitted/logs/refs/heads/b2 +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 a78705c3b2725f931d3ee05348d83cc26700f247 Congyi Wu 1352923200 -0500 branch: Created from master diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/logs/refs/heads/b3 b/vendor/libgit2/tests/resources/push_src/.gitted/logs/refs/heads/b3 deleted file mode 100644 index 01e302c44..000000000 --- a/vendor/libgit2/tests/resources/push_src/.gitted/logs/refs/heads/b3 +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 a78705c3b2725f931d3ee05348d83cc26700f247 Congyi Wu 1352923201 -0500 branch: Created from HEAD -a78705c3b2725f931d3ee05348d83cc26700f247 d9b63a88223d8367516f50bd131a5f7349b7f3e4 Congyi Wu 1352923201 -0500 commit: edited a.txt diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/logs/refs/heads/b4 b/vendor/libgit2/tests/resources/push_src/.gitted/logs/refs/heads/b4 deleted file mode 100644 index 7afddc54e..000000000 --- a/vendor/libgit2/tests/resources/push_src/.gitted/logs/refs/heads/b4 +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 a78705c3b2725f931d3ee05348d83cc26700f247 Congyi Wu 1352923201 -0500 branch: Created from master -a78705c3b2725f931d3ee05348d83cc26700f247 27b7ce66243eb1403862d05f958c002312df173d Congyi Wu 1352923201 -0500 commit: edited fold\b.txt diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/logs/refs/heads/b5 b/vendor/libgit2/tests/resources/push_src/.gitted/logs/refs/heads/b5 deleted file mode 100644 index bc22567f7..000000000 --- a/vendor/libgit2/tests/resources/push_src/.gitted/logs/refs/heads/b5 +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 a78705c3b2725f931d3ee05348d83cc26700f247 Congyi Wu 1352923201 -0500 branch: Created from master -a78705c3b2725f931d3ee05348d83cc26700f247 fa38b91f199934685819bea316186d8b008c52a2 Congyi Wu 1352923206 -0500 commit: added submodule named 'submodule' pointing to '../testrepo.git' diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/logs/refs/heads/master b/vendor/libgit2/tests/resources/push_src/.gitted/logs/refs/heads/master deleted file mode 100644 index 8aafa9ca4..000000000 --- a/vendor/libgit2/tests/resources/push_src/.gitted/logs/refs/heads/master +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 5c0bb3d1b9449d1cc69d7519fd05166f01840915 Congyi Wu 1352923200 -0500 commit (initial): added a.txt -5c0bb3d1b9449d1cc69d7519fd05166f01840915 a78705c3b2725f931d3ee05348d83cc26700f247 Congyi Wu 1352923200 -0500 commit: added fold and fold/b.txt -a78705c3b2725f931d3ee05348d83cc26700f247 951bbbb90e2259a4c8950db78946784fb53fcbce Congyi Wu 1352923207 -0500 merge b3 b4 b5: Merge made by the 'octopus' strategy. diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/HEAD b/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/config b/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/config deleted file mode 100644 index 59810077d..000000000 --- a/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/config +++ /dev/null @@ -1,15 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = false - bare = false - logallrefupdates = true - worktree = ../../../submodule - symlinks = false - ignorecase = true - hideDotFiles = dotGitOnly -[remote "origin"] - fetch = +refs/heads/*:refs/remotes/origin/* - url = m:/dd/libgit2/tests-clar/resources/testrepo.git -[branch "master"] - remote = origin - merge = refs/heads/master diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/description b/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/description deleted file mode 100644 index 498b267a8..000000000 --- a/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/index b/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/index deleted file mode 100644 index 8e44080f3e042f1890a432a19c0bcaf219d1ebf7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 256 zcmZ?q402{*U|<4b=77aN+<-I#j0UkGpm7O|1*ExGC>tt#TU*fIV%sM3XuDG1k;nIr zF|Y->I=c9}g4DtE!)SzF6mz)DreE`Z>A2L^>&3T4g-;&;3frJ`hJin+C^0WNBR(xN zCsnVcqJ((!c$bT|9lZZyxlGRf9HIFRK4DJ(4fisz=cSfI%}F+ts_=X3;l3()y8Y?@ LmvygrwTJ@%LKa3> diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/info/exclude b/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/info/exclude deleted file mode 100644 index a5196d1be..000000000 --- a/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/info/exclude +++ /dev/null @@ -1,6 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/logs/HEAD b/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/logs/HEAD deleted file mode 100644 index aedcdf295..000000000 --- a/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/logs/HEAD +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 a65fedf39aefe402d3bb6e24df4d4f5fe4547750 Congyi Wu 1352923205 -0500 clone: from m:/dd/libgit2/tests-clar/resources/testrepo.git diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/logs/refs/heads/master b/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/logs/refs/heads/master deleted file mode 100644 index aedcdf295..000000000 --- a/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/logs/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 a65fedf39aefe402d3bb6e24df4d4f5fe4547750 Congyi Wu 1352923205 -0500 clone: from m:/dd/libgit2/tests-clar/resources/testrepo.git diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/logs/refs/remotes/origin/HEAD b/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/logs/refs/remotes/origin/HEAD deleted file mode 100644 index aedcdf295..000000000 --- a/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/logs/refs/remotes/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 a65fedf39aefe402d3bb6e24df4d4f5fe4547750 Congyi Wu 1352923205 -0500 clone: from m:/dd/libgit2/tests-clar/resources/testrepo.git diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/08/b041783f40edfe12bb406c9c9a8a040177c125 b/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/08/b041783f40edfe12bb406c9c9a8a040177c125 deleted file mode 100644 index d1c032fce34ef6688440fef9b0bc34851e3937ca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 54 zcmb-^#7G-5C`FfcPQQ3!H%bn$g%SfOmF@NI2De~WFK%%kl}eMcVO zI|fyeRFs&PoDrXvnUktlQc=R-y0dwo*>)TDjyrSqY|q)<@TYo1I8Fm*0&IVk`D diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/1a/443023183e3f2bfbef8ac923cd81c1018a18fd b/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/1a/443023183e3f2bfbef8ac923cd81c1018a18fd deleted file mode 100644 index 3ec541288fd04106cb69bc53e8ad085dd550b847..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 122 zcmV-=0EPc}0iBIO3IZ_CifV?>)s7M^1Y%!`;&LUMTlLAXeIVsSp^AMPkgZGeHH721AUD zWR#;MNoSX>)`Ir>DjW3A9Ucu_#|3Ug@y%&~K9_Rg56$buO)T>OEh_ZdIgN0Zt(4-h W$IZ%r2gH3D>qry)O5zK?(n*;`X-(Du diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/27/0b8ea76056d5cad83af921837702d3e3c2924d b/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/27/0b8ea76056d5cad83af921837702d3e3c2924d deleted file mode 100644 index df40d99affff9bac5a004388e3ae19ec0df19488..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 dcmbSu`A(-~^2~DaX|Dj|a1Ojz C$`Zx^ diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/32/59a6bd5b57fb9c1281bb7ed3167b50f224cb54 b/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/32/59a6bd5b57fb9c1281bb7ed3167b50f224cb54 deleted file mode 100644 index 321eaa8679591d3fc76e62628126185b0427c940..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 50 zcmby-a%8?0t#9e}{dDH^=1pybKbl G{96FXClfjV diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/36/97d64be941a53d4ae8f6a271e4e3fa56b022cc b/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/36/97d64be941a53d4ae8f6a271e4e3fa56b022cc deleted file mode 100644 index 9bb5b623bdbc11a70db482867b5b26d0d7b3215c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23 fcmb)5VqnO?#OiI__Bv?w-}KEnos|Z^uNZBf`g;=3-Mh++_sV&r0c}+h Ah5!Hn diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/52/1d87c1ec3aef9824daf6d96cc0ae3710766d91 b/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/52/1d87c1ec3aef9824daf6d96cc0ae3710766d91 deleted file mode 100644 index 351cff823065f92f8b4ef218194c1dfb06e86fd0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 152 zcmV;J0B8Sr0X2<53c@fD06pgw+p|#8CTS{&2wv4Mlug{0+9WG=J@|Wj@i+|32u{#+ zZpYzCQJ^us8{5v}7`#K*p$infZLJA(2&VG^ZA9HG`MwB3;-F+JU@0sp^cXf8gonSG zXod1gNqC_GN6NI$u^ws7_&!e==Tt||r|oNu*WNk@d);cS)RlRG8&+^ -öF- \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/75/057dd4114e74cca1d750d0aee1647c903cb60a b/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/75/057dd4114e74cca1d750d0aee1647c903cb60a deleted file mode 100644 index 2ef4faa0f82efa00eeac6cae9e8b2abccc8566ee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 119 zcmV--0Eqv10V^p=O;s>7G-5C`FfcPQQ3!H%bn$g%5N`dHvVMD1*wTH+ot*d0HmhE8 ziUX=5sVFfoIU_zTGbdHAq@skub!YQFv+XwQ9e3vJ*`Bkz;ZOC3aH!I})N-(rU!EJv Zrz=lf8^K%<@M(E`$>VgnNdSzWFYprfIFkSX diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/76/3d71aadf09a7951596c9746c024e7eece7c7af b/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/76/3d71aadf09a7951596c9746c024e7eece7c7af deleted file mode 100644 index 716b0c64b..000000000 --- a/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/76/3d71aadf09a7951596c9746c024e7eece7c7af +++ /dev/null @@ -1 +0,0 @@ -xŽAj!³ö?0¨£ßÂ09Êo}HÚ6¨}ÿôjUPP©ÕZ&Yÿø˜ AÔ›±€pŒÁFdë¼÷pz[fŽYŒ½PÒqLJ.,Z§`™Å®Ð.ù`’vÙ ³q $Æ5+9çOëtœû>Û/úDE/龡W¯ï*e¿§VŸdf1>ð覭Öê²×äÄ›¹úÊ™F« ­ìTŽÙhœk.i¶^0Ô?P¼R, \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/7b/4384978d2493e851f9cca7858815fac9b10980 b/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/7b/4384978d2493e851f9cca7858815fac9b10980 deleted file mode 100644 index 23c462f3415e0b02832cb2445dc66bde8daa9ef4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 145 zcmV;C0B-+y0WFL{4uUWc06q5=dp99n3hj~@;|IJM@1-nQr9fac;rG_WWDawg5kCOd z_As|k4g%b0Lful=8zvnpG+m=jZw=bY1c#Q$p`lL6zA%J2r6@}B;~)Nf;1%vM@FZ~c zt3)`7pXS&5G9(|zB1dPylCXAUY6nMMYOU1m5jV(q`0%>J7Sl2^RiSaIAE^xQ@?_ml44FkiJ(R)*{ z(H(TH6>PFd5&0~h#n$X!k{LPpBqYvbW+w8_Xyl{wSm9BID%@u&V}Z+7esG(*wD+lu geg*3yQ9w!oju;WmZug_se_Eq;)3!|J3!n-%%(!(uEdT%j diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/84/9a5e34a26815e821f865b8479f5815a47af0fe b/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/84/9a5e34a26815e821f865b8479f5815a47af0fe deleted file mode 100644 index 71019a636..000000000 --- a/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/84/9a5e34a26815e821f865b8479f5815a47af0fe +++ /dev/null @@ -1,2 +0,0 @@ -xŒM F]sŠ¹€†Ÿ41ÆxÝ(­I‹ÁéÂÛKݽ/_ÞãP@¡ÚÕø¢!8›)es -” ¥N&FGSÆ„¹hÑ{+ßCç‰÷ÆZzvØF¡7ZàÎ-¬Îñó‡k™x\ã¡[PÆ8ï´ôGØK/¥^© lÊ>.4 \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/94/4c0f6e4dfa41595e6eb3ceecdb14f50fe18162 b/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/94/4c0f6e4dfa41595e6eb3ceecdb14f50fe18162 deleted file mode 100644 index 4cc3f4dff..000000000 --- a/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/94/4c0f6e4dfa41595e6eb3ceecdb14f50fe18162 +++ /dev/null @@ -1 +0,0 @@ -x+)JMU044b040031QrutñueX¡l¨ðmmA‹m›Ì£íJ}Gß;U‘T”˜—œŸ–™“ªWRQÂ`6ýš÷KÇ¥¶^/¾-*|òøWØ¥3P¥y©å`%ËEÛÞ±\&gŽÐ|Ÿ0§ÿ†{Ó1X \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/9a/03079b8a8ee85a0bee58bf9be3da8b62414ed4 b/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/9a/03079b8a8ee85a0bee58bf9be3da8b62414ed4 deleted file mode 100644 index bf7b2bb686f9d563f6af7ded70cfee2a31432731..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 50 zcmV-20L}k+0V^p=O;s>9W-v4`Ff%bxFxD%nC}B|N?pvM^cJ;ÔÂÁ…¬£³X†ÂEÈŽ5R±£ ÛAÑE &n}ZÜæ™A¹ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/9f/d738e8f7967c078dceed8190330fc8648ee56a b/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/9f/d738e8f7967c078dceed8190330fc8648ee56a deleted file mode 100644 index a79612435..000000000 --- a/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/9f/d738e8f7967c078dceed8190330fc8648ee56a +++ /dev/null @@ -1,3 +0,0 @@ -xŽ[ -Â0EýÎ*fÊäÕ¤ "¸W0“‡-ØFâtÿÝ—çpS[–YÀ˜x^ -Díb CLhutɉ}¥8X*4Zí¬sY½¨—UÀ‘AÃÖ ÌX3‡R«Mµ¶) s6è¼¢M¦ÖážšÜ&Jm…ó;}Çõ±Ðü<¥¶\@›à‚ÑÞpÄ€¨vº?”ò«jÛºLð«¨Ø?Hå \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/a4/a7dce85cf63874e984719f4fdd239f5145052f b/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/a4/a7dce85cf63874e984719f4fdd239f5145052f deleted file mode 100644 index f8588696b..000000000 --- a/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/a4/a7dce85cf63874e984719f4fdd239f5145052f +++ /dev/null @@ -1,2 +0,0 @@ -x;j1DëmdÓú·À˜ÇŽ|M«µ3`ŒV{ >€³âQ¯ ¸·vL0I?Í!š4–Z=Ê! ×¦8²F¢Ã’!rÖsQßyÈ9]$DŽ&„l6AÇ>jFWüÒµ IKNiûë§Z¢%¡SˆŒ‘ -‹Ò ­ÅʉøU~̽øä>'¼ï™û ¯wþ ×[ËÇ× ÷öÚDGÚ¡±ðŒQ-ºMù«>dܶ‘OÞáÒò}í\à8g_ШÂoYr \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/a6/5fedf39aefe402d3bb6e24df4d4f5fe4547750 b/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/a6/5fedf39aefe402d3bb6e24df4d4f5fe4547750 deleted file mode 100644 index 29c8e824d..000000000 --- a/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/a6/5fedf39aefe402d3bb6e24df4d4f5fe4547750 +++ /dev/null @@ -1,3 +0,0 @@ -xŽQ -!@ûösBQ"‚ŽÐ ÆÙ± rÍîßÒú{BQQQ6W+Sv9;eTEK4oHX{LN+y0Ic;3tpET3 diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/a8/233120f6ad708f843d861ce2b7228ec4e3dec6 b/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/a8/233120f6ad708f843d861ce2b7228ec4e3dec6 deleted file mode 100644 index 18a7f61c29ea8c5c9a48e3b30bead7f058d06293..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 26 icmb7F=Q|_FfcPQQ3!H%bn$g%5N`dHvVMD1*wTH+ot*d0HmhE8 zio?VJ2ow^N7(P11yjPSt(6h?$`BvBen~c_Mm~j}YJ*g-$FF7MVEi)%oucV@c!F6Zz zKC|sM>>YRJ?Ae~PyWvmuhH$9Tywq~Al3$)1%BL$&TpPh$5b$Yve97Z6W-v4`Ff%bxFw!fjC}DWMWvzv>=l^MU8)q`GHtgK^h(&LM mi2)EOq@`yt7)37I8y)_8j!@(7y31nK0iRS(hX4SGX&b5U?IBwL diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/be/3563ae3f795b2b4353bcce3a527ad0a4f7f644 b/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/be/3563ae3f795b2b4353bcce3a527ad0a4f7f644 deleted file mode 100644 index 0817229bc..000000000 --- a/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/be/3563ae3f795b2b4353bcce3a527ad0a4f7f644 +++ /dev/null @@ -1,3 +0,0 @@ -xKj1D³Ö)zçUBëÛ-0ÁuV9¦Õò<#£È÷ÏȲ+ŠWX;c`PQ zB{N88cHD?SMeT6bgvQFGC!DN`Q!+}8-dMs!X?D1VS@;*`@|$Zu=F}Un6m;Oi%DJQiSyb!!`4A?`{c=JktQF)dE{ydr;yFA-O+u DGk!%4 diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/d6/c93164c249c8000205dd4ec5cbca1b516d487f b/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/d6/c93164c249c8000205dd4ec5cbca1b516d487f deleted file mode 100644 index a67d6e647ccc1f3faad53aa928441dcf66808c42..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 dcmbgf0V^p=O;s>6VK6i>Ff%bxFfcbvHcT=xOSUjINisGxv@lIgv@|z2F-}S~ lOSAwoOw27AI5s#|*gL%aC$!rkXU?oH7RK^}ssOCx6%dLF8pr?u diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 b/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 deleted file mode 100644 index 711223894375fe1186ac5bfffdc48fb1fa1e65cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15 Wcmb003G-2nPTF diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/f1/425cef211cc08caa31e7b545ffb232acb098c3 b/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/f1/425cef211cc08caa31e7b545ffb232acb098c3 deleted file mode 100644 index 82e2790e82869f7ebc516f291a2f2d0312f40660..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 103 zcmV-t0GR)H0V^p=O;xZoU@$Z=Ff%bxFwrZiC}FsE(lF(a=LrTT*1LX3PoI(w%=M@@ zF#rOEWQJMH?6bT2UPN)fi`YN=@vZJ8N53l&xs+6fZD#VvRu)#=_|s=Z5m>$`jW{Fc$=TS{`5WI9+ZM01*fsdfR&>4gdfE diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/fa/49b077972391ad58037050f2a75f74e3671e92 b/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/fa/49b077972391ad58037050f2a75f74e3671e92 deleted file mode 100644 index 112998d425717bb922ce74e8f6f0f831d8dc4510..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24 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 rcaKYLMm*}NJR{E;Zd?;1?Rz=-Xf;gsm+2PX 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

    =uHz#4%J0P!RYVlzYKcqTl#P^Wo1(_e1-EG? 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

    &SG& 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�eTY#b?LX)(ib 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

    oIQ4YOXU$0Mi5i`Sf+bbJ=L9 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ǧ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 z zM-FyiMRZT%Sr9#-bU~1l&1TSvAKJ}&pPtc*J@lNuS=2lXy1o^E)HIg#kCsux3cKzL zyTB~Aiko% zDrT$xH9&i)HF*97>lpNWX)Sy)Pg&#&vM}-IA@P_d-~(p?l+ysu6Hp<3olXbn>Krle z5uvG@F6ax}`4u2g5r2?>Pl(C=DvAQA@AUT-g0XmI;~kp~F2 zyNb5~y14M6VSsI17j$&aufR(yA7L77d&xEA-mWFOl*87NEEAG;itj|?SFwj`mh$`G zUPsOs;-;6m7xY36-`i&Js9?Q9fz#s;RsZ(!Kj)Kqr&GPAn=jhfk}ex#OqQD>dj_3% z?j-f)M+MVWLG&wAUDGxnNpJI<5_** z-m1_4u<~QKur!ugEs$txW05$p7OlZoE_I9cXmxe9wK&4T(}w@8gf*+(&j1%E*V4TI z0Mx%r1kZ|5mPnz}NE9(i6RNV5CP7xvLduY2MHJ8oM`5wrpzRuAwB9-{D`Y}al@>`B zCjuuaI8ibUGE4|AL>kjnsVHWS3r3Ez5Qm)5m~&ikEP0}ef{3C}oQMQ-#<>hJjT{$_ zoS;dHu}H!=W+7LYiYN&LrZQr29MCum6w5L$9Y;nkrCE$Y8E_hlG@_gYK^lQJNhske zW+{BoBy$`cxrj#`hY^DuITcwz;7v%%XqXYoNE#DfkeE`(MIHBTw_Lus`SaCn{`Th0 zTkq3JwO?|nEYqdQyJ_*43)c{%zp5Pi;yNOlQ*EImowX^vOP_qSy%;Zz^dZjTR2zL) zD~U9)deI9>EWX5;{k~c?HdygdFpkc0jf6(^u zzH`+cb5@p(@Fe$l7e5@f(w>yp3m@#!?Yq~n`xJ|&MV}*rjSi8A!H2;}(O8RK z9vC!i<)b~!%8xa>hpGw=6tG70*z>#Y{|W;CpM!BbzZHH$|6T@%)*DCh@n7|0e=-IC zDR*5xL;GJr)5cu8B)%=r*8rT|qE&7*{n>4ii?V^4?a%bh?H~Q!wfqjx4=;7&3WX4O zocqIjhj+qSk)qV%{L-T2)MEYO#N2|MRNefPq=~!K8966DHDTnOEXxQYL&0P(m^=z5 z|1xe=;Y`mgi3ciI&`L?N<^uDIQp*bR^K%rmK%_Mn7w6>LOd3+0U@=<-po*e`_{5x? z{A7)kBu${6&C1M+nMF7u5@|)LsTv@qAeqSz*kk}?nKZGvSa_VBRNIczFc5vuR}5Q$ z>}_eoN<5{h1lkI%v=qb!i3g-8P29#Ju}k8>c31s(#&&bvATEB0Q+v*wGiRoma1m!! z!r(%&QiU1c&eIEL(mzdEc3?%>zlmj@bJaUr?zvjX1XHXAhjsAEao(=q-E6{OeHW07 zV{*lFR>}fjkcv7E;6g}fA)$@|{qTl2LSptyVb8fxz-Mrd(m6u~hl2g!vMLRS=Qxvu z?YLl|$-}!3pMv!@q43o}da>Zc%_a!nzxm?X+np?c2t3wG<|&I34+K2(Ve|R+R=@fn zUakbYSJVO??WR{=VU=6dQ&fy#l$BramT&3z1yHZW50#ClI0H`Bz?|hJQ{;t~I|KLL zok7VTnB0+pwUk=N$|4d8A(bfkUa&;_Np)JH3)Dfa4GJ~59w=DC74Fk1cFmOBD2}DT zrsa|$F$Esl2(S*qy^hj{AHyN5J!_O^0NB$xEUbg+jjs1we4MeUs5xJq1J8VDbx<5ZN#n7ZX!yxh3g`$V5qb*jdlhB#w&fkm zuUxld_Tz|xe>C}t!QHX=Yd=q;AC7S!M?Czae`C(E{Gg7;zyIcT)|+edEp&bX6bz=) z?-YX>c%19xzRx*fk_2aZW=VWG)Q2-IvT$~d(i12V`=9MU9>L`Hu*YssM zISYzX%QEvzi{nc&b5j*;6+Hby;(Z+>tYf%1C#y4Rvnf;qS)7xT87-KA)M7?WR?b>3 zpxkvvT}IBy985|;QjbZ3RiPTBER;!`g_BcXYjPKpG@F8!K1ggGlRO((mUFTviyz(i4XP<3UPJO(6k1LA7@r%2P*-Z`juIo6>REc zMHWe@l|VBkIXRPc?Vw(U`oq8)Y%0(OsDpv#3t|{QnVl8r5}?WYtm06Uf$D%>Dqxia z03eA?O1zT+c$|$@Yfs}w6#brGF@=h?vxba4oZe7$pgp3l}k`oy-K#a|cu%_!9~ZcE0l)CcS#oU^2!j+EfHkXIZ!wZ^4#_b#MfbmUyL^gBPR^L9{DRg{%&01jX$P6V&lx@w&h9SZ)0h$87EQ%bz-9=W7RuH|UTh9N|m)850s9By1 zMM?Of3Ro{x7EEOpGS@1!6Xe1!JHP`Ag-lMW!scow532~eg{5hQj0L9+4x-yQb_q)e z<%r8UD9IGCsL2MiT$lvq--u7DT!#P5B7h&egqHmh(=w*>$A)A=GS#Z%Ij$c`;GE`R z)K`Q+drHDsiSZjn5|eF(*M?-~i1sBkIFNtBwLVlIWD0T;C6nw*Qd|q-+6Tpy;E_m@8vBd{G%T6C#3tNJ0h5~9|+U%P0&EB03(*mEa8KGX%>pc zfy7wI(qB37o(Xq|=1Pg0W4jDhPC`n|Of|rlv#qWr^C2=V8Ghr$W}(Y!QWggEG zr!%T}8Bq52N1nZk1}}cgPG+qQ=mIXh*r~2Ip73na?$6V&Ev`chRAp4RA(FW!WgoKN zIP{#fVl?TJ*3QxDPu%>x^~*W=)TgYH>34WQF4k(PLexx5bya~ppY`lk1p~Qr0bXO! z0#QLQpvkTS`Ob$QwN0DLE!g17l}2M-aeevhFz&X(sH&MxCZj>;AWxTbLZ7;_dTod6 zd3k2q(dX+uOjNF7hmU0*TJGoWn-zhWfj9`t;ycMnOSuhm|8y%}c}u&g*#X%<8eX^? zhPlp^cBi(w))lsbg6D9tJAZ_@sjJK~?-)1WH6l#s2A~UEtoy|7@2?gx8gZKE@Cd&Q z{ds+Chu6uRGyf>1YihR7N+ZR!+R!T&&R`n}esnWxQ!rs-`U%`n^5SlJ7<)S!DQl>} znetynYJYNf^Kf%{ns{2WV`$vLB-h$O zaI+_&WLFfOFkq4p(fRHAtliz`t($zvwL$JK?cA?>_WyE2Q&8G5 z`7<(2M@s#3QFn7&9aTo|?PuAKmX43|@kWKdtOx%I{3sz!DXVU2)Q0A*q_uf)0-0Qr87RVy+2%HD@9i4RPecBW=q-Dm*01{ER_;Vvg+Tfod^* z-9N5_aN|MHfv0>Aatq@zcTqE66AbVt>%ZOr^B6+MUU&q=c|IY_(90?;0eF!v(V-Oa z0GW-(9W4zY^LUkP;IzPk8CC-{a#Q;rMSr| zyVnmA5`QEr@LjMWRTDJZ_{l63knysTnp;DJ6@vGy5)>r5(p&|l_W4Xp)I6XG8se5a z_$jr5K29{lg}PDkK)$5fO7DvdXZUHw5Ag=1PBximtr48WH&G#!L-ep;(3b2xLT+8% z8Lx%Cxgb7fY+ zIJe^f9hQE3$o>FYkl9+yEsF2E%XwAYrOBzs7()Ux$6$#WTB?9x9Ec)Cu+QisTd$E0 zls^FBDjpapxSbp3_r^TtOs~yV@R=!3Ch0s<3baOREoRsquP`kHXG z`Z_eU_NbxVZ>PvdShVSK%jA`3RZWP_SHUdl6g(`1EsPvf+rsP9NaKna6FQ}-M>8+S zKex(L>j~d&ls#{v+C0wI8h)x$gB0-8_f~LyZo3=h_IvrVv`_RSfbGmVc zMDjt!|DO!5-W#$AW^-kx?qKK&Xk1mRzOQ@CWp~c`8+n+8#0~AXIRWQ;ciaF?heivUG+bb@m_?&Sz7z z?Z+oQGLLkja>k1Z5EHEW_jJh3m`jh~LwbkNzDW?zaKe9gU&b0>bcpXz)G zyB&R$MveFsl*s*~TBF;T^@h1TaoWEw2%8`{g_vKTWErj#o_tOLG5h>^-3ChU)1!;% zul+FbqIuyWwFX6z{_u3x&cO z38Md5u04`1KVK3+utA8GpK%y^yu?k-!)tAveC51Vr0?tR>z9@Cz|!6?$W?T+Ypbwt zu>JBEyxun*iPJ>qw){q?X90C?MS23-d@JT7F8mPc_xA_lT|r(VO60_7@-;4+`^WWC zqo^C9Nm|3~Is#Q2W7gmZ{4a>!WvmP(+#an^l`!^Rx#2J}IbcX@9;}^ZATzV1@u9RX zjQNrNj@6REPz9cnk`MjKMU^meK!P=$y|C=+6ZcE#rU6d&Uf@oL9TdDq0wb#&%dT(k z!_nu5FF%{551}IC62@5%6onnj%{11=^+tHojK^XHLzGEC}EOCMJ$yFLFn@Ql{i@yoz<1Vgd`z?T&KP)sk2UQZt&>fBBM#F^IdMp$9|gC! z1@tFB9tM`NPt=@#WE1`Pj%LuB?H=308WN~~`rX(wo4}Dx{$WX3ebNikt`C74zq)Zq zlD6Q8$7IQ>eQZQDUY|uHtc&MnEjl998;%AsyQ<tPeF=2utW?wI78U-*8!&AOGPmBjP>~@hi;H6Rv1_=_li@arf@V-L$T-v6#iGs?Gs;z-sZcP8!o__a26;%%z z@TFeZ;+y+St6_mB>xx?N%r5@dZ6{14T_&BSFNymJKU5Pk zjvBULx3UWOb-mO_Z($E8->UP;Js(2LzUX}$ya6X1l_O1UG|k%Q@JUVd=#2Ut-%>Nr z?ah%nmHg5FP~z~Oj4iuP7;mM&7q!%A&DUbxrrx@00UpOW+z`e@^@vaCeTw6n$1@k9 z0x16c4V70lvRhfZd@_Kv5C!&=)#ql_FGd>b44)Zacb`tioRKa$2M>6aW9Yg^l#6X; zHdL;28k6I%=pwmEx@OseFD7@RBMCK4R^WF`NQ4B}ivJ9W#gdnvLye$ZB#Cc0)Gy&_ zHqK+T4&=31(iuFl;Uf0!Do-j~88?~>(FS-rY1P5JYhW%XQB@pLP6yKPg~G5c3H5$2 zo`3{0w$S6NzM;NJo_gHX#zx+6bKWPmPs#ouNw?}^qan^D7g*P786tP|^<{M+$k8d8 z`lN$I@vyIR_LNBsJw^*QQdU(i6}{uc6>gm>b4FYQIVC%BSB)T_%1BKKjI#_qL4WZS z`A+-bxpQa!IP&$8yAPA-OQ4oe;rWbBd0?phQUqFqK~T+0(nn;l$drv$4!1zQNIkkc zYKSmqO|-!&3b(vI!2#Gecke8{vAQHPQD!L>TbBSE71#6Obc{4Gd03dSF7#nqoStN!QNuz9BM|k(9dxHLvMh|d$Uo(NJ5rV#=9H+W6qAsbSuftJ z^bdU}*|BRijU#kpkv5L}=^Gj^jEne5@oOJv1 z-69IHc<&E~Z#FO4f{5qpGXsMk9f_1`Ip3q+hF7G&8z($&=L)!;$OGdr0$J0zg`yu?GRnj|mDx!U?jIu+$* zS_PkfQOZ=RS&X}7B(MjMnifh|c>kuTOz`%2D%0x3xd-fJmpL>@n}YCE%MDp_$P>$U zJ6!Y#H58r0s$ZKCyKRUCA>TY)R;)ZN0s*|QNuRB{kBL{iS`C8EGjMuX%Xye`#RMGa zmkIi4*3G1p9;y1D+qx(jr%cv>D}ly*_P0rfQNfPEMLE9n$HBmmtfo9)l*j6>;%} zv1HIWS{L?=hd>*y12S|BpRLN#BQ2xeZ4A~&%#6b9al$+qcn>ulOh&$*=NFA}gB@O? zD#bXmsX%80(EWT?s{tXp3gGC)4ADu!q%a!8Zeb_ZSqR4+nGOuGN!fjMuIb%h6*S@D zju@S*Dp6YEukP`1YwXZtKv8SRqv!V5U{@}Ri`a@Tr@7- zHk(MKMJ8js*BEhI2!ShuyOQ(qb~7H{=Z(A)eCEz_fAZGU{F;-h3{HR<5#79y-w1Ut zwuUoscIG9I=XX0T7>Ggq2jg=lS*r0?8rW1eTJvTL7H@< zWH(6xt3AtwAZl65K>QB2vV(#2#Srr7&gSkxiPPKG{jC!}MkS zdc9&;<2(COwQceC1sO8SJln{T1!w7r=kiqT_c1*yAQV0S~9?vKInmY10U_-c=z!l+G zb~3L#bIGJ>xRP*OsS2w9U`ymeO8EsGQY!*{bbJR!a4ezIdxnx8{oM0o_Co}C9 zKUK8Z{NPj((cBFh!Em^DG{=BTDXMt)ijbNSGqYlSb@XqJ5Az~yUfNPQ(TNF<$#=3H zKvv9=yFF859NpH9SCBBIJcX{$Hq$xhjN%+ftsdE&Pk*eZ`SqIQWL|Z0yD3uB37`wO z))pv|lye%_s`6ZsToM?n8UEN+f0mu-XrFoD8uIQJT3ljRI=!32(A#3^z6-~}2z)0N zOIr7vMV~RJgIjhCERp3*h$GIyS%{mj#P9kPa2HD+=&*XeJBa=0vg4LYNeOxPC$%L= z1MDjP@or=L%aSIGwZG^msIBY|S$CoU)fx69TGf)Hn=s2ia(Js$yVs7;nS8G>HAB%} zrzGJvpmzqwW^MOi)C$bM{H?B~V!5bp6eo_ArD3F~if!aSuLkC7n(Uty6-jFvX_Q1( zP-*zvA~j?n3&|OUKJ!xd@Mw@TN?=ral2kC0pO^=5ajGcR;+08Az&De!F_V6n=dX|gITB_K($^@tsiAE>dx|&SC*H%v~P=Z=FCfwBl>(aA@q{OP+jaUNiPX zuo7@_O~)H?&$+RCef?GSA~zj~D&1j=uf(66+6L!B3)>uultc6EA?&JknE*7VVT4^r z|2P_23Qh#vs9i5wi1FXaX%e#o2roGz$mGVsqs&hWVwJ#~CXyp6M;XVOs<7XF`VTD0 z((_BAV~WfLqh)5{O?N(6S}r(dDF<8H9nol{Q@pRp%1jr&8)|=%(Nj}q;Lu5@IjPdc zCbrB8QCuIMAEuz&az)L;;!8+*)lE$GJQyw9i|eyigeWV*!ZW~`kRReuuUk~)I#bjw zi7sAIhy|tJ+3zm1pC0fN&}_QholY_oX38*yArM>%o|Mv z1=mK>ysm3Y(R)yft%Xi6N`5JHg&kEgmkmTFu3I}4X553-_>_Mvn1z2_t4l}Z>gitd znt_WH=G#o zmY#wdDzgwuUGgp-XbmnnSAs3152b%sVB*Aj{ZP`iw(rl8*`Lrb@1jYOxGinhWK*@X z91D;1iE6~k@nU@%Alc-=|~>5VJ(`f;@)#?Sl|D9=cetK%-1>yjV+v!j=6)|y~N z(iEl2gU3)8^iURq^d@eNfv`*p+xhb-%(fR4CBmb*jL9n~aqru|%Os9hI_vxM9i9P& z%y@%9ykJP9hMz&FJ&~!I?%@;+QPiFga%Bm33!%}Enq|1OPL+jMG||t$4aRhG`^Vh~ z)fkj{DU|TmpT(bKYH&sA+PvT5nIA8)VsN%(YS=sSs+0Ryo<)lURM5!{aCP+}Wqt$J z^^$iEZ3XbR4U>LeZ?zVn(VC>tO=OO_rEJ=IOpGl}9m;viMIX}Hr&V%}e061-T^l@L z;LVE~ZZI9Hl5ZRP9(@6kUL9d})?Zmh2%+secpeN&A4+Zai2USZN4{yrh5d;X{k5Q1 zF+rv&Wq=qyR`a?4+#vl0Gh?tlZMwrieqs3?n<#uw#A#aB_v-HRln-!@HZ4#`b%r-v zlPnLK&dHR+_Jr0DK@N$j7%vIE-v7(&7$i%I-L14M=Vq;Ze?4<$GHg6S$@vaR7tE<3 zeUAn*<%Ma(;4&osL{+$T5<*C_Te89&wW>YO*TqP3TKncBPMwsAds*sESqoK1CC|jy z<%3ld7PISi%<4{fqHcX}9W$(n!vw1NLWUbaw?9loZOcyOZVG4NFw(rD@y^>EsJ=cMLd)1-MVIV zCAOkJAbv#~k|ZY*GR~w4eh6|dQL9KZ4+=0T5wn z@VFL<^aqvC1okKnu%Hg(P&qNkBbIo|REQ4g4}v2~N5rhj9>|#`ttMY#!i#>v$;o3L z>~Qwn;(F`Y9ecif*?RiC^Ydum@3-4BPh%{OwjzkzbDnMocPm59F}%(-A|Za-hFVUh zqqhs1g|jLmG{VV_@!?N!EQN~nie}}`B}41uQ?o+8dqiR%kvLa+>xG!%!O6UV#&yXJ&T!wX+K47is&DpFO53EN^C^Z3!k8> z)*NKQT33z2FWHOJf{!!ys+|4@Xp`*DuFHvFo@@?;M7UdnKY?d0@*PQm_VVQkz$_2rP-!SqI&PDU3CM zrzxQJ&%ui+j46KQ-Q`YNWrk#kg7x!jjwlM0hYDOe`}vV;H}gHr=EF4#XBqEBb2{i+ z4ApdS+UG%imk$^sEGZ9?vpKWXDmieZTn}YJm!mgqEN@h`Krg8~Uro3YZd-VN$YgZ_ z({<=6Oi#74%=vQZyoQ(uw;-=A9eOCNG{CE!-A>8g2|;flI*Ey!1A7sjmWn(;$dasY z3(=-1-cE+vm`t|^tv}r70@Rx=3v45p+Kr`mObZEjWs*P?LvyqE0*T;QISXG+-fxTz z4_}L?WZZqT=6`Nge+Ki6|D7eAmQg-0D+oM=;+y<#qY`axdu@oFNU6~uP&_oAt zF|=HaX^75Z#n$0XC;>fWHfx+oF!6xFH>`@KR{A;9{&tkdntC>1A!_@33dpee;MSk! zdZR?EBf33WPMN$f?O{~)`2#J!d~yjq)iZI)%3Y^4Gh@7It!hBdcc@&VWWs|Y1vJm;w%@~i-ogkK@SvX)xA`t zif6?v*<+PTpvtK<{d3`V9GQ#{wg2Ztqb|V+=CYVu>Eh~b;K0~DoDoG;R|!&%Tsp?b zSALs64$aTL09b|t3X~%ZGx0Pk)UIW2;xatpUgwK?TMn(b@O(M{@wQh^)Mr0mWWpT0 z>y>Y+Lq+)B%!JmS?EjfVhE=GJ_14dx-5Vd--Xr`u;AZU)Y42Ay&s_)6BECoFQlgE# zvd4-G$R=E+kYFA&=#1?O?diBn@$KbURVs~xj%!FEesv_gD4BifdJ%wVP+;EHTDzj% zND-@kmDmF+0wa22|NKVoFXfc^&?QNl+D0UN8pe32)UZ)hZmMrS7}HFjbwH(NU!kn- z!^@>akhlUb1UMFLm*#PDxq+Q~Yc6xWtiinx#}1LZFoH$Abf9?0r)q4(mao;|CFPNr z{dCq46v%snq`c!LdtCNxW?>|i!3uuXBG*jkx> zaN6k`&)S^sh!g8p#)bDN?>0^aC;N|jH1SG0EQ5}eSr5|Xt+2T|wX443xlhd#>lZCx zJd=Hk1nz{hgXwS;668ER0woCo5i5viHo!fSz*(2lrPjd<+n?p%;$PGk6x5rb{Ni&= z$fXb~i5uw~Uj_83$G&a9DhkYv@NK#UEOZb==M;C1ao9gPVF#%EdVo_ptGJZ6rlP5_mF(qRoMeMTJxQT`|SX|Hq(?exkOjZsowxSh~KhdQyfKx>2I8 z{tvrUh((gz)S7`Nom5639sqZVaJ_2|WWuI2^_=!4F$0i$_Awjj#0_1`o>et9WU%W~ z(7*M%W0fUxuA1Rm2$)Spi&-~)be%*yFv+YZx9gTMe;qk__TS+hShGP;{G^M3kRDHX zy5WqhY2`S8NYbmB8qWe1R?^Q$o>C;n4kKS=wJuz(mf%1Oo0Cj;1ihINd_dKb$Nu5W zuG5R8waEgv;7Th2-a@uFegnv9trMkhMWlglP>v5WxW!D-`zcuLbL=6=vYZye>wZ=M z@e~5DodM4WUeYBOv=&;_iXHN-i-Z{>uYI<>uB{zOeZ9eyjM?U_J^q=rC|*?1CrPL!dNHN;ZEwW#=`6fOGAIOXu;-zeqyCtihLPXc$P8jiDB-ZYbk(j5? zBHT#v=W9xX%$N=3GjYm1%&BC^KqjtoNbpx|RisLq!<5~M@}U(dr7R-hu*O@f6dd%Y z0WUrI*ex~08t8;aSAu(5-`$rDPAMmDyJ}&ZlR5DSI64&ZEjHrcRyj$rjCIe33ZQ!M z55`4EQ+5WZu9FFb+@iADJ`DA$&|gz958QD5+l|CovIKfh_UyT`#8HBYnqMQe@*%ls zSlGs=S&o`lQNHZNSgz#GT6kk^hs{Bd;vTSML?651?#vj&F6=SD*Wk1a;K}1OoW1#l ztj_Q{nM;doTlSG>+NpmTC&HNLLJt&X)vZ)4uC=659KeVrQxMc1x(8XYpnqF2l?f+6 zbM@4KkH3&VEH$^bYZ{s$n0+)U=eec)yA3hK;}f_M+n^+mpE!vyxDi#m1CM~B zD)NnvPgzEW`dK|ak7uuBUx)mpr*fKfiSp5PiV4?Cg9%6cwzhNqwc)&$vp#%`U;EnC zt@-%*5>21Zqtllr*n4cE;lrcHLsyTQF{v^tzC2ii7oyLx; z=7LHyG^jMDDg456YtlSu-H0(Os&IDMylCRnkE*G-|%%J=Ti zanXfGJ#=G@-k|{bGZwRl>ob4o@Tk@pmSTxhVp{1-<7(+X!RG36pX&J`TBX_WCkl}Q z>`oLGaz!p##kwpEjbD0w%Aeoys{0&oi&8?61_ay6wOGfa_us9(v^5#L&Q)t9x%Vhy zC2vdRTzq~>T^!1MU-V6oBlP0?ES4Jk_R@2D5Q4Z*X#}_Q2O3P29ob3BMZU*z0Pg)9 zsncJKzPt^cZ(o>vz%S+9M6h5?$_VMnf9*sh+!5;%0cwD8&_!2lkISPpB#YT5`kFQJ*S^&i6vPd}nT2HXONkjCEMowLCmCXd1_O>W>y?ww# z94K$fzP-dDKpiM5NBFX9TO%Gk4GB`h5ulv#FjW6s5lsL~UCXnHl(}BwRmUBUx7Ef= zA7b7C(g(TAqf-(=!Bh{6lyPcUPak1Es2C7`IFqk=Ory_-*>!2Y*>ylEaZluD5A9Vj zw?`{-MvVQH^m^LMjz7(ZtVK`D_wUezztk1%BUM30o1Rn3b^yM4ihfOY6+n6dS-Qs> zT43p&<)Nye)Gv(M<-OMRh$D&Lk4*;_M@q;sn1(A5L2aL*+dNxnKX#px7GE4VIM}l* zw77QEAcC?rIXUfnyX_vhSu^o-=DVs}Q833BCuZA48S$iJcH|b>3GvB|@1KeknJfju zI_3rrc+#Q`sTTVL&|V7%#aj=VexXbief3D0?EN*|7V)juWs;Fyqa`rQ#JR7~ue$`Z zbKQ( zCIW37GO^r4O$&~quBrviYy_{Kud7Sgy4Z5#zd81JhoZ=i$e-b*&IjY?q+g2gPGA1W zSJ6V+WL#XzEG3e>{1zK{Ug_)J{PdkqYcJ~|9u8C)7kBPGp-EJ-*}f5!K1TnOstJ_A zRdKvODL*s8EW1=S4r&poFg+u;w|}QFr7$h6Fx~75?RE>SuWbBUui-QFq^sYguMgPN zMm@a*i=4v%b<`yU9DMu&{{>#F4~D7ek)j!x8}?q6wUD-OP^k{|aiM`ga|{NCnagdgVHG z@oPr`YxAPCRZ4wYbU*Kvkd4&=fcbjFvn!~GOfJxm8vuTMyu!c2*K&blE;31>g%oJE86Q9@7|`u{az*$RBPnLHfZYA>(nD5TXSs8J~W-w`9~NxmF`gS7Nzpee>K z7!N2ttvZuAF~EV0y=u_m{;6P7UAC&itR4sWaJ(UpkPcw~jxuBuo(K{W-+uRa8`0l` zHYWhAHpm~l;E_vcpp}sVcK&tx0$`Yc@FI^q3j-##({`nwuLGYpTPFs9%3!2FJyDde z!NL(Z7e7*9tB-zxy)*+_17Vb`EeS$3H1 zgFPnvFNaoy^8msq$iOSquk&ZnUZ53TfHo% zABwPi$*h9#^x*Lb|Ye>f?xHY>~p zwO=(Bn8iVQt>N-6pfh1X45+l#ySzdQJun6R+elrindr}BVM)c|=g!Gjflyl}#p(IU zPIR$`NA%DigRXWIpX0}LQqq9wrWU0TrX`w5g~vsO{jEckk!NL^lE$7QrZSR#infM6 zGGWR2XtVLUp^aICccyksOw+2D*iWPgfEe}J6;)85V41N=IW6gN29?=)7`?=79aN(n zqa*{>qzw2b+)`T38j5ZTA>z`_aa8k-W3poYXh6S>aKa@->{rKS91cmhu8zLWv$R3=cDXQKF}0k$|Jla%Pbn^Bj|pnG z$ZM;Um9W)ZC#FXX8|8D4^V6^`$hdEc7ewDzbB^&Aa}=cGQwk;O9r3xwd1O z9nSGzA!nhz83&+dK0zW9e4tv}A(KTE5gz7?WCOx~@+Lv^`_X>FGVblE&~X6v`mP|M zAile?;Bp0++z5-FR~tT>r^RG_2^CZzHh1<;dD9c{agX6)BG$M9735chM&x?;oJ*ye z-^9j_D8`W5{R+O#$GQT$c3_E z%BMRjem1eNX&cWu0-8avMv!IN*igG=lZ@k(;_m#zN?CjpIflMnPPM4YZ=rgZUPkbV6evL&HHS+6uTLLSBK3jYBW2Rgst1zG2O|m51f?uoMOr4V!lXhW0b+#v(H<4g!v}63fwu6 zOaApr5wU0`DIYtz7H+-ucujX+oJS7`KWu*h{5VUC1i@+KPoO4mz9lmLLZgH{jBggx z9~7-yoK9=R{>qJ{R1{XN+d||Z$Vuf_cdu6mfA#4g9G5xtj78q`e79L4zyKGmP*<{H zh&o$l1x%^6z7~}vQ5{t><6<9my4r^7rtc?J^M*}9smwCf;EIgBkn!-JMyjBsZI?&V zhKL0UR}|7LGJM%J3eN?*$QYU+eK=luc8b}UX4Mu6qHUl4VyFR~w4^mBEvaKyhbg-< zFp8uJo= z(-#bY&|U49c2 zo+I`=A{6*jV<{|A3w~x(PC6i0K(r~7>J7-j)Qg63PtFMX{kcGtV5IrHOei8wKHId> z-CEk>scf#|H^O+$k6!@1z)Q8GU9cr=pd+N5o{`A>w=bM}32EPtVv<-H*c|J>DV!r&&n3}(hdxweldDz$k4>?f; z+5Jy|?T>4?Yq;7h2+Z^1&zLFBbY}zRTq!wQn-6C}9uf_;5TC(tG*Go1=j}kqkDO1z zeE>;w_;Kn%=b;_|p!9bb0qSy&Cc?`St8m8Gsi2?Ny zh{gG!=E&?EEG+D-Dx;HfGF8Uf>OHsS?{-!%3I^x>^ogmN$L-x6$beCKq>ep^Mg6~1 zD>;kSNJj>x2L(9>sA_^<)9V5(L6{_Teh@q%at4a)|FNXDLUc_Kl>G;l|4&?Irbt%L z#+iOKJLk23exKvN{w`Dh4=#J9LZ#S8j9~{&ruInTGQb`?1)s&)3FMxTsi&Z(vXT!V zb^7_ErU-Ta=e|>sa=f;BR=F|=ACv46l57yN0rp1 zK`m6ry zYnq4lSE-*RH)CMY@PKC>6!ksu6v%(e&R@Kr4UUNmHY4mHhw}@sB=X||DA_kvpOny0 z2R;D~utj+}h7JM+@cAaTa+!)zd>onw2qHsqa)vTM@o!AMy>?#$kwPrEzssrDDs$55%3kNu%WwisGCSn#<7~V3_XP{2O^$+SpszJDJ&mJQcK{ znJq790^Xe|S4-rYNkXl-p9sKxu#W%l?GT5fnLHo~p9P7(FO#5-Ed&BRF!9f!Qf2J> z*wdFGO8B94jk4dA@MTz(zj@2PoKfPzH^UE6N(eWHby!JvW|qWN#Pu|Ib=rwXR2bEk z^yC(E;!vxrfj};_dMf9NxfmDy?@10Qq#;m_Oyle0V$|e*qA5~5{?r%}VIuIPmR5%J zOnFwa-u(uF>uT(aJ^r7zvbHg(WPIMIv9)$j}zs8zM#ahsqY-W z2oOdC9Jedtcfmur|8sn>xf{a>@ACKzBt9e^79;i>w1K==y@vovD8Nz;63ZdvHxS1C zU%)x|;iLmT!c6Xce{hC_482aKS`c^i#H3<*}s19^EWsf`lRw>m=yGF|FP zQ^(Eam_nzX^byji5pK@xkq>;Q1fQys9uK|CO2;}1-9;{^D(5|-fjFb?Hpj)sR5hsT%v!@@ijcmYOmJvB*Y4-JIAe17TMt^H&oXnew zj(UzZMtK^$QAp7;-N-6Tnr3@SXkI*o!Z!tGFH#0I4jzuIC#u?_28OgjL-{_x484Rt z^R+>r(WF`HDtW4>ru5TJa6aWXH-_l`HM`YBtJ{xJ;O{tXD+?Rp=H0<)DJFBsN)TQxuVSksHWG1;Yvp(%4F+zb+`DOhhKB}zjMFFt(2dMwXK1Oam)XH^ z-DSxe3!)qKX@VVgKW_d_(nq4eOOsiL4-+17b^VvtkX6j8NYg3E$uZ8W^e#d#e*;PU zWthAUWi1N#!vvGbp3L+NJ(CIzlMKU{e2#rhAuq39B#;`z+FC^=0BzPEI`buIn;lNn zUYx5~NrT|~DXoTE#9pN>Su|ifFsEVV>v#V*$E^1 zo8_gRzT_C}s1@*wmAHHtJQn{yauk8rB5X0_)7-0;Kq8Cyj@^xfesr5b*jow!jBg`C zTtP*Xf#m3aGHl9g-rje)i(|?qg-NaJFGy0UO@4nFwz>|Yh&V(;JnB%c#oQAATF&Q@ z>i-h3b+3dxaswPD-@`xs={x~*V<58iuYh44(*=TE13J==KjY#W&ey0(J41nIZ^;)Uywv0R7srvwq-!=JgcV ztEd2gIuUZ}5MNU=+-dx1dqv|Fe>ayTM4Wj;!+Q9NS}kzK1E9Vt3>#kH0Iq5=81g zg((3sxnSOa@Q-HrbGZ0GOgjWiJUEI=t;Fx&+|f()OUyq{rq%(G!GKp_GMGjFxR(9a zw7*G{-;_vibxt%GRG%7T!P&vN=nKq_B6L!RAQMTV<6OPV0=qr<{(YS8t`-&`6rx7Q zEO}V^(WlpxFPH(&C6bC}U|4Rh(vfi4za++wBh?8tLLHze7#Z&}YLQ*o3KEEq z8)}O6AD}NDb6}7H5W7LaTtJ0QfNshQjVskH<(V zk)EEJnqru1-0nMskpSEnS9&!&*WLJ?|ETm4*3MkC%xtKbSR!nOX4C@#Or#HJ^lU&|2e3}9LVI6 z-6fN8>wm&eP5s96BJlXUCZkCEpnZv9Jsux_ZHAE_n)g{iITGvJZvj0jl{9u#L=nH)a1a&+o;jkF!{{MQ zTZARodnApwm^jifGm}|=1KG3WU}t=j1E@V$)qUoTK~iZL*PYReLn-0BoAG2>A=5-T zYU`&xbk~{PyPL-PyILHEs^w*jH2&mW0TE?A&2Op-Ob{Lo6TdNc^!4}7uB?-`Nr;Ke z#>vrTv)?66HP=@wa#t^eV3OT*^Noa3R?$zuLMsG8M>yd3)kU<={IlfKm_>BPf0RvU z0($%sEX3^JA`W_g7*(x0nlsU&r{~pM@!bN_dsZW@l7R!N`Vjh$p+ciU4-jCQfU=Ja z_$S!f3UExU(ct#uG&cNper(1&9!d%H2J8!94>%U)7QUVyzYj5ASF$ZEtd%m@H8e*6 z@DyAC6WTyhQS`>;=Wa}mkeA3&VWtruz{j<(R<)RPsW}-8 z2vTJl8Ac{r%h`ntuj!bHqhYInjogc)$#qSE13w4=`%nC?6PPe-&^~wpB0kRH{?T)u z{Gy&f!)WM?q1+17`G>OV9lQ{Xe=Dq+lY@heJ4j_!C7f>t+VpgD31c3lffB@!zrlR! zTG+uby=h)BxoN-m2(hkPXybTT8eX1FHN1nRfnka=J?(_eH<$;+WI$1}ekWqz%H?P% zhY$t}qU4}FW{t>a2JyVAMs^Fzghd{-3YW{1&1dFC@9P!~XBk{zBHGJzvdOdszBJz^ z(HHKUzcwooUzSCVl&pE8Whmp*R+N9C5(*FD-lYrNk@+%10SjEGa#{4vwx z4twN$hebI%-}%Mc6xIeAvvZavjN+lk*-?{c6+6;b%7R#hlJ|en_LgB;E??XD9h7vp z(%s!6-3>}3-QC@d)Qz+t(k0T;0#ec;A)V5xwD4ZA_kQ;Cd!P6DfBS#n3&(ZL%)Mr2 z&06Q2=NepclkVlkzME*$kL>%&be)`3>yeUq^<&;n-*c3ZaCeWrswx|v39FGcoL^l0 zfMm0CD=`n&k*{R3&IJUFY3ln~{h<9NEy-1cWA<_8D~ei~|L`;;K`<5v9N+7bWn*@- zb41vQsT$(x?5_2d?aHR}Wja7p(myjVtQHsPB#kcTp8yg#EG>PSo7!Lp85U4PPVWhvoBWzrMoepHgg)mC+%K z>zWo{DYNj-&Ft($QaLPO$3_H(Yi7(pfW*oJPNm;1QLbm~%a@_A zk`w}>e0;T%Y@xwFTi?ikD=*R+K>jf2jDhxs$-+;tMNKLd3#4(6NxKD!Y&HOrESjrq zPw{WPoD{tSJk0W0Gwk*j#=x}_qq0&4b3ZL-Q?iJ^i)aEj2v;6WU=%o2@5rKHFx{=6zO|2?rjB zKiUg4jJmuy-;lM3lNBI$oR) zXj^^Xa9?vJ1H%YLdGwh$*P?}fBq!>Lmlwkb#1Ahk*esY2`vp&q>GC?AxG8OCY+@MP zF~2jcln4uzYZ82!q6T}O_^hV@EE>5uociTPkcq7OwgS8C)Dhto6rNRs&){8Z%)VMX zIbs5NnNH*3wt;Rfi|r@pqcyEdTAFhfQI62aY)Z4ladtZ2)WL!X!KF=fzQG%lZ-!c8 zz=49c=3}>=sj(Jrb9?{Is~NS{{@5SsYWLotyXd&lHa(fPaFsPpFk;D6lxxQ@i#hH7 zK)#i}@1>(qv*D@bi3Y>4f{jAcl6VJLMULEN1rqz;<8q@>mftOO=id+MMH*LKyH;Ib zl(`F!NEmbrLwFUb6~H^e!Jq&DIVyVa{#X|d?A;;eFBIUIkR@ccZ7p!<{)hKhtr+X! zacK{(?~(AXkz^t|q<*52)VTW?2=;WK&PiRg&=A*5qK^#3r!%$JWdmWoLhU?635+`- zYGrzvL)Fi8qL8!%BdwEWkUxhB!+FE5;6g=O`SiD-u}Hv{S`{2{56%8m)Q(S39Fi&? z)e+nAR$Mv2Bt~3L&8AG;!ceYV{Bg%ei$4OX16$h0jsc*K?^wbsNKq+_51!;W%U67( zci*gcfH^J%mXWauI2014_Q8s-|Nk6H%txkR+ejb)6zb>BwT7asoAF3ngYf1cM=J;s zE5NkuX^DKS$xHS>dv@L(X9piG)ll$ixd$V!7urP$Jv^VT4aFZTJ zA#5NN{J5=jki$(Jck6tf5QOT{pnJ48)up3toG_`t+!^P zczR6-%a1tIN-$c)A!-P~J<#iIigOijllr<_Zt(k?PvoM{t54?JdS&0GnT~k=LbU%5 zcL!h7n|^OqyVZ|g9j-sCSUV#Kn-{JM{Oo*VR^*dkKDw}gPHI@jtrEPRl(Og27dhGS zf`_0mb(7A#kT&#J?%Y#VS1-O%ZlXyP5v>|*)LQf-6)}1ym7#%Y1q&zq*G6|OHZE0S zYgdbU%!kj$eTXJwi|9jFZ<5Xo(aSidg_#_NFg4A5D|VK6b`CerhGxKJT$)^)@Cm^5 z>aG4*sWE2Svw-LIcsc!OuwlW4+c+4^3pZ~8J;&NE^IBIw8(9~b;*Rz1C9=R(Gy^gX zP#q6B!<*&``L#I>@|B!U=>ScZX?WWe*y@J(+YwPzIuJXyFtSHlif??iW5Rw}Yiqbt7WnjXy zLJEUeGyiRYbX<%z9am?7>6;AMZ7@zgU1R3&R03LwrxnHi3}B z94wGoJ7VglX7~vW5Nm1(IpT<6;*)0$^;Ui5U6JXcjdxc3j0vs5q|=jjdxE{1bhjD;gAPg|+xLDjq$CTQL%L;qH5>JQg>Pq+VKA3(EiYcf9)Al zhp)p$UP4eAk>=Yc;InWx%l3=}NV%A<{v1Y9{UNE|>kL3HOC?t4j zX`Hfo`Lyk%aq_hT+c@4KCz~Q}6XkHUjX8a==JYRwy(alFI{jFSG!CZhv;=u5 zR1-1i86rDM;tJl(`;0K9@2buF<4}VmdhO&KnOOTOMD>j7Oa=J7OXdO7VUGaj9M$jIJ|C0Aq6dfC@pljH@E4Hh0A6 z*vE7-N91F@c9zSmJV{@H3u}W*7auOvjho$?@?&F4`07%XI24(l|=lHO- z}@`8@MqQP5iDJt}qlvo~al&Tuu$Q1KMnA}ktc^lEv4ujwscvFlEajrIG?tTbJ8 z4*bcl1ACVTNefr0_guvv4GaV1ZK{iYZ!tkQ6hUacjxmSm;Tx|2pWf-8YAe3<)q(-- zqYW!O`GeOT9aU88SFDaWi~X-!s2g8VYW7v@aYPvvLbv}y)ivK2wPJ_IeO*JfEvY*; zBauc6vsoSZ9(RjRDERQ(*IjX9Ybk!HZX};6oXL}~!8|!L^D=w-Af~qL(Lr-C`;3Aw zal=@OTp6?kHBm~+#`T*k>dM0k1B&Yq(D=0!{t-$L0AC6X)~DEtN4^&a6xI**G6Nne zw*hkNpI@(hn8`Z_FfzjEj!aE*FXJ^*YPqZUxkT9TN~o(ODX6OXyNSzI$f)Mc?4@bK z;sfLS5cErSWB(ai$@U=*+S)L$_zh!$|4k=T^Hy9+5Y8OXP*h=RW(|E~<@83$ z4Kj35wlPVHAl7b{ocTyzP0v$Rpe@t+Vlp!p##KqrqXnfzT$@o=#>LIJjeUn`vS8s5 zkE~oldylgZ27M@C!T3Z0)U;7kQ3++o6`fZ(;ba{PjgpyDil)eLGv2NT>%LE_FJiGV zxjk%1YLadEJ#l-t)y9kY&a5@G_4Bf@sF~*3MS_oCA+(U*DJ1c>AOb=$?`%T)vh9;| z`MEDmRpj@OTq?uMa^E2)T?;lnab7o>Z!!1<{p79DBSMTdG?=uX47;WD?ox&uHbRDj zD;Az+H)4tR?v~cC(4H%_Gw^f~G@q(gBe2`5hkbcEda1R@gKR3M{n57EtyvWuseL*M zjq5VUl(8hPSDz-`+p;dH%u0gZxn~Lp$x-AY|R0k>0 z3Pzojs=$-xldZ-V4{Ra^1FXrcFD?n*;^$_(y=m6wR~Zb*I~g=m@FyqmQl&sNS9-D; zEigy?qWbc~R87e3Eh#(;W~udXcm+RC6}@N&oJIz^tk^@HRR@dc5d5&|?Ar)6c#xGP zbKDV}A#iH-`9*k(cc4D5F5s)btFiVo%dyBa53m83KiQwhUtmkL18o%$(hEeZr6#%7 zQ05~g)|u%egOcQkVL!nDTna#BG2WqIs>jn0N7|O%V2JPu$Up|se-8{}{|6sq&UY%; zcsE;2J5M0Jq-QhN;eS*^KL7?57@|J6&87#M={t$_52ZibP~0j8ks`o_?L*rE4E3L@ zqiFH9E6*gyk2Svc0>`_T@2t4a6mZ%z2|>Z)ayHI#9NiJiJyN;ZDfZ?{qugNp9 z(sf~hZ1PBs*5Ff+fwV&%RC!ku)qr5tcJY;Ino&v1kuJ5C>ls(mLzg5cGJgQCHGYc-+>X3s$Q0#4B0H%1@@^mcqkHGSNK~(#tmR zY%5~1H!mee4?;Hak+8YK*={OREqr!`X$iL=ph}G{LNR+ayO{A?=1qzSf9+A5_tC}k zt>O9G8t;q!Mx&$Om6^NfL-uLoX}E#m`PJ6VH%r>Q zvXTz`A=|~(Dhy{&mzfRpe?Kja_K77~X+UUz}duy^XkOwK5iAVXU&nQQ)PxfPWV&UU~! zU$Rv3{AC+fwK!vQ-YY&l=*zN!uyVA*KTYx5ka-roX698ifioYRkS1(?|E&)-0VYZU zO#yee8L<+QUvQN0M}|GnHqQ@y-<+|(s!V^&tYY=Tew)8fy4$*yp$AEy9qtNGMtJC} z)X#D7GAi=Hs1P32yfU|Y+jte~)u|ZSkM>1@oxJ7g}n1(}&YS(Own;}Svqxd>`xYp4U=fN4=5)O^^c; zBTzSDmGCgS%fuwalW)BwsJTy>MR|^?or~BCnYWD{MzwpJj5`1bZwmG zCj6D`K1#;>h16?`Au}t<+wG&v)x|gc`mZEQ=Im{0jbUS>(U|oNg+-A2`Q-%@H=SPu zIna_4ZA}<6;@l&~=|6Yx)c*wI zzapWrND{+=9mw^&>n4BJ2zo|6DilCQy3MDoU@S}5RAH#xlU>owVyxn^Hsx>`lvA|i zf#Oc}bRYFgmoB~94g*;>#4e#}341;x^eaO88ZjNKWw_3i+b{ngffcr7S$F()BdmGc zm4dm_!Ta>?JE|6MSf@~L%&w?mt|8uHL*WMRGDDzdI-jx(v@R}x>|+rNF^m*8K;H<) zOY3nBAZG5d#hTRm2DMSZy_pOeB^qr8ga%1d1)t1K6cX$I80R?4B5lv>cw>1zD?`=8 zGtV_6P!win*M$}4_9bRYDoS>Rb{8Kpl~TpNS%3;MzGDEKfgmxzcgN!n5|zGYlZ(#@$JpPiCGG zjxK5a;bY}_(Qfc0prWNIozcwETGMmsJM9@!?Dqc1cTs2SiQ#$3dtO6KXYN#~=`3+? zbk^Q{bN5k~A{x#t`SHn;*=AZs6I*1Efc8fFg@C|y$O~;)!bg$f-7F8&Gjdo9myMF^ zWTf+#n!}GNeAOaBdN&g{{KUwg_qwulKN04@4+K+@8AAx1jhn2ulkn?j(Pxh z9Lt%L&tr|G!|3E|wX?}g>ANsV3Vzv@I&N+`J(@A3dfEgz7plIQ`YLcC@(u!ioq7_& zI9|z(Jp7Yt6DYQu2E_>mIkrKAI#vi?6j#FDD^-08Z7*TZL(lfJcdlDQ3kgOy)E7P3 zG_eibR2?6W4!exhmdW|mbXi~@)G}V;7TB**oS<9QdKq6WG#SI^adMPxQu?YaH=<_0 z_*G5wqNB0o=_PS%AqERs*N;Z|Pg(OQkn6N=rH*~KvLXS?b<)Up1D0R*pST3;lrh=K zWSNT>EU#L>sBqt0lVu`KPZ{(fvUDbXnc?7XkEn3KzG-)HjeyDN{A=dp2M>Q=JpWAaCWc#FoIXL_CvCDoWvnfGhqB{H5a`?F== zy*vjT!U?fu0^Vi{w)z(FhB~cY&R4e+ zcJVl7K7PN7SU@W+4Q4{e>*tAzqqCFFiwAN_$16B4Duh2+jTwL{+JWz{LJg6>B>oW~ z9GwMxOM9DcZ*=|c7Ok6h(C)E^HXY2H8 zNYL^ucKphkDL4P+n5zZJ&_80~mj+@{zi}+-s4pW}dQ?bT`V_qiZ}lsKw!ftw6Q&QM zK(P5#Byl|PS&DH()ZJD(+6N0nlvssgf;0jb$fvb^OPR01Tx0P34)UUnUP4~=JA7)Q ze|mOMsu>#-hek&REjBw}&s<)f1S5Hu5*@2ikf;u!j`mUU$dXC=?vOkuXgfL;PZzy0 zXyezjrSou`AX)ShHX37$u%e-jCo7d{`K0!2%*feSKbw+AgZhY=$52w#<)(8^q)}!w zl8H)X*bb(ZD9!b(81KMTy#&+wwCov~!erk3>IMgjo76njz=j(Oa=77H+#d|Af-I^M zg?BGEveYwL7gv%DF@&|WBMps;h(d{Sne7x3)eSRqer3ouf*c)oKfG|;V=~LoHWyXW0zj#R^PATKNK(TTg@tukUS!J zktMpE$zChA&XsCVphDOpw`QG5O&Z5T$D*SCyg%8KVA|5rwtzWo>)Vv_5NcN0w^gs) zF*#N{l}SnXseZ{sZP9Eo6)>i93pwHl`xv4WJt|)mQRij+T;4gGVBCv;G1A6Lx+`rN zrSGN_F)P*)Y|T=|jBxcNGItY)EnX*4yCq0Q=<7Z&`o*Uwwy7^ebHG)SrO*2CS5Jw9 zlx}o)C4bY}+aOIPONup&+H1F0)mYy3`*{zOX2HvwozO4)Xe4cFPO_-Z*P`%(M)W_%ZlXY8ZrbrN{9w0pPdZ? zwL>DyY}y9_(7C!>jm8&Df2Lh^n?fn4@$9SZA#E;W83@BqZd1EQNo zZ?)r?GsyC#vxLX{-6w9YC|~v2Bn*&J1is4(v4R4InGM)mnD^A&VJ+9@taj{~6(myr9{azF0#JGKEcp zH1zw_jOCp8sAs9Zb&tAa_dbBjlw^oU%e^)I4+qz>-`Vi~r{&P+aHTbgC5jM#1%}Sd zuOhMP@vE;HqrxK8d%rcSA23GFkRm7-q4!Jl<%Q1%(Z}q+`1RfD%I8uS{2it)Zr9oJXg~NZa2RNT!jZJ*3(0JpW!bY7*Mmi~mhvJ= zc#Y=DN@7D#WL*4S>L3VhQI>LI9MfK1t|8_gHi8vXF^&S?Wsor!XQ2%p&ael6H+y>7INxK2R({~)-jP9h zLBgO%lnk3G|1z|Np!H0FPSZj!TJ$|3%ZEV|S@@XRlqBF8HN}_Cm)^M?)fr;JpYF8r z-rV-SCb3flN{{Sz8jWDp}7UJDiJj?u*6f1JKE zg1!E6v$SS=6!Nm4p~P#Ug`BmUw>$CWXC3SE^QkHL?pyX#AA+&FWX1i1$i3yhHb+8D z8&b+Xc_-atbRj6uFKxWEVn46hCqtKVC)+G>0|-Od2v`DDdly0XgwJAxJ&AurCPk@# zXeHXx+>RHa3sYqDw5z7&6oDZ0WmnvUDciU>Gbe>^MUEDY%}R#Qrr_KhsxlS~Z71Q3 zo8H*DW2H=J6&~6p7&jR(zj(JA^`=f(aua2w%L2&*$InZVRnPX+O?4Dun`IB zAJZX}Pkw9p2|Rxp$Z8-GxBfA?Mat$BGo=^C`L;)${*Z%E~nu)I>#dpj}Tvk7u zNgg`zeqQ^An+YNNNx`yf}l#(cN#-2k5_Q^cHLVZiwVp+mpMZ({`rkS0) zfwaffa=83JLKz&oJqx_|+iyD(6_qYFRqrRpY|XK$dN=Wfy6{5{H>yIns|_KuvGD>b zYNN{dcs!ckf#olc_a)Wv{3iW8^i@3-Rv5kmA8B;CwS*4eRoq#ULYpD8qG1**6?@43 zmGA^hQyN4P$ig$CO}LB<{Z+mx%ho-rp6H$(hlm7PDtE>1V3nehlF63-HtB>{8?DwBX!|f{8@qGFJ7-i z)4T{?S(35-Lr`9!L;h`70x&^*^I8?WLm6+jUZ0ohgD5KDoHrof0HPk48Z>`@g>;Sh zDF}k=iMCbVfl^CW13KQth-ha1@uxrxAZ!K0QlOi{Dp+|d;LaBSyk6j{7y&UldVCcg}S}p4$l-HD3wHZnCrmj54}IA za2^n=PpME`gFy3Ti__Lzp5XoJVi*(0=Yg2K2mI-36!Z0tSY$i^=)KVxwZ##`ElM3e zRP=zcgxUWPe^&_)Q<^AvTlT5peYy>X9QoJ$un&`;GY=z%aZ%RB6{@|`YgNUBV?D7( z4O@N21I3Q1)sKhwrTOf~4Yv;3$(C>0`5X<|Naq|8zrn33GIU+Zdn5ehbImkT(K&gQ z{;hK+z$Ss*F$)(#Y^ua+lfY; zNbX5aGqP;t?%IAy%)*a-x4q$)mig|*-Wn!;YOg9zoLUxb1~JE7XuTmU;J7h%RPmbL zj`beogBt@;iGiT?ZRFx!`?F(GJ*1ReH- zls`XW2_UciY*YJ=d4N$WE5eydQIp)HCjW~fUgg3Jr*r1HvuF0Uz#T=t*k*Cu4ZE&# z62mv;xxA$JNIZt}6R5IN4zky7Sy=d(7~dKQ-|BgP3l+chKCj`C=B}aq#Ulju3otKt zV$C4oO8#CQ8#W9&XB%$K4i%`BWj$U}P)*6G34khdP-(3|N&)KfKM1Sri?M*o*((t- z*3#(MVv;KQ@;heB=K?`$V9-o0YRw+ey#nxYw|j`j_pcx%++^T^m|FK(E^IWSrMba_ zBONDW&*1Kuc+n#aAKY9l>x>c`d>mD;@3QU#m01{NY}vOfn?AP$(A;4sh}G zKs;zOi)d7^4Kd=4kuwmjWPIK6v(7m4^}2>84-u+)MJ8WNE)z#k@#n4Oc9xi6yqt#rLS0v0CUUzuL^sFjj zy}7V>I(zT!f)3jPDig%T{g!@}+tl=wzg5#Z2hvByFtZttQ5+b&%O=k`|hW7E%+Z8 zzP-K-*l0})wTa^yjUnNJ!{d2o+w7^-jG_gPtn@ya?E`OL4W$o(&wc#5x8Q}Hi_wVg z;y^Sr1uU@UGL~N%uOdmOj9x>-B(;tD$Hhc6o8u*2-zP>8NL&1)*C8YX1h}?N@Be9k z{>IUxalQ84utm0bzc!hz?;$c48}^z8LlBUcA(r0;f*{~b%s^T9{eUx}0azF8?Bpg7 zqAV6yD`O52{qT}wZk4Xr7uoqv7oE#@Q#B3@Ni@8;qjp0l3@%}zf|*d97_wLV*Q9nS z)sFALxSoazirA?;>zFExyx+2~cx-T<=+u%!8o;ni=oqpqLx^4Y1yJ3g<%?^wB~)n8 z;yFGYEr_%P>ah+V>I@7;161)?^&v4ISCuf|5G8tkWQuD=HEX71|d3X+WR@jE3fOi#e3lan%j9lQ!{SJnADCr!bRxfS2Bfn#~8 zv6R?Kglb1Vxcx#5Y}=?CfcSCKHQ8Oe`ee_Hj28{`^cYU`2pmfQ{JZBa);}bp-*oya zsd%X9n{HGwBJs!OJXi`$$UlDu!2&cEh5Fq-d_ou)3ag9085k%3#6p^u4;@723Qbyv zK8}P7H1v-Z0h6g8d0l@LTMEraW zk9hMH(U+gtA!nc_3lD_lfo2Hk1p$@8e;j9-tn<-+u;THKu9&iNl2q?02K&|0h9I4ZcG@fOG|*itshbzzOv4w86s-Z3AQF#-yj~DFq9!efGe;sV;@8^BSY3fYveP1-CR4vRfR-Ee1R#^mOn@tk4E^t^FqLw3W@>6 zn1~?wV6>w>#OMe+;Pav8aCeF4>l@h8^#f-_f9L`&+}4$W3u26Or#Mga==A-5Y8%KV zNv|)EygJctno)V_e`6@M&hRcpcH+r{XNaaL&4&4=Q*W$0&#B>-Wf(=V+; z0gpT1)turUiVw5<6lvP(Dho$vsjloHoYGyGot&APkyge&mmp{Cf(84wp`)k{a^ORc zS%HKCx3K@^smEZ=KNSlN@zr2Nj8)GyFZxk_cx80K4o~WQJK+-iN0Mu2;)lbJH5y}!rK}6X zew97nK;HTC8g0wA3Muq(Gw%#1s~zS;(?~0gl%X%R>{uTtEtXbcaN5iIIZ{6xJ-;Aq z*uLmTE~qV`4(vvM$Cy+nr)02pToU0B_zU}IlZj?5#z*y-e2;lnbV=l2ASP@$cs_HA zRUd$GTyj31@UejXSAR&n%utfe`vYy?u=lr|Qo2ru`c2BeXWpDexyFP?GO3ngb&Z=; zdK=rUNjtuIqji<}HG(fK;!DaD0%@x$hcnWpU{Y}QpnWpzs#ljgOn^Y{`5(=Ge$P{7 z*|)S|fi$g7D9lG*)XA6)X8w$mJQPJ`Pl;xp>z$eZ8GohW$f0)?rz~*R8daZwvps9N zI=RPL5@`Zk)x>)NkGi_y41y?&{V1RBQ8^qmfj{bzaC}zE>Ot$;82}#nB0;f^6bwAc zVN1};{Am?yaKn;$80M-|tg`ibFiXEDmFEgxFInra*$xx00V<`_C7Kc*Wu)nR$V;uT zM%#?UFQ85>fJnLF2E|D}4bPquPTbfaMc*0Nn|n%~7`MVaQXvnpxccETcr$V(Y-?B| zd1Wa;hv{_Kp8!Us#)#sef}E1Z@h{i&C+^N~*nlk)HyV}jQyn43Vyn?*IJj+cUrocvqt+i%X4&nX(Ni77XK?fKVM)dOsR8k=hRLg_9=*1gsT?F2}Ptw5sm{#~d2!8?Ks zA;9~o@ux%VuqWCq8CUH$`;QF4iB!~#|GCL$P4@dI2ThmvGpYGn4C4fNYPYwEB&hL- zP+RI}Y<7P7wbfqMSh+{MUmC3y###e?0})`@MF2dy`TeP_y3Sx*SJoL04iJR|T>Bw7 z=;6}$8EEw%C)+pV*Snr4i%fWZI~MMi&u5lkb(z%I^oI&_;Q$gn%nE$X0-Ct*r@Nv3 zR0n~zLgv9-wdv4#I21>6R~J(@Mm9!P$J#I?cKF&&v?Fls8pakhzYJ?|A8PaOPmbO? zv&jvsnN!vhuIdQa%MEDF_d6%~R~y0Zao{u4%Wi9Qla`<)?x!E;nRU$y0WlU5&#gk@ zjUT+EcZe&LsWvK1dgE1TdW#MlK|q3r-=eMP?=Ix^;pCw`BJg$rI{OM-#1^pP^caLx zJVK$lat<~QE@Fk!0oKv+;?8nO@!~ll??N6pGabbWt&z5pPAMTG#LG4=BDwgWB0rqv z9cVhx8(09;dw-31jhM)byLnIRhEOgqWxG=6z<<4*uuZutR4oq=#_hMU#Ht6-;EiVh5@_2rVHMI4?b^H6Xd$3%3Y?o&D4?&>v*sSO3OSd)p@|y; zh?7~lTn;AL!dU{jRe#Z2c%&!o)BDFc4(K(7 zGgw~Cc`+S3UeV0aHYPhRQqlZ71GA&emNU<~h0J$-M~D&oBy$G>Hs%mPSHnd8Yw#fu zz$Onwf&M4`4@3cD%>ESVQ~GBHO^xaAuOS$f4yLQsuto^3uU)vE1D!)AZ*-DO+JsIF z->=mxm?4xOm(f10FEP+cccc0Z$Hb9C-;?C@b3l0V49r|aySW4X$L4>xkM=ogeu~%L zv1T)p*tS_f16}Bw(_{N;?5Espqlc;c zyP4e4;Afy~>C~tc!6fxgd*vOBrqah|z7@-jCmZKagoO%K+J{PZa5X#lJT`+jLVUUo zE|Yx3Ww-tlm;IOw0%^WLbX)@u0`v{N;$~goup-I7GqdM?J1l0$Aq?UzhsW51WIbRS z<(F#C5>F8G?>6Mo4QT!U3^0*TxuX{j-}9Ty1z~gCPGpr|W)Xp3Y@s!-A%p_*N3aR# z-Q$u2a%zzg3CU|!UsO}}e64iVfnh>>5_pz>|88%)cE_5aT@TrB6Wck1I8CDvar>p>hl1wR zi1?OU_!|Y{!_#X0P-|xSVJ2`{3vD=sJPw zirk*xn<&Ui0*mLno3tzOvo8|=?(oF%Kbm+=u%Cqk?ZxUEo;1^cyuDhHK~Gai zT2~-)|F#pgxDoa{_cDOzXNGdK*NfYOYv90bdeo$zlAxQeLLz``i${MPN>JNhx|u^j zN5k4aHDTAr+c;<5aq_XXY}k27Ck_OsguZB34P-pP9mnC{dx@h4L~97oy8#Ym0`^cv zo2qX&%g2Gnrgmuc+7{cwo&ea2=SdzANCUO%{v(jSh`S~9yQ}mb+`Vx?Wxot5o#|A0 z2&D09FvIO4uz|)Z1(n=Gv%YLu1%qfo&tAbnRv^J-|NgB0h2c@rx%7K_S9HhSKUsW^ z0~1?QRgXUlK>=fE6%u9s@6VEb-${p4jyEtWI=!?i_lK2dGE*tW-<8xAp9-|Si#ogq zjRZn*y~^uX=Ao?RHflC<)@nH+sS(oFhRzl~hBg2v(J(qB)xsj?qk%utqeLl{WXK6SwKO8t|sR$3^4I$ZmoWcJv*atLM!QA59!n(mG({!^d zE}DJ1q6dQ=m!UiFgMnlHu~$H#85MU}T-N_im`&+iQ2V`T7n6JE z2S@p)21!865BXU5NGB_fZT}V+a6NsGuRc`{ow~VfQIrMfWQt(i(w$`?Yr~{yg)KXF zUPpAMA=mp<;QTPajb<1j3mb)A3E}X;twMbMow+ELZ!=%A zCI;9V&RrH-6A$SE-5aKt|5}jOX6U`!P+;|f`9XdEjPn0|meE6TFTRe-zo5|;YMKWn1MOpC#tnk?6xoHYtycK<`V}zZT2h7xctK za03z0=R?eu3(18fcHlyM)ZUx*=Fj0IpOJBX5^EtM-+!Gnsn{EY7HSvyP<%6s_WXrg zH)LdZhW{xcmkOP;)nMfU zk<3A}fNCtZ|1Kt3PG4J>`%2q1(?z^Wf_g2ylCD z2IYoHuPlhw@BuOo2Qc7&)}(AiT1DmHj)*<}Y4j@xVmKtNk#}T5kIjsdpsE4|s&N0E zr+$GWL_~~@3nF<-zn?p}u~)fsB$Leo@dB|}psN{l&I7mztp}^QC<9i*Km3aUUI*~L zlLrWN3IGeLnPyguuy)M7YfCaueytEPNb!btO+g`&vQex{9Pm2Fh(2BPVtyLHth97v?*ht)fJSOj2Ua2B z5A4y0c=y4-rp(wo&p9)n3JgxiRN{>ZS$cmfu>Napt(*a0gM+w%uZwGB%)7Cthi!Ev z1o&Lfgt(v}u?qyqHW-LO=ksgy%)6hwJWu`#aM_iH2N0XMdGBAluYy6|AAwo|&`1CW z`^TVig{k}JXFi;sj%}vSdd@b30f#Ef0a^dWCk>rl7;4DSBQ;Xiw8_c-{@KReXrr1B zB=nh7_dgDiex}O#GUN|_9h^S)!q2q}7rF3%>~TF#%rpb4(>|E_?>-+Y)P~yp3>TkP zSfcZx{WYZE({kl_9ajo!hM@ERhXaz$eDTU(>Hg#LtkzdvS#Inm#< za^LRauxWd*btrBe{82Rp$nmGJ8g-Z$?ZwlqhJsn6A%E85U(VCX3JrYsZ~3WG-qLNE z?a^@AonC!Nd)9hyo$+Upb1>Jk1!hqrDyfmuNscXWK~?H`w=NVfb5qJY(A4=lx4NM*lZn%Q`;z z`Z%W5`Y3lcztU4h_XO^yREf2-;tI+9fg|lRfJ*u%T;}jLFu&{fRr{#p7ShtTh^}|m zD~>@92#DRB<=Gk%5Y7H$)BX2s;tNJ1+)`V10Y;fEOfS|v^V|O~n|8;d$h>j8OOqyR zJZKg9K3lj`+?CNn(s*Q2Bdlttzv*irGU+t9)#1BOL~7U^r4nJoD$nwd9*w1~df2M# z<8NP;bV=)%%?Qnc{yx>-c(tTdpnzF^4!{Cv|5_kq?`Q`fR?~jLIONIIcCnlZmhmd+L`f zetg8b9j%+c$k6O9WmJeCE>GVi1XHuKtQ^4u=_J?)^#1X@__PbgZIV7I`u!&sR~2I? zV*JfhP}~>>;UgJZVE^0srMbq>dtMNB!YgxnHL{KSTvw=RekVjhw&gRqoW7eS4Vg?(@@!^Jrkk?>{dI zP$Nu#pyk$B2*FqVAo9DE?&@hrRQ5IHb;upk>{!{#w2q`AlhcnMF}mkqy9!ia?GsTQ zmMS%WRNayPvGhQkB3&BhQtJIBuJX15uDhc9Mg#L7yWoB^O-$yLJ zbl=z#73>p&%4yS+d^yQ8rYD1{`4q3LGJrk!aoC7AB!3MFTp}O zSb)$5=~u(l`&j&BUj4h@X(vH z4QX#EEWAydM<>k-m{d4$Wb^)9@9@{@FxY`Qa)>nkSO07OkN*8Fvlse|JCiet-g8`$ zMv`QOya@@Wo!MyWQirkd^Uwxb5JdJX{d5EL5eCYlBDK^H+QGlxE0kaX zA|qt#XJ=>srJX`P%%M2>c&BVQawjI12d4PQn&rxGlcCL-w`&eK{ne#GWKeWIX(=GY zw*J?+{d)}ZmCB@)oA%0+zsmfTf%gQw$3-8FJ6VPLWd#z4|L@1LefEwK^ntNk3A=oE zXKXo*3t#zuxILcJORK17yIJ5B!-scfmu>a5NG(k!bLOdsk8+hl0jE}u@Bo*Tp zMTLEV!(a8UgvBoxUes)i#GHK~=|5^(#`>vpXyDB1p%p9VvebryJ$!k6%b^TFMcgbNc~MJZNjgCl;SqP*1Nyis`(v z%+qYw;R-*J{n^zNg-)jtVezov2MVH2R& z@lzugRt%%FDx9}eYU{oH?VMRPUEjdqi@J+)x_T~|T@S$09=q}|e-n>Rqz&;M#7;+MW=0e!{JzF9dpB&+DfXH*x;t)^6mANfMhD(UXN9Eg3rQn z`2Yc>KVdB0wLAUF6K&Ms-d7x9CHx(6ksL(T`(sWDr}!+c2IUf`IbSE$@AreC^WT<; zG^Jlx;Wbf;MGPbr+1n?SGD>@hI6DMQe&0Cb*C|~~OSUe>c-ss^eRo+!4eYkW`b{Ai z4x);C1QiuZR-c(f26&n{n>S_d#Pmiw5DwX(UiIAs%G7fcNkMd^r+UjD7t~{rL(7_AkRS8Y zEB9(`I8zs?Swb%^J9L_>*MYhlm}$rQ&A8+S_8_qn%bkUkW3cBH)KW)Jh*UEme<$q( zJ70$&sm9eUKyt}pypDjC9WNANX(zpKGXbHIXkt%of6q3S&bg@Ck-Yx}HqGqwA1~Ug zzVHQvRHeT&ZFv!n{H||W?_2h(n{&rT%cm5q1U9=7=mz%^2#oiyEUd9@$MYi&G}t#% z@0@5?lY7?qEKDd)0yP{nb!)pxEjosnEehg|`6`+z>8EEKwiN_O#Sh-h;pD5oIUcMv zF4WVVy{u~Ha3H}BfVk)^;|845;9ic-<+r4UFUPjotwo)(;RVM6==sD0jL8cc_$yoF z#wF_g02#>_Cu?L2P*iTh$k!LZ(@c`}#6?bIOYKMg_8VD4mUA_lc_E|1o&(4tx%%)C zS0It+@Q-PvtXn9vkb+Kt#WxFh4|HiHg{=G(=QAEpL@y^MV1P*#lbVevV=WE5*D1!v3n)`LEv(^b8FAL#JE+hqbp1t7BWXK-a=8xQE~pB)A5G26uON4-UcILLj)i zYjAf7PH+hB?hy#~dL`NW?0fD#_q*?V?@xYYHQlpk*POFz)TmK4>21m4Z!U!yXNPE- zOp^W0Ku=UMZH89(Zz!S{wr`hv7z8P}{R?U38g?+2(u@FI0KZ7@z9^ zrV?OgfF(f<0M1zo;VQk-CQVON8RR1P=$+L)_1r7Z&`e41>;PkS|32i6aCkjg4z=rxGS-?rEkiBlX*qVVx%iB^S{qj<^*o>F8CCPoYFS$ zSFL*)`p4k09Dp0%`hAH`?|w^*pSe z%xC--G&%D|MLK{^0D{tgenI6ay)!|uU5#6)zwEd7$ZC7Gan%3&xF-1UpRPln0j@yW zW_y=YFIwUljfQHl=A{z76sK>z#!&T*pAkESwU(lf-jJEcj;+G(b{btPcy|pe`wW~2 zc|L^G@Fx?%$p19I;gS$4`f}mI_vnHAA+BnxI*tS8G!vb68w>>J+Uqwf-Xb_>+pqW} z0WYMg0xRH5fzZ$-6po?%~>Tx0|6IsT?3aOQ)rV6U2eq4S%L?>q$Vu-??B!IQDHlI{Q?KyZqHR&F#>EKcToYv0&e9{hmXMigNIL-d0-2G2+F`em{}$B~2j~hz$wU-O{F=vn%}0nGE|8#_?t}gF zS$=^y!}UV3A0`cIpp0MUt!$$XG>oyzG>?Kbi{VBAkQT^W{PoI%eMO_~l4a31E&`Sh zcdvFz*hlI-4}Za{cjc((yU@!31M&Z|tI7Ff88mLfr1`2PeYs%6CB#3ohz52wAu-&L zb#Ry(z)Gb2GTbN>=}-$733X)RQn>U}Vv)Xit7)*;^^03+3ioea*B67Z4EBC- zz%Rugh3$H^JBGgT*~EFk$bi{WVYQE;OUeE!C&%6Z|1&o+O}H#%;-G;nfW}cJO=-T)kDPfX6bpy=c<TFUDCeusf4-^W!yH9eT5^z10gsYWdRG3Nu`WSY2L?07Ui=~aF zAcee(Lwha<4eF_Xmaqlw7vTlmw|9D?y*tU&5wnaQJ+g)h7dwBq08l`k%qSl%Wlo9W zczgLuZE^@+)0C$v-k%ks@R=TorUgij_yIgq-Vv8z?_S!0Ay^qFu2$9}7KmDEfk~kQ z803b9V6z7s2v`Yk@f$U>UR>0MzJLHgloycrv15^29e%-b!PP<0_Ja-TFR2P14A0d|S8# zHm$!PiA|QDyo~)O%4Wudgy(h$Yo`s&XM;v^0v!az<4YyZ@(#VO4P&7T%PIMe%1)8W z((F>0agItZCzqGXN|7$uD0C>!*wkE(`10SkbQ(1?Mq({5MHz3#tli&gf?5}FAbRM5 zl)vUU#ajenYnx6i3xNMixdei5C2+0qyo^V5uazQrL2EmP1z|SPFDMRp7FN~ z+;plm7{RK!OGV4)Lx31iwqF5N`hMts*~(_tfGY0n3ee~6FDXaZ6dVQ7iQ^-%pp{R> zNq1x-kH4509FU;XWVbLNC2jBOnnkv9 z&oFJ2!T<@B#~s_gkJt=YjduA;2}jNwM~v350|kXTarRE$@J9V(`b~QuWmhS-?PJrk z($X|@)qhE&<{Fe47>pHwV3|t*d4udA{o?3o4m=G_Nb=n_b3`j64}l5>6JaXj`dpNY+rS$i9N1;RJ5WpSM0K>DJ| zRCl%Uto6pT-9u*XZn?#wl_hVG7@lInt!ixI#;fsFBBT3fYBg4m)m`6r{O`VTl=kfS zhq^EzC(RL!AYR=YQQ|f>mECPTt<+B_81k+%A%)Yk#$&|HXc7 z&|~dAI3w>^Nx+@uJ%SC4fX*v|>HIn;4j{W98I^B)rE@;7)!J!%Sy>x5i;MZ$a?lUR zX$gSGukT!fsmX|jJCUDs z{_I0m%e-d7^6>2Z1Hk?nq+>XMYp+#XN=MxHFYh@@k(j?|Hu1dD4`=&(nABNJZx6a} zvl18AUew-sH1Jwd--@t{0u@ysoCF-dTHVw2TBCO00_0Us7cg8 zgum>gaC*RhNy(a-4exrXQP_dnzao9z0Efu~*N*asdiR=`$ua(20KxhU7W)h>j2|#t z+8?S`y|9Txotn6^K3y#_iwe_kuf#Z!3y09IUsK;+O33(hIrNu9v_KY8BY|D2%LZ0E z7@|6&%gZd!M8Uz*PspI1`5`5)G#iYYsnbuzar2Di=^#GE$FNG>-y$T`uUTpw6mHsP zA~3^DPE71q>*JnyP|-MDTFRboZl<>RODi=%bL!2+AosYI=*^8FHC_@Fdi*YqdEs6`;q!PPZ(+V$piOY- z*T0cX*-0uuBk+oihlQqtyR*1&_;YHR>m{QY4v2n+l6W5qV1V!r)V;IpA#WZ9w9@(j zxg_g9IzkZjHdrN|lzu8CERuXMi2ekP5%^x%e;m_a?GAy4cNmLKLkgbi7MH!46O{5WE*Wm5Gi8Kb(^Rx#e!_`NBRHZn2_QVCQeYw4Us5vC~odBTx z^-2Kx&%ljdJlk%lb{|goDf`qEZcLk~=fQ5-ZuEH%fhqkVW~-I$&V5IMeIwD@YWx0O z4Upu?Ab9pCIe>3M^W$`6xsdLx-)nVw=xftMFl`f*N*-j3B!093fD5lXgBqy1a72wz0*z6ZZDP zwz9&G>32C%ilx>^|B&347;0SuW*RY}LZ!k;4tgIzC}X?34c~)A3Y*r-&B!d*(KpN9 z9Hi}h31g>d7j}U}YIO;RI5ft}H@(PthDm1(53(#`iQ0sYLx*e{{39IQzQ$U}6rR7e zp1zrgQH!qrOWUVeGhiq&TB>)^=7g#UQ!5d{YL2pNPOdeF_UL%g7MH$EU0F0h_=`b$j!03qM@J zB%g;x(Zmr|bkp3NLKSC9KqY8Yt_3JMQURgK7&Sj`s#gHZJ4NdnqPXjA z1L})0-efZtDU)5CBHRRveDlOU5$AzD6I`GwT2}89d2e??`k$^v(d7I?TdzZZ0=bd| zl?kRkLG1S?_xs0(#1iGC1gK>=vWbx*CwdE{i@NYc>G{dJSSxB@Ffciv!sE@mIpTyz z2A)S>W8EPV!G_C;AC!x>i4=LCd9JnHtfuL`*F{@frdg+Q0Hb9b$?_R0XQd!)bY0Vr zZ$Xc&av)_Mv96)q!}HEiYit?5awZCvw^NOdVK%^SSbm$qx^hQ6EpTn@8HNr2L4+EU z@Xa&_l-!SUE9~z&^80gTPoyKQ& zyw|Uel)e)652iJR8yVd4qJN<=EQsggwaLP*$a)@g9L>KL`%;H?`b|je=SW;bJ`U3m zaqB!9fdP`YJ;qjVgcPhb{fpkY<2toV-UYVR#Ilgl%qlmjR?}T|rKS4ssc6~paAn?V zn!!YK+E^B$M5t20fB77agkd+ljOO)25n)BaryZ+- zud$%I2o72Fdlrk9_)oSYF8D6rC7%w5v1oYLL|wIGg82%5uHzJ_f+Ovu*2irgoQMha zJwwGYh97*8-+lEs)!w7CE{M&>A$t(WmU|JlEi)r{#)-be+?tw`YTe zmw&2aycV2Ve7C{nTGQri&X|i3Qmn(UVrk^I`Fx4oFDAi@Opd8dlrTsDU-nAGGmz%U zgh_2|$Vo%w2**!QKN9&htp#n9huC$C7VS1Qt|>h>pgMqyW1d*Bt3nrVlK)4J0K2Rg z|2wlR89_+`k|0a)@*N5A?}I!xKxn#EJdcfrnu($g>Ps!9k+- zd?PJyw==g9LI)Er&p+}M4ODF|-vpq+f9b?Qngr3FRa{yoF4|OZGU{D6l*UaZo&Dta z1q}?Qpuis?p8#RjU!D|K>ly&4IE;Iy{n$zt4;^ z?5j#eYq)pt{$jsi7_&qk#@J|1B%9mGy;VMYKH6+D-f}}i!JGF#^Y4dZM+s5?FiHZf zE^h_G#hb2QQia~jtNDJqj(vq-WvggKprHsCxSCYN#n1q&q95l{akHD4Sm(Vt2^}}V z_6P%FoRlpGTqZGKr9#>m{zUkR0HIq$p+f`xm>a~@|vIlbPF#i#t!t7 z6Ift|es#2gTn;E_?}V@H2=$X63MS@JAe=sHZkc8F`1j>bw3I3@&+Hk6#LhD}leqVo zos)w1i)w(?7;5qAnz4m}ftgWm%JSVQzH{Py0xm2dM?U$KG zO7&86u>#X>g3RM|f*K0YbklNH@;eN9mrU>&uZHM|pyIM>EM+psOqHvu`U^l%f5|ux z5tIxqA^}kc6+sEo?~@xTr5`DrN3v7l4D0O+X zsK(>Pnl&eg#ayb$ItH*3-cJuPw!jXuO}I-6B20kZ+J>nIr~&`^R5;YkMPDj2o{VfY zwC{NnIv3TShW5Mn&~N7 zMG7%lS$TOe$w|4tTR?(T03t?AQfg{!Dys)a-j`j?QJi-yL)TE~qRr8_dhBIB3NPJ?CTu}LX)^XI(&}PvNKweI4hm!dX@jFV ze?gCokD~s$DjAhNK!302#-Yq8jZurwvPPReh^(Gu&5lhLa`Z)Z*K}_KE*!TYF&=kEQ(n&ehZ(FifS9hr8``>VHFY6?d{?+_Ez`__ zX&$JHuVIdKX3w0;=J7&`*-lnnkqr6m(#jaC|Wp6HR=2pZGsH0z?^XuDmBKsv?3up>= zDW#^)>7+w|fCvL(JR0*qe00b`h+PyedCc9dfD zU&Qu9o)t&6Fh|uhuUEQxqN#?vW}&?1pcy{Aqje~Wf88eRvk^asr9AG4=lts*s}*Cl znC}JX`FVaCstz%G&JdYJa{!CAk^iz@>92V1GAI=|AFaVm#z=Pg^Ndb-> z-cLSJraf3fK;!yf&CUQ(l;BZpYsT>*-FIJ%(hEHLQw}^zXpw&RGEfV72@s{yI@zR{ z|6%f<1hJpB0oi5SC>G=%X6&H7HvJ0=^^*Pd&tZ`-5jJ;;q}HS_vt^W84%IkN*adi(d!*~J)S^0azBp@Tg zB2Gg_MyzWXj#eRrVD{o>D@;cC+K~ z9o$xaS^d9k+Hx*Wdyk>df$aBR-*zZHO5IFV_Qs>7ZguiV(rD?^iWx7%zcO<6!>V74L=TfSA(WWs3M zvcE1Knt(3-z}FCVuxvzgbMn&#kjA;e`=k*OA~>55q0!+$&wd?q0vh$Kyxxd+i}MZ3 zMgL^Z7GZV<#$A2EJ5d)SHGDA}67D$Ud!4M|Fnvm9@ zw9rMPcV4Y^VO0_Oz0YteDBclPymOh{n?tG(ix?Ze&U3%&hDR>WjeVCp(}%q>6+224 z6R7f9l)q}Cy)P|Isr9PjriM3yE3iJBuFR2Dh%wf;_hopqcUiLJ&9(@qnB^=H(mfY= zBGKYt3-%I1-1vu#L23y_jlJaOAeeg^M!2wVUf~%Za3L}VPHA^|$*oCh{El6cL=(|# z$5mG1|CBN4B1aoG{~8&gD`Y&&iycBPy_J)!RztP0LG=}wW0#mQsa`?sU`fStaB!tF zg`SmVTq*5r1&)?BL#|qCKtN>jmlDK$HdC|BwOn0<%3xB)z6z$8P=}523MNv7&95}F z=*wd%XQMnn#@&9txIdo}C?}}T8_uab3tS0#x+xq9q9$Uv!W62A{3vKGXyKQ#a`2Mt zjj0i16^Le?6=qrZv$Mm9&D=y^vFlO_uF`^v{dA??|$$(nU8wc`|wZFcz@mPqN z9ehKGw=|FCV7fK-BzmBBIC#uyQIGrVn$PivaP1?eZ`P&W9zSl6Jbiw=!u5|Uf$DzW z?87yxj(q(L+?LmSXaR@-pjR}v{*kiMH1=Qh*3H~xvE4%BNMC^V#G*q#VPS`U_7jAMyd7ee z%$9SOB&|q7iwj+NqLh0C#l;N)tRfF2dF~)hhDq778)Q1Vsd+VnUS*J+DusE(C4Hn} zwz5^*{cLJFg}hqcV?7E7dgUVy0%8gvU4NwLU0OpHlp!juUuIWBR<*zFdt4J&d)-WP zdnpZ++;#*agPH=7W;P(DQJ$qWnx=u!XS))s0y1e=Fdb}AAQ5qR;zRfpQ^3OCf`Weq z0smbySXMI?YvUNUIF-Scy08=XEYbKbPEnW(rm0rB{V-bn^co2SxD!6rEza+ zf{};K>=R;Rku77@mOC0~8--@C4(b0`i0|(V1H=6ZqNw3WOK-AEwHIHQPxl-LoAM|S z`_S~c1K_)17m-U-?`+eU9|h!pnAwJ;^@S{9yv(wt>I^kob`Qhr~zfBA8nX zj?o67t1Qt>k=5jcnO-3!T9$)Ic44A{bj3d^E(gDnv|aG#ADOB(Y0!=>cxKyO2`5?q zf_-*lo-A*|1Om1M76!Hd4rY6yIQ-Rbc03nXwVJiVZ_^!O3(Nw^zy66C?M;k;>HsEE zZPGhjVLsv77R8!F_xa{W4)@w?r~ojn6LFV)=pJBxOP_uwn~I?Ps~-V<3#6@RIKZ9w z>ktdOun&o9K;a>qo@a(j2{*Sx{#f45`O8rnutUy2gY|t*{LW=HMLJRo&Dk6|+6PIRgj!{%wAP{)2**k=nTpobvAL z&iAXm9Com{WWUVsh!NEU;JX06?LVKExV^@^gaGyM&A@HzvPQl`+OaP0KRs>x?pYC_ zm;ke=_}IrhR|M$a{Jl~ggee09({bu-aUvpP zzaayP84%^GZ?TF^f?7=Yg+vy(A(vh#J2%Wb=s*0N_gi3!d&=d;Xyy8ie3j&U92-uz zzu7q2DC}x-Mh%f4AKbmE5(L^D2fgxFw60|hWu%YOJ2%78Gv)++_LrAD2K(6quS*2l z`klSe0b}3i@+L{7>}}j|8^)wON50SDT`n1HK(#pohXR?KKij}yhpM8d2v*aqlO7W% zo7KI`kMBX)TTyymqoB2!CqwH{K;M)9k`tQnh;85S+AB&g(?=m0+0RA~B|CxSgy00x zI8LDgff<7sl*qs9eQ_Tvdrc5zEg3G<-*08PptLU@)md|uhSY#Sq1zb8|9#I!Sm@jG z=IAP+U(;y%S$djiJ8kacWgnJL9%v{&d{4=HG+uw8`>cJh&BNPlPWl-fh`XH-Z6C%j z1SpQSc52yb@)vbwt+Kh_EdhXg)PO`l zb>qQ9h#<X~uyt>|W&b;;PV3cJ)(xft zRY&+Dpcceaf`TIcgLvp9%iV2uTCTiP3(go6?fl#bFPyE`3q z-0~QM>jzG^5WA_gy#obP!K6T)sx%F)*bn+Dqg@~BZw!m%-W+62)2gmIwp>+;*`oQ; zjSa~_m9kIKOU#Xo8e2R}e=XX`n9g7geKXHNMSopZwyV#~0)h(O%r$}g6gnrBAclpJkbC5( z-)-BhY`%Lf0*88wz2-Eq=Zf!Y`*>~sOvL{C%M-0XkZk_uWgk>K3fwBkvj&-@@d%50 zp9}fPpDx~F=Ofg`vD+pqfGS)-A7*xqUr(7>skGgSmxA}kHaycjvU1COO?UhbB!9n8 z#fI$|-lo!-SI)aL6Y6^+{q^SY@v8E*YFu|0;kwfz*O}vJW@-v-yVL;&@`PI`MF}Jf zxmokc-FKIkYdTC5KG1=k^KEU=UxHVSi%nIIEl$%=h*3tY`>gCNHOph}p=?p#A!B|c9a2%j+@lDv+{XNZR6oq;@~Sh zx=X?;%3WccKjDq-ZC^w4_kzQvXVFd*C3o#Fu=gy>oG?{o;d-&p| zUufL09g;OJP6axA&)h-92&Ew#qg84?#aw)(yUOhwl6>s!yz~r#bgh%C8=sC8mm@yS ztl?L9OHj1*p0!#G>&;!Ec_K4@q^3%!$;jIQJ}0NCw724h<5W&+#TW$P{RD#2bZxK= zHqUhjIzJY5wHP;#7(MJ%ReVr20Rbc;8#l9v?$FykejV>R0n3O-bJOAooi|g=$Jf4| zSDR&T?{Km__;jLpX-c^Fy0HO$iX;l9Pg@}ikB2hfea&pVs(CxA&Qs3C<4Bkj`b{N< zo?CLvPc*0IV8KK^`ZCHcJUXPV+F%s-08nUlt+qOM7KU7A`I6JO%}BU}jKXhiIieCs ztoUDXa&aEQcow;BS8n#b+xz>4!R?W%dgCsLNP#g&_q# zj2G~Eg<6_RnfIK7MYOSwk_|qdd@~ihW1Hdacy@akWkYBNg(Qt=JW1Lx3fyi9ul0^| z=W)qREJvB8=XnHT)W%cN4*Ic?asvYm6>P&k`wpYa1T6V_GbuTyLE2q^LKs%Ch3bgX z&dmbs&Rk8$&TR#^^_ z&C4|fX5pVfY@Fa5^>cKu@~LB{Mc;VT1>xbAc$p5CiF!aeVp^VIP-aM;ad(P|R*GT# z^X!y#g~ZO(#E^{C1Op4OHSJDKjlgfdW(<3msQ1=UiadFE1YY^ZR0ni8k8ODb&VZb5 zm9CPuA}>dF2@_Gx#45&yiCW5K-gc*{x<@U70*l~FPta(9tMVK4{?pk`l>D!=-M;q! z|Fd25*V&E=ob8W`Q#TuW{y(d-?wPqj`a-hCo54*q5zJKIX?Ck&#wDKh`PH~xaD%M%@t$@MV9*vZ_7&2~G+ymH#5aM$igOVBg zU!Zy+Wsc**^?F-JfxZWPbpX6qdoZ?u3dv6kXgI6fB}uvf+Vxs(4Wr&TEf`Y449OLn zcpxjSO;f987KnOfrfVi<2O{EtHu|4Hpk)3Gr?X6}lyI;=F4}xW=9=#Q)cG8G4z&PU z@c`fGmH1B1Q$le(N87mcuU|vZj8FNCQ)hB>?{bZ@Q#(B5T-~bDo~K{hU7{&sZ(iFJ zI-rzN3s4~zlNuE%N{zQXcbW_lUUOO7MY{y(EYtRl8nXHb5vQh=hIOC!2lD5+>kFln!42_m!L&IlOE9rhG-Nhuwpa^hBCg6W_`gp6 z*hL`Dfxp1qWM^fEvr7Kt@0?C^#q^A z57v?@f}#-~O7km=%^%y*;-6CWQZfyDu)GVMArb1dhR%`?eMe2=`L_2%E!{5JB|PDraQ}g8K$KQthn@jyGXDk-yg;^(;4-1gVexTvH`SK2T1MuIBU}qm zif+~j=lss@(`PON#*Z<+Zs{mc2e=7{JCx$iq^c=mh0R(kXI!p$-=ttssQq9VGTpmG z_{jat7mC~^BooizmAOVUSD{^2v=c3ba8e0{X$$+Ih?T)T6b4@ebHhZZ>_>A;P(}l6 zlPyUk2kpO9Br;6)k{M%Dcf28IMK;ay${k_yz$(+U3%iFzU=)pFcD>KU#45+!2<|<= zbgQt0_F-4R_Lx?@nA1!akVMO7@5EX~%nPD>0aLSs_!NLsK6~X?8zS*$2?Jgskl@x7 z@-mW?oZL1&_N8IkS*YbnaiX0zV;?zNCWzJm@aS)anjXs7~py=1q&lf{iK?T%jn0l-{La(7g z7iL`OKwJk4;57NwYE~lXw`M*a1_MK$*VE0@Y|@)oztbh0w+La?AP|tNT;G=h0`XvF zS$ixNbk*Q^5nm9_8-n2i73pbghhf?ZiKjD69O0!z8Q*N?O6T~UEgEBii9~!3Xel!}Ah&5lv&_;FXha#++88Q;N<}~2s_xOpF zc)hXGf~7+yeP^Q$ADlo}mJ&2hM=>chhym5o6F9axaj=6gH<^t^SXox0Mw?!S9rcOY z-_u!76IvWG4grly{hEkM<_O`eHhV(~{p$-C41ZF17=zI+zZj(p449{6RQ2ka9ItCM;I=30^Ut5X(+Y*)27T$B0~o@LMHT z*GU}r`j)d7ue~F?flXLQ?8vcNoe>B7vkmA%RdnU4N1yt0fz6*LNjg<88>u{Lpv)aB z>q0D@DaxFoRECHe11A?}uSXExCSf(5tSoDq8w!$NVc>HEEW#8JFI59=kyMfZE}afd!ca~{+%B&7#F?HR zh+c=E3z*&NxbWfVD4g|AOlPXADqL7Tf0~15?AY(#P%Lt~&bhky7}w>#pxtH_)%XQ@ z>5B)@D)nv5nO&zc^=!iHg^ZHVdS15ei&l@An%dJ#INbqtD884 zruiBMFy5~a$w{`qWGFeWs^v_eL9^t@3|ojmqAiVqU&u=YidP+=UMChpmfz$y!*{t4 zxdA}G!_67YC)o%ws%oJ4tkLmmb^Paw3R>y@Ab zI5t*{KU2T`Q;yE%K zcXh7>ya)Cs19gA&Qb#gtEk&LfeQ9MC;c#B-zNbkb$EoW4dY5eeoA#h!WME;CpOzJ` zs-ziHnl!qOZR=FO=RQlhI2vH7dZf-H&!>CF(HuP~n}0mLE$5pR{NhH)e@?D#zD52A zqe|9Y0L$8`@g`5sG?U8d{f1LGzptlThpk{2OY#Q5lD;4);ejm??H8R3T|;f|8VsHk$+rY30V^Z!NFk&PxY;5o>#2rXa}KH$z3_(O7b5es3gys7QbcdiT}sV}ACURN4R^fo0lc^i~#Tot&`3JSLkr+Wy$O!?7y zioNGd97q^Al8u~%|5{Lz{W;Y85Rc*B|9ic!0?^RrScK$d-iPuJ6sERstOAARmOaOT zZeDsrRr+l|Eq6j|9=jY{?#X&ST4;I8z^$HIVt}FvXAXN#OE!9*1-yJ&qjQaqOZ(j- z*g129@mmBT=&P3>24{}=ieZv)buL99;W;m8QJhpmVoSilg$BtVHz2~zYQ`I9*T=OK z6NX+;TEsoR37@WTLuD|gG)DB}Qs1l4_l8>|2wuKl*oD)C&VwbT#4wCK^uN3&@~G7{ zTEaC&3U2MNc(wc@bd%LrE07>311p>12hAsT zf#^SsK3*JQonH=QU^h&r33hfQJkjMH461yl66k9$n_a);TV6Q)fZJ*kpsO)5Fc8gJ zeUWGNu^QJHKC5a{WwuWe=7tTvd2#5qooi|L8scR;l;jbMl+{CXOw_W4897(#?7FF8 zz@55ba%?Y!tJ2r`qs7l=-#3^QIRuZeN_;gtJ=YqEkZiY5jug%5Cc=YNNMDY#=1kQV zOFG}as}f}~)v!K3D?1m_P|jO@msfrC(&i}Iu%U`AYGZzN@)6T+u!lGYh0d~Yun(7wfRJF zhgw9Kp!hjA7W!Z0M>nT3HViox7BNSm!N`Ajw)|n|8-;hM+?wM!whGTSVp9ItB4UrX zj00bQdtuuL{NsoyL4nH`biMV>V+E*e}d&UT2c?s!vv6M50*8PRIarbTS~I^9-)inA$2=v786KV=GSv+0+> zVu@&x8tX>_PwM#*g}Y6G@7qd}?T&+4Bg>vOG?lY_QJXN|Vcu;m?j&qPkkAkfn2!x` z(zC&Aen}8X-xss z97ftMJkXx@?7Q(O!t>Qq4Z&yMHrR#cNZ&mVa3efh#qv3y$5a)&TN`zcR1P(3%QA)2 zPbh!hzKE1rjZZ;&>S6o2>pKeP8z{S;l|h)iMj|vd0w;^^dl}?+ncH1+D5&`DumsG8 znfks>9DxsF@`vDu_pSNF>oYg6y43fMz`$LQDNm0Mz;dMDK(|~U^N9^cfuC@JpAtXf zLu2j&KZP(wXHUjz86>divjm8ljAO8CeZG-TuCj!Q3S$qrejF~??`)41@NrkXiXs7S zctdr1^KC85@GdB#c46+~)5a|==n-s41C6%_<-Y>R!KG2(X;}1{;FiSC)Qz^OzyfVe zuH6M5-O=Rn=H2zhNl1M6#?Ukx0B;b-{7KmvIMee_0-;A8W1iS$aW(Io8BjuZ6T+as zS?JyT!i|;2_$BC|_sKC(xpV>$S<1f(Z#`yE2PbH(dm8@H288s|E*&|cZf8lFmjJv~IKWdTCjzlz%?rbi4u>rkt% zeQ)kkG6}6@SQ;<}TGX<7(X2k;V;&RKvc6RFnLf$Znl`6T&DBS=P2hq6kzYqKLp& zJ1j2=B{lJxr*uTUm*XrQe`({(v0jM1tUeNrzPT1`eI7T(WDJ>bX_u&xdZ)R;Scgb! z*0tr}K0LRq-e{XfAOGtIbvQQdx!k2pE!k8wPH}O{XPHF(xgZc!v@xwsM3OKt!J|uE ztvQJ>66!kNQTh(xy&QSHOfIHY z(VJIgdv?wuHT`Z(!xE_@{hBED`%iX%A}{U*)DaV&)Sr5n3k{NK=CuJ zQ7{p?)(?-O}*Rdny(yViWhSu0u_*@4|mN%otGC_D(t^&SWS}ak0Dr-)<3G%sc z*QZ`nUXFpYZaF;p^r_UY#;*R*5n2ap{#`9jl3oi}Q!>;V(MZO8F<%n8te<2eG|uPH zKw<=LD9cLMr;n#ETT&e8Pg@*jgpe73E)C(`?=V6C_e_OF!&};~n}@3=JqZPFH+MFR8TRDW`> z!bwtW0O2W$bUIy^t4xLd^N$mf1?e-SPb?UP^WuV77PmX?f4tL+iE=Ax*%rZ+?Uea3 zE$@aFddvF}&5amd91amJ7JnNXQ@)QGhaVo-Aq+3>(UHdgb*^7;{T-uMR`(m0i(rvm z^_~r((G3BGs@W;2)09nZXza_*b9t7~XI* zh;EiVRc2DXj{g}G7nH*&a)RDjxNRhhp#h~A8`Mcc%$PKCr~|K)FnN6b*4-uSiwSe$ zw29;yY;C< z!s3b4*snPMo?JV4Q3?_vIFLyXW9#v%q0=-Ti|3is6Y>M68Z<6N1#*_yIa?d%qy9Yo z$-nrX-I+2f^COIjgxb@v2E_ zmPGL@?%t!`u~%N};AnK#6-~{Xaul~>ZA)!$e7zGT9KU|_SjS__WQn&JWEqZ*`Vwu* zvn~pq^n;QP_y}zMdn5+!ohSTKXn<4mHorz|*3vzC`+Xp)gGb zUd$tIz>uNfQO}u_&_aW4HbU>_GS2=|^(Kr$7z$a$SM>bALh;>6THmwT@w*g7W!lX0 z^Glk3ie%{|LY*I)!!Ru?N;f-0ADj;^1fR$YW06r8W20LRyZ2=^*GeqF@ZtqBRUwk~67lLi}Eu z{op&CI&^v@!a)D}>8=-FNaPZRv*E(Cl_x)csIOq4oQd}?UGNxXMZL}^<5|>!4L;VH zLfC6UzvIs1J_*OqyV52 zsE2u}w%zwlX+N%1IMy&jK`t;?-p!-??*c5GiiSW#r2~q%<{m^(s<2_h-!vIR&2eF2>`U@auk^zIf*Zgcrx^QnD-Kwf=XPcE`fG?-5|-TsS`I@9IjW z>g=~oyJQuj9lR_8DeS#5-{ZpIet`P1X?M)hdU$er+*b$CJYsu94{M}xJzwd+Ttm_M ztbgl9Vz?%mIW|82eyU64mi}b52LE9hOo&3N00bVWtG9gae#*rzHGvvldr5$zOci|z zj>6U(0qp~K)FjviC(hpUH@$}0b(<)M0g>Hr-bKUDhBhOJqbVdFxFls+M{hqgdpIr^ zQ+V(O_swDQyXbIQ*3VPAys&Jf9(5`7l6B0day=t4nlzd;`$K!akoO$T=oK>Xw zt6&$e#bjqfM1TR6!Oag6jEpxAe6PB`=O5KI*74mdYqbKbo_~)&oaobL_Y8(fb zzpyE#C(kMg*~QG)wKZtIC-AX*)lqtbE?xO065Otli?d!ut(T!XD_i)M4(2>VJoeK8 z{M%G2J-x3pjfYi^?+Xpf^S(X2nu(TO2z;BDV<7e7#FpV?7jEPyXJW;Z5b-7aIZk}y z$96Ku^$LckOB!~gHO)~wg$(iyEDWa2{7y5)i_$6P{uS7X#3!nG`zgK|!g(d|i%$pY zm#-57-cKv(<{h}VN(g(6D>}9Ds2=G0)<0xx8UyXPJ+9;B)Ge~yIUZ*6M_YY;1=B7AwYny$l7b~b-%XH zx%UUuXtTx~^Bwl|-e25nQ_#iO36nHu(zgNa`?A%pKWM!d2X-cQ3(bHJhi2NjDJ+ilW=FZm2h|V@koC>;>uuKt~w@OnYIe*k2AMMNu_pPL- z+i$N+@rH&q3~W54I{Bo{8hR>lRF?KYh-tmsVBW1fc3c+JMwna{qWvX_ug?Q(Yf^*x z_Um>1{`weB=1M{ipBwEtN1u5UBhQvND^BLhG7~)vPb4XI3$23I+%@55w)W1(UPNofw+r{oPLH_s z5_&ENcY^PVk5wm&bDe+^SH!46@`Nyr`(7{ zp`evV7U2`LXR)KA$sblt>q+v86`6_k95!-5*;=42AIPM`JCJPMI-nJ{oF>||y66Xd zkJbZy#|LrC9%szn(GFs5;W=*aG48$`5;)ZKyZh3}$QzFpofLS^Xk8sXq(^L%F%)Cg zJL_tuMzn&=jdth>Gj&cNA=u0j(pk+vJT(KbS4cY`us?kG8-mJ3k8z2J99SmhwxB zQ%zo=-PP)B`+Bq3A*&+~9xK)v*L z{hiN8JUYb>7-ed|C=u9+=HXbKLgWtlpP^(5bldR0w0DC}l?o{aWe#SZ!VT2n_h>6z zoH>tkvmD_zh|P^tliyv~&ZFx$9iQNNur_>Utdj)Es}4yvnw8tj9_RqFgRU~YthmE_ z%)j$|K!XzQ3PuqtRQm+Hho`uSMaVN%h$|w3M|!-s3{mn5D7uU{j$7_VSpH^x%*oz+|rb90ym<2M(KuztHA8zfQ~ z-+TO!FQX~d(z&aRfqEC}aaqjgCZe%lAYu(HRWux=n#~}(-UdH3^EYAZ zypV7{qBPq9QIL(fG#_}k@oA=&D)pE1m$kxfNdp(p#O@O}q?Lg;eea?q6ZOoOVkO^Y z#e~FeY4?21aTgOsaq2(>E*5X#MzdWcSJI3}epCKL8!U&$%|IzdF7HaW!AXGnjaC$@ zya_4){p1(q>S2a&OYQ^$cQCF=PWIy`;Rd!8^^-F!_k#Qq4l4z+`Mye$hQ~uu9qmpE zsGpLVInICAJLcFD8MSm+HCmv*I4(vQ@WeEG-I~L>0n;>tM zjbAwsAV2yC$hFx15V9FqBk&RA7~q2IT4rfbAv4k*rvH+qvZPHymhpjx_Ima^Lg8RW zGCfs%TD+VH7M3$bg5QHv^BoQ6p~gG7bjL7$*T@&p)afp1vf8KcNzzUy%Z-npVK0}P zrGw=N(`7Rb4P&~h9`h_vl;?C$t}49BZrQ1XIIyEb*0$3&38Z46pZ2aRf!q7rBB^a5 zkEuuYC(WUXOhin*G``d`if8m$zr*iXHub%y?S79eKYE&9zHguWfSZ14e#C2kJbef; zj`89#x7wb)E2hBL66^Mb8?}2st6E%9@*_IzxUSx>(&eNCxerrBh?8A9x;~NXWA!h< zg(7FZb%@B8E7;-!2+IK3ppd_;sCNU=8Vd@~WxD-Debwad&v5J34nRkKQz z_N;BBICdIlxhP-IJ&_pV9*jlH{Oel(PeS7dJO?qHwpeLpudhAr+X~bKOiCiJg!Gal zHK}z(9hf@R9ubK27A3ga7BRyI;AlWrfQ39}|LP~OrZ#NWnkfFA`GJvH@zIF=wd8@X zaYpN>Kk(=%FOoU7|RVAvnZ|C8>s&Pj{4xb~U*N_u;1Zh80{ z!0-}M@+m~*?JJ+i2$*~sJ_c^C18bO}6HB1?>t|rFdF#(bb08AkRHf?AB$Qzi&qYz{ z#gy)lkRNCCqjFK{XYm>m6^Y8`As3@J!P?tve_yQ6nwQ8(GhI@pc>Ll*DIAjgAU zpymJZV2>>A>2&GX4gwB}3tPUDEOyF8Q|)6 zu$(M+Qd6iGXaUjbKdm(zHOIaRhvAbF>KEiCbKV;k9d6_MI~!`z2B0|ZS~@vG_-m}1 ztr=)2Ft!|a3{5g0M7bx%e&@2=jqd!01PIPj28Xi*zIN6>M?K8kI?sK1#}i+wg)iRI zwzBo=@%z_N5A_3eYy%S-c;y=@+SmA_O?3V;RU2hMyaR_sfbV1eZd&T+Oey6O{YvY zFWU52UFV(V;N@9t9nx|vcQc3hr|COh6#8ulFsht6SR3mt(iyhPQvT310i8n1>tedd z@zzuAZQ@3|qm$s)u1X1a6aZ-urRWF>?1cf81vLEMaHrx*j>*~LW`5)w5j}0xOT8r) zXyaFexN&&d^@+slRJWTINFuUo?=~~zOZQApzX3T2W;5E0K1td3dVacpWgWd4I=x=; z$)~A~Q3S41KGul^i!0bqx^rWz9mh6+ZW*++GvFLpq4`G_x&X5P1I}5K@>m&EtC}k3 zeWbX|nlJ7d=j}tSl|h00?SvYB3j6~L{Uf#RzdvQ`o;OO*)}Mrze?Z)w$SeagyS7We zvqH7Gv9UKgpX{Sv|55nx3e{E5jlE8ifV!}4rNHLQqfl)JzUD53p9=WitLRqF9g=r? zo1C(J2sVA2gUO7;Z1H#6N@lVqr@mnw_m`1ftX1#N02m3Rx-(!aBDfR&B|Er%nwAXe zx8GjL=ycqStTJ#!I7Yi#hC> zuWetMX&_2)5R3NvTi21aAD9r{>JncJoh`C{yM!lj#R0a8fz*#7|5?a}`ZD{iH1eUJ z=+wxjIO+B|zUCIj8yW$i5GcTRo&8AGR$e--=JG8mxNoWF9QRH&CGx*_0p=ue;truA z6~Qm!H4W@5>{nQ-zlkej24j0$2Sb-v=<3;QGQkxcxMlgY|4tQE?BmztcePZyKu~{w z1ag%J(nXl&Wg=x>bCDw1_Hca~kP?FZkOT?uXz53^NcDg@i{1esdL8@v^oUGbh4p}{~-vEzP+WOOId?NA<=-1qI zpfaHPPv^vyfjl)CC+eKy?UIj4{PM^Q!BI@@obernph+VlM)syaDy&RLjZ@bHFCL-brI)HgiuSZJYT%^m5{n2KCR7Y#b%uC7Y%2_wH6h!Rg(B(F{2NX*E>WDdhMoA4TV^@6iK$ zx;bq0w3*O{-ig#6u1MB@<*ecYO1Qd;kOd{MqDO)nE>%X@TPvs(&5?{I#uTNY>o^ga zrLO>hdtc09YcLYm&g8A)(Gxmm6UFHcAn}EI-U3FwMln6Mh1Oc4Zozyn8=F#wiONhB z(>H+ts5!wdgF~N~!9DRhN&f4F6>Pk#zbQ+N?5K;napC{u)PIOpQV#-(L7?=aCV(f& zc`)d7q#;n!&>i)@sD-?iTwU@{I;3zVaV@!MVx@<(;2Dt_pyv=VYY#Hu)jZ?h*H^=! zhs&jd;wczObk?pi%b1b1I?3S4_*Fd+-nuQ~Xhe^OBa(kxLcW!W!t%Ao>%=UHNuX*S zSppX1TARC%bQn@>ZTCho0thgm95)~W#K4We8hN~ym6`$|=*%D9a8}Z=FIoOZ!?v7e zq)DABN_B zy|@RSs(F?Lfb9n^`?75E3hpYihGU&iRog!myQo<1&Pq2kH2?Icr5&P{k(ZlfU>F(& za!ZM;ZC^e7lP@lv4dSSw>hXvuyH0P7aV`n<`WxNy}?_WBy53MXF zI!S(L-3U3$jJ`z5zp+%_{j0RwTbh82`qi8tV-h(<2Rfpq<5p*|ICM^pas0GnD-5;l zA#V61SWFfiQ!CT=id#}_Vrju~a1<&_L*R+6t;3SS{4jNNi>VaAFmQ+>KZec^n$8b8`~s=ckNi;aaz_S1&wlE>g#J=MSa>b&iewmZa~ zrHY&+_#+*Lk_&^2&!3o_vC<$+z1`DP<$BmB>9OzWdY$wu&DJ%K0@=i<)wM9b)dFC+ zE>P$Q9lQ0ruLwTJtf@_A;Lgs&!66?Kgj6vQ1DH6QJND%;@plfSQ-iHx8ujan={_e7uO)Gn9vpH0Ia6EegROppio zO}&EUe?~qQ5OgJ#?s|JW8<=@;;fT}jB-l0}6P`#5dEN*)<-`*?2 zGKVJeK`??+4Fnjl4NURPrD43b7X3ymvmEskeIO1&@VFjqbjI(4y4qGItRsE{Cq;f; zBzi%L)Gn}K+C_XN1%Lg!`|AtqJ)=qKoQsL~XaM3)sN@Y`R5-Y#@-}8({IdIw9K0l# z?w&c)AQ}ab)P#ixtM5-<_c>I&>YsX56-q`s#=da9XNEW!Vr}IW*7=y@LO77?Zbehnn;J5+Ve{_%;IBr^RHa(TmKF5Oe(4_M~ifgO% zj~mx+3351i^8#M_Ef0Wquz@g%Qg$*aXD1`DKJ4zYT2(c-3qMaLr@9tHUUyX|yvW^P z#U*&o`g>LxbYZ%9G3q{i-=nw;gL4mG&Ql&zA%|k11_1OaBSaoT`hy29kO$EJSKsRc zL3OM7C+4CdWYQ9K2J*Mjj!mvp-G3%#TN5k!<>_w^0kXI}WxP`Lky1gie1X}C67*V4X9p6TR*CPI$ zfYP)B=?`9$0oeh=fBG%%5@d9W7@i#DUX6QXaS>U^zsXfna9$4sEP?=i4YgZ}JnWQY zHP~F9EU4D=yA{`)o5lZe02|Q{etOS-j|g|L$>>ly#)}nPs~e1_vtzMFQW1Fl0^ml_ zN?gHFhg4;WRJoD?HAJXjsQTF;*F=@D%Nc?rDk4Obt=!GtaxBW_jc;fD-c%!R9STjK z0Rl0pKbOM%XMz}_pOQ8EVDvIJHTy{;t97FB$CGv<<4ReM>pWTkF#{_VdsiM#*?z=< za}#Vc)=;hPsCi2q8vdfM)DlDmHD@iL>|24oLc+|?`3PiljBTV8o~#w?K|&ve>{8in8)aNl#Y1$PP#jq4_)LN zGIJ*dA4l3S-g}TWFCb6Me-)3P!blxp z#t*Ek2RZ?w|9TO=Aoev?A;$bpKlkC*&dx9|cjnA5xABRi+`9W&olyu#k=MUP6Jz0b z!Z})c2L4sx|0CE1SysSH!0jl$XE8hLnHnAJSB1y=SldzTN-X zBa?6eDy>!aDuQ+TN<|gKazz>Hl=Jg5*tZ=LAZ13_z6k^`xsFs%lvd880vo{zi|jsE zk}<7W0EsGChXY_BcpS(o=AzN7WWG@?Y7suHA4NimPpelhX&pG61$xcFw;Vu(o`KIh zcuCyE9D0%GhV(Tt$yvZwMiH!)Dqy#q%jv02SvJgLkQ`ep7iVORtsw+Jqz>6_3pySR z-1q;mugEJoEyMBqITS=>@yS?ujgbXq4HjlZ7^ak%4-UiB?%^gh|DrsX=XUbYy5$R$Yp2OqOwIbV8MyQA&PX zZbXhj<;T>XiiVW5JfyU!djEhZP9jyU1`r@JMV)31o(HviKE^wXvW;wiq&EfN-9o7z zL3{^S3F~$533kKcw1A9^0HZ(tp;i$RUL9Xbb3I#XC%>EeM`gOFE4;Jw8DhzP1K|FJ z5_twp{?86OZ0=*A{F_9s7W3Tnq26JEN=}lglifeH@!LLP#s)Ck=ud5=sqqj0KWZae zE%e?N{Nd{aod~e`*Fh)me|yjW`j!kGEE!Gg-Q3Mh?EwFMd5rx(o`-uHPC`ODonQl6AB*Xf6hw(r#<=q zG!ja=;^+G-YEzYJF4E(PKjv7~9I?bFUVtFBciL%CF~ER_Muh!p4 zsSt3)Y<=y&cm@UvEAFCQuRj700JMzd^it3=)Z5#8#iC)Go1+yoztF82O@n8$Hr4X* zaMKD#JJ3M~9Z91NV*#U%a)4j%>~bgYe&8MZa!+G`bs)Q{_kYGikc z2%QDa)yet(Q7C#8Om#Sv+bE}KROP{;30YVS;-S~(Z6a8%WWG(g)1+Gp!36EnzCH=9 z8k!#s9pm_CnP{fkRj+887GY*-k0-$<6|__E&q%K?NgYOszlMiMqvlA<%U2InsaOWNEVL^a zQ?$DUV|!Vgomh+w`2(-E=e;MohKZ`)dq167u5TZ$&K-xqz?e}|B2d6cz(};cngep* z-}je;Lq}t)I=(!Q#%WTm;FhR({uHrj70sYdFfs=9|IAh82=(cBx#uceh%GvxVCb}V zT@9h*;CMH~z%)#sPB2Zx;>+ebu93@^JoG)nb|c??*`3Me z$*8`Ogj)PoQSYo+{~Z}PJbTlbCGnaC=VA9y@f?oZ!8-5+am|@19aZ661C;%T*{=-q z%in-}r@#e!za>7pN5^5F?(z2`0d5`$@i%~A$^K)Ji>zfJ@qn3TjK|y< zotq*vBtW1B#(L`)bl@VlTUMi%cC3!%8x0WDFm-sGO{fFLSirHaXNTu0HUSxgV*#8I z*)d!=HQspf#3^~bb4t4A7s4l0J+sz>dH9s@n!E@w%^A7_7ql{K~AkE5jF! zRcgG6Ywi{Gn~$^aXJ;S#3%j15f+xh9YZFFhO%%sbwvAdlo0%V0UG&CKtZ7ykva3HW zwf$UuBtf-fn@+bu-5;AAzlm>Q#HuUn|7@G8(y$|0r^O&%Z*kXeHGvf7(YF6$i5=VA zAIR@h^cFZrnpf8!T~4O1m^Eb1%G9V6j6Y&vtcJFdTkIH`uwSbFiPCskYX0^X4={I@RQPGi+_WJ)c*))XX|$m6EGTAZsSaEN z&4Y9#meobILgdfj(xyZtzi^UMlM%|QAnvm@MAe@L5wv?vpMQ6mR#gdi`n@N5GN@1ddSzsxrGoO&w1@~t|J0mXzN;6;s|lz!o$Bdw6SJ_b)?!MB_&;V$`@c7HmMlk=1QK_}eXcvdYM zhPMec>6|WY33Fl63ZR1%Rebe?C&PXbWBjd;;~7-IP--viTiKRW;Zrse!+Wo4YR)+dg2XY_UhSZ^uBVPAi%$+q9uJ?GGjL za;|=(!*^@R_iar#q57Q5(s8xDV%_|`TB&%#l4aJ7=~9)PLZ--DMyrdjj{Crv-AzWq zsa{E`ZbYnsQ+cfWjn=RASi^6RLB~Y{oj2x8ItN}MEg~*t*hvH-dDv^G6blfm1sIqI zQ*898Ug=BJQc|Ky?r_g}&Ajv)Q;_npDdll5Dyj2c97|MZal6yhsWs@x-O!T`7a23+ zB}v11C^PsxvY4aqiGSd6^UoVvSV5r&i3P3)MeZg9R+CKTWMlkTax4tgU5uRvdK}l5 zcpJ?no|6(w?DsVw4Z<-)d_qK!?Ht7YhE)Bd1m*E)XF*YIqiBi{S9fpI$LQakXe41uw6(lSRB}~`(92;YCdB!?hPE_1PlPD z4$$ANt16buNQkM3H7HkO7gL$cw_zIt? zoB7k>eg?`rt$V1z1?5n|hhgo>0bl)%geD?S7|$T7&;{mq9JH+lgKx{U<6zg{wQWPO z=ADZuEzy!3ONoJng&zngh&n*axl0hTAv{t+>01f}Pqn0ycL0iuEuLdvK$u^ExvXj*tyjr6 zcNldD2rL&JjO?IK31&38od6x^VX<^261x+u{L#;Z0iV&UBGmCd>n*jx?%-6cF^aFk zySW0;BSb^hgt>47wYk&L@BuvW-42m_duoB3nD!X3pFH%9Db;Nt0Da?$*!zX#I<%8H zMg*ATk*sLpvdYV(slsW~rV zfB89xtc=-S>Xecy_}cGX@2f4V-yh|eu<#Fx-G=Kl^qG9oWs$ob%gr%iR%2pJwG_Nj zxM%xV8n83eeRQO+Cj&!(n(kqH1NNkH`>^G7pRn`GX)dLdlsK^z>Fl$9m&?gv8Z-+_ zPH;hXA^GoA@y*7&$68e`LeqfA5Xz}_C_E1Gdrrg4s*yD!E(G{_h|fQOq@UCvFDF<5 z3H-L;C(4zbcR5u;%smIO?iY2CaSanOX}byR4=4muaiJ(~2OTrV!LWr+7EKX9Jzm}z zvJuv4;{Z+Iv22y;NoF;_Pu4l6rTm5Bg~~I3(R7%G_!wW8A;qp=+CDCd*!zf(~4uWjK=Y<$}bey z{&k+aK)jT0lKi1mR1!5>04SKQ^z6Y6)I(NO$S$8%qUQk| zDqwf?dTR4pbx?t2+hs);R@kh^}zSLTAzXdgXr=|ymBPKsel zQ!}6XFldo46X2N6`WCmCxzuyJ@RyUq1DvQu^pyZgO7aTnOkXqxHk{gVSF9O9zLMs) zh>M!{Em5QLu+Kw$p%>rWw4!$tG)mA{DWiCYkd79|}8k<_|J;#$gu zAJ3wTWsJJv$heNEwi5r~^aAmx>EavB5oZFpXB3uh4ug5`BS9%GC4JXPh)*-C{Rh>h zbBIVve)?og-*_EFW(et>Iq>4JnxN0}nFBQZhSATt5lH%+^RgF?DE-n4UPJu#7~is%NPE*~2;7kNl@3o_QJzgrhzi zvVu=K^e!3fwa)h;R-`=NDSjRIsxQWFRy1N<2@hx+a_|LueDj!&|eSbC-RPk zRdvcJL9Q;S1OWXb?Q4b5ihXnAM3~EbD6hPOZ$C;>dlfYzAtO3MGf6N$VCDgyZkPsF zTyn?d{>@MIpN;xuaqdv-&lN|H!B>)0$)Rir7yI0Ok>*wvz8iZ{ z6v&ZbSZ%Z0RZ8V(s9*B;GsHeEM8D%Q}V@b+5A2x+9Z$ zmhkcI5e{l1(hZ)#%T=(=s@1#|jpD`xEvp;VUfiMK-IoL?%O zgeMO4b$zMOnWArWPi`OV?>XC^7lV@5I+kSd5!sIp8w6V28h!I_G!Nes^6Lar&W_SI ze;f%G5iFBMI^&9D+V*)o$GxrY%JAuQ{-%*Cx)<~?DwT)?8xdU(d`f24wcw{pi$>oA zY96m~kqycW!-qw#AWF7iGXsRPpx2pV)ia;mHxMz$Vb3<^a5oq}#THgRY+xfZ4RNJH zR;EwD8x;2S^VB3b5o~_)*#PB>WsUehhEKrjSM~JsI52HP@e}B_ywJYcD-12%+v(H_ zMl1;}#Q0h%6B8MdYLXTCc4l-Bsz!O!3vSQ62$pPTe5JX}4nO)Cb#H7$Y^xbEQvn=% zlRi>GsE!sQErg5;qy*u(DfPg^jN|m?_Omw>#U}nQ2>8uW z$JM^tJZIPW_mx&BiOMV%57&Cl6%R*Wx-_1>ym!v#-}^jobsh|qDy9H+Oa1 zooAlC6=-oitLz=yyy6WF9dW{W%kSy+H&DHr`w<*L>SYPz{^iyjld+me;iZRJ?s4skenM~e^P_Vd_fd=BqnR(3X$I@? zyoy9K3nPosOC6!?eQN^6BZoZgf(T60fFiDAfm8OU4#9#RK;-X&+YwO;r)oFMlOqSpe?TOoz*ZXHLOwHhu zdR#$NC#_YC$E&UrrY{ahByNQM!cM-o;jLaEt<^SFp_u6J@XO}%PKFlU(srr)IOYXO zh-U40cU(DMH|&?I$lCmK<(t(gJ=3;BB7s4&TOt$63~?kjOF>*O!)B?~4WPj(%^(y} zbm`f|7s_aXTAMAA=|Jj4Lei1j?Kd~IRQRQJ*e>+_QVqW!mctzh$)?E*^@yBxh8Qh+ z97$XIG7ThJOHK43mI`Vfv=Mzb&CYwb{Cau>FdZJ}bB%*7M%8wNup90Re`#!D9=he1x%)=nf&_I%UEt87W?atI#|D;fZS-mL9Cw1iWVaI!&& zA^if;uST?xC>^F9F=qh4bGV1yKUgK?7dE@~#4LRa@p@O8c^KzVEBPMcLJZ5NbHy^EY zJKA0jKAGx2E;s9B=GCjDpS<&6tlxaNtk*XUy=QRsE9n!J^)k-g=~38FZ_Lr>YrUPU z^tF3-p-^oKlZ=3WfKt(6q|t^GMMNYX3Ud&d9z{qK3o1(e%s>Cu_~KhhF~lkZ5}gS~ zNxZ&A>H_aKbCuPIH{t%3gJv53-qec51&Lxozc`sFD|XSss_Y4);Iv8Mtiu_+l)WSC zlG9}?45Up=5VTgCO$xK#+?H1bZ0IBn30aNQBcHNb*wxsCv{R!iOArgwaP?N)5-ACV z!);_t*2eA_SXg30!@e0GS{a1w5c<7X;6N`7Opd1t4gOF(Y&-DwdmND;HXA=~dH1*M z5yM97@e0lpF}5_$DkI}i(j8Dd1#g}kVh6}b>l^Ib`VVXM%)@3KM+)cBK}D(=BF zCaLZ~(BK8Szm;+8Mv<;gsLwkF_nhHB+=`Qt_d>^G>t8UC71njpH4XzV}y=bfJa=> z?Z}MVW?AJ7pML@sVL$bIu~$jgCcJSQjcrf|Ax;7yrEO=hpAgHk=sErl1%`g-hq?-d zw802m(s3ACz*|Fy2W7Pe$S}3OR+4rtO}tpTe(JV%&jAS53!=+(enq_nlpe)!oG_v} z6%SL~DMXyj>&aa-a}Po-hdkMmZ>d__@}1xX>7zOoj4O}SUQv}g|0$o2VvEJhC-d($iN#V| zx<$*EehwPl!(kCW-Wx89va*Dr&4zQ2$80MGJq~#QrnyxNtr(#JRGsc25ITnx zts+}UZNIu@c+w$Ldmw4$I1Gqg*+b^J=~#3qQn(y=_MlCCm|L5_AKNJ<`!^$<(=UCQ zX>@(m-uG8zDdUhSCL#e^`sTeo)|zJT7S_tD55b8LW)~XWhm+d~DXnh4%E6E{j-&-> zZOmc(kY$lUb?CMuBmh#FKfLpZ2=vwZPJJ7SSexKOLh z_n8{H+Flrcv(uhK{3#t9pp>o~IrSY?Q*_@;5p`BI%8I{_WF^f~RF26g6mqUq$QDZw z9nw7*t0jIN-#BK3#_DSF?FMIG7A$DUDWb zlvH-2xDOp!+{SZH#Ol_n@>JV49B6pO`0H9lRMo*ocXDapuskLd!ER#Mva}23_kfc{ zWb8+|#05n|=)|hxw}>i)Xk-RD$>=Jkb4)bVK>?A4-&rI4Vit?TpF{iX1fv;eDuXe( zhfcgS7Bf!?giJrtRisjj;g!P!qC-ku&a4-ishSucJT-abUtrD12zUUDPE{{c#S-T3@_J$nPMB$I&0&nK}7*Z^wzy+LQ;)@Y6FxjpVk*6@5L*3(<>10e)tJR$Hp zh8zWZhyUSH|96Dzk1e4E;J+bU@pTDq5BQt)Uw~j`y@sy+G6%>z$G2bn(FoRV(`7kv zxuANh2ttMG9Jb8>2T7)Yz8bweUQMTJ-*>Gw>4YnK{_6}Jab}19-cRQ*PM@aoF|@Xa zl}iw$e}m&?Sku?w=t5`GGSKsfhSj+3)pb16+|haXSyN;ZD?V=!b5(w%Ww_T#NNsX4 zsXO1YYAd2EFUEvknRCoXZ_@~$QMf(O(<+TBN%f8)AyBtjcS=|J33Vo0ZT__?lo2@r z4mDMkt46U%x~P1U?2@uYZLpeP;A7EstkpWP4XITw{*gu1si~jtkx24zVN$4HR)Nxk z>baDhrhj7+*|8tgs3#Bms39gDq1C4bWdSNkbJ=8eYdV>E(s`OtfpwgIuKStAnNjaR zpBmF1>|<2k;(3c48c|DjFH~7>ibKY<&_V)-pg_ME714r!#8%KncO7-u0#`6rk4 z)RhoVy}E(hLKDmZcxvdwD<5;~?;yYObA4UeR!QU#sDY12uMq0PVu{%{PoL52EBo4P zdrMX<5SM(ql$9Bgj*+v|qAV`#xK3IbDbSr@>=lJ|W}kwHCx5oTWx;_jkL}va-+Zap zln(;XiiI41{_z#~_VyVZX1~^Jdd=7tgXIdv!dTev!je0^GZrP`!kfWRaB=CuR=B)# zd}}5E1SfsEvTPF%w4*b@vYUz$wpTPuA_8x67)(~|@%$HQ`#96KTWaR@| z{VJXbN1!P|XJDa11W)oc(ttUdayVhU;E~I?0z|kyq`=p}5zDtRMwM}g2wKb+Yf7Bu zN%U%dDZmlv_ti$PA4Sr6D~k<(&w_ z2xOhn%R5V$Eyf7>OFezR80R`wWA-v-SOnvIvVV=Ijx!NVMj&70)F4NefdodyhEcj^ zmde>DR1***dj<7Tp7B0?JtaoILs~&Ve1kB&vlmE>YSGJq!P_+rs6+pOcCr4B*H*dF z7CJat89Rq6nSGo2J;BBg)LX8~^)YVuj2jOr(-Xc4TT_DxZRD-di!AIp`vHeXc-Dz( z^q@nr5Pl3ZD1l&5_07yjT;ovxy_O5x_9h~RZZkYeR3`54e(xx4IT0jJpE)eDJ#05L zAaW_~j=Z?vUj3|$Iu!>}_8ypc)VG8)!tpZpq6J1xccM}H(o@!3V%K=^;=SLYT0cF# z{s=+)m}V6{EZU{uu=Q#l{lKDxOsZPlf(KrVIgv(kUMT0qG<*di5$9HVwh{e*JXtS>t2sL?R-g?OlDoov9d0q z0H~(Uk86H{Y+=kQ)O7r2wS@lf0|hqD#{6J~e$e$~pkF_HeDo5%zk3$&n#foXJz8&b%Ac@MDcfDs_Yj)LuY#Kv3!^X*l8?D*cw9^ zG(gfoiue|qA1?O#hlwR8J82l0Y*I!n4(2e57fCzrIEgtP?_1QIc3V{K^1C>l^%V5a z6&Cc@?+$#wwrul`;-DBCJH^y|_4nG#)9Uh*_uXFS&|dNiY`(N=VPMN?6%8R}tJuPL zmihyIm@8$M##hk5A%=*kB~BEfnf$vqa5Y9Vc+?EXI8h1f%^mFF@l$YLZatoQJF%Y% z_v~ZWggr;Dw7#OsiW~8T4lby1gh2!|&h{gy#B0FxkVbtbZEq6| zI4UjGK3e}#BG!Y8Xqm%}LkvfwJT8qSBM&E@kOz(F@07<<^NZv?*3PIxw+|QL+BO}k zt^)4R?v&0o%3vo6uoEI&vY4lQ?*MPN}@kIz{BL8_vHzyiO1 zcX~L2G1hOVpf`b8Td?Tnb~3G2E)o&n>FdIxcOf!pf_xo@uPCyi$s5h~E+0=moiNRg zCsdoyfO()yT2EaoQ7$F`5+g**21GZ-zaWV~!NRcAu-WGj%q4gKNbDm=!HrwQ>|Bbk z-02r|WPq9XNN(o-J>Vl1ZA+IA-o1u~0OVarxg)4peei7l4?&gLxT~Qn}SANknzvDZE?7ZfROJXjTaFwx4r*!+}7GNeZL{WJd2ru;ab zTUNH(nB9^Pnuc`6;4*=y&CDB?Ach5HXYv*Zf>88HG{g5Y#WGmTlpmm@Y^LM%ybkbx zQFwgrt7THY0eYNht7YE^S|*6nFY-QrwKwY`Wc^M5>~`<{#bN2FNgWU;v>#3^_l5op zEtRQgLMeo4Z!QAO{d_~`=%~zWs(j-oJzpl;jtG9kbxlY^HP$Uc_s#7FA|vd3igh|o z4qe~nYJT?|<#e`RH!iEVf#z*Fp644c9Rr z=~jA{jI`1VDvyQC>9E0V&>7llnWNtZ+)~4|lqJ=U`gD0m1iXAG!WNy-)oXj3^a0X} zVlG1~t5}B`G)-zvq8fU&jg0TMlZI$PN7yiU{f%=SdF?a0-7T&|f2Iwdl+y`4Tfjqo zg731p3(un+8MEdD;brZ;W1#o_g}BoS3Bj|3>73qu(fnZz|Yi(n=wwj<5#In12W-vi=GLqUD7moB=~@ zUMo#g_-pRcn5zHwSBBh8C)pI&4i_&qyj6NO$HI9;O28fk%J3dA)C!E}4!>lZi@bbq z$BIhSO%t%aH9a-U(HXEq0{HO5gB1lKs{h%&4HkCM;z=`SXf~Or)UPb9+GW)$h#LKo zT&y!8b)Eq;z+Uoy6a^xkgUQ*Z7(KTO^R$f@4KFWGm%}nmIJ?n_jp@J>3l#q&m?f1O zC(806lpnbI{jVBOVd0g)ozm7UU#7ZbhaATK6076EKY}}#jQDwxW>q~r7pq-|KqUt~ zDp;vMV5yJ_;W&7z0E4Xmo+@_IV^Z#;Wu8->>*7OqRNv}4TX_sEI|c}b8- z{O-joDf7ksG7DZrYJsxup4kBd1lXAWt2{6u9e4dHdEvpHbs!-gO+=V=SpB$f_wbU|!JR6E(Xk1PsAfOG)reYr)xUOU~?Bp!Qjmqu~9ES}&%E6||r_J#-Q> zahhx~x}74|ppvFc1ak=U&H0hV$t7vt<18~+w>H#f8UwIlL+c<4l|ZoPhv~$r4?^(4 zgZKoRN;!SpX3i9+3T&V_E-b?T1MvgF>4IM}MCHWLV--I6$OQgclVuguCv|iIf}p~&11dzB{~9V; z3+3p{Zi$9j=CdE{O6&X?Ri&pVEl)$W9EWzZhZqRRe!T#BHT4Vq|*&=UXDOeQrZ;UEng-MLMz1B*jz7CzS< z1tR|;P;YU9>@rN?k9aX>aAxnno5SWklTdJKc+&8M6g&@nw*WZU0}CV9wa2e`kfj_M zM63+kxeYf9Y*gTvpr(g9Q!{f4D?1ko zXJ;!fGXobvXa=kts>y%JqN$*>ux?OXc=Bu|g7poU-@yD8?B>q3lBj;;C!eT~Ala)} zkd(%V27}nVwfOy0D#k4}o+*dpHyY3t6kYrX61fYk+jschJ*}SD!$LAe(~*hOAA~{) z*x>aHYeX{NbBkPY@bd76KZkyrdy|bFg^TSxgu@*5$S39mgcE-rBkz)MRaL(Q2tE3p zdMJsKD~W2xBn}0=Q3wTOs)-|}rN;2_v*y%pN?Tr!4Cjtp?9l19+o?aOp=&|C8*f5; zYkEhrdJD7Ogy+kew_IP{v|KY;2F!_z--{!+AopkJ=~0+uJqlc%Fb8AfJ=`OrS_GCzAFb#zp!ANOr`y}x422dcz4%2bxS%;`t|KE1NPgR} zehnOb4yc3wr9cD2jHnmMXZFC!`+#53BO(C;GRD76vFR_Kja+=ktaef5=HD_;7=6dk zuS}k-5BBTOZg$~<9}8*!JIT8E4c=Egsk!n`u>SIrQ@r$V-rByerU%173@|HUrgg|+ zQGe4KT;hCZANNyteVQ@lP$JY_m{nlz0#hc-6-cn&mZbl|DX-{eS_hiafogK;XDxIV z4q{;wuIwHat31ELkHQ0)Xk&x|JBiTW?)_)W*zOg|(veUfhp^W5q)2U6an#4Bd%q+> zciMz~{Nw*rT2)!XLfVq27J{>_pc@CsI4LGZ4_89;7=WaY4KmmITCmXOVoAjfNA+u! zJgc0E;AqhnK^fp8fdrhj1MVsI!MrH101kM!xnv5J4AMK=J!Bb>e>c+Nf7>t&FOBa? zj^mcsLq%PCh+4kiTK!@f<_uww9UhSzWoJNO66hCdG%!Q%xY+yFhm%`tH?McSeqmbr zVWAf$FX(4<8dV>fYOa~NLwIji4Ckn@#%FYpD>q}I?GD?cn&WC%m@)}Si7=Vw)BsT* z!9UxFjrrU8BPaE-J$Ej@P1x65o?S#qm3?bsuKaKI1gRDRI$L~9SGw23GGr-Ao-SR3 z{ydq&5UQD&(f%YD=^W(YM<`~K99f!19d)`zsbTb zd~pJd4M=c61Hvdj0FfcE-~JuWKwpHLdc9RfiSKo)AIz=z-eg7c z{t?dPjZZTAk{y^#SfS$iT5O`Oyt7CMJ10c221xAlz2Cp`io2VvNYa6DBVmt#ut1W3 zzpAYzaWTJ5Kabt~Y2D?nv`GkTQ)1gqnv0G7megTz{GU_ns?)qQrrXdzTZT(MgWve=Y9=Ml<| zW`sNw@Cu2IyEhF}FPxb|fmO{?wb;~L{&hw%;%{WKZXlQ80ToxAhE3q=VZ7~P+53*h zew+NrqG(J0M()NV-UN!NwUYdGdZ82=eP3jc)=hLCEi51t*$inVu*Lm<= z2*l+^`dx&P)axDo)Tv;ioU;9HhI&G=f=VI+*6Eoyzkb?DtJhiFj0uR2oph9P;j(z( zml+zL@_evRQxQ~RZd;9U&rxx*jag$)HN5dYRa0Vr|zb!mD=CF@Xk zUysp@*hm$dr_=nMFS%#ReR;T=S(OIgQD5N(GP=Rj-c093G`s=x@c0Qv1DgL!0Pp-C zU6RP?Z=0u;?Hy`c?$vJVh1}FcbZ0=9gjWaa`oKMM4XDwCs*l?fOG8qq-z2z7AXPAd zEB;I~^)`@%QK?20mr48#2$EoW9gq33uH60WT!foNdAfGVYFGma|9B`hA36nPk|dif z$rTDHLNrj#TVky@lkl^9qsq@Ho{ld^?ML266%W>;+TR^k4_hgf)W*Dyd5#3kj1r~c zDjkVt(CuE~(z;AU9eFHSm#m8;@`iC!I*84Dyx-|QqHol{{rFrm{oeK*@vh)UMqupy zx0~Og7w+f2zU^1Vx;_hSJ9x{y-gb^Z7hIzJGvC=wX16w5;$1X~{JuL-x>ycE)B2Xn zH-C8D+RWN`>2251^=JO{Xy^F${k^B334+)ISBFak2KtW@?Q=Oy@y6|mX+BZT(moWCa<^}%R9wl9hWb8sURI&J`8~5#XnbN)lu0y%usqr`MXIwY2n^12@lKb5Kigu!6yHr;^%Sn1 z*j%VRf>TL1%;QLoM;S5i)i#AuTFV{vnc?c|=bb$~s*iuggtRUuR#Nv}>IC0aaJ+Y9MhiI;Y0H)ZK=sYXz9>5O%70Y?orW8a1z$h z%nDu;aulZ59r#v~aG|A)Mwd`B$P7@?_ZXQspb)+aPdaxD3JgnHxlH>&lh}hV<&fDE zT$5XB;s&d8PB*lp-ZECGZ5>)LYib!nWXD3>ABU{=2b$X2T)oZ^Ux_H0Op?AHIHmu*5pWydXnvt8w`3 z{0uE3t~lHGi{NFPIGJjh=_~(^rb7SrKi3cZAps2QFfoyU>zrUiyyKQcKU#EoX1(?m zA>Vuz?P(RBg+@`oy*>l?plNNhw~bw(mDRHaIb@7Yhb^*^Ty3<%Mw<)Xpuq@JBBb8Bp_I=+6MmuSMFUJhPQv zCK3JdyeN0b!y)(8m;a`|)(A1BP-hL@p81uZ@J##l#*Qbm?-MjuS0f9vxdI#$_SD+* z+5!`NPyNnM^+4otaMd=Mz!{rKdHUKb7-4>kp}}__L>>lbvjP)|0o=mh_59CnrXm|F zB`|b#c%&vvrhcQR=ERgz(j=%7# zgianT%NMK8A%|lbzc;^(Z~B~W`^-rs__^5m zOSoy(yNbElYny1`8F;nBCTTu4)o67T)=<kv9xD1gs(7P#YYShUX@d?AQdrDDlU!U>gvV&PG&E~k$kda9ubl?AFi(S0xR!=hl+5yE%Oxc^8d@-mN}p?v zldCseTs0Th9umRG>VHBxrYmNBN>WK=4*FrN_xk`P08r!YCB9(#0z8-mBVV-`yJWB~vGX9>sc~JY+#wa;-=BE;@$J z-$ca}ktjDqEeqN7Q*991qRptz5Vt4JO~t4$3C{>9Y)0_m1Kj`OdGJ4d#SbX3fS5{0 z!x>cQyZTEyl;;=25_^SWnT3^WSKWSktugr`hY)=P0Orcl(LVv)1 zoX6SaHLHBJI*xKGR!$KTj&fA-vNc<4Eb^?3tV6IUmJpg0(_ajwxb(Jo=AK``^BENhQ5dmZ%w^#rfEPhXUEM6JQCV>1U7JS@A z7AsyU=B5)FE1_!bWu8Mfkut&!k4D2~gUda1!lhQn?TSV(=rr&K;k{cbi`3Cv*A>EBTD>s`-d~8{6bF=?(HflPJq7>9k9ax z(_e`J2GVZ!$04=&fqqGZG(NU#MyS8)UiRtp3F#E0bsZd&1YG@bqy7GG8?CD+7$j|v zfWHq0%A!v{{)l9{H|g>}+twH3G5xvp^1ZkaY&tfk0#(|ee%yhL1h^+pmAXy%P57!s zFvR22yctH~Fn3Ax+yj0d&S~(^&MW9Km=F?%6cAxM*^}Oy1dkanz{`JV)L{uFgZV1) ziFgnYy@refpP2uMUjLtoUUU5a5xxE+di_WA`j6=KAJOYSqSt>!um6Z%{}H|ZBYOQu z^!ktJ_5bgp*Jkx$$^TD@Ufcc=z5XM5{YUirkLdLu(d$2=*MCH>|A=1yUx{8_5I!vK z!+!o7SvA6GWvunPxIuQIlf8)7gJ7rWbwBkX9fDZi6GeQ40)LDBV)Zz&=;3GKVw%qn zrKOv~IeZZFBr(h?%xAv8w+#Ry>q%K;_&AqSd%dsISDbfS)6BZ7bx&PN>^zJOn|go{ zC&={WjgKVb@KzZM!aj&16;ApH{23mgi4I*SxptFc<-XDE+409+y!1SJhrdI5?QYwi zc-xO*KnVV6gsyW)6q+UJk!2e{Di8Y{5?TfyCiNTK(h@_#_03Ta3I3T~p>&7<#rNbS z%Hn6FKd+1u#S8y{dle`#)@6M0$ou4U{dbtc78Z`OpxeRp7KCXU)Fia&2u105$1K|r z-E@Z)&tmT1&zOA&w3wzBk;V*Tv7W^dKKoumG#tZ1kV`fwgi%rDK6zjmfIr=KkhA|# z)p^luC0Nm)pRbsDLew0j_M0DmX~*L`3@!FT!xXI&%8zX@>R~YlrMPgT_j0oc zxYNKl9$?!71l51Ffd)1e+(;fGUmIw@X>G|UeKE4UTYoqFL}FY0foA**wiXe1pD#dP zpIX!L{tzk>=dW6$cOw42y}Fp1wj>8Zob`_ez_5wx;kd)!Efgrj=$^@r>yX#5**(4H z>RJzn2BSTA&?||4&65S`Sw#e!bM|_s*I8B^noql!ZcK6AY;QyxGpBY=W7nqg3V1CrzKp+>Fje`@aCIc_T^y zu|NR*?%%rKHnNj?Tcu4S;`-&yge*GV(4K{)M>qSkJM=CVB@ti=&1SU{EvAfEcKER_PtQ23rP&7S)G-T8rJir`!B9`zVlz&jiQ zXA_B*A*Rct#2D@6{L582uuQJ%DdfzF&~XKB)CjnW7^vf+ntX(;Dgg}52NytfVM=TH zVWYuFtTrZ2o(?YdwNr4hU`*s^PPP=R<`m9OChU)Kc(rZ_YH%0Yz&qL5 z8RwKPisLN^^ph6VZUw#*Xf^I7Hqm_%Pjak5E7|(|MPWWRJ zbnIVEPz!HZ5OWYb9kA>q{%hHVllE*1e|c+8|H`ccvfgBt&3a}#_VJ12zOsszz6BQu zkVl^wA?*n52vs6r{;$8a$^Ve&nee4xvp%C_744y|`~KgCFGYCb9%DW^a2c$9baalp zgy`syTk8()2M^qlT3XW#ges*@oIr{GxrO-Y{ z)R(~w0%ppzM2}X(0?5r*jAc0QM)?pq$*@77&|%yVYgynqif_d{gSKRD4uU`=uyC;( z;O^ItL#ajex1r1*ohOiN0!cU_AOb>-zqfyveGvth?NLOHAnA2x^4_N2VM$iJpm8O% zidAr=*W=FL664xK)jx<&SWg&3_h9A&28ksi@&FuDX<%Ibmc6C{6@6$r;mm#(*IZ#3 z3a0}Z+-G^@m~M}9TQPA_+9)Zfiux1F~ z!v?ZB7$h8xkiP>T<^FW+gq!tH$t-`E?oGlFt^G7(JR~8o* z3Rg0TlO{l_Ie&c6%kKiN7ih^YR?^{{yc~(#jO9BGPO(cH`1lp}Ko%bjZ&-fHT4t!O z1=LU@znb8QMvLbaJBtpI?TGiN$FCxLFkX4?h;Gy zj1S1J^t2!)XvLI|?o4DY!!VK?_DFkcnZQwo@onmCHV}Wjip(7@59OzJ&9iF!$+uNO zRk|OFsteo61>S4ONzIv{(RLp8Nt2@0sTy&AuZooVXemz;-h|H}VavEj$z^jyuBhM2 zs(N@l@$!scNKry@vHQi(jF$2SggAnsPeY}fJ{-*^I|&CN3(0<%@hzOPogpVJMY-|0 zq?l=`v0&%B5U+)PP~bo9s^?&;*uU{$~-3 zW@SD{X$uJQ33D~&t3iEv#&V+dQ6<&#Cnq%iF=Q3%e`cfW-rh!)QZMRD7 zMcvxYpKNlz)2O}FsWhY(M+l6$qyME7Y!$+SY7X$mer6zij*6km6w3`^R4UOqc0qe> zr*@k5ez4vwx%LctrSFp=xlw_FT!0-X_eQ=(9kX$kl(SaZPO&Jl(e&do_8d+%pY+e% zO%)o~%EcF35cgQVeq`Z=Cbh=0rNIcMcLMKoVMd>Qgyk4f$Z(^kkE9mRC7TG5*`M@B zw`4zjf83J2y;OjnfG=U0diW`EiiT#=5L;%fb8Xaoy+6^CP4HpDd@cgX0Wi%n7$}Od3|T1BULK}dwtV>#W;}(Fgt%q>R5G5mnZCx} zT_=p`QZ7m&hg6$Cr`_u9kUpFL&is9O)==-_=7s1HS)UBkZgb>EYCT@4RSPxEg4WpbamBXN}G zqWQYUx0-txiI1y1znWn~fh{OIT`-PR8Z)$BCS`If_BDr;P+P;+1;$AN}CoX84YOFw-t+dGy|9=+p4p<oT`7jajpz?3&h$ zBHj3va?Z1}g4&<4Zr;t6CUUq?q6F(q51mu#&wqsx@(PhTG|8| z>pJt3)kFmv`s~K9GSNtSQz}O>S7%U~RKM^9Qv&lHChrDy3vILBd$$*^d{xNlo5>`0Yk5V-eE~W{Yst~28xB#I zW!kKuc9P=hp5%hr@pJTWqXL^rg@%pTH*{!S%6f5l{^-c6Sw5`UUgAq`Hh?Le^B2fX zpj5nBF^@t}B%Gy{4@`znI zjlq^D#4Z7ZL12Se)id=Pq~>SmS(?-)nmKK9yGSxqw(Ue)`|<*?FQ^KL*FA z6t#sC9LwwmMU8K0rmGE6ZZTc!#cgJJwy3!N6a%|?RyTC@kKINV)mqcb2TGIa4~^tk z{}Kx>z=yhgSnh1skgyE{%R4U}C$Z<(7j&|H#XBK+xjyD-ikv{et!QqGqC#{^RpXvC zowPK-jEPwU2aoBYWjm;mT%2$)Nsca(+Mhij=2^)UOw#}u*ui-uH7?DD$||V2SWR`! zbfP`b5u&kAQij`JmT`fz^rAfz>gWf4wcGrce;snBhK*EJ6-9JOx1yMFxb-Q@&zS-H z&y+AJiS`|$E>4w$nXYYM)!HdbLe$B3zF)HGGdmM@WzR4w{cnEfW{Pgi5I^%HvK9T9 z$lE1y9FCd-sQU*v=XDO9obE1O&iBO~)gg)*_6f|(ZN;UNRf@Y^pFw;2l#c3fu<5w) zFTVQ?C+GBY+6x+pHr-sW6`mKh(JU%=QKSxQA4DbfPQ&_eMr4(GZ6OuWBw#9i&(V#! z$0HTz6i;B5#uDn`NPFqJ-X`uZgUbC@oR9>5TpRu^RbVI$w;aiDyBs^?_LtA*=D!!o zn<|k^avk&88^gaoVCG6aEJv*-@{aPCBHoPtrTU2 zk91k+6vhkncX;kLs;ytL>VSMw88Lq=y~W^ z%G9M;R~fW)vCL6iWV2}8rL;t|CWjz0bYHFrQTh~yX3{l^rJs$)Z%eE#@XQsp^Vu(X z3&ptXY!a72ub_URRNM+%GJivq_h+yC1a&a~gE0UM%B_2SEVPwH8YEs(NePuOB!6_Sdv6>b zsT_keW7(7jS>#^!bi^V?x9(y*v6x@aJCxD0%x~rmkO499Zgx&YiYFHG0lszc<(m@< zA2n5XSgFs6++Xd>kf}HbXzad&#RQD&%-pVOT<|m#6S&;HdmfGJLeCt>D`aV_G+kca zo3NH?rUdGDVwNCgOJ?o7x10)Odo9jxlK7*A?feVwRG@0=mP`DYocE~LLVy@xT!&CL zJTc6;7?QnlAHTC5AJjUpBpCdrJQ5y8qMdBmaP}ClnrV@toAX;D(yx8%_f+(o$*c+J zo`wA~KW1HqR0ql{3zmcW!WnJF^a*F!bTR_u<6ziTKg=H(n7-4(Fhr1Kl1GyO(Jy)f z#&y<=&H4SS#I(GOq+5AKzr-4Mb`0H%-#Vw5HrbRruDEg-{yMMr z#J0T85AP@ek!~cMpr-#aX7QK@Y_FYQ-lm6SSacX_i!R*BW38=yB)ANRY1g8~}}6Qpyh z*xrd?K6f9>igy)F`pByOt$4zSf>WNaGcnl>X1P=2i z&BcYb`O$k+G3hl<-QGQ1Dh0r_P8~3<<6_yzy!mA@n3FX2QA3gh6;=bIr@GZw4s8ANw^(NPccl4_sBddB^3 ze=6cXORMaRbn$=pBWr;*UVoP*CVq5Y#_l98LB2;w8E>0*18yw(66|ddTV^y2LI* zARrC_TZ5AS8i`VftSZ=d2lhCB}`__VxBO_)e4$M~Q~ua&mh zdJZLqrRovm99shioB%Iup1MxmQj!j(U~S_yUePF2TcZX95?p{kw8;U=q5#HL^z5O$ zA1%3bO#?BWz?&a{&j|tWI^39RFG&Ramnk7{#HcOHH-h}v#Ju7%px`7#pB0#Fz^me4 z<-PEi3m*^BDx*)agVWvausJ5|bt#DcVtJ1{qjUo5SD*qiKirUN8%$a-kjkhuq)wj0 z<~>Jx=5>B>y;R)2ay=>@{h1I<7=T%P1kQaN^kN@9Pf0e!S3scR&=yl{%xh?e1F~K0 z+L+;-PozN@kbf17QoQ~2e*a#uGJ8Ki6OvoaoBNV**;3QwAhR$=_pxC0@{XfNIVyS3 zdl27C`wpEI8CJsm@dY8gB{W|_C^ZqeGj%xnE zD_4P-C9v+Za2=4etWzwnDZP)yJVjrHHiE~YMKEdEQ)GBMf`NyC_$MZ@OTGt)w`JF_ zp(i(b6VDwpnWKwB6)ti70bX1_JTpc+yp^`K?1QX++4%Y=4@Wl~-EW1vv_@`Qxeqs~ zcP=7ssl(ZvF>iWX)?;&0|eEoF6@YpTnX^a{^i| znATqKf0Jfg@e)W+!{bElX6~x@4u^edVhw+WnL|ND+3%&0yAiGZVYg5(fdF=c%l8L_ zRL3rh7iPLfmN8{dXLfMrr^d*-Y-)M?1R_)Dl;Kxll1LwpMr`YWv{`dLp1s+|e2nBV zq!zotC`)+x2M;^gy2;E{4s4tol!j7Lj4fcxM8ymbXo z&BGep8eCN+SX{}jVh^c#V)9pY?e0Ka+t`OPJxfs(P2d)HcE>HmgG5m4%ysd1v^@G|={UXB-Ffsvw32Mt5eLO8}j+FCU+ zE@qT6R8kayyfmTlmi~y8fn1!Nez5MldzHJb|AtG+$7An(-Tn;Qe~w-j@#6MB-T1M* zY$wumw(6a`*!-}0<1Tu=@lE&QaPiBHG!6XA+i_i*zK_=nzAB*{|fiv-1`U9&n=o!QYsHM#;`UBw-=zLMRANyb? zhK!tq^_HUUY>om5c!%&tEnnHmnyK;;L=G>ljf;y%LO(aFu@B6@KLFPmj%^!@#uJ#P zJ4QhBsK7hf&8?(3pg@#Gqy{lzjZt_~XqwiLrb~Vli;jDIS;vpZ&~w3AqpmD7=MTi-r{i<|RLUUKB z#h1mT_Y0{k-jN8SDfTdDhzrvb4_j2yw0U472Zj^ zJbkA0?{5*a`R)A&lJgr1I#~dGy6?R{>Sv0YKrkI=Zi^ByDy0b3;?LvkSjee3s z*7lMS=a~3yxF?>gMf{}hU=^~VadbF3v{xF!Q$HK7Wz;o69w`8RM#(hF{!4?lqy0US zmOP*af48Amz_;fCTS!+lxj^_K^<>R0=QYgBF+Ty%gWIro{sv!i@$5Fvs~Zm(WOu`_ zWvLT2uahPvWvwmzNeu+OFE&oDa_N=gzIf%6ih=i%2SqqLltLT`rK-Pld=b394t100 zFx}eEnYS02`KC2gQDQq@>u=ZQbKjS_OiBvrm`>dwmM7qL{-S*Qfu8arAYY39hq4MGEM6ggQz9R3jsx>rW$A_eWv(*ZsOE2kFmX2x@vH$u$v2s$m>&G2 zeEBN{?`>@N^jvFbbHXz&v-$GjiZ7GXot^X1tEs%v{NVtw8m?9$2Y}VKKO6=*wssp36=e`gA(Qb2ozF)2F{rE<$QN0xxT&jkF{vnPxQ5 znOj=lv;4w>T!Gq@k5zau0_mQu8t-Q$ZYX|Th3qR3S5+T~H58#kNgF5opkJ9(iHb(`Nm)B) z7oLbYl9VRbQFlw*gzc#Gg)4TSpfuY+$(KJ7WcA#yzC$FdDLqwp#V6~KBV69XMpXk| zj4v?l4Sfk=96&7#>E9&Z(IaLcUqdmb5k| zVMA8j7>wI!D4pbUDd|$LkdJ(N(UEp7M|Isuq=@jV1edjTj>_)TY=0&eh{dQukQOIH zOI*sqDPjwPFqjmlUrczc)%Ph_y7{d#Zq#uMFIbtS8^B0RYYRfnzUjnK%!32zt?fpE z>6dZ4ULD&ReFC%0EwB&ODbviuV(f1Y6OaT+HKNgX*9vs$!~t*BFVak{4xB2ZI8{l6M%kg)+9X>z@hfia7ekb zCgF@NqM(}g4ajAv0&7B*Gns5fVo`t_Mow{8(gK3`(3?9ArO#Ve43Kfs_`y0jBMa@E zp*^r|iqZ)FIoB;;)QQG!`H87I7p3ewxfd9eJUGhu)-U%@RPn_h^&HbTVUniDs;qy8 zU1+?TNbWEatfL8%G$F<`81@%mE3~5suGn7ieVf;jcSW1T-b3uuP%4SOlSCG)FO{_u zW+3>LjitTuY%g&O7Rwnwor`7>qsUrerjE&lAUt{s&Eefz#5=4iZ{@T+ywwgES` zfyRyO2njk2#nrihVP9Ar$i^2v;C5stKw1!kUp1{eVvccx8i z_c33PQE^1FQzFVOO)cMBm^>Dzbk=TCl!W4GxB#XelQtqex9~e(ua}3T)S>;!EV3Wg zVhfqE_bf-R#p=_}WX0q>mEcKd`zC+zOYN?hV;aE46c=xUR??g#c6On^9hGAIl>0*; z4)e=?^sHJeFIRtqhw1mOV$omu`Ig=twJ?=aj@tCJC2>A_e7QOE0mDSH#&QKFk@A0m zX(9Q-gVibBRrBvK%oXKpI;Posv&|dI;o>m@Cywe*|M}A6M>r-mye|B=!DkB@m^*|*iiZ7LxXB%etBzz5eE8e98Mxt{*{>jD2VB@y^b`VMR z5_*K3_J!^@+-q_?CQ~?&PzgTKraaKP4OQ#1CVq}t1aU(81M8Go44JBmIY`R!agxY> zL8Dkj8WeY8{hj$kGM?N!i~K6`1l^9ju%&C_yV9`%x3#JFIVs6o?VhJwJ2zd87Ych0 z_~=H7%oyoYNVl%xE4Fwk-A4G{n6I1oBslGpv%ki{vLgY_PTRPKStID5gnyFf?~>GZ<;S^vH#e`4N<7 zUlxS~$4><^K|lyeij1R}MPe*#KN;B*PfwNRR*~Kx;rW2v>`Jy}9q9Ob$WpyjOecr1 zIZR_qgi2L6X(QA0{V0v&F1;jLvf9k+bcUZjs-Yw-fuu<>wa)a&9T|(VTT3qXDhFy*S_@G6c6?AXI2lk)NhHr!t2-HaHsKP2 zk)|O&BKr__*8LE^SNqnfc6T9VKN~4)uxN_Nd@`nd>X|aF^8y;(_K!w@FmR7!6|g-Y$ADGY`D1o`G-AmjYo9TATj>E z;KgJ|w`vwGLVn${si%DYX`$Gw0r=1fqezGhAt~eDLtCkNyG%YSJS76FU58#@If@@E zTZX%rFBd85xa=v#IxS6=OQf0w-_dGOYHH^;`degYCGTLzJWh#=8F3lXo1Z%Pu)fB= zD{G&~>f!{m&%ch9xX}mBJ03aOZ(Dzs7G(QHxP8-llqBa$i*>%uR7aMXy`jFh9hd#t z-VauE6w15}9|DkOGK;RI%z7|VMuo~B(&%oSEp02;Ui5I!1*YvK zrK?_~ouHTSeXU1xU0#iS{il~L-e1%{+45!bSV|xgA{N)QCx2ZhcfUcIn+e8$wfU|8 z^7L+U`kROS=G4Q1>1VQgJ-RH4q@Tv^?0WGPm0w;9uYJ+LwF zBz{7#Fa%3nVQSI4!wD^UJ9XD%PTmB569*>>7NdAwbAR-Fy}-Ovteahwqa^@-wOxlT zRk=>I`(2(sfNQs{Nv=>;Bf#61t*A5FFH*ruP%OiY1rqdYv)tD)@S`!axnEb|3Iz}A z_qt2n=t*BOLHbb|oEmM!ho0#ZBw@NcX55VY0Y6qz1v%^ZZ3JmMk*Q2X?TE7t>A~-l z;Az|59LZjrY0zC9+T!Vs8m4vp3j-9##GgJD_WM6`#bf)^O~~@vvR~v6?G?Q6_4io_ zl9H?ARZ5Xsz>&3BZ%@_eq38A*d$$^>G&EeElDJVysu)Fw(ciTd%awGqn6%%01VtGVV@Mv#LEo%he)f!akurSDcUIaO)M^^1@; zbs`jnYi_riVD(Fs2-9IWyVzu)SgKnWUu{9R{{CVtQ(Jh;2?XMBf4B2J3KJ~_oMDfC3QuR)78p|ESMKv7dSfKJ zOb^xk_ZJ$xJ*?EHqY6PB1Ahf35BU3kmGNYI^?@5<_tbalzKtOs)q3GntHv1xaY3Q;H?n%^Kvp%Rpx>VnhxywAXLDuE zMV3u@LLqa%yEux4ns+WB8;7mc6IYjk7?j#dwsQy$(D?UX9yl8><*kGL^m&`sX2*0( zm!|d>1^DILY0PLFfMX=c-mK}=gT6IdlBUfMrg4UA+J+4T%Bz2`S*~!-nw(+xdcVw^ z3%P6Eq}QHi0vN&CuimlXD_De9;^WFU%JhWNp(|VZvqceFvEQgkhvb|oSlCHt$_NPY;yes`GalxGtH^X{Wsqmb;(Nw ztl&Upf+*Vua7BPC;lI__h>dXkGg$58|JW6jTzf|}UGmq!{Ezju-mY{S11KukDFe;N zZ~=a9x$jKyvA#C5OCi09{CI6$FR0@=PrujZNZUr%RMH#x%(cX%5uZoSC?r2?gyv24 z^oI{Z+-60d>0-&2IsgSQ>J|1Y4(V4+D5_E7-4w?WEN+=R>4hJ7z5BzT+bPCW7-!vb zR~k9F-R_SHJ>&8OZIKCpHfmu3%4~MJaO{>8=6fCr8aG-b%qlRkPiDE+bMbk*`9(|i z04cFfu*1zZDwKzcCL1$?i(*s`No*ki$q~N)%tiBz&$Ko0EN0PP{p^dq`q}--_Nb`; z;_dm(jVF2|zWa8|DPjL9f6Hm}P^MMFa?cgX!olhAddJtvy{n6cL9U^!bssj)ZP{%u z#qHX?y(}7gZ$jbW7yhvW?%8d-o2L}7`kNJZXC+cHHr?ZUj{TDP1Fy2}XbL3#McfIu z&BiEYNNVrSSI<4ovA2m#yCM{{#e@(&8YADb@lg`&vok|yn=W;gJeFP-aBw`)=-w=>^tW8(P;9&FBgmeZm3tm|Ao5?EH=$$ujFxKbE`|-2ZBY*dV))p3XhstjTUjuPACN&NqiA z-awZA8No9?xRp=W6{?Q6Pu^4C8mMl~awO{uIH zp8a9Y4+OCl3BDj!kn*2G5K(>QxqnifumA@>tXs`F1B8VE0&MK zT2OmKdC)LiD`UHWbxuebR>i5-V9L5*>VeWHX{Q0;Olk%$1h7{`cN`%?+$gKuB z?Oq-?0?W6*6+Z=ozVBuVo8C{!E+t51id>x>ZXF07(D>gtJnUuSv!ClO&a3V;4Wj#Z zTpe$H%qudd2~$qFT>Ky;q|%e9w4wXyJ#*2BhO*iWX5!$_`O<_jAS)>(SO=MaVKX=( zIg6ci#1Nm>)oR^YnQi3$h z55GZwb|Y`=-81kG5l-f*;NXuHQE0C;3Rzf)NbccnawE$W|K8h#IR3K}Y?VN1`#!lWK~efCiM$CU(`6(Fo~gR*d&y zUW0J0&XE6DvCY14rzlg^9YnXt&-|p(On(Q<5CC6RjJ65WC94$hGeM}$_RU8ofa|f! zbhY8+mnEZ`olyuQ+>VEfgcO5ZAV*^<@JX4qVi!K6NSz|GhHH$JoBKrylPbMRyjoL` zk9Gen!}x1h(-=0$t5N6)T4Y0?Owl_wfa@{sv;N5S@O{>a`zwpDB-Kp;y@fCI-Z1AK z(`0pwCpxv$5wWDPBxsf4wWnq9f$ABeEd6>dGQ0-EpApT&_XK%39b$4m z)xzR@sUS$v8_~AF=!scMEBRxsR~5!i8UWQ}H%04Go8I<`>cNUMW89>LyXZ3A86)t) z1#8;(|6=UD$(N?efZk>fn_v3FU#-#;iD zE6u5Foxpje+fh*G96hsR$$W=G&kTmfa#oSeF{X1}<9)>+m5y)YpHx`XeQ^}JtEF&U z{1}KeGC+s|NlQQd79Aldewhqk*!P3p#6cO4Cr+&S%OG7lhb~bm#6t4YrEF99; zsgw{nq_%#fdbDH^5h7i3^JY$$Vl%Gj>Foj)A+}=McNtJs<-^ylx$cZQ{S4vJ1K(+q zij;ANzqq{9E~etioO#HeK0&F-e#h$el#H@-_DQuZ{t8U#TE?3%^k|Rzql8#KX2wQg zT3@VFQ$hBFLYNQ&B|TNl>I-WliB}u(jl&T`Hiq=xkMrHx1$6u}d5h~{DKQTfxp&L< zL&dJiV}!BgIx`YQT*6vvC`z9oFv#esTn?G0&_aAtqV;9X?J13PVF^nw$<%~M0{Jh% zI2kpTU|e4~UlGeWYS0}rhb^ic%ik!1jT7w9hgPjy7KvtI6xA&mcbt^c@NZCPv!UDD zNseB7eqzAewK;+dR!u-A zt_P{RWLUT3&|+LpcSabzyfrgIzG_6ylp|9)!E8vo@S>J!bp&L3jA;%C?9=bQ?Fyp^ z_*U@6M6wjoj77yALz3C9J@KW21jjy{$%G81+|?zYwsy&#mA=N(I5T-py{>Il!xD1N zH86kS7$cRzDgb-c{^Rajj{sWZv;GN>+uL&44ve@_IThI0U0OKDuSwr2+MgOFf=rL9 z;uq+9L=^L zYxwEKZvB9xjk?3B>B+Yb$Gtu0UQPh~4213fmFDn;n(A54X+^0Vaa>bV`N$HVJdZO9 zKifYdsGWw#0$<|XJ&@*2e;(!NNigaixfe%BJvlmCq49ZlKr^yyKD2`xHra#UY3uWb z@;sIQYTYzjhq?Y>nJq*whE}+Wh{pZfZIJ)Y&R%KLkrC%u(3Li1NH6I9uyT}y6hVK7 zMV^z3)x0-<1y6iM-&5YeX+Z3t%0+N7TaF!q);?2dt|NRhF`AGcetRBU#ivO z!}jg&2wQ$q2>3OUv4@eSF8IUcM5!qvm~IW73P)iq>u;s?;>Wzd28Q&%$5RAzkw6Fe^Bez!6Pdl)XWa~B zm)>~o9wq0u-mH0Cv+(RZO#)6tjcUi8)bcpc=$&`{Nq5jMlNd^ zmFujx9Uq&zr@5w@zpIfd9Xc=bIuXP_nmzw9>Wc!HG8#tds~(I-ghVk3qJoU@I|w@MD1EX_(%O(F=*o0U7!%gt=8JAS*-Q3 z7jp>Xt4UXLGj?Q|);0cXys%}}Hl3V>nP=3&ZY;Ge{=CY>{JkS7 zi`DXDm$sr}X9qWDaCZoL)h(EYuB1-GHEj*#3#Tnve6^jsT-|WP>f?-p{ka+vQ|3=! zE+iy=w!W(x%l9KS`6`RJd!X;}90lcO+s^f4qyYYjrU1Xfb_m}9n1etT#Yghu9Y5|( z@x13fph^pIaEtW2@{2b7zhbJ&*9&vE@KJ5pbTa|Q{##W$dehG2! zHBPw-pNkmL80`=vS!qEfQ_B*2Kf@&{rLW9%LgZ0F7#OYfudea%-sx4pN%gAo;Dr@M z$AWr(t{+qm@4qnx_jmgH3FVC0hWfCP$hw@=L1HY?+L!*!{rYC-j{28k+@5)aAE<&n zZ~Whho{wG}4I`7}YMRT+mP~4>gS6@9oadF^C7dGLU>jtx@NS)j_6X6lrToJFio?wX zJmG}4*^4W-0ivkB|DMq{2*T|J>dsgt=u#Tu=M?;z$3OOgxzQB_Ge3Rt&R%BOwsuEj z-+k$z_Iv=r8ahGEJem&}9srYps?PGkJ|b2{C@RO);aG|Ro)k|*b}^(l_Z%wne>1na zm95#sM^1ph{RrTl8=(=m30k(*WL2X`4#qIl${1mRu$qYr3^NohpsY$cR23xDTnvyu z@u$AJEHzYrIVyo612^vSNK6%x0U1Zmvj^t=&tm1{m6X%bRq3%rd~gZr`$fOAj#X|_ znBSFj4d1KV@LctJpVm66_MTt5Bdstl<^9(nf=nzHgVH`Cs^^-D_PmBL4fs!8UpjWW z86|&HF<7pfpth_vYoe{QnIQ+W!2-r{Z<>u4)!|j!SOSF@UrFmX3m}Q@L|$|V!HyYj%0n*_mtc~6ttmqyd~ILb^th|O@2aG4+n+5!l`>D5 zuOKp?%c_43zvLo!QdL?TJ|=@6bcbpj%>bwWhZSDMiKue+{T+_ayNO>mCML8I+ck-l zFx|}4-M~Wi&ch2W-G|;!cWZ)E==`@Gg%${XQE7E=zGYNAAl{y1VdC2S64E&nWgIql zTr)!wFc;c%8NJZ2DJrz>D89KVL|swg#THoz@QL|v`d!DdZkA6>TI7|O$?552SCi}E zknadrZR1erV(*)px%GW;`VX^0n=>!+ec<%?GN*A$u3=Cx8f+vD2cGY`3@ zobHcsxfL7D*s!DWeB$JJ-6pY<_$g=eo zXKg`bcQp69ziZj{b{9KU0yS*W72kad_Oc3~3!{ne#cdE*2%WTY`^~v7*(pN;zUa(T z@E0Ig?9aN-L)x0YJMkS=O`!EeIVZm*{lV%z+;g66IjfIs;aDA%bourK@GynW>?LA?YCgOL&3Z0CCV$okVy>%E^_Uurrc>Z|XS<-iayRbko^ zuqaSJ|I!GJlC=)=HF3Qpr=D)%hB1W?eloP7Gy?i7!q_Re>+fHqn6Ov_PPV^>l@skEH3YSUjx(qxq0dPmdSSLnVeG zZ6VAiFks>z>Q638=|}{5ftI|AdANM3*8Qr4nZ?xj`Jv~h2uOhLaruwscXC69iQCR* zUAm=DuQa63ZQNc;KrK(WKzwNh=Fierq!#hmJl?zCoj za(d#s@aw^sX$Ta-j_>{XGJg7VsS&nnj5E`?us{lznVzTIn_gQ7Jm+w0&mFwxc{F`+ zx_?MGEQ^-+u4waZq4gGD?0(!h(M&Eb{x1m^=xBR4lmy!2mE;~+eGJ>~C&GfAOE{T{ zi$k`7!eGpa`q-;tz_ttAot|RQWkPg(+W=taiMC0EdpFW#bqytmmq5^!VRUm)OiJ+g zc3XRx1^dg$bze+)Rh$g#e&YG@q4jaY`Aw{80`HJ`cLb@9fn>KSU%Oa3nZw!>cfT6JqM+%Qd1zov3M zJboFiQ5V+j&BSOkcn55#^(oR_`ugnLlh2nS+DbJ0hf$Y+H0nA{bn$EW{6pz;7hi%O z6^#EY`Ul$=HsECKI{{Aqm;(z5N;dJ(Wo@)ZFc#t;n0m1D`djK5cF-xF_uz-#g33Is zgj0$2??wbaPV07?ZR|xalO|P(c7%4-ifApQp+h`oGbaA}n) zIdqhQ>m3}K z`3bdx0agiWEXljhB-H7;d`R%q`KQp$qv*ucXq~|*c z$9`YL!hpQSqYZeM-1O5}86A(9OOy7zLiY|jsyH_hhw3uYCBZ^fyt}|CJdY1^4ln2W zD;s|DUi4mD1%zUD=1r}1$G$IbF5oZB@>TJ2Q(IEBYSP=33YGmdrHC!=N*ZpWg2@p1 zZcJhMfD&c>W~Xo)|H}iWlv!;{x#WzwGVVBF79h@20;AQz<^g)HJ5Aexdov?W8+EV@ z&fW7W;rr-TBEd_|K*Cc!iF%<$_CjW-*T~0rU4=?7E3muxbe|;&QNt zi-z*U(Q9}&hU)zu5h#at4tqBCa(0D4G6agatL8bp&=raNQWV*mZY z97Ax8a*4Ak7F&vUn^WX?AzdDKe)UdPl_BQ_w|)I}49zOv5#HsgeMn9+Rpa<|31LK> z2ut34b*F{XlrKF$mN`AGqHNgM9q}L|ckWEdn)wjdPg`4~FVuEnbLQV~iCD?_8U2tN@ zEe=_sUX}>qE3>TJ7b*`=iw{2}+{G!I4HSKe%r%z9(a=L|7F}qzy0yK!ysS`sjT5gc zi@SU9PUnNrDDoRdic`Zu?-m|yAF10rc^I5wt8vgfL6M<;-Xe#wL z`*aW{!AA|d*nv*5iUXHtA)WZB9`b3ia0X9 z8n1W5A7n+883q}HxsPK7h9+-IoH9B7i`5|?Ge;-r zHhjmQy+`t@{96WYS-riz>qg;wBjepGD}lNOo;^XMAssd=474B^GY z8*O9M&ZS&}i9h;)IhVN&m}pdiD78)oW{pQve+Tb_w$Et^p%6_n+D8z;(g0ieN9b(6 zXbj`lZk={@PQ)YcV4YwQ#ZMth)q#C-c~dP~fQPxI-P*W(-c(jrOO3hZ zzUrczg%I8Cz5D3w`sju|GjHbF^r^LkB<|x)!=Xo#1RLux-y6R#?~`$)b}F}5*LsxE zwD){@g12rC_k)r_Rjm7Qi{H-;v9VBmW>9kA2#$#ggr46x z@Kf9jCB83?-kspMEOpu?+sNjv+?;l9_?(#$bgv?OfLQ(W@wOg*rhxn2C*0FWi(p2N z$uMym!(n4%2n`1eaA0i4+nA}{c5YHh)gj;4FArUD<%=_1WP*kbsT{r|+`zJ^MkeQO zi8opBhg~`ksqpt55kdiuP)&e{NOyEpnsYrD2%Xj|WUqSte zd9atfteUlPh`p7(xk`yqV85vl!9xgL8=uws6^Nt(Od{T0>gzcrTy#QP0mjHb{JvIC zLX4s-_wM5Ao)qBd$b}?mt4t1FJ2yspZ{blbVfg5RgIPhbe-0*^W5Yfzd}Dv1Ku1P+ zG`sI>F9~5JlAkPJ(onB!zl(UpPTjXf^NQ6)9R9h;QB5)uYsZe6h_bAl_I)R==XN(3 zKG*djr9m#$lyi`1D10V;pl$;(F7|SYW4k-`{9W#1@=i{}7bMSbBHG<=7QF6eTRycr zQ=pFW)5I?IyHN>zB2jAQTiUW0pg|eD+n~crAFv-qKRG|MLeQnl?H%@ex*iDZ*&>fL zH2B^tJ>IFTm}^rARe)ws@Lx?KUYsg|d+BkHG4ZFLHMNr+ZR6pn8N2kdVH3u12{o`G zX@Gj3in+(+F29JM-eX7Z?T)qg_@z_DW1_T zB8hMC0xJn)`PN4-bkunmZmy5+-iQq+)7xc>r-FQ?o|t3%OE){ETC@k)6>yH$vEVvr zcf3v7GAZLT!MFk$2}x(z`1TkBP-&{7y{;k2-I3Ob5~7+!!?q3!u|wVQyJ)LVU2SZk z;t;hK8s;2f8U=X1H~Y$7er={ApU0J|0+BljJ2y22%MRvPvSwK>6W9E*T2LmIe5Mt$ zhlkz&>M5T@wA!8CA$6=x*UfTuIZn2AZuM5VPQ|viPDP#G{-lt#*|w5?=GXHNa@|%Ef5-&+geq39!F+&5J7PMM@$zS=21Ph>HQ8z5*=hN* zprR^d!Q5iE>mrnL0efNt4K=g!a=naKE{ ziPXt)3n}2JzD@RyoC&uqURlK~c=FgMGboarLqa5olk(HZQ>1btDa4aX^Ku;)i2a)n z{etDTe%_xIu^|*MytClUrtj@;vopS$5q!xTYTqSzVB@n05G9XB(KJ_on$bDq4+;=X z0U9PigHS~?|E#g=*-<79mf29AeYVu^5*69oAfAhZ@FLhQyEn5?%|Z< z=v!Njz*$xjM{Uy32Nn z*n_mL^~tNew)<1D$5E?;hkM(vvkO@}J%c9<4Ic=~S#NFoSliAYTt=JhBvhPd-!I8s z{!(8`WIFEK8|5ptfstlWBW>GU-ht_^-<+`@*CS6>;E5WzlqW2PU~$@HqREm zw414*)H0^s+Wf6ZQX{(I+Fpa>XHO54Vb{0p6P}}WEnCDLM(8LE93UqTrd}Gf=2x1B zBoTY>lEpADXDfgrA?dJIIgW1V?#$UH*J4KXaQ>;iXZ#0l@4BtQ;l0sFEz@hZTw+8Y zMERPh8c&?)io{3K_?yqlcr|6b6i9lX$LZnHHM<+uzu(z%&Riy^^TdBAq#DTDssv-R zG{M`cZC?9eds@gFEFyKVQ8}o{?Z?KVz{#%K*@nSpT~l*ii+QCi$g^*>?ZWlR_2h%& zHweJ87`5E04|Q#EbLyB@?rwK+a#|fVrDMJdQQ!?xC)IFPROEHK>Fe76-m0j~soAf# z{Q<$E@U3Hl+dHtS*sMg#+(^aT z$T}p|FIGIRR7$~`CL()kotk80X>oRGF;7ihFCs7ZjzN@eR05t>0Yoxt+fSAO4qzh52 zpoBzznqtk1{4&BgM{6Sma~eu0F_d6-4JHm`1p8s6#r9Q-+k&UZ#}@-o^Mu}fDTUK} zY|(PbK!sOv4Q+sxd(`UWZ_(&E*e0RN4!c~8?)_cNXC9PShN*WcG+w({?`EYU{%I0B z%FgiX_QD-BH7X-#`sdN{S%STc>GIhu{gj&wPpQ*B#a)x{u(oTdxq2+&b&p|kVrYG_ zMMZMnm_a7uXRkOVf7ca^+GjZ#eF?3MqzaiqYz&gTGIC2C*)*vY1Z$3RJGeCr8w*<; zV)eC%>#`dr&uC^Fsz_FcAOBF;%K3i9--c^s7LDSnGGlW{JukJ%=;|JRc8keJj}KC* zaXcv&@S?@C1X}8Y*&hmz!U#J*St`)Jy30#Di^GtA_X77!D9>Wne1k}tiR}vlj&gdKxg*`)#8m0trj31gXNKcdWCqK7 zV=lSnjFjh{?+MRT9#4P7;7i2TDGcNi0(~+ zwHd_AaS$WYC)(wA_Ai?=CzO96I6c;soP2B=78-rI7R(~kw3Aj|>C%`N(PQS;t`w`h z`_*&X;j5fB)Vo7MYvUUPjKpd#7kTSO&eXO&cQ)uU9lG@liO&)sC*_xt1b)}ZZVA~R z*81kZwZ{oIfTq!!Qf%Pw->z?pIRK>c!q@ z_~v@+p}Qz_Ma*+p)}WFt*Xaf~+GT|d#cUsg!HE`(s}X z9_}KwwSWj61VIfvGzAbt1(y83)EGO>zy;TahNX$?dx7F26kEr&ed{PSwtYtU0^pyw zfB!rfJ@`Dlvh(yZZgF%{#^4CGMRj$HrV`c1UStkz`uhZ-)pvv+NNx0>dBWoC&&{qV zX)OPF0ZUr|{hEzqb{@$s%cMMlE6;YcIpeWEZ4D+jV?oM6WHeK7qypF}DzDBTKV7a> zn=xO@Q*5BH$nhy_L+-|Ic^Z7RM% zz@fV6eE20-|LxewTr0#qGyusCq-`t8RNR)0i%DrtF( z5`j4$9J=!o({Tpo3pOQ6R>kKG6Vd>1l|b8ZR#x}vr(id(N) zvjf8P$tNzJkroSFwk!D%^0(h_S#?qP=yAw>nbGw@X4N^H+5)LC1K1fc_0>7d2w*$H zoS_$IzfL1eKy0ADP|wJg(~|+1A zi5k+O>|ZybaEb|^hxyI}*8=FfR-+Eh0iuabh8; z^_RBOC8Jtl4;dfxDxY~pVHD<)+Dyr2mJ@0FhO9y1_0x){rsC;C!_ijdb*YL@?Z7IlF5vx2ikWt~ibuyP7O33WNgRSiKv8nU` zUxVoi6v271#5w_l21Y-Rb%-^%nJAHgDz`j@3&68={-#7ZEM(*Mc;Q}srm$&3-IKx$ z9?9IGUryBg20kn;?Yq$8M)V?j;O-PD8PSEtoP34B8qx@}R zp+Uz+R1+Hf_>lDN38;QjBY^Jq zVjWJw^NGMIx=TV${AQbq-AQS09iYZorWlOhIGHgtNbwZp*uPBnJaL3o?S6asIrQFP8F!TI+qnKB39T@ zcLH1OZX%VO7KSp)p4;6KYWR=4GJzK6rew4yvDv#RzkQ8@y(g=AC8lz- zWGfbNMoRmLLssuX_`!V;mH&9DfVp=K5tgHU{&2~thjUVGn2BnN>NE}LtV!;y(WKYn zEtxdJ(kkYV;4>>_O21M4#}xc%P5xmP?i&wOKQIYotQ%>$UjOS)QIX#_T@NcJcvR|o zG++>JHo*}9Wl*8|zdX51FtSvRuQ=}ywM`Yq@<{6rW+z+fL)TG>?I#38*Ow44!%;0v zo7{pNKCxZlO6$xpW=A)qi&;+Y%!uxMa~FL)83Z@3a4mvJg>yu7wt~yA9;0k>iMY`1 zW72P{2#3FUQU2JsfYdxs!lp8T+U;p{jrN>w!d4OrD3G^ykmqTnlw3JYZm&5KGI444 z;3mIbQ*k%~gF@kyvP%d*Vz6&iO!ZtBbHm6i)nu+E$0}E5q}X^JJh(Y(d98uxTmonF zw$O_6cimD+MFf_|(R(ydv`e9M(Q`@4C+n~Pa9@A>3aMn@OPp`z=J&VN3F6+$*`L0y zz&*(fhJCLP5mTb0ESvIn`q+)@>ui&kjGL86@Wlq{U>FJ!N^RX^U4o&Y>vuY8P;E2{&BFs zAZLK$5G*yK_!;>5gItEj!GkoTMXZvwXAe)c?ps{kuV`zqFA3vmmxF(cf+-+h!j2U0 zk*F`h-hfP#BPMTYFMmh)9$S_TquYUCvF+xg8_Dds{8x_Z-GY$ zkTExYa>HCa5knWpJ^MUjiB88a`X*BTE?GVIOhG$kAD?!&4}0#Izw{o_WO-z{I*M`+ zzSCH~gS#aUsB*L_wW)F~^mDT+aCG;6?N=<6oA2-Mz?`|og+&Mr@Zq?wzzTpm6=gh> zcWbm;XzPg&S28#Ms(-PuomV8rY1&k%hyqIA#0djXJt!0r?RHMK0s#7@m!OYKkF@v( z4kvfn{$ufHuXl64HLa0CBPIkf8?Zv4B4TOio*b{0i z=u2{hV{oAcbleBC=su5rQ$`Ewyy;|^h=tAr&WFa$>MeCN+lt3Bho}6JG0|L8 zDNY80xci8)Qr7hHNHQP)lQM9F-H(l%1kUv1mGMZ|rG^T)5aYL;7=;!QMXKkdp?AKU zi%hTi17_Zso}glqAVK6^r*my+7cwE5S}4tY%`7#!z4B4%1sz@w2T5Z!2R2HGNuE^M z7UU9Ea}?{}m%cEt;I5>v2fIR#_Hzm0j{ti|@nkbvGg>h*jI7_#P_&zV4!Y?9gYoLb zNcK_Wd_saYbYwSrxmfOOD|>Vtigl?(#9NF7>%Bml!loT8DBsvt$^vE3yzTGdkG5^j zy?_al_im$E%)kRcAVPG*^{#oNEJbX8RA+KqxbC5l_kDbm;Tq|ND6`Uls{J`v>tG1I zlz`AK-0Yn3x`i9ujH?$-89&=XSF+IRfW!m%;`zh*UrT>p)_x9-AUrmM^T^dXh> zXmuxwrxpxHg<(nd98BRMm7iXgB$XH!^G23OMBSh^{Q#c&AN<6nFsRzY(Wlzoqu8M| z)G_rxaM%VBQPu*&4`ej_b9r^r&r#3bGc;!r?z&bL4%o(JmhqvMZ$ML;ATG-*R97ln zmLF1QUh}#q2bM37qmiooH#`5=^5;BFuL9T`4$-FIJzIf40}{8I?!D6t75)5;bhNQMJ{!B!a9Eg!uDy&EO6x}-W6 zbs@%7baD`olKz{96Jh@u#xHz{Pqvx%J=X3M*)%O({@ekf=Hkdn@ z+YJScIcdSK=&72%HI9Qr1Mw7JrqTRCjuA`}s{6$<+%SPz(%oJ`UskJE*4?)=Z8g$r z_rG)hCZva^#=rwHZ9`74Im@%3N{%1q%5HhNSf?@fQrS8z3ZQ4_A(l^K#Jk-0 zyua(@JiePz_vpvyyR(`&qpZFrWh69=B)Dy}1F~I!GShw1h%<4n%q|6^`Aoq=l~GJq zu5H=q7~9sPTP5^XZNCc-l5WMUwF&^yNsn$f9|u2>@N@|x!$p9$bG{&u`G=jb$|Xa* zyCSXLcCQ)pv%JgoVtZ9lZdrOg9S*g&-~sQ}2Y550?T*oA(hTWxHQ2XbWt_Fo?Vip* zb-yRrUFSTu(Ko0483A>_Be-Q70etrA%Pu#q0Y2DuK{xgh1YJEs=Kw2$kjto!*K-@!?RJ-OH(j7CcCq6BB4qf2O}TinW-~ZYD2UEzVQy zsSt6edQ<4Ni^I^j?XgtQfXIr zs8T32v4?*J@DPxN=R9-{ae9&k+^0O+y=6M<{y11xJZ4BU_TyL0$Ve_STN=(#k-oZ~ zb+HJ>Wfcsg56nh zo;*qFqMqb~L30=IBxYg0C2XiCagaA|^d3~Ubx=Zns}ic8X*I@xv?egWf!r)$+`;Ie zsk3vzvO|V#v8$;W0q_6tUEYAG3%8VT`|TML8zw$$Pk^zC0A|ylXAFM$Zt!aJM;$w% z(Mwp$aq+PkbT;?w{|@S6Hpktai}sAzb=Xw>zE@doUsMpq0~N+oAp>9^(?qCr z77(b+*Z<3vrbevclV6xU#Y(QKW3cj>`GHd^1+KLH4ow@tr^^8URA1hVwD=U)hNN0a z2*nfZ;4w5GDd@^zv?Rl5 z-6GgLtL1!L?01%{i;LuOEYS<(7Fmm#Su9sAu2QgC!eXo(wVWIlvKE*qHLW4?gIk2<^-|~Aov!E z&;U+2%C13~KtPkWY7)m)+&`QAtnWVJADgC`Up8K2x_3_B&1-l@O9)iZ>0i&J*Gzi+ zYS}#8z}MjH0KuH75)g+n*#GBe`nF3A04qP>wf+erw_a+QTER^?GRks4F5osiW0YmR zdCRhtB%K5rE5Iw5gC&6&gJ^SIh$n)NPf@|kdeanUzS1V&NexLaW3VnFo}nxjlz8}U zZNWBF3t@P(m1s=y434G4*Q2rBp8#u%>{h&)l6!Dw$~!g6)PB49=mIwUiUK2(;H zY6%epqMzXJ|=gHZE7qYJ-w5Y zmX@7%G#8*WgS?V}fQ_Z&dIEzLcp~SX&hN9TWcYr*sF$xrk@U2xNW=OouKeH+pkDi` z30}{@!nn^BUzm5JKGWcgU(=hJF7No%VhB==#1fr?1JV5F;pMtsUwr-k=#Aj*4>z9N zB`^B^!g3Zs!7kS7bI z=&>o+YkDX;o&54N99Rm~S&q_AwywqsKlp1ERFN_$P6m@nx;FIs-C;wKc=~|0ul(a) zZ+P4-R3*}xjjSJj5QxdRw<4al?|80DTgdQAS1>~X8U*uzp8Zm7t2)LbWcrb}gxl08 z-r0Lj5*J+8elGf7Ca8Ar^YDewWU9MY);k{ikZPw!>yG`M-N@Ppv%A;tyNQ4A8c9V^sr|_w8j=MfrSLlmFCju$pqo2Aa2aU`+>Qp-(2SB z`CsQMWWHzOII`M&u}3%osZ0#bcjNXiA_AO$)9i1ab1)90FqCp?xJT2^OVH@ox|ODF zjgl|eVPykWGcSxZv_@m>wvS}4(y6YX@TphRVilRH}#2y zrk8Q*39ld~Z{jta%mlZ+dKBSQQ4Hh zxt7o|zZ12yRahbH+n!uvmHISXYm9hZj@^`U#caXBfg(GLC5LiFRCpg#RQRS?VOmkq zE93P0*)y-YniKT1pbVjU6FcL%-W{|+_?OPE+SP1o=4?l6p4@LrkEa#Pg4~d}ko1(B zz%;fmu%VLJh2obz>sp^^T$PF7hd- z_YHk6O=XapaL4z+=E!BbR*caiWvJRl*<)ny?)JVwyk95TE5G&Jm{A*CKVEYM{^tv~ zxIDJqVQG=5D9s!tAKK#yx39IY4~N(I4Dv5o9oi@g8wdt0bNx==fD9S5q{P^j#i|yhN2K?CI zUw&+O&-3s_b&Phih0K|#1@-Pu#coz*d96F}_V0^-$o0D!3v6Ef7piVcMYn48g6~}3 z-+HorHTFskL_v=DX^jN01VZm|7JeI_ZvhjN1_!bF2580KlfPKHItqG0K1{f`CHcZN zQM1LB8}%9c?LuGKj8@U0)=&89|M_D@^Y7~4AN~AcSblHM^!7-ZqH4{Exk)O|OP?8U@my^taD_i7Vg7qr3uf(D-0#3l5Py7_eTG~3+D`txEjO7 z7}Ski(zPqQs>~A19{xs8%#)U&ap_%<>+P(o@>~9_iI_i_bP3kpWx!Z=Rg6u-Z7e>I zDutCU(X6>Va83Mxf5CtuV;Ozr8@7He|0B5hX=_QsZE(Zwd!9O&_4oVqH%qQkb5&T|Mbg$T%=3_I6qQ zes)dG7M+h4CF#+<`}5d5l2!(MWw$R~ak7k#HOrD*YI@p#D4>ya9mAE)?!dzHhgu8U z8XK*?+EMzAs1WFQ9TsBsTUUKzjhv{@r77TU*LkaF|G*`;{Gry*g6pxtd%Un|Y=Zt7 zm|q5P5j;9j!4N@@U-0;{Z2EX8B&&kSv;hP0-*ct+Nr$++u%xujgE4a4U8go;+u1^|fF&Vi1&?|1yU(%yMicqgXKQi!7Yym8I#N{k$=`VD&aQU$|6Lk4D z8Uy$OD(G~MbLvE{XB)h%;=<1oRm6)Cy~o8~%>LBj2`_UxE%a>?Ut=2P13>vBE`BWl z9t?Jc>+(?xQI?eP!XW9l7`HZHz9>NXAKu|DmdWz4S6@3W$CJ|zrM#zS;DMz+U8}!i<><-N2Fo~6-ncCZovFN-szt!vx>R5 zCE9s;pnh_0@q(yISyj(?9#TEGY;d*7Di7jkg)>~Zq+ zP%1FT_ppd{Y{P-D0D4XBkw3w9=QZud7Bf>D4sJI&Y$Zc+u;ADfD19vr1Oyk4``-+4BZuy?%B#pl0$ zDOuWxl`s>ugIpnM80EeAtkLGXEpEWIsXJ_R$s_N5N8ngjFb5^=GTB6#UY8BZITNux z^C{ZB-?8r?dasd_##ySdblghoqY}BL*zPoTiq7Citu&EmL4g;Z29P{9yrrtA`uGb% zLox38%?MohH6{W249%x#4YG35DY|_2ILp z0on^ZmvQuk<`PW<2k0FZbVTvrYYeF*j1BA_?0O|{xCj?rV&lJW``kXN*;b2xMwpj&nvcSc zNL2l7wqn&g>d-t^tgx~aUz8c%via&=pyAIqwk~uzNRdnZ$Mz-N3<(dX81xFG-0Ld6 zb|}(*1Ss_Rgv7HxR*CQJ6AP_NEBNe+CU4)bm-x`9Gd}C!X_VPD!vcC=v(ol~%_p%1 z_bZJ!DTklc^bo1?m_~({6QvY#W*Qh1DI94u36aUFF28%Ga7UPyLXIJ(uORE_Fh$1X zeWp*-akJ*dSy%ki9L|yJMjS#*$FWzl8Q*3TVrC16?fz5}_Xzjgzmf6gTKGG)R``43 zCwU50kMas#cou~QG1qHVr?#wxYmP;ZT|`zJuPeHJlYHx%rEo~e%8(Lnu_A$7GYYVK zpq#rqYF)jSq89dPQ!imEtGDphzHE%|j(?wJWSA`FSE0PuuibV};bjgv6}G;!0G>YL zI5cu@)QasA(#!Y;v7DmI0@QgBBnaqt)rWdFy2N&s>z(qd)U`dvhHj!^_ADZvTL2;S z50s|5-n95@L#6R(if;SFnOnn!ug&BrFUn$)>Pt}n%SnmaSY5#_lD)P5LtB(=GN!y_ zWE%_^=7{^p-TVI7+vbGkPTJ7rAT*9OL@cNjNNRBOb(gAD(>yKB4oJz*j-?wAUpw>a zBS`gM!ax-pMx^R}`pD#E*PMY@sQWPJ^L(U4O_8?EMb626jZ|VthLWbpDj%S|M~(Y_ z4pIwEBTpcT6*RjU_;V12f}x_Kv+#O&#N)_BB-z&Z=6Yv(;#HThH0G$A+PP|>CYE~P5=UwQcAet{`}svUBbV|Gb5N3N*GlSQDiedl5wlfO(r=O`lQtkw{W7{Jt`j2m3hFN0Oifc>(s_ zi-5_hzyP&tw=f5({qtQjqRE5hP&n>CrM_QHj)_E1)oFBscR^Z(RxNVYrW19uCx(QL z*1jl+tunbfL`VTnx)vv44^F>iG8ppKWeUokP56|~x_RhCF zevG$nW{#Zly@0|9H1Rp>s}6ZS=hK z{yEI_)d8<(7Vakp_Ka#@(Tk{qM>5MrB43h4`f=P@nLDW0ulC1UJ=oQHWbA5yybIIh zSte##hXMEgp9)z1n$7yu2U}m~3+tDl+Zg5ZZBZ9cco-)EY#JjBP{|Q@FY`5qu%YI0 zzN_Nm^sRiIJWVdf&l6wQBX!Q5Oj(fR=U}Do5bT#{RQfW{sP1KmtUKss>}aeOBITe~ zS{G|nn#B|s)X@}l`2x2tuX2$o!2{P_!skDKI!!(ea3{cprXuKY7GWR+y+Z2NBf(&2 zvckvo_y(cQZOWlnT{4|cx{zHomJTT20toIuH&1tceukrZIL#t_e0zlk6dKp$@PN%P z9TVZ)t3kv zCd&BmHLinBiCqg3GhQhx1nTK$tEu|)fW7zIiIMx|eu4?c39nm0ZU8~$kJURdvH6_n zZClrmP|+}y3;ba5hD=}=-~1L={_>OjA8SACy^BLSh>WFB4x~qWTN~kItef?jQ_Yc0 z^S}n5#ch3z1~Stuh+K^KghwKyT(>3MWk`JkwA)*e?xMTd*~4wV|H0;~^d>HGHN`vh zlC^6hqZU6qxC!&BL5{T;5Ay}fPfbiIK0~Tr>){jQotq1b<-L9xTU0r3qC&xNSF&+b z9NG9)JF-aGDJ6xSVpWU4Nw|e!##K1af=@7p8ZSy?jF59jaUh|(a%!%W6nT|$rAGn} zV*26`um%qVQVYfj^`F%P?!NjPUP5JsSviBOu+Xx_FQ1x=1hZE~{1Tui+wiIn=_OY$ zz(UbTz5wC|q1r#h{T#_cHx$KH9k+R=@ZpS~GJ5Nf*~{x3>uZ?Cy8xaWB>_NDW%?n?dx#I~ zu!sMq7bCaK8j`-T;oEAnc4t&oV<#!CDS%#n*b$T4KC?s7%YJ*gWU~7<-hwa%bV(KM zV(#BiL+|z@7iR~2z3A=9t^Ib~&RAmRf>%oughj@?9p$8;p-vrY52*O`(vOmZ zmGS^bBgf5T?dCFiHef(gM+?>$msOU1QF#42*y`ZR?5;i=jlGnqqWTNP5Nd)D?)R;% zNAzp6GikjWPOjqydW;~73q_9C0-^qQ487+UyzuqkarA!%vhR-)(63-W2ice_q!rCV z3=uc@xJ9!08C{I!E=WY@rlsn=d7Bx>qZgnikFLidBJuya`^vDax^CU)p}QrO5|Hi& zDd}zmk?!s;>F!2Qxes>x>R{R?p0M#GOp`AgYO+lUrpy@w1{3D6Gsm&+=psW<(<#j7Tg3JB z;-HKUuEGi+GaFygNC`PsYh9k35n0ldz7CR4#l7%Z zvgA6LV1`Yj5rTCsyhCd*20$GCPELy`CxK7ETzpWEHm4(%?9)kK=>h80n9YY(tux69 z-8WsU)ikQEK!b(5fjsAzKzy6vogS^eToF2(doOp1@5^-`6&Mx8)OgZJB`6>VGB&NB z)ZAT0a}=!ZvrH0+Hv2#zK?R$AtH>Sf$C%~)pO}S_84P+p39DBG9MJ#BD58*A9IM3p zAt}qt`&`!ds9b+oU(%(^^7+8SH_wXj`~DHP8*@e0*30Wt){^Yux^SRFVsZERK`f6W z2-<&Wohjak^i;rF3tREYj-C_T9uEclD{;nLCH3OlS;B|wTvsl~)~hRqTGC>EIMAh| zc<=#q@Iw*;avEKxAro61;aU+axcTNVn8&t-B-}kmuzuRAs_(H?7-#n=-zG=J7T|NpS(3aED zGHKQc)-fRt7^=@-BMC_RkaeutqTiM6d{B6JVkDHbSx5mMfmp0AhW2?g~?jtZi$oh>z@aIvY%4RNA!4~ge%cQ?+YCOviFK_8yH-9;p z1zNITL1FPv&;NexaM*N*AID%-80B?TeVOjCL%!EVjG;q=@(@u0pxi?g_vpKlppu|s zy>Qrmo{bWWzMGkNpG`f1S0i!yNIzsd<*1# z|JsECX!Ca#_s1lH3)(Xk`UY z1;-J-?DNi_WY8ZihS1%Rs-QJVP0{DIylpzJIyg%;fhm^%p?K>cn|nd($D0N9A@NM_ z>*3X8qh&t)5$_z&E7_D%5dyA8l@VuXk9O_ZeEuOk(7C?tPpiOrAW3*l?WAkgEtot4 zRTf4MqDq9BtN;w;A4~ZEL&)%W5ll;YuaX`=_)|#h<9x?W{}|^?on`85ak7X*XxA7Xi?W~`u*!5C|SJ{dNq9+{M;^1cli zRl|lWTsk3Q|bR^2| z8GEfzrE~4pQ-j_QA!h>!>xU%u!zYMDNdhIKF<-C3@4w2U7xVEf65i_I+*+;$8i5we z(X4@-?|=dDzxnfd&8zT3CdBG=^$_Ak@eIqx%~`OD7F_f?bQFMk0RPQC1TX%IcV}*m zeV%3H^{ZUl6|U(V@xQYV?iPeyJMi)tFFejh?{geY$0;p^QH^9H z`mDw5GA{RyYG_X-3n_D@tS%$mC$P95+3`R%p)Xo~JQ9KZwf8_Cq{7#Yr0#a9eb#;V zwkCedJWTvS#1yp?hrdm6$}Hur6$F7~Fix0KB+%Nu#3QJNSZF~Yt`xk*zwbSql+@NP zpSO+G$dG%DX~PO7$s3Io2T(F zbT|yxc+@~6J*a;FUSS&2L%7y?c_#5}efq}W$x(ntx1d!^_bnD^5*Dpy0~~Y(qzzi= z*fcDN>Goo{AkE+ae~8q+6L2C#4g+t(sp~? ztlwoJUd07aes4nW`1g0qm{6B$a8DhX8XBA}&^bP1(3;O(A^Cs`ntg`;d<$F)T)HfA zUk`QYb0QbYStu##wCe;fZH3Xl9|mc1z_b4UY<0SM9X0I?`-k4()i14jeb2h(F-?9d zDrT?5+FfZZLUZh@`l4*utBL&G-a@T6?D0OvT>K09aZtp zAkZif3mTzG2tn~WJce578Mg&A`ZgLu8V3wKF}qe4mG~k&BWwx+W}#1grZ>0aNNc6K zYb$(ZS*$W;4RRf3ZX;s0UR;H1tArtK+Y7T-&H(r&_nT=U;5T0YD<{uwT1Vz=S$(nSsK0{L!#`5o4z~Pv)fio0AeZ?6J)=Gng z2esiZ!Ct^?L(9+*@X}KC%$DFPHK|=cl_zKoCKdY#gKtJGMYZ?~bX5_#ZwcG+%J|mh zfO?U@1|DYt#73vUq)*a(Qjq@HOFE7E%T^@8d%pJz3N5B`W_U30@wDt*Nm23BUjE)E z`*L?$oo#EP)V^AFPRIi99{oxhqgQ1g0qS01%HpUtDWat9Syf(eu}!~V)Q z{Lx+w(w6&dE*Fvg!T#%R8IHVKg$j8PQa@kluRtx1z?ZB ztOiGW2NQtW6^CY)8lSqTSgsvXl2d_*vmrY=Mh6+DlY=b=xD99+234q`sx6x=ni@X_ zb5^H)MtwO(6)~d-D-sL^s_9|T+k+1Q?y0}+ZgIR^oi?hu@72Y!;EM65O?P*HNsf@l zhl-BT7UgzgK_2VVFPpgQHXa%qoD$aUKVOp6ZB}wCyi$FLiDhkY1u7r)c`P(5d>bsQd)?u%5q4jUx`sNO@j(4*?H z}fl>Q<>ALEHCC15?hzl59Zx zC%^!Ipl_D5d&LZ&VJRAF8N0F}iAE#_+&8=#7+^!RU>Up_UB_bGGz3%J@H9+G7&j+d z6NlLuL4hDNgnyTfAwA}#tIf^1o1cZ@MHAs)O6wC8;O?T~LEX<#U93V7fp<}zNm>N( z?QNN*&Hmk()whF z1Eb_8Za6FRE_S?kN_;r(^NT?mf(p|~M<7a|aTL)DfCoyucTnx7@6KI;#7lxUQ@j34 zE)a4D)GRP$`1K#T3c$^kyjtBwWHeTZZol!k=_;G(=j&>WbON_7p}q$SwLlsE(Hnk# z_%0rtPr2~ES?AvpF6V+X7Es_3-^`E?#mPB-lR-gACq3aw0C0KsE5FA$zdzcCmm(ZGGr%dl#3aTMYCoPzdk{R#I?O z=DjvQMpaLO&}r6|3wN34yF-qS1_#~4nu-YlXz_pX8k(gyHgZS&=8#1x19T9S$4?x( z4+S8cGkTZ0A0GR>hl86!pl8Ls8e|#G9ogO6tC^^!46tnI>5Zrj!Gf?wQ4rUmg8}H{ zV_^3f`{v@bd`&;AjaO=?HA-y@tPO2>1yhk6*Wifrt~96iCe}r?D}`fk`0$tPw`X5@ zd*h$-uMy<~ab`=eYli15q=_x40-QbwSDG=^y+Lw$gW4k_`80goQBzo&y9Y#@?5I6D z%jf70DK-8|Tbq`U>_{L>K3#nvo+nMpg8+$^keE@pGo6&OqLb{X0<%I$jrmLuPLa3^ zwD7Hr25AC1Z|Nl&Qd1+P$N{UlMGfGo3 z(@It2s-IptNI3ZDNLlDevEUVk2iLF-s6J4%xqiHA&iacavKcY}%r_d5u)F2ZCv@I> z*M&B~ibTta(6RGthh}Fh&omhyK+A2??i6Gf^=y&8{sv|OWhc;ri7g8$Ovp?3>3Wvb; z#i+SJ$OiqFl_ZLD>Q?bFfGo76=i&#XNju_Uyc9Q9kbLlhERc`QG%O)d~EAQo9hgdew(q;PYIX% zyY)jY72jeosQwZS>9^B+43_=F1|q4ZexBq{uRPhdmFF#EoBQUV?bY@0vE#d_10{f= z`U|@S+^m-X@P3<7Flxly-nO?V^Hu*y{al0lEKhDFT_$HBtqcQW*ce0>s>I-po7u9< zGV+^_Su1M<>A2g38P8q3<`R_PW-9n+cRfVd!=bMA@!t;)HHZ@E3wY+ zEk}JJV>&Tu33VAz=R=il=`RE7Id^)jFh;;XwbYq+sle%^WYn_qYZX9Q@PzIx7U}x?nt% z9v|H(wfoibsRUv$DGSY08jB#HSkyA&o#Y7+)ZcQHf$)c5fEYgpsCfP{%%PiPlyW+& zQt0f9M8hPo`yCYNPiyQA0LrN%CFFrksBeHhwZv=z2yT!IjqIhAYK5)J{G+1$!wN*A zM6{HAY`nxR#7>Q{E096IKB3|Q78B@H{c}}{gZHv2{qWS;(WBB!IK+QRV>g{;S^i=taG7)DG5fa*k!@ z52?P3jAAtf`!}XW$Hf{VmSIv``E3GVdEg>i@cSYdpMe^+H{fu}pv49RuO~e1R9KZ;|5JvGjK=8)_4rTB*)H&c;E}4db zd~{Nhh`h-I*{xSCO(&3O1!8gXF)_-u+{nRg+3_NBJ#Z zgvn2g7%wVT-FaYMuz(_}kZOOIs{UwE=$=giZYRVUZ;#5N+*)VnIjx|Slv7T>1*m%( z<&{;`J`iCp$Nsm%k@?P!$z|bV3S#A6zbLOD)ZY!>*ku0a~7k8GM~l& zj)NQ>3_&C#m#nklmFOPrlIZH3Uq-W$vJs!UGM82XHIILlV}5r9gP3JtssI)a3m|;! zneSy4w#?}*fVf0%CA?r&SCBU>0fSyozz_XnbCOR}UoN20&JX09-}2IUklSzF)Nz15 zaH0rR{$G`WA-$hJHapyTJCj~E)(Q3bR4)k|&ZJ17U_P>$ao@|y+b3N0c^*k}uBgsL zDU@(ArlYAPe29lp{p8WV<`p30b;aWl(oQv|e_F#cYk{N^n+B!&?bD6oRNC4v_YNwH z{LJ=J_m{sS6cAN~|5Q8_$1TaCnC3XOE?&@U9tTaFe+-A%@1B5CT*ScJP*I0~R9WI( zGuE!+>={u-L%be%733=p0C&k)F)EM{Q=K)-AF)ohzCo!C0TF7U1(-hsZf`ngN4UwX z4QgmXm{`!p-(mg501fIt&9KjL2#t&>tSQy~L>EwSNtWrt$++$7`rf!P(15dVK$9e$ zo9C<9)rZ6Fn)+l-@3&Sxil+OzzdT4j@|D@MsrHkmC`fdUF)OToYW7{1hAorrZ_s1NQHcRQ|W^Ik2 zdNCpS5N82Kam8@4RH`2Fbn7$|-r~`cTpJ|qfArbH{)>~E32rfZp z(^)znAhd<(`3KGD~v4iR~Pp2iH;TlVjlZ2C{>7&cg0-7n4OfZ55#zsTQf`o8Ki7O4AiB8 zWX=NBk*?D#G@{(Q4Q)<)(z(Hc-l7h7=nTXmBXeSNP!bt}T~!^RoJs0(3hR;>ZQB}& z-=L_W**vw+nWL8w8DRM=`Iz66_a6vVK5f{HVIDWTyKevPLdqP$?g?^kF4a+Mqt%$2 z>J4Qapp&sUU00b=&efXQSG5oG^a)qXUZ@z~Yo92{DWfg2eX<*_HNn+X&1L!4cqEIn zV6NWKV|ocYEx7K=>{oPs!55-T(@2(rG9}eglhPLXC#qZ~g~(5v3(L9%Vc%D?k2QN3 zg)XWFnY2xRw^qB@{x)CeI$CGM318`;B2;h72Qz8>GughTZth5>t)Y_@PRW=zvy=tK zNrv(p{^qQiTB~!o9vc%|o7%``NY>{yOd5Cv42$vZ7Ch7U$V|kyzNSw7aIZaeL%llB3{he&ooL{UU6WeH&-rue`crYLMA3=U1vy zbT^z0iHMNbqc+OTVO#G)v5&j_IBuzB4S6&RFc0KgVFq8^1b4t=t>9KkVuc&TH$*hS z5To?yq)Nv{YQ7D=^CB3qXVcZ&ur7!3lh(FNt!Sh%hCgmsCMQSmOIe()sV{Aq2=~4)} zI7&w#AEw=O#&8f@h#xcovfwl5GQ$Ey|$seYjkhZ^!CU*p@2*hoLy#w;|H9ukez ze{ojk{?V^-BYiBvn4BSqRaWdN6JBv-mt)>7F$xbFzZrb;0d=i@Kqa-0p7vI^iJ|NT z7t{sIgr(+*P)I%q=GSf&MVbHDDYXt#uN9*y`6+CNIEoV!w*A5J3+&{$(aSdYAsHfp zZPfOrbtSPFYZoc`au2%~bN9l;YH~gmIQCAv(O3V<+NO_auZZ&7^hZ<9VbTA7QliY@wcAJEAy+ zFXwaRVtz~At0a0$>yf{43|X!qLX~c`Zni8LDyvcHO1H~gmR`FsH2n1oVZGs$8Ly1c z=*J-mXNoP&C!HL7$ItlUsuz1$sE!jFP0t9vds-6`k9`u-e4EmJx+UOk9`G{H1((sA zF^CJryL%fu%lTR>^A*LOc8f;o)ZCnWgGafHY-kO3k&*XY=KBvHu#wRrxA>MA9;<04 zC0+aj?zZ6AjO*!53x#D7<*cOqvlNaw{V0N7FWw+E*B^G|!?1Xyv*j|q*$v)VrS(gv z#!ap)BuzoKz1#9fSClK27#S#OOu=$RmBIEfJ>tgYMEr@z8}r7-=;uSzv2RppILdgqfVaI7q@*v=JGk=o>qa-ifLWP_eIu9BbzY7=U)AL} zMjtYTk4X}&A8Vdl{c`Y$)WP5UHs!h;5ZqSKTM>9qYkBAhA+Ius$-0(ggf=69quGTs8rCWL zfyLw_Oj&UnyLvlmCwqd>+`5Y;7yQ^t{Y-lMG&R?x?4qBP@NNMUVQ&F-=!?&|_E1VT zp=j%!hdUee6p~>}ZOF*Wt)Ppmf(-h4tf~Ckv@{aUoBAz{DI2X~ zVgyF~4{!bHvS44XqYtVhAWgenFE-QJj48Do~LSED3{i9sGojEmqsHd*cvHw=azgi#g1bc0TrX zTH0gVrV+4;NL;jqMq9b2hfI}>Ov~@aV`&G)(BR+02{bhM9#uOxm$}`Ti5!U)#Sk;R zQ-sMBvZ^gRj6$XqT;}EAGG4D&YZ6Ohzk^Nfcsf6S6rw?LKU4OsauGw9#&kPP1J)?d z?MX&F^V~iN}t^Zh$|C)Oa##ESXa zrGKySX+wk{TDdpv*wrvb4wWD!V$rwLNZ&%nrz{^>f7B#xlvx)w)^iu1(>gzAFAkqd)2YP(V0mbCXTe)Z_HtP)JcaJ!aHxS;~nNrcxStb zwW!IjE|;HgW|R_WgZZ9*Ug$4m_TvgT8Y^h)^F)%Gm?v|)W`^7ID7wb&>-77fZc=ZTShozaKH_NgJWSN(|8u(S@7kEBb*Y& zZy9zW6$X1B1RwYum^kizO-J)NYb3iq^JwNC0>hV;cH9S(U;n(?^97rdo9XF21R(y2 z{6QOMtKps2S}^O0 z721I$Dw*?Ju5-@ToYYkBY66)xKYB(2+H_uSLDCNzZp^i6MI-Na-?WOkDctbl$%7JH zUoVn-YAenfIVUH=prI;ywn9%rw$eQi`IChDFwUH$>r7JsyMH%am1V9+uv1UyEh zxf~X0%Dkc<`%25kMVVfMP~AAozS!>xfm(rac7Ccxb59F$!KX`qgUbf!yD@Qx{EvyG z(;3>N#GJ8ZU;Il02gTyH)TqLZp+do8#bkJv*(@q4QdYN~luwe8UpuB%{0truV?1Sa zd5iE?u^+bH=###3MD1W&pd2Mv{@PJ-ZjWpcyQ#rQjpc@)_q&xNkpQhK{`j>2i8olWQ?tf?pN{HsYqu^)9YjMO&kV9Gdi4(_ggP;HbaZAlJ&P~2Me3X8g||4 z$EDsghKkXT9l#t3Zmz3S+s}X8(QD>K^&{>du{tmOkkj&keP|6-w5}l! zKV<|=jnPX^TM&gD408)mc~4Rsb3Eq6cp1`RAj5>XPIa+mWCc!V;XI2`l#l!*rf5ko zUY`JQYQJw&V1*#Wc!xFw&PR<2l=aq3K4U0-?eHMN!@vl

    buibo}hicx6&l@gJNcsJI;tJeTH?p}*-9#Ii z@3706gDGL2Hg}@!j5ElkxtG8o`A&fNTHKigV?Ae#^La0ar2fE1v!ai3$O0s_2`(ic z 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«< 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 Ly^wf#eqsC{v)m?j diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/pack/pack-d7c6adf9f61318f041845b01440d09aa7a91e1b5.idx b/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/pack/pack-d7c6adf9f61318f041845b01440d09aa7a91e1b5.idx deleted file mode 100644 index 94c3c71da52ca3d4761c4e9041b384d9bc75ad9b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1240 zcmexg;-AdGz`z8=qW}^Pps*kZGXwPvCCmbJ??}b0K);VP%m(x`PVCs+bpPZ39eaPT zF#d95_t~f2a`oYw4{Y+*Z5}2Csyees*{;KHB55dV&?dF#`kRGN5~TfOsX4T@J*P yfLQIszKM4h+|MXn`snRCm0er%Quq9yFn5~doV&qSCs?ySKaj$-^Vag-Df$4qg=3fi diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/pack/pack-d7c6adf9f61318f041845b01440d09aa7a91e1b5.pack b/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/pack/pack-d7c6adf9f61318f041845b01440d09aa7a91e1b5.pack deleted file mode 100644 index 74c7fe4f3a657d606a4a004c87336749079c0edf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 491 zcmWG=boORoU|<4bwrPA7bLRHNavd@dXt`h9wYOo@&ulXVr3x1R33=PLWk|2oj=R6e z{6ngQ-HiT=p)71gtxNdtSc@#my7+iQ>e4qWip{2_EIvQCa!ROJYez<`n&YvUtTcI* z9TTeiTBZe0nUf^pW%6`sa`eMPzM|)nA8tGF@Z|lXUFTAFz2AA(eS_Z5b4eUxWitfM zx;^&{{dY4@|EHR09p8m=V|lCdF3HolfsX5m=3+ABVfbI&731*Idp5t|LFI}jHQzg~ zyQiAoi@zxS!<^^L4J{_ighMw%nza;7mv(7p=6M|PE%R{fdiLnm>17)awYE#nS$-B0AgjUCm@D?V9#TFX)~ z$JoTcz}PU*66+=E@hWo`*7*&jWecg0;xw=p8Q#< znGm{LIG-cz>zd?K^@r5dt1_-_DeboX%y8$7^v#Wo6?0bm=)z13@;H6Q^C=U9)d4m= z>xwzr=RI@+K|))fGcic~WZt)&iFo@NUWM`6pV&9?&Vu_Hg-aj3U8k~ZOJ3@p{}TZ5 CmFm|3 diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/pack/pack-d85f5d483273108c9d8dd0e4728ccf0b2982423a.idx b/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/pack/pack-d85f5d483273108c9d8dd0e4728ccf0b2982423a.idx deleted file mode 100644 index 555cfa977d92b199d541285af6997543062dbb5f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1240 zcmexg;-AdGz`z8=Fu(|8jAF{d02H2-U}m6xVlWF(-6*Ck3|N6-I8-nj(5*DVOle|P zo{t)ie0?j&@$0PFqP>OL=Y#(kT`Ve_JpcH-3(;%WeY(v#lR+%mtR?&EiC&|hR!?hN z(wd)1Z9Qs`dw%x!5V?meVL>yD15}(ow=(kB?z_;%ZLnQyuGiaosUIg!3HkM=?0m@~ zu;ad6!x7<|%-;-CYzi~lg?rcd+wO~5?(_a%q=V;#6!|H$|2e3=YcE{|%zhz2tPI5a zfqq^Fr2Bw0kGu4gOS9IUbq@E_@MF5DBm1P@&x?V@nN22yqrhMG{sG3n*SE{>v{(-S DZ%AIa diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/pack/pack-d85f5d483273108c9d8dd0e4728ccf0b2982423a.pack b/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/objects/pack/pack-d85f5d483273108c9d8dd0e4728ccf0b2982423a.pack deleted file mode 100644 index 4d539ed0a554c2b1b03e38f5eb389b515fc37792..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 498 zcmWG=boORoU|<4bwh4R{bLO6LB2ZL-fLMnU}tes`9ibm`tURpR~n zN4$6HD)yU)CWLQZoTPkI!7rVgzg+9v``Z_ETFHpbhKWQbKFLPm4J!}4hZ-;;1 za#iqhJ1^nhV_bNmPxbulr)SmY-soaD~5%da!2C_U9Y#XivXB zA!=`fYW_quaW@M^#aa1lT|@sZc&3)$dY@s6GLb^dz-uTluNVLoplcP)9_=us3ZHN-p>mFO;6gd diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/packed-refs b/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/packed-refs deleted file mode 100644 index 506a8607c..000000000 --- a/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/packed-refs +++ /dev/null @@ -1,24 +0,0 @@ -# pack-refs with: peeled -a4a7dce85cf63874e984719f4fdd239f5145052f refs/remotes/origin/br2 -a4a7dce85cf63874e984719f4fdd239f5145052f refs/remotes/origin/cannot-fetch -e90810b8df3e80c413d903f631643c716887138d refs/remotes/origin/chomped -258f0e2a959a364e40ed6603d5d44fbb24765b10 refs/remotes/origin/haacked -a65fedf39aefe402d3bb6e24df4d4f5fe4547750 refs/remotes/origin/master -a65fedf39aefe402d3bb6e24df4d4f5fe4547750 refs/remotes/origin/not-good -41bc8c69075bbdb46c5c6f0566cc8cc5b46e8bd9 refs/remotes/origin/packed -4a202b346bb0fb0db7eff3cffeb3c70babbd2045 refs/remotes/origin/packed-test -763d71aadf09a7951596c9746c024e7eece7c7af refs/remotes/origin/subtrees -e90810b8df3e80c413d903f631643c716887138d refs/remotes/origin/test -9fd738e8f7967c078dceed8190330fc8648ee56a refs/remotes/origin/track-local -e90810b8df3e80c413d903f631643c716887138d refs/remotes/origin/trailing -521d87c1ec3aef9824daf6d96cc0ae3710766d91 refs/tags/annotated_tag_to_blob -^1385f264afb75a56a5bec74243be9b367ba4ca08 -7b4384978d2493e851f9cca7858815fac9b10980 refs/tags/e90810b -^e90810b8df3e80c413d903f631643c716887138d -849a5e34a26815e821f865b8479f5815a47af0fe refs/tags/hard_tag -^a65fedf39aefe402d3bb6e24df4d4f5fe4547750 -1385f264afb75a56a5bec74243be9b367ba4ca08 refs/tags/point_to_blob -b25fa35b38051e4ae45d4222e795f9df2e43f1d1 refs/tags/test -^e90810b8df3e80c413d903f631643c716887138d -849a5e34a26815e821f865b8479f5815a47af0fe refs/tags/wrapped_tag -^a65fedf39aefe402d3bb6e24df4d4f5fe4547750 diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/refs/heads/master b/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/refs/heads/master deleted file mode 100644 index 3d8f0a402..000000000 --- a/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -a65fedf39aefe402d3bb6e24df4d4f5fe4547750 diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/refs/remotes/origin/HEAD b/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/refs/remotes/origin/HEAD deleted file mode 100644 index 6efe28fff..000000000 --- a/vendor/libgit2/tests/resources/push_src/.gitted/modules/submodule/refs/remotes/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/remotes/origin/master diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/objects/08/585692ce06452da6f82ae66b90d98b55536fca b/vendor/libgit2/tests/resources/push_src/.gitted/objects/08/585692ce06452da6f82ae66b90d98b55536fca deleted file mode 100644 index 39d126b2b..000000000 --- a/vendor/libgit2/tests/resources/push_src/.gitted/objects/08/585692ce06452da6f82ae66b90d98b55536fca +++ /dev/null @@ -1 +0,0 @@ -x+)JMU06f040031QHÔ+©(a¨˜!©”h­õ;A•EÿÛÞö®ƒ3ýZüÝ* \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/objects/27/b7ce66243eb1403862d05f958c002312df173d b/vendor/libgit2/tests/resources/push_src/.gitted/objects/27/b7ce66243eb1403862d05f958c002312df173d deleted file mode 100644 index 01d63b5c4..000000000 --- a/vendor/libgit2/tests/resources/push_src/.gitted/objects/27/b7ce66243eb1403862d05f958c002312df173d +++ /dev/null @@ -1,4 +0,0 @@ -x•ŽM -Â0F]çsËt¦i<„7ù™Ñ‚m¤¤¨··xw÷àKešÆ -Dý®." ªâmrš1°Ó@’’ê9Ú>RëûÈž¬y†Eæ -Á mâHŽì&µ™EÐr7äS¢Þ!*u΄µÞËç2ß>#\V8¤ß|­§ÛÆG“Êt„–-ybÂöhÍF·Uþ/ä±J-|M}Wóã+GK \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/objects/28/905c54ea45a4bed8d7b90f51bd8bd81eec8840 b/vendor/libgit2/tests/resources/push_src/.gitted/objects/28/905c54ea45a4bed8d7b90f51bd8bd81eec8840 deleted file mode 100644 index dc10f6831757a5bd6e61060e0b4279c7a19e3d5c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 109 zcmV-z0FwWB0V^p=O;s>7Fk~<^FfcPQQApG)sVHGM$igX{RaN>x^;dwFwEp#N+U1uj zO$>lQAuT^Ah2h8db$>J&7GF0%xANVSaLvD=WpYwb{UG@yuo-4aYQLv*9XPe}^4G}p P)r`hoA^iyegi0!M(djYW diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/objects/36/6226fb970ac0caa9d3f55967ab01334a548f60 b/vendor/libgit2/tests/resources/push_src/.gitted/objects/36/6226fb970ac0caa9d3f55967ab01334a548f60 deleted file mode 100644 index 45c4d920891a2db6cfc66a327ef5575e777348a0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20 bcmbö3(§nÞibˆC°èû¾ë0öhQ6¢BåMv¨‡à2&-ø÷M0Q)+ ®Œêæª tNsÚà¿E*;}àžøJϲN픹­§(th­ÔÖ@#”BŒËºC•?ÉÀTÃ…oÅyk7ÿ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/objects/5c/0bb3d1b9449d1cc69d7519fd05166f01840915 b/vendor/libgit2/tests/resources/push_src/.gitted/objects/5c/0bb3d1b9449d1cc69d7519fd05166f01840915 deleted file mode 100644 index 88318213851b7a7acf29e9f80d6bd2b9ff0dc9d7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 128 zcmV-`0Du2@0hNtG3c@fD06pgw`vJ>#|T(ZVH%!pP1RYIf{|4_qM{dJ(o{`TZdEp;j3SkD&;Z6 iR?je6ra+buVULVxHoN^a|6dwODJPIY-)g?*Qa2;P#ymd& diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/objects/61/780798228d17af2d34fce4cfbdf35556832472 b/vendor/libgit2/tests/resources/push_src/.gitted/objects/61/780798228d17af2d34fce4cfbdf35556832472 deleted file mode 100644 index 586bf17a49e63a07b4b491ab4306a90e79e49378..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17 Ycmb7H)k+3FfcPQQP4}zEXmDJDa}bOX87J^$aW%rtLL%68JiYy zB$XW#_tbzYOVlf=C}B9r!YQ0pRr)~nSAdqZ{`GCz<(Dc=41ho(Ek7rP;m7xNe>52u zUpGIu^4*hg&A*{#a#B$JAo(P)8D>dpzo&B@IJNTf*U0qMjK*Fe{RxIJhL@}e8=CPju z742HM=g5#;FyzN^7$}WotVUC`3<(LnE|!!Fwoq1rKhF%YElXv=-RL>|@03@#);Rn8 lfLom3A+HRlS6`Q{jI#mDw diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/objects/95/1bbbb90e2259a4c8950db78946784fb53fcbce b/vendor/libgit2/tests/resources/push_src/.gitted/objects/95/1bbbb90e2259a4c8950db78946784fb53fcbce deleted file mode 100644 index 596cd43de..000000000 --- a/vendor/libgit2/tests/resources/push_src/.gitted/objects/95/1bbbb90e2259a4c8950db78946784fb53fcbce +++ /dev/null @@ -1,2 +0,0 @@ -x•[JÆ0…}î*f¿2—Ì$ÁEøœi’úƒm¥¶ˆ»· -úîÛáã\8ã:Ï×DôfßZ ½ªöì&¹º65³^©»œ,åî%Ôá­lmÙ¡~;KJÌR“XT²®è•„Šö(!{ìÒ¯Ÿ£Ç±™qæP’qÅsPÓˆÈB\;EùëïE’gê”s–`IeoEÈ(YMŽ˜FåÂC9ö—uƒ§u™>¯ð|Àýø#?ŽÇi.××»q€D9³0F¸EENzþßÛÿ“Ãܶ©Ë<\ ,\a_a.ïgßðëd \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/objects/a7/8705c3b2725f931d3ee05348d83cc26700f247 b/vendor/libgit2/tests/resources/push_src/.gitted/objects/a7/8705c3b2725f931d3ee05348d83cc26700f247 deleted file mode 100644 index 6ad835e86c71b341e0ab8ed854938141fd3b1b66..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 166 zcmV;X09pTd0hNwh3c@fD0R7G>_5$i|UTr``@DP3{yNMQTBPB(>y+u#p-!L#RT*q-} zppD(MIcH$$dny5o4#r5**)nUNdhV!XkEV;&UL!J2e>S7;4eOx({+r)eaCe?0vV@+HX0GO=n&Ov*T0tkFI5!D U0;S#s;`D=k+O=0xA5?})3K&aHU;qFB diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/objects/b4/83ae7ba66decee9aee971f501221dea84b1498 b/vendor/libgit2/tests/resources/push_src/.gitted/objects/b4/83ae7ba66decee9aee971f501221dea84b1498 deleted file mode 100644 index 1e0bd3b05..000000000 --- a/vendor/libgit2/tests/resources/push_src/.gitted/objects/b4/83ae7ba66decee9aee971f501221dea84b1498 +++ /dev/null @@ -1,3 +0,0 @@ -x5K -1D]ç½¥;1i"^À•'èÎô|d`dŒ ooqQE½Í«*PàÝ¢+ -á 3…$, }ì%¢Rßw¬É+sç9»úy輨«ÍÐrøÃ`+ܦ2ŠÍp/ã[m­p~µuÝê8-—öSˆ™r„=¢Û,?ÃZ+g \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/objects/b4/e1f2b375a64c1ccd40c5ff6aa8bc96839ba4fd b/vendor/libgit2/tests/resources/push_src/.gitted/objects/b4/e1f2b375a64c1ccd40c5ff6aa8bc96839ba4fd deleted file mode 100644 index 4e650aaa1bfd8e093627c5052d137770b074e7e0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 148 zcmV;F0Biqv0V^p=O;s>7F<>w>FfcPQQP4}zEXmDJDa}bOX87J^$aW%rtLL%68JiYy zB$XW#_tbzYOVlf=C}F6WA*qyTt@S%Wl|}#C-uAA8GyPgk41ho(Ek7rP;m7xNe>52u zUpGIu^4*hg&A*{#a#Dt7VEN+GB#12x%i`aDp7s6-)8*ZHD))W;6VK6i>Ff%bxNYpE-C}F6WA*qyTt@S%Wl|}#C-uAA8GyPgk m41ho(Ek7rP;m7xNe>52uUpGIu^4*hg&A*{#a#8?*tsEl;AR<2i diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/objects/d9/b63a88223d8367516f50bd131a5f7349b7f3e4 b/vendor/libgit2/tests/resources/push_src/.gitted/objects/d9/b63a88223d8367516f50bd131a5f7349b7f3e4 deleted file mode 100644 index b471e2155..000000000 --- a/vendor/libgit2/tests/resources/push_src/.gitted/objects/d9/b63a88223d8367516f50bd131a5f7349b7f3e4 +++ /dev/null @@ -1,2 +0,0 @@ -x•ŽA -Â0E]çsËd¦Ó$ "x×i2Õ‚m¤¤¨··zwŸ÷S™¦±‘ÝÕErŠ½gjÃÐ ![ÍŽ%wbY(z˜C/ÁšG\t®w(‰{r$C`›Y…[Ÿ=§DC¨u&®õV8—ùúá²Â!ýæs=]§8Þ›T¦#|;˜ÐÂÑltûWõÓh«fˆM}Uó¼QDM \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/objects/dc/ab83249f6f9d1ed735d651352a80519339b591 b/vendor/libgit2/tests/resources/push_src/.gitted/objects/dc/ab83249f6f9d1ed735d651352a80519339b591 deleted file mode 100644 index 9f6b1502f8a4be38a8e19e7579f74085d3aa2e1e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 80 zcmV-W0I&ae0V^p=O;s>6VK6i>Ff%bxNYpE-C}B9r!YQ0pRr)~nSAdqZ{`GCz<(Dc= m41ho(Ek7rP;m7xNe>52uUpGIu^4*hg&A*{#a#8?zE*s?m+ahxS diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/objects/ee/a4f2705eeec2db3813f2430829afce99cd00b5 b/vendor/libgit2/tests/resources/push_src/.gitted/objects/ee/a4f2705eeec2db3813f2430829afce99cd00b5 deleted file mode 100644 index b7b81d5e33fba17a21de678d5f77bccda5635efa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmV;80CN9$0WHj33WG2Z1mHgB6ng<>W6Y0GN?&>dFA(#m1-r#8l-|CIg&F318ukUG zb{CqSDKIFL?J#w&Hz;jX*2sh&yNFW=QCpQT4;Zu+{Cy{2U&P*Ho4-ri;1NH5i!jc# vR(ioT@u~Z|gpDd?ZUe11kjg4!uy+GAs1b!2=cU3Pe_R67iB|jobvZJ;wZ%S3 diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/objects/f7/8a3106c85fb549c65198b2a2086276c6174928 b/vendor/libgit2/tests/resources/push_src/.gitted/objects/f7/8a3106c85fb549c65198b2a2086276c6174928 deleted file mode 100644 index b9813576d2149a66a9ba1759c705eedffade518a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 65 zcmV-H0KWft0ZYosPf{>5Wr!{=P0GzrDa}b$P=Yg+V!1dA5=$}^Y!%>QT%4svIY0qD XJ^hl@;*z4&f_%O7%n~jDi)a{BRYV&H diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/objects/f8/f7aefc2900a3d737cea9eee45729fd55761e1a b/vendor/libgit2/tests/resources/push_src/.gitted/objects/f8/f7aefc2900a3d737cea9eee45729fd55761e1a deleted file mode 100644 index 888354fc281f61813fb506c77e7b888db85c541e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 50 zcmV-20L}k+0V^p=O;s>9W-v4`Ff%bxNYX2*C}BvfV4tDXE52UW I00*QF=f8gwkpKVy diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/objects/fa/38b91f199934685819bea316186d8b008c52a2 b/vendor/libgit2/tests/resources/push_src/.gitted/objects/fa/38b91f199934685819bea316186d8b008c52a2 deleted file mode 100644 index 13d9bca20..000000000 --- a/vendor/libgit2/tests/resources/push_src/.gitted/objects/fa/38b91f199934685819bea316186d8b008c52a2 +++ /dev/null @@ -1,2 +0,0 @@ -x•½J1„­ó§ÛÊ5›ÿ…‹>„urr²n’eo‚øö {»™f[)¹ƒ°â©_DmIiµ7 -7Ĩ8ꔌ÷.ànœÜƒW)²Ó_T;xë,×(ÃlÐi—[”D\K墓ˆÂXΓP–ùÑ?Ûï­ß>ÜðW~·£ø|_±•Wؤ»‚xæšs6éÜ×éÿIæc¤J‹ãNP}™~ù œ-מë½Á²®/ó„³­Gî û§X \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/objects/ff/83aa4c5e5d28e3bcba2f5c6e2adc61286a4e5e b/vendor/libgit2/tests/resources/push_src/.gitted/objects/ff/83aa4c5e5d28e3bcba2f5c6e2adc61286a4e5e deleted file mode 100644 index 10f25eb7c..000000000 --- a/vendor/libgit2/tests/resources/push_src/.gitted/objects/ff/83aa4c5e5d28e3bcba2f5c6e2adc61286a4e5e +++ /dev/null @@ -1,4 +0,0 @@ -x5ÍM -1 `×=Eö¢4ÓNAÄ ¸òýÉüÈÀH ooq‘Ç{›/G@ò»5=$+”SOÝ) n¥xâ≻Ø[Æ@4úy -h1Ú„v‡ÿ¥ÂmÎS”îyz'© -çWk×-ŽóziÙQc<ÃÞ¢µfS~Âpv+… \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/objects/ff/fe95c7fd0a37fa2ed702f8f93b56b2196b3925 b/vendor/libgit2/tests/resources/push_src/.gitted/objects/ff/fe95c7fd0a37fa2ed702f8f93b56b2196b3925 deleted file mode 100644 index 1cdc048c01b9e171c739f32dc5d6769fdb67a8f3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 109 zcmV-z0FwWB0V^p=O;s>7Fk~<^FfcPQQApG)sVHHnm?5c@Xsz`-L6t@S+uruBgEReF zO$>lQAuT^Ah2h8db$>J&7GF0%xANVSaLvD=WpYwb{UG@yuo-4aYQLv*9XPe}^4G}p P)r`hoA^iyemA@*m*V;0t diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/objects/pack/dummy b/vendor/libgit2/tests/resources/push_src/.gitted/objects/pack/dummy deleted file mode 100644 index e69de29bb..000000000 diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/refs/heads/b1 b/vendor/libgit2/tests/resources/push_src/.gitted/refs/heads/b1 deleted file mode 100644 index afadf9d26..000000000 --- a/vendor/libgit2/tests/resources/push_src/.gitted/refs/heads/b1 +++ /dev/null @@ -1 +0,0 @@ -a78705c3b2725f931d3ee05348d83cc26700f247 diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/refs/heads/b2 b/vendor/libgit2/tests/resources/push_src/.gitted/refs/heads/b2 deleted file mode 100644 index afadf9d26..000000000 --- a/vendor/libgit2/tests/resources/push_src/.gitted/refs/heads/b2 +++ /dev/null @@ -1 +0,0 @@ -a78705c3b2725f931d3ee05348d83cc26700f247 diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/refs/heads/b3 b/vendor/libgit2/tests/resources/push_src/.gitted/refs/heads/b3 deleted file mode 100644 index 3056bb436..000000000 --- a/vendor/libgit2/tests/resources/push_src/.gitted/refs/heads/b3 +++ /dev/null @@ -1 +0,0 @@ -d9b63a88223d8367516f50bd131a5f7349b7f3e4 diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/refs/heads/b4 b/vendor/libgit2/tests/resources/push_src/.gitted/refs/heads/b4 deleted file mode 100644 index efed6f064..000000000 --- a/vendor/libgit2/tests/resources/push_src/.gitted/refs/heads/b4 +++ /dev/null @@ -1 +0,0 @@ -27b7ce66243eb1403862d05f958c002312df173d diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/refs/heads/b5 b/vendor/libgit2/tests/resources/push_src/.gitted/refs/heads/b5 deleted file mode 100644 index cf313ad05..000000000 --- a/vendor/libgit2/tests/resources/push_src/.gitted/refs/heads/b5 +++ /dev/null @@ -1 +0,0 @@ -fa38b91f199934685819bea316186d8b008c52a2 diff --git a/vendor/libgit2/tests/resources/push_src/.gitted/refs/heads/b6 b/vendor/libgit2/tests/resources/push_src/.gitted/refs/heads/b6 deleted file mode 100644 index 711e466ae..000000000 --- a/vendor/libgit2/tests/resources/push_src/.gitted/refs/heads/b6 +++ /dev/null @@ -1 +0,0 @@ -951bbbb90e2259a4c8950db78946784fb53fcbce diff --git a/vendor/libgit2/tests/resources/push_src/a.txt b/vendor/libgit2/tests/resources/push_src/a.txt deleted file mode 100644 index f7eac1c51..000000000 --- a/vendor/libgit2/tests/resources/push_src/a.txt +++ /dev/null @@ -1,2 +0,0 @@ -a -edit diff --git a/vendor/libgit2/tests/resources/push_src/fold/b.txt b/vendor/libgit2/tests/resources/push_src/fold/b.txt deleted file mode 100644 index 617807982..000000000 --- a/vendor/libgit2/tests/resources/push_src/fold/b.txt +++ /dev/null @@ -1 +0,0 @@ -b diff --git a/vendor/libgit2/tests/resources/push_src/foldb.txt b/vendor/libgit2/tests/resources/push_src/foldb.txt deleted file mode 100644 index 5b38718be..000000000 --- a/vendor/libgit2/tests/resources/push_src/foldb.txt +++ /dev/null @@ -1 +0,0 @@ -edit diff --git a/vendor/libgit2/tests/resources/push_src/gitmodules b/vendor/libgit2/tests/resources/push_src/gitmodules deleted file mode 100644 index f1734dfc1..000000000 --- a/vendor/libgit2/tests/resources/push_src/gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "submodule"] - path = submodule - url = ../testrepo.git diff --git a/vendor/libgit2/tests/resources/push_src/submodule/.gitted b/vendor/libgit2/tests/resources/push_src/submodule/.gitted deleted file mode 100644 index 3ffcf960a..000000000 --- a/vendor/libgit2/tests/resources/push_src/submodule/.gitted +++ /dev/null @@ -1 +0,0 @@ -gitdir: ../.git/modules/submodule diff --git a/vendor/libgit2/tests/resources/push_src/submodule/README b/vendor/libgit2/tests/resources/push_src/submodule/README deleted file mode 100644 index ca8c64728..000000000 --- a/vendor/libgit2/tests/resources/push_src/submodule/README +++ /dev/null @@ -1 +0,0 @@ -hey there diff --git a/vendor/libgit2/tests/resources/push_src/submodule/branch_file.txt b/vendor/libgit2/tests/resources/push_src/submodule/branch_file.txt deleted file mode 100644 index a26902575..000000000 --- a/vendor/libgit2/tests/resources/push_src/submodule/branch_file.txt +++ /dev/null @@ -1,2 +0,0 @@ -hi -bye! diff --git a/vendor/libgit2/tests/resources/push_src/submodule/new.txt b/vendor/libgit2/tests/resources/push_src/submodule/new.txt deleted file mode 100644 index 8e0884e36..000000000 --- a/vendor/libgit2/tests/resources/push_src/submodule/new.txt +++ /dev/null @@ -1 +0,0 @@ -my new file diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/HEAD b/vendor/libgit2/tests/resources/rebase/.gitted/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/vendor/libgit2/tests/resources/rebase/.gitted/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/config b/vendor/libgit2/tests/resources/rebase/.gitted/config deleted file mode 100644 index 17e58b1c2..000000000 --- a/vendor/libgit2/tests/resources/rebase/.gitted/config +++ /dev/null @@ -1,4 +0,0 @@ -[core] - repositoryformatversion = 0 - bare = false - logallrefupdates = true diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/index b/vendor/libgit2/tests/resources/rebase/.gitted/index deleted file mode 100644 index 0f53a21673a7c17ffeabdd0e05b32012f51e44d5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 488 zcmZ?q402{*U|<4bw%`*oZ-F!ejAmqDU}e6xVL1as;}Ql2#;-sr5uj4<^tV;NRWsN_ z^Jka*@~@fHvg(bX0t0ViaY15HVtQ$@UP(m>$QY10X~;Cxyf9SrSYtB2N$C5uUY;k+ zd9$X@H8JeY9ENEO97(CEX%M4um=lg_4vUL-O;`X!w_Zv8!-jdUqh#;#HMDXua3|%L zX6EE%!d->%ADTZ`pqj_ncI4Ta#c#46i1b}D{8USved*Jh-o*TD_q_dxX8m^g~QSG*wXEFn_aR1Eh>?0 diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/info/exclude b/vendor/libgit2/tests/resources/rebase/.gitted/info/exclude deleted file mode 100644 index a5196d1be..000000000 --- a/vendor/libgit2/tests/resources/rebase/.gitted/info/exclude +++ /dev/null @@ -1,6 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/logs/HEAD b/vendor/libgit2/tests/resources/rebase/.gitted/logs/HEAD deleted file mode 100644 index 62d3b164e..000000000 --- a/vendor/libgit2/tests/resources/rebase/.gitted/logs/HEAD +++ /dev/null @@ -1 +0,0 @@ -efad0b11c47cb2f0220cbd6f5b0f93bb99064b00 efad0b11c47cb2f0220cbd6f5b0f93bb99064b00 Edward Thomson 1405623541 -0400 checkout: moving from master to master diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/00/66204dd469ee930e551fbcf123f98e211c99ce b/vendor/libgit2/tests/resources/rebase/.gitted/objects/00/66204dd469ee930e551fbcf123f98e211c99ce deleted file mode 100644 index e6f72ce24060c03cd8d378695f5350c60e18dda2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 806 zcmV+>1KIp|0c})GkJ~m7?U}z~ZoOy?v^@mKp1g?yyV=-AY0msddq1nzsQs2;i>VCEA_V7e%R2L^YKJ47>0>ETEDITBzDPx*o(TCT1y(8^9vieRYlX0Xe_*_v6(YT9c@>h=X3fn17 zfCm~cul3XMu;1@KonM7Q@U!cvXfdJqtA&_8+E`Y!3@dN`B0JUD1V?lM`uE!pyQ7-AeB9J zrsZb=8Uf&e-$3{ctL%l4F6cLooQH`cg; zdUIv9*`L22E4q!Q9T)K}>noFPJPck02mmBov4C|X@#&d5PYydR%PCfeJ^bBoUupk` z0BhvW`U3F~5y6+*c@j~$pRIVVlfa86ae~QEQyxd1lnkjqQZK|ue58s3h83e1(HeLs zKFi?y1gMY}0w&8c7Y|w;w!2dS%$DQ5WcA??vZe`2Jf+~h1DJmuOAHep(O9X|$O%E# zIZK`#0@)d;nds(civU7vVP+zAY)z}PbU zu~YXN3;nf=CD%#04itPb$2$5kpKVy diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/00/f1b9a0948a7d5d14405eba6030efcdfbb8ff4a b/vendor/libgit2/tests/resources/rebase/.gitted/objects/00/f1b9a0948a7d5d14405eba6030efcdfbb8ff4a deleted file mode 100644 index a23f526b5..000000000 --- a/vendor/libgit2/tests/resources/rebase/.gitted/objects/00/f1b9a0948a7d5d14405eba6030efcdfbb8ff4a +++ /dev/null @@ -1,3 +0,0 @@ -x¥ŽAnC! D»æ¾@*À𑪪YäÙGå/~ˆ(U¯ZåÙͼ‘f¦´}ßX -o£«B% -BU«#DGa‘‚9øì"R”H~±.-HæÎ]o˜}ñ–µH-±HZSÎÅYLÉyåIØU/ëjøg\[‡“ür8_ÛþÝnð¡“þ©/ýžî½´ýì¼fá€ÑL:Ï}±ÆE¶±ÍùVAú¦r¹+› øT \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/01/3cc32d341bab0e6f039f50f153c18986f16c58 b/vendor/libgit2/tests/resources/rebase/.gitted/objects/01/3cc32d341bab0e6f039f50f153c18986f16c58 deleted file mode 100644 index 2e32bd33900620aaeff23422060b07099afdb697..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 175 zcmV;g08syU0i}*jN(M0yL|x|;eE}uu?))@}xN+&u3nb|tz5(Zp#E5u%NAU*ks$N0y z`Z$h#0YH0C#nq2>855rLvrdJV%Q)W074Ge%Kk3nahrf2$$MFDxeN2cPGu(Ri-ktQ6 dUG~o#_dImp_FmV1DiEvztmg?8a!F4 z5zWVY%@ldU_n$w$-97y}-{J9m!t=xH*?tQyh3seicDSxaKU}p zJtp$Wmd6(64Ze{5P^B^=SA}l0yO8W#i11N;QE5RJDxVNu6^FNG96`5h6Q{sQFmIeQ zEvR|03#}~9rv>7pj+i*ao((-18`mNub}uc1b{rHVT6gv$*S@WAeKSBOfi5(nkk-<` z2r+!ruplJmzRs+J6=8m-1oQ219?_RKLJl;ODY&UN&3?@qjleKX*j$Bog2XUWS4~!Q zY-BF)LqBj0b4vb3GILsMY-5=z_Q8;eXRc|X05AV|0V^p=O;s>5GG{O}FfcPQQAjKTj;SFV484ZsWk8T$lY^VAlR8|EF&&z4D;^ KmI45#Azomv@?(eq diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/05/3808a709cf91385985369159b296cf61a177ac b/vendor/libgit2/tests/resources/rebase/.gitted/objects/05/3808a709cf91385985369159b296cf61a177ac deleted file mode 100644 index c38c5b2559b84ceb7258e8da700eedc03890bbe9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 241 zcmV5vtTeZFfcPQQAjK(d zZoQKFhYj;yN6FsfYiQ+yDoZa)EUN@7I`Zty;x}0jMEWin{wxZ=-(x7p7!OyJnwl41 zkeUcqm?%7Zw!`8lonKb($@=Iguug;_&mF2Tzp}U_wFs;#W4-)whx(gq?~608sM~ll rrew;|8BkSasfjsYHOn`o1=nRi7nrsG$^YrwO0PU9zoh^G>x*v?$P9A> diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/0e/f2e2b2a2b8d6e1f8dff5e621e0eca21b693d0c b/vendor/libgit2/tests/resources/rebase/.gitted/objects/0e/f2e2b2a2b8d6e1f8dff5e621e0eca21b693d0c deleted file mode 100644 index d8ef47c62..000000000 --- a/vendor/libgit2/tests/resources/rebase/.gitted/objects/0e/f2e2b2a2b8d6e1f8dff5e621e0eca21b693d0c +++ /dev/null @@ -1,3 +0,0 @@ -x¥P»N1¤öWl— -´g¯í³„"J:~`½^ç"åÎÈ1Aü=‚/ ›—Fš‘¶®çnrw£«B‘Y9g/U­ -¦ä“ÄJ“÷ÌÑ‘Mµ$óÆ]·$,jÐHÈ>K Êìœ"åY+FçÊÌ“y»»¢3YL¤8kf™¼Í®„â3ÖZ]ªI‚~Këð\>¸x]Úzm<ê®~£'ý1~Ùƒ´õ¡Ö:"¸GB4»ºúÏó¢ý´_Óy“§Î·Ïœ·Ñà¦|1_"fi \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/0f/5f6d3353be1a9966fa5767b7d604b051798224 b/vendor/libgit2/tests/resources/rebase/.gitted/objects/0f/5f6d3353be1a9966fa5767b7d604b051798224 deleted file mode 100644 index 739aca383a8c0b405e533f8e72a0f74f55d098b1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 183 zcmV;o07(CM0i};!3IZ_?Bg#+-8CmOGAtR)LrP8(*Kx@CNY_T4yygRigj^ diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/11/fac10ca1b9318ce361a0be0c3d889d777e299c b/vendor/libgit2/tests/resources/rebase/.gitted/objects/11/fac10ca1b9318ce361a0be0c3d889d777e299c deleted file mode 100644 index 5af5474b55bbb69d5b86faa9902d190a9d8a3e54..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 208 zcmV;>05AV|0V^p=O;s>5GG{O}FfcPQQAjKTj;SFV484ZsWk8T$lY^VAlR8|EF&&z4D;^ KmI46pr(VNl@@3Ef diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/12/c084412b952396962eb420716df01022b847cc b/vendor/libgit2/tests/resources/rebase/.gitted/objects/12/c084412b952396962eb420716df01022b847cc deleted file mode 100644 index 5244e469d..000000000 --- a/vendor/libgit2/tests/resources/rebase/.gitted/objects/12/c084412b952396962eb420716df01022b847cc +++ /dev/null @@ -1,2 +0,0 @@ -x¥ŽKjC1³Ö)æúÌèIB6^z— Œ¤äYAQ0¾½ãd×Õ Må¾ïm‚¥ø2‡¸Â8³ )!–m“JÄ¡È"Œ‰ML¨¾yÈe‚6.gg‹C“8iñU»XIWC.›ƒ¯Æg -Šç¹8–+Ÿç¾ÿô ¼ÉjÿÒ‡<†'½æ¾¿ƒAMÞZô4j­V»d§üóFziµežm) ̉ǗÜÔK€U \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/12/f28ed978639d331269d9dc2b74e87db58e1057 b/vendor/libgit2/tests/resources/rebase/.gitted/objects/12/f28ed978639d331269d9dc2b74e87db58e1057 deleted file mode 100644 index b0dbc3e07..000000000 --- a/vendor/libgit2/tests/resources/rebase/.gitted/objects/12/f28ed978639d331269d9dc2b74e87db58e1057 +++ /dev/null @@ -1,3 +0,0 @@ -x¥O9nÃ0tÍWìbp)‰KF&e:`¹\Ú*$…|?´á¸›3˜‘º,sçÝ©mª€XXÐ -cŠÑÁ#Û¤V†BÌD¤.F1¿¼éÚ€„R “F -sØÉûBÖe'‰Èû%ä±>Ú½nðÿxËp½×e¯+\´«ô¥OãÅÎR—OÀ±—9ôãv´Ötµmúfù©y.³p›û„V÷þ‡oÇnþB#Vj \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/19/14d57ddf6c5c997664521cc94f190df46dc1c2 b/vendor/libgit2/tests/resources/rebase/.gitted/objects/19/14d57ddf6c5c997664521cc94f190df46dc1c2 deleted file mode 100644 index 921f2cd8807f5127a20574d589b12b5b7827c3f4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 277 zcmV+w0qXvE0VPmDPQyS9da|73OHe9dmv7nPfc2!3w#r2ZZYFLy_q`fS{4De790ASMOzT zLA}KjmI_(SOPw)F;p&%z326;z3R73ljP?SX1x8KcwO&NB_EV}|$4Na*Mzmz=&T~u& b)ODcH$IR#xUHwTg->$#$dYkYMBn^t6-KLOD diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/1b/1d19799fcc89fa3cb821581fcf7f2e8fd2cc4d b/vendor/libgit2/tests/resources/rebase/.gitted/objects/1b/1d19799fcc89fa3cb821581fcf7f2e8fd2cc4d deleted file mode 100644 index 3d206b0cc1bb53097035f173fb471d5eed75b485..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 178 zcmV;j08RgR0i}*TPD3#egsFXsy#Q#v{@W)ZL_n~N>UBZcTB5Sqz%6t2TPt3D zwOA;!O)4ByQATI-_qvP;AM%r@!09sfuW^M}J?LM0*Z<+(Uh3H2z5GG{O}FfcPQQAjK$CU5B2tu*mvakOg5AC#59LoQJSOm2PYJc67?0> zDNT@vF>W5}tKIX{)8prt2OVJ!i|?eP#&LU~S>{<{RdDku=z+v8UxPOa0KE-98TDaz z|E<>7Or!We63H;EP81@Du>Y-`)N+g=CrWMP8BD4fmYJ95ij<@Lf$|c)ofFL*f1bfm zIZ$U?xmKYO0xn9vFC2jxdh@#7*Z+dL46BC218QAJvW{^Onbm{=F1vGKPg%ILcxZxk z)(_O%qnHr{siMH30UxIzzjjk3IgFsx~FUE0(o#c(NkiSUxADL6*c;2 zKEOOgMD?Y1nbZ{N7pFVtr1GLolCWgBsgENkqag62*TFC1W`LDNuckHFo$gtI&l9A= zS{Rs|C@vn@sNy16oWyg<>SaU78WWtjN^=MvV*Yn535YMz*qHq&2|?zZHBTOa>@3_& zbP9_@0O7SxW+QdtY|B|Yz(>_>QId6x9DJg6 zDb=h#I2TU3qlvwj_!q$f!*8MC#>p@GJ+g8ENy~s0l>{*$BeIhY=#*$huq&HQi4#cB zzDqDL1C(T~9=<1Wn6i{CghL|q=}aBRL$$`SfCGnNjxItsx^4q&MmDenayDnY;;e4l z2}w?9I~qDD!`q#K)H&IhU5;EPw`rY1k179zI^p<9Kyb3TTm+Z+t>G#W#popw=J$!v z^r)$75>_xRwEB!&F| diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/22/adb22bef75a0371e85ff6d82e5e60e4b425501 b/vendor/libgit2/tests/resources/rebase/.gitted/objects/22/adb22bef75a0371e85ff6d82e5e60e4b425501 deleted file mode 100644 index 7f17ef059a66be6cf1e7a5c55ac9373afdeb495c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 380 zcmV-?0fYW{0Yy^HZo)7O-Z@X<2dKDBo5ZQ0@}o@@QP9q5>e8s8$r1;|+s_GzotikG zzaP7;u`RrRe!P{eB(f%fq^Y#c8+PR1Mf3WN^~Ua|{Ip z<)uT=1d~>1?ggkwjOoEnT%Ob*>J=O}6&&k*Q-GX0F!ByG;Dw*zCJ8+^4c4U^1d?V9 z8RnQM!|as4VzoU~@UuN`poIOlT2{c!i*i}-n3hTX8Cg^_I$4PBA?DCI^qDY7Lvta! z4(Mj#H%d<-#d&&Ytu_xq(k7o?Zagwv6Wg;r6$vy67frT&;j6dtJg|wN@rn=KKwfgb zlqvHAS)Nh>w?V4`E-?_a2%J&0QjKX83F<7(Q<3i(&zy=IM*I(T(==o(S(ogK*EXKq zgY1}^JB-wP;+5oNyrMX9veX-pAK3v*jUÌ{¹ R4¡Öd19ò™sD‘š\ÄCb¼ðäQ0ü×ÖáM¿¸+œ¯mûh78–¹þ¤Sù=þÚ>·í0Ø%:ç-‹ Öš¹NÙQþ‰1ïM׺fëTp0\:~›'fÐUN \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/2b/4ebffd3111546d278bb5df62e5630930b605fb b/vendor/libgit2/tests/resources/rebase/.gitted/objects/2b/4ebffd3111546d278bb5df62e5630930b605fb deleted file mode 100644 index 5bdfc1e293b2e28e54f072801b1f307dadf85351..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 208 zcmV;>05AV|0V^p=O;s>5GG{O}FfcPQQAjKTj;SFV484ZsWk8T$lY^VAlR8|EF&&z4D;^ KmI450zFr6;@?x<7 diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/30/69cc907e6294623e5917ef6de663928c1febfb b/vendor/libgit2/tests/resources/rebase/.gitted/objects/30/69cc907e6294623e5917ef6de663928c1febfb deleted file mode 100644 index edd86f721..000000000 --- a/vendor/libgit2/tests/resources/rebase/.gitted/objects/30/69cc907e6294623e5917ef6de663928c1febfb +++ /dev/null @@ -1 +0,0 @@ -x¥Ž;n1 DSë¼€RŸ] 07.ÓåEÂ[¬eldøúÞ¾Aº™7ÀàI_×e€OóÇØT!&Æ[ËÅUö5´¹R¬L–ÑP±¸oz+Ab)ižçF¾ø8±Ù«Ç÷qéœÛƒ·?—¾þö+u§餯áÝ>¥¯_@Óä)§Œˆn§»ìÐÞ¸ïÞ[„Dz+ªª¹' TG \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/32/52a0692ace4c4c709f22011227d9dc4845f289 b/vendor/libgit2/tests/resources/rebase/.gitted/objects/32/52a0692ace4c4c709f22011227d9dc4845f289 deleted file mode 100644 index 2b2434f87ff7f962c819c9424577410362892052..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 209 zcmV;?051P{0V^p=O;s>5GG{O}FfcPQQAjKUz(YdlL=PlT@x0- z(5+We|FB`+>nPcKd=0H!P-W>wiDi{wMMs{US^OsJfk@va!=FXr_j?TG7~`Re@+*r= zQj5T>c3Q4nDBR}o}r diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/33/f915f9e4dbd9f4b24430e48731a59b45b15500 b/vendor/libgit2/tests/resources/rebase/.gitted/objects/33/f915f9e4dbd9f4b24430e48731a59b45b15500 deleted file mode 100644 index c33f179bf..000000000 --- a/vendor/libgit2/tests/resources/rebase/.gitted/objects/33/f915f9e4dbd9f4b24430e48731a59b45b15500 +++ /dev/null @@ -1 +0,0 @@ -x¥Ûi1Eó­*¦iViÁ„@Hi@[­Â®LÚbÜÿî.çæÞZ€Þ¾Œ0YN"e1Æ8K}HÉ!dG‹^H;Iê'î¼ ðÙ' ŽWIJvDâ5ÌÉ{¢´æP¬¨x×¾Ãgù{¯koGßàÌ3ýWï|/î”{{cç¢F‚WmµV3°ƒŸœQ}“ïšGÝ.Ðz©Rsuââ1¿ÅËíPH¾ZÞ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/34/86a9d4cdf0b7b4a702c199eed541dc3af13a03 b/vendor/libgit2/tests/resources/rebase/.gitted/objects/34/86a9d4cdf0b7b4a702c199eed541dc3af13a03 deleted file mode 100644 index fdbe16d10..000000000 --- a/vendor/libgit2/tests/resources/rebase/.gitted/objects/34/86a9d4cdf0b7b4a702c199eed541dc3af13a03 +++ /dev/null @@ -1 +0,0 @@ -xM½nÃ0 „;ë)îŒ,‚L-Э@ƒþ e›Ž…Ò¢*Quüö¥…è"Ç#ï#{–÷ÇãÝãÃëóÓ'Þ^>ÎçÎU!:g"\sLè}fÚº?ù»ú¬M_½Rî0ÑjMAbÁ`ý5u®„+Ÿ³˜± Ù'áãØê!ª` u&lÞ¨A·=MkŽ!µY®,žù„^#(.•7è*˜¥æ²#QD²Ô1™ɘÂ!Ic£4‹Ë~øÚK‘öÂRU%@ƒ/l4ÍËdH³_:¬Ag$J‰r#/žõän …eý–x¹9)[¾ÑÖtÀ»,^¥Àg²1Ž®1ÛðãÔn;†ÎÁÎ$æw¿/Š \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/3c/33b080bf75724c8899d8e703614cb59bfbd047 b/vendor/libgit2/tests/resources/rebase/.gitted/objects/3c/33b080bf75724c8899d8e703614cb59bfbd047 deleted file mode 100644 index 8716898f8b4b2d0de04e7aca7784d3fae0266984..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 208 zcmV;>05AV|0V^p=O;s>5GG{O}FfcPQQAjK@U{2UVDqnwkbylkrVL->3ERJYmk8HFd6uVRz;*OoOS(FU`!!$pkC&t_cfZ z=+-N#f7meZb(HKqzJ^vVsIv5;#Ij1Tq9f1FEPj*qK&0=I;m@M*`#pwojPX!K`IW^b zsYMVQ*UKMwsK2@PzBuEGx{W7eN~Rp00aaC&nwSGtvwTBZa9#Fufm!>X{GYz9^vZ+s KTM7UIH(uX+on`0% diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/3d/a85aca38a95b44d77ef55a8deb445e49ba19b4 b/vendor/libgit2/tests/resources/rebase/.gitted/objects/3d/a85aca38a95b44d77ef55a8deb445e49ba19b4 deleted file mode 100644 index fa6d9468d9743cd416b26d605c00b64a4cafe929..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 55 zcmb)7U|?ckU~CxZ;iYrRbL|!Fl^TgFYOa{2UTr>|b1%n!bJLA-D}AH2 L>Ff-dB?8v~G4&PD diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/3e/8989b5a16d5258c935d998ef0e6bb139cc4757 b/vendor/libgit2/tests/resources/rebase/.gitted/objects/3e/8989b5a16d5258c935d998ef0e6bb139cc4757 deleted file mode 100644 index 1bbf138ef..000000000 --- a/vendor/libgit2/tests/resources/rebase/.gitted/objects/3e/8989b5a16d5258c935d998ef0e6bb139cc4757 +++ /dev/null @@ -1,2 +0,0 @@ -x¥ŽKj1 †»ö)tù1¶Jé&Ëìz%C'.®›\?nÈ ºûðñå¶ïu€[ÒËèªPŠ¦ÕÓŠ™"åÀ›%¬Cñ¢0+›oîzrÚ --º&*V,e\b, ¸¼¥ã¶f’P ÿŽsëp”wÏsÛÚÞt®éCdz½æ¶¿ƒ æœwÓÍ\§ìÐbÌ©I-5ó¨SÁÂhpUþ2w_ÎT diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/3f/05a038dd89f51ba2b3d7b14ba1f8c00f0e31ac b/vendor/libgit2/tests/resources/rebase/.gitted/objects/3f/05a038dd89f51ba2b3d7b14ba1f8c00f0e31ac deleted file mode 100644 index 26bd353f74d585938ea58579df3ab22d48d9c821..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 209 zcmV;?051P{0V^p=O;s>5GG{O}FfcPQQAjKŠïI1aPTb´ƒëM|Ö{Yà,¯¸\ïeZË ‡ÜÔ:å¯ñc»T¦#¸OwÔ!lm°Ö4µ­ùÏs)2ê˜bÛ„Z ®íO¼=Wó>{VT \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/41/4dfc71ead79c07acd4ea47fecf91f289afc4b9 b/vendor/libgit2/tests/resources/rebase/.gitted/objects/41/4dfc71ead79c07acd4ea47fecf91f289afc4b9 deleted file mode 100644 index 546815ea85b67a781ee20058cf01d24a99e81fc1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 376 zcmV-;0f+v00X30LPQ)+_g<0nm?*N4zu;{ANRAK}gU}j*Swl0lG8PV}H>(6`^kmKZrahY+9PJnY2iAAObtXE@E8Rdzz4a zBLgK2sypm(>YmOm1~#^8BW;X@bBHZg9g7C7*vMLFH^J)|FMUhk{2_qqwC~^h7J*U@ zt`uR-S2h!jOI&l$sgb~ppX4BZE1ZVa;e+4}jRHBVAs3r<%xr}~FvYNOVrwNtYetI2 zs*?awTiF|j&!&F3h^a*SI(lX|XIpwlvUM>e#yw{@(R48@7|DpM!drA;A|`fJ^;D$r zO$9ak7K@g+LL}BPiPR8CPZ%qnc$^ARSr-NcHW-Z928G65EbM)~(0NZOtl z!OZ)Z$7KD4FWIcBc`C=Vu)D9bWgl7r_IxYLE}yFWt;|w{mlVakxs-v4L8Bs9lMq-BNAq z8EAaz-WjQ!Vlh$UYG{Q-Fk0y%Ws=G}hJA?i&Ugov2|3)!`mXQ0Bij8B4DH+aB;-7U zt{xv*Myhrm8YXY-T^AW!EBsZ%#2?v^M)C_aMa^D>Y^&r8&qSZkMOHHUx4!cxijw^m z=M|s*^OhQ1SEE+EpN0|NJFrK=7PhjA(i%KHA+UVoYCmHt9@zAMQ*{HZ0OO$_c+=uv z8V~GM&X_b$SZTQ8NUAfAC_8pmc#`JFL}-uW>+Y=^xadU6%VLz#j_eJycWi_n+?8{& e{23T56Gv7Px){6N-45OH7soxKe4RhpQ^o_eWWQ_x diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/42/cdad903aef3e7b614675e6584a8be417941911 b/vendor/libgit2/tests/resources/rebase/.gitted/objects/42/cdad903aef3e7b614675e6584a8be417941911 deleted file mode 100644 index 99b5e6d2c8f1feb318ae3effc47c16d1f66918ce..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 208 zcmV;>05AV|0V^p=O;s>5GG{O}FfcPQQAjKIQ$+tt_V?XZL0=CHjtW{)$$7)k<%=}6EQZzswSM!*~~;j!cnvP~EX zSirL-ckRFyQOpRN^(%a=U*3%t$V4C^DjxlyeAjw&0`_o0p`=Aqhz*qm-JBb2d)UMN z{q<9s>S{(#1Q(VG5F(SMDy2soywWZrgXiFzgc5JfBE?9l5oUDqY;YJrE&Hr5t#6iu>aRL){OVs*>fkc5 zo#0fmKu-{h7_~6hC@M4td9IgwZg}OiS}@bUsg^*+)<87^^EZu!d%{7fwZb9mPDj$5 z>4=I~XSGizeN+XS09&U+#Y85Tab(Nn#a&?tUX94oyY(EMeg-8gq9bd8p4iQcTT0*U N7nFE!egIA!&7-4Fu#*4) diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/4b/21eb6eeeec7f8fc89a1d334faff9bd5f5f8c34 b/vendor/libgit2/tests/resources/rebase/.gitted/objects/4b/21eb6eeeec7f8fc89a1d334faff9bd5f5f8c34 deleted file mode 100644 index 0c9f4b944..000000000 --- a/vendor/libgit2/tests/resources/rebase/.gitted/objects/4b/21eb6eeeec7f8fc89a1d334faff9bd5f5f8c34 +++ /dev/null @@ -1,2 +0,0 @@ -x¥]J1„}Î)úJOÒ™L`A¼èt:»3‘™,^ß(ÞÀ·úâ+é­Õ6ÐÃ8TÁ‰s 7L%ø`I¶-Ƽi@·.$ÉÇTRF -æ“Ýl¾8ÂQ±8—i¡•‹J”¤ží:g<"¾[?à-ñ‘áýÖÛÙw¸èLÔ‹þîIz{†…ЯÖbpðˆ„hf:a‡þsƼö½|Tu¿Bë¹–*<êÄ!øœßøz?Í72ZÝ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/4b/7c5650008b2e747fe1809eeb5a1dde0e80850a b/vendor/libgit2/tests/resources/rebase/.gitted/objects/4b/7c5650008b2e747fe1809eeb5a1dde0e80850a deleted file mode 100644 index 016398531ebf1408a8bcff0d4a2974da890c3874..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 615 zcmV-t0+{`H0Zo(5j@vK{gnRZ=@BzF*+grQ0qCgv9fi2Ko^eo%7Em#pD%8Onl|EL(9jB2A{ZB9%z(Q zDp~`0c9}Zy!LU4TnP`R_a2j)I$sDeGffp+4!3AhA43rTJ zWFou6(+HCX3{H(@VP2uCCwfgfFK{R0k?|pZ5Tn=5VX^q(kEe+?4x#DTDaRH8q9={` zWw}8EEsSAvd9G9{tKCHm=?0zGU48B3V`RP-+bXJ(v;jb>SGxw2^@RZPNXkU^> z6Gz{R_OmI(24P;kl#I&RsBV>}TARmX?7g^Q>{EiS6pz508ZlJQ-6Vs%~M z*Ma+pM6e6PV2lD}J@`D|vUs„µ-–sŒ!äÄX\UtÇÖá»Ü¨ø9¶õÜN°“¹þ§½05AV|0V^p=O;s>5GG{O}FfcPQQAjK3ERJYmk8HFd6uVRz;*OoOS(FU`!!$pkC&t_cfZ z=+-N#f7meZb(HKqzJ^vVsIv5;#Ij1Tq9f1FEPj*qK&0=I;m@M*`#pwojPX!K`IW^b zsYMVQ*UKMwsK2@PzBuEGx{W7eN~Rp00aaC&nwSGtvwTBZa9#Fufm!>X{GYz9^vZ+s KTM7W$Mql=Ok7!;1 diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/50/8be4ff49d38465ad3de58f66d38f70e59f881f b/vendor/libgit2/tests/resources/rebase/.gitted/objects/50/8be4ff49d38465ad3de58f66d38f70e59f881f deleted file mode 100644 index 7ce4452b20d881ce6da47bae4d2d29bb7ab34217..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 241 zcmV5vtTeZFfcPQQAjK5GG{O}FfcPQQAjK29G3?G9hG{T0`K6gTIhkN(-ZfzX z4BdJq^$#27y^fN-$Jfxx1yz<_lvq{?R&?aqnZ<9i9*Fc^GW=N-e!s_1jxippD8I6} zB((@)<9hky4)r(J-WO+FQMd7AOv#j^GoY%Z&P(pYtE*B(>#_B=ZUR=vp`s&_R^t|3}=)K##tmtv~@$|adQW#0+sFU88 zyr687j!ag_Tf^?MAX5aGk%C9rn@OQTCMF3Hc&RqUP+ZjYsk{}R=>29o*)pze3s!@(HgZaHG0B`~z>B{okIC_ZN zPFA73wV(*RVIcvAxSIW?~y8oNseX~M`8*ZY*S~V!lE<OjE8sRBb3pEUK9Cs=v6GX;!yjYp*@sb4=nMMy!YwwbAlW})~ z?zwBiiDOidd34h7wKe!@Z8h6Rq~N#1Z#3WA#0)K zIw2WxW(JNNwygz0HW=b~&bbg(>Yg1is#%Pwr_fmVCwjqcu;0_85Adz-w7WxWKhdC< zoF`3<{{x+a85xKNoqSZr?Wi>&!b#l=_bnRG3`ucuCt4zLkOsPRJU|&isHx@oAAjRi z2QJ&O&5~f$E_pS0B4iT%kr@i^>AUe(PQ)+_MOo)7?gvz}m=zMMibgQv(a}64W|_7wiExw9II8;hqyn+C zu8;3=$Dzaiet-9L()t}oUE|zdk2|H_>KBc}1^T0Yyu98}pK)uiXj)vJHJZ~wH~)Br z;CY4fh-`X77$KHaPfYWQL^M>0Szus|AI8iZF*z^jZHSQuq{%Q>DBA+XZBvLfWdErm znN(r1uD6(S5_E(vI4)O3SUgA}M~GvFkRND%D5>ke$ioR1Cl*G1XEO`UTWt}P;$a)R aEG7K)$`X)b2tNHiIC9AIPW=FMfM2`M3u^%Y diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/61/30e5fcbdce2aa8b3cfd84706c58a892e7d8dd0 b/vendor/libgit2/tests/resources/rebase/.gitted/objects/61/30e5fcbdce2aa8b3cfd84706c58a892e7d8dd0 deleted file mode 100644 index 116da7ca9ba3ad01627f48b0f4722d5e331cac30..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 208 zcmV;>05AV|0V^p=O;s>5GG{O}FfcPQQAjKTj;SFV484ZsWk8T$lY^VAlR8|EF&&z4D;^ KmI45=n_Vvskz(Ee diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/63/c18bf188b8a1ab0bad85161dc3fb43c48ed0db b/vendor/libgit2/tests/resources/rebase/.gitted/objects/63/c18bf188b8a1ab0bad85161dc3fb43c48ed0db deleted file mode 100644 index 297c43225f8c359087078b579c081b0bbe8bb1eb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 208 zcmV;>05AV|0V^p=O;s>5GG{O}FfcPQQAjK*bF-)ZbitUz~A8-NutKB~y;hfT}7>P0RtSS-v4HxGwv-z^wgG{!ialdgVd+ KEd>DQk6#foUS&!E diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/67/ed7afb256807556f9b74fa4f7c9284aaec1120 b/vendor/libgit2/tests/resources/rebase/.gitted/objects/67/ed7afb256807556f9b74fa4f7c9284aaec1120 deleted file mode 100644 index 82da2062677f502302aa7a53e4da9969082e7573..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 391 zcmV;20eJp+0Yy^Fa^oNn%$cv44^ZWn%2wrs9sH!}5JK)gl#aaL{ulTw?5G|304^5(m(0PR9?_yqiuR|e>(&7u_ zudmP_Yxpzpw(l~>k@uplV06ab1<}}Y`k5wZ_)G?AJU3yLK?`e!w^J)#)~`ji=kUB$8BMjIypcL0h$;xRP)6!ZczhVDt&1Uz7p0H#<{OJl97U zgcwL^i5W6ZZB!^p_&s_KCn&Y+wT76b&1wP);T2CVV{KWjLBcUKIyRwQV5gK<6 z)~_RqSxxl-GK~?&j23};H_~@_E=n^{u@yQ>XL$7&gwgEO=&L0>iH;?yFt$ALrztI(nqaC8z&a>7Zp&I8pAN0WCFP$2O-q(?ym5+LeLvPrCSY~yt{$?L+G6)tk4kU%Y>M`aoYkefxZI?kit~>LRrGIFjO%(nP(;)X}h2946ur z+LbAYF6|e45M+MnQfz#Cg!Q=4 zcScoIbgOWsAqe9+zywtAm4JvTr`nO`;^Q?4rJEG{3*AXqz;l)RAP<^TiqjU1LQY#8 zWu!jvaHT9cOX*tOx+lA!9O@(b7D2)2Q&eZP)c?X6q-l}(Qc33dRH8Kk2>NQ?wqlvpHMgV+B-53jsBV)y09GA#Q*rNI9BU?-PR8n4rX8b{NiUDrkJS z#>IVIL}6sEP#W!F$k9Vhr9Eu{287ne%oiFZ_yGf?T1>7bFzwL9(DilYug92+rlY;JP3e_oWtY%)Op0?3(po5hq;V1r2sz+akEz z?=)AlD5y6_xc@uC++(7eNLWJI3%(6++bHOZXþÔœ†rS57jÜÀ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/6d/fb87d20f3dbca02da4a39890114fd9ba6a51e7 b/vendor/libgit2/tests/resources/rebase/.gitted/objects/6d/fb87d20f3dbca02da4a39890114fd9ba6a51e7 deleted file mode 100644 index 039c669aa4745247d956e7870c24de49d9d7de79..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 364 zcmV-y0h9iC0X309Zrv~pM7!20<^XPXZ5Cb?NEQJCKnOzDaBox zvZ&#k;S_noulwIW9{xT(KH&2B2d^*hmpkX){FT6o@L7FP@CwN>C^C5&zy;4?_n62h zJ04q@H~2#KLzT*iTot;}?n1I}p;Jei(2dF$gjdDktrr)s z;(S^lKI({xL+skngRyZfGGh1AG-$^`F`{*6FLL&6h3kg_Itg^65rwpt21bbCvxWsB zDfe?`9jplRl@iQvhx3TOd=PS=*-}~ERGZB{W{pN*m}c0#3hxAoVWw_1S<$hPxm<_- z;1qL8{-SnJM;Q$c$&MX`$sbYZw~LRpV_s2!h3S)AgKCxlu!{dBo5GG{O}FfcPQQAjK`wgTT#);VL1Q* diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/78/c320b06544e23d786a9ec84ee93861f2933094 b/vendor/libgit2/tests/resources/rebase/.gitted/objects/78/c320b06544e23d786a9ec84ee93861f2933094 deleted file mode 100644 index afa39fb97a7285366c61beb28a08de6cfe213a5a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 55 zcmV-70LcG%0V^p=O;s?qU@$Z=Ff%bxNJ=cqNv+f?sVHHXbEWzDE#=0!^@W%GW;i!0 Nn|GuK0|0Sj5tU3%7NGzD diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/79/e28694aae0d3064b06f96a5207b943a2357f07 b/vendor/libgit2/tests/resources/rebase/.gitted/objects/79/e28694aae0d3064b06f96a5207b943a2357f07 deleted file mode 100644 index 17ff306f1b1c90b6d15182494094742e35161dbb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 287 zcmV+)0pR|40Zov>YQr!PM0?g(%mLqa3eefg-8Wx^DiyYeS%? zh1p@|?RM68c;0TGUh=vuzR*)tr_=*@*Pkw6k>mrTco?@KCA z(V4Jjspcau%N;szEDYmHj_n;hdyIaHX+a`~Ag#t>5D7kFFh7LgC)cl(Vo`Oze@9j0 zSjd!)+r;dh0IcxI3eD=ZBuJyaWta_*2owUvl{{(7JM{ob*3bVzV7u;KUf{r9HiheI-ty}@!_lD(XkZ15{5|S6c`U9#JimITSx8*(8$#EyR!>@FuHd!i*h>@%iF-4IZZO#+ zi%Dd9-3CUTLRPfZM_J&)FIpIGk20-ghNCq1qt5aLzwMC9bOPfw25Um}u-EO8YHkZ# e<erd8iEDp67Z diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/7a/677f6201c8f9d46bdfe1f4b08cb504e360a34e b/vendor/libgit2/tests/resources/rebase/.gitted/objects/7a/677f6201c8f9d46bdfe1f4b08cb504e360a34e deleted file mode 100644 index dc2fd5a364be82bbc29f6a57f61bbdd1bf3c3a14..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 208 zcmV;>05AV|0V^p=O;s>5GG{O}FfcPQQAjK2344pnwkbylkrVL->3ERJYmk8HFd6uVRz;*OoOS(FU`!!$pkC&t_cfZ z=+-N#f7meZb(HKqzJ^vVsIv5;#Ij1Tq9f1FEPj*qK&0=I;m@M*`#pwojPX!K`IW^b zsYMVQ*UKMwsK2@PzBuEGx{W7eN~Rp00aaC&nwSGtvwTBZa9#Fufm!>X{GYz9^vZ+s KTM7VOOòšÐÏÉ[4Ôd‚ÌA\~ökmð!?¹ |]ëö¨78é /wÑwñ—\·3ø0Í ââì§0MnÐq¶ë?gÜg•b…s/ãB€j ­¨|ß5»_X$W‡ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/80/32d630f37266bace093e353f7b97d7f8b20950 b/vendor/libgit2/tests/resources/rebase/.gitted/objects/80/32d630f37266bace093e353f7b97d7f8b20950 deleted file mode 100644 index 07050dfd44136505c12ec4dcd1f39f103d82658c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 209 zcmV;?051P{0V^p=O;s>5GG{O}FfcPQQAjKæÔ@2QbpdÐ^x:ìaûòÛÍ -Þ6Ok% ¡Ý<î}ß?*= Àg_YG®v ½'{ÕÅdë ~ÕñW&FH~䦨٨m•|’èó±ÈJ„ßxåMµø+Î+¾ø—”8Od&8åÄÐ#„ÌJ,Ì%Š2ŠI€Œ•RuD•ò8’!tl/0x'Fxᮜ£•ŸAÀ2Keµ¡Ùyq‹ñ»þ9ܪðÊà \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/83/53b9f9deff7c707f280e0f656c80772cca7cd9 b/vendor/libgit2/tests/resources/rebase/.gitted/objects/83/53b9f9deff7c707f280e0f656c80772cca7cd9 deleted file mode 100644 index a4a7e3aa3..000000000 --- a/vendor/libgit2/tests/resources/rebase/.gitted/objects/83/53b9f9deff7c707f280e0f656c80772cca7cd9 +++ /dev/null @@ -1,2 +0,0 @@ -xMAjÃ0E»Ö)þL6]…¬ÒÚBh‚í@»”íq,*kTi\7·ïØèJðçóæiÏ ·Û‡§}y<|¢:]ÎcΗ§wÔ¯åဗ·ã±÷hlòt+ C"Â÷d“ä%Ÿ­P*ÐÓ ŽCF; ¦X˜êíÏû²<Õr›l¤6tëÜat®¥B#âü âä¶PeJÁÅ•eòh½ß¡açáW -âo™1ð”ò¢DQ·º€^#pBï~‘§Ð­–Z1ɶ_Ë(Ðòö'*°Êg¯6kד* v,0;)FJ«y¶^væ.’=ÏÿEà9\ïMJº_m§¸AÍ£ΰ‰cè·%ïõ°]çDo=† .#³öÍ óŒŠ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/85/258e426a341cc1aa035ac7f6d18f84fed2ab38 b/vendor/libgit2/tests/resources/rebase/.gitted/objects/85/258e426a341cc1aa035ac7f6d18f84fed2ab38 deleted file mode 100644 index af1106d6aa290c265027ee5b7fc80267ad3b9dde..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 208 zcmV;>05AV|0V^p=O;s>5GG{O}FfcPQQAjKTj;SFV484ZsWk8T$lY^VAlR8|EF&&z4D;^ KmI449`dfQT@;^+W;)Ccs9nFBnz#p_k~>W zAqDnm6S^g=QERK{Hm-e#PyVHy;p^Jl(Kk5DO#jup+>3`h<=)<4vFNPz)CBvww1OEXD697RvbI)u?gYn`NnC1 zW1RW<{-*V@rO%(fe);hI+ru-xp5D#}W6p0EdV0B>=z-3s3*|8}(|fTg3&nv}n>jVN z=NMcJLS4xuv-Q5A7}&g?Pp6m1w`VPHz3nDicv(2n5=-d0Z^(w8@*1^3tj`UtE|2?5 z+D9AluH(AVvkf%b`AD8KxlCe4fnAmkzfDDK>h01{zKy)ET z?YAVO3%dL#TVVcwtfH#ZjE~{U=}6g5OcCvvL;p|#(9WYSjl)p?UlUtlasw!CMli|u zl$zmUfcI1ac1hq2zz>3Y!c7gQGH7LFNtM= zr_^rLGsv+tMzTvP<33&|)q1>CfmNm@!qYB>>_TzjO3=M_6}))u9jzF(5nF2xZmvU# zP%>;s!>;>H*JM{bz;l&OHz>~oJq<=bs*GSwA!cMP4cuiULsn+sxa(A03j&VJx?+C?LZF!qj2AMZS^Ydn~LCGO?!`jy_-Z+ UDBYww!6^*WL`puGKPB;mGf7D}^8f$< diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/8d/1f13f93c4995760ac07d129246ac1ff64c0be9 b/vendor/libgit2/tests/resources/rebase/.gitted/objects/8d/1f13f93c4995760ac07d129246ac1ff64c0be9 deleted file mode 100644 index a66cfccb2..000000000 --- a/vendor/libgit2/tests/resources/rebase/.gitted/objects/8d/1f13f93c4995760ac07d129246ac1ff64c0be9 +++ /dev/null @@ -1,2 +0,0 @@ -x¥ŽAnÃ0 {Ö+øMÙ¹ôØ[>@“⃣ÀQïÇ-úƒÜvgÅh[×¥¥é£oî0P"Á±¨³²NX*ÆH4Y1åÌ©R.á&›_;˜MQh0$+CÎcå$³š`ÒšŒæÂAýÒ6ø¶§lçK[ïí -ßéo:ùßðß¾´­GˆŒi¤˜™á1ìt—íþæMøi¶ÔE¥/»Ao0»×ðâ›S€ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/8d/95ea62e621f1d38d230d9e7d206e41096d76af b/vendor/libgit2/tests/resources/rebase/.gitted/objects/8d/95ea62e621f1d38d230d9e7d206e41096d76af deleted file mode 100644 index 464de7c1c67de95b3798f383ad501ed6ec841d91..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 773 zcmV+g1N!`U0c})GZ`3dlD8OJuU}m6_aEv0>*KebF%MUt_w;bHr<>cm4|I>e6bEXVhlaYP z;4qN&p31~Dc$TUDM^B!|i#7&s%+t;7`y2Z5c>h4x7>0>=boF%goj4Si*`FGUxlWL{ zBw8KjwM=7XE2kYjSxm)5GqWw!dA5OU=*im?xk3&nO0hH~DZ6m+O!3HBzruEs8SqT8 zt>+6#F@|CBN+HE1^xRYHZFiu=DRFM<+_FZ!Al8>l?9GgU!Nnj(X^H!VGf30K;iV9d zKa=`&NqwY%ou2g;8{MyitNabM`eS=gu?GDfIxMq_!f-%6 zx1#W}6Bd{ZHT5`IF**cV3`+bAE@4|F;#&;ff? z+zut#Xp|VuymZr!J}m-;c!-(l6qijMaMnPyIj&UzuvD>z=zUz(quGYQ`5i$5W1mCw zPn-j?avmbfXcaCJgr>NR?8pI~Vyy_ga>dj*VF}uI4hA>?Nzv-zb7l{gwPZ0KgwUrG z^)?@xEsk|K=2(cMMyR8k8?YJKfC=PXDfkMNh1zaLk_Bx?Lr2~4{AM6^o_FTHWLud# z*;wc`-9MvFxV|zLtgh6D;2gg#Ts5MgUK3&dp9oElimD>Pg5(&VinqQf*b6uC04=C` zsQE#bpG&t9s#uOZa(zeyt=s}B5$P+@qFH!K@L<)7YgDzojZq518EpcICGE^_xw_;v Dnyhto diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/8f/4de6c781b9ff9cedfd7f9f9f224e744f97b259 b/vendor/libgit2/tests/resources/rebase/.gitted/objects/8f/4de6c781b9ff9cedfd7f9f9f224e744f97b259 deleted file mode 100644 index faa938958..000000000 --- a/vendor/libgit2/tests/resources/rebase/.gitted/objects/8f/4de6c781b9ff9cedfd7f9f9f224e744f97b259 +++ /dev/null @@ -1 +0,0 @@ -x+)JMU0·d040031QHJ,ÊI­Ô+©(a¨|Ô6eÕƒËlÞl?³‚Øw:/2­g‡ªJ)ÊLM‰/HM+tôýSøêúö5W^¹ÿ;?ñSçú#;a9$j \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/92/54a37fde7e97f9a28dee2967fdb2c5d1ed94e9 b/vendor/libgit2/tests/resources/rebase/.gitted/objects/92/54a37fde7e97f9a28dee2967fdb2c5d1ed94e9 deleted file mode 100644 index 10d6c134f..000000000 --- a/vendor/libgit2/tests/resources/rebase/.gitted/objects/92/54a37fde7e97f9a28dee2967fdb2c5d1ed94e9 +++ /dev/null @@ -1 +0,0 @@ -xERËnã0 ìY_Á0z+Z '5uè¢Îúœe…Ž…(–V¢äï—RŠöd‰Îp8­áéåùAv{ÙÊÍÐA× ûG!zùQúZø#ÛM oÃçj[wà&PÑ« N)VuPÁ,F£½U 1f·pyѳhÖÐokè›}WZŽ`Õ hÆ ?ÃUnšÏ5ˆ¤ì9˜g¢sKþŠõ®­á°ë· a¿«W50ó›\5ŸLˤá„,jGHþ.æÑ{ …0*K¯B¾¿Chàï Û¾ËÙ×m£3ö.HÆ–ÓÏ4á_2Ä㹉ª Z„O¶Œ|ákpé4óÑàÞu#Åþ²§âÈñ–*¸ÎFÏpI‘`D`bTúœW‘¡ÞÑk.ò½à™SsÃM] ÍKÎGÞ´øIã›{VG¦æ« Ÿ8’âŒ#J ;˽ù‘'PŒ¶Èû(bš&£ .dopäø²Ñ»vÑœ¬KÕ˜ˆ#+ ½{þv‹á«üÉ?ŠÿÐwǃ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/95/39b2cc291d6a6b1b266df8474d31fdd344dd79 b/vendor/libgit2/tests/resources/rebase/.gitted/objects/95/39b2cc291d6a6b1b266df8474d31fdd344dd79 deleted file mode 100644 index 96494347320439eb5c1ad707c012d5b0c63194d5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 173 zcmV;e08;;W0i}*X3c@fDMP26MJJv@MCa8xrCwc+)(H<3#N4>*+(0P@8*@M}9mgyYV;JZx zR>>2kgc-TxOokurQYswMlWT(0rA+rS!&VpiNqhYczqXMw?VuyudqkoLYfILeg)Xv9 b|GY8BlEyp=w{cNGXa&w(ulh1?8wgbbVHi$j diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/9a/8535dfcaf7554c728d874f047c5461fb2c71d1 b/vendor/libgit2/tests/resources/rebase/.gitted/objects/9a/8535dfcaf7554c728d874f047c5461fb2c71d1 deleted file mode 100644 index d997426b2d01f1d596d14be0dba16f05f3f17257..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 208 zcmV;>05AV|0V^p=O;s>5GG{O}FfcPQQAjK*bF-)ZbitUz~A8-NutKB~y;hfT}7>P0RtSNzgpaU>*5g;OC0hH*d{5r(4X< Koe2Qbh+MNWE@jsM diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/9c/d483e7da23819d7f71d24e9843812337886753 b/vendor/libgit2/tests/resources/rebase/.gitted/objects/9c/d483e7da23819d7f71d24e9843812337886753 deleted file mode 100644 index d16845506..000000000 --- a/vendor/libgit2/tests/resources/rebase/.gitted/objects/9c/d483e7da23819d7f71d24e9843812337886753 +++ /dev/null @@ -1 +0,0 @@ -xMAjÃ0E»Ö)þL6]…¬ÒÚ€ÛÛv)ÛãXTѨҨ®o_ÙèJðçóæiZË-·Û‡§}U>QŸ.çRçKƒÓ;š×êpÀ˱,kð€VKs¾“—|ÒB¡À@Øv]$_¨úøç}Uš± ÚSíúunœ0zÓQ‘#PÆÙ…éÄȼP%güÊRõÛ¾,whÙXÁ•œØ21FN!.JäàóVã0ä0˜‚çäúÕ2WTÐÝ×2r´¼nI„]Xå£Í6k×RVõ­Àdd„'ï)¬æQ[Ù©»H´<ýew½7)äýÙ6ù ¾iá(cývdmþtßÉ7C>†Œ&"rî«?v„‹ê \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/a0/1a6ee390f65d834375e072952deaee0c5e92f7 b/vendor/libgit2/tests/resources/rebase/.gitted/objects/a0/1a6ee390f65d834375e072952deaee0c5e92f7 deleted file mode 100644 index eb98c9da52e3cd72be5a7d30edea584bb55ad63a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 90 zcmV-g0HyzU0V^p=O;s?rWH2-^Ff%bxNJ=cqNv+f?sVHGEXa?1$}JmNOlk`R=OY w9jlL4%urP+MVYB7@dc@gV1uW{5w(g(b{qLS_(_MzU-=E(B0KfJnYtAPtPyhe` diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/a0/fa65f96c1e3bdc7287e334229279dcc1248fa4 b/vendor/libgit2/tests/resources/rebase/.gitted/objects/a0/fa65f96c1e3bdc7287e334229279dcc1248fa4 deleted file mode 100644 index fd43545ce..000000000 --- a/vendor/libgit2/tests/resources/rebase/.gitted/objects/a0/fa65f96c1e3bdc7287e334229279dcc1248fa4 +++ /dev/null @@ -1,3 +0,0 @@ -xERÍnà ޙ§ðD½M›ÔS6µ«´i©šöqL£¾ý ­ºSÀ|þ~ìtÆuðúþöR·ûúPZh›Ó~%ıþÞÀ¶9à§>|màãôû¹Û´àÑË Ï)VUAX­ÐÜ*P‰3€³\¶jÍŽ» ›}[´=yqægX$aà¦Ñù\ƒHÒL±À<˜³ù+M#Hðf+TÎ2-“†3W¬ft¶ü]Ì£÷ -a”†ÖBö=Ðâà’d ˜9:§Í]´)§§¾$MlÏ Te>™byækpéœmEW¼ëF -’óåL…Èñ”*XF­F˜S$è8£àSE†zGë\ä{Á3§â† ÿC• d,9Ÿí‹ç6ܣ왚;ŒÔ|â•”d¼¢d9YÖ‰Èì€' •Ažw@Ó0h¥Ñ’¹AÏëËAïÚEs0.ñªºD¼²2ÐY›é‘õüɯÄ9Ï̃ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/a1/25b9b655932711abceaf8962948e6b601d67b6 b/vendor/libgit2/tests/resources/rebase/.gitted/objects/a1/25b9b655932711abceaf8962948e6b601d67b6 deleted file mode 100644 index 50bcee1092e976df746cf3c81eb020b8d28dad1f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 89 zcmV-f0H*(V0V^p=O;s?rWH2-^Ff%bxNJ=cqNv+f?sVHGEXa?1$}JmNOlk`R=OY v9jlL4%urP+MVYB7@dc@gV1@6LkG^}m_D5t4|2HnP-056maptxF&G#b*m=-B~ diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/a7/00acc970eccccc73be53cd269462176544e6d1 b/vendor/libgit2/tests/resources/rebase/.gitted/objects/a7/00acc970eccccc73be53cd269462176544e6d1 deleted file mode 100644 index e5c62dba737e0fd0aff0bdc27e10fb2c7000f1cf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 373 zcmV-*0gC>30Yy?vZsRZvowZKE0|ea_GeB3yG-wOVq(+k*fR^c)up+4v)gZSorMT_N zvi$gd^x(n(_kVu>>h^v2);%5fuzx-Fcg7rWA(%o*;4qyChT`o^8NvjZBPKkRyn$>J zMgkV_Y{^|WV2dbbg4f*^UUq+~Mb z;PAZtuT1r6CQbwwmKhKtlcj29KpVW$t|o)$;G2aKZ({wn@3(Kz?H*y@{X0Au97m8# zfcJt)TAbCx5ZK*(3A=WJFE=XuURVfnm}FDk>`W}KSw8Db3guL7Wu_0h>1Ii&`D*gU zulcp54P0inGn`8n7zkn!qY;)`MTN#75A{;t8(ulB4lMK&sx|Ocs8(RUx3O~1I4ZSH zIAlHPN?I~qQSq9r>SWT7>OdP{>vXA@$mB9jY?-{cD~!Qw5LvaG=H&EeP_iPrvbLc! TyJbyF>7)GxCEl4&Z*R+kPO`QW diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/a7/b066537e6be7109abfe4ff97b675d4e077da20 b/vendor/libgit2/tests/resources/rebase/.gitted/objects/a7/b066537e6be7109abfe4ff97b675d4e077da20 deleted file mode 100644 index 54f9b66175cf9c6bd4592ad9048f2d45c195beda..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 621 zcmV-z0+RiB0Zmi8uGBCPrS@0M2ZR+A6lkkkfP{p^l@L%*lF7!3W9NEoLil>lIJ-a@ z$8+Yq+=tZD+c)puz54#)=`(%(^6mNJ+;c7DV@brcr9x%SBJ@%@7o{}O&P8%}KTgr7 zs5D?iR}P`06vgS5Qk-hA>wVy1p-r|;GVp2~W$cLKNM%oUK{=F;c3<2ht)u`f#+VIn}IJ(#5a1;LR5xTw{XwHZoM`8?_-rwp z@P^dxM!&$W#l%@j6TqjDy@99J~55yH+;^16EI%6By~P^H2JJZk{8o{uLe9rQ=)d} zB^n27;L9v4oM~y$B>P|eKDrrN?vHJ^2IKD0RzoLBX4T(B;NXRR*#DKsJ8`cVJdCPa zs}VUxw#?c)gS4|xDTd=hPZ3af-w$u?RXjFT#d~%AqyFvPWLjb!7V`;70n8ey<>LMT HT=<4_?*22G diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/aa/4c42aecdfc7cd989bbc3209934ea7cda3f4d88 b/vendor/libgit2/tests/resources/rebase/.gitted/objects/aa/4c42aecdfc7cd989bbc3209934ea7cda3f4d88 deleted file mode 100644 index 628c2d3a1..000000000 --- a/vendor/libgit2/tests/resources/rebase/.gitted/objects/aa/4c42aecdfc7cd989bbc3209934ea7cda3f4d88 +++ /dev/null @@ -1 +0,0 @@ -x¥Á B1D=§Šm@Ùý=Ø l²~À¸#b÷F±o3o`^ÒZK‹~Õ›ˆdfñL“Ï6ìØ1GÏ9¦)̘1 5ôè‹68ó“ÃeÑz×ìeÐO:ÊwøµMÒz€É¡ßZë¦ÖèÍ CÞåÏsb.½ ½fˆÔ®ò2o! Fw \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/ab/25a53ef5622d443ecb0492b7516725f0deac8f b/vendor/libgit2/tests/resources/rebase/.gitted/objects/ab/25a53ef5622d443ecb0492b7516725f0deac8f deleted file mode 100644 index 83ef51e2654b9c3460e951ccdaa52260844a7292..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 208 zcmV;>05AV|0V^p=O;s>5GG{O}FfcPQQAjK~@o7 zJ<40=&xr7?f+|c(O-%!<$@nIr@6&pDo-pUlnmX6Susd@Yroq(YmuBYVWP+7>*MtQy zbnBJWKWv!yI!g8)UqdSwR9SjaVp%0v(UE6o7Qe}QAkufq@Mlr@{T@R(#(1cr{L12z z)FOzD>*bF-)ZbitUz~A8-NutKB~y;hfT}7>P0RtSS-v4HxGwv-z^wgG{!ialdgVd+ KEd>DWwO+qwUS|9N diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/ad/c97cfb874cdfb9d5ab17b54f3771dea6e02ccf b/vendor/libgit2/tests/resources/rebase/.gitted/objects/ad/c97cfb874cdfb9d5ab17b54f3771dea6e02ccf deleted file mode 100644 index cc7ccd086741e69c8497d5d45ab28f9c6aff4754..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 240 zcmV5vtTeZFfcPQQAjK*bF-)ZbitUz~A8-NutK qB~y;hfT}7>P0RtSS-v4HxGwv-z^wgG{!ialdgVd+Ed>CSKW@m+7H>=d diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/ae/87cae12879a3c37d7cc994afc6395bcb0eaf99 b/vendor/libgit2/tests/resources/rebase/.gitted/objects/ae/87cae12879a3c37d7cc994afc6395bcb0eaf99 deleted file mode 100644 index 5c8469eb9ec9c18ab737bd885c21450572151696..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 209 zcmV;?051P{0V^p=O;s>5GG{O}FfcPQQAjKNcK?DVcI~22@p9YGMvp&GHRt!FAcs1!nDk@_+ia(kl05AV|0V^p=O;s>5GG{O}FfcPQQAjK$0B<%-a9t|MYF8S00q# KQUCylv0c)~(q-8I diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/b6/72b141d48c369fee6c4deeb32a904387594365 b/vendor/libgit2/tests/resources/rebase/.gitted/objects/b6/72b141d48c369fee6c4deeb32a904387594365 deleted file mode 100644 index d8cdb71ae13ae80a05daff42de02deb48ee858dc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 174 zcmV;f08#&V0i}*H4gw(%MXfo-TtEY}3(F+N*jU=xn_(Fu#fm|U*OxWk!0!L|lb1i2 zWyuZD;igp)V1qVLaMsd*lQA4-;pE97jb2=E+C(=6rygA8-ass-G-?~!hDnT2(1b(- zCH5=!CW+_KDt@(Fsc?#Kt`RP`vOLQj_R{H^j`AITZ8w+Y0HzBZqV*GO^{BP#w4ZJA cr$(Ji%qh>@a=(C362zJ%ULV5h1H^|_uxO4}4gdfE diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/b7/c536a5883c8adaeb34d5e198c5a3dbbdc608b5 b/vendor/libgit2/tests/resources/rebase/.gitted/objects/b7/c536a5883c8adaeb34d5e198c5a3dbbdc608b5 deleted file mode 100644 index b59498472d3216b7973d5869d564d31fe8e40f15..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 209 zcmV;?051P{0V^p=O;s>5GG{O}FfcPQQAjK(d zZoQKFhYj;yN6FsfYiQ+yDoZa)EUN@7I`Zty;x}0jMEWin{wxZ=-(x7p7!OsHUs+s| zS_D>=v0nbTL;cOQ_r)1k)NMQ&Q!?e~45+HI)WjUHn&lhPg6p!M3(VU85GG{O}FfcPQQAjK*bF-)ZbitUz~A8-NutKB~y;hfT}7>P0RtSIVx_!;_$YjE&iYVLW7;fZKB81 JBml?@Te{XVWxoIb diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/c4/e6cca3ec6ae0148ed231f97257df8c311e015f b/vendor/libgit2/tests/resources/rebase/.gitted/objects/c4/e6cca3ec6ae0148ed231f97257df8c311e015f deleted file mode 100644 index 2bbf28f57..000000000 --- a/vendor/libgit2/tests/resources/rebase/.gitted/objects/c4/e6cca3ec6ae0148ed231f97257df8c311e015f +++ /dev/null @@ -1 +0,0 @@ -x%P1nÄ0 ëìWð¹CNE§N7¶è¡:*‰’p¬Ô’/¸ßWÎmI‘”ú$=^^ŸŸ._ï?¿¸~|žC¸°ã¼6©yTÈ„A¨(#1eôÌÓé´“.ˆ†áÀ(Hto@̸K-aë°Õ°…¡´²“sá1r6)&)8¸Å·TêÖa¶<0ׇ¿JÙ¢Ý[‡ŒK‡5IJ²²­ÈÀªcáÁ¸q͓쌫r_ÍÛ‡"u^@ÐÈ7~X)—›÷2¸ Ýâ G…,æ¥f¬R¸ùå`BÚúÂ4¶3£½ÁvQŸø¤›HÖ©¦Öu­êa²b SwÞcJ q…)fÆ”èæO‚ùvû×;‡í«ŒŸ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/c5/17380440ed78865ffe3fa130b9738615c76618 b/vendor/libgit2/tests/resources/rebase/.gitted/objects/c5/17380440ed78865ffe3fa130b9738615c76618 deleted file mode 100644 index b9a52a310682a51ac5809bc61139840da64cc557..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 649 zcmV;40(Sj)0ZmiOj?*v{W$mxHA5bb-us~f^qZv`DG?m%`v2>D~#)@MHKM3LLIoHV` zmT~Umyl!oMO&>pe{`BtK^YKi#>h-!;>iT-8)8$^#k*?L9QXiP&PO&nUjRg-#FES%XVzD zBp9_zSq+{DnM8kLhJt(gF8@c}Zoo}M<04Sim<7m6vUpbR4Aj;OVfqDgJDDNWF;LSy#Q$aOB@Ly8cI5PwDGPXh2tm~aeWNp26Qv?q|r<) zIZqW#XEt>e0gqu6my#RU2G@CF%i=@oy5>`l;)fK1PHLf5<_a9Op{PY;GNUveB(gW! z8p6Od1hP0pONyTLURF5qi&loqz2rxkVJ|KHsH1$r&+TH#2ha|EkG-}Iw&)O5OWW8g df7YmT;VDg#>eMD^s0D8A`+Qx5)Ej|dR+c2HQEvbM diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/d6/16d97082eb7bb2dc6f180a7cca940993b7a56f b/vendor/libgit2/tests/resources/rebase/.gitted/objects/d6/16d97082eb7bb2dc6f180a7cca940993b7a56f deleted file mode 100644 index fa2e8d9ef..000000000 --- a/vendor/libgit2/tests/resources/rebase/.gitted/objects/d6/16d97082eb7bb2dc6f180a7cca940993b7a56f +++ /dev/null @@ -1 +0,0 @@ -x¥NK uÍ)æš)0-MŒqãÒ`Ð.Z ¢ÆۋƸ{ÿ¼çyª É­jßùÑJ@œD7D”Ä6ô”¼q‘byçVW.²´"³ â¬ÆVC'žCGÚ›–$)%3¦1ô¢ø^/¹À!>¹D8]ò|Ë l¥©´—¯ñc›çt©×„D°F‹¨šÚÎVùsFsœÒ¸Ní‚šá\øñRoV< \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/d6/b9ec0dfb972a6815ace42545cde5f2631cd776 b/vendor/libgit2/tests/resources/rebase/.gitted/objects/d6/b9ec0dfb972a6815ace42545cde5f2631cd776 deleted file mode 100644 index 123970457b57013fa481beb1819abe8098ee500f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 790 zcmV+x1L^#D0c})GZ{s!)?U}z~ZhKJ-bbBb!oSdx}**2RjU5sZ30RXPN3Rdh$HpwJ~sG-X6bvdZe$f#}hpO42aLPf7|~-9E!{AuMNdq z5hN~&RtLP6Y0PZpx}!G>R3MtKhy95@JstMXWJ6EhUda`5fh?t18j_Sj^C4va|*TzYm%{dk!>9S2=Qq73WEU6*osDGfcq#=w**I zY$gy$L+j+aX$#-8y)fA}V!&Gf34)Xr1Z*?uobIWQ6u{|OZ?RE+1+MWo)asw@S;HFi zIdWKL4TXor>&&gFyzGPpLq?i=P&_Lx z4%VpRDwsXzYwhZ7Lg<<$BylGx#sD$jT@wcJtr|OXnpjX|TaYy9QOMpQO`$a|9tA|! z>da;8*}Dz{!4BAq>ULO?%|?mQ%u6@z=(k0X5DzgkUE{K)1J7EBHpjIF0GArp5WSD9 z&SiuJ={Iq->i1q)#vKEP+Ght10iY}U{4zJ7W$dO;=v2~qLr2j#oelM}FqGYX{+>=a@{WkEOR2HPsp z{_Xignd;Y!oCwY=6Cgw;OVvt`Hh867Oa{-vgDnCjUd1BCNU0HKbn<9$7(mVez6vI3 zaTX7KV0ZN;?Ai)`-Kg+aVIjz2l&*rjiN!U`C*7t{j@4FX`lhRHmV}zGCU5+jUt8+n zJh7eNRI)%%5Q`X%FxM(7GzNLBhq`Zg<+OTXrvFf_fr_n#Y6a$R8VmP?gHr1ahpa0d zNlT_9DqfRSolN>u9cTk=oemWfnOw$^Et3~_fgyMeB8zs@9GyM}B`cyMYlWWJ%}ZKJ P-|ZEYcx!$D&c4j!RW+}j diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/da/9c51a23d02d931a486f45ad18cda05cf5d2b94 b/vendor/libgit2/tests/resources/rebase/.gitted/objects/da/9c51a23d02d931a486f45ad18cda05cf5d2b94 deleted file mode 100644 index 85b78eed5..000000000 --- a/vendor/libgit2/tests/resources/rebase/.gitted/objects/da/9c51a23d02d931a486f45ad18cda05cf5d2b94 +++ /dev/null @@ -1,2 +0,0 @@ -x¥Ž;!†­9Å\@3ÀÂ@bŒ¥à1·X1+Æë‹ÆØýäËWڲ̌£M_™! 5Õ[KÆûœ -c´lÊ‘*IÈ£CuO+ß:P¡,Áq¤ ºêPÐy/„¦š’‰"–P'QéÙ¯m…S}¥µÂåÚ–G»ÁžÇúIGþ¿¶+m9€žÌhò¶8!ª±ÙÎbÔ¹ÕYæ’ú<4ô™YÔõ¯S• \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/dc/12ac1e10f2be70e8ecd52132a08da98a309c3a b/vendor/libgit2/tests/resources/rebase/.gitted/objects/dc/12ac1e10f2be70e8ecd52132a08da98a309c3a deleted file mode 100644 index 9907248f8..000000000 --- a/vendor/libgit2/tests/resources/rebase/.gitted/objects/dc/12ac1e10f2be70e8ecd52132a08da98a309c3a +++ /dev/null @@ -1 +0,0 @@ -x¥ŽMJ1…]çÅì•ÊϤ¦Ad@\ºóUIÅCw†LD¼½Q¼»÷Þ/µm«…»ÑUAI1eq‹U<ùhKfO‘¼gë$Ø#2/æÊ]÷š ‰/%«.¤ˆÙå(–-.Ÿâä ŒµuxÉŸÜ3¼­m»µu®?鬿à¯=¤¶= x$ŒD Üc@4s²CÿycžWíý ®5]êþ‡×–k©‰GJFQ-ó ºZy \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/df/d3d25264693fcd7348ad286f3c34f3f6b30918 b/vendor/libgit2/tests/resources/rebase/.gitted/objects/df/d3d25264693fcd7348ad286f3c34f3f6b30918 deleted file mode 100644 index 3de3fda62fce2b75e53e8fe502dbc4e8f7f6443c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 177 zcmV;i08amS0i};kP6QzkgC?J^_H!j_Ifr2WWUi4tPnRtECcmsFuCwci^ z8~eUZK*EQ4s6yzKO0J?IN)pW8tMAC%dhMDyY3gK|qWR=QZxbAL%qk^i@5vtTeZFfcPQQAjK05AV|0V^p=O;s>5GG{O}FfcPQQAjK$uPiP} zErQs%UjDd4{mr%a#Ti%BZ9ExMGUezDsH(Em#2m1i$0B<%-a9t|MYF8S00q# KQUCxrG+hBKIAUG^ diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/e9/5f47e016dcc70b0b888df8e40e97b8aabafd4c b/vendor/libgit2/tests/resources/rebase/.gitted/objects/e9/5f47e016dcc70b0b888df8e40e97b8aabafd4c deleted file mode 100644 index cc3312a4730f93e6b76d43ea2c52e5188f8c7573..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 279 zcmV+y0qFjC0VPmDZo)te?0H`?4**oDr>ZBUBFY7536(fHi9=S}tfO6rh~L+n-mIDN z%-D618gK8fFZ-YE?+usJ^}KOzzpJo2?7u3UPuJt;1=67rN|_OuB5LMty`Cxe@QP-^ zD7FanEP#)A%9PysRIM;h3!ptC)4)dF6StnDW>7{a2@BWTR+ed8VfNbpW2SfC*X^-7 zRJYP$Cgrq3iRvT-nHSlZq~V;=`oxWL;fg2e1{Y0az82t$w+%_Adk;eP{NR79%;{mh z6ecLQSi({vidv~V21#7}qEn$<0_w!nmNUJ6Kxctc9eABbk(j$Fl&-^+EldV9q}iNj d9|EXtL9X+W(FJšæÐÚäé^AÆD„Ÿb“äEŸ­Pª0Ð ŽCFW%V&»:›«1wÉFêaC¿î]Fï:ªTiœ_2ƒ8¹/©RRpqÍ2y²Þïвóp‚+ñwÈ̹¤¼ Q@Ô«.`P œ0¸_Bäú•R-&Ùî{YZ怩ˆpP€>{¥Y½ži´S…ÙɈH1RZɳõ²3ìyþÏáúpRÒûJ[âgž¬p†M¤1†ny¯_Àö½í Z†ŒNkbõ›?ŒÂÊ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/ec/725f5639730640f91cd0be5f2d6d7ac5d69c79 b/vendor/libgit2/tests/resources/rebase/.gitted/objects/ec/725f5639730640f91cd0be5f2d6d7ac5d69c79 deleted file mode 100644 index 0fb3334db17ba5880aeb725e41927a9f25557d26..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 377 zcmV-<0fzo~0X309ZsRZvMZ4B1{sBDQwOx2+AO@yrk#>^w0J2TjLS<1SN-=u-q1?=l z6sgbm$-(o0ho{H8!|Ay{;Jxo~e*1X8H|Em4^mse=`18@7F5npwy~~JXr2!|ry47MJ z8#LV(H!iS=^dV;Y3$5n)h|BL&f73Zvp(~|t2+tXt)n;riFWQ`lz`=14j0?v| z6H07!poYnG#{!roO&hOgD8)M;;q{V8bYS4;}yoU`Fq7}LIEs4vg0vd62r51^D zNud_u-QVISxR80zBj-i~H-1ro`rY9yyiK2k=x9{P*$k!H+{esb2^3QeyP&pKf_OKQ zRI5P)i1oTRPG8Ob;U;D>*P|i7ghZ@eYyMN>-^Mk)1H^clOd|sUvk)q{|p+ XX1(w?mx`C_*IE@W@!tFcToK8Xn6|@g diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/ed/f7b3ffde1624c60d2d6b1a2bb792d86de172e0 b/vendor/libgit2/tests/resources/rebase/.gitted/objects/ed/f7b3ffde1624c60d2d6b1a2bb792d86de172e0 deleted file mode 100644 index e2e98d6d8..000000000 --- a/vendor/libgit2/tests/resources/rebase/.gitted/objects/ed/f7b3ffde1624c60d2d6b1a2bb792d86de172e0 +++ /dev/null @@ -1,3 +0,0 @@ -x¥OKN!uÍ)êh¡ -ctá f?ú8½èfÒb¼¾8™¸{Ÿä}¸oÛ:`Iø0U¨Â…ØZ¦Èb­Hª-PKÑž‰‚hEõ ³¹k=t@LÍrÒBÙ‚„Ì>!ùEnDˆ­p–h®~K?àC~ê!pºôí«ïð¢SýCoz3îì‰ûö -!úD± <úè½›ê;ôŸ1î]dë¬ïŸóõ~¾ju¿Z’U„ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/ee/23c5eeedadf8595c0ff60a366d970a165e373d b/vendor/libgit2/tests/resources/rebase/.gitted/objects/ee/23c5eeedadf8595c0ff60a366d970a165e373d deleted file mode 100644 index b32600f78503917778b60b3d303fa467b1c3628b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 372 zcmV-)0gL{40X309QsgiUMOph4{{VpC0n;=Ga1w>Ma4e5ycZ%C1n`S3j z^4I&)=y}BL-#=G($A{q#ufqXvFYm86#+(k1174m7{ChtfPv8X-y~~JXr2{8Cxy@oE z8#LWlH?6RV^dVaM5|ILT5@}5MDBNtIgP5UbQ(9frH~9m{yLF zW|Y|JKn;_zVTM?rdyMRS(?;GIE0-iaHY-(wHtgg*YIn3Em%cS|`A|S3j?UC0Q7$Re zBE0)w+zb~ow>)z0G;q@=1*qQ!XW?!7AVf!#LM~=3)n*&BcqLFwHSB`g+6dy^L{hB= z4H`Bgr_Zi^xQLld_F5uyScUx&sw5rHIUOMx0#H~oyEB^YaBXw7#%NS{4z3>;8 SikIrwS`{ww#(V?BAj)*hwzG@? diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/ee/f0edde5daa94da5f297d4ddb5dfbc1980f0902 b/vendor/libgit2/tests/resources/rebase/.gitted/objects/ee/f0edde5daa94da5f297d4ddb5dfbc1980f0902 deleted file mode 100644 index e9b3f58c65bd5df07a1eceada0f0d59b37cc06bf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 55 zcmV-70LcG%0V^p=O;s?qU@$Z=Ff%bxNJ=cqNv+f?sVHGEXa?1$}JmNOlk`R=OY N9jlL4%m93_6GAyO7bO4y diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/ef/ad0b11c47cb2f0220cbd6f5b0f93bb99064b00 b/vendor/libgit2/tests/resources/rebase/.gitted/objects/ef/ad0b11c47cb2f0220cbd6f5b0f93bb99064b00 deleted file mode 100644 index 285e14056..000000000 --- a/vendor/libgit2/tests/resources/rebase/.gitted/objects/ef/ad0b11c47cb2f0220cbd6f5b0f93bb99064b00 +++ /dev/null @@ -1 +0,0 @@ -x¥=nÃ0 …3ë¼@ Š¢dŠ.»å¬D&l¶‚^¿jÐt{?ÀÃ÷J[×¥%:õ]r¤˜•)I`_ŠÁ¥L–ªÏ–Ù´’|…ìî²ëÖaŒ3¢F1¤H"ÂxfoÈXb%ÓÉ&'~k;|ÔoÙ+\nm=Úgé¯z×gñç^K[ßÀ3ÆD>Í ^ƺ‘Ø®ÿœqŸ­.¶éË@ˆÐÈ1þÈõq¸æ©V \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/f5/56d5fef35003561dc0b64b37057d7541239105 b/vendor/libgit2/tests/resources/rebase/.gitted/objects/f5/56d5fef35003561dc0b64b37057d7541239105 deleted file mode 100644 index f4143e1f5506bed257b104d6343cbc40c29ce799..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 90 zcmV-g0HyzU0V^p=O;s?rWH2-^Ff%bxNJ=cqNv+f?sVHGEXa?1$}JmNOlk`R=OY w9jlL4%urP+MVYB7@dc@gV1>EA+b{9k?pdI_Wbup%g8nymWd%M50L8*2Tg7E4@c;k- diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/f6/3fa37e285bd11b0a7b48fa584a4091814a3ada b/vendor/libgit2/tests/resources/rebase/.gitted/objects/f6/3fa37e285bd11b0a7b48fa584a4091814a3ada deleted file mode 100644 index e650383a22e03d10db15aede5419ea655f61c3d0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 55 zcmV-70LcG%0V^p=O;s?qU@$Z=Ff%bxNJ=cqNv+f?sVHH1`AJ9M|KmJ{{ Nx`2hP2mo-a5+*{L7VH23 diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/f7/5c193a1df47186727179f24867bc4d27a8991f b/vendor/libgit2/tests/resources/rebase/.gitted/objects/f7/5c193a1df47186727179f24867bc4d27a8991f deleted file mode 100644 index 618cb68148e321b5bfbe692ac3592da5e73ca458..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 802 zcmV+-1Ks?10c})GZ{s!)?U}z~ZoMc5+8zotCuggL(`MsfZEw)tM$$+kOpz){+4aBg z8_J7qfnIFLqG#SG8y6b-;isQ}{O+l)Khj};dfOOt-2PtEaaYss`Sn*i;FCg6jYwZn zyJS4{#LiJ3g?cAxEWhZJli{HWUMlmxd;YMaPp89?o-hm(UupZk{e#438^zr!3b9N` zVVUV_F|QFCqHwxx=$$bY6V0c3d!!F9_4bw6cjWj+Hk0+lG>2SKnxpk+CloFc^%b^L zng9Tr1e zv)0#4qxkO=$uO)+ltlnx|6X@e%Q1$WD7BGiY*NgS%$(jT(jDawl$Yr3oM`6w?F>le zK%H&nQGrGPxFh*%;fR@`H}BhH{TZtZSrr@_Q0qdHmBv|QRuKlM>~3Xy%EFz+LldmC zexTl7#O(H`&xeYxqix4kd?$Pn;wHf0Re%|QbSoAJM^c|2sSD(>(}|uE^R|b-`{x(h ze^FqK{+Z7Z4-rv(sa+-&Mf%05=bRK?v`G?7hMM{~ax#hzTJ%bM#7C-V#;{`aDp~{Y z)Mp)hn*bHkLcrui=i-5lA})Z%NxYS;-W@{Ln4rW%nnUma^RHt`u=pO0jX92z5M<6- z^W+i8&O*&Z*RVJQ5LzoU8>tg#Th7`6z9?>slB_gx2xeN^aYMf?DI?f@h(foptm=UC zGDEExu0;T_RI&QtT)3)76MHZ57nQ*9*U)g|;r)BO|bgyUDif~(EtBDlwI4OfXM zsFy^T|4)RbM@3bUV8Lt!-->qP{DGML9!~J(8@KCDIk40 gFq(y{1Q%ARxQ^8FRz@i#iD(l@Ec3?v1DJH(wPB`}cmMzZ diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/f8/7d14a4a236582a0278a916340a793714256864 b/vendor/libgit2/tests/resources/rebase/.gitted/objects/f8/7d14a4a236582a0278a916340a793714256864 deleted file mode 100644 index 1d29712c5..000000000 --- a/vendor/libgit2/tests/resources/rebase/.gitted/objects/f8/7d14a4a236582a0278a916340a793714256864 +++ /dev/null @@ -1,2 +0,0 @@ -x¥ŽKŠAD]×)òUÙõqãÒÈÎ6ØÖЖz}Ûan0»ˆN1‘Kà~hÑ[¯†Š#ŽU²«b–4cP¯LƼij£G¿´Žò¢Eà|ió½Ýà[WúIýþÚ·y!ú”‡œaë£÷n¥«l×Þ¸S“É&¦>­ -ôO¥«{äƒTÈ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/fc/e0584b379f535e50e036db587db71884ea6b36 b/vendor/libgit2/tests/resources/rebase/.gitted/objects/fc/e0584b379f535e50e036db587db71884ea6b36 deleted file mode 100644 index ce8b2fb54aa19cf67ed1ec6491b9265c9130f5d4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 281 zcmV+!0p|XA0VPn&j)FiC-1B@zeSn%x_O#iP$rAM5WE(LNcg5Q=4j9{edn5rP}c}Od@0GW|y)KbLhRufQB?g f<;6M&YFm)$?8xXGJ>y8w_?@nBG<2*eK(fL(So$ovP zbpzpRbt+Wiq?-l`CRN`pUvSK^o|~=WB!phksfhaE=JlVLJ)Dn`~DdU1Yvrj>l_zo4eA`2mp_&;vFX BuR#C+ diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/objects/ff/dfa89389040a87008c4ab1834120d3046daaea b/vendor/libgit2/tests/resources/rebase/.gitted/objects/ff/dfa89389040a87008c4ab1834120d3046daaea deleted file mode 100644 index 54c938e2e710a21ace8561627587660f3e922ddb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 208 zcmV;>05AV|0V^p=O;s>5GG{O}FfcPQQAjKtGT9 diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/refs/heads/asparagus b/vendor/libgit2/tests/resources/rebase/.gitted/refs/heads/asparagus deleted file mode 100644 index a3c9d67c4..000000000 --- a/vendor/libgit2/tests/resources/rebase/.gitted/refs/heads/asparagus +++ /dev/null @@ -1 +0,0 @@ -4b21eb6eeeec7f8fc89a1d334faff9bd5f5f8c34 diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/refs/heads/barley b/vendor/libgit2/tests/resources/rebase/.gitted/refs/heads/barley deleted file mode 100644 index feab9443f..000000000 --- a/vendor/libgit2/tests/resources/rebase/.gitted/refs/heads/barley +++ /dev/null @@ -1 +0,0 @@ -12c084412b952396962eb420716df01022b847cc diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/refs/heads/beef b/vendor/libgit2/tests/resources/rebase/.gitted/refs/heads/beef deleted file mode 100644 index 1c69e6ac5..000000000 --- a/vendor/libgit2/tests/resources/rebase/.gitted/refs/heads/beef +++ /dev/null @@ -1 +0,0 @@ -b146bd7608eac53d9bf9e1a6963543588b555c64 diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/refs/heads/dried_pea b/vendor/libgit2/tests/resources/rebase/.gitted/refs/heads/dried_pea deleted file mode 100644 index 9ede6023c..000000000 --- a/vendor/libgit2/tests/resources/rebase/.gitted/refs/heads/dried_pea +++ /dev/null @@ -1 +0,0 @@ -7f37fe2d7320360f8a9118b1ed8fba6f38481679 diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/refs/heads/gravy b/vendor/libgit2/tests/resources/rebase/.gitted/refs/heads/gravy deleted file mode 100644 index 3753b7330..000000000 --- a/vendor/libgit2/tests/resources/rebase/.gitted/refs/heads/gravy +++ /dev/null @@ -1 +0,0 @@ -d616d97082eb7bb2dc6f180a7cca940993b7a56f diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/refs/heads/green_pea b/vendor/libgit2/tests/resources/rebase/.gitted/refs/heads/green_pea deleted file mode 100644 index 3bffe27d1..000000000 --- a/vendor/libgit2/tests/resources/rebase/.gitted/refs/heads/green_pea +++ /dev/null @@ -1 +0,0 @@ -d482e77aecb8e07da43e4cad6e0dcb59219e12af diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/refs/heads/master b/vendor/libgit2/tests/resources/rebase/.gitted/refs/heads/master deleted file mode 100644 index abbe9cc15..000000000 --- a/vendor/libgit2/tests/resources/rebase/.gitted/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -efad0b11c47cb2f0220cbd6f5b0f93bb99064b00 diff --git a/vendor/libgit2/tests/resources/rebase/.gitted/refs/heads/veal b/vendor/libgit2/tests/resources/rebase/.gitted/refs/heads/veal deleted file mode 100644 index 484f48976..000000000 --- a/vendor/libgit2/tests/resources/rebase/.gitted/refs/heads/veal +++ /dev/null @@ -1 +0,0 @@ -f87d14a4a236582a0278a916340a793714256864 diff --git a/vendor/libgit2/tests/resources/rebase/asparagus.txt b/vendor/libgit2/tests/resources/rebase/asparagus.txt deleted file mode 100644 index 67ed7afb2..000000000 --- a/vendor/libgit2/tests/resources/rebase/asparagus.txt +++ /dev/null @@ -1,10 +0,0 @@ -ASPARAGUS SOUP. - -TAKE FOUR LARGE BUNCHES of asparagus, scrape it nicely, cut off one inch -OF THE TOPS, and lay them in water, chop the stalks and put them on the -FIRE WITH A PIECE OF BACON, a large onion cut up, and pepper and salt; -ADD TWO QUARTS OF WATER, boil them till the stalks are quite soft, then -PULP THEM THROUGH A SIEVE, and strain the water to it, which must be put -back in the pot; put into it a chicken cut up, with the tops of -asparagus which had been laid by, boil it until these last articles are -sufficiently done, thicken with flour, butter and milk, and serve it up. diff --git a/vendor/libgit2/tests/resources/rebase/beef.txt b/vendor/libgit2/tests/resources/rebase/beef.txt deleted file mode 100644 index 68f6182f4..000000000 --- a/vendor/libgit2/tests/resources/rebase/beef.txt +++ /dev/null @@ -1,22 +0,0 @@ -BEEF SOUP. - -Take the hind shin of beef, cut off all the flesh off the leg-bone, -which must be taken away entirely, or the soup will be greasy. Wash the -meat clean and lay it in a pot, sprinkle over it one small -table-spoonful of pounded black pepper, and two of salt; three onions -the size of a hen's egg, cut small, six small carrots scraped and cut -up, two small turnips pared and cut into dice; pour on three quarts of -water, cover the pot close, and keep it gently and steadily boiling five -hours, which will leave about three pints of clear soup; do not let the -pot boil over, but take off the scum carefully, as it rises. When it has -boiled four hours, put in a small bundle of thyme and parsley, and a -pint of celery cut small, or a tea-spoonful of celery seed pounded. -These latter ingredients would lose their delicate flavour if boiled too -much. Just before you take it up, brown it in the following manner: put -a small table-spoonful of nice brown sugar into an iron skillet, set it -on the fire and stir it till it melts and looks very dark, pour into it -a ladle full of the soup, a little at a time; stirring it all the while. -Strain this browning and mix it well with the soup; take out the bundle -of thyme and parsley, put the nicest pieces of meat in your tureen, and -pour on the soup and vegetables; put in some toasted bread cut in dice, -and serve it up. diff --git a/vendor/libgit2/tests/resources/rebase/bouilli.txt b/vendor/libgit2/tests/resources/rebase/bouilli.txt deleted file mode 100644 index 4b7c56500..000000000 --- a/vendor/libgit2/tests/resources/rebase/bouilli.txt +++ /dev/null @@ -1,18 +0,0 @@ -SOUP WITH BOUILLI. - -Take the nicest part of the thick brisket of beef, about eight pounds, -put it into a pot with every thing directed for the other soup; make it -exactly in the same way, only put it on an hour sooner, that you may -have time to prepare the bouilli; after it has boiled five hours, take -out the beef, cover up the soup and set it near the fire that it may -keep hot. Take the skin off the beef, have the yelk of an egg well -beaten, dip a feather in it and wash the top of your beef, sprinkle over -it the crumb of stale bread finely grated, put it in a Dutch oven -previously heated, put the top on with coals enough to brown, but not -burn the beef; let it stand nearly an hour, and prepare your gravy -thus:--Take a sufficient quantity of soup and the vegetables boiled in -it; add to it a table-spoonful of red wine, and two of mushroom catsup, -thicken with a little bit of butter and a little brown flour; make it -very hot, pour it in your dish, and put the beef on it. Garnish it with -green pickle, cut in thin slices, serve up the soup in a tureen with -bits of toasted bread. diff --git a/vendor/libgit2/tests/resources/rebase/gravy.txt b/vendor/libgit2/tests/resources/rebase/gravy.txt deleted file mode 100644 index c4e6cca3e..000000000 --- a/vendor/libgit2/tests/resources/rebase/gravy.txt +++ /dev/null @@ -1,8 +0,0 @@ -GRAVY SOUP. - -Get eight pounds of coarse lean beef--wash it clean and lay it in your -pot, put in the same ingredients as for the shin soup, with the same -quantity of water, and follow the process directed for that. Strain the -soup through a sieve, and serve it up clear, with nothing more than -toasted bread in it; two table-spoonsful of mushroom catsup will add a -fine flavour to the soup. diff --git a/vendor/libgit2/tests/resources/rebase/oyster.txt b/vendor/libgit2/tests/resources/rebase/oyster.txt deleted file mode 100644 index 68af1fc74..000000000 --- a/vendor/libgit2/tests/resources/rebase/oyster.txt +++ /dev/null @@ -1,13 +0,0 @@ -OYSTER SOUP. - -Wash and drain two quarts of oysters, put them on with three quarts of -water, three onions chopped up, two or three slices of lean ham, pepper -and salt; boil it till reduced one-half, strain it through a sieve, -return the liquid into the pot, put in one quart of fresh oysters, boil -it till they are sufficiently done, and thicken the soup with four -spoonsful of flour, two gills of rich cream, and the yelks of six new -laid eggs beaten well; boil it a few minutes after the thickening is put -in. Take care that it does not curdle, and that the flour is not in -lumps; serve it up with the last oysters that were put in. If the -flavour of thyme be agreeable, you may put in a little, but take care -that it does not boil in it long enough to discolour the soup. diff --git a/vendor/libgit2/tests/resources/rebase/veal.txt b/vendor/libgit2/tests/resources/rebase/veal.txt deleted file mode 100644 index a7b066537..000000000 --- a/vendor/libgit2/tests/resources/rebase/veal.txt +++ /dev/null @@ -1,18 +0,0 @@ -VEAL SOUP. - -Put into a pot three quarts of water, three onions cut small, one -spoonful of black pepper pounded, and two of salt, with two or three -slices of lean ham; let it boil steadily two hours; skim it -occasionally, then put into it a shin of veal, let it boil two hours -longer; take out the slices of ham, and skim off the grease if any -should rise, take a gill of good cream, mix with it two table-spoonsful -of flour very nicely, and the yelks of two eggs beaten well, strain this -mixture, and add some chopped parsley; pour some soup on by degrees, -stir it well, and pour it into the pot, continuing to stir until it has -boiled two or three minutes to take off the raw taste of the eggs. If -the cream be not perfectly sweet, and the eggs quite new, the thickening -will curdle in the soup. For a change you may put a dozen ripe tomatos -in, first taking off their skins, by letting them stand a few minutes in -hot water, when they may be easily peeled. When made in this way you -must thicken it with the flour only. Any part of the veal may be used, -but the shin or knuckle is the nicest. diff --git a/vendor/libgit2/tests/resources/redundant.git/HEAD b/vendor/libgit2/tests/resources/redundant.git/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/vendor/libgit2/tests/resources/redundant.git/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/vendor/libgit2/tests/resources/redundant.git/config b/vendor/libgit2/tests/resources/redundant.git/config deleted file mode 100755 index 2f8958058..000000000 --- a/vendor/libgit2/tests/resources/redundant.git/config +++ /dev/null @@ -1,5 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = true - logallrefupdates = true diff --git a/vendor/libgit2/tests/resources/redundant.git/objects/info/packs b/vendor/libgit2/tests/resources/redundant.git/objects/info/packs deleted file mode 100644 index fbf960f10..000000000 --- a/vendor/libgit2/tests/resources/redundant.git/objects/info/packs +++ /dev/null @@ -1,2 +0,0 @@ -P pack-3d944c0c5bcb6b16209af847052c6ff1a521529d.pack - diff --git a/vendor/libgit2/tests/resources/redundant.git/objects/pack/pack-3d944c0c5bcb6b16209af847052c6ff1a521529d.idx b/vendor/libgit2/tests/resources/redundant.git/objects/pack/pack-3d944c0c5bcb6b16209af847052c6ff1a521529d.idx deleted file mode 100644 index d8e099a984354feb9b22929c72bc9a0004931514..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 121136 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≈&i>o)EFFhkWV=_%t56}1l z-)8Ds-xx^O@cWP)gX!gCg^NW4avr$HJNHT)6=%(HV88)nWnLPLts!|X+ z)v=$EvqgI>7i~gfM~2WW?w3|_hLRPXbS_El=&PI}QQi5qZW~2%Ruip-ywSg_3KDY@ zk9drUn3&q+qWaC~l3#EA5Ck(FFY0Nq(s;1Qjlg7Vm~_J|5K)i2awV}9PM zX}V(ky;E&VE^_BA+zBAy@inu>js z<4Z5owcAnR*-N$$#Z&?)ND0m}Lbvl02=o&< zT?ujOllPV7p%jSUx%=;c}?CM=3v>R$(#ht=mek4$R`May$M_HGH&J>;axnZDe9B1)M@eC+5ow8w_Zh$1u z3cq;fE(k){)D&JwO4+x~s=Di$8QCN#e(cp@PhDm&Lb*(%7V)WUEs9%+*iWfwyR;sS zk@6texRoHoRx!{7SLr=Te_^LGit^!&2cJ%3iTD@i_N6L(Z{{#%5#=+N> z#?J55ZxgXN);!pY$^NI4l@KgV_qv0PyB``>R;^c<_sWp_Zx9^&x|K_I>dxz``9{gQ zZ>Iukyb!X_BOY)UEPd?`xH&5VUo-Z4ULfp8X!b*-I`*uIA@10MuyQ>k(GWwdODC?P z$!S@KTJJ_~_aU>cT8P!Vg0;c#ipy{C(UL2d*{;%#91uGU?tf>7##u1$jkN_C@x2hH zPKZ6UKu5cJ){s0+$$(qDP?p&oA9Oc^El4Ol)xUyy0S;j)a1=1?&-Q4jaxx$fKKISFW7hxKJbI1$k6q(e~8O zOg6u-c*82|SvqUsp+ajMPN_DJ{XG+$%c&}6vn&`QMui&OpinfiV2g2g}T12 zQIX)2$7#ns(x+V@-#_;u*WTM@Q!#%Qb-Ker!H!xwG2gH?w@ayOq7sV?t&QDImRDpL z0)Bj64z#&#r!px^G2e79H1xOINJ$T!sL|}#qO#iI7TVL5`tEB8l}|+OoFnx6NM*0! zU~X`ncln{xPCntc_h}IkE0u@!WmLFpjx)8~{VKP8(HO;CAXUchS{8LNzOY0s@IL4H zr)T-;-&AFA#QVuwas9*nV*mN;L$u9Zi>aEm*Uk{+8wg9=Yw4D%)HxMODydpmL7x#* zlWN1-khCxb;`S*lN~rqT0#yhK>)AYuVy9r8Ii`YVS*Qlk|5H;XAll_9X-nXlS{?H~ zMWvb*U#zYYb-_A!_MU+?Fut|wKB8K z;;@hi+`^xhu2LgiiJ!!w{vG^$Ft$3ke!fsW^+HX7e59}>>?d5WQ2M>LH@tU|bBkJj zyC+_s{@|x|+!sTWJ@q-HtyF3Qyg>5l=g9&SqrAGU?{*U-l+)CX$0i&BCI|PsFnjZm zX4wJpsa0yv!uJTG(PM>Os$OQH=>*T#9z0&GJMlBt+`$i;5U1 zQ@N}hkwsSN1t?}cWtF-R$){TmInbicFqy!f`>i5@hB+R>NtE}S|)IzzOhpJ5Qg{tVKPR!lFc7O>1ZJ9wCHn1%^JHOy!r zp6+iI^)X_*aZupxAsjWw#v>Y5|AK+LO)+YBx8*O)MGX4x&krv;%aKB8 zsMHJhZIfLBp8V!{BVcLtg`!V|v5;6yh6D8&PHE4TbQ5R{xfyzF$`{&WvV{Lwn?10- zwW864GpNr~-7qp6;5z$SmZ;Utt2r`=Evi;A;nOl1J5JcC!vFz4#87%TkH?${@ z=D47AD`QP#bD`c2Iha533%=UNQ6DyT-cD<#x%zjS8t`Z~c+=rX z2B8eD?n`4vM2@(0Qojj>zMXMOZc&I}V&)c}{Mp05UW9_`S zN^26IODw(LNto5FClEI)<-HeNK(7wC7RjPb#PuK_%Evs2s+PYt7F%|T| z9%0HShIU+A=ezp2Hk;brd}&>`R$wR7585T^PQ+Wz2;I$53nOwW6S-eT%CtLcRlk`- z)>3c|l9COe^M=2I=4c;vKR4CXP{oHmrYEbR9Ua+>{iK6Y^<~B~`~76|#APdqtrzuv z;X;RCO7)?BC-T}wr(#i0fVcB}k&_Oq52+_3ON}TubiQUVr5qzM#gh)dqK-)2k@wG@ zwSOpXD)Mq32$xQxg8{8LWjs=3t!U`7;Y!Wi3+eur%l$?8flT#FTRV-ecd6XY=?lLfkGbW73^Q|R2WK$dbi#73 zqNvA71^S_Dpm*wpCP=+o8Zy1zmCwHvN<>-U`EiEDlwJ&yq~@7cmK zqwlJ8TlD2EO!UV?c^YV~>XgP;Nh{QJPsv3Kl&g>&Q?}OsY^W5!EGzUtky_fdW#5^D zT@ccgH5`jkR4tyMCZyI|*iN;Vw9F6P4b$OI}numMp$p!A9 z#DyJwDeKc+No9*rNmGHHvDXPG`zN}$9@9|+{O^yP*^!~EiV7M~mD=`+s*B0L%8Ht; zzZE*}234R?HNuK?*syY62CmVqBcf8plLH*6seGvJ(LiVQa= z8}4EvV~c)L8f^d)m)cjT+r#svaoN}(h6if2cj91IgD_&KPna<3kIRnE-1~+jn5au7 zF4b{pbo{owSvcvhkEayc6GvDLuSAH@IJM5ELP0e)BtKmd?s}bv_w4H$}6?5y2ylq_8<@4qzJu&C+kX*|PWg2Oz;wgFPaufEVL&8ZI)f8d2PL~8ZNJ*{< z$sE6+zh=8_R-enEN83RuA!iN_Qv&7CKjKJR-VrkvHp1D>fY-4;>LI)t`2)!`yi@umF-Lhtzpu#Ld{o-?AOQBh;u6j|?XzRb|OCd~(NR?EO)A{&ewQ7ug-_c&ot{gN;Ht z?~ue>`*EK~a#}ltIoXnn!Q)#TG)LPl!NOxYQ1^O8tW<%HA<$#7AiTMujoyKtMxm_E z;#gXOAq$)@Y0f_rJJO-6pJ_nk>s|QBkX_xF#9MpU3r|EytaF-+A0)=jP^vGKxm|d8 z?ndS<;Muh;Wn#h0(12}k#HhCxy%|swMjqIs9el^d&;`f+5;=3j*UiiOAV^$2`n;CO zu<9~mD-4Uf%S8UB7Uh>j)LE*-u+h4icA2;#dZnJ1nkMDeaQO_&@HZqdT#oi?NSl!P z8Hr;ZjxITd;fSC_LfDO6pGj|ARJ{}K6+G3&NO)aZgx@>bx7qUeUZt~-taN0}NO|JI zPk{FrGEJ(vqS^!sW5FZr=5WdMiQSmDYfXqskXxTzMyHKz#^1F%Ee_d0(m>2*s^tTx%nomb&K7DzJj0 z-oU%rU0t&ZgW<8N}Rir#t)(9dl8f8t{EXP9yb^u zd_erSqu$hgGGM9cZ`tq01kG`Z$>emG3B^bg(;jSxvHiv~GR>&{ zlM42c2^v|w{7ZJieXS?z=N<}&QX`cI~4Gwq{2F0Pu<^k0u6OhG}m zw2jFXRQ5l}%k}<(J~t3YGKKw&{tT9umNIsx!`qPT%u>jvVG27Jg2i*>q)cr1wUcn( ze#j0t%T)4w*GHws`X^-hZ3aEBQpWw-nSNc_nv9{ z^C5S4m=yA{XlCN1hRoe;MK}gQom9F^j+>e|N@fA=Qf)#G)q#X`1bGkhsUKYseP-n* z=C4%oc9OkAgVVw**`HN(jF{cr#3t%BHiKQ+n*6Imzh@xRiZZ*ML_4>?y5Nd<9<|PW z7$T=1$Y*xfF*T_%Br_0>D#tMJWoAw~)GjQ1 zF}q9)hi44O!qi9JOk)0SfFFlZL6%63nyrMHouxA^56fH+7OeeaKm1w1fQe_cpckWn z37dIjSag=`?>mzMxJU6MjyO0mn38#Ce;l0}TTxHm;pEXpY){1HtEn>F$4M6S3(_wlz1v!7r||8~Gi-$*{!|tc7qj$dgKcNiLPvM2 z$A@6doJ1C$y?a&eQB`ZbmouTWxoC2pf1)hH0<7Bd`1EDCJuB4T-saKNxr|su>o9Ob zfq%oPL=q&1Y0oGno!zs@FPSBiI{i{NFtB7Q=+nojWp8CsBMjRLE8{Y4O)`UopB03% z6Tz?;45nlt48S#n1r{b+hS3}kWk<8*9VjWFxcb1qeuTMHQc+`hg6 z#=?0V8f?NWuaQD|OhKO5QltDIv{`Jn?AX^>5$aDhekH-7AAh}EEXqN~RoP8tMTzWF zzAjy0cwLJ!MYr@%IPTnMC63HIdwDZI^rl)kv>rF1H17D$N(23|@RqIFf)^*gXxtCZ zpyT6V)xREg_-RyhB__0T5BJ{RpevKiYI^f8B$z?^Ayw=NM_bC|@BuEB)uK9modB-y z;|3b9bYFN`d?4e0tahj`!{%!tZa<6)U{fygzRXIqusU@Z;xc|lvtJXfSzo)d!*=_% z$y((Y1W&Po58s$AS+x?tz zr<`RwM8lfx&idQzV`^~_Izow^jvOki@bew55$h%@oz8eYnt`2DBmVgpq4tHO1O$zhrGF(E7Mp=?-7xhAPt zzmt1i<|Q@Q`ZxND=$B{#0G2f z?b+y$4sQo)MG7>_@VAQw2z5dvCfO9*!ggl+K1Xo%DWu{Ovusv5Td-M%i^^RzGI(hX zZGn*X3?smDQ*2fwi0ND-{>a_RCQ#n+@U4UL8ny_fWYsnL#?}GpRqj+qfuN6;Wo+@c zQ9@9xc7vPmNf!hXRMFDQC~RfSeC078=>)z~8)(w2l150WH?h@g2spO2ht1V5O9^ph zx$(^Q^02jN7`R)Y7aZ9!+J^l19|RG%je~7C;Tttos8N$Ymh;rS@g=?NXfoU5DL5y! zg0l)tSvartuh1>dfR^nQDU%6`Xc{<5@ifXjN-kw}%fOC~7yq9Rh$@f$+ipev>W$m) zSzdMmp|dY`ZMPG${7tQ#My^D1;ZSyhzg06)EE)zG-jQVcOlg7^EcWbd!8mjXb;o`i zYUJeb4R;nla3|Qs48GO&+m@yA52k>Ev9ENkD)1ShoGMP95095Ne%j_tvdK&7FQP=ZjSEO z8ZW3hJg#P4Ksk3Ky5f}=2kiJ$Brm-ewM_t-uurV7yhWJO4WJXOL@&Kuh!fM#A{Q*q zQHQ_$&lkrs;4j|pm2lo8?U{IX9Kg>z?CjngG?!=!2`Ffb9`XR{2Z#>w(BlpOe0?cwTA_b@=giC@m` zoeLHaMoenk7N_|81u#!yKFhQrX!W#u?LNJhAmjGpGzgz^!#u?}TQeUC4pfHlD zklhI;PiVIQxrCp^Uror+a4@7icf}?eI!t2#V^O-AH1H~!t}v)^L7D)iB+6=qZ-K z*rdAV`Wb&bTUY^A(J<$KgnBwF7CI!AR01lsD1i~TU@+>3g5io>cSET?kaYVlju-`2 zYcTBEqg%!3y7lLf{z~UcuA~WHa4`Z--w@UX96>P^CPd9A=RG+zBryzZ5X^fhYc5?# zUmDs#?i4M2g)tsmhf;(ZGp|yY~xR7w>&00LooT zWpWT*_%WDHR#*}8HNQKASP>`DjsnCx`r9;?yG5xZjurM!lt z;xXH)4GzJzk`T`|xG?n-UJG0ntuf?|JNL5DIORIxGv{88?C&EkaxwYP38mlB$Npr3 zZ4X15jfNXh1u_Ei_=ht}*;3qZM7UGYzUOwMQ!)dE47+4YSwk5V(C9-}XN{v+Rx%CL z`KEl0;U#UMqX}A^Z(UQCN-{V_3Uamm%ldpX^N=2@Ukm+tVKPy|bmSKZd4K58s0OAc z%$V>+q%v1S4(1ER9g*

    }W~k@~nW#p)y`2BEfIOWR7P+@}k}@uAZUlK-C>AfkWwU@J=Te1moA2PFr#^|(KMc_GFF~V0!G5qoO z=Q6@t^S$kow#2^NH_1j559m}Gkut_i>=!F9&8*jhzhxnC>@u%)H!|#h;^XCMQW%S^ z%O=7g=G=*^RWlahueny@!tFx`<2>n0y7=fvNK5UU8=q~M4yH;xd0u?^D`hY zzXZw&mK*yeYF^Bs#OG`RCo?;hr!MmCeU!lL58j0Y<;U9#%`-ig)hTK9AujGlik?M! zo=skA5;HC#}4FFd^43KK9R-`S5n~MX3TXWFYNRC88e)qOSE`#1o(`7InWGnb8aIhC^NwS z7|o(c|Mg`T6g>yV7<6%PfHT%kcWK8VpO)>Om!dpHfsC5aW;5nNQlV?uf{I3@zPBfR z(w8r(Av5q6Nz$o5rr*vt#Q+i@l~R+a@+D^xKDdZr0vRx}P1W-QCp22WMX`dtm!W6;GA zSTq)1!3GG>OIC!Aa_V~~)sdZOc{C_*FRg-i>dwzPSun?cqaNgAPc$qM@0ISUaa1N> zlzjq}Pw!zQX*4wk37V@WeIM=5p^V@}UBKmdF*HDt$-ffLt8PA~v`u(YfIHph?KDqS z@==6O?M=RTmq%P}J}EKyYcyGTMI(At=ONiv^VY_!ZGfykXf#^8&2I+u+PsYKAbFQj z8TT=7L^N=d@=U~U`{9=tzZ`75V&MR{cQlkSshO)+6D>)c{?9BLQ^wPFW;B~g#&9p! z$rKjMCYtpHr2z%O%QUz-zpdAW{_z^7e{=KD9ziE%g*3p?;y?s)%^2tqfpcv&rK!Ri zvNXfa@g)`aHKMf~96+YuY_#*kONG*jxsry7{Mgawlw+U1~#$%GxEvQ z{3(vKjiv?Z4mAKCc-9Fs4TX?y=|m_jZ9O1e{WTCh|3ntwZX1AVDnxd}Dp_&J&NUk9 z)&i1P93D)BKq={~WI(Srh&3Tel@9=hesqX-&`XP64=zK4Y&9eAW$W{9;xC&aCAo;H zc|4uhYc($NkB%l$#&mr_9lAeI`OVeBu{AcTdHy5RTPS*Np(SfS1G^2tMKwXgca=oL zR$z@$ACKpC$Gbg-X*E#_`&Uq7$rC)6-K3o`|6Kf0v^7yU?D?N(SUFdWQQ`k=C6R_> zK{ZxZ$`Ir*`+`i-ZbfsIsb(O%QbI4 z#dg!nFY=R9VLc+Ui){TizBP?N-2K*cepkts<+5u;{wA;yF*YuYh9zVQ2N@Q+Iw1ps zh4aRxKsG>or1Bk3l>;x4#N6asz%q;|ST;*^Y}lJfEzr1WPq^=e(KSf%{x*N_W0WT0 zDx1i4H!_(kk@dK1oHmN7Jp9urZwc*FzQ{jN$!461&o-pKoqAwmq0yfO`?Rzl~8NqS? zpen~o+pWfR2R6+|VE%!u*1y{%;HXE$PZfd;u{P|W;o}YHju05013{IFMb6> z9_}yvN&|;KlK#~d%pU=%88-Py{^E72M~EcSBySMtJ!hPU{5JY2r^UQP<5`&X<*>&8 zy-h9#05<&9vQber8`w>_G0#wtJN*Uk^fwM=7UpUS7(mofdA8nYITbgGe>Wn@o}62g zlh<+<>Y(seyEyDRwl_8cb;=$?I-1iubNtDgUesQF0XJ2j1c&!n?ol%oe0+{hEKW6e zem7ae>Goei=Sm47hQ}yGfFIVW^EYCzp7~<}U~)c}z(Jym`?~A^FgI#HlJf$fNi{h% zg(*}^8WuuSY&VA;eARTA=$f$wbhiGPN(X}S>o=81;8KtU+dUTI>gUq01mlfhV>hbR z$FLJj;R4ksQbBK_z+w1});GT@IyW>1Z*QSW+J48_ zeeK2PtvA1|H6nfB7%t*VE5l7u_D&MU!8gXI3Rfh{?~QXsZ|{-y>4_{$pEuO6Yn$@E zRmGJ35blze%GbJ*GB@6?vW?WOrC*6@33((AtsAM7qc`h1M_YZtdb}fXo$3|j2uN*) z95?&C@tU}gAP`WgFI@tNd%rBp;5ZYA7)trDqnzSvI>E_m2*_T%h&VO0goug#{hrOU zo!^Pv@P{=ivN%9nJ66AS4*@Dk;$f|biNy^+GdNT-x$1PLb9tQkn5D2RxFdjCsyJf^ z-DdDbCd)a>7#pmf`BRW9WjJahP$B1A%3HoOgMNSRjiC?(2{>wA3eJH*gH15)fTl!_WI2hm~5y9-fm1OD^qB*aP%{bx>I=O$d#2&uyXKb@!=)syPvQ^d`#Y&K(?j>r`T%Mfj1a4LLfey0>LrblxW2@iaKQ^3@i~06 zVo20oqv?z=RhHhZsBx77OgVny`>R4Q-0yR#s&gf*ybo352e`8o2%-+lUfZXB&m2{@9fXv$%^!#V=7)SZ#( zPF<@6`Srkv23IqJRXQ9SXh&NzSz@o6h)~@s1p3=J&yE;;lR>`eZ7--hi z=)mY7=Qfar@;Y{RJMWY{!e)I`k{r7K#q$!&_&Rw!)KX6N4sO6qZ>rB+Xv7P@qdI&( zZ{l>6Y>tio*)~G%(`M+$hB|(A0*@ed{&(?_;3Kdjzg^SXNjiw?l`{SHI}~Z?WjdD^W>!Sn?y!d(6L3_i5DwV1^g6B*8XvbQ zq9JZZ(_ms)=RS3!aXPy(*fAMqsq@7|)uUov*U$mK!8*Jc;?|y{^=9BY4uV8S~Z zp}c)Y2^$gG0y^5JQLCvyXyZ-Yswpq)zihnO^g7zHj$b#ExDYol#?P_GOeOT*WIE>8 z=@gzQAs}sv-Q`WV*tcNa!#eHtjQAH*#u!>+ed&L>LxF|4q&o>R2i*&YJ`mA2EYqMo zmdxH!W;-3!pK6=p3L8ITk+1&e1&Y;RB|9u^i-orrZM;N`hdgk}$iN;9E;~OEj~(SN zdi$q?2)H^B%?YZ4(>qU2iQC>Oc?j`B{gH~=+^!L?4m($e6kl$eJoj|=5Ki4acd-JJ zvpZn24P%>P@FZ#WhV8rib{LAf^2D`(@>;GC253o?K(mQb? zI~-2Q`)+SG%!Ob;95&;^Q#*P5@n*qgK?RQ4X~gQO+f*4mggcLxKQR9<;0cY7EbV}g z=gWjvUOT2nak3^4Mq@ahzIuRjUbL|!iaXN!PNbUPk^)~!sbOb<*#{sbzdPKWBZQ!v z?J*LyS^q|J*l@s^W5tK0GGs9vPKRi7UtoL5GaUVbo%d*=w__^eWNk)OdR8!P?jb^ zjU6_spFDbHCH+0R5K8dEfjD2*0&H~4N<4dr*J+}|wlRzoQflkODn~CI^*nxU=@$+k z9R-Tw_oZhi=g$dGCf8wLs5 z+&rUy1dZ^gj3>O~EoUCqF1y7)%{-{pWzvv;29V?rWN^Mvcp6ZB7CgWL(0>L6`xu?_ zo;qsm(#9xpQ#{gv6cnm%gs8)aK2Dt)ZVK7d6TF(xLKI1I=#5|TWAmBXt!#yW%cPIVR z$KSqJ*najOY&jXX);%&i-?z^7ZBNp|8Xd@C;tb?zTRl6`iv4ZHm}B*UuY3KVJd6qZ z%{@*|2`C0sC+bvG!`75`HW zY1E`KT-t^j5H;SfS?G;;Rn4M*Y(0TJ zFefUx(@F(z2O&z@N*AA=0zIW_UGosWpJluUl$;H0oBH#D-aV{MK;402s3_N?irLrO zIR()GLp}moFXs%!HW`v|SqX#Xy=H&80X_&gA9@@}*+9lt;UN3%q&_`jr+SHAFDV2Q@j#nK%bg15G(JGbV-0prmF>Pt;E~>~sBwcz zo<2e!AhYsYIKZvgj*#6gQ!wNjB0gimjdC@|i7Q)`bCqyH4K$_aRz7q-)%G*(rHYmt zWf#WGY0MEvRX%rfiQ)uU#yZ1)5>4FR27)^r`96dUWY{j3SXa%eU@Ay*5bcTE0zQVo z;S40Ag=7RvfMdt96%NjA6+Xab%&(vjzz7}E;ah5kkBjxeLq6^R%zG#NZq$$JMvWkB zzkll7+&=juNYq^dUSjZ_sHBhrXTOHe<39%VX$UGt$}%@#!7_Z%KVE@0Za))dXTNjA z4W@b3ozHB^>4|Z(M?V!fWrQ+^(0YlEsY;fS6L4ZcCO;z%(!1qii7yxOQys4lg<56O zravgC3Cl8|a)(b8B+fz@SIZV#1wS|FkiF|b1?l=u&xE2V+|)gpR6jW7Ji!4h?jnYm z62V!0m}*sJ^gm`ysHt|v+@@6(xr=F})*VlgF+X)OOKzKoNAr%pD{^(n%Y#cEt3Qz% z-<$uruZ^%^L0Jp2tu5>?)<2b@c#dxEvz*Qs#VV+>|0J|>9Y4b0L6}|cJb7w8*{Gze z5VAzP13$;j&+?-5TrQDTraR0V;_|pNl|RV85dN5;AiBMh4%kw>*Mu7M_&?0fxl&U+ z%vEnTno~15q>O?ZxBfr7ggieBhCmzZPK}LWA0;5# z(N0lw9;akG3qUF5WR%6(+Ax!#%@{%-1BWF{Y(PDZSfO(8hiDdEs~||i@)Me|pg=&l zZN}^%_jbxQaD36I=OV08DL_E@@`EV^Fk&|Z`Y&7JWES4_=0IY179g=wPUO0*P!}^m z>rqP8XF#JTlzN6pN_TfN%7XxcbH@5!H$bxRO~swR;L{g1D~|}tRAT0%ltA8Ef0#v1 z>)ybKGN+`dcU5x&b3oqhJi2ttg_bEt_6@%tvu#A0fk5zlX5f|QM`vPmqA~I zOyUE#Rk`Yk5_I=y3pUIHYe8%g^G}`f9}6tn{_$8VB9yJ`7eR0-@hM4X26Kn~iv==w zK6TPPbU}-9H*nR0n5A>_>ZmLGqU}}{%|V{hdQX~6mZ zfI+Te=|dnYAsa^Z?y$T|zoFLE#6hrx#X4gPbA?z?#O0SeEfo?r072s_Sb>FYOECWZ zg${ccIFdOYQ$g)!7pr_!)~CE)yD*39Kh^AB)Cp+O>n6|)5JI$iE5+BfMM3-mk%u4A?QK$sV9)XmBxaVV2toWybnOo;KK;5_qxz*8 zk6wE?0zwm3lQKwTfjxjAl9o_8^sr1e&}b3#R-{R$cFVsWi)B%8q*R9y-PtU_hqm?!_f>>s&v z6Iw+}mdWhi(L!`99chaTBon`t$4>CF@dL2Lxk84UIo)M2STrG=L0k)5^ysRnJ3^aO ziCoQ9_z~uEg{MxDPHUwRbwZ>eHxZD{1%c=b0udx-w6q|fDnh=Gm_GMw)%U?c1Duvj z=rA1Y=t9PHSFi9|!{Vbl@dLb^J^9ci{X)i(9tI_ZDaUP~3Tv3du~nwwcS6qCgi5|- zzzp7?n8+L|%5_vOqC(Pd0j9XEnhMa^n%J|KM(#VXCYC|)kNdFj=0i=}wLBwv@*3LCK??W~pxa@~U-0B+? zVHmG4n*e{T#zS0a|H=mT&DmF+_l`|wf$~gG^h00vV6xc7x*m4M-#HU^{NYtZe?wyF z3ORa2*^~Kf_DL=l!Y3BRtV3j8^GM*etJD#S9>oP5Au}=eutRF<06fve6@DK|VAKg) zUb%qC*h6%bLM_VYh?`I(2ccN$!3n&wD?@bs-t6g+n)BM0Z6fq+YeVhWI_9(BO6U>tt;&)>aDd`L zDMR;_A@?aI4Fgq7(wKi&6o3c2%|r@)9i{NFW3Q&x6+BAL;r&36Aw&%)p!;S}ph=9b z)dt{O2<(CpJ46r@-hk2S%w`^i%cP4muqrh=5JVM7t~aNs)`+C~wGfKua7{AWq(m*i zqkR`P`(r{>fTMQlWTKc)oWC`3@7%_9!n$*RG>^U3le zSC8G^PefTI9)?=ByEqA>0DBEGLX?x9Gelln>wg>QBtjWeo&>eGP-R|31w>#%eD2B8 zu23in=piZ}+L?SD?L=jt;B)S@Kv-%G)&c1!&DaSe!bD}$XnGQ~1noZG-5Jp7Sh+bv zK16BgzUq*%CS>~WaC7DU5HL%Ot3G}U)sVtYcm0_%(F;zY#& zx7hNH^d_>(PyUs`U~H3AY(&~)nOJik$X}5uy9W4eqEUyu8AR$lR`$zd>dX654<$=O zjB1@1=0x^9at(1HIO2AtaP&Q15lP)nxfmE8OAW&vAre%2}K~V{i8kNVpkI3RvJl1#YK?aC32FBTxUmwOq^TPMZhWp7DcKS^x)`xIn_=k7D(u& z&TcNGi$%WzO47Q?T#RuE)q#6|OmZjoqeb&{Y`Qk05r#{as^!=opWojPIPw|NEjEtd= z_C^??#eodLa3W^A(`l@|R8^3$3`QNryLZIDJcK-o^^p~qg25Fp1x6k!{Nppe@0%)8JAVYgy~8^YQH{ zK>c$`??#7vyn^MUd1;UC#zvMuVbfZ| zXWelmcgB_k4_vtSb4Ht#4?~j?e#W6VwTmU2@Ha1e-bS8Ti^~Rviv@;UPl6eq+x#i^ zr$(xa7}ajI9IikmpFhz4_H#bzO-A;YN#=X>uOI7Ztk2G>6kw+7W;`#I?Tdfl=z9i72MzZ@go<~0dOa8lp@5Q?j!Y-a3WZYDI zz(+rD%609*8V6-7;iEUHH5^L2Qb#~^@6h+Vi>PKu=JVVsc&nea%ST2h%h|3)EtFDl z5i`w_L(X&j97j*_^8pzePtA_e1%LPvETGSe{L!5+{Mh4g}F zz(UHsq(^#rY;SyV-e|U|!7RDYNMei9YDat#FRUW2skrg+QX>Ayd=sPxjYo)0ve|vk ze)Lr|wdfbuOXI2%jYp7h8KBH*z5f0QP^^oX@F`Qc)JK@KC#SJ_yT1)B&rRES@T+Ao z$VZ*%r0SEPhUieuW!WcfR>x)tiASKeDgoUF;r`i>PMA6;2vbvTQPBioBFY$8t}@Fwu1JYVz<|89My)4@pB{l-Y1KSg zF-V@YWlfh($o~CtP$8Px5rBhnyGXFt5hZ>6{1!FN z=3K4{1kDY;KS=n`sTbl#da0We2hnBdYu<&ZPjtpy9_gWVWqkV#;-jhpbU3oQ8(xdSevWdLeo5=mkTf77LU zyeYw^a7M4UA>-o11W9cN=~KN%WtcA4)2Jp6)s`eoeOt9vIDI_b86EeM&HTG1!-l-jqR-&TJOIlE#fz zx=K0G5N>bxxbf+RDk!4DUb}t;)=E-#>S6$VA_=hgYsfXnL5`cB*GgS;PumdSYHjm_ z$aeqHFXcsq`bu&A8%maF9`3KmgHlB6SOl) zC=DJYgi5h|>N#Teoc#sG6S6>%#BdtHF7m z1WNiR)WVRXaxam|1{i!ws^Mw5Yi&dsJAUQ1cLFiKW=rMTbn4@7TVtO766X-i)9 z_rEvNbIdJL79gU0#F30|xJzIf0cn{3oYU7dZs{*3lSa}v%1dSe+wtE+_C1dIEF`hr zQC!#Y%S&>0_xny`o3v(}R0}cYn7PuW5=)B05h}DgsN+VtbxYLNbDScuiHMBF4F2S4-o~0%gaGQcbO42rcPY=J>2Fc5#q_S4?byl=gAJ(FhT_x-zAyIz_KiG)!(M9aJ57 z($wbQURo?nN%h@Nl}vMjbp*c>uC|}JBCJM6=&>T|)=Y>EV+QAMiDdf2S=B05YCbP3 zlT41|J#aXzw=1=xscMGIANIwJ&`gz2blOP&F}LYmsuUVu*g)gCXiS`S(n#)VFjst~ zG2KicMl{HKzD%dM9aPx`C69&ma&P`Jtexo1R!pd-U=-II=hIqiKPsVNBL5 zpK-?<3=uKRs4V^UofAPaS4`oeO9p4b>>|_#CQ#ok`MB`U`%LTybCVd;@y*{Epfut* zNoXh{e@yht-y@ivK0C~N-PS?>qm_1B?F!2piM(#&biDRA4#QE z&^^b<2`nxvgxmZG#H^6oRcbFO#$MrsQ%(|bm{xELvN91-0{8ccJ^HHq&Q2C2>8W|ScpofwfFP|u5*E6RTk4`LhXZ1xUUa$x5Z_-cK?ZZ$?EKY;T zJwJ=L;!;BWjN`b`px2Vx-%g1C!Y6_8H&rbyNgR76Bf|Vp*-nqt0erThhemn6x|9=c z0|(L%-%gb~qApEGqJrh(;HMYER;1~peNLQ4)U_9v{%Q2Hq>W40YOAC}QBJmsOi|%M zLG%to^E1dGkh4q<98SUu!a|HjLxt#)6vvAVwgPxP3{KIv*G>H-g`aEckBJxbO7je% zVNTa39DaGFx>SxTZzKzSYVG~V$4=V?GawC0L|AZuHS<*eSiC8Dm`>-hnz;80^nx3V zFS!0%5-R!E7f%Bx-;04un4sMzvg5b zJ!X7V{ZA_(Dtsy~WaKNS{nN#~ioTY@jZZNIenI*&1Qa|E@6L9GjaZZw;!iy1GKvLy zZ(d+rWsXlK*9d;jqEA2bG1^$=7>_#`e|0##%Yff?x=%+d?Oyy$*c@%r8iaA77FM?Y zvQJ*!YcxDBkcv3%$mG~hZq>Wo^G|MCfHR0}Te#Q!j8sa_ZwLrK%1@ZJY*vqA=oIYf z16W@a;{1m6Rgs{Hr?ijyDN2>diP zLQp5{#T>mEDdUifU0I6;L|673HdX@SVBvA;XOYEeISgQ&3eiDO}Bujq!l$-TbUPT>)QHFQ zkM@kHSTY;rYhHhSTapiG@lb;R{8;NGZ-rs%P^{GG!)lAYL{Nv)*EtfO->g4blq>D- z4RbANzEF+%+XHAjUyRGV^!c5BNPaVAy-<|zy#)KeIpX6i{!RiVfaGeTy-=A7Iuio& z0h)5S5Mxv5ARL%scu=nt@7Nv5Fb4Jq8ujB|j4k8k&QQ20Ox4*Ni*GklT4lo(ZE&Bz zxlp+~-!{Ln*)}Y^3N+zE-Y<`9zfi>at_OYkj+vnC6>nDmsB5WE0Z_^o=-H6O8;`D` z1?~-xc-D)-;!x2$AK9k-LDqa~1+)el?A>xxMNruZ5couGbL%)rmgVY($iDhJ`%vJq zDWfIU0A19t=P<)&)mayXd{Fn#Hr28T0&_k}0%3*?zBHDlu2BB=6y#anW&gTOWxri0 zzN1iAfl(@vq-<0a0WdE{yhF zfW7(7e$WPnAMc1yEm3r5VXrf*oOLr6;7_lg(zyc)a#42uzS@1?nYFDIFOwJY`NS>j zsZoLE^xULvuV?TB>6mPpxP6Dut5J+PXJy%*3%xZtSoLT@8@*=2^ih&^2ZWz|1OXm3 z)@e*_QZ`R0z)_QS(V1L%i)cF*zrbu+!bTEu4^h7=@@kW4f}@#c83ZjkW~~D0>QTqs z=wh=~P7nFaHQ05Q^ZbQ&pHa@ym}1I_tb%VuRZ7OoBWWk}{87^6+AxD6Ib`s5s3+EQ5EX&*xlz_=v{GFd z0+&AMZ{Ct0J%{xqcQ|sK>r!svNYqrd9dm4@kS-UGHBQ%=c~X6-r}k?z$73f>!~S17 zcVxcmpHhRJeP_BM*LR%87NEG6ABfCQ?NW`kEeXQCC$8jphjSysKJ+!uGg6USLXF?E zPI%iMX9*oOe^<|Lx>BqF#Kl-bYCbuKUs4~qB)lkNQBt?Xs$^)$3^+2??9TKRyF0<@ zKT^o!@Ol`hNi!;`=Uy7_3m=p=)>6sRa?~UN()bK==B$`Z>O*;xFjCzD3K&(7PCn+4 zTA^Pj46JDRKvLgXIoR*iPyxhuF)Qs|i#9E-KvLminlJM()R6MYz?H2KTIjCrYf|G} z0zdu*ES(;1BBl%*sK6#T%2MS1l@+32#9%|kf2T1=KcLci z2xPfk=2H4W(353pv(>yFAa5Xx_x`aX3{wYnV^t(2q?haQVAyk{^6G_mKT`-pH;)K; zw0{jFvuls0IhV|AtY-Ma$1=~e*~ zJyRQ)w}00$bf@gDvQ{)`|KlY3s8cNU+@Kp!ZE&F9Fm$pp-ORrN2~#s|T6Xj%pv7qF z&`+?xTfYDkmtS&h;b^qyfcaz&Va8p2a zwYOw!mg&B_j7@}LIdy!1ZBtmKTsnZFo{XrCP_H3hzP0-82UDI+LLIngP?S6dzK;Z` zw3__d$y1>^5U{>;fs-SN;7a?7<$5v8#8akw{7JGzhVi!Tm1``T4B`dnT~o6SLi>w| zO}p_RXS*YVuxGZZC=Bd{U^zfPAI8P#`)KlGAiAI06Yk@k&ifG_fo}#0i zc2oKTyrH`PP*WANHiTouxpLNsN>lyUyf*epKeoRA@C>D!qJ~4_xKtH}LJ=yJe>MT- zgA9=U;@k`V-c&Pb`Ri%sF5kt&;9S67mm3KjkyJaN*?d3su6aK>qIjK8r+mi0a#T=x zyJ58$3Olrz%1!Uhb>CLjC{%3K{$-83FFYV7nxdZhNk9|v&{TO=IjONa+9gAhI893>BIPftntfCT2!@}LgrS> zw)(hV$XAV^9*q{T8CXrUUm9=p7?@>Nx}IYf6j$5#q2n`k9= z!87NYZdH@{#0*7`k&nMZ4+l)<%QKko)*&JRf zEXOnQRkJwbSa+Q7epR`mvS;4QhkHL|UA1x&A)P(4OjW(aJNl&n+o{xHHye4Ac$-KN zc~#37X)QyE6SZQopc!~#jxatuUscT`La-gP2ra zx`Z87K5=T3#Z}TaB&ecBU<-J@!)yzTmOZ@*MOEO@*w_$@h}J8^23Z`izFYsG4prnh zgUj9`Cl#kCL0|Dyf68iij#f03TPra{8cytmfA{e2u7MRfV^%-Lag~(ZsDSYFm^cSC zXc=D+*j7k2)?Fajxk!Hs`6SVbw8FZD;#N}cR13a&(*?wbx{y$Zmjzef!B$$4Jop{J zWSoQj1{t8UN&5f=k5*lT7lPAWqd7apX*B0SuT7cr@>Y%}VNZ;x*q-ifqFz?OChnRE z=vJ1>&7VITRi^zqw~V11=ZUW`-d3PU6qXF})H)(w4&`f75@J?P(N?Plig#ut5Of@U zB~npJ`5~Zx_*Sfgg6;eXI{$(D$)i0KYj1LX8)e<=*}_|5qbFl&m&y*ZD^Y`2*D{{Hb%ZgI74$f}RdKd2_$fqP4HQdm-7N z-&bx0vkz~re+!=L%e1zU>sFBSn^$t57ScqKctLWdK7C0jJN$&2a95Z`!tu^bCLno& zqzZ+3xVfR4K3ANp1Xvdm(MFG>awzSD_DA3{%pLKxP4#yrhYeao$@jhRalOQH6^6!@xcWZbQaDs zC|Nam!&siv{?|LkQrP+73@pa!D&pWvRam`qVsdl#5Et^2sS*2du@yxW7+BB)Y8WE` z8Tyn*(V8KV@Y4aV8(7ncQ!+UH7{GdtIQ`KF>!Y>)-&o{|th+idb=BZ+^H?$$`&$9n zp;+~;+4Gk9b&=Z=_%+ONJt3X+Sy=xkFo*ssMc7v0inn)bYTLFfZCM5*hui$iVFTZI ziFESAQXg9$Ygsa0PGozMS#jKFee2kX?6dJ@@mVyWCTGr?uR|5CaaBD9=JMQBzF9gK zwhv|g{14p4m1Sy93ac7m$XPuFfJKnS%^%l(T*v;_sZSVjw^=?sFB8D0CJ>{mIghA@ zXv(ZnU|B&gL2lVB7jW)A)KfFDi9p$rFRDFJW%EPhQT|2R7-r;~tEAiK)>&Lbr|H%IbTqv5VqJ;Q9T4b# zepy_kenT@fQJSwi;wHh52chQ!Bw1tzUn5OyKbiQ>r?Kdj!DJ!Q#93#Tl*Rl2Gik9n zi~QM+(hwCUw^?p0#)Pt@<8(uY=kcfSk3oBro>_86(}zd4P8^**ZZ8nr5}~5fz*(Kr zLov%i$<>icz@IdT6Xrb9URj=C2qbidGG_^Tjubg@sHkYX9$De;aT8{RSqL{h?n2~; z9D7~5>sj)YB*H!@odjUQp_-(qSKglFH(C+ulG*d?MM;3?gyQ)#hfWP&eOeNElSVz} zjI|M-=&Dp!g-rcv16nP?g@r&(>lkv~O>^vz_O8=o$y!xr)p0nDHmYUa9VMIAUTi^Y z{#uOJ*Y@Q&sK1B%d)HsnN@J@{@>;R$F+D%+lhQ7Z7~0?8(ZLy=lUlMyjTqFJVSPsT zg7J7VXpGZ);abDTKUtz4*%5$uiMPPFQ^U9P2U^P`Piq|jmXM_U{hCv?b`}H5=UUPK z;+;-_>AJX+FNX+pNeqP&&|2F*w68Di_YAk?2V2?MrLAhJE?VA9-J!--3~MvaTFsWr z(vOhD(_0UfcNrqnz95ctE^a>%$Ez6KvRff>qt@vK+r{{r2f$`<;!DAx30o*m;TR!r z>N@VGyUx}C@{wmJj$1US9+eAP!wdKkq{kxI1_Oqo$XiAKD4nl&13USyP|QL9uTN~a zS6fj6X-fn6L6YZqCr8!GQ?ITmL|a=boIv6Hm%+XIP3hn@XdMp!C0k@7&=>ta1HOK4 zAv%uAUSw(Iq+4d5H{B|Pf^eA472Ff}W#s}){99;LM8$48XuvF2MwAkaqR}Csbz5#k zYEsd%=;I1a*zka)BPdZ7V_SL#!W+ki(ATl&2!QB z?vfJdVCrZ()X1~WM_b*!5ftR2>)Q36;~x*M;%jI{(OdSgqStOvic#2qG!^=wu1+=A zfLt8sVw|UPG(yvriZCdhZ?&4roLnWux+CTZ-%$|JJMTanz}$xIBwTFeLpy$QGyf1- znfm^PzsR<7{#fT!762HOOPqXq5j0*+gywpCiO-*=->y^yc|Bx)ZouEDO`;y zzUN2c|F{<7Sx1-avdO51nOvh_>@%rHdKx*oc`99+srhg0MnsrYqxXoz`*je+O~4_wVA;0+rf zE)UVh2~Emy9n=6DUR>9^UXisFNn^9&@22AD-pX$UI9&H1goLX)O^_}s+0tw(JRb7MApKbFAf|+dVu+P)lMq-aa;9ZIFJn)`oAACM;n%- zSkm#N56huiC2ZgX(p|O;ai{IN{ahx=R|!WRXmb1QeD0c?8tQDa9Zg7OVL@%vHrPbLtV#Cq=mZi71x!L z%s}zV&*8%B++EbeqfgHiDeu@}0&#+E0!HJo^j+s6ovbrnvk~O#(P}UA#l1?z#$EEO zPEcSrOrveHQh_Yg5CgC5tzGj$)==mgWMJkg&n^jb#oD>FMTq<>*IfZS zcCdCT4qg)ZbY9d6<>RTF#8-yMp`j+~a9%LC7k>Hft||ztN2`JtKAmCV%3eKOXOX2X zTpPFM4ze+;>rZJUpk7bgxEhIik;kW(X(Qkd;Mvn|zg}Cp2_9rxpys}efKR(CCsZ~6 zUS5#g56zGIQdU#zb83WpJz6epFkY~5LjR`p1lM|%3u8sdMXqXHeO}32g<|b^Bp$l0 zhY+ADnfR5W@LttUXZ=@KU`TL0l~*k~8NLgmG+#8>d<(JDlwi&Pc6cotVtKX)dzF<+%TohXeWHY`K{7i0^=u(S~C?O(FA9{7%7 znhpm}q@mXo0fNW+kPP$rZNpg6`{SuKa z&az-dicWQvgk4NE{hV#wUX%5+<{4l{NL@voFl>b}$dLnULky5%)KOqZq|hJIBgw8A z`HnRvez(5s+XY}&zO_--h5oqA!TCU3m79;i8-rkJiMfaG-wRhHphHq(_4vWS9^hbV z8i8J+Tjm6#d0`&drCZpsKzp7xCI5~`_>vg3PBseZ%y>c(r?4)3&a{?~Is;M>upisHJ}jbZw_k4XP9YUXJDib@_r6W;|h{x;IpA@CG=5E|O8%gB~CIql~NMWCNqN9{#(lpA0T1G9Tx5;n3f`_4iN0S`?^WjPo`nV#vE#yH3Q!T z0HcTmYVzBctFd9!Is{nyYQ?k4i?$?^6FW3Cn|NX0n~a7`&xQay76yWv)Xdq^=5t}` z;e!6B;y;y+DV{O4>n1+nX})3n#$Aj#IEduL29Noc@4Xqn+SFnFy4I8!?p)8tK8~fS z9>woOZl;t$bU0b7S+88iwC}LvaMNyPtkGT65pWgkS zj*&!Bj2mL@9zW=swg+p#DD8nr-6~qjNoHd8FPQ>f8Of4j{pVZfHJG63aBO1voqPi%Pok(;Ej zZ3<%>fy*djI(tFVnsP=U)&a!;x9ejjkz-+}X7ewj#Hc#xzx^i~pOs@NjQrFrd4EKVhp%&{ktwo^vLdgfS)=w#0$1;aiy3mTF^Q z8M?$pR_nlWZ{4B+a-Yqe203GCl~*<|?xS3b1RBpFTaInhaj9c#1pU|Rmv!%}t+6U| z8@^%<)u>~1I2@*I;|bD!V(a|3^RFX~9*kpuw`6dW+{$>pl&WDhhFUx_3w2|G7t6j2 zHcr@ka1>~US@k(UJ0xR*8Xd$o*d3*hcL68lAB;J_rl(2yK`WEG@-t}tV(PyZCDftS0~ zPwy=Tkf9S);qPOu>O5LD#Oc$8#u%;lfM}Dg@8M&*zPeh}UyM@)i0P0?>2^Eux8h^I zMdV~9#v(pGo6(wlxB0v7ZjfWYfuCs#s6Q=`eMfF{X?S*?r$uB0VS>y`UQaaH8>sQ2 zFkFeiCK6-|XNZ=SfS$Cpd2z@jOx6a|RVic=O+eHvwli!sIW(iK3QT=m8nk32G8b)k zoo2BTiMcT(l#RX2v@c{OSBcz=DVVU^tvcT+j5A7U(4 z_()_mt$pE%9<7|#q41I`8#>-%yia608SIv8u()^}jd_!leI*>R$Wvr%m_UP&u~)kY z}C$L7&@FX0QH zF7Wg~-3DaBjX!vPd|x8qnd#wRdl*}<{7_`wL0)lFAg=b^=+fKJ5cHKq4@PAcY{+X% z%y9w7C&>xrTINF$)LCUVQJ2hQF)COE`o@6^$hLg?=V4_y^9tqYHZ3K!2godrzM55I zPzGgIKuxakT&Z<3(cI@f1T4=}XcuK%)Nh-MqyW!1BA!GPDbIia;htr4!mDY8-}Qsa zs9EzxDR4}ekD+CF`&@Qn$U7wP|JZ@0c&NtWM}}p2W+YR?dQ*Uda{<}qPT&g-UEO7V zL1rS&l2IAtLIRB{RKiB-OH*Z$yG29wk#lxXa3}5UI2n)$vyNrD?)7cUUc%1;GArDg zC?={=pLu1)CN@+=vLoq5(AXXUql^Ka&dp{3ps`bV;@MIO-r!S7d{n>8^^j%;5tdM? z<28o2c4;M1x+nB4!_;O9U(HzF0|82#?RlOQI7;dx?ooYqu%k!Q|>cv6{-q=4~ zvjb)xpxa$ib{_lTA|(H!`j_l&>Q`nX#CBkDtgH}R72WM}lBsu#JLYC3ODFAt=~6Zyc+KCxuNb1XC(AXh=W%8{<=+|O%$Gza%b5~n z7l_gUJi}&DRARHY9g$c{fpo>7@&DZ$Tg7Hoq^V6&eXpl68yyuDV=lz9k#%NpG=g~1 zx|6h#i4bQrXQnVe5wK>FhB=s?O2S07kWp*sAnR*eVvwA&B*D!R)TOBp#^75z>u!&mF;C!aKL8;T=ssYVH#&@MI5Vr zQ({c1%ywfO?oXXQwOMCt_Uh?Hibcw>2OZt2UB$o8?7e4gYq zg>Gk}WQaS?nq>cxl#w+f+YoU*J|<_ogdw_eX3}ov_X+Wbi*zi#%fn~w9*R7_aKCxc z{&`3!@wu6&k*{a*`~rPNxGa|%o}I)mWA~zC+ydhOF~j8_|x|Ut14&y zAOPk*zfm2oto1ePaq^i6tT$*79^RI42;3Bv8oJ{T_l7(m)F0wcAs&^pse??it9j*V(d74D(+U_XB)%J?;vPWWfyIA zd%(7t8jq_{ww@UPkMw9%^3n)(@lc|ge?i;U)7-%=dCh2gMSG+pG&F9i$g4D0#FSe# zIFD$b&(MGfb|s~ezQSz2C{BPG@jz&}3${%q(HarH%-?jiG;3p(kl&`*iC5T_fbueOB(?srAapk*b?pERHTi;q=F_O@vHW(G4Rkza<1Auv^7q3$yw&&_EGl~{=IFZ{j?dWfw_ zcFg@y)QD*eQj-5cUsLr%04^i0rAEuoYX)f~#yoiKU{TCEMapt^Qe6V9)*)u3J4hbm`V8AZe zH=b%oVtgSFU2CSqz{CsMamG>itoJsu;?TIOINqS$I^IHf;Y&nSY4 zbK_ld9>AEqH_mEoF)Kz%*d8V)Y}^L?-z<%rohfR3{@PDTZPlfnL!MW{RhXN#doOB? zlCV=l?-f*sQEIaGsw7JKUaM-lc>YZL&i!cjiDT$48-A-w|D4BkeIe(dr`i!c5x$0|I;Mdl*gv`~B z2z@YDL87`a`EqM*0+f^_iHhkXUfg?d;x5BgGzn{Z65i0BIcm9vyT_FB79aRN%PMPt zP04~T4)J1VCeu2bPXXxHj|FRm#Zo#zy(RNWn*7}<*>XflsOxKydRGYs^OI4fRO3|E zUzwR4;;(E02~3exPo$A}>n%i{%~U2V{q$@Htrh=MkJ7{Dc5*iznjvOH2MKH!LTmWo6E{rij@$(%?dT3CBw}8iT{vK>qKJ3U&G{QPR zFpFcFDqi_5>d$Ofcp_ZRc}PX)VVs0>7w(7m%C>A>8K}547<vm<@DJ62j7$wj5}FGuHo zN}eySmY!^L`j6UZf)~gt0zyx}HZR>SN3?8ujF3husndy67yEBlH__H-<6>-y3-A1^ zqpU6pu?W;M(d*&ar{!#plXd!RgKJ?ZANd+*v9_(0VPtHSo6Z!;-fPcjLa*xqmj!h1 zK~Zd#c?1}W>cf;n9EBk@o3X|3E=X*wSxZf<X~fpG|74W($>YdwI>A^b~6T-@QG~lMtp-~e~Hj_d@z*a zWZsdf0m5wbk#NUeSNrYz8zIa@GjFw*1m$e~6f6?R0IOn+&+5sxPxK$3cD5`X=QuSfp*XCugx+ z%MvME${p%nKTYl1&F*c*Cgweu%w>e10Ln>~v%qp${TFT0_T%ZM(Z9i1GI9)6sNWb- zUZic=2PdZ}yIa-!BYmDu7eba&2SRQJ)e%A_OIu{g_wY|+?}cd|*_mz-Akq;Dj((q` zXXD3JNYl_|7J+UVzTS%%Ted`Kvh7;X7GtW%>|Aa#&@9K)wR*E1x8$W3inPP&%~Ebq zG@f&5tCiPgfe0A(i~WcZC){pja#f};Bu3Lb{z^r)mrAb*+rv9@4DE16FSBnK zOB@A@Rs_df82;gK`xuaA#? zU(NTzKWA?!gSEJi<_8iJ{r*-`Kya3;<~DCOP!;n3eI5FGSAOZ^xHM4plHhMc*fkpv zVhrO6HFok=$ihLS)^cxUF4v>+W{Agbp9HIvP-FCPQr~ZLO+BE6pvRHtSy<>sXh?nG z(N}MZgQY`p&r9nzJxYjkS|C6kWBYHFep=E7Ec|0~Gf7#NFy^kavmkGmH?+g|LN@pu z$!l>dnH{rR*xGNWb^+3-$9YWF94bKlfGuTzk@#=M-E3iEx3hM9uYDv%Kz}zJyFYK# zg=p++=*J2ulxQ)mhx+n)-cWDw+?1WOf=U$C*{9F2Q~rqD1M6?~@vTAOH`g8G2t?}W zjr{RiKSXc(KG|j)B5#52Q|@zd8Eur{KNxTSEWYsTnz{fa47EIr?gZHnMz(MVY@~N7 z#R##*$cdT@3#plZMhS2he^<)TrMkFM5u(nFkDVHRiY#y+5?88zzyf$&v+h=jx@%<; zqRDV1p=gb8gY|7RinQQa)Yg}ZMC5Qbs?i3T(iIwnGjXl(%>1INka2K6Dn3TOZR-l` z(u4fb2!Ke@WmRxaY{~3!83hH@Iw}eE<^;7-w6kz_Ab=u$73b5bTB#}80TI<n})B zX7Qsr7RW8)A#D_>moeE-z*calre1ky6ND~#F8(bTzU}qs2vu;Yo^XdA>WEv#dR)v= z3p@ESevNRf_lV$}#D^H!pbpK+E^@g#Qh#u{%V>mwWv@V~bT+W)4q&Yj_knQ8LS&A_ z<2hg{M|CaZTV63E3MO#X$yD6<)PuR+)%DD5z5dfTO@(mVGK56t?HHcJ2L9IF$+cjQ zqx^8)nu_CYnl(cl^@&(TR_H#*T2^r2o27eGBFPrN-yT6 zK0f+Izeohfms`T%BjTH09)!Jr3Q${q~%I!1A+Ibn4E31cqa zo`SF~V}lyx_DFHh>|JV16Pt%eJjd^8_z=qTMKy8ig)GR+K1Tbbr+cm*O|GWhHUHq)ut51)XHMXitS)L^_4Tp1=_&T3s*5qgK@=Ix0G#&7AROfS>rsG`{ z@Q8MpL^6fdZb91tpy+eNGN@mpdipZOjMkPe59`K#JGgVo%EGMlc(bd>u6A}c%s<@5 z8O?LzyE{}Dc4LTC8DD(o_q8xgzov8qV?O}>DeLIFY*7NttO*R6g%NZL)dx1fX94#% zD4pSECmJBpBXx8n@-|<>L+qNdHdMhsP^H!xGb?mlKq0u2AnM1`5j4EUAE03p@2GUG zh}B-W0vjOxtzhZZX6MH9;SO}Rf=nFzl0;wfDQ5#7as=LfD{XYWP0`BR`JuhYJCFqQ z05JDvgH?3F%sR+R9R_4OV^-5@Jt&}H*^+e2;O(Lwh8lo-X)mSOBGO`-CV6z%ZEdG1 zSE!dWNBdP^ItaMp{o!=u@*Jf)?Z6`6q=ElH`STVAwb^v;meo_v3?CG7=Qmw^6c54L zH_mkMcClLIwh?*<=hFfpd(zmtQdo5O!rMayc3{BbA%>KO5_Fp-u%C4NJ(HFW z%wvvcOky(nX`1O@*Zed~HZgS}A?8VW5CoMJ)X+9Q3+gP5&|inM zFw<2l#N~B7UdafCeM(f}&|De(5MHiL_z`tI6t7Kod)3it3Qm(A4G@7!P(z5s}hd?ILvN ziOa8ClMAj!Oon!0m|wFMee?Sx9g*H|tjP{m&^&f`Lq?PqmjuvZbcMG3oU+=$x<+<- z<`YYOKwX8Ys!I0KF4%L`>(F+n7w|zsHWtV5<TvYHTzQd&eDc!n?vSiK=%7O#1)nowz&HD1OPpb|mmz z%a(T)nhU@UFN5CBOk0M97|~BS|Mqtsl>};{q{5kZqB{3W%a7~ipXzr{uIccZ&`3Tc z8epaNz;d%xHaB-rgNov`Iti4}T9!giyg@($jeU1vEzVJtPY5KmMR~i?NII`qfiQP@ z+(bt40xJL`=&3bQHD7d8tg3f_*xQ)ZVy`U(orx|}q&#QqaWZ$2E;qtaK`33VZ0Ls8 zi|2q@D1mpOL(IHZm9&!`HW)~f)`v8KYuR_H?9>n21}WERji>9DPEtRL{J(d#rbK_j zN1LaACYii|SuJl-6xMgZ+^1Dd`_8UTj(B$ICC#`N3GR2*Fd-nv>CEEBne6rlg+S!> zX;*jNF@r$=^NnN)qkqDL{kdUP$*FhaoIjEG5D>7VJI%C80aSZwey?~8`@!{=KA2Ts z^v*&fM2;xurayQYh9;`NCAuj_jR4(UzQ>)( z;w=+1JdAiayr=QoPX~}JRMSNRI`aW}9uRm$2MzU85r7EXW-?dqbi|GI9^`mblsX=H zGl}`2Hda^kLSAZu!$x>r-*|5hMv_#E(JKB@;S`7Tb)z3K=Lx_uyaa>5k7)~d{l z51x2stV?=Sh(ipjnRVY_XFS&1(NcJXWVpEw4(LvNKwtWU(8Vjk-V%6*t1vRjf!+Zu z0%^m*D-O^V$~1V3Syro7zUr6;xMLTpz65ecR8n}css}>A$J<>kqPuZI<|P|Zj{tbR z#dIai`ycn3A+4>%0C^qixZHTeKn&sAi!4^MxrsSbBV7efxm$SjCV1|zx>csbIL=BFtm5XZ`&76?AOLwrj+b^cVj$2E zw)4sBXr!1r720`DAA&6-q@>SN|87QVu@;-IIoWwr*zg-YY`qiUy++jRv1#9Y}&MDqLQUt@Ws(nX&X z)~LHVo@UR8?ME_AVupFn`-yxszI}$KP@NazZ1?;6{=9kiF7rB))kh2zKl69d71p1Q z2WolyG&7%EUo$#K(9=~_ZQF+O^0#A5{BZ5up+h18gZSItoYE0KD9y*6hAGbF!PhnQ$+Huz(hjFEbN zE(Il5ip+T4H-nb?jScPYin)4(qC~49$M*5E9FPHWonANIRJwYG=54e}8+|ChWauPh z&@0X8I)QqWoui)vX{DdPL5dqbQ4#%8-DL%;SA zJ(GH=9tIvCPN>mLLbCpE2nK5Z2>*J?Rtz5Ros^ar=nVxfTn~v5#s`61B{rp!LUJ-iu z3Or-~s-W_j1dn!1t(M_AA(C(P%sj$k9 zJ$-vXK<#e~j-#ZPEZMyZr}1DE^e%fuoT%q&HABJ&->ev3?HBgtl*@ZxR|%zmBvSSt zOE`QGICUJ*N85XB=fH@6dRAp}$Eh<@|emWR|;vzNW|UQ*T}4Y|2x);6QtQ zD?ABjmtOg0jmM=InAMcPK< z0~ehz1|WNoJ^h62R43=87qh|ud%D@?ym)(>N)yUn07dTf?(tbFnwU^myo}38Mu6Xr$76laX5h6 zAV*B3@N=YfIaqv>yKByW8aCBtz^a~9J;EUtJrjJFYZX~OJsR;kG+;-TKxW^69_xIh z*TNkQ`6f(kF80|yt>S_#V6uFuj?Mcuf|z%KWMaSGS28v`-KTu28>;5xcHfD;p5nHB zrB5Hg=IDH@QdPb2YDO2O{~dV0JFk&=<1BowimptecYdMZV-qK>zvYp~2R(eV2JSBO zB61sn`Ynr?i+<+~B1mgagMsa_y%9rnC;22gy-dnli81z)nVkF60-4gxF` z_yl~?A^We@w+ z6{X5-TyKhZn(=)Umz7x%Jn^b_c+4Kvx~+c}5E^|Sc0>4U;r2VHB|~ws0Vlq~5gdIb zud=OGVK^NNf3A!3Q!h#o zf*O6B1fXz=(6muaPc;GYAsHGq?P)k6(6I405B6c9u|5c(XTKj*m!5sU zw%WYCCm!aXV+__$`qecsLx6qDzM?(cy~tpCX_+_6rrmw+-myP+ zWaE*+?*q4XQ+iDvS@M1LO3Y=V9QTLbGn>aTmms10$u3Q^|w z6xeY%>Ko6v~j^m;3C1D>AAVz!rWe6L>30jsd9{ zam)gw3?g)sK5V(5OEI;m|d;FelEihF0Zxbo3*83BH?%DFu%$%@hGMW5dci|-7`sEmHM+^%-b ztzFK9&sxva*cm;*<@kQZ)YG9;JWa^~BDpL2`gzyyqU3(h!C}M7o^z$uMk8!uG)rp9 zz&n1{13-5!KRd{y#2VuOnM@PUDc5IH?4HUI2Y)M@0EWeg$cS#`YO&~2c6#=H^2KTWfXrWL{9&? zEumiJ%}Z9Zwlws?PvwBKar8^;4s*$7N+EN+q-v2L^Alkhqr&~nQ%|&>Kwk;5f9`*FE)D>5!ZkACm+Qh zMV7@Srv(Lc8yVCP-3)*Oz_(pmOA20Hdws9aKJxinJ~)5`RU+8Jmn#+s(QlOuOlO1n z2Csk+P077F;E^12v+23-cKx+j9~>DOxPEU)`vS^)|whu#$jg zu4!Eu-OzoAH9zA0U9YkHnCLB7F_kpqJubpCnT)M~8sQ(dm5HbuEosCSEUwgK&mN zTq}Unzh6ar>0>-_aMqiSjqnMX;x2&qK3=7DktW>5Pm`KSZ4$&waA$!MK<`yW`AjUi zFm6{MQ#>6O6@!5$6LQyg@DuR~0Z(_{xyLwB=gzz@%YLJQqdK`Ldk(O zH-0E7r8c7nvV_`ov9}5FU<83W*V!#z9@q)52^1E*&9)~GbSGLo?n5W>0XR+ zpfOT86a_@8M?bkidbfeB1Wzm8+wbyZ+!Nd+fF}X;DindWQ;l@*%3|b>Q0yjE`V<8- zR(gTeOj~B%boP`$-;(>xGzY%ctj&eXh66>s$ zE5K3)gQ9{d_7~3ai!$i~oo~c|JNL3P%iDr8kZlZ+rTyhLhLtX5u#zlSE@gs0ffoG6 zwK|PgWcW>I;IwDe0>Xk;<)d1Y6b{fBXDP(NYQ}$3Hadb@t$5MTbph9|0kZ`jr3NSy zVrzn0?zCC_>&wyr+7wLg*u|!bHQ<6>M4X^`XZ6w)ptxW}*@_#(!aRasFrce-woOTqJ_9 z|3?mI{hjj-itB_+#8K`wjI)BX?dxtD6aGuXD6x&y2t@pc&mw}oE+?ZBKM{B94O)enhx|3iEek zG-Or--YghdR0@L=huhY(x-h?JHyEZUTbNq`qd1tf2XNr8gtB}E}ZQo_07*YJb6&tEDQqe$w(`-LP*f#0|eLC%A} zJIpQ;tbzc_p~I74WPPji(Kds>SW*ALhxDFE1n!pJXQ)G+F9CzZ_=d0=crsfQ_#Pj` zu;7mGJhFrGPG`^oS~K8Vyqj|r5D#@>1P_DrDsD;iV&%Sjl$0s`Wc}4MD-nbTPa>E& zb8RVWe4(tyN|f)&kCTKEabiB;k)=LA9`w4E#J4beq49(s!5s9IVyrp!`|_@hpWtAZ zDK3O*eHEvoEQo%!b`B3F%>kmSE{%k7DJ{hw+z*DLIm4WNY7Z+Q@8*P)jO&6CTS!1Y zS9Yso1Rk`Ko@0cT z6Xw01Xn+8PL47QfV>DL4dU=Gi`P;UMk?SO!a$<_3a{k^=fSZK0|aG>k$s(u?2;oHD4#X-QvvTWL8O=Kdso_|A>XQbrjs7W2zwGIMlVX^LcoR8i%_W78Sg7TXLoGH(4qEx+o6Tk>uo1+ zzb;Tz!?Mdyjjc=t0-S~Gzy($EZz&Z{<`Joi{jY-<3rU6XpxETO-HAlDT1LHm(Cb@G znNx-X(PgU0PPpi5!L`xWQMNl7H~n)@P~5|N6rHjhKct{%e}?1uZxKbFC+&D^n=EVt|H4 zfs`e@hcwb4SNqzpJW*%NLpX*>e*E25jkhel=P2lGL|r>Q_b`TeK_%=nQHadtI}zx- zKcNFD)mMgs4)X#&E05b`u-Edzf>@BN%Fu?88&9szA97pKG;HGTubikaG#`eT?yhqg z&^qWm?QgEQlZ8arph$+hXp84}es|r~YoLDJAH<;J>+^=jU&i^((` zTKID?_MjKzm-~kMBsgZ|MMm1fKY1}jI%_q`D`|%O$XEUOcS~d5!B-o?j4A+oaBztXJM*Q{q!MNsiS7 zj>LHPu!n%0h`Wb+>ehK}S8Q?Bz_Iohh!43SfS-qsR4HhpCRfl=gqg@%2M50BgJXx4 zsnJ`%@)h&I1kq>wx%=?C?qi3c&6tL)JBs+J>z?+Jn;iaEOZ#&_uB(T^mIoD( zWP=~2`QH+aZM35Nbqt5ew7>+c!xN^=$!ak@tqJ&D!Lay{C@2=Lqvfy;M?*glC8o>8}O3IA|8FX8e_jLnaU5#5IURu`L!c2wMH? zWqHJ?!63=Nrt*kJ&Qe@afJT&9NA{6Vrt@SV(zl3B3~7-;BYJF27)g4Br;)6=Yb==e!{DLcr6PKH!-4ef~@-R)Km^}OfN&pXW|_Zc8l^(2WT zQ~o#s(BJOEk~2)Z>lK!24LgZ4ACq=pbI0q3DT+`n!6#MJMnUcAsiBGveXU)G3LJT#OZRVj&Xn-{aI2@kZ5m zAk2x8!ZlUR5~ZC~P7Ph0y{s9mn1_j&Zxv{MugIf9wX`kxq%FT|^b=X64q;ySR-oFFg%qIsA#c9&h%W=g^LK2>3r4@Q0|onx2W# zptPuRZ*j7o;M3a%%$<}(XYz^JSkqnEP2w46XuPEO56$C~%6N(ELH?#26&2MO0A}^J zcz(gwmD z8t=?!Wx40NV$FM0D;bIZg?pyB3TLy(f=ltPl*&waL1T&k*C=5)mI$n;l`O2i9oun7 zE+UE=N0?DQUT{R~2UZjDYA!aVFHnjxsoM67C7H-IRI^bO?Z5m-*At3DYmyxMx;-)% z!ggeGFqEh9jWLRD19WF7d<_^0Dt6<^-5*<(aA1msa3*`pr;kXW#1kU0S(RtH6s?Mh z6*qsyGBOCWl1e5PBBNtJ?!Stk3}OjUfICRR=8*f-R!J;I(}S<-9? zF=3p!^13XTDlgbmGtr9djgoVz+>%4ZrzA#)Xo0unKaGn3&AVNdn1C^9b=@IUjXEm% zT#AbqK^p?bd+)Tff1-r&_(lrOXXc9_ZE})#jL%M|^HkC%dOBwBr>~1XrWhh!=z;=w zF=qQ`Lln!p1AmK1^9qxCyfeoY7#uHnDcZ(g58R7Og*c-Xe5%YU;te(TO9L!dTrG=K z0+`lK(;!aT-@{ZV;o?&r9K?%k3L`RYgOki8AmWs=N)ZBH+dPYc`uNtLTxMfERyG9p z*^oo%Kjn*qzJVK4wIFjZB@)XCai}EPp}dQU!}#G=RtL4Tj^Q2W?CVaVWC)9j^YpZF zm+U*pT-AJ|wjj+)k)DgA(dc9!TRAl;koL3 zPj!pA{E@)=O%?&)`Vj-wmh?Ux+megL`1p6NOqiZxE4-#7xJ(-uW*v*h%XgZhOkKsw zvZSWCK0iaX{}PMoa^s!3TDjrt9Jt(XDl?B*_)Lrxzc+-e7ArY`vo_Tg{7J6YQ(ue~ z5|f+tTFx+W0mVL4YjD-zUPO!@{HdeEkVYk8)P~s#W8?4IPn(P?;!pU_l_3%7+348J zqWaq9y0DB-N)fqR&iT3G&zEGEKPee#(Y=gPHW>#Mz?eqL@`EXy%b2dMmO_kN@3vEb z8e%SZ#YBkNa5S|G(F}}ZORk!#t!CA<4_i-;ggMBl`96$(l#2;g!*@f`;nB&UC;B}u zGqa4E(+#c`FPko!m~h|Duqyq&sTho%Bj7Jw&gpqvz%hE_2x&7TRcVZ`C=WEWIZl17 z`@Qr0cho9UF3F6*;U)tB8cKqA-??wpy}HGfR-cT@F-T7Jl;z>w=s=kFq||shwknM7 z2JQZ%&Xm~z35S?Azr~?%4*!hv=FV=}TNIG5iIh5_9ND3!EPRa-2y86Uhb9-V(?6q7 zc?RF(l_ZT4B3w3tVt5oz#rzXE!!M+??QD%1LswXGukJ0+!T`q2T0P~=;=+v^g&2G; zhu~DdSaTjHol3;GG5U=ljeuG=Jym~O2Yg{rRp33cmwt^b-LVF*Nw(i*r8*Xr#7^Tj zWPOc6Gua3m1=AnKaXpWruR%k}ZN7pltpi-!_Jxg`e?DFVx}Ne^Kpnp9+1w>d@yv~| zl~UWZ)$L|9pEx>W`ZVT-IJ zlQNDXM#8?lN)rqVbHzPVu86kHUqeAbS4)K<;{6q67JC10oR&134GtkRBw zqsJD%S6g%x7ssNhUE~YQ*&vRQIk-pC;(}=TXw1E`PCfbc|6-1p#1F5>t<7>2&mu}k zK}QrXKCh0TkC#;~8`_)(?z(trI!?L)U*wMPiDnsne+NXnjCN7+>4qk%v$c;7zb58q z2|)_O`{``Xbe|}L=@ySB{O{Sn{ACD!+C_n9(aF^SQg)9gA7Fy>3Guj(xiY~=1rVWJ zWvP!beA#zqTWm_2ZQ8Qdgy^`EY66cuCw~JXZO$~0b7989-|@H(wPH`tIcDi$zzXXJ**)iO9n8HBXj&;RhAHo)@hGrujQO|xEMd;kKiRE zzCeBI-#w3aXb?Q8gpBISy>^ViJ=)dr9FC89km4zS*&OKa^$GL1z__i!=6H{L0OPMu zPvzmp-OYl?Z25(?qV|uGm2I$#yT!H7*gp;D4`{8F2#1fm06jp$zZyU0oBspcehY5f zgdmh}gU5A`%N)I?{Mg4OzwKr{HU$oRBCGyatRvrx~VeN#(E@LH-X{7d&bkO|z%|4(x z=8Ee`3Lij_ZHB?(bDvcd>f?t?^ai*7^#t;emBU2#1?at_u+Xj1cjk4}-||9`o>f$# z1Nlfx9Lc*;snx7qKi|HP#Ydeb8?`H)r>$@~5G!#$rlkOo(=IeIYF@I0K>s564W8cxxdBU`i=Upx$5Z5_nGou+V{&2X?-^?+P`NteGJ#kaASIbLY9RL@q08}l}iM3pbQvj0Rjnk)wUTIv4RE zOqSHqFB%1kM3xox7M{Hy&fj5?Rc*5mXDYUFg3FAH5DUmj*7T8)SV(IHe81P z@b5Ua!IEGg%@sNs8Zv5;tu_R$|a2U*D-IiUZf-l#zvR(*qD}e>rkSR-xloUEH;5sI5AGEqesoVVp*_};Dl*om?e>R z$}C$PNQGH>aW7Ai=F;e&Yp+ehw_@=hwKOtypK7v^^toO1rIiG!fjg#Y5>_cO*^uLs z4J=nySVi9SOVi=vg5+BdZ4&~L6@E(H#7Gq2_+TbpRqC?y9DDJS8aBf_Z%h=AVR^eZ zlsiLCifkW}A!nbP>T# z_T4Lzlwo8SlW(Mc`bC=OHLwwjHAN$pbc$w0;`9e!^U8 zWblUq=fIo96zV0C(%HY-F8a%*7cn?sH(&FqH(7j=;m4Sbw(-i5#t;vbBA|$P9}i)Y z>B1nO!^?Wjuisu|Gc9b{-O|63_i+i&My|KoSg1u*xttwwO}8+T{)QiOgt{Cr%UEC# zYnQ{#Jx+I%3QO@k&IIN*styjd%GmZkWB6c`5E_t2RO{`GL%*Bb6dX zG>V1cudIrbxcyILN)XV+U3kUpEjg}MLK2*l*AQ<%>XUW<&|Ut^2j8qC@a;*H@sO&n zc&J)>6*6m>7hD1oV?U>q1+n>$O)$8!56BRbV6ry~69>hV2sVDE0zr5PNYJ~+*UYK& zdmBTP4SuViX`OZ?CCO#(`rplQ2J>N*4enM)F?^W_4gnQ;bOw^>vdtBg4`Va!wQn_9 zdJoDtBB|Z&ZSjVbDWr-B(T^MPDjmTBP*n(DZO@jJIXi}$t<^@=S!%dxo!4Lg~CsiT|=INmA$_odRD!^ zjrT&kSnckVUB1El_t_F|Kp*duTaTI>|0lAqn&y6#buvdIU z#&a=J9AWc}VM+LGkj40vz3J--6eGoTO;4|2srHtJno{$Wz#)r=)P|+5na?n^uxwhs zO?}Xm&?s$x$lK(+znhxoijHhtFZ$<{-v+a5n0tUkC6X?;nFr9Cps0SV7CyIn#5;rUdRIV@;She<|2M@F_n>?y4EdD%CW zL|{k``wNP~zH}hH6AT4ar(N!qO(R1^6>AA%sZ!{7<#@N8s;2psSi#J_Rgk z7g$aEOJ@R=U3!al8Y=Ep7%jv@9>iN#OCw^HVZ}aKE1lsdks}pg3)O}{y~E3uc)fmw zs7S{IYABJl@)lmvi6a`7r|A}iN5h#i6U*FhT_ZlL_Ob+(wn#`qWiu1eqUCRxhw^Z?!^|LcL?wk6s zv99y+q|E^Oi;5?fPTNXS-KqA!CKrm*I!wlX2kz6BWgRyh-CKF%qFSi%#h?GqT`?$@ zbEkQzhg65X&w;lPHz8W3w~)w|ewveYtl!P?COKR83=@^XWb|>Cz$@kmo&T>6K`b?u z)G8}>eADrk$4Vi&H;y8_?+M0D72iPcphn1+>~`2gk(TIGN1tg;8TT zCS~V-a-ijYF2>_CPc-C~|H~En2-*G3qIV3ZT6LPQ>#dKM44D$6PRiU1z+%rl|5SuU_vbZY#7fhbC{=tDZU4BFOMIcCW*Y^8nWI3LEiOPS)8lqv zGeCTEHx6$`@EmHFEyj=D+B0$9Uxm>wL`dOUPCj3kM@WrXc%7-u*jG#IBKq4nrt4pq zX%do_saMU6e_n3pzU4(xz_+}YZ4QqcE0SMt!YR-|sL#Cv0Y*ymL*MUtgqRfljqp#G%!bi5wlizpK$sAVy<=Cd zNC=OY%_&F+IrMv6h3~HEwk8jZVdT=Uk>Iv+}x)0xEd%|g_s z@4GMjk?r%T3ZhAu{hFUeVw5Eey>;sUg-R$LU0UOqCyzqC87g{Y2(Wo@fm##cAXt=` zE3-2nSrp?f0a2L&GwvS*ALWmjFDLC{;rJTc2G3v+G-iC}+veezH+_uUbZgWVajfcs z&e`bhbK>-vLR*LUPje2c0OV|6IF#!87os+pNkX&T*oraB&P>zqnD~ym7(GvzTpve6 z;)#H<_DEExi@YXv{oQ_;Uh(dcMkTbE4){3fr3;1oSfZ7fdp1Ug;G*KtNGu+vI8Z?7 zvxSeCh`zXOXvo=dSmG-1Q-4x*&DRd z>fom?WjO8HHf}5ailhdar->;CrnOty(Fp0^<#QH}uQR2Yx%?XxFLz5Vun-I2n>CjV}F}3NNUQFg?5G1l7>w^I$0!1tt+;bF5V?^e+EV5~4g3-` ziKo1pw}4zOA6)C6!BQpb{!9L!jA$2{#Gms2pMp9fJ;*+IvUuLu^A;+a#bKqNN=6En zFMY_6Zs1zW*lfm{*Kx7c6=c=)nNV6)M*@d;?m{PDD^(LJJ4IDnAQUf!Z z-#rynZf|oVPg%$%xVakX#R*cH>D+JdH|1NP!sG^XF#Ec44vl!4^|vXkbh zf0*~*brg&N2l5T5;XrhoA$?4;&Srxf3pw4-v!yF4=>9XCD?F6t&&fYUqvG>97pafV z3_s$VKdi6Y8LK+0-W?9gIIEFKkbO;?MBL_gkb)yAdDZ|bsri_`fZ^DiN1ZO4WbG52 zqsW`Ebw!YDhZ#a8>=!n=^0Z8njOy$8Pe2|}av%Q@-!_rIf? zaD=%#D;YWw30Eko4&5(b5FPrPa|!W*PEY|n+likP&VCLp({q!k`8 zdOmfNnufc5qoz}Q3h&h9?@|9*~(BR$I_IC+Yk!Lx(t2`x0jHut|R4uk1a4lH<_%(0{;KTnau zxF_b$G?Z40By>8Q&r5=MZ-2f&B8b3rBMFL_RSgrI<)1)+8~BV}VY#V`Rhl%=TyP1T z=70}=l@~fiB$U1pP_$3JOri0d=&b4Hioobzh;OsMl5U$VBseIY4wuRw5Crh01a46A z!?eR0P+#hu5jQpRI=1(a0L*n38&?^VGiFAe8yaE2P`GDZT;o%(|2QF-7BIJ+9BqhU z@i?aTuViUS3v^7lt#aL+Lxr<0NOGi~uJs46IXS47&5Cd|*44eGUlRR+W zZ>c>2aF&;z6|=3rMWsuluG4N|Q9jXIOrc($7eN_#C{AXFgLj@AG{W6U;SyM$92sgu z4jP?W(P+sZdk|jVPbmkUjdqPXUx|-=0-{efHrPw<*5nqRm7aX`BOt_rT=l*ewAk0R zrzhc_pwKREZYSrkNh4E&s9(1Y=2*C%sFj~|%PKw&Y%?wI^A$U@kRV^4vm;Ga1g*yt z>o@vFrQ}Dg4A>Q(xRo5*Jkw-l!h=CWP3O=Mk3}S&x?FG#YU98|5V9KAO)yd=@G!N>`$Pf+TgH#S~|?dkSbOi2b(LYp=CLxC%wPIBs;x>k2; zxhqj5d+9)*`B2!OPv}~WPh=p3_`@oT?Gy-?5ab7+Qy>r`r8w`L=88qFN)yAE{RRx5 zRWXZQ?oQ)DSh-ki%TMg0r(QjLg!Xgun)X$)K=>4PULL z8{hJ${KHJ2h6jaUepG)My?%!?fELDRwvhmzu7mQ(_IG_I27;lFdp9KI({25qvAndE zz($ih1*)+>w`Wp|;{wE=%>dcS%}JO?n2oW-;=NH9uJ5&<&{(aDr~AifUy26LK)tM& zi$=ts;SSCS&ZZd*#gXSEt`%>!TMKxf<^bBa*Bd~Prevwpnv(G zB#J@n&)8|Vx+TsoCsr_#oQq7LCG(+cEWeJ`#_Ei!#t3PFdw-9hH>Fj#E9Uu`VA~>* zv~U@6igjP0Kq_phAU1g6bvIE1?s&wdKNioRS_7pil?L5GEfT_Nyex*=o#tPlV?3y@ z5~0NMlO0vI0{QJFThfIPz zxkhWCqg^@)IjJiVPcN{zR~QXBgoOT}ziXyKx3|d3(Sxl*Wp?;Q&Lzg6#*V$}*F-u{ z>{UK{h=YZcy~Jyv*w1a|hX7kLpE0ivSedS*tLLns{7}7!e2|SnyGNiiW!g?n+hRze zA-=$Sb&a6amb&nQ@^bIPb-hNREHb}OLj?IJ@bwJzFWAddW2>^EFnH3-I1$6;vhdtb zwH&OIYs>thI05XIIBI5+>P%&K!JK~YDfeihK20yc*pW5R4Xaoq>OX-{VsD3`PaVpS z;M`I{YN5^g+SSrF^zL|}RSj|<adV)e|(@M8AUIlw;sG??HiBX^m(`i!ouk zGZ1_!#<*;u*cV+Dk2_P^fU*Td~)j&il8vsj#V?VrS zUimkoM49cq=~c!=lnm_j5g>v^oj2>ERQT&~gL><>VR1S|d)b(Gxxwe6Xda9~&wR>h ze_l@hmT^iy+(|p@YWz;hfbM9hm$xG6}&|Mr_fHL0*ZLF z(;sx>LJOV%3P5QVd>?|N5_5#!#_FRaf8GV>5su$h0dQuc69xNk$+`~5v9X7m9ypjN zesfZzANhmr{(>k12H&*?e{b60mHA?%59^)QtSg7mCN0PNH4~Us8!*|V5eNB^Mgy0z@#973g4Q0h#fjXc z7K!Xv|3%S5N4(>++st9&`P?U@7?6(TwS9_4?=X6mPz>NXKL(bhGrB_UGfb#t`htC6 zrCs8@J8)X0Jvk5fZ3gu#fO$&htYyPJ?2f{uMlolJ0i4i0*FQEOvky#9vXAVfN^a6$ z3OFr~*z&$G@lWP((vrudPN--?-mck~K|0YhZ=Z3_2D)pcV$r1wp%p0#6{lcY#4bXM z95V5wX8WPNz{DD9;?Kw#`cz__LF)>nYZSs{vm7#N(8e1lre|8gw)+R9b~gtON@(q` z3gd|cFhky?nZt&pd9q_5aUwRrDYclTv+wYJs_U7gfrEeb|6tVW8#(+`q19hH4AW$! zhaHS_EcCfNmvS+4zD5VY$G{1ssrWH(wYrI$)%MCNkH~Jeo-jqE!??I^(pk!M>?&PV zWW$a9pf`=A*_X`{Z@w>!k=K(EHT$PD5isPW+@97>M>Tb)|HI0Q*lT(>*9L&3<{e5u zapo@4*!Y>zd}1~L6;NTM=SbP8y)(aOPgv_4e*yk;i*8J$@a38{vNgwaI$nJvPsu0C zg=g5L^(MpEC*GP~ve((D$fXuz@?=CpV7yq0bEtRYFH6V zxp(_^H%MV7$d8AmK4NVTIMF!sH%0iq{=HuoSc`h4L`uC}EDii&7bCbX522G5N?q@z zT6!pRxnGkZygcVZiFd>KU-K`N4Wz2@9s=-!A z*=Wq5A1O=~c`}h)Mt6y&uOC+)2+x4I0Fi!+>bABNPOAwhQ{P=V~*&^SjER_2o z(sHneLA-V$#m8-DZIIKZE!7Tnava7$A>j)=3*|yEbBo!gFV#Y%HAFg}X)p!SW>kC6 z$R=*4FlRTJd=28O{=i4mwkFsy31C5uajT3~ngzNNqccXh^ zd@tD^S=^zfpI+^I(r^Q^(F1y!_)5cAJ$hoMt*S-2?|!(v;~z5zm+FG7j$2cv@vB-~ z%LHJQxH^o+Kv}#jNP!Ed2_Ez~sJ}O;A?RCLW$mS(8}oOk3Z@l3HO&dG&(M*KVz#>$ z*R>_56r5tAMsFxbQ>I)bQ4Xv+hGWU6JznCc$)U$?cbt4)<2=ypMoCtuKKc$R-m{?O zi`i0&4XyjlMzM*fSW0`6l8wh?!WtFA>HFb%;#`!ceZ<6Wcj2G>k(uNLEggF4MN5*W zjmX$2=`WiY3_heMXW6{9ED3O@rbC;1|8~CSreNe4BXEE&mWTVNyFh|8;Yx$0y>)0D zAazQBx+Mi!Z@-SYDel0h-QqBb z(GaOFBA+2mXv5NgV(40@{f6YzM_=TeyZyls=nv5%m*zgG1`#lah=2*dG|=sc*1%5# zO9AMp7#o>?6VJus6iw;jFhg*0f%ZVC8(6_dd@_>Fy209ZGGBFwhlO6KBn|q=I%QCJ zYek+6(f2?czxnT|-&}DDxm>~X zu)#>u;$wjO5?myx?M>HU+1`!zqE>Bj-^-{|vE1FL^5Gj((O|!Mgf)wn)oB?CLd->| z_Lg5?Ct1)y*Wx!8;}>Q+-;YSCGu#aTK~<`(4t@vSeb}NzKvNp2K!gZj8M^esYy4|T z{ta**$rlBwQFN!_ouqbkO7_}}yCzAprVmT0ftmJI&tX~nu|7Ds1fLlgLq}k#p2)IM z12tJl&fB>DMJK*n$L2h#uVkJdXAK+BBzHlRKx2l%P4022v(xlPykW+f*ZtpR*f#-+ z>?~KQ;Xa~$CDSt3!L=CzGQYzagwH*x;Wl|=!O3Ztc}E?Ufu))`b6+uDn4|n_3kUDCK#$(WdCNhF-A zA1n=<^T=$jV;DG>5|+z}FxGXdD;+xOAIaF;u=BCx+6&_TrdjibJ zK)g(khdH3CQ)b~k@^oItVh=#7*QpATLJ&WyZ8o`vOTbX#CkpQb_WY3coLaW3b$sqY zvk*f3;+pHvy3?>ZQoACmqs1kQdt3&mxGI*t`<=r(2`i|or)eg;%J9UgOp>Z^_D6CO zT}#8Nv4M8s#i;A}TYS&hCbRf1>*N=zw?APfJWn`MViilxQiY0>xnH!Zi(areQ7-I zEKeZP_mXk(fd)4=18$V7gFB!0;pXAf$+8oDtCUC8Ocw#Gs)=ph-@!>lJ{9h9lf_qT z6Ib1O{NE)P`>lB1 z>Bp$jie;Rv2%c1iGEy@O9|^-{V-Wj9(ibM8>IkE(W3NpXdPj>19c{QB*lwrY`$w*C!bc95_$;`Jq<4{7$*>tw7kXCfDG~_4Q<;A(Fj8|~_9g5_v znyxYyHVXJmL&eQ|b8W`%ouYZHow3jAUmNCaMkF}QR68NzM2iiqtb4j8@?zrj1{aoJR?yYxp7mVquDKXtz>C;M5f_LcUp&7BKzyEQr7JWk_=P=Nfc5)Fi_0J}oi zG>22_+(pmApQx9uCAUY!V4G)8MBsO)$%=MrNM#SLE`_9}{a z1I(=K{4M0Ia0n{$nl49jg3Rh!NP0jL@Mc7bBm3$#z@~};IuhbWflwp^))+(B@)xEqP_5~yjN8GGuXj5 zDhkUh#R&D8ZRF~$zBEjppy62B?eOSgOVVLxO&u<+#V5ao$JJ4dHpi;ZXnb_I{s1nm z$PYfi^7qn!X`2b|s#zP2TbA2nV=so0z2(p}t<$HXix2d1&8y!!r>g8}& z$Wqs*ZENeo+T;PvuV;R(>-3u`U$H~q?zMO4XoZF^*ieG4@zE?JXPGCVJg%xjp=?Jo zW-}tLEHWegi)Wl7QL$zIz28c@3?Sobb}5;z zc6A0b;4TeVU)D2wg$@Aod$_T#daNoA1ptQ$BY{5~(z)4N*O2P2tUmZcJO^#&JKiCd z0}X@FkYj4DwC>=v@k~@mQnb2`G@QrE5YBb3xyL=AH8-m4L}&Sg31<$q@u7IG*r&l_ zN+8Z0`*RPNGcjxrC67n0=zhx2D&|n|QW^Vn+K%mO9reGi?Kug6Gj+VB@P>F<9juNj zokfnW`@mz5w(2kC*@aG%3|O7qEEv772x0h8aD#lWAA5@HX2Frh!`0ZYOmJd6v3;U7 z$Q6?DMI{!?FEGrnSp+tQa!#K|SUeEVcWTzqylPgje?_h-^svk%Qp3)7v#}mBHhgZc ziz={j{CGUZkfJ>az}$slX>TL1l@}Vz8Kc!Ky?$*QAFkH^m}vp8rA}qjx{EDP8sez7 zYCuRB1=SpB`P-Q5HM zgtm#&pgsQD^!(mGbhc@)-uI)Glo$7NcOrutb676qG+Uvs-;X7)D1s_KM*f5(e$DAN z1UpBs>RvFWO$%G40F@Pn*qHdAgZ}uh^JcKx+8L2_$LejSGZgp49^qZD`rv^Yv^w;d zVof|}L)IlcQgxTF{`THEBjW3A>MCoKy!JT1^DTq01Bu_swBc(M0u}-s-X~ga8Gcu= z4h!M+o|&A=%O15%bcQ6M(FMh@K$$KQLul<|W?vMhlMl-?A6Gye;h5CR9y@G!e+iR{j?n=#W;Dei%@7?MdGzM3=;eeH6k;p zquld91SW9*Bw8wnf((v=NjZWDz4awZRdP{BlX{~oKHs!8xSGn z*%4jui2$_(;{0Z?qXD{gK2)bd8-T!)YNJf7{9u%@xYrxhfjS~z{0xa}fqn`dPR_2d z&k1?})+&_0l`+B%KWwKrp~o&n+# zvT9qC)E%0!ASpf=Jqv$<_{Z5Gb8h{NB|cE6H%~`)=+<)e&$8NQCo+xVsM9kHp74mQrNmHdcRkV zZ(S*|bYN&F42a&d!C5Zz)cwA^yV)JFi1Q)bKN%?wLMMg{z!^cz{MY!gl~st_l+|kK zLM~eQax7)=y7N-8n$rTA2Z;x0iZxg<2xqjiT9ucvo)krGh(7_EHCMRAchBf4y(N*c zsP6~acd=BT9g7R%#G#!{lnyenvU3}yHd)hC?hLCv^p3LpFhxJHvqXhqH~uc1Ic*H? zWPQESmm5p5xZnk{_-i$0z?9e3v0F_Sm%1yl(Q6CCsS1)Y(R9S4Y!w4JCLxxw)Z4XN zUFf&=WRV`aO=VAR$^urg;&8xpGFdrDg|S5s-qRcZQ=r1KFFS6K34-T+a*im1=|b;( zEwB}`Gr^pyUAPG7)FQ}^jIsc44m)zPJN^dxpaU7>o$ONH#ZmW>+lgVaOcAoN<7(TZ z0K~_3)_ET6h;P`kS}P1%qdK#qxxVXuex^;oyL|()eZC`c{0NhawKr5^TDe$v-OD$! zkBH1WNpTg5y=IU;eO31||5D$wrh>#sAMb;n4rb`h`MLmRs!}zx0Qu-LPkhO47j=!G zc+0wm9$ZYb0|T+LI`7rT*59Kn@JiStGi@ug4@su3C7`verp?i#$z1A|d6e3-7XuE( z4CCUl2nL4h4Y8AJpsZfAEz(w7FbdGq3o*B5wQWDnt%NtTMsdurEvzEFG&$EMSg6*` zTm3k*N7Ss=^wE>#dQ*s+>F7+orIG=&S_cQ`T#`q`N3<9lfgYY{?zZ%^U#hb3i%rU6 z)vufb-hB|e>ey7Xb%bU$z%h}Wf6hId6`rqMZ3T6+j*GJY`#w?5Nfc1?l5Jxd^-WH* zlrzCB-?L`cUX{znTfgr?C<>QHdn9P^crb6rKyT-~`P?AnH8in zpOR9W*3xaSb97qN?gkLFUbxN|xW#y{Gfdlj9v!_2=t*0&U}XXxHsk%bxQf9IG;GY) zE5iS@aOQ9x={|nPO$|*T-JwTqew!||iwEtk=K>_W@6_jpRSRWYEY1P6i|Z{QEp_1_ zRD{;&Rldkq{uXPrk{(V_^l~*?zM(d**|;vTT|m6FruV)2U4-pJi{Q1_-*T?2S(>)A z%s@7Y*HEdrxijFNvX~L8?|P=R=|3VYoxG^6x9D9RYe%sN%JbK?4`#;2`!i6pJdR4H zfPHG1A|+t88^_~xMF?*u`lIn`16gK%&Hz%i9EirCy1Wf%&?4B~rWZjKV=r#CAt0Ur zDsmm9acJHvq>AXupVywXBKC=p5_D4|MMY=BY2XFb0Y|L0I)o;jEwnIsV?P~wt?C-8 zP4VirMjAXD$bZRhv+vQ}f}W$G7mgdXR`pPELn$i{Xg!~M(xZG8WB+iqTp~%*ld(iZ zKJnw5ua3BjibGqqpMsH=YZ3{*m<{I}oh+AEp5WuPr42$v!L<-Jr;)j{vGmMauPIKo zt0g+QdB$$PE1<=Z1(OPU>_U09vtt1hm8}p!dM6y!TjKKjugH@ z9qfE6)juz_!l67rxDWk}5_wlDPi5YvVS>iB;XNm1Hg|NwvgP~9%!IYB`b`(L=J^iW z3{TnpKz1mD)8BbhHd&0e6i|Ex!iaxum|R7>Sh>{r9$XK$E41N+*E?5kBsF~RuF-SB zu@y?%|AEi?weis}ote3Hd65!4KkaEa;V2R+tadx+S! zf(z1JaF#7F*?wdeVoDgW(&z@ZmUCzgSXTj5-7U3B6d17zjW?{em=1NY{21#dYjT_> zUkpJgV}^^itdhZ#Bj_aSnzo%hN66s``wz&ruHBC2Ktn+g2e)^>kZ{@dDR2C?zVlUG z73dHVO6z9OfADSDlwAT>sfO(6>$uVh7Zhld=(F&W2{G;JLu%dq|(Z>vd z57Yg&>j~(J)e#QN^@(=3%x!5C?XBdt?{unaoJL&TB%h>R(~43fF2pytAZ%&UOvocH zXkA3AXV>5Ngs9=SBz)F?492rlJt%KlfB3V3hw9b0HFMw;bdF>7phkpga(X;;@)ZKN zMU0$PK9(FKw2UnXfY$y7Wfg+AS+D-+;=6JWQTlVRMBEiC-Ng;JTTk+PgKv*a-wDQI zxkV*+)A-@HTY}Xfg1%<;CY8t%j_G}lf0~`QU^31s9)NMIX_9qw&jhNgtw#2@Z=#~b z5W{W&QGmpKL@PZyou<&YbRR|8FgnFT5Skglc|-(Wm2^e7e<;5xuYzlypr(mf^_|=~ zb+@{=i))x*_Dv}ZjXb2A8$+n1b_sd6sGbcX^=U=R<*YHuzTv22*-(79sZ{L?3$;NB zQB1F z-B1PY&ka|QAG{>6ne+uZD=Xu;10{ncO-V_ka^9?APtV<7s|F{y1PF^uXxu}{i6P=b zp7hSY33nH`5~cHzN$ZiNs?B}eM){S)93O|c8eA~(!+SMc?mLcPfm#}bfA-|KDU0YA zFF#lRp<=_i+cC{AkcD2jI82Ob1Up|@7xWIpNEk|Fu8h{WRruQb;&V#IQPT_6t-|PM z+_~SlaG9`}z_sU!J2Zke!%c%7Hnt_Wd@&wt)-ouw+B4N1I-7xi^Wfzxk z0T910;-Qnc!0-%^SbePc1>VePhPt)t^46QU#aHw0F89qbv=p^q)6SmeP!=V)(0{K& z7ag)HvSgBeaL68WcX@=k?Oph7*aeoB-|4;-6*9N)DEwTw@jf(;bwHe`9wamnAD6&HCblQJD#|fzR0%Ke z6AwWwFI?s)Fi~u|G&w7wuLznr(s}CK79<@o#+7QhOf7o3;}9Mg@Vh$&Qo#enSQ9Y0 zk4G8kJiA*AT$cz6us-dXp?Pa|e0yf1YPG~(C#2x8Y*Akbv$ly`Tz%&1(>;y&AknrH|Tg5#D-m5MdF_Y?ID1+>yU>-K8tv!&5b|=nIwWwce z%8440`vtJ8>oKg098HdZ}bSnVj_wZ4ml^k6ikR~W^+IAr3tWdd&!QZlyZtsLv8 z7907yQde1rsQMiTT(z0(bq~1ai1re@Trhiu0qW{8Camp3RTzq(7igbjFs>WGwfh@pc)=KfcF`-$V^w@pX|-%nzI(W#7c`*N5tfUMKLQ< z`AVU0TtfQ0;Qlq#8cF%}zdF(}x446MwaAXU=cRFRY9zoY{#uN2vKNy*i~0(@1u^$3 zpET3&>*7b0Rg{-S8PnOk3D~d$aRE{Is$8}nk{4fJkYM(_46`8Nmc$7jXZ@Y8MZTG2 zF&@CY4Nx~mM9BMoy#W|RNs$$oef843CVCHrC;3Pc&ISW`ssF3vl!fWML>@MP(~nz% zKc1dd`b9hU!s&>-VM1`+QCihQR&#BPO|!^8@{X6hY975>hM5#>WDY(qMq^<)#73sP zcPq$Xq2F{wijv!_O7j*S_2>b-er%yrv)Je4de=WQV-4t|O;9ephB0O)NUS7{BR(#v zf#&xco|weEnTs3LfO5hrB&fD8=deNH&79A?ql;?taFR=&Y~H96DwNRR>W5yuv#nHs z%1Ensh%w_L;9F^Llpe6W^6pYV%3@sZ?*M!5za*3CUHHt!7h? zsh&){_b6~N=8~`NLA5xybRjz-A#1a}2py133huW_Aqb~+TYkS}6_mieA5OcQw_R->}LydBI%TGTRLhl(pS1EZnu z#Q8YAzgukLAfXFA@Mjy5F-*-A&J44??7AG(uVBR! z<+M+UewtU^W3VB<0eulCf(}Y0YdyTD?fpyy%&b(>#gCTGHqxJi{wAP%g) z5(i8;r>BVA>n^G$Bp@>d;Elq*AgQ>p1xrx4?#$YCIOWU|1mQ-$B6l*a5(|nJL*W0! z$!iF9T8gi}DGJD50x;V)xk<)!j?D65I|*57R;7Er5HzTB1@c;E|no;h`wWSb3I^=)WeuTN^EQ)=u5;RwnVW+ewW> zwMDGHTmBkfusWjF3jYXjWrKF+fw_E}%Pq>ZvCds54BV==Np znCGFhUw3l8sGmnI0<2>sjA$l^SCB6QUM+mSyEhzfIV2UtY#Eh+p-)3K30gD0%p-|M zG*37y!DEF8g!&0aHYZrV)hZl55Z^1NLUAFlX-)Z_W<+j7YI2A^D)^nlBXapWRuf-rd+-_f;ul|9x9yw1 zD~Kfjx887!N2VBHaIbRFTpMJbC@4R{yoMPJE+W`aJ6M%^X9MOY#z zcm^M=%%Cbna=3nS5)BT&M)q+uJa6>tx4*mol+Ue~7>%*NSL0z`9C}uMcPXsMp|#Or zTCpL&UO`m{Li4~(Cdv|mD3{CwB$7EY&BUzj?ImZ-JA zs!ze{;bPrv41eUoFmu@u;W3oIwl31ohp3P$5GCH*2*-*`P1^Loxw?XA89={|lqdqm z2jZ0{MiTSCyi0NZn7>Q>F7c)JSh7jw&!N{=JuZj|5O8-*tOaTpe>Nm;23Oj~r z!;d<3AMU+aMz3TKq>P%tB@_$QrMHB4zgPfM5W2aFxI)LkJn|4{a`1a1)ksa4vZn21 zrmjiAL*P|Aoabq%kK>eS)vUwH3yOZgQ-BZDN&i*utmTHtOfdM91x2{PcNva_z@D5m zd)wK`+=Gjp)(3OIfG=g=qg}_2EC=w05QK_v&Ryxig!ibVnbnu%?8hl{4j?PeiB-42 zhhH3@_=gm@ShIME#-wU$tO;4bh;BcD87`nvGKMr+o87+&_VQf7nm~-Pbm?dlS@W=z zF3~`@RLFL~rr~J|^>m>KlM1wM#h$!(?G(_!v6d{$Pk=bSZIZ&4qgvC^$~nlu+mRwE zg$SxFI5>eiVb0AfG33Gg%fAh!=1dmRY|6tSO}b0LP&mZbCdH^| z;Ye)BreiF@l?T1SR10ENV+h;`9O=-|VWsAVO?_g)Y!nR?AG30!_kCS;p(Jx1(aA{#l;%)DW`XdP|70aOs=NF9B`g<8);C& zpHyqxH705;g)|SsKcqM|z7?DfnfN@rQ!MsRc!2l9NBK{tRm8pL8C&vNdi>_rh{p}W zRiSj+-nL&9FY{|^gJKrrZ9ksES2(hHmA+~hUaf_Q%aQA70;*z+ z0V2?az=eUrXD7GBNgWnrjhr6&97=(tEva+DabShK;Y+{!0Y>Nm%E>d? z;kN)YK+M1X>;{@)sM)5ituMmg!i=)OsCe^MoOPA@1B6su)9Dymso!l%#!sA=8(CkuGdUO+#v$n8l3jnz1!w8N~@c9pX-b9ym4~L;F z^7|_X!wxSJyOQ_Qhj!+bsAR86Hs&1LJVbwwvx6g-%9!+_2o&AZ0bJv;h<&{ivpU#fW(!-ovw z4q%nztAjM10m5q&gxL#d!-qXPeg*n1>I@SEd?aB5a{uCR!-$?Yso#ge!Lm5EqdmSs z)-U?u!>ekaR&&x%NQ;#m>H4qM(dAKz!>h*MSgz$mYf^kTm$}X@&60j(!?28mjIBsf zZ`iOTwJ3CRz5qi8!_@rqZ?%KBOPt-qrZQLQA-}XT#12Iq>un-JboHy&VepZk>mJ3{ z#1j>eWPydLe~c|y0R?ma#`1Zf#3EgjBy|p~9jQMcp<-edcISAb#7l^R1}mE+d@mJN zb0K-dtTvAQ#97JS>iHRj8qo@_OKn~W8-~GT#Bcy9o;EIc>@ut~TO?nTXRh#v#E%BH zENP+dWX)q!sAFPEdQf3H#E+k(#Cipl)^e-=!l9HANG&Hg#F|j@gM46!&9Vkw6?%VJ zqcba1#JQm4GOeI!2bHup8?4dyrrfIk#JVqxvB&*CsZ7bsL*@I&OQytILlC*k@*Nis z#NPp{&@-6TheDzxr0YDp-7RC4#O|}*osxoLs{5iTrUJ(@@!2)+#S3De7H*=3xVKd^ zCd#nJRh#SP$x*P(AVub2o_^o3XSF1aig#Vs-l zzzDWE;%p|_l4e2c09aGw#WrQ4cbh0m2()mFCN2v`kx>{i#X8!2@c}uA?9CH&&!xNy zwb!2i#Y30F5CO#!#(~-2Bi2$`>+3)u#ZN)*t6y+8)NvOFG+B#u{Y4$c#bhI!vlbjB zkBG6Q$>SL=%9fd}#cTcx(!7|@R42k!TB2-njZRIZ={m@ z#fQi9K_mEY!@}=m=j|&{fGr5a#gbDOF%B5uB5S(z(#tWG#!r9gos8eQu zoX$VU#!z0|O#D2(Bkz+LtTtzT|Ihb%#$orKW)#=k@Mw8b;#GkIv3}mU8cEC}2jM&Z0 zWV=l_ar)9{#?BWr?3y+ArSEi!tCOp;keq&*#^u+h?`nh8ETPa!ODjkdFnONv#_aoG zmz$^U0FZeVF&Aw@Q8=s*#_t*NW@7uwoGI{Y6SbvM#}%&Y#_@cHuL7XH+Sc$dFp&TG zWJm}L#{|OUB2m-|1_}#J6Uz%E&XxWk#}vc3sh}p`!FMLNw($)6I^|_a#}=2J$IMT< zcbC7&7c?8XN`O+Q$6980B@rZglSAmSh$6ni+E|7|QwOpADFR)ayiF^Za z$7#2xmIn0gmUu*$KgGLmcd9; ze&?z}YyB{Ixf~bG$LBp3Pcw?U2jXgzXTpVZP;r;+$Lh$|p4P?pq%!)VG))!uYULWZ z$Nm`1@n$P$XBue0T)nj@^Kj_s$PsD8XKDC)w>_BvYSLNzgs{QD$T@UVeU+=pLwgb& z(wfLWkX-$N$VvK_$`SkIlBkWGT5Q`)&Uo!9$V;cN?>EiwaoJ`&A-`)}fEYb4$aur3 zI8QOyG+pF?#u7qkL%8vq$dW7(B1n3@6A&~Po$H*ke#Qba$mgQKY@S#fvT!;5m1Ol1 zY#Hes$m~X0)7P&j=gI$@>K7|m&>h9h$n8ev?*BM_anwptQweaa#fZrs$nd^{y7`#R z;AXsM$}jVz5lOf6$oxlgNHR)&PW$Wuq?3k_!i7Wx$qoCLv6x8875LdAHKb3srjF9F z$swO(>Wk0*7H8t@+wN$VZ`2Pi$tAhV+h720Ifl;B+LRK}=Wl(2$vgoSha(ty6F~FR zW(f~WAAis^$yOUadWkQR9S?v~W-u_em;zp5<)2uhS%9F!Q1oobM>-=jUfflW%OYHq7%A*7* z{5+M!r79|x`f29(Ht>`f%B5%e49G5u&($I*DzQb+`Q7yJ%B)&89=89=;e5&`mPSA7 zK31lk%C(Lb=-8?IS&97FGk-H?^)!ih%Dxb=XFc3aaSyPb)BGVF19w^ZHtQ*dn&k%Sjf|6N%zwWY@I9 z5NdOByT`^l%Vo;vKs)S$9g~>5+yEdnD%cXS%XLkP6g$s03RRCZSTGwL@!60V%XOw$ z*_dj?K|GpgEGa7vPH`by%Ze2OUolZ23>s{muQTy2!G=L$%a*ESo8eG>>rIO_BbT2< z*Jq}2%b*M?Ee^+D^JZ*KW@ObON7Q_-%cvI`3J}hId$z^JX;G&sHFHZW%eD_^d!CA} zXxDt@JyT6G9UWJ$%jLKvGaeqBQy@^($R}I4D0zzv%mQ@yam0MU)gPWFRus;n)!7z= z%nbf|Uik7m{QRL55H|f(|4OX$%p`!lQPx2D7!TUknm2F??rd&^%qD;z36eq9%rce7@MQ=;3*D7IBu6z?-hzqy%t!8gcdk|DMWo)|p#-IMTFCn#%wO4t z7(jtC*8Hw>UZWx%07xm!%yp@t%q6JTc8~KoCWUsMh+Kg|%!|XgEA4{NoiWs~=h4|? zN9@Ia%$GmIOq95ng^h7^l*eaJPd!ii%%Z;EOoPTAX(%drJe>Rp2bEhY%&Z8IRq0Aw zc#OVFFn2~r&*(of%&?R42*JN#YR;R&ul^+LY{z^7%(>a^4=S9$J~B1*Fhm7jCBd}# z%FT^I5B7|vaH!FT{IwAVoHT^%>Fbk7ARX(?4ve) zA_@3-B3}eo%>guva6rK(Z3zfb{?_oj%oL4P%`!PC2(B?ur@26=poG>hk`{uY%{7!H zd6z{X(*q$940?;!uV;X4 zXUSfh%~V<9P6h>|Z%qiWv*qyc^btW>&2{4{AjM%=l-;7 zwj&2EJZWmdnZ7f~&4f{T)liy@6IlEXf4Ny7R#cTC&5}JEs>Ql}@Ri6*;9eFa9jsH- z&6C-)#gvHGf^lDv!l;+RhVdAL&8H@N8l2%d6*ipIl5rAHUl32*&AJCNUvKVuQ-}|- z2Biu8033u-&BZZ^11RCjes!6&F%U#5&lG~3i?gvjs$Sm;c(!e&H=4C z85c17P&T(tFatICOP9g~&NcwarbS3hYFb(u>t)=Q-k-r$&Nt|AX2gzmurH^LS|Pl$ zl8IQP&P0K7)Jmsj_g}XDTRz@|1K}Q6&QW>(clr`^=iQDZgTrPwovU4Z&Sy>p;BH^qWa7}&Vp@LvUeYA;C^Q0c+zadcNkrp z&X1Q(k<)U$qJsR9wl-8YDQ6Cr&XLUZDmZu@t~p~;OQ599EaY~i&XzC8S2^QG23V$! z7qS-mDQC!%&Zn=1uoo2_s9x+0)EFVrEK}1B&a(RA6pThWC&_Y=heG_Utv$}zvREXAx&t(ix zOZ1E-wB=jPwKTb9@S!-Q&uB)Sz09xIn2w?Rh^};aKozz=&urB4L}gVrO#|2>=g~U` zjEQ=?&v;2kca8y~HYNTVWyORZkik@m&w%!`J!S{;cRJCl(WFj>M)q*q&w->93{ z&&mcVPHm_+nUw-|=^&iP8;61X&*&&A={dGjP2VKAS5H!mM0;uz&-R2^h@AJUQCamE ztnYEeuV!++%#cb*^5ZLZ&-tBpg)q|u@&~-4@O3xCkItHL&-yh~ z!m0*VW&Bx~XFswB_og*!&-&v^vX3$|<>3psbt1QAn}l@A&;R;GmP2Y*zpSKDF1_%- zM`>}m&;y#F%_@#)2+>+jyL)||@ofh8&<$;_1541E9`jw^^e5t3zn`k5&=Y{S1w|xF zylgfp+JXhY?Me@x&>J}JnICKb$Un9d&v(~4ts)}p&>XFFCErn)Z8gwSe+a}%zt8MG z&?z)%jVNq<4xD#v^n5b>z!90s^14(2ELJN58sQ z<1T)VG zPu8r7(IcSHCw90QnFU4q?X-k&B&_J9(J88gXJoJI6}(t76N5*>O@?K7(JF4$>{kK> zzppd`(Hq^fIUC+v(JNiR$1Yo8SlM5t@mX@3a=)|s(J#Q&F4Gmvmd^~E2WRSaP`q@Q z(NQy?JKYmb6F6=ezLktDAuc1-(Ovb3AX7)Wy{KG9uoewq0Log;(PQ7xsvLpyS(Fnh z9B(rghfZC~(SKGN!4yb5SX0A-_4q7esK#;f(S$=QYL;q-)!c7%FjIQ0+d8tK(Tr)& z*Nn30-wTpqGWc*to{g4w(Ycp#1JPtS%#(a2r+koL_uu0#cLdoz}RJ|}N%(g@U1yKIYp z9*t-{+l=ye)vGgM(j~!PDN_1(ZO><=cx`i%W)|EO(k7^cB0Sl;YTNROhlJ+ca?AYG z(nt>qW-EP30)vm{yzaEv-XT;q(ox;~Bb36RQBa`s_y|61wY|~T(rPGceMXa?vaA7( zboHohazb5{(r*54A^!HpcdDO#&HQww`{^3)(sCP9>I|3{44sZ`YR3)omEmZ?(!^cw z0<>Bs1n>kso;sw*2 z6lrDk(;YsyA0)(lf|Gtl(>h0FFux^yy6#EiELzV(QmcH)(>tlnm=M4N zi*Ru79C9Y7EatVn(?I&81SHl+8G5$?7U!ST3GA|{(?m-ebNyhNzWe+wt;5LyDOay` z(?`R5Yo;tYEhkhpt5!$pH!pxh(@SYzfM-M-L48C1#f?n{wAFEV(^6=(7&*KD z{WSR_NU={^({VfWS_sY=K@v8A&%dr2sT>{-(}VO)yTBhqE>pAeT9E!I4zYr7)4AGt z*qv~^^Y4R?s$n{)TC5RF)4l)O6jcO;mz{?~OSIa-~|l+r1Dv)OC79uCqEp0VLS`9_8x)Q-ACc)RaTm zN=240@B=X)cPc(VrEol?PTXaYGm2PbR0AK)e;+bg@Gbw z*|SX9GbS5Q0D>B!)gctU)H5uD>l)h!3EZyZB&()z}CC zgdL=EX!OOx;ynAth|1S4)&hrKjP$Fsn1dd%5ktb(OF$e~)(e>Hm3R*gB7pen#ncBu zqBh7@)(i$incvy(>?Htps!wP7%NI{M)*10;$v3=cFQQQZ5Gny(e}wV|)*-?6o+nm8 z=44m`a*RWuwxLaV)-$&Mw6eaa=D|Z7L81_1Vo|kY)gDOZ5lybO~Hw-=MF*8Wc@(wlBZa%HENp;gAzhEft< z*94(xcX({BI6?$v?AXI;1O_kO*9fGna6n*DU18go6-YPT`+DM&*BB=%o%u^}Lr){chzyw&*EJxDkz_MI`HqcbcyaHgqyhVZ*EnhSHD5;JUZSnH#%LZnEKtmK*Fg^T;AA_R*2G}_h&*H4krpt3}2Mp3DAoIa@#_~Ykr6HN5dg*RA7sE*JVjOs5ynFQRL51a-}b1JTZYN*QjKS`J^o4 zTqP^|s~v20|8+ka*Rx1+h8;m4gRe3NykxDG%(}YW*XG6gv?LB4-o+aEbVBEh9-%=7 z*YH^x9{K!)yU(Vn{fBC+CM($^*YU#H^nZVu=KGf?$sZ%k?X8&l*ZN|KB0X0i=;v(P z(Wa*39}5j+*b!oMC-~Q>gyXp?ELW3Y4L2Pg*cD?s1L+?mk&4@Iw1rA6lnuHS*e4&0 zvoB!$MJp$G&e%@Zsd(-9*h*XRa|D6Ez~!<+mkox&*AW1V*kX)l6mI|d(MzoUyl?HD zhBH+_*k*bIBx;N4ttAi-jDu!AqUZv4*n0U6eG6P?)U*?p$6J_bwTE5F*pWBMJE87$ zk`(_;I*hj$*;+$ z*r(TSeYHRD3)f4-r8fE6_kQkh*s{VSTM2V{LkPhR=%I$_q9vG|*t6z(_^BF_m<*tKkgHVkIbbaPv?BkU*t+KP z@4k<|Q5UqB{+ySjo6raZ*u+H3;C$O?4CiU{cvl|J7rsl;*v${SU^}F4%ko(>oO8be zcRHE6*yB@S@bJ**6Mh?kITJRY>)=X}*y)Y6RLg$`K)9ht6JE?(Op%7&*ztipomhoG zSA8D8D&Hu{)-nt~*zw?5+cl7w`Oh<5I)Z(TTl@&>*(Y)-u-a;sMsFh4uG^A~wNa%q z*)UDyro@_DWaT}(JSq#;Nq*~U*>8bl08m7{Q*`-D}ky8GK+C|Zu{LAZ`ttS9 z;XiC4M{k~Rqb6!$sLw1u+SVl|Eegtf;?GT-?0`8e;|myN37xwDWW=`%fM!s+jkU(B*>;{M}KYt2vgde zD@ODk%f8Dx(?bK7C{|*m+m;n(Jzz0`b;N<@u5#Bev|x_O+m{JiI3gJ9OxsqML~6qT zLrmfc+nCvBUe$0?M;;xE2!nwr*ZDf*+nk9siE=f@J)7BJ$Ve;#`O8PL+q!pf2~)Q} zOw^6A7r(jUVU*5R+r@vd8j?iDCt$cCP+%E;G^MQ)+s<3n8>Rrun$DxkNUR!(-M8xb z+ueHQ02Z9-i3q z&a0WG6jD8SL_JkK+>>ui$$tBr0)M+M?pTf4vF9b?+?E<h5E}DE<0%JHO-1Wv&gJ7D}@PA~c zL1{6p22LtQ-3yt~3^ae8MzhvPG8Jg7)GZcZ-4voakBQHO;86(=cNe+4sD(x6-5e*D zZ4h~WKVTIHVQa7M1q(Nm-7AIOm-7nefbYOiU8 z>XQ8_-9`;KYJrlHRpgHcHo858N}DBS-AB*_RAr2#tl3wQX+WlQd~u}T-C+yVsRgd@ z;r;8+Y!1$`f68NP-D18*VQPT9lFFETVbXgh7yhjG-GcqUo!t6O-b{pyBV>g(#wupRorms(}qU2cKChfEEE>-X7w@ zyYz=~Ui%mB+1+)A29A?>-aJec9tib-lc2Ztu7;#u-6 zuYw#F-aemJJy&a%gwa|`rY`;t=_#*r-d3d*=TNG)Ax~dMA^(CQnk1M+-dN9s)N5$( zbu4LC5mPAxL?2lM-f#n+5LBh5TtOmJ|EQCtO8ioJ-hPn+aamUSt3*c-?UV)K^7m(e z-k+`B;$NTj856| zb`vv54F^60=B05_4R@zrTZ{v4->~^~%mOo0BQ%CAQSKy^-Xr$1-?I5o zXB0y;#+{|~Dd@pY(8GQ0-?oFq)GaDZ3i1S~`lA(pEbw0F-~g8y*yhUGU?#;Tz}qVc=#!x(-mFRr@J4;U}Vh zoBOC7v!Rt43*G_M&^X~%;Wd*f=}A|S+HQnoE}(ujcXGMS;aGZaTS5LZDW$0{pEdM8`n5b;gv-88(-Mf$2*z_lOKoG*lHXr;hMCg(vJrDus78i zwO*=^CtA%<;he(N9}V>*tyT+BpEXv{7xur8;mbjqm0f9rNot*pQ@>qu+Qm*c;nLBE zL-oNJyJyA;BJP@W2&w8(;ppf^7`?93_ioESjXWLQ8aaeM;rDipKYlb+;Dft%4MoJ0 zp2tC1;rhD5GXo#mBT5}0V_;F{UQHQa;yPebPAO;v@CStubCw&~N;}1GdGhdxU zpMT%R@hcWMeQUpoH;hWo*gP28=Y<33&x=VSl%L<8{IwZis5F{U28C5u8K| zvWq{O<9F1NWxkkYCQUI7XX=tl(PvBv_Ps@Rr^TmwcWcX>RgujZ z9A zx*{yY#6AWDc$XCcORe;4jhxHsASLAbssH`W~GEK8YukizbCLU1Te?r!e&lT3@fgh#zMJ0g&E1RV|=>Iw!x^tBw!n!<&bKC+(m1aRK_j{z&N=JxcGsz<)64jm>Qz;3~d-c9xiD3<<*coeG{{u;eDZGbdj9zYBQ^w<=)_n@<`c~ ziA^^_AL(ousj5u&=Kust zZ#gN-K*!9_n*VL{=NWzLNjLI^YU=a#___>% z;F%5=VA)so_EJ?72skt**&%}+BAh^=WmO%f8XPbi6d`;4z`360(5N+ z=X40?U7^N0-?DD0j_k)d;0|L7=YJP5tB=KIJ$d0-1Eb-aGZ3$v=aesMA5|X@K7%u9 zEp@U9qEz(>=d1A19UUGd=&AwTP{mXI4W?UU=f}I@WksC=CMx;zOd{n1z&RT@=hs;r zlfKY*Y6<|%pCqyT%C%oc=i)DPlJcLU8$?mdP4)3C&2|VZ z+B+sN=m3P7F;0~_JQT4Fg`p?q5%=Tv=o($)5=y#K#gz`uQ@vn!&h@|V=s2gxB*sEV z=@y!^R9h_K%DTrG=u3@i{ZV6~+$AELiX*~o!g)Ku z=xjWL|Bjdi`=JqhFU&T9vy!BB=z?(FsnG%5@70k2+433_syd}M=&eZf;~XM6XZ~&| zC=}A0nfg2F=*|f0n-#LHM`o^JHFc@ouqNQ>p^^oo&O}*n)MRqE9@IOT=?bXX zK6_c;E~$yt#-0ar69jMZ=^OJc4~rOkI1l}#U)R2O8HTC)=_>T30lATtRu=_{1+9N}MhhqQ{gOBskxjs#OJ={6**c8bx8L=ZzSuAA74EOSx?=|L$yU6X^* zhywXrJFIzeN0Szc>7f^7UerZ!!;BxrWFPn<@5G{e>8Wc|o9B|oB~2a+zx1s+fH$rm z>8lYI9a7FmaPUD@dB|P2;70d2>AC`8B6F-XQP_+;p<8BgP8$JW>ATSnO>X^v(McYf z?EB|^GvKD(>Be=#xI{r*80pZbtC4^nccnYf>B&FmCNj-3vol42{F?WDJ#2yv>F@cK ztfFZrMIN}Pa~?How5)UR>GI($Nmc1$-fs8bhVAY6yh%HJ>HTmzujmeKr`b*~Y2GY6 zsCMQ+>HX}OWgS(&d)}rb+|`X33%3Li>IPJcFq^my2Hk|c3#0_D(UuQ2>KPP!s010r zlV4M;?I97$2*t^$h}BYg-wEm~)t>SCTCisHRfciFnWLKGO%!-=_F z>WTb-^CVVWF~IyYbsxjBUmj43>Wb$N>x(+-t|>`KvP2Gmag9yg>d3vsv-H{cgZrzW zln$c!Y%eWY>de&))?z9$F3p&82yosqMMrhn>f+({hpM@7WlG%!JhYNKxNIdU>iCN5 z;L6fU9_H@GC)FgEbbBCl>isd>$f)OJaM!=}xOO05`qF}*>i^zG0V4gMMHV+LxzKgv z{M5ch>i|S{zyTGW@|a6qmt>JaHkP)y>qWv68pgZ)VL+PkTn(B%aQ2bD>q^dkyXKmh zN-VCQJk+Hm-1BjK>rOMF@&o9{@{tuv-b6~4LGW}}>u=2rS_TAC;icak+2?3bqThcu z>vO+g`AL2q*7r$APWcnv*yrJ0>wj5@V9AKJJ>}JFey`&P5j=bW>xi@aNe=`<0xYHN zHVx+f%Pd&~>x}Z0wS&)wclF7Nsr*%PSwGy+>y1^uL@hb%<8EpTfyMYaTKFS8>z?@g zy6<{yRVUT-AF(Q>Eg+m^>!k*nhXHLjcj@r-(+*LEtmia%>ER0dsWf4 ztfOrb>*-EI_I0RQVKg*CJ8uGUmGDrG>=$R4Z(oFI2o;&shL~leVi;&C>>p=%xiJ%z zyqHenbvxH6RGsL;>>^DbjcHK|FRV@vDG4+z2R%)&G z>^$yxb@DQm4L2i)Jd2he2s_@u>_k#~;dE`YJW)A+aMkzGG|Iw8>_sPw_*{<7+0!1{ct|*0ljU)g#4U{>`k!3J9j7U`4~(GU_=aESytTq>`&iI zwemr7?Z?1}wGoZ}3V%FxgSGi`v&Xw^`7?2ZRQcU^=M*&%6YotpHg z&wmJ1X=Py{!)tGUdFj^ zIA)pjP*YYq?MTmyBP@*U1uaKrwNp$_Xku8VNwdMX<(T{ z?aU)S8!*jd(V}?csDHu{y7dWWY>` z3jajij^I4~?dl9PO~U&27Xds2hukba%vNQ+?i&v>PRbl}$f7rS16o;!-6Qh6 z3AQ^yDts=Ga>B&w?ox|YC&45c#dDLd<>b((>UsDao+D) z?t%Zw9VFO6UFLM}mVtG-Pr0if?v{%;N<4IE%DR2gs4Wc6Z%Z&4?zH7}(y{I+r+hmC z=kiCYuX5JK?z!KKMlD~AAuNcaP@G?3Dx?$t7hJk7i8!r0Yt7!ia>I0to0?&V7N;@s8t`@w4p_236+ zf$4bZ?(_Bwcb%h6Ju!{~YJ!R`wvK`{?)6o+7ic6>Qm!Rt%N9VngElQn?+cN&K!7(N zPN(PStr)RNge#+P8jD%LM7AzB60OV?@iifu51p@`#moE<**kV-AZ7? z?@+uznhHesiAfxUw$wyJm!s*2?^=cUsN*u=p8SWuAs}iI+dG-M?`TY2X^Utzfh?!g zSM10(jvwRR?{r~LP5>ix1`!^9OVJ+jJTI(dT?>4A8MsL3zcYjmnvKH@5>P5{|#&y{0!4*q0Un2eoFb`@9-1X5MZwLCE}eC z+p@5&m1z0+@AQNliCOikK29*5LCOg3k)t0Z@BXhg1?0y&DCyH7^v(vq|v@Cfh}CYME;020Mu2hz7rasC3r@FJ9FWBSYGb4_CRwV%?V z*=&Ed@Fa=+p~qKlR}A>Otn6gpDsooE@Fr?S6KXeUbO9xP0V=fatFtiU@F%+QwVqVo z8i~mG+z^mNE@7b{@H`^RVZ-6ce-%qyBBQ9p$w(9+@IDh@|B0X=#umXL7sNz+Y*&q7 z@IpZq%II#$Ej|(8LViA&+d>R2@M9~Wvs@xW;RS9>F7oHmikx+4@MHs01aeg1^8@07 zetJgJh{a9o@NDZo1<)ffp|t4c)Mmf5Y%YAP@N~VZP?}jNgN7CS<~HY-p#Aha@On#e zc)7tWMbLY?cfGZ@Sx;F@SoBHhGy*N27CpGBf9$A@U!ytFHsHjR282j)2@=n z9CxXp@Web|9Zfr+_~t72>9L4b7EFIM@XnynfW11@*83M;lBaK{pA=s=@brGbYEfpT zwDh^uC2gpQ0SY+#@cMhilhOyOWJO?OOcTNCdiR%*@cb?$yN_XP+YCd)XET$URXam0 z@dWYT-lG`G&HE4HLWi*zfjUAK@eW3`l`-*Yt5v2I^tAd=6+Zhx@f1j?Tjzz-g9iid z+kW#47dH5Lab@hv9$ z=bQC0cgn0ZmWZqd#oc8V@km$l0|yEPQ`=G@r9fc4SU|@(}%ANBzfU5t2P^|@uezi4?{bA>(>ZQ^x=!Jzshx= z@vI0$qnd^>cxGC@2`@*&(Nu2c@vdDgUhsNtlt|7NFB&L6!~vxQ@wSk&Ddr|$3xl$M zh0f8vblhlh@x@zhA=oZIK@y*7sU2Qv7gzGr+ET_x;4n>7gk+8N@#X1sR}FH7;U$T7c_G%^wROR|@#fwM(6uvP!qsTtoGwUo z_5S`x@$+EtO!$@pdK!B9A^(w-EfID_@*mRWI^@PR9(imy1!-(WbfPvz@+@(Pd)lde zNy!m5{sSsD9F0g>@<6c9!d1@}j_kjkG{Z)UyHa($@!@?9FP%PqE>|Av*Du9|jqly4@}#Qn zr|3&A;|EZ;qOZJ9{SJNK^1w~ROKHhu8Pbcmkk4~m=GW|2^3{I2IAi!Xzc*zZEI%!h zD1}p7^4TJs$Y3-_zdQB1h$!X*36+ik^4-AR3!(G|)|1fNP27^?H3;L>^7A<)bZk4N zul=*0r^A3?o!EG=}uLL++*>)TeaPOG5^BgAQvJEq~5gw;i zKco^SVnOvv^COM_@vouAO2erJU@ncn#3Uu!^Cv8`1S<7S*q3}dVT0RmOHkeR^C|Mg zLz6wThjr^ramOh6KOta*^DNHVcg3R|kkTh0MRso-2XJAI^E@G}5&%!Xt-`1g&fYRd zTQ8t+^Gf%VnvxR&jXL-`pRy{c{Vf0=^H2dLO{Tq^XHWMuvoYt1+r#x-^KQ((g(Ctj z%dOn)K|qQuBF-Is^LxL~QM7jrB)j_Sf{K|pQ<BF#?v?YnUbLG53Afv8#^b2OF z0uCm1N2nyty72@4h|TZ(^e}r(3lnJ8!(NVFO5O`a-*7?E-58L^l<4Orz`hV z1sp)ZjFpH2Ks5YW^m3WYYX-y+k6A_(!t1eKfdrB>^m8Y}JUzmvUD0UVBb%9XW~3-a z^nfFd`kI$s8_ou%TJC}_J1DEH^pXP4GcK-|CKMaEY-Hq|?E`l>q@lV}?DYxKtMMWTms^!-u-jNzOjCd9zn zY4q~tG)xqTb)3rbsHl6T|B=M29rXORol1qb2dA!e=qul{iVt5dz4ZdA3dZ!Kz+;Hx zcpE@}A5aq~zV!oCrP*PD@z|a|qdA1%p;1p3S@jPB6da29516W)dD~+nQKth~9`zyr z7{x}(GRQ(VxGeRE^+A7JA@ww^8YI0p$C*V&u;QuR_2g)uWmufXmGxcY9D5Eu_*J^R3N=-_XjpuFF zNA-0yo}?iX=XoX$#G09&`popZ?Dc_!3Y2D+1A79bmf}OCI@j_OS@nVNFLloO5bHpY z25Ouv<`=~6T=jxt#GFcWe%blo@JM3*4tKxLMfHRg+N@-orpB~zJQr%7D;SUM!S$YW zO=9pIUhI$=9MX(nH{g6+J@ue{k?*(wfL47R`ggK7*Nv)yiS@9e#f6CXK0t?dDyg@j zc5j?$iuJM)RCr}c)QP{5=n278fa<1U!S%MlhE>`f;J&Edag_ASw(=$ZYxTvKul=c9 zLwPX$4rcrA5dyewto6?b9tJ}S!&5RwAV?jaXN)ci*CKsh@T+ zMa6soFMYT##<`TG%PPfXWcFxdd+R|5?ahr&D|ZjZQ*)aic=mvzsIu?`9!2{HuggOJ z?C*SallFr*QiAsw3YlOcK*6b5Vszo74h%J&g3!iJN;Vv$VHKTS(35>uW&so>b|sdRQF2^{@?SM zE=v^Dos_jih^}1B-S=w@QwxXBv}fQJNQyvj9gpW9d-sxQs-~btH4J>AJUzy;rmQnG zm-m`__gC3(`2y^kMguY3?`C@u^7rXTr_m#{ZUJ75k{+gJ>+aGD$oKlc5mHLu*#g|W z^#0*AO-~>>eE1)Lx>VYa9SpK)0MOZZ8awb?vuo4Z;>bPZa6 zomJ%oLHJKut$P2vnA_6xW}SWZf7=MoyZBZ5ZSUu`0Vclcz&8>maNEfpuXL`biMc1BQce)w&&d$nWTAVJ|BL7O7sdAX2Pz^u#03=2ogRo0we;e8MMniOO=mqWWS-9WT@w*3IdnLHRP~avnRo zy+An|zRT3i;y}B!8qRfxTEl9%C?Ra*-8N&H3h8 zSO+@aOOh?hvlkXZa6P~8IQkYh`EK-^F38A!;+<3n8R|X|68bEG_-H5um;Yg))VVrm z3DI?CE&4*_Xi1us_Qpe*=q~n#ja>}OYx+gWcg5s-r(Z<9&O3p9_Gs29t@=!Mlm*?l zwYg+h>V*~~Zi^5aF#1&aJ;v0LZ6y7NRMG?U@a$x0ZTeaBdNpX-69=Od2sL-1Emk?r zqxxIdCR_-{R7hV!Rl=V0Fk+S*^ZH^FYJ2+WDV_*HhCWaF5uQq5o%&`5dAfh?PL|q0 zM!=b{vZf9WcrhpcKXa|O>G&F+aKY~C6c$E<$&@VPx{YREOQvH?-2j6EVPDFFJjDc zm-^tet$J=A=F^JidXxcSOVU^o9{TKt4&(3~ZC&u-BZAo_1^h%H*!uN9;pzD$=OnHp zQp;Pe&QE3!Zu=u6ARz;c$_?Mb@4BK-O_9Qvt@}G4lzxXV;c^M8I9mDNK-6x&$ooLD zHEWOz)6{AZ4PbKm4C-G|d;3_dpa6_RC{EmR8Ylj1UBT)Q68l}M!B^|8Oo^%XjMa%Y zIPlWd+52et=`J30LOaCie4;Zm#EaLo5&M!cPrI@+ER=J)tuK{?ZrTk5P2=e4?0S|EnLGT4}*8c3oKm1nXGl*+MFRY?XUz!BfZ;t2MiTsXWY>Z7- zN8r^gY&gntJ>fy#IsBlAjb&n1OuQer3_su(fh~J0FV0n^x>sXt6Q*YW&&%%ltL+AA>?% zZ?hX%#beqL&ivj=18b?d&D@Lc0-a{}{MG8v3;g0K0Nt4KCC;!ZrwSwGr9-YC{yG1AoK*5o>)y{+% zav+Vl$^7~Z-_UoU4)m|h;TZG_x^h$))BOUiV&+K}4K`65E#aq$+w9ijCH)42PrlFP zxv9BALQ;15Ih9c9Rs9U`86@Mj+efTVS8m8EIwf!6T^L-|s=bl)|xX30bdi|1`n*AkH4;U`(P}@!h zkQ>Z~|CQ-m`28is;`@yxPyyn^{+IkU46pFAxBWaKk7~a1PH+NcV+rIZ(iPt^Lj6xk zCte85g}!9P^XHxPUI53Cto={h9FjGNbc3 zGB2LViV3nMT~>OHApLcJb*8qzeQh8Ov7xWW-WyL5>ivXFWnUc?<@5DNEPgZGvLJ9+ zU;UlKKhEN~jwin=j>_0JGxLW=tNo^;>xMv2p!)&7U4Fl5j>QsI(fzB*xahZkaVlr; zt*+RsvT>je0sXqSb%H2J*x^~mN9lBND=iy_iT%RZ%IOhz)6;)&1M7>!FM-kEi?x-bQ!S&DIInv;E>{Bcm=Y6eqif!4;TR z*nSdZ<^A@q-bwomli;CU2L&GCNEz)Z%>Deu&3|aY{2qTyo~q#Grc*pZ5dHnverz{E zpHThFMOTx~b6S#O9R2@IKGl!y3e5Qaqq_kDiSY@M)c!JhXL?b1n5}*j^DhJQ`WlN> z4*o+ST|T++ld(f8j!5)%SY=B^js8TI=7$FKnU^k9{2H((J-#nnQvO^>7Byr-z;2t3 zVXO{avs14Nh5laqS=?QxAI$)#3`59R1-g3w#QtG!qaC^U-#=HI)a-rZA`Ifx82)X& za3m;@KA`o;bH;>?wlLW4nErG0deeuqcZ-o_b#Q1>!!!p`%l>p`l5E*2Rs(P}tr#PL zlW^fKLH>6T0~+6NEkIb8tAB>rBl|C~vHp1-hA~vN`;pDq?nZpFEd$d!i~fPhuzPMN zI9=Pm7MgE|{SrZkPTLSrr(7FLh;fS<@ zl>VmwzjOP@z%{-#7=?mFS;(xPbpFUB8*rHwp*8ka_&k!YTsIg`<^I)%QvLJCa=*ny zj&D7W0J37LR{rxjREMUVUa_>oiJ0^hW`HO z|79rFKNdagW~j`-AFv+4O8*ngkZ0l{oYr$9rO!TY#GLgcr~fshArt1tzG0IXz~sf; ztzb{nkN-9DClfm&`$4?|vi2DR&XFGXEB|R)T$FgOe|R7}WNBh5v(-$#ME`d@siTS! z!M3SteGDVYbw~f;rvHk94rx-;O@+*nd(8wS3(DWnG5@BZh`Z7Vl+3<4V@CCg@Owe< za{sQw&n6PBi~E0za9Y+XIY=ygj{mX6P)AYBiAj8ZnIas+AcGTjS^v8>!RHlcok%W= zh&GeWZYvr#AOF?got`4#=I|Al9{FdIU9uC3F#qOY9%>h}qAR2avXo4#bzD$PZvW`p zx21tl@;d)@Ws5f8YUer;6aVYm{(`_?sxtkj{66aD6OL#;QUCoVcKj8G$|+PyxZO1a z&tvXizANHj50pk4SOkHp85;qlY?lM@Ut7(n&9Q02U zPcyo3+b~X|w_B5~um)iR?&eOm1FeYfN9o%VYFqdbt_=@MB z$ssA^jF0BD$Py8Cpuy`$(a!rG;F{C|M1L2O(Wa%mE^80kczD^faA3`hln1Y!e}qJ5 zOBT?t5O3vEsyP4_Wr+2JKLKY#B2&aMUCL6n{2N@wg)ZBx*@$KMUa~s3D+&k6XXu{| z3PH@0kqP1>sv5vnFZiiwg8AXlcbqF6L|^j?3*SpsFGbvvVMX2efOf6`|EB@@u?k|< z_P)r9L(YUj^%luq^)ZA)7$(prIJbRg+xO^6RxElK=eHRNmC2+0H1x38O=r9Dpe?w6 z>{C-A?;9-6EQ2N}1DG?Pxau!st={7S{bYe*qd0TE2iO8xzmq4MlI62h+*QB-|XbT7&joB z0sEV3^8&#OA|w<5RuEkJbKjTGtsB;muDI13u^i};MKb0Pm`({_pT{W?%|V!vlLpx= zvyhs!M>a*z8s_ft#z*|RM55QdVA~R`+%DEr@v6ArCut2zAs_skA`UlN*JrRU3GyRs zmWHe7$+gv%djz=E4+32ZCM09dAC%fadi*Eu(=5&sA5TVo1R2A}z-hAQEX3F@o#%Mg zx~#j94HJ=Byzlxx3D~N7k#fX(w0dk7Z2nkKJLqC%d9%j4Lj4td66)ZA(y@Z#U=-m$E z2#IG)N&EB@C9nM4M%di}6~4d*Xv*fzbOavsQ5t~mpEtLq|LU44uRLAN~+J$lwI5R9n!$LOvqld0#1T#l%fY)~*IQZeB znO}-58rKCTy%J3 z6d3)Vyq=XkoBMt!n6L!^NB_@ii+*7&C{mpOs~`OCiKMsS71qd+-eF(l`208NDfNm( zdKFB&qyrq+q#kJsWT5 z_clto0FG@&o$5ra7@nEjXx_{?81da6qo$-^RCky@QF!;&FL)}EB(SkB*W^5Ihkx*b z_7@Aw46@68An|5!=R5d%^7Z&8!i&8`?$cN(44S2ZNW z;3DJOmxK2+8^lnCMKm@{QxJAj+Nx2r4^IVK8|SA_i#P(cgZFy@y|{qV*v}W9C+7;U z;Pj8&9}Bxo2*)GLOH|Xx77>BnTC1}KpZ|G*sSn8|PL>3qB6<%&In%P_0zc-(X+DoS zEq-NF5KB|zA+l7=B~`70`?ysIx_i~|d%i?yT?GNYW7$3GPibv$N+J+~BbZ@L3@i0d`_(=97bOYlLa_!DtZ zX5z4GfMH&d$+$%=TSY+YhE(xZ2Qq#ajzFrtE!3-3at6Ry>6>|b1a-b}|7af{vsfLo zQyFB8hX=xFlq7Mr7FD=1x`H)tdQm>B*0K_1Q3#?NVxu2LBQy2N?hozC-zM_GCbvzqn zc2=r8xT_G}v}yBJ83|WcpdKi;g&6{5_3N_h9Ntp>?tVuht$ z3M?-gW!f00VmBCAJz)+J|31uBvHMnIhyd7LZh68+DT@=$ zQL{Hja2iqM_{=Z#PiOl` z(GuYPH~fN=c7`I`3%EnpO#}`)6CyjY9c6yIEDv!6YSz%g%)N#jsi*WvnRNX~VyHJP zo@(kf0Xf%o;pXndXR>q;heVr%o0j@v=)SL9wir-S6{2zJ2}q0>H@Yt~a{?+*r!=k+#PT>@oa*Cy zkuU{z_|?3S7pfyYdSKHPZN`ioEupP(tb16dAC4Xl1jA91x!`Rrpv zLPqKN#|hGLTT1lS4qjc0TWS2=a*~v#7mi(51K*4!wn4x~XBU|;DV<1iA-O%y9JA1` zsgTf{gX(XuR6Jg77K7t5*dtNu6!$5{y}?+NPo2Y7-Z_`r+%0<$^pb@b2xA za>kt{iGp!b0`a^NSjDfHtnD3rR0jVrek@WPT~hCzhb8WN6fBj^2Uyl+HvfbGr)Lij zUleeAiOW%U3&$qx;I|y=S97wv@<{-4z8cM6I-y&~q^a1wG-BM~r|5EY32k?bF2A`j zsM<~|iQiD5?pBMWyG=$%?X;3{b%sSA_Q*TRf-<*Ur+VaqjaqPtSkHl48wdI%2kMq3 z#S{lZWbz2QU*%@vo}krHeFF8^RrhWBAn_{Lp#5IXUyxFXRBDHIb7sTW{sH7GqG(wyA! zE+?S(fVxX!IyZa@0nv8~wFA^7eZ4_zi+rzbE7S_%OO{p0Z_Z-$s!A!zrPLgK71|J! zMmho>GL_Tt@*+59X=cPBxgeB%-&R~h%OnP$rgH>&4*ffZZ&sV!Mi*H??pd;oSO5@6H3WS{Jx<+z!zvthfBE>>XpZ03~{I zXk!48=}K(HHExc;>E+=+fiUqicQGJD*?Zipi*S2`RU+JQKqV{(b{YD-nJl|WYS=$; z-x8<2BBUg2v#EW+3;=EL(pK=H)S<*)^QBR3@fxQWbtvNUHF9hrD*8-msmsJm5fQD0 z4|Zguu@3mxBZ#v}PT{C95Z*>GKNlcDtcTx?+chEPTi2mad_3B~shop%b z8Mi!ArnR-fqDPsqsKWhoU=%F3UxB+!3ZPsBx_65=P7F9^Rz9r+kWFmzj2rxOb;TC5 zbM527>c99Hm?vrg$)3Au6du|HGtPa73VrZASDqR^(>mZI?y6`E#W$oXu6!gIY;>GV z;LAwW!fo*h3xQ2>o_+OD>7df|nwr5Um?Q@_4h^Dx&>;9sVSP$ca93ZOAaOuI@Ost; z$OQ_;xh_*RJ(PigxJvrV*xNur2Eg~6&m0U#`IzPJfD`Wl`6jd7d0=D~=fsSsEYIZlcoM;-P*$jfpiL)T$)MBR&<)ePO)vbjVMw&wU8NLk z>h)y(6$rwCYh9n-Pd-Z-fJi3w~hM_1O)p>Y+_X=Mj zv)FO4C0OcBr}VVM?Og1-&n67*@)C5PT3du-$f&G z3wv%~l+I7c(p3irFzv9AY=U3a(`ij4`XZmvG4H;Cu#mQ)rn5Z$I`)bh{!Z3*Ik zW#ngOuwN^hjZoaRP4=W8uaK-#+@_mgD#Bs_R9qiu>s)2}n#1VOI}W9nGb{mL6r|WNXWA+bP}L@@VQgb)}S_z`9^H&F0?%zy(J7=0nZBA@Mso&(9U&N!J)0i zDkg@YS4OD*Wi3SSIZ-5JuB4C`J9aH2m3NEX^TjPnYt<1nnc_B`t=lzo@ZsO& zdncJbpi{z3noTj`L3naE><=2U{or7XIj#zn-RTlC8SMO=gKxCZ27yo&ixd zfIb7^pD@5fz_aC7vXCCJ#&zI~hTDhyDCGQX4_3Z@ab*%^Y+dLkXUG-Joj5gGr`nh; zvdI!YxU$BJ9Nt`R&Wxs$5Po8x7YE@s!Aaa##c8ylb+>Ei+= zb$pt5K-t6`#se7Syic$K9^@C;o-iVp`viF~Axey~2-&%}tm3mX6+J@w%5!~9*xI~F zvr7e<)J&Db{v!efK!W}sWLMU`#AFll75L(Sf9rBCLVa3(Rh#;v+DHNa zd*R6@JgsqWMyvR4IisB=3-Rv=?zDattwRim2Z1U-5jn@Zj?Yc~#$bn=zDZ;eVp@tT z{C7(gy#%V)GP?=BZ|GpOzesTkfMG=_?cC%&{y22E&^S9u9co3vR@o3ZEi*kC7FF=8*8;&mc&B(0GFNOM1{{~*hByrUE%X2QjZZv$x} z0TQz6LeJxFgS85A$**2&G`jhF;?~L5v2j+wvd&kj%3btU3}{h?EJ$KL5WVtUsA)Bk zU(!lSG}4ayMP6a5%zQh`1Z>tSt)(Wkz>hf>5T&B~t5qjhCdVGl@N8$R*IobkViQ;` z-4V{CZyg}7;fKi*`o+8r&II=t>-?QB<2V{ZaPD88Chaz@&|XKpY?x0RdSCWUE5kZz zmjEF*rjG=*F$W{j7mcw+3d=-HN=a`#-#GBlr;})t={~F4*mSWn6H1F(woB&(`*~VH z;jO60P5+cBpM4%BQW5$BYj&c^ErzF5L+0{lvWTqBMX<}Y71s6wIbkaP03;B5K#QFG zLpzka^pd0m(FpIJE4&8bIi|A(8HCFRf{?2c&@xBz$e~79h$DrSnEF(?0ZUO)=6jtR znPP(KmY1hMpaSIBBCRzVzHqJZIIP518_3;-JD$?Mvg>-PKHaq6Q!B=Qsxvcx$LS#Y zsNlLtCHrLkmwG#1SrsY_;4y7q-^YEldH3N1svt z9+*Tk2_CYaw174roDTWwOnuuRT5OOgPh}#uBqzID!y@ z!*IKBsoI$JeY(T@Kmia{sE};#8oJtBD@ReGHr@-!xQ-Tp0um9NbxD`_CU$ z1)vPB3HHxr+F%?KNu$3u*|m(4h3!}JmI`j1uOr{x?gLLjz;x`iAKhvP)%aqUj!F>P zkFVM7?ekKDh0cU+PSLt{er$hnl=i>I3$-C!x;B|7q85%rBqkmJma&@L%UM8oaY*@+%-DBT^w<$F-L zmDa~F4Kf9Mx53WEBh~z5wg+s6q|auJlg`DTbiffB*d-K)$e0O>)RK$u$N$3I z(8FlLAUMVFFj2>eEay%RgVHU24gM4T&h;@fa(Ch-2%!cpD8{|2mtZ=2j>W{^YA0JVxO-x z`KW0;r*-WAST=zf2`;)pQEQfzw?>cgtsb4?m;IQPX8X8sXVoS1h{xMRfhcm)Jn9`* z4XNR6j8P^#n@do6+;t#eh@ZlE!v7Q@@RdJTnaU`N1=2r#}J+ zVyBz1)1pU^CT`z+2%~r_)Y`XYGQ@ec(6q-(-w9Z@ShmGOm<+H^^!@sI(y-8-k*BO= zMw(5szOMj*pmW+b6)28_8vSo?qUl}^5d348;UsFpC86M<*$fz>m*0L2Kr74!5{e%< zS}&&R3mPu&MjgE&nD`lzEU9Yufd5qwU0YWPfYvAIl-291~@(;!ae`Gc_Ol6a|bnzC!&V4aRPBCTT1dUV&ZL?3@ue|E$MHJJlh0uN`LI1&v0S zUoR{g5!(*yjY4*gZ}_n+1?KOTH;S{hSHNJmy&V&tmYxH}tjE5=iOrc(cayklFjf!! zrEGC}fkrpk8AsW@D~?M`+1;RB&ofRrqq&<@l@IcVOvxo@>=mBj!(h}Cx$NUuUSc_8 zBifFxoHlvIGe8?K8(lMd^g0@?9+op`ES@T+HP+H2F?Hy$`8i@=yXU^H4Ykz$ zO&FAx(k)`W1*Op~eBKPl<>HlJ{!rbFYlETl}jS8@1aSR3j+f?K&i|Ve`KDKNRBfxEwWIl0bmCV z`Q}Zk9(hoIuA*VLsuSO|G>IWrdvT?WvfA)68M#J)^;xu31>Y=GGMN{8@n|Zo_Hn4q zX%P;%l}H)E&`c0kOnIzrycoNm0dNDdygEg9>r~a<1f^|4WX>vs%cDtEbG?Z%Pj>;| z>~6Q(IGM;)SM*#->j^e1vnOW{CwQpdV1_4$x|a^zkd}tetSpQM++H$QHyAR3S>L`2ffBZkb&!L7z|LC0-aVWLg2#vc;}OXf_|fd)YX%xiT{!3gd95_I;7 zImaL!_jCXFoezTu+2vyS>THKpSC^`dmQ*fhx*pZH|Q^j%(8t0Z~@Om0A#eTqY%OTKnSicVW$+Id`Kl#^kXrrYgJo%~Smb_4ln#?17 zo)^l}sLKuO1Vjd^NuR=D^IF+Nyd!y4xkX4RO8gF@g^AI^IZ$cUA8`5gWLj$VN9-Xf{80b)g zf33MvkVxM*wB53-R8vp!j!mQeK#2^Eu$9W3PR&zXe9$^DQS3b22;!r#hIN5z za9)}WaKP~IG_RrW5K**I_mbI(l7irnv2Q^K405g3E0rnD+As?D(1er z9TUHB&&W^0_MVH!9NR);d6 zMUFRs5C~(|3jDVY07MQe>E0IdN;jpXJMUnf!9M2pw9=cyJH9LO)Tvp9$lUEiLug63 zhxNNxqVo#{RpQhg4*^Biy1R5j7^29n9=pI^3D1tu*MU~c&1xSlX0j5nBF*#4DQ~B@ zDpgQJ;WS|r_(x>Jtsl98fGL!X0`E%4{{=q;**po@XQTKeJKTt9a`@V+24T-4&|$ddiM)qOmi6t`5|9kG{!+Rd0m$&kWAsQt1#Y%F zcMvA9g#6)|q{Tm8Lchj>J0;azjdq{_ZPRLU$^@{GG|S2uuzYQs;{gLE0H!_0Ymx#R zG!oawtuP9wif-70(&(Ic`w`gw!^Y#$F|_St5W1DrKENQ~eb09|(hU>0+bW~&*@=v3 zaL(WMP*P!77Y*xilKqyxzWhDkTu@Sj=zw@G8%G(Y(Jum#h6`1?M*7rskQoV zLmTj;_t{jvRZlS-l@0#y<6=%Cp(U{Mt%~f^WM}!f9?o=s3LPRNV*|pbjI;l2OeKXT z@SZ=pPy-42xVfnD|14=VtfIdfUty(WvCBHR@@R4D6JKwdI4?%~-QamhZDK=!#S~eH z=5CXjX2ZP@eOK|dwn(>)Ri+jW(u&sK>~FFr*?Tk>;!Ohqhy*qx2_!2oQptYqS52tL z1eP=(bpy+A+r`-!{XH~$+m3X7nWFb`_Qr-a@Qu^1_7S;0_i%*A-Qv87ca8Xo8xFCk z1UjpWwV^MY$=3xOGU89Usdz0!hTIb|fD6YpqHbK;Z-8^PNo|>S^oxBfCdsH_;_v|3 z^Vl&Ho-0#jFEk^M^a;;CsWyqk>(D-lqfS8Q1m+X*D{yA0_#s;Bf$+he<6YvkNkZ-x z!g@qj|MpU2MMj(uAuM_qz-}r2HEDGZrZ3|WK5qU^7F6|IAasG)Wls9d=hOY)Y?f>` zbF8*D)l^&!k~5p($%{SIkUJ)bs;s0%J;0DmP%1e<)@|LL)5r@uy%qvga3t><+6j$z zs3`{h-m%T zt%03J!NcAT^3TK*T_a3#E<&!E%{?+6Qs4GtAZ3iUS0cd`UYqv-XY>Pn$e4f$Zwk}+ zvGoDbF~Vg-Qo@P$1gZ}p2Mw701Jo6%)kWHHDF^kEcrCbg3XL)^2sUo?{d@v2uzTaU z*#A&xm9;K5-wURH1)S8oxP*$W=8w>p6|~Ppj}E)NR@{H!=?7)}%WmXmiX7QGIeO@O;*ks)NUY(bkCz(ucEbakLx0H*wb)djbd| zlS!uAX_;rGDnfj6K$+JJHBCk`|GoeBh*DO^9l3|!p+~f+5j5b^wJDaCCZ086&PM)o z)Ido6fo6X4USfK5C0W@|cE(?7_RhuyNE;j2j&o$W0s_B1fOyBPX=#~!!)GGbyyNGU zID=Kb9VY|4hM}v(&gN*+We3w(I>o<8^bUm<51v_ZU^iPRf#TRJwX*R33rDQT&hQdR z(IFM^roO1@bjME;O$tAj$$Wwa&1w*$wWHkw`@5yGlRFXl#ZGWUuJImw+-CWT=taM; zn!czcGp^t|Wy=MH4!>hOWQ#kQ&5WRhMV|(S-mJ+b!iWC)_#A8S(Vw^=`cQw6Zz1kr z0q;sf?h#BcSuqM*xoJP&k=6Iz#tGrrq>-i%+6r{wRDDeRq|}O;xu)i4a~Ccw zs$+qpbPOVxW|JZ-XCF(i2#F9P34#sF$-HNBxt9m5FZmdIAOW^9uq^T#@O_RL9dcq4 zPELSy73OD>_>*vd2b7%?Mb>;OHmE8FuvXY01@~%0?Rh4Kp|ZV?LlAJ7c$03j*Vb7f zX}dfVY6>e&Vhrct4jsliCpq%oopM%fUGDfU^hq{O9Bqy5vW#w{Os+0NdO3^3 zO@X)f5`s~T<+?~jsY;1#>?gX{TkJKo9Edv(Yb==;KqAV+pM;7j_xHApfZXizIf$N1 z$!^a@SyW9eXaf`LO5^b3%PFSQslMRHx5A%vsgFHQ%8*G2HZESMDv?igYKS^8gWW}c z@`~BMzWbaaaMK?x*Z!^Pw8fm#DXsmOejfB_%#~rg; zH$1$&@&{K4cV%+4Q~dRB)*I(JL|@}YW!XoKd6{kfU4+iHJP4qCP#OBsXPA!1Kad)^ z{-TuK4wy3Rc~*?m^BIGKMF4>oAnKQVE-yqujJY%Jj#daMeRApn`Bq|!PpE26DU;$l zTu(3yhFh*hL1 zWPkF}MLBc@#e8@+Uwebf>k{2ui=TL*Hr*Y#`akmfH_XP>mk=LQZAv{^I^7J8Fgvwln>2gUlTREv5`0UmCJ*?0Mj^*~z^ipnN!fzvVo;e}&{-(1AYG?% zs5{lB#!s`TtEq)W5iBBdG0dYDZ6De?FxcSnb{cpiepB2@%hjJ=Aho&n;%yGSPg;@@ zV+sSFBV0`5S5$R@k+N=bh#KOQH%bC>Et(5Z9Z74&6`HX)eq0Lum$5F=i@=^0>g6ybzAfl?>^@;KWp`?io_YQUNpwQq)DU%Bls0_ zo0Z*(hYFYYOBGT)uN{c_w_@`u18AeMu9_JMWpo(#g%gtis$oy!=>w zi584tGrn`LRgpHrfGP2)u`$v;T}LcItpeTXo(!Eniy(!hbzX=%d8y0p90ALQgvLC> zYpr>xO3}E7x!8*6-#-x=3EXxqsqSVMhRoRlF`iEAQ1Pf%?jo5vc^)KEkX*Z0Z%FGb zLFFlZ?Tl+wHQH>vK!XjO6c*lA7_(;d)Q(!;M00x5Hxd#9h5xm8!g?<0%Z}5=+Z>_O zT4YPFdG?3(GaXZ*#9Bt*vMD9RUhSVV_ux1DSd)sfjMpDcffFYm`AGjhv3eAmNENcV z@`^6Ni6Gv*5<$7jRvoy)c1Wf#@_BbSQmz&XA~c#$gKmVI?*f|VhlV5UOobM_x% z-Gqx5%dAw8rQV;{0ft#*u*cWpEc#W<(@_k@Kc%=h?3RWOmudTfMst~Ru<(%6fUpjv3 z?l`}85T}X4a%ES%2=f;9{sf2X=0lWG5|Sz44Y87cMdbUQkrg?U~|p)wZe_zX+ng`Zh-nMjD?DiyzXNtv}MrT8=~K zjmM@4PkJ8|{*S0&Z%!+^jsDITIhpZs*Sm5pXqQ)5j>o5>cKW4Ojmi-r?KWt)+(z&; zD@NLgq8V{wUY2?8({j5hVXD>s2>xYTJ>8>bA+}A~;;FE+q^{7;%>_EWfSWBhb)g}- z6H96xKN_jXRELm7viPh6g~@uEoijSh)FM3n*F?!KTKEEWw84W&ov=V@QX(RqI+y{v zFz9!|WcRrmw=L#7e8TwFY@YPM-yOrQ$s%a+!Aui+J^dh?o9Qr)A`vC(}wk^^`GCu{pCt^&zRI`%fSINuZ~D@xPD@D zOpVLa%GPUtZcTYYdQGO`wm5V54Vf2*)lV;!33K zKe6tPb2;}^nd?{Iz3R62`@q(hV^&vK@bAu$8WlZvyWMYgaBudY{I6!#YM8I=moM!% zp3j)h!TZoEBWS2!(a!#!iPgh8MSW}4w{VWfvr@;W-4a#J>7Q%2v#so};fWvemAp1; z=GM5tPnqN-*s8i9&WlHe?ztROhCQn;mu~vM&Ip1p+4r$)yeWUZE zUQase5#o1n+N1I-clYjccK?JfXQ$`Q=`kg1O5Ex>rQS@4Jlgnp+3PPnvww9t@qSLv zObfF%XqMisv15f1a4z`*Dwmva^0nPPQ}UssFRqix;;()m&1}p8R=n zT+_@G9BOQP`lNj>pJ7?g3^<-x)wSfWbZr`CICE)Y;=+yF?zX9T`ZPK69P z7{EUmv$j;=?vq>I#5>(sHE4R~T)9W`SB8DMgg*|-nY3Yl|ECvghuw{zTEVg9=usor z?JE#k=ftGzTW+Y`7MXm?m6#- z?%D1-e!4!)Ztk|H*}*5vM{3K$GgGhKt}^Y$?khRY-hOm5C}dY_{@PQ?bB>j-q~2WL zCC87)MXwjH?DFu!x7QD!H>!K+=JZd^XI!1@oG-@hU#pRuqC;|IbqQ@fZrQHz1-+k~ zyXsV-T;0%{m0wa;X&`K3S(hr~+xJGiC2xo?c~;{fLm9VZR`716v; z#(TwX4UdV7%d*hxYtD$7jpk%OGhjd)uW8Ft(b%_`=P zs=aJ}%9$DovH#6j)na6qB~Np1o}F{usCD`>wUblElR=)Z1~pB!veK#(yXw2Xu6nF# zOosDb`6jzJIJzlh+sbmu*EiLzHnnTDi4`&k|5-4<)Y_PP8HK?RXWBHOD z9@Kc(W#gIKUzdlJ_)y2Ez0`+-z~3rwI>ZM&~?s;pOzN7c%GZ4Nu~o$!chfH(_UP$`+p`NE%l*O4 z@l?x+r#wIFX<+6*d18KiKNUTA^R$(DdQBM-VN+ikeY9$AB7_-d)&T^L5FaRQ*R=|9Vwkd?81^<5QByRQlV0cHv^7HzvGIKR9mvi~kmUeUkI* z825@9_kXRle0{AUWjbYi)-F2z(>~u99N=Hqx>ab0_k%)L{306mdTsf~IPXkx+S+R7 zkhgPuvpp>_u$yPNzq|8}Tc^Wc?47mw+WdeOE|uSBs9Ju!>zm0<3e@&2^89qr+ro~! z-(~$39yWF8po)plcJA2Spy%3D&XM79L!$=G|8Ul~TXMp!$BVmUnf1JR)y3DGVuyTP zwB=aX>zfDDPPJURoiW}TlS@ZsUb8ID@yn#;GviWr*MHpMQqY*^X9q5K9Od?}+|8vw ze74^I7acxoYR%hUf{Gt&kgCv&t|>h{D!2R4f7+0JeLlvQN{KBw@*yvB%+Ao%+T3cZ8;Ya^1Yvx&{#)d^RYaiZXjPBvO$-hI2$CxB%-=7(t zoZb?!?)sv!H|qa9`>n>f@W{Ir_SS6Ve>Z07mD?)=iWIpqB;&L`HwQ=FtvBPRcjJ5A z_uc4KGi;OZLrc%%uh+SmH9Rh>!UE^T_nqw7>avF_A4ubnCnoApu~#!^E@&Rua{Rc} zzR3?a1h-6Ur#MfHC{p@Dg{*OoD_6Ot6mmH*WSQY`veb!!Je?=4VXmFK z`@4pBITsc`{NI1B&EG!EKYW>I>v^Sv!%B>IYWMkPZL`bIw{M!~GWV%nKEt<{roPWJQPRoD6*sdXA%a^Um_MlZ##XJM6CYPOgWpMWN z*4P&pXZ|}s?oqYmGL@cQ@h`LV{>hn>+d1x4k$NZhrg4rrk?LUPt$WNao!0zG*X>vL zypw|chxTh+qtS$d`&#zt(q>=XMLCMznXxwgu_aYcBxdoRc6drE|A@BDQ^njY^zlUF z5-VdiY;{gu$#&V2$1XDKPWxNes&w1bY)s&#Yq3k#eINYv;{6GChurFr|93hcJHqFd zL%W%KcdV%1es8$Pnx7u=wXAn#ht><;SNveD_c#CK$aDN)k-S@Oy*1PM^o{Q^HQr4A zf}2u@0aes&n0}`SvO0s z>C+F?*uV5(x5vL<*_B^!pI55Fk;FFrhX>Vn+^UFmpen$cN;E12=6dt}6+pD^u!k;JdCn?w>k7Cu4Bo<*V4axHLuTc; za(#YVyh4Pp>LeCAr@3txbnko4&cAHGJOip7l56U1}w7?C^4A(wsAo zx*Z!9bz|w(sRJ7xoS1F;h{N|wkM9y0u%LgF-uW+{Uf+D&;;0fo58R8ig5yUAbuV-I zeD%u1yJfjlw(HtD6aS?v(xzS3e?$5oT5xko@7I<7wd~^6>2LO%-*-EnA3Ln_zMwJF z3NAJOWEelB_{(MQf9FnKvHnBH)+?4Cy_s=w(!RFEM`zhp=S51w@wq|n#CYF%o9CCB zbtd@3)93D+&Q10I*sxCy_mZvqbWAaQ>qWbj+~&S#_=A0KPA-dEaQe&q0mYkC2&h|d zNNiN#0rO?9aRXL(wJ)@HK%RgG}lyJhv-v|auF^{ej#SKsWhZ3F-N(vwaujb8K(xcYqW zfN3RLRE)elgnvyqCOX`;`n~7%54q?5IeNkrEq?a2MY@?!{9;{#%a70f@4uvM)7P$g z=H05$yE4IDzD)Ug;B$21f^`!QdZ_lYoEcr${|WK_6dLY4y0TNbEVHUDT(Ypsu+NHk6Y}wHk#%$Xy}0Z=WB%Wx=Ho3Dw#M9!U*vwLV#}7_%jF#q z(aa$_$Ab%1?2bQ7|D-j|&Su$pIIX$2|Iz5_5BxH`Y(HkdSEq~jM*f?6Ji%x0#H`T?7jXv!@ZSfQ+K=7%W3kqG48#xFOAF;KC0>cn3zv) zBbRw*?zCtAty5PQ13PfkZ8HYK!m=EV(ij$NI!U`sX^&s*)1 z0-ih9One!zJM+q%Q+DUNQu{{5Yh6Bm8+a+OL*%R(cSmjU{NgvLOJv6S`;s3y&3e#1 zezWCWFy%u~rO-Z|`s{7D>fg<@r@b~L9}0cZcIvWeMcQ8utQLQ($i@OiefM|o-^KTG zy7afEjCHP`F4(6+wafE+*EyCm`P1uFAEMfut<2>IHl*7e6A>L=%e&IqoNcQVjW^$C zPmb=}xwp%p&^;s9S`{jsTXy5az@X-je_vK3JwsF|xzV~X_g+dZbIE@~A&E0+etj6QF9Uq^RwRq0o!!p%-@c!#=ExUK(h(l6P zwJm1~2S1vz)+=3TO4-=yEs_S6^=;bg;qByHwWeoUmHuUpfEHucS1=s>l6vK+Q7zx? zMqbHjs}CPtqEXw@t^?XFh|0Rcf1C5{PgzzDZq_qjy9qDe?EUua`n^B>ea7B+xcx@A zY^QDvdYpN3pYuyM58GRIWQ`L=&-ko*T0QW@^tW-R54Aj+^YW+A9;x1(e4~wnJ)72l zcC_u_8|&)#PcBh?USIdCQ#<#Otk9s&Fe)aVU<4<4l9KL?<)R8p{{&tO8 zJ-XG+);D`R4ydy#a(|k=7q?9c>hW&>j$H{K4?a1OW$1;O9XoV%=(HjGm-#0LU74A9 z{@Rd#o$Trls=VL#wN35?w?cN5&T_$?ntsNbi5H)G?409OpkqL)r>Wa+uj-NzTBUjE zX48IncXKH}Xn)UV8>h_e+WoRd-)P!**OI3TcwkC_PJL4L8+L9mWQXq(fSd3d+TZ1h~g>N$12 zVjEto^tAOtx5^nNHVVAv;D;T&;ukyM8|!HnsDsg)i+k`cO6=G?(Difoq^ zdt9c&Us>~u$ZobrX1y!2cCVFLe1?o%V`YzjE<^sZ9=DR6X`9sKxK#G0EQc*Jd*70E z!;)n>$n3IJ)~XG%3WUfivr<;y%G@u%>^75RUH6ckuBMD3J6J~)KdUOU;t^T-{>jL= zN!H$$vR!V-&JZGV-wRole#q=uRAzx$G6#*4IeW0I*#l)(9WCp2q^w&Gvd;U;8ZuRO z;WDxwj*`73Mt1duGOv2eD05ckZLYU8r>vpHWM!`{bNd3B0aIk&ag#kijZFKCNz^K>ei2@hqa$}DTk0NG`?OLw-*=vYIBkE?Wk zpX@TdWVvOMz510@EuGAGOJ?P?vT|3F^|!Wk!A(lJD{JrpFf?D*^GY(UkFxkbLK)so zW#r`?rWTQLmos@eoLY>Q`Tni!Zii&&A1J#4bv*AXBYBu?pSiN9ay}OyNb}mUHb>bp zhoyGSWfldG-8;)3;w(G+E-B!x%v-Lqx`4Mfd1Y1ilj6W++G#SU`pWLuQdWEgS$BI< zCl{FuKgqny8E?BH@sBFl{LC#mV|o zR>u2=GHaEBSFE|yAL;KwS?QL^`npEe(OB7iIp4@@GQU6LI_YIa!NbXA!2##fW3G&~ z?8zsQn%|T0`K9dggJhmfk@@9?v|=?}{3UA~Yj}4UuJZntC1j=9T%nkc_N1WpB9(Cs@Oo&$8+kkl}Dl){hlnu%^t6 zS7jaG_suTKF2=R&W$*&67Ky{kPc)Xjz)_ZC5t)}p z%BqSUoNFSpDf@Cv%{70*g^x1(wU)95%9`0pcDAjuqri!8MOl9eaOMdz`uCRkDhWMl z!2ajRHr~ic02hnc$NK(UW24MR|KRO%?vy{L~qp?7Jz$}ZkZ##Y{Y z(nIF_>@pt@m38(Bcw$|suw7?~tQs?A{y}rr_2hnkWt@kTHPJ3(vaDIHWwnf!I(YHk z)-nh4xt<@;%HrTTz3d$sWIaNU5;()VL9(``m-&CLXFLX{{bjaBA7>wy@uCAfdPVJ; zNynbc9?MxiZ7+LeF&Syv%5KE9!Yaz>G(zUAVA-XA%Dg{K)|5FiDi&w$J7i`Lg@4q3 zGkgt5E7QH8%;-k4tF4p03+yf9I$5Z7`)JvN;nnt%vO4CI3fz&=CkwnQ@(?{F4TK7?0jQ z5dXJ8xZr`FmxXVeC2#y@W1RH(zU-!ZWIV$!ofgC4DAv}I_ivE7;UPKUyv%1{x8GH% z6Iwey5Fg$zecLaqAayRp&q7wo>~ouaz|EWUWh~mwJ<7{0*-Ym2no|EbSvfCDnen}9 zNz&7XvOWCJl`;6&NtwHL!l|sX_Ji$BeZb5X*|oUlr}{Gb;(w#E%bLzUOLvg9@tv#~ zQ}&*-=)p~yzU%bwO(mg`+`jTbGyF1u(k zS>+DMo)^iw$sjE*%MQ#B$D?G;7$v#l3(L@;?OSB{AH^4H^DA8bFjD3(&Zc0 z`VTF6bWG+;II!nA*qn{`f}1P@Wc(_|`_{?o3_kwsly!B2>_MCG`AIU$k+GI8;Tl_!RIH4#OVP!}GRHQRc^-X_|3ZGsF4JwRj7<&DcQmaJdRCHqY)Z!K!08w?Wy5eO zni{R<%xlBBQ!ZiwvTJ~8U$W3m>e|O&MvEn6sq191ak7WHqJ8gWS>%jzC1vmB{f*Fy z5nL}H8oC_}Utc9F;<&65Q)Cs+B`dV9?D}Ecqpi$gTqicY>>TJoK6GvYzOxa|^J-XCLM$s0sD-|M_;Zbe5 z-diVG&S2`wIri%z!MULhy291@Zut6;JwXxQs>f6GPl)}S*R>)&xtN9ma2D= z(dZf&N5c;KNO_Xk57}fbS!E{pdO2Hi&q)m)p-Ff69Q$!V@58&Zw_#-Z0eBfc-f1j3 zc^7rsBClyT+?c)7?mE6W(c zYX|WjKWe$B6PdOEd-jplk87TIC3DO=_8%*2*<~4@uAsB5efn6|$eDhxBzsgTnPKp^ z^gcYq4Sgg>IsK4TD2+4*?HG=3KLs19D$5Qc&x|XAo~4qNjr`cQgv?-S?f~Z726Ohj ze^5DTekvKR)6j)$vIY&28IHH_0&`CzWtU1#?f#HAW55}&k32|bqD~c_$jWd>8aqci zyGzz+w8mjR8DRz)Y`iRY);&50{`y_&8$h;fC+pq_&h06FL_ITdpPlS|0eJ7f08b$g z{6!fQrx(}2XL^v=*42_7i?_50met^d%%AsUkI5lx8XA5S z-CfFu%`&n_f|nH*=hlYnY$cn$ArE>veKcD>M>69o3mVACc;lkBiW!%zy_?3RCaAaJ!o{7hO4-BCB#q z>Gwzalhtr#Cz*-*gjA3@#}ys^i{|!|eyx|)AB@%iL_g_*hofUb=VTxFAa$o^!^=n+ z;nbL4tdDz_8zf`nMp>5|NHx1kKfp&7G<$@{B==aDjg({DZ; zDZ4q^{_2u+3vJGJPv!$&@Aa5WML+cnA86B5>fE0m7C!InEo;C4?j4PO{FOEAyUZoy zWjLLcSouZGSCv-vYB29WqbdGFdyLOS4 z$otJ*GE<|cM;GGbv3LglP#KPPz(+l{l7TjW!x6HV_mQ3N0Qi7k%l=8}vPc^qOZT&q z2f+3l@He8StSA3u7D4kS4dOnTIPc3+@Ff`mb7Z~q;hKkKy7HdY=<)#iq%53sx`EPB zaNPkfE89f+{*He0KN*KMu*VBB8=+0Xqrj98dNKnqDKFzNc{A{kj32k?56J`#uF*54 zL36Xpm>(u9PbnE0@Y4VDv=PfC#f7DiXVxOZ9^A@o;MrjxM>%2;ugj5>p#Uy#CD%i6n~ z>_fIo=FH}ySuMKAthQRl*L~#JnXuU=qJ{ik1}yc5|a~&8~wD z?$v_&*CYFcXT(=(%kEE2GWp94#!;VTrACY0o5R8H)EG`Z zgKv!*k*V2-H@?}efb=@O%)OkQM=$c?PT4&l$gI&oMz>=0UvR~lb9fm+pGb|S;Lp?X zklK6DN;J}yGi^jh$k0jF!dJ|bHpz@BK`#OakFcL(XwKnE=pOhh(t#eETCE%`4Fn52 zGtkF=kvW;y+fS8Qb2&Y$JG^0Si=L4^IeVuaXuw{w>mnJWc-=V`{GtENImcSwGV8$6 z7{oEJyRV4I#&)AwONnjA(RJJL&Kr z@=g$XdP|0U1$W*=Gm$Q+IiZ>j)B9i;7-WbPO# zYdie@?gdsko50=DZfZ683woL?s{+01gT^wmaQ=n=F_$>aEH69Rl)f?p-sbk5bKuWm z%u6lK$!!}r?JPBMmIjx>OW%`g@uosuq}3NV^E|RA(}SGxlid>T6iHxz{CRvSS>v7H zPZqR~eq()0nek|ijs7lKEz<>^+RFXQqc2@K(`UBq?9;#*>*{-1=Ftt(E^@^|IMdJ* ze``n%SuSJyF_{By;5%shp$ak*og|mdk`G=!ZlA0NFTem;7_?A!3pDBIb(!dgZQYga zABsL5kySIEewLcmz;8yP<7fNJsB#3Yn|=&(hnna{I$23`>80V_hqCl0=u>O3zj_?K9N50d zerF%$?0?Wx9m1pE%4}SlYm@8Vkp&v9k+rBYnsQF&h_`y)L2JvugqvsuQOkpsT01+(}?9W*+q zBeUguGH0NTL+-=Hv{F~F*E$d$vF;T$WR&_#pU7EVTEl$Cof$INE;tK+gnM%`;C~)6 zqxW#uubAcRg1^1N0P9P2Mdo|vaR*({5cDQJb@4?rH#DOMSt;YBDPt+xzXj};$D_RP zEC1257^Iu~_LCViqd9zL_5twKN7mw@FVJ=CQ2WXwoP0WrI?(n+=vdbCAqN!(>#8M5j5=Uae)fMwhqwqx%iO3OHNxM%Mj_ z_;;|(Ce!F;bITh3RZ6Cx2>_>?$f1F7AQlZy0sor^N&jU-FZNPT(d&lL56s~j>tyZD zN)7^hcRulKB~1GN%pqbf`>4RW(QilYIlH0E<5^`zw&E<%y0U0)8uG_Qpcn%d?F zl9AyPx`#GrJ|dHujWv*ZMxs4~vr_j{Ql|=%b5Z>HuC!_e+Mb2X$h`7;G+6V83**=e zYh87L42XW+;JHBV(z3|IHqWW717Om=&5Z6YeJ*{@8OmMUNU~}k!Bu|(Q7X28znpHiFB+YJstdRR}h`K#BAV>j8)_(sB0HLgE!)> zC&@@_CV>6acoS#63tgzV87;G=Wlpj)bFW1;@OQG%FL?T+qm27_B6?t2e5OwsG6A#5 z97%W?bv#s1Mu}BYnRU{ex-xcjqlaD0wVmMN9kK%bNyH`cNH1n=oAEg>bc>9$d>UuP zz1{PW%hJkb&R~yWeicN1$=pE3dhpihw5&T^^AdHNl~HC_JjBxhkMbeQz|rNksq+`I zFumF$gKIUF*{Pb0#dxLHSzZUf0s~W+tDMEFXFZVJ!-Wjl4vul(gnY7>=S5$u%U<_T zR+*u))9sM?J(fMxqJMsyVj$UOcOmvbFaLP0)U>y(HPq%tDOq9U=bC?{nC0|@CuIF#2Hc|qesozT zb1bV49K7tyeN5SvncZ!#!mJyQofgPi!1ShTGH$buukds;I{a`mIuGXV76+@~@mw)7 z4d+yHn#?h8WM_?+>55+kCCYqWg?xqvX4uLaAIqwS*Hy&_vhq3S1aj^#G81^&2^apI zAv^q$IpiTd$r^O@En0w9-y1KZ=o4Aq_;g8XwZ@z5_)*52X5a}OZM=jTeJUB_9`gHx zeH&Tus)tml1e%tB*U|^v_oA04`%XqbQ<2;DOp{S-tjy`)xH@=S z`&GtB=CCJMqkZ5baXY;ke!LZadgS977dh=ZJR21vYZLx3hBGU8kNHGjSxeE__7i2b ztA*dp;XYZ|6WGoFLRMwC{2%rB0_S@UL?7W%&71J}AahJIwow{C3nHt-wJmmAvJW!Oc(O|vzStG~_NpRf zKohQ@f!)#A_i()Rd0BhVosuoc1__*P8hCYzx}gV0J97W;csjn73vW>-=E`95{3o>g z3%b!%*1NpqWAex181TSMCM+18px^&`Lsq$AaEzJIf7_(}lVx6iBC~c1y%u%0$pXjd zD@IS17WW6Yhh)2q1RHhW`VpBQr|^7(v%17H=o35HD|O)+qCITA?8cnI#8=Xmelo93 zlsN%BCBntkod0&7{dD8=uAIB?aT&k=%BnsL|9}s*)4^}nz55`&*)p#EQ}zK*vI1Js zf%(=Je5klZX7@+?_M)5DWN%}C8xQeJ{SO)jjux`6SmtSQWZr4r;OYc;!(Nu2CC~BN z=2_tOBifI*zj;6wdB-egA$(-74R=e-XY5{|WbmxgI#XFzpIb7&EdiS@vL}|MKX}Xx z0lrNhETaN?-4XBDN1dy1ua^GQfwkFw_&j{;dW(L6JWjR}=WQMWOO@bA(P7ft;W9t$ z#>2qUu&#I)9vAkU^WfKBOQkdTY|}pY&{;BI0W^)Do%=^WL_X+Km)dddROoOOe;MVd z;lAh0o8UwY=l%#>z9!ec&du|N(mV?c#CzAXX7JLG`me*^>n_EA@#c_nvIe=y7#1U| zMjJE=?53vvFVM;%-ZI?4-7)G?w*s@Se&7io7?4AH9f2nWOC9J3(v=`PddiL&BcmPl zZodd!Lfa$Jh2R`Aox00z!OwbpBMasMd+*USG;VZJdJx zlii(ttpk^f(Ip$~H`ywq6?^*0S!~Ts{U^(~M!kmbl-(A7Mv@~g*QKutlrdl{y$kc6 z+L_V75LvsfGMh+`R!#wHlgJYFWchQ}Iq{zM796i5d-Y5_5zXA^&OE-jl;FVgmB-S* zjxraXA_td*|J1%i3-%l&b48>yk(!J|AF_}q-@cV?k_)<^bKR-Ip5`(Ru%|p|`tXCY zbCGvS;J0nqdl>t;;U&$vDxIz<+w&ar?p?CVu9WQ@!SnGkQg9XWlDmvj1IUDA@ofWT z4jeBlx-rjeR!T$3u21Rn%7D|2<)r4VWOtm4cckLIWTf*UWE*}RiXZeYL65uw4Tirx z`*ODEdRe%K-CHS(WUoNO@(z;Os2X#aUgQ`0@Ezz=mt>hO*W&B+7d~ikEV|G43(U-D za(FDc^$zE}K=yz%@U|W`zRP}}f|F+G6gr>hp;WsFbK`aNo?!XDjW?5j+V+sW8x6>{ z8!n@zk$k>9*LGojMUTmfpa;oUMFu(BdI3Jhl0Al@8wIIZj)F3K&xNn(=u-HdKS9R7 zfimK$TX%RrqY|@+aMpsS7lqSq_`)qT@L6m6qSRo3-_OC%zUG4``1bKBU;tkrn^|FG zl+yGagYdyUTggY~$sJ_5?fJ+hD`mZ$ga>+4Z&!NcuCiQnvDYQcWzh5aU0EAg8hJu? zs5crn9h^AO7k!~NFQoEdput<#*A&lqBzyW-&iW!A3Ma2^l69JE4MER8a%Sbp1;!|P z%_H;*+3^$hyEqRV1?y8rOJ&jB#%Rg@ykrvcQJQnI=Jk`^yOb1_Q`Rk>OKbxVqYlgR z8wJmqb#L7zGyb;Z8PD3_RGsmhX*OA(T+p}s_+LA;057_CMaHrua6$c|=|9u+`mal9 zOL?^GA^J~^J7weinRjJs27#ai93Q>#XJ%PARi;88+D ziP@1khx51}#jIhdjBWfZ3*Hbrj9$l$tj(F7d?KrHeQ-%_OniD}Y8lPgZ#y){8Ykn` zG%{N$Fxv*L1tZ7tu;Jy|1G&!`ezype8MjKtsVlOxqL&%a{Ms<{@d}Kv~O{k_la9O#dKl=JU5gsp|~%hg`M=uW`vlcH0R4 z?~yC1|B4JU%QS+6tMSi6=s&(u8y*;8GV=6cUK1<*VsFc{$-KLjvwwrG|6smY8=t4% zR=lhxb?_^Eb9`@lA2^Z1Iq!Ze9a#=0;b<#^duK$WN8p=WBQHAj1}|9r6K{MiT?yoT zFEPLR16KIe_cxkBURcvm#{F$FcY%#Wd?gNUM}oQJ@3NvxoTuZIiNn_OrIUIj1cXic(g9Q9~GM(i_> z+?+w0`WnqdLw~}HO?c<{vG{gwJPgb&bS1~5e{<;NFNVpS+W-zy(-C{nC^Wb&eA_jV zGh<%m_n8{!lI;k$ec^#KTHFACnnhL#{~)tA=eeaUy)zt2SBE*=8kwKzfimMaqnU+m zLjzjnCy#U_PaR+;v{Cl|XX|0-WWL&o-^IunbXL}p2QoLq^}YGXqIsB|bfA81WIo<6 z+ns$KYAwU5oXoE&vWlZGgYfT6ak3|IW?Kq!4Y=XvD~+J`-{;AAe}{g6`OH81qHJTh zFMRJyjXT4I%OP+$T=u+5%YXx{eiY9Su897= zmfdX(97s<#zX-O_GoFXq`PPu@z<uNI}^q-o#*U9|p~d=?KG&OLI0AD;D^k?ij@vw`8~WP8E)60E-+Ii2r;S^dzsO6WzV z1oA`{Sxz^kOhNoSK*pZ`z{PVo`V&qp2JesPZ|O;zx`3aeV3Fq$Wf#kGKwEov1nWsM z$E78Q)nyjiQiexYG$~T@xXt;VlI4Rw&Y})8(bLDDz!#Xx5-W2eUOW|jiDLZ+H%Mcc zGkhM3C&NecEnG|ozczx2$Fhdyl94R{ew0Le@g8ULO2KPn5j<%|KN+o`F;AUDhQ(8g zMUfq{N#hR6x=>5ze_Z!sATzBn<|@l&9eplq0kz6^QgWI{7Q7FyU*JvKWvo99_R+iW z<1z;i0R#Bg1~8WkuC+i<^LLk0`LZXjl^V|6CO3rilyQ;1a4Y$CCR%-%nm?tUrmfY&cly8lbS1iy2<+6$}aMhS#LpETUkr3aG9TG z;$hU><0|;{m$?-Txxvx0tz@@sBJ+L?dd1@OrH5rt5PiKrn)Omv9XP!98CcmYa~*tt zhbFEf!`3HLxyLgzVg~e;9{2V?=B*o;r{N!$$dNm^-V177k8Hj5JwA`lr|K#ryoVIv zF5AYpYoMc@|H&v*0baw=mXBrLOhg-bUQp*3I7H_rwwC3%LgvTqQYiN*h_@VDA>-&9 z@&F#k+}Pwit@+?4syY1*{D>JTqnd-vtkmt&bm~`(vrhrLw`Eu4_dlyqBeM0!FsT+f zw;Vj`8G+VLmAO2Y^BF{bq?et2gc%iQe)bAEYZ&}P*C!e>7p!GYRZ|K<)4{8;y#zfV zL32KTUbmg+cDxpEPFT4jm z^Q$X+B$&^VN_H=FcVY`E9cRBB?^+m5X2+jKg2{=jG4FesZx^7=U~f-L$v+USLi-1y z$?Zpz@6grY(`d&9vO%0I&tUq5dSvju;BAzQ>|o{07W$|i)D>UoOieR+O5F>Qli=Qw za-6>*JJyT2LO*nw-XaRkTD=zEI?CL>u&lXw*Z*mKJ zovX=}Z zOD;uo;YJqjT^jxy=q#RN{qBhl4y6}FlN{iC6@DI_lUW*C-gPmxhtFxh$YkDQYZlu4 zQ&uzTJP(ZJM^jZ*#;sY*Av%!_c&1+aj#LR;T-YyN&%$0<{}`}z0u6I?<9g_Ig-xur zBYr~f7;4C1zHg<}mkKnHMpNg;aAOy19mR9S#>vbUD&Q5ZWmjD!^_k1Oh8nL&7n-t{ zww>rr(Cy`enSqk8&R3FMVU;XqeRelE`g)zrZ z9TL$B&MKfSv#m3-*OENb2CVNZ=cO1Z{8+Gjr zc2|SXjNE_n7Pt#%i;~;QHpHI`<1N&PXH$mvZ+QPk_IB3$e3R_zwrmgT96U+J=K1(U z6ddAx-yLOb^ORlVIx~w9W>{!^hsrW?jHJ)!Osmb3u`?3C;q?pDb|eo}x}cqD5@osL zyV=NBh3bRgc| z3p@;=29e?P8$Y-XXP%>;loL%18Yp`oJS$QZ9R=@c%FA4wi?e@34qd{mXed7U3!Q-z zJ@-g?dhkB@a+m8g!zLuU0k_#+&3PEQ{+UuF{C zy5N$G(`a4U6%t--7bc^eMhkuDzvhC2KAB|uC&>1s2lz~;P2tz(Z~2vaJ0F#~AD+a* zht*f4JM=X!576)fc+Ut~Yry#4(c};K9n88)(TC(aCgZ~hnXAZ(@4-vC=`t>Em*ow9 z`-9ghWWR6dNBCbE3G^Zd$1<<}F4G5%Ej^pM;K?n2kqOd}ZHkaDsQs0^G9H!WKGS7c z|MC1{0J-!S80dqZl$BjSN!D91Uy8Hb3_rZa%e-@d*Eu(5*7@H^Y1uVdFFd5*U6`Gm zk$KRW{Kh>T2FU2!SmvC=Qne%KbSi0W40?cOKIp|9r#c??f4#&@SGb@N!Yzva@hl2@M=`I*w+KhdppXcD) zX0*xuBR&8Yr~ludIFq+!WqPk6Ux4#r_(oxH(e|ZOg?!|5LDmtx_0wABYxEGK?!e`| zXk%S^0&>)(hWHj3*hmJM9wMFV&wL?SW-e-*ZIjIG_`?Qrc(ISNrd`56LS@Fmn@`2b zN%U%?Id7k5Qa9=m#@hYzp#hU+22+=+htWIEJ{mt6k^{e+3qEhabvQUMTK25rQt>%b znKWdv6ZG4$(j#6w0M~jJlZv6m)BErY^dXvxzt24`E1q7hIWX=^JA>(;1JKbI zcr^1cPqNClK6nm&Xbbqh0nF7~#%IZ4)8Jj1>+}E-=wb(1{lK$38rPEdOlUwq)0r%E z6|Lor-8dtExOlg@%o;`E1bF_7c9n{e6$P&LKjQltv+%(@_@ci|jg#2}pPm{8-aGR7 z>fA3MnpTKDvXksuBP0VJc6msT+5_xFlUK;9>8`*_yz1H;?!o!>^pn}7i|l%(_}-@@ zuPr5)^^?LA$PEkO`#G7jXTzDYvVOdkR^tU<4c48D9JmvFR3X=U%Y0T)=2mJwJr+G& zPJX&6t(hw8mygUcXw&@}Y{Tv&8aW-+p6r}?tyw!^oMl2PwTk$A=bzmHN1pYO5&&$~r`H-O%v zIk}!}F>->etax0~2NQovR{3J(q#V6oW z~@NWGUn z4Q$K+lUeAWmX($fM{PPjL+2f2rq9z^NlZh+J4lgO=QZw*-Mn=IUvezsjYmzC# z(SnS-Wi|7p_PibtAXNloF8$z4H?kG_+*q={egZ#u)^lpv0&fq9;7k*lpRQwWvOs1d z?(?XdQ#ao~N+i1!XwHFmM6a(}It3XjB<=qC*(-vi4++ zTQcV2k?psVmsY_i@a5N7R?K>teylZzKl?==rsS8oZlkP+rO6_J(qYz{1iw5J@K5$T zmR>4kHm_6Xm3a5VZOpTH7IdZ>d8@mOpg>v6@`Ke7&i5E~kCfdFUN>c)F`GIKFDLUV zSi3b;X5rJayw1srD2>03k=^7OpMAv)0KcqdFlV60%-Bfgqh>PrdoTI`H=gaKXY-TY zE{VPwO!U|ys{pv2TZuE>kMG?^%Ua2ZY)FjN57nc7!Hn}+%_(_Mp)kiF_3kX84y%rR)#;H}gZ9Bn&_ zUxZMv?-I`dt$g6;*Jkn!nq44SDn|x)r6y;n*$;5s6@2#HC97{+W}{rA20Y#~QdY6; z=n~#imHHg!^9#Vxknu9QvW}g#;aE}5X#;1;{_0*tKTpfN#9B6Nkm<$m>-Cc1{7dFT zuz9hL%>M9Z_+)ZUjC74XSVfqT@n6JvGF@g_J4%ve`^rqS4KCHDFW_7~;ku~r7*DW6 zzfrfC%*MB+8-3}$-%IVlKwoltOZfkw5Hs9-t%(|yq0b+dp+l}hb$94M0V6_X>V>BKUd%nTxaMGo_UZN7Sy1R zX({vAd6^@YORXl#h@OvTePUg#VKcgu+z73~lTXkCx8k|M$24FRkE+j^4fE!E0fU(h z@t)gh>Fwd5kOePp z!P(bG>-fy3mCTdfWd?m?&wud0?6Q|!kv-2*%FFtma4sV!avwJ|lG>+-`vZTHqfg3O z@`7ukWh;lux_%okDbLT&%eZn1WANyQcggn*>9MM~Rn<6u>GrD+}i~!Fv|AxB-Ww=a}xsvQtX$$*^L3`rS zYku~dUa{8*S+1<#o9y_e3|RZawW9EPvTPxqAB}{k8JEl6$QtKFbB`2q&MSO&llUiP z(02SKFo~RvfBk$*=HN^se#=0A?N!WEw{V^1oNwf7@Bx1Ux5{R|V3%Uulb^#6=0|P` z;CPX&6+3uVgLdvuW`6L1Gpi~)awR^+{@ zA3l(oeJy&49_E)hob~_z`$n{Kc4qos*OquV8sKN*31G|_&Dg}e<^TV-!0iiY)O~4W zF7}*BcB6iH4tl(b{TAYy1;KW$ZL*!wqs5nG%|V~cYiK$iaV88vgZF diff --git a/vendor/libgit2/tests/resources/redundant.git/objects/pack/pack-3d944c0c5bcb6b16209af847052c6ff1a521529d.pack b/vendor/libgit2/tests/resources/redundant.git/objects/pack/pack-3d944c0c5bcb6b16209af847052c6ff1a521529d.pack deleted file mode 100644 index 02ea49f4b34e87f6bb9d88bd1dd1340829cfefd3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 309860 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 diff --git a/vendor/libgit2/tests/resources/redundant.git/packed-refs b/vendor/libgit2/tests/resources/redundant.git/packed-refs deleted file mode 100644 index e8bf04d65..000000000 --- a/vendor/libgit2/tests/resources/redundant.git/packed-refs +++ /dev/null @@ -1,3 +0,0 @@ -# pack-refs with: peeled fully-peeled -e18fa2788e9c4e12d83150808a31dfbfb1ae364f refs/heads/master -91f4b95df4a59504a9813ba66912562931d990e3 refs/heads/ref2/ref28 diff --git a/vendor/libgit2/tests/resources/redundant.git/refs/.gitkeep b/vendor/libgit2/tests/resources/redundant.git/refs/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/vendor/libgit2/tests/resources/renames/.gitted/HEAD b/vendor/libgit2/tests/resources/renames/.gitted/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/vendor/libgit2/tests/resources/renames/.gitted/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/vendor/libgit2/tests/resources/renames/.gitted/config b/vendor/libgit2/tests/resources/renames/.gitted/config deleted file mode 100644 index bb4d11c1f..000000000 --- a/vendor/libgit2/tests/resources/renames/.gitted/config +++ /dev/null @@ -1,7 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = false diff --git a/vendor/libgit2/tests/resources/renames/.gitted/description b/vendor/libgit2/tests/resources/renames/.gitted/description deleted file mode 100644 index 498b267a8..000000000 --- a/vendor/libgit2/tests/resources/renames/.gitted/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/vendor/libgit2/tests/resources/renames/.gitted/index b/vendor/libgit2/tests/resources/renames/.gitted/index deleted file mode 100644 index 72363c0f52fba5560db5c0a127ddebfc47c0ba62..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 352 zcmZ?q402{*U|<4bmO!-yRX~~nM)Lv1m^6Z}F)%bPVPIhV3X~E7Dn0k=%i_oTpS8BW zj%!(pCmOpi#xCMP-?J=`a%m)fU=8%!ANS^Eyz?C5dTJALN$-+%dE_s3G1e8 zNcftg)y@ 1351024687 -0700 commit (initial): Initial commit -31e47d8c1fa36d7f8d537b96158e3f024de0a9f2 2bc7f351d20b53f1c72c16c4b036e491c478c49a Russell Belfer 1351024817 -0700 commit: copy and rename with no change -2bc7f351d20b53f1c72c16c4b036e491c478c49a 1c068dee5790ef1580cfc4cd670915b48d790084 Russell Belfer 1361485758 -0800 commit: rewrites, copies with changes, etc. -1c068dee5790ef1580cfc4cd670915b48d790084 19dd32dfb1520a64e5bbaae8dce6ef423dfa2f13 Russell Belfer 1361486360 -0800 commit: more renames and smallish modifications diff --git a/vendor/libgit2/tests/resources/renames/.gitted/logs/refs/heads/master b/vendor/libgit2/tests/resources/renames/.gitted/logs/refs/heads/master deleted file mode 100644 index e69792263..000000000 --- a/vendor/libgit2/tests/resources/renames/.gitted/logs/refs/heads/master +++ /dev/null @@ -1,4 +0,0 @@ -0000000000000000000000000000000000000000 31e47d8c1fa36d7f8d537b96158e3f024de0a9f2 Russell Belfer 1351024687 -0700 commit (initial): Initial commit -31e47d8c1fa36d7f8d537b96158e3f024de0a9f2 2bc7f351d20b53f1c72c16c4b036e491c478c49a Russell Belfer 1351024817 -0700 commit: copy and rename with no change -2bc7f351d20b53f1c72c16c4b036e491c478c49a 1c068dee5790ef1580cfc4cd670915b48d790084 Russell Belfer 1361485758 -0800 commit: rewrites, copies with changes, etc. -1c068dee5790ef1580cfc4cd670915b48d790084 19dd32dfb1520a64e5bbaae8dce6ef423dfa2f13 Russell Belfer 1361486360 -0800 commit: more renames and smallish modifications diff --git a/vendor/libgit2/tests/resources/renames/.gitted/objects/03/da7ad872536bd448da8d88eb7165338bf923a7 b/vendor/libgit2/tests/resources/renames/.gitted/objects/03/da7ad872536bd448da8d88eb7165338bf923a7 deleted file mode 100644 index 2ee86444d7e36c2f48ae2a5e8a2f2aed2084d7b1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 90 zcmV-g0HyzU0V^p=O;xZkVlXr?Ff%bxC{8UZ%gjsHE2$`9Sj*KHx{zf}$cjbtuI%vk we4b&xP#CVPEHy7Vvm`UM7_2nSP(J4O^X44&KrZV=U+gsWbh>u|0Hs(VQKqseFaQ7m diff --git a/vendor/libgit2/tests/resources/renames/.gitted/objects/17/58bdd7c16a72ff7c17d8de0c957ced3ccad645 b/vendor/libgit2/tests/resources/renames/.gitted/objects/17/58bdd7c16a72ff7c17d8de0c957ced3ccad645 deleted file mode 100644 index 01801ed11..000000000 --- a/vendor/libgit2/tests/resources/renames/.gitted/objects/17/58bdd7c16a72ff7c17d8de0c957ced3ccad645 +++ /dev/null @@ -1,5 +0,0 @@ -xEͱ Â@QbWq ÿ®—ÃÅHôŸ¡_ž‰&{ëó]ãðy›û¸•¶Y¬X³û`Ÿì‹=¯Ý'í¶=Zo´Þh½Ñz£õFëÖí¿­­Ð -­Ð -­Ð -­Ð -MhBšÐ„&4¡ MhB3šÑŒf4£ÍhF3šÑŽKûxŒŒ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/renames/.gitted/objects/19/dd32dfb1520a64e5bbaae8dce6ef423dfa2f13 b/vendor/libgit2/tests/resources/renames/.gitted/objects/19/dd32dfb1520a64e5bbaae8dce6ef423dfa2f13 deleted file mode 100644 index 4be4c6952..000000000 --- a/vendor/libgit2/tests/resources/renames/.gitted/objects/19/dd32dfb1520a64e5bbaae8dce6ef423dfa2f13 +++ /dev/null @@ -1 +0,0 @@ -x•ŽÑM!Eý¦Ši@3¼Þc,Á\X °ýK þÞ{Nrbo­,xzYC¬<‡h[&“È?=fcvÎyƒèC£W¿<äZ #:J"vs’µ%Œ9š˜Ü½¶ÁPÚ’Q|¯³ø¾ç”ZáKj–ï#|þ”uÞá-ööúpÚ;Â+¢Úëî[ý¯©Z;’›Là+Ál\k™'´žJ.‘Wé×T¯;O diff --git a/vendor/libgit2/tests/resources/renames/.gitted/objects/1c/068dee5790ef1580cfc4cd670915b48d790084 b/vendor/libgit2/tests/resources/renames/.gitted/objects/1c/068dee5790ef1580cfc4cd670915b48d790084 deleted file mode 100644 index d65ab0a9b58ca3f41d9f7d2c61e941d1596a188a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 176 zcmV;h08jsT0hNx?4Z<)C1^Lbt9srQtxJfD@gcyMh64#}bT8h$CtWOw$-_twYlXY39 z0uA$_WL2<&?3wzWQ|E-Eaza$W!6~5xa?xUpePiA+>#K@M{9s$^8%(VoNPHty#e~)= zcO>kCa2HM7%eZEE?AxaE40oLe&2Y)-_MFPNr?aff705c`(E2vO2?L_3wEin~`mbrS ee)3dwJA$n5NjLb^5Xcx`&mYtxXY&O)1x?P|R9TS# diff --git a/vendor/libgit2/tests/resources/renames/.gitted/objects/2b/c7f351d20b53f1c72c16c4b036e491c478c49a b/vendor/libgit2/tests/resources/renames/.gitted/objects/2b/c7f351d20b53f1c72c16c4b036e491c478c49a deleted file mode 100644 index 93f1ccb3fd4755e9a1eae764590ffd5f8143559d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 173 zcmV;e08;;W0hNx~3BxcD1@rAHwt)oQ2ZRt(LORf~Ya49Y$TA__M=j*{@rIeSt?S%C zNPlS+5e#?9kRWFji`g*cqoC+9dP#|ED~vM2Dn0C>Vrd{bDw|#66r{S~WVTF5*&v9um6%A b-MZp}YFsc*wy lmRjy0lo4ENO9*FAVK6i>Ff%bxaL!3AE;iIlE@p6-@R6(Aq_tIs1;QqS(oCbr_(mF*?n=CgS9;eU@(1mE3# zMIzW-!RZM+5{%d1jjYIe>P^Nd(9Yq2!OQYyr(jUN*fVk; zmgfiyuQg%I=}DN)Mn;5LB3wz8H;HZ(N8R$GsjQ?HO5CZB6aTtQ4ACo$o&`&YgS6;E zB-aY>EyJ~aVXhI0-4@kO@-oninqb5?YM(g2v`RQf z(L+a84cz1(O;g$BO1wZTui}fDd>>a*^4m(gwOuDsJm&^CT&dq;vy~<7NOADRG+ZR6 z;E_fu`2F*jIvT;ig(qb37|GX`^lfX6I+=i;0)420QP$$zOI5MO(e#Rj>vIgc1;K_c zhQ-s*PTQD@^kN7Fu)7vtTeZFfcPQQOL|rO)V(Stk5f|C}A*T;@x(3&8o?s^@eZH z_N(as++&stRacx^mYSEGS(2Gr3|5+EC?E6td2^0>AeZ%`FLoMwI^DZqN;4~pQ;W(n z^U}d8ug_M{eK_M+;szC!osZ&Lc#p>kE5lUg=cVVTfsF<$_48S0S9>+@y7zy}pj?*B NryP$2*S diff --git a/vendor/libgit2/tests/resources/renames/.gitted/objects/42/10ffd5c390b21dd5483375e75288dea9ede512 b/vendor/libgit2/tests/resources/renames/.gitted/objects/42/10ffd5c390b21dd5483375e75288dea9ede512 deleted file mode 100644 index d351a6d13b620ff34fa29c0d283f243946fb7de0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1145 zcmV-<1cv)~0d-YPZ`?);lOo`LmILPT@aa~M#srSLy2^%&c36;gkYn1?r5=Tr1NC{5g*C=tM#pI z9OID|4OE?-QwOw2aJbGsQItLb{4#*D33Lwl zeC5A!9S<|h>^PE1dnQS&JHZM((I_EuF=|J!B8hC!Fz_Py-h377FnUDAG|p3YaPe2> znCzA&u(n`w%N{V!h=?SAH6CR+(PXSc47?F2lEEO`!g|aej4@@O1Qqm=(=XLC z($dV95muY;Xj%nn(`kE0VIt$V(^qoEal-#F@LlyMgFGd1!rvkp{01a|o6~L{INF#L zSwTLTjtPb0RLVG84(;wbPV$CtJvAmJpec1VFoVz#wT`9w@kaO)2M9)h?a5J5%2h?Ij!J4hYaMkZ8abb6;2G8@M z=B;Bk`DlWt>c#HO#8V?^e9fa*fRUW_DjXBgvPkBHa}!5Z7rF{X!U-CBQ47U`=DOcs z!O`tZI;g;4IQpw(j$Tp_AFAq;EMz7fXG)L(j-c_2f?VSOHs*V|5G@5ZF{7+|1#y%;n%mPXb9P7g zdp61d6d7dIelWOG8bj?m?n~bmO-y-%6A={ID)4)gk-7%nrXhVX&R`rYBL-@L*g~fRG0!;!V~?Pbb2hDJ>)Inu4W4 z5aTp67GWHfR#<}m$nc|(zFHX7D;t+aOcaz*`?p@$%(^Oc)Phmbbukqi%%KakKcZv5 z*@gpl!S}oHeg51qdft^%w%WV?%Q(hri(rwtG`p^N0LPv$Vns}7n5eF?)4CON0LxUH LY^eSP6%Gp}TSqL) diff --git a/vendor/libgit2/tests/resources/renames/.gitted/objects/44/4a76ed3e45b183753f49376af30da8c3fe276a b/vendor/libgit2/tests/resources/renames/.gitted/objects/44/4a76ed3e45b183753f49376af30da8c3fe276a deleted file mode 100644 index 5ce12a3c5dcc72207248182c16a8e01231ea7ca6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 135 zcmV;20C@j+0i}(>4FVw$0DV)%HlW#K4-XP!{MdmFAh+a5ZrubhwlCJ;Z!(XWq#~um z6zri_W*`@AaFjD~bnKsTK}@p^nIdNi>{ pYSY|LN#zO?E$Dq1H8`R}G{cT@=RXpr6)AhHkju`^d;xA6KraBJJyZYy diff --git a/vendor/libgit2/tests/resources/renames/.gitted/objects/47/184c1e7eb22abcbed2bf4ee87d4e38096f7951 b/vendor/libgit2/tests/resources/renames/.gitted/objects/47/184c1e7eb22abcbed2bf4ee87d4e38096f7951 deleted file mode 100644 index aa9192699281b967cb0217cb7f5c68fa2e4ed1cd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 229 zcmVz0bP&5PQx$^hB^BweBL3WLY#I&mEbaQp)cUI?rPyCB@P-B+PmXWA))4w z$Y1>Fw@;c*`0&`=eVW8GzFn>Ge1QK|Xp<`UMN+iz!jZG|n~tNzj}7Yht8CGfnFfyu z9of4b0QNh;9d?r#j-rhIN-P{}7O7s*WEQ22B_YLBCeBspmCW!WWkSM1#*wo-7-?p- zgk_@Q7o$^0)fl*}8zAX9WjAN{RXsKiwRiRp{fi5(>;bB53-yexubz~jmPMtfI$d)g fUitEzbl}{;H=v(&thNr<{DKwV;0Evm{E>Pv3uksE diff --git a/vendor/libgit2/tests/resources/renames/.gitted/objects/4e/4cae3e7dd56ed74bff39526d0469e554432953 b/vendor/libgit2/tests/resources/renames/.gitted/objects/4e/4cae3e7dd56ed74bff39526d0469e554432953 deleted file mode 100644 index 5e6ebd5e026aaa6b177e86c219ecf9258c821116..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 452 zcmV;#0XzP90bNqP&eSjvr1n#6M{}Wof{FrYPWnDh2!yCN@#bvdc%!wG=-!^$92IGt zoM&g}=fVX-~P{DOW0a7E0V`6sfdu6dE5mE6r+tzHPKM zfWw!qQ|@#C+map_RZ!q+66$)6fRFFe!mGAU!1W|lc@fh2d|&vFn1AGc3BQw)$s~D~ zNV={jtz`v6jacAQt{~-xl^`94aOEx+;$3rOY{jcXC$;KM92q&62Swom#XjQZ3qi&z zmRpi|p(AMlXwo|CR-?oazNwuaM&NSK(9;tVz!>`l&LcMoKXofmlk${Yn>0SoOWCml zu8QiJ)JxT)NW8CAm‰í ä®”¨Ï~*ùD‰ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/renames/.gitted/objects/5e/26abc56a5a84d89790f45416648899cbe13109 b/vendor/libgit2/tests/resources/renames/.gitted/objects/5e/26abc56a5a84d89790f45416648899cbe13109 deleted file mode 100644 index 2acd3d5830bb7e817e31c3d9ac45149ed7b62cab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 163 zcmV;U09^lg0V^p=O;s>7GiNX~FfcPQQOL|rO)V(Stk5f|C}DW@W%1+v&stkw@~mCN zZnoyh#Ipk2P<22h#i>PQnR)48l|Om?5AmJ7ulR0XmibGiSQTf>OIu+o^Yha4)6A1I zOEOc7!HS&({$D*jVUz4t598A3K^^y2zI`eLRa}}^l9`*DQwdf#EAwW;x+xnHzUFAP RGlj%yZ(P086aZGANWbzjPe1?w diff --git a/vendor/libgit2/tests/resources/renames/.gitted/objects/61/8c6f2f8740bd6049b2fb9eb93fc15726462745 b/vendor/libgit2/tests/resources/renames/.gitted/objects/61/8c6f2f8740bd6049b2fb9eb93fc15726462745 deleted file mode 100644 index 24eac54c5e842d756e67aa6b83abea6e5bea28db..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 106 zcmV-w0G0oE0V^p=O;s>7vS2VYFfcPQQ7BF=OU+BpEXhnQ)+?zfVMsHSkNN$)IY&K^ z%X-llI}JUZ?p-jYnH9yUMP-?J>0p&>x%xsEvaAVNv1s0v9p0YLGt3tX!&K(yrRS%C MjmBvx01B=$oADqoEC2ui diff --git a/vendor/libgit2/tests/resources/renames/.gitted/objects/66/311f5cfbe7836c27510a3ba2f43e282e2c8bba b/vendor/libgit2/tests/resources/renames/.gitted/objects/66/311f5cfbe7836c27510a3ba2f43e282e2c8bba deleted file mode 100644 index 5ee28a76ae3cbdab2977e29f0431dcb3571715d2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1155 zcmV-}1bq8=0d-YPZ{tP`?ODHqz1so0rvgO}Zi4`BH;Y9aAn0)f5M za=Oq*39TBf*Xhb(p_s=hWy#SkRA=j2ZttqqYY-DG!fe+kV_O=TQm}PSOkI$XOlQJf zb-oH*rGafA$!U_9BF!B5pTGXbDfQWeHi(Q-!{cP6zJxkdC*M+ULa|R z`c>2N66h50{>p#gK7LFrljBGxZMh_|?f@%PiUtXhi%~P6E|SOwjRP-&_w^UScB4o1 zOyfLd2N%C*j>)ch0&Ig?4!lqsc-{iW2@#RyPsXDW2O5oah=C_Ujifh7x70mmkCHKE zp9DShk<$;=1!-w!^8l;WcQlQHwCS)uqcxH7*Xkp=;yB?u^n6$S#;BfFam4>D83hhV z05`|YJaDuzDYAlmG%XW4#i{ghvK*StbsXgt?>eeYNSI_yQqhIi)MqIj}Affyd(rSn4$3ab3QfWZ z6g{hj;!$Z8nLMxAI{Ap;;m0Tc?u3Xkk;1LkY` zMimr+9an2MfLFQ;moNqoLRNzAL1{uFY1l5INad0ax}=aF7YZuPw}v5H3T$FVW49jS zD0|4;(fIAofszj6ia=0Rt%F9dy(fPktM? z4kNM*!pWHhYCmI2$9MY(fpM&iEPDv4U@YDwUO06i44a}GX5*-W}Gbl#$*qB~A diff --git a/vendor/libgit2/tests/resources/renames/.gitted/objects/93/f538c45a57a87eb4c1e86f91c6ee41d66c7ba7 b/vendor/libgit2/tests/resources/renames/.gitted/objects/93/f538c45a57a87eb4c1e86f91c6ee41d66c7ba7 deleted file mode 100644 index 39105f94de392e169ed8bdac792304731bf62588..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 229 zcmVz0bP%=PQ)+_hMD~oo^R+;5YtVl5-f;?zJRZFuNF>H;-KS%?%i>ykWe!u z@)v*l?W3k6-aoWApC<8yZx<^Z4)DKfx}?fOkrb_Y=EzxwO~;GGj}7Yit8CGnnMRLk zda`#r0PJ^wJM3pMoJ1M@l~_2|EK@>R#%6+`voh$!WG~L{Gxg>LvnH* diff --git a/vendor/libgit2/tests/resources/renames/.gitted/objects/9a/69d960ae94b060f56c2a8702545e2bb1abb935 b/vendor/libgit2/tests/resources/renames/.gitted/objects/9a/69d960ae94b060f56c2a8702545e2bb1abb935 deleted file mode 100644 index f75178c59abb114a2724eb88d32f32ce03aef3be..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 464 zcmV;>0Wbb|0bNqDuGBCPq_*UL*pB9f4yY)A=A`#{LLfxFi8p5ppEt6dMECd1`lxVY zC!U?1nf07?rjPGGy!lmnx=Fr!_vzpA&bwFbF_kN&LOHEMksHk-g>D>#<~#O6t5)0J zHrgA&-hJ6SrA{ZnE$WF{1qbdHp{}C_gnX6e-HWzP0QM+U_$H+5IN$h>RQpK%$-CcC zsmdbhkU+X^Ra#35juOzq%1lH|4NXBiP2OF&%MBv>rpv<@dTkf|qV>JdSpknIBdnVNX_Q}+x>F)h&q zO5=0f%7HfUmQ^2#Jr_N*ge&Y<`dm9gHayu(9?E&v+O7Mm&RL-PNQ<;#Du`^;S#`h0 z4h;`G2<=4>t*)z-CN_vY2k3*acjnadg-cP>;~nA8 z2?%0=3`y`=iNj&>A}N5)`Bov!%rTu>(Xzl2Q$u@{(NLUvqwiI>DBZiSdV`T3hk-#c zBNvSM@en|N-MI$KQH>x}!N9{bbyd)6nI=58$e8Y9Lc<>Yx2B1H?BNa~dQO{7+`GTo G-~OIXpz5sv diff --git a/vendor/libgit2/tests/resources/renames/.gitted/objects/ad/0a8e55a104ac54a8a29ed4b84b49e76837a113 b/vendor/libgit2/tests/resources/renames/.gitted/objects/ad/0a8e55a104ac54a8a29ed4b84b49e76837a113 deleted file mode 100644 index 440b7bec3f8521484fd7ca4e8b7e64e9898bbf07..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 415 zcmV;Q0bu@k0bP>8j?*v@hB^Bw{yhOwT8RrBdMeVQt@Z!{q@JD4B(~z%mF*B z8ZQy_F--8*v(~b%r;74V>~n&i(9Ve_81aodCeAOd651$w>`B$Y&Hl+Wl`dECBCTA- z7c=`IZbb6?irv}1mnfcdgB!2tx7cE3O$Q>5zL=}R;P7U%J{zcAgD{OYG=Uo1S<@=FHgBPFO4qxYP)3L*&y*R#v J>JME$6V=y!@Ff%bxNYpE-C}DVY#6EE9qH|BJOCoOEx|sF$oj$%n{?~}#xW_ZK=B>@CYpwtzWgk$b0V4PS diff --git a/vendor/libgit2/tests/resources/renames/.gitted/objects/d7/9b202de198fa61b02424b9e25e840dc75e1323 b/vendor/libgit2/tests/resources/renames/.gitted/objects/d7/9b202de198fa61b02424b9e25e840dc75e1323 deleted file mode 100644 index daa2b3997579e55909bdbc77202824fb145fb6ef..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 421 zcmV;W0b2fe0Zo!kj?^#^g<1D0-mCzrd&CMBtQu+1v}OSUq+UCdN^HfkTeg#s9f#nA zoP<~I4#OgfQ$H_Xy>jDYgAecCzuEyOJUu*oMRq@7V~|{sCCx7MhfxCaz?&adRunV! zwqO((@7Xm3S>AqR0kbY4m{BrJ5}d6mFrnpPy}fTjM+P6`vISXtEsOV+BMbAz%7{2i zg4d)zSqiBE|PK#$Rp?Z^XoTL->qN} zxnvXx7)kH6;AOAMd$tih2M)1X0NtARcj|=ptJV26mtmR|O$!QGnj4oun>*uDzL}ve zaT+!}N8J{W@ggDDa#D@P%*WTQIcm3L{m%75XED~Lt;i?^Van`jh%S_j1`esL61~M1&=4Loc-@4Fd24w1P Sx!}YNBer?}X53-X69oV<`8>G* diff --git a/vendor/libgit2/tests/resources/renames/.gitted/objects/ea/f4a3e3bfe68585e90cada20736ace491cd100b b/vendor/libgit2/tests/resources/renames/.gitted/objects/ea/f4a3e3bfe68585e90cada20736ace491cd100b deleted file mode 100644 index f72df8d82..000000000 --- a/vendor/libgit2/tests/resources/renames/.gitted/objects/ea/f4a3e3bfe68585e90cada20736ace491cd100b +++ /dev/null @@ -1,5 +0,0 @@ -x}RÁªÔ@ô<_QžTÈ.¼“ÂâAáÉ[–‡â -{ž¼t2C’žez’˜›áú%öLžº'!aº»ª«jê!Ôx{÷îÅ'¢+Îþ;“$œ)Ξ»Ý#±yÿ¿Ç˜³#q#¯h„­c° ÃQDX¶m­R|ŠaD*ÝOˆþ†+±”^ZI~ýøi>3aôÃàã!,R!-áïÉEaIÁ>äyš‰o*«¼4æˆRf¡ m&e¯ IAÑú™ò*!â;¢ždÍݬ‚…´Å -êH¶o­¤ -ÃÄO®‚U¾DöyTVØHpwqÅH¼7§„Æ·­.ÈʆÎÎts6{Zä +öX\)Šª”ÑC–žì5QªÂä9 -%©ÌÅt*Ã&Ï&è°êv;|šÕÆ'4½ìÆéþþ Dƒu[°7h¯¿e!ÉNK*"C©-=Óòæ`´æ#ØŽ$EëÅe2õáâT|ùêå@NBsús¢¦lµ°Wö|/¶0¬÷aÈ¥üJ±ò¶Nêv)-šÚ¡˜iÛ¤3ÅëbäbO:uWMâˆNÓÜàóæ¶X²7¿Tóº \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/renames/.gitted/objects/f9/0d4fc20ecddf21eebe6a37e9225d244339d2b5 b/vendor/libgit2/tests/resources/renames/.gitted/objects/f9/0d4fc20ecddf21eebe6a37e9225d244339d2b5 deleted file mode 100644 index f6d933be9929e07a1e66031bc36906d0ae277e8f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 441 zcmV;q0Y?6K0bNqdP9rf8mf`?0Jyee#Cwu zUqZDf3kx|++Wjb3RlD-BqV@Xb;uq1w-Q6QmcCSP>2FX1Rl13MrWhcQ9UA2m) z06v7h#ed=6&*BQo%)0n#htMQoVI`|s*}>JdBne6;`u3l?|I(wADQ}d18;aXRM@cyb z_}f9_+n>MY*+M`oas;PdQ0XAXm6p#(urNCti5fK_Aeb#E3-=^ zf~*vcjcU%RpK~8CnV~LNy)9jlk#CKgG}{Uu1v1PjDOY=-xF_CaNA5E|1EatB^QD`c z4Uo(Uy1D8+$RR;<-(Nv>5Q=*iaBY~k?8@O}@B2AQVrnìî­R—]ʸ´  GଭÖê°Çxð U·:jz©/¤’? \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/revert/.gitted/objects/0a/b09ea6d4c3634bdf6c221626d8b6f7dd890767 b/vendor/libgit2/tests/resources/revert/.gitted/objects/0a/b09ea6d4c3634bdf6c221626d8b6f7dd890767 deleted file mode 100644 index c050e5a89d50495cbf3d199e762392e5d83968dd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 28 kcmb7v0yMXFfcPQQAo?oNj20fsVHGM^>gmyB{S3otGA^qGV-l) zlV)4NgQUm^tcYvFyk%DoCwt$|Q4&+TvF-caPWE&pMaE!7Ummg_GPux{@Y`{&WZQgs n4Q+MZIY^4kz>4^z|9tHU?QM%)wvVatdS&F~l$>_}D9<}b%t=9? diff --git a/vendor/libgit2/tests/resources/revert/.gitted/objects/0c/db66192ee192f70f891f05a47636057420e871 b/vendor/libgit2/tests/resources/revert/.gitted/objects/0c/db66192ee192f70f891f05a47636057420e871 deleted file mode 100644 index 31c107fc4254a763ec6e6617addcdaa74c8aa9d7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 35 rcmb^?|Bmd510ZYosPf{>6GiGqh%t=)!&aBW;NK7s%P0Y!uROAASrRA3v4Gty%peZ*0 DyB!k` diff --git a/vendor/libgit2/tests/resources/revert/.gitted/objects/10/10c8f4711d60d04bad16197a0f4b0d4d19c542 b/vendor/libgit2/tests/resources/revert/.gitted/objects/10/10c8f4711d60d04bad16197a0f4b0d4d19c542 deleted file mode 100644 index 083f7467b544ede68605f66d5205c847c7be3aa8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 53 zcmV-50LuS(0V^p=O;s>9V=y!@Ff%bxNXyJg)hnqeVNhI|HREl|m58*5_wv;8FE5kw LdU*!`OP&$x6T}v? diff --git a/vendor/libgit2/tests/resources/revert/.gitted/objects/13/a6fdfd10bd74b1f258fb58801215985dd2e797 b/vendor/libgit2/tests/resources/revert/.gitted/objects/13/a6fdfd10bd74b1f258fb58801215985dd2e797 deleted file mode 100644 index 3c54aab0c503fe12ffaa55c89b2c898adb88fe93..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 121 zcmV-<0EYi~0V^p=O;s>7G-EI{FfcPQQP4}zEJ-XWDauSLElDkAkpFN*nMK>}v}|H^ z b&k>Sl^;)rMXLC>QvOeQA%6sGhF_17*Gb%i$ diff --git a/vendor/libgit2/tests/resources/revert/.gitted/objects/13/ee9cd5d8e1023c218e0e1ea684ec0c582b5050 b/vendor/libgit2/tests/resources/revert/.gitted/objects/13/ee9cd5d8e1023c218e0e1ea684ec0c582b5050 deleted file mode 100644 index aed4647a6a919946f3838879e896761361ffa312..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 161 zcmV;S0ABxi0i}*X4#FT1MO||WE}$7^fVPP-ZoGjP0A@(Lpcsnr`r;W}yyWLCUVf^j zY+WPKsW%ZlQ}&Lt_284uGsi)&#Db2+#7S%dLYmbpG}*hB7=ZvVi8%H?O%owAc(lft zCCh{%E*rd_QFncnVSnphw$$oTbHAioZraf72Ix_r!2zgY$I&i- PBvfo+PpkR@7v0yMXFfcPQQAo?oNj20fsVHG6DOY=-xF_CaNA5E|1EatB z^QD`ckrWw$6>)8tx9rN{WbgYqN@8j^wtc_b$)1j+$QZ2X%R}}<1{b;#eml;UY@08y np{=ev2T73$SW)Pj&uYu&bFHqL?swGwSLjmiQwRM3b&@;TcH%&) diff --git a/vendor/libgit2/tests/resources/revert/.gitted/objects/18/1aab27ddb37b40d9a284fb4733497006d57091 b/vendor/libgit2/tests/resources/revert/.gitted/objects/18/1aab27ddb37b40d9a284fb4733497006d57091 deleted file mode 100644 index 6b422b808d167a02ee3d78aa25227a55d6436f73..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 133 zcmV;00DAv;0V^p=O;s>7v0yMXFfcPQQAo?oNj20fsVHG6H=LAZT;sQT;UkIK39o-~ zO-`NMgrvv_tcYvFyk%DoCwt$|Q4&+TvF-caPWE&pMaE!7Ummg_GPux{@Y`{&WZQgs n4Q+MZIY^4kz>4^z|9tHU?QM%)wvVatdS&F~l$>_}*62L(jS)g_ diff --git a/vendor/libgit2/tests/resources/revert/.gitted/objects/1b/c915c5cb7185a9438de28a7b1a7dfe8c01ee7f b/vendor/libgit2/tests/resources/revert/.gitted/objects/1b/c915c5cb7185a9438de28a7b1a7dfe8c01ee7f deleted file mode 100644 index 0a6955b5da107cb8a76e7fd8fb637a7257a0b708..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1169 zcmV;C1aA9y0d-bQZyPrd?U}!Vje`PJ;uVk-J+#QdmYl?ZzbYwB3qcULTxypwmt>Y) zTk0Xdy>G~sswR#PqvddBIDGSF=+d~7zk2oh^$#Z}{Ia&LQ~XaIdSUoH_LX)#s@A(s zbUVJ$MunHW?6s+Qr$TQcmcmvHzG;)!%BoI8Rq=Aiz4N^h-BE;3dTcvclu;t6G28z7%b2A^ zp+7HI+T!=tt;$bhig95@X%v5!EuQg>GnMMNwmde9-}LWPh0GL3-JctV)tK8Tq<`?1G03C4m_Y?M9=MB>ULXF67#G zj=~sMLp}r_B*l0Lfj)|Kg8+rs>4a=XTe#Ffn8}M5TnY&U6B(FBN@KVPPmWg7+0H8) zstvxfO!j1c6lWkF5~2;t+XodW2GYuMOXlx-T?s16Ssz_1qIQ-qoHO@2!m9Rj;tUzi z)VvX$rwRuycyV*F;L=sv)|}X=En6Q<0RE^*rC83xD!WmPg%a&V$6XGQ;5az%_fV!2 zK6P>89`pZ4FsoS~P(%q0tKc z=lbY-VjeM(P@T@q6mz9m=U>%;}htL#5XRZ!c6$38zufSh>vrZvPIfsR2?&&M`B4&ws+p zf%gQ=rPqXSI@h8XEkaOKye1rs-UmuXJUTS3Rgd8LVb%;Y0&W46F8B~V2Nl59x(FXt zDb%J^QqZJ+RJoKjM)vQgKeP1*Uw5KXvy{>LEoC%jITYr=uzTg|QSsOH)&JHYBGqU9 z#}%Kej@msP%}|W>R78PpX))%GmIh0>ToF+7M;&FeZ$!M7+4+Fl8Nk>G06AvsyN9^G z*hY*^Toj6H0BWv<)f-T7Pvtk?`#a)XrDCUJAE5f4^_yeP>6S(oWtOLUV2h@2%K)A* z)x^U$;=Rr9C+fJ-b#h@-749SWrLCr*GbMKtkw8I?Qeb}B96Dgc;$eS2yO{hvxw7v0yMXFfcPQQAo?oNj20fsVHG6DOY=-xF_CaNA5E|1EatB z^QD`ckrWw$6>)8tx9rN{WbgYqN@8j^wtc_b$)1j+$QZ2X%R}}<1{b;#eml;UY@08y np{=ev2T74BSW)Pj&uYu&bFHqL?swGwSLjmiQwRM3b*wwudeK1T diff --git a/vendor/libgit2/tests/resources/revert/.gitted/objects/1f/f0c423042b46cb1d617b81efb715defbe8054d b/vendor/libgit2/tests/resources/revert/.gitted/objects/1f/f0c423042b46cb1d617b81efb715defbe8054d deleted file mode 100644 index 2ed1a2292e6b4d9e5f8b2c60d769352fe7cb6318..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 751 zcmVmQqQMn|=Kr z<;+Rj_?83)0-GX5KE6j5))(~g(}&M*=I8y*=5!~CDyg}%i3(|WYkZ*OiM!-mPNrmQ zcjSC%*_yvX);J+?m2vC1n4LGB`RqLlzsi=xdlLDJj{Z4(t0XGLG)=5KV0g+jy;pccPUU7bPIX zy9F(ePqd7NGFm(2=Pd$id5EUT5~wdO0)kva&Bkgi)^j!7x}dL)*d_@M$^^f9-&xQE z@lbLQPD5U}U?`rEwQ(GF8Q|1(kp{?Y&$~E+k*z@p3J~bT6!~;LF+5AIf<9K#mC|M>q`5cPt|k&MjRG~YT2|5aUaBc z^q!@c2?|{uNQwEjAB*STB;dlsW(^)3xUqrMj^Edq4deR-(8<$b+^Ko+LnIh*l`p$2 z7JS2wjgT9j8}FbnY~ew%FArsnV?qFQxDB&MhX>|R3q9(dsxbk&JnHb0*9dPhM7Y3g zc{M_Hqrk5VZd_9b8SevYTF=CMkv^eP^dYYxj=KLhmW@+2FK=%qEbw`n^!a_-QenEE hwk&T~6P8V-966QS&*irXOGr~bzg8!G{sA+ixECtgav=Z! diff --git a/vendor/libgit2/tests/resources/revert/.gitted/objects/21/a96a98ed84d45866e1de6e266fd3a61a4ae9dc b/vendor/libgit2/tests/resources/revert/.gitted/objects/21/a96a98ed84d45866e1de6e266fd3a61a4ae9dc deleted file mode 100644 index 95842dbf87aa03a265eefc00cc0fd0a73563ac5c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19 acmb6Hev|L$ShU>qLPeMh1|rGiUI&GMlbSW2ocW! diff --git a/vendor/libgit2/tests/resources/revert/.gitted/objects/2d/440f2b3147d3dc7ad1085813478d6d869d5a4d b/vendor/libgit2/tests/resources/revert/.gitted/objects/2d/440f2b3147d3dc7ad1085813478d6d869d5a4d deleted file mode 100644 index c06cc9472..000000000 --- a/vendor/libgit2/tests/resources/revert/.gitted/objects/2d/440f2b3147d3dc7ad1085813478d6d869d5a4d +++ /dev/null @@ -1,2 +0,0 @@ -x¥ŽK -1D]ç}%Iç3"n¼Èt:΀I$ñúÆ3¸)ŠWð(ª9o´q‡Þ˜aaQ9ËRyífž"É]’JÍv Ym¯Ð¸tð“ñÑð„N9‡2%\F°!™/DHÆŠðîkmp‹ŸÐ"Üך÷Zà̃þÚ5oÔê^S?QÍP8Y…~ÖŽÒJ)G;ÿ¡Ž’žõ­<€ÖP¼‹/ælPÞ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/revert/.gitted/objects/33/c6fd981c49a2abf2971482089350bfc5cda8ea b/vendor/libgit2/tests/resources/revert/.gitted/objects/33/c6fd981c49a2abf2971482089350bfc5cda8ea deleted file mode 100644 index 683f27f0eb4aac8bdc462f3db2a6b3bc7e25d4ce..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 47 zcmV+~0MP$<0ZYosPf{>4Hev|L$ShU>qQsPx)D(rxJcW{sRE4CX#JuDTJ+5IS2>{}l FP|OLsiU0rr diff --git a/vendor/libgit2/tests/resources/revert/.gitted/objects/39/9fb3aba3d9d13f7d40a9254ce4402067ef3149 b/vendor/libgit2/tests/resources/revert/.gitted/objects/39/9fb3aba3d9d13f7d40a9254ce4402067ef3149 deleted file mode 100644 index 6cb6839d6..000000000 --- a/vendor/libgit2/tests/resources/revert/.gitted/objects/39/9fb3aba3d9d13f7d40a9254ce4402067ef3149 +++ /dev/null @@ -1,2 +0,0 @@ -x¥ŽK!]s -. á;@bŒoàzºA\0mŒ×Ïàª<äÖžC§£ç,3Ød@û ¢_ÑDò @§K6Å—5Tâ=oS$çT1«Õ.% @zªQ["-—D xÊ]Þèä½rÛy“ç<éo]Û;ï\Æ ¹]¤¶1YüåQE¥Ä¤óèÈ$l<ê,`…í‘ÅaGNÅ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/revert/.gitted/objects/3a/3ef367eaf3fe79effbfb0a56b269c04c2b59fe b/vendor/libgit2/tests/resources/revert/.gitted/objects/3a/3ef367eaf3fe79effbfb0a56b269c04c2b59fe deleted file mode 100644 index b83806e683971a8fe965a6f610a1d88b809eca80..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 33 pcmbT}WVHF1RP?o;{QtJod diff --git a/vendor/libgit2/tests/resources/revert/.gitted/objects/4b/8fcff56437e60f58e9a6bc630dd242ebf6ea2c b/vendor/libgit2/tests/resources/revert/.gitted/objects/4b/8fcff56437e60f58e9a6bc630dd242ebf6ea2c deleted file mode 100644 index c0bd3dbf98c287fd7dba1578131e1eb4c9d461cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 43 zcmbzRäªAq‹ƒ Æ:‡VYm©ÎQ ˜K -ÑpÒA’èÑП5sÈ…Šg”Jg…«€‘£õ†³ÌäU"IRÄï¹õïå'ŽŸ[og?à…½oomÏ£Ÿ½ÎçÜÛ+ ö´fõÁuÅ¥Xt=6ù'Ä/†4â‘7¸´»:¯yý˜Lü:øc’ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/revert/.gitted/objects/6b/ccd0dc58cea5ccff86014f3d64b31bd8c02a37 b/vendor/libgit2/tests/resources/revert/.gitted/objects/6b/ccd0dc58cea5ccff86014f3d64b31bd8c02a37 deleted file mode 100644 index 2664da4804fdf5d59ef1acbf33bfe1a7288f9030..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 171 zcmV;c095~Y0gaAb3c@fDg#A}?ily&Lnsl24#6yS|$R=A_Fjms&`4xKspJo_7hA)gM z4Fyzd7bP=;^A5Y{Ov6$KB&V&ifjLHH4Wet2Fk)z>c>2tb0;XniK@sXm)alS*N6L~i z!J>@Rkm<Q@Ne0Z_y7@yO8|HeQu+V@ diff --git a/vendor/libgit2/tests/resources/revert/.gitted/objects/71/eb9c2b53dbbf3c45fb28b27c850db4b7fb8011 b/vendor/libgit2/tests/resources/revert/.gitted/objects/71/eb9c2b53dbbf3c45fb28b27c850db4b7fb8011 deleted file mode 100644 index 995a1e6260d813d0d5e6cc7ec523637507d3e3ed..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 148 zcmV;F0Biqv0gcW{3IZ_@Kv8EUr>F}EmC6j_T`K7cHW*t%^!$n^aQ7E)@ypWMJU}PE z8eIfpaET}DOsS|#4HH*wh1mO8Bk5QZ`w%6oCwF-a;8N^lOhUp$QYD)lv}MMu5koPQ zger+w{2I5V!+Nvb?GMM(H{c?T=ld13i76O|k>HFDQI+4+kUzQV@|HfJiTVK1tu(=h CxJ66= diff --git a/vendor/libgit2/tests/resources/revert/.gitted/objects/72/333f47d4e83616630ff3b0ffe4c0faebcc3c45 b/vendor/libgit2/tests/resources/revert/.gitted/objects/72/333f47d4e83616630ff3b0ffe4c0faebcc3c45 deleted file mode 100644 index 1f69787036b1bafc322f9e2c48d86fb8b98c2773..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 172 zcmV;d08{^X0i}+?Z37_?0R6ryXdu?IEC)zYlutTH0}H$OESV$Xh|+$}HTXB0$7o7# z?LG}syv(6$Y_!Z7gGhEE6G&o=R5JzVCuI0#+3scZqt|&Yy?q$#qPH$2K=TG3U^(qM aI`xIb^Px8#H|6|LQ#RgjdMy97kWhv=VN(?V diff --git a/vendor/libgit2/tests/resources/revert/.gitted/objects/73/ec36fa120f8066963a0bc9105bb273dbd903d7 b/vendor/libgit2/tests/resources/revert/.gitted/objects/73/ec36fa120f8066963a0bc9105bb273dbd903d7 deleted file mode 100644 index 3c8d2c20aa494f67310b9c2b4a477c59e3ef0ce5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 31 ncmbmOEZM2szd?+!+{HP diff --git a/vendor/libgit2/tests/resources/revert/.gitted/objects/74/7726e021bc5f44b86de60e3032fd6f9f1b8383 b/vendor/libgit2/tests/resources/revert/.gitted/objects/74/7726e021bc5f44b86de60e3032fd6f9f1b8383 deleted file mode 100644 index e4d14776fd8d50d4d1d4bc1c8b222def52a5f7f2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 28 kcmbtlfW5+_?Q5KBqUk;FV@^?qw4 zNfPXB%E-y^YusChi@doDT<@)}?Ey#K?2pcM$-S+uj6-hq1ePojp$iuFNQh>$+vw0g R66W$5ok3+8<_j?2OU@pCPPPC5 diff --git a/vendor/libgit2/tests/resources/revert/.gitted/objects/77/31926a337c4eaba1e2187d90ebfa0a93659382 b/vendor/libgit2/tests/resources/revert/.gitted/objects/77/31926a337c4eaba1e2187d90ebfa0a93659382 deleted file mode 100644 index b87fa154351e192be105cffac617081a4d4ef06b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 37 tcmb7G-oh0FfcPQQAo?oN!3j%O3X{n&?~7ZVK6@ScZQ7TqSc?K zi!^ae4%mP6?21=NN)5q^cy6aj>OGwFoxf9_bxD~SYl*^(LL@~-U`54m%zg>+H>6Fo T;yx)5y{Y*2P3G$WOo=aGyg4($ diff --git a/vendor/libgit2/tests/resources/revert/.gitted/objects/87/59ad453cf01cf7daf14e2a668f8218f9a678eb b/vendor/libgit2/tests/resources/revert/.gitted/objects/87/59ad453cf01cf7daf14e2a668f8218f9a678eb deleted file mode 100644 index ab19acf83f1bc5095891a748f6bbe86e6a5202a2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 122 zcmV-=0EPc}0V^p=O;s>7G-EI{FfcPQQP4}zEJ-XWDauSLElDkAkpFN*nMK>}v}|H^ z*7P%`lW*ruJGjCM04!TDH#oXE?EnA( diff --git a/vendor/libgit2/tests/resources/revert/.gitted/objects/8b/e77695228eadd004606af0508462457961ca4a b/vendor/libgit2/tests/resources/revert/.gitted/objects/8b/e77695228eadd004606af0508462457961ca4a deleted file mode 100644 index 951917ce3d470596314d20641ff9b41b853625f1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 52 zcmV-40L%Y)0V^p=O;s>9V=y!@Ff%bxNXyJg)hnqeVQ~A;5t3&0TCr(ob5HNGKI1jY Kd*lE)+z;#ea~4_v diff --git a/vendor/libgit2/tests/resources/revert/.gitted/objects/8f/d40e13fff575b63e86af87175e70fa7fb92f80 b/vendor/libgit2/tests/resources/revert/.gitted/objects/8f/d40e13fff575b63e86af87175e70fa7fb92f80 deleted file mode 100644 index 9ff8617282a0454cda47e097d959986b65dac7ce..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 80 zcmV-W0I&ae0V^p=O;s>AVK6i>Ff%bxNXyJgHPkDqC}H5aohGUGaME}FPI=ZPWoE1; m3NH$g6d8dP6~8h2CB)y5HqDCrq(Jnh;@dZwuLA%=7#!{QJt8px diff --git a/vendor/libgit2/tests/resources/revert/.gitted/objects/97/e52d5e81f541080cd6b92829fb85bc4d81d90b b/vendor/libgit2/tests/resources/revert/.gitted/objects/97/e52d5e81f541080cd6b92829fb85bc4d81d90b deleted file mode 100644 index 416ae0f13cb7e733aaff4d3ad87fcf5b69078157..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 163 zcmV;U09^lg0i}+~4Z<)G0C~HLZ2;tB<3mD-4-Ft1u-9uP568$c&_1CCexrGehFY!5 z0B!7HbY_UrvGxkhlvQEtP-dre!9-*W`#`9t#F@l1c3uZaNx@OjA)pH0VRWewW7v}7hC8 ztbDSpN~Fd7<=Z4*BPlinE8@AGCaL#u(s%w&dDbOmW~?O&FA9+q8G#iQzcKqI#NUuM V&5HY^K=h{K+c%l70|5TdE({_AH&Flp diff --git a/vendor/libgit2/tests/resources/revert/.gitted/objects/9a/95fd974e03c5b93828ceedd28755965b5d5c60 b/vendor/libgit2/tests/resources/revert/.gitted/objects/9a/95fd974e03c5b93828ceedd28755965b5d5c60 deleted file mode 100644 index bb93a34bb0a18500e7093940c302613af24aa7d0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 122 zcmV-=0EPc}0V^p=O;s>7G-EI{FfcPQQP4}zEJ-XWDauSLElDkAkpFN*nMK>}v}|H^ z7Gh#3_FfcPQQAo?oN!3j%O3X{n&?~7ZVK6@ScZQ7TqSc?K zi!^ae4%mP6?21>&N^=u4^KvrtQo)KfvvRE;-v1C2E1xW@5@|7i`8LVdNQw=?ig<3P zN$NeE^qs#`o^?r?8Ec8ci$WwtMqow7Z_IuP@i(MRv*JD}5WT7R_D$yN0501=Pi-GV A;s5{u diff --git a/vendor/libgit2/tests/resources/revert/.gitted/objects/a8/c86221b400b836010567cc3593db6e96c1a83a b/vendor/libgit2/tests/resources/revert/.gitted/objects/a8/c86221b400b836010567cc3593db6e96c1a83a deleted file mode 100644 index 29654616efc0ca16f144710696443938b7ad738d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24 fcmbWKa&m$%w1r7#_oh*L=Zp;Xg diff --git a/vendor/libgit2/tests/resources/revert/.gitted/objects/aa/7e281435d1fe6740d712f4bcc6fe89c425bedc b/vendor/libgit2/tests/resources/revert/.gitted/objects/aa/7e281435d1fe6740d712f4bcc6fe89c425bedc deleted file mode 100644 index f0dd67d3b80fdc17ea69bd8f43145cb70c0c54f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 53 zcmbdN0z¸"!:ùMLÿ䮽š¹õ$Î \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/revert/.gitted/objects/b7/a55408832174c54708906a372a9be2ffe3649b b/vendor/libgit2/tests/resources/revert/.gitted/objects/b7/a55408832174c54708906a372a9be2ffe3649b deleted file mode 100644 index 77d4e20f92d85e096cd1b3ff0f3cd46da97bade2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 133 zcmV;00DAv;0V^p=O;s>7v0yMXFfcPQQAo?oNj20fsVHHvviqF=>hr(K_rHI0g>A|_ z;G-S+4@r>`SP|ETdCRUGPWHZ^qa>zwW83$;o$TpIij2XEzC2_7v0yMXFfcPQQAo?oNj20fsVHIa?mz!E#rzq6#LH!Sl6fyV zz5ez}2T73;SP|ETdCRUGPWHZ^qa>zwW83$;o$TpIij2XEzC2_N+Q7GfK0hh}a+<_y_=9{k6P zt=2NYtn@K@N+3eKAjLqaDS4a4dU2eI+(JZa%wBTTPW^IE`v63AAqGikjmepqP`vT0 zXJaYKw_ADs94dZ}t#!D|$z9;FwR*H2zS5+B>sCwb?Pz&?##XPe*no@m!Fsr8)LKnC cLr40DLd{~X3C=P$I7%%)+{<{WH)U8+R&rKW3IG5A diff --git a/vendor/libgit2/tests/resources/revert/.gitted/objects/d1/d403d22cbe24592d725f442835cf46fe60c8ac b/vendor/libgit2/tests/resources/revert/.gitted/objects/d1/d403d22cbe24592d725f442835cf46fe60c8ac deleted file mode 100644 index 2190bb449df8712a1b6d84bcbb22ef3bcc1fffb1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 164 zcmV;V09*ff0i}*f3IZ_@06pgw{Q)IgX8{o}{=g4p=`aIkGGrot-}nY^MIDMtt=4sb zRPHo75kwmhHFr))VRb@nx%1ovWo7V@WGSSK_L1$O(>5ScL1To>Rs<7@%Z>{)UXXSM zi!GGMbBxHsdn~QPBY#5A@LXCw+6Gse_DA=+rrwTL#wE3S1ECxWW#9~ diff --git a/vendor/libgit2/tests/resources/revert/.gitted/objects/dd/9a159c89509e73fd37d6af99619994cf7dfc06 b/vendor/libgit2/tests/resources/revert/.gitted/objects/dd/9a159c89509e73fd37d6af99619994cf7dfc06 deleted file mode 100644 index ed80d0aa5ae872a9a5f636eb99cd6bbc3b9e2ba2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 133 zcmV;00DAv;0V^p=O;s>7v0yMXFfcPQQAo?oNj20fsVHG6DOY=-xF_CaNA5E|1EatB z^QD`ckrWw$6>)8tx9rN{WbgYqN@8j^wtc_b$)1j+$QZ2X%R}}<1{b;#eml;UY@08y np{=ev2T73`SP_5ppRYZky=}3}_AxbHuZ*0WlJgD#b|^d`üIÝbæ +h”äû™8y@À§*ª –Üj]œÑFWBÂì ÏD2¡ §(4Q˜#N(,²ckÞc×Û€0«³âÔSqLè1Ë”‚õ6”ä]Ê,ž$`2ñc,­Ã›|Å.p]ZÝÚ žuWØk]so[+ã”[}bbf´|†'dD³«ûСD˜‹~jpüêGc®ËºA¿ü–üûÔÉ|ki`ö \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/revert/.gitted/objects/ea/392a157085bc32daccd59aa1998fe2f5fb9fc0 b/vendor/libgit2/tests/resources/revert/.gitted/objects/ea/392a157085bc32daccd59aa1998fe2f5fb9fc0 deleted file mode 100644 index 1451a6ac4437aa028ffb412d8ec2e6c74e35f427..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 134 zcmV;10D1p-0V^p=O;s>7v0yMXFfcPQQAo?oNj20fsVHH1cWmuxeVaE6PTf26k8$JV zCRM$2vyl`TffaFWn78c8;biaoIZ9$`H@1Dh+sU4eq{tYo=*vU)Lk1VR5`H_*m28_Y ouc583I|oUT8CVg2^q;Rip}lRf%l0ufUayRtoRaen0PJ}`8M`Jw5&!@I diff --git a/vendor/libgit2/tests/resources/revert/.gitted/objects/eb/b03002cee5d66c7732dd06241119fe72ab96a5 b/vendor/libgit2/tests/resources/revert/.gitted/objects/eb/b03002cee5d66c7732dd06241119fe72ab96a5 deleted file mode 100644 index 802125ebb..000000000 --- a/vendor/libgit2/tests/resources/revert/.gitted/objects/eb/b03002cee5d66c7732dd06241119fe72ab96a5 +++ /dev/null @@ -1,2 +0,0 @@ -x¥Á 1E=§Ši@I6&AÄ‹Ø@6;ÃÌdGlßXƒ‡Ÿwø¯HkUÁa` \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/revert/.gitted/objects/ee/c6adcb2f3ceca0cadeccfe01b19382252ece9b b/vendor/libgit2/tests/resources/revert/.gitted/objects/ee/c6adcb2f3ceca0cadeccfe01b19382252ece9b deleted file mode 100644 index f59f3d48de922dd711cc58d42a63afb030a740eb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 66 zcmV-I0KNZs0ZYosPf{>6vtUqk%gjkt$j?hvg~Yu4l8n?Mh18VH Y61YlS;&26U28!KC&Ol-U04Q}g8{1YKZU6uP diff --git a/vendor/libgit2/tests/resources/revert/.gitted/objects/f4/e107c230d08a60fb419d19869f1f282b272d9c b/vendor/libgit2/tests/resources/revert/.gitted/objects/f4/e107c230d08a60fb419d19869f1f282b272d9c deleted file mode 100644 index 029da1ba91b94af04b1bccaa81bbfc91df57e807..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 30 lcmb7&`jx>HxN}3w!_o diff --git a/vendor/libgit2/tests/resources/revert/.gitted/refs/heads/master b/vendor/libgit2/tests/resources/revert/.gitted/refs/heads/master deleted file mode 100644 index 180f407e3..000000000 --- a/vendor/libgit2/tests/resources/revert/.gitted/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -2d440f2b3147d3dc7ad1085813478d6d869d5a4d diff --git a/vendor/libgit2/tests/resources/revert/.gitted/refs/heads/merges b/vendor/libgit2/tests/resources/revert/.gitted/refs/heads/merges deleted file mode 100644 index 6533a947b..000000000 --- a/vendor/libgit2/tests/resources/revert/.gitted/refs/heads/merges +++ /dev/null @@ -1 +0,0 @@ -5acdc74af27172ec491d213ee36cea7eb9ef2579 diff --git a/vendor/libgit2/tests/resources/revert/.gitted/refs/heads/merges-branch b/vendor/libgit2/tests/resources/revert/.gitted/refs/heads/merges-branch deleted file mode 100644 index febb29c44..000000000 --- a/vendor/libgit2/tests/resources/revert/.gitted/refs/heads/merges-branch +++ /dev/null @@ -1 +0,0 @@ -13ee9cd5d8e1023c218e0e1ea684ec0c582b5050 diff --git a/vendor/libgit2/tests/resources/revert/.gitted/refs/heads/reverted-branch b/vendor/libgit2/tests/resources/revert/.gitted/refs/heads/reverted-branch deleted file mode 100644 index 16bb7a2d7..000000000 --- a/vendor/libgit2/tests/resources/revert/.gitted/refs/heads/reverted-branch +++ /dev/null @@ -1 +0,0 @@ -52c95c4264245469a0617e289a7d737f156826b4 diff --git a/vendor/libgit2/tests/resources/revert/.gitted/refs/heads/two b/vendor/libgit2/tests/resources/revert/.gitted/refs/heads/two deleted file mode 100644 index 69d76cfad..000000000 --- a/vendor/libgit2/tests/resources/revert/.gitted/refs/heads/two +++ /dev/null @@ -1 +0,0 @@ -75ec9929465623f17ff3ad68c0438ea56faba815 diff --git a/vendor/libgit2/tests/resources/revert/file1.txt b/vendor/libgit2/tests/resources/revert/file1.txt deleted file mode 100644 index 84b225940..000000000 --- a/vendor/libgit2/tests/resources/revert/file1.txt +++ /dev/null @@ -1,14 +0,0 @@ -!File one! -!File one! -File one! -File one -File one -File one -File one -File one -File one -File one -File one! -!File one! -!File one! -!File one! diff --git a/vendor/libgit2/tests/resources/revert/file2.txt b/vendor/libgit2/tests/resources/revert/file2.txt deleted file mode 100644 index acb5747b3..000000000 --- a/vendor/libgit2/tests/resources/revert/file2.txt +++ /dev/null @@ -1,16 +0,0 @@ -File two -File two -File two -File two -File two -File two -File two -File two -File two -File two -File two -File two -File two -File two -File two -File two diff --git a/vendor/libgit2/tests/resources/revert/file3.txt b/vendor/libgit2/tests/resources/revert/file3.txt deleted file mode 100644 index b0330597f..000000000 --- a/vendor/libgit2/tests/resources/revert/file3.txt +++ /dev/null @@ -1,16 +0,0 @@ -File three -File three -File three -File three -File three -File three -File three -File three -File three -File three -File three -File three -File three -File three -File three -File three diff --git a/vendor/libgit2/tests/resources/revert/file6.txt b/vendor/libgit2/tests/resources/revert/file6.txt deleted file mode 100644 index 5c0cd5d56..000000000 --- a/vendor/libgit2/tests/resources/revert/file6.txt +++ /dev/null @@ -1,14 +0,0 @@ -File six, actually! -File four! -File four! -File four! -File four! -File four! -File four! -File four! -File four! -File four! -File four! -File four! -File four! -File four! diff --git a/vendor/libgit2/tests/resources/shallow.git/HEAD b/vendor/libgit2/tests/resources/shallow.git/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/vendor/libgit2/tests/resources/shallow.git/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/vendor/libgit2/tests/resources/shallow.git/config b/vendor/libgit2/tests/resources/shallow.git/config deleted file mode 100644 index a88b74b69..000000000 --- a/vendor/libgit2/tests/resources/shallow.git/config +++ /dev/null @@ -1,8 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = true - ignorecase = true - precomposeunicode = false -[remote "origin"] - url = file://testrepo.git diff --git a/vendor/libgit2/tests/resources/shallow.git/objects/pack/pack-706e49b161700946489570d96153e5be4dc31ad4.idx b/vendor/libgit2/tests/resources/shallow.git/objects/pack/pack-706e49b161700946489570d96153e5be4dc31ad4.idx deleted file mode 100644 index bfc7d24ff4178cdde4ff06b36ace5dc71e6d7edf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1324 zcmexg;-AdGz`z8=v<8eo3kCv%{6;Qj2I?KDm<8x}N-!%>KQ%BL&>VIk=AaSg1e!bI zv4p_=uf1JqtU_0s^-B0NHCl{&&YDfX=Ka!fsjb(GZ;J|_JpL87LFtU^&gOk)+ilo8 z?#$Vj<~#U=IsG@>yF%Ge;oI7R z{ubLdnMd1|`i?xlcWj?&@;dv`_DnUy^Ijt;fofp8vS~tls#F zoaLp=h1)FO31v*P;+vQv&7)at4b1w${L6S3NS6R{1CSjFjBg$w{SJsv0oilKH*)Qo rI*((~)L*l@&xOAhtS?G@u-*99hsWiQkG`n5FZS{O$3sUJO4b7af1;4_ diff --git a/vendor/libgit2/tests/resources/shallow.git/objects/pack/pack-706e49b161700946489570d96153e5be4dc31ad4.pack b/vendor/libgit2/tests/resources/shallow.git/objects/pack/pack-706e49b161700946489570d96153e5be4dc31ad4.pack deleted file mode 100644 index ccc6932fc403443b47b4bb7f4e1ea1245ce7193e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 791 zcmWG=boORoU|<4b&Z)c=bLO7D$jM~L)9~=S-$d3a+dPB0m70_-9A|m&Wj=o@@_V?< z!R_<;|81PTiY*jJm(E%f$cc{+v7Y>Avgx<|!m}v`$byd@lX{-SF$F zJinipzGF6Mwf{I>5a^&@-z;WB9=Gpyt!0r*J^oGRQ5D(rZk76n6GdtlW@`3T|8H~B zzi{{XW7~a}XBt{Ie4V$%^Q@%sPchYs#~rrf`a;eESD)>BwV~GOWpDG061|zCk+Wu* zE^Jav2tOHkCTLy#J~uI!)cM6zZksOv3j+uj2V}A=z)oy3l^v zIQd`J_wu6m*6(|)1EW!q5nH}N$0@b z3)m~>7@HUv7#jw16qS~IEKQAAn6u(TZmwf}ckb*ni{EL^nFWnZWzfV`I=F^Yx8*EFB1C~~*8-Y=WpKqu)NCIA|x{|%QE6* z(Zy}e-{Wfnf55t;MI!@vnxpqyR$FXSYuUXya!e0y47bQLb0F@qk-v9sr diff --git a/vendor/libgit2/tests/resources/shallow.git/packed-refs b/vendor/libgit2/tests/resources/shallow.git/packed-refs deleted file mode 100644 index 97eed743b..000000000 --- a/vendor/libgit2/tests/resources/shallow.git/packed-refs +++ /dev/null @@ -1,2 +0,0 @@ -# pack-refs with: peeled -a65fedf39aefe402d3bb6e24df4d4f5fe4547750 refs/heads/master diff --git a/vendor/libgit2/tests/resources/shallow.git/refs/.gitkeep b/vendor/libgit2/tests/resources/shallow.git/refs/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/vendor/libgit2/tests/resources/shallow.git/shallow b/vendor/libgit2/tests/resources/shallow.git/shallow deleted file mode 100644 index 9536ad89c..000000000 --- a/vendor/libgit2/tests/resources/shallow.git/shallow +++ /dev/null @@ -1 +0,0 @@ -be3563ae3f795b2b4353bcce3a527ad0a4f7f644 diff --git a/vendor/libgit2/tests/resources/short_tag.git/HEAD b/vendor/libgit2/tests/resources/short_tag.git/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/vendor/libgit2/tests/resources/short_tag.git/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/vendor/libgit2/tests/resources/short_tag.git/config b/vendor/libgit2/tests/resources/short_tag.git/config deleted file mode 100644 index a4ef456cb..000000000 --- a/vendor/libgit2/tests/resources/short_tag.git/config +++ /dev/null @@ -1,5 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = true - logallrefupdates = true diff --git a/vendor/libgit2/tests/resources/short_tag.git/index b/vendor/libgit2/tests/resources/short_tag.git/index deleted file mode 100644 index 87fef784703ae391c5d301968bb187364d20ccd0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 104 zcmZ?q402{*U|<4b#(+s*?HL|&CIV?|aj)CE zZ@PHR*}GeFU3t`vLr;2wCo(Xn<>vzp0fAXhtb8A;+I(!OIK;A$z1&=FV+soZLw_OB diff --git a/vendor/libgit2/tests/resources/short_tag.git/objects/4a/5ed60bafcf4638b7c8356bd4ce1916bfede93c b/vendor/libgit2/tests/resources/short_tag.git/objects/4a/5ed60bafcf4638b7c8356bd4ce1916bfede93c deleted file mode 100644 index aeb4e4b0b8c9bf515e183528e050859122bed9d4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 169 zcmV;a09OBa0iBI84#F@DMVWgFUw|rUQzb|Uv2X!KHp_8~p-rmBbl~(9j==W*8~&p_ zO`^~^yVHdkTw!jaea z7tW|7mLiyH%F_vK+u2}3+cmH^-k55$TUYu2hw9362FgiMlB59;6bH~dDvU_avLQpB XRdT`+A{ScZx1bjuV_kg!HtJD_!TH60#di&ULDsVh9jLv zWFqgc6cF_)Q1i=U;7KkmDoV{OiBHSSNd=k0z~KAc$pe`Nn#aT-az6##ypW*F`m$Fo zUbC>iSYdOp_4_>47yJx7AamkVQgc#EQh_?4=J+GiQ1gJcp}3FFRnN&~>xJgKAKbXk z%bh8?J@@=VDF)u${FKbJ%+wTw17ZGz(NO;upqVEZdRgq`u7b{)A1C%rE59K7XIh1^U_m`A?|Vk8UgY*goe29!7ViNESBv{GF3X)zVJqpP}dQ)q6GhH zw{8Y$RP(^DMD;!>JRd{-52m61Pe(J~YC_)gLV15rjk~9{;`{dm@V;JfX$6A}n)#T) z0grdI@BsP^C42>fW{JIco^)l+_MOT3UmX^382%KEV&I3GpO;z=3t`{yuDTHSLTG4s z{6;fRcEXNBbGsK$F}ZlmPMXtp)uO!Un?-QV|hyJa@ELC!|CwM8M63 z<}{?>1)0|ZH5W`n&8mo{4GP2QJ06lGx$fw~tnSQ$Kw7n?gw TEZ4S-cXDQ^y6q>LzRLvwsK7@X diff --git a/vendor/libgit2/tests/resources/status/.gitted/info/exclude b/vendor/libgit2/tests/resources/status/.gitted/info/exclude deleted file mode 100644 index 0c4042a6a..000000000 --- a/vendor/libgit2/tests/resources/status/.gitted/info/exclude +++ /dev/null @@ -1,8 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ -ignored* - diff --git a/vendor/libgit2/tests/resources/status/.gitted/logs/HEAD b/vendor/libgit2/tests/resources/status/.gitted/logs/HEAD deleted file mode 100644 index 7b95b3cf1..000000000 --- a/vendor/libgit2/tests/resources/status/.gitted/logs/HEAD +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 0017bd4ab1ec30440b17bae1680cff124ab5f1f6 Jason Penny 1308050070 -0400 commit (initial): initial -0017bd4ab1ec30440b17bae1680cff124ab5f1f6 735b6a258cd196a8f7c9428419b02c1dca93fd75 Jason Penny 1308954538 -0400 commit: add subdir -735b6a258cd196a8f7c9428419b02c1dca93fd75 26a125ee1bfc5df1e1b2e9441bbe63c8a7ae989f nulltoken 1319911544 +0200 commit: Add a file which name should appear before the "subdir/" folder while being dealt with by the treewalker diff --git a/vendor/libgit2/tests/resources/status/.gitted/logs/refs/heads/master b/vendor/libgit2/tests/resources/status/.gitted/logs/refs/heads/master deleted file mode 100644 index 7b95b3cf1..000000000 --- a/vendor/libgit2/tests/resources/status/.gitted/logs/refs/heads/master +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 0017bd4ab1ec30440b17bae1680cff124ab5f1f6 Jason Penny 1308050070 -0400 commit (initial): initial -0017bd4ab1ec30440b17bae1680cff124ab5f1f6 735b6a258cd196a8f7c9428419b02c1dca93fd75 Jason Penny 1308954538 -0400 commit: add subdir -735b6a258cd196a8f7c9428419b02c1dca93fd75 26a125ee1bfc5df1e1b2e9441bbe63c8a7ae989f nulltoken 1319911544 +0200 commit: Add a file which name should appear before the "subdir/" folder while being dealt with by the treewalker diff --git a/vendor/libgit2/tests/resources/status/.gitted/objects/00/17bd4ab1ec30440b17bae1680cff124ab5f1f6 b/vendor/libgit2/tests/resources/status/.gitted/objects/00/17bd4ab1ec30440b17bae1680cff124ab5f1f6 deleted file mode 100644 index b256d95a3..000000000 --- a/vendor/libgit2/tests/resources/status/.gitted/objects/00/17bd4ab1ec30440b17bae1680cff124ab5f1f6 +++ /dev/null @@ -1,2 +0,0 @@ -xA E]sŠ¹€fh)‰1]»ò -#SÀTºðö¶Wp÷ßK^~¨9§šÜ¡-"àC'Ø…)FvõbƒvÉ Þ"¶wŽŽ¼EÅk{Ö®ü©nRÊίÞû6ã#sšO¡æ 舄pDƒ¨6»6ù3W©¤–xV?¨Å9é \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/status/.gitted/objects/06/1d42a44cacde5726057b67558821d95db96f19 b/vendor/libgit2/tests/resources/status/.gitted/objects/06/1d42a44cacde5726057b67558821d95db96f19 deleted file mode 100644 index 82e02cb0e0fda076e0929858a5c7b56e75be70fe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 44 zcmb!i*lf6ud?x}LtB{-@7)K4oI)V&>ch0RCqU&j0`b diff --git a/vendor/libgit2/tests/resources/status/.gitted/objects/19/d9cc8584ac2c7dcf57d2680375e80f099dc481 b/vendor/libgit2/tests/resources/status/.gitted/objects/19/d9cc8584ac2c7dcf57d2680375e80f099dc481 deleted file mode 100644 index 2d5e711b97ec5874dbc18b2ad235530c86652706..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 22 dcmbÀægêìÏŸüÕÛ‰ùImú|½jñ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/status/.gitted/objects/2b/d0a343aeef7a2cf0d158478966a6e587ff3863 b/vendor/libgit2/tests/resources/status/.gitted/objects/2b/d0a343aeef7a2cf0d158478966a6e587ff3863 deleted file mode 100644 index d10ca636b6bf5f66bce633362d871d17d9a292c6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 56 zcmV-80LTA$0ZYosPf{>3VkpVTELKR%%t=)M(#aW#dFiPs3YmEdNkxfy$r%cXc_|9H OiNz(UMO*-@y%7?c&=$P_ diff --git a/vendor/libgit2/tests/resources/status/.gitted/objects/32/504b727382542f9f089e24fddac5e78533e96c b/vendor/libgit2/tests/resources/status/.gitted/objects/32/504b727382542f9f089e24fddac5e78533e96c deleted file mode 100644 index 7fca67be8d55dd4bdcd0f6f4589cd13a2b191e7b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 31 ncmb4HDNF`FfcPQQAjQ=DoV{OiBHSSNo81Yua4^w!;#J-GLiRJ z3W$0YsQKkV)q&*WQ&MwMOHxx9LV_;q%U-p3&BFR(h0Vd%@AFh&@I%$*=BH$)Wu~S; z40P3Va@l&J`R)fduJdwdN^Z|RzfcOQu(%{K9jGihBQY;MwV1&uz`LlpDMWuh$2^t4 zw~jtwFl!Z?=MPxu~*o`{sMm8q@Vm41hqP7_5k4 dmHIMA*9;E@{@e96Gk2N&STI$i902&UwRWHzr-=Xn diff --git a/vendor/libgit2/tests/resources/status/.gitted/objects/45/2e4244b5d083ddf0460acf1ecc74db9dcfa11a b/vendor/libgit2/tests/resources/status/.gitted/objects/45/2e4244b5d083ddf0460acf1ecc74db9dcfa11a deleted file mode 100644 index 5b47461e9c410699899651eebf9316fdc477aab7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 30 mcmb!i*le?46-ud~{n{-@7)K4oI)Ud{Oo0QpJ|NdN!< diff --git a/vendor/libgit2/tests/resources/status/.gitted/objects/54/52d32f1dd538eb0405e8a83cc185f79e25e80f b/vendor/libgit2/tests/resources/status/.gitted/objects/54/52d32f1dd538eb0405e8a83cc185f79e25e80f deleted file mode 100644 index a72dff646b20ab48a518cc175462fdaabe794fc7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 29 kcmbiQ^texKq}F2E(aNh>WK98n>%;f|A?{+u(P O5^Q@&b7Nmdl1VU_L{01f diff --git a/vendor/libgit2/tests/resources/status/.gitted/objects/75/6e27627e67bfbc048d01ece5819c6de733d7ea b/vendor/libgit2/tests/resources/status/.gitted/objects/75/6e27627e67bfbc048d01ece5819c6de733d7ea deleted file mode 100644 index 8f3fa89e5bb2ca0906ce05d583e51f763179aed9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 301 zcmV+|0n+|>0V^p=O;s>4G-EI{FfcPQQAjQ=DoV{OiBHSSNo81Yua4^w!;#J-GLiRJ z3W$0YsQKkV)q&*WQ&MwMOHxx9LV_;q%U-p3&BFR(h0Vd%@AFh&@I%$*=BH$)Wu~S; z40P3Va@l&J`R)fduJdwdN^Z|RzfcOQu(%{K9jGihBQY;MwV1&uz`LlpDMWuh$2^t4 zw~jt4fIy+RG$|#sh+&obGDp`84+Z|)^))khnf+KWRihjLBsHeBni!R! diff --git a/vendor/libgit2/tests/resources/status/.gitted/objects/90/6ee7711f4f4928ddcb2a5f8fbc500deba0d2a8 b/vendor/libgit2/tests/resources/status/.gitted/objects/90/6ee7711f4f4928ddcb2a5f8fbc500deba0d2a8 deleted file mode 100644 index bb732b08e00e261d2c586ef82bbc5a351fc2714d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 46 zcmV+}0MY+=0ZYosPf{?oU??t0OixXTPtHipOHVD1&&^NCOv?lcq-Ex$a^aN(05gdg E-^4%@-v9sr diff --git a/vendor/libgit2/tests/resources/status/.gitted/objects/90/b8c29d8ba39434d1c63e1b093daaa26e5bd972 b/vendor/libgit2/tests/resources/status/.gitted/objects/90/b8c29d8ba39434d1c63e1b093daaa26e5bd972 deleted file mode 100644 index 7a96618ff102eba85f7faea1f60823ea0024b72e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 41 xcmbLmr~m0Qo==$=e6O<`005$93d{fi diff --git a/vendor/libgit2/tests/resources/status/.gitted/objects/a6/191982709b746d5650e93c2acf34ef74e11504 b/vendor/libgit2/tests/resources/status/.gitted/objects/a6/191982709b746d5650e93c2acf34ef74e11504 deleted file mode 100644 index cc1f377b30ef420dc1a3eda12a85774b729c6504..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 37 tcmb!i-5^Jo1}`keOh?esr=#`7r?!<5flssJkl5G()y diff --git a/vendor/libgit2/tests/resources/status/.gitted/objects/a6/be623522ce87a1d862128ac42672604f7b468b b/vendor/libgit2/tests/resources/status/.gitted/objects/a6/be623522ce87a1d862128ac42672604f7b468b deleted file mode 100644 index c47298347d7c1f469623d8ce4caddd8794e40027..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 46 zcmb7GGs6`FfcPQQAjQ=DoV{OiBHSSNo5FL^WfqcLD!{U{`prd zY+J^ZEXi&RRhN>QlUkCR0#PT?ae~z(dQs|zcT+rfv{xsjL@Go;)#c`=WTs`p6fTpL aY$}*tk{cHA(njmN$@`LrqAUOlPB4dZg)}q( diff --git a/vendor/libgit2/tests/resources/status/.gitted/objects/d4/27e0b2e138501a3d15cc376077a3631e15bd46 b/vendor/libgit2/tests/resources/status/.gitted/objects/d4/27e0b2e138501a3d15cc376077a3631e15bd46 deleted file mode 100644 index 0b3611ae4c9dc635dafd5dc9560cbc2ff5e92198..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 38 ucmbZC&ODsUReNf+YxvG diff --git a/vendor/libgit2/tests/resources/status/.gitted/objects/e8/ee89e15bbe9b20137715232387b3de5b28972e b/vendor/libgit2/tests/resources/status/.gitted/objects/e8/ee89e15bbe9b20137715232387b3de5b28972e deleted file mode 100644 index cfc2413d5ee7b0e6bbe13ce5dcfdb3c5767e8176..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 38 ucmb`p8uz^f~D5PKHbOxRn4)!V!A_ diff --git a/vendor/libgit2/tests/resources/status/.gitted/objects/e9/b9107f290627c04d097733a10055af941f6bca b/vendor/libgit2/tests/resources/status/.gitted/objects/e9/b9107f290627c04d097733a10055af941f6bca deleted file mode 100644 index 1266d3eac711499057f4a9a42b34b130bbc48fa2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 37 tcmb{)$KSWp-}9`eu4k|R=`)_Kn}T;R+?V0m1ONwH4y^zH diff --git a/vendor/libgit2/tests/resources/status/.gitted/objects/ed/062903b8f6f3dccb2fa81117ba6590944ef9bd b/vendor/libgit2/tests/resources/status/.gitted/objects/ed/062903b8f6f3dccb2fa81117ba6590944ef9bd deleted file mode 100644 index 8fa8c170741c62e1169b35b5eecd7f1dcafaceb4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 42 ycmb4F=r^r$ShV!%gjkt0Mf}BiFxU%DGHf+3b~2JC8SOTvLu;?`=J4eDP*<*dE;n62`k)BYy+6Fc>Nra9wz(d_-EKB)6_f kRq%Rq_qhtM=fz>Ee_l3S@LMBvbgC8SC8;G(PQUH}02WnsssI20 diff --git a/vendor/libgit2/tests/resources/sub.git/logs/HEAD b/vendor/libgit2/tests/resources/sub.git/logs/HEAD deleted file mode 100644 index f636268f6..000000000 --- a/vendor/libgit2/tests/resources/sub.git/logs/HEAD +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 b7a59b3f4ea13b985f8a1e0d3757d5cd3331add8 Edward Thomson 1442522322 -0400 commit (initial): Initial revision diff --git a/vendor/libgit2/tests/resources/sub.git/logs/refs/heads/master b/vendor/libgit2/tests/resources/sub.git/logs/refs/heads/master deleted file mode 100644 index f636268f6..000000000 --- a/vendor/libgit2/tests/resources/sub.git/logs/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 b7a59b3f4ea13b985f8a1e0d3757d5cd3331add8 Edward Thomson 1442522322 -0400 commit (initial): Initial revision diff --git a/vendor/libgit2/tests/resources/sub.git/objects/10/ddd6d257e01349d514541981aeecea6b2e741d b/vendor/libgit2/tests/resources/sub.git/objects/10/ddd6d257e01349d514541981aeecea6b2e741d deleted file mode 100644 index a095b3fb822e3cde46d5d39ff21528c1e1fc70cf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 22 ecmb7F=sF|FfcPQQP4}zEJ-XWDauSLElDkA5YKY$pYq^UP|>;c z!`Yv?vtOS2rVLe?n3rFYky@lzQc=PnaQE7!@CU-4S4Bc38`r&gm91AI3sshunUjiB mjfnveC={0_F?TvpB(Aj# zP#zDX=M3Jai6%!5lQ)JGd5n0DNmG`}854s;^h*@sHCFC$qfh7rkCp4j4d%StA6;un toi|>_DRI4kvR0$kMr$}qE2Y@&J|6jxgt)gdN_axg@3Iwc;tNWyL3_OFJ+1%% diff --git a/vendor/libgit2/tests/resources/sub.git/objects/d0/ee23c41b28746d7e822511d7838bce784ae773 b/vendor/libgit2/tests/resources/sub.git/objects/d0/ee23c41b28746d7e822511d7838bce784ae773 deleted file mode 100644 index d9bb9c84d8053600309e1bd6393d26b61c47bd78..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 54 zcmV-60LlM&0V^p=O;s>9XD~D{Ff%bxNY2R2Nzp5*C}9w|d+k#A17XjrA|aBE>)yP| M)+><(08@Jq$s_(2XaE2J diff --git a/vendor/libgit2/tests/resources/sub.git/refs/heads/master b/vendor/libgit2/tests/resources/sub.git/refs/heads/master deleted file mode 100644 index 0e4d6e2a7..000000000 --- a/vendor/libgit2/tests/resources/sub.git/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -b7a59b3f4ea13b985f8a1e0d3757d5cd3331add8 diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/HEAD b/vendor/libgit2/tests/resources/submod2/.gitted/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/config b/vendor/libgit2/tests/resources/submod2/.gitted/config deleted file mode 100644 index abc420734..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/config +++ /dev/null @@ -1,20 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true -[submodule "sm_missing_commits"] - url = ../submod2_target -[submodule "sm_unchanged"] - url = ../submod2_target -[submodule "sm_changed_file"] - url = ../submod2_target -[submodule "sm_changed_index"] - url = ../submod2_target -[submodule "sm_changed_head"] - url = ../submod2_target -[submodule "sm_changed_untracked_file"] - url = ../submod2_target -[submodule "sm_added_and_uncommited"] - url = ../submod2_target diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/description b/vendor/libgit2/tests/resources/submod2/.gitted/description deleted file mode 100644 index 498b267a8..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/index b/vendor/libgit2/tests/resources/submod2/.gitted/index deleted file mode 100644 index 0c17e8629df1f457dd55db2b43f79442955e8e18..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 944 zcmZ?q402{*U|<4b?f}*sHb9yIM)NT+urS;{zk`9HaR~zh<5!@R2vBJ`ryE~%&YlfX zb`GwS4{KR1SCTu$$H1+Zo>`KcpHiBWS`0D-2m)BI0gXV=5c5v|KsApc{^x{6Q6(2w zXvjQT&Dgi%ep+SBHEss3AXi5hUst`7iV~0+AP~TM{W>xYb)Phvc`DUQjvfw^T@|%) zMUv?G4H0$IuCQEV5Y8$sE{RW!PsuFOPtMOPNzE%kxbylcsJUPoYOW}nxl&H&cg9?h z{;3q5Iy>(1+cOm}-fgL1;D(x;mYI_ZG6V=<;RmCk=4CN3JOIkV!jWN>2gB43T@ATw zW&fhvOf!S{LY7}Wz#v|n8=shxlA02qn3ob?nwOlPo10mZngTZW`dT0b3I{L^G572y zqRiz7nwy-Fn3oPT8R}M`IhfoX_&=i*5=FC#S(>b~_*^T0IJJa(eY6F_obW?o8a z1=ydvpyq*TsCiq7GEWl8ywbdqqQvBEn9qU!=75?DrXl8@5hKc6A)vXrnZ?DKdFk!nhT~O=AMlu%3L0xxxm 1342559771 -0700 commit (initial): Initial commit -14fe9ccf104058df25e0a08361c4494e167ef243 a9104bf89e911387244ef499413960ba472066d9 Russell Belfer 1342559831 -0700 commit: Adding a submodule -a9104bf89e911387244ef499413960ba472066d9 5901da4f1c67756eeadc5121d206bec2431f253b Russell Belfer 1342560036 -0700 commit: Updating submodule -5901da4f1c67756eeadc5121d206bec2431f253b 7484482eb8db738cafa696993664607500a3f2b9 Russell Belfer 1342560288 -0700 commit: Adding a bunch more test content diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/logs/refs/heads/master b/vendor/libgit2/tests/resources/submod2/.gitted/logs/refs/heads/master deleted file mode 100644 index 2cf2ca74d..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/logs/refs/heads/master +++ /dev/null @@ -1,4 +0,0 @@ -0000000000000000000000000000000000000000 14fe9ccf104058df25e0a08361c4494e167ef243 Russell Belfer 1342559771 -0700 commit (initial): Initial commit -14fe9ccf104058df25e0a08361c4494e167ef243 a9104bf89e911387244ef499413960ba472066d9 Russell Belfer 1342559831 -0700 commit: Adding a submodule -a9104bf89e911387244ef499413960ba472066d9 5901da4f1c67756eeadc5121d206bec2431f253b Russell Belfer 1342560036 -0700 commit: Updating submodule -5901da4f1c67756eeadc5121d206bec2431f253b 7484482eb8db738cafa696993664607500a3f2b9 Russell Belfer 1342560288 -0700 commit: Adding a bunch more test content diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/HEAD b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/config b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/config deleted file mode 100644 index 2d0583e99..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/config +++ /dev/null @@ -1,13 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - worktree = ../../../sm_added_and_uncommited - ignorecase = true -[remote "origin"] - fetch = +refs/heads/*:refs/remotes/origin/* - url = /Users/rb/src/libgit2/tests-clar/resources/submod2_target -[branch "master"] - remote = origin - merge = refs/heads/master diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/description b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/description deleted file mode 100644 index 498b267a8..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/index b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/index deleted file mode 100644 index 65140a51097551874bfd47c68c0b7cd52751c7a0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 192 zcmZ?q402{*U|<5_0M;8eK$-zY^D!{6Fx)=BnSr5k2?GP;SD=NB2J7Ek~B;>VZr z-=W*rTb(&1>aFX=z!l``=;G_DS5i>|G6Mu)=D=vEd0WuT%dD99`_`=`OPk7jU0WiXFD)}CHNGT2J~uxlGp!P29{X{_l`mH5U)hp1IZi^iI7`7`MJWKpE;#G} diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/info/exclude b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/info/exclude deleted file mode 100644 index a5196d1be..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/info/exclude +++ /dev/null @@ -1,6 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/logs/HEAD b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/logs/HEAD deleted file mode 100644 index 53753e7dd..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/logs/HEAD +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 480095882d281ed676fe5b863569520e54a7d5c0 Russell Belfer 1342560316 -0700 clone: from /Users/rb/src/libgit2/tests-clar/resources/submod2_target diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/logs/refs/heads/master b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/logs/refs/heads/master deleted file mode 100644 index 53753e7dd..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/logs/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 480095882d281ed676fe5b863569520e54a7d5c0 Russell Belfer 1342560316 -0700 clone: from /Users/rb/src/libgit2/tests-clar/resources/submod2_target diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/logs/refs/remotes/origin/HEAD b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/logs/refs/remotes/origin/HEAD deleted file mode 100644 index 53753e7dd..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/logs/refs/remotes/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 480095882d281ed676fe5b863569520e54a7d5c0 Russell Belfer 1342560316 -0700 clone: from /Users/rb/src/libgit2/tests-clar/resources/submod2_target diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/objects/06/362fe2fdb7010d0e447b4fb450d405420479a1 b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/objects/06/362fe2fdb7010d0e447b4fb450d405420479a1 deleted file mode 100644 index f4b7094c52b2b13a955016da7ed894453ab9813c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 55 zcmV-70LcG%0V^p=O;s?qU@$Z=Ff%bx2y%6F@paWJsVHHn;4Pm1^~H}b<-bF>ueUmL NNYq=`3jkt>5$jr-7%cz* diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/objects/0e/6a3ca48bd47cfe67681acf39aa0b10a0b92484 b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/objects/0e/6a3ca48bd47cfe67681acf39aa0b10a0b92484 deleted file mode 100644 index 56c845e49de66164d68d3f7439e2aedcb220c498..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 53 zcmV-50LuS(0ZYosPf{>3U`ELH%bM1{1>oK%I9e1+Wnl+3hBh0HvK;?g7_r!*(E Ln2QSlfR+#vlJ6KL diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/objects/17/d0ece6e96460a06592d9d9d000de37ba4232c5 b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/objects/17/d0ece6e96460a06592d9d9d000de37ba4232c5 deleted file mode 100644 index bd179b5f5406f12f948b97d871c763cc0e10b06f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 93 zcmV-j0HXhR0V^p=O;xZkU@$Z=Ff%bx2y%6F@paWJsVHHn;4Pm1^~H}b<-bF>ueUmL zNYq=`3#uwDGbc5^BtJekKP5A*l7TPFW=Z#znt$mTQs*sKaSJTisnP-fi0mQg3zH~C diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/objects/41/bd4bc3df978de695f67ace64c560913da11653 b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/objects/41/bd4bc3df978de695f67ace64c560913da11653 deleted file mode 100644 index ccf49bd15cac3c2bac13fa644f20924a6928dead..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 163 zcmV;U09^lg0hNx~4Z<)G1^IRr+W=^NtQ|`T0VU9Zv)&w14&*rf;}+2TJYIve6?|_sH;Eh(2DY7+$k{q!!fw!> z(TR3ZR66Ul7xvZ-v-q#0c>kLs07~zTmQMI-8)u#UYRIi-p RZG8X>-X+A`MI6N*Dz6QY4Oxv{b!#F?R3>Zey&Eh^ zLz#U_A&YRfX{+!#kAs&5Uc8K4;a=nOJGbeKx3rZ94B99}B8703PD;_&{;zfVZz|>;+Qv+EoOhlpLYZ1IW9p#9+rkUf;jILVt%D7~a-( zHi)r&*iZ%W*dq%vm(oN!T~(-~7mAT<%e|zi#OU5_=*u97N%F)=dM#H`s@SPCR?3Xz zYe>>UAWW_u_S^>i9Q&@z0(V`y4!Di!`!U<|m_B)1zaXR>5o?JA7hk-0Cq4h{RR3GL V-?ucIUk@ueUmL zNYq=`3#uwDGbc5^BtJekKP5A*lA&VW?_0N)ENv?9b#1W-nHoB8!Ax%es2L;m5j-ce diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/objects/78/0d7397f5e8f8f477fb55b7af3accc2154b2d4a b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/objects/78/0d7397f5e8f8f477fb55b7af3accc2154b2d4a deleted file mode 100644 index 6d27af8a8..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/objects/78/0d7397f5e8f8f477fb55b7af3accc2154b2d4a +++ /dev/null @@ -1,2 +0,0 @@ -x-Ë1Â0 FaæžâßØ0pŽÀìÄÐ(N-ÅöÐÛÓ¡Ò“¾é±ãq]>ksÅ*š? |m“‡Õçiª@ÛÖý¶¼m»¨V£…£'©î`)”.Ø-1¨ x -u„xãòt(+ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/objects/78/9efbdadaa4a582778d4584385495559ea0994b b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/objects/78/9efbdadaa4a582778d4584385495559ea0994b deleted file mode 100644 index 17458840b..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/objects/78/9efbdadaa4a582778d4584385495559ea0994b +++ /dev/null @@ -1,2 +0,0 @@ -x Œ± …0 )ÞŠ?= ¥ÉÄNŠlO¤k®¸‹jÛúÿ¹8&„«¨ ãr ” -ïqJWñ°7¾B<ÉáöfÙìK8­#Q1C-‘"eª·Ì«£Š°ð>¼'@ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/objects/88/34b635dd468a83cb012f6feace968c1c9f5d6e b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/objects/88/34b635dd468a83cb012f6feace968c1c9f5d6e deleted file mode 100644 index 83cc29fb159ab59087d724473642a0057d841358..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 81 zcmV-X0IvUd0ZYosPf{?mWC+Q~ELH%bM1{1>oK%I9e1+Wnl+3hBh0HvK;?g7_r!*(E nn9H+7Au*>YH8G`9AtSL^p*TM`RRO58B)_OqkBbWc`{EjQ6-gx7 diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/objects/d0/5f2cd5cc77addf68ed6f50d622c9a4f732e6c5 b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/objects/d0/5f2cd5cc77addf68ed6f50d622c9a4f732e6c5 deleted file mode 100644 index 55bda40ef277279310f6bf3122497c14602374d6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 93 zcmV-j0HXhR0V^p=O;xZkU@$Z=Ff%bx2y%6F@paWJsVHHn;4Pm1^~H}b<-bF>ueUmL zNYq=`3#uwDGbc5^BtJekKP5A*lA*(7o9SJ*uIAH>`uVTUP3w`FADagNj^84oNOvn! diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/packed-refs b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/packed-refs deleted file mode 100644 index 5a4ebc47c..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/packed-refs +++ /dev/null @@ -1,2 +0,0 @@ -# pack-refs with: peeled -480095882d281ed676fe5b863569520e54a7d5c0 refs/remotes/origin/master diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/refs/heads/master b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/refs/heads/master deleted file mode 100644 index e12c44d7a..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -480095882d281ed676fe5b863569520e54a7d5c0 diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/refs/remotes/origin/HEAD b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/refs/remotes/origin/HEAD deleted file mode 100644 index 6efe28fff..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_added_and_uncommited/refs/remotes/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/remotes/origin/master diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/HEAD b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/config b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/config deleted file mode 100644 index 10cc2508e..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/config +++ /dev/null @@ -1,13 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - worktree = ../../../sm_changed_file - ignorecase = true -[remote "origin"] - fetch = +refs/heads/*:refs/remotes/origin/* - url = /Users/rb/src/libgit2/tests-clar/resources/submod2_target -[branch "master"] - remote = origin - merge = refs/heads/master diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/description b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/description deleted file mode 100644 index 498b267a8..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/index b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/index deleted file mode 100644 index 6914a3b6edf944a819a71ecbd6b0b5c919c3a28b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 192 zcmZ?q402{*U|<5_0M_ekfiwe*=3`)BVYq$vHv>cC5(WmwuRtjgAkM1bEuQ}M#g8xL zzeBgLw>oo3)LYk!fh)+>(Z$zQucV>`WCjSp%z@ER^ZuZjmsv6I_pMt?mNu35y0%z^ zObwm4V5T<%Us`5PYJ5q4d~SY9W?Ci4yw+10^HT0^J@!F#v(di=TgsUqthNIH2lGAc diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/info/exclude b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/info/exclude deleted file mode 100644 index a5196d1be..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/info/exclude +++ /dev/null @@ -1,6 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/logs/HEAD b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/logs/HEAD deleted file mode 100644 index e5cb63f8d..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/logs/HEAD +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 480095882d281ed676fe5b863569520e54a7d5c0 Russell Belfer 1342560173 -0700 clone: from /Users/rb/src/libgit2/tests-clar/resources/submod2_target diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/logs/refs/heads/master b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/logs/refs/heads/master deleted file mode 100644 index e5cb63f8d..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/logs/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 480095882d281ed676fe5b863569520e54a7d5c0 Russell Belfer 1342560173 -0700 clone: from /Users/rb/src/libgit2/tests-clar/resources/submod2_target diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/logs/refs/remotes/origin/HEAD b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/logs/refs/remotes/origin/HEAD deleted file mode 100644 index e5cb63f8d..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/logs/refs/remotes/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 480095882d281ed676fe5b863569520e54a7d5c0 Russell Belfer 1342560173 -0700 clone: from /Users/rb/src/libgit2/tests-clar/resources/submod2_target diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/objects/06/362fe2fdb7010d0e447b4fb450d405420479a1 b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/objects/06/362fe2fdb7010d0e447b4fb450d405420479a1 deleted file mode 100644 index f4b7094c52b2b13a955016da7ed894453ab9813c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 55 zcmV-70LcG%0V^p=O;s?qU@$Z=Ff%bx2y%6F@paWJsVHHn;4Pm1^~H}b<-bF>ueUmL NNYq=`3jkt>5$jr-7%cz* diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/objects/0e/6a3ca48bd47cfe67681acf39aa0b10a0b92484 b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/objects/0e/6a3ca48bd47cfe67681acf39aa0b10a0b92484 deleted file mode 100644 index 56c845e49de66164d68d3f7439e2aedcb220c498..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 53 zcmV-50LuS(0ZYosPf{>3U`ELH%bM1{1>oK%I9e1+Wnl+3hBh0HvK;?g7_r!*(E Ln2QSlfR+#vlJ6KL diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/objects/17/d0ece6e96460a06592d9d9d000de37ba4232c5 b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/objects/17/d0ece6e96460a06592d9d9d000de37ba4232c5 deleted file mode 100644 index bd179b5f5406f12f948b97d871c763cc0e10b06f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 93 zcmV-j0HXhR0V^p=O;xZkU@$Z=Ff%bx2y%6F@paWJsVHHn;4Pm1^~H}b<-bF>ueUmL zNYq=`3#uwDGbc5^BtJekKP5A*l7TPFW=Z#znt$mTQs*sKaSJTisnP-fi0mQg3zH~C diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/objects/41/bd4bc3df978de695f67ace64c560913da11653 b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/objects/41/bd4bc3df978de695f67ace64c560913da11653 deleted file mode 100644 index ccf49bd15cac3c2bac13fa644f20924a6928dead..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 163 zcmV;U09^lg0hNx~4Z<)G1^IRr+W=^NtQ|`T0VU9Zv)&w14&*rf;}+2TJYIve6?|_sH;Eh(2DY7+$k{q!!fw!> z(TR3ZR66Ul7xvZ-v-q#0c>kLs07~zTmQMI-8)u#UYRIi-p RZG8X>-X+A`MI6N*Dz6QY4Oxv{b!#F?R3>Zey&Eh^ zLz#U_A&YRfX{+!#kAs&5Uc8K4;a=nOJGbeKx3rZ94B99}B8703PD;_&{;zfVZz|>;+Qv+EoOhlpLYZ1IW9p#9+rkUf;jILVt%D7~a-( zHi)r&*iZ%W*dq%vm(oN!T~(-~7mAT<%e|zi#OU5_=*u97N%F)=dM#H`s@SPCR?3Xz zYe>>UAWW_u_S^>i9Q&@z0(V`y4!Di!`!U<|m_B)1zaXR>5o?JA7hk-0Cq4h{RR3GL V-?ucIUk@ueUmL zNYq=`3#uwDGbc5^BtJekKP5A*lA&VW?_0N)ENv?9b#1W-nHoB8!Ax%es2L;m5j-ce diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/objects/78/0d7397f5e8f8f477fb55b7af3accc2154b2d4a b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/objects/78/0d7397f5e8f8f477fb55b7af3accc2154b2d4a deleted file mode 100644 index 6d27af8a8..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/objects/78/0d7397f5e8f8f477fb55b7af3accc2154b2d4a +++ /dev/null @@ -1,2 +0,0 @@ -x-Ë1Â0 FaæžâßØ0pŽÀìÄÐ(N-ÅöÐÛÓ¡Ò“¾é±ãq]>ksÅ*š? |m“‡Õçiª@ÛÖý¶¼m»¨V£…£'©î`)”.Ø-1¨ x -u„xãòt(+ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/objects/78/9efbdadaa4a582778d4584385495559ea0994b b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/objects/78/9efbdadaa4a582778d4584385495559ea0994b deleted file mode 100644 index 17458840b..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/objects/78/9efbdadaa4a582778d4584385495559ea0994b +++ /dev/null @@ -1,2 +0,0 @@ -x Œ± …0 )ÞŠ?= ¥ÉÄNŠlO¤k®¸‹jÛúÿ¹8&„«¨ ãr ” -ïqJWñ°7¾B<ÉáöfÙìK8­#Q1C-‘"eª·Ì«£Š°ð>¼'@ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/objects/88/34b635dd468a83cb012f6feace968c1c9f5d6e b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/objects/88/34b635dd468a83cb012f6feace968c1c9f5d6e deleted file mode 100644 index 83cc29fb159ab59087d724473642a0057d841358..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 81 zcmV-X0IvUd0ZYosPf{?mWC+Q~ELH%bM1{1>oK%I9e1+Wnl+3hBh0HvK;?g7_r!*(E nn9H+7Au*>YH8G`9AtSL^p*TM`RRO58B)_OqkBbWc`{EjQ6-gx7 diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/objects/d0/5f2cd5cc77addf68ed6f50d622c9a4f732e6c5 b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/objects/d0/5f2cd5cc77addf68ed6f50d622c9a4f732e6c5 deleted file mode 100644 index 55bda40ef277279310f6bf3122497c14602374d6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 93 zcmV-j0HXhR0V^p=O;xZkU@$Z=Ff%bx2y%6F@paWJsVHHn;4Pm1^~H}b<-bF>ueUmL zNYq=`3#uwDGbc5^BtJekKP5A*lA*(7o9SJ*uIAH>`uVTUP3w`FADagNj^84oNOvn! diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/packed-refs b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/packed-refs deleted file mode 100644 index 5a4ebc47c..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/packed-refs +++ /dev/null @@ -1,2 +0,0 @@ -# pack-refs with: peeled -480095882d281ed676fe5b863569520e54a7d5c0 refs/remotes/origin/master diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/refs/heads/master b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/refs/heads/master deleted file mode 100644 index e12c44d7a..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -480095882d281ed676fe5b863569520e54a7d5c0 diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/refs/remotes/origin/HEAD b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/refs/remotes/origin/HEAD deleted file mode 100644 index 6efe28fff..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_file/refs/remotes/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/remotes/origin/master diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/COMMIT_EDITMSG b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/COMMIT_EDITMSG deleted file mode 100644 index 6b8d1e3fc..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -Making a change in a submodule diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/HEAD b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/config b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/config deleted file mode 100644 index 7d002536a..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/config +++ /dev/null @@ -1,13 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - worktree = ../../../sm_changed_head - ignorecase = true -[remote "origin"] - fetch = +refs/heads/*:refs/remotes/origin/* - url = /Users/rb/src/libgit2/tests-clar/resources/submod2_target -[branch "master"] - remote = origin - merge = refs/heads/master diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/description b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/description deleted file mode 100644 index 498b267a8..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/index b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/index deleted file mode 100644 index 728fa292f5c9e9a10d1d9983132120ad9034c122..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 192 zcmZ?q402{*U|<5_0M_f9fiwe*=3`)BVYq#61p`Cl5(WmwuRtjgAkM1bEuQ}M#g8xL zzeBgLw>oo3)LYk!fh)+>(Z$zQucV>`WCjQXu-;gVOhe4Opn_)Jy1tFi%-_yG@zm9S z5wFD$PEPsBQ@=3qrDf)%#+T&B=jNwmrd5K>iK}TYk-nns6nKVZqb1KYHMJMo>j7GH BIK2P> diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/info/exclude b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/info/exclude deleted file mode 100644 index a5196d1be..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/info/exclude +++ /dev/null @@ -1,6 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/logs/HEAD b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/logs/HEAD deleted file mode 100644 index cabdeb2b5..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/logs/HEAD +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 480095882d281ed676fe5b863569520e54a7d5c0 Russell Belfer 1342560179 -0700 clone: from /Users/rb/src/libgit2/tests-clar/resources/submod2_target -480095882d281ed676fe5b863569520e54a7d5c0 3d9386c507f6b093471a3e324085657a3c2b4247 Russell Belfer 1342560431 -0700 commit: Making a change in a submodule diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/logs/refs/heads/master b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/logs/refs/heads/master deleted file mode 100644 index cabdeb2b5..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/logs/refs/heads/master +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 480095882d281ed676fe5b863569520e54a7d5c0 Russell Belfer 1342560179 -0700 clone: from /Users/rb/src/libgit2/tests-clar/resources/submod2_target -480095882d281ed676fe5b863569520e54a7d5c0 3d9386c507f6b093471a3e324085657a3c2b4247 Russell Belfer 1342560431 -0700 commit: Making a change in a submodule diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/logs/refs/remotes/origin/HEAD b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/logs/refs/remotes/origin/HEAD deleted file mode 100644 index 257ca21d1..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/logs/refs/remotes/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 480095882d281ed676fe5b863569520e54a7d5c0 Russell Belfer 1342560179 -0700 clone: from /Users/rb/src/libgit2/tests-clar/resources/submod2_target diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/objects/06/362fe2fdb7010d0e447b4fb450d405420479a1 b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/objects/06/362fe2fdb7010d0e447b4fb450d405420479a1 deleted file mode 100644 index f4b7094c52b2b13a955016da7ed894453ab9813c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 55 zcmV-70LcG%0V^p=O;s?qU@$Z=Ff%bx2y%6F@paWJsVHHn;4Pm1^~H}b<-bF>ueUmL NNYq=`3jkt>5$jr-7%cz* diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/objects/0e/6a3ca48bd47cfe67681acf39aa0b10a0b92484 b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/objects/0e/6a3ca48bd47cfe67681acf39aa0b10a0b92484 deleted file mode 100644 index 56c845e49de66164d68d3f7439e2aedcb220c498..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 53 zcmV-50LuS(0ZYosPf{>3U`ELH%bM1{1>oK%I9e1+Wnl+3hBh0HvK;?g7_r!*(E Ln2QSlfR+#vlJ6KL diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/objects/17/d0ece6e96460a06592d9d9d000de37ba4232c5 b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/objects/17/d0ece6e96460a06592d9d9d000de37ba4232c5 deleted file mode 100644 index bd179b5f5406f12f948b97d871c763cc0e10b06f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 93 zcmV-j0HXhR0V^p=O;xZkU@$Z=Ff%bx2y%6F@paWJsVHHn;4Pm1^~H}b<-bF>ueUmL zNYq=`3#uwDGbc5^BtJekKP5A*l7TPFW=Z#znt$mTQs*sKaSJTisnP-fi0mQg3zH~C diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/objects/3d/9386c507f6b093471a3e324085657a3c2b4247 b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/objects/3d/9386c507f6b093471a3e324085657a3c2b4247 deleted file mode 100644 index a2c371642..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/objects/3d/9386c507f6b093471a3e324085657a3c2b4247 +++ /dev/null @@ -1,3 +0,0 @@ -x•ŽKj!E3vµ„jµüÀ#<Þ<“ì@­êéO°uÿq ™.çÂ)×ql ´‰o­Š€÷sFa#Èv‰ÓÅ )g#{':ªßTål`b¤4ë0 ;ïf¡ár‘4 -Ùä™ -ªÔÛzUøî÷-û/Ùg©ð¨ù¹lmíù£\Ç'LÆjrhÍïèÕXG_êŸê+ýlç ÊšÎE`;ß=÷]ÔÞJç \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/objects/41/bd4bc3df978de695f67ace64c560913da11653 b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/objects/41/bd4bc3df978de695f67ace64c560913da11653 deleted file mode 100644 index ccf49bd15cac3c2bac13fa644f20924a6928dead..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 163 zcmV;U09^lg0hNx~4Z<)G1^IRr+W=^NtQ|`T0VU9Zv)&w14&*rf;}+2TJYIve6?|_sH;Eh(2DY7+$k{q!!fw!> z(TR3ZR66Ul7xvZ-v-q#0c>kLs07~zTmQMI-8)u#UYRIi-p RZG8X>-X+A`MI6N*Dz6QY4Oxv{b!#F?R3>Zey&Eh^ zLz#U_A&YRfX{+!#kAs&5Uc8K4;a=nOJGbeKx3rZ94B99}B8703PD;_&{;zfVZz|>;+Qv+EoOhlpLYZ1IW9p#9+rkUf;jILVt%D7~a-( zHi)r&*iZ%W*dq%vm(oN!T~(-~7mAT<%e|zi#OU5_=*u97N%F)=dM#H`s@SPCR?3Xz zYe>>UAWW_u_S^>i9Q&@z0(V`y4!Di!`!U<|m_B)1zaXR>5o?JA7hk-0Cq4h{RR3GL V-?ucIUk@ueUmL zNYq=`3#uwDGbc5^BtJekKP5A*lA&VW?_0N)ENv?9b#1W-nHoB8!Ax%es2L;m5j-ce diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/objects/77/fb0ed3e58568d6ad362c78de08ab8649d76e29 b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/objects/77/fb0ed3e58568d6ad362c78de08ab8649d76e29 deleted file mode 100644 index f8a236f3d34786f432673ca244af537700adb66a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 93 zcmV-j0HXhR0V^p=O;xZkU@$Z=Ff%bx2y%6F@paWJsVHHn;4Pm1^~H}b<-bF>ueUmL zNYq=`3#uwDGbc5^BtJekKP5A*lA&+oGxN9ePds(?U&L$igOgK!^3*Q?pK2pjFwQB_ diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/objects/78/0d7397f5e8f8f477fb55b7af3accc2154b2d4a b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/objects/78/0d7397f5e8f8f477fb55b7af3accc2154b2d4a deleted file mode 100644 index 6d27af8a8..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/objects/78/0d7397f5e8f8f477fb55b7af3accc2154b2d4a +++ /dev/null @@ -1,2 +0,0 @@ -x-Ë1Â0 FaæžâßØ0pŽÀìÄÐ(N-ÅöÐÛÓ¡Ò“¾é±ãq]>ksÅ*š? |m“‡Õçiª@ÛÖý¶¼m»¨V£…£'©î`)”.Ø-1¨ x -u„xãòt(+ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/objects/78/9efbdadaa4a582778d4584385495559ea0994b b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/objects/78/9efbdadaa4a582778d4584385495559ea0994b deleted file mode 100644 index 17458840b..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/objects/78/9efbdadaa4a582778d4584385495559ea0994b +++ /dev/null @@ -1,2 +0,0 @@ -x Œ± …0 )ÞŠ?= ¥ÉÄNŠlO¤k®¸‹jÛúÿ¹8&„«¨ ãr ” -ïqJWñ°7¾B<ÉáöfÙìK8­#Q1C-‘"eª·Ì«£Š°ð>¼'@ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/objects/88/34b635dd468a83cb012f6feace968c1c9f5d6e b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/objects/88/34b635dd468a83cb012f6feace968c1c9f5d6e deleted file mode 100644 index 83cc29fb159ab59087d724473642a0057d841358..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 81 zcmV-X0IvUd0ZYosPf{?mWC+Q~ELH%bM1{1>oK%I9e1+Wnl+3hBh0HvK;?g7_r!*(E nn9H+7Au*>YH8G`9AtSL^p*TM`RRO58B)_OqkBbWc`{EjQ6-gx7 diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/objects/8e/b1e637ed9fc8e5454fa20d38f809091f9395f4 b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/objects/8e/b1e637ed9fc8e5454fa20d38f809091f9395f4 deleted file mode 100644 index 8155b3e87..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/objects/8e/b1e637ed9fc8e5454fa20d38f809091f9395f4 +++ /dev/null @@ -1,2 +0,0 @@ -xMM; -1µÎ)Þ ÁZPÐÞÆr²3kÉ l²En¿ƒl!¼æýc±ˆóõrz§Üà ,¹º¡çe +ÚlEZxuPY…x QC³*ðf·uLácfR3ŠÍT0'Ò¯øjƒŠ°ð~G¦^s1Šèb2z’ƒÿùVkî]Ü5<·ûv¨'>ã \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/objects/d0/5f2cd5cc77addf68ed6f50d622c9a4f732e6c5 b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/objects/d0/5f2cd5cc77addf68ed6f50d622c9a4f732e6c5 deleted file mode 100644 index 55bda40ef277279310f6bf3122497c14602374d6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 93 zcmV-j0HXhR0V^p=O;xZkU@$Z=Ff%bx2y%6F@paWJsVHHn;4Pm1^~H}b<-bF>ueUmL zNYq=`3#uwDGbc5^BtJekKP5A*lA*(7o9SJ*uIAH>`uVTUP3w`FADagNj^84oNOvn! diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/packed-refs b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/packed-refs deleted file mode 100644 index 5a4ebc47c..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/packed-refs +++ /dev/null @@ -1,2 +0,0 @@ -# pack-refs with: peeled -480095882d281ed676fe5b863569520e54a7d5c0 refs/remotes/origin/master diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/refs/heads/master b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/refs/heads/master deleted file mode 100644 index ae079bd79..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -3d9386c507f6b093471a3e324085657a3c2b4247 diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/refs/remotes/origin/HEAD b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/refs/remotes/origin/HEAD deleted file mode 100644 index 6efe28fff..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_head/refs/remotes/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/remotes/origin/master diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/HEAD b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/config b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/config deleted file mode 100644 index 0274ff7e3..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/config +++ /dev/null @@ -1,13 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - worktree = ../../../sm_changed_index - ignorecase = true -[remote "origin"] - fetch = +refs/heads/*:refs/remotes/origin/* - url = /Users/rb/src/libgit2/tests-clar/resources/submod2_target -[branch "master"] - remote = origin - merge = refs/heads/master diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/description b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/description deleted file mode 100644 index 498b267a8..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/index b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/index deleted file mode 100644 index 6fad3b43eab8d2b6b8717c1111a61c378cc37aeb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 192 zcmZ?q402{*U|<5_0M_g4fiwe*=3`)BVYq!RfPtZL2?GP;SD=NB2J7Ek~B;>VZr z-=W*rTb(&1>aFX=z!l``=;G_DS5i>|G6MtxSZ}l=(-8A62%?!ce}S%HIa~X*Q1{hU zEax81+%)e=#5D%Kw9K5;_>%ni-29Zxv`UaUS1bMog|S)uwLFq+XeS%cmaR8$7Xax* BIIREx diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/info/exclude b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/info/exclude deleted file mode 100644 index a5196d1be..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/info/exclude +++ /dev/null @@ -1,6 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/logs/HEAD b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/logs/HEAD deleted file mode 100644 index 80eb54102..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/logs/HEAD +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 480095882d281ed676fe5b863569520e54a7d5c0 Russell Belfer 1342560175 -0700 clone: from /Users/rb/src/libgit2/tests-clar/resources/submod2_target diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/logs/refs/heads/master b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/logs/refs/heads/master deleted file mode 100644 index 80eb54102..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/logs/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 480095882d281ed676fe5b863569520e54a7d5c0 Russell Belfer 1342560175 -0700 clone: from /Users/rb/src/libgit2/tests-clar/resources/submod2_target diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/logs/refs/remotes/origin/HEAD b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/logs/refs/remotes/origin/HEAD deleted file mode 100644 index 80eb54102..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/logs/refs/remotes/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 480095882d281ed676fe5b863569520e54a7d5c0 Russell Belfer 1342560175 -0700 clone: from /Users/rb/src/libgit2/tests-clar/resources/submod2_target diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/objects/06/362fe2fdb7010d0e447b4fb450d405420479a1 b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/objects/06/362fe2fdb7010d0e447b4fb450d405420479a1 deleted file mode 100644 index f4b7094c52b2b13a955016da7ed894453ab9813c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 55 zcmV-70LcG%0V^p=O;s?qU@$Z=Ff%bx2y%6F@paWJsVHHn;4Pm1^~H}b<-bF>ueUmL NNYq=`3jkt>5$jr-7%cz* diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/objects/0e/6a3ca48bd47cfe67681acf39aa0b10a0b92484 b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/objects/0e/6a3ca48bd47cfe67681acf39aa0b10a0b92484 deleted file mode 100644 index 56c845e49de66164d68d3f7439e2aedcb220c498..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 53 zcmV-50LuS(0ZYosPf{>3U`ELH%bM1{1>oK%I9e1+Wnl+3hBh0HvK;?g7_r!*(E Ln2QSlfR+#vlJ6KL diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/objects/17/d0ece6e96460a06592d9d9d000de37ba4232c5 b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/objects/17/d0ece6e96460a06592d9d9d000de37ba4232c5 deleted file mode 100644 index bd179b5f5406f12f948b97d871c763cc0e10b06f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 93 zcmV-j0HXhR0V^p=O;xZkU@$Z=Ff%bx2y%6F@paWJsVHHn;4Pm1^~H}b<-bF>ueUmL zNYq=`3#uwDGbc5^BtJekKP5A*l7TPFW=Z#znt$mTQs*sKaSJTisnP-fi0mQg3zH~C diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/objects/41/bd4bc3df978de695f67ace64c560913da11653 b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/objects/41/bd4bc3df978de695f67ace64c560913da11653 deleted file mode 100644 index ccf49bd15cac3c2bac13fa644f20924a6928dead..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 163 zcmV;U09^lg0hNx~4Z<)G1^IRr+W=^NtQ|`T0VU9Zv)&w14&*rf;}+2TJYIve6?|_sH;Eh(2DY7+$k{q!!fw!> z(TR3ZR66Ul7xvZ-v-q#0c>kLs07~zTmQMI-8)u#UYRIi-p RZG8X>-X+A`MI6N*Dz6QY4Oxv{b!#F?R3>Zey&Eh^ zLz#U_A&YRfX{+!#kAs&5Uc8K4;a=nOJGbeKx3rZ94B99}B8703PD;_&{;zfVZz|>;+Qv+EoOhlpLYZ1IW9p#9+rkUf;jILVt%D7~a-( zHi)r&*iZ%W*dq%vm(oN!T~(-~7mAT<%e|zi#OU5_=*u97N%F)=dM#H`s@SPCR?3Xz zYe>>UAWW_u_S^>i9Q&@z0(V`y4!Di!`!U<|m_B)1zaXR>5o?JA7hk-0Cq4h{RR3GL V-?ucIUk@ueUmL zNYq=`3#uwDGbc5^BtJekKP5A*lA&VW?_0N)ENv?9b#1W-nHoB8!Ax%es2L;m5j-ce diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/objects/78/0d7397f5e8f8f477fb55b7af3accc2154b2d4a b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/objects/78/0d7397f5e8f8f477fb55b7af3accc2154b2d4a deleted file mode 100644 index 6d27af8a8..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/objects/78/0d7397f5e8f8f477fb55b7af3accc2154b2d4a +++ /dev/null @@ -1,2 +0,0 @@ -x-Ë1Â0 FaæžâßØ0pŽÀìÄÐ(N-ÅöÐÛÓ¡Ò“¾é±ãq]>ksÅ*š? |m“‡Õçiª@ÛÖý¶¼m»¨V£…£'©î`)”.Ø-1¨ x -u„xãòt(+ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/objects/78/9efbdadaa4a582778d4584385495559ea0994b b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/objects/78/9efbdadaa4a582778d4584385495559ea0994b deleted file mode 100644 index 17458840b..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/objects/78/9efbdadaa4a582778d4584385495559ea0994b +++ /dev/null @@ -1,2 +0,0 @@ -x Œ± …0 )ÞŠ?= ¥ÉÄNŠlO¤k®¸‹jÛúÿ¹8&„«¨ ãr ” -ïqJWñ°7¾B<ÉáöfÙìK8­#Q1C-‘"eª·Ì«£Š°ð>¼'@ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/objects/88/34b635dd468a83cb012f6feace968c1c9f5d6e b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/objects/88/34b635dd468a83cb012f6feace968c1c9f5d6e deleted file mode 100644 index 83cc29fb159ab59087d724473642a0057d841358..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 81 zcmV-X0IvUd0ZYosPf{?mWC+Q~ELH%bM1{1>oK%I9e1+Wnl+3hBh0HvK;?g7_r!*(E nn9H+7Au*>YH8G`9AtSL^p*TM`RRO58B)_OqkBbWc`{EjQ6-gx7 diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/objects/a0/2d31770687965547ab7a04cee199b29ee458d6 b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/objects/a0/2d31770687965547ab7a04cee199b29ee458d6 deleted file mode 100644 index cb3f5a00261e6d452d9e86c55f0adc6a41ca8c57..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 134 zcmV;10D1p-0VRz)4gxU{L#cBLpI{{l3T^;B4do;=OCquvDIY;@&nzpsv1R-DtRCmf z_4J6T!9-Y77Iej?oYsj{(1tfNvNU(^pj?G`B2q)sO<>EebuR9y1Az*N8Ce5mgh=Hj o_S#THSa@+asdgXb;281f@DAGJR9L>C!hiSC`sP&K4-wKjM3@OZ!vFvP diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/objects/d0/5f2cd5cc77addf68ed6f50d622c9a4f732e6c5 b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/objects/d0/5f2cd5cc77addf68ed6f50d622c9a4f732e6c5 deleted file mode 100644 index 55bda40ef277279310f6bf3122497c14602374d6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 93 zcmV-j0HXhR0V^p=O;xZkU@$Z=Ff%bx2y%6F@paWJsVHHn;4Pm1^~H}b<-bF>ueUmL zNYq=`3#uwDGbc5^BtJekKP5A*lA*(7o9SJ*uIAH>`uVTUP3w`FADagNj^84oNOvn! diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/packed-refs b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/packed-refs deleted file mode 100644 index 5a4ebc47c..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/packed-refs +++ /dev/null @@ -1,2 +0,0 @@ -# pack-refs with: peeled -480095882d281ed676fe5b863569520e54a7d5c0 refs/remotes/origin/master diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/refs/heads/master b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/refs/heads/master deleted file mode 100644 index e12c44d7a..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -480095882d281ed676fe5b863569520e54a7d5c0 diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/refs/remotes/origin/HEAD b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/refs/remotes/origin/HEAD deleted file mode 100644 index 6efe28fff..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_index/refs/remotes/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/remotes/origin/master diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/HEAD b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/config b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/config deleted file mode 100644 index 7f2584476..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/config +++ /dev/null @@ -1,13 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - worktree = ../../../sm_changed_untracked_file - ignorecase = true -[remote "origin"] - fetch = +refs/heads/*:refs/remotes/origin/* - url = /Users/rb/src/libgit2/tests-clar/resources/submod2_target -[branch "master"] - remote = origin - merge = refs/heads/master diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/description b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/description deleted file mode 100644 index 498b267a8..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/index b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/index deleted file mode 100644 index 598e30a32c0a05c68b94868c903b70e267e29b6f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 192 zcmZ?q402{*U|<5_0M_fffHVV)=3`)BVYq$n9|J?<5(WmwuRtjgAkM1bEuQ}M#g8xL zzeBgLw>oo3)LYk!fh)+>(Z$zQucV>`WCjSp%z@ER^Zuimmsv6I_pMt?mNu35y0%z^ zObwm4V5T<%Us`5PYJ5q4d~SY9W?Ci4ylltW-{u{;yzbMyE8!+zFDLJqyR!xWEx|us diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/info/exclude b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/info/exclude deleted file mode 100644 index a5196d1be..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/info/exclude +++ /dev/null @@ -1,6 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/logs/HEAD b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/logs/HEAD deleted file mode 100644 index d1beafbd6..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/logs/HEAD +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 480095882d281ed676fe5b863569520e54a7d5c0 Russell Belfer 1342560186 -0700 clone: from /Users/rb/src/libgit2/tests-clar/resources/submod2_target diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/logs/refs/heads/master b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/logs/refs/heads/master deleted file mode 100644 index d1beafbd6..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/logs/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 480095882d281ed676fe5b863569520e54a7d5c0 Russell Belfer 1342560186 -0700 clone: from /Users/rb/src/libgit2/tests-clar/resources/submod2_target diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/logs/refs/remotes/origin/HEAD b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/logs/refs/remotes/origin/HEAD deleted file mode 100644 index d1beafbd6..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/logs/refs/remotes/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 480095882d281ed676fe5b863569520e54a7d5c0 Russell Belfer 1342560186 -0700 clone: from /Users/rb/src/libgit2/tests-clar/resources/submod2_target diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/objects/06/362fe2fdb7010d0e447b4fb450d405420479a1 b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/objects/06/362fe2fdb7010d0e447b4fb450d405420479a1 deleted file mode 100644 index f4b7094c52b2b13a955016da7ed894453ab9813c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 55 zcmV-70LcG%0V^p=O;s?qU@$Z=Ff%bx2y%6F@paWJsVHHn;4Pm1^~H}b<-bF>ueUmL NNYq=`3jkt>5$jr-7%cz* diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/objects/0e/6a3ca48bd47cfe67681acf39aa0b10a0b92484 b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/objects/0e/6a3ca48bd47cfe67681acf39aa0b10a0b92484 deleted file mode 100644 index 56c845e49de66164d68d3f7439e2aedcb220c498..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 53 zcmV-50LuS(0ZYosPf{>3U`ELH%bM1{1>oK%I9e1+Wnl+3hBh0HvK;?g7_r!*(E Ln2QSlfR+#vlJ6KL diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/objects/17/d0ece6e96460a06592d9d9d000de37ba4232c5 b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/objects/17/d0ece6e96460a06592d9d9d000de37ba4232c5 deleted file mode 100644 index bd179b5f5406f12f948b97d871c763cc0e10b06f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 93 zcmV-j0HXhR0V^p=O;xZkU@$Z=Ff%bx2y%6F@paWJsVHHn;4Pm1^~H}b<-bF>ueUmL zNYq=`3#uwDGbc5^BtJekKP5A*l7TPFW=Z#znt$mTQs*sKaSJTisnP-fi0mQg3zH~C diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/objects/41/bd4bc3df978de695f67ace64c560913da11653 b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/objects/41/bd4bc3df978de695f67ace64c560913da11653 deleted file mode 100644 index ccf49bd15cac3c2bac13fa644f20924a6928dead..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 163 zcmV;U09^lg0hNx~4Z<)G1^IRr+W=^NtQ|`T0VU9Zv)&w14&*rf;}+2TJYIve6?|_sH;Eh(2DY7+$k{q!!fw!> z(TR3ZR66Ul7xvZ-v-q#0c>kLs07~zTmQMI-8)u#UYRIi-p RZG8X>-X+A`MI6N*Dz6QY4Oxv{b!#F?R3>Zey&Eh^ zLz#U_A&YRfX{+!#kAs&5Uc8K4;a=nOJGbeKx3rZ94B99}B8703PD;_&{;zfVZz|>;+Qv+EoOhlpLYZ1IW9p#9+rkUf;jILVt%D7~a-( zHi)r&*iZ%W*dq%vm(oN!T~(-~7mAT<%e|zi#OU5_=*u97N%F)=dM#H`s@SPCR?3Xz zYe>>UAWW_u_S^>i9Q&@z0(V`y4!Di!`!U<|m_B)1zaXR>5o?JA7hk-0Cq4h{RR3GL V-?ucIUk@ueUmL zNYq=`3#uwDGbc5^BtJekKP5A*lA&VW?_0N)ENv?9b#1W-nHoB8!Ax%es2L;m5j-ce diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/objects/78/0d7397f5e8f8f477fb55b7af3accc2154b2d4a b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/objects/78/0d7397f5e8f8f477fb55b7af3accc2154b2d4a deleted file mode 100644 index 6d27af8a8..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/objects/78/0d7397f5e8f8f477fb55b7af3accc2154b2d4a +++ /dev/null @@ -1,2 +0,0 @@ -x-Ë1Â0 FaæžâßØ0pŽÀìÄÐ(N-ÅöÐÛÓ¡Ò“¾é±ãq]>ksÅ*š? |m“‡Õçiª@ÛÖý¶¼m»¨V£…£'©î`)”.Ø-1¨ x -u„xãòt(+ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/objects/78/9efbdadaa4a582778d4584385495559ea0994b b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/objects/78/9efbdadaa4a582778d4584385495559ea0994b deleted file mode 100644 index 17458840b..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/objects/78/9efbdadaa4a582778d4584385495559ea0994b +++ /dev/null @@ -1,2 +0,0 @@ -x Œ± …0 )ÞŠ?= ¥ÉÄNŠlO¤k®¸‹jÛúÿ¹8&„«¨ ãr ” -ïqJWñ°7¾B<ÉáöfÙìK8­#Q1C-‘"eª·Ì«£Š°ð>¼'@ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/objects/88/34b635dd468a83cb012f6feace968c1c9f5d6e b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/objects/88/34b635dd468a83cb012f6feace968c1c9f5d6e deleted file mode 100644 index 83cc29fb159ab59087d724473642a0057d841358..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 81 zcmV-X0IvUd0ZYosPf{?mWC+Q~ELH%bM1{1>oK%I9e1+Wnl+3hBh0HvK;?g7_r!*(E nn9H+7Au*>YH8G`9AtSL^p*TM`RRO58B)_OqkBbWc`{EjQ6-gx7 diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/objects/d0/5f2cd5cc77addf68ed6f50d622c9a4f732e6c5 b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/objects/d0/5f2cd5cc77addf68ed6f50d622c9a4f732e6c5 deleted file mode 100644 index 55bda40ef277279310f6bf3122497c14602374d6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 93 zcmV-j0HXhR0V^p=O;xZkU@$Z=Ff%bx2y%6F@paWJsVHHn;4Pm1^~H}b<-bF>ueUmL zNYq=`3#uwDGbc5^BtJekKP5A*lA*(7o9SJ*uIAH>`uVTUP3w`FADagNj^84oNOvn! diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/packed-refs b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/packed-refs deleted file mode 100644 index 5a4ebc47c..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/packed-refs +++ /dev/null @@ -1,2 +0,0 @@ -# pack-refs with: peeled -480095882d281ed676fe5b863569520e54a7d5c0 refs/remotes/origin/master diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/refs/heads/master b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/refs/heads/master deleted file mode 100644 index e12c44d7a..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -480095882d281ed676fe5b863569520e54a7d5c0 diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/refs/remotes/origin/HEAD b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/refs/remotes/origin/HEAD deleted file mode 100644 index 6efe28fff..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_changed_untracked_file/refs/remotes/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/remotes/origin/master diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_missing_commits/HEAD b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_missing_commits/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_missing_commits/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_missing_commits/config b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_missing_commits/config deleted file mode 100644 index 45fbb30cf..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_missing_commits/config +++ /dev/null @@ -1,13 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - worktree = ../../../sm_missing_commits - ignorecase = true -[remote "origin"] - fetch = +refs/heads/*:refs/remotes/origin/* - url = /Users/rb/src/libgit2/tests-clar/resources/submod2_target -[branch "master"] - remote = origin - merge = refs/heads/master diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_missing_commits/description b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_missing_commits/description deleted file mode 100644 index 498b267a8..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_missing_commits/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_missing_commits/index b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_missing_commits/index deleted file mode 100644 index 4903565245793c25c85846d2ec7f1f1f7bf86cf1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 192 zcmZ?q402{*U|<5_0M=_JK$-zY^D!{6Fx);9#lXH5m@#9PR z@6he*t$OWah`_G4Q2j=A_1# 1342559796 -0700 clone: from /Users/rb/src/libgit2/tests-clar/resources/submod2_target diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_missing_commits/logs/refs/heads/master b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_missing_commits/logs/refs/heads/master deleted file mode 100644 index ee08c9706..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_missing_commits/logs/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 5e4963595a9774b90524d35a807169049de8ccad Russell Belfer 1342559796 -0700 clone: from /Users/rb/src/libgit2/tests-clar/resources/submod2_target diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_missing_commits/logs/refs/remotes/origin/HEAD b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_missing_commits/logs/refs/remotes/origin/HEAD deleted file mode 100644 index ee08c9706..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_missing_commits/logs/refs/remotes/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 5e4963595a9774b90524d35a807169049de8ccad Russell Belfer 1342559796 -0700 clone: from /Users/rb/src/libgit2/tests-clar/resources/submod2_target diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_missing_commits/objects/06/362fe2fdb7010d0e447b4fb450d405420479a1 b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_missing_commits/objects/06/362fe2fdb7010d0e447b4fb450d405420479a1 deleted file mode 100644 index f4b7094c52b2b13a955016da7ed894453ab9813c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 55 zcmV-70LcG%0V^p=O;s?qU@$Z=Ff%bx2y%6F@paWJsVHHn;4Pm1^~H}b<-bF>ueUmL NNYq=`3jkt>5$jr-7%cz* diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_missing_commits/objects/0e/6a3ca48bd47cfe67681acf39aa0b10a0b92484 b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_missing_commits/objects/0e/6a3ca48bd47cfe67681acf39aa0b10a0b92484 deleted file mode 100644 index 56c845e49de66164d68d3f7439e2aedcb220c498..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 53 zcmV-50LuS(0ZYosPf{>3U`ELH%bM1{1>oK%I9e1+Wnl+3hBh0HvK;?g7_r!*(E Ln2QSlfR+#vlJ6KL diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_missing_commits/objects/17/d0ece6e96460a06592d9d9d000de37ba4232c5 b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_missing_commits/objects/17/d0ece6e96460a06592d9d9d000de37ba4232c5 deleted file mode 100644 index bd179b5f5406f12f948b97d871c763cc0e10b06f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 93 zcmV-j0HXhR0V^p=O;xZkU@$Z=Ff%bx2y%6F@paWJsVHHn;4Pm1^~H}b<-bF>ueUmL zNYq=`3#uwDGbc5^BtJekKP5A*l7TPFW=Z#znt$mTQs*sKaSJTisnP-fi0mQg3zH~C diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_missing_commits/objects/41/bd4bc3df978de695f67ace64c560913da11653 b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_missing_commits/objects/41/bd4bc3df978de695f67ace64c560913da11653 deleted file mode 100644 index ccf49bd15cac3c2bac13fa644f20924a6928dead..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 163 zcmV;U09^lg0hNx~4Z<)G1^IRr+W=^NtQ|`T0VU9Zv)&w14&*rf;}+2TJYIve6?|_sH;Eh(2DY7+$k{q!!fw!> z(TR3ZR66Ul7xvZ-v-q#0c>kLs07~zTmQMI-8)u#UYRIi-p RZG|>;+Qv+EoOhlpLYZ1IW9p#9+rkUf;jILVt%D7~a-( zHi)r&*iZ%W*dq%vm(oN!T~(-~7mAT<%e|zi#OU5_=*u97N%F)=dM#H`s@SPCR?3Xz zYe>>UAWW_u_S^>i9Q&@z0(V`y4!Di!`!U<|m_B)1zaXR>5o?JA7hk-0Cq4h{RR3GL V-?ucIUk@ksÅ*š? |m“‡Õçiª@ÛÖý¶¼m»¨V£…£'©î`)”.Ø-1¨ x -u„xãòt(+ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_missing_commits/objects/88/34b635dd468a83cb012f6feace968c1c9f5d6e b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_missing_commits/objects/88/34b635dd468a83cb012f6feace968c1c9f5d6e deleted file mode 100644 index 83cc29fb159ab59087d724473642a0057d841358..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 81 zcmV-X0IvUd0ZYosPf{?mWC+Q~ELH%bM1{1>oK%I9e1+Wnl+3hBh0HvK;?g7_r!*(E nn9H+7Au*>YH8G`9AtSL^p*TM`RRO58B)_OqkBbWc`{EjQ6-gx7 diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_missing_commits/objects/d0/5f2cd5cc77addf68ed6f50d622c9a4f732e6c5 b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_missing_commits/objects/d0/5f2cd5cc77addf68ed6f50d622c9a4f732e6c5 deleted file mode 100644 index 55bda40ef277279310f6bf3122497c14602374d6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 93 zcmV-j0HXhR0V^p=O;xZkU@$Z=Ff%bx2y%6F@paWJsVHHn;4Pm1^~H}b<-bF>ueUmL zNYq=`3#uwDGbc5^BtJekKP5A*lA*(7o9SJ*uIAH>`uVTUP3w`FADagNj^84oNOvn! diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_missing_commits/packed-refs b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_missing_commits/packed-refs deleted file mode 100644 index 66fbf5daf..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_missing_commits/packed-refs +++ /dev/null @@ -1,2 +0,0 @@ -# pack-refs with: peeled -5e4963595a9774b90524d35a807169049de8ccad refs/remotes/origin/master diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_missing_commits/refs/heads/master b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_missing_commits/refs/heads/master deleted file mode 100644 index 3913aca5d..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_missing_commits/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -5e4963595a9774b90524d35a807169049de8ccad diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_missing_commits/refs/remotes/origin/HEAD b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_missing_commits/refs/remotes/origin/HEAD deleted file mode 100644 index 6efe28fff..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_missing_commits/refs/remotes/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/remotes/origin/master diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/HEAD b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/config b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/config deleted file mode 100644 index fc706c9dd..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/config +++ /dev/null @@ -1,13 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - worktree = ../../../sm_unchanged - ignorecase = true -[remote "origin"] - fetch = +refs/heads/*:refs/remotes/origin/* - url = /Users/rb/src/libgit2/tests-clar/resources/submod2_target -[branch "master"] - remote = origin - merge = refs/heads/master diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/description b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/description deleted file mode 100644 index 498b267a8..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/index b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/index deleted file mode 100644 index 629c849ecfac930312db938c6c7c4484ef449aff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 192 zcmZ?q402{*U|<5_0M_d(fiwe*=3`)BVYq#E83RM(5(WmwuRtjgAkM1bEuQ}M#g8xL zzeBgLw>oo3)LYk!fh)+>(Z$zQucV>`WCjSp%z@ER^OmETmsv6I_pMt?mNu35y0%z^ zObwm4V5T<%Us`5PYJ5q4d~SY9W?Ci4JlT+i%MRAdRwr(p^x(Rr0pH6VH)a9=m{dFW diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/info/exclude b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/info/exclude deleted file mode 100644 index a5196d1be..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/info/exclude +++ /dev/null @@ -1,6 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/logs/HEAD b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/logs/HEAD deleted file mode 100644 index 72653286a..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/logs/HEAD +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 480095882d281ed676fe5b863569520e54a7d5c0 Russell Belfer 1342560169 -0700 clone: from /Users/rb/src/libgit2/tests-clar/resources/submod2_target diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/logs/refs/heads/master b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/logs/refs/heads/master deleted file mode 100644 index 72653286a..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/logs/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 480095882d281ed676fe5b863569520e54a7d5c0 Russell Belfer 1342560169 -0700 clone: from /Users/rb/src/libgit2/tests-clar/resources/submod2_target diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/logs/refs/remotes/origin/HEAD b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/logs/refs/remotes/origin/HEAD deleted file mode 100644 index 72653286a..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/logs/refs/remotes/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 480095882d281ed676fe5b863569520e54a7d5c0 Russell Belfer 1342560169 -0700 clone: from /Users/rb/src/libgit2/tests-clar/resources/submod2_target diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/objects/06/362fe2fdb7010d0e447b4fb450d405420479a1 b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/objects/06/362fe2fdb7010d0e447b4fb450d405420479a1 deleted file mode 100644 index f4b7094c52b2b13a955016da7ed894453ab9813c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 55 zcmV-70LcG%0V^p=O;s?qU@$Z=Ff%bx2y%6F@paWJsVHHn;4Pm1^~H}b<-bF>ueUmL NNYq=`3jkt>5$jr-7%cz* diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/objects/0e/6a3ca48bd47cfe67681acf39aa0b10a0b92484 b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/objects/0e/6a3ca48bd47cfe67681acf39aa0b10a0b92484 deleted file mode 100644 index 56c845e49de66164d68d3f7439e2aedcb220c498..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 53 zcmV-50LuS(0ZYosPf{>3U`ELH%bM1{1>oK%I9e1+Wnl+3hBh0HvK;?g7_r!*(E Ln2QSlfR+#vlJ6KL diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/objects/17/d0ece6e96460a06592d9d9d000de37ba4232c5 b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/objects/17/d0ece6e96460a06592d9d9d000de37ba4232c5 deleted file mode 100644 index bd179b5f5406f12f948b97d871c763cc0e10b06f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 93 zcmV-j0HXhR0V^p=O;xZkU@$Z=Ff%bx2y%6F@paWJsVHHn;4Pm1^~H}b<-bF>ueUmL zNYq=`3#uwDGbc5^BtJekKP5A*l7TPFW=Z#znt$mTQs*sKaSJTisnP-fi0mQg3zH~C diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/objects/41/bd4bc3df978de695f67ace64c560913da11653 b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/objects/41/bd4bc3df978de695f67ace64c560913da11653 deleted file mode 100644 index ccf49bd15cac3c2bac13fa644f20924a6928dead..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 163 zcmV;U09^lg0hNx~4Z<)G1^IRr+W=^NtQ|`T0VU9Zv)&w14&*rf;}+2TJYIve6?|_sH;Eh(2DY7+$k{q!!fw!> z(TR3ZR66Ul7xvZ-v-q#0c>kLs07~zTmQMI-8)u#UYRIi-p RZG8X>-X+A`MI6N*Dz6QY4Oxv{b!#F?R3>Zey&Eh^ zLz#U_A&YRfX{+!#kAs&5Uc8K4;a=nOJGbeKx3rZ94B99}B8703PD;_&{;zfVZz|>;+Qv+EoOhlpLYZ1IW9p#9+rkUf;jILVt%D7~a-( zHi)r&*iZ%W*dq%vm(oN!T~(-~7mAT<%e|zi#OU5_=*u97N%F)=dM#H`s@SPCR?3Xz zYe>>UAWW_u_S^>i9Q&@z0(V`y4!Di!`!U<|m_B)1zaXR>5o?JA7hk-0Cq4h{RR3GL V-?ucIUk@ueUmL zNYq=`3#uwDGbc5^BtJekKP5A*lA&VW?_0N)ENv?9b#1W-nHoB8!Ax%es2L;m5j-ce diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/objects/78/0d7397f5e8f8f477fb55b7af3accc2154b2d4a b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/objects/78/0d7397f5e8f8f477fb55b7af3accc2154b2d4a deleted file mode 100644 index 6d27af8a8..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/objects/78/0d7397f5e8f8f477fb55b7af3accc2154b2d4a +++ /dev/null @@ -1,2 +0,0 @@ -x-Ë1Â0 FaæžâßØ0pŽÀìÄÐ(N-ÅöÐÛÓ¡Ò“¾é±ãq]>ksÅ*š? |m“‡Õçiª@ÛÖý¶¼m»¨V£…£'©î`)”.Ø-1¨ x -u„xãòt(+ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/objects/78/9efbdadaa4a582778d4584385495559ea0994b b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/objects/78/9efbdadaa4a582778d4584385495559ea0994b deleted file mode 100644 index 17458840b..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/objects/78/9efbdadaa4a582778d4584385495559ea0994b +++ /dev/null @@ -1,2 +0,0 @@ -x Œ± …0 )ÞŠ?= ¥ÉÄNŠlO¤k®¸‹jÛúÿ¹8&„«¨ ãr ” -ïqJWñ°7¾B<ÉáöfÙìK8­#Q1C-‘"eª·Ì«£Š°ð>¼'@ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/objects/88/34b635dd468a83cb012f6feace968c1c9f5d6e b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/objects/88/34b635dd468a83cb012f6feace968c1c9f5d6e deleted file mode 100644 index 83cc29fb159ab59087d724473642a0057d841358..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 81 zcmV-X0IvUd0ZYosPf{?mWC+Q~ELH%bM1{1>oK%I9e1+Wnl+3hBh0HvK;?g7_r!*(E nn9H+7Au*>YH8G`9AtSL^p*TM`RRO58B)_OqkBbWc`{EjQ6-gx7 diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/objects/d0/5f2cd5cc77addf68ed6f50d622c9a4f732e6c5 b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/objects/d0/5f2cd5cc77addf68ed6f50d622c9a4f732e6c5 deleted file mode 100644 index 55bda40ef277279310f6bf3122497c14602374d6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 93 zcmV-j0HXhR0V^p=O;xZkU@$Z=Ff%bx2y%6F@paWJsVHHn;4Pm1^~H}b<-bF>ueUmL zNYq=`3#uwDGbc5^BtJekKP5A*lA*(7o9SJ*uIAH>`uVTUP3w`FADagNj^84oNOvn! diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/packed-refs b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/packed-refs deleted file mode 100644 index 5a4ebc47c..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/packed-refs +++ /dev/null @@ -1,2 +0,0 @@ -# pack-refs with: peeled -480095882d281ed676fe5b863569520e54a7d5c0 refs/remotes/origin/master diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/refs/heads/master b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/refs/heads/master deleted file mode 100644 index e12c44d7a..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -480095882d281ed676fe5b863569520e54a7d5c0 diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/refs/remotes/origin/HEAD b/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/refs/remotes/origin/HEAD deleted file mode 100644 index 6efe28fff..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/modules/sm_unchanged/refs/remotes/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/remotes/origin/master diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/objects/09/460e5b6cbcb05a3e404593c32a3aa7221eca0e b/vendor/libgit2/tests/resources/submod2/.gitted/objects/09/460e5b6cbcb05a3e404593c32a3aa7221eca0e deleted file mode 100644 index f1ea5f4c8ecf1fbc9730e84b202ac91d9af39b05..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 197 zcmV;$06PD80hQ8C3c@fD1z@-BDN6Smtl-XLxDpBZ8Pi~r%1izuT@(l%#KTa!{1yxwk|%7_J)cZKU#?XEzb+;!ymCd6v+%$!5b|NX4T-12G?= zDX3Zm1A54Pj%Pz}hF`3Mq4k|C=4{Y#pZ2µÊ ^!¹²F'½‘!諲l£_¼q4Íä´ÇE˜Þ¶Rá݃S‚'§ÀnÕ>>±mÝ^\Éw³š´^‰$œ‘ÅXÇ_迦xí±E“à—_.à9} \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/objects/22/ce3e0311dda73a5992d54a4a595518d3876ea7 b/vendor/libgit2/tests/resources/submod2/.gitted/objects/22/ce3e0311dda73a5992d54a4a595518d3876ea7 deleted file mode 100644 index fce6a94b5..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/objects/22/ce3e0311dda73a5992d54a4a595518d3876ea7 +++ /dev/null @@ -1,4 +0,0 @@ -xµË -Â0Eݶ_Qº·. -.ü W"!1 æ!3 øù>+¶Š.¤Û9Ã=3Wº(«nÕ-¶”¥:;¨jòÜ[" WÑ{›¨Þ•ÅQ¤¾ZWï°,2º iviyh •“ÐT/‚=Ž{Ž‡ ¶!@b(¡bÎJcSËP¢¥rÅŒ -è‡ð¡ã{ë`ì|%³imÐpú콡ÙÄ=ˆIÇÿW2›6‡„B@)|¼óÿ)g£ý™ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/objects/25/5546424b0efb847b1bfc91dbf7348b277f8970 b/vendor/libgit2/tests/resources/submod2/.gitted/objects/25/5546424b0efb847b1bfc91dbf7348b277f8970 deleted file mode 100644 index 2965becf606848ee8b992a62838f0e84c4d15aba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 157 zcmV;O0Al}m0kzG$3IZ_@g<;#>rwH4-1FMCNk6|Seav8IMTx2EzA7Al?tAd5to*&Mq zL)K!sSk1Ovb7 z8C7y diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/objects/2a/30f1e6f94b20917005a21273f65b406d0f8bad b/vendor/libgit2/tests/resources/submod2/.gitted/objects/2a/30f1e6f94b20917005a21273f65b406d0f8bad deleted file mode 100644 index 08faf0fa8e69b6488d400a0e61f5875ace6ce1f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 144 zcmV;B0B`?z0i}(*3IZ_@0BtW{5w7MmAhz1QDTb&b-^36+XLKO3_eM4V diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/objects/42/cfb95cd01bf9225b659b5ee3edcc78e8eeb478 b/vendor/libgit2/tests/resources/submod2/.gitted/objects/42/cfb95cd01bf9225b659b5ee3edcc78e8eeb478 deleted file mode 100644 index ee7848ae6efdac9ddaca627c926715721fafbfcf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 40 ycmV+@0N4L`0ZYosPf{>4V+hH}ELH%btkU8Vg+zsdoW#sLg|y6^R4xF(PYWStUJ-); diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/objects/57/958699c2dc394f81cfc76950e9c3ac3025c398 b/vendor/libgit2/tests/resources/submod2/.gitted/objects/57/958699c2dc394f81cfc76950e9c3ac3025c398 deleted file mode 100644 index ca9203a6e3dc2d699dbd7ac7bb72c49d15d29ef7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 136 zcmV;30C)d*0V^p=O;s>7GG;I|FfcPQQP4}zEXmDJDa}bOW|+H2bM^t@SE{DXTev@~ zZ(a6;xw;doEXdW-#n)A@q@sl3=Y&O3B^Os{$UIuj*tg<-T4l^NZbLHzAW$gIjnB<2 qF3!wLk5A6e&CM(+X7FH`+M%lÄ6­#=-ÛÐg?,¯FŒ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/objects/60/7d96653d4d0a4f733107f7890c2e67b55b620d b/vendor/libgit2/tests/resources/submod2/.gitted/objects/60/7d96653d4d0a4f733107f7890c2e67b55b620d deleted file mode 100644 index 30bee40e94f29490b006aadaec04669732ccda8c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 53 zcmbi`6I6@CB! diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/objects/74/84482eb8db738cafa696993664607500a3f2b9 b/vendor/libgit2/tests/resources/submod2/.gitted/objects/74/84482eb8db738cafa696993664607500a3f2b9 deleted file mode 100644 index 79018042d905a039f8bc37fdb65726addb7d3b48..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 173 zcmV;e08;;W0hNy1O~o(}1^IRr+W^RK8|exGCD4JrKE8>R#K_t7Pg>x2G$Rd&tHnDldUHo!`8V+hH}ELH%bM1{1>oK%I(JRqweClN@eWEQ0+m*f{!asdE5 Gs1B*t@Dh;# diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/objects/87/3585b94bdeabccea991ea5e3ec1a277895b698 b/vendor/libgit2/tests/resources/submod2/.gitted/objects/87/3585b94bdeabccea991ea5e3ec1a277895b698 deleted file mode 100644 index 41af98aa9f2dec642502d9c2d2bbf3d9de10c89c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 137 zcmV;40CxX)0V^p=O;s>7GG;I|FfcPQQP4}zEXmDJDa}bOW|+H2bM^t@SE{DXTev@~ zZ(a6;xw;doEXdW-#n)A@q@sl3=Y&O3B^Os{$UIuj*tg<-T4l^NZbLHzAW$gIjnB<2 rF3!wLk5A6e&CM(+W{C4lj*OaKvXfQia#TZMCd=FxXVwA$eBLt!%4k4; diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/objects/97/4cf7c73de336b0c4e019f918f3cee367d72e84 b/vendor/libgit2/tests/resources/submod2/.gitted/objects/97/4cf7c73de336b0c4e019f918f3cee367d72e84 deleted file mode 100644 index 160f1caf4..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/objects/97/4cf7c73de336b0c4e019f918f3cee367d72e84 +++ /dev/null @@ -1,2 +0,0 @@ -xµË -Â0Eݶ_º·Bqåg¸ yŒi ™IÀÏ÷Y±Up!ÝÎs¸£|R¬ï7«=’)XCAGä¢:…à25‡º:É<°-û„uUÐ_IÛò‡¤Y¢…\Ϥ%êAF fª{Gß qTœPsï”u¹ã(ÓZ{‰RA ô#ø̉£ó0m¾“Ų.8ïÞÑbáäìÇãÞù?{vÊŒ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/objects/9d/bc299bc013ea253583b40bf327b5a6e4037b89 b/vendor/libgit2/tests/resources/submod2/.gitted/objects/9d/bc299bc013ea253583b40bf327b5a6e4037b89 deleted file mode 100644 index 1ee52218d9f27d4c087983e47a8e2194ad3b8f93..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 80 zcmV-W0I&ae0ZYosPg1ZjWr!{=P0GzrDa}b$P%6%i&&@0@&df`XPtMQH%`7Qaisj-g mNG!=vuvNg6FGlZF^VrqEJ{x;;Q{~&2q2jMMSvUZTt zTzVq{Ym~M+I1Gt=h>^T=g1jb0QFv*LbvjJWvafHncMzD##h3+0u5HRv6ZhPzNkl}4 zBql>yqGEpZr8fAC=evERe?F8+*{_>W;*reC2e*g#eZ)<~sx@kGvW9Gey+W6WiZ QLBA|zFV@+^2Y_`jIUZm*3IG5A diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/objects/d4/07f19e50c1da1ff584beafe0d6dac7237c5d06 b/vendor/libgit2/tests/resources/submod2/.gitted/objects/d4/07f19e50c1da1ff584beafe0d6dac7237c5d06 deleted file mode 100644 index 292303eb9376601cf4d4fc319529960ea41a7220..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 55 zcmb)7U|?ckU~Cx3QB+#;vGl6;N{z%HmWhEOCy$Cs8TE%5e_Oj_ewbu& LuQWqMo1hH<9@`XQ diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/objects/d9/3e95571d92cceb5de28c205f1d5f3cc8b88bc8 b/vendor/libgit2/tests/resources/submod2/.gitted/objects/d9/3e95571d92cceb5de28c205f1d5f3cc8b88bc8 deleted file mode 100644 index b92c7eebd..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/objects/d9/3e95571d92cceb5de28c205f1d5f3cc8b88bc8 +++ /dev/null @@ -1,2 +0,0 @@ -x•ÏÛ -!€ánק}€ "‚.z’uRÉCx€}üΑۼøt¸ œ.׫Ù6î‚,iŸs&%ãÁ9“S¿#ݲ¦úIW¢=—a˜ßËf2A‹¼BYsÏñßÐa{c±¶^K3g¼Äñ³wMÍ F˜Üúøߥ4sÅçâ€òÇáõÎ÷'Nê°I \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/objects/e3/b83bf274ee065eee48734cf8c6dfaf5e81471c b/vendor/libgit2/tests/resources/submod2/.gitted/objects/e3/b83bf274ee065eee48734cf8c6dfaf5e81471c deleted file mode 100644 index 3c7750b12addc1be9c7f6824d34794b35f9d486b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 246 zcmV4GGZ_^FfcPQQP4}zEXmDJDa}bOX1HlLHC%Smnb)z8dKBVi z<84mt=sp2e7Ub&a;_IqcQc=S2bHbvil8Y-eWFD<%>|1d^tup2sw}}A|C}foum&7N= zr(_l}B-Bnzwe{ulFE(WV-pQkvzBM|D7itt#Ra$0FDudJcoiP`re=0?%&W?Nh_Dsc# zcUvk9&A^5g=f)>zB<7{3ro@AldN54w(AAK;R`xHt%``KJFJ$@E1DHxPQWH}ch*O%G wmy%jRq}tNFlA^@qY~tLKn^|0(nU@})oS&PUSyD{Eiqbr&H?gV%07{jksAL9rrvLx| diff --git a/vendor/libgit2/tests/resources/submod2/.gitted/objects/f5/4414c25e6d24fe39f5c3f128d7c8a17bc23833 b/vendor/libgit2/tests/resources/submod2/.gitted/objects/f5/4414c25e6d24fe39f5c3f128d7c8a17bc23833 deleted file mode 100644 index 219620b25..000000000 --- a/vendor/libgit2/tests/resources/submod2/.gitted/objects/f5/4414c25e6d24fe39f5c3f128d7c8a17bc23833 +++ /dev/null @@ -1,2 +0,0 @@ -xeÍÁ -Â0„a¯íS„ÞíbOzð1ßä2@~ diff --git a/vendor/libgit2/tests/resources/submod2/not-submodule/.gitted/info/exclude b/vendor/libgit2/tests/resources/submod2/not-submodule/.gitted/info/exclude deleted file mode 100644 index a5196d1be..000000000 --- a/vendor/libgit2/tests/resources/submod2/not-submodule/.gitted/info/exclude +++ /dev/null @@ -1,6 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ diff --git a/vendor/libgit2/tests/resources/submod2/not-submodule/.gitted/logs/HEAD b/vendor/libgit2/tests/resources/submod2/not-submodule/.gitted/logs/HEAD deleted file mode 100644 index 1749e7dff..000000000 --- a/vendor/libgit2/tests/resources/submod2/not-submodule/.gitted/logs/HEAD +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 68e92c611b80ee1ed8f38314ff9577f0d15b2444 Russell Belfer 1342560358 -0700 commit (initial): Initial commit diff --git a/vendor/libgit2/tests/resources/submod2/not-submodule/.gitted/logs/refs/heads/master b/vendor/libgit2/tests/resources/submod2/not-submodule/.gitted/logs/refs/heads/master deleted file mode 100644 index 1749e7dff..000000000 --- a/vendor/libgit2/tests/resources/submod2/not-submodule/.gitted/logs/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 68e92c611b80ee1ed8f38314ff9577f0d15b2444 Russell Belfer 1342560358 -0700 commit (initial): Initial commit diff --git a/vendor/libgit2/tests/resources/submod2/not-submodule/.gitted/objects/68/e92c611b80ee1ed8f38314ff9577f0d15b2444 b/vendor/libgit2/tests/resources/submod2/not-submodule/.gitted/objects/68/e92c611b80ee1ed8f38314ff9577f0d15b2444 deleted file mode 100644 index 8892531a749bf004b9dd9b802e09bc19cae75bc3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 132 zcmV-~0DJ#<0hNtG4#FT1MO|}>xqxOUOiL4Ej61j90LoxVKoSb~m&6me{dw>Gt>hdV z$c0X=GDAS=X?D_Z@QM_N$+=ZoO@=(JXwm3JuEfIjwwDU8ejJ<)7U|?ckU~Cx3QB+#;vGl6;N{vK~KlZ_Ye|0WB`T0hP&b0Wx!fk~` L!R!nH>inw!O7<3- diff --git a/vendor/libgit2/tests/resources/submod2/not-submodule/.gitted/refs/heads/master b/vendor/libgit2/tests/resources/submod2/not-submodule/.gitted/refs/heads/master deleted file mode 100644 index 0bd8514bd..000000000 --- a/vendor/libgit2/tests/resources/submod2/not-submodule/.gitted/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -68e92c611b80ee1ed8f38314ff9577f0d15b2444 diff --git a/vendor/libgit2/tests/resources/submod2/not-submodule/README.txt b/vendor/libgit2/tests/resources/submod2/not-submodule/README.txt deleted file mode 100644 index 71ff9927d..000000000 --- a/vendor/libgit2/tests/resources/submod2/not-submodule/README.txt +++ /dev/null @@ -1 +0,0 @@ -This is a git repo but not a submodule diff --git a/vendor/libgit2/tests/resources/submod2/not/.gitted/notempty b/vendor/libgit2/tests/resources/submod2/not/.gitted/notempty deleted file mode 100644 index 9b33ac4e4..000000000 --- a/vendor/libgit2/tests/resources/submod2/not/.gitted/notempty +++ /dev/null @@ -1 +0,0 @@ -fooled you diff --git a/vendor/libgit2/tests/resources/submod2/not/README.txt b/vendor/libgit2/tests/resources/submod2/not/README.txt deleted file mode 100644 index 4f6935b98..000000000 --- a/vendor/libgit2/tests/resources/submod2/not/README.txt +++ /dev/null @@ -1 +0,0 @@ -what am I really diff --git a/vendor/libgit2/tests/resources/submod2/sm_added_and_uncommited/.gitted b/vendor/libgit2/tests/resources/submod2/sm_added_and_uncommited/.gitted deleted file mode 100644 index 2b2a4cf90..000000000 --- a/vendor/libgit2/tests/resources/submod2/sm_added_and_uncommited/.gitted +++ /dev/null @@ -1 +0,0 @@ -gitdir: ../.git/modules/sm_added_and_uncommited diff --git a/vendor/libgit2/tests/resources/submod2/sm_added_and_uncommited/README.txt b/vendor/libgit2/tests/resources/submod2/sm_added_and_uncommited/README.txt deleted file mode 100644 index 780d7397f..000000000 --- a/vendor/libgit2/tests/resources/submod2/sm_added_and_uncommited/README.txt +++ /dev/null @@ -1,3 +0,0 @@ -This is the target for submod2 submodule links. -Don't add commits casually because you make break tests. - diff --git a/vendor/libgit2/tests/resources/submod2/sm_added_and_uncommited/file_to_modify b/vendor/libgit2/tests/resources/submod2/sm_added_and_uncommited/file_to_modify deleted file mode 100644 index 789efbdad..000000000 --- a/vendor/libgit2/tests/resources/submod2/sm_added_and_uncommited/file_to_modify +++ /dev/null @@ -1,3 +0,0 @@ -This is a file to modify in submodules -It already has some history. -You can add local changes as needed. diff --git a/vendor/libgit2/tests/resources/submod2/sm_changed_file/.gitted b/vendor/libgit2/tests/resources/submod2/sm_changed_file/.gitted deleted file mode 100644 index dc98b1674..000000000 --- a/vendor/libgit2/tests/resources/submod2/sm_changed_file/.gitted +++ /dev/null @@ -1 +0,0 @@ -gitdir: ../.git/modules/sm_changed_file diff --git a/vendor/libgit2/tests/resources/submod2/sm_changed_file/README.txt b/vendor/libgit2/tests/resources/submod2/sm_changed_file/README.txt deleted file mode 100644 index 780d7397f..000000000 --- a/vendor/libgit2/tests/resources/submod2/sm_changed_file/README.txt +++ /dev/null @@ -1,3 +0,0 @@ -This is the target for submod2 submodule links. -Don't add commits casually because you make break tests. - diff --git a/vendor/libgit2/tests/resources/submod2/sm_changed_file/file_to_modify b/vendor/libgit2/tests/resources/submod2/sm_changed_file/file_to_modify deleted file mode 100644 index e5ba67168..000000000 --- a/vendor/libgit2/tests/resources/submod2/sm_changed_file/file_to_modify +++ /dev/null @@ -1,4 +0,0 @@ -This is a file to modify in submodules -It already has some history. -You can add local changes as needed. -In this case, the file is changed in the workdir diff --git a/vendor/libgit2/tests/resources/submod2/sm_changed_head/.gitted b/vendor/libgit2/tests/resources/submod2/sm_changed_head/.gitted deleted file mode 100644 index d5419b62d..000000000 --- a/vendor/libgit2/tests/resources/submod2/sm_changed_head/.gitted +++ /dev/null @@ -1 +0,0 @@ -gitdir: ../.git/modules/sm_changed_head diff --git a/vendor/libgit2/tests/resources/submod2/sm_changed_head/README.txt b/vendor/libgit2/tests/resources/submod2/sm_changed_head/README.txt deleted file mode 100644 index 780d7397f..000000000 --- a/vendor/libgit2/tests/resources/submod2/sm_changed_head/README.txt +++ /dev/null @@ -1,3 +0,0 @@ -This is the target for submod2 submodule links. -Don't add commits casually because you make break tests. - diff --git a/vendor/libgit2/tests/resources/submod2/sm_changed_head/file_to_modify b/vendor/libgit2/tests/resources/submod2/sm_changed_head/file_to_modify deleted file mode 100644 index 8eb1e637e..000000000 --- a/vendor/libgit2/tests/resources/submod2/sm_changed_head/file_to_modify +++ /dev/null @@ -1,4 +0,0 @@ -This is a file to modify in submodules -It already has some history. -You can add local changes as needed. -This one has been changed and the change has been committed to HEAD. diff --git a/vendor/libgit2/tests/resources/submod2/sm_changed_index/.gitted b/vendor/libgit2/tests/resources/submod2/sm_changed_index/.gitted deleted file mode 100644 index 2c7a5b271..000000000 --- a/vendor/libgit2/tests/resources/submod2/sm_changed_index/.gitted +++ /dev/null @@ -1 +0,0 @@ -gitdir: ../.git/modules/sm_changed_index diff --git a/vendor/libgit2/tests/resources/submod2/sm_changed_index/README.txt b/vendor/libgit2/tests/resources/submod2/sm_changed_index/README.txt deleted file mode 100644 index 780d7397f..000000000 --- a/vendor/libgit2/tests/resources/submod2/sm_changed_index/README.txt +++ /dev/null @@ -1,3 +0,0 @@ -This is the target for submod2 submodule links. -Don't add commits casually because you make break tests. - diff --git a/vendor/libgit2/tests/resources/submod2/sm_changed_index/file_to_modify b/vendor/libgit2/tests/resources/submod2/sm_changed_index/file_to_modify deleted file mode 100644 index a02d31770..000000000 --- a/vendor/libgit2/tests/resources/submod2/sm_changed_index/file_to_modify +++ /dev/null @@ -1,4 +0,0 @@ -This is a file to modify in submodules -It already has some history. -You can add local changes as needed. -Here the file is changed in the index and the workdir diff --git a/vendor/libgit2/tests/resources/submod2/sm_changed_untracked_file/.gitted b/vendor/libgit2/tests/resources/submod2/sm_changed_untracked_file/.gitted deleted file mode 100644 index 9a1070647..000000000 --- a/vendor/libgit2/tests/resources/submod2/sm_changed_untracked_file/.gitted +++ /dev/null @@ -1 +0,0 @@ -gitdir: ../.git/modules/sm_changed_untracked_file diff --git a/vendor/libgit2/tests/resources/submod2/sm_changed_untracked_file/README.txt b/vendor/libgit2/tests/resources/submod2/sm_changed_untracked_file/README.txt deleted file mode 100644 index 780d7397f..000000000 --- a/vendor/libgit2/tests/resources/submod2/sm_changed_untracked_file/README.txt +++ /dev/null @@ -1,3 +0,0 @@ -This is the target for submod2 submodule links. -Don't add commits casually because you make break tests. - diff --git a/vendor/libgit2/tests/resources/submod2/sm_changed_untracked_file/file_to_modify b/vendor/libgit2/tests/resources/submod2/sm_changed_untracked_file/file_to_modify deleted file mode 100644 index 789efbdad..000000000 --- a/vendor/libgit2/tests/resources/submod2/sm_changed_untracked_file/file_to_modify +++ /dev/null @@ -1,3 +0,0 @@ -This is a file to modify in submodules -It already has some history. -You can add local changes as needed. diff --git a/vendor/libgit2/tests/resources/submod2/sm_changed_untracked_file/i_am_untracked b/vendor/libgit2/tests/resources/submod2/sm_changed_untracked_file/i_am_untracked deleted file mode 100644 index d2bae6167..000000000 --- a/vendor/libgit2/tests/resources/submod2/sm_changed_untracked_file/i_am_untracked +++ /dev/null @@ -1 +0,0 @@ -This file is untracked, but in a submodule diff --git a/vendor/libgit2/tests/resources/submod2/sm_missing_commits/.gitted b/vendor/libgit2/tests/resources/submod2/sm_missing_commits/.gitted deleted file mode 100644 index 70193be84..000000000 --- a/vendor/libgit2/tests/resources/submod2/sm_missing_commits/.gitted +++ /dev/null @@ -1 +0,0 @@ -gitdir: ../.git/modules/sm_missing_commits diff --git a/vendor/libgit2/tests/resources/submod2/sm_missing_commits/README.txt b/vendor/libgit2/tests/resources/submod2/sm_missing_commits/README.txt deleted file mode 100644 index 780d7397f..000000000 --- a/vendor/libgit2/tests/resources/submod2/sm_missing_commits/README.txt +++ /dev/null @@ -1,3 +0,0 @@ -This is the target for submod2 submodule links. -Don't add commits casually because you make break tests. - diff --git a/vendor/libgit2/tests/resources/submod2/sm_missing_commits/file_to_modify b/vendor/libgit2/tests/resources/submod2/sm_missing_commits/file_to_modify deleted file mode 100644 index 8834b635d..000000000 --- a/vendor/libgit2/tests/resources/submod2/sm_missing_commits/file_to_modify +++ /dev/null @@ -1,3 +0,0 @@ -This is a file to modify in submodules -It already has some history. - diff --git a/vendor/libgit2/tests/resources/submod2/sm_unchanged/.gitted b/vendor/libgit2/tests/resources/submod2/sm_unchanged/.gitted deleted file mode 100644 index 51a679c80..000000000 --- a/vendor/libgit2/tests/resources/submod2/sm_unchanged/.gitted +++ /dev/null @@ -1 +0,0 @@ -gitdir: ../.git/modules/sm_unchanged diff --git a/vendor/libgit2/tests/resources/submod2/sm_unchanged/README.txt b/vendor/libgit2/tests/resources/submod2/sm_unchanged/README.txt deleted file mode 100644 index 780d7397f..000000000 --- a/vendor/libgit2/tests/resources/submod2/sm_unchanged/README.txt +++ /dev/null @@ -1,3 +0,0 @@ -This is the target for submod2 submodule links. -Don't add commits casually because you make break tests. - diff --git a/vendor/libgit2/tests/resources/submod2/sm_unchanged/file_to_modify b/vendor/libgit2/tests/resources/submod2/sm_unchanged/file_to_modify deleted file mode 100644 index 789efbdad..000000000 --- a/vendor/libgit2/tests/resources/submod2/sm_unchanged/file_to_modify +++ /dev/null @@ -1,3 +0,0 @@ -This is a file to modify in submodules -It already has some history. -You can add local changes as needed. diff --git a/vendor/libgit2/tests/resources/submod2_target/.gitted/HEAD b/vendor/libgit2/tests/resources/submod2_target/.gitted/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/vendor/libgit2/tests/resources/submod2_target/.gitted/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/vendor/libgit2/tests/resources/submod2_target/.gitted/config b/vendor/libgit2/tests/resources/submod2_target/.gitted/config deleted file mode 100644 index af107929f..000000000 --- a/vendor/libgit2/tests/resources/submod2_target/.gitted/config +++ /dev/null @@ -1,6 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true diff --git a/vendor/libgit2/tests/resources/submod2_target/.gitted/description b/vendor/libgit2/tests/resources/submod2_target/.gitted/description deleted file mode 100644 index 498b267a8..000000000 --- a/vendor/libgit2/tests/resources/submod2_target/.gitted/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/vendor/libgit2/tests/resources/submod2_target/.gitted/index b/vendor/libgit2/tests/resources/submod2_target/.gitted/index deleted file mode 100644 index eb3ff8c101bf9689c5ec54f63dfe456d65313cea..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 192 zcmZ?q402{*U|<5_0M@I^fHVV)=3`)BVYq#|l!2jf2?GP;SD=NB2J7Ek~B;>VZr z-=W*rTb(&1>aFX=z!l``=;G_DS5i>|G6MtxSg)-`rXl8?nTuv#X2rbUw{9(2+Em`_ z+F}thHFVyBncfV1X_+~x@g@23x%nxXX_X*zR@#d%xV7m{P}xn_BZc)^T+6E5`2lzM BI;;Qy diff --git a/vendor/libgit2/tests/resources/submod2_target/.gitted/info/exclude b/vendor/libgit2/tests/resources/submod2_target/.gitted/info/exclude deleted file mode 100644 index a5196d1be..000000000 --- a/vendor/libgit2/tests/resources/submod2_target/.gitted/info/exclude +++ /dev/null @@ -1,6 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ diff --git a/vendor/libgit2/tests/resources/submod2_target/.gitted/logs/HEAD b/vendor/libgit2/tests/resources/submod2_target/.gitted/logs/HEAD deleted file mode 100644 index 0ecd1113f..000000000 --- a/vendor/libgit2/tests/resources/submod2_target/.gitted/logs/HEAD +++ /dev/null @@ -1,4 +0,0 @@ -0000000000000000000000000000000000000000 6b31c659545507c381e9cd34ec508f16c04e149e Russell Belfer 1342559662 -0700 commit (initial): Initial commit -6b31c659545507c381e9cd34ec508f16c04e149e 41bd4bc3df978de695f67ace64c560913da11653 Russell Belfer 1342559709 -0700 commit: Adding test file -41bd4bc3df978de695f67ace64c560913da11653 5e4963595a9774b90524d35a807169049de8ccad Russell Belfer 1342559726 -0700 commit: Updating test file -5e4963595a9774b90524d35a807169049de8ccad 480095882d281ed676fe5b863569520e54a7d5c0 Russell Belfer 1342559925 -0700 commit: One more update diff --git a/vendor/libgit2/tests/resources/submod2_target/.gitted/logs/refs/heads/master b/vendor/libgit2/tests/resources/submod2_target/.gitted/logs/refs/heads/master deleted file mode 100644 index 0ecd1113f..000000000 --- a/vendor/libgit2/tests/resources/submod2_target/.gitted/logs/refs/heads/master +++ /dev/null @@ -1,4 +0,0 @@ -0000000000000000000000000000000000000000 6b31c659545507c381e9cd34ec508f16c04e149e Russell Belfer 1342559662 -0700 commit (initial): Initial commit -6b31c659545507c381e9cd34ec508f16c04e149e 41bd4bc3df978de695f67ace64c560913da11653 Russell Belfer 1342559709 -0700 commit: Adding test file -41bd4bc3df978de695f67ace64c560913da11653 5e4963595a9774b90524d35a807169049de8ccad Russell Belfer 1342559726 -0700 commit: Updating test file -5e4963595a9774b90524d35a807169049de8ccad 480095882d281ed676fe5b863569520e54a7d5c0 Russell Belfer 1342559925 -0700 commit: One more update diff --git a/vendor/libgit2/tests/resources/submod2_target/.gitted/objects/06/362fe2fdb7010d0e447b4fb450d405420479a1 b/vendor/libgit2/tests/resources/submod2_target/.gitted/objects/06/362fe2fdb7010d0e447b4fb450d405420479a1 deleted file mode 100644 index f4b7094c52b2b13a955016da7ed894453ab9813c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 55 zcmV-70LcG%0V^p=O;s?qU@$Z=Ff%bx2y%6F@paWJsVHHn;4Pm1^~H}b<-bF>ueUmL NNYq=`3jkt>5$jr-7%cz* diff --git a/vendor/libgit2/tests/resources/submod2_target/.gitted/objects/0e/6a3ca48bd47cfe67681acf39aa0b10a0b92484 b/vendor/libgit2/tests/resources/submod2_target/.gitted/objects/0e/6a3ca48bd47cfe67681acf39aa0b10a0b92484 deleted file mode 100644 index 56c845e49de66164d68d3f7439e2aedcb220c498..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 53 zcmV-50LuS(0ZYosPf{>3U`ELH%bM1{1>oK%I9e1+Wnl+3hBh0HvK;?g7_r!*(E Ln2QSlfR+#vlJ6KL diff --git a/vendor/libgit2/tests/resources/submod2_target/.gitted/objects/17/d0ece6e96460a06592d9d9d000de37ba4232c5 b/vendor/libgit2/tests/resources/submod2_target/.gitted/objects/17/d0ece6e96460a06592d9d9d000de37ba4232c5 deleted file mode 100644 index bd179b5f5406f12f948b97d871c763cc0e10b06f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 93 zcmV-j0HXhR0V^p=O;xZkU@$Z=Ff%bx2y%6F@paWJsVHHn;4Pm1^~H}b<-bF>ueUmL zNYq=`3#uwDGbc5^BtJekKP5A*l7TPFW=Z#znt$mTQs*sKaSJTisnP-fi0mQg3zH~C diff --git a/vendor/libgit2/tests/resources/submod2_target/.gitted/objects/41/bd4bc3df978de695f67ace64c560913da11653 b/vendor/libgit2/tests/resources/submod2_target/.gitted/objects/41/bd4bc3df978de695f67ace64c560913da11653 deleted file mode 100644 index ccf49bd15cac3c2bac13fa644f20924a6928dead..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 163 zcmV;U09^lg0hNx~4Z<)G1^IRr+W=^NtQ|`T0VU9Zv)&w14&*rf;}+2TJYIve6?|_sH;Eh(2DY7+$k{q!!fw!> z(TR3ZR66Ul7xvZ-v-q#0c>kLs07~zTmQMI-8)u#UYRIi-p RZG8X>-X+A`MI6N*Dz6QY4Oxv{b!#F?R3>Zey&Eh^ zLz#U_A&YRfX{+!#kAs&5Uc8K4;a=nOJGbeKx3rZ94B99}B8703PD;_&{;zfVZz|>;+Qv+EoOhlpLYZ1IW9p#9+rkUf;jILVt%D7~a-( zHi)r&*iZ%W*dq%vm(oN!T~(-~7mAT<%e|zi#OU5_=*u97N%F)=dM#H`s@SPCR?3Xz zYe>>UAWW_u_S^>i9Q&@z0(V`y4!Di!`!U<|m_B)1zaXR>5o?JA7hk-0Cq4h{RR3GL V-?ucIUk@ueUmL zNYq=`3#uwDGbc5^BtJekKP5A*lA&VW?_0N)ENv?9b#1W-nHoB8!Ax%es2L;m5j-ce diff --git a/vendor/libgit2/tests/resources/submod2_target/.gitted/objects/78/0d7397f5e8f8f477fb55b7af3accc2154b2d4a b/vendor/libgit2/tests/resources/submod2_target/.gitted/objects/78/0d7397f5e8f8f477fb55b7af3accc2154b2d4a deleted file mode 100644 index 6d27af8a8..000000000 --- a/vendor/libgit2/tests/resources/submod2_target/.gitted/objects/78/0d7397f5e8f8f477fb55b7af3accc2154b2d4a +++ /dev/null @@ -1,2 +0,0 @@ -x-Ë1Â0 FaæžâßØ0pŽÀìÄÐ(N-ÅöÐÛÓ¡Ò“¾é±ãq]>ksÅ*š? |m“‡Õçiª@ÛÖý¶¼m»¨V£…£'©î`)”.Ø-1¨ x -u„xãòt(+ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/submod2_target/.gitted/objects/78/9efbdadaa4a582778d4584385495559ea0994b b/vendor/libgit2/tests/resources/submod2_target/.gitted/objects/78/9efbdadaa4a582778d4584385495559ea0994b deleted file mode 100644 index 17458840b..000000000 --- a/vendor/libgit2/tests/resources/submod2_target/.gitted/objects/78/9efbdadaa4a582778d4584385495559ea0994b +++ /dev/null @@ -1,2 +0,0 @@ -x Œ± …0 )ÞŠ?= ¥ÉÄNŠlO¤k®¸‹jÛúÿ¹8&„«¨ ãr ” -ïqJWñ°7¾B<ÉáöfÙìK8­#Q1C-‘"eª·Ì«£Š°ð>¼'@ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/submod2_target/.gitted/objects/88/34b635dd468a83cb012f6feace968c1c9f5d6e b/vendor/libgit2/tests/resources/submod2_target/.gitted/objects/88/34b635dd468a83cb012f6feace968c1c9f5d6e deleted file mode 100644 index 83cc29fb159ab59087d724473642a0057d841358..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 81 zcmV-X0IvUd0ZYosPf{?mWC+Q~ELH%bM1{1>oK%I9e1+Wnl+3hBh0HvK;?g7_r!*(E nn9H+7Au*>YH8G`9AtSL^p*TM`RRO58B)_OqkBbWc`{EjQ6-gx7 diff --git a/vendor/libgit2/tests/resources/submod2_target/.gitted/objects/d0/5f2cd5cc77addf68ed6f50d622c9a4f732e6c5 b/vendor/libgit2/tests/resources/submod2_target/.gitted/objects/d0/5f2cd5cc77addf68ed6f50d622c9a4f732e6c5 deleted file mode 100644 index 55bda40ef277279310f6bf3122497c14602374d6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 93 zcmV-j0HXhR0V^p=O;xZkU@$Z=Ff%bx2y%6F@paWJsVHHn;4Pm1^~H}b<-bF>ueUmL zNYq=`3#uwDGbc5^BtJekKP5A*lA*(7o9SJ*uIAH>`uVTUP3w`FADagNj^84oNOvn! diff --git a/vendor/libgit2/tests/resources/submod2_target/.gitted/refs/heads/master b/vendor/libgit2/tests/resources/submod2_target/.gitted/refs/heads/master deleted file mode 100644 index e12c44d7a..000000000 --- a/vendor/libgit2/tests/resources/submod2_target/.gitted/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -480095882d281ed676fe5b863569520e54a7d5c0 diff --git a/vendor/libgit2/tests/resources/submod2_target/README.txt b/vendor/libgit2/tests/resources/submod2_target/README.txt deleted file mode 100644 index 780d7397f..000000000 --- a/vendor/libgit2/tests/resources/submod2_target/README.txt +++ /dev/null @@ -1,3 +0,0 @@ -This is the target for submod2 submodule links. -Don't add commits casually because you make break tests. - diff --git a/vendor/libgit2/tests/resources/submod2_target/file_to_modify b/vendor/libgit2/tests/resources/submod2_target/file_to_modify deleted file mode 100644 index 789efbdad..000000000 --- a/vendor/libgit2/tests/resources/submod2_target/file_to_modify +++ /dev/null @@ -1,3 +0,0 @@ -This is a file to modify in submodules -It already has some history. -You can add local changes as needed. diff --git a/vendor/libgit2/tests/resources/submodule_simple/.gitmodules b/vendor/libgit2/tests/resources/submodule_simple/.gitmodules deleted file mode 100644 index 03150b4a7..000000000 --- a/vendor/libgit2/tests/resources/submodule_simple/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "testrepo"] - path = testrepo - url = ../testrepo.git diff --git a/vendor/libgit2/tests/resources/submodule_simple/.gitted/HEAD b/vendor/libgit2/tests/resources/submodule_simple/.gitted/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/vendor/libgit2/tests/resources/submodule_simple/.gitted/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/vendor/libgit2/tests/resources/submodule_simple/.gitted/config b/vendor/libgit2/tests/resources/submodule_simple/.gitted/config deleted file mode 100644 index 78387c50b..000000000 --- a/vendor/libgit2/tests/resources/submodule_simple/.gitted/config +++ /dev/null @@ -1,8 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = false - bare = false - logallrefupdates = true - symlinks = false - ignorecase = true - hideDotFiles = dotGitOnly diff --git a/vendor/libgit2/tests/resources/submodule_simple/.gitted/description b/vendor/libgit2/tests/resources/submodule_simple/.gitted/description deleted file mode 100644 index 498b267a8..000000000 --- a/vendor/libgit2/tests/resources/submodule_simple/.gitted/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/vendor/libgit2/tests/resources/submodule_simple/.gitted/index b/vendor/libgit2/tests/resources/submodule_simple/.gitted/index deleted file mode 100644 index 6e22d7ffb7fc29502b9503b6e4cbfeda0cfd3d49..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 184 zcmZ?q402{*U|<5_5Z9omK$-zYgV+$zxCF)m(oS1GbvpmL-0^(8l diff --git a/vendor/libgit2/tests/resources/submodule_simple/.gitted/objects/22/9cea838964f435d4fc2c11561ddb7447003609 b/vendor/libgit2/tests/resources/submodule_simple/.gitted/objects/22/9cea838964f435d4fc2c11561ddb7447003609 deleted file mode 100644 index 9f0800d29d5852b9429629b8fafcb7eb52c2ddcf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 134 zcmV;10D1p-0iBIY3IZ_@1zqP9eE}ukApsHBf`>?Y(ioYZhD^M_0dL^$QBd_znA-po z(`octVOpSyYcW&6_ o5E>U0zJc+^MVqX*aMoUHHR-$^)A%!>+TKRX8~jS@3n-I6wzN?|fdBvi diff --git a/vendor/libgit2/tests/resources/submodule_simple/.gitted/objects/5b/19f7523fbf55c96153ff5a94875583f1115a36 b/vendor/libgit2/tests/resources/submodule_simple/.gitted/objects/5b/19f7523fbf55c96153ff5a94875583f1115a36 deleted file mode 100644 index d0681ac4009d0b4f121131cba141b90656f36d44..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 91 zcmV-h0HptT0V^p=O;s>AWiT`_Ff%bx&`ZxO$<0qG%}Fh0*z&2<`Pb!!FYm18WKUI{ xt)bv^D9X^x00e4W&Gy*!Vq%o0#8`~k{}Z}{{#`Ej9Byj0 z?gJdhm(gL4j z+qy6>){?i;=smt$hlkdDwG+PfeU$&1~n* cF^PW)j2@Fdb!52iwYKd(GW=Q16F2Hlw>qa;W&i*H diff --git a/vendor/libgit2/tests/resources/submodule_simple/.gitted/objects/b4/f28943fad380f4ee3a9c6b95259b28204cc25a b/vendor/libgit2/tests/resources/submodule_simple/.gitted/objects/b4/f28943fad380f4ee3a9c6b95259b28204cc25a deleted file mode 100644 index 653238cd88b22ea94914d0297b580907474bf4ee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 65 zcmV-H0KWft0ZYosPf{>5W{55>P0GzrDa}b$P%23+E-6Ya$XANx;w(rk$xyIWfC+JN XmKNmz`FeW#Fd@D4%n~jDSWXw7S(_TA diff --git a/vendor/libgit2/tests/resources/submodule_simple/.gitted/objects/d6/9ff504a3ba631f2fdb35bff93cc8cb8e85f4f8 b/vendor/libgit2/tests/resources/submodule_simple/.gitted/objects/d6/9ff504a3ba631f2fdb35bff93cc8cb8e85f4f8 deleted file mode 100644 index dabf65b7ee6e84994384d1d1d9fbab13b4df3561..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 92 zcmV-i0HgnS0V^p=O;s>AWiT`_Ff%bx&`ZxO$<0qG%}Fh0*z&2<`Pb!!FYm18WKUI{ yt)bv^D9X^x00l71lb0Sb3n{M*m7-alcwygN_jzOR4$laTTN z2A-VEB>j@q;*z4&f_#YbkRVrAAj_1&NWqY6V-nw|q+S8Xtd@&&D(sB!xQ3lP4AjD4 ys9?Z#)%8!d!<%{O#@bo3x^GY4mj3@b`_cPT!M_=Km$h&Qx=xo~|8AY~c_{$IhD+W6 diff --git a/vendor/libgit2/tests/resources/submodule_with_path/.gitted/objects/18/372280a56a54340fa600aa91315065c6c4c693 b/vendor/libgit2/tests/resources/submodule_with_path/.gitted/objects/18/372280a56a54340fa600aa91315065c6c4c693 deleted file mode 100644 index d9b4313e187ed50eb03ad8c99a11ae9bbfa14879..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 85 zcmV-b0IL6Z0V^p=O;s?nWH2-^Ff%bx&`ZxO$<0qG%}Fh0Fv~DB3~ws^w&Jf$@I2nw r1vl3IS2HmH0)?E+B!;W5f3h9k%u6@c&XU!Ad-}HY|JT_795W{55>P0GzrDa}b$P%23+E-6Ya$XANx;w(rk$xyIW$jMC7 VhY53WmKNmz#q{(LLI7Du7m_mY8dU%Q diff --git a/vendor/libgit2/tests/resources/submodule_with_path/.gitted/objects/89/ca686bb21bfb75dda99a02313831a0c418f921 b/vendor/libgit2/tests/resources/submodule_with_path/.gitted/objects/89/ca686bb21bfb75dda99a02313831a0c418f921 deleted file mode 100644 index 7c1af6645b3678f7cddabf69568fbe93b73c26c7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 161 zcmV;S0ABxi0i}-14Z<)GL^-<(HvsbbvvDMZxX=L&*z1jwgW1S2qJ2yaoM!Z-HyV;! zx2~;&Q*X>V16sq2MH>qk5167aFw+zrJ6FhufHad+dusgZnxfB3m~yf<_%dP`IS_J& z1oOf%7sIBYO7Ff((~t5=t?1_}^^ljo@}R$VuNyTvWa$@@deh)NB1W*F&n6h71|3H` P|1qIN_CtLE2lz_SuD?t; diff --git a/vendor/libgit2/tests/resources/submodule_with_path/.gitted/objects/b1/620ef2628d10416a84d19c783e33dc4556c9c3 b/vendor/libgit2/tests/resources/submodule_with_path/.gitted/objects/b1/620ef2628d10416a84d19c783e33dc4556c9c3 deleted file mode 100644 index 4475582597be6c70d7350a9d6e9dd3106b6d7d31..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 86 zcmV-c0IC0Y0V^p=O;s?nWH2-^Ff%bx&`ZxO$<0qG%}Fh0*ky90_T=RY8+RK=yPmw1 sz3{`I3CB$gfIuN9Gl}7<>z{0gH}leswX5XNWE?P0GzrDa}b$P%23+E-6Ya$XANx;w(rk$xyIW$jMC7 ahY53WmKNmz#q{*xLVD?$C0qc#AQ=eHq#alQ diff --git a/vendor/libgit2/tests/resources/submodule_with_path/.gitted/objects/c8/4bf57ba2254dba216ab5c6eb1a19fe8bd0e0d6 b/vendor/libgit2/tests/resources/submodule_with_path/.gitted/objects/c8/4bf57ba2254dba216ab5c6eb1a19fe8bd0e0d6 deleted file mode 100644 index 9f664569ce0477eeddf845279556266ded79ab69..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 127 zcmV-_0D%8^0i})04Z<)CKsjd$F933WZYm+v3mdS2up4eLK1{#Z}`(UZSY*b+*WvPS`U50JrDb%rS8)7 h(9&9V=y!`00M=Q)Z&t&)Pj75W$|x6&wBra>GJM8mHWQ_@lQg^ J0{~*65=1l57(D<0 diff --git a/vendor/libgit2/tests/resources/submodule_with_path/.gitted/refs/heads/master b/vendor/libgit2/tests/resources/submodule_with_path/.gitted/refs/heads/master deleted file mode 100644 index 4b5a5a21d..000000000 --- a/vendor/libgit2/tests/resources/submodule_with_path/.gitted/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -89ca686bb21bfb75dda99a02313831a0c418f921 diff --git a/vendor/libgit2/tests/resources/submodules/.gitted/HEAD b/vendor/libgit2/tests/resources/submodules/.gitted/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/vendor/libgit2/tests/resources/submodules/.gitted/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/vendor/libgit2/tests/resources/submodules/.gitted/config b/vendor/libgit2/tests/resources/submodules/.gitted/config deleted file mode 100644 index af107929f..000000000 --- a/vendor/libgit2/tests/resources/submodules/.gitted/config +++ /dev/null @@ -1,6 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true diff --git a/vendor/libgit2/tests/resources/submodules/.gitted/description b/vendor/libgit2/tests/resources/submodules/.gitted/description deleted file mode 100644 index 498b267a8..000000000 --- a/vendor/libgit2/tests/resources/submodules/.gitted/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/vendor/libgit2/tests/resources/submodules/.gitted/index b/vendor/libgit2/tests/resources/submodules/.gitted/index deleted file mode 100644 index 97bf8ef515d84a4fcc16770b467f7afd6566c2b3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 408 zcmZ?q402{*U|<4bR{yNzY#_}5qxl#ZSQr8lmoP9i0x{!Ppp*y@Csi2qObR^j_pV!Y zc}}hRgyXiA#o-Lxdg+-Zx%nxjIjO}ULx8|P|5*hx4K^?Qc{-YTY*)Yku`l_4??6+- z=Yo}`8--qc&%8!BJ0Zy`aFnDLmlUNI 1332365253 -0700 commit (initial): initial commit -09176a980273d801a3e37cc45c84af1366501ed9 97896810b3210244a62a82458b8e0819ecfc6850 Russell Belfer 1332780781 -0700 commit: Setting up gitmodules diff --git a/vendor/libgit2/tests/resources/submodules/.gitted/logs/refs/heads/master b/vendor/libgit2/tests/resources/submodules/.gitted/logs/refs/heads/master deleted file mode 100644 index 87a7bdafc..000000000 --- a/vendor/libgit2/tests/resources/submodules/.gitted/logs/refs/heads/master +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 09176a980273d801a3e37cc45c84af1366501ed9 Russell Belfer 1332365253 -0700 commit (initial): initial commit -09176a980273d801a3e37cc45c84af1366501ed9 97896810b3210244a62a82458b8e0819ecfc6850 Russell Belfer 1332780781 -0700 commit: Setting up gitmodules diff --git a/vendor/libgit2/tests/resources/submodules/.gitted/objects/26/a3b32a9b7d97486c5557f5902e8ac94638145e b/vendor/libgit2/tests/resources/submodules/.gitted/objects/26/a3b32a9b7d97486c5557f5902e8ac94638145e deleted file mode 100644 index 2c3c2cb61..000000000 --- a/vendor/libgit2/tests/resources/submodules/.gitted/objects/26/a3b32a9b7d97486c5557f5902e8ac94638145e +++ /dev/null @@ -1,2 +0,0 @@ -x%‰= -€0 F]í)Š0à"ÃIŒ*•|Éý-t{?œ2ÇilV8¿ùô$±«Øm¡ýv»ãk­k*F DAÊ=(=|=6 ¬DAv=ÛÍA}™&'…Oò$= \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/submodules/.gitted/objects/78/308c9251cf4eee8b25a76c7d2790c73d797357 b/vendor/libgit2/tests/resources/submodules/.gitted/objects/78/308c9251cf4eee8b25a76c7d2790c73d797357 deleted file mode 100644 index c85fb5512fd51b1c48f70673bddc2d2d1293b749..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 97 zcmV-n0G|JN0ZYosPg1b7V2Ca*P0GzrDa}b$P%23+E-6Ya$XANx;w(rk$xyIWfC+JN zmKNmz`TC*7sYS*5MM?U_MalX(nMvuHB}V!nRY1Yi;{4L0FfcPQQP4}zEXmDJDa}bOW~eaenG|^5?_Ia*@|;@r z3CC?Ki^HMHQc`nLOHxx9IJJMzzF%^;=daQWAyJ{mce9p#kb)`!nv$88iA#-{0T3vZ sq!yPHr55BfEQ^2pdDi5a!}*^lPZI0ntiPdJ2m8f$JV2;iQ%UrJC`g&0Bc+As#X2&96)4EAqkv$8IjAY6 a$wc8Q*taTcz9>#~PjY_kmaqW{5=V$nDLFO( diff --git a/vendor/libgit2/tests/resources/submodules/.gitted/objects/info/packs b/vendor/libgit2/tests/resources/submodules/.gitted/objects/info/packs deleted file mode 100644 index 0785ef698..000000000 --- a/vendor/libgit2/tests/resources/submodules/.gitted/objects/info/packs +++ /dev/null @@ -1,2 +0,0 @@ -P pack-b69d04bb39ac274669e2184e45bd90015d02ef5b.pack - diff --git a/vendor/libgit2/tests/resources/submodules/.gitted/objects/pack/pack-b69d04bb39ac274669e2184e45bd90015d02ef5b.idx b/vendor/libgit2/tests/resources/submodules/.gitted/objects/pack/pack-b69d04bb39ac274669e2184e45bd90015d02ef5b.idx deleted file mode 100644 index 810fc318112de92aa7005938939150e8934983d8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1156 zcmexg;-AdGz`z8=!~l>wY?v7+K8i=fU^ER3(KNs*o;8E1_y*(R$2CV{TGk7v1<2jx z)c!sDe#zaQze+EJM1>mP&06+Biobt*M0jJzioYNHGY8>BVCLgygs z?ys;L`1Rnyd&5M)D{0AzQl>z}q%ZZ8#JO-qu0o+qigm7z_wim0p8K{*@9>bWVsK@% zB62@)uIqAxfEe+TVnR6i?7jQhrHvu~)vkToXx!o0xG%RcIYO-lc$_mdFfcPQQAkP6 zNi9iDVc^vMJ^Oyi-JZWnFN8#e8sE)Y_Cd-Jq9ivzB{MA(znaoKys7|BSuLkCc$}-u e=K=r%Rsi$aUrH3wz>q)yR#N~5FKI`K#Q$vniEE<( diff --git a/vendor/libgit2/tests/resources/submodules/.gitted/packed-refs b/vendor/libgit2/tests/resources/submodules/.gitted/packed-refs deleted file mode 100644 index a6450691e..000000000 --- a/vendor/libgit2/tests/resources/submodules/.gitted/packed-refs +++ /dev/null @@ -1,2 +0,0 @@ -# pack-refs with: peeled -09176a980273d801a3e37cc45c84af1366501ed9 refs/heads/master diff --git a/vendor/libgit2/tests/resources/submodules/.gitted/refs/heads/master b/vendor/libgit2/tests/resources/submodules/.gitted/refs/heads/master deleted file mode 100644 index 32b935853..000000000 --- a/vendor/libgit2/tests/resources/submodules/.gitted/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -97896810b3210244a62a82458b8e0819ecfc6850 diff --git a/vendor/libgit2/tests/resources/submodules/added b/vendor/libgit2/tests/resources/submodules/added deleted file mode 100644 index d5f7fc3f7..000000000 --- a/vendor/libgit2/tests/resources/submodules/added +++ /dev/null @@ -1 +0,0 @@ -added diff --git a/vendor/libgit2/tests/resources/submodules/gitmodules b/vendor/libgit2/tests/resources/submodules/gitmodules deleted file mode 100644 index 2798b696c..000000000 --- a/vendor/libgit2/tests/resources/submodules/gitmodules +++ /dev/null @@ -1,6 +0,0 @@ -[submodule "testrepo"] - path = testrepo - url = -[submodule ""] - path = testrepo - url = \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/submodules/ignored b/vendor/libgit2/tests/resources/submodules/ignored deleted file mode 100644 index 092bfb9bd..000000000 --- a/vendor/libgit2/tests/resources/submodules/ignored +++ /dev/null @@ -1 +0,0 @@ -yo diff --git a/vendor/libgit2/tests/resources/submodules/modified b/vendor/libgit2/tests/resources/submodules/modified deleted file mode 100644 index 452216e1d..000000000 --- a/vendor/libgit2/tests/resources/submodules/modified +++ /dev/null @@ -1,2 +0,0 @@ -changed - diff --git a/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/HEAD b/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/config b/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/config deleted file mode 100644 index d6dcad12b..000000000 --- a/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/config +++ /dev/null @@ -1,12 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true -[remote "origin"] - fetch = +refs/heads/*:refs/remotes/origin/* - url = /Users/rb/src/libgit2/tests/resources/testrepo.git -[branch "master"] - remote = origin - merge = refs/heads/master diff --git a/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/description b/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/description deleted file mode 100644 index 498b267a8..000000000 --- a/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/index b/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/index deleted file mode 100644 index 3eb8d84fe3d422ad85c2eea457fc2b4666876555..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 256 zcmZ?q402{*U|<4bX8)|HO+cCfM)NT+urT=lzRbYTxP*a$@hebD1ctt#TU*fI zV%sM3XuDG1k;nIrF|Y->I=c9}LiO)JrlIECL^FrOZ2C3tmySzqy# kf5W{D?0Ko>P;(B==WacEr(Ry|;KnJ_IIb|wRg|^@05f1sF#rGn diff --git a/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/info/exclude b/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/info/exclude deleted file mode 100644 index a5196d1be..000000000 --- a/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/info/exclude +++ /dev/null @@ -1,6 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ diff --git a/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/logs/HEAD b/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/logs/HEAD deleted file mode 100644 index 147643a30..000000000 --- a/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/logs/HEAD +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 a65fedf39aefe402d3bb6e24df4d4f5fe4547750 Russell Belfer 1332366307 -0700 clone: from /Users/rb/src/libgit2/tests/resources/testrepo.git diff --git a/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/logs/refs/heads/master b/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/logs/refs/heads/master deleted file mode 100644 index 147643a30..000000000 --- a/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/logs/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 a65fedf39aefe402d3bb6e24df4d4f5fe4547750 Russell Belfer 1332366307 -0700 clone: from /Users/rb/src/libgit2/tests/resources/testrepo.git diff --git a/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/13/85f264afb75a56a5bec74243be9b367ba4ca08 b/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/13/85f264afb75a56a5bec74243be9b367ba4ca08 deleted file mode 100644 index cedb2a22e6914c3bbbed90bbedf8fd2095bf5a7d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19 acmb-^#7G-5C`FfcPQQ3!H%bn$g%SfOmF@NI2De~WFK%%kl}eMcVO zI|fyeRFs&PoDrXvnUktlQc=R-y0dwo*>)TDjyrSqY|q)<@TYo1I8Fm*0&IVk`D diff --git a/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/1f/67fc4386b2d171e0d21be1c447e12660561f9b b/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/1f/67fc4386b2d171e0d21be1c447e12660561f9b deleted file mode 100644 index 225c45734e0bc525ec231bcba0d6ffd2e335a5d0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 dcmby-a%8?0t#9e}{dDH^=1pybKbl G{96FXClfjV diff --git a/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/36/97d64be941a53d4ae8f6a271e4e3fa56b022cc b/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/36/97d64be941a53d4ae8f6a271e4e3fa56b022cc deleted file mode 100644 index 9bb5b623bdbc11a70db482867b5b26d0d7b3215c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23 fcmb -öF- \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/75/057dd4114e74cca1d750d0aee1647c903cb60a b/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/75/057dd4114e74cca1d750d0aee1647c903cb60a deleted file mode 100644 index 2ef4faa0f82efa00eeac6cae9e8b2abccc8566ee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 119 zcmV--0Eqv10V^p=O;s>7G-5C`FfcPQQ3!H%bn$g%5N`dHvVMD1*wTH+ot*d0HmhE8 ziUX=5sVFfoIU_zTGbdHAq@skub!YQFv+XwQ9e3vJ*`Bkz;ZOC3aH!I})N-(rU!EJv Zrz=lf8^K%<@M(E`$>VgnNdSzWFYprfIFkSX diff --git a/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/76/3d71aadf09a7951596c9746c024e7eece7c7af b/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/76/3d71aadf09a7951596c9746c024e7eece7c7af deleted file mode 100644 index 716b0c64b..000000000 --- a/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/76/3d71aadf09a7951596c9746c024e7eece7c7af +++ /dev/null @@ -1 +0,0 @@ -xŽAj!³ö?0¨£ßÂ09Êo}HÚ6¨}ÿôjUPP©ÕZ&Yÿø˜ AÔ›±€pŒÁFdë¼÷pz[fŽYŒ½PÒqLJ.,Z§`™Å®Ð.ù`’vÙ ³q $Æ5+9çOëtœû>Û/úDE/龡W¯ï*e¿§VŸdf1>ð覭Öê²×äÄ›¹úÊ™F« ­ìTŽÙhœk.i¶^0Ô?P¼R, \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/7b/4384978d2493e851f9cca7858815fac9b10980 b/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/7b/4384978d2493e851f9cca7858815fac9b10980 deleted file mode 100644 index 23c462f3415e0b02832cb2445dc66bde8daa9ef4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 145 zcmV;C0B-+y0WFL{4uUWc06q5=dp99n3hj~@;|IJM@1-nQr9fac;rG_WWDawg5kCOd z_As|k4g%b0Lful=8zvnpG+m=jZw=bY1c#Q$p`lL6zA%J2r6@}B;~)Nf;1%vM@FZ~c zt3)`7pXS&5G9(|zB1dPylCXAUY6nMMYOU1m5jV(q`0%>J7Sl2^RiSaIAE^xQ@?_ml44FkiJ(R)*{ z(H(TH6>PFd5&0~h#n$X!k{LPpBqYvbW+w8_Xyl{wSm9BID%@u&V}Z+7esG(*wD+lu geg*3yQ9w!oju;WmZug_se_Eq;)3!|J3!n-%%(!(uEdT%j diff --git a/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/94/4c0f6e4dfa41595e6eb3ceecdb14f50fe18162 b/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/94/4c0f6e4dfa41595e6eb3ceecdb14f50fe18162 deleted file mode 100644 index 4cc3f4dff..000000000 --- a/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/94/4c0f6e4dfa41595e6eb3ceecdb14f50fe18162 +++ /dev/null @@ -1 +0,0 @@ -x+)JMU044b040031QrutñueX¡l¨ðmmA‹m›Ì£íJ}Gß;U‘T”˜—œŸ–™“ªWRQÂ`6ýš÷KÇ¥¶^/¾-*|òøWØ¥3P¥y©å`%ËEÛÞ±\&gŽÐ|Ÿ0§ÿ†{Ó1X \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/9a/03079b8a8ee85a0bee58bf9be3da8b62414ed4 b/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/9a/03079b8a8ee85a0bee58bf9be3da8b62414ed4 deleted file mode 100644 index bf7b2bb686f9d563f6af7ded70cfee2a31432731..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 50 zcmV-20L}k+0V^p=O;s>9W-v4`Ff%bxFxD%nC}B|N?pvM^cJ€³âQ¯ ¸·vL0I?Í!š4–Z=Ê! ×¦8²F¢Ã’!rÖsQßyÈ9]$DŽ&„l6AÇ>jFWüÒµ IKNiûë§Z¢%¡SˆŒ‘ -‹Ò ­ÅʉøU~̽øä>'¼ï™û ¯wþ ×[ËÇ× ÷öÚDGÚ¡±ðŒQ-ºMù«>dܶ‘OÞáÒò}í\à8g_ШÂoYr \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/a6/5fedf39aefe402d3bb6e24df4d4f5fe4547750 b/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/a6/5fedf39aefe402d3bb6e24df4d4f5fe4547750 deleted file mode 100644 index 29c8e824d..000000000 --- a/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/a6/5fedf39aefe402d3bb6e24df4d4f5fe4547750 +++ /dev/null @@ -1,3 +0,0 @@ -xŽQ -!@ûösBQ"‚ŽÐ ÆÙ± rÍîßÒú{BQQQ6W+Sv9;eTEK4oHX{LN+y0Ic;3tpET3 diff --git a/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/a8/233120f6ad708f843d861ce2b7228ec4e3dec6 b/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/a8/233120f6ad708f843d861ce2b7228ec4e3dec6 deleted file mode 100644 index 18a7f61c29ea8c5c9a48e3b30bead7f058d06293..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 26 icmb7F=Q|_FfcPQQ3!H%bn$g%5N`dHvVMD1*wTH+ot*d0HmhE8 zio?VJ2ow^N7(P11yjPSt(6h?$`BvBen~c_Mm~j}YJ*g-$FF7MVEi)%oucV@c!F6Zz zKC|sM>>YRJ?Ae~PyWvmuhH$9Tywq~Al3$)1%BL$&TpPh$5b$Yve97Z6W-v4`Ff%bxFw!fjC}DWMWvzv>=l^MU8)q`GHtgK^h(&LM mi2)EOq@`yt7)37I8y)_8j!@(7y31nK0iRS(hX4SGX&b5U?IBwL diff --git a/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/be/3563ae3f795b2b4353bcce3a527ad0a4f7f644 b/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/be/3563ae3f795b2b4353bcce3a527ad0a4f7f644 deleted file mode 100644 index 0817229bc..000000000 --- a/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/be/3563ae3f795b2b4353bcce3a527ad0a4f7f644 +++ /dev/null @@ -1,3 +0,0 @@ -xKj1D³Ö)zçUBëÛ-0ÁuV9¦Õò<#£È÷ÏȲ+ŠW003G-2nPTF diff --git a/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/f1/425cef211cc08caa31e7b545ffb232acb098c3 b/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/f1/425cef211cc08caa31e7b545ffb232acb098c3 deleted file mode 100644 index 82e2790e82869f7ebc516f291a2f2d0312f40660..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 103 zcmV-t0GR)H0V^p=O;xZoU@$Z=Ff%bxFwrZiC}FsE(lF(a=LrTT*1LX3PoI(w%=M@@ zF#rOEWQJMH?6bT2UPN)fi`YN=@vZJ8N53l&xs+6fZD#VvRu)#=_|s=Z5m>$`jW{Fc$=TS{`5WI9+ZM01*fsdfR&>4gdfE diff --git a/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/fa/49b077972391ad58037050f2a75f74e3671e92 b/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/fa/49b077972391ad58037050f2a75f74e3671e92 deleted file mode 100644 index 112998d425717bb922ce74e8f6f0f831d8dc4510..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24 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 rcaKYLMm*}NJR{E;Zd?;1?Rz=-Xf;gsm+2PX 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

    =uHz#4%J0P!RYVlzYKcqTl#P^Wo1(_e1-EG? zQ`$8DF0BYwYX)pBEt7?^4g-%KOa#>*KR(Hfx3~&{(r`8)w6ej0S2VG{DSOYoa|yDB zLbu7(s-V|qS4sZlpZze))(AI{YFBe-s6?|Hp*Xp$pEiNFu+vZ?yS!bLy6j@86<%La z-EsZ<)X1VH{dQ0%ES02hH#Kw&R)V(qz*2+Om&;GA2e8Y?o%1|9a%f)W?n|bdKsnAR z-C=oBih(PVopMLxC;Eu|jQ+%!?EaQX@8pmOgg(J>Kfg@0L$1CN8&bglE*DguQXvz+ zXqfPS7CFil;RI_80k*NPEB+wGiE=&9+go(u&>o>?p8U5V#ygT*6U+7$Nb6i@A_t9^ zt!(86aFnnRxFwL*S;%0tF=6!a$Ot$Cl8xFA7I0wE_3Q83wEuW@{aw1h4Y!n|3} z2T?xj8Js&pWGWRDM1>)i44kIUJa0m_E5@SO7SW@YixJ;`=wJ+(b!MgMqfId|3(iP)d zknwo^yFC?0${e^wsa->WIKu_Kk-QJQF~?ln)ZW!`52Vk5ulLk8h{0L(N!EWg|7B`I z7V-RyxSA7~eefI>-&;Mp#KF2#%5sU*Vo!ykMrO$_J z8V_$?kz_Mh2fM5ZJKXqP?RzGz#!pm_gXl~1BoBpg#H@uFa!D)?qILtTI#a)a{+7T!d;&; zm^@Z)vo*KqRBolmR}yid9mZ_tZQN3?h#vI>sr_-emjI^ZPY zMnx;rI{~^zXhkKGxi{v-CKsa`s~Tiqc~BMf*=^R7>8f<-$`my^v7*LHlL>-oxi)ih zbA*_7tvoRiMg~gdN`X@fJVT=*pd#QcB|TYODW=RQ!-JKpD5!1OX#5s)v$!iw8|<-pef1Hn zd~XCzUL4Kz?pEj9kMH0VRkjE4Kl~|fRhF53;A}WcAV|BE%kX4RFqSvO!d95X?>YuM z8;G7iuRgs$R(}0~p>}gw_)5hH{?DTXWIJ9l9F-MQoqFam;-8531<~o}wIo>*t?f8y zBms{*cuf&*vlmP=tT&xB$RIeHXYB>W85aK9Nlj|2XXPp;RY_tQcGa|1t71T{4|lK> zn+`ptp@m3z@%~cbaIDKI#$AwI|-Y&cFUVcOKrxXwRdMp+b zjVRxd&W5VpBvAdF4fOcJGPz<)h_%A2jhqr>N@u*vDvSKx&1lDvrFp{tO$OR!JUa$* z?7E_V_bR}HXZ@>S21HwrsaXR}TZd8Y*%hhfIdaLN4V-n9zaMZ7jUFF3cLPo0F5&)M zavvlaO58Wc8kIyO!g*>9`+I5IR|9=$PEc(~K2hYIP1M}X&BTLVN1kY#@6XX6O3$7H zn@%E!WvC6Fer4OqG7q5sVshug7h`n$+nGQyARg#Y367hv03Ma1&wnE{DU-0ZmM2J( zjOR@96i$~d?1Ch!6mX)nK5c#jlbaV8hnI%85}myMlO7z0nvq;V@X*Gc@5B}9|9hpr>m)vJu?qNx-VIBb;R-n5%_AT#>7 zNEFj~$Yw-X6KCHC>Vd!Ki8c8w3DeqpfZrc^R)FVwXQtor)*}iFs(8+*<{Q*16 z657Ys)AIUaRk@!|##9vGJZpVVfLf5w==fr&U*y=l{_KQgsNP~xONCGvZ#w(>v-~ef zafK^+9r{~Q&J72bPL997%dLR(?NjxwqNVTjcK-$a=}X7HF-co1H_S}%7e;i}mNQfN z&TPP^?3#oD-%H=CS2Q0%1`O>*OPXEQ%oy~ol_AC~|ExdR@d?9|`>*#%Iw$$zN_>j% zQ6-Edyysk(U|YRZ)ywNgPvA%4r?bc%;;*xfZ~udu|6jfZ5H;5we4*y?;h;gEHf^Pf zaGkYkKVSLMG;DqDu7$UU?u_(2Bfdr{fRZuQ<&XNk=ArCHoGN@Cd9`-k#8$&&4G@Ad zdVp;b38h+s$C399)V_<-dg~YyDop2+Bk-g;#q;a~o>X+hPHhCo7z6VPfE)pHQ*P_d z`Ts!kTXmk=v|W_ZukUu_{!)@CPotquO|pADrm`oME(kABhYU!%x4C;$kt#p zm_)$%aCNQw=+hz+!iK!G^Tt3q`BWV2(KY^%cp%tmv0HGG9k6)bmC6H`?<4Pr-$_{D z8u^AK5o?dRA!C}es}wG$<9#`X9X4P)55aaGo-0D#MDF3Zruv3ouv33?jf7*z#RxtU z4jP3{ZD4N@lpdgY5lj;3+Gf*P*mN?ki7}8;m*af-%jxKd)ay^3%@5mN2EiIsPVO6$ zK{6G@e;&gc3mmTj!&Y6BJ8=hx58!CsDDW!o#~7RpYdO8*Y{uP-3#Kg37il8SLVnoq z;RxW+ZS}9dX6$j&04L3Im#MrAH-w6AR_S3doteJuE$q=vF-zOfg)P(1zj_~Yv8z0F zzb4E6>;C^WLv#^fGo%+ZBijf^^K268fPjENMGg2^@0R?|?sDiB{Ng!TkniWhW_p|? z1D<75g{@-Sd6`_lohHX6R5C`rGS;WTB}Ersl}3ZPyUuwgOJ`;4dDWF7g{U*ZN1NAl zTi@gi?irHGQUcG|=WU3TChaHOm!``&V%}$GqYbbTQ~{W;J%Vl8jd4|+p-Sb!mz=Wh zLAr9aT1%rKN{lp?|0-aVQ!UN@w7YbF)EE`sBfzqI>;hBugtKoCNg!Tuqg2nG1drd| zeQ-mv8Rnc@W_m&|mhed(wm02*{tW-D{-l`T|7N9Quax=UJ&jKuNcR1Q>=fmiXY_La zFUVithQs9Isegw3;DgEsF85dVwjC9y>y6=HVIx~OrO z!a5$_!=-6!B0#FH#L}P`@g#$1&#y#x9=oa^t!v=oR{ z6ZjUEEAaFJ4~!4PpH!I9I%_e&1H(@azE*e3u|^IE<*FS03$f|fb!pgi6ZZm_+lf4= zidg4yt2sLi^A-i>bg!bHPA^BrMF=Ky-4y!F%G#XOVhnc!ja!?!u-wA0;XM22N%8TD z-`lf`Ar6Wh-P=ODn7ZnPNfvk6AR^~s!;sX$XOa#)eA zI%cB2>L40$_~3uszv_HW_3VehxAd9+Kwa?OwmdW6I(0aoOMseLORk8JP(IN{ zB9K!d8`1hMKckzQ=l68_8KKO=n(JJxE>lir&V3zi)0D8DXU#JaU00emW?rXstkIiy z-DDBHL`X5#_mDCwZJaPqa$c=mn2`aVHJ-%M3FT_Sm?Z7zotMTh7iyo!q|QJuKiepl z*H_GOtI*<1&v1b%wFf_P%DMnK^IsJ|4Td%vHvO5(n}^i;cQrWY*=l5WSd1**n#S^H z1~59U9lnyOHhqsH1Wz%G&;P1ch5rv@>jL4pHd!jH1;|Equ)*_q`n=!F+`QKy?ZcgS zd47B)cLgU1+GYYhvp4S%ZPxiVYPEj;wB@K}Rg1z)!bQ3Tb$s7#`gGR@s_$-ikduVb zo3I21I^B2f)5uV;b@Hbjm8yn1ui~PrxQpuY>lcE}9YmX%%crKX$5@l3IEF2PAqYiP zeixTU(5hQ+r%0`htF&Kqq_AYVL!x}8ACls@xP}N$)UCX(eHnNi7--LD(7YA z@*0hG&z5v{m_*;3+mJ}xm3E>m+T9~OBgwoF&R11eFE5L=STKoQ?!P{Kp_xCz?|(sm zux054d$9FkI*)gW&PrMdrOb^aPq)X<@hAK1l$Vww zIXl8+0?o2bL6sQ^v)KtQ>1j@xfK}H9K~%l_E-?3pR*Sd6wM_4f9o=+j>oI0NKRqZS z^k`z}yEfnZ%af*(S5`sNK04{u3g^v{?ljqam<;CMH9X8?a4=o!1rfqoK>gd4+CHoU z<8QWkiZ>&D4wNWCO!tuAAc^|l18o~-YqE_5aK8P%xCpn9QA$40%;VV2xjr1*4({$* zm?8Rf)!J_Uya+M&1+kp_JDq|1^?!aDBmRd5`9@1(<~00j2j>p z+4P?NB_dly>(XY|GRv{WQJHXMFAwZdJ zB`pLYC_%gwE5Q7$24(NTt;gt+3o-niJ+$@;*md|mqCX!KyuZoR*=3~T0~Z{}^VM~N zzW4-Cp>QvsO)ybv8tO8E#!=H7oyyI%xpk7m9V3MxWQkcT<_udGwsd4cjxLwLet^Y_ zR9>aI(@a+4{F4rSM!9;v7|B{6atM5teT+K5CEtePq+P8XL%1TjJcyvy(nKAxWfK3M z0hQPD&7Ti@oN#$9sP(7K@Y;*H$$=MCvRP6}vJH3ZUVx+8;@U|R_{J`@Y=Gw-dl9z2 zwH+FgNAhjrLb*+2DI@*{H&lqnT{?UgNrLd50eHW9j#r=juXQYgq16RM17^&FJ&Ike z?snbYsG{mXWO;ouly%;$K2aHcABtK|zjVq`ieoz&9w)sNaDHuo7o(yN|6k@@tziR= zr<09Omsj&oOSmUQlHg>lRA7=uaGaq0e@?Ua2ri381Zk|*AJJuEvBSb>H6g(U(wo5u zwdU{7^J+-V;oG}Yoi|f5F=4q71u6Dq)+;RA>^jO#Nowr|0eBW_mA?}10dbO|4>)E< z5ppzGQuWD~m9qisA$0x;&Iv13&DKo-lpiNLVYkN*eNXv@F16F+p|S1@vEvBR1jC-C zX_c1a^Qr|w}rU4A5-BGu?P<-hspICp>3 zOC{HXvo4QIVg`ONC0ScM66CIXI@Tzu@I)X61X&3z~P$X~XMa=Wj~C+VQi)0EdtY8}Lkl2sGo}HbG)`;s zfM!o8%po95;|gfJVJtz$FG7TK0s1g>y_bhIy^?HHDYmQ78W0RCqkh!4B4^ccoHpy=#1>axQq|mPl!1D|x9MEih z6XtD|xOjcE+~s_o>S>)B+aUUIXTGtuBPbSmlsxXJ`|vR<#(95jX1lv3T`3u18AOQM z0$cddh*NbCdbQ41F5Evn|~OARHE8{x2nQgOLL+A)b2LP6eqH;QYI8Ke0VOj z_m}S;r`+Zv<^zKU}$EF+nQ;5j>6dMq|&5N zTZXF?Q7^+tp_rkAwn)EADl&Y2t1C2O5O<<14!UgiU19;KaY4nm@fApeKL^MO0Yqj093J%`p5;}km2XVB- z;fL@6DKv*}KIp_eLGwa5@u=36@)(Fh2^Hc6wAJN!#{kZkqb}{2zB7kL z{-jNt`7d4RJDwS*C?rGeHqF7SN9JPA$LO8jIm)P`~c>#QK;H+7XKwrz*5MIu|ZFA^_Z zOER*1Qy_o`Yg!I`P&sAqL*tAG6BQk^;EEf=-LBV;)X* zkm8wcetJvnGR#M^Lq=H^kF z=&DL3&057eoJINFdL@Qo1C)Y%=N_d7hYamqbw=qRk8lI?Uj@0OZjYxJs&gzOY^K@; z&s*zp!2$S%95|={Buje;^K=b+mo98kx)zM{lE$>%Bes~mP(AcaS?(j*%%-yuVs?&je5@VWH2h(A#fU^ zpnXn!h@E<7oUR6nrbAzBzZ3@wXRe^vktYeZhQ`Z8UPCKDc0fDkT<9y7R0yRI z7vj=~r^$W>C>Q!}07VjvJkCm35q^F4;iA!T^dZEVLcRk@0#Rc#su z$Tt`_3~0e;?j;a9{e!CvOU0(es@lc^7%v})`o*)YKc z*^1pg+*HBxvr|k;rJTR>@9iK^0;;u=2Ac$pAJxU0gg4;bJXZLxWs7BCWZWQQ+rWbW zn+FJA(boEj8*~!{T=!P zsB%o{I9L_YzyX_*t$ZGq{^KK-{NEl76lC^cy!jA~PNFKRi%KF&)>xMkgo(sm`h;kg>@-F`j5->;-~ST|B(8H8ziGTXyzV^>JQ_>bpJuc@ikxZ9#%%(K1Oc7 zzdHKVYbR1mx0a3vk}T0Nf>PkXu$5;nQF@GY%Cl>yd6v=1{%C1FL5i}dXv!sW9Ag{X zMK}#~^qT=XA36~M5xL*ptos&?Dhz3yc&xIh;wN(<*&-Q(F~JUCd>ziZ#^mz_fUbqo zXr*QMgo*mf;nDPc^r~J<&lAv^G}`UmU{+Pm6g}>L1V6x~GNEP$9uHs^Td^x1Ea-WG z;{iu0ElZW%OktABTWxkdI#W*4EVmWmBBGh7$c*;Qt~$?sd{7lR@Nl?39U;9J!u==7 zULFi9E#E(?b~g&aZW|2g{r*P0ts4iQc#*c~_a;qAUwa$JYy;Hjh`MG4XoZl5P;0R$ zfs1lC3XeR2vx!m&8Pdd|6L))OJ%Ij$>x=z_zHK1|r6ks}eT-R^Baz|bK@(dHvRXwH zo8=_pEvLhfM6f%tpVAP74?OZgZHXX2>csOLV1Q>s$Uxs(r@?wDZkq?y``TJ}o6sKr ztW>U&7)Mv09*_)09**|yzDThuj1%{mDoOw6!$^hTSkyM)*2+7Ks&A;eI}97#4Er2S zj+f22g}R`ot=yaVN6zA;*{Jf$z=21krp3&%1c`&i9#V!X6bZ`cUgH({>@$b&RA0LQ zbU#0X{z5EbTcIWaXCTQjTVH2Y5YU=?A}88G{=0Dv9R;Eb#d?U}@9?A$VTw|ko$hj@ zq6#TjeSqm6K^cye=|-hQT}H|zSSf+d^82&4Teq~}%|Y6tOf`DJ zW?S_SoffD0uw-T_M~h5rj5%e#L(rRcqDS}{u080Mqr>Z&e%w%Rx#+1Wr%tft@f6np z2iPy2oYnQ40^NtJh?9`gA08pyM-=ZcH!j_(J?4@~SdukPt{@MARm3!x4y;-eLW>Y= znK_e>>dblU`S`d{&SSh=17Q2We?VB2S*YV~aSFy*^v3x)My^X)xCv9-)z@jm z&?Z&snABCCm!oIoQ(8#9arXW`7k3Uw#kLCy-ShNlM^DkZG#ZtiEEyoH&1aC(RH^jy z9H*wBeCm>i`Gng`Q2+7iAE)jtaKf|M*RBU(A}Fs7StCMGSpfm$V9Hlb8gTc!JAxDG z<4-=>NRK*xgDAN1E`dzL3P;}~g^d2?OhdC-IgPXOhx{Cg?To{<$=`5pf_etKXR9}g zDcVhL{a}C5MRA~WL?Gm-Ri0?wGJ}icrW?Vm;Z(a=9_Zx`_X1H^$dmamYXBGy3OxTp zfSe>=9BhD?eRn2tkbus&@FEj&thY>nwY4#i#Jgu^V=dFSg)_OEk%Gu<=+dk3(ggP+ zpjP-A!qyQzx>WILaj9HvOC_U$CunRKVn!0`AFJf$X8 z<)jkirzoEJU-BzDP!5fu(TKbR$otz)k3`i)<9shG zTJTu&)&BhVdWrVqbkH^(_-IhF5>G4;6JGzL6VuuXmkmQRP2?c~&leENZ{sj- z#TbdPG99?PNWWxYoD=v__iySsO)>@mW+b%Sh^b29&KR6fe+{5Tzt{*d*Kw`P<1?a9 zcVFZO+g=P%lijf-Nk46D$8)0Bs6yvCJ)WKGfQ0evPqh*Xg5sy}2|((*0I%79eK=M! zD|G3jf51&ZK0tYXQVuU zJOI9CX2)&<4W@?T-Z+{AM))o<+R?z@C{>o1Xm_thgN*nVY0L?6VX!+=J6PpikkQX^ zfgg&UVl_uoHYcc97f`Pya)P}`+Qe<-N?PT`FohU(3`>T%oX2BSv^L=9__j_oT7(V- ziI)1SU~>R}V2-wN%pkROg{OAm@*${WZw<01{SOzmtD|(Qy1v8hiw^3YvCmLXA>S1U z-t_WC{~!}Lg*&b2KCRQ=o4I}(R?5pmdRKG0BP-sctmRax8_1?& zYl+0H6CTyO{1kglj}w0zvQ!N+pdLK?*zsk#BPg9h5ldhLiq;dPE%BIyw2Rje-_>h+!_=?CsYx^~uOrpCo!p-~G4rgz;k}?{Budj+ab8Z^uT`Pk?;AYp z@3QrTAk@w4)swSZ;1hC6FBEd!G&V^FC)c4vewY}zsXcGV{Jqj3d=0@|%#L5<*DhsC z9g;2ssrii>7Pz~xUmw_U?UYdmATS!r9+p|A1NwWw-SCT1CN#~&9s6`8!;q}-8Eo+m z?QXW(Ba@)Ly0PgZPw1VC{Rxr=0ll}vBI7UVl@cP9E8@^CL-0-i_*frhGzdb> zPvQdpmkF}5|CvfYFbepZ4Dl$|3MJK`{nfnC`v_Mt@aaYfIn>ZP>a&XXR#?qDFjVk& zlaPAu`ER1AI7O(-ixiTh+&e2P*p7yDqVj1gSm+{6REtTI-K&hJT{iPza?kV23;Xkt zA>>7Z&2bn-@k_$Bk5#iyOlT^|r*Uq8E@rQTtP?V?W=OtHmyw#55^+??%gXSe=)YHZ z67!_83-#luZWvVdlR;P91fU-^l4`%)GqYq@S4wV>o^J(-`~rz&ccBDMsMB}5#98`LqpO7vb#Vx1l@anYd!@^U zCab8~X#$cUqhd}p%DW!ydTuM*4edCfHR3$)dEF{z`r`2{uB%qdhMjMRc$Xyi4|xf@ z5Ap5t9H*Gs3t?FWg}9muC0N>QbfMr!?0`xFi6;48w!;}|~WO#260 zyZ!E|0)Tj+|K;A#|31YZ`^1GH*= zBv&#*TbypUY#Dqm*GB1OZ3gK#t{Lrp4ydz#G07;v8~G%kTo4KJx7loE8Pht=fg42Z z274pkzHEIz!Eli7Z zqf9u;8*P}eh97;Ju>K4~9pr&C6eOk<;NDlU%zMlC#(-OPOMs=58>J6UsHe6UM3JmQ z*l~be0zfKW%+lHRV=rwOw~077%Lu~C~dhR0BjpTvr~$&HQ8DU5k*j8oUpXHbfU1W2~orR{!(>265V;p zO(klJzYxtTaUIX+i0vghvLOBn{`1?EplU}k_ox_Ll|`4@l3-*pzuNCBF-v!SFyJ#B zrR{wOYHAjd`STiAN#*uirF?|;WGy4sO;ykBYs}foC%^<9j5zUDB(dRB0&U06N8yGD zH?T(!`JD2y=i6d{I!0pm4e%8XU&oHEza}wTG!XqB?ttN#6@7d&pC>NAl{oI8?N7F4 z2WWn(116Ry{mj7?R_+%8Aoqf=fT1+?Vg+uTE-XbP_#tgLRp1e%5}Ad#-@FA2^~E5$wf3#f>k zG4$ZTIt+fkgL*j3&x!cyxGMVONFItGAbH@mV&H_7N-B#dQAg#Z2-vdcX+N%wwSo5f zD3nYh^XwV1nN&%uTM~PNI*ISPU>Y%$`vFC9G_yn^HD*#Zzl3GebMQP`+7;xpNbq0C zlvOO?=Q5hf!rYGk+3iu+*TIhFY1=Q1mf(2qQ+e%a@0*y;v*D#v84_Eo6)pX18L4sI z`PuV!YX?#wOTrz=($A}8Jbu5rr&lJ<{nXcJ;&(oEab8A9oBPq@OKNCH6g`1L=*{U^ zL8@JnTA~&3J11q`w8U-gXgu`km#zp(j_VYpt?Z?Qip=epgzed3q-0~KrFczC!t?#A zOqFwKita^G+V;nNPoED+_JG1%`hTHS|Kawne{?oReq!MZUg)Z-JWQk{{)1jIjNzh& z;!nZlpV@F$@DlKZ?+@EuNWfTsv&*^0F2QvU%!_97isyfX(#o1F?sGpV_WTzE;(5W? zO*EZV=MMY17EM;x+sy%6Mw;eT*1GGMk?Yjj?(irK+hYCT@^j8K5J=*MjvD3P=U`yB z(A)VhBXO@Cvrfw4?l05MdbpkIFqtSarkn!V3_*a2Tp1KB^=R&lnkhxf=UKgwz9Y4i zpd)r@=Z`KoNg( zz{iJLZl1dZZwp~{o(@J_is9m$-t|iCGDRlicTX9}GR3)Cj_=BD3ONPdbC&6OSJy{B z}v(;7*p z1PzqJt(>-x1jczRqn7tkxL08K_sg>u3C&H0C@Gr0FEim4uu<`%RZty?a30%U*i|iZ z!M8pp44Yx_gZZ|EdK0}vl&bMMhoWv5CMXp)-=>8Z|m&C#UPP@1EoS3 z^0mz?;eB;v8*}!yv0wzK5^P$PF5Ow_31Q!wL`>qP3zyB702?$_uX!WckzlxU@r_yN zR>LBB0z2_dZ(Yd|K~@rX%lINYc@}MbT{bF=@VMQktx3$3Zt#>SzuctcPVm7tN%#g| zfBilq1Z=lxhjl00E!`FyaLXmq1%Ff+F}}#zu~#X3_S->~A1GlA9-i}gPi~v5zr#$&7AzPYsr}0Dd{HvD8q+tz zElo=Hqh)|FEX~v~4OsUZ$vD}^jaga`GswO9Nv1lzTTnh#9S)ZC5^4T>|DoxhfelP? zx5m8{j;FIQaYOjB&Enb9%*QHK;AF{bHc+LJ49uPfzOgfM!#lLeu820V<5o~=A)oAF zMMT`sbSY1cT zoA9lfF)A%dJZAPdtBke+utvLtWmZmE6QOjWZK!KOc2#$6VIGumu;%`fH=L{Xa*Ykf z`}XhY$N@dQZ_d70hrP!qB;U$JbNMc9poEt`Z;MkY>ZK>H{2~HR#Ontnx{Op0XkDKx z=l8>dO2}H)3yBycWCD$-zwi+?f@P{buz#X44}B|p?^g?a{oKTe?>`*+-CTVO{6{!F z5ox41=}!lKDO0(SBy{)q=`!RZ|EpAH3UI;4VEzNM$mG|6r;V(2BJN!Dkv&$h);QhS z(y+8L?FpY~)Ns`PfpreO+@WZ-E!+%2*gNl+j{GzH$F;e1{2`9U_!dMe3kbaC?_t?a zC)eOW@p4-dy*-{C{1ki#u`7O~ikAj%ld|*|Ui&XYme{3$?F@}% zkW`>ns8ZxvSN2lUh`o+(!@T7)yKZ5&x>bN7{OZrMN&s1aLx{5KUS}`Gv9sc_rKXzF zekN^`Hg%iQP`<`^+iC$B+P4aiZVg!z-IPY!3uk7X8Vd^ZqH%486-({e%3cr3TBK;_ zTQr_ns@9ee-cCpJM*}xmR?(~<>5ZD74}`@-hMF>_M^+%V4n9GRIwiunpAaLA!C9avqo^vw#Ku|GQ=9UL2~R0S-H#f{#BOpf?>9h3N!>G49e@5 z#B5H(2Xtx`c$}!%q>rF7GWDapZIE3C%nW90EvM^f_;@U}u4)O-C@*^l|DN_He!ZRD zKacPjROkVbi+(|L;h;wvC@w^(;kT-)3nn*(_G&I#>v@GpstqWEi$+|9-uOnjSMp>W zBmndNT)_1cz4Io6SPo%`*8Zho6iuDQfTn)MzucoGu8Eb@vaY2N9<)}|h^__fQa%%* z_ga!|!KYY$QM+T1GisFBi?O%`QoJPc?B_aO zynCCeW;A(qgOCg?vsyyU`vAA{4mK-z^g!1kXat{44eaK>oUP#2s=X~p7t9^^! z#!+hN^wi4Q{&<_A_W@Ix&t*>~02Y}-#}{S1`G~Q}!p3a1R)3UF4eMkv@&sp=9+fqy zlnXWg?wveHH0wZeEwN32&4=ON{asVFGW@P|2`mOwIWseq5%?DL-hw9V?f%W_)m*t@;m}%tD=C3q zUV=3h5DGzNk8Ah0nxq>Qenu>|UnFab4!#As$Rkq)to>pZ6W)E1%bde!<(WqU7qX?? zHI~iH!q^`;u8VDuqB<>aKzot%za^8B|fqbx452gQ6cf-tHBMSSCQyrzw7G<5i= z+uH5T1*CNT2_@+qi=G^!KH@nEAZCozBZAp&*&<)_92PY#6eN+DjMBJ%gde=_*R7M#wd-l1T)vss2>SqQ za&YzSV)=JF4&Q|V`7;J7^QMDk>r~I#VXhLe{E**1vHNOLy6UebgB!bG>w4iHQ7F(- z)ooS~DepAB1-B5};$^dxWo_C1w4FF42cOW!95lW1&+7yHUsnCVTr<*J?J5YfI^Fg3|k ztHv^fY(yN$W@c_4cN&l^Ol+CpOh^D_-Zu|6tYN{ z7}aaZvxK8-2e1o10l4{Zyl!lLhMk9%0NPbLE=CBbue#Lner%2+kS>{zSN-`Z?1A=o z_uV$^Wpe10j~BVGe*?w}K2$q<`x{)}-pgNTtvLw1VXtZHU^Fu8EF=DV(n01PtYRI4 z5gqMkUp><9Z(@Wta|vJ781t2P2-FE@8@}~|rY1>@LkAQh#8GmA{FMG(JBC4CetUJ` zg%~Hpnr29-s~7Gkp~$p$Qu>fNN^wGt8=IK*Bc{QrFN&L!4zow;!jG+pO*7aC7M(el zd5$XzdxW`Nb3*g%a1OTTnYHHj`r_F3c08KhO}l61UVbmG)B%qa>Fo$c0mn!|s%TGe zn~Zb?;8Ef$ROzyOc7{c|{T}SlHjkpK6kx4~smpWN0oZJr#^~3rhH*O!-heC;JWQD| zFZ}@36DQ#xFH_{Un+~<(`PdTk0`2Uycg_MnF_Ik3BM00(2*;d!$40WxjX>n}Fh69u zU3t$s%#DgVaYGvskSA>hfMer9O_ElaUb6B7$ zC{Ih7V2yIi$wf2*7WtvmJ0o~=W%(tC-uZX_LNazE`t~~7vh5nYHQyr*CX_xk4|ZR! zh$GKuII99^S`YM$>Q(^9g}!16Tq34EWS3=Ly{E~Vlg;5v%4)_hbwR5;_HY*uIF8t?; z?y5Pm-#@nD1(-<>?~?QjdV01!Rb&~*@*x*0SZyuW`X=j$N@?;dk}||=HgF64=~Rq7 zlkUxKmo8jU)|OVC5J(Dn~kQvnoPv=9s{hvOzxbHqh_cgjxH6oM^s%P zwtnH2t^2`XC!>N**O`23IR)b~8p`{ubM(_^KZpbI&$JdNs-Vs>S1RP5=0S>ENgBf~ z#s-Gm$&5P5^q+(@HLjp!PpeO&@7*BKFeWiy+JI!BJMaHu?sI@seAkDhmrz(l0BW|r zk?l2UZL}3sYYP=9;kRNO+50J(n#tWFn1q0SoTeYj#*rbUe@c;~GZ4->xupTXbihr2 zsykqeabNADe`99;T|tc1CMuiKLj-w#Zk3)?FqKqv^{oaAM{Cv2*~iEtGFLKh5Q`O~ zYwoOhRg?>+%^?Gdl$7PoyL?!@#U0>7NW|i14;<-&sxbi@QLDQ1_JhJMsAy57rq;J$ z&~pKVzx4P=&Tr(I3ob|A6ceuLm4zLSFveM3>(tEus_#p+^PlhFYOeadnL`K#1A+p5 zvHNMuIM_EhPIy|K6E$Y}Cd8_?&D>m=A*(jy?8U-6I zn1~&=1XVYKxuVcPfAlWgbtAgc_tQ~Q8sk0g>83u%QNGRHGR$*e0PV_vd^ne4wMmR~ zcQ=8c1l^U53hea@A*SW@2KIw|_;J7Il@G=D=Vv#+kt;NhDe#4gkl5LAHMy+1)GHNg zS!W%pPJ)k*f$ndX)kb3p|LxBIu0j>iNcVFE@xRT1J-57ZHYC{?eWD%PX#nN_+8xK3 zUu>jy{Zbf(rhb|-0WkX262!1^#N?C^I;u20UEQku0Rl&9r!7dG^0R3eQaCX0;XCY&!nC;U$4PVE~7kC!#qqEW6S? zGmkYNE$>(!yW6mP9~|#eKip=Mt>=sX8uCn&mC{yb%(H&wO_gI8&aRlRY!UZNBJ?Ng zej`l5eGkebXO= z?%X$e>w1mMrThpAU5(DfNhD+_ZyPaF6iyF$qX6NrHSkoxJ- zOhYs|t>aldxt5|4=kJP74w@^-%OOK^tVzPHa7Lh-KZ`|ga~hh_CS&JAFLLTDMW9$X8ceD^@TiL^ zbt#mT5?nXmavxA1&ZM56{A>+lP^&|-)DwLpoQR;O5grwJNrb0a!de1W%|st{vyNi`hc>nCZ6*NHoAUnj@%yjsK3Q3;W2-N( zU|lt{=aST5&>wLH-PCrrFA9-Koy{!0aQBSfA1J#|p;{r~s}uD}FK)+~D7Y&sCrgNet^==-1e_)gKI^?YAj0^T4wKGvQ8WHkQ|ui7In262B137^rDXDecONDK?X z+*f|>S|Lrdm|Arw+&>24AUOyo*wxwCTcv+(D77)UJVS_GGHxG@qY_W$m^8!Yo;uUo zq*$M?1G5=nq&=K>UBnU9{Y-ju7iyJ7cdtQ}dvNRd2){=X4yC3Bz8x+t%}Zg!%1mbo z-u4haVY4H38-S};tK1d;W+BeKi^*pIbvhHLrwCN?<7+h<>AH9cp;j1nrgjOPwLa+5O+K^rrK`tVx;12gFCs=E6j`l|K)!AY= z$;~sc!6T1SJUcG^IK!DC{Ig-q{aNzMdb{n$we=Z2XJ2NZ|gbTceZDci`dj*%2&a zwL)E^KBk%}h-wEWpD$i_VEt&;zcK(y?i7HM8_?tYTYU7u1(#_am=a$plEtt>ngPZHuRs^Ge54*vu7Gk#e5(HZ|K46)h&C z;`n?z8=DlGoC?=UlFN=6w$57D8N-ScwMw?eWwl)@INUv?GO$_u*#LCTp}OS}LBQ(*1!Cte&*ItkY| zPy`Vi=!!UV!~qs@!BaulSlQw448++WJ;%*lnHJsQ&oR7MMEgP$F=56BPE$6BzIeWo zgdGffT(E&Ojzd0E{$n=!a)w=l(jN@zjxUaIjN-lzscO$cy(2#l^v4|Td1ij6gJJI0 zo5EFK+Nxn2FZVmu(!&ttdJ~N4{&rg3^7wv{N67<@s)|Sj6gMd`|8+y4H@?Gv6brEc z)D$$KY_34}zBT-y<{@1&-GYx?wA&x2(p47 zoa<(xfB-}ByrfH2axeyNkMr|W(FaI|&~*R5>izCXs8Hq z=<}FvfR>EMF?;`$Z}0U-x@i+j(Yl2yXt3F$mopMyQqk^~eiQl92I%3sJTo4YtmP4P zdqA8a=2IVwMVL>$an0D+$kXQ#vzXlpgYw<>OvwOCSq#JNuSRQo<=(nZfh_0{ z%^kY{XZck7Y{c4I|9i5M61F$92vKZ2_+GN}pP*~cE_BU;yx`5h`xX-kbPYatT`46i z(vIk)Ia4s@ACCUs+$>QbBAe#^qe7(oFFOFBpzTH8qzN`J0BR5_6!wkgn76ey<`MnE ze|Y`THk~nV9&1YzPDp}sa0+LX3_emMIBWsoq#aA7w1eQOl-bzbp0;_b5 z`l9AUmwZb+B0=UzP=T1ZRx{n+7o}6RwZ}wJZLihS`c6H@q$XS2yGvDE+a`dCq@-IHrHK<`1u4Lutg0G1tpAK}bPqD1>m_ z8{3({HOh6=H$LRsALU|;Q)6PFxIXY8Nm291@qc8Zlf|s?%F>(f`k5TbpEB4hfe*WG ze4LGPgCYW|r%8&K%yBI;-}~@Ej>{K_R$Kb5G+&$tq^p_+2cK=^`5EyRHZ0S$+`9M! z8@AgN;{Xl#hIx&n)+({kceMM-!0!7_xThFsJ2I_kshWKv`&DB~$Dcm~L`OwqP~JlOyFMb4745DRLrHTLPWTs~T^SrKiDzzivLO98+Ja8gV_2L`guD%gn z3N^gWH94uBT-gO*WRA9>?XC5UoET-oz}oSu-_=$bC+*eLTlmei&1%yPR1M{wji-?< zD`pPE0`vjgi9hq2RG8ChL{#(SmYiKw4Og?ZR9QRr@2N02OZovhCq_d&-Vd?F-q2Q$ zCOnZc^QSuGKI}R_g&nHzJ8U*uLS6vT&_aJ5SgGdy5>-srRa~A3k@QjmMVRpRjgbQ$ zS->tWrmZ-{7KlPr*AWY#|ujiEL=y^iQb-u^9#Pg*mXQh{H&$&wxXD@;96I zgHo)fXf>R>n1x^UV>;^zY#QQ-=jz5mmFBk8Kly^kYl3N@tU)Lckn1d5gJoukG$AQ>J}3 z01-WH6Q$mDn9tm3ZJ^2-ejVl9|#pHJ1!&ellT@mP$oQn=E915is3k$55;dFW` z)Vt+@jb5N&@q^HA2{(?%B7^};$oJiD*u%Krh*FZQ_>)FI$R5WaF60{K}{r6kk~`u=lFb5{x%V9MaF=n!nCo<5Rm5 zKdq>;7zhOMX*8BpeYgiZwU67)EpP$Z?|Jc+w6i9P+eG`nnGjDb3gi16g$od|i3YSXG-Nbkq+9Ht57oAR|!!wG*y`m#I{6C}wzV%o*u zp1Y2O4DD0iXPyz(6raOq1ck@;Ya_MJze`X9muGlPMGjzC9<;XMCXbEeu|6I$@0BiG zo%+l<>FB=9NNcJ|mL-Y9GtgRGM0aobatCi6S%?2^V138{8v8_1yxRdUjJg?GgYOQ9 zA{zS|nSkQwkR$FyXoWC+|Fv_I^9n{;Pk5CK034(wOxqq10)`a4!&~x(1|LB>F=91K z8qUS*tU4~rI=kG0Q2JPZ#vUGrEtt1vsu2TkyibHO!}Ha;FjOPR#^n$?iW=)mmJ0WQ zRYz4fpEQq9*!M+#3Kk`3(qR*MnaGf2DlJL1=vZlvm+Z>cp%Tap+RKG8_Oo<^!+b#J z5_{*-cfQY-(89Lw!r(=|y@D`PDpy4Z*mWIdpY3MLMtmVGu)5IEtm_b6TKkY)? zKrI9iioJ(zBNv;HrWZYVtzG5n`t@}C;}OmrV3vx6Ht5)crtuo5&F7j&>h}n=EW!yY_V*AfBDuY*c=>>Po)2Mlz0IAWWa**D{{EKA%RD5L9vdIQK{G= z6V$<=Roc-*T!a`b(J|kTKBean0t$lb9vAK`Q(l0Q(&@d#?&0 zI8D-%&yz12Lxr0$T`*ak^`ey0O;Mfcg#URcn#*z)+CL=m4N*Zoll9rdC%lG%qVNdX z4+kpjo=~sI>Y0cs8IW5YJ+cn>A!HZB2igaMJ-HSHrZPb*9S-m9=ppG9E)HzuWdvo5 zddAvnFXed#UXKu46L{!v&*I4o+orI@HI;e5z*I}c{A{e`r!3=3u8p{vq#)<(5#bAa7`asQRvJgf!F8nJK*4br^JW59j3&oA@&HIGZmlZe?>}ZIjrkt$EOWk-hv)SUK{sFQA{{tp z7UXb_P9P|0R+3EyJs`jU4o?}gEM#zZXYTyyIfyF5NB9ja(v#2bEf6jTYg-ELqj0)ewwl1m%W;ch>Xr35}}=9C(g4GA&xg=ui$>t1sypnGyP! zfFLW1Q3o@;2|OxM&M{N-l*ENoT~{>?u5c`tVd!Ja`c!M0602J9%d6U(qjJr%oc@(Z zo~`DZm7u;7IjX@jvRBY|=J#~pz2o>EBmax{W~rlRcOiln@*G zo~}U0%(Kyb7L8jZZ8`6yLp6r|kYJ!0aX)x0b|#`p5&e>7X3=;2k&-~^c6ub55DHFg zlJxf*w06uy5A+k9pGuHj$6qJ7U3X8zRMnkBLq&J)&wdTzwm$y-h!Y(yB}%;-@>BM= zqY|!3*_+Yw1b_vdox}IvnpZez;3Knmo_``LJpl9;b$I8Airz=+*TJjZWioT-e6mY2 z?83rT&Deq}ou#x`W0pytuet*a&gNjB{$$5V?haonL>Qz4y((Rjx6V+NDzO683=@re zM0#pQ`9x#9WR22_Q<$lL#If4!Mv@##t#eBemnPBxo2#C*7LW=s19o^U~ww z4XNi>5I+5ug$vtOqJ*KDEU7hXk9RQXbQI_KL9suA1M;ZMTJ7SXKRmk__aT0Z91Or? zD;=xe!ay8n*TEZC741xQwkDWG+wC8d+y_VL$7;w9vGqjf$_hfj+N=O79g-PWz0CX8l3kmL!@Yfbvp$_^F>vMa*do63BPKB5WbL2_0-^5Ab?Y&oa9 z7QR4pg)Rl@=fD~Ltda!Ml=|dyc9aV27)T(oXui1x?8E}6Jcug^!1-<>_1$VNq?D1jM&LAx_?Esjfu)al}DD1jYfTc3$8J!3H+Q%`)@x1*m?g0KKKl8%Ko7k zZ#+Vj5;|2nT@Y~7@RSlU8kb-u^V3^=2I1DZw&yG}C9V(T)jXhGE$T1GW94$zq%z~A zs!@Q9g@$NJmuU!0|Df#N=MK@1#S;p`O;~501@PwVBk7ZV*eYrW{tYgXkP_ei|txDLYb?wN; zeSUYYbBJG=ge5WnPK}bFEdUkW^?>Ge(H|=`k$8nFh%{&)iAtx*DYls%jn>{2u23wf z#CHF#&=^$M-9%xa&hncDq*MS@M8c&A+arjjr@Xm`D3e65Q1`yFA_ZM&2~E;<2+(rv zhO@*(A+xc=6lM?-9ZPuYs+N$~VodLgoh2INX%gs1=?r1K9^#3%!5uieeT54tp6C$y z%=7#GP*h{X_-(=!1ci~!a@ILhECQq^2Q~nirEeU)-A}iW!@nY03{zL>u3@5^;bDCx zOqfB~40O}mBI$DiD&gUWxDitZZo1H|0klt7y0ISqUS|ZK<}bZEiX@oy0ek)vt~k30c=D?_ z$~+tPK|^RCdWtgEndtp>Vc7ePs?vBcBLsMbiif&G!Io2aJE`w#7L+e~(ieR%w)l|` zt}OzL-$uYq^S?j(LPH_8wia8bSKp;?Fs2{qalBa}#Lp+Je3rYqzP~9(bb(x5-o3K_ zp{M`DlmIL{{KFL}kZeP-2W$V3paDp^yViP|FxKL(z>ilEn&jX^&fk*XWjD6;BKcx_ zAB3=psA5*5-Dx^?%{K~E!*o(HzI~~(zbK~(bNXjsa~PGPgU;Lbbm3DyZOPJBxTkBH zi_F@lMzwdrjD}HoPejmMkGifHf;e&waN;e|gq;JHU?pUIDtY!fek1-1WIWBrG)M48>ho4M$ zbW;?Rgb?T+6O*4YO`A!yoJ%xVH$Y!j)m@z?3Q)n1fp&~~P$Tp!5xr`x_>>koTK-)0 ztF5fK=v_k;xu~|Pn()wLuamDx9bXmLkX{pK_a-oJsJ*|q5N!ctfnba6)shL#3dfg}$Lgo#iLV^7hHxuFP zqg%jZ&>?z^T>PB7W~rUwd>Up*$b(u)(BDh9cm6F+q3^|or``BrJa@Q$D`KC6`PY@B z1Jp55M0cC&>GKrSScf>m_+lV;cf#Jil#*VnK7r4A=(Dt}DPXEzBdAR{A4*#y>&4Ol ziDL%T34dk-g}f^eBf38XobOpM#U{_izcxr7yjY z7Uh%s{8~eE=iTGp_k$12hkEHb0tssUVHTjhkk@TUE$x!y8`jL84u(9&Tx% z+|Q$DN4|TN`CV&j9d5jzLb}N&Uqp5*aI}rQlflk|`9`D&I90p`{%O+Lb3W=V+i)Q`|DggJ2Y^32e8!@y;vht)hAQkM3&o==^=f8Uu8OF5MiTbwIfj!SDu#IPHb( zPTG>#P)(Nu1i8sqk?_rXgS(Rl7ULwnzS4|ILsEl!Qv^R|?8luKM(jPELdOQ19l5xaQNIcpaH&DRap2b3TX|qXmIx41s zeH?96)tMcb9cb@a)i=7pW|pwDE#MxR;lwf^bN4T8{7(t5p-|z4!_JZZu2-681E3(k zBv!?Wj)6YM-!&t9Wi7wzIl-H-n|?dIkJyS!>FH5lYLUJ1PE++W9H20wXRn@BqY_Om z9#Vm#|Bt!e1|5w+ckbj^ONKM)O4Ex$T>YEWixkzvV30?si!^zKO=>MP3XsDl|4JHfO)PS$1_| zGsz~<(X$8;HnhkStLKAc9hxcR2qM?$DK8QnNz7EYdUZC3pggh#sjKl26igYo@)9-$ z0HdwYFOCz~xFQiJL6mv%8$ai&yU%G8V61La>FRTm(>74HU45o876+to%C_?m;0sh5 z#A|w5?bW9FFqC%DI$3G&GASBV->Mw{^OFa4O;aqYez_L8sOjW%aNh+Bdf)*rfs zjx-DIk+74S|8o69-2@96!EbBR{Y@m)HQhPXG{ICmVDkC>*}JEgHB9kn>G_la&>Y9a zZvyYy%F%cSY7med(Bb@=ugM7#yFg|J%^**LL}*CI8fZn(OWe$RJa#%{R( ziBdc<*-PO?rgnMDzK$A9wTN^LF|E~j3Zk`;IQfq|a2VBPS-}j{l1l|8MZ-`JWo5d1 z+PX$f$zgkV@rzwJ@i;U0mQdd6t>z71uv{tZ8p#mZlSOh{rPQunI=fx^1C5bjJaIrK z&uNTvFg|`Z`nDE`RdG#D<auK(IDH(h*Dwkd-yF0j)!x@#iQk4`Jz^}VBq71J z_|iN_fH~8!Amk}LD&_@*9fp5G$5gG4{RZyB0eBPAAnjS@JxP7I4*)QV7G&a^OD?{x zx1K&F9L`GWnGH_o{6o@EAWU!+raG{ke&pd_fYk#cBbr={ayg-=3eJiR%JD! zdu&u%PsL>W=ji#nV`oo~_!&r6$mZamWFcmz!4mK<0iDy;YcP?yB|0N@FpF-8Vx>w# zVC>jRp-W7PE{1u%aU!iy3RW3JjmuC=4=~QphZ3Ia&opSt#Im_ToKJ9_(WHvWRQTh) zx77D&iJL7#VZj)^QR%zC%}8@YTa%nX5hnIpqT>{R!LRNYc9PvT(Bs{F;8q^%K2tIH zht3W{VFPoy&Ila8BvDB}_hbzlgOiN|VrnqmF)1MXn6%Ue-hgMz?VJA%=gURL8`xUXUODq$RW>sV07<}t z-vRkZ$WMM8zD1QBr7fK( z?Ywh+_4@>*flTb9TpGANB>sEe*;z|~R|5RDQ=VxwI8ju6%UX!?tRM}46M~XEHo{mP zgRRNqeS^OYUn*m8l<{LX3os4gkYGR>MaOTxI69TUN!ESZcnjzvTpy_)HjYGtbu{5e z$TqK6dy=KLaG2auvnT*>3}hupZ(jlMZ>^6FZEur_(KrtQ9xJ>;C)TnxgY()nFT`#o zAxAp0KMws|ga0*8w}?6bST_>{?f>6AxrO-tiG5JySmhX%EBN~;byKj^7$!4m9RFjQ zRZv!;vZ9KuE5y@whcKm4ljRv%F5wTkM{h&x=eN~&sGq6{0Suq(e3mlcc~$^}<_ddh^-ZCgNvRZ*h_tL@sak0V5qWl@D(FN}Rn<+;B27)zs!6tqzl{Zk zs?`m(^bRC6+Ax;~{T{F3I(D}UKoxvM3M z5*1%?;{mSH<_Q#V_p4^uehv2s=Y!Y_-nr;a^kLQUHnf8woKFzMzy4mp_qnR(lRyz8 z0?vpCptWyO%-5PW=4K5=!^j)k6XgIYaZLyuhg#9ph_N&UBvMi8328n7_fS2{ObDpl zpW-1s^Z82JWj9?13T<7*L)_Te4c_7HO&JmB1k@&6A^P?cPd89EbI*yr2f?s*65lyB z?wbrU5LjYKZwWRNN;;-HHjqU;ojH=NY^H|DVY*;lDd>W$>BCv0OFoYm99ycP6XOE5 z!5bH?n~q+ti*ZJs-Q$p!0y`}_myME8g7qYO5y|ng`OB~r{n<=mXc+k&uPY7ZvYP9^ z*RU%upizs0lOWlw9RA0_!v3MV9lwrwr(BEiAd-_~Sp(jcKqeQdW^}L*j#I@obH$i> zL*#)1FT!`O@T0%PNOUe1%22U&U}U7#7MzIu>qspz`r|{?UkD`zm5Ki}~qzztmN4IKm!06NMXXfZ=bL|Hly`@({ z%)i1B;EiuafB*Ct`66+PIfu8AfjLbqx{MtnVc$6AJY3AUh%>8N59FLq_G<9*qa>c3k!o(mzB6zBZM09=fuYW*ufn82G? zs(@&U#q}S<*qJ6F&>|C-ihgPo5Y0OG1*Uit@}d-@vUvm&k|+Sv5&LxfuRn_IrTn9J+vC)8dO%3H>RPJR=I6+qxTfQ|@b&Bs0;7aU^@0@f zpFM8kLz4^ug!aAYUFLRSkft3OvgOHH$JKBB#IX&yI(0z;3NI6lF!z|@wV-+*?HKd| z!nObsj_jvvi1x==J2Go!4Rk{uLWE&j29IBRug>T9o@~cHPW!u;VHPdm$O4Q#TZD-J zqUI^9)MDtO@8pZhrP69tnl1kVgGARQ*t7v_U-bAiByEdmgiOPNcss$z10y+iTc4wY zN!4uRa)ct(T#Bl$;t{DULD|~xj?G|>k(sv%*i@>)S5{`$Udd9NOGyO87mg=4&41Ew7aqnCSBDkTNOol5VHIXwbo=e2cYbzZMS5BeJnQL+)hys>Ru zuNngk1Nl(b2X7MixkhJ$XFnd5!sQ?--P3?*9q8Q+E^E7%-25LdIV4a~ND(3ltKkiW z%YGJS>NXYA<*rWBg^!Sf5UHswAxyoQJ?Q^`_{xsS&c?RPlss-AR zy4{BDrbQFI2B5&XmTr1)2t3xmxv(?l=Vah*n^Wy&fe^^J=9T<}nT`M6=O8F8g6Mn} zc+rGE6-b9f+^^ITI+4jizGjn|STAjZ}qjY#qWz8IXwr6!#qYk^ziTsGD0| zX8HOmtIh9BOWv|X9O~((4``{ZetOEFK#X2ZiGK6-q@zt$GkNB=&;rt>W|nG(U@rLWsb zLE^aW{G9prdqw>H3iKfFRh0PO6ZhK&0R-zeUyIoHK#J1iSMl~sq5%B5{~MJW z3x|#KmC67a>1>?_K0U{jPj)UdlnASF{`BSJJku^-NHIE8J^*aTqSX?Mrl zqG0iXe8}romtJ0Nz}dT_W_)&86;K?fC6v3|IEL@BgzGOG!w5YEDx(8eL9%{EI2qXQ zNCY2*36PW%eYQo}&kEvoHcml@ZACN-BpE$1%i8hl0CN7DN%5lgcG3X;oy8U*4b#aR z&@YpdvkF#p*DnOFZvCq}%0Ch#Rz{1;cV3T4zmwkh0p9*3s2XJaE)UN*?-5;&r3wp` zJH0VhUJk|;!x4V>0mIgUniWE6K1@fC_ijFczKdztx##`0%wHh-}+i3af6 z75f1*UfAvn8h7i4rKBrTsmR(>*Gc%vxm<8mO!Ek-ruAf^NtpYWq8wN-*GhQgH<6#+ z6vrZpZOC&I)f%a`MKQ=FDtn!+!5#|mc|#Nf z^4kJ5x_|pt%vA0XaQVHIw`MYr33 zsH1E;(*q)~TnS#{_tOUtUr{&EJ*9q@!fOWjuYvsx=lT-1fK1psX6t75_5@uggZmTb z0i;f;Bd~|^*rLD#?o5AJ!8H1|OvBfhV>rT|hhb5NVC^>ben(gJof(na`@hPtwpNpB?ja+ z{C5chT*iZhsG=v;`!;>(;MVz(h0b%56g7uvw;n^JEe-zVdCRLY+~<@TDo^H^FR7XZZ7qDll@PT)J4w^V+BA?`Q2l|ar`$(D2x3%QOta-i+0gv% zkJ^<2Q#F7M;)P8tlZ462lg>13*rZ+5k+ZH$wpLmyiE}hSy%5b}UY?(Pd4+5> z40~YwQ_bCK4^P$=GOTfH?=j70;-pi+vA?{qQ{Wo-{*n)~{1^2SsI8D2*hh59eutKl zKUYa(PDynPllW3$+Nk5xg-9du-u5u>l!aYDxQDZJFGjBd@<(S5*k)6k;Gn9efa?(gPtL2CI1(FddQQLJm&0Ap53J zMIc+Ly4pNY$e!3sixZIIncRz@i*LNHeF$`h&P6&**QP~-oBMbKI%i5wj$c4)ZfUk= z+UC;%R$Kf8ptiuzwZ}QWXC2n8=rd_*1+Am&N}!9~ZJK&_{2F9WyRe;;97b3Z4%#y9 zvt^QW2uAE(#Y*KxiZ(hKoQg$Ku#-Y%p%*&1$SU1R!AUvH?cZ=HA;3uqVuiaw#STh~ zjEM^^b&?dEIc+wQ&lD_{p=pgnpuP6f?m>BgRMOEVGkHIq&0m^E<}%jwy}g1o#vJgC zDabwdmQzD6E+qSchYHl1+Y2~XEhxgu zbZtI=ZTdY%`Bc_J%4;N58>88XFK9Uf?Tj{Wsqhu#3K|B8XMQW4;tboky-v2qwYeb1 z50F9VDT8i5S^8h6_;{8$WPy!yeuE0OI02K0h6c@-IS#`+`l4D|B<8?)MHH|Q`FK-2 zgQ(qctCfj0DUfE|EalJictcn%zc9?@?JH7*`V&L^IxxLzkk*Z|ON)AP`27;&g7UaQ z-a)L&$HkKWz3c=*TR=3q=nFU4OOAty)^l_ap~Spur^Q^he=4O`xJ-NEA7@(v4`%a# zT7cHlyDLtfNt_rnOEC7F6e&ey`PWuV4D~10Xu(;r5?$gMY$O_qL#Stbx6OtxBiLm# z8*~jB?oqqd$X78Md@~a^n5_pqlJ9=vE$|MAa^Smr4*rg`4wfdcI=9N^B*>C%Rj3oq zCjQUy`(XIVeaBMBS(YB=kMi9JM$5qWCf%%2ts0^1TJSQpWgWUbO8H>{?>D^c06MPR z9|jB9ktgTg4Uc1sp(ubU?$9_G`aX{EIx|nVM|2oYEBL4vcr^Vi3>q5n;PNYZNf2YQ zTH2)DLhQ%Jv#+!q~4v;F?G-R2L4(2+ZM+f~mV3+p~vrrcJ~&6{x#Qa&jlw75vf3t(s2G7%4=V zkW3w^8eM(@Mb16wp=}z4%rXO(6vVFy@zQv91j%n5#aI2OX|s!7vAm(drres7x0Wap zC4t_Z`{XuaaWvTm`+$#|6Zc3NrdMdK$QjyT*==$5xGQu;brB4!U^EI7SPnMYra9D* zu^B-IhQRf?uEOdK3BGj`G8?aph;roFv0P9sITYNkp8%<6=MU&>b^XIgivmuFO`Jls ze+;Y3jNB#YPPUC>`VfB&H}Y|1(X?25!$XT>BTwvMjfV0S#u-!C;M@!$a(xoK;Y=E$ zs7K?;UAUo3s2l*s9d3#bet;2Hz+fJ%qU?4o(3m3T zs@^dc{*4J)m`bYCDYVf+75((F=j^k?j-z%OHha?bp}ixw(r-Bnl9oov^TK-xh` zWkm}uMC61B(aq~CaMr_x=sYwY8m)^HNU`869)NNi;y4F_+)xeBX14xP9A%Vlcgnn3 zyLX0pYsh#`NXlKN?AkQiHL$Gw1Mq}AzG43KY$ z@@(ta9()f+RU7Saq*P;M|Cf~g-*prU$YMF8Q|w5!>GH2?k}5flm$0bX%J$SS;B8T4 z{KY8O^!7xyS+3*=ErhLW>V6Co8SXD6QEjaJRBBNYpR)l?uT@~ob6a{Qvz1b5Nv7p2 zBCp^S;Fy)OCQaoYrnF)bC0u4)p{dwXiQjg{xkw{RG$1!CNwCN6E@O`+e}0}<5s81Y z3xg8*w1=a@b|PfciWU~d%wRget3@1LpZAy)rU&*Rh6gubqA3?vrLGmsnfn7St+JZS zS}Fy|I;~sr9f>Fet3Mb&0C>$KVvotHtf+*%Z?? zdw)+5+>a<0no5DMDY6Ldu9U{kyc;9#57+$?uYP+=f|v?D#KQ#jduEktkM6SWt$XyZ zZO7uj%VLJgx_#W=`MH1J3ja3q1Inlx(8&bgRbmol|B(_yZ~me=SyyzAZQlSyHcYHw zs|I+EW5ebp3F_|ZnxrE(q7xpf zEgod*nyVG4mHI`u<|Jd>gX}1Uw2|6(GHUCVbQ8^T54@AFQZ)^g31x{9RIW3^B%y@5 zdttvZcUNYsIxp&_P~m6D7swXRXsTB%G*vuO9bX43nEuH=!||VUIJMTuZo>zpgEtvx zk~&+N9KJX~8k=Y@DnrTYAp3e;DCP4d!9C@>M>#!k1iU!>8#*wM2&yCUezLd{7(8N@ zkAS5^k_)6au`g&>#=_5qj*|?@i6B1X#edFr4rz&}7rEf80&8LHd!fOcPD8Cv?s+U; z61egsWR|Y;>1!IZk3xovnDc-%gj_#dfFl_~;TC@Es;{A8ZK!M|;Ggm~;}AEY`sp6bOCxaTMNL+H4*k2+~+7 zE%sD2)BGcF00Y&n?G!)R4kTwVXNC0&blZQR&1J zmnu#M>1q22!0;?`F`B~tKGt+C_`&Ku31H4R1eh~gE^qR8g_dl{+#xtTpvga3Gcc+8 zY=?@1PGEH*gGkq=!khpQ)eM9|jeJzuMOCiq2X?4>hzB4@2!bT1AoNmJhU`A%Yb-D4 zc-KfVdh|hPT)0$YR$Kp5!NO+!>=w+k?TRWZfeYmeyr8?u>@F&9ecTgJLEN)ApD1(d z!XUjw)SBH>j4HypuC>=m=A3l0xtDB#@hO>G3)#F43yn1I874`S=qrFkzovWT;>+3V zjqcm8>(uuWX8NWMCjH;wRgTYUh!J)3lV&@$;PBQh`+&05)pF1L#q6C6N;Z49xaso+ z4v@uKc^P%ze%a+&Rgcz%j*FOA}*{6?-V9$A`wBcf7zC7%xR-6w+|p z=T^@szgTahvb%C%7J7oxg_tT}uaP#W?e}EYH>L&+&*t|2!%GJ$w9A$=HVj!T9Yw_; zfLqm{ONgy|v_PO+g<`~3IE`w>Nviq#=g!N!-&t+lC4?25%la;qza`+t9O;A`0Qi&? z$jE3NX#E|(hTO==go`;h%}^79DVc*r!s)R5k#(PXuFCMvOQCh-gNazc`$f866RVf| zM$*bBEaw!i@$l5voh$rlhZ_$_lb7O$XBygeePk?oMsOqFIj)7xKfZc$=>aRBkx`jweRsj||q5=Ndb(#HS2wX0KNJ)T-24 zIqUurwvd@}5vph}VpZQrb5#M_q;2LEYp*86ZGaa!`{hbk+xH!BVQgR4|RUFJCAyxx_A&sFmF2cz%CegZNIvFEr&( zBlfKMXP=IVo&Fbt8hqm!*^Pmt!Jn!sBuT_|xTKV}ZDO&?zLc1Nw$S4vOo{3_p>2wp z9tVg)MN|Zrv?-(Hq#tv$DGF3SZAx1q&IE^}HmsV&grOvP(+^e{XxjL7-$P7g7GEmOtG&p}d^*y7Ob1?UZXYo@lN zPR+?*Bkz@jsynZfT(&%+Klgq?%nd->7VK}K_2mlt4>tJmXK(BC)LBiGm{#YFh8IYQ zEZ=^*?{t0_b>cS=fSA}rUqk+*w84!s{j11+2voo*<@F^a5DrV?j&=n#2PLfqf&nOa z^>-n$yom_Tft%NuJ%dg3m9?l01J;=pRLQ7LNBE5FKts{kLeTR+Mm5lVYHKqbTOhZJ zl~Xd)BSgN+PJZ#OxZ_w2lA5-mIZ z7dJ~05@HJo=Af;g)#CZUUXc@uWGnl7{{*~tZO`b6H>mtu$^qJdT9g@g);R_+&InU5 z4ftfX+q*q+nJ9y+N9K;ft{kcU@pO($O9jabx}S~TFTVq9kt$;%g;bky+)OKlSEh`r zPIgmu_w47~mb(DVZ(e*O*Nem?vzMk-UBI-^{pl~~hwwSj zW6B&$sXg8=u!9k4x^6!tPO?}?A|Sn`>98!L&$1jg;a4m-PaDJzETfFJ5LVb`+|Gj| z3j186wod2agKDPD!Oc9iIQSAb-+UQs>KcS=TA^o|9RmG08QKQ;#5MKvq+H&SGAHJz z8XC28cD{rb&qpr7YuNrQy-`g*;EGW8KLn>i#-Z^dkxSR>$&s~xMx&Jp0~rgIZNjrZ z(St1IIN3wq|2-FqAH zoc=eh?YW=|*IhA)AzDu{LJ*x-4!CMG*y774}>jfnBTUPyl`VjGsz? zToTcK_OiIPNcSWYCwW_IHlL~|cq5H}k+LUlF(l0sY~8YFc${-7=e7t{bE!$r+3Uu& zKy;)mSk-3y(+G#;yPJ3ms~1!TiqK#xZzsqan!1aFmwB~H65fLHZh&ftkmv3p6K3MT zr5ubAMS-w`{VIpa)-SAiadL*8g&3ET&j>jmSAQT(q(6JjL0D|ahxDiTp>P29r!iyk z33FU~0E*bnM?wPwzLcJ;Crt{^SnBTS{hq%0jC-F;&TK1z!A92%y?cE+brSLYB?Dgd zd`gDXk2L<`LT0WT`YSlpzldUg|u59)YGZ!8#Dk)W`wUO-Tw0mG4jdGjB zNV+)%9Jd`6>u11pTK^wa-@sj07p)!Jw#^gUwv&d9ZKJVmG`1Qyw(X>`ZL`rmeeW3G zxZhvcd#yR=dgg=7ItDO5o%DboYsPkcKMp%^2G0n(jJ~o(ZV`E34pf<*?QndYq?F9D zORdVL^S1qazXGp$@!r7Ia#lssfgGkB<%xf{xbuzv2}V`7L?#$ulsoecPy?38PJ*3OfMw7dw?q6$p4Ux*Pk@Pm zsU7(}XRz;*>Cag|ps4S`0rb`sp*UB#4R!!7EG#78p1&$U>^NBN111f9x?G5))GeQ$ z7VdV~Cr9r19xA(~I!m{1qB!{;-7@j@FS8Hw2c#J(L* zhf5iv*&?7CM}Bg1Hpg&Ec+KDWLk<#Y-6b+7j!e zPNK~yNj&6ORavsT(khBZ! z150k1(@z|8?soW4GuCg%R^T@r=2$wF00K1za^vxYQWUsXW<{*TlNnvd&elUKg+6Ws zfVdcauO7%z$wQEgpCi_y#PfMU=o~qGn-S#eaGPNl%Y<2IA^Y!>7;;Ke>`*5^dW{js zf0S3Gp7r6QfMjxit8^M!H zg@AoCZCk2xhi?x%86t%pW0khvy=)>(&(1+67(RoEdC3bFLJs4(X7wjS5SOqex|(X= z+ICh7JbLW=uctSSE-)TgDh6T;b0q*g zoum?5)5P?i@8A48ydLrC8)YZbO@Ycjb%ojuPT;Z7x=|((uJ5RS_6g3noWmO8qm%*zmQ92g+rmZhL z7#aUX8i&2_ZRJ>~XQl_AxTZ&>Z4)zn!OTanznvR9biVuCR`#I>WLm;Y2V{|WSU7af zIznvwErG-fCIrfRvE{KA-==$@3&IuZO1IojPNm{Fte018yU$Rx4wd)9hxNzkDWRKS z3=bv80g1J19CNtkCZ@8+66v-S=@Lk@7O|~0Z^edpY$Qc2YO*~=;PKcThf-vG>Z~ne zk-pvEv+7k4n5>Le0w{0}ULgug0B1tbA1@z8JU7Rmp>WC3hPL|mC)LR$_*k9ZjyeF%aRdql*g*{XB}*sMpv1DikfWMjt!-&) zqRywjK}>$>D-G`#VpfYE>yM0XKL9LKizru|#h~lyXR|(7!9m7g+hH}|BOC)sO0F;p zLtZoE5xM|#VxvRipECOjX}XQcTi7o#t7_kldskix%&46}ByUZyaxYhrBhfKMF=ts` zC!?H-I2LRfb;;|ly0PhKcnAl+4p6c7SLL?*woAad5*NucNFyW~jC^|{(gWF;pVT-5 zJTA-ejHBWuDGsje1Z1tf>lNem!Db!kj$l}-bO|)9$lU>JL(%>huWI$e1 zI1J8GO~`iLDad->ZAidt!%4#UwQ?ro*B6=XoJC6QzMRKZbI8dUk#zxZn~`+ITLkY^ z#<5NS8+T!&#?to=d+@?$_XcHv*-mCT6lO)7*7Jk{hehhp$uSv~1kNL9yGRE+dHQnC zfl}?xJt5omAjx{h_yiye-v8poTzmh`G){&{vN>=qQN|Y`IO|avzRI?{gl3XEs;SF` z!BLNz8I!d-%2{Fz&jP)jOGZO`*NJl>%IPvOWhw?+Bo$1 zq)M7(79qdTdT#Lh?XxltTHjv|!*|EQs(kfpf8B2S`*{E9f$C&mO$6@HQxog|VftYn z0+1uk5y%ZcnrB2%8coU|S_?M8WD9Kz{@p13`=^rYpy^ABM2xR5at$=pgex0bH*%jc z`32SZ@g<#RU{12VQkOc`AFGq0D4;z(Pxfr1z>>mdlXU`KwJIWE`2LRk@tOHa@zsIK zj%I1b4*xDk?*ym;Y%;0m`1$4C<39f&yP#M#9?yf@wp{svjI7aK!;9+47et&}nIOa< zmklWCn^_KQ8l+Y$m7bQSYmAxdWSfo!0|Ddn-!vx*Qoom3nhb!;8)ULnE^qr=GOH12 zURx#ued?$}qXl?pcXrR$50Ea*zSBlXm~Zc)M;^U~f!X)N_fR}>pjTADYHUh661oG` zFWF5Hf+G;zRez`(l_xlmxi_S{mdI}IaK&y9U+Ss3PQ51bBY+2Q!$n(*7 z0#-<$2}xU$KS$()L=qg3cx?%D>lOdx=o$k%SE82E9p-yAW7}ai%WhC+w33T{v8# zcO7^JW$Cek{0xXY=QSu-^f8l8EScW=I9L#E&eLBY{*8=P*LrM_p>&XNG%ni z7$MM11jm9`_Pl>lCUefWxVQ^Kd~cY+*n@UQV?DW z>!s)>E5S?H6_q>(^+=XLV2_rW^>^v3YWnIOj4~^dWY$lz{rf9A6^M^ZPz+M) z>ss=cl?9VUZ-Zj7FZq#EL7_9=t0uHaB$NFP{tmIHnGLX(wjN!NVjy=@=yeUsznoFC z4pX!7&f^Oq;CubOaqx$_g@-$DR!;m!UsGMT2Fm4qm$eYQWJG^UrY&QqHWo97V#&(g zLz;M*MnB5x${38i{vDrAn&+2*F_)a=v0#eIg}G~|>u9GnoyIq)lugsSy05e!*KBkf z;9JGgP}8^w$+Zn(Ez`6dW7#g-=qfL<6&KONHfEOV)7`YJaP4!93ckO=j|T-(*cc#N zpLHK@jPI(7ihloeUUhvzXrpPxkm(6S<|i!OxV1E@_`ok|$N9|y{m~f(KE^o``ZDWf(9i;Pj_1kba#Ow(u_=9X9EbS`Y zU0OR|1bE*cHi&!qgol*5u=hWiAr|c9&E%9MV(kO+oKvP}qaX{rm$4y?pz zc=elHh$X(Mx66BT{lFG~$AE$C|jLzL`S|J2Z%D)aEK4-I=Fsf1j2`~qc z{kpyb=wIVVN#Vjh)c7z_wcEMO%hx0KkDh}1@#*Oc_vj|+ad+RO%4x;F_4`W)d=MUQ ze2AK|U|ldXeZ;`2um4z0T&2Es8J3MwAh*EkdSk zSvri?;2A{4te?Ud80P(>lqnmKJR@jtCfWK1X`wIg^}+fxXU-}jI=q<$l2{ujALc0b zmy2QQj||dlC3rrdD(_iis4LNfR|7)5=>c`pMYq){n5@*Z0k<9!hxqKgwSAS-mW+RPXGEfp!}~$i z&KNa^EPfJC!xRStgr9mEd@Lz%krbcoRH|h4K!i#L234qJ$U(+=icPSZ`!d)y_>X)W z&|R->zwvViq^2omlH$E&ELmx8#|a*IH+^if_h(QaUHdu}`;$Gd%Mh*``w^IXQO0a? zs9`}i(KE_fRrrgxC%KTYMO{#9!h*C3!WvxSdy%lUi56vBxAj1}o51=7R_vJY%=y0U zyicl$ZV>EzFWMxaC3VjKNod2dvf*>uBMC_m&Q~NEH_*S3GnT#_b<%y@-q&QIr;aHRJI`5?s9Crp zn_kJ*WS^*O<0@8;bG3j%W(&pd?Wx<(XT%QieD5klyxMU^#F7_;G};@w@4KXZz?9aP{pOv{T?=g>Tz|i0(C< z`*i!`!83^5j6*6Ic4Srz59TJoe$c)6oP`!dl=s98!c(pqt_!Unv{TjWXhw$Ch9^@B0!|7! zwJv~TM^Ro!jgXy{nHVU$PHjvsRn_HnX2a{-h#2&1p~U89ddl8$3*c%TBIRFNsP^h! zCQW~Z#UZZHl#~Ydv8JJ9s&GP}{fnsjwr||Z+!RXD@g&l8KoU0PDVXF zAW{N$3rg|`PA6oJ7Cjti8xGf<+bCKmQFX;|l*^MzfGU!u$*BWB_ZTZ#Fr?g4y1b_T zD2&-8s-iz;Zx|hQ!q&Li8@Wv5V>=o(o`g60WDe+5)p440GGdS|UE&Xg375$c=uEkZ zqQeW(*QpuU_edj+^C`FPdsF1p6YZlso(%DF=h^Q8y%^KM(HA7Ln$Aa~K`u{PkKpOe zL`nKyc>fc}CwI1!M@Tdmh3tsK+f%CylXP|luQe7l+WGS;$OZR^!)$i+3AvZ6GnA0x zIWo}xK{n*JIplk=4PToV4{3IhPTDV+^&rt~=5#Jf7gQNa6KF2)MhOzShmntMzus<; zXW}%f1P6!S+rSdVvJup2R= zUQc=TiI0~JgfV5*RUPrOJ=mp*FOxl2_H6VQBHTpZ&CaJ% zcSXZj1NJa|s8sw55oP-X&6X^~)_YD6h3=kp%?|23iP`Pa0h5%-1;ozc&L)Ie3E7am zoM3$QM<~Y%8`T>4I|&WT2IV&k*XefH&ftt?x9+=eVdcJ&)_t|oa5EEoVNLPR2|D?u z4wx~+pw;$e=Opsq#O!)7l6+gy@SCw!XV3)SK8@eyJ0j$D?g8tTTh&{^_pp9Pz?{dXF%th@^(3cV}Eux5D+3&~)Us zA&f&F3-C5jVC_2|dnX0V@e-YM>|)qqSiork*lT%b_z~I)XIPwloWfBee#bq@qj2fo zZW`tjSY;`BKCcHcPOn;uKEm9}bNaT)o`9eRj49+TMVU*vdByzW0hPvWZ!Xj4ST=l(7X(+4Mf21hU> zZ(Y$uK7#7{TpR&O(tY*X+8)0ZK_c$FAG72Y$ytyaqee>iAQ_ufjF{w=TZnFBtIq2w zYNwt_B^sQj(0^dT$)Kh#D4Q2#j(o z`t$+_bTU;kYo$R=$tVf@+r5rZ9DKe$-Bl3TrjOVmfK&1A>82@ny4f` zJqzWy6QjR?75V<-)B%5x3+2>CGxHyJFn;QvA8rURpJa<(7v~*ZL;XMAxKdqjQvTX7 zSoWyHclv7Y6Iz#_IRk!~KoVU_!#t9xGqe6LOyc5%Y5JM0n#q)n2o;=a?5dV) zu`Qp_#L6V-cO$QjITh7tLea9BJhOJY!jSt-VUfJrh)2HHn(%&sHrf{KSwq)p9fR~$ z8M!(RVa&!rP=dvobcz_Hi}QqYi#;g6+Kl#vu%yJ+t8vd9RG#>nH6M>?z5D+t=Xrzb z&+{uuC;C_0|G5AIUtav74tyN4B!K{h1p~viMnOw0IKzO!4%zh&g1>!E zynSxNDmFexx!Negaat-bPRjzGP;&SXmXCY7!ahJCF>+4QfE_SZc?x*c5xS3Q-$86; ze{0I1irzqwT=t^!05|lmV=1ljzzzL+>%dr=kiQToHrY)V7gTlWR=$V5x-)_PwstJ| z&pu?yusIvTK~#83s0swgQyKbrLQZ!JOqKW?ywT)SOKc47J20(Wm%xvhG6-f}PfCWk zodP1}sfB8Lm!CuhYJ3&YCa%!c@h#7K!hKdAvvvRe>?zn=~3C86cqiCGkSaXqOr z$a*Xs3Y@hGYePdkZ5D!_z`kq;tm5E7d8L{R$`N}@hGa(7jUrR8161`VFeR|4gR;}u z1~GW{(0X9VT2!J5)`)AS^HTgiT0}4QQ$`(}Veoyrzt&6k@b60#VsnA&_EeQA#X%C3 z?t6@T5c?8Fy9yS`JVS*C`xAhzjE-f1xyQDF4%eBA(q!-CvlN^-35C=J_n(qQRhcc$ zoC;kwc7<*C!gJ4oIbi6s3b3p*Lf|p#C}MJ^+Vd$?Vl^}yHn;x0N+rl+PZK?Dg6Y%Pz?g}_^lQp3Y8uA{Nk$8@M0>L;53-) z2%ty&na2GF(b?FC|1VA|Cqd4B5O@Kfv-`0#BD4%NG&IgCe`#i-XY9yZ!io#CXRfC| z)Sp(KLE+zj<<-lPfib0=NLyE19f4tvtHd_{9-xWI@Fo+$o6w!$l*fRxT)nj?h&`*9 z5>&_`tq4h#)nVj7x(w*T6a{QdprL1DcS3nu0oNi55YJw3@fWI!|laK)Rk-vA%$6%Iw1~ZQI6Mh#Vj=#R=jI0Hu!L@{lpzXDaj2Rm z1$N;;weX8m`McF{BuT8Zn!F)EH3TDI8FvGLjBA<~JkV#ae6eLtV#P5$*7P1Bv$xQs zCzw=`294I#sW}>j;iV2WkH0H%##0c>CEp`6(WAaD@RWJ;B=WTe{1LOpm^=?4PM} zYCLqmAh2jnj*rZk0_IR4)a5%fA5d@i!hZf$t9vR2vQhZ_9|^hN@2=AD{!Id#RzpCm z>urHhDCwa4^Wv0wM4eVwkkzy#VPoj^0@JtlT_oj7Y{G(~_#%vm{1L^t211mwin&Q{ znv}MxrpH;;Wt+3M^Hgp?f?R$Tp_8%3L^n&Ry=S94D@UT0Wo81$#9RX&M6T5>C=t9L z-%I&UG5{xN*>hv>W0juxh^stHvr-e$1l}x;JoNUh8#v@aMKD`LYDv}YH+!iKVqAD( z9OVk5zX_w9a8}!gHO?{(4qQXrMnyhlFf((L2lB*KDcqnYg;R6B-A5@|%%ABq7;b6W zK@j!S+ZR#Yte(7@YvFcJ$Jw6#l=JO+zht`w=c|b#Nchj@`(G41FyHiFL2RbT`iPEz zQ7zU=wZEnmO18JmOtD>>Z{e!O>|FeXn{iJ#ot=#$vOesN>5wv8co}M(y^clsi^irs zsxp(s0M=|&h6(|9O=l^mw5kT!V(rw!V^0vzY0ecEV8axuQ%)kX?{Ux(iuj>d7hc9j#7Fk$4r9L9Ep`03NWjfKb+3W(l}1gQ{a%A0 zUg9eV0koko3pf@I!l_8c8RmI&C=K|Vu3hN|ym%1UF$=8w578fOvCd%HFS?UTrxp}Y z)H&JCM*cv#$f3g?Xw-@s&D9p+>~}a^K%NP&@a?^doKn?2%sFDVsyb2pj=a@|b~xoB zrYB>SEUSL+w1@>ZIL0LN#BY1zS%$(UcsH+iU5f*Fn$}Y6pFF^RqB`{te(MG%buP&@ zcyev&cciGo6&xg#CWyuxF~r)snT^F9aIcqLOOJ`hUG_<@eEM0Sp$DEJwc9+exo&<+ zOKEU*=xd!n&7PIAh_??7m$z4&o8AGnOwT?|J*%`O&6PbWQ;88Me?$l~_0>$ao5S4o zL*;G&4hZ^yD^A(aKqm+IHFvXkluTs!Qvmbf6 zAImhLz(oYq8!?R0i*O>x3Mrd};SMLm67C07%+2N1@xtYE_}jWqANosO5bTC7;u>oO zgj{hDO`{eH`nefYWQ9SfW|rhRX{Ptf5=w?*kI;q?(&Y@cqx+gGcF`DyH4c@EX$pZG+`eM!?3ceUui;7#-Df7(m2d5%8+Rzm4$j!5Fq{Y*WtINKf z1%S4Vh;TA;OHs160=}hoO~WIr)2fr7YO%z^8WE25xZp+qLG0C1&ET7KFZxh3PweP+ zr45?y>t$`hq0*6(-%+NhX)q&v4~L*1$BKRk`7ypj8~^RheUJOPH-AujHD%)v02s2& zqonTqbb*YLu|2dhwZ=kw!0ehtQ&gRWub?!#rtx^QgjV{?i{rAHC-k|_s^t&5uO(=i z1vHG!QBjZs`fzt0YfVl~TqQNH`b9+SAS-VKOZ}us=CsdBp_pj++G?bS3nC%v??i~_ zy5A}mhLASp9Xc=FuTFr})N5>DT&tW7k}u)gOkij=V*3a6RpQfCtm8A8*>R_aCbTDp zUCS+CifTP>VVI5Fq(Bkx0CraU7LambgUMQ>@8O69&!@vbiJ}_z5V3Pm>JAx?)8|!@PGXkx;A{Xg30em5Dx5%>%Av{fB+K9F58h;u ztFXjJP#cAZZm&5#L(7m5nXu{q_68sDOK7renJ|7Bs%;P~ z^DMOgXDL*sZ{zvealpO25%djr{(1Ge*06Er#~H`9#A^)CFl@XlVFQkq$u!#Dj#82N zu`NOR3HHLAQc9Ra&agD!FjBKeam!Xlb?3(CCI1C@H}Z^Q=08j)ehT9-Uh zJ!G={q9S%ioV30TnRv+1*Je4n#$dNIF%fe`5 zEm@)~VI`F-sr*%`I24k|AI!i?iEg5vt7)3TIXpgZEXUETk-1tqsHYPPhJ7U#A{H-& z{KnXcA}Qv`r?h?aDb+&i?vYR|o5o6?8WLMoj6oGsWK!yn9T86CD>chwAM{579oCMm z;FSWNfCPu;z3xCH){@pxe@Sz~pfS(HdriPf)(l=ncmt zXdDDo7czochDBL8x;#saJ(VNFQi03X4xoyr;G@gM&&8_=b8m-N$sK*oy-116zX5xS-PHGH zgbWOuJ2{<-07o@7(@v6?7Pat&Bp6INk zUztcw5q))P{71aFwe=Tm>^XrJb5*O0L(~IspYvK`XYAu;ZyOxlkKp4FOPb=SKr#WjWiEO0^$7M&h&!H+0Uw4*SU8}Bh9^f(g!pgOf7dkzcPzsX zL2itj-`PoOU1xI(-^N9g>*IRw2=!plSdDfj0MzASGdxt$J0=i9(9)@dp&DFc+FPAN z81E^i*pXg#u78HIsyr$v9tB)EA5^P9(}4^aU<~EI-vG3sn`8;RFupeLa;Ggx z5MyGbwaxFs6&P-gV8FFnT>R=bxh@iDHe|5D@xK?Kh>B3=GXG8#byhzMnHjvcoI3BO zeN|GERjSfq?9ZT5lwm5aWEdC!r{2r`S|w3Jkw z8}V*)0O-P65QDdClDQN=lkSFZ`~^F{+0BjBF;E|-pn@GbYec|^`bjP9!oUo&mr_P6 z4whQYw)Bj`|05O8K=B5A5rKzsC^9T!zEJ>e-)dbOk#NE9!x?SQt@kk9=)Pf5a_kJ8 z>L$>zfAl?n8ILA_kUD(d82Ogj&Ibw;0ZdC>hVunl8gvVFI2)!)X;44F#61ZG=W0@> zzkwSg4U~fydcLg}#xg(JCJ=s{xnf>^-fJ6+P1O{o z6|6?{Fr!trliioNgRPwfsYBh6_ZNh+!pu3geH6mzb=a!gCVBYFq#q9 zo#G=!N?ik~T}M57cFQ#Ec2l9*3ys=1K)zL~_0Nq+24UZM^C!Y}`V#H-wy^Y&50es@ zx}M9l9-I+V=qK!nnLp?Xb?5_y=b$ImI_D(xq>)0K@LgT1(@#5rz!_TM(&M-ZEddsH zd_yt5 zg?cj_PSXc(Cw9~V9Qk9~4>6Y!R-C(1T9q&rQaT{X! zTUY&u8>D}lovzy$65tnq_tEi-jeGFqYr%l&+JV)lkrRKEsZ{71L`{k*SiyW(^6$v+ z1|=r7`uNXxGp-f!a(}trQ(= z%1XU&V=6AeO%=E`r)U8$HQ!=ERg4xH^8o=6ApY#CebaBMRR) zG%AO_@IL4ujNJk+Uz=&Asn@}8=WoJH(fa8>Ydf-rzP{{}%!HuKyq5C*GY9`ap$_EK z)6A91TAM+O=-h0{i`LfA7NR=#gFLM`pc>K<3R?G)-rFsnXg>=o6*SdN*XA>;tYIc% z=BXT3Gn>z16zw+IOQruEw=zNiI+l5h8pwj#0U8S(hpXytn(QIgX+LkPk=FaY9BLupmccD!dAVf9|4R&~_bqv4PoH+(tf=}@@iPD51s!sE-##4tg5Mf#iotCEiaMd5fgWLl$aa>;W-liG#W zus0%osmO+$0dDAalt@M12%@9N{NJ}b)!mS;c*-{O2x+1b>=Mcu>@t5v`Z8V6Kywuh zjO3f)+bM|E-(^LirP><;tA5Yzjrmcp8WYf%onFM&`>usPjN||2&0YTLIr)C`UCUHR zf3f;KMF0rxt4#nI;3%E<^jK{aB6gz4x(&hkFev%L-c~Ba3uO7_B}0;A8iMbm%N`Zn z3JC^<;4+CFY`^(T9V2F!$aJ+HjkU34$EvI(^o<$mC!;hL7Jqe)9#}_W;)jZ%(-?5T z-5;uQ*sU|%xoI;tw2#C8k=C1VR$0_g`@@6I;=0s_%;M=3QoEENZo~Dl$*;uY;8YhT zH?hBOF&fRPYZ~2Iv!fVIzpM?vKbSba7ZpLn1w*;0*EK-LSzC?kqpgNEPLFh zUi3m3b`tiL$eiZ6K#kgrVxPT~e)8F>@cNO!m<&VhXjyz)9+T&m^G5`01JlkB*w+{r zBoAw_yn~emZ;ZwMWD>em<>UigpQ8Sc84e*QeNfdL(>xiOL5|gA7|N&GNjk(pQEVoN7=+LFf#ZW$TWgY<$$Zai*0m z0N#!TMxJbl@|EB+PE=iFx>UuAh0t5mNl6Epj}1Bwhd3=_f8=X)p$Djy?>Kz&8UI_5 zMS$f7L;P8AXj_bo+G!p_quh2SNS*0s|LgLb!sQM(M%=%OtU`;1mQ`bJ&f-uklZacc z`C)D{KJL0kLvA*gFs#Xj##YhHoN!iZHyD!W8+50&@KX78r{`e!)}MPfqJf3l(dae7kU*_NRg-qK-S? z+tQv%fi!9O+`q~c`_!o65%~d*nECTO1&I5_#{a*b#UN5%f&MjE0Y`^Vp-J)xf$p=R zL!szMKqIwBpcfM`9tCV#=C@sC%+zFnwYSQ}Y0r5b9*XmFm3GWw6$QkV6Kngt2^dY*ozLwXEI=EK7(2q2mRHtJ#+}u=kIEd^MTXV9n{i& z%F?D`eTPAvFSoe!uf8{pxB9lhJ7VWZ+&3r#^oa4qe*(n+U#jG0JAzcHTq%}FeWPEv$r#<#%Wq2F+K%fX6Ub>S&R$m6Ve0&}n`#dLpNd*a$}D$6)pEBX8W z2-a!UuIYS%lIw`>LOWc6G49B{c8$Ab^FoqE*k`X_WAp`7EA86}lRF117py|9*yt%@ z_}7nAJd7dx=8gUROqrKOj*lTMb)x!Sf>ODA_e1F7Yor5Y6*(x?%`y8w2P6fDY#=!E zrZriw(gD*653hkyB2c_Wlv%l&t7XEr)nsgI8bkK!8}7DNDG&<&1m44}6eX_wr(}My zdEGm@X-&4GvXr6zYAud#)pB9Hxf-8V5=fbOFm-Rx4C`sCT)-S_*z_1*jKW(u)v5ew zu6R(~$z~$$M<$@s+p)P}@3ZSHeCt$~P!hWdMH+hl0iBwn|C_$!18FP$9fmNhuT&g0 zm+571w?5!HL5(+f(2A8$~UkovcKFl=dPe&ay#a}xeSwgCrkQjaZD#*0G2S?md zsr`_WQjyMJgg^H1vwOV-hq9|iy8$KK=j>8+JENTh5}jz=#V)@opgM zyX1x;)uBW20rTNcE|%_eMxeJ>!g2x;e>AxD^R8wMMwjg?SV<9|JOSs+8#ZDeERZ5Z zq%LdXJj0`RK!gF>&};LT#Ejwju7pa$&aGXz#uXLVGxmrFQ4Jp#Osn|`pWV+n?#U(do_q)so)Ppflkm)dKd zmGm)QgE7AIJAeovf3urymN$3^FL@0VA+nDvm=PqW(pK}S~h@OaZwafYve z>8ky23z?HxuL_(6#eIB-+|+MJ-5GRy0gdW_5Mpk*vTwo0UKF7*U%7HH6}WWz1-?EV zT4<<^`kV2Rrv@^o%71+6bxZWuaevuF2N$;2=Ufd2MIM2Dlv^fLQWs(3IpeiF))BVY zsmZM)UY6VLH%bPMuns|Vz$&qIYTig@AoQ6SFb&*4RvWJgiEOfGc9|{oNg}Djp(8_o zhx@=M*@|bw7^e(AHX_R-VWlCKI!FJBwm>&Ha=@1D*!9WIEoMwe&&?Dj462yxLI8gt zIwFo+8?1(8^A$`macPDv$CpKbgX;u!o8Zf6M8pe|74IN(!*P{d zzNnEeh`$=o1L<$=Z-I#8-V5I5w~T&=f0QCZ(Xic-Cb}~Aye3YVaxG9+;UAd9NVE)# z$7a&VjS6HVa<*qox#rrYTDQKcoo*3pKzp^a{u{3A|0U*zJ@bcpEYevmaE2?MeA5=* z04Je#_r|nVrKBx)P~tH(;$_bBm-{qLA4G_C#d}MOB@Yg6RP=V4m0kfFR_YpG3nXE~ zQz1dx+Gu-ox%!Ibkkx7&r%0Z^iJ-2#ll+EXf!CX$r1Bi%*@seMaSStQFI_-ZSKuE} z?)X-Fjhvr3Ot7|u1McC>yt~J*RN@$P4=DuBzkJi5K`_9=ynOU9!CQK(WXQWIMmfcV z5-*;xKM7DgWK6R&8l_Y)g1{btF5@2p!GVE0z7tS%+8oo4xMzndrSty2dinXp^~t>D z+WrEzXdbkgKnASU%Kv1g2wlhYRXM`88ktQt(Nu%5uuLR7(5xfc3~Q#cYU7`|wqgX_ zyU}@!LhIKh(h!JEvf3JzZsb#vc($h66SB*06=#*!9rHE7AS?n`ioAR()wImgzDo8S zPC|~xa|Y5s_;QtvmpaC=k|(rnD7zZSMS}fmH|+hKxxe1z=-|b~ZXm;q|F#CJR=Ddo zX{`6gPLcu;z{|u@x3Y5u__1$9dCB_R`Lp{zl$b;}zGF3}Zn&apHcY_}g8K(P)$Q!g zvN?nCdC3#-<1}2nLSO^VPgbuG9 zT_LM1ygMp5{gWi%7x(F751sTI`k*&go)A)NraZW>fMe7PYB6)#75uo63L&Q5o zJqn?YeJr6y(Fm?BAJ$)nm)0JgA3ZJpkzaReKfuwq8~*%c1%6Z2{|LJO+^Dt&?>w^U zbnFy2)hjuzombZ31`LagBS5I{daef*JFJz?;Q=oKTRv<+3kvN;(YsQsXm>Sxaeb{r ztabHBb#~pKW>z)LkCLVr{Q_$+tDLo53c4DF(q=kZUMhb&W$&x1@8mf$%2MgZJB@zC zblu-1BL^zoY-%Ia-QS;jX*Y=P?bwp(v3`07G0bEY+Kv|nG1L0Ww;Ii|6o#wKIA9r| zbCW%T8DTTsAHCL7O?$wLsFgla0s9pS=(-#%K{w&_^~lHT;m61)V#se&XM9|~XBhtp zBRm}oVQ5FXLVXcF$vP%5E-t}POlkGCLen)-ik)f8d90*QSnmTgUogiyVNwZ3$$<~J zY)BS2E--m}Q!Eux*ZgWgkvLgF3)V^3WUb;hFg-1rliymj=y{qtrmGd-AQ2}RKOrS7 zLd+B9ucI&p<8%*7(`5iO7L+}L9ZBsO=7u+;H+Od~l7mN{K#yMOtCh)yT{kC8+~jNT z5gr0L=%}0&UhPH<4pus$&O`Qm6iI6dy-?ttz2Ty%viNVy?6J#9X(pKCcOm<09s{qD zu3?`Gk|tGdlw0}d6 z5{o^s_^v-jt;6F}Yo{HM(XhIm%olp~$?)YP<;9Z7ps*ylJX>wEcYXb<2WvA z4tJYG<*;0!RF@bbDB=n@J{Y`_D5`T;=XaSL^I=jXKTI;U2FxP~*od)z6W?1^_h|7?uq9{aX(DYo&f`juZBy)+*75Aa7ayHqt)<82COA#n`5nq! ziiYF<=!*R&^p7?Jsc0fZV|n8)8u9!J$H9!i^1USzU9Y^D2N+5wv7_o-AxdyW>tuV! z&FSak>v#LLqeef(JhbXLnS}0{?Hk_#EQuJ9KK?_ODr7AL8ma0 zze6GTLxvZ>K~LL+y+N0fyK~(72g(MP(KtLk&G)*g7k9se$olFQ7w0%^U4jWJm!>G? zrTy9~X2q~$S1WKCcZ-aZcy}ZId+Yn9-ufdcAc;=FsPKr1#0I7gYQt#a?KW2~TxFO1 z8I&Wiwq#rBz&TXPfZB9o8ErsaEpy}fblcz#ykg>eavre$r2?s6K<79h^=oLu+lnFh zk|VB?MnRE>W1gs}9M3RDW!bQ=b-mMfbxKfp0+K!R^)r4~9^%dsP?J-Q2V*BBw`oHC zC~Tfl>NmeOePyUYKNR+pEEqRc!VTwbDXsy(1h3J_c~RBoVxySSZDBMl>nPx z>SeB%-l!R3d)(cZf9s0M>w z)}F&Sg5b>z#zslwEHO>C*n>nwOT*@X3l%ob5uL%jY=Zd?B?ip7dtuWjF;6j!pfBrp zaE+nb8?qf|I1_VcH*2U6#8oB^@aF7hb?c8H0Z27OjEo%81)jt22ZCj^rJKy@qt?Cf ztepXJx9|hF=X*BUJVtIh{oa&D@8uZZGd)P-I-b?7pK@MXd#nPlGpvdGa-P{oox zwg(r2xuJ+{93DHLz80c}z6VbLl=Dj|+q&=`(Ya%?sk z(>_X-BtGcBz4)}4?2^F+elK`*IErBUOsE@LT>aCXqu%^f_E$;iQhC_yO`s_`6V9qd zU4v#+0)ugjLv&V7qD~>pqU>R#v6SX=Y_E-AD2y%v`qnO^ry?Le-tLv&O@bfldz-TU z419UkuxoRUEI4yRilY%hcs5V}RR|X{G3F0e$q|53`bgb7a6H)uH^et{voIpF1C6L1 zoP9oDp8D(i`_g9=G=i-Ip#|MXno_L|2W{}zbFdIxJ$_uS6&h0b*r%Y+r%%1}@!s2Q z6~DwVL>6~zN>Dh@9jl&es^@LqmpTAAVLU}*@4yBkd1gcQvB32Uqksr6GLvsF4e-LPAof>WwUkm&JsfBK#e(7 z+Lf3%`2c-=r#N6XOM`ktZ>eQ{vA)`kVnoe0{1BhU1#g%fw>GrDMMdRhdk{&q zXQh`KRstqJS{=3$2{f$;J`6P&ad?Cl=%#RB{d3xP-MAzITnRX)ImfykEEh4`J{xp5 zw}92v-ybMW z3{(u;;VSU37S0B``z-;mWkL@{U%yjvj2+CL7_1)L2`(kFNb%gMmiUHAYNkd|KXdn7 z(Z|&uV7SZbemK*>Ae@fw?!>lytr2FNC@gnQanUvnwrMYn#Y`CkeiK=t>%Rz>2S^H7 z1qZ6Ss_d4gvprQoi_!h|&5JzWTqe#F7+sE#%YZH-C0iU0nR=7I-Wcy10 zgnUE(75nUy{a@nFl=bF6+YIk0(qAc0c-nV)qBPoWi3)OeAVyU`Z{3_3adk__*0q+~ zP+%}vv)IrwuL%@%G7312WmX>DE~`AmH7AU-U5jy)X8}hEUN*E%_aNvleFAu3xh8t^a zs_Jj_k5vT~7c$V8Z#)NkK>e_9!kumrTFyJUJg^z}ST6#mS8C=F30%`b&z4`>r-bJm z)TZOCVn9_xLJtQ8MR-~D5KX+JKJGQT5xMKzSHL10;}qo5VyJ8NKe<@kbXEZFWE>nN z&40||7Js^TDSGmX9GQK#c)YYP{ATR`(a-YZ+h>5E9Nmqh;()8)@2QYTqgZsY6oK8Z zJqt1Uop>B5rW9|2@Lt!5|6%Ga*y8A#E?nH*3GNK;?#>_q5(w_@4uL>$cXtWyF2M(P zx8N4sHTW5x_d4G>KcTyK*REPsbuY@$x3m2d?{^`vtw+UA%dZ{y$^W4)XFjMI(wld< zKWt}cYLhjaLyRr`-1|tIafk7zu}F~XXe5nO_AiFaVc{x!YUz+*zF+*Nw4gj3wiB>f zo%}r*XFqK?_YAr0&K67s!rz&q!1qOY1YA!r8{PslHjn;(zAzv8s?2#m2RrF6 zOJ5S~9CxV}l4OBXv5M|U`H1&Hqq`V z^WtxK4g%OtbGdr#m#Va$hIG2wlZu7)dUZv))`5ERNZY73JJ`V2-&ED2KEI==P4znn zp>yOq>RM9&OI5gORfQYCF@o;E$Re2z<#I0?>}Rn|DcoA85Br4jUA2-|Y1JO--!O4{ zoIQbJ)Ly>e_CRk7ZU=^!d@btk%k|~GF8|Lg#FbyRk;Q&yiyZ#T09Z>9UmX4CLDKvo z#v5t)D=9}VRl%Magsah98O#7gj4MUFMi1y8*_BRYP`X*7fptCS3mi@}z>U7YQaM54 zC}~iDY2vFLB}EDQh=!252;bfT$2Zr2UA6pV&fW+Z0+P?!(~N&7(6z-anCP

    &SG& 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�eTY#b?LX)(ib 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

    oIQ4YOXU$0Mi5i`Sf+bbJ=L9 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ǧ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 z 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

    buibo}hicx6&l@gJNcsJI;tJeTH?p}*-9#Ii z@3706gDGL2Hg}@!j5ElkxtG8o`A&fNTHKigV?Ae#^La0ar2fE1v!ai3$O0s_2`(ic z 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«< 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 Ly^wf#eqsC{v)m?j diff --git a/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/pack/pack-d7c6adf9f61318f041845b01440d09aa7a91e1b5.idx b/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/pack/pack-d7c6adf9f61318f041845b01440d09aa7a91e1b5.idx deleted file mode 100644 index 94c3c71da52ca3d4761c4e9041b384d9bc75ad9b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1240 zcmexg;-AdGz`z8=qW}^Pps*kZGXwPvCCmbJ??}b0K);VP%m(x`PVCs+bpPZ39eaPT zF#d95_t~f2a`oYw4{Y+*Z5}2Csyees*{;KHB55dV&?dF#`kRGN5~TfOsX4T@J*P yfLQIszKM4h+|MXn`snRCm0er%Quq9yFn5~doV&qSCs?ySKaj$-^Vag-Df$4qg=3fi diff --git a/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/pack/pack-d7c6adf9f61318f041845b01440d09aa7a91e1b5.pack b/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/pack/pack-d7c6adf9f61318f041845b01440d09aa7a91e1b5.pack deleted file mode 100644 index 74c7fe4f3a657d606a4a004c87336749079c0edf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 491 zcmWG=boORoU|<4bwrPA7bLRHNavd@dXt`h9wYOo@&ulXVr3x1R33=PLWk|2oj=R6e z{6ngQ-HiT=p)71gtxNdtSc@#my7+iQ>e4qWip{2_EIvQCa!ROJYez<`n&YvUtTcI* z9TTeiTBZe0nUf^pW%6`sa`eMPzM|)nA8tGF@Z|lXUFTAFz2AA(eS_Z5b4eUxWitfM zx;^&{{dY4@|EHR09p8m=V|lCdF3HolfsX5m=3+ABVfbI&731*Idp5t|LFI}jHQzg~ zyQiAoi@zxS!<^^L4J{_ighMw%nza;7mv(7p=6M|PE%R{fdiLnm>17)awYE#nS$-B0AgjUCm@D?V9#TFX)~ z$JoTcz}PU*66+=E@hWo`*7*&jWecg0;xw=p8Q#< znGm{LIG-cz>zd?K^@r5dt1_-_DeboX%y8$7^v#Wo6?0bm=)z13@;H6Q^C=U9)d4m= z>xwzr=RI@+K|))fGcic~WZt)&iFo@NUWM`6pV&9?&Vu_Hg-aj3U8k~ZOJ3@p{}TZ5 CmFm|3 diff --git a/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/pack/pack-d85f5d483273108c9d8dd0e4728ccf0b2982423a.idx b/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/pack/pack-d85f5d483273108c9d8dd0e4728ccf0b2982423a.idx deleted file mode 100644 index 555cfa977d92b199d541285af6997543062dbb5f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1240 zcmexg;-AdGz`z8=Fu(|8jAF{d02H2-U}m6xVlWF(-6*Ck3|N6-I8-nj(5*DVOle|P zo{t)ie0?j&@$0PFqP>OL=Y#(kT`Ve_JpcH-3(;%WeY(v#lR+%mtR?&EiC&|hR!?hN z(wd)1Z9Qs`dw%x!5V?meVL>yD15}(ow=(kB?z_;%ZLnQyuGiaosUIg!3HkM=?0m@~ zu;ad6!x7<|%-;-CYzi~lg?rcd+wO~5?(_a%q=V;#6!|H$|2e3=YcE{|%zhz2tPI5a zfqq^Fr2Bw0kGu4gOS9IUbq@E_@MF5DBm1P@&x?V@nN22yqrhMG{sG3n*SE{>v{(-S DZ%AIa diff --git a/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/pack/pack-d85f5d483273108c9d8dd0e4728ccf0b2982423a.pack b/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/objects/pack/pack-d85f5d483273108c9d8dd0e4728ccf0b2982423a.pack deleted file mode 100644 index 4d539ed0a554c2b1b03e38f5eb389b515fc37792..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 498 zcmWG=boORoU|<4bwh4R{bLO6LB2ZL-fLMnU}tes`9ibm`tURpR~n zN4$6HD)yU)CWLQZoTPkI!7rVgzg+9v``Z_ETFHpbhKWQbKFLPm4J!}4hZ-;;1 za#iqhJ1^nhV_bNmPxbulr)SmY-soaD~5%da!2C_U9Y#XivXB zA!=`fYW_quaW@M^#aa1lT|@sZc&3)$dY@s6GLb^dz-uTluNVLoplcP)9_=us3ZHN-p>mFO;6gd diff --git a/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/packed-refs b/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/packed-refs deleted file mode 100644 index 9c0433e1c..000000000 --- a/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/packed-refs +++ /dev/null @@ -1,12 +0,0 @@ -# pack-refs with: peeled -b25fa35b38051e4ae45d4222e795f9df2e43f1d1 refs/tags/test -^e90810b8df3e80c413d903f631643c716887138d -1385f264afb75a56a5bec74243be9b367ba4ca08 refs/tags/point_to_blob -7b4384978d2493e851f9cca7858815fac9b10980 refs/tags/e90810b -^e90810b8df3e80c413d903f631643c716887138d -e90810b8df3e80c413d903f631643c716887138d refs/remotes/origin/test -763d71aadf09a7951596c9746c024e7eece7c7af refs/remotes/origin/subtrees -4a202b346bb0fb0db7eff3cffeb3c70babbd2045 refs/remotes/origin/packed-test -41bc8c69075bbdb46c5c6f0566cc8cc5b46e8bd9 refs/remotes/origin/packed -a65fedf39aefe402d3bb6e24df4d4f5fe4547750 refs/remotes/origin/master -a4a7dce85cf63874e984719f4fdd239f5145052f refs/remotes/origin/br2 diff --git a/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/refs/heads/master b/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/refs/heads/master deleted file mode 100644 index 3d8f0a402..000000000 --- a/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -a65fedf39aefe402d3bb6e24df4d4f5fe4547750 diff --git a/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/refs/remotes/origin/HEAD b/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/refs/remotes/origin/HEAD deleted file mode 100644 index 6efe28fff..000000000 --- a/vendor/libgit2/tests/resources/submodules/testrepo/.gitted/refs/remotes/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/remotes/origin/master diff --git a/vendor/libgit2/tests/resources/submodules/testrepo/README b/vendor/libgit2/tests/resources/submodules/testrepo/README deleted file mode 100644 index a8233120f..000000000 --- a/vendor/libgit2/tests/resources/submodules/testrepo/README +++ /dev/null @@ -1 +0,0 @@ -hey there diff --git a/vendor/libgit2/tests/resources/submodules/testrepo/branch_file.txt b/vendor/libgit2/tests/resources/submodules/testrepo/branch_file.txt deleted file mode 100644 index 3697d64be..000000000 --- a/vendor/libgit2/tests/resources/submodules/testrepo/branch_file.txt +++ /dev/null @@ -1,2 +0,0 @@ -hi -bye! diff --git a/vendor/libgit2/tests/resources/submodules/testrepo/new.txt b/vendor/libgit2/tests/resources/submodules/testrepo/new.txt deleted file mode 100644 index a71586c1d..000000000 --- a/vendor/libgit2/tests/resources/submodules/testrepo/new.txt +++ /dev/null @@ -1 +0,0 @@ -my new file diff --git a/vendor/libgit2/tests/resources/submodules/unmodified b/vendor/libgit2/tests/resources/submodules/unmodified deleted file mode 100644 index 092bfb9bd..000000000 --- a/vendor/libgit2/tests/resources/submodules/unmodified +++ /dev/null @@ -1 +0,0 @@ -yo diff --git a/vendor/libgit2/tests/resources/submodules/untracked b/vendor/libgit2/tests/resources/submodules/untracked deleted file mode 100644 index 092bfb9bd..000000000 --- a/vendor/libgit2/tests/resources/submodules/untracked +++ /dev/null @@ -1 +0,0 @@ -yo diff --git a/vendor/libgit2/tests/resources/super/.gitted/COMMIT_EDITMSG b/vendor/libgit2/tests/resources/super/.gitted/COMMIT_EDITMSG deleted file mode 100644 index e2d6b8987..000000000 --- a/vendor/libgit2/tests/resources/super/.gitted/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -submodule diff --git a/vendor/libgit2/tests/resources/super/.gitted/HEAD b/vendor/libgit2/tests/resources/super/.gitted/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/vendor/libgit2/tests/resources/super/.gitted/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/vendor/libgit2/tests/resources/super/.gitted/config b/vendor/libgit2/tests/resources/super/.gitted/config deleted file mode 100644 index 06a8b7790..000000000 --- a/vendor/libgit2/tests/resources/super/.gitted/config +++ /dev/null @@ -1,10 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = false - bare = false - logallrefupdates = true - symlinks = false - ignorecase = true - hideDotFiles = dotGitOnly -[submodule "sub"] - url = ../sub.git diff --git a/vendor/libgit2/tests/resources/super/.gitted/index b/vendor/libgit2/tests/resources/super/.gitted/index deleted file mode 100644 index cc2ffffb980f6eade02621e7431faffc830c96e9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 217 zcmZ?q402{*U|<5_(BFmvK$-zYgV+$zxCF)m(!qfda}>M3SM{!ZdE@qh>DRML)YXnK zaOp0i)X@;dTKg{30SZ^EfSPb1kPO Nt$y+J!W`S|A^_*II9C7w diff --git a/vendor/libgit2/tests/resources/super/.gitted/objects/51/589c218bf77a8da9e9d8dbc097d76a742726c4 b/vendor/libgit2/tests/resources/super/.gitted/objects/51/589c218bf77a8da9e9d8dbc097d76a742726c4 deleted file mode 100644 index 727d3a696894fe8d07899ae0b520da02596720cd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 90 zcmV-g0HyzU0ZYosPg1ZjW{55>P0GzrDa}b$Py#ZQV!1dA5=$}^Y!!e!F3!@T93V5< wDkdg9vm_=aCo>618|fOy#FV5KmlVgu6r~pDmlh?b0+~P!dO%q&0A7+GCFlAeGXMYp diff --git a/vendor/libgit2/tests/resources/super/.gitted/objects/79/d0d58ca6aa1688a073d280169908454cad5b91 b/vendor/libgit2/tests/resources/super/.gitted/objects/79/d0d58ca6aa1688a073d280169908454cad5b91 deleted file mode 100644 index 7fd889d5f1cfe79f0b769d2682e3f5a888f0fa3b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 132 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 1335806563 -0700 clone: from /Users/ben/src/libgit2/tests/resources/testrepo.git -be3563ae3f795b2b4353bcce3a527ad0a4f7f644 a65fedf39aefe402d3bb6e24df4d4f5fe4547750 Ben Straub 1335806603 -0900 commit: -a65fedf39aefe402d3bb6e24df4d4f5fe4547750 5b5b025afb0b4c913b4c338a42934a3863bf3644 Ben Straub 1335806604 -0900 checkout: moving from master to 5b5b025 -5b5b025afb0b4c913b4c338a42934a3863bf3644 a65fedf39aefe402d3bb6e24df4d4f5fe4547750 Ben Straub 1335806605 -0900 checkout: moving from 5b5b025 to master -a65fedf39aefe402d3bb6e24df4d4f5fe4547750 c47800c7266a2be04c571c04d5a6614691ea99bd Ben Straub 1335806608 -0900 checkout: moving from master to br2 -c47800c7266a2be04c571c04d5a6614691ea99bd a4a7dce85cf63874e984719f4fdd239f5145052f Ben Straub 1335806617 -0900 commit: checking in -a4a7dce85cf63874e984719f4fdd239f5145052f a65fedf39aefe402d3bb6e24df4d4f5fe4547750 Ben Straub 1335806621 -0900 checkout: moving from br2 to master diff --git a/vendor/libgit2/tests/resources/testrepo.git/logs/refs/heads/br2 b/vendor/libgit2/tests/resources/testrepo.git/logs/refs/heads/br2 deleted file mode 100644 index 4e27f6b8d..000000000 --- a/vendor/libgit2/tests/resources/testrepo.git/logs/refs/heads/br2 +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 c47800c7266a2be04c571c04d5a6614691ea99bd Ben Straub 1335806608 -0700 branch: Created from refs/remotes/origin/br2 -a4a7dce85cf63874e984719f4fdd239f5145052f a4a7dce85cf63874e984719f4fdd239f5145052f Ben Straub 1335806617 -0700 commit: checking in diff --git a/vendor/libgit2/tests/resources/testrepo.git/logs/refs/heads/master b/vendor/libgit2/tests/resources/testrepo.git/logs/refs/heads/master deleted file mode 100644 index e1c729a45..000000000 --- a/vendor/libgit2/tests/resources/testrepo.git/logs/refs/heads/master +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 be3563ae3f795b2b4353bcce3a527ad0a4f7f644 Ben Straub 1335806563 -0800 clone: from /Users/ben/src/libgit2/tests/resources/testrepo.git -be3563ae3f795b2b4353bcce3a527ad0a4f7f644 a65fedf39aefe402d3bb6e24df4d4f5fe4547750 Ben Straub 1335806603 -0800 commit: checking in diff --git a/vendor/libgit2/tests/resources/testrepo.git/logs/refs/heads/not-good b/vendor/libgit2/tests/resources/testrepo.git/logs/refs/heads/not-good deleted file mode 100644 index bfbeacb8a..000000000 --- a/vendor/libgit2/tests/resources/testrepo.git/logs/refs/heads/not-good +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 a65fedf39aefe402d3bb6e24df4d4f5fe4547750 Ben Straub 1336761944 -0700 branch: Created from master diff --git a/vendor/libgit2/tests/resources/testrepo.git/logs/refs/remotes/origin/HEAD b/vendor/libgit2/tests/resources/testrepo.git/logs/refs/remotes/origin/HEAD deleted file mode 100644 index f1aac6d0f..000000000 --- a/vendor/libgit2/tests/resources/testrepo.git/logs/refs/remotes/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 be3563ae3f795b2b4353bcce3a527ad0a4f7f644 Ben Straub 1335806563 -0700 clone: from /Users/ben/src/libgit2/tests/resources/testrepo.git diff --git a/vendor/libgit2/tests/resources/testrepo.git/logs/refs/remotes/test/master b/vendor/libgit2/tests/resources/testrepo.git/logs/refs/remotes/test/master deleted file mode 100644 index 8d49ba3e0..000000000 --- a/vendor/libgit2/tests/resources/testrepo.git/logs/refs/remotes/test/master +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 a65fedf39aefe402d3bb6e24df4d4f5fe4547750 Ben Straub 1335806565 -0800 update by push -a65fedf39aefe402d3bb6e24df4d4f5fe4547750 be3563ae3f795b2b4353bcce3a527ad0a4f7f644 Ben Straub 1335806688 -0800 update by push diff --git a/vendor/libgit2/tests/resources/testrepo.git/objects/08/b041783f40edfe12bb406c9c9a8a040177c125 b/vendor/libgit2/tests/resources/testrepo.git/objects/08/b041783f40edfe12bb406c9c9a8a040177c125 deleted file mode 100644 index d1c032fce34ef6688440fef9b0bc34851e3937ca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 54 zcmb-^#7G-5C`FfcPQQ3!H%bn$g%SfOmF@NI2De~WFK%%kl}eMcVO zI|fyeRFs&PoDrXvnUktlQc=R-y0dwo*>)TDjyrSqY|q)<@TYo1I8Fm*0&IVk`D diff --git a/vendor/libgit2/tests/resources/testrepo.git/objects/1a/443023183e3f2bfbef8ac923cd81c1018a18fd b/vendor/libgit2/tests/resources/testrepo.git/objects/1a/443023183e3f2bfbef8ac923cd81c1018a18fd deleted file mode 100644 index 3ec541288fd04106cb69bc53e8ad085dd550b847..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 122 zcmV-=0EPc}0iBIO3IZ_CifV?>)s7M^1Y%!`;&LUMTlLAXeIVsSp^AMPkgZGeHH721AUD zWR#;MNoSX>)`Ir>DjW3A9Ucu_#|3Ug@y%&~K9_Rg56$buO)T>OEh_ZdIgN0Zt(4-h W$IZ%r2gH3D>qry)O5zK?(n*;`X-(Du diff --git a/vendor/libgit2/tests/resources/testrepo.git/objects/27/0b8ea76056d5cad83af921837702d3e3c2924d b/vendor/libgit2/tests/resources/testrepo.git/objects/27/0b8ea76056d5cad83af921837702d3e3c2924d deleted file mode 100644 index df40d99affff9bac5a004388e3ae19ec0df19488..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 dcmbSu`A(-~^2~DaX|Dj|a1Ojz C$`Zx^ diff --git a/vendor/libgit2/tests/resources/testrepo.git/objects/32/59a6bd5b57fb9c1281bb7ed3167b50f224cb54 b/vendor/libgit2/tests/resources/testrepo.git/objects/32/59a6bd5b57fb9c1281bb7ed3167b50f224cb54 deleted file mode 100644 index 321eaa8679591d3fc76e62628126185b0427c940..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 50 zcmby-a%8?0t#9e}{dDH^=1pybKbl G{96FXClfjV diff --git a/vendor/libgit2/tests/resources/testrepo.git/objects/36/97d64be941a53d4ae8f6a271e4e3fa56b022cc b/vendor/libgit2/tests/resources/testrepo.git/objects/36/97d64be941a53d4ae8f6a271e4e3fa56b022cc deleted file mode 100644 index 9bb5b623bdbc11a70db482867b5b26d0d7b3215c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23 fcmb)5VqnO?#OiI__Bv?w-}KEnos|Z^uNZBf`g;=3-Mh++_sV&r0c}+h Ah5!Hn diff --git a/vendor/libgit2/tests/resources/testrepo.git/objects/52/1d87c1ec3aef9824daf6d96cc0ae3710766d91 b/vendor/libgit2/tests/resources/testrepo.git/objects/52/1d87c1ec3aef9824daf6d96cc0ae3710766d91 deleted file mode 100644 index 351cff823065f92f8b4ef218194c1dfb06e86fd0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 152 zcmV;J0B8Sr0X2<53c@fD06pgw+p|#8CTS{&2wv4Mlug{0+9WG=J@|Wj@i+|32u{#+ zZpYzCQJ^us8{5v}7`#K*p$infZLJA(2&VG^ZA9HG`MwB3;-F+JU@0sp^cXf8gonSG zXod1gNqC_GN6NI$u^ws7_&!e==Tt||r|oNu*WNk@d);cS)RlRG8&+^ -öF- \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/testrepo.git/objects/75/057dd4114e74cca1d750d0aee1647c903cb60a b/vendor/libgit2/tests/resources/testrepo.git/objects/75/057dd4114e74cca1d750d0aee1647c903cb60a deleted file mode 100644 index 2ef4faa0f82efa00eeac6cae9e8b2abccc8566ee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 119 zcmV--0Eqv10V^p=O;s>7G-5C`FfcPQQ3!H%bn$g%5N`dHvVMD1*wTH+ot*d0HmhE8 ziUX=5sVFfoIU_zTGbdHAq@skub!YQFv+XwQ9e3vJ*`Bkz;ZOC3aH!I})N-(rU!EJv Zrz=lf8^K%<@M(E`$>VgnNdSzWFYprfIFkSX diff --git a/vendor/libgit2/tests/resources/testrepo.git/objects/76/3d71aadf09a7951596c9746c024e7eece7c7af b/vendor/libgit2/tests/resources/testrepo.git/objects/76/3d71aadf09a7951596c9746c024e7eece7c7af deleted file mode 100644 index 716b0c64b..000000000 --- a/vendor/libgit2/tests/resources/testrepo.git/objects/76/3d71aadf09a7951596c9746c024e7eece7c7af +++ /dev/null @@ -1 +0,0 @@ -xŽAj!³ö?0¨£ßÂ09Êo}HÚ6¨}ÿôjUPP©ÕZ&Yÿø˜ AÔ›±€pŒÁFdë¼÷pz[fŽYŒ½PÒqLJ.,Z§`™Å®Ð.ù`’vÙ ³q $Æ5+9çOëtœû>Û/úDE/龡W¯ï*e¿§VŸdf1>ð覭Öê²×äÄ›¹úÊ™F« ­ìTŽÙhœk.i¶^0Ô?P¼R, \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/testrepo.git/objects/7b/4384978d2493e851f9cca7858815fac9b10980 b/vendor/libgit2/tests/resources/testrepo.git/objects/7b/4384978d2493e851f9cca7858815fac9b10980 deleted file mode 100644 index 23c462f3415e0b02832cb2445dc66bde8daa9ef4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 145 zcmV;C0B-+y0WFL{4uUWc06q5=dp99n3hj~@;|IJM@1-nQr9fac;rG_WWDawg5kCOd z_As|k4g%b0Lful=8zvnpG+m=jZw=bY1c#Q$p`lL6zA%J2r6@}B;~)Nf;1%vM@FZ~c zt3)`7pXS&5G9(|zB1dPylCXAUY6nMMYOU1m5jV(q`0%>J7Sl2^RiSaIAE^xQ@?_ml44FkiJ(R)*{ z(H(TH6>PFd5&0~h#n$X!k{LPpBqYvbW+w8_Xyl{wSm9BID%@u&V}Z+7esG(*wD+lu geg*3yQ9w!oju;WmZug_se_Eq;)3!|J3!n-%%(!(uEdT%j diff --git a/vendor/libgit2/tests/resources/testrepo.git/objects/84/9a5e34a26815e821f865b8479f5815a47af0fe b/vendor/libgit2/tests/resources/testrepo.git/objects/84/9a5e34a26815e821f865b8479f5815a47af0fe deleted file mode 100644 index 71019a636..000000000 --- a/vendor/libgit2/tests/resources/testrepo.git/objects/84/9a5e34a26815e821f865b8479f5815a47af0fe +++ /dev/null @@ -1,2 +0,0 @@ -xŒM F]sŠ¹€†Ÿ41ÆxÝ(­I‹ÁéÂÛKݽ/_ÞãP@¡ÚÕø¢!8›)es -” ¥N&FGSÆ„¹hÑ{+ßCç‰÷ÆZzvØF¡7ZàÎ-¬Îñó‡k™x\ã¡[PÆ8ï´ôGØK/¥^© lÊ>.4 \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/testrepo.git/objects/94/4c0f6e4dfa41595e6eb3ceecdb14f50fe18162 b/vendor/libgit2/tests/resources/testrepo.git/objects/94/4c0f6e4dfa41595e6eb3ceecdb14f50fe18162 deleted file mode 100644 index 4cc3f4dff..000000000 --- a/vendor/libgit2/tests/resources/testrepo.git/objects/94/4c0f6e4dfa41595e6eb3ceecdb14f50fe18162 +++ /dev/null @@ -1 +0,0 @@ -x+)JMU044b040031QrutñueX¡l¨ðmmA‹m›Ì£íJ}Gß;U‘T”˜—œŸ–™“ªWRQÂ`6ýš÷KÇ¥¶^/¾-*|òøWØ¥3P¥y©å`%ËEÛÞ±\&gŽÐ|Ÿ0§ÿ†{Ó1X \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/testrepo.git/objects/9a/03079b8a8ee85a0bee58bf9be3da8b62414ed4 b/vendor/libgit2/tests/resources/testrepo.git/objects/9a/03079b8a8ee85a0bee58bf9be3da8b62414ed4 deleted file mode 100644 index bf7b2bb686f9d563f6af7ded70cfee2a31432731..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 50 zcmV-20L}k+0V^p=O;s>9W-v4`Ff%bxFxD%nC}B|N?pvM^cJ;ÔÂÁ…¬£³X†ÂEÈŽ5R±£ ÛAÑE &n}ZÜæ™A¹ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/testrepo.git/objects/9f/d738e8f7967c078dceed8190330fc8648ee56a b/vendor/libgit2/tests/resources/testrepo.git/objects/9f/d738e8f7967c078dceed8190330fc8648ee56a deleted file mode 100644 index a79612435..000000000 --- a/vendor/libgit2/tests/resources/testrepo.git/objects/9f/d738e8f7967c078dceed8190330fc8648ee56a +++ /dev/null @@ -1,3 +0,0 @@ -xŽ[ -Â0EýÎ*fÊäÕ¤ "¸W0“‡-ØFâtÿÝ—çpS[–YÀ˜x^ -Díb CLhutɉ}¥8X*4Zí¬sY½¨—UÀ‘AÃÖ ÌX3‡R«Mµ¶) s6è¼¢M¦ÖážšÜ&Jm…ó;}Çõ±Ðü<¥¶\@›à‚ÑÞpÄ€¨vº?”ò«jÛºLð«¨Ø?Hå \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/testrepo.git/objects/a4/a7dce85cf63874e984719f4fdd239f5145052f b/vendor/libgit2/tests/resources/testrepo.git/objects/a4/a7dce85cf63874e984719f4fdd239f5145052f deleted file mode 100644 index f8588696b..000000000 --- a/vendor/libgit2/tests/resources/testrepo.git/objects/a4/a7dce85cf63874e984719f4fdd239f5145052f +++ /dev/null @@ -1,2 +0,0 @@ -x;j1DëmdÓú·À˜ÇŽ|M«µ3`ŒV{ >€³âQ¯ ¸·vL0I?Í!š4–Z=Ê! ×¦8²F¢Ã’!rÖsQßyÈ9]$DŽ&„l6AÇ>jFWüÒµ IKNiûë§Z¢%¡SˆŒ‘ -‹Ò ­ÅʉøU~̽øä>'¼ï™û ¯wþ ×[ËÇ× ÷öÚDGÚ¡±ðŒQ-ºMù«>dܶ‘OÞáÒò}í\à8g_ШÂoYr \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/testrepo.git/objects/a6/5fedf39aefe402d3bb6e24df4d4f5fe4547750 b/vendor/libgit2/tests/resources/testrepo.git/objects/a6/5fedf39aefe402d3bb6e24df4d4f5fe4547750 deleted file mode 100644 index 29c8e824d..000000000 --- a/vendor/libgit2/tests/resources/testrepo.git/objects/a6/5fedf39aefe402d3bb6e24df4d4f5fe4547750 +++ /dev/null @@ -1,3 +0,0 @@ -xŽQ -!@ûösBQ"‚ŽÐ ÆÙ± rÍîßÒú{BQQQ6W+Sv9;eTEK4oHX{LN+y0Ic;3tpET3 diff --git a/vendor/libgit2/tests/resources/testrepo.git/objects/a8/233120f6ad708f843d861ce2b7228ec4e3dec6 b/vendor/libgit2/tests/resources/testrepo.git/objects/a8/233120f6ad708f843d861ce2b7228ec4e3dec6 deleted file mode 100644 index 18a7f61c29ea8c5c9a48e3b30bead7f058d06293..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 26 icmb7F=Q|_FfcPQQ3!H%bn$g%5N`dHvVMD1*wTH+ot*d0HmhE8 zio?VJ2ow^N7(P11yjPSt(6h?$`BvBen~c_Mm~j}YJ*g-$FF7MVEi)%oucV@c!F6Zz zKC|sM>>YRJ?Ae~PyWvmuhH$9Tywq~Al3$)1%BL$&TpPh$5b$Yve97Z6W-v4`Ff%bxFw!fjC}DWMWvzv>=l^MU8)q`GHtgK^h(&LM mi2)EOq@`yt7)37I8y)_8j!@(7y31nK0iRS(hX4SGX&b5U?IBwL diff --git a/vendor/libgit2/tests/resources/testrepo.git/objects/be/3563ae3f795b2b4353bcce3a527ad0a4f7f644 b/vendor/libgit2/tests/resources/testrepo.git/objects/be/3563ae3f795b2b4353bcce3a527ad0a4f7f644 deleted file mode 100644 index 0817229bc..000000000 --- a/vendor/libgit2/tests/resources/testrepo.git/objects/be/3563ae3f795b2b4353bcce3a527ad0a4f7f644 +++ /dev/null @@ -1,3 +0,0 @@ -xKj1D³Ö)zçUBëÛ-0ÁuV9¦Õò<#£È÷ÏȲ+ŠWX;c`PQ zB{N88cHD?SMeT6bgvQFGC!DN`Q!+}8-dMs!X?D1VS@;*`@|$Zu=F}Un6m;Oi%DJQiSyb!!`4A?`{c=JktQF)dE{ydr;yFA-O+u DGk!%4 diff --git a/vendor/libgit2/tests/resources/testrepo.git/objects/d6/c93164c249c8000205dd4ec5cbca1b516d487f b/vendor/libgit2/tests/resources/testrepo.git/objects/d6/c93164c249c8000205dd4ec5cbca1b516d487f deleted file mode 100644 index a67d6e647ccc1f3faad53aa928441dcf66808c42..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 dcmbgf0V^p=O;s>6VK6i>Ff%bxFfcbvHcT=xOSUjINisGxv@lIgv@|z2F-}S~ lOSAwoOw27AI5s#|*gL%aC$!rkXU?oH7RK^}ssOCx6%dLF8pr?u diff --git a/vendor/libgit2/tests/resources/testrepo.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 b/vendor/libgit2/tests/resources/testrepo.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 deleted file mode 100644 index 711223894375fe1186ac5bfffdc48fb1fa1e65cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15 Wcmb003G-2nPTF diff --git a/vendor/libgit2/tests/resources/testrepo.git/objects/f1/425cef211cc08caa31e7b545ffb232acb098c3 b/vendor/libgit2/tests/resources/testrepo.git/objects/f1/425cef211cc08caa31e7b545ffb232acb098c3 deleted file mode 100644 index 82e2790e82869f7ebc516f291a2f2d0312f40660..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 103 zcmV-t0GR)H0V^p=O;xZoU@$Z=Ff%bxFwrZiC}FsE(lF(a=LrTT*1LX3PoI(w%=M@@ zF#rOEWQJMH?6bT2UPN)fi`YN=@vZJ8N53l&xs+6fZD#VvRu)#=_|s=Z5m>$`jW{Fc$=TS{`5WI9+ZM01*fsdfR&>4gdfE diff --git a/vendor/libgit2/tests/resources/testrepo.git/objects/fa/49b077972391ad58037050f2a75f74e3671e92 b/vendor/libgit2/tests/resources/testrepo.git/objects/fa/49b077972391ad58037050f2a75f74e3671e92 deleted file mode 100644 index 112998d425717bb922ce74e8f6f0f831d8dc4510..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24 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 rcaKYLMm*}NJR{E;Zd?;1?Rz=-Xf;gsm+2PX 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

    =uHz#4%J0P!RYVlzYKcqTl#P^Wo1(_e1-EG? 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

    &SG& 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�eTY#b?LX)(ib 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

    oIQ4YOXU$0Mi5i`Sf+bbJ=L9 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ǧ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 z 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

    buibo}hicx6&l@gJNcsJI;tJeTH?p}*-9#Ii z@3706gDGL2Hg}@!j5ElkxtG8o`A&fNTHKigV?Ae#^La0ar2fE1v!ai3$O0s_2`(ic z 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«< zR+d0ptJX9Z^--3rp5?ZfR=7PFLivV{tXPhk0KjZu1Fw4MQk?_OJ)qpy`yAfAUq$^& z>N~q)q5OT>=_g`xoLuA&67+GaKmh4~O8f$o1N?`|10&6PEFLuK_B{*>cN->*}=c*<=4Ir}#M z%)L>m5wOB}bNwR)=R?ZWB;jv)Pr|Y=T`1UaX-ndF?5LmomhA5!N*~|+P`k~anW=)5 z$xGv^BXelBTvM&ph2| zjvw?_4gE}~BNy9z>;Eew^D;*mEwh^`8_hxA$2<(JiwH@JMv52dVSceZDv4pqhs(}$!!j_0VQ97 znXvr?P_hC#E^P!&^x{GNh2>v}gJ^+i+3V1e|0e%>?}(5q+V}t6^{M;9y~2b!Vi3i)_P)`f<8;IA;wj2=a_xd{J_q>QJ9$YeV{Bj^bAp z#nhY3e7h6zb7)ymiW}$m|F>$?8mP8}J&;+y(hWQyFVa^lqEig4bo?0w4O&D8&A12AwFe?De%- zsF6Ca+PoG+zhAlj#j>?yOpnBduYQT-7(S|1WTCEIFMKd?gmOWtD+Ws7j8d=)0vbWD zKOV{dks(5NFg+U_VD}!oB>&6q`Qcz%l~@dnMpKW?eBGllg;gEOEhLIdWWlj#$6MLZ z^W)gk*Tk>$uvv1;P11EH28P>$2LKexo)Z<#H&()m*IQor9 z(83@@+^@L~S5pUJK+0fv-gW3e>c87*KO7TU^NU6*lqCxNxEM7KE+H`@r1gjI6+c~f zwa<9@^F@})>FkWDmv6T9S9UABL4c-&8F)o+Yl6Ffa%h6#r$T^p@-Mo^3IG9l+;?dq z4oaUv{CEfs05FU#{k0+X27aLf8f4~8W$P;+e%kTBRCFS>aIlHLstS9e0-7K~W4H7J z5T~AW&7w}P@MboKw3R``#W3N3YkGi`{mnJ`xD^jfl@>~)1kL!I#TFMAh*-7&u4(5D z`Uk5Z0B-L&>>BIZjg>rNQ&uetA{T_=*n)l-$@@qU{l_)^=V!3tY!mF$jAa%;QDM|t ziu3tRBz%407MCcta7;)DoHKx#Z0Yri{qI)Yb9oOXB(1B)v?2}elFWMF_ZkXR_zgp9 z59|y4@VCFm3~7}(FXSMY9(!}9+pDuW!tbJ>01GOkLCys5cl3W&+6rz3$LiqhSAmKL z?y4qQmu#^2CJ}uq0^8H$9HdVVFhtj(ALmW~P3j;)KgT2+mEB`xHI(OBY1z*wfaNbYVg4|lb&g717Pc&X1{ROSlIXzN5_+s z&jxx?^rSDbZLKjuGysaaLD`Qv{)K`eJs1?F%rXM7p94U;KPOQQj%A2brN`+N`#SCl z$CG|@DoJL@kpW#B^vmnN`|>yjyu{yvGUyfT9>BbA^sFxvM2HK0wg(3K3m1AC!|c2G z0emjbaZ5ruU-D+waXPh5*6_%=Co1TpDsn~{5TpH7B>XE79-A1_yS&;S$L&p4z*1&8 z^gXUHx%Iirop*W__~7K*jNs%B#E{GKti2qE!Yu{gYqN}m+<&8Z@YoHUw--7$zxsDW zE8lR)q@3eB?Y*@SS5HiXV&Cn;I<&NHB9X!qljHkB(^lvZql$nIn6%)=R~Z~LS&W)h z7u%6t=qqS$H)(d2K=F`RvG5x>7|<9%4S#?GLlb8pjAlHWV-va|AdvH)O3b}zf$ij3TwW9D;g&&jR^KxU~ zf6zdg%1C47@o&Qi&99Os?+F49ElIi4W$Hn{fxI)BuUU;@Eh_aI@%3Z%^tUu7}KSJr^|Ay`{9qVnGW6CW{+`NOn6O< zPr{L5u?VGgzAbO)15{H#3K~L_<+es+GFtN}i)C+6v=~`^cSqrGloyS*^OI%OK&tx; zV-pB|;?p_c7b;vjk0G^57|J|ltNQl*^LB>sjXRH}tFl*lTnTj)Ginh`qt&mi>?O%m z7W^pgU}g<6?-M6>u3FSC-Ms?0sV|~j>PLia& zl^~c=y_sy!^vFukBI9Nt2VZh0sK?qH!g}4 zGRC5NL-?%i5)qI%jc3Z!VxjZA&p69>S^4;}AYW#YsLE7?9TOQ4cg4{wO#;ck6eX0! z;Yc@XS_h1bUZiB8hQgflzhHXn+|<6XT#oyZfUH z^#R0B-`AI))fpu&o}yE1dwh2%F}ZTE&t}*$ir;4Onc{t(Q}{-z#&yTL%uQn{?H6q= zi|^Tl5)(D@q~9H3SE=u1rH-n$x4by5Vf~<^7Bi3LvHI(X+p!G+SLQw$Rk4p;-xnO2 zq{OfXerN&vqhgp;s4abyzSa^2*EsCu@k&vGif5N(pmaqPZJ=)$ND(Y_Hv&@^-iOAV zWl8nH3G&r+s1HjjO}ghcuHjttkTZe$CQzBIqRWi{+gQOPZ1{@h+Jr8;2^enZ3-fLd z9P;3#9_SUS!GN8}!kId>z<#$c+mhjylF3-uCzdXGnAbRi`s;tG&)3leZ;|`C6FJNOv`&}O*huMRRyXisxN~F2OCi()}`#~J_sk+~nR44tgi@Juzn7oLbf@eF4 z%PLJ0w1Mz)N^q|hvq#b`6;jG(uN}o#Lu}#s?_?V_K%fR(#Z1d!;1b8zb06*+K(JsW zaLxcCf`-A|1BU@%g}vZ{E|IkkHao%v&oIkhLneSY{j%WpaxkWRvjQ#{T%9aXuaqn*NRfwl(9+*rAW(#Swg!>#e|-B9B4c=w@_t{Q@G7(txoup)cl2Pyk)@G%R&_E;2zX^E{kCF^Q6 zt|t&qc&rqHGDA_c{&xZrtZRc;Q1 zExEGxN)`svUh+NiynsW40T0B7f;+bdeh1_h{*o&%!DodTT}vH; zf|rn^@sF?8W!nv4K_wqiI{ufN5<|qcu);G`+Cj$2gAkl-JBwGc;5UA)q^;s)rSGx7_MeDTk{i? zbmw>Pl`dBoz%hc@2TwpCxhsYKJ;ZrHz%okC-@682WoYX-$eT+)BG9C~e5B(6SQ;K) z=-Wgs?Q|7Zo~V^pztZ#wHa0ooSC}PK0_}|eM<-=FDGLuDhuCw#`ALvbN=cBhiK!$+ zB-BvX<<(LvbUyIFaZk?8ad6M3BU6Q%h&*g6Z8-RG^v0kH+sl!!BnI&atKOHI8zEmY Ly^wf#eqsC{v)m?j diff --git a/vendor/libgit2/tests/resources/testrepo.git/objects/pack/pack-d7c6adf9f61318f041845b01440d09aa7a91e1b5.idx b/vendor/libgit2/tests/resources/testrepo.git/objects/pack/pack-d7c6adf9f61318f041845b01440d09aa7a91e1b5.idx deleted file mode 100644 index 94c3c71da52ca3d4761c4e9041b384d9bc75ad9b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1240 zcmexg;-AdGz`z8=qW}^Pps*kZGXwPvCCmbJ??}b0K);VP%m(x`PVCs+bpPZ39eaPT zF#d95_t~f2a`oYw4{Y+*Z5}2Csyees*{;KHB55dV&?dF#`kRGN5~TfOsX4T@J*P yfLQIszKM4h+|MXn`snRCm0er%Quq9yFn5~doV&qSCs?ySKaj$-^Vag-Df$4qg=3fi diff --git a/vendor/libgit2/tests/resources/testrepo.git/objects/pack/pack-d7c6adf9f61318f041845b01440d09aa7a91e1b5.pack b/vendor/libgit2/tests/resources/testrepo.git/objects/pack/pack-d7c6adf9f61318f041845b01440d09aa7a91e1b5.pack deleted file mode 100644 index 74c7fe4f3a657d606a4a004c87336749079c0edf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 491 zcmWG=boORoU|<4bwrPA7bLRHNavd@dXt`h9wYOo@&ulXVr3x1R33=PLWk|2oj=R6e z{6ngQ-HiT=p)71gtxNdtSc@#my7+iQ>e4qWip{2_EIvQCa!ROJYez<`n&YvUtTcI* z9TTeiTBZe0nUf^pW%6`sa`eMPzM|)nA8tGF@Z|lXUFTAFz2AA(eS_Z5b4eUxWitfM zx;^&{{dY4@|EHR09p8m=V|lCdF3HolfsX5m=3+ABVfbI&731*Idp5t|LFI}jHQzg~ zyQiAoi@zxS!<^^L4J{_ighMw%nza;7mv(7p=6M|PE%R{fdiLnm>17)awYE#nS$-B0AgjUCm@D?V9#TFX)~ z$JoTcz}PU*66+=E@hWo`*7*&jWecg0;xw=p8Q#< znGm{LIG-cz>zd?K^@r5dt1_-_DeboX%y8$7^v#Wo6?0bm=)z13@;H6Q^C=U9)d4m= z>xwzr=RI@+K|))fGcic~WZt)&iFo@NUWM`6pV&9?&Vu_Hg-aj3U8k~ZOJ3@p{}TZ5 CmFm|3 diff --git a/vendor/libgit2/tests/resources/testrepo.git/objects/pack/pack-d85f5d483273108c9d8dd0e4728ccf0b2982423a.idx b/vendor/libgit2/tests/resources/testrepo.git/objects/pack/pack-d85f5d483273108c9d8dd0e4728ccf0b2982423a.idx deleted file mode 100644 index 555cfa977d92b199d541285af6997543062dbb5f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1240 zcmexg;-AdGz`z8=Fu(|8jAF{d02H2-U}m6xVlWF(-6*Ck3|N6-I8-nj(5*DVOle|P zo{t)ie0?j&@$0PFqP>OL=Y#(kT`Ve_JpcH-3(;%WeY(v#lR+%mtR?&EiC&|hR!?hN z(wd)1Z9Qs`dw%x!5V?meVL>yD15}(ow=(kB?z_;%ZLnQyuGiaosUIg!3HkM=?0m@~ zu;ad6!x7<|%-;-CYzi~lg?rcd+wO~5?(_a%q=V;#6!|H$|2e3=YcE{|%zhz2tPI5a zfqq^Fr2Bw0kGu4gOS9IUbq@E_@MF5DBm1P@&x?V@nN22yqrhMG{sG3n*SE{>v{(-S DZ%AIa diff --git a/vendor/libgit2/tests/resources/testrepo.git/objects/pack/pack-d85f5d483273108c9d8dd0e4728ccf0b2982423a.pack b/vendor/libgit2/tests/resources/testrepo.git/objects/pack/pack-d85f5d483273108c9d8dd0e4728ccf0b2982423a.pack deleted file mode 100644 index 4d539ed0a554c2b1b03e38f5eb389b515fc37792..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 498 zcmWG=boORoU|<4bwh4R{bLO6LB2ZL-fLMnU}tes`9ibm`tURpR~n zN4$6HD)yU)CWLQZoTPkI!7rVgzg+9v``Z_ETFHpbhKWQbKFLPm4J!}4hZ-;;1 za#iqhJ1^nhV_bNmPxbulr)SmY-soaD~5%da!2C_U9Y#XivXB zA!=`fYW_quaW@M^#aa1lT|@sZc&3)$dY@s6GLb^dz-uTluNVLoplcP)9_=us3ZHN-p>mFO;6gd diff --git a/vendor/libgit2/tests/resources/testrepo.git/packed-refs b/vendor/libgit2/tests/resources/testrepo.git/packed-refs deleted file mode 100644 index 52f5e876f..000000000 --- a/vendor/libgit2/tests/resources/testrepo.git/packed-refs +++ /dev/null @@ -1,3 +0,0 @@ -# pack-refs with: peeled -41bc8c69075bbdb46c5c6f0566cc8cc5b46e8bd9 refs/heads/packed -5b5b025afb0b4c913b4c338a42934a3863bf3644 refs/heads/packed-test diff --git a/vendor/libgit2/tests/resources/testrepo.git/refs/heads/br2 b/vendor/libgit2/tests/resources/testrepo.git/refs/heads/br2 deleted file mode 100644 index aab87e5e7..000000000 --- a/vendor/libgit2/tests/resources/testrepo.git/refs/heads/br2 +++ /dev/null @@ -1 +0,0 @@ -a4a7dce85cf63874e984719f4fdd239f5145052f diff --git a/vendor/libgit2/tests/resources/testrepo.git/refs/heads/cannot-fetch b/vendor/libgit2/tests/resources/testrepo.git/refs/heads/cannot-fetch deleted file mode 100644 index aab87e5e7..000000000 --- a/vendor/libgit2/tests/resources/testrepo.git/refs/heads/cannot-fetch +++ /dev/null @@ -1 +0,0 @@ -a4a7dce85cf63874e984719f4fdd239f5145052f diff --git a/vendor/libgit2/tests/resources/testrepo.git/refs/heads/chomped b/vendor/libgit2/tests/resources/testrepo.git/refs/heads/chomped deleted file mode 100644 index 0166a7f92..000000000 --- a/vendor/libgit2/tests/resources/testrepo.git/refs/heads/chomped +++ /dev/null @@ -1 +0,0 @@ -e90810b8df3e80c413d903f631643c716887138d \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/testrepo.git/refs/heads/haacked b/vendor/libgit2/tests/resources/testrepo.git/refs/heads/haacked deleted file mode 100644 index 17f591222..000000000 --- a/vendor/libgit2/tests/resources/testrepo.git/refs/heads/haacked +++ /dev/null @@ -1 +0,0 @@ -258f0e2a959a364e40ed6603d5d44fbb24765b10 diff --git a/vendor/libgit2/tests/resources/testrepo.git/refs/heads/master b/vendor/libgit2/tests/resources/testrepo.git/refs/heads/master deleted file mode 100644 index 3d8f0a402..000000000 --- a/vendor/libgit2/tests/resources/testrepo.git/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -a65fedf39aefe402d3bb6e24df4d4f5fe4547750 diff --git a/vendor/libgit2/tests/resources/testrepo.git/refs/heads/not-good b/vendor/libgit2/tests/resources/testrepo.git/refs/heads/not-good deleted file mode 100644 index 3d8f0a402..000000000 --- a/vendor/libgit2/tests/resources/testrepo.git/refs/heads/not-good +++ /dev/null @@ -1 +0,0 @@ -a65fedf39aefe402d3bb6e24df4d4f5fe4547750 diff --git a/vendor/libgit2/tests/resources/testrepo.git/refs/heads/packed-test b/vendor/libgit2/tests/resources/testrepo.git/refs/heads/packed-test deleted file mode 100644 index f2c14ad83..000000000 --- a/vendor/libgit2/tests/resources/testrepo.git/refs/heads/packed-test +++ /dev/null @@ -1 +0,0 @@ -4a202b346bb0fb0db7eff3cffeb3c70babbd2045 diff --git a/vendor/libgit2/tests/resources/testrepo.git/refs/heads/subtrees b/vendor/libgit2/tests/resources/testrepo.git/refs/heads/subtrees deleted file mode 100644 index ad27e0b13..000000000 --- a/vendor/libgit2/tests/resources/testrepo.git/refs/heads/subtrees +++ /dev/null @@ -1 +0,0 @@ -763d71aadf09a7951596c9746c024e7eece7c7af diff --git a/vendor/libgit2/tests/resources/testrepo.git/refs/heads/test b/vendor/libgit2/tests/resources/testrepo.git/refs/heads/test deleted file mode 100644 index 399c4c73e..000000000 --- a/vendor/libgit2/tests/resources/testrepo.git/refs/heads/test +++ /dev/null @@ -1 +0,0 @@ -e90810b8df3e80c413d903f631643c716887138d diff --git a/vendor/libgit2/tests/resources/testrepo.git/refs/heads/track-local b/vendor/libgit2/tests/resources/testrepo.git/refs/heads/track-local deleted file mode 100644 index f37febb2c..000000000 --- a/vendor/libgit2/tests/resources/testrepo.git/refs/heads/track-local +++ /dev/null @@ -1 +0,0 @@ -9fd738e8f7967c078dceed8190330fc8648ee56a diff --git a/vendor/libgit2/tests/resources/testrepo.git/refs/heads/trailing b/vendor/libgit2/tests/resources/testrepo.git/refs/heads/trailing deleted file mode 100644 index 2a4a6e62f..000000000 --- a/vendor/libgit2/tests/resources/testrepo.git/refs/heads/trailing +++ /dev/null @@ -1 +0,0 @@ -e90810b8df3e80c413d903f631643c716887138d diff --git a/vendor/libgit2/tests/resources/testrepo.git/refs/notes/fanout b/vendor/libgit2/tests/resources/testrepo.git/refs/notes/fanout deleted file mode 100644 index 1f1703631..000000000 --- a/vendor/libgit2/tests/resources/testrepo.git/refs/notes/fanout +++ /dev/null @@ -1 +0,0 @@ -d07b0f9a8c89f1d9e74dc4fce6421dec5ef8a659 diff --git a/vendor/libgit2/tests/resources/testrepo.git/refs/remotes/test/master b/vendor/libgit2/tests/resources/testrepo.git/refs/remotes/test/master deleted file mode 100644 index 9536ad89c..000000000 --- a/vendor/libgit2/tests/resources/testrepo.git/refs/remotes/test/master +++ /dev/null @@ -1 +0,0 @@ -be3563ae3f795b2b4353bcce3a527ad0a4f7f644 diff --git a/vendor/libgit2/tests/resources/testrepo/.gitted/HEAD b/vendor/libgit2/tests/resources/testrepo/.gitted/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/vendor/libgit2/tests/resources/testrepo/.gitted/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/vendor/libgit2/tests/resources/testrepo/.gitted/HEAD_TRACKER b/vendor/libgit2/tests/resources/testrepo/.gitted/HEAD_TRACKER deleted file mode 100644 index 40d876b4c..000000000 --- a/vendor/libgit2/tests/resources/testrepo/.gitted/HEAD_TRACKER +++ /dev/null @@ -1 +0,0 @@ -ref: HEAD diff --git a/vendor/libgit2/tests/resources/testrepo/.gitted/config b/vendor/libgit2/tests/resources/testrepo/.gitted/config deleted file mode 100644 index d0114012f..000000000 --- a/vendor/libgit2/tests/resources/testrepo/.gitted/config +++ /dev/null @@ -1,8 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true -[remote "test"] - url = git://github.com/libgit2/libgit2 - fetch = +refs/heads/*:refs/remotes/test/* diff --git a/vendor/libgit2/tests/resources/testrepo/.gitted/index b/vendor/libgit2/tests/resources/testrepo/.gitted/index deleted file mode 100644 index a27fb9c96feb433fb28a2713a863a7356d45eed7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10041 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 diff --git a/vendor/libgit2/tests/resources/testrepo/.gitted/objects/1d/d0968be3ff95fcaecb6fa4245662db9fdc4568 b/vendor/libgit2/tests/resources/testrepo/.gitted/objects/1d/d0968be3ff95fcaecb6fa4245662db9fdc4568 deleted file mode 100644 index 97c6b2cfab03b001553d57eb70817c0b69647e1f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 73 zcmV-P0Ji^l0ZYosPf{>5V8}=;&QM57%u81&NG!=vD9KkS&d*I%$jmEAEh;EV1(IA` fAsLy)3Tc@+K;dGA)QZ&P(vrlaoK!9VB7zsLOamV1 diff --git a/vendor/libgit2/tests/resources/testrepo/.gitted/objects/1f/67fc4386b2d171e0d21be1c447e12660561f9b b/vendor/libgit2/tests/resources/testrepo/.gitted/objects/1f/67fc4386b2d171e0d21be1c447e12660561f9b deleted file mode 100644 index 225c45734e0bc525ec231bcba0d6ffd2e335a5d0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 dcmb3VkpVTELKR%%t=)M(#aW#dFiPs3YmEdNkxfy$r%cXc_|9H OiNz(UMO*-@y%7?c&=$P_ diff --git a/vendor/libgit2/tests/resources/testrepo/.gitted/objects/32/59a6bd5b57fb9c1281bb7ed3167b50f224cb54 b/vendor/libgit2/tests/resources/testrepo/.gitted/objects/32/59a6bd5b57fb9c1281bb7ed3167b50f224cb54 deleted file mode 100644 index 321eaa8679591d3fc76e62628126185b0427c940..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 50 zcmby-a%8?0t#9e}{dDH^=1pybKbl G{96FXClfjV diff --git a/vendor/libgit2/tests/resources/testrepo/.gitted/objects/36/97d64be941a53d4ae8f6a271e4e3fa56b022cc b/vendor/libgit2/tests/resources/testrepo/.gitted/objects/36/97d64be941a53d4ae8f6a271e4e3fa56b022cc deleted file mode 100644 index 9bb5b623bdbc11a70db482867b5b26d0d7b3215c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23 fcmb7HDxd~FfcPQQ3!H%bn$g%SfOmF@NI2De~WFK%%kl}eMcVO zI|fyeRFs&PoDrXvnUktlQc=QSHvO9SOUI?QUN62aDtz+zSJ(!nGloV6K%kJ5nU@`3 zk{_R!S`JovAgKS^nHfD?4(GTZN*|o`r}wBy9@JErlI5ap2k*aFE|arAM`*r-Pngqx K!@U5TW9W-v4`FgG<-NYX2*C}Bvmy3HwKo<76B`i0fR_rKg9Y8*EO I00q(x`N*;qRsaA1 diff --git a/vendor/libgit2/tests/resources/testrepo/.gitted/objects/4e/886e602529caa9ab11d71f86634bd1b6e0de10 b/vendor/libgit2/tests/resources/testrepo/.gitted/objects/4e/886e602529caa9ab11d71f86634bd1b6e0de10 deleted file mode 100644 index 53168a038b77edb9bb0073f155cf7e2315c07f59..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 56 zcmV-80LTA$0ZYosPf{>3VkpVTELKR%%t=)M(#aW#dFiPs3YmEdxrxOksYMEjc_|7> OMTvRI8C(FZ2N4pV?iL9E diff --git a/vendor/libgit2/tests/resources/testrepo/.gitted/objects/5b/5b025afb0b4c913b4c338a42934a3863bf3644 b/vendor/libgit2/tests/resources/testrepo/.gitted/objects/5b/5b025afb0b4c913b4c338a42934a3863bf3644 deleted file mode 100644 index c1f22c54f..000000000 --- a/vendor/libgit2/tests/resources/testrepo/.gitted/objects/5b/5b025afb0b4c913b4c338a42934a3863bf3644 +++ /dev/null @@ -1,2 +0,0 @@ -xŽÛ 1EýNi@™Ék2 "X‚$ÙYW0YcÿíÀ¿Ã…s¸¥ÕzïÚÚõMDÏ€0æœ8!¶†ÉÌÞs‰ XŠªgÚdí::@X0»P¢wÙ"F/‰‰œÍRàˆUz÷¥múZZïú²¤ÒV}|•/œo5݇ÒêI£!¬1z Æ:vùÇUim}ê/¢> -öF- \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/testrepo/.gitted/objects/62/eb56dabb4b9929bc15dd9263c2c733b13d2dcc b/vendor/libgit2/tests/resources/testrepo/.gitted/objects/62/eb56dabb4b9929bc15dd9263c2c733b13d2dcc deleted file mode 100644 index b669961d8f9fe449aa715bcc4574e838309f83f1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 50 zcmV-20L}k+0V^p=O;s>9W-v4`Ff%bxNYX2*C}Bvmy3HwKo<76B`i0fR_rKg9Y8*EO I00nyv_QnPi@Bjb+ diff --git a/vendor/libgit2/tests/resources/testrepo/.gitted/objects/66/3adb09143767984f7be83a91effa47e128c735 b/vendor/libgit2/tests/resources/testrepo/.gitted/objects/66/3adb09143767984f7be83a91effa47e128c735 deleted file mode 100644 index 9ff5eb2b5dde9d39204782babe64bb240aced32f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19 acmb_5w=Y4-iqW;0ZR#rY*EdX;Zwuy@J03GfZmBGIfwL zT>3@?E=nyNN)@dlQF12lljkIKR7z@>EE(qwvK2R~9e4-@BPNA`Feqb!H_|8Rino@O z<~}4zr7%4D*fw}mg-_q`h;WblbC~*g#9M011B7xWaN&f2D|ei;lb&y#{ diff --git a/vendor/libgit2/tests/resources/testrepo/.gitted/objects/6b/9b767af9992b4abad5e24ffb1ba2d688ca602e b/vendor/libgit2/tests/resources/testrepo/.gitted/objects/6b/9b767af9992b4abad5e24ffb1ba2d688ca602e deleted file mode 100644 index 197685b8644b1d915a06f1fb2b572e89430d08e1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 41 zcmV+^0M`F_0ZYosPf{>4Wk}3Ttjf$w?%$7G-5C`FfcPQQ3!H%bn$g%5N`dHvVMD1*wTH+ot*d0HmhE8 ziUX=5sVFfoIU_zTGbdHAq@skub!YQFv+XwQ9e3vJ*`Bkz;ZOC3aH!I})N-(rU!EJv Zrz=lf8^K%<@M(E`$>VgnNdSzWFYprfIFkSX diff --git a/vendor/libgit2/tests/resources/testrepo/.gitted/objects/76/3d71aadf09a7951596c9746c024e7eece7c7af b/vendor/libgit2/tests/resources/testrepo/.gitted/objects/76/3d71aadf09a7951596c9746c024e7eece7c7af deleted file mode 100644 index 716b0c64b..000000000 --- a/vendor/libgit2/tests/resources/testrepo/.gitted/objects/76/3d71aadf09a7951596c9746c024e7eece7c7af +++ /dev/null @@ -1 +0,0 @@ -xŽAj!³ö?0¨£ßÂ09Êo}HÚ6¨}ÿôjUPP©ÕZ&Yÿø˜ AÔ›±€pŒÁFdë¼÷pz[fŽYŒ½PÒqLJ.,Z§`™Å®Ð.ù`’vÙ ³q $Æ5+9çOëtœû>Û/úDE/龡W¯ï*e¿§VŸdf1>ð覭Öê²×äÄ›¹úÊ™F« ­ìTŽÙhœk.i¶^0Ô?P¼R, \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/testrepo/.gitted/objects/7b/2417a23b63e1fdde88c80e14b33247c6e5785a b/vendor/libgit2/tests/resources/testrepo/.gitted/objects/7b/2417a23b63e1fdde88c80e14b33247c6e5785a deleted file mode 100644 index db778aaaed7308f12e4a9eb2e34875d4f8d82e9b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 187 zcmV;s07U4He)a}FfcPQQ3!H%bn$g%SfOmF@NI2De~WFK%%kl}eMcVO zI|fyeRFs&PoDrXvnUktlQc=QSHvO9SOUI?QUN62aDtz+zSJ(!nGloV6K%kJ5nU@`3 zk{_R!S`JovAgKS^nHfD?4(GTZN*|o`r}wBy9@JErlI5ap2k*aFE|arAM`*r-Pngqx p!@W=?Py45jOauJ7Sl2^RiSaIAE^xQ@?_ml44FkiJ(R)*{ z(H(TH6>PFd5&0~h#n$X!k{LPpBqYvbW+w8_Xyl{wSm9BID%@u&V}Z+7esG(*wD+lu geg*3yQ9w!oju;WmZug_se_Eq;)3!|J3!n-%%(!(uEdT%j diff --git a/vendor/libgit2/tests/resources/testrepo/.gitted/objects/87/380ae84009e9c503506c2f6143a4fc6c60bf80 b/vendor/libgit2/tests/resources/testrepo/.gitted/objects/87/380ae84009e9c503506c2f6143a4fc6c60bf80 deleted file mode 100644 index 3042f57909c0e8a354b3fd9a10dac80ad3b70b2b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 161 zcmV;S0ABxi0iDiK4#FT11W>;@#a=+O!a`|cjCuu60Nq6!r8Sg(cze+!_&1r!OJ#XKJqPOhSD-@Y31ZR_QGJTLFgqlr^PBd{M zrqnjFUxzBJ^*$H4$OP9~!W!WamtQ#D#(H1lZkY2C_J(u=+9PbSLsYG82dn%+)tMOr PEbsgrr-%9gz(q$G>lH`m diff --git a/vendor/libgit2/tests/resources/testrepo/.gitted/objects/94/4c0f6e4dfa41595e6eb3ceecdb14f50fe18162 b/vendor/libgit2/tests/resources/testrepo/.gitted/objects/94/4c0f6e4dfa41595e6eb3ceecdb14f50fe18162 deleted file mode 100644 index 4cc3f4dff..000000000 --- a/vendor/libgit2/tests/resources/testrepo/.gitted/objects/94/4c0f6e4dfa41595e6eb3ceecdb14f50fe18162 +++ /dev/null @@ -1 +0,0 @@ -x+)JMU044b040031QrutñueX¡l¨ðmmA‹m›Ì£íJ}Gß;U‘T”˜—œŸ–™“ªWRQÂ`6ýš÷KÇ¥¶^/¾-*|òøWØ¥3P¥y©å`%ËEÛÞ±\&gŽÐ|Ÿ0§ÿ†{Ó1X \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/testrepo/.gitted/objects/9a/03079b8a8ee85a0bee58bf9be3da8b62414ed4 b/vendor/libgit2/tests/resources/testrepo/.gitted/objects/9a/03079b8a8ee85a0bee58bf9be3da8b62414ed4 deleted file mode 100644 index bf7b2bb686f9d563f6af7ded70cfee2a31432731..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 50 zcmV-20L}k+0V^p=O;s>9W-v4`Ff%bxFxD%nC}B|N?pvM^cJ€³âQ¯ ¸·vL0I?Í!š4–Z=Ê! ×¦8²F¢Ã’!rÖsQßyÈ9]$DŽ&„l6AÇ>jFWüÒµ IKNiûë§Z¢%¡SˆŒ‘ -‹Ò ­ÅʉøU~̽øä>'¼ï™û ¯wþ ×[ËÇ× ÷öÚDGÚ¡±ðŒQ-ºMù«>dܶ‘OÞáÒò}í\à8g_ШÂoYr \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/testrepo/.gitted/objects/a6/5fedf39aefe402d3bb6e24df4d4f5fe4547750 b/vendor/libgit2/tests/resources/testrepo/.gitted/objects/a6/5fedf39aefe402d3bb6e24df4d4f5fe4547750 deleted file mode 100644 index 29c8e824d..000000000 --- a/vendor/libgit2/tests/resources/testrepo/.gitted/objects/a6/5fedf39aefe402d3bb6e24df4d4f5fe4547750 +++ /dev/null @@ -1,3 +0,0 @@ -xŽQ -!@ûösBQ"‚ŽÐ ÆÙ± rÍîßÒú{BQQQ6W+Sv9;eTEK4oHX{LN+y0Ic;3tpET3 diff --git a/vendor/libgit2/tests/resources/testrepo/.gitted/objects/a8/233120f6ad708f843d861ce2b7228ec4e3dec6 b/vendor/libgit2/tests/resources/testrepo/.gitted/objects/a8/233120f6ad708f843d861ce2b7228ec4e3dec6 deleted file mode 100644 index 18a7f61c29ea8c5c9a48e3b30bead7f058d06293..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 26 icmb7F=Q|_FfcPQQ3!H%bn$g%5N`dHvVMD1*wTH+ot*d0HmhE8 zio?VJ2ow^N7(P11yjPSt(6h?$`BvBen~c_Mm~j}YJ*g-$FF7MVEi)%oucV@c!F6Zz zKC|sM>>YRJ?Ae~PyWvmuhH$9Tywq~Al3$)1%BL$&TpPh$5b$Yve97ZdC>-d32A-ck3#53Bj1eiHrH0%_a~O^E z)~=I`b02d6B+%X!CmvR!^~Nwt%%a1R;+kE^D++9ey79m^NvBjfvsg~xWW7((n6W-v4`Ff%bxFw!fjC}DWMWvzv>=l^MU8)q`GHtgK^h(&LM mi2)EOq@`yt7)37I8y)_8j!@(7y31nK0iRS(hX4SGX&b5U?IBwL diff --git a/vendor/libgit2/tests/resources/testrepo/.gitted/objects/be/3563ae3f795b2b4353bcce3a527ad0a4f7f644 b/vendor/libgit2/tests/resources/testrepo/.gitted/objects/be/3563ae3f795b2b4353bcce3a527ad0a4f7f644 deleted file mode 100644 index 0817229bc..000000000 --- a/vendor/libgit2/tests/resources/testrepo/.gitted/objects/be/3563ae3f795b2b4353bcce3a527ad0a4f7f644 +++ /dev/null @@ -1,3 +0,0 @@ -xKj1D³Ö)zçUBëÛ-0ÁuV9¦Õò<#£È÷ÏȲ+ŠW?Ufpg3`(n5&I15rj|f8m diff --git a/vendor/libgit2/tests/resources/testrepo/.gitted/objects/c3/6d8ea75da8cb510fcb0c408c1d7e53f9a99dbe b/vendor/libgit2/tests/resources/testrepo/.gitted/objects/c3/6d8ea75da8cb510fcb0c408c1d7e53f9a99dbe deleted file mode 100644 index 0975f7fdf227dbb428c5ce60d76b0195eb30008a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 192 zcmV;x06+hD0V^p=O;s>5He@g~FfcPQQ3!H%bn$g%SfOmF@NI2De~WFK%%kl}eMcVO zI|fyeRFs&PoDrXvnUktlQc=QSHvO9SOUI?QUN62aDtz+zSJ(!nGf<_ODXDoShG12X zGZ_vm`EFVJ<@omnbG=S5xlivBMpk8nTa}Rk5Gdqi=4Hp1#TIhlFc@g@23d8y@KLk|S?Upq6S whs)s{_e1G}lm7G`HOYh84^y&SwC&*i7t3XG_U8!Ackl^w`fs=w0EuZ7F<>w>FfcPQQ3!H%bn$g%SfOmF@NI2De~WFK%%kl}eMcVO zJ7!`41PX}^ejLs3-n~BfTijGk=2g@8)A6h8lA*ejiW2jZGvd=Sb5iw6DoPk!cQ)@c z+it_&ac9n+?K!&}{#0)WhbqlWEe9)EF4}hR{)^=@Is0>j<~#U=IsG@>3joZzJl^$Q BMxFow diff --git a/vendor/libgit2/tests/resources/testrepo/.gitted/objects/d6/c93164c249c8000205dd4ec5cbca1b516d487f b/vendor/libgit2/tests/resources/testrepo/.gitted/objects/d6/c93164c249c8000205dd4ec5cbca1b516d487f deleted file mode 100644 index a67d6e647ccc1f3faad53aa928441dcf66808c42..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 dcmb3Wl&a7@k~+SQsz=t2+7DSR!GatNmVG%%*jzmN>#{ANzE$( R36-Q4rKad{0RV?s56uB&8Eyao diff --git a/vendor/libgit2/tests/resources/testrepo/.gitted/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 b/vendor/libgit2/tests/resources/testrepo/.gitted/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 deleted file mode 100644 index 711223894375fe1186ac5bfffdc48fb1fa1e65cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15 Wcmb003G-2nPTF diff --git a/vendor/libgit2/tests/resources/testrepo/.gitted/objects/ee/3fa1b8c00aff7fe02065fdb50864bb0d932ccf b/vendor/libgit2/tests/resources/testrepo/.gitted/objects/ee/3fa1b8c00aff7fe02065fdb50864bb0d932ccf deleted file mode 100644 index 974b72dfd16aba70c9dd263a606d7c89f6f8d542..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 64 zcmV-G0Kflu0ZYosPf{>4F=r^r$ShV!%gjkt0Mf}BiFxU%DGHf+3b~2JC8=Z5m>$`jW{Fc$=TS{`5WI9+ZM01*fsdfR&>4gdfE diff --git a/vendor/libgit2/tests/resources/testrepo/.gitted/objects/fa/49b077972391ad58037050f2a75f74e3671e92 b/vendor/libgit2/tests/resources/testrepo/.gitted/objects/fa/49b077972391ad58037050f2a75f74e3671e92 deleted file mode 100644 index 112998d425717bb922ce74e8f6f0f831d8dc4510..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24 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 rcaKYLMm*}NJR{E;Zd?;1?Rz=-Xf;gsm+2PX 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

    =uHz#4%J0P!RYVlzYKcqTl#P^Wo1(_e1-EG? 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

    &SG& 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�eTY#b?LX)(ib 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

    oIQ4YOXU$0Mi5i`Sf+bbJ=L9 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ǧ-as!?j9N54O2(e>6?f{B!P*zJjLd?BuK6_Lt#$d;~8~r?)R(U2NXI_~Yge zZ@>HQ)dgZzZQTCTFz6<(A4k?Vb=tCA3|Tw0RaN)dIQ?Z+)ec#e^0H$6xY)!=TtN$` z(>|ti)fx%+3{o68K`OshvM6NSDZ0+6n`Tm#L+u=oNr!5B2Qx^@qBSte5%mg5p_i0< zpxH~)@r;(BbxF#2`UQDL`KA&MS1ajMwv83?-=lo?5^|Ihr-O6qTH&(gq>=c9lzWih zGATo?c$2@!;TH0!v{BL&rzFwVkk3r%ow*R=R@Y4GdXzjAs?aNaC^{13DCxI094aYE zB_TVBua*>ql%c}b*>B;NBxxXESxg?~Bek^8ASJ0K&#nC3TfOzlm$>#Q>n}`l*bG`@ zv#lBnBem2?OoQaAlJ-@paPsI_*vqi8L2rZ1g}i-*0e|uR`FSMVn|C_e)4Jy+AF_Vz zyR2w4R(HeD6@6cby5x18Wx2?PG+&PP2~`m6I-e;A09C7Ohdqbe-{>8b%Kpl1Q1z4{ z3$v%9MlN9m2S~0dP#6Y|j_?^!Q=O_!Dhdb3dMQA{9AKD7r*e?G#}y7<(M%g!UsN3{ zp{D%08mrP7>Ap-~ZRiwEdR2$W?~Guf`?V6D|KH#I+x9o4TT#+`y7t~Wt%O}`)TX36 zjYTfeHFoP^_hctEh7M?1_f$b&Y<<$`df6|d>2bfj%k`CPaY@z&E@5nWd52w zeiD;NLR*n6u1SCtgn04#?Tb)~>nqdFRc$u)YjsxE**Mfi&B~@PtDz8W+DyONe(2Mx z?Yl)GW>ldJaU;xYEyo7X8Ns|cJ;?w5voXTNdzICU6&Y_?Gqy#_@>H;KEZV**tES89 zS`5`nf%+V=L9yyepF!^i99&7iIV{EQ`qG$T>?^_3wyO%!ja{FQSvur-osLx_L^-5c zTMO2X!=e}xS0IP#mlz}pom}8|Fl-1Cg%0C7NQf)RMQ_w&BUw5)fDN1NA6**o5(RG| zA;1>B49lR~V8J+$@B$t!%7!)DS@JIE2}m5Eub11Mcfe*dlwO9}^+#<0kyjXykiBR_SHj=kdP1=T><`8U1`61s~ z8q-B7N8(4ou0I-AbSOw;D_Mvu+N9CgN*3aZ4ti;9Ek(qEVX7Ur;Tk$jh1k?EC1}5( zyscLe;;)_Oqrp}sj6xXn1{rk48)7v}I1U+ZN{oLPm^Oepa^PR0zjeMmsb?RIwu6~5 zB2RR{?YOO@v9R2M5Eyc>fEo)oip;aAIRK~`|NSM!bD1u~$V@!U&lFm@)R_F9@l z@Fb2gb3G9i6uW+v;H%B zzO|lW#T#f2S@nisAQNUOm3^?Ako^0HY++|$b4^6o(ZP$81O{RL5J#=RJy&#~L+czJ zrg@Sq^w;4LE*@!nH7l$+i~Y45f-dZ>h-Vz`N0;l@@&WBqh*Is6(_F3PhuJsh9 zuW=&bK=nqlW_UrOrT#{^500Ak8OlmeQQ%dLW9xRf3qo(qy?l*Y!fRY~*lT#J3CEV( zwH|h592@!s&7!YrVC6pbmya4%*||GD?%i zKA=slU*@c-Ist20W1oN@a$Hr!U=$tA4|h)jGiq*Wzk}CJ;EnbSp{W@<-1(d49#$h3 zH%rr)Qs99*ZoM9j&UfhS$M-icAB59}rHB&VMWmHJ52Z4GeW=f~y77DR#n~S1VPjr;56$0Voh-GF z$~B|YyYgiLw{cuP2zQJEI&<5J(pXSl2)Uv(68oC;_rbC5)3e)u?VKF+p|6r;lsCdX z?ljsUBD`~qJe+=j^wu6RdGHJ?@NQxA0f`f=!3Sqt0z4o0<(_URjOr$!66?zq%<0X) z^`@?t>TeuiGNOIs2hbU4It%9*%=-1hNwYlEwMWhNh}WGp+gEFc%?8_#H&;J7Y;XSb z`n7*o;Q2Qa?&QV!%U5qU7w11*JbK^k-fw2eQ^~5twe6Gbq>^pFnQt9T0P~m2o85l% zvDxh&={1|npLY9Cj~?n}XNkT#aeAsDo;*&rS3fr&CUpBRABWv<=Zg;W2gB&s^7g|s zceef1Q5u`=heukn&CKLX=q!0?U@aAkY^E_GGs14p|9p|%H$rxw2;YAD!{(dw*B8(4 z6Y2No-`*bSd@W@*N!MH@?U2kalw4nZ_>yeLmcW)FQDHT8`0Y0RIN zIkSt~VYB~qGg$xYEl7e7+B)sB=v-!Z#yFZz5J8>s7Q$9mD{e}x6+ z8hQr_^i{PZMKFEK9c4KACs4!34zomfoRw2ePvbBUJ(FKy1*uA_K+<$Y5|wg5RA?`~ z&>LD=c08qqG_GQoWm)mx8OP~ImaTwD8KvVl@6C)~Pi0k<8v(>Opbaf0KVSOZX*aus zat*caoLoLg6Dfi4s{{B#mY~)R($j_+S&(AMYBE416|yE1M|r0BBNRsaW6z5QL{&g0 z6O!@aD9!R=nhzI{U*t*3M4G|H4<0l8;sQjRaZ!*#v}NB^T0T@DoDA|%{s#r_f1%P} zkKhx(jD{h`G_x@;Y=n`Gani*2Ao8%S+5dhUd&k8DGpwT(vrdH@vw^uGTi~uyr>EsB zs70{L_FdZl>O%Y$&r8L(--m0CvSaD!TLRmWKXh%AeK)yxJ-z)oqx0$AJb)Leji#ki z8YtrWO&vOiq94dW@bNw&1(71eH$f7cU2V{MYo>MZyOsv)-7c-gbkO=KBt1*pAOBO) zN>H_iD(DFwlD6OoR0_I!(xwi2wg;p8#SPs}|Yq2Nj&7TcW)=k{i=@enOe)-oiAtK9)?5leF!>O3BLJ@i z2^;SA1)3RnoV8kQj~qu4RulxvDv6M6hwvtv1KD@>`EFizW_ECl2*imZh!bH)NJP;x zFFkjg?Cl)8dp2)eL{#Y@C#6W0pIw-4?w{Gh$22PT~Bpa@7-BGoqSQW-tC$0 zs(QNWsp{(c;^ANZ@!V&sTU+YIa=fdj`+C0E+Fcv`U^1(w2enqO?M#;2ZC!5d{&+Ch zzCKXb)m#^~nzrpitG4_|SIdQJ=Ix$Z?%DxWPv-qU?flV}y1y&06?1JCIGj(GOFdHu zi^*)qOzYIzWOj4Es6Jk^E9hC(*8Ss6eyf*>apx~H`&ri<3hT?SDQ-82@E0bA8pKRW38 zCwJSW?sX}aWXE!DCe3QKEOvbL)vR5rqFNpl)9E9%=uOnMn#^eFewvukwDY}UY0RH2 zRR4c{&@bAmLX`(Q{RGv+svd+}$yT(f7F~}vA=8iEH0bD?P60Et_pwoSdeZ zajl!;V7eSv?W~#XtZ$eV`YD@6mAURU(3@`3ZaZt|(6QR`J^bP+90z%7%Y~>a#E>kx0tKzy(5hKy;ZjrdCW~lX6=^o4YM(Oy;-+!tH*Dx zKi|(jdi~NX9Y)9HqkhH*ANEs!H&Fe5!Na^aJ$M+V<}(|a&%839qlCT(<}xD>0`F9_rEzR5U4}hY2l{kkClWq$09{hN1bbY1xQo4rxwJ zp8mfg|z7Wb@!n?ynEKlGg6&%P}1plc- zL|ll|1&Kt_$T@0UVgEHpr0gr%RnTVuZ*JVa(tAUAL@sD$w0KOWjDl6CD`|~{5jo{;z#v|WJx-l>!y&;4AYD*T z9}9y||F)mJ@FrM(To=p2aXhoQPwrT7G5JKd&AR_!gPuITbK^C6#22aUIein*KahW0Q&9Ii>h#h?J z$2gLGLU!Wu;OMjGu5_V5Tp_xV3rYz?&`ap{5^Mo);Y3BcG>ymuUuG@}QqmAq9)myV z?GB5T^nmHnF%|M(=JQ%8Mu+4b+J0K)Qc4e!LFQlRz}>6Ejc3i+~uRlh86CBg6>U zEh-%KB4+?wm_n*(I11D<l|KjKG z4BmbICq9!PFgf-lAXg$;GlV_W@V77T6Q)l?fA}odg|Rxe%MgK`YjZo3B{pDsvw+^fLnQ)5E}qG z(b4J_1>UI!#Vg(>4(xbe6CqV>0szF$lNaz&5-ydpr&vb?$>Iz|;xg2>2uU&yTp7Eh z+?Sa>FFgM3H$K1h@*lo(dxg#nPgpjy{IE(cc9gm7ieV!6~1%?liDG-hcJzSC`Tij)zQM z+x$2M78zz-E?;sSUryWdR0MSTgyHR@S1(<=x+ww$nZQBO&QKEm+adAF`~BD{oQ^WV zM}vtpI)R1@N%>8feCP5HR~&_evj8V_1rayOfc)zWfQ+6rynXcFOV>Den1xSxiXHS) z-XR?2PnR7$AM|6V!4n;aXXu6OF_2bh4x?$sApPg^_0?!P6u)tzR~`It)ocEE`RO2K zqbCe+AN~2V3#Y^OlyKrf0cp|h!HLQ%QW%)QQ((gB6g`iVoi0@IV8)?zH@ve1G6)x! z4O5>Zc1iLbs&yPFMqZKv`9cubKX8*cjU!(Sh0MX4s1Lw~u^hK?SPdny5%qW6!QzuD zPP&dfk#-xLV$iSh4h?88p>3A95<5u+EmZqBT;ME$vbF>YJ(qTz4Ps&Q%(A|+*>H#i z3q|#+a%j%MhmqKZw&|p(FQ)u{pI>Rwc6FSBvRt%A-J_+)gM0}uK$v*_E+ibl-MBd@ zQjoAv8KJV`x)GT5>vnz{1x*tqQn(I|2lF%?!LhCWD2Fy$ApwX^FZYB;0(!N2a_VfYhGNkJkUL%Q4(Ht{V^F-IU>l)qp;ge| z=1!qI*P-);nNSgBn~~gEZ$#l3IqgPXryEwlyS4Uw!KON!#$rJWRT7LFdE-N?H0E>< zLlj@$NgrVdt#RJR!Lo8&gqpbV;sSw+{SVQMBNQr!T#SxtDE?zM%Gggoa+Ht9diq%? zw!neV7fEe1TGo>O}zFt(_tqoqY?X+ZAPJ8pOF2CU2dfN$1iY~ zV@G7Iz;ht@JIDmvfL#xr{~&2WeeR+~;;6lg(_K%^3#_03zeZkwci@D`9V~k`S|KfL z3*JLx2CWti@4x}A_Wh@``+|@HN98sFDVxDc>HXm(Sc_lBULO!gZa8M1NO6=?1vkbUKu=0R#_|e*d0P~2nY3qdQ}jV zLs%lOB9|Z~qsz(O5xToRJOp%TKV{x^3Yx;4m|aBFo{Pm^vnKH_-%w2qk8ue;`*1b( zqxh;U$19uDq2tu{5MqhfAwcnr z3l_e3lp-~ejYBb7c}=|1^OV|cQH_Hk{2vPx$lVz~P&VrccPC!ZHJ(De0Vu6ef(ik_ zp$R8M6w(t`DfzAs`PmhZsdsOO!UDYiMk9WD|IzafPi0Mz=aC@Lu#MMvdz`4QYz(n(+-S7$DS9AXryU3wcHurM^^aqA za}?D&wrcW-3Qbs?iQyvv8b{k&E~UL&uB`b!Sr>?o$!e0JUc={qz4FiRu5_tzl;_jB z9N||Q05Z(|hTmLydcUDL{W7zuw~y*8*O;wo0dqi-cY@;$#=C|M}N=1)%DNDqWt>R zUfQNIv#w6+lZ#h-`>fA`U-k6x4H{QdyWGYt9}0d@ml)pm7N6_A_Q6x^J^Fg~&CUbc zTn?QR>N6uvGCU~O&Ia_?Ht9m^8NqCoI1k8b@5UKHHd0PNT$Ra~TATbHTptUtU({pJ; zzyT5gk|801>A3_5VaYbqMohp9fGm-aATk1?eFA61h@4m9Onu!|eb$*BjLy#Vt*ZY2 zud4PRe_#Cb_r=e@-=2SX{CNHT=`VkNc<-YJ55M^O;pYz?d{W(Y@87Q;u4^@Y_vF!? z>VxWO-PG;9$Lq9w_vq1+_5S>|x~Ywgtw z^0sGt04)s z590c5v4ck4sFx8dK$G8~1I!Q%_;Qk}PqRhHO|<8-85#Tf>`hk3%{)Bto zZeRcS+D~_G)$aP0H{N`0XH$IS2{D0z#pBZ!hcT3Ka)H7=Q#d5O7;0UcfP zUf>O18Wvks2O%v>1q(6ajnqY-p4qQ5r@^lAS6|E8C+#9DJ#bJBfkv+*AfhY^xY63GgIu zgRu*dn&;%wtb?0@8~)8Q8eXD95Zmz66aqN=6!R);Pn6L|*{};>a*T)$lf*?7Hl5gr zU|~U=&V`+Tq!2ac7qqLD-$6qJEG6H5dDY9g=3v(G21qSRqjfYyZ_Ul^0@(zPxD(ai zzJC3ke_#EotlmiQ^JM!`m2?^QnMY)>@+qTZk=eHTkdtfo?tbyjOYH#=Sg|Q~lKE4i zhg+1LZohYR@$F0PgoMe=)xWUcda0+e%-b#3&+qaQqYSYcdryBP8|94XQl~i%=Tf^& zkY1icZ9YQ)C*?V+M*8qFf+CevG;PU#5eLgIs8BQ}U^xg{hlGMkO6%-y>R7x${Mo`8 zmJo+lWtGE<UFie46>IDh>p3aZc$h3WtX`rV!i6kt+Mw49V z4_Sr6YF01MS5fDn_KZ7{&YsiwNWrO-sNJb?K|bYWD0FC`SF)ZMipAndr3XdJ0wmLQ zPb|hRB!1yQyn*#i3cwlYYHvOaPg)Gc5EY@C5UR;=F)O-hzRThwH5}A}bK=i_#6jJSxX?m#Z2*k` zP-@D7p%sH9$zYse917UTq1#-q6i*9IV{h;!@W@@4HUt|TLG z?hb|pX5v2z>(icll}q5D=uZ5{T2ikp1HFJDPLDc=IMWT$qyt@;f?lR1uXSDOeI3$) zQrG5mkj_a5&3fE`K)0pn2C2)?%Q@eKo#p;m=;xS&d)QAqgH&va1p-37p2}d@@dB}& zZj@kIXh{NeaWzAclk>`+NryaAW20+qIu|KqQPts8dO$Q-OdqMo15KZTTXhlIG{ERfbzs z4G1%J1g6AhmyN7#DIAS0sRE!$9*lsNlBx6n7wR^m5lC`TA9|xW_$U6Pp1J@X*8%j9 ztGaG0Zbte7uDX$=aA6XNt4r8DD@;&} z^gjWltId3|=7gP_4>71K?!Npe_RqyN7lqiM)MG)i1H}j!Pn8m-%97sXxDpDklzL+n z0gc6VO0(OQ^OQhXX=0_E?M?EP2(sLEVsi*&t0q$xE4pvv%^Z-#{(V*gZLkq7gL z)3}laNmN{qjIOYb)@({t%UO>ERFwBr(1~3feP2_g&MpP z)aVCgT>9T0ntDAPeh$-TcDh8sd<9nJ`&+x_oL>yW_f{iuM7xAuKms^ol1yya3$t21p=YqZbGKb&pLCZBpDZu0R}^+SAedOlXWp>OP&{K`lbPs+g7_y!u(1v=sJfYiAR8mqKQ`-uh9-VCs{#a1 zKrcf0jCusAmg#QMA=40#;KS5AMXu?PiwLkkeH@|9Az&g~B1z&*+?Sq-BW|`!9mi%| zp=j6Vt%uu{h`AtG^*vmY4_D6*Hf~guvtI_^Ev<>T%p)X44HZQWi!CWEwyNPRCBi)) zto`~#d3ob@0o&|l(64UFp=*0m=-OU2{P$)Ct>5}%v5@w+#G@JZ%Ca1rJd$FQN7Zm` zImHe?TV{o-sMIyxjhII$t)tSq9~_lR z6_h}0uoh?|xW}l~`uyN&TjPTl5s_;4J!0ZhM4sC|^R<#DWj=D_36HR$=c27Te>qdq z*IJ+}XIT}(PCVk!XIza~awunC74_d77iZ}9ZTCdQTl)|!=rTbBO!|b8v~2{iC{p4G zQmvpAN0KveCZwJNj__DeEv77&Bi&qz?sMf1KW?|4eA50xyEGS%1hCsNPx4GsPl}0% zyN?q|{d?`^V|4|-Kp+%P!8l{;*SKBXW70jD!maqQ)6wpJi!59KT=EF#afu%EI>3bKww&Clrl?ER|?= z^zt2$E_p`}e{0_UG8^Q(<$wIL zgAr%wGh<--zFO!y8h5=oo!}XCKwPzqJNfz0^za}3K}Z{KE^LRt@4a)Mk4O2aWgGAC zgUe&facV#g@!vG-Y7t&?aFR7Y?5zbH(SYt^^eOc@E{{uaZCt;YtLSzdTjW<1K@6kY zPcajqbgS_M?r0Ck31nRWhIb@*ZQ^;A**2glCg?Xt-Oc%0Q)ZEu@M5dLg_#mbQ?JMksFW8}7~UvO2amsXeF zeYsR^X$ydK+gQo4Kk0Qc1n`e4t(cw z(H71&M;9bmkvQ3$aiitZPdCP1&i(W%@&MxX)?l%Cdpsuh4>-7^6GD>W)OV4)z%e>! zdbw0$J8^VJ!oNSGSLnMST%9AbT&3R-pGN0bLc85#<1r4sXo==HcJQ3A8Ju{gkzmuy zOi?B#7Qc8&mL=E|O`O1}X!Z@beIQvM?h@}d%(1vqL_#m{Ly{ng!KE=FXr{ZOhdsqL z97XL*E(Ul*@f=y2nUblieN)AzsyVmuZFnoJa7@A!iJGd(p021Sc3e+4Fjh?6n>lh{ z*G13JHLvf;Skbu<&eBB`qrZHY%Knby)JHE<97cE9oB0y^!6kVA8cDLD^wqwms^~(L zMUe}0Vp4Ldd~O1wn^3U);HQgiPUyNCw&WAoYRuHhEIoxG0n~<3x&YZj{N&s~U;}tK zU$aBGxec4Kb3!CNA&#CFMKp%0BM9%X@fbpG6vx>rC0-$LO2!>zsZQA`0lQXKhpPM( zRP|(3iuhw7>^p29qWBKBCqHdz`1;FLKsI(UjL?!KNpZ$Dw&XvI$|5JrPW7lmIp_a3 ze`uC%?a;z^7l>|SQs=Iedz<`>4Eq(&q5TZej2KyO-(B0Etea0Aa4#WtxK{nMY=Da3Q+b{_t*Me;nT2bdofNwCSM*!5)db=sUUr!Om*qpGJ`x_;Uwu$gSa!c{b+9I1^o2T3s~Nx zaOi@4a@7_0Y^q?~{*t?UR0SjB3d(dtine84b zgxcM~4jxO5W@t>L3X3w{&3WnMw&G;Cgx3C0a9O+{T?I0L4`st~* zW7*fI9RnxfO{WJD_nJ>9SyY{6AsoS*g=S}v$_RpWJz>?WqLR^f_b4oi*~X#%(fZ@& z!!=I;yExcwe#XL0h?fK|gqB#irv8#tocFol0M(rM`8+%IOJ_Yd3-JpR-dErFvd#;B zttbq3ZJ7i0p}Smla(6hwC4bPBE-iuL9;w{>Tr7X8mt!okvdRS*X%+P}r=IQjHuXQ9 z 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

    buibo}hicx6&l@gJNcsJI;tJeTH?p}*-9#Ii z@3706gDGL2Hg}@!j5ElkxtG8o`A&fNTHKigV?Ae#^La0ar2fE1v!ai3$O0s_2`(ic z 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«< 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 Ly^wf#eqsC{v)m?j diff --git a/vendor/libgit2/tests/resources/testrepo/.gitted/objects/pack/pack-d7c6adf9f61318f041845b01440d09aa7a91e1b5.idx b/vendor/libgit2/tests/resources/testrepo/.gitted/objects/pack/pack-d7c6adf9f61318f041845b01440d09aa7a91e1b5.idx deleted file mode 100644 index 94c3c71da52ca3d4761c4e9041b384d9bc75ad9b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1240 zcmexg;-AdGz`z8=qW}^Pps*kZGXwPvCCmbJ??}b0K);VP%m(x`PVCs+bpPZ39eaPT zF#d95_t~f2a`oYw4{Y+*Z5}2Csyees*{;KHB55dV&?dF#`kRGN5~TfOsX4T@J*P yfLQIszKM4h+|MXn`snRCm0er%Quq9yFn5~doV&qSCs?ySKaj$-^Vag-Df$4qg=3fi diff --git a/vendor/libgit2/tests/resources/testrepo/.gitted/objects/pack/pack-d7c6adf9f61318f041845b01440d09aa7a91e1b5.pack b/vendor/libgit2/tests/resources/testrepo/.gitted/objects/pack/pack-d7c6adf9f61318f041845b01440d09aa7a91e1b5.pack deleted file mode 100644 index 74c7fe4f3a657d606a4a004c87336749079c0edf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 491 zcmWG=boORoU|<4bwrPA7bLRHNavd@dXt`h9wYOo@&ulXVr3x1R33=PLWk|2oj=R6e z{6ngQ-HiT=p)71gtxNdtSc@#my7+iQ>e4qWip{2_EIvQCa!ROJYez<`n&YvUtTcI* z9TTeiTBZe0nUf^pW%6`sa`eMPzM|)nA8tGF@Z|lXUFTAFz2AA(eS_Z5b4eUxWitfM zx;^&{{dY4@|EHR09p8m=V|lCdF3HolfsX5m=3+ABVfbI&731*Idp5t|LFI}jHQzg~ zyQiAoi@zxS!<^^L4J{_ighMw%nza;7mv(7p=6M|PE%R{fdiLnm>17)awYE#nS$-B0AgjUCm@D?V9#TFX)~ z$JoTcz}PU*66+=E@hWo`*7*&jWecg0;xw=p8Q#< znGm{LIG-cz>zd?K^@r5dt1_-_DeboX%y8$7^v#Wo6?0bm=)z13@;H6Q^C=U9)d4m= z>xwzr=RI@+K|))fGcic~WZt)&iFo@NUWM`6pV&9?&Vu_Hg-aj3U8k~ZOJ3@p{}TZ5 CmFm|3 diff --git a/vendor/libgit2/tests/resources/testrepo/.gitted/objects/pack/pack-d85f5d483273108c9d8dd0e4728ccf0b2982423a.idx b/vendor/libgit2/tests/resources/testrepo/.gitted/objects/pack/pack-d85f5d483273108c9d8dd0e4728ccf0b2982423a.idx deleted file mode 100644 index 555cfa977d92b199d541285af6997543062dbb5f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1240 zcmexg;-AdGz`z8=Fu(|8jAF{d02H2-U}m6xVlWF(-6*Ck3|N6-I8-nj(5*DVOle|P zo{t)ie0?j&@$0PFqP>OL=Y#(kT`Ve_JpcH-3(;%WeY(v#lR+%mtR?&EiC&|hR!?hN z(wd)1Z9Qs`dw%x!5V?meVL>yD15}(ow=(kB?z_;%ZLnQyuGiaosUIg!3HkM=?0m@~ zu;ad6!x7<|%-;-CYzi~lg?rcd+wO~5?(_a%q=V;#6!|H$|2e3=YcE{|%zhz2tPI5a zfqq^Fr2Bw0kGu4gOS9IUbq@E_@MF5DBm1P@&x?V@nN22yqrhMG{sG3n*SE{>v{(-S DZ%AIa diff --git a/vendor/libgit2/tests/resources/testrepo/.gitted/objects/pack/pack-d85f5d483273108c9d8dd0e4728ccf0b2982423a.pack b/vendor/libgit2/tests/resources/testrepo/.gitted/objects/pack/pack-d85f5d483273108c9d8dd0e4728ccf0b2982423a.pack deleted file mode 100644 index 4d539ed0a554c2b1b03e38f5eb389b515fc37792..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 498 zcmWG=boORoU|<4bwh4R{bLO6LB2ZL-fLMnU}tes`9ibm`tURpR~n zN4$6HD)yU)CWLQZoTPkI!7rVgzg+9v``Z_ETFHpbhKWQbKFLPm4J!}4hZ-;;1 za#iqhJ1^nhV_bNmPxbulr)SmY-soaD~5%da!2C_U9Y#XivXB zA!=`fYW_quaW@M^#aa1lT|@sZc&3)$dY@s6GLb^dz-uTluNVLoplcP)9_=us3ZHN-p>mFO;6gd diff --git a/vendor/libgit2/tests/resources/testrepo/.gitted/packed-refs b/vendor/libgit2/tests/resources/testrepo/.gitted/packed-refs deleted file mode 100644 index 6018a19d2..000000000 --- a/vendor/libgit2/tests/resources/testrepo/.gitted/packed-refs +++ /dev/null @@ -1,4 +0,0 @@ -# pack-refs with: peeled -41bc8c69075bbdb46c5c6f0566cc8cc5b46e8bd9 refs/heads/packed -5b5b025afb0b4c913b4c338a42934a3863bf3644 refs/heads/packed-test -b25fa35b38051e4ae45d4222e795f9df2e43f1d1 refs/tags/packed-tag diff --git a/vendor/libgit2/tests/resources/testrepo/.gitted/refs/heads/br2 b/vendor/libgit2/tests/resources/testrepo/.gitted/refs/heads/br2 deleted file mode 100644 index aab87e5e7..000000000 --- a/vendor/libgit2/tests/resources/testrepo/.gitted/refs/heads/br2 +++ /dev/null @@ -1 +0,0 @@ -a4a7dce85cf63874e984719f4fdd239f5145052f diff --git a/vendor/libgit2/tests/resources/testrepo/.gitted/refs/heads/dir b/vendor/libgit2/tests/resources/testrepo/.gitted/refs/heads/dir deleted file mode 100644 index 4567d37fa..000000000 --- a/vendor/libgit2/tests/resources/testrepo/.gitted/refs/heads/dir +++ /dev/null @@ -1 +0,0 @@ -144344043ba4d4a405da03de3844aa829ae8be0e diff --git a/vendor/libgit2/tests/resources/testrepo/.gitted/refs/heads/ident b/vendor/libgit2/tests/resources/testrepo/.gitted/refs/heads/ident deleted file mode 100644 index 2cfd880a3..000000000 --- a/vendor/libgit2/tests/resources/testrepo/.gitted/refs/heads/ident +++ /dev/null @@ -1 +0,0 @@ -6fd5c7dd2ab27b48c493023f794be09861e9045f diff --git a/vendor/libgit2/tests/resources/testrepo/.gitted/refs/heads/long-file-name b/vendor/libgit2/tests/resources/testrepo/.gitted/refs/heads/long-file-name deleted file mode 100644 index 1f942a746..000000000 --- a/vendor/libgit2/tests/resources/testrepo/.gitted/refs/heads/long-file-name +++ /dev/null @@ -1 +0,0 @@ -6b377958d8c6a4906e8573b53672a1a23a4e8ce6 diff --git a/vendor/libgit2/tests/resources/testrepo/.gitted/refs/heads/master b/vendor/libgit2/tests/resources/testrepo/.gitted/refs/heads/master deleted file mode 100644 index f31fe781b..000000000 --- a/vendor/libgit2/tests/resources/testrepo/.gitted/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -099fabac3a9ea935598528c27f866e34089c2eff diff --git a/vendor/libgit2/tests/resources/testrepo/.gitted/refs/heads/packed-test b/vendor/libgit2/tests/resources/testrepo/.gitted/refs/heads/packed-test deleted file mode 100644 index f2c14ad83..000000000 --- a/vendor/libgit2/tests/resources/testrepo/.gitted/refs/heads/packed-test +++ /dev/null @@ -1 +0,0 @@ -4a202b346bb0fb0db7eff3cffeb3c70babbd2045 diff --git a/vendor/libgit2/tests/resources/testrepo/.gitted/refs/heads/subtrees b/vendor/libgit2/tests/resources/testrepo/.gitted/refs/heads/subtrees deleted file mode 100644 index ad27e0b13..000000000 --- a/vendor/libgit2/tests/resources/testrepo/.gitted/refs/heads/subtrees +++ /dev/null @@ -1 +0,0 @@ -763d71aadf09a7951596c9746c024e7eece7c7af diff --git a/vendor/libgit2/tests/resources/testrepo/.gitted/refs/heads/test b/vendor/libgit2/tests/resources/testrepo/.gitted/refs/heads/test deleted file mode 100644 index 399c4c73e..000000000 --- a/vendor/libgit2/tests/resources/testrepo/.gitted/refs/heads/test +++ /dev/null @@ -1 +0,0 @@ -e90810b8df3e80c413d903f631643c716887138d diff --git a/vendor/libgit2/tests/resources/testrepo2/.gitted/HEAD b/vendor/libgit2/tests/resources/testrepo2/.gitted/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/vendor/libgit2/tests/resources/testrepo2/.gitted/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/vendor/libgit2/tests/resources/testrepo2/.gitted/config b/vendor/libgit2/tests/resources/testrepo2/.gitted/config deleted file mode 100644 index 4af067f04..000000000 --- a/vendor/libgit2/tests/resources/testrepo2/.gitted/config +++ /dev/null @@ -1,26 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = false -[remote "origin"] - url = https://github.com/libgit2/false.git - fetch = +refs/heads/*:refs/remotes/origin/* -[remote "insteadof-test"] - url = http://example.com/libgit2/libgit2 - pushurl = http://github.com/libgit2/libgit2 - fetch = +refs/heads/*:refs/remotes/test/* -[branch "master"] - remote = origin - merge = refs/heads/master - rebase = true -[url "longer-non-prefix-match"] - insteadOf = ttp://example.com/li -[url "shorter-prefix"] - insteadOf = http://example.co -[url "http://github.com"] - insteadOf = http://example.com -[url "git@github.com:"] - pushInsteadOf = http://github.com/ diff --git a/vendor/libgit2/tests/resources/testrepo2/.gitted/description b/vendor/libgit2/tests/resources/testrepo2/.gitted/description deleted file mode 100644 index 498b267a8..000000000 --- a/vendor/libgit2/tests/resources/testrepo2/.gitted/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/vendor/libgit2/tests/resources/testrepo2/.gitted/index b/vendor/libgit2/tests/resources/testrepo2/.gitted/index deleted file mode 100644 index b614d0727d53a80dbfcfa54e3ac60c59cb7857a6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 512 zcmZ?q402{*U|<4bw!l7@FF=|BM)NT+urTv_i7+rUE@5C`{0fu;vKd%}TR)|&-yRjV zbl-6&=Y6xys+XMNU|#xza+4U? z^HR(8N-9c_+<|6}IGQ=w-NRd4nv{}Rq>peG++S$sNuZgB-CcZ8^AOI%Wu6q8dDz`2 t3N;Tx84=-5X*6@OyHgC!TqO4 1368278260 -0700 clone: from /Users/rb/src/libgit2/tests-clar/resources/../../../rugged/test/fixtures/testrepo.git diff --git a/vendor/libgit2/tests/resources/testrepo2/.gitted/logs/refs/heads/master b/vendor/libgit2/tests/resources/testrepo2/.gitted/logs/refs/heads/master deleted file mode 100644 index 4e80c69fa..000000000 --- a/vendor/libgit2/tests/resources/testrepo2/.gitted/logs/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 36060c58702ed4c2a40832c51758d5344201d89a Russell Belfer 1368278260 -0700 clone: from /Users/rb/src/libgit2/tests-clar/resources/../../../rugged/test/fixtures/testrepo.git diff --git a/vendor/libgit2/tests/resources/testrepo2/.gitted/logs/refs/remotes/origin/HEAD b/vendor/libgit2/tests/resources/testrepo2/.gitted/logs/refs/remotes/origin/HEAD deleted file mode 100644 index 4e80c69fa..000000000 --- a/vendor/libgit2/tests/resources/testrepo2/.gitted/logs/refs/remotes/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 36060c58702ed4c2a40832c51758d5344201d89a Russell Belfer 1368278260 -0700 clone: from /Users/rb/src/libgit2/tests-clar/resources/../../../rugged/test/fixtures/testrepo.git diff --git a/vendor/libgit2/tests/resources/testrepo2/.gitted/objects/0c/37a5391bbff43c37f0d0371823a5509eed5b1d b/vendor/libgit2/tests/resources/testrepo2/.gitted/objects/0c/37a5391bbff43c37f0d0371823a5509eed5b1d deleted file mode 100644 index bfe146a5a809d2163d2a521b57be55a6459054f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 134 zcmV;10D1p-0UeA%3c@fD06pgw`vFUm-If$Y1fSpwc0(E~#uT#%{@&EfFqawS436kf z<&mPoD5F?E@*-9!&JH^f1CyVT7{i3J;6!BfyCsOVlvR!P$HxtJmz>^ki&Yh_caHT1 orxyQm$%WVF(33MbAA)m)0pV!9wZ>>_3j3#|);K5g1ApKxugrQtFaQ7m diff --git a/vendor/libgit2/tests/resources/testrepo2/.gitted/objects/13/85f264afb75a56a5bec74243be9b367ba4ca08 b/vendor/libgit2/tests/resources/testrepo2/.gitted/objects/13/85f264afb75a56a5bec74243be9b367ba4ca08 deleted file mode 100644 index cedb2a22e6914c3bbbed90bbedf8fd2095bf5a7d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19 acmb-^#7G-5C`FfcPQQ3!H%bn$g%SfOmF@NI2De~WFK%%kl}eMcVO zI|fyeRFs&PoDrXvnUktlQc=R-y0dwo*>)TDjyrSqY|q)<@TYo1I8Fm*0&IVk`D diff --git a/vendor/libgit2/tests/resources/testrepo2/.gitted/objects/2d/2eff63372b08adf0a9eb84109ccf7d19e2f3a2 b/vendor/libgit2/tests/resources/testrepo2/.gitted/objects/2d/2eff63372b08adf0a9eb84109ccf7d19e2f3a2 deleted file mode 100644 index 3cd240db52b878954cf28186a859d716910768e0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 125 zcmV-@0D}K`0hNtg3c@fD0R7G>_5_l2HxEHX=n*`@Ca!J4G|;Sg{T6TF-^|A_rPaD9 zxPT|!M8G9yF -öF- \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/testrepo2/.gitted/objects/61/9f9935957e010c419cb9d15621916ddfcc0b96 b/vendor/libgit2/tests/resources/testrepo2/.gitted/objects/61/9f9935957e010c419cb9d15621916ddfcc0b96 deleted file mode 100644 index 1fd79b47794e916f9873ed60f1cb92815d3295b3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 116 zcmV-)0E_>40V^p=O;s>7FlI0`FfcPQQ3!H%bn$g%5N`dHvVMD1*wTH+ot*d0HmhE8 ziUX=5FST5+q@sl3m*B7G-5C`FfcPQQ3!H%bn$g%5N`dHvVMD1*wTH+ot*d0HmhE8 ziUX=5sVFfoIU_zTGbdHAq@skub!YQFv+XwQ9e3vJ*`Bkz;ZOC3aH!I})N-(rU!EJv Zrz=lf8^K%<@M(E`$>VgnNdSzWFYprfIFkSX diff --git a/vendor/libgit2/tests/resources/testrepo2/.gitted/objects/7f/043268ea43ce18e3540acaabf9e090c91965b0 b/vendor/libgit2/tests/resources/testrepo2/.gitted/objects/7f/043268ea43ce18e3540acaabf9e090c91965b0 deleted file mode 100644 index 3d1016daae43a7a3c163b6385ad15078cdbbcea1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 55 zcmV-70LcG%0V^p=O;s?qU@$Z=Ff%bx2y%6F@paWJsVHF(ZvB+9etT5d(tXFBocGN( Nt6p-70{~G25c)?67YP6W diff --git a/vendor/libgit2/tests/resources/testrepo2/.gitted/objects/81/4889a078c031f61ed08ab5fa863aea9314344d b/vendor/libgit2/tests/resources/testrepo2/.gitted/objects/81/4889a078c031f61ed08ab5fa863aea9314344d deleted file mode 100644 index 2f9b6b6e3d9250ba09360734aa47973a993b59d1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 82 zcmV-Y0ImOc0V^p=O;s?nWH2-^Ff%bx2y%6F@pWZbp=_w|ZEZn+i*1|CqwPw4M;_lh o233)lTCP`8QNplXwC&*i7t3XG_U8!Ackl^w`fs=w02$OB|A$m1)Bpeg diff --git a/vendor/libgit2/tests/resources/testrepo2/.gitted/objects/84/96071c1b46c854b31185ea97743be6a8774479 b/vendor/libgit2/tests/resources/testrepo2/.gitted/objects/84/96071c1b46c854b31185ea97743be6a8774479 deleted file mode 100644 index 5df58dda56789631c78aeed62708e1b694440195..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 126 zcmV-^0D=E_0iBK82?8+?0R2uC+kmpkZXSY&U

    RiSaIAE^xQ@?_ml44FkiJ(R)*{ z(H(TH6>PFd5&0~h#n$X!k{LPpBqYvbW+w8_Xyl{wSm9BID%@u&V}Z+7esG(*wD+lu geg*3yQ9w!oju;WmZug_se_Eq;)3!|J3!n-%%(!(uEdT%j diff --git a/vendor/libgit2/tests/resources/testrepo2/.gitted/objects/9f/d738e8f7967c078dceed8190330fc8648ee56a b/vendor/libgit2/tests/resources/testrepo2/.gitted/objects/9f/d738e8f7967c078dceed8190330fc8648ee56a deleted file mode 100644 index a79612435..000000000 --- a/vendor/libgit2/tests/resources/testrepo2/.gitted/objects/9f/d738e8f7967c078dceed8190330fc8648ee56a +++ /dev/null @@ -1,3 +0,0 @@ -xŽ[ -Â0EýÎ*fÊäÕ¤ "¸W0“‡-ØFâtÿÝ—çpS[–YÀ˜x^ -Díb CLhutɉ}¥8X*4Zí¬sY½¨—UÀ‘AÃÖ ÌX3‡R«Mµ¶) s6è¼¢M¦ÖážšÜ&Jm…ó;}Çõ±Ðü<¥¶\@›à‚ÑÞpÄ€¨vº?”ò«jÛºLð«¨Ø?Hå \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/testrepo2/.gitted/objects/a4/a7dce85cf63874e984719f4fdd239f5145052f b/vendor/libgit2/tests/resources/testrepo2/.gitted/objects/a4/a7dce85cf63874e984719f4fdd239f5145052f deleted file mode 100644 index f8588696b..000000000 --- a/vendor/libgit2/tests/resources/testrepo2/.gitted/objects/a4/a7dce85cf63874e984719f4fdd239f5145052f +++ /dev/null @@ -1,2 +0,0 @@ -x;j1DëmdÓú·À˜ÇŽ|M«µ3`ŒV{ >€³âQ¯ ¸·vL0I?Í!š4–Z=Ê! ×¦8²F¢Ã’!rÖsQßyÈ9]$DŽ&„l6AÇ>jFWüÒµ IKNiûë§Z¢%¡SˆŒ‘ -‹Ò ­ÅʉøU~̽øä>'¼ï™û ¯wþ ×[ËÇ× ÷öÚDGÚ¡±ðŒQ-ºMù«>dܶ‘OÞáÒò}í\à8g_ШÂoYr \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/testrepo2/.gitted/objects/a7/1586c1dfe8a71c6cbf6c129f404c5642ff31bd b/vendor/libgit2/tests/resources/testrepo2/.gitted/objects/a7/1586c1dfe8a71c6cbf6c129f404c5642ff31bd deleted file mode 100644 index d0d7e736e536a41bcb885005f8bf258c61cad682..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 28 kcmbBQQQ6W+Sv9;eTEK4oHX{LN+y0Ic;3tpET3 diff --git a/vendor/libgit2/tests/resources/testrepo2/.gitted/objects/a8/233120f6ad708f843d861ce2b7228ec4e3dec6 b/vendor/libgit2/tests/resources/testrepo2/.gitted/objects/a8/233120f6ad708f843d861ce2b7228ec4e3dec6 deleted file mode 100644 index 18a7f61c29ea8c5c9a48e3b30bead7f058d06293..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 26 icmb40V^p=O;s>7Fk&z?FfcPQQ3!H%bn$g%5N`dHvVMD1*wTH+ot*d0HmhE8 ziUX=5FST5+q@sl3m*B=Z5m>$`jW{Fc$=TS{`5WI9+ZM01*fsda7_Ea{vGU diff --git a/vendor/libgit2/tests/resources/testrepo2/.gitted/objects/fa/49b077972391ad58037050f2a75f74e3671e92 b/vendor/libgit2/tests/resources/testrepo2/.gitted/objects/fa/49b077972391ad58037050f2a75f74e3671e92 deleted file mode 100644 index 112998d425717bb922ce74e8f6f0f831d8dc4510..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24 gcmbYw4{Y+*Z5}2Csyees*{;KHB55dV&?dF#`kRGN5~TfOsX4T@J*P yfLQIszKM4h+|MXn`snRCm0er%Quq9yFn5~doV&qSCs?ySKaj$-^Vag-Df$4qg=3fi diff --git a/vendor/libgit2/tests/resources/testrepo2/.gitted/objects/pack/pack-d7c6adf9f61318f041845b01440d09aa7a91e1b5.pack b/vendor/libgit2/tests/resources/testrepo2/.gitted/objects/pack/pack-d7c6adf9f61318f041845b01440d09aa7a91e1b5.pack deleted file mode 100644 index 74c7fe4f3a657d606a4a004c87336749079c0edf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 491 zcmWG=boORoU|<4bwrPA7bLRHNavd@dXt`h9wYOo@&ulXVr3x1R33=PLWk|2oj=R6e z{6ngQ-HiT=p)71gtxNdtSc@#my7+iQ>e4qWip{2_EIvQCa!ROJYez<`n&YvUtTcI* z9TTeiTBZe0nUf^pW%6`sa`eMPzM|)nA8tGF@Z|lXUFTAFz2AA(eS_Z5b4eUxWitfM zx;^&{{dY4@|EHR09p8m=V|lCdF3HolfsX5m=3+ABVfbI&731*Idp5t|LFI}jHQzg~ zyQiAoi@zxS!<^^L4J{_ighMw%nza;7mv(7p=6M|PE%R{fdiLnm>17)awYE#nS$-B0AgjUCm@D?V9#TFX)~ z$JoTcz}PU*66+=E@hWo`*7*&jWecg0;xw=p8Q#< znGm{LIG-cz>zd?K^@r5dt1_-_DeboX%y8$7^v#Wo6?0bm=)z13@;H6Q^C=U9)d4m= z>xwzr=RI@+K|))fGcic~WZt)&iFo@NUWM`6pV&9?&Vu_Hg-aj3U8k~ZOJ3@p{}TZ5 CmFm|3 diff --git a/vendor/libgit2/tests/resources/testrepo2/.gitted/packed-refs b/vendor/libgit2/tests/resources/testrepo2/.gitted/packed-refs deleted file mode 100644 index 97ea6a848..000000000 --- a/vendor/libgit2/tests/resources/testrepo2/.gitted/packed-refs +++ /dev/null @@ -1,6 +0,0 @@ -# pack-refs with: peeled fully-peeled -36060c58702ed4c2a40832c51758d5344201d89a refs/remotes/origin/master -41bc8c69075bbdb46c5c6f0566cc8cc5b46e8bd9 refs/remotes/origin/packed -5b5b025afb0b4c913b4c338a42934a3863bf3644 refs/tags/v0.9 -0c37a5391bbff43c37f0d0371823a5509eed5b1d refs/tags/v1.0 -^5b5b025afb0b4c913b4c338a42934a3863bf3644 diff --git a/vendor/libgit2/tests/resources/testrepo2/.gitted/refs/heads/master b/vendor/libgit2/tests/resources/testrepo2/.gitted/refs/heads/master deleted file mode 100644 index a7eafce3c..000000000 --- a/vendor/libgit2/tests/resources/testrepo2/.gitted/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -36060c58702ed4c2a40832c51758d5344201d89a diff --git a/vendor/libgit2/tests/resources/testrepo2/.gitted/refs/remotes/origin/HEAD b/vendor/libgit2/tests/resources/testrepo2/.gitted/refs/remotes/origin/HEAD deleted file mode 100644 index 6efe28fff..000000000 --- a/vendor/libgit2/tests/resources/testrepo2/.gitted/refs/remotes/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/remotes/origin/master diff --git a/vendor/libgit2/tests/resources/testrepo2/README b/vendor/libgit2/tests/resources/testrepo2/README deleted file mode 100644 index 1385f264a..000000000 --- a/vendor/libgit2/tests/resources/testrepo2/README +++ /dev/null @@ -1 +0,0 @@ -hey diff --git a/vendor/libgit2/tests/resources/testrepo2/new.txt b/vendor/libgit2/tests/resources/testrepo2/new.txt deleted file mode 100644 index fa49b0779..000000000 --- a/vendor/libgit2/tests/resources/testrepo2/new.txt +++ /dev/null @@ -1 +0,0 @@ -new file diff --git a/vendor/libgit2/tests/resources/testrepo2/subdir/README b/vendor/libgit2/tests/resources/testrepo2/subdir/README deleted file mode 100644 index 1385f264a..000000000 --- a/vendor/libgit2/tests/resources/testrepo2/subdir/README +++ /dev/null @@ -1 +0,0 @@ -hey diff --git a/vendor/libgit2/tests/resources/testrepo2/subdir/new.txt b/vendor/libgit2/tests/resources/testrepo2/subdir/new.txt deleted file mode 100644 index fa49b0779..000000000 --- a/vendor/libgit2/tests/resources/testrepo2/subdir/new.txt +++ /dev/null @@ -1 +0,0 @@ -new file diff --git a/vendor/libgit2/tests/resources/testrepo2/subdir/subdir2/README b/vendor/libgit2/tests/resources/testrepo2/subdir/subdir2/README deleted file mode 100644 index 1385f264a..000000000 --- a/vendor/libgit2/tests/resources/testrepo2/subdir/subdir2/README +++ /dev/null @@ -1 +0,0 @@ -hey diff --git a/vendor/libgit2/tests/resources/testrepo2/subdir/subdir2/new.txt b/vendor/libgit2/tests/resources/testrepo2/subdir/subdir2/new.txt deleted file mode 100644 index fa49b0779..000000000 --- a/vendor/libgit2/tests/resources/testrepo2/subdir/subdir2/new.txt +++ /dev/null @@ -1 +0,0 @@ -new file diff --git a/vendor/libgit2/tests/resources/twowaymerge.git/HEAD b/vendor/libgit2/tests/resources/twowaymerge.git/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/vendor/libgit2/tests/resources/twowaymerge.git/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/vendor/libgit2/tests/resources/twowaymerge.git/config b/vendor/libgit2/tests/resources/twowaymerge.git/config deleted file mode 100644 index c53d818dd..000000000 --- a/vendor/libgit2/tests/resources/twowaymerge.git/config +++ /dev/null @@ -1,5 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = true - ignorecase = true diff --git a/vendor/libgit2/tests/resources/twowaymerge.git/description b/vendor/libgit2/tests/resources/twowaymerge.git/description deleted file mode 100644 index 498b267a8..000000000 --- a/vendor/libgit2/tests/resources/twowaymerge.git/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/vendor/libgit2/tests/resources/twowaymerge.git/info/exclude b/vendor/libgit2/tests/resources/twowaymerge.git/info/exclude deleted file mode 100644 index a5196d1be..000000000 --- a/vendor/libgit2/tests/resources/twowaymerge.git/info/exclude +++ /dev/null @@ -1,6 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ diff --git a/vendor/libgit2/tests/resources/twowaymerge.git/objects/0c/8a3f1f3d5f421cf83048c7c73ee3b55a5e0f29 b/vendor/libgit2/tests/resources/twowaymerge.git/objects/0c/8a3f1f3d5f421cf83048c7c73ee3b55a5e0f29 deleted file mode 100644 index 12698affab4238d1a9cd8efe845514523d1a7e4e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 157 zcmV;O0Al}m0iBLZ3c@fH0A1%4?*f*WmzOjF5qE-HPmph`m_}-Pf9n<84#P09)%xf_ z#D~7-4CGAK21&&fQE{SC>5{XJn5_0jyCegSg~i*idFdbv@1B&NI2ct-iGL?isx=eEK0pw diff --git a/vendor/libgit2/tests/resources/twowaymerge.git/objects/10/2dce8e3081f398e4bdd9fd894dc85ac3ca6a67 b/vendor/libgit2/tests/resources/twowaymerge.git/objects/10/2dce8e3081f398e4bdd9fd894dc85ac3ca6a67 deleted file mode 100644 index 3806ee74cf9a9e0f45db0d033bebed587e3dac37..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 54 zcmb9v}7¾TKy4`6‡¶æ š,y’9j§GJì8ÁÇÞb¢‘\Œfõ–5/ Ç^‰8v¹'ö‚ÙËœì`SÆ%[›ë -÷T[ƒ[×úŠ,púüÌsºL6o±Kµœ´5Ø;ŽèÕn÷›-ÿ= ²úÿDà \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/twowaymerge.git/objects/1f/4c0311a24b63f6fc209a59a1e404942d4a5006 b/vendor/libgit2/tests/resources/twowaymerge.git/objects/1f/4c0311a24b63f6fc209a59a1e404942d4a5006 deleted file mode 100644 index 99288fdd7..000000000 --- a/vendor/libgit2/tests/resources/twowaymerge.git/objects/1f/4c0311a24b63f6fc209a59a1e404942d4a5006 +++ /dev/null @@ -1,2 +0,0 @@ -xÍ=Â0 @aæœÂ ²Mê6BlH¬œ ¿m!RqïO¹ë7¼[­‹ rÐ5g°N’Xƒ‹Å±)Eg]ÏDY2c R8xã7Û -ØTáÞÁ­½Rõo8~òœ®Ó¢óºØêèÔ[”™àˆ#¢Ùußjþ;`¼ùÔÙ7ó \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/twowaymerge.git/objects/22/24e191514cb4bd8c566d80dac22dfcb1e9bb83 b/vendor/libgit2/tests/resources/twowaymerge.git/objects/22/24e191514cb4bd8c566d80dac22dfcb1e9bb83 deleted file mode 100644 index 48466ea51..000000000 --- a/vendor/libgit2/tests/resources/twowaymerge.git/objects/22/24e191514cb4bd8c566d80dac22dfcb1e9bb83 +++ /dev/null @@ -1,3 +0,0 @@ -xŽK -Â0@]çsK&¤ ˆ¸Üz‚™4éÛHMïo½‚Û÷àñbY–©‚1tª[JàbŽlɈµâ¥í4vÉ¡±Lâ³ ì'—Õ›·´V`B¦û . -ëÎIöm ï1õZ¨Ç x¯cÙàK­ðhà^^ýÂ+\>?2·aªã.M,Ë°µtTB‹pÖ^kuÐc³¦¿jV_«sFh \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/twowaymerge.git/objects/29/6e56023cdc034d2735fee8c0d85a659d1b07f4 b/vendor/libgit2/tests/resources/twowaymerge.git/objects/29/6e56023cdc034d2735fee8c0d85a659d1b07f4 deleted file mode 100644 index aa3fccdf0c0bc5425c76decb4105a908641c9e44..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 51 zcmb)BU|?ckU~CxZky2sy{o)&6@%5I~<=N}B`*#(-@bv%SvLZz&%#)#d Hr|fzF-?|ht diff --git a/vendor/libgit2/tests/resources/twowaymerge.git/objects/31/51880ae2b363f1c262cf98b750c1f169a0d432 b/vendor/libgit2/tests/resources/twowaymerge.git/objects/31/51880ae2b363f1c262cf98b750c1f169a0d432 deleted file mode 100644 index 235d42bff5f9d890465806df814f5fb954a12429..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 68 zcmV-K0K5Nq0V^p=O;s>5FlI0`FfcPQQAlKXHuur&O&6~@dv|NDE04Ny=t)oTM5tsE aKFMT!k}3EkQ}Icr;gd|qDhU8=`C@}+o*X;? diff --git a/vendor/libgit2/tests/resources/twowaymerge.git/objects/3b/287f8730c81d0b763c2d294618a5e32b67b4f8 b/vendor/libgit2/tests/resources/twowaymerge.git/objects/3b/287f8730c81d0b763c2d294618a5e32b67b4f8 deleted file mode 100644 index 56ddac5ee6ce544f60ff65dcfa1601822f76dcb3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 54 zcmb)5VqjumU~CxZky2sy{o)&6@%5I~<=N}B`*#(-@bv%S!tmz_{}%v( Ch!a`> diff --git a/vendor/libgit2/tests/resources/twowaymerge.git/objects/59/b0cf7d74659e1cdb13305319d6d4ce2733c118 b/vendor/libgit2/tests/resources/twowaymerge.git/objects/59/b0cf7d74659e1cdb13305319d6d4ce2733c118 deleted file mode 100644 index 30b507c06839e5ee67fc272a15916040a7e4dc5c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 65 zcmV-H0KWft0V^p=O;s>7H(@X|FfcPQQAlKXHuur&O&6~@dv|NDE04Ny=t)oTM5tsE XKFKtElIi#)Gw?}fVwD5{Dgsp456~ID diff --git a/vendor/libgit2/tests/resources/twowaymerge.git/objects/6a/b5d28acbf3c3bdff276f7ccfdf29c1520e542f b/vendor/libgit2/tests/resources/twowaymerge.git/objects/6a/b5d28acbf3c3bdff276f7ccfdf29c1520e542f deleted file mode 100644 index ff6a386ac..000000000 --- a/vendor/libgit2/tests/resources/twowaymerge.git/objects/6a/b5d28acbf3c3bdff276f7ccfdf29c1520e542f +++ /dev/null @@ -1 +0,0 @@ -xÎM‚0@a×=Å\@2ýcÜ™¸õeÚ†Rƒåþâܾŗǵ”¹RæÔ¶”@¢Šœ(i$™uOÉ 1ö9Ro"“ ¬9¸à¼x‡-­ ü@¬µcc3;ê-KvHÊ+‡9ÙèÁFe¼{›êO®­Á£ƒ{]b +\>¿òoãܦ}踖+Hm zšàŒ„(Žzl¶ô7 ñ•œF- \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/twowaymerge.git/objects/6c/fca542b55b8b37017e6125a4b8f59a6eae6f11 b/vendor/libgit2/tests/resources/twowaymerge.git/objects/6c/fca542b55b8b37017e6125a4b8f59a6eae6f11 deleted file mode 100644 index 9a969a279bce6d737174d2eea9425b47d9029236..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 68 zcmV-K0K5Nq0V^p=O;s>5FlI0`FfcPQQAlKXHuur&O&6~@dv|NDE04Ny=t)oTM5tsE aKFKtElIi#)Gw?}f;*-q6DhU8_sbZ3D)*Pz< diff --git a/vendor/libgit2/tests/resources/twowaymerge.git/objects/76/5b32c65d38f04c4f287abda055818ec0f26912 b/vendor/libgit2/tests/resources/twowaymerge.git/objects/76/5b32c65d38f04c4f287abda055818ec0f26912 deleted file mode 100644 index 493bbc076b4fec7fb33ff4401945b46b667520d5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 54 zcmbYGMÌV½eMK9¢ÑZˆƒ5ÙæHè¥õ¢#{¦ž¥E´J¶:–î±Ô -·®åÕϲÀéó“Çp¦:n¡‰e>ƒ6-£sH GìÕ®ûfMÔS}ZE² \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/twowaymerge.git/objects/82/bf9a1a10a4b25c1f14c9607b60970705e92545 b/vendor/libgit2/tests/resources/twowaymerge.git/objects/82/bf9a1a10a4b25c1f14c9607b60970705e92545 deleted file mode 100644 index 89b0b9f9b..000000000 --- a/vendor/libgit2/tests/resources/twowaymerge.git/objects/82/bf9a1a10a4b25c1f14c9607b60970705e92545 +++ /dev/null @@ -1 +0,0 @@ -xŽË Â09»Šm€hã_ÖBܸRן„cœþ1-p§yšPKy4RÚ–D›GŒF»ÀJvÉFE>‡1#q²Ž j§ÅÛoimbvSŽŠYSbEr²Š¸»Q"eÓÑ{+üÞ–ºÁ=ÔÖà6Àµ¾bñ+œ>?òœ/ó£-;¡–3ŒÊhœ¬C‚#¢è´g¶ô÷XÄÌyF¤ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/twowaymerge.git/objects/8b/82fb1794cb1c8c7f172ec730a4c2db0ae3e650 b/vendor/libgit2/tests/resources/twowaymerge.git/objects/8b/82fb1794cb1c8c7f172ec730a4c2db0ae3e650 deleted file mode 100644 index 8e9b758ea..000000000 --- a/vendor/libgit2/tests/resources/twowaymerge.git/objects/8b/82fb1794cb1c8c7f172ec730a4c2db0ae3e650 +++ /dev/null @@ -1,3 +0,0 @@ -xν Â0@ajOq ù7BtH´Lp¾ó%A8FÁÙŸ°íW<=ª¥Ì ¬õ‡¶æ x"ÊŽØ$—%1†dÄcÏDNLˆ:Yv=©7®yiÐc -l¤$Ž\b{‰DÂbOd‚Õ9x+ -·6ÕT[ƒ{·úâ‚ œ??yŽ×qnÓ–:ªåƯcÔÞÁQZ«]÷Í–ÿ¨¢¾7 H† \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/twowaymerge.git/objects/9a/40a2f11c191f180c47e54b11567cb3c1e89b30 b/vendor/libgit2/tests/resources/twowaymerge.git/objects/9a/40a2f11c191f180c47e54b11567cb3c1e89b30 deleted file mode 100644 index 1de1224f7533b0ab4dff1b7cf4f9eaa07f92a8b2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 62 zcmV-E0Kxxw0V^p=O;s>7F=a3`FfcPQQAlKXHuur&O&6~@dv|NDE04Ny=t)oTM5tso UKFJ(>lDYUK^RP++0CD0+F~%VoEdT%j diff --git a/vendor/libgit2/tests/resources/twowaymerge.git/objects/9b/219343610c88a1187c996d0dc58330b55cee28 b/vendor/libgit2/tests/resources/twowaymerge.git/objects/9b/219343610c88a1187c996d0dc58330b55cee28 deleted file mode 100644 index 8b64b4381..000000000 --- a/vendor/libgit2/tests/resources/twowaymerge.git/objects/9b/219343610c88a1187c996d0dc58330b55cee28 +++ /dev/null @@ -1,2 +0,0 @@ -xÏKj1Ьç½óÊFj}Z‚¼3²Ê ¤VÏÇdFA#ß?’\ ËzÅu]—FÓSo" ‰JðÆ& ‚^˜‚Ž,9$G’Eéd)7|¦&[6”(FU"&Žh< ¯FÉc4AÆ¿>"ZÑQ;m9Û\;ïKP%1b9k‰93¤GŸkƒw®½Ãënõ£¬iƒçý[îÓuZúüÈ®ë hã¬"RÞÂY¥†C[]þ=0¼I›rKÏp—¶÷óO:Á²õ -»pÝʯ _¾(c‡ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/twowaymerge.git/objects/9f/e06a50f4d1634d6c6879854d01d80857388706 b/vendor/libgit2/tests/resources/twowaymerge.git/objects/9f/e06a50f4d1634d6c6879854d01d80857388706 deleted file mode 100644 index 055de01580a58db62f907e09c049224b8be26e26..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 65 zcmV-H0KWft0V^p=O;s>7H(@X|FfcPQQAlKXHuur&O&6~@dv|NDE04Ny=t)oTM5tsE XKFMT!k}3Ek)9^{AW0eE|CplEk5=R<2 diff --git a/vendor/libgit2/tests/resources/twowaymerge.git/objects/a4/1a49f8f5cd9b6cb14a076bf8394881ed0b4d19 b/vendor/libgit2/tests/resources/twowaymerge.git/objects/a4/1a49f8f5cd9b6cb14a076bf8394881ed0b4d19 deleted file mode 100644 index cb4d34e77..000000000 --- a/vendor/libgit2/tests/resources/twowaymerge.git/objects/a4/1a49f8f5cd9b6cb14a076bf8394881ed0b4d19 +++ /dev/null @@ -1,3 +0,0 @@ -xν Â0@ajOq Ýù7'!D‡DËöÙ A$FÁÙŸ°íW<=©ó<5ÐÚÚZ -8N(CÈÁzÇ…$'2!Î>[):#D½zǵ, zŽ £MÚ d…=†ä‘t…µ³NÅ­=ê -w©­Á­ƒk}å9.púüä9^Æ©=¶ÔIÏ@ÆY ž‰áˆ=¢ÚußlåÔ°Dâ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/twowaymerge.git/objects/a9/53a018c5b10b20c86e69fef55ebc8ad4c5a417 b/vendor/libgit2/tests/resources/twowaymerge.git/objects/a9/53a018c5b10b20c86e69fef55ebc8ad4c5a417 deleted file mode 100644 index 8235f1839..000000000 --- a/vendor/libgit2/tests/resources/twowaymerge.git/objects/a9/53a018c5b10b20c86e69fef55ebc8ad4c5a417 +++ /dev/null @@ -1 +0,0 @@ -xÍJÄ0…]÷)înV3$¹is"îÁ•Oû“NŶ’ɼ¿ñ\žï|8²¯ëÒ!dzèÍ ªÔdXG/ޫϹp*‰¢C³X³ˆº@ZÂ8|•f[VŸ0HD™H“E]6¯”g¶I#g«*ñÏ­9UEæHÆH!MḦÕñh‚ºR¦¡Üûuoð.{ïðz—ýSײÁãí‡|ÌÏóÒ¯w¾È¾>Ç1º4‘C8;rn8èq«Û¿†7k³·²ÉNui·~þM§áÜ^­ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/twowaymerge.git/objects/a9/cce3cd1b3efbda5b1f4a6dcc3f1570b2d3d74c b/vendor/libgit2/tests/resources/twowaymerge.git/objects/a9/cce3cd1b3efbda5b1f4a6dcc3f1570b2d3d74c deleted file mode 100644 index 4da7e826a..000000000 --- a/vendor/libgit2/tests/resources/twowaymerge.git/objects/a9/cce3cd1b3efbda5b1f4a6dcc3f1570b2d3d74c +++ /dev/null @@ -1 +0,0 @@ -x+)JMU044c040031QHdx6÷ÑìM¯9{wk®+ºqèIOðD¨d6>É|’¹X%>½9j \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/twowaymerge.git/objects/bd/1732c43c68d712ad09e1d872b9be6d4b9efdc4 b/vendor/libgit2/tests/resources/twowaymerge.git/objects/bd/1732c43c68d712ad09e1d872b9be6d4b9efdc4 deleted file mode 100644 index b9b60122d7044e8382ae6c6339d126dfc7524424..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 158 zcmV;P0Ac@l0iBLP4uUWc06q5=`vJ+e+ofw_j5ianzMw2EV1ybh{};dDb&{EkmU*5k zIOh*_O$kEF9XV~eC&}p5XD1nkRU&1ZspssS)hvWwG-#ld zsAG!i!Lrbl2Z{Sv5{TvrKe}3dST!*QSTi0lrFJOs1wgE}th=OQ#x^LF> McfhFm0ySSn$XT09J^%m! diff --git a/vendor/libgit2/tests/resources/twowaymerge.git/objects/c3/7a783c20d92ac92362a78a32860f7eebf938ef b/vendor/libgit2/tests/resources/twowaymerge.git/objects/c3/7a783c20d92ac92362a78a32860f7eebf938ef deleted file mode 100644 index 041e890abacd84fbfa028b11891f671377b52fe2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 158 zcmV;P0Ac@l0iDiG4uUWcKw;NC#auu#(;ucJ#<(+a>j~On0F6+C<^JLo+9<bR_^!dqiyo`@JZMl&$pMhNP$c%yEh!N53x^Gtf MJ75;`1v)83>3AheTmS$7 diff --git a/vendor/libgit2/tests/resources/twowaymerge.git/objects/cb/dd40facab1682754eb67f7a43f29e672903cf6 b/vendor/libgit2/tests/resources/twowaymerge.git/objects/cb/dd40facab1682754eb67f7a43f29e672903cf6 deleted file mode 100644 index ccb156d889008fbd24fd13354e0e50183c0cdeec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 51 zcmb)BU|?ckU~CxZky2sy{o)&6@%5I~<=N}B`*#(-@bv%SvLeMS%#)#} HUUmln;5ig0 diff --git a/vendor/libgit2/tests/resources/twowaymerge.git/objects/cd/f97fd3bb48eb3827638bb33d208f5fd32d0aa6 b/vendor/libgit2/tests/resources/twowaymerge.git/objects/cd/f97fd3bb48eb3827638bb33d208f5fd32d0aa6 deleted file mode 100644 index 0e028dc019f5399a42380532e9d084f02c6dc0fe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 158 zcmV;P0Ac@l0iBLP4#FT106p`H{eTSxWNBiIHxsYEU|E*7MvAHQ|JE;fnZq0=!?l#T zfidpTRuM=8abhGvZw;j^!X7iBj8V(Q0Cp zOgZ(*4^Gk6rnhkP$+Wor9Ck-NgXE2^a(b diff --git a/vendor/libgit2/tests/resources/twowaymerge.git/objects/d9/acdc7ae7632adfeec67fa73c1e343cf4d1f47e b/vendor/libgit2/tests/resources/twowaymerge.git/objects/d9/acdc7ae7632adfeec67fa73c1e343cf4d1f47e deleted file mode 100644 index de94528a4..000000000 --- a/vendor/libgit2/tests/resources/twowaymerge.git/objects/d9/acdc7ae7632adfeec67fa73c1e343cf4d1f47e +++ /dev/null @@ -1 +0,0 @@ -x+)JMU044c040031QHdx6÷ÑìM¯9{wk®+ºqèIOðD¨d>É4|’éX%:79U \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/twowaymerge.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 b/vendor/libgit2/tests/resources/twowaymerge.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 deleted file mode 100644 index 711223894375fe1186ac5bfffdc48fb1fa1e65cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15 WcmbhkP$+WorV%4mCGBwm>4qc+yw!^%@`H{ diff --git a/vendor/libgit2/tests/resources/twowaymerge.git/refs/heads/first-branch b/vendor/libgit2/tests/resources/twowaymerge.git/refs/heads/first-branch deleted file mode 100644 index ef0dead7f..000000000 --- a/vendor/libgit2/tests/resources/twowaymerge.git/refs/heads/first-branch +++ /dev/null @@ -1 +0,0 @@ -2224e191514cb4bd8c566d80dac22dfcb1e9bb83 diff --git a/vendor/libgit2/tests/resources/twowaymerge.git/refs/heads/master b/vendor/libgit2/tests/resources/twowaymerge.git/refs/heads/master deleted file mode 100644 index ebf18f58e..000000000 --- a/vendor/libgit2/tests/resources/twowaymerge.git/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -1c30b88f5f3ee66d78df6520a7de9e89b890818b diff --git a/vendor/libgit2/tests/resources/twowaymerge.git/refs/heads/second-branch b/vendor/libgit2/tests/resources/twowaymerge.git/refs/heads/second-branch deleted file mode 100644 index 586a14a84..000000000 --- a/vendor/libgit2/tests/resources/twowaymerge.git/refs/heads/second-branch +++ /dev/null @@ -1 +0,0 @@ -9b219343610c88a1187c996d0dc58330b55cee28 diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/HEAD b/vendor/libgit2/tests/resources/typechanges/.gitted/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/vendor/libgit2/tests/resources/typechanges/.gitted/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/config b/vendor/libgit2/tests/resources/typechanges/.gitted/config deleted file mode 100644 index 4cc6e1ddf..000000000 --- a/vendor/libgit2/tests/resources/typechanges/.gitted/config +++ /dev/null @@ -1,12 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true -[submodule "e"] - url = /Users/rb/src/libgit2/tests-clar/resources/submod2_target/.git -[submodule "d"] - url = /Users/rb/src/libgit2/tests-clar/resources/submod2_target/.git -[submodule "b"] - url = /Users/rb/src/libgit2/tests-clar/resources/submod2_target/.git diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/description b/vendor/libgit2/tests/resources/typechanges/.gitted/description deleted file mode 100644 index 498b267a8..000000000 --- a/vendor/libgit2/tests/resources/typechanges/.gitted/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/index b/vendor/libgit2/tests/resources/typechanges/.gitted/index deleted file mode 100644 index 4f6d12a3b9e8c3ea13c0ef5fb2adae059a268558..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 184 zcmZ?q402{*U|<5_fSguAAk6@y`4|{j7{hO=FfcSOVPIhV3X~E7$v>O>X!fRy*POk( zHP@9#-8l55CwL+Qw_bW?Np5~hX-;Y}ND&YOWEa0jrXl9FEkiYrm1*XST|3`A;Qa7= x`D@1?0bdSkzumc=fiuX}(Z$zQFE@o@&AC8_333HL=4?3eLiSXf=Zt$bX8^2wJUIXW diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/info/exclude b/vendor/libgit2/tests/resources/typechanges/.gitted/info/exclude deleted file mode 100644 index a5196d1be..000000000 --- a/vendor/libgit2/tests/resources/typechanges/.gitted/info/exclude +++ /dev/null @@ -1,6 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/b/HEAD b/vendor/libgit2/tests/resources/typechanges/.gitted/modules/b/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/b/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/b/config b/vendor/libgit2/tests/resources/typechanges/.gitted/modules/b/config deleted file mode 100644 index f57cd4a6f..000000000 --- a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/b/config +++ /dev/null @@ -1,13 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - worktree = ../../../b - ignorecase = true -[remote "origin"] - fetch = +refs/heads/*:refs/remotes/origin/* - url = /Users/rb/src/libgit2/tests-clar/resources/submod2_target/.git -[branch "master"] - remote = origin - merge = refs/heads/master diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/b/description b/vendor/libgit2/tests/resources/typechanges/.gitted/modules/b/description deleted file mode 100644 index 498b267a8..000000000 --- a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/b/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/b/index b/vendor/libgit2/tests/resources/typechanges/.gitted/modules/b/index deleted file mode 100644 index c16a026b76c1227c89d3e2a22d6bbcea87111f70..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 192 zcmZ?q402{*U|<5_fb4=H5m@#9PR z@6he*tHmzJ568efthpPQeOnN|rhPvmH~)nW#7Z)=&SM+(2baNZKWO%wnxEjkMT diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/b/info/exclude b/vendor/libgit2/tests/resources/typechanges/.gitted/modules/b/info/exclude deleted file mode 100644 index a5196d1be..000000000 --- a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/b/info/exclude +++ /dev/null @@ -1,6 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/b/objects/06/362fe2fdb7010d0e447b4fb450d405420479a1 b/vendor/libgit2/tests/resources/typechanges/.gitted/modules/b/objects/06/362fe2fdb7010d0e447b4fb450d405420479a1 deleted file mode 100644 index f4b7094c52b2b13a955016da7ed894453ab9813c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 55 zcmV-70LcG%0V^p=O;s?qU@$Z=Ff%bx2y%6F@paWJsVHHn;4Pm1^~H}b<-bF>ueUmL NNYq=`3jkt>5$jr-7%cz* diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/b/objects/0e/6a3ca48bd47cfe67681acf39aa0b10a0b92484 b/vendor/libgit2/tests/resources/typechanges/.gitted/modules/b/objects/0e/6a3ca48bd47cfe67681acf39aa0b10a0b92484 deleted file mode 100644 index 56c845e49de66164d68d3f7439e2aedcb220c498..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 53 zcmV-50LuS(0ZYosPf{>3U`ELH%bM1{1>oK%I9e1+Wnl+3hBh0HvK;?g7_r!*(E Ln2QSlfR+#vlJ6KL diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/b/objects/17/d0ece6e96460a06592d9d9d000de37ba4232c5 b/vendor/libgit2/tests/resources/typechanges/.gitted/modules/b/objects/17/d0ece6e96460a06592d9d9d000de37ba4232c5 deleted file mode 100644 index bd179b5f5406f12f948b97d871c763cc0e10b06f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 93 zcmV-j0HXhR0V^p=O;xZkU@$Z=Ff%bx2y%6F@paWJsVHHn;4Pm1^~H}b<-bF>ueUmL zNYq=`3#uwDGbc5^BtJekKP5A*l7TPFW=Z#znt$mTQs*sKaSJTisnP-fi0mQg3zH~C diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/b/objects/41/bd4bc3df978de695f67ace64c560913da11653 b/vendor/libgit2/tests/resources/typechanges/.gitted/modules/b/objects/41/bd4bc3df978de695f67ace64c560913da11653 deleted file mode 100644 index ccf49bd15cac3c2bac13fa644f20924a6928dead..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 163 zcmV;U09^lg0hNx~4Z<)G1^IRr+W=^NtQ|`T0VU9Zv)&w14&*rf;}+2TJYIve6?|_sH;Eh(2DY7+$k{q!!fw!> z(TR3ZR66Ul7xvZ-v-q#0c>kLs07~zTmQMI-8)u#UYRIi-p RZG8X>-X+A`MI6N*Dz6QY4Oxv{b!#F?R3>Zey&Eh^ zLz#U_A&YRfX{+!#kAs&5Uc8K4;a=nOJGbeKx3rZ94B99}B8703PD;_&{;zfVZz|>;+Qv+EoOhlpLYZ1IW9p#9+rkUf;jILVt%D7~a-( zHi)r&*iZ%W*dq%vm(oN!T~(-~7mAT<%e|zi#OU5_=*u97N%F)=dM#H`s@SPCR?3Xz zYe>>UAWW_u_S^>i9Q&@z0(V`y4!Di!`!U<|m_B)1zaXR>5o?JA7hk-0Cq4h{RR3GL V-?ucIUk@ueUmL zNYq=`3#uwDGbc5^BtJekKP5A*lA&VW?_0N)ENv?9b#1W-nHoB8!Ax%es2L;m5j-ce diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/b/objects/78/0d7397f5e8f8f477fb55b7af3accc2154b2d4a b/vendor/libgit2/tests/resources/typechanges/.gitted/modules/b/objects/78/0d7397f5e8f8f477fb55b7af3accc2154b2d4a deleted file mode 100644 index 6d27af8a8..000000000 --- a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/b/objects/78/0d7397f5e8f8f477fb55b7af3accc2154b2d4a +++ /dev/null @@ -1,2 +0,0 @@ -x-Ë1Â0 FaæžâßØ0pŽÀìÄÐ(N-ÅöÐÛÓ¡Ò“¾é±ãq]>ksÅ*š? |m“‡Õçiª@ÛÖý¶¼m»¨V£…£'©î`)”.Ø-1¨ x -u„xãòt(+ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/b/objects/78/9efbdadaa4a582778d4584385495559ea0994b b/vendor/libgit2/tests/resources/typechanges/.gitted/modules/b/objects/78/9efbdadaa4a582778d4584385495559ea0994b deleted file mode 100644 index 17458840b..000000000 --- a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/b/objects/78/9efbdadaa4a582778d4584385495559ea0994b +++ /dev/null @@ -1,2 +0,0 @@ -x Œ± …0 )ÞŠ?= ¥ÉÄNŠlO¤k®¸‹jÛúÿ¹8&„«¨ ãr ” -ïqJWñ°7¾B<ÉáöfÙìK8­#Q1C-‘"eª·Ì«£Š°ð>¼'@ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/b/objects/88/34b635dd468a83cb012f6feace968c1c9f5d6e b/vendor/libgit2/tests/resources/typechanges/.gitted/modules/b/objects/88/34b635dd468a83cb012f6feace968c1c9f5d6e deleted file mode 100644 index 83cc29fb159ab59087d724473642a0057d841358..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 81 zcmV-X0IvUd0ZYosPf{?mWC+Q~ELH%bM1{1>oK%I9e1+Wnl+3hBh0HvK;?g7_r!*(E nn9H+7Au*>YH8G`9AtSL^p*TM`RRO58B)_OqkBbWc`{EjQ6-gx7 diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/b/objects/d0/5f2cd5cc77addf68ed6f50d622c9a4f732e6c5 b/vendor/libgit2/tests/resources/typechanges/.gitted/modules/b/objects/d0/5f2cd5cc77addf68ed6f50d622c9a4f732e6c5 deleted file mode 100644 index 55bda40ef277279310f6bf3122497c14602374d6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 93 zcmV-j0HXhR0V^p=O;xZkU@$Z=Ff%bx2y%6F@paWJsVHHn;4Pm1^~H}b<-bF>ueUmL zNYq=`3#uwDGbc5^BtJekKP5A*lA*(7o9SJ*uIAH>`uVTUP3w`FADagNj^84oNOvn! diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/b/packed-refs b/vendor/libgit2/tests/resources/typechanges/.gitted/modules/b/packed-refs deleted file mode 100644 index 5a4ebc47c..000000000 --- a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/b/packed-refs +++ /dev/null @@ -1,2 +0,0 @@ -# pack-refs with: peeled -480095882d281ed676fe5b863569520e54a7d5c0 refs/remotes/origin/master diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/b/refs/heads/master b/vendor/libgit2/tests/resources/typechanges/.gitted/modules/b/refs/heads/master deleted file mode 100644 index e12c44d7a..000000000 --- a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/b/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -480095882d281ed676fe5b863569520e54a7d5c0 diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/b/refs/remotes/origin/HEAD b/vendor/libgit2/tests/resources/typechanges/.gitted/modules/b/refs/remotes/origin/HEAD deleted file mode 100644 index 6efe28fff..000000000 --- a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/b/refs/remotes/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/remotes/origin/master diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/d/HEAD b/vendor/libgit2/tests/resources/typechanges/.gitted/modules/d/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/d/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/d/config b/vendor/libgit2/tests/resources/typechanges/.gitted/modules/d/config deleted file mode 100644 index 42e1bddda..000000000 --- a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/d/config +++ /dev/null @@ -1,13 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - worktree = ../../../d - ignorecase = true -[remote "origin"] - fetch = +refs/heads/*:refs/remotes/origin/* - url = /Users/rb/src/libgit2/tests-clar/resources/submod2_target/.git -[branch "master"] - remote = origin - merge = refs/heads/master diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/d/description b/vendor/libgit2/tests/resources/typechanges/.gitted/modules/d/description deleted file mode 100644 index 498b267a8..000000000 --- a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/d/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/d/index b/vendor/libgit2/tests/resources/typechanges/.gitted/modules/d/index deleted file mode 100644 index 86d0266e8f0967e1cff2b8b47b0983926e7517f0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 192 zcmZ?q402{*U|<5_fb1d=n*m1iF)*+&hVR_Vz|gpafr0TWP)Y=dvnqItr+(-K`P366=EfyhD xL+34+>CM2GmYI_pUy>i6o1c=IRtYjM&7ueUmL NNYq=`3jkt>5$jr-7%cz* diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/d/objects/0e/6a3ca48bd47cfe67681acf39aa0b10a0b92484 b/vendor/libgit2/tests/resources/typechanges/.gitted/modules/d/objects/0e/6a3ca48bd47cfe67681acf39aa0b10a0b92484 deleted file mode 100644 index 56c845e49de66164d68d3f7439e2aedcb220c498..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 53 zcmV-50LuS(0ZYosPf{>3U`ELH%bM1{1>oK%I9e1+Wnl+3hBh0HvK;?g7_r!*(E Ln2QSlfR+#vlJ6KL diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/d/objects/17/d0ece6e96460a06592d9d9d000de37ba4232c5 b/vendor/libgit2/tests/resources/typechanges/.gitted/modules/d/objects/17/d0ece6e96460a06592d9d9d000de37ba4232c5 deleted file mode 100644 index bd179b5f5406f12f948b97d871c763cc0e10b06f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 93 zcmV-j0HXhR0V^p=O;xZkU@$Z=Ff%bx2y%6F@paWJsVHHn;4Pm1^~H}b<-bF>ueUmL zNYq=`3#uwDGbc5^BtJekKP5A*l7TPFW=Z#znt$mTQs*sKaSJTisnP-fi0mQg3zH~C diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/d/objects/41/bd4bc3df978de695f67ace64c560913da11653 b/vendor/libgit2/tests/resources/typechanges/.gitted/modules/d/objects/41/bd4bc3df978de695f67ace64c560913da11653 deleted file mode 100644 index ccf49bd15cac3c2bac13fa644f20924a6928dead..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 163 zcmV;U09^lg0hNx~4Z<)G1^IRr+W=^NtQ|`T0VU9Zv)&w14&*rf;}+2TJYIve6?|_sH;Eh(2DY7+$k{q!!fw!> z(TR3ZR66Ul7xvZ-v-q#0c>kLs07~zTmQMI-8)u#UYRIi-p RZG8X>-X+A`MI6N*Dz6QY4Oxv{b!#F?R3>Zey&Eh^ zLz#U_A&YRfX{+!#kAs&5Uc8K4;a=nOJGbeKx3rZ94B99}B8703PD;_&{;zfVZz|>;+Qv+EoOhlpLYZ1IW9p#9+rkUf;jILVt%D7~a-( zHi)r&*iZ%W*dq%vm(oN!T~(-~7mAT<%e|zi#OU5_=*u97N%F)=dM#H`s@SPCR?3Xz zYe>>UAWW_u_S^>i9Q&@z0(V`y4!Di!`!U<|m_B)1zaXR>5o?JA7hk-0Cq4h{RR3GL V-?ucIUk@ueUmL zNYq=`3#uwDGbc5^BtJekKP5A*lA&VW?_0N)ENv?9b#1W-nHoB8!Ax%es2L;m5j-ce diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/d/objects/78/0d7397f5e8f8f477fb55b7af3accc2154b2d4a b/vendor/libgit2/tests/resources/typechanges/.gitted/modules/d/objects/78/0d7397f5e8f8f477fb55b7af3accc2154b2d4a deleted file mode 100644 index 6d27af8a8..000000000 --- a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/d/objects/78/0d7397f5e8f8f477fb55b7af3accc2154b2d4a +++ /dev/null @@ -1,2 +0,0 @@ -x-Ë1Â0 FaæžâßØ0pŽÀìÄÐ(N-ÅöÐÛÓ¡Ò“¾é±ãq]>ksÅ*š? |m“‡Õçiª@ÛÖý¶¼m»¨V£…£'©î`)”.Ø-1¨ x -u„xãòt(+ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/d/objects/78/9efbdadaa4a582778d4584385495559ea0994b b/vendor/libgit2/tests/resources/typechanges/.gitted/modules/d/objects/78/9efbdadaa4a582778d4584385495559ea0994b deleted file mode 100644 index 17458840b..000000000 --- a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/d/objects/78/9efbdadaa4a582778d4584385495559ea0994b +++ /dev/null @@ -1,2 +0,0 @@ -x Œ± …0 )ÞŠ?= ¥ÉÄNŠlO¤k®¸‹jÛúÿ¹8&„«¨ ãr ” -ïqJWñ°7¾B<ÉáöfÙìK8­#Q1C-‘"eª·Ì«£Š°ð>¼'@ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/d/objects/88/34b635dd468a83cb012f6feace968c1c9f5d6e b/vendor/libgit2/tests/resources/typechanges/.gitted/modules/d/objects/88/34b635dd468a83cb012f6feace968c1c9f5d6e deleted file mode 100644 index 83cc29fb159ab59087d724473642a0057d841358..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 81 zcmV-X0IvUd0ZYosPf{?mWC+Q~ELH%bM1{1>oK%I9e1+Wnl+3hBh0HvK;?g7_r!*(E nn9H+7Au*>YH8G`9AtSL^p*TM`RRO58B)_OqkBbWc`{EjQ6-gx7 diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/d/objects/d0/5f2cd5cc77addf68ed6f50d622c9a4f732e6c5 b/vendor/libgit2/tests/resources/typechanges/.gitted/modules/d/objects/d0/5f2cd5cc77addf68ed6f50d622c9a4f732e6c5 deleted file mode 100644 index 55bda40ef277279310f6bf3122497c14602374d6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 93 zcmV-j0HXhR0V^p=O;xZkU@$Z=Ff%bx2y%6F@paWJsVHHn;4Pm1^~H}b<-bF>ueUmL zNYq=`3#uwDGbc5^BtJekKP5A*lA*(7o9SJ*uIAH>`uVTUP3w`FADagNj^84oNOvn! diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/d/packed-refs b/vendor/libgit2/tests/resources/typechanges/.gitted/modules/d/packed-refs deleted file mode 100644 index 5a4ebc47c..000000000 --- a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/d/packed-refs +++ /dev/null @@ -1,2 +0,0 @@ -# pack-refs with: peeled -480095882d281ed676fe5b863569520e54a7d5c0 refs/remotes/origin/master diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/d/refs/heads/master b/vendor/libgit2/tests/resources/typechanges/.gitted/modules/d/refs/heads/master deleted file mode 100644 index e12c44d7a..000000000 --- a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/d/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -480095882d281ed676fe5b863569520e54a7d5c0 diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/d/refs/remotes/origin/HEAD b/vendor/libgit2/tests/resources/typechanges/.gitted/modules/d/refs/remotes/origin/HEAD deleted file mode 100644 index 6efe28fff..000000000 --- a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/d/refs/remotes/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/remotes/origin/master diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/e/HEAD b/vendor/libgit2/tests/resources/typechanges/.gitted/modules/e/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/e/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/e/config b/vendor/libgit2/tests/resources/typechanges/.gitted/modules/e/config deleted file mode 100644 index 89b3b9b4f..000000000 --- a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/e/config +++ /dev/null @@ -1,13 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - worktree = ../../../e - ignorecase = true -[remote "origin"] - fetch = +refs/heads/*:refs/remotes/origin/* - url = /Users/rb/src/libgit2/tests-clar/resources/submod2_target/.git -[branch "master"] - remote = origin - merge = refs/heads/master diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/e/description b/vendor/libgit2/tests/resources/typechanges/.gitted/modules/e/description deleted file mode 100644 index 498b267a8..000000000 --- a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/e/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/e/index b/vendor/libgit2/tests/resources/typechanges/.gitted/modules/e/index deleted file mode 100644 index cd6e2da6cc021f0c966194ad77016ce3e77afab4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 192 zcmZ?q402{*U|<5_fb3#9Ak6@y`4|{j7{hk~#Tu6|Ffe`vN{Ik*Rt0bI^sg^|d@27O zx_!OXnM0!9x?T)iL9UK2zOH&D6(t}uKmcYAjE0&gk7izG#k}9QZY^2bRNm{_Vi7Vm xbl!rQ-VA(cnK`NPCHe8W`6-!cl_2w;@A!20!}=?y)2l-E8c1%Qp1|-&8UUa!IO_la diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/e/info/exclude b/vendor/libgit2/tests/resources/typechanges/.gitted/modules/e/info/exclude deleted file mode 100644 index a5196d1be..000000000 --- a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/e/info/exclude +++ /dev/null @@ -1,6 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/e/objects/06/362fe2fdb7010d0e447b4fb450d405420479a1 b/vendor/libgit2/tests/resources/typechanges/.gitted/modules/e/objects/06/362fe2fdb7010d0e447b4fb450d405420479a1 deleted file mode 100644 index f4b7094c52b2b13a955016da7ed894453ab9813c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 55 zcmV-70LcG%0V^p=O;s?qU@$Z=Ff%bx2y%6F@paWJsVHHn;4Pm1^~H}b<-bF>ueUmL NNYq=`3jkt>5$jr-7%cz* diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/e/objects/0e/6a3ca48bd47cfe67681acf39aa0b10a0b92484 b/vendor/libgit2/tests/resources/typechanges/.gitted/modules/e/objects/0e/6a3ca48bd47cfe67681acf39aa0b10a0b92484 deleted file mode 100644 index 56c845e49de66164d68d3f7439e2aedcb220c498..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 53 zcmV-50LuS(0ZYosPf{>3U`ELH%bM1{1>oK%I9e1+Wnl+3hBh0HvK;?g7_r!*(E Ln2QSlfR+#vlJ6KL diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/e/objects/17/d0ece6e96460a06592d9d9d000de37ba4232c5 b/vendor/libgit2/tests/resources/typechanges/.gitted/modules/e/objects/17/d0ece6e96460a06592d9d9d000de37ba4232c5 deleted file mode 100644 index bd179b5f5406f12f948b97d871c763cc0e10b06f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 93 zcmV-j0HXhR0V^p=O;xZkU@$Z=Ff%bx2y%6F@paWJsVHHn;4Pm1^~H}b<-bF>ueUmL zNYq=`3#uwDGbc5^BtJekKP5A*l7TPFW=Z#znt$mTQs*sKaSJTisnP-fi0mQg3zH~C diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/e/objects/41/bd4bc3df978de695f67ace64c560913da11653 b/vendor/libgit2/tests/resources/typechanges/.gitted/modules/e/objects/41/bd4bc3df978de695f67ace64c560913da11653 deleted file mode 100644 index ccf49bd15cac3c2bac13fa644f20924a6928dead..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 163 zcmV;U09^lg0hNx~4Z<)G1^IRr+W=^NtQ|`T0VU9Zv)&w14&*rf;}+2TJYIve6?|_sH;Eh(2DY7+$k{q!!fw!> z(TR3ZR66Ul7xvZ-v-q#0c>kLs07~zTmQMI-8)u#UYRIi-p RZG8X>-X+A`MI6N*Dz6QY4Oxv{b!#F?R3>Zey&Eh^ zLz#U_A&YRfX{+!#kAs&5Uc8K4;a=nOJGbeKx3rZ94B99}B8703PD;_&{;zfVZz|>;+Qv+EoOhlpLYZ1IW9p#9+rkUf;jILVt%D7~a-( zHi)r&*iZ%W*dq%vm(oN!T~(-~7mAT<%e|zi#OU5_=*u97N%F)=dM#H`s@SPCR?3Xz zYe>>UAWW_u_S^>i9Q&@z0(V`y4!Di!`!U<|m_B)1zaXR>5o?JA7hk-0Cq4h{RR3GL V-?ucIUk@ueUmL zNYq=`3#uwDGbc5^BtJekKP5A*lA&VW?_0N)ENv?9b#1W-nHoB8!Ax%es2L;m5j-ce diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/e/objects/78/0d7397f5e8f8f477fb55b7af3accc2154b2d4a b/vendor/libgit2/tests/resources/typechanges/.gitted/modules/e/objects/78/0d7397f5e8f8f477fb55b7af3accc2154b2d4a deleted file mode 100644 index 6d27af8a8..000000000 --- a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/e/objects/78/0d7397f5e8f8f477fb55b7af3accc2154b2d4a +++ /dev/null @@ -1,2 +0,0 @@ -x-Ë1Â0 FaæžâßØ0pŽÀìÄÐ(N-ÅöÐÛÓ¡Ò“¾é±ãq]>ksÅ*š? |m“‡Õçiª@ÛÖý¶¼m»¨V£…£'©î`)”.Ø-1¨ x -u„xãòt(+ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/e/objects/78/9efbdadaa4a582778d4584385495559ea0994b b/vendor/libgit2/tests/resources/typechanges/.gitted/modules/e/objects/78/9efbdadaa4a582778d4584385495559ea0994b deleted file mode 100644 index 17458840b..000000000 --- a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/e/objects/78/9efbdadaa4a582778d4584385495559ea0994b +++ /dev/null @@ -1,2 +0,0 @@ -x Œ± …0 )ÞŠ?= ¥ÉÄNŠlO¤k®¸‹jÛúÿ¹8&„«¨ ãr ” -ïqJWñ°7¾B<ÉáöfÙìK8­#Q1C-‘"eª·Ì«£Š°ð>¼'@ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/e/objects/88/34b635dd468a83cb012f6feace968c1c9f5d6e b/vendor/libgit2/tests/resources/typechanges/.gitted/modules/e/objects/88/34b635dd468a83cb012f6feace968c1c9f5d6e deleted file mode 100644 index 83cc29fb159ab59087d724473642a0057d841358..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 81 zcmV-X0IvUd0ZYosPf{?mWC+Q~ELH%bM1{1>oK%I9e1+Wnl+3hBh0HvK;?g7_r!*(E nn9H+7Au*>YH8G`9AtSL^p*TM`RRO58B)_OqkBbWc`{EjQ6-gx7 diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/e/objects/d0/5f2cd5cc77addf68ed6f50d622c9a4f732e6c5 b/vendor/libgit2/tests/resources/typechanges/.gitted/modules/e/objects/d0/5f2cd5cc77addf68ed6f50d622c9a4f732e6c5 deleted file mode 100644 index 55bda40ef277279310f6bf3122497c14602374d6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 93 zcmV-j0HXhR0V^p=O;xZkU@$Z=Ff%bx2y%6F@paWJsVHHn;4Pm1^~H}b<-bF>ueUmL zNYq=`3#uwDGbc5^BtJekKP5A*lA*(7o9SJ*uIAH>`uVTUP3w`FADagNj^84oNOvn! diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/e/packed-refs b/vendor/libgit2/tests/resources/typechanges/.gitted/modules/e/packed-refs deleted file mode 100644 index 5a4ebc47c..000000000 --- a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/e/packed-refs +++ /dev/null @@ -1,2 +0,0 @@ -# pack-refs with: peeled -480095882d281ed676fe5b863569520e54a7d5c0 refs/remotes/origin/master diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/e/refs/heads/master b/vendor/libgit2/tests/resources/typechanges/.gitted/modules/e/refs/heads/master deleted file mode 100644 index e12c44d7a..000000000 --- a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/e/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -480095882d281ed676fe5b863569520e54a7d5c0 diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/e/refs/remotes/origin/HEAD b/vendor/libgit2/tests/resources/typechanges/.gitted/modules/e/refs/remotes/origin/HEAD deleted file mode 100644 index 6efe28fff..000000000 --- a/vendor/libgit2/tests/resources/typechanges/.gitted/modules/e/refs/remotes/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/remotes/origin/master diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/objects/0d/78578795b7ca49fd8df6c4b6d27c5c02d991d8 b/vendor/libgit2/tests/resources/typechanges/.gitted/objects/0d/78578795b7ca49fd8df6c4b6d27c5c02d991d8 deleted file mode 100644 index f2d02f4f727eabaf687dd4d230352cb69de50791..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 76 zcmV-S0JHyi0ZYosPf{>6G-8M@E=|hKPbtkwRZvP&isj-gNG!=vuvJLn;w&x70W$RT i^dU-&;!6^X(o;+H_0ls-xRCXwAn8jXpbr4ysU@frO(UKF diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/objects/0e/7ed140b514b8cae23254cb8656fe1674403aff b/vendor/libgit2/tests/resources/typechanges/.gitted/objects/0e/7ed140b514b8cae23254cb8656fe1674403aff deleted file mode 100644 index 527964c924057d15b12a470ab6b991431c464277..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 162 zcmV;T0A2rh0hNwhYQr!P0Q;>|EabaItFGx?{h_=k)tAyLMSd5r4Wb83Ax(fV)E7erKVd4mLg%4K#_c6Rw|;J{9seW zq7f}&E!nY2XP@^5zvpr2vcOZ9stxW<9@DGOr+npo{RX6g9YzWReA-~Gx#;!RFZI8r Q`I*x;=>a!1Zx(+y0d11qirX*{g?p{180bxW;S$TTvne#tq;4@yHc-55?}B7c)~1fN*xFt4 z_MMSKHZ>K2A@X<5{K>S|z*4FYMcoWQKMf8C2R%MpINBcC#ymAn!ds0!g6k0hJJ&Zj zK&@Zt=KPFM*1CJbL5QM8_=9JEJAkXTgVMgV6&NJ9m#%`Q``1MG_*sYuLimvvhwu3| z+wH$)hx_aiZqFB(k4MNUTKvkgDXJJ2@f2Ne_v;B7&F867Lj4atWWTe`L-BRJ&43CZ zbde+?nWEeL{^!(H`U27^y4mk`dGQXjYwA&v!&}p~G#r|q9cPQL$p3i4_DElJH#DxX z9Srt_<3f0xG;>;>v;A2x#*5_jeG+10Pp8HWA{>v%JJRcxcEa~moSsDiS7R=*yu|7f zk)i-tEY0#LW4ud_NrE~~wOUBMoJ+i0B&Lia8R?}ejo9?49lZzJIeH~yf^a1RP7to* z04PDYQUOqcaFql=3Bpwxh|Tzd;A7;6!<9)dFtgYT%9-+lYL>8ogee=p3*}Wv0&+Gi zAh2WsRZy{jDnK??H^TTTB#;2ZAeC4$NJbS`;4_lpZANt!65x9z!1qW-zDF|hJ(AIF ckI7X?A7}x-M~c2jioQpRzDHWXUu|IPx^BeoCIA2c diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/objects/18/aa7e45bbe4c3cc24a0b079696c59d36675af97 b/vendor/libgit2/tests/resources/typechanges/.gitted/objects/18/aa7e45bbe4c3cc24a0b079696c59d36675af97 deleted file mode 100644 index 032a960b47f05fe8cb032453a7fdaba66f22e95c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 89 zcmV-f0H*(V0V^p=O;s>AV=y!@Ff%bx&`ZxO$<0qG%}Fh0csBRZ>`fQ1IeT|&t}Bna vap*};@ITMeim0`#dZV$Lq8!;MVBPA diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/objects/1b/63caae4a5ca96f78e8dfefc376c6a39a142475 b/vendor/libgit2/tests/resources/typechanges/.gitted/objects/1b/63caae4a5ca96f78e8dfefc376c6a39a142475 deleted file mode 100644 index d32622e67592b2f64df9154db4ccbc2f30e8bda7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 161 zcmV;S0ABxi0hNwj3c@fDgniB_7JOE+P1?91B6QD~q^-C~+tpro{KL9*9p)5Jb(-yQk) zUCF_@nu@>@d3I)YR_5Fp-~kWb9qVQQ`e_((7@^0f4yvw)b7LNxQNU}BJ;K-{0=8q{ z-~hFLp_}UyLQ(7X5eLSOHNqdfy4wN9T8~h4&*u^h65DfILeu_BqI>+v7zZD|<;T<4 ze3$JHU$WCf_6y#gPY_Ipi6!*-Bg>XhX~8U9LN~j^W&!0v5J}18|DdPrceed`{Jhy^ zKn4gJE5+0jy2~HFFIj~%5G|qG!+xJ1?_kRsIVj8FwK<BMZ>e9OX(#rc%;^>PtQ&Ky z#jTdNic}duoSL)}AttI)3UwH184H~T0+U#of^)%jDhtE5J?fF(L)VVr6IC7Oo%>BF)R(Dj%1({USh(7kXL0PQnsBQ8@%T( zM>~XY+-4Oz?qVe!cezrQn=~Tpfiwb)vE(u^ic6Ce8bv4+`A#AgRmh`Q${^HLb=MHH z262;LW4Vd5u-r6PX}M`Gv>v2)Zw%)~0usPjAPrtvAQ6?;tTRW1WNw~H&W!|c$q~RM nM?@|;B67(Q5hXV_s=1Lq&{|y_R9zfYT^v+h9JJQIcl`pu^)~#A diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/objects/42/061c01a1c70097d1e4579f29a5adf40abdec95 b/vendor/libgit2/tests/resources/typechanges/.gitted/objects/42/061c01a1c70097d1e4579f29a5adf40abdec95 deleted file mode 100644 index 0a8f32e155f5f3e85753d18a069825e975a59e89..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24 gcmbG-v9sr diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/objects/46/2838cee476a87e7cff32196b66fa18ed756592 b/vendor/libgit2/tests/resources/typechanges/.gitted/objects/46/2838cee476a87e7cff32196b66fa18ed756592 deleted file mode 100644 index 52af51f74879da79e318de0c737c3dd00e7ead8a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 76 zcmV-S0JHyi0ZYosPf{>6G-8M@E=|hKPbtkwRZvP*isj-gNG!=vuvJLq;w&x70W$RT i^dU-&;!6^X(o;+H_0ls-xRCXwAn8jXpbr4!-6gIS3nSnF diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/objects/63/499e4ea8e096b831515ceb1d5a7593e4d87ae5 b/vendor/libgit2/tests/resources/typechanges/.gitted/objects/63/499e4ea8e096b831515ceb1d5a7593e4d87ae5 deleted file mode 100644 index afafa89f4db359607939482da740faacc90158be..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18 ZcmbGbd zorB$q9)d-u(ai45`eW}wa9h0DAKDSx1=x_Nm-2nW~Q}Dc zYM=%PS{lR59J<@ye4Vq(+(0phZf>uyxBCk?u@)K1w(z?>9?2YXuRnQ<&zRnl!+k?v zTsO8;+jlVb4|obB*-4&LcvC;Tumnp%rug15w&@=p+G%8~(_!0={&z>pB;8YUZXuSb z8~<9vYmKiJsWO1ldfP~am1&GYrwXS_=`5F6mBt4lq;OUT&o%?PiT0uICfbsdz-ld* zNno{BOCW*OS}%bFR%^2a5?HN^q+xyZL{_Sb=&eN+J)$c#ca?}(39dvFgS2dOS~hqq zvX5y9nYsN!W$v)hnL92_;wFtE^*|aNON>HuZ-n+$a43~D)OS^wqCruVT65)^=At3b z8pKWg`ov9~A#u}OF>%ven0nB8j>x4lp>!k_cvV>^s>YU1OT;3Qk62Wd*5yS*oi&J) zxP0Oyk3!-k&6wuObC7nP!+K#cHcB~amj`1*Y$yfg8)pJ91m)Eb#$7b@S%bK89>kUN oAkCZyY34jglkzy5Y|cN@2U?bFGSzG{)oe1=Y%(p&A0ZGL7y}b59RL6T diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/objects/6e/ae26c90e8ccc4d16208972119c40635489c6f0 b/vendor/libgit2/tests/resources/typechanges/.gitted/objects/6e/ae26c90e8ccc4d16208972119c40635489c6f0 deleted file mode 100644 index ea35cd311956f02a8122562692e2234f7b4af3ad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 160 zcmV;R0AK%j0hNwh3c@fD0R7G>7W`I{=CKWkh~B^(Y_^+L=tI)<{^kn)4l^*kEz74u zXX2?A5imUwit{OnW6Rt*(n(_sF|dz=4FNsni0Vs4)(R#C%S7VHGsTdxmww2S*<#>8 zHj;6jL$Bzl(^lYp?7Pe}JY~*O;8xOO{M6}4SKgL880%tt>9B{3My*w&?XNcV-%`CM OT1VO8?9~rr!9>yGuv16? diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/objects/6f/39eabbb8a7541515e0d35971078bccb502e7e0 b/vendor/libgit2/tests/resources/typechanges/.gitted/objects/6f/39eabbb8a7541515e0d35971078bccb502e7e0 deleted file mode 100644 index c54817598a4e401129ad887f0a424ef77650f775..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 66 zcmV-I0KNZs0ZYosPf{>7V~8#;P0GzrDa}b$P)bpX<>D+zEXh!?RY>9DEG^0bGW7KH YAxezmOA?FHQ%m&q(lblA0DgcI*UpL_tpET3 diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/objects/71/54d3083461536dfc71ad5542f3e65e723a06c4 b/vendor/libgit2/tests/resources/typechanges/.gitted/objects/71/54d3083461536dfc71ad5542f3e65e723a06c4 deleted file mode 100644 index 9fdd8f245a749bc74906cab47ca498dfafae9cc7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 657 zcmV;C0&e|y0d169Z`wc*h5Nj}VwJwY1CjS?Z>1t7#H~;vks_-0E!xX$unKl$J4y5J zJG(^CqFP8Jmcw^u<}A2f=O|;P`LNkG1I3r6BMc+$;i;ps>*=m>kIl&G>lS*TV-G-~ z9s33by0tHO^7aJOZ*BVs10kC&&|mPDPX{_~?MQw1ybII;(w^HuoAzIb?coz4jLzuS z<>ukba#gSIZt92I`Um~{`Amz$L-@ILb6?lzQkld=oJ+4)ch_f9Ruo!FBL63SsDIXr z@0+XZRZX!0l$J^nbuL{kZ@-;Wd2T?TOBZ+R^>T9(C#ud;vZSxgZimak?RAIU!V9E# zX~SK_Pi#9hW7D;C==N|3B&`#7j^T}6|3;E51)1WzBxKR;_suwv+2J9}7Qb(Im`OUv z=In$`Q#bCt`u7^%D_|v*md2UL1ym|31y*P)OKwfUp(>U0jB#d-^o}fgup{1wt{w4~ z91Lc2K1~L*xtLNkn9b#sqQPvgrW6fkbDcbl3l3qWs1R=qh~NOMmW8cYfQl7@#o)Oi zi^FB3A6edG8iHrGn~2Qz6Pejzq7oZDbm{>;3Me5kSvbX{tGop+xWc|Gt#kyYODPLs zV?25AqX)9FUzga(^ofmgg~Z0WAoU>g9HHPs`O>15FRIE|Rz*`<$pLi0J%X+(Da(_G zIC>xxSuQbgM?NvpGo-ol9O#|rFpe1rQ3#9e7G4=2BBmf*w8|G6f6p$W#-2Rn(F0jI z4`k&$&@<)MWfi+>0gr)VxH r{PyrP();@AW?f(I!>Jc_>;=8>{^i`T=G?I6+_2`{@c#V)-~uuQX+KTY diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/objects/75/56c1d893a4c0ca85ac8ac51de47ff399758729 b/vendor/libgit2/tests/resources/typechanges/.gitted/objects/75/56c1d893a4c0ca85ac8ac51de47ff399758729 deleted file mode 100644 index d43630f44f10b6a256618e0c6ee781d7ea724ccc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 226 zcmV<803H8$0V^p=O;s>5GGH(?FfcPQQP4}zEXmDJDa}bOX86QiX`(LlV3T2(``IS- zrNw`(kK{p>1-Ux9_`2%lrZDh-NxU_!Q!U>^w?8dpi37Kv@zFLD10YaHWcd3)q|Q3> zb7OLpHDjLrvs?~xl#2LC~0nLs*ud^P*m&A z&b6QGjs~t>xy!t2tJNFpwT4DuV^bKM*kl+N9%q<-@k#i6&82Iu(j!NP5=M^ diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/objects/76/fef844064c26d5e06c2508240dae661e7231b2 b/vendor/libgit2/tests/resources/typechanges/.gitted/objects/76/fef844064c26d5e06c2508240dae661e7231b2 deleted file mode 100644 index 355ce4b5b7a6606d5e8bb6bdda93b325f776c56d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 66 zcmV-I0KNZs0ZYosPf{>7V~8#;P0GzrDa}b$P)bsY<>D+zEXh!?RY>CEEG^0bGW7KH YAxezmOA?FHQ%m&q(lblA0Db5a)6fJT5&!@I diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/objects/79/b9f23e85f55ea36a472a902e875bc1121a94cb b/vendor/libgit2/tests/resources/typechanges/.gitted/objects/79/b9f23e85f55ea36a472a902e875bc1121a94cb deleted file mode 100644 index 2b07ad256..000000000 --- a/vendor/libgit2/tests/resources/typechanges/.gitted/objects/79/b9f23e85f55ea36a472a902e875bc1121a94cb +++ /dev/null @@ -1,2 +0,0 @@ -x•A E]sŠ¹€f€JbŒqçÖ í`I@ -÷—ĸýyïýµäH;ŸZeBrž6L˜P«Yº%8½²&v‹4JmÖ¢ÔÛ^*¼úqpJðà¸Âµúû;¶½ûËZò ¤žœ’Æ 3ZD1Öñ×ú¯)žŸØ"%ø%Ä–38_ \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/objects/85/28da0ea65eacf1f74f9ed6696adbac547963ad b/vendor/libgit2/tests/resources/typechanges/.gitted/objects/85/28da0ea65eacf1f74f9ed6696adbac547963ad deleted file mode 100644 index 6d2da6c935a3b55c8d7146ab003f783a187d4985..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 451 zcmV;!0X+VA0d11qYTG~%g?qhEG0+?9LdB9LB?Ky{UA2hXF%*^b&gf?nEtR!F+9dex zduC-ES5z1VtRFOx)W+ z^GI#^ij&hbQ{9&R6OT$2Ez=)9xzmwsTUx5kOV?1vaC_++(*3_C<-m7J1?1EByf}Qz zx7lw0H9OpA4|M%}rsedga4s!=X4zaCiCC@X()D(~o=Jn{GKnG;{ZD$xerKCs#h3Lq zBQyZ%O&qIuF5Tw$KjyBXYap3RH~ZZ#FW$xCnmDP-=}mVXhJ)#uX}0{z@+K2DkN8sd zqqf@gG@2t%3z2bR=2)IJ!%2xu7Afodq}0Y7kJ^sPpB|O>;L8p>k#jUxE&@-wsm`@N z*XCRqRc!_?EtYJ0i`7q*pN5`Le!B7ql%GZ(f%4PXBT#;t0G$37^f7RW<+{)T)nes< zdJ#FGS;PVWOvLyd3@;!6I9CEdSPOs-8UfG&i*a-Xt}Y;i5L6;Wi?s-0)JO;JMi^e- t7+pXJTt*07Mi{w_Fmf4Tbe%E2fcSu^x{RnUBdW`Y>M~-ge*vPI;Hx7~+6G-8M@E=|hKPbtkwRZvP%isj-gNG!=vuvJLm;w&x70W$RT i^dU-&;!6^X(o;+H_0ls-xRCXwBI!#dpbr4!Z6&S}fg^4J diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/objects/93/3e28c1c8a68838a763d250bdf0b2c6068289c3 b/vendor/libgit2/tests/resources/typechanges/.gitted/objects/93/3e28c1c8a68838a763d250bdf0b2c6068289c3 deleted file mode 100644 index 02ad0e97a90e855a26a926160b6d8f0e45f0aa64..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 226 zcmV<803H8$0V^p=O;s>5GGH(?FfcPQQP4}zEXmDJDa}bOX2`dEwR^|%5K++wmm>?= zyU%Q8dj0^aEXdW-#n)9YH-+JPxMWY2kiD;`YS zVHg3=c)M?(AIqx$bD-+LgP^tF~Ibv0iIvWB>#T$qY_x zGK>q4GfcnuBz(T+(zRc>_P&{FXa<%{Venv>+M%l6G-8M@E=|hKPbtkwRZvP%isj-gNG!=vuvJLm;w&x70W$RT i^dU-&;!6^X(o;+H_0ls-xRCWFA?ZsZpbr4zi6y8Es3QLW diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/objects/96/6cf1b3598e195b31b2cde3784f9a19f0728a6f b/vendor/libgit2/tests/resources/typechanges/.gitted/objects/96/6cf1b3598e195b31b2cde3784f9a19f0728a6f deleted file mode 100644 index 5f9ffd4ed1b2f80900b2eb466f75154f79fc761c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 226 zcmV<803H8$0V^p=O;s>5GGH(?FfcPQQP4}zEXmDJDa}bOX2`dEwR^|%5K++wmm>?= zyU%Q8dj0^aEXdW-#n)9YH-%y2^x7j&i+2cJNt_;XveDvb=FB_1P(_Ih$)5B4Ry>%t z!!R)BwQN-B?(o&qJ!O-&V&7#@mh-PyVJbKTLvwJUd-S8cU=W4+eU$N&fwk{O)X zWEdA7XPAERN%(xtrE9-%?R_)V&4NgP0CYQCiqryfR{#J2 diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/objects/99/e8bab9ece009f0fba7eb41f850f4c12bedb9b7 b/vendor/libgit2/tests/resources/typechanges/.gitted/objects/99/e8bab9ece009f0fba7eb41f850f4c12bedb9b7 deleted file mode 100644 index ac17defac6d4e933624c18018dfaa678aa5820c0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 701 zcmV;u0z&4>a}VMGN_E$Uo zu{b-wY$+N*XrndJ$I#2!)%RmoQ4N@5==6F%pDhmH!fGm%%;;0MTH$bTdi{R3@CfBw znQ))+7r)tcL)UNUu3y7GkTOo3Ifgg%+hCCC!rDIwE-z3zq`8Sf97ZSenog_)Fl zH0MwFsJIC)HNMpJQUNQWv~j^@A;IdbHF#;fYJ_)8fNgY$oD1%qih)eG;0N4?ely^f z>;=XXF)9M%i5yWB7*EuQqQH2fM-&Cd6H_!?NCC+jX_4MJkSPFoqnNimf#po{oT6}K zx?eW>iPt%nCPd{9C$e(K6IHp>i7wozVTuRTV9-F~iUrM8u+f8%LZfeMw8_9tqZE@q z=YxiL)j)3a8wxja#=?z#rNWJULGhq!ABhR6W8+aOGHadZHoL|v0bml&5sbA;H3tp( zs)3xy6$&TLC>BoCOr@{d2WrkQf=wB6l#PkTOYBPt)o2{++z)Yy55mVoG#@Ga ziEuyAoA&Ht-kz@0!Ha(Nf?BwLH8-p^H>@=`tTnf~e+Dor6CDE^V^oP7!K`Zp=PoK{ jq*m5Nli6D@?|1!QKh)!Ebc%1=x=#-)e7ybw!U<6BrK(*X diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/objects/9b/19edf33a03a0c59cdfc113bfa5c06179bf9b1a b/vendor/libgit2/tests/resources/typechanges/.gitted/objects/9b/19edf33a03a0c59cdfc113bfa5c06179bf9b1a deleted file mode 100644 index 7ab83aefe..000000000 --- a/vendor/libgit2/tests/resources/typechanges/.gitted/objects/9b/19edf33a03a0c59cdfc113bfa5c06179bf9b1a +++ /dev/null @@ -1,5 +0,0 @@ -x•ŽI -1E]箕LTˆè ¼A†J·Ðƒ¤Ó÷7WpûyïñÓ¶,ŸZÑ©Uf cXcR ƒC4¼3Y2æ"£NN:ÔHɈo¨¼6 ,µ’žs’ˆòÁjf—#îk½G›¶ -ïcßyžáÉsá -·ã§MG¼¦m¹ƒ2–´Bò -.ÒK)úÚÿµŽþkŠ×Ö‘w8ñžCCà \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/objects/9b/db75b73836a99e3dbeea640a81de81031fdc29 b/vendor/libgit2/tests/resources/typechanges/.gitted/objects/9b/db75b73836a99e3dbeea640a81de81031fdc29 deleted file mode 100644 index aed4d81659251670daa3025f2f015239d43c8653..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 162 zcmV;T0A2rh0hNy1ZNo4O0Q;>exIhZM7>Ym;1nCCdfTF1;fE@?2ynnnxe-C%S>AEb> z0Wqep(anGm&l;w}NwRvCf}%wf!(^FSOU#6YBD=SAdkrA2++wnV4bdc>B~ujk(F$SJ z5MmI{TAl3Uv3B^~x6S4m?lw2;aOw5-_Z*MCe(SniA*9SP5MzduC-2=skH2xK|1I55 QHyH-HzQ%FtKHnThBc}>bu>b%7 diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/objects/9d/0235c7a7edc0889a18f97a42ee6db9fe688447 b/vendor/libgit2/tests/resources/typechanges/.gitted/objects/9d/0235c7a7edc0889a18f97a42ee6db9fe688447 deleted file mode 100644 index 3e02a41b2fd61ecee78a28d4b3a3f93ed6b31161..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 160 zcmV;R0AK%j0hNwP3IZ_@06pgw4W5;(oeqeI{=gq(>C6bTNG9`t=L=qoDyY29^QVJW z;nW*5u;pS6#=uEd6)2bJwI;&oDiti4$zbwHd}HIKgJjP|S(%)&iE?CZw6i%8I;^bF zTPsbhRm8oIYlHW`Z9Glz5GGH(?FfcPQQP4}zEXmDJDa}bOX86QiX`(LlV3T2(``IS- zrNw`(kK{p>1-Ux9_`2%lrZ8kp;7HJJl*?SXebEh*X`g3R`rmtPVgLjRi41=qh}2m} zer`;TvS!S)e|GD1LHS&$0Z9zWp7Z=xJean_Ffit|Y*gvwCpW5|0wv8&O%;+E9*Sz+ z*}3*}-O<3cD|eY!ZMAx1z1GkOY-|dH6Ppa9XD~D{Ff%bx2y%6F@paY9O<`!&xW%_DZq3K<{`0P7X5C&B MQklFK07HNgUP1{MOaK4? diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/objects/b1/977dc4e573b812d4619754c98138c56999dc0d b/vendor/libgit2/tests/resources/typechanges/.gitted/objects/b1/977dc4e573b812d4619754c98138c56999dc0d deleted file mode 100644 index e1334057c341a5b8aa9320d98dc884324f91709b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 518 zcmV+h0{Q)T0c}!Ui`y^|?6ZEwLSK>x7k|ihTxg(4-C~+tpt!VeL9#bzQ^z`N-5vS& z-IYTwH5Gv+^33e)taN8IWJ&t2Y}yg%r@-Q9VZbK?Co@3T>c`fG@Y>*jUxjZ3Mjp`q96ryYp{@}&kj$j*Qp)${14H`-9xv!z^{}oXKeiR}A555)U@oTZm z_lGa}@ge^O_vaJ%(-GkuTK>rMIaD%OM04n7ci7CJf$t|$3i&_iG5?)!f0my&yBx>> zLDM)E@f^A<9=^|2LuVkFL$`0vZyoEE}yQs%TgYle$p7%!67_d$rQIiFiQ3U4~1=!vg7+6mv2IkgCu>_%T}b*=Ta zB2@v9W;#2C5w7A>9HWX7CDTx4eu%3y)>ROMfy!j1#dbht={=a<(kq!7c3t`{+DQ;&o_yb;42kqBf$Gl75=6Uc1M1Tu>(EboZXjYvQOXa>?W z6$44AW(Te#3Ep>}sVW6!<#=>Px# diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/objects/d7/5992dd02391e128dac332dcc78d649dd9ab095 b/vendor/libgit2/tests/resources/typechanges/.gitted/objects/d7/5992dd02391e128dac332dcc78d649dd9ab095 deleted file mode 100644 index 65f1f530f6a620c89a28d23a72982c4c3cd0252a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 577 zcmV-H0>1rt0d107i`y^|h5M{uG0>Of!Nt1yQfQz_-4dE?pro{KL9)gh)5KnE?=JcG z9myftnu@>>`RF?{N3y5Z0*|$Pw?EcB(9ght{Qw<4wNSMkoND`64+36~*dYuZB49Ig zHTG~cFSK)cLMV@>dBmQv{So00Uczn-w$CRA7K!%UIH;R{A*RERjB$wI+j@Wa zy51Dq-IwCl4J|Vqz-Y|0s&7RCzIzQ|WTETTY}rjuWMr`k(Yr{4Q2M_n()W z0;mC!rdl&Sm2TD#-=|a&8c3$n)o#08@9$zyO@frI;k7=UC>%aG>3GJrIkK8&-uvBJ*&vTT{BAP_SCgTn>9!p-iQsitkJ~nvI zLymq35!iMn1G}85z;-k3+2oP<9>^oc6dhNw)m+)EG$^Fd)OVKXq(YvgO2yJt)!jqf zJcv#GTF)kC>De@w^K6<6eGe+k;bI|mnHsVx<1EV!&#F8%N+2eVa>OLdluGX&^5#KI zVp-3mj7rZWPv_?fbC5U9aSK4*4w4{*Oo9+HfkMax3Lz7SLcSf;w}bS7UO-5WYDkW1 PNRDbqj$XiDZFUYNse2xC diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/objects/da/e2709d638df52212b1f43ff61797ebfedfcc7c b/vendor/libgit2/tests/resources/typechanges/.gitted/objects/da/e2709d638df52212b1f43ff61797ebfedfcc7c deleted file mode 100644 index 355faa61f17db37ff742a99c02d67a2df841b1c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 78 zcmV-U0I~mg0ZYosPf{>9Vu&s-P0GzrDa}b$P)b#b<>D+zEXh!?RY>LHEG^0bGBQd^ k3W}}t_0uy;GD?&5lJj%*b25{FJR=yb2jp-80ROrf?lvVN`2YX_ diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/objects/e1/152adcb9adf37ec551ada9ba377ab53aec3bad b/vendor/libgit2/tests/resources/typechanges/.gitted/objects/e1/152adcb9adf37ec551ada9ba377ab53aec3bad deleted file mode 100644 index c68fdcfab02698df69e73c1354cc326d752fa6f8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19 acmb5GGH(?FfcPQQP4}zEXmDJDa}bOW+?mj!-dU9?dpRZRSp&2 zb!l=%hMS(0)#pX-hWu3fpyylSh}8|$?Iy*F0*YBg`p diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 b/vendor/libgit2/tests/resources/typechanges/.gitted/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 deleted file mode 100644 index 711223894375fe1186ac5bfffdc48fb1fa1e65cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15 Wcmb7HUV`ts$AqF2u& WZ=vo>!QNlKUNZLH!BBTb_$C0*m>&ZG diff --git a/vendor/libgit2/tests/resources/typechanges/.gitted/objects/fd/e0147e3b59f381635a3b016e3fe6dacb70779d b/vendor/libgit2/tests/resources/typechanges/.gitted/objects/fd/e0147e3b59f381635a3b016e3fe6dacb70779d deleted file mode 100644 index e3663da9f3c298f8284eb35180a688bf93fb5734..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 53 zcmV-50LuS(0V^p=O;s>9V=y!@Ff%bx$jdKD%`GUYWXO>E=_l~&Q_| - `79b9f23e85f55ea36a472a902e875bc1121a94cb` -* `a(1->2) b(1->3) c(1->4) d(1->5) e(1->6)` - **Create content**
    - `9bdb75b73836a99e3dbeea640a81de81031fdc29` -* `a(2->3) b(3->4) c(4->5) d(5->6) e(6->2)` - **Changes #1**
    - `0e7ed140b514b8cae23254cb8656fe1674403aff` -* `a(3->5) b(4->6) c(5->2) d(6->3) e(2->4)` - **Changes #2**
    - `9d0235c7a7edc0889a18f97a42ee6db9fe688447` -* `a(5->3) b(6->4) c(2->5) d(3->6) e(4->2)` - **Changes #3**
    - `9b19edf33a03a0c59cdfc113bfa5c06179bf9b1a` -* `a(3->2) b(4->3) c(5->4) d(6->5) e(2->6)` - **Changes #4**
    - `1b63caae4a5ca96f78e8dfefc376c6a39a142475`
    - Matches **Changes #1** except README.md -* `a(2->1) b(3->1) c(4->1) d(5->1) e(6->1)` - **Changes #5**
    - `6eae26c90e8ccc4d16208972119c40635489c6f0`
    - Matches **Initial commit** except README.md and .gitmodules diff --git a/vendor/libgit2/tests/resources/typechanges/gitmodules b/vendor/libgit2/tests/resources/typechanges/gitmodules deleted file mode 100644 index e69de29bb..000000000 diff --git a/vendor/libgit2/tests/resources/unsymlinked.git/HEAD b/vendor/libgit2/tests/resources/unsymlinked.git/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/vendor/libgit2/tests/resources/unsymlinked.git/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/vendor/libgit2/tests/resources/unsymlinked.git/config b/vendor/libgit2/tests/resources/unsymlinked.git/config deleted file mode 100644 index f57351fd5..000000000 --- a/vendor/libgit2/tests/resources/unsymlinked.git/config +++ /dev/null @@ -1,6 +0,0 @@ -[core] - bare = true - repositoryformatversion = 0 - filemode = false - logallrefupdates = true - ignorecase = true diff --git a/vendor/libgit2/tests/resources/unsymlinked.git/description b/vendor/libgit2/tests/resources/unsymlinked.git/description deleted file mode 100644 index 498b267a8..000000000 --- a/vendor/libgit2/tests/resources/unsymlinked.git/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/vendor/libgit2/tests/resources/unsymlinked.git/info/exclude b/vendor/libgit2/tests/resources/unsymlinked.git/info/exclude deleted file mode 100644 index 6d05881d3..000000000 --- a/vendor/libgit2/tests/resources/unsymlinked.git/info/exclude +++ /dev/null @@ -1,2 +0,0 @@ -# File patterns to ignore; see `git help ignore` for more information. -# Lines that start with '#' are comments. diff --git a/vendor/libgit2/tests/resources/unsymlinked.git/objects/08/8b64704e0d6b8bd061dea879418cb5442a3fbf b/vendor/libgit2/tests/resources/unsymlinked.git/objects/08/8b64704e0d6b8bd061dea879418cb5442a3fbf deleted file mode 100644 index 953262fa919d9724bbc2eebd40d804cf99eed6fe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 49 zcmV-10M7q-0V^p=O;s>9VlXr?FgG<-@GI5JVEFkgO!B7veYN5aJuWqwxXBw=IIsZ# H{)5VqnO?#JWGIjpOIm>5FUav}01DB)$YM%4kYxsy1Y}&BJp708OM2 ABLDyZ diff --git a/vendor/libgit2/tests/resources/unsymlinked.git/objects/19/bf568e59e3a0b363cafb4106226e62d4a4c41c b/vendor/libgit2/tests/resources/unsymlinked.git/objects/19/bf568e59e3a0b363cafb4106226e62d4a4c41c deleted file mode 100644 index 94afd01e8af764ea40f44bec81690f89d89e17d4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 29 lcmbU}D`Lw3mnNGEh>O?-~GU CBoJ!= diff --git a/vendor/libgit2/tests/resources/unsymlinked.git/objects/5c/87b6791e8b13da658a14d1ef7e09b5dc3bac8c b/vendor/libgit2/tests/resources/unsymlinked.git/objects/5c/87b6791e8b13da658a14d1ef7e09b5dc3bac8c deleted file mode 100644 index 67eb14930c0a2efe84dafba6deab01cc1cd2b1fc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 78 zcmV-U0I~mg0V^p=O;s>6WiT-S0)@=H^higY-T`ByRX=H%OpH6C+A kROBaRB{Q7wm-%|;MdT5SYiHPsT29A_39&r~0QEQ>yDWYqH2?qr diff --git a/vendor/libgit2/tests/resources/unsymlinked.git/objects/6f/e5f5398af85fb3de8a6aba0339b6d3bfa26a27 b/vendor/libgit2/tests/resources/unsymlinked.git/objects/6f/e5f5398af85fb3de8a6aba0339b6d3bfa26a27 deleted file mode 100644 index c1ea0de75fac99058980349942fa053ac8eff434..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 49 zcmV-10M7q-0V^p=O;s>9VK6ZO0)@=HRuD( diff --git a/vendor/libgit2/tests/resources/unsymlinked.git/objects/7f/ccd75616ec188b8f1b23d67506a334cc34a49d b/vendor/libgit2/tests/resources/unsymlinked.git/objects/7f/ccd75616ec188b8f1b23d67506a334cc34a49d deleted file mode 100644 index 028505563894257f00f3e1fca04bae797e1b9702..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 132 zcmV-~0DJ#<0hNtA3PLdu0IhS1?S+t--#!rWUBK2l*{mdJ48&M?dmnfLtAT-GsJB)p z=-_vAFoPou$%jQVCT()`4x_eN^DVGilFMXLBqR~vv-AP$4;Kk*V>p)D&a?1fNxhvw m8|#!sYZ3P9pp@9`wwwHSD6VxDi17NfM}6Lb#AtvXVyQ$W-m;%S* zoELGv_-j+;xwdoC?GHbiZUgkW?c;lGn9y>LFEY*t_Br`X7q-mmZQpwf{|=SbTDEfB Y(P%%`Nrfiv&qtZm_Xo6k0gMMqi*V>scmMzZ diff --git a/vendor/libgit2/tests/resources/unsymlinked.git/objects/83/7d176303c5005505ec1e4a30231c40930c0230 b/vendor/libgit2/tests/resources/unsymlinked.git/objects/83/7d176303c5005505ec1e4a30231c40930c0230 deleted file mode 100644 index 189ab044d00cfed1ddaeb48ceab4441db5ba9cef..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 44 zcmV+{0Mq|?0V^p=O;s?mWH2!R0tLTP29EBO0zcmD?hA?cR#ZCnY<1DH-wy!N9VlXr?Ff%bx@GI5JVEFkgO!B7veYN5aJuWqwxXBw=IIsZ# H{$mYJ)20*$ diff --git a/vendor/libgit2/tests/resources/unsymlinked.git/objects/d5/278d05c8607ec420bfee4cf219fbc0eeebfd6a b/vendor/libgit2/tests/resources/unsymlinked.git/objects/d5/278d05c8607ec420bfee4cf219fbc0eeebfd6a deleted file mode 100644 index c1b6a5101afd02d6030b0f2fe51bab72a2e557fb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 49 zcmV-10M7q-0V^p=O;s>9VK6ZO0)@=H)5VqnO?#JWGI?ekxw`15-@Y?2D!@*xxwLQ;jKV)J^S7T#jlktJSpHl(bW+hZ@_1 z|E^=2Zm{Cp3g$@+d`RXNWE9{rZzZaEOgGwfCDZJUTqk!%RtN2SlM;UL&UASOfuz*5 z{GwE3kHg#r^!FE#`A~naLN$-`4`=G;@ z%?Aev4s$o5n#+`?w`9k{+~OJu-oKYNO5QseAUeq?hd~-{ZeBh{h=5W7&UCvO)qIw@ znd_hY?ahsNctMkKLvzOItLM&6jAc;7VLnpG;BfyIRP&j)J+I;PT3=g!;C1@u#Fz(H zvv}6>GcriwFdv#nAU?oFg31R3z?x6^K_x>mayCKa<0IyvvIUk;wxhZiM?MinG7l*X zK;{HJdw3L?=3`)BVH5QULNymhKH)<$7wY$rAXitQdDj>WO%+VIcog1?aITa6a&>vm z?VG(Z#%FG4p8=OC48{ruT%Y$@%r%wsK9hUKJN}WP$$S3fAA7+jf@N(EG`HMa7a6Wn zeK@^rbyCjB2NBwke2G&U7A*{B3PxP4qI=RK?M{_#ky=ptCERjx&$nZ1A&CvFzc200 zb(4L;c+nYV&bQI$g!|H^&J3N$C#W!(g QxjTzUbZLE`EHvo@05Ia~!~g&Q diff --git a/vendor/libgit2/tests/resources/userdiff/.gitted/info/refs b/vendor/libgit2/tests/resources/userdiff/.gitted/info/refs deleted file mode 100644 index b0743141d..000000000 --- a/vendor/libgit2/tests/resources/userdiff/.gitted/info/refs +++ /dev/null @@ -1 +0,0 @@ -60e3f7b244a5305e2c9fa4ef0e897f3b14f3b8dd refs/heads/master diff --git a/vendor/libgit2/tests/resources/userdiff/.gitted/objects/09/65b377c214bbe5e0d18fcdaf556df7fa7ed7c8 b/vendor/libgit2/tests/resources/userdiff/.gitted/objects/09/65b377c214bbe5e0d18fcdaf556df7fa7ed7c8 deleted file mode 100644 index cbaf4c1bc2a51d1ffcf569deef779695c827a011..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 850 zcmV-Y1Figc0hLy5PunmM-e-Qrfiy_hG#v~OVlZhEd#T2@icvv@_~1598<8fN{{_8p&ZHSiF?g)_v}PO2)t6&H$~ z2^;aMQm8~*4eiLrO3s}Tn^1TFavWx!5}>(yXaf>!43x)w3fhGVkYyQ{Svv?vW66b= z#v|oL1zbRRf@euChCK6_?>kzqu}nCmIYZ?4B}-KZ{9Zz(;fzPuPqehK|5TO5h_Bl5 zNAlEKEEJZhx0i}UCUTx~FHe0YRkpS&j_DLY7=W{Bg3Yd2bQi`Wr(q8%=rN1^hwgXUSG3%F2N^jS~3 z3yhwj;#h_jHiMl>a?j6_X}oh>0D57jBo3|-@9g*0uZBzMYUN&9quT3M70-DfYgEs_ ze7&qHU#Q8i(Z1+>`+jNGm#G#&kO**0QV_=YuhLo)LDA00Zj93H@{C5ZR33PIB!rui z^cGI6bOi>6u&giE)2LYDVq2+X=1J46+EjJ1y{&s!5t6iE=^j#78tPbSA+ z5G9E)Te-Ua+pv4k&D}a|kRF_s`thA>&r5bvww&o{_rl0<`;o(KkY<;fnOW(yS(uMsa c*UXn0xAI3HTCjU))$}cov$nvOe<#!ZX@{+$*#H0l diff --git a/vendor/libgit2/tests/resources/userdiff/.gitted/objects/0c/20ef1409ae1df4d5a76cdbd98d5c33ccdb6bcc b/vendor/libgit2/tests/resources/userdiff/.gitted/objects/0c/20ef1409ae1df4d5a76cdbd98d5c33ccdb6bcc deleted file mode 100644 index fa149da98b2bceba595d89743a43c8490a30f03e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 120 zcmV-;0Ehp00V^p=O;s>7HexU_00M=?w35^!hR^#f=9)3OG;Zo z|NHDaUz&`DGO1D;pYM5W-(z3;QPPL@!9n|#FM}|aPB4iFd6>kGl7A+lk}k+uny5T; zVVwArNH*YM1NgtkYw!U&k(f($yn$=?Lcw=AMTCw$-0c8z7iVb2*Nzb);gLg4!nDh+2cx<>0>*-cw}Y+X8w z7#Zk5e&;f^$O}R<757q=|Qe+YMnJ`7M#JMz^8n$YF4exEWO4KuW z1Mk}K(Hw@U;4%TmH|A#36dzy#GQy}Rdrib3Cocfm-7P@O$(3T6KaHigI+k92EDTbP zr4FPV3+a*5df?LH0bEGb?*CSw#kWA1g_h?NL6s!2N>$Y7*w+0-C?D5#iK*2*Yjgoe ziikexUUxz8GbD{=xWi_!GfwX1X)=v>jtW38%*f*4An{IrUHxphoUV56rZukJPSx>T z26>I^`R6Z}Rp$%p{TlC!v#;MS%>Xmi0tgZXj!6o_7=M)3QV1kFW4kdaGNX+9(kWwl4q*U(y(tYT%rCJt4Tzcv&%3T`Pb9WAFdG+i3CPsS*d z?7oDg+gU?F%B&@s0g@c7&4eVphDK}p8J-taOpE^+B43GVnPZT|xt!%z?=&cqAix<# zx84ttkGvpC5@n`xb^Nzr@1UUvtjl}oPP8{dHVyN^$m}Z)*U|tC=n`5UbhmTF9RMY) z{X>E`wWV>|$Ghv!zW#%t6R!nn+g;Ct&?&9PSh=73lxyfwZOuoDmY@FK@bID+wm#SP gPtV0G(uMs)*YuZZxAIHjp)YuBvqj_hFHF?@?IyINumAu6 diff --git a/vendor/libgit2/tests/resources/userdiff/.gitted/objects/3c/c08384deae5957247bc36776ab626cc9e0582b b/vendor/libgit2/tests/resources/userdiff/.gitted/objects/3c/c08384deae5957247bc36776ab626cc9e0582b deleted file mode 100644 index 29b72fbbca6d39e3390f4effef4dc5081a4873eb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 116 zcmV-)0E_>40V^p=O;s>7G-EI{FfcPQQAo?oN!80J$<1MC*Og4OH*%fa8Ce~)?@dbh z!8_CCkribnmL(P^7iAWdFmR@BEqz`+oR_mS5gD~b!Fo_2;OkzjyzmrgK7x*kqgv?wR zC;lYjHF(?r`t8vfoI)pJb1sfI@a%yJ_`&BWBn)TEYu@wuRt*mUTsT8q?WC;YTXC+~ z95DFK?Rhc+Ow#z1+@r=VS^09lrCnKgrOIFej= zX*^V3RKPiuCwP`j#DHfW^L7_q05CKve;MKA!6mt3mUu&;?v5Ec&7+ z-33O^P;o3n3!A~tICLE3_}$-@ad&^<}CB5F`Q|lN5w8epOmaA}HD!*{xB!Tb|KK7Rm!pPlRw= zklw+Gm9D_R5SI1DdKwi=Tx=_q%sgqDRh!B#wzqZfNoWwMcqPc5wE}nzM0II3#!7pdQ>vk-YHR+YX!_}Y8y;Tt%+}||{^+@QMY^zm d=$iR5<5qm>K?8OVteU>%an=^K<9{Gt{azZmp)ddd diff --git a/vendor/libgit2/tests/resources/userdiff/.gitted/objects/53/917973acfe0111f93c2cfaacf854be245880e8 b/vendor/libgit2/tests/resources/userdiff/.gitted/objects/53/917973acfe0111f93c2cfaacf854be245880e8 deleted file mode 100644 index debf7e40f9e252e788bee02699a7c5f191eadb73..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 846 zcmV-U1F`&g0hLy5PuoBY-e-P=K^mlMNTGuXF*a!ud#T2@icvv@_;775ZA3`2OG;Zo z|NHDaUz&`DGO1D$pYM5W-(z0~Q8Iw`VSDeDFM}|aPB4jwd6>kGl7A+lk}k+uny5T; z;V$tfk!--j2JpMbYw!WOk(f*MegoI;g@W&Ljz-3Cw!GG@oNqO75x|90#MLBK7vGw< z8XCuj!r0D8+%Y>qJ`OXF3?jp74D~+clO6hdpPAyjR*udE)mHDh+2cxo>Pr(20jiicDgqBoqNdh7o%@6Q(GZIG1Kq!&c3&;hn8kiFyWa;B6Z|n!_*^ zTqeNy#@uY0;sY!|Mi>=kuZbAsR_8F}0d!jV|EC5YZ>y$}R|g zhNQ6!ci0Se?vi_XnoQ%J;{wnNGqN~1C%n^Nmp>aWr>mWNX^m^ITXj5>L0;o}_W8?2 z)%l!yzsCE#^Yz<>nNOx#070U_F-buf3V~#2Y}dx=X1T^KSt<`aJ~F~}$$A4P z*17@%Ls-@q>uFr9aPe5VWai1;OvhBE*xuG>S23CqP@{{`4v|%=P%@vW*rm$TgJod!h`1URGU*83syu@^*1 zqRdpTj{g?yA2#%Wb$JiniS|awreQuDn|;OMS{i^MT|&!)?sbp31E7R;a76H?wlq!$ zcz4~}&wmhf;&cAUDX%@G-*- z!)4!d13jCMRz(0=qomQICmCb1(a}6{4AC#qu`%3v3e4)DDt`?o6qDwlttDsBiDsY3 zNAX28`pd^NO_Y%{R4d$Tef;jSZ)9S diff --git a/vendor/libgit2/tests/resources/userdiff/.gitted/objects/f3/be389d351e4bcc6dcc4b5fe22134ef0f63f8bd b/vendor/libgit2/tests/resources/userdiff/.gitted/objects/f3/be389d351e4bcc6dcc4b5fe22134ef0f63f8bd deleted file mode 100644 index cfbef992da8d846c0d415bad157136287afd3e19..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 117 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 - -

    -
      -
    1. item 1.1
      2. -
    2. item 1.2 changed
      3. -
    3. item 1.3 changed
      4. -
    4. item 1.4
      5. -
    5. item 1.5
      6. -
    6. item 1.6
      7. -
    7. item 1.7
      8. -
    8. item 1.8
      9. -
    9. item 1.9
      10. -
    10. item 1.10 added
      11. -
    -

    -

    -
      -
    1. item 2.1
      2. -
    2. item 2.2
      3. -
    3. item 2.3
      4. -
    4. item 2.4
      5. -
    5. item 2.5
      6. -
    6. item 2.6
      7. -
    7. item 2.7 changed
      8. -
    8. item 2.7.1 added
      9. -
    9. item 2.8
      10. -
    -

    -

    -
      -
    1. item 3.1
      2. -
    2. item 3.2
      3. -
    3. item 3.3
      4. -
    4. item 3.4
      5. -
    5. item 3.5
      6. -
    6. item 3.6
      7. -
    -

    - - diff --git a/vendor/libgit2/tests/resources/userdiff/after/file.javascript b/vendor/libgit2/tests/resources/userdiff/after/file.javascript deleted file mode 100644 index 53917973a..000000000 --- a/vendor/libgit2/tests/resources/userdiff/after/file.javascript +++ /dev/null @@ -1,108 +0,0 @@ -define(function(require, exports, module) { - module.exports = Player; - - var Key = require("./key") - , Direction = require("./direction"); - - function Player(game) { - this.game = game; - - this.image = new Image("./assets/fighter.png"); - this.game.resources.add(this.image); - - this.x = 0; - this.y = 0; - - this.pixelX = 10; - this.pixelY = 10; - - this.animationStep = 0; - } - - Player.prototype.update = function() { - if (!this.isWalking()) { - this.handleInput(); - } - - if (this.isWalking()) { - // Increase the animation step. - this.animationStep = ++this.animationStep % 60; - - if (this.x * 32 > this.pixelX) { - this.pixelX++; - } else if (this.x * 32 < this.pixelX) { - this.pixelX--; - } - - if (this.y * 32 > this.pixelY) { - this.pixelY++; - } else if (this.y * 32 < this.pixelY) { - this.pixelY--; - } - } else { - // Reset the animation step. - this.animationStep = 0; - } - }; - - Player.prototype.handleInput = function() { - var keyboard = this.game.keyboard, finalAction, action, inputs = { - 'moveDown': keyboard.isDown(Key.DOWN), - 'moveUp': keyboard.isDown(Key.UP), - 'moveLeft': keyboard.isDown(Key.LEFT), - 'moveRight': keyboard.isDown(Key.RIGHT) - }; - - for (action in inputs) { - if (inputs[action]) { - if (!finalAction || inputs[finalAction] < inputs[action]) { - finalAction = action; - } - } - } - - this[finalAction] && this[finalAction](); - }; - - Player.prototype.isWalking = function() { - return this.x * 32 != this.pixelX || this.y * 32 != this.pixelY; - }; - - Player.prototype.moveDown = function() { - this.y += 1; - this.direction = Direction.DOWN; - }; - - Player.prototype.moveUp = function() { - this.y -= 1; - this.direction = Direction.UP; - }; - - Player.prototype.moveLeft = function() { - this.x -= 5; - this.direction = Direction.LEFT; - }; - - Player.prototype.moveRight = function() { - this.x += 1; - this.direction = Direction.RIGHT; - }; - - Player.prototype.draw = function(context) { - var offsetX = Math.floor(this.animationStep / 15) * 32, offsetY = 0; - - switch(this.direction) { - case Direction.UP: - offsetY = 48 * 3; - break; - case Direction.RIGHT: - offsetY = 48 * 2; - break; - case Direction.LEFT: - offsetY = 48; - break; - } - - context.drawImage(this.image.data, offsetX, offsetY, 32, 48, this.pixelX, this.pixelY, 32, 48); - }; -}); diff --git a/vendor/libgit2/tests/resources/userdiff/after/file.php b/vendor/libgit2/tests/resources/userdiff/after/file.php deleted file mode 100644 index 967d6466c..000000000 --- a/vendor/libgit2/tests/resources/userdiff/after/file.php +++ /dev/null @@ -1,50 +0,0 @@ -unique() - */ -class UniqueGenerator -{ - protected $generator; - protected $maxRetries; - protected $moreStuff; - protected $uniques = array(); - - public function __construct(Generator $generator, $maxRetries) - { - $this->generator = $generator; - $this->maxRetries = $maxRetries + 1; - } - - /** - * Catch and proxy all generator calls but return only unique values - */ - public function __get($attribute) - { - return $this->__call($attribute, array()); - } - - /** - * Catch and proxy all generator calls with arguments but return only unique values - */ - public function __call($name, $arguments) - { - $i = 0; - if (!isset($this->uniques[$name])) { - $this->uniques[$name] = array(); - } - do { - $res = call_user_func_array(array($this->generator, $name), $arguments); - $i++; - if ($i >= $this->maxRetries) { - throw new \OverflowException(sprintf('Maximum retries of %d reached without finding a unique value', $this->maxRetries)); - } - } while (in_array($res, $this->uniques[$name])); - $this->uniques[$name][]= $res; - - return $res; - } -} diff --git a/vendor/libgit2/tests/resources/userdiff/before/file.html b/vendor/libgit2/tests/resources/userdiff/before/file.html deleted file mode 100644 index 872d19663..000000000 --- a/vendor/libgit2/tests/resources/userdiff/before/file.html +++ /dev/null @@ -1,41 +0,0 @@ - - -

    -
      -
    1. item 1.1
      2. -
    2. item 1.2
      3. -
    3. item 1.3
      4. -
    4. item 1.4
      5. -
    5. item 1.5
      6. -
    6. item 1.6
      7. -
    7. item 1.7
      8. -
    8. item 1.8
      9. -
    9. item 1.9
      10. -
    -

    -

    -
      -
    1. item 2.1
      2. -
    2. item 2.2
      3. -
    3. item 2.3
      4. -
    4. item 2.4
      5. -
    5. item 2.5
      6. -
    6. item 2.6
      7. -
    7. item 2.7
      8. -
    8. item 2.8
      9. -
    -

    -

    -
      -
    1. item 3.1
      2. -
    2. item 3.2
      3. -
    3. item 3.3
      4. -
    4. item 3.4
      5. -
    5. item 3.5
      6. -
    6. item 3.6
      7. -
    7. item 3.7
      8. -
    8. item 3.8
      9. -
    -

    - - diff --git a/vendor/libgit2/tests/resources/userdiff/before/file.javascript b/vendor/libgit2/tests/resources/userdiff/before/file.javascript deleted file mode 100644 index 0965b377c..000000000 --- a/vendor/libgit2/tests/resources/userdiff/before/file.javascript +++ /dev/null @@ -1,109 +0,0 @@ -define(function(require, exports, module) { - module.exports = Player; - - var Key = require("./key") - , Direction = require("./direction") - , Image = require("./image"); - - function Player(game) { - this.game = game; - - this.image = new Image("./assets/fighter.png"); - this.game.resources.add(this.image); - - this.x = 0; - this.y = 0; - - this.pixelX = 0; - this.pixelY = 0; - - this.animationStep = 0; - } - - Player.prototype.update = function() { - if (!this.isWalking()) { - this.handleInput(); - } - - if (this.isWalking()) { - // Increase the animation step. - this.animationStep = ++this.animationStep % 60; - - if (this.x * 32 > this.pixelX) { - this.pixelX++; - } else if (this.x * 32 < this.pixelX) { - this.pixelX--; - } - - if (this.y * 32 > this.pixelY) { - this.pixelY++; - } else if (this.y * 32 < this.pixelY) { - this.pixelY--; - } - } else { - // Reset the animation step. - this.animationStep = 0; - } - }; - - Player.prototype.handleInput = function() { - var keyboard = this.game.keyboard, finalAction, action, inputs = { - 'moveDown': keyboard.isDown(Key.DOWN), - 'moveUp': keyboard.isDown(Key.UP), - 'moveLeft': keyboard.isDown(Key.LEFT), - 'moveRight': keyboard.isDown(Key.RIGHT) - }; - - for (action in inputs) { - if (inputs[action]) { - if (!finalAction || inputs[finalAction] < inputs[action]) { - finalAction = action; - } - } - } - - this[finalAction] && this[finalAction](); - }; - - Player.prototype.isWalking = function() { - return this.x * 32 != this.pixelX || this.y * 32 != this.pixelY; - }; - - Player.prototype.moveDown = function() { - this.y += 1; - this.direction = Direction.DOWN; - }; - - Player.prototype.moveUp = function() { - this.y -= 1; - this.direction = Direction.UP; - }; - - Player.prototype.moveLeft = function() { - this.x -= 1; - this.direction = Direction.LEFT; - }; - - Player.prototype.moveRight = function() { - this.x += 1; - this.direction = Direction.RIGHT; - }; - - Player.prototype.draw = function(context) { - var offsetX = Math.floor(this.animationStep / 15) * 32, offsetY = 0; - - switch(this.direction) { - case Direction.UP: - offsetY = 48 * 3; - break; - case Direction.RIGHT: - offsetY = 48 * 2; - break; - case Direction.LEFT: - offsetY = 48; - break; - } - - context.drawImage(this.image.data, offsetX, offsetY, 32, 48, this.pixelX, this.pixelY - 16, 32, 48); - }; -}); diff --git a/vendor/libgit2/tests/resources/userdiff/before/file.php b/vendor/libgit2/tests/resources/userdiff/before/file.php deleted file mode 100644 index 63250ad01..000000000 --- a/vendor/libgit2/tests/resources/userdiff/before/file.php +++ /dev/null @@ -1,49 +0,0 @@ -unique() - */ -class UniqueGenerator -{ - protected $generator; - protected $maxRetries; - protected $uniques = array(); - - public function __construct(Generator $generator, $maxRetries) - { - $this->generator = $generator; - $this->maxRetries = $maxRetries; - } - - /** - * Catch and proxy all generator calls but return only unique values - */ - public function __get($attribute) - { - return $this->__call($attribute, array()); - } - - /** - * Catch and proxy all generator calls with arguments but return only unique values - */ - public function __call($name, $arguments) - { - if (!isset($this->uniques[$name])) { - $this->uniques[$name] = array(); - } - $i = 0; - do { - $res = call_user_func_array(array($this->generator, $name), $arguments); - $i++; - if ($i > $this->maxRetries) { - throw new \OverflowException(sprintf('Maximum retries of %d reached without finding a unique value', $this->maxRetries)); - } - } while (in_array($res, $this->uniques[$name])); - $this->uniques[$name][]= $res; - - return $res; - } -} diff --git a/vendor/libgit2/tests/resources/userdiff/expected/driver/diff.html b/vendor/libgit2/tests/resources/userdiff/expected/driver/diff.html deleted file mode 100644 index 5a428e7dc..000000000 --- a/vendor/libgit2/tests/resources/userdiff/expected/driver/diff.html +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/files/file.html b/files/file.html -index 872d196..2320e2f 100644 ---- a/files/file.html -+++ b/files/file.html -@@ -5,4 +5,4 @@

    -
  • item 1.1
    • --
  • item 1.2
    • --
  • item 1.3
    • -+
  • item 1.2 changed
    • -+
  • item 1.3 changed
    • -
  • item 1.4
    • -@@ -13,2 +13,3 @@

    -
  • item 1.9
    • -+
  • item 1.10 added
    • - -@@ -23,3 +24,4 @@

    -
  • item 2.6
    • --
  • item 2.7
    • -+
  • item 2.7 changed
    • -+
  • item 2.7.1 added
    • -
  • item 2.8
    • -@@ -35,4 +37,2 @@

    -
  • item 3.6
    • --
  • item 3.7
    • --
  • item 3.8
    • - diff --git a/vendor/libgit2/tests/resources/userdiff/expected/driver/diff.javascript b/vendor/libgit2/tests/resources/userdiff/expected/driver/diff.javascript deleted file mode 100644 index 4cefe5cff..000000000 --- a/vendor/libgit2/tests/resources/userdiff/expected/driver/diff.javascript +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/files/file.javascript b/files/file.javascript -index 0965b37..5391797 100644 ---- a/files/file.javascript -+++ b/files/file.javascript -@@ -4,4 +4,3 @@ function(require, exports, module) - var Key = require("./key") -- , Direction = require("./direction") -- , Image = require("./image"); -+ , Direction = require("./direction"); - -@@ -16,4 +15,4 @@ function Player(game) - -- this.pixelX = 0; -- this.pixelY = 0; -+ this.pixelX = 10; -+ this.pixelY = 10; - -@@ -82,3 +81,3 @@ Player.prototype.moveUp = function() - Player.prototype.moveLeft = function() { -- this.x -= 1; -+ this.x -= 5; - this.direction = Direction.LEFT; -@@ -106,3 +105,3 @@ Player.prototype.draw = function(context) - -- context.drawImage(this.image.data, offsetX, offsetY, 32, 48, this.pixelX, this.pixelY - 16, 32, 48); -+ context.drawImage(this.image.data, offsetX, offsetY, 32, 48, this.pixelX, this.pixelY, 32, 48); - }; diff --git a/vendor/libgit2/tests/resources/userdiff/expected/driver/diff.php b/vendor/libgit2/tests/resources/userdiff/expected/driver/diff.php deleted file mode 100644 index 9711b5b3e..000000000 --- a/vendor/libgit2/tests/resources/userdiff/expected/driver/diff.php +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/files/file.php b/files/file.php -index 63250ad..967d646 100644 ---- a/files/file.php -+++ b/files/file.php -@@ -12,2 +12,3 @@ class UniqueGenerator - protected $maxRetries; -+ protected $moreStuff; - protected $uniques = array(); -@@ -17,3 +18,3 @@ public function __construct(Generator $generator, $maxRetries) - $this->generator = $generator; -- $this->maxRetries = $maxRetries; -+ $this->maxRetries = $maxRetries + 1; - } -@@ -33,10 +34,10 @@ public function __call($name, $arguments) - { -+ $i = 0; - if (!isset($this->uniques[$name])) { - $this->uniques[$name] = array(); - } -- $i = 0; - do { - $res = call_user_func_array(array($this->generator, $name), $arguments); - $i++; -- if ($i > $this->maxRetries) { -+ if ($i >= $this->maxRetries) { - throw new \OverflowException(sprintf('Maximum retries of %d reached without finding a unique value', $this->maxRetries)); diff --git a/vendor/libgit2/tests/resources/userdiff/expected/nodriver/diff.html b/vendor/libgit2/tests/resources/userdiff/expected/nodriver/diff.html deleted file mode 100644 index 2ea4b8a16..000000000 --- a/vendor/libgit2/tests/resources/userdiff/expected/nodriver/diff.html +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/files/file.html b/files/file.html -index 872d196..2320e2f 100644 ---- a/files/file.html -+++ b/files/file.html -@@ -5,4 +5,4 @@ -
  • item 1.1
    • --
  • item 1.2
    • --
  • item 1.3
    • -+
  • item 1.2 changed
    • -+
  • item 1.3 changed
    • -
  • item 1.4
    • -@@ -13,2 +13,3 @@ -
  • item 1.9
    • -+
  • item 1.10 added
    • - -@@ -23,3 +24,4 @@ -
  • item 2.6
    • --
  • item 2.7
    • -+
  • item 2.7 changed
    • -+
  • item 2.7.1 added
    • -
  • item 2.8
    • -@@ -35,4 +37,2 @@ -
  • item 3.6
    • --
  • item 3.7
    • --
  • item 3.8
    • - diff --git a/vendor/libgit2/tests/resources/userdiff/expected/nodriver/diff.javascript b/vendor/libgit2/tests/resources/userdiff/expected/nodriver/diff.javascript deleted file mode 100644 index 4bbd54764..000000000 --- a/vendor/libgit2/tests/resources/userdiff/expected/nodriver/diff.javascript +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/files/file.javascript b/files/file.javascript -index 0965b37..5391797 100644 ---- a/files/file.javascript -+++ b/files/file.javascript -@@ -4,4 +4,3 @@ define(function(require, exports, module) { - var Key = require("./key") -- , Direction = require("./direction") -- , Image = require("./image"); -+ , Direction = require("./direction"); - -@@ -16,4 +15,4 @@ define(function(require, exports, module) { - -- this.pixelX = 0; -- this.pixelY = 0; -+ this.pixelX = 10; -+ this.pixelY = 10; - -@@ -82,3 +81,3 @@ define(function(require, exports, module) { - Player.prototype.moveLeft = function() { -- this.x -= 1; -+ this.x -= 5; - this.direction = Direction.LEFT; -@@ -106,3 +105,3 @@ define(function(require, exports, module) { - -- context.drawImage(this.image.data, offsetX, offsetY, 32, 48, this.pixelX, this.pixelY - 16, 32, 48); -+ context.drawImage(this.image.data, offsetX, offsetY, 32, 48, this.pixelX, this.pixelY, 32, 48); - }; diff --git a/vendor/libgit2/tests/resources/userdiff/expected/nodriver/diff.php b/vendor/libgit2/tests/resources/userdiff/expected/nodriver/diff.php deleted file mode 100644 index e77c094aa..000000000 --- a/vendor/libgit2/tests/resources/userdiff/expected/nodriver/diff.php +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/files/file.php b/files/file.php -index 63250ad..967d646 100644 ---- a/files/file.php -+++ b/files/file.php -@@ -12,2 +12,3 @@ class UniqueGenerator - protected $maxRetries; -+ protected $moreStuff; - protected $uniques = array(); -@@ -17,3 +18,3 @@ class UniqueGenerator - $this->generator = $generator; -- $this->maxRetries = $maxRetries; -+ $this->maxRetries = $maxRetries + 1; - } -@@ -33,10 +34,10 @@ class UniqueGenerator - { -+ $i = 0; - if (!isset($this->uniques[$name])) { - $this->uniques[$name] = array(); - } -- $i = 0; - do { - $res = call_user_func_array(array($this->generator, $name), $arguments); - $i++; -- if ($i > $this->maxRetries) { -+ if ($i >= $this->maxRetries) { - throw new \OverflowException(sprintf('Maximum retries of %d reached without finding a unique value', $this->maxRetries)); diff --git a/vendor/libgit2/tests/resources/userdiff/files/file.html b/vendor/libgit2/tests/resources/userdiff/files/file.html deleted file mode 100644 index 2320e2f1e..000000000 --- a/vendor/libgit2/tests/resources/userdiff/files/file.html +++ /dev/null @@ -1,41 +0,0 @@ - - -

    -
      -
    1. item 1.1
      2. -
    2. item 1.2 changed
      3. -
    3. item 1.3 changed
      4. -
    4. item 1.4
      5. -
    5. item 1.5
      6. -
    6. item 1.6
      7. -
    7. item 1.7
      8. -
    8. item 1.8
      9. -
    9. item 1.9
      10. -
    10. item 1.10 added
      11. -
    -

    -

    -
      -
    1. item 2.1
      2. -
    2. item 2.2
      3. -
    3. item 2.3
      4. -
    4. item 2.4
      5. -
    5. item 2.5
      6. -
    6. item 2.6
      7. -
    7. item 2.7 changed
      8. -
    8. item 2.7.1 added
      9. -
    9. item 2.8
      10. -
    -

    -

    -
      -
    1. item 3.1
      2. -
    2. item 3.2
      3. -
    3. item 3.3
      4. -
    4. item 3.4
      5. -
    5. item 3.5
      6. -
    6. item 3.6
      7. -
    -

    - - diff --git a/vendor/libgit2/tests/resources/userdiff/files/file.javascript b/vendor/libgit2/tests/resources/userdiff/files/file.javascript deleted file mode 100644 index 53917973a..000000000 --- a/vendor/libgit2/tests/resources/userdiff/files/file.javascript +++ /dev/null @@ -1,108 +0,0 @@ -define(function(require, exports, module) { - module.exports = Player; - - var Key = require("./key") - , Direction = require("./direction"); - - function Player(game) { - this.game = game; - - this.image = new Image("./assets/fighter.png"); - this.game.resources.add(this.image); - - this.x = 0; - this.y = 0; - - this.pixelX = 10; - this.pixelY = 10; - - this.animationStep = 0; - } - - Player.prototype.update = function() { - if (!this.isWalking()) { - this.handleInput(); - } - - if (this.isWalking()) { - // Increase the animation step. - this.animationStep = ++this.animationStep % 60; - - if (this.x * 32 > this.pixelX) { - this.pixelX++; - } else if (this.x * 32 < this.pixelX) { - this.pixelX--; - } - - if (this.y * 32 > this.pixelY) { - this.pixelY++; - } else if (this.y * 32 < this.pixelY) { - this.pixelY--; - } - } else { - // Reset the animation step. - this.animationStep = 0; - } - }; - - Player.prototype.handleInput = function() { - var keyboard = this.game.keyboard, finalAction, action, inputs = { - 'moveDown': keyboard.isDown(Key.DOWN), - 'moveUp': keyboard.isDown(Key.UP), - 'moveLeft': keyboard.isDown(Key.LEFT), - 'moveRight': keyboard.isDown(Key.RIGHT) - }; - - for (action in inputs) { - if (inputs[action]) { - if (!finalAction || inputs[finalAction] < inputs[action]) { - finalAction = action; - } - } - } - - this[finalAction] && this[finalAction](); - }; - - Player.prototype.isWalking = function() { - return this.x * 32 != this.pixelX || this.y * 32 != this.pixelY; - }; - - Player.prototype.moveDown = function() { - this.y += 1; - this.direction = Direction.DOWN; - }; - - Player.prototype.moveUp = function() { - this.y -= 1; - this.direction = Direction.UP; - }; - - Player.prototype.moveLeft = function() { - this.x -= 5; - this.direction = Direction.LEFT; - }; - - Player.prototype.moveRight = function() { - this.x += 1; - this.direction = Direction.RIGHT; - }; - - Player.prototype.draw = function(context) { - var offsetX = Math.floor(this.animationStep / 15) * 32, offsetY = 0; - - switch(this.direction) { - case Direction.UP: - offsetY = 48 * 3; - break; - case Direction.RIGHT: - offsetY = 48 * 2; - break; - case Direction.LEFT: - offsetY = 48; - break; - } - - context.drawImage(this.image.data, offsetX, offsetY, 32, 48, this.pixelX, this.pixelY, 32, 48); - }; -}); diff --git a/vendor/libgit2/tests/resources/userdiff/files/file.php b/vendor/libgit2/tests/resources/userdiff/files/file.php deleted file mode 100644 index 967d6466c..000000000 --- a/vendor/libgit2/tests/resources/userdiff/files/file.php +++ /dev/null @@ -1,50 +0,0 @@ -unique() - */ -class UniqueGenerator -{ - protected $generator; - protected $maxRetries; - protected $moreStuff; - protected $uniques = array(); - - public function __construct(Generator $generator, $maxRetries) - { - $this->generator = $generator; - $this->maxRetries = $maxRetries + 1; - } - - /** - * Catch and proxy all generator calls but return only unique values - */ - public function __get($attribute) - { - return $this->__call($attribute, array()); - } - - /** - * Catch and proxy all generator calls with arguments but return only unique values - */ - public function __call($name, $arguments) - { - $i = 0; - if (!isset($this->uniques[$name])) { - $this->uniques[$name] = array(); - } - do { - $res = call_user_func_array(array($this->generator, $name), $arguments); - $i++; - if ($i >= $this->maxRetries) { - throw new \OverflowException(sprintf('Maximum retries of %d reached without finding a unique value', $this->maxRetries)); - } - } while (in_array($res, $this->uniques[$name])); - $this->uniques[$name][]= $res; - - return $res; - } -} diff --git a/vendor/libgit2/tests/resources/win32-forbidden/.gitted/HEAD b/vendor/libgit2/tests/resources/win32-forbidden/.gitted/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/vendor/libgit2/tests/resources/win32-forbidden/.gitted/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/vendor/libgit2/tests/resources/win32-forbidden/.gitted/config b/vendor/libgit2/tests/resources/win32-forbidden/.gitted/config deleted file mode 100644 index 6c9406b7d..000000000 --- a/vendor/libgit2/tests/resources/win32-forbidden/.gitted/config +++ /dev/null @@ -1,7 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = true diff --git a/vendor/libgit2/tests/resources/win32-forbidden/.gitted/index b/vendor/libgit2/tests/resources/win32-forbidden/.gitted/index deleted file mode 100644 index 1202dd9f4ae5b5246426b4b7bdc787a12af44248..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 577 zcmZ?q402{*U|<4b_OQdze}OaujAmqDU}3rwx0->WaR~zh<5!@R2oUp#XSw!IdGIQz z=v?~Y?9bfUFHe0_X5iCH&n!tSDJjZKDlJJZhL|Jy2bqSLXZjY+JiS{5F=8+@FfcPQQP4}zEJ-XWDauSLElDkA5YKY$pYq^UP|>;c z!`Yv?vtOS2rVLf-?C-~LE6Hl_)a*@v8-k8=9DnQlAy!h?94hToP-2KrJ~1&-ucV@c xq2G1YwNKVlIe%2-B-TkDR9{z?Fbir#Vrd0F6VftsQVAJRRaJ#k2>{B;WqZ3*KK=jz diff --git a/vendor/libgit2/tests/resources/win32-forbidden/.gitted/objects/17/6a458f94e0ea5272ce67c36bf30b6be9caf623 b/vendor/libgit2/tests/resources/win32-forbidden/.gitted/objects/17/6a458f94e0ea5272ce67c36bf30b6be9caf623 deleted file mode 100644 index ef83166706c43aabd3c68d155be9c92a23960f0f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 28 kcmb5Fkmn=FfcPQQE>M6W4M)MwRdXvroRnA$2pF_b^Z`5scR0E z_9-Ya#3!Gan5b7$QNqygy6V~|>#3YSDsmF*BoC^uD@&LKH6pRJ0-p(KnK`M1jHs%r L!l?uR{HIf1PD3w2 diff --git a/vendor/libgit2/tests/resources/win32-forbidden/.gitted/objects/34/96991d72d500af36edef68bbfcccd1661d88db b/vendor/libgit2/tests/resources/win32-forbidden/.gitted/objects/34/96991d72d500af36edef68bbfcccd1661d88db deleted file mode 100644 index 71b6172c6..000000000 --- a/vendor/libgit2/tests/resources/win32-forbidden/.gitted/objects/34/96991d72d500af36edef68bbfcccd1661d88db +++ /dev/null @@ -1,3 +0,0 @@ -x•Í -!…[ûw„ãï†hÓ¢}/à8šB*8N½~½@guÎÇÕœS‡ Í¡7ïa¢ -©fš2ËÐ"s e.È%ŒÁQ —ŠØ½ÇÚ຾m[ákÞjÙúm—Gêq_N®æ3LBJÅ”FG:B¯Ýÿã ®„ùùäVROö Í¿Ò–j!èÖ=ö \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/win32-forbidden/.gitted/objects/8f/45aad6f23b9509f8786c617e19c127ae76609a b/vendor/libgit2/tests/resources/win32-forbidden/.gitted/objects/8f/45aad6f23b9509f8786c617e19c127ae76609a deleted file mode 100644 index 8bcd980c4..000000000 --- a/vendor/libgit2/tests/resources/win32-forbidden/.gitted/objects/8f/45aad6f23b9509f8786c617e19c127ae76609a +++ /dev/null @@ -1,2 +0,0 @@ -xÁA -€ ÐÖâ/kÓ.ð ]`„™¾ŽhÞ¾÷"=â Ë•ò€e*’ ¨·UŠÂ+¶äMí%çý´O4ÊcÞ˱þá– \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/win32-forbidden/.gitted/objects/da/623abd956bb2fd8052c708c7ed43f05d192d37 b/vendor/libgit2/tests/resources/win32-forbidden/.gitted/objects/da/623abd956bb2fd8052c708c7ed43f05d192d37 deleted file mode 100644 index 923462306f0fb2612820702c6b18f53f3c95b479..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 59 zcmbFMi#hOzsp>a%59Po8VGq(58w PWV-n4LPmy_m?ÛBgôqàãøVJ ³=FÀ ‰¤ÕdJTæqDd­BáæNå¼'Îì6Rëp ÛÜS+k«pŠÓþÖå™GÚÜÁ·rAR*Tz!Øó ›vVGü÷Ïn5l_Ðã;¯¹Uö>H \ No newline at end of file diff --git a/vendor/libgit2/tests/resources/win32-forbidden/.gitted/refs/heads/master b/vendor/libgit2/tests/resources/win32-forbidden/.gitted/refs/heads/master deleted file mode 100644 index 47fce0fe3..000000000 --- a/vendor/libgit2/tests/resources/win32-forbidden/.gitted/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -3496991d72d500af36edef68bbfcccd1661d88db diff --git a/vendor/libgit2/tests/revert/bare.c b/vendor/libgit2/tests/revert/bare.c deleted file mode 100644 index 206c86d70..000000000 --- a/vendor/libgit2/tests/revert/bare.c +++ /dev/null @@ -1,107 +0,0 @@ -#include "clar.h" -#include "clar_libgit2.h" - -#include "buffer.h" -#include "fileops.h" -#include "git2/revert.h" - -#include "../merge/merge_helpers.h" - -#define TEST_REPO_PATH "revert" - -static git_repository *repo; - -// Fixture setup and teardown -void test_revert_bare__initialize(void) -{ - repo = cl_git_sandbox_init(TEST_REPO_PATH); -} - -void test_revert_bare__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -void test_revert_bare__automerge(void) -{ - git_commit *head_commit, *revert_commit; - git_oid head_oid, revert_oid; - git_index *index; - - struct merge_index_entry merge_index_entries[] = { - { 0100644, "caf99de3a49827117bb66721010eac461b06a80c", 0, "file1.txt" }, - { 0100644, "0ab09ea6d4c3634bdf6c221626d8b6f7dd890767", 0, "file2.txt" }, - { 0100644, "f4e107c230d08a60fb419d19869f1f282b272d9c", 0, "file3.txt" }, - { 0100644, "0f5bfcf58c558d865da6be0281d7795993646cee", 0, "file6.txt" }, - }; - - git_oid_fromstr(&head_oid, "72333f47d4e83616630ff3b0ffe4c0faebcc3c45"); - cl_git_pass(git_commit_lookup(&head_commit, repo, &head_oid)); - - git_oid_fromstr(&revert_oid, "d1d403d22cbe24592d725f442835cf46fe60c8ac"); - cl_git_pass(git_commit_lookup(&revert_commit, repo, &revert_oid)); - - cl_git_pass(git_revert_commit(&index, repo, revert_commit, head_commit, 0, NULL)); - cl_assert(merge_test_index(index, merge_index_entries, 4)); - - git_commit_free(revert_commit); - git_commit_free(head_commit); - git_index_free(index); -} - -void test_revert_bare__conflicts(void) -{ - git_reference *head_ref; - git_commit *head_commit, *revert_commit; - git_oid revert_oid; - git_index *index; - - struct merge_index_entry merge_index_entries[] = { - { 0100644, "7731926a337c4eaba1e2187d90ebfa0a93659382", 1, "file1.txt" }, - { 0100644, "4b8fcff56437e60f58e9a6bc630dd242ebf6ea2c", 2, "file1.txt" }, - { 0100644, "3a3ef367eaf3fe79effbfb0a56b269c04c2b59fe", 3, "file1.txt" }, - { 0100644, "0ab09ea6d4c3634bdf6c221626d8b6f7dd890767", 0, "file2.txt" }, - { 0100644, "f4e107c230d08a60fb419d19869f1f282b272d9c", 0, "file3.txt" }, - { 0100644, "0f5bfcf58c558d865da6be0281d7795993646cee", 0, "file6.txt" }, - }; - - git_oid_fromstr(&revert_oid, "72333f47d4e83616630ff3b0ffe4c0faebcc3c45"); - - cl_git_pass(git_repository_head(&head_ref, repo)); - cl_git_pass(git_reference_peel((git_object **)&head_commit, head_ref, GIT_OBJ_COMMIT)); - - cl_git_pass(git_commit_lookup(&revert_commit, repo, &revert_oid)); - cl_git_pass(git_revert_commit(&index, repo, revert_commit, head_commit, 0, NULL)); - - cl_assert(git_index_has_conflicts(index)); - cl_assert(merge_test_index(index, merge_index_entries, 6)); - - git_commit_free(revert_commit); - git_commit_free(head_commit); - git_reference_free(head_ref); - git_index_free(index); -} - -void test_revert_bare__orphan(void) -{ - git_commit *head_commit, *revert_commit; - git_oid head_oid, revert_oid; - git_index *index; - - struct merge_index_entry merge_index_entries[] = { - { 0100644, "296a6d3be1dff05c5d1f631d2459389fa7b619eb", 0, "file-mainline.txt" }, - }; - - git_oid_fromstr(&head_oid, "39467716290f6df775a91cdb9a4eb39295018145"); - cl_git_pass(git_commit_lookup(&head_commit, repo, &head_oid)); - - git_oid_fromstr(&revert_oid, "ebb03002cee5d66c7732dd06241119fe72ab96a5"); - cl_git_pass(git_commit_lookup(&revert_commit, repo, &revert_oid)); - - cl_git_pass(git_revert_commit(&index, repo, revert_commit, head_commit, 0, NULL)); - cl_assert(merge_test_index(index, merge_index_entries, 1)); - - git_commit_free(revert_commit); - git_commit_free(head_commit); - git_index_free(index); -} diff --git a/vendor/libgit2/tests/revert/workdir.c b/vendor/libgit2/tests/revert/workdir.c deleted file mode 100644 index 802819c75..000000000 --- a/vendor/libgit2/tests/revert/workdir.c +++ /dev/null @@ -1,577 +0,0 @@ -#include "clar.h" -#include "clar_libgit2.h" - -#include "buffer.h" -#include "fileops.h" -#include "git2/revert.h" - -#include "../merge/merge_helpers.h" - -#define TEST_REPO_PATH "revert" - -static git_repository *repo; -static git_index *repo_index; - -// Fixture setup and teardown -void test_revert_workdir__initialize(void) -{ - git_config *cfg; - - repo = cl_git_sandbox_init(TEST_REPO_PATH); - git_repository_index(&repo_index, repo); - - /* Ensure that the user's merge.conflictstyle doesn't interfere */ - cl_git_pass(git_repository_config(&cfg, repo)); - cl_git_pass(git_config_set_string(cfg, "merge.conflictstyle", "merge")); - git_config_free(cfg); -} - -void test_revert_workdir__cleanup(void) -{ - git_index_free(repo_index); - cl_git_sandbox_cleanup(); -} - -/* git reset --hard 72333f47d4e83616630ff3b0ffe4c0faebcc3c45 - * git revert --no-commit d1d403d22cbe24592d725f442835cf46fe60c8ac */ -void test_revert_workdir__automerge(void) -{ - git_commit *head, *commit; - git_oid head_oid, revert_oid; - - struct merge_index_entry merge_index_entries[] = { - { 0100644, "caf99de3a49827117bb66721010eac461b06a80c", 0, "file1.txt" }, - { 0100644, "0ab09ea6d4c3634bdf6c221626d8b6f7dd890767", 0, "file2.txt" }, - { 0100644, "f4e107c230d08a60fb419d19869f1f282b272d9c", 0, "file3.txt" }, - { 0100644, "0f5bfcf58c558d865da6be0281d7795993646cee", 0, "file6.txt" }, - }; - - git_oid_fromstr(&head_oid, "72333f47d4e83616630ff3b0ffe4c0faebcc3c45"); - cl_git_pass(git_commit_lookup(&head, repo, &head_oid)); - cl_git_pass(git_reset(repo, (git_object *)head, GIT_RESET_HARD, NULL)); - - git_oid_fromstr(&revert_oid, "d1d403d22cbe24592d725f442835cf46fe60c8ac"); - cl_git_pass(git_commit_lookup(&commit, repo, &revert_oid)); - cl_git_pass(git_revert(repo, commit, NULL)); - - cl_assert(merge_test_index(repo_index, merge_index_entries, 4)); - - git_commit_free(commit); - git_commit_free(head); -} - -/* git revert --no-commit 72333f47d4e83616630ff3b0ffe4c0faebcc3c45 */ -void test_revert_workdir__conflicts(void) -{ - git_reference *head_ref; - git_commit *head, *commit; - git_oid revert_oid; - git_buf conflicting_buf = GIT_BUF_INIT, mergemsg_buf = GIT_BUF_INIT; - - struct merge_index_entry merge_index_entries[] = { - { 0100644, "7731926a337c4eaba1e2187d90ebfa0a93659382", 1, "file1.txt" }, - { 0100644, "4b8fcff56437e60f58e9a6bc630dd242ebf6ea2c", 2, "file1.txt" }, - { 0100644, "3a3ef367eaf3fe79effbfb0a56b269c04c2b59fe", 3, "file1.txt" }, - { 0100644, "0ab09ea6d4c3634bdf6c221626d8b6f7dd890767", 0, "file2.txt" }, - { 0100644, "f4e107c230d08a60fb419d19869f1f282b272d9c", 0, "file3.txt" }, - { 0100644, "0f5bfcf58c558d865da6be0281d7795993646cee", 0, "file6.txt" }, - }; - - git_oid_fromstr(&revert_oid, "72333f47d4e83616630ff3b0ffe4c0faebcc3c45"); - - cl_git_pass(git_repository_head(&head_ref, repo)); - cl_git_pass(git_reference_peel((git_object **)&head, head_ref, GIT_OBJ_COMMIT)); - cl_git_pass(git_reset(repo, (git_object *)head, GIT_RESET_HARD, NULL)); - - cl_git_pass(git_commit_lookup(&commit, repo, &revert_oid)); - cl_git_pass(git_revert(repo, commit, NULL)); - - cl_assert(merge_test_index(repo_index, merge_index_entries, 6)); - - cl_git_pass(git_futils_readbuffer(&conflicting_buf, - TEST_REPO_PATH "/file1.txt")); - cl_assert(strcmp(conflicting_buf.ptr, "!File one!\n" \ - "!File one!\n" \ - "File one!\n" \ - "File one\n" \ - "File one\n" \ - "File one\n" \ - "File one\n" \ - "File one\n" \ - "File one\n" \ - "File one\n" \ - "<<<<<<< HEAD\n" \ - "File one!\n" \ - "!File one!\n" \ - "!File one!\n" \ - "!File one!\n" \ - "=======\n" \ - "File one\n" \ - "File one\n" \ - "File one\n" \ - "File one\n" \ - ">>>>>>> parent of 72333f4... automergeable changes\n") == 0); - - cl_assert(git_path_exists(TEST_REPO_PATH "/.git/MERGE_MSG")); - cl_git_pass(git_futils_readbuffer(&mergemsg_buf, - TEST_REPO_PATH "/.git/MERGE_MSG")); - cl_assert(strcmp(mergemsg_buf.ptr, - "Revert \"automergeable changes\"\n" \ - "\n" \ - "This reverts commit 72333f47d4e83616630ff3b0ffe4c0faebcc3c45.\n" - "\n" \ - "Conflicts:\n" \ - "\tfile1.txt\n") == 0); - - git_commit_free(commit); - git_commit_free(head); - git_reference_free(head_ref); - git_buf_free(&mergemsg_buf); - git_buf_free(&conflicting_buf); -} - -/* git reset --hard 39467716290f6df775a91cdb9a4eb39295018145 - * git revert --no-commit ebb03002cee5d66c7732dd06241119fe72ab96a5 -*/ -void test_revert_workdir__orphan(void) -{ - git_commit *head, *commit; - git_oid head_oid, revert_oid; - - struct merge_index_entry merge_index_entries[] = { - { 0100644, "296a6d3be1dff05c5d1f631d2459389fa7b619eb", 0, "file-mainline.txt" }, - }; - - git_oid_fromstr(&head_oid, "39467716290f6df775a91cdb9a4eb39295018145"); - cl_git_pass(git_commit_lookup(&head, repo, &head_oid)); - cl_git_pass(git_reset(repo, (git_object *)head, GIT_RESET_HARD, NULL)); - - git_oid_fromstr(&revert_oid, "ebb03002cee5d66c7732dd06241119fe72ab96a5"); - cl_git_pass(git_commit_lookup(&commit, repo, &revert_oid)); - cl_git_pass(git_revert(repo, commit, NULL)); - - cl_assert(merge_test_index(repo_index, merge_index_entries, 1)); - - git_commit_free(commit); - git_commit_free(head); -} - -/* - * revert the same commit twice (when the first reverts cleanly): - * - * git revert 2d440f2 - * git revert 2d440f2 - */ -void test_revert_workdir__again(void) -{ - git_reference *head_ref; - git_commit *orig_head; - git_tree *reverted_tree; - git_oid reverted_tree_oid, reverted_commit_oid; - git_signature *signature; - - struct merge_index_entry merge_index_entries[] = { - { 0100644, "7731926a337c4eaba1e2187d90ebfa0a93659382", 0, "file1.txt" }, - { 0100644, "0ab09ea6d4c3634bdf6c221626d8b6f7dd890767", 0, "file2.txt" }, - { 0100644, "f4e107c230d08a60fb419d19869f1f282b272d9c", 0, "file3.txt" }, - { 0100644, "0f5bfcf58c558d865da6be0281d7795993646cee", 0, "file6.txt" }, - }; - - cl_git_pass(git_repository_head(&head_ref, repo)); - cl_git_pass(git_reference_peel((git_object **)&orig_head, head_ref, GIT_OBJ_COMMIT)); - cl_git_pass(git_reset(repo, (git_object *)orig_head, GIT_RESET_HARD, NULL)); - - cl_git_pass(git_revert(repo, orig_head, NULL)); - - cl_assert(merge_test_index(repo_index, merge_index_entries, 4)); - - cl_git_pass(git_index_write_tree(&reverted_tree_oid, repo_index)); - cl_git_pass(git_tree_lookup(&reverted_tree, repo, &reverted_tree_oid)); - - cl_git_pass(git_signature_new(&signature, "Reverter", "reverter@example.org", time(NULL), 0)); - cl_git_pass(git_commit_create(&reverted_commit_oid, repo, "HEAD", signature, signature, NULL, "Reverted!", reverted_tree, 1, (const git_commit **)&orig_head)); - - cl_git_pass(git_revert(repo, orig_head, NULL)); - cl_assert(merge_test_index(repo_index, merge_index_entries, 4)); - - git_signature_free(signature); - git_tree_free(reverted_tree); - git_commit_free(orig_head); - git_reference_free(head_ref); -} - -/* git reset --hard 72333f47d4e83616630ff3b0ffe4c0faebcc3c45 - * git revert --no-commit d1d403d22cbe24592d725f442835cf46fe60c8ac */ -void test_revert_workdir__again_after_automerge(void) -{ - git_commit *head, *commit; - git_tree *reverted_tree; - git_oid head_oid, revert_oid, reverted_tree_oid, reverted_commit_oid; - git_signature *signature; - - struct merge_index_entry merge_index_entries[] = { - { 0100644, "caf99de3a49827117bb66721010eac461b06a80c", 0, "file1.txt" }, - { 0100644, "0ab09ea6d4c3634bdf6c221626d8b6f7dd890767", 0, "file2.txt" }, - { 0100644, "f4e107c230d08a60fb419d19869f1f282b272d9c", 0, "file3.txt" }, - { 0100644, "0f5bfcf58c558d865da6be0281d7795993646cee", 0, "file6.txt" }, - }; - - struct merge_index_entry second_revert_entries[] = { - { 0100644, "3a3ef367eaf3fe79effbfb0a56b269c04c2b59fe", 1, "file1.txt" }, - { 0100644, "caf99de3a49827117bb66721010eac461b06a80c", 2, "file1.txt" }, - { 0100644, "747726e021bc5f44b86de60e3032fd6f9f1b8383", 3, "file1.txt" }, - { 0100644, "0ab09ea6d4c3634bdf6c221626d8b6f7dd890767", 0, "file2.txt" }, - { 0100644, "f4e107c230d08a60fb419d19869f1f282b272d9c", 0, "file3.txt" }, - { 0100644, "0f5bfcf58c558d865da6be0281d7795993646cee", 0, "file6.txt" }, - }; - - git_oid_fromstr(&head_oid, "72333f47d4e83616630ff3b0ffe4c0faebcc3c45"); - cl_git_pass(git_commit_lookup(&head, repo, &head_oid)); - cl_git_pass(git_reset(repo, (git_object *)head, GIT_RESET_HARD, NULL)); - - git_oid_fromstr(&revert_oid, "d1d403d22cbe24592d725f442835cf46fe60c8ac"); - cl_git_pass(git_commit_lookup(&commit, repo, &revert_oid)); - cl_git_pass(git_revert(repo, commit, NULL)); - - cl_assert(merge_test_index(repo_index, merge_index_entries, 4)); - - cl_git_pass(git_index_write_tree(&reverted_tree_oid, repo_index)); - cl_git_pass(git_tree_lookup(&reverted_tree, repo, &reverted_tree_oid)); - - cl_git_pass(git_signature_new(&signature, "Reverter", "reverter@example.org", time(NULL), 0)); - cl_git_pass(git_commit_create(&reverted_commit_oid, repo, "HEAD", signature, signature, NULL, "Reverted!", reverted_tree, 1, (const git_commit **)&head)); - - cl_git_pass(git_revert(repo, commit, NULL)); - cl_assert(merge_test_index(repo_index, second_revert_entries, 6)); - - git_signature_free(signature); - git_tree_free(reverted_tree); - git_commit_free(commit); - git_commit_free(head); -} - -/* - * revert the same commit twice (when the first reverts cleanly): - * - * git revert 2d440f2 - * git revert 2d440f2 - */ -void test_revert_workdir__again_after_edit(void) -{ - git_reference *head_ref; - git_commit *orig_head, *commit; - git_tree *reverted_tree; - git_oid orig_head_oid, revert_oid, reverted_tree_oid, reverted_commit_oid; - git_signature *signature; - - struct merge_index_entry merge_index_entries[] = { - { 0100644, "3721552e06c4bdc7d478e0674e6304888545d5fd", 0, "file1.txt" }, - { 0100644, "0ab09ea6d4c3634bdf6c221626d8b6f7dd890767", 0, "file2.txt" }, - { 0100644, "f4e107c230d08a60fb419d19869f1f282b272d9c", 0, "file3.txt" }, - { 0100644, "0f5bfcf58c558d865da6be0281d7795993646cee", 0, "file6.txt" }, - }; - - cl_git_pass(git_repository_head(&head_ref, repo)); - - cl_git_pass(git_oid_fromstr(&orig_head_oid, "399fb3aba3d9d13f7d40a9254ce4402067ef3149")); - cl_git_pass(git_commit_lookup(&orig_head, repo, &orig_head_oid)); - cl_git_pass(git_reset(repo, (git_object *)orig_head, GIT_RESET_HARD, NULL)); - - cl_git_pass(git_oid_fromstr(&revert_oid, "2d440f2b3147d3dc7ad1085813478d6d869d5a4d")); - cl_git_pass(git_commit_lookup(&commit, repo, &revert_oid)); - - cl_git_pass(git_revert(repo, commit, NULL)); - - cl_assert(merge_test_index(repo_index, merge_index_entries, 4)); - - cl_git_pass(git_index_write_tree(&reverted_tree_oid, repo_index)); - cl_git_pass(git_tree_lookup(&reverted_tree, repo, &reverted_tree_oid)); - - cl_git_pass(git_signature_new(&signature, "Reverter", "reverter@example.org", time(NULL), 0)); - cl_git_pass(git_commit_create(&reverted_commit_oid, repo, "HEAD", signature, signature, NULL, "Reverted!", reverted_tree, 1, (const git_commit **)&orig_head)); - - cl_git_pass(git_revert(repo, commit, NULL)); - cl_assert(merge_test_index(repo_index, merge_index_entries, 4)); - - git_signature_free(signature); - git_tree_free(reverted_tree); - git_commit_free(commit); - git_commit_free(orig_head); - git_reference_free(head_ref); -} - -/* - * revert the same commit twice (when the first reverts cleanly): - * - * git reset --hard 75ec9929465623f17ff3ad68c0438ea56faba815 - * git revert 97e52d5e81f541080cd6b92829fb85bc4d81d90b - */ -void test_revert_workdir__again_after_edit_two(void) -{ - git_buf diff_buf = GIT_BUF_INIT; - git_config *config; - git_oid head_commit_oid, revert_commit_oid; - git_commit *head_commit, *revert_commit; - - struct merge_index_entry merge_index_entries[] = { - { 0100644, "a8c86221b400b836010567cc3593db6e96c1a83a", 1, "file.txt" }, - { 0100644, "46ff0854663aeb2182b9838c8da68e33ac23bc1e", 2, "file.txt" }, - { 0100644, "21a96a98ed84d45866e1de6e266fd3a61a4ae9dc", 3, "file.txt" }, - }; - - cl_git_pass(git_repository_config(&config, repo)); - cl_git_pass(git_config_set_bool(config, "core.autocrlf", 0)); - - cl_git_pass(git_oid_fromstr(&head_commit_oid, "75ec9929465623f17ff3ad68c0438ea56faba815")); - cl_git_pass(git_commit_lookup(&head_commit, repo, &head_commit_oid)); - cl_git_pass(git_reset(repo, (git_object *)head_commit, GIT_RESET_HARD, NULL)); - - cl_git_pass(git_oid_fromstr(&revert_commit_oid, "97e52d5e81f541080cd6b92829fb85bc4d81d90b")); - cl_git_pass(git_commit_lookup(&revert_commit, repo, &revert_commit_oid)); - - cl_git_pass(git_revert(repo, revert_commit, NULL)); - - cl_assert(merge_test_index(repo_index, merge_index_entries, 3)); - - cl_git_pass(git_futils_readbuffer(&diff_buf, "revert/file.txt")); - cl_assert_equal_s( - "a\n" \ - "<<<<<<< HEAD\n" \ - "=======\n" \ - "a\n" \ - ">>>>>>> parent of 97e52d5... Revert me\n" \ - "a\n" \ - "a\n" \ - "a\n" \ - "a\n" \ - "ab", - diff_buf.ptr); - - git_commit_free(revert_commit); - git_commit_free(head_commit); - git_config_free(config); - git_buf_free(&diff_buf); -} - -/* git reset --hard 72333f47d4e83616630ff3b0ffe4c0faebcc3c45 - * git revert --no-commit d1d403d22cbe24592d725f442835cf46fe60c8ac */ -void test_revert_workdir__conflict_use_ours(void) -{ - git_commit *head, *commit; - git_oid head_oid, revert_oid; - git_revert_options opts = GIT_REVERT_OPTIONS_INIT; - - struct merge_index_entry merge_index_entries[] = { - { 0100644, "caf99de3a49827117bb66721010eac461b06a80c", 0, "file1.txt" }, - { 0100644, "0ab09ea6d4c3634bdf6c221626d8b6f7dd890767", 0, "file2.txt" }, - { 0100644, "f4e107c230d08a60fb419d19869f1f282b272d9c", 0, "file3.txt" }, - { 0100644, "0f5bfcf58c558d865da6be0281d7795993646cee", 0, "file6.txt" }, - }; - - struct merge_index_entry merge_filesystem_entries[] = { - { 0100644, "caf99de3a49827117bb66721010eac461b06a80c", 0, "file1.txt" }, - { 0100644, "0ab09ea6d4c3634bdf6c221626d8b6f7dd890767", 0, "file2.txt" }, - { 0100644, "f4e107c230d08a60fb419d19869f1f282b272d9c", 0, "file3.txt" }, - { 0100644, "0f5bfcf58c558d865da6be0281d7795993646cee", 0, "file6.txt" }, - }; - - opts.checkout_opts.checkout_strategy = GIT_CHECKOUT_SAFE | GIT_CHECKOUT_USE_OURS; - - git_oid_fromstr(&head_oid, "72333f47d4e83616630ff3b0ffe4c0faebcc3c45"); - cl_git_pass(git_commit_lookup(&head, repo, &head_oid)); - cl_git_pass(git_reset(repo, (git_object *)head, GIT_RESET_HARD, NULL)); - - git_oid_fromstr(&revert_oid, "d1d403d22cbe24592d725f442835cf46fe60c8ac"); - cl_git_pass(git_commit_lookup(&commit, repo, &revert_oid)); - cl_git_pass(git_revert(repo, commit, &opts)); - - cl_assert(merge_test_index(repo_index, merge_index_entries, 4)); - cl_assert(merge_test_workdir(repo, merge_filesystem_entries, 4)); - - git_commit_free(commit); - git_commit_free(head); -} - -/* git reset --hard cef56612d71a6af8d8015691e4865f7fece905b5 - * git revert --no-commit 55568c8de5322ff9a95d72747a239cdb64a19965 - */ -void test_revert_workdir__rename_1_of_2(void) -{ - git_commit *head, *commit; - git_oid head_oid, revert_oid; - git_revert_options opts = GIT_REVERT_OPTIONS_INIT; - - struct merge_index_entry merge_index_entries[] = { - { 0100644, "747726e021bc5f44b86de60e3032fd6f9f1b8383", 0, "file1.txt" }, - { 0100644, "0ab09ea6d4c3634bdf6c221626d8b6f7dd890767", 0, "file2.txt" }, - { 0100644, "f4e107c230d08a60fb419d19869f1f282b272d9c", 0, "file3.txt" }, - { 0100644, "55acf326a69f0aab7a974ec53ffa55a50bcac14e", 3, "file4.txt" }, - { 0100644, "55acf326a69f0aab7a974ec53ffa55a50bcac14e", 1, "file5.txt" }, - { 0100644, "0f5bfcf58c558d865da6be0281d7795993646cee", 2, "file6.txt" }, - }; - - opts.merge_opts.flags |= GIT_MERGE_FIND_RENAMES; - opts.merge_opts.rename_threshold = 50; - - git_oid_fromstr(&head_oid, "cef56612d71a6af8d8015691e4865f7fece905b5"); - cl_git_pass(git_commit_lookup(&head, repo, &head_oid)); - cl_git_pass(git_reset(repo, (git_object *)head, GIT_RESET_HARD, NULL)); - - git_oid_fromstr(&revert_oid, "55568c8de5322ff9a95d72747a239cdb64a19965"); - cl_git_pass(git_commit_lookup(&commit, repo, &revert_oid)); - cl_git_pass(git_revert(repo, commit, &opts)); - - cl_assert(merge_test_index(repo_index, merge_index_entries, 6)); - - git_commit_free(commit); - git_commit_free(head); -} - -/* git reset --hard 55568c8de5322ff9a95d72747a239cdb64a19965 - * git revert --no-commit HEAD~1 */ -void test_revert_workdir__rename(void) -{ - git_commit *head, *commit; - git_oid head_oid, revert_oid; - git_revert_options opts = GIT_REVERT_OPTIONS_INIT; - - struct merge_index_entry merge_index_entries[] = { - { 0100644, "55acf326a69f0aab7a974ec53ffa55a50bcac14e", 1, "file4.txt" }, - { 0100644, "55acf326a69f0aab7a974ec53ffa55a50bcac14e", 2, "file5.txt" }, - }; - - struct merge_name_entry merge_name_entries[] = { - { "file4.txt", "file5.txt", "" }, - }; - - opts.merge_opts.flags |= GIT_MERGE_FIND_RENAMES; - opts.merge_opts.rename_threshold = 50; - - git_oid_fromstr(&head_oid, "55568c8de5322ff9a95d72747a239cdb64a19965"); - cl_git_pass(git_commit_lookup(&head, repo, &head_oid)); - cl_git_pass(git_reset(repo, (git_object *)head, GIT_RESET_HARD, NULL)); - - git_oid_fromstr(&revert_oid, "0aa8c7e40d342fff78d60b29a4ba8e993ed79c51"); - cl_git_pass(git_commit_lookup(&commit, repo, &revert_oid)); - cl_git_pass(git_revert(repo, commit, &opts)); - - cl_assert(merge_test_index(repo_index, merge_index_entries, 2)); - cl_assert(merge_test_names(repo_index, merge_name_entries, 1)); - - git_commit_free(commit); - git_commit_free(head); -} - -/* git revert --no-commit HEAD */ -void test_revert_workdir__head(void) -{ - git_reference *head; - git_commit *commit; - - struct merge_index_entry merge_index_entries[] = { - { 0100644, "7731926a337c4eaba1e2187d90ebfa0a93659382", 0, "file1.txt" }, - { 0100644, "0ab09ea6d4c3634bdf6c221626d8b6f7dd890767", 0, "file2.txt" }, - { 0100644, "f4e107c230d08a60fb419d19869f1f282b272d9c", 0, "file3.txt" }, - { 0100644, "0f5bfcf58c558d865da6be0281d7795993646cee", 0, "file6.txt" }, - }; - - /* HEAD is 2d440f2b3147d3dc7ad1085813478d6d869d5a4d */ - cl_git_pass(git_repository_head(&head, repo)); - cl_git_pass(git_reference_peel((git_object **)&commit, head, GIT_OBJ_COMMIT)); - cl_git_pass(git_reset(repo, (git_object *)commit, GIT_RESET_HARD, NULL)); - cl_git_pass(git_revert(repo, commit, NULL)); - - cl_assert(merge_test_index(repo_index, merge_index_entries, 4)); - cl_assert(merge_test_workdir(repo, merge_index_entries, 4)); - - git_reference_free(head); - git_commit_free(commit); -} - -void test_revert_workdir__nonmerge_fails_mainline_specified(void) -{ - git_reference *head; - git_commit *commit; - git_revert_options opts = GIT_REVERT_OPTIONS_INIT; - - cl_git_pass(git_repository_head(&head, repo)); - cl_git_pass(git_reference_peel((git_object **)&commit, head, GIT_OBJ_COMMIT)); - - opts.mainline = 1; - cl_must_fail(git_revert(repo, commit, &opts)); - cl_assert(!git_path_exists(TEST_REPO_PATH "/.git/MERGE_MSG")); - cl_assert(!git_path_exists(TEST_REPO_PATH "/.git/REVERT_HEAD")); - - git_reference_free(head); - git_commit_free(commit); -} - -/* git reset --hard 5acdc74af27172ec491d213ee36cea7eb9ef2579 - * git revert HEAD */ -void test_revert_workdir__merge_fails_without_mainline_specified(void) -{ - git_commit *head; - git_oid head_oid; - - git_oid_fromstr(&head_oid, "5acdc74af27172ec491d213ee36cea7eb9ef2579"); - cl_git_pass(git_commit_lookup(&head, repo, &head_oid)); - cl_git_pass(git_reset(repo, (git_object *)head, GIT_RESET_HARD, NULL)); - - cl_must_fail(git_revert(repo, head, NULL)); - cl_assert(!git_path_exists(TEST_REPO_PATH "/.git/MERGE_MSG")); - cl_assert(!git_path_exists(TEST_REPO_PATH "/.git/REVERT_HEAD")); - - git_commit_free(head); -} - -/* git reset --hard 5acdc74af27172ec491d213ee36cea7eb9ef2579 - * git revert HEAD -m1 --no-commit */ -void test_revert_workdir__merge_first_parent(void) -{ - git_commit *head; - git_oid head_oid; - git_revert_options opts = GIT_REVERT_OPTIONS_INIT; - - struct merge_index_entry merge_index_entries[] = { - { 0100644, "296a6d3be1dff05c5d1f631d2459389fa7b619eb", 0, "file-mainline.txt" }, - { 0100644, "0cdb66192ee192f70f891f05a47636057420e871", 0, "file1.txt" }, - { 0100644, "73ec36fa120f8066963a0bc9105bb273dbd903d7", 0, "file2.txt" }, - }; - - opts.mainline = 1; - - git_oid_fromstr(&head_oid, "5acdc74af27172ec491d213ee36cea7eb9ef2579"); - cl_git_pass(git_commit_lookup(&head, repo, &head_oid)); - cl_git_pass(git_reset(repo, (git_object *)head, GIT_RESET_HARD, NULL)); - - cl_git_pass(git_revert(repo, head, &opts)); - - cl_assert(merge_test_index(repo_index, merge_index_entries, 3)); - - git_commit_free(head); -} - -void test_revert_workdir__merge_second_parent(void) -{ - git_commit *head; - git_oid head_oid; - git_revert_options opts = GIT_REVERT_OPTIONS_INIT; - - struct merge_index_entry merge_index_entries[] = { - { 0100644, "33c6fd981c49a2abf2971482089350bfc5cda8ea", 0, "file-branch.txt" }, - { 0100644, "0cdb66192ee192f70f891f05a47636057420e871", 0, "file1.txt" }, - { 0100644, "73ec36fa120f8066963a0bc9105bb273dbd903d7", 0, "file2.txt" }, - }; - - opts.mainline = 2; - - git_oid_fromstr(&head_oid, "5acdc74af27172ec491d213ee36cea7eb9ef2579"); - cl_git_pass(git_commit_lookup(&head, repo, &head_oid)); - cl_git_pass(git_reset(repo, (git_object *)head, GIT_RESET_HARD, NULL)); - - cl_git_pass(git_revert(repo, head, &opts)); - - cl_assert(merge_test_index(repo_index, merge_index_entries, 3)); - - git_commit_free(head); -} diff --git a/vendor/libgit2/tests/revwalk/basic.c b/vendor/libgit2/tests/revwalk/basic.c deleted file mode 100644 index 5ed7da4eb..000000000 --- a/vendor/libgit2/tests/revwalk/basic.c +++ /dev/null @@ -1,475 +0,0 @@ -#include "clar_libgit2.h" - -/* - * a4a7dce [0] Merge branch 'master' into br2 - |\ - | * 9fd738e [1] a fourth commit - | * 4a202b3 [2] a third commit - * | c47800c [3] branch commit one - |/ - * 5b5b025 [5] another commit - * 8496071 [4] testing -*/ -static const char *commit_head = "a4a7dce85cf63874e984719f4fdd239f5145052f"; - -static const char *commit_ids[] = { - "a4a7dce85cf63874e984719f4fdd239f5145052f", /* 0 */ - "9fd738e8f7967c078dceed8190330fc8648ee56a", /* 1 */ - "4a202b346bb0fb0db7eff3cffeb3c70babbd2045", /* 2 */ - "c47800c7266a2be04c571c04d5a6614691ea99bd", /* 3 */ - "8496071c1b46c854b31185ea97743be6a8774479", /* 4 */ - "5b5b025afb0b4c913b4c338a42934a3863bf3644", /* 5 */ -}; - -/* Careful: there are two possible topological sorts */ -static const int commit_sorting_topo[][6] = { - {0, 1, 2, 3, 5, 4}, {0, 3, 1, 2, 5, 4} -}; - -static const int commit_sorting_time[][6] = { - {0, 3, 1, 2, 5, 4} -}; - -static const int commit_sorting_topo_reverse[][6] = { - {4, 5, 3, 2, 1, 0}, {4, 5, 2, 1, 3, 0} -}; - -static const int commit_sorting_time_reverse[][6] = { - {4, 5, 2, 1, 3, 0} -}; - -static const int commit_sorting_segment[][6] = { - {1, 2, -1, -1, -1, -1} -}; - -#define commit_count 6 -static const int result_bytes = 24; - - -static int get_commit_index(git_oid *raw_oid) -{ - int i; - char oid[GIT_OID_HEXSZ]; - - git_oid_fmt(oid, raw_oid); - - for (i = 0; i < commit_count; ++i) - if (memcmp(oid, commit_ids[i], GIT_OID_HEXSZ) == 0) - return i; - - return -1; -} - -static int test_walk_only(git_revwalk *walk, - const int possible_results[][commit_count], int results_count) -{ - git_oid oid; - int i; - int result_array[commit_count]; - - for (i = 0; i < commit_count; ++i) - result_array[i] = -1; - - i = 0; - while (git_revwalk_next(&oid, walk) == 0) { - result_array[i++] = get_commit_index(&oid); - /*{ - char str[GIT_OID_HEXSZ+1]; - git_oid_fmt(str, &oid); - str[GIT_OID_HEXSZ] = 0; - printf(" %d) %s\n", i, str); - }*/ - } - - for (i = 0; i < results_count; ++i) - if (memcmp(possible_results[i], - result_array, result_bytes) == 0) - return 0; - - return GIT_ERROR; -} - -static int test_walk(git_revwalk *walk, const git_oid *root, - int flags, const int possible_results[][6], int results_count) -{ - git_revwalk_sorting(walk, flags); - git_revwalk_push(walk, root); - - return test_walk_only(walk, possible_results, results_count); -} - -static git_repository *_repo = NULL; -static git_revwalk *_walk = NULL; -static const char *_fixture = NULL; - -void test_revwalk_basic__initialize(void) -{ -} - -void test_revwalk_basic__cleanup(void) -{ - git_revwalk_free(_walk); - - if (_fixture) - cl_git_sandbox_cleanup(); - else - git_repository_free(_repo); - - _fixture = NULL; - _repo = NULL; - _walk = NULL; -} - -static void revwalk_basic_setup_walk(const char *fixture) -{ - if (fixture) { - _fixture = fixture; - _repo = cl_git_sandbox_init(fixture); - } else { - cl_git_pass(git_repository_open(&_repo, cl_fixture("testrepo.git"))); - } - - cl_git_pass(git_revwalk_new(&_walk, _repo)); -} - -void test_revwalk_basic__sorting_modes(void) -{ - git_oid id; - - revwalk_basic_setup_walk(NULL); - - git_oid_fromstr(&id, commit_head); - - cl_git_pass(test_walk(_walk, &id, GIT_SORT_TIME, commit_sorting_time, 1)); - cl_git_pass(test_walk(_walk, &id, GIT_SORT_TOPOLOGICAL, commit_sorting_topo, 2)); - cl_git_pass(test_walk(_walk, &id, GIT_SORT_TIME | GIT_SORT_REVERSE, commit_sorting_time_reverse, 1)); - cl_git_pass(test_walk(_walk, &id, GIT_SORT_TOPOLOGICAL | GIT_SORT_REVERSE, commit_sorting_topo_reverse, 2)); -} - -void test_revwalk_basic__glob_heads(void) -{ - int i = 0; - git_oid oid; - - revwalk_basic_setup_walk(NULL); - - cl_git_pass(git_revwalk_push_glob(_walk, "heads")); - - while (git_revwalk_next(&oid, _walk) == 0) { - i++; - } - - /* git log --branches --oneline | wc -l => 14 */ - cl_assert_equal_i(i, 14); -} - -void test_revwalk_basic__glob_heads_with_invalid(void) -{ - int i; - git_oid oid; - - revwalk_basic_setup_walk("testrepo"); - - cl_git_mkfile("testrepo/.git/refs/heads/garbage", "not-a-ref"); - cl_git_pass(git_revwalk_push_glob(_walk, "heads")); - - for (i = 0; !git_revwalk_next(&oid, _walk); ++i) - /* walking */; - - /* git log --branches --oneline | wc -l => 16 */ - cl_assert_equal_i(18, i); -} - -void test_revwalk_basic__push_head(void) -{ - int i = 0; - git_oid oid; - - revwalk_basic_setup_walk(NULL); - - cl_git_pass(git_revwalk_push_head(_walk)); - - while (git_revwalk_next(&oid, _walk) == 0) { - i++; - } - - /* git log HEAD --oneline | wc -l => 7 */ - cl_assert_equal_i(i, 7); -} - -void test_revwalk_basic__push_head_hide_ref(void) -{ - int i = 0; - git_oid oid; - - revwalk_basic_setup_walk(NULL); - - cl_git_pass(git_revwalk_push_head(_walk)); - cl_git_pass(git_revwalk_hide_ref(_walk, "refs/heads/packed-test")); - - while (git_revwalk_next(&oid, _walk) == 0) { - i++; - } - - /* git log HEAD --oneline --not refs/heads/packed-test | wc -l => 4 */ - cl_assert_equal_i(i, 4); -} - -void test_revwalk_basic__push_head_hide_ref_nobase(void) -{ - int i = 0; - git_oid oid; - - revwalk_basic_setup_walk(NULL); - - cl_git_pass(git_revwalk_push_head(_walk)); - cl_git_pass(git_revwalk_hide_ref(_walk, "refs/heads/packed")); - - while (git_revwalk_next(&oid, _walk) == 0) { - i++; - } - - /* git log HEAD --oneline --not refs/heads/packed | wc -l => 7 */ - cl_assert_equal_i(i, 7); -} - -/* -* $ git rev-list HEAD 5b5b02 ^refs/heads/packed-test -* a65fedf39aefe402d3bb6e24df4d4f5fe4547750 -* be3563ae3f795b2b4353bcce3a527ad0a4f7f644 -* c47800c7266a2be04c571c04d5a6614691ea99bd -* 9fd738e8f7967c078dceed8190330fc8648ee56a - -* $ git log HEAD 5b5b02 --oneline --not refs/heads/packed-test | wc -l => 4 -* a65fedf -* be3563a Merge branch 'br2' -* c47800c branch commit one -* 9fd738e a fourth commit -*/ -void test_revwalk_basic__multiple_push_1(void) -{ - int i = 0; - git_oid oid; - - revwalk_basic_setup_walk(NULL); - - cl_git_pass(git_revwalk_push_head(_walk)); - - cl_git_pass(git_revwalk_hide_ref(_walk, "refs/heads/packed-test")); - - cl_git_pass(git_oid_fromstr(&oid, "5b5b025afb0b4c913b4c338a42934a3863bf3644")); - cl_git_pass(git_revwalk_push(_walk, &oid)); - - while (git_revwalk_next(&oid, _walk) == 0) - i++; - - cl_assert_equal_i(i, 4); -} - -/* -* Difference between test_revwalk_basic__multiple_push_1 and -* test_revwalk_basic__multiple_push_2 is in the order reference -* refs/heads/packed-test and commit 5b5b02 are pushed. -* revwalk should return same commits in both the tests. - -* $ git rev-list 5b5b02 HEAD ^refs/heads/packed-test -* a65fedf39aefe402d3bb6e24df4d4f5fe4547750 -* be3563ae3f795b2b4353bcce3a527ad0a4f7f644 -* c47800c7266a2be04c571c04d5a6614691ea99bd -* 9fd738e8f7967c078dceed8190330fc8648ee56a - -* $ git log 5b5b02 HEAD --oneline --not refs/heads/packed-test | wc -l => 4 -* a65fedf -* be3563a Merge branch 'br2' -* c47800c branch commit one -* 9fd738e a fourth commit -*/ -void test_revwalk_basic__multiple_push_2(void) -{ - int i = 0; - git_oid oid; - - revwalk_basic_setup_walk(NULL); - - cl_git_pass(git_oid_fromstr(&oid, "5b5b025afb0b4c913b4c338a42934a3863bf3644")); - cl_git_pass(git_revwalk_push(_walk, &oid)); - - cl_git_pass(git_revwalk_hide_ref(_walk, "refs/heads/packed-test")); - - cl_git_pass(git_revwalk_push_head(_walk)); - - while (git_revwalk_next(&oid, _walk) == 0) - i++; - - cl_assert_equal_i(i, 4); -} - -void test_revwalk_basic__disallow_non_commit(void) -{ - git_oid oid; - - revwalk_basic_setup_walk(NULL); - - cl_git_pass(git_oid_fromstr(&oid, "521d87c1ec3aef9824daf6d96cc0ae3710766d91")); - cl_git_fail(git_revwalk_push(_walk, &oid)); -} - -void test_revwalk_basic__hide_then_push(void) -{ - git_oid oid; - int i = 0; - - revwalk_basic_setup_walk(NULL); - cl_git_pass(git_oid_fromstr(&oid, "5b5b025afb0b4c913b4c338a42934a3863bf3644")); - - cl_git_pass(git_revwalk_hide(_walk, &oid)); - cl_git_pass(git_revwalk_push(_walk, &oid)); - - while (git_revwalk_next(&oid, _walk) == 0) - i++; - - cl_assert_equal_i(i, 0); -} - -void test_revwalk_basic__push_range(void) -{ - revwalk_basic_setup_walk(NULL); - - git_revwalk_reset(_walk); - git_revwalk_sorting(_walk, 0); - cl_git_pass(git_revwalk_push_range(_walk, "9fd738e~2..9fd738e")); - cl_git_pass(test_walk_only(_walk, commit_sorting_segment, 1)); -} - -void test_revwalk_basic__push_mixed(void) -{ - git_oid oid; - int i = 0; - - revwalk_basic_setup_walk(NULL); - - git_revwalk_reset(_walk); - git_revwalk_sorting(_walk, 0); - cl_git_pass(git_revwalk_push_glob(_walk, "tags")); - - while (git_revwalk_next(&oid, _walk) == 0) { - i++; - } - - /* git rev-list --count --glob=tags #=> 9 */ - cl_assert_equal_i(9, i); -} - -void test_revwalk_basic__push_all(void) -{ - git_oid oid; - int i = 0; - - revwalk_basic_setup_walk(NULL); - - git_revwalk_reset(_walk); - git_revwalk_sorting(_walk, 0); - cl_git_pass(git_revwalk_push_glob(_walk, "*")); - - while (git_revwalk_next(&oid, _walk) == 0) { - i++; - } - - /* git rev-list --count --all #=> 15 */ - cl_assert_equal_i(15, i); -} - -/* -* $ git rev-list br2 master e908 -* a65fedf39aefe402d3bb6e24df4d4f5fe4547750 -* e90810b8df3e80c413d903f631643c716887138d -* 6dcf9bf7541ee10456529833502442f385010c3d -* a4a7dce85cf63874e984719f4fdd239f5145052f -* be3563ae3f795b2b4353bcce3a527ad0a4f7f644 -* c47800c7266a2be04c571c04d5a6614691ea99bd -* 9fd738e8f7967c078dceed8190330fc8648ee56a -* 4a202b346bb0fb0db7eff3cffeb3c70babbd2045 -* 5b5b025afb0b4c913b4c338a42934a3863bf3644 -* 8496071c1b46c854b31185ea97743be6a8774479 -*/ - -void test_revwalk_basic__mimic_git_rev_list(void) -{ - git_oid oid; - - revwalk_basic_setup_walk(NULL); - git_revwalk_sorting(_walk, GIT_SORT_TIME); - - cl_git_pass(git_revwalk_push_ref(_walk, "refs/heads/br2")); - cl_git_pass(git_revwalk_push_ref(_walk, "refs/heads/master")); - cl_git_pass(git_oid_fromstr(&oid, "e90810b8df3e80c413d903f631643c716887138d")); - cl_git_pass(git_revwalk_push(_walk, &oid)); - - cl_git_pass(git_revwalk_next(&oid, _walk)); - cl_assert(!git_oid_streq(&oid, "a65fedf39aefe402d3bb6e24df4d4f5fe4547750")); - - cl_git_pass(git_revwalk_next(&oid, _walk)); - cl_assert(!git_oid_streq(&oid, "e90810b8df3e80c413d903f631643c716887138d")); - - cl_git_pass(git_revwalk_next(&oid, _walk)); - cl_assert(!git_oid_streq(&oid, "6dcf9bf7541ee10456529833502442f385010c3d")); - - cl_git_pass(git_revwalk_next(&oid, _walk)); - cl_assert(!git_oid_streq(&oid, "a4a7dce85cf63874e984719f4fdd239f5145052f")); - - cl_git_pass(git_revwalk_next(&oid, _walk)); - cl_assert(!git_oid_streq(&oid, "be3563ae3f795b2b4353bcce3a527ad0a4f7f644")); - - cl_git_pass(git_revwalk_next(&oid, _walk)); - cl_assert(!git_oid_streq(&oid, "c47800c7266a2be04c571c04d5a6614691ea99bd")); - - cl_git_pass(git_revwalk_next(&oid, _walk)); - cl_assert(!git_oid_streq(&oid, "9fd738e8f7967c078dceed8190330fc8648ee56a")); - - cl_git_pass(git_revwalk_next(&oid, _walk)); - cl_assert(!git_oid_streq(&oid, "4a202b346bb0fb0db7eff3cffeb3c70babbd2045")); - - cl_git_pass(git_revwalk_next(&oid, _walk)); - cl_assert(!git_oid_streq(&oid, "5b5b025afb0b4c913b4c338a42934a3863bf3644")); - - cl_git_pass(git_revwalk_next(&oid, _walk)); - cl_assert(!git_oid_streq(&oid, "8496071c1b46c854b31185ea97743be6a8774479")); - - cl_git_fail_with(git_revwalk_next(&oid, _walk), GIT_ITEROVER); -} - -void test_revwalk_basic__big_timestamp(void) -{ - git_reference *head; - git_commit *tip; - git_signature *sig; - git_tree *tree; - git_oid id; - int error; - - revwalk_basic_setup_walk("testrepo.git"); - - cl_git_pass(git_repository_head(&head, _repo)); - cl_git_pass(git_reference_peel((git_object **) &tip, head, GIT_OBJ_COMMIT)); - - /* Commit with a far-ahead timestamp, we should be able to parse it in the revwalk */ - cl_git_pass(git_signature_new(&sig, "Joe", "joe@example.com", 2399662595, 0)); - cl_git_pass(git_commit_tree(&tree, tip)); - - cl_git_pass(git_commit_create(&id, _repo, "HEAD", sig, sig, NULL, "some message", tree, 1, - (const git_commit **)&tip)); - - cl_git_pass(git_revwalk_push_head(_walk)); - - while ((error = git_revwalk_next(&id, _walk)) == 0) { - /* nothing */ - } - - cl_assert_equal_i(GIT_ITEROVER, error); - - git_tree_free(tree); - git_commit_free(tip); - git_reference_free(head); - git_signature_free(sig); - -} diff --git a/vendor/libgit2/tests/revwalk/hidecb.c b/vendor/libgit2/tests/revwalk/hidecb.c deleted file mode 100644 index 14cf39afd..000000000 --- a/vendor/libgit2/tests/revwalk/hidecb.c +++ /dev/null @@ -1,201 +0,0 @@ -#include "clar_libgit2.h" -/* -* a4a7dce [0] Merge branch 'master' into br2 -|\ -| * 9fd738e [1] a fourth commit -| * 4a202b3 [2] a third commit -* | c47800c [3] branch commit one -|/ -* 5b5b025 [5] another commit -* 8496071 [4] testing -*/ -static const char *commit_head = "a4a7dce85cf63874e984719f4fdd239f5145052f"; - -static const char *commit_strs[] = { - "a4a7dce85cf63874e984719f4fdd239f5145052f", /* 0 */ - "9fd738e8f7967c078dceed8190330fc8648ee56a", /* 1 */ - "4a202b346bb0fb0db7eff3cffeb3c70babbd2045", /* 2 */ - "c47800c7266a2be04c571c04d5a6614691ea99bd", /* 3 */ - "8496071c1b46c854b31185ea97743be6a8774479", /* 4 */ - "5b5b025afb0b4c913b4c338a42934a3863bf3644", /* 5 */ -}; - -#define commit_count 6 - -static git_oid commit_ids[commit_count]; -static git_oid _head_id; -static git_repository *_repo; - - -void test_revwalk_hidecb__initialize(void) -{ - int i; - - cl_git_pass(git_repository_open(&_repo, cl_fixture("testrepo.git"))); - cl_git_pass(git_oid_fromstr(&_head_id, commit_head)); - - for (i = 0; i < commit_count; i++) - cl_git_pass(git_oid_fromstr(&commit_ids[i], commit_strs[i])); - -} - -void test_revwalk_hidecb__cleanup(void) -{ - git_repository_free(_repo); - _repo = NULL; -} - -/* Hide all commits */ -static int hide_every_commit_cb(const git_oid *commit_id, void *data) -{ - GIT_UNUSED(commit_id); - GIT_UNUSED(data); - - return 1; -} - -/* Do not hide anything */ -static int hide_none_cb(const git_oid *commit_id, void *data) -{ - GIT_UNUSED(commit_id); - GIT_UNUSED(data); - - return 0; -} - -/* Hide some commits */ -static int hide_commit_cb(const git_oid *commit_id, void *data) -{ - GIT_UNUSED(commit_id); - GIT_UNUSED(data); - - return (git_oid_cmp(commit_id, &commit_ids[5]) == 0); -} - -/* In payload data, pointer to a commit id is passed */ -static int hide_commit_use_payload_cb(const git_oid *commit_id, void *data) -{ - git_oid *hide_commit_id = data; - - return (git_oid_cmp(commit_id, hide_commit_id) == 0); -} - -void test_revwalk_hidecb__hide_all_cb(void) -{ - git_revwalk *walk; - git_oid id; - - cl_git_pass(git_revwalk_new(&walk, _repo)); - cl_git_pass(git_revwalk_add_hide_cb(walk, hide_every_commit_cb, NULL)); - cl_git_pass(git_revwalk_push(walk, &_head_id)); - - /* First call to git_revwalk_next should return GIT_ITEROVER */ - cl_assert_equal_i(GIT_ITEROVER, git_revwalk_next(&id, walk)); - - git_revwalk_free(walk); -} - - -void test_revwalk_hidecb__hide_none_cb(void) -{ - git_revwalk *walk; - int i, error; - git_oid id; - - cl_git_pass(git_revwalk_new(&walk, _repo)); - cl_git_pass(git_revwalk_add_hide_cb(walk, hide_none_cb, NULL)); - cl_git_pass(git_revwalk_push(walk, &_head_id)); - - /* It should return all 6 commits */ - i = 0; - while ((error = git_revwalk_next(&id, walk)) == 0) - i++; - - cl_assert_equal_i(i, 6); - cl_assert_equal_i(error, GIT_ITEROVER); - - git_revwalk_free(walk); -} - -void test_revwalk_hidecb__add_hide_cb_multiple_times(void) -{ - git_revwalk *walk; - - cl_git_pass(git_revwalk_new(&walk, _repo)); - cl_git_pass(git_revwalk_add_hide_cb(walk, hide_every_commit_cb, NULL)); - cl_git_fail(git_revwalk_add_hide_cb(walk, hide_every_commit_cb, NULL)); - - git_revwalk_free(walk); -} - -void test_revwalk_hidecb__add_hide_cb_during_walking(void) -{ - git_revwalk *walk; - git_oid id; - int error; - - cl_git_pass(git_revwalk_new(&walk, _repo)); - cl_git_pass(git_revwalk_push(walk, &_head_id)); - - /* Start walking without adding hide callback */ - cl_git_pass(git_revwalk_next(&id, walk)); - - /* Now add hide callback */ - cl_git_pass(git_revwalk_add_hide_cb(walk, hide_none_cb, NULL)); - - /* walk should be reset */ - error = git_revwalk_next(&id, walk); - cl_assert_equal_i(error, GIT_ITEROVER); - - git_revwalk_free(walk); -} - -void test_revwalk_hidecb__hide_some_commits(void) -{ - git_revwalk *walk; - git_oid id; - int i, error; - - cl_git_pass(git_revwalk_new(&walk, _repo)); - cl_git_pass(git_revwalk_push(walk, &_head_id)); - - /* Add hide callback */ - cl_git_pass(git_revwalk_add_hide_cb(walk, hide_commit_cb, NULL)); - - i = 0; - while ((error = git_revwalk_next(&id, walk)) == 0) { - cl_assert_equal_oid(&commit_ids[i], &id); - i++; - } - - cl_assert_equal_i(i, 4); - cl_assert_equal_i(error, GIT_ITEROVER); - - git_revwalk_free(walk); -} - -void test_revwalk_hidecb__test_payload(void) -{ - git_revwalk *walk; - git_oid id; - int i, error; - - cl_git_pass(git_revwalk_new(&walk, _repo)); - cl_git_pass(git_revwalk_push(walk, &_head_id)); - - /* Add hide callback, pass id of parent of initial commit as payload data */ - cl_git_pass(git_revwalk_add_hide_cb(walk, hide_commit_use_payload_cb, &commit_ids[5])); - - i = 0; - while ((error = git_revwalk_next(&id, walk)) == 0) { - cl_assert_equal_oid(&commit_ids[i], &id); - i++; - } - - /* walker should return four commits */ - cl_assert_equal_i(i, 4); - cl_assert_equal_i(error, GIT_ITEROVER); - - git_revwalk_free(walk); -} - diff --git a/vendor/libgit2/tests/revwalk/mergebase.c b/vendor/libgit2/tests/revwalk/mergebase.c deleted file mode 100644 index ee078b3e7..000000000 --- a/vendor/libgit2/tests/revwalk/mergebase.c +++ /dev/null @@ -1,514 +0,0 @@ -#include "clar_libgit2.h" -#include "vector.h" -#include - -static git_repository *_repo; -static git_repository *_repo2; - -void test_revwalk_mergebase__initialize(void) -{ - cl_git_pass(git_repository_open(&_repo, cl_fixture("testrepo.git"))); - cl_git_pass(git_repository_open(&_repo2, cl_fixture("twowaymerge.git"))); -} - -void test_revwalk_mergebase__cleanup(void) -{ - git_repository_free(_repo); - _repo = NULL; - - git_repository_free(_repo2); - _repo2 = NULL; -} - -void test_revwalk_mergebase__single1(void) -{ - git_oid result, one, two, expected; - size_t ahead, behind; - - cl_git_pass(git_oid_fromstr(&one, "c47800c7266a2be04c571c04d5a6614691ea99bd ")); - cl_git_pass(git_oid_fromstr(&two, "9fd738e8f7967c078dceed8190330fc8648ee56a")); - cl_git_pass(git_oid_fromstr(&expected, "5b5b025afb0b4c913b4c338a42934a3863bf3644")); - - cl_git_pass(git_merge_base(&result, _repo, &one, &two)); - cl_assert_equal_oid(&expected, &result); - - cl_git_pass(git_graph_ahead_behind(&ahead, &behind, _repo, &one, &two)); - cl_assert_equal_sz(ahead, 1); - cl_assert_equal_sz(behind, 2); - - cl_git_pass(git_graph_ahead_behind(&ahead, &behind, _repo, &two, &one)); - cl_assert_equal_sz(ahead, 2); - cl_assert_equal_sz(behind, 1); -} - -void test_revwalk_mergebase__single2(void) -{ - git_oid result, one, two, expected; - size_t ahead, behind; - - cl_git_pass(git_oid_fromstr(&one, "763d71aadf09a7951596c9746c024e7eece7c7af")); - cl_git_pass(git_oid_fromstr(&two, "a65fedf39aefe402d3bb6e24df4d4f5fe4547750")); - cl_git_pass(git_oid_fromstr(&expected, "c47800c7266a2be04c571c04d5a6614691ea99bd")); - - cl_git_pass(git_merge_base(&result, _repo, &one, &two)); - cl_assert_equal_oid(&expected, &result); - - cl_git_pass(git_graph_ahead_behind( &ahead, &behind, _repo, &one, &two)); - cl_assert_equal_sz(ahead, 1); - cl_assert_equal_sz(behind, 4); - - cl_git_pass(git_graph_ahead_behind( &ahead, &behind, _repo, &two, &one)); - cl_assert_equal_sz(ahead, 4); - cl_assert_equal_sz(behind, 1); -} - -void test_revwalk_mergebase__merged_branch(void) -{ - git_oid result, one, two, expected; - size_t ahead, behind; - - cl_git_pass(git_oid_fromstr(&one, "a65fedf39aefe402d3bb6e24df4d4f5fe4547750")); - cl_git_pass(git_oid_fromstr(&two, "9fd738e8f7967c078dceed8190330fc8648ee56a")); - cl_git_pass(git_oid_fromstr(&expected, "9fd738e8f7967c078dceed8190330fc8648ee56a")); - - cl_git_pass(git_merge_base(&result, _repo, &one, &two)); - cl_assert_equal_oid(&expected, &result); - - cl_git_pass(git_merge_base(&result, _repo, &two, &one)); - cl_assert_equal_oid(&expected, &result); - - cl_git_pass(git_graph_ahead_behind(&ahead, &behind, _repo, &one, &two)); - cl_assert_equal_sz(ahead, 3); - cl_assert_equal_sz(behind, 0); - - cl_git_pass(git_graph_ahead_behind(&ahead, &behind, _repo, &two, &one)); - cl_assert_equal_sz(ahead, 0); - cl_assert_equal_sz(behind, 3); -} - -void test_revwalk_mergebase__two_way_merge(void) -{ - git_oid one, two; - size_t ahead, behind; - - cl_git_pass(git_oid_fromstr(&one, "9b219343610c88a1187c996d0dc58330b55cee28")); - cl_git_pass(git_oid_fromstr(&two, "a953a018c5b10b20c86e69fef55ebc8ad4c5a417")); - cl_git_pass(git_graph_ahead_behind(&ahead, &behind, _repo2, &one, &two)); - - cl_assert_equal_sz(ahead, 8); - cl_assert_equal_sz(behind, 2); - - cl_git_pass(git_graph_ahead_behind(&ahead, &behind, _repo2, &two, &one)); - - cl_assert_equal_sz(ahead, 2); - cl_assert_equal_sz(behind, 8); -} - -void test_revwalk_mergebase__no_common_ancestor_returns_ENOTFOUND(void) -{ - git_oid result, one, two; - size_t ahead, behind; - int error; - - cl_git_pass(git_oid_fromstr(&one, "763d71aadf09a7951596c9746c024e7eece7c7af")); - cl_git_pass(git_oid_fromstr(&two, "e90810b8df3e80c413d903f631643c716887138d")); - - error = git_merge_base(&result, _repo, &one, &two); - cl_git_fail(error); - - cl_assert_equal_i(GIT_ENOTFOUND, error); - - cl_git_pass(git_graph_ahead_behind(&ahead, &behind, _repo, &one, &two)); - cl_assert_equal_sz(4, ahead); - cl_assert_equal_sz(2, behind); -} - -void test_revwalk_mergebase__prefer_youngest_merge_base(void) -{ - git_oid result, one, two, expected; - - cl_git_pass(git_oid_fromstr(&one, "a4a7dce85cf63874e984719f4fdd239f5145052f")); - cl_git_pass(git_oid_fromstr(&two, "be3563ae3f795b2b4353bcce3a527ad0a4f7f644")); - cl_git_pass(git_oid_fromstr(&expected, "c47800c7266a2be04c571c04d5a6614691ea99bd")); - - cl_git_pass(git_merge_base(&result, _repo, &one, &two)); - cl_assert_equal_oid(&expected, &result); -} - -void test_revwalk_mergebase__multiple_merge_bases(void) -{ - git_oid one, two, expected1, expected2; - git_oidarray result = {NULL, 0}; - - cl_git_pass(git_oid_fromstr(&one, "a4a7dce85cf63874e984719f4fdd239f5145052f")); - cl_git_pass(git_oid_fromstr(&two, "be3563ae3f795b2b4353bcce3a527ad0a4f7f644")); - cl_git_pass(git_oid_fromstr(&expected1, "c47800c7266a2be04c571c04d5a6614691ea99bd")); - cl_git_pass(git_oid_fromstr(&expected2, "9fd738e8f7967c078dceed8190330fc8648ee56a")); - - cl_git_pass(git_merge_bases(&result, _repo, &one, &two)); - cl_assert_equal_i(2, result.count); - cl_assert_equal_oid(&expected1, &result.ids[0]); - cl_assert_equal_oid(&expected2, &result.ids[1]); - - git_oidarray_free(&result); -} - -void test_revwalk_mergebase__multiple_merge_bases_many_commits(void) -{ - git_oid expected1, expected2; - git_oidarray result = {NULL, 0}; - - git_oid *input = git__malloc(sizeof(git_oid) * 2); - - cl_git_pass(git_oid_fromstr(&input[0], "a4a7dce85cf63874e984719f4fdd239f5145052f")); - cl_git_pass(git_oid_fromstr(&input[1], "be3563ae3f795b2b4353bcce3a527ad0a4f7f644")); - cl_git_pass(git_oid_fromstr(&expected1, "c47800c7266a2be04c571c04d5a6614691ea99bd")); - cl_git_pass(git_oid_fromstr(&expected2, "9fd738e8f7967c078dceed8190330fc8648ee56a")); - - cl_git_pass(git_merge_bases_many(&result, _repo, 2, input)); - cl_assert_equal_i(2, result.count); - cl_assert_equal_oid(&expected1, &result.ids[0]); - cl_assert_equal_oid(&expected2, &result.ids[1]); - - git_oidarray_free(&result); - git__free(input); -} - -void test_revwalk_mergebase__no_off_by_one_missing(void) -{ - git_oid result, one, two; - - cl_git_pass(git_oid_fromstr(&one, "1a443023183e3f2bfbef8ac923cd81c1018a18fd")); - cl_git_pass(git_oid_fromstr(&two, "9f13f7d0a9402c681f91dc590cf7b5470e6a77d2")); - cl_git_pass(git_merge_base(&result, _repo, &one, &two)); -} - -static void assert_mergebase_many(const char *expected_sha, int count, ...) -{ - va_list ap; - int i; - git_oid *oids; - git_oid oid, expected; - char *partial_oid; - git_object *object; - - oids = git__malloc(count * sizeof(git_oid)); - cl_assert(oids != NULL); - - memset(oids, 0x0, count * sizeof(git_oid)); - - va_start(ap, count); - - for (i = 0; i < count; ++i) { - partial_oid = va_arg(ap, char *); - cl_git_pass(git_oid_fromstrn(&oid, partial_oid, strlen(partial_oid))); - - cl_git_pass(git_object_lookup_prefix(&object, _repo, &oid, strlen(partial_oid), GIT_OBJ_COMMIT)); - git_oid_cpy(&oids[i], git_object_id(object)); - git_object_free(object); - } - - va_end(ap); - - if (expected_sha == NULL) - cl_assert_equal_i(GIT_ENOTFOUND, git_merge_base_many(&oid, _repo, count, oids)); - else { - cl_git_pass(git_merge_base_many(&oid, _repo, count, oids)); - cl_git_pass(git_oid_fromstr(&expected, expected_sha)); - - cl_assert_equal_oid(&expected, &oid); - } - - git__free(oids); -} - -void test_revwalk_mergebase__many_no_common_ancestor_returns_ENOTFOUND(void) -{ - assert_mergebase_many(NULL, 3, "41bc8c", "e90810", "a65fed"); - assert_mergebase_many(NULL, 3, "e90810", "41bc8c", "a65fed"); - assert_mergebase_many(NULL, 3, "e90810", "a65fed", "41bc8c"); - assert_mergebase_many(NULL, 3, "a65fed", "e90810", "41bc8c"); - assert_mergebase_many(NULL, 3, "a65fed", "41bc8c", "e90810"); - - assert_mergebase_many(NULL, 3, "e90810", "763d71", "a65fed"); -} - -void test_revwalk_mergebase__many_merge_branch(void) -{ - assert_mergebase_many("c47800c7266a2be04c571c04d5a6614691ea99bd", 3, "a65fed", "763d71", "849607"); - - assert_mergebase_many("c47800c7266a2be04c571c04d5a6614691ea99bd", 3, "763d71", "e90810", "a65fed"); - assert_mergebase_many("c47800c7266a2be04c571c04d5a6614691ea99bd", 3, "763d71", "a65fed", "e90810"); - - assert_mergebase_many("c47800c7266a2be04c571c04d5a6614691ea99bd", 3, "a65fed", "763d71", "849607"); - assert_mergebase_many("c47800c7266a2be04c571c04d5a6614691ea99bd", 3, "a65fed", "849607", "763d71"); - assert_mergebase_many("8496071c1b46c854b31185ea97743be6a8774479", 3, "849607", "a65fed", "763d71"); - - assert_mergebase_many("5b5b025afb0b4c913b4c338a42934a3863bf3644", 5, "5b5b02", "763d71", "a4a7dc", "a65fed", "41bc8c"); -} - -static void assert_mergebase_octopus(const char *expected_sha, int count, ...) -{ - va_list ap; - int i; - git_oid *oids; - git_oid oid, expected; - char *partial_oid; - git_object *object; - - oids = git__malloc(count * sizeof(git_oid)); - cl_assert(oids != NULL); - - memset(oids, 0x0, count * sizeof(git_oid)); - - va_start(ap, count); - - for (i = 0; i < count; ++i) { - partial_oid = va_arg(ap, char *); - cl_git_pass(git_oid_fromstrn(&oid, partial_oid, strlen(partial_oid))); - - cl_git_pass(git_object_lookup_prefix(&object, _repo, &oid, strlen(partial_oid), GIT_OBJ_COMMIT)); - git_oid_cpy(&oids[i], git_object_id(object)); - git_object_free(object); - } - - va_end(ap); - - if (expected_sha == NULL) - cl_assert_equal_i(GIT_ENOTFOUND, git_merge_base_octopus(&oid, _repo, count, oids)); - else { - cl_git_pass(git_merge_base_octopus(&oid, _repo, count, oids)); - cl_git_pass(git_oid_fromstr(&expected, expected_sha)); - - cl_assert_equal_oid(&expected, &oid); - } - - git__free(oids); -} - -void test_revwalk_mergebase__octopus_no_common_ancestor_returns_ENOTFOUND(void) -{ - assert_mergebase_octopus(NULL, 3, "41bc8c", "e90810", "a65fed"); - assert_mergebase_octopus(NULL, 3, "e90810", "41bc8c", "a65fed"); - assert_mergebase_octopus(NULL, 3, "e90810", "a65fed", "41bc8c"); - assert_mergebase_octopus(NULL, 3, "a65fed", "e90810", "41bc8c"); - assert_mergebase_octopus(NULL, 3, "a65fed", "41bc8c", "e90810"); - - assert_mergebase_octopus(NULL, 3, "e90810", "763d71", "a65fed"); - - assert_mergebase_octopus(NULL, 3, "763d71", "e90810", "a65fed"); - assert_mergebase_octopus(NULL, 3, "763d71", "a65fed", "e90810"); - - assert_mergebase_octopus(NULL, 5, "5b5b02", "763d71", "a4a7dc", "a65fed", "41bc8c"); -} - -void test_revwalk_mergebase__octopus_merge_branch(void) -{ - assert_mergebase_octopus("8496071c1b46c854b31185ea97743be6a8774479", 3, "a65fed", "763d71", "849607"); - - assert_mergebase_octopus("8496071c1b46c854b31185ea97743be6a8774479", 3, "a65fed", "763d71", "849607"); - assert_mergebase_octopus("8496071c1b46c854b31185ea97743be6a8774479", 3, "a65fed", "849607", "763d71"); - assert_mergebase_octopus("8496071c1b46c854b31185ea97743be6a8774479", 3, "849607", "a65fed", "763d71"); -} - -/* - * testrepo.git $ git log --graph --all - * * commit 763d71aadf09a7951596c9746c024e7eece7c7af - * | Author: nulltoken - * | Date: Sun Oct 9 12:54:47 2011 +0200 - * | - * | Add some files into subdirectories - * | - * | * commit a65fedf39aefe402d3bb6e24df4d4f5fe4547750 - * | | Author: Scott Chacon - * | | Date: Tue Aug 9 19:33:46 2011 -0700 - * | | - * | * commit be3563ae3f795b2b4353bcce3a527ad0a4f7f644 - * | |\ Merge: 9fd738e c47800c - * | |/ Author: Scott Chacon - * |/| Date: Tue May 25 11:58:27 2010 -0700 - * | | - * | | Merge branch 'br2' - * | | - * | | * commit e90810b8df3e80c413d903f631643c716887138d - * | | | Author: Vicent Marti - * | | | Date: Thu Aug 5 18:42:20 2010 +0200 - * | | | - * | | | Test commit 2 - * | | | - * | | * commit 6dcf9bf7541ee10456529833502442f385010c3d - * | | Author: Vicent Marti - * | | Date: Thu Aug 5 18:41:33 2010 +0200 - * | | - * | | Test commit 1 - * | | - * | | * commit a4a7dce85cf63874e984719f4fdd239f5145052f - * | | |\ Merge: c47800c 9fd738e - * | |/ / Author: Scott Chacon - * |/| / Date: Tue May 25 12:00:23 2010 -0700 - * | |/ - * | | Merge branch 'master' into br2 - * | | - * | * commit 9fd738e8f7967c078dceed8190330fc8648ee56a - * | | Author: Scott Chacon - * | | Date: Mon May 24 10:19:19 2010 -0700 - * | | - * | | a fourth commit - * | | - * | * commit 4a202b346bb0fb0db7eff3cffeb3c70babbd2045 - * | | Author: Scott Chacon - * | | Date: Mon May 24 10:19:04 2010 -0700 - * | | - * | | a third commit - * | | - * * | commit c47800c7266a2be04c571c04d5a6614691ea99bd - * |/ Author: Scott Chacon - * | Date: Tue May 25 11:58:14 2010 -0700 - * | - * | branch commit one - * | - * * commit 5b5b025afb0b4c913b4c338a42934a3863bf3644 - * | Author: Scott Chacon - * | Date: Tue May 11 13:38:42 2010 -0700 - * | - * | another commit - * | - * * commit 8496071c1b46c854b31185ea97743be6a8774479 - * Author: Scott Chacon - * Date: Sat May 8 16:13:06 2010 -0700 - * - * testing - * - * * commit 41bc8c69075bbdb46c5c6f0566cc8cc5b46e8bd9 - * | Author: Scott Chacon - * | Date: Tue May 11 13:40:41 2010 -0700 - * | - * | packed commit two - * | - * * commit 5001298e0c09ad9c34e4249bc5801c75e9754fa5 - * Author: Scott Chacon - * Date: Tue May 11 13:40:23 2010 -0700 - * - * packed commit one - */ - -/* - * twowaymerge.git $ git log --graph --all - * * commit 9b219343610c88a1187c996d0dc58330b55cee28 - * |\ Merge: c37a783 2224e19 - * | | Author: Scott J. Goldman - * | | Date: Tue Nov 27 20:31:04 2012 -0800 - * | | - * | | Merge branch 'first-branch' into second-branch - * | | - * | * commit 2224e191514cb4bd8c566d80dac22dfcb1e9bb83 - * | | Author: Scott J. Goldman - * | | Date: Tue Nov 27 20:28:51 2012 -0800 - * | | - * | | j - * | | - * | * commit a41a49f8f5cd9b6cb14a076bf8394881ed0b4d19 - * | | Author: Scott J. Goldman - * | | Date: Tue Nov 27 20:28:39 2012 -0800 - * | | - * | | i - * | | - * | * commit 82bf9a1a10a4b25c1f14c9607b60970705e92545 - * | | Author: Scott J. Goldman - * | | Date: Tue Nov 27 20:28:28 2012 -0800 - * | | - * | | h - * | | - * * | commit c37a783c20d92ac92362a78a32860f7eebf938ef - * | | Author: Scott J. Goldman - * | | Date: Tue Nov 27 20:30:57 2012 -0800 - * | | - * | | n - * | | - * * | commit 8b82fb1794cb1c8c7f172ec730a4c2db0ae3e650 - * | | Author: Scott J. Goldman - * | | Date: Tue Nov 27 20:30:43 2012 -0800 - * | | - * | | m - * | | - * * | commit 6ab5d28acbf3c3bdff276f7ccfdf29c1520e542f - * | | Author: Scott J. Goldman - * | | Date: Tue Nov 27 20:30:38 2012 -0800 - * | | - * | | l - * | | - * * | commit 7b8c336c45fc6895c1c60827260fe5d798e5d247 - * | | Author: Scott J. Goldman - * | | Date: Tue Nov 27 20:30:24 2012 -0800 - * | | - * | | k - * | | - * | | * commit 1c30b88f5f3ee66d78df6520a7de9e89b890818b - * | | | Author: Scott J. Goldman - * | | | Date: Tue Nov 27 20:28:10 2012 -0800 - * | | | - * | | | e - * | | | - * | | * commit 42b7311aa626e712891940c1ec5d5cba201946a4 - * | | | Author: Scott J. Goldman - * | | | Date: Tue Nov 27 20:28:06 2012 -0800 - * | | | - * | | | d - * | | | - * | | * commit a953a018c5b10b20c86e69fef55ebc8ad4c5a417 - * | | |\ Merge: bd1732c cdf97fd - * | | |/ Author: Scott J. Goldman - * | |/| Date: Tue Nov 27 20:26:43 2012 -0800 - * | | | - * | | | Merge branch 'first-branch' - * | | | - * | * | commit cdf97fd3bb48eb3827638bb33d208f5fd32d0aa6 - * | | | Author: Scott J. Goldman - * | | | Date: Tue Nov 27 20:24:46 2012 -0800 - * | | | - * | | | g - * | | | - * | * | commit ef0488f0b722f0be8bcb90a7730ac7efafd1d694 - * | | | Author: Scott J. Goldman - * | | | Date: Tue Nov 27 20:24:39 2012 -0800 - * | | | - * | | | f - * | | | - * | | * commit bd1732c43c68d712ad09e1d872b9be6d4b9efdc4 - * | |/ Author: Scott J. Goldman - * | | Date: Tue Nov 27 17:43:58 2012 -0800 - * | | - * | | c - * | | - * | * commit 0c8a3f1f3d5f421cf83048c7c73ee3b55a5e0f29 - * |/ Author: Scott J. Goldman - * | Date: Tue Nov 27 17:43:48 2012 -0800 - * | - * | b - * | - * * commit 1f4c0311a24b63f6fc209a59a1e404942d4a5006 - * Author: Scott J. Goldman - * Date: Tue Nov 27 17:43:41 2012 -0800 - * - * a - */ - -void test_revwalk_mergebase__remove_redundant(void) -{ - git_repository *repo; - git_oid one, two, base; - git_oidarray result = {NULL, 0}; - - cl_git_pass(git_repository_open(&repo, cl_fixture("redundant.git"))); - - cl_git_pass(git_oid_fromstr(&one, "d89137c93ba1ee749214ff4ce52ae9137bc833f9")); - cl_git_pass(git_oid_fromstr(&two, "91f4b95df4a59504a9813ba66912562931d990e3")); - cl_git_pass(git_oid_fromstr(&base, "6cb1f2352d974e1c5a776093017e8772416ac97a")); - - cl_git_pass(git_merge_bases(&result, repo, &one, &two)); - cl_assert_equal_i(1, result.count); - cl_assert_equal_oid(&base, &result.ids[0]); - - git_oidarray_free(&result); - git_repository_free(repo); -} diff --git a/vendor/libgit2/tests/revwalk/signatureparsing.c b/vendor/libgit2/tests/revwalk/signatureparsing.c deleted file mode 100644 index b312bad09..000000000 --- a/vendor/libgit2/tests/revwalk/signatureparsing.c +++ /dev/null @@ -1,47 +0,0 @@ -#include "clar_libgit2.h" - -static git_repository *_repo; -static git_revwalk *_walk; - -void test_revwalk_signatureparsing__initialize(void) -{ - cl_git_pass(git_repository_open(&_repo, cl_fixture("testrepo.git"))); - cl_git_pass(git_revwalk_new(&_walk, _repo)); -} - -void test_revwalk_signatureparsing__cleanup(void) -{ - git_revwalk_free(_walk); - _walk = NULL; - - git_repository_free(_repo); - _repo = NULL; -} - -void test_revwalk_signatureparsing__do_not_choke_when_name_contains_angle_brackets(void) -{ - git_reference *ref; - git_oid commit_oid; - git_commit *commit; - const git_signature *signature; - - /* - * The branch below points at a commit with angle brackets in the committer/author name - * committer 1323847743 +0100 - */ - cl_git_pass(git_reference_lookup(&ref, _repo, "refs/heads/haacked")); - - git_revwalk_push(_walk, git_reference_target(ref)); - cl_git_pass(git_revwalk_next(&commit_oid, _walk)); - - cl_git_pass(git_commit_lookup(&commit, _repo, git_reference_target(ref))); - - signature = git_commit_committer(commit); - cl_assert_equal_s("foo@example.com", signature->email); - cl_assert_equal_s("Yu V. Bin Haacked", signature->name); - cl_assert_equal_i(1323847743, (int)signature->when.time); - cl_assert_equal_i(60, signature->when.offset); - - git_commit_free(commit); - git_reference_free(ref); -} diff --git a/vendor/libgit2/tests/revwalk/simplify.c b/vendor/libgit2/tests/revwalk/simplify.c deleted file mode 100644 index f65ce6c59..000000000 --- a/vendor/libgit2/tests/revwalk/simplify.c +++ /dev/null @@ -1,55 +0,0 @@ -#include "clar_libgit2.h" - -void test_revwalk_simplify__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -/* - * a4a7dce [0] Merge branch 'master' into br2 - |\ - | * 9fd738e [1] a fourth commit - | * 4a202b3 [2] a third commit - * | c47800c [3] branch commit one - |/ - * 5b5b025 [5] another commit - * 8496071 [4] testing -*/ -static const char *commit_head = "a4a7dce85cf63874e984719f4fdd239f5145052f"; - -static const char *expected_str[] = { - "a4a7dce85cf63874e984719f4fdd239f5145052f", /* 0 */ - "c47800c7266a2be04c571c04d5a6614691ea99bd", /* 3 */ - "5b5b025afb0b4c913b4c338a42934a3863bf3644", /* 4 */ - "8496071c1b46c854b31185ea97743be6a8774479", /* 5 */ -}; - -void test_revwalk_simplify__first_parent(void) -{ - git_repository *repo; - git_revwalk *walk; - git_oid id, expected[4]; - int i, error; - - for (i = 0; i < 4; i++) { - git_oid_fromstr(&expected[i], expected_str[i]); - } - - repo = cl_git_sandbox_init("testrepo.git"); - cl_git_pass(git_revwalk_new(&walk, repo)); - - git_oid_fromstr(&id, commit_head); - cl_git_pass(git_revwalk_push(walk, &id)); - git_revwalk_simplify_first_parent(walk); - - i = 0; - while ((error = git_revwalk_next(&id, walk)) == 0) { - cl_assert_equal_oid(&expected[i], &id); - i++; - } - - cl_assert_equal_i(i, 4); - cl_assert_equal_i(error, GIT_ITEROVER); - - git_revwalk_free(walk); -} diff --git a/vendor/libgit2/tests/stash/apply.c b/vendor/libgit2/tests/stash/apply.c deleted file mode 100644 index f26b73b19..000000000 --- a/vendor/libgit2/tests/stash/apply.c +++ /dev/null @@ -1,449 +0,0 @@ -#include "clar_libgit2.h" -#include "fileops.h" -#include "stash_helpers.h" - -static git_signature *signature; -static git_repository *repo; -static git_index *repo_index; - -void test_stash_apply__initialize(void) -{ - git_oid oid; - - repo = cl_git_sandbox_init_new("stash"); - cl_git_pass(git_repository_index(&repo_index, repo)); - cl_git_pass(git_signature_new(&signature, "nulltoken", "emeric.fermas@gmail.com", 1323847743, 60)); /* Wed Dec 14 08:29:03 2011 +0100 */ - - cl_git_mkfile("stash/what", "hello\n"); - cl_git_mkfile("stash/how", "small\n"); - cl_git_mkfile("stash/who", "world\n"); - cl_git_mkfile("stash/where", "meh\n"); - - cl_git_pass(git_index_add_bypath(repo_index, "what")); - cl_git_pass(git_index_add_bypath(repo_index, "how")); - cl_git_pass(git_index_add_bypath(repo_index, "who")); - - cl_repo_commit_from_index(NULL, repo, signature, 0, "Initial commit"); - - cl_git_rewritefile("stash/what", "goodbye\n"); - cl_git_rewritefile("stash/who", "funky world\n"); - cl_git_mkfile("stash/when", "tomorrow\n"); - cl_git_mkfile("stash/why", "would anybody use stash?\n"); - cl_git_mkfile("stash/where", "????\n"); - - cl_git_pass(git_index_add_bypath(repo_index, "who")); - cl_git_pass(git_index_add_bypath(repo_index, "why")); - cl_git_pass(git_index_add_bypath(repo_index, "where")); - git_index_write(repo_index); - - cl_git_rewritefile("stash/where", "....\n"); - - /* Pre-stash state */ - assert_status(repo, "what", GIT_STATUS_WT_MODIFIED); - assert_status(repo, "how", GIT_STATUS_CURRENT); - assert_status(repo, "who", GIT_STATUS_INDEX_MODIFIED); - assert_status(repo, "when", GIT_STATUS_WT_NEW); - assert_status(repo, "why", GIT_STATUS_INDEX_NEW); - assert_status(repo, "where", GIT_STATUS_INDEX_NEW|GIT_STATUS_WT_MODIFIED); - - cl_git_pass(git_stash_save(&oid, repo, signature, NULL, GIT_STASH_INCLUDE_UNTRACKED)); - - /* Post-stash state */ - assert_status(repo, "what", GIT_STATUS_CURRENT); - assert_status(repo, "how", GIT_STATUS_CURRENT); - assert_status(repo, "who", GIT_STATUS_CURRENT); - assert_status(repo, "when", GIT_ENOTFOUND); - assert_status(repo, "why", GIT_ENOTFOUND); - assert_status(repo, "where", GIT_ENOTFOUND); -} - -void test_stash_apply__cleanup(void) -{ - git_signature_free(signature); - signature = NULL; - - git_index_free(repo_index); - repo_index = NULL; - - cl_git_sandbox_cleanup(); -} - -void test_stash_apply__with_default(void) -{ - git_buf where = GIT_BUF_INIT; - - cl_git_pass(git_stash_apply(repo, 0, NULL)); - - cl_assert_equal_i(git_index_has_conflicts(repo_index), 0); - assert_status(repo, "what", GIT_STATUS_WT_MODIFIED); - assert_status(repo, "how", GIT_STATUS_CURRENT); - assert_status(repo, "who", GIT_STATUS_WT_MODIFIED); - assert_status(repo, "when", GIT_STATUS_WT_NEW); - assert_status(repo, "why", GIT_STATUS_INDEX_NEW); - assert_status(repo, "where", GIT_STATUS_INDEX_NEW); - - cl_git_pass(git_futils_readbuffer(&where, "stash/where")); - cl_assert_equal_s("....\n", where.ptr); - - git_buf_free(&where); -} - -void test_stash_apply__with_existing_file(void) -{ - cl_git_mkfile("stash/where", "oops!\n"); - cl_git_fail(git_stash_apply(repo, 0, NULL)); -} - -void test_stash_apply__merges_new_file(void) -{ - const git_index_entry *ancestor, *our, *their; - - cl_git_mkfile("stash/where", "committed before stash\n"); - cl_git_pass(git_index_add_bypath(repo_index, "where")); - cl_repo_commit_from_index(NULL, repo, signature, 0, "Other commit"); - - cl_git_pass(git_stash_apply(repo, 0, NULL)); - - cl_assert_equal_i(1, git_index_has_conflicts(repo_index)); - assert_status(repo, "what", GIT_STATUS_INDEX_MODIFIED); - cl_git_pass(git_index_conflict_get(&ancestor, &our, &their, repo_index, "where")); /* unmerged */ - assert_status(repo, "who", GIT_STATUS_INDEX_MODIFIED); - assert_status(repo, "when", GIT_STATUS_WT_NEW); - assert_status(repo, "why", GIT_STATUS_INDEX_NEW); -} - -void test_stash_apply__with_reinstate_index(void) -{ - git_buf where = GIT_BUF_INIT; - git_stash_apply_options opts = GIT_STASH_APPLY_OPTIONS_INIT; - - opts.flags = GIT_STASH_APPLY_REINSTATE_INDEX; - - cl_git_pass(git_stash_apply(repo, 0, &opts)); - - cl_assert_equal_i(git_index_has_conflicts(repo_index), 0); - assert_status(repo, "what", GIT_STATUS_WT_MODIFIED); - assert_status(repo, "how", GIT_STATUS_CURRENT); - assert_status(repo, "who", GIT_STATUS_INDEX_MODIFIED); - assert_status(repo, "when", GIT_STATUS_WT_NEW); - assert_status(repo, "why", GIT_STATUS_INDEX_NEW); - assert_status(repo, "where", GIT_STATUS_INDEX_NEW | GIT_STATUS_WT_MODIFIED); - - cl_git_pass(git_futils_readbuffer(&where, "stash/where")); - cl_assert_equal_s("....\n", where.ptr); - - git_buf_free(&where); -} - -void test_stash_apply__conflict_index_with_default(void) -{ - const git_index_entry *ancestor; - const git_index_entry *our; - const git_index_entry *their; - - cl_git_rewritefile("stash/who", "nothing\n"); - cl_git_pass(git_index_add_bypath(repo_index, "who")); - cl_git_pass(git_index_write(repo_index)); - cl_repo_commit_from_index(NULL, repo, signature, 0, "Other commit"); - - cl_git_pass(git_stash_apply(repo, 0, NULL)); - - cl_assert_equal_i(git_index_has_conflicts(repo_index), 1); - assert_status(repo, "what", GIT_STATUS_INDEX_MODIFIED); - assert_status(repo, "how", GIT_STATUS_CURRENT); - cl_git_pass(git_index_conflict_get(&ancestor, &our, &their, repo_index, "who")); /* unmerged */ - assert_status(repo, "when", GIT_STATUS_WT_NEW); - assert_status(repo, "why", GIT_STATUS_INDEX_NEW); -} - -void test_stash_apply__conflict_index_with_reinstate_index(void) -{ - git_stash_apply_options opts = GIT_STASH_APPLY_OPTIONS_INIT; - - opts.flags = GIT_STASH_APPLY_REINSTATE_INDEX; - - cl_git_rewritefile("stash/who", "nothing\n"); - cl_git_pass(git_index_add_bypath(repo_index, "who")); - cl_git_pass(git_index_write(repo_index)); - cl_repo_commit_from_index(NULL, repo, signature, 0, "Other commit"); - - cl_git_fail_with(git_stash_apply(repo, 0, &opts), GIT_ECONFLICT); - - cl_assert_equal_i(git_index_has_conflicts(repo_index), 0); - assert_status(repo, "what", GIT_STATUS_CURRENT); - assert_status(repo, "how", GIT_STATUS_CURRENT); - assert_status(repo, "who", GIT_STATUS_CURRENT); - assert_status(repo, "when", GIT_ENOTFOUND); - assert_status(repo, "why", GIT_ENOTFOUND); -} - -void test_stash_apply__conflict_untracked_with_default(void) -{ - git_stash_apply_options opts = GIT_STASH_APPLY_OPTIONS_INIT; - - cl_git_mkfile("stash/when", "nothing\n"); - - cl_git_fail_with(git_stash_apply(repo, 0, &opts), GIT_ECONFLICT); - - cl_assert_equal_i(git_index_has_conflicts(repo_index), 0); - assert_status(repo, "what", GIT_STATUS_CURRENT); - assert_status(repo, "how", GIT_STATUS_CURRENT); - assert_status(repo, "who", GIT_STATUS_CURRENT); - assert_status(repo, "when", GIT_STATUS_WT_NEW); - assert_status(repo, "why", GIT_ENOTFOUND); -} - -void test_stash_apply__conflict_untracked_with_reinstate_index(void) -{ - git_stash_apply_options opts = GIT_STASH_APPLY_OPTIONS_INIT; - - opts.flags = GIT_STASH_APPLY_REINSTATE_INDEX; - - cl_git_mkfile("stash/when", "nothing\n"); - - cl_git_fail_with(git_stash_apply(repo, 0, &opts), GIT_ECONFLICT); - - cl_assert_equal_i(git_index_has_conflicts(repo_index), 0); - assert_status(repo, "what", GIT_STATUS_CURRENT); - assert_status(repo, "how", GIT_STATUS_CURRENT); - assert_status(repo, "who", GIT_STATUS_CURRENT); - assert_status(repo, "when", GIT_STATUS_WT_NEW); - assert_status(repo, "why", GIT_ENOTFOUND); -} - -void test_stash_apply__conflict_workdir_with_default(void) -{ - cl_git_rewritefile("stash/what", "ciao\n"); - - cl_git_fail_with(git_stash_apply(repo, 0, NULL), GIT_ECONFLICT); - - cl_assert_equal_i(git_index_has_conflicts(repo_index), 0); - assert_status(repo, "what", GIT_STATUS_WT_MODIFIED); - assert_status(repo, "how", GIT_STATUS_CURRENT); - assert_status(repo, "who", GIT_STATUS_CURRENT); - assert_status(repo, "when", GIT_STATUS_WT_NEW); - assert_status(repo, "why", GIT_ENOTFOUND); -} - -void test_stash_apply__conflict_workdir_with_reinstate_index(void) -{ - git_stash_apply_options opts = GIT_STASH_APPLY_OPTIONS_INIT; - - opts.flags = GIT_STASH_APPLY_REINSTATE_INDEX; - - cl_git_rewritefile("stash/what", "ciao\n"); - - cl_git_fail_with(git_stash_apply(repo, 0, &opts), GIT_ECONFLICT); - - cl_assert_equal_i(git_index_has_conflicts(repo_index), 0); - assert_status(repo, "what", GIT_STATUS_WT_MODIFIED); - assert_status(repo, "how", GIT_STATUS_CURRENT); - assert_status(repo, "who", GIT_STATUS_CURRENT); - assert_status(repo, "when", GIT_STATUS_WT_NEW); - assert_status(repo, "why", GIT_ENOTFOUND); -} - -void test_stash_apply__conflict_commit_with_default(void) -{ - const git_index_entry *ancestor; - const git_index_entry *our; - const git_index_entry *their; - - cl_git_rewritefile("stash/what", "ciao\n"); - cl_git_pass(git_index_add_bypath(repo_index, "what")); - cl_repo_commit_from_index(NULL, repo, signature, 0, "Other commit"); - - cl_git_pass(git_stash_apply(repo, 0, NULL)); - - cl_assert_equal_i(git_index_has_conflicts(repo_index), 1); - cl_git_pass(git_index_conflict_get(&ancestor, &our, &their, repo_index, "what")); /* unmerged */ - assert_status(repo, "how", GIT_STATUS_CURRENT); - assert_status(repo, "who", GIT_STATUS_INDEX_MODIFIED); - assert_status(repo, "when", GIT_STATUS_WT_NEW); - assert_status(repo, "why", GIT_STATUS_INDEX_NEW); -} - -void test_stash_apply__conflict_commit_with_reinstate_index(void) -{ - git_stash_apply_options opts = GIT_STASH_APPLY_OPTIONS_INIT; - const git_index_entry *ancestor; - const git_index_entry *our; - const git_index_entry *their; - - opts.flags = GIT_STASH_APPLY_REINSTATE_INDEX; - - cl_git_rewritefile("stash/what", "ciao\n"); - cl_git_pass(git_index_add_bypath(repo_index, "what")); - cl_repo_commit_from_index(NULL, repo, signature, 0, "Other commit"); - - cl_git_pass(git_stash_apply(repo, 0, &opts)); - - cl_assert_equal_i(git_index_has_conflicts(repo_index), 1); - cl_git_pass(git_index_conflict_get(&ancestor, &our, &their, repo_index, "what")); /* unmerged */ - assert_status(repo, "how", GIT_STATUS_CURRENT); - assert_status(repo, "who", GIT_STATUS_INDEX_MODIFIED); - assert_status(repo, "when", GIT_STATUS_WT_NEW); - assert_status(repo, "why", GIT_STATUS_INDEX_NEW); -} - -void test_stash_apply__fails_with_uncommitted_changes_in_index(void) -{ - cl_git_rewritefile("stash/who", "nothing\n"); - cl_git_pass(git_index_add_bypath(repo_index, "who")); - cl_git_pass(git_index_write(repo_index)); - - cl_git_fail_with(git_stash_apply(repo, 0, NULL), GIT_EUNCOMMITTED); - - cl_assert_equal_i(git_index_has_conflicts(repo_index), 0); - assert_status(repo, "what", GIT_STATUS_CURRENT); - assert_status(repo, "how", GIT_STATUS_CURRENT); - assert_status(repo, "who", GIT_STATUS_INDEX_MODIFIED); - assert_status(repo, "when", GIT_ENOTFOUND); - assert_status(repo, "why", GIT_ENOTFOUND); -} - -void test_stash_apply__pop(void) -{ - cl_git_pass(git_stash_pop(repo, 0, NULL)); - - cl_git_fail_with(git_stash_pop(repo, 0, NULL), GIT_ENOTFOUND); -} - -struct seen_paths { - bool what; - bool how; - bool who; - bool when; -}; - -int checkout_notify( - git_checkout_notify_t why, - const char *path, - const git_diff_file *baseline, - const git_diff_file *target, - const git_diff_file *workdir, - void *payload) -{ - struct seen_paths *seen_paths = (struct seen_paths *)payload; - - GIT_UNUSED(why); - GIT_UNUSED(baseline); - GIT_UNUSED(target); - GIT_UNUSED(workdir); - - if (strcmp(path, "what") == 0) - seen_paths->what = 1; - else if (strcmp(path, "how") == 0) - seen_paths->how = 1; - else if (strcmp(path, "who") == 0) - seen_paths->who = 1; - else if (strcmp(path, "when") == 0) - seen_paths->when = 1; - - return 0; -} - -void test_stash_apply__executes_notify_cb(void) -{ - git_stash_apply_options opts = GIT_STASH_APPLY_OPTIONS_INIT; - struct seen_paths seen_paths = {0}; - - opts.checkout_options.notify_cb = checkout_notify; - opts.checkout_options.notify_flags = GIT_CHECKOUT_NOTIFY_ALL; - opts.checkout_options.notify_payload = &seen_paths; - - cl_git_pass(git_stash_apply(repo, 0, &opts)); - - cl_assert_equal_i(git_index_has_conflicts(repo_index), 0); - assert_status(repo, "what", GIT_STATUS_WT_MODIFIED); - assert_status(repo, "how", GIT_STATUS_CURRENT); - assert_status(repo, "who", GIT_STATUS_WT_MODIFIED); - assert_status(repo, "when", GIT_STATUS_WT_NEW); - assert_status(repo, "why", GIT_STATUS_INDEX_NEW); - assert_status(repo, "where", GIT_STATUS_INDEX_NEW); - - cl_assert_equal_b(true, seen_paths.what); - cl_assert_equal_b(false, seen_paths.how); - cl_assert_equal_b(true, seen_paths.who); - cl_assert_equal_b(true, seen_paths.when); -} - -int progress_cb( - git_stash_apply_progress_t progress, - void *payload) -{ - git_stash_apply_progress_t *p = (git_stash_apply_progress_t *)payload; - - cl_assert_equal_i((*p)+1, progress); - - *p = progress; - - return 0; -} - -void test_stash_apply__calls_progress_cb(void) -{ - git_stash_apply_options opts = GIT_STASH_APPLY_OPTIONS_INIT; - git_stash_apply_progress_t progress = GIT_STASH_APPLY_PROGRESS_NONE; - - opts.progress_cb = progress_cb; - opts.progress_payload = &progress; - - cl_git_pass(git_stash_apply(repo, 0, &opts)); - cl_assert_equal_i(progress, GIT_STASH_APPLY_PROGRESS_DONE); -} - -int aborting_progress_cb( - git_stash_apply_progress_t progress, - void *payload) -{ - GIT_UNUSED(payload); - - if (progress == GIT_STASH_APPLY_PROGRESS_ANALYZE_MODIFIED) - return -44; - - return 0; -} - -void test_stash_apply__progress_cb_can_abort(void) -{ - git_stash_apply_options opts = GIT_STASH_APPLY_OPTIONS_INIT; - - opts.progress_cb = aborting_progress_cb; - - cl_git_fail_with(-44, git_stash_apply(repo, 0, &opts)); -} - -void test_stash_apply__uses_reflog_like_indices_1(void) -{ - git_oid oid; - - cl_git_mkfile("stash/untracked", "untracked\n"); - cl_git_pass(git_stash_save(&oid, repo, signature, NULL, GIT_STASH_INCLUDE_UNTRACKED)); - assert_status(repo, "untracked", GIT_ENOTFOUND); - - // stash@{1} is the oldest (first) stash we made - cl_git_pass(git_stash_apply(repo, 1, NULL)); - cl_assert_equal_i(git_index_has_conflicts(repo_index), 0); - assert_status(repo, "what", GIT_STATUS_WT_MODIFIED); - assert_status(repo, "how", GIT_STATUS_CURRENT); - assert_status(repo, "who", GIT_STATUS_WT_MODIFIED); - assert_status(repo, "when", GIT_STATUS_WT_NEW); - assert_status(repo, "why", GIT_STATUS_INDEX_NEW); - assert_status(repo, "where", GIT_STATUS_INDEX_NEW); -} - -void test_stash_apply__uses_reflog_like_indices_2(void) -{ - git_oid oid; - - cl_git_mkfile("stash/untracked", "untracked\n"); - cl_git_pass(git_stash_save(&oid, repo, signature, NULL, GIT_STASH_INCLUDE_UNTRACKED)); - assert_status(repo, "untracked", GIT_ENOTFOUND); - - // stash@{0} is the newest stash we made immediately above - cl_git_pass(git_stash_apply(repo, 0, NULL)); - - cl_assert_equal_i(git_index_has_conflicts(repo_index), 0); - assert_status(repo, "untracked", GIT_STATUS_WT_NEW); -} diff --git a/vendor/libgit2/tests/stash/drop.c b/vendor/libgit2/tests/stash/drop.c deleted file mode 100644 index 89a0ade72..000000000 --- a/vendor/libgit2/tests/stash/drop.c +++ /dev/null @@ -1,174 +0,0 @@ -#include "clar_libgit2.h" -#include "fileops.h" -#include "stash_helpers.h" -#include "refs.h" - -static git_repository *repo; -static git_signature *signature; - -void test_stash_drop__initialize(void) -{ - cl_git_pass(git_repository_init(&repo, "stash", 0)); - cl_git_pass(git_signature_new(&signature, "nulltoken", "emeric.fermas@gmail.com", 1323847743, 60)); /* Wed Dec 14 08:29:03 2011 +0100 */ -} - -void test_stash_drop__cleanup(void) -{ - git_signature_free(signature); - signature = NULL; - - git_repository_free(repo); - repo = NULL; - - cl_git_pass(git_futils_rmdir_r("stash", NULL, GIT_RMDIR_REMOVE_FILES)); -} - -void test_stash_drop__cannot_drop_from_an_empty_stash(void) -{ - cl_git_fail_with(git_stash_drop(repo, 0), GIT_ENOTFOUND); -} - -static void push_three_states(void) -{ - git_oid oid; - git_index *index; - - cl_git_mkfile("stash/zero.txt", "content\n"); - cl_git_pass(git_repository_index(&index, repo)); - cl_git_pass(git_index_add_bypath(index, "zero.txt")); - cl_repo_commit_from_index(NULL, repo, signature, 0, "Initial commit"); - cl_assert(git_path_exists("stash/zero.txt")); - git_index_free(index); - - cl_git_mkfile("stash/one.txt", "content\n"); - cl_git_pass(git_stash_save( - &oid, repo, signature, "First", GIT_STASH_INCLUDE_UNTRACKED)); - cl_assert(!git_path_exists("stash/one.txt")); - cl_assert(git_path_exists("stash/zero.txt")); - - cl_git_mkfile("stash/two.txt", "content\n"); - cl_git_pass(git_stash_save( - &oid, repo, signature, "Second", GIT_STASH_INCLUDE_UNTRACKED)); - cl_assert(!git_path_exists("stash/two.txt")); - cl_assert(git_path_exists("stash/zero.txt")); - - cl_git_mkfile("stash/three.txt", "content\n"); - cl_git_pass(git_stash_save( - &oid, repo, signature, "Third", GIT_STASH_INCLUDE_UNTRACKED)); - cl_assert(!git_path_exists("stash/three.txt")); - cl_assert(git_path_exists("stash/zero.txt")); -} - -void test_stash_drop__cannot_drop_a_non_existing_stashed_state(void) -{ - push_three_states(); - - cl_git_fail_with(git_stash_drop(repo, 666), GIT_ENOTFOUND); - cl_git_fail_with(git_stash_drop(repo, 42), GIT_ENOTFOUND); - cl_git_fail_with(git_stash_drop(repo, 3), GIT_ENOTFOUND); -} - -void test_stash_drop__can_purge_the_stash_from_the_top(void) -{ - push_three_states(); - - cl_git_pass(git_stash_drop(repo, 0)); - cl_git_pass(git_stash_drop(repo, 0)); - cl_git_pass(git_stash_drop(repo, 0)); - - cl_git_fail_with(git_stash_drop(repo, 0), GIT_ENOTFOUND); -} - -void test_stash_drop__can_purge_the_stash_from_the_bottom(void) -{ - push_three_states(); - - cl_git_pass(git_stash_drop(repo, 2)); - cl_git_pass(git_stash_drop(repo, 1)); - cl_git_pass(git_stash_drop(repo, 0)); - - cl_git_fail_with(git_stash_drop(repo, 0), GIT_ENOTFOUND); -} - -void test_stash_drop__dropping_an_entry_rewrites_reflog_history(void) -{ - git_reference *stash; - git_reflog *reflog; - const git_reflog_entry *entry; - git_oid oid; - size_t count; - - push_three_states(); - - cl_git_pass(git_reference_lookup(&stash, repo, GIT_REFS_STASH_FILE)); - - cl_git_pass(git_reflog_read(&reflog, repo, GIT_REFS_STASH_FILE)); - entry = git_reflog_entry_byindex(reflog, 1); - - git_oid_cpy(&oid, git_reflog_entry_id_old(entry)); - count = git_reflog_entrycount(reflog); - - git_reflog_free(reflog); - - cl_git_pass(git_stash_drop(repo, 1)); - - cl_git_pass(git_reflog_read(&reflog, repo, GIT_REFS_STASH_FILE)); - entry = git_reflog_entry_byindex(reflog, 0); - - cl_assert_equal_oid(&oid, git_reflog_entry_id_old(entry)); - cl_assert_equal_sz(count - 1, git_reflog_entrycount(reflog)); - - git_reflog_free(reflog); - - git_reference_free(stash); -} - -void test_stash_drop__dropping_the_last_entry_removes_the_stash(void) -{ - git_reference *stash; - - push_three_states(); - - cl_git_pass(git_reference_lookup(&stash, repo, GIT_REFS_STASH_FILE)); - git_reference_free(stash); - - cl_git_pass(git_stash_drop(repo, 0)); - cl_git_pass(git_stash_drop(repo, 0)); - cl_git_pass(git_stash_drop(repo, 0)); - - cl_git_fail_with( - git_reference_lookup(&stash, repo, GIT_REFS_STASH_FILE), GIT_ENOTFOUND); -} - -void retrieve_top_stash_id(git_oid *out) -{ - git_object *top_stash; - - cl_git_pass(git_revparse_single(&top_stash, repo, "stash@{0}")); - cl_git_pass(git_reference_name_to_id(out, repo, GIT_REFS_STASH_FILE)); - - cl_assert_equal_oid(out, git_object_id(top_stash)); - - git_object_free(top_stash); -} - -void test_stash_drop__dropping_the_top_stash_updates_the_stash_reference(void) -{ - git_object *next_top_stash; - git_oid oid; - - push_three_states(); - - retrieve_top_stash_id(&oid); - - cl_git_pass(git_revparse_single(&next_top_stash, repo, "stash@{1}")); - cl_assert(git_oid_cmp(&oid, git_object_id(next_top_stash))); - - cl_git_pass(git_stash_drop(repo, 0)); - - retrieve_top_stash_id(&oid); - - cl_assert_equal_oid(&oid, git_object_id(next_top_stash)); - - git_object_free(next_top_stash); -} diff --git a/vendor/libgit2/tests/stash/foreach.c b/vendor/libgit2/tests/stash/foreach.c deleted file mode 100644 index 57dc8eeb4..000000000 --- a/vendor/libgit2/tests/stash/foreach.c +++ /dev/null @@ -1,126 +0,0 @@ -#include "clar_libgit2.h" -#include "fileops.h" -#include "stash_helpers.h" - -struct callback_data -{ - char **oids; - int invokes; -}; - -static git_repository *repo; -static git_signature *signature; -static git_oid stash_tip_oid; -struct callback_data data; - -#define REPO_NAME "stash" - -void test_stash_foreach__initialize(void) -{ - cl_git_pass(git_signature_new( - &signature, - "nulltoken", - "emeric.fermas@gmail.com", - 1323847743, 60)); /* Wed Dec 14 08:29:03 2011 +0100 */ - - memset(&data, 0, sizeof(struct callback_data)); -} - -void test_stash_foreach__cleanup(void) -{ - git_signature_free(signature); - signature = NULL; - - git_repository_free(repo); - repo = NULL; - - cl_git_pass(git_futils_rmdir_r(REPO_NAME, NULL, GIT_RMDIR_REMOVE_FILES)); -} - -static int callback_cb( - size_t index, - const char* message, - const git_oid *stash_oid, - void *payload) -{ - struct callback_data *data = (struct callback_data *)payload; - - GIT_UNUSED(index); - GIT_UNUSED(message); - - cl_assert_equal_i(0, git_oid_streq(stash_oid, data->oids[data->invokes++])); - - return 0; -} - -void test_stash_foreach__enumerating_a_empty_repository_doesnt_fail(void) -{ - char *oids[] = { NULL }; - - data.oids = oids; - - cl_git_pass(git_repository_init(&repo, REPO_NAME, 0)); - - cl_git_pass(git_stash_foreach(repo, callback_cb, &data)); - - cl_assert_equal_i(0, data.invokes); -} - -void test_stash_foreach__can_enumerate_a_repository(void) -{ - char *oids_default[] = { - "493568b7a2681187aaac8a58d3f1eab1527cba84", NULL }; - - char *oids_untracked[] = { - "7f89a8b15c878809c5c54d1ff8f8c9674154017b", - "493568b7a2681187aaac8a58d3f1eab1527cba84", NULL }; - - char *oids_ignored[] = { - "c95599a8fef20a7e57582c6727b1a0d02e0a5828", - "7f89a8b15c878809c5c54d1ff8f8c9674154017b", - "493568b7a2681187aaac8a58d3f1eab1527cba84", NULL }; - - cl_git_pass(git_repository_init(&repo, REPO_NAME, 0)); - - setup_stash(repo, signature); - - cl_git_pass(git_stash_save( - &stash_tip_oid, - repo, - signature, - NULL, - GIT_STASH_DEFAULT)); - - data.oids = oids_default; - - cl_git_pass(git_stash_foreach(repo, callback_cb, &data)); - cl_assert_equal_i(1, data.invokes); - - /* ensure stash_foreach operates with INCLUDE_UNTRACKED */ - cl_git_pass(git_stash_save( - &stash_tip_oid, - repo, - signature, - NULL, - GIT_STASH_INCLUDE_UNTRACKED)); - - data.oids = oids_untracked; - data.invokes = 0; - - cl_git_pass(git_stash_foreach(repo, callback_cb, &data)); - cl_assert_equal_i(2, data.invokes); - - /* ensure stash_foreach operates with INCLUDE_IGNORED */ - cl_git_pass(git_stash_save( - &stash_tip_oid, - repo, - signature, - NULL, - GIT_STASH_INCLUDE_IGNORED)); - - data.oids = oids_ignored; - data.invokes = 0; - - cl_git_pass(git_stash_foreach(repo, callback_cb, &data)); - cl_assert_equal_i(3, data.invokes); -} diff --git a/vendor/libgit2/tests/stash/save.c b/vendor/libgit2/tests/stash/save.c deleted file mode 100644 index edcee820f..000000000 --- a/vendor/libgit2/tests/stash/save.c +++ /dev/null @@ -1,428 +0,0 @@ -#include "clar_libgit2.h" -#include "fileops.h" -#include "stash_helpers.h" - -static git_repository *repo; -static git_signature *signature; -static git_oid stash_tip_oid; - -/* - * Friendly reminder, in order to ease the reading of the following tests: - * - * "stash" points to the worktree commit - * "stash^1" points to the base commit (HEAD when the stash was created) - * "stash^2" points to the index commit - * "stash^3" points to the untracked commit - */ - -void test_stash_save__initialize(void) -{ - cl_git_pass(git_repository_init(&repo, "stash", 0)); - cl_git_pass(git_signature_new(&signature, "nulltoken", "emeric.fermas@gmail.com", 1323847743, 60)); /* Wed Dec 14 08:29:03 2011 +0100 */ - - setup_stash(repo, signature); -} - -void test_stash_save__cleanup(void) -{ - git_signature_free(signature); - signature = NULL; - - git_repository_free(repo); - repo = NULL; - - cl_git_pass(git_futils_rmdir_r("stash", NULL, GIT_RMDIR_REMOVE_FILES)); - cl_fixture_cleanup("sorry-it-is-a-non-bare-only-party"); -} - -static void assert_object_oid(const char* revision, const char* expected_oid, git_otype type) -{ - int result; - git_object *obj; - - result = git_revparse_single(&obj, repo, revision); - - if (!expected_oid) { - cl_assert_equal_i(GIT_ENOTFOUND, result); - return; - } else - cl_assert_equal_i(0, result); - - cl_git_pass(git_oid_streq(git_object_id(obj), expected_oid)); - cl_assert_equal_i(type, git_object_type(obj)); - git_object_free(obj); -} - -static void assert_blob_oid(const char* revision, const char* expected_oid) -{ - assert_object_oid(revision, expected_oid, GIT_OBJ_BLOB); -} - -void test_stash_save__does_not_keep_index_by_default(void) -{ -/* -$ git stash - -$ git show refs/stash:what -see you later - -$ git show refs/stash:how -not so small and - -$ git show refs/stash:who -funky world - -$ git show refs/stash:when -fatal: Path 'when' exists on disk, but not in 'stash'. - -$ git show refs/stash^2:what -goodbye - -$ git show refs/stash^2:how -not so small and - -$ git show refs/stash^2:who -world - -$ git show refs/stash^2:when -fatal: Path 'when' exists on disk, but not in 'stash^2'. - -$ git status --short -?? when - -*/ - unsigned int status; - - cl_git_pass(git_stash_save(&stash_tip_oid, repo, signature, NULL, GIT_STASH_DEFAULT)); - cl_git_pass(git_status_file(&status, repo, "when")); - - assert_blob_oid("refs/stash:what", "bc99dc98b3eba0e9157e94769cd4d49cb49de449"); /* see you later */ - assert_blob_oid("refs/stash:how", "e6d64adb2c7f3eb8feb493b556cc8070dca379a3"); /* not so small and */ - assert_blob_oid("refs/stash:who", "a0400d4954659306a976567af43125a0b1aa8595"); /* funky world */ - assert_blob_oid("refs/stash:when", NULL); - assert_blob_oid("refs/stash:why", "88c2533e21f098b89c91a431d8075cbdbe422a51"); /* would anybody use stash? */ - assert_blob_oid("refs/stash:where", "e3d6434ec12eb76af8dfa843a64ba6ab91014a0b"); /* .... */ - assert_blob_oid("refs/stash:.gitignore", "ac4d88de61733173d9959e4b77c69b9f17a00980"); - assert_blob_oid("refs/stash:just.ignore", NULL); - - assert_blob_oid("refs/stash^2:what", "dd7e1c6f0fefe118f0b63d9f10908c460aa317a6"); /* goodbye */ - assert_blob_oid("refs/stash^2:how", "e6d64adb2c7f3eb8feb493b556cc8070dca379a3"); /* not so small and */ - assert_blob_oid("refs/stash^2:who", "cc628ccd10742baea8241c5924df992b5c019f71"); /* world */ - assert_blob_oid("refs/stash^2:when", NULL); - assert_blob_oid("refs/stash^2:why", "88c2533e21f098b89c91a431d8075cbdbe422a51"); /* would anybody use stash? */ - assert_blob_oid("refs/stash^2:where", "e08f7fbb9a42a0c5367cf8b349f1f08c3d56bd72"); /* ???? */ - assert_blob_oid("refs/stash^2:.gitignore", "ac4d88de61733173d9959e4b77c69b9f17a00980"); - assert_blob_oid("refs/stash^2:just.ignore", NULL); - - assert_blob_oid("refs/stash^3", NULL); - - cl_assert_equal_i(GIT_STATUS_WT_NEW, status); -} - -void test_stash_save__can_keep_index(void) -{ - cl_git_pass(git_stash_save(&stash_tip_oid, repo, signature, NULL, GIT_STASH_KEEP_INDEX)); - - assert_status(repo, "what", GIT_STATUS_INDEX_MODIFIED); - assert_status(repo, "how", GIT_STATUS_INDEX_MODIFIED); - assert_status(repo, "who", GIT_STATUS_CURRENT); - assert_status(repo, "when", GIT_STATUS_WT_NEW); - assert_status(repo, "just.ignore", GIT_STATUS_IGNORED); -} - -static void assert_commit_message_contains(const char *revision, const char *fragment) -{ - git_commit *commit; - - cl_git_pass(git_revparse_single((git_object**)&commit, repo, revision)); - - cl_assert(strstr(git_commit_message(commit), fragment) != NULL); - - git_commit_free(commit); -} - -void test_stash_save__can_include_untracked_files(void) -{ - cl_git_pass(git_stash_save(&stash_tip_oid, repo, signature, NULL, GIT_STASH_INCLUDE_UNTRACKED)); - - assert_commit_message_contains("refs/stash^3", "untracked files on master: "); - - assert_blob_oid("refs/stash^3:what", NULL); - assert_blob_oid("refs/stash^3:how", NULL); - assert_blob_oid("refs/stash^3:who", NULL); - assert_blob_oid("refs/stash^3:when", "b6ed15e81e2593d7bb6265eb4a991d29dc3e628b"); - assert_blob_oid("refs/stash^3:just.ignore", NULL); -} - -void test_stash_save__untracked_skips_ignored(void) -{ - cl_git_append2file("stash/.gitignore", "bundle/vendor/\n"); - cl_must_pass(p_mkdir("stash/bundle", 0777)); - cl_must_pass(p_mkdir("stash/bundle/vendor", 0777)); - cl_git_mkfile("stash/bundle/vendor/blah", "contents\n"); - - cl_assert(git_path_exists("stash/when")); /* untracked */ - cl_assert(git_path_exists("stash/just.ignore")); /* ignored */ - cl_assert(git_path_exists("stash/bundle/vendor/blah")); /* ignored */ - - cl_git_pass(git_stash_save( - &stash_tip_oid, repo, signature, NULL, GIT_STASH_INCLUDE_UNTRACKED)); - - cl_assert(!git_path_exists("stash/when")); - cl_assert(git_path_exists("stash/bundle/vendor/blah")); - cl_assert(git_path_exists("stash/just.ignore")); -} - -void test_stash_save__can_include_untracked_and_ignored_files(void) -{ - cl_git_pass(git_stash_save(&stash_tip_oid, repo, signature, NULL, GIT_STASH_INCLUDE_UNTRACKED | GIT_STASH_INCLUDE_IGNORED)); - - assert_commit_message_contains("refs/stash^3", "untracked files on master: "); - - assert_blob_oid("refs/stash^3:what", NULL); - assert_blob_oid("refs/stash^3:how", NULL); - assert_blob_oid("refs/stash^3:who", NULL); - assert_blob_oid("refs/stash^3:when", "b6ed15e81e2593d7bb6265eb4a991d29dc3e628b"); - assert_blob_oid("refs/stash^3:just.ignore", "78925fb1236b98b37a35e9723033e627f97aa88b"); - - cl_assert(!git_path_exists("stash/just.ignore")); -} - -#define MESSAGE "Look Ma! I'm on TV!" -void test_stash_save__can_accept_a_message(void) -{ - cl_git_pass(git_stash_save(&stash_tip_oid, repo, signature, MESSAGE, GIT_STASH_DEFAULT)); - - assert_commit_message_contains("refs/stash^2", "index on master: "); - assert_commit_message_contains("refs/stash", "On master: " MESSAGE); -} - -void test_stash_save__cannot_stash_against_an_unborn_branch(void) -{ - git_reference *head; - - cl_git_pass(git_reference_symbolic_create(&head, repo, "HEAD", "refs/heads/unborn", 1, NULL)); - - cl_assert_equal_i(GIT_EUNBORNBRANCH, - git_stash_save(&stash_tip_oid, repo, signature, NULL, GIT_STASH_DEFAULT)); - - git_reference_free(head); -} - -void test_stash_save__cannot_stash_against_a_bare_repository(void) -{ - git_repository *local; - - cl_git_pass(git_repository_init(&local, "sorry-it-is-a-non-bare-only-party", 1)); - - cl_assert_equal_i(GIT_EBAREREPO, - git_stash_save(&stash_tip_oid, local, signature, NULL, GIT_STASH_DEFAULT)); - - git_repository_free(local); -} - -void test_stash_save__can_stash_against_a_detached_head(void) -{ - git_repository_detach_head(repo); - - cl_git_pass(git_stash_save(&stash_tip_oid, repo, signature, NULL, GIT_STASH_DEFAULT)); - - assert_commit_message_contains("refs/stash^2", "index on (no branch): "); - assert_commit_message_contains("refs/stash", "WIP on (no branch): "); -} - -void test_stash_save__stashing_updates_the_reflog(void) -{ - assert_object_oid("refs/stash@{0}", NULL, GIT_OBJ_COMMIT); - - cl_git_pass(git_stash_save(&stash_tip_oid, repo, signature, NULL, GIT_STASH_DEFAULT)); - - assert_object_oid("refs/stash@{0}", git_oid_tostr_s(&stash_tip_oid), GIT_OBJ_COMMIT); - assert_object_oid("refs/stash@{1}", NULL, GIT_OBJ_COMMIT); -} - -void test_stash_save__cannot_stash_when_there_are_no_local_change(void) -{ - git_index *index; - git_oid stash_tip_oid; - - cl_git_pass(git_repository_index(&index, repo)); - - /* - * 'what', 'where' and 'who' are being committed. - * 'when' remains untracked. - */ - cl_git_pass(git_index_add_bypath(index, "what")); - cl_git_pass(git_index_add_bypath(index, "where")); - cl_git_pass(git_index_add_bypath(index, "who")); - - cl_repo_commit_from_index(NULL, repo, signature, 0, "Initial commit"); - git_index_free(index); - - cl_assert_equal_i(GIT_ENOTFOUND, - git_stash_save(&stash_tip_oid, repo, signature, NULL, GIT_STASH_DEFAULT)); - - p_unlink("stash/when"); - cl_assert_equal_i(GIT_ENOTFOUND, - git_stash_save(&stash_tip_oid, repo, signature, NULL, GIT_STASH_INCLUDE_UNTRACKED)); -} - -void test_stash_save__can_stage_normal_then_stage_untracked(void) -{ - /* - * $ git ls-tree stash@{1}^0 - * 100644 blob ac4d88de61733173d9959e4b77c69b9f17a00980 .gitignore - * 100644 blob e6d64adb2c7f3eb8feb493b556cc8070dca379a3 how - * 100644 blob bc99dc98b3eba0e9157e94769cd4d49cb49de449 what - * 100644 blob a0400d4954659306a976567af43125a0b1aa8595 who - * - * $ git ls-tree stash@{1}^1 - * 100644 blob ac4d88de61733173d9959e4b77c69b9f17a00980 .gitignore - * 100644 blob ac790413e2d7a26c3767e78c57bb28716686eebc how - * 100644 blob ce013625030ba8dba906f756967f9e9ca394464a what - * 100644 blob cc628ccd10742baea8241c5924df992b5c019f71 who - * - * $ git ls-tree stash@{1}^2 - * 100644 blob ac4d88de61733173d9959e4b77c69b9f17a00980 .gitignore - * 100644 blob e6d64adb2c7f3eb8feb493b556cc8070dca379a3 how - * 100644 blob dd7e1c6f0fefe118f0b63d9f10908c460aa317a6 what - * 100644 blob cc628ccd10742baea8241c5924df992b5c019f71 who - * - * $ git ls-tree stash@{1}^3 - * fatal: Not a valid object name stash@{1}^3 - * - * $ git ls-tree stash@{0}^0 - * 100644 blob ac4d88de61733173d9959e4b77c69b9f17a00980 .gitignore - * 100644 blob ac790413e2d7a26c3767e78c57bb28716686eebc how - * 100644 blob ce013625030ba8dba906f756967f9e9ca394464a what - * 100644 blob cc628ccd10742baea8241c5924df992b5c019f71 who - * - * $ git ls-tree stash@{0}^1 - * 100644 blob ac4d88de61733173d9959e4b77c69b9f17a00980 .gitignore - * 100644 blob ac790413e2d7a26c3767e78c57bb28716686eebc how - * 100644 blob ce013625030ba8dba906f756967f9e9ca394464a what - * 100644 blob cc628ccd10742baea8241c5924df992b5c019f71 who - * - * $ git ls-tree stash@{0}^2 - * 100644 blob ac4d88de61733173d9959e4b77c69b9f17a00980 .gitignore - * 100644 blob ac790413e2d7a26c3767e78c57bb28716686eebc how - * 100644 blob ce013625030ba8dba906f756967f9e9ca394464a what - * 100644 blob cc628ccd10742baea8241c5924df992b5c019f71 who - * - * $ git ls-tree stash@{0}^3 - * 100644 blob b6ed15e81e2593d7bb6265eb4a991d29dc3e628b when - */ - - assert_status(repo, "what", GIT_STATUS_WT_MODIFIED | GIT_STATUS_INDEX_MODIFIED); - assert_status(repo, "how", GIT_STATUS_INDEX_MODIFIED); - assert_status(repo, "who", GIT_STATUS_WT_MODIFIED); - assert_status(repo, "when", GIT_STATUS_WT_NEW); - assert_status(repo, "just.ignore", GIT_STATUS_IGNORED); - - cl_git_pass(git_stash_save(&stash_tip_oid, repo, signature, NULL, GIT_STASH_DEFAULT)); - assert_status(repo, "what", GIT_STATUS_CURRENT); - assert_status(repo, "how", GIT_STATUS_CURRENT); - assert_status(repo, "who", GIT_STATUS_CURRENT); - assert_status(repo, "when", GIT_STATUS_WT_NEW); - assert_status(repo, "just.ignore", GIT_STATUS_IGNORED); - - cl_git_pass(git_stash_save(&stash_tip_oid, repo, signature, NULL, GIT_STASH_INCLUDE_UNTRACKED)); - assert_status(repo, "what", GIT_STATUS_CURRENT); - assert_status(repo, "how", GIT_STATUS_CURRENT); - assert_status(repo, "who", GIT_STATUS_CURRENT); - assert_status(repo, "when", GIT_ENOTFOUND); - assert_status(repo, "just.ignore", GIT_STATUS_IGNORED); - - - assert_blob_oid("stash@{1}^0:what", "bc99dc98b3eba0e9157e94769cd4d49cb49de449"); /* see you later */ - assert_blob_oid("stash@{1}^0:how", "e6d64adb2c7f3eb8feb493b556cc8070dca379a3"); /* not so small and */ - assert_blob_oid("stash@{1}^0:who", "a0400d4954659306a976567af43125a0b1aa8595"); /* funky world */ - assert_blob_oid("stash@{1}^0:when", NULL); - - assert_blob_oid("stash@{1}^2:what", "dd7e1c6f0fefe118f0b63d9f10908c460aa317a6"); /* goodbye */ - assert_blob_oid("stash@{1}^2:how", "e6d64adb2c7f3eb8feb493b556cc8070dca379a3"); /* not so small and */ - assert_blob_oid("stash@{1}^2:who", "cc628ccd10742baea8241c5924df992b5c019f71"); /* world */ - assert_blob_oid("stash@{1}^2:when", NULL); - - assert_object_oid("stash@{1}^3", NULL, GIT_OBJ_COMMIT); - - assert_blob_oid("stash@{0}^0:what", "ce013625030ba8dba906f756967f9e9ca394464a"); /* hello */ - assert_blob_oid("stash@{0}^0:how", "ac790413e2d7a26c3767e78c57bb28716686eebc"); /* small */ - assert_blob_oid("stash@{0}^0:who", "cc628ccd10742baea8241c5924df992b5c019f71"); /* world */ - assert_blob_oid("stash@{0}^0:when", NULL); - - assert_blob_oid("stash@{0}^2:what", "ce013625030ba8dba906f756967f9e9ca394464a"); /* hello */ - assert_blob_oid("stash@{0}^2:how", "ac790413e2d7a26c3767e78c57bb28716686eebc"); /* small */ - assert_blob_oid("stash@{0}^2:who", "cc628ccd10742baea8241c5924df992b5c019f71"); /* world */ - assert_blob_oid("stash@{0}^2:when", NULL); - - assert_blob_oid("stash@{0}^3:when", "b6ed15e81e2593d7bb6265eb4a991d29dc3e628b"); /* now */ -} - -#define EMPTY_TREE "4b825dc642cb6eb9a060e54bf8d69288fbee4904" - -void test_stash_save__including_untracked_without_any_untracked_file_creates_an_empty_tree(void) -{ - cl_must_pass(p_unlink("stash/when")); - - assert_status(repo, "what", GIT_STATUS_WT_MODIFIED | GIT_STATUS_INDEX_MODIFIED); - assert_status(repo, "how", GIT_STATUS_INDEX_MODIFIED); - assert_status(repo, "who", GIT_STATUS_WT_MODIFIED); - assert_status(repo, "when", GIT_ENOTFOUND); - assert_status(repo, "just.ignore", GIT_STATUS_IGNORED); - - cl_git_pass(git_stash_save(&stash_tip_oid, repo, signature, NULL, GIT_STASH_INCLUDE_UNTRACKED)); - - assert_object_oid("stash^3^{tree}", EMPTY_TREE, GIT_OBJ_TREE); -} - -void test_stash_save__ignored_directory(void) -{ - cl_git_pass(p_mkdir("stash/ignored_directory", 0777)); - cl_git_pass(p_mkdir("stash/ignored_directory/sub", 0777)); - cl_git_mkfile("stash/ignored_directory/sub/some_file", "stuff"); - - assert_status(repo, "ignored_directory/sub/some_file", GIT_STATUS_WT_NEW); - cl_git_pass(git_ignore_add_rule(repo, "ignored_directory/")); - assert_status(repo, "ignored_directory/sub/some_file", GIT_STATUS_IGNORED); - - cl_git_pass(git_stash_save(&stash_tip_oid, repo, signature, NULL, GIT_STASH_INCLUDE_UNTRACKED | GIT_STASH_INCLUDE_IGNORED)); - - cl_assert(!git_path_exists("stash/ignored_directory/sub/some_file")); - cl_assert(!git_path_exists("stash/ignored_directory/sub")); - cl_assert(!git_path_exists("stash/ignored_directory")); -} - -void test_stash_save__skip_submodules(void) -{ - git_repository *untracked_repo; - cl_git_pass(git_repository_init(&untracked_repo, "stash/untracked_repo", false)); - cl_git_mkfile("stash/untracked_repo/content", "stuff"); - git_repository_free(untracked_repo); - - assert_status(repo, "untracked_repo/", GIT_STATUS_WT_NEW); - - cl_git_pass(git_stash_save( - &stash_tip_oid, repo, signature, NULL, GIT_STASH_INCLUDE_UNTRACKED)); - - assert_status(repo, "untracked_repo/", GIT_STATUS_WT_NEW); -} - -void test_stash_save__deleted_in_index_modified_in_workdir(void) -{ - git_index *index; - - git_repository_index(&index, repo); - - cl_git_pass(git_index_remove_bypath(index, "who")); - cl_git_pass(git_index_write(index)); - - assert_status(repo, "who", GIT_STATUS_WT_NEW | GIT_STATUS_INDEX_DELETED); - - cl_git_pass(git_stash_save(&stash_tip_oid, repo, signature, NULL, GIT_STASH_DEFAULT)); - - assert_blob_oid("stash@{0}^0:who", "a0400d4954659306a976567af43125a0b1aa8595"); - assert_blob_oid("stash@{0}^2:who", NULL); - - git_index_free(index); -} diff --git a/vendor/libgit2/tests/stash/stash_helpers.c b/vendor/libgit2/tests/stash/stash_helpers.c deleted file mode 100644 index 0398757c2..000000000 --- a/vendor/libgit2/tests/stash/stash_helpers.c +++ /dev/null @@ -1,57 +0,0 @@ -#include "clar_libgit2.h" -#include "fileops.h" -#include "stash_helpers.h" - -void setup_stash(git_repository *repo, git_signature *signature) -{ - git_index *index; - - cl_git_pass(git_repository_index(&index, repo)); - - cl_git_mkfile("stash/what", "hello\n"); /* ce013625030ba8dba906f756967f9e9ca394464a */ - cl_git_mkfile("stash/how", "small\n"); /* ac790413e2d7a26c3767e78c57bb28716686eebc */ - cl_git_mkfile("stash/who", "world\n"); /* cc628ccd10742baea8241c5924df992b5c019f71 */ - cl_git_mkfile("stash/when", "now\n"); /* b6ed15e81e2593d7bb6265eb4a991d29dc3e628b */ - cl_git_mkfile("stash/just.ignore", "me\n"); /* 78925fb1236b98b37a35e9723033e627f97aa88b */ - - cl_git_mkfile("stash/.gitignore", "*.ignore\n"); - - cl_git_pass(git_index_add_bypath(index, "what")); - cl_git_pass(git_index_add_bypath(index, "how")); - cl_git_pass(git_index_add_bypath(index, "who")); - cl_git_pass(git_index_add_bypath(index, ".gitignore")); - - cl_repo_commit_from_index(NULL, repo, signature, 0, "Initial commit"); - - cl_git_rewritefile("stash/what", "goodbye\n"); /* dd7e1c6f0fefe118f0b63d9f10908c460aa317a6 */ - cl_git_rewritefile("stash/how", "not so small and\n"); /* e6d64adb2c7f3eb8feb493b556cc8070dca379a3 */ - cl_git_rewritefile("stash/who", "funky world\n"); /* a0400d4954659306a976567af43125a0b1aa8595 */ - cl_git_mkfile("stash/why", "would anybody use stash?\n"); /* 88c2533e21f098b89c91a431d8075cbde422a51 */ - cl_git_mkfile("stash/where", "????\n"); /* e08f7fbb9a42a0c5367cf8b349f1f08c3d56bd72 */ - - cl_git_pass(git_index_add_bypath(index, "what")); - cl_git_pass(git_index_add_bypath(index, "how")); - cl_git_pass(git_index_add_bypath(index, "why")); - cl_git_pass(git_index_add_bypath(index, "where")); - cl_git_pass(git_index_write(index)); - - cl_git_rewritefile("stash/what", "see you later\n"); /* bc99dc98b3eba0e9157e94769cd4d49cb49de449 */ - cl_git_mkfile("stash/where", "....\n"); /* e3d6434ec12eb76af8dfa843a64ba6ab91014a0b */ - - git_index_free(index); -} - -void assert_status( - git_repository *repo, - const char *path, - int status_flags) -{ - unsigned int status; - - if (status_flags < 0) - cl_assert_equal_i(status_flags, git_status_file(&status, repo, path)); - else { - cl_git_pass(git_status_file(&status, repo, path)); - cl_assert_equal_i((unsigned int)status_flags, status); - } -} diff --git a/vendor/libgit2/tests/stash/stash_helpers.h b/vendor/libgit2/tests/stash/stash_helpers.h deleted file mode 100644 index 66d758fe2..000000000 --- a/vendor/libgit2/tests/stash/stash_helpers.h +++ /dev/null @@ -1,8 +0,0 @@ -void setup_stash( - git_repository *repo, - git_signature *signature); - -void assert_status( - git_repository *repo, - const char *path, - int status_flags); diff --git a/vendor/libgit2/tests/stash/submodules.c b/vendor/libgit2/tests/stash/submodules.c deleted file mode 100644 index 8cadca0f2..000000000 --- a/vendor/libgit2/tests/stash/submodules.c +++ /dev/null @@ -1,83 +0,0 @@ -#include "clar_libgit2.h" -#include "stash_helpers.h" -#include "../submodule/submodule_helpers.h" - -static git_repository *repo; -static git_signature *signature; -static git_oid stash_tip_oid; - -static git_submodule *sm; - -void test_stash_submodules__initialize(void) -{ - cl_git_pass(git_signature_new(&signature, "nulltoken", "emeric.fermas@gmail.com", 1323847743, 60)); /* Wed Dec 14 08:29:03 2011 +0100 */ - - repo = setup_fixture_submodules(); - - cl_git_pass(git_submodule_lookup(&sm, repo, "testrepo")); -} - -void test_stash_submodules__cleanup(void) -{ - git_submodule_free(sm); - sm = NULL; - - git_signature_free(signature); - signature = NULL; -} - -void test_stash_submodules__does_not_stash_modified_submodules(void) -{ - static git_index *smindex; - static git_repository *smrepo; - - assert_status(repo, "modified", GIT_STATUS_WT_MODIFIED); - - /* modify file in submodule */ - cl_git_rewritefile("submodules/testrepo/README", "heyheyhey"); - assert_status(repo, "testrepo", GIT_STATUS_WT_MODIFIED); - - /* add file to index in submodule */ - cl_git_pass(git_submodule_open(&smrepo, sm)); - cl_git_pass(git_repository_index(&smindex, smrepo)); - cl_git_pass(git_index_add_bypath(smindex, "README")); - - /* commit changed index of submodule */ - cl_repo_commit_from_index(NULL, smrepo, NULL, 1372350000, "Modify it"); - assert_status(repo, "testrepo", GIT_STATUS_WT_MODIFIED); - - cl_git_pass(git_stash_save(&stash_tip_oid, repo, signature, NULL, GIT_STASH_DEFAULT)); - - assert_status(repo, "testrepo", GIT_STATUS_WT_MODIFIED); - assert_status(repo, "modified", GIT_STATUS_CURRENT); - - git_index_free(smindex); - git_repository_free(smrepo); -} - -void test_stash_submodules__stash_is_empty_with_modified_submodules(void) -{ - static git_index *smindex; - static git_repository *smrepo; - - cl_git_pass(git_stash_save(&stash_tip_oid, repo, signature, NULL, GIT_STASH_DEFAULT)); - assert_status(repo, "modified", GIT_STATUS_CURRENT); - - /* modify file in submodule */ - cl_git_rewritefile("submodules/testrepo/README", "heyheyhey"); - assert_status(repo, "testrepo", GIT_STATUS_WT_MODIFIED); - - /* add file to index in submodule */ - cl_git_pass(git_submodule_open(&smrepo, sm)); - cl_git_pass(git_repository_index(&smindex, smrepo)); - cl_git_pass(git_index_add_bypath(smindex, "README")); - - /* commit changed index of submodule */ - cl_repo_commit_from_index(NULL, smrepo, NULL, 1372350000, "Modify it"); - assert_status(repo, "testrepo", GIT_STATUS_WT_MODIFIED); - - cl_git_fail_with(git_stash_save(&stash_tip_oid, repo, signature, NULL, GIT_STASH_DEFAULT), GIT_ENOTFOUND); - - git_index_free(smindex); - git_repository_free(smrepo); -} diff --git a/vendor/libgit2/tests/status/ignore.c b/vendor/libgit2/tests/status/ignore.c deleted file mode 100644 index c318046da..000000000 --- a/vendor/libgit2/tests/status/ignore.c +++ /dev/null @@ -1,1041 +0,0 @@ -#include "clar_libgit2.h" -#include "fileops.h" -#include "git2/attr.h" -#include "ignore.h" -#include "attr.h" -#include "status_helpers.h" - -static git_repository *g_repo = NULL; - -void test_status_ignore__initialize(void) -{ -} - -void test_status_ignore__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -static void assert_ignored_( - bool expected, const char *filepath, const char *file, int line) -{ - int is_ignored = 0; - cl_git_pass_( - git_status_should_ignore(&is_ignored, g_repo, filepath), file, line); - clar__assert( - (expected != 0) == (is_ignored != 0), - file, line, "expected != is_ignored", filepath, 1); -} -#define assert_ignored(expected, filepath) \ - assert_ignored_(expected, filepath, __FILE__, __LINE__) -#define assert_is_ignored(filepath) \ - assert_ignored_(true, filepath, __FILE__, __LINE__) -#define refute_is_ignored(filepath) \ - assert_ignored_(false, filepath, __FILE__, __LINE__) - -void test_status_ignore__0(void) -{ - struct { - const char *path; - int expected; - } test_cases[] = { - /* pattern "ign" from .gitignore */ - { "file", 0 }, - { "ign", 1 }, - { "sub", 0 }, - { "sub/file", 0 }, - { "sub/ign", 1 }, - { "sub/ign/file", 1 }, - { "sub/ign/sub", 1 }, - { "sub/ign/sub/file", 1 }, - { "sub/sub", 0 }, - { "sub/sub/file", 0 }, - { "sub/sub/ign", 1 }, - { "sub/sub/sub", 0 }, - /* pattern "dir/" from .gitignore */ - { "dir", 1 }, - { "dir/", 1 }, - { "sub/dir", 1 }, - { "sub/dir/", 1 }, - { "sub/dir/file", 1 }, /* contained in ignored parent */ - { "sub/sub/dir", 0 }, /* dir is not actually a dir, but a file */ - { NULL, 0 } - }, *one_test; - - g_repo = cl_git_sandbox_init("attr"); - - for (one_test = test_cases; one_test->path != NULL; one_test++) - assert_ignored(one_test->expected, one_test->path); - - /* confirm that ignore files were cached */ - cl_assert(git_attr_cache__is_cached( - g_repo, GIT_ATTR_FILE__FROM_FILE, ".git/info/exclude")); - cl_assert(git_attr_cache__is_cached( - g_repo, GIT_ATTR_FILE__FROM_FILE, ".gitignore")); -} - - -void test_status_ignore__1(void) -{ - g_repo = cl_git_sandbox_init("attr"); - - cl_git_rewritefile("attr/.gitignore", "/*.txt\n/dir/\n"); - git_attr_cache_flush(g_repo); - - assert_is_ignored("root_test4.txt"); - refute_is_ignored("sub/subdir_test2.txt"); - assert_is_ignored("dir"); - assert_is_ignored("dir/"); - refute_is_ignored("sub/dir"); - refute_is_ignored("sub/dir/"); -} - -void test_status_ignore__empty_repo_with_gitignore_rewrite(void) -{ - status_entry_single st; - - g_repo = cl_git_sandbox_init("empty_standard_repo"); - - cl_git_mkfile( - "empty_standard_repo/look-ma.txt", "I'm going to be ignored!"); - - memset(&st, 0, sizeof(st)); - cl_git_pass(git_status_foreach(g_repo, cb_status__single, &st)); - cl_assert(st.count == 1); - cl_assert(st.status == GIT_STATUS_WT_NEW); - - cl_git_pass(git_status_file(&st.status, g_repo, "look-ma.txt")); - cl_assert(st.status == GIT_STATUS_WT_NEW); - - refute_is_ignored("look-ma.txt"); - - cl_git_rewritefile("empty_standard_repo/.gitignore", "*.nomatch\n"); - - memset(&st, 0, sizeof(st)); - cl_git_pass(git_status_foreach(g_repo, cb_status__single, &st)); - cl_assert(st.count == 2); - cl_assert(st.status == GIT_STATUS_WT_NEW); - - cl_git_pass(git_status_file(&st.status, g_repo, "look-ma.txt")); - cl_assert(st.status == GIT_STATUS_WT_NEW); - - refute_is_ignored("look-ma.txt"); - - cl_git_rewritefile("empty_standard_repo/.gitignore", "*.txt\n"); - - memset(&st, 0, sizeof(st)); - cl_git_pass(git_status_foreach(g_repo, cb_status__single, &st)); - cl_assert(st.count == 2); - cl_assert(st.status == GIT_STATUS_IGNORED); - - cl_git_pass(git_status_file(&st.status, g_repo, "look-ma.txt")); - cl_assert(st.status == GIT_STATUS_IGNORED); - - assert_is_ignored("look-ma.txt"); -} - -void test_status_ignore__ignore_pattern_contains_space(void) -{ - unsigned int flags; - const mode_t mode = 0777; - - g_repo = cl_git_sandbox_init("empty_standard_repo"); - cl_git_rewritefile("empty_standard_repo/.gitignore", "foo bar.txt\n"); - - cl_git_mkfile( - "empty_standard_repo/foo bar.txt", "I'm going to be ignored!"); - - cl_git_pass(git_status_file(&flags, g_repo, "foo bar.txt")); - cl_assert(flags == GIT_STATUS_IGNORED); - - cl_git_pass(git_futils_mkdir_r("empty_standard_repo/foo", mode)); - cl_git_mkfile("empty_standard_repo/foo/look-ma.txt", "I'm not going to be ignored!"); - - cl_git_pass(git_status_file(&flags, g_repo, "foo/look-ma.txt")); - cl_assert(flags == GIT_STATUS_WT_NEW); -} - -void test_status_ignore__ignore_pattern_ignorecase(void) -{ - unsigned int flags; - bool ignore_case; - git_index *index; - - g_repo = cl_git_sandbox_init("empty_standard_repo"); - cl_git_rewritefile("empty_standard_repo/.gitignore", "a.txt\n"); - - cl_git_mkfile("empty_standard_repo/A.txt", "Differs in case"); - - cl_git_pass(git_repository_index(&index, g_repo)); - ignore_case = (git_index_caps(index) & GIT_INDEXCAP_IGNORE_CASE) != 0; - git_index_free(index); - - cl_git_pass(git_status_file(&flags, g_repo, "A.txt")); - cl_assert(flags == ignore_case ? GIT_STATUS_IGNORED : GIT_STATUS_WT_NEW); -} - -void test_status_ignore__subdirectories(void) -{ - status_entry_single st; - - g_repo = cl_git_sandbox_init("empty_standard_repo"); - - cl_git_mkfile( - "empty_standard_repo/ignore_me", "I'm going to be ignored!"); - - cl_git_rewritefile("empty_standard_repo/.gitignore", "ignore_me\n"); - - memset(&st, 0, sizeof(st)); - cl_git_pass(git_status_foreach(g_repo, cb_status__single, &st)); - cl_assert_equal_i(2, st.count); - cl_assert(st.status == GIT_STATUS_IGNORED); - - cl_git_pass(git_status_file(&st.status, g_repo, "ignore_me")); - cl_assert(st.status == GIT_STATUS_IGNORED); - - assert_is_ignored("ignore_me"); - - /* I've changed libgit2 so that the behavior here now differs from - * core git but seems to make more sense. In core git, the following - * items are skipped completed, even if --ignored is passed to status. - * It you mirror these steps and run "git status -uall --ignored" then - * you will not see "test/ignore_me/" in the results. - * - * However, we had a couple reports of this as a bug, plus there is a - * similar circumstance where we were differing for core git when you - * used a rooted path for an ignore, so I changed this behavior. - */ - cl_git_pass(git_futils_mkdir_r( - "empty_standard_repo/test/ignore_me", 0775)); - cl_git_mkfile( - "empty_standard_repo/test/ignore_me/file", "I'm going to be ignored!"); - cl_git_mkfile( - "empty_standard_repo/test/ignore_me/file2", "Me, too!"); - - memset(&st, 0, sizeof(st)); - cl_git_pass(git_status_foreach(g_repo, cb_status__single, &st)); - cl_assert_equal_i(3, st.count); - - cl_git_pass(git_status_file(&st.status, g_repo, "test/ignore_me/file")); - cl_assert(st.status == GIT_STATUS_IGNORED); - - assert_is_ignored("test/ignore_me/file"); -} - -static void make_test_data(const char *reponame, const char **files) -{ - const char **scan; - size_t repolen = strlen(reponame) + 1; - - g_repo = cl_git_sandbox_init(reponame); - - for (scan = files; *scan != NULL; ++scan) { - cl_git_pass(git_futils_mkdir_relative( - *scan + repolen, reponame, - 0777, GIT_MKDIR_PATH | GIT_MKDIR_SKIP_LAST, NULL)); - cl_git_mkfile(*scan, "contents"); - } -} - -static const char *test_repo_1 = "empty_standard_repo"; -static const char *test_files_1[] = { - "empty_standard_repo/dir/a/ignore_me", - "empty_standard_repo/dir/b/ignore_me", - "empty_standard_repo/dir/ignore_me", - "empty_standard_repo/ignore_also/file", - "empty_standard_repo/ignore_me", - "empty_standard_repo/test/ignore_me/file", - "empty_standard_repo/test/ignore_me/file2", - "empty_standard_repo/test/ignore_me/and_me/file", - NULL -}; - -void test_status_ignore__subdirectories_recursion(void) -{ - /* Let's try again with recursing into ignored dirs turned on */ - git_status_options opts = GIT_STATUS_OPTIONS_INIT; - status_entry_counts counts; - static const char *paths_r[] = { - ".gitignore", - "dir/a/ignore_me", - "dir/b/ignore_me", - "dir/ignore_me", - "ignore_also/file", - "ignore_me", - "test/ignore_me/and_me/file", - "test/ignore_me/file", - "test/ignore_me/file2", - }; - static const unsigned int statuses_r[] = { - GIT_STATUS_WT_NEW, GIT_STATUS_IGNORED, GIT_STATUS_IGNORED, - GIT_STATUS_IGNORED, GIT_STATUS_IGNORED, GIT_STATUS_IGNORED, - GIT_STATUS_IGNORED, GIT_STATUS_IGNORED, GIT_STATUS_IGNORED, - }; - static const char *paths_nr[] = { - ".gitignore", - "dir/a/ignore_me", - "dir/b/ignore_me", - "dir/ignore_me", - "ignore_also/", - "ignore_me", - "test/ignore_me/", - }; - static const unsigned int statuses_nr[] = { - GIT_STATUS_WT_NEW, - GIT_STATUS_IGNORED, GIT_STATUS_IGNORED, GIT_STATUS_IGNORED, - GIT_STATUS_IGNORED, GIT_STATUS_IGNORED, GIT_STATUS_IGNORED, - }; - - make_test_data(test_repo_1, test_files_1); - cl_git_rewritefile("empty_standard_repo/.gitignore", "ignore_me\n/ignore_also\n"); - - memset(&counts, 0x0, sizeof(status_entry_counts)); - counts.expected_entry_count = 9; - counts.expected_paths = paths_r; - counts.expected_statuses = statuses_r; - - opts.flags = GIT_STATUS_OPT_DEFAULTS | GIT_STATUS_OPT_RECURSE_IGNORED_DIRS; - - cl_git_pass(git_status_foreach_ext( - g_repo, &opts, cb_status__normal, &counts)); - - cl_assert_equal_i(counts.expected_entry_count, counts.entry_count); - cl_assert_equal_i(0, counts.wrong_status_flags_count); - cl_assert_equal_i(0, counts.wrong_sorted_path); - - - memset(&counts, 0x0, sizeof(status_entry_counts)); - counts.expected_entry_count = 7; - counts.expected_paths = paths_nr; - counts.expected_statuses = statuses_nr; - - opts.flags = GIT_STATUS_OPT_DEFAULTS; - - cl_git_pass(git_status_foreach_ext( - g_repo, &opts, cb_status__normal, &counts)); - - cl_assert_equal_i(counts.expected_entry_count, counts.entry_count); - cl_assert_equal_i(0, counts.wrong_status_flags_count); - cl_assert_equal_i(0, counts.wrong_sorted_path); -} - -void test_status_ignore__subdirectories_not_at_root(void) -{ - git_status_options opts = GIT_STATUS_OPTIONS_INIT; - status_entry_counts counts; - static const char *paths_1[] = { - "dir/.gitignore", - "dir/a/ignore_me", - "dir/b/ignore_me", - "dir/ignore_me", - "ignore_also/file", - "ignore_me", - "test/.gitignore", - "test/ignore_me/and_me/file", - "test/ignore_me/file", - "test/ignore_me/file2", - }; - static const unsigned int statuses_1[] = { - GIT_STATUS_WT_NEW, GIT_STATUS_IGNORED, GIT_STATUS_IGNORED, - GIT_STATUS_IGNORED, GIT_STATUS_WT_NEW, GIT_STATUS_WT_NEW, - GIT_STATUS_WT_NEW, GIT_STATUS_IGNORED, GIT_STATUS_WT_NEW, GIT_STATUS_WT_NEW, - }; - - make_test_data(test_repo_1, test_files_1); - cl_git_rewritefile("empty_standard_repo/dir/.gitignore", "ignore_me\n/ignore_also\n"); - cl_git_rewritefile("empty_standard_repo/test/.gitignore", "and_me\n"); - - memset(&counts, 0x0, sizeof(status_entry_counts)); - counts.expected_entry_count = 10; - counts.expected_paths = paths_1; - counts.expected_statuses = statuses_1; - - opts.flags = GIT_STATUS_OPT_DEFAULTS | GIT_STATUS_OPT_RECURSE_IGNORED_DIRS; - - cl_git_pass(git_status_foreach_ext( - g_repo, &opts, cb_status__normal, &counts)); - - cl_assert_equal_i(counts.expected_entry_count, counts.entry_count); - cl_assert_equal_i(0, counts.wrong_status_flags_count); - cl_assert_equal_i(0, counts.wrong_sorted_path); -} - -void test_status_ignore__leading_slash_ignores(void) -{ - git_status_options opts = GIT_STATUS_OPTIONS_INIT; - status_entry_counts counts; - static const char *paths_2[] = { - "dir/.gitignore", - "dir/a/ignore_me", - "dir/b/ignore_me", - "dir/ignore_me", - "ignore_also/file", - "ignore_me", - "test/.gitignore", - "test/ignore_me/and_me/file", - "test/ignore_me/file", - "test/ignore_me/file2", - }; - static const unsigned int statuses_2[] = { - GIT_STATUS_WT_NEW, GIT_STATUS_WT_NEW, GIT_STATUS_WT_NEW, - GIT_STATUS_IGNORED, GIT_STATUS_IGNORED, GIT_STATUS_IGNORED, - GIT_STATUS_WT_NEW, GIT_STATUS_WT_NEW, GIT_STATUS_WT_NEW, GIT_STATUS_WT_NEW, - }; - - make_test_data(test_repo_1, test_files_1); - - cl_fake_home(); - cl_git_mkfile("home/.gitignore", "/ignore_me\n"); - { - git_config *cfg; - cl_git_pass(git_repository_config(&cfg, g_repo)); - cl_git_pass(git_config_set_string( - cfg, "core.excludesfile", "~/.gitignore")); - git_config_free(cfg); - } - - cl_git_rewritefile("empty_standard_repo/.git/info/exclude", "/ignore_also\n"); - cl_git_rewritefile("empty_standard_repo/dir/.gitignore", "/ignore_me\n"); - cl_git_rewritefile("empty_standard_repo/test/.gitignore", "/and_me\n"); - - memset(&counts, 0x0, sizeof(status_entry_counts)); - counts.expected_entry_count = 10; - counts.expected_paths = paths_2; - counts.expected_statuses = statuses_2; - - opts.flags = GIT_STATUS_OPT_DEFAULTS | GIT_STATUS_OPT_RECURSE_IGNORED_DIRS; - - cl_git_pass(git_status_foreach_ext( - g_repo, &opts, cb_status__normal, &counts)); - - cl_assert_equal_i(counts.expected_entry_count, counts.entry_count); - cl_assert_equal_i(0, counts.wrong_status_flags_count); - cl_assert_equal_i(0, counts.wrong_sorted_path); -} - -void test_status_ignore__contained_dir_with_matching_name(void) -{ - static const char *test_files[] = { - "empty_standard_repo/subdir_match/aaa/subdir_match/file", - "empty_standard_repo/subdir_match/zzz_ignoreme", - NULL - }; - static const char *expected_paths[] = { - "subdir_match/.gitignore", - "subdir_match/aaa/subdir_match/file", - "subdir_match/zzz_ignoreme", - }; - static const unsigned int expected_statuses[] = { - GIT_STATUS_WT_NEW, GIT_STATUS_WT_NEW, GIT_STATUS_IGNORED - }; - git_status_options opts = GIT_STATUS_OPTIONS_INIT; - status_entry_counts counts; - - make_test_data("empty_standard_repo", test_files); - cl_git_mkfile( - "empty_standard_repo/subdir_match/.gitignore", "*_ignoreme\n"); - - refute_is_ignored("subdir_match/aaa/subdir_match/file"); - assert_is_ignored("subdir_match/zzz_ignoreme"); - - memset(&counts, 0x0, sizeof(status_entry_counts)); - counts.expected_entry_count = 3; - counts.expected_paths = expected_paths; - counts.expected_statuses = expected_statuses; - - opts.flags = GIT_STATUS_OPT_DEFAULTS | GIT_STATUS_OPT_RECURSE_IGNORED_DIRS; - - cl_git_pass(git_status_foreach_ext( - g_repo, &opts, cb_status__normal, &counts)); - - cl_assert_equal_i(counts.expected_entry_count, counts.entry_count); - cl_assert_equal_i(0, counts.wrong_status_flags_count); - cl_assert_equal_i(0, counts.wrong_sorted_path); -} - -void test_status_ignore__trailing_slash_star(void) -{ - static const char *test_files[] = { - "empty_standard_repo/file", - "empty_standard_repo/subdir/file", - "empty_standard_repo/subdir/sub2/sub3/file", - NULL - }; - - make_test_data("empty_standard_repo", test_files); - cl_git_mkfile( - "empty_standard_repo/subdir/.gitignore", "/**/*\n"); - - refute_is_ignored("file"); - assert_is_ignored("subdir/sub2/sub3/file"); - assert_is_ignored("subdir/file"); -} - -void test_status_ignore__adding_internal_ignores(void) -{ - g_repo = cl_git_sandbox_init("empty_standard_repo"); - - refute_is_ignored("one.txt"); - refute_is_ignored("two.bar"); - - cl_git_pass(git_ignore_add_rule(g_repo, "*.nomatch\n")); - - refute_is_ignored("one.txt"); - refute_is_ignored("two.bar"); - - cl_git_pass(git_ignore_add_rule(g_repo, "*.txt\n")); - - assert_is_ignored("one.txt"); - refute_is_ignored("two.bar"); - - cl_git_pass(git_ignore_add_rule(g_repo, "*.bar\n")); - - assert_is_ignored("one.txt"); - assert_is_ignored("two.bar"); - - cl_git_pass(git_ignore_clear_internal_rules(g_repo)); - - refute_is_ignored("one.txt"); - refute_is_ignored("two.bar"); - - cl_git_pass(git_ignore_add_rule( - g_repo, "multiple\n*.rules\n# comment line\n*.bar\n")); - - refute_is_ignored("one.txt"); - assert_is_ignored("two.bar"); -} - -void test_status_ignore__add_internal_as_first_thing(void) -{ - const char *add_me = "\n#################\n## Eclipse\n#################\n\n*.pydevproject\n.project\n.metadata\nbin/\ntmp/\n*.tmp\n\n"; - - g_repo = cl_git_sandbox_init("empty_standard_repo"); - - cl_git_pass(git_ignore_add_rule(g_repo, add_me)); - - assert_is_ignored("one.tmp"); - refute_is_ignored("two.bar"); -} - -void test_status_ignore__internal_ignores_inside_deep_paths(void) -{ - const char *add_me = "Debug\nthis/is/deep\npatterned*/dir\n"; - - g_repo = cl_git_sandbox_init("empty_standard_repo"); - - cl_git_pass(git_ignore_add_rule(g_repo, add_me)); - - assert_is_ignored("Debug"); - assert_is_ignored("and/Debug"); - assert_is_ignored("really/Debug/this/file"); - assert_is_ignored("Debug/what/I/say"); - - refute_is_ignored("and/NoDebug"); - refute_is_ignored("NoDebug/this"); - refute_is_ignored("please/NoDebug/this"); - - assert_is_ignored("this/is/deep"); - /* pattern containing slash gets FNM_PATHNAME so all slashes must match */ - refute_is_ignored("and/this/is/deep"); - assert_is_ignored("this/is/deep/too"); - /* pattern containing slash gets FNM_PATHNAME so all slashes must match */ - refute_is_ignored("but/this/is/deep/and/ignored"); - - refute_is_ignored("this/is/not/deep"); - refute_is_ignored("is/this/not/as/deep"); - refute_is_ignored("this/is/deepish"); - refute_is_ignored("xthis/is/deep"); -} - -void test_status_ignore__automatically_ignore_bad_files(void) -{ - g_repo = cl_git_sandbox_init("empty_standard_repo"); - - assert_is_ignored(".git"); - assert_is_ignored("this/file/."); - assert_is_ignored("path/../funky"); - refute_is_ignored("path/whatever.c"); - - cl_git_pass(git_ignore_add_rule(g_repo, "*.c\n")); - - assert_is_ignored(".git"); - assert_is_ignored("this/file/."); - assert_is_ignored("path/../funky"); - assert_is_ignored("path/whatever.c"); - - cl_git_pass(git_ignore_clear_internal_rules(g_repo)); - - assert_is_ignored(".git"); - assert_is_ignored("this/file/."); - assert_is_ignored("path/../funky"); - refute_is_ignored("path/whatever.c"); -} - -void test_status_ignore__filenames_with_special_prefixes_do_not_interfere_with_status_retrieval(void) -{ - status_entry_single st; - char *test_cases[] = { - "!file", - "#blah", - "[blah]", - "[attr]", - "[attr]blah", - NULL - }; - int i; - - for (i = 0; *(test_cases + i) != NULL; i++) { - git_buf file = GIT_BUF_INIT; - char *file_name = *(test_cases + i); - git_repository *repo = cl_git_sandbox_init("empty_standard_repo"); - - cl_git_pass(git_buf_joinpath(&file, "empty_standard_repo", file_name)); - cl_git_mkfile(git_buf_cstr(&file), "Please don't ignore me!"); - - memset(&st, 0, sizeof(st)); - cl_git_pass(git_status_foreach(repo, cb_status__single, &st)); - cl_assert(st.count == 1); - cl_assert(st.status == GIT_STATUS_WT_NEW); - - cl_git_pass(git_status_file(&st.status, repo, file_name)); - cl_assert(st.status == GIT_STATUS_WT_NEW); - - cl_git_sandbox_cleanup(); - git_buf_free(&file); - } -} - -void test_status_ignore__issue_1766_negated_ignores(void) -{ - unsigned int status; - - g_repo = cl_git_sandbox_init("empty_standard_repo"); - - cl_git_pass(git_futils_mkdir_r( - "empty_standard_repo/a", 0775)); - cl_git_mkfile( - "empty_standard_repo/a/.gitignore", "*\n!.gitignore\n"); - cl_git_mkfile( - "empty_standard_repo/a/ignoreme", "I should be ignored\n"); - - refute_is_ignored("a/.gitignore"); - assert_is_ignored("a/ignoreme"); - - cl_git_pass(git_futils_mkdir_r( - "empty_standard_repo/b", 0775)); - cl_git_mkfile( - "empty_standard_repo/b/.gitignore", "*\n!.gitignore\n"); - cl_git_mkfile( - "empty_standard_repo/b/ignoreme", "I should be ignored\n"); - - refute_is_ignored("b/.gitignore"); - assert_is_ignored("b/ignoreme"); - - /* shouldn't have changed results from first couple either */ - refute_is_ignored("a/.gitignore"); - assert_is_ignored("a/ignoreme"); - - /* status should find the two ignore files and nothing else */ - - cl_git_pass(git_status_file(&status, g_repo, "a/.gitignore")); - cl_assert_equal_i(GIT_STATUS_WT_NEW, (int)status); - - cl_git_pass(git_status_file(&status, g_repo, "a/ignoreme")); - cl_assert_equal_i(GIT_STATUS_IGNORED, (int)status); - - cl_git_pass(git_status_file(&status, g_repo, "b/.gitignore")); - cl_assert_equal_i(GIT_STATUS_WT_NEW, (int)status); - - cl_git_pass(git_status_file(&status, g_repo, "b/ignoreme")); - cl_assert_equal_i(GIT_STATUS_IGNORED, (int)status); - - { - git_status_options opts = GIT_STATUS_OPTIONS_INIT; - status_entry_counts counts; - static const char *paths[] = { - "a/.gitignore", - "a/ignoreme", - "b/.gitignore", - "b/ignoreme", - }; - static const unsigned int statuses[] = { - GIT_STATUS_WT_NEW, - GIT_STATUS_IGNORED, - GIT_STATUS_WT_NEW, - GIT_STATUS_IGNORED, - }; - - memset(&counts, 0x0, sizeof(status_entry_counts)); - counts.expected_entry_count = 4; - counts.expected_paths = paths; - counts.expected_statuses = statuses; - - opts.flags = GIT_STATUS_OPT_DEFAULTS; - - cl_git_pass(git_status_foreach_ext( - g_repo, &opts, cb_status__normal, &counts)); - - cl_assert_equal_i(counts.expected_entry_count, counts.entry_count); - cl_assert_equal_i(0, counts.wrong_status_flags_count); - cl_assert_equal_i(0, counts.wrong_sorted_path); - } -} - -static void add_one_to_index(const char *file) -{ - git_index *index; - cl_git_pass(git_repository_index(&index, g_repo)); - cl_git_pass(git_index_add_bypath(index, file)); - git_index_free(index); -} - -/* Some further broken scenarios that have been reported */ -void test_status_ignore__more_breakage(void) -{ - static const char *test_files[] = { - "empty_standard_repo/d1/pfx-d2/d3/d4/d5/tracked", - "empty_standard_repo/d1/pfx-d2/d3/d4/d5/untracked", - "empty_standard_repo/d1/pfx-d2/d3/d4/untracked", - NULL - }; - - make_test_data("empty_standard_repo", test_files); - cl_git_mkfile( - "empty_standard_repo/.gitignore", - "/d1/pfx-*\n" - "!/d1/pfx-d2/\n" - "/d1/pfx-d2/*\n" - "!/d1/pfx-d2/d3/\n" - "/d1/pfx-d2/d3/*\n" - "!/d1/pfx-d2/d3/d4/\n"); - add_one_to_index("d1/pfx-d2/d3/d4/d5/tracked"); - - { - git_status_options opts = GIT_STATUS_OPTIONS_INIT; - status_entry_counts counts; - static const char *files[] = { - ".gitignore", - "d1/pfx-d2/d3/d4/d5/tracked", - "d1/pfx-d2/d3/d4/d5/untracked", - "d1/pfx-d2/d3/d4/untracked", - }; - static const unsigned int statuses[] = { - GIT_STATUS_WT_NEW, - GIT_STATUS_INDEX_NEW, - GIT_STATUS_WT_NEW, - GIT_STATUS_WT_NEW, - }; - - memset(&counts, 0x0, sizeof(status_entry_counts)); - counts.expected_entry_count = 4; - counts.expected_paths = files; - counts.expected_statuses = statuses; - opts.flags = GIT_STATUS_OPT_DEFAULTS | - GIT_STATUS_OPT_INCLUDE_IGNORED | - GIT_STATUS_OPT_RECURSE_IGNORED_DIRS; - cl_git_pass(git_status_foreach_ext( - g_repo, &opts, cb_status__normal, &counts)); - - cl_assert_equal_i(counts.expected_entry_count, counts.entry_count); - cl_assert_equal_i(0, counts.wrong_status_flags_count); - cl_assert_equal_i(0, counts.wrong_sorted_path); - } - - refute_is_ignored("d1/pfx-d2/d3/d4/d5/tracked"); - refute_is_ignored("d1/pfx-d2/d3/d4/d5/untracked"); - refute_is_ignored("d1/pfx-d2/d3/d4/untracked"); -} - -void test_status_ignore__negative_ignores_inside_ignores(void) -{ - static const char *test_files[] = { - "empty_standard_repo/top/mid/btm/tracked", - "empty_standard_repo/top/mid/btm/untracked", - "empty_standard_repo/zoo/bar", - "empty_standard_repo/zoo/foo/bar", - NULL - }; - - make_test_data("empty_standard_repo", test_files); - cl_git_mkfile( - "empty_standard_repo/.gitignore", - "top\n" - "!top/mid/btm\n" - "zoo/*\n" - "!zoo/bar\n" - "!zoo/foo/bar\n"); - add_one_to_index("top/mid/btm/tracked"); - - { - git_status_options opts = GIT_STATUS_OPTIONS_INIT; - status_entry_counts counts; - static const char *files[] = { - ".gitignore", "top/mid/btm/tracked", "top/mid/btm/untracked", - "zoo/bar", "zoo/foo/bar", - }; - static const unsigned int statuses[] = { - GIT_STATUS_WT_NEW, GIT_STATUS_INDEX_NEW, GIT_STATUS_IGNORED, - GIT_STATUS_WT_NEW, GIT_STATUS_IGNORED, - }; - - memset(&counts, 0x0, sizeof(status_entry_counts)); - counts.expected_entry_count = 5; - counts.expected_paths = files; - counts.expected_statuses = statuses; - opts.flags = GIT_STATUS_OPT_DEFAULTS | - GIT_STATUS_OPT_INCLUDE_IGNORED | - GIT_STATUS_OPT_RECURSE_IGNORED_DIRS; - cl_git_pass(git_status_foreach_ext( - g_repo, &opts, cb_status__normal, &counts)); - - cl_assert_equal_i(counts.expected_entry_count, counts.entry_count); - cl_assert_equal_i(0, counts.wrong_status_flags_count); - cl_assert_equal_i(0, counts.wrong_sorted_path); - } - - assert_is_ignored("top/mid/btm/tracked"); - assert_is_ignored("top/mid/btm/untracked"); - refute_is_ignored("foo/bar"); -} - -void test_status_ignore__negative_ignores_in_slash_star(void) -{ - git_status_options status_opts = GIT_STATUS_OPTIONS_INIT; - git_status_list *list; - int found_look_ma = 0, found_what_about = 0; - size_t i; - static const char *test_files[] = { - "empty_standard_repo/bin/look-ma.txt", - "empty_standard_repo/bin/what-about-me.txt", - NULL - }; - - make_test_data("empty_standard_repo", test_files); - cl_git_mkfile( - "empty_standard_repo/.gitignore", - "bin/*\n" - "!bin/w*\n"); - - assert_is_ignored("bin/look-ma.txt"); - refute_is_ignored("bin/what-about-me.txt"); - - status_opts.flags = GIT_STATUS_OPT_DEFAULTS; - cl_git_pass(git_status_list_new(&list, g_repo, &status_opts)); - for (i = 0; i < git_status_list_entrycount(list); i++) { - const git_status_entry *entry = git_status_byindex(list, i); - - if (!strcmp("bin/look-ma.txt", entry->index_to_workdir->new_file.path)) - found_look_ma = 1; - - if (!strcmp("bin/what-about-me.txt", entry->index_to_workdir->new_file.path)) - found_what_about = 1; - } - git_status_list_free(list); - - cl_assert(found_look_ma); - cl_assert(found_what_about); -} - -void test_status_ignore__negative_ignores_without_trailing_slash_inside_ignores(void) -{ - git_status_options status_opts = GIT_STATUS_OPTIONS_INIT; - git_status_list *list; - int found_parent_file = 0, found_parent_child1_file = 0, found_parent_child2_file = 0; - size_t i; - static const char *test_files[] = { - "empty_standard_repo/parent/file.txt", - "empty_standard_repo/parent/force.txt", - "empty_standard_repo/parent/child1/file.txt", - "empty_standard_repo/parent/child2/file.txt", - NULL - }; - - make_test_data("empty_standard_repo", test_files); - cl_git_mkfile( - "empty_standard_repo/.gitignore", - "parent/*\n" - "!parent/force.txt\n" - "!parent/child1\n" - "!parent/child2/\n"); - - add_one_to_index("parent/force.txt"); - - assert_is_ignored("parent/file.txt"); - refute_is_ignored("parent/force.txt"); - refute_is_ignored("parent/child1/file.txt"); - refute_is_ignored("parent/child2/file.txt"); - - status_opts.flags = GIT_STATUS_OPT_DEFAULTS; - cl_git_pass(git_status_list_new(&list, g_repo, &status_opts)); - for (i = 0; i < git_status_list_entrycount(list); i++) { - const git_status_entry *entry = git_status_byindex(list, i); - - if (!entry->index_to_workdir) - continue; - - if (!strcmp("parent/file.txt", entry->index_to_workdir->new_file.path)) - found_parent_file = 1; - - if (!strcmp("parent/force.txt", entry->index_to_workdir->new_file.path)) - found_parent_file = 1; - - if (!strcmp("parent/child1/file.txt", entry->index_to_workdir->new_file.path)) - found_parent_child1_file = 1; - - if (!strcmp("parent/child2/file.txt", entry->index_to_workdir->new_file.path)) - found_parent_child2_file = 1; - } - git_status_list_free(list); - - cl_assert(found_parent_file); - cl_assert(found_parent_child1_file); - cl_assert(found_parent_child2_file); -} - -void test_status_ignore__negative_directory_ignores(void) -{ - static const char *test_files[] = { - "empty_standard_repo/parent/child1/bar.txt", - "empty_standard_repo/parent/child2/bar.txt", - "empty_standard_repo/parent/child3/foo.txt", - "empty_standard_repo/parent/child4/bar.txt", - "empty_standard_repo/parent/nested/child5/bar.txt", - "empty_standard_repo/parent/nested/child6/bar.txt", - "empty_standard_repo/parent/nested/child7/bar.txt", - "empty_standard_repo/padded_parent/child8/bar.txt", - NULL - }; - - make_test_data("empty_standard_repo", test_files); - cl_git_mkfile( - "empty_standard_repo/.gitignore", - "foo.txt\n" - "parent/child1\n" - "parent/child2\n" - "parent/child4\n" - "parent/nested/child5\n" - "nested/child6\n" - "nested/child7\n" - "padded_parent/child8\n" - /* test simple exact match */ - "!parent/child1\n" - /* test negating file without negating dir */ - "!parent/child2/bar.txt\n" - /* test negative pattern on dir with its content - * being ignored */ - "!parent/child3\n" - /* test with partial match at end */ - "!child4\n" - /* test with partial match with '/' at end */ - "!nested/child5\n" - /* test with complete match */ - "!nested/child6\n" - /* test with trailing '/' */ - "!child7/\n" - /* test with partial dir match */ - "!_parent/child8\n"); - - refute_is_ignored("parent/child1/bar.txt"); - assert_is_ignored("parent/child2/bar.txt"); - assert_is_ignored("parent/child3/foo.txt"); - refute_is_ignored("parent/child4/bar.txt"); - assert_is_ignored("parent/nested/child5/bar.txt"); - refute_is_ignored("parent/nested/child6/bar.txt"); - refute_is_ignored("parent/nested/child7/bar.txt"); - assert_is_ignored("padded_parent/child8/bar.txt"); -} - -void test_status_ignore__filename_with_cr(void) -{ - int ignored; - - g_repo = cl_git_sandbox_init("empty_standard_repo"); - cl_git_mkfile("empty_standard_repo/.gitignore", "Icon\r\r\n"); - - cl_git_pass(git_ignore_path_is_ignored(&ignored, g_repo, "Icon\r")); - cl_assert_equal_i(1, ignored); - - cl_git_mkfile("empty_standard_repo/.gitignore", "Ico\rn\n"); - cl_git_pass(git_ignore_path_is_ignored(&ignored, g_repo, "Ico\rn")); - cl_assert_equal_i(1, ignored); - - cl_git_mkfile("empty_standard_repo/.gitignore", "Ico\rn\r\n"); - cl_git_pass(git_ignore_path_is_ignored(&ignored, g_repo, "Ico\rn")); - cl_assert_equal_i(1, ignored); - cl_git_pass(git_ignore_path_is_ignored(&ignored, g_repo, "Ico\rn\r")); - cl_assert_equal_i(0, ignored); - - cl_git_mkfile("empty_standard_repo/.gitignore", "Ico\rn\r\r\n"); - cl_git_pass(git_ignore_path_is_ignored(&ignored, g_repo, "Ico\rn\r")); - cl_assert_equal_i(1, ignored); - cl_git_pass(git_ignore_path_is_ignored(&ignored, g_repo, "Icon\r")); - cl_assert_equal_i(0, ignored); - - cl_git_mkfile("empty_standard_repo/.gitignore", "Icon\r\n"); - cl_git_pass(git_ignore_path_is_ignored(&ignored, g_repo, "Icon\r")); - cl_assert_equal_i(0, ignored); - cl_git_pass(git_ignore_path_is_ignored(&ignored, g_repo, "Icon")); - cl_assert_equal_i(1, ignored); -} - -void test_status_ignore__subdir_doesnt_match_above(void) -{ - int ignored, icase = 0, error; - git_config *cfg; - - g_repo = cl_git_sandbox_init("empty_standard_repo"); - - cl_git_pass(git_repository_config_snapshot(&cfg, g_repo)); - error = git_config_get_bool(&icase, cfg, "core.ignorecase"); - git_config_free(cfg); - if (error == GIT_ENOTFOUND) - error = 0; - - cl_git_pass(error); - - cl_git_pass(p_mkdir("empty_standard_repo/src", 0777)); - cl_git_pass(p_mkdir("empty_standard_repo/src/src", 0777)); - cl_git_mkfile("empty_standard_repo/src/.gitignore", "src\n"); - cl_git_mkfile("empty_standard_repo/.gitignore", ""); - - cl_git_pass(git_ignore_path_is_ignored(&ignored, g_repo, "src/test.txt")); - cl_assert_equal_i(0, ignored); - cl_git_pass(git_ignore_path_is_ignored(&ignored, g_repo, "src/src/test.txt")); - cl_assert_equal_i(1, ignored); - cl_git_pass(git_ignore_path_is_ignored(&ignored, g_repo, "src/foo/test.txt")); - cl_assert_equal_i(0, ignored); - - cl_git_pass(git_ignore_path_is_ignored(&ignored, g_repo, "SRC/src/test.txt")); - cl_assert_equal_i(icase, ignored); - cl_git_pass(git_ignore_path_is_ignored(&ignored, g_repo, "src/SRC/test.txt")); - cl_assert_equal_i(icase, ignored); -} - -void test_status_ignore__negate_exact_previous(void) -{ - int ignored; - - g_repo = cl_git_sandbox_init("empty_standard_repo"); - - cl_git_mkfile("empty_standard_repo/.gitignore", "*.com\ntags\n!tags/\n.buildpath"); - cl_git_mkfile("empty_standard_repo/.buildpath", ""); - cl_git_pass(git_ignore_path_is_ignored(&ignored, g_repo, ".buildpath")); - cl_assert_equal_i(1, ignored); -} - -void test_status_ignore__negate_starstar(void) -{ - int ignored; - - g_repo = cl_git_sandbox_init("empty_standard_repo"); - - cl_git_mkfile("empty_standard_repo/.gitignore", - "code/projects/**/packages/*\n" - "!code/projects/**/packages/repositories.config"); - - cl_git_pass(git_futils_mkdir_r("empty_standard_repo/code/projects/foo/bar/packages", 0777)); - cl_git_mkfile("empty_standard_repo/code/projects/foo/bar/packages/repositories.config", ""); - - cl_git_pass(git_ignore_path_is_ignored(&ignored, g_repo, "code/projects/foo/bar/packages/repositories.config")); - cl_assert_equal_i(0, ignored); -} diff --git a/vendor/libgit2/tests/status/renames.c b/vendor/libgit2/tests/status/renames.c deleted file mode 100644 index f482d693a..000000000 --- a/vendor/libgit2/tests/status/renames.c +++ /dev/null @@ -1,715 +0,0 @@ -#include "clar_libgit2.h" -#include "buffer.h" -#include "path.h" -#include "posix.h" -#include "status_helpers.h" -#include "util.h" -#include "status.h" - -static git_repository *g_repo = NULL; - -void test_status_renames__initialize(void) -{ - g_repo = cl_git_sandbox_init("renames"); - - cl_repo_set_bool(g_repo, "core.autocrlf", false); -} - -void test_status_renames__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -static void _rename_helper( - git_repository *repo, const char *from, const char *to, const char *extra) -{ - git_buf oldpath = GIT_BUF_INIT, newpath = GIT_BUF_INIT; - - cl_git_pass(git_buf_joinpath( - &oldpath, git_repository_workdir(repo), from)); - cl_git_pass(git_buf_joinpath( - &newpath, git_repository_workdir(repo), to)); - - cl_git_pass(p_rename(oldpath.ptr, newpath.ptr)); - - if (extra) - cl_git_append2file(newpath.ptr, extra); - - git_buf_free(&oldpath); - git_buf_free(&newpath); -} - -#define rename_file(R,O,N) _rename_helper((R), (O), (N), NULL) -#define rename_and_edit_file(R,O,N) \ - _rename_helper((R), (O), (N), "Added at the end to keep similarity!") - -struct status_entry { - git_status_t status; - const char *oldname; - const char *newname; -}; - -static void check_status( - git_status_list *status_list, - struct status_entry *expected_list, - size_t expected_len) -{ - const git_status_entry *actual; - const struct status_entry *expected; - const char *oldname, *newname; - size_t i, files_in_status = git_status_list_entrycount(status_list); - - cl_assert_equal_sz(expected_len, files_in_status); - - for (i = 0; i < expected_len; i++) { - actual = git_status_byindex(status_list, i); - expected = &expected_list[i]; - - oldname = actual->head_to_index ? actual->head_to_index->old_file.path : - actual->index_to_workdir ? actual->index_to_workdir->old_file.path : NULL; - - newname = actual->index_to_workdir ? actual->index_to_workdir->new_file.path : - actual->head_to_index ? actual->head_to_index->new_file.path : NULL; - - cl_assert_equal_i_fmt(expected->status, actual->status, "%04x"); - - if (expected->oldname) { - cl_assert(oldname != NULL); - cl_assert_equal_s(oldname, expected->oldname); - } else { - cl_assert(oldname == NULL); - } - - if (actual->status & (GIT_STATUS_INDEX_RENAMED|GIT_STATUS_WT_RENAMED)) { - if (expected->newname) { - cl_assert(newname != NULL); - cl_assert_equal_s(newname, expected->newname); - } else { - cl_assert(newname == NULL); - } - } - } -} - -void test_status_renames__head2index_one(void) -{ - git_index *index; - git_status_list *statuslist; - git_status_options opts = GIT_STATUS_OPTIONS_INIT; - struct status_entry expected[] = { - { GIT_STATUS_INDEX_RENAMED, "ikeepsix.txt", "newname.txt" }, - }; - - opts.flags |= GIT_STATUS_OPT_RENAMES_HEAD_TO_INDEX; - - cl_git_pass(git_repository_index(&index, g_repo)); - - rename_file(g_repo, "ikeepsix.txt", "newname.txt"); - - cl_git_pass(git_index_remove_bypath(index, "ikeepsix.txt")); - cl_git_pass(git_index_add_bypath(index, "newname.txt")); - cl_git_pass(git_index_write(index)); - - cl_git_pass(git_status_list_new(&statuslist, g_repo, &opts)); - check_status(statuslist, expected, 1); - git_status_list_free(statuslist); - - git_index_free(index); -} - -void test_status_renames__head2index_two(void) -{ - git_index *index; - git_status_list *statuslist; - git_status_options opts = GIT_STATUS_OPTIONS_INIT; - struct status_entry expected[] = { - { GIT_STATUS_INDEX_RENAMED | GIT_STATUS_INDEX_MODIFIED, - "sixserving.txt", "aaa.txt" }, - { GIT_STATUS_INDEX_RENAMED | GIT_STATUS_INDEX_MODIFIED, - "untimely.txt", "bbb.txt" }, - { GIT_STATUS_INDEX_RENAMED, "songof7cities.txt", "ccc.txt" }, - { GIT_STATUS_INDEX_RENAMED, "ikeepsix.txt", "ddd.txt" }, - }; - - opts.flags |= GIT_STATUS_OPT_RENAMES_HEAD_TO_INDEX; - - cl_git_pass(git_repository_index(&index, g_repo)); - - rename_file(g_repo, "ikeepsix.txt", "ddd.txt"); - rename_and_edit_file(g_repo, "sixserving.txt", "aaa.txt"); - rename_file(g_repo, "songof7cities.txt", "ccc.txt"); - rename_and_edit_file(g_repo, "untimely.txt", "bbb.txt"); - - cl_git_pass(git_index_remove_bypath(index, "ikeepsix.txt")); - cl_git_pass(git_index_remove_bypath(index, "sixserving.txt")); - cl_git_pass(git_index_remove_bypath(index, "songof7cities.txt")); - cl_git_pass(git_index_remove_bypath(index, "untimely.txt")); - cl_git_pass(git_index_add_bypath(index, "ddd.txt")); - cl_git_pass(git_index_add_bypath(index, "aaa.txt")); - cl_git_pass(git_index_add_bypath(index, "ccc.txt")); - cl_git_pass(git_index_add_bypath(index, "bbb.txt")); - cl_git_pass(git_index_write(index)); - - cl_git_pass(git_status_list_new(&statuslist, g_repo, &opts)); - check_status(statuslist, expected, 4); - git_status_list_free(statuslist); - - git_index_free(index); -} - -void test_status_renames__head2index_no_rename_from_rewrite(void) -{ - git_index *index; - git_status_list *statuslist; - git_status_options opts = GIT_STATUS_OPTIONS_INIT; - struct status_entry expected[] = { - { GIT_STATUS_INDEX_MODIFIED, "ikeepsix.txt", "ikeepsix.txt" }, - { GIT_STATUS_INDEX_MODIFIED, "sixserving.txt", "sixserving.txt" }, - }; - - opts.flags |= GIT_STATUS_OPT_RENAMES_HEAD_TO_INDEX; - - cl_git_pass(git_repository_index(&index, g_repo)); - - rename_file(g_repo, "ikeepsix.txt", "_temp_.txt"); - rename_file(g_repo, "sixserving.txt", "ikeepsix.txt"); - rename_file(g_repo, "_temp_.txt", "sixserving.txt"); - - cl_git_pass(git_index_add_bypath(index, "ikeepsix.txt")); - cl_git_pass(git_index_add_bypath(index, "sixserving.txt")); - cl_git_pass(git_index_write(index)); - - cl_git_pass(git_status_list_new(&statuslist, g_repo, &opts)); - check_status(statuslist, expected, 2); - git_status_list_free(statuslist); - - git_index_free(index); -} - -void test_status_renames__head2index_rename_from_rewrite(void) -{ - git_index *index; - git_status_list *statuslist; - git_status_options opts = GIT_STATUS_OPTIONS_INIT; - struct status_entry expected[] = { - { GIT_STATUS_INDEX_RENAMED, "sixserving.txt", "ikeepsix.txt" }, - { GIT_STATUS_INDEX_RENAMED, "ikeepsix.txt", "sixserving.txt" }, - }; - - opts.flags |= GIT_STATUS_OPT_RENAMES_HEAD_TO_INDEX; - opts.flags |= GIT_STATUS_OPT_RENAMES_FROM_REWRITES; - - cl_git_pass(git_repository_index(&index, g_repo)); - - rename_file(g_repo, "ikeepsix.txt", "_temp_.txt"); - rename_file(g_repo, "sixserving.txt", "ikeepsix.txt"); - rename_file(g_repo, "_temp_.txt", "sixserving.txt"); - - cl_git_pass(git_index_add_bypath(index, "ikeepsix.txt")); - cl_git_pass(git_index_add_bypath(index, "sixserving.txt")); - cl_git_pass(git_index_write(index)); - - cl_git_pass(git_status_list_new(&statuslist, g_repo, &opts)); - check_status(statuslist, expected, 2); - git_status_list_free(statuslist); - - git_index_free(index); -} - -void test_status_renames__index2workdir_one(void) -{ - git_status_list *statuslist; - git_status_options opts = GIT_STATUS_OPTIONS_INIT; - struct status_entry expected[] = { - { GIT_STATUS_WT_RENAMED, "ikeepsix.txt", "newname.txt" }, - }; - - opts.flags |= GIT_STATUS_OPT_INCLUDE_UNTRACKED; - opts.flags |= GIT_STATUS_OPT_RENAMES_INDEX_TO_WORKDIR; - - rename_file(g_repo, "ikeepsix.txt", "newname.txt"); - - cl_git_pass(git_status_list_new(&statuslist, g_repo, &opts)); - check_status(statuslist, expected, 1); - git_status_list_free(statuslist); -} - -void test_status_renames__index2workdir_two(void) -{ - git_status_list *statuslist; - git_status_options opts = GIT_STATUS_OPTIONS_INIT; - struct status_entry expected[] = { - { GIT_STATUS_WT_RENAMED | GIT_STATUS_WT_MODIFIED, - "sixserving.txt", "aaa.txt" }, - { GIT_STATUS_WT_RENAMED | GIT_STATUS_WT_MODIFIED, - "untimely.txt", "bbb.txt" }, - { GIT_STATUS_WT_RENAMED, "songof7cities.txt", "ccc.txt" }, - { GIT_STATUS_WT_RENAMED, "ikeepsix.txt", "ddd.txt" }, - }; - - opts.flags |= GIT_STATUS_OPT_INCLUDE_UNTRACKED; - opts.flags |= GIT_STATUS_OPT_RENAMES_INDEX_TO_WORKDIR; - - rename_file(g_repo, "ikeepsix.txt", "ddd.txt"); - rename_and_edit_file(g_repo, "sixserving.txt", "aaa.txt"); - rename_file(g_repo, "songof7cities.txt", "ccc.txt"); - rename_and_edit_file(g_repo, "untimely.txt", "bbb.txt"); - - cl_git_pass(git_status_list_new(&statuslist, g_repo, &opts)); - check_status(statuslist, expected, 4); - git_status_list_free(statuslist); -} - -void test_status_renames__index2workdir_rename_from_rewrite(void) -{ - git_index *index; - git_status_list *statuslist; - git_status_options opts = GIT_STATUS_OPTIONS_INIT; - struct status_entry expected[] = { - { GIT_STATUS_WT_RENAMED, "sixserving.txt", "ikeepsix.txt" }, - { GIT_STATUS_WT_RENAMED, "ikeepsix.txt", "sixserving.txt" }, - }; - - opts.flags |= GIT_STATUS_OPT_RENAMES_INDEX_TO_WORKDIR; - opts.flags |= GIT_STATUS_OPT_RENAMES_FROM_REWRITES; - - cl_git_pass(git_repository_index(&index, g_repo)); - - rename_file(g_repo, "ikeepsix.txt", "_temp_.txt"); - rename_file(g_repo, "sixserving.txt", "ikeepsix.txt"); - rename_file(g_repo, "_temp_.txt", "sixserving.txt"); - - cl_git_pass(git_status_list_new(&statuslist, g_repo, &opts)); - check_status(statuslist, expected, 2); - git_status_list_free(statuslist); - - git_index_free(index); -} - -void test_status_renames__both_one(void) -{ - git_index *index; - git_status_list *statuslist; - git_status_options opts = GIT_STATUS_OPTIONS_INIT; - struct status_entry expected[] = { - { GIT_STATUS_INDEX_RENAMED | GIT_STATUS_WT_RENAMED, - "ikeepsix.txt", "newname-workdir.txt" }, - }; - - opts.flags |= GIT_STATUS_OPT_INCLUDE_UNTRACKED; - opts.flags |= GIT_STATUS_OPT_RENAMES_HEAD_TO_INDEX; - opts.flags |= GIT_STATUS_OPT_RENAMES_INDEX_TO_WORKDIR; - - cl_git_pass(git_repository_index(&index, g_repo)); - - rename_file(g_repo, "ikeepsix.txt", "newname-index.txt"); - - cl_git_pass(git_index_remove_bypath(index, "ikeepsix.txt")); - cl_git_pass(git_index_add_bypath(index, "newname-index.txt")); - cl_git_pass(git_index_write(index)); - - rename_file(g_repo, "newname-index.txt", "newname-workdir.txt"); - - cl_git_pass(git_status_list_new(&statuslist, g_repo, &opts)); - check_status(statuslist, expected, 1); - git_status_list_free(statuslist); - - git_index_free(index); -} - -void test_status_renames__both_two(void) -{ - git_index *index; - git_status_list *statuslist; - git_status_options opts = GIT_STATUS_OPTIONS_INIT; - struct status_entry expected[] = { - { GIT_STATUS_INDEX_RENAMED | GIT_STATUS_INDEX_MODIFIED | - GIT_STATUS_WT_RENAMED | GIT_STATUS_WT_MODIFIED, - "ikeepsix.txt", "ikeepsix-both.txt" }, - { GIT_STATUS_INDEX_RENAMED | GIT_STATUS_INDEX_MODIFIED, - "sixserving.txt", "sixserving-index.txt" }, - { GIT_STATUS_WT_RENAMED | GIT_STATUS_WT_MODIFIED, - "songof7cities.txt", "songof7cities-workdir.txt" }, - { GIT_STATUS_INDEX_RENAMED | GIT_STATUS_WT_RENAMED, - "untimely.txt", "untimely-both.txt" }, - }; - - opts.flags |= GIT_STATUS_OPT_INCLUDE_UNTRACKED; - opts.flags |= GIT_STATUS_OPT_RENAMES_HEAD_TO_INDEX; - opts.flags |= GIT_STATUS_OPT_RENAMES_INDEX_TO_WORKDIR; - - cl_git_pass(git_repository_index(&index, g_repo)); - - rename_and_edit_file(g_repo, "ikeepsix.txt", "ikeepsix-index.txt"); - rename_and_edit_file(g_repo, "sixserving.txt", "sixserving-index.txt"); - rename_file(g_repo, "untimely.txt", "untimely-index.txt"); - - cl_git_pass(git_index_remove_bypath(index, "ikeepsix.txt")); - cl_git_pass(git_index_remove_bypath(index, "sixserving.txt")); - cl_git_pass(git_index_remove_bypath(index, "untimely.txt")); - cl_git_pass(git_index_add_bypath(index, "ikeepsix-index.txt")); - cl_git_pass(git_index_add_bypath(index, "sixserving-index.txt")); - cl_git_pass(git_index_add_bypath(index, "untimely-index.txt")); - cl_git_pass(git_index_write(index)); - - rename_and_edit_file(g_repo, "ikeepsix-index.txt", "ikeepsix-both.txt"); - rename_and_edit_file(g_repo, "songof7cities.txt", "songof7cities-workdir.txt"); - rename_file(g_repo, "untimely-index.txt", "untimely-both.txt"); - - cl_git_pass(git_status_list_new(&statuslist, g_repo, &opts)); - check_status(statuslist, expected, 4); - git_status_list_free(statuslist); - - git_index_free(index); -} - - -void test_status_renames__both_rename_from_rewrite(void) -{ - git_index *index; - git_status_list *statuslist; - git_status_options opts = GIT_STATUS_OPTIONS_INIT; - struct status_entry expected[] = { - { GIT_STATUS_INDEX_RENAMED | GIT_STATUS_WT_RENAMED, - "songof7cities.txt", "ikeepsix.txt" }, - { GIT_STATUS_INDEX_RENAMED | GIT_STATUS_WT_RENAMED, - "ikeepsix.txt", "sixserving.txt" }, - { GIT_STATUS_INDEX_RENAMED | GIT_STATUS_WT_RENAMED, - "sixserving.txt", "songof7cities.txt" }, - }; - - opts.flags |= GIT_STATUS_OPT_INCLUDE_UNTRACKED; - opts.flags |= GIT_STATUS_OPT_RENAMES_HEAD_TO_INDEX; - opts.flags |= GIT_STATUS_OPT_RENAMES_INDEX_TO_WORKDIR; - opts.flags |= GIT_STATUS_OPT_RENAMES_FROM_REWRITES; - - cl_git_pass(git_repository_index(&index, g_repo)); - - rename_file(g_repo, "ikeepsix.txt", "_temp_.txt"); - rename_file(g_repo, "sixserving.txt", "ikeepsix.txt"); - rename_file(g_repo, "songof7cities.txt", "sixserving.txt"); - rename_file(g_repo, "_temp_.txt", "songof7cities.txt"); - - cl_git_pass(git_index_add_bypath(index, "ikeepsix.txt")); - cl_git_pass(git_index_add_bypath(index, "sixserving.txt")); - cl_git_pass(git_index_add_bypath(index, "songof7cities.txt")); - cl_git_pass(git_index_write(index)); - - rename_file(g_repo, "songof7cities.txt", "_temp_.txt"); - rename_file(g_repo, "ikeepsix.txt", "songof7cities.txt"); - rename_file(g_repo, "sixserving.txt", "ikeepsix.txt"); - rename_file(g_repo, "_temp_.txt", "sixserving.txt"); - - cl_git_pass(git_status_list_new(&statuslist, g_repo, &opts)); - check_status(statuslist, expected, 3); - git_status_list_free(statuslist); - - git_index_free(index); -} - -void test_status_renames__rewrites_only_for_renames(void) -{ - git_index *index; - git_status_list *statuslist; - git_status_options opts = GIT_STATUS_OPTIONS_INIT; - struct status_entry expected[] = { - { GIT_STATUS_WT_MODIFIED, "ikeepsix.txt", "ikeepsix.txt" }, - }; - - opts.flags |= GIT_STATUS_OPT_INCLUDE_UNTRACKED; - opts.flags |= GIT_STATUS_OPT_RENAMES_HEAD_TO_INDEX; - opts.flags |= GIT_STATUS_OPT_RENAMES_INDEX_TO_WORKDIR; - opts.flags |= GIT_STATUS_OPT_RENAMES_FROM_REWRITES; - - cl_git_pass(git_repository_index(&index, g_repo)); - - cl_git_rewritefile("renames/ikeepsix.txt", - "This is enough content for the file to be rewritten.\n" \ - "This is enough content for the file to be rewritten.\n" \ - "This is enough content for the file to be rewritten.\n" \ - "This is enough content for the file to be rewritten.\n" \ - "This is enough content for the file to be rewritten.\n" \ - "This is enough content for the file to be rewritten.\n" \ - "This is enough content for the file to be rewritten.\n" \ - "This is enough content for the file to be rewritten.\n" \ - "This is enough content for the file to be rewritten.\n" \ - "This is enough content for the file to be rewritten.\n" \ - "This is enough content for the file to be rewritten.\n" \ - "This is enough content for the file to be rewritten.\n" \ - "This is enough content for the file to be rewritten.\n" \ - "This is enough content for the file to be rewritten.\n" \ - "This is enough content for the file to be rewritten.\n" \ - "This is enough content for the file to be rewritten.\n"); - - cl_git_pass(git_status_list_new(&statuslist, g_repo, &opts)); - check_status(statuslist, expected, 1); - git_status_list_free(statuslist); - - git_index_free(index); -} - -void test_status_renames__both_casechange_one(void) -{ - git_index *index; - git_status_list *statuslist; - git_status_options opts = GIT_STATUS_OPTIONS_INIT; - int index_caps; - struct status_entry expected_icase[] = { - { GIT_STATUS_INDEX_RENAMED, - "ikeepsix.txt", "IKeepSix.txt" }, - }; - struct status_entry expected_case[] = { - { GIT_STATUS_INDEX_RENAMED | GIT_STATUS_WT_RENAMED, - "ikeepsix.txt", "IKEEPSIX.txt" }, - }; - - opts.flags |= GIT_STATUS_OPT_INCLUDE_UNTRACKED; - opts.flags |= GIT_STATUS_OPT_RENAMES_HEAD_TO_INDEX; - opts.flags |= GIT_STATUS_OPT_RENAMES_INDEX_TO_WORKDIR; - - cl_git_pass(git_repository_index(&index, g_repo)); - index_caps = git_index_caps(index); - - rename_file(g_repo, "ikeepsix.txt", "IKeepSix.txt"); - - cl_git_pass(git_index_remove_bypath(index, "ikeepsix.txt")); - cl_git_pass(git_index_add_bypath(index, "IKeepSix.txt")); - cl_git_pass(git_index_write(index)); - - /* on a case-insensitive file system, this change won't matter. - * on a case-sensitive one, it will. - */ - rename_file(g_repo, "IKeepSix.txt", "IKEEPSIX.txt"); - - cl_git_pass(git_status_list_new(&statuslist, g_repo, &opts)); - - check_status(statuslist, (index_caps & GIT_INDEXCAP_IGNORE_CASE) ? - expected_icase : expected_case, 1); - - git_status_list_free(statuslist); - - git_index_free(index); -} - -void test_status_renames__both_casechange_two(void) -{ - git_index *index; - git_status_list *statuslist; - git_status_options opts = GIT_STATUS_OPTIONS_INIT; - int index_caps; - struct status_entry expected_icase[] = { - { GIT_STATUS_INDEX_RENAMED | GIT_STATUS_INDEX_MODIFIED | - GIT_STATUS_WT_MODIFIED, - "ikeepsix.txt", "IKeepSix.txt" }, - { GIT_STATUS_INDEX_MODIFIED, - "sixserving.txt", "sixserving.txt" }, - { GIT_STATUS_INDEX_RENAMED | GIT_STATUS_WT_MODIFIED, - "songof7cities.txt", "songof7.txt" }, - { GIT_STATUS_INDEX_RENAMED | GIT_STATUS_WT_RENAMED, - "untimely.txt", "untimeliest.txt" } - }; - struct status_entry expected_case[] = { - { GIT_STATUS_INDEX_RENAMED | - GIT_STATUS_WT_MODIFIED | GIT_STATUS_WT_RENAMED, - "songof7cities.txt", "SONGOF7.txt" }, - { GIT_STATUS_INDEX_MODIFIED | GIT_STATUS_WT_RENAMED, - "sixserving.txt", "SixServing.txt" }, - { GIT_STATUS_INDEX_RENAMED | GIT_STATUS_INDEX_MODIFIED | - GIT_STATUS_WT_RENAMED | GIT_STATUS_WT_MODIFIED, - "ikeepsix.txt", "ikeepsix.txt" }, - { GIT_STATUS_INDEX_RENAMED | GIT_STATUS_WT_RENAMED, - "untimely.txt", "untimeliest.txt" } - }; - - opts.flags |= GIT_STATUS_OPT_INCLUDE_UNTRACKED; - opts.flags |= GIT_STATUS_OPT_RENAMES_HEAD_TO_INDEX; - opts.flags |= GIT_STATUS_OPT_RENAMES_INDEX_TO_WORKDIR; - - cl_git_pass(git_repository_index(&index, g_repo)); - index_caps = git_index_caps(index); - - rename_and_edit_file(g_repo, "ikeepsix.txt", "IKeepSix.txt"); - rename_and_edit_file(g_repo, "sixserving.txt", "sixserving.txt"); - rename_file(g_repo, "songof7cities.txt", "songof7.txt"); - rename_file(g_repo, "untimely.txt", "untimelier.txt"); - - cl_git_pass(git_index_remove_bypath(index, "ikeepsix.txt")); - cl_git_pass(git_index_remove_bypath(index, "sixserving.txt")); - cl_git_pass(git_index_remove_bypath(index, "songof7cities.txt")); - cl_git_pass(git_index_remove_bypath(index, "untimely.txt")); - cl_git_pass(git_index_add_bypath(index, "IKeepSix.txt")); - cl_git_pass(git_index_add_bypath(index, "sixserving.txt")); - cl_git_pass(git_index_add_bypath(index, "songof7.txt")); - cl_git_pass(git_index_add_bypath(index, "untimelier.txt")); - cl_git_pass(git_index_write(index)); - - rename_and_edit_file(g_repo, "IKeepSix.txt", "ikeepsix.txt"); - rename_file(g_repo, "sixserving.txt", "SixServing.txt"); - rename_and_edit_file(g_repo, "songof7.txt", "SONGOF7.txt"); - rename_file(g_repo, "untimelier.txt", "untimeliest.txt"); - - cl_git_pass(git_status_list_new(&statuslist, g_repo, &opts)); - - check_status(statuslist, (index_caps & GIT_INDEXCAP_IGNORE_CASE) ? - expected_icase : expected_case, 4); - - git_status_list_free(statuslist); - - git_index_free(index); -} - -void test_status_renames__zero_byte_file_does_not_fail(void) -{ - git_status_list *statuslist; - git_status_options opts = GIT_STATUS_OPTIONS_INIT; - - struct status_entry expected[] = { - { GIT_STATUS_WT_DELETED, "ikeepsix.txt", "ikeepsix.txt" }, - { GIT_STATUS_WT_NEW, "zerobyte.txt", "zerobyte.txt" }, - }; - - opts.flags |= GIT_STATUS_OPT_RENAMES_FROM_REWRITES | - GIT_STATUS_OPT_RENAMES_HEAD_TO_INDEX | - GIT_STATUS_OPT_RENAMES_INDEX_TO_WORKDIR | - GIT_STATUS_OPT_INCLUDE_IGNORED | - GIT_STATUS_OPT_INCLUDE_UNTRACKED | - GIT_STATUS_OPT_RECURSE_UNTRACKED_DIRS | - GIT_STATUS_SHOW_INDEX_AND_WORKDIR | - GIT_STATUS_OPT_RECURSE_IGNORED_DIRS; - - p_unlink("renames/ikeepsix.txt"); - cl_git_mkfile("renames/zerobyte.txt", ""); - - cl_git_pass(git_status_list_new(&statuslist, g_repo, &opts)); - check_status(statuslist, expected, 2); - git_status_list_free(statuslist); -} - -#ifdef GIT_USE_ICONV -static char *nfc = "\xC3\x85\x73\x74\x72\xC3\xB6\x6D"; -static char *nfd = "\x41\xCC\x8A\x73\x74\x72\x6F\xCC\x88\x6D"; -#endif - -void test_status_renames__precomposed_unicode_rename(void) -{ -#ifdef GIT_USE_ICONV - git_status_list *statuslist; - git_status_options opts = GIT_STATUS_OPTIONS_INIT; - struct status_entry expected0[] = { - { GIT_STATUS_WT_NEW, nfd, NULL }, - { GIT_STATUS_WT_DELETED, "sixserving.txt", NULL }, - }; - struct status_entry expected1[] = { - { GIT_STATUS_WT_RENAMED, "sixserving.txt", nfd }, - }; - struct status_entry expected2[] = { - { GIT_STATUS_WT_DELETED, "sixserving.txt", NULL }, - { GIT_STATUS_WT_NEW, nfc, NULL }, - }; - struct status_entry expected3[] = { - { GIT_STATUS_WT_RENAMED, "sixserving.txt", nfc }, - }; - - rename_file(g_repo, "sixserving.txt", nfc); - - opts.flags |= GIT_STATUS_OPT_INCLUDE_UNTRACKED; - - cl_repo_set_bool(g_repo, "core.precomposeunicode", false); - - cl_git_pass(git_status_list_new(&statuslist, g_repo, &opts)); - check_status(statuslist, expected0, ARRAY_SIZE(expected0)); - git_status_list_free(statuslist); - - opts.flags |= GIT_STATUS_OPT_RENAMES_INDEX_TO_WORKDIR; - - cl_git_pass(git_status_list_new(&statuslist, g_repo, &opts)); - check_status(statuslist, expected1, ARRAY_SIZE(expected1)); - git_status_list_free(statuslist); - - cl_repo_set_bool(g_repo, "core.precomposeunicode", true); - - opts.flags &= ~GIT_STATUS_OPT_RENAMES_INDEX_TO_WORKDIR; - - cl_git_pass(git_status_list_new(&statuslist, g_repo, &opts)); - check_status(statuslist, expected2, ARRAY_SIZE(expected2)); - git_status_list_free(statuslist); - - opts.flags |= GIT_STATUS_OPT_RENAMES_INDEX_TO_WORKDIR; - - cl_git_pass(git_status_list_new(&statuslist, g_repo, &opts)); - check_status(statuslist, expected3, ARRAY_SIZE(expected3)); - git_status_list_free(statuslist); -#endif -} - -void test_status_renames__precomposed_unicode_toggle_is_rename(void) -{ -#ifdef GIT_USE_ICONV - git_status_list *statuslist; - git_status_options opts = GIT_STATUS_OPTIONS_INIT; - struct status_entry expected0[] = { - { GIT_STATUS_INDEX_RENAMED, "ikeepsix.txt", nfd }, - }; - struct status_entry expected1[] = { - { GIT_STATUS_WT_RENAMED, nfd, nfc }, - }; - struct status_entry expected2[] = { - { GIT_STATUS_INDEX_RENAMED, nfd, nfc }, - }; - struct status_entry expected3[] = { - { GIT_STATUS_INDEX_RENAMED | GIT_STATUS_WT_RENAMED, nfd, nfd }, - }; - - cl_repo_set_bool(g_repo, "core.precomposeunicode", false); - rename_file(g_repo, "ikeepsix.txt", nfd); - - { - git_index *index; - cl_git_pass(git_repository_index(&index, g_repo)); - cl_git_pass(git_index_remove_bypath(index, "ikeepsix.txt")); - cl_git_pass(git_index_add_bypath(index, nfd)); - cl_git_pass(git_index_write(index)); - git_index_free(index); - } - - opts.flags |= GIT_STATUS_OPT_INCLUDE_UNTRACKED | - GIT_STATUS_OPT_RENAMES_HEAD_TO_INDEX | - GIT_STATUS_OPT_RENAMES_INDEX_TO_WORKDIR; - - cl_git_pass(git_status_list_new(&statuslist, g_repo, &opts)); - check_status(statuslist, expected0, ARRAY_SIZE(expected0)); - git_status_list_free(statuslist); - - cl_repo_commit_from_index(NULL, g_repo, NULL, 0, "commit nfd"); - - cl_git_pass(git_status_list_new(&statuslist, g_repo, &opts)); - cl_assert_equal_sz(0, git_status_list_entrycount(statuslist)); - git_status_list_free(statuslist); - - cl_repo_set_bool(g_repo, "core.precomposeunicode", true); - - cl_git_pass(git_status_list_new(&statuslist, g_repo, &opts)); - check_status(statuslist, expected1, ARRAY_SIZE(expected1)); - git_status_list_free(statuslist); - - { - git_index *index; - cl_git_pass(git_repository_index(&index, g_repo)); - cl_git_pass(git_index_remove_bypath(index, nfd)); - cl_git_pass(git_index_add_bypath(index, nfc)); - cl_git_pass(git_index_write(index)); - git_index_free(index); - } - - cl_git_pass(git_status_list_new(&statuslist, g_repo, &opts)); - check_status(statuslist, expected2, ARRAY_SIZE(expected2)); - git_status_list_free(statuslist); - - cl_repo_set_bool(g_repo, "core.precomposeunicode", false); - - cl_git_pass(git_status_list_new(&statuslist, g_repo, &opts)); - check_status(statuslist, expected3, ARRAY_SIZE(expected3)); - git_status_list_free(statuslist); -#endif -} - diff --git a/vendor/libgit2/tests/status/single.c b/vendor/libgit2/tests/status/single.c deleted file mode 100644 index 6efaab294..000000000 --- a/vendor/libgit2/tests/status/single.c +++ /dev/null @@ -1,45 +0,0 @@ -#include "clar_libgit2.h" -#include "posix.h" - -static void -cleanup__remove_file(void *_file) -{ - cl_must_pass(p_unlink((char *)_file)); -} - -/* test retrieving OID from a file apart from the ODB */ -void test_status_single__hash_single_file(void) -{ - static const char file_name[] = "new_file"; - static const char file_contents[] = "new_file\n"; - static const char file_hash[] = "d4fa8600b4f37d7516bef4816ae2c64dbf029e3a"; - - git_oid expected_id, actual_id; - - /* initialization */ - git_oid_fromstr(&expected_id, file_hash); - cl_git_mkfile(file_name, file_contents); - cl_set_cleanup(&cleanup__remove_file, (void *)file_name); - - cl_git_pass(git_odb_hashfile(&actual_id, file_name, GIT_OBJ_BLOB)); - cl_assert_equal_oid(&expected_id, &actual_id); -} - -/* test retrieving OID from an empty file apart from the ODB */ -void test_status_single__hash_single_empty_file(void) -{ - static const char file_name[] = "new_empty_file"; - static const char file_contents[] = ""; - static const char file_hash[] = "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391"; - - git_oid expected_id, actual_id; - - /* initialization */ - git_oid_fromstr(&expected_id, file_hash); - cl_git_mkfile(file_name, file_contents); - cl_set_cleanup(&cleanup__remove_file, (void *)file_name); - - cl_git_pass(git_odb_hashfile(&actual_id, file_name, GIT_OBJ_BLOB)); - cl_assert_equal_oid(&expected_id, &actual_id); -} - diff --git a/vendor/libgit2/tests/status/status_data.h b/vendor/libgit2/tests/status/status_data.h deleted file mode 100644 index 8ad4235fd..000000000 --- a/vendor/libgit2/tests/status/status_data.h +++ /dev/null @@ -1,326 +0,0 @@ -#include "status_helpers.h" - -// A utf-8 string with 83 characters, but 249 bytes. -static const char *longname = "\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97"; - - -/* entries for a plain copy of tests/resources/status */ - -static const char *entry_paths0[] = { - "file_deleted", - "ignored_file", - "modified_file", - "new_file", - "staged_changes", - "staged_changes_file_deleted", - "staged_changes_modified_file", - "staged_delete_file_deleted", - "staged_delete_modified_file", - "staged_new_file", - "staged_new_file_deleted_file", - "staged_new_file_modified_file", - - "subdir/deleted_file", - "subdir/modified_file", - "subdir/new_file", - - "\xe8\xbf\x99", -}; - -static const unsigned int entry_statuses0[] = { - GIT_STATUS_WT_DELETED, - GIT_STATUS_IGNORED, - GIT_STATUS_WT_MODIFIED, - GIT_STATUS_WT_NEW, - GIT_STATUS_INDEX_MODIFIED, - GIT_STATUS_INDEX_MODIFIED | GIT_STATUS_WT_DELETED, - GIT_STATUS_INDEX_MODIFIED | GIT_STATUS_WT_MODIFIED, - GIT_STATUS_INDEX_DELETED, - GIT_STATUS_INDEX_DELETED | GIT_STATUS_WT_NEW, - GIT_STATUS_INDEX_NEW, - GIT_STATUS_INDEX_NEW | GIT_STATUS_WT_DELETED, - GIT_STATUS_INDEX_NEW | GIT_STATUS_WT_MODIFIED, - - GIT_STATUS_WT_DELETED, - GIT_STATUS_WT_MODIFIED, - GIT_STATUS_WT_NEW, - - GIT_STATUS_WT_NEW, -}; - -static const int entry_count0 = 16; - -/* entries for a copy of tests/resources/status with all content - * deleted from the working directory - */ - -static const char *entry_paths2[] = { - "current_file", - "file_deleted", - "modified_file", - "staged_changes", - "staged_changes_file_deleted", - "staged_changes_modified_file", - "staged_delete_file_deleted", - "staged_delete_modified_file", - "staged_new_file", - "staged_new_file_deleted_file", - "staged_new_file_modified_file", - "subdir.txt", - "subdir/current_file", - "subdir/deleted_file", - "subdir/modified_file", -}; - -static const unsigned int entry_statuses2[] = { - GIT_STATUS_WT_DELETED, - GIT_STATUS_WT_DELETED, - GIT_STATUS_WT_DELETED, - GIT_STATUS_WT_DELETED | GIT_STATUS_INDEX_MODIFIED, - GIT_STATUS_WT_DELETED | GIT_STATUS_INDEX_MODIFIED, - GIT_STATUS_WT_DELETED | GIT_STATUS_INDEX_MODIFIED, - GIT_STATUS_INDEX_DELETED, - GIT_STATUS_INDEX_DELETED, - GIT_STATUS_WT_DELETED | GIT_STATUS_INDEX_NEW, - GIT_STATUS_WT_DELETED | GIT_STATUS_INDEX_NEW, - GIT_STATUS_WT_DELETED | GIT_STATUS_INDEX_NEW, - GIT_STATUS_WT_DELETED, - GIT_STATUS_WT_DELETED, - GIT_STATUS_WT_DELETED, - GIT_STATUS_WT_DELETED, -}; - -static const int entry_count2 = 15; - -/* entries for a copy of tests/resources/status with some mods */ - -static const char *entry_paths3_icase[] = { - ".HEADER", - "42-is-not-prime.sigh", - "current_file", - "current_file/", - "file_deleted", - "ignored_file", - "modified_file", - "new_file", - "README.md", - "staged_changes", - "staged_changes_file_deleted", - "staged_changes_modified_file", - "staged_delete_file_deleted", - "staged_delete_modified_file", - "staged_new_file", - "staged_new_file_deleted_file", - "staged_new_file_modified_file", - "subdir", - "subdir/current_file", - "subdir/deleted_file", - "subdir/modified_file", - "\xe8\xbf\x99", -}; - -static const unsigned int entry_statuses3_icase[] = { - GIT_STATUS_WT_NEW, - GIT_STATUS_WT_NEW, - GIT_STATUS_WT_DELETED, - GIT_STATUS_WT_NEW, - GIT_STATUS_WT_DELETED, - GIT_STATUS_IGNORED, - GIT_STATUS_WT_MODIFIED, - GIT_STATUS_WT_NEW, - GIT_STATUS_WT_NEW, - GIT_STATUS_INDEX_MODIFIED, - GIT_STATUS_WT_DELETED | GIT_STATUS_INDEX_MODIFIED, - GIT_STATUS_WT_MODIFIED | GIT_STATUS_INDEX_MODIFIED, - GIT_STATUS_INDEX_DELETED, - GIT_STATUS_WT_NEW | GIT_STATUS_INDEX_DELETED, - GIT_STATUS_INDEX_NEW, - GIT_STATUS_WT_DELETED | GIT_STATUS_INDEX_NEW, - GIT_STATUS_WT_MODIFIED | GIT_STATUS_INDEX_NEW, - GIT_STATUS_WT_NEW, - GIT_STATUS_WT_DELETED, - GIT_STATUS_WT_DELETED, - GIT_STATUS_WT_DELETED, - GIT_STATUS_WT_NEW, -}; - -static const char *entry_paths3[] = { - ".HEADER", - "42-is-not-prime.sigh", - "README.md", - "current_file", - "current_file/", - "file_deleted", - "ignored_file", - "modified_file", - "new_file", - "staged_changes", - "staged_changes_file_deleted", - "staged_changes_modified_file", - "staged_delete_file_deleted", - "staged_delete_modified_file", - "staged_new_file", - "staged_new_file_deleted_file", - "staged_new_file_modified_file", - "subdir", - "subdir/current_file", - "subdir/deleted_file", - "subdir/modified_file", - "\xe8\xbf\x99", -}; - -static const unsigned int entry_statuses3[] = { - GIT_STATUS_WT_NEW, - GIT_STATUS_WT_NEW, - GIT_STATUS_WT_NEW, - GIT_STATUS_WT_DELETED, - GIT_STATUS_WT_NEW, - GIT_STATUS_WT_DELETED, - GIT_STATUS_IGNORED, - GIT_STATUS_WT_MODIFIED, - GIT_STATUS_WT_NEW, - GIT_STATUS_INDEX_MODIFIED, - GIT_STATUS_WT_DELETED | GIT_STATUS_INDEX_MODIFIED, - GIT_STATUS_WT_MODIFIED | GIT_STATUS_INDEX_MODIFIED, - GIT_STATUS_INDEX_DELETED, - GIT_STATUS_WT_NEW | GIT_STATUS_INDEX_DELETED, - GIT_STATUS_INDEX_NEW, - GIT_STATUS_WT_DELETED | GIT_STATUS_INDEX_NEW, - GIT_STATUS_WT_MODIFIED | GIT_STATUS_INDEX_NEW, - GIT_STATUS_WT_NEW, - GIT_STATUS_WT_DELETED, - GIT_STATUS_WT_DELETED, - GIT_STATUS_WT_DELETED, - GIT_STATUS_WT_NEW, -}; - -static const int entry_count3 = 22; - - -/* entries for a copy of tests/resources/status with some mods - * and different options to the status call - */ - -static const char *entry_paths4[] = { - ".new_file", - "current_file", - "current_file/current_file", - "current_file/modified_file", - "current_file/new_file", - "file_deleted", - "modified_file", - "new_file", - "staged_changes", - "staged_changes_file_deleted", - "staged_changes_modified_file", - "staged_delete_file_deleted", - "staged_delete_modified_file", - "staged_new_file", - "staged_new_file_deleted_file", - "staged_new_file_modified_file", - "subdir", - "subdir/current_file", - "subdir/deleted_file", - "subdir/modified_file", - "zzz_new_dir/new_file", - "zzz_new_file", - "\xe8\xbf\x99", -}; - -static const unsigned int entry_statuses4[] = { - GIT_STATUS_WT_NEW, - GIT_STATUS_WT_DELETED, - GIT_STATUS_WT_NEW, - GIT_STATUS_WT_NEW, - GIT_STATUS_WT_NEW, - GIT_STATUS_WT_DELETED, - GIT_STATUS_WT_MODIFIED, - GIT_STATUS_WT_NEW, - GIT_STATUS_INDEX_MODIFIED, - GIT_STATUS_WT_DELETED | GIT_STATUS_INDEX_MODIFIED, - GIT_STATUS_WT_MODIFIED | GIT_STATUS_INDEX_MODIFIED, - GIT_STATUS_INDEX_DELETED, - GIT_STATUS_WT_NEW | GIT_STATUS_INDEX_DELETED, - GIT_STATUS_INDEX_NEW, - GIT_STATUS_WT_DELETED | GIT_STATUS_INDEX_NEW, - GIT_STATUS_WT_MODIFIED | GIT_STATUS_INDEX_NEW, - GIT_STATUS_WT_NEW, - GIT_STATUS_WT_DELETED, - GIT_STATUS_WT_DELETED, - GIT_STATUS_WT_DELETED, - GIT_STATUS_WT_NEW, - GIT_STATUS_WT_NEW, - GIT_STATUS_WT_NEW, -}; - -static const int entry_count4 = 23; - - -/* entries for a copy of tests/resources/status with options - * passed to the status call in order to only get the differences - * between the HEAD and the index (changes to be committed) - */ - -static const char *entry_paths5[] = { - "staged_changes", - "staged_changes_file_deleted", - "staged_changes_modified_file", - "staged_delete_file_deleted", - "staged_delete_modified_file", - "staged_new_file", - "staged_new_file_deleted_file", - "staged_new_file_modified_file", -}; - -static const unsigned int entry_statuses5[] = { - GIT_STATUS_INDEX_MODIFIED, - GIT_STATUS_INDEX_MODIFIED, - GIT_STATUS_INDEX_MODIFIED, - GIT_STATUS_INDEX_DELETED, - GIT_STATUS_INDEX_DELETED, - GIT_STATUS_INDEX_NEW, - GIT_STATUS_INDEX_NEW, - GIT_STATUS_INDEX_NEW, -}; - -static const int entry_count5 = 8; - - -/* entries for a copy of tests/resources/status with options - * passed to the status call in order to only get the differences - * between the workdir and the index (changes not staged, untracked files) - */ - -static const char *entry_paths6[] = { - "file_deleted", - "ignored_file", - "modified_file", - "new_file", - "staged_changes_file_deleted", - "staged_changes_modified_file", - "staged_delete_modified_file", - "staged_new_file_deleted_file", - "staged_new_file_modified_file", - "subdir/deleted_file", - "subdir/modified_file", - "subdir/new_file", - "\xe8\xbf\x99", -}; - -static const unsigned int entry_statuses6[] = { - GIT_STATUS_WT_DELETED, - GIT_STATUS_IGNORED, - GIT_STATUS_WT_MODIFIED, - GIT_STATUS_WT_NEW, - GIT_STATUS_WT_DELETED, - GIT_STATUS_WT_MODIFIED, - GIT_STATUS_WT_NEW, - GIT_STATUS_WT_DELETED, - GIT_STATUS_WT_MODIFIED, - GIT_STATUS_WT_DELETED, - GIT_STATUS_WT_MODIFIED, - GIT_STATUS_WT_NEW, - GIT_STATUS_WT_NEW, -}; - -static const int entry_count6 = 13; diff --git a/vendor/libgit2/tests/status/status_helpers.c b/vendor/libgit2/tests/status/status_helpers.c deleted file mode 100644 index 5d13caa9a..000000000 --- a/vendor/libgit2/tests/status/status_helpers.c +++ /dev/null @@ -1,97 +0,0 @@ -#include "clar_libgit2.h" -#include "status_helpers.h" - -int cb_status__normal( - const char *path, unsigned int status_flags, void *payload) -{ - status_entry_counts *counts = payload; - - if (counts->debug) - cb_status__print(path, status_flags, NULL); - - if (counts->entry_count >= counts->expected_entry_count) - counts->wrong_status_flags_count++; - else if (strcmp(path, counts->expected_paths[counts->entry_count])) - counts->wrong_sorted_path++; - else if (status_flags != counts->expected_statuses[counts->entry_count]) - counts->wrong_status_flags_count++; - - counts->entry_count++; - return 0; -} - -int cb_status__count(const char *p, unsigned int s, void *payload) -{ - volatile int *count = (int *)payload; - - GIT_UNUSED(p); - GIT_UNUSED(s); - - (*count)++; - - return 0; -} - -int cb_status__single(const char *p, unsigned int s, void *payload) -{ - status_entry_single *data = (status_entry_single *)payload; - - if (data->debug) - fprintf(stderr, "%02d: %s (%04x)\n", data->count, p, s); - - data->count++; - data->status = s; - - return 0; -} - -int cb_status__print( - const char *path, unsigned int status_flags, void *payload) -{ - char istatus = ' ', wstatus = ' '; - int icount = 0, wcount = 0; - - if (status_flags & GIT_STATUS_INDEX_NEW) { - istatus = 'A'; icount++; - } - if (status_flags & GIT_STATUS_INDEX_MODIFIED) { - istatus = 'M'; icount++; - } - if (status_flags & GIT_STATUS_INDEX_DELETED) { - istatus = 'D'; icount++; - } - if (status_flags & GIT_STATUS_INDEX_RENAMED) { - istatus = 'R'; icount++; - } - if (status_flags & GIT_STATUS_INDEX_TYPECHANGE) { - istatus = 'T'; icount++; - } - - if (status_flags & GIT_STATUS_WT_NEW) { - wstatus = 'A'; wcount++; - } - if (status_flags & GIT_STATUS_WT_MODIFIED) { - wstatus = 'M'; wcount++; - } - if (status_flags & GIT_STATUS_WT_DELETED) { - wstatus = 'D'; wcount++; - } - if (status_flags & GIT_STATUS_WT_TYPECHANGE) { - wstatus = 'T'; wcount++; - } - if (status_flags & GIT_STATUS_IGNORED) { - wstatus = 'I'; wcount++; - } - if (status_flags & GIT_STATUS_WT_UNREADABLE) { - wstatus = 'X'; wcount++; - } - - fprintf(stderr, "%c%c %s (%d/%d%s)\n", - istatus, wstatus, path, icount, wcount, - (icount > 1 || wcount > 1) ? " INVALID COMBO" : ""); - - if (payload) - *((int *)payload) += 1; - - return 0; -} diff --git a/vendor/libgit2/tests/status/status_helpers.h b/vendor/libgit2/tests/status/status_helpers.h deleted file mode 100644 index 242076cc9..000000000 --- a/vendor/libgit2/tests/status/status_helpers.h +++ /dev/null @@ -1,49 +0,0 @@ -#ifndef INCLUDE_cl_status_helpers_h__ -#define INCLUDE_cl_status_helpers_h__ - -typedef struct { - int wrong_status_flags_count; - int wrong_sorted_path; - int entry_count; - const unsigned int* expected_statuses; - const char** expected_paths; - int expected_entry_count; - const char *file; - int line; - bool debug; -} status_entry_counts; - -#define status_counts_init(counts, paths, statuses) do { \ - memset(&(counts), 0, sizeof(counts)); \ - (counts).expected_statuses = (statuses); \ - (counts).expected_paths = (paths); \ - (counts).file = __FILE__; \ - (counts).line = __LINE__; \ - } while (0) - -/* cb_status__normal takes payload of "status_entry_counts *" */ - -extern int cb_status__normal( - const char *path, unsigned int status_flags, void *payload); - - -/* cb_status__count takes payload of "int *" */ - -extern int cb_status__count(const char *p, unsigned int s, void *payload); - - -typedef struct { - int count; - unsigned int status; - bool debug; -} status_entry_single; - -/* cb_status__single takes payload of "status_entry_single *" */ - -extern int cb_status__single(const char *p, unsigned int s, void *payload); - -/* cb_status__print takes optional payload of "int *" */ - -extern int cb_status__print(const char *p, unsigned int s, void *payload); - -#endif diff --git a/vendor/libgit2/tests/status/submodules.c b/vendor/libgit2/tests/status/submodules.c deleted file mode 100644 index e6de60088..000000000 --- a/vendor/libgit2/tests/status/submodules.c +++ /dev/null @@ -1,526 +0,0 @@ -#include "clar_libgit2.h" -#include "fileops.h" -#include "status_helpers.h" -#include "../submodule/submodule_helpers.h" - -static git_repository *g_repo = NULL; - -void test_status_submodules__initialize(void) -{ -} - -void test_status_submodules__cleanup(void) -{ -} - -void test_status_submodules__api(void) -{ - git_submodule *sm; - - g_repo = setup_fixture_submodules(); - - cl_assert(git_submodule_lookup(NULL, g_repo, "nonexistent") == GIT_ENOTFOUND); - - cl_assert(git_submodule_lookup(NULL, g_repo, "modified") == GIT_ENOTFOUND); - - cl_git_pass(git_submodule_lookup(&sm, g_repo, "testrepo")); - cl_assert(sm != NULL); - cl_assert_equal_s("testrepo", git_submodule_name(sm)); - cl_assert_equal_s("testrepo", git_submodule_path(sm)); - git_submodule_free(sm); -} - -void test_status_submodules__0(void) -{ - int counts = 0; - - g_repo = setup_fixture_submodules(); - - cl_assert(git_path_isdir("submodules/.git")); - cl_assert(git_path_isdir("submodules/testrepo/.git")); - cl_assert(git_path_isfile("submodules/.gitmodules")); - - cl_git_pass( - git_status_foreach(g_repo, cb_status__count, &counts) - ); - - cl_assert_equal_i(6, counts); -} - -static const char *expected_files[] = { - ".gitmodules", - "added", - "deleted", - "ignored", - "modified", - "untracked" -}; - -static unsigned int expected_status[] = { - GIT_STATUS_WT_MODIFIED, - GIT_STATUS_INDEX_NEW, - GIT_STATUS_INDEX_DELETED, - GIT_STATUS_IGNORED, - GIT_STATUS_WT_MODIFIED, - GIT_STATUS_WT_NEW -}; - -static int cb_status__match(const char *p, unsigned int s, void *payload) -{ - status_entry_counts *counts = payload; - int idx = counts->entry_count++; - - clar__assert_equal( - counts->file, counts->line, - "Status path mismatch", 1, - "%s", counts->expected_paths[idx], p); - - clar__assert_equal( - counts->file, counts->line, - "Status code mismatch", 1, - "%o", counts->expected_statuses[idx], s); - - return 0; -} - -void test_status_submodules__1(void) -{ - status_entry_counts counts; - - g_repo = setup_fixture_submodules(); - - cl_assert(git_path_isdir("submodules/.git")); - cl_assert(git_path_isdir("submodules/testrepo/.git")); - cl_assert(git_path_isfile("submodules/.gitmodules")); - - status_counts_init(counts, expected_files, expected_status); - - cl_git_pass( git_status_foreach(g_repo, cb_status__match, &counts) ); - - cl_assert_equal_i(6, counts.entry_count); -} - -void test_status_submodules__single_file(void) -{ - unsigned int status = 0; - g_repo = setup_fixture_submodules(); - cl_git_pass( git_status_file(&status, g_repo, "testrepo") ); - cl_assert(!status); -} - -void test_status_submodules__moved_head(void) -{ - git_submodule *sm; - git_repository *smrepo; - git_oid oid; - git_status_options opts = GIT_STATUS_OPTIONS_INIT; - status_entry_counts counts; - static const char *expected_files_with_sub[] = { - ".gitmodules", - "added", - "deleted", - "ignored", - "modified", - "testrepo", - "untracked" - }; - static unsigned int expected_status_with_sub[] = { - GIT_STATUS_WT_MODIFIED, - GIT_STATUS_INDEX_NEW, - GIT_STATUS_INDEX_DELETED, - GIT_STATUS_IGNORED, - GIT_STATUS_WT_MODIFIED, - GIT_STATUS_WT_MODIFIED, - GIT_STATUS_WT_NEW - }; - - g_repo = setup_fixture_submodules(); - - cl_git_pass(git_submodule_lookup(&sm, g_repo, "testrepo")); - cl_git_pass(git_submodule_open(&smrepo, sm)); - git_submodule_free(sm); - - /* move submodule HEAD to c47800c7266a2be04c571c04d5a6614691ea99bd */ - cl_git_pass( - git_oid_fromstr(&oid, "c47800c7266a2be04c571c04d5a6614691ea99bd")); - cl_git_pass(git_repository_set_head_detached(smrepo, &oid)); - - /* first do a normal status, which should now include the submodule */ - - opts.flags = GIT_STATUS_OPT_DEFAULTS; - - status_counts_init( - counts, expected_files_with_sub, expected_status_with_sub); - cl_git_pass( - git_status_foreach_ext(g_repo, &opts, cb_status__match, &counts)); - cl_assert_equal_i(7, counts.entry_count); - - /* try again with EXCLUDE_SUBMODULES which should skip it */ - - opts.flags = GIT_STATUS_OPT_DEFAULTS | GIT_STATUS_OPT_EXCLUDE_SUBMODULES; - - status_counts_init(counts, expected_files, expected_status); - cl_git_pass( - git_status_foreach_ext(g_repo, &opts, cb_status__match, &counts)); - cl_assert_equal_i(6, counts.entry_count); - - git_repository_free(smrepo); -} - -void test_status_submodules__dirty_workdir_only(void) -{ - git_status_options opts = GIT_STATUS_OPTIONS_INIT; - status_entry_counts counts; - static const char *expected_files_with_sub[] = { - ".gitmodules", - "added", - "deleted", - "ignored", - "modified", - "testrepo", - "untracked" - }; - static unsigned int expected_status_with_sub[] = { - GIT_STATUS_WT_MODIFIED, - GIT_STATUS_INDEX_NEW, - GIT_STATUS_INDEX_DELETED, - GIT_STATUS_IGNORED, - GIT_STATUS_WT_MODIFIED, - GIT_STATUS_WT_MODIFIED, - GIT_STATUS_WT_NEW - }; - - g_repo = setup_fixture_submodules(); - - cl_git_rewritefile("submodules/testrepo/README", "heyheyhey"); - cl_git_mkfile("submodules/testrepo/all_new.txt", "never seen before"); - - /* first do a normal status, which should now include the submodule */ - - opts.flags = GIT_STATUS_OPT_DEFAULTS; - - status_counts_init( - counts, expected_files_with_sub, expected_status_with_sub); - cl_git_pass( - git_status_foreach_ext(g_repo, &opts, cb_status__match, &counts)); - cl_assert_equal_i(7, counts.entry_count); - - /* try again with EXCLUDE_SUBMODULES which should skip it */ - - opts.flags = GIT_STATUS_OPT_DEFAULTS | GIT_STATUS_OPT_EXCLUDE_SUBMODULES; - - status_counts_init(counts, expected_files, expected_status); - cl_git_pass( - git_status_foreach_ext(g_repo, &opts, cb_status__match, &counts)); - cl_assert_equal_i(6, counts.entry_count); -} - -void test_status_submodules__uninitialized(void) -{ - git_repository *cloned_repo; - git_status_list *statuslist; - - g_repo = cl_git_sandbox_init("submod2"); - - cl_git_pass(git_clone(&cloned_repo, "submod2", "submod2-clone", NULL)); - - cl_git_pass(git_status_list_new(&statuslist, cloned_repo, NULL)); - cl_assert_equal_i(0, git_status_list_entrycount(statuslist)); - - git_status_list_free(statuslist); - git_repository_free(cloned_repo); - cl_git_sandbox_cleanup(); -} - -void test_status_submodules__contained_untracked_repo(void) -{ - git_status_options opts = GIT_STATUS_OPTIONS_INIT; - status_entry_counts counts; - git_repository *contained; - static const char *expected_files_not_ignored[] = { - ".gitmodules", - "added", - "deleted", - "modified", - "untracked" - }; - static unsigned int expected_status_not_ignored[] = { - GIT_STATUS_WT_MODIFIED, - GIT_STATUS_INDEX_NEW, - GIT_STATUS_INDEX_DELETED, - GIT_STATUS_WT_MODIFIED, - GIT_STATUS_WT_NEW, - }; - static const char *expected_files_with_untracked[] = { - ".gitmodules", - "added", - "deleted", - "dir/file.md", - "modified", - "untracked" - }; - static const char *expected_files_with_untracked_dir[] = { - ".gitmodules", - "added", - "deleted", - "dir/", - "modified", - "untracked" - }; - static unsigned int expected_status_with_untracked[] = { - GIT_STATUS_WT_MODIFIED, - GIT_STATUS_INDEX_NEW, - GIT_STATUS_INDEX_DELETED, - GIT_STATUS_WT_NEW, - GIT_STATUS_WT_MODIFIED, - GIT_STATUS_WT_NEW - }; - - g_repo = setup_fixture_submodules(); - - /* skip empty directory */ - - cl_must_pass(p_mkdir("submodules/dir", 0777)); - opts.flags = GIT_STATUS_OPT_INCLUDE_UNTRACKED; - - status_counts_init( - counts, expected_files_not_ignored, expected_status_not_ignored); - cl_git_pass(git_status_foreach_ext( - g_repo, &opts, cb_status__match, &counts)); - cl_assert_equal_i(5, counts.entry_count); - - /* still skipping because empty == ignored */ - - opts.flags = GIT_STATUS_OPT_INCLUDE_UNTRACKED | - GIT_STATUS_OPT_RECURSE_UNTRACKED_DIRS; - - status_counts_init( - counts, expected_files_not_ignored, expected_status_not_ignored); - cl_git_pass(git_status_foreach_ext( - g_repo, &opts, cb_status__match, &counts)); - cl_assert_equal_i(5, counts.entry_count); - - /* find non-ignored contents of directory */ - - cl_git_mkfile("submodules/dir/file.md", "hello"); - opts.flags = GIT_STATUS_OPT_INCLUDE_UNTRACKED | - GIT_STATUS_OPT_RECURSE_UNTRACKED_DIRS; - - status_counts_init( - counts, expected_files_with_untracked, expected_status_with_untracked); - cl_git_pass(git_status_foreach_ext( - g_repo, &opts, cb_status__match, &counts)); - cl_assert_equal_i(6, counts.entry_count); - - /* but skip if all content is ignored */ - - cl_git_append2file("submodules/.git/info/exclude", "\n*.md\n\n"); - opts.flags = GIT_STATUS_OPT_INCLUDE_UNTRACKED | - GIT_STATUS_OPT_RECURSE_UNTRACKED_DIRS; - - status_counts_init( - counts, expected_files_not_ignored, expected_status_not_ignored); - cl_git_pass(git_status_foreach_ext( - g_repo, &opts, cb_status__match, &counts)); - cl_assert_equal_i(5, counts.entry_count); - - /* same is true if it contains a git link */ - - cl_git_mkfile("submodules/dir/.git", "gitlink: ../.git"); - opts.flags = GIT_STATUS_OPT_INCLUDE_UNTRACKED | - GIT_STATUS_OPT_RECURSE_UNTRACKED_DIRS; - - status_counts_init( - counts, expected_files_not_ignored, expected_status_not_ignored); - cl_git_pass(git_status_foreach_ext( - g_repo, &opts, cb_status__match, &counts)); - cl_assert_equal_i(5, counts.entry_count); - - /* but if it contains tracked files, it should just show up as a - * directory and exclude the files in it - */ - - cl_git_mkfile("submodules/dir/another_file", "hello"); - opts.flags = GIT_STATUS_OPT_INCLUDE_UNTRACKED | - GIT_STATUS_OPT_RECURSE_UNTRACKED_DIRS; - - status_counts_init( - counts, expected_files_with_untracked_dir, - expected_status_with_untracked); - cl_git_pass(git_status_foreach_ext( - g_repo, &opts, cb_status__match, &counts)); - cl_assert_equal_i(6, counts.entry_count); - - /* that applies to a git repo with a .git directory too */ - - cl_must_pass(p_unlink("submodules/dir/.git")); - cl_git_pass(git_repository_init(&contained, "submodules/dir", false)); - git_repository_free(contained); - opts.flags = GIT_STATUS_OPT_INCLUDE_UNTRACKED | - GIT_STATUS_OPT_RECURSE_UNTRACKED_DIRS; - - status_counts_init( - counts, expected_files_with_untracked_dir, - expected_status_with_untracked); - cl_git_pass(git_status_foreach_ext( - g_repo, &opts, cb_status__match, &counts)); - cl_assert_equal_i(6, counts.entry_count); - - /* same result even if we don't recurse into subdirectories */ - - opts.flags = GIT_STATUS_OPT_INCLUDE_UNTRACKED; - - status_counts_init( - counts, expected_files_with_untracked_dir, - expected_status_with_untracked); - cl_git_pass(git_status_foreach_ext( - g_repo, &opts, cb_status__match, &counts)); - cl_assert_equal_i(6, counts.entry_count); - - /* and if we remove the untracked file, it goes back to ignored */ - - cl_must_pass(p_unlink("submodules/dir/another_file")); - - status_counts_init( - counts, expected_files_not_ignored, expected_status_not_ignored); - cl_git_pass(git_status_foreach_ext( - g_repo, &opts, cb_status__match, &counts)); - cl_assert_equal_i(5, counts.entry_count); -} - -void test_status_submodules__broken_stuff_that_git_allows(void) -{ - git_status_options opts = GIT_STATUS_OPTIONS_INIT; - status_entry_counts counts; - git_repository *contained; - static const char *expected_files_with_broken[] = { - ".gitmodules", - "added", - "broken/tracked", - "deleted", - "ignored", - "modified", - "untracked" - }; - static unsigned int expected_status_with_broken[] = { - GIT_STATUS_WT_MODIFIED, - GIT_STATUS_INDEX_NEW, - GIT_STATUS_INDEX_NEW, - GIT_STATUS_INDEX_DELETED, - GIT_STATUS_IGNORED, - GIT_STATUS_WT_MODIFIED, - GIT_STATUS_WT_NEW, - }; - - g_repo = setup_fixture_submodules(); - - opts.flags = GIT_STATUS_OPT_INCLUDE_UNTRACKED | - GIT_STATUS_OPT_RECURSE_UNTRACKED_DIRS | - GIT_STATUS_OPT_INCLUDE_IGNORED; - - /* make a directory and stick a tracked item into the index */ - { - git_index *idx; - cl_must_pass(p_mkdir("submodules/broken", 0777)); - cl_git_mkfile("submodules/broken/tracked", "tracked content"); - cl_git_pass(git_repository_index(&idx, g_repo)); - cl_git_pass(git_index_add_bypath(idx, "broken/tracked")); - cl_git_pass(git_index_write(idx)); - git_index_free(idx); - } - - status_counts_init( - counts, expected_files_with_broken, expected_status_with_broken); - cl_git_pass(git_status_foreach_ext( - g_repo, &opts, cb_status__match, &counts)); - cl_assert_equal_i(7, counts.entry_count); - - /* directory with tracked items that looks a little bit like a repo */ - - cl_must_pass(p_mkdir("submodules/broken/.git", 0777)); - cl_must_pass(p_mkdir("submodules/broken/.git/info", 0777)); - cl_git_mkfile("submodules/broken/.git/info/exclude", "# bogus"); - - status_counts_init( - counts, expected_files_with_broken, expected_status_with_broken); - cl_git_pass(git_status_foreach_ext( - g_repo, &opts, cb_status__match, &counts)); - cl_assert_equal_i(7, counts.entry_count); - - /* directory with tracked items that is a repo */ - - cl_git_pass(git_futils_rmdir_r( - "submodules/broken/.git", NULL, GIT_RMDIR_REMOVE_FILES)); - cl_git_pass(git_repository_init(&contained, "submodules/broken", false)); - git_repository_free(contained); - - status_counts_init( - counts, expected_files_with_broken, expected_status_with_broken); - cl_git_pass(git_status_foreach_ext( - g_repo, &opts, cb_status__match, &counts)); - cl_assert_equal_i(7, counts.entry_count); - - /* directory with tracked items that claims to be a submodule but is not */ - - cl_git_pass(git_futils_rmdir_r( - "submodules/broken/.git", NULL, GIT_RMDIR_REMOVE_FILES)); - cl_git_append2file("submodules/.gitmodules", - "\n[submodule \"broken\"]\n" - "\tpath = broken\n" - "\turl = https://github.com/not/used\n\n"); - - status_counts_init( - counts, expected_files_with_broken, expected_status_with_broken); - cl_git_pass(git_status_foreach_ext( - g_repo, &opts, cb_status__match, &counts)); - cl_assert_equal_i(7, counts.entry_count); -} - -void test_status_submodules__entry_but_dir_tracked(void) -{ - git_repository *repo; - git_status_list *status; - git_diff *diff; - git_index *index; - git_tree *tree; - - cl_git_pass(git_repository_init(&repo, "mixed-submodule", 0)); - cl_git_mkfile("mixed-submodule/.gitmodules", "[submodule \"sub\"]\n path = sub\n url = ../foo\n"); - cl_git_pass(p_mkdir("mixed-submodule/sub", 0777)); - cl_git_mkfile("mixed-submodule/sub/file", ""); - - /* Create the commit with sub/file as a file, and an entry for sub in the modules list */ - { - git_oid tree_id, commit_id; - git_signature *sig; - git_reference *ref; - - cl_git_pass(git_repository_index(&index, repo)); - cl_git_pass(git_index_add_bypath(index, ".gitmodules")); - cl_git_pass(git_index_add_bypath(index, "sub/file")); - cl_git_pass(git_index_write(index)); - cl_git_pass(git_index_write_tree(&tree_id, index)); - cl_git_pass(git_signature_now(&sig, "Sloppy Submoduler", "sloppy@example.com")); - cl_git_pass(git_tree_lookup(&tree, repo, &tree_id)); - cl_git_pass(git_commit_create(&commit_id, repo, NULL, sig, sig, NULL, "message", tree, 0, NULL)); - cl_git_pass(git_reference_create(&ref, repo, "refs/heads/master", &commit_id, 1, "commit: foo")); - git_reference_free(ref); - git_signature_free(sig); - } - - cl_git_pass(git_diff_tree_to_index(&diff, repo, tree, index, NULL)); - cl_assert_equal_i(0, git_diff_num_deltas(diff)); - git_diff_free(diff); - - cl_git_pass(git_diff_index_to_workdir(&diff, repo, index, NULL)); - cl_assert_equal_i(0, git_diff_num_deltas(diff)); - git_diff_free(diff); - - cl_git_pass(git_status_list_new(&status, repo, NULL)); - cl_assert_equal_i(0, git_status_list_entrycount(status)); - - git_status_list_free(status); - git_index_free(index); - git_tree_free(tree); - git_repository_free(repo); -} diff --git a/vendor/libgit2/tests/status/worktree.c b/vendor/libgit2/tests/status/worktree.c deleted file mode 100644 index 5d3b4d55e..000000000 --- a/vendor/libgit2/tests/status/worktree.c +++ /dev/null @@ -1,1151 +0,0 @@ -#include "clar_libgit2.h" -#include "fileops.h" -#include "ignore.h" -#include "status_data.h" -#include "posix.h" -#include "util.h" -#include "path.h" -#include "../diff/diff_helpers.h" -#include "../checkout/checkout_helpers.h" -#include "git2/sys/diff.h" - -/** - * Cleanup - * - * This will be called once after each test finishes, even - * if the test failed - */ -void test_status_worktree__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -/** - * Tests - Status determination on a working tree - */ -/* this test is equivalent to t18-status.c:statuscb0 */ -void test_status_worktree__whole_repository(void) -{ - status_entry_counts counts; - git_repository *repo = cl_git_sandbox_init("status"); - - memset(&counts, 0x0, sizeof(status_entry_counts)); - counts.expected_entry_count = entry_count0; - counts.expected_paths = entry_paths0; - counts.expected_statuses = entry_statuses0; - - cl_git_pass( - git_status_foreach(repo, cb_status__normal, &counts) - ); - - cl_assert_equal_i(counts.expected_entry_count, counts.entry_count); - cl_assert_equal_i(0, counts.wrong_status_flags_count); - cl_assert_equal_i(0, counts.wrong_sorted_path); -} - -void assert_show( - const int entry_counts, - const char *entry_paths[], - const unsigned int entry_statuses[], - git_repository *repo, - git_status_show_t show, - unsigned int extra_flags) -{ - status_entry_counts counts; - git_status_options opts = GIT_STATUS_OPTIONS_INIT; - - memset(&counts, 0x0, sizeof(status_entry_counts)); - counts.expected_entry_count = entry_counts; - counts.expected_paths = entry_paths; - counts.expected_statuses = entry_statuses; - - opts.flags = GIT_STATUS_OPT_DEFAULTS | extra_flags; - opts.show = show; - - cl_git_pass( - git_status_foreach_ext(repo, &opts, cb_status__normal, &counts) - ); - - cl_assert_equal_i(counts.expected_entry_count, counts.entry_count); - cl_assert_equal_i(0, counts.wrong_status_flags_count); - cl_assert_equal_i(0, counts.wrong_sorted_path); -} - -void test_status_worktree__show_index_and_workdir(void) -{ - assert_show(entry_count0, entry_paths0, entry_statuses0, - cl_git_sandbox_init("status"), GIT_STATUS_SHOW_INDEX_AND_WORKDIR, 0); -} - -void test_status_worktree__show_index_only(void) -{ - assert_show(entry_count5, entry_paths5, entry_statuses5, - cl_git_sandbox_init("status"), GIT_STATUS_SHOW_INDEX_ONLY, 0); -} - -void test_status_worktree__show_workdir_only(void) -{ - assert_show(entry_count6, entry_paths6, entry_statuses6, - cl_git_sandbox_init("status"), GIT_STATUS_SHOW_WORKDIR_ONLY, 0); -} - -/* this test is equivalent to t18-status.c:statuscb1 */ -void test_status_worktree__empty_repository(void) -{ - int count = 0; - git_repository *repo = cl_git_sandbox_init("empty_standard_repo"); - - cl_git_pass(git_status_foreach(repo, cb_status__count, &count)); - - cl_assert_equal_i(0, count); -} - -static int remove_file_cb(void *data, git_buf *file) -{ - const char *filename = git_buf_cstr(file); - - GIT_UNUSED(data); - - if (git__suffixcmp(filename, ".git") == 0) - return 0; - - if (git_path_isdir(filename)) - cl_git_pass(git_futils_rmdir_r(filename, NULL, GIT_RMDIR_REMOVE_FILES)); - else - cl_git_pass(p_unlink(git_buf_cstr(file))); - - return 0; -} - -/* this test is equivalent to t18-status.c:statuscb2 */ -void test_status_worktree__purged_worktree(void) -{ - status_entry_counts counts; - git_repository *repo = cl_git_sandbox_init("status"); - git_buf workdir = GIT_BUF_INIT; - - /* first purge the contents of the worktree */ - cl_git_pass(git_buf_sets(&workdir, git_repository_workdir(repo))); - cl_git_pass(git_path_direach(&workdir, 0, remove_file_cb, NULL)); - git_buf_free(&workdir); - - /* now get status */ - memset(&counts, 0x0, sizeof(status_entry_counts)); - counts.expected_entry_count = entry_count2; - counts.expected_paths = entry_paths2; - counts.expected_statuses = entry_statuses2; - - cl_git_pass( - git_status_foreach(repo, cb_status__normal, &counts) - ); - - cl_assert_equal_i(counts.expected_entry_count, counts.entry_count); - cl_assert_equal_i(0, counts.wrong_status_flags_count); - cl_assert_equal_i(0, counts.wrong_sorted_path); -} - -/* this test is similar to t18-status.c:statuscb3 */ -void test_status_worktree__swap_subdir_and_file(void) -{ - status_entry_counts counts; - git_repository *repo = cl_git_sandbox_init("status"); - git_index *index; - git_status_options opts = GIT_STATUS_OPTIONS_INIT; - bool ignore_case; - - cl_git_pass(git_repository_index(&index, repo)); - ignore_case = (git_index_caps(index) & GIT_INDEXCAP_IGNORE_CASE) != 0; - git_index_free(index); - - /* first alter the contents of the worktree */ - cl_git_pass(p_rename("status/current_file", "status/swap")); - cl_git_pass(p_rename("status/subdir", "status/current_file")); - cl_git_pass(p_rename("status/swap", "status/subdir")); - - cl_git_mkfile("status/.HEADER", "dummy"); - cl_git_mkfile("status/42-is-not-prime.sigh", "dummy"); - cl_git_mkfile("status/README.md", "dummy"); - - /* now get status */ - memset(&counts, 0x0, sizeof(status_entry_counts)); - counts.expected_entry_count = entry_count3; - counts.expected_paths = ignore_case ? entry_paths3_icase : entry_paths3; - counts.expected_statuses = ignore_case ? entry_statuses3_icase : entry_statuses3; - - opts.flags = GIT_STATUS_OPT_INCLUDE_UNTRACKED | - GIT_STATUS_OPT_INCLUDE_IGNORED; - - cl_git_pass( - git_status_foreach_ext(repo, &opts, cb_status__normal, &counts) - ); - - cl_assert_equal_i(counts.expected_entry_count, counts.entry_count); - cl_assert_equal_i(0, counts.wrong_status_flags_count); - cl_assert_equal_i(0, counts.wrong_sorted_path); -} - -void test_status_worktree__swap_subdir_with_recurse_and_pathspec(void) -{ - status_entry_counts counts; - git_repository *repo = cl_git_sandbox_init("status"); - git_status_options opts = GIT_STATUS_OPTIONS_INIT; - - /* first alter the contents of the worktree */ - cl_git_pass(p_rename("status/current_file", "status/swap")); - cl_git_pass(p_rename("status/subdir", "status/current_file")); - cl_git_pass(p_rename("status/swap", "status/subdir")); - cl_git_mkfile("status/.new_file", "dummy"); - cl_git_pass(git_futils_mkdir_r("status/zzz_new_dir", 0777)); - cl_git_mkfile("status/zzz_new_dir/new_file", "dummy"); - cl_git_mkfile("status/zzz_new_file", "dummy"); - - /* now get status */ - memset(&counts, 0x0, sizeof(status_entry_counts)); - counts.expected_entry_count = entry_count4; - counts.expected_paths = entry_paths4; - counts.expected_statuses = entry_statuses4; - - opts.flags = GIT_STATUS_OPT_INCLUDE_UNTRACKED | - GIT_STATUS_OPT_RECURSE_UNTRACKED_DIRS; - /* TODO: set pathspec to "current_file" eventually */ - - cl_git_pass( - git_status_foreach_ext(repo, &opts, cb_status__normal, &counts) - ); - - cl_assert_equal_i(counts.expected_entry_count, counts.entry_count); - cl_assert_equal_i(0, counts.wrong_status_flags_count); - cl_assert_equal_i(0, counts.wrong_sorted_path); -} - -/* this test is equivalent to t18-status.c:singlestatus0 */ -void test_status_worktree__single_file(void) -{ - int i; - unsigned int status_flags; - git_repository *repo = cl_git_sandbox_init("status"); - - for (i = 0; i < (int)entry_count0; i++) { - cl_git_pass( - git_status_file(&status_flags, repo, entry_paths0[i]) - ); - cl_assert(entry_statuses0[i] == status_flags); - } -} - -/* this test is equivalent to t18-status.c:singlestatus1 */ -void test_status_worktree__single_nonexistent_file(void) -{ - int error; - unsigned int status_flags; - git_repository *repo = cl_git_sandbox_init("status"); - - error = git_status_file(&status_flags, repo, "nonexistent"); - cl_git_fail(error); - cl_assert(error == GIT_ENOTFOUND); -} - -/* this test is equivalent to t18-status.c:singlestatus2 */ -void test_status_worktree__single_nonexistent_file_empty_repo(void) -{ - int error; - unsigned int status_flags; - git_repository *repo = cl_git_sandbox_init("empty_standard_repo"); - - error = git_status_file(&status_flags, repo, "nonexistent"); - cl_git_fail(error); - cl_assert(error == GIT_ENOTFOUND); -} - -/* this test is equivalent to t18-status.c:singlestatus3 */ -void test_status_worktree__single_file_empty_repo(void) -{ - unsigned int status_flags; - git_repository *repo = cl_git_sandbox_init("empty_standard_repo"); - - cl_git_mkfile("empty_standard_repo/new_file", "new_file\n"); - - cl_git_pass(git_status_file(&status_flags, repo, "new_file")); - cl_assert(status_flags == GIT_STATUS_WT_NEW); -} - -/* this test is equivalent to t18-status.c:singlestatus4 */ -void test_status_worktree__single_folder(void) -{ - int error; - unsigned int status_flags; - git_repository *repo = cl_git_sandbox_init("status"); - - error = git_status_file(&status_flags, repo, "subdir"); - cl_git_fail(error); - cl_assert(error != GIT_ENOTFOUND); -} - - -void test_status_worktree__ignores(void) -{ - int i, ignored; - git_repository *repo = cl_git_sandbox_init("status"); - - for (i = 0; i < (int)entry_count0; i++) { - cl_git_pass( - git_status_should_ignore(&ignored, repo, entry_paths0[i]) - ); - cl_assert(ignored == (entry_statuses0[i] == GIT_STATUS_IGNORED)); - } - - cl_git_pass( - git_status_should_ignore(&ignored, repo, "nonexistent_file") - ); - cl_assert(!ignored); - - cl_git_pass( - git_status_should_ignore(&ignored, repo, "ignored_nonexistent_file") - ); - cl_assert(ignored); -} - -static int cb_status__check_592(const char *p, unsigned int s, void *payload) -{ - if (s != GIT_STATUS_WT_DELETED || - (payload != NULL && strcmp(p, (const char *)payload) != 0)) - return -1; - - return 0; -} - -void test_status_worktree__issue_592(void) -{ - git_repository *repo; - git_buf path = GIT_BUF_INIT; - - repo = cl_git_sandbox_init("issue_592"); - cl_git_pass(git_buf_joinpath(&path, git_repository_workdir(repo), "l.txt")); - cl_git_pass(p_unlink(git_buf_cstr(&path))); - cl_assert(!git_path_exists("issue_592/l.txt")); - - cl_git_pass(git_status_foreach(repo, cb_status__check_592, "l.txt")); - - git_buf_free(&path); -} - -void test_status_worktree__issue_592_2(void) -{ - git_repository *repo; - git_buf path = GIT_BUF_INIT; - - repo = cl_git_sandbox_init("issue_592"); - cl_git_pass(git_buf_joinpath(&path, git_repository_workdir(repo), "c/a.txt")); - cl_git_pass(p_unlink(git_buf_cstr(&path))); - cl_assert(!git_path_exists("issue_592/c/a.txt")); - - cl_git_pass(git_status_foreach(repo, cb_status__check_592, "c/a.txt")); - - git_buf_free(&path); -} - -void test_status_worktree__issue_592_3(void) -{ - git_repository *repo; - git_buf path = GIT_BUF_INIT; - - repo = cl_git_sandbox_init("issue_592"); - - cl_git_pass(git_buf_joinpath(&path, git_repository_workdir(repo), "c")); - cl_git_pass(git_futils_rmdir_r(git_buf_cstr(&path), NULL, GIT_RMDIR_REMOVE_FILES)); - cl_assert(!git_path_exists("issue_592/c/a.txt")); - - cl_git_pass(git_status_foreach(repo, cb_status__check_592, "c/a.txt")); - - git_buf_free(&path); -} - -void test_status_worktree__issue_592_4(void) -{ - git_repository *repo; - git_buf path = GIT_BUF_INIT; - - repo = cl_git_sandbox_init("issue_592"); - - cl_git_pass(git_buf_joinpath(&path, git_repository_workdir(repo), "t/b.txt")); - cl_git_pass(p_unlink(git_buf_cstr(&path))); - - cl_git_pass(git_status_foreach(repo, cb_status__check_592, "t/b.txt")); - - git_buf_free(&path); -} - -void test_status_worktree__issue_592_5(void) -{ - git_repository *repo; - git_buf path = GIT_BUF_INIT; - - repo = cl_git_sandbox_init("issue_592"); - - cl_git_pass(git_buf_joinpath(&path, git_repository_workdir(repo), "t")); - cl_git_pass(git_futils_rmdir_r(git_buf_cstr(&path), NULL, GIT_RMDIR_REMOVE_FILES)); - cl_git_pass(p_mkdir(git_buf_cstr(&path), 0777)); - - cl_git_pass(git_status_foreach(repo, cb_status__check_592, NULL)); - - git_buf_free(&path); -} - -void test_status_worktree__issue_592_ignores_0(void) -{ - int count = 0; - status_entry_single st; - git_repository *repo = cl_git_sandbox_init("issue_592"); - - cl_git_pass(git_status_foreach(repo, cb_status__count, &count)); - cl_assert_equal_i(0, count); - - cl_git_rewritefile("issue_592/.gitignore", - ".gitignore\n*.txt\nc/\n[tT]*/\n"); - - cl_git_pass(git_status_foreach(repo, cb_status__count, &count)); - cl_assert_equal_i(1, count); - - /* This is a situation where the behavior of libgit2 is - * different from core git. Core git will show ignored.txt - * in the list of ignored files, even though the directory - * "t" is ignored and the file is untracked because we have - * the explicit "*.txt" ignore rule. Libgit2 just excludes - * all untracked files that are contained within ignored - * directories without explicitly listing them. - */ - cl_git_rewritefile("issue_592/t/ignored.txt", "ping"); - - memset(&st, 0, sizeof(st)); - cl_git_pass(git_status_foreach(repo, cb_status__single, &st)); - cl_assert_equal_i(1, st.count); - cl_assert(st.status == GIT_STATUS_IGNORED); - - cl_git_rewritefile("issue_592/c/ignored_by_dir", "ping"); - - memset(&st, 0, sizeof(st)); - cl_git_pass(git_status_foreach(repo, cb_status__single, &st)); - cl_assert_equal_i(1, st.count); - cl_assert(st.status == GIT_STATUS_IGNORED); - - cl_git_rewritefile("issue_592/t/ignored_by_dir_pattern", "ping"); - - memset(&st, 0, sizeof(st)); - cl_git_pass(git_status_foreach(repo, cb_status__single, &st)); - cl_assert_equal_i(1, st.count); - cl_assert(st.status == GIT_STATUS_IGNORED); -} - -void test_status_worktree__issue_592_ignored_dirs_with_tracked_content(void) -{ - int count = 0; - git_repository *repo = cl_git_sandbox_init("issue_592b"); - - cl_git_pass(git_status_foreach(repo, cb_status__count, &count)); - cl_assert_equal_i(1, count); - - /* if we are really mimicking core git, then only ignored1.txt - * at the top level will show up in the ignores list here. - * everything else will be unmodified or skipped completely. - */ -} - -void test_status_worktree__conflict_with_diff3(void) -{ - git_repository *repo = cl_git_sandbox_init("status"); - git_index *index; - unsigned int status; - git_index_entry ancestor_entry, our_entry, their_entry; - - memset(&ancestor_entry, 0x0, sizeof(git_index_entry)); - memset(&our_entry, 0x0, sizeof(git_index_entry)); - memset(&their_entry, 0x0, sizeof(git_index_entry)); - - ancestor_entry.path = "modified_file"; - ancestor_entry.mode = 0100644; - git_oid_fromstr(&ancestor_entry.id, - "452e4244b5d083ddf0460acf1ecc74db9dcfa11a"); - - our_entry.path = "modified_file"; - our_entry.mode = 0100644; - git_oid_fromstr(&our_entry.id, - "452e4244b5d083ddf0460acf1ecc74db9dcfa11a"); - - their_entry.path = "modified_file"; - their_entry.mode = 0100644; - git_oid_fromstr(&their_entry.id, - "452e4244b5d083ddf0460acf1ecc74db9dcfa11a"); - - cl_git_pass(git_status_file(&status, repo, "modified_file")); - cl_assert_equal_i(GIT_STATUS_WT_MODIFIED, status); - - cl_git_pass(git_repository_index(&index, repo)); - cl_git_pass(git_index_remove(index, "modified_file", 0)); - cl_git_pass(git_index_conflict_add( - index, &ancestor_entry, &our_entry, &their_entry)); - cl_git_pass(git_index_write(index)); - git_index_free(index); - - cl_git_pass(git_status_file(&status, repo, "modified_file")); - - cl_assert_equal_i(GIT_STATUS_CONFLICTED, status); -} - -static const char *filemode_paths[] = { - "exec_off", - "exec_off2on_staged", - "exec_off2on_workdir", - "exec_off_untracked", - "exec_on", - "exec_on2off_staged", - "exec_on2off_workdir", - "exec_on_untracked", -}; - -static unsigned int filemode_statuses[] = { - GIT_STATUS_CURRENT, - GIT_STATUS_INDEX_MODIFIED, - GIT_STATUS_WT_MODIFIED, - GIT_STATUS_WT_NEW, - GIT_STATUS_CURRENT, - GIT_STATUS_INDEX_MODIFIED, - GIT_STATUS_WT_MODIFIED, - GIT_STATUS_WT_NEW -}; - -static const int filemode_count = 8; - -void test_status_worktree__filemode_changes(void) -{ - git_repository *repo = cl_git_sandbox_init("filemodes"); - status_entry_counts counts; - git_status_options opts = GIT_STATUS_OPTIONS_INIT; - - /* overwrite stored filemode with platform appropriate value */ - if (cl_is_chmod_supported()) - cl_repo_set_bool(repo, "core.filemode", true); - else { - int i; - - cl_repo_set_bool(repo, "core.filemode", false); - - /* won't trust filesystem mode diffs, so these will appear unchanged */ - for (i = 0; i < filemode_count; ++i) - if (filemode_statuses[i] == GIT_STATUS_WT_MODIFIED) - filemode_statuses[i] = GIT_STATUS_CURRENT; - } - - opts.flags = GIT_STATUS_OPT_INCLUDE_UNTRACKED | - GIT_STATUS_OPT_INCLUDE_IGNORED | - GIT_STATUS_OPT_INCLUDE_UNMODIFIED; - - memset(&counts, 0, sizeof(counts)); - counts.expected_entry_count = filemode_count; - counts.expected_paths = filemode_paths; - counts.expected_statuses = filemode_statuses; - - cl_git_pass( - git_status_foreach_ext(repo, &opts, cb_status__normal, &counts) - ); - - cl_assert_equal_i(counts.expected_entry_count, counts.entry_count); - cl_assert_equal_i(0, counts.wrong_status_flags_count); - cl_assert_equal_i(0, counts.wrong_sorted_path); -} - -static int cb_status__interrupt(const char *p, unsigned int s, void *payload) -{ - volatile int *count = (int *)payload; - - GIT_UNUSED(p); - GIT_UNUSED(s); - - (*count)++; - - return (*count == 8) ? -111 : 0; -} - -void test_status_worktree__interruptable_foreach(void) -{ - int count = 0; - git_repository *repo = cl_git_sandbox_init("status"); - - cl_assert_equal_i( - -111, git_status_foreach(repo, cb_status__interrupt, &count) - ); - - cl_assert_equal_i(8, count); -} - -void test_status_worktree__line_endings_dont_count_as_changes_with_autocrlf(void) -{ - git_repository *repo = cl_git_sandbox_init("status"); - unsigned int status; - - cl_repo_set_bool(repo, "core.autocrlf", true); - - cl_git_rewritefile("status/current_file", "current_file\r\n"); - - cl_git_pass(git_status_file(&status, repo, "current_file")); - - /* stat data on file should no longer match stat cache, even though - * file diff will be empty because of line-ending conversion - matches - * the Git command-line behavior here. - */ - cl_assert_equal_i(GIT_STATUS_WT_MODIFIED, status); -} - -void test_status_worktree__line_endings_dont_count_as_changes_with_autocrlf_issue_1397(void) -{ - git_repository *repo = cl_git_sandbox_init("issue_1397"); - unsigned int status; - - cl_repo_set_bool(repo, "core.autocrlf", true); - - cl_git_pass(git_status_file(&status, repo, "crlf_file.txt")); - - cl_assert_equal_i(GIT_STATUS_CURRENT, status); -} - -void test_status_worktree__conflicted_item(void) -{ - git_repository *repo = cl_git_sandbox_init("status"); - git_index *index; - unsigned int status; - git_index_entry ancestor_entry, our_entry, their_entry; - - memset(&ancestor_entry, 0x0, sizeof(git_index_entry)); - memset(&our_entry, 0x0, sizeof(git_index_entry)); - memset(&their_entry, 0x0, sizeof(git_index_entry)); - - ancestor_entry.mode = 0100644; - ancestor_entry.path = "modified_file"; - git_oid_fromstr(&ancestor_entry.id, - "452e4244b5d083ddf0460acf1ecc74db9dcfa11a"); - - our_entry.mode = 0100644; - our_entry.path = "modified_file"; - git_oid_fromstr(&our_entry.id, - "452e4244b5d083ddf0460acf1ecc74db9dcfa11a"); - - their_entry.mode = 0100644; - their_entry.path = "modified_file"; - git_oid_fromstr(&their_entry.id, - "452e4244b5d083ddf0460acf1ecc74db9dcfa11a"); - - cl_git_pass(git_status_file(&status, repo, "modified_file")); - cl_assert_equal_i(GIT_STATUS_WT_MODIFIED, status); - - cl_git_pass(git_repository_index(&index, repo)); - cl_git_pass(git_index_conflict_add(index, &ancestor_entry, - &our_entry, &their_entry)); - - cl_git_pass(git_status_file(&status, repo, "modified_file")); - cl_assert_equal_i(GIT_STATUS_CONFLICTED, status); - - git_index_free(index); -} - -void test_status_worktree__conflict_has_no_oid(void) -{ - git_repository *repo = cl_git_sandbox_init("status"); - git_index *index; - git_index_entry entry = {{0}}; - git_status_list *statuslist; - const git_status_entry *status; - git_oid zero_id = {{0}}; - - entry.mode = 0100644; - entry.path = "modified_file"; - git_oid_fromstr(&entry.id, "452e4244b5d083ddf0460acf1ecc74db9dcfa11a"); - - cl_git_pass(git_repository_index(&index, repo)); - cl_git_pass(git_index_conflict_add(index, &entry, &entry, &entry)); - - git_status_list_new(&statuslist, repo, NULL); - - cl_assert_equal_i(16, git_status_list_entrycount(statuslist)); - - status = git_status_byindex(statuslist, 2); - - cl_assert_equal_i(GIT_STATUS_CONFLICTED, status->status); - cl_assert_equal_s("modified_file", status->head_to_index->old_file.path); - cl_assert(!git_oid_equal(&zero_id, &status->head_to_index->old_file.id)); - cl_assert(0 != status->head_to_index->old_file.mode); - cl_assert_equal_s("modified_file", status->head_to_index->new_file.path); - cl_assert_equal_oid(&zero_id, &status->head_to_index->new_file.id); - cl_assert_equal_i(0, status->head_to_index->new_file.mode); - cl_assert_equal_i(0, status->head_to_index->new_file.size); - - cl_assert_equal_s("modified_file", status->index_to_workdir->old_file.path); - cl_assert_equal_oid(&zero_id, &status->index_to_workdir->old_file.id); - cl_assert_equal_i(0, status->index_to_workdir->old_file.mode); - cl_assert_equal_i(0, status->index_to_workdir->old_file.size); - cl_assert_equal_s("modified_file", status->index_to_workdir->new_file.path); - cl_assert( - !git_oid_equal(&zero_id, &status->index_to_workdir->new_file.id) || - !(status->index_to_workdir->new_file.flags & GIT_DIFF_FLAG_VALID_ID)); - cl_assert(0 != status->index_to_workdir->new_file.mode); - cl_assert(0 != status->index_to_workdir->new_file.size); - - git_index_free(index); - git_status_list_free(statuslist); -} - -static void stage_and_commit(git_repository *repo, const char *path) -{ - git_index *index; - - cl_git_pass(git_repository_index(&index, repo)); - cl_git_pass(git_index_add_bypath(index, path)); - cl_repo_commit_from_index(NULL, repo, NULL, 1323847743, "Initial commit\n"); - git_index_free(index); -} - -static void assert_ignore_case( - bool should_ignore_case, - int expected_lower_cased_file_status, - int expected_camel_cased_file_status) -{ - unsigned int status; - git_buf lower_case_path = GIT_BUF_INIT, camel_case_path = GIT_BUF_INIT; - git_repository *repo, *repo2; - - repo = cl_git_sandbox_init("empty_standard_repo"); - cl_git_remove_placeholders(git_repository_path(repo), "dummy-marker.txt"); - - cl_repo_set_bool(repo, "core.ignorecase", should_ignore_case); - - cl_git_pass(git_buf_joinpath(&lower_case_path, - git_repository_workdir(repo), "plop")); - - cl_git_mkfile(git_buf_cstr(&lower_case_path), ""); - - stage_and_commit(repo, "plop"); - - cl_git_pass(git_repository_open(&repo2, "./empty_standard_repo")); - - cl_git_pass(git_status_file(&status, repo2, "plop")); - cl_assert_equal_i(GIT_STATUS_CURRENT, status); - - cl_git_pass(git_buf_joinpath(&camel_case_path, - git_repository_workdir(repo), "Plop")); - - cl_git_pass(p_rename(git_buf_cstr(&lower_case_path), git_buf_cstr(&camel_case_path))); - - cl_git_pass(git_status_file(&status, repo2, "plop")); - cl_assert_equal_i(expected_lower_cased_file_status, status); - - cl_git_pass(git_status_file(&status, repo2, "Plop")); - cl_assert_equal_i(expected_camel_cased_file_status, status); - - git_repository_free(repo2); - git_buf_free(&lower_case_path); - git_buf_free(&camel_case_path); -} - -void test_status_worktree__file_status_honors_core_ignorecase_true(void) -{ - assert_ignore_case(true, GIT_STATUS_CURRENT, GIT_STATUS_CURRENT); -} - -void test_status_worktree__file_status_honors_core_ignorecase_false(void) -{ - assert_ignore_case(false, GIT_STATUS_WT_DELETED, GIT_STATUS_WT_NEW); -} - -void test_status_worktree__file_status_honors_case_ignorecase_regarding_untracked_files(void) -{ - git_repository *repo = cl_git_sandbox_init("status"); - unsigned int status; - git_index *index; - - cl_repo_set_bool(repo, "core.ignorecase", false); - - repo = cl_git_sandbox_reopen(); - - /* Actually returns GIT_STATUS_IGNORED on Windows */ - cl_git_fail_with(git_status_file(&status, repo, "NEW_FILE"), GIT_ENOTFOUND); - - cl_git_pass(git_repository_index(&index, repo)); - - cl_git_pass(git_index_add_bypath(index, "new_file")); - cl_git_pass(git_index_write(index)); - git_index_free(index); - - /* Actually returns GIT_STATUS_IGNORED on Windows */ - cl_git_fail_with(git_status_file(&status, repo, "NEW_FILE"), GIT_ENOTFOUND); -} - -void test_status_worktree__simple_delete(void) -{ - git_repository *repo = cl_git_sandbox_init("renames"); - git_status_options opts = GIT_STATUS_OPTIONS_INIT; - int count; - - opts.flags = GIT_STATUS_OPT_INCLUDE_UNTRACKED | - GIT_STATUS_OPT_DISABLE_PATHSPEC_MATCH | - GIT_STATUS_OPT_EXCLUDE_SUBMODULES | - GIT_STATUS_OPT_RECURSE_UNTRACKED_DIRS; - - count = 0; - cl_git_pass( - git_status_foreach_ext(repo, &opts, cb_status__count, &count) ); - cl_assert_equal_i(0, count); - - cl_must_pass(p_unlink("renames/untimely.txt")); - - count = 0; - cl_git_pass( - git_status_foreach_ext(repo, &opts, cb_status__count, &count) ); - cl_assert_equal_i(1, count); -} - -void test_status_worktree__simple_delete_indexed(void) -{ - git_repository *repo = cl_git_sandbox_init("renames"); - git_status_options opts = GIT_STATUS_OPTIONS_INIT; - git_status_list *status; - - opts.flags = GIT_STATUS_OPT_INCLUDE_UNTRACKED | - GIT_STATUS_OPT_DISABLE_PATHSPEC_MATCH | - GIT_STATUS_OPT_EXCLUDE_SUBMODULES | - GIT_STATUS_OPT_RECURSE_UNTRACKED_DIRS; - - cl_git_pass(git_status_list_new(&status, repo, &opts)); - cl_assert_equal_sz(0, git_status_list_entrycount(status)); - git_status_list_free(status); - - cl_must_pass(p_unlink("renames/untimely.txt")); - - cl_git_pass(git_status_list_new(&status, repo, &opts)); - cl_assert_equal_sz(1, git_status_list_entrycount(status)); - cl_assert_equal_i( - GIT_STATUS_WT_DELETED, git_status_byindex(status, 0)->status); - git_status_list_free(status); -} - -static const char *icase_paths[] = { "B", "c", "g", "H" }; -static unsigned int icase_statuses[] = { - GIT_STATUS_WT_MODIFIED, GIT_STATUS_WT_DELETED, - GIT_STATUS_WT_MODIFIED, GIT_STATUS_WT_DELETED, -}; - -static const char *case_paths[] = { "B", "H", "c", "g" }; -static unsigned int case_statuses[] = { - GIT_STATUS_WT_MODIFIED, GIT_STATUS_WT_DELETED, - GIT_STATUS_WT_DELETED, GIT_STATUS_WT_MODIFIED, -}; - -void test_status_worktree__sorting_by_case(void) -{ - git_repository *repo = cl_git_sandbox_init("icase"); - git_index *index; - git_status_options opts = GIT_STATUS_OPTIONS_INIT; - bool native_ignore_case; - status_entry_counts counts; - - cl_git_pass(git_repository_index(&index, repo)); - native_ignore_case = - (git_index_caps(index) & GIT_INDEXCAP_IGNORE_CASE) != 0; - git_index_free(index); - - memset(&counts, 0, sizeof(counts)); - counts.expected_entry_count = 0; - counts.expected_paths = NULL; - counts.expected_statuses = NULL; - cl_git_pass( - git_status_foreach_ext(repo, &opts, cb_status__normal, &counts)); - cl_assert_equal_i(counts.expected_entry_count, counts.entry_count); - cl_assert_equal_i(0, counts.wrong_status_flags_count); - cl_assert_equal_i(0, counts.wrong_sorted_path); - - cl_git_rewritefile("icase/B", "new stuff"); - cl_must_pass(p_unlink("icase/c")); - cl_git_rewritefile("icase/g", "new stuff"); - cl_must_pass(p_unlink("icase/H")); - - memset(&counts, 0, sizeof(counts)); - counts.expected_entry_count = 4; - if (native_ignore_case) { - counts.expected_paths = icase_paths; - counts.expected_statuses = icase_statuses; - } else { - counts.expected_paths = case_paths; - counts.expected_statuses = case_statuses; - } - cl_git_pass( - git_status_foreach_ext(repo, &opts, cb_status__normal, &counts)); - cl_assert_equal_i(counts.expected_entry_count, counts.entry_count); - cl_assert_equal_i(0, counts.wrong_status_flags_count); - cl_assert_equal_i(0, counts.wrong_sorted_path); - - opts.flags = GIT_STATUS_OPT_SORT_CASE_SENSITIVELY; - - memset(&counts, 0, sizeof(counts)); - counts.expected_entry_count = 4; - counts.expected_paths = case_paths; - counts.expected_statuses = case_statuses; - cl_git_pass( - git_status_foreach_ext(repo, &opts, cb_status__normal, &counts)); - cl_assert_equal_i(counts.expected_entry_count, counts.entry_count); - cl_assert_equal_i(0, counts.wrong_status_flags_count); - cl_assert_equal_i(0, counts.wrong_sorted_path); - - opts.flags = GIT_STATUS_OPT_SORT_CASE_INSENSITIVELY; - - memset(&counts, 0, sizeof(counts)); - counts.expected_entry_count = 4; - counts.expected_paths = icase_paths; - counts.expected_statuses = icase_statuses; - cl_git_pass( - git_status_foreach_ext(repo, &opts, cb_status__normal, &counts)); - cl_assert_equal_i(counts.expected_entry_count, counts.entry_count); - cl_assert_equal_i(0, counts.wrong_status_flags_count); - cl_assert_equal_i(0, counts.wrong_sorted_path); -} - -void test_status_worktree__long_filenames(void) -{ - char path[260*4+1]; - const char *expected_paths[] = {path}; - const unsigned int expected_statuses[] = {GIT_STATUS_WT_NEW}; - - git_repository *repo = cl_git_sandbox_init("empty_standard_repo"); - git_status_options opts = GIT_STATUS_OPTIONS_INIT; - status_entry_counts counts = {0}; - - // Create directory with amazingly long filename - sprintf(path, "empty_standard_repo/%s", longname); - cl_git_pass(git_futils_mkdir_r(path, 0777)); - sprintf(path, "empty_standard_repo/%s/foo", longname); - cl_git_mkfile(path, "dummy"); - - sprintf(path, "%s/foo", longname); - counts.expected_entry_count = 1; - counts.expected_paths = expected_paths; - counts.expected_statuses = expected_statuses; - - opts.show = GIT_STATUS_SHOW_WORKDIR_ONLY; - opts.flags = GIT_STATUS_OPT_DEFAULTS; - - cl_git_pass( - git_status_foreach_ext(repo, &opts, cb_status__normal, &counts) ); - cl_assert_equal_i(counts.expected_entry_count, counts.entry_count); - cl_assert_equal_i(0, counts.wrong_status_flags_count); - cl_assert_equal_i(0, counts.wrong_sorted_path); -} - -/* The update stat cache tests mostly just mirror other tests and try - * to make sure that updating the stat cache doesn't change the results - * while reducing the amount of work that needs to be done - */ - -static void check_status0(git_status_list *status) -{ - size_t i, max_i = git_status_list_entrycount(status); - cl_assert_equal_sz(entry_count0, max_i); - for (i = 0; i < max_i; ++i) { - const git_status_entry *entry = git_status_byindex(status, i); - cl_assert_equal_i(entry_statuses0[i], entry->status); - } -} - -void test_status_worktree__update_stat_cache_0(void) -{ - git_repository *repo = cl_git_sandbox_init("status"); - git_status_options opts = GIT_STATUS_OPTIONS_INIT; - git_status_list *status; - git_diff_perfdata perf = GIT_DIFF_PERFDATA_INIT; - git_index *index; - - opts.flags = GIT_STATUS_OPT_DEFAULTS; - - cl_git_pass(git_status_list_new(&status, repo, &opts)); - check_status0(status); - cl_git_pass(git_status_list_get_perfdata(&perf, status)); - cl_assert_equal_sz(13 + 3, perf.stat_calls); - cl_assert_equal_sz(5, perf.oid_calculations); - - git_status_list_free(status); - - /* tick the index so we avoid recalculating racily-clean entries */ - cl_git_pass(git_repository_index__weakptr(&index, repo)); - tick_index(index); - - opts.flags |= GIT_STATUS_OPT_UPDATE_INDEX; - - cl_git_pass(git_status_list_new(&status, repo, &opts)); - check_status0(status); - cl_git_pass(git_status_list_get_perfdata(&perf, status)); - cl_assert_equal_sz(13 + 3, perf.stat_calls); - cl_assert_equal_sz(5, perf.oid_calculations); - - git_status_list_free(status); - - opts.flags &= ~GIT_STATUS_OPT_UPDATE_INDEX; - - /* tick again as the index updating from the previous diff might have reset the timestamp */ - tick_index(index); - cl_git_pass(git_status_list_new(&status, repo, &opts)); - check_status0(status); - cl_git_pass(git_status_list_get_perfdata(&perf, status)); - cl_assert_equal_sz(13 + 3, perf.stat_calls); - cl_assert_equal_sz(0, perf.oid_calculations); - - git_status_list_free(status); -} - -void test_status_worktree__unreadable(void) -{ -#ifndef GIT_WIN32 - const char *expected_paths[] = { "no_permission/foo" }; - const unsigned int expected_statuses[] = {GIT_STATUS_WT_UNREADABLE}; - - git_repository *repo = cl_git_sandbox_init("empty_standard_repo"); - git_status_options opts = GIT_STATUS_OPTIONS_INIT; - status_entry_counts counts = {0}; - - if (geteuid() == 0) - cl_skip(); - - /* Create directory with no read permission */ - cl_git_pass(git_futils_mkdir_r("empty_standard_repo/no_permission", 0777)); - cl_git_mkfile("empty_standard_repo/no_permission/foo", "dummy"); - p_chmod("empty_standard_repo/no_permission", 0644); - - counts.expected_entry_count = 1; - counts.expected_paths = expected_paths; - counts.expected_statuses = expected_statuses; - - opts.show = GIT_STATUS_SHOW_WORKDIR_ONLY; - opts.flags = GIT_STATUS_OPT_DEFAULTS | GIT_STATUS_OPT_INCLUDE_UNREADABLE; - - cl_git_pass( - git_status_foreach_ext(repo, &opts, cb_status__normal, &counts) ); - - /* Restore permissions so we can cleanup :) */ - p_chmod("empty_standard_repo/no_permission", 0777); - - cl_assert_equal_i(counts.expected_entry_count, counts.entry_count); - cl_assert_equal_i(0, counts.wrong_status_flags_count); - cl_assert_equal_i(0, counts.wrong_sorted_path); -#endif -} - -void test_status_worktree__unreadable_not_included(void) -{ -#ifndef GIT_WIN32 - const char *expected_paths[] = { "no_permission/" }; - const unsigned int expected_statuses[] = {GIT_STATUS_WT_NEW}; - - git_repository *repo = cl_git_sandbox_init("empty_standard_repo"); - git_status_options opts = GIT_STATUS_OPTIONS_INIT; - status_entry_counts counts = {0}; - - /* Create directory with no read permission */ - cl_git_pass(git_futils_mkdir_r("empty_standard_repo/no_permission", 0777)); - cl_git_mkfile("empty_standard_repo/no_permission/foo", "dummy"); - p_chmod("empty_standard_repo/no_permission", 0644); - - counts.expected_entry_count = 1; - counts.expected_paths = expected_paths; - counts.expected_statuses = expected_statuses; - - opts.show = GIT_STATUS_SHOW_WORKDIR_ONLY; - opts.flags = (GIT_STATUS_OPT_INCLUDE_IGNORED | GIT_STATUS_OPT_INCLUDE_UNTRACKED); - - cl_git_pass( - git_status_foreach_ext(repo, &opts, cb_status__normal, &counts) ); - - /* Restore permissions so we can cleanup :) */ - p_chmod("empty_standard_repo/no_permission", 0777); - - cl_assert_equal_i(counts.expected_entry_count, counts.entry_count); - cl_assert_equal_i(0, counts.wrong_status_flags_count); - cl_assert_equal_i(0, counts.wrong_sorted_path); -#endif -} - -void test_status_worktree__unreadable_as_untracked(void) -{ - const char *expected_paths[] = { "no_permission/foo" }; - const unsigned int expected_statuses[] = {GIT_STATUS_WT_NEW}; - - git_repository *repo = cl_git_sandbox_init("empty_standard_repo"); - git_status_options opts = GIT_STATUS_OPTIONS_INIT; - status_entry_counts counts = {0}; - - /* Create directory with no read permission */ - cl_git_pass(git_futils_mkdir_r("empty_standard_repo/no_permission", 0777)); - cl_git_mkfile("empty_standard_repo/no_permission/foo", "dummy"); - p_chmod("empty_standard_repo/no_permission", 0644); - - counts.expected_entry_count = 1; - counts.expected_paths = expected_paths; - counts.expected_statuses = expected_statuses; - - opts.show = GIT_STATUS_SHOW_WORKDIR_ONLY; - opts.flags = GIT_STATUS_OPT_DEFAULTS | - GIT_STATUS_OPT_INCLUDE_UNREADABLE | - GIT_STATUS_OPT_INCLUDE_UNREADABLE_AS_UNTRACKED; - - cl_git_pass( - git_status_foreach_ext(repo, &opts, cb_status__normal, &counts) ); - - /* Restore permissions so we can cleanup :) */ - p_chmod("empty_standard_repo/no_permission", 0777); - - cl_assert_equal_i(counts.expected_entry_count, counts.entry_count); - cl_assert_equal_i(0, counts.wrong_status_flags_count); - cl_assert_equal_i(0, counts.wrong_sorted_path); -} - -void test_status_worktree__update_index_with_symlink_doesnt_change_mode(void) -{ - git_repository *repo = cl_git_sandbox_init("testrepo"); - git_reference *head; - git_object *head_object; - git_index *index; - const git_index_entry *idx_entry; - git_status_options opts = GIT_STATUS_OPTIONS_INIT; - status_entry_counts counts = {0}; - const char *expected_paths[] = { "README" }; - const unsigned int expected_statuses[] = {GIT_STATUS_WT_NEW}; - - opts.show = GIT_STATUS_SHOW_INDEX_AND_WORKDIR; - opts.flags = GIT_STATUS_OPT_DEFAULTS | GIT_STATUS_OPT_UPDATE_INDEX; - - cl_git_pass(git_repository_head(&head, repo)); - cl_git_pass(git_reference_peel(&head_object, head, GIT_OBJ_COMMIT)); - - cl_git_pass(git_reset(repo, head_object, GIT_RESET_HARD, NULL)); - - cl_git_rewritefile("testrepo/README", "This was rewritten."); - - /* this status rewrites the index because we have changed the - * contents of a tracked file - */ - counts.expected_entry_count = 1; - counts.expected_paths = expected_paths; - counts.expected_statuses = expected_statuses; - - cl_git_pass( - git_status_foreach_ext(repo, &opts, cb_status__normal, &counts)); - cl_assert_equal_i(1, counts.entry_count); - - /* now ensure that the status's rewrite of the index did not screw - * up the mode of the symlink `link_to_new.txt`, particularly - * on platforms that don't support symlinks - */ - cl_git_pass(git_repository_index(&index, repo)); - cl_git_pass(git_index_read(index, true)); - - cl_assert(idx_entry = git_index_get_bypath(index, "link_to_new.txt", 0)); - cl_assert(S_ISLNK(idx_entry->mode)); - - git_index_free(index); - git_object_free(head_object); - git_reference_free(head); -} - diff --git a/vendor/libgit2/tests/status/worktree_init.c b/vendor/libgit2/tests/status/worktree_init.c deleted file mode 100644 index 9d5cfa5a3..000000000 --- a/vendor/libgit2/tests/status/worktree_init.c +++ /dev/null @@ -1,338 +0,0 @@ -#include "clar_libgit2.h" -#include "git2/sys/repository.h" - -#include "fileops.h" -#include "ignore.h" -#include "status_helpers.h" -#include "posix.h" -#include "util.h" -#include "path.h" - -static void cleanup_new_repo(void *path) -{ - cl_fixture_cleanup((char *)path); -} - -void test_status_worktree_init__cannot_retrieve_the_status_of_a_bare_repository(void) -{ - git_repository *repo; - unsigned int status = 0; - - cl_git_pass(git_repository_open(&repo, cl_fixture("testrepo.git"))); - cl_assert_equal_i(GIT_EBAREREPO, git_status_file(&status, repo, "dummy")); - git_repository_free(repo); -} - -void test_status_worktree_init__first_commit_in_progress(void) -{ - git_repository *repo; - git_index *index; - status_entry_single result; - - cl_set_cleanup(&cleanup_new_repo, "getting_started"); - - cl_git_pass(git_repository_init(&repo, "getting_started", 0)); - cl_git_mkfile("getting_started/testfile.txt", "content\n"); - - memset(&result, 0, sizeof(result)); - cl_git_pass(git_status_foreach(repo, cb_status__single, &result)); - cl_assert_equal_i(1, result.count); - cl_assert(result.status == GIT_STATUS_WT_NEW); - - cl_git_pass(git_repository_index(&index, repo)); - cl_git_pass(git_index_add_bypath(index, "testfile.txt")); - cl_git_pass(git_index_write(index)); - - memset(&result, 0, sizeof(result)); - cl_git_pass(git_status_foreach(repo, cb_status__single, &result)); - cl_assert_equal_i(1, result.count); - cl_assert(result.status == GIT_STATUS_INDEX_NEW); - - git_index_free(index); - git_repository_free(repo); -} - - - -void test_status_worktree_init__status_file_without_index_or_workdir(void) -{ - git_repository *repo; - unsigned int status = 0; - git_index *index; - - cl_git_pass(p_mkdir("wd", 0777)); - - cl_git_pass(git_repository_open(&repo, cl_fixture("testrepo.git"))); - cl_git_pass(git_repository_set_workdir(repo, "wd", false)); - - cl_git_pass(git_index_open(&index, "empty-index")); - cl_assert_equal_i(0, (int)git_index_entrycount(index)); - git_repository_set_index(repo, index); - - cl_git_pass(git_status_file(&status, repo, "branch_file.txt")); - - cl_assert_equal_i(GIT_STATUS_INDEX_DELETED, status); - - git_repository_free(repo); - git_index_free(index); - cl_git_pass(p_rmdir("wd")); -} - -static void fill_index_wth_head_entries(git_repository *repo, git_index *index) -{ - git_oid oid; - git_commit *commit; - git_tree *tree; - - cl_git_pass(git_reference_name_to_id(&oid, repo, "HEAD")); - cl_git_pass(git_commit_lookup(&commit, repo, &oid)); - cl_git_pass(git_commit_tree(&tree, commit)); - - cl_git_pass(git_index_read_tree(index, tree)); - cl_git_pass(git_index_write(index)); - - git_tree_free(tree); - git_commit_free(commit); -} - -void test_status_worktree_init__status_file_with_clean_index_and_empty_workdir(void) -{ - git_repository *repo; - unsigned int status = 0; - git_index *index; - - cl_git_pass(p_mkdir("wd", 0777)); - - cl_git_pass(git_repository_open(&repo, cl_fixture("testrepo.git"))); - cl_git_pass(git_repository_set_workdir(repo, "wd", false)); - - cl_git_pass(git_index_open(&index, "my-index")); - fill_index_wth_head_entries(repo, index); - - git_repository_set_index(repo, index); - - cl_git_pass(git_status_file(&status, repo, "branch_file.txt")); - - cl_assert_equal_i(GIT_STATUS_WT_DELETED, status); - - git_repository_free(repo); - git_index_free(index); - cl_git_pass(p_rmdir("wd")); - cl_git_pass(p_unlink("my-index")); -} - -void test_status_worktree_init__bracket_in_filename(void) -{ - git_repository *repo; - git_index *index; - status_entry_single result; - unsigned int status_flags; - - #define FILE_WITH_BRACKET "LICENSE[1].md" - #define FILE_WITHOUT_BRACKET "LICENSE1.md" - - cl_set_cleanup(&cleanup_new_repo, "with_bracket"); - - cl_git_pass(git_repository_init(&repo, "with_bracket", 0)); - cl_git_mkfile("with_bracket/" FILE_WITH_BRACKET, "I have a bracket in my name\n"); - - /* file is new to working directory */ - - memset(&result, 0, sizeof(result)); - cl_git_pass(git_status_foreach(repo, cb_status__single, &result)); - cl_assert_equal_i(1, result.count); - cl_assert(result.status == GIT_STATUS_WT_NEW); - - cl_git_pass(git_status_file(&status_flags, repo, FILE_WITH_BRACKET)); - cl_assert(status_flags == GIT_STATUS_WT_NEW); - - /* ignore the file */ - - cl_git_rewritefile("with_bracket/.gitignore", "*.md\n.gitignore\n"); - - memset(&result, 0, sizeof(result)); - cl_git_pass(git_status_foreach(repo, cb_status__single, &result)); - cl_assert_equal_i(2, result.count); - cl_assert(result.status == GIT_STATUS_IGNORED); - - cl_git_pass(git_status_file(&status_flags, repo, FILE_WITH_BRACKET)); - cl_assert(status_flags == GIT_STATUS_IGNORED); - - /* don't ignore the file */ - - cl_git_rewritefile("with_bracket/.gitignore", ".gitignore\n"); - - memset(&result, 0, sizeof(result)); - cl_git_pass(git_status_foreach(repo, cb_status__single, &result)); - cl_assert_equal_i(2, result.count); - cl_assert(result.status == GIT_STATUS_WT_NEW); - - cl_git_pass(git_status_file(&status_flags, repo, FILE_WITH_BRACKET)); - cl_assert(status_flags == GIT_STATUS_WT_NEW); - - /* add the file to the index */ - - cl_git_pass(git_repository_index(&index, repo)); - cl_git_pass(git_index_add_bypath(index, FILE_WITH_BRACKET)); - cl_git_pass(git_index_write(index)); - - memset(&result, 0, sizeof(result)); - cl_git_pass(git_status_foreach(repo, cb_status__single, &result)); - cl_assert_equal_i(2, result.count); - cl_assert(result.status == GIT_STATUS_INDEX_NEW); - - cl_git_pass(git_status_file(&status_flags, repo, FILE_WITH_BRACKET)); - cl_assert(status_flags == GIT_STATUS_INDEX_NEW); - - /* Create file without bracket */ - - cl_git_mkfile("with_bracket/" FILE_WITHOUT_BRACKET, "I have no bracket in my name!\n"); - - cl_git_pass(git_status_file(&status_flags, repo, FILE_WITHOUT_BRACKET)); - cl_assert(status_flags == GIT_STATUS_WT_NEW); - - cl_git_fail_with(git_status_file(&status_flags, repo, "LICENSE\\[1\\].md"), GIT_ENOTFOUND); - - cl_git_pass(git_status_file(&status_flags, repo, FILE_WITH_BRACKET)); - cl_assert(status_flags == GIT_STATUS_INDEX_NEW); - - git_index_free(index); - git_repository_free(repo); -} - -void test_status_worktree_init__space_in_filename(void) -{ - git_repository *repo; - git_index *index; - status_entry_single result; - unsigned int status_flags; - -#define FILE_WITH_SPACE "LICENSE - copy.md" - - cl_set_cleanup(&cleanup_new_repo, "with_space"); - cl_git_pass(git_repository_init(&repo, "with_space", 0)); - cl_git_mkfile("with_space/" FILE_WITH_SPACE, "I have a space in my name\n"); - - /* file is new to working directory */ - - memset(&result, 0, sizeof(result)); - cl_git_pass(git_status_foreach(repo, cb_status__single, &result)); - cl_assert_equal_i(1, result.count); - cl_assert(result.status == GIT_STATUS_WT_NEW); - - cl_git_pass(git_status_file(&status_flags, repo, FILE_WITH_SPACE)); - cl_assert(status_flags == GIT_STATUS_WT_NEW); - - /* ignore the file */ - - cl_git_rewritefile("with_space/.gitignore", "*.md\n.gitignore\n"); - - memset(&result, 0, sizeof(result)); - cl_git_pass(git_status_foreach(repo, cb_status__single, &result)); - cl_assert_equal_i(2, result.count); - cl_assert(result.status == GIT_STATUS_IGNORED); - - cl_git_pass(git_status_file(&status_flags, repo, FILE_WITH_SPACE)); - cl_assert(status_flags == GIT_STATUS_IGNORED); - - /* don't ignore the file */ - - cl_git_rewritefile("with_space/.gitignore", ".gitignore\n"); - - memset(&result, 0, sizeof(result)); - cl_git_pass(git_status_foreach(repo, cb_status__single, &result)); - cl_assert_equal_i(2, result.count); - cl_assert(result.status == GIT_STATUS_WT_NEW); - - cl_git_pass(git_status_file(&status_flags, repo, FILE_WITH_SPACE)); - cl_assert(status_flags == GIT_STATUS_WT_NEW); - - /* add the file to the index */ - - cl_git_pass(git_repository_index(&index, repo)); - cl_git_pass(git_index_add_bypath(index, FILE_WITH_SPACE)); - cl_git_pass(git_index_write(index)); - - memset(&result, 0, sizeof(result)); - cl_git_pass(git_status_foreach(repo, cb_status__single, &result)); - cl_assert_equal_i(2, result.count); - cl_assert(result.status == GIT_STATUS_INDEX_NEW); - - cl_git_pass(git_status_file(&status_flags, repo, FILE_WITH_SPACE)); - cl_assert(status_flags == GIT_STATUS_INDEX_NEW); - - git_index_free(index); - git_repository_free(repo); -} - -static int cb_status__expected_path(const char *p, unsigned int s, void *payload) -{ - const char *expected_path = (const char *)payload; - - GIT_UNUSED(s); - - if (payload == NULL) - cl_fail("Unexpected path"); - - cl_assert_equal_s(expected_path, p); - - return 0; -} - -void test_status_worktree_init__disable_pathspec_match(void) -{ - git_repository *repo; - git_status_options opts = GIT_STATUS_OPTIONS_INIT; - char *file_with_bracket = "LICENSE[1].md", - *imaginary_file_with_bracket = "LICENSE[1-2].md"; - - cl_set_cleanup(&cleanup_new_repo, "pathspec"); - cl_git_pass(git_repository_init(&repo, "pathspec", 0)); - cl_git_mkfile("pathspec/LICENSE[1].md", "screaming bracket\n"); - cl_git_mkfile("pathspec/LICENSE1.md", "no bracket\n"); - - opts.flags = GIT_STATUS_OPT_INCLUDE_UNTRACKED | - GIT_STATUS_OPT_DISABLE_PATHSPEC_MATCH; - opts.pathspec.count = 1; - opts.pathspec.strings = &file_with_bracket; - - cl_git_pass( - git_status_foreach_ext(repo, &opts, cb_status__expected_path, - file_with_bracket) - ); - - /* Test passing a pathspec matching files in the workdir. */ - /* Must not match because pathspecs are disabled. */ - opts.pathspec.strings = &imaginary_file_with_bracket; - cl_git_pass( - git_status_foreach_ext(repo, &opts, cb_status__expected_path, NULL) - ); - - git_repository_free(repo); -} - -void test_status_worktree_init__new_staged_file_must_handle_crlf(void) -{ - git_repository *repo; - git_index *index; - unsigned int status; - - cl_set_cleanup(&cleanup_new_repo, "getting_started"); - cl_git_pass(git_repository_init(&repo, "getting_started", 0)); - - /* Ensure that repo has core.autocrlf=true */ - cl_repo_set_bool(repo, "core.autocrlf", true); - - cl_git_mkfile("getting_started/testfile.txt", "content\r\n"); /* Content with CRLF */ - - cl_git_pass(git_repository_index(&index, repo)); - cl_git_pass(git_index_add_bypath(index, "testfile.txt")); - cl_git_pass(git_index_write(index)); - - cl_git_pass(git_status_file(&status, repo, "testfile.txt")); - cl_assert_equal_i(GIT_STATUS_INDEX_NEW, status); - - git_index_free(index); - git_repository_free(repo); -} - diff --git a/vendor/libgit2/tests/stress/diff.c b/vendor/libgit2/tests/stress/diff.c deleted file mode 100644 index a3ba4fab3..000000000 --- a/vendor/libgit2/tests/stress/diff.c +++ /dev/null @@ -1,146 +0,0 @@ -#include "clar_libgit2.h" -#include "../diff/diff_helpers.h" - -static git_repository *g_repo = NULL; - -void test_stress_diff__initialize(void) -{ -} - -void test_stress_diff__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -#define ANOTHER_POEM \ -"OH, glorious are the guarded heights\nWhere guardian souls abide—\nSelf-exiled from our gross delights—\nAbove, beyond, outside:\nAn ampler arc their spirit swings—\nCommands a juster view—\nWe have their word for all these things,\nNo doubt their words are true.\n\nYet we, the bond slaves of our day,\nWhom dirt and danger press—\nCo-heirs of insolence, delay,\nAnd leagued unfaithfulness—\nSuch is our need must seek indeed\nAnd, having found, engage\nThe men who merely do the work\nFor which they draw the wage.\n\nFrom forge and farm and mine and bench,\nDeck, altar, outpost lone—\nMill, school, battalion, counter, trench,\nRail, senate, sheepfold, throne—\nCreation's cry goes up on high\nFrom age to cheated age:\n\"Send us the men who do the work\n\"For which they draw the wage!\"\n" - -static void test_with_many(int expected_new) -{ - git_index *index; - git_tree *tree, *new_tree; - git_diff *diff = NULL; - diff_expects exp; - git_diff_options diffopts = GIT_DIFF_OPTIONS_INIT; - git_diff_find_options opts = GIT_DIFF_FIND_OPTIONS_INIT; - - cl_git_pass(git_repository_index(&index, g_repo)); - cl_git_pass( - git_revparse_single((git_object **)&tree, g_repo, "HEAD^{tree}")); - - cl_git_pass(p_rename("renames/ikeepsix.txt", "renames/ikeepsix2.txt")); - cl_git_pass(git_index_remove_bypath(index, "ikeepsix.txt")); - cl_git_pass(git_index_add_bypath(index, "ikeepsix2.txt")); - cl_git_pass(git_index_write(index)); - - cl_git_pass(git_diff_tree_to_index(&diff, g_repo, tree, index, &diffopts)); - - memset(&exp, 0, sizeof(exp)); - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, NULL, NULL, NULL, &exp)); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(expected_new + 1, exp.file_status[GIT_DELTA_ADDED]); - cl_assert_equal_i(expected_new + 2, exp.files); - - opts.flags = GIT_DIFF_FIND_ALL; - cl_git_pass(git_diff_find_similar(diff, &opts)); - - memset(&exp, 0, sizeof(exp)); - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, NULL, NULL, NULL, &exp)); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_RENAMED]); - cl_assert_equal_i(expected_new, exp.file_status[GIT_DELTA_ADDED]); - cl_assert_equal_i(expected_new + 1, exp.files); - - git_diff_free(diff); - - cl_repo_commit_from_index(NULL, g_repo, NULL, 1372350000, "yoyoyo"); - cl_git_pass(git_revparse_single( - (git_object **)&new_tree, g_repo, "HEAD^{tree}")); - - cl_git_pass(git_diff_tree_to_tree( - &diff, g_repo, tree, new_tree, &diffopts)); - - memset(&exp, 0, sizeof(exp)); - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, NULL, NULL, NULL, &exp)); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_DELETED]); - cl_assert_equal_i(expected_new + 1, exp.file_status[GIT_DELTA_ADDED]); - cl_assert_equal_i(expected_new + 2, exp.files); - - opts.flags = GIT_DIFF_FIND_ALL; - cl_git_pass(git_diff_find_similar(diff, &opts)); - - memset(&exp, 0, sizeof(exp)); - cl_git_pass(git_diff_foreach( - diff, diff_file_cb, NULL, NULL, NULL, &exp)); - cl_assert_equal_i(1, exp.file_status[GIT_DELTA_RENAMED]); - cl_assert_equal_i(expected_new, exp.file_status[GIT_DELTA_ADDED]); - cl_assert_equal_i(expected_new + 1, exp.files); - - git_diff_free(diff); - - git_tree_free(new_tree); - git_tree_free(tree); - git_index_free(index); -} - -void test_stress_diff__rename_big_files(void) -{ - git_index *index; - char tmp[64]; - int i, j; - git_buf b = GIT_BUF_INIT; - - g_repo = cl_git_sandbox_init("renames"); - - cl_git_pass(git_repository_index(&index, g_repo)); - - for (i = 0; i < 100; i += 1) { - p_snprintf(tmp, sizeof(tmp), "renames/newfile%03d", i); - for (j = i * 256; j > 0; --j) - git_buf_printf(&b, "more content %d\n", i); - cl_git_mkfile(tmp, b.ptr); - } - - for (i = 0; i < 100; i += 1) { - p_snprintf(tmp, sizeof(tmp), "renames/newfile%03d", i); - cl_git_pass(git_index_add_bypath(index, tmp + strlen("renames/"))); - } - - git_buf_free(&b); - git_index_free(index); - - test_with_many(100); -} - -void test_stress_diff__rename_many_files(void) -{ - git_index *index; - char tmp[64]; - int i; - git_buf b = GIT_BUF_INIT; - - g_repo = cl_git_sandbox_init("renames"); - - cl_git_pass(git_repository_index(&index, g_repo)); - - git_buf_printf(&b, "%08d\n" ANOTHER_POEM "%08d\n" ANOTHER_POEM ANOTHER_POEM, 0, 0); - - for (i = 0; i < 2500; i += 1) { - p_snprintf(tmp, sizeof(tmp), "renames/newfile%03d", i); - p_snprintf(b.ptr, 9, "%08d", i); - b.ptr[8] = '\n'; - cl_git_mkfile(tmp, b.ptr); - } - git_buf_free(&b); - - for (i = 0; i < 2500; i += 1) { - p_snprintf(tmp, sizeof(tmp), "renames/newfile%03d", i); - cl_git_pass(git_index_add_bypath(index, tmp + strlen("renames/"))); - } - - git_index_free(index); - - test_with_many(2500); -} diff --git a/vendor/libgit2/tests/submodule/add.c b/vendor/libgit2/tests/submodule/add.c deleted file mode 100644 index c3b3e6364..000000000 --- a/vendor/libgit2/tests/submodule/add.c +++ /dev/null @@ -1,130 +0,0 @@ -#include "clar_libgit2.h" -#include "posix.h" -#include "path.h" -#include "submodule_helpers.h" -#include "config/config_helpers.h" -#include "fileops.h" -#include "repository.h" - -static git_repository *g_repo = NULL; - -void test_submodule_add__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -static void assert_submodule_url(const char* name, const char *url) -{ - git_buf key = GIT_BUF_INIT; - - - cl_git_pass(git_buf_printf(&key, "submodule.%s.url", name)); - assert_config_entry_value(g_repo, git_buf_cstr(&key), url); - - git_buf_free(&key); -} - -void test_submodule_add__url_absolute(void) -{ - git_submodule *sm; - git_repository *repo; - git_buf dot_git_content = GIT_BUF_INIT; - - g_repo = setup_fixture_submod2(); - - /* re-add existing submodule */ - cl_git_fail_with( - GIT_EEXISTS, - git_submodule_add_setup(NULL, g_repo, "whatever", "sm_unchanged", 1)); - - /* add a submodule using a gitlink */ - - cl_git_pass( - git_submodule_add_setup(&sm, g_repo, "https://github.com/libgit2/libgit2.git", "sm_libgit2", 1) - ); - git_submodule_free(sm); - - cl_assert(git_path_isfile("submod2/" "sm_libgit2" "/.git")); - - cl_assert(git_path_isdir("submod2/.git/modules")); - cl_assert(git_path_isdir("submod2/.git/modules/" "sm_libgit2")); - cl_assert(git_path_isfile("submod2/.git/modules/" "sm_libgit2" "/HEAD")); - assert_submodule_url("sm_libgit2", "https://github.com/libgit2/libgit2.git"); - - cl_git_pass(git_repository_open(&repo, "submod2/" "sm_libgit2")); - - /* Verify worktree path is relative */ - assert_config_entry_value(repo, "core.worktree", "../../../sm_libgit2/"); - - /* Verify gitdir path is relative */ - cl_git_pass(git_futils_readbuffer(&dot_git_content, "submod2/" "sm_libgit2" "/.git")); - cl_assert_equal_s("gitdir: ../.git/modules/sm_libgit2/", dot_git_content.ptr); - - git_repository_free(repo); - git_buf_free(&dot_git_content); - - /* add a submodule not using a gitlink */ - - cl_git_pass( - git_submodule_add_setup(&sm, g_repo, "https://github.com/libgit2/libgit2.git", "sm_libgit2b", 0) - ); - git_submodule_free(sm); - - cl_assert(git_path_isdir("submod2/" "sm_libgit2b" "/.git")); - cl_assert(git_path_isfile("submod2/" "sm_libgit2b" "/.git/HEAD")); - cl_assert(!git_path_exists("submod2/.git/modules/" "sm_libgit2b")); - assert_submodule_url("sm_libgit2b", "https://github.com/libgit2/libgit2.git"); -} - -void test_submodule_add__url_relative(void) -{ - git_submodule *sm; - git_remote *remote; - git_strarray problems = {0}; - - /* default remote url is https://github.com/libgit2/false.git */ - g_repo = cl_git_sandbox_init("testrepo2"); - - /* make sure we don't default to origin - rename origin -> test_remote */ - cl_git_pass(git_remote_rename(&problems, g_repo, "origin", "test_remote")); - cl_assert_equal_i(0, problems.count); - git_strarray_free(&problems); - cl_git_fail(git_remote_lookup(&remote, g_repo, "origin")); - - cl_git_pass( - git_submodule_add_setup(&sm, g_repo, "../TestGitRepository", "TestGitRepository", 1) - ); - git_submodule_free(sm); - - assert_submodule_url("TestGitRepository", "https://github.com/libgit2/TestGitRepository"); -} - -void test_submodule_add__url_relative_to_origin(void) -{ - git_submodule *sm; - - /* default remote url is https://github.com/libgit2/false.git */ - g_repo = cl_git_sandbox_init("testrepo2"); - - cl_git_pass( - git_submodule_add_setup(&sm, g_repo, "../TestGitRepository", "TestGitRepository", 1) - ); - git_submodule_free(sm); - - assert_submodule_url("TestGitRepository", "https://github.com/libgit2/TestGitRepository"); -} - -void test_submodule_add__url_relative_to_workdir(void) -{ - git_submodule *sm; - - /* In this repo, HEAD (master) has no remote tracking branc h*/ - g_repo = cl_git_sandbox_init("testrepo"); - - cl_git_pass( - git_submodule_add_setup(&sm, g_repo, "./", "TestGitRepository", 1) - ); - git_submodule_free(sm); - - assert_submodule_url("TestGitRepository", git_repository_workdir(g_repo)); -} diff --git a/vendor/libgit2/tests/submodule/init.c b/vendor/libgit2/tests/submodule/init.c deleted file mode 100644 index 9e0cf5753..000000000 --- a/vendor/libgit2/tests/submodule/init.c +++ /dev/null @@ -1,115 +0,0 @@ -#include "clar_libgit2.h" -#include "posix.h" -#include "path.h" -#include "submodule_helpers.h" -#include "fileops.h" - -static git_repository *g_repo = NULL; - -void test_submodule_init__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -void test_submodule_init__absolute_url(void) -{ - git_submodule *sm; - git_config *cfg; - git_buf absolute_url = GIT_BUF_INIT; - const char *config_url; - - g_repo = setup_fixture_submodule_simple(); - - cl_assert(git_path_dirname_r(&absolute_url, git_repository_workdir(g_repo)) > 0); - cl_git_pass(git_buf_joinpath(&absolute_url, absolute_url.ptr, "testrepo.git")); - - /* write the absolute url to the .gitmodules file*/ - cl_git_pass(git_submodule_set_url(g_repo, "testrepo", absolute_url.ptr)); - - cl_git_pass(git_submodule_lookup(&sm, g_repo, "testrepo")); - - /* verify that the .gitmodules is set with an absolute path*/ - cl_assert_equal_s(absolute_url.ptr, git_submodule_url(sm)); - - /* init and verify that absolute path is written to .git/config */ - cl_git_pass(git_submodule_init(sm, false)); - - cl_git_pass(git_repository_config_snapshot(&cfg, g_repo)); - - cl_git_pass(git_config_get_string(&config_url, cfg, "submodule.testrepo.url")); - cl_assert_equal_s(absolute_url.ptr, config_url); - - git_buf_free(&absolute_url); - git_config_free(cfg); - git_submodule_free(sm); -} - -void test_submodule_init__relative_url(void) -{ - git_submodule *sm; - git_config *cfg; - git_buf absolute_url = GIT_BUF_INIT; - const char *config_url; - - g_repo = setup_fixture_submodule_simple(); - - cl_assert(git_path_dirname_r(&absolute_url, git_repository_workdir(g_repo)) > 0); - cl_git_pass(git_buf_joinpath(&absolute_url, absolute_url.ptr, "testrepo.git")); - - cl_git_pass(git_submodule_lookup(&sm, g_repo, "testrepo")); - - /* verify that the .gitmodules is set with an absolute path*/ - cl_assert_equal_s("../testrepo.git", git_submodule_url(sm)); - - /* init and verify that absolute path is written to .git/config */ - cl_git_pass(git_submodule_init(sm, false)); - - cl_git_pass(git_repository_config_snapshot(&cfg, g_repo)); - - cl_git_pass(git_config_get_string(&config_url, cfg, "submodule.testrepo.url")); - cl_assert_equal_s(absolute_url.ptr, config_url); - - git_buf_free(&absolute_url); - git_config_free(cfg); - git_submodule_free(sm); -} - -void test_submodule_init__relative_url_detached_head(void) -{ - git_submodule *sm; - git_config *cfg; - git_buf absolute_url = GIT_BUF_INIT; - const char *config_url; - git_reference *head_ref = NULL; - git_object *head_commit = NULL; - - g_repo = setup_fixture_submodule_simple(); - - /* Put the parent repository into a detached head state. */ - cl_git_pass(git_repository_head(&head_ref, g_repo)); - cl_git_pass(git_reference_peel(&head_commit, head_ref, GIT_OBJ_COMMIT)); - - cl_git_pass(git_repository_set_head_detached(g_repo, git_commit_id((git_commit *)head_commit))); - - cl_assert(git_path_dirname_r(&absolute_url, git_repository_workdir(g_repo)) > 0); - cl_git_pass(git_buf_joinpath(&absolute_url, absolute_url.ptr, "testrepo.git")); - - cl_git_pass(git_submodule_lookup(&sm, g_repo, "testrepo")); - - /* verify that the .gitmodules is set with an absolute path*/ - cl_assert_equal_s("../testrepo.git", git_submodule_url(sm)); - - /* init and verify that absolute path is written to .git/config */ - cl_git_pass(git_submodule_init(sm, false)); - - cl_git_pass(git_repository_config_snapshot(&cfg, g_repo)); - - cl_git_pass(git_config_get_string(&config_url, cfg, "submodule.testrepo.url")); - cl_assert_equal_s(absolute_url.ptr, config_url); - - git_buf_free(&absolute_url); - git_config_free(cfg); - git_object_free(head_commit); - git_reference_free(head_ref); - git_submodule_free(sm); -} diff --git a/vendor/libgit2/tests/submodule/lookup.c b/vendor/libgit2/tests/submodule/lookup.c deleted file mode 100644 index 148f9273e..000000000 --- a/vendor/libgit2/tests/submodule/lookup.c +++ /dev/null @@ -1,390 +0,0 @@ -#include "clar_libgit2.h" -#include "submodule_helpers.h" -#include "git2/sys/repository.h" -#include "repository.h" -#include "fileops.h" - -static git_repository *g_repo = NULL; - -void test_submodule_lookup__initialize(void) -{ - g_repo = setup_fixture_submod2(); -} - -void test_submodule_lookup__simple_lookup(void) -{ - assert_submodule_exists(g_repo, "sm_unchanged"); - - /* lookup pending change in .gitmodules that is not in HEAD */ - assert_submodule_exists(g_repo, "sm_added_and_uncommited"); - - /* lookup pending change in .gitmodules that is not in HEAD nor index */ - assert_submodule_exists(g_repo, "sm_gitmodules_only"); - - /* lookup git repo subdir that is not added as submodule */ - refute_submodule_exists(g_repo, "not-submodule", GIT_EEXISTS); - - /* lookup existing directory that is not a submodule */ - refute_submodule_exists(g_repo, "just_a_dir", GIT_ENOTFOUND); - - /* lookup existing file that is not a submodule */ - refute_submodule_exists(g_repo, "just_a_file", GIT_ENOTFOUND); - - /* lookup non-existent item */ - refute_submodule_exists(g_repo, "no_such_file", GIT_ENOTFOUND); - - /* lookup a submodule by path with a trailing slash */ - assert_submodule_exists(g_repo, "sm_added_and_uncommited/"); -} - -void test_submodule_lookup__accessors(void) -{ - git_submodule *sm; - const char *oid = "480095882d281ed676fe5b863569520e54a7d5c0"; - - cl_git_pass(git_submodule_lookup(&sm, g_repo, "sm_unchanged")); - cl_assert(git_submodule_owner(sm) == g_repo); - cl_assert_equal_s("sm_unchanged", git_submodule_name(sm)); - cl_assert(git__suffixcmp(git_submodule_path(sm), "sm_unchanged") == 0); - cl_assert(git__suffixcmp(git_submodule_url(sm), "/submod2_target") == 0); - - cl_assert(git_oid_streq(git_submodule_index_id(sm), oid) == 0); - cl_assert(git_oid_streq(git_submodule_head_id(sm), oid) == 0); - cl_assert(git_oid_streq(git_submodule_wd_id(sm), oid) == 0); - - cl_assert(git_submodule_ignore(sm) == GIT_SUBMODULE_IGNORE_NONE); - cl_assert(git_submodule_update_strategy(sm) == GIT_SUBMODULE_UPDATE_CHECKOUT); - - git_submodule_free(sm); - - - cl_git_pass(git_submodule_lookup(&sm, g_repo, "sm_changed_head")); - cl_assert_equal_s("sm_changed_head", git_submodule_name(sm)); - - cl_assert(git_oid_streq(git_submodule_index_id(sm), oid) == 0); - cl_assert(git_oid_streq(git_submodule_head_id(sm), oid) == 0); - cl_assert(git_oid_streq(git_submodule_wd_id(sm), - "3d9386c507f6b093471a3e324085657a3c2b4247") == 0); - - git_submodule_free(sm); - - - cl_git_pass(git_submodule_lookup(&sm, g_repo, "sm_added_and_uncommited")); - cl_assert_equal_s("sm_added_and_uncommited", git_submodule_name(sm)); - - cl_assert(git_oid_streq(git_submodule_index_id(sm), oid) == 0); - cl_assert(git_submodule_head_id(sm) == NULL); - cl_assert(git_oid_streq(git_submodule_wd_id(sm), oid) == 0); - - git_submodule_free(sm); - - - cl_git_pass(git_submodule_lookup(&sm, g_repo, "sm_missing_commits")); - cl_assert_equal_s("sm_missing_commits", git_submodule_name(sm)); - - cl_assert(git_oid_streq(git_submodule_index_id(sm), oid) == 0); - cl_assert(git_oid_streq(git_submodule_head_id(sm), oid) == 0); - cl_assert(git_oid_streq(git_submodule_wd_id(sm), - "5e4963595a9774b90524d35a807169049de8ccad") == 0); - - git_submodule_free(sm); -} - -typedef struct { - int count; -} sm_lookup_data; - -static int sm_lookup_cb(git_submodule *sm, const char *name, void *payload) -{ - sm_lookup_data *data = payload; - data->count += 1; - cl_assert_equal_s(git_submodule_name(sm), name); - return 0; -} - -void test_submodule_lookup__foreach(void) -{ - git_config *cfg; - sm_lookup_data data; - - memset(&data, 0, sizeof(data)); - cl_git_pass(git_submodule_foreach(g_repo, sm_lookup_cb, &data)); - cl_assert_equal_i(8, data.count); - - memset(&data, 0, sizeof(data)); - - /* Change the path for a submodule so it doesn't match the name */ - cl_git_pass(git_config_open_ondisk(&cfg, "submod2/.gitmodules")); - - cl_git_pass(git_config_set_string(cfg, "submodule.smchangedindex.path", "sm_changed_index")); - cl_git_pass(git_config_set_string(cfg, "submodule.smchangedindex.url", "../submod2_target")); - cl_git_pass(git_config_delete_entry(cfg, "submodule.sm_changed_index.path")); - cl_git_pass(git_config_delete_entry(cfg, "submodule.sm_changed_index.url")); - - git_config_free(cfg); - - cl_git_pass(git_submodule_foreach(g_repo, sm_lookup_cb, &data)); - cl_assert_equal_i(8, data.count); -} - -void test_submodule_lookup__lookup_even_with_unborn_head(void) -{ - git_reference *head; - - /* put us on an unborn branch */ - cl_git_pass(git_reference_symbolic_create( - &head, g_repo, "HEAD", "refs/heads/garbage", 1, NULL)); - git_reference_free(head); - - test_submodule_lookup__simple_lookup(); /* baseline should still pass */ -} - -void test_submodule_lookup__lookup_even_with_missing_index(void) -{ - git_index *idx; - - /* give the repo an empty index */ - cl_git_pass(git_index_new(&idx)); - git_repository_set_index(g_repo, idx); - git_index_free(idx); - - test_submodule_lookup__simple_lookup(); /* baseline should still pass */ -} - -void test_submodule_lookup__backslashes(void) -{ - git_config *cfg; - git_submodule *sm; - git_repository *subrepo; - git_buf buf = GIT_BUF_INIT; - const char *backslashed_path = "..\\submod2_target"; - - cl_git_pass(git_config_open_ondisk(&cfg, "submod2/.gitmodules")); - cl_git_pass(git_config_set_string(cfg, "submodule.sm_unchanged.url", backslashed_path)); - git_config_free(cfg); - - cl_git_pass(git_submodule_lookup(&sm, g_repo, "sm_unchanged")); - cl_assert_equal_s(backslashed_path, git_submodule_url(sm)); - cl_git_pass(git_submodule_open(&subrepo, sm)); - - cl_git_pass(git_submodule_resolve_url(&buf, g_repo, backslashed_path)); - - git_buf_free(&buf); - git_submodule_free(sm); - git_repository_free(subrepo); -} - -static void baseline_tests(void) -{ - /* small baseline that should work even if we change the index or make - * commits from the index - */ - assert_submodule_exists(g_repo, "sm_unchanged"); - assert_submodule_exists(g_repo, "sm_gitmodules_only"); - refute_submodule_exists(g_repo, "not-submodule", GIT_EEXISTS); -} - -static void add_submodule_with_commit(const char *name) -{ - git_submodule *sm; - git_repository *smrepo; - git_index *idx; - git_buf p = GIT_BUF_INIT; - - cl_git_pass(git_submodule_add_setup(&sm, g_repo, - "https://github.com/libgit2/libgit2.git", name, 1)); - - assert_submodule_exists(g_repo, name); - - cl_git_pass(git_submodule_open(&smrepo, sm)); - cl_git_pass(git_repository_index(&idx, smrepo)); - - cl_git_pass(git_buf_joinpath(&p, git_repository_workdir(smrepo), "file")); - cl_git_mkfile(p.ptr, "new file"); - git_buf_free(&p); - - cl_git_pass(git_index_add_bypath(idx, "file")); - cl_git_pass(git_index_write(idx)); - git_index_free(idx); - - cl_repo_commit_from_index(NULL, smrepo, NULL, 0, "initial commit"); - git_repository_free(smrepo); - - cl_git_pass(git_submodule_add_finalize(sm)); - - git_submodule_free(sm); -} - -void test_submodule_lookup__just_added(void) -{ - git_submodule *sm; - git_buf snap1 = GIT_BUF_INIT, snap2 = GIT_BUF_INIT; - git_reference *original_head = NULL; - - refute_submodule_exists(g_repo, "sm_just_added", GIT_ENOTFOUND); - refute_submodule_exists(g_repo, "sm_just_added_2", GIT_ENOTFOUND); - refute_submodule_exists(g_repo, "sm_just_added_idx", GIT_ENOTFOUND); - refute_submodule_exists(g_repo, "sm_just_added_head", GIT_ENOTFOUND); - refute_submodule_exists(g_repo, "mismatch_name", GIT_ENOTFOUND); - refute_submodule_exists(g_repo, "mismatch_path", GIT_ENOTFOUND); - baseline_tests(); - - cl_git_pass(git_futils_readbuffer(&snap1, "submod2/.gitmodules")); - cl_git_pass(git_repository_head(&original_head, g_repo)); - - cl_git_pass(git_submodule_add_setup(&sm, g_repo, - "https://github.com/libgit2/libgit2.git", "sm_just_added", 1)); - git_submodule_free(sm); - assert_submodule_exists(g_repo, "sm_just_added"); - - cl_git_pass(git_submodule_add_setup(&sm, g_repo, - "https://github.com/libgit2/libgit2.git", "sm_just_added_2", 1)); - assert_submodule_exists(g_repo, "sm_just_added_2"); - cl_git_fail(git_submodule_add_finalize(sm)); /* fails if no HEAD */ - git_submodule_free(sm); - - add_submodule_with_commit("sm_just_added_head"); - cl_repo_commit_from_index(NULL, g_repo, NULL, 0, "commit new sm to head"); - assert_submodule_exists(g_repo, "sm_just_added_head"); - - add_submodule_with_commit("sm_just_added_idx"); - assert_submodule_exists(g_repo, "sm_just_added_idx"); - - cl_git_pass(git_futils_readbuffer(&snap2, "submod2/.gitmodules")); - - cl_git_append2file( - "submod2/.gitmodules", - "\n[submodule \"mismatch_name\"]\n" - "\tpath = mismatch_path\n" - "\turl = https://example.com/example.git\n\n"); - - assert_submodule_exists(g_repo, "mismatch_name"); - assert_submodule_exists(g_repo, "mismatch_path"); - assert_submodule_exists(g_repo, "sm_just_added"); - assert_submodule_exists(g_repo, "sm_just_added_2"); - assert_submodule_exists(g_repo, "sm_just_added_idx"); - assert_submodule_exists(g_repo, "sm_just_added_head"); - baseline_tests(); - - cl_git_rewritefile("submod2/.gitmodules", snap2.ptr); - git_buf_free(&snap2); - - refute_submodule_exists(g_repo, "mismatch_name", GIT_ENOTFOUND); - refute_submodule_exists(g_repo, "mismatch_path", GIT_ENOTFOUND); - assert_submodule_exists(g_repo, "sm_just_added"); - assert_submodule_exists(g_repo, "sm_just_added_2"); - assert_submodule_exists(g_repo, "sm_just_added_idx"); - assert_submodule_exists(g_repo, "sm_just_added_head"); - baseline_tests(); - - cl_git_rewritefile("submod2/.gitmodules", snap1.ptr); - git_buf_free(&snap1); - - refute_submodule_exists(g_repo, "mismatch_name", GIT_ENOTFOUND); - refute_submodule_exists(g_repo, "mismatch_path", GIT_ENOTFOUND); - /* note error code change, because add_setup made a repo in the workdir */ - refute_submodule_exists(g_repo, "sm_just_added", GIT_EEXISTS); - refute_submodule_exists(g_repo, "sm_just_added_2", GIT_EEXISTS); - /* these still exist in index and head respectively */ - assert_submodule_exists(g_repo, "sm_just_added_idx"); - assert_submodule_exists(g_repo, "sm_just_added_head"); - baseline_tests(); - - { - git_index *idx; - cl_git_pass(git_repository_index(&idx, g_repo)); - cl_git_pass(git_index_remove_bypath(idx, "sm_just_added_idx")); - cl_git_pass(git_index_remove_bypath(idx, "sm_just_added_head")); - cl_git_pass(git_index_write(idx)); - git_index_free(idx); - } - - refute_submodule_exists(g_repo, "sm_just_added_idx", GIT_EEXISTS); - assert_submodule_exists(g_repo, "sm_just_added_head"); - - { - cl_git_pass(git_reference_create(NULL, g_repo, "refs/heads/master", git_reference_target(original_head), 1, "move head back")); - git_reference_free(original_head); - } - - refute_submodule_exists(g_repo, "sm_just_added_head", GIT_EEXISTS); -} - -/* Test_App and Test_App2 are fairly similar names, make sure we load the right one */ -void test_submodule_lookup__prefix_name(void) -{ - git_submodule *sm; - - cl_git_rewritefile("submod2/.gitmodules", - "[submodule \"Test_App\"]\n" - " path = Test_App\n" - " url = ../Test_App\n" - "[submodule \"Test_App2\"]\n" - " path = Test_App2\n" - " url = ../Test_App\n"); - - cl_git_pass(git_submodule_lookup(&sm, g_repo, "Test_App")); - cl_assert_equal_s("Test_App", git_submodule_name(sm)); - - git_submodule_free(sm); - - cl_git_pass(git_submodule_lookup(&sm, g_repo, "Test_App2")); - cl_assert_equal_s("Test_App2", git_submodule_name(sm)); - - git_submodule_free(sm); -} - -void test_submodule_lookup__renamed(void) -{ - const char *newpath = "sm_actually_changed"; - git_index *idx; - sm_lookup_data data; - - cl_git_pass(git_repository_index__weakptr(&idx, g_repo)); - - /* We're replicating 'git mv sm_unchanged sm_actually_changed' in this test */ - - cl_git_pass(p_rename("submod2/sm_unchanged", "submod2/sm_actually_changed")); - - /* Change the path in .gitmodules and stage it*/ - { - git_config *cfg; - - cl_git_pass(git_config_open_ondisk(&cfg, "submod2/.gitmodules")); - cl_git_pass(git_config_set_string(cfg, "submodule.sm_unchanged.path", newpath)); - git_config_free(cfg); - - cl_git_pass(git_index_add_bypath(idx, ".gitmodules")); - } - - /* Change the worktree info in the submodule's config */ - { - git_config *cfg; - - cl_git_pass(git_config_open_ondisk(&cfg, "submod2/.git/modules/sm_unchanged/config")); - cl_git_pass(git_config_set_string(cfg, "core.worktree", "../../../sm_actually_changed")); - git_config_free(cfg); - } - - /* Rename the entry in the index */ - { - const git_index_entry *e; - git_index_entry entry = {{ 0 }}; - - e = git_index_get_bypath(idx, "sm_unchanged", 0); - cl_assert(e); - cl_assert_equal_i(GIT_FILEMODE_COMMIT, e->mode); - - entry.path = newpath; - entry.mode = GIT_FILEMODE_COMMIT; - git_oid_cpy(&entry.id, &e->id); - - cl_git_pass(git_index_remove(idx, "sm_unchanged", 0)); - cl_git_pass(git_index_add(idx, &entry)); - cl_git_pass(git_index_write(idx)); - } - - memset(&data, 0, sizeof(data)); - cl_git_pass(git_submodule_foreach(g_repo, sm_lookup_cb, &data)); - cl_assert_equal_i(8, data.count); -} diff --git a/vendor/libgit2/tests/submodule/modify.c b/vendor/libgit2/tests/submodule/modify.c deleted file mode 100644 index f7a089e72..000000000 --- a/vendor/libgit2/tests/submodule/modify.c +++ /dev/null @@ -1,212 +0,0 @@ -#include "clar_libgit2.h" -#include "posix.h" -#include "path.h" -#include "submodule_helpers.h" -#include "config/config_helpers.h" - -static git_repository *g_repo = NULL; - -#define SM_LIBGIT2_URL "https://github.com/libgit2/libgit2.git" -#define SM_LIBGIT2_BRANCH "github-branch" -#define SM_LIBGIT2 "sm_libgit2" - -void test_submodule_modify__initialize(void) -{ - g_repo = setup_fixture_submod2(); -} - -static int delete_one_config(const git_config_entry *entry, void *payload) -{ - git_config *cfg = payload; - return git_config_delete_entry(cfg, entry->name); -} - -static int init_one_submodule( - git_submodule *sm, const char *name, void *payload) -{ - GIT_UNUSED(name); - GIT_UNUSED(payload); - return git_submodule_init(sm, false); -} - -void test_submodule_modify__init(void) -{ - git_config *cfg; - const char *str; - - /* erase submodule data from .git/config */ - cl_git_pass(git_repository_config(&cfg, g_repo)); - cl_git_pass( - git_config_foreach_match(cfg, "submodule\\..*", delete_one_config, cfg)); - git_config_free(cfg); - - /* confirm no submodule data in config */ - cl_git_pass(git_repository_config_snapshot(&cfg, g_repo)); - cl_git_fail_with(GIT_ENOTFOUND, git_config_get_string(&str, cfg, "submodule.sm_unchanged.url")); - cl_git_fail_with(GIT_ENOTFOUND, git_config_get_string(&str, cfg, "submodule.sm_changed_head.url")); - cl_git_fail_with(GIT_ENOTFOUND, git_config_get_string(&str, cfg, "submodule.sm_added_and_uncommited.url")); - git_config_free(cfg); - - /* call init and see that settings are copied */ - cl_git_pass(git_submodule_foreach(g_repo, init_one_submodule, NULL)); - - /* confirm submodule data in config */ - cl_git_pass(git_repository_config_snapshot(&cfg, g_repo)); - cl_git_pass(git_config_get_string(&str, cfg, "submodule.sm_unchanged.url")); - cl_assert(git__suffixcmp(str, "/submod2_target") == 0); - cl_git_pass(git_config_get_string(&str, cfg, "submodule.sm_changed_head.url")); - cl_assert(git__suffixcmp(str, "/submod2_target") == 0); - cl_git_pass(git_config_get_string(&str, cfg, "submodule.sm_added_and_uncommited.url")); - cl_assert(git__suffixcmp(str, "/submod2_target") == 0); - git_config_free(cfg); -} - -static int sync_one_submodule( - git_submodule *sm, const char *name, void *payload) -{ - GIT_UNUSED(name); - GIT_UNUSED(payload); - return git_submodule_sync(sm); -} - -static void assert_submodule_url_is_synced( - git_submodule *sm, const char *parent_key, const char *child_key) -{ - git_repository *smrepo; - - assert_config_entry_value(g_repo, parent_key, git_submodule_url(sm)); - - cl_git_pass(git_submodule_open(&smrepo, sm)); - assert_config_entry_value(smrepo, child_key, git_submodule_url(sm)); - git_repository_free(smrepo); -} - -void test_submodule_modify__sync(void) -{ - git_submodule *sm1, *sm2, *sm3; - git_config *cfg; - const char *str; - -#define SM1 "sm_unchanged" -#define SM2 "sm_changed_head" -#define SM3 "sm_added_and_uncommited" - - /* look up some submodules */ - cl_git_pass(git_submodule_lookup(&sm1, g_repo, SM1)); - cl_git_pass(git_submodule_lookup(&sm2, g_repo, SM2)); - cl_git_pass(git_submodule_lookup(&sm3, g_repo, SM3)); - - /* At this point, the .git/config URLs for the submodules have - * not be rewritten with the absolute paths (although the - * .gitmodules have. Let's confirm that they DO NOT match - * yet, then we can do a sync to make them match... - */ - - /* check submodule info does not match before sync */ - cl_git_pass(git_repository_config_snapshot(&cfg, g_repo)); - cl_git_pass(git_config_get_string(&str, cfg, "submodule."SM1".url")); - cl_assert(strcmp(git_submodule_url(sm1), str) != 0); - cl_git_pass(git_config_get_string(&str, cfg, "submodule."SM2".url")); - cl_assert(strcmp(git_submodule_url(sm2), str) != 0); - cl_git_pass(git_config_get_string(&str, cfg, "submodule."SM3".url")); - cl_assert(strcmp(git_submodule_url(sm3), str) != 0); - git_config_free(cfg); - - /* sync all the submodules */ - cl_git_pass(git_submodule_foreach(g_repo, sync_one_submodule, NULL)); - - /* check that submodule config is updated */ - assert_submodule_url_is_synced( - sm1, "submodule."SM1".url", "remote.origin.url"); - assert_submodule_url_is_synced( - sm2, "submodule."SM2".url", "remote.origin.url"); - assert_submodule_url_is_synced( - sm3, "submodule."SM3".url", "remote.origin.url"); - - git_submodule_free(sm1); - git_submodule_free(sm2); - git_submodule_free(sm3); -} - -void assert_ignore_change(git_submodule_ignore_t ignore) -{ - git_submodule *sm; - - cl_git_pass(git_submodule_set_ignore(g_repo, "sm_changed_head", ignore)); - - cl_git_pass(git_submodule_lookup(&sm, g_repo, "sm_changed_head")); - cl_assert_equal_i(ignore, git_submodule_ignore(sm)); - git_submodule_free(sm); -} - -void test_submodule_modify__set_ignore(void) -{ - assert_ignore_change(GIT_SUBMODULE_IGNORE_UNTRACKED); - assert_ignore_change(GIT_SUBMODULE_IGNORE_NONE); - assert_ignore_change(GIT_SUBMODULE_IGNORE_ALL); -} - -void assert_update_change(git_submodule_update_t update) -{ - git_submodule *sm; - - cl_git_pass(git_submodule_set_update(g_repo, "sm_changed_head", update)); - - cl_git_pass(git_submodule_lookup(&sm, g_repo, "sm_changed_head")); - cl_assert_equal_i(update, git_submodule_update_strategy(sm)); - git_submodule_free(sm); -} - -void test_submodule_modify__set_update(void) -{ - assert_update_change(GIT_SUBMODULE_UPDATE_REBASE); - assert_update_change(GIT_SUBMODULE_UPDATE_NONE); - assert_update_change(GIT_SUBMODULE_UPDATE_CHECKOUT); -} - -void assert_recurse_change(git_submodule_recurse_t recurse) -{ - git_submodule *sm; - - cl_git_pass(git_submodule_set_fetch_recurse_submodules(g_repo, "sm_changed_head", recurse)); - - cl_git_pass(git_submodule_lookup(&sm, g_repo, "sm_changed_head")); - cl_assert_equal_i(recurse, git_submodule_fetch_recurse_submodules(sm)); - git_submodule_free(sm); -} - -void test_submodule_modify__set_fetch_recurse_submodules(void) -{ - assert_recurse_change(GIT_SUBMODULE_RECURSE_YES); - assert_recurse_change(GIT_SUBMODULE_RECURSE_NO); - assert_recurse_change(GIT_SUBMODULE_RECURSE_ONDEMAND); -} - -void test_submodule_modify__set_branch(void) -{ - git_submodule *sm; - - cl_git_pass(git_submodule_lookup(&sm, g_repo, "sm_changed_head")); - cl_assert(git_submodule_branch(sm) == NULL); - git_submodule_free(sm); - - cl_git_pass(git_submodule_set_branch(g_repo, "sm_changed_head", SM_LIBGIT2_BRANCH)); - cl_git_pass(git_submodule_lookup(&sm, g_repo, "sm_changed_head")); - cl_assert_equal_s(SM_LIBGIT2_BRANCH, git_submodule_branch(sm)); - git_submodule_free(sm); - - cl_git_pass(git_submodule_set_branch(g_repo, "sm_changed_head", NULL)); - cl_git_pass(git_submodule_lookup(&sm, g_repo, "sm_changed_head")); - cl_assert(git_submodule_branch(sm) == NULL); - git_submodule_free(sm); -} - -void test_submodule_modify__set_url(void) -{ - git_submodule *sm; - - cl_git_pass(git_submodule_set_url(g_repo, "sm_changed_head", SM_LIBGIT2_URL)); - cl_git_pass(git_submodule_lookup(&sm, g_repo, "sm_changed_head")); - cl_assert_equal_s(SM_LIBGIT2_URL, git_submodule_url(sm)); - git_submodule_free(sm); -} diff --git a/vendor/libgit2/tests/submodule/nosubs.c b/vendor/libgit2/tests/submodule/nosubs.c deleted file mode 100644 index 8a73dc11a..000000000 --- a/vendor/libgit2/tests/submodule/nosubs.c +++ /dev/null @@ -1,130 +0,0 @@ -/* test the submodule APIs on repositories where there are no submodules */ - -#include "clar_libgit2.h" -#include "posix.h" -#include "fileops.h" - -void test_submodule_nosubs__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -void test_submodule_nosubs__lookup(void) -{ - git_repository *repo = cl_git_sandbox_init("status"); - git_submodule *sm = NULL; - - p_mkdir("status/subrepo", 0777); - cl_git_mkfile("status/subrepo/.git", "gitdir: ../.git"); - - cl_assert_equal_i(GIT_ENOTFOUND, git_submodule_lookup(&sm, repo, "subdir")); - - cl_assert_equal_i(GIT_EEXISTS, git_submodule_lookup(&sm, repo, "subrepo")); - - cl_assert_equal_i(GIT_ENOTFOUND, git_submodule_lookup(&sm, repo, "subdir")); - - cl_assert_equal_i(GIT_EEXISTS, git_submodule_lookup(&sm, repo, "subrepo")); -} - -static int fake_submod_cb(git_submodule *sm, const char *n, void *p) -{ - GIT_UNUSED(sm); GIT_UNUSED(n); GIT_UNUSED(p); - return 0; -} - -void test_submodule_nosubs__foreach(void) -{ - git_repository *repo = cl_git_sandbox_init("status"); - cl_git_pass(git_submodule_foreach(repo, fake_submod_cb, NULL)); -} - -void test_submodule_nosubs__add(void) -{ - git_repository *repo = cl_git_sandbox_init("status"); - git_submodule *sm, *sm2; - - cl_git_pass(git_submodule_add_setup(&sm, repo, "https://github.com/libgit2/libgit2.git", "submodules/libgit2", 1)); - - cl_git_pass(git_submodule_lookup(&sm2, repo, "submodules/libgit2")); - git_submodule_free(sm2); - - cl_git_pass(git_submodule_foreach(repo, fake_submod_cb, NULL)); - - git_submodule_free(sm); -} - -void test_submodule_nosubs__bad_gitmodules(void) -{ - git_repository *repo = cl_git_sandbox_init("status"); - - cl_git_mkfile("status/.gitmodules", "[submodule \"foobar\"]\tpath=blargle\n\turl=\n\tbranch=\n\tupdate=flooble\n\n"); - - cl_git_rewritefile("status/.gitmodules", "[submodule \"foobar\"]\tpath=blargle\n\turl=\n\tbranch=\n\tupdate=rebase\n\n"); - - cl_git_pass(git_submodule_lookup(NULL, repo, "foobar")); - cl_assert_equal_i(GIT_ENOTFOUND, git_submodule_lookup(NULL, repo, "subdir")); -} - -void test_submodule_nosubs__add_and_delete(void) -{ - git_repository *repo = cl_git_sandbox_init("status"); - git_submodule *sm; - git_buf buf = GIT_BUF_INIT; - - cl_git_fail(git_submodule_lookup(NULL, repo, "libgit2")); - cl_git_fail(git_submodule_lookup(NULL, repo, "submodules/libgit2")); - - /* create */ - - cl_git_pass(git_submodule_add_setup( - &sm, repo, "https://github.com/libgit2/libgit2.git", "submodules/libgit2", 1)); - cl_assert_equal_s("submodules/libgit2", git_submodule_name(sm)); - cl_assert_equal_s("submodules/libgit2", git_submodule_path(sm)); - git_submodule_free(sm); - - cl_git_pass(git_futils_readbuffer(&buf, "status/.gitmodules")); - cl_assert(strstr(buf.ptr, "[submodule \"submodules/libgit2\"]") != NULL); - cl_assert(strstr(buf.ptr, "path = submodules/libgit2") != NULL); - git_buf_free(&buf); - - /* lookup */ - - cl_git_fail(git_submodule_lookup(&sm, repo, "libgit2")); - cl_git_pass(git_submodule_lookup(&sm, repo, "submodules/libgit2")); - cl_assert_equal_s("submodules/libgit2", git_submodule_name(sm)); - cl_assert_equal_s("submodules/libgit2", git_submodule_path(sm)); - git_submodule_free(sm); - - /* update name */ - - cl_git_rewritefile( - "status/.gitmodules", - "[submodule \"libgit2\"]\n" - " path = submodules/libgit2\n" - " url = https://github.com/libgit2/libgit2.git\n"); - - cl_git_pass(git_submodule_lookup(&sm, repo, "libgit2")); - cl_assert_equal_s("libgit2", git_submodule_name(sm)); - cl_assert_equal_s("submodules/libgit2", git_submodule_path(sm)); - git_submodule_free(sm); - cl_git_pass(git_submodule_lookup(&sm, repo, "submodules/libgit2")); - git_submodule_free(sm); - - /* revert name update */ - - cl_git_rewritefile( - "status/.gitmodules", - "[submodule \"submodules/libgit2\"]\n" - " path = submodules/libgit2\n" - " url = https://github.com/libgit2/libgit2.git\n"); - - cl_git_fail(git_submodule_lookup(&sm, repo, "libgit2")); - cl_git_pass(git_submodule_lookup(&sm, repo, "submodules/libgit2")); - git_submodule_free(sm); - - /* remove completely */ - - cl_must_pass(p_unlink("status/.gitmodules")); - cl_git_fail(git_submodule_lookup(&sm, repo, "libgit2")); - cl_git_fail(git_submodule_lookup(&sm, repo, "submodules/libgit2")); -} diff --git a/vendor/libgit2/tests/submodule/repository_init.c b/vendor/libgit2/tests/submodule/repository_init.c deleted file mode 100644 index 9be1e0b23..000000000 --- a/vendor/libgit2/tests/submodule/repository_init.c +++ /dev/null @@ -1,38 +0,0 @@ -#include "clar_libgit2.h" -#include "posix.h" -#include "path.h" -#include "submodule_helpers.h" -#include "config/config_helpers.h" -#include "fileops.h" - -static git_repository *g_repo = NULL; - -void test_submodule_repository_init__basic(void) -{ - git_submodule *sm; - git_repository *repo; - git_buf dot_git_content = GIT_BUF_INIT; - - g_repo = setup_fixture_submod2(); - - cl_git_pass(git_submodule_lookup(&sm, g_repo, "sm_gitmodules_only")); - cl_git_pass(git_submodule_init(sm, 0)); - cl_git_pass(git_submodule_repo_init(&repo, sm, 1)); - - /* Verify worktree */ - assert_config_entry_value(repo, "core.worktree", "../../../sm_gitmodules_only/"); - - /* Verify gitlink */ - cl_git_pass(git_futils_readbuffer(&dot_git_content, "submod2/" "sm_gitmodules_only" "/.git")); - cl_assert_equal_s("gitdir: ../.git/modules/sm_gitmodules_only/", dot_git_content.ptr); - - cl_assert(git_path_isfile("submod2/" "sm_gitmodules_only" "/.git")); - - cl_assert(git_path_isdir("submod2/.git/modules")); - cl_assert(git_path_isdir("submod2/.git/modules/" "sm_gitmodules_only")); - cl_assert(git_path_isfile("submod2/.git/modules/" "sm_gitmodules_only" "/HEAD")); - - git_submodule_free(sm); - git_repository_free(repo); - git_buf_free(&dot_git_content); -} diff --git a/vendor/libgit2/tests/submodule/status.c b/vendor/libgit2/tests/submodule/status.c deleted file mode 100644 index 10f385ce9..000000000 --- a/vendor/libgit2/tests/submodule/status.c +++ /dev/null @@ -1,354 +0,0 @@ -#include "clar_libgit2.h" -#include "posix.h" -#include "path.h" -#include "submodule_helpers.h" -#include "fileops.h" -#include "iterator.h" - -static git_repository *g_repo = NULL; - -void test_submodule_status__initialize(void) -{ - g_repo = setup_fixture_submod2(); -} - -void test_submodule_status__cleanup(void) -{ -} - -void test_submodule_status__unchanged(void) -{ - unsigned int status = get_submodule_status(g_repo, "sm_unchanged"); - unsigned int expected = - GIT_SUBMODULE_STATUS_IN_HEAD | - GIT_SUBMODULE_STATUS_IN_INDEX | - GIT_SUBMODULE_STATUS_IN_CONFIG | - GIT_SUBMODULE_STATUS_IN_WD; - - cl_assert(GIT_SUBMODULE_STATUS_IS_UNMODIFIED(status)); - cl_assert(expected == status); -} - -static void rm_submodule(const char *name) -{ - git_buf path = GIT_BUF_INIT; - cl_git_pass(git_buf_joinpath(&path, git_repository_workdir(g_repo), name)); - cl_git_pass(git_futils_rmdir_r(path.ptr, NULL, GIT_RMDIR_REMOVE_FILES)); - git_buf_free(&path); -} - -static void add_submodule_to_index(const char *name) -{ - git_submodule *sm; - cl_git_pass(git_submodule_lookup(&sm, g_repo, name)); - cl_git_pass(git_submodule_add_to_index(sm, true)); - git_submodule_free(sm); -} - -static void rm_submodule_from_index(const char *name) -{ - git_index *index; - size_t pos; - - cl_git_pass(git_repository_index(&index, g_repo)); - cl_assert(!git_index_find(&pos, index, name)); - cl_git_pass(git_index_remove(index, name, 0)); - cl_git_pass(git_index_write(index)); - git_index_free(index); -} - -/* 4 values of GIT_SUBMODULE_IGNORE to check */ - -void test_submodule_status__ignore_none(void) -{ - unsigned int status; - - rm_submodule("sm_unchanged"); - - refute_submodule_exists(g_repo, "just_a_dir", GIT_ENOTFOUND); - refute_submodule_exists(g_repo, "not-submodule", GIT_EEXISTS); - refute_submodule_exists(g_repo, "not", GIT_EEXISTS); - - status = get_submodule_status(g_repo, "sm_changed_index"); - cl_assert((status & GIT_SUBMODULE_STATUS_WD_INDEX_MODIFIED) != 0); - - status = get_submodule_status(g_repo, "sm_changed_head"); - cl_assert((status & GIT_SUBMODULE_STATUS_WD_MODIFIED) != 0); - - status = get_submodule_status(g_repo, "sm_changed_file"); - cl_assert((status & GIT_SUBMODULE_STATUS_WD_WD_MODIFIED) != 0); - - status = get_submodule_status(g_repo, "sm_changed_untracked_file"); - cl_assert((status & GIT_SUBMODULE_STATUS_WD_UNTRACKED) != 0); - - status = get_submodule_status(g_repo, "sm_missing_commits"); - cl_assert((status & GIT_SUBMODULE_STATUS_WD_MODIFIED) != 0); - - status = get_submodule_status(g_repo, "sm_added_and_uncommited"); - cl_assert((status & GIT_SUBMODULE_STATUS_INDEX_ADDED) != 0); - - /* removed sm_unchanged for deleted workdir */ - status = get_submodule_status(g_repo, "sm_unchanged"); - cl_assert((status & GIT_SUBMODULE_STATUS_WD_DELETED) != 0); - - /* now mkdir sm_unchanged to test uninitialized */ - cl_git_pass(git_futils_mkdir_relative("sm_unchanged", "submod2", 0755, 0, NULL)); - status = get_submodule_status(g_repo, "sm_unchanged"); - cl_assert((status & GIT_SUBMODULE_STATUS_WD_UNINITIALIZED) != 0); - - /* update sm_changed_head in index */ - add_submodule_to_index("sm_changed_head"); - status = get_submodule_status(g_repo, "sm_changed_head"); - cl_assert((status & GIT_SUBMODULE_STATUS_INDEX_MODIFIED) != 0); - - /* remove sm_changed_head from index */ - rm_submodule_from_index("sm_changed_head"); - status = get_submodule_status(g_repo, "sm_changed_head"); - cl_assert((status & GIT_SUBMODULE_STATUS_INDEX_DELETED) != 0); -} - -void test_submodule_status__ignore_untracked(void) -{ - unsigned int status; - git_submodule_ignore_t ign = GIT_SUBMODULE_IGNORE_UNTRACKED; - - rm_submodule("sm_unchanged"); - - refute_submodule_exists(g_repo, "just_a_dir", GIT_ENOTFOUND); - refute_submodule_exists(g_repo, "not-submodule", GIT_EEXISTS); - refute_submodule_exists(g_repo, "not", GIT_EEXISTS); - - cl_git_pass(git_submodule_status(&status, g_repo,"sm_changed_index", ign)); - cl_assert((status & GIT_SUBMODULE_STATUS_WD_INDEX_MODIFIED) != 0); - - cl_git_pass(git_submodule_status(&status, g_repo,"sm_changed_head", ign)); - cl_assert((status & GIT_SUBMODULE_STATUS_WD_MODIFIED) != 0); - - cl_git_pass(git_submodule_status(&status, g_repo,"sm_changed_file", ign)); - cl_assert((status & GIT_SUBMODULE_STATUS_WD_WD_MODIFIED) != 0); - - cl_git_pass(git_submodule_status(&status, g_repo,"sm_changed_untracked_file", ign)); - cl_assert(GIT_SUBMODULE_STATUS_IS_UNMODIFIED(status)); - - cl_git_pass(git_submodule_status(&status, g_repo,"sm_missing_commits", ign)); - cl_assert((status & GIT_SUBMODULE_STATUS_WD_MODIFIED) != 0); - - cl_git_pass(git_submodule_status(&status, g_repo,"sm_added_and_uncommited", ign)); - cl_assert((status & GIT_SUBMODULE_STATUS_INDEX_ADDED) != 0); - - /* removed sm_unchanged for deleted workdir */ - cl_git_pass(git_submodule_status(&status, g_repo,"sm_unchanged", ign)); - cl_assert((status & GIT_SUBMODULE_STATUS_WD_DELETED) != 0); - - /* now mkdir sm_unchanged to test uninitialized */ - cl_git_pass(git_futils_mkdir_relative("sm_unchanged", "submod2", 0755, 0, NULL)); - cl_git_pass(git_submodule_status(&status, g_repo,"sm_unchanged", ign)); - cl_assert((status & GIT_SUBMODULE_STATUS_WD_UNINITIALIZED) != 0); - - /* update sm_changed_head in index */ - add_submodule_to_index("sm_changed_head"); - cl_git_pass(git_submodule_status(&status, g_repo,"sm_changed_head", ign)); - cl_assert((status & GIT_SUBMODULE_STATUS_INDEX_MODIFIED) != 0); -} - -void test_submodule_status__ignore_dirty(void) -{ - unsigned int status; - git_submodule_ignore_t ign = GIT_SUBMODULE_IGNORE_DIRTY; - - rm_submodule("sm_unchanged"); - - refute_submodule_exists(g_repo, "just_a_dir", GIT_ENOTFOUND); - refute_submodule_exists(g_repo, "not-submodule", GIT_EEXISTS); - refute_submodule_exists(g_repo, "not", GIT_EEXISTS); - - cl_git_pass(git_submodule_status(&status, g_repo,"sm_changed_index", ign)); - cl_assert(GIT_SUBMODULE_STATUS_IS_UNMODIFIED(status)); - - cl_git_pass(git_submodule_status(&status, g_repo,"sm_changed_head", ign)); - cl_assert((status & GIT_SUBMODULE_STATUS_WD_MODIFIED) != 0); - - cl_git_pass(git_submodule_status(&status, g_repo,"sm_changed_file", ign)); - cl_assert(GIT_SUBMODULE_STATUS_IS_UNMODIFIED(status)); - - cl_git_pass(git_submodule_status(&status, g_repo,"sm_changed_untracked_file", ign)); - cl_assert(GIT_SUBMODULE_STATUS_IS_UNMODIFIED(status)); - - cl_git_pass(git_submodule_status(&status, g_repo,"sm_missing_commits", ign)); - cl_assert((status & GIT_SUBMODULE_STATUS_WD_MODIFIED) != 0); - - cl_git_pass(git_submodule_status(&status, g_repo,"sm_added_and_uncommited", ign)); - cl_assert((status & GIT_SUBMODULE_STATUS_INDEX_ADDED) != 0); - - /* removed sm_unchanged for deleted workdir */ - cl_git_pass(git_submodule_status(&status, g_repo,"sm_unchanged", ign)); - cl_assert((status & GIT_SUBMODULE_STATUS_WD_DELETED) != 0); - - /* now mkdir sm_unchanged to test uninitialized */ - cl_git_pass(git_futils_mkdir_relative("sm_unchanged", "submod2", 0755, 0, NULL)); - cl_git_pass(git_submodule_status(&status, g_repo,"sm_unchanged", ign)); - cl_assert((status & GIT_SUBMODULE_STATUS_WD_UNINITIALIZED) != 0); - - /* update sm_changed_head in index */ - add_submodule_to_index("sm_changed_head"); - cl_git_pass(git_submodule_status(&status, g_repo,"sm_changed_head", ign)); - cl_assert((status & GIT_SUBMODULE_STATUS_INDEX_MODIFIED) != 0); -} - -void test_submodule_status__ignore_all(void) -{ - unsigned int status; - git_submodule_ignore_t ign = GIT_SUBMODULE_IGNORE_ALL; - - rm_submodule("sm_unchanged"); - - refute_submodule_exists(g_repo, "just_a_dir", GIT_ENOTFOUND); - refute_submodule_exists(g_repo, "not-submodule", GIT_EEXISTS); - refute_submodule_exists(g_repo, "not", GIT_EEXISTS); - - cl_git_pass(git_submodule_status(&status, g_repo,"sm_changed_index", ign)); - cl_assert(GIT_SUBMODULE_STATUS_IS_UNMODIFIED(status)); - - cl_git_pass(git_submodule_status(&status, g_repo,"sm_changed_head", ign)); - cl_assert(GIT_SUBMODULE_STATUS_IS_UNMODIFIED(status)); - - cl_git_pass(git_submodule_status(&status, g_repo,"sm_changed_file", ign)); - cl_assert(GIT_SUBMODULE_STATUS_IS_UNMODIFIED(status)); - - cl_git_pass(git_submodule_status(&status, g_repo,"sm_changed_untracked_file", ign)); - cl_assert(GIT_SUBMODULE_STATUS_IS_UNMODIFIED(status)); - - cl_git_pass(git_submodule_status(&status, g_repo,"sm_missing_commits", ign)); - cl_assert(GIT_SUBMODULE_STATUS_IS_UNMODIFIED(status)); - - cl_git_pass(git_submodule_status(&status, g_repo,"sm_added_and_uncommited", ign)); - cl_assert(GIT_SUBMODULE_STATUS_IS_UNMODIFIED(status)); - - /* removed sm_unchanged for deleted workdir */ - cl_git_pass(git_submodule_status(&status, g_repo,"sm_unchanged", ign)); - cl_assert(GIT_SUBMODULE_STATUS_IS_UNMODIFIED(status)); - - /* now mkdir sm_unchanged to test uninitialized */ - cl_git_pass(git_futils_mkdir_relative("sm_unchanged", "submod2", 0755, 0, NULL)); - cl_git_pass(git_submodule_status(&status, g_repo,"sm_unchanged", ign)); - cl_assert(GIT_SUBMODULE_STATUS_IS_UNMODIFIED(status)); - - /* update sm_changed_head in index */ - add_submodule_to_index("sm_changed_head"); - cl_git_pass(git_submodule_status(&status, g_repo,"sm_changed_head", ign)); - cl_assert(GIT_SUBMODULE_STATUS_IS_UNMODIFIED(status)); -} - -typedef struct { - size_t counter; - const char **paths; - int *statuses; -} submodule_expectations; - -static int confirm_submodule_status( - const char *path, unsigned int status_flags, void *payload) -{ - submodule_expectations *exp = payload; - - while (exp->statuses[exp->counter] < 0) - exp->counter++; - - cl_assert_equal_i(exp->statuses[exp->counter], (int)status_flags); - cl_assert_equal_s(exp->paths[exp->counter++], path); - - GIT_UNUSED(status_flags); - - return 0; -} - -void test_submodule_status__iterator(void) -{ - git_iterator *iter; - git_iterator_options iter_opts = GIT_ITERATOR_OPTIONS_INIT; - const git_index_entry *entry; - size_t i; - static const char *expected[] = { - ".gitmodules", - "just_a_dir/", - "just_a_dir/contents", - "just_a_file", - "not-submodule/", - "not-submodule/README.txt", - "not/", - "not/README.txt", - "README.txt", - "sm_added_and_uncommited", - "sm_changed_file", - "sm_changed_head", - "sm_changed_index", - "sm_changed_untracked_file", - "sm_missing_commits", - "sm_unchanged", - NULL - }; - static int expected_flags[] = { - GIT_STATUS_INDEX_MODIFIED | GIT_STATUS_WT_MODIFIED, /* ".gitmodules" */ - -1, /* "just_a_dir/" will be skipped */ - GIT_STATUS_CURRENT, /* "just_a_dir/contents" */ - GIT_STATUS_CURRENT, /* "just_a_file" */ - GIT_STATUS_WT_NEW, /* "not-submodule/" untracked item */ - -1, /* "not-submodule/README.txt" */ - GIT_STATUS_WT_NEW, /* "not/" untracked item */ - -1, /* "not/README.txt" */ - GIT_STATUS_CURRENT, /* "README.txt */ - GIT_STATUS_INDEX_NEW, /* "sm_added_and_uncommited" */ - GIT_STATUS_WT_MODIFIED, /* "sm_changed_file" */ - GIT_STATUS_WT_MODIFIED, /* "sm_changed_head" */ - GIT_STATUS_WT_MODIFIED, /* "sm_changed_index" */ - GIT_STATUS_WT_MODIFIED, /* "sm_changed_untracked_file" */ - GIT_STATUS_WT_MODIFIED, /* "sm_missing_commits" */ - GIT_STATUS_CURRENT, /* "sm_unchanged" */ - 0 - }; - submodule_expectations exp = { 0, expected, expected_flags }; - git_status_options opts = GIT_STATUS_OPTIONS_INIT; - git_index *index; - - iter_opts.flags = GIT_ITERATOR_IGNORE_CASE | GIT_ITERATOR_INCLUDE_TREES; - - cl_git_pass(git_repository_index(&index, g_repo)); - cl_git_pass(git_iterator_for_workdir(&iter, g_repo, index, NULL, &iter_opts)); - - for (i = 0; !git_iterator_advance(&entry, iter); ++i) - cl_assert_equal_s(expected[i], entry->path); - - git_iterator_free(iter); - git_index_free(index); - - opts.flags = GIT_STATUS_OPT_INCLUDE_UNTRACKED | - GIT_STATUS_OPT_INCLUDE_UNMODIFIED | - GIT_STATUS_OPT_INCLUDE_IGNORED | - GIT_STATUS_OPT_RECURSE_UNTRACKED_DIRS | - GIT_STATUS_OPT_SORT_CASE_INSENSITIVELY; - - cl_git_pass(git_status_foreach_ext( - g_repo, &opts, confirm_submodule_status, &exp)); -} - -void test_submodule_status__untracked_dirs_containing_ignored_files(void) -{ - unsigned int status, expected; - - cl_git_append2file( - "submod2/.git/modules/sm_unchanged/info/exclude", "\n*.ignored\n"); - - cl_git_pass( - git_futils_mkdir_relative("sm_unchanged/directory", "submod2", 0755, 0, NULL)); - cl_git_mkfile( - "submod2/sm_unchanged/directory/i_am.ignored", - "ignore this file, please\n"); - - status = get_submodule_status(g_repo, "sm_unchanged"); - cl_assert(GIT_SUBMODULE_STATUS_IS_UNMODIFIED(status)); - - expected = GIT_SUBMODULE_STATUS_IN_HEAD | - GIT_SUBMODULE_STATUS_IN_INDEX | - GIT_SUBMODULE_STATUS_IN_CONFIG | - GIT_SUBMODULE_STATUS_IN_WD; - cl_assert(status == expected); -} diff --git a/vendor/libgit2/tests/submodule/submodule_helpers.c b/vendor/libgit2/tests/submodule/submodule_helpers.c deleted file mode 100644 index 4ff4b4da7..000000000 --- a/vendor/libgit2/tests/submodule/submodule_helpers.c +++ /dev/null @@ -1,220 +0,0 @@ -#include "clar_libgit2.h" -#include "buffer.h" -#include "path.h" -#include "util.h" -#include "posix.h" -#include "submodule_helpers.h" -#include "git2/sys/repository.h" - -/* rewrite gitmodules -> .gitmodules - * rewrite the empty or relative urls inside each module - * rename the .gitted directory inside any submodule to .git - */ -void rewrite_gitmodules(const char *workdir) -{ - git_buf in_f = GIT_BUF_INIT, out_f = GIT_BUF_INIT, path = GIT_BUF_INIT; - FILE *in, *out; - char line[256]; - - cl_git_pass(git_buf_joinpath(&in_f, workdir, "gitmodules")); - cl_git_pass(git_buf_joinpath(&out_f, workdir, ".gitmodules")); - - cl_assert((in = fopen(in_f.ptr, "rb")) != NULL); - cl_assert((out = fopen(out_f.ptr, "wb")) != NULL); - - while (fgets(line, sizeof(line), in) != NULL) { - char *scan = line; - - while (*scan == ' ' || *scan == '\t') scan++; - - /* rename .gitted -> .git in submodule directories */ - if (git__prefixcmp(scan, "path =") == 0) { - scan += strlen("path ="); - while (*scan == ' ') scan++; - - git_buf_joinpath(&path, workdir, scan); - git_buf_rtrim(&path); - git_buf_joinpath(&path, path.ptr, ".gitted"); - - if (!git_buf_oom(&path) && p_access(path.ptr, F_OK) == 0) { - git_buf_joinpath(&out_f, workdir, scan); - git_buf_rtrim(&out_f); - git_buf_joinpath(&out_f, out_f.ptr, ".git"); - - if (!git_buf_oom(&out_f)) - p_rename(path.ptr, out_f.ptr); - } - } - - /* copy non-"url =" lines verbatim */ - if (git__prefixcmp(scan, "url =") != 0) { - fputs(line, out); - continue; - } - - /* convert relative URLs in "url =" lines */ - scan += strlen("url ="); - while (*scan == ' ') scan++; - - if (*scan == '.') { - git_buf_joinpath(&path, workdir, scan); - git_buf_rtrim(&path); - } else if (!*scan || *scan == '\n') { - git_buf_joinpath(&path, workdir, "../testrepo.git"); - } else { - fputs(line, out); - continue; - } - - git_path_prettify(&path, path.ptr, NULL); - git_buf_putc(&path, '\n'); - cl_assert(!git_buf_oom(&path)); - - fwrite(line, scan - line, sizeof(char), out); - fputs(path.ptr, out); - } - - fclose(in); - fclose(out); - - cl_must_pass(p_unlink(in_f.ptr)); - - git_buf_free(&in_f); - git_buf_free(&out_f); - git_buf_free(&path); -} - -static void cleanup_fixture_submodules(void *payload) -{ - cl_git_sandbox_cleanup(); /* either "submodules" or "submod2" */ - - if (payload) - cl_fixture_cleanup(payload); -} - -git_repository *setup_fixture_submodules(void) -{ - git_repository *repo = cl_git_sandbox_init("submodules"); - - cl_fixture_sandbox("testrepo.git"); - - rewrite_gitmodules(git_repository_workdir(repo)); - p_rename("submodules/testrepo/.gitted", "submodules/testrepo/.git"); - - cl_set_cleanup(cleanup_fixture_submodules, "testrepo.git"); - - cl_git_pass(git_repository_reinit_filesystem(repo, 1)); - - return repo; -} - -git_repository *setup_fixture_submod2(void) -{ - git_repository *repo = cl_git_sandbox_init("submod2"); - - cl_fixture_sandbox("submod2_target"); - p_rename("submod2_target/.gitted", "submod2_target/.git"); - - rewrite_gitmodules(git_repository_workdir(repo)); - p_rename("submod2/not-submodule/.gitted", "submod2/not-submodule/.git"); - p_rename("submod2/not/.gitted", "submod2/not/.git"); - - cl_set_cleanup(cleanup_fixture_submodules, "submod2_target"); - - cl_git_pass(git_repository_reinit_filesystem(repo, 1)); - - return repo; -} - -git_repository *setup_fixture_super(void) -{ - git_repository *repo = cl_git_sandbox_init("super"); - - cl_fixture_sandbox("sub.git"); - p_mkdir("super/sub", 0777); - - rewrite_gitmodules(git_repository_workdir(repo)); - - cl_set_cleanup(cleanup_fixture_submodules, "sub.git"); - - cl_git_pass(git_repository_reinit_filesystem(repo, 1)); - - return repo; -} - -git_repository *setup_fixture_submodule_simple(void) -{ - git_repository *repo = cl_git_sandbox_init("submodule_simple"); - - cl_fixture_sandbox("testrepo.git"); - p_mkdir("submodule_simple/testrepo", 0777); - - cl_set_cleanup(cleanup_fixture_submodules, "testrepo.git"); - - cl_git_pass(git_repository_reinit_filesystem(repo, 1)); - - return repo; -} - -git_repository *setup_fixture_submodule_with_path(void) -{ - git_repository *repo = cl_git_sandbox_init("submodule_with_path"); - - cl_fixture_sandbox("testrepo.git"); - p_mkdir("submodule_with_path/lib", 0777); - p_mkdir("submodule_with_path/lib/testrepo", 0777); - - cl_set_cleanup(cleanup_fixture_submodules, "testrepo.git"); - - cl_git_pass(git_repository_reinit_filesystem(repo, 1)); - - return repo; -} - -void assert__submodule_exists( - git_repository *repo, const char *name, - const char *msg, const char *file, int line) -{ - git_submodule *sm; - int error = git_submodule_lookup(&sm, repo, name); - if (error) - cl_git_report_failure(error, file, line, msg); - cl_assert_at_line(sm != NULL, file, line); - git_submodule_free(sm); -} - -void refute__submodule_exists( - git_repository *repo, const char *name, int expected_error, - const char *msg, const char *file, int line) -{ - clar__assert_equal( - file, line, msg, 1, "%i", - expected_error, (int)(git_submodule_lookup(NULL, repo, name))); -} - -unsigned int get_submodule_status(git_repository *repo, const char *name) -{ - unsigned int status = 0; - - assert(repo && name); - - cl_git_pass(git_submodule_status(&status, repo, name, GIT_SUBMODULE_IGNORE_UNSPECIFIED)); - - return status; -} - -static int print_submodules(git_submodule *sm, const char *name, void *p) -{ - unsigned int loc = 0; - GIT_UNUSED(p); - git_submodule_location(&loc, sm); - fprintf(stderr, "# submodule %s (at %s) flags %x\n", - name, git_submodule_path(sm), loc); - return 0; -} - -void dump_submodules(git_repository *repo) -{ - git_submodule_foreach(repo, print_submodules, NULL); -} - diff --git a/vendor/libgit2/tests/submodule/submodule_helpers.h b/vendor/libgit2/tests/submodule/submodule_helpers.h deleted file mode 100644 index 42b14a7bc..000000000 --- a/vendor/libgit2/tests/submodule/submodule_helpers.h +++ /dev/null @@ -1,24 +0,0 @@ -extern void rewrite_gitmodules(const char *workdir); - -/* these will automatically set a cleanup callback */ -extern git_repository *setup_fixture_submodules(void); -extern git_repository *setup_fixture_submod2(void); -extern git_repository *setup_fixture_submodule_simple(void); -extern git_repository *setup_fixture_super(void); -extern git_repository *setup_fixture_submodule_with_path(void); - -extern unsigned int get_submodule_status(git_repository *, const char *); - -extern void assert__submodule_exists( - git_repository *, const char *, const char *, const char *, int); - -#define assert_submodule_exists(repo,name) \ - assert__submodule_exists(repo, name, "git_submodule_lookup(" #name ") failed", __FILE__, __LINE__) - -extern void refute__submodule_exists( - git_repository *, const char *, int err, const char *, const char *, int); - -#define refute_submodule_exists(repo,name,code) \ - refute__submodule_exists(repo, name, code, "expected git_submodule_lookup(" #name ") to fail with error " #code, __FILE__, __LINE__) - -extern void dump_submodules(git_repository *repo); diff --git a/vendor/libgit2/tests/submodule/update.c b/vendor/libgit2/tests/submodule/update.c deleted file mode 100644 index cbd519d81..000000000 --- a/vendor/libgit2/tests/submodule/update.c +++ /dev/null @@ -1,440 +0,0 @@ -#include "clar_libgit2.h" -#include "posix.h" -#include "path.h" -#include "submodule_helpers.h" -#include "fileops.h" - -static git_repository *g_repo = NULL; - -void test_submodule_update__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -void test_submodule_update__unitialized_submodule_no_init(void) -{ - git_submodule *sm; - git_submodule_update_options update_options = GIT_SUBMODULE_UPDATE_OPTIONS_INIT; - - g_repo = setup_fixture_submodule_simple(); - - /* get the submodule */ - cl_git_pass(git_submodule_lookup(&sm, g_repo, "testrepo")); - - /* updating an unitialized repository throws */ - cl_git_fail_with( - GIT_ERROR, - git_submodule_update(sm, 0, &update_options)); - - git_submodule_free(sm); -} - -struct update_submodule_cb_payload { - int update_tips_called; - int checkout_progress_called; - int checkout_notify_called; -}; - -static void checkout_progress_cb( - const char *path, - size_t completed_steps, - size_t total_steps, - void *payload) -{ - struct update_submodule_cb_payload *update_payload = payload; - - GIT_UNUSED(path); - GIT_UNUSED(completed_steps); - GIT_UNUSED(total_steps); - - update_payload->checkout_progress_called = 1; -} - -static int checkout_notify_cb( - git_checkout_notify_t why, - const char *path, - const git_diff_file *baseline, - const git_diff_file *target, - const git_diff_file *workdir, - void *payload) -{ - struct update_submodule_cb_payload *update_payload = payload; - - GIT_UNUSED(why); - GIT_UNUSED(path); - GIT_UNUSED(baseline); - GIT_UNUSED(target); - GIT_UNUSED(workdir); - - update_payload->checkout_notify_called = 1; - - return 0; -} - -static int update_tips(const char *refname, const git_oid *a, const git_oid *b, void *data) -{ - struct update_submodule_cb_payload *update_payload = data; - - GIT_UNUSED(refname); - GIT_UNUSED(a); - GIT_UNUSED(b); - - update_payload->update_tips_called = 1; - - return 1; -} - -void test_submodule_update__update_submodule(void) -{ - git_submodule *sm; - git_submodule_update_options update_options = GIT_SUBMODULE_UPDATE_OPTIONS_INIT; - unsigned int submodule_status = 0; - struct update_submodule_cb_payload update_payload = { 0 }; - - g_repo = setup_fixture_submodule_simple(); - - update_options.checkout_opts.progress_cb = checkout_progress_cb; - update_options.checkout_opts.progress_payload = &update_payload; - - update_options.fetch_opts.callbacks.update_tips = update_tips; - update_options.fetch_opts.callbacks.payload = &update_payload; - - /* get the submodule */ - cl_git_pass(git_submodule_lookup(&sm, g_repo, "testrepo")); - - /* verify the initial state of the submodule */ - cl_git_pass(git_submodule_status(&submodule_status, g_repo, "testrepo", GIT_SUBMODULE_IGNORE_UNSPECIFIED)); - cl_assert_equal_i(submodule_status, GIT_SUBMODULE_STATUS_IN_HEAD | - GIT_SUBMODULE_STATUS_IN_INDEX | - GIT_SUBMODULE_STATUS_IN_CONFIG | - GIT_SUBMODULE_STATUS_WD_UNINITIALIZED); - - /* initialize and update the submodule */ - cl_git_pass(git_submodule_init(sm, 0)); - cl_git_pass(git_submodule_update(sm, 0, &update_options)); - - /* verify state */ - cl_git_pass(git_submodule_status(&submodule_status, g_repo, "testrepo", GIT_SUBMODULE_IGNORE_UNSPECIFIED)); - cl_assert_equal_i(submodule_status, GIT_SUBMODULE_STATUS_IN_HEAD | - GIT_SUBMODULE_STATUS_IN_INDEX | - GIT_SUBMODULE_STATUS_IN_CONFIG | - GIT_SUBMODULE_STATUS_IN_WD); - - cl_assert(git_oid_streq(git_submodule_head_id(sm), "be3563ae3f795b2b4353bcce3a527ad0a4f7f644") == 0); - cl_assert(git_oid_streq(git_submodule_wd_id(sm), "be3563ae3f795b2b4353bcce3a527ad0a4f7f644") == 0); - cl_assert(git_oid_streq(git_submodule_index_id(sm), "be3563ae3f795b2b4353bcce3a527ad0a4f7f644") == 0); - - /* verify that the expected callbacks have been called. */ - cl_assert_equal_i(1, update_payload.checkout_progress_called); - cl_assert_equal_i(1, update_payload.update_tips_called); - - git_submodule_free(sm); -} - -void test_submodule_update__update_submodule_with_path(void) -{ - git_submodule *sm; - git_submodule_update_options update_options = GIT_SUBMODULE_UPDATE_OPTIONS_INIT; - unsigned int submodule_status = 0; - struct update_submodule_cb_payload update_payload = { 0 }; - - g_repo = setup_fixture_submodule_with_path(); - - update_options.checkout_opts.progress_cb = checkout_progress_cb; - update_options.checkout_opts.progress_payload = &update_payload; - - update_options.fetch_opts.callbacks.update_tips = update_tips; - update_options.fetch_opts.callbacks.payload = &update_payload; - - /* get the submodule */ - cl_git_pass(git_submodule_lookup(&sm, g_repo, "testrepo")); - - /* verify the initial state of the submodule */ - cl_git_pass(git_submodule_status(&submodule_status, g_repo, "testrepo", GIT_SUBMODULE_IGNORE_UNSPECIFIED)); - cl_assert_equal_i(submodule_status, GIT_SUBMODULE_STATUS_IN_HEAD | - GIT_SUBMODULE_STATUS_IN_INDEX | - GIT_SUBMODULE_STATUS_IN_CONFIG | - GIT_SUBMODULE_STATUS_WD_UNINITIALIZED); - - /* initialize and update the submodule */ - cl_git_pass(git_submodule_init(sm, 0)); - cl_git_pass(git_submodule_update(sm, 0, &update_options)); - - /* verify state */ - cl_git_pass(git_submodule_status(&submodule_status, g_repo, "testrepo", GIT_SUBMODULE_IGNORE_UNSPECIFIED)); - cl_assert_equal_i(submodule_status, GIT_SUBMODULE_STATUS_IN_HEAD | - GIT_SUBMODULE_STATUS_IN_INDEX | - GIT_SUBMODULE_STATUS_IN_CONFIG | - GIT_SUBMODULE_STATUS_IN_WD); - - cl_assert(git_oid_streq(git_submodule_head_id(sm), "a65fedf39aefe402d3bb6e24df4d4f5fe4547750") == 0); - cl_assert(git_oid_streq(git_submodule_wd_id(sm), "a65fedf39aefe402d3bb6e24df4d4f5fe4547750") == 0); - cl_assert(git_oid_streq(git_submodule_index_id(sm), "a65fedf39aefe402d3bb6e24df4d4f5fe4547750") == 0); - - /* verify that the expected callbacks have been called. */ - cl_assert_equal_i(1, update_payload.checkout_progress_called); - cl_assert_equal_i(1, update_payload.update_tips_called); - - git_submodule_free(sm); -} - -void test_submodule_update__update_and_init_submodule(void) -{ - git_submodule *sm; - git_submodule_update_options update_options = GIT_SUBMODULE_UPDATE_OPTIONS_INIT; - unsigned int submodule_status = 0; - - g_repo = setup_fixture_submodule_simple(); - - /* get the submodule */ - cl_git_pass(git_submodule_lookup(&sm, g_repo, "testrepo")); - - cl_git_pass(git_submodule_status(&submodule_status, g_repo, "testrepo", GIT_SUBMODULE_IGNORE_UNSPECIFIED)); - cl_assert_equal_i(submodule_status, GIT_SUBMODULE_STATUS_IN_HEAD | - GIT_SUBMODULE_STATUS_IN_INDEX | - GIT_SUBMODULE_STATUS_IN_CONFIG | - GIT_SUBMODULE_STATUS_WD_UNINITIALIZED); - - /* update (with option to initialize sub repo) */ - cl_git_pass(git_submodule_update(sm, 1, &update_options)); - - /* verify expected state */ - cl_assert(git_oid_streq(git_submodule_head_id(sm), "be3563ae3f795b2b4353bcce3a527ad0a4f7f644") == 0); - cl_assert(git_oid_streq(git_submodule_wd_id(sm), "be3563ae3f795b2b4353bcce3a527ad0a4f7f644") == 0); - cl_assert(git_oid_streq(git_submodule_index_id(sm), "be3563ae3f795b2b4353bcce3a527ad0a4f7f644") == 0); - - git_submodule_free(sm); -} - -void test_submodule_update__update_already_checked_out_submodule(void) -{ - git_submodule *sm = NULL; - git_checkout_options checkout_options = GIT_CHECKOUT_OPTIONS_INIT; - git_submodule_update_options update_options = GIT_SUBMODULE_UPDATE_OPTIONS_INIT; - unsigned int submodule_status = 0; - git_reference *branch_reference = NULL; - git_object *branch_commit = NULL; - struct update_submodule_cb_payload update_payload = { 0 }; - - g_repo = setup_fixture_submodule_simple(); - - update_options.checkout_opts.progress_cb = checkout_progress_cb; - update_options.checkout_opts.progress_payload = &update_payload; - - /* Initialize and update the sub repository */ - cl_git_pass(git_submodule_lookup(&sm, g_repo, "testrepo")); - - cl_git_pass(git_submodule_status(&submodule_status, g_repo, "testrepo", GIT_SUBMODULE_IGNORE_UNSPECIFIED)); - cl_assert_equal_i(submodule_status, GIT_SUBMODULE_STATUS_IN_HEAD | - GIT_SUBMODULE_STATUS_IN_INDEX | - GIT_SUBMODULE_STATUS_IN_CONFIG | - GIT_SUBMODULE_STATUS_WD_UNINITIALIZED); - - cl_git_pass(git_submodule_update(sm, 1, &update_options)); - - /* verify expected state */ - cl_assert(git_oid_streq(git_submodule_head_id(sm), "be3563ae3f795b2b4353bcce3a527ad0a4f7f644") == 0); - cl_assert(git_oid_streq(git_submodule_wd_id(sm), "be3563ae3f795b2b4353bcce3a527ad0a4f7f644") == 0); - cl_assert(git_oid_streq(git_submodule_index_id(sm), "be3563ae3f795b2b4353bcce3a527ad0a4f7f644") == 0); - - /* checkout the alternate_1 branch */ - checkout_options.checkout_strategy = GIT_CHECKOUT_SAFE; - - cl_git_pass(git_reference_lookup(&branch_reference, g_repo, "refs/heads/alternate_1")); - cl_git_pass(git_reference_peel(&branch_commit, branch_reference, GIT_OBJ_COMMIT)); - cl_git_pass(git_checkout_tree(g_repo, branch_commit, &checkout_options)); - cl_git_pass(git_repository_set_head(g_repo, git_reference_name(branch_reference))); - - /* - * Verify state after checkout of parent repository. The submodule ID in the - * HEAD commit and index should be updated, but not the workdir. - */ - - cl_git_pass(git_submodule_status(&submodule_status, g_repo, "testrepo", GIT_SUBMODULE_IGNORE_UNSPECIFIED)); - - git_submodule_free(sm); - cl_git_pass(git_submodule_lookup(&sm, g_repo, "testrepo")); - - cl_assert_equal_i(submodule_status, GIT_SUBMODULE_STATUS_IN_HEAD | - GIT_SUBMODULE_STATUS_IN_INDEX | - GIT_SUBMODULE_STATUS_IN_CONFIG | - GIT_SUBMODULE_STATUS_IN_WD | - GIT_SUBMODULE_STATUS_WD_MODIFIED); - - cl_assert(git_oid_streq(git_submodule_head_id(sm), "a65fedf39aefe402d3bb6e24df4d4f5fe4547750") == 0); - cl_assert(git_oid_streq(git_submodule_wd_id(sm), "be3563ae3f795b2b4353bcce3a527ad0a4f7f644") == 0); - cl_assert(git_oid_streq(git_submodule_index_id(sm), "a65fedf39aefe402d3bb6e24df4d4f5fe4547750") == 0); - - /* - * Update the submodule and verify the state. - * Now, the HEAD, index, and Workdir commits should all be updated to - * the new commit. - */ - cl_git_pass(git_submodule_update(sm, 0, &update_options)); - cl_assert(git_oid_streq(git_submodule_head_id(sm), "a65fedf39aefe402d3bb6e24df4d4f5fe4547750") == 0); - cl_assert(git_oid_streq(git_submodule_wd_id(sm), "a65fedf39aefe402d3bb6e24df4d4f5fe4547750") == 0); - cl_assert(git_oid_streq(git_submodule_index_id(sm), "a65fedf39aefe402d3bb6e24df4d4f5fe4547750") == 0); - - /* verify that the expected callbacks have been called. */ - cl_assert_equal_i(1, update_payload.checkout_progress_called); - - git_submodule_free(sm); - git_object_free(branch_commit); - git_reference_free(branch_reference); -} - -void test_submodule_update__update_blocks_on_dirty_wd(void) -{ - git_submodule *sm = NULL; - git_checkout_options checkout_options = GIT_CHECKOUT_OPTIONS_INIT; - git_submodule_update_options update_options = GIT_SUBMODULE_UPDATE_OPTIONS_INIT; - unsigned int submodule_status = 0; - git_reference *branch_reference = NULL; - git_object *branch_commit = NULL; - struct update_submodule_cb_payload update_payload = { 0 }; - - g_repo = setup_fixture_submodule_simple(); - - update_options.checkout_opts.notify_flags = GIT_CHECKOUT_NOTIFY_CONFLICT; - update_options.checkout_opts.notify_cb = checkout_notify_cb; - update_options.checkout_opts.notify_payload = &update_payload; - - /* Initialize and update the sub repository */ - cl_git_pass(git_submodule_lookup(&sm, g_repo, "testrepo")); - - cl_git_pass(git_submodule_status(&submodule_status, g_repo, "testrepo", GIT_SUBMODULE_IGNORE_UNSPECIFIED)); - cl_assert_equal_i(submodule_status, GIT_SUBMODULE_STATUS_IN_HEAD | - GIT_SUBMODULE_STATUS_IN_INDEX | - GIT_SUBMODULE_STATUS_IN_CONFIG | - GIT_SUBMODULE_STATUS_WD_UNINITIALIZED); - - cl_git_pass(git_submodule_update(sm, 1, &update_options)); - - /* verify expected state */ - cl_assert(git_oid_streq(git_submodule_head_id(sm), "be3563ae3f795b2b4353bcce3a527ad0a4f7f644") == 0); - cl_assert(git_oid_streq(git_submodule_wd_id(sm), "be3563ae3f795b2b4353bcce3a527ad0a4f7f644") == 0); - cl_assert(git_oid_streq(git_submodule_index_id(sm), "be3563ae3f795b2b4353bcce3a527ad0a4f7f644") == 0); - - /* checkout the alternate_1 branch */ - checkout_options.checkout_strategy = GIT_CHECKOUT_SAFE; - - cl_git_pass(git_reference_lookup(&branch_reference, g_repo, "refs/heads/alternate_1")); - cl_git_pass(git_reference_peel(&branch_commit, branch_reference, GIT_OBJ_COMMIT)); - cl_git_pass(git_checkout_tree(g_repo, branch_commit, &checkout_options)); - cl_git_pass(git_repository_set_head(g_repo, git_reference_name(branch_reference))); - - /* - * Verify state after checkout of parent repository. The submodule ID in the - * HEAD commit and index should be updated, but not the workdir. - */ - - cl_git_pass(git_submodule_status(&submodule_status, g_repo, "testrepo", GIT_SUBMODULE_IGNORE_UNSPECIFIED)); - - git_submodule_free(sm); - cl_git_pass(git_submodule_lookup(&sm, g_repo, "testrepo")); - - cl_assert_equal_i(submodule_status, GIT_SUBMODULE_STATUS_IN_HEAD | - GIT_SUBMODULE_STATUS_IN_INDEX | - GIT_SUBMODULE_STATUS_IN_CONFIG | - GIT_SUBMODULE_STATUS_IN_WD | - GIT_SUBMODULE_STATUS_WD_MODIFIED); - - cl_assert(git_oid_streq(git_submodule_head_id(sm), "a65fedf39aefe402d3bb6e24df4d4f5fe4547750") == 0); - cl_assert(git_oid_streq(git_submodule_wd_id(sm), "be3563ae3f795b2b4353bcce3a527ad0a4f7f644") == 0); - cl_assert(git_oid_streq(git_submodule_index_id(sm), "a65fedf39aefe402d3bb6e24df4d4f5fe4547750") == 0); - - /* - * Create a conflicting edit in the subrepository to verify that - * the submodule update action is blocked. - */ - cl_git_write2file("submodule_simple/testrepo/branch_file.txt", "a conflicting edit", 0, - O_WRONLY | O_CREAT | O_TRUNC, 0755); - - cl_git_fail(git_submodule_update(sm, 0, &update_options)); - - /* verify that the expected callbacks have been called. */ - cl_assert_equal_i(1, update_payload.checkout_notify_called); - - /* verify that the submodule state has not changed. */ - cl_assert(git_oid_streq(git_submodule_head_id(sm), "a65fedf39aefe402d3bb6e24df4d4f5fe4547750") == 0); - cl_assert(git_oid_streq(git_submodule_wd_id(sm), "be3563ae3f795b2b4353bcce3a527ad0a4f7f644") == 0); - cl_assert(git_oid_streq(git_submodule_index_id(sm), "a65fedf39aefe402d3bb6e24df4d4f5fe4547750") == 0); - - git_submodule_free(sm); - git_object_free(branch_commit); - git_reference_free(branch_reference); -} - -void test_submodule_update__can_force_update(void) -{ - git_submodule *sm = NULL; - git_checkout_options checkout_options = GIT_CHECKOUT_OPTIONS_INIT; - git_submodule_update_options update_options = GIT_SUBMODULE_UPDATE_OPTIONS_INIT; - unsigned int submodule_status = 0; - git_reference *branch_reference = NULL; - git_object *branch_commit = NULL; - - g_repo = setup_fixture_submodule_simple(); - - /* Initialize and update the sub repository */ - cl_git_pass(git_submodule_lookup(&sm, g_repo, "testrepo")); - - cl_git_pass(git_submodule_status(&submodule_status, g_repo, "testrepo", GIT_SUBMODULE_IGNORE_UNSPECIFIED)); - cl_assert_equal_i(submodule_status, GIT_SUBMODULE_STATUS_IN_HEAD | - GIT_SUBMODULE_STATUS_IN_INDEX | - GIT_SUBMODULE_STATUS_IN_CONFIG | - GIT_SUBMODULE_STATUS_WD_UNINITIALIZED); - - cl_git_pass(git_submodule_update(sm, 1, &update_options)); - - /* verify expected state */ - cl_assert(git_oid_streq(git_submodule_head_id(sm), "be3563ae3f795b2b4353bcce3a527ad0a4f7f644") == 0); - cl_assert(git_oid_streq(git_submodule_wd_id(sm), "be3563ae3f795b2b4353bcce3a527ad0a4f7f644") == 0); - cl_assert(git_oid_streq(git_submodule_index_id(sm), "be3563ae3f795b2b4353bcce3a527ad0a4f7f644") == 0); - - /* checkout the alternate_1 branch */ - checkout_options.checkout_strategy = GIT_CHECKOUT_SAFE; - - cl_git_pass(git_reference_lookup(&branch_reference, g_repo, "refs/heads/alternate_1")); - cl_git_pass(git_reference_peel(&branch_commit, branch_reference, GIT_OBJ_COMMIT)); - cl_git_pass(git_checkout_tree(g_repo, branch_commit, &checkout_options)); - cl_git_pass(git_repository_set_head(g_repo, git_reference_name(branch_reference))); - - /* - * Verify state after checkout of parent repository. The submodule ID in the - * HEAD commit and index should be updated, but not the workdir. - */ - cl_git_pass(git_submodule_status(&submodule_status, g_repo, "testrepo", GIT_SUBMODULE_IGNORE_UNSPECIFIED)); - - git_submodule_free(sm); - cl_git_pass(git_submodule_lookup(&sm, g_repo, "testrepo")); - - cl_assert_equal_i(submodule_status, GIT_SUBMODULE_STATUS_IN_HEAD | - GIT_SUBMODULE_STATUS_IN_INDEX | - GIT_SUBMODULE_STATUS_IN_CONFIG | - GIT_SUBMODULE_STATUS_IN_WD | - GIT_SUBMODULE_STATUS_WD_MODIFIED); - - cl_assert(git_oid_streq(git_submodule_head_id(sm), "a65fedf39aefe402d3bb6e24df4d4f5fe4547750") == 0); - cl_assert(git_oid_streq(git_submodule_wd_id(sm), "be3563ae3f795b2b4353bcce3a527ad0a4f7f644") == 0); - cl_assert(git_oid_streq(git_submodule_index_id(sm), "a65fedf39aefe402d3bb6e24df4d4f5fe4547750") == 0); - - /* - * Create a conflicting edit in the subrepository to verify that - * the submodule update action is blocked. - */ - cl_git_write2file("submodule_simple/testrepo/branch_file.txt", "a conflicting edit", 0, - O_WRONLY | O_CREAT | O_TRUNC, 0777); - - /* forcefully checkout and verify the submodule state was updated. */ - update_options.checkout_opts.checkout_strategy = GIT_CHECKOUT_FORCE; - cl_git_pass(git_submodule_update(sm, 0, &update_options)); - cl_assert(git_oid_streq(git_submodule_head_id(sm), "a65fedf39aefe402d3bb6e24df4d4f5fe4547750") == 0); - cl_assert(git_oid_streq(git_submodule_wd_id(sm), "a65fedf39aefe402d3bb6e24df4d4f5fe4547750") == 0); - cl_assert(git_oid_streq(git_submodule_index_id(sm), "a65fedf39aefe402d3bb6e24df4d4f5fe4547750") == 0); - - git_submodule_free(sm); - git_object_free(branch_commit); - git_reference_free(branch_reference); -} - diff --git a/vendor/libgit2/tests/threads/basic.c b/vendor/libgit2/tests/threads/basic.c deleted file mode 100644 index 9c342bc42..000000000 --- a/vendor/libgit2/tests/threads/basic.c +++ /dev/null @@ -1,50 +0,0 @@ -#include "clar_libgit2.h" - -#include "thread_helpers.h" -#include "cache.h" - - -static git_repository *g_repo; - -void test_threads_basic__initialize(void) -{ - g_repo = cl_git_sandbox_init("testrepo"); -} - -void test_threads_basic__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - - -void test_threads_basic__cache(void) -{ - // run several threads polling the cache at the same time - cl_assert(1 == 1); -} - -void test_threads_basic__multiple_init(void) -{ - git_repository *nested_repo; - - git_libgit2_init(); - cl_git_pass(git_repository_open(&nested_repo, cl_fixture("testrepo.git"))); - git_repository_free(nested_repo); - - git_libgit2_shutdown(); - cl_git_pass(git_repository_open(&nested_repo, cl_fixture("testrepo.git"))); - git_repository_free(nested_repo); -} - -static void *set_error(void *dummy) -{ - giterr_set(GITERR_INVALID, "oh no, something happened!\n"); - - return dummy; -} - -/* Set errors so we can check that we free it */ -void test_threads_basic__set_error(void) -{ - run_in_parallel(1, 4, set_error, NULL, NULL); -} diff --git a/vendor/libgit2/tests/threads/diff.c b/vendor/libgit2/tests/threads/diff.c deleted file mode 100644 index c32811469..000000000 --- a/vendor/libgit2/tests/threads/diff.c +++ /dev/null @@ -1,196 +0,0 @@ -#include "clar_libgit2.h" -#include "thread_helpers.h" - -#ifdef GIT_THREADS - -# if defined(GIT_WIN32) -# define git_thread_yield() Sleep(0) -# elif defined(__FreeBSD__) || defined(__MidnightBSD__) || defined(__DragonFly__) -# define git_thread_yield() pthread_yield() -# else -# define git_thread_yield() sched_yield() -# endif - -#else -# define git_thread_yield() (void)0 -#endif - -static git_repository *_repo; -static git_tree *_a, *_b; -static git_atomic _counts[4]; -static int _check_counts; - -#define THREADS 20 - -void test_threads_diff__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -static void setup_trees(void) -{ - git_index *idx; - - _repo = cl_git_sandbox_reopen(); /* reopen sandbox to flush caches */ - - /* avoid competing to load initial index */ - cl_git_pass(git_repository_index(&idx, _repo)); - git_index_free(idx); - - cl_git_pass(git_revparse_single( - (git_object **)&_a, _repo, "0017bd4ab1^{tree}")); - cl_git_pass(git_revparse_single( - (git_object **)&_b, _repo, "26a125ee1b^{tree}")); - - memset(_counts, 0, sizeof(_counts)); -} - -static void free_trees(void) -{ - git_tree_free(_a); _a = NULL; - git_tree_free(_b); _b = NULL; - - if (_check_counts) { - cl_assert_equal_i(288, git_atomic_get(&_counts[0])); - cl_assert_equal_i(112, git_atomic_get(&_counts[1])); - cl_assert_equal_i( 80, git_atomic_get(&_counts[2])); - cl_assert_equal_i( 96, git_atomic_get(&_counts[3])); - } -} - -static void *run_index_diffs(void *arg) -{ - int thread = *(int *)arg; - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - git_diff *diff = NULL; - size_t i; - int exp[4] = { 0, 0, 0, 0 }; - - switch (thread & 0x03) { - case 0: /* diff index to workdir */; - cl_git_pass(git_diff_index_to_workdir(&diff, _repo, NULL, &opts)); - break; - case 1: /* diff tree 'a' to index */; - cl_git_pass(git_diff_tree_to_index(&diff, _repo, _a, NULL, &opts)); - break; - case 2: /* diff tree 'b' to index */; - cl_git_pass(git_diff_tree_to_index(&diff, _repo, _b, NULL, &opts)); - break; - case 3: /* diff index to workdir (explicit index) */; - { - git_index *idx; - cl_git_pass(git_repository_index(&idx, _repo)); - cl_git_pass(git_diff_index_to_workdir(&diff, _repo, idx, &opts)); - git_index_free(idx); - break; - } - } - - /* keep some diff stats to make sure results are as expected */ - - i = git_diff_num_deltas(diff); - git_atomic_add(&_counts[0], (int32_t)i); - exp[0] = (int)i; - - while (i > 0) { - switch (git_diff_get_delta(diff, --i)->status) { - case GIT_DELTA_MODIFIED: exp[1]++; git_atomic_inc(&_counts[1]); break; - case GIT_DELTA_ADDED: exp[2]++; git_atomic_inc(&_counts[2]); break; - case GIT_DELTA_DELETED: exp[3]++; git_atomic_inc(&_counts[3]); break; - default: break; - } - } - - switch (thread & 0x03) { - case 0: case 3: - cl_assert_equal_i(8, exp[0]); cl_assert_equal_i(4, exp[1]); - cl_assert_equal_i(0, exp[2]); cl_assert_equal_i(4, exp[3]); - break; - case 1: - cl_assert_equal_i(12, exp[0]); cl_assert_equal_i(3, exp[1]); - cl_assert_equal_i(7, exp[2]); cl_assert_equal_i(2, exp[3]); - break; - case 2: - cl_assert_equal_i(8, exp[0]); cl_assert_equal_i(3, exp[1]); - cl_assert_equal_i(3, exp[2]); cl_assert_equal_i(2, exp[3]); - break; - } - - git_diff_free(diff); - giterr_clear(); - - return arg; -} - -void test_threads_diff__concurrent_diffs(void) -{ - _repo = cl_git_sandbox_init("status"); - _check_counts = 1; - - run_in_parallel( - 5, 32, run_index_diffs, setup_trees, free_trees); -} - -static void *run_index_diffs_with_modifier(void *arg) -{ - int thread = *(int *)arg; - git_diff_options opts = GIT_DIFF_OPTIONS_INIT; - git_diff *diff = NULL; - git_index *idx = NULL; - - cl_git_pass(git_repository_index(&idx, _repo)); - - /* have first thread altering the index as we go */ - if (thread == 0) { - int i; - - for (i = 0; i < 300; ++i) { - switch (i & 0x03) { - case 0: (void)git_index_add_bypath(idx, "new_file"); break; - case 1: (void)git_index_remove_bypath(idx, "modified_file"); break; - case 2: (void)git_index_remove_bypath(idx, "new_file"); break; - case 3: (void)git_index_add_bypath(idx, "modified_file"); break; - } - git_thread_yield(); - } - - goto done; - } - - /* only use explicit index in this test to prevent reloading */ - - switch (thread & 0x03) { - case 0: /* diff index to workdir */; - cl_git_pass(git_diff_index_to_workdir(&diff, _repo, idx, &opts)); - break; - case 1: /* diff tree 'a' to index */; - cl_git_pass(git_diff_tree_to_index(&diff, _repo, _a, idx, &opts)); - break; - case 2: /* diff tree 'b' to index */; - cl_git_pass(git_diff_tree_to_index(&diff, _repo, _b, idx, &opts)); - break; - case 3: /* diff index to workdir reversed */; - opts.flags |= GIT_DIFF_REVERSE; - cl_git_pass(git_diff_index_to_workdir(&diff, _repo, idx, &opts)); - break; - } - - /* results will be unpredictable with index modifier thread running */ - - git_diff_free(diff); - -done: - git_index_free(idx); - giterr_clear(); - - return arg; -} - -void test_threads_diff__with_concurrent_index_modified(void) -{ - _repo = cl_git_sandbox_init("status"); - _check_counts = 0; - - run_in_parallel( - 5, 16, run_index_diffs_with_modifier, setup_trees, free_trees); -} diff --git a/vendor/libgit2/tests/threads/iterator.c b/vendor/libgit2/tests/threads/iterator.c deleted file mode 100644 index 6b86cf1a0..000000000 --- a/vendor/libgit2/tests/threads/iterator.c +++ /dev/null @@ -1,52 +0,0 @@ -#include "clar_libgit2.h" -#include "thread_helpers.h" -#include "iterator.h" - -static git_repository *_repo; - -void test_threads_iterator__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -static void *run_workdir_iterator(void *arg) -{ - int error = 0; - git_iterator *iter; - git_iterator_options iter_opts = GIT_ITERATOR_OPTIONS_INIT; - const git_index_entry *entry = NULL; - - iter_opts.flags = GIT_ITERATOR_DONT_AUTOEXPAND; - - cl_git_pass(git_iterator_for_workdir( - &iter, _repo, NULL, NULL, &iter_opts)); - - while (!error) { - if (entry && entry->mode == GIT_FILEMODE_TREE) { - error = git_iterator_advance_into(&entry, iter); - - if (error == GIT_ENOTFOUND) - error = git_iterator_advance(&entry, iter); - } else { - error = git_iterator_advance(&entry, iter); - } - - if (!error) - (void)git_iterator_current_is_ignored(iter); - } - - cl_assert_equal_i(GIT_ITEROVER, error); - - git_iterator_free(iter); - giterr_clear(); - return arg; -} - - -void test_threads_iterator__workdir(void) -{ - _repo = cl_git_sandbox_init("status"); - - run_in_parallel( - 1, 20, run_workdir_iterator, NULL, NULL); -} diff --git a/vendor/libgit2/tests/threads/refdb.c b/vendor/libgit2/tests/threads/refdb.c deleted file mode 100644 index 6589e3922..000000000 --- a/vendor/libgit2/tests/threads/refdb.c +++ /dev/null @@ -1,221 +0,0 @@ -#include "clar_libgit2.h" -#include "git2/refdb.h" -#include "refdb.h" - -static git_repository *g_repo; -static int g_expected = 0; - -void test_threads_refdb__initialize(void) -{ - g_repo = NULL; -} - -void test_threads_refdb__cleanup(void) -{ - cl_git_sandbox_cleanup(); - g_repo = NULL; -} - -#define REPEAT 20 -#define THREADS 20 - -static void *iterate_refs(void *arg) -{ - git_reference_iterator *i; - git_reference *ref; - int count = 0; - - cl_git_pass(git_reference_iterator_new(&i, g_repo)); - - for (count = 0; !git_reference_next(&ref, i); ++count) { - cl_assert(ref != NULL); - git_reference_free(ref); - } - - if (g_expected > 0) - cl_assert_equal_i(g_expected, count); - - git_reference_iterator_free(i); - - giterr_clear(); - return arg; -} - -void test_threads_refdb__iterator(void) -{ - int r, t; - git_thread th[THREADS]; - int id[THREADS]; - git_oid head; - git_reference *ref; - char name[128]; - git_refdb *refdb; - - g_repo = cl_git_sandbox_init("testrepo2"); - - cl_git_pass(git_reference_name_to_id(&head, g_repo, "HEAD")); - - /* make a bunch of references */ - - for (r = 0; r < 200; ++r) { - p_snprintf(name, sizeof(name), "refs/heads/direct-%03d", r); - cl_git_pass(git_reference_create(&ref, g_repo, name, &head, 0, NULL)); - git_reference_free(ref); - } - - cl_git_pass(git_repository_refdb(&refdb, g_repo)); - cl_git_pass(git_refdb_compress(refdb)); - git_refdb_free(refdb); - - g_expected = 206; - - for (r = 0; r < REPEAT; ++r) { - g_repo = cl_git_sandbox_reopen(); /* reopen to flush caches */ - - for (t = 0; t < THREADS; ++t) { - id[t] = t; -#ifdef GIT_THREADS - cl_git_pass(git_thread_create(&th[t], NULL, iterate_refs, &id[t])); -#else - th[t] = t; - iterate_refs(&id[t]); -#endif - } - -#ifdef GIT_THREADS - for (t = 0; t < THREADS; ++t) { - cl_git_pass(git_thread_join(&th[t], NULL)); - } -#endif - - memset(th, 0, sizeof(th)); - } -} - -static void *create_refs(void *arg) -{ - int *id = arg, i; - git_oid head; - char name[128]; - git_reference *ref[10]; - - cl_git_pass(git_reference_name_to_id(&head, g_repo, "HEAD")); - - for (i = 0; i < 10; ++i) { - p_snprintf(name, sizeof(name), "refs/heads/thread-%03d-%02d", *id, i); - cl_git_pass(git_reference_create(&ref[i], g_repo, name, &head, 0, NULL)); - - if (i == 5) { - git_refdb *refdb; - cl_git_pass(git_repository_refdb(&refdb, g_repo)); - cl_git_pass(git_refdb_compress(refdb)); - git_refdb_free(refdb); - } - } - - for (i = 0; i < 10; ++i) - git_reference_free(ref[i]); - - giterr_clear(); - return arg; -} - -static void *delete_refs(void *arg) -{ - int *id = arg, i; - git_reference *ref; - char name[128]; - - for (i = 0; i < 10; ++i) { - p_snprintf( - name, sizeof(name), "refs/heads/thread-%03d-%02d", (*id) & ~0x3, i); - - if (!git_reference_lookup(&ref, g_repo, name)) { - cl_git_pass(git_reference_delete(ref)); - git_reference_free(ref); - } - - if (i == 5) { - git_refdb *refdb; - cl_git_pass(git_repository_refdb(&refdb, g_repo)); - cl_git_pass(git_refdb_compress(refdb)); - git_refdb_free(refdb); - } - } - - giterr_clear(); - return arg; -} - -void test_threads_refdb__edit_while_iterate(void) -{ - int r, t; - int id[THREADS]; - git_oid head; - git_reference *ref; - char name[128]; - git_refdb *refdb; - -#ifdef GIT_THREADS - git_thread th[THREADS]; -#endif - - g_repo = cl_git_sandbox_init("testrepo2"); - - cl_git_pass(git_reference_name_to_id(&head, g_repo, "HEAD")); - - /* make a bunch of references */ - - for (r = 0; r < 50; ++r) { - p_snprintf(name, sizeof(name), "refs/heads/starter-%03d", r); - cl_git_pass(git_reference_create(&ref, g_repo, name, &head, 0, NULL)); - git_reference_free(ref); - } - - cl_git_pass(git_repository_refdb(&refdb, g_repo)); - cl_git_pass(git_refdb_compress(refdb)); - git_refdb_free(refdb); - - g_expected = -1; - - g_repo = cl_git_sandbox_reopen(); /* reopen to flush caches */ - - for (t = 0; t < THREADS; ++t) { - void *(*fn)(void *arg); - - switch (t & 0x3) { - case 0: fn = create_refs; break; - case 1: fn = delete_refs; break; - default: fn = iterate_refs; break; - } - - id[t] = t; - - /* It appears with all reflog writing changes, etc., that this - * test has started to fail quite frequently, so let's disable it - * for now by just running on a single thread... - */ -/* #ifdef GIT_THREADS */ -/* cl_git_pass(git_thread_create(&th[t], NULL, fn, &id[t])); */ -/* #else */ - fn(&id[t]); -/* #endif */ - } - -#ifdef GIT_THREADS -/* for (t = 0; t < THREADS; ++t) { */ -/* cl_git_pass(git_thread_join(th[t], NULL)); */ -/* } */ - - memset(th, 0, sizeof(th)); - - for (t = 0; t < THREADS; ++t) { - id[t] = t; - cl_git_pass(git_thread_create(&th[t], NULL, iterate_refs, &id[t])); - } - - for (t = 0; t < THREADS; ++t) { - cl_git_pass(git_thread_join(&th[t], NULL)); - } -#endif -} diff --git a/vendor/libgit2/tests/threads/thread_helpers.c b/vendor/libgit2/tests/threads/thread_helpers.c deleted file mode 100644 index 760a7bd33..000000000 --- a/vendor/libgit2/tests/threads/thread_helpers.c +++ /dev/null @@ -1,44 +0,0 @@ -#include "clar_libgit2.h" -#include "thread_helpers.h" - -void run_in_parallel( - int repeats, - int threads, - void *(*func)(void *), - void (*before_test)(void), - void (*after_test)(void)) -{ - int r, t, *id = git__calloc(threads, sizeof(int)); -#ifdef GIT_THREADS - git_thread *th = git__calloc(threads, sizeof(git_thread)); - cl_assert(th != NULL); -#else - void *th = NULL; -#endif - - cl_assert(id != NULL); - - for (r = 0; r < repeats; ++r) { - if (before_test) before_test(); - - for (t = 0; t < threads; ++t) { - id[t] = t; -#ifdef GIT_THREADS - cl_git_pass(git_thread_create(&th[t], NULL, func, &id[t])); -#else - cl_assert(func(&id[t]) == &id[t]); -#endif - } - -#ifdef GIT_THREADS - for (t = 0; t < threads; ++t) - cl_git_pass(git_thread_join(&th[t], NULL)); - memset(th, 0, threads * sizeof(git_thread)); -#endif - - if (after_test) after_test(); - } - - git__free(id); - git__free(th); -} diff --git a/vendor/libgit2/tests/threads/thread_helpers.h b/vendor/libgit2/tests/threads/thread_helpers.h deleted file mode 100644 index 3c13cfb6b..000000000 --- a/vendor/libgit2/tests/threads/thread_helpers.h +++ /dev/null @@ -1,8 +0,0 @@ -#include "thread-utils.h" - -void run_in_parallel( - int repeats, - int threads, - void *(*func)(void *), - void (*before_test)(void), - void (*after_test)(void)); diff --git a/vendor/libgit2/tests/trace/trace.c b/vendor/libgit2/tests/trace/trace.c deleted file mode 100644 index 097208bff..000000000 --- a/vendor/libgit2/tests/trace/trace.c +++ /dev/null @@ -1,106 +0,0 @@ -#include "clar_libgit2.h" -#include "clar_libgit2_trace.h" -#include "trace.h" - -static int written = 0; - -static void trace_callback(git_trace_level_t level, const char *message) -{ - GIT_UNUSED(level); - - cl_assert(strcmp(message, "Hello world!") == 0); - - written = 1; -} - -void test_trace_trace__initialize(void) -{ - /* If global tracing is enabled, disable for the duration of this test. */ - cl_global_trace_disable(); - - git_trace_set(GIT_TRACE_INFO, trace_callback); - written = 0; -} - -void test_trace_trace__cleanup(void) -{ - git_trace_set(GIT_TRACE_NONE, NULL); - - /* If global tracing was enabled, restart it. */ - cl_global_trace_register(); -} - -void test_trace_trace__sets(void) -{ -#ifdef GIT_TRACE - cl_assert(git_trace_level() == GIT_TRACE_INFO); -#else - cl_skip(); -#endif -} - -void test_trace_trace__can_reset(void) -{ -#ifdef GIT_TRACE - cl_assert(git_trace_level() == GIT_TRACE_INFO); - cl_git_pass(git_trace_set(GIT_TRACE_ERROR, trace_callback)); - - cl_assert(written == 0); - git_trace(GIT_TRACE_INFO, "Hello %s!", "world"); - cl_assert(written == 0); - - git_trace(GIT_TRACE_ERROR, "Hello %s!", "world"); - cl_assert(written == 1); -#else - cl_skip(); -#endif -} - -void test_trace_trace__can_unset(void) -{ -#ifdef GIT_TRACE - cl_assert(git_trace_level() == GIT_TRACE_INFO); - cl_git_pass(git_trace_set(GIT_TRACE_NONE, NULL)); - - cl_assert(git_trace_level() == GIT_TRACE_NONE); - - cl_assert(written == 0); - git_trace(GIT_TRACE_FATAL, "Hello %s!", "world"); - cl_assert(written == 0); -#else - cl_skip(); -#endif -} - -void test_trace_trace__skips_higher_level(void) -{ -#ifdef GIT_TRACE - cl_assert(written == 0); - git_trace(GIT_TRACE_DEBUG, "Hello %s!", "world"); - cl_assert(written == 0); -#else - cl_skip(); -#endif -} - -void test_trace_trace__writes(void) -{ -#ifdef GIT_TRACE - cl_assert(written == 0); - git_trace(GIT_TRACE_INFO, "Hello %s!", "world"); - cl_assert(written == 1); -#else - cl_skip(); -#endif -} - -void test_trace_trace__writes_lower_level(void) -{ -#ifdef GIT_TRACE - cl_assert(written == 0); - git_trace(GIT_TRACE_ERROR, "Hello %s!", "world"); - cl_assert(written == 1); -#else - cl_skip(); -#endif -} diff --git a/vendor/libgit2/tests/trace/windows/stacktrace.c b/vendor/libgit2/tests/trace/windows/stacktrace.c deleted file mode 100644 index c00c1b774..000000000 --- a/vendor/libgit2/tests/trace/windows/stacktrace.c +++ /dev/null @@ -1,151 +0,0 @@ -#include "clar_libgit2.h" -#include "win32/w32_stack.h" - -#if defined(GIT_MSVC_CRTDBG) -static void a(void) -{ - char buf[10000]; - - cl_assert(git_win32__stack(buf, sizeof(buf), 0, NULL, NULL) == 0); - -#if 0 - fprintf(stderr, "Stacktrace from [%s:%d]:\n%s\n", __FILE__, __LINE__, buf); -#endif -} - -static void b(void) -{ - a(); -} - -static void c(void) -{ - b(); -} -#endif - -void test_trace_windows_stacktrace__basic(void) -{ -#if defined(GIT_MSVC_CRTDBG) - c(); -#endif -} - - -void test_trace_windows_stacktrace__leaks(void) -{ -#if defined(GIT_MSVC_CRTDBG) - void * p1; - void * p2; - void * p3; - void * p4; - int before, after; - int leaks; - int error; - - /* remember outstanding leaks due to set setup - * and set mark/checkpoint. - */ - before = git_win32__crtdbg_stacktrace__dump( - GIT_WIN32__CRTDBG_STACKTRACE__QUIET | - GIT_WIN32__CRTDBG_STACKTRACE__LEAKS_TOTAL | - GIT_WIN32__CRTDBG_STACKTRACE__SET_MARK, - NULL); - - p1 = git__malloc(5); - leaks = git_win32__crtdbg_stacktrace__dump( - GIT_WIN32__CRTDBG_STACKTRACE__QUIET | - GIT_WIN32__CRTDBG_STACKTRACE__LEAKS_SINCE_MARK, - "p1"); - cl_assert((leaks == 1)); - - p2 = git__malloc(5); - leaks = git_win32__crtdbg_stacktrace__dump( - GIT_WIN32__CRTDBG_STACKTRACE__QUIET | - GIT_WIN32__CRTDBG_STACKTRACE__LEAKS_SINCE_MARK, - "p1,p2"); - cl_assert((leaks == 2)); - - p3 = git__malloc(5); - leaks = git_win32__crtdbg_stacktrace__dump( - GIT_WIN32__CRTDBG_STACKTRACE__QUIET | - GIT_WIN32__CRTDBG_STACKTRACE__LEAKS_SINCE_MARK, - "p1,p2,p3"); - cl_assert((leaks == 3)); - - git__free(p2); - leaks = git_win32__crtdbg_stacktrace__dump( - GIT_WIN32__CRTDBG_STACKTRACE__QUIET | - GIT_WIN32__CRTDBG_STACKTRACE__LEAKS_SINCE_MARK, - "p1,p3"); - cl_assert((leaks == 2)); - - /* move the mark. only new leaks should appear afterwards */ - error = git_win32__crtdbg_stacktrace__dump( - GIT_WIN32__CRTDBG_STACKTRACE__SET_MARK, - NULL); - cl_assert((error == 0)); - - leaks = git_win32__crtdbg_stacktrace__dump( - GIT_WIN32__CRTDBG_STACKTRACE__QUIET | - GIT_WIN32__CRTDBG_STACKTRACE__LEAKS_SINCE_MARK, - "not_p1,not_p3"); - cl_assert((leaks == 0)); - - p4 = git__malloc(5); - leaks = git_win32__crtdbg_stacktrace__dump( - GIT_WIN32__CRTDBG_STACKTRACE__QUIET | - GIT_WIN32__CRTDBG_STACKTRACE__LEAKS_SINCE_MARK, - "p4,not_p1,not_p3"); - cl_assert((leaks == 1)); - - git__free(p1); - git__free(p3); - leaks = git_win32__crtdbg_stacktrace__dump( - GIT_WIN32__CRTDBG_STACKTRACE__QUIET | - GIT_WIN32__CRTDBG_STACKTRACE__LEAKS_SINCE_MARK, - "p4"); - cl_assert((leaks == 1)); - - git__free(p4); - leaks = git_win32__crtdbg_stacktrace__dump( - GIT_WIN32__CRTDBG_STACKTRACE__QUIET | - GIT_WIN32__CRTDBG_STACKTRACE__LEAKS_SINCE_MARK, - "end"); - cl_assert((leaks == 0)); - - /* confirm current absolute leaks count matches beginning value. */ - after = git_win32__crtdbg_stacktrace__dump( - GIT_WIN32__CRTDBG_STACKTRACE__QUIET | - GIT_WIN32__CRTDBG_STACKTRACE__LEAKS_TOTAL, - "total"); - cl_assert((before == after)); -#endif -} - -#if defined(GIT_MSVC_CRTDBG) -static void aux_cb_alloc__1(unsigned int *aux_id) -{ - static unsigned int aux_counter = 0; - - *aux_id = aux_counter++; -} - -static void aux_cb_lookup__1(unsigned int aux_id, char *aux_msg, unsigned int aux_msg_len) -{ - p_snprintf(aux_msg, aux_msg_len, "\tQQ%08x\n", aux_id); -} - -#endif - -void test_trace_windows_stacktrace__aux1(void) -{ -#if defined(GIT_MSVC_CRTDBG) - git_win32__stack__set_aux_cb(aux_cb_alloc__1, aux_cb_lookup__1); - c(); - c(); - c(); - c(); - git_win32__stack__set_aux_cb(NULL, NULL); -#endif -} diff --git a/vendor/libgit2/tests/transport/register.c b/vendor/libgit2/tests/transport/register.c deleted file mode 100644 index 97aae6b20..000000000 --- a/vendor/libgit2/tests/transport/register.c +++ /dev/null @@ -1,77 +0,0 @@ -#include "clar_libgit2.h" -#include "git2/sys/transport.h" - -static git_transport _transport = GIT_TRANSPORT_INIT; - -static int dummy_transport(git_transport **transport, git_remote *owner, void *param) -{ - *transport = &_transport; - GIT_UNUSED(owner); - GIT_UNUSED(param); - return 0; -} - -void test_transport_register__custom_transport(void) -{ - git_transport *transport; - - cl_git_pass(git_transport_register("something", dummy_transport, NULL)); - - cl_git_pass(git_transport_new(&transport, NULL, "something://somepath")); - - cl_assert(transport == &_transport); - - cl_git_pass(git_transport_unregister("something")); -} - -void test_transport_register__custom_transport_error_doubleregister(void) -{ - cl_git_pass(git_transport_register("something", dummy_transport, NULL)); - - cl_git_fail_with(git_transport_register("something", dummy_transport, NULL), GIT_EEXISTS); - - cl_git_pass(git_transport_unregister("something")); -} - -void test_transport_register__custom_transport_error_remove_non_existing(void) -{ - cl_git_fail_with(git_transport_unregister("something"), GIT_ENOTFOUND); -} - -void test_transport_register__custom_transport_ssh(void) -{ - const char *urls[] = { - "ssh://somehost:somepath", - "ssh+git://somehost:somepath", - "git+ssh://somehost:somepath", - "git@somehost:somepath", - }; - git_transport *transport; - unsigned i; - - for (i = 0; i < ARRAY_SIZE(urls); i++) { -#ifndef GIT_SSH - cl_git_fail_with(git_transport_new(&transport, NULL, urls[i]), -1); -#else - cl_git_pass(git_transport_new(&transport, NULL, urls[i])); - transport->free(transport); -#endif - } - - cl_git_pass(git_transport_register("ssh", dummy_transport, NULL)); - - cl_git_pass(git_transport_new(&transport, NULL, "git@somehost:somepath")); - - cl_assert(transport == &_transport); - - cl_git_pass(git_transport_unregister("ssh")); - - for (i = 0; i < ARRAY_SIZE(urls); i++) { -#ifndef GIT_SSH - cl_git_fail_with(git_transport_new(&transport, NULL, urls[i]), -1); -#else - cl_git_pass(git_transport_new(&transport, NULL, urls[i])); - transport->free(transport); -#endif - } -} diff --git a/vendor/libgit2/tests/valgrind-supp-mac.txt b/vendor/libgit2/tests/valgrind-supp-mac.txt deleted file mode 100644 index 0cdc975fa..000000000 --- a/vendor/libgit2/tests/valgrind-supp-mac.txt +++ /dev/null @@ -1,176 +0,0 @@ -{ - libgit2-giterr-set-buffer - Memcheck:Leak - ... - fun:git__realloc - fun:git_buf_try_grow - fun:git_buf_grow - fun:git_buf_vprintf - fun:giterr_set -} -{ - mac-setenv-leak-1 - Memcheck:Leak - fun:malloc_zone_malloc - fun:__setenv - fun:setenv -} -{ - mac-setenv-leak-2 - Memcheck:Leak - fun:malloc_zone_malloc - fun:malloc_set_zone_name - ... - fun:init__zone0 - fun:setenv -} -{ - mac-dyld-initializer-leak - Memcheck:Leak - fun:malloc - ... - fun:dyld_register_image_state_change_handler - fun:_dyld_initializer -} -{ - mac-tz-leak-1 - Memcheck:Leak - ... - fun:token_table_add - fun:notify_register_check - fun:notify_register_tz -} -{ - mac-tz-leak-2 - Memcheck:Leak - fun:malloc - fun:tzload -} -{ - mac-tz-leak-3 - Memcheck:Leak - fun:malloc - fun:tzsetwall_basic -} -{ - mac-tz-leak-4 - Memcheck:Leak - fun:malloc - fun:gmtsub -} -{ - mac-system-init-leak-1 - Memcheck:Leak - ... - fun:_libxpc_initializer - fun:libSystem_initializer -} -{ - mac-system-init-leak-2 - Memcheck:Leak - ... - fun:__keymgr_initializer - fun:libSystem_initializer -} -{ - mac-puts-leak - Memcheck:Leak - fun:malloc - fun:__smakebuf - ... - fun:puts -} -{ - mac-ssl-uninitialized-1 - Memcheck:Cond - obj:/usr/lib/libcrypto.0.9.8.dylib - ... - fun:ssl23_connect -} -{ - mac-ssl-uninitialized-2 - Memcheck:Cond - ... - obj:/usr/lib/libssl.0.9.8.dylib - ... - fun:ssl23_connect -} -{ - mac-ssl-uninitialized-3 - Memcheck:Value8 - obj:/usr/lib/libcrypto.0.9.8.dylib - ... - fun:ssl23_connect -} -{ - mac-ssl-leak-1 - Memcheck:Leak - ... - fun:ERR_load_strings -} -{ - mac-ssl-leak-2 - Memcheck:Leak - ... - fun:SSL_library_init -} -{ - mac-ssl-leak-3 - Memcheck:Leak - ... - fun:si_module_with_name - fun:getaddrinfo -} -{ - mac-ssl-leak-4 - Memcheck:Leak - fun:malloc - fun:CRYPTO_malloc - ... - fun:ssl3_get_server_certificate -} -{ - mac-ssl-leak-5 - Memcheck:Leak - fun:malloc - fun:CRYPTO_malloc - ... - fun:ERR_put_error -} -{ - clar-printf-buf - Memcheck:Leak - fun:malloc - fun:__smakebuf - ... - fun:printf - fun:clar_print_init -} -{ - molo-1 - Memcheck:Leak - fun:malloc_zone_malloc - ... - fun:_objc_init -} -{ - molo-2 - Memcheck:Leak - fun:malloc_zone_calloc - ... - fun:_objc_init -} -{ - molo-3 - Memcheck:Leak - fun:malloc - ... - fun:_objc_init -} -{ - molo-4 - Memcheck:Leak - fun:malloc - ... - fun:dyld_register_image_state_change_handler -} diff --git a/vendor/libgit2/tests/win32/forbidden.c b/vendor/libgit2/tests/win32/forbidden.c deleted file mode 100644 index e02f41179..000000000 --- a/vendor/libgit2/tests/win32/forbidden.c +++ /dev/null @@ -1,183 +0,0 @@ -#include "clar_libgit2.h" - -#include "repository.h" -#include "buffer.h" -#include "submodule.h" - -static const char *repo_name = "win32-forbidden"; -static git_repository *repo; - -void test_win32_forbidden__initialize(void) -{ - repo = cl_git_sandbox_init(repo_name); -} - -void test_win32_forbidden__cleanup(void) -{ - cl_git_sandbox_cleanup(); -} - -void test_win32_forbidden__can_open_index(void) -{ - git_index *index; - cl_git_pass(git_repository_index(&index, repo)); - cl_assert_equal_i(7, git_index_entrycount(index)); - - /* ensure we can even write the unmodified index */ - cl_git_pass(git_index_write(index)); - - git_index_free(index); -} - -void test_win32_forbidden__can_add_forbidden_filename_with_entry(void) -{ - git_index *index; - git_index_entry entry = {{0}}; - - cl_git_pass(git_repository_index(&index, repo)); - - entry.path = "aux"; - entry.mode = GIT_FILEMODE_BLOB; - git_oid_fromstr(&entry.id, "da623abd956bb2fd8052c708c7ed43f05d192d37"); - - cl_git_pass(git_index_add(index, &entry)); - - git_index_free(index); -} - -void test_win32_forbidden__cannot_add_dot_git_even_with_entry(void) -{ - git_index *index; - git_index_entry entry = {{0}}; - - cl_git_pass(git_repository_index(&index, repo)); - - entry.path = "foo/.git"; - entry.mode = GIT_FILEMODE_BLOB; - git_oid_fromstr(&entry.id, "da623abd956bb2fd8052c708c7ed43f05d192d37"); - - cl_git_fail(git_index_add(index, &entry)); - - git_index_free(index); -} - -void test_win32_forbidden__cannot_add_forbidden_filename_from_filesystem(void) -{ - git_index *index; - - /* since our function calls are very low-level, we can create `aux.`, - * but we should not be able to add it to the index - */ - cl_git_pass(git_repository_index(&index, repo)); - cl_git_write2file("win32-forbidden/aux.", "foo\n", 4, O_RDWR | O_CREAT, 0666); - -#ifdef GIT_WIN32 - cl_git_fail(git_index_add_bypath(index, "aux.")); -#else - cl_git_pass(git_index_add_bypath(index, "aux.")); -#endif - - cl_must_pass(p_unlink("win32-forbidden/aux.")); - git_index_free(index); -} - -static int dummy_submodule_cb( - git_submodule *sm, const char *name, void *payload) -{ - GIT_UNUSED(sm); - GIT_UNUSED(name); - GIT_UNUSED(payload); - return 0; -} - -void test_win32_forbidden__can_diff_tree_to_index(void) -{ - git_diff *diff; - git_tree *tree; - - cl_git_pass(git_repository_head_tree(&tree, repo)); - cl_git_pass(git_diff_tree_to_index(&diff, repo, tree, NULL, NULL)); - cl_assert_equal_i(0, git_diff_num_deltas(diff)); - git_diff_free(diff); - git_tree_free(tree); -} - -void test_win32_forbidden__can_diff_tree_to_tree(void) -{ - git_diff *diff; - git_tree *tree; - - cl_git_pass(git_repository_head_tree(&tree, repo)); - cl_git_pass(git_diff_tree_to_tree(&diff, repo, tree, tree, NULL)); - cl_assert_equal_i(0, git_diff_num_deltas(diff)); - git_diff_free(diff); - git_tree_free(tree); -} - -void test_win32_forbidden__can_diff_index_to_workdir(void) -{ - git_index *index; - git_diff *diff; - const git_diff_delta *delta; - git_tree *tree; - size_t i; - - cl_git_pass(git_repository_index(&index, repo)); - cl_git_pass(git_repository_head_tree(&tree, repo)); - cl_git_pass(git_diff_index_to_workdir(&diff, repo, index, NULL)); - - for (i = 0; i < git_diff_num_deltas(diff); i++) { - delta = git_diff_get_delta(diff, i); - cl_assert_equal_i(GIT_DELTA_DELETED, delta->status); - } - - git_diff_free(diff); - git_tree_free(tree); - git_index_free(index); -} - -void test_win32_forbidden__checking_out_forbidden_index_fails(void) -{ -#ifdef GIT_WIN32 - git_index *index; - git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - git_diff *diff; - const git_diff_delta *delta; - git_tree *tree; - size_t num_deltas, i; - - opts.checkout_strategy = GIT_CHECKOUT_FORCE; - - cl_git_pass(git_repository_index(&index, repo)); - cl_git_fail(git_checkout_index(repo, index, &opts)); - - cl_git_pass(git_repository_head_tree(&tree, repo)); - cl_git_pass(git_diff_index_to_workdir(&diff, repo, index, NULL)); - - num_deltas = git_diff_num_deltas(diff); - - cl_assert(num_deltas > 0); - - for (i = 0; i < num_deltas; i++) { - delta = git_diff_get_delta(diff, i); - cl_assert_equal_i(GIT_DELTA_DELETED, delta->status); - } - - git_diff_free(diff); - git_tree_free(tree); - git_index_free(index); -#endif -} - -void test_win32_forbidden__can_query_submodules(void) -{ - cl_git_pass(git_submodule_foreach(repo, dummy_submodule_cb, NULL)); -} - -void test_win32_forbidden__can_blame_file(void) -{ - git_blame *blame; - - cl_git_pass(git_blame_file(&blame, repo, "aux", NULL)); - git_blame_free(blame); -} diff --git a/vendor/libgit2/tests/win32/longpath.c b/vendor/libgit2/tests/win32/longpath.c deleted file mode 100644 index 5a36875ed..000000000 --- a/vendor/libgit2/tests/win32/longpath.c +++ /dev/null @@ -1,62 +0,0 @@ -#include "clar_libgit2.h" - -#include "git2/clone.h" -#include "clone.h" -#include "buffer.h" -#include "fileops.h" - -static git_buf path = GIT_BUF_INIT; - -void test_win32_longpath__initialize(void) -{ -#ifdef GIT_WIN32 - const char *base = clar_sandbox_path(); - size_t base_len = strlen(base); - size_t remain = MAX_PATH - base_len; - size_t i; - - git_buf_clear(&path); - git_buf_puts(&path, base); - git_buf_putc(&path, '/'); - - cl_assert(remain < (MAX_PATH - 5)); - - for (i = 0; i < (remain - 5); i++) - git_buf_putc(&path, 'a'); -#endif -} - -void test_win32_longpath__cleanup(void) -{ - git_buf_free(&path); -} - -#ifdef GIT_WIN32 -void assert_name_too_long(void) -{ - const git_error *err; - size_t expected_len, actual_len; - char *expected_msg; - - err = giterr_last(); - actual_len = strlen(err->message); - - expected_msg = git_win32_get_error_message(ERROR_FILENAME_EXCED_RANGE); - expected_len = strlen(expected_msg); - - /* check the suffix */ - cl_assert_equal_s(expected_msg, err->message + (actual_len - expected_len)); - - git__free(expected_msg); -} -#endif - -void test_win32_longpath__errmsg_on_checkout(void) -{ -#ifdef GIT_WIN32 - git_repository *repo; - - cl_git_fail(git_clone(&repo, cl_fixture("testrepo.git"), path.ptr, NULL)); - assert_name_too_long(); -#endif -} From d79d1b1febd88d6ade9f41ccddb6bb73c5a7e725 Mon Sep 17 00:00:00 2001 From: John Haley Date: Fri, 29 Apr 2016 07:15:16 -0700 Subject: [PATCH 52/61] Add libgit2 as a submodule --- .gitmodules | 4 ++++ vendor/libgit2 | 1 + 2 files changed, 5 insertions(+) create mode 100644 .gitmodules create mode 160000 vendor/libgit2 diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 000000000..1e39a72bf --- /dev/null +++ b/.gitmodules @@ -0,0 +1,4 @@ +[submodule "vendor/libgit2"] + path = vendor/libgit2 +[submodule "vendor/libgit2"] + url = https://github.com/nodegit/libgit2.git diff --git a/vendor/libgit2 b/vendor/libgit2 new file mode 160000 index 000000000..211e117a0 --- /dev/null +++ b/vendor/libgit2 @@ -0,0 +1 @@ +Subproject commit 211e117a0590583a720c53172406f34186c543bd From 26ca8b4f39fbd97b5c6f41c9ab16b0f81d6bad68 Mon Sep 17 00:00:00 2001 From: John Haley Date: Fri, 29 Apr 2016 08:12:11 -0700 Subject: [PATCH 53/61] Move promisification of `child_process.exec` to util file --- generate/scripts/generateNativeCode.js | 5 +---- lifecycleScripts/install.js | 7 ++----- test/runner.js | 6 +----- test/tests/commit.js | 5 +---- test/tests/config.js | 6 +----- test/tests/refs.js | 6 +----- test/tests/signature.js | 6 +----- test/tests/stage.js | 4 +--- test/tests/status.js | 4 +--- test/tests/status_list.js | 4 +--- utils/execPromise.js | 6 ++++++ 11 files changed, 17 insertions(+), 42 deletions(-) create mode 100644 utils/execPromise.js diff --git a/generate/scripts/generateNativeCode.js b/generate/scripts/generateNativeCode.js index b07004077..56d52672c 100644 --- a/generate/scripts/generateNativeCode.js +++ b/generate/scripts/generateNativeCode.js @@ -1,10 +1,7 @@ const path = require("path"); const promisify = require("promisify-node"); const fse = promisify(require("fs-extra")); -const exec = promisify(function(command, opts, callback) { - return require("child_process").exec(command, opts, callback); -}); - +const exec = require('../../utils/execPromise'); const utils = require("./utils"); module.exports = function generateNativeCode() { diff --git a/lifecycleScripts/install.js b/lifecycleScripts/install.js index 4fc3363e8..c28a92bad 100644 --- a/lifecycleScripts/install.js +++ b/lifecycleScripts/install.js @@ -1,14 +1,11 @@ -var promisify = require("promisify-node"); var path = require("path"); var fs = require("fs"); var cp = require("child_process"); var prepareForBuild = require("./prepareForBuild"); - -var exec = promisify(function(command, opts, callback) { - return cp.exec(command, opts, callback); -}); +var exec = require("../utils/execPromise"); var fromRegistry; + try { fs.statSync(path.join(__dirname, "..", "include")); fs.statSync(path.join(__dirname, "..", "src")); diff --git a/test/runner.js b/test/runner.js index ba50eb179..a7a28cf57 100644 --- a/test/runner.js +++ b/test/runner.js @@ -2,6 +2,7 @@ var promisify = require("promisify-node"); var fse = promisify("fs-extra"); var path = require("path"); var local = path.join.bind(path, __dirname); +var exec = require('../utils/execPromise'); var NodeGit = require('..'); @@ -13,11 +14,6 @@ if(process.env.NODEGIT_TEST_THREADSAFETY) { NodeGit.setThreadSafetyStatus(NodeGit.THREAD_SAFETY.ENABLED_FOR_ASYNC_ONLY); } -// Have to wrap exec, since it has a weird callback signature. -var exec = promisify(function(command, opts, callback) { - return require("child_process").exec(command, opts, callback); -}); - var workdirPath = local("repos/workdir"); before(function() { diff --git a/test/tests/commit.js b/test/tests/commit.js index 0f12d0884..be066093e 100644 --- a/test/tests/commit.js +++ b/test/tests/commit.js @@ -8,10 +8,7 @@ var leakTest = require("../utils/leak_test"); var local = path.join.bind(path, __dirname); -// Have to wrap exec, since it has a weird callback signature. -var exec = promisify(function(command, opts, callback) { - return require("child_process").exec(command, opts, callback); -}); +var exec = require("../../utils/execPromise"); describe("Commit", function() { var NodeGit = require("../../"); diff --git a/test/tests/config.js b/test/tests/config.js index 8922e4649..3ac6fca48 100644 --- a/test/tests/config.js +++ b/test/tests/config.js @@ -1,12 +1,8 @@ var assert = require("assert"); var path = require("path"); var local = path.join.bind(path, __dirname); -var promisify = require("promisify-node"); -// Have to wrap exec, since it has a weird callback signature. -var exec = promisify(function(command, opts, callback) { - return require("child_process").exec(command, opts, callback); -}); +var exec = require("../../utils/execPromise"); describe("Config", function() { var NodeGit = require("../../"); diff --git a/test/tests/refs.js b/test/tests/refs.js index 8f5548c94..c2b148cc5 100644 --- a/test/tests/refs.js +++ b/test/tests/refs.js @@ -1,12 +1,8 @@ var assert = require("assert"); var path = require("path"); -var promisify = require("promisify-node"); var local = path.join.bind(path, __dirname); -// Have to wrap exec, since it has a weird callback signature. -var exec = promisify(function(command, opts, callback) { - return require("child_process").exec(command, opts, callback); -}); +var exec = require("../../utils/execPromise"); describe("Reference", function() { var NodeGit = require("../../"); diff --git a/test/tests/signature.js b/test/tests/signature.js index 5ff950034..8841ffa29 100644 --- a/test/tests/signature.js +++ b/test/tests/signature.js @@ -1,12 +1,8 @@ var assert = require("assert"); var path = require("path"); var local = path.join.bind(path, __dirname); -var promisify = require("promisify-node"); -// Have to wrap exec, since it has a weird callback signature. -var exec = promisify(function(command, opts, callback) { - return require("child_process").exec(command, opts, callback); -}); +var exec = require("../../utils/execPromise"); describe("Signature", function() { var NodeGit = require("../../"); diff --git a/test/tests/stage.js b/test/tests/stage.js index c1b9588d7..e49db7535 100644 --- a/test/tests/stage.js +++ b/test/tests/stage.js @@ -3,9 +3,7 @@ var path = require("path"); var promisify = require("promisify-node"); var fse = promisify(require("fs-extra")); -var exec = promisify(function(command, opts, callback) { - return require("child_process").exec(command, opts, callback); -}); +var exec = require("../../utils/execPromise"); describe("Stage", function() { var RepoUtils = require("../utils/repository_setup"); diff --git a/test/tests/status.js b/test/tests/status.js index cc3bd5924..d74c7bee7 100644 --- a/test/tests/status.js +++ b/test/tests/status.js @@ -3,9 +3,7 @@ var path = require("path"); var promisify = require("promisify-node"); var fse = promisify(require("fs-extra")); var local = path.join.bind(path, __dirname); -var exec = promisify(function(command, opts, callback) { - return require("child_process").exec(command, opts, callback); -}); +var exec = require("../../utils/execPromise"); describe("Status", function() { var NodeGit = require("../../"); diff --git a/test/tests/status_list.js b/test/tests/status_list.js index 3ae4734aa..be96952a2 100644 --- a/test/tests/status_list.js +++ b/test/tests/status_list.js @@ -3,9 +3,7 @@ var path = require("path"); var promisify = require("promisify-node"); var fse = promisify(require("fs-extra")); var local = path.join.bind(path, __dirname); -var exec = promisify(function(command, opts, callback) { - return require("child_process").exec(command, opts, callback); -}); +var exec = require("../../utils/execPromise"); describe("StatusList", function() { var NodeGit = require("../../"); diff --git a/utils/execPromise.js b/utils/execPromise.js new file mode 100644 index 000000000..d369ab612 --- /dev/null +++ b/utils/execPromise.js @@ -0,0 +1,6 @@ +var promisify = require("promisify-node"); +var cp = require('child_process'); + +module.exports = promisify(function(command, opts, callback) { + return cp.exec(command, opts, callback); +}); From 68208c966d0c48626a11e4d7fdbe39ac95553c22 Mon Sep 17 00:00:00 2001 From: Chris Bargren Date: Fri, 29 Apr 2016 09:55:20 -0700 Subject: [PATCH 54/61] ES6 support for JSHint --- .jshintrc | 1 + 1 file changed, 1 insertion(+) diff --git a/.jshintrc b/.jshintrc index 9f0a2639b..0fd02f29b 100644 --- a/.jshintrc +++ b/.jshintrc @@ -2,6 +2,7 @@ "boss": true, "curly": true, "eqnull": true, + "esnext": true, "evil": true, "futurehostile": true, "globals": { From b9366347c2c5e482a5a6c24aee00b47746e430ca Mon Sep 17 00:00:00 2001 From: John Haley Date: Fri, 29 Apr 2016 10:01:54 -0700 Subject: [PATCH 55/61] Add scripts to handle submodules --- generate/index.js | 31 +++++++--- lifecycleScripts/install.js | 1 - lifecycleScripts/prepareForBuild.js | 8 ++- lifecycleScripts/submodules/getStatus.js | 37 ++++++++++++ lifecycleScripts/submodules/index.js | 74 ++++++++++++++++++++++++ utils/gitExecutableLocation.js | 23 ++++++++ 6 files changed, 163 insertions(+), 11 deletions(-) create mode 100644 lifecycleScripts/submodules/getStatus.js create mode 100644 lifecycleScripts/submodules/index.js create mode 100644 utils/gitExecutableLocation.js diff --git a/generate/index.js b/generate/index.js index 9b9f836cd..739ef15c7 100644 --- a/generate/index.js +++ b/generate/index.js @@ -1,19 +1,34 @@ var generateJson = require("./scripts/generateJson"); var generateNativeCode = require("./scripts/generateNativeCode"); var generateMissingTests = require("./scripts/generateMissingTests"); +var submoduleStatus = require("../lifecycleScripts/submodules/getStatus"); module.exports = function generate() { - return new Promise(function(resolve, reject) { - try { + return submoduleStatus() + .then(function(statuses) { + var dirtySubmodules = statuses + .filter(function(status) { + return status.onNewCommit + || status.needsInitialization + || status.workDirDirty; + }); + + if (dirtySubmodules.length) { + console.log("WARNING - Some submodules are out-of-sync"); + dirtySubmodules.forEach(function(submodule) { + console.log("\t" + submodule.name); + }); + } + }) + .then(function() { generateJson(); generateNativeCode(); generateMissingTests(); - resolve(); - } - catch(e) { - reject(e); - } - }); + }) + .catch(function(e) { + console.log("ERROR - Could not generate native code"); + console.log(e); + }); } if (require.main === module) { diff --git a/lifecycleScripts/install.js b/lifecycleScripts/install.js index c28a92bad..d1ae7b27e 100644 --- a/lifecycleScripts/install.js +++ b/lifecycleScripts/install.js @@ -121,7 +121,6 @@ function build() { return arg; }); - console.log(args); return new Promise(function(resolve, reject) { var child = cp.spawn(cmd, args, opts); child.on("close", function(code) { diff --git a/lifecycleScripts/prepareForBuild.js b/lifecycleScripts/prepareForBuild.js index 0cb961f63..27557d273 100644 --- a/lifecycleScripts/prepareForBuild.js +++ b/lifecycleScripts/prepareForBuild.js @@ -3,11 +3,11 @@ var path = require("path"); var local = path.join.bind(path, __dirname); +var submodules = require(local("submodules")); var configure = require(local("configureLibssh2")); var generate = require(local("../generate")); module.exports = function prepareForBuild() { - return new Promise(function(resolve, reject) { cp.exec("npm install --ignore-scripts", function(err, stdout, stderr) { if (err) { @@ -19,7 +19,11 @@ module.exports = function prepareForBuild() { console.info(stdout); } }); - }).then(function() { + }) + .then(function() { + return submodules(); + }) + .then(function() { return Promise.all([ configure(), generate() diff --git a/lifecycleScripts/submodules/getStatus.js b/lifecycleScripts/submodules/getStatus.js new file mode 100644 index 000000000..a6b3f801c --- /dev/null +++ b/lifecycleScripts/submodules/getStatus.js @@ -0,0 +1,37 @@ +var path = require("path"); +var rootDir = path.join(__dirname, "../.."); +var exec = require(path.join(rootDir, "./utils/execPromise")); + +module.exports = function getStatus() { + return exec("git submodule status", { cwd: rootDir}) + .then(function(stdout) { + function getStatusPromiseFromLine(line) { + var lineSections = line.trim().split(" "); + var onNewCommit = !!~lineSections[0].indexOf("+"); + var needsInitialization = !!~lineSections[0].indexOf("-"); + var commitOid = lineSections[0].replace("+", "").replace("-", ""); + var name = lineSections[1]; + + return exec("git status", { cwd: path.join(rootDir, name)}) + .then(function(workDirStatus) { + return { + commitOid: commitOid, + onNewCommit: onNewCommit, + name: name, + needsInitialization: needsInitialization, + workDirDirty: !~workDirStatus + .trim() + .split("\n") + .pop() + .indexOf("nothing to commit") + }; + }); + } + + return Promise.all(stdout + .trim() + .split("\n") + .map(getStatusPromiseFromLine) + ); + }); +}; diff --git a/lifecycleScripts/submodules/index.js b/lifecycleScripts/submodules/index.js new file mode 100644 index 000000000..596d255e4 --- /dev/null +++ b/lifecycleScripts/submodules/index.js @@ -0,0 +1,74 @@ +var path = require("path"); +var rootDir = path.join(__dirname, "../.."); + +var gitExecutableLocation = require( + path.join(rootDir, "./utils/gitExecutableLocation") +); +var submoduleStatus = require("./getStatus"); + +var exec = require(path.join(rootDir, "./utils/execPromise")); + +module.exports = function submodules() { + return gitExecutableLocation() + .catch(function() { + console.log("ERROR - Compilation of NodeGit requires git CLI to be " + + "installed and on the path"); + + throw new Error("git CLI is not installed or not on the path"); + }) + .then(function() { + return submoduleStatus(); + }) + .then(function(statuses) { + function printSubmodule(submoduleName) { + console.log("\t" + submoduleName); + } + + var dirtySubmodules = statuses + .filter(function(status) { + return status.workDirDirty && !status.needsInitialization; + }) + .map(function(dirtySubmodule) { + return dirtySubmodule.name; + }); + + if (dirtySubmodules.length) { + console.log( + "ERROR - The following submodules have uncommited changes:" + ); + dirtySubmodules.forEach(printSubmodule); + console.log( + "\nThey must either be committed or discarded before we build" + ); + + throw new Error("Dirty Submodules: " + dirtySubmodules.join(" ")); + } + + var outOfSyncSubmodules = statuses + .filter(function(status) { + return status.onNewCommit && !status.needsInitialization; + }) + .map(function(outOfSyncSubmodule) { + return outOfSyncSubmodule.name; + }); + + if (outOfSyncSubmodules.length) { + console.log( + "WARNING - The following submodules are pointing to an new commit:" + ); + outOfSyncSubmodules.forEach(printSubmodule); + console.log("\nThey will not be updated."); + } + + return Promise.all(statuses + .filter(function(status) { + return !status.onNewCommit; + }) + .map(function(submoduleToUpdate) { + return exec( + "git submodule update --init --recursive " + submoduleToUpdate.name + ); + }) + ); + }); +}; diff --git a/utils/gitExecutableLocation.js b/utils/gitExecutableLocation.js new file mode 100644 index 000000000..48316510f --- /dev/null +++ b/utils/gitExecutableLocation.js @@ -0,0 +1,23 @@ +var cp = require("child_process"); + +module.exports = function gitExecutableLocation() { + return new Promise(function(resolve, reject) { + var cmd; + + if (process.platform === "win32") { + cmd = "where git"; + } + else { + cmd = "which git"; + } + + cp.exec(cmd, function(err, stdout, stderr) { + if (err) { + reject(err, stderr); + } + else { + resolve(stdout); + } + }); + }); +}; From a4454cf74e8cf69bc7245bded1d13122633c87c7 Mon Sep 17 00:00:00 2001 From: Chris Bargren Date: Mon, 2 May 2016 09:47:32 -0700 Subject: [PATCH 56/61] Bump npm to stop test failures --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index 298baf957..7081da9f3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -40,6 +40,7 @@ matrix: install: - ps: Install-Product node $env:nodejs_version $env:platform - ps: Start-Process c:\projects\nodegit\vendor\pageant.exe c:\projects\nodegit\vendor\private.ppk + - npm install -g npm - cmd: npm install -g node-gyp - npm install From 71bac252526a531a0a8ebe6a3b59b80d0a7a4ed8 Mon Sep 17 00:00:00 2001 From: Chris Bargren Date: Tue, 3 May 2016 13:16:44 -0700 Subject: [PATCH 57/61] Addressing PR comment --- lifecycleScripts/install.js | 1 - 1 file changed, 1 deletion(-) diff --git a/lifecycleScripts/install.js b/lifecycleScripts/install.js index c3c7cb2ca..1b8e442f1 100644 --- a/lifecycleScripts/install.js +++ b/lifecycleScripts/install.js @@ -93,7 +93,6 @@ function transpileJavascript() { return new Promise(function(resolve, reject) { var child = cp.spawn(cmd, args, opts); child.on("close", function(code) { - console.log(code); if (code) { reject(code); process.exitCode = 13; From 7c21ef56996393eb015b2bbdf4151540cfbad980 Mon Sep 17 00:00:00 2001 From: John Haley Date: Tue, 3 May 2016 13:57:03 -0700 Subject: [PATCH 58/61] Make `Commit.create` async Creating a commit should be an async action, this makes it so. --- generate/input/descriptor.json | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/generate/input/descriptor.json b/generate/input/descriptor.json index 1b49c91cd..fbe9fd4fc 100644 --- a/generate/input/descriptor.json +++ b/generate/input/descriptor.json @@ -416,17 +416,21 @@ "update_ref": { "isOptional": true } + }, + "isAsync": true, + "return": { + "isErrorCode": true } }, - "git_commit_create_buffer": { - "ignore": true - }, "git_commit_create_from_callback": { "ignore": true }, "git_commit_create_from_ids": { "ignore": true }, + "git_commit_create_from_v": { + "ignore": true + }, "git_commit_extract_signature": { "ignore": true }, From a734b9fef9115592ed54d4443220c3b03cdfb520 Mon Sep 17 00:00:00 2001 From: John Haley Date: Tue, 3 May 2016 14:26:19 -0700 Subject: [PATCH 59/61] Fix filemode changes test That test was wrong, wrong, wrongity, wrong and now it's :100: --- test/tests/stage.js | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/test/tests/stage.js b/test/tests/stage.js index e49db7535..ac0675492 100644 --- a/test/tests/stage.js +++ b/test/tests/stage.js @@ -304,15 +304,19 @@ describe("Stage", function() { return index.writeTree(); }) .then(function (oid) { - var signature = NodeGit.Signature.create("Foo bar", - "foo@bar.com", 123456789, 60); - return test.repository.createCommit("HEAD", signature, signature, - "initial commit", oid, []); + return test.repository.getHeadCommit() + .then(function(parent) { + var signature = NodeGit.Signature.create("Foo bar", + "foo@bar.com", 123456789, 60); + return test.repository.createCommit("HEAD", signature, signature, + "initial commit", oid, [parent]); + }); //... alright, we did a commit. }) - //Now if we compare head commit to index, should be a filemode change + // Now if we compare head commit to the workdir, + // there shouldn't be a filemode change .then(function() { - return compareFilemodes(false, index, 0111 /* expect +x */); + return compareFilemodes(true, null, 0); }); }); From c18568bd49805a8ccd10053af7dbada488ca7fc7 Mon Sep 17 00:00:00 2001 From: John Haley Date: Wed, 4 May 2016 08:05:28 -0700 Subject: [PATCH 60/61] Bump to version 0.13.0 --- .npmignore | 2 - CHANGELOG.md | 150 +++++++++++++++++++++++++++++++++++++++++++++++++++ package.json | 2 +- 3 files changed, 151 insertions(+), 3 deletions(-) diff --git a/.npmignore b/.npmignore index 2485a5668..bf9f1e379 100644 --- a/.npmignore +++ b/.npmignore @@ -1,7 +1,5 @@ /build/ -/example/ /examples/ -/lib/ /test/ /vendor/Release/ diff --git a/CHANGELOG.md b/CHANGELOG.md index 774e768ef..253238445 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,155 @@ # Change Log +## [0.13.0](https://github.com/nodegit/nodegit/releases/tag/v0.13.0) (2016-05-04) + +[Full Changelog](https://github.com/nodegit/nodegit/compare/v0.12.2...v0.13.0) + +# Summary + +This is a big update! Lots of work was done to bring NodeGit up to the latest stable libgit2 version (v0.24.1), to use babel in the library, to make it more stable, remove memory leaks, squash bugs and in general just improve the library for all. Make sure to see all of the API changes below (there are a lot). + +# Node support + +We have added Node 6 as a supported platform! Going forward we aim to have 1:1 support for versions of Node that are either current or LTS. That means that v0.12 will not be supported soon so if you're on that please upgrade to at least Node v4. Also Node v5 will *NOT* be LTS so when Node stops supporting that in the coming months we will as well. You can read more about the current Node upgrade plan [here](https://nodejs.org/en/blog/release/v6.0.0/). + +# API Changes +------- + +## Modified + +- `Index#add`, `Index#addByPath`, `Index#clear`, `Index#conflictAdd`, `Index#conflictCleanup`, `Index#conflictGet`, `Index#conflictRemove`, `Index.open`, `Index#read`, `Index#readTree`, `Index#remove`, `Index#removeByPath`, `Index#removeDirectory`, `Index#read`, `Index#writeTree`, and `Index#writeTreeTo` are all now asynchronous functions [PR #971](https://github.com/nodegit/nodegit/pull/971) +- Made `ancestoryEntry`, `outEntry` and `theirEntry` optional parameters on `Index#conflictAdd` [PR #997](https://github.com/nodegit/nodegit/pull/997) +- `Repository#refreshIndex` will return an Index object back that has the latest data loaded off of disk [PR #986](https://github.com/nodegit/nodegit/pull/986) +- `Commit.create` is now asynchronous [PR #1022](https://github.com/nodegit/nodegit/pull/1022) + +## Added + +- `Diff#merge` will combine a diff into itself [PR #1000](https://github.com/nodegit/nodegit/pull/1000) +- `ReflogEntry#committer`, `ReflogEntry#idNew`, `ReflogEntry#idOld`, and `ReflogEntry#message` have been added +[PR #1013](https://github.com/nodegit/nodegit/pull/1013) + +## Removed + +- `Repository#openIndex` [PR #990](https://github.com/nodegit/nodegit/pull/990) +- `Reflog#entryCommitter`, `Reflog#entryIdNew`, `Reflog#entryIdOld`, and `Reflog#entryMessage` have been moved to be under `ReflogEntry` +[PR #1013](https://github.com/nodegit/nodegit/pull/1013) + +## Bug fixes + +- `Branch.name` works now [PR #991](https://github.com/nodegit/nodegit/pull/991) +- Fixed a crash with callbacks from libgit2 [PR #944](https://github.com/nodegit/nodegit/pull/944) +- Fixed a crash in `Tree#entryByName` [PR #998](https://github.com/nodegit/nodegit/pull/998) +- More memory leaks have been plugged [PR #1005](https://github.com/nodegit/nodegit/pull/1005), [PR #1006](https://github.com/nodegit/nodegit/pull/1006), [PR #1014](https://github.com/nodegit/nodegit/pull/1014), and [PR #1015](https://github.com/nodegit/nodegit/pull/1015) +- `Commit#getDiffWithOptions` now actually passes the options correctly [PR #1008](https://github.com/nodegit/nodegit/pull/1008) + +## Upgraded to libgit2 v0.24.1 [PR #1010](https://github.com/nodegit/nodegit/pull/1010) +------- + +### Changes or improvements + +- Custom merge drivers can now be registered, which allows callers to + configure callbacks to honor `merge=driver` configuration in + `.gitattributes`. + +- Custom filters can now be registered with wildcard attributes, for + example `filter=*`. Consumers should examine the attributes parameter + of the `check` function for details. + +- Symlinks are now followed when locking a file, which can be + necessary when multiple worktrees share a base repository. + +- You can now set your own user-agent to be sent for HTTP requests by + using the `Libgit2.OPT.SET_USER_AGENT` with `Libgit2.opts()`. + +- You can set custom HTTP header fields to be sent along with requests + by passing them in the fetch and push options. + +- Tree objects are now assumed to be sorted. If a tree is not + correctly formed, it will give bad results. This is the git approach + and cuts a significant amount of time when reading the trees. + +- Filter registration is now protected against concurrent + registration. + +- Filenames which are not valid on Windows in an index no longer cause + to fail to parse it on that OS. + +- Rebases can now be performed purely in-memory, without touching the + repository's workdir. + +- When adding objects to the index, or when creating new tree or commit + objects, the inputs are validated to ensure that the dependent objects + exist and are of the correct type. This object validation can be + disabled with the `Libgit2.OPT.ENABLE_STRICT_OBJECT_CREATION` option. + +- The WinHTTP transport's handling of bad credentials now behaves like + the others, asking for credentials again. + +### API additions + +- `Blob.createFromStream()` and + `Blob.createFromStreamCommit` allow you to create a blob by + writing into a stream. Useful when you do not know the final size or + want to copy the contents from another stream. + +- `Config#lock` has been added, which allow for + transactional/atomic complex updates to the configuration, removing + the opportunity for concurrent operations and not committing any + changes until the unlock. + +- `DiffOptions` added a new callback `progress_cb` to report on the + progress of the diff as files are being compared. The documentation of + the existing callback `notify_cb` was updated to reflect that it only + gets called when new deltas are added to the diff. + +- `FetchOptions` and `PushOptions` have gained a `custom_headers` + field to set the extra HTTP header fields to send. + +- `Commit#headerField` allows you to look up a specific header + field in a commit. + +### Breaking API changes + +- `MergeOptions` now provides a `defaultDriver` that can be used + to provide the name of a merge driver to be used to handle files changed + during a merge. + +- The `Merge.TREE_FLAG` is now `Merge.FLAG`. Subsequently, + `treeFlags` field of the `MergeOptions` structure is now named `flags`. + +- The `Merge.FILE_FLAGS` enum is now `Merge.FILE_FLAG` for + consistency with other enum type names. + +- `Cert` descendent types now have a proper `parent` member + +- It is the responsibility of the refdb backend to decide what to do + with the reflog on ref deletion. The file-based backend must delete + it, a database-backed one may wish to archive it. + +- `Index#add` and `Index#conflictAdd` will now use the case + as provided by the caller on case insensitive systems. Previous + versions would keep the case as it existed in the index. This does + not affect the higher-level `Index#addByPath` or + `Index#addFromBuffer` functions. + +- The `Config.LEVEL` enum has gained a higher-priority value + `PROGRAMDATA` which represent a rough Windows equivalent + to the system level configuration. + +- `RebaseOptions` now has a `mergeOptions` field. + +- The index no longer performs locking itself. This is not something + users of the library should have been relying on as it's not part of + the concurrency guarantees. + +- `Remote#connect()` now takes a `customHeaders` argument to set + the extra HTTP header fields to send. + +- `Tree.entryFilemode`, `Tree.entryFilemodeRaw`, `Tree.entryId`, `Tree.entryName`, + `Tree.entryToObject`, and `Tree.entryType` have all been moved to the `TreeEntry` prototype. + Additionally, the `TreeEntry` fields have been removed in lieu of the corresponding functions to return + the data. + ## [0.12.2](https://github.com/nodegit/nodegit/releases/tag/v0.12.2) (2016-04-07) [Full Changelog](https://github.com/nodegit/nodegit/compare/v0.12.1...v0.12.2) diff --git a/package.json b/package.json index 1849e850d..60ad78d7f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "nodegit", "description": "Node.js libgit2 asynchronous native bindings", - "version": "0.12.2", + "version": "0.13.0", "homepage": "http://nodegit.org", "keywords": [ "libgit2", From aa672ee7a941c396ea76d97ec07adb66e8af0d74 Mon Sep 17 00:00:00 2001 From: John Haley Date: Wed, 4 May 2016 08:37:23 -0700 Subject: [PATCH 61/61] Format `CHANGELOG.md` to be easier to link to --- CHANGELOG.md | 134 +++++++++++++++++++++++++-------------------------- 1 file changed, 67 insertions(+), 67 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 253238445..c00feb8a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,40 +1,40 @@ # Change Log -## [0.13.0](https://github.com/nodegit/nodegit/releases/tag/v0.13.0) (2016-05-04) +#     v0.13.0 [(2016-05-04)](https://github.com/nodegit/nodegit/releases/tag/v0.13.0) [Full Changelog](https://github.com/nodegit/nodegit/compare/v0.12.2...v0.13.0) -# Summary +## Summary This is a big update! Lots of work was done to bring NodeGit up to the latest stable libgit2 version (v0.24.1), to use babel in the library, to make it more stable, remove memory leaks, squash bugs and in general just improve the library for all. Make sure to see all of the API changes below (there are a lot). -# Node support +## Node support We have added Node 6 as a supported platform! Going forward we aim to have 1:1 support for versions of Node that are either current or LTS. That means that v0.12 will not be supported soon so if you're on that please upgrade to at least Node v4. Also Node v5 will *NOT* be LTS so when Node stops supporting that in the coming months we will as well. You can read more about the current Node upgrade plan [here](https://nodejs.org/en/blog/release/v6.0.0/). -# API Changes +## API Changes ------- -## Modified +### Modified - `Index#add`, `Index#addByPath`, `Index#clear`, `Index#conflictAdd`, `Index#conflictCleanup`, `Index#conflictGet`, `Index#conflictRemove`, `Index.open`, `Index#read`, `Index#readTree`, `Index#remove`, `Index#removeByPath`, `Index#removeDirectory`, `Index#read`, `Index#writeTree`, and `Index#writeTreeTo` are all now asynchronous functions [PR #971](https://github.com/nodegit/nodegit/pull/971) - Made `ancestoryEntry`, `outEntry` and `theirEntry` optional parameters on `Index#conflictAdd` [PR #997](https://github.com/nodegit/nodegit/pull/997) - `Repository#refreshIndex` will return an Index object back that has the latest data loaded off of disk [PR #986](https://github.com/nodegit/nodegit/pull/986) - `Commit.create` is now asynchronous [PR #1022](https://github.com/nodegit/nodegit/pull/1022) -## Added +### Added - `Diff#merge` will combine a diff into itself [PR #1000](https://github.com/nodegit/nodegit/pull/1000) - `ReflogEntry#committer`, `ReflogEntry#idNew`, `ReflogEntry#idOld`, and `ReflogEntry#message` have been added [PR #1013](https://github.com/nodegit/nodegit/pull/1013) -## Removed +### Removed - `Repository#openIndex` [PR #990](https://github.com/nodegit/nodegit/pull/990) - `Reflog#entryCommitter`, `Reflog#entryIdNew`, `Reflog#entryIdOld`, and `Reflog#entryMessage` have been moved to be under `ReflogEntry` [PR #1013](https://github.com/nodegit/nodegit/pull/1013) -## Bug fixes +### Bug fixes - `Branch.name` works now [PR #991](https://github.com/nodegit/nodegit/pull/991) - Fixed a crash with callbacks from libgit2 [PR #944](https://github.com/nodegit/nodegit/pull/944) @@ -150,35 +150,35 @@ We have added Node 6 as a supported platform! Going forward we aim to have 1:1 s Additionally, the `TreeEntry` fields have been removed in lieu of the corresponding functions to return the data. -## [0.12.2](https://github.com/nodegit/nodegit/releases/tag/v0.12.2) (2016-04-07) +# v0.12.2 [(2016-04-07)](https://github.com/nodegit/nodegit/releases/tag/v0.12.2) [Full Changelog](https://github.com/nodegit/nodegit/compare/v0.12.1...v0.12.2) -# Added +## Added - We now provide 32-bit binaries for linux [PR #980](https://github.com/nodegit/nodegit/pull/980) -# Bug fixes +## Bug fixes - Added memory clean up for references [PR #977](https://github.com/nodegit/nodegit/pull/977) and remotes [PR #981](https://github.com/nodegit/nodegit/pull/981) -## [0.12.1](https://github.com/nodegit/nodegit/releases/tag/v0.12.1) (2016-03-30) +# v0.12.1 [(2016-03-30)](https://github.com/nodegit/nodegit/releases/tag/v0.12.1) [Full Changelog](https://github.com/nodegit/nodegit/compare/v0.12.0...v0.12.1) -# Bug fixes +## Bug fixes - Fixed post install script dying on windows [PR #978](https://github.com/nodegit/nodegit/pull/978) -## [0.12.0](https://github.com/nodegit/nodegit/releases/tag/v0.12.0) (2016-03-28) +# v0.12.0 [(2016-03-28)](https://github.com/nodegit/nodegit/releases/tag/v0.12.0) [Full Changelog](https://github.com/nodegit/nodegit/compare/v0.11.9...v0.12.0) -# API changes +## API changes - `Ignore` - Made `Ignore.pathIsIgnored` async [PR #970](https://github.com/nodegit/nodegit/pull/970) -# Bug fixes +## Bug fixes - Added an error message when trying to install NodeGit without a required version of libstdc++ [PR #972](https://github.com/nodegit/nodegit/pull/972) - Fix a crash when grabbing content out of a buffer that has unicode [PR #966](https://github.com/nodegit/nodegit/pull/966) @@ -187,19 +187,19 @@ We have added Node 6 as a supported platform! Going forward we aim to have 1:1 s - Fixed install when there is a space in the username on windows [PR #951](https://github.com/nodegit/nodegit/pull/951) - Bump to nan@2.2.0 [PR #952](https://github.com/nodegit/nodegit/pull/952) -## [0.11.9](https://github.com/nodegit/nodegit/releases/tag/v0.11.9) (2016-03-09) +# v0.11.9 [(2016-03-09)](https://github.com/nodegit/nodegit/releases/tag/v0.11.9) [Full Changelog](https://github.com/nodegit/nodegit/compare/v0.11.8...v0.11.9) - Fixed crash when calculating diff via `ConvenientPatch` [PR #945](https://github.com/nodegit/nodegit/pull/945) -## [0.11.8](https://github.com/nodegit/nodegit/releases/tag/v0.11.8) (2016-03-07) +# v0.11.8 [(2016-03-07)](https://github.com/nodegit/nodegit/releases/tag/v0.11.8) [Full Changelog](https://github.com/nodegit/nodegit/compare/v0.11.7...v0.11.8) - Removed callback throttling due to segmentation faults. Will be implemented later. [PR #943](https://github.com/nodegit/nodegit/pull/943) -## [0.11.7](https://github.com/nodegit/nodegit/releases/tag/v0.11.7) (2016-03-07) +# v0.11.7 [(2016-03-07)](https://github.com/nodegit/nodegit/releases/tag/v0.11.7) [Full Changelog](https://github.com/nodegit/nodegit/compare/v0.11.6...v0.11.7) @@ -209,7 +209,7 @@ We have added Node 6 as a supported platform! Going forward we aim to have 1:1 s - Fixed unicode in `Diff.blobToBuffer` getting corrupted [PR #935](https://github.com/nodegit/nodegit/pull/935) - Fixed fetching/pulling to bitbucket in versions > v5.6 of node [PR #942](https://github.com/nodegit/nodegit/pull/942) -## [0.11.6](https://github.com/nodegit/nodegit/releases/tag/v0.11.6) (2016-03-01) +# v0.11.6 [(2016-03-01)](https://github.com/nodegit/nodegit/releases/tag/v0.11.6) [Full Changelog](https://github.com/nodegit/nodegit/compare/v0.11.5...v0.11.6) @@ -220,27 +220,27 @@ We have added Node 6 as a supported platform! Going forward we aim to have 1:1 s - Fixed http parsing errors in Node 5.6 [PR #931](https://github.com/nodegit/nodegit/pull/931) - Fixed `Tree#walk` not returning the correct entries on `end` [PR #929](https://github.com/nodegit/nodegit/pull/929) -## [0.11.5](https://github.com/nodegit/nodegit/releases/tag/v0.11.5) (2016-02-25) +# v0.11.5 [(2016-02-25)](https://github.com/nodegit/nodegit/releases/tag/v0.11.5) [Full Changelog](https://github.com/nodegit/nodegit/compare/v0.11.4...v0.11.5) - Fixed crash when calculating a diff [PR #922](https://github.com/nodegit/nodegit/pull/922) - Fixed an issue with return values getting randomly corrupted [PR #923](https://github.com/nodegit/nodegit/pull/923)) -## [0.11.4](https://github.com/nodegit/nodegit/releases/tag/v0.11.4) (2016-02-24) +# v0.11.4 [(2016-02-24)](https://github.com/nodegit/nodegit/releases/tag/v0.11.4) [Full Changelog](https://github.com/nodegit/nodegit/compare/v0.11.3...v0.11.4) - Fixed callback out values in callbacks from C++. This affects any NodeGit call that is passed a callback as an option [PR #921](https://github.com/nodegit/nodegit/pull/921) - Fixed an issue with building the debug version of NodeGit on windows [PR #918](https://github.com/nodegit/nodegit/pull/918) -## [0.11.3](https://github.com/nodegit/nodegit/releases/tag/v0.11.3) (2016-02-22) +# v0.11.3 [(2016-02-22)](https://github.com/nodegit/nodegit/releases/tag/v0.11.3) [Full Changelog](https://github.com/nodegit/nodegit/compare/v0.11.2...v0.11.3) - Fixed an issue where initializing NodeGit would sometimes seg fault. Also fixed an error when fetching concurrently [PR #912](https://github.com/nodegit/nodegit/pull/912) -## [0.11.2](https://github.com/nodegit/nodegit/releases/tag/v0.11.2) (2016-02-18) +# v0.11.2 [(2016-02-18)](https://github.com/nodegit/nodegit/releases/tag/v0.11.2) [Full Changelog](https://github.com/nodegit/nodegit/compare/v0.11.1...v0.11.2) @@ -249,21 +249,21 @@ We have added Node 6 as a supported platform! Going forward we aim to have 1:1 s - Fixed seg-fault in linux that happens when getting the diff of very small files [PR #908](https://github.com/nodegit/nodegit/pull/908) - Fixed `RevWalk#fastWalk` dying when an error happens in libgit2 [PR #909](https://github.com/nodegit/nodegit/pull/909) -## [0.11.1](https://github.com/nodegit/nodegit/releases/tag/v0.11.1) (2016-02-09) +# v0.11.1 [(2016-02-09)](https://github.com/nodegit/nodegit/releases/tag/v0.11.1) [Full Changelog](https://github.com/nodegit/nodegit/compare/v0.11.0...v0.11.1) - Numerous fixes and perf boosts to file history [PR #900](https://github.com/nodegit/nodegit/pull/900)[PR #896](https://github.com/nodegit/nodegit/pull/896) - Several doc fixes [PR #899](https://github.com/nodegit/nodegit/pull/899)[PR #897](https://github.com/nodegit/nodegit/pull/897) -## [0.11.0](https://github.com/nodegit/nodegit/releases/tag/v0.11.0) (2016-02-04) +# v0.11.0 [(2016-02-04)](https://github.com/nodegit/nodegit/releases/tag/v0.11.0) [Full Changelog](https://github.com/nodegit/nodegit/compare/v0.10.0...v0.11.0) - Change `Revert.commit` and `Revert.revert` to by async. [PR #887](https://github.com/nodegit/nodegit/pull/887) - Added `RevWalk#fileHistoryWalk` for a faster way to retrieve history for a specific file. [PR #889](https://github.com/nodegit/nodegit/pull/889) -## [0.10.0](https://github.com/nodegit/nodegit/releases/tag/v0.10.0) (2016-02-01) +# v0.10.0 [(2016-02-01)](https://github.com/nodegit/nodegit/releases/tag/v0.10.0) [Full Changelog](https://github.com/nodegit/nodegit/compare/v0.9.0...v0.10.0) @@ -289,7 +289,7 @@ We have added Node 6 as a supported platform! Going forward we aim to have 1:1 s - `rawContent()` contains the unformatted content of the line. This is no longer a string from the line to the end of the file. - `content()` contains the utf8 formatted content of the line. -## [0.9.0](https://github.com/nodegit/nodegit/releases/tag/v0.9.0) (2016-01-21) +# v0.9.0 [(2016-01-21)](https://github.com/nodegit/nodegit/releases/tag/v0.9.0) [Full Changelog](https://github.com/nodegit/nodegit/compare/v0.8.0...v0.9.0) @@ -299,7 +299,7 @@ We have added Node 6 as a supported platform! Going forward we aim to have 1:1 s - `Repository#mergeBranches` now takes in a `MergeOptions` parameter [PR #873](https://github.com/nodegit/nodegit/pull/873) - Remove a NodeGit specific hack to make `Index#addAll` faster since that is fixed in libgit2 [PR #875](https://github.com/nodegit/nodegit/pull/875)) -## [0.8.0](https://github.com/nodegit/nodegit/releases/tag/v0.8.0) (2016-01-15) +# v0.8.0 [(2016-01-15)](https://github.com/nodegit/nodegit/releases/tag/v0.8.0) [Full Changelog](https://github.com/nodegit/nodegit/compare/v0.7.0...0.8.0) @@ -308,7 +308,7 @@ We have added Node 6 as a supported platform! Going forward we aim to have 1:1 s - `Repository#stageFilemode` now can accept an array of strings for files to update - `Submodule#addToIndex`, `Submodule#addFinalize`, `Submodule#init`, `Submodule#open`, `Submodule#sync`, and `Submodule#update` are now all async methodss -## [0.7.0](https://github.com/nodegit/nodegit/releases/tag/v0.7.0) (2016-01-08) +# v0.7.0 [(2016-01-08)](https://github.com/nodegit/nodegit/releases/tag/v0.7.0) [Full Changelog](https://github.com/nodegit/nodegit/compare/v0.6.3...0.7.0) @@ -317,20 +317,20 @@ We have added Node 6 as a supported platform! Going forward we aim to have 1:1 s - Make GraphDescendentOf asynchronous - Fixed line length of utf8 stringss -## [0.6.3](https://github.com/nodegit/nodegit/releases/tag/v0.6.3) (2015-12-16) +# v0.6.3 [(2015-12-16)](https://github.com/nodegit/nodegit/releases/tag/v0.6.3) [Full Changelog](https://github.com/nodegit/nodegit/compare/v0.6.2...0.6.3) - Fixed a bug where manually building for vanilla node would fail without explicitly setting the target -## [0.6.2](https://github.com/nodegit/nodegit/releases/tag/v0.6.2) (2015-12-16) +# v0.6.2 [(2015-12-16)](https://github.com/nodegit/nodegit/releases/tag/v0.6.2) [Full Changelog](https://github.com/nodegit/nodegit/compare/v0.6.1...0.6.2) - Fixed a bug where manually building on windows would fail (if unable to download a prebuilt binary) -## [0.6.1](https://github.com/nodegit/nodegit/releases/tag/v0.6.1) (2015-12-14) +# v0.6.1 [(2015-12-14)](https://github.com/nodegit/nodegit/releases/tag/v0.6.1) [Full Changelog](https://github.com/nodegit/nodegit/compare/v0.6.0...0.6.1) @@ -338,7 +338,7 @@ We have added Node 6 as a supported platform! Going forward we aim to have 1:1 s - Added Repository.getSubmoduleNames - Added Submodule.Foreach -## [0.6.0](https://github.com/nodegit/nodegit/releases/tag/v0.6.0) (2015-12-08) +# v0.6.0 [(2015-12-08)](https://github.com/nodegit/nodegit/releases/tag/v0.6.0) - Added file mode staging - Added a fast rev walk to do the rev walk in C++ and bubble the result up to JS @@ -349,7 +349,7 @@ We have added Node 6 as a supported platform! Going forward we aim to have 1:1 s - Fixed weirdness in lifecycle scripts - Added downloading prebuilt binaries for electron -## [0.4.1](https://github.com/nodegit/nodegit/tree/0.4.1) (2015-06-02) +# v0.4.1 [(2015-06-02)](https://github.com/nodegit/nodegit/tree/0.4.1) [Full Changelog](https://github.com/nodegit/nodegit/compare/v0.4.0...0.4.1) @@ -413,7 +413,7 @@ We have added Node 6 as a supported platform! Going forward we aim to have 1:1 s - stop cleaning on post-install [\#562](https://github.com/nodegit/nodegit/pull/562) ([maxkorp](https://github.com/maxkorp)) -## [v0.4.0](https://github.com/nodegit/nodegit/tree/v0.4.0) (2015-05-07) +# v0.4.0 [(2015-05-07)](https://github.com/nodegit/nodegit/tree/v0.4.0) [Full Changelog](https://github.com/nodegit/nodegit/compare/v0.3.3...v0.4.0) @@ -541,7 +541,7 @@ We have added Node 6 as a supported platform! Going forward we aim to have 1:1 s - Add automatically generated change log file. [\#465](https://github.com/nodegit/nodegit/pull/465) ([skywinder](https://github.com/skywinder)) -## [v0.3.3](https://github.com/nodegit/nodegit/tree/v0.3.3) (2015-03-16) +# v0.3.3 [(2015-03-16)](https://github.com/nodegit/nodegit/tree/v0.3.3) [Full Changelog](https://github.com/nodegit/nodegit/compare/v0.3.2...v0.3.3) @@ -549,7 +549,7 @@ We have added Node 6 as a supported platform! Going forward we aim to have 1:1 s - Download all dev dependencies before build [\#491](https://github.com/nodegit/nodegit/pull/491) ([johnhaley81](https://github.com/johnhaley81)) -## [v0.3.2](https://github.com/nodegit/nodegit/tree/v0.3.2) (2015-03-16) +# v0.3.2 [(2015-03-16)](https://github.com/nodegit/nodegit/tree/v0.3.2) [Full Changelog](https://github.com/nodegit/nodegit/compare/v0.3.1...v0.3.2) @@ -561,7 +561,7 @@ We have added Node 6 as a supported platform! Going forward we aim to have 1:1 s - Confirm builder exists before building [\#490](https://github.com/nodegit/nodegit/pull/490) ([johnhaley81](https://github.com/johnhaley81)) -## [v0.3.1](https://github.com/nodegit/nodegit/tree/v0.3.1) (2015-03-14) +# v0.3.1 [(2015-03-14)](https://github.com/nodegit/nodegit/tree/v0.3.1) [Full Changelog](https://github.com/nodegit/nodegit/compare/v0.3.0...v0.3.1) @@ -569,7 +569,7 @@ We have added Node 6 as a supported platform! Going forward we aim to have 1:1 s - Revert node-pre-gyp to install not build [\#486](https://github.com/nodegit/nodegit/pull/486) ([tbranyen](https://github.com/tbranyen)) -## [v0.3.0](https://github.com/nodegit/nodegit/tree/v0.3.0) (2015-03-13) +# v0.3.0 [(2015-03-13)](https://github.com/nodegit/nodegit/tree/v0.3.0) [Full Changelog](https://github.com/nodegit/nodegit/compare/v0.2.7...v0.3.0) @@ -779,11 +779,11 @@ We have added Node 6 as a supported platform! Going forward we aim to have 1:1 s - Enable transfer progress [\#325](https://github.com/nodegit/nodegit/pull/325) ([tbranyen](https://github.com/tbranyen)) -## [v0.2.7](https://github.com/nodegit/nodegit/tree/v0.2.7) (2015-01-21) +# v0.2.7 [(2015-01-21)](https://github.com/nodegit/nodegit/tree/v0.2.7) [Full Changelog](https://github.com/nodegit/nodegit/compare/v0.2.6...v0.2.7) -## [v0.2.6](https://github.com/nodegit/nodegit/tree/v0.2.6) (2015-01-20) +# v0.2.6 [(2015-01-20)](https://github.com/nodegit/nodegit/tree/v0.2.6) [Full Changelog](https://github.com/nodegit/nodegit/compare/v0.2.5...v0.2.6) @@ -791,7 +791,7 @@ We have added Node 6 as a supported platform! Going forward we aim to have 1:1 s - \[WIP\] Added in some diff functions from libgit2 [\#348](https://github.com/nodegit/nodegit/pull/348) ([johnhaley81](https://github.com/johnhaley81)) -## [v0.2.5](https://github.com/nodegit/nodegit/tree/v0.2.5) (2015-01-20) +# v0.2.5 [(2015-01-20)](https://github.com/nodegit/nodegit/tree/v0.2.5) [Full Changelog](https://github.com/nodegit/nodegit/compare/v0.2.4...v0.2.5) @@ -857,7 +857,7 @@ We have added Node 6 as a supported platform! Going forward we aim to have 1:1 s - moving some deps to devdeps [\#320](https://github.com/nodegit/nodegit/pull/320) ([maxkorp](https://github.com/maxkorp)) -## [v0.2.4](https://github.com/nodegit/nodegit/tree/v0.2.4) (2014-12-05) +# v0.2.4 [(2014-12-05)](https://github.com/nodegit/nodegit/tree/v0.2.4) [Full Changelog](https://github.com/nodegit/nodegit/compare/v0.2.3...v0.2.4) @@ -909,11 +909,11 @@ We have added Node 6 as a supported platform! Going forward we aim to have 1:1 s - Styling [\#295](https://github.com/nodegit/nodegit/pull/295) ([maxkorp](https://github.com/maxkorp)) -## [v0.2.3](https://github.com/nodegit/nodegit/tree/v0.2.3) (2014-11-25) +# v0.2.3 [(2014-11-25)](https://github.com/nodegit/nodegit/tree/v0.2.3) [Full Changelog](https://github.com/nodegit/nodegit/compare/v0.2.2...v0.2.3) -## [v0.2.2](https://github.com/nodegit/nodegit/tree/v0.2.2) (2014-11-25) +# v0.2.2 [(2014-11-25)](https://github.com/nodegit/nodegit/tree/v0.2.2) [Full Changelog](https://github.com/nodegit/nodegit/compare/v0.2.1...v0.2.2) @@ -921,7 +921,7 @@ We have added Node 6 as a supported platform! Going forward we aim to have 1:1 s - Moved some dependencies around to help the generate not fail [\#294](https://github.com/nodegit/nodegit/pull/294) ([johnhaley81](https://github.com/johnhaley81)) -## [v0.2.1](https://github.com/nodegit/nodegit/tree/v0.2.1) (2014-11-25) +# v0.2.1 [(2014-11-25)](https://github.com/nodegit/nodegit/tree/v0.2.1) [Full Changelog](https://github.com/nodegit/nodegit/compare/v0.2.0...v0.2.1) @@ -929,7 +929,7 @@ We have added Node 6 as a supported platform! Going forward we aim to have 1:1 s - Rewrite installer [\#293](https://github.com/nodegit/nodegit/pull/293) ([johnhaley81](https://github.com/johnhaley81)) -## [v0.2.0](https://github.com/nodegit/nodegit/tree/v0.2.0) (2014-11-25) +# v0.2.0 [(2014-11-25)](https://github.com/nodegit/nodegit/tree/v0.2.0) [Full Changelog](https://github.com/nodegit/nodegit/compare/v0.1.4...v0.2.0) @@ -1121,7 +1121,7 @@ We have added Node 6 as a supported platform! Going forward we aim to have 1:1 s - Better installation flow for developing. [\#180](https://github.com/nodegit/nodegit/pull/180) ([tbranyen](https://github.com/tbranyen)) -## [v0.1.4](https://github.com/nodegit/nodegit/tree/v0.1.4) (2014-06-13) +# v0.1.4 [(2014-06-13)](https://github.com/nodegit/nodegit/tree/v0.1.4) [Full Changelog](https://github.com/nodegit/nodegit/compare/v0.1.3...v0.1.4) @@ -1143,7 +1143,7 @@ We have added Node 6 as a supported platform! Going forward we aim to have 1:1 s - Fixed: "ReferenceError: error is not defined" [\#169](https://github.com/nodegit/nodegit/pull/169) ([danyshaanan](https://github.com/danyshaanan)) -## [v0.1.3](https://github.com/nodegit/nodegit/tree/v0.1.3) (2014-05-02) +# v0.1.3 [(2014-05-02)](https://github.com/nodegit/nodegit/tree/v0.1.3) [Full Changelog](https://github.com/nodegit/nodegit/compare/v0.1.2...v0.1.3) @@ -1151,7 +1151,7 @@ We have added Node 6 as a supported platform! Going forward we aim to have 1:1 s - Fix erroneous OS detection for installation in OS X. [\#156](https://github.com/nodegit/nodegit/pull/156) ([tbranyen](https://github.com/tbranyen)) -## [v0.1.2](https://github.com/nodegit/nodegit/tree/v0.1.2) (2014-05-02) +# v0.1.2 [(2014-05-02)](https://github.com/nodegit/nodegit/tree/v0.1.2) [Full Changelog](https://github.com/nodegit/nodegit/compare/v0.1.1...v0.1.2) @@ -1189,7 +1189,7 @@ We have added Node 6 as a supported platform! Going forward we aim to have 1:1 s - WIP New installer. [\#140](https://github.com/nodegit/nodegit/pull/140) ([tbranyen](https://github.com/tbranyen)) -## [v0.1.1](https://github.com/nodegit/nodegit/tree/v0.1.1) (2014-03-23) +# v0.1.1 [(2014-03-23)](https://github.com/nodegit/nodegit/tree/v0.1.1) [Full Changelog](https://github.com/nodegit/nodegit/compare/v0.1.0...v0.1.1) @@ -1267,7 +1267,7 @@ We have added Node 6 as a supported platform! Going forward we aim to have 1:1 s - Add system dependencies for OSX install [\#82](https://github.com/nodegit/nodegit/pull/82) ([philschatz](https://github.com/philschatz)) -## [v0.1.0](https://github.com/nodegit/nodegit/tree/v0.1.0) (2013-09-07) +# v0.1.0 [(2013-09-07)](https://github.com/nodegit/nodegit/tree/v0.1.0) [Full Changelog](https://github.com/nodegit/nodegit/compare/v0.0.79...v0.1.0) @@ -1301,7 +1301,7 @@ We have added Node 6 as a supported platform! Going forward we aim to have 1:1 s - Updated LICENSE to MIT [\#75](https://github.com/nodegit/nodegit/pull/75) ([tbranyen](https://github.com/tbranyen)) -## [v0.0.79](https://github.com/nodegit/nodegit/tree/v0.0.79) (2013-04-05) +# v0.0.79 [(2013-04-05)](https://github.com/nodegit/nodegit/tree/v0.0.79) [Full Changelog](https://github.com/nodegit/nodegit/compare/v0.0.778...v0.0.79) @@ -1311,7 +1311,7 @@ We have added Node 6 as a supported platform! Going forward we aim to have 1:1 s - Python error on installing nodegit 0.0.77 [\#59](https://github.com/nodegit/nodegit/issues/59) -## [v0.0.778](https://github.com/nodegit/nodegit/tree/v0.0.778) (2013-03-26) +# v0.0.778 [(2013-03-26)](https://github.com/nodegit/nodegit/tree/v0.0.778) [Full Changelog](https://github.com/nodegit/nodegit/compare/v0.0.77...v0.0.778) @@ -1319,15 +1319,15 @@ We have added Node 6 as a supported platform! Going forward we aim to have 1:1 s - See issue \#59 [\#60](https://github.com/nodegit/nodegit/pull/60) ([dctr](https://github.com/dctr)) -## [v0.0.77](https://github.com/nodegit/nodegit/tree/v0.0.77) (2013-03-24) +# v0.0.77 [(2013-03-24)](https://github.com/nodegit/nodegit/tree/v0.0.77) [Full Changelog](https://github.com/nodegit/nodegit/compare/v0.0.76...v0.0.77) -## [v0.0.76](https://github.com/nodegit/nodegit/tree/v0.0.76) (2013-03-24) +# v0.0.76 [(2013-03-24)](https://github.com/nodegit/nodegit/tree/v0.0.76) [Full Changelog](https://github.com/nodegit/nodegit/compare/v0.0.75...v0.0.76) -## [v0.0.75](https://github.com/nodegit/nodegit/tree/v0.0.75) (2013-03-24) +# v0.0.75 [(2013-03-24)](https://github.com/nodegit/nodegit/tree/v0.0.75) [Full Changelog](https://github.com/nodegit/nodegit/compare/v0.0.74...v0.0.75) @@ -1357,11 +1357,11 @@ We have added Node 6 as a supported platform! Going forward we aim to have 1:1 s - Comment all code methods [\#1](https://github.com/nodegit/nodegit/issues/1) -## [v0.0.74](https://github.com/nodegit/nodegit/tree/v0.0.74) (2013-03-21) +# v0.0.74 [(2013-03-21)](https://github.com/nodegit/nodegit/tree/v0.0.74) [Full Changelog](https://github.com/nodegit/nodegit/compare/v0.0.73...v0.0.74) -## [v0.0.73](https://github.com/nodegit/nodegit/tree/v0.0.73) (2013-03-21) +# v0.0.73 [(2013-03-21)](https://github.com/nodegit/nodegit/tree/v0.0.73) [Full Changelog](https://github.com/nodegit/nodegit/compare/v0.0.72...v0.0.73) @@ -1375,11 +1375,11 @@ We have added Node 6 as a supported platform! Going forward we aim to have 1:1 s - Tree each method is synchronous [\#15](https://github.com/nodegit/nodegit/issues/15) -## [v0.0.72](https://github.com/nodegit/nodegit/tree/v0.0.72) (2013-03-06) +# v0.0.72 [(2013-03-06)](https://github.com/nodegit/nodegit/tree/v0.0.72) [Full Changelog](https://github.com/nodegit/nodegit/compare/v0.0.71...v0.0.72) -## [v0.0.71](https://github.com/nodegit/nodegit/tree/v0.0.71) (2013-03-06) +# v0.0.71 [(2013-03-06)](https://github.com/nodegit/nodegit/tree/v0.0.71) [Full Changelog](https://github.com/nodegit/nodegit/compare/v0.0.6...v0.0.71) @@ -1407,7 +1407,7 @@ We have added Node 6 as a supported platform! Going forward we aim to have 1:1 s - Refactor [\#37](https://github.com/nodegit/nodegit/pull/37) ([mmalecki](https://github.com/mmalecki)) -## [v0.0.6](https://github.com/nodegit/nodegit/tree/v0.0.6) (2011-12-19) +# v0.0.6 [(2011-12-19)](https://github.com/nodegit/nodegit/tree/v0.0.6) [Full Changelog](https://github.com/nodegit/nodegit/compare/v0.0.4...v0.0.6) @@ -1421,7 +1421,7 @@ We have added Node 6 as a supported platform! Going forward we aim to have 1:1 s - Node 0.6x fixes [\#34](https://github.com/nodegit/nodegit/pull/34) ([moneal](https://github.com/moneal)) -## [v0.0.4](https://github.com/nodegit/nodegit/tree/v0.0.4) (2011-05-14) +# v0.0.4 [(2011-05-14)](https://github.com/nodegit/nodegit/tree/v0.0.4) [Full Changelog](https://github.com/nodegit/nodegit/compare/v0.0.3...v0.0.4) @@ -1433,7 +1433,7 @@ We have added Node 6 as a supported platform! Going forward we aim to have 1:1 s - Branch history each method is asynchronous [\#11](https://github.com/nodegit/nodegit/issues/11) -## [v0.0.3](https://github.com/nodegit/nodegit/tree/v0.0.3) (2011-04-13) +# v0.0.3 [(2011-04-13)](https://github.com/nodegit/nodegit/tree/v0.0.3) [Full Changelog](https://github.com/nodegit/nodegit/compare/v0.0.2...v0.0.3) @@ -1443,11 +1443,11 @@ We have added Node 6 as a supported platform! Going forward we aim to have 1:1 s - Windows link issue [\#12](https://github.com/nodegit/nodegit/issues/12) -## [v0.0.2](https://github.com/nodegit/nodegit/tree/v0.0.2) (2011-03-14) +# v0.0.2 [(2011-03-14)](https://github.com/nodegit/nodegit/tree/v0.0.2) [Full Changelog](https://github.com/nodegit/nodegit/compare/v0.0.1...v0.0.2) -## [v0.0.1](https://github.com/nodegit/nodegit/tree/v0.0.1) (2011-03-10) +# v0.0.1 [(2011-03-10)](https://github.com/nodegit/nodegit/tree/v0.0.1)